diff --git a/cpt-kuesel/README.md b/cpt-kuesel/README.md
index 587fc95..c6c5ccc 100644
--- a/cpt-kuesel/README.md
+++ b/cpt-kuesel/README.md
@@ -18,21 +18,26 @@ I run PMM with docker-compose:
 <br>
 
 ## WIP Notice & Instructions
-Version required: v1.17.1 (latest)
+Version required: v1.17.3
 
-I am still not finished but here are my new language overlays.
+I overhauled my language overlays yet again.
+Instead of big flags, I now use small flags with the language written beside the flag.
 
 My suggestion is downloading the required files and run them local, as I have not yet worked in to run them from the configs repo.
-Also that way you can fine tune more to what you want.
+Also that way you can fine tune it all to your specific needs.
 
 <br>
 
 Here is a short explanation on how to get them working and how to customize:
 
-My approach was to separate all different aspects of it into individual files.
+My approach was to separate different aspects of it into individual files.
 
 They are:
 
+  - _OverlayPacks/*
+
+    | I generated 3 Packs to choose from: german, english and two letter language codes ISO 639-2. Take the files you want to use and put them in the folder *overlays/_flags* to use with my config
+
   - metadata/admin/_switches.yml
 
     | Switch specific overlays on using template_variables in config.yml, as they all default to false initially.
@@ -41,41 +46,25 @@ They are:
 
     | Contains all templates used in my files, not necessarily specific to overlays.
 
-    | Templates used in overlay files are `ol_builder` and `it_items`.
+    | 'flag_overlays' is the template used.
 
   - metadata/admin/core.yml
 
-    | Create a collection with all used labels, switch metadata languages for items and add a label to 4k/HDR content.
-
-    | Also toggable via template_variables in config.yml
+    | Use collections to switch metadata languages for items.
 
   - overlays/admin/queues.yml
 
-    | Contains all queues used in my overlays and a pseudo overlay builder definition, which should not actually do something but was required to have a valid file.
+    | Contains the queue 'flags' used in my overlays and a pseudo overlay builder definition, which should not actually do something but was required to have a valid file.
 
   - overlays/flags.yml
 
     | Has all the overlay builders for the different languages.
 
-  - overlays/badges.yml
-
-    | Has a 4k and a HDR overlay builder.
-
-  - overlays/_posters/* | overlays/_posters/[183x113]/*
-
-    | In this folder are all the files used as overlay for Movies, Shows and Seasons with dimensions 250x150 or 183x113.
-    Choose the size you want to use and move them up in overlays/_posters.
-
-    | My configs use size 250x150.
+  - overlays/_flags/*
 
-  - overlays/_titlecards/*
+    | Put the overlay files you chose/created in this folder.
 
-    | In this folder are all the files used as overlay for Episodes with dimensions 240x180.
-
-I am using Overlay Queues and sorted all languages in my library according to my preference with weights accordingly.
-
-All queues apart from the default ones require their specific label on the Plex Item.
-You can add those manually or via another PMM collection builder using `item_label`.
+I am using Overlay Queues and sorted all languages in my library according to my preference with weights.
 
 <br>
 
@@ -83,56 +72,44 @@ Here is an example config:
 
 ```yaml
 x-movie_languages: &movie_languages
-  sw_german: true
-  sw_english: true
-  sw_french: true
-  sw_japanese: true
-  sw_korean: true
-  sw_chinese: true
-  sw_danish: true
-  sw_russian: true
-  sw_spanish: true
-  sw_italian: true
-  sw_portuguese: true
-  sw_hindi: true
-  sw_telugu: true
-  sw_farsi: true
-  sw_thai: true
-  sw_dutch: true
-  sw_norwegian: true
-  sw_icelandic: true
-  sw_turkish: true
-  sw_polish: true
-  sw_czech: true
-  sw_ukranian: true
-  sw_hungarian: true
+  use_german: true
+  use_english: true
+  use_french: true
+  use_japanese: true
+  use_korean: true
+  use_chinese: true
+  use_danish: true
+  use_russian: true
+  use_spanish: true
+  use_italian: true
+  use_portuguese: true
+  use_hindi: true
+  use_telugu: true
+  use_dutch: true
+  use_icelandic: true
+  use_turkish: true
+  use_ukranian: true
 x-show_languages: &show_languages
-  sw_german: true
-  sw_english: true
-  sw_french: true
-  sw_korean: true
-  sw_spanish: true
-  sw_swedish: true
+  use_german: true
+  use_english: true
+  use_french: true
+  use_korean: true
+  use_spanish: true
 x-anime_languages: &anime_languages
-  sw_german: true
-  sw_english: true
-  sw_french: true
-  sw_japanese: true
-  sw_korean: true
-  sw_spanish: true
-  sw_italian: true
-  sw_portuguese: true
-  sw_thai: true
-x-badges: &badges
-  sw_uhd: true
-  sw_hdr: true
+  use_german: true
+  use_english: true
+  use_french: true
+  use_japanese: true
+  use_korean: true
+  use_spanish: true
+  use_italian: true
+  use_portuguese: true
+  use_thai: true
 
 libraries:
   Movies:
     metadata_path:
       - file: metadata/admin/core
-        template_variables:
-          local_only: true
       - file: metadata/movies/metadata
       - file: metadata/movies/Collections
       - file: metadata/movies/Suggestions
@@ -142,63 +119,6 @@ libraries:
       - file: overlays/flags
         template_variables:
           <<: *movie_languages
-          ol_type: movie
-          ol_folder: _posters
-          ol_queue: default_portrait_flags
-      - file: overlays/badges
-        template_variables:
-          <<: *badges
-          ol_type: movie
-          ol_folder: _posters
-          ol_queue: default_portrait_badges
-      - file: overlays/flags
-        template_variables:
-          <<: *movie_languages
-          ol_type: movie
-          ol_folder: _posters
-          ol_queue: bottom_portrait_flags
-          it_queue: bottom
-          it_default: null
-      - file: overlays/badges
-        template_variables:
-          <<: *badges
-          ol_type: movie
-          ol_folder: _posters
-          ol_queue: bottom_portrait_badges
-          it_queue: bottom
-          it_default: null
-      - file: overlays/flags
-        template_variables:
-          <<: *movie_languages
-          ol_type: movie
-          ol_folder: _posters
-          ol_queue: up_corners_portrait_flags
-          it_queue: up_corners
-          it_default: null
-      - file: overlays/badges
-        template_variables:
-          <<: *badges
-          ol_type: movie
-          ol_folder: _posters
-          ol_queue: up_corners_portrait_badges
-          it_queue: up_corners
-          it_default: null
-      - file: overlays/flags
-        template_variables:
-          <<: *movie_languages
-          ol_type: movie
-          ol_folder: _posters
-          ol_queue: down_corners_portrait_flags
-          it_queue: down_corners
-          it_default: null
-      - file: overlays/badges
-        template_variables:
-          <<: *badges
-          ol_type: movie
-          ol_folder: _posters
-          ol_queue: down_corners_portrait_badges
-          it_queue: down_corners
-          it_default: null
     settings:
       asset_directory:
         - assets/movies/collections
@@ -208,8 +128,6 @@ libraries:
   Shows:
     metadata_path:
       - file: metadata/admin/core
-        template_variables:
-          local_only: true
       - file: metadata/shows/metadata
     overlay_path:
       - remove_overlays: false
@@ -218,54 +136,55 @@ libraries:
         template_variables:
           <<: *show_languages
           overlay_level: episode
-          ol_type: episode
-          ol_folder: _titlecards
-          ol_queue: default_landscape_flags
-      - file: overlays/badges
-        template_variables:
-          <<: *badges
-          overlay_level: episode
-          ol_type: episode
-          ol_folder: _titlecards
-          ol_queue: default_landscape_badges
       - file: overlays/flags
         template_variables:
           <<: *show_languages
           overlay_level: season
-          ol_type: season
-          ol_folder: _posters
-          ol_queue: default_portrait_flags
-      - file: overlays/badges
-        template_variables:
-          <<: *badges
-          overlay_level: season
-          ol_type: season
-          ol_folder: _posters
-          ol_queue: default_portrait_badges
       - file: overlays/flags
         template_variables:
           <<: *show_languages
-          ol_type: show
-          ol_folder: _posters
-          ol_queue: default_portrait_flags
-      - file: overlays/badges
-        template_variables:
-          <<: *badges
-          ol_type: show
-          ol_folder: _posters
-          ol_queue: default_portrait_badges
     settings:
       asset_directory:
         - assets/shows/collections
         - assets/shows/shows
+  Anime:
+    metadata_path:
+      - file: metadata/admin/core
+      - file: metadata/animes/metadata
+    overlay_path:
+      - remove_overlays: false
+      - file: overlays/admin/queues
+      - file: overlays/flags
+        template_variables:
+          <<: *anime_languages
+          overlay_level: episode
+      - file: overlays/flags
+        template_variables:
+          <<: *anime_languages
+          overlay_level: season
+      - file: overlays/flags
+        template_variables:
+          <<: *anime_languages
+    settings:
+      asset_directory:
+        - assets/animes/collections
+        - assets/animes/animes
 ```
 
-I know I need to properly explain more, but for the moment it is all I can think of.
-
 Feel free to ask me questions in the Discord or make suggestions on what I need to add here.
 
+<br>
+
+I added all files I used to create the overlays in the folder *__OverlayCreation*.
+
+The psd uses variables and datasets to be able to generate a batch quickly.
+
+    File->Export->Data-Sets as Files
+
+To convert the generated psd-files into png-files I use the application ImageMagick and provided a batch file in the export directory to take care of it.
+
+
 <br>
 
 ## Questions?
-You can always shoot me a question in the PMM Discord found on the main GitHub in the support section:
-https://github.com/meisnate12/Plex-Meta-Manager/tree/master#support
\ No newline at end of file
+You can always shoot me a question in the PMM Discord!
\ No newline at end of file
diff --git a/cpt-kuesel/_OverlayCreation/_posters.psd b/cpt-kuesel/_OverlayCreation/_posters.psd
deleted file mode 100644
index 9738732..0000000
Binary files a/cpt-kuesel/_OverlayCreation/_posters.psd and /dev/null differ
diff --git a/cpt-kuesel/_OverlayCreation/_posters_186x113.psd b/cpt-kuesel/_OverlayCreation/_posters_186x113.psd
deleted file mode 100644
index ee6a4d5..0000000
Binary files a/cpt-kuesel/_OverlayCreation/_posters_186x113.psd and /dev/null differ
diff --git a/cpt-kuesel/_OverlayCreation/_titlecards.psd b/cpt-kuesel/_OverlayCreation/_titlecards.psd
deleted file mode 100644
index 8b5876f..0000000
Binary files a/cpt-kuesel/_OverlayCreation/_titlecards.psd and /dev/null differ
diff --git a/cpt-kuesel/_OverlayPacks/ISO_639-2_lozenges/chinese.png b/cpt-kuesel/_OverlayPacks/ISO_639-2_lozenges/chinese.png
new file mode 100644
index 0000000..4a330c8
Binary files /dev/null and b/cpt-kuesel/_OverlayPacks/ISO_639-2_lozenges/chinese.png differ
diff --git a/cpt-kuesel/_OverlayPacks/ISO_639-2_lozenges/czech.png b/cpt-kuesel/_OverlayPacks/ISO_639-2_lozenges/czech.png
new file mode 100644
index 0000000..ab72e54
Binary files /dev/null and b/cpt-kuesel/_OverlayPacks/ISO_639-2_lozenges/czech.png differ
diff --git a/cpt-kuesel/_OverlayPacks/ISO_639-2_lozenges/danish.png b/cpt-kuesel/_OverlayPacks/ISO_639-2_lozenges/danish.png
new file mode 100644
index 0000000..144192a
Binary files /dev/null and b/cpt-kuesel/_OverlayPacks/ISO_639-2_lozenges/danish.png differ
diff --git a/cpt-kuesel/_OverlayPacks/ISO_639-2_lozenges/dutch.png b/cpt-kuesel/_OverlayPacks/ISO_639-2_lozenges/dutch.png
new file mode 100644
index 0000000..5b7d58d
Binary files /dev/null and b/cpt-kuesel/_OverlayPacks/ISO_639-2_lozenges/dutch.png differ
diff --git a/cpt-kuesel/_OverlayPacks/ISO_639-2_lozenges/english.png b/cpt-kuesel/_OverlayPacks/ISO_639-2_lozenges/english.png
new file mode 100644
index 0000000..0be4d04
Binary files /dev/null and b/cpt-kuesel/_OverlayPacks/ISO_639-2_lozenges/english.png differ
diff --git a/cpt-kuesel/_OverlayPacks/ISO_639-2_lozenges/farsi.png b/cpt-kuesel/_OverlayPacks/ISO_639-2_lozenges/farsi.png
new file mode 100644
index 0000000..37e8c27
Binary files /dev/null and b/cpt-kuesel/_OverlayPacks/ISO_639-2_lozenges/farsi.png differ
diff --git a/cpt-kuesel/_OverlayPacks/ISO_639-2_lozenges/french.png b/cpt-kuesel/_OverlayPacks/ISO_639-2_lozenges/french.png
new file mode 100644
index 0000000..eb3bbfd
Binary files /dev/null and b/cpt-kuesel/_OverlayPacks/ISO_639-2_lozenges/french.png differ
diff --git a/cpt-kuesel/_OverlayPacks/ISO_639-2_lozenges/german.png b/cpt-kuesel/_OverlayPacks/ISO_639-2_lozenges/german.png
new file mode 100644
index 0000000..89ac14e
Binary files /dev/null and b/cpt-kuesel/_OverlayPacks/ISO_639-2_lozenges/german.png differ
diff --git a/cpt-kuesel/_OverlayPacks/ISO_639-2_lozenges/hindi.png b/cpt-kuesel/_OverlayPacks/ISO_639-2_lozenges/hindi.png
new file mode 100644
index 0000000..9e83848
Binary files /dev/null and b/cpt-kuesel/_OverlayPacks/ISO_639-2_lozenges/hindi.png differ
diff --git a/cpt-kuesel/_OverlayPacks/ISO_639-2_lozenges/hungarian.png b/cpt-kuesel/_OverlayPacks/ISO_639-2_lozenges/hungarian.png
new file mode 100644
index 0000000..57a9a8c
Binary files /dev/null and b/cpt-kuesel/_OverlayPacks/ISO_639-2_lozenges/hungarian.png differ
diff --git a/cpt-kuesel/_OverlayPacks/ISO_639-2_lozenges/icelandic.png b/cpt-kuesel/_OverlayPacks/ISO_639-2_lozenges/icelandic.png
new file mode 100644
index 0000000..77b62c0
Binary files /dev/null and b/cpt-kuesel/_OverlayPacks/ISO_639-2_lozenges/icelandic.png differ
diff --git a/cpt-kuesel/_OverlayPacks/ISO_639-2_lozenges/italian.png b/cpt-kuesel/_OverlayPacks/ISO_639-2_lozenges/italian.png
new file mode 100644
index 0000000..2600eca
Binary files /dev/null and b/cpt-kuesel/_OverlayPacks/ISO_639-2_lozenges/italian.png differ
diff --git a/cpt-kuesel/_OverlayPacks/ISO_639-2_lozenges/japanese.png b/cpt-kuesel/_OverlayPacks/ISO_639-2_lozenges/japanese.png
new file mode 100644
index 0000000..75dd7a4
Binary files /dev/null and b/cpt-kuesel/_OverlayPacks/ISO_639-2_lozenges/japanese.png differ
diff --git a/cpt-kuesel/_OverlayPacks/ISO_639-2_lozenges/korean.png b/cpt-kuesel/_OverlayPacks/ISO_639-2_lozenges/korean.png
new file mode 100644
index 0000000..996ecb0
Binary files /dev/null and b/cpt-kuesel/_OverlayPacks/ISO_639-2_lozenges/korean.png differ
diff --git a/cpt-kuesel/_OverlayPacks/ISO_639-2_lozenges/norwegian.png b/cpt-kuesel/_OverlayPacks/ISO_639-2_lozenges/norwegian.png
new file mode 100644
index 0000000..0f820bf
Binary files /dev/null and b/cpt-kuesel/_OverlayPacks/ISO_639-2_lozenges/norwegian.png differ
diff --git a/cpt-kuesel/_OverlayPacks/ISO_639-2_lozenges/polish.png b/cpt-kuesel/_OverlayPacks/ISO_639-2_lozenges/polish.png
new file mode 100644
index 0000000..380e615
Binary files /dev/null and b/cpt-kuesel/_OverlayPacks/ISO_639-2_lozenges/polish.png differ
diff --git a/cpt-kuesel/_OverlayPacks/ISO_639-2_lozenges/portuguese.png b/cpt-kuesel/_OverlayPacks/ISO_639-2_lozenges/portuguese.png
new file mode 100644
index 0000000..c2b7df7
Binary files /dev/null and b/cpt-kuesel/_OverlayPacks/ISO_639-2_lozenges/portuguese.png differ
diff --git a/cpt-kuesel/_OverlayPacks/ISO_639-2_lozenges/russian.png b/cpt-kuesel/_OverlayPacks/ISO_639-2_lozenges/russian.png
new file mode 100644
index 0000000..e3ad32f
Binary files /dev/null and b/cpt-kuesel/_OverlayPacks/ISO_639-2_lozenges/russian.png differ
diff --git a/cpt-kuesel/_OverlayPacks/ISO_639-2_lozenges/spanish.png b/cpt-kuesel/_OverlayPacks/ISO_639-2_lozenges/spanish.png
new file mode 100644
index 0000000..6b89fcc
Binary files /dev/null and b/cpt-kuesel/_OverlayPacks/ISO_639-2_lozenges/spanish.png differ
diff --git a/cpt-kuesel/_OverlayPacks/ISO_639-2_lozenges/swedish.png b/cpt-kuesel/_OverlayPacks/ISO_639-2_lozenges/swedish.png
new file mode 100644
index 0000000..5490139
Binary files /dev/null and b/cpt-kuesel/_OverlayPacks/ISO_639-2_lozenges/swedish.png differ
diff --git a/cpt-kuesel/_OverlayPacks/ISO_639-2_lozenges/telugu.png b/cpt-kuesel/_OverlayPacks/ISO_639-2_lozenges/telugu.png
new file mode 100644
index 0000000..f1d3f31
Binary files /dev/null and b/cpt-kuesel/_OverlayPacks/ISO_639-2_lozenges/telugu.png differ
diff --git a/cpt-kuesel/_OverlayPacks/ISO_639-2_lozenges/thai.png b/cpt-kuesel/_OverlayPacks/ISO_639-2_lozenges/thai.png
new file mode 100644
index 0000000..635992d
Binary files /dev/null and b/cpt-kuesel/_OverlayPacks/ISO_639-2_lozenges/thai.png differ
diff --git a/cpt-kuesel/_OverlayPacks/ISO_639-2_lozenges/turkish.png b/cpt-kuesel/_OverlayPacks/ISO_639-2_lozenges/turkish.png
new file mode 100644
index 0000000..d5c21b5
Binary files /dev/null and b/cpt-kuesel/_OverlayPacks/ISO_639-2_lozenges/turkish.png differ
diff --git a/cpt-kuesel/_OverlayPacks/ISO_639-2_lozenges/ukrainian.png b/cpt-kuesel/_OverlayPacks/ISO_639-2_lozenges/ukrainian.png
new file mode 100644
index 0000000..a98f3d8
Binary files /dev/null and b/cpt-kuesel/_OverlayPacks/ISO_639-2_lozenges/ukrainian.png differ
diff --git a/cpt-kuesel/_OverlayPacks/english_lozenges/chinese.png b/cpt-kuesel/_OverlayPacks/english_lozenges/chinese.png
new file mode 100644
index 0000000..17dc396
Binary files /dev/null and b/cpt-kuesel/_OverlayPacks/english_lozenges/chinese.png differ
diff --git a/cpt-kuesel/_OverlayPacks/english_lozenges/czech.png b/cpt-kuesel/_OverlayPacks/english_lozenges/czech.png
new file mode 100644
index 0000000..5d80aac
Binary files /dev/null and b/cpt-kuesel/_OverlayPacks/english_lozenges/czech.png differ
diff --git a/cpt-kuesel/_OverlayPacks/english_lozenges/danish.png b/cpt-kuesel/_OverlayPacks/english_lozenges/danish.png
new file mode 100644
index 0000000..e7d837d
Binary files /dev/null and b/cpt-kuesel/_OverlayPacks/english_lozenges/danish.png differ
diff --git a/cpt-kuesel/_OverlayPacks/english_lozenges/dutch.png b/cpt-kuesel/_OverlayPacks/english_lozenges/dutch.png
new file mode 100644
index 0000000..8aba2cb
Binary files /dev/null and b/cpt-kuesel/_OverlayPacks/english_lozenges/dutch.png differ
diff --git a/cpt-kuesel/_OverlayPacks/english_lozenges/english.png b/cpt-kuesel/_OverlayPacks/english_lozenges/english.png
new file mode 100644
index 0000000..52fb4f9
Binary files /dev/null and b/cpt-kuesel/_OverlayPacks/english_lozenges/english.png differ
diff --git a/cpt-kuesel/_OverlayPacks/english_lozenges/farsi.png b/cpt-kuesel/_OverlayPacks/english_lozenges/farsi.png
new file mode 100644
index 0000000..3bf710d
Binary files /dev/null and b/cpt-kuesel/_OverlayPacks/english_lozenges/farsi.png differ
diff --git a/cpt-kuesel/_OverlayPacks/english_lozenges/french.png b/cpt-kuesel/_OverlayPacks/english_lozenges/french.png
new file mode 100644
index 0000000..e35751a
Binary files /dev/null and b/cpt-kuesel/_OverlayPacks/english_lozenges/french.png differ
diff --git a/cpt-kuesel/_OverlayPacks/english_lozenges/german.png b/cpt-kuesel/_OverlayPacks/english_lozenges/german.png
new file mode 100644
index 0000000..cab6126
Binary files /dev/null and b/cpt-kuesel/_OverlayPacks/english_lozenges/german.png differ
diff --git a/cpt-kuesel/_OverlayPacks/english_lozenges/hindi.png b/cpt-kuesel/_OverlayPacks/english_lozenges/hindi.png
new file mode 100644
index 0000000..2f3dae4
Binary files /dev/null and b/cpt-kuesel/_OverlayPacks/english_lozenges/hindi.png differ
diff --git a/cpt-kuesel/_OverlayPacks/english_lozenges/hungarian.png b/cpt-kuesel/_OverlayPacks/english_lozenges/hungarian.png
new file mode 100644
index 0000000..0d72f2d
Binary files /dev/null and b/cpt-kuesel/_OverlayPacks/english_lozenges/hungarian.png differ
diff --git a/cpt-kuesel/_OverlayPacks/english_lozenges/icelandic.png b/cpt-kuesel/_OverlayPacks/english_lozenges/icelandic.png
new file mode 100644
index 0000000..6450dfd
Binary files /dev/null and b/cpt-kuesel/_OverlayPacks/english_lozenges/icelandic.png differ
diff --git a/cpt-kuesel/_OverlayPacks/english_lozenges/italian.png b/cpt-kuesel/_OverlayPacks/english_lozenges/italian.png
new file mode 100644
index 0000000..99c265d
Binary files /dev/null and b/cpt-kuesel/_OverlayPacks/english_lozenges/italian.png differ
diff --git a/cpt-kuesel/_OverlayPacks/english_lozenges/japanese.png b/cpt-kuesel/_OverlayPacks/english_lozenges/japanese.png
new file mode 100644
index 0000000..4519d35
Binary files /dev/null and b/cpt-kuesel/_OverlayPacks/english_lozenges/japanese.png differ
diff --git a/cpt-kuesel/_OverlayPacks/english_lozenges/korean.png b/cpt-kuesel/_OverlayPacks/english_lozenges/korean.png
new file mode 100644
index 0000000..010df87
Binary files /dev/null and b/cpt-kuesel/_OverlayPacks/english_lozenges/korean.png differ
diff --git a/cpt-kuesel/_OverlayPacks/english_lozenges/norwegian.png b/cpt-kuesel/_OverlayPacks/english_lozenges/norwegian.png
new file mode 100644
index 0000000..df6ec99
Binary files /dev/null and b/cpt-kuesel/_OverlayPacks/english_lozenges/norwegian.png differ
diff --git a/cpt-kuesel/_OverlayPacks/english_lozenges/polish.png b/cpt-kuesel/_OverlayPacks/english_lozenges/polish.png
new file mode 100644
index 0000000..5b987e2
Binary files /dev/null and b/cpt-kuesel/_OverlayPacks/english_lozenges/polish.png differ
diff --git a/cpt-kuesel/_OverlayPacks/english_lozenges/portuguese.png b/cpt-kuesel/_OverlayPacks/english_lozenges/portuguese.png
new file mode 100644
index 0000000..0d9adec
Binary files /dev/null and b/cpt-kuesel/_OverlayPacks/english_lozenges/portuguese.png differ
diff --git a/cpt-kuesel/_OverlayPacks/english_lozenges/russian.png b/cpt-kuesel/_OverlayPacks/english_lozenges/russian.png
new file mode 100644
index 0000000..dbbdd62
Binary files /dev/null and b/cpt-kuesel/_OverlayPacks/english_lozenges/russian.png differ
diff --git a/cpt-kuesel/_OverlayPacks/english_lozenges/spanish.png b/cpt-kuesel/_OverlayPacks/english_lozenges/spanish.png
new file mode 100644
index 0000000..e101f4c
Binary files /dev/null and b/cpt-kuesel/_OverlayPacks/english_lozenges/spanish.png differ
diff --git a/cpt-kuesel/_OverlayPacks/english_lozenges/swedish.png b/cpt-kuesel/_OverlayPacks/english_lozenges/swedish.png
new file mode 100644
index 0000000..b8bfc53
Binary files /dev/null and b/cpt-kuesel/_OverlayPacks/english_lozenges/swedish.png differ
diff --git a/cpt-kuesel/_OverlayPacks/english_lozenges/telugu.png b/cpt-kuesel/_OverlayPacks/english_lozenges/telugu.png
new file mode 100644
index 0000000..d11c32f
Binary files /dev/null and b/cpt-kuesel/_OverlayPacks/english_lozenges/telugu.png differ
diff --git a/cpt-kuesel/_OverlayPacks/english_lozenges/thai.png b/cpt-kuesel/_OverlayPacks/english_lozenges/thai.png
new file mode 100644
index 0000000..a3f2700
Binary files /dev/null and b/cpt-kuesel/_OverlayPacks/english_lozenges/thai.png differ
diff --git a/cpt-kuesel/_OverlayPacks/english_lozenges/turkish.png b/cpt-kuesel/_OverlayPacks/english_lozenges/turkish.png
new file mode 100644
index 0000000..fb25301
Binary files /dev/null and b/cpt-kuesel/_OverlayPacks/english_lozenges/turkish.png differ
diff --git a/cpt-kuesel/_OverlayPacks/english_lozenges/ukrainian.png b/cpt-kuesel/_OverlayPacks/english_lozenges/ukrainian.png
new file mode 100644
index 0000000..6c28f07
Binary files /dev/null and b/cpt-kuesel/_OverlayPacks/english_lozenges/ukrainian.png differ
diff --git a/cpt-kuesel/_OverlayPacks/german_lozenges/chinese.png b/cpt-kuesel/_OverlayPacks/german_lozenges/chinese.png
new file mode 100644
index 0000000..14fa2f3
Binary files /dev/null and b/cpt-kuesel/_OverlayPacks/german_lozenges/chinese.png differ
diff --git a/cpt-kuesel/_OverlayPacks/german_lozenges/czech.png b/cpt-kuesel/_OverlayPacks/german_lozenges/czech.png
new file mode 100644
index 0000000..67d677a
Binary files /dev/null and b/cpt-kuesel/_OverlayPacks/german_lozenges/czech.png differ
diff --git a/cpt-kuesel/_OverlayPacks/german_lozenges/danish.png b/cpt-kuesel/_OverlayPacks/german_lozenges/danish.png
new file mode 100644
index 0000000..58dc264
Binary files /dev/null and b/cpt-kuesel/_OverlayPacks/german_lozenges/danish.png differ
diff --git a/cpt-kuesel/_OverlayPacks/german_lozenges/dutch.png b/cpt-kuesel/_OverlayPacks/german_lozenges/dutch.png
new file mode 100644
index 0000000..d637a7b
Binary files /dev/null and b/cpt-kuesel/_OverlayPacks/german_lozenges/dutch.png differ
diff --git a/cpt-kuesel/_OverlayPacks/german_lozenges/english.png b/cpt-kuesel/_OverlayPacks/german_lozenges/english.png
new file mode 100644
index 0000000..2fbc6a0
Binary files /dev/null and b/cpt-kuesel/_OverlayPacks/german_lozenges/english.png differ
diff --git a/cpt-kuesel/_OverlayPacks/german_lozenges/farsi.png b/cpt-kuesel/_OverlayPacks/german_lozenges/farsi.png
new file mode 100644
index 0000000..9f87676
Binary files /dev/null and b/cpt-kuesel/_OverlayPacks/german_lozenges/farsi.png differ
diff --git a/cpt-kuesel/_OverlayPacks/german_lozenges/french.png b/cpt-kuesel/_OverlayPacks/german_lozenges/french.png
new file mode 100644
index 0000000..950faf8
Binary files /dev/null and b/cpt-kuesel/_OverlayPacks/german_lozenges/french.png differ
diff --git a/cpt-kuesel/_OverlayPacks/german_lozenges/german.png b/cpt-kuesel/_OverlayPacks/german_lozenges/german.png
new file mode 100644
index 0000000..4967277
Binary files /dev/null and b/cpt-kuesel/_OverlayPacks/german_lozenges/german.png differ
diff --git a/cpt-kuesel/_OverlayPacks/german_lozenges/hindi.png b/cpt-kuesel/_OverlayPacks/german_lozenges/hindi.png
new file mode 100644
index 0000000..d7ca362
Binary files /dev/null and b/cpt-kuesel/_OverlayPacks/german_lozenges/hindi.png differ
diff --git a/cpt-kuesel/_OverlayPacks/german_lozenges/hungarian.png b/cpt-kuesel/_OverlayPacks/german_lozenges/hungarian.png
new file mode 100644
index 0000000..3011a67
Binary files /dev/null and b/cpt-kuesel/_OverlayPacks/german_lozenges/hungarian.png differ
diff --git a/cpt-kuesel/_OverlayPacks/german_lozenges/icelandic.png b/cpt-kuesel/_OverlayPacks/german_lozenges/icelandic.png
new file mode 100644
index 0000000..dfaeb5c
Binary files /dev/null and b/cpt-kuesel/_OverlayPacks/german_lozenges/icelandic.png differ
diff --git a/cpt-kuesel/_OverlayPacks/german_lozenges/italian.png b/cpt-kuesel/_OverlayPacks/german_lozenges/italian.png
new file mode 100644
index 0000000..143dc1f
Binary files /dev/null and b/cpt-kuesel/_OverlayPacks/german_lozenges/italian.png differ
diff --git a/cpt-kuesel/_OverlayPacks/german_lozenges/japanese.png b/cpt-kuesel/_OverlayPacks/german_lozenges/japanese.png
new file mode 100644
index 0000000..b3dd670
Binary files /dev/null and b/cpt-kuesel/_OverlayPacks/german_lozenges/japanese.png differ
diff --git a/cpt-kuesel/_OverlayPacks/german_lozenges/korean.png b/cpt-kuesel/_OverlayPacks/german_lozenges/korean.png
new file mode 100644
index 0000000..d7c2a4d
Binary files /dev/null and b/cpt-kuesel/_OverlayPacks/german_lozenges/korean.png differ
diff --git a/cpt-kuesel/_OverlayPacks/german_lozenges/norwegian.png b/cpt-kuesel/_OverlayPacks/german_lozenges/norwegian.png
new file mode 100644
index 0000000..09ee7f5
Binary files /dev/null and b/cpt-kuesel/_OverlayPacks/german_lozenges/norwegian.png differ
diff --git a/cpt-kuesel/_OverlayPacks/german_lozenges/polish.png b/cpt-kuesel/_OverlayPacks/german_lozenges/polish.png
new file mode 100644
index 0000000..a2aa571
Binary files /dev/null and b/cpt-kuesel/_OverlayPacks/german_lozenges/polish.png differ
diff --git a/cpt-kuesel/_OverlayPacks/german_lozenges/portuguese.png b/cpt-kuesel/_OverlayPacks/german_lozenges/portuguese.png
new file mode 100644
index 0000000..0689a49
Binary files /dev/null and b/cpt-kuesel/_OverlayPacks/german_lozenges/portuguese.png differ
diff --git a/cpt-kuesel/_OverlayPacks/german_lozenges/russian.png b/cpt-kuesel/_OverlayPacks/german_lozenges/russian.png
new file mode 100644
index 0000000..6e74ec1
Binary files /dev/null and b/cpt-kuesel/_OverlayPacks/german_lozenges/russian.png differ
diff --git a/cpt-kuesel/_OverlayPacks/german_lozenges/spanish.png b/cpt-kuesel/_OverlayPacks/german_lozenges/spanish.png
new file mode 100644
index 0000000..98dcea8
Binary files /dev/null and b/cpt-kuesel/_OverlayPacks/german_lozenges/spanish.png differ
diff --git a/cpt-kuesel/_OverlayPacks/german_lozenges/swedish.png b/cpt-kuesel/_OverlayPacks/german_lozenges/swedish.png
new file mode 100644
index 0000000..6ac29ef
Binary files /dev/null and b/cpt-kuesel/_OverlayPacks/german_lozenges/swedish.png differ
diff --git a/cpt-kuesel/_OverlayPacks/german_lozenges/telugu.png b/cpt-kuesel/_OverlayPacks/german_lozenges/telugu.png
new file mode 100644
index 0000000..7cc97e7
Binary files /dev/null and b/cpt-kuesel/_OverlayPacks/german_lozenges/telugu.png differ
diff --git a/cpt-kuesel/_OverlayPacks/german_lozenges/thai.png b/cpt-kuesel/_OverlayPacks/german_lozenges/thai.png
new file mode 100644
index 0000000..8fba77b
Binary files /dev/null and b/cpt-kuesel/_OverlayPacks/german_lozenges/thai.png differ
diff --git a/cpt-kuesel/_OverlayPacks/german_lozenges/turkish.png b/cpt-kuesel/_OverlayPacks/german_lozenges/turkish.png
new file mode 100644
index 0000000..a7eacf8
Binary files /dev/null and b/cpt-kuesel/_OverlayPacks/german_lozenges/turkish.png differ
diff --git a/cpt-kuesel/_OverlayPacks/german_lozenges/ukrainian.png b/cpt-kuesel/_OverlayPacks/german_lozenges/ukrainian.png
new file mode 100644
index 0000000..0e641a9
Binary files /dev/null and b/cpt-kuesel/_OverlayPacks/german_lozenges/ukrainian.png differ
diff --git a/cpt-kuesel/__OverlayCreation/ISO_639-2_lozenges.txt b/cpt-kuesel/__OverlayCreation/ISO_639-2_lozenges.txt
new file mode 100644
index 0000000..8659e0e
--- /dev/null
+++ b/cpt-kuesel/__OverlayCreation/ISO_639-2_lozenges.txt
@@ -0,0 +1,25 @@
+name,language,flag,bg_2,bg_3,bg_4,bg_5,bg_6,bg_7,bg_8,bg_9,bg_10,bg_11,bg_12,bg_13,bg_14
+chinese,ZH,flags/chinese.png,true,false,false,false,false,false,false,false,false,false,false,false,false
+czech,CS,flags/czech.png,true,false,false,false,false,false,false,false,false,false,false,false,false
+danish,DA,flags/danish.png,true,false,false,false,false,false,false,false,false,false,false,false,false
+dutch,NL,flags/dutch.png,true,false,false,false,false,false,false,false,false,false,false,false,false
+english,EN,flags/english.png,true,false,false,false,false,false,false,false,false,false,false,false,false
+french,FR,flags/french.png,true,false,false,false,false,false,false,false,false,false,false,false,false
+german,DE,flags/german.png,true,false,false,false,false,false,false,false,false,false,false,false,false
+hungarian,HU,flags/hungarian.png,true,false,false,false,false,false,false,false,false,false,false,false,false
+icelandic,IS,flags/icelandic.png,true,false,false,false,false,false,false,false,false,false,false,false,false
+hindi,HI,flags/indian.png,true,false,false,false,false,false,false,false,false,false,false,false,false
+telugu,TE,flags/indian.png,true,false,false,false,false,false,false,false,false,false,false,false,false
+farsi,FA,flags/iranian.png,true,false,false,false,false,false,false,false,false,false,false,false,false
+italian,IT,flags/italian.png,true,false,false,false,false,false,false,false,false,false,false,false,false
+japanese,JA,flags/japanese.png,true,false,false,false,false,false,false,false,false,false,false,false,false
+korean,KO,flags/korean.png,true,false,false,false,false,false,false,false,false,false,false,false,false
+norwegian,NO,flags/norwegian.png,true,false,false,false,false,false,false,false,false,false,false,false,false
+polish,PL,flags/polish.png,true,false,false,false,false,false,false,false,false,false,false,false,false
+portuguese,PT,flags/portuguese.png,true,false,false,false,false,false,false,false,false,false,false,false,false
+russian,RU,flags/russian.png,true,false,false,false,false,false,false,false,false,false,false,false,false
+spanish,ES,flags/spanish.png,true,false,false,false,false,false,false,false,false,false,false,false,false
+swedish,SV,flags/swedish.png,true,false,false,false,false,false,false,false,false,false,false,false,false
+thai,TH,flags/thai.png,true,false,false,false,false,false,false,false,false,false,false,false,false
+turkish,TR,flags/turkish.png,true,false,false,false,false,false,false,false,false,false,false,false,false
+ukrainian,UK,flags/ukrainian.png,true,false,false,false,false,false,false,false,false,false,false,false,false
\ No newline at end of file
diff --git a/cpt-kuesel/__OverlayCreation/english_lozenges.txt b/cpt-kuesel/__OverlayCreation/english_lozenges.txt
new file mode 100644
index 0000000..6445273
--- /dev/null
+++ b/cpt-kuesel/__OverlayCreation/english_lozenges.txt
@@ -0,0 +1,25 @@
+name,language,flag,bg_2,bg_3,bg_4,bg_5,bg_6,bg_7,bg_8,bg_9,bg_10,bg_11,bg_12,bg_13,bg_14
+chinese,CHINESE,flags/chinese.png,false,false,false,false,false,true,false,false,false,false,false,false,false
+czech,CZECH,flags/czech.png,false,false,false,true,false,false,false,false,false,false,false,false,false
+danish,DANISH,flags/danish.png,false,false,false,false,true,false,false,false,false,false,false,false,false
+dutch,DUTCH,flags/dutch.png,false,false,false,true,false,false,false,false,false,false,false,false,false
+english,ENGLISH,flags/english.png,false,false,false,false,false,true,false,false,false,false,false,false,false
+french,FRENCH,flags/french.png,false,false,false,false,true,false,false,false,false,false,false,false,false
+german,GERMAN,flags/german.png,false,false,false,false,true,false,false,false,false,false,false,false,false
+hungarian,HUNGARIAN,flags/hungarian.png,false,false,false,false,false,false,false,true,false,false,false,false,false
+icelandic,ICELANDIC,flags/icelandic.png,false,false,false,false,false,false,false,true,false,false,false,false,false
+hindi,HINDI,flags/indian.png,false,false,false,true,false,false,false,false,false,false,false,false,false
+telugu,TELUGU,flags/indian.png,false,false,false,false,true,false,false,false,false,false,false,false,false
+farsi,FARSI,flags/iranian.png,false,false,false,true,false,false,false,false,false,false,false,false,false
+italian,ITALIAN,flags/italian.png,false,false,false,false,false,true,false,false,false,false,false,false,false
+japanese,JAPANESE,flags/japanese.png,false,false,false,false,false,false,true,false,false,false,false,false,false
+korean,KOREAN,flags/korean.png,false,false,false,false,true,false,false,false,false,false,false,false,false
+norwegian,NORWEGIAN,flags/norwegian.png,false,false,false,false,false,false,false,true,false,false,false,false,false
+polish,POLISH,flags/polish.png,false,false,false,false,true,false,false,false,false,false,false,false,false
+portuguese,PORTUGUESE,flags/portuguese.png,false,false,false,false,false,false,false,false,true,false,false,false,false
+russian,RUSSIAN,flags/russian.png,false,false,false,false,false,true,false,false,false,false,false,false,false
+spanish,SPANISH,flags/spanish.png,false,false,false,false,false,true,false,false,false,false,false,false,false
+swedish,SWEDISH,flags/swedish.png,false,false,false,false,false,true,false,false,false,false,false,false,false
+thai,THAI,flags/thai.png,false,false,true,false,false,false,false,false,false,false,false,false,false
+turkish,TURKISH,flags/turkish.png,false,false,false,false,false,true,false,false,false,false,false,false,false
+ukrainian,UKRAINIAN,flags/ukrainian.png,false,false,false,false,false,false,false,true,false,false,false,false,false
\ No newline at end of file
diff --git a/cpt-kuesel/__OverlayCreation/export/ISO_639-2_lozenges/chinese.png b/cpt-kuesel/__OverlayCreation/export/ISO_639-2_lozenges/chinese.png
new file mode 100644
index 0000000..4a330c8
Binary files /dev/null and b/cpt-kuesel/__OverlayCreation/export/ISO_639-2_lozenges/chinese.png differ
diff --git a/cpt-kuesel/__OverlayCreation/export/ISO_639-2_lozenges/czech.png b/cpt-kuesel/__OverlayCreation/export/ISO_639-2_lozenges/czech.png
new file mode 100644
index 0000000..ab72e54
Binary files /dev/null and b/cpt-kuesel/__OverlayCreation/export/ISO_639-2_lozenges/czech.png differ
diff --git a/cpt-kuesel/__OverlayCreation/export/ISO_639-2_lozenges/danish.png b/cpt-kuesel/__OverlayCreation/export/ISO_639-2_lozenges/danish.png
new file mode 100644
index 0000000..144192a
Binary files /dev/null and b/cpt-kuesel/__OverlayCreation/export/ISO_639-2_lozenges/danish.png differ
diff --git a/cpt-kuesel/__OverlayCreation/export/ISO_639-2_lozenges/dutch.png b/cpt-kuesel/__OverlayCreation/export/ISO_639-2_lozenges/dutch.png
new file mode 100644
index 0000000..5b7d58d
Binary files /dev/null and b/cpt-kuesel/__OverlayCreation/export/ISO_639-2_lozenges/dutch.png differ
diff --git a/cpt-kuesel/__OverlayCreation/export/ISO_639-2_lozenges/english.png b/cpt-kuesel/__OverlayCreation/export/ISO_639-2_lozenges/english.png
new file mode 100644
index 0000000..0be4d04
Binary files /dev/null and b/cpt-kuesel/__OverlayCreation/export/ISO_639-2_lozenges/english.png differ
diff --git a/cpt-kuesel/__OverlayCreation/export/ISO_639-2_lozenges/farsi.png b/cpt-kuesel/__OverlayCreation/export/ISO_639-2_lozenges/farsi.png
new file mode 100644
index 0000000..37e8c27
Binary files /dev/null and b/cpt-kuesel/__OverlayCreation/export/ISO_639-2_lozenges/farsi.png differ
diff --git a/cpt-kuesel/__OverlayCreation/export/ISO_639-2_lozenges/french.png b/cpt-kuesel/__OverlayCreation/export/ISO_639-2_lozenges/french.png
new file mode 100644
index 0000000..eb3bbfd
Binary files /dev/null and b/cpt-kuesel/__OverlayCreation/export/ISO_639-2_lozenges/french.png differ
diff --git a/cpt-kuesel/__OverlayCreation/export/ISO_639-2_lozenges/german.png b/cpt-kuesel/__OverlayCreation/export/ISO_639-2_lozenges/german.png
new file mode 100644
index 0000000..89ac14e
Binary files /dev/null and b/cpt-kuesel/__OverlayCreation/export/ISO_639-2_lozenges/german.png differ
diff --git a/cpt-kuesel/__OverlayCreation/export/ISO_639-2_lozenges/hindi.png b/cpt-kuesel/__OverlayCreation/export/ISO_639-2_lozenges/hindi.png
new file mode 100644
index 0000000..9e83848
Binary files /dev/null and b/cpt-kuesel/__OverlayCreation/export/ISO_639-2_lozenges/hindi.png differ
diff --git a/cpt-kuesel/__OverlayCreation/export/ISO_639-2_lozenges/hungarian.png b/cpt-kuesel/__OverlayCreation/export/ISO_639-2_lozenges/hungarian.png
new file mode 100644
index 0000000..57a9a8c
Binary files /dev/null and b/cpt-kuesel/__OverlayCreation/export/ISO_639-2_lozenges/hungarian.png differ
diff --git a/cpt-kuesel/__OverlayCreation/export/ISO_639-2_lozenges/icelandic.png b/cpt-kuesel/__OverlayCreation/export/ISO_639-2_lozenges/icelandic.png
new file mode 100644
index 0000000..77b62c0
Binary files /dev/null and b/cpt-kuesel/__OverlayCreation/export/ISO_639-2_lozenges/icelandic.png differ
diff --git a/cpt-kuesel/__OverlayCreation/export/ISO_639-2_lozenges/italian.png b/cpt-kuesel/__OverlayCreation/export/ISO_639-2_lozenges/italian.png
new file mode 100644
index 0000000..2600eca
Binary files /dev/null and b/cpt-kuesel/__OverlayCreation/export/ISO_639-2_lozenges/italian.png differ
diff --git a/cpt-kuesel/__OverlayCreation/export/ISO_639-2_lozenges/japanese.png b/cpt-kuesel/__OverlayCreation/export/ISO_639-2_lozenges/japanese.png
new file mode 100644
index 0000000..75dd7a4
Binary files /dev/null and b/cpt-kuesel/__OverlayCreation/export/ISO_639-2_lozenges/japanese.png differ
diff --git a/cpt-kuesel/__OverlayCreation/export/ISO_639-2_lozenges/korean.png b/cpt-kuesel/__OverlayCreation/export/ISO_639-2_lozenges/korean.png
new file mode 100644
index 0000000..996ecb0
Binary files /dev/null and b/cpt-kuesel/__OverlayCreation/export/ISO_639-2_lozenges/korean.png differ
diff --git a/cpt-kuesel/__OverlayCreation/export/ISO_639-2_lozenges/norwegian.png b/cpt-kuesel/__OverlayCreation/export/ISO_639-2_lozenges/norwegian.png
new file mode 100644
index 0000000..0f820bf
Binary files /dev/null and b/cpt-kuesel/__OverlayCreation/export/ISO_639-2_lozenges/norwegian.png differ
diff --git a/cpt-kuesel/__OverlayCreation/export/ISO_639-2_lozenges/polish.png b/cpt-kuesel/__OverlayCreation/export/ISO_639-2_lozenges/polish.png
new file mode 100644
index 0000000..380e615
Binary files /dev/null and b/cpt-kuesel/__OverlayCreation/export/ISO_639-2_lozenges/polish.png differ
diff --git a/cpt-kuesel/__OverlayCreation/export/ISO_639-2_lozenges/portuguese.png b/cpt-kuesel/__OverlayCreation/export/ISO_639-2_lozenges/portuguese.png
new file mode 100644
index 0000000..c2b7df7
Binary files /dev/null and b/cpt-kuesel/__OverlayCreation/export/ISO_639-2_lozenges/portuguese.png differ
diff --git a/cpt-kuesel/__OverlayCreation/export/ISO_639-2_lozenges/russian.png b/cpt-kuesel/__OverlayCreation/export/ISO_639-2_lozenges/russian.png
new file mode 100644
index 0000000..e3ad32f
Binary files /dev/null and b/cpt-kuesel/__OverlayCreation/export/ISO_639-2_lozenges/russian.png differ
diff --git a/cpt-kuesel/__OverlayCreation/export/ISO_639-2_lozenges/spanish.png b/cpt-kuesel/__OverlayCreation/export/ISO_639-2_lozenges/spanish.png
new file mode 100644
index 0000000..6b89fcc
Binary files /dev/null and b/cpt-kuesel/__OverlayCreation/export/ISO_639-2_lozenges/spanish.png differ
diff --git a/cpt-kuesel/__OverlayCreation/export/ISO_639-2_lozenges/swedish.png b/cpt-kuesel/__OverlayCreation/export/ISO_639-2_lozenges/swedish.png
new file mode 100644
index 0000000..5490139
Binary files /dev/null and b/cpt-kuesel/__OverlayCreation/export/ISO_639-2_lozenges/swedish.png differ
diff --git a/cpt-kuesel/__OverlayCreation/export/ISO_639-2_lozenges/telugu.png b/cpt-kuesel/__OverlayCreation/export/ISO_639-2_lozenges/telugu.png
new file mode 100644
index 0000000..f1d3f31
Binary files /dev/null and b/cpt-kuesel/__OverlayCreation/export/ISO_639-2_lozenges/telugu.png differ
diff --git a/cpt-kuesel/__OverlayCreation/export/ISO_639-2_lozenges/thai.png b/cpt-kuesel/__OverlayCreation/export/ISO_639-2_lozenges/thai.png
new file mode 100644
index 0000000..635992d
Binary files /dev/null and b/cpt-kuesel/__OverlayCreation/export/ISO_639-2_lozenges/thai.png differ
diff --git a/cpt-kuesel/__OverlayCreation/export/ISO_639-2_lozenges/turkish.png b/cpt-kuesel/__OverlayCreation/export/ISO_639-2_lozenges/turkish.png
new file mode 100644
index 0000000..d5c21b5
Binary files /dev/null and b/cpt-kuesel/__OverlayCreation/export/ISO_639-2_lozenges/turkish.png differ
diff --git a/cpt-kuesel/__OverlayCreation/export/ISO_639-2_lozenges/ukrainian.png b/cpt-kuesel/__OverlayCreation/export/ISO_639-2_lozenges/ukrainian.png
new file mode 100644
index 0000000..a98f3d8
Binary files /dev/null and b/cpt-kuesel/__OverlayCreation/export/ISO_639-2_lozenges/ukrainian.png differ
diff --git a/cpt-kuesel/__OverlayCreation/export/Thumbs.db b/cpt-kuesel/__OverlayCreation/export/Thumbs.db
new file mode 100644
index 0000000..90cb3ec
Binary files /dev/null and b/cpt-kuesel/__OverlayCreation/export/Thumbs.db differ
diff --git a/cpt-kuesel/__OverlayCreation/export/_convert_psd_to_png.bat b/cpt-kuesel/__OverlayCreation/export/_convert_psd_to_png.bat
new file mode 100644
index 0000000..482fecf
--- /dev/null
+++ b/cpt-kuesel/__OverlayCreation/export/_convert_psd_to_png.bat
@@ -0,0 +1,6 @@
+echo convert psd to png
+magick.exe mogrify -format png *.psd[0]
+echo delete psd
+del "*.psd"
+echo done
+pause
\ No newline at end of file
diff --git a/cpt-kuesel/__OverlayCreation/flags/Thumbs.db b/cpt-kuesel/__OverlayCreation/flags/Thumbs.db
new file mode 100644
index 0000000..f2174b3
Binary files /dev/null and b/cpt-kuesel/__OverlayCreation/flags/Thumbs.db differ
diff --git a/cpt-kuesel/_OverlayCreation/flags/chinese.png b/cpt-kuesel/__OverlayCreation/flags/chinese.png
similarity index 100%
rename from cpt-kuesel/_OverlayCreation/flags/chinese.png
rename to cpt-kuesel/__OverlayCreation/flags/chinese.png
diff --git a/cpt-kuesel/__OverlayCreation/flags/czech.png b/cpt-kuesel/__OverlayCreation/flags/czech.png
new file mode 100644
index 0000000..6f76bfe
Binary files /dev/null and b/cpt-kuesel/__OverlayCreation/flags/czech.png differ
diff --git a/cpt-kuesel/_OverlayCreation/flags/danish.png b/cpt-kuesel/__OverlayCreation/flags/danish.png
similarity index 100%
rename from cpt-kuesel/_OverlayCreation/flags/danish.png
rename to cpt-kuesel/__OverlayCreation/flags/danish.png
diff --git a/cpt-kuesel/_OverlayCreation/flags/dutch.png b/cpt-kuesel/__OverlayCreation/flags/dutch.png
similarity index 100%
rename from cpt-kuesel/_OverlayCreation/flags/dutch.png
rename to cpt-kuesel/__OverlayCreation/flags/dutch.png
diff --git a/cpt-kuesel/_OverlayCreation/flags/english.png b/cpt-kuesel/__OverlayCreation/flags/english.png
similarity index 100%
rename from cpt-kuesel/_OverlayCreation/flags/english.png
rename to cpt-kuesel/__OverlayCreation/flags/english.png
diff --git a/cpt-kuesel/_OverlayCreation/flags/french.png b/cpt-kuesel/__OverlayCreation/flags/french.png
similarity index 100%
rename from cpt-kuesel/_OverlayCreation/flags/french.png
rename to cpt-kuesel/__OverlayCreation/flags/french.png
diff --git a/cpt-kuesel/_OverlayCreation/flags/german.png b/cpt-kuesel/__OverlayCreation/flags/german.png
similarity index 100%
rename from cpt-kuesel/_OverlayCreation/flags/german.png
rename to cpt-kuesel/__OverlayCreation/flags/german.png
diff --git a/cpt-kuesel/__OverlayCreation/flags/hungarian.png b/cpt-kuesel/__OverlayCreation/flags/hungarian.png
new file mode 100644
index 0000000..ca03542
Binary files /dev/null and b/cpt-kuesel/__OverlayCreation/flags/hungarian.png differ
diff --git a/cpt-kuesel/_OverlayCreation/flags/icelandic.png b/cpt-kuesel/__OverlayCreation/flags/icelandic.png
similarity index 100%
rename from cpt-kuesel/_OverlayCreation/flags/icelandic.png
rename to cpt-kuesel/__OverlayCreation/flags/icelandic.png
diff --git a/cpt-kuesel/_OverlayCreation/flags/indian.png b/cpt-kuesel/__OverlayCreation/flags/indian.png
similarity index 100%
rename from cpt-kuesel/_OverlayCreation/flags/indian.png
rename to cpt-kuesel/__OverlayCreation/flags/indian.png
diff --git a/cpt-kuesel/_OverlayCreation/flags/iranian.png b/cpt-kuesel/__OverlayCreation/flags/iranian.png
similarity index 100%
rename from cpt-kuesel/_OverlayCreation/flags/iranian.png
rename to cpt-kuesel/__OverlayCreation/flags/iranian.png
diff --git a/cpt-kuesel/_OverlayCreation/flags/italian.png b/cpt-kuesel/__OverlayCreation/flags/italian.png
similarity index 100%
rename from cpt-kuesel/_OverlayCreation/flags/italian.png
rename to cpt-kuesel/__OverlayCreation/flags/italian.png
diff --git a/cpt-kuesel/_OverlayCreation/flags/japanese.png b/cpt-kuesel/__OverlayCreation/flags/japanese.png
similarity index 100%
rename from cpt-kuesel/_OverlayCreation/flags/japanese.png
rename to cpt-kuesel/__OverlayCreation/flags/japanese.png
diff --git a/cpt-kuesel/_OverlayCreation/flags/korean.png b/cpt-kuesel/__OverlayCreation/flags/korean.png
similarity index 100%
rename from cpt-kuesel/_OverlayCreation/flags/korean.png
rename to cpt-kuesel/__OverlayCreation/flags/korean.png
diff --git a/cpt-kuesel/_OverlayCreation/flags/norwegian.png b/cpt-kuesel/__OverlayCreation/flags/norwegian.png
similarity index 100%
rename from cpt-kuesel/_OverlayCreation/flags/norwegian.png
rename to cpt-kuesel/__OverlayCreation/flags/norwegian.png
diff --git a/cpt-kuesel/__OverlayCreation/flags/polish.png b/cpt-kuesel/__OverlayCreation/flags/polish.png
new file mode 100644
index 0000000..7218dc7
Binary files /dev/null and b/cpt-kuesel/__OverlayCreation/flags/polish.png differ
diff --git a/cpt-kuesel/__OverlayCreation/flags/portuguese.png b/cpt-kuesel/__OverlayCreation/flags/portuguese.png
new file mode 100644
index 0000000..bd3b39d
Binary files /dev/null and b/cpt-kuesel/__OverlayCreation/flags/portuguese.png differ
diff --git a/cpt-kuesel/_OverlayCreation/flags/russian.png b/cpt-kuesel/__OverlayCreation/flags/russian.png
similarity index 100%
rename from cpt-kuesel/_OverlayCreation/flags/russian.png
rename to cpt-kuesel/__OverlayCreation/flags/russian.png
diff --git a/cpt-kuesel/_OverlayCreation/flags/spanish.png b/cpt-kuesel/__OverlayCreation/flags/spanish.png
similarity index 100%
rename from cpt-kuesel/_OverlayCreation/flags/spanish.png
rename to cpt-kuesel/__OverlayCreation/flags/spanish.png
diff --git a/cpt-kuesel/_OverlayCreation/flags/swedish.png b/cpt-kuesel/__OverlayCreation/flags/swedish.png
similarity index 100%
rename from cpt-kuesel/_OverlayCreation/flags/swedish.png
rename to cpt-kuesel/__OverlayCreation/flags/swedish.png
diff --git a/cpt-kuesel/_OverlayCreation/flags/thai.png b/cpt-kuesel/__OverlayCreation/flags/thai.png
similarity index 100%
rename from cpt-kuesel/_OverlayCreation/flags/thai.png
rename to cpt-kuesel/__OverlayCreation/flags/thai.png
diff --git a/cpt-kuesel/_OverlayCreation/flags/turkish.png b/cpt-kuesel/__OverlayCreation/flags/turkish.png
similarity index 100%
rename from cpt-kuesel/_OverlayCreation/flags/turkish.png
rename to cpt-kuesel/__OverlayCreation/flags/turkish.png
diff --git a/cpt-kuesel/__OverlayCreation/flags/ukrainian.png b/cpt-kuesel/__OverlayCreation/flags/ukrainian.png
new file mode 100644
index 0000000..8db1d08
Binary files /dev/null and b/cpt-kuesel/__OverlayCreation/flags/ukrainian.png differ
diff --git a/cpt-kuesel/__OverlayCreation/german_lozenges.txt b/cpt-kuesel/__OverlayCreation/german_lozenges.txt
new file mode 100644
index 0000000..87b8b2e
--- /dev/null
+++ b/cpt-kuesel/__OverlayCreation/german_lozenges.txt
@@ -0,0 +1,25 @@
+name,language,flag,bg_2,bg_3,bg_4,bg_5,bg_6,bg_7,bg_8,bg_9,bg_10,bg_11,bg_12,bg_13,bg_14
+chinese,CHINESISCH,flags/chinese.png,false,false,false,false,false,false,false,false,true,false,false,false,false
+czech,TSCHECHISCH,flags/czech.png,false,false,false,false,false,false,false,false,false,true,false,false,false
+danish,DÄNISCH,flags/danish.png,false,false,false,false,false,true,false,false,false,false,false,false,false
+dutch,NIEDERLÄNDISCH,flags/dutch.png,false,false,false,false,false,false,false,false,false,false,false,false,true
+english,ENGLISCH,flags/english.png,false,false,false,false,false,false,true,false,false,false,false,false,false
+french,FRANZÖSISCH,flags/french.png,false,false,false,false,false,false,false,false,false,true,false,false,false
+german,DEUTSCH,flags/german.png,false,false,false,false,false,true,false,false,false,false,false,false,false
+hungarian,UNGARISCH,flags/hungarian.png,false,false,false,false,false,false,false,true,false,false,false,false,false
+icelandic,ISLÄNDISCH,flags/icelandic.png,false,false,false,false,false,false,false,false,true,false,false,false,false
+hindi,HINDI,flags/indian.png,false,false,false,true,false,false,false,false,false,false,false,false,false
+telugu,TELUGU,flags/indian.png,false,false,false,false,true,false,false,false,false,false,false,false,false
+farsi,FARSI,flags/iranian.png,false,false,false,true,false,false,false,false,false,false,false,false,false
+italian,ITALIÄNISCH,flags/italian.png,false,false,false,false,false,false,false,false,false,true,false,false,false
+japanese,JAPANISCH,flags/japanese.png,false,false,false,false,false,false,false,true,false,false,false,false,false
+korean,KOREANISCH,flags/korean.png,false,false,false,false,false,false,false,false,true,false,false,false,false
+norwegian,NORWEGISCH,flags/norwegian.png,false,false,false,false,false,false,false,false,true,false,false,false,false
+polish,POLNISCH,flags/polish.png,false,false,false,false,false,false,true,false,false,false,false,false,false
+portuguese,PORTUGIESISCH,flags/portuguese.png,false,false,false,false,false,false,false,false,false,false,false,true,false
+russian,RUSSISCH,flags/russian.png,false,false,false,false,false,false,true,false,false,false,false,false,false
+spanish,SPANISCH,flags/spanish.png,false,false,false,false,false,false,true,false,false,false,false,false,false
+swedish,SCHWEDISCH,flags/swedish.png,false,false,false,false,false,false,false,false,true,false,false,false,false
+thai,THAI,flags/thai.png,false,false,true,false,false,false,false,false,false,false,false,false,false
+turkish,TÜRKISCH,flags/turkish.png,false,false,false,false,false,false,true,false,false,false,false,false,false
+ukrainian,UKRAINISCH,flags/ukrainian.png,false,false,false,false,false,false,false,false,true,false,false,false,false
\ No newline at end of file
diff --git a/cpt-kuesel/_OverlayCreation/logos/4k_logo.png b/cpt-kuesel/__OverlayCreation/logos/4k.png
similarity index 100%
rename from cpt-kuesel/_OverlayCreation/logos/4k_logo.png
rename to cpt-kuesel/__OverlayCreation/logos/4k.png
diff --git a/cpt-kuesel/_OverlayCreation/logos/hdr_logo.png b/cpt-kuesel/__OverlayCreation/logos/hdr.png
similarity index 100%
rename from cpt-kuesel/_OverlayCreation/logos/hdr_logo.png
rename to cpt-kuesel/__OverlayCreation/logos/hdr.png
diff --git a/cpt-kuesel/__OverlayCreation/logos/none.png b/cpt-kuesel/__OverlayCreation/logos/none.png
new file mode 100644
index 0000000..444928a
Binary files /dev/null and b/cpt-kuesel/__OverlayCreation/logos/none.png differ
diff --git a/cpt-kuesel/__OverlayCreation/pmm_language_lozenges.psd b/cpt-kuesel/__OverlayCreation/pmm_language_lozenges.psd
new file mode 100644
index 0000000..a188c19
Binary files /dev/null and b/cpt-kuesel/__OverlayCreation/pmm_language_lozenges.psd differ
diff --git a/cpt-kuesel/metadata/admin/_switches.yml b/cpt-kuesel/metadata/admin/_switches.yml
index 32e9cfa..85b998f 100644
--- a/cpt-kuesel/metadata/admin/_switches.yml
+++ b/cpt-kuesel/metadata/admin/_switches.yml
@@ -1,106 +1,97 @@
 templates:
-  sw_german:
+  use_german:
     default:
-      sw_german: false
-    allowed_library_types: <<sw_german>>
-  sw_english:
+      use_german: false
+    allowed_library_types: <<use_german>>
+  use_english:
     default:
-      sw_english: false
-    allowed_library_types: <<sw_english>>
-  sw_french:
+      use_english: false
+    allowed_library_types: <<use_english>>
+  use_french:
     default:
-      sw_french: false
-    allowed_library_types: <<sw_french>>
-  sw_japanese:
+      use_french: false
+    allowed_library_types: <<use_french>>
+  use_japanese:
     default:
-      sw_japanese: false
-    allowed_library_types: <<sw_japanese>>
-  sw_korean:
+      use_japanese: false
+    allowed_library_types: <<use_japanese>>
+  use_korean:
     default:
-      sw_korean: false
-    allowed_library_types: <<sw_korean>>
-  sw_chinese:
+      use_korean: false
+    allowed_library_types: <<use_korean>>
+  use_chinese:
     default:
-      sw_chinese: false
-    allowed_library_types: <<sw_chinese>>
-  sw_danish:
+      use_chinese: false
+    allowed_library_types: <<use_chinese>>
+  use_danish:
     default:
-      sw_danish: false
-    allowed_library_types: <<sw_danish>>
-  sw_russian:
+      use_danish: false
+    allowed_library_types: <<use_danish>>
+  use_russian:
     default:
-      sw_russian: false
-    allowed_library_types: <<sw_russian>>
-  sw_spanish:
+      use_russian: false
+    allowed_library_types: <<use_russian>>
+  use_spanish:
     default:
-      sw_spanish: false
-    allowed_library_types: <<sw_spanish>>
-  sw_italian:
+      use_spanish: false
+    allowed_library_types: <<use_spanish>>
+  use_italian:
     default:
-      sw_italian: false
-    allowed_library_types: <<sw_italian>>
-  sw_portuguese:
+      use_italian: false
+    allowed_library_types: <<use_italian>>
+  use_portuguese:
     default:
-      sw_portuguese: false
-    allowed_library_types: <<sw_portuguese>>
-  sw_hindi:
+      use_portuguese: false
+    allowed_library_types: <<use_portuguese>>
+  use_hindi:
     default:
-      sw_hindi: false
-    allowed_library_types: <<sw_hindi>>
-  sw_telugu:
+      use_hindi: false
+    allowed_library_types: <<use_hindi>>
+  use_telugu:
     default:
-      sw_telugu: false
-    allowed_library_types: <<sw_telugu>>
-  sw_farsi:
+      use_telugu: false
+    allowed_library_types: <<use_telugu>>
+  use_farsi:
     default:
-      sw_farsi: false
-    allowed_library_types: <<sw_farsi>>
-  sw_thai:
+      use_farsi: false
+    allowed_library_types: <<use_farsi>>
+  use_thai:
     default:
-      sw_thai: false
-    allowed_library_types: <<sw_thai>>
-  sw_dutch:
+      use_thai: false
+    allowed_library_types: <<use_thai>>
+  use_dutch:
     default:
-      sw_dutch: false
-    allowed_library_types: <<sw_dutch>>
-  sw_norwegian:
+      use_dutch: false
+    allowed_library_types: <<use_dutch>>
+  use_norwegian:
     default:
-      sw_norwegian: false
-    allowed_library_types: <<sw_norwegian>>
-  sw_icelandic:
+      use_norwegian: false
+    allowed_library_types: <<use_norwegian>>
+  use_icelandic:
     default:
-      sw_icelandic: false
-    allowed_library_types: <<sw_icelandic>>
-  sw_swedish:
+      use_icelandic: false
+    allowed_library_types: <<use_icelandic>>
+  use_swedish:
     default:
-      sw_swedish: false
-    allowed_library_types: <<sw_swedish>>
-  sw_turkish:
+      use_swedish: false
+    allowed_library_types: <<use_swedish>>
+  use_turkish:
     default:
-      sw_turkish: false
-    allowed_library_types: <<sw_turkish>>
-  sw_polish:
+      use_turkish: false
+    allowed_library_types: <<use_turkish>>
+  use_polish:
     default:
-      sw_polish: false
-    allowed_library_types: <<sw_polish>>
-  sw_czech:
+      use_polish: false
+    allowed_library_types: <<use_polish>>
+  use_czech:
     default:
-      sw_czech: false
-    allowed_library_types: <<sw_czech>>
-  sw_ukrainian:
+      use_czech: false
+    allowed_library_types: <<use_czech>>
+  use_ukrainian:
     default:
-      sw_ukrainian: false
-    allowed_library_types: <<sw_ukrainian>>
-  sw_hungarian:
+      use_ukrainian: false
+    allowed_library_types: <<use_ukrainian>>
+  use_hungarian:
     default:
-      sw_hungarian: false
-    allowed_library_types: <<sw_hungarian>>
-
-  sw_uhd:
-    default:
-      sw_uhd: false
-    allowed_library_types: <<sw_uhd>>
-  sw_hdr:
-    default:
-      sw_hdr: false
-    allowed_library_types: <<sw_hdr>>
\ No newline at end of file
+      use_hungarian: false
+    allowed_library_types: <<use_hungarian>>
\ No newline at end of file
diff --git a/cpt-kuesel/metadata/admin/_templates.yml b/cpt-kuesel/metadata/admin/_templates.yml
index 3278f65..2f2c080 100644
--- a/cpt-kuesel/metadata/admin/_templates.yml
+++ b/cpt-kuesel/metadata/admin/_templates.yml
@@ -1,50 +1,17 @@
 templates:
-  ol_builder:
-    ignore_blank_results: true
+  flag_overlay:
     optional:
       - overlay_level
-    collection_level: <<overlay_level>>
-    conditionals:
-      ol_folder:
-        default: _posters
-        conditions:
-          - overlay_level: episode
-            value: _titlecards
-    overlay:
-      name: <<ol_overlay>>_<<ol_queue>>_<<ol_weight>>
-      file: overlays/<<ol_folder>>/<<ol_file>>.png
-      queue: <<ol_queue>>
-      weight: <<ol_weight>>
-  it_items:
+    builder_level: <<overlay_level>>
     ignore_blank_results: true
-    optional:
-      - it_language
-      - it_uhd
-      - it_hdr
-      - it_pos
-    conditionals:
-      it_pos_filter: # labels used to change overlay positions
-        default: "Bottom, Up_corners, Down_corners, Left_side, Right_side, Sides"
-        conditions:
-          - it_pos: Bottom
-            value: "Up_corners, Down_corners, Left_side, Right_side, Sides"
-          - it_pos: Up_corners
-            value: "Bottom, Down_corners, Left_side, Right_side, Sides"
-          - it_pos: Down_corners
-            value: "Bottom, Up_corners, Left_side, Right_side, Sides"
-          - it_pos: Left_side
-            value: "Bottom, Up_corners, Down_corners, Right_side, Sides"
-          - it_pos: Right_side
-            value: "Bottom, Up_corners, Down_corners, Left_side, Sides"
-          - it_pos: Sides
-            value: "Bottom, Up_corners, Down_corners, Left_side, Right_side"
     plex_search:
       all:
-        audio_language: <<it_language>>
-        resolution: <<it_uhd>>
-        hdr: <<it_hdr>>
-        label: <<it_pos>>
-        label.not: <<it_pos_filter>>
+        audio_language: <<language>>
+    overlay:
+      name: <<overlay>>
+      file: overlays/_flags/<<overlay>>.png
+      queue: flags
+      weight: <<weight>>
   lbxd_list:
     ignore_blank_results: true
     optional:
@@ -54,10 +21,10 @@ templates:
       lbxd_user: cpt_kuesel
       lbxd_sort: <<collection_name>>
     conditionals:
-      lboxd_url:
+      lbxd_url:
         default: https://letterboxd.com/<<lbxd_user>>/list/<<lbxd_list>>/
         conditions:
-          - lboxd_list: watchlist
+          - lbxd_list: watchlist
             value: https://letterboxd.com/<<lbxd_user>>/<<lbxd_list>>/
     letterboxd_list: <<lbxd_url>>
     collection_order: <<lbxd_order>>
diff --git a/cpt-kuesel/metadata/admin/core.yml b/cpt-kuesel/metadata/admin/core.yml
index a609e8f..e048dee 100644
--- a/cpt-kuesel/metadata/admin/core.yml
+++ b/cpt-kuesel/metadata/admin/core.yml
@@ -29,12 +29,6 @@ collections:
       - Admin
       - German_metadata
       - Non_german_metadata
-      - Bottom
-      - Up_corners
-      - Down_corners
-      - Left_side
-      - Right_side
-      - Sides
   remove_non_german_metadata:
     template: {name: non_german_metadata}
     build_collection: false
diff --git a/cpt-kuesel/metadata/anime/metadata.yml b/cpt-kuesel/metadata/animes/metadata.yml
similarity index 100%
rename from cpt-kuesel/metadata/anime/metadata.yml
rename to cpt-kuesel/metadata/animes/metadata.yml
diff --git a/cpt-kuesel/metadata/movies/Collections.yml b/cpt-kuesel/metadata/movies/Collections.yml
index 18ee15f..7f66ef4 100644
--- a/cpt-kuesel/metadata/movies/Collections.yml
+++ b/cpt-kuesel/metadata/movies/Collections.yml
@@ -38,6 +38,7 @@ dynamic_collections:
       608101: "The Hitman's Bodyguard"
       735384: Hercule Poirot
       747168: Borat Moviefilms
+      939227: Beavis and Butt-Head
       975677: The First Myth Universe
     addons:
       34055:                  # Combine all Pokémon Movie Collections into one
diff --git a/cpt-kuesel/metadata/movies/Suggestions.yml b/cpt-kuesel/metadata/movies/Suggestions.yml
index 595b7ca..d6eb108 100644
--- a/cpt-kuesel/metadata/movies/Suggestions.yml
+++ b/cpt-kuesel/metadata/movies/Suggestions.yml
@@ -11,5 +11,5 @@ collections:
     smart_label: random
     visible_shared: true
     visible_library: true
-  Family Watchlist:
-    template: {name: lbxd_wlist, lbxd_smart: random}
+  Watchlist:
+    template: {name: lbxd_list, lbxd_list: watchlist, lbxd_sort: "!1_Watchlist", lbxd_smart: random}
diff --git a/cpt-kuesel/metadata/movies/metadata.yml b/cpt-kuesel/metadata/movies/metadata.yml
index 31aee48..b061949 100644
--- a/cpt-kuesel/metadata/movies/metadata.yml
+++ b/cpt-kuesel/metadata/movies/metadata.yml
@@ -1,398 +1,14 @@
-x-Up_corners: &Up_corners
-  label: Up_corners
-  label.remove:
-    - Down_corners
-    - Left_side
-    - Right_side
-    - Bottom
-    - Sides
-x-Down_corners: &Down_corners
-  label: Down_corners
-  label.remove:
-    - Up_corners
-    - Left_side
-    - Right_side
-    - Bottom
-    - Sides
-x-Bottom: &Bottom
-  label: Bottom
-  label.remove:
-    - Up_corners
-    - Down_corners
-    - Left_side
-    - Right_side
-    - Sides
-x-Left_side: &Left_side
-  label: Left_side
-  label.remove:
-    - Up_corners
-    - Down_corners
-    - Right_side
-    - Bottom
-    - Sides
-x-Right_side: &Right_side
-  label: Right_side
-  label.remove:
-    - Up_corners
-    - Down_corners
-    - Left_side
-    - Bottom
-    - Sides
-x-Sides: &Sides
-  label: Sides
-  label.remove:
-    - Up_corners
-    - Down_corners
-    - Left_side
-    - Right_side
-    - Bottom
-
 metadata:
   # <tmdb-id>: # <movie_name>
     # title: <title> # override stupid german translations of movie names
-    # <<: *<overlay_positions>
 
-  11: # Star Wars (1977)
-    <<: *Up_corners
   146: # Crouching Tiger, Hidden Dragon
     title: Crouching Tiger, Hidden Dragon
-    <<: *Bottom
-  253: # Live and Let Die (1973)
-    <<: *Up_corners
-  479: # Shaft (2000)
-    <<: *Bottom
-  603: # The Matrix (1999)
-    <<: *Up_corners
-  604: # The Matrix Reloaded (2003)
-    <<: *Up_corners
-  605: # The Matrix Revolutions (2003)
-    <<: *Up_corners
-  607: # Men in Black (1997)
-    <<: *Bottom
-  608: # Men in Black II (2002)
-    <<: *Bottom
-  646: # Dr. No (1962)
-    <<: *Up_corners
-  655: # Paris, Texas
-    title: Paris, Texas
-  657: # From Russia with Love (1963)
-    <<: *Up_corners
-  658: # Goldfinger (1964)
-    <<: *Up_corners
-  660: # Thunderball (1965)
-    <<: *Up_corners
-  667: # You Only Live Twice (1967)
-    <<: *Up_corners
-  668: # On Her Majesty's Secret Service (1969)
-    <<: *Up_corners
-  681: # Diamonds Are Forever (1971)
-    <<: *Up_corners
-  682: # The Man with the Golden Gun (1974)
-    <<: *Up_corners
-  691: # The Spy Who Loved Me (1977)
-    <<: *Up_corners
-  694: # Doctor Sleep (2019)
-    <<: *Bottom
-  698: # Moonraker (1979)
-    <<: *Up_corners
-  699: # For Your Eyes Only (1981)
-    <<: *Up_corners
-  700: # Octopussy (1983)
-    <<: *Up_corners
-  707: # A View to a Kill (1985)
-    <<: *Up_corners
-  708: # The Living Daylights (1987)
-    <<: *Up_corners
-  709: # Licence to Kill (1989)
-    <<: *Up_corners
-  710: # GoldenEye (1995)
-    <<: *Up_corners
-  714: # Tomorrow Never Dies (1997)
-    <<: *Up_corners
-  1487: # Hellboy (2004)
-    <<: *Up_corners
-  1891: # The Empire Strikes Back (1980)
-    <<: *Up_corners
-  1892: # Return of the Jedi (1983)
-    <<: *Up_corners
-  1893: # Star Wars: Episode I - The Phantom Menace (1999)
-    <<: *Up_corners
-  1894: # Star Wars: Episode II - Attack of the Clones (2002)
-    <<: *Up_corners
-  1895: # Star Wars: Episode III - Revenge of the Sith (2005)
-    <<: *Up_corners
   8386: # How High (2001)
     title: How High
-  10764: # Quantum of Solace (2008)
-    <<: *Up_corners
-  11253: # Hellboy II: The Golden Army (2008)
-    <<: *Up_corners
-  24428: # The Avengers (2012)
-    <<: *Up_corners
-  36643: # The World Is Not Enough (1999)
-    <<: *Up_corners
-  36557: # Casino Royale (2006)
-    <<: *Up_corners
-  36657: # X-Men (2000)
-    <<: *Up_corners
-  36658: # X2 (2003)
-    <<: *Up_corners
-  36668: # X-Men: The Last Stand (2006)
-    <<: *Up_corners
-  36669: # Die Another Day (2002)
-    <<: *Up_corners
   36670: # Never Say Never Again (1983)
     title: James Bond 007 - Sag niemals nie
-    <<: *Up_corners
-  37724: # Skyfall (2012)
-    <<: *Up_corners
-  41154: # Men in Black 3 (2012)
-    <<: *Bottom
-  49538: # X-Men: First Class (2011)
-    <<: *Up_corners
-  55931: # The Animatrix (2003)
-    <<: *Up_corners
-  99861: # Avengers: Age of Ultron (2015)
-    <<: *Up_corners
-  127585: # X-Men: Days of Future Past (2014)
-    <<: *Up_corners
-  140607: # Star Wars: The Force Awakens (2015)
-    <<: *Up_corners
-  158015: # The Purge (2013)
-    <<: *Bottom
-  181808: # Star Wars: The Last Jedi (2017)
-    <<: *Up_corners
-  181812: # Star Wars: The Rise of Skywalker (2019)
-    <<: *Up_corners
-  206647: # Spectre (2015)
-    <<: *Up_corners
-  246655: # X-Men: Apocalypse (2016)
-    <<: *Up_corners
-  259316: # Fantastic Beasts and Where to Find Them (2016)
-    <<: *Bottom
-  263341: # Crouching Tiger, Hidden Dragon: Sword of Destiny (2016)
-    <<: *Bottom
-  238636: # The Purge: Anarchy (2014)
-    <<: *Bottom
-  245891: # John Wick (2014)
-    <<: *Sides
-  287947: # Shazam! (2019)
-    <<: *Up_corners
-  297762: # Wonder Woman (2017)
-    <<: *Up_corners
-  299534: # Avengers: Endgame (2019)
-    <<: *Up_corners
-  299536: # Avengers: Infinity War (2018)
-    <<: *Up_corners
-  299537: # Captain Marvel (2019)
-    <<: *Up_corners
-  315635: # Spider-Man: Homecoming (2017)
-    <<: *Up_corners
-  316727: # The Purge: Election Year (2016)
-    <<: *Bottom
-  320288: # Dark Phoenix (2019)
-    <<: *Up_corners
-  324552: # John Wick: Chapter 2 (2017)
-    <<: *Sides
-  330459: # Rogue One: A Star Wars Story (2016)
-    <<: *Up_corners
-  335787: # Uncharted (2022)
-    <<: *Up_corners
-  335983: # Venom (2018)
-    <<: *Up_corners
-  338952: # Fantastic Beasts: The Crimes of Grindelwald (2018)
-    <<: *Bottom
-  338953: # Fantastic Beasts: The Secrets of Dumbledore (2022)
-    <<: *Bottom
-  340102: # The New Mutants (2020)
-    <<: *Up_corners
-  348350: # Solo: A Star Wars Story (2018)
-    <<: *Up_corners
-  359724: # Ford v Ferrari (2019)
-    <<: *Down_corners
-  370172: # No Time to Die (2021)
-    <<: *Up_corners
-  399579: # Alita: Battle Angel (2019)
-    <<: *Bottom
-  414906: # The Batman (2022)
-    <<: *Up_corners
-  429617: # Spider-Man: Far From Home (2019)
-    <<: *Up_corners
-  436969: # The Suicide Squad (2021)
-    <<: *Up_corners
-  438631: # Dune (2021)
-    <<: *Bottom
-  442249: # The First Purge (2018)
-    <<: *Bottom
   453395: # Doctor Strange in the Multiverse of Madness
     title: Doctor Strange in the Multiverse of Madness
-    <<: *Up_corners
-  456740: # Hellboy (2019)
-    <<: *Up_corners
-  457840: # Psych: The Movie (2017)
-    <<: *Down_corners
-  458156: # John Wick: Chapter 3 - Parabellum (2019)
-    <<: *Sides
-  464052: # Wonder Woman 1984 (2020)
-    <<: *Up_corners
-  467909: # In the Heights (2021)
-    <<: *Down_corners
-  471498: # Oxygen (2021)
-    <<: *Bottom
-  473033: # Uncut Gems (2019)
-    <<: *Up_corners
-  475557: # Joker (2019)
-    <<: *Up_corners
-  479259: # Lost Girls & Love Hotels (2020)
-    <<: *Down_corners
-  479455: # Men in Black: International (2019)
-    <<: *Bottom
-  480001: # The Art of Self-Defense (2019)
-    <<: *Left_side
-  484641: # Anna (2019)
-    <<: *Down_corners
-  486131: # Shaft (2019)
-    <<: *Bottom
-  495764: # Birds of Prey (and the Fantabulous Emancipation of One Harley Quinn) (2020)
-    <<: *Up_corners
-  497698: # Black Widow (2021)
-    <<: *Up_corners
-  499932: # The Devil All the Time (2020)
-    <<: *Up_corners
-  501170: # Doctor Sleep (2019)
-    <<: *Bottom
-  504608: # Rocketman (2019)
-    <<: *Bottom
-  520016: # Driven (2019)
-    <<: *Bottom
-  522039: # The Last Black Man in San Francisco (2019)
-    <<: *Up_corners
-  524434: # Eternals (2021)
-    <<: *Up_corners
-  526896: # Morbius (2022)
-    <<: *Up_corners
-  531428: # Portrait of a Lady on Fire (2019)
-    <<: *Up_corners
-  535265: # Killers Anonymous (2019)
-    <<: *Up_corners
-  535581: # The Dead Don't Die (2019)
-    <<: *Up_corners
-  546554: # Knives Out (2019)
-    <<: *Bottom
-  547016: # The Old Guard (2020)
-    <<: *Up_corners
-  559907: # The Green Knight (2021)
-    <<: *Bottom
-  556678: # Emma. (2020)
-    <<: *Down_corners
-  566525: # Shang-Chi and the Legend of the Ten Rings (2021)
-    <<: *Up_corners
-  567410: # System Crasher (2019)
-    <<: *Bottom
-  568160: # Weathering with You (2019)
-    <<: *Bottom
-  575088: # Baba Yaga: Terror of the Dark Forest (2020)
-    <<: *Up_corners
-  576845: # Last Night in Soho (2021)
-    <<: *Bottom
-  580489: # Venom: Let There Be Carnage (2021)
-    <<: *Up_corners
-  581392: # Peninsula (2020)
-    <<: *Bottom
-  581526: #
-    <<: *Down_corners
-  582218: # Psych 2: Lassie Come Home (2020)
-    <<: *Down_corners
-  585378: # After Yang (2022)
-    <<: *Bottom
-  586592: # Come to Daddy (2019)
-    <<: *Bottom
-  597208: # Nightmare Alley (2021)
-    <<: *Down_corners
-  600583: # The Power of the Dog (2021)
-    <<: *Bottom
-  602223: # The Forever Purge (2021)
-    <<: *Bottom
-  602269: # The Little Things (2021)
-    <<: *Bottom
-  606402: # Yaksha: Ruthless Operations (2022)
-    <<: *Up_corners
-  614911: # The Midnight Sky (2020)
-    <<: *Bottom
-  615667: # Ma Rainey's Black Bottom (2020)
-    <<: *Bottom
-  617653: # The Last Duel (2021)
-    <<: *Up_corners
-  624860: # The Matrix Resurrections (2021)
-    <<: *Up_corners
-  627725: # The Banker (2020)
-    <<: *Up_corners
-  629542: # The Bad Guys (2022)
-    <<: *Up_corners
-  632617: # C'mon C'mon (2021)
-    <<: *Bottom
-  634649: # Spider-Man: No Way Home (2021)
-    <<: *Up_corners
-  635302: # Demon Slayer -Kimetsu no Yaiba- The Movie: Mugen Train (2020)
-    <<: *Down_corners
   637649: # Wrath of Man (2021)
     title: Wrath of Man
-    <<: *Up_corners
-  641662: # Pieces of a Woman (2020)
-    label: Up_corners
-  648579: # The Unbearable Weight of Massive Talent (2022)
-    <<: *Up_corners
-  652004: # The Wolf of Snow Hollow (2020)
-    <<: *Up_corners
-  653606: # The Last Shift (2020)
-    <<: *Bottom
-  663870: # Riders of Justice (2020)
-    <<: *Up_corners
-  673319: # Happily (2021)
-    <<: *Bottom
-  680058: # The Rescue (2021)
-    <<: *Bottom
-  696806: # The Adam Project (2022)
-    <<: *Up_corners
-  639933: # The Northman (2022)
-    <<: *Down_corners
-  716594: # No Man of God (2021)
-    <<: *Bottom
-  716612: # Spencer (2021)
-    <<: *Left_side
-  732203: # Gintama: The Final (2021)
-    <<: *Down_corners
-  736073: # Batman: The Long Halloween, Part One (2021)
-    <<: *Up_corners
-  736074: # Batman: The Long Halloween, Part Two (2021)
-    <<: *Up_corners
-  758724: # The Cellar (2022)
-    <<: *Down_corners
-  758866: # Drive My Car (2021)
-    <<: *Down_corners
-  760104: # X (2022)
-    <<: *Up_corners
-  765869: # Black Friday (2021)
-    <<: *Bottom
-  766798: # Parallel Mothers (2021)
-    <<: *Up_corners
-  771536: # You Are Not My Mother (2022)
-    <<: *Up_corners
-  787752: # Fresh (2022)
-    <<: *Bottom
-  791373: # Zack Snyder's Justice League (2021)
-    <<: *Up_corners
-  795813: # I'm Your Man (2021)
-    <<: *Bottom
-  823754: # Bo Burnham: Inside (2021)
-    <<: *Left_side
-  829400: # Psych 3: This Is Gus (2021)
-    <<: *Down_corners
-  848886: # Hellbender (2022)
-    <<: *Up_corners
-  869250: # Being James Bond (2021)
-    <<: *Up_corners
-  881198: # Tony Hawk: Until the Wheels Fall Off (2022)
-    <<: *Up_corners
-  899082: # Harry Potter 20th Anniversary: Return to Hogwarts (2022)
-    <<: *Up_corners
\ No newline at end of file
diff --git a/cpt-kuesel/overlays/_flags/chinese.png b/cpt-kuesel/overlays/_flags/chinese.png
new file mode 100644
index 0000000..343af1a
Binary files /dev/null and b/cpt-kuesel/overlays/_flags/chinese.png differ
diff --git a/cpt-kuesel/overlays/_flags/czech.png b/cpt-kuesel/overlays/_flags/czech.png
new file mode 100644
index 0000000..5c13d77
Binary files /dev/null and b/cpt-kuesel/overlays/_flags/czech.png differ
diff --git a/cpt-kuesel/overlays/_flags/danish.png b/cpt-kuesel/overlays/_flags/danish.png
new file mode 100644
index 0000000..e5a449e
Binary files /dev/null and b/cpt-kuesel/overlays/_flags/danish.png differ
diff --git a/cpt-kuesel/overlays/_flags/dutch.png b/cpt-kuesel/overlays/_flags/dutch.png
new file mode 100644
index 0000000..dda1ffd
Binary files /dev/null and b/cpt-kuesel/overlays/_flags/dutch.png differ
diff --git a/cpt-kuesel/overlays/_flags/english.png b/cpt-kuesel/overlays/_flags/english.png
new file mode 100644
index 0000000..f58a71e
Binary files /dev/null and b/cpt-kuesel/overlays/_flags/english.png differ
diff --git a/cpt-kuesel/overlays/_flags/farsi.png b/cpt-kuesel/overlays/_flags/farsi.png
new file mode 100644
index 0000000..8aa26b6
Binary files /dev/null and b/cpt-kuesel/overlays/_flags/farsi.png differ
diff --git a/cpt-kuesel/overlays/_flags/french.png b/cpt-kuesel/overlays/_flags/french.png
new file mode 100644
index 0000000..c580cc6
Binary files /dev/null and b/cpt-kuesel/overlays/_flags/french.png differ
diff --git a/cpt-kuesel/overlays/_flags/german.png b/cpt-kuesel/overlays/_flags/german.png
new file mode 100644
index 0000000..e863c4f
Binary files /dev/null and b/cpt-kuesel/overlays/_flags/german.png differ
diff --git a/cpt-kuesel/overlays/_flags/hindi.png b/cpt-kuesel/overlays/_flags/hindi.png
new file mode 100644
index 0000000..b4daf7c
Binary files /dev/null and b/cpt-kuesel/overlays/_flags/hindi.png differ
diff --git a/cpt-kuesel/overlays/_flags/hungarian.png b/cpt-kuesel/overlays/_flags/hungarian.png
new file mode 100644
index 0000000..6fd54e8
Binary files /dev/null and b/cpt-kuesel/overlays/_flags/hungarian.png differ
diff --git a/cpt-kuesel/overlays/_flags/icelandic.png b/cpt-kuesel/overlays/_flags/icelandic.png
new file mode 100644
index 0000000..bfb62cd
Binary files /dev/null and b/cpt-kuesel/overlays/_flags/icelandic.png differ
diff --git a/cpt-kuesel/overlays/_flags/italian.png b/cpt-kuesel/overlays/_flags/italian.png
new file mode 100644
index 0000000..858929f
Binary files /dev/null and b/cpt-kuesel/overlays/_flags/italian.png differ
diff --git a/cpt-kuesel/overlays/_flags/japanese.png b/cpt-kuesel/overlays/_flags/japanese.png
new file mode 100644
index 0000000..66e8c83
Binary files /dev/null and b/cpt-kuesel/overlays/_flags/japanese.png differ
diff --git a/cpt-kuesel/overlays/_flags/korean.png b/cpt-kuesel/overlays/_flags/korean.png
new file mode 100644
index 0000000..090ebfd
Binary files /dev/null and b/cpt-kuesel/overlays/_flags/korean.png differ
diff --git a/cpt-kuesel/overlays/_flags/norwegian.png b/cpt-kuesel/overlays/_flags/norwegian.png
new file mode 100644
index 0000000..107da4d
Binary files /dev/null and b/cpt-kuesel/overlays/_flags/norwegian.png differ
diff --git a/cpt-kuesel/overlays/_flags/polish.png b/cpt-kuesel/overlays/_flags/polish.png
new file mode 100644
index 0000000..eaa34ea
Binary files /dev/null and b/cpt-kuesel/overlays/_flags/polish.png differ
diff --git a/cpt-kuesel/overlays/_flags/portuguese.png b/cpt-kuesel/overlays/_flags/portuguese.png
new file mode 100644
index 0000000..9373cf7
Binary files /dev/null and b/cpt-kuesel/overlays/_flags/portuguese.png differ
diff --git a/cpt-kuesel/overlays/_flags/russian.png b/cpt-kuesel/overlays/_flags/russian.png
new file mode 100644
index 0000000..a6fce30
Binary files /dev/null and b/cpt-kuesel/overlays/_flags/russian.png differ
diff --git a/cpt-kuesel/overlays/_flags/spanish.png b/cpt-kuesel/overlays/_flags/spanish.png
new file mode 100644
index 0000000..9a25502
Binary files /dev/null and b/cpt-kuesel/overlays/_flags/spanish.png differ
diff --git a/cpt-kuesel/overlays/_flags/swedish.png b/cpt-kuesel/overlays/_flags/swedish.png
new file mode 100644
index 0000000..2638596
Binary files /dev/null and b/cpt-kuesel/overlays/_flags/swedish.png differ
diff --git a/cpt-kuesel/overlays/_flags/telugu.png b/cpt-kuesel/overlays/_flags/telugu.png
new file mode 100644
index 0000000..f7faccf
Binary files /dev/null and b/cpt-kuesel/overlays/_flags/telugu.png differ
diff --git a/cpt-kuesel/overlays/_flags/thai.png b/cpt-kuesel/overlays/_flags/thai.png
new file mode 100644
index 0000000..a416475
Binary files /dev/null and b/cpt-kuesel/overlays/_flags/thai.png differ
diff --git a/cpt-kuesel/overlays/_flags/turkish.png b/cpt-kuesel/overlays/_flags/turkish.png
new file mode 100644
index 0000000..d458820
Binary files /dev/null and b/cpt-kuesel/overlays/_flags/turkish.png differ
diff --git a/cpt-kuesel/overlays/_flags/ukrainian.png b/cpt-kuesel/overlays/_flags/ukrainian.png
new file mode 100644
index 0000000..f1828ce
Binary files /dev/null and b/cpt-kuesel/overlays/_flags/ukrainian.png differ
diff --git a/cpt-kuesel/overlays/_posters/186x113/4k.png b/cpt-kuesel/overlays/_posters/186x113/4k.png
deleted file mode 100644
index 9a9114c..0000000
Binary files a/cpt-kuesel/overlays/_posters/186x113/4k.png and /dev/null differ
diff --git a/cpt-kuesel/overlays/_posters/186x113/chinese.png b/cpt-kuesel/overlays/_posters/186x113/chinese.png
deleted file mode 100644
index ffd3200..0000000
Binary files a/cpt-kuesel/overlays/_posters/186x113/chinese.png and /dev/null differ
diff --git a/cpt-kuesel/overlays/_posters/186x113/czech.png b/cpt-kuesel/overlays/_posters/186x113/czech.png
deleted file mode 100644
index 6361627..0000000
Binary files a/cpt-kuesel/overlays/_posters/186x113/czech.png and /dev/null differ
diff --git a/cpt-kuesel/overlays/_posters/186x113/danish.png b/cpt-kuesel/overlays/_posters/186x113/danish.png
deleted file mode 100644
index 82022a9..0000000
Binary files a/cpt-kuesel/overlays/_posters/186x113/danish.png and /dev/null differ
diff --git a/cpt-kuesel/overlays/_posters/186x113/dutch.png b/cpt-kuesel/overlays/_posters/186x113/dutch.png
deleted file mode 100644
index fb49ab7..0000000
Binary files a/cpt-kuesel/overlays/_posters/186x113/dutch.png and /dev/null differ
diff --git a/cpt-kuesel/overlays/_posters/186x113/english.png b/cpt-kuesel/overlays/_posters/186x113/english.png
deleted file mode 100644
index 22da1c8..0000000
Binary files a/cpt-kuesel/overlays/_posters/186x113/english.png and /dev/null differ
diff --git a/cpt-kuesel/overlays/_posters/186x113/french.png b/cpt-kuesel/overlays/_posters/186x113/french.png
deleted file mode 100644
index 064e385..0000000
Binary files a/cpt-kuesel/overlays/_posters/186x113/french.png and /dev/null differ
diff --git a/cpt-kuesel/overlays/_posters/186x113/german.png b/cpt-kuesel/overlays/_posters/186x113/german.png
deleted file mode 100644
index 1fab7a4..0000000
Binary files a/cpt-kuesel/overlays/_posters/186x113/german.png and /dev/null differ
diff --git a/cpt-kuesel/overlays/_posters/186x113/hdr.png b/cpt-kuesel/overlays/_posters/186x113/hdr.png
deleted file mode 100644
index be7ca0d..0000000
Binary files a/cpt-kuesel/overlays/_posters/186x113/hdr.png and /dev/null differ
diff --git a/cpt-kuesel/overlays/_posters/186x113/hungarian.png b/cpt-kuesel/overlays/_posters/186x113/hungarian.png
deleted file mode 100644
index 3d36e84..0000000
Binary files a/cpt-kuesel/overlays/_posters/186x113/hungarian.png and /dev/null differ
diff --git a/cpt-kuesel/overlays/_posters/186x113/icelandic.png b/cpt-kuesel/overlays/_posters/186x113/icelandic.png
deleted file mode 100644
index a171467..0000000
Binary files a/cpt-kuesel/overlays/_posters/186x113/icelandic.png and /dev/null differ
diff --git a/cpt-kuesel/overlays/_posters/186x113/indian.png b/cpt-kuesel/overlays/_posters/186x113/indian.png
deleted file mode 100644
index 5127a4a..0000000
Binary files a/cpt-kuesel/overlays/_posters/186x113/indian.png and /dev/null differ
diff --git a/cpt-kuesel/overlays/_posters/186x113/iranian.png b/cpt-kuesel/overlays/_posters/186x113/iranian.png
deleted file mode 100644
index c3973b1..0000000
Binary files a/cpt-kuesel/overlays/_posters/186x113/iranian.png and /dev/null differ
diff --git a/cpt-kuesel/overlays/_posters/186x113/italian.png b/cpt-kuesel/overlays/_posters/186x113/italian.png
deleted file mode 100644
index 770662f..0000000
Binary files a/cpt-kuesel/overlays/_posters/186x113/italian.png and /dev/null differ
diff --git a/cpt-kuesel/overlays/_posters/186x113/japanese.png b/cpt-kuesel/overlays/_posters/186x113/japanese.png
deleted file mode 100644
index 7c0683e..0000000
Binary files a/cpt-kuesel/overlays/_posters/186x113/japanese.png and /dev/null differ
diff --git a/cpt-kuesel/overlays/_posters/186x113/korean.png b/cpt-kuesel/overlays/_posters/186x113/korean.png
deleted file mode 100644
index 1ce3089..0000000
Binary files a/cpt-kuesel/overlays/_posters/186x113/korean.png and /dev/null differ
diff --git a/cpt-kuesel/overlays/_posters/186x113/norwegian.png b/cpt-kuesel/overlays/_posters/186x113/norwegian.png
deleted file mode 100644
index b1ab70e..0000000
Binary files a/cpt-kuesel/overlays/_posters/186x113/norwegian.png and /dev/null differ
diff --git a/cpt-kuesel/overlays/_posters/186x113/polish.png b/cpt-kuesel/overlays/_posters/186x113/polish.png
deleted file mode 100644
index a9d6468..0000000
Binary files a/cpt-kuesel/overlays/_posters/186x113/polish.png and /dev/null differ
diff --git a/cpt-kuesel/overlays/_posters/186x113/portuguese.png b/cpt-kuesel/overlays/_posters/186x113/portuguese.png
deleted file mode 100644
index 0e9a5be..0000000
Binary files a/cpt-kuesel/overlays/_posters/186x113/portuguese.png and /dev/null differ
diff --git a/cpt-kuesel/overlays/_posters/186x113/russian.png b/cpt-kuesel/overlays/_posters/186x113/russian.png
deleted file mode 100644
index ec07f54..0000000
Binary files a/cpt-kuesel/overlays/_posters/186x113/russian.png and /dev/null differ
diff --git a/cpt-kuesel/overlays/_posters/186x113/spanish.png b/cpt-kuesel/overlays/_posters/186x113/spanish.png
deleted file mode 100644
index 3c7f0cd..0000000
Binary files a/cpt-kuesel/overlays/_posters/186x113/spanish.png and /dev/null differ
diff --git a/cpt-kuesel/overlays/_posters/186x113/swedish.png b/cpt-kuesel/overlays/_posters/186x113/swedish.png
deleted file mode 100644
index cbb40c3..0000000
Binary files a/cpt-kuesel/overlays/_posters/186x113/swedish.png and /dev/null differ
diff --git a/cpt-kuesel/overlays/_posters/186x113/thai.png b/cpt-kuesel/overlays/_posters/186x113/thai.png
deleted file mode 100644
index fad1539..0000000
Binary files a/cpt-kuesel/overlays/_posters/186x113/thai.png and /dev/null differ
diff --git a/cpt-kuesel/overlays/_posters/186x113/turkish.png b/cpt-kuesel/overlays/_posters/186x113/turkish.png
deleted file mode 100644
index 7d80322..0000000
Binary files a/cpt-kuesel/overlays/_posters/186x113/turkish.png and /dev/null differ
diff --git a/cpt-kuesel/overlays/_posters/186x113/ukrainian.png b/cpt-kuesel/overlays/_posters/186x113/ukrainian.png
deleted file mode 100644
index 28d798f..0000000
Binary files a/cpt-kuesel/overlays/_posters/186x113/ukrainian.png and /dev/null differ
diff --git a/cpt-kuesel/overlays/_posters/4k.png b/cpt-kuesel/overlays/_posters/4k.png
deleted file mode 100644
index 5825a67..0000000
Binary files a/cpt-kuesel/overlays/_posters/4k.png and /dev/null differ
diff --git a/cpt-kuesel/overlays/_posters/chinese.png b/cpt-kuesel/overlays/_posters/chinese.png
deleted file mode 100644
index 1fc7b31..0000000
Binary files a/cpt-kuesel/overlays/_posters/chinese.png and /dev/null differ
diff --git a/cpt-kuesel/overlays/_posters/czech.png b/cpt-kuesel/overlays/_posters/czech.png
deleted file mode 100644
index 5548b7c..0000000
Binary files a/cpt-kuesel/overlays/_posters/czech.png and /dev/null differ
diff --git a/cpt-kuesel/overlays/_posters/danish.png b/cpt-kuesel/overlays/_posters/danish.png
deleted file mode 100644
index e026ffd..0000000
Binary files a/cpt-kuesel/overlays/_posters/danish.png and /dev/null differ
diff --git a/cpt-kuesel/overlays/_posters/dutch.png b/cpt-kuesel/overlays/_posters/dutch.png
deleted file mode 100644
index 898430c..0000000
Binary files a/cpt-kuesel/overlays/_posters/dutch.png and /dev/null differ
diff --git a/cpt-kuesel/overlays/_posters/english.png b/cpt-kuesel/overlays/_posters/english.png
deleted file mode 100644
index 21444ad..0000000
Binary files a/cpt-kuesel/overlays/_posters/english.png and /dev/null differ
diff --git a/cpt-kuesel/overlays/_posters/french.png b/cpt-kuesel/overlays/_posters/french.png
deleted file mode 100644
index 26aecf2..0000000
Binary files a/cpt-kuesel/overlays/_posters/french.png and /dev/null differ
diff --git a/cpt-kuesel/overlays/_posters/german.png b/cpt-kuesel/overlays/_posters/german.png
deleted file mode 100644
index 5d94435..0000000
Binary files a/cpt-kuesel/overlays/_posters/german.png and /dev/null differ
diff --git a/cpt-kuesel/overlays/_posters/hdr.png b/cpt-kuesel/overlays/_posters/hdr.png
deleted file mode 100644
index 63f5cce..0000000
Binary files a/cpt-kuesel/overlays/_posters/hdr.png and /dev/null differ
diff --git a/cpt-kuesel/overlays/_posters/hungarian.png b/cpt-kuesel/overlays/_posters/hungarian.png
deleted file mode 100644
index ea6fac9..0000000
Binary files a/cpt-kuesel/overlays/_posters/hungarian.png and /dev/null differ
diff --git a/cpt-kuesel/overlays/_posters/icelandic.png b/cpt-kuesel/overlays/_posters/icelandic.png
deleted file mode 100644
index 0b3c912..0000000
Binary files a/cpt-kuesel/overlays/_posters/icelandic.png and /dev/null differ
diff --git a/cpt-kuesel/overlays/_posters/indian.png b/cpt-kuesel/overlays/_posters/indian.png
deleted file mode 100644
index b30f1f3..0000000
Binary files a/cpt-kuesel/overlays/_posters/indian.png and /dev/null differ
diff --git a/cpt-kuesel/overlays/_posters/iranian.png b/cpt-kuesel/overlays/_posters/iranian.png
deleted file mode 100644
index 5c294c4..0000000
Binary files a/cpt-kuesel/overlays/_posters/iranian.png and /dev/null differ
diff --git a/cpt-kuesel/overlays/_posters/italian.png b/cpt-kuesel/overlays/_posters/italian.png
deleted file mode 100644
index a35ea03..0000000
Binary files a/cpt-kuesel/overlays/_posters/italian.png and /dev/null differ
diff --git a/cpt-kuesel/overlays/_posters/japanese.png b/cpt-kuesel/overlays/_posters/japanese.png
deleted file mode 100644
index b181cbc..0000000
Binary files a/cpt-kuesel/overlays/_posters/japanese.png and /dev/null differ
diff --git a/cpt-kuesel/overlays/_posters/korean.png b/cpt-kuesel/overlays/_posters/korean.png
deleted file mode 100644
index 82e0a87..0000000
Binary files a/cpt-kuesel/overlays/_posters/korean.png and /dev/null differ
diff --git a/cpt-kuesel/overlays/_posters/norwegian.png b/cpt-kuesel/overlays/_posters/norwegian.png
deleted file mode 100644
index bd8ee88..0000000
Binary files a/cpt-kuesel/overlays/_posters/norwegian.png and /dev/null differ
diff --git a/cpt-kuesel/overlays/_posters/polish.png b/cpt-kuesel/overlays/_posters/polish.png
deleted file mode 100644
index 46b0b8d..0000000
Binary files a/cpt-kuesel/overlays/_posters/polish.png and /dev/null differ
diff --git a/cpt-kuesel/overlays/_posters/portuguese.png b/cpt-kuesel/overlays/_posters/portuguese.png
deleted file mode 100644
index d646d9f..0000000
Binary files a/cpt-kuesel/overlays/_posters/portuguese.png and /dev/null differ
diff --git a/cpt-kuesel/overlays/_posters/remux.png b/cpt-kuesel/overlays/_posters/remux.png
deleted file mode 100644
index 9aa477c..0000000
Binary files a/cpt-kuesel/overlays/_posters/remux.png and /dev/null differ
diff --git a/cpt-kuesel/overlays/_posters/russian.png b/cpt-kuesel/overlays/_posters/russian.png
deleted file mode 100644
index aa5b626..0000000
Binary files a/cpt-kuesel/overlays/_posters/russian.png and /dev/null differ
diff --git a/cpt-kuesel/overlays/_posters/spanish.png b/cpt-kuesel/overlays/_posters/spanish.png
deleted file mode 100644
index 0fcbfcd..0000000
Binary files a/cpt-kuesel/overlays/_posters/spanish.png and /dev/null differ
diff --git a/cpt-kuesel/overlays/_posters/swedish.png b/cpt-kuesel/overlays/_posters/swedish.png
deleted file mode 100644
index f807476..0000000
Binary files a/cpt-kuesel/overlays/_posters/swedish.png and /dev/null differ
diff --git a/cpt-kuesel/overlays/_posters/thai.png b/cpt-kuesel/overlays/_posters/thai.png
deleted file mode 100644
index 762119d..0000000
Binary files a/cpt-kuesel/overlays/_posters/thai.png and /dev/null differ
diff --git a/cpt-kuesel/overlays/_posters/turkish.png b/cpt-kuesel/overlays/_posters/turkish.png
deleted file mode 100644
index 3be29ae..0000000
Binary files a/cpt-kuesel/overlays/_posters/turkish.png and /dev/null differ
diff --git a/cpt-kuesel/overlays/_posters/ukrainian.png b/cpt-kuesel/overlays/_posters/ukrainian.png
deleted file mode 100644
index 4a6729e..0000000
Binary files a/cpt-kuesel/overlays/_posters/ukrainian.png and /dev/null differ
diff --git a/cpt-kuesel/overlays/_titlecards/4k.png b/cpt-kuesel/overlays/_titlecards/4k.png
deleted file mode 100644
index f3452d4..0000000
Binary files a/cpt-kuesel/overlays/_titlecards/4k.png and /dev/null differ
diff --git a/cpt-kuesel/overlays/_titlecards/chinese.png b/cpt-kuesel/overlays/_titlecards/chinese.png
deleted file mode 100644
index 0c942fb..0000000
Binary files a/cpt-kuesel/overlays/_titlecards/chinese.png and /dev/null differ
diff --git a/cpt-kuesel/overlays/_titlecards/czech.png b/cpt-kuesel/overlays/_titlecards/czech.png
deleted file mode 100644
index f8f0127..0000000
Binary files a/cpt-kuesel/overlays/_titlecards/czech.png and /dev/null differ
diff --git a/cpt-kuesel/overlays/_titlecards/danish.png b/cpt-kuesel/overlays/_titlecards/danish.png
deleted file mode 100644
index 548f35e..0000000
Binary files a/cpt-kuesel/overlays/_titlecards/danish.png and /dev/null differ
diff --git a/cpt-kuesel/overlays/_titlecards/dutch.png b/cpt-kuesel/overlays/_titlecards/dutch.png
deleted file mode 100644
index ee09786..0000000
Binary files a/cpt-kuesel/overlays/_titlecards/dutch.png and /dev/null differ
diff --git a/cpt-kuesel/overlays/_titlecards/english.png b/cpt-kuesel/overlays/_titlecards/english.png
deleted file mode 100644
index d2adf75..0000000
Binary files a/cpt-kuesel/overlays/_titlecards/english.png and /dev/null differ
diff --git a/cpt-kuesel/overlays/_titlecards/french.png b/cpt-kuesel/overlays/_titlecards/french.png
deleted file mode 100644
index cb96fa8..0000000
Binary files a/cpt-kuesel/overlays/_titlecards/french.png and /dev/null differ
diff --git a/cpt-kuesel/overlays/_titlecards/german.png b/cpt-kuesel/overlays/_titlecards/german.png
deleted file mode 100644
index 53929ed..0000000
Binary files a/cpt-kuesel/overlays/_titlecards/german.png and /dev/null differ
diff --git a/cpt-kuesel/overlays/_titlecards/hdr.png b/cpt-kuesel/overlays/_titlecards/hdr.png
deleted file mode 100644
index 4580f83..0000000
Binary files a/cpt-kuesel/overlays/_titlecards/hdr.png and /dev/null differ
diff --git a/cpt-kuesel/overlays/_titlecards/hungarian.png b/cpt-kuesel/overlays/_titlecards/hungarian.png
deleted file mode 100644
index e83436f..0000000
Binary files a/cpt-kuesel/overlays/_titlecards/hungarian.png and /dev/null differ
diff --git a/cpt-kuesel/overlays/_titlecards/icelandic.png b/cpt-kuesel/overlays/_titlecards/icelandic.png
deleted file mode 100644
index 075a1b1..0000000
Binary files a/cpt-kuesel/overlays/_titlecards/icelandic.png and /dev/null differ
diff --git a/cpt-kuesel/overlays/_titlecards/indian.png b/cpt-kuesel/overlays/_titlecards/indian.png
deleted file mode 100644
index 54de53d..0000000
Binary files a/cpt-kuesel/overlays/_titlecards/indian.png and /dev/null differ
diff --git a/cpt-kuesel/overlays/_titlecards/iranian.png b/cpt-kuesel/overlays/_titlecards/iranian.png
deleted file mode 100644
index e2240d1..0000000
Binary files a/cpt-kuesel/overlays/_titlecards/iranian.png and /dev/null differ
diff --git a/cpt-kuesel/overlays/_titlecards/italian.png b/cpt-kuesel/overlays/_titlecards/italian.png
deleted file mode 100644
index 91c3c59..0000000
Binary files a/cpt-kuesel/overlays/_titlecards/italian.png and /dev/null differ
diff --git a/cpt-kuesel/overlays/_titlecards/japanese.png b/cpt-kuesel/overlays/_titlecards/japanese.png
deleted file mode 100644
index 3c42efb..0000000
Binary files a/cpt-kuesel/overlays/_titlecards/japanese.png and /dev/null differ
diff --git a/cpt-kuesel/overlays/_titlecards/korean.png b/cpt-kuesel/overlays/_titlecards/korean.png
deleted file mode 100644
index 931500c..0000000
Binary files a/cpt-kuesel/overlays/_titlecards/korean.png and /dev/null differ
diff --git a/cpt-kuesel/overlays/_titlecards/norwegian.png b/cpt-kuesel/overlays/_titlecards/norwegian.png
deleted file mode 100644
index b88269e..0000000
Binary files a/cpt-kuesel/overlays/_titlecards/norwegian.png and /dev/null differ
diff --git a/cpt-kuesel/overlays/_titlecards/polish.png b/cpt-kuesel/overlays/_titlecards/polish.png
deleted file mode 100644
index 344bd32..0000000
Binary files a/cpt-kuesel/overlays/_titlecards/polish.png and /dev/null differ
diff --git a/cpt-kuesel/overlays/_titlecards/portuguese.png b/cpt-kuesel/overlays/_titlecards/portuguese.png
deleted file mode 100644
index 0e3b224..0000000
Binary files a/cpt-kuesel/overlays/_titlecards/portuguese.png and /dev/null differ
diff --git a/cpt-kuesel/overlays/_titlecards/remux.png b/cpt-kuesel/overlays/_titlecards/remux.png
deleted file mode 100644
index 086bddd..0000000
Binary files a/cpt-kuesel/overlays/_titlecards/remux.png and /dev/null differ
diff --git a/cpt-kuesel/overlays/_titlecards/russian.png b/cpt-kuesel/overlays/_titlecards/russian.png
deleted file mode 100644
index f4644a8..0000000
Binary files a/cpt-kuesel/overlays/_titlecards/russian.png and /dev/null differ
diff --git a/cpt-kuesel/overlays/_titlecards/spanish.png b/cpt-kuesel/overlays/_titlecards/spanish.png
deleted file mode 100644
index dbed077..0000000
Binary files a/cpt-kuesel/overlays/_titlecards/spanish.png and /dev/null differ
diff --git a/cpt-kuesel/overlays/_titlecards/swedish.png b/cpt-kuesel/overlays/_titlecards/swedish.png
deleted file mode 100644
index 0904dbe..0000000
Binary files a/cpt-kuesel/overlays/_titlecards/swedish.png and /dev/null differ
diff --git a/cpt-kuesel/overlays/_titlecards/thai.png b/cpt-kuesel/overlays/_titlecards/thai.png
deleted file mode 100644
index 3d4cc47..0000000
Binary files a/cpt-kuesel/overlays/_titlecards/thai.png and /dev/null differ
diff --git a/cpt-kuesel/overlays/_titlecards/turkish.png b/cpt-kuesel/overlays/_titlecards/turkish.png
deleted file mode 100644
index 78fba52..0000000
Binary files a/cpt-kuesel/overlays/_titlecards/turkish.png and /dev/null differ
diff --git a/cpt-kuesel/overlays/_titlecards/ukrainian.png b/cpt-kuesel/overlays/_titlecards/ukrainian.png
deleted file mode 100644
index 98a13d2..0000000
Binary files a/cpt-kuesel/overlays/_titlecards/ukrainian.png and /dev/null differ
diff --git a/cpt-kuesel/overlays/admin/queues.yml b/cpt-kuesel/overlays/admin/queues.yml
index 233ec63..387aa01 100644
--- a/cpt-kuesel/overlays/admin/queues.yml
+++ b/cpt-kuesel/overlays/admin/queues.yml
@@ -1,91 +1,25 @@
 queues:
-  default_portrait_flags:
-    - horizontal_offset: 250
-      vertical_offset: 0
-    - horizontal_offset: 500
-      vertical_offset: 0
-  default_portrait_badges:
-    - horizontal_offset: 0
-      vertical_offset: 0
-    - horizontal_offset: 750
-      vertical_offset: 0
-
-  default_landscape_flags:
-    - horizontal_offset: 240
-      vertical_offset: 0
-    - horizontal_offset: 480
-      vertical_offset: 0
-  default_landscape_badges:
-    - horizontal_offset: 0
-      vertical_offset: 0
-    - horizontal_offset: 0
-      vertical_offset: 180
-
-  bottom_portrait_flags:
-    - horizontal_offset: 250
-      vertical_offset: 1350
-    - horizontal_offset: 500
-      vertical_offset: 1350
-  bottom_portrait_badges:
-    - horizontal_offset: 0
-      vertical_offset: 1350
-    - horizontal_offset: 750
-      vertical_offset: 1350
-
-  up_corners_portrait_flags:
-    - horizontal_offset: 0
-      vertical_offset: 0
-    - horizontal_offset: 750
-      vertical_offset: 0
-  up_corners_portrait_badges:
-    - horizontal_offset: 0
-      vertical_offset: 150
-    - horizontal_offset: 750
-      vertical_offset: 150
-
-  down_corners_portrait_flags:
-    - horizontal_offset: 0
-      vertical_offset: 1350
-    - horizontal_offset: 750
-      vertical_offset: 1350
-  down_corners_portrait_badges:
-    - horizontal_offset: 0
-      vertical_offset: 1200
-    - horizontal_offset: 750
-      vertical_offset: 1200
-
-  left_side_portrait_flags:
-    - horizontal_offset: 0
-      vertical_offset: 600
-    - horizontal_offset: 0
-      vertical_offset: 750
-  left_side_portrait_badges:
-    - horizontal_offset: 750
-      vertical_offset: 450
-    - horizontal_offset: 750
-      vertical_offset: 900
-
-  right_side_portrait_flags:
-    - horizontal_offset: 0
-      vertical_offset: 600
-    - horizontal_offset: 750
-      vertical_offset: 750
-  right_side_portrait_badges:
-    - horizontal_offset: 0
-      vertical_offset: 450
-    - horizontal_offset: 750
-      vertical_offset: 900
-
-  sides_portrait_flags:
-    - horizontal_offset: 0
-      vertical_offset: 600
-    - horizontal_offset: 750
-      vertical_offset: 600
-  sides_portrait_badges:
-    - horizontal_offset: 0
-      vertical_offset: 750
-    - horizontal_offset: 750
-      vertical_offset: 750
+  flags:
+    - horizontal_align: left
+      vertical_align: top
+      horizontal_offset: 15
+      vertical_offset: 15
+    - horizontal_align: left
+      vertical_align: top
+      horizontal_offset: 15
+      vertical_offset: 75
+    - horizontal_align: left
+      vertical_align: top
+      horizontal_offset: 15
+      vertical_offset: 135
+    - horizontal_align: left
+      vertical_align: top
+      horizontal_offset: 15
+      vertical_offset: 195
+    - horizontal_align: left
+      vertical_align: top
+      horizontal_offset: 15
+      vertical_offset: 255
 
 overlays:
   queue_pseudo_overlay:
diff --git a/cpt-kuesel/overlays/badges.yml b/cpt-kuesel/overlays/badges.yml
deleted file mode 100644
index d50f94c..0000000
--- a/cpt-kuesel/overlays/badges.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-external_templates:
-  - file: metadata/admin/_templates.yml
-  - file: metadata/admin/_switches.yml
-
-overlays:
-  uhd:
-    template:
-      - name: sw_uhd
-      - name: it_items
-        it_uhd: 4k
-      - name: ol_builder
-        ol_overlay: uhd
-        ol_file: 4k
-        ol_weight: 50
-  hdr:
-    template:
-      - name: sw_hdr
-      - name: it_items
-        it_hdr: true
-      - name: ol_builder
-        ol_overlay: hdr
-        ol_file: hdr
-        ol_weight: 49
\ No newline at end of file
diff --git a/cpt-kuesel/overlays/flags.yml b/cpt-kuesel/overlays/flags.yml
index 80d46c7..d284471 100644
--- a/cpt-kuesel/overlays/flags.yml
+++ b/cpt-kuesel/overlays/flags.yml
@@ -5,217 +5,169 @@ external_templates:
 overlays:
   german:
     template:
-      - name: sw_german
-      - name: it_items
-        it_language: de
-      - name: ol_builder
-        ol_overlay: german
-        ol_file: german
-        ol_weight: 89
+      - name: use_german
+      - name: flag_overlay
+        language: de
+        overlay: german
+        weight: 89
   english:
     template:
-      - name: sw_english
-      - name: it_items
-        it_language: en
-      - name: ol_builder
-        ol_overlay: english
-        ol_file: english
-        ol_weight: 88
+      - name: use_english
+      - name: flag_overlay
+        language: en
+        overlay: english
+        weight: 88
   french:
     template:
-      - name: sw_french
-      - name: it_items
-        it_language: fr
-      - name: ol_builder
-        ol_overlay: french
-        ol_file: french
-        ol_weight: 87
+      - name: use_french
+      - name: flag_overlay
+        language: fr
+        overlay: french
+        weight: 87
   japanese:
     template:
-      - name: sw_japanese
-      - name: it_items
-        it_language: ja
-      - name: ol_builder
-        ol_overlay: japanese
-        ol_file: japanese
-        ol_weight: 86
+      - name: use_japanese
+      - name: flag_overlay
+        language: ja
+        overlay: japanese
+        weight: 86
   korean:
     template:
-      - name: sw_korean
-      - name: it_items
-        it_language: ko
-      - name: ol_builder
-        ol_overlay: korean
-        ol_file: korean
-        ol_weight: 85
+      - name: use_korean
+      - name: flag_overlay
+        language: ko
+        overlay: korean
+        weight: 85
   chinese:
     template:
-      - name: sw_chinese
-      - name: it_items
-        it_language: zh
-      - name: ol_builder
-        ol_overlay: chinese
-        ol_file: chinese
-        ol_weight: 84
+      - name: use_chinese
+      - name: flag_overlay
+        language: zh
+        overlay: chinese
+        weight: 84
   danish:
     template:
-      - name: sw_danish
-      - name: it_items
-        it_language: da
-      - name: ol_builder
-        ol_overlay: danish
-        ol_file: danish
-        ol_weight: 83
+      - name: use_danish
+      - name: flag_overlay
+        language: da
+        overlay: danish
+        weight: 83
   russian:
     template:
-      - name: sw_russian
-      - name: it_items
-        it_language: ru
-      - name: ol_builder
-        ol_overlay: russian
-        ol_file: russian
-        ol_weight: 82
+      - name: use_russian
+      - name: flag_overlay
+        language: ru
+        overlay: russian
+        weight: 82
   spanish:
     template:
-      - name: sw_spanish
-      - name: it_items
-        it_language: es
-      - name: ol_builder
-        ol_overlay: spanish
-        ol_file: spanish
-        ol_weight: 81
+      - name: use_spanish
+      - name: flag_overlay
+        language: es
+        overlay: spanish
+        weight: 81
   italian:
     template:
-      - name: sw_italian
-      - name: it_items
-        it_language: it
-      - name: ol_builder
-        ol_overlay: italian
-        ol_file: italian
-        ol_weight: 80
+      - name: use_italian
+      - name: flag_overlay
+        language: it
+        overlay: italian
+        weight: 80
   portuguese:
     template:
-      - name: sw_portuguese
-      - name: it_items
-        it_language: pt
-      - name: ol_builder
-        ol_overlay: portuguese
-        ol_file: portuguese
-        ol_weight: 79
+      - name: use_portuguese
+      - name: flag_overlay
+        language: pt
+        overlay: portuguese
+        weight: 79
   hindi:
     template:
-      - name: sw_hindi
-      - name: it_items
-        it_language: hi
-      - name: ol_builder
-        ol_overlay: hindi
-        ol_file: indian
-        ol_weight: 78
+      - name: use_hindi
+      - name: flag_overlay
+        language: hi
+        overlay: hindi
+        weight: 78
   telugu:
     template:
-      - name: sw_telugu
-      - name: it_items
-        it_language: te
-      - name: ol_builder
-        ol_overlay: telugu
-        ol_file: indian
-        ol_weight: 77
+      - name: use_telugu
+      - name: flag_overlay
+        language: te
+        overlay: telugu
+        weight: 77
   farsi:
     template:
-      - name: sw_farsi
-      - name: it_items
-        it_language: fa
-      - name: ol_builder
-        ol_overlay: farsi
-        ol_file: iranian
-        ol_weight: 76
+      - name: use_farsi
+      - name: flag_overlay
+        language: fa
+        overlay: farsi
+        weight: 76
   thai:
     template:
-      - name: sw_thai
-      - name: it_items
-        it_language: th
-      - name: ol_builder
-        ol_overlay: thai
-        ol_file: thai
-        ol_weight: 75
+      - name: use_thai
+      - name: flag_overlay
+        language: th
+        overlay: thai
+        weight: 75
   dutch:
     template:
-      - name: sw_dutch
-      - name: it_items
-        it_language: nl
-      - name: ol_builder
-        ol_overlay: dutch
-        ol_file: dutch
-        ol_weight: 74
+      - name: use_dutch
+      - name: flag_overlay
+        language: nl
+        overlay: dutch
+        weight: 74
   norwegian:
     template:
-      - name: sw_norwegian
-      - name: it_items
-        it_language: no
-      - name: ol_builder
-        ol_overlay: norwegian
-        ol_file: norwegian
-        ol_weight: 73
+      - name: use_norwegian
+      - name: flag_overlay
+        language: no
+        overlay: norwegian
+        weight: 73
   icelandic:
     template:
-      - name: sw_icelandic
-      - name: it_items
-        it_language: is
-      - name: ol_builder
-        ol_overlay: icelandic
-        ol_file: icelandic
-        ol_weight: 72
+      - name: use_icelandic
+      - name: flag_overlay
+        language: is
+        overlay: icelandic
+        weight: 72
   swedish:
     template:
-      - name: sw_swedish
-      - name: it_items
-        it_language: sv
-      - name: ol_builder
-        ol_overlay: swedish
-        ol_file: swedish
-        ol_weight: 71
+      - name: use_swedish
+      - name: flag_overlay
+        language: sv
+        overlay: swedish
+        weight: 71
   turkish:
     template:
-      - name: sw_turkish
-      - name: it_items
-        it_language: tr
-      - name: ol_builder
-        ol_overlay: turkish
-        ol_file: turkish
-        ol_weight: 70
+      - name: use_turkish
+      - name: flag_overlay
+        language: tr
+        overlay: turkish
+        weight: 70
   polish:
     template:
-      - name: sw_polish
-      - name: it_items
-        it_language: pl
-      - name: ol_builder
-        ol_overlay: polish
-        ol_file: polish
-        ol_weight: 69
+      - name: use_polish
+      - name: flag_overlay
+        language: pl
+        overlay: polish
+        weight: 69
   czech:
     template:
-      - name: sw_czech
-      - name: it_items
-        it_language: cs
-      - name: ol_builder
-        ol_overlay: czech
-        ol_file: czech
-        ol_weight: 68
+      - name: use_czech
+      - name: flag_overlay
+        language: cs
+        overlay: czech
+        weight: 68
   ukrainian:
     template:
-      - name: sw_ukrainian
-      - name: it_items
-        it_language: uk
-      - name: ol_builder
-        ol_overlay: ukrainian
-        ol_file: ukrainian
-        ol_weight: 67
+      - name: use_ukrainian
+      - name: flag_overlay
+        language: uk
+        overlay: ukrainian
+        weight: 67
   hungarian:
     template:
-      - name: sw_hungarian
-      - name: it_items
-        it_language: hu
-      - name: ol_builder
-        ol_overlay: hungarian
-        ol_file: hungarian
-        ol_weight: 66
\ No newline at end of file
+      - name: use_hungarian
+      - name: flag_overlay
+        language: hu
+        overlay: hungarian
+        weight: 66
\ No newline at end of file