From 32695b60064f3e523850b8d6fcd794a65a0da4df Mon Sep 17 00:00:00 2001
From: hap <happppp@users.noreply.github.com>
Date: Fri, 13 Dec 2019 14:18:30 +0100
Subject: [PATCH] savant: modernize artwork (nw)

---
 src/mame/drivers/novag_savant.cpp |   7 +-
 src/mame/layout/novag_savant.lay  | 218 +++++++++++++++---------------
 2 files changed, 113 insertions(+), 112 deletions(-)

diff --git a/src/mame/drivers/novag_savant.cpp b/src/mame/drivers/novag_savant.cpp
index b701cfd832d..e8dc57d7476 100644
--- a/src/mame/drivers/novag_savant.cpp
+++ b/src/mame/drivers/novag_savant.cpp
@@ -64,9 +64,6 @@ public:
 	// machine drivers
 	void savant(machine_config &config);
 
-	// user-controlled light switch (9 light bulbs behind LCD panel)
-	DECLARE_INPUT_CHANGED_MEMBER(light_switch) { output().set_value("backlight", newval); }
-
 protected:
 	virtual void machine_start() override;
 
@@ -343,8 +340,8 @@ static INPUT_PORTS_START( savant )
 	PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_Y) PORT_NAME("Promote")
 	PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_6) PORT_NAME("Set Up")
 
-	PORT_START("LIGHT")
-	PORT_CONFNAME( 0x01, 0x01, "LCD Light" ) PORT_CHANGED_MEMBER(DEVICE_SELF, savant_state, light_switch, 0)
+	PORT_START("LIGHT") // user-controlled light switch (9 light bulbs behind LCD panel)
+	PORT_CONFNAME( 0x01, 0x01, "LCD Light" )
 	PORT_CONFSETTING(    0x00, DEF_STR( Off ) )
 	PORT_CONFSETTING(    0x01, DEF_STR( On ) )
 INPUT_PORTS_END
diff --git a/src/mame/layout/novag_savant.lay b/src/mame/layout/novag_savant.lay
index 9cec0e30974..e96254302c3 100644
--- a/src/mame/layout/novag_savant.lay
+++ b/src/mame/layout/novag_savant.lay
@@ -7,17 +7,23 @@
 	<element name="gray2"><rect><color red="0.8" green="0.8" blue="0.85" /></rect></element>
 	<element name="black"><rect><color red="0.12" green="0.12" blue="0.13" /></rect></element>
 	<element name="blackb"><rect><color red="0" green="0" blue="0" /></rect></element>
+	<element name="whiteb"><rect><color red="1" green="1" blue="1" /></rect></element>
+
 	<element name="cb_green"><rect><color red="0.3" green="0.8" blue="0.75" /></rect></element>
 	<element name="cb_light" defstate="1">
 		<rect state="0"><color red="0.33" green="0.3" blue="0.15" /></rect>
 		<rect state="1"><color red="1.0" green="0.79" blue="0.38" /></rect>
 	</element>
 
+	<element name="nothing" defstate="0">
+		<text string=" "/>
+	</element>
+
 	<element name="hl" defstate="0">
 		<text string=" "><bounds x="0" y="0" width="1" height="1.0034" /></text>
 		<disk state="1">
 			<bounds x="0.12" y="0.1217" width="0.76" height="0.7634" />
-			<color red="1" green="1" blue="1" />
+			<color red="0" green="0" blue="0" />
 		</disk>
 	</element>
 
@@ -97,26 +103,11 @@
 		<text string="Set Up"><color red="0.01" green="0.01" blue="0.01" /></text>
 	</element>
 
-	<element name="text_b21a">
-		<rect><color red="0.7" green="0.7" blue="0.74" /></rect>
-		<text string="[P]"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_b22a">
-		<rect><color red="0.7" green="0.7" blue="0.74" /></rect>
-		<text string="[R]"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_b23a">
-		<rect><color red="0.7" green="0.7" blue="0.74" /></rect>
-		<text string="[N]"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_b24a">
-		<rect><color red="0.7" green="0.7" blue="0.74" /></rect>
-		<text string="[B]"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_b25a">
-		<rect><color red="0.7" green="0.7" blue="0.74" /></rect>
-		<text string="[Q]"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_b21a"><image file="chess/bp.png"/></element>
+	<element name="text_b22a"><image file="chess/br.png"/></element>
+	<element name="text_b23a"><image file="chess/bn.png"/></element>
+	<element name="text_b24a"><image file="chess/bb.png"/></element>
+	<element name="text_b25a"><image file="chess/bq.png"/></element>
 
 	<element name="text_b21">
 		<rect><color red="0.7" green="0.7" blue="0.74" /></rect>
@@ -218,19 +209,17 @@
 			<param name="y" start="10" increment="23.56" />
 			<repeat count="4">
 				<param name="x" start="14.84" increment="23.48" />
-				<overlay element="cb_green"><bounds x="~x~" y="~y~" width="11.74" height="11.78" /></overlay>
+				<element ref="cb_green" blend="multiply"><bounds x="~x~" y="~y~" width="11.74" height="11.78" /></element>
 			</repeat>
 		</repeat>
 		<repeat count="4">
 			<param name="y" start="21.78" increment="23.56" />
 			<repeat count="4">
 				<param name="x" start="3.1" increment="23.48" />
-				<overlay element="cb_green"><bounds x="~x~" y="~y~" width="11.74" height="11.78" /></overlay>
+				<element ref="cb_green" blend="multiply"><bounds x="~x~" y="~y~" width="11.74" height="11.78" /></element>
 			</repeat>
 		</repeat>
 
-		<overlay name="backlight" element="cb_light"><bounds x="0" y="0" width="101" height="114" /></overlay>
-
 		<!-- sensors -->
 		<repeat count="8">
 			<param name="y" start="10" increment="11.78" />
@@ -238,103 +227,119 @@
 			<repeat count="8">
 				<param name="x" start="3.1" increment="11.74" />
 				<param name="mask" start="0x01" lshift="1" />
-				<bezel element="hl" inputtag="board:RANK.~i~" inputmask="~mask~"><bounds x="~x~" y="~y~" width="11.74" height="11.78" /><color alpha="0.15" /></bezel>
+				<element ref="hl" inputtag="board:RANK.~i~" inputmask="~mask~"><bounds x="~x~" y="~y~" width="11.74" height="11.78" /><color alpha="0.08" /></element>
 			</repeat>
 		</repeat>
 
-		<!-- mask edges -->
-		<bezel element="blackb"><bounds x="0" y="0" width="101" height="2" /></bezel>
-		<bezel element="blackb"><bounds x="0" y="8.2" width="101" height="1" /></bezel>
-		<bezel element="blackb"><bounds x="0" y="104.9" width="101" height="1" /></bezel>
-		<bezel element="blackb"><bounds x="0" y="111.7" width="101" height="2" /></bezel>
+		<!-- backlight -->
+		<element ref="nothing" blend="add" inputtag="LIGHT" inputmask="0x00" inputraw="1"><bounds x="0" y="0" width="101" height="114" /></element>
+		<element ref="cb_light" blend="multiply" inputtag="LIGHT" inputmask="0x01" inputraw="1"><bounds x="0" y="0" width="101" height="114" /></element>
 
-		<bezel element="blackb"><bounds x="0" y="0" width="1.5" height="114" /></bezel>
-		<bezel element="blackb"><bounds x="98.7" y="0" width="2" height="114" /></bezel>
+		<!-- mask edges -->
+		<element ref="blackb"><bounds x="0" y="0" width="101" height="2" /></element>
+		<element ref="blackb"><bounds x="0" y="8.2" width="101" height="1" /></element>
+		<element ref="blackb"><bounds x="0" y="104.9" width="101" height="1" /></element>
+		<element ref="blackb"><bounds x="0" y="111.7" width="101" height="2" /></element>
+
+		<element ref="blackb"><bounds x="0" y="0" width="1.5" height="114" /></element>
+		<element ref="blackb"><bounds x="98.7" y="0" width="2" height="114" /></element>
 	</group>
 
 	<group name="buttons">
 		<bounds x="-1" y="0" width="85" height="49" />
-		<bezel element="gray2"><bounds x="-1" y="2.5" width="85" height="49" /></bezel>
-		<bezel element="gray"><bounds x="-0.5" y="3" width="84" height="48" /></bezel>
+		<element ref="gray2"><bounds x="-1" y="2.5" width="85" height="49" /></element>
+		<element ref="gray"><bounds x="-0.5" y="3" width="84" height="48" /></element>
 
-		<bezel element="black"><bounds x="41.1" y="3.8" width="39.8" height="11.4" /></bezel>
-		<bezel element="gray"><bounds x="41.6" y="4.3" width="38.8" height="10.4" /></bezel>
+		<element ref="black"><bounds x="41.1" y="3.8" width="39.8" height="11.4" /></element>
+		<element ref="gray"><bounds x="41.6" y="4.3" width="38.8" height="10.4" /></element>
 
-		<bezel element="black"><bounds x="2.1" y="25.8" width="78.8" height="22.7" /></bezel>
-		<bezel element="gray"><bounds x="2.6" y="26.3" width="51.65" height="10.45" /></bezel>
-		<bezel element="gray"><bounds x="54.75" y="26.3" width="25.65" height="21.4" /></bezel>
-		<bezel element="black"><bounds x="2.1" y="36.8" width="65.65" height="11.7" /></bezel>
-		<bezel element="gray"><bounds x="2.6" y="37.25" width="64.65" height="10.45" /></bezel>
-		<bezel element="gray"><bounds x="0" y="48.2" width="82" height="1" /></bezel>
+		<element ref="black"><bounds x="2.1" y="25.8" width="78.8" height="22.7" /></element>
+		<element ref="gray"><bounds x="2.6" y="26.3" width="51.65" height="10.45" /></element>
+		<element ref="gray"><bounds x="54.75" y="26.3" width="25.65" height="21.4" /></element>
+		<element ref="black"><bounds x="2.1" y="36.8" width="65.65" height="11.7" /></element>
+		<element ref="gray"><bounds x="2.6" y="37.25" width="64.65" height="10.45" /></element>
+		<element ref="gray"><bounds x="0" y="48.2" width="82" height="1" /></element>
 
 		<!-- button row 1 -->
-		<bezel element="text_b12"><bounds x="15" y="7" width="14" height="2.5" /></bezel>
-		<bezel element="text_b15"><bounds x="54" y="7" width="14" height="2.5" /></bezel>
-		<bezel element="text_b11"><bounds x="3"  y="7" width="12" height="2.5" /></bezel>
-		<bezel element="text_b13"><bounds x="29" y="7" width="12" height="2.5" /></bezel>
-		<bezel element="text_b14"><bounds x="42" y="7" width="12" height="2.5" /></bezel>
-		<bezel element="text_b16"><bounds x="68" y="7" width="12" height="2.5" /></bezel>
-		<bezel element="text_b1x"><bounds x="42" y="4.5" width="12" height="2.5" /></bezel>
+		<element ref="text_b12"><bounds x="15" y="7" width="14" height="2.5" /></element>
+		<element ref="text_b15"><bounds x="54" y="7" width="14" height="2.5" /></element>
+		<element ref="text_b11"><bounds x="3"  y="7" width="12" height="2.5" /></element>
+		<element ref="text_b13"><bounds x="29" y="7" width="12" height="2.5" /></element>
+		<element ref="text_b14"><bounds x="42" y="7" width="12" height="2.5" /></element>
+		<element ref="text_b16"><bounds x="68" y="7" width="12" height="2.5" /></element>
+		<element ref="text_b1x"><bounds x="42" y="4.5" width="12" height="2.5" /></element>
 
-		<bezel element="but" inputtag="IN.2" inputmask="0x08"><bounds x="5"  y="10" width="8" height="4" /></bezel>
-		<bezel element="but" inputtag="IN.1" inputmask="0x08"><bounds x="18" y="10" width="8" height="4" /></bezel>
-		<bezel element="but" inputtag="IN.0" inputmask="0x08"><bounds x="31" y="10" width="8" height="4" /></bezel>
-		<bezel element="but" inputtag="IN.0" inputmask="0x80"><bounds x="44" y="10" width="8" height="4" /></bezel>
-		<bezel element="but" inputtag="IN.1" inputmask="0x80"><bounds x="57" y="10" width="8" height="4" /></bezel>
-		<bezel element="but" inputtag="IN.2" inputmask="0x80"><bounds x="70" y="10" width="8" height="4" /></bezel>
+		<element ref="but" inputtag="IN.2" inputmask="0x08"><bounds x="5"  y="10" width="8" height="4" /></element>
+		<element ref="but" inputtag="IN.1" inputmask="0x08"><bounds x="18" y="10" width="8" height="4" /></element>
+		<element ref="but" inputtag="IN.0" inputmask="0x08"><bounds x="31" y="10" width="8" height="4" /></element>
+		<element ref="but" inputtag="IN.0" inputmask="0x80"><bounds x="44" y="10" width="8" height="4" /></element>
+		<element ref="but" inputtag="IN.1" inputmask="0x80"><bounds x="57" y="10" width="8" height="4" /></element>
+		<element ref="but" inputtag="IN.2" inputmask="0x80"><bounds x="70" y="10" width="8" height="4" /></element>
 
 		<!-- button row 2 -->
-		<bezel element="text_b21a"><bounds x="3"  y="15.5" width="12" height="2.5" /></bezel>
-		<bezel element="text_b22a"><bounds x="16" y="15.5" width="12" height="2.5" /></bezel>
-		<bezel element="text_b23a"><bounds x="29" y="15.5" width="12" height="2.5" /></bezel>
-		<bezel element="text_b24a"><bounds x="42" y="15.5" width="12" height="2.5" /></bezel>
-		<bezel element="text_b25a"><bounds x="55" y="15.5" width="12" height="2.5" /></bezel>
+		<element ref="whiteb"><bounds x="7.65"  y="15.4" width="2.7" height="2.7" /></element>
+		<element ref="whiteb"><bounds x="20.65" y="15.4" width="2.7" height="2.7" /></element>
+		<element ref="whiteb"><bounds x="33.65" y="15.4" width="2.7" height="2.7" /></element>
+		<element ref="whiteb"><bounds x="46.65" y="15.4" width="2.7" height="2.7" /></element>
+		<element ref="whiteb"><bounds x="59.65" y="15.4" width="2.7" height="2.7" /></element>
 
-		<bezel element="text_b21"><bounds x="3"  y="18" width="12" height="2.5" /></bezel>
-		<bezel element="text_b22"><bounds x="16" y="18" width="12" height="2.5" /></bezel>
-		<bezel element="text_b23"><bounds x="29" y="18" width="12" height="2.5" /></bezel>
-		<bezel element="text_b24"><bounds x="42" y="18" width="12" height="2.5" /></bezel>
-		<bezel element="text_b25"><bounds x="55" y="18" width="12" height="2.5" /></bezel>
-		<bezel element="text_b26"><bounds x="68" y="18" width="12" height="2.5" /></bezel>
+		<element ref="text_b21a"><bounds x="7.65"  y="15.4" width="2.7" height="2.7" /></element>
+		<element ref="text_b22a"><bounds x="20.65" y="15.4" width="2.7" height="2.7" /></element>
+		<element ref="text_b23a"><bounds x="33.65" y="15.4" width="2.7" height="2.7" /></element>
+		<element ref="text_b24a"><bounds x="46.65" y="15.4" width="2.7" height="2.7" /></element>
+		<element ref="text_b25a"><bounds x="59.65" y="15.4" width="2.7" height="2.7" /></element>
 
-		<bezel element="but" inputtag="IN.2" inputmask="0x04"><bounds x="5"  y="21" width="8" height="4" /></bezel>
-		<bezel element="but" inputtag="IN.1" inputmask="0x04"><bounds x="18" y="21" width="8" height="4" /></bezel>
-		<bezel element="but" inputtag="IN.0" inputmask="0x04"><bounds x="31" y="21" width="8" height="4" /></bezel>
-		<bezel element="but" inputtag="IN.0" inputmask="0x40"><bounds x="44" y="21" width="8" height="4" /></bezel>
-		<bezel element="but" inputtag="IN.1" inputmask="0x40"><bounds x="57" y="21" width="8" height="4" /></bezel>
-		<bezel element="but" inputtag="IN.2" inputmask="0x40"><bounds x="70" y="21" width="8" height="4" /></bezel>
+		<element ref="gray" blend="multiply"><bounds x="7.65"  y="15.4" width="2.7" height="2.7" /></element>
+		<element ref="gray" blend="multiply"><bounds x="20.65" y="15.4" width="2.7" height="2.7" /></element>
+		<element ref="gray" blend="multiply"><bounds x="33.65" y="15.4" width="2.7" height="2.7" /></element>
+		<element ref="gray" blend="multiply"><bounds x="46.65" y="15.4" width="2.7" height="2.7" /></element>
+		<element ref="gray" blend="multiply"><bounds x="59.65" y="15.4" width="2.7" height="2.7" /></element>
+
+		<element ref="text_b23"><bounds x="28" y="18" width="14" height="2.5" /></element>
+		<element ref="text_b21"><bounds x="3"  y="18" width="12" height="2.5" /></element>
+		<element ref="text_b22"><bounds x="16" y="18" width="12" height="2.5" /></element>
+		<element ref="text_b24"><bounds x="42" y="18" width="12" height="2.5" /></element>
+		<element ref="text_b25"><bounds x="55" y="18" width="12" height="2.5" /></element>
+		<element ref="text_b26"><bounds x="68" y="18" width="12" height="2.5" /></element>
+
+		<element ref="but" inputtag="IN.2" inputmask="0x04"><bounds x="5"  y="21" width="8" height="4" /></element>
+		<element ref="but" inputtag="IN.1" inputmask="0x04"><bounds x="18" y="21" width="8" height="4" /></element>
+		<element ref="but" inputtag="IN.0" inputmask="0x04"><bounds x="31" y="21" width="8" height="4" /></element>
+		<element ref="but" inputtag="IN.0" inputmask="0x40"><bounds x="44" y="21" width="8" height="4" /></element>
+		<element ref="but" inputtag="IN.1" inputmask="0x40"><bounds x="57" y="21" width="8" height="4" /></element>
+		<element ref="but" inputtag="IN.2" inputmask="0x40"><bounds x="70" y="21" width="8" height="4" /></element>
 
 		<!-- button row 3 -->
-		<bezel element="text_b31"><bounds x="3"  y="29" width="12" height="2.5" /></bezel>
-		<bezel element="text_b32"><bounds x="16" y="29" width="12" height="2.5" /></bezel>
-		<bezel element="text_b33"><bounds x="29" y="29" width="12" height="2.5" /></bezel>
-		<bezel element="text_b34"><bounds x="42" y="29" width="12" height="2.5" /></bezel>
-		<bezel element="text_b35"><bounds x="55" y="29" width="12" height="2.5" /></bezel>
-		<bezel element="text_b36"><bounds x="68" y="29" width="12" height="2.5" /></bezel>
-		<bezel element="text_b3x"><bounds x="3"  y="26.5" width="12" height="2.5" /></bezel>
+		<element ref="text_b31"><bounds x="3"  y="29" width="12" height="2.5" /></element>
+		<element ref="text_b32"><bounds x="16" y="29" width="12" height="2.5" /></element>
+		<element ref="text_b33"><bounds x="29" y="29" width="12" height="2.5" /></element>
+		<element ref="text_b34"><bounds x="42" y="29" width="12" height="2.5" /></element>
+		<element ref="text_b35"><bounds x="55" y="29" width="12" height="2.5" /></element>
+		<element ref="text_b36"><bounds x="68" y="29" width="12" height="2.5" /></element>
+		<element ref="text_b3x"><bounds x="3"  y="26.5" width="12" height="2.5" /></element>
 
-		<bezel element="but" inputtag="IN.2" inputmask="0x02"><bounds x="5"  y="32" width="8" height="4" /></bezel>
-		<bezel element="but" inputtag="IN.1" inputmask="0x02"><bounds x="18" y="32" width="8" height="4" /></bezel>
-		<bezel element="but" inputtag="IN.0" inputmask="0x02"><bounds x="31" y="32" width="8" height="4" /></bezel>
-		<bezel element="but" inputtag="IN.0" inputmask="0x20"><bounds x="44" y="32" width="8" height="4" /></bezel>
-		<bezel element="but" inputtag="IN.1" inputmask="0x20"><bounds x="57" y="32" width="8" height="4" /></bezel>
-		<bezel element="but" inputtag="IN.2" inputmask="0x20"><bounds x="70" y="32" width="8" height="4" /></bezel>
+		<element ref="but" inputtag="IN.2" inputmask="0x02"><bounds x="5"  y="32" width="8" height="4" /></element>
+		<element ref="but" inputtag="IN.1" inputmask="0x02"><bounds x="18" y="32" width="8" height="4" /></element>
+		<element ref="but" inputtag="IN.0" inputmask="0x02"><bounds x="31" y="32" width="8" height="4" /></element>
+		<element ref="but" inputtag="IN.0" inputmask="0x20"><bounds x="44" y="32" width="8" height="4" /></element>
+		<element ref="but" inputtag="IN.1" inputmask="0x20"><bounds x="57" y="32" width="8" height="4" /></element>
+		<element ref="but" inputtag="IN.2" inputmask="0x20"><bounds x="70" y="32" width="8" height="4" /></element>
 
 		<!-- button row 4 -->
-		<bezel element="text_b42"><bounds x="15" y="40" width="14" height="2.5" /></bezel>
-		<bezel element="text_b41"><bounds x="3"  y="40" width="12" height="2.5" /></bezel>
-		<bezel element="text_b43"><bounds x="29" y="40" width="12" height="2.5" /></bezel>
-		<bezel element="text_b44"><bounds x="42" y="40" width="12" height="2.5" /></bezel>
-		<bezel element="text_b45"><bounds x="55" y="40" width="12" height="2.5" /></bezel>
-		<bezel element="text_b46"><bounds x="68" y="40" width="12" height="2.5" /></bezel>
-		<bezel element="text_b4x"><bounds x="3"  y="37.5" width="12" height="2.5" /></bezel>
+		<element ref="text_b42"><bounds x="15" y="40" width="14" height="2.5" /></element>
+		<element ref="text_b41"><bounds x="3"  y="40" width="12" height="2.5" /></element>
+		<element ref="text_b43"><bounds x="29" y="40" width="12" height="2.5" /></element>
+		<element ref="text_b44"><bounds x="42" y="40" width="12" height="2.5" /></element>
+		<element ref="text_b45"><bounds x="55" y="40" width="12" height="2.5" /></element>
+		<element ref="text_b46"><bounds x="68" y="40" width="12" height="2.5" /></element>
+		<element ref="text_b4x"><bounds x="3"  y="37.5" width="12" height="2.5" /></element>
 
-		<bezel element="but" inputtag="IN.2" inputmask="0x01"><bounds x="5"  y="43" width="8" height="4" /></bezel>
-		<bezel element="but" inputtag="IN.1" inputmask="0x01"><bounds x="18" y="43" width="8" height="4" /></bezel>
-		<bezel element="but" inputtag="IN.0" inputmask="0x01"><bounds x="31" y="43" width="8" height="4" /></bezel>
-		<bezel element="but" inputtag="IN.0" inputmask="0x10"><bounds x="44" y="43" width="8" height="4" /></bezel>
-		<bezel element="but" inputtag="IN.1" inputmask="0x10"><bounds x="57" y="43" width="8" height="4" /></bezel>
-		<bezel element="but" inputtag="IN.2" inputmask="0x10"><bounds x="70" y="43" width="8" height="4" /></bezel>
+		<element ref="but" inputtag="IN.2" inputmask="0x01"><bounds x="5"  y="43" width="8" height="4" /></element>
+		<element ref="but" inputtag="IN.1" inputmask="0x01"><bounds x="18" y="43" width="8" height="4" /></element>
+		<element ref="but" inputtag="IN.0" inputmask="0x01"><bounds x="31" y="43" width="8" height="4" /></element>
+		<element ref="but" inputtag="IN.0" inputmask="0x10"><bounds x="44" y="43" width="8" height="4" /></element>
+		<element ref="but" inputtag="IN.1" inputmask="0x10"><bounds x="57" y="43" width="8" height="4" /></element>
+		<element ref="but" inputtag="IN.2" inputmask="0x10"><bounds x="70" y="43" width="8" height="4" /></element>
 	</group>
 
 
@@ -348,38 +353,37 @@
 		<repeat count="8">
 			<param name="y" start="14.64" increment="11.78" />
 			<param name="i" start="0" increment="1" />
-			<bezel element="text_v~i~"><bounds x="-2" y="~y~" width="3" height="2.5" /></bezel>
+			<element ref="text_v~i~"><bounds x="-2" y="~y~" width="3" height="2.5" /></element>
 		</repeat>
 		<repeat count="8">
 			<param name="y" start="14.64" increment="11.78" />
 			<param name="i" start="0" increment="1" />
-			<bezel element="text_v~i~"><bounds x="99.4" y="~y~" width="3" height="2.5" /></bezel>
+			<element ref="text_v~i~"><bounds x="99.4" y="~y~" width="3" height="2.5" /></element>
 		</repeat>
 
 		<repeat count="8">
 			<param name="x" start="3.1" increment="11.74" />
 			<param name="i" start="0" increment="1" />
-			<bezel element="text_b~i~"><bounds x="~x~" y="-4" width="11.74" height="2.5" /></bezel>
+			<element ref="text_b~i~"><bounds x="~x~" y="-4" width="11.74" height="2.5" /></element>
 		</repeat>
 		<repeat count="8">
 			<param name="x" start="3.1" increment="11.74" />
 			<param name="i" start="0" increment="1" />
-			<bezel element="text_a~i~"><bounds x="~x~" y="-1.5" width="11.74" height="2.5" /></bezel>
+			<element ref="text_a~i~"><bounds x="~x~" y="-1.5" width="11.74" height="2.5" /></element>
 		</repeat>
 		<repeat count="8">
 			<param name="x" start="3.1" increment="11.74" />
 			<param name="i" start="0" increment="1" />
-			<bezel element="text_a~i~"><bounds x="~x~" y="112.8" width="11.74" height="2.5" /></bezel>
+			<element ref="text_a~i~"><bounds x="~x~" y="112.8" width="11.74" height="2.5" /></element>
 		</repeat>
 		<repeat count="8">
 			<param name="x" start="3.1" increment="11.74" />
 			<param name="i" start="0" increment="1" />
-			<bezel element="text_c~i~"><bounds x="~x~" y="115.3" width="11.74" height="2.5" /></bezel>
+			<element ref="text_c~i~"><bounds x="~x~" y="115.3" width="11.74" height="2.5" /></element>
 		</repeat>
 
-		<bezel element="gray"><bounds x="104" y="-5.5" width="91" height="125" /></bezel>
+		<element ref="gray"><bounds x="104" y="-5.5" width="91" height="125" /></element>
 		<group ref="buttons"><bounds x="107" y="30.5" width="85" height="49" /></group>
-
 	</view>
 
 	<view name="Internal Layout (Screen)">