diff --git a/Package/Environment/Common/layouts/Mamed 16x9/bkgnd.png b/Package/Environment/Common/layouts/Mamed 16x9/bkgnd.png
deleted file mode 120000
index 23afff3..0000000
--- a/Package/Environment/Common/layouts/Mamed 16x9/bkgnd.png	
+++ /dev/null
@@ -1 +0,0 @@
-../Default 16x9/bkgnd.png
\ No newline at end of file
diff --git a/Package/Environment/Common/layouts/Mamed 16x9/highlight.wav b/Package/Environment/Common/layouts/Mamed 16x9/highlight.wav
deleted file mode 120000
index b5bb4ec..0000000
--- a/Package/Environment/Common/layouts/Mamed 16x9/highlight.wav	
+++ /dev/null
@@ -1 +0,0 @@
-../Default 16x9/highlight.wav
\ No newline at end of file
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 7f17446..0000000
--- a/Package/Environment/Common/layouts/Mamed 16x9/layout.xml	
+++ /dev/null
@@ -1,111 +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=".2">
-          <animate type="alpha" from="0.5" to="0" algorithm="easeincircular"/>
-        </set>
-      </onMenuExit>
-      <onMenuEnter>
-        <set duration=".2">
-           <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=".2">
-           <animate type="alpha" from="1" to="0" algorithm="easeincircular"/>
-        </set>
-      </onMenuExit>
-      <onMenuEnter>
-        <set duration=".2">
-           <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=".2">
-        <animate type="x"     from="597" to="797"/>
-        <animate type="width" from="800" to="400"/>
-      </set>
-    </onMenuExit>
-    <onMenuExit menuIndex="1">
-      <set duration=".2">
-        <animate type="x"     from="797" to="597"/>
-        <animate type="width" from="400" to="800"/>
-      </set>
-    </onMenuExit>
-  </reloadableVideo>
-
-
-  <reloadableImage type="titleshot"             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"/>
-      </set>
-    </onMenuEnter>
-    <onMenuExit menuIndex="1">
-      <set duration=".1">
-        <animate type="alpha" from="1" to="0"/>
-      </set>
-    </onMenuExit>
-  </reloadableImage>
-
-
-  <reloadableImage type="device"                x="1510" y="319" xOrigin="center" yOrigin="center" height="326"    maxWidth="432" layer="3"/>
-  <reloadableImage type="device" mode="system"  x="1510" y="319" xOrigin="center" yOrigin="center" height="326"    maxWidth="432" layer="3"/>
-
-
-  <reloadableImage type="logo"                  x="597"  y="300" xOrigin="center" yOrigin="top"    maxHeight="200" 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>
-    <onExit>
-      <set duration=".1">
-        <animate type="alpha" to="0" algorithm="easeinquadratic"/>
-      </set>
-    </onExit>
-  </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 120000
index 67e557a..0000000
--- a/Package/Environment/Common/layouts/Mamed 16x9/load.wav	
+++ /dev/null
@@ -1 +0,0 @@
-../Default 16x9/load.wav
\ No newline at end of file
diff --git a/Package/Environment/Common/layouts/Mamed 16x9/logo.png b/Package/Environment/Common/layouts/Mamed 16x9/logo.png
deleted file mode 120000
index 619fe6b..0000000
--- a/Package/Environment/Common/layouts/Mamed 16x9/logo.png	
+++ /dev/null
@@ -1 +0,0 @@
-../Default 16x9/logo.png
\ No newline at end of file
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 120000
index 98d9d5b..0000000
--- a/Package/Environment/Common/layouts/Mamed 16x9/select.wav	
+++ /dev/null
@@ -1 +0,0 @@
-../Default 16x9/select.wav
\ No newline at end of file
diff --git a/Package/Environment/Common/layouts/Mamed 16x9/splash.xml b/Package/Environment/Common/layouts/Mamed 16x9/splash.xml
deleted file mode 120000
index cdd472a..0000000
--- a/Package/Environment/Common/layouts/Mamed 16x9/splash.xml	
+++ /dev/null
@@ -1 +0,0 @@
-../Default 16x9/splash.xml
\ No newline at end of file
diff --git a/Package/Environment/Common/layouts/Mamed 16x9/unload.wav b/Package/Environment/Common/layouts/Mamed 16x9/unload.wav
deleted file mode 120000
index 0f7ab48..0000000
--- a/Package/Environment/Common/layouts/Mamed 16x9/unload.wav	
+++ /dev/null
@@ -1 +0,0 @@
-../Default 16x9/unload.wav
\ No newline at end of file
diff --git a/Package/Environment/Common/layouts/Mamed 4x3/bkgnd.png b/Package/Environment/Common/layouts/Mamed 4x3/bkgnd.png
deleted file mode 120000
index 23afff3..0000000
--- a/Package/Environment/Common/layouts/Mamed 4x3/bkgnd.png	
+++ /dev/null
@@ -1 +0,0 @@
-../Default 16x9/bkgnd.png
\ No newline at end of file
diff --git a/Package/Environment/Common/layouts/Mamed 4x3/highlight.wav b/Package/Environment/Common/layouts/Mamed 4x3/highlight.wav
deleted file mode 120000
index b5bb4ec..0000000
--- a/Package/Environment/Common/layouts/Mamed 4x3/highlight.wav	
+++ /dev/null
@@ -1 +0,0 @@
-../Default 16x9/highlight.wav
\ No newline at end of file
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 01395af..0000000
--- a/Package/Environment/Common/layouts/Mamed 4x3/layout.xml	
+++ /dev/null
@@ -1,80 +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=".2">
-          <animate type="alpha" from="0.5" to="0" algorithm="easeincircular"/>
-        </set>
-      </onMenuExit>
-      <onMenuEnter>
-        <set duration=".2">
-           <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=".2">
-           <animate type="alpha" from="1" to="0" algorithm="easeincircular"/>
-        </set>
-      </onMenuExit>
-      <onMenuEnter>
-        <set duration=".2">
-           <animate type="alpha" from="0" to="1" algorithm="easeincircular"/>
-        </set>
-      </onMenuEnter>
-    </item>
-  </menu>
-
-
-  <!-- Reloadable items -->
-
-  <reloadableVideo imageType="screenshot"      x="498"  y="578" xOrigin="center" yOrigin="center" height="400"    maxWidth="667" layer="2"/>
-
-  <reloadableImage type="device"               x="1258" y="355" xOrigin="center" yOrigin="center" height="362"    maxWidth="360" layer="3"/>
-  <reloadableImage type="device" mode="system" x="1258" y="355" xOrigin="center" yOrigin="center" height="362"    maxWidth="360" layer="3"/>
-
-
-  <reloadableImage type="logo"                 x="498"  y="332" xOrigin="center" yOrigin="top"    maxHeight="222" maxWidth="168" 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>
-    <onExit>
-      <set duration="0.1">
-        <animate type="alpha" to="0" algorithm="easeinquadratic"/>
-      </set>
-    </onExit>
-  </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 120000
index 67e557a..0000000
--- a/Package/Environment/Common/layouts/Mamed 4x3/load.wav	
+++ /dev/null
@@ -1 +0,0 @@
-../Default 16x9/load.wav
\ No newline at end of file
diff --git a/Package/Environment/Common/layouts/Mamed 4x3/logo.png b/Package/Environment/Common/layouts/Mamed 4x3/logo.png
deleted file mode 120000
index 619fe6b..0000000
--- a/Package/Environment/Common/layouts/Mamed 4x3/logo.png	
+++ /dev/null
@@ -1 +0,0 @@
-../Default 16x9/logo.png
\ No newline at end of file
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 120000
index 98d9d5b..0000000
--- a/Package/Environment/Common/layouts/Mamed 4x3/select.wav	
+++ /dev/null
@@ -1 +0,0 @@
-../Default 16x9/select.wav
\ No newline at end of file
diff --git a/Package/Environment/Common/layouts/Mamed 4x3/splash.xml b/Package/Environment/Common/layouts/Mamed 4x3/splash.xml
deleted file mode 120000
index cdd472a..0000000
--- a/Package/Environment/Common/layouts/Mamed 4x3/splash.xml	
+++ /dev/null
@@ -1 +0,0 @@
-../Default 16x9/splash.xml
\ No newline at end of file
diff --git a/Package/Environment/Common/layouts/Mamed 4x3/unload.wav b/Package/Environment/Common/layouts/Mamed 4x3/unload.wav
deleted file mode 120000
index 0f7ab48..0000000
--- a/Package/Environment/Common/layouts/Mamed 4x3/unload.wav	
+++ /dev/null
@@ -1 +0,0 @@
-../Default 16x9/unload.wav
\ No newline at end of file