diff --git a/themes/slate-DE/theme.xml b/themes/slate-DE/theme.xml
index 1f1413ca6..5b8affd8f 100644
--- a/themes/slate-DE/theme.xml
+++ b/themes/slate-DE/theme.xml
@@ -27,7 +27,7 @@
 
     <variant name="withVideos, withoutVideos, noGameMedia">
         <view name="system">
-            <carousel name="system_carousel">
+            <carousel name="systemCarousel">
                 <pos>0 0.383796</pos>
                 <size>1 0.232407</size>
                 <type>horizontal</type>
@@ -45,7 +45,7 @@
                 <letterCase>uppercase</letterCase>
                 <lineSpacing>1.2</lineSpacing>
             </carousel>
-            <text name="game_counter">
+            <text name="gameCounter">
                 <pos>0.5 0.6437</pos>
                 <size>1 0.056</size>
                 <origin>0.5 0.5</origin>
@@ -68,7 +68,7 @@
             </helpsystem>
         </view>
         <view name="gamelist">
-            <textlist name="gamelist_textlist">
+            <textlist name="gamelistTextlist">
                 <pos>0.025 0.201</pos>
                 <size>0.39 0.711</size>
                 <selectorColor>${gamelistTextlistSelectorColor}</selectorColor>
@@ -208,22 +208,22 @@
             <color>${gamelistBackFrameColor}</color>
             <zIndex>10</zIndex>
         </image>
-        <text name="md_lbl_releasedate, md_lbl_developer, md_lbl_publisher,
-                    md_lbl_genre, md_lbl_players, md_lbl_lastplayed">
+        <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="md_developer, md_publisher, md_genre, md_players">
+        <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="md_description">
+        <text name="description">
             <pos>0.454 0.675</pos>
             <size>0.346 0.242</size>
             <container>true</container>
@@ -238,68 +238,68 @@
             <letterCase>uppercase</letterCase>
             <lineSpacing>1.2</lineSpacing>
         </text>
-        <datetime name="md_releasedate, md_lastplayed">
+        <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="md_lbl_releasedate">
+        <text name="labelReleasedate">
             <pos>0.815 0.2755</pos>
             <text>Released:</text>
             <metadataElement>true</metadataElement>
         </text>
-        <datetime name="md_releasedate">
+        <datetime name="releasedate">
             <pos>0.83 0.3005</pos>
             <metadata>releasedate</metadata>
         </datetime>
-        <text name="md_lbl_developer">
+        <text name="labelDeveloper">
             <pos>0.815 0.3355</pos>
             <text>Developer:</text>
             <metadataElement>true</metadataElement>
         </text>
-        <text name="md_developer">
+        <text name="developer">
             <pos>0.83 0.3605</pos>
             <metadata>developer</metadata>
         </text>
-        <text name="md_lbl_publisher">
+        <text name="labelPublisher">
             <pos>0.815 0.3955</pos>
             <text>Publisher:</text>
             <metadataElement>true</metadataElement>
         </text>
-        <text name="md_publisher">
+        <text name="publisher">
             <pos>0.83 0.4205</pos>
             <metadata>publisher</metadata>
         </text>
-        <text name="md_lbl_genre">
+        <text name="labelGenre">
             <pos>0.815 0.4555</pos>
             <text>Genre:</text>
             <metadataElement>true</metadataElement>
         </text>
-        <text name="md_genre">
+        <text name="genre">
             <pos>0.83 0.4805</pos>
             <metadata>genre</metadata>
         </text>
-        <text name="md_lbl_players">
+        <text name="labelPlayers">
             <pos>0.815 0.5155</pos>
             <text>Players:</text>
             <metadataElement>true</metadataElement>
         </text>
-        <text name="md_players">
+        <text name="players">
             <pos>0.83 0.5405</pos>
             <metadata>players</metadata>
         </text>
-        <text name="md_lbl_lastplayed">
+        <text name="labelLastplayed">
             <pos>0.815 0.5755</pos>
             <text>Last played:</text>
             <metadataElement>true</metadataElement>
         </text>
-        <datetime name="md_lastplayed">
+        <datetime name="lastplayed">
             <pos>0.83 0.6005</pos>
             <metadata>lastplayed</metadata>
         </datetime>
-        <rating name="md_rating">
+        <rating name="rating">
             <pos>0.453 0.203</pos>
             <size>0 0.03</size>
             <interpolation>nearest</interpolation>
@@ -316,7 +316,7 @@
             <horizontalAlignment>right</horizontalAlignment>
             <color>${gamelistInfoColor}</color>
         </gamelistinfo>
-        <badges name="md_badges">
+        <badges name="badges">
             <pos>0.815 0.675</pos>
             <size>0.13 0.235</size>
             <horizontalAlignment>left</horizontalAlignment>
@@ -334,7 +334,7 @@
 
     <variant name="withVideos">
         <view name="gamelist">
-            <video name="md_video">
+            <video name="gameVideo">
                 <pos>0.63 0.45</pos>
                 <maxSize>0.356 0.424</maxSize>
                 <origin>0.5 0.5</origin>
@@ -350,7 +350,7 @@
 
     <variant name="withoutVideos">
         <view name="gamelist">
-            <image name="md_image">
+            <image name="gameImage">
                 <pos>0.63 0.45</pos>
                 <maxSize>0.360 0.424</maxSize>
                 <origin>0.5 0.5</origin>
@@ -409,7 +409,7 @@
 
     <variant name="noGameMedia">
         <view name="gamelist">
-            <textlist name="gamelist_textlist">
+            <textlist name="gamelistTextlist">
                 <pos>0.04 0.201</pos>
                 <size>0.92 0.71</size>
                 <horizontalAlignment>center</horizontalAlignment>
@@ -427,21 +427,20 @@
             <image name="backframe3">
                 <visible>false</visible>
             </image>
-            <badges name="md_badges">
+            <badges name="badges">
                 <visible>false</visible>
             </badges>
-            <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">
+            <text name="labelReleasedate, labelDeveloper, labelPublisher, labelGenre, labelPlayers,
+                        labelLastplayed, developer, publisher, genre, players, description">
                 <visible>false</visible>
             </text>
-            <datetime name="md_releasedate, md_lastplayed">
+            <datetime name="releasedate, lastplayed">
                 <visible>false</visible>
             </datetime>
             <gamelistinfo name="gamelistInfo">
                 <visible>false</visible>
             </gamelistinfo>
-            <rating name="md_rating">
+            <rating name="rating">
                 <visible>false</visible>
             </rating>
         </view>
diff --git a/themes/slate-DE/theme_engine_test_1.xml b/themes/slate-DE/theme_engine_test_1.xml
index 954be5dd2..9e3a7d82d 100644
--- a/themes/slate-DE/theme_engine_test_1.xml
+++ b/themes/slate-DE/theme_engine_test_1.xml
@@ -2,7 +2,7 @@
     <!-- Test of vertical system carousel wheel, system videos, gameselector elements etc. -->
 
     <view name="system">
-        <carousel name="system_carousel">
+        <carousel name="systemCarousel">
             <pos>0 0</pos>
             <size>0.28 1</size>
             <type>vertical_wheel</type>
@@ -26,38 +26,38 @@
             <letterCase>uppercase</letterCase>
             <lineSpacing>1.2</lineSpacing>
         </carousel>
-        <gameselector name="selector_recent">
+        <gameselector name="selectorRecent">
             <selection>lastplayed</selection>
             <gameCount>1</gameCount>
         </gameselector>
-        <gameselector name="selector_random">
+        <gameselector name="selectorRandom">
             <selection>random</selection>
             <gameCount>1</gameCount>
         </gameselector>
-        <image name="random_background_image">
+        <image name="randomBackgroundImage">
             <pos>0 0</pos>
             <size>1 1</size>
             <imageType>fanart, titlescreen</imageType>
-            <gameselector>selector_random</gameselector>
+            <gameselector>selectorRandom</gameselector>
             <interpolation>nearest</interpolation>
             <opacity>0.8</opacity>
             <saturation>0.8</saturation>
             <zIndex>3</zIndex>
         </image>
-        <image name="recent_game_image">
+        <image name="recentGameImage">
             <pos>0.975 0.08</pos>
             <origin>1 0</origin>
             <size>0.2 0</size>
             <imageType>cover</imageType>
-            <gameselector>selector_recent</gameselector>
+            <gameselector>selectorRecent</gameselector>
             <interpolation>nearest</interpolation>
             <zIndex>3</zIndex>
         </image>
-        <video name="random_game_video">
+        <video name="randomGameVideo">
             <pos>0.30 0.23</pos>
             <maxSize>0.3 0.424</maxSize>
             <imageType>marquee, titlescreen</imageType>
-            <gameselector>selector_random</gameselector>
+            <gameselector>selectorRandom</gameselector>
             <audio>true</audio>
             <interpolation>linear</interpolation>
             <pillarboxes>false</pillarboxes>
@@ -65,7 +65,7 @@
             <delay>1.7</delay>
             <fadeInTime>1.2</fadeInTime>
         </video>
-        <text name="game_counter">
+        <text name="gameCounter">
             <pos>0.30 0.082</pos>
             <size>0.35 0.1</size>
             <systemdata>gamecount</systemdata>
@@ -77,7 +77,7 @@
             <letterCase>uppercase</letterCase>
             <zIndex>50</zIndex>
         </text>
-        <text name="game_counter2">
+        <text name="gameCounter2">
             <pos>0.42 0.5437</pos>
             <size>0.25 0.056</size>
             <origin>0.5 0.5</origin>
@@ -91,7 +91,7 @@
             <visible>false</visible>
             <zIndex>50</zIndex>
         </text>
-        <text name="system_name">
+        <text name="systemName">
             <pos>0.30 0.01</pos>
             <size>0.46 0.1</size>
             <systemdata>fullname</systemdata>
@@ -103,11 +103,11 @@
             <letterCase>uppercase</letterCase>
             <zIndex>50</zIndex>
         </text>
-        <text name="game_name">
+        <text name="gameName">
             <pos>0.775 0.59</pos>
             <size>0.2 0.05</size>
             <metadata>name</metadata>
-            <gameselector>selector_recent</gameselector>
+            <gameselector>selectorRecent</gameselector>
             <fontPath>./core/fonts/Exo2-RegularCondensed.otf</fontPath>
             <fontSize>0.045</fontSize>
             <horizontalAlignment>right</horizontalAlignment>
@@ -116,11 +116,11 @@
             <letterCase>none</letterCase>
             <zIndex>50</zIndex>
         </text>
-        <datetime name="game_lastplayed_date">
+        <datetime name="gameLastplayed">
             <pos>0.775 0.64</pos>
             <size>0.2 0.05</size>
             <metadata>lastplayed</metadata>
-            <gameselector>selector_recent</gameselector>
+            <gameselector>selectorRecent</gameselector>
             <fontPath>./core/fonts/Exo2-RegularCondensed.otf</fontPath>
             <fontSize>0.045</fontSize>
             <horizontalAlignment>right</horizontalAlignment>
@@ -130,7 +130,7 @@
             <displayRelative>true</displayRelative>
             <zIndex>50</zIndex>
         </datetime>
-        <text name="recently_played_text">
+        <text name="recentlyPlayed">
             <pos>0.775 0.03</pos>
             <size>0.2 0</size>
             <text>Last played</text>
@@ -185,18 +185,18 @@
             <pos>0.58 0.904</pos>
             <horizontalAlignment>right</horizontalAlignment>
         </text>
-        <rating name="random_game_rating">
+        <rating name="randomGameRating">
             <pos>0.30 0.167</pos>
             <size>0.06 0.04</size>
-            <gameselector>selector_random</gameselector>
+            <gameselector>selectorRandom</gameselector>
             <color>FFEE00</color>
             <opacity>0.9</opacity>
         </rating>
-        <rating name="recent_game_rating">
+        <rating name="recentGameRating">
             <pos>0.975 0.042</pos>
             <origin>1 0</origin>
             <size>0.03 0.03</size>
-            <gameselector>selector_recent</gameselector>
+            <gameselector>selectorRecent</gameselector>
             <color>FFEE00</color>
         </rating>
         <helpsystem name="help">
@@ -232,7 +232,7 @@
     </view>
 
     <view name="gamelist">
-        <carousel name="gamelist_carousel">
+        <carousel name="gamelistCarousel">
             <pos>0.5 0.645</pos>
             <size>0.96 0.28</size>
             <origin>0.5 0</origin>
@@ -279,10 +279,10 @@
             <interpolation>nearest</interpolation>
             <scrollFadeIn>true</scrollFadeIn>
         </image>
-        <badges name="md_badges">
+        <badges name="badges">
             <pos>0.65 0.29</pos>
         </badges>
-        <rating name="md_rating">
+        <rating name="rating">
             <pos>0.65 0.25</pos>
         </rating>
         <helpsystem name="help">
@@ -296,10 +296,10 @@
         <image name="backframe3">
             <visible>false</visible>
         </image>
-        <text name="md_lbl_lastplayed, md_description">
+        <text name="labelLastplayed, description">
             <visible>false</visible>
         </text>
-        <datetime name="md_lastplayed">
+        <datetime name="lastplayed">
             <visible>false</visible>
         </datetime>
     </view>
@@ -312,16 +312,16 @@
             </helpsystem>
         </view>
         <view name="system">
-            <carousel name="system_carousel">
+            <carousel name="systemCarousel">
                 <itemRotationOrigin>-4.05 0.5</itemRotationOrigin>
                 <horizontalOffset>-0.03</horizontalOffset>
             </carousel>
-            <text name="recently_played_text">
+            <text name="recentlyPlayed">
                 <pos>0.775 0.038</pos>
                 <size>0.2 0</size>
                 <fontSize>0.031</fontSize>
             </text>
-            <rating name="recent_game_rating">
+            <rating name="recentGameRating">
                 <pos>0.975 0.050</pos>
                 <size>0.022 0.022</size>
             </rating>
diff --git a/themes/slate-DE/theme_engine_test_2.xml b/themes/slate-DE/theme_engine_test_2.xml
index a56f43ac7..666562694 100644
--- a/themes/slate-DE/theme_engine_test_2.xml
+++ b/themes/slate-DE/theme_engine_test_2.xml
@@ -2,7 +2,7 @@
     <!-- Test of system textlist and vertical gamelist carousel -->
 
     <view name="system">
-        <textlist name="system_textlist">
+        <textlist name="systemTextlist">
             <pos>0.025 0.201</pos>
             <size>0.39 0.711</size>
             <selectorColor>${gamelistTextlistSelectorColor}</selectorColor>
@@ -44,7 +44,7 @@
             <maxSize>0.32 0.13</maxSize>
             <origin>0 1</origin>
         </image>
-        <text name="game_counter">
+        <text name="gameCounter">
             <pos>0.45 0.225</pos>
             <size>0.4 0.056</size>
             <origin>0 0.5</origin>
@@ -106,7 +106,7 @@
     </view>
 
     <view name="gamelist">
-        <carousel name="gamelist_carousel">
+        <carousel name="gamelistCarousel">
             <pos>0.025 0.201</pos>
             <size>0.39 0.711</size>
             <type>vertical</type>
@@ -126,7 +126,7 @@
             <lineSpacing>1.2</lineSpacing>
             <zIndex>80</zIndex>
         </carousel>
-        <image name="md_image">
+        <image name="gameImage">
             <pos>0.63 0.45</pos>
             <maxSize>0.360 0.424</maxSize>
             <origin>0.5 0.5</origin>
@@ -150,7 +150,7 @@
             </helpsystem>
         </view>
         <view name="gamelist">
-            <carousel name="gamelist_carousel">
+            <carousel name="gamelistCarousel">
                 <itemSize>0.25 0.105</itemSize>
             </carousel>
         </view>
diff --git a/themes/slate-DE/theme_engine_test_3.xml b/themes/slate-DE/theme_engine_test_3.xml
index fc7722457..c497e9ed7 100644
--- a/themes/slate-DE/theme_engine_test_3.xml
+++ b/themes/slate-DE/theme_engine_test_3.xml
@@ -2,7 +2,7 @@
     <!-- Test of system textlist and horizontal gamelist carousel with reflections -->
 
     <view name="system">
-        <textlist name="system_textlist">
+        <textlist name="systemTextlist">
             <pos>0.025 0.201</pos>
             <size>0.39 0.711</size>
             <selectorColor>${gamelistTextlistSelectorColor}</selectorColor>
@@ -44,7 +44,7 @@
             <maxSize>0.32 0.13</maxSize>
             <origin>0 1</origin>
         </image>
-        <text name="game_counter">
+        <text name="gameCounter">
             <pos>0.45 0.225</pos>
             <size>0.4 0.056</size>
             <origin>0 0.5</origin>
@@ -106,7 +106,7 @@
     </view>
 
     <view name="gamelist">
-        <carousel name="gamelist_carousel">
+        <carousel name="gamelistCarousel">
             <pos>0.025 0.231</pos>
             <size>0.95 0.692</size>
             <type>horizontal</type>
@@ -138,12 +138,11 @@
             <color>181818</color>
             <zIndex>10</zIndex>
         </image>
-        <text name="game_name">
+        <text name="gameName">
             <pos>0.5 0.77</pos>
             <size>0.95 0.08</size>
             <origin>0.5 0</origin>
             <metadata>name</metadata>
-            <gameselector>selector_recent</gameselector>
             <fontPath>./core/fonts/Exo2-RegularCondensed.otf</fontPath>
             <fontSize>0.045</fontSize>
             <horizontalAlignment>center</horizontalAlignment>
@@ -152,20 +151,20 @@
             <letterCase>none</letterCase>
             <zIndex>80</zIndex>
         </text>
-        <text name="md_description">
+        <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="md_rating">
+        <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="md_badges">
+        <badges name="badges">
             <pos>0.03 0.205</pos>
             <size>0.38 0.08</size>
             <lines>1</lines>
@@ -182,15 +181,14 @@
         <image name="backframe3">
             <visible>false</visible>
         </image>
-        <text name="md_lbl_publisher, md_lbl_releasedate, md_lbl_developer, md_lbl_genre,
-            md_lbl_players, md_lbl_lastplayed, md_developer, md_publisher, md_genre,
-            md_players, md_description">
+        <text name="labelPublisher, labelReleasedate, labelDeveloper, labelGenre, labelPlayers,
+                    labelLastplayed, developer, publisher, genre, players, description">
             <visible>false</visible>
         </text>
-        <datetime name="md_releasedate md_lastplayed">
+        <datetime name="releasedate lastplayed">
             <visible>false</visible>
         </datetime>
-        <rating name="md_rating">
+        <rating name="rating">
             <visible>false</visible>
         </rating>
     </view>
@@ -202,7 +200,7 @@
             </helpsystem>
         </view>
         <view name="gamelist">
-            <carousel name="gamelist_carousel">
+            <carousel name="gamelistCarousel">
                 <itemSize>0.12 0.225</itemSize>
             </carousel>
         </view>
diff --git a/themes/slate-DE/theme_engine_test_4.xml b/themes/slate-DE/theme_engine_test_4.xml
index 601ffc2f0..e30912944 100644
--- a/themes/slate-DE/theme_engine_test_4.xml
+++ b/themes/slate-DE/theme_engine_test_4.xml
@@ -2,7 +2,7 @@
     <!-- Test of grid element for both the system view and gamelist view -->
 
     <view name="system">
-        <grid name="system_grid">
+        <grid name="systemGrid">
             <pos>0.5 0.2</pos>
             <size>0.86 0.715</size>
             <origin>0.5 0</origin>
@@ -54,7 +54,7 @@
             <maxSize>0.32 0.13</maxSize>
             <origin>0 1</origin>
         </image>
-        <text name="game_counter">
+        <text name="gameCounter">
             <pos>0.8 0.145</pos>
             <size>0.117 0.056</size>
             <origin>0 0.5</origin>
@@ -81,7 +81,7 @@
     </view>
 
     <view name="gamelist">
-        <grid name="gamelist_grid">
+        <grid name="gamelistGrid">
             <pos>0.5 0.3</pos>
             <size>0.86 0.623</size>
             <origin>0.5 0</origin>
@@ -117,12 +117,11 @@
             <color>181818</color>
             <zIndex>10</zIndex>
         </image>
-        <text name="game_name">
+        <text name="gameName">
             <pos>0.92 0.225</pos>
             <size>0.55 0.08</size>
             <origin>1 0</origin>
             <metadata>name</metadata>
-            <gameselector>selector_recent</gameselector>
             <fontPath>./core/fonts/Exo2-RegularCondensed.otf</fontPath>
             <fontSize>0.045</fontSize>
             <horizontalAlignment>right</horizontalAlignment>
@@ -131,20 +130,20 @@
             <letterCase>none</letterCase>
             <zIndex>80</zIndex>
         </text>
-        <text name="md_description">
+        <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="md_rating">
+        <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="md_badges">
+        <badges name="badges">
             <pos>0.03 0.205</pos>
             <size>0.38 0.08</size>
             <lines>1</lines>
@@ -161,28 +160,26 @@
         <image name="backframe3">
             <visible>false</visible>
         </image>
-        <text name="md_lbl_publisher, md_lbl_releasedate, md_lbl_developer, md_lbl_genre,
-            md_lbl_players, md_lbl_lastplayed, md_developer, md_publisher, md_genre,
-            md_players, md_description">
+        <text name="labelPublisher, labelReleasedate, labelDeveloper, labelGenre, labelPlayers,
+                    labelLastplayed, developer, publisher, genre, players, description">
             <visible>false</visible>
         </text>
-        <datetime name="md_releasedate md_lastplayed">
+        <datetime name="releasedate lastplayed">
             <visible>false</visible>
         </datetime>
-        <rating name="md_rating">
+        <rating name="rating">
             <visible>false</visible>
         </rating>
     </view>
 
     <aspectRatio name="4:3">
         <view name="system, gamelist">
-            <grid name="gamelist_grid">
+            <grid name="gamelistGrid">
                 <itemSize>0.192 -1</itemSize>
             </grid>
             <helpsystem name="help">
                 <fontSize>0.034</fontSize>
             </helpsystem>
         </view>
-        <view name="gamelist"></view>
     </aspectRatio>
 </theme>
\ No newline at end of file