diff --git a/themes/slate-DE/capabilities.xml b/themes/slate-DE/capabilities.xml
index 918220120..091169e1f 100644
--- a/themes/slate-DE/capabilities.xml
+++ b/themes/slate-DE/capabilities.xml
@@ -1,31 +1,21 @@
 <!--
-Theme capabilities for rbsimple-DE.
+    Theme capabilities for slate-DE
 -->
 
 <themeCapabilities>
     <aspectRatio>16:9</aspectRatio>
     <aspectRatio>4:3</aspectRatio>
 
-    <variant name="darkMode">
+    <colorScheme name="dark">
         <label>Dark mode</label>
-        <selectable>true</selectable>
-        <override>
-            <trigger>no_game_media</trigger>
-            <useVariant>noMedia</useVariant>
-        </override>
-    </variant>
+    </colorScheme>
 
-    <variant name="darkModeNoVideos">
-        <label>Dark mode (no videos)</label>
-        <selectable>true</selectable>
-        <override>
-            <trigger>no_game_media</trigger>
-            <useVariant>noMedia</useVariant>
-        </override>
-    </variant>
-
-    <variant name="lightMode">
+    <colorScheme name="light">
         <label>Light mode</label>
+    </colorScheme>
+
+    <variant name="withVideos">
+        <label>Textlist with videos</label>
         <selectable>true</selectable>
         <override>
             <trigger>no_game_media</trigger>
@@ -33,8 +23,8 @@ Theme capabilities for rbsimple-DE.
         </override>
     </variant>
 
-    <variant name="lightModeNoVideos">
-        <label>Light mode (no videos)</label>
+    <variant name="withoutVideos">
+        <label>Textlist without videos</label>
         <selectable>true</selectable>
         <override>
             <trigger>no_game_media</trigger>
diff --git a/themes/slate-DE/colors.xml b/themes/slate-DE/colors.xml
new file mode 100644
index 000000000..8046032b6
--- /dev/null
+++ b/themes/slate-DE/colors.xml
@@ -0,0 +1,79 @@
+<theme>
+    <!-- Default band colors (used if a system is unthemed) -->
+    <view name="system, gamelist">
+        <image name="band1">
+            <color>F6DD08</color>
+        </image>
+        <image name="band2">
+            <color>800000</color>
+        </image>
+        <image name="band3">
+            <color>FF0000</color>
+        </image>
+        <image name="band4">
+            <color>303030</color>
+        </image>
+    </view>
+
+    <colorScheme name="dark">
+        <variables>
+            <!-- Both system and gamelist views -->
+            <backgroundColor>404040</backgroundColor>
+
+            <!-- System view -->
+            <systemCarouselColor>747474D8</systemCarouselColor>
+            <systemCarouselTextColor>F0F0F0</systemCarouselTextColor>
+            <systemGameCounterColor>C6C6C6</systemGameCounterColor>
+            <systemGameCounterBackgroundColor>555555D8</systemGameCounterBackgroundColor>
+
+            <systemInfoTextColor>B6B6B6</systemInfoTextColor>
+            <systemHelpColor>A6A6A6</systemHelpColor>
+            <systemHelpColorDimmed>969696</systemHelpColorDimmed>
+
+            <!-- Gamelist view -->
+            <gamelistBackFrameColor>6F6F6F</gamelistBackFrameColor>
+            <gamelistTextlistSelectorColor>161616</gamelistTextlistSelectorColor>
+            <gamelistTextlistSelectedColor>AFAFAF</gamelistTextlistSelectedColor>
+            <gamelistTextlistPrimaryColor>000000</gamelistTextlistPrimaryColor>
+            <gamelistTextlistSecondaryColor>333333</gamelistTextlistSecondaryColor>
+
+            <gamelistDefaultTextColor>000000</gamelistDefaultTextColor>
+            <gamelistInfoColor>303030</gamelistInfoColor>
+            <gamelistRatingColor>606060</gamelistRatingColor>
+
+            <gamelistHelpColor>A6A6A6</gamelistHelpColor>
+            <gamelistHelpColorDimmed>969696</gamelistHelpColorDimmed>
+        </variables>
+    </colorScheme>
+
+    <colorScheme name="light">
+        <variables>
+            <!-- Both system and gamelist views -->
+            <backgroundColor>707070</backgroundColor>
+
+            <!-- System view -->
+            <systemCarouselColor>FFFFFFD8</systemCarouselColor>
+            <systemCarouselTextColor>262626</systemCarouselTextColor>
+            <systemGameCounterColor>202020</systemGameCounterColor>
+            <systemGameCounterBackgroundColor>DDDDDDD8</systemGameCounterBackgroundColor>
+
+            <systemInfoTextColor>262626</systemInfoTextColor>
+            <systemHelpColor>C6C6C6</systemHelpColor>
+            <systemHelpColorDimmed>B6B6B6</systemHelpColorDimmed>
+
+            <!-- Gamelist view -->
+            <gamelistBackFrameColor>9F9F9F</gamelistBackFrameColor>
+            <gamelistTextlistSelectorColor>262626</gamelistTextlistSelectorColor>
+            <gamelistTextlistSelectedColor>9F9F9F</gamelistTextlistSelectedColor>
+            <gamelistTextlistPrimaryColor>262626</gamelistTextlistPrimaryColor>
+            <gamelistTextlistSecondaryColor>4D4D4D</gamelistTextlistSecondaryColor>
+
+            <gamelistDefaultTextColor>262626</gamelistDefaultTextColor>
+            <gamelistInfoColor>505050</gamelistInfoColor>
+            <gamelistRatingColor>FFFFFF</gamelistRatingColor>
+
+            <gamelistHelpColor>262626</gamelistHelpColor>
+            <gamelistHelpColorDimmed>B6B6B6</gamelistHelpColorDimmed>
+        </variables>
+    </colorScheme>
+</theme>
\ No newline at end of file
diff --git a/themes/slate-DE/colors_dark.xml b/themes/slate-DE/colors_dark.xml
deleted file mode 100644
index 71052f27f..000000000
--- a/themes/slate-DE/colors_dark.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<theme>
-    <view name="system, gamelist">
-        <!-- Default band colors (used if a system is unthemed) -->
-        <image name="band1">
-            <color>F6DD08</color>
-        </image>
-        <image name="band2">
-            <color>800000</color>
-        </image>
-        <image name="band3">
-            <color>FF0000</color>
-        </image>
-        <image name="band4">
-            <color>303030</color>
-        </image>
-        <helpsystem name="help">
-            <textColor>A6A6A6</textColor>
-            <iconColor>A6A6A6</iconColor>
-            <textColorDimmed>969696</textColorDimmed>
-            <iconColorDimmed>969696</iconColorDimmed>
-        </helpsystem>
-    </view>
-
-    <view name="system">
-        <image name="background">
-            <color>404040</color>
-        </image>
-        <text name="game_counter">
-            <color>C6C6C6</color>
-            <backgroundColor>555555D8</backgroundColor>
-        </text>
-        <text name="info1, info2, info3, info4, info5, info6, info7, info8, info9, info10">
-            <color>B6B6B6</color>
-        </text>
-    </view>
-
-    <view name="gamelist">
-        <image name="background">
-            <color>404040</color>
-        </image>
-        <image name="backframe2">
-            <color>6F6F6F</color>
-        </image>
-        <image name="backframe3">
-            <color>6F6F6F</color>
-        </image>
-        <text name="md_lbl_releasedate, md_lbl_developer, md_lbl_publisher, md_lbl_genre,
-                    md_lbl_players, md_lbl_lastplayed, md_developer, md_publisher,
-                    md_genre, md_players, md_description">
-            <color>000000</color>
-        </text>
-        <datetime name="md_releasedate, md_lastplayed">
-            <color>000000</color>
-        </datetime>
-        <gamelistinfo name="gamelistInfo">
-            <color>303030</color>
-        </gamelistinfo>
-        <rating name="md_rating">
-            <color>606060</color>
-        </rating>
-    </view>
-
-    <variant name="noMedia">
-        <view name="gamelist">
-            <image name="backframe1">
-                <color>9F9F9F</color>
-            </image>
-        </view>
-    </variant>
-</theme>
\ No newline at end of file
diff --git a/themes/slate-DE/colors_light.xml b/themes/slate-DE/colors_light.xml
deleted file mode 100644
index 11f54b8f1..000000000
--- a/themes/slate-DE/colors_light.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<theme>
-    <view name="system, gamelist">
-        <!-- Default band colors (used if a system is unthemed) -->
-        <image name="band1">
-            <color>F6DD08</color>
-        </image>
-        <image name="band2">
-            <color>800000</color>
-        </image>
-        <image name="band3">
-            <color>FF0000</color>
-        </image>
-        <image name="band4">
-            <color>303030</color>
-        </image>
-    </view>
-
-    <view name="system">
-        <image name="background">
-            <color>707070</color>
-        </image>
-        <text name="game_counter">
-            <color>202020</color>
-            <backgroundColor>DDDDDDD8</backgroundColor>
-        </text>
-        <text name="info1, info2, info3, info4, info5, info6, info7, info8, info9, info10">
-            <color>262626</color>
-        </text>
-        <helpsystem name="help">
-            <textColor>C6C6C6</textColor>
-            <iconColor>C6C6C6</iconColor>
-            <textColorDimmed>B6B6B6</textColorDimmed>
-            <iconColorDimmed>B6B6B6</iconColorDimmed>
-        </helpsystem>
-    </view>
-
-    <view name="gamelist">
-        <image name="background">
-            <color>707070</color>
-        </image>
-        <image name="backframe2">
-            <color>9F9F9F</color>
-        </image>
-        <image name="backframe3">
-            <color>9F9F9F</color>
-        </image>
-        <text name="md_lbl_releasedate, md_lbl_developer, md_lbl_publisher, md_lbl_genre,
-                    md_lbl_players, md_lbl_lastplayed, md_developer, md_publisher,
-                    md_genre, md_players, md_description">
-            <color>262626</color>
-        </text>
-        <datetime name="md_releasedate, md_lastplayed">
-            <color>262626</color>
-        </datetime>
-        <gamelistinfo name="gamelistInfo">
-            <color>505050</color>
-        </gamelistinfo>
-        <helpsystem name="help">
-            <textColor>262626</textColor>
-            <iconColor>262626</iconColor>
-            <textColorDimmed>B6B6B6</textColorDimmed>
-            <iconColorDimmed>B6B6B6</iconColorDimmed>
-        </helpsystem>
-    </view>
-
-    <variant name="noMedia">
-        <view name="gamelist">
-            <image name="backframe1">
-                <color>9F9F9F</color>
-            </image>
-        </view>
-    </variant>
-</theme>
\ No newline at end of file
diff --git a/themes/slate-DE/theme.xml b/themes/slate-DE/theme.xml
index 443fbd2d5..22f96277c 100644
--- a/themes/slate-DE/theme.xml
+++ b/themes/slate-DE/theme.xml
@@ -7,20 +7,7 @@
 
 <theme>
     <include>./navigationsounds.xml</include>
-
-    <variables>
-        <systemConsoleImage>./${system.theme}/images/consolegame.svg</systemConsoleImage>
-        <systemControllerImage>./${system.theme}/images/controller.svg</systemControllerImage>
-        <systemLogo>./${system.theme}/images/logo.svg</systemLogo>
-    </variables>
-
-    <variant name="darkMode, darkModeNoVideos">
-        <include>./colors_dark.xml</include>
-    </variant>
-
-    <variant name="lightMode, lightModeNoVideos">
-        <include>./colors_light.xml</include>
-    </variant>
+    <include>./colors.xml</include>
 
     <!-- Per-system band colors and platform info -->
     <variant name="all">
@@ -28,42 +15,13 @@
         <include>./${system.theme}/systeminfo.xml</include>
     </variant>
 
-    <!-- Temporary location during theme engine testing, should be moved to colors_dark.xml -->
-    <variant name="darkMode, darkModeNoVideos">
-        <view name="system">
-            <carousel name="system_carousel">
-                <color>747474D8</color>
-                <textColor>F0F0F0</textColor>
-            </carousel>
-        </view>
-        <view name="gamelist">
-            <textlist name="gamelist_textlist">
-                <selectorColor>161616</selectorColor>
-                <selectedColor>AFAFAF</selectedColor>
-                <primaryColor>000000</primaryColor>
-                <secondaryColor>333333</secondaryColor>
-            </textlist>
-        </view>
-    </variant>
+    <variables>
+        <systemConsoleImage>./${system.theme}/images/consolegame.svg</systemConsoleImage>
+        <systemControllerImage>./${system.theme}/images/controller.svg</systemControllerImage>
+        <systemLogo>./${system.theme}/images/logo.svg</systemLogo>
+    </variables>
 
-    <!-- Temporary location during theme engine testing, should be moved to colors_light.xml -->
-    <variant name="lightMode, lightModeNoVideos">
-        <view name="system">
-            <carousel name="system_carousel">
-                <textColor>262626</textColor>
-            </carousel>
-        </view>
-        <view name="gamelist">
-            <textlist name="gamelist_textlist">
-                <selectorColor>262626</selectorColor>
-                <selectedColor>9F9F9F</selectedColor>
-                <primaryColor>262626</primaryColor>
-                <secondaryColor>4D4D4D</secondaryColor>
-            </textlist>
-        </view>
-    </variant>
-
-    <variant name="darkMode, darkModeNoVideos, lightMode, lightModeNoVideos">
+    <variant name="withVideos, withoutVideos">
         <view name="system">
             <carousel name="system_carousel">
                 <pos>0 0.383796</pos>
@@ -75,7 +33,9 @@
                 <itemScale>1.23</itemScale>
                 <itemInterpolation>linear</itemInterpolation>
                 <unfocusedItemOpacity>0.5</unfocusedItemOpacity>
+                <color>${systemCarouselColor}</color>
                 <text>${system.fullName}</text>
+                <textColor>${systemCarouselTextColor}</textColor>
                 <fontPath>./core/fonts/Exo2-RegularCondensed.otf</fontPath>
                 <fontSize>0.055</fontSize>
                 <letterCase>uppercase</letterCase>
@@ -89,14 +49,26 @@
                 <fontPath>./core/fonts/Exo2-RegularCondensed.otf</fontPath>
                 <fontSize>0.035</fontSize>
                 <horizontalAlignment>center</horizontalAlignment>
+                <color>${systemGameCounterColor}</color>
+                <backgroundColor>${systemGameCounterBackgroundColor}</backgroundColor>
                 <letterCase>uppercase</letterCase>
                 <zIndex>50</zIndex>
             </text>
+            <helpsystem name="help">
+                <textColor>${systemHelpColor}</textColor>
+                <iconColor>${systemHelpColor}</iconColor>
+                <textColorDimmed>${systemHelpColorDimmed}</textColorDimmed>
+                <iconColorDimmed>${systemHelpColorDimmed}</iconColorDimmed>
+            </helpsystem>
         </view>
         <view name="gamelist">
             <textlist name="gamelist_textlist">
                 <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>
@@ -105,6 +77,12 @@
                 <indicators>symbols</indicators>
                 <collectionIndicators>symbols</collectionIndicators>
             </textlist>
+            <helpsystem name="help">
+                <textColor>${gamelistHelpColor}</textColor>
+                <iconColor>${gamelistHelpColor}</iconColor>
+                <textColorDimmed>${gamelistHelpColorDimmed}</textColorDimmed>
+                <iconColorDimmed>${gamelistHelpColorDimmed}</iconColorDimmed>
+            </helpsystem>
         </view>
     </variant>
 
@@ -114,6 +92,7 @@
             <size>1 1</size>
             <path>./core/images/background.png</path>
             <tile>true</tile>
+            <color>${backgroundColor}</color>
             <zIndex>0</zIndex>
         </image>
         <image name="band1">
@@ -160,6 +139,7 @@
             <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>
@@ -210,12 +190,14 @@
             <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="md_lbl_releasedate, md_lbl_developer, md_lbl_publisher,
@@ -223,12 +205,14 @@
             <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="md_developer, md_publisher, md_genre, md_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="md_description">
@@ -242,6 +226,7 @@
             <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>
@@ -249,6 +234,7 @@
             <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="md_lbl_releasedate">
@@ -309,6 +295,7 @@
             <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>
@@ -319,6 +306,7 @@
             <fontPath>./core/fonts/Exo2-BoldCondensed.otf</fontPath>
             <fontSize>0.025</fontSize>
             <horizontalAlignment>right</horizontalAlignment>
+            <color>${gamelistInfoColor}</color>
         </gamelistinfo>
         <badges name="md_badges">
             <pos>0.815 0.675</pos>
@@ -336,7 +324,7 @@
         </badges>
     </view>
 
-    <variant name="darkMode, lightMode">
+    <variant name="withVideos">
         <view name="gamelist">
             <video name="md_video">
                 <pos>0.63 0.45</pos>
@@ -352,7 +340,7 @@
         </view>
     </variant>
 
-    <variant name="darkModeNoVideos, lightModeNoVideos">
+    <variant name="withoutVideos">
         <view name="gamelist">
             <image name="md_image">
                 <pos>0.63 0.45</pos>
@@ -371,6 +359,7 @@
                 <pos>0.02 0.19</pos>
                 <size>0.96 0.735</size>
                 <path>./core/images/frame.png</path>
+                <color>${gamelistBackFrameColor}</color>
             </image>
             <textlist name="gamelist_textlist">
                 <pos>0.04 0.201</pos>
diff --git a/themes/slate-DE/theme_engine_test_1.xml b/themes/slate-DE/theme_engine_test_1.xml
index 1fa9edb3c..9d7d2e9ec 100644
--- a/themes/slate-DE/theme_engine_test_1.xml
+++ b/themes/slate-DE/theme_engine_test_1.xml
@@ -1,8 +1,6 @@
 <theme>
     <!-- Test of vertical system carousel wheel, system videos, gameselector elements etc. -->
 
-    <include>./colors_dark.xml</include>
-
     <view name="system">
         <carousel name="system_carousel">
             <pos>0 0</pos>
@@ -185,6 +183,10 @@
         <helpsystem name="help">
             <pos>0.9885 0.954</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">
@@ -214,6 +216,10 @@
         <textlist name="gamelist_textlist">
             <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>
@@ -229,6 +235,12 @@
             <delay>1.7</delay>
             <scrollFadeIn>true</scrollFadeIn>
         </video>
+        <helpsystem name="help">
+            <textColor>${gamelistHelpColor}</textColor>
+            <iconColor>${gamelistHelpColor}</iconColor>
+            <textColorDimmed>${gamelistHelpColorDimmed}</textColorDimmed>
+            <iconColorDimmed>${gamelistHelpColorDimmed}</iconColorDimmed>
+        </helpsystem>
     </view>
 
     <!-- Color customizations -->
diff --git a/themes/slate-DE/theme_engine_test_2.xml b/themes/slate-DE/theme_engine_test_2.xml
index 7d5336c17..bc2e3299c 100644
--- a/themes/slate-DE/theme_engine_test_2.xml
+++ b/themes/slate-DE/theme_engine_test_2.xml
@@ -1,16 +1,18 @@
 <theme>
     <!-- Test of system textlist and vertical gamelist carousel -->
 
-    <include>./colors_light.xml</include>
-
     <view name="system">
-        <textlist name="gamelist_textlist">
+        <textlist name="system_textlist">
             <pos>0.025 0.201</pos>
             <size>0.39 0.711</size>
-            <horizontalAlignment>left</horizontalAlignment>
-            <horizontalMargin>0.01</horizontalMargin>
+            <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">
@@ -27,12 +29,14 @@
             <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">
@@ -48,6 +52,7 @@
             <fontPath>./core/fonts/Exo2-RegularCondensed.otf</fontPath>
             <fontSize>0.035</fontSize>
             <horizontalAlignment>left</horizontalAlignment>
+            <backgroundColor>00000000</backgroundColor>
             <letterCase>uppercase</letterCase>
             <zIndex>50</zIndex>
         </text>
@@ -91,6 +96,12 @@
             <pos>0.45 0.874</pos>
             <horizontalAlignment>left</horizontalAlignment>
         </text>
+        <helpsystem name="help">
+            <textColor>${gamelistHelpColor}</textColor>
+            <iconColor>${gamelistHelpColor}</iconColor>
+            <textColorDimmed>${gamelistHelpColorDimmed}</textColorDimmed>
+            <iconColorDimmed>${gamelistHelpColorDimmed}</iconColorDimmed>
+        </helpsystem>
     </view>
 
     <view name="gamelist">
@@ -106,6 +117,8 @@
             <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>
@@ -120,31 +133,11 @@
             <interpolation>nearest</interpolation>
             <scrollFadeIn>true</scrollFadeIn>
         </image>
-    </view>
-
-    <!-- Color customizations -->
-    <view name="system">
-        <textlist name="gamelist_textlist">
-            <selectorColor>161616</selectorColor>
-            <selectedColor>AFAFAF</selectedColor>
-            <primaryColor>262626</primaryColor>
-            <secondaryColor>333333</secondaryColor>
-        </textlist>
-        <image name="backframe2">
-            <color>9F9F9F</color>
-        </image>
-        <image name="backframe3">
-            <color>9F9F9F</color>
-        </image>
-        <text name="game_counter">
-            <backgroundColor>00000000</backgroundColor>
-        </text>
-    </view>
-
-    <view name="gamelist">
-        <carousel name="gamelist_carousel">
-            <color>74747400</color>
-            <textColor>262626</textColor>
-        </carousel>
+        <helpsystem name="help">
+            <textColor>${gamelistHelpColor}</textColor>
+            <iconColor>${gamelistHelpColor}</iconColor>
+            <textColorDimmed>${gamelistHelpColorDimmed}</textColorDimmed>
+            <iconColorDimmed>${gamelistHelpColorDimmed}</iconColorDimmed>
+        </helpsystem>
     </view>
 </theme>
\ No newline at end of file
diff --git a/themes/slate-DE/theme_engine_test_3.xml b/themes/slate-DE/theme_engine_test_3.xml
index f55d479dd..d79195d8b 100644
--- a/themes/slate-DE/theme_engine_test_3.xml
+++ b/themes/slate-DE/theme_engine_test_3.xml
@@ -1,12 +1,14 @@
 <theme>
     <!-- Test of system textlist and horizontal gamelist carousel with reflections -->
 
-    <include>./colors_dark.xml</include>
-
     <view name="system">
-        <textlist name="gamelist_textlist">
+        <textlist name="system_textlist">
             <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>
@@ -27,12 +29,14 @@
             <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">
@@ -48,6 +52,7 @@
             <fontPath>./core/fonts/Exo2-RegularCondensed.otf</fontPath>
             <fontSize>0.035</fontSize>
             <horizontalAlignment>left</horizontalAlignment>
+            <backgroundColor>00000000</backgroundColor>
             <letterCase>uppercase</letterCase>
             <zIndex>50</zIndex>
         </text>
@@ -91,6 +96,12 @@
             <pos>0.45 0.874</pos>
             <horizontalAlignment>left</horizontalAlignment>
         </text>
+        <helpsystem name="help">
+            <textColor>${gamelistHelpColor}</textColor>
+            <iconColor>${gamelistHelpColor}</iconColor>
+            <textColorDimmed>${gamelistHelpColorDimmed}</textColorDimmed>
+            <iconColorDimmed>${gamelistHelpColorDimmed}</iconColorDimmed>
+        </helpsystem>
     </view>
 
     <view name="gamelist">
@@ -109,6 +120,8 @@
             <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>
@@ -121,6 +134,7 @@
             <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="game_name">
@@ -133,6 +147,7 @@
             <fontSize>0.045</fontSize>
             <horizontalAlignment>center</horizontalAlignment>
             <verticalAlignment>center</verticalAlignment>
+            <color>D6D6D6</color>
             <letterCase>none</letterCase>
             <zIndex>80</zIndex>
         </text>
@@ -146,12 +161,21 @@
             <pos>0.815 0.203</pos>
             <size>0.04 0.03</size>
         </rating>
+        <gamelistinfo name="gamelistInfo">
+            <color>888888</color>
+        </gamelistinfo>
         <badges name="md_badges">
             <pos>0.03 0.205</pos>
             <size>0.38 0.08</size>
             <lines>1</lines>
             <itemsPerLine>10</itemsPerLine>
         </badges>
+        <helpsystem name="help">
+            <textColor>${gamelistHelpColor}</textColor>
+            <iconColor>${gamelistHelpColor}</iconColor>
+            <textColorDimmed>${gamelistHelpColorDimmed}</textColorDimmed>
+            <iconColorDimmed>${gamelistHelpColorDimmed}</iconColorDimmed>
+        </helpsystem>
         <!-- Hide some unwanted elements -->
         <image name="backframe3">
             <visible>false</visible>
@@ -168,49 +192,4 @@
             <visible>false</visible>
         </rating>
     </view>
-
-    <!-- Color customizations -->
-    <view name="system">
-        <textlist name="gamelist_textlist">
-            <selectorColor>161616</selectorColor>
-            <selectedColor>AFAFAF</selectedColor>
-            <primaryColor>262626</primaryColor>
-            <secondaryColor>333333</secondaryColor>
-        </textlist>
-        <image name="backframe2">
-            <color>6F6F6F</color>
-        </image>
-        <image name="backframe3">
-            <color>6F6F6F</color>
-        </image>
-        <text name="game_counter">
-            <color>202020</color>
-            <backgroundColor>00000000</backgroundColor>
-        </text>
-        <text name="info1, info2, info3, info4, info5, info6, info7, info8, info9, info10">
-            <color>262626</color>
-        </text>
-    </view>
-
-    <view name="gamelist">
-        <carousel name="gamelist_carousel">
-            <color>74747400</color>
-            <textColor>949494</textColor>
-        </carousel>
-        <image name="backframe2">
-            <color>181818</color>
-        </image>
-        <text name="game_name">
-            <color>D6D6D6</color>
-        </text>
-        <gamelistinfo name="gamelistInfo">
-            <color>888888</color>
-        </gamelistinfo>
-        <helpsystem name="help">
-            <textColor>A6A6A6</textColor>
-            <iconColor>A6A6A6</iconColor>
-            <textColorDimmed>969696</textColorDimmed>
-            <iconColorDimmed>969696</iconColorDimmed>
-        </helpsystem>
-    </view>
 </theme>
\ No newline at end of file