From 97e58ca2debac474a444cc95e6cf1a54abc9d45b Mon Sep 17 00:00:00 2001
From: hap <happppp@users.noreply.github.com>
Date: Fri, 13 Feb 2015 20:54:44 +0100
Subject: [PATCH] test layout stuff

---
 src/mess/layout/alnchase.lay | 178 +++++++++++++++++++--
 src/mess/layout/edracula.lay | 172 ++++++++++++++++++--
 src/mess/layout/tmtennis.lay | 300 +++++++++++++++++------------------
 src/mess/layout/wildfire.lay |   7 +-
 4 files changed, 479 insertions(+), 178 deletions(-)

diff --git a/src/mess/layout/alnchase.lay b/src/mess/layout/alnchase.lay
index 59ddac58d3e..16d4bdae325 100644
--- a/src/mess/layout/alnchase.lay
+++ b/src/mess/layout/alnchase.lay
@@ -5,27 +5,183 @@
 
 	<element name="static_black"><rect><color red="0.0" green="0.0" blue="0.0" /></rect></element>
 
-	<element name="green" defstate="0">
-		<disk state="0"><color red="0.0" green="0.1" blue="0.0" /></disk>
-		<disk state="1"><color red="0.2" green="1.0" blue="0.2" /></disk>
-	</element>
-	<element name="red" defstate="0">
-		<disk state="0"><color red="0.1" green="0.0" blue="0.0" /></disk>
-		<disk state="1"><color red="1.0" green="0.2" blue="0.2" /></disk>
+	<element name="led" defstate="0">
+		<disk state="0"><color red="0.1" green="0.2" blue="0.12" /></disk>
+		<disk state="1"><color red="0.5" green="1.0" blue="0.6" /></disk>
 	</element>
 
 
 <!-- build screen -->
 
 	<view name="Test Layout">
-		<bounds left="0" right="100" top="0" bottom="100" />
+		<bounds left="0" right="64" top="0" bottom="64" />
 		<bezel element="static_black">
-			<bounds left="0" right="100" top="0" bottom="100" />
+			<bounds left="0" right="64" top="0" bottom="64" />
 		</bezel>
 
-	<!-- matrix -->
+	<!-- 17*9 matrix -->
 
-		<bezel name="lamp0" element="green"><bounds x="0" y="0" width="1" height="1" /></bezel>
+		<bezel name="lamp800" element="led"><bounds x="0" y="0" width="1" height="1" /></bezel>
+		<bezel name="lamp801" element="led"><bounds x="2" y="0" width="1" height="1" /></bezel>
+		<bezel name="lamp802" element="led"><bounds x="4" y="0" width="1" height="1" /></bezel>
+		<bezel name="lamp803" element="led"><bounds x="6" y="0" width="1" height="1" /></bezel>
+		<bezel name="lamp804" element="led"><bounds x="8" y="0" width="1" height="1" /></bezel>
+		<bezel name="lamp805" element="led"><bounds x="10" y="0" width="1" height="1" /></bezel>
+		<bezel name="lamp806" element="led"><bounds x="12" y="0" width="1" height="1" /></bezel>
+		<bezel name="lamp807" element="led"><bounds x="14" y="0" width="1" height="1" /></bezel>
+		<bezel name="lamp808" element="led"><bounds x="16" y="0" width="1" height="1" /></bezel>
+		<bezel name="lamp809" element="led"><bounds x="18" y="0" width="1" height="1" /></bezel>
+		<bezel name="lamp810" element="led"><bounds x="20" y="0" width="1" height="1" /></bezel>
+		<bezel name="lamp811" element="led"><bounds x="22" y="0" width="1" height="1" /></bezel>
+		<bezel name="lamp812" element="led"><bounds x="24" y="0" width="1" height="1" /></bezel>
+		<bezel name="lamp813" element="led"><bounds x="26" y="0" width="1" height="1" /></bezel>
+		<bezel name="lamp814" element="led"><bounds x="28" y="0" width="1" height="1" /></bezel>
+		<bezel name="lamp815" element="led"><bounds x="30" y="0" width="1" height="1" /></bezel>
+		<bezel name="lamp816" element="led"><bounds x="32" y="0" width="1" height="1" /></bezel>
+
+		<bezel name="lamp700" element="led"><bounds x="0" y="2" width="1" height="1" /></bezel>
+		<bezel name="lamp701" element="led"><bounds x="2" y="2" width="1" height="1" /></bezel>
+		<bezel name="lamp702" element="led"><bounds x="4" y="2" width="1" height="1" /></bezel>
+		<bezel name="lamp703" element="led"><bounds x="6" y="2" width="1" height="1" /></bezel>
+		<bezel name="lamp704" element="led"><bounds x="8" y="2" width="1" height="1" /></bezel>
+		<bezel name="lamp705" element="led"><bounds x="10" y="2" width="1" height="1" /></bezel>
+		<bezel name="lamp706" element="led"><bounds x="12" y="2" width="1" height="1" /></bezel>
+		<bezel name="lamp707" element="led"><bounds x="14" y="2" width="1" height="1" /></bezel>
+		<bezel name="lamp708" element="led"><bounds x="16" y="2" width="1" height="1" /></bezel>
+		<bezel name="lamp709" element="led"><bounds x="18" y="2" width="1" height="1" /></bezel>
+		<bezel name="lamp710" element="led"><bounds x="20" y="2" width="1" height="1" /></bezel>
+		<bezel name="lamp711" element="led"><bounds x="22" y="2" width="1" height="1" /></bezel>
+		<bezel name="lamp712" element="led"><bounds x="24" y="2" width="1" height="1" /></bezel>
+		<bezel name="lamp713" element="led"><bounds x="26" y="2" width="1" height="1" /></bezel>
+		<bezel name="lamp714" element="led"><bounds x="28" y="2" width="1" height="1" /></bezel>
+		<bezel name="lamp715" element="led"><bounds x="30" y="2" width="1" height="1" /></bezel>
+		<bezel name="lamp716" element="led"><bounds x="32" y="2" width="1" height="1" /></bezel>
+
+		<bezel name="lamp600" element="led"><bounds x="0" y="4" width="1" height="1" /></bezel>
+		<bezel name="lamp601" element="led"><bounds x="2" y="4" width="1" height="1" /></bezel>
+		<bezel name="lamp602" element="led"><bounds x="4" y="4" width="1" height="1" /></bezel>
+		<bezel name="lamp603" element="led"><bounds x="6" y="4" width="1" height="1" /></bezel>
+		<bezel name="lamp604" element="led"><bounds x="8" y="4" width="1" height="1" /></bezel>
+		<bezel name="lamp605" element="led"><bounds x="10" y="4" width="1" height="1" /></bezel>
+		<bezel name="lamp606" element="led"><bounds x="12" y="4" width="1" height="1" /></bezel>
+		<bezel name="lamp607" element="led"><bounds x="14" y="4" width="1" height="1" /></bezel>
+		<bezel name="lamp608" element="led"><bounds x="16" y="4" width="1" height="1" /></bezel>
+		<bezel name="lamp609" element="led"><bounds x="18" y="4" width="1" height="1" /></bezel>
+		<bezel name="lamp610" element="led"><bounds x="20" y="4" width="1" height="1" /></bezel>
+		<bezel name="lamp611" element="led"><bounds x="22" y="4" width="1" height="1" /></bezel>
+		<bezel name="lamp612" element="led"><bounds x="24" y="4" width="1" height="1" /></bezel>
+		<bezel name="lamp613" element="led"><bounds x="26" y="4" width="1" height="1" /></bezel>
+		<bezel name="lamp614" element="led"><bounds x="28" y="4" width="1" height="1" /></bezel>
+		<bezel name="lamp615" element="led"><bounds x="30" y="4" width="1" height="1" /></bezel>
+		<bezel name="lamp616" element="led"><bounds x="32" y="4" width="1" height="1" /></bezel>
+
+		<bezel name="lamp500" element="led"><bounds x="0" y="6" width="1" height="1" /></bezel>
+		<bezel name="lamp501" element="led"><bounds x="2" y="6" width="1" height="1" /></bezel>
+		<bezel name="lamp502" element="led"><bounds x="4" y="6" width="1" height="1" /></bezel>
+		<bezel name="lamp503" element="led"><bounds x="6" y="6" width="1" height="1" /></bezel>
+		<bezel name="lamp504" element="led"><bounds x="8" y="6" width="1" height="1" /></bezel>
+		<bezel name="lamp505" element="led"><bounds x="10" y="6" width="1" height="1" /></bezel>
+		<bezel name="lamp506" element="led"><bounds x="12" y="6" width="1" height="1" /></bezel>
+		<bezel name="lamp507" element="led"><bounds x="14" y="6" width="1" height="1" /></bezel>
+		<bezel name="lamp508" element="led"><bounds x="16" y="6" width="1" height="1" /></bezel>
+		<bezel name="lamp509" element="led"><bounds x="18" y="6" width="1" height="1" /></bezel>
+		<bezel name="lamp510" element="led"><bounds x="20" y="6" width="1" height="1" /></bezel>
+		<bezel name="lamp511" element="led"><bounds x="22" y="6" width="1" height="1" /></bezel>
+		<bezel name="lamp512" element="led"><bounds x="24" y="6" width="1" height="1" /></bezel>
+		<bezel name="lamp513" element="led"><bounds x="26" y="6" width="1" height="1" /></bezel>
+		<bezel name="lamp514" element="led"><bounds x="28" y="6" width="1" height="1" /></bezel>
+		<bezel name="lamp515" element="led"><bounds x="30" y="6" width="1" height="1" /></bezel>
+		<bezel name="lamp516" element="led"><bounds x="32" y="6" width="1" height="1" /></bezel>
+
+		<bezel name="lamp400" element="led"><bounds x="0" y="8" width="1" height="1" /></bezel>
+		<bezel name="lamp401" element="led"><bounds x="2" y="8" width="1" height="1" /></bezel>
+		<bezel name="lamp402" element="led"><bounds x="4" y="8" width="1" height="1" /></bezel>
+		<bezel name="lamp403" element="led"><bounds x="6" y="8" width="1" height="1" /></bezel>
+		<bezel name="lamp404" element="led"><bounds x="8" y="8" width="1" height="1" /></bezel>
+		<bezel name="lamp405" element="led"><bounds x="10" y="8" width="1" height="1" /></bezel>
+		<bezel name="lamp406" element="led"><bounds x="12" y="8" width="1" height="1" /></bezel>
+		<bezel name="lamp407" element="led"><bounds x="14" y="8" width="1" height="1" /></bezel>
+		<bezel name="lamp408" element="led"><bounds x="16" y="8" width="1" height="1" /></bezel>
+		<bezel name="lamp409" element="led"><bounds x="18" y="8" width="1" height="1" /></bezel>
+		<bezel name="lamp410" element="led"><bounds x="20" y="8" width="1" height="1" /></bezel>
+		<bezel name="lamp411" element="led"><bounds x="22" y="8" width="1" height="1" /></bezel>
+		<bezel name="lamp412" element="led"><bounds x="24" y="8" width="1" height="1" /></bezel>
+		<bezel name="lamp413" element="led"><bounds x="26" y="8" width="1" height="1" /></bezel>
+		<bezel name="lamp414" element="led"><bounds x="28" y="8" width="1" height="1" /></bezel>
+		<bezel name="lamp415" element="led"><bounds x="30" y="8" width="1" height="1" /></bezel>
+		<bezel name="lamp416" element="led"><bounds x="32" y="8" width="1" height="1" /></bezel>
+
+		<bezel name="lamp300" element="led"><bounds x="0" y="10" width="1" height="1" /></bezel>
+		<bezel name="lamp301" element="led"><bounds x="2" y="10" width="1" height="1" /></bezel>
+		<bezel name="lamp302" element="led"><bounds x="4" y="10" width="1" height="1" /></bezel>
+		<bezel name="lamp303" element="led"><bounds x="6" y="10" width="1" height="1" /></bezel>
+		<bezel name="lamp304" element="led"><bounds x="8" y="10" width="1" height="1" /></bezel>
+		<bezel name="lamp305" element="led"><bounds x="10" y="10" width="1" height="1" /></bezel>
+		<bezel name="lamp306" element="led"><bounds x="12" y="10" width="1" height="1" /></bezel>
+		<bezel name="lamp307" element="led"><bounds x="14" y="10" width="1" height="1" /></bezel>
+		<bezel name="lamp308" element="led"><bounds x="16" y="10" width="1" height="1" /></bezel>
+		<bezel name="lamp309" element="led"><bounds x="18" y="10" width="1" height="1" /></bezel>
+		<bezel name="lamp310" element="led"><bounds x="20" y="10" width="1" height="1" /></bezel>
+		<bezel name="lamp311" element="led"><bounds x="22" y="10" width="1" height="1" /></bezel>
+		<bezel name="lamp312" element="led"><bounds x="24" y="10" width="1" height="1" /></bezel>
+		<bezel name="lamp313" element="led"><bounds x="26" y="10" width="1" height="1" /></bezel>
+		<bezel name="lamp314" element="led"><bounds x="28" y="10" width="1" height="1" /></bezel>
+		<bezel name="lamp315" element="led"><bounds x="30" y="10" width="1" height="1" /></bezel>
+		<bezel name="lamp316" element="led"><bounds x="32" y="10" width="1" height="1" /></bezel>
+
+		<bezel name="lamp200" element="led"><bounds x="0" y="12" width="1" height="1" /></bezel>
+		<bezel name="lamp201" element="led"><bounds x="2" y="12" width="1" height="1" /></bezel>
+		<bezel name="lamp202" element="led"><bounds x="4" y="12" width="1" height="1" /></bezel>
+		<bezel name="lamp203" element="led"><bounds x="6" y="12" width="1" height="1" /></bezel>
+		<bezel name="lamp204" element="led"><bounds x="8" y="12" width="1" height="1" /></bezel>
+		<bezel name="lamp205" element="led"><bounds x="10" y="12" width="1" height="1" /></bezel>
+		<bezel name="lamp206" element="led"><bounds x="12" y="12" width="1" height="1" /></bezel>
+		<bezel name="lamp207" element="led"><bounds x="14" y="12" width="1" height="1" /></bezel>
+		<bezel name="lamp208" element="led"><bounds x="16" y="12" width="1" height="1" /></bezel>
+		<bezel name="lamp209" element="led"><bounds x="18" y="12" width="1" height="1" /></bezel>
+		<bezel name="lamp210" element="led"><bounds x="20" y="12" width="1" height="1" /></bezel>
+		<bezel name="lamp211" element="led"><bounds x="22" y="12" width="1" height="1" /></bezel>
+		<bezel name="lamp212" element="led"><bounds x="24" y="12" width="1" height="1" /></bezel>
+		<bezel name="lamp213" element="led"><bounds x="26" y="12" width="1" height="1" /></bezel>
+		<bezel name="lamp214" element="led"><bounds x="28" y="12" width="1" height="1" /></bezel>
+		<bezel name="lamp215" element="led"><bounds x="30" y="12" width="1" height="1" /></bezel>
+		<bezel name="lamp216" element="led"><bounds x="32" y="12" width="1" height="1" /></bezel>
+
+		<bezel name="lamp100" element="led"><bounds x="0" y="14" width="1" height="1" /></bezel>
+		<bezel name="lamp101" element="led"><bounds x="2" y="14" width="1" height="1" /></bezel>
+		<bezel name="lamp102" element="led"><bounds x="4" y="14" width="1" height="1" /></bezel>
+		<bezel name="lamp103" element="led"><bounds x="6" y="14" width="1" height="1" /></bezel>
+		<bezel name="lamp104" element="led"><bounds x="8" y="14" width="1" height="1" /></bezel>
+		<bezel name="lamp105" element="led"><bounds x="10" y="14" width="1" height="1" /></bezel>
+		<bezel name="lamp106" element="led"><bounds x="12" y="14" width="1" height="1" /></bezel>
+		<bezel name="lamp107" element="led"><bounds x="14" y="14" width="1" height="1" /></bezel>
+		<bezel name="lamp108" element="led"><bounds x="16" y="14" width="1" height="1" /></bezel>
+		<bezel name="lamp109" element="led"><bounds x="18" y="14" width="1" height="1" /></bezel>
+		<bezel name="lamp110" element="led"><bounds x="20" y="14" width="1" height="1" /></bezel>
+		<bezel name="lamp111" element="led"><bounds x="22" y="14" width="1" height="1" /></bezel>
+		<bezel name="lamp112" element="led"><bounds x="24" y="14" width="1" height="1" /></bezel>
+		<bezel name="lamp113" element="led"><bounds x="26" y="14" width="1" height="1" /></bezel>
+		<bezel name="lamp114" element="led"><bounds x="28" y="14" width="1" height="1" /></bezel>
+		<bezel name="lamp115" element="led"><bounds x="30" y="14" width="1" height="1" /></bezel>
+		<bezel name="lamp116" element="led"><bounds x="32" y="14" width="1" height="1" /></bezel>
+
+		<bezel name="lamp0" element="led"><bounds x="0" y="16" width="1" height="1" /></bezel>
+		<bezel name="lamp1" element="led"><bounds x="2" y="16" width="1" height="1" /></bezel>
+		<bezel name="lamp2" element="led"><bounds x="4" y="16" width="1" height="1" /></bezel>
+		<bezel name="lamp3" element="led"><bounds x="6" y="16" width="1" height="1" /></bezel>
+		<bezel name="lamp4" element="led"><bounds x="8" y="16" width="1" height="1" /></bezel>
+		<bezel name="lamp5" element="led"><bounds x="10" y="16" width="1" height="1" /></bezel>
+		<bezel name="lamp6" element="led"><bounds x="12" y="16" width="1" height="1" /></bezel>
+		<bezel name="lamp7" element="led"><bounds x="14" y="16" width="1" height="1" /></bezel>
+		<bezel name="lamp8" element="led"><bounds x="16" y="16" width="1" height="1" /></bezel>
+		<bezel name="lamp9" element="led"><bounds x="18" y="16" width="1" height="1" /></bezel>
+		<bezel name="lamp10" element="led"><bounds x="20" y="16" width="1" height="1" /></bezel>
+		<bezel name="lamp11" element="led"><bounds x="22" y="16" width="1" height="1" /></bezel>
+		<bezel name="lamp12" element="led"><bounds x="24" y="16" width="1" height="1" /></bezel>
+		<bezel name="lamp13" element="led"><bounds x="26" y="16" width="1" height="1" /></bezel>
+		<bezel name="lamp14" element="led"><bounds x="28" y="16" width="1" height="1" /></bezel>
+		<bezel name="lamp15" element="led"><bounds x="30" y="16" width="1" height="1" /></bezel>
+		<bezel name="lamp16" element="led"><bounds x="32" y="16" width="1" height="1" /></bezel>
 
 
 	</view>
diff --git a/src/mess/layout/edracula.lay b/src/mess/layout/edracula.lay
index 448ceef4342..174b8dbb090 100644
--- a/src/mess/layout/edracula.lay
+++ b/src/mess/layout/edracula.lay
@@ -5,31 +5,173 @@
 
 	<element name="static_black"><rect><color red="0.0" green="0.0" blue="0.0" /></rect></element>
 
-	<element name="cyan" defstate="0">
-		<disk state="0"><color red="0.0" green="0.1" blue="0.1" /></disk>
-		<disk state="1"><color red="0.2" green="1.0" blue="1.0" /></disk>
-	</element>
-	<element name="green" defstate="0">
-		<disk state="0"><color red="0.0" green="0.1" blue="0.0" /></disk>
-		<disk state="1"><color red="0.2" green="1.0" blue="0.2" /></disk>
-	</element>
-	<element name="red" defstate="0">
-		<disk state="0"><color red="0.1" green="0.0" blue="0.0" /></disk>
-		<disk state="1"><color red="1.0" green="0.2" blue="0.2" /></disk>
+	<element name="led" defstate="0">
+		<disk state="0"><color red="0.1" green="0.2" blue="0.2" /></disk>
+		<disk state="1"><color red="0.5" green="1.0" blue="1.0" /></disk>
 	</element>
 
 
 <!-- build screen -->
 
 	<view name="Test Layout">
-		<bounds left="0" right="100" top="0" bottom="100" />
+		<bounds left="0" right="64" top="0" bottom="64" />
 		<bezel element="static_black">
-			<bounds left="0" right="100" top="0" bottom="100" />
+			<bounds left="0" right="64" top="0" bottom="64" />
 		</bezel>
 
-	<!-- matrix -->
+	<!-- 8*18 matrix -->
 
-		<bezel name="lamp0" element="green"><bounds x="0" y="0" width="1" height="1" /></bezel>
+		<bezel name="lamp700" element="led"><bounds x="0" y="0" width="1" height="1" /></bezel>
+		<bezel name="lamp701" element="led"><bounds x="0" y="2" width="1" height="1" /></bezel>
+		<bezel name="lamp702" element="led"><bounds x="0" y="4" width="1" height="1" /></bezel>
+		<bezel name="lamp703" element="led"><bounds x="0" y="6" width="1" height="1" /></bezel>
+		<bezel name="lamp704" element="led"><bounds x="0" y="8" width="1" height="1" /></bezel>
+		<bezel name="lamp705" element="led"><bounds x="0" y="10" width="1" height="1" /></bezel>
+		<bezel name="lamp706" element="led"><bounds x="0" y="12" width="1" height="1" /></bezel>
+		<bezel name="lamp707" element="led"><bounds x="0" y="14" width="1" height="1" /></bezel>
+		<bezel name="lamp708" element="led"><bounds x="0" y="16" width="1" height="1" /></bezel>
+		<bezel name="lamp709" element="led"><bounds x="0" y="18" width="1" height="1" /></bezel>
+		<bezel name="lamp710" element="led"><bounds x="0" y="20" width="1" height="1" /></bezel>
+		<bezel name="lamp711" element="led"><bounds x="0" y="22" width="1" height="1" /></bezel>
+		<bezel name="lamp712" element="led"><bounds x="0" y="24" width="1" height="1" /></bezel>
+		<bezel name="lamp713" element="led"><bounds x="0" y="26" width="1" height="1" /></bezel>
+		<bezel name="lamp714" element="led"><bounds x="0" y="28" width="1" height="1" /></bezel>
+		<bezel name="lamp715" element="led"><bounds x="0" y="30" width="1" height="1" /></bezel>
+		<bezel name="lamp716" element="led"><bounds x="0" y="32" width="1" height="1" /></bezel>
+		<bezel name="lamp717" element="led"><bounds x="0" y="34" width="1" height="1" /></bezel>
+
+		<bezel name="lamp600" element="led"><bounds x="2" y="0" width="1" height="1" /></bezel>
+		<bezel name="lamp601" element="led"><bounds x="2" y="2" width="1" height="1" /></bezel>
+		<bezel name="lamp602" element="led"><bounds x="2" y="4" width="1" height="1" /></bezel>
+		<bezel name="lamp603" element="led"><bounds x="2" y="6" width="1" height="1" /></bezel>
+		<bezel name="lamp604" element="led"><bounds x="2" y="8" width="1" height="1" /></bezel>
+		<bezel name="lamp605" element="led"><bounds x="2" y="10" width="1" height="1" /></bezel>
+		<bezel name="lamp606" element="led"><bounds x="2" y="12" width="1" height="1" /></bezel>
+		<bezel name="lamp607" element="led"><bounds x="2" y="14" width="1" height="1" /></bezel>
+		<bezel name="lamp608" element="led"><bounds x="2" y="16" width="1" height="1" /></bezel>
+		<bezel name="lamp609" element="led"><bounds x="2" y="18" width="1" height="1" /></bezel>
+		<bezel name="lamp610" element="led"><bounds x="2" y="20" width="1" height="1" /></bezel>
+		<bezel name="lamp611" element="led"><bounds x="2" y="22" width="1" height="1" /></bezel>
+		<bezel name="lamp612" element="led"><bounds x="2" y="24" width="1" height="1" /></bezel>
+		<bezel name="lamp613" element="led"><bounds x="2" y="26" width="1" height="1" /></bezel>
+		<bezel name="lamp614" element="led"><bounds x="2" y="28" width="1" height="1" /></bezel>
+		<bezel name="lamp615" element="led"><bounds x="2" y="30" width="1" height="1" /></bezel>
+		<bezel name="lamp616" element="led"><bounds x="2" y="32" width="1" height="1" /></bezel>
+		<bezel name="lamp617" element="led"><bounds x="2" y="34" width="1" height="1" /></bezel>
+
+		<bezel name="lamp500" element="led"><bounds x="4" y="0" width="1" height="1" /></bezel>
+		<bezel name="lamp501" element="led"><bounds x="4" y="2" width="1" height="1" /></bezel>
+		<bezel name="lamp502" element="led"><bounds x="4" y="4" width="1" height="1" /></bezel>
+		<bezel name="lamp503" element="led"><bounds x="4" y="6" width="1" height="1" /></bezel>
+		<bezel name="lamp504" element="led"><bounds x="4" y="8" width="1" height="1" /></bezel>
+		<bezel name="lamp505" element="led"><bounds x="4" y="10" width="1" height="1" /></bezel>
+		<bezel name="lamp506" element="led"><bounds x="4" y="12" width="1" height="1" /></bezel>
+		<bezel name="lamp507" element="led"><bounds x="4" y="14" width="1" height="1" /></bezel>
+		<bezel name="lamp508" element="led"><bounds x="4" y="16" width="1" height="1" /></bezel>
+		<bezel name="lamp509" element="led"><bounds x="4" y="18" width="1" height="1" /></bezel>
+		<bezel name="lamp510" element="led"><bounds x="4" y="20" width="1" height="1" /></bezel>
+		<bezel name="lamp511" element="led"><bounds x="4" y="22" width="1" height="1" /></bezel>
+		<bezel name="lamp512" element="led"><bounds x="4" y="24" width="1" height="1" /></bezel>
+		<bezel name="lamp513" element="led"><bounds x="4" y="26" width="1" height="1" /></bezel>
+		<bezel name="lamp514" element="led"><bounds x="4" y="28" width="1" height="1" /></bezel>
+		<bezel name="lamp515" element="led"><bounds x="4" y="30" width="1" height="1" /></bezel>
+		<bezel name="lamp516" element="led"><bounds x="4" y="32" width="1" height="1" /></bezel>
+		<bezel name="lamp517" element="led"><bounds x="4" y="34" width="1" height="1" /></bezel>
+
+		<bezel name="lamp400" element="led"><bounds x="6" y="0" width="1" height="1" /></bezel>
+		<bezel name="lamp401" element="led"><bounds x="6" y="2" width="1" height="1" /></bezel>
+		<bezel name="lamp402" element="led"><bounds x="6" y="4" width="1" height="1" /></bezel>
+		<bezel name="lamp403" element="led"><bounds x="6" y="6" width="1" height="1" /></bezel>
+		<bezel name="lamp404" element="led"><bounds x="6" y="8" width="1" height="1" /></bezel>
+		<bezel name="lamp405" element="led"><bounds x="6" y="10" width="1" height="1" /></bezel>
+		<bezel name="lamp406" element="led"><bounds x="6" y="12" width="1" height="1" /></bezel>
+		<bezel name="lamp407" element="led"><bounds x="6" y="14" width="1" height="1" /></bezel>
+		<bezel name="lamp408" element="led"><bounds x="6" y="16" width="1" height="1" /></bezel>
+		<bezel name="lamp409" element="led"><bounds x="6" y="18" width="1" height="1" /></bezel>
+		<bezel name="lamp410" element="led"><bounds x="6" y="20" width="1" height="1" /></bezel>
+		<bezel name="lamp411" element="led"><bounds x="6" y="22" width="1" height="1" /></bezel>
+		<bezel name="lamp412" element="led"><bounds x="6" y="24" width="1" height="1" /></bezel>
+		<bezel name="lamp413" element="led"><bounds x="6" y="26" width="1" height="1" /></bezel>
+		<bezel name="lamp414" element="led"><bounds x="6" y="28" width="1" height="1" /></bezel>
+		<bezel name="lamp415" element="led"><bounds x="6" y="30" width="1" height="1" /></bezel>
+		<bezel name="lamp416" element="led"><bounds x="6" y="32" width="1" height="1" /></bezel>
+		<bezel name="lamp417" element="led"><bounds x="6" y="34" width="1" height="1" /></bezel>
+
+		<bezel name="lamp300" element="led"><bounds x="8" y="0" width="1" height="1" /></bezel>
+		<bezel name="lamp301" element="led"><bounds x="8" y="2" width="1" height="1" /></bezel>
+		<bezel name="lamp302" element="led"><bounds x="8" y="4" width="1" height="1" /></bezel>
+		<bezel name="lamp303" element="led"><bounds x="8" y="6" width="1" height="1" /></bezel>
+		<bezel name="lamp304" element="led"><bounds x="8" y="8" width="1" height="1" /></bezel>
+		<bezel name="lamp305" element="led"><bounds x="8" y="10" width="1" height="1" /></bezel>
+		<bezel name="lamp306" element="led"><bounds x="8" y="12" width="1" height="1" /></bezel>
+		<bezel name="lamp307" element="led"><bounds x="8" y="14" width="1" height="1" /></bezel>
+		<bezel name="lamp308" element="led"><bounds x="8" y="16" width="1" height="1" /></bezel>
+		<bezel name="lamp309" element="led"><bounds x="8" y="18" width="1" height="1" /></bezel>
+		<bezel name="lamp310" element="led"><bounds x="8" y="20" width="1" height="1" /></bezel>
+		<bezel name="lamp311" element="led"><bounds x="8" y="22" width="1" height="1" /></bezel>
+		<bezel name="lamp312" element="led"><bounds x="8" y="24" width="1" height="1" /></bezel>
+		<bezel name="lamp313" element="led"><bounds x="8" y="26" width="1" height="1" /></bezel>
+		<bezel name="lamp314" element="led"><bounds x="8" y="28" width="1" height="1" /></bezel>
+		<bezel name="lamp315" element="led"><bounds x="8" y="30" width="1" height="1" /></bezel>
+		<bezel name="lamp316" element="led"><bounds x="8" y="32" width="1" height="1" /></bezel>
+		<bezel name="lamp317" element="led"><bounds x="8" y="34" width="1" height="1" /></bezel>
+
+		<bezel name="lamp200" element="led"><bounds x="10" y="0" width="1" height="1" /></bezel>
+		<bezel name="lamp201" element="led"><bounds x="10" y="2" width="1" height="1" /></bezel>
+		<bezel name="lamp202" element="led"><bounds x="10" y="4" width="1" height="1" /></bezel>
+		<bezel name="lamp203" element="led"><bounds x="10" y="6" width="1" height="1" /></bezel>
+		<bezel name="lamp204" element="led"><bounds x="10" y="8" width="1" height="1" /></bezel>
+		<bezel name="lamp205" element="led"><bounds x="10" y="10" width="1" height="1" /></bezel>
+		<bezel name="lamp206" element="led"><bounds x="10" y="12" width="1" height="1" /></bezel>
+		<bezel name="lamp207" element="led"><bounds x="10" y="14" width="1" height="1" /></bezel>
+		<bezel name="lamp208" element="led"><bounds x="10" y="16" width="1" height="1" /></bezel>
+		<bezel name="lamp209" element="led"><bounds x="10" y="18" width="1" height="1" /></bezel>
+		<bezel name="lamp210" element="led"><bounds x="10" y="20" width="1" height="1" /></bezel>
+		<bezel name="lamp211" element="led"><bounds x="10" y="22" width="1" height="1" /></bezel>
+		<bezel name="lamp212" element="led"><bounds x="10" y="24" width="1" height="1" /></bezel>
+		<bezel name="lamp213" element="led"><bounds x="10" y="26" width="1" height="1" /></bezel>
+		<bezel name="lamp214" element="led"><bounds x="10" y="28" width="1" height="1" /></bezel>
+		<bezel name="lamp215" element="led"><bounds x="10" y="30" width="1" height="1" /></bezel>
+		<bezel name="lamp216" element="led"><bounds x="10" y="32" width="1" height="1" /></bezel>
+		<bezel name="lamp217" element="led"><bounds x="10" y="34" width="1" height="1" /></bezel>
+
+		<bezel name="lamp100" element="led"><bounds x="12" y="0" width="1" height="1" /></bezel>
+		<bezel name="lamp101" element="led"><bounds x="12" y="2" width="1" height="1" /></bezel>
+		<bezel name="lamp102" element="led"><bounds x="12" y="4" width="1" height="1" /></bezel>
+		<bezel name="lamp103" element="led"><bounds x="12" y="6" width="1" height="1" /></bezel>
+		<bezel name="lamp104" element="led"><bounds x="12" y="8" width="1" height="1" /></bezel>
+		<bezel name="lamp105" element="led"><bounds x="12" y="10" width="1" height="1" /></bezel>
+		<bezel name="lamp106" element="led"><bounds x="12" y="12" width="1" height="1" /></bezel>
+		<bezel name="lamp107" element="led"><bounds x="12" y="14" width="1" height="1" /></bezel>
+		<bezel name="lamp108" element="led"><bounds x="12" y="16" width="1" height="1" /></bezel>
+		<bezel name="lamp109" element="led"><bounds x="12" y="18" width="1" height="1" /></bezel>
+		<bezel name="lamp110" element="led"><bounds x="12" y="20" width="1" height="1" /></bezel>
+		<bezel name="lamp111" element="led"><bounds x="12" y="22" width="1" height="1" /></bezel>
+		<bezel name="lamp112" element="led"><bounds x="12" y="24" width="1" height="1" /></bezel>
+		<bezel name="lamp113" element="led"><bounds x="12" y="26" width="1" height="1" /></bezel>
+		<bezel name="lamp114" element="led"><bounds x="12" y="28" width="1" height="1" /></bezel>
+		<bezel name="lamp115" element="led"><bounds x="12" y="30" width="1" height="1" /></bezel>
+		<bezel name="lamp116" element="led"><bounds x="12" y="32" width="1" height="1" /></bezel>
+		<bezel name="lamp117" element="led"><bounds x="12" y="34" width="1" height="1" /></bezel>
+
+		<bezel name="lamp0" element="led"><bounds x="14" y="0" width="1" height="1" /></bezel>
+		<bezel name="lamp1" element="led"><bounds x="14" y="2" width="1" height="1" /></bezel>
+		<bezel name="lamp2" element="led"><bounds x="14" y="4" width="1" height="1" /></bezel>
+		<bezel name="lamp3" element="led"><bounds x="14" y="6" width="1" height="1" /></bezel>
+		<bezel name="lamp4" element="led"><bounds x="14" y="8" width="1" height="1" /></bezel>
+		<bezel name="lamp5" element="led"><bounds x="14" y="10" width="1" height="1" /></bezel>
+		<bezel name="lamp6" element="led"><bounds x="14" y="12" width="1" height="1" /></bezel>
+		<bezel name="lamp7" element="led"><bounds x="14" y="14" width="1" height="1" /></bezel>
+		<bezel name="lamp8" element="led"><bounds x="14" y="16" width="1" height="1" /></bezel>
+		<bezel name="lamp9" element="led"><bounds x="14" y="18" width="1" height="1" /></bezel>
+		<bezel name="lamp10" element="led"><bounds x="14" y="20" width="1" height="1" /></bezel>
+		<bezel name="lamp11" element="led"><bounds x="14" y="22" width="1" height="1" /></bezel>
+		<bezel name="lamp12" element="led"><bounds x="14" y="24" width="1" height="1" /></bezel>
+		<bezel name="lamp13" element="led"><bounds x="14" y="26" width="1" height="1" /></bezel>
+		<bezel name="lamp14" element="led"><bounds x="14" y="28" width="1" height="1" /></bezel>
+		<bezel name="lamp15" element="led"><bounds x="14" y="30" width="1" height="1" /></bezel>
+		<bezel name="lamp16" element="led"><bounds x="14" y="32" width="1" height="1" /></bezel>
+		<bezel name="lamp17" element="led"><bounds x="14" y="34" width="1" height="1" /></bezel>
 
 
 	</view>
diff --git a/src/mess/layout/tmtennis.lay b/src/mess/layout/tmtennis.lay
index 1c836ddb7f6..fd9c855ab27 100644
--- a/src/mess/layout/tmtennis.lay
+++ b/src/mess/layout/tmtennis.lay
@@ -5,177 +5,177 @@
 
 	<element name="static_black"><rect><color red="0.0" green="0.0" blue="0.0" /></rect></element>
 
-	<element name="green" defstate="0">
-		<disk state="0"><color red="0.0" green="0.1" blue="0.0" /></disk>
-		<disk state="1"><color red="0.2" green="1.0" blue="0.2" /></disk>
+	<element name="led" defstate="0">
+		<disk state="0"><color red="0.05" green="0.15" blue="0.05" /></disk>
+		<disk state="1"><color red="0.3" green="1.0" blue="0.3" /></disk>
 	</element>
 
 
 <!-- build screen -->
 
 	<view name="Test Layout">
-		<bounds left="0" right="100" top="0" bottom="100" />
+		<bounds left="0" right="64" top="0" bottom="64" />
 		<bezel element="static_black">
-			<bounds left="0" right="100" top="0" bottom="100" />
+			<bounds left="0" right="64" top="0" bottom="64" />
 		</bezel>
 
-	<!-- matrix -->
+	<!-- 12*12 matrix -->
 
-		<bezel name="lamp0" element="green"><bounds x="0" y="0" width="1" height="1" /></bezel>
-		<bezel name="lamp1" element="green"><bounds x="0" y="2" width="1" height="1" /></bezel>
-		<bezel name="lamp2" element="green"><bounds x="0" y="4" width="1" height="1" /></bezel>
-		<bezel name="lamp3" element="green"><bounds x="0" y="6" width="1" height="1" /></bezel>
-		<bezel name="lamp4" element="green"><bounds x="0" y="8" width="1" height="1" /></bezel>
-		<bezel name="lamp5" element="green"><bounds x="0" y="10" width="1" height="1" /></bezel>
-		<bezel name="lamp6" element="green"><bounds x="0" y="12" width="1" height="1" /></bezel>
-		<bezel name="lamp7" element="green"><bounds x="0" y="14" width="1" height="1" /></bezel>
-		<bezel name="lamp8" element="green"><bounds x="0" y="16" width="1" height="1" /></bezel>
-		<bezel name="lamp9" element="green"><bounds x="0" y="18" width="1" height="1" /></bezel>
-		<bezel name="lamp10" element="green"><bounds x="0" y="20" width="1" height="1" /></bezel>
-		<bezel name="lamp11" element="green"><bounds x="0" y="22" width="1" height="1" /></bezel>
+		<bezel name="lamp0" element="led"><bounds x="0" y="0" width="1" height="1" /></bezel>
+		<bezel name="lamp1" element="led"><bounds x="0" y="2" width="1" height="1" /></bezel>
+		<bezel name="lamp2" element="led"><bounds x="0" y="4" width="1" height="1" /></bezel>
+		<bezel name="lamp3" element="led"><bounds x="0" y="6" width="1" height="1" /></bezel>
+		<bezel name="lamp4" element="led"><bounds x="0" y="8" width="1" height="1" /></bezel>
+		<bezel name="lamp5" element="led"><bounds x="0" y="10" width="1" height="1" /></bezel>
+		<bezel name="lamp6" element="led"><bounds x="0" y="12" width="1" height="1" /></bezel>
+		<bezel name="lamp7" element="led"><bounds x="0" y="14" width="1" height="1" /></bezel>
+		<bezel name="lamp8" element="led"><bounds x="0" y="16" width="1" height="1" /></bezel>
+		<bezel name="lamp9" element="led"><bounds x="0" y="18" width="1" height="1" /></bezel>
+		<bezel name="lamp10" element="led"><bounds x="0" y="20" width="1" height="1" /></bezel>
+		<bezel name="lamp11" element="led"><bounds x="0" y="22" width="1" height="1" /></bezel>
 
-		<bezel name="lamp100" element="green"><bounds x="2" y="0" width="1" height="1" /></bezel>
-		<bezel name="lamp101" element="green"><bounds x="2" y="2" width="1" height="1" /></bezel>
-		<bezel name="lamp102" element="green"><bounds x="2" y="4" width="1" height="1" /></bezel>
-		<bezel name="lamp103" element="green"><bounds x="2" y="6" width="1" height="1" /></bezel>
-		<bezel name="lamp104" element="green"><bounds x="2" y="8" width="1" height="1" /></bezel>
-		<bezel name="lamp105" element="green"><bounds x="2" y="10" width="1" height="1" /></bezel>
-		<bezel name="lamp106" element="green"><bounds x="2" y="12" width="1" height="1" /></bezel>
-		<bezel name="lamp107" element="green"><bounds x="2" y="14" width="1" height="1" /></bezel>
-		<bezel name="lamp108" element="green"><bounds x="2" y="16" width="1" height="1" /></bezel>
-		<bezel name="lamp109" element="green"><bounds x="2" y="18" width="1" height="1" /></bezel>
-		<bezel name="lamp110" element="green"><bounds x="2" y="20" width="1" height="1" /></bezel>
-		<bezel name="lamp111" element="green"><bounds x="2" y="22" width="1" height="1" /></bezel>
+		<bezel name="lamp100" element="led"><bounds x="2" y="0" width="1" height="1" /></bezel>
+		<bezel name="lamp101" element="led"><bounds x="2" y="2" width="1" height="1" /></bezel>
+		<bezel name="lamp102" element="led"><bounds x="2" y="4" width="1" height="1" /></bezel>
+		<bezel name="lamp103" element="led"><bounds x="2" y="6" width="1" height="1" /></bezel>
+		<bezel name="lamp104" element="led"><bounds x="2" y="8" width="1" height="1" /></bezel>
+		<bezel name="lamp105" element="led"><bounds x="2" y="10" width="1" height="1" /></bezel>
+		<bezel name="lamp106" element="led"><bounds x="2" y="12" width="1" height="1" /></bezel>
+		<bezel name="lamp107" element="led"><bounds x="2" y="14" width="1" height="1" /></bezel>
+		<bezel name="lamp108" element="led"><bounds x="2" y="16" width="1" height="1" /></bezel>
+		<bezel name="lamp109" element="led"><bounds x="2" y="18" width="1" height="1" /></bezel>
+		<bezel name="lamp110" element="led"><bounds x="2" y="20" width="1" height="1" /></bezel>
+		<bezel name="lamp111" element="led"><bounds x="2" y="22" width="1" height="1" /></bezel>
 
-		<bezel name="lamp200" element="green"><bounds x="4" y="0" width="1" height="1" /></bezel>
-		<bezel name="lamp201" element="green"><bounds x="4" y="2" width="1" height="1" /></bezel>
-		<bezel name="lamp202" element="green"><bounds x="4" y="4" width="1" height="1" /></bezel>
-		<bezel name="lamp203" element="green"><bounds x="4" y="6" width="1" height="1" /></bezel>
-		<bezel name="lamp204" element="green"><bounds x="4" y="8" width="1" height="1" /></bezel>
-		<bezel name="lamp205" element="green"><bounds x="4" y="10" width="1" height="1" /></bezel>
-		<bezel name="lamp206" element="green"><bounds x="4" y="12" width="1" height="1" /></bezel>
-		<bezel name="lamp207" element="green"><bounds x="4" y="14" width="1" height="1" /></bezel>
-		<bezel name="lamp208" element="green"><bounds x="4" y="16" width="1" height="1" /></bezel>
-		<bezel name="lamp209" element="green"><bounds x="4" y="18" width="1" height="1" /></bezel>
-		<bezel name="lamp210" element="green"><bounds x="4" y="20" width="1" height="1" /></bezel>
-		<bezel name="lamp211" element="green"><bounds x="4" y="22" width="1" height="1" /></bezel>
+		<bezel name="lamp200" element="led"><bounds x="4" y="0" width="1" height="1" /></bezel>
+		<bezel name="lamp201" element="led"><bounds x="4" y="2" width="1" height="1" /></bezel>
+		<bezel name="lamp202" element="led"><bounds x="4" y="4" width="1" height="1" /></bezel>
+		<bezel name="lamp203" element="led"><bounds x="4" y="6" width="1" height="1" /></bezel>
+		<bezel name="lamp204" element="led"><bounds x="4" y="8" width="1" height="1" /></bezel>
+		<bezel name="lamp205" element="led"><bounds x="4" y="10" width="1" height="1" /></bezel>
+		<bezel name="lamp206" element="led"><bounds x="4" y="12" width="1" height="1" /></bezel>
+		<bezel name="lamp207" element="led"><bounds x="4" y="14" width="1" height="1" /></bezel>
+		<bezel name="lamp208" element="led"><bounds x="4" y="16" width="1" height="1" /></bezel>
+		<bezel name="lamp209" element="led"><bounds x="4" y="18" width="1" height="1" /></bezel>
+		<bezel name="lamp210" element="led"><bounds x="4" y="20" width="1" height="1" /></bezel>
+		<bezel name="lamp211" element="led"><bounds x="4" y="22" width="1" height="1" /></bezel>
 
-		<bezel name="lamp300" element="green"><bounds x="6" y="0" width="1" height="1" /></bezel>
-		<bezel name="lamp301" element="green"><bounds x="6" y="2" width="1" height="1" /></bezel>
-		<bezel name="lamp302" element="green"><bounds x="6" y="4" width="1" height="1" /></bezel>
-		<bezel name="lamp303" element="green"><bounds x="6" y="6" width="1" height="1" /></bezel>
-		<bezel name="lamp304" element="green"><bounds x="6" y="8" width="1" height="1" /></bezel>
-		<bezel name="lamp305" element="green"><bounds x="6" y="10" width="1" height="1" /></bezel>
-		<bezel name="lamp306" element="green"><bounds x="6" y="12" width="1" height="1" /></bezel>
-		<bezel name="lamp307" element="green"><bounds x="6" y="14" width="1" height="1" /></bezel>
-		<bezel name="lamp308" element="green"><bounds x="6" y="16" width="1" height="1" /></bezel>
-		<bezel name="lamp309" element="green"><bounds x="6" y="18" width="1" height="1" /></bezel>
-		<bezel name="lamp310" element="green"><bounds x="6" y="20" width="1" height="1" /></bezel>
-		<bezel name="lamp311" element="green"><bounds x="6" y="22" width="1" height="1" /></bezel>
+		<bezel name="lamp300" element="led"><bounds x="6" y="0" width="1" height="1" /></bezel>
+		<bezel name="lamp301" element="led"><bounds x="6" y="2" width="1" height="1" /></bezel>
+		<bezel name="lamp302" element="led"><bounds x="6" y="4" width="1" height="1" /></bezel>
+		<bezel name="lamp303" element="led"><bounds x="6" y="6" width="1" height="1" /></bezel>
+		<bezel name="lamp304" element="led"><bounds x="6" y="8" width="1" height="1" /></bezel>
+		<bezel name="lamp305" element="led"><bounds x="6" y="10" width="1" height="1" /></bezel>
+		<bezel name="lamp306" element="led"><bounds x="6" y="12" width="1" height="1" /></bezel>
+		<bezel name="lamp307" element="led"><bounds x="6" y="14" width="1" height="1" /></bezel>
+		<bezel name="lamp308" element="led"><bounds x="6" y="16" width="1" height="1" /></bezel>
+		<bezel name="lamp309" element="led"><bounds x="6" y="18" width="1" height="1" /></bezel>
+		<bezel name="lamp310" element="led"><bounds x="6" y="20" width="1" height="1" /></bezel>
+		<bezel name="lamp311" element="led"><bounds x="6" y="22" width="1" height="1" /></bezel>
 
-		<bezel name="lamp400" element="green"><bounds x="8" y="0" width="1" height="1" /></bezel>
-		<bezel name="lamp401" element="green"><bounds x="8" y="2" width="1" height="1" /></bezel>
-		<bezel name="lamp402" element="green"><bounds x="8" y="4" width="1" height="1" /></bezel>
-		<bezel name="lamp403" element="green"><bounds x="8" y="6" width="1" height="1" /></bezel>
-		<bezel name="lamp404" element="green"><bounds x="8" y="8" width="1" height="1" /></bezel>
-		<bezel name="lamp405" element="green"><bounds x="8" y="10" width="1" height="1" /></bezel>
-		<bezel name="lamp406" element="green"><bounds x="8" y="12" width="1" height="1" /></bezel>
-		<bezel name="lamp407" element="green"><bounds x="8" y="14" width="1" height="1" /></bezel>
-		<bezel name="lamp408" element="green"><bounds x="8" y="16" width="1" height="1" /></bezel>
-		<bezel name="lamp409" element="green"><bounds x="8" y="18" width="1" height="1" /></bezel>
-		<bezel name="lamp410" element="green"><bounds x="8" y="20" width="1" height="1" /></bezel>
-		<bezel name="lamp411" element="green"><bounds x="8" y="22" width="1" height="1" /></bezel>
+		<bezel name="lamp400" element="led"><bounds x="8" y="0" width="1" height="1" /></bezel>
+		<bezel name="lamp401" element="led"><bounds x="8" y="2" width="1" height="1" /></bezel>
+		<bezel name="lamp402" element="led"><bounds x="8" y="4" width="1" height="1" /></bezel>
+		<bezel name="lamp403" element="led"><bounds x="8" y="6" width="1" height="1" /></bezel>
+		<bezel name="lamp404" element="led"><bounds x="8" y="8" width="1" height="1" /></bezel>
+		<bezel name="lamp405" element="led"><bounds x="8" y="10" width="1" height="1" /></bezel>
+		<bezel name="lamp406" element="led"><bounds x="8" y="12" width="1" height="1" /></bezel>
+		<bezel name="lamp407" element="led"><bounds x="8" y="14" width="1" height="1" /></bezel>
+		<bezel name="lamp408" element="led"><bounds x="8" y="16" width="1" height="1" /></bezel>
+		<bezel name="lamp409" element="led"><bounds x="8" y="18" width="1" height="1" /></bezel>
+		<bezel name="lamp410" element="led"><bounds x="8" y="20" width="1" height="1" /></bezel>
+		<bezel name="lamp411" element="led"><bounds x="8" y="22" width="1" height="1" /></bezel>
 
-		<bezel name="lamp500" element="green"><bounds x="10" y="0" width="1" height="1" /></bezel>
-		<bezel name="lamp501" element="green"><bounds x="10" y="2" width="1" height="1" /></bezel>
-		<bezel name="lamp502" element="green"><bounds x="10" y="4" width="1" height="1" /></bezel>
-		<bezel name="lamp503" element="green"><bounds x="10" y="6" width="1" height="1" /></bezel>
-		<bezel name="lamp504" element="green"><bounds x="10" y="8" width="1" height="1" /></bezel>
-		<bezel name="lamp505" element="green"><bounds x="10" y="10" width="1" height="1" /></bezel>
-		<bezel name="lamp506" element="green"><bounds x="10" y="12" width="1" height="1" /></bezel>
-		<bezel name="lamp507" element="green"><bounds x="10" y="14" width="1" height="1" /></bezel>
-		<bezel name="lamp508" element="green"><bounds x="10" y="16" width="1" height="1" /></bezel>
-		<bezel name="lamp509" element="green"><bounds x="10" y="18" width="1" height="1" /></bezel>
-		<bezel name="lamp510" element="green"><bounds x="10" y="20" width="1" height="1" /></bezel>
-		<bezel name="lamp511" element="green"><bounds x="10" y="22" width="1" height="1" /></bezel>
+		<bezel name="lamp500" element="led"><bounds x="10" y="0" width="1" height="1" /></bezel>
+		<bezel name="lamp501" element="led"><bounds x="10" y="2" width="1" height="1" /></bezel>
+		<bezel name="lamp502" element="led"><bounds x="10" y="4" width="1" height="1" /></bezel>
+		<bezel name="lamp503" element="led"><bounds x="10" y="6" width="1" height="1" /></bezel>
+		<bezel name="lamp504" element="led"><bounds x="10" y="8" width="1" height="1" /></bezel>
+		<bezel name="lamp505" element="led"><bounds x="10" y="10" width="1" height="1" /></bezel>
+		<bezel name="lamp506" element="led"><bounds x="10" y="12" width="1" height="1" /></bezel>
+		<bezel name="lamp507" element="led"><bounds x="10" y="14" width="1" height="1" /></bezel>
+		<bezel name="lamp508" element="led"><bounds x="10" y="16" width="1" height="1" /></bezel>
+		<bezel name="lamp509" element="led"><bounds x="10" y="18" width="1" height="1" /></bezel>
+		<bezel name="lamp510" element="led"><bounds x="10" y="20" width="1" height="1" /></bezel>
+		<bezel name="lamp511" element="led"><bounds x="10" y="22" width="1" height="1" /></bezel>
 
-		<bezel name="lamp600" element="green"><bounds x="12" y="0" width="1" height="1" /></bezel>
-		<bezel name="lamp601" element="green"><bounds x="12" y="2" width="1" height="1" /></bezel>
-		<bezel name="lamp602" element="green"><bounds x="12" y="4" width="1" height="1" /></bezel>
-		<bezel name="lamp603" element="green"><bounds x="12" y="6" width="1" height="1" /></bezel>
-		<bezel name="lamp604" element="green"><bounds x="12" y="8" width="1" height="1" /></bezel>
-		<bezel name="lamp605" element="green"><bounds x="12" y="10" width="1" height="1" /></bezel>
-		<bezel name="lamp606" element="green"><bounds x="12" y="12" width="1" height="1" /></bezel>
-		<bezel name="lamp607" element="green"><bounds x="12" y="14" width="1" height="1" /></bezel>
-		<bezel name="lamp608" element="green"><bounds x="12" y="16" width="1" height="1" /></bezel>
-		<bezel name="lamp609" element="green"><bounds x="12" y="18" width="1" height="1" /></bezel>
-		<bezel name="lamp610" element="green"><bounds x="12" y="20" width="1" height="1" /></bezel>
-		<bezel name="lamp611" element="green"><bounds x="12" y="22" width="1" height="1" /></bezel>
+		<bezel name="lamp600" element="led"><bounds x="12" y="0" width="1" height="1" /></bezel>
+		<bezel name="lamp601" element="led"><bounds x="12" y="2" width="1" height="1" /></bezel>
+		<bezel name="lamp602" element="led"><bounds x="12" y="4" width="1" height="1" /></bezel>
+		<bezel name="lamp603" element="led"><bounds x="12" y="6" width="1" height="1" /></bezel>
+		<bezel name="lamp604" element="led"><bounds x="12" y="8" width="1" height="1" /></bezel>
+		<bezel name="lamp605" element="led"><bounds x="12" y="10" width="1" height="1" /></bezel>
+		<bezel name="lamp606" element="led"><bounds x="12" y="12" width="1" height="1" /></bezel>
+		<bezel name="lamp607" element="led"><bounds x="12" y="14" width="1" height="1" /></bezel>
+		<bezel name="lamp608" element="led"><bounds x="12" y="16" width="1" height="1" /></bezel>
+		<bezel name="lamp609" element="led"><bounds x="12" y="18" width="1" height="1" /></bezel>
+		<bezel name="lamp610" element="led"><bounds x="12" y="20" width="1" height="1" /></bezel>
+		<bezel name="lamp611" element="led"><bounds x="12" y="22" width="1" height="1" /></bezel>
 
-		<bezel name="lamp700" element="green"><bounds x="14" y="0" width="1" height="1" /></bezel>
-		<bezel name="lamp701" element="green"><bounds x="14" y="2" width="1" height="1" /></bezel>
-		<bezel name="lamp702" element="green"><bounds x="14" y="4" width="1" height="1" /></bezel>
-		<bezel name="lamp703" element="green"><bounds x="14" y="6" width="1" height="1" /></bezel>
-		<bezel name="lamp704" element="green"><bounds x="14" y="8" width="1" height="1" /></bezel>
-		<bezel name="lamp705" element="green"><bounds x="14" y="10" width="1" height="1" /></bezel>
-		<bezel name="lamp706" element="green"><bounds x="14" y="12" width="1" height="1" /></bezel>
-		<bezel name="lamp707" element="green"><bounds x="14" y="14" width="1" height="1" /></bezel>
-		<bezel name="lamp708" element="green"><bounds x="14" y="16" width="1" height="1" /></bezel>
-		<bezel name="lamp709" element="green"><bounds x="14" y="18" width="1" height="1" /></bezel>
-		<bezel name="lamp710" element="green"><bounds x="14" y="20" width="1" height="1" /></bezel>
-		<bezel name="lamp711" element="green"><bounds x="14" y="22" width="1" height="1" /></bezel>
+		<bezel name="lamp700" element="led"><bounds x="14" y="0" width="1" height="1" /></bezel>
+		<bezel name="lamp701" element="led"><bounds x="14" y="2" width="1" height="1" /></bezel>
+		<bezel name="lamp702" element="led"><bounds x="14" y="4" width="1" height="1" /></bezel>
+		<bezel name="lamp703" element="led"><bounds x="14" y="6" width="1" height="1" /></bezel>
+		<bezel name="lamp704" element="led"><bounds x="14" y="8" width="1" height="1" /></bezel>
+		<bezel name="lamp705" element="led"><bounds x="14" y="10" width="1" height="1" /></bezel>
+		<bezel name="lamp706" element="led"><bounds x="14" y="12" width="1" height="1" /></bezel>
+		<bezel name="lamp707" element="led"><bounds x="14" y="14" width="1" height="1" /></bezel>
+		<bezel name="lamp708" element="led"><bounds x="14" y="16" width="1" height="1" /></bezel>
+		<bezel name="lamp709" element="led"><bounds x="14" y="18" width="1" height="1" /></bezel>
+		<bezel name="lamp710" element="led"><bounds x="14" y="20" width="1" height="1" /></bezel>
+		<bezel name="lamp711" element="led"><bounds x="14" y="22" width="1" height="1" /></bezel>
 
-		<bezel name="lamp800" element="green"><bounds x="16" y="0" width="1" height="1" /></bezel>
-		<bezel name="lamp801" element="green"><bounds x="16" y="2" width="1" height="1" /></bezel>
-		<bezel name="lamp802" element="green"><bounds x="16" y="4" width="1" height="1" /></bezel>
-		<bezel name="lamp803" element="green"><bounds x="16" y="6" width="1" height="1" /></bezel>
-		<bezel name="lamp804" element="green"><bounds x="16" y="8" width="1" height="1" /></bezel>
-		<bezel name="lamp805" element="green"><bounds x="16" y="10" width="1" height="1" /></bezel>
-		<bezel name="lamp806" element="green"><bounds x="16" y="12" width="1" height="1" /></bezel>
-		<bezel name="lamp807" element="green"><bounds x="16" y="14" width="1" height="1" /></bezel>
-		<bezel name="lamp808" element="green"><bounds x="16" y="16" width="1" height="1" /></bezel>
-		<bezel name="lamp809" element="green"><bounds x="16" y="18" width="1" height="1" /></bezel>
-		<bezel name="lamp810" element="green"><bounds x="16" y="20" width="1" height="1" /></bezel>
-		<bezel name="lamp811" element="green"><bounds x="16" y="22" width="1" height="1" /></bezel>
+		<bezel name="lamp800" element="led"><bounds x="16" y="0" width="1" height="1" /></bezel>
+		<bezel name="lamp801" element="led"><bounds x="16" y="2" width="1" height="1" /></bezel>
+		<bezel name="lamp802" element="led"><bounds x="16" y="4" width="1" height="1" /></bezel>
+		<bezel name="lamp803" element="led"><bounds x="16" y="6" width="1" height="1" /></bezel>
+		<bezel name="lamp804" element="led"><bounds x="16" y="8" width="1" height="1" /></bezel>
+		<bezel name="lamp805" element="led"><bounds x="16" y="10" width="1" height="1" /></bezel>
+		<bezel name="lamp806" element="led"><bounds x="16" y="12" width="1" height="1" /></bezel>
+		<bezel name="lamp807" element="led"><bounds x="16" y="14" width="1" height="1" /></bezel>
+		<bezel name="lamp808" element="led"><bounds x="16" y="16" width="1" height="1" /></bezel>
+		<bezel name="lamp809" element="led"><bounds x="16" y="18" width="1" height="1" /></bezel>
+		<bezel name="lamp810" element="led"><bounds x="16" y="20" width="1" height="1" /></bezel>
+		<bezel name="lamp811" element="led"><bounds x="16" y="22" width="1" height="1" /></bezel>
 
-		<bezel name="lamp900" element="green"><bounds x="18" y="0" width="1" height="1" /></bezel>
-		<bezel name="lamp901" element="green"><bounds x="18" y="2" width="1" height="1" /></bezel>
-		<bezel name="lamp902" element="green"><bounds x="18" y="4" width="1" height="1" /></bezel>
-		<bezel name="lamp903" element="green"><bounds x="18" y="6" width="1" height="1" /></bezel>
-		<bezel name="lamp904" element="green"><bounds x="18" y="8" width="1" height="1" /></bezel>
-		<bezel name="lamp905" element="green"><bounds x="18" y="10" width="1" height="1" /></bezel>
-		<bezel name="lamp906" element="green"><bounds x="18" y="12" width="1" height="1" /></bezel>
-		<bezel name="lamp907" element="green"><bounds x="18" y="14" width="1" height="1" /></bezel>
-		<bezel name="lamp908" element="green"><bounds x="18" y="16" width="1" height="1" /></bezel>
-		<bezel name="lamp909" element="green"><bounds x="18" y="18" width="1" height="1" /></bezel>
-		<bezel name="lamp910" element="green"><bounds x="18" y="20" width="1" height="1" /></bezel>
-		<bezel name="lamp911" element="green"><bounds x="18" y="22" width="1" height="1" /></bezel>
+		<bezel name="lamp900" element="led"><bounds x="18" y="0" width="1" height="1" /></bezel>
+		<bezel name="lamp901" element="led"><bounds x="18" y="2" width="1" height="1" /></bezel>
+		<bezel name="lamp902" element="led"><bounds x="18" y="4" width="1" height="1" /></bezel>
+		<bezel name="lamp903" element="led"><bounds x="18" y="6" width="1" height="1" /></bezel>
+		<bezel name="lamp904" element="led"><bounds x="18" y="8" width="1" height="1" /></bezel>
+		<bezel name="lamp905" element="led"><bounds x="18" y="10" width="1" height="1" /></bezel>
+		<bezel name="lamp906" element="led"><bounds x="18" y="12" width="1" height="1" /></bezel>
+		<bezel name="lamp907" element="led"><bounds x="18" y="14" width="1" height="1" /></bezel>
+		<bezel name="lamp908" element="led"><bounds x="18" y="16" width="1" height="1" /></bezel>
+		<bezel name="lamp909" element="led"><bounds x="18" y="18" width="1" height="1" /></bezel>
+		<bezel name="lamp910" element="led"><bounds x="18" y="20" width="1" height="1" /></bezel>
+		<bezel name="lamp911" element="led"><bounds x="18" y="22" width="1" height="1" /></bezel>
 
-		<bezel name="lamp1000" element="green"><bounds x="20" y="0" width="1" height="1" /></bezel>
-		<bezel name="lamp1001" element="green"><bounds x="20" y="2" width="1" height="1" /></bezel>
-		<bezel name="lamp1002" element="green"><bounds x="20" y="4" width="1" height="1" /></bezel>
-		<bezel name="lamp1003" element="green"><bounds x="20" y="6" width="1" height="1" /></bezel>
-		<bezel name="lamp1004" element="green"><bounds x="20" y="8" width="1" height="1" /></bezel>
-		<bezel name="lamp1005" element="green"><bounds x="20" y="10" width="1" height="1" /></bezel>
-		<bezel name="lamp1006" element="green"><bounds x="20" y="12" width="1" height="1" /></bezel>
-		<bezel name="lamp1007" element="green"><bounds x="20" y="14" width="1" height="1" /></bezel>
-		<bezel name="lamp1008" element="green"><bounds x="20" y="16" width="1" height="1" /></bezel>
-		<bezel name="lamp1009" element="green"><bounds x="20" y="18" width="1" height="1" /></bezel>
-		<bezel name="lamp1010" element="green"><bounds x="20" y="20" width="1" height="1" /></bezel>
-		<bezel name="lamp1011" element="green"><bounds x="20" y="22" width="1" height="1" /></bezel>
+		<bezel name="lamp1000" element="led"><bounds x="20" y="0" width="1" height="1" /></bezel>
+		<bezel name="lamp1001" element="led"><bounds x="20" y="2" width="1" height="1" /></bezel>
+		<bezel name="lamp1002" element="led"><bounds x="20" y="4" width="1" height="1" /></bezel>
+		<bezel name="lamp1003" element="led"><bounds x="20" y="6" width="1" height="1" /></bezel>
+		<bezel name="lamp1004" element="led"><bounds x="20" y="8" width="1" height="1" /></bezel>
+		<bezel name="lamp1005" element="led"><bounds x="20" y="10" width="1" height="1" /></bezel>
+		<bezel name="lamp1006" element="led"><bounds x="20" y="12" width="1" height="1" /></bezel>
+		<bezel name="lamp1007" element="led"><bounds x="20" y="14" width="1" height="1" /></bezel>
+		<bezel name="lamp1008" element="led"><bounds x="20" y="16" width="1" height="1" /></bezel>
+		<bezel name="lamp1009" element="led"><bounds x="20" y="18" width="1" height="1" /></bezel>
+		<bezel name="lamp1010" element="led"><bounds x="20" y="20" width="1" height="1" /></bezel>
+		<bezel name="lamp1011" element="led"><bounds x="20" y="22" width="1" height="1" /></bezel>
 
-		<bezel name="lamp1100" element="green"><bounds x="22" y="0" width="1" height="1" /></bezel>
-		<bezel name="lamp1101" element="green"><bounds x="22" y="2" width="1" height="1" /></bezel>
-		<bezel name="lamp1102" element="green"><bounds x="22" y="4" width="1" height="1" /></bezel>
-		<bezel name="lamp1103" element="green"><bounds x="22" y="6" width="1" height="1" /></bezel>
-		<bezel name="lamp1104" element="green"><bounds x="22" y="8" width="1" height="1" /></bezel>
-		<bezel name="lamp1105" element="green"><bounds x="22" y="10" width="1" height="1" /></bezel>
-		<bezel name="lamp1106" element="green"><bounds x="22" y="12" width="1" height="1" /></bezel>
-		<bezel name="lamp1107" element="green"><bounds x="22" y="14" width="1" height="1" /></bezel>
-		<bezel name="lamp1108" element="green"><bounds x="22" y="16" width="1" height="1" /></bezel>
-		<bezel name="lamp1109" element="green"><bounds x="22" y="18" width="1" height="1" /></bezel>
-		<bezel name="lamp1110" element="green"><bounds x="22" y="20" width="1" height="1" /></bezel>
-		<bezel name="lamp1111" element="green"><bounds x="22" y="22" width="1" height="1" /></bezel>
+		<bezel name="lamp1100" element="led"><bounds x="22" y="0" width="1" height="1" /></bezel>
+		<bezel name="lamp1101" element="led"><bounds x="22" y="2" width="1" height="1" /></bezel>
+		<bezel name="lamp1102" element="led"><bounds x="22" y="4" width="1" height="1" /></bezel>
+		<bezel name="lamp1103" element="led"><bounds x="22" y="6" width="1" height="1" /></bezel>
+		<bezel name="lamp1104" element="led"><bounds x="22" y="8" width="1" height="1" /></bezel>
+		<bezel name="lamp1105" element="led"><bounds x="22" y="10" width="1" height="1" /></bezel>
+		<bezel name="lamp1106" element="led"><bounds x="22" y="12" width="1" height="1" /></bezel>
+		<bezel name="lamp1107" element="led"><bounds x="22" y="14" width="1" height="1" /></bezel>
+		<bezel name="lamp1108" element="led"><bounds x="22" y="16" width="1" height="1" /></bezel>
+		<bezel name="lamp1109" element="led"><bounds x="22" y="18" width="1" height="1" /></bezel>
+		<bezel name="lamp1110" element="led"><bounds x="22" y="20" width="1" height="1" /></bezel>
+		<bezel name="lamp1111" element="led"><bounds x="22" y="22" width="1" height="1" /></bezel>
 
 
 	</view>
diff --git a/src/mess/layout/wildfire.lay b/src/mess/layout/wildfire.lay
index 8ad3454ce01..51d25ca1fa0 100644
--- a/src/mess/layout/wildfire.lay
+++ b/src/mess/layout/wildfire.lay
@@ -17,15 +17,17 @@
 <!-- build screen -->
 
 	<view name="Test Layout">
-		<bounds left="0" right="100" top="0" bottom="100" />
+		<bounds left="0" right="64" top="0" bottom="64" />
 		<bezel element="static_black">
-			<bounds left="0" right="100" top="0" bottom="100" />
+			<bounds left="0" right="64" top="0" bottom="64" />
 		</bezel>
 
 		<bezel name="digit0" element="digit"><bounds x="0" y="0" width="10" height="15" /></bezel>
 		<bezel name="digit1" element="digit"><bounds x="10" y="0" width="10" height="15" /></bezel>
 		<bezel name="digit2" element="digit"><bounds x="20" y="0" width="10" height="15" /></bezel>
 
+	<!-- 8*13 matrix (first 3 are the 7segs) -->
+
 		<bezel name="lamp0" element="led"><bounds x="0" y="20" width="1" height="1" /></bezel>
 		<bezel name="lamp1" element="led"><bounds x="2" y="20" width="1" height="1" /></bezel>
 		<bezel name="lamp2" element="led"><bounds x="4" y="20" width="1" height="1" /></bezel>
@@ -143,5 +145,6 @@
 		<bezel name="lamp126" element="led"><bounds x="12" y="44" width="1" height="1" /></bezel>
 		<bezel name="lamp127" element="led"><bounds x="14" y="44" width="1" height="1" /></bezel>
 
+
 	</view>
 </mamelayout>