diff --git a/cpt-kuesel/README.md b/cpt-kuesel/README.md
index 2b3cbca..cd05c27 100644
--- a/cpt-kuesel/README.md
+++ b/cpt-kuesel/README.md
@@ -44,10 +44,21 @@ This is shown in the header of each file:
 #  ]
 ```
 Normal collections, like Bad Boys, are just sorted alphabetically into the library.
+Capitalized Metadata Files get their own asset folders in an attempt to be organized. 
+Works for me as I have now, at time of writing, cracked the mark of 10GB of local assets. Too much for a single asset directory in my opinion.
+
+I have started cross library metadata files. 
+For example in my movies library I have a `serien.yml` for those Movies that belong to a tv show.
+The collections are hidden so that they just come up in the overview of the items when you scroll down, but not in the library tab.
 
 ## Overlays
 Overlays are my way to signal audio languages and therefore i have created overlays with every language currently in my library. 
 I also use *item_metadata_language* to only have movies with german audio track with german movie synopsis and title and everything else with english text and title.
+The flags are taken from: https://www.countries-ofthe-world.com/flags-of-the-world.html
+
+In my overlay.psd, located in  `config/overlays` in this repo btw, i have prepared a layer for every flag/language that is represented in my library.
+They are in layer groups and can easily be toggled to quickly create new overlays.
+If you like to use my overlays and can't use my .psd shoot me a message on Discord and I can create any missing language overlay for you.
 
 ## Questions?
 You can always shoot me a question in the PMM Discord found on the main GitHub in the support section:
diff --git a/cpt-kuesel/config/config.yml b/cpt-kuesel/config/config.yml
index 08e275f..03c780f 100644
--- a/cpt-kuesel/config/config.yml
+++ b/cpt-kuesel/config/config.yml
@@ -1,47 +1,96 @@
 libraries:
-      Filme:
-            split_duplicates: true
-            metadata_path:
-                - metadata/movies/Filme.yml
-                - metadata/movies/People.yml
-                - metadata/movies/Genres.yml
-                - metadata/movies/Awards.yml
-                - metadata/movies/Decades.yml
-                - metadata/movies/metadata.yml
-                - metadata/movies/overlays.yml
-            settings:
-                  asset_directory: assets/movies
-      Anime:
-            metadata_path:
-                - metadata/anime/Anime.yml
-                - metadata/anime/metadata.yml
-            settings:
-                  asset_directory: assets/anime
-      Serien:
-            metadata_path:
-                - metadata/tv_shows/Serien.yml
-                - metadata/tv_shows/metadata.yml
-            #     - metadata/tv_shows/overlays.yml
-            settings:
-                  asset_directory: assets/tv_shows
+  Filme:
+    split_duplicates: true
+    metadata_path:
+      - metadata/movies/metadata.yml
+      - metadata/movies/overlays.yml
+      - metadata/movies/anime.yml
+      - metadata/movies/serien.yml
+      - metadata/movies/Filme.yml
+      - metadata/movies/People.yml
+      - metadata/movies/Genres.yml
+      - metadata/movies/Awards.yml
+      - metadata/movies/Decades.yml
+      - metadata/movies/Watchlists.yml
+    settings:
+      asset_directory:
+        - assets/movies/collections
+        - assets/movies/filme
+        - assets/movies/people
+        - assets/movies/genres
+        - assets/movies/awards
+        - assets/movies/decades
+        - assets/movies/watchlists
+  Anime:
+    metadata_path:
+      - metadata/anime/metadata.yml
+      - metadata/anime/filme.yml
+      - metadata/anime/Anime.yml
+    settings:
+      asset_directory:
+        - assets/anime/collections
+        - assets/anime/anime
+  Serien:
+    metadata_path:
+      - metadata/tv_shows/metadata.yml
+      - metadata/tv_shows/overlays.yml
+      - metadata/tv_shows/filme.yml
+      - metadata/tv_shows/Serien.yml
+    settings:
+      asset_directory:
+        - assets/tv_shows/collections
+        - assets/tv_shows/serien
+  Movies:
+    split_duplicates: true
+    metadata_path:
+      - metadata/movies/metadata.yml
+      - metadata/movies/overlays.yml
+      - metadata/movies/Movies.yml
+      - metadata/movies/People.yml
+      - metadata/movies/Genres.yml
+      - metadata/movies/Awards.yml
+      - metadata/movies/Decades.yml
+    settings:
+      asset_directory:
+        - assets/movies/collections
+        - assets/movies/filme
+        - assets/movies/people
+        - assets/movies/genres
+        - assets/movies/awards
+        - assets/movies/decades
+  Shows:
+    metadata_path:
+      - metadata/tv_shows/metadata.yml
+      - metadata/tv_shows/overlays.yml
+      - metadata/tv_shows/Shows.yml
+    settings:
+      asset_directory:
+        - assets/tv_shows/collections
+        - assets/tv_shows/serien
 settings:
-      cache: true
-      cache_expiration: 60
-      sync_mode: sync
-      show_unmanaged: true
-      show_filtered: false
-      show_missing: true
-      save_missing: false
-      asset_directory: assets
-      asset_folders: true
-      assets_for_all: true
+  cache: true
+  cache_expiration: 60
+  sync_mode: sync
+  show_unmanaged: true
+  show_filtered: false
+  show_missing: true
+  save_missing: false
+  run_again_delay: 2
+  asset_directory: assets
+  asset_folders: true
+  assets_for_all: true
+  released_missing_only: false
+  create_asset_folders: false
+  missing_only_released: false
+  collection_minimum: 1
+  delete_below_minimum: false
 plex:
-      url: <local_plex_ip>:32400
-      token: <plex_token>
-      timeout: 60
-      clean_bundles: true
-      empty_trash: true
-      optimize: false
+  url: http://192.168.178.27:32400
+  token: <token>
+  timeout: 60
+  clean_bundles: true
+  empty_trash: true
+  optimize: false
 tmdb:
-      apikey: <tmdb_api_key>
-      language: de
+  apikey: <apikey>
+  language: de
diff --git a/cpt-kuesel/metadata/anime/filme.yml b/cpt-kuesel/metadata/anime/filme.yml
new file mode 100644
index 0000000..99a650d
--- /dev/null
+++ b/cpt-kuesel/metadata/anime/filme.yml
@@ -0,0 +1,14 @@
+### Anime that have Movies will be put in a hidden collection 
+### in order to link them together in the Overview when you scroll down.
+
+templates:
+  Show:
+    tvdb_show: <<show>>
+    collection_mode: hide
+    sort_title: <<collection_name>>
+
+collections:
+  Gintama:
+    template: {name: Show, show: 79895}
+  K-Project:
+    template: {name: Show, show: 261249}
\ No newline at end of file
diff --git a/cpt-kuesel/metadata/anime/metadata.yml b/cpt-kuesel/metadata/anime/metadata.yml
index 974c914..5f1228d 100644
--- a/cpt-kuesel/metadata/anime/metadata.yml
+++ b/cpt-kuesel/metadata/anime/metadata.yml
@@ -1,3 +1,13 @@
 metadata:
   "Avatar: The Legend of Korra":
-    alt_title: The Legend of Korra
\ No newline at end of file
+    alt_title: The Legend of Korra
+  Gintama:
+    episodes:
+      S00E18:
+        title: The Semi-Final - Don't Spread the Wrapping Cloth Without Thinking Ahead
+        summary: As the war temporarily calms down and Edo rebuilds, Gintoki finds Shinpachi—who is still unaware of his return—on a bridge. However, as a fight quickly breaks out between the Yorozuya and the Tenshouin Naraku, suspicion grows, forcing Gintoki to use what is nearest—a loincloth—to mask his identity. Saved for the time being, Gintoki enters the Yorozuya office, but unbeknownst to him, someone else is already waiting there...
+      S00E19:
+        title: The Semi-Final - Don't Make Up Your Mind Right Before The Important Decision
+        summary: Meanwhile, Kondou departs Earth to marry Princess Bubbles in an attempt to improve diplomatic relations. After boarding the Gorilla Amanto mother ship, he realizes that he doesn't speak their language. Confused, Kondou tries conversing with them, only to inadvertently gain their support. However, someone associated with the princess crashes the ongoing ceremony. Will the wedding continue, or has Kondou just been saved from becoming the next Gorilla Prince?
+  Monster Incidents:
+    alt_title: Kemono Jihen
\ No newline at end of file
diff --git a/cpt-kuesel/metadata/movies/Awards.yml b/cpt-kuesel/metadata/movies/Awards.yml
index cc1b4a4..cd069c3 100644
--- a/cpt-kuesel/metadata/movies/Awards.yml
+++ b/cpt-kuesel/metadata/movies/Awards.yml
@@ -8,28 +8,38 @@
 
 #   +3_ = People
 #   +4_ = Genres
-#   +5_ = Filme
+#   +5_ = Movies
 
-templates:
-  Award:
-    optional:
-      - movie
-      - list
-    tmdb_movie: <<movie>>
-    tmdb_list: <<list>>
-    sort_title: <<collection_name>>
 collections:
   2021 Oscar Winners:
-    template: {name: Award, list: 7093940}
+    letterboxd_list: https://letterboxd.com/jkbsmm/list/2021-oscar-winners
     smart_label: critic_rating.desc
     sort_title: +2_1_2021 Oscar Winners
   2020 Oscar Winners:
-    template: {name: Award, list: 7095665}
+    letterboxd_list: https://letterboxd.com/jkbsmm/list/2020-oscar-winners
     smart_label: critic_rating.desc
     sort_title: +2_11_2020 Oscar Winners
   2019 Oscar Winners:
-    template: {name: Award, list: 7095666}
+    letterboxd_list: https://letterboxd.com/jkbsmm/list/2019-oscar-winners
     smart_label: critic_rating.desc
     sort_title: +2_111_2019 Oscar Winners
+  Oscar Winners:
+    letterboxd_list:
+      - https://letterboxd.com/jkbsmm/list/2021-oscar-winners   #2021
+      - https://letterboxd.com/jkbsmm/list/2020-oscar-winners   #2020
+      - https://letterboxd.com/jkbsmm/list/2019-oscar-winners   #2019
+      - https://letterboxd.com/jkbsmm/list/2018-oscar-winners   #2018
+      - https://letterboxd.com/jkbsmm/list/2017-oscar-winners-2 #2017
+      - https://letterboxd.com/jkbsmm/list/2016-oscar-winners-3 #2016
+      - https://letterboxd.com/jkbsmm/list/2015-oscar-winners   #2015
+      - https://letterboxd.com/jkbsmm/list/2014-oscar-winners   #2014
+      - https://letterboxd.com/jkbsmm/list/2013-oscar-winners   #2013
+      - https://letterboxd.com/jkbsmm/list/2012-oscar-winners   #2012
+      - https://letterboxd.com/jkbsmm/list/2011-oscar-winners   #2011
+      - https://letterboxd.com/jkbsmm/list/2010-oscar-winners   #2010
+      - https://letterboxd.com/jkbsmm/list/2009-oscar-winners   #2009
+      - https://letterboxd.com/jkbsmm/list/2008-oscar-winners   #2008
+    smart_label: release.desc
+    sort_title: +2_1111_Oscar Winners
 
 
diff --git a/cpt-kuesel/metadata/movies/Decades.yml b/cpt-kuesel/metadata/movies/Decades.yml
index fa913ba..543458e 100644
--- a/cpt-kuesel/metadata/movies/Decades.yml
+++ b/cpt-kuesel/metadata/movies/Decades.yml
@@ -7,7 +7,7 @@
 #   +2_ = Awards
 #   +3_ = People
 #   +4_ = Genres
-#   +5_ = Filme
+#   +5_ = Movies
 
 templates:
   Decade:
diff --git a/cpt-kuesel/metadata/movies/Filme.yml b/cpt-kuesel/metadata/movies/Filme.yml
index 0b903f9..e8c41e8 100644
--- a/cpt-kuesel/metadata/movies/Filme.yml
+++ b/cpt-kuesel/metadata/movies/Filme.yml
@@ -65,6 +65,11 @@ collections:
     template: {name: Movie, collection: 14890}
   Bahubali:
     template: {name: Movie, collection: 350309}
+  "Batman: The Long Halloween":
+    template: {name: Movie, collection: 785583}
+    name_mapping: Batman The Long Halloween
+  Battle Royale:
+    template: {name: Movie, collection: 16302}
   Bill & Ted's Most Excellent:
     template: {name: Movie, collection: 91746}
   Black Panther:
@@ -97,6 +102,8 @@ collections:
   Crazy Rich Asians:
     template: {name: Movie, collection: 545955}
     collection_mode: hide
+  Crouching Tiger, Hidden Dragon:
+    template: {name: Movie, collection: 290973}
   Darko:
     template: {name: Movie, collection: 178106}
   Deadpool:
@@ -106,11 +113,20 @@ collections:
   Doctor Strange:
     template: {name: Movie, collection: 618529}
     collection_mode: hide
+  Don't Breathe:
+    template: {name: Movie, collection: 748919}
   Eastrail 177:
     template: {name: Movie, movie: "9741, 381288, 450465"}
   Edge of Tomorrow:
     template: {name: Movie, collection: 578704}
     collection_mode: hide
+  Elizabeth:
+    template: {name: Movie, collection: 100286}
+  Escape From ...:
+    template: {name: Movie, collection: 115838}
+    name_mapping: Escape From
+  Escape Room:
+    template: {name: Movie, collection: 769423}
   Evil Dead:
     template: {name: Movie, collection: 1960}
   Extraction:
@@ -119,12 +135,17 @@ collections:
   Fantastic Beasts:
     template: {name: Movie, collection: 435259}
   Fast & Furious:
-    template: {name: Movie, collection: 9485, movie: 384018}
+    template: {name: Movie, list: 7102873}
+    collection_order: custom
     sort_title: +5_2_Fast & Furious
+  Final Destination:
+    template: {name: Movie, collection: 8864}
   Finding Nemo:
     template: {name: Movie, collection: 137697}
   Frozen:
     template: {name: Movie, collection: 386382}
+  Gintama:
+    template: {name: Movie, collection: 713969}
   Ghost Rider:
     template: {name: Movie, collection: 90306}
   Ghostbusters:
@@ -181,7 +202,7 @@ collections:
   Kick-Ass:
     template: {name: Movie, collection: 179892}
   Kill Bill:
-    template: {name: Movie, collection: 2883}
+    template: {name: Movie, collection: 2883, movie: 414419}
   Kingsman:
     template: {name: Movie, collection: 391860}
   Machete:
@@ -194,6 +215,8 @@ collections:
     template: {name: Movie, list: 7082740}
     smart_label: year.asc
     sort_title: +5_1_Marvel Cinematic Universe
+  Millennium:
+    template: {name: Movie, collection: 24761}
   Mechanic:
     template: {name: Movie, collection: 280504}
   "Mission: Impossible":
@@ -202,8 +225,9 @@ collections:
     sort_title: +5_2_Mission Impossible
   Men In Black:
     template: {name: Movie, collection: 86055}
-  Monsters, Inc.:
+  "Monsters, Inc.":
     template: {name: Movie, collection: 137696}
+    name_mapping: Monsters, Inc
   Monty Python:
     template: {name: Movie, movie: "583, 762"}
   Naked Gun:
@@ -228,6 +252,8 @@ collections:
     template: {name: Movie, collection: 135416}
   Psych:
     template: {name: Movie, collection: 718934}
+  Rebuild of Evangelion:
+    template: {name: Movie, collection: 210303}
   RED:
     template: {name: Movie, collection: 163902}
   Rocky:
@@ -251,6 +277,8 @@ collections:
     template: {name: Movie, collection: 135179}
   Smokin' Aces:
     template: {name: Movie, collection: 96680}
+  Space Jam:
+    template: {name: Movie, collection: 722961}
   Spider-Man:
     template: {name: Movie, collection: 556}
   Spider-Man (Avengers):
@@ -266,8 +294,8 @@ collections:
     template: {name: Movie, collection: 115575}
     name_mapping: Star Trek Alternate Reality
   Star Wars:
-    template: {name: Movie, collection: 10, movie: "348350, 330459"}
-    collection_order: alpha
+    template: {name: Movie, list: 7102821}
+    collection_order: custom
     sort_title: +5_2_Star Wars
   Stargate:
     template: {name: Movie, collection: 44215}
@@ -279,55 +307,92 @@ collections:
     template: {name: Movie, collection: 135483}
   The Amazing Spider-Man:
     template: {name: Movie, collection: 125574}
+    sort_title: Amazing Spider-Man
   The Avengers:
     template: {name: Movie, collection: 86311}
+    sort_title: Avengers
   The Babysitter:
     template: {name: Movie, collection: 737382}
+    sort_title: Babysitter
   The Boondock Saints:
     template: {name: Movie, collection: 87186}
+    sort_title: Boondock Saints
+  The Chronicles of Narnia:
+    template: {name: Movie, collection: 420}
+    sort_title: Chronicles of Narnia
   The Conjuring:
     template: {name: Movie, collection: 313086}
+    sort_title: Conjuring
+  The Croods:
+    template: {name: Movie, collection: 464577}
+    sort_title: Croods
   The Dark Knight:
     template: {name: Movie, collection: 263}
+    sort_title: Dark Knight
   The Equalizer:
     template: {name: Movie, collection: 523855}
+    sort_title: Equalizer
   The Expendables:
     template: {name: Movie, collection: 126125}
+    sort_title: Expendables
   The First Myth Universe:
     template: {name: Movie, movie: "635389, 615453"}
     item_label: never_german
     item_metadata_language: en-US
+    sort_title: First Myth Universe
+  The Girl - Millenium:
+    template: {name: Movie, collection: 575987}
+    sort_title: Girl - Millenium
   The Godfather:
     template: {name: Movie, collection: 230}
+    sort_title: Godfather
   The Hangover:
     template: {name: Movie, collection: 86119}
+    sort_title: Hangover
   The Hitman's Bodyguard:
     template: {name: Movie, collection: 608101}
+    sort_title: Hitman's Bodyguard
   The Hobbit:
     template: {name: Movie, collection: 121938}
+    sort_title: Hobbit
   The Lego Movie:
     template: {name: Movie, collection: 325470}
+    sort_title: Lego Movie
   The Lord of the Rings:
     template: {name: Movie, collection: 119}
+    sort_title: Lord of the Rings
   The Matrix:
     template: {name: Movie, collection: 2344, movie: 55931}
+    sort_title: Matrix
   The Middle Earth Collection:
     template: {name: Movie, collection: "119, 121938"}
     collection_order: alpha
     sort_title: +5_2_The Middle Earth Collection
+  The Monsterverse:
+    template: {name: Movie, collection: 535313, movie: 293167}
+    sort_title: +5_2_The Monsterverse
+  The Purge:
+    template: {name: Movie, collection: 256322}
+    sort_title: Purge
   The Raid:
     template: {name: Movie, collection: 257960}
+    sort_title: Raid
   The Space Odyssey Series:
     template: {name: Movie, collection: 4438}
+    sort_title: Space Odyssey
   The Terminator:
     template: {name: Movie, collection: 528}
     sort_title: +5_2_The Terminator
   The Transporter:
     template: {name: Movie, collection: 9518}
+    sort_title: Transporter
   The Wolverine:
     template: {name: Movie, collection: 453993}
+    sort_title: Wolverine
   Thor:
     template: {name: Movie, collection: 131296}
+  Three Colors:
+    template: {name: Movie, collection: 131}
   Top Gun:
     template: {name: Movie, collection: 531330}
     collection_mode: hide
diff --git a/cpt-kuesel/metadata/movies/Genres.yml b/cpt-kuesel/metadata/movies/Genres.yml
index dbd4c15..ce74417 100644
--- a/cpt-kuesel/metadata/movies/Genres.yml
+++ b/cpt-kuesel/metadata/movies/Genres.yml
@@ -8,7 +8,7 @@
 #   +4_ = Genres
 #  ]
 
-#   +5_ = Filme
+#   +5_ = Movies
 
 # templates:
 collections:
diff --git a/cpt-kuesel/metadata/movies/Movies.yml b/cpt-kuesel/metadata/movies/Movies.yml
new file mode 100644
index 0000000..5bc5029
--- /dev/null
+++ b/cpt-kuesel/metadata/movies/Movies.yml
@@ -0,0 +1,31 @@
+# Prefixes for cpt-kuesels Movie Collections:
+#   +1_ = Decades
+#   +2_ = Awards
+#   +3_ = People
+#   +4_ = Genres
+
+#  In this file:
+#  [
+#   +5_1_ = Universes
+#   +5_2_ = Franchises
+#  ]
+
+templates:
+  Movie:
+    optional:
+      - collection
+      - movie
+      - list
+    tmdb_collection_details: <<collection>>
+    tmdb_movie: <<movie>>
+    tmdb_list: <<list>>
+    sort_title: <<collection_name>>
+collections:
+  # The Hobbit:
+  #   template: {name: Movie, collection: 121938}
+  # The Lord of the Rings:
+  #   template: {name: Movie, collection: 119}
+  # The Middle Earth Collection:
+  #   template: {name: Movie, collection: "119, 121938"}
+  #   collection_order: alpha
+  #   sort_title: +5_2_The Middle Earth Collection
diff --git a/cpt-kuesel/metadata/movies/People.yml b/cpt-kuesel/metadata/movies/People.yml
index cf3fd57..60e07b5 100644
--- a/cpt-kuesel/metadata/movies/People.yml
+++ b/cpt-kuesel/metadata/movies/People.yml
@@ -5,11 +5,10 @@
 #  In this file:
 #  [
 #   +3_1_ = Directors
-#   +3_2_ = Actors
 #  ]
 
 #   +4_ = Genres
-#   +5_ = Filme
+#   +5_ = Movies
 
 templates:
   Director:
@@ -19,111 +18,22 @@ templates:
       sort_by: year.asc
     tmdb_person: <<person>>
     sort_title: +3_1_<<collection_name>>
-  Actor:
-    smart_filter:
-      all:
-        actor: tmdb
-      sort_by: year.asc
-    tmdb_person: <<person>>
-    sort_title: +3_2_<<collection_name>>
 collections:
-  Alan Tudyk:
-    template: {name: Actor, person: 21088}
-  # Alec Baldwin:
-  #   template: {name: Actor, person: 7447}
-  # Angelina Jolie:
-  #   template: {name: Actor, person: 11701}
-  Awkwafina:
-    template: {name: Actor, person: 1625558}
   Bong Joon-Ho:
     template: {name: Director, person: 21684}
-  # Brad Pitt:
-  #   template: {name: Actor, person: 287}
-  Charlize Theron:
-    template: {name: Actor, person: 6885}
-  Chiwetel Ejiofor:
-    template: {name: Actor, person: 5294}
-  Christian Bale:
-    template: {name: Actor, person: 3894}
   Christopher Nolan:
     template: {name: Director, person: 525}
-  # Danny Trejo:
-  #   template: {name: Actor, person: 11160}
-  # Dave Bautista:
-  #   template: {name: Actor, person: 543530}
-  Denzel Washington:
-    template: {name: Actor, person: 5292}
-  Edward Norton:
-    template: {name: Actor, person: 819}
-  # Emily Blunt:
-  #   template: {name: Actor, person: 5081}
-  Emma Stone:
-    template: {name: Actor, person: 54693}
-  Gary Oldman:
-    template: {name: Actor, person: 64}
-  # George Clooney:
-  #   template: {name: Actor, person: 1461}
-  Halle Berry:
-    template: {name: Actor, person: 4587}
-  Helena Bonham Carter:
-    template: {name: Actor, person: 1283}
-  Helen Mirren:
-    template: {name: Actor, person: 15735}
-  Jack Nicholson:
-    template: {name: Actor, person: 514}
-  Jeff Bridges:
-    template: {name: Actor, person: 1229}
-  Jesse Eisenberg:
-    template: {name: Actor, person: 44735}
-  Joaquin Phoenix:
-    template: {name: Actor, person: 73421}
-  Jodie Foster:
-    template: {name: Actor, person: 1038}
-  # Johnny Depp:
-  #   template: {name: Actor, person: 85}
-  Julianne Moore:
-    template: {name: Actor, person: 1231}
-  Keanu Reeves:
-    template: {name: Actor, person: 6384}
-  Leonardo DiCaprio:
-    template: {name: Actor, person: 6193}
-  # Liam Neeson:
-  #   template: {name: Actor, person: 3896}
-  Mads Mikkelsen:
-    template: {name: Actor, person: 1019}
-  # Matthew McConaughey:
-  #   template: {name: Actor, person: 10297}
-  Mila Kunis:
-    template: {name: Actor, person: 18973}
-  Morgan Freeman:
-    template: {name: Actor, person: 192}
-  Nicolas Cage:
-    template: {name: Actor, person: 2963}
-  Oscar Isaac:
-    template: {name: Actor, person: 25072}
+  Edgar Wright:
+    template: {name: Director, person: 11090}
+  Guy Ritchie:
+    template: {name: Director, person: 956}
+  Martin Scorsese:
+    template: {name: Director, person: 1032}
   Quentin Tarantino:
     template: {name: Director, person: 138}
-  Robert De Niro:
-    template: {name: Actor, person: 380}
   Robert Rodriguez:
     template: {name: Director, person: 2294}
-  Sacha Baron Cohen:
-    template: {name: Actor, person: 6730}
-  Sam Rockwell:
-    template: {name: Actor, person: 6807}
-  Samara Weaving:
-    template: {name: Actor, person: 1372369}
-  Samuel L. Jackson:
-    template: {name: Actor, person: 2231}
-  Scarlett Johansson:
-    template: {name: Actor, person: 1245}
-  # Seth Rogen:
-  #   template: {name: Actor, person: 19274}
   Taika Waititi:
     template: {name: Director, person: 55934}
   Tim Burton:
-    template: {name: Director, person: 510}
-  Will Smith:
-    template: {name: Actor, person: 2888}
-  Woody Harrelson:
-    template: {name: Actor, person: 57755}
\ No newline at end of file
+    template: {name: Director, person: 510}
\ No newline at end of file
diff --git a/cpt-kuesel/metadata/movies/Watchlists.yml b/cpt-kuesel/metadata/movies/Watchlists.yml
new file mode 100644
index 0000000..5b3b359
--- /dev/null
+++ b/cpt-kuesel/metadata/movies/Watchlists.yml
@@ -0,0 +1,18 @@
+templates:
+  Watchlist:
+    optional:
+      - label
+      - letterboxd
+    letterboxd_list: https://letterboxd.com/<<letterboxd>>
+    label: <<label>>
+    visible_library: true
+    visible_shared: true
+    smart_label: random
+    sort_title: +6_<<collection_name>>
+
+collections:
+  Family Watchlist:
+    template: {name: Watchlist, label: Family Watchlist, letterboxd: jkbsmm/list/family-watchlist/}
+  My Watchlist:
+    template: {name: Watchlist, label: My Watchlist, letterboxd: jkbsmm/watchlist/}
+
diff --git a/cpt-kuesel/metadata/movies/anime.yml b/cpt-kuesel/metadata/movies/anime.yml
new file mode 100644
index 0000000..0309a9c
--- /dev/null
+++ b/cpt-kuesel/metadata/movies/anime.yml
@@ -0,0 +1,12 @@
+### Single Movies that belong to an Anime will be put in a hidden collection 
+### in order to link them together in the Overview when you scroll down.
+
+templates:
+  Movie:
+    tmdb_movie: <<movie>>
+    collection_mode: hide
+    sort_title: <<collection_name>>
+
+collections:
+  K-Project:
+    template: {name: Movie, movie: 271708}
\ No newline at end of file
diff --git a/cpt-kuesel/metadata/movies/metadata.yml b/cpt-kuesel/metadata/movies/metadata.yml
index 67bebb2..f0bdd2a 100644
--- a/cpt-kuesel/metadata/movies/metadata.yml
+++ b/cpt-kuesel/metadata/movies/metadata.yml
@@ -1,30 +1,12 @@
 metadata:
+  "Gintama: The Semi Final":
+    label: Tv_special
+    summary: "Combined 2-Episode TV-Special leading up to the last movie Gintama: The Very Final."
   James Bond 007 - Sag niemals nie:
     alt_title: Sag niemals nie
-  # --- Star Wars --- #
-  "Star Wars: Episode I - Die dunkle Bedrohung":
-    sort_title: Star Wars 1
-  "Star Wars: Episode II - Angriff der Klonkrieger":
-    sort_title: Star Wars 2
-  "Solo: A Star Wars Story":
-    sort_title: Star Wars 2.5
-  "Star Wars: Episode III - Die Rache der Sith":
-    sort_title: Star Wars 3
-  "Star Wars: Rogue One":
-    sort_title: Star Wars 3.5
-  Krieg der Sterne:
-    sort_title: Star Wars 4
-  Das Imperium schlägt zurück:
-    sort_title: Star Wars 5
-  Die Rückkehr der Jedi-Ritter:
-    sort_title: Star Wars 6
-  "Star Wars: Das Erwachen der Macht":
-    sort_title: Star Wars 7
-  "Star Wars: Die letzten Jedi":
-    sort_title: Star Wars 8
-  "Star Wars: Der Aufstieg Skywalkers":
-    sort_title: Star Wars 9
-  # --- Star Wars --- #
+  Paris, Texas:
+    alt_title: Motel Chronicles
+
   # --- The Middle Earth Collection --- #
   Der Hobbit - Eine unerwartete Reise:
     sort_title: Middle Earth 1
diff --git a/cpt-kuesel/metadata/movies/overlays.yml b/cpt-kuesel/metadata/movies/overlays.yml
old mode 100644
new mode 100755
index c615d90..4b1b896
--- a/cpt-kuesel/metadata/movies/overlays.yml
+++ b/cpt-kuesel/metadata/movies/overlays.yml
@@ -1,828 +1,915 @@
+### ISO-Language codes (https://www.loc.gov/standards/iso639-2/php/code_list.php) in this file:
+# de  |  German
+# en  |  English
+# fr  |  French
+# ja  |  Japanese
+# zh  |  Chinese
+# ko  |  Korean
+# da  |  Danish
+# ru  |  Russian
+# es  |  Spanish
+# nl  |  Dutch
+# hi  |  Hindi
+# te  |  Telugu
+# sv  |  Swedish
+# it  |  Italian
+# fa  |  Farsi
+# th  |  Thai
+### Flags for Overlays -> https://www.countries-ofthe-world.com/flags-of-the-world.html
+
 collections:
   dl_german_english_4k_hdr:
     plex_search:
       all:
         resolution: 4K
-        hdr: true
+        hdr: True
         audio_language:
-          - Deutsch
-          - English
-        audio_language.not:
-          - Français
-          - 日本語
-          - 中文
-          - 한국어
-          - हिन्दी, हिंदी
-          - తెలుగు
-          - Dansk
-          - русский язык
-          - Español
-          - Nederlands
+          - de
+          - en
+        label.not:
+          - Tv_special
     build_collection: false
     item_overlay: dl_german_english_4k_hdr
+    # revert_overlay: true
     item_metadata_language: de-DE
-    item_label: 4K
-  german_4k_hdr:
+  dl_german_english_4k:
     plex_search:
       all:
         resolution: 4K
+        hdr: false
+        audio_language:
+          - de
+          - en
+        label.not:
+          - Tv_special
+    build_collection: false
+    item_overlay: dl_german_english_4k
+    # revert_overlay: true
+    item_metadata_language: de-DE
+  dl_german_english_hdr:
+    plex_search:
+      all:
+        resolution: 1080
         hdr: true
-        audio_language: Deutsch
-        audio_language.not:
-          - English
-          - Français
-          - 日本語
-          - 中文
-          - 한국어
-          - हिन्दी, हिंदी
-          - తెలుగు
-          - Dansk
-          - русский язык
-          - Español
-          - Nederlands
+        audio_language:
+          - de
+          - en
+        label.not:
+          - Tv_special
     build_collection: false
-    item_overlay: german_4k_hdr
+    item_overlay: dl_german_english_hdr
+    # revert_overlay: true
     item_metadata_language: de-DE
-    item_label: 4K
   english_4k_hdr:
     plex_search:
       all:
         resolution: 4K
         hdr: true
-        audio_language: English
+        audio_language: en
         audio_language.not:
-          - Deutsch
-          - Français
-          - 日本語
-          - 中文
-          - 한국어
-          - हिन्दी, हिंदी
-          - తెలుగు
-          - Dansk
-          - русский язык
-          - Español
-          - Nederlands
+          - de
+        label.not:
+          - Tv_special
     build_collection: false
     item_overlay: english_4k_hdr
+    # revert_overlay: true
     item_metadata_language: en-US
-    item_label: 4K
-  dl_german_english_4k:
+  english_4k:
     plex_search:
       all:
         resolution: 4K
         hdr: false
-        audio_language:
-          - Deutsch
-          - English
+        audio_language: en
         audio_language.not:
-          - Français
-          - 日本語
-          - 中文
-          - 한국어
-          - हिन्दी, हिंदी
-          - తెలుగు
-          - Dansk
-          - русский язык
-          - Español
-          - Nederlands
+          - de
+        label.not:
+          - Tv_special
     build_collection: false
-    item_overlay: dl_german_english_4k
-    item_metadata_language: de-DE
-    item_label: 4K
-  german_4k:
+    item_overlay: english_4k
+    # revert_overlay: true
+    item_metadata_language: en-US
+  english_hdr:
     plex_search:
       all:
-        resolution: 4K
-        hdr: false
-        audio_language: Deutsch
+        resolution: 1080
+        hdr: true
+        audio_language: en
         audio_language.not:
-          - English
-          - Français
-          - 日本語
-          - 中文
-          - 한국어
-          - हिन्दी, हिंदी
-          - తెలుగు
-          - Dansk
-          - русский язык
-          - Español
-          - Nederlands
+          - de
+        label.not:
+          - Tv_special
     build_collection: false
-    item_overlay: german_4k
-    item_metadata_language: de-DE
-    item_label: 4K
-  english_4k:
+    item_overlay: english_hdr
+    # revert_overlay: true
+    item_metadata_language: en-US
+  german_4k_hdr:
     plex_search:
       all:
         resolution: 4K
-        hdr: false
-        audio_language: English
+        hdr: true
+        audio_language: de
         audio_language.not:
-          - Deutsch
-          - Français
-          - 日本語
-          - 中文
-          - 한국어
-          - हिन्दी, हिंदी
-          - తెలుగు
-          - Dansk
-          - русский язык
-          - Español
-          - Nederlands
+          - en
+        label.not:
+          - Tv_special
     build_collection: false
-    item_overlay: english_4k
-    item_metadata_language: en-US
-    item_label: 4K
-  dl_german_english_hdr:
+    item_overlay: german_4k_hdr
+    # revert_overlay: true
+    item_metadata_language: de-DE
+  german_4k:
     plex_search:
       all:
-        resolution: 1080
-        hdr: true
-        audio_language:
-          - Deutsch
-          - English
+        resolution: 4K
+        hdr: false
+        audio_language: de
         audio_language.not:
-          - Français
-          - 日本語
-          - 中文
-          - 한국어
-          - हिन्दी, हिंदी
-          - తెలుగు
-          - Dansk
-          - русский язык
-          - Español
-          - Nederlands
+          - en
+        label.not:
+          - Tv_special
     build_collection: false
-    item_overlay: dl_german_english_hdr
+    item_overlay: german_4k
+    # revert_overlay: true
     item_metadata_language: de-DE
-    item_label: 4K
   german_hdr:
     plex_search:
       all:
         resolution: 1080
         hdr: true
-        audio_language: Deutsch
+        audio_language: de
         audio_language.not:
-          - English
-          - Français
-          - 日本語
-          - 中文
-          - 한국어
-          - हिन्दी, हिंदी
-          - తెలుగు
-          - Dansk
-          - русский язык
-          - Español
-          - Nederlands
+          - en
+        label.not:
+          - Tv_special
     build_collection: false
     item_overlay: german_hdr
+    # revert_overlay: true
     item_metadata_language: de-DE
-    item_label: 4K
-  english_hdr:
+
+  dl_chinese_french:
     plex_search:
       all:
-        resolution: 1080
-        hdr: true
-        audio_language: English
-        audio_language.not:
-          - Deutsch
-          - Français
-          - 日本語
-          - 中文
-          - 한국어
-          - हिन्दी, हिंदी
-          - తెలుగు
-          - Dansk
-          - русский язык
-          - Español
-          - Nederlands
+        label.not: 
+          - Tv_special
+        audio_language:
+          - zh
+          - fr
     build_collection: false
-    item_overlay: english_hdr
+    item_overlay: dl_chinese_french
+    # revert_overlay: true
     item_metadata_language: en-US
-    item_label: 4K
-
-  dl_german_english:
+  dl_english_chinese:
     plex_search:
       all:
-        label.not: 4K
+        label.not: 
+          - Tv_special
         audio_language:
-          - Deutsch
-          - English
-        audio_language.not:
-          - Français
-          - 日本語
-          - 中文
-          - 한국어
-          - हिन्दी, हिंदी
-          - తెలుగు
-          - Dansk
-          - русский язык
-          - Español
-          - Nederlands
+          - en
+          - zh
     build_collection: false
-    item_overlay: dl_german_english
-    item_metadata_language: de-DE
-  dl_german_french:
+    item_overlay: dl_english_chinese
+    # revert_overlay: true
+    item_metadata_language: en-US
+  dl_english_danish:
     plex_search:
       all:
-        label.not: 4K
+        label.not: 
+          - Tv_special
         audio_language:
-          - Deutsch
-          - Français
-        audio_language.not:
-          - English
-          - 日本語
-          - 中文
-          - 한국어
-          - हिन्दी, हिंदी
-          - తెలుగు
-          - Dansk
-          - русский язык
-          - Español
-          - Nederlands
+          - en
+          - da
     build_collection: false
-    item_overlay: dl_german_french
-    item_metadata_language: de-DE
-  dl_german_japanese:
+    item_overlay: dl_english_danish
+    # revert_overlay: true
+    item_metadata_language: en-US
+  dl_english_dutch:
     plex_search:
       all:
-        label.not: 4K
+        label.not: 
+          - Tv_special
         audio_language:
-          - Deutsch
-          - 日本語
-        audio_language.not:
-          - English
-          - Français
-          - 中文
-          - 한국어
-          - हिन्दी, हिंदी
-          - తెలుగు
-          - Dansk
-          - русский язык
-          - Español
-          - Nederlands
+          - en
+          - nl
     build_collection: false
-    item_overlay: dl_german_japanese
-    item_metadata_language: de-DE
-  dl_german_chinese:
+    item_overlay: dl_english_dutch
+    # revert_overlay: true
+    item_metadata_language: en-US
+  dl_english_french:
     plex_search:
       all:
-        label.not: 4K
+        label.not: 
+          - Tv_special
         audio_language:
-          - Deutsch
-          - 中文
-        audio_language.not:
-          - English
-          - Français
-          - 日本語
-          - 한국어
-          - हिन्दी, हिंदी
-          - తెలుగు
-          - Dansk
-          - русский язык
-          - Español
-          - Nederlands
+          - en
+          - fr
     build_collection: false
-    item_overlay: dl_german_chinese
-    item_metadata_language: de-DE
-  dl_german_korean:
+    item_overlay: dl_english_french
+    # revert_overlay: true
+    item_metadata_language: en-US
+  dl_english_indian:
     plex_search:
       all:
-        label.not: 4K
+        label.not: 
+          - Tv_special
         audio_language:
-          - Deutsch
-          - 한국어
-        audio_language.not:
-          - English
-          - Français
-          - 日本語
-          - 中文
-          - हिन्दी, हिंदी
-          - తెలుగు
-          - Dansk
-          - русский язык
-          - Español
-          - Nederlands
+          - en
+        any:
+          audio_language:
+            - hi
+            - te
     build_collection: false
-    item_overlay: dl_german_korean
+    item_overlay: dl_english_indian
+    # revert_overlay: true
+    item_metadata_language: en-US
+  dl_english_iranian:
+    plex_search:
+      all:
+        label.not: 
+          - Tv_special
+        audio_language:
+          - en
+          - fa
+    build_collection: false
+    item_overlay: dl_english_iranian
+    # revert_overlay: true
+    item_metadata_language: en-US
+  dl_english_italian:
+    plex_search:
+      all:
+        label.not: 
+          - Tv_special
+        audio_language:
+          - en
+          - it
+    build_collection: false
+    item_overlay: dl_english_italian
+    # revert_overlay: true
+    item_metadata_language: en-US
+  dl_english_japanese:
+    plex_search:
+      all:
+        label.not: 
+          - Tv_special
+        audio_language:
+          - en
+          - ja
+    build_collection: false
+    item_overlay: dl_english_japanese
+    # revert_overlay: true
+    item_metadata_language: en-US
+  dl_english_korean:
+    plex_search:
+      all:
+        label.not: 
+          - Tv_special
+        audio_language:
+          - en
+          - ko
+    build_collection: false
+    item_overlay: dl_english_korean
+    # revert_overlay: true
+    item_metadata_language: en-US
+  dl_english_russian:
+    plex_search:
+      all:
+        label.not: 
+          - Tv_special
+        audio_language:
+          - en
+          - ru
+    build_collection: false
+    item_overlay: dl_english_russian
+    # revert_overlay: true
+    item_metadata_language: en-US
+  dl_english_spanish:
+    plex_search:
+      all:
+        label.not: 
+          - Tv_special
+        audio_language:
+          - en
+          - es
+    build_collection: false
+    item_overlay: dl_english_spanish
+    # revert_overlay: true
+    item_metadata_language: en-US
+  # dl_english_swedish:
+  #   plex_search:
+  #     all:
+  #       label.not: 
+  #         - Tv_special
+  #       audio_language:
+  #         - en
+  #         - sv
+  #   build_collection: false
+  #   item_overlay: dl_english_swedish
+  #   # revert_overlay: true
+  #   item_metadata_language: en-US
+  dl_english_thai:
+    plex_search:
+      all:
+        label.not: 
+          - Tv_special
+        audio_language:
+          - en
+          - th
+    build_collection: false
+    item_overlay: dl_english_thai
+    # revert_overlay: true
+    item_metadata_language: en-US
+  dl_french_danish:
+    plex_search:
+      all:
+        label.not: 
+          - Tv_special
+        audio_language:
+          - fr
+          - da
+    build_collection: false
+    item_overlay: dl_french_danish
+    # revert_overlay: true
+    item_metadata_language: en-US
+  dl_german_chinese:
+    plex_search:
+      all:
+        label.not: 
+          - Tv_special
+        audio_language:
+          - de
+          - zh
+    build_collection: false
+    item_overlay: dl_german_chinese
+    # revert_overlay: true
     item_metadata_language: de-DE
   dl_german_danish:
     plex_search:
       all:
-        label.not: 4K
+        label.not: 
+          - Tv_special
         audio_language:
-          - Deutsch
-          - Dansk
-        audio_language.not:
-          - English
-          - Français
-          - 日本語
-          - 中文
-          - 한국어
-          - हिन्दी, हिंदी
-          - తెలుగు
-          - русский язык
-          - Español
-          - Nederlands
+          - de
+          - da
     build_collection: false
     item_overlay: dl_german_danish
+    # revert_overlay: true
     item_metadata_language: de-DE
-  dl_german_russian:
+  dl_german_dutch:
     plex_search:
       all:
-        label.not: 4K
+        label.not: 
+          - Tv_special
         audio_language:
-          - Deutsch
-          - русский язык
-        audio_language.not:
-          - English
-          - Français
-          - 日本語
-          - 中文
-          - 한국어
-          - हिन्दी, हिंदी
-          - తెలుగు
-          - Dansk
-          - Español
-          - Nederlands
+          - de
+          - nl
     build_collection: false
-    item_overlay: dl_german_russian
+    item_overlay: dl_german_dutch
+    # revert_overlay: true
     item_metadata_language: de-DE
-  dl_german_spanish:
+  dl_german_english:
     plex_search:
       all:
-        label.not: 4K
+        label.not: 
+          - Tv_special
         audio_language:
-          - Deutsch
-          - Español
-        audio_language.not:
-          - English
-          - Français
-          - 日本語
-          - 中文
-          - 한국어
-          - हिन्दी, हिंदी
-          - తెలుగు
-          - Dansk
-          - русский язык
-          - Nederlands
+          - de
+          - en
     build_collection: false
-    item_overlay: dl_german_spanish
+    item_overlay: dl_german_english
+    # revert_overlay: true
     item_metadata_language: de-DE
-  dl_german_dutch:
+  dl_german_french:
     plex_search:
       all:
-        label.not: 4K
+        label.not: 
+          - Tv_special
         audio_language:
-          - Deutsch
-          - Nederlands
-        audio_language.not:
-          - English
-          - Français
-          - 日本語
-          - 中文
-          - 한국어
-          - हिन्दी, हिंदी
-          - తెలుగు
-          - Dansk
-          - русский язык
-          - Español
+          - de
+          - fr
     build_collection: false
-    item_overlay: dl_german_dutch
+    item_overlay: dl_german_french
+    # revert_overlay: true
     item_metadata_language: de-DE
   dl_german_indian:
     plex_search:
       all:
-        label.not: 4K
+        label.not: 
+          - Tv_special
         audio_language:
-          - Deutsch
+          - de
         any:
           audio_language:
-            - हिन्दी, हिंदी
-            - తెలుగు
-        audio_language.not:
-          - English
-          - Français
-          - 日本語
-          - 中文
-          - 한국어
-          - Dansk
-          - русский язык
-          - Español
-          - Nederlands
+            - hi
+            - te
     build_collection: false
     item_overlay: dl_german_indian
+    # revert_overlay: true
     item_metadata_language: de-DE
-  dl_english_japanese:
+  dl_german_iranian:
     plex_search:
       all:
-        label.not: 4K
+        label.not: 
+          - Tv_special
         audio_language:
-          - English
-          - 日本語
-        audio_language.not:
-          - Deutsch
-          - Français
-          - 中文
-          - 한국어
-          - हिन्दी, हिंदी
-          - తెలుగు
-          - Dansk
-          - русский язык
-          - Español
-          - Nederlands
+          - de
+          - fa
     build_collection: false
-    item_overlay: dl_english_japanese
-    item_metadata_language: en-US
-  dl_english_chinese:
+    item_overlay: dl_german_iranian
+    # revert_overlay: true
+    item_metadata_language: de-DE
+  dl_german_italian:
     plex_search:
       all:
-        label.not: 4K
+        label.not: 
+          - Tv_special
         audio_language:
-          - English
-          - 中文
-        audio_language.not:
-          - Deutsch
-          - Français
-          - 日本語
-          - 한국어
-          - हिन्दी, हिंदी
-          - తెలుగు
-          - Dansk
-          - русский язык
-          - Español
-          - Nederlands
+          - de
+          - it
     build_collection: false
-    item_overlay: dl_english_chinese
-  dl_english_korean:
+    item_overlay: dl_german_italian
+    # revert_overlay: true
+    item_metadata_language: de-DE
+  dl_german_japanese:
     plex_search:
       all:
-        label.not: 4K
+        label.not: 
+          - Tv_special
         audio_language:
-          - English
-          - 한국어
-        audio_language.not:
-          - Deutsch
-          - Français
-          - 日本語
-          - 中文
-          - हिन्दी, हिंदी
-          - తెలుగు
-          - Dansk
-          - русский язык
-          - Español
-          - Nederlands
+          - de
+          - ja
     build_collection: false
-    item_overlay: dl_english_korean
-    item_metadata_language: en-US
-  dl_english_french:
+    item_overlay: dl_german_japanese
+    # revert_overlay: true
+    item_metadata_language: de-DE
+  dl_german_korean:
     plex_search:
       all:
-        label.not: 4K
+        label.not: 
+          - Tv_special
         audio_language:
-          - English
-          - Français
-        audio_language.not:
-          - Deutsch
-          - 日本語
-          - 中文
-          - 한국어
-          - हिन्दी, हिंदी
-          - తెలుగు
-          - Dansk
-          - русский язык
-          - Español
-          - Nederlands
+          - de
+          - ko
     build_collection: false
-    item_overlay: dl_english_french
-    item_metadata_language: en-US
-  dl_english_indian:
+    item_overlay: dl_german_korean
+    # revert_overlay: true
+    item_metadata_language: de-DE
+  dl_german_russian:
     plex_search:
       all:
-        label.not: 4K
+        label.not: 
+          - Tv_special
         audio_language:
-          - English
-        any:
-          audio_language:
-            - हिन्दी, हिंदी
-            - తెలుగు
-        audio_language.not:
-          - Deutsch
-          - Français
-          - 日本語
-          - 中文
-          - 한국어
-          - Dansk
-          - русский язык
-          - Español
-          - Nederlands
+          - de
+          - ru
     build_collection: false
-    item_overlay: dl_english_indian
-    item_metadata_language: en-US
-  dl_english_danish:
+    item_overlay: dl_german_russian
+    # revert_overlay: true
+    item_metadata_language: de-DE
+  dl_german_spanish:
     plex_search:
       all:
-        label.not: 4K
+        label.not: 
+          - Tv_special
         audio_language:
-          - English
-          - Dansk
-        audio_language.not:
-          - Deutsch
-          - Français
-          - 日本語
-          - 中文
-          - 한국어
-          - हिन्दी, हिंदी
-          - తెలుగు
-          - русский язык
-          - Español
-          - Nederlands
+          - de
+          - es
     build_collection: false
-    item_overlay: dl_english_danish
-    item_metadata_language: en-US
-  dl_english_russian:
+    item_overlay: dl_german_spanish
+    # revert_overlay: true
+    item_metadata_language: de-DE
+  # dl_german_swedish:
+  #   plex_search:
+  #     all:
+  #       label.not: 
+  #         - Tv_special
+  #       audio_language:
+  #         - de
+  #         - sv
+  #   build_collection: false
+  #   item_overlay: dl_german_swedish
+  #   # revert_overlay: true
+  #   item_metadata_language: de-DE
+  dl_german_thai:
+    plex_search:
+      all:
+        label.not: 
+          - Tv_special
+        audio_language:
+          - de
+          - th
+    build_collection: false
+    item_overlay: dl_german_thai
+    # revert_overlay: true
+    item_metadata_language: de-DE
+  dl_italian_thai:
     plex_search:
       all:
-        label.not: 4K
+        label.not: 
+          - Tv_special
         audio_language:
-          - English
-          - русский язык
-        audio_language.not:
-          - Deutsch
-          - Français
-          - 日本語
-          - 中文
-          - 한국어
-          - हिन्दी, हिंदी
-          - తెలుగు
-          - Dansk
-          - Español
-          - Nederlands
+          - it
+          - th
     build_collection: false
-    item_overlay: dl_english_russian
+    item_overlay: dl_italian_thai
+    # revert_overlay: true
     item_metadata_language: en-US
-  dl_english_spanish:
+  dl_japanese_chinese:
     plex_search:
       all:
-        label.not: 4K
+        label.not: 
+          - Tv_special
         audio_language:
-          - English
-          - Español
-        audio_language.not:
-          - Deutsch
-          - Français
-          - 日本語
-          - 中文
-          - 한국어
-          - हिन्दी, हिंदी
-          - తెలుగు
-          - Dansk
-          - русский язык
-          - Nederlands
+          - ja
+          - zh
     build_collection: false
-    item_overlay: dl_english_spanish
+    item_overlay: dl_japanese_chinese
+    # revert_overlay: true
     item_metadata_language: en-US
-  dl_english_dutch:
+  dl_korean_french:
     plex_search:
       all:
-        label.not: 4K
+        label.not: 
+          - Tv_special
         audio_language:
-          - English
-          - Nederlands
-        audio_language.not:
-          - Deutsch
-          - Français
-          - 日本語
-          - 中文
-          - 한국어
-          - हिन्दी, हिंदी
-          - తెలుగు
-          - Dansk
-          - русский язык
-          - Español
+          - ko
+          - fr
     build_collection: false
-    item_overlay: dl_english_dutch
+    item_overlay: dl_korean_french
+    # revert_overlay: true
     item_metadata_language: en-US
 
-  german:
-    plex_search:
-      all:
-        label.not: 4K
-        audio_language: Deutsch
-        audio_language.not:
-          - English
-          - Français
-          - 日本語
-          - 中文
-          - 한국어
-          - हिन्दी, हिंदी
-          - తెలుగు
-          - Dansk
-          - русский язык
-          - Español
-          - Nederlands
-    build_collection: false
-    item_overlay: german
-    item_metadata_language: de-DE
-  english:
+  chinese:
     plex_search:
       all:
-        label.not: 4K
-        audio_language: English
-        audio_language.not:
-          - Deutsch
-          - Français
-          - 日本語
-          - 中文
-          - 한국어
-          - हिन्दी, हिंदी
-          - తెలుగు
-          - Dansk
-          - русский язык
-          - Español
-          - Nederlands
+        label.not: 
+          - Tv_special
+        audio_language: zh
+        audio_language.not:
+          - da
+          - de
+          - en
+          - es
+          - fa
+          - fr
+          - hi
+          - it
+          - ja
+          - ko
+          - nl
+          - ru
+          - te
+          - th
     build_collection: false
-    item_overlay: english
+    item_overlay: chinese
+    # revert_overlay: true
     item_metadata_language: en-US
-  french:
+  danish:
     plex_search:
       all:
-        label.not: 4K
-        audio_language: Français
-        audio_language.not:
-          - Deutsch
-          - English
-          - 日本語
-          - 中文
-          - 한국어
-          - हिन्दी, हिंदी
-          - తెలుగు
-          - Dansk
-          - русский язык
-          - Español
-          - Nederlands
+        label.not: 
+          - Tv_special
+        audio_language: da
+        audio_language.not:
+          - de
+          - en
+          - es
+          - fa
+          - fr
+          - hi
+          - it
+          - ja
+          - ko
+          - nl
+          - ru
+          - te
+          - th
+          - zh
     build_collection: false
-    item_overlay: french
+    item_overlay: danish
+    # revert_overlay: true
     item_metadata_language: en-US
-  japanese:
+  dutch:
     plex_search:
       all:
-        label.not: 4K
-        audio_language: 日本語
-        audio_language.not:
-          - Deutsch
-          - English
-          - Français
-          - 中文
-          - 한국어
-          - हिन्दी, हिंदी
-          - తెలుగు
-          - Dansk
-          - русский язык
-          - Español
-          - Nederlands
+        label.not: 
+          - Tv_special
+        audio_language: nl
+        audio_language.not:
+          - da
+          - de
+          - en
+          - es
+          - fa
+          - fr
+          - hi
+          - it
+          - ja
+          - ko
+          - ru
+          - te
+          - th
+          - zh
     build_collection: false
-    item_overlay: japanese
+    item_overlay: dutch
+    # revert_overlay: true
     item_metadata_language: en-US
-  chinese:
+  english:
     plex_search:
       all:
-        label.not: 4K
-        audio_language: 中文
-        audio_language.not:
-          - Deutsch
-          - English
-          - Français
-          - 日本語
-          - 한국어
-          - हिन्दी, हिंदी
-          - తెలుగు
-          - Dansk
-          - русский язык
-          - Español
-          - Nederlands
+        label.not: 
+          - Tv_special
+        audio_language: en
+        audio_language.not:
+          - da
+          - de
+          - es
+          - fa
+          - fr
+          - hi
+          - it
+          - ja
+          - ko
+          - nl
+          - ru
+          - te
+          - th
+          - zh
     build_collection: false
-    item_overlay: chinese
+    item_overlay: english
+    # revert_overlay: true
     item_metadata_language: en-US
-  korean:
+  french:
     plex_search:
       all:
-        label.not: 4K
-        audio_language: 한국어
-        audio_language.not:
-          - Deutsch
-          - English
-          - Français
-          - 日本語
-          - 中文
-          - हिन्दी, हिंदी
-          - తెలుగు
-          - Dansk
-          - русский язык
-          - Español
-          - Nederlands
+        label.not: 
+          - Tv_special
+        audio_language: fr
+        audio_language.not:
+          - da
+          - de
+          - en
+          - es
+          - fa
+          - hi
+          - it
+          - ja
+          - ko
+          - nl
+          - ru
+          - te
+          - th
+          - zh
     build_collection: false
-    item_overlay: korean
+    item_overlay: french
+    # revert_overlay: true
     item_metadata_language: en-US
-  danish:
+  german:
     plex_search:
       all:
-        label.not: 4K
-        audio_language: Dansk
-        audio_language.not:
-          - Deutsch
-          - English
-          - Français
-          - 日本語
-          - 中文
-          - 한국어
-          - हिन्दी, हिंदी
-          - తెలుగు
-          - русский язык
-          - Español
-          - Nederlands
+        label.not: 
+          - Tv_special
+        audio_language: de
+        audio_language.not:
+          - da
+          - en
+          - es
+          - fa
+          - fr
+          - hi
+          - it
+          - ja
+          - ko
+          - nl
+          - ru
+          - te
+          - th
+          - zh
     build_collection: false
-    item_overlay: danish
-    item_metadata_language: en-US
+    item_overlay: german
+    # revert_overlay: true
+    item_metadata_language: de-DE
   indian:
     plex_search:
       all:
-        label.not: 4K
+        label.not: 
+          - Tv_special
         any:
           audio_language:
-            - हिन्दी, हिंदी
-            - తెలుగు
-        audio_language.not:
-          - Deutsch
-          - English
-          - Français
-          - 日本語
-          - 中文
-          - 한국어
-          - Dansk
-          - русский язык
-          - Español
-          - Nederlands
+            - hi
+            - te
+        audio_language.not:
+          - da
+          - de
+          - en
+          - es
+          - fa
+          - fr
+          - it
+          - ja
+          - ko
+          - nl
+          - ru
+          - th
+          - zh
     build_collection: false
     item_overlay: indian
+    # revert_overlay: true
+    item_metadata_language: en-US
+  iranian:
+    plex_search:
+      all:
+        label.not: 
+          - Tv_special
+        audio_language: fa
+        audio_language.not:
+          - da
+          - de
+          - en
+          - es
+          - fr
+          - ja
+          - hi
+          - it
+          - ko
+          - nl
+          - ru
+          - te
+          - th
+          - zh
+    build_collection: false
+    item_overlay: iranian
+    # revert_overlay: true
+    item_metadata_language: en-US
+  italian:
+    plex_search:
+      all:
+        label.not: 
+          - Tv_special
+        audio_language: it
+        audio_language.not:
+          - da
+          - de
+          - en
+          - es
+          - fa
+          - fr
+          - hi
+          - ja
+          - ko
+          - nl
+          - ru
+          - te
+          - th
+          - zh
+    build_collection: false
+    item_overlay: italian
+    # revert_overlay: true
+    item_metadata_language: en-US
+  japanese:
+    plex_search:
+      all:
+        label.not: 
+          - Tv_special
+        audio_language: ja
+        audio_language.not:
+          - da
+          - de
+          - en
+          - es
+          - fa
+          - fr
+          - hi
+          - it
+          - ko
+          - nl
+          - ru
+          - te
+          - th
+          - zh
+    build_collection: false
+    item_overlay: japanese
+    # revert_overlay: true
+    item_metadata_language: en-US
+  korean:
+    plex_search:
+      all:
+        label.not: 
+          - Tv_special
+        audio_language: ko
+        audio_language.not:
+          - da
+          - de
+          - en
+          - es
+          - fa
+          - fr
+          - hi
+          - it
+          - ja
+          - nl
+          - ru
+          - te
+          - th
+          - zh
+    build_collection: false
+    item_overlay: korean
+    # revert_overlay: true
     item_metadata_language: en-US
   russian:
     plex_search:
       all:
-        label.not: 4K
-        audio_language: русский язык
-        audio_language.not:
-          - Deutsch
-          - English
-          - Français
-          - 日本語
-          - 中文
-          - 한국어
-          - हिन्दी, हिंदी
-          - తెలుగు
-          - Dansk
-          - Español
-          - Nederlands
+        label.not: 
+          - Tv_special
+        audio_language: ru
+        audio_language.not:
+          - da
+          - de
+          - en
+          - es
+          - fa
+          - fr
+          - hi
+          - it
+          - ja
+          - ko
+          - nl
+          - te
+          - th
+          - zh
     build_collection: false
     item_overlay: russian
+    # revert_overlay: true
     item_metadata_language: en-US
   spanish:
     plex_search:
       all:
-        label.not: 4K
-        audio_language: Español
-        audio_language.not:
-          - Deutsch
-          - English
-          - Français
-          - 日本語
-          - 中文
-          - 한국어
-          - हिन्दी, हिंदी
-          - తెలుగు
-          - Dansk
-          - русский язык
-          - Nederlands
+        label.not: 
+          - Tv_special
+        audio_language: es
+        audio_language.not:
+          - da
+          - de
+          - en
+          - fa
+          - fr
+          - hi
+          - it
+          - ja
+          - ko
+          - nl
+          - ru
+          - te
+          - th
+          - zh
     build_collection: false
     item_overlay: spanish
+    # revert_overlay: true
     item_metadata_language: en-US
-  dutch:
-    plex_search:
-      all:
-        label.not: 4K
-        audio_language: Nederlands
-        audio_language.not:
-          - Deutsch
-          - English
-          - Français
-          - 日本語
-          - 中文
-          - 한국어
-          - हिन्दी, हिंदी
-          - తెలుగు
-          - Dansk
-          - русский язык
-          - Español
-    build_collection: false
-    item_overlay: dutch
+  # swedish:
+  #   plex_search:
+  #     all:
+  #       label.not: 
+  #         - Tv_special
+  #       audio_language: sv
+  #       audio_language.not:
+  #         - da
+  #         - de
+  #         - en
+  #         - es
+  #         - fa
+  #         - fr
+  #         - hi
+  #         - it
+  #         - ja
+  #         - ko
+  #         - nl
+  #         - ru
+  #         - te
+  #         - th
+  #         - zh
+  #   build_collection: false
+  #   item_overlay: swedish
+  #   # revert_overlay: true
+  #   item_metadata_language: en-US
+  thai:
+    plex_search:
+      all:
+        label.not: 
+          - Tv_special
+        audio_language: th
+        audio_language.not:
+          - da
+          - de
+          - en
+          - fa
+          - fr
+          - hi
+          - it
+          - ja
+          - ko
+          - nl
+          - ru
+          - te
+          - zh
+    build_collection: false
+    item_overlay: thai
+    # revert_overlay: true
     item_metadata_language: en-US
diff --git a/cpt-kuesel/metadata/movies/serien.yml b/cpt-kuesel/metadata/movies/serien.yml
new file mode 100644
index 0000000..0d1e5b5
--- /dev/null
+++ b/cpt-kuesel/metadata/movies/serien.yml
@@ -0,0 +1,12 @@
+### Single Movies that belong to a Show will be put in a hidden collection 
+### in order to link them together in the Overview when you scroll down.
+
+templates:
+  Movie:
+    tmdb_movie: <<movie>>
+    collection_mode: hide
+    sort_title: <<collection_name>>
+
+collections:
+  What We Do in the Shadows:
+    template: {name: Movie, movie: 246741}
\ No newline at end of file
diff --git a/cpt-kuesel/metadata/tv_shows/Serien.yml b/cpt-kuesel/metadata/tv_shows/Serien.yml
index 8c9167e..937ff9d 100644
--- a/cpt-kuesel/metadata/tv_shows/Serien.yml
+++ b/cpt-kuesel/metadata/tv_shows/Serien.yml
@@ -17,15 +17,11 @@ collections:
     smart_label: year.asc
     sort_title: +2_1_In Association With Marvel
   Marvel Cinematic Universe:
-    template: {name: Show, show: "362392, 362496, 362472"}
+    template: {name: Show, show: "362392, 362496, 362472, 367147"}
     smart_label: year.asc
     sort_title: +2_2_Marvel Cinematic Universe
   Penny Dreadful:
     template: {name: Show, show: "265766, 360892"}
-  Star Wars:
-    template: {name: Show, show: "83268, 361753, 385376"}
-    smart_label: year.asc
-    sort_title: +2_3_Star Wars
   Stargate:
     template: {name: Show, show: "72449, 70851, 83237, 339552"}
   What We Do in the Shadows:
diff --git a/cpt-kuesel/metadata/tv_shows/Shows (4k).yml b/cpt-kuesel/metadata/tv_shows/Shows.yml
similarity index 100%
rename from cpt-kuesel/metadata/tv_shows/Shows (4k).yml
rename to cpt-kuesel/metadata/tv_shows/Shows.yml
diff --git a/cpt-kuesel/metadata/tv_shows/filme.yml b/cpt-kuesel/metadata/tv_shows/filme.yml
new file mode 100644
index 0000000..f03dd09
--- /dev/null
+++ b/cpt-kuesel/metadata/tv_shows/filme.yml
@@ -0,0 +1,12 @@
+### Shows that have Movies will be put in a hidden collection 
+### in order to link them together in the Overview when you scroll down.
+
+templates:
+  Show:
+    tvdb_show: <<show>>
+    collection_mode: hide
+    sort_title: <<collection_name>>
+
+collections:
+  Psych:
+    template: {name: Show, show: 79335}
\ No newline at end of file
diff --git a/cpt-kuesel/metadata/tv_shows/overlays.yml b/cpt-kuesel/metadata/tv_shows/overlays.yml
index 0550c45..e74173a 100644
--- a/cpt-kuesel/metadata/tv_shows/overlays.yml
+++ b/cpt-kuesel/metadata/tv_shows/overlays.yml
@@ -1,142 +1,141 @@
+### ISO-Language codes in this file:
+# de    | German
+# en    | English
+# fr    | French
+
 collections:
   dl_german_english:
     plex_search:
       all:
         audio_language:
-          - Deutsch
-          - English
-        audio_language.not:
-          - Français
+          - de
+          - en
     build_collection: false
     item_overlay: dl_german_english
-    test: true
+    item_metadata_language: de-DE
   dl_german_french:
     plex_search:
       all:
         audio_language:
-          - Deutsch
-          - Français
-        audio_language.not:
-          - English
+          - de
+          - fr
     build_collection: false
     item_overlay: dl_german_french
-    test: true
+    item_metadata_language: de-DE
   dl_english_french:
     plex_search:
       all:
         audio_language:
-          - English
-          - Français
-        audio_language.not:
-          - Deutsch
+          - en
+          - fr
     build_collection: false
     item_overlay: dl_english_french
-    test: true
+    item_metadata_language: en-US-US
 
   german:
     plex_search:
       all:
         audio_language:
-          - Deutsch
+          - de
         audio_language.not:
-          - English
-          - Français
+          - en
+          - fr
     build_collection: false
     item_overlay: german
-    test: true
+    item_metadata_language: de-DE
   english:
     plex_search:
       all:
         audio_language:
-          - English
+          - en
         audio_language.not:
-          - Deutsch
-          - Français
+          - de
+          - fr
     build_collection: false
     item_overlay: english
-    test: true
+    item_metadata_language: en-US-US
   french:
     plex_search:
       all:
         audio_language:
-          - Français
+          - fr
         audio_language.not:
-          - Deutsch
-          - English
+          - de
+          - en
     build_collection: false
     item_overlay: french
-    test: true
+    item_metadata_language: en-US-US
 
-  dl_german_english_episodes:
-    plex_search:
-      type: episodes
-      all:
-        audio_language:
-          - Deutsch
-          - English
-        audio_language.not:
-          - Français
-    build_collection: false
-    item_overlay: dl_german_english
-    test: true
-  dl_german_french_episodes:
-    plex_search:
-      type: episodes
-      all:
-        audio_language:
-          - Deutsch
-          - Français
-        audio_language.not:
-          - English
-    build_collection: false
-    item_overlay: dl_german_french
-    test: true
-  dl_english_french_episodes:
-    plex_search:
-      type: episodes
-      all:
-        audio_language:
-          - English
-          - Français
-        audio_language.not:
-          - Deutsch
-    build_collection: false
-    item_overlay: dl_english_french
-    test: true
+  # dl_german_english_episodes:
+  #   plex_search:
+  #     type: episodes
+  #     all:
+  #       audio_language:
+  #         - de
+  #         - en
+  #   build_collection: false
+  #   item_overlay: dl_german_english
+  #   item_metadata_language: de-DE
+  #   test: true
+  # dl_german_french_episodes:
+  #   plex_search:
+  #     type: episodes
+  #     all:
+  #       audio_language:
+  #         - de
+  #         - fr
+  #   build_collection: false
+  #   item_overlay: dl_german_french
+  #   item_metadata_language: de-DE
+  #   test: true
+  # dl_english_french_episodes:
+  #   plex_search:
+  #     type: episodes
+  #     all:
+  #       audio_language:
+  #         - en
+  #         - fr
+  #   build_collection: false
+  #   item_overlay: dl_english_french
+  #   item_metadata_language: en-US-US
+  #   test: true
 
-  german_episodes:
-    plex_search:
-      type: episodes
-      all:
-        audio_language:
-          - Deutsch
-        audio_language.not:
-          - English
-          - Français
-    build_collection: false
-    item_overlay: german
-    test: true
-  english_episodes:
-    plex_search:
-      type: episodes
-      all:
-        audio_language:
-          - English
-        audio_language.not:
-          - Deutsch
-          - Français
-    build_collection: false
-    item_overlay: english
-    test: true
-  french_episodes:
-    plex_search:
-      type: episodes
-      all:
-        audio_language:
-          - Français
-        audio_language.not:
-          - Deutsch
-          - English
-    build_collection: false
-    item_overlay: french
-    test: true
+  # german_episodes:
+  #   plex_search:
+  #     type: episodes
+  #     all:
+  #       audio_language:
+  #         - de
+  #       audio_language.not:
+  #         - en
+  #         - fr
+  #   build_collection: false
+  #   item_overlay: german
+  #   item_metadata_language: de-DE
+  #   test: true
+  # english_episodes:
+  #   plex_search:
+  #     type: episodes
+  #     all:
+  #       audio_language:
+  #         - en
+  #       audio_language.not:
+  #         - de
+  #         - fr
+  #   build_collection: false
+  #   item_overlay: english
+  #   item_metadata_language: en-US-US
+  #   test: true
+  # french_episodes:
+  #   plex_search:
+  #     type: episodes
+  #     all:
+  #       audio_language:
+  #         - fr
+  #       audio_language.not:
+  #         - de
+  #         - en
+  #   build_collection: false
+  #   item_overlay: french
+  #   item_metadata_language: en-US-US
+  #   test: true
diff --git a/cpt-kuesel/pmm_folder_structure.png b/cpt-kuesel/pmm_folder_structure.png
index 211cafb..c339c53 100644
Binary files a/cpt-kuesel/pmm_folder_structure.png and b/cpt-kuesel/pmm_folder_structure.png differ