diff --git a/README.md b/README.md
index 587f197..c8c9032 100644
--- a/README.md
+++ b/README.md
@@ -1,10 +1,16 @@
-# BatoCRT, an EmulationStation theme for Recalbox/Batocera
-A simple EmulationStation theme for Recalbox/Batocera. Bbased on the CRT theme by Anthony that was originally based on the Carbon theme by Eric Hettervik; then tweaked to work with Recalbox/Batocera.
+# BatoCRT, an EmulationStation theme for Recalbox/Batocera/RetroPie
+A simple EmulationStation theme for Recalbox/Batocera/RetroPie. Based on the CRT theme by Anthony that was originally based on the Carbon theme by Eric Hettervik; then tweaked to work with Recalbox/Batocera.
 
 ---
 
 ### Updates
 
+*20/08/2017*
+- Moved things around in `_inc/templates` to allow this theme to support both Recalbox/Batocera and RetroPie.
+ - Templates are split in to `_inc/templates/recalbox` and `_inc/templates/retropie`. See the [customizing layout section](#customizing-layout) below.
+- Added a 16x9-no_desc.xml template for RetroPie.
+- Adjusted `retropie/theme.xml` to disable aditional md_lbl elements that would appear in 16x9-no_desc.xml template.
+
 *07/08/2017*
 - Initial fork and edit of CRT Theme.
 - Removed unsupport ES theme items such as video/z-index/etc as they do not work in Recalbox/Batocera.
@@ -34,7 +40,7 @@ TBC
 ### Installation
 Copy the theme directory to `\\RECALBOX\share\system\.emulationstation\themes\` and then select the theme in the UI settings menu.
 
-### Customizing layout
+### Customizing Layout
 In `theme.xml` you can uncomment the layout template you wish to use. The default layout is 16x9 with no bezel.
 
 ~~~
@@ -43,13 +49,20 @@ In `theme.xml` you can uncomment the layout template you wish to use. The defaul
    <!--
    Uncomment the template vesion below that you want to use...
    -->
+   <!-- This Section for Recalbox/Batocera templates... -->
+   <!-- <include>./_inc/templates/recalbox/4x3.xml</include> -->
+   <!-- <include>./_inc/templates/recalbox/16x9-no_desc.xml</include> -->
+   <!-- <include>./_inc/templates/recalbox/16x10.xml</include> -->
+   <!-- <include>./_inc/templates/recalbox/4x3-bezel.xml</include> -->
+   <!-- <include>./_inc/templates/recalbox/16x9-bezel.xml</include> -->
+   <!-- <include>./_inc/templates/recalbox/16x10-bezel.xml</include> -->
+
 
-   <!-- <include>./_inc/templates/4x3.xml</include> -->
-   <include>./_inc/templates/16x9.xml</include>
-   <!-- <include>./_inc/templates/16x10.xml</include> -->
-   <!-- <include>./_inc/templates/4x3-bezel.xml</include> -->
-   <!-- <include>./_inc/templates/16x9-bezel.xml</include> -->
-   <!-- <include>./_inc/templates/16x10-bezel.xml</include> -->
+   <!-- This Section for RetroPie templates... -->
+   <!-- <include>./_inc/templates/retropie/4x3.xml</include> -->
+   <!-- <include>./_inc/templates/retropie/16x9.xml</include> -->
+   <include>./_inc/templates/retropie/16x9-no_desc.xml</include>
+   <!-- <include>./_inc/templates/retropie/16x10.xml</include> -->
 </theme>
 ~~~
 
diff --git a/_inc/templates/16x10-bezel.xml b/_inc/templates/recalbox/16x10-bezel.xml
similarity index 86%
rename from _inc/templates/16x10-bezel.xml
rename to _inc/templates/recalbox/16x10-bezel.xml
index a687101..3c037c9 100644
--- a/_inc/templates/16x10-bezel.xml
+++ b/_inc/templates/recalbox/16x10-bezel.xml
@@ -11,7 +11,7 @@
          <pos>0 0</pos>
          <size>1 1</size>
          <tile>true</tile>
-         <path>./../images/background.png</path>
+         <path>./../../images/background.png</path>
       </image>
    </view>
 
@@ -29,10 +29,10 @@
          <selectedColor>bba358</selectedColor>
          <primaryColor>eaeaea</primaryColor>
          <secondaryColor>eaeaea</secondaryColor>
-         <fontPath>./../fonts/Cabin-Bold-TTF.ttf</fontPath>
+         <fontPath>./../../fonts/Cabin-Bold-TTF.ttf</fontPath>
          <fontSize>0.03375</fontSize>
          <forceUppercase>1</forceUppercase>
-         <scrollSound>./../sounds/select.wav</scrollSound>
+         <scrollSound>./../../sounds/select.wav</scrollSound>
          <alignment>center</alignment>
       </textlist>
    </view>
@@ -46,28 +46,28 @@
       </datetime>
       <text name="md_description,md_lastplayed,md_lbl_lastplayed,md_lbl_players,md_players,md_releasedate,md_genre">
          <color>555555</color>
-         <fontPath>./../fonts/Cabin-Bold-TTF.ttf</fontPath>
+         <fontPath>./../../fonts/Cabin-Bold-TTF.ttf</fontPath>
          <fontSize>0.02</fontSize>
       </text>
 
       <rating name="md_rating">
          <pos>0.2015625 0.58</pos>
          <size>0.2515625 0.025</size>
-         <filledPath>./../images/star_filled.svg</filledPath>
-         <unfilledPath>./../images/star_empty.svg</unfilledPath>
+         <filledPath>./../../images/star_filled.svg</filledPath>
+         <unfilledPath>./../../images/star_empty.svg</unfilledPath>
       </rating>
       <image name="md_hidden">
          <origin>0 0</origin>
          <pos>0.390625 0.58</pos>
          <maxSize>0.02109375 0.025</maxSize>
-         <path>./../images/hidden.svg</path>
+         <path>./../../images/hidden.svg</path>
          <color>bba35880</color>
       </image>
       <image name="md_kidgame">
          <origin>0 0</origin>
          <pos>0.4171875 0.58</pos>
          <maxSize>0.0125 0.025</maxSize>
-         <path>./../images/kid.svg</path>
+         <path>./../../images/kid.svg</path>
          <color>bba35880</color>
       </image>
       <text name="md_lbl_favorite">
@@ -84,7 +84,7 @@
          <origin>0 0</origin>
          <pos>0.2015625 0.63</pos>
          <maxSize>0.00703125 0.025</maxSize>
-         <path>./../images/metadata.svg</path>
+         <path>./../../images/metadata.svg</path>
       </image>
       <text name="md_lbl_lastplayed">
          <pos>0.21015625 0.63</pos>
@@ -99,7 +99,7 @@
          <origin>0 0</origin>
          <pos>0.2015625 0.6675</pos>
          <maxSize>0.00703125 0.025</maxSize>
-         <path>./../images/metadata.svg</path>
+         <path>./../../images/metadata.svg</path>
       </image>
       <text name="md_lbl_players">
          <pos>0.21015625 0.6675</pos>
@@ -114,7 +114,7 @@
          <origin>0 0</origin>
          <pos>0.2859375 0.6675</pos>
          <maxSize>0.00703125 0.025</maxSize>
-         <path>./../images/metadata.svg</path>
+         <path>./../../images/metadata.svg</path>
       </image>
       <datetime name="md_releasedate">
          <pos>0.29453125 0.6675</pos>
@@ -125,7 +125,7 @@
          <origin>0 0</origin>
          <pos>0.3703125 0.6675</pos>
          <maxSize>0.00703125 0.025</maxSize>
-         <path>./../images/metadata.svg</path>
+         <path>./../../images/metadata.svg</path>
       </image>
       <text name="md_genre">
          <pos>0.37890625 0.6675</pos>
@@ -152,7 +152,7 @@
          <origin>0.5 0.5</origin>
          <pos>0.32734375 0.38</pos>
          <maxSize>0.2671875 0.3275</maxSize>
-         <path>./../images/crt-bezel.svg</path>
+         <path>./../../images/crt-bezel.svg</path>
       </image>
       <image name="md_image">
          <origin>0.5 0.5</origin>
@@ -163,7 +163,7 @@
          <origin>0.5 0.5</origin>
          <pos>0.32734375 0.38</pos>
          <maxSize>0.25 0.3</maxSize>
-         <path>./../images/crt-screen.svg</path>
+         <path>./../../images/crt-screen.svg</path>
       </image>
    </view>
 
diff --git a/_inc/templates/16x10.xml b/_inc/templates/recalbox/16x10.xml
similarity index 86%
rename from _inc/templates/16x10.xml
rename to _inc/templates/recalbox/16x10.xml
index 7bcb1a0..a46488b 100755
--- a/_inc/templates/16x10.xml
+++ b/_inc/templates/recalbox/16x10.xml
@@ -11,7 +11,7 @@
          <pos>0 0</pos>
          <size>1 1</size>
          <tile>true</tile>
-         <path>./../images/background.png</path>
+         <path>./../../images/background.png</path>
       </image>
    </view>
 
@@ -29,10 +29,10 @@
          <selectedColor>bba358</selectedColor>
          <primaryColor>eaeaea</primaryColor>
          <secondaryColor>eaeaea</secondaryColor>
-         <fontPath>./../fonts/Cabin-Bold-TTF.ttf</fontPath>
+         <fontPath>./../../fonts/Cabin-Bold-TTF.ttf</fontPath>
          <fontSize>0.03375</fontSize>
          <forceUppercase>1</forceUppercase>
-         <scrollSound>./../sounds/select.wav</scrollSound>
+         <scrollSound>./../../sounds/select.wav</scrollSound>
          <alignment>center</alignment>
       </textlist>
    </view>
@@ -46,28 +46,28 @@
       </datetime>
       <text name="md_description,md_lastplayed,md_lbl_lastplayed,md_lbl_players,md_players,md_releasedate,md_genre">
          <color>555555</color>
-         <fontPath>./../fonts/Cabin-Bold-TTF.ttf</fontPath>
+         <fontPath>./../../fonts/Cabin-Bold-TTF.ttf</fontPath>
          <fontSize>0.02</fontSize>
       </text>
 
       <rating name="md_rating">
          <pos>0.2015625 0.58</pos>
          <size>0.2515625 0.025</size>
-         <filledPath>./../images/star_filled.svg</filledPath>
-         <unfilledPath>./../images/star_empty.svg</unfilledPath>
+         <filledPath>./../../images/star_filled.svg</filledPath>
+         <unfilledPath>./../../images/star_empty.svg</unfilledPath>
       </rating>
       <image name="md_hidden">
          <origin>0 0</origin>
          <pos>0.390625 0.58</pos>
          <maxSize>0.02109375 0.025</maxSize>
-         <path>./../images/hidden.svg</path>
+         <path>./../../images/hidden.svg</path>
          <color>bba35880</color>
       </image>
       <image name="md_kidgame">
          <origin>0 0</origin>
          <pos>0.4171875 0.58</pos>
          <maxSize>0.0125 0.025</maxSize>
-         <path>./../images/kid.svg</path>
+         <path>./../../images/kid.svg</path>
          <color>bba35880</color>
       </image>
       <text name="md_lbl_favorite">
@@ -84,7 +84,7 @@
          <origin>0 0</origin>
          <pos>0.2015625 0.63</pos>
          <maxSize>0.00703125 0.025</maxSize>
-         <path>./../images/metadata.svg</path>
+         <path>./../../images/metadata.svg</path>
       </image>
       <text name="md_lbl_lastplayed">
          <pos>0.21015625 0.63</pos>
@@ -99,7 +99,7 @@
          <origin>0 0</origin>
          <pos>0.2015625 0.6675</pos>
          <maxSize>0.00703125 0.025</maxSize>
-         <path>./../images/metadata.svg</path>
+         <path>./../../images/metadata.svg</path>
       </image>
       <text name="md_lbl_players">
          <pos>0.21015625 0.6675</pos>
@@ -114,7 +114,7 @@
          <origin>0 0</origin>
          <pos>0.2859375 0.6675</pos>
          <maxSize>0.00703125 0.025</maxSize>
-         <path>./../images/metadata.svg</path>
+         <path>./../../images/metadata.svg</path>
       </image>
       <datetime name="md_releasedate">
          <pos>0.29453125 0.6675</pos>
@@ -125,7 +125,7 @@
          <origin>0 0</origin>
          <pos>0.3703125 0.6675</pos>
          <maxSize>0.00703125 0.025</maxSize>
-         <path>./../images/metadata.svg</path>
+         <path>./../../images/metadata.svg</path>
       </image>
       <text name="md_genre">
          <pos>0.37890625 0.6675</pos>
diff --git a/_inc/templates/16x9-bezel.xml b/_inc/templates/recalbox/16x9-bezel.xml
similarity index 87%
rename from _inc/templates/16x9-bezel.xml
rename to _inc/templates/recalbox/16x9-bezel.xml
index c0329aa..d8032db 100644
--- a/_inc/templates/16x9-bezel.xml
+++ b/_inc/templates/recalbox/16x9-bezel.xml
@@ -11,7 +11,7 @@
          <pos>0 0</pos>
          <size>1 1</size>
          <tile>true</tile>
-         <path>./../images/background.png</path>
+         <path>./../../images/background.png</path>
       </image>
    </view>
 
@@ -28,10 +28,10 @@
          <selectedColor>bba358</selectedColor>
          <primaryColor>eaeaea</primaryColor>
          <secondaryColor>eaeaea</secondaryColor>
-         <fontPath>./../fonts/Cabin-Bold-TTF.ttf</fontPath>
+         <fontPath>./../../fonts/Cabin-Bold-TTF.ttf</fontPath>
          <fontSize>0.0375</fontSize>
          <forceUppercase>1</forceUppercase>
-         <scrollSound>./../sounds/select.wav</scrollSound>
+         <scrollSound>./../../sounds/select.wav</scrollSound>
          <alignment>center</alignment>
       </textlist>
    </view>
@@ -45,27 +45,27 @@
       </datetime>
       <text name="md_description,md_lastplayed,md_lbl_lastplayed,md_lbl_players,md_players,md_releasedate,md_genre">
          <color>555555</color>
-         <fontPath>./../fonts/Cabin-Bold-TTF.ttf</fontPath>
+         <fontPath>./../../fonts/Cabin-Bold-TTF.ttf</fontPath>
          <fontSize>0.0222222222222222</fontSize>
       </text>
       <rating name="md_rating">
          <pos>0.2015625 0.5888888888888889</pos>
          <size>0.2515625 0.0277777777777778</size>
-         <filledPath>./../images/star_filled.svg</filledPath>
-         <unfilledPath>./../images/star_empty.svg</unfilledPath>
+         <filledPath>./../../images/star_filled.svg</filledPath>
+         <unfilledPath>./../../images/star_empty.svg</unfilledPath>
       </rating>
       <image name="md_hidden">
          <origin>0 0</origin>
          <pos>0.390625 0.5888888888888889</pos>
          <maxSize>0.02109375 0.0277777777777778</maxSize>
-         <path>./../images/hidden.svg</path>
+         <path>./../../images/hidden.svg</path>
          <color>bba35880</color>
       </image>
       <image name="md_kidgame">
          <origin>0 0</origin>
          <pos>0.4171875 0.5888888888888889</pos>
          <maxSize>0.0125 0.0277777777777778</maxSize>
-         <path>./../images/kid.svg</path>
+         <path>./../../images/kid.svg</path>
          <color>bba35880</color>
       </image>
       <text name="md_lbl_favorite">
@@ -83,7 +83,7 @@
          <origin>0 0</origin>
          <pos>0.2015625 0.6444444444444444</pos>
          <maxSize>0.00703125 0.0277777777777778</maxSize>
-         <path>./../images/metadata.svg</path>
+         <path>./../../images/metadata.svg</path>
       </image>
       <text name="md_lbl_lastplayed">
          <pos>0.21015625 0.6444444444444444</pos>
@@ -98,7 +98,7 @@
          <origin>0 0</origin>
          <pos>0.2015625 0.6861111111111111</pos>
          <maxSize>0.00703125 0.0277777777777778</maxSize>
-         <path>./../images/metadata.svg</path>
+         <path>./../../images/metadata.svg</path>
       </image>
       <text name="md_lbl_players">
          <pos>0.21015625 0.6861111111111111</pos>
@@ -113,7 +113,7 @@
          <origin>0 0</origin>
          <pos>0.2859375 0.6861111111111111</pos>
          <maxSize>0.00703125 0.0277777777777778</maxSize>
-         <path>./../images/metadata.svg</path>
+         <path>./../../images/metadata.svg</path>
       </image>
       <datetime name="md_releasedate">
          <pos>0.29453125 0.6861111111111111</pos>
@@ -124,7 +124,7 @@
          <origin>0 0</origin>
          <pos>0.3703125 0.6861111111111111</pos>
          <maxSize>0.00703125 0.0277777777777778</maxSize>
-         <path>./../images/metadata.svg</path>
+         <path>./../../images/metadata.svg</path>
       </image>
       <text name="md_genre">
          <pos>0.37890625 0.6861111111111111</pos>
@@ -151,7 +151,7 @@
          <origin>0.5 0.5</origin>
          <pos>0.32734375 0.3666666666666667</pos>
          <maxSize>0.2671875 0.3638888888888889</maxSize>
-         <path>./../images/crt-bezel.svg</path>
+         <path>./../../images/crt-bezel.svg</path>
       </image>
       <image name="md_image">
          <origin>0.5 0.5</origin>
@@ -162,7 +162,7 @@
          <origin>0.5 0.5</origin>
          <pos>0.32734375 0.3666666666666667</pos>
          <maxSize>0.25 0.3333333333333333</maxSize>
-         <path>./../images/crt-screen.svg</path>
+         <path>./../../images/crt-screen.svg</path>
       </image>
    </view>
 
diff --git a/_inc/templates/16x9-no_desc.xml b/_inc/templates/recalbox/16x9-no_desc.xml
similarity index 92%
rename from _inc/templates/16x9-no_desc.xml
rename to _inc/templates/recalbox/16x9-no_desc.xml
index af52b69..3ffc760 100644
--- a/_inc/templates/16x9-no_desc.xml
+++ b/_inc/templates/recalbox/16x9-no_desc.xml
@@ -11,7 +11,7 @@
          <pos>0 0</pos>
          <size>1 1</size>
          <tile>true</tile>
-         <path>./../images/background.png</path>
+         <path>./../../images/background.png</path>
       </image>
    </view>
 
@@ -28,7 +28,7 @@
          <selectedColor>bba358</selectedColor>
          <primaryColor>eaeaea</primaryColor>
          <secondaryColor>eaeaea</secondaryColor>
-         <fontPath>./../fonts/Cabin-Bold-TTF.ttf</fontPath>
+         <fontPath>./../../fonts/Cabin-Bold-TTF.ttf</fontPath>
          <fontSize>0.0275</fontSize>
          <forceUppercase>1</forceUppercase>
          <alignment>center</alignment>
@@ -44,7 +44,7 @@
       </datetime>
       <text name="md_description,md_lastplayed,md_lbl_lastplayed,md_lbl_players,md_lbl_releasedate,md_players,md_releasedate,md_lbl_genre,md_genre">
          <color>555555</color>
-         <fontPath>./../fonts/Cabin-Bold-TTF.ttf</fontPath>
+         <fontPath>./../../fonts/Cabin-Bold-TTF.ttf</fontPath>
          <fontSize>0.0222222222222222</fontSize>
          <forceUppercase>1</forceUppercase>
       </text>
@@ -52,14 +52,14 @@
       <rating name="md_rating">
          <pos>0.2015625 0.7455555555555</pos>
          <size>0.2515625 0.0277777777777778</size>
-         <filledPath>./../images/star_filled.svg</filledPath>
-         <unfilledPath>./../images/star_empty.svg</unfilledPath>
+         <filledPath>./../../images/star_filled.svg</filledPath>
+         <unfilledPath>./../../images/star_empty.svg</unfilledPath>
       </rating>
       <!-- <image name="md_hidden">
          <origin>0 0</origin>
          <pos>0.390625 0.7488888888888889</pos>
          <maxSize>0 0</maxSize>
-         <path>./../images/hidden.svg</path>
+         <path>./../../images/hidden.svg</path>
          <color>bba35880</color>
       </image> -->
       <text name="md_lbl_favorite">
diff --git a/_inc/templates/16x9.xml b/_inc/templates/recalbox/16x9.xml
similarity index 92%
rename from _inc/templates/16x9.xml
rename to _inc/templates/recalbox/16x9.xml
index bf500df..61884c0 100755
--- a/_inc/templates/16x9.xml
+++ b/_inc/templates/recalbox/16x9.xml
@@ -11,7 +11,7 @@
          <pos>0 0</pos>
          <size>1 1</size>
          <tile>true</tile>
-         <path>./../images/background.png</path>
+         <path>./../../images/background.png</path>
       </image>
    </view>
 
@@ -28,7 +28,7 @@
          <selectedColor>bba358</selectedColor>
          <primaryColor>eaeaea</primaryColor>
          <secondaryColor>eaeaea</secondaryColor>
-         <fontPath>./../fonts/Cabin-Bold-TTF.ttf</fontPath>
+         <fontPath>./../../fonts/Cabin-Bold-TTF.ttf</fontPath>
          <fontSize>0.0275</fontSize>
          <forceUppercase>1</forceUppercase>
          <alignment>center</alignment>
@@ -44,7 +44,7 @@
       </datetime>
       <text name="md_description,md_lastplayed,md_lbl_lastplayed,md_lbl_players,md_lbl_releasedate,md_players,md_releasedate,md_lbl_genre,md_genre">
          <color>555555</color>
-         <fontPath>./../fonts/Cabin-Bold-TTF.ttf</fontPath>
+         <fontPath>./../../fonts/Cabin-Bold-TTF.ttf</fontPath>
          <fontSize>0.0222222222222222</fontSize>
          <forceUppercase>1</forceUppercase>
       </text>
@@ -52,14 +52,14 @@
       <rating name="md_rating">
          <pos>0.2015625 0.5888888888888889</pos>
          <size>0.2515625 0.0277777777777778</size>
-         <filledPath>./../images/star_filled.svg</filledPath>
-         <unfilledPath>./../images/star_empty.svg</unfilledPath>
+         <filledPath>./../../images/star_filled.svg</filledPath>
+         <unfilledPath>./../../images/star_empty.svg</unfilledPath>
       </rating>
       <image name="md_hidden">
          <origin>0 0</origin>
          <pos>0.390625 0.5888888888888889</pos>
          <maxSize>0 0</maxSize>
-         <path>./../images/hidden.svg</path>
+         <path>./../../images/hidden.svg</path>
          <color>bba35880</color>
       </image>
       <text name="md_lbl_favorite">
diff --git a/_inc/templates/4x3-bezel.xml b/_inc/templates/recalbox/4x3-bezel.xml
similarity index 87%
rename from _inc/templates/4x3-bezel.xml
rename to _inc/templates/recalbox/4x3-bezel.xml
index d6315cd..e0b1cac 100644
--- a/_inc/templates/4x3-bezel.xml
+++ b/_inc/templates/recalbox/4x3-bezel.xml
@@ -11,7 +11,7 @@
          <pos>0 0</pos>
          <size>1 1</size>
          <tile>true</tile>
-         <path>./../images/background.png</path>
+         <path>./../../images/background.png</path>
       </image>
    </view>
 
@@ -28,10 +28,10 @@
          <selectedColor>bba358</selectedColor>
          <primaryColor>eaeaea</primaryColor>
          <secondaryColor>eaeaea</secondaryColor>
-         <fontPath>./../fonts/Cabin-Bold-TTF.ttf</fontPath>
+         <fontPath>./../../fonts/Cabin-Bold-TTF.ttf</fontPath>
          <fontSize>0.0375</fontSize>
          <forceUppercase>1</forceUppercase>
-         <scrollSound>./../sounds/select.wav</scrollSound>
+         <scrollSound>./../../sounds/select.wav</scrollSound>
          <alignment>center</alignment>
       </textlist>
    </view>
@@ -45,20 +45,20 @@
       </datetime>
       <text name="md_description,md_lastplayed,md_lbl_lastplayed,md_lbl_players,md_players,md_releasedate,md_genre">
          <color>555555</color>
-         <fontPath>./../fonts/Cabin-Bold-TTF.ttf</fontPath>
+         <fontPath>./../../fonts/Cabin-Bold-TTF.ttf</fontPath>
          <fontSize>0.0222222222222222</fontSize>
       </text>
 
       <rating name="md_rating">
          <pos>0.1020833333333333 0.5888888888888889</pos>
          <size>0.3354166666666667 0.0277777777777778</size>
-         <filledPath>./../images/star_filled.svg</filledPath>
-         <unfilledPath>./../images/star_empty.svg</unfilledPath>
+         <filledPath>./../../images/star_filled.svg</filledPath>
+         <unfilledPath>./../../images/star_empty.svg</unfilledPath>
       </rating>
       <image name="md_hidden">
          <origin>0 0</origin>
          <pos>0.3541666666666667 0.5888888888888889</pos>
-         <path>./../images/hidden.svg</path>
+         <path>./../../images/hidden.svg</path>
          <size>0.028125 0.0277777777777778</size>
          <color>bba35880</color>
       </image>
@@ -76,7 +76,7 @@
          <origin>0 0</origin>
          <pos>0.1020833333333333 0.6444444444444444</pos>
          <maxSize>0.009375 0.0277777777777778</maxSize>
-         <path>./../images/metadata.svg</path>
+         <path>./../../images/metadata.svg</path>
       </image>
       <text name="md_lbl_lastplayed">
          <pos>0.1135416666666667 0.6444444444444444</pos>
@@ -91,7 +91,7 @@
          <origin>0 0</origin>
          <pos>0.1020833333333333 0.6861111111111111</pos>
          <maxSize>0.009375 0.0277777777777778</maxSize>
-         <path>./../images/metadata.svg</path>
+         <path>./../../images/metadata.svg</path>
       </image>
       <text name="md_lbl_players">
          <pos>0.1135416666666667 0.6861111111111111</pos>
@@ -106,7 +106,7 @@
          <origin>0 0</origin>
          <pos>0.2145833333333333 0.6861111111111111</pos>
          <maxSize>0.009375 0.0277777777777778</maxSize>
-         <path>./../images/metadata.svg</path>
+         <path>./../../images/metadata.svg</path>
       </image>
       <datetime name="md_releasedate">
          <pos>0.2260416666666667 0.6861111111111111</pos>
@@ -117,7 +117,7 @@
          <origin>0 0</origin>
          <pos>0.3270833333333333 0.6861111111111111</pos>
          <maxSize>0.009375 0.0277777777777778</maxSize>
-         <path>./../images/metadata.svg</path>
+         <path>./../../images/metadata.svg</path>
       </image>
       <text name="md_genre">
          <pos>0.3385416666666667 0.6861111111111111</pos>
@@ -144,7 +144,7 @@
          <origin>0.5 0.5</origin>
          <pos>0.2697916666666667 0.3666666666666667</pos>
          <maxSize>0.35625 0.3638888888888889</maxSize>
-         <path>./../images/crt-bezel.svg</path>
+         <path>./../../images/crt-bezel.svg</path>
       </image>
       <image name="md_image">
          <origin>0.5 0.5</origin>
@@ -156,7 +156,7 @@
          <origin>0.5 0.5</origin>
          <pos>0.2697916666666667 0.3666666666666667</pos>
          <maxSize>0.3333333333333333 0.3333333333333333</maxSize>
-         <path>./../images/crt-screen.svg</path>
+         <path>./../../images/crt-screen.svg</path>
       </image>
 
    </view>
diff --git a/_inc/templates/4x3.xml b/_inc/templates/recalbox/4x3.xml
similarity index 88%
rename from _inc/templates/4x3.xml
rename to _inc/templates/recalbox/4x3.xml
index 485e5f5..e123891 100755
--- a/_inc/templates/4x3.xml
+++ b/_inc/templates/recalbox/4x3.xml
@@ -11,7 +11,7 @@
          <pos>0 0</pos>
          <size>1 1</size>
          <tile>true</tile>
-         <path>./../images/background.png</path>
+         <path>./../../images/background.png</path>
       </image>
    </view>
 
@@ -28,10 +28,10 @@
          <selectedColor>bba358</selectedColor>
          <primaryColor>eaeaea</primaryColor>
          <secondaryColor>eaeaea</secondaryColor>
-         <fontPath>./../fonts/Cabin-Bold-TTF.ttf</fontPath>
+         <fontPath>./../../fonts/Cabin-Bold-TTF.ttf</fontPath>
          <fontSize>0.0375</fontSize>
          <forceUppercase>1</forceUppercase>
-         <scrollSound>./../sounds/select.wav</scrollSound>
+         <scrollSound>./../../sounds/select.wav</scrollSound>
          <alignment>center</alignment>
       </textlist>
    </view>
@@ -45,20 +45,20 @@
       </datetime>
       <text name="md_description,md_lastplayed,md_lbl_lastplayed,md_lbl_players,md_players,md_releasedate,md_genre">
          <color>555555</color>
-         <fontPath>./../fonts/Cabin-Bold-TTF.ttf</fontPath>
+         <fontPath>./../../fonts/Cabin-Bold-TTF.ttf</fontPath>
          <fontSize>0.0222222222222222</fontSize>
       </text>
 
       <rating name="md_rating">
          <pos>0.1020833333333333 0.5888888888888889</pos>
          <size>0.3354166666666667 0.0277777777777778</size>
-         <filledPath>./../images/star_filled.svg</filledPath>
-         <unfilledPath>./../images/star_empty.svg</unfilledPath>
+         <filledPath>./../../images/star_filled.svg</filledPath>
+         <unfilledPath>./../../images/star_empty.svg</unfilledPath>
       </rating>
       <image name="md_hidden">
          <origin>0 0</origin>
          <pos>0.3541666666666667 0.5888888888888889</pos>
-         <path>./../images/hidden.svg</path>
+         <path>./../../images/hidden.svg</path>
          <size>0.028125 0.0277777777777778</size>
          <color>bba35880</color>
       </image>
@@ -76,7 +76,7 @@
          <origin>0 0</origin>
          <pos>0.1020833333333333 0.6444444444444444</pos>
          <maxSize>0.009375 0.0277777777777778</maxSize>
-         <path>./../images/metadata.svg</path>
+         <path>./../../images/metadata.svg</path>
       </image>
       <text name="md_lbl_lastplayed">
          <pos>0.1135416666666667 0.6444444444444444</pos>
@@ -91,7 +91,7 @@
          <origin>0 0</origin>
          <pos>0.1020833333333333 0.6861111111111111</pos>
          <maxSize>0.009375 0.0277777777777778</maxSize>
-         <path>./../images/metadata.svg</path>
+         <path>./../../images/metadata.svg</path>
       </image>
       <text name="md_lbl_players">
          <pos>0.1135416666666667 0.6861111111111111</pos>
@@ -106,7 +106,7 @@
          <origin>0 0</origin>
          <pos>0.2145833333333333 0.6861111111111111</pos>
          <maxSize>0.009375 0.0277777777777778</maxSize>
-         <path>./../images/metadata.svg</path>
+         <path>./../../images/metadata.svg</path>
       </image>
       <datetime name="md_releasedate">
          <pos>0.2260416666666667 0.6861111111111111</pos>
@@ -117,7 +117,7 @@
          <origin>0 0</origin>
          <pos>0.3270833333333333 0.6861111111111111</pos>
          <maxSize>0.009375 0.0277777777777778</maxSize>
-         <path>./../images/metadata.svg</path>
+         <path>./../../images/metadata.svg</path>
       </image>
       <text name="md_genre">
          <pos>0.3385416666666667 0.6861111111111111</pos>
diff --git a/_inc/templates/retropie/16x10.xml b/_inc/templates/retropie/16x10.xml
new file mode 100755
index 0000000..917309c
--- /dev/null
+++ b/_inc/templates/retropie/16x10.xml
@@ -0,0 +1,244 @@
+<theme>
+   <formatVersion>4</formatVersion>
+
+   <view name="system,basic,detailed,video">
+      <helpsystem name="help">
+         <pos>1 1</pos>
+         <textColor>777777</textColor>
+         <iconColor>77777750</iconColor>
+      </helpsystem>
+      <image name="background" extra="true">
+         <origin>0 0</origin>
+         <pos>0 0</pos>
+         <size>1 1</size>
+         <tile>true</tile>
+         <path>./../../images/background.png</path>
+      </image>
+   </view>
+
+   <feature supported="carousel">
+      <view name="system">
+         <carousel name="systemcarousel">
+            <type>horizontal</type>
+            <color>1c1c1cdd</color>
+         </carousel>
+         <text name="systemInfo">
+            <backgroundColor>1c1c1cdd</backgroundColor>
+            <color>777777</color>
+            <fontPath>./../../fonts/Cabin-Bold-TTF.ttf</fontPath>
+         </text>
+      </view>
+   </feature>
+
+   <view name="basic,detailed,video">
+      <image name="logo">
+         <origin>0.5 0</origin>
+         <pos>0.5 0.1125</pos>
+         <maxSize>0.234375 0.05</maxSize>
+      </image>
+      <textlist name="gamelist">
+         <pos>0.1875 0.23</pos>
+         <size>0.625 0.625</size>
+         <selectorColor>1c1c1c00</selectorColor>
+         <selectedColor>bba358</selectedColor>
+         <primaryColor>eaeaea</primaryColor>
+         <secondaryColor>eaeaea</secondaryColor>
+         <fontPath>./../../fonts/Cabin-Bold-TTF.ttf</fontPath>
+         <fontSize>0.03375</fontSize>
+         <forceUppercase>1</forceUppercase>
+         <scrollSound>./../../sounds/select.wav</scrollSound>
+         <alignment>center</alignment>
+      </textlist>
+   </view>
+
+   <view name="detailed,video">
+      <text name="md_lbl_rating, md_lbl_releasedate, md_lbl_developer, md_lbl_publisher, md_lbl_genre, md_lbl_playcount, md_developer, md_publisher, md_playcount">
+         <pos>1 1</pos>
+      </text>
+      <datetime name="md_releasedate">
+         <pos>1 1</pos>
+      </datetime>
+      <text name="md_description,md_lastplayed,md_lbl_lastplayed,md_lbl_players,md_players,md_releasedate,md_genre">
+         <color>555555</color>
+         <fontPath>./../../fonts/Cabin-Bold-TTF.ttf</fontPath>
+         <fontSize>0.02</fontSize>
+      </text>
+
+      <rating name="md_rating">
+         <pos>0.2015625 0.58</pos>
+         <size>0.2515625 0.025</size>
+         <filledPath>./../../images/star_filled.svg</filledPath>
+         <unfilledPath>./../../images/star_empty.svg</unfilledPath>
+      </rating>
+      <image name="md_hidden">
+         <origin>0 0</origin>
+         <pos>0.390625 0.58</pos>
+         <maxSize>0.02109375 0.025</maxSize>
+         <path>./../../images/hidden.svg</path>
+         <color>bba35880</color>
+      </image>
+      <image name="md_kidgame">
+         <origin>0 0</origin>
+         <pos>0.4171875 0.58</pos>
+         <maxSize>0.0125 0.025</maxSize>
+         <path>./../../images/kid.svg</path>
+         <color>bba35880</color>
+      </image>
+      <image name="md_favorite">
+         <origin>0 0</origin>
+         <pos>0.43515625 0.58</pos>
+         <maxSize>0.01796875 0.025</maxSize>
+         <path>./../../images/favorite.svg</path>
+         <color>bba35880</color>
+      </image>
+
+      <image name="md_lbl_lastplayed_slash" extra="true">
+         <origin>0 0</origin>
+         <pos>0.2015625 0.63</pos>
+         <maxSize>0.00703125 0.025</maxSize>
+         <path>./../../images/metadata.svg</path>
+      </image>
+      <text name="md_lbl_lastplayed">
+         <pos>0.21015625 0.63</pos>
+         <size>0.07109375 0.025</size>
+      </text>
+      <datetime name="md_lastplayed">
+         <pos>0.28125 0.63</pos>
+         <size>0.1171875 0.025</size>
+      </datetime>
+
+      <image name="md_lbl_players_slash" extra="true">
+         <origin>0 0</origin>
+         <pos>0.2015625 0.6675</pos>
+         <maxSize>0.00703125 0.025</maxSize>
+         <path>./../../images/metadata.svg</path>
+      </image>
+      <text name="md_lbl_players">
+         <pos>0.21015625 0.6675</pos>
+         <size>0.04765625 0.025</size>
+      </text>
+      <text name="md_players">
+         <pos>0.2578125 0.6675</pos>
+         <size>0.028125 0.025</size>
+      </text>
+
+      <image name="md_releasedate_slash" extra="true">
+         <origin>0 0</origin>
+         <pos>0.2859375 0.6675</pos>
+         <maxSize>0.00703125 0.025</maxSize>
+         <path>./../../images/metadata.svg</path>
+      </image>
+      <datetime name="md_releasedate">
+         <pos>0.29453125 0.6675</pos>
+         <size>0.07578125 0.025</size>
+      </datetime>
+
+      <image name="md_genre_slash" extra="true">
+         <origin>0 0</origin>
+         <pos>0.3703125 0.6675</pos>
+         <maxSize>0.00703125 0.025</maxSize>
+         <path>./../../images/metadata.svg</path>
+      </image>
+      <text name="md_genre">
+         <pos>0.37890625 0.6675</pos>
+         <size>0.07421875 0.025</size>
+      </text>
+
+      <text name="md_description">
+         <pos>0.2015625 0.7175</pos>
+         <size>0.2515625 0.1325</size>
+         <color>999999</color>
+         <fontSize>0.0225</fontSize>
+      </text>
+
+      <textlist name="gamelist">
+         <pos>0.546875 0.23</pos>
+         <size>0.29375 0.625</size>
+         <alignment>left</alignment>
+         <horizontalMargin>0.00625</horizontalMargin>
+      </textlist>
+   </view>
+
+   <view name="detailed">
+      <image name="crt-bezel" extra="true">
+         <origin>0.5 0.5</origin>
+         <pos>0.32734375 0.38</pos>
+         <maxSize>0.2671875 0.3275</maxSize>
+         <path>./../../images/crt-bezel.svg</path>
+      </image>
+      <image name="md_image">
+         <origin>0.5 0.5</origin>
+         <pos>0.32734375 0.38</pos>
+         <maxSize>0.25 0.3</maxSize>
+      </image>
+      <image name="crt-screen" extra="true">
+         <origin>0.5 0.5</origin>
+         <pos>0.32734375 0.38</pos>
+         <maxSize>0.25 0.3</maxSize>
+         <path>./../../images/crt-screen.svg</path>
+      </image>
+   </view>
+
+   <feature supported="video">
+      <view name="video">
+         <image name="crt-bezel" extra="true">
+            <origin>0.5 0.5</origin>
+            <pos>0.32734375 0.38</pos>
+            <maxSize>0.2671875 0.3275</maxSize>
+            <path>./../../images/crt-bezel.svg</path>
+         </image>
+         <image name="md_image">
+            <origin>1 1</origin>
+            <pos>0.46484375 0.545</pos>
+            <maxSize>0.1015625 0.1625</maxSize>
+         </image>
+         <image name="md_marquee">
+            <origin>0 1</origin>
+            <pos>0.18984375 0.545</pos>
+            <maxSize>0.1015625 0.1625</maxSize>
+         </image>
+         <video name="md_video">
+            <origin>0.5 0.5</origin>
+            <pos>0.32734375 0.38</pos>
+            <maxSize>0.25 0.3</maxSize>
+            <delay>0.5</delay>
+            <default>./../../videos/static.mp4</default>
+            <showSnapshotNoVideo>false</showSnapshotNoVideo>
+            <showSnapshotDelay>false</showSnapshotDelay>
+         </video>
+      </view>
+   </feature>
+
+   <feature supported="z-index">
+      <view name="detailed,video">
+         <image name="crt-bezel" extra="true">
+            <zIndex>100</zIndex>
+         </image>
+         <image name="md_image">
+            <zIndex>80</zIndex>
+         </image>
+         <image name="crt-screen" extra="true">
+            <origin>0.5 0.5</origin>
+            <pos>0.32734375 0.38</pos>
+            <maxSize>0.25 0.3</maxSize>
+            <path>./../../images/crt-screen.svg</path>
+            <zIndex>60</zIndex>
+         </image>
+      </view>
+      <view name="video">
+         <image name="md_image">
+            <zIndex>120</zIndex>
+         </image>
+         <image name="md_marquee">
+            <zIndex>120</zIndex>
+         </image>
+         <image name="crt-bezel" extra="true">
+            <zIndex>100</zIndex>
+         </image>
+         <video name="md_video">
+            <zIndex>80</zIndex>
+         </video>
+      </view>
+   </feature>
+   
+</theme>
\ No newline at end of file
diff --git a/_inc/templates/retropie/16x9-no_desc.xml b/_inc/templates/retropie/16x9-no_desc.xml
new file mode 100755
index 0000000..ebe13da
--- /dev/null
+++ b/_inc/templates/retropie/16x9-no_desc.xml
@@ -0,0 +1,232 @@
+<theme>
+   <formatVersion>4</formatVersion>
+
+   <view name="system,basic,detailed,video">
+      <helpsystem name="help">
+         <!-- <pos>1 1</pos> -->
+         <textColor>777777</textColor>
+         <iconColor>77777750</iconColor>
+      </helpsystem>
+      <image name="background" extra="true">
+         <origin>0 0</origin>
+         <pos>0 0</pos>
+         <size>1 1</size>
+         <tile>true</tile>
+         <path>./../../images/background.png</path>
+      </image>
+   </view>
+
+   <feature supported="carousel">
+      <view name="system">
+         <carousel name="systemcarousel">
+            <type>horizontal</type>
+            <color>1c1c1cdd</color>
+         </carousel>
+         <text name="systemInfo">
+            <backgroundColor>1c1c1cdd</backgroundColor>
+            <color>777777</color>
+            <fontPath>./../../fonts/Cabin-Bold-TTF.ttf</fontPath>
+         </text>
+      </view>
+   </feature>
+
+   <view name="basic,detailed,video">
+      <image name="logo">
+         <origin>0.5 0</origin>
+         <pos>0.5 0.0694444444444444</pos>
+         <maxSize>0.234375 0.0555555555555556</maxSize>
+      </image>
+      <textlist name="gamelist">
+         <pos>0.1875 0.180555555555556</pos>
+         <size>0.625 0.708333333333333</size>
+         <selectorColor>1c1c1caa</selectorColor>
+         <selectedColor>bba358</selectedColor>
+         <primaryColor>eaeaea</primaryColor>
+         <secondaryColor>eaeaea</secondaryColor>
+         <fontPath>./../../fonts/Cabin-Bold-TTF.ttf</fontPath>
+         <fontSize>0.0275</fontSize>
+         <forceUppercase>1</forceUppercase>
+         <scrollSound>./../../sounds/select.wav</scrollSound>
+         <alignment>center</alignment>
+      </textlist>
+   </view>
+
+   <view name="detailed,video">
+      <text name="md_lbl_rating, md_lbl_releasedate, md_lbl_developer, md_lbl_publisher, md_lbl_genre, md_lbl_playcount, md_developer, md_publisher, md_playcount">
+         <pos>1 1</pos>
+      </text>
+      <datetime name="md_releasedate">
+         <pos>1 1</pos>
+      </datetime>
+      <text name="md_description,md_lastplayed,md_lbl_lastplayed,md_lbl_players,md_lbl_releasedate,md_players,md_releasedate,md_lbl_genre,md_genre">
+         <color>555555</color>
+         <fontPath>./../../fonts/Cabin-Bold-TTF.ttf</fontPath>
+         <fontSize>0.0222222222222222</fontSize>
+      </text>
+
+      <rating name="md_rating">
+         <pos>0.2015625 0.7455555555555</pos>
+         <size>0.2515625 0.0277777777777778</size>
+         <filledPath>./../../images/star_filled.svg</filledPath>
+         <unfilledPath>./../../images/star_empty.svg</unfilledPath>
+      </rating>
+      <image name="md_hidden">
+         <origin>0 0</origin>
+         <pos>0.390625 0.5888888888888889</pos>
+         <maxSize>0.02109375 0.0277777777777778</maxSize>
+         <path>./../../images/hidden.svg</path>
+         <color>bba35880</color>
+      </image>
+      <image name="md_kidgame">
+         <origin>0 0</origin>
+         <pos>0.4171875 0.5888888888888889</pos>
+         <maxSize>0.0125 0.0277777777777778</maxSize>
+         <path>./../../images/kid.svg</path>
+         <color>bba35880</color>
+      </image>
+      <text name="md_lbl_favorite">
+         <pos>1 1</pos>
+         <color>000000</color>
+         <fontSize>0.000000000001</fontSize>
+      </text>
+      <text name="md_favorite">
+         <pos>1 1</pos>
+         <color>000000</color>
+         <fontSize>0.000000000001</fontSize>
+      </text>
+
+      <text name="md_lbl_lastplayed">
+         <pos>0.2015625 0.78</pos>
+         <size>0.09109375 0.0277777777777778</size>
+         <fontSize>0.02</fontSize>
+      </text>
+      <datetime name="md_lastplayed">
+         <pos>0.2763 0.78</pos>
+         <size>0.1171875 0.0277777777777778</size>
+         <fontSize>0.02</fontSize>
+      </datetime>
+
+      <text name="md_lbl_releasedate">
+         <pos>0.2015625 0.81</pos>
+         <size>0.05765625 0.0277777777777778</size>
+         <fontSize>0.02</fontSize>
+      </text>
+      <datetime name="md_releasedate">
+         <pos>0.262 0.81</pos>
+         <size>0.007578125 0.0277777777777778</size>
+         <fontSize>0.02</fontSize>
+      </datetime>
+
+      <text name="md_lbl_players">
+         <pos>0.2015625 0.84</pos>
+         <size>0.05765625 0.0277777777777778</size>
+         <fontSize>0.02</fontSize>
+      </text>
+      <text name="md_players">
+         <pos>0.255 0.84</pos>
+         <size>0.028125 0.0277777777777778</size>
+         <fontSize>0.02</fontSize>
+      </text>
+
+      <text name="md_lbl_genre">
+         <pos>0.2015625 0.87</pos>
+         <size>0.07421875 0.0277777777777778</size>
+         <fontSize>0.02</fontSize>
+      </text>
+      <text name="md_genre">
+         <pos>0.24415625 0.87</pos>
+         <size>0.2215625 0.0277777777777778</size>
+         <fontSize>0.02</fontSize>
+      </text>
+
+      <textlist name="gamelist">
+         <pos>0.546875 0.1958333333333333</pos>
+         <size>0.4500 0.6944444444444444</size>
+         <alignment>left</alignment>
+         <horizontalMargin>0.00625</horizontalMargin>
+      </textlist>
+   </view>
+
+   <view name="detailed">
+      <image name="crt-bezel" extra="true">
+         <origin>0.5 0.5</origin>
+         <pos>0.32734375 0.3666666666666667</pos>
+         <maxSize>0.2671875 0.3638888888888889</maxSize>
+         <path>./../../images/crt-bezel.svg</path>
+      </image>
+      <image name="md_image">
+         <origin>0.5 0.5</origin>
+         <pos>0.32734375 0.3666666666666667</pos>
+         <maxSize>0.25 0.3333333333333333</maxSize>
+      </image>
+      <image name="crt-screen" extra="true">
+         <origin>0.5 0.5</origin>
+         <pos>0.32734375 0.3666666666666667</pos>
+         <maxSize>0.25 0.3333333333333333</maxSize>
+         <path>./../../images/crt-screen.svg</path>
+      </image>
+   </view>
+
+   <feature supported="video">
+      <view name="video">
+         <image name="crt-bezel" extra="true">
+            <origin>0.5 0.5</origin>
+            <pos>0.32734375  0.45333333333337</pos>
+            <maxSize>0.43210 0.555</maxSize>
+            <path>./../../images/crt-bezel.svg</path>
+         </image>
+         <image name="md_image">
+            <origin>1 1</origin>
+            <pos>0.52 0.9</pos>
+            <maxSize>0.15 0.15</maxSize>
+         </image>
+         <image name="md_marquee">
+            <origin>0 1</origin>
+            <pos>0.15 0.68</pos>
+            <maxSize>0.1015625 0.1805555555555556</maxSize>
+         </image>
+         <video name="md_video">
+            <origin>0.46155 0.45155</origin>
+            <pos>0.31734375  0.43333333333337</pos>
+            <maxSize>0.382 0.502</maxSize>
+            <delay>0.5</delay>
+            <default>./../../videos/static.mp4</default>
+            <showSnapshotNoVideo>false</showSnapshotNoVideo>
+            <showSnapshotDelay>false</showSnapshotDelay>
+         </video>
+      </view>
+   </feature>
+
+   <feature supported="z-index">
+      <view name="detailed,video">
+         <image name="crt-bezel" extra="true">
+            <zIndex>100</zIndex>
+         </image>
+         <image name="md_image">
+            <zIndex>80</zIndex>
+         </image>
+      </view>
+      <view name="video">
+         <image name="md_image">
+            <zIndex>120</zIndex>
+         </image>
+         <image name="md_marquee">
+            <zIndex>120</zIndex>
+         </image>
+         <image name="crt-bezel" extra="true">
+            <zIndex>100</zIndex>
+         </image>
+         <video name="md_video">
+            <zIndex>80</zIndex>
+         </video>
+         <image name="crt-screen" extra="true">
+            <origin>0.5 0.5</origin>
+            <pos>0.32734375  0.45333333333337</pos>
+            <maxSize>0.39 0.51</maxSize>
+            <path>./../../images/crt-screen.svg</path>
+            <zIndex>60</zIndex>
+         </image>
+      </view>
+   </feature>
+
+</theme>
diff --git a/_inc/templates/retropie/16x9.xml b/_inc/templates/retropie/16x9.xml
new file mode 100755
index 0000000..eca19e1
--- /dev/null
+++ b/_inc/templates/retropie/16x9.xml
@@ -0,0 +1,244 @@
+<theme>
+   <formatVersion>4</formatVersion>
+
+   <view name="system,basic,detailed,video">
+      <helpsystem name="help">
+         <pos>1 1</pos>
+         <textColor>777777</textColor>
+         <iconColor>77777750</iconColor>
+      </helpsystem>
+      <image name="background" extra="true">
+         <origin>0 0</origin>
+         <pos>0 0</pos>
+         <size>1 1</size>
+         <tile>true</tile>
+         <path>./../../images/background.png</path>
+      </image>
+   </view>
+
+   <feature supported="carousel">
+      <view name="system">
+         <carousel name="systemcarousel">
+            <type>horizontal</type>
+            <color>1c1c1cdd</color>
+         </carousel>
+         <text name="systemInfo">
+            <backgroundColor>1c1c1cdd</backgroundColor>
+            <color>777777</color>
+            <fontPath>./../../fonts/Cabin-Bold-TTF.ttf</fontPath>
+         </text>
+      </view>
+   </feature>
+
+   <view name="basic,detailed,video">
+      <image name="logo">
+         <origin>0.5 0</origin>
+         <pos>0.5 0.0694444444444444</pos>
+         <maxSize>0.234375 0.0555555555555556</maxSize>
+      </image>
+      <textlist name="gamelist">
+         <pos>0.1875 0.180555555555556</pos>
+         <size>0.625 0.708333333333333</size>
+         <selectorColor>1c1c1caa</selectorColor>
+         <selectedColor>bba358</selectedColor>
+         <primaryColor>eaeaea</primaryColor>
+         <secondaryColor>eaeaea</secondaryColor>
+         <fontPath>./../../fonts/Cabin-Bold-TTF.ttf</fontPath>
+         <fontSize>0.0375</fontSize>
+         <forceUppercase>1</forceUppercase>
+         <scrollSound>./../../sounds/select.wav</scrollSound>
+         <alignment>center</alignment>
+      </textlist>
+   </view>
+
+   <view name="detailed,video">
+      <text name="md_lbl_rating, md_lbl_releasedate, md_lbl_developer, md_lbl_publisher, md_lbl_genre, md_lbl_playcount, md_developer, md_publisher, md_playcount">
+         <pos>1 1</pos>
+      </text>
+      <datetime name="md_releasedate">
+         <pos>1 1</pos>
+      </datetime>
+      <text name="md_description,md_lastplayed,md_lbl_lastplayed,md_lbl_players,md_players,md_releasedate,md_genre">
+         <color>555555</color>
+         <fontPath>./../../fonts/Cabin-Bold-TTF.ttf</fontPath>
+         <fontSize>0.0222222222222222</fontSize>
+      </text>
+
+      <rating name="md_rating">
+         <pos>0.2015625 0.5888888888888889</pos>
+         <size>0.2515625 0.0277777777777778</size>
+         <filledPath>./../../images/star_filled.svg</filledPath>
+         <unfilledPath>./../../images/star_empty.svg</unfilledPath>
+      </rating>
+      <image name="md_hidden">
+         <origin>0 0</origin>
+         <pos>0.390625 0.5888888888888889</pos>
+         <maxSize>0.02109375 0.0277777777777778</maxSize>
+         <path>./../../images/hidden.svg</path>
+         <color>bba35880</color>
+      </image>
+      <image name="md_kidgame">
+         <origin>0 0</origin>
+         <pos>0.4171875 0.5888888888888889</pos>
+         <maxSize>0.0125 0.0277777777777778</maxSize>
+         <path>./../../images/kid.svg</path>
+         <color>bba35880</color>
+      </image>
+      <image name="md_favorite">
+         <origin>0 0</origin>
+         <pos>0.43515625 0.5888888888888889</pos>
+         <maxSize>0.01796875 0.0277777777777778</maxSize>
+         <path>./../../images/favorite.svg</path>
+         <color>bba35880</color>
+      </image>
+
+      <image name="md_lbl_lastplayed_slash" extra="true">
+         <origin>0 0</origin>
+         <pos>0.2015625 0.6444444444444444</pos>
+         <maxSize>0.00703125 0.0277777777777778</maxSize>
+         <path>./../../images/metadata.svg</path>
+      </image>
+      <text name="md_lbl_lastplayed">
+         <pos>0.21015625 0.6444444444444444</pos>
+         <size>0.07109375 0.0277777777777778</size>
+      </text>
+      <datetime name="md_lastplayed">
+         <pos>0.28125 0.6444444444444444</pos>
+         <size>0.1171875 0.0277777777777778</size>
+      </datetime>
+
+      <image name="md_lbl_players_slash" extra="true">
+         <origin>0 0</origin>
+         <pos>0.2015625 0.6861111111111111</pos>
+         <maxSize>0.00703125 0.0277777777777778</maxSize>
+         <path>./../../images/metadata.svg</path>
+      </image>
+      <text name="md_lbl_players">
+         <pos>0.21015625 0.6861111111111111</pos>
+         <size>0.04765625 0.0277777777777778</size>
+      </text>
+      <text name="md_players">
+         <pos>0.2578125 0.6861111111111111</pos>
+         <size>0.028125 0.0277777777777778</size>
+      </text>
+
+      <image name="md_releasedate_slash" extra="true">
+         <origin>0 0</origin>
+         <pos>0.2859375 0.6861111111111111</pos>
+         <maxSize>0.00703125 0.0277777777777778</maxSize>
+         <path>./../../images/metadata.svg</path>
+      </image>
+      <datetime name="md_releasedate">
+         <pos>0.29453125 0.6861111111111111</pos>
+         <size>0.07578125 0.0277777777777778</size>
+      </datetime>
+
+      <image name="md_genre_slash" extra="true">
+         <origin>0 0</origin>
+         <pos>0.3703125 0.6861111111111111</pos>
+         <maxSize>0.00703125 0.0277777777777778</maxSize>
+         <path>./../../images/metadata.svg</path>
+      </image>
+      <text name="md_genre">
+         <pos>0.37890625 0.6861111111111111</pos>
+         <size>0.07421875 0.0277777777777778</size>
+      </text>
+
+      <text name="md_description">
+         <pos>0.2015625 0.7416666666666667</pos>
+         <size>0.2515625 0.1472222222222222</size>
+         <color>999999</color>
+         <fontSize>0.025</fontSize>
+      </text>
+
+      <textlist name="gamelist">
+         <pos>0.546875 0.180555555555556</pos>
+         <size>0.29375 0.708333333333333</size>
+         <alignment>left</alignment>
+         <horizontalMargin>0.00625</horizontalMargin>
+      </textlist>
+   </view>
+
+   <view name="detailed">
+      <image name="crt-bezel" extra="true">
+         <origin>0.5 0.5</origin>
+         <pos>0.32734375 0.3666666666666667</pos>
+         <maxSize>0.2671875 0.3638888888888889</maxSize>
+         <path>./../../images/crt-bezel.svg</path>
+      </image>
+      <image name="md_image">
+         <origin>0.5 0.5</origin>
+         <pos>0.32734375 0.3666666666666667</pos>
+         <maxSize>0.25 0.3333333333333333</maxSize>
+      </image>
+      <image name="crt-screen" extra="true">
+         <origin>0.5 0.5</origin>
+         <pos>0.32734375 0.3666666666666667</pos>
+         <maxSize>0.25 0.3333333333333333</maxSize>
+         <path>./../../images/crt-screen.svg</path>
+      </image>
+   </view>
+
+   <feature supported="video">
+      <view name="video">
+         <image name="crt-bezel" extra="true">
+            <origin>0.5 0.5</origin>
+            <pos>0.32734375 0.3666666666666667</pos>
+            <maxSize>0.2671875 0.3638888888888889</maxSize>
+            <path>./../../images/crt-bezel.svg</path>
+         </image>
+         <image name="md_image">
+            <origin>1 1</origin>
+            <pos>0.46484375 0.55</pos>
+            <maxSize>0.1015625 0.1805555555555556</maxSize>
+         </image>
+         <image name="md_marquee">
+            <origin>0 1</origin>
+            <pos>0.18984375 0.55</pos>
+            <maxSize>0.1015625 0.1805555555555556</maxSize>
+         </image>
+         <video name="md_video">
+            <origin>0.5 0.5</origin>
+            <pos>0.32734375 0.3666666666666667</pos>
+            <maxSize>0.25 0.3333333333333333</maxSize>
+            <delay>0.5</delay>
+            <default>./../../videos/static.mp4</default>
+            <showSnapshotNoVideo>false</showSnapshotNoVideo>
+            <showSnapshotDelay>false</showSnapshotDelay>
+         </video>
+      </view>
+   </feature>
+
+   <feature supported="z-index">
+      <view name="detailed,video">
+         <image name="crt-bezel" extra="true">
+            <zIndex>100</zIndex>
+         </image>
+         <image name="md_image">
+            <zIndex>80</zIndex>
+         </image>
+         <!--<image name="crt-screen" extra="true">
+            <origin>0.5 0.5</origin>
+            <pos>0.32734375 0.3666666666666667</pos>
+            <maxSize>0.25 0.3333333333333333</maxSize>
+            <path>./../../images/crt-screen.svg</path>
+            <zIndex>60</zIndex>
+         </image>-->
+      </view>
+      <view name="video">
+         <image name="md_image">
+            <zIndex>120</zIndex>
+         </image>
+         <image name="md_marquee">
+            <zIndex>120</zIndex>
+         </image>
+         <image name="crt-bezel" extra="true">
+            <zIndex>100</zIndex>
+         </image>
+         <video name="md_video">
+            <zIndex>80</zIndex>
+         </video>
+      </view>
+   </feature>
+   
+</theme>
\ No newline at end of file
diff --git a/_inc/templates/retropie/4x3.xml b/_inc/templates/retropie/4x3.xml
new file mode 100755
index 0000000..18ac810
--- /dev/null
+++ b/_inc/templates/retropie/4x3.xml
@@ -0,0 +1,244 @@
+<theme>
+   <formatVersion>4</formatVersion>
+
+   <view name="system,basic,detailed,video">
+      <helpsystem name="help">
+         <pos>1 1</pos>
+         <textColor>777777</textColor>
+         <iconColor>77777750</iconColor>
+      </helpsystem>
+      <image name="background" extra="true">
+         <origin>0 0</origin>
+         <pos>0 0</pos>
+         <size>1 1</size>
+         <tile>true</tile>
+         <path>./../../images/background.png</path>
+      </image>
+   </view>
+
+   <feature supported="carousel">
+      <view name="system">
+         <carousel name="systemcarousel">
+            <type>horizontal</type>
+            <color>1c1c1cdd</color>
+         </carousel>
+         <text name="systemInfo">
+            <backgroundColor>1c1c1cdd</backgroundColor>
+            <color>777777</color>
+            <fontPath>./../../fonts/Cabin-Bold-TTF.ttf</fontPath>
+         </text>
+      </view>
+   </feature>
+
+   <view name="basic,detailed,video">
+      <image name="logo">
+         <origin>0.5 0</origin>
+         <pos>0.5 0.0694444444444444</pos>
+         <maxSize>0.234375 0.0555555555555556</maxSize>
+      </image>
+      <textlist name="gamelist">
+         <pos>0.1875 0.1958333333333333</pos>
+         <size>0.625 0.6944444444444444</size>
+         <selectorColor>1c1c1caa</selectorColor>
+         <selectedColor>bba358</selectedColor>
+         <primaryColor>eaeaea</primaryColor>
+         <secondaryColor>eaeaea</secondaryColor>
+         <fontPath>./../../fonts/Cabin-Bold-TTF.ttf</fontPath>
+         <fontSize>0.0375</fontSize>
+         <forceUppercase>1</forceUppercase>
+         <scrollSound>./../../sounds/select.wav</scrollSound>
+         <alignment>center</alignment>
+      </textlist>
+   </view>
+
+   <view name="detailed,video">
+      <text name="md_lbl_rating, md_lbl_releasedate, md_lbl_developer, md_lbl_publisher, md_lbl_genre, md_lbl_playcount, md_developer, md_publisher, md_playcount">
+         <pos>1 1</pos>
+      </text>
+      <datetime name="md_releasedate">
+         <pos>1 1</pos>
+      </datetime>
+      <text name="md_description,md_lastplayed,md_lbl_lastplayed,md_lbl_players,md_players,md_releasedate,md_genre">
+         <color>555555</color>
+         <fontPath>./../../fonts/Cabin-Bold-TTF.ttf</fontPath>
+         <fontSize>0.0222222222222222</fontSize>
+      </text>
+
+      <rating name="md_rating">
+         <pos>0.1020833333333333 0.5888888888888889</pos>
+         <size>0.3354166666666667 0.0277777777777778</size>
+         <filledPath>./../../images/star_filled.svg</filledPath>
+         <unfilledPath>./../../images/star_empty.svg</unfilledPath>
+      </rating>
+      <image name="md_hidden">
+         <origin>0 0</origin>
+         <pos>0.3541666666666667 0.5888888888888889</pos>
+         <path>./../../images/hidden.svg</path>
+         <size>0.028125 0.0277777777777778</size>
+         <color>bba35880</color>
+      </image>
+      <image name="md_kidgame">
+         <origin>0 0</origin>
+         <pos>0.3895833333333333 0.5888888888888889</pos>
+         <path>./../../images/kid.svg</path>
+         <size>0.0166666666666667 0.0277777777777778</size>
+         <color>bba35880</color>
+      </image>
+      <image name="md_favorite">
+         <origin>0 0</origin>
+         <pos>0.4135416666666667 0.5888888888888889</pos>
+         <path>./../../images/favorite.svg</path>
+         <size>0.0239583333333333 0.0277777777777778</size>
+         <color>bba35880</color>
+      </image>
+
+      <image name="md_lbl_lastplayed_slash" extra="true">
+         <origin>0 0</origin>
+         <pos>0.1020833333333333 0.6444444444444444</pos>
+         <maxSize>0.009375 0.0277777777777778</maxSize>
+         <path>./../../images/metadata.svg</path>
+      </image>
+      <text name="md_lbl_lastplayed">
+         <pos>0.1135416666666667 0.6444444444444444</pos>
+         <size>0.0947916666666667 0.0277777777777778</size>
+      </text>
+      <datetime name="md_lastplayed">
+         <pos>0.2083333333333333 0.6444444444444444</pos>
+         <size>0.15625 0.0277777777777778</size>
+      </datetime>
+
+      <image name="md_lbl_players_slash" extra="true">
+         <origin>0 0</origin>
+         <pos>0.1020833333333333 0.6861111111111111</pos>
+         <maxSize>0.009375 0.0277777777777778</maxSize>
+         <path>./../../images/metadata.svg</path>
+      </image>
+      <text name="md_lbl_players">
+         <pos>0.1135416666666667 0.6861111111111111</pos>
+         <size>0.0635416666666667 0.0277777777777778</size>
+      </text>
+      <text name="md_players">
+         <pos>0.1770833333333333 0.6861111111111111</pos>
+         <size>0.0375 0.0277777777777778</size>
+      </text>
+
+      <image name="md_releasedate_slash" extra="true">
+         <origin>0 0</origin>
+         <pos>0.2145833333333333 0.6861111111111111</pos>
+         <maxSize>0.009375 0.0277777777777778</maxSize>
+         <path>./../../images/metadata.svg</path>
+      </image>
+      <datetime name="md_releasedate">
+         <pos>0.2260416666666667 0.6861111111111111</pos>
+         <size>0.1010416666666667 0.0277777777777778</size>
+      </datetime>
+
+      <image name="md_genre_slash" extra="true">
+         <origin>0 0</origin>
+         <pos>0.3270833333333333 0.6861111111111111</pos>
+         <maxSize>0.009375 0.0277777777777778</maxSize>
+         <path>./../../images/metadata.svg</path>
+      </image>
+      <text name="md_genre">
+         <pos>0.3385416666666667 0.6861111111111111</pos>
+         <size>0.0989583333333333 0.0277777777777778</size>
+      </text>
+
+      <text name="md_description">
+         <pos>0.1020833333333333 0.7416666666666667</pos>
+         <size>0.3354166666666667 0.1472222222222222</size>
+         <color>999999</color>
+         <fontSize>0.025</fontSize>
+      </text>
+
+      <textlist name="gamelist">
+         <pos>0.5625 0.1958333333333333</pos>
+         <size>0.3354166666666667 0.6944444444444444</size>
+         <alignment>left</alignment>
+         <horizontalMargin>0.009375</horizontalMargin>
+      </textlist>
+   </view>
+
+   <view name="detailed">
+      <image name="crt-bezel" extra="true">
+         <origin>0.5 0.5</origin>
+         <pos>0.2697916666666667 0.3666666666666667</pos>
+         <maxSize>0.35625 0.3638888888888889</maxSize>
+         <path>./../../images/crt-bezel.svg</path>
+      </image>
+      <image name="md_image">
+         <origin>0.5 0.5</origin>
+         <pos>0.2697916666666667 0.3666666666666667</pos>
+         <maxSize>0.3333333333333333 0.3333333333333333</maxSize>
+      </image>
+      <image name="crt-screen" extra="true">
+         <origin>0.5 0.5</origin>
+         <pos>0.2697916666666667 0.3666666666666667</pos>
+         <maxSize>0.3333333333333333 0.3333333333333333</maxSize>
+         <path>./../../images/crt-screen.svg</path>
+      </image>
+   </view>
+
+   <feature supported="video">
+      <view name="video">
+         <image name="crt-bezel" extra="true">
+            <origin>0.5 0.5</origin>
+            <pos>0.2697916666666667 0.3666666666666667</pos>
+            <maxSize>0.35625 0.3638888888888889</maxSize>
+            <path>./../../images/crt-bezel.svg</path>
+         </image>
+         <image name="md_image">
+            <origin>1 1</origin>
+            <pos>0.453125 0.55</pos>
+            <maxSize>0.1354166666666667 0.1805555555555556</maxSize>
+         </image>
+         <image name="md_marquee">
+            <origin>0 1</origin>
+            <pos>0.0864583333333333 0.55</pos>
+            <maxSize>0.1354166666666667 0.1805555555555556</maxSize>
+         </image>
+         <video name="md_video">
+            <origin>0.5 0.5</origin>
+            <pos>0.2697916666666667 0.3666666666666667</pos>
+            <maxSize>0.3333333333333333 0.3333333333333333</maxSize>
+            <delay>0.5</delay>
+            <default>./../../videos/static.mp4</default>
+            <showSnapshotNoVideo>false</showSnapshotNoVideo>
+            <showSnapshotDelay>false</showSnapshotDelay>
+         </video>
+      </view>
+   </feature>
+
+   <feature supported="z-index">
+      <view name="detailed,video">
+         <image name="crt-bezel" extra="true">
+            <zIndex>100</zIndex>
+         </image>
+         <image name="md_image">
+            <zIndex>80</zIndex>
+         </image>
+         <!--<image name="crt-screen" extra="true">
+            <origin>0.5 0.5</origin>
+            <pos>0.2697916666666667 0.3666666666666667</pos>
+            <maxSize>0.3333333333333333 0.3333333333333333</maxSize>
+            <path>./../../images/crt-screen.svg</path>
+            <zIndex>60</zIndex>
+         </image>-->
+      </view>
+      <view name="video">
+         <image name="md_image">
+            <zIndex>120</zIndex>
+         </image>
+         <image name="md_marquee">
+            <zIndex>120</zIndex>
+         </image>
+         <image name="crt-bezel" extra="true">
+            <zIndex>100</zIndex>
+         </image>
+         <video name="md_video">
+            <zIndex>80</zIndex>
+         </video>
+      </view>
+   </feature>
+   
+</theme>
\ No newline at end of file
diff --git a/_inc/videos/static.mp4 b/_inc/videos/static.mp4
new file mode 100755
index 0000000..c1b54c7
Binary files /dev/null and b/_inc/videos/static.mp4 differ
diff --git a/retropie/theme.xml b/retropie/theme.xml
index 8aa3a4c..39cc351 100644
--- a/retropie/theme.xml
+++ b/retropie/theme.xml
@@ -9,7 +9,7 @@
 	</view>
 
 	<view name="detailed,video">
-	  <text name="md_lbl_players,md_players,md_genre,md_releasedate,md_rating,md_lbl_lastplayed,md_lastplayed">
+	  <text name="md_description,md_lastplayed,md_lbl_lastplayed,md_lbl_players,md_lbl_releasedate,md_players,md_releasedate,md_lbl_genre,md_genre">
          <pos>1 1</pos>
       </text>
       <image name="md_lbl_lastplayed_slash,md_lbl_players_slash,md_releasedate_slash,md_genre_slash" extra="true">
@@ -18,6 +18,9 @@
       <text name="md_description">
          <pos>0.2015625 0.5888888888888889</pos>
       </text>
+			<rating name="md_rating">
+				<pos>1 1</pos>
+			</rating>
     </view>
 
-</theme>
\ No newline at end of file
+</theme>
diff --git a/theme.xml b/theme.xml
index 47ec881..df2ccd7 100755
--- a/theme.xml
+++ b/theme.xml
@@ -13,11 +13,18 @@ based on:       "CRT" by Anthony / "Carbon" by Eric Hettervik
    <!--
    Uncomment the template vesion below that you want to use...
    -->
+   <!-- This Section for Recalbox/Batocera templates... -->
+   <!-- <include>./_inc/templates/recalbox/4x3.xml</include> -->
+   <!-- <include>./_inc/templates/recalbox/16x9-no_desc.xml</include> -->
+   <!-- <include>./_inc/templates/recalbox/16x10.xml</include> -->
+   <!-- <include>./_inc/templates/recalbox/4x3-bezel.xml</include> -->
+   <!-- <include>./_inc/templates/recalbox/16x9-bezel.xml</include> -->
+   <!-- <include>./_inc/templates/recalbox/16x10-bezel.xml</include> -->
 
-   <!-- <include>./_inc/templates/4x3.xml</include> -->
-   <include>./_inc/templates/16x9.xml</include>
-   <!-- <include>./_inc/templates/16x10.xml</include> -->
-   <!-- <include>./_inc/templates/4x3-bezel.xml</include> -->
-   <!-- <include>./_inc/templates/16x9-bezel.xml</include> -->
-   <!-- <include>./_inc/templates/16x10-bezel.xml</include> -->
+
+   <!-- This Section for RetroPie templates... -->
+   <!-- <include>./_inc/templates/retropie/4x3.xml</include> -->
+   <!-- <include>./_inc/templates/retropie/16x9.xml</include> -->
+   <include>./_inc/templates/retropie/16x9-no_desc.xml</include>
+   <!-- <include>./_inc/templates/retropie/16x10.xml</include> -->
 </theme>