From 4b1f87ca45d1fae8ace2ba865dcafd4a71e8ddc4 Mon Sep 17 00:00:00 2001
From: hap <happppp@users.noreply.github.com>
Date: Mon, 25 Mar 2019 22:24:57 +0100
Subject: [PATCH] add updated layouts to release branch (nw)

---
 src/mame/layout/ctstein.lay |  49 ++++++++++++++++
 src/mame/layout/matchme.lay | 111 ++++++++++++++++++++++++++++++------
 src/mame/layout/touchme.lay | 109 +++++++++++++++++++++++++----------
 3 files changed, 220 insertions(+), 49 deletions(-)

diff --git a/src/mame/layout/ctstein.lay b/src/mame/layout/ctstein.lay
index d86f5caa719..a38d1f9bcfe 100644
--- a/src/mame/layout/ctstein.lay
+++ b/src/mame/layout/ctstein.lay
@@ -3,6 +3,7 @@
 
 <!-- define elements -->
 
+	<element name="static_black"><rect><color red="0" green="0" blue="0" /></rect></element>
 	<element name="static_white"><rect><color red="0.75" green="0.73" blue="0.7" /></rect></element>
 	<element name="static_white2"><rect><color red="0.6" green="0.59" blue="0.57" /></rect></element>
 
@@ -22,6 +23,43 @@
 		<rect><color red="0.6" green="0.59" blue="0.57" /></rect>
 		<text string="GAME"><color red="0.0" green="0.0" blue="0.0" /></text>
 	</element>
+	<element name="text_dif">
+		<rect><color red="0.6" green="0.59" blue="0.57" /></rect>
+		<text string="DIFFICULTY"><color red="0.0" green="0.0" blue="0.0" /></text>
+	</element>
+	<element name="text_1">
+		<rect><color red="0.6" green="0.59" blue="0.57" /></rect>
+		<text string="1"><color red="0.0" green="0.0" blue="0.0" /></text>
+	</element>
+	<element name="text_2">
+		<rect><color red="0.6" green="0.59" blue="0.57" /></rect>
+		<text string="2"><color red="0.0" green="0.0" blue="0.0" /></text>
+	</element>
+	<element name="text_3">
+		<rect><color red="0.6" green="0.59" blue="0.57" /></rect>
+		<text string="3"><color red="0.0" green="0.0" blue="0.0" /></text>
+	</element>
+	<element name="text_4">
+		<rect><color red="0.6" green="0.59" blue="0.57" /></rect>
+		<text string="4"><color red="0.0" green="0.0" blue="0.0" /></text>
+	</element>
+
+	<element name="switch1" defstate="0">
+		<text string=" "><color red="0" green="0" blue="0" /></text>
+		<disk state="0x0e"><color red="0.4" green="0.4" blue="0.4" /></disk>
+	</element>
+	<element name="switch2" defstate="0">
+		<text string=" "><color red="0" green="0" blue="0" /></text>
+		<disk state="0x0d"><color red="0.4" green="0.4" blue="0.4" /></disk>
+	</element>
+	<element name="switch3" defstate="0">
+		<text string=" "><color red="0" green="0" blue="0" /></text>
+		<disk state="0x0b"><color red="0.4" green="0.4" blue="0.4" /></disk>
+	</element>
+	<element name="switch4" defstate="0">
+		<text string=" "><color red="0" green="0" blue="0" /></text>
+		<disk state="0x07"><color red="0.4" green="0.4" blue="0.4" /></disk>
+	</element>
 
 	<element name="lamp_r" defstate="0">
 		<rect state="0"><color red="0.5" green="0.15" blue="0.1" /></rect>
@@ -95,5 +133,16 @@
 		<bezel element="text_game"><bounds x="25.8" y="18.5" width="3" height="0.75" /></bezel>
 		<bezel element="button_r" inputtag="IN.1" inputmask="0x01"><bounds x="24" y="18" width="2" height="2" /></bezel>
 
+		<bezel element="text_dif"><bounds x="21.2" y="6.6" width="7.6" height="0.75" /></bezel>
+		<bezel element="static_black"><bounds x="23.5" y="7.5" width="3.0" height="0.7" /></bezel>
+		<bezel element="switch1" inputtag="IN.0" inputmask="0x0f" inputraw="1"><bounds x="23.4" y="7.4" width="0.9" height="0.9" /></bezel>
+		<bezel element="switch2" inputtag="IN.0" inputmask="0x0f" inputraw="1"><bounds x="24.166" y="7.4" width="0.9" height="0.9" /></bezel>
+		<bezel element="switch3" inputtag="IN.0" inputmask="0x0f" inputraw="1"><bounds x="24.933" y="7.4" width="0.9" height="0.9" /></bezel>
+		<bezel element="switch4" inputtag="IN.0" inputmask="0x0f" inputraw="1"><bounds x="25.7" y="7.4" width="0.9" height="0.9" /></bezel>
+		<bezel element="text_1"><bounds x="23.4" y="8.3" width="0.9" height="0.75" /></bezel>
+		<bezel element="text_2"><bounds x="24.166" y="8.3" width="0.9" height="0.75" /></bezel>
+		<bezel element="text_3"><bounds x="24.933" y="8.3" width="0.9" height="0.75" /></bezel>
+		<bezel element="text_4"><bounds x="25.7" y="8.3" width="0.9" height="0.75" /></bezel>
+
 	</view>
 </mamelayout>
diff --git a/src/mame/layout/matchme.lay b/src/mame/layout/matchme.lay
index e420abefe7e..b36d624e647 100644
--- a/src/mame/layout/matchme.lay
+++ b/src/mame/layout/matchme.lay
@@ -29,50 +29,103 @@
 		</disk>
 	</element>
 
+	<element name="switch_music" defstate="0">
+		<rect><color red="0.6" green="0.6" blue="0.6" /></rect>
+		<text state="0x01" string="MAN" align="1"><color red="0.02" green="0.02" blue="0.02" /></text>
+		<text state="0x00" string="AUTO" align="1"><color red="0.02" green="0.02" blue="0.02" /></text>
+	</element>
+	<element name="switch_speed" defstate="0">
+		<rect><color red="0.6" green="0.6" blue="0.6" /></rect>
+		<text state="0x00" string="LO" align="1"><color red="0.02" green="0.02" blue="0.02" /></text>
+		<text state="0x01" string="HI" align="1"><color red="0.02" green="0.02" blue="0.02" /></text>
+	</element>
+	<element name="switch_skill" defstate="0">
+		<rect><color red="0.6" green="0.6" blue="0.6" /></rect>
+		<text state="0x01" string="AM" align="1"><color red="0.02" green="0.02" blue="0.02" /></text>
+		<text state="0x00" string="PRO" align="1"><color red="0.02" green="0.02" blue="0.02" /></text>
+	</element>
+	<element name="switch_game" defstate="0">
+		<rect><color red="0.6" green="0.6" blue="0.6" /></rect>
+		<text state="0x07" string="1" align="1"><color red="0.02" green="0.02" blue="0.02" /></text>
+		<text state="0x06" string="2" align="1"><color red="0.02" green="0.02" blue="0.02" /></text>
+		<text state="0x05" string="3" align="1"><color red="0.02" green="0.02" blue="0.02" /></text>
+		<text state="0x03" string="4" align="1"><color red="0.02" green="0.02" blue="0.02" /></text>
+	</element>
+
+	<element name="text_yb">
+		<disk><color red="0.0" green="0.0" blue="0.0" /></disk>
+		<text string="&#x25ba;">
+			<color red="0.8" green="0.77" blue="0.1" />
+		</text>
+	</element>
+	<element name="text_ob">
+		<disk><color red="0.0" green="0.0" blue="0.0" /></disk>
+		<text string="&#x25ba;">
+			<color red="0.8" green="0.5" blue="0.1" />
+		</text>
+	</element>
+
+	<element name="text_music">
+		<rect><color red="0.6" green="0.6" blue="0.6" /></rect>
+		<text string="MUSIC:" align="1"><color red="0.02" green="0.02" blue="0.02" /></text>
+	</element>
+	<element name="text_speed">
+		<rect><color red="0.6" green="0.6" blue="0.6" /></rect>
+		<text string="SPEED:" align="1"><color red="0.02" green="0.02" blue="0.02" /></text>
+	</element>
+	<element name="text_skill">
+		<rect><color red="0.6" green="0.6" blue="0.6" /></rect>
+		<text string="SKILL:" align="1"><color red="0.02" green="0.02" blue="0.02" /></text>
+	</element>
+	<element name="text_game">
+		<rect><color red="0.6" green="0.6" blue="0.6" /></rect>
+		<text string="GAME:" align="1"><color red="0.02" green="0.02" blue="0.02" /></text>
+	</element>
+
 	<element name="text_last">
 		<rect><color red="0.6" green="0.6" blue="0.6" /></rect>
-		<text string="LAST"><color red="0.1" green="0.1" blue="0.1" /></text>
+		<text string="LAST"><color red="0.02" green="0.02" blue="0.02" /></text>
 	</element>
 	<element name="text_start">
 		<rect><color red="0.6" green="0.6" blue="0.6" /></rect>
-		<text string="START"><color red="0.1" green="0.1" blue="0.1" /></text>
+		<text string="START"><color red="0.02" green="0.02" blue="0.02" /></text>
 	</element>
 	<element name="text_long">
 		<rect><color red="0.6" green="0.6" blue="0.6" /></rect>
-		<text string="LONG"><color red="0.1" green="0.1" blue="0.1" /></text>
+		<text string="LONG"><color red="0.02" green="0.02" blue="0.02" /></text>
 	</element>
 
 	<element name="text_1">
 		<disk><color red="0.6" green="0.6" blue="0.6" /></disk>
-		<text string="1"><color red="0.01" green="0.01" blue="0.01" /></text>
+		<text string="1"><color red="0.02" green="0.02" blue="0.02" /></text>
 	</element>
 	<element name="text_2">
 		<disk><color red="0.6" green="0.6" blue="0.6" /></disk>
-		<text string="2"><color red="0.01" green="0.01" blue="0.01" /></text>
+		<text string="2"><color red="0.02" green="0.02" blue="0.02" /></text>
 	</element>
 	<element name="text_3">
 		<disk><color red="0.6" green="0.6" blue="0.6" /></disk>
-		<text string="3"><color red="0.01" green="0.01" blue="0.01" /></text>
+		<text string="3"><color red="0.02" green="0.02" blue="0.02" /></text>
 	</element>
 	<element name="text_4">
 		<disk><color red="0.6" green="0.6" blue="0.6" /></disk>
-		<text string="4"><color red="0.01" green="0.01" blue="0.01" /></text>
+		<text string="4"><color red="0.02" green="0.02" blue="0.02" /></text>
 	</element>
 	<element name="text_5">
 		<disk><color red="0.6" green="0.6" blue="0.6" /></disk>
-		<text string="5"><color red="0.01" green="0.01" blue="0.01" /></text>
+		<text string="5"><color red="0.02" green="0.02" blue="0.02" /></text>
 	</element>
 	<element name="text_6">
 		<disk><color red="0.6" green="0.6" blue="0.6" /></disk>
-		<text string="6"><color red="0.01" green="0.01" blue="0.01" /></text>
+		<text string="6"><color red="0.02" green="0.02" blue="0.02" /></text>
 	</element>
 	<element name="text_7">
 		<disk><color red="0.6" green="0.6" blue="0.6" /></disk>
-		<text string="7"><color red="0.01" green="0.01" blue="0.01" /></text>
+		<text string="7"><color red="0.02" green="0.02" blue="0.02" /></text>
 	</element>
 	<element name="text_8">
 		<disk><color red="0.6" green="0.6" blue="0.6" /></disk>
-		<text string="8"><color red="0.01" green="0.01" blue="0.01" /></text>
+		<text string="8"><color red="0.02" green="0.02" blue="0.02" /></text>
 	</element>
 
 
@@ -94,6 +147,26 @@
 		<bezel element="text_7"><bounds x="12.3369" y="10.8215" width="0.5" height="0.5" /></bezel>
 		<bezel element="text_8"><bounds x="10.8215" y="12.3369" width="0.5" height="0.5" /></bezel>
 
+		<bezel element="text_music"><bounds x="9" y="8.8" width="2" height="0.29" /></bezel>
+		<bezel element="text_speed"><bounds x="9" y="9.2" width="2" height="0.29" /></bezel>
+		<bezel element="text_skill"><bounds x="9" y="9.6" width="2" height="0.29" /></bezel>
+		<bezel element="text_game"><bounds x="9" y="10.0" width="2" height="0.29" /></bezel>
+
+		<bezel element="text_yb"><bounds x="9.825" y="8.77" width="0.35" height="0.35" /></bezel>
+		<bezel element="text_yb"><bounds x="9.825" y="9.17" width="0.35" height="0.35" /></bezel>
+		<bezel element="text_ob"><bounds x="9.825" y="9.57" width="0.35" height="0.35" /></bezel>
+		<bezel element="text_ob"><bounds x="9.825" y="9.97" width="0.35" height="0.35" /></bezel>
+		<bezel element="dummy" inputtag="FAKE" inputmask="0x02" inputraw="1"><bounds x="9.805" y="8.75" width="0.39" height="0.39" /></bezel>
+		<bezel element="dummy" inputtag="IN.4" inputmask="0x01" inputraw="1"><bounds x="9.805" y="9.15" width="0.39" height="0.39" /></bezel>
+		<bezel element="dummy" inputtag="IN.3" inputmask="0x08" inputraw="1"><bounds x="9.805" y="9.55" width="0.39" height="0.39" /></bezel>
+		<bezel element="dummy" inputtag="IN.3" inputmask="0x07" inputraw="1"><bounds x="9.805" y="9.95" width="0.39" height="0.39" /></bezel>
+
+		<bezel element="dummy" inputtag="DUMMY" inputmask="0x01"><bounds x="10.2" y="8.7" width="1.1" height="1.8" /></bezel>
+		<bezel element="switch_music" inputtag="FAKE" inputmask="0x02" inputraw="1"><bounds x="10.25" y="8.8" width="1" height="0.29" /></bezel>
+		<bezel element="switch_speed" inputtag="IN.4" inputmask="0x01" inputraw="1"><bounds x="10.25" y="9.2" width="1" height="0.29" /></bezel>
+		<bezel element="switch_skill" inputtag="IN.3" inputmask="0x08" inputraw="1"><bounds x="10.25" y="9.6" width="1" height="0.29" /></bezel>
+		<bezel element="switch_game" inputtag="IN.3" inputmask="0x07" inputraw="1"><bounds x="10.25" y="10.0" width="1" height="0.29" /></bezel>
+
 		<bezel element="button" inputtag="FAKE" inputmask="0x01"><bounds x="8.0" y="11" width="0.5" height="0.5" /></bezel>
 		<bezel element="button" inputtag="IN.2" inputmask="0x01"><bounds x="9.75" y="11.9" width="0.5" height="0.5" /></bezel>
 		<bezel element="button" inputtag="IN.2" inputmask="0x04"><bounds x="11.5" y="11" width="0.5" height="0.5" /></bezel>
@@ -122,14 +195,14 @@
 		<bezel element="dummy" inputtag="IN.1" inputmask="0x04"><bounds x="13.3694" y="10.6634" width="2.5" height="2.5" /></bezel>
 		<bezel element="dummy" inputtag="IN.1" inputmask="0x08"><bounds x="10.6634" y="13.3694" width="2.5" height="2.5" /></bezel>
 
-		<bezel name="0.0" element="mask"><bounds x="6.8366" y="13.3694" width="2.5" height="2.5" /><color alpha="0.4" /></bezel>
-		<bezel name="0.1" element="mask"><bounds x="4.1306" y="10.6634" width="2.5" height="2.5" /><color alpha="0.4" /></bezel>
-		<bezel name="0.2" element="mask"><bounds x="4.1306" y="6.8366" width="2.5" height="2.5" /><color alpha="0.4" /></bezel>
-		<bezel name="0.3" element="mask"><bounds x="6.8366" y="4.1306" width="2.5" height="2.5" /><color alpha="0.4" /></bezel>
-		<bezel name="0.4" element="mask"><bounds x="10.6634" y="4.1306" width="2.5" height="2.5" /><color alpha="0.4" /></bezel>
-		<bezel name="0.5" element="mask"><bounds x="13.3694" y="6.8366" width="2.5" height="2.5" /><color alpha="0.4" /></bezel>
-		<bezel name="0.6" element="mask"><bounds x="13.3694" y="10.6634" width="2.5" height="2.5" /><color alpha="0.4" /></bezel>
-		<bezel name="0.7" element="mask"><bounds x="10.6634" y="13.3694" width="2.5" height="2.5" /><color alpha="0.4" /></bezel>
+		<bezel name="0.0" element="mask"><bounds x="6.8366" y="13.3694" width="2.5" height="2.5" /><color alpha="0.5" /></bezel>
+		<bezel name="0.1" element="mask"><bounds x="4.1306" y="10.6634" width="2.5" height="2.5" /><color alpha="0.5" /></bezel>
+		<bezel name="0.2" element="mask"><bounds x="4.1306" y="6.8366" width="2.5" height="2.5" /><color alpha="0.5" /></bezel>
+		<bezel name="0.3" element="mask"><bounds x="6.8366" y="4.1306" width="2.5" height="2.5" /><color alpha="0.5" /></bezel>
+		<bezel name="0.4" element="mask"><bounds x="10.6634" y="4.1306" width="2.5" height="2.5" /><color alpha="0.5" /></bezel>
+		<bezel name="0.5" element="mask"><bounds x="13.3694" y="6.8366" width="2.5" height="2.5" /><color alpha="0.5" /></bezel>
+		<bezel name="0.6" element="mask"><bounds x="13.3694" y="10.6634" width="2.5" height="2.5" /><color alpha="0.5" /></bezel>
+		<bezel name="0.7" element="mask"><bounds x="10.6634" y="13.3694" width="2.5" height="2.5" /><color alpha="0.5" /></bezel>
 
 	</view>
 </mamelayout>
diff --git a/src/mame/layout/touchme.lay b/src/mame/layout/touchme.lay
index 00745eaa252..7d514b91729 100644
--- a/src/mame/layout/touchme.lay
+++ b/src/mame/layout/touchme.lay
@@ -34,6 +34,31 @@
 		<rect><color red="0.7" green="0.72" blue="0.75" /></rect>
 		<text string="SKILL"><color red="0.02" green="0.02" blue="0.02" /></text>
 	</element>
+	<element name="text_s1">
+		<rect><color red="0.7" green="0.72" blue="0.75" /></rect>
+		<text string="1"><color red="0.02" green="0.02" blue="0.02" /></text>
+	</element>
+	<element name="text_s2">
+		<rect><color red="0.7" green="0.72" blue="0.75" /></rect>
+		<text string="2"><color red="0.02" green="0.02" blue="0.02" /></text>
+	</element>
+	<element name="text_s3">
+		<rect><color red="0.7" green="0.72" blue="0.75" /></rect>
+		<text string="3"><color red="0.02" green="0.02" blue="0.02" /></text>
+	</element>
+
+	<element name="switch1" defstate="0">
+		<text string=" "><color red="0" green="0" blue="0" /></text>
+		<disk state="0x06"><color red="0.45" green="0.45" blue="0.45" /></disk>
+	</element>
+	<element name="switch2" defstate="0">
+		<text string=" "><color red="0" green="0" blue="0" /></text>
+		<disk state="0x05"><color red="0.45" green="0.45" blue="0.45" /></disk>
+	</element>
+	<element name="switch3" defstate="0">
+		<text string=" "><color red="0" green="0" blue="0" /></text>
+		<disk state="0x03"><color red="0.45" green="0.45" blue="0.45" /></disk>
+	</element>
 
 	<element name="hl" defstate="0">
 		<text string=" "><color red="0.0" green="0.0" blue="0.0" /></text>
@@ -53,14 +78,14 @@
 <!-- build screen -->
 
 	<view name="Internal Layout">
-		<bounds left="1.41" right="10.89" top="5" bottom="19.3" />
+		<bounds left="1.41" right="10.89" top="5" bottom="20" />
 
 		<bezel name="digit0" element="digit"><bounds x="5.15" y="5.6" width="1" height="1.5" /></bezel>
 		<bezel name="digit1" element="digit"><bounds x="6.15" y="5.6" width="1" height="1.5" /></bezel>
 
 	<!-- bezel (also allow clicking it) -->
 
-		<bezel element="static_gray"><bounds x="1.4" y="7.7" width="9.5" height="12" /></bezel>
+		<bezel element="static_gray"><bounds x="1.4" y="7.7" width="9.5" height="12.4" /></bezel>
 		<bezel element="static_black"><bounds x="1.7" y="9.7" width="8.9" height="8.9" /></bezel>
 
 		<bezel element="static_blue"><bounds x="2" y="10" width="4" height="4" /></bezel>
@@ -75,37 +100,45 @@
 
 	<!-- smooth edges -->
 
-		<bezel element="static_gray"><bounds x="1.5" y="9.5" width="1.3" height="1.3" /></bezel>
-		<bezel element="disk_black"><bounds x="1.7" y="9.7" width="2" height="2" /></bezel>
-		<bezel element="disk_blue"><bounds x="2" y="10" width="2" height="2" /></bezel>
-		<bezel element="disk_blue"><bounds x="2.15" y="10" width="2" height="2" /></bezel>
-		<bezel element="disk_blue"><bounds x="2.3" y="10" width="2" height="2" /></bezel>
-		<bezel element="disk_blue"><bounds x="2" y="10.15" width="2" height="2" /></bezel>
-		<bezel element="disk_blue"><bounds x="2" y="10.3" width="2" height="2" /></bezel>
+		<bezel element="static_gray"><bounds x="1.5" y="9.3" width="1.55" height="1.55" /></bezel>
+		<bezel element="disk_black"><bounds x="1.7" y="9.7" width="2.6" height="2.6" /></bezel>
+		<repeat count="10">
+			<param name="x" start="2.0" increment="0.1" />
+			<param name="y" start="10.0" increment="0.1" />
+			<bezel element="disk_blue"><bounds x="2.0" y="~y~" width="2" height="2" /></bezel>
+			<bezel element="disk_blue"><bounds x="~x~" y="10.0" width="2" height="2" /></bezel>
+			<bezel element="disk_blue"><bounds x="~x~" y="~y~" width="2" height="2" /></bezel>
+		</repeat>
 
-		<bezel element="static_gray"><bounds x="9.5" y="9.5" width="1.3" height="1.3" /></bezel>
-		<bezel element="disk_black"><bounds x="8.6" y="9.7" width="2" height="2" /></bezel>
-		<bezel element="disk_yellow"><bounds x="8.3" y="10" width="2" height="2" /></bezel>
-		<bezel element="disk_yellow"><bounds x="8.15" y="10" width="2" height="2" /></bezel>
-		<bezel element="disk_yellow"><bounds x="8.0" y="10" width="2" height="2" /></bezel>
-		<bezel element="disk_yellow"><bounds x="8.3" y="10.15" width="2" height="2" /></bezel>
-		<bezel element="disk_yellow"><bounds x="8.3" y="10.3" width="2" height="2" /></bezel>
+		<bezel element="static_gray"><bounds x="9.25" y="9.3" width="1.55" height="1.55" /></bezel>
+		<bezel element="disk_black"><bounds x="8.0" y="9.7" width="2.6" height="2.6" /></bezel>
+		<repeat count="10">
+			<param name="x" start="8.31" increment="-0.1" />
+			<param name="y" start="10.0" increment="0.1" />
+			<bezel element="disk_yellow"><bounds x="8.31" y="~y~" width="2" height="2" /></bezel>
+			<bezel element="disk_yellow"><bounds x="~x~" y="10.0" width="2" height="2" /></bezel>
+			<bezel element="disk_yellow"><bounds x="~x~" y="~y~" width="2" height="2" /></bezel>
+		</repeat>
 
-		<bezel element="static_gray"><bounds x="1.5" y="17.5" width="1.3" height="1.3" /></bezel>
-		<bezel element="disk_black"><bounds x="1.7" y="16.6" width="2" height="2" /></bezel>
-		<bezel element="disk_red"><bounds x="2" y="16.3" width="2" height="2" /></bezel>
-		<bezel element="disk_red"><bounds x="2.15" y="16.3" width="2" height="2" /></bezel>
-		<bezel element="disk_red"><bounds x="2.3" y="16.3" width="2" height="2" /></bezel>
-		<bezel element="disk_red"><bounds x="2" y="16.15" width="2" height="2" /></bezel>
-		<bezel element="disk_red"><bounds x="2" y="16.0" width="2" height="2" /></bezel>
+		<bezel element="static_gray"><bounds x="1.5" y="17.25" width="1.55" height="1.55" /></bezel>
+		<bezel element="disk_black"><bounds x="1.7" y="16.0" width="2.6" height="2.6" /></bezel>
+		<repeat count="10">
+			<param name="x" start="2.0" increment="0.1" />
+			<param name="y" start="16.31" increment="-0.1" />
+			<bezel element="disk_red"><bounds x="2.0" y="~y~" width="2" height="2" /></bezel>
+			<bezel element="disk_red"><bounds x="~x~" y="16.31" width="2" height="2" /></bezel>
+			<bezel element="disk_red"><bounds x="~x~" y="~y~" width="2" height="2" /></bezel>
+		</repeat>
 
-		<bezel element="static_gray"><bounds x="9.5" y="17.5" width="1.3" height="1.3" /></bezel>
-		<bezel element="disk_black"><bounds x="8.6" y="16.6" width="2" height="2" /></bezel>
-		<bezel element="disk_green"><bounds x="8.3" y="16.3" width="2" height="2" /></bezel>
-		<bezel element="disk_green"><bounds x="8.15" y="16.3" width="2" height="2" /></bezel>
-		<bezel element="disk_green"><bounds x="8.0" y="16.3" width="2" height="2" /></bezel>
-		<bezel element="disk_green"><bounds x="8.3" y="16.15" width="2" height="2" /></bezel>
-		<bezel element="disk_green"><bounds x="8.3" y="16.0" width="2" height="2" /></bezel>
+		<bezel element="static_gray"><bounds x="9.25" y="17.25" width="1.55" height="1.55" /></bezel>
+		<bezel element="disk_black"><bounds x="8.0" y="16.0" width="2.6" height="2.6" /></bezel>
+		<repeat count="10">
+			<param name="x" start="8.31" increment="-0.1" />
+			<param name="y" start="16.31" increment="-0.1" />
+			<bezel element="disk_green"><bounds x="8.31" y="~y~" width="2" height="2" /></bezel>
+			<bezel element="disk_green"><bounds x="~x~" y="16.31" width="2" height="2" /></bezel>
+			<bezel element="disk_green"><bounds x="~x~" y="~y~" width="2" height="2" /></bezel>
+		</repeat>
 
 	<!-- middle buttons, leds -->
 
@@ -151,5 +184,21 @@
 		<bezel element="hl" inputtag="IN.0" inputmask="0x04"><bounds x="6.6" y="8.4" width="1.5" height="1" /><color alpha="0.25" /></bezel>
 		<bezel element="hl" inputtag="IN.0" inputmask="0x08"><bounds x="9.0" y="8.4" width="1.5" height="1" /><color alpha="0.25" /></bezel>
 
+	<!-- bottom switch -->
+
+		<bezel element="text_s1"><bounds x="7.55" y="19.45" width="0.6" height="0.5" /></bezel>
+		<bezel element="text_s2"><bounds x="8.00" y="19.45" width="0.6" height="0.5" /></bezel>
+		<bezel element="text_s3"><bounds x="8.45" y="19.45" width="0.6" height="0.5" /></bezel>
+		<bezel element="disk_black"><bounds x="8.00" y="19.67" width="0.1" height="0.1" /></bezel>
+		<bezel element="disk_black"><bounds x="8.45" y="19.67" width="0.1" height="0.1" /></bezel>
+
+		<bezel element="disk_black"><bounds x="7.6" y="18.9" width="0.5" height="0.5" /></bezel>
+		<bezel element="disk_black"><bounds x="8.5" y="18.9" width="0.5" height="0.5" /></bezel>
+		<bezel element="static_black"><bounds x="7.8" y="18.9" width="1.0" height="0.5" /></bezel>
+
+		<bezel element="switch1" inputtag="IN.2" inputmask="0x07" inputraw="1"><bounds x="7.55" y="18.85" width="0.6" height="0.6" /></bezel>
+		<bezel element="switch2" inputtag="IN.2" inputmask="0x07" inputraw="1"><bounds x="8.00" y="18.85" width="0.6" height="0.6" /></bezel>
+		<bezel element="switch3" inputtag="IN.2" inputmask="0x07" inputraw="1"><bounds x="8.45" y="18.85" width="0.6" height="0.6" /></bezel>
+
 	</view>
 </mamelayout>