diff --git a/Package/Environment/Common/layouts/Mamed 16x9/Roboto-Bold.ttf b/Package/Environment/Common/layouts/Mamed 16x9/Roboto-Bold.ttf
deleted file mode 100644
index aaf374d..0000000
Binary files a/Package/Environment/Common/layouts/Mamed 16x9/Roboto-Bold.ttf and /dev/null differ
diff --git a/Package/Environment/Common/layouts/Mamed 16x9/bkgnd.png b/Package/Environment/Common/layouts/Mamed 16x9/bkgnd.png
deleted file mode 100644
index 0f16b88..0000000
Binary files a/Package/Environment/Common/layouts/Mamed 16x9/bkgnd.png and /dev/null differ
diff --git a/Package/Environment/Common/layouts/Mamed 16x9/highlight.wav b/Package/Environment/Common/layouts/Mamed 16x9/highlight.wav
deleted file mode 100644
index 517e819..0000000
Binary files a/Package/Environment/Common/layouts/Mamed 16x9/highlight.wav and /dev/null differ
diff --git a/Package/Environment/Common/layouts/Mamed 16x9/layout.xml b/Package/Environment/Common/layouts/Mamed 16x9/layout.xml
deleted file mode 100644
index dd46163..0000000
--- a/Package/Environment/Common/layouts/Mamed 16x9/layout.xml	
+++ /dev/null
@@ -1,149 +0,0 @@
-<layout width="1920" height="1080" font="mamedfont.ttf" loadFontSize="64" fontColor="dedede">
-
-
-  <!-- Sounds -->
-
-  <sound type="load" src="load.wav" />
-  <sound type="unload" src="unload.wav" />
-  <sound type="highlight" src="highlight.wav" />
-  <sound type="select" src="select.wav" />
-
-
-
-  <!-- Background image -->
-
-  <image src="mamedbg.jpg" x="0" y="0" height="stretch" width="stretch" layer="0"/>
-
-
-
-  <!--Menu structure-->
-
-  <menu orientation="vertical" scrollTime=".24" scrollAcceleration=".04" algorithm="easeincircular" x="0" y="775" width="1920" height="220">
-    <itemDefaults x="center" height="32" xOrigin="960" width="400" maxWidth="1700" fontSize="32" alpha="0.5" layer="1">
-      <onMenuExit>
-        <set duration=".1">
-          <animate type="alpha" from="0.5" to="0" algorithm="easeincircular"/>
-        </set>
-      </onMenuExit>
-      <onMenuEnter>
-        <set duration=".1">
-           <animate type="alpha" from="0" to="0.5" algorithm="easeincircular"/>
-        </set>
-      </onMenuEnter>
-    </itemDefaults>
-    <item index="start" spacing="0" alpha="0" height="0"/>
-    <item index="end" spacing="0" alpha="0" height="0"/>
-    <item index="3" spacing="2" height="48" fontSize="48" alpha="1" selected="true">
-      <onMenuExit>
-        <set duration=".1">
-           <animate type="alpha" from="1" to="0" algorithm="easeincircular"/>
-        </set>
-      </onMenuExit>
-      <onMenuEnter>
-        <set duration=".1">
-           <animate type="alpha" from="0" to="1" algorithm="easeincircular"/>
-        </set>
-      </onMenuEnter>
-    </item>
-  </menu>
-
-
-  <!-- Reloadable items -->
-
-  <reloadableVideo imageType="screenshot"       x="597"  y="520" xOrigin="center" yOrigin="center" maxHeight="360" width="800" layer="2">
-    <onMenuExit menuIndex="0">
-      <set duration=".3">
-        <animate type="x"     from="597" to="797"/>
-        <animate type="width" from="800" to="400"/>
-      </set>
-    </onMenuExit>
-    <onMenuExit menuIndex="1">
-      <set duration=".3">
-        <animate type="x"     from="797" to="597"/>
-        <animate type="width" from="400" to="800"/>
-      </set>
-    </onMenuExit>
-    <onHighlightEnter>
-      <set duration=".3">
-        <animate type="alpha" from="0" to="1" algorithm="easeinquadratic"/>
-      </set>
-    </onHighlightEnter>
-    <onHighlightExit>
-      <set duration=".3">
-        <animate type="alpha" from="1" to="0" algorithm="easeinquadratic"/>
-      </set>
-    </onHighlightExit>
-  </reloadableVideo>
-
-
-  <reloadableImage type="screentitle"             x="397"  y="520" xOrigin="center" yOrigin="center" height="360"    maxWidth="400" layer="2">
-    <onMenuEnter menuIndex="1">
-      <set duration=".1">
-        <animate type="alpha" from="0" to="1" algorithm="easeinquadratic"/>
-      </set>
-    </onMenuEnter>
-    <onMenuExit menuIndex="1">
-      <set duration=".1">
-        <animate type="alpha" from="1" to="0" algorithm="easeinquadratic"/>
-      </set>
-    </onMenuExit>
-    <onHighlightEnter menuIndex="1">
-      <set duration=".3">
-        <animate type="alpha" from="0" to="1" algorithm="easeinquadratic"/>
-      </set>
-    </onHighlightEnter>
-    <onHighlightExit menuIndex="1">
-      <set duration=".3">
-        <animate type="alpha" from="1" to="0" algorithm="easeinquadratic"/>
-      </set>
-    </onHighlightExit>
-  </reloadableImage>
-
-
-  <reloadableImage type="device"                x="1473" y="590" xOrigin="center" yOrigin="bottom" height="480"    maxWidth="650" layer="3">
-    <onHighlightEnter menuIndex="0">
-      <set duration=".3">
-        <animate type="alpha" from="0" to="1" algorithm="easeinquadratic"/>
-      </set>
-    </onHighlightEnter>
-    <onHighlightExit menuIndex="0">
-      <set duration=".3">
-        <animate type="alpha" from="1" to="0" algorithm="easeinquadratic"/>
-      </set>
-    </onHighlightExit>
-  </reloadableImage>
-  <reloadableImage type="device" mode="system"  x="1473" y="590" xOrigin="center" yOrigin="bottom" height="480"    maxWidth="650" layer="3"/>
-
-
-  <reloadableImage type="logo"                  x="1473" y="100" xOrigin="center" yOrigin="top"    height="170"    maxWidth="650" layer="4">
-    <onHighlightEnter>
-      <set duration=".3">
-        <animate type="alpha" from="0" to="1" algorithm="easeinquadratic"/>
-      </set>
-    </onHighlightEnter>
-    <onHighlightExit>
-      <set duration=".3">
-        <animate type="alpha" from="1" to="0" algorithm="easeinquadratic"/>
-      </set>
-    </onHighlightExit>
-  </reloadableImage>
-  <reloadableImage type="logo"                  x="597"  y="350" xOrigin="center" yOrigin="bottom" height="60" maxWidth="200" layer="4" alpha="0">
-    <onIdle>
-      <set duration="1">
-        <animate type="alpha" from="0" to="1" algorithm="easeinquadratic"/>
-      </set>
-      <set duration="1">
-        <animate type="alpha" from="1" to="0" algorithm="easeinquadratic"/>
-      </set>
-    </onIdle>
-  </reloadableImage>
-
-
-  <reloadableText type="year"                   x="1220" y="712" xOrigin="center" fontSize="40"   maxWidth="200" layer="6"/>
-
-  <reloadableText type="manufacturer"           x="1800" y="712" xOrigin="right"  fontSize="40"   maxWidth="500" layer="6"/>
-
-  <reloadableText type="genre"                  x="1520" y="656" xOrigin="center" fontSize="40"   maxWidth="550" layer="6"/>
-
-
-</layout>
diff --git a/Package/Environment/Common/layouts/Mamed 16x9/load.wav b/Package/Environment/Common/layouts/Mamed 16x9/load.wav
deleted file mode 100644
index 077480e..0000000
Binary files a/Package/Environment/Common/layouts/Mamed 16x9/load.wav and /dev/null differ
diff --git a/Package/Environment/Common/layouts/Mamed 16x9/logo.png b/Package/Environment/Common/layouts/Mamed 16x9/logo.png
deleted file mode 100644
index 5e7d0f4..0000000
Binary files a/Package/Environment/Common/layouts/Mamed 16x9/logo.png and /dev/null differ
diff --git a/Package/Environment/Common/layouts/Mamed 16x9/mamedbg.jpg b/Package/Environment/Common/layouts/Mamed 16x9/mamedbg.jpg
deleted file mode 100644
index 86d4d6c..0000000
Binary files a/Package/Environment/Common/layouts/Mamed 16x9/mamedbg.jpg and /dev/null differ
diff --git a/Package/Environment/Common/layouts/Mamed 16x9/mamedfont.ttf b/Package/Environment/Common/layouts/Mamed 16x9/mamedfont.ttf
deleted file mode 100644
index 55559c9..0000000
Binary files a/Package/Environment/Common/layouts/Mamed 16x9/mamedfont.ttf and /dev/null differ
diff --git a/Package/Environment/Common/layouts/Mamed 16x9/select.wav b/Package/Environment/Common/layouts/Mamed 16x9/select.wav
deleted file mode 100644
index 6678b93..0000000
Binary files a/Package/Environment/Common/layouts/Mamed 16x9/select.wav and /dev/null differ
diff --git a/Package/Environment/Common/layouts/Mamed 16x9/splash.xml b/Package/Environment/Common/layouts/Mamed 16x9/splash.xml
deleted file mode 100644
index 5f777f0..0000000
--- a/Package/Environment/Common/layouts/Mamed 16x9/splash.xml	
+++ /dev/null
@@ -1,38 +0,0 @@
-<layout width="1920" height="1080" font="Roboto-Bold.ttf" loadFontSize="32" fontColor="dedede" minShowTime="2">
-   
-<!--backgroundImage-->
-  <image src="bkgnd.png" x="0" y="0" height="stretch" width="stretch" layer="0"/>
-
-   <!-- logo -->
-   <image src="logo.png" x="center" y="center" height="400" xOrigin="center" yOrigin="center" layer="1" alpha="1"/>
-   
-   <text value="Loading..." x="0" y="bottom" xOffset="20" yOrigin="center" yOffset="-220" height="150" width="stretch" fontSize="48" layer="3">
-      <onEnter>
-         <set duration=".2">
-            <animate type="alpha" from="0" to="1" algorithm="easeinquadratic"/>
-         </set>
-      </onEnter>
-      <onIdle>
-         <set duration=".2">
-            <animate type="alpha" from="1" to=".5" algorithm="easeinquadratic"/>
-         </set>
-         <set duration=".2">
-            <animate type="alpha" from=".5" to="1" algorithm="easeinquadratic"/>
-         </set>
-      </onIdle>
-     <onExit>
-         <set duration=".2">
-            <animate type="alpha" from="1" to="0" algorithm="easeinquadratic"/>
-         </set>
-      </onExit>
-   </text>
-    
-   <!-- Text shown when creating meta.db. This will only show once unless meta.db does not exsist -->
-   <statusText x="0" y="bottom" xOffset="20" yOrigin="center" yOffset="-175" height="150" width="stretch" fontSize="25" layer="3" />
-   <image src="splashloadbk.png" x="center" y="center" xOrigin="center" yOrigin="center" yOffset="334" layer="1" alpha="1"/>   
-
- </layout>
-
-
-
-
diff --git a/Package/Environment/Common/layouts/Mamed 16x9/unload.wav b/Package/Environment/Common/layouts/Mamed 16x9/unload.wav
deleted file mode 100644
index 65f069a..0000000
Binary files a/Package/Environment/Common/layouts/Mamed 16x9/unload.wav and /dev/null differ
diff --git a/Package/Environment/Common/layouts/Mamed 2015 16x9/Roboto-Bold.ttf b/Package/Environment/Common/layouts/Mamed 2015 16x9/Roboto-Bold.ttf
deleted file mode 100644
index aaf374d..0000000
Binary files a/Package/Environment/Common/layouts/Mamed 2015 16x9/Roboto-Bold.ttf and /dev/null differ
diff --git a/Package/Environment/Common/layouts/Mamed 2015 16x9/bkgnd.png b/Package/Environment/Common/layouts/Mamed 2015 16x9/bkgnd.png
deleted file mode 100644
index 0f16b88..0000000
Binary files a/Package/Environment/Common/layouts/Mamed 2015 16x9/bkgnd.png and /dev/null differ
diff --git a/Package/Environment/Common/layouts/Mamed 2015 16x9/highlight.wav b/Package/Environment/Common/layouts/Mamed 2015 16x9/highlight.wav
deleted file mode 100644
index 517e819..0000000
Binary files a/Package/Environment/Common/layouts/Mamed 2015 16x9/highlight.wav and /dev/null differ
diff --git a/Package/Environment/Common/layouts/Mamed 2015 16x9/layout.xml b/Package/Environment/Common/layouts/Mamed 2015 16x9/layout.xml
deleted file mode 100644
index 4ca289b..0000000
--- a/Package/Environment/Common/layouts/Mamed 2015 16x9/layout.xml	
+++ /dev/null
@@ -1,163 +0,0 @@
-<layout width="1920" height="1080" font="mamedfont.ttf" loadFontSize="64" fontColor="dedede">
-
-
-  <!-- Sounds -->
-
-  <sound type="load" src="load.wav" />
-  <sound type="unload" src="unload.wav" />
-  <sound type="highlight" src="highlight.wav" />
-  <sound type="select" src="select.wav" />
-
-
-
-  <!-- Background image -->
-
-  <image src="mamedbg.png" x="0" y="0" height="stretch" width="stretch" layer="0"/>
-
-
-
-  <!--Menu structure-->
-
-  <menu orientation="vertical" scrollTime=".24" scrollAcceleration=".04" algorithm="easeincircular" x="0"
-  y="770" width="1920" height="220">
-    <itemDefaults x="center" height="32" xOrigin="960" width="400" maxWidth="1700"
-    fontSize="35" alpha="0.5" layer="1">
-      <onMenuExit>
-        <set duration=".1">
-          <animate type="alpha" from="0.5" to="0" algorithm="easeincircular"/>
-        </set>
-      </onMenuExit>
-      <onMenuEnter>
-        <set duration=".1">
-           <animate type="alpha" from="0" to="0.5" algorithm="easeincircular"/>
-        </set>
-      </onMenuEnter>
-    </itemDefaults>
-    <item index="start" spacing="0" alpha="0" height="0"/>
-    <item index="end" spacing="0" alpha="0" height="0"/>
-    <item index="2" spacing="6">
-      <onMenuExit>
-        <set duration=".1">
-          <animate type="alpha" from="0.5" to="0" algorithm="easeincircular"/>
-        </set>
-      </onMenuExit>
-      <onMenuEnter>
-        <set duration=".1">
-           <animate type="alpha" from="0" to="0.5" algorithm="easeincircular"/>
-        </set>
-      </onMenuEnter>
-    </item>
-    <item index="3" spacing="4" height="48" fontSize="48" alpha="1" selected="true">
-      <onMenuExit>
-        <set duration=".1">
-           <animate type="alpha" from="1" to="0" algorithm="easeincircular"/>
-        </set>
-      </onMenuExit>
-      <onMenuEnter>
-        <set duration=".1">
-           <animate type="alpha" from="0" to="1" algorithm="easeincircular"/>
-        </set>
-      </onMenuEnter>
-    </item>
-  </menu>
-
-
-  <!-- Reloadable items -->
-
-  <reloadableVideo imageType="screenshot"       x="597"  y="520" xOrigin="center" yOrigin="center" maxHeight="360" width="800" layer="2">
-    <onMenuExit menuIndex="0">
-      <set duration=".3">
-        <animate type="x"     from="597" to="797"/>
-        <animate type="width" from="800" to="400"/>
-      </set>
-    </onMenuExit>
-    <onMenuExit menuIndex="1">
-      <set duration=".3">
-        <animate type="x"     from="797" to="597"/>
-        <animate type="width" from="400" to="800"/>
-      </set>
-    </onMenuExit>
-    <onHighlightEnter>
-      <set duration=".3">
-        <animate type="alpha" from="0" to="1" algorithm="easeinquadratic"/>
-      </set>
-    </onHighlightEnter>
-    <onHighlightExit>
-      <set duration=".3">
-        <animate type="alpha" from="1" to="0" algorithm="easeinquadratic"/>
-      </set>
-    </onHighlightExit>
-  </reloadableVideo>
-
-
-  <reloadableImage type="screentitle"             x="397"  y="520" xOrigin="center" yOrigin="center" height="360"    maxWidth="400" layer="2">
-    <onMenuEnter menuIndex="1">
-      <set duration=".1">
-        <animate type="alpha" from="0" to="1" algorithm="easeinquadratic"/>
-      </set>
-    </onMenuEnter>
-    <onMenuExit menuIndex="1">
-      <set duration=".1">
-        <animate type="alpha" from="1" to="0" algorithm="easeinquadratic"/>
-      </set>
-    </onMenuExit>
-    <onHighlightEnter menuIndex="1">
-      <set duration=".3">
-        <animate type="alpha" from="0" to="1" algorithm="easeinquadratic"/>
-      </set>
-    </onHighlightEnter>
-    <onHighlightExit menuIndex="1">
-      <set duration=".3">
-        <animate type="alpha" from="1" to="0" algorithm="easeinquadratic"/>
-      </set>
-    </onHighlightExit>
-  </reloadableImage>
-
-
-  <reloadableImage type="device"                x="1491" y="565" xOrigin="center" yOrigin="bottom" height="465"    maxWidth="635" layer="3">
-    <onHighlightEnter menuIndex="0">
-      <set duration=".3">
-        <animate type="alpha" from="0" to="1" algorithm="easeinquadratic"/>
-      </set>
-    </onHighlightEnter>
-    <onHighlightExit menuIndex="0">
-      <set duration=".3">
-        <animate type="alpha" from="1" to="0" algorithm="easeinquadratic"/>
-      </set>
-    </onHighlightExit>
-  </reloadableImage>
-  <reloadableImage type="device" mode="system"  x="1491" y="565" xOrigin="center" yOrigin="bottom" height="465"    maxWidth="635" layer="3"/>
-
-
-  <reloadableImage type="logo"                  x="1491" y="100" xOrigin="center" yOrigin="top"    height="170"    maxWidth="635" layer="4">
-    <onHighlightEnter>
-      <set duration=".3">
-        <animate type="alpha" from="0" to="1" algorithm="easeinquadratic"/>
-      </set>
-    </onHighlightEnter>
-    <onHighlightExit>
-      <set duration=".3">
-        <animate type="alpha" from="1" to="0" algorithm="easeinquadratic"/>
-      </set>
-    </onHighlightExit>
-  </reloadableImage>
-  <reloadableImage type="logo"                  x="597"  y="350" xOrigin="center" yOrigin="bottom" height="70"     maxWidth="200" layer="4" alpha="0">
-    <onIdle>
-      <set duration="1">
-        <animate type="alpha" from="0" to="1" algorithm="easeinquadratic"/>
-      </set>
-      <set duration="1">
-        <animate type="alpha" from="1" to="0" algorithm="easeinquadratic"/>
-      </set>
-    </onIdle>
-  </reloadableImage>
-
-
-  <reloadableText type="year"                   x="1225" y="705" xOrigin="center" fontSize="40"   maxWidth="200" layer="6"/>
-
-  <reloadableText type="manufacturer"           x="1800" y="705" xOrigin="right"  fontSize="40"   maxWidth="500" layer="6"/>
-
-  <reloadableText type="genre"                  x="1520" y="645" xOrigin="center" fontSize="40"   maxWidth="550" layer="6"/>
-
-
-</layout>
diff --git a/Package/Environment/Common/layouts/Mamed 2015 16x9/load.wav b/Package/Environment/Common/layouts/Mamed 2015 16x9/load.wav
deleted file mode 100644
index 077480e..0000000
Binary files a/Package/Environment/Common/layouts/Mamed 2015 16x9/load.wav and /dev/null differ
diff --git a/Package/Environment/Common/layouts/Mamed 2015 16x9/logo.png b/Package/Environment/Common/layouts/Mamed 2015 16x9/logo.png
deleted file mode 100644
index 5e7d0f4..0000000
Binary files a/Package/Environment/Common/layouts/Mamed 2015 16x9/logo.png and /dev/null differ
diff --git a/Package/Environment/Common/layouts/Mamed 2015 16x9/mamedbg.png b/Package/Environment/Common/layouts/Mamed 2015 16x9/mamedbg.png
deleted file mode 100644
index 6587ca6..0000000
Binary files a/Package/Environment/Common/layouts/Mamed 2015 16x9/mamedbg.png and /dev/null differ
diff --git a/Package/Environment/Common/layouts/Mamed 2015 16x9/mamedfont.ttf b/Package/Environment/Common/layouts/Mamed 2015 16x9/mamedfont.ttf
deleted file mode 100644
index 55559c9..0000000
Binary files a/Package/Environment/Common/layouts/Mamed 2015 16x9/mamedfont.ttf and /dev/null differ
diff --git a/Package/Environment/Common/layouts/Mamed 2015 16x9/select.wav b/Package/Environment/Common/layouts/Mamed 2015 16x9/select.wav
deleted file mode 100644
index 6678b93..0000000
Binary files a/Package/Environment/Common/layouts/Mamed 2015 16x9/select.wav and /dev/null differ
diff --git a/Package/Environment/Common/layouts/Mamed 2015 16x9/splash.xml b/Package/Environment/Common/layouts/Mamed 2015 16x9/splash.xml
deleted file mode 100644
index 5f777f0..0000000
--- a/Package/Environment/Common/layouts/Mamed 2015 16x9/splash.xml	
+++ /dev/null
@@ -1,38 +0,0 @@
-<layout width="1920" height="1080" font="Roboto-Bold.ttf" loadFontSize="32" fontColor="dedede" minShowTime="2">
-   
-<!--backgroundImage-->
-  <image src="bkgnd.png" x="0" y="0" height="stretch" width="stretch" layer="0"/>
-
-   <!-- logo -->
-   <image src="logo.png" x="center" y="center" height="400" xOrigin="center" yOrigin="center" layer="1" alpha="1"/>
-   
-   <text value="Loading..." x="0" y="bottom" xOffset="20" yOrigin="center" yOffset="-220" height="150" width="stretch" fontSize="48" layer="3">
-      <onEnter>
-         <set duration=".2">
-            <animate type="alpha" from="0" to="1" algorithm="easeinquadratic"/>
-         </set>
-      </onEnter>
-      <onIdle>
-         <set duration=".2">
-            <animate type="alpha" from="1" to=".5" algorithm="easeinquadratic"/>
-         </set>
-         <set duration=".2">
-            <animate type="alpha" from=".5" to="1" algorithm="easeinquadratic"/>
-         </set>
-      </onIdle>
-     <onExit>
-         <set duration=".2">
-            <animate type="alpha" from="1" to="0" algorithm="easeinquadratic"/>
-         </set>
-      </onExit>
-   </text>
-    
-   <!-- Text shown when creating meta.db. This will only show once unless meta.db does not exsist -->
-   <statusText x="0" y="bottom" xOffset="20" yOrigin="center" yOffset="-175" height="150" width="stretch" fontSize="25" layer="3" />
-   <image src="splashloadbk.png" x="center" y="center" xOrigin="center" yOrigin="center" yOffset="334" layer="1" alpha="1"/>   
-
- </layout>
-
-
-
-
diff --git a/Package/Environment/Common/layouts/Mamed 2015 16x9/unload.wav b/Package/Environment/Common/layouts/Mamed 2015 16x9/unload.wav
deleted file mode 100644
index 65f069a..0000000
Binary files a/Package/Environment/Common/layouts/Mamed 2015 16x9/unload.wav and /dev/null differ
diff --git a/Package/Environment/Common/layouts/Mamed 4x3/Roboto-Bold.ttf b/Package/Environment/Common/layouts/Mamed 4x3/Roboto-Bold.ttf
deleted file mode 100644
index aaf374d..0000000
Binary files a/Package/Environment/Common/layouts/Mamed 4x3/Roboto-Bold.ttf and /dev/null differ
diff --git a/Package/Environment/Common/layouts/Mamed 4x3/bkgnd.png b/Package/Environment/Common/layouts/Mamed 4x3/bkgnd.png
deleted file mode 100644
index 0f16b88..0000000
Binary files a/Package/Environment/Common/layouts/Mamed 4x3/bkgnd.png and /dev/null differ
diff --git a/Package/Environment/Common/layouts/Mamed 4x3/highlight.wav b/Package/Environment/Common/layouts/Mamed 4x3/highlight.wav
deleted file mode 100644
index 517e819..0000000
Binary files a/Package/Environment/Common/layouts/Mamed 4x3/highlight.wav and /dev/null differ
diff --git a/Package/Environment/Common/layouts/Mamed 4x3/layout.xml b/Package/Environment/Common/layouts/Mamed 4x3/layout.xml
deleted file mode 100644
index 76e4adc..0000000
--- a/Package/Environment/Common/layouts/Mamed 4x3/layout.xml	
+++ /dev/null
@@ -1,109 +0,0 @@
-<layout width="1600" height="1200" font="mamedfont.ttf" loadFontSize="64" fontColor="dedede">
-
-
-  <!-- Sounds -->
-
-  <sound type="load" src="load.wav" />
-  <sound type="unload" src="unload.wav" />
-  <sound type="highlight" src="highlight.wav" />
-  <sound type="select" src="select.wav" />
-
-
-  <!-- Background image -->
-
-  <image src="mamedbg.jpg" x="0" y="0" height="stretch" width="stretch" layer="0"/>
-
-
-  <!--Menu structure-->
-
-  <menu orientation="vertical" scrollTime=".24" scrollAcceleration=".04" algorithm="easeincircular" x="0" y="862" width="1600" height="245">
-    <itemDefaults x="center" height="35" xOrigin="800" width="333" maxWidth="1418" fontSize="35" alpha="0.5" layer="1">
-      <onMenuExit>
-        <set duration=".3">
-          <animate type="alpha" from="0.5" to="0" algorithm="easeincircular"/>
-        </set>
-      </onMenuExit>
-      <onMenuEnter>
-        <set duration=".3">
-           <animate type="alpha" from="0" to="0.5" algorithm="easeincircular"/>
-        </set>
-      </onMenuEnter>
-    </itemDefaults>
-    <item index="start" spacing="0" alpha="0" height="0"/>
-    <item index="end" spacing="0" alpha="0" height="0"/>
-    <item index="3" spacing="2" height="53" fontSize="53" alpha="1" selected="true">
-      <onMenuExit>
-        <set duration=".3">
-           <animate type="alpha" from="1" to="0" algorithm="easeincircular"/>
-        </set>
-      </onMenuExit>
-      <onMenuEnter>
-        <set duration=".3">
-           <animate type="alpha" from="0" to="1" algorithm="easeincircular"/>
-        </set>
-      </onMenuEnter>
-    </item>
-  </menu>
-
-
-  <!-- Reloadable items -->
-
-  <reloadableVideo imageType="screenshot"      x="498"  y="580" xOrigin="center" yOrigin="center" height="395"    maxWidth="667" layer="2">
-    <onHighlightEnter>
-      <set duration=".3">
-        <animate type="alpha" from="0" to="1" algorithm="easeinquadratic"/>
-      </set>
-    </onHighlightEnter>
-    <onHighlightExit>
-      <set duration=".3">
-        <animate type="alpha" from="1" to="0" algorithm="easeinquadratic"/>
-      </set>
-    </onHighlightExit>
-  </reloadableVideo>
-
-  <reloadableImage type="device"               x="1227" y="655" xOrigin="center" yOrigin="bottom" height="540"    maxWidth="535" layer="3">
-    <onHighlightEnter menuIndex="0">
-      <set duration=".3">
-        <animate type="alpha" from="0" to="1" algorithm="easeinquadratic"/>
-      </set>
-    </onHighlightEnter>
-    <onHighlightExit menuIndex="0">
-      <set duration=".3">
-        <animate type="alpha" from="1" to="0" algorithm="easeinquadratic"/>
-      </set>
-    </onHighlightExit>
-  </reloadableImage>
-  <reloadableImage type="device" mode="system" x="1227" y="655" xOrigin="center" yOrigin="bottom" height="540"    maxWidth="535" layer="3"/>
-
-
-  <reloadableImage type="logo"                 x="1227" y="120" xOrigin="center" yOrigin="top" height="170"   maxWidth="535" layer="4">
-    <onHighlightEnter>
-      <set duration=".3">
-        <animate type="alpha" from="0" to="1" algorithm="easeinquadratic"/>
-      </set>
-    </onHighlightEnter>
-    <onHighlightExit>
-      <set duration=".3">
-        <animate type="alpha" from="1" to="0" algorithm="easeinquadratic"/>
-      </set>
-    </onHighlightExit>
-  </reloadableImage>
-  <reloadableImage type="logo"                 x="498"  y="390" xOrigin="center" yOrigin="bottom" height="60"    maxWidth="300" layer="4" alpha="0">
-    <onIdle>
-      <set duration="1">
-        <animate type="alpha" from="0" to="1" algorithm="easeinquadratic"/>
-      </set>
-      <set duration="1">
-        <animate type="alpha" from="1" to="0" algorithm="easeinquadratic"/>
-      </set>
-    </onIdle>
-  </reloadableImage>
-
-  <reloadableText type="year"                  x="1020" y="790" xOrigin="center" fontSize="48"   maxWidth="168" layer="6"/>
-
-  <reloadableText type="manufacturer"          x="1500" y="790" xOrigin="right"  fontSize="48"   maxWidth="350" layer="6"/>
-
-  <reloadableText type="genre"                 x="1258" y="730" xOrigin="center" fontSize="48"   maxWidth="400" layer="6"/>
-
-
-</layout>
diff --git a/Package/Environment/Common/layouts/Mamed 4x3/load.wav b/Package/Environment/Common/layouts/Mamed 4x3/load.wav
deleted file mode 100644
index 077480e..0000000
Binary files a/Package/Environment/Common/layouts/Mamed 4x3/load.wav and /dev/null differ
diff --git a/Package/Environment/Common/layouts/Mamed 4x3/logo.png b/Package/Environment/Common/layouts/Mamed 4x3/logo.png
deleted file mode 100644
index 5e7d0f4..0000000
Binary files a/Package/Environment/Common/layouts/Mamed 4x3/logo.png and /dev/null differ
diff --git a/Package/Environment/Common/layouts/Mamed 4x3/mamedbg.jpg b/Package/Environment/Common/layouts/Mamed 4x3/mamedbg.jpg
deleted file mode 100644
index 51bd984..0000000
Binary files a/Package/Environment/Common/layouts/Mamed 4x3/mamedbg.jpg and /dev/null differ
diff --git a/Package/Environment/Common/layouts/Mamed 4x3/mamedfont.ttf b/Package/Environment/Common/layouts/Mamed 4x3/mamedfont.ttf
deleted file mode 100644
index 55559c9..0000000
Binary files a/Package/Environment/Common/layouts/Mamed 4x3/mamedfont.ttf and /dev/null differ
diff --git a/Package/Environment/Common/layouts/Mamed 4x3/select.wav b/Package/Environment/Common/layouts/Mamed 4x3/select.wav
deleted file mode 100644
index 6678b93..0000000
Binary files a/Package/Environment/Common/layouts/Mamed 4x3/select.wav and /dev/null differ
diff --git a/Package/Environment/Common/layouts/Mamed 4x3/splash.xml b/Package/Environment/Common/layouts/Mamed 4x3/splash.xml
deleted file mode 100644
index 5f777f0..0000000
--- a/Package/Environment/Common/layouts/Mamed 4x3/splash.xml	
+++ /dev/null
@@ -1,38 +0,0 @@
-<layout width="1920" height="1080" font="Roboto-Bold.ttf" loadFontSize="32" fontColor="dedede" minShowTime="2">
-   
-<!--backgroundImage-->
-  <image src="bkgnd.png" x="0" y="0" height="stretch" width="stretch" layer="0"/>
-
-   <!-- logo -->
-   <image src="logo.png" x="center" y="center" height="400" xOrigin="center" yOrigin="center" layer="1" alpha="1"/>
-   
-   <text value="Loading..." x="0" y="bottom" xOffset="20" yOrigin="center" yOffset="-220" height="150" width="stretch" fontSize="48" layer="3">
-      <onEnter>
-         <set duration=".2">
-            <animate type="alpha" from="0" to="1" algorithm="easeinquadratic"/>
-         </set>
-      </onEnter>
-      <onIdle>
-         <set duration=".2">
-            <animate type="alpha" from="1" to=".5" algorithm="easeinquadratic"/>
-         </set>
-         <set duration=".2">
-            <animate type="alpha" from=".5" to="1" algorithm="easeinquadratic"/>
-         </set>
-      </onIdle>
-     <onExit>
-         <set duration=".2">
-            <animate type="alpha" from="1" to="0" algorithm="easeinquadratic"/>
-         </set>
-      </onExit>
-   </text>
-    
-   <!-- Text shown when creating meta.db. This will only show once unless meta.db does not exsist -->
-   <statusText x="0" y="bottom" xOffset="20" yOrigin="center" yOffset="-175" height="150" width="stretch" fontSize="25" layer="3" />
-   <image src="splashloadbk.png" x="center" y="center" xOrigin="center" yOrigin="center" yOffset="334" layer="1" alpha="1"/>   
-
- </layout>
-
-
-
-
diff --git a/Package/Environment/Common/layouts/Mamed 4x3/unload.wav b/Package/Environment/Common/layouts/Mamed 4x3/unload.wav
deleted file mode 100644
index 65f069a..0000000
Binary files a/Package/Environment/Common/layouts/Mamed 4x3/unload.wav and /dev/null differ
diff --git a/Package/Environment/Common/layouts/Pandora's Box 16x9/Roboto-Bold.ttf b/Package/Environment/Common/layouts/Pandora's Box 16x9/Roboto-Bold.ttf
deleted file mode 100644
index aaf374d..0000000
Binary files a/Package/Environment/Common/layouts/Pandora's Box 16x9/Roboto-Bold.ttf and /dev/null differ
diff --git a/Package/Environment/Common/layouts/Pandora's Box 16x9/attribution.txt b/Package/Environment/Common/layouts/Pandora's Box 16x9/attribution.txt
deleted file mode 100644
index 7a1afcd..0000000
--- a/Package/Environment/Common/layouts/Pandora's Box 16x9/attribution.txt	
+++ /dev/null
@@ -1,4 +0,0 @@
-The background image was taken from
-https://commons.wikimedia.org/wiki/File:Flame_of_fire.jpg, and is licensed
-under the Creative Commons Attribution-Share Alike 2.5 Generic, 2.0 Generic
-and 1.0 Generic license.
diff --git a/Package/Environment/Common/layouts/Pandora's Box 16x9/bg.jpg b/Package/Environment/Common/layouts/Pandora's Box 16x9/bg.jpg
deleted file mode 100644
index 80103f7..0000000
Binary files a/Package/Environment/Common/layouts/Pandora's Box 16x9/bg.jpg and /dev/null differ
diff --git a/Package/Environment/Common/layouts/Pandora's Box 16x9/bkgnd.png b/Package/Environment/Common/layouts/Pandora's Box 16x9/bkgnd.png
deleted file mode 100644
index 0f16b88..0000000
Binary files a/Package/Environment/Common/layouts/Pandora's Box 16x9/bkgnd.png and /dev/null differ
diff --git a/Package/Environment/Common/layouts/Pandora's Box 16x9/black.png b/Package/Environment/Common/layouts/Pandora's Box 16x9/black.png
deleted file mode 100644
index 73d0a7c..0000000
Binary files a/Package/Environment/Common/layouts/Pandora's Box 16x9/black.png and /dev/null differ
diff --git a/Package/Environment/Common/layouts/Pandora's Box 16x9/bottomborder.png b/Package/Environment/Common/layouts/Pandora's Box 16x9/bottomborder.png
deleted file mode 100644
index 1735f28..0000000
Binary files a/Package/Environment/Common/layouts/Pandora's Box 16x9/bottomborder.png and /dev/null differ
diff --git a/Package/Environment/Common/layouts/Pandora's Box 16x9/highlight.wav b/Package/Environment/Common/layouts/Pandora's Box 16x9/highlight.wav
deleted file mode 100644
index 517e819..0000000
Binary files a/Package/Environment/Common/layouts/Pandora's Box 16x9/highlight.wav and /dev/null differ
diff --git a/Package/Environment/Common/layouts/Pandora's Box 16x9/layout.xml b/Package/Environment/Common/layouts/Pandora's Box 16x9/layout.xml
deleted file mode 100644
index 5ffdff1..0000000
--- a/Package/Environment/Common/layouts/Pandora's Box 16x9/layout.xml	
+++ /dev/null
@@ -1,444 +0,0 @@
-<layout width="1920" height="1080" font="Roboto-Bold.ttf" loadFontSize="64" fontColor="dedede">
-
-
-  <!--
-     - Default RetroFE sound files.
-    -->
-
-  <sound type="load" src="load.wav" />
-  <sound type="unload" src="unload.wav" />
-  <sound type="highlight" src="highlight.wav" />
-  <sound type="select" src="select.wav" />
-
-
-  <!--
-     - Flaming background, slowly pulsating using transparency.
-    -->
-
-  <image src="bg.jpg" x="0" y="0" height="stretch" width="stretch" layer="0">
-    <onIdle>
-      <set duration="2">
-        <animate type="alpha" from="1" to="0.5" algorithm="easeinquadratic"/>
-      </set>
-      <set duration="1">
-        <animate type="alpha" from="0.5" to="1" algorithm="easeinquadratic"/>
-      </set>
-    </onIdle>
-  </image>
-
-
-  <!--
-     - Main menu structure.
-     - This menu uses the device images from the system_artwork directory.
-     - The menu items are faded out when leaving this menu, and faded in
-     - when entering this menu.
-    -->
-
-  <menu type="custom" imageType="device" scrollTime=".24" scrollAcceleration=".04" orientation="horizontal" >
-    <itemDefaults x="center" y="790" xOrigin="center" yOrigin="bottom" width="200" maxHeight="500" fontSize="35" layer="5"/>
-    <item xOffset="-1150" alpha="0" algorithm="easeinquadratic"/>
-    <item xOffset="-940">
-      <onMenuEnter>
-        <set duration=".3">
-          <animate type="alpha" from="0" to="1" algorithm="easeinquadratic"/>
-        </set>
-      </onMenuEnter>
-      <onMenuExit>
-        <set duration=".3">
-          <animate type="alpha" from="1" to="0" algorithm="easeinquadratic"/>
-        </set>
-      </onMenuExit>
-    </item>
-    <item xOffset="-730">
-      <onMenuEnter>
-        <set duration=".3">
-          <animate type="alpha" from="0" to="1" algorithm="easeinquadratic"/>
-        </set>
-      </onMenuEnter>
-      <onMenuExit>
-        <set duration=".3">
-          <animate type="alpha" from="1" to="0" algorithm="easeinquadratic"/>
-        </set>
-      </onMenuExit>
-    </item>
-    <item xOffset="-520">
-      <onMenuEnter>
-        <set duration=".3">
-          <animate type="alpha" from="0" to="1" algorithm="easeinquadratic"/>
-        </set>
-      </onMenuEnter>
-      <onMenuExit>
-        <set duration=".3">
-          <animate type="alpha" from="1" to="0" algorithm="easeinquadratic"/>
-        </set>
-      </onMenuExit>
-    </item>
-    <item xOffset="-310">
-      <onMenuEnter>
-        <set duration=".3">
-          <animate type="alpha" from="0" to="1" algorithm="easeinquadratic"/>
-        </set>
-      </onMenuEnter>
-      <onMenuExit>
-        <set duration=".3">
-          <animate type="alpha" from="1" to="0" algorithm="easeinquadratic"/>
-        </set>
-      </onMenuExit>
-    </item>
-    <item selected="true" width="400" yOffset="60" layer="5">
-      <onMenuEnter>
-        <set duration=".3">
-          <animate type="alpha" from="0" to="1" algorithm="easeinquadratic"/>
-        </set>
-      </onMenuEnter>
-      <onMenuExit>
-        <set duration=".3">
-          <animate type="alpha" from="1" to="0" algorithm="easeinquadratic"/>
-        </set>
-      </onMenuExit>
-    </item>
-    <item xOffset="310">
-      <onMenuEnter>
-        <set duration=".3">
-          <animate type="alpha" from="0" to="1" algorithm="easeinquadratic"/>
-        </set>
-      </onMenuEnter>
-      <onMenuExit>
-        <set duration=".3">
-          <animate type="alpha" from="1" to="0" algorithm="easeinquadratic"/>
-        </set>
-      </onMenuExit>
-    </item>
-    <item xOffset="520">
-      <onMenuEnter>
-        <set duration=".3">
-          <animate type="alpha" from="0" to="1" algorithm="easeinquadratic"/>
-        </set>
-      </onMenuEnter>
-      <onMenuExit>
-        <set duration=".3">
-          <animate type="alpha" from="1" to="0" algorithm="easeinquadratic"/>
-        </set>
-      </onMenuExit>
-    </item>
-    <item xOffset="730">
-      <onMenuEnter>
-        <set duration=".3">
-          <animate type="alpha" from="0" to="1" algorithm="easeinquadratic"/>
-        </set>
-      </onMenuEnter>
-      <onMenuExit>
-        <set duration=".3">
-          <animate type="alpha" from="1" to="0" algorithm="easeinquadratic"/>
-        </set>
-      </onMenuExit>
-    </item>
-    <item xOffset="940">
-      <onMenuEnter>
-        <set duration=".3">
-          <animate type="alpha" from="0" to="1" algorithm="easeinquadratic"/>
-        </set>
-      </onMenuEnter>
-      <onMenuExit>
-        <set duration=".3">
-          <animate type="alpha" from="1" to="0" algorithm="easeinquadratic"/>
-        </set>
-      </onMenuExit>
-    </item>
-    <item xOffset="1150" alpha="0" algorithm="easeinquadratic"/>
-  </menu>
-
-
-  <!--
-     - Collection menu structure.
-     - This menu uses the artwork_front images from the medium_artwork directory.
-     - The menu items are faded out when leaving this menu, and faded in
-     - when entering this menu.
-     - It is left to the user which images should be used for the
-     - artwork_front for systems like MAME. Personally I use the logo's
-     - there, since the available cabinet images leave something to be
-     - desired.
-    -->
-
-  <menu type="custom" imageType="artwork_front" scrollTime=".24" scrollAcceleration=".04" orientation="horizontal">
-    <itemDefaults x="center" y="790" xOrigin="center" yOrigin="bottom" width="150" maxHeight="500" fontSize="35" layer="5"/>
-    <item xOffset="-1085" alpha="0" algorithm="easeinquadratic"/>
-    <item xOffset="-925">
-      <onMenuExit>
-        <set duration=".3">
-          <animate type="alpha" from="1" to="0" algorithm="easeinquadratic"/>
-        </set>
-      </onMenuExit>
-    </item>
-    <item xOffset="-765">
-      <onMenuExit>
-        <set duration=".3">
-          <animate type="alpha" from="1" to="0" algorithm="easeinquadratic"/>
-        </set>
-      </onMenuExit>
-    </item>
-    <item xOffset="-605">
-      <onMenuExit>
-        <set duration=".3">
-          <animate type="alpha" from="1" to="0" algorithm="easeinquadratic"/>
-        </set>
-      </onMenuExit>
-    </item>
-    <item xOffset="-445">
-      <onMenuExit>
-        <set duration=".3">
-          <animate type="alpha" from="1" to="0" algorithm="easeinquadratic"/>
-        </set>
-      </onMenuExit>
-    </item>
-    <item xOffset="-285">
-      <onMenuExit>
-        <set duration=".3">
-          <animate type="alpha" from="1" to="0" algorithm="easeinquadratic"/>
-        </set>
-      </onMenuExit>
-    </item>
-    <item selected="true" width="400" yOffset="60" layer="5">
-      <onMenuExit>
-        <set duration=".3">
-          <animate type="alpha" from="1" to="0"
-          algorithm="easeinquadratic"/>
-        </set>
-      </onMenuExit>
-    </item>
-    <item xOffset="285">
-      <onMenuExit>
-        <set duration=".3">
-          <animate type="alpha" from="1" to="0" algorithm="easeinquadratic"/>
-        </set>
-      </onMenuExit>
-    </item>
-    <item xOffset="445">
-      <onMenuExit>
-        <set duration=".3">
-          <animate type="alpha" from="1" to="0" algorithm="easeinquadratic"/>
-        </set>
-      </onMenuExit>
-    </item>
-    <item xOffset="605">
-      <onMenuExit>
-        <set duration=".3">
-          <animate type="alpha" from="1" to="0" algorithm="easeinquadratic"/>
-        </set>
-      </onMenuExit>
-    </item>
-    <item xOffset="765">
-      <onMenuExit>
-        <set duration=".3">
-          <animate type="alpha" from="1" to="0" algorithm="easeinquadratic"/>
-        </set>
-      </onMenuExit>
-    </item>
-    <item xOffset="925">
-      <onMenuExit>
-        <set duration=".3">
-          <animate type="alpha" from="1" to="0" algorithm="easeinquadratic"/>
-        </set>
-      </onMenuExit>
-    </item>
-    <item xOffset="1085" alpha="0" algorithm="easeinquadratic"/>
-  </menu>
-
-
-  <!--
-     - Video display, consisting of a black background image, a video border
-     - image by Timmyb, and a 640x480 video display with screenshots as
-     - backup in case the video is not available.
-    -->
-
-  <image src="black.png" x="400" y="300" xOrigin="center" yOrigin="center" height="480" width="640" layer="2"/>
-  <image src="videoborder.png" x="400" y="300" xOrigin="center" yOrigin="center" layer="4"/>
-  <reloadableVideo imageType="screenshot" x="400" y="300" xOrigin="center" yOrigin="center" height="480" maxWidth="640" layer="3">
-    <onHighlightEnter>
-      <set duration=".3">
-        <animate type="alpha" from="0" to="1" algorithm="easeinquadratic"/>
-      </set>
-    </onHighlightEnter>
-    <onHighlightExit>
-      <set duration=".3">
-        <animate type="alpha" from="1" to="0" algorithm="easeinquadratic"/>
-      </set>
-    </onHighlightExit>
-  </reloadableVideo>
-
-
-  <!--
-     - Logo displayed at the top of the video window.
-    -->
-
-  <reloadableImage type="logo" x="400" y="90" xOrigin="center" yOrigin="top" maxHeight="70" maxWidth="200" layer="5" alpha="0">
-    <onIdle>
-      <set duration="1">
-        <animate type="alpha" from="0" to="1" algorithm="easeinquadratic"/>
-      </set>
-      <set duration="1">
-        <animate type="alpha" from="1" to="0" algorithm="easeinquadratic"/>
-      </set>
-    </onIdle>
-  </reloadableImage>
-
-
-  <!--
-     - Large device image displayed during the main menu. When switching
-     - devices, the device image is moved off-screen to the right, and the
-     - next device image moves in from the right. When switching to the
-     - collection menu's, the device image is faded out, and the display is
-     - taken over by the system mode device image.
-    -->
-
-  <reloadableImage type="device" x="1350" y="640" xOrigin="center" yOrigin="center" maxHeight="1200" width="2000" layer="1">
-    <onHighlightEnter>
-      <set duration=".3">
-        <animate type="x" from="4000" to="1350" algorithm="easeinquadratic"/>
-      </set>
-    </onHighlightEnter>
-    <onHighlightExit>
-      <set duration=".3">
-        <animate type="x" from="1350" to="4000" algorithm="easeinquadratic"/>
-      </set>
-    </onHighlightExit>
-    <onMenuEnter menuIndex="0">
-      <set duration="0.3">
-        <animate type="alpha" from="0" to="1" algorithm="easeinquadratic"/>
-      </set>
-    </onMenuEnter>
-    <onMenuExit menuIndex="0">
-      <set duration="0.3">
-        <animate type="alpha" from="1" to="0" algorithm="easeinquadratic"/>
-      </set>
-    </onMenuExit>
-  </reloadableImage>
-
-
-  <!--
-     - Large system mode device image of the selected collection displayed
-     - during the collection menu.
-    -->
-
-  <reloadableImage type="device" mode="system" x="1350" y="640" xOrigin="center" yOrigin="center" maxHeight="1200" width="2000" layer="1"/>
-
-
-  <!--
-     - Large logo display at the top of the device image for the main menu.
-    -->
-
-  <reloadableImage type="logo" x="1350" y="50" xOrigin="center" yOrigin="top" height="250" maxWidth="1100" layer="7">
-    <onMenuExit menuIndex="0">
-      <set duration="1">
-        <animate type="alpha" from="1" to="0" algorithm="easeinquadratic"/>
-      </set>
-    </onMenuExit>
-    <onHighlightEnter menuIndex="0">
-      <set duration=".6">
-        <animate type="alpha" from="0" to="1" algorithm="easeinquadratic"/>
-      </set>
-    </onHighlightEnter>
-  </reloadableImage>
-
-
-  <!--
-     - Large logo display of the selected collection at the top of the
-     - device image for the collection menu.
-    -->
-
-  <reloadableImage type="logo" mode="system" x="1350" y="50" xOrigin="center" yOrigin="top" height="250" maxWidth="1100" layer="7"/>
-
-
-
-  <!--
-     - Bottom border image by Timmyb.
-    -->
-
-  <image src="bottomborder.png" x="0" y="1080" xOrigin="left" yOrigin="bottom" layer="3"/>
-
-
-  <!--
-     - Medium (cart/disk) displayed in the right side area of the bottom
-     - border.
-    -->
-
-  <reloadableImage type="medium_front" x="1500" y="925" xOrigin="center" yOrigin="center" maxHeight="190" width="350" layer="7">
-    <onHighlightEnter>
-      <set duration=".3">
-        <animate type="alpha" from="0" to="1" algorithm="easeinquadratic"/>
-      </set>
-    </onHighlightEnter>
-    <onHighlightExit>
-      <set duration=".3">
-        <animate type="alpha" from="1" to="0" algorithm="easeinquadratic"/>
-      </set>
-    </onHighlightExit>
-  </reloadableImage>
-
-
-  <!--
-     - Displaying year, genre, and manufacturer in the left side area of the
-     - bottom border.
-    -->
-
-  <text value="Year:" x="300" y="850" xOrigin="right" yOrigin="top" fontSize="48" layer="7"/>
-  <text value="Genre:" x="300" y="900" xOrigin="right" yOrigin="top" fontSize="48" layer="7"/>
-  <text value="Manufacturer:" x="300" y="950" xOrigin="right" yOrigin="top" fontSize="48" layer="7"/>
-
-  <reloadableText type="year" x="310" y="850" xOrigin="left" yOrigin="top" fontSize="48" maxWidth="300" layer="7">
-    <onHighlightEnter>
-      <set duration=".3">
-        <animate type="alpha" from="0" to="1" algorithm="easeinquadratic"/>
-      </set>
-    </onHighlightEnter>
-    <onHighlightExit>
-      <set duration=".3">
-        <animate type="alpha" from="1" to="0" algorithm="easeinquadratic"/>
-      </set>
-    </onHighlightExit>
-  </reloadableText>
-  <reloadableText type="genre" x="310" y="900" xOrigin="left" yOrigin="top" fontSize="48" maxWidth="300" layer="7">
-    <onHighlightEnter>
-      <set duration=".3">
-        <animate type="alpha" from="0" to="1" algorithm="easeinquadratic"/>
-      </set>
-    </onHighlightEnter>
-    <onHighlightExit>
-      <set duration=".3">
-        <animate type="alpha" from="1" to="0" algorithm="easeinquadratic"/>
-      </set>
-    </onHighlightExit>
-  </reloadableText>
-  <reloadableText type="manufacturer" x="310" y="950" xOrigin="left" yOrigin="top" fontSize="48" maxWidth="300" layer="7">
-    <onHighlightEnter>
-      <set duration=".3">
-        <animate type="alpha" from="0" to="1" algorithm="easeinquadratic"/>
-      </set>
-    </onHighlightEnter>
-    <onHighlightExit>
-      <set duration=".3">
-        <animate type="alpha" from="1" to="0" algorithm="easeinquadratic"/>
-      </set>
-    </onHighlightExit>
-  </reloadableText>
-
-
-  <!--
-     - System/Game title display in the center area of the bottom border.
-    -->
-
-  <reloadableText type="title" x="960" y="910" xOrigin="center" yOrigin="center" fontSize="36" maxWidth="600" layer="7">
-    <onHighlightEnter>
-      <set duration=".3">
-        <animate type="alpha" from="0" to="1" algorithm="easeinquadratic"/>
-      </set>
-    </onHighlightEnter>
-    <onHighlightExit>
-      <set duration=".3">
-        <animate type="alpha" from="1" to="0" algorithm="easeinquadratic"/>
-      </set>
-    </onHighlightExit>
-  </reloadableText>
-
-
-</layout>
diff --git a/Package/Environment/Common/layouts/Pandora's Box 16x9/load.wav b/Package/Environment/Common/layouts/Pandora's Box 16x9/load.wav
deleted file mode 100644
index 077480e..0000000
Binary files a/Package/Environment/Common/layouts/Pandora's Box 16x9/load.wav and /dev/null differ
diff --git a/Package/Environment/Common/layouts/Pandora's Box 16x9/logo.png b/Package/Environment/Common/layouts/Pandora's Box 16x9/logo.png
deleted file mode 100644
index 5e7d0f4..0000000
Binary files a/Package/Environment/Common/layouts/Pandora's Box 16x9/logo.png and /dev/null differ
diff --git a/Package/Environment/Common/layouts/Pandora's Box 16x9/select.wav b/Package/Environment/Common/layouts/Pandora's Box 16x9/select.wav
deleted file mode 100644
index 6678b93..0000000
Binary files a/Package/Environment/Common/layouts/Pandora's Box 16x9/select.wav and /dev/null differ
diff --git a/Package/Environment/Common/layouts/Pandora's Box 16x9/splash.xml b/Package/Environment/Common/layouts/Pandora's Box 16x9/splash.xml
deleted file mode 100644
index 5f777f0..0000000
--- a/Package/Environment/Common/layouts/Pandora's Box 16x9/splash.xml	
+++ /dev/null
@@ -1,38 +0,0 @@
-<layout width="1920" height="1080" font="Roboto-Bold.ttf" loadFontSize="32" fontColor="dedede" minShowTime="2">
-   
-<!--backgroundImage-->
-  <image src="bkgnd.png" x="0" y="0" height="stretch" width="stretch" layer="0"/>
-
-   <!-- logo -->
-   <image src="logo.png" x="center" y="center" height="400" xOrigin="center" yOrigin="center" layer="1" alpha="1"/>
-   
-   <text value="Loading..." x="0" y="bottom" xOffset="20" yOrigin="center" yOffset="-220" height="150" width="stretch" fontSize="48" layer="3">
-      <onEnter>
-         <set duration=".2">
-            <animate type="alpha" from="0" to="1" algorithm="easeinquadratic"/>
-         </set>
-      </onEnter>
-      <onIdle>
-         <set duration=".2">
-            <animate type="alpha" from="1" to=".5" algorithm="easeinquadratic"/>
-         </set>
-         <set duration=".2">
-            <animate type="alpha" from=".5" to="1" algorithm="easeinquadratic"/>
-         </set>
-      </onIdle>
-     <onExit>
-         <set duration=".2">
-            <animate type="alpha" from="1" to="0" algorithm="easeinquadratic"/>
-         </set>
-      </onExit>
-   </text>
-    
-   <!-- Text shown when creating meta.db. This will only show once unless meta.db does not exsist -->
-   <statusText x="0" y="bottom" xOffset="20" yOrigin="center" yOffset="-175" height="150" width="stretch" fontSize="25" layer="3" />
-   <image src="splashloadbk.png" x="center" y="center" xOrigin="center" yOrigin="center" yOffset="334" layer="1" alpha="1"/>   
-
- </layout>
-
-
-
-
diff --git a/Package/Environment/Common/layouts/Pandora's Box 16x9/unload.wav b/Package/Environment/Common/layouts/Pandora's Box 16x9/unload.wav
deleted file mode 100644
index 65f069a..0000000
Binary files a/Package/Environment/Common/layouts/Pandora's Box 16x9/unload.wav and /dev/null differ
diff --git a/Package/Environment/Common/layouts/Pandora's Box 16x9/videoborder.png b/Package/Environment/Common/layouts/Pandora's Box 16x9/videoborder.png
deleted file mode 100644
index e79f15d..0000000
Binary files a/Package/Environment/Common/layouts/Pandora's Box 16x9/videoborder.png and /dev/null differ
diff --git a/Package/Environment/Common/layouts/Pandora's Box 3x4/Roboto-Bold.ttf b/Package/Environment/Common/layouts/Pandora's Box 3x4/Roboto-Bold.ttf
deleted file mode 100644
index aaf374d..0000000
Binary files a/Package/Environment/Common/layouts/Pandora's Box 3x4/Roboto-Bold.ttf and /dev/null differ
diff --git a/Package/Environment/Common/layouts/Pandora's Box 3x4/attribution.txt b/Package/Environment/Common/layouts/Pandora's Box 3x4/attribution.txt
deleted file mode 100644
index 7a1afcd..0000000
--- a/Package/Environment/Common/layouts/Pandora's Box 3x4/attribution.txt	
+++ /dev/null
@@ -1,4 +0,0 @@
-The background image was taken from
-https://commons.wikimedia.org/wiki/File:Flame_of_fire.jpg, and is licensed
-under the Creative Commons Attribution-Share Alike 2.5 Generic, 2.0 Generic
-and 1.0 Generic license.
diff --git a/Package/Environment/Common/layouts/Pandora's Box 3x4/bg.jpg b/Package/Environment/Common/layouts/Pandora's Box 3x4/bg.jpg
deleted file mode 100644
index f9c5d4d..0000000
Binary files a/Package/Environment/Common/layouts/Pandora's Box 3x4/bg.jpg and /dev/null differ
diff --git a/Package/Environment/Common/layouts/Pandora's Box 3x4/bkgnd.png b/Package/Environment/Common/layouts/Pandora's Box 3x4/bkgnd.png
deleted file mode 100644
index 0f16b88..0000000
Binary files a/Package/Environment/Common/layouts/Pandora's Box 3x4/bkgnd.png and /dev/null differ
diff --git a/Package/Environment/Common/layouts/Pandora's Box 3x4/black.png b/Package/Environment/Common/layouts/Pandora's Box 3x4/black.png
deleted file mode 100644
index 73d0a7c..0000000
Binary files a/Package/Environment/Common/layouts/Pandora's Box 3x4/black.png and /dev/null differ
diff --git a/Package/Environment/Common/layouts/Pandora's Box 3x4/bottomborder.png b/Package/Environment/Common/layouts/Pandora's Box 3x4/bottomborder.png
deleted file mode 100644
index 337be42..0000000
Binary files a/Package/Environment/Common/layouts/Pandora's Box 3x4/bottomborder.png and /dev/null differ
diff --git a/Package/Environment/Common/layouts/Pandora's Box 3x4/highlight.wav b/Package/Environment/Common/layouts/Pandora's Box 3x4/highlight.wav
deleted file mode 100644
index 517e819..0000000
Binary files a/Package/Environment/Common/layouts/Pandora's Box 3x4/highlight.wav and /dev/null differ
diff --git a/Package/Environment/Common/layouts/Pandora's Box 3x4/layout.xml b/Package/Environment/Common/layouts/Pandora's Box 3x4/layout.xml
deleted file mode 100644
index 749416e..0000000
--- a/Package/Environment/Common/layouts/Pandora's Box 3x4/layout.xml	
+++ /dev/null
@@ -1,393 +0,0 @@
-<layout width="1200" height="1600" font="Roboto-Bold.ttf" loadFontSize="64" fontColor="dedede">
-
-
-  <!--
-     - Default RetroFE sound files.
-    -->
-
-  <sound type="load" src="load.wav" />
-  <sound type="unload" src="unload.wav" />
-  <sound type="highlight" src="highlight.wav" />
-  <sound type="select" src="select.wav" />
-
-
-  <!--
-     - Flaming background, slowly pulsating using transparency.
-    -->
-
-  <image src="bg.jpg" x="0" y="0" height="stretch" width="stretch" layer="0">
-    <onIdle>
-      <set duration="2">
-        <animate type="alpha" from="1" to="0.5" algorithm="easeinquadratic"/>
-      </set>
-      <set duration="1">
-        <animate type="alpha" from="0.5" to="1" algorithm="easeinquadratic"/>
-      </set>
-    </onIdle>
-  </image>
-
-
-  <!--
-     - Main menu structure.
-     - This menu uses the device images from the system_artwork directory.
-     - The menu items are faded out when leaving this menu, and faded in
-     - when entering this menu.
-    -->
-
-  <menu type="custom" imageType="device" scrollTime=".24" scrollAcceleration=".04" orientation="horizontal" >
-    <itemDefaults x="center" y="1420" xOrigin="center" yOrigin="bottom" width="200" maxHeight="500" fontSize="35" layer="5"/>
-    <item xOffset="-870" alpha="0" algorithm="easeinquadratic"/>
-    <item xOffset="-660">
-      <onMenuEnter>
-        <set duration=".3">
-          <animate type="alpha" from="0" to="1" algorithm="easeinquadratic"/>
-        </set>
-      </onMenuEnter>
-      <onMenuExit>
-        <set duration=".3">
-          <animate type="alpha" from="1" to="0" algorithm="easeinquadratic"/>
-        </set>
-      </onMenuExit>
-    </item>
-    <item xOffset="-450">
-      <onMenuEnter>
-        <set duration=".3">
-          <animate type="alpha" from="0" to="1" algorithm="easeinquadratic"/>
-        </set>
-      </onMenuEnter>
-      <onMenuExit>
-        <set duration=".3">
-          <animate type="alpha" from="1" to="0" algorithm="easeinquadratic"/>
-        </set>
-      </onMenuExit>
-    </item>
-    <item xOffset="-240">
-      <onMenuEnter>
-        <set duration=".3">
-          <animate type="alpha" from="0" to="1" algorithm="easeinquadratic"/>
-        </set>
-      </onMenuEnter>
-      <onMenuExit>
-        <set duration=".3">
-          <animate type="alpha" from="1" to="0" algorithm="easeinquadratic"/>
-        </set>
-      </onMenuExit>
-    </item>
-    <item selected="true" width="260" yOffset="40" layer="5">
-      <onMenuEnter>
-        <set duration=".3">
-          <animate type="alpha" from="0" to="1" algorithm="easeinquadratic"/>
-        </set>
-      </onMenuEnter>
-      <onMenuExit>
-        <set duration=".3">
-          <animate type="alpha" from="1" to="0" algorithm="easeinquadratic"/>
-        </set>
-      </onMenuExit>
-    </item>
-    <item xOffset="240">
-      <onMenuEnter>
-        <set duration=".3">
-          <animate type="alpha" from="0" to="1" algorithm="easeinquadratic"/>
-        </set>
-      </onMenuEnter>
-      <onMenuExit>
-        <set duration=".3">
-          <animate type="alpha" from="1" to="0" algorithm="easeinquadratic"/>
-        </set>
-      </onMenuExit>
-    </item>
-    <item xOffset="450">
-      <onMenuEnter>
-        <set duration=".3">
-          <animate type="alpha" from="0" to="1" algorithm="easeinquadratic"/>
-        </set>
-      </onMenuEnter>
-      <onMenuExit>
-        <set duration=".3">
-          <animate type="alpha" from="1" to="0" algorithm="easeinquadratic"/>
-        </set>
-      </onMenuExit>
-    </item>
-    <item xOffset="660">
-      <onMenuEnter>
-        <set duration=".3">
-          <animate type="alpha" from="0" to="1" algorithm="easeinquadratic"/>
-        </set>
-      </onMenuEnter>
-      <onMenuExit>
-        <set duration=".3">
-          <animate type="alpha" from="1" to="0" algorithm="easeinquadratic"/>
-        </set>
-      </onMenuExit>
-    </item>
-    <item xOffset="870" alpha="0" algorithm="easeinquadratic"/>
-  </menu>
-
-
-  <!--
-     - Collection menu structure.
-     - This menu uses the artwork_front images from the medium_artwork directory.
-     - The menu items are faded out when leaving this menu, and faded in
-     - when entering this menu.
-     - It is left to the user which images should be used for the
-     - artwork_front for systems like MAME. Personally I use the logo's
-     - there, since the available cabinet images leave something to be
-     - desired.
-    -->
-
-  <menu type="custom" imageType="artwork_front" scrollTime=".24" scrollAcceleration=".04" orientation="horizontal">
-    <itemDefaults x="center" y="1420" xOrigin="center" yOrigin="bottom" width="200" maxHeight="500" fontSize="35" layer="5"/>
-    <item xOffset="-870" alpha="0" algorithm="easeinquadratic"/>
-    <item xOffset="-660">
-      <onMenuExit>
-        <set duration=".3">
-          <animate type="alpha" from="1" to="0" algorithm="easeinquadratic"/>
-        </set>
-      </onMenuExit>
-    </item>
-    <item xOffset="-450">
-      <onMenuExit>
-        <set duration=".3">
-          <animate type="alpha" from="1" to="0" algorithm="easeinquadratic"/>
-        </set>
-      </onMenuExit>
-    </item>
-    <item xOffset="-240">
-      <onMenuExit>
-        <set duration=".3">
-          <animate type="alpha" from="1" to="0" algorithm="easeinquadratic"/>
-        </set>
-      </onMenuExit>
-    </item>
-    <item selected="true" width="260" yOffset="40" layer="5">
-      <onMenuExit>
-        <set duration=".3">
-          <animate type="alpha" from="1" to="0"
-          algorithm="easeinquadratic"/>
-        </set>
-      </onMenuExit>
-    </item>
-    <item xOffset="240">
-      <onMenuExit>
-        <set duration=".3">
-          <animate type="alpha" from="1" to="0" algorithm="easeinquadratic"/>
-        </set>
-      </onMenuExit>
-    </item>
-    <item xOffset="450">
-      <onMenuExit>
-        <set duration=".3">
-          <animate type="alpha" from="1" to="0" algorithm="easeinquadratic"/>
-        </set>
-      </onMenuExit>
-    </item>
-    <item xOffset="660">
-      <onMenuExit>
-        <set duration=".3">
-          <animate type="alpha" from="1" to="0" algorithm="easeinquadratic"/>
-        </set>
-      </onMenuExit>
-    </item>
-    <item xOffset="870" alpha="0" algorithm="easeinquadratic"/>
-  </menu>
-
-
-  <!--
-     - Video display, consisting of a black background image, a video border
-     - image by Timmyb, and a 640x480 video display with screenshots as
-     - backup in case the video is not available.
-    -->
-
-  <image src="black.png" x="400" y="600" xOrigin="center" yOrigin="center" height="480" width="640" layer="2"/>
-  <image src="videoborder.png" x="400" y="600" xOrigin="center" yOrigin="center" layer="4"/>
-  <reloadableVideo imageType="screenshot" x="400" y="600" xOrigin="center" yOrigin="center" height="480" maxWidth="640" layer="3">
-    <onHighlightEnter>
-      <set duration=".3">
-        <animate type="alpha" from="0" to="1" algorithm="easeinquadratic"/>
-      </set>
-    </onHighlightEnter>
-    <onHighlightExit>
-      <set duration=".3">
-        <animate type="alpha" from="1" to="0" algorithm="easeinquadratic"/>
-      </set>
-    </onHighlightExit>
-  </reloadableVideo>
-
-
-  <!--
-     - Logo displayed at the top of the video window.
-    -->
-
-  <reloadableImage type="logo" x="400" y="390" xOrigin="center" yOrigin="top" maxHeight="70" maxWidth="200" layer="5" alpha="0">
-    <onIdle>
-      <set duration="1">
-        <animate type="alpha" from="0" to="1" algorithm="easeinquadratic"/>
-      </set>
-      <set duration="1">
-        <animate type="alpha" from="1" to="0" algorithm="easeinquadratic"/>
-      </set>
-    </onIdle>
-  </reloadableImage>
-
-
-  <!--
-     - Large device image displayed during the main menu. When switching
-     - devices, the device image is moved off-screen to the right, and the
-     - next device image moves in from the right. When switching to the
-     - collection menu's, the device image is faded out, and the display is
-     - taken over by the system mode device image.
-    -->
-
-  <reloadableImage type="device" x="800" y="900" xOrigin="center" yOrigin="center" maxHeight="1200" width="1600" layer="1">
-    <onHighlightEnter>
-      <set duration=".3">
-        <animate type="x" from="4000" to="800" algorithm="easeinquadratic"/>
-      </set>
-    </onHighlightEnter>
-    <onHighlightExit>
-      <set duration=".3">
-        <animate type="x" from="800" to="4000" algorithm="easeinquadratic"/>
-      </set>
-    </onHighlightExit>
-    <onMenuEnter menuIndex="0">
-      <set duration="0.3">
-        <animate type="alpha" from="0" to="1" algorithm="easeinquadratic"/>
-      </set>
-    </onMenuEnter>
-    <onMenuExit menuIndex="0">
-      <set duration="0.3">
-        <animate type="alpha" from="1" to="0" algorithm="easeinquadratic"/>
-      </set>
-    </onMenuExit>
-  </reloadableImage>
-
-
-  <!--
-     - Large system mode device image of the selected collection displayed
-     - during the collection menu.
-    -->
-
-  <reloadableImage type="device" mode="system" x="800" y="900" xOrigin="center" yOrigin="center" maxHeight="1200" width="1600" layer="1"/>
-
-
-  <!--
-     - Large logo display at the top of the device image for the main menu.
-    -->
-
-  <reloadableImage type="logo" x="600" y="50" xOrigin="center" yOrigin="top" height="250" maxWidth="1180" layer="7">
-    <onMenuExit menuIndex="0">
-      <set duration="1">
-        <animate type="alpha" from="1" to="0" algorithm="easeinquadratic"/>
-      </set>
-    </onMenuExit>
-    <onHighlightEnter menuIndex="0">
-      <set duration=".6">
-        <animate type="alpha" from="0" to="1" algorithm="easeinquadratic"/>
-      </set>
-    </onHighlightEnter>
-  </reloadableImage>
-
-
-  <!--
-     - Large logo display of the selected collection at the top of the
-     - device image for the collection menu.
-    -->
-
-  <reloadableImage type="logo" mode="system" x="600" y="50" xOrigin="center" yOrigin="top" height="250" maxWidth="1180" layer="7"/>
-
-
-
-  <!--
-     - Bottom border image by Timmyb.
-    -->
-
-  <image src="bottomborder.png" x="0" y="1600" xOrigin="left" yOrigin="bottom" layer="3"/>
-
-
-  <!--
-     - Medium (cart/disk) displayed in the right side area of the bottom
-     - border.
-    -->
-
-  <reloadableImage type="medium_front" x="945" y="1503" xOrigin="center" yOrigin="center"
-  maxHeight="120" width="350" layer="7">
-    <onHighlightEnter>
-      <set duration=".3">
-        <animate type="alpha" from="0" to="1" algorithm="easeinquadratic"/>
-      </set>
-    </onHighlightEnter>
-    <onHighlightExit>
-      <set duration=".3">
-        <animate type="alpha" from="1" to="0" algorithm="easeinquadratic"/>
-      </set>
-    </onHighlightExit>
-  </reloadableImage>
-
-
-  <!--
-     - Displaying year, genre, and manufacturer in the left side area of the
-     - bottom border.
-    -->
-
-  <text value="Year:" x="200" y="1440" xOrigin="right" yOrigin="top" fontSize="48" layer="7"/>
-  <text value="Genre:" x="200" y="1480" xOrigin="right" yOrigin="top" fontSize="48" layer="7"/>
-  <text value="Creator:" x="200" y="1520" xOrigin="right" yOrigin="top" fontSize="48" layer="7"/>
-
-  <reloadableText type="year" x="210" y="1440" xOrigin="left" yOrigin="top" fontSize="48" maxWidth="170" layer="7">
-    <onHighlightEnter>
-      <set duration=".3">
-        <animate type="alpha" from="0" to="1" algorithm="easeinquadratic"/>
-      </set>
-    </onHighlightEnter>
-    <onHighlightExit>
-      <set duration=".3">
-        <animate type="alpha" from="1" to="0" algorithm="easeinquadratic"/>
-      </set>
-    </onHighlightExit>
-  </reloadableText>
-  <reloadableText type="genre" x="210" y="1480" xOrigin="left" yOrigin="top" fontSize="48" maxWidth="170" layer="7">
-    <onHighlightEnter>
-      <set duration=".3">
-        <animate type="alpha" from="0" to="1" algorithm="easeinquadratic"/>
-      </set>
-    </onHighlightEnter>
-    <onHighlightExit>
-      <set duration=".3">
-        <animate type="alpha" from="1" to="0" algorithm="easeinquadratic"/>
-      </set>
-    </onHighlightExit>
-  </reloadableText>
-  <reloadableText type="manufacturer" x="210" y="1520" xOrigin="left" yOrigin="top" fontSize="48" maxWidth="170" layer="7">
-    <onHighlightEnter>
-      <set duration=".3">
-        <animate type="alpha" from="0" to="1" algorithm="easeinquadratic"/>
-      </set>
-    </onHighlightEnter>
-    <onHighlightExit>
-      <set duration=".3">
-        <animate type="alpha" from="1" to="0" algorithm="easeinquadratic"/>
-      </set>
-    </onHighlightExit>
-  </reloadableText>
-
-
-  <!--
-     - System/Game title display below the center area of the bottom border.
-    -->
-
-  <reloadableText type="title" x="600" y="1550" xOrigin="center" yOrigin="top" fontSize="48" maxWidth="280" layer="7">
-    <onHighlightEnter>
-      <set duration=".3">
-        <animate type="alpha" from="0" to="1" algorithm="easeinquadratic"/>
-      </set>
-    </onHighlightEnter>
-    <onHighlightExit>
-      <set duration=".3">
-        <animate type="alpha" from="1" to="0" algorithm="easeinquadratic"/>
-      </set>
-    </onHighlightExit>
-  </reloadableText>
-
-
-</layout>
diff --git a/Package/Environment/Common/layouts/Pandora's Box 3x4/load.wav b/Package/Environment/Common/layouts/Pandora's Box 3x4/load.wav
deleted file mode 100644
index 077480e..0000000
Binary files a/Package/Environment/Common/layouts/Pandora's Box 3x4/load.wav and /dev/null differ
diff --git a/Package/Environment/Common/layouts/Pandora's Box 3x4/logo.png b/Package/Environment/Common/layouts/Pandora's Box 3x4/logo.png
deleted file mode 100644
index 5e7d0f4..0000000
Binary files a/Package/Environment/Common/layouts/Pandora's Box 3x4/logo.png and /dev/null differ
diff --git a/Package/Environment/Common/layouts/Pandora's Box 3x4/select.wav b/Package/Environment/Common/layouts/Pandora's Box 3x4/select.wav
deleted file mode 100644
index 6678b93..0000000
Binary files a/Package/Environment/Common/layouts/Pandora's Box 3x4/select.wav and /dev/null differ
diff --git a/Package/Environment/Common/layouts/Pandora's Box 3x4/splash.xml b/Package/Environment/Common/layouts/Pandora's Box 3x4/splash.xml
deleted file mode 100644
index 5f777f0..0000000
--- a/Package/Environment/Common/layouts/Pandora's Box 3x4/splash.xml	
+++ /dev/null
@@ -1,38 +0,0 @@
-<layout width="1920" height="1080" font="Roboto-Bold.ttf" loadFontSize="32" fontColor="dedede" minShowTime="2">
-   
-<!--backgroundImage-->
-  <image src="bkgnd.png" x="0" y="0" height="stretch" width="stretch" layer="0"/>
-
-   <!-- logo -->
-   <image src="logo.png" x="center" y="center" height="400" xOrigin="center" yOrigin="center" layer="1" alpha="1"/>
-   
-   <text value="Loading..." x="0" y="bottom" xOffset="20" yOrigin="center" yOffset="-220" height="150" width="stretch" fontSize="48" layer="3">
-      <onEnter>
-         <set duration=".2">
-            <animate type="alpha" from="0" to="1" algorithm="easeinquadratic"/>
-         </set>
-      </onEnter>
-      <onIdle>
-         <set duration=".2">
-            <animate type="alpha" from="1" to=".5" algorithm="easeinquadratic"/>
-         </set>
-         <set duration=".2">
-            <animate type="alpha" from=".5" to="1" algorithm="easeinquadratic"/>
-         </set>
-      </onIdle>
-     <onExit>
-         <set duration=".2">
-            <animate type="alpha" from="1" to="0" algorithm="easeinquadratic"/>
-         </set>
-      </onExit>
-   </text>
-    
-   <!-- Text shown when creating meta.db. This will only show once unless meta.db does not exsist -->
-   <statusText x="0" y="bottom" xOffset="20" yOrigin="center" yOffset="-175" height="150" width="stretch" fontSize="25" layer="3" />
-   <image src="splashloadbk.png" x="center" y="center" xOrigin="center" yOrigin="center" yOffset="334" layer="1" alpha="1"/>   
-
- </layout>
-
-
-
-
diff --git a/Package/Environment/Common/layouts/Pandora's Box 3x4/unload.wav b/Package/Environment/Common/layouts/Pandora's Box 3x4/unload.wav
deleted file mode 100644
index 65f069a..0000000
Binary files a/Package/Environment/Common/layouts/Pandora's Box 3x4/unload.wav and /dev/null differ
diff --git a/Package/Environment/Common/layouts/Pandora's Box 3x4/videoborder.png b/Package/Environment/Common/layouts/Pandora's Box 3x4/videoborder.png
deleted file mode 100644
index e79f15d..0000000
Binary files a/Package/Environment/Common/layouts/Pandora's Box 3x4/videoborder.png and /dev/null differ
diff --git a/Package/Environment/Common/layouts/Pandora's Box 4x3/Roboto-Bold.ttf b/Package/Environment/Common/layouts/Pandora's Box 4x3/Roboto-Bold.ttf
deleted file mode 100644
index aaf374d..0000000
Binary files a/Package/Environment/Common/layouts/Pandora's Box 4x3/Roboto-Bold.ttf and /dev/null differ
diff --git a/Package/Environment/Common/layouts/Pandora's Box 4x3/attribution.txt b/Package/Environment/Common/layouts/Pandora's Box 4x3/attribution.txt
deleted file mode 100644
index 7a1afcd..0000000
--- a/Package/Environment/Common/layouts/Pandora's Box 4x3/attribution.txt	
+++ /dev/null
@@ -1,4 +0,0 @@
-The background image was taken from
-https://commons.wikimedia.org/wiki/File:Flame_of_fire.jpg, and is licensed
-under the Creative Commons Attribution-Share Alike 2.5 Generic, 2.0 Generic
-and 1.0 Generic license.
diff --git a/Package/Environment/Common/layouts/Pandora's Box 4x3/bg.jpg b/Package/Environment/Common/layouts/Pandora's Box 4x3/bg.jpg
deleted file mode 100644
index 53c7441..0000000
Binary files a/Package/Environment/Common/layouts/Pandora's Box 4x3/bg.jpg and /dev/null differ
diff --git a/Package/Environment/Common/layouts/Pandora's Box 4x3/bkgnd.png b/Package/Environment/Common/layouts/Pandora's Box 4x3/bkgnd.png
deleted file mode 100644
index 0f16b88..0000000
Binary files a/Package/Environment/Common/layouts/Pandora's Box 4x3/bkgnd.png and /dev/null differ
diff --git a/Package/Environment/Common/layouts/Pandora's Box 4x3/black.png b/Package/Environment/Common/layouts/Pandora's Box 4x3/black.png
deleted file mode 100644
index 73d0a7c..0000000
Binary files a/Package/Environment/Common/layouts/Pandora's Box 4x3/black.png and /dev/null differ
diff --git a/Package/Environment/Common/layouts/Pandora's Box 4x3/bottomborder.png b/Package/Environment/Common/layouts/Pandora's Box 4x3/bottomborder.png
deleted file mode 100644
index 52fa1ff..0000000
Binary files a/Package/Environment/Common/layouts/Pandora's Box 4x3/bottomborder.png and /dev/null differ
diff --git a/Package/Environment/Common/layouts/Pandora's Box 4x3/highlight.wav b/Package/Environment/Common/layouts/Pandora's Box 4x3/highlight.wav
deleted file mode 100644
index 517e819..0000000
Binary files a/Package/Environment/Common/layouts/Pandora's Box 4x3/highlight.wav and /dev/null differ
diff --git a/Package/Environment/Common/layouts/Pandora's Box 4x3/layout.xml b/Package/Environment/Common/layouts/Pandora's Box 4x3/layout.xml
deleted file mode 100644
index db71a63..0000000
--- a/Package/Environment/Common/layouts/Pandora's Box 4x3/layout.xml	
+++ /dev/null
@@ -1,407 +0,0 @@
-<layout width="1600" height="1200" font="Roboto-Bold.ttf" loadFontSize="64" fontColor="dedede">
-
-
-  <!--
-     - Default RetroFE sound files.
-    -->
-
-  <sound type="load" src="load.wav" />
-  <sound type="unload" src="unload.wav" />
-  <sound type="highlight" src="highlight.wav" />
-  <sound type="select" src="select.wav" />
-
-
-  <!--
-     - Flaming background, slowly pulsating using transparency.
-    -->
-
-  <image src="bg.jpg" x="0" y="0" height="stretch" width="stretch" layer="0">
-    <onIdle>
-      <set duration="2">
-        <animate type="alpha" from="1" to="0.5" algorithm="easeinquadratic"/>
-      </set>
-      <set duration="1">
-        <animate type="alpha" from="0.5" to="1" algorithm="easeinquadratic"/>
-      </set>
-    </onIdle>
-  </image>
-
-
-  <!--
-     - Main menu structure.
-     - This menu uses the device images from the system_artwork directory.
-     - The menu items are faded out when leaving this menu, and faded in
-     - when entering this menu.
-    -->
-
-  <menu type="custom" imageType="device" scrollTime=".24" scrollAcceleration=".04" orientation="horizontal" >
-    <itemDefaults x="center" y="960" xOrigin="center" yOrigin="bottom" width="200" maxHeight="500" fontSize="35" layer="5"/>
-    <item xOffset="-940" alpha="0" algorithm="easeinquadratic"/>
-    <item xOffset="-730">
-      <onMenuEnter>
-        <set duration=".3">
-          <animate type="alpha" from="0" to="1" algorithm="easeinquadratic"/>
-        </set>
-      </onMenuEnter>
-      <onMenuExit>
-        <set duration=".3">
-          <animate type="alpha" from="1" to="0" algorithm="easeinquadratic"/>
-        </set>
-      </onMenuExit>
-    </item>
-    <item xOffset="-520">
-      <onMenuEnter>
-        <set duration=".3">
-          <animate type="alpha" from="0" to="1" algorithm="easeinquadratic"/>
-        </set>
-      </onMenuEnter>
-      <onMenuExit>
-        <set duration=".3">
-          <animate type="alpha" from="1" to="0" algorithm="easeinquadratic"/>
-        </set>
-      </onMenuExit>
-    </item>
-    <item xOffset="-310">
-      <onMenuEnter>
-        <set duration=".3">
-          <animate type="alpha" from="0" to="1" algorithm="easeinquadratic"/>
-        </set>
-      </onMenuEnter>
-      <onMenuExit>
-        <set duration=".3">
-          <animate type="alpha" from="1" to="0" algorithm="easeinquadratic"/>
-        </set>
-      </onMenuExit>
-    </item>
-    <item selected="true" width="350" yOffset="50" layer="5">
-      <onMenuEnter>
-        <set duration=".3">
-          <animate type="alpha" from="0" to="1" algorithm="easeinquadratic"/>
-        </set>
-      </onMenuEnter>
-      <onMenuExit>
-        <set duration=".3">
-          <animate type="alpha" from="1" to="0" algorithm="easeinquadratic"/>
-        </set>
-      </onMenuExit>
-    </item>
-    <item xOffset="310">
-      <onMenuEnter>
-        <set duration=".3">
-          <animate type="alpha" from="0" to="1" algorithm="easeinquadratic"/>
-        </set>
-      </onMenuEnter>
-      <onMenuExit>
-        <set duration=".3">
-          <animate type="alpha" from="1" to="0" algorithm="easeinquadratic"/>
-        </set>
-      </onMenuExit>
-    </item>
-    <item xOffset="520">
-      <onMenuEnter>
-        <set duration=".3">
-          <animate type="alpha" from="0" to="1" algorithm="easeinquadratic"/>
-        </set>
-      </onMenuEnter>
-      <onMenuExit>
-        <set duration=".3">
-          <animate type="alpha" from="1" to="0" algorithm="easeinquadratic"/>
-        </set>
-      </onMenuExit>
-    </item>
-    <item xOffset="730">
-      <onMenuEnter>
-        <set duration=".3">
-          <animate type="alpha" from="0" to="1" algorithm="easeinquadratic"/>
-        </set>
-      </onMenuEnter>
-      <onMenuExit>
-        <set duration=".3">
-          <animate type="alpha" from="1" to="0" algorithm="easeinquadratic"/>
-        </set>
-      </onMenuExit>
-    </item>
-    <item xOffset="940" alpha="0" algorithm="easeinquadratic"/>
-  </menu>
-
-
-  <!--
-     - Collection menu structure.
-     - This menu uses the artwork_front images from the medium_artwork directory.
-     - The menu items are faded out when leaving this menu, and faded in
-     - when entering this menu.
-     - It is left to the user which images should be used for the
-     - artwork_front for systems like MAME. Personally I use the logo's
-     - there, since the available cabinet images leave something to be
-     - desired.
-    -->
-
-  <menu type="custom" imageType="artwork_front" scrollTime=".24" scrollAcceleration=".04" orientation="horizontal">
-    <itemDefaults x="center" y="960" xOrigin="center" yOrigin="bottom" width="150" maxHeight="500" fontSize="35" layer="5"/>
-    <item xOffset="-925" alpha="0" algorithm="easeinquadratic"/>
-    <item xOffset="-765">
-      <onMenuExit>
-        <set duration=".3">
-          <animate type="alpha" from="1" to="0" algorithm="easeinquadratic"/>
-        </set>
-      </onMenuExit>
-    </item>
-    <item xOffset="-605">
-      <onMenuExit>
-        <set duration=".3">
-          <animate type="alpha" from="1" to="0" algorithm="easeinquadratic"/>
-        </set>
-      </onMenuExit>
-    </item>
-    <item xOffset="-445">
-      <onMenuExit>
-        <set duration=".3">
-          <animate type="alpha" from="1" to="0" algorithm="easeinquadratic"/>
-        </set>
-      </onMenuExit>
-    </item>
-    <item xOffset="-285">
-      <onMenuExit>
-        <set duration=".3">
-          <animate type="alpha" from="1" to="0" algorithm="easeinquadratic"/>
-        </set>
-      </onMenuExit>
-    </item>
-    <item selected="true" width="350" yOffset="50" layer="5">
-      <onMenuExit>
-        <set duration=".3">
-          <animate type="alpha" from="1" to="0"
-          algorithm="easeinquadratic"/>
-        </set>
-      </onMenuExit>
-    </item>
-    <item xOffset="285">
-      <onMenuExit>
-        <set duration=".3">
-          <animate type="alpha" from="1" to="0" algorithm="easeinquadratic"/>
-        </set>
-      </onMenuExit>
-    </item>
-    <item xOffset="445">
-      <onMenuExit>
-        <set duration=".3">
-          <animate type="alpha" from="1" to="0" algorithm="easeinquadratic"/>
-        </set>
-      </onMenuExit>
-    </item>
-    <item xOffset="605">
-      <onMenuExit>
-        <set duration=".3">
-          <animate type="alpha" from="1" to="0" algorithm="easeinquadratic"/>
-        </set>
-      </onMenuExit>
-    </item>
-    <item xOffset="765">
-      <onMenuExit>
-        <set duration=".3">
-          <animate type="alpha" from="1" to="0" algorithm="easeinquadratic"/>
-        </set>
-      </onMenuExit>
-    </item>
-    <item xOffset="925" alpha="0" algorithm="easeinquadratic"/>
-  </menu>
-
-
-  <!--
-     - Video display, consisting of a black background image, a video border
-     - image by Timmyb, and a 640x480 video display with screenshots as
-     - backup in case the video is not available.
-    -->
-
-  <image src="black.png" x="400" y="300" xOrigin="center" yOrigin="center" height="480" width="640" layer="2"/>
-  <image src="videoborder.png" x="400" y="300" xOrigin="center" yOrigin="center" layer="4"/>
-  <reloadableVideo imageType="screenshot" x="400" y="300" xOrigin="center" yOrigin="center" height="480" maxWidth="640" layer="3">
-    <onHighlightEnter>
-      <set duration=".3">
-        <animate type="alpha" from="0" to="1" algorithm="easeinquadratic"/>
-      </set>
-    </onHighlightEnter>
-    <onHighlightExit>
-      <set duration=".3">
-        <animate type="alpha" from="1" to="0" algorithm="easeinquadratic"/>
-      </set>
-    </onHighlightExit>
-  </reloadableVideo>
-
-
-  <!--
-     - Logo displayed at the top of the video window.
-    -->
-
-  <reloadableImage type="logo" x="400" y="90" xOrigin="center" yOrigin="top" maxHeight="70" maxWidth="200" layer="5" alpha="0">
-    <onIdle>
-      <set duration="1">
-        <animate type="alpha" from="0" to="1" algorithm="easeinquadratic"/>
-      </set>
-      <set duration="1">
-        <animate type="alpha" from="1" to="0" algorithm="easeinquadratic"/>
-      </set>
-    </onIdle>
-  </reloadableImage>
-
-
-  <!--
-     - Large device image displayed during the main menu. When switching
-     - devices, the device image is moved off-screen to the right, and the
-     - next device image moves in from the right. When switching to the
-     - collection menu's, the device image is faded out, and the display is
-     - taken over by the system mode device image.
-    -->
-
-  <reloadableImage type="device" x="1175" y="640" xOrigin="center" yOrigin="center" maxHeight="1200" width="2000" layer="1">
-    <onHighlightEnter>
-      <set duration=".3">
-        <animate type="x" from="4000" to="1175" algorithm="easeinquadratic"/>
-      </set>
-    </onHighlightEnter>
-    <onHighlightExit>
-      <set duration=".3">
-        <animate type="x" from="1175" to="4000" algorithm="easeinquadratic"/>
-      </set>
-    </onHighlightExit>
-    <onMenuEnter menuIndex="0">
-      <set duration="0.3">
-        <animate type="alpha" from="0" to="1" algorithm="easeinquadratic"/>
-      </set>
-    </onMenuEnter>
-    <onMenuExit menuIndex="0">
-      <set duration="0.3">
-        <animate type="alpha" from="1" to="0" algorithm="easeinquadratic"/>
-      </set>
-    </onMenuExit>
-  </reloadableImage>
-
-
-  <!--
-     - Large system mode device image of the selected collection displayed
-     - during the collection menu.
-    -->
-
-  <reloadableImage type="device" mode="system" x="1175" y="640" xOrigin="center" yOrigin="center" maxHeight="1200" width="2000" layer="1"/>
-
-
-  <!--
-     - Large logo display at the top of the device image for the main menu.
-    -->
-
-  <reloadableImage type="logo" x="1175" y="50" xOrigin="center" yOrigin="top" height="250" maxWidth="800" layer="7">
-    <onMenuExit menuIndex="0">
-      <set duration="1">
-        <animate type="alpha" from="1" to="0" algorithm="easeinquadratic"/>
-      </set>
-    </onMenuExit>
-    <onHighlightEnter menuIndex="0">
-      <set duration=".6">
-        <animate type="alpha" from="0" to="1" algorithm="easeinquadratic"/>
-      </set>
-    </onHighlightEnter>
-  </reloadableImage>
-
-
-  <!--
-     - Large logo display of the selected collection at the top of the
-     - device image for the collection menu.
-    -->
-
-  <reloadableImage type="logo" mode="system" x="1175" y="50" xOrigin="center" yOrigin="top" height="250" maxWidth="800" layer="7"/>
-
-
-
-  <!--
-     - Bottom border image by Timmyb.
-    -->
-
-  <image src="bottomborder.png" x="0" y="1200" xOrigin="left" yOrigin="bottom" layer="3"/>
-
-
-  <!--
-     - Medium (cart/disk) displayed in the right side area of the bottom
-     - border.
-    -->
-
-  <reloadableImage type="medium_front" x="1255" y="1070" xOrigin="center" yOrigin="center"
-  maxHeight="160" width="350" layer="7">
-    <onHighlightEnter>
-      <set duration=".3">
-        <animate type="alpha" from="0" to="1" algorithm="easeinquadratic"/>
-      </set>
-    </onHighlightEnter>
-    <onHighlightExit>
-      <set duration=".3">
-        <animate type="alpha" from="1" to="0" algorithm="easeinquadratic"/>
-      </set>
-    </onHighlightExit>
-  </reloadableImage>
-
-
-  <!--
-     - Displaying year, genre, and manufacturer in the left side area of the
-     - bottom border.
-    -->
-
-  <text value="Year:" x="290" y="995" xOrigin="right" yOrigin="top" fontSize="48" layer="7"/>
-  <text value="Genre:" x="290" y="1045" xOrigin="right" yOrigin="top" fontSize="48" layer="7"/>
-  <text value="Manufacturer:" x="290" y="1095" xOrigin="right" yOrigin="top" fontSize="48" layer="7"/>
-
-  <reloadableText type="year" x="300" y="995" xOrigin="left" yOrigin="top" fontSize="48" maxWidth="220" layer="7">
-    <onHighlightEnter>
-      <set duration=".3">
-        <animate type="alpha" from="0" to="1" algorithm="easeinquadratic"/>
-      </set>
-    </onHighlightEnter>
-    <onHighlightExit>
-      <set duration=".3">
-        <animate type="alpha" from="1" to="0" algorithm="easeinquadratic"/>
-      </set>
-    </onHighlightExit>
-  </reloadableText>
-  <reloadableText type="genre" x="300" y="1045" xOrigin="left" yOrigin="top" fontSize="48" maxWidth="220" layer="7">
-    <onHighlightEnter>
-      <set duration=".3">
-        <animate type="alpha" from="0" to="1" algorithm="easeinquadratic"/>
-      </set>
-    </onHighlightEnter>
-    <onHighlightExit>
-      <set duration=".3">
-        <animate type="alpha" from="1" to="0" algorithm="easeinquadratic"/>
-      </set>
-    </onHighlightExit>
-  </reloadableText>
-  <reloadableText type="manufacturer" x="300" y="1095" xOrigin="left" yOrigin="top" fontSize="48" maxWidth="220" layer="7">
-    <onHighlightEnter>
-      <set duration=".3">
-        <animate type="alpha" from="0" to="1" algorithm="easeinquadratic"/>
-      </set>
-    </onHighlightEnter>
-    <onHighlightExit>
-      <set duration=".3">
-        <animate type="alpha" from="1" to="0" algorithm="easeinquadratic"/>
-      </set>
-    </onHighlightExit>
-  </reloadableText>
-
-
-  <!--
-     - System/Game title display in the center area of the bottom border.
-    -->
-
-  <reloadableText type="title" x="800" y="1040" xOrigin="center" yOrigin="top" fontSize="36" maxWidth="600" layer="7">
-    <onHighlightEnter>
-      <set duration=".3">
-        <animate type="alpha" from="0" to="1" algorithm="easeinquadratic"/>
-      </set>
-    </onHighlightEnter>
-    <onHighlightExit>
-      <set duration=".3">
-        <animate type="alpha" from="1" to="0" algorithm="easeinquadratic"/>
-      </set>
-    </onHighlightExit>
-  </reloadableText>
-
-
-</layout>
diff --git a/Package/Environment/Common/layouts/Pandora's Box 4x3/load.wav b/Package/Environment/Common/layouts/Pandora's Box 4x3/load.wav
deleted file mode 100644
index 077480e..0000000
Binary files a/Package/Environment/Common/layouts/Pandora's Box 4x3/load.wav and /dev/null differ
diff --git a/Package/Environment/Common/layouts/Pandora's Box 4x3/logo.png b/Package/Environment/Common/layouts/Pandora's Box 4x3/logo.png
deleted file mode 100644
index 5e7d0f4..0000000
Binary files a/Package/Environment/Common/layouts/Pandora's Box 4x3/logo.png and /dev/null differ
diff --git a/Package/Environment/Common/layouts/Pandora's Box 4x3/select.wav b/Package/Environment/Common/layouts/Pandora's Box 4x3/select.wav
deleted file mode 100644
index 6678b93..0000000
Binary files a/Package/Environment/Common/layouts/Pandora's Box 4x3/select.wav and /dev/null differ
diff --git a/Package/Environment/Common/layouts/Pandora's Box 4x3/splash.xml b/Package/Environment/Common/layouts/Pandora's Box 4x3/splash.xml
deleted file mode 100644
index 5f777f0..0000000
--- a/Package/Environment/Common/layouts/Pandora's Box 4x3/splash.xml	
+++ /dev/null
@@ -1,38 +0,0 @@
-<layout width="1920" height="1080" font="Roboto-Bold.ttf" loadFontSize="32" fontColor="dedede" minShowTime="2">
-   
-<!--backgroundImage-->
-  <image src="bkgnd.png" x="0" y="0" height="stretch" width="stretch" layer="0"/>
-
-   <!-- logo -->
-   <image src="logo.png" x="center" y="center" height="400" xOrigin="center" yOrigin="center" layer="1" alpha="1"/>
-   
-   <text value="Loading..." x="0" y="bottom" xOffset="20" yOrigin="center" yOffset="-220" height="150" width="stretch" fontSize="48" layer="3">
-      <onEnter>
-         <set duration=".2">
-            <animate type="alpha" from="0" to="1" algorithm="easeinquadratic"/>
-         </set>
-      </onEnter>
-      <onIdle>
-         <set duration=".2">
-            <animate type="alpha" from="1" to=".5" algorithm="easeinquadratic"/>
-         </set>
-         <set duration=".2">
-            <animate type="alpha" from=".5" to="1" algorithm="easeinquadratic"/>
-         </set>
-      </onIdle>
-     <onExit>
-         <set duration=".2">
-            <animate type="alpha" from="1" to="0" algorithm="easeinquadratic"/>
-         </set>
-      </onExit>
-   </text>
-    
-   <!-- Text shown when creating meta.db. This will only show once unless meta.db does not exsist -->
-   <statusText x="0" y="bottom" xOffset="20" yOrigin="center" yOffset="-175" height="150" width="stretch" fontSize="25" layer="3" />
-   <image src="splashloadbk.png" x="center" y="center" xOrigin="center" yOrigin="center" yOffset="334" layer="1" alpha="1"/>   
-
- </layout>
-
-
-
-
diff --git a/Package/Environment/Common/layouts/Pandora's Box 4x3/unload.wav b/Package/Environment/Common/layouts/Pandora's Box 4x3/unload.wav
deleted file mode 100644
index 65f069a..0000000
Binary files a/Package/Environment/Common/layouts/Pandora's Box 4x3/unload.wav and /dev/null differ
diff --git a/Package/Environment/Common/layouts/Pandora's Box 4x3/videoborder.png b/Package/Environment/Common/layouts/Pandora's Box 4x3/videoborder.png
deleted file mode 100644
index e79f15d..0000000
Binary files a/Package/Environment/Common/layouts/Pandora's Box 4x3/videoborder.png and /dev/null differ