diff --git a/Package/Environment/Common/layouts/Mamed 16x9/layout.xml b/Package/Environment/Common/layouts/Mamed 16x9/layout.xml
index 7f17446..76f149a 100644
--- a/Package/Environment/Common/layouts/Mamed 16x9/layout.xml	
+++ b/Package/Environment/Common/layouts/Mamed 16x9/layout.xml	
@@ -21,12 +21,12 @@
   <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">
+        <set duration=".1">
           <animate type="alpha" from="0.5" to="0" algorithm="easeincircular"/>
         </set>
       </onMenuExit>
       <onMenuEnter>
-        <set duration=".2">
+        <set duration=".1">
            <animate type="alpha" from="0" to="0.5" algorithm="easeincircular"/>
         </set>
       </onMenuEnter>
@@ -35,12 +35,12 @@
     <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">
+        <set duration=".1">
            <animate type="alpha" from="1" to="0" algorithm="easeincircular"/>
         </set>
       </onMenuExit>
       <onMenuEnter>
-        <set duration=".2">
+        <set duration=".1">
            <animate type="alpha" from="0" to="1" algorithm="easeincircular"/>
         </set>
       </onMenuEnter>
@@ -52,31 +52,51 @@
 
   <reloadableVideo imageType="screenshot"       x="597"  y="520" xOrigin="center" yOrigin="center" maxHeight="360" width="800" layer="2">
     <onMenuExit menuIndex="0">
-      <set duration=".2">
+      <set duration=".3">
         <animate type="x"     from="597" to="797"/>
         <animate type="width" from="800" to="400"/>
       </set>
     </onMenuExit>
     <onMenuExit menuIndex="1">
-      <set duration=".2">
+      <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="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"/>
+        <animate type="alpha" from="0" to="1" algorithm="easeinquadratic"/>
       </set>
     </onMenuEnter>
     <onMenuExit menuIndex="1">
       <set duration=".1">
-        <animate type="alpha" from="1" to="0"/>
+        <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>
 
 
@@ -84,7 +104,7 @@
   <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">
+  <reloadableImage type="logo"                  x="597"  y="350" xOrigin="center" yOrigin="bottom" maxHeight="200" maxWidth="200" layer="4" alpha="0">
     <onIdle>
       <set duration="1">
         <animate type="alpha" from="0" to="1" algorithm="easeinquadratic"/>
@@ -93,19 +113,14 @@
         <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="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="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"/>
+  <reloadableText type="genre"                  x="1520" y="656" xOrigin="center" fontSize="40"   maxWidth="550" layer="6"/>
 
 
 </layout>
diff --git a/Package/Environment/Common/layouts/Mamed 2015 16x9/Roboto-Bold.ttf b/Package/Environment/Common/layouts/Mamed 2015 16x9/Roboto-Bold.ttf
new file mode 100644
index 0000000..aaf374d
Binary files /dev/null and b/Package/Environment/Common/layouts/Mamed 2015 16x9/Roboto-Bold.ttf differ
diff --git a/Package/Environment/Common/layouts/Mamed 2015 16x9/bkgnd.png b/Package/Environment/Common/layouts/Mamed 2015 16x9/bkgnd.png
new file mode 100644
index 0000000..0f16b88
Binary files /dev/null and b/Package/Environment/Common/layouts/Mamed 2015 16x9/bkgnd.png differ
diff --git a/Package/Environment/Common/layouts/Mamed 2015 16x9/highlight.wav b/Package/Environment/Common/layouts/Mamed 2015 16x9/highlight.wav
new file mode 100644
index 0000000..517e819
Binary files /dev/null and b/Package/Environment/Common/layouts/Mamed 2015 16x9/highlight.wav differ
diff --git a/Package/Environment/Common/layouts/Mamed 2015 16x9/layout.xml b/Package/Environment/Common/layouts/Mamed 2015 16x9/layout.xml
new file mode 100644
index 0000000..fd2305a
--- /dev/null
+++ b/Package/Environment/Common/layouts/Mamed 2015 16x9/layout.xml	
@@ -0,0 +1,140 @@
+<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="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" 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="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="350" xOrigin="center" yOrigin="bottom" 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>
+  </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
new file mode 100644
index 0000000..077480e
Binary files /dev/null and b/Package/Environment/Common/layouts/Mamed 2015 16x9/load.wav differ
diff --git a/Package/Environment/Common/layouts/Mamed 2015 16x9/logo.png b/Package/Environment/Common/layouts/Mamed 2015 16x9/logo.png
new file mode 100644
index 0000000..5e7d0f4
Binary files /dev/null and b/Package/Environment/Common/layouts/Mamed 2015 16x9/logo.png differ
diff --git a/Package/Environment/Common/layouts/Mamed 2015 16x9/mamedbg.png b/Package/Environment/Common/layouts/Mamed 2015 16x9/mamedbg.png
new file mode 100644
index 0000000..6587ca6
Binary files /dev/null and b/Package/Environment/Common/layouts/Mamed 2015 16x9/mamedbg.png differ
diff --git a/Package/Environment/Common/layouts/Mamed 2015 16x9/mamedfont.ttf b/Package/Environment/Common/layouts/Mamed 2015 16x9/mamedfont.ttf
new file mode 100644
index 0000000..55559c9
Binary files /dev/null and b/Package/Environment/Common/layouts/Mamed 2015 16x9/mamedfont.ttf differ
diff --git a/Package/Environment/Common/layouts/Mamed 2015 16x9/select.wav b/Package/Environment/Common/layouts/Mamed 2015 16x9/select.wav
new file mode 100644
index 0000000..6678b93
Binary files /dev/null and b/Package/Environment/Common/layouts/Mamed 2015 16x9/select.wav differ
diff --git a/Package/Environment/Common/layouts/Mamed 2015 16x9/splash.xml b/Package/Environment/Common/layouts/Mamed 2015 16x9/splash.xml
new file mode 100644
index 0000000..5f777f0
--- /dev/null
+++ b/Package/Environment/Common/layouts/Mamed 2015 16x9/splash.xml	
@@ -0,0 +1,38 @@
+<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
new file mode 100644
index 0000000..65f069a
Binary files /dev/null and b/Package/Environment/Common/layouts/Mamed 2015 16x9/unload.wav differ
diff --git a/Package/Environment/Common/layouts/Mamed 4x3/layout.xml b/Package/Environment/Common/layouts/Mamed 4x3/layout.xml
index 01395af..8244494 100644
--- a/Package/Environment/Common/layouts/Mamed 4x3/layout.xml	
+++ b/Package/Environment/Common/layouts/Mamed 4x3/layout.xml	
@@ -19,12 +19,12 @@
   <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">
+        <set duration=".3">
           <animate type="alpha" from="0.5" to="0" algorithm="easeincircular"/>
         </set>
       </onMenuExit>
       <onMenuEnter>
-        <set duration=".2">
+        <set duration=".3">
            <animate type="alpha" from="0" to="0.5" algorithm="easeincircular"/>
         </set>
       </onMenuEnter>
@@ -33,12 +33,12 @@
     <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">
+        <set duration=".3">
            <animate type="alpha" from="1" to="0" algorithm="easeincircular"/>
         </set>
       </onMenuExit>
       <onMenuEnter>
-        <set duration=".2">
+        <set duration=".3">
            <animate type="alpha" from="0" to="1" algorithm="easeincircular"/>
         </set>
       </onMenuEnter>
@@ -48,13 +48,24 @@
 
   <!-- Reloadable items -->
 
-  <reloadableVideo imageType="screenshot"      x="498"  y="578" xOrigin="center" yOrigin="center" height="400"    maxWidth="667" layer="2"/>
+  <reloadableVideo imageType="screenshot"      x="498"  y="578" xOrigin="center" yOrigin="center" height="400"    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="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">
+  <reloadableImage type="logo"                 x="498"  y="390" xOrigin="center" yOrigin="bottom" maxHeight="222" maxWidth="168" layer="4" alpha="0">
     <onIdle>
       <set duration="1">
         <animate type="alpha" from="0" to="1" algorithm="easeinquadratic"/>
@@ -63,11 +74,6 @@
         <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"/>