diff --git a/src/mame/layout/dendego.lay b/src/mame/layout/dendego.lay
index 75657465869..1e15f88b1a8 100644
--- a/src/mame/layout/dendego.lay
+++ b/src/mame/layout/dendego.lay
@@ -4,61 +4,36 @@
 <!-- define elements -->
 
 	<element name="static_black">
-		<rect>
-			<color red="0.0" green="0.0" blue="0.0" />
-		</rect>
+		<rect><color red="0.0" green="0.0" blue="0.0" /></rect>
 	</element>
 	<element name="static_darkgray">
-		<rect>
-			<color red="0.25" green="0.25" blue="0.25" />
-		</rect>
+		<rect><color red="0.25" green="0.25" blue="0.25" /></rect>
 	</element>
 	<element name="static_lightgray">
-		<rect>
-			<color red="0.6" green="0.6" blue="0.6" />
-		</rect>
+		<rect><color red="0.6" green="0.6" blue="0.6" /></rect>
 	</element>
 	<element name="static_white">
-		<rect>
-			<color red="0.85" green="0.85" blue="0.85" />
-		</rect>
+		<rect><color red="0.85" green="0.85" blue="0.85" /></rect>
 	</element>
 	<element name="static_yellow">
-		<rect>
-			<color red="0.8" green="0.8" blue="0.1" />
-		</rect>
+		<rect><color red="0.8" green="0.8" blue="0.1" /></rect>
 	</element>
 	<element name="static_blue">
-		<rect>
-			<color red="0.2" green="0.5" blue="0.8" />
-		</rect>
+		<rect><color red="0.2" green="0.5" blue="0.8" /></rect>
 	</element>
 
 
 <!-- panel text -->
 
-	<element name="text_power">
-		<text string="PWR">
-			<color red="0.0" green="0.0" blue="0.0" />
-		</text>
-	</element>
-	<element name="text_normal">
-		<text string="OK">
-			<color red="0.0" green="0.0" blue="0.0" />
-		</text>
-	</element>
-	<element name="text_emergency">
-		<text string="EME">
-			<color red="0.0" green="0.0" blue="0.0" />
-		</text>
-	</element>
 	<element name="text_door">
+		<rect><color red="0.6" green="0.6" blue="0.6" /></rect>
 		<text string="doors" align="1">
 			<color red="0.0" green="0.0" blue="0.0" />
 		</text>
 	</element>
 
 	<element name="text_lets">
+		<rect><color red="0.85" green="0.85" blue="0.85" /></rect>
 		<text string="LET'S GO BY TRAIN!" align="1">
 			<color red="0.3" green="0.6" blue="0.9" />
 		</text>
@@ -68,32 +43,38 @@
 <!-- throttle -->
 
 	<element name="text_throttle">
+		<rect><color red="0.25" green="0.25" blue="0.25" /></rect>
 		<text string="THROTTLE:" align="1">
 			<color red="0.8" green="0.8" blue="0.8" />
 		</text>
 	</element>
 	<element name="text_dot">
+		<rect><color red="0.25" green="0.25" blue="0.25" /></rect>
 		<text string="." align="1">
 			<color red="1.0" green="1.0" blue="0.0" />
 		</text>
 	</element>
 	<element name="text_kmh">
+		<rect><color red="0.25" green="0.25" blue="0.25" /></rect>
 		<text string="km/h" align="1">
 			<color red="1.0" green="1.0" blue="0.0" />
 		</text>
 	</element>
 
 	<element name="counter_throttle" defstate="0">
+		<rect><color red="0.25" green="0.25" blue="0.25" /></rect>
 		<simplecounter maxstate="9" digits="1" align="1">
 			<color red="1.0" green="1.0" blue="1.0" />
 		</simplecounter>
 	</element>
 	<element name="counter_speed1" defstate="0">
+		<rect><color red="0.25" green="0.25" blue="0.25" /></rect>
 		<simplecounter maxstate="999" digits="3" align="1">
 			<color red="1.0" green="1.0" blue="0.0" />
 		</simplecounter>
 	</element>
 	<element name="counter_speed2" defstate="0">
+		<rect><color red="0.25" green="0.25" blue="0.25" /></rect>
 		<simplecounter maxstate="9" digits="1" align="1">
 			<color red="1.0" green="1.0" blue="0.0" />
 		</simplecounter>
@@ -103,22 +84,26 @@
 <!-- brake -->
 
 	<element name="text_brake">
+		<rect><color red="0.25" green="0.25" blue="0.25" /></rect>
 		<text string="BRAKE:" align="1">
 			<color red="0.8" green="0.8" blue="0.8" />
 		</text>
 	</element>
 	<element name="text_kpa">
+		<rect><color red="0.25" green="0.25" blue="0.25" /></rect>
 		<text string="kPa" align="1">
 			<color red="1.0" green="1.0" blue="0.0" />
 		</text>
 	</element>
 
 	<element name="counter_brake" defstate="0">
+		<rect><color red="0.25" green="0.25" blue="0.25" /></rect>
 		<simplecounter maxstate="99" digits="2" align="1">
 			<color red="1.0" green="1.0" blue="1.0" />
 		</simplecounter>
 	</element>
 	<element name="counter_pressure" defstate="0">
+		<rect><color red="0.25" green="0.25" blue="0.25" /></rect>
 		<simplecounter maxstate="9999" digits="4" align="1">
 			<color red="1.0" green="1.0" blue="0.0" />
 		</simplecounter>
@@ -128,37 +113,47 @@
 <!-- lamps -->
 
 	<element name="lamp_rect_white" defstate="0">
-		<rect state="1">
-			<color red="1.0" green="1.0" blue="1.0" />
-		</rect>
-		<rect state="0">
-			<color red="0.2" green="0.2" blue="0.2" />
-		</rect>
+		<rect state="1"><color red="1.0" green="1.0" blue="1.0" /></rect>
+		<rect state="0"><color red="0.2" green="0.2" blue="0.2" /></rect>
 	</element>
-	<element name="lamp_rect_red" defstate="0">
-		<rect state="1">
-			<color red="1.0" green="0.1" blue="0.1" />
-		</rect>
-		<rect state="0">
-			<color red="0.3" green="0.0" blue="0.0" />
-		</rect>
+
+	<element name="lamp_power" defstate="0">
+		<rect state="1"><color red="1.0" green="1.0" blue="1.0" /></rect>
+		<rect state="0"><color red="0.2" green="0.2" blue="0.2" /></rect>
+		<text string="PWR">
+			<color red="0.0" green="0.0" blue="0.0" />
+			<bounds x="0" y="0.333" width="1.0" height="0.333" />
+		</text>
 	</element>
+
+	<element name="lamp_normal" defstate="0">
+		<rect state="1"><color red="1.0" green="1.0" blue="1.0" /></rect>
+		<rect state="0"><color red="0.2" green="0.2" blue="0.2" /></rect>
+		<text string="OK">
+			<color red="0.0" green="0.0" blue="0.0" />
+			<bounds x="0" y="0.333" width="1.0" height="0.333" />
+		</text>
+	</element>
+
+	<element name="lamp_emergency" defstate="0">
+		<rect state="1"><color red="1.0" green="0.1" blue="0.1" /></rect>
+		<rect state="0"><color red="0.3" green="0.0" blue="0.0" /></rect>
+		<text string="EME">
+			<color red="0.0" green="0.0" blue="0.0" />
+			<bounds x="0" y="0.333" width="1.0" height="0.333" />
+		</text>
+	</element>
+
 	<element name="lamp_disk_white" defstate="0">
-		<disk state="1">
-			<color red="1.0" green="1.0" blue="1.0" />
-		</disk>
-		<disk state="0">
-			<color red="0.2" green="0.2" blue="0.2" />
-		</disk>
+		<disk state="1"><color red="1.0" green="1.0" blue="1.0" /></disk>
+		<disk state="0"><color red="0.2" green="0.2" blue="0.2" /></disk>
 	</element>
+
 	<element name="lamp_disk_yellow" defstate="0">
-		<disk state="1">
-			<color red="1.0" green="1.0" blue="0.3" />
-		</disk>
-		<disk state="0">
-			<color red="0.2" green="0.2" blue="0.0" />
-		</disk>
+		<disk state="1"><color red="1.0" green="1.0" blue="0.3" /></disk>
+		<disk state="0"><color red="0.2" green="0.2" blue="0.0" /></disk>
 	</element>
+
 	<element name="lamp_disk_red" defstate="0">
 		<disk>
 			<color red="0.0" green="0.0" blue="0.0" />
@@ -202,42 +197,33 @@
 			<bounds left="245" right="380" top="302" bottom="330" />
 		</bezel>
 		<bezel element="static_black">
-			<bounds left="245" right="245.5" top="302" bottom="330" />
+			<bounds left="244.75" right="245.5" top="302" bottom="330" />
 		</bezel>
 		<bezel element="static_black">
-			<bounds left="380" right="380.5" top="302" bottom="330" />
+			<bounds left="379.25" right="380.5" top="302" bottom="330" />
 		</bezel>
 		<bezel element="static_blue">
 			<bounds left="360" right="380" top="302" bottom="330" />
 		</bezel>
 
 		<bezel element="text_lets">
-			<bounds x="264" y="306" width="120" height="10" />
+			<bounds x="264" y="306" width="85" height="10" />
 		</bezel>
 
 
 <!-- lamps -->
 
-		<bezel name="lamp4" element="lamp_rect_white">
+		<bezel name="lamp4" element="lamp_power">
 			<bounds x="8" y="304" width="17" height="24" />
 		</bezel>
-		<bezel element="text_power">
-			<bounds x="8" y="312" width="17" height="9" />
-		</bezel>
 
-		<bezel name="lamp2" element="lamp_rect_white">
+		<bezel name="lamp2" element="lamp_normal">
 			<bounds x="31" y="304" width="17" height="24" />
 		</bezel>
-		<bezel element="text_normal">
-			<bounds x="31" y="312" width="17" height="9" />
-		</bezel>
 
-		<bezel name="lamp3" element="lamp_rect_red">
+		<bezel name="lamp3" element="lamp_emergency">
 			<bounds x="54" y="304" width="17" height="24" />
 		</bezel>
-		<bezel element="text_emergency">
-			<bounds x="54" y="312" width="17" height="9" />
-		</bezel>
 
 		<bezel name="lamp1" element="lamp_disk_white">
 			<bounds x="86" y="314" width="14" height="14" />
@@ -287,14 +273,14 @@
 			<bounds x="180" y="306" width="40" height="10" />
 		</bezel>
 		<bezel name="counter1" element="counter_brake">
-			<bounds x="209" y="306" width="20" height="10" />
+			<bounds x="209" y="306" width="12" height="10" />
 		</bezel>
 
 		<bezel name="counter4" element="counter_pressure">
 			<bounds x="180" y="316" width="30" height="10" />
 		</bezel>
 		<bezel element="text_kpa">
-			<bounds x="201" y="316" width="30" height="10" />
+			<bounds x="201" y="316" width="18" height="10" />
 		</bezel>
 
 	</view>
diff --git a/src/mame/layout/gridiron.lay b/src/mame/layout/gridiron.lay
index fffb0ffa744..2322464107f 100644
--- a/src/mame/layout/gridiron.lay
+++ b/src/mame/layout/gridiron.lay
@@ -2,27 +2,23 @@
 <mamelayout version="2">
 
 	<element name="static_black">
-		<rect>
-			<color red="0.0" green="0.0" blue="0.0" />
-		</rect>
+		<rect><color red="0.0" green="0.0" blue="0.0" /></rect>
 	</element>
 	<element name="static_orange">
-		<rect>
-			<color red="0.85" green="0.30" blue="0.10" />
-		</rect>
+		<rect><color red="0.85" green="0.30" blue="0.10" /></rect>
 	</element>
 	<element name="static_blue">
-		<rect>
-			<color red="0.08" green="0.17" blue="0.52" />
-		</rect>
+		<rect><color red="0.08" green="0.17" blue="0.52" /></rect>
 	</element>
 
 	<element name="text1">
+		<rect><color red="0.08" green="0.17" blue="0.52" /></rect>
 		<text string="FORMATION">
 			<color red="1.0" green="1.0" blue="1.0" />
 		</text>
 	</element>
 	<element name="text2">
+		<rect><color red="0.08" green="0.17" blue="0.52" /></rect>
 		<text string="NUMBER">
 			<color red="1.0" green="1.0" blue="1.0" />
 		</text>
diff --git a/src/mame/layout/imolagp.lay b/src/mame/layout/imolagp.lay
index 48a7869adda..dfe1b69dffa 100644
--- a/src/mame/layout/imolagp.lay
+++ b/src/mame/layout/imolagp.lay
@@ -10,59 +10,39 @@
 	</element>
 
 	<element name="static_black">
-		<rect>
-			<color red="0.0" green="0.0" blue="0.0" />
-		</rect>
+		<rect><color red="0.0" green="0.0" blue="0.0" /></rect>
 	</element>
 
 	<element name="static_gray">
-		<rect>
-			<color red="0.6" green="0.6" blue="0.6" />
-		</rect>
+		<rect><color red="0.6" green="0.6" blue="0.6" /></rect>
 	</element>
 
 	<element name="static_white">
-		<rect>
-			<color red="0.95" green="0.95" blue="0.95" />
-		</rect>
+		<rect><color red="0.95" green="0.95" blue="0.95" /></rect>
 	</element>
 	<element name="disk_white">
-		<disk>
-			<color red="0.95" green="0.95" blue="0.95" />
-		</disk>
+		<disk><color red="0.95" green="0.95" blue="0.95" /></disk>
 	</element>
 
 	<element name="static_red">
-		<rect>
-			<color red="0.8" green="0.1" blue="0.0" />
-		</rect>
+		<rect><color red="0.8" green="0.1" blue="0.0" /></rect>
 	</element>
 	<element name="disk_red">
-		<disk>
-			<color red="0.8" green="0.1" blue="0.0" />
-		</disk>
+		<disk><color red="0.8" green="0.1" blue="0.0" /></disk>
 	</element>
 
 	<element name="static_green">
-		<rect>
-			<color red="0.15" green="0.8" blue="0.1" />
-		</rect>
+		<rect><color red="0.15" green="0.8" blue="0.1" /></rect>
 	</element>
 	<element name="disk_green">
-		<disk>
-			<color red="0.15" green="0.8" blue="0.1" />
-		</disk>
+		<disk><color red="0.15" green="0.8" blue="0.1" /></disk>
 	</element>
 
 	<element name="static_yellow">
-		<rect>
-			<color red="0.8" green="0.75" blue="0.1" />
-		</rect>
+		<rect><color red="0.8" green="0.75" blue="0.1" /></rect>
 	</element>
 	<element name="disk_yellow">
-		<disk>
-			<color red="0.8" green="0.75" blue="0.1" />
-		</disk>
+		<disk><color red="0.8" green="0.75" blue="0.1" /></disk>
 	</element>
 
 
@@ -86,53 +66,63 @@
 	</element>
 
 	<element name="text_s">
+		<rect><color red="0.8" green="0.1" blue="0.0" /></rect>
 		<text string="S">
 			<color red="1.0" green="1.0" blue="1.0" />
 		</text>
 	</element>
 	<element name="text_c">
+		<rect><color red="0.8" green="0.1" blue="0.0" /></rect>
 		<text string="C">
 			<color red="1.0" green="1.0" blue="1.0" />
 		</text>
 	</element>
 	<element name="text_o">
+		<rect><color red="0.8" green="0.1" blue="0.0" /></rect>
 		<text string="O">
 			<color red="1.0" green="1.0" blue="1.0" />
 		</text>
 	</element>
 	<element name="text_r">
+		<rect><color red="0.8" green="0.1" blue="0.0" /></rect>
 		<text string="R">
 			<color red="1.0" green="1.0" blue="1.0" />
 		</text>
 	</element>
 	<element name="text_e">
+		<rect><color red="0.8" green="0.1" blue="0.0" /></rect>
 		<text string="E">
 			<color red="1.0" green="1.0" blue="1.0" />
 		</text>
 	</element>
 
 	<element name="text_i">
+		<rect><color red="0.8" green="0.1" blue="0.0" /></rect>
 		<text string="I">
 			<color red="1.0" green="1.0" blue="1.0" />
 		</text>
 	</element>
 	<element name="text_n">
+		<rect><color red="0.8" green="0.1" blue="0.0" /></rect>
 		<text string="N">
 			<color red="1.0" green="1.0" blue="1.0" />
 		</text>
 	</element>
 	<element name="text_f">
+		<rect><color red="0.8" green="0.1" blue="0.0" /></rect>
 		<text string="F">
 			<color red="1.0" green="1.0" blue="1.0" />
 		</text>
 	</element>
 
 	<element name="text_h">
+		<rect><color red="0.8" green="0.1" blue="0.0" /></rect>
 		<text string="H">
 			<color red="1.0" green="1.0" blue="1.0" />
 		</text>
 	</element>
 	<element name="text_g">
+		<rect><color red="0.8" green="0.1" blue="0.0" /></rect>
 		<text string="G">
 			<color red="1.0" green="1.0" blue="1.0" />
 		</text>
@@ -491,34 +481,34 @@
 			<bounds x="199" y="-115" width="14" height="99" />
 		</bezel>
 		<bezel element="text_h">
-			<bounds x="199" y="-113" width="14" height="9" />
+			<bounds x="200" y="-113" width="12" height="9" />
 		</bezel>
 		<bezel element="text_i">
-			<bounds x="199" y="-103.5" width="14" height="9" />
+			<bounds x="200" y="-103.5" width="12" height="9" />
 		</bezel>
 		<bezel element="text_g">
-			<bounds x="199" y="-94" width="14" height="9" />
+			<bounds x="200" y="-94" width="12" height="9" />
 		</bezel>
 		<bezel element="text_h">
-			<bounds x="199" y="-84.5" width="14" height="9" />
+			<bounds x="200" y="-84.5" width="12" height="9" />
 		</bezel>
 		<bezel element="text_s">
-			<bounds x="199" y="-75" width="14" height="9" />
+			<bounds x="200" y="-75" width="12" height="9" />
 		</bezel>
 		<bezel element="text_c">
-			<bounds x="199" y="-65.5" width="14" height="9" />
+			<bounds x="200" y="-65.5" width="12" height="9" />
 		</bezel>
 		<bezel element="text_o">
-			<bounds x="199" y="-56" width="14" height="9" />
+			<bounds x="200" y="-56" width="12" height="9" />
 		</bezel>
 		<bezel element="text_r">
-			<bounds x="199" y="-46.5" width="14" height="9" />
+			<bounds x="200" y="-46.5" width="12" height="9" />
 		</bezel>
 		<bezel element="text_e">
-			<bounds x="199" y="-37" width="14" height="9" />
+			<bounds x="200" y="-37" width="12" height="9" />
 		</bezel>
 		<bezel element="text_s">
-			<bounds x="199" y="-27.5" width="14" height="9" />
+			<bounds x="200" y="-27.5" width="12" height="9" />
 		</bezel>
 
 
diff --git a/src/mame/layout/stactics.lay b/src/mame/layout/stactics.lay
index 8b2b1b37585..3bd19d6ec0b 100644
--- a/src/mame/layout/stactics.lay
+++ b/src/mame/layout/stactics.lay
@@ -85,6 +85,9 @@
 		</text>
 	</element>
 	<element name="energy_b_text">
+		<rect>
+			<color red="1.0" green="1.0" blue="0" />
+		</rect>
 		<text string="ENERGY BARRIER BUTTON">
 			<color red="0" green="0" blue="0" />
 		</text>
@@ -469,7 +472,7 @@
 					<bounds x="-60" y="604" width="200" height="24" />
 		</bezel>
 		<bezel element="energy_b_text">
-					<bounds x="-60" y="608" width="216" height="15" />
+					<bounds x="-59" y="608" width="198" height="15" />
 		</bezel>
 
 		<bezel name="barrier_lamp" element="yellow_disc">