From 48f6c13667b18931e441e556bfffd0de63637c59 Mon Sep 17 00:00:00 2001
From: Vas Crabb <vas@vastheman.com>
Date: Wed, 9 Sep 2020 02:54:44 +1000
Subject: [PATCH] -Fix layout regressions in spacezap/ebases and ccompan.

-emu/rendlay.cpp: Actually add the group bounds calculation fix.

-Update a few more layouts.
---
 src/emu/render.h                   |   4 +-
 src/emu/rendlay.cpp                |   9 +-
 src/mame/drivers/psikyo4.cpp       |   1 -
 src/mame/layout/mgavegas.lay       | 246 ++++----
 src/mame/layout/micropin.lay       | 311 +++++----
 src/mame/layout/mirage.lay         |  21 +-
 src/mame/layout/modulab.lay        | 106 ++--
 src/mame/layout/mpu4.lay           | 577 ++---------------
 src/mame/layout/mpu4ext.lay        | 969 ++---------------------------
 src/mame/layout/mpu4plasma.lay     | 539 ++--------------
 src/mame/layout/saitek_ccompan.lay |   7 +-
 src/mame/layout/sc2_vid.lay        |   3 -
 src/mame/layout/spacezap.lay       |   3 +-
 13 files changed, 493 insertions(+), 2303 deletions(-)

diff --git a/src/emu/render.h b/src/emu/render.h
index ab7daa753e3..8aff6b73af9 100644
--- a/src/emu/render.h
+++ b/src/emu/render.h
@@ -715,8 +715,8 @@ private:
 			util::xml::data_node const &parentnode,
 			group_map &groupmap,
 			std::vector<layout_group const *> &seen,
-			bool empty,
-			bool collection,
+			bool &empty,
+			bool vistoggle,
 			bool repeat,
 			bool init);
 
diff --git a/src/emu/rendlay.cpp b/src/emu/rendlay.cpp
index 3eedf6c728f..d51a7165c5d 100644
--- a/src/emu/rendlay.cpp
+++ b/src/emu/rendlay.cpp
@@ -1116,7 +1116,8 @@ void layout_group::resolve_bounds(environment &env, group_map &groupmap, std::ve
 	{
 		set_render_bounds_xy(m_bounds, 0.0F, 0.0F, 1.0F, 1.0F);
 		environment local(env);
-		resolve_bounds(local, m_groupnode, groupmap, seen, true, false, false, true);
+		bool empty;
+		resolve_bounds(local, m_groupnode, groupmap, seen, empty, false, false, true);
 	}
 	seen.pop_back();
 }
@@ -1126,8 +1127,8 @@ void layout_group::resolve_bounds(
 		util::xml::data_node const &parentnode,
 		group_map &groupmap,
 		std::vector<layout_group const *> &seen,
-		bool empty,
-		bool collection,
+		bool &empty,
+		bool vistoggle,
 		bool repeat,
 		bool init)
 {
@@ -1242,7 +1243,7 @@ void layout_group::resolve_bounds(
 		m_bounds_resolved = resolved;
 	}
 
-	if (!collection && !repeat)
+	if (!vistoggle && !repeat)
 		m_bounds_resolved = true;
 }
 
diff --git a/src/mame/drivers/psikyo4.cpp b/src/mame/drivers/psikyo4.cpp
index 5018829362d..7a4fa62a5f7 100644
--- a/src/mame/drivers/psikyo4.cpp
+++ b/src/mame/drivers/psikyo4.cpp
@@ -132,7 +132,6 @@ ROMs -
 #include "emu.h"
 #include "includes/psikyo4.h"
 
-#include "rendlay.h"
 #include "speaker.h"
 
 
diff --git a/src/mame/layout/mgavegas.lay b/src/mame/layout/mgavegas.lay
index 1cc032213cd..3e8b21ab026 100644
--- a/src/mame/layout/mgavegas.lay
+++ b/src/mame/layout/mgavegas.lay
@@ -11,13 +11,6 @@ license:CC0
 		</rect>
 	</element>
 
-	<element name="background">
-		<rect>
-			<bounds left="0" top="0" right="1" bottom="1" />
-			<color red="0.0" green="0.0" blue="0.0" />
-		</rect>
-	</element>
-
 	<element name="P0"><text string="MR"><color red="1.0" green="1.0" blue="1.0" /></text></element>
 	<element name="P1"><text string="MC"><color red="1.0" green="1.0" blue="1.0" /></text></element>
 	<element name="P2"><text string="ML"><color red="1.0" green="1.0" blue="1.0" /></text></element>
@@ -59,190 +52,187 @@ license:CC0
 
 	<view name="Default Layout">
 
-		<!-- Background -->
-		<backdrop element="background">
-			<bounds left="0" top="0" right="480" bottom="500" />
-		</backdrop>
+		<bounds left="0" top="0" right="480" bottom="500" />
 
 		<!-- LEDs -->
 
-		<bezel name="ML" element="red_led">
+		<element name="ML" ref="red_led">
 			<bounds x="280" y="50" width="5" height="5" />
-		</bezel>
-		<bezel name="MC" element="red_led">
+		</element>
+		<element name="MC" ref="red_led">
 			<bounds x="320" y="50" width="5" height="5" />
-		</bezel>
-		<bezel name="MR" element="red_led">
+		</element>
+		<element name="MR" ref="red_led">
 			<bounds x="360" y="50" width="5" height="5" />
-		</bezel>
+		</element>
 
-		<bezel name="CL" element="red_led">
+		<element name="CL" ref="red_led">
 			<bounds x="280" y="100" width="5" height="5" />
-		</bezel>
-		<bezel name="CC" element="red_led">
+		</element>
+		<element name="CC" ref="red_led">
 			<bounds x="320" y="100" width="5" height="5" />
-		</bezel>
-		<bezel name="CR" element="red_led">
+		</element>
+		<element name="CR" ref="red_led">
 			<bounds x="360" y="100" width="5" height="5" />
-		</bezel>
+		</element>
 
-		<bezel name="FL" element="red_led">
+		<element name="FL" ref="red_led">
 			<bounds x="280" y="150" width="5" height="5" />
-		</bezel>
-		<bezel name="FC" element="red_led">
+		</element>
+		<element name="FC" ref="red_led">
 			<bounds x="320" y="150" width="5" height="5" />
-		</bezel>
-		<bezel name="FR" element="red_led">
+		</element>
+		<element name="FR" ref="red_led">
 			<bounds x="360" y="150" width="5" height="5" />
-		</bezel>
+		</element>
 
-		<bezel name="PL" element="red_led">
+		<element name="PL" ref="red_led">
 			<bounds x="280" y="200" width="5" height="5" />
-		</bezel>
-		<bezel name="PC" element="red_led">
+		</element>
+		<element name="PC" ref="red_led">
 			<bounds x="320" y="200" width="5" height="5" />
-		</bezel>
-		<bezel name="PR" element="red_led">
+		</element>
+		<element name="PR" ref="red_led">
 			<bounds x="360" y="200" width="5" height="5" />
-		</bezel>
+		</element>
 
-		<bezel name="500" element="red_led">
+		<element name="500" ref="red_led">
 			<bounds x="410" y="50" width="5" height="5" />
-		</bezel>
-		<bezel name="300" element="red_led">
+		</element>
+		<element name="300" ref="red_led">
 			<bounds x="410" y="100" width="5" height="5" />
-		</bezel>
-		<bezel name="200" element="red_led">
+		</element>
+		<element name="200" ref="red_led">
 			<bounds x="410" y="150" width="5" height="5" />
-		</bezel>
-		<bezel name="100" element="red_led">
+		</element>
+		<element name="100" ref="red_led">
 			<bounds x="410" y="200" width="5" height="5" />
-		</bezel>
+		</element>
 
-		<bezel name="INSERTCOIN" element="red_led">
+		<element name="INSERTCOIN" ref="red_led">
 			<bounds x="270" y="250" width="5" height="5" />
-		</bezel>
-		<bezel name="NOCAMBIO" element="red_led">
+		</element>
+		<element name="NOCAMBIO" ref="red_led">
 			<bounds x="310" y="250" width="5" height="5" />
-		</bezel>
-		<bezel name="FUSE" element="red_led">
+		</element>
+		<element name="FUSE" ref="red_led">
 			<bounds x="350" y="250" width="5" height="5" />
-		</bezel>
-		<bezel name="FALTA" element="red_led">
+		</element>
+		<element name="FALTA" ref="red_led">
 			<bounds x="400" y="250" width="5" height="5" />
-		</bezel>
+		</element>
 
-		<bezel name="MGA4" element="red_led">
+		<element name="MGA4" ref="red_led">
 			<bounds x="35" y="350" width="30" height="30" />
-		</bezel>
-		<bezel name="50" element="red_led">
+		</element>
+		<element name="50" ref="red_led">
 			<bounds x="80" y="350" width="30" height="30" />
-		</bezel>
-		<bezel name="MGA3" element="red_led">
+		</element>
+		<element name="MGA3" ref="red_led">
 			<bounds x="125" y="350" width="30" height="30" />
-		</bezel>
-		<bezel name="252" element="red_led">
+		</element>
+		<element name="252" ref="red_led">
 			<bounds x="170" y="350" width="30" height="30" />
-		</bezel>
-		<bezel name="250" element="red_led">
+		</element>
+		<element name="250" ref="red_led">
 			<bounds x="215" y="350" width="30" height="30" />
-		</bezel>
-		<bezel name="MGA2" element="red_led">
+		</element>
+		<element name="MGA2" ref="red_led">
 			<bounds x="260" y="350" width="30" height="30" />
-		</bezel>
-		<bezel name="1002" element="red_led">
+		</element>
+		<element name="1002" ref="red_led">
 			<bounds x="305" y="350" width="30" height="30" />
-		</bezel>
-		<bezel name="MGA" element="red_led">
+		</element>
+		<element name="MGA" ref="red_led">
 			<bounds x="350" y="350" width="30" height="30" />
-		</bezel>
-		<bezel name="25" element="red_led">
+		</element>
+		<element name="25" ref="red_led">
 			<bounds x="395" y="350" width="30" height="30" />
-		</bezel>
+		</element>
 
 
-		<bezel name="MGA4" element="red_led">
+		<element name="MGA4" ref="red_led">
 			<bounds x="40" y="50" width="5" height="5" />
-		</bezel>
-		<bezel name="50" element="red_led">
+		</element>
+		<element name="50" ref="red_led">
 			<bounds x="60" y="100" width="5" height="5" />
-		</bezel>
-		<bezel name="MGA3" element="red_led">
+		</element>
+		<element name="MGA3" ref="red_led">
 			<bounds x="80" y="150" width="5" height="5" />
-		</bezel>
-		<bezel name="252" element="red_led">
+		</element>
+		<element name="252" ref="red_led">
 			<bounds x="100" y="200" width="5" height="5" />
-		</bezel>
-		<bezel name="250" element="red_led">
+		</element>
+		<element name="250" ref="red_led">
 			<bounds x="120" y="250" width="5" height="5" />
-		</bezel>
-		<bezel name="MGA2" element="red_led">
+		</element>
+		<element name="MGA2" ref="red_led">
 			<bounds x="140" y="200" width="5" height="5" />
-		</bezel>
-		<bezel name="1002" element="red_led">
+		</element>
+		<element name="1002" ref="red_led">
 			<bounds x="160" y="150" width="5" height="5" />
-		</bezel>
-		<bezel name="MGA" element="red_led">
+		</element>
+		<element name="MGA" ref="red_led">
 			<bounds x="180" y="100" width="5" height="5" />
-		</bezel>
-		<bezel name="25" element="red_led">
+		</element>
+		<element name="25" ref="red_led">
 			<bounds x="200" y="50" width="5" height="5" />
-		</bezel>
+		</element>
 
-		<bezel name="PREMIOS" element="red_led">
+		<element name="PREMIOS" ref="red_led">
 			<bounds x="220" y="150" width="10" height="10" />
-		</bezel>
+		</element>
 
 
 
-		<bezel element="P0"><bounds left="350" right="370" top="20" bottom="40" /></bezel>
-		<bezel element="P1"><bounds left="310" right="330" top="20" bottom="40" /></bezel>
-		<bezel element="P2"><bounds left="270" right="290" top="20" bottom="40" /></bezel>
+		<element ref="P0"><bounds left="350" right="370" top="20" bottom="40" /></element>
+		<element ref="P1"><bounds left="310" right="330" top="20" bottom="40" /></element>
+		<element ref="P2"><bounds left="270" right="290" top="20" bottom="40" /></element>
 
-		<bezel element="P3"><bounds left="350" right="370" top="70" bottom="90" /></bezel>
-		<bezel element="P4"><bounds left="310" right="330" top="70" bottom="90" /></bezel>
-		<bezel element="P5"><bounds left="270" right="290" top="70" bottom="90" /></bezel>
+		<element ref="P3"><bounds left="350" right="370" top="70" bottom="90" /></element>
+		<element ref="P4"><bounds left="310" right="330" top="70" bottom="90" /></element>
+		<element ref="P5"><bounds left="270" right="290" top="70" bottom="90" /></element>
 
-		<bezel element="P6"><bounds left="350" right="370" top="120" bottom="140" /></bezel>
-		<bezel element="P7"><bounds left="310" right="330" top="120" bottom="140" /></bezel>
-		<bezel element="P8"><bounds left="270" right="290" top="120" bottom="140" /></bezel>
+		<element ref="P6"><bounds left="350" right="370" top="120" bottom="140" /></element>
+		<element ref="P7"><bounds left="310" right="330" top="120" bottom="140" /></element>
+		<element ref="P8"><bounds left="270" right="290" top="120" bottom="140" /></element>
 
-		<bezel element="P9"><bounds left="350" right="370" top="170" bottom="190" /></bezel>
-		<bezel element="P10"><bounds left="310" right="330" top="170" bottom="190" /></bezel>
-		<bezel element="P11"><bounds left="270" right="290" top="170" bottom="190" /></bezel>
+		<element ref="P9"><bounds left="350" right="370" top="170" bottom="190" /></element>
+		<element ref="P10"><bounds left="310" right="330" top="170" bottom="190" /></element>
+		<element ref="P11"><bounds left="270" right="290" top="170" bottom="190" /></element>
 
-		<bezel element="P12"><bounds left="400" right="420" top="20" bottom="40" /></bezel>
-		<bezel element="P13"><bounds left="400" right="420" top="70" bottom="90" /></bezel>
-		<bezel element="P14"><bounds left="400" right="420" top="120" bottom="140" /></bezel>
-		<bezel element="P15"><bounds left="400" right="420" top="170" bottom="190" /></bezel>
+		<element ref="P12"><bounds left="400" right="420" top="20" bottom="40" /></element>
+		<element ref="P13"><bounds left="400" right="420" top="70" bottom="90" /></element>
+		<element ref="P14"><bounds left="400" right="420" top="120" bottom="140" /></element>
+		<element ref="P15"><bounds left="400" right="420" top="170" bottom="190" /></element>
 
-		<bezel element="P16"><bounds left="270" right="290" top="220" bottom="240" /></bezel>
-		<bezel element="P17"><bounds left="310" right="330" top="220" bottom="240" /></bezel>
-		<bezel element="P18"><bounds left="350" right="370" top="220" bottom="240" /></bezel>
-		<bezel element="P19"><bounds left="400" right="420" top="220" bottom="240" /></bezel>
+		<element ref="P16"><bounds left="270" right="290" top="220" bottom="240" /></element>
+		<element ref="P17"><bounds left="310" right="330" top="220" bottom="240" /></element>
+		<element ref="P18"><bounds left="350" right="370" top="220" bottom="240" /></element>
+		<element ref="P19"><bounds left="400" right="420" top="220" bottom="240" /></element>
 
-		<bezel element="P20"><bounds left="35" right="55" top="320" bottom="340" /></bezel>
-		<bezel element="P21"><bounds left="80" right="100" top="320" bottom="340" /></bezel>
-		<bezel element="P22"><bounds left="125" right="145" top="320" bottom="340" /></bezel>
-		<bezel element="P23"><bounds left="170" right="190" top="320" bottom="340" /></bezel>
-		<bezel element="P24"><bounds left="215" right="235" top="320" bottom="340" /></bezel>
-		<bezel element="P25"><bounds left="260" right="280" top="320" bottom="340" /></bezel>
-		<bezel element="P26"><bounds left="305" right="325" top="320" bottom="340" /></bezel>
-		<bezel element="P27"><bounds left="350" right="370" top="320" bottom="340" /></bezel>
-		<bezel element="P28"><bounds left="395" right="415" top="320" bottom="340" /></bezel>
+		<element ref="P20"><bounds left="35" right="55" top="320" bottom="340" /></element>
+		<element ref="P21"><bounds left="80" right="100" top="320" bottom="340" /></element>
+		<element ref="P22"><bounds left="125" right="145" top="320" bottom="340" /></element>
+		<element ref="P23"><bounds left="170" right="190" top="320" bottom="340" /></element>
+		<element ref="P24"><bounds left="215" right="235" top="320" bottom="340" /></element>
+		<element ref="P25"><bounds left="260" right="280" top="320" bottom="340" /></element>
+		<element ref="P26"><bounds left="305" right="325" top="320" bottom="340" /></element>
+		<element ref="P27"><bounds left="350" right="370" top="320" bottom="340" /></element>
+		<element ref="P28"><bounds left="395" right="415" top="320" bottom="340" /></element>
 
 
-		<bezel element="P20"><bounds left="40" right="60" top="35" bottom="45" /></bezel>
-		<bezel element="P21"><bounds left="60" right="80" top="85" bottom="95" /></bezel>
-		<bezel element="P22"><bounds left="80" right="100" top="135" bottom="145" /></bezel>
-		<bezel element="P23"><bounds left="100" right="120" top="185" bottom="195" /></bezel>
-		<bezel element="P24"><bounds left="120" right="140" top="235" bottom="245" /></bezel>
-		<bezel element="P25"><bounds left="140" right="160" top="185" bottom="195" /></bezel>
-		<bezel element="P26"><bounds left="160" right="180" top="135" bottom="145" /></bezel>
-		<bezel element="P27"><bounds left="180" right="200" top="85" bottom="95" /></bezel>
-		<bezel element="P28"><bounds left="200" right="220" top="35" bottom="45" /></bezel>
+		<element ref="P20"><bounds left="40" right="60" top="35" bottom="45" /></element>
+		<element ref="P21"><bounds left="60" right="80" top="85" bottom="95" /></element>
+		<element ref="P22"><bounds left="80" right="100" top="135" bottom="145" /></element>
+		<element ref="P23"><bounds left="100" right="120" top="185" bottom="195" /></element>
+		<element ref="P24"><bounds left="120" right="140" top="235" bottom="245" /></element>
+		<element ref="P25"><bounds left="140" right="160" top="185" bottom="195" /></element>
+		<element ref="P26"><bounds left="160" right="180" top="135" bottom="145" /></element>
+		<element ref="P27"><bounds left="180" right="200" top="85" bottom="95" /></element>
+		<element ref="P28"><bounds left="200" right="220" top="35" bottom="45" /></element>
 
-		<bezel element="P29"><bounds left="190" right="260" top="130" bottom="150" /></bezel>
+		<element ref="P29"><bounds left="190" right="260" top="130" bottom="150" /></element>
 
 	</view>
 </mamelayout>
diff --git a/src/mame/layout/micropin.lay b/src/mame/layout/micropin.lay
index 714fd8628a8..6d9918dbc5b 100644
--- a/src/mame/layout/micropin.lay
+++ b/src/mame/layout/micropin.lay
@@ -16,13 +16,6 @@ copyright-holders:Robbbert
 		<disk><color red="1.0" green="0.0" blue="0.0" /></disk>
 	</element>
 
-	<element name="background">
-		<rect>
-			<bounds left="0" top="0" right="1" bottom="1" />
-			<color red="0.0" green="0.0" blue="0.0" />
-		</rect>
-	</element>
-
 	<element name="P0"><text string="BALL"><color red="1.0" green="1.0" blue="1.0" /></text></element>
 	<element name="P1"><text string="CREDIT"><color red="1.0" green="1.0" blue="1.0" /></text></element>
 	<element name="P2"><text string="BONUS"><color red="1.0" green="1.0" blue="1.0" /></text></element>
@@ -40,244 +33,240 @@ copyright-holders:Robbbert
 	<element name="P14"><text string="GAME OVER"><color red="1.0" green="1.0" blue="1.0" /></text></element>
 
 	<view name="Default Layout">
-
-		<!-- Background -->
-		<backdrop element="background">
-			<bounds left="0" top="20" right="1200" bottom="305" />
-		</backdrop>
+		<bounds left="0" top="20" right="1200" bottom="305" />
 
 		<!-- Text -->
-		<bezel element="P0"><bounds left="128" right="198" top="86" bottom="120" /></bezel>
-		<bezel element="P1"><bounds left="5" right="100" top="86" bottom="120" /></bezel>
-		<bezel element="P2"><bounds left="368" right="500" top="86" bottom="120" /></bezel>
-		<bezel element="P3"><bounds left="620" right="790" top="86" bottom="120" /></bezel>
-		<bezel element="P4"><bounds left="940" right="1110" top="86" bottom="120" /></bezel>
-		<bezel element="P5"><bounds left="620" right="790" top="171" bottom="205" /></bezel>
-		<bezel element="P6"><bounds left="940" right="1110" top="171" bottom="205" /></bezel>
-		<bezel element="P7"><bounds left="256" right="560" top="171" bottom="205" /></bezel>
-		<bezel element="P8"><bounds left="256" right="560" top="256" bottom="290" /></bezel>
-		<bezel element="P9"><bounds left="620" right="790" top="256" bottom="290" /></bezel>
-		<bezel element="P10"><bounds left="940" right="1110" top="256" bottom="290" /></bezel>
-		<bezel element="P11"><bounds left="50" right="180" top="132" bottom="158" /></bezel>
-		<bezel element="P12"><bounds left="50" right="100" top="173" bottom="199" /></bezel>
-		<bezel element="P13"><bounds left="50" right="200" top="214" bottom="240" /></bezel>
-		<bezel element="P14"><bounds left="50" right="170" top="255" bottom="281" /></bezel>
+		<element ref="P0"><bounds left="128" right="198" top="86" bottom="120" /></element>
+		<element ref="P1"><bounds left="5" right="100" top="86" bottom="120" /></element>
+		<element ref="P2"><bounds left="368" right="500" top="86" bottom="120" /></element>
+		<element ref="P3"><bounds left="620" right="790" top="86" bottom="120" /></element>
+		<element ref="P4"><bounds left="940" right="1110" top="86" bottom="120" /></element>
+		<element ref="P5"><bounds left="620" right="790" top="171" bottom="205" /></element>
+		<element ref="P6"><bounds left="940" right="1110" top="171" bottom="205" /></element>
+		<element ref="P7"><bounds left="256" right="560" top="171" bottom="205" /></element>
+		<element ref="P8"><bounds left="256" right="560" top="256" bottom="290" /></element>
+		<element ref="P9"><bounds left="620" right="790" top="256" bottom="290" /></element>
+		<element ref="P10"><bounds left="940" right="1110" top="256" bottom="290" /></element>
+		<element ref="P11"><bounds left="50" right="180" top="132" bottom="158" /></element>
+		<element ref="P12"><bounds left="50" right="100" top="173" bottom="199" /></element>
+		<element ref="P13"><bounds left="50" right="200" top="214" bottom="240" /></element>
+		<element ref="P14"><bounds left="50" right="170" top="255" bottom="281" /></element>
 
 		<!-- LEDs -->
-		<bezel name="led0" element="red_led">
-			<bounds left="600" right="620" top="93" bottom="113" /></bezel>
-		<bezel name="led1" element="red_led">
-			<bounds left="920" right="940" top="93" bottom="113" /></bezel>
-		<bezel name="led2" element="red_led">
-			<bounds left="600" right="620" top="178" bottom="198" /></bezel>
-		<bezel name="led3" element="red_led">
-			<bounds left="920" right="940" top="178" bottom="198" /></bezel>
-		<bezel name="led4" element="red_led">
-			<bounds left="15" right="35" top="176" bottom="196" /></bezel>
-		<bezel name="led5" element="red_led">
-			<bounds left="15" right="35" top="217" bottom="237" /></bezel>
-		<bezel name="led6" element="red_led">
-			<bounds left="15" right="35" top="258" bottom="278" /></bezel>
-		<bezel name="led7" element="red_led">
-			<bounds left="15" right="35" top="135" bottom="155" /></bezel>
+		<element name="led0" ref="red_led">
+			<bounds left="600" right="620" top="93" bottom="113" /></element>
+		<element name="led1" ref="red_led">
+			<bounds left="920" right="940" top="93" bottom="113" /></element>
+		<element name="led2" ref="red_led">
+			<bounds left="600" right="620" top="178" bottom="198" /></element>
+		<element name="led3" ref="red_led">
+			<bounds left="920" right="940" top="178" bottom="198" /></element>
+		<element name="led4" ref="red_led">
+			<bounds left="15" right="35" top="176" bottom="196" /></element>
+		<element name="led5" ref="red_led">
+			<bounds left="15" right="35" top="217" bottom="237" /></element>
+		<element name="led6" ref="red_led">
+			<bounds left="15" right="35" top="258" bottom="278" /></element>
+		<element name="led7" ref="red_led">
+			<bounds left="15" right="35" top="135" bottom="155" /></element>
 
 		<!-- Credits -->
-		<bezel name="digit54" element="digit">
+		<element name="digit54" ref="digit">
 			<bounds x="14" y="45" width="35" height="40" />
-		</bezel>
-		<bezel name="digit53" element="digit">
+		</element>
+		<element name="digit53" ref="digit">
 			<bounds x="58" y="45" width="35" height="40" />
-		</bezel>
+		</element>
 
 		<!-- Match / Balls Left -->
-		<bezel name="digit52" element="digit">
+		<element name="digit52" ref="digit">
 			<bounds x="148" y="45" width="35" height="40" />
-		</bezel>
+		</element>
 
 		<!-- Bonus -->
-		<bezel name="digit34" element="digit">
+		<element name="digit34" ref="digit">
 			<bounds x="300" y="45" width="35" height="40" />
-		</bezel>
-		<bezel name="digit33" element="digit">
+		</element>
+		<element name="digit33" ref="digit">
 			<bounds x="344" y="45" width="35" height="40" />
-		</bezel>
-		<bezel name="digit32" element="digit">
+		</element>
+		<element name="digit32" ref="digit">
 			<bounds x="388" y="45" width="35" height="40" />
-		</bezel>
-		<bezel name="digit14" element="digit">
+		</element>
+		<element name="digit14" ref="digit">
 			<bounds x="432" y="45" width="35" height="40" />
-		</bezel>
-		<bezel name="digit13" element="digit">
+		</element>
+		<element name="digit13" ref="digit">
 			<bounds x="476" y="45" width="35" height="40" />
-		</bezel>
-		<bezel name="digit12" element="digit">
+		</element>
+		<element name="digit12" ref="digit">
 			<bounds x="520" y="45" width="35" height="40" />
-		</bezel>
+		</element>
 
 		<!-- Player 1 Score -->
-		<bezel name="digit11" element="digit">
+		<element name="digit11" ref="digit">
 			<bounds x="620" y="45" width="35" height="40" />
-		</bezel>
-		<bezel name="digit10" element="digit">
+		</element>
+		<element name="digit10" ref="digit">
 			<bounds x="664" y="45" width="35" height="40" />
-		</bezel>
-		<bezel name="digit9" element="digit">
+		</element>
+		<element name="digit9" ref="digit">
 			<bounds x="708" y="45" width="35" height="40" />
-		</bezel>
-		<bezel name="digit8" element="digit">
+		</element>
+		<element name="digit8" ref="digit">
 			<bounds x="752" y="45" width="35" height="40" />
-		</bezel>
-		<bezel name="digit7" element="digit">
+		</element>
+		<element name="digit7" ref="digit">
 			<bounds x="796" y="45" width="35" height="40" />
-		</bezel>
-		<bezel name="digit6" element="digit">
+		</element>
+		<element name="digit6" ref="digit">
 			<bounds x="840" y="45" width="35" height="40" />
-		</bezel>
+		</element>
 
 		<!-- Player 2 Score -->
-		<bezel name="digit5" element="digit">
+		<element name="digit5" ref="digit">
 			<bounds x="940" y="45" width="35" height="40" />
-		</bezel>
-		<bezel name="digit4" element="digit">
+		</element>
+		<element name="digit4" ref="digit">
 			<bounds x="984" y="45" width="35" height="40" />
-		</bezel>
-		<bezel name="digit3" element="digit">
+		</element>
+		<element name="digit3" ref="digit">
 			<bounds x="1028" y="45" width="35" height="40" />
-		</bezel>
-		<bezel name="digit2" element="digit">
+		</element>
+		<element name="digit2" ref="digit">
 			<bounds x="1072" y="45" width="35" height="40" />
-		</bezel>
-		<bezel name="digit1" element="digit">
+		</element>
+		<element name="digit1" ref="digit">
 			<bounds x="1116" y="45" width="35" height="40" />
-		</bezel>
-		<bezel name="digit0" element="digit">
+		</element>
+		<element name="digit0" ref="digit">
 			<bounds x="1160" y="45" width="35" height="40" />
-		</bezel>
+		</element>
 
 		<!-- High Player Today -->
-		<bezel name="digit66" element="digit">
+		<element name="digit66" ref="digit">
 			<bounds x="256" y="130" width="35" height="40" />
-		</bezel>
-		<bezel name="digit65" element="digit">
+		</element>
+		<element name="digit65" ref="digit">
 			<bounds x="300" y="130" width="35" height="40" />
-		</bezel>
-		<bezel name="digit64" element="digit">
+		</element>
+		<element name="digit64" ref="digit">
 			<bounds x="344" y="130" width="35" height="40" />
-		</bezel>
-		<bezel name="digit63" element="digit">
+		</element>
+		<element name="digit63" ref="digit">
 			<bounds x="388" y="130" width="35" height="40" />
-		</bezel>
-		<bezel name="digit62" element="digit">
+		</element>
+		<element name="digit62" ref="digit">
 			<bounds x="432" y="130" width="35" height="40" />
-		</bezel>
-		<bezel name="digit61" element="digit">
+		</element>
+		<element name="digit61" ref="digit">
 			<bounds x="476" y="130" width="35" height="40" />
-		</bezel>
-		<bezel name="digit60" element="digit">
+		</element>
+		<element name="digit60" ref="digit">
 			<bounds x="520" y="130" width="35" height="40" />
-		</bezel>
+		</element>
 
 		<!-- Player 3 Score -->
-		<bezel name="digit31" element="digit">
+		<element name="digit31" ref="digit">
 			<bounds x="620" y="130" width="35" height="40" />
-		</bezel>
-		<bezel name="digit30" element="digit">
+		</element>
+		<element name="digit30" ref="digit">
 			<bounds x="664" y="130" width="35" height="40" />
-		</bezel>
-		<bezel name="digit29" element="digit">
+		</element>
+		<element name="digit29" ref="digit">
 			<bounds x="708" y="130" width="35" height="40" />
-		</bezel>
-		<bezel name="digit28" element="digit">
+		</element>
+		<element name="digit28" ref="digit">
 			<bounds x="752" y="130" width="35" height="40" />
-		</bezel>
-		<bezel name="digit27" element="digit">
+		</element>
+		<element name="digit27" ref="digit">
 			<bounds x="796" y="130" width="35" height="40" />
-		</bezel>
-		<bezel name="digit26" element="digit">
+		</element>
+		<element name="digit26" ref="digit">
 			<bounds x="840" y="130" width="35" height="40" />
-		</bezel>
+		</element>
 
 		<!-- Player 4 Score -->
-		<bezel name="digit25" element="digit">
+		<element name="digit25" ref="digit">
 			<bounds x="940" y="130" width="35" height="40" />
-		</bezel>
-		<bezel name="digit24" element="digit">
+		</element>
+		<element name="digit24" ref="digit">
 			<bounds x="984" y="130" width="35" height="40" />
-		</bezel>
-		<bezel name="digit23" element="digit">
+		</element>
+		<element name="digit23" ref="digit">
 			<bounds x="1028" y="130" width="35" height="40" />
-		</bezel>
-		<bezel name="digit22" element="digit">
+		</element>
+		<element name="digit22" ref="digit">
 			<bounds x="1072" y="130" width="35" height="40" />
-		</bezel>
-		<bezel name="digit21" element="digit">
+		</element>
+		<element name="digit21" ref="digit">
 			<bounds x="1116" y="130" width="35" height="40" />
-		</bezel>
-		<bezel name="digit20" element="digit">
+		</element>
+		<element name="digit20" ref="digit">
 			<bounds x="1160" y="130" width="35" height="40" />
-		</bezel>
+		</element>
 
 		<!-- High Team Today -->
-		<bezel name="digit73" element="digit">
+		<element name="digit73" ref="digit">
 			<bounds x="256" y="215" width="35" height="40" />
-		</bezel>
-		<bezel name="digit72" element="digit">
+		</element>
+		<element name="digit72" ref="digit">
 			<bounds x="300" y="215" width="35" height="40" />
-		</bezel>
-		<bezel name="digit71" element="digit">
+		</element>
+		<element name="digit71" ref="digit">
 			<bounds x="344" y="215" width="35" height="40" />
-		</bezel>
-		<bezel name="digit70" element="digit">
+		</element>
+		<element name="digit70" ref="digit">
 			<bounds x="388" y="215" width="35" height="40" />
-		</bezel>
-		<bezel name="digit69" element="digit">
+		</element>
+		<element name="digit69" ref="digit">
 			<bounds x="432" y="215" width="35" height="40" />
-		</bezel>
-		<bezel name="digit68" element="digit">
+		</element>
+		<element name="digit68" ref="digit">
 			<bounds x="476" y="215" width="35" height="40" />
-		</bezel>
-		<bezel name="digit67" element="digit">
+		</element>
+		<element name="digit67" ref="digit">
 			<bounds x="520" y="215" width="35" height="40" />
-		</bezel>
+		</element>
 
 		<!-- Team 1&3 -->
-		<bezel name="digit45" element="digit">
+		<element name="digit45" ref="digit">
 			<bounds x="620" y="215" width="35" height="40" />
-		</bezel>
-		<bezel name="digit44" element="digit">
+		</element>
+		<element name="digit44" ref="digit">
 			<bounds x="664" y="215" width="35" height="40" />
-		</bezel>
-		<bezel name="digit43" element="digit">
+		</element>
+		<element name="digit43" ref="digit">
 			<bounds x="708" y="215" width="35" height="40" />
-		</bezel>
-		<bezel name="digit42" element="digit">
+		</element>
+		<element name="digit42" ref="digit">
 			<bounds x="752" y="215" width="35" height="40" />
-		</bezel>
-		<bezel name="digit41" element="digit">
+		</element>
+		<element name="digit41" ref="digit">
 			<bounds x="796" y="215" width="35" height="40" />
-		</bezel>
-		<bezel name="digit40" element="digit">
+		</element>
+		<element name="digit40" ref="digit">
 			<bounds x="840" y="215" width="35" height="40" />
-		</bezel>
+		</element>
 
 		<!-- Team 2&4 -->
-		<bezel name="digit51" element="digit">
+		<element name="digit51" ref="digit">
 			<bounds x="940" y="215" width="35" height="40" />
-		</bezel>
-		<bezel name="digit50" element="digit">
+		</element>
+		<element name="digit50" ref="digit">
 			<bounds x="984" y="215" width="35" height="40" />
-		</bezel>
-		<bezel name="digit49" element="digit">
+		</element>
+		<element name="digit49" ref="digit">
 			<bounds x="1028" y="215" width="35" height="40" />
-		</bezel>
-		<bezel name="digit48" element="digit">
+		</element>
+		<element name="digit48" ref="digit">
 			<bounds x="1072" y="215" width="35" height="40" />
-		</bezel>
-		<bezel name="digit47" element="digit">
+		</element>
+		<element name="digit47" ref="digit">
 			<bounds x="1116" y="215" width="35" height="40" />
-		</bezel>
-		<bezel name="digit46" element="digit">
+		</element>
+		<element name="digit46" ref="digit">
 			<bounds x="1160" y="215" width="35" height="40" />
-		</bezel>
+		</element>
 	</view>
 </mamelayout>
diff --git a/src/mame/layout/mirage.lay b/src/mame/layout/mirage.lay
index f8f20563f04..d927f696c88 100644
--- a/src/mame/layout/mirage.lay
+++ b/src/mame/layout/mirage.lay
@@ -12,27 +12,16 @@ copyright-holders:R. Belmont
 		</led7seg>
 	</element>
 
-	<element name="background">
-		<rect>
-			<bounds left="0" top="0" right="1" bottom="1" />
-			<color red="0.0" green="0.0" blue="0.0" />
-		</rect>
-	</element>
-
 	<view name="Default Layout">
-
-		<!-- Background -->
-		<backdrop element="background">
-			<bounds left="0" top="0" right="42" bottom="28" />
-		</backdrop>
+		<bounds left="0" top="0" right="42" bottom="28" />
 
 		<!-- LEDs -->
-		<bezel name="digit0" element="digit">
+		<element name="digit0" ref="digit">
 			<bounds left="2" top="0" right="20" bottom="23" />
-		</bezel>
-		<bezel name="digit1" element="digit">
+		</element>
+		<element name="digit1" ref="digit">
 			<bounds left="22" top="0" right="40" bottom="23" />
-		</bezel>
+		</element>
 	</view>
 
 </mamelayout>
diff --git a/src/mame/layout/modulab.lay b/src/mame/layout/modulab.lay
index fe23a350452..55438d8a6ec 100644
--- a/src/mame/layout/modulab.lay
+++ b/src/mame/layout/modulab.lay
@@ -122,13 +122,13 @@ Esselte Studium Modulab layout
 	</element>
 
 	<group name="screw">
-		<bezel element="screwhead"><bounds x="0" y="0" width="100" height="100" /></bezel>
+		<element ref="screwhead"><bounds x="0" y="0" width="100" height="100" /></element>
 		<repeat count="50">
 			<param name="x1" start="25" increment="1" />
 			<param name="x2" start="75" increment="-1" />
 			<param name="y" start="25" increment="1" />
-			<bezel element="hole"><bounds x="~x1~" y="~y~" width="8" height="8" /></bezel>
-			<bezel element="hole"><bounds x="~x2~" y="~y~" width="8" height="8" /></bezel>
+			<element ref="hole"><bounds x="~x1~" y="~y~" width="8" height="8" /></element>
+			<element ref="hole"><bounds x="~x2~" y="~y~" width="8" height="8" /></element>
 		</repeat>
 	</group>
 
@@ -169,32 +169,32 @@ Esselte Studium Modulab layout
 	</element>
 
 	<group name="hdip">
-		<bezel element="~col~"><bounds x="10" y="20" width="~w~" height="~h~" /></bezel>
-		<bezel element="~t~"><bounds x="30" y="30" width="~tw~" height="~th~" /></bezel>
+		<element ref="~col~"><bounds x="10" y="20" width="~w~" height="~h~" /></element>
+		<element ref="~t~"><bounds x="30" y="30" width="~tw~" height="~th~" /></element>
 		<repeat count="~c~">
 			<param name="x" start="15" increment="35" />
-			<bezel element="silver"><bounds y="10" x="~x~" width="25" height="10" /></bezel>
-			<bezel element="silver"><bounds y="~b~" x="~x~" width="25" height="10" /></bezel>
+			<element ref="silver"><bounds y="10" x="~x~" width="25" height="10" /></element>
+			<element ref="silver"><bounds y="~b~" x="~x~" width="25" height="10" /></element>
 		</repeat>
 	</group>
 
 	<group name="vdip">
-		<bezel element="~col~"><bounds x="20" y="10" width="80" height="~h~" /></bezel>
-		<bezel element="~t~"><bounds x="30" y="30" width="60" height="30" /></bezel>
+		<element ref="~col~"><bounds x="20" y="10" width="80" height="~h~" /></element>
+		<element ref="~t~"><bounds x="30" y="30" width="60" height="30" /></element>
 		<repeat count="~c~">
 			<param name="y" start="15" increment="35" />
-			<bezel element="silver"><bounds x="10" y="~y~" width="10" height="25" /></bezel>
-			<bezel element="silver"><bounds x="100" y="~y~" width="10" height="25" /></bezel>
+			<element ref="silver"><bounds x="10" y="~y~" width="10" height="25" /></element>
+			<element ref="silver"><bounds x="100" y="~y~" width="10" height="25" /></element>
 		</repeat>
 	</group>
 
 	<group name="key">
-		<bezel element="~keycol~" inputtag="LINE~line~" inputmask="~mask~">
+		<element ref="~keycol~" inputtag="LINE~line~" inputmask="~mask~">
 			<bounds x="~x~" y="~y~" width="262" height="262" />
-		</bezel>
-		<bezel element="text_~bname~">
+		</element>
+		<element ref="text_~bname~">
 			<bounds x="~xt~" y="~yt~" width="150" height="150" />
-		</bezel>
+		</element>
 	</group>
 
 	<element name="digit" defstate="1">
@@ -204,9 +204,9 @@ Esselte Studium Modulab layout
 	</element>
 
 	<group name="digit">
-		<bezel name="digit~dno~" element="digit">
+		<element name="digit~dno~" ref="digit">
 			<bounds x="~x~" y="~y~" width="188" height="276" />
-		</bezel>
+		</element>
 	</group>
 
 	<element name="plexi">
@@ -220,17 +220,17 @@ Esselte Studium Modulab layout
 	</element>
 
 	<group name="hood">
-		<bezel element="plexi" />
+		<element ref="plexi" />
 	</group>
 
 	<group name="pcb">
-		<backdrop element="pcb_blue"><bounds left="0" top="0" right="3200" bottom="2400"/></backdrop>
-		<bezel element="text_esselte"><bounds x="164" y="2044" width="264" height="52" /></bezel>
-		<bezel element="text_studium"><bounds x="164" y="2110" width="264" height="52" /></bezel>
+		<element ref="pcb_blue"><bounds left="0" top="0" right="3200" bottom="2400"/></element>
+		<element ref="text_esselte"><bounds x="164" y="2044" width="264" height="52" /></element>
+		<element ref="text_studium"><bounds x="164" y="2110" width="264" height="52" /></element>
 
 		<!-- Key pad -->
-		<bezel element="black"><bounds x="1780" y="818" width="1110" height="1395" /></bezel>
-		<bezel element="black"><bounds x="1780" y="818" width="1390" height="280" /></bezel>
+		<element ref="black"><bounds x="1780" y="818" width="1110" height="1395" /></element>
+		<element ref="black"><bounds x="1780" y="818" width="1390" height="280" /></element>
 		<param name="keycol" value="brownkey" />
 		<repeat count="4">
 			<param name="bname" start="0" increment="1" />
@@ -286,7 +286,7 @@ Esselte Studium Modulab layout
 
 		<!-- BCD 7seg display -->
 		<!--Adress-->
-		<bezel element="text_adress"><bounds x="1820" y="44" width="228" height="52" /></bezel>
+		<element ref="text_adress"><bounds x="1820" y="44" width="228" height="52" /></element>
 		<param name="y" value="222" />
 		<param name="h" value="240" />
 		<param name="c" value="7" />
@@ -300,7 +300,7 @@ Esselte Studium Modulab layout
 			<group ref="vdip"><bounds x="~xdip~" y="528" width="100" height="270" /></group>
 		</repeat>
 		<!--Data-->
-		<bezel element="text_data"><bounds x="2532" y="44" width="156" height="52" /></bezel>
+		<element ref="text_data"><bounds x="2532" y="44" width="156" height="52" /></element>
 		<repeat count="2">
 			<param name="dno" start="1" increment="-1" />
 			<param name="x" start="2428" increment="224" />
@@ -356,23 +356,23 @@ Esselte Studium Modulab layout
 
 
 		<!-- descrete components -->
-		<bezel element="xtal"><bounds x="410" y="995" width="160" height="240" /></bezel>
-		<bezel element="text_4mhz"><bounds x="420" y="1025" width="140" height="40" /></bezel>
-		<bezel element="text_sunny"><bounds x="420" y="1075" width="140" height="40" /></bezel>
+		<element ref="xtal"><bounds x="410" y="995" width="160" height="240" /></element>
+		<element ref="text_4mhz"><bounds x="420" y="1025" width="140" height="40" /></element>
+		<element ref="text_sunny"><bounds x="420" y="1075" width="140" height="40" /></element>
 
 		<!-- mount holes -->
-		<bezel element="mount"><bounds x="250"  y="2300" width="75" height="75" /></bezel>
-		<bezel element="mount"><bounds x="1700" y="2300" width="75" height="75" /></bezel>
-		<bezel element="mount"><bounds x="2860" y="2300" width="75" height="75" /></bezel>
-		<bezel element="mount"><bounds x="250"  y="30"   width="75" height="75" /></bezel>
-		<bezel element="mount"><bounds x="1700" y="30"   width="75" height="75" /></bezel>
-		<bezel element="mount"><bounds x="2860" y="30"   width="75" height="75" /></bezel>
-		<bezel element="mount"><bounds x="1170" y="630"  width="75" height="75" /></bezel>
+		<element ref="mount"><bounds x="250"  y="2300" width="75" height="75" /></element>
+		<element ref="mount"><bounds x="1700" y="2300" width="75" height="75" /></element>
+		<element ref="mount"><bounds x="2860" y="2300" width="75" height="75" /></element>
+		<element ref="mount"><bounds x="250"  y="30"   width="75" height="75" /></element>
+		<element ref="mount"><bounds x="1700" y="30"   width="75" height="75" /></element>
+		<element ref="mount"><bounds x="2860" y="30"   width="75" height="75" /></element>
+		<element ref="mount"><bounds x="1170" y="630"  width="75" height="75" /></element>
 
 		<!-- pins -->
 		<!-- IRQ -->
-		<bezel element="pin"><bounds x="440" y="1450"  width="30" height="30" /></bezel>
-		<bezel element="text_irq"><bounds x="400" y="1395" width="120" height="50" /></bezel>
+		<element ref="pin"><bounds x="440" y="1450"  width="30" height="30" /></element>
+		<element ref="text_irq"><bounds x="400" y="1395" width="120" height="50" /></element>
 		<!-- Ports -->
 		<repeat count="8">
 			<param name="tid" start="7" increment="-1" />
@@ -381,32 +381,32 @@ Esselte Studium Modulab layout
 			<repeat count="2">
 		<param name="yp" start="280" increment="140" />
 		<param name="typ" start="275" increment="140" />
-		<bezel element="pin"><bounds x="~xp~" y="~yp~"  width="30" height="30" /></bezel>
-		<bezel element="text_~tid~"><bounds x="~txp~" y="~typ~" width="120" height="50" /></bezel>
+		<element ref="pin"><bounds x="~xp~" y="~yp~"  width="30" height="30" /></element>
+		<element ref="text_~tid~"><bounds x="~txp~" y="~typ~" width="120" height="50" /></element>
 			</repeat>
 		</repeat>
-		<bezel element="text_porta"><bounds x="350" y="200" width="500" height="75" /></bezel>
-		<bezel element="text_portb"><bounds x="350" y="340" width="500" height="75" /></bezel>
+		<element ref="text_porta"><bounds x="350" y="200" width="500" height="75" /></element>
+		<element ref="text_portb"><bounds x="350" y="340" width="500" height="75" /></element>
 		<!-- power feed -->
-		<bezel element="pin"><bounds x="150" y="575"  width="30" height="30" /></bezel>
-		<bezel element="text_vcc"><bounds x="150" y="615" width="100" height="50" /></bezel>
-		<bezel element="pin"><bounds x="150" y="710"  width="30" height="30" /></bezel>
-		<bezel element="text_gnd"><bounds x="150" y="660" width="100" height="50" /></bezel>
+		<element ref="pin"><bounds x="150" y="575"  width="30" height="30" /></element>
+		<element ref="text_vcc"><bounds x="150" y="615" width="100" height="50" /></element>
+		<element ref="pin"><bounds x="150" y="710"  width="30" height="30" /></element>
+		<element ref="text_gnd"><bounds x="150" y="660" width="100" height="50" /></element>
 		<!-- R pins -->
-		<bezel element="pin"><bounds x="3050" y="1740"  width="30" height="30" /></bezel>
-		<bezel element="text_r"><bounds x="2950" y="1735" width="100" height="50" /></bezel>
-		<bezel element="pin"><bounds x="3050" y="1890"  width="30" height="30" /></bezel>
-		<bezel element="text_r"><bounds x="2950" y="1885" width="100" height="50" /></bezel>
+		<element ref="pin"><bounds x="3050" y="1740"  width="30" height="30" /></element>
+		<element ref="text_r"><bounds x="2950" y="1735" width="100" height="50" /></element>
+		<element ref="pin"><bounds x="3050" y="1890"  width="30" height="30" /></element>
+		<element ref="text_r"><bounds x="2950" y="1885" width="100" height="50" /></element>
 		<!-- trim pot -->
-		<bezel element="trim"><bounds x="950" y="2160"  width="120" height="120" /></bezel>
+		<element ref="trim"><bounds x="950" y="2160"  width="120" height="120" /></element>
 		<!-- side connector -->
-		<bezel element="amp"><bounds x="0" y="850"  width="250" height="925" /></bezel>
+		<element ref="amp"><bounds x="0" y="850"  width="250" height="925" /></element>
 	</group>
 
 	<group name="screws">
 		<!-- max size -->
-		<bezel element="pcb_blue"><bounds x="0" y="0" width="1" height="1" /></bezel>
-		<bezel element="pcb_blue"><bounds x="3200" y="2400" width="1" height="1" /></bezel>
+		<element ref="pcb_blue"><bounds x="0" y="0" width="1" height="1" /></element>
+		<element ref="pcb_blue"><bounds x="3200" y="2400" width="1" height="1" /></element>
 		<!-- screws -->
 		<group ref="screw"><bounds x="250"  y="2300" width="75" height="75" /></group>
 		<group ref="screw"><bounds x="1700" y="2300" width="75" height="75" /></group>
diff --git a/src/mame/layout/mpu4.lay b/src/mame/layout/mpu4.lay
index 0fce4cf2207..c22d519c530 100644
--- a/src/mame/layout/mpu4.lay
+++ b/src/mame/layout/mpu4.lay
@@ -4,560 +4,79 @@ license:CC0
 -->
 <mamelayout version="2">
 	<element name="digit">
-	<led7seg>
+		<led7seg>
 			<color red="1.0" green="0.0" blue="0.0" />
-	</led7seg>
+		</led7seg>
 	</element>
 	<element name="matrixlamp">
 		<rect state ="0">
-			<bounds x="0" y="0" width="7" height="7" />
 			<color red="0.7" green="0.7" blue="0.7" />
 		</rect>
 		<rect state ="1">
-			<bounds x="0" y="0" width="7" height="7" />
 			<color red="0.0" green="0.0" blue="1.0" />
 		</rect>
 		<rect state ="2">
-			<bounds x="0" y="0" width="7" height="7" />
 			<color red="0.0" green="1.0" blue="0.0" />
 		</rect>
 	</element>
 	<element name="Steppers" defstate="0">
 		<simplecounter maxstate="999" digits="3">
-		<color red="1.0" green="1.0" blue="1.0" />
-		<bounds x="0" y="0" width="1" height="1" />
+			<color red="1.0" green="1.0" blue="1.0" />
 		</simplecounter>
 	</element>
 	<element name="vfd0">
-	<led16segsc>
+		<led16segsc>
 			<color red="0" green="0.6" blue="1.0" />
-	</led16segsc>
+		</led16segsc>
 	</element>
 
+	<group name="vfd">
+		<repeat count="16">
+			<param name="n" start="15" increment="-1" />
+			<param name="x" start="0" increment="9" />
+			<element name="vfd~n~" ref="vfd0" state="0">
+				<bounds x="~x~" y="0" width="9" height="17"/>
+			</element>
+		</repeat>
+	</group>
+
 	<view name="AWP Simulated Video (No Artwork)">
-		<backdrop name="reel1" element="Steppers" state="0">
-			<bounds x="10" y="300" width="50" height="50"/>
-		</backdrop>
-		<backdrop name="reel2" element="Steppers" state="0">
-			<bounds x="60" y="300" width="50" height="50"/>
-		</backdrop>
-		<backdrop name="reel3" element="Steppers" state="0">
-			<bounds x="110" y="300" width="50" height="50"/>
-		</backdrop>
-		<backdrop name="reel4" element="Steppers" state="0">
-			<bounds x="160" y="300" width="50" height="50"/>
-		</backdrop>
-		<backdrop name="reel5" element="Steppers" state="0">
+		<repeat count="4">
+			<param name="n" start="1" increment="1" />
+			<param name="x" start="10" increment="50" />
+			<element name="reel~n~" ref="Steppers" state="0">
+				<bounds x="~x~" y="300" width="50" height="50"/>
+			</element>
+		</repeat>
+		<element name="reel5" ref="Steppers" state="0">
 			<bounds x="220" y="300" width="50" height="50"/>
-		</backdrop>
-		<backdrop name="reel6" element="Steppers" state="0">
+		</element>
+		<element name="reel6" ref="Steppers" state="0">
 			<bounds x="280" y="300" width="50" height="50"/>
-		</backdrop>
-		<backdrop name="lamp0" element="matrixlamp" state="0">
-			<bounds x="0" y="0" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp1" element="matrixlamp" state="0">
-			<bounds x="0" y="8" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp2" element="matrixlamp" state="0">
-			<bounds x="0" y="16" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp3" element="matrixlamp" state="0">
-			<bounds x="0" y="24" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp4" element="matrixlamp" state="0">
-			<bounds x="0" y="32" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp5" element="matrixlamp" state="0">
-			<bounds x="0" y="40" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp6" element="matrixlamp" state="0">
-			<bounds x="0" y="48" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp7" element="matrixlamp" state="0">
-			<bounds x="0" y="56" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp8" element="matrixlamp" state="0">
-			<bounds x="8" y="0" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp9" element="matrixlamp" state="0">
-			<bounds x="8" y="8" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp10" element="matrixlamp" state="0">
-			<bounds x="8" y="16" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp11" element="matrixlamp" state="0">
-			<bounds x="8" y="24" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp12" element="matrixlamp" state="0">
-			<bounds x="8" y="32" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp13" element="matrixlamp" state="0">
-			<bounds x="8" y="40" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp14" element="matrixlamp" state="0">
-			<bounds x="8" y="48" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp15" element="matrixlamp" state="0">
-			<bounds x="8" y="56" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp16" element="matrixlamp" state="0">
-			<bounds x="16" y="0" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp17" element="matrixlamp" state="0">
-			<bounds x="16" y="8" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp18" element="matrixlamp" state="0">
-			<bounds x="16" y="16" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp19" element="matrixlamp" state="0">
-			<bounds x="16" y="24" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp20" element="matrixlamp" state="0">
-			<bounds x="16" y="32" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp21" element="matrixlamp" state="0">
-			<bounds x="16" y="40" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp22" element="matrixlamp" state="0">
-			<bounds x="16" y="48" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp23" element="matrixlamp" state="0">
-			<bounds x="16" y="56" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp24" element="matrixlamp" state="0">
-			<bounds x="24" y="0" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp25" element="matrixlamp" state="0">
-			<bounds x="24" y="8" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp26" element="matrixlamp" state="0">
-			<bounds x="24" y="16" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp27" element="matrixlamp" state="0">
-			<bounds x="24" y="24" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp28" element="matrixlamp" state="0">
-			<bounds x="24" y="32" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp29" element="matrixlamp" state="0">
-			<bounds x="24" y="40" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp30" element="matrixlamp" state="0">
-			<bounds x="24" y="48" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp31" element="matrixlamp" state="0">
-			<bounds x="24" y="56" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp32" element="matrixlamp" state="0">
-			<bounds x="32" y="0" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp33" element="matrixlamp" state="0">
-			<bounds x="32" y="8" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp34" element="matrixlamp" state="0">
-			<bounds x="32" y="16" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp35" element="matrixlamp" state="0">
-			<bounds x="32" y="24" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp36" element="matrixlamp" state="0">
-			<bounds x="32" y="32" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp37" element="matrixlamp" state="0">
-			<bounds x="32" y="40" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp38" element="matrixlamp" state="0">
-			<bounds x="32" y="48" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp39" element="matrixlamp" state="0">
-			<bounds x="32" y="56" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp40" element="matrixlamp" state="0">
-			<bounds x="40" y="0" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp41" element="matrixlamp" state="0">
-			<bounds x="40" y="8" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp42" element="matrixlamp" state="0">
-			<bounds x="40" y="16" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp43" element="matrixlamp" state="0">
-			<bounds x="40" y="24" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp44" element="matrixlamp" state="0">
-			<bounds x="40" y="32" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp45" element="matrixlamp" state="0">
-			<bounds x="40" y="40" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp46" element="matrixlamp" state="0">
-			<bounds x="40" y="48" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp47" element="matrixlamp" state="0">
-			<bounds x="40" y="56" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp48" element="matrixlamp" state="0">
-			<bounds x="48" y="0" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp49" element="matrixlamp" state="0">
-			<bounds x="48" y="8" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp50" element="matrixlamp" state="0">
-			<bounds x="48" y="16" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp51" element="matrixlamp" state="0">
-			<bounds x="48" y="24" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp52" element="matrixlamp" state="0">
-			<bounds x="48" y="32" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp53" element="matrixlamp" state="0">
-			<bounds x="48" y="40" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp54" element="matrixlamp" state="0">
-			<bounds x="48" y="48" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp55" element="matrixlamp" state="0">
-			<bounds x="48" y="56" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp56" element="matrixlamp" state="0">
-			<bounds x="56" y="0" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp57" element="matrixlamp" state="0">
-			<bounds x="56" y="8" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp58" element="matrixlamp" state="0">
-			<bounds x="56" y="16" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp59" element="matrixlamp" state="0">
-			<bounds x="56" y="24" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp60" element="matrixlamp" state="0">
-			<bounds x="56" y="32" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp61" element="matrixlamp" state="0">
-			<bounds x="56" y="40" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp62" element="matrixlamp" state="0">
-			<bounds x="56" y="48" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp63" element="matrixlamp" state="0">
-			<bounds x="56" y="56" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp64" element="matrixlamp" state="0">
-			<bounds x="64" y="0" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp65" element="matrixlamp" state="0">
-			<bounds x="64" y="8" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp66" element="matrixlamp" state="0">
-			<bounds x="64" y="16" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp67" element="matrixlamp" state="0">
-			<bounds x="64" y="24" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp68" element="matrixlamp" state="0">
-			<bounds x="64" y="32" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp69" element="matrixlamp" state="0">
-			<bounds x="64" y="40" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp70" element="matrixlamp" state="0">
-			<bounds x="64" y="48" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp71" element="matrixlamp" state="0">
-			<bounds x="64" y="56" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp72" element="matrixlamp" state="0">
-			<bounds x="72" y="0" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp73" element="matrixlamp" state="0">
-			<bounds x="72" y="8" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp74" element="matrixlamp" state="0">
-			<bounds x="72" y="16" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp75" element="matrixlamp" state="0">
-			<bounds x="72" y="24" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp76" element="matrixlamp" state="0">
-			<bounds x="72" y="32" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp77" element="matrixlamp" state="0">
-			<bounds x="72" y="40" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp78" element="matrixlamp" state="0">
-			<bounds x="72" y="48" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp79" element="matrixlamp" state="0">
-			<bounds x="72" y="56" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp80" element="matrixlamp" state="0">
-			<bounds x="80" y="0" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp81" element="matrixlamp" state="0">
-			<bounds x="80" y="8" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp82" element="matrixlamp" state="0">
-			<bounds x="80" y="16" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp83" element="matrixlamp" state="0">
-			<bounds x="80" y="24" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp84" element="matrixlamp" state="0">
-			<bounds x="80" y="32" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp85" element="matrixlamp" state="0">
-			<bounds x="80" y="40" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp86" element="matrixlamp" state="0">
-			<bounds x="80" y="48" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp87" element="matrixlamp" state="0">
-			<bounds x="80" y="56" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp88" element="matrixlamp" state="0">
-			<bounds x="88" y="0" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp89" element="matrixlamp" state="0">
-			<bounds x="88" y="8" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp90" element="matrixlamp" state="0">
-			<bounds x="88" y="16" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp91" element="matrixlamp" state="0">
-			<bounds x="88" y="24" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp92" element="matrixlamp" state="0">
-			<bounds x="88" y="32" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp93" element="matrixlamp" state="0">
-			<bounds x="88" y="40" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp94" element="matrixlamp" state="0">
-			<bounds x="88" y="48" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp95" element="matrixlamp" state="0">
-			<bounds x="88" y="56" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp96" element="matrixlamp" state="0">
-			<bounds x="96" y="0" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp97" element="matrixlamp" state="0">
-			<bounds x="96" y="8" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp98" element="matrixlamp" state="0">
-			<bounds x="96" y="16" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp99" element="matrixlamp" state="0">
-			<bounds x="96" y="24" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp100" element="matrixlamp" state="0">
-			<bounds x="96" y="32" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp101" element="matrixlamp" state="0">
-			<bounds x="96" y="40" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp102" element="matrixlamp" state="0">
-			<bounds x="96" y="48" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp103" element="matrixlamp" state="0">
-			<bounds x="96" y="56" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp104" element="matrixlamp" state="0">
-			<bounds x="104" y="0" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp105" element="matrixlamp" state="0">
-			<bounds x="104" y="8" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp106" element="matrixlamp" state="0">
-			<bounds x="104" y="16" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp107" element="matrixlamp" state="0">
-			<bounds x="104" y="24" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp108" element="matrixlamp" state="0">
-			<bounds x="104" y="32" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp109" element="matrixlamp" state="0">
-			<bounds x="104" y="40" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp110" element="matrixlamp" state="0">
-			<bounds x="104" y="48" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp111" element="matrixlamp" state="0">
-			<bounds x="104" y="56" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp112" element="matrixlamp" state="0">
-			<bounds x="112" y="0" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp113" element="matrixlamp" state="0">
-			<bounds x="112" y="8" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp114" element="matrixlamp" state="0">
-			<bounds x="112" y="16" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp115" element="matrixlamp" state="0">
-			<bounds x="112" y="24" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp116" element="matrixlamp" state="0">
-			<bounds x="112" y="32" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp117" element="matrixlamp" state="0">
-			<bounds x="112" y="40" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp118" element="matrixlamp" state="0">
-			<bounds x="112" y="48" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp119" element="matrixlamp" state="0">
-			<bounds x="112" y="56" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp120" element="matrixlamp" state="0">
-			<bounds x="120" y="0" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp121" element="matrixlamp" state="0">
-			<bounds x="120" y="8" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp122" element="matrixlamp" state="0">
-			<bounds x="120" y="16" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp123" element="matrixlamp" state="0">
-			<bounds x="120" y="24" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp124" element="matrixlamp" state="0">
-			<bounds x="120" y="32" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp125" element="matrixlamp" state="0">
-			<bounds x="120" y="40" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp126" element="matrixlamp" state="0">
-			<bounds x="120" y="48" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp127" element="matrixlamp" state="0">
-			<bounds x="120" y="56" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="digit0" element="digit" state="0">
-			<bounds x="300" y="200" width="8" height="10"/>
-		</backdrop>
-		<backdrop name="digit1" element="digit" state="0">
-			<bounds x="308" y="200" width="8" height="10"/>
-		</backdrop>
-		<backdrop name="digit2" element="digit" state="0">
-			<bounds x="316" y="200" width="8" height="10"/>
-		</backdrop>
-		<backdrop name="digit3" element="digit" state="0">
-			<bounds x="324" y="200" width="8" height="10"/>
-		</backdrop>
-		<backdrop name="digit4" element="digit" state="0">
-			<bounds x="332" y="200" width="8" height="10"/>
-		</backdrop>
-		<backdrop name="digit5" element="digit" state="0">
-			<bounds x="340" y="200" width="8" height="10"/>
-		</backdrop>
-		<backdrop name="digit6" element="digit" state="0">
-			<bounds x="348" y="200" width="8" height="10"/>
-		</backdrop>
-		<backdrop name="digit7" element="digit" state="0">
-			<bounds x="356" y="200" width="8" height="10"/>
-		</backdrop>
-		<backdrop name="vfd15" element="vfd0" state="0">
-			<bounds x="17" y="280" width="7" height="24"/>
-		</backdrop>
-		<backdrop name="vfd14" element="vfd0" state="0">
-			<bounds x="24" y="280" width="7" height="24"/>
-		</backdrop>
-		<backdrop name="vfd13" element="vfd0" state="0">
-			<bounds x="31" y="280" width="7" height="24"/>
-		</backdrop>
-		<backdrop name="vfd12" element="vfd0" state="0">
-			<bounds x="38" y="280" width="7" height="24"/>
-		</backdrop>
-		<backdrop name="vfd11" element="vfd0" state="0">
-			<bounds x="45" y="280" width="7" height="24"/>
-		</backdrop>
-		<backdrop name="vfd10" element="vfd0" state="0">
-			<bounds x="52" y="280" width="7" height="24"/>
-		</backdrop>
-		<backdrop name="vfd9" element="vfd0" state="0">
-			<bounds x="59" y="280" width="7" height="24"/>
-		</backdrop>
-		<backdrop name="vfd8" element="vfd0" state="0">
-			<bounds x="66" y="280" width="7" height="24"/>
-		</backdrop>
-		<backdrop name="vfd7" element="vfd0" state="0">
-			<bounds x="73" y="280" width="7" height="24"/>
-		</backdrop>
-		<backdrop name="vfd6" element="vfd0" state="0">
-			<bounds x="80" y="280" width="7" height="24"/>
-		</backdrop>
-		<backdrop name="vfd5" element="vfd0" state="0">
-			<bounds x="87" y="280" width="7" height="24"/>
-		</backdrop>
-		<backdrop name="vfd4" element="vfd0" state="0">
-			<bounds x="94" y="280" width="7" height="24"/>
-		</backdrop>
-		<backdrop name="vfd3" element="vfd0" state="0">
-			<bounds x="101" y="280" width="7" height="24"/>
-		</backdrop>
-		<backdrop name="vfd2" element="vfd0" state="0">
-			<bounds x="108" y="280" width="7" height="24"/>
-		</backdrop>
-		<backdrop name="vfd1" element="vfd0" state="0">
-			<bounds x="115" y="280" width="7" height="24"/>
-		</backdrop>
-		<backdrop name="vfd0" element="vfd0" state="0">
-			<bounds x="122" y="280" width="7" height="24"/>
-		</backdrop>
+		</element>
+		<repeat count="16">
+			<param name="s" start="0" increment="8" />
+			<param name="x" start="0" increment="8" />
+			<repeat count="8">
+				<param name="n" start="~s~" increment="1" />
+				<param name="y" start="0" increment="8" />
+				<element name="lamp~n~" ref="matrixlamp" state="0" blend="add">
+					<bounds x="~x~" y="~y~" width="7" height="7"/>
+				</element>
+			</repeat>
+		</repeat>
+		<repeat count="8">
+			<param name="n" start="0" increment="1" />
+			<param name="x" start="300" increment="8" />
+			<element name="digit~n~" ref="digit" state="0">
+				<bounds x="~x~" y="200" width="8" height="10"/>
+			</element>
+		</repeat>
+		<group ref="vfd">
+			<bounds x="17" y="280" width="112" height="24" />
+		</group>
 	</view>
 	<view name="VFD Display Output Only">
-		<bezel name="vfd15" element="vfd0" state="0">
-			<bounds x="10" y="200" width="9" height="17"/>
-		</bezel>
-		<bezel name="vfd14" element="vfd0" state="0">
-			<bounds x="19" y="200" width="9" height="17"/>
-		</bezel>
-		<bezel name="vfd13" element="vfd0" state="0">
-			<bounds x="28" y="200" width="9" height="17"/>
-		</bezel>
-		<bezel name="vfd12" element="vfd0" state="0">
-			<bounds x="37" y="200" width="9" height="17"/>
-		</bezel>
-		<bezel name="vfd11" element="vfd0" state="0">
-			<bounds x="46" y="200" width="9" height="17"/>
-		</bezel>
-		<bezel name="vfd10" element="vfd0" state="0">
-			<bounds x="55" y="200" width="9" height="17"/>
-		</bezel>
-		<bezel name="vfd9" element="vfd0" state="0">
-			<bounds x="64" y="200" width="9" height="17"/>
-		</bezel>
-		<bezel name="vfd8" element="vfd0" state="0">
-			<bounds x="73" y="200" width="9" height="17"/>
-		</bezel>
-		<bezel name="vfd7" element="vfd0" state="0">
-			<bounds x="82" y="200" width="9" height="17"/>
-		</bezel>
-		<bezel name="vfd6" element="vfd0" state="0">
-			<bounds x="91" y="200" width="9" height="17"/>
-		</bezel>
-		<bezel name="vfd5" element="vfd0" state="0">
-			<bounds x="100" y="200" width="9" height="17"/>
-		</bezel>
-		<bezel name="vfd4" element="vfd0" state="0">
-			<bounds x="109" y="200" width="9" height="17"/>
-		</bezel>
-		<bezel name="vfd3" element="vfd0" state="0">
-			<bounds x="118" y="200" width="9" height="17"/>
-		</bezel>
-		<bezel name="vfd2" element="vfd0" state="0">
-			<bounds x="127" y="200" width="9" height="17"/>
-		</bezel>
-		<bezel name="vfd1" element="vfd0" state="0">
-			<bounds x="136" y="200" width="9" height="17"/>
-		</bezel>
-		<bezel name="vfd0" element="vfd0" state="0">
-			<bounds x="145" y="200" width="9" height="17"/>
-		</bezel>
+		<group ref="vfd" />
 	</view>
 </mamelayout>
diff --git a/src/mame/layout/mpu4ext.lay b/src/mame/layout/mpu4ext.lay
index 8849f257737..924c2615b24 100644
--- a/src/mame/layout/mpu4ext.lay
+++ b/src/mame/layout/mpu4ext.lay
@@ -4,947 +4,86 @@ license:CC0
 -->
 <mamelayout version="2">
 	<element name="digit">
-	<led7seg>
+		<led7seg>
 			<color red="1.0" green="0.0" blue="0.0" />
-	</led7seg>
+		</led7seg>
 	</element>
 	<element name="matrixlamp">
 		<rect state ="0">
-			<bounds x="0" y="0" width="7" height="7" />
 			<color red="0.7" green="0.7" blue="0.7" />
 		</rect>
 		<rect state ="1">
-			<bounds x="0" y="0" width="7" height="7" />
 			<color red="0.0" green="0.0" blue="1.0" />
 		</rect>
 		<rect state ="2">
-			<bounds x="0" y="0" width="7" height="7" />
 			<color red="0.0" green="1.0" blue="0.0" />
 		</rect>
 	</element>
 	<element name="Steppers" defstate="0">
 		<simplecounter maxstate="999" digits="3">
-		<color red="1.0" green="1.0" blue="1.0" />
-		<bounds x="0" y="0" width="1" height="1" />
+			<color red="1.0" green="1.0" blue="1.0" />
 		</simplecounter>
 	</element>
 	<element name="vfd0">
-	<led16segsc>
+		<led16segsc>
 			<color red="0" green="0.6" blue="1.0" />
-	</led16segsc>
+		</led16segsc>
 	</element>
 
+	<group name="vfd">
+		<repeat count="16">
+			<param name="n" start="15" increment="-1" />
+			<param name="x" start="0" increment="9" />
+			<element name="vfd~n~" ref="vfd0" state="0">
+				<bounds x="~x~" y="0" width="9" height="17"/>
+			</element>
+		</repeat>
+	</group>
+
 	<view name="AWP Simulated Video (No Artwork)">
-		<backdrop name="reel1" element="Steppers" state="0">
-			<bounds x="10" y="300" width="50" height="50"/>
-		</backdrop>
-		<backdrop name="reel2" element="Steppers" state="0">
-			<bounds x="60" y="300" width="50" height="50"/>
-		</backdrop>
-		<backdrop name="reel3" element="Steppers" state="0">
-			<bounds x="110" y="300" width="50" height="50"/>
-		</backdrop>
-		<backdrop name="reel4" element="Steppers" state="0">
-			<bounds x="160" y="300" width="50" height="50"/>
-		</backdrop>
-		<backdrop name="reel5" element="Steppers" state="0">
+		<repeat count="4">
+			<param name="n" start="1" increment="1" />
+			<param name="x" start="10" increment="50" />
+			<element name="reel~n~" ref="Steppers" state="0">
+				<bounds x="~x~" y="300" width="50" height="50"/>
+			</element>
+		</repeat>
+		<element name="reel5" ref="Steppers" state="0">
 			<bounds x="220" y="300" width="50" height="50"/>
-		</backdrop>
-		<backdrop name="reel6" element="Steppers" state="0">
+		</element>
+		<element name="reel6" ref="Steppers" state="0">
 			<bounds x="280" y="300" width="50" height="50"/>
-		</backdrop>
-		<backdrop name="lamp0" element="matrixlamp" state="0">
-			<bounds x="0" y="0" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp1" element="matrixlamp" state="0">
-			<bounds x="0" y="8" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp2" element="matrixlamp" state="0">
-			<bounds x="0" y="16" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp3" element="matrixlamp" state="0">
-			<bounds x="0" y="24" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp4" element="matrixlamp" state="0">
-			<bounds x="0" y="32" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp5" element="matrixlamp" state="0">
-			<bounds x="0" y="40" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp6" element="matrixlamp" state="0">
-			<bounds x="0" y="48" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp7" element="matrixlamp" state="0">
-			<bounds x="0" y="56" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp8" element="matrixlamp" state="0">
-			<bounds x="8" y="0" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp9" element="matrixlamp" state="0">
-			<bounds x="8" y="8" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp10" element="matrixlamp" state="0">
-			<bounds x="8" y="16" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp11" element="matrixlamp" state="0">
-			<bounds x="8" y="24" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp12" element="matrixlamp" state="0">
-			<bounds x="8" y="32" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp13" element="matrixlamp" state="0">
-			<bounds x="8" y="40" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp14" element="matrixlamp" state="0">
-			<bounds x="8" y="48" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp15" element="matrixlamp" state="0">
-			<bounds x="8" y="56" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp16" element="matrixlamp" state="0">
-			<bounds x="16" y="0" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp17" element="matrixlamp" state="0">
-			<bounds x="16" y="8" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp18" element="matrixlamp" state="0">
-			<bounds x="16" y="16" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp19" element="matrixlamp" state="0">
-			<bounds x="16" y="24" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp20" element="matrixlamp" state="0">
-			<bounds x="16" y="32" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp21" element="matrixlamp" state="0">
-			<bounds x="16" y="40" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp22" element="matrixlamp" state="0">
-			<bounds x="16" y="48" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp23" element="matrixlamp" state="0">
-			<bounds x="16" y="56" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp24" element="matrixlamp" state="0">
-			<bounds x="24" y="0" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp25" element="matrixlamp" state="0">
-			<bounds x="24" y="8" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp26" element="matrixlamp" state="0">
-			<bounds x="24" y="16" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp27" element="matrixlamp" state="0">
-			<bounds x="24" y="24" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp28" element="matrixlamp" state="0">
-			<bounds x="24" y="32" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp29" element="matrixlamp" state="0">
-			<bounds x="24" y="40" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp30" element="matrixlamp" state="0">
-			<bounds x="24" y="48" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp31" element="matrixlamp" state="0">
-			<bounds x="24" y="56" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp32" element="matrixlamp" state="0">
-			<bounds x="32" y="0" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp33" element="matrixlamp" state="0">
-			<bounds x="32" y="8" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp34" element="matrixlamp" state="0">
-			<bounds x="32" y="16" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp35" element="matrixlamp" state="0">
-			<bounds x="32" y="24" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp36" element="matrixlamp" state="0">
-			<bounds x="32" y="32" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp37" element="matrixlamp" state="0">
-			<bounds x="32" y="40" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp38" element="matrixlamp" state="0">
-			<bounds x="32" y="48" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp39" element="matrixlamp" state="0">
-			<bounds x="32" y="56" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp40" element="matrixlamp" state="0">
-			<bounds x="40" y="0" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp41" element="matrixlamp" state="0">
-			<bounds x="40" y="8" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp42" element="matrixlamp" state="0">
-			<bounds x="40" y="16" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp43" element="matrixlamp" state="0">
-			<bounds x="40" y="24" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp44" element="matrixlamp" state="0">
-			<bounds x="40" y="32" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp45" element="matrixlamp" state="0">
-			<bounds x="40" y="40" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp46" element="matrixlamp" state="0">
-			<bounds x="40" y="48" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp47" element="matrixlamp" state="0">
-			<bounds x="40" y="56" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp48" element="matrixlamp" state="0">
-			<bounds x="48" y="0" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp49" element="matrixlamp" state="0">
-			<bounds x="48" y="8" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp50" element="matrixlamp" state="0">
-			<bounds x="48" y="16" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp51" element="matrixlamp" state="0">
-			<bounds x="48" y="24" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp52" element="matrixlamp" state="0">
-			<bounds x="48" y="32" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp53" element="matrixlamp" state="0">
-			<bounds x="48" y="40" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp54" element="matrixlamp" state="0">
-			<bounds x="48" y="48" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp55" element="matrixlamp" state="0">
-			<bounds x="48" y="56" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp56" element="matrixlamp" state="0">
-			<bounds x="56" y="0" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp57" element="matrixlamp" state="0">
-			<bounds x="56" y="8" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp58" element="matrixlamp" state="0">
-			<bounds x="56" y="16" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp59" element="matrixlamp" state="0">
-			<bounds x="56" y="24" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp60" element="matrixlamp" state="0">
-			<bounds x="56" y="32" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp61" element="matrixlamp" state="0">
-			<bounds x="56" y="40" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp62" element="matrixlamp" state="0">
-			<bounds x="56" y="48" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp63" element="matrixlamp" state="0">
-			<bounds x="56" y="56" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp64" element="matrixlamp" state="0">
-			<bounds x="64" y="0" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp65" element="matrixlamp" state="0">
-			<bounds x="64" y="8" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp66" element="matrixlamp" state="0">
-			<bounds x="64" y="16" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp67" element="matrixlamp" state="0">
-			<bounds x="64" y="24" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp68" element="matrixlamp" state="0">
-			<bounds x="64" y="32" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp69" element="matrixlamp" state="0">
-			<bounds x="64" y="40" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp70" element="matrixlamp" state="0">
-			<bounds x="64" y="48" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp71" element="matrixlamp" state="0">
-			<bounds x="64" y="56" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp72" element="matrixlamp" state="0">
-			<bounds x="72" y="0" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp73" element="matrixlamp" state="0">
-			<bounds x="72" y="8" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp74" element="matrixlamp" state="0">
-			<bounds x="72" y="16" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp75" element="matrixlamp" state="0">
-			<bounds x="72" y="24" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp76" element="matrixlamp" state="0">
-			<bounds x="72" y="32" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp77" element="matrixlamp" state="0">
-			<bounds x="72" y="40" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp78" element="matrixlamp" state="0">
-			<bounds x="72" y="48" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp79" element="matrixlamp" state="0">
-			<bounds x="72" y="56" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp80" element="matrixlamp" state="0">
-			<bounds x="80" y="0" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp81" element="matrixlamp" state="0">
-			<bounds x="80" y="8" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp82" element="matrixlamp" state="0">
-			<bounds x="80" y="16" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp83" element="matrixlamp" state="0">
-			<bounds x="80" y="24" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp84" element="matrixlamp" state="0">
-			<bounds x="80" y="32" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp85" element="matrixlamp" state="0">
-			<bounds x="80" y="40" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp86" element="matrixlamp" state="0">
-			<bounds x="80" y="48" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp87" element="matrixlamp" state="0">
-			<bounds x="80" y="56" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp88" element="matrixlamp" state="0">
-			<bounds x="88" y="0" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp89" element="matrixlamp" state="0">
-			<bounds x="88" y="8" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp90" element="matrixlamp" state="0">
-			<bounds x="88" y="16" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp91" element="matrixlamp" state="0">
-			<bounds x="88" y="24" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp92" element="matrixlamp" state="0">
-			<bounds x="88" y="32" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp93" element="matrixlamp" state="0">
-			<bounds x="88" y="40" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp94" element="matrixlamp" state="0">
-			<bounds x="88" y="48" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp95" element="matrixlamp" state="0">
-			<bounds x="88" y="56" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp96" element="matrixlamp" state="0">
-			<bounds x="96" y="0" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp97" element="matrixlamp" state="0">
-			<bounds x="96" y="8" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp98" element="matrixlamp" state="0">
-			<bounds x="96" y="16" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp99" element="matrixlamp" state="0">
-			<bounds x="96" y="24" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp100" element="matrixlamp" state="0">
-			<bounds x="96" y="32" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp101" element="matrixlamp" state="0">
-			<bounds x="96" y="40" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp102" element="matrixlamp" state="0">
-			<bounds x="96" y="48" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp103" element="matrixlamp" state="0">
-			<bounds x="96" y="56" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp104" element="matrixlamp" state="0">
-			<bounds x="104" y="0" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp105" element="matrixlamp" state="0">
-			<bounds x="104" y="8" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp106" element="matrixlamp" state="0">
-			<bounds x="104" y="16" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp107" element="matrixlamp" state="0">
-			<bounds x="104" y="24" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp108" element="matrixlamp" state="0">
-			<bounds x="104" y="32" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp109" element="matrixlamp" state="0">
-			<bounds x="104" y="40" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp110" element="matrixlamp" state="0">
-			<bounds x="104" y="48" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp111" element="matrixlamp" state="0">
-			<bounds x="104" y="56" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp112" element="matrixlamp" state="0">
-			<bounds x="112" y="0" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp113" element="matrixlamp" state="0">
-			<bounds x="112" y="8" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp114" element="matrixlamp" state="0">
-			<bounds x="112" y="16" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp115" element="matrixlamp" state="0">
-			<bounds x="112" y="24" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp116" element="matrixlamp" state="0">
-			<bounds x="112" y="32" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp117" element="matrixlamp" state="0">
-			<bounds x="112" y="40" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp118" element="matrixlamp" state="0">
-			<bounds x="112" y="48" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp119" element="matrixlamp" state="0">
-			<bounds x="112" y="56" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp120" element="matrixlamp" state="0">
-			<bounds x="120" y="0" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp121" element="matrixlamp" state="0">
-			<bounds x="120" y="8" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp122" element="matrixlamp" state="0">
-			<bounds x="120" y="16" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp123" element="matrixlamp" state="0">
-			<bounds x="120" y="24" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp124" element="matrixlamp" state="0">
-			<bounds x="120" y="32" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp125" element="matrixlamp" state="0">
-			<bounds x="120" y="40" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp126" element="matrixlamp" state="0">
-			<bounds x="120" y="48" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp127" element="matrixlamp" state="0">
-			<bounds x="120" y="56" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp128" element="matrixlamp" state="0">
-			<bounds x="128" y="0" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp129" element="matrixlamp" state="0">
-			<bounds x="128" y="8" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp130" element="matrixlamp" state="0">
-			<bounds x="128" y="16" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp131" element="matrixlamp" state="0">
-			<bounds x="128" y="24" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp132" element="matrixlamp" state="0">
-			<bounds x="128" y="32" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp133" element="matrixlamp" state="0">
-			<bounds x="128" y="40" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp134" element="matrixlamp" state="0">
-			<bounds x="128" y="48" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp135" element="matrixlamp" state="0">
-			<bounds x="128" y="56" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp136" element="matrixlamp" state="0">
-			<bounds x="136" y="0" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp137" element="matrixlamp" state="0">
-			<bounds x="136" y="8" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp138" element="matrixlamp" state="0">
-			<bounds x="136" y="16" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp139" element="matrixlamp" state="0">
-			<bounds x="136" y="24" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp140" element="matrixlamp" state="0">
-			<bounds x="136" y="32" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp141" element="matrixlamp" state="0">
-			<bounds x="136" y="40" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp142" element="matrixlamp" state="0">
-			<bounds x="136" y="48" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp143" element="matrixlamp" state="0">
-			<bounds x="136" y="56" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp144" element="matrixlamp" state="0">
-			<bounds x="144" y="0" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp145" element="matrixlamp" state="0">
-			<bounds x="144" y="8" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp146" element="matrixlamp" state="0">
-			<bounds x="144" y="16" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp147" element="matrixlamp" state="0">
-			<bounds x="144" y="24" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp148" element="matrixlamp" state="0">
-			<bounds x="144" y="32" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp149" element="matrixlamp" state="0">
-			<bounds x="144" y="40" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp150" element="matrixlamp" state="0">
-			<bounds x="144" y="48" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp151" element="matrixlamp" state="0">
-			<bounds x="144" y="56" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp152" element="matrixlamp" state="0">
-			<bounds x="152" y="0" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp153" element="matrixlamp" state="0">
-			<bounds x="152" y="8" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp154" element="matrixlamp" state="0">
-			<bounds x="152" y="16" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp155" element="matrixlamp" state="0">
-			<bounds x="152" y="24" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp156" element="matrixlamp" state="0">
-			<bounds x="152" y="32" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp157" element="matrixlamp" state="0">
-			<bounds x="152" y="40" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp158" element="matrixlamp" state="0">
-			<bounds x="152" y="48" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp159" element="matrixlamp" state="0">
-			<bounds x="152" y="56" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp160" element="matrixlamp" state="0">
-			<bounds x="160" y="0" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp161" element="matrixlamp" state="0">
-			<bounds x="160" y="8" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp162" element="matrixlamp" state="0">
-			<bounds x="160" y="16" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp163" element="matrixlamp" state="0">
-			<bounds x="160" y="24" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp164" element="matrixlamp" state="0">
-			<bounds x="160" y="32" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp165" element="matrixlamp" state="0">
-			<bounds x="160" y="40" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp166" element="matrixlamp" state="0">
-			<bounds x="160" y="48" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp167" element="matrixlamp" state="0">
-			<bounds x="160" y="56" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp168" element="matrixlamp" state="0">
-			<bounds x="168" y="0" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp169" element="matrixlamp" state="0">
-			<bounds x="168" y="8" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp170" element="matrixlamp" state="0">
-			<bounds x="168" y="16" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp171" element="matrixlamp" state="0">
-			<bounds x="168" y="24" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp172" element="matrixlamp" state="0">
-			<bounds x="168" y="32" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp173" element="matrixlamp" state="0">
-			<bounds x="168" y="40" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp174" element="matrixlamp" state="0">
-			<bounds x="168" y="48" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp175" element="matrixlamp" state="0">
-			<bounds x="168" y="56" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp176" element="matrixlamp" state="0">
-			<bounds x="176" y="0" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp177" element="matrixlamp" state="0">
-			<bounds x="176" y="8" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp178" element="matrixlamp" state="0">
-			<bounds x="176" y="16" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp179" element="matrixlamp" state="0">
-			<bounds x="176" y="24" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp180" element="matrixlamp" state="0">
-			<bounds x="176" y="32" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp181" element="matrixlamp" state="0">
-			<bounds x="176" y="40" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp182" element="matrixlamp" state="0">
-			<bounds x="176" y="48" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp183" element="matrixlamp" state="0">
-			<bounds x="176" y="56" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp184" element="matrixlamp" state="0">
-			<bounds x="184" y="0" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp185" element="matrixlamp" state="0">
-			<bounds x="184" y="8" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp186" element="matrixlamp" state="0">
-			<bounds x="184" y="16" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp187" element="matrixlamp" state="0">
-			<bounds x="184" y="24" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp188" element="matrixlamp" state="0">
-			<bounds x="184" y="32" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp189" element="matrixlamp" state="0">
-			<bounds x="184" y="40" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp190" element="matrixlamp" state="0">
-			<bounds x="184" y="48" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp191" element="matrixlamp" state="0">
-			<bounds x="184" y="56" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp192" element="matrixlamp" state="0">
-			<bounds x="192" y="0" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp193" element="matrixlamp" state="0">
-			<bounds x="192" y="8" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp194" element="matrixlamp" state="0">
-			<bounds x="192" y="16" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp195" element="matrixlamp" state="0">
-			<bounds x="192" y="24" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp196" element="matrixlamp" state="0">
-			<bounds x="192" y="32" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp197" element="matrixlamp" state="0">
-			<bounds x="192" y="40" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp198" element="matrixlamp" state="0">
-			<bounds x="192" y="48" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp199" element="matrixlamp" state="0">
-			<bounds x="192" y="56" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp200" element="matrixlamp" state="0">
-			<bounds x="200" y="0" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp201" element="matrixlamp" state="0">
-			<bounds x="200" y="8" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp202" element="matrixlamp" state="0">
-			<bounds x="200" y="16" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp203" element="matrixlamp" state="0">
-			<bounds x="200" y="24" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp204" element="matrixlamp" state="0">
-			<bounds x="200" y="32" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp205" element="matrixlamp" state="0">
-			<bounds x="200" y="40" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp206" element="matrixlamp" state="0">
-			<bounds x="200" y="48" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp207" element="matrixlamp" state="0">
-			<bounds x="200" y="56" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp208" element="matrixlamp" state="0">
-			<bounds x="208" y="0" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp209" element="matrixlamp" state="0">
-			<bounds x="208" y="8" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp210" element="matrixlamp" state="0">
-			<bounds x="208" y="16" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp211" element="matrixlamp" state="0">
-			<bounds x="208" y="24" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp212" element="matrixlamp" state="0">
-			<bounds x="208" y="32" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp213" element="matrixlamp" state="0">
-			<bounds x="208" y="40" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp214" element="matrixlamp" state="0">
-			<bounds x="208" y="48" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp215" element="matrixlamp" state="0">
-			<bounds x="208" y="56" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp216" element="matrixlamp" state="0">
-			<bounds x="216" y="0" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp217" element="matrixlamp" state="0">
-			<bounds x="216" y="8" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp218" element="matrixlamp" state="0">
-			<bounds x="216" y="16" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp219" element="matrixlamp" state="0">
-			<bounds x="216" y="24" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp220" element="matrixlamp" state="0">
-			<bounds x="216" y="32" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp221" element="matrixlamp" state="0">
-			<bounds x="216" y="40" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp222" element="matrixlamp" state="0">
-			<bounds x="216" y="48" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp223" element="matrixlamp" state="0">
-			<bounds x="216" y="56" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp224" element="matrixlamp" state="0">
+		</element>
+		<repeat count="28">
+			<param name="s" start="0" increment="8" />
+			<param name="x" start="0" increment="8" />
+			<repeat count="8">
+				<param name="n" start="~s~" increment="1" />
+				<param name="y" start="0" increment="8" />
+				<element name="lamp~n~" ref="matrixlamp" state="0" blend="add">
+					<bounds x="~x~" y="~y~" width="7" height="7"/>
+				</element>
+			</repeat>
+		</repeat>
+		<element name="lamp224" ref="matrixlamp" state="0" blend="add">
 			<bounds x="224" y="0" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="digit0" element="digit" state="0">
-			<bounds x="300" y="200" width="8" height="10"/>
-		</backdrop>
-		<backdrop name="digit1" element="digit" state="0">
-			<bounds x="308" y="200" width="8" height="10"/>
-		</backdrop>
-		<backdrop name="digit2" element="digit" state="0">
-			<bounds x="316" y="200" width="8" height="10"/>
-		</backdrop>
-		<backdrop name="digit3" element="digit" state="0">
-			<bounds x="324" y="200" width="8" height="10"/>
-		</backdrop>
-		<backdrop name="digit4" element="digit" state="0">
-			<bounds x="332" y="200" width="8" height="10"/>
-		</backdrop>
-		<backdrop name="digit5" element="digit" state="0">
-			<bounds x="340" y="200" width="8" height="10"/>
-		</backdrop>
-		<backdrop name="digit6" element="digit" state="0">
-			<bounds x="348" y="200" width="8" height="10"/>
-		</backdrop>
-		<backdrop name="digit7" element="digit" state="0">
-			<bounds x="356" y="200" width="8" height="10"/>
-		</backdrop>
-		<backdrop name="digit8" element="digit" state="0">
-			<bounds x="300" y="211" width="8" height="10"/>
-		</backdrop>
-		<backdrop name="digit9" element="digit" state="0">
-			<bounds x="308" y="211" width="8" height="10"/>
-		</backdrop>
-		<backdrop name="digit10" element="digit" state="0">
-			<bounds x="316" y="211" width="8" height="10"/>
-		</backdrop>
-		<backdrop name="digit11" element="digit" state="0">
-			<bounds x="324" y="211" width="8" height="10"/>
-		</backdrop>
-		<backdrop name="digit12" element="digit" state="0">
-			<bounds x="332" y="211" width="8" height="10"/>
-		</backdrop>
-		<backdrop name="digit13" element="digit" state="0">
-			<bounds x="340" y="211" width="8" height="10"/>
-		</backdrop>
-		<backdrop name="digit14" element="digit" state="0">
-			<bounds x="348" y="211" width="8" height="10"/>
-		</backdrop>
-		<backdrop name="digit15" element="digit" state="0">
-			<bounds x="356" y="211" width="8" height="10"/>
-		</backdrop>
-		<backdrop name="digit16" element="digit" state="0">
-			<bounds x="300" y="222" width="8" height="10"/>
-		</backdrop>
-		<backdrop name="digit17" element="digit" state="0">
-			<bounds x="308" y="222" width="8" height="10"/>
-		</backdrop>
-		<backdrop name="digit18" element="digit" state="0">
-			<bounds x="316" y="222" width="8" height="10"/>
-		</backdrop>
-		<backdrop name="digit19" element="digit" state="0">
-			<bounds x="324" y="222" width="8" height="10"/>
-		</backdrop>
-		<backdrop name="digit20" element="digit" state="0">
-			<bounds x="332" y="222" width="8" height="10"/>
-		</backdrop>
-		<backdrop name="digit21" element="digit" state="0">
-			<bounds x="340" y="222" width="8" height="10"/>
-		</backdrop>
-		<backdrop name="digit22" element="digit" state="0">
-			<bounds x="348" y="222" width="8" height="10"/>
-		</backdrop>
-		<backdrop name="digit23" element="digit" state="0">
-			<bounds x="356" y="222" width="8" height="10"/>
-		</backdrop>
-		<backdrop name="digit24" element="digit" state="0">
-			<bounds x="300" y="233" width="8" height="10"/>
-		</backdrop>
-		<backdrop name="digit25" element="digit" state="0">
-			<bounds x="308" y="233" width="8" height="10"/>
-		</backdrop>
-		<backdrop name="digit26" element="digit" state="0">
-			<bounds x="316" y="233" width="8" height="10"/>
-		</backdrop>
-		<backdrop name="digit27" element="digit" state="0">
-			<bounds x="324" y="233" width="8" height="10"/>
-		</backdrop>
-		<backdrop name="digit28" element="digit" state="0">
-			<bounds x="332" y="233" width="8" height="10"/>
-		</backdrop>
-		<backdrop name="digit29" element="digit" state="0">
-			<bounds x="340" y="233" width="8" height="10"/>
-		</backdrop>
-		<backdrop name="digit30" element="digit" state="0">
-			<bounds x="348" y="233" width="8" height="10"/>
-		</backdrop>
-		<backdrop name="digit31" element="digit" state="0">
-			<bounds x="356" y="233" width="8" height="10"/>
-		</backdrop>
-		<backdrop name="digit32" element="digit" state="0">
-			<bounds x="300" y="244" width="8" height="10"/>
-		</backdrop>
-		<backdrop name="digit33" element="digit" state="0">
-			<bounds x="308" y="244" width="8" height="10"/>
-		</backdrop>
-		<backdrop name="digit34" element="digit" state="0">
-			<bounds x="316" y="244" width="8" height="10"/>
-		</backdrop>
-		<backdrop name="digit35" element="digit" state="0">
-			<bounds x="324" y="244" width="8" height="10"/>
-		</backdrop>
-		<backdrop name="digit36" element="digit" state="0">
-			<bounds x="332" y="244" width="8" height="10"/>
-		</backdrop>
-		<backdrop name="digit37" element="digit" state="0">
-			<bounds x="340" y="244" width="8" height="10"/>
-		</backdrop>
-		<backdrop name="digit38" element="digit" state="0">
-			<bounds x="348" y="244" width="8" height="10"/>
-		</backdrop>
-		<backdrop name="digit39" element="digit" state="0">
-			<bounds x="356" y="244" width="8" height="10"/>
-		</backdrop>
-		<backdrop name="vfd15" element="vfd0" state="0">
-			<bounds x="17" y="280" width="7" height="24"/>
-		</backdrop>
-		<backdrop name="vfd14" element="vfd0" state="0">
-			<bounds x="24" y="280" width="7" height="24"/>
-		</backdrop>
-		<backdrop name="vfd13" element="vfd0" state="0">
-			<bounds x="31" y="280" width="7" height="24"/>
-		</backdrop>
-		<backdrop name="vfd12" element="vfd0" state="0">
-			<bounds x="38" y="280" width="7" height="24"/>
-		</backdrop>
-		<backdrop name="vfd11" element="vfd0" state="0">
-			<bounds x="45" y="280" width="7" height="24"/>
-		</backdrop>
-		<backdrop name="vfd10" element="vfd0" state="0">
-			<bounds x="52" y="280" width="7" height="24"/>
-		</backdrop>
-		<backdrop name="vfd9" element="vfd0" state="0">
-			<bounds x="59" y="280" width="7" height="24"/>
-		</backdrop>
-		<backdrop name="vfd8" element="vfd0" state="0">
-			<bounds x="66" y="280" width="7" height="24"/>
-		</backdrop>
-		<backdrop name="vfd7" element="vfd0" state="0">
-			<bounds x="73" y="280" width="7" height="24"/>
-		</backdrop>
-		<backdrop name="vfd6" element="vfd0" state="0">
-			<bounds x="80" y="280" width="7" height="24"/>
-		</backdrop>
-		<backdrop name="vfd5" element="vfd0" state="0">
-			<bounds x="87" y="280" width="7" height="24"/>
-		</backdrop>
-		<backdrop name="vfd4" element="vfd0" state="0">
-			<bounds x="94" y="280" width="7" height="24"/>
-		</backdrop>
-		<backdrop name="vfd3" element="vfd0" state="0">
-			<bounds x="101" y="280" width="7" height="24"/>
-		</backdrop>
-		<backdrop name="vfd2" element="vfd0" state="0">
-			<bounds x="108" y="280" width="7" height="24"/>
-		</backdrop>
-		<backdrop name="vfd1" element="vfd0" state="0">
-			<bounds x="115" y="280" width="7" height="24"/>
-		</backdrop>
-		<backdrop name="vfd0" element="vfd0" state="0">
-			<bounds x="122" y="280" width="7" height="24"/>
-		</backdrop>
+		</element>
+		<repeat count="5">
+			<param name="s" start="0" increment="8" />
+			<param name="y" start="200" increment="11" />
+			<repeat count="8">
+				<param name="n" start="~s~" increment="1" />
+				<param name="x" start="300" increment="8" />
+				<element name="digit~n~" ref="digit" state="0">
+					<bounds x="~x~" y="~y~" width="8" height="10"/>
+				</element>
+			</repeat>
+		</repeat>
+		<group ref="vfd">
+			<bounds x="17" y="280" width="112" height="24" />
+		</group>
 	</view>
 	<view name="VFD Display Output Only">
-		<bezel name="vfd15" element="vfd0" state="0">
-			<bounds x="10" y="200" width="9" height="17"/>
-		</bezel>
-		<bezel name="vfd14" element="vfd0" state="0">
-			<bounds x="19" y="200" width="9" height="17"/>
-		</bezel>
-		<bezel name="vfd13" element="vfd0" state="0">
-			<bounds x="28" y="200" width="9" height="17"/>
-		</bezel>
-		<bezel name="vfd12" element="vfd0" state="0">
-			<bounds x="37" y="200" width="9" height="17"/>
-		</bezel>
-		<bezel name="vfd11" element="vfd0" state="0">
-			<bounds x="46" y="200" width="9" height="17"/>
-		</bezel>
-		<bezel name="vfd10" element="vfd0" state="0">
-			<bounds x="55" y="200" width="9" height="17"/>
-		</bezel>
-		<bezel name="vfd9" element="vfd0" state="0">
-			<bounds x="64" y="200" width="9" height="17"/>
-		</bezel>
-		<bezel name="vfd8" element="vfd0" state="0">
-			<bounds x="73" y="200" width="9" height="17"/>
-		</bezel>
-		<bezel name="vfd7" element="vfd0" state="0">
-			<bounds x="82" y="200" width="9" height="17"/>
-		</bezel>
-		<bezel name="vfd6" element="vfd0" state="0">
-			<bounds x="91" y="200" width="9" height="17"/>
-		</bezel>
-		<bezel name="vfd5" element="vfd0" state="0">
-			<bounds x="100" y="200" width="9" height="17"/>
-		</bezel>
-		<bezel name="vfd4" element="vfd0" state="0">
-			<bounds x="109" y="200" width="9" height="17"/>
-		</bezel>
-		<bezel name="vfd3" element="vfd0" state="0">
-			<bounds x="118" y="200" width="9" height="17"/>
-		</bezel>
-		<bezel name="vfd2" element="vfd0" state="0">
-			<bounds x="127" y="200" width="9" height="17"/>
-		</bezel>
-		<bezel name="vfd1" element="vfd0" state="0">
-			<bounds x="136" y="200" width="9" height="17"/>
-		</bezel>
-		<bezel name="vfd0" element="vfd0" state="0">
-			<bounds x="145" y="200" width="9" height="17"/>
-		</bezel>
+		<group ref="vfd" />
 	</view>
 </mamelayout>
diff --git a/src/mame/layout/mpu4plasma.lay b/src/mame/layout/mpu4plasma.lay
index f77a1b82792..887c794d92d 100644
--- a/src/mame/layout/mpu4plasma.lay
+++ b/src/mame/layout/mpu4plasma.lay
@@ -4,515 +4,80 @@ license:CC0
 -->
 <mamelayout version="2">
 	<element name="digit">
-	<led7seg>
+		<led7seg>
 			<color red="1.0" green="0.0" blue="0.0" />
-	</led7seg>
+		</led7seg>
 	</element>
 	<element name="matrixlamp">
 		<rect state ="0">
-			<bounds x="0" y="0" width="7" height="7" />
 			<color red="0.7" green="0.7" blue="0.7" />
 		</rect>
 		<rect state ="1">
-			<bounds x="0" y="0" width="7" height="7" />
 			<color red="0.0" green="0.0" blue="1.0" />
 		</rect>
 		<rect state ="2">
-			<bounds x="0" y="0" width="7" height="7" />
 			<color red="0.0" green="1.0" blue="0.0" />
 		</rect>
 	</element>
 	<element name="Steppers" defstate="0">
 		<simplecounter maxstate="999" digits="3">
-		<color red="1.0" green="1.0" blue="1.0" />
-		<bounds x="0" y="0" width="1" height="1" />
+			<color red="1.0" green="1.0" blue="1.0" />
 		</simplecounter>
 	</element>
 	<element name="vfd0">
-	<led16segsc>
+		<led16segsc>
 			<color red="0" green="0.6" blue="1.0" />
-	</led16segsc>
+		</led16segsc>
 	</element>
 
+	<group name="vfd">
+		<repeat count="16">
+			<param name="n" start="15" increment="-1" />
+			<param name="x" start="0" increment="9" />
+			<element name="vfd~n~" ref="vfd0" state="0">
+				<bounds x="~x~" y="0" width="9" height="17"/>
+			</element>
+		</repeat>
+	</group>
+
 	<view name="AWP Simulated Video (No Artwork) (With Plasma)">
-		<backdrop name="reel1" element="Steppers" state="0">
-			<bounds x="10" y="300" width="50" height="50"/>
-		</backdrop>
-		<backdrop name="reel2" element="Steppers" state="0">
-			<bounds x="60" y="300" width="50" height="50"/>
-		</backdrop>
-		<backdrop name="reel3" element="Steppers" state="0">
-			<bounds x="110" y="300" width="50" height="50"/>
-		</backdrop>
-		<backdrop name="reel4" element="Steppers" state="0">
-			<bounds x="160" y="300" width="50" height="50"/>
-		</backdrop>
-		<backdrop name="reel5" element="Steppers" state="0">
+		<screen index="0">
+			<bounds x="32" y="64" width="200" height="75" />
+		</screen>
+
+		<repeat count="4">
+			<param name="n" start="1" increment="1" />
+			<param name="x" start="10" increment="50" />
+			<element name="reel~n~" ref="Steppers" state="0">
+				<bounds x="~x~" y="300" width="50" height="50"/>
+			</element>
+		</repeat>
+		<element name="reel5" ref="Steppers" state="0">
 			<bounds x="220" y="300" width="50" height="50"/>
-		</backdrop>
-		<backdrop name="reel6" element="Steppers" state="0">
+		</element>
+		<element name="reel6" ref="Steppers" state="0">
 			<bounds x="280" y="300" width="50" height="50"/>
-		</backdrop>
-		<backdrop name="lamp0" element="matrixlamp" state="0">
-			<bounds x="0" y="0" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp1" element="matrixlamp" state="0">
-			<bounds x="0" y="8" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp2" element="matrixlamp" state="0">
-			<bounds x="0" y="16" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp3" element="matrixlamp" state="0">
-			<bounds x="0" y="24" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp4" element="matrixlamp" state="0">
-			<bounds x="0" y="32" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp5" element="matrixlamp" state="0">
-			<bounds x="0" y="40" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp6" element="matrixlamp" state="0">
-			<bounds x="0" y="48" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp7" element="matrixlamp" state="0">
-			<bounds x="0" y="56" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp8" element="matrixlamp" state="0">
-			<bounds x="8" y="0" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp9" element="matrixlamp" state="0">
-			<bounds x="8" y="8" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp10" element="matrixlamp" state="0">
-			<bounds x="8" y="16" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp11" element="matrixlamp" state="0">
-			<bounds x="8" y="24" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp12" element="matrixlamp" state="0">
-			<bounds x="8" y="32" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp13" element="matrixlamp" state="0">
-			<bounds x="8" y="40" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp14" element="matrixlamp" state="0">
-			<bounds x="8" y="48" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp15" element="matrixlamp" state="0">
-			<bounds x="8" y="56" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp16" element="matrixlamp" state="0">
-			<bounds x="16" y="0" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp17" element="matrixlamp" state="0">
-			<bounds x="16" y="8" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp18" element="matrixlamp" state="0">
-			<bounds x="16" y="16" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp19" element="matrixlamp" state="0">
-			<bounds x="16" y="24" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp20" element="matrixlamp" state="0">
-			<bounds x="16" y="32" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp21" element="matrixlamp" state="0">
-			<bounds x="16" y="40" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp22" element="matrixlamp" state="0">
-			<bounds x="16" y="48" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp23" element="matrixlamp" state="0">
-			<bounds x="16" y="56" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp24" element="matrixlamp" state="0">
-			<bounds x="24" y="0" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp25" element="matrixlamp" state="0">
-			<bounds x="24" y="8" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp26" element="matrixlamp" state="0">
-			<bounds x="24" y="16" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp27" element="matrixlamp" state="0">
-			<bounds x="24" y="24" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp28" element="matrixlamp" state="0">
-			<bounds x="24" y="32" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp29" element="matrixlamp" state="0">
-			<bounds x="24" y="40" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp30" element="matrixlamp" state="0">
-			<bounds x="24" y="48" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp31" element="matrixlamp" state="0">
-			<bounds x="24" y="56" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp32" element="matrixlamp" state="0">
-			<bounds x="32" y="0" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp33" element="matrixlamp" state="0">
-			<bounds x="32" y="8" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp34" element="matrixlamp" state="0">
-			<bounds x="32" y="16" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp35" element="matrixlamp" state="0">
-			<bounds x="32" y="24" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp36" element="matrixlamp" state="0">
-			<bounds x="32" y="32" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp37" element="matrixlamp" state="0">
-			<bounds x="32" y="40" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp38" element="matrixlamp" state="0">
-			<bounds x="32" y="48" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp39" element="matrixlamp" state="0">
-			<bounds x="32" y="56" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp40" element="matrixlamp" state="0">
-			<bounds x="40" y="0" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp41" element="matrixlamp" state="0">
-			<bounds x="40" y="8" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp42" element="matrixlamp" state="0">
-			<bounds x="40" y="16" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp43" element="matrixlamp" state="0">
-			<bounds x="40" y="24" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp44" element="matrixlamp" state="0">
-			<bounds x="40" y="32" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp45" element="matrixlamp" state="0">
-			<bounds x="40" y="40" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp46" element="matrixlamp" state="0">
-			<bounds x="40" y="48" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp47" element="matrixlamp" state="0">
-			<bounds x="40" y="56" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp48" element="matrixlamp" state="0">
-			<bounds x="48" y="0" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp49" element="matrixlamp" state="0">
-			<bounds x="48" y="8" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp50" element="matrixlamp" state="0">
-			<bounds x="48" y="16" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp51" element="matrixlamp" state="0">
-			<bounds x="48" y="24" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp52" element="matrixlamp" state="0">
-			<bounds x="48" y="32" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp53" element="matrixlamp" state="0">
-			<bounds x="48" y="40" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp54" element="matrixlamp" state="0">
-			<bounds x="48" y="48" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp55" element="matrixlamp" state="0">
-			<bounds x="48" y="56" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp56" element="matrixlamp" state="0">
-			<bounds x="56" y="0" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp57" element="matrixlamp" state="0">
-			<bounds x="56" y="8" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp58" element="matrixlamp" state="0">
-			<bounds x="56" y="16" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp59" element="matrixlamp" state="0">
-			<bounds x="56" y="24" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp60" element="matrixlamp" state="0">
-			<bounds x="56" y="32" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp61" element="matrixlamp" state="0">
-			<bounds x="56" y="40" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp62" element="matrixlamp" state="0">
-			<bounds x="56" y="48" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp63" element="matrixlamp" state="0">
-			<bounds x="56" y="56" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp64" element="matrixlamp" state="0">
-			<bounds x="64" y="0" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp65" element="matrixlamp" state="0">
-			<bounds x="64" y="8" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp66" element="matrixlamp" state="0">
-			<bounds x="64" y="16" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp67" element="matrixlamp" state="0">
-			<bounds x="64" y="24" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp68" element="matrixlamp" state="0">
-			<bounds x="64" y="32" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp69" element="matrixlamp" state="0">
-			<bounds x="64" y="40" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp70" element="matrixlamp" state="0">
-			<bounds x="64" y="48" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp71" element="matrixlamp" state="0">
-			<bounds x="64" y="56" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp72" element="matrixlamp" state="0">
-			<bounds x="72" y="0" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp73" element="matrixlamp" state="0">
-			<bounds x="72" y="8" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp74" element="matrixlamp" state="0">
-			<bounds x="72" y="16" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp75" element="matrixlamp" state="0">
-			<bounds x="72" y="24" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp76" element="matrixlamp" state="0">
-			<bounds x="72" y="32" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp77" element="matrixlamp" state="0">
-			<bounds x="72" y="40" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp78" element="matrixlamp" state="0">
-			<bounds x="72" y="48" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp79" element="matrixlamp" state="0">
-			<bounds x="72" y="56" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp80" element="matrixlamp" state="0">
-			<bounds x="80" y="0" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp81" element="matrixlamp" state="0">
-			<bounds x="80" y="8" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp82" element="matrixlamp" state="0">
-			<bounds x="80" y="16" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp83" element="matrixlamp" state="0">
-			<bounds x="80" y="24" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp84" element="matrixlamp" state="0">
-			<bounds x="80" y="32" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp85" element="matrixlamp" state="0">
-			<bounds x="80" y="40" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp86" element="matrixlamp" state="0">
-			<bounds x="80" y="48" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp87" element="matrixlamp" state="0">
-			<bounds x="80" y="56" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp88" element="matrixlamp" state="0">
-			<bounds x="88" y="0" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp89" element="matrixlamp" state="0">
-			<bounds x="88" y="8" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp90" element="matrixlamp" state="0">
-			<bounds x="88" y="16" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp91" element="matrixlamp" state="0">
-			<bounds x="88" y="24" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp92" element="matrixlamp" state="0">
-			<bounds x="88" y="32" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp93" element="matrixlamp" state="0">
-			<bounds x="88" y="40" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp94" element="matrixlamp" state="0">
-			<bounds x="88" y="48" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp95" element="matrixlamp" state="0">
-			<bounds x="88" y="56" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp96" element="matrixlamp" state="0">
-			<bounds x="96" y="0" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp97" element="matrixlamp" state="0">
-			<bounds x="96" y="8" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp98" element="matrixlamp" state="0">
-			<bounds x="96" y="16" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp99" element="matrixlamp" state="0">
-			<bounds x="96" y="24" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp100" element="matrixlamp" state="0">
-			<bounds x="96" y="32" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp101" element="matrixlamp" state="0">
-			<bounds x="96" y="40" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp102" element="matrixlamp" state="0">
-			<bounds x="96" y="48" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp103" element="matrixlamp" state="0">
-			<bounds x="96" y="56" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp104" element="matrixlamp" state="0">
-			<bounds x="104" y="0" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp105" element="matrixlamp" state="0">
-			<bounds x="104" y="8" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp106" element="matrixlamp" state="0">
-			<bounds x="104" y="16" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp107" element="matrixlamp" state="0">
-			<bounds x="104" y="24" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp108" element="matrixlamp" state="0">
-			<bounds x="104" y="32" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp109" element="matrixlamp" state="0">
-			<bounds x="104" y="40" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp110" element="matrixlamp" state="0">
-			<bounds x="104" y="48" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp111" element="matrixlamp" state="0">
-			<bounds x="104" y="56" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp112" element="matrixlamp" state="0">
-			<bounds x="112" y="0" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp113" element="matrixlamp" state="0">
-			<bounds x="112" y="8" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp114" element="matrixlamp" state="0">
-			<bounds x="112" y="16" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp115" element="matrixlamp" state="0">
-			<bounds x="112" y="24" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp116" element="matrixlamp" state="0">
-			<bounds x="112" y="32" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp117" element="matrixlamp" state="0">
-			<bounds x="112" y="40" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp118" element="matrixlamp" state="0">
-			<bounds x="112" y="48" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp119" element="matrixlamp" state="0">
-			<bounds x="112" y="56" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp120" element="matrixlamp" state="0">
-			<bounds x="120" y="0" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp121" element="matrixlamp" state="0">
-			<bounds x="120" y="8" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp122" element="matrixlamp" state="0">
-			<bounds x="120" y="16" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp123" element="matrixlamp" state="0">
-			<bounds x="120" y="24" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp124" element="matrixlamp" state="0">
-			<bounds x="120" y="32" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp125" element="matrixlamp" state="0">
-			<bounds x="120" y="40" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp126" element="matrixlamp" state="0">
-			<bounds x="120" y="48" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="lamp127" element="matrixlamp" state="0">
-			<bounds x="120" y="56" width="7" height="7"/>
-		</backdrop>
-		<backdrop name="digit0" element="digit" state="0">
-			<bounds x="300" y="200" width="8" height="10"/>
-		</backdrop>
-		<backdrop name="digit1" element="digit" state="0">
-			<bounds x="308" y="200" width="8" height="10"/>
-		</backdrop>
-		<backdrop name="digit2" element="digit" state="0">
-			<bounds x="316" y="200" width="8" height="10"/>
-		</backdrop>
-		<backdrop name="digit3" element="digit" state="0">
-			<bounds x="324" y="200" width="8" height="10"/>
-		</backdrop>
-		<backdrop name="digit4" element="digit" state="0">
-			<bounds x="332" y="200" width="8" height="10"/>
-		</backdrop>
-		<backdrop name="digit5" element="digit" state="0">
-			<bounds x="340" y="200" width="8" height="10"/>
-		</backdrop>
-		<backdrop name="digit6" element="digit" state="0">
-			<bounds x="348" y="200" width="8" height="10"/>
-		</backdrop>
-		<backdrop name="digit7" element="digit" state="0">
-			<bounds x="356" y="200" width="8" height="10"/>
-		</backdrop>
-		<backdrop name="vfd15" element="vfd0" state="0">
-			<bounds x="17" y="280" width="7" height="24"/>
-		</backdrop>
-		<backdrop name="vfd14" element="vfd0" state="0">
-			<bounds x="24" y="280" width="7" height="24"/>
-		</backdrop>
-		<backdrop name="vfd13" element="vfd0" state="0">
-			<bounds x="31" y="280" width="7" height="24"/>
-		</backdrop>
-		<backdrop name="vfd12" element="vfd0" state="0">
-			<bounds x="38" y="280" width="7" height="24"/>
-		</backdrop>
-		<backdrop name="vfd11" element="vfd0" state="0">
-			<bounds x="45" y="280" width="7" height="24"/>
-		</backdrop>
-		<backdrop name="vfd10" element="vfd0" state="0">
-			<bounds x="52" y="280" width="7" height="24"/>
-		</backdrop>
-		<backdrop name="vfd9" element="vfd0" state="0">
-			<bounds x="59" y="280" width="7" height="24"/>
-		</backdrop>
-		<backdrop name="vfd8" element="vfd0" state="0">
-			<bounds x="66" y="280" width="7" height="24"/>
-		</backdrop>
-		<backdrop name="vfd7" element="vfd0" state="0">
-			<bounds x="73" y="280" width="7" height="24"/>
-		</backdrop>
-		<backdrop name="vfd6" element="vfd0" state="0">
-			<bounds x="80" y="280" width="7" height="24"/>
-		</backdrop>
-		<backdrop name="vfd5" element="vfd0" state="0">
-			<bounds x="87" y="280" width="7" height="24"/>
-		</backdrop>
-		<backdrop name="vfd4" element="vfd0" state="0">
-			<bounds x="94" y="280" width="7" height="24"/>
-		</backdrop>
-		<backdrop name="vfd3" element="vfd0" state="0">
-			<bounds x="101" y="280" width="7" height="24"/>
-		</backdrop>
-		<backdrop name="vfd2" element="vfd0" state="0">
-			<bounds x="108" y="280" width="7" height="24"/>
-		</backdrop>
-		<backdrop name="vfd1" element="vfd0" state="0">
-			<bounds x="115" y="280" width="7" height="24"/>
-		</backdrop>
-		<backdrop name="vfd0" element="vfd0" state="0">
-			<bounds x="122" y="280" width="7" height="24"/>
-		</backdrop>
-
-	<screen index="0">
-		<bounds x="32" y="64" width="200" height="75" />
-	</screen>
-
+		</element>
+		<repeat count="16">
+			<param name="s" start="0" increment="8" />
+			<param name="x" start="0" increment="8" />
+			<repeat count="8">
+				<param name="n" start="~s~" increment="1" />
+				<param name="y" start="0" increment="8" />
+				<element name="lamp~n~" ref="matrixlamp" state="0" blend="add">
+					<bounds x="~x~" y="~y~" width="7" height="7"/>
+				</element>
+			</repeat>
+		</repeat>
+		<repeat count="8">
+			<param name="n" start="0" increment="1" />
+			<param name="x" start="300" increment="8" />
+			<element name="digit~n~" ref="digit" state="0">
+				<bounds x="~x~" y="200" width="8" height="10"/>
+			</element>
+		</repeat>
+		<group ref="vfd">
+			<bounds x="17" y="280" width="112" height="24" />
+		</group>
 	</view>
-	</mamelayout>
+</mamelayout>
diff --git a/src/mame/layout/saitek_ccompan.lay b/src/mame/layout/saitek_ccompan.lay
index d297730f3a2..338abdfcc89 100644
--- a/src/mame/layout/saitek_ccompan.lay
+++ b/src/mame/layout/saitek_ccompan.lay
@@ -580,14 +580,15 @@ license:CC0
 	<view name="Internal Layout">
 		<bounds left="-14" right="120" top="-1" bottom="88" />
 
-		<element ref="black2"><bounds x="3.7" y="2.7" width="80.6" height="80.6" /></element>
 		<element ref="cwhite"><bounds x="-1" y="-1" width="88.5" height="89" /></element>
-		<group ref="sb_board"><bounds x="4" y="3" width="80" height="80" /></group>
-		<group ref="sb_ui"><bounds x="-12.5" y="3" width="10" height="80" /></group>
 
 		<element ref="cwhite"><bounds x="87" y="-1" width="33" height="89" /></element>
 		<group ref="panel"><bounds x="88" y="28.7" width="31" height="59" /></group>
 
+		<element ref="black2"><bounds x="3.7" y="2.7" width="80.6" height="80.6" /></element>
+		<group ref="sb_board"><bounds x="4" y="3" width="80" height="80" /></group>
+		<group ref="sb_ui"><bounds x="-12.5" y="3" width="10" height="80" /></group>
+
 		<element ref="text_8"><bounds x="-0.4" y="7"  width="2" height="2" /></element>
 		<element ref="text_7"><bounds x="-0.4" y="17" width="2" height="2" /></element>
 		<element ref="text_6"><bounds x="-0.4" y="27" width="2" height="2" /></element>
diff --git a/src/mame/layout/sc2_vid.lay b/src/mame/layout/sc2_vid.lay
index 088929e079c..832f8051276 100644
--- a/src/mame/layout/sc2_vid.lay
+++ b/src/mame/layout/sc2_vid.lay
@@ -5,15 +5,12 @@ license:CC0
 <mamelayout version="2">
 	<element name="matrixlamp">
 		<rect state ="0">
-			<bounds x="0" y="0" width="7" height="7" />
 			<color red="0.7" green="0.7" blue="0.7" />
 		</rect>
 		<rect state ="1">
-			<bounds x="0" y="0" width="7" height="7" />
 			<color red="0.0" green="0.0" blue="1.0" />
 		</rect>
 		<rect state ="2">
-			<bounds x="0" y="0" width="7" height="7" />
 			<color red="0.0" green="1.0" blue="0.0" />
 		</rect>
 	</element>
diff --git a/src/mame/layout/spacezap.lay b/src/mame/layout/spacezap.lay
index bb6d690a0f5..12f16d3eb78 100644
--- a/src/mame/layout/spacezap.lay
+++ b/src/mame/layout/spacezap.lay
@@ -209,6 +209,8 @@ license:CC0
 
 
 	<view name="Color Overlay">
+		<bounds left="0" top="0" right="400" bottom="300" />
+
 		<screen index="0">
 			<bounds left="0" top="0" right="400" bottom="300" />
 		</screen>
@@ -216,6 +218,5 @@ license:CC0
 		<element ref="overlay" blend="multiply">
 			<bounds x="-100" y="-150" width="600" height="600" />
 		</element>
-
 	</view>
 </mamelayout>