diff --git a/themes/slate-es-de/CREDITS.md b/themes/slate-es-de/CREDITS.md
index e29a7ffaa..29f7300aa 100644
--- a/themes/slate-es-de/CREDITS.md
+++ b/themes/slate-es-de/CREDITS.md
@@ -1,6 +1,6 @@
-# EmulationStation Desktop Edition (ES-DE) - Slate credits
+# Slate for EmulationStation Desktop Edition - credits
 
-The theme set Slate is based on recalbox-multi by the Recalbox community.
+The theme set slate-es-de is based on [recalbox-multi](https://gitlab.com/recalbox/recalbox-themes) by the Recalbox community.
 
 Some graphics was also taken from the carbon theme by Rookervik.
 
diff --git a/themes/slate-es-de/README.md b/themes/slate-es-de/README.md
index c4d85354e..43500e33e 100644
--- a/themes/slate-es-de/README.md
+++ b/themes/slate-es-de/README.md
@@ -19,6 +19,12 @@ The following options are included:
 - 16:9
 - 4:3
 
+3 transitions:
+
+- Slide
+- Instant
+- Fade
+
 There is no need for a dedicated 16:10 aspect ratio as the 16:9 layout scales really well.
 
 # Credits
diff --git a/themes/slate-es-de/auto-allgames/theme.xml b/themes/slate-es-de/auto-allgames/theme.xml
index e81e56e2e..d233d5a39 100644
--- a/themes/slate-es-de/auto-allgames/theme.xml
+++ b/themes/slate-es-de/auto-allgames/theme.xml
@@ -1,10 +1,9 @@
 <theme>
     <include>./../theme.xml</include>
 
-    <variant name="withVideos, withoutVideos, noGameMedia">
+    <variant name="all">
         <view name="gamelist">
             <text name="collectionsSystemName">
-                <pos>0.42 0.174</pos>
                 <metadata>sourceSystemFullname</metadata>
             </text>
         </view>
diff --git a/themes/slate-es-de/auto-favorites/theme.xml b/themes/slate-es-de/auto-favorites/theme.xml
index e81e56e2e..d233d5a39 100644
--- a/themes/slate-es-de/auto-favorites/theme.xml
+++ b/themes/slate-es-de/auto-favorites/theme.xml
@@ -1,10 +1,9 @@
 <theme>
     <include>./../theme.xml</include>
 
-    <variant name="withVideos, withoutVideos, noGameMedia">
+    <variant name="all">
         <view name="gamelist">
             <text name="collectionsSystemName">
-                <pos>0.42 0.174</pos>
                 <metadata>sourceSystemFullname</metadata>
             </text>
         </view>
diff --git a/themes/slate-es-de/auto-lastplayed/theme.xml b/themes/slate-es-de/auto-lastplayed/theme.xml
index e81e56e2e..d233d5a39 100644
--- a/themes/slate-es-de/auto-lastplayed/theme.xml
+++ b/themes/slate-es-de/auto-lastplayed/theme.xml
@@ -1,10 +1,9 @@
 <theme>
     <include>./../theme.xml</include>
 
-    <variant name="withVideos, withoutVideos, noGameMedia">
+    <variant name="all">
         <view name="gamelist">
             <text name="collectionsSystemName">
-                <pos>0.42 0.174</pos>
                 <metadata>sourceSystemFullname</metadata>
             </text>
         </view>
diff --git a/themes/slate-es-de/capabilities.xml b/themes/slate-es-de/capabilities.xml
index dbabb74ec..149201e81 100644
--- a/themes/slate-es-de/capabilities.xml
+++ b/themes/slate-es-de/capabilities.xml
@@ -45,24 +45,6 @@
         <startupToGamelist>slide</startupToGamelist>
     </transitions>
 
-    <transitions name="fadeAndSlide">
-        <selectable>false</selectable>
-        <systemToSystem>fade</systemToSystem>
-        <systemToGamelist>slide</systemToGamelist>
-        <gamelistToGamelist>slide</gamelistToGamelist>
-        <gamelistToSystem>slide</gamelistToSystem>
-        <startupToSystem>slide</startupToSystem>
-    </transitions>
-
-    <transitions name="instantAndSlide">
-        <selectable>false</selectable>
-        <systemToSystem>instant</systemToSystem>
-        <systemToGamelist>slide</systemToGamelist>
-        <gamelistToGamelist>slide</gamelistToGamelist>
-        <gamelistToSystem>slide</gamelistToSystem>
-        <startupToSystem>slide</startupToSystem>
-    </transitions>
-
     <suppressTransitionProfiles>
         <entry>builtin-instant</entry>
         <entry>builtin-slide</entry>
@@ -93,24 +75,4 @@
         <label>No game media</label>
         <selectable>false</selectable>
     </variant>
-
-    <variant name="themeEngineTest_1">
-        <label>Theme engine test 1</label>
-        <selectable>true</selectable>
-    </variant>
-
-    <variant name="themeEngineTest_2">
-        <label>Theme engine test 2</label>
-        <selectable>true</selectable>
-    </variant>
-
-    <variant name="themeEngineTest_3">
-        <label>Theme engine test 3</label>
-        <selectable>true</selectable>
-    </variant>
-
-    <variant name="themeEngineTest_4">
-        <label>Theme engine test 4</label>
-        <selectable>true</selectable>
-    </variant>
 </themeCapabilities>
\ No newline at end of file
diff --git a/themes/slate-es-de/colors.xml b/themes/slate-es-de/colors.xml
index 27131c41b..08e6a4279 100644
--- a/themes/slate-es-de/colors.xml
+++ b/themes/slate-es-de/colors.xml
@@ -36,7 +36,7 @@
             <gamelistTextlistSelectedColor>AFAFAF</gamelistTextlistSelectedColor>
             <gamelistTextlistPrimaryColor>000000</gamelistTextlistPrimaryColor>
             <gamelistTextlistSecondaryColor>333333</gamelistTextlistSecondaryColor>
-            <gamelistCustomCollectionsHeaderColor>C6C6C6</gamelistCustomCollectionsHeaderColor>
+            <gamelistCollectionsHeaderColor>C6C6C6</gamelistCollectionsHeaderColor>
 
             <gamelistDefaultTextColor>000000</gamelistDefaultTextColor>
             <gamelistInfoColor>303030</gamelistInfoColor>
@@ -68,7 +68,7 @@
             <gamelistTextlistSelectedColor>9F9F9F</gamelistTextlistSelectedColor>
             <gamelistTextlistPrimaryColor>262626</gamelistTextlistPrimaryColor>
             <gamelistTextlistSecondaryColor>4D4D4D</gamelistTextlistSecondaryColor>
-            <gamelistCustomCollectionsHeaderColor>202020</gamelistCustomCollectionsHeaderColor>
+            <gamelistCollectionsHeaderColor>202020</gamelistCollectionsHeaderColor>
 
             <gamelistDefaultTextColor>262626</gamelistDefaultTextColor>
             <gamelistInfoColor>505050</gamelistInfoColor>
diff --git a/themes/slate-es-de/custom-collections/theme.xml b/themes/slate-es-de/custom-collections/theme.xml
index 8ba27f394..9fce009ca 100644
--- a/themes/slate-es-de/custom-collections/theme.xml
+++ b/themes/slate-es-de/custom-collections/theme.xml
@@ -1,14 +1,12 @@
 <theme>
     <include>./../theme.xml</include>
 
-    <variant name="withVideos, withoutVideos, noGameMedia">
+    <variant name="all">
         <view name="gamelist">
-            <text name="collectionsSystemName">
-                <pos>0.42 0.128</pos>
+            <text name="customCollectionsSystemName">
                 <metadata>sourceSystemFullname</metadata>
             </text>
-            <text name="customCollectionsHeader">
-                <pos>0.42 0.174</pos>
+            <text name="customCollectionsHeader, customCollectionsHeaderNoMedia">
                 <metadata>systemFullname</metadata>
             </text>
         </view>
diff --git a/themes/slate-es-de/theme.xml b/themes/slate-es-de/theme.xml
index 9a03a034b..1ac6fce47 100644
--- a/themes/slate-es-de/theme.xml
+++ b/themes/slate-es-de/theme.xml
@@ -10,22 +10,54 @@
     <include>./colors.xml</include>
 
     <!-- Per-system band colors and platform info -->
-    <variant name="all">
-        <include>./${system.theme}/colors.xml</include>
-        <include>./${system.theme}/systeminfo.xml</include>
-    </variant>
+    <include>./${system.theme}/colors.xml</include>
+    <include>./${system.theme}/systeminfo.xml</include>
 
     <variables>
+        <regularFont>./core/fonts/Exo2-RegularCondensed.otf</regularFont>
+        <semiBoldFont>./core/fonts/Exo2-SemiBoldCondensed.otf</semiBoldFont>
+        <boldFont>./core/fonts/Exo2-BoldCondensed.otf</boldFont>
         <systemConsoleImage>./${system.theme}/images/consolegame.svg</systemConsoleImage>
         <systemControllerImage>./${system.theme}/images/controller.svg</systemControllerImage>
         <systemLogo>./${system.theme}/images/logo.svg</systemLogo>
     </variables>
 
-    <variant name="withVideos, withoutVideos, noGameMedia">
-        <transitions>slide</transitions>
-    </variant>
+    <variant name="all">
+        <view name="system, gamelist">
+            <image name="background">
+                <pos>0 0</pos>
+                <size>1 1</size>
+                <path>./core/images/background.png</path>
+                <tile>true</tile>
+                <color>${backgroundColor}</color>
+                <zIndex>0</zIndex>
+            </image>
+            <image name="band1">
+                <pos>0.80 0</pos>
+                <size>0.03 1</size>
+                <path>./core/images/band.png</path>
+                <zIndex>5</zIndex>
+            </image>
+            <image name="band2">
+                <pos>0.829 0</pos>
+                <size>0.03 1</size>
+                <path>./core/images/band.png</path>
+                <zIndex>5</zIndex>
+            </image>
+            <image name="band3">
+                <pos>0.858 0</pos>
+                <size>0.03 1</size>
+                <path>./core/images/band.png</path>
+                <zIndex>5</zIndex>
+            </image>
+            <image name="band4">
+                <pos>0.887 0</pos>
+                <size>0.03 1</size>
+                <path>./core/images/band.png</path>
+                <zIndex>5</zIndex>
+            </image>
+        </view>
 
-    <variant name="withVideos, withoutVideos, noGameMedia">
         <view name="system">
             <carousel name="systemCarousel">
                 <pos>0 0.383796</pos>
@@ -40,7 +72,7 @@
                 <color>${systemCarouselColor}</color>
                 <text>${system.fullName}</text>
                 <textColor>${systemCarouselTextColor}</textColor>
-                <fontPath>./core/fonts/Exo2-RegularCondensed.otf</fontPath>
+                <fontPath>${regularFont}</fontPath>
                 <fontSize>0.055</fontSize>
                 <letterCase>uppercase</letterCase>
                 <lineSpacing>1.2</lineSpacing>
@@ -50,7 +82,7 @@
                 <size>1 0.056</size>
                 <origin>0.5 0.5</origin>
                 <systemdata>gamecount</systemdata>
-                <fontPath>./core/fonts/Exo2-RegularCondensed.otf</fontPath>
+                <fontPath>${regularFont}</fontPath>
                 <fontSize>0.035</fontSize>
                 <horizontalAlignment>center</horizontalAlignment>
                 <color>${systemGameCounterColor}</color>
@@ -58,6 +90,55 @@
                 <letterCase>uppercase</letterCase>
                 <zIndex>50</zIndex>
             </text>
+            <image name="consolegame">
+                <pos>0.02 0.327</pos>
+                <maxSize>0.4 0.28</maxSize>
+                <origin>0 1</origin>
+                <path>${systemConsoleImage}</path>
+            </image>
+            <image name="controller">
+                <pos>0.78 0.327</pos>
+                <maxSize>0.12 0.28</maxSize>
+                <origin>1 1</origin>
+                <path>${systemControllerImage}</path>
+            </image>
+            <text name="info1, info2, info3, info4, info5, info6, info7, info8, info9, info10">
+                <size>0.4 0.03</size>
+                <fontPath>${semiBoldFont}</fontPath>
+                <fontSize>0.021</fontSize>
+                <horizontalAlignment>left</horizontalAlignment>
+                <color>${systemInfoTextColor}</color>
+            </text>
+            <text name="info1">
+                <pos>0.38 0.695</pos>
+            </text>
+            <text name="info2">
+                <pos>0.38 0.716</pos>
+            </text>
+            <text name="info3">
+                <pos>0.38 0.737</pos>
+            </text>
+            <text name="info4">
+                <pos>0.38 0.758</pos>
+            </text>
+            <text name="info5">
+                <pos>0.38 0.799</pos>
+            </text>
+            <text name="info6">
+                <pos>0.38 0.820</pos>
+            </text>
+            <text name="info7">
+                <pos>0.38 0.841</pos>
+            </text>
+            <text name="info8">
+                <pos>0.38 0.862</pos>
+            </text>
+            <text name="info9">
+                <pos>0.38 0.883</pos>
+            </text>
+            <text name="info10">
+                <pos>0.38 0.904</pos>
+            </text>
             <helpsystem name="help">
                 <pos>0.012 0.955</pos>
                 <textColor>${systemHelpColor}</textColor>
@@ -67,6 +148,7 @@
                 <fontSize>0.035</fontSize>
             </helpsystem>
         </view>
+
         <view name="gamelist">
             <textlist name="gamelistTextlist">
                 <pos>0.025 0.201</pos>
@@ -75,7 +157,7 @@
                 <selectedColor>${gamelistTextlistSelectedColor}</selectedColor>
                 <primaryColor>${gamelistTextlistPrimaryColor}</primaryColor>
                 <secondaryColor>${gamelistTextlistSecondaryColor}</secondaryColor>
-                <fontPath>./core/fonts/Exo2-BoldCondensed.otf</fontPath>
+                <fontPath>${boldFont}</fontPath>
                 <fontSize>0.025</fontSize>
                 <horizontalAlignment>left</horizontalAlignment>
                 <horizontalMargin>0.01</horizontalMargin>
@@ -83,6 +165,185 @@
                 <indicators>symbols</indicators>
                 <collectionIndicators>symbols</collectionIndicators>
             </textlist>
+            <image name="consolegame">
+                <pos>0.02 0.17</pos>
+                <maxSize>0.4 0.15</maxSize>
+                <origin>0 1</origin>
+                <path>${systemConsoleImage}</path>
+            </image>
+            <image name="logo">
+                <pos>0.78 0.17</pos>
+                <maxSize>0.32 0.13</maxSize>
+                <origin>1 1</origin>
+                <path>${systemLogo}</path>
+            </image>
+            <image name="backframe2">
+                <pos>0.02 0.19</pos>
+                <size>0.4 0.735</size>
+                <path>./core/images/frame.png</path>
+                <color>${gamelistBackFrameColor}</color>
+                <zIndex>10</zIndex>
+            </image>
+            <image name="backframe3">
+                <pos>0.44 0.19</pos>
+                <size>0.54 0.735</size>
+                <path>./core/images/frame.png</path>
+                <color>${gamelistBackFrameColor}</color>
+                <zIndex>10</zIndex>
+            </image>
+            <text name="collectionsSystemName, customCollectionsSystemName">
+                <size>0.214 0.025</size>
+                <origin>1 1</origin>
+                <metadataElement>true</metadataElement>
+                <fontPath>${regularFont}</fontPath>
+                <fontSize>0.025</fontSize>
+                <horizontalAlignment>right</horizontalAlignment>
+                <color>${gamelistCollectionsHeaderColor}</color>
+                <letterCase>uppercase</letterCase>
+                <lineSpacing>1.0</lineSpacing>
+            </text>
+            <text name="customCollectionsHeader, customCollectionsHeaderNoMedia">
+                <size>0.214 0.05</size>
+                <origin>1 1</origin>
+                <fontPath>${regularFont}</fontPath>
+                <fontSize>0.05</fontSize>
+                <horizontalAlignment>right</horizontalAlignment>
+                <color>${gamelistCollectionsHeaderColor}</color>
+                <letterCase>uppercase</letterCase>
+                <lineSpacing>1.0</lineSpacing>
+            </text>
+            <text name="collectionsSystemName, customCollectionsHeader">
+                <pos>0.42 0.174</pos>
+            </text>
+            <text name="customCollectionsSystemName">
+                <pos>0.42 0.128</pos>
+            </text>
+            <text name="customCollectionsHeaderNoMedia">
+                <pos>0.78 0.10</pos>
+                <visible>false</visible>
+            </text>
+            <text name="labelReleasedate, labelDeveloper, labelPublisher,
+                        labelGenre, labelPlayers, labelLastplayed">
+                <size>0.14 0.02</size>
+                <fontPath>${boldFont}</fontPath>
+                <fontSize>0.0195</fontSize>
+                <color>${gamelistDefaultTextColor}</color>
+                <letterCase>uppercase</letterCase>
+            </text>
+            <text name="developer, publisher, genre, players">
+                <size>0.14 0.02</size>
+                <fontPath>${regularFont}</fontPath>
+                <fontSize>0.0195</fontSize>
+                <color>${gamelistDefaultTextColor}</color>
+                <letterCase>uppercase</letterCase>
+            </text>
+            <text name="description">
+                <pos>0.454 0.675</pos>
+                <size>0.346 0.242</size>
+                <container>true</container>
+                <containerVerticalSnap>true</containerVerticalSnap>
+                <containerScrollSpeed>1</containerScrollSpeed>
+                <containerStartDelay>4.5</containerStartDelay>
+                <containerResetDelay>7</containerResetDelay>
+                <metadata>description</metadata>
+                <fontPath>${semiBoldFont}</fontPath>
+                <fontSize>0.0195</fontSize>
+                <color>${gamelistDefaultTextColor}</color>
+                <letterCase>uppercase</letterCase>
+                <lineSpacing>1.2</lineSpacing>
+            </text>
+            <datetime name="releasedate, lastplayed">
+                <size>0.14 0.02</size>
+                <fontPath>${regularFont}</fontPath>
+                <fontSize>0.0195</fontSize>
+                <color>${gamelistDefaultTextColor}</color>
+                <letterCase>uppercase</letterCase>
+            </datetime>
+            <text name="labelReleasedate">
+                <pos>0.815 0.2755</pos>
+                <text>Released:</text>
+                <metadataElement>true</metadataElement>
+            </text>
+            <datetime name="releasedate">
+                <pos>0.83 0.3005</pos>
+                <metadata>releasedate</metadata>
+            </datetime>
+            <text name="labelDeveloper">
+                <pos>0.815 0.3355</pos>
+                <text>Developer:</text>
+                <metadataElement>true</metadataElement>
+            </text>
+            <text name="developer">
+                <pos>0.83 0.3605</pos>
+                <metadata>developer</metadata>
+            </text>
+            <text name="labelPublisher">
+                <pos>0.815 0.3955</pos>
+                <text>Publisher:</text>
+                <metadataElement>true</metadataElement>
+            </text>
+            <text name="publisher">
+                <pos>0.83 0.4205</pos>
+                <metadata>publisher</metadata>
+            </text>
+            <text name="labelGenre">
+                <pos>0.815 0.4555</pos>
+                <text>Genre:</text>
+                <metadataElement>true</metadataElement>
+            </text>
+            <text name="genre">
+                <pos>0.83 0.4805</pos>
+                <metadata>genre</metadata>
+            </text>
+            <text name="labelPlayers">
+                <pos>0.815 0.5155</pos>
+                <text>Players:</text>
+                <metadataElement>true</metadataElement>
+            </text>
+            <text name="players">
+                <pos>0.83 0.5405</pos>
+                <metadata>players</metadata>
+            </text>
+            <text name="labelLastplayed">
+                <pos>0.815 0.5755</pos>
+                <text>Last played:</text>
+                <metadataElement>true</metadataElement>
+            </text>
+            <datetime name="lastplayed">
+                <pos>0.83 0.6005</pos>
+                <metadata>lastplayed</metadata>
+            </datetime>
+            <rating name="rating">
+                <pos>0.453 0.203</pos>
+                <size>0 0.03</size>
+                <interpolation>nearest</interpolation>
+                <color>${gamelistRatingColor}</color>
+                <filledPath>./core/images/rating_filled.svg</filledPath>
+                <unfilledPath>./core/images/rating_empty.svg</unfilledPath>
+                <overlay>false</overlay>
+            </rating>
+            <gamelistinfo name="gamelistInfo">
+                <pos>0.773 0.192</pos>
+                <size>0.2 0.042</size>
+                <fontPath>${boldFont}</fontPath>
+                <fontSize>0.025</fontSize>
+                <horizontalAlignment>right</horizontalAlignment>
+                <color>${gamelistInfoColor}</color>
+            </gamelistinfo>
+            <badges name="badges">
+                <pos>0.815 0.675</pos>
+                <size>0.13 0.235</size>
+                <horizontalAlignment>left</horizontalAlignment>
+                <direction>row</direction>
+                <lines>3</lines>
+                <itemsPerLine>3</itemsPerLine>
+                <slots>collection, folder, favorite, completed, kidgame, broken, controller, altemulator</slots>
+                <controllerPos>0.5 0.572</controllerPos>
+                <controllerSize>0.81</controllerSize>
+                <folderLinkPos>0.54 0.64</folderLinkPos>
+                <folderLinkSize>0.31</folderLinkSize>
+                <itemMargin>-1.0 0.005</itemMargin>
+            </badges>
             <helpsystem name="help">
                 <pos>0.012 0.955</pos>
                 <textColor>${gamelistHelpColor}</textColor>
@@ -94,265 +355,6 @@
         </view>
     </variant>
 
-    <view name="system, gamelist">
-        <image name="background">
-            <pos>0 0</pos>
-            <size>1 1</size>
-            <path>./core/images/background.png</path>
-            <tile>true</tile>
-            <color>${backgroundColor}</color>
-            <zIndex>0</zIndex>
-        </image>
-        <image name="band1">
-            <pos>0.80 0</pos>
-            <size>0.03 1</size>
-            <path>./core/images/band.png</path>
-            <zIndex>5</zIndex>
-        </image>
-        <image name="band2">
-            <pos>0.829 0</pos>
-            <size>0.03 1</size>
-            <path>./core/images/band.png</path>
-            <zIndex>5</zIndex>
-        </image>
-        <image name="band3">
-            <pos>0.858 0</pos>
-            <size>0.03 1</size>
-            <path>./core/images/band.png</path>
-            <zIndex>5</zIndex>
-        </image>
-        <image name="band4">
-            <pos>0.887 0</pos>
-            <size>0.03 1</size>
-            <path>./core/images/band.png</path>
-            <zIndex>5</zIndex>
-        </image>
-    </view>
-
-    <view name="system">
-        <image name="consolegame">
-            <pos>0.02 0.327</pos>
-            <maxSize>0.4 0.28</maxSize>
-            <origin>0 1</origin>
-            <path>${systemConsoleImage}</path>
-        </image>
-        <image name="controller">
-            <pos>0.78 0.327</pos>
-            <maxSize>0.12 0.28</maxSize>
-            <origin>1 1</origin>
-            <path>${systemControllerImage}</path>
-        </image>
-        <text name="info1, info2, info3, info4, info5, info6, info7, info8, info9, info10">
-            <size>0.4 0.03</size>
-            <fontPath>./core/fonts/Exo2-SemiBoldCondensed.otf</fontPath>
-            <fontSize>0.021</fontSize>
-            <horizontalAlignment>left</horizontalAlignment>
-            <color>${systemInfoTextColor}</color>
-        </text>
-        <text name="info1">
-            <pos>0.38 0.695</pos>
-        </text>
-        <text name="info2">
-            <pos>0.38 0.716</pos>
-        </text>
-        <text name="info3">
-            <pos>0.38 0.737</pos>
-        </text>
-        <text name="info4">
-            <pos>0.38 0.758</pos>
-        </text>
-        <text name="info5">
-            <pos>0.38 0.799</pos>
-        </text>
-        <text name="info6">
-            <pos>0.38 0.820</pos>
-        </text>
-        <text name="info7">
-            <pos>0.38 0.841</pos>
-        </text>
-        <text name="info8">
-            <pos>0.38 0.862</pos>
-        </text>
-        <text name="info9">
-            <pos>0.38 0.883</pos>
-        </text>
-        <text name="info10">
-            <pos>0.38 0.904</pos>
-        </text>
-    </view>
-
-    <view name="gamelist">
-        <image name="consolegame">
-            <pos>0.02 0.17</pos>
-            <maxSize>0.4 0.15</maxSize>
-            <origin>0 1</origin>
-            <path>${systemConsoleImage}</path>
-        </image>
-        <image name="logo">
-            <pos>0.78 0.17</pos>
-            <maxSize>0.32 0.13</maxSize>
-            <origin>1 1</origin>
-            <path>${systemLogo}</path>
-        </image>
-        <image name="backframe2">
-            <pos>0.02 0.19</pos>
-            <size>0.4 0.735</size>
-            <path>./core/images/frame.png</path>
-            <color>${gamelistBackFrameColor}</color>
-            <zIndex>10</zIndex>
-        </image>
-        <image name="backframe3">
-            <pos>0.44 0.19</pos>
-            <size>0.54 0.735</size>
-            <path>./core/images/frame.png</path>
-            <color>${gamelistBackFrameColor}</color>
-            <zIndex>10</zIndex>
-        </image>
-        <text name="collectionsSystemName">
-            <size>0.214 0.025</size>
-            <origin>1 1</origin>
-            <metadataElement>true</metadataElement>
-            <fontPath>./core/fonts/Exo2-RegularCondensed.otf</fontPath>
-            <fontSize>0.025</fontSize>
-            <horizontalAlignment>right</horizontalAlignment>
-            <color>${gamelistCustomCollectionsHeaderColor}</color>
-            <letterCase>uppercase</letterCase>
-            <lineSpacing>1.0</lineSpacing>
-        </text>
-        <text name="customCollectionsHeader">
-            <size>0.214 0.05</size>
-            <origin>1 1</origin>
-            <fontPath>./core/fonts/Exo2-RegularCondensed.otf</fontPath>
-            <fontSize>0.05</fontSize>
-            <horizontalAlignment>right</horizontalAlignment>
-            <color>${gamelistCustomCollectionsHeaderColor}</color>
-            <letterCase>uppercase</letterCase>
-            <lineSpacing>1.0</lineSpacing>
-        </text>
-        <text name="labelReleasedate, labelDeveloper, labelPublisher,
-                    labelGenre, labelPlayers, labelLastplayed">
-            <size>0.14 0.02</size>
-            <fontPath>./core/fonts/Exo2-BoldCondensed.otf</fontPath>
-            <fontSize>0.0195</fontSize>
-            <color>${gamelistDefaultTextColor}</color>
-            <letterCase>uppercase</letterCase>
-        </text>
-        <text name="developer, publisher, genre, players">
-            <size>0.14 0.02</size>
-            <fontPath>./core/fonts/Exo2-RegularCondensed.otf</fontPath>
-            <fontSize>0.0195</fontSize>
-            <color>${gamelistDefaultTextColor}</color>
-            <letterCase>uppercase</letterCase>
-        </text>
-        <text name="description">
-            <pos>0.454 0.675</pos>
-            <size>0.346 0.242</size>
-            <container>true</container>
-            <containerVerticalSnap>true</containerVerticalSnap>
-            <containerScrollSpeed>1</containerScrollSpeed>
-            <containerStartDelay>4.5</containerStartDelay>
-            <containerResetDelay>7</containerResetDelay>
-            <metadata>description</metadata>
-            <fontPath>./core/fonts/Exo2-SemiBoldCondensed.otf</fontPath>
-            <fontSize>0.0195</fontSize>
-            <color>${gamelistDefaultTextColor}</color>
-            <letterCase>uppercase</letterCase>
-            <lineSpacing>1.2</lineSpacing>
-        </text>
-        <datetime name="releasedate, lastplayed">
-            <size>0.14 0.02</size>
-            <fontPath>./core/fonts/Exo2-RegularCondensed.otf</fontPath>
-            <fontSize>0.0195</fontSize>
-            <color>${gamelistDefaultTextColor}</color>
-            <letterCase>uppercase</letterCase>
-        </datetime>
-        <text name="labelReleasedate">
-            <pos>0.815 0.2755</pos>
-            <text>Released:</text>
-            <metadataElement>true</metadataElement>
-        </text>
-        <datetime name="releasedate">
-            <pos>0.83 0.3005</pos>
-            <metadata>releasedate</metadata>
-        </datetime>
-        <text name="labelDeveloper">
-            <pos>0.815 0.3355</pos>
-            <text>Developer:</text>
-            <metadataElement>true</metadataElement>
-        </text>
-        <text name="developer">
-            <pos>0.83 0.3605</pos>
-            <metadata>developer</metadata>
-        </text>
-        <text name="labelPublisher">
-            <pos>0.815 0.3955</pos>
-            <text>Publisher:</text>
-            <metadataElement>true</metadataElement>
-        </text>
-        <text name="publisher">
-            <pos>0.83 0.4205</pos>
-            <metadata>publisher</metadata>
-        </text>
-        <text name="labelGenre">
-            <pos>0.815 0.4555</pos>
-            <text>Genre:</text>
-            <metadataElement>true</metadataElement>
-        </text>
-        <text name="genre">
-            <pos>0.83 0.4805</pos>
-            <metadata>genre</metadata>
-        </text>
-        <text name="labelPlayers">
-            <pos>0.815 0.5155</pos>
-            <text>Players:</text>
-            <metadataElement>true</metadataElement>
-        </text>
-        <text name="players">
-            <pos>0.83 0.5405</pos>
-            <metadata>players</metadata>
-        </text>
-        <text name="labelLastplayed">
-            <pos>0.815 0.5755</pos>
-            <text>Last played:</text>
-            <metadataElement>true</metadataElement>
-        </text>
-        <datetime name="lastplayed">
-            <pos>0.83 0.6005</pos>
-            <metadata>lastplayed</metadata>
-        </datetime>
-        <rating name="rating">
-            <pos>0.453 0.203</pos>
-            <size>0 0.03</size>
-            <interpolation>nearest</interpolation>
-            <color>${gamelistRatingColor}</color>
-            <filledPath>./core/images/rating_filled.svg</filledPath>
-            <unfilledPath>./core/images/rating_empty.svg</unfilledPath>
-            <overlay>false</overlay>
-        </rating>
-        <gamelistinfo name="gamelistInfo">
-            <pos>0.773 0.192</pos>
-            <size>0.2 0.042</size>
-            <fontPath>./core/fonts/Exo2-BoldCondensed.otf</fontPath>
-            <fontSize>0.025</fontSize>
-            <horizontalAlignment>right</horizontalAlignment>
-            <color>${gamelistInfoColor}</color>
-        </gamelistinfo>
-        <badges name="badges">
-            <pos>0.815 0.675</pos>
-            <size>0.13 0.235</size>
-            <horizontalAlignment>left</horizontalAlignment>
-            <direction>row</direction>
-            <lines>3</lines>
-            <itemsPerLine>3</itemsPerLine>
-            <slots>collection, folder, favorite, completed, kidgame, broken, controller, altemulator</slots>
-            <controllerPos>0.5 0.572</controllerPos>
-            <controllerSize>0.81</controllerSize>
-            <folderLinkPos>0.54 0.64</folderLinkPos>
-            <folderLinkSize>0.31</folderLinkSize>
-            <itemMargin>-1.0 0.005</itemMargin>
-        </badges>
-    </view>
-
     <variant name="withVideos">
         <view name="gamelist">
             <video name="gameVideo">
@@ -426,7 +428,7 @@
                 </text>
             </view>
             <view name="gamelist">
-                <text name="collectionsSystemName">
+                <text name="collectionsSystemName, customCollectionsSystemName">
                     <size>0.182 0.025</size>
                 </text>
                 <text name="customCollectionsHeader">
@@ -461,10 +463,11 @@
             <badges name="badges">
                 <visible>false</visible>
             </badges>
-            <text name="customCollectionsHeader">
-                <pos>0.78 0.10</pos>
-                <origin>1 1</origin>
-                <horizontalAlignment>right</horizontalAlignment>
+            <text name="customCollectionsHeaderNoMedia">
+                <visible>true</visible>
+            </text>
+            <text name="collectionsSystemName, customCollectionsSystemName, customCollectionsHeader">
+                <visible>false</visible>
             </text>
             <text name="labelReleasedate, labelDeveloper, labelPublisher, labelGenre, labelPlayers,
                         labelLastplayed, developer, publisher, genre, players, description">
@@ -481,24 +484,4 @@
             </rating>
         </view>
     </variant>
-
-    <variant name="themeEngineTest_1">
-        <transitions>fadeAndSlide</transitions>
-        <include>./theme_engine_test_1.xml</include>
-    </variant>
-
-    <variant name="themeEngineTest_2">
-        <transitions>instantAndSlide</transitions>
-        <include>./theme_engine_test_2.xml</include>
-    </variant>
-
-    <variant name="themeEngineTest_3">
-        <transitions>instantAndSlide</transitions>
-        <include>./theme_engine_test_3.xml</include>
-    </variant>
-
-    <variant name="themeEngineTest_4">
-        <transitions>instantAndSlide</transitions>
-        <include>./theme_engine_test_4.xml</include>
-    </variant>
 </theme>
\ No newline at end of file
diff --git a/themes/slate-es-de/theme_engine_test_1.xml b/themes/slate-es-de/theme_engine_test_1.xml
deleted file mode 100644
index 976b73a31..000000000
--- a/themes/slate-es-de/theme_engine_test_1.xml
+++ /dev/null
@@ -1,316 +0,0 @@
-<theme>
-    <!-- Test of vertical system carousel wheel, system videos, gameselector elements etc. -->
-
-    <view name="system">
-        <carousel name="systemCarousel">
-            <pos>0 0</pos>
-            <size>0.28 1</size>
-            <type>verticalWheel</type>
-            <staticImage>./${system.theme}/images/logo.svg</staticImage>
-            <itemsBeforeCenter>4</itemsBeforeCenter>
-            <itemsAfterCenter>4</itemsAfterCenter>
-            <itemSize>0.15 0.125</itemSize>
-            <itemScale>1.23</itemScale>
-            <itemRotation>11</itemRotation>
-            <itemRotationOrigin>-3.03 0.5</itemRotationOrigin>
-            <itemAxisHorizontal>true</itemAxisHorizontal>
-            <itemHorizontalAlignment>center</itemHorizontalAlignment>
-            <itemVerticalAlignment>center</itemVerticalAlignment>
-            <wheelHorizontalAlignment>right</wheelHorizontalAlignment>
-            <horizontalOffset>-0.05</horizontalOffset>
-            <color>555555BB</color>
-            <text>${system.fullName}</text>
-            <textColor>F0F0F0</textColor>
-            <fontPath>./core/fonts/Exo2-RegularCondensed.otf</fontPath>
-            <fontSize>0.056</fontSize>
-            <letterCase>uppercase</letterCase>
-            <lineSpacing>1.2</lineSpacing>
-        </carousel>
-        <gameselector name="selectorRecent">
-            <selection>lastplayed</selection>
-            <gameCount>1</gameCount>
-        </gameselector>
-        <gameselector name="selectorRandom">
-            <selection>random</selection>
-            <gameCount>1</gameCount>
-        </gameselector>
-        <image name="randomBackgroundImage">
-            <pos>0 0</pos>
-            <size>1 1</size>
-            <imageType>fanart, titlescreen</imageType>
-            <gameselector>selectorRandom</gameselector>
-            <interpolation>nearest</interpolation>
-            <opacity>0.8</opacity>
-            <saturation>0.8</saturation>
-            <zIndex>3</zIndex>
-        </image>
-        <image name="recentGameImage">
-            <pos>0.975 0.08</pos>
-            <origin>1 0</origin>
-            <size>0.2 0</size>
-            <imageType>cover</imageType>
-            <gameselector>selectorRecent</gameselector>
-            <interpolation>nearest</interpolation>
-            <zIndex>3</zIndex>
-        </image>
-        <video name="randomGameVideo">
-            <pos>0.30 0.23</pos>
-            <maxSize>0.3 0.424</maxSize>
-            <imageType>marquee, titlescreen</imageType>
-            <gameselector>selectorRandom</gameselector>
-            <audio>true</audio>
-            <interpolation>linear</interpolation>
-            <pillarboxes>false</pillarboxes>
-            <scanlines>false</scanlines>
-            <delay>1.7</delay>
-            <fadeInTime>1.2</fadeInTime>
-        </video>
-        <text name="gameCounter">
-            <pos>0.30 0.082</pos>
-            <size>0.35 0.1</size>
-            <systemdata>gamecount</systemdata>
-            <fontPath>./core/fonts/Exo2-RegularCondensed.otf</fontPath>
-            <fontSize>0.048</fontSize>
-            <horizontalAlignment>left</horizontalAlignment>
-            <color>C6C6C6</color>
-            <backgroundColor>55555500</backgroundColor>
-            <letterCase>uppercase</letterCase>
-            <zIndex>50</zIndex>
-        </text>
-        <text name="systemName">
-            <pos>0.30 0.01</pos>
-            <size>0.46 0.1</size>
-            <systemdata>fullname</systemdata>
-            <fontPath>./core/fonts/Exo2-RegularCondensed.otf</fontPath>
-            <fontSize>0.075</fontSize>
-            <horizontalAlignment>left</horizontalAlignment>
-            <color>E6E6E6</color>
-            <backgroundColor>55555500</backgroundColor>
-            <letterCase>uppercase</letterCase>
-            <zIndex>50</zIndex>
-        </text>
-        <text name="gameName">
-            <pos>0.775 0.59</pos>
-            <size>0.2 0.05</size>
-            <metadata>name</metadata>
-            <gameselector>selectorRecent</gameselector>
-            <fontPath>./core/fonts/Exo2-RegularCondensed.otf</fontPath>
-            <fontSize>0.045</fontSize>
-            <horizontalAlignment>right</horizontalAlignment>
-            <color>E6E6E6</color>
-            <backgroundColor>55555500</backgroundColor>
-            <letterCase>none</letterCase>
-            <zIndex>50</zIndex>
-        </text>
-        <datetime name="gameLastplayed">
-            <pos>0.775 0.64</pos>
-            <size>0.2 0.05</size>
-            <metadata>lastplayed</metadata>
-            <gameselector>selectorRecent</gameselector>
-            <fontPath>./core/fonts/Exo2-RegularCondensed.otf</fontPath>
-            <fontSize>0.045</fontSize>
-            <horizontalAlignment>right</horizontalAlignment>
-            <color>E6E6E6</color>
-            <backgroundColor>55555500</backgroundColor>
-            <letterCase>capitalize</letterCase>
-            <displayRelative>true</displayRelative>
-            <zIndex>50</zIndex>
-        </datetime>
-        <text name="recentlyPlayed">
-            <pos>0.775 0.03</pos>
-            <size>0.2 0</size>
-            <text>Last played</text>
-            <fontPath>./core/fonts/Exo2-RegularCondensed.otf</fontPath>
-            <fontSize>0.035</fontSize>
-            <horizontalAlignment>left</horizontalAlignment>
-            <color>E6E6E6</color>
-            <backgroundColor>55555500</backgroundColor>
-            <letterCase>uppercase</letterCase>
-            <zIndex>50</zIndex>
-        </text>
-        <text name="info1, info2, info3, info4, info5, info6, info7, info8, info9, info10">
-            <color>D6D6D6</color>
-        </text>
-        <text name="info1">
-            <pos>0.58 0.695</pos>
-            <horizontalAlignment>right</horizontalAlignment>
-        </text>
-        <text name="info2">
-            <pos>0.58 0.716</pos>
-            <horizontalAlignment>right</horizontalAlignment>
-        </text>
-        <text name="info3">
-            <pos>0.58 0.737</pos>
-            <horizontalAlignment>right</horizontalAlignment>
-        </text>
-        <text name="info4">
-            <pos>0.58 0.758</pos>
-            <horizontalAlignment>right</horizontalAlignment>
-        </text>
-        <text name="info5">
-            <pos>0.58 0.799</pos>
-            <horizontalAlignment>right</horizontalAlignment>
-        </text>
-        <text name="info6">
-            <pos>0.58 0.820</pos>
-            <horizontalAlignment>right</horizontalAlignment>
-        </text>
-        <text name="info7">
-            <pos>0.58 0.841</pos>
-            <horizontalAlignment>right</horizontalAlignment>
-        </text>
-        <text name="info8">
-            <pos>0.58 0.862</pos>
-            <horizontalAlignment>right</horizontalAlignment>
-        </text>
-        <text name="info9">
-            <pos>0.58 0.883</pos>
-            <horizontalAlignment>right</horizontalAlignment>
-        </text>
-        <text name="info10">
-            <pos>0.58 0.904</pos>
-            <horizontalAlignment>right</horizontalAlignment>
-        </text>
-        <rating name="randomGameRating">
-            <pos>0.30 0.167</pos>
-            <size>0.06 0.04</size>
-            <gameselector>selectorRandom</gameselector>
-            <color>FFEE00</color>
-            <opacity>0.9</opacity>
-        </rating>
-        <rating name="recentGameRating">
-            <pos>0.975 0.042</pos>
-            <origin>1 0</origin>
-            <size>0.03 0.03</size>
-            <gameselector>selectorRecent</gameselector>
-            <color>FFEE00</color>
-        </rating>
-        <helpsystem name="help">
-            <pos>0.9885 0.955</pos>
-            <origin>1 0</origin>
-            <textColor>A6A6A6</textColor>
-            <iconColor>A6A6A6</iconColor>
-            <textColorDimmed>969696</textColorDimmed>
-            <iconColorDimmed>969696</iconColorDimmed>
-        </helpsystem>
-        <!-- Hide some unwanted elements -->
-        <image name="background">
-            <visible>false</visible>
-        </image>
-        <image name="band1">
-            <visible>false</visible>
-        </image>
-        <image name="band2">
-            <visible>false</visible>
-        </image>
-        <image name="band3">
-            <visible>false</visible>
-        </image>
-        <image name="band4">
-            <visible>false</visible>
-        </image>
-        <image name="consolegame">
-            <visible>false</visible>
-        </image>
-        <image name="controller">
-            <visible>false</visible>
-        </image>
-    </view>
-
-    <view name="gamelist">
-        <carousel name="gamelistCarousel">
-            <pos>0.5 0.645</pos>
-            <size>0.96 0.28</size>
-            <origin>0.5 0</origin>
-            <type>horizontalWheel</type>
-            <imageType>marquee</imageType>
-            <itemSize>0.12 0.125</itemSize>
-            <itemScale>1.5</itemScale>
-            <imageInterpolation>linear</imageInterpolation>
-            <itemRotation>11.8</itemRotation>
-            <itemRotationOrigin>-6.8 0.5</itemRotationOrigin>
-            <itemAxisHorizontal>true</itemAxisHorizontal>
-            <itemVerticalAlignment>center</itemVerticalAlignment>
-            <wheelVerticalAlignment>top</wheelVerticalAlignment>
-            <verticalOffset>-0.21</verticalOffset>
-            <unfocusedItemOpacity>0.7</unfocusedItemOpacity>
-            <color>555555DD</color>
-            <textColor>${systemCarouselTextColor}</textColor>
-            <fontPath>./core/fonts/Exo2-RegularCondensed.otf</fontPath>
-            <fontSize>0.046</fontSize>
-            <letterCase>uppercase</letterCase>
-            <lineSpacing>1.2</lineSpacing>
-            <zIndex>80</zIndex>
-        </carousel>
-        <image name="backframe2">
-            <pos>0.5 0.19</pos>
-            <size>0.96 0.735</size>
-            <origin>0.5 0</origin>
-            <path>./core/images/frame.png</path>
-            <zIndex>10</zIndex>
-        </image>
-        <image name="coverImage">
-            <pos>0.26 0.25</pos>
-            <maxSize>0.18 0.324</maxSize>
-            <origin>0.5 0</origin>
-            <imageType>cover</imageType>
-            <interpolation>linear</interpolation>
-            <scrollFadeIn>true</scrollFadeIn>
-        </image>
-        <image name="gameImage">
-            <pos>0.5 0.25</pos>
-            <maxSize>0.256 0.324</maxSize>
-            <origin>0.5 0</origin>
-            <imageType>screenshot, titlescreen</imageType>
-            <interpolation>nearest</interpolation>
-            <scrollFadeIn>true</scrollFadeIn>
-        </image>
-        <badges name="badges">
-            <pos>0.65 0.29</pos>
-        </badges>
-        <rating name="rating">
-            <pos>0.65 0.25</pos>
-        </rating>
-        <helpsystem name="help">
-            <pos>0.012 0.955</pos>
-            <textColor>${gamelistHelpColor}</textColor>
-            <iconColor>${gamelistHelpColor}</iconColor>
-            <textColorDimmed>${gamelistHelpColorDimmed}</textColorDimmed>
-            <iconColorDimmed>${gamelistHelpColorDimmed}</iconColorDimmed>
-        </helpsystem>
-        <!-- Hide some unwanted elements -->
-        <image name="backframe3">
-            <visible>false</visible>
-        </image>
-        <text name="labelLastplayed, description">
-            <visible>false</visible>
-        </text>
-        <datetime name="lastplayed">
-            <visible>false</visible>
-        </datetime>
-    </view>
-
-    <aspectRatio name="4:3">
-        <view name="system">
-            <helpsystem name="help">
-                <pos>0.9885 0.955</pos>
-                <fontSize>0.034</fontSize>
-            </helpsystem>
-        </view>
-        <view name="system">
-            <carousel name="systemCarousel">
-                <itemRotationOrigin>-4.05 0.5</itemRotationOrigin>
-                <horizontalOffset>-0.03</horizontalOffset>
-            </carousel>
-            <text name="recentlyPlayed">
-                <pos>0.775 0.038</pos>
-                <size>0.2 0</size>
-                <fontSize>0.031</fontSize>
-            </text>
-            <rating name="recentGameRating">
-                <pos>0.975 0.050</pos>
-                <size>0.022 0.022</size>
-            </rating>
-        </view>
-    </aspectRatio>
-</theme>
\ No newline at end of file
diff --git a/themes/slate-es-de/theme_engine_test_2.xml b/themes/slate-es-de/theme_engine_test_2.xml
deleted file mode 100644
index 666562694..000000000
--- a/themes/slate-es-de/theme_engine_test_2.xml
+++ /dev/null
@@ -1,158 +0,0 @@
-<theme>
-    <!-- Test of system textlist and vertical gamelist carousel -->
-
-    <view name="system">
-        <textlist name="systemTextlist">
-            <pos>0.025 0.201</pos>
-            <size>0.39 0.711</size>
-            <selectorColor>${gamelistTextlistSelectorColor}</selectorColor>
-            <selectedColor>${gamelistTextlistSelectedColor}</selectedColor>
-            <primaryColor>${gamelistTextlistPrimaryColor}</primaryColor>
-            <secondaryColor>${gamelistTextlistSecondaryColor}</secondaryColor>
-            <fontPath>./core/fonts/Exo2-BoldCondensed.otf</fontPath>
-            <fontSize>0.025</fontSize>
-            <horizontalAlignment>left</horizontalAlignment>
-            <horizontalMargin>0.01</horizontalMargin>
-            <letterCase>uppercase</letterCase>
-        </textlist>
-        <image name="consolegame">
-            <pos>0.45 0.29</pos>
-            <maxSize>0.35 0.28</maxSize>
-            <origin>0 0</origin>
-        </image>
-        <image name="controller">
-            <pos>0.94 0.29</pos>
-            <maxSize>0.12 0.28</maxSize>
-            <origin>1 0</origin>
-        </image>
-        <image name="backframe2">
-            <pos>0.02 0.19</pos>
-            <size>0.4 0.735</size>
-            <path>./core/images/frame.png</path>
-            <color>${gamelistBackFrameColor}</color>
-            <zIndex>10</zIndex>
-        </image>
-        <image name="backframe3">
-            <pos>0.44 0.19</pos>
-            <size>0.54 0.735</size>
-            <path>./core/images/frame.png</path>
-            <color>${gamelistBackFrameColor}</color>
-            <zIndex>10</zIndex>
-        </image>
-        <image name="logo">
-            <pos>0.02 0.17</pos>
-            <maxSize>0.32 0.13</maxSize>
-            <origin>0 1</origin>
-        </image>
-        <text name="gameCounter">
-            <pos>0.45 0.225</pos>
-            <size>0.4 0.056</size>
-            <origin>0 0.5</origin>
-            <systemdata>gamecount</systemdata>
-            <fontPath>./core/fonts/Exo2-RegularCondensed.otf</fontPath>
-            <fontSize>0.035</fontSize>
-            <horizontalAlignment>left</horizontalAlignment>
-            <backgroundColor>00000000</backgroundColor>
-            <letterCase>uppercase</letterCase>
-            <zIndex>50</zIndex>
-        </text>
-        <text name="info1">
-            <pos>0.45 0.665</pos>
-            <horizontalAlignment>left</horizontalAlignment>
-        </text>
-        <text name="info2">
-            <pos>0.45 0.686</pos>
-            <horizontalAlignment>left</horizontalAlignment>
-        </text>
-        <text name="info3">
-            <pos>0.45 0.707</pos>
-            <horizontalAlignment>left</horizontalAlignment>
-        </text>
-        <text name="info4">
-            <pos>0.45 0.728</pos>
-            <horizontalAlignment>left</horizontalAlignment>
-        </text>
-        <text name="info5">
-            <pos>0.45 0.769</pos>
-            <horizontalAlignment>left</horizontalAlignment>
-        </text>
-        <text name="info6">
-            <pos>0.45 0.790</pos>
-            <horizontalAlignment>left</horizontalAlignment>
-        </text>
-        <text name="info7">
-            <pos>0.45 0.811</pos>
-            <horizontalAlignment>left</horizontalAlignment>
-        </text>
-        <text name="info8">
-            <pos>0.45 0.832</pos>
-            <horizontalAlignment>left</horizontalAlignment>
-        </text>
-        <text name="info9">
-            <pos>0.45 0.853</pos>
-            <horizontalAlignment>left</horizontalAlignment>
-        </text>
-        <text name="info10">
-            <pos>0.45 0.874</pos>
-            <horizontalAlignment>left</horizontalAlignment>
-        </text>
-        <helpsystem name="help">
-            <pos>0.012 0.955</pos>
-            <textColor>${gamelistHelpColor}</textColor>
-            <iconColor>${gamelistHelpColor}</iconColor>
-            <textColorDimmed>${gamelistHelpColorDimmed}</textColorDimmed>
-            <iconColorDimmed>${gamelistHelpColorDimmed}</iconColorDimmed>
-        </helpsystem>
-    </view>
-
-    <view name="gamelist">
-        <carousel name="gamelistCarousel">
-            <pos>0.025 0.201</pos>
-            <size>0.39 0.711</size>
-            <type>vertical</type>
-            <imageType>marquee</imageType>
-            <maxItemCount>5</maxItemCount>
-            <itemSize>0.26 0.105</itemSize>
-            <itemScale>1.23</itemScale>
-            <imageInterpolation>linear</imageInterpolation>
-            <itemHorizontalAlignment>center</itemHorizontalAlignment>
-            <horizontalOffset>0</horizontalOffset>
-            <verticalOffset>0</verticalOffset>
-            <color>00000000</color>
-            <textColor>${systemCarouselTextColor}</textColor>
-            <fontPath>./core/fonts/Exo2-RegularCondensed.otf</fontPath>
-            <fontSize>0.056</fontSize>
-            <letterCase>uppercase</letterCase>
-            <lineSpacing>1.2</lineSpacing>
-            <zIndex>80</zIndex>
-        </carousel>
-        <image name="gameImage">
-            <pos>0.63 0.45</pos>
-            <maxSize>0.360 0.424</maxSize>
-            <origin>0.5 0.5</origin>
-            <imageType>image</imageType>
-            <interpolation>nearest</interpolation>
-            <scrollFadeIn>true</scrollFadeIn>
-        </image>
-        <helpsystem name="help">
-            <pos>0.012 0.955</pos>
-            <textColor>${gamelistHelpColor}</textColor>
-            <iconColor>${gamelistHelpColor}</iconColor>
-            <textColorDimmed>${gamelistHelpColorDimmed}</textColorDimmed>
-            <iconColorDimmed>${gamelistHelpColorDimmed}</iconColorDimmed>
-        </helpsystem>
-    </view>
-
-    <aspectRatio name="4:3">
-        <view name="system, gamelist">
-            <helpsystem name="help">
-                <fontSize>0.034</fontSize>
-            </helpsystem>
-        </view>
-        <view name="gamelist">
-            <carousel name="gamelistCarousel">
-                <itemSize>0.25 0.105</itemSize>
-            </carousel>
-        </view>
-    </aspectRatio>
-</theme>
\ No newline at end of file
diff --git a/themes/slate-es-de/theme_engine_test_3.xml b/themes/slate-es-de/theme_engine_test_3.xml
deleted file mode 100644
index c497e9ed7..000000000
--- a/themes/slate-es-de/theme_engine_test_3.xml
+++ /dev/null
@@ -1,208 +0,0 @@
-<theme>
-    <!-- Test of system textlist and horizontal gamelist carousel with reflections -->
-
-    <view name="system">
-        <textlist name="systemTextlist">
-            <pos>0.025 0.201</pos>
-            <size>0.39 0.711</size>
-            <selectorColor>${gamelistTextlistSelectorColor}</selectorColor>
-            <selectedColor>${gamelistTextlistSelectedColor}</selectedColor>
-            <primaryColor>${gamelistTextlistPrimaryColor}</primaryColor>
-            <secondaryColor>${gamelistTextlistSecondaryColor}</secondaryColor>
-            <fontPath>./core/fonts/Exo2-BoldCondensed.otf</fontPath>
-            <fontSize>0.025</fontSize>
-            <horizontalAlignment>left</horizontalAlignment>
-            <horizontalMargin>0.01</horizontalMargin>
-            <letterCase>uppercase</letterCase>
-        </textlist>
-        <image name="consolegame">
-            <pos>0.45 0.29</pos>
-            <maxSize>0.35 0.28</maxSize>
-            <origin>0 0</origin>
-        </image>
-        <image name="controller">
-            <pos>0.94 0.29</pos>
-            <maxSize>0.12 0.28</maxSize>
-            <origin>1 0</origin>
-        </image>
-        <image name="backframe2">
-            <pos>0.02 0.19</pos>
-            <size>0.4 0.735</size>
-            <path>./core/images/frame.png</path>
-            <color>${gamelistBackFrameColor}</color>
-            <zIndex>10</zIndex>
-        </image>
-        <image name="backframe3">
-            <pos>0.44 0.19</pos>
-            <size>0.54 0.735</size>
-            <path>./core/images/frame.png</path>
-            <color>${gamelistBackFrameColor}</color>
-            <zIndex>10</zIndex>
-        </image>
-        <image name="logo">
-            <pos>0.02 0.17</pos>
-            <maxSize>0.32 0.13</maxSize>
-            <origin>0 1</origin>
-        </image>
-        <text name="gameCounter">
-            <pos>0.45 0.225</pos>
-            <size>0.4 0.056</size>
-            <origin>0 0.5</origin>
-            <systemdata>gamecount</systemdata>
-            <fontPath>./core/fonts/Exo2-RegularCondensed.otf</fontPath>
-            <fontSize>0.035</fontSize>
-            <horizontalAlignment>left</horizontalAlignment>
-            <backgroundColor>00000000</backgroundColor>
-            <letterCase>uppercase</letterCase>
-            <zIndex>50</zIndex>
-        </text>
-        <text name="info1">
-            <pos>0.45 0.665</pos>
-            <horizontalAlignment>left</horizontalAlignment>
-        </text>
-        <text name="info2">
-            <pos>0.45 0.686</pos>
-            <horizontalAlignment>left</horizontalAlignment>
-        </text>
-        <text name="info3">
-            <pos>0.45 0.707</pos>
-            <horizontalAlignment>left</horizontalAlignment>
-        </text>
-        <text name="info4">
-            <pos>0.45 0.728</pos>
-            <horizontalAlignment>left</horizontalAlignment>
-        </text>
-        <text name="info5">
-            <pos>0.45 0.769</pos>
-            <horizontalAlignment>left</horizontalAlignment>
-        </text>
-        <text name="info6">
-            <pos>0.45 0.790</pos>
-            <horizontalAlignment>left</horizontalAlignment>
-        </text>
-        <text name="info7">
-            <pos>0.45 0.811</pos>
-            <horizontalAlignment>left</horizontalAlignment>
-        </text>
-        <text name="info8">
-            <pos>0.45 0.832</pos>
-            <horizontalAlignment>left</horizontalAlignment>
-        </text>
-        <text name="info9">
-            <pos>0.45 0.853</pos>
-            <horizontalAlignment>left</horizontalAlignment>
-        </text>
-        <text name="info10">
-            <pos>0.45 0.874</pos>
-            <horizontalAlignment>left</horizontalAlignment>
-        </text>
-        <helpsystem name="help">
-            <pos>0.012 0.955</pos>
-            <textColor>${gamelistHelpColor}</textColor>
-            <iconColor>${gamelistHelpColor}</iconColor>
-            <textColorDimmed>${gamelistHelpColorDimmed}</textColorDimmed>
-            <iconColorDimmed>${gamelistHelpColorDimmed}</iconColorDimmed>
-        </helpsystem>
-    </view>
-
-    <view name="gamelist">
-        <carousel name="gamelistCarousel">
-            <pos>0.025 0.231</pos>
-            <size>0.95 0.692</size>
-            <type>horizontal</type>
-            <imageType>cover</imageType>
-            <maxItemCount>5</maxItemCount>
-            <itemSize>0.105 0.235</itemSize>
-            <itemScale>1.53</itemScale>
-            <imageInterpolation>linear</imageInterpolation>
-            <itemVerticalAlignment>center</itemVerticalAlignment>
-            <verticalOffset>0.1</verticalOffset>
-            <reflections>true</reflections>
-            <reflectionsOpacity>0.3</reflectionsOpacity>
-            <reflectionsFalloff>1.2</reflectionsFalloff>
-            <unfocusedItemOpacity>1</unfocusedItemOpacity>
-            <color>00000000</color>
-            <textColor>949494</textColor>
-            <textBackgroundColor>323232CC</textBackgroundColor>
-            <fontPath>./core/fonts/Exo2-RegularCondensed.otf</fontPath>
-            <fontSize>0.032</fontSize>
-            <letterCase>uppercase</letterCase>
-            <lineSpacing>1.2</lineSpacing>
-            <zIndex>60</zIndex>
-        </carousel>
-        <image name="backframe2">
-            <pos>0.5 0.19</pos>
-            <size>0.96 0.735</size>
-            <origin>0.5 0</origin>
-            <path>./core/images/frame.png</path>
-            <color>181818</color>
-            <zIndex>10</zIndex>
-        </image>
-        <text name="gameName">
-            <pos>0.5 0.77</pos>
-            <size>0.95 0.08</size>
-            <origin>0.5 0</origin>
-            <metadata>name</metadata>
-            <fontPath>./core/fonts/Exo2-RegularCondensed.otf</fontPath>
-            <fontSize>0.045</fontSize>
-            <horizontalAlignment>center</horizontalAlignment>
-            <verticalAlignment>center</verticalAlignment>
-            <color>D6D6D6</color>
-            <letterCase>none</letterCase>
-            <zIndex>80</zIndex>
-        </text>
-        <text name="description">
-            <pos>0.025 0.205</pos>
-            <size>0.446 0.185</size>
-            <fontSize>0.02</fontSize>
-            <lineSpacing>1.2</lineSpacing>
-        </text>
-        <rating name="rating">
-            <pos>0.815 0.203</pos>
-            <size>0.04 0.03</size>
-        </rating>
-        <gamelistinfo name="gamelistInfo">
-            <color>888888</color>
-        </gamelistinfo>
-        <badges name="badges">
-            <pos>0.03 0.205</pos>
-            <size>0.38 0.08</size>
-            <lines>1</lines>
-            <itemsPerLine>10</itemsPerLine>
-        </badges>
-        <helpsystem name="help">
-            <pos>0.012 0.955</pos>
-            <textColor>${gamelistHelpColor}</textColor>
-            <iconColor>${gamelistHelpColor}</iconColor>
-            <textColorDimmed>${gamelistHelpColorDimmed}</textColorDimmed>
-            <iconColorDimmed>${gamelistHelpColorDimmed}</iconColorDimmed>
-        </helpsystem>
-        <!-- Hide some unwanted elements -->
-        <image name="backframe3">
-            <visible>false</visible>
-        </image>
-        <text name="labelPublisher, labelReleasedate, labelDeveloper, labelGenre, labelPlayers,
-                    labelLastplayed, developer, publisher, genre, players, description">
-            <visible>false</visible>
-        </text>
-        <datetime name="releasedate lastplayed">
-            <visible>false</visible>
-        </datetime>
-        <rating name="rating">
-            <visible>false</visible>
-        </rating>
-    </view>
-
-    <aspectRatio name="4:3">
-        <view name="system, gamelist">
-            <helpsystem name="help">
-                <fontSize>0.034</fontSize>
-            </helpsystem>
-        </view>
-        <view name="gamelist">
-            <carousel name="gamelistCarousel">
-                <itemSize>0.12 0.225</itemSize>
-            </carousel>
-        </view>
-    </aspectRatio>
-</theme>
\ No newline at end of file
diff --git a/themes/slate-es-de/theme_engine_test_4.xml b/themes/slate-es-de/theme_engine_test_4.xml
deleted file mode 100644
index f9e7c0004..000000000
--- a/themes/slate-es-de/theme_engine_test_4.xml
+++ /dev/null
@@ -1,185 +0,0 @@
-<theme>
-    <!-- Test of grid element for both the system view and gamelist view -->
-
-    <view name="system">
-        <grid name="systemGrid">
-            <pos>0.5 0.2</pos>
-            <size>0.86 0.715</size>
-            <origin>0.5 0</origin>
-            <staticImage>./${system.theme}/images/logo.svg</staticImage>
-            <itemSize>0.151 -1</itemSize>
-            <itemScale>1.1</itemScale>
-            <itemSpacing>0.022 -1</itemSpacing>
-            <fractionalRows>true</fractionalRows>
-            <itemTransitions>animate</itemTransitions>
-            <rowTransitions>animate</rowTransitions>
-            <unfocusedItemOpacity>1.0</unfocusedItemOpacity>
-            <imageRelativeScale>0.9</imageRelativeScale>
-            <imageFit>contain</imageFit>
-            <backgroundImage>./core/images/grid_frame.svg</backgroundImage>
-            <backgroundRelativeScale>1.0</backgroundRelativeScale>
-            <backgroundColor>424242</backgroundColor>
-            <selectorImage>./core/images/grid_frame.svg</selectorImage>
-            <selectorRelativeScale>1.0</selectorRelativeScale>
-            <selectorLayer>middle</selectorLayer>
-            <selectorColor>FF3333</selectorColor>
-            <textRelativeScale>0.8</textRelativeScale>
-            <textColor>F0F0F0</textColor>
-            <fontPath>./core/fonts/Exo2-RegularCondensed.otf</fontPath>
-            <fontSize>0.032</fontSize>
-            <letterCase>uppercase</letterCase>
-            <lineSpacing>1.2</lineSpacing>
-            <fadeAbovePrimary>true</fadeAbovePrimary>
-        </grid>
-        <image name="consolegame">
-            <pos>0.02 0.17</pos>
-            <maxSize>0.4 0.15</maxSize>
-            <origin>0 1</origin>
-        </image>
-        <image name="controller">
-            <pos>0.78 0.17</pos>
-            <maxSize>0.1 0.15</maxSize>
-            <origin>1 1</origin>
-        </image>
-        <image name="backframe2">
-            <pos>0.5 0.19</pos>
-            <size>0.96 0.735</size>
-            <origin>0.5 0</origin>
-            <path>./core/images/frame.png</path>
-            <color>181818</color>
-            <zIndex>10</zIndex>
-        </image>
-        <image name="logo">
-            <pos>0.02 0.17</pos>
-            <maxSize>0.32 0.13</maxSize>
-            <origin>0 1</origin>
-        </image>
-        <text name="gameCounter">
-            <pos>0.8 0.145</pos>
-            <size>0.117 0.056</size>
-            <origin>0 0.5</origin>
-            <systemdata>gamecountGames</systemdata>
-            <fontPath>./core/fonts/Exo2-RegularCondensed.otf</fontPath>
-            <fontSize>0.035</fontSize>
-            <horizontalAlignment>center</horizontalAlignment>
-            <color>DDDDDD</color>
-            <backgroundColor>262626DD</backgroundColor>
-            <letterCase>uppercase</letterCase>
-            <zIndex>50</zIndex>
-        </text>
-        <helpsystem name="help">
-            <pos>0.012 0.955</pos>
-            <textColor>${gamelistHelpColor}</textColor>
-            <iconColor>${gamelistHelpColor}</iconColor>
-            <textColorDimmed>${gamelistHelpColorDimmed}</textColorDimmed>
-            <iconColorDimmed>${gamelistHelpColorDimmed}</iconColorDimmed>
-        </helpsystem>
-        <!-- Hide some unwanted elements -->
-        <text name="info1, info2, info3, info4, info5, info6, info7, info8, info9, info10">
-            <visible>false</visible>
-        </text>
-    </view>
-
-    <view name="gamelist">
-        <grid name="gamelistGrid">
-            <pos>0.5 0.3</pos>
-            <size>0.86 0.623</size>
-            <origin>0.5 0</origin>
-            <imageType>cover</imageType>
-            <itemSize>0.151 -1</itemSize>
-            <itemScale>1.1</itemScale>
-            <itemSpacing>0.022 -1</itemSpacing>
-            <fractionalRows>false</fractionalRows>
-            <itemTransitions>animate</itemTransitions>
-            <rowTransitions>animate</rowTransitions>
-            <unfocusedItemOpacity>1.0</unfocusedItemOpacity>
-            <imageRelativeScale>0.9</imageRelativeScale>
-            <imageFit>contain</imageFit>
-            <backgroundImage>./core/images/grid_frame.svg</backgroundImage>
-            <backgroundRelativeScale>1.0</backgroundRelativeScale>
-            <backgroundColor>424242</backgroundColor>
-            <selectorImage>./core/images/grid_frame.svg</selectorImage>
-            <selectorRelativeScale>1.0</selectorRelativeScale>
-            <selectorLayer>middle</selectorLayer>
-            <selectorColor>FF3333</selectorColor>
-            <textRelativeScale>0.8</textRelativeScale>
-            <textColor>F0F0F0</textColor>
-            <fontPath>./core/fonts/Exo2-RegularCondensed.otf</fontPath>
-            <fontSize>0.032</fontSize>
-            <letterCase>uppercase</letterCase>
-            <lineSpacing>1.2</lineSpacing>
-        </grid>
-        <image name="backframe2">
-            <pos>0.5 0.19</pos>
-            <size>0.96 0.735</size>
-            <origin>0.5 0</origin>
-            <path>./core/images/frame.png</path>
-            <color>181818</color>
-            <zIndex>10</zIndex>
-        </image>
-        <text name="gameName">
-            <pos>0.92 0.225</pos>
-            <size>0.55 0.08</size>
-            <origin>1 0</origin>
-            <metadata>name</metadata>
-            <fontPath>./core/fonts/Exo2-RegularCondensed.otf</fontPath>
-            <fontSize>0.045</fontSize>
-            <horizontalAlignment>right</horizontalAlignment>
-            <verticalAlignment>center</verticalAlignment>
-            <color>D6D6D6</color>
-            <letterCase>none</letterCase>
-            <zIndex>80</zIndex>
-        </text>
-        <text name="description">
-            <pos>0.025 0.205</pos>
-            <size>0.446 0.185</size>
-            <fontSize>0.02</fontSize>
-            <lineSpacing>1.2</lineSpacing>
-        </text>
-        <rating name="rating">
-            <pos>0.815 0.203</pos>
-            <size>0.04 0.03</size>
-        </rating>
-        <gamelistinfo name="gamelistInfo">
-            <color>888888</color>
-        </gamelistinfo>
-        <badges name="badges">
-            <pos>0.03 0.205</pos>
-            <size>0.38 0.08</size>
-            <lines>1</lines>
-            <itemsPerLine>10</itemsPerLine>
-        </badges>
-        <helpsystem name="help">
-            <pos>0.012 0.955</pos>
-            <textColor>${gamelistHelpColor}</textColor>
-            <iconColor>${gamelistHelpColor}</iconColor>
-            <textColorDimmed>${gamelistHelpColorDimmed}</textColorDimmed>
-            <iconColorDimmed>${gamelistHelpColorDimmed}</iconColorDimmed>
-        </helpsystem>
-        <!-- Hide some unwanted elements -->
-        <image name="backframe3">
-            <visible>false</visible>
-        </image>
-        <text name="labelPublisher, labelReleasedate, labelDeveloper, labelGenre, labelPlayers,
-                    labelLastplayed, developer, publisher, genre, players, description">
-            <visible>false</visible>
-        </text>
-        <datetime name="releasedate lastplayed">
-            <visible>false</visible>
-        </datetime>
-        <rating name="rating">
-            <visible>false</visible>
-        </rating>
-    </view>
-
-    <aspectRatio name="4:3">
-        <view name="system, gamelist">
-            <grid name="gamelistGrid">
-                <itemSize>0.192 -1</itemSize>
-            </grid>
-            <helpsystem name="help">
-                <fontSize>0.034</fontSize>
-            </helpsystem>
-        </view>
-    </aspectRatio>
-</theme>
\ No newline at end of file