diff --git a/src/mame/layout/mbaskb.lay b/src/mame/layout/mbaskb.lay
index 79bcd4f65ca..a71b85c00ac 100644
--- a/src/mame/layout/mbaskb.lay
+++ b/src/mame/layout/mbaskb.lay
@@ -6,11 +6,19 @@ license:CC0
 
 <!-- define elements -->
 
-	<element name="static_black"><rect><color red="0" green="0" blue="0" /></rect></element>
-	<element name="disk_black"><disk><color red="0" green="0" blue="0" /></disk></element>
-	<element name="static_white"><rect><color red="0.8" green="0.8" blue="0.8" /></rect></element>
-	<element name="disk_white"><disk><color red="0.8" green="0.8" blue="0.8" /></disk></element>
-	<element name="static_orange"><rect><color red="0.6" green="0.35" blue="0.1" /></rect></element>
+	<element name="black"><rect><color red="0" green="0" blue="0" /></rect></element>
+	<element name="blackd"><disk><color red="0" green="0" blue="0" /></disk></element>
+	<element name="white"><rect><color red="0.8" green="0.8" blue="0.8" /></rect></element>
+	<element name="whited"><disk><color red="0.8" green="0.8" blue="0.8" /></disk></element>
+	<element name="orange"><rect><color red="0.6" green="0.35" blue="0.1" /></rect></element>
+
+	<element name="line30">
+		<image><data><![CDATA[
+			<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="100" height="100">
+				<rect width="200" height="20" x="0" y="0" transform="rotate(30.0)" fill="#000000" />
+			</svg>
+		]]></data></image>
+	</element>
 
 	<element name="text_l1">
 		<rect><color red="0.8" green="0.8" blue="0.8" /></rect>
@@ -37,45 +45,47 @@ license:CC0
 	<view name="Internal Layout">
 		<bounds left="2.26" right="22.74" top="2.51" bottom="26.14" />
 
-	<!-- bezel -->
+		<!-- bezel -->
+		<element ref="white"><bounds x="2.25" y="5" width="20.5" height="22" /></element>
+		<element ref="black"><bounds x="2.5" y="5.5" width="20" height="22" /></element>
 
-		<element ref="static_white"><bounds x="2.25" y="5" width="20.5" height="22" /></element>
-		<element ref="static_black"><bounds x="2.5" y="5.5" width="20" height="22" /></element>
+		<element ref="whited"><bounds x="10" y="9" width="5" height="5" /></element>
+		<element ref="blackd"><bounds x="10.25" y="9.25" width="4.5" height="4.5" /></element>
 
-		<element ref="static_white"><bounds x="10" y="5.25" width="5" height="6.25" /></element>
-		<element ref="static_black"><bounds x="10.25" y="5.5" width="4.5" height="6.25" /></element>
+		<element ref="black"><bounds x="12.375" y="8.5" width="0.25" height="2" /></element>
+		<element ref="line30"><bounds x="10.875" y="9" width="1.25" height="1.25" /><orientation rotate="90" flipx="yes" /></element>
+		<element ref="line30"><bounds x="12.875" y="9" width="1.25" height="1.25" /><orientation rotate="90" /></element>
+		<element ref="line30"><bounds x="9.975" y="10.0" width="1.25" height="1.25" /></element>
+		<element ref="line30"><bounds x="13.775" y="10.0" width="1.25" height="1.25" /><orientation flipx="yes" /></element>
 
-		<element ref="disk_white"><bounds x="10" y="9" width="5" height="5" /></element>
-		<element ref="disk_black"><bounds x="10.25" y="9.25" width="4.5" height="4.5" /></element>
-		<element ref="static_black"><bounds x="10.85" y="8.5" width="0.35" height="3" /></element>
-		<element ref="static_black"><bounds x="12.25" y="8.5" width="0.5" height="3" /></element>
-		<element ref="static_black"><bounds x="13.8" y="8.5" width="0.35" height="3" /></element>
-		<element ref="static_white"><bounds x="10.1" y="11.25" width="4.8" height="0.25" /></element>
+		<element ref="white"><bounds x="10.1" y="11.25" width="4.8" height="0.25" /></element>
+		<element ref="white"><bounds x="10" y="5.25" width="0.25" height="6.25" /></element>
+		<element ref="white"><bounds x="14.75" y="5.25" width="0.5" height="6.25" /></element>
+		<element ref="black"><bounds x="15" y="5.5" width="0.5" height="8" /></element>
 
-		<element ref="disk_white"><bounds x="10" y="19.25" width="5" height="5" /></element>
-		<element ref="disk_black"><bounds x="10.25" y="19.5" width="4.5" height="4.5" /></element>
-		<element ref="static_white"><bounds x="2.3" y="21.65" width="20.4" height="5" /></element>
+		<element ref="whited"><bounds x="10" y="19.25" width="5" height="5" /></element>
+		<element ref="blackd"><bounds x="10.25" y="19.5" width="4.5" height="4.5" /></element>
+		<element ref="white"><bounds x="2.3" y="21.65" width="20.4" height="5" /></element>
 
 		<element ref="text_l1"><bounds x="3" y="21.85" width="11" height="0.6" /></element>
 		<element ref="text_l2"><bounds x="11" y="21.85" width="11" height="0.6" /></element>
 
-		<element ref="static_orange"><bounds x="5.5" y="21.9" width="14" height="5" /></element>
-		<element ref="static_orange"><bounds x="2.25" y="22.65" width="20.5" height="5" /></element>
-		<element ref="static_black"><bounds x="0" y="26.15" width="25" height="5" /></element>
-		<element ref="static_black"><bounds x="0" y="0" width="25" height="5.25" /></element>
-		<element ref="static_orange"><bounds x="2.25" y="2.5" width="20.5" height="2.75" /></element>
+		<element ref="orange"><bounds x="5.5" y="21.9" width="14" height="5" /></element>
+		<element ref="orange"><bounds x="2.25" y="22.65" width="20.5" height="5" /></element>
+		<element ref="black"><bounds x="0" y="26.15" width="25" height="5" /></element>
+		<element ref="black"><bounds x="0" y="0" width="25" height="5.25" /></element>
+		<element ref="orange"><bounds x="2.25" y="2.5" width="20.5" height="2.75" /></element>
 
-		<element ref="static_white"><bounds x="10" y="22.15" width="5" height="3.75" /></element>
-		<element ref="static_black"><bounds x="10.25" y="22.4" width="4.5" height="3.25" /></element>
+		<element ref="white"><bounds x="10" y="22.15" width="5" height="3.75" /></element>
+		<element ref="black"><bounds x="10.25" y="22.4" width="4.5" height="3.25" /></element>
 
-		<element ref="disk_white"><bounds x="11.25" y="4.625" width="2.5" height="1.5" /></element>
-		<element ref="disk_black"><bounds x="11.5" y="4.875" width="2" height="1" /></element>
+		<element ref="whited"><bounds x="11.25" y="4.625" width="2.5" height="1.5" /></element>
+		<element ref="blackd"><bounds x="11.5" y="4.875" width="2" height="1" /></element>
 
-		<element ref="static_white"><bounds x="10" y="2.75" width="5" height="2.1" /></element>
-		<element ref="static_black"><bounds x="10.25" y="3" width="4.5" height="1.55" /></element>
-
-	<!-- leds -->
+		<element ref="white"><bounds x="10" y="2.75" width="5" height="2.1" /></element>
+		<element ref="black"><bounds x="10.25" y="3" width="4.5" height="1.55" /></element>
 
+		<!-- leds -->
 		<element name="digit0" ref="digit"><bounds x="10.75" y="23.025" width="1.5" height="2" /></element>
 		<element name="digit1" ref="digit"><bounds x="12.75" y="23.025" width="1.5" height="2" /></element>
 
diff --git a/src/mame/layout/mbaskb2.lay b/src/mame/layout/mbaskb2.lay
index c3f3bd05871..01af34f350d 100644
--- a/src/mame/layout/mbaskb2.lay
+++ b/src/mame/layout/mbaskb2.lay
@@ -81,17 +81,15 @@ license:CC0
 		<element ref="orange"><bounds x="121" y="0" width="14" height="115" /></element>
 		<element ref="orange"><bounds x="5" y="0" width="130" height="19" /></element>
 
-		<element ref="white"><bounds x="59" y="0" width="22" height="19.5" /></element>
-		<element ref="black"><bounds x="60" y="0" width="20" height="19" /></element>
-
-		<element ref="whited"><bounds x="64.5" y="16" width="11" height="7" /></element>
-		<element ref="blackd"><bounds x="65.5" y="17" width="9" height="5" /></element>
-
-		<element ref="black"><bounds x="0" y="0" width="52" height="12" /></element>
-		<element ref="black"><bounds x="88" y="0" width="52" height="12" /></element>
+		<element ref="black"><bounds x="0" y="0" width="140" height="12" /></element>
 		<element ref="black"><bounds x="0" y="0" width="12" height="120" /></element>
 		<element ref="black"><bounds x="128" y="0" width="12" height="120" /></element>
 		<element ref="black"><bounds x="0" y="104" width="140" height="120" /></element>
+
+		<element ref="white"><bounds x="59" y="0" width="22" height="19.5" /></element>
+		<element ref="black"><bounds x="60" y="0" width="20" height="19" /></element>
+		<element ref="whited"><bounds x="64.5" y="16" width="11" height="7" /></element>
+		<element ref="blackd"><bounds x="65.5" y="17" width="9" height="5" /></element>
 		<element ref="black"><bounds x="-1" y="-1" width="150" height="4.5" /></element>
 
 		<!-- leds -->
diff --git a/src/mame/layout/mfootb2.lay b/src/mame/layout/mfootb2.lay
index 6834aa11c1c..d1cacb0d0f6 100644
--- a/src/mame/layout/mfootb2.lay
+++ b/src/mame/layout/mfootb2.lay
@@ -6,9 +6,9 @@ license:CC0
 
 <!-- define elements -->
 
-	<element name="static_black"><rect><color red="0.0" green="0.0" blue="0.0" /></rect></element>
-	<element name="static_white"><rect><color red="0.8" green="0.8" blue="0.8" /></rect></element>
-	<element name="static_green"><rect><color red="0.1" green="0.5" blue="0.2" /></rect></element>
+	<element name="black"><rect><color red="0.0" green="0.0" blue="0.0" /></rect></element>
+	<element name="white"><rect><color red="0.8" green="0.8" blue="0.8" /></rect></element>
+	<element name="green"><rect><color red="0.1" green="0.5" blue="0.2" /></rect></element>
 
 	<element name="text_down">
 		<rect><color red="0.8" green="0.8" blue="0.8" /></rect>
@@ -61,8 +61,8 @@ license:CC0
 <!-- score/status panel -->
 
 	<group name="panel">
-		<element ref="static_white"><bounds x="2" y="0" width="179" height="48" /></element>
-		<element ref="static_black"><bounds x="4" y="11" width="175" height="26" /></element>
+		<element ref="white"><bounds x="2" y="0" width="179" height="48" /></element>
+		<element ref="black"><bounds x="4" y="11" width="175" height="26" /></element>
 
 		<element name="digit8" ref="digit"><bounds x="19.5"  y="16" width="12" height="16" /></element>
 		<element name="digit9" ref="digit"><bounds x="35.5"  y="16" width="12" height="16" /></element>
@@ -72,8 +72,8 @@ license:CC0
 		<element name="digit6" ref="digit"><bounds x="131.5" y="16" width="12" height="16" /></element>
 		<element name="digit7" ref="digit"><bounds x="147.5" y="16" width="12" height="16" /></element>
 
-		<element ref="static_white"><bounds x="58" y="1" width="2" height="46" /></element>
-		<element ref="static_white"><bounds x="123" y="1" width="2" height="46" /></element>
+		<element ref="white"><bounds x="58" y="1" width="2" height="46" /></element>
+		<element ref="white"><bounds x="123" y="1" width="2" height="46" /></element>
 
 		<element ref="text_down"><bounds x="4" y="1" width="54" height="9" /></element>
 		<element ref="text_field"><bounds x="58" y="1" width="67" height="9" /></element>
@@ -90,36 +90,36 @@ license:CC0
 	<view name="Internal Layout">
 		<bounds left="0" right="203" top="-5.7" bottom="109" />
 
-		<element ref="static_green"><bounds x="-1" y="27" width="205" height="83" /></element>
+		<element ref="green"><bounds x="-1" y="27" width="205" height="83" /></element>
 		<group ref="panel"><bounds x="22" y="-5.7" width="159" height="42.6" /></group>
 
 		<!-- playing field -->
-		<element ref="static_white"><bounds x="-1" y="53" width="205" height="54" /></element>
+		<element ref="white"><bounds x="-1" y="53" width="205" height="54" /></element>
 
-		<element ref="static_black"><bounds x="2" y="55" width="19" height="50" /></element>
-		<element ref="static_black"><bounds x="22" y="55" width="19" height="50" /></element>
-		<element ref="static_black"><bounds x="42" y="55" width="19" height="50" /></element>
-		<element ref="static_black"><bounds x="62" y="55" width="19" height="50" /></element>
-		<element ref="static_black"><bounds x="82" y="55" width="19" height="50" /></element>
-		<element ref="static_black"><bounds x="102" y="55" width="19" height="50" /></element>
-		<element ref="static_black"><bounds x="122" y="55" width="19" height="50" /></element>
-		<element ref="static_black"><bounds x="142" y="55" width="19" height="50" /></element>
-		<element ref="static_black"><bounds x="162" y="55" width="19" height="50" /></element>
-		<element ref="static_black"><bounds x="182" y="55" width="19" height="50" /></element>
+		<element ref="black"><bounds x="2" y="55" width="19" height="50" /></element>
+		<element ref="black"><bounds x="22" y="55" width="19" height="50" /></element>
+		<element ref="black"><bounds x="42" y="55" width="19" height="50" /></element>
+		<element ref="black"><bounds x="62" y="55" width="19" height="50" /></element>
+		<element ref="black"><bounds x="82" y="55" width="19" height="50" /></element>
+		<element ref="black"><bounds x="102" y="55" width="19" height="50" /></element>
+		<element ref="black"><bounds x="122" y="55" width="19" height="50" /></element>
+		<element ref="black"><bounds x="142" y="55" width="19" height="50" /></element>
+		<element ref="black"><bounds x="162" y="55" width="19" height="50" /></element>
+		<element ref="black"><bounds x="182" y="55" width="19" height="50" /></element>
 
-		<element ref="static_white"><bounds x="0" y="71" width="203" height="1" /></element>
-		<element ref="static_white"><bounds x="0" y="88" width="203" height="1" /></element>
+		<element ref="white"><bounds x="0" y="71" width="203" height="1" /></element>
+		<element ref="white"><bounds x="0" y="88" width="203" height="1" /></element>
 
-		<element ref="static_black"><bounds x="3.5" y="56" width="16" height="48" /></element>
-		<element ref="static_black"><bounds x="23.5" y="56" width="16" height="48" /></element>
-		<element ref="static_black"><bounds x="43.5" y="56" width="16" height="48" /></element>
-		<element ref="static_black"><bounds x="63.5" y="56" width="16" height="48" /></element>
-		<element ref="static_black"><bounds x="83.5" y="56" width="16" height="48" /></element>
-		<element ref="static_black"><bounds x="103.5" y="56" width="16" height="48" /></element>
-		<element ref="static_black"><bounds x="123.5" y="56" width="16" height="48" /></element>
-		<element ref="static_black"><bounds x="143.5" y="56" width="16" height="48" /></element>
-		<element ref="static_black"><bounds x="163.5" y="56" width="16" height="48" /></element>
-		<element ref="static_black"><bounds x="183.5" y="56" width="16" height="48" /></element>
+		<element ref="black"><bounds x="3.5" y="56" width="16" height="48" /></element>
+		<element ref="black"><bounds x="23.5" y="56" width="16" height="48" /></element>
+		<element ref="black"><bounds x="43.5" y="56" width="16" height="48" /></element>
+		<element ref="black"><bounds x="63.5" y="56" width="16" height="48" /></element>
+		<element ref="black"><bounds x="83.5" y="56" width="16" height="48" /></element>
+		<element ref="black"><bounds x="103.5" y="56" width="16" height="48" /></element>
+		<element ref="black"><bounds x="123.5" y="56" width="16" height="48" /></element>
+		<element ref="black"><bounds x="143.5" y="56" width="16" height="48" /></element>
+		<element ref="black"><bounds x="163.5" y="56" width="16" height="48" /></element>
+		<element ref="black"><bounds x="183.5" y="56" width="16" height="48" /></element>
 
 		<element name="8.8" ref="seg"><bounds x="7" y="62" width="9" height="2" /></element>
 		<element name="8.9" ref="seg"><bounds x="7" y="79" width="9" height="2" /></element>
@@ -162,9 +162,9 @@ license:CC0
 		<element name="7.10" ref="seg"><bounds x="187" y="96" width="9" height="2" /></element>
 
 		<!-- cut edges -->
-		<element ref="static_black"><bounds x="-10" y="0" width="10" height="150" /></element>
-		<element ref="static_black"><bounds x="203" y="0" width="10" height="150" /></element>
-		<element ref="static_black"><bounds x="-10" y="109" width="300" height="10" /></element>
+		<element ref="black"><bounds x="-10" y="0" width="10" height="150" /></element>
+		<element ref="black"><bounds x="203" y="0" width="10" height="150" /></element>
+		<element ref="black"><bounds x="-10" y="109" width="300" height="10" /></element>
 
 	</view>
 </mamelayout>
diff --git a/src/mame/layout/mhockey.lay b/src/mame/layout/mhockey.lay
index 0e34e51bd2c..92cb13900f0 100644
--- a/src/mame/layout/mhockey.lay
+++ b/src/mame/layout/mhockey.lay
@@ -6,13 +6,13 @@ license:CC0
 
 <!-- define elements -->
 
-	<element name="static_black"><rect><color red="0" green="0" blue="0" /></rect></element>
-	<element name="disk_black"><disk><color red="0" green="0" blue="0" /></disk></element>
-	<element name="static_white"><rect><color red="0.8" green="0.8" blue="0.8" /></rect></element>
-	<element name="disk_white"><disk><color red="0.8" green="0.8" blue="0.8" /></disk></element>
-	<element name="static_red"><rect><color red="0.25" green="0.07" blue="0.02" /></rect></element>
-	<element name="disk_red"><disk><color red="0.25" green="0.07" blue="0.02" /></disk></element>
-	<element name="static_blue"><rect><color red="0.2" green="0.5" blue="0.65" /></rect></element>
+	<element name="black"><rect><color red="0" green="0" blue="0" /></rect></element>
+	<element name="blackd"><disk><color red="0" green="0" blue="0" /></disk></element>
+	<element name="white"><rect><color red="0.8" green="0.8" blue="0.8" /></rect></element>
+	<element name="whited"><disk><color red="0.8" green="0.8" blue="0.8" /></disk></element>
+	<element name="red"><rect><color red="0.25" green="0.07" blue="0.02" /></rect></element>
+	<element name="redd"><disk><color red="0.25" green="0.07" blue="0.02" /></disk></element>
+	<element name="blue"><rect><color red="0.2" green="0.5" blue="0.65" /></rect></element>
 
 	<element name="f1">
 		<rect>
@@ -82,39 +82,37 @@ license:CC0
 	<view name="Internal Layout">
 		<bounds left="2.26" right="22.74" top="4.26" bottom="26.14" />
 
-	<!-- bezel -->
-
+		<!-- bezel -->
 		<element ref="f1"><bounds x="0" y="0" width="30" height="30" /></element>
 
 		<element ref="text_p"><bounds x="2.5" y="6.32" width="2.5" height="0.6" /></element>
 		<element ref="text_p"><bounds x="20" y="6.32" width="2.5" height="0.6" /></element>
 
-		<element ref="static_red"><bounds x="4" y="9.5" width="17" height="0.25" /></element>
-		<element ref="static_white"><bounds x="10" y="6.5" width="5" height="3.25" /></element>
-		<element ref="static_red"><bounds x="10" y="9.75" width="5" height="3.25" /></element>
-		<element ref="static_black"><bounds x="10.25" y="6.75" width="4.5" height="2.75" /></element>
-		<element ref="static_black"><bounds x="10.25" y="9.75" width="4.5" height="3" /></element>
+		<element ref="red"><bounds x="4" y="9.5" width="17" height="0.25" /></element>
+		<element ref="white"><bounds x="10" y="6.5" width="5" height="3.25" /></element>
+		<element ref="red"><bounds x="10" y="9.75" width="5" height="3.25" /></element>
+		<element ref="black"><bounds x="10.25" y="6.75" width="4.5" height="2.75" /></element>
+		<element ref="black"><bounds x="10.25" y="9.75" width="4.5" height="3" /></element>
 
-		<element ref="disk_red"><bounds x="5.5" y="14" width="4" height="4" /></element>
-		<element ref="disk_black"><bounds x="5.75" y="14.25" width="3.5" height="3.5" /></element>
-		<element ref="disk_red"><bounds x="15.5" y="14" width="4" height="4" /></element>
-		<element ref="disk_black"><bounds x="15.75" y="14.25" width="3.5" height="3.5" /></element>
-		<element ref="disk_red"><bounds x="10.5" y="19.75" width="4" height="4" /></element>
-		<element ref="disk_black"><bounds x="10.75" y="20" width="3.5" height="3.5" /></element>
-		<element ref="static_white"><bounds x="2.3" y="21.65" width="20.4" height="5" /></element>
+		<element ref="redd"><bounds x="5.5" y="14" width="4" height="4" /></element>
+		<element ref="blackd"><bounds x="5.75" y="14.25" width="3.5" height="3.5" /></element>
+		<element ref="redd"><bounds x="15.5" y="14" width="4" height="4" /></element>
+		<element ref="blackd"><bounds x="15.75" y="14.25" width="3.5" height="3.5" /></element>
+		<element ref="redd"><bounds x="10.5" y="19.75" width="4" height="4" /></element>
+		<element ref="blackd"><bounds x="10.75" y="20" width="3.5" height="3.5" /></element>
+		<element ref="white"><bounds x="2.3" y="21.65" width="20.4" height="5" /></element>
 
 		<element ref="text_l1"><bounds x="3" y="21.85" width="11" height="0.6" /></element>
 		<element ref="text_l2"><bounds x="11" y="21.85" width="11" height="0.6" /></element>
 
-		<element ref="static_blue"><bounds x="5.5" y="21.9" width="14" height="5" /></element>
-		<element ref="static_blue"><bounds x="2.25" y="22.65" width="20.5" height="5" /></element>
-		<element ref="static_black"><bounds x="0" y="26.15" width="25" height="5" /></element>
+		<element ref="blue"><bounds x="5.5" y="21.9" width="14" height="5" /></element>
+		<element ref="blue"><bounds x="2.25" y="22.65" width="20.5" height="5" /></element>
+		<element ref="black"><bounds x="0" y="26.15" width="25" height="5" /></element>
 
-		<element ref="static_white"><bounds x="10" y="22.15" width="5" height="3.75" /></element>
-		<element ref="static_black"><bounds x="10.25" y="22.4" width="4.5" height="3.25" /></element>
-
-	<!-- leds -->
+		<element ref="white"><bounds x="10" y="22.15" width="5" height="3.75" /></element>
+		<element ref="black"><bounds x="10.25" y="22.4" width="4.5" height="3.25" /></element>
 
+		<!-- leds -->
 		<element name="digit0" ref="digit"><bounds x="10.75" y="23.025" width="1.5" height="2" /></element>
 		<element name="digit1" ref="digit"><bounds x="12.75" y="23.025" width="1.5" height="2" /></element>
 
diff --git a/src/mame/layout/mhockeya.lay b/src/mame/layout/mhockeya.lay
index 18694abd7ec..3da6d35701f 100644
--- a/src/mame/layout/mhockeya.lay
+++ b/src/mame/layout/mhockeya.lay
@@ -6,13 +6,13 @@ license:CC0
 
 <!-- define elements -->
 
-	<element name="static_black"><rect><color red="0" green="0" blue="0" /></rect></element>
-	<element name="disk_black"><disk><color red="0" green="0" blue="0" /></disk></element>
-	<element name="static_white"><rect><color red="0.8" green="0.8" blue="0.8" /></rect></element>
-	<element name="disk_white"><disk><color red="0.8" green="0.8" blue="0.8" /></disk></element>
-	<element name="static_red"><rect><color red="0.25" green="0.07" blue="0.02" /></rect></element>
-	<element name="disk_red"><disk><color red="0.25" green="0.07" blue="0.02" /></disk></element>
-	<element name="static_blue"><rect><color red="0.2" green="0.5" blue="0.65" /></rect></element>
+	<element name="black"><rect><color red="0" green="0" blue="0" /></rect></element>
+	<element name="blackd"><disk><color red="0" green="0" blue="0" /></disk></element>
+	<element name="white"><rect><color red="0.8" green="0.8" blue="0.8" /></rect></element>
+	<element name="whited"><disk><color red="0.8" green="0.8" blue="0.8" /></disk></element>
+	<element name="red"><rect><color red="0.25" green="0.07" blue="0.02" /></rect></element>
+	<element name="redd"><disk><color red="0.25" green="0.07" blue="0.02" /></disk></element>
+	<element name="blue"><rect><color red="0.2" green="0.5" blue="0.65" /></rect></element>
 
 	<element name="text_l1">
 		<rect><color red="0.8" green="0.8" blue="0.8" /></rect>
@@ -40,50 +40,48 @@ license:CC0
 	<view name="Internal Layout">
 		<bounds left="2.26" right="22.74" top="2.26" bottom="26.14" />
 
-	<!-- bezel -->
+		<!-- bezel -->
+		<element ref="white"><bounds x="2.25" y="4" width="20.5" height="23" /></element>
+		<element ref="black"><bounds x="2.5" y="4.5" width="20" height="23" /></element>
 
-		<element ref="static_white"><bounds x="2.25" y="4" width="20.5" height="23" /></element>
-		<element ref="static_black"><bounds x="2.5" y="4.5" width="20" height="23" /></element>
-
-		<element ref="disk_red"><bounds x="10" y="19.25" width="5" height="5" /></element>
-		<element ref="disk_black"><bounds x="10.25" y="19.5" width="4.5" height="4.5" /></element>
-		<element ref="static_white"><bounds x="2.3" y="21.65" width="20.4" height="5" /></element>
+		<element ref="redd"><bounds x="10" y="19.25" width="5" height="5" /></element>
+		<element ref="blackd"><bounds x="10.25" y="19.5" width="4.5" height="4.5" /></element>
+		<element ref="white"><bounds x="2.3" y="21.65" width="20.4" height="5" /></element>
 
 		<element ref="text_l1"><bounds x="3" y="21.85" width="11" height="0.6" /></element>
 		<element ref="text_l2"><bounds x="11" y="21.85" width="11" height="0.6" /></element>
 
-		<element ref="static_blue"><bounds x="5.5" y="21.9" width="14" height="5" /></element>
-		<element ref="static_blue"><bounds x="2.25" y="22.65" width="20.5" height="5" /></element>
-		<element ref="static_black"><bounds x="0" y="26.15" width="25" height="5" /></element>
-		<element ref="static_black"><bounds x="0" y="0" width="25" height="5.25" /></element>
-		<element ref="static_blue"><bounds x="2.25" y="2.25" width="20.5" height="3" /></element>
+		<element ref="blue"><bounds x="5.5" y="21.9" width="14" height="5" /></element>
+		<element ref="blue"><bounds x="2.25" y="22.65" width="20.5" height="5" /></element>
+		<element ref="black"><bounds x="0" y="26.15" width="25" height="5" /></element>
+		<element ref="black"><bounds x="0" y="0" width="25" height="5.25" /></element>
+		<element ref="blue"><bounds x="2.25" y="2.25" width="20.5" height="3" /></element>
 
-		<element ref="disk_white"><bounds x="2.25" y="3.25" width="4" height="4" /></element>
-		<element ref="disk_black"><bounds x="2.5" y="3.5" width="3.5" height="3.5" /></element>
-		<element ref="disk_white"><bounds x="18.75" y="3.25" width="4" height="4" /></element>
-		<element ref="disk_black"><bounds x="19" y="3.5" width="3.5" height="3.5" /></element>
-		<element ref="static_white"><bounds x="4.25" y="3.25" width="16.5" height="10" /></element>
-		<element ref="static_black"><bounds x="4.25" y="3.5" width="16.5" height="10" /></element>
-		<element ref="static_black"><bounds x="2.5" y="5.25" width="20" height="10" /></element>
+		<element ref="whited"><bounds x="2.25" y="3.25" width="4" height="4" /></element>
+		<element ref="blackd"><bounds x="2.5" y="3.5" width="3.5" height="3.5" /></element>
+		<element ref="whited"><bounds x="18.75" y="3.25" width="4" height="4" /></element>
+		<element ref="blackd"><bounds x="19" y="3.5" width="3.5" height="3.5" /></element>
+		<element ref="white"><bounds x="4.25" y="3.25" width="16.5" height="10" /></element>
+		<element ref="black"><bounds x="4.25" y="3.5" width="16.5" height="10" /></element>
+		<element ref="black"><bounds x="2.5" y="5.25" width="20" height="10" /></element>
 
-		<element ref="static_white"><bounds x="10" y="2.75" width="5" height="3" /></element>
-		<element ref="static_black"><bounds x="10.25" y="3" width="4.5" height="3" /></element>
+		<element ref="white"><bounds x="10" y="2.75" width="5" height="3" /></element>
+		<element ref="black"><bounds x="10.25" y="3" width="4.5" height="3" /></element>
 
-		<element ref="static_blue"><bounds x="2.5" y="15.6" width="20" height="0.25" /></element>
-		<element ref="static_red"><bounds x="2.5" y="5.25" width="20" height="0.25" /></element>
-		<element ref="static_red"><bounds x="10" y="5.25" width="5" height="2.25" /></element>
-		<element ref="static_black"><bounds x="10.25" y="5.5" width="4.5" height="1.75" /></element>
+		<element ref="blue"><bounds x="2.5" y="15.6" width="20" height="0.25" /></element>
+		<element ref="red"><bounds x="2.5" y="5.25" width="20" height="0.25" /></element>
+		<element ref="red"><bounds x="10" y="5.25" width="5" height="2.25" /></element>
+		<element ref="black"><bounds x="10.25" y="5.5" width="4.5" height="1.75" /></element>
 
-		<element ref="disk_red"><bounds x="4.5" y="8.5" width="5" height="5" /></element>
-		<element ref="disk_black"><bounds x="4.75" y="8.75" width="4.5" height="4.5" /></element>
-		<element ref="disk_red"><bounds x="15.5" y="8.5" width="5" height="5" /></element>
-		<element ref="disk_black"><bounds x="15.75" y="8.75" width="4.5" height="4.5" /></element>
+		<element ref="redd"><bounds x="4.5" y="8.5" width="5" height="5" /></element>
+		<element ref="blackd"><bounds x="4.75" y="8.75" width="4.5" height="4.5" /></element>
+		<element ref="redd"><bounds x="15.5" y="8.5" width="5" height="5" /></element>
+		<element ref="blackd"><bounds x="15.75" y="8.75" width="4.5" height="4.5" /></element>
 
-		<element ref="static_white"><bounds x="10" y="22.15" width="5" height="3.75" /></element>
-		<element ref="static_black"><bounds x="10.25" y="22.4" width="4.5" height="3.25" /></element>
-
-	<!-- leds -->
+		<element ref="white"><bounds x="10" y="22.15" width="5" height="3.75" /></element>
+		<element ref="black"><bounds x="10.25" y="22.4" width="4.5" height="3.25" /></element>
 
+		<!-- leds -->
 		<element name="digit0" ref="digit"><bounds x="10.75" y="23.025" width="1.5" height="2" /></element>
 		<element name="digit1" ref="digit"><bounds x="12.75" y="23.025" width="1.5" height="2" /></element>
 
diff --git a/src/mame/layout/msoccer.lay b/src/mame/layout/msoccer.lay
index 442d5b53b26..b75b10724fe 100644
--- a/src/mame/layout/msoccer.lay
+++ b/src/mame/layout/msoccer.lay
@@ -6,11 +6,11 @@ license:CC0
 
 <!-- define elements -->
 
-	<element name="static_black"><rect><color red="0" green="0" blue="0" /></rect></element>
-	<element name="disk_black"><disk><color red="0" green="0" blue="0" /></disk></element>
-	<element name="static_white"><rect><color red="0.8" green="0.8" blue="0.8" /></rect></element>
-	<element name="disk_white"><disk><color red="0.8" green="0.8" blue="0.8" /></disk></element>
-	<element name="static_green"><rect><color red="0.2" green="0.55" blue="0.1" /></rect></element>
+	<element name="black"><rect><color red="0" green="0" blue="0" /></rect></element>
+	<element name="blackd"><disk><color red="0" green="0" blue="0" /></disk></element>
+	<element name="white"><rect><color red="0.8" green="0.8" blue="0.8" /></rect></element>
+	<element name="whited"><disk><color red="0.8" green="0.8" blue="0.8" /></disk></element>
+	<element name="green"><rect><color red="0.2" green="0.55" blue="0.1" /></rect></element>
 
 	<element name="text_l1">
 		<rect><color red="0.8" green="0.8" blue="0.8" /></rect>
@@ -38,41 +38,39 @@ license:CC0
 	<view name="Internal Layout">
 		<bounds left="2.26" right="22.74" top="3.36" bottom="26.14" />
 
-	<!-- bezel -->
+		<!-- bezel -->
+		<element ref="white"><bounds x="2.25" y="5" width="20.5" height="22" /></element>
+		<element ref="black"><bounds x="2.5" y="5.5" width="20" height="22" /></element>
 
-		<element ref="static_white"><bounds x="2.25" y="5" width="20.5" height="22" /></element>
-		<element ref="static_black"><bounds x="2.5" y="5.5" width="20" height="22" /></element>
+		<element ref="whited"><bounds x="10" y="9.55" width="5" height="5" /></element>
+		<element ref="blackd"><bounds x="10.25" y="9.8" width="4.5" height="4.5" /></element>
 
-		<element ref="disk_white"><bounds x="10" y="9.55" width="5" height="5" /></element>
-		<element ref="disk_black"><bounds x="10.25" y="9.8" width="4.5" height="4.5" /></element>
+		<element ref="white"><bounds x="6.5" y="5.25" width="12" height="7.75" /></element>
+		<element ref="black"><bounds x="6.75" y="5.5" width="11.5" height="7.25" /></element>
 
-		<element ref="static_white"><bounds x="6.5" y="5.25" width="12" height="7.75" /></element>
-		<element ref="static_black"><bounds x="6.75" y="5.5" width="11.5" height="7.25" /></element>
+		<element ref="white"><bounds x="9.25" y="5.25" width="6.5" height="2.25" /></element>
+		<element ref="black"><bounds x="9.5" y="5.5" width="6" height="1.75" /></element>
 
-		<element ref="static_white"><bounds x="9.25" y="5.25" width="6.5" height="2.25" /></element>
-		<element ref="static_black"><bounds x="9.5" y="5.5" width="6" height="1.75" /></element>
-
-		<element ref="disk_white"><bounds x="10" y="19.25" width="5" height="5" /></element>
-		<element ref="disk_black"><bounds x="10.25" y="19.5" width="4.5" height="4.5" /></element>
-		<element ref="static_white"><bounds x="2.3" y="21.65" width="20.4" height="5" /></element>
+		<element ref="whited"><bounds x="10" y="19.25" width="5" height="5" /></element>
+		<element ref="blackd"><bounds x="10.25" y="19.5" width="4.5" height="4.5" /></element>
+		<element ref="white"><bounds x="2.3" y="21.65" width="20.4" height="5" /></element>
 
 		<element ref="text_l1"><bounds x="3" y="21.85" width="11" height="0.6" /></element>
 		<element ref="text_l2"><bounds x="11" y="21.85" width="11" height="0.6" /></element>
 
-		<element ref="static_green"><bounds x="5.5" y="21.9" width="14" height="5" /></element>
-		<element ref="static_green"><bounds x="2.25" y="22.65" width="20.5" height="5" /></element>
-		<element ref="static_black"><bounds x="0" y="26.15" width="25" height="5" /></element>
-		<element ref="static_black"><bounds x="0" y="0" width="25" height="5.25" /></element>
-		<element ref="static_green"><bounds x="2.25" y="3.35" width="20.5" height="1.9" /></element>
+		<element ref="green"><bounds x="5.5" y="21.9" width="14" height="5" /></element>
+		<element ref="green"><bounds x="2.25" y="22.65" width="20.5" height="5" /></element>
+		<element ref="black"><bounds x="0" y="26.15" width="25" height="5" /></element>
+		<element ref="black"><bounds x="0" y="0" width="25" height="5.25" /></element>
+		<element ref="green"><bounds x="2.25" y="3.35" width="20.5" height="1.9" /></element>
 
-		<element ref="static_white"><bounds x="10" y="22.15" width="5" height="3.75" /></element>
-		<element ref="static_black"><bounds x="10.25" y="22.4" width="4.5" height="3.25" /></element>
+		<element ref="white"><bounds x="10" y="22.15" width="5" height="3.75" /></element>
+		<element ref="black"><bounds x="10.25" y="22.4" width="4.5" height="3.25" /></element>
 
-		<element ref="static_white"><bounds x="10" y="3.6" width="5" height="1.8" /></element>
-		<element ref="static_black"><bounds x="10.25" y="3.85" width="4.5" height="1.4" /></element>
-
-	<!-- leds -->
+		<element ref="white"><bounds x="10" y="3.6" width="5" height="1.8" /></element>
+		<element ref="black"><bounds x="10.25" y="3.85" width="4.5" height="1.4" /></element>
 
+		<!-- leds -->
 		<element name="digit0" ref="digit"><bounds x="10.75" y="23.025" width="1.5" height="2" /></element>
 		<element name="digit1" ref="digit"><bounds x="12.75" y="23.025" width="1.5" height="2" /></element>