From 0f237da678a8ecd95be05cbdf536b548eff91655 Mon Sep 17 00:00:00 2001
From: hap <happppp@users.noreply.github.com>
Date: Fri, 8 Dec 2023 22:25:40 +0100
Subject: misc artwork: remove obsolete text bg rect

---
 src/emu/layout/smartboard.lay           |  70 ++---
 src/mame/chess/cking_master.cpp         |   4 +-
 src/mame/handheld/hh_tms1k.cpp          |   2 +-
 src/mame/layout/aci_borisdpl.lay        |  85 ++----
 src/mame/layout/aci_prodigy.lay         | 245 ++++-------------
 src/mame/layout/amaztron.lay            | 131 ++--------
 src/mame/layout/arcmania.lay            | 105 +++-----
 src/mame/layout/arrball.lay             |  29 +-
 src/mame/layout/autorace.lay            |   1 -
 src/mame/layout/ave_arb.lay             | 120 ++-------
 src/mame/layout/bship.lay               |   5 +-
 src/mame/layout/bshipg.lay              |  11 +-
 src/mame/layout/cc40.lay                |  22 +-
 src/mame/layout/cgang.lay               |  38 +--
 src/mame/layout/chessmate.lay           | 249 ++++--------------
 src/mame/layout/chessmst.lay            | 142 +++++-----
 src/mame/layout/chessmstdm.lay          | 110 ++++----
 src/mame/layout/ck_master.lay           | 450 --------------------------------
 src/mame/layout/cking_master.lay        | 409 +++++++++++++++++++++++++++++
 src/mame/layout/cmpchess.lay            | 165 +++---------
 src/mame/layout/cnfball.lay             |  30 +--
 src/mame/layout/cnsector.lay            | 164 +++---------
 src/mame/layout/comp4.lay               | 106 ++------
 src/mame/layout/comparc.lay             |  25 +-
 src/mame/layout/comparca.lay            |  25 +-
 src/mame/layout/conchess.lay            |  47 +---
 src/mame/layout/conic_cchess.lay        |  91 ++-----
 src/mame/layout/conic_cchess2.lay       | 120 ++-------
 src/mame/layout/cqback.lay              |  30 +--
 src/mame/layout/ctntune.lay             |  92 ++-----
 src/mame/layout/ctstein.lay             |  45 +---
 src/mame/layout/cxg_ch2001.lay          | 126 ++-------
 src/mame/layout/cxg_commander.lay       | 120 ++-------
 src/mame/layout/cxg_dominator.lay       | 204 ++++-----------
 src/mame/layout/cxg_enterprise.lay      | 204 ++++-----------
 src/mame/layout/cxg_galaxy.lay          | 204 ++++-----------
 src/mame/layout/cxg_scptchess_v1.lay    |  38 +--
 src/mame/layout/cxg_scptchess_v2.lay    |  38 +--
 src/mame/layout/cxg_senterprise.lay     | 204 ++++-----------
 src/mame/layout/cxg_sphinx40.lay        | 120 ++-------
 src/mame/layout/debutm.lay              | 239 ++++-------------
 src/mame/layout/ebball.lay              |  41 +--
 src/mame/layout/ebball2.lay             |  47 +---
 src/mame/layout/ebball3.lay             |  25 +-
 src/mame/layout/efball.lay              |  30 +--
 src/mame/layout/elecdet.lay             | 228 ++++------------
 src/mame/layout/f2pbball.lay            |  82 ++----
 src/mame/layout/fidel_acr.lay           | 114 +++-----
 src/mame/layout/fidel_as12.lay          | 120 ++-------
 src/mame/layout/fidel_bcc.lay           | 120 +++------
 src/mame/layout/fidel_bkc.lay           | 120 +++------
 src/mame/layout/fidel_brc.lay           | 166 +++---------
 src/mame/layout/fidel_bridgeb.lay       |  68 ++---
 src/mame/layout/fidel_bv3.lay           | 166 +++---------
 src/mame/layout/fidel_cc1.lay           |  92 ++-----
 src/mame/layout/fidel_cc10.lay          | 120 +++------
 src/mame/layout/fidel_cc10c.lay         | 102 ++------
 src/mame/layout/fidel_cc3.lay           |  92 ++-----
 src/mame/layout/fidel_chesster.lay      | 204 ++++-----------
 src/mame/layout/fidel_cphantom.lay      | 233 ++++-------------
 src/mame/layout/fidel_cr.lay            | 114 +++-----
 src/mame/layout/fidel_csc.lay           | 157 +++--------
 src/mame/layout/fidel_des.lay           | 251 +++++-------------
 src/mame/layout/fidel_desdis.lay        | 204 ++++-----------
 src/mame/layout/fidel_desdis_68kg.lay   | 204 ++++-----------
 src/mame/layout/fidel_desdis_68kr.lay   | 204 ++++-----------
 src/mame/layout/fidel_dsc.lay           | 325 +++++------------------
 src/mame/layout/fidel_eag.lay           | 120 ++-------
 src/mame/layout/fidel_eag_68k.lay       | 120 ++-------
 src/mame/layout/fidel_eas.lay           | 120 ++-------
 src/mame/layout/fidel_eldorado.lay      | 174 ++++--------
 src/mame/layout/fidel_ex.lay            | 241 ++++-------------
 src/mame/layout/fidel_ex_68k.lay        | 236 ++++-------------
 src/mame/layout/fidel_exb.lay           | 236 ++++-------------
 src/mame/layout/fidel_exd.lay           | 236 ++++-------------
 src/mame/layout/fidel_exv.lay           | 236 ++++-------------
 src/mame/layout/fidel_gambit.lay        | 204 ++++-----------
 src/mame/layout/fidel_gin.lay           | 166 +++---------
 src/mame/layout/fidel_msc_v1.lay        | 165 +++---------
 src/mame/layout/fidel_msc_v2.lay        | 165 +++---------
 src/mame/layout/fidel_pc.lay            | 120 ++-------
 src/mame/layout/fidel_phantom.lay       | 233 ++++-------------
 src/mame/layout/fidel_playmatic.lay     | 120 ++-------
 src/mame/layout/fidel_rsc.lay           | 180 +++----------
 src/mame/layout/fidel_sc12.lay          | 287 +++++---------------
 src/mame/layout/fidel_sc6.lay           | 162 +++---------
 src/mame/layout/fidel_sc8.lay           | 132 ++--------
 src/mame/layout/fidel_sc9.lay           | 162 +++---------
 src/mame/layout/fidel_su9.lay           | 187 +++----------
 src/mame/layout/fidel_vcc.lay           | 109 +++-----
 src/mame/layout/fidel_vsc.lay           | 157 +++--------
 src/mame/layout/fingbowl.lay            | 112 +++-----
 src/mame/layout/ftri1.lay               |  44 +---
 src/mame/layout/gammonm2.lay            | 117 ++-------
 src/mame/layout/h2hbaseb.lay            |  75 ++----
 src/mame/layout/h2hfootb.lay            |  37 +--
 src/mame/layout/horseran.lay            |  24 --
 src/mame/layout/im01.lay                | 154 +++--------
 src/mame/layout/im05.lay                | 159 +++--------
 src/mame/layout/lchicken.lay            |   6 +-
 src/mame/layout/leboom.lay              |  43 +--
 src/mame/layout/lightfgt.lay            |  49 +---
 src/mame/layout/lostreas.lay            | 259 +++++-------------
 src/mame/layout/matchme.lay             |  85 ++----
 src/mame/layout/matchnum.lay            |  29 +-
 src/mame/layout/mbaseb.lay              |  30 +--
 src/mame/layout/mbaskb.lay              |  10 +-
 src/mame/layout/mbdtower.lay            | 125 +++------
 src/mame/layout/mcompgin.lay            |   3 +-
 src/mame/layout/mdndclab.lay            | 117 ++-------
 src/mame/layout/melodym.lay             | 160 +++---------
 src/mame/layout/mephisto_1.lay          |  15 +-
 src/mame/layout/mephisto_3.lay          | 135 ++--------
 src/mame/layout/mephisto_academy.lay    |  92 +++----
 src/mame/layout/mephisto_alm16.lay      |  82 +++---
 src/mame/layout/mephisto_alm32.lay      |  82 +++---
 src/mame/layout/mephisto_amsterdam.lay  | 128 ++++-----
 src/mame/layout/mephisto_berlin.lay     |  38 +--
 src/mame/layout/mephisto_bup.lay        | 102 +++-----
 src/mame/layout/mephisto_esb2.lay       | 135 ++--------
 src/mame/layout/mephisto_europa.lay     | 156 ++++-------
 src/mame/layout/mephisto_gen32.lay      |  82 +++---
 src/mame/layout/mephisto_glasgow.lay    | 128 ++++-----
 src/mame/layout/mephisto_junior.lay     |  15 +-
 src/mame/layout/mephisto_milano.lay     |  38 +--
 src/mame/layout/mephisto_mirage.lay     |  74 ++----
 src/mame/layout/mephisto_mm1.lay        | 180 ++++---------
 src/mame/layout/mephisto_mm2.lay        | 112 ++++----
 src/mame/layout/mephisto_mm5.lay        | 112 ++++----
 src/mame/layout/mephisto_modena.lay     |  38 +--
 src/mame/layout/mephisto_modular_tm.lay |  82 +++---
 src/mame/layout/mephisto_mondial.lay    | 112 ++++----
 src/mame/layout/mephisto_mondial2.lay   | 112 ++++----
 src/mame/layout/mephisto_mondial68k.lay |  77 ++----
 src/mame/layout/mephisto_montec.lay     |  72 ++---
 src/mame/layout/mephisto_montreal.lay   | 126 ++++-----
 src/mame/layout/mephisto_montreux.lay   |  43 +--
 src/mame/layout/mephisto_polgar.lay     |  71 ++---
 src/mame/layout/mephisto_risc.lay       |  71 ++---
 src/mame/layout/mephisto_roma2.lay      | 128 ++++-----
 src/mame/layout/mephisto_smondial.lay   | 101 +++----
 src/mame/layout/mephisto_smondial2.lay  | 129 ++++-----
 src/mame/layout/merlin.lay              |  19 +-
 src/mame/layout/mfootb.lay              |  30 +--
 src/mame/layout/mfootb2.lay             |  30 +--
 src/mame/layout/mhockey.lay             |  15 +-
 src/mame/layout/mhockeya.lay            |  10 +-
 src/mame/layout/mmarvin.lay             |  22 +-
 src/mame/layout/mmerlin.lay             |  20 +-
 src/mame/layout/monkeysee.lay           |  30 +--
 src/mame/layout/msoccer.lay             |  10 +-
 src/mame/layout/novag_cexpert.lay       |  38 +--
 src/mame/layout/novag_cforte.lay        |  78 ++----
 src/mame/layout/novag_const.lay         | 115 ++------
 src/mame/layout/novag_constjr.lay       |  78 ++----
 src/mame/layout/novag_constq.lay        |  38 +--
 src/mame/layout/novag_diablo68k.lay     |  38 +--
 src/mame/layout/novag_micro.lay         |  78 ++----
 src/mame/layout/novag_micro2.lay        |  68 ++---
 src/mame/layout/novag_mk1.lay           |  50 +---
 src/mame/layout/novag_mk2.lay           |  82 ++----
 src/mame/layout/novag_mk2a.lay          |  87 ++----
 src/mame/layout/novag_robotadv.lay      | 228 +++++-----------
 src/mame/layout/novag_savant.lay        | 141 +++-------
 src/mame/layout/novag_scorpio68k.lay    |  38 +--
 src/mame/layout/novag_sexpert.lay       |  38 +--
 src/mame/layout/novag_sforte.lay        |  48 +---
 src/mame/layout/novag_snova.lay         |  38 +--
 src/mame/layout/novag_ssensor4.lay      |  38 +--
 src/mame/layout/novag_supercon.lay      |  38 +--
 src/mame/layout/novag_supremo.lay       |  38 +--
 src/mame/layout/omar.lay                | 117 ++-------
 src/mame/layout/pylo.lay                |  15 +-
 src/mame/layout/regence.lay             | 120 ++-------
 src/mame/layout/rockpin.lay             |  31 +--
 src/mame/layout/saitek_chesstrvi.lay    |   1 -
 src/mame/layout/saitek_companion.lay    | 224 ++++------------
 src/mame/layout/saitek_companion2.lay   | 214 ++++-----------
 src/mame/layout/saitek_corona.lay       | 202 +++-----------
 src/mame/layout/saitek_cp2000.lay       | 381 +++++++--------------------
 src/mame/layout/saitek_delta1.lay       |  85 ++----
 src/mame/layout/saitek_expchess.lay     | 120 ++-------
 src/mame/layout/saitek_galileo.lay      | 120 ++-------
 src/mame/layout/saitek_leonardo.lay     | 120 ++-------
 src/mame/layout/saitek_mark6.lay        |  38 +--
 src/mame/layout/saitek_minichess.lay    |   5 -
 src/mame/layout/saitek_prschess.lay     |  38 +--
 src/mame/layout/saitek_renaissance.lay  | 120 ++-------
 src/mame/layout/saitek_risc2500.lay     |  97 +++----
 src/mame/layout/saitek_schess.lay       |  39 +--
 src/mame/layout/saitek_simultano.lay    |  38 +--
 src/mame/layout/saitek_sstar28k.lay     |  53 +---
 src/mame/layout/saitek_ssystem3.lay     | 109 ++------
 src/mame/layout/saitek_stratos.lay      | 197 +++-----------
 src/mame/layout/saitek_tking.lay        | 182 ++++---------
 src/mame/layout/saitek_tstar432.lay     |  38 +--
 src/mame/layout/sc2.lay                 | 117 ++-------
 src/mame/layout/simon.lay               | 220 ++++------------
 src/mame/layout/ssimon.lay              |  71 ++---
 src/mame/layout/starwlb.lay             |  11 +-
 src/mame/layout/stopthief.lay           |  48 +---
 src/mame/layout/strobe.lay              |   5 +-
 src/mame/layout/subwars.lay             |  21 +-
 src/mame/layout/tactix.lay              |  53 ++--
 src/mame/layout/tama.lay                |  18 +-
 src/mame/layout/tascr30.lay             |  85 +++---
 src/mame/layout/tcfball.lay             |  30 +--
 src/mame/layout/tcfballa.lay            |  30 +--
 src/mame/layout/tchess.lay              |  40 +--
 src/mame/layout/ti74.lay                |  22 +-
 src/mame/layout/ti95.lay                |  49 +---
 src/mame/layout/tmbaskb.lay             |  12 +-
 src/mame/layout/tmvolleyb.lay           |  19 +-
 src/mame/layout/tntell.lay              |  10 +-
 src/mame/layout/touchme.lay             |  50 +---
 src/mame/layout/ttfball.lay             |  30 +--
 src/mame/layout/us2pfball.lay           |  67 +----
 src/mame/layout/yeno_301xl.lay          | 114 +++-----
 src/mame/layout/yeno_532xl.lay          | 253 ++++--------------
 src/mame/layout/zodiac.lay              |   6 +-
 src/mame/novag/constjr.cpp              |  16 +-
 221 files changed, 5853 insertions(+), 16897 deletions(-)
 delete mode 100644 src/mame/layout/ck_master.lay
 create mode 100644 src/mame/layout/cking_master.lay

diff --git a/src/emu/layout/smartboard.lay b/src/emu/layout/smartboard.lay
index 023d13962fe..90cc543fad0 100644
--- a/src/emu/layout/smartboard.lay
+++ b/src/emu/layout/smartboard.lay
@@ -84,22 +84,22 @@ license:CC0-1.0
 		<image file="chess/bp.svg" state="64"><color alpha="0.5" /></image>
 	</element>
 
-	<element name="text_1">     <rect><color red="0.56" green="0.33" blue="0.12" /></rect>    <text string="1">         <color red="1" green="1" blue="1" /></text> </element>
-	<element name="text_2">     <rect><color red="0.56" green="0.33" blue="0.12" /></rect>    <text string="2">         <color red="1" green="1" blue="1" /></text> </element>
-	<element name="text_3">     <rect><color red="0.56" green="0.33" blue="0.12" /></rect>    <text string="3">         <color red="1" green="1" blue="1" /></text> </element>
-	<element name="text_4">     <rect><color red="0.56" green="0.33" blue="0.12" /></rect>    <text string="4">         <color red="1" green="1" blue="1" /></text> </element>
-	<element name="text_5">     <rect><color red="0.56" green="0.33" blue="0.12" /></rect>    <text string="5">         <color red="1" green="1" blue="1" /></text> </element>
-	<element name="text_6">     <rect><color red="0.56" green="0.33" blue="0.12" /></rect>    <text string="6">         <color red="1" green="1" blue="1" /></text> </element>
-	<element name="text_7">     <rect><color red="0.56" green="0.33" blue="0.12" /></rect>    <text string="7">         <color red="1" green="1" blue="1" /></text> </element>
-	<element name="text_8">     <rect><color red="0.56" green="0.33" blue="0.12" /></rect>    <text string="8">         <color red="1" green="1" blue="1" /></text> </element>
-	<element name="text_a">     <rect><color red="0.56" green="0.33" blue="0.12" /></rect>    <text string="A">         <color red="1" green="1" blue="1" /></text> </element>
-	<element name="text_b">     <rect><color red="0.56" green="0.33" blue="0.12" /></rect>    <text string="B">         <color red="1" green="1" blue="1" /></text> </element>
-	<element name="text_c">     <rect><color red="0.56" green="0.33" blue="0.12" /></rect>    <text string="C">         <color red="1" green="1" blue="1" /></text> </element>
-	<element name="text_d">     <rect><color red="0.56" green="0.33" blue="0.12" /></rect>    <text string="D">         <color red="1" green="1" blue="1" /></text> </element>
-	<element name="text_e">     <rect><color red="0.56" green="0.33" blue="0.12" /></rect>    <text string="E">         <color red="1" green="1" blue="1" /></text> </element>
-	<element name="text_f">     <rect><color red="0.56" green="0.33" blue="0.12" /></rect>    <text string="F">         <color red="1" green="1" blue="1" /></text> </element>
-	<element name="text_g">     <rect><color red="0.56" green="0.33" blue="0.12" /></rect>    <text string="G">         <color red="1" green="1" blue="1" /></text> </element>
-	<element name="text_h">     <rect><color red="0.56" green="0.33" blue="0.12" /></rect>    <text string="H">         <color red="1" green="1" blue="1" /></text> </element>
+	<element name="text_1"> <text string="1"> <color red="1" green="1" blue="1" /></text> </element>
+	<element name="text_2"> <text string="2"> <color red="1" green="1" blue="1" /></text> </element>
+	<element name="text_3"> <text string="3"> <color red="1" green="1" blue="1" /></text> </element>
+	<element name="text_4"> <text string="4"> <color red="1" green="1" blue="1" /></text> </element>
+	<element name="text_5"> <text string="5"> <color red="1" green="1" blue="1" /></text> </element>
+	<element name="text_6"> <text string="6"> <color red="1" green="1" blue="1" /></text> </element>
+	<element name="text_7"> <text string="7"> <color red="1" green="1" blue="1" /></text> </element>
+	<element name="text_8"> <text string="8"> <color red="1" green="1" blue="1" /></text> </element>
+	<element name="text_a"> <text string="A"> <color red="1" green="1" blue="1" /></text> </element>
+	<element name="text_b"> <text string="B"> <color red="1" green="1" blue="1" /></text> </element>
+	<element name="text_c"> <text string="C"> <color red="1" green="1" blue="1" /></text> </element>
+	<element name="text_d"> <text string="D"> <color red="1" green="1" blue="1" /></text> </element>
+	<element name="text_e"> <text string="E"> <color red="1" green="1" blue="1" /></text> </element>
+	<element name="text_f"> <text string="F"> <color red="1" green="1" blue="1" /></text> </element>
+	<element name="text_g"> <text string="G"> <color red="1" green="1" blue="1" /></text> </element>
+	<element name="text_h"> <text string="H"> <color red="1" green="1" blue="1" /></text> </element>
 
 
 <!-- sb board -->
@@ -317,43 +317,23 @@ license:CC0-1.0
 	<element name="text_uit1"><text string="S.BOARD"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uit2"><text string="INTERFACE"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uib1"><text string="BOARD:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uib2">
-		<rect><color red="0.84" green="0.75" blue="0.50" /></rect>
-		<text string="RESET"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uib3">
-		<rect><color red="0.84" green="0.75" blue="0.50" /></rect>
-		<text string="CLEAR"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uib2"><text string="RESET"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uib3"><text string="CLEAR"><color red="0.01" green="0.01" blue="0.01" /></text></element>
 	<element name="text_uis1"><text string="SPAWN:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uih1"><text string="HAND:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uih2">
-		<rect><color red="0.84" green="0.75" blue="0.50" /></rect>
-		<text string="REMOVE"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uih2"><text string="REMOVE"><color red="0.01" green="0.01" blue="0.01" /></text></element>
 	<element name="text_uiu1"><text string="UNDO:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uiu2a">
-		<rect><color red="0.84" green="0.75" blue="0.50" /></rect>
-		<text string=" &lt;&lt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2b">
-		<rect><color red="0.84" green="0.75" blue="0.50" /></rect>
-		<text string=" &lt;  "><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2c">
-		<rect><color red="0.84" green="0.75" blue="0.50" /></rect>
-		<text string="   &gt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2d">
-		<rect><color red="0.84" green="0.75" blue="0.50" /></rect>
-		<text string=" &gt;&gt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uiu2a"><text string=" &lt;&lt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2b"><text string=" &lt;  "><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2c"><text string="   &gt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2d"><text string=" &gt;&gt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu3b"><text string="/"><color red="0.81" green="0.8" blue="0.79" /></text></element>
+
 	<element name="text_uiu3a" defstate="0">
 		<simplecounter maxstate="999" digits="1" align="2">
 			<color red="0.81" green="0.8" blue="0.79" />
 		</simplecounter>
 	</element>
-	<element name="text_uiu3b"><text string="/"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uiu3c" defstate="0">
 		<simplecounter maxstate="999" digits="1" align="1">
 			<color red="0.81" green="0.8" blue="0.79" />
diff --git a/src/mame/chess/cking_master.cpp b/src/mame/chess/cking_master.cpp
index 38b10e67af7..c3eb8840504 100644
--- a/src/mame/chess/cking_master.cpp
+++ b/src/mame/chess/cking_master.cpp
@@ -31,7 +31,7 @@ Hardware notes:
 #include "speaker.h"
 
 // internal artwork
-#include "ck_master.lh"
+#include "cking_master.lh"
 
 
 namespace {
@@ -235,7 +235,7 @@ void master_state::master(machine_config &config)
 
 	// video hardware
 	PWM_DISPLAY(config, m_display).set_size(9, 2);
-	config.set_default_layout(layout_ck_master);
+	config.set_default_layout(layout_cking_master);
 
 	// sound hardware
 	SPEAKER(config, "speaker").front_center();
diff --git a/src/mame/handheld/hh_tms1k.cpp b/src/mame/handheld/hh_tms1k.cpp
index 36a85f7e1b6..396e353c3df 100644
--- a/src/mame/handheld/hh_tms1k.cpp
+++ b/src/mame/handheld/hh_tms1k.cpp
@@ -276,10 +276,10 @@ on Joerg Woerner's datamath.org: http://www.datamath.org/IC_List.htm
 #include "comparc.lh"
 #include "copycat.lh"
 #include "copycata.lh"
+#include "cqback.lh"
 #include "dataman.lh"
 #include "ditto.lh"
 #include "dxfootb.lh"
-#include "cqback.lh"
 #include "ebball.lh"
 #include "ebball2.lh"
 #include "ebball3.lh"
diff --git a/src/mame/layout/aci_borisdpl.lay b/src/mame/layout/aci_borisdpl.lay
index 783072a691a..8a19183b440 100644
--- a/src/mame/layout/aci_borisdpl.lay
+++ b/src/mame/layout/aci_borisdpl.lay
@@ -151,75 +151,24 @@ license:CC0-1.0
 		</rect>
 	</element>
 
-	<element name="text_0">
-		<rect><color red="0.28" green="0.16" blue="0.08" /></rect>
-		<text string="0"><color red="0.7" green="0.56" blue="0.42" /></text>
-	</element>
-	<element name="text_1">
-		<rect><color red="0.7" green="0.56" blue="0.42" /></rect>
-		<text string="A  1"><color red="0.28" green="0.16" blue="0.08" /></text>
-	</element>
-	<element name="text_2">
-		<rect><color red="0.28" green="0.16" blue="0.08" /></rect>
-		<text string="B  2"><color red="0.7" green="0.56" blue="0.42" /></text>
-	</element>
-	<element name="text_3">
-		<rect><color red="0.7" green="0.56" blue="0.42" /></rect>
-		<text string="C  3"><color red="0.28" green="0.16" blue="0.08" /></text>
-	</element>
-	<element name="text_4">
-		<rect><color red="0.28" green="0.16" blue="0.08" /></rect>
-		<text string="D  4"><color red="0.7" green="0.56" blue="0.42" /></text>
-	</element>
-	<element name="text_5">
-		<rect><color red="0.7" green="0.56" blue="0.42" /></rect>
-		<text string="E  5"><color red="0.28" green="0.16" blue="0.08" /></text>
-	</element>
-	<element name="text_6">
-		<rect><color red="0.28" green="0.16" blue="0.08" /></rect>
-		<text string="F  6"><color red="0.7" green="0.56" blue="0.42" /></text>
-	</element>
-	<element name="text_7">
-		<rect><color red="0.7" green="0.56" blue="0.42" /></rect>
-		<text string="G  7"><color red="0.28" green="0.16" blue="0.08" /></text>
-	</element>
-	<element name="text_8">
-		<rect><color red="0.28" green="0.16" blue="0.08" /></rect>
-		<text string="H  8"><color red="0.7" green="0.56" blue="0.42" /></text>
-	</element>
-	<element name="text_9a">
-		<rect><color red="0.7" green="0.56" blue="0.42" /></rect>
-		<text string="9" align="1"><color red="0.28" green="0.16" blue="0.08" /></text>
-	</element>
-	<element name="text_9b">
-		<rect><color red="0.7" green="0.56" blue="0.42" /></rect>
-		<text string="SET" align="2"><color red="0.28" green="0.16" blue="0.08" /></text>
-	</element>
+	<element name="text_0"><text string="0"><color red="0.7" green="0.56" blue="0.42" /></text></element>
+	<element name="text_1"><text string="A  1"><color red="0.28" green="0.16" blue="0.08" /></text></element>
+	<element name="text_2"><text string="B  2"><color red="0.7" green="0.56" blue="0.42" /></text></element>
+	<element name="text_3"><text string="C  3"><color red="0.28" green="0.16" blue="0.08" /></text></element>
+	<element name="text_4"><text string="D  4"><color red="0.7" green="0.56" blue="0.42" /></text></element>
+	<element name="text_5"><text string="E  5"><color red="0.28" green="0.16" blue="0.08" /></text></element>
+	<element name="text_6"><text string="F  6"><color red="0.7" green="0.56" blue="0.42" /></text></element>
+	<element name="text_7"><text string="G  7"><color red="0.28" green="0.16" blue="0.08" /></text></element>
+	<element name="text_8"><text string="H  8"><color red="0.7" green="0.56" blue="0.42" /></text></element>
+	<element name="text_9a"><text string="9" align="1"><color red="0.28" green="0.16" blue="0.08" /></text></element>
+	<element name="text_9b"><text string="SET" align="2"><color red="0.28" green="0.16" blue="0.08" /></text></element>
 
-	<element name="text_ti">
-		<rect><color red="0.7" green="0.56" blue="0.42" /></rect>
-		<text string="TIME"><color red="0.28" green="0.16" blue="0.08" /></text>
-	</element>
-	<element name="text_bw">
-		<rect><color red="0.7" green="0.56" blue="0.42" /></rect>
-		<text string="B/W"><color red="0.28" green="0.16" blue="0.08" /></text>
-	</element>
-	<element name="text_ra">
-		<rect><color red="0.7" green="0.56" blue="0.42" /></rect>
-		<text string="RANK"><color red="0.28" green="0.16" blue="0.08" /></text>
-	</element>
-	<element name="text_re">
-		<rect><color red="0.7" green="0.56" blue="0.42" /></rect>
-		<text string="RESET"><color red="0.28" green="0.16" blue="0.08" /></text>
-	</element>
-	<element name="text_ce">
-		<rect><color red="0.7" green="0.56" blue="0.42" /></rect>
-		<text string="CE"><color red="0.28" green="0.16" blue="0.08" /></text>
-	</element>
-	<element name="text_en">
-		<rect><color red="0.7" green="0.56" blue="0.42" /></rect>
-		<text string="ENTER"><color red="0.28" green="0.16" blue="0.08" /></text>
-	</element>
+	<element name="text_ti"><text string="TIME"><color red="0.28" green="0.16" blue="0.08" /></text></element>
+	<element name="text_bw"><text string="B/W"><color red="0.28" green="0.16" blue="0.08" /></text></element>
+	<element name="text_ra"><text string="RANK"><color red="0.28" green="0.16" blue="0.08" /></text></element>
+	<element name="text_re"><text string="RESET"><color red="0.28" green="0.16" blue="0.08" /></text></element>
+	<element name="text_ce"><text string="CE"><color red="0.28" green="0.16" blue="0.08" /></text></element>
+	<element name="text_en"><text string="ENTER"><color red="0.28" green="0.16" blue="0.08" /></text></element>
 
 
 <!-- digits -->
diff --git a/src/mame/layout/aci_prodigy.lay b/src/mame/layout/aci_prodigy.lay
index 51f58d12c01..8c0f4c7d55b 100644
--- a/src/mame/layout/aci_prodigy.lay
+++ b/src/mame/layout/aci_prodigy.lay
@@ -148,168 +148,51 @@ license:CC0-1.0
 		</rect>
 	</element>
 
-	<element name="text_restore">
-		<rect><color red="0.21" green="0.17" blue="0.17" /></rect>
-		<text string="RESTORE"><color red="0.81" green="0.8" blue="0.79" /></text>
-	</element>
-	<element name="text_halt">
-		<rect><color red="0.21" green="0.17" blue="0.17" /></rect>
-		<text string="HALT"><color red="0.81" green="0.8" blue="0.79" /></text>
-	</element>
-	<element name="text_hint">
-		<rect><color red="0.21" green="0.17" blue="0.17" /></rect>
-		<text string="HINT"><color red="0.81" green="0.8" blue="0.79" /></text>
-	</element>
-	<element name="text_audio">
-		<rect><color red="0.21" green="0.17" blue="0.17" /></rect>
-		<text string="AUDIO"><color red="0.81" green="0.8" blue="0.79" /></text>
-	</element>
-	<element name="text_ce">
-		<rect><color red="0.21" green="0.17" blue="0.17" /></rect>
-		<text string="CE"><color red="0.81" green="0.8" blue="0.79" /></text>
-	</element>
-
-	<element name="text_g7">
-		<rect><color red="0.21" green="0.17" blue="0.17" /></rect>
-		<text string="G  7"><color red="0.81" green="0.8" blue="0.79" /></text>
-	</element>
-	<element name="text_h8">
-		<rect><color red="0.21" green="0.17" blue="0.17" /></rect>
-		<text string="H  8"><color red="0.81" green="0.8" blue="0.79" /></text>
-	</element>
-	<element name="text_time">
-		<rect><color red="0.21" green="0.17" blue="0.17" /></rect>
-		<text string="TIME"><color red="0.81" green="0.8" blue="0.79" /></text>
-	</element>
-	<element name="text_number">
-		<rect><color red="0.21" green="0.17" blue="0.17" /></rect>
-		<text string="NUMBER"><color red="0.81" green="0.8" blue="0.79" /></text>
-	</element>
-	<element name="text_level">
-		<rect><color red="0.21" green="0.17" blue="0.17" /></rect>
-		<text string="LEVEL"><color red="0.81" green="0.8" blue="0.79" /></text>
-	</element>
-
-	<element name="text_d4">
-		<rect><color red="0.21" green="0.17" blue="0.17" /></rect>
-		<text string="D  4"><color red="0.81" green="0.8" blue="0.79" /></text>
-	</element>
-	<element name="text_e5">
-		<rect><color red="0.21" green="0.17" blue="0.17" /></rect>
-		<text string="E  5"><color red="0.81" green="0.8" blue="0.79" /></text>
-	</element>
-	<element name="text_f6">
-		<rect><color red="0.21" green="0.17" blue="0.17" /></rect>
-		<text string="F  6"><color red="0.81" green="0.8" blue="0.79" /></text>
-	</element>
-	<element name="text_change">
-		<rect><color red="0.21" green="0.17" blue="0.17" /></rect>
-		<text string="CHANGE"><color red="0.81" green="0.8" blue="0.79" /></text>
-	</element>
-	<element name="text_board">
-		<rect><color red="0.21" green="0.17" blue="0.17" /></rect>
-		<text string="BOARD"><color red="0.81" green="0.8" blue="0.79" /></text>
-	</element>
-
-	<element name="text_a1">
-		<rect><color red="0.21" green="0.17" blue="0.17" /></rect>
-		<text string="A  1"><color red="0.81" green="0.8" blue="0.79" /></text>
-	</element>
-	<element name="text_b2">
-		<rect><color red="0.21" green="0.17" blue="0.17" /></rect>
-		<text string="B  2"><color red="0.81" green="0.8" blue="0.79" /></text>
-	</element>
-	<element name="text_c3">
-		<rect><color red="0.21" green="0.17" blue="0.17" /></rect>
-		<text string="C  3"><color red="0.81" green="0.8" blue="0.79" /></text>
-	</element>
-	<element name="text_verify">
-		<rect><color red="0.21" green="0.17" blue="0.17" /></rect>
-		<text string="VERIFY"><color red="0.81" green="0.8" blue="0.79" /></text>
-	</element>
-
-	<element name="text_go">
-		<rect><color red="0.21" green="0.17" blue="0.17" /></rect>
-		<text string="GO"><color red="0.81" green="0.8" blue="0.79" /></text>
-	</element>
-	<element name="text_black">
-		<rect><color red="0.21" green="0.17" blue="0.17" /></rect>
-		<text string="BLACK"><color red="0.81" green="0.8" blue="0.79" /></text>
-	</element>
-	<element name="text_white">
-		<rect><color red="0.21" green="0.17" blue="0.17" /></rect>
-		<text string="WHITE"><color red="0.81" green="0.8" blue="0.79" /></text>
-	</element>
-	<element name="text_enter">
-		<rect><color red="0.21" green="0.17" blue="0.17" /></rect>
-		<text string="ENTER"><color red="0.81" green="0.8" blue="0.79" /></text>
-	</element>
-
-	<element name="text_a">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="A"><color red="0.7" green="0.6" blue="0.4" /></text>
-	</element>
-	<element name="text_b">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="B"><color red="0.7" green="0.6" blue="0.4" /></text>
-	</element>
-	<element name="text_c">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="C"><color red="0.7" green="0.6" blue="0.4" /></text>
-	</element>
-	<element name="text_d">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="D"><color red="0.7" green="0.6" blue="0.4" /></text>
-	</element>
-	<element name="text_e">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="E"><color red="0.7" green="0.6" blue="0.4" /></text>
-	</element>
-	<element name="text_f">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="F"><color red="0.7" green="0.6" blue="0.4" /></text>
-	</element>
-	<element name="text_g">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="G"><color red="0.7" green="0.6" blue="0.4" /></text>
-	</element>
-	<element name="text_h">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="H"><color red="0.7" green="0.6" blue="0.4" /></text>
-	</element>
-
-	<element name="text_1">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="1"><color red="0.7" green="0.6" blue="0.4" /></text>
-	</element>
-	<element name="text_2">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="2"><color red="0.7" green="0.6" blue="0.4" /></text>
-	</element>
-	<element name="text_3">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="3"><color red="0.7" green="0.6" blue="0.4" /></text>
-	</element>
-	<element name="text_4">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="4"><color red="0.7" green="0.6" blue="0.4" /></text>
-	</element>
-	<element name="text_5">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="5"><color red="0.7" green="0.6" blue="0.4" /></text>
-	</element>
-	<element name="text_6">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="6"><color red="0.7" green="0.6" blue="0.4" /></text>
-	</element>
-	<element name="text_7">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="7"><color red="0.7" green="0.6" blue="0.4" /></text>
-	</element>
-	<element name="text_8">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="8"><color red="0.7" green="0.6" blue="0.4" /></text>
-	</element>
+	<element name="text_restore"><text string="RESTORE"><color red="0.81" green="0.8" blue="0.79" /></text></element>
+	<element name="text_halt"><text string="HALT"><color red="0.81" green="0.8" blue="0.79" /></text></element>
+	<element name="text_hint"><text string="HINT"><color red="0.81" green="0.8" blue="0.79" /></text></element>
+	<element name="text_audio"><text string="AUDIO"><color red="0.81" green="0.8" blue="0.79" /></text></element>
+	<element name="text_ce"><text string="CE"><color red="0.81" green="0.8" blue="0.79" /></text></element>
+
+	<element name="text_g7"><text string="G  7"><color red="0.81" green="0.8" blue="0.79" /></text></element>
+	<element name="text_h8"><text string="H  8"><color red="0.81" green="0.8" blue="0.79" /></text></element>
+	<element name="text_time"><text string="TIME"><color red="0.81" green="0.8" blue="0.79" /></text></element>
+	<element name="text_number"><text string="NUMBER"><color red="0.81" green="0.8" blue="0.79" /></text></element>
+	<element name="text_level"><text string="LEVEL"><color red="0.81" green="0.8" blue="0.79" /></text></element>
+
+	<element name="text_d4"><text string="D  4"><color red="0.81" green="0.8" blue="0.79" /></text></element>
+	<element name="text_e5"><text string="E  5"><color red="0.81" green="0.8" blue="0.79" /></text></element>
+	<element name="text_f6"><text string="F  6"><color red="0.81" green="0.8" blue="0.79" /></text></element>
+	<element name="text_change"><text string="CHANGE"><color red="0.81" green="0.8" blue="0.79" /></text></element>
+	<element name="text_board"><text string="BOARD"><color red="0.81" green="0.8" blue="0.79" /></text></element>
+
+	<element name="text_a1"><text string="A  1"><color red="0.81" green="0.8" blue="0.79" /></text></element>
+	<element name="text_b2"><text string="B  2"><color red="0.81" green="0.8" blue="0.79" /></text></element>
+	<element name="text_c3"><text string="C  3"><color red="0.81" green="0.8" blue="0.79" /></text></element>
+	<element name="text_verify"><text string="VERIFY"><color red="0.81" green="0.8" blue="0.79" /></text></element>
+
+	<element name="text_go"><text string="GO"><color red="0.81" green="0.8" blue="0.79" /></text></element>
+	<element name="text_black"><text string="BLACK"><color red="0.81" green="0.8" blue="0.79" /></text></element>
+	<element name="text_white"><text string="WHITE"><color red="0.81" green="0.8" blue="0.79" /></text></element>
+	<element name="text_enter"><text string="ENTER"><color red="0.81" green="0.8" blue="0.79" /></text></element>
+
+	<element name="text_a"><text string="A"><color red="0.7" green="0.6" blue="0.4" /></text></element>
+	<element name="text_b"><text string="B"><color red="0.7" green="0.6" blue="0.4" /></text></element>
+	<element name="text_c"><text string="C"><color red="0.7" green="0.6" blue="0.4" /></text></element>
+	<element name="text_d"><text string="D"><color red="0.7" green="0.6" blue="0.4" /></text></element>
+	<element name="text_e"><text string="E"><color red="0.7" green="0.6" blue="0.4" /></text></element>
+	<element name="text_f"><text string="F"><color red="0.7" green="0.6" blue="0.4" /></text></element>
+	<element name="text_g"><text string="G"><color red="0.7" green="0.6" blue="0.4" /></text></element>
+	<element name="text_h"><text string="H"><color red="0.7" green="0.6" blue="0.4" /></text></element>
+
+	<element name="text_1"><text string="1"><color red="0.7" green="0.6" blue="0.4" /></text></element>
+	<element name="text_2"><text string="2"><color red="0.7" green="0.6" blue="0.4" /></text></element>
+	<element name="text_3"><text string="3"><color red="0.7" green="0.6" blue="0.4" /></text></element>
+	<element name="text_4"><text string="4"><color red="0.7" green="0.6" blue="0.4" /></text></element>
+	<element name="text_5"><text string="5"><color red="0.7" green="0.6" blue="0.4" /></text></element>
+	<element name="text_6"><text string="6"><color red="0.7" green="0.6" blue="0.4" /></text></element>
+	<element name="text_7"><text string="7"><color red="0.7" green="0.6" blue="0.4" /></text></element>
+	<element name="text_8"><text string="8"><color red="0.7" green="0.6" blue="0.4" /></text></element>
 
 
 <!-- sb board -->
@@ -467,43 +350,23 @@ license:CC0-1.0
 	<element name="text_uit1"><text string="S.BOARD"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uit2"><text string="INTERFACE"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uib1"><text string="BOARD:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uib2">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="RESET"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uib3">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="CLEAR"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uib2"><text string="RESET"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uib3"><text string="CLEAR"><color red="0.01" green="0.01" blue="0.01" /></text></element>
 	<element name="text_uis1"><text string="SPAWN:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uih1"><text string="HAND:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uih2">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="REMOVE"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uih2"><text string="REMOVE"><color red="0.01" green="0.01" blue="0.01" /></text></element>
 	<element name="text_uiu1"><text string="UNDO:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uiu2a">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string=" &lt;&lt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2b">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string=" &lt;  "><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2c">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="   &gt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2d">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string=" &gt;&gt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uiu2a"><text string=" &lt;&lt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2b"><text string=" &lt;  "><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2c"><text string="   &gt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2d"><text string=" &gt;&gt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu3b"><text string="/"><color red="0.81" green="0.8" blue="0.79" /></text></element>
+
 	<element name="text_uiu3a" defstate="0">
 		<simplecounter maxstate="999" digits="1" align="2">
 			<color red="0.81" green="0.8" blue="0.79" />
 		</simplecounter>
 	</element>
-	<element name="text_uiu3b"><text string="/"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uiu3c" defstate="0">
 		<simplecounter maxstate="999" digits="1" align="1">
 			<color red="0.81" green="0.8" blue="0.79" />
diff --git a/src/mame/layout/amaztron.lay b/src/mame/layout/amaztron.lay
index c55cefa704f..51fe671980f 100644
--- a/src/mame/layout/amaztron.lay
+++ b/src/mame/layout/amaztron.lay
@@ -36,106 +36,31 @@ license:CC0-1.0
 	</element>
 
 	<!-- note: some boards have blue text, the US/Canada one has black text -->
-	<element name="text_1">
-		<rect><color red="0.88" green="0.88" blue="0.88" /></rect>
-		<text string="1"><color red="0.03" green="0.03" blue="0.03" /></text>
-	</element>
-	<element name="text_2">
-		<rect><color red="0.88" green="0.88" blue="0.88" /></rect>
-		<text string="2"><color red="0.03" green="0.03" blue="0.03" /></text>
-	</element>
-	<element name="text_3">
-		<rect><color red="0.88" green="0.88" blue="0.88" /></rect>
-		<text string="3"><color red="0.03" green="0.03" blue="0.03" /></text>
-	</element>
-	<element name="text_4">
-		<rect><color red="0.88" green="0.88" blue="0.88" /></rect>
-		<text string="4"><color red="0.03" green="0.03" blue="0.03" /></text>
-	</element>
-	<element name="text_5">
-		<rect><color red="0.88" green="0.88" blue="0.88" /></rect>
-		<text string="5"><color red="0.03" green="0.03" blue="0.03" /></text>
-	</element>
-	<element name="text_6">
-		<rect><color red="0.88" green="0.88" blue="0.88" /></rect>
-		<text string="6"><color red="0.03" green="0.03" blue="0.03" /></text>
-	</element>
-	<element name="text_7">
-		<rect><color red="0.88" green="0.88" blue="0.88" /></rect>
-		<text string="7"><color red="0.03" green="0.03" blue="0.03" /></text>
-	</element>
-	<element name="text_8">
-		<rect><color red="0.88" green="0.88" blue="0.88" /></rect>
-		<text string="8"><color red="0.03" green="0.03" blue="0.03" /></text>
-	</element>
-	<element name="text_9">
-		<rect><color red="0.88" green="0.88" blue="0.88" /></rect>
-		<text string="9"><color red="0.03" green="0.03" blue="0.03" /></text>
-	</element>
-	<element name="text_10">
-		<rect><color red="0.88" green="0.88" blue="0.88" /></rect>
-		<text string="10"><color red="0.03" green="0.03" blue="0.03" /></text>
-	</element>
-	<element name="text_11">
-		<rect><color red="0.88" green="0.88" blue="0.88" /></rect>
-		<text string="11"><color red="0.03" green="0.03" blue="0.03" /></text>
-	</element>
-	<element name="text_12">
-		<rect><color red="0.88" green="0.88" blue="0.88" /></rect>
-		<text string="12"><color red="0.03" green="0.03" blue="0.03" /></text>
-	</element>
-	<element name="text_13">
-		<rect><color red="0.88" green="0.88" blue="0.88" /></rect>
-		<text string="13"><color red="0.03" green="0.03" blue="0.03" /></text>
-	</element>
-	<element name="text_14">
-		<rect><color red="0.88" green="0.88" blue="0.88" /></rect>
-		<text string="14"><color red="0.03" green="0.03" blue="0.03" /></text>
-	</element>
-	<element name="text_15">
-		<rect><color red="0.88" green="0.88" blue="0.88" /></rect>
-		<text string="15"><color red="0.03" green="0.03" blue="0.03" /></text>
-	</element>
-	<element name="text_16">
-		<rect><color red="0.88" green="0.88" blue="0.88" /></rect>
-		<text string="16"><color red="0.03" green="0.03" blue="0.03" /></text>
-	</element>
-	<element name="text_17">
-		<rect><color red="0.88" green="0.88" blue="0.88" /></rect>
-		<text string="17"><color red="0.03" green="0.03" blue="0.03" /></text>
-	</element>
-	<element name="text_18">
-		<rect><color red="0.88" green="0.88" blue="0.88" /></rect>
-		<text string="18"><color red="0.03" green="0.03" blue="0.03" /></text>
-	</element>
-	<element name="text_19">
-		<rect><color red="0.88" green="0.88" blue="0.88" /></rect>
-		<text string="19"><color red="0.03" green="0.03" blue="0.03" /></text>
-	</element>
-	<element name="text_20">
-		<rect><color red="0.88" green="0.88" blue="0.88" /></rect>
-		<text string="20"><color red="0.03" green="0.03" blue="0.03" /></text>
-	</element>
-	<element name="text_21">
-		<rect><color red="0.88" green="0.88" blue="0.88" /></rect>
-		<text string="21"><color red="0.03" green="0.03" blue="0.03" /></text>
-	</element>
-	<element name="text_22">
-		<rect><color red="0.88" green="0.88" blue="0.88" /></rect>
-		<text string="22"><color red="0.03" green="0.03" blue="0.03" /></text>
-	</element>
-	<element name="text_23">
-		<rect><color red="0.88" green="0.88" blue="0.88" /></rect>
-		<text string="23"><color red="0.03" green="0.03" blue="0.03" /></text>
-	</element>
-	<element name="text_24">
-		<rect><color red="0.88" green="0.88" blue="0.88" /></rect>
-		<text string="24"><color red="0.03" green="0.03" blue="0.03" /></text>
-	</element>
-	<element name="text_25">
-		<rect><color red="0.88" green="0.88" blue="0.88" /></rect>
-		<text string="25"><color red="0.03" green="0.03" blue="0.03" /></text>
-	</element>
+	<element name="text_1"><text string="1"><color red="0.03" green="0.03" blue="0.03" /></text></element>
+	<element name="text_2"><text string="2"><color red="0.03" green="0.03" blue="0.03" /></text></element>
+	<element name="text_3"><text string="3"><color red="0.03" green="0.03" blue="0.03" /></text></element>
+	<element name="text_4"><text string="4"><color red="0.03" green="0.03" blue="0.03" /></text></element>
+	<element name="text_5"><text string="5"><color red="0.03" green="0.03" blue="0.03" /></text></element>
+	<element name="text_6"><text string="6"><color red="0.03" green="0.03" blue="0.03" /></text></element>
+	<element name="text_7"><text string="7"><color red="0.03" green="0.03" blue="0.03" /></text></element>
+	<element name="text_8"><text string="8"><color red="0.03" green="0.03" blue="0.03" /></text></element>
+	<element name="text_9"><text string="9"><color red="0.03" green="0.03" blue="0.03" /></text></element>
+	<element name="text_10"><text string="10"><color red="0.03" green="0.03" blue="0.03" /></text></element>
+	<element name="text_11"><text string="11"><color red="0.03" green="0.03" blue="0.03" /></text></element>
+	<element name="text_12"><text string="12"><color red="0.03" green="0.03" blue="0.03" /></text></element>
+	<element name="text_13"><text string="13"><color red="0.03" green="0.03" blue="0.03" /></text></element>
+	<element name="text_14"><text string="14"><color red="0.03" green="0.03" blue="0.03" /></text></element>
+	<element name="text_15"><text string="15"><color red="0.03" green="0.03" blue="0.03" /></text></element>
+	<element name="text_16"><text string="16"><color red="0.03" green="0.03" blue="0.03" /></text></element>
+	<element name="text_17"><text string="17"><color red="0.03" green="0.03" blue="0.03" /></text></element>
+	<element name="text_18"><text string="18"><color red="0.03" green="0.03" blue="0.03" /></text></element>
+	<element name="text_19"><text string="19"><color red="0.03" green="0.03" blue="0.03" /></text></element>
+	<element name="text_20"><text string="20"><color red="0.03" green="0.03" blue="0.03" /></text></element>
+	<element name="text_21"><text string="21"><color red="0.03" green="0.03" blue="0.03" /></text></element>
+	<element name="text_22"><text string="22"><color red="0.03" green="0.03" blue="0.03" /></text></element>
+	<element name="text_23"><text string="23"><color red="0.03" green="0.03" blue="0.03" /></text></element>
+	<element name="text_24"><text string="24"><color red="0.03" green="0.03" blue="0.03" /></text></element>
+	<element name="text_25"><text string="25"><color red="0.03" green="0.03" blue="0.03" /></text></element>
 
 	<element name="text_game"><text string="GAME"><color red="0.9" green="0.9" blue="0.9" /></text></element>
 	<element name="text_select"><text string="SELECT"><color red="0.9" green="0.9" blue="0.9" /></text></element>
@@ -150,8 +75,7 @@ license:CC0-1.0
 			<bounds left="0" right="58" top="0" bottom="58" />
 		</element>
 
-	<!-- playing board buttons -->
-
+		<!-- playing board buttons -->
 		<element ref="static_white"><bounds x="5" y="5" width="8" height="8" /></element>
 		<element ref="static_white"><bounds x="15" y="5" width="8" height="8" /></element>
 		<element ref="static_white"><bounds x="25" y="5" width="8" height="8" /></element>
@@ -230,8 +154,7 @@ license:CC0-1.0
 		<element ref="hl" inputtag="IN.3" inputmask="0x10"><bounds x="35" y="45" width="8" height="8" /><color alpha="0.15" /></element>
 		<element ref="hl" inputtag="IN.4" inputmask="0x10"><bounds x="45" y="45" width="8" height="8" /><color alpha="0.15" /></element>
 
-	<!-- bottom side -->
-
+		<!-- bottom side -->
 		<element ref="static_white"><bounds x="0" y="57" width="58" height="60" /></element>
 		<element ref="static_black"><bounds x="3" y="59" width="52" height="14" /></element>
 		<element ref="static_black"><bounds x="3" y="75" width="52" height="24" /></element>
diff --git a/src/mame/layout/arcmania.lay b/src/mame/layout/arcmania.lay
index 54cd090ee03..1ad4f9dc86c 100644
--- a/src/mame/layout/arcmania.lay
+++ b/src/mame/layout/arcmania.lay
@@ -6,59 +6,24 @@ license:CC0-1.0
 
 <!-- define elements -->
 
-	<element name="static_gray"><rect><color red="0.25" green="0.25" blue="0.25" /></rect></element>
-
-	<element name="static_orange"><rect><color red="0.75" green="0.35" blue="0.1" /></rect></element>
-	<element name="text_1">
-		<rect><color red="0.75" green="0.35" blue="0.1" /></rect>
-		<text string="1"><color red="0.85" green="0.85" blue="0.85" /></text>
-	</element>
-	<element name="text_2">
-		<rect><color red="0.75" green="0.35" blue="0.1" /></rect>
-		<text string="2"><color red="0.85" green="0.85" blue="0.85" /></text>
-	</element>
-	<element name="text_3">
-		<rect><color red="0.75" green="0.35" blue="0.1" /></rect>
-		<text string="3"><color red="0.85" green="0.85" blue="0.85" /></text>
-	</element>
-
-	<element name="static_yellow"><rect><color red="0.75" green="0.75" blue="0.3" /></rect></element>
-
-	<element name="static_red"><rect><color red="0.75" green="0.2" blue="0.2" /></rect></element>
-	<element name="text_run">
-		<rect><color red="0.75" green="0.2" blue="0.2" /></rect>
-		<text string="RUN"><color red="0.85" green="0.85" blue="0.85" /></text>
-	</element>
-	<element name="text_amuk">
-		<rect><color red="0.75" green="0.2" blue="0.2" /></rect>
-		<text string="AMUK"><color red="0.85" green="0.85" blue="0.85" /></text>
-	</element>
-
-	<element name="static_blue"><rect><color red="0.15" green="0.25" blue="0.75" /></rect></element>
-	<element name="text_sneak">
-		<rect><color red="0.15" green="0.25" blue="0.75" /></rect>
-		<text string="SNEAK"><color red="0.85" green="0.85" blue="0.85" /></text>
-	</element>
-	<element name="text_attack">
-		<rect><color red="0.15" green="0.25" blue="0.75" /></rect>
-		<text string="ATTACK"><color red="0.85" green="0.85" blue="0.85" /></text>
-	</element>
-
-	<element name="static_green"><rect><color red="0.15" green="0.6" blue="0.2" /></rect></element>
-	<element name="text_alien">
-		<rect><color red="0.15" green="0.6" blue="0.2" /></rect>
-		<text string="Alien"><color red="0.85" green="0.85" blue="0.85" /></text>
-	</element>
-	<element name="text_raiders">
-		<rect><color red="0.15" green="0.6" blue="0.2" /></rect>
-		<text string="Raiders"><color red="0.85" green="0.85" blue="0.85" /></text>
-	</element>
-
-	<element name="static_purple"><rect><color red="0.7" green="0.25" blue="0.5" /></rect></element>
-	<element name="text_rattler">
-		<rect><color red="0.7" green="0.25" blue="0.5" /></rect>
-		<text string="Rattler"><color red="0.85" green="0.85" blue="0.85" /></text>
-	</element>
+	<element name="gray"><rect><color red="0.25" green="0.25" blue="0.25" /></rect></element>
+	<element name="orange"><rect><color red="0.75" green="0.35" blue="0.1" /></rect></element>
+	<element name="yellow"><rect><color red="0.75" green="0.75" blue="0.3" /></rect></element>
+	<element name="red"><rect><color red="0.75" green="0.2" blue="0.2" /></rect></element>
+	<element name="blue"><rect><color red="0.15" green="0.25" blue="0.75" /></rect></element>
+	<element name="green"><rect><color red="0.15" green="0.6" blue="0.2" /></rect></element>
+	<element name="purple"><rect><color red="0.7" green="0.25" blue="0.5" /></rect></element>
+
+	<element name="text_1"><text string="1"><color red="0.85" green="0.85" blue="0.85" /></text></element>
+	<element name="text_2"><text string="2"><color red="0.85" green="0.85" blue="0.85" /></text></element>
+	<element name="text_3"><text string="3"><color red="0.85" green="0.85" blue="0.85" /></text></element>
+	<element name="text_run"><text string="RUN"><color red="0.85" green="0.85" blue="0.85" /></text></element>
+	<element name="text_amuk"><text string="AMUK"><color red="0.85" green="0.85" blue="0.85" /></text></element>
+	<element name="text_sneak"><text string="SNEAK"><color red="0.85" green="0.85" blue="0.85" /></text></element>
+	<element name="text_attack"><text string="ATTACK"><color red="0.85" green="0.85" blue="0.85" /></text></element>
+	<element name="text_alien"><text string="Alien"><color red="0.85" green="0.85" blue="0.85" /></text></element>
+	<element name="text_raiders"><text string="Raiders"><color red="0.85" green="0.85" blue="0.85" /></text></element>
+	<element name="text_rattler"><text string="Rattler"><color red="0.85" green="0.85" blue="0.85" /></text></element>
 
 	<element name="hl" defstate="0">
 		<text string=" ">
@@ -82,12 +47,11 @@ license:CC0-1.0
 	<view name="Internal Layout">
 		<bounds left="-1.5" right="19.5" top="-0.2" bottom="36.1" />
 
-	<!-- leds -->
-
-		<element ref="static_gray"><bounds x="0" y="4.9" width="18" height="0.2" /></element>
-		<element ref="static_gray"><bounds x="0" y="9.9" width="18" height="0.2" /></element>
-		<element ref="static_gray"><bounds x="5.9" y="0" width="0.2" height="15" /></element>
-		<element ref="static_gray"><bounds x="11.9" y="0" width="0.2" height="15" /></element>
+		<!-- leds -->
+		<element ref="gray"><bounds x="0" y="4.9" width="18" height="0.2" /></element>
+		<element ref="gray"><bounds x="0" y="9.9" width="18" height="0.2" /></element>
+		<element ref="gray"><bounds x="5.9" y="0" width="0.2" height="15" /></element>
+		<element ref="gray"><bounds x="11.9" y="0" width="0.2" height="15" /></element>
 
 		<element name="0.0" ref="led"><bounds x="2" y="1.5" width="2" height="2" /></element>
 		<element name="0.1" ref="led"><bounds x="8" y="1.5" width="2" height="2" /></element>
@@ -99,20 +63,18 @@ license:CC0-1.0
 		<element name="0.7" ref="led"><bounds x="8" y="11.5" width="2" height="2" /></element>
 		<element name="0.8" ref="led"><bounds x="14" y="11.5" width="2" height="2" /></element>
 
-	<!-- button panel -->
-
-		<element ref="static_orange"><bounds x="-1" y="18" width="5.8" height="5" /></element>
-		<element ref="static_orange"><bounds x="6.1" y="18" width="5.8" height="5" /></element>
-		<element ref="static_orange"><bounds x="13.2" y="18" width="5.8" height="5" /></element>
+		<!-- button panel -->
+		<element ref="orange"><bounds x="-1" y="18" width="5.8" height="5" /></element>
+		<element ref="orange"><bounds x="6.1" y="18" width="5.8" height="5" /></element>
+		<element ref="orange"><bounds x="13.2" y="18" width="5.8" height="5" /></element>
 
-		<element ref="static_red"><bounds x="-1" y="24.3" width="5.8" height="5" /></element>
-		<element ref="static_yellow"><bounds x="6.1" y="24.3" width="5.8" height="5" /></element>
-		<element ref="static_blue"><bounds x="13.2" y="24.3" width="5.8" height="5" /></element>
-
-		<element ref="static_green"><bounds x="-1" y="30.6" width="5.8" height="5" /></element>
-		<element ref="static_yellow"><bounds x="6.1" y="30.6" width="5.8" height="5" /></element>
-		<element ref="static_purple"><bounds x="13.2" y="30.6" width="5.8" height="5" /></element>
+		<element ref="red"><bounds x="-1" y="24.3" width="5.8" height="5" /></element>
+		<element ref="yellow"><bounds x="6.1" y="24.3" width="5.8" height="5" /></element>
+		<element ref="blue"><bounds x="13.2" y="24.3" width="5.8" height="5" /></element>
 
+		<element ref="green"><bounds x="-1" y="30.6" width="5.8" height="5" /></element>
+		<element ref="yellow"><bounds x="6.1" y="30.6" width="5.8" height="5" /></element>
+		<element ref="purple"><bounds x="13.2" y="30.6" width="5.8" height="5" /></element>
 
 		<element ref="text_1"><bounds x="-0.9" y="18.5" width="5.6" height="4" /></element>
 		<element ref="text_2"><bounds x="6.2" y="18.5" width="5.6" height="4" /></element>
@@ -129,7 +91,6 @@ license:CC0-1.0
 
 		<element ref="text_rattler"><bounds x="13.3" y="32.3" width="5.6" height="1.6" /></element>
 
-
 		<element ref="hl" inputtag="IN.2" inputmask="0x01"><bounds x="-1" y="18" width="5.8" height="5" /><color alpha="0.2" /></element>
 		<element ref="hl" inputtag="IN.2" inputmask="0x02"><bounds x="6.1" y="18" width="5.8" height="5" /><color alpha="0.2" /></element>
 		<element ref="hl" inputtag="IN.2" inputmask="0x04"><bounds x="13.2" y="18" width="5.8" height="5" /><color alpha="0.2" /></element>
diff --git a/src/mame/layout/arrball.lay b/src/mame/layout/arrball.lay
index 07a2135cfc5..20573abb86a 100644
--- a/src/mame/layout/arrball.lay
+++ b/src/mame/layout/arrball.lay
@@ -31,22 +31,10 @@ license:CC0-1.0
 	<element name="text_15"><text string="15"><color red="0.7" green="0.4" blue="0.3" /></text></element>
 	<element name="text_16"><text string="16"><color red="0.7" green="0.4" blue="0.3" /></text></element>
 
-	<element name="text_l1">
-		<rect><color red="0.7" green="0.4" blue="0.3" /></rect>
-		<text string="L1"><color red="0" green="0" blue="0" /></text>
-	</element>
-	<element name="text_l2">
-		<rect><color red="0.85" green="0.85" blue="0.85" /></rect>
-		<text string="L2"><color red="0" green="0" blue="0" /></text>
-	</element>
-	<element name="text_l3">
-		<rect><color red="0.7" green="0.4" blue="0.3" /></rect>
-		<text string="L3"><color red="0" green="0" blue="0" /></text>
-	</element>
-	<element name="text_l4">
-		<rect><color red="0.85" green="0.85" blue="0.85" /></rect>
-		<text string="L4"><color red="0" green="0" blue="0" /></text>
-	</element>
+	<element name="text_l1"><text string="L1"><color red="0" green="0" blue="0" /></text></element>
+	<element name="text_l2"><text string="L2"><color red="0" green="0" blue="0" /></text></element>
+	<element name="text_l3"><text string="L3"><color red="0" green="0" blue="0" /></text></element>
+	<element name="text_l4"><text string="L4"><color red="0" green="0" blue="0" /></text></element>
 
 	<element name="led" defstate="0">
 		<disk state="0"><color red="0.2" green="0.04" blue="0.05" /></disk>
@@ -152,8 +140,7 @@ license:CC0-1.0
 		<element ref="text_15"><bounds x="10.5" y="25.75" width="2" height="1.5" /></element>
 		<element ref="text_16"><bounds x="15.5" y="25.75" width="2" height="1.5" /></element>
 
-	<!-- bottom side-->
-
+		<!-- bottom side-->
 		<element ref="static_orange"><bounds x="-0.2" y="28.7" width="3.4" height="1.7" /></element>
 		<element ref="disk_orange"><bounds x="-0.2" y="28.7" width="3.4" height="3.4" /></element>
 		<element ref="text_l1"><bounds x="0.3" y="29.55" width="2.4" height="1.8" /></element>
@@ -172,8 +159,7 @@ license:CC0-1.0
 
 		<element ref="static_black"><bounds x="-1" y="28.2" width="20" height="1" /></element>
 
-	<!-- right side-->
-
+		<!-- right side-->
 		<element ref="text_start"><bounds x="19" y="28.3" width="7" height="1.3" /></element>
 		<element ref="disk_orange"><bounds x="21" y="25" width="3" height="3" /></element>
 		<element ref="disk_black"><bounds x="21.4" y="25.4" width="2.2" height="2.2" /></element>
@@ -204,8 +190,7 @@ license:CC0-1.0
 		<element ref="disk_orange"><bounds x="21.8" y="22.1" width="0.6" height="0.6" /></element>
 		<element ref="disk_orange"><bounds x="21.966" y="23.7" width="0.6" height="0.6" /></element>
 
-	<!-- digits-->
-
+		<!-- digits-->
 		<element ref="static_orange"><bounds x="0.5" y="3" width="7" height="5" /></element>
 		<element ref="static_black"><bounds x="0.9" y="3.4" width="6.2" height="4.2" /></element>
 		<element name="digit5" ref="digit"><bounds x="1.5" y="3.625" width="2.5" height="3.75" /></element>
diff --git a/src/mame/layout/autorace.lay b/src/mame/layout/autorace.lay
index b62fbb2bb86..3c74e7aad82 100644
--- a/src/mame/layout/autorace.lay
+++ b/src/mame/layout/autorace.lay
@@ -14,7 +14,6 @@ license:CC0-1.0
 	</element>
 
 	<element name="gear" defstate="3">
-		<rect><color red="0.8" green="0.8" blue="0.8" /></rect>
 		<text state="3" string="GEAR:1"><color red="0.6" green="0.6" blue="0.6" /></text>
 		<text state="1" string="GEAR:2"><color red="0.6" green="0.6" blue="0.6" /></text>
 		<text state="0" string="GEAR:3"><color red="0.6" green="0.6" blue="0.6" /></text>
diff --git a/src/mame/layout/ave_arb.lay b/src/mame/layout/ave_arb.lay
index 664a9464a32..9733a3361e0 100644
--- a/src/mame/layout/ave_arb.lay
+++ b/src/mame/layout/ave_arb.lay
@@ -54,71 +54,23 @@ license:CC0-1.0
 		<rect><color alpha="0" /></rect>
 	</element>
 
-	<element name="text_1">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="1"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_2">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="2"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_3">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="3"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_4">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="4"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_5">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="5"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_6">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="6"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_7">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="7"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_8">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="8"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-
-	<element name="text_a">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="A"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_b">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="B"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_c">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="C"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_d">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="D"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_e">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="E"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_f">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="F"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_g">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="G"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_h">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="H"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
+	<element name="text_1"><text string="1"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_2"><text string="2"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_3"><text string="3"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_4"><text string="4"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_5"><text string="5"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_6"><text string="6"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_7"><text string="7"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_8"><text string="8"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+
+	<element name="text_a"><text string="A"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_b"><text string="B"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_c"><text string="C"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_d"><text string="D"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_e"><text string="E"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_f"><text string="F"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_g"><text string="G"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_h"><text string="H"><color red="0.87" green="0.87" blue="0.84" /></text></element>
 
 	<element name="text_l0"><text string="0"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_l1"><text string="1"><color red="0.81" green="0.8" blue="0.79" /></text></element>
@@ -355,43 +307,23 @@ license:CC0-1.0
 	<element name="text_uit1"><text string="S.BOARD"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uit2"><text string="INTERFACE"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uib1"><text string="BOARD:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uib2">
-		<rect><color red="0.84" green="0.75" blue="0.50" /></rect>
-		<text string="RESET"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uib3">
-		<rect><color red="0.84" green="0.75" blue="0.50" /></rect>
-		<text string="CLEAR"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uib2"><text string="RESET"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uib3"><text string="CLEAR"><color red="0.01" green="0.01" blue="0.01" /></text></element>
 	<element name="text_uis1"><text string="SPAWN:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uih1"><text string="HAND:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uih2">
-		<rect><color red="0.84" green="0.75" blue="0.50" /></rect>
-		<text string="REMOVE"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uih2"><text string="REMOVE"><color red="0.01" green="0.01" blue="0.01" /></text></element>
 	<element name="text_uiu1"><text string="UNDO:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uiu2a">
-		<rect><color red="0.84" green="0.75" blue="0.50" /></rect>
-		<text string=" &lt;&lt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2b">
-		<rect><color red="0.84" green="0.75" blue="0.50" /></rect>
-		<text string=" &lt;  "><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2c">
-		<rect><color red="0.84" green="0.75" blue="0.50" /></rect>
-		<text string="   &gt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2d">
-		<rect><color red="0.84" green="0.75" blue="0.50" /></rect>
-		<text string=" &gt;&gt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uiu2a"><text string=" &lt;&lt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2b"><text string=" &lt;  "><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2c"><text string="   &gt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2d"><text string=" &gt;&gt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu3b"><text string="/"><color red="0.81" green="0.8" blue="0.79" /></text></element>
+
 	<element name="text_uiu3a" defstate="0">
 		<simplecounter maxstate="999" digits="1" align="2">
 			<color red="0.81" green="0.8" blue="0.79" />
 		</simplecounter>
 	</element>
-	<element name="text_uiu3b"><text string="/"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uiu3c" defstate="0">
 		<simplecounter maxstate="999" digits="1" align="1">
 			<color red="0.81" green="0.8" blue="0.79" />
diff --git a/src/mame/layout/bship.lay b/src/mame/layout/bship.lay
index d69b9b41d3a..d6053fc3941 100644
--- a/src/mame/layout/bship.lay
+++ b/src/mame/layout/bship.lay
@@ -10,10 +10,7 @@ license:CC0-1.0
 	<element name="static_gray"><rect><color red="0.1" green="0.1" blue="0.11" /></rect></element>
 	<element name="static_red"><rect><color red="0.8" green="0.1" blue="0.15" /></rect></element>
 
-	<element name="text_fire">
-		<rect><color red="0.8" green="0.1" blue="0.15" /></rect>
-		<text string="FIRE"><color red="0.8" green="0.8" blue="0.8" /></text>
-	</element>
+	<element name="text_fire"><text string="FIRE"><color red="0.8" green="0.8" blue="0.8" /></text></element>
 
 	<element name="lamp" defstate="0">
 		<disk state="0"><color red="0.15" green="0.03" blue="0.033" /></disk>
diff --git a/src/mame/layout/bshipg.lay b/src/mame/layout/bshipg.lay
index 1d683e8155f..d2f884ef5a2 100644
--- a/src/mame/layout/bshipg.lay
+++ b/src/mame/layout/bshipg.lay
@@ -10,10 +10,7 @@ license:CC0-1.0
 	<element name="static_gray"><rect><color red="0.1" green="0.1" blue="0.11" /></rect></element>
 	<element name="static_red"><rect><color red="0.8" green="0.1" blue="0.15" /></rect></element>
 
-	<element name="text_fire">
-		<rect><color red="0.8" green="0.1" blue="0.15" /></rect>
-		<text string="FIRE"><color red="0.8" green="0.8" blue="0.8" /></text>
-	</element>
+	<element name="text_fire"><text string="FIRE"><color red="0.8" green="0.8" blue="0.8" /></text></element>
 
 	<element name="lamp" defstate="0">
 		<disk state="0"><color red="0.15" green="0.03" blue="0.033" /></disk>
@@ -112,8 +109,7 @@ license:CC0-1.0
 
 		<element ref="static_gray"><bounds x="137.75" y="-15" width="0.5" height="45" /></element>
 
-	<!-- player 1 buttons -->
-
+		<!-- player 1 buttons -->
 		<element ref="static_red"><bounds x="0" y="0" width="10" height="10" /></element>
 		<element ref="text_fire"><bounds x="0" y="3" width="10" height="4" /></element>
 		<element ref="hlb" inputtag="IN.1" inputmask="0x800"><bounds x="0" y="0" width="10" height="10" /><color alpha="0.3" /></element>
@@ -166,8 +162,7 @@ license:CC0-1.0
 		<element ref="text_i"><bounds x="113" y="13" width="10" height="6" /></element>
 		<element ref="text_j"><bounds x="124" y="13" width="10" height="6" /></element>
 
-	<!-- player 2 buttons -->
-
+		<!-- player 2 buttons -->
 		<element ref="static_red"><bounds x="142" y="0" width="10" height="10" /></element>
 		<element ref="text_fire"><bounds x="142" y="3" width="10" height="4" /></element>
 		<element ref="hlb" inputtag="IN.3" inputmask="0x800"><bounds x="142" y="0" width="10" height="10" /><color alpha="0.3" /></element>
diff --git a/src/mame/layout/cc40.lay b/src/mame/layout/cc40.lay
index 95fc060805c..e1c632aab79 100644
--- a/src/mame/layout/cc40.lay
+++ b/src/mame/layout/cc40.lay
@@ -11,7 +11,6 @@ license:CC0-1.0
 <!-- define lcd indicators -->
 
 	<element name="ind_left" defstate="0">
-		<rect><color red="0.5412" green="0.57255" blue="0.5804" /></rect>
 		<text string="&#x25c4;" align="1" state="0">
 			<color red="0.515" green="0.537" blue="0.548" />
 		</text>
@@ -21,7 +20,6 @@ license:CC0-1.0
 	</element>
 
 	<element name="ind_right" defstate="0">
-		<rect><color red="0.5412" green="0.57255" blue="0.5804" /></rect>
 		<text string="&#x25ba;" align="2" state="0">
 			<color red="0.515" green="0.537" blue="0.548" />
 		</text>
@@ -31,7 +29,6 @@ license:CC0-1.0
 	</element>
 
 	<element name="ind_shift" defstate="0">
-		<rect><color red="0.5412" green="0.57255" blue="0.5804" /></rect>
 		<text string="SHIFT" state="0">
 			<color red="0.515" green="0.537" blue="0.548" />
 		</text>
@@ -41,7 +38,6 @@ license:CC0-1.0
 	</element>
 
 	<element name="ind_ctl" defstate="0">
-		<rect><color red="0.5412" green="0.57255" blue="0.5804" /></rect>
 		<text string="CTL" state="0">
 			<color red="0.515" green="0.537" blue="0.548" />
 		</text>
@@ -51,7 +47,6 @@ license:CC0-1.0
 	</element>
 
 	<element name="ind_fn" defstate="0">
-		<rect><color red="0.5412" green="0.57255" blue="0.5804" /></rect>
 		<text string="FN" state="0">
 			<color red="0.515" green="0.537" blue="0.548" />
 		</text>
@@ -61,7 +56,6 @@ license:CC0-1.0
 	</element>
 
 	<element name="ind_deg" defstate="0">
-		<rect><color red="0.5412" green="0.57255" blue="0.5804" /></rect>
 		<text string="DEG" state="0">
 			<color red="0.515" green="0.537" blue="0.548" />
 		</text>
@@ -71,7 +65,6 @@ license:CC0-1.0
 	</element>
 
 	<element name="ind_rad" defstate="0">
-		<rect><color red="0.5412" green="0.57255" blue="0.5804" /></rect>
 		<text string="RAD" state="0">
 			<color red="0.515" green="0.537" blue="0.548" />
 		</text>
@@ -81,7 +74,6 @@ license:CC0-1.0
 	</element>
 
 	<element name="ind_grad" defstate="0">
-		<rect><color red="0.5412" green="0.57255" blue="0.5804" /></rect>
 		<text string="GRAD" state="0">
 			<color red="0.515" green="0.537" blue="0.548" />
 		</text>
@@ -91,7 +83,6 @@ license:CC0-1.0
 	</element>
 
 	<element name="ind_io" defstate="0">
-		<rect><color red="0.5412" green="0.57255" blue="0.5804" /></rect>
 		<text string="I/O" state="0">
 			<color red="0.515" green="0.537" blue="0.548" />
 		</text>
@@ -101,7 +92,6 @@ license:CC0-1.0
 	</element>
 
 	<element name="ind_ucl" defstate="0">
-		<rect><color red="0.5412" green="0.57255" blue="0.5804" /></rect>
 		<text string="UCL" state="0">
 			<color red="0.515" green="0.537" blue="0.548" />
 		</text>
@@ -111,7 +101,6 @@ license:CC0-1.0
 	</element>
 
 	<element name="ind_error" defstate="0">
-		<rect><color red="0.5412" green="0.57255" blue="0.5804" /></rect>
 		<text string="ERROR" state="0">
 			<color red="0.515" green="0.537" blue="0.548" />
 		</text>
@@ -121,7 +110,6 @@ license:CC0-1.0
 	</element>
 
 	<element name="ind_user" defstate="0">
-		<rect><color red="0.5412" green="0.57255" blue="0.5804" /></rect>
 		<text string="&#x25bc;" state="0">
 			<color red="0.515" green="0.537" blue="0.548" />
 		</text>
@@ -139,6 +127,7 @@ license:CC0-1.0
 	</element>
 
 
+<!-- build screen -->
 
 	<view name="Internal Layout">
 		<bounds left="0" top="1" right="189" bottom="33" />
@@ -147,8 +136,7 @@ license:CC0-1.0
 			<bounds x="1" y="11" width="187" height="11" />
 		</screen>
 
-<!-- draw background around lcd screen matrix part -->
-
+		<!-- draw background around lcd screen matrix part -->
 		<element ref="static_bg">
 			<bounds left="0" top="0" right="188" bottom="11.25" />
 		</element>
@@ -162,8 +150,7 @@ license:CC0-1.0
 			<bounds left="0" top="21.75" right="188" bottom="33" />
 		</element>
 
-<!-- draw top row of lcd indicators -->
-
+		<!-- draw top row of lcd indicators -->
 		<element name="seg10" ref="ind_left">
 			<bounds x="1.5" y="2.5" width="20" height="5.5" />
 		</element>
@@ -197,8 +184,7 @@ license:CC0-1.0
 			<bounds x="161" y="3" width="20" height="5" />
 		</element>
 
-<!-- draw bottom row of lcd indicators -->
-
+		<!-- draw bottom row of lcd indicators -->
 		<element name="seg60" ref="ind_error">
 			<bounds x="7" y="25" width="20" height="5" />
 		</element>
diff --git a/src/mame/layout/cgang.lay b/src/mame/layout/cgang.lay
index 95896d7cb41..e45be32facb 100644
--- a/src/mame/layout/cgang.lay
+++ b/src/mame/layout/cgang.lay
@@ -15,36 +15,14 @@ license:CC0-1.0
 	<element name="red"><rect><color red="0.9" green="0.2" blue="0.2" /></rect></element>
 	<element name="orange"><rect><color red="0.9" green="0.6" blue="0.17" /></rect></element>
 
-	<element name="text_stage">
-		<rect><color red="0.9" green="0.2" blue="0.2" /></rect>
-		<text string="STAGE" align="1"><color red="0.9" green="0.9" blue="0.9" /></text>
-	</element>
-	<element name="text_time">
-		<rect><color red="0.9" green="0.2" blue="0.2" /></rect>
-		<text string="TIME"><color red="0.9" green="0.9" blue="0.9" /></text>
-	</element>
-	<element name="text_hits">
-		<rect><color red="0.9" green="0.6" blue="0.17" /></rect>
-		<text string="HITS"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="text_high">
-		<rect><color red="0.9" green="0.9" blue="0.15" /></rect>
-		<text string="HIGH SCORE"><color red="0.8" green="0.5" blue="0.12" /></text>
-	</element>
-	<element name="text_1ph">
-		<text string="1 PLAYER"><color red="0.9" green="0.9" blue="0.15" /></text>
-	</element>
-	<element name="text_2ph">
-		<text string="2 PLAYERS"><color red="0.9" green="0.9" blue="0.15" /></text>
-	</element>
-	<element name="text_start1">
-		<rect><color red="0.9" green="0.9" blue="0.92" /></rect>
-		<text string="EASY" align="2"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="text_start2">
-		<rect><color red="0.9" green="0.9" blue="0.92" /></rect>
-		<text string="HARD" align="2"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
+	<element name="text_stage"><text string="STAGE" align="1"><color red="0.9" green="0.9" blue="0.9" /></text></element>
+	<element name="text_time"><text string="TIME"><color red="0.9" green="0.9" blue="0.9" /></text></element>
+	<element name="text_hits"><text string="HITS"><color red="0.1" green="0.1" blue="0.1" /></text></element>
+	<element name="text_high"><text string="HIGH SCORE"><color red="0.8" green="0.5" blue="0.12" /></text></element>
+	<element name="text_1ph"><text string="1 PLAYER"><color red="0.9" green="0.9" blue="0.15" /></text></element>
+	<element name="text_2ph"><text string="2 PLAYERS"><color red="0.9" green="0.9" blue="0.15" /></text></element>
+	<element name="text_start1"><text string="EASY" align="2"><color red="0.1" green="0.1" blue="0.1" /></text></element>
+	<element name="text_start2"><text string="HARD" align="2"><color red="0.1" green="0.1" blue="0.1" /></text></element>
 
 	<element name="yellowe">
 		<disk>
diff --git a/src/mame/layout/chessmate.lay b/src/mame/layout/chessmate.lay
index 1d099a2e268..e1005f5c6f1 100644
--- a/src/mame/layout/chessmate.lay
+++ b/src/mame/layout/chessmate.lay
@@ -51,201 +51,60 @@ license:CC0-1.0
 		</disk>
 	</element>
 
-	<element name="text_l1">
-		<rect><color red="0.3" green="0.1" blue="0.0" /></rect>
-		<text string="A"><color red="0.88" green="0.88" blue="0.9" /></text>
-	</element>
-	<element name="text_l2">
-		<rect><color red="0.3" green="0.1" blue="0.0" /></rect>
-		<text string="B"><color red="0.88" green="0.88" blue="0.9" /></text>
-	</element>
-	<element name="text_l3">
-		<rect><color red="0.3" green="0.1" blue="0.0" /></rect>
-		<text string="C"><color red="0.88" green="0.88" blue="0.9" /></text>
-	</element>
-	<element name="text_l4">
-		<rect><color red="0.3" green="0.1" blue="0.0" /></rect>
-		<text string="D"><color red="0.88" green="0.88" blue="0.9" /></text>
-	</element>
-	<element name="text_l5">
-		<rect><color red="0.3" green="0.1" blue="0.0" /></rect>
-		<text string="E"><color red="0.88" green="0.88" blue="0.9" /></text>
-	</element>
-	<element name="text_l6">
-		<rect><color red="0.3" green="0.1" blue="0.0" /></rect>
-		<text string="F"><color red="0.88" green="0.88" blue="0.9" /></text>
-	</element>
-	<element name="text_l7">
-		<rect><color red="0.3" green="0.1" blue="0.0" /></rect>
-		<text string="G"><color red="0.88" green="0.88" blue="0.9" /></text>
-	</element>
-	<element name="text_l8">
-		<rect><color red="0.3" green="0.1" blue="0.0" /></rect>
-		<text string="H"><color red="0.88" green="0.88" blue="0.9" /></text>
-	</element>
-
-	<element name="text_n1">
-		<rect><color red="0.3" green="0.1" blue="0.0" /></rect>
-		<text string="1"><color red="0.88" green="0.88" blue="0.9" /></text>
-	</element>
-	<element name="text_n2">
-		<rect><color red="0.3" green="0.1" blue="0.0" /></rect>
-		<text string="2"><color red="0.88" green="0.88" blue="0.9" /></text>
-	</element>
-	<element name="text_n3">
-		<rect><color red="0.3" green="0.1" blue="0.0" /></rect>
-		<text string="3"><color red="0.88" green="0.88" blue="0.9" /></text>
-	</element>
-	<element name="text_n4">
-		<rect><color red="0.3" green="0.1" blue="0.0" /></rect>
-		<text string="4"><color red="0.88" green="0.88" blue="0.9" /></text>
-	</element>
-	<element name="text_n5">
-		<rect><color red="0.3" green="0.1" blue="0.0" /></rect>
-		<text string="5"><color red="0.88" green="0.88" blue="0.9" /></text>
-	</element>
-	<element name="text_n6">
-		<rect><color red="0.3" green="0.1" blue="0.0" /></rect>
-		<text string="6"><color red="0.88" green="0.88" blue="0.9" /></text>
-	</element>
-	<element name="text_n7">
-		<rect><color red="0.3" green="0.1" blue="0.0" /></rect>
-		<text string="7"><color red="0.88" green="0.88" blue="0.9" /></text>
-	</element>
-	<element name="text_n8">
-		<rect><color red="0.3" green="0.1" blue="0.0" /></rect>
-		<text string="8"><color red="0.88" green="0.88" blue="0.9" /></text>
-	</element>
-
-	<element name="text_ll">
-		<rect><color red="0.88" green="0.88" blue="0.9" /></rect>
-		<text string="WHITE"><color red="0.05" green="0.05" blue="0.05" /></text>
-	</element>
-	<element name="text_lr">
-		<rect><color red="0.88" green="0.88" blue="0.9" /></rect>
-		<text string="BLACK"><color red="0.05" green="0.05" blue="0.05" /></text>
-	</element>
-
-	<element name="text_from">
-		<rect><color red="0.88" green="0.88" blue="0.9" /></rect>
-		<text string="FROM"><color red="0.0" green="0.0" blue="0.0" /></text>
-	</element>
-	<element name="text_to">
-		<rect><color red="0.88" green="0.88" blue="0.9" /></rect>
-		<text string="TO"><color red="0.0" green="0.0" blue="0.0" /></text>
-	</element>
-	<element name="text_time">
-		<rect><color red="0.88" green="0.88" blue="0.9" /></rect>
-		<text string="TIME" align="1"><color red="0.0" green="0.0" blue="0.0" /></text>
-	</element>
-	<element name="text_twhite">
-		<rect><color red="0.88" green="0.88" blue="0.9" /></rect>
-		<text string="WHITE" align="1"><color red="0.0" green="0.0" blue="0.0" /></text>
-	</element>
-	<element name="text_tblack">
-		<rect><color red="0.88" green="0.88" blue="0.9" /></rect>
-		<text string="BLACK" align="1"><color red="0.0" green="0.0" blue="0.0" /></text>
-	</element>
-	<element name="text_white">
-		<rect><color red="0.88" green="0.88" blue="0.9" /></rect>
-		<text string="WHITE"><color red="0.0" green="0.0" blue="0.0" /></text>
-	</element>
-	<element name="text_black">
-		<rect><color red="0.88" green="0.88" blue="0.9" /></rect>
-		<text string="BLACK"><color red="0.0" green="0.0" blue="0.0" /></text>
-	</element>
-
-	<element name="text_u1">
-		<rect><color red="0.88" green="0.88" blue="0.9" /></rect>
-		<text string="CHECK"><color red="0.05" green="0.05" blue="0.05" /></text>
-	</element>
-	<element name="text_u2a">
-		<rect><color red="0.88" green="0.88" blue="0.9" /></rect>
-		<text string="CHESSmate"><color red="0.05" green="0.05" blue="0.05" /></text>
-	</element>
-	<element name="text_u2b">
-		<rect><color red="0.88" green="0.88" blue="0.9" /></rect>
-		<text string="LOSES"><color red="0.05" green="0.05" blue="0.05" /></text>
-	</element>
-	<element name="text_u3">
-		<rect><color red="0.88" green="0.88" blue="0.9" /></rect>
-		<text string="CHESSmate" align="1"><color red="0.05" green="0.05" blue="0.05" /></text>
-	</element>
-	<element name="text_u4">
-		<rect><color red="0.88" green="0.88" blue="0.9" /></rect>
-		<text string="PLAYING"><color red="0.05" green="0.05" blue="0.05" /></text>
-	</element>
-	<element name="text_u5">
-		<rect><color red="0.88" green="0.88" blue="0.9" /></rect>
-		<text string="IS"><color red="0.05" green="0.05" blue="0.05" /></text>
-	</element>
-
-	<element name="text_m1">
-		<rect><color red="0.88" green="0.88" blue="0.9" /></rect>
-		<text string="NEW GAME"><color red="0.05" green="0.05" blue="0.05" /></text>
-	</element>
-	<element name="text_m2">
-		<rect><color red="0.88" green="0.88" blue="0.9" /></rect>
-		<text string="CLEAR"><color red="0.05" green="0.05" blue="0.05" /></text>
-	</element>
-	<element name="text_m3">
-		<rect><color red="0.88" green="0.88" blue="0.9" /></rect>
-		<text string="ENTER"><color red="0.05" green="0.05" blue="0.05" /></text>
-	</element>
-	<element name="text_up">
-		<rect><color red="0.3" green="0.1" blue="0.0" /></rect>
-		<text string="&#x2191;"><color red="0.88" green="0.88" blue="0.9" /></text>
-	</element>
-
-	<element name="text_l2a">
-		<rect><color red="0.88" green="0.88" blue="0.9" /></rect>
-		<text string="BOARD"><color red="0.05" green="0.05" blue="0.05" /></text>
-	</element>
-	<element name="text_l3a">
-		<rect><color red="0.88" green="0.88" blue="0.9" /></rect>
-		<text string="CHESS"><color red="0.05" green="0.05" blue="0.05" /></text>
-	</element>
-	<element name="text_l4a">
-		<rect><color red="0.88" green="0.88" blue="0.9" /></rect>
-		<text string="DISPLAY"><color red="0.05" green="0.05" blue="0.05" /></text>
-	</element>
-	<element name="text_l5a">
-		<rect><color red="0.88" green="0.88" blue="0.9" /></rect>
-		<text string="STOP"><color red="0.05" green="0.05" blue="0.05" /></text>
-	</element>
-	<element name="text_l6a">
-		<rect><color red="0.88" green="0.88" blue="0.9" /></rect>
-		<text string="SKILL"><color red="0.05" green="0.05" blue="0.05" /></text>
-	</element>
-	<element name="text_l7a">
-		<rect><color red="0.88" green="0.88" blue="0.9" /></rect>
-		<text string="GAME"><color red="0.05" green="0.05" blue="0.05" /></text>
-	</element>
-
-	<element name="text_l2b">
-		<rect><color red="0.88" green="0.88" blue="0.9" /></rect>
-		<text string="VERIFY"><color red="0.05" green="0.05" blue="0.05" /></text>
-	</element>
-	<element name="text_l3b">
-		<rect><color red="0.88" green="0.88" blue="0.9" /></rect>
-		<text string="CLOCK"><color red="0.05" green="0.05" blue="0.05" /></text>
-	</element>
-	<element name="text_l4b">
-		<rect><color red="0.88" green="0.88" blue="0.9" /></rect>
-		<text string="TIME"><color red="0.05" green="0.05" blue="0.05" /></text>
-	</element>
-	<element name="text_l5b">
-		<rect><color red="0.88" green="0.88" blue="0.9" /></rect>
-		<text string="CLOCK"><color red="0.05" green="0.05" blue="0.05" /></text>
-	</element>
-	<element name="text_l6b">
-		<rect><color red="0.88" green="0.88" blue="0.9" /></rect>
-		<text string="LEVEL"><color red="0.05" green="0.05" blue="0.05" /></text>
-	</element>
-	<element name="text_l7b">
-		<rect><color red="0.88" green="0.88" blue="0.9" /></rect>
-		<text string="MOVES"><color red="0.05" green="0.05" blue="0.05" /></text>
-	</element>
+	<element name="text_l1"><text string="A"><color red="0.88" green="0.88" blue="0.9" /></text></element>
+	<element name="text_l2"><text string="B"><color red="0.88" green="0.88" blue="0.9" /></text></element>
+	<element name="text_l3"><text string="C"><color red="0.88" green="0.88" blue="0.9" /></text></element>
+	<element name="text_l4"><text string="D"><color red="0.88" green="0.88" blue="0.9" /></text></element>
+	<element name="text_l5"><text string="E"><color red="0.88" green="0.88" blue="0.9" /></text></element>
+	<element name="text_l6"><text string="F"><color red="0.88" green="0.88" blue="0.9" /></text></element>
+	<element name="text_l7"><text string="G"><color red="0.88" green="0.88" blue="0.9" /></text></element>
+	<element name="text_l8"><text string="H"><color red="0.88" green="0.88" blue="0.9" /></text></element>
+
+	<element name="text_n1"><text string="1"><color red="0.88" green="0.88" blue="0.9" /></text></element>
+	<element name="text_n2"><text string="2"><color red="0.88" green="0.88" blue="0.9" /></text></element>
+	<element name="text_n3"><text string="3"><color red="0.88" green="0.88" blue="0.9" /></text></element>
+	<element name="text_n4"><text string="4"><color red="0.88" green="0.88" blue="0.9" /></text></element>
+	<element name="text_n5"><text string="5"><color red="0.88" green="0.88" blue="0.9" /></text></element>
+	<element name="text_n6"><text string="6"><color red="0.88" green="0.88" blue="0.9" /></text></element>
+	<element name="text_n7"><text string="7"><color red="0.88" green="0.88" blue="0.9" /></text></element>
+	<element name="text_n8"><text string="8"><color red="0.88" green="0.88" blue="0.9" /></text></element>
+
+	<element name="text_ll"><text string="WHITE"><color red="0.05" green="0.05" blue="0.05" /></text></element>
+	<element name="text_lr"><text string="BLACK"><color red="0.05" green="0.05" blue="0.05" /></text></element>
+
+	<element name="text_from"><text string="FROM"><color red="0.0" green="0.0" blue="0.0" /></text></element>
+	<element name="text_to"><text string="TO"><color red="0.0" green="0.0" blue="0.0" /></text></element>
+	<element name="text_time"><text string="TIME" align="1"><color red="0.0" green="0.0" blue="0.0" /></text></element>
+	<element name="text_twhite"><text string="WHITE" align="1"><color red="0.0" green="0.0" blue="0.0" /></text></element>
+	<element name="text_tblack"><text string="BLACK" align="1"><color red="0.0" green="0.0" blue="0.0" /></text></element>
+	<element name="text_white"><text string="WHITE"><color red="0.0" green="0.0" blue="0.0" /></text></element>
+	<element name="text_black"><text string="BLACK"><color red="0.0" green="0.0" blue="0.0" /></text></element>
+
+	<element name="text_u1"><text string="CHECK"><color red="0.05" green="0.05" blue="0.05" /></text></element>
+	<element name="text_u2a"><text string="CHESSmate"><color red="0.05" green="0.05" blue="0.05" /></text></element>
+	<element name="text_u2b"><text string="LOSES"><color red="0.05" green="0.05" blue="0.05" /></text></element>
+	<element name="text_u3"><text string="CHESSmate" align="1"><color red="0.05" green="0.05" blue="0.05" /></text></element>
+	<element name="text_u4"><text string="PLAYING"><color red="0.05" green="0.05" blue="0.05" /></text></element>
+	<element name="text_u5"><text string="IS"><color red="0.05" green="0.05" blue="0.05" /></text></element>
+
+	<element name="text_m1"><text string="NEW GAME"><color red="0.05" green="0.05" blue="0.05" /></text></element>
+	<element name="text_m2"><text string="CLEAR"><color red="0.05" green="0.05" blue="0.05" /></text></element>
+	<element name="text_m3"><text string="ENTER"><color red="0.05" green="0.05" blue="0.05" /></text></element>
+	<element name="text_up"><text string="&#x2191;"><color red="0.88" green="0.88" blue="0.9" /></text></element> <!-- arrow up -->
+
+	<element name="text_l2a"><text string="BOARD"><color red="0.05" green="0.05" blue="0.05" /></text></element>
+	<element name="text_l3a"><text string="CHESS"><color red="0.05" green="0.05" blue="0.05" /></text></element>
+	<element name="text_l4a"><text string="DISPLAY"><color red="0.05" green="0.05" blue="0.05" /></text></element>
+	<element name="text_l5a"><text string="STOP"><color red="0.05" green="0.05" blue="0.05" /></text></element>
+	<element name="text_l6a"><text string="SKILL"><color red="0.05" green="0.05" blue="0.05" /></text></element>
+	<element name="text_l7a"><text string="GAME"><color red="0.05" green="0.05" blue="0.05" /></text></element>
+
+	<element name="text_l2b"><text string="VERIFY"><color red="0.05" green="0.05" blue="0.05" /></text></element>
+	<element name="text_l3b"><text string="CLOCK"><color red="0.05" green="0.05" blue="0.05" /></text></element>
+	<element name="text_l4b"><text string="TIME"><color red="0.05" green="0.05" blue="0.05" /></text></element>
+	<element name="text_l5b"><text string="CLOCK"><color red="0.05" green="0.05" blue="0.05" /></text></element>
+	<element name="text_l6b"><text string="LEVEL"><color red="0.05" green="0.05" blue="0.05" /></text></element>
+	<element name="text_l7b"><text string="MOVES"><color red="0.05" green="0.05" blue="0.05" /></text></element>
 
 
 <!-- build screen -->
diff --git a/src/mame/layout/chessmst.lay b/src/mame/layout/chessmst.lay
index 2d44e5c0965..b54f9fce212 100644
--- a/src/mame/layout/chessmst.lay
+++ b/src/mame/layout/chessmst.lay
@@ -55,56 +55,58 @@ license:CC0-1.0
 
 	<element name="whitew"><rect><color red="1" green="1" blue="1" /></rect></element>
 
-	<element name="text_1"> <rect><color red="0.56" green="0.33" blue="0.12" /></rect>    <text string="1"><color red="0.87" green="0.87" blue="0.84" /></text> </element>
-	<element name="text_2"> <rect><color red="0.56" green="0.33" blue="0.12" /></rect>    <text string="2"><color red="0.87" green="0.87" blue="0.84" /></text> </element>
-	<element name="text_3"> <rect><color red="0.56" green="0.33" blue="0.12" /></rect>    <text string="3"><color red="0.87" green="0.87" blue="0.84" /></text> </element>
-	<element name="text_4"> <rect><color red="0.56" green="0.33" blue="0.12" /></rect>    <text string="4"><color red="0.87" green="0.87" blue="0.84" /></text> </element>
-	<element name="text_5"> <rect><color red="0.56" green="0.33" blue="0.12" /></rect>    <text string="5"><color red="0.87" green="0.87" blue="0.84" /></text> </element>
-	<element name="text_6"> <rect><color red="0.56" green="0.33" blue="0.12" /></rect>    <text string="6"><color red="0.87" green="0.87" blue="0.84" /></text> </element>
-	<element name="text_7"> <rect><color red="0.56" green="0.33" blue="0.12" /></rect>    <text string="7"><color red="0.87" green="0.87" blue="0.84" /></text> </element>
-	<element name="text_8"> <rect><color red="0.56" green="0.33" blue="0.12" /></rect>    <text string="8"><color red="0.87" green="0.87" blue="0.84" /></text> </element>
-
-	<element name="text_a"> <rect><color red="0.56" green="0.33" blue="0.12" /></rect>    <text string="A"><color red="0.87" green="0.87" blue="0.84" /></text> </element>
-	<element name="text_b"> <rect><color red="0.56" green="0.33" blue="0.12" /></rect>    <text string="B"><color red="0.87" green="0.87" blue="0.84" /></text> </element>
-	<element name="text_c"> <rect><color red="0.56" green="0.33" blue="0.12" /></rect>    <text string="C"><color red="0.87" green="0.87" blue="0.84" /></text> </element>
-	<element name="text_d"> <rect><color red="0.56" green="0.33" blue="0.12" /></rect>    <text string="D"><color red="0.87" green="0.87" blue="0.84" /></text> </element>
-	<element name="text_e"> <rect><color red="0.56" green="0.33" blue="0.12" /></rect>    <text string="E"><color red="0.87" green="0.87" blue="0.84" /></text> </element>
-	<element name="text_f"> <rect><color red="0.56" green="0.33" blue="0.12" /></rect>    <text string="F"><color red="0.87" green="0.87" blue="0.84" /></text> </element>
-	<element name="text_g"> <rect><color red="0.56" green="0.33" blue="0.12" /></rect>    <text string="G"><color red="0.87" green="0.87" blue="0.84" /></text> </element>
-	<element name="text_h"> <rect><color red="0.56" green="0.33" blue="0.12" /></rect>    <text string="H"><color red="0.87" green="0.87" blue="0.84" /></text> </element>
-
-	<element name="text_b1">            <rect><color red="0.84" green="0.75" blue="0.50" /></rect>    <text string="0"><color red="0.01" green="0.01" blue="0.01" /></text> </element>
-	<element name="text_b2">            <rect><color red="0.84" green="0.75" blue="0.50" /></rect>    <text string="1"><color red="0.01" green="0.01" blue="0.01" /></text> </element>
-	<element name="text_b3">            <rect><color red="0.84" green="0.75" blue="0.50" /></rect>    <text string="2"><color red="0.01" green="0.01" blue="0.01" /></text> </element>
-	<element name="text_b4">            <rect><color red="0.84" green="0.75" blue="0.50" /></rect>    <text string="3"><color red="0.01" green="0.01" blue="0.01" /></text> </element>
-	<element name="text_b5">            <rect><color red="0.84" green="0.75" blue="0.50" /></rect>    <text string="4"><color red="0.01" green="0.01" blue="0.01" /></text> </element>
-	<element name="text_b6">            <rect><color red="0.84" green="0.75" blue="0.50" /></rect>    <text string="5"><color red="0.01" green="0.01" blue="0.01" /></text> </element>
-	<element name="text_b7">            <rect><color red="0.84" green="0.75" blue="0.50" /></rect>    <text string="6"><color red="0.01" green="0.01" blue="0.01" /></text> </element>
-	<element name="text_b8">            <rect><color red="0.84" green="0.75" blue="0.50" /></rect>    <text string="7"><color red="0.01" green="0.01" blue="0.01" /></text> </element>
-	<element name="text_chessmaster">   <rect><color red="0.84" green="0.75" blue="0.50" /></rect>    <text string="CHESS-MASTER" ><color red="0.17" green="0.15" blue="0.15" /></text> </element>
-	<element name="text_newgame">       <rect><color red="0.84" green="0.75" blue="0.50" /></rect>    <text string="NEW GAME"     ><color red="0.17" green="0.15" blue="0.15" /></text> </element>
-	<element name="text_level">         <rect><color red="0.84" green="0.75" blue="0.50" /></rect>    <text string="LEVEL"        ><color red="0.17" green="0.15" blue="0.15" /></text> </element>
-	<element name="text_color">         <rect><color red="0.84" green="0.75" blue="0.50" /></rect>    <text string="COLOR"        ><color red="0.17" green="0.15" blue="0.15" /></text> </element>
-	<element name="text_board">         <rect><color red="0.84" green="0.75" blue="0.50" /></rect>    <text string="BOARD"        ><color red="0.17" green="0.15" blue="0.15" /></text> </element>
-	<element name="text_selfplay">      <rect><color red="0.84" green="0.75" blue="0.50" /></rect>    <text string="SELF PLAY"    ><color red="0.17" green="0.15" blue="0.15" /></text> </element>
-	<element name="text_referee">       <rect><color red="0.84" green="0.75" blue="0.50" /></rect>    <text string="REFEREE"      ><color red="0.17" green="0.15" blue="0.15" /></text> </element>
-	<element name="text_random">        <rect><color red="0.84" green="0.75" blue="0.50" /></rect>    <text string="RANDOM"       ><color red="0.17" green="0.15" blue="0.15" /></text> </element>
-	<element name="text_hint">          <rect><color red="0.84" green="0.75" blue="0.50" /></rect>    <text string="HINT"         ><color red="0.17" green="0.15" blue="0.15" /></text> </element>
-	<element name="text_white">         <rect><color red="0.84" green="0.75" blue="0.50" /></rect>    <text string="WHITE"        align="2"><color red="0.17" green="0.15" blue="0.15" /></text> </element>
-	<element name="text_black">         <rect><color red="0.84" green="0.75" blue="0.50" /></rect>    <text string="BLACK"        align="2"><color red="0.17" green="0.15" blue="0.15" /></text> </element>
-	<element name="text_king" >         <image file="chess/wk.svg"/></element>
-	<element name="text_queen" >        <image file="chess/wq.svg"/></element>
-	<element name="text_rook" >         <image file="chess/wr.svg"/></element>
-	<element name="text_bishop" >       <image file="chess/wb.svg"/></element>
-	<element name="text_knight" >       <image file="chess/wn.svg"/></element>
-	<element name="text_pawn" >         <image file="chess/wp.svg"/></element>
-	<element name="text_change">        <rect><color red="0.84" green="0.75" blue="0.50" /></rect>    <text string="CHANGE"       align="2"><color red="0.17" green="0.15" blue="0.15" /></text> </element>
-	<element name="text_board1">        <rect><color red="0.84" green="0.75" blue="0.50" /></rect>    <text string="BOARD"        align="1"><color red="0.17" green="0.15" blue="0.15" /></text> </element>
-	<element name="text_halt">          <rect><color red="0.84" green="0.75" blue="0.50" /></rect>    <text string="HALT"         ><color red="0.17" green="0.15" blue="0.15" /></text> </element>
-	<element name="text_reset">         <rect><color red="0.84" green="0.75" blue="0.50" /></rect>    <text string="RESET"        ><color red="0.17" green="0.15" blue="0.15" /></text> </element>
-	<element name="text_check">         <rect><color red="0.84" green="0.75" blue="0.50" /></rect>    <text string="CHECK"        ><color red="0.17" green="0.15" blue="0.15" /></text> </element>
-	<element name="text_your">          <rect><color red="0.84" green="0.75" blue="0.50" /></rect>    <text string="YOUR"         ><color red="0.17" green="0.15" blue="0.15" /></text> </element>
-	<element name="text_cms">           <rect><color red="0.84" green="0.75" blue="0.50" /></rect>    <text string="CM'S"         ><color red="0.17" green="0.15" blue="0.15" /></text> </element>
+	<element name="text_1"> <text string="1"><color red="0.87" green="0.87" blue="0.84" /></text> </element>
+	<element name="text_2"> <text string="2"><color red="0.87" green="0.87" blue="0.84" /></text> </element>
+	<element name="text_3"> <text string="3"><color red="0.87" green="0.87" blue="0.84" /></text> </element>
+	<element name="text_4"> <text string="4"><color red="0.87" green="0.87" blue="0.84" /></text> </element>
+	<element name="text_5"> <text string="5"><color red="0.87" green="0.87" blue="0.84" /></text> </element>
+	<element name="text_6"> <text string="6"><color red="0.87" green="0.87" blue="0.84" /></text> </element>
+	<element name="text_7"> <text string="7"><color red="0.87" green="0.87" blue="0.84" /></text> </element>
+	<element name="text_8"> <text string="8"><color red="0.87" green="0.87" blue="0.84" /></text> </element>
+
+	<element name="text_a"> <text string="A"><color red="0.87" green="0.87" blue="0.84" /></text> </element>
+	<element name="text_b"> <text string="B"><color red="0.87" green="0.87" blue="0.84" /></text> </element>
+	<element name="text_c"> <text string="C"><color red="0.87" green="0.87" blue="0.84" /></text> </element>
+	<element name="text_d"> <text string="D"><color red="0.87" green="0.87" blue="0.84" /></text> </element>
+	<element name="text_e"> <text string="E"><color red="0.87" green="0.87" blue="0.84" /></text> </element>
+	<element name="text_f"> <text string="F"><color red="0.87" green="0.87" blue="0.84" /></text> </element>
+	<element name="text_g"> <text string="G"><color red="0.87" green="0.87" blue="0.84" /></text> </element>
+	<element name="text_h"> <text string="H"><color red="0.87" green="0.87" blue="0.84" /></text> </element>
+
+	<element name="text_b1">       <text string="0"><color red="0.01" green="0.01" blue="0.01" /></text> </element>
+	<element name="text_b2">       <text string="1"><color red="0.01" green="0.01" blue="0.01" /></text> </element>
+	<element name="text_b3">       <text string="2"><color red="0.01" green="0.01" blue="0.01" /></text> </element>
+	<element name="text_b4">       <text string="3"><color red="0.01" green="0.01" blue="0.01" /></text> </element>
+	<element name="text_b5">       <text string="4"><color red="0.01" green="0.01" blue="0.01" /></text> </element>
+	<element name="text_b6">       <text string="5"><color red="0.01" green="0.01" blue="0.01" /></text> </element>
+	<element name="text_b7">       <text string="6"><color red="0.01" green="0.01" blue="0.01" /></text> </element>
+	<element name="text_b8">       <text string="7"><color red="0.01" green="0.01" blue="0.01" /></text> </element>
+
+	<element name="text_king">     <image file="chess/wk.svg"/></element>
+	<element name="text_queen">    <image file="chess/wq.svg"/></element>
+	<element name="text_rook">     <image file="chess/wr.svg"/></element>
+	<element name="text_bishop">   <image file="chess/wb.svg"/></element>
+	<element name="text_knight">   <image file="chess/wn.svg"/></element>
+	<element name="text_pawn">     <image file="chess/wp.svg"/></element>
+
+	<element name="text_chessm">   <text string="CHESS-MASTER" ><color red="0.17" green="0.15" blue="0.15" /></text> </element>
+	<element name="text_newgame">  <text string="NEW GAME"     ><color red="0.17" green="0.15" blue="0.15" /></text> </element>
+	<element name="text_level">    <text string="LEVEL"        ><color red="0.17" green="0.15" blue="0.15" /></text> </element>
+	<element name="text_color">    <text string="COLOR"        ><color red="0.17" green="0.15" blue="0.15" /></text> </element>
+	<element name="text_board">    <text string="BOARD"        ><color red="0.17" green="0.15" blue="0.15" /></text> </element>
+	<element name="text_selfplay"> <text string="SELF PLAY"    ><color red="0.17" green="0.15" blue="0.15" /></text> </element>
+	<element name="text_referee">  <text string="REFEREE"      ><color red="0.17" green="0.15" blue="0.15" /></text> </element>
+	<element name="text_random">   <text string="RANDOM"       ><color red="0.17" green="0.15" blue="0.15" /></text> </element>
+	<element name="text_hint">     <text string="HINT"         ><color red="0.17" green="0.15" blue="0.15" /></text> </element>
+	<element name="text_white">    <text string="WHITE"        align="2"><color red="0.17" green="0.15" blue="0.15" /></text> </element>
+	<element name="text_black">    <text string="BLACK"        align="2"><color red="0.17" green="0.15" blue="0.15" /></text> </element>
+	<element name="text_change">   <text string="CHANGE"       align="2"><color red="0.17" green="0.15" blue="0.15" /></text> </element>
+	<element name="text_board1">   <text string="BOARD"        align="1"><color red="0.17" green="0.15" blue="0.15" /></text> </element>
+	<element name="text_halt">     <text string="HALT"         ><color red="0.17" green="0.15" blue="0.15" /></text> </element>
+	<element name="text_reset">    <text string="RESET"        ><color red="0.17" green="0.15" blue="0.15" /></text> </element>
+	<element name="text_check">    <text string="CHECK"        ><color red="0.17" green="0.15" blue="0.15" /></text> </element>
+	<element name="text_your">     <text string="YOUR"         ><color red="0.17" green="0.15" blue="0.15" /></text> </element>
+	<element name="text_cms">      <text string="CM'S"         ><color red="0.17" green="0.15" blue="0.15" /></text> </element>
 
 
 <!-- sb board -->
@@ -274,43 +276,23 @@ license:CC0-1.0
 	<element name="text_uit1"><text string="S.BOARD"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uit2"><text string="INTERFACE"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uib1"><text string="BOARD:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uib2">
-		<rect><color red="0.84" green="0.75" blue="0.50" /></rect>
-		<text string="RESET"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uib3">
-		<rect><color red="0.84" green="0.75" blue="0.50" /></rect>
-		<text string="CLEAR"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uib2"><text string="RESET"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uib3"><text string="CLEAR"><color red="0.01" green="0.01" blue="0.01" /></text></element>
 	<element name="text_uis1"><text string="SPAWN:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uih1"><text string="HAND:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uih2">
-		<rect><color red="0.84" green="0.75" blue="0.50" /></rect>
-		<text string="REMOVE"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uih2"><text string="REMOVE"><color red="0.01" green="0.01" blue="0.01" /></text></element>
 	<element name="text_uiu1"><text string="UNDO:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uiu2a">
-		<rect><color red="0.84" green="0.75" blue="0.50" /></rect>
-		<text string=" &lt;&lt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2b">
-		<rect><color red="0.84" green="0.75" blue="0.50" /></rect>
-		<text string=" &lt;  "><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2c">
-		<rect><color red="0.84" green="0.75" blue="0.50" /></rect>
-		<text string="   &gt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2d">
-		<rect><color red="0.84" green="0.75" blue="0.50" /></rect>
-		<text string=" &gt;&gt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uiu2a"><text string=" &lt;&lt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2b"><text string=" &lt;  "><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2c"><text string="   &gt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2d"><text string=" &gt;&gt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu3b"><text string="/"><color red="0.81" green="0.8" blue="0.79" /></text></element>
+
 	<element name="text_uiu3a" defstate="0">
 		<simplecounter maxstate="999" digits="1" align="2">
 			<color red="0.81" green="0.8" blue="0.79" />
 		</simplecounter>
 	</element>
-	<element name="text_uiu3b"><text string="/"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uiu3c" defstate="0">
 		<simplecounter maxstate="999" digits="1" align="1">
 			<color red="0.81" green="0.8" blue="0.79" />
@@ -438,7 +420,7 @@ license:CC0-1.0
 		<element ref="text_white">   <bounds x="106" y="63" width="6" height="1.8" /></element>
 		<element ref="text_black">   <bounds x="106" y="70" width="6" height="1.8" /></element>
 
-		<element ref="text_chessmaster"><bounds x="105.5" y="2" width="22" height="3" /></element>
+		<element ref="text_chessm">  <bounds x="105.5"  y="2"  width="22" height="3" /></element>
 		<element ref="text_newgame"> <bounds x="114"    y="18" width="12" height="1.8" /></element>
 		<element ref="text_level">   <bounds x="114"    y="25" width="12" height="1.8" /></element>
 		<element ref="text_color">   <bounds x="114"    y="32" width="12" height="1.8" /></element>
diff --git a/src/mame/layout/chessmstdm.lay b/src/mame/layout/chessmstdm.lay
index 7979b87742a..4e7ac46a41a 100644
--- a/src/mame/layout/chessmstdm.lay
+++ b/src/mame/layout/chessmstdm.lay
@@ -55,42 +55,42 @@ license:CC0-1.0
 		<rect><color alpha="0" /></rect>
 	</element>
 
-	<element name="text_1"> <rect><color red="0.84" green="0.75" blue="0.50" /></rect>    <text string="1"><color red="0.01" green="0.01" blue="0.01" /></text> </element>
-	<element name="text_2"> <rect><color red="0.84" green="0.75" blue="0.50" /></rect>    <text string="2"><color red="0.01" green="0.01" blue="0.01" /></text> </element>
-	<element name="text_3"> <rect><color red="0.84" green="0.75" blue="0.50" /></rect>    <text string="3"><color red="0.01" green="0.01" blue="0.01" /></text> </element>
-	<element name="text_4"> <rect><color red="0.84" green="0.75" blue="0.50" /></rect>    <text string="4"><color red="0.01" green="0.01" blue="0.01" /></text> </element>
-	<element name="text_5"> <rect><color red="0.84" green="0.75" blue="0.50" /></rect>    <text string="5"><color red="0.01" green="0.01" blue="0.01" /></text> </element>
-	<element name="text_6"> <rect><color red="0.84" green="0.75" blue="0.50" /></rect>    <text string="6"><color red="0.01" green="0.01" blue="0.01" /></text> </element>
-	<element name="text_7"> <rect><color red="0.84" green="0.75" blue="0.50" /></rect>    <text string="7"><color red="0.01" green="0.01" blue="0.01" /></text> </element>
-	<element name="text_8"> <rect><color red="0.84" green="0.75" blue="0.50" /></rect>    <text string="8"><color red="0.01" green="0.01" blue="0.01" /></text> </element>
-
-	<element name="text_a"> <rect><color red="0.84" green="0.75" blue="0.50" /></rect>    <text string="A"><color red="0.01" green="0.01" blue="0.01" /></text> </element>
-	<element name="text_b"> <rect><color red="0.84" green="0.75" blue="0.50" /></rect>    <text string="B"><color red="0.01" green="0.01" blue="0.01" /></text> </element>
-	<element name="text_c"> <rect><color red="0.84" green="0.75" blue="0.50" /></rect>    <text string="C"><color red="0.01" green="0.01" blue="0.01" /></text> </element>
-	<element name="text_d"> <rect><color red="0.84" green="0.75" blue="0.50" /></rect>    <text string="D"><color red="0.01" green="0.01" blue="0.01" /></text> </element>
-	<element name="text_e"> <rect><color red="0.84" green="0.75" blue="0.50" /></rect>    <text string="E"><color red="0.01" green="0.01" blue="0.01" /></text> </element>
-	<element name="text_f"> <rect><color red="0.84" green="0.75" blue="0.50" /></rect>    <text string="F"><color red="0.01" green="0.01" blue="0.01" /></text> </element>
-	<element name="text_g"> <rect><color red="0.84" green="0.75" blue="0.50" /></rect>    <text string="G"><color red="0.01" green="0.01" blue="0.01" /></text> </element>
-	<element name="text_h"> <rect><color red="0.84" green="0.75" blue="0.50" /></rect>    <text string="H"><color red="0.01" green="0.01" blue="0.01" /></text> </element>
-
-	<element name="text_chessmaster"> <rect><color red="0.84" green="0.75" blue="0.50" /></rect>    <text string="CHESS-MASTER" align="1"><color red="0.17" green="0.15" blue="0.15" /></text> </element>
-	<element name="text_diamond">     <rect><color red="0.84" green="0.75" blue="0.50" /></rect>    <text string="diamond"      align="1"><color red="0.17" green="0.15" blue="0.15" /></text> </element>
-	<element name="text_monitor">     <rect><color red="0.84" green="0.75" blue="0.50" /></rect>    <text string="MONITOR"      align="1"><color red="0.17" green="0.15" blue="0.15" /></text> </element>
-	<element name="text_view">        <rect><color red="0.84" green="0.75" blue="0.50" /></rect>    <text string="VIEW"         align="1"><color red="0.17" green="0.15" blue="0.15" /></text> </element>
-	<element name="text_reset">       <rect><color red="0.84" green="0.75" blue="0.50" /></rect>    <text string="RESET"        align="1"><color red="0.17" green="0.15" blue="0.15" /></text> </element>
-	<element name="text_selection">   <rect><color red="0.84" green="0.75" blue="0.50" /></rect>    <text string="SELECTION"    align="1"><color red="0.17" green="0.15" blue="0.15" /></text> </element>
-	<element name="text_dialogue">    <rect><color red="0.84" green="0.75" blue="0.50" /></rect>    <text string="DIALOGUE"     align="1"><color red="0.17" green="0.15" blue="0.15" /></text> </element>
-	<element name="text_function">    <rect><color red="0.84" green="0.75" blue="0.50" /></rect>    <text string="FUNCTION"     align="1"><color red="0.17" green="0.15" blue="0.15" /></text> </element>
-	<element name="text_notation">    <rect><color red="0.84" green="0.75" blue="0.50" /></rect>    <text string="NOTATION"     align="1"><color red="0.17" green="0.15" blue="0.15" /></text> </element>
-	<element name="text_parameter">   <rect><color red="0.84" green="0.75" blue="0.50" /></rect>    <text string="PARAMETER"    align="1"><color red="0.17" green="0.15" blue="0.15" /></text> </element>
-	<element name="text_information"> <rect><color red="0.84" green="0.75" blue="0.50" /></rect>    <text string="INFORMATION"  align="1"><color red="0.17" green="0.15" blue="0.15" /></text> </element>
-	<element name="text_board">       <rect><color red="0.84" green="0.75" blue="0.50" /></rect>    <text string="BOARD"        align="1"><color red="0.17" green="0.15" blue="0.15" /></text> </element>
-	<element name="text_match">       <rect><color red="0.84" green="0.75" blue="0.50" /></rect>    <text string="MATCH"        align="1"><color red="0.17" green="0.15" blue="0.15" /></text> </element>
-	<element name="text_time">        <rect><color red="0.84" green="0.75" blue="0.50" /></rect>    <text string="TIME"         align="1"><color red="0.17" green="0.15" blue="0.15" /></text> </element>
-	<element name="text_enter">       <rect><color red="0.84" green="0.75" blue="0.50" /></rect>    <text string="ENTER"        align="1"><color red="0.17" green="0.15" blue="0.15" /></text> </element>
-	<element name="text_playmode">    <rect><color red="0.84" green="0.75" blue="0.50" /></rect>    <text string="PLAY MODE"    align="1"><color red="0.17" green="0.15" blue="0.15" /></text> </element>
-	<element name="text_move_fore">   <rect><color red="0.84" green="0.75" blue="0.50" /></rect>    <text string="MOVE FORE"             ><color red="0.17" green="0.15" blue="0.15" /></text> </element>
-	<element name="text_move_back">   <rect><color red="0.84" green="0.75" blue="0.50" /></rect>    <text string="MOVE BACK"             ><color red="0.17" green="0.15" blue="0.15" /></text> </element>
+	<element name="text_1"> <text string="1"><color red="0.01" green="0.01" blue="0.01" /></text> </element>
+	<element name="text_2"> <text string="2"><color red="0.01" green="0.01" blue="0.01" /></text> </element>
+	<element name="text_3"> <text string="3"><color red="0.01" green="0.01" blue="0.01" /></text> </element>
+	<element name="text_4"> <text string="4"><color red="0.01" green="0.01" blue="0.01" /></text> </element>
+	<element name="text_5"> <text string="5"><color red="0.01" green="0.01" blue="0.01" /></text> </element>
+	<element name="text_6"> <text string="6"><color red="0.01" green="0.01" blue="0.01" /></text> </element>
+	<element name="text_7"> <text string="7"><color red="0.01" green="0.01" blue="0.01" /></text> </element>
+	<element name="text_8"> <text string="8"><color red="0.01" green="0.01" blue="0.01" /></text> </element>
+
+	<element name="text_a"> <text string="A"><color red="0.01" green="0.01" blue="0.01" /></text> </element>
+	<element name="text_b"> <text string="B"><color red="0.01" green="0.01" blue="0.01" /></text> </element>
+	<element name="text_c"> <text string="C"><color red="0.01" green="0.01" blue="0.01" /></text> </element>
+	<element name="text_d"> <text string="D"><color red="0.01" green="0.01" blue="0.01" /></text> </element>
+	<element name="text_e"> <text string="E"><color red="0.01" green="0.01" blue="0.01" /></text> </element>
+	<element name="text_f"> <text string="F"><color red="0.01" green="0.01" blue="0.01" /></text> </element>
+	<element name="text_g"> <text string="G"><color red="0.01" green="0.01" blue="0.01" /></text> </element>
+	<element name="text_h"> <text string="H"><color red="0.01" green="0.01" blue="0.01" /></text> </element>
+
+	<element name="text_chessmaster"> <text string="CHESS-MASTER" align="1"><color red="0.17" green="0.15" blue="0.15" /></text> </element>
+	<element name="text_diamond">     <text string="diamond"      align="1"><color red="0.17" green="0.15" blue="0.15" /></text> </element>
+	<element name="text_monitor">     <text string="MONITOR"      align="1"><color red="0.17" green="0.15" blue="0.15" /></text> </element>
+	<element name="text_view">        <text string="VIEW"         align="1"><color red="0.17" green="0.15" blue="0.15" /></text> </element>
+	<element name="text_reset">       <text string="RESET"        align="1"><color red="0.17" green="0.15" blue="0.15" /></text> </element>
+	<element name="text_selection">   <text string="SELECTION"    align="1"><color red="0.17" green="0.15" blue="0.15" /></text> </element>
+	<element name="text_dialogue">    <text string="DIALOGUE"     align="1"><color red="0.17" green="0.15" blue="0.15" /></text> </element>
+	<element name="text_function">    <text string="FUNCTION"     align="1"><color red="0.17" green="0.15" blue="0.15" /></text> </element>
+	<element name="text_notation">    <text string="NOTATION"     align="1"><color red="0.17" green="0.15" blue="0.15" /></text> </element>
+	<element name="text_parameter">   <text string="PARAMETER"    align="1"><color red="0.17" green="0.15" blue="0.15" /></text> </element>
+	<element name="text_information"> <text string="INFORMATION"  align="1"><color red="0.17" green="0.15" blue="0.15" /></text> </element>
+	<element name="text_board">       <text string="BOARD"        align="1"><color red="0.17" green="0.15" blue="0.15" /></text> </element>
+	<element name="text_match">       <text string="MATCH"        align="1"><color red="0.17" green="0.15" blue="0.15" /></text> </element>
+	<element name="text_time">        <text string="TIME"         align="1"><color red="0.17" green="0.15" blue="0.15" /></text> </element>
+	<element name="text_enter">       <text string="ENTER"        align="1"><color red="0.17" green="0.15" blue="0.15" /></text> </element>
+	<element name="text_playmode">    <text string="PLAY MODE"    align="1"><color red="0.17" green="0.15" blue="0.15" /></text> </element>
+	<element name="text_move_fore">   <text string="MOVE FORE"             ><color red="0.17" green="0.15" blue="0.15" /></text> </element>
+	<element name="text_move_back">   <text string="MOVE BACK"             ><color red="0.17" green="0.15" blue="0.15" /></text> </element>
 
 
 <!-- sb board -->
@@ -260,43 +260,23 @@ license:CC0-1.0
 	<element name="text_uit1"><text string="S.BOARD"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uit2"><text string="INTERFACE"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uib1"><text string="BOARD:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uib2">
-		<rect><color red="0.84" green="0.75" blue="0.50" /></rect>
-		<text string="RESET"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uib3">
-		<rect><color red="0.84" green="0.75" blue="0.50" /></rect>
-		<text string="CLEAR"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uib2"><text string="RESET"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uib3"><text string="CLEAR"><color red="0.01" green="0.01" blue="0.01" /></text></element>
 	<element name="text_uis1"><text string="SPAWN:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uih1"><text string="HAND:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uih2">
-		<rect><color red="0.84" green="0.75" blue="0.50" /></rect>
-		<text string="REMOVE"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uih2"><text string="REMOVE"><color red="0.01" green="0.01" blue="0.01" /></text></element>
 	<element name="text_uiu1"><text string="UNDO:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uiu2a">
-		<rect><color red="0.84" green="0.75" blue="0.50" /></rect>
-		<text string=" &lt;&lt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2b">
-		<rect><color red="0.84" green="0.75" blue="0.50" /></rect>
-		<text string=" &lt;  "><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2c">
-		<rect><color red="0.84" green="0.75" blue="0.50" /></rect>
-		<text string="   &gt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2d">
-		<rect><color red="0.84" green="0.75" blue="0.50" /></rect>
-		<text string=" &gt;&gt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uiu2a"><text string=" &lt;&lt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2b"><text string=" &lt;  "><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2c"><text string="   &gt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2d"><text string=" &gt;&gt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu3b"><text string="/"><color red="0.81" green="0.8" blue="0.79" /></text></element>
+
 	<element name="text_uiu3a" defstate="0">
 		<simplecounter maxstate="999" digits="1" align="2">
 			<color red="0.81" green="0.8" blue="0.79" />
 		</simplecounter>
 	</element>
-	<element name="text_uiu3b"><text string="/"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uiu3c" defstate="0">
 		<simplecounter maxstate="999" digits="1" align="1">
 			<color red="0.81" green="0.8" blue="0.79" />
diff --git a/src/mame/layout/ck_master.lay b/src/mame/layout/ck_master.lay
deleted file mode 100644
index 60557ab6e22..00000000000
--- a/src/mame/layout/ck_master.lay
+++ /dev/null
@@ -1,450 +0,0 @@
-<?xml version="1.0"?>
-<!--
-license:CC0-1.0
--->
-<mamelayout version="2">
-
-<!-- define elements -->
-
-	<element name="black"><rect><color red="0.15" green="0.15" blue="0.15" /></rect></element>
-	<element name="white"><rect><color red="0.81" green="0.8" blue="0.79" /></rect></element>
-
-	<element name="led" defstate="0">
-		<disk state="1"><color red="1.0" green="0.1" blue="0.15" /></disk>
-		<disk state="0"><color red="0.1" green="0.01" blue="0.015" /></disk>
-	</element>
-	<element name="ledg" defstate="0">
-		<disk state="1"><color red="0.15" green="1.0" blue="0.1" /></disk>
-		<disk state="0"><color red="0.015" green="0.1" blue="0.01" /></disk>
-	</element>
-
-	<element name="hlb" defstate="0">
-		<text string=" ">
-			<bounds x="0.0" y="0.0" width="1.0" height="1.0" />
-			<color red="0.0" green="0.0" blue="0.0" />
-		</text>
-		<rect state="1">
-			<bounds x="0.0" y="0.0" width="1.0" height="1.0" />
-			<color red="1.0" green="1.0" blue="1.0" />
-		</rect>
-	</element>
-
-	<element name="text_l1">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="CHANGE POSITION"><color red="0.15" green="0.15" blue="0.15" /></text>
-	</element>
-	<element name="text_l2">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="CLEAR BOARD"><color red="0.15" green="0.15" blue="0.15" /></text>
-	</element>
-	<element name="text_l3">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="NEW GAME"><color red="0.15" green="0.15" blue="0.15" /></text>
-	</element>
-	<element name="text_l4">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="TAKE BACK"><color red="0.15" green="0.15" blue="0.15" /></text>
-	</element>
-	<element name="text_l13">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="MOVE"><color red="0.15" green="0.15" blue="0.15" /></text>
-	</element>
-	<element name="text_l14">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="LEVEL"><color red="0.15" green="0.15" blue="0.15" /></text>
-	</element>
-	<element name="text_l15">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="SOUND"><color red="0.15" green="0.15" blue="0.15" /></text>
-	</element>
-
-	<element name="text_p1"><rect><color red="1" green="1" blue="1" /></rect><image file="chess/wk.svg" /><rect><color red="1" green="1" blue="1" alpha="0.13" /></rect></element>
-	<element name="text_p2"><rect><color red="1" green="1" blue="1" /></rect><image file="chess/wq.svg" /><rect><color red="1" green="1" blue="1" alpha="0.13" /></rect></element>
-	<element name="text_p3"><rect><color red="1" green="1" blue="1" /></rect><image file="chess/wr.svg" /><rect><color red="1" green="1" blue="1" alpha="0.13" /></rect></element>
-	<element name="text_p4"><rect><color red="1" green="1" blue="1" /></rect><image file="chess/wb.svg" /><rect><color red="1" green="1" blue="1" alpha="0.13" /></rect></element>
-	<element name="text_p5"><rect><color red="1" green="1" blue="1" /></rect><image file="chess/wn.svg" /><rect><color red="1" green="1" blue="1" alpha="0.13" /></rect></element>
-	<element name="text_p6"><rect><color red="1" green="1" blue="1" /></rect><image file="chess/wp.svg" /><rect><color red="1" green="1" blue="1" alpha="0.13" /></rect></element>
-
-
-<!-- sb board -->
-
-	<element name="cblack"><rect><color red="0.41" green="0.4" blue="0.39" /></rect></element>
-	<element name="cwhite"><rect><color red="0.81" green="0.8" blue="0.79" /></rect></element>
-
-	<element name="hlbb" defstate="0">
-		<text string=" "><bounds x="0" y="0" width="1" height="1" /></text>
-		<disk state="1">
-			<bounds x="0.12" y="0.12" width="0.76" height="0.76" />
-			<color red="0" green="0" blue="0" />
-		</disk>
-	</element>
-
-	<element name="piece" defstate="0">
-		<image file="chess/wp.svg" state="1"/>
-		<image file="chess/wn.svg" state="2"/>
-		<image file="chess/wb.svg" state="3"/>
-		<image file="chess/wr.svg" state="4"/>
-		<image file="chess/wq.svg" state="5"/>
-		<image file="chess/wk.svg" state="6"/>
-
-		<image file="chess/bp.svg" state="7"/>
-		<image file="chess/bn.svg" state="8"/>
-		<image file="chess/bb.svg" state="9"/>
-		<image file="chess/br.svg" state="10"/>
-		<image file="chess/bq.svg" state="11"/>
-		<image file="chess/bk.svg" state="12"/>
-
-		<!-- selected pieces -->
-		<image file="chess/wp.svg" state="13"><color alpha="0.5" /></image>
-		<image file="chess/wn.svg" state="14"><color alpha="0.5" /></image>
-		<image file="chess/wb.svg" state="15"><color alpha="0.5" /></image>
-		<image file="chess/wr.svg" state="16"><color alpha="0.5" /></image>
-		<image file="chess/wq.svg" state="17"><color alpha="0.5" /></image>
-		<image file="chess/wk.svg" state="18"><color alpha="0.5" /></image>
-
-		<image file="chess/bp.svg" state="19"><color alpha="0.5" /></image>
-		<image file="chess/bn.svg" state="20"><color alpha="0.5" /></image>
-		<image file="chess/bb.svg" state="21"><color alpha="0.5" /></image>
-		<image file="chess/br.svg" state="22"><color alpha="0.5" /></image>
-		<image file="chess/bq.svg" state="23"><color alpha="0.5" /></image>
-		<image file="chess/bk.svg" state="24"><color alpha="0.5" /></image>
-	</element>
-
-	<group name="sb_board">
-		<bounds x="0" y="0" width="80" height="80" />
-
-		<!-- squares (avoid seams) -->
-		<element ref="cwhite"><bounds x="0"  y="0" width="11" height="11" /></element>
-		<element ref="cblack"><bounds x="10" y="0" width="11" height="11" /></element>
-		<element ref="cwhite"><bounds x="20" y="0" width="11" height="11" /></element>
-		<element ref="cblack"><bounds x="30" y="0" width="11" height="11" /></element>
-		<element ref="cwhite"><bounds x="40" y="0" width="11" height="11" /></element>
-		<element ref="cblack"><bounds x="50" y="0" width="11" height="11" /></element>
-		<element ref="cwhite"><bounds x="60" y="0" width="11" height="11" /></element>
-		<element ref="cblack"><bounds x="70" y="0" width="10" height="11" /></element>
-
-		<element ref="cblack"><bounds x="0"  y="10" width="11" height="11" /></element>
-		<element ref="cwhite"><bounds x="10" y="10" width="11" height="11" /></element>
-		<element ref="cblack"><bounds x="20" y="10" width="11" height="11" /></element>
-		<element ref="cwhite"><bounds x="30" y="10" width="11" height="11" /></element>
-		<element ref="cblack"><bounds x="40" y="10" width="11" height="11" /></element>
-		<element ref="cwhite"><bounds x="50" y="10" width="11" height="11" /></element>
-		<element ref="cblack"><bounds x="60" y="10" width="11" height="11" /></element>
-		<element ref="cwhite"><bounds x="70" y="10" width="10" height="11" /></element>
-
-		<element ref="cwhite"><bounds x="0"  y="20" width="11" height="11" /></element>
-		<element ref="cblack"><bounds x="10" y="20" width="11" height="11" /></element>
-		<element ref="cwhite"><bounds x="20" y="20" width="11" height="11" /></element>
-		<element ref="cblack"><bounds x="30" y="20" width="11" height="11" /></element>
-		<element ref="cwhite"><bounds x="40" y="20" width="11" height="11" /></element>
-		<element ref="cblack"><bounds x="50" y="20" width="11" height="11" /></element>
-		<element ref="cwhite"><bounds x="60" y="20" width="11" height="11" /></element>
-		<element ref="cblack"><bounds x="70" y="20" width="10" height="11" /></element>
-
-		<element ref="cblack"><bounds x="0"  y="30" width="11" height="11" /></element>
-		<element ref="cwhite"><bounds x="10" y="30" width="11" height="11" /></element>
-		<element ref="cblack"><bounds x="20" y="30" width="11" height="11" /></element>
-		<element ref="cwhite"><bounds x="30" y="30" width="11" height="11" /></element>
-		<element ref="cblack"><bounds x="40" y="30" width="11" height="11" /></element>
-		<element ref="cwhite"><bounds x="50" y="30" width="11" height="11" /></element>
-		<element ref="cblack"><bounds x="60" y="30" width="11" height="11" /></element>
-		<element ref="cwhite"><bounds x="70" y="30" width="10" height="11" /></element>
-
-		<element ref="cwhite"><bounds x="0"  y="40" width="11" height="11" /></element>
-		<element ref="cblack"><bounds x="10" y="40" width="11" height="11" /></element>
-		<element ref="cwhite"><bounds x="20" y="40" width="11" height="11" /></element>
-		<element ref="cblack"><bounds x="30" y="40" width="11" height="11" /></element>
-		<element ref="cwhite"><bounds x="40" y="40" width="11" height="11" /></element>
-		<element ref="cblack"><bounds x="50" y="40" width="11" height="11" /></element>
-		<element ref="cwhite"><bounds x="60" y="40" width="11" height="11" /></element>
-		<element ref="cblack"><bounds x="70" y="40" width="10" height="11" /></element>
-
-		<element ref="cblack"><bounds x="0"  y="50" width="11" height="11" /></element>
-		<element ref="cwhite"><bounds x="10" y="50" width="11" height="11" /></element>
-		<element ref="cblack"><bounds x="20" y="50" width="11" height="11" /></element>
-		<element ref="cwhite"><bounds x="30" y="50" width="11" height="11" /></element>
-		<element ref="cblack"><bounds x="40" y="50" width="11" height="11" /></element>
-		<element ref="cwhite"><bounds x="50" y="50" width="11" height="11" /></element>
-		<element ref="cblack"><bounds x="60" y="50" width="11" height="11" /></element>
-		<element ref="cwhite"><bounds x="70" y="50" width="10" height="11" /></element>
-
-		<element ref="cwhite"><bounds x="0"  y="60" width="11" height="11" /></element>
-		<element ref="cblack"><bounds x="10" y="60" width="11" height="11" /></element>
-		<element ref="cwhite"><bounds x="20" y="60" width="11" height="11" /></element>
-		<element ref="cblack"><bounds x="30" y="60" width="11" height="11" /></element>
-		<element ref="cwhite"><bounds x="40" y="60" width="11" height="11" /></element>
-		<element ref="cblack"><bounds x="50" y="60" width="11" height="11" /></element>
-		<element ref="cwhite"><bounds x="60" y="60" width="11" height="11" /></element>
-		<element ref="cblack"><bounds x="70" y="60" width="10" height="11" /></element>
-
-		<element ref="cblack"><bounds x="0"  y="70" width="11" height="10" /></element>
-		<element ref="cwhite"><bounds x="10" y="70" width="11" height="10" /></element>
-		<element ref="cblack"><bounds x="20" y="70" width="11" height="10" /></element>
-		<element ref="cwhite"><bounds x="30" y="70" width="11" height="10" /></element>
-		<element ref="cblack"><bounds x="40" y="70" width="11" height="10" /></element>
-		<element ref="cwhite"><bounds x="50" y="70" width="11" height="10" /></element>
-		<element ref="cblack"><bounds x="60" y="70" width="11" height="10" /></element>
-		<element ref="cwhite"><bounds x="70" y="70" width="10" height="10" /></element>
-
-		<!-- sensors, pieces -->
-		<repeat count="8">
-			<param name="y" start="0" increment="10" />
-			<param name="i" start="8" increment="-1" />
-
-			<element ref="hlbb" inputtag="board:RANK.~i~" inputmask="0x01"><bounds x="0"  y="~y~" width="10" height="10" /><color alpha="0.04" /></element>
-			<element ref="hlbb" inputtag="board:RANK.~i~" inputmask="0x02"><bounds x="10" y="~y~" width="10" height="10" /><color alpha="0.04" /></element>
-			<element ref="hlbb" inputtag="board:RANK.~i~" inputmask="0x04"><bounds x="20" y="~y~" width="10" height="10" /><color alpha="0.04" /></element>
-			<element ref="hlbb" inputtag="board:RANK.~i~" inputmask="0x08"><bounds x="30" y="~y~" width="10" height="10" /><color alpha="0.04" /></element>
-			<element ref="hlbb" inputtag="board:RANK.~i~" inputmask="0x10"><bounds x="40" y="~y~" width="10" height="10" /><color alpha="0.04" /></element>
-			<element ref="hlbb" inputtag="board:RANK.~i~" inputmask="0x20"><bounds x="50" y="~y~" width="10" height="10" /><color alpha="0.04" /></element>
-			<element ref="hlbb" inputtag="board:RANK.~i~" inputmask="0x40"><bounds x="60" y="~y~" width="10" height="10" /><color alpha="0.04" /></element>
-			<element ref="hlbb" inputtag="board:RANK.~i~" inputmask="0x80"><bounds x="70" y="~y~" width="10" height="10" /><color alpha="0.04" /></element>
-
-			<element name="piece_a~i~" ref="piece"><bounds x="0"  y="~y~" width="10" height="10" /></element>
-			<element name="piece_b~i~" ref="piece"><bounds x="10" y="~y~" width="10" height="10" /></element>
-			<element name="piece_c~i~" ref="piece"><bounds x="20" y="~y~" width="10" height="10" /></element>
-			<element name="piece_d~i~" ref="piece"><bounds x="30" y="~y~" width="10" height="10" /></element>
-			<element name="piece_e~i~" ref="piece"><bounds x="40" y="~y~" width="10" height="10" /></element>
-			<element name="piece_f~i~" ref="piece"><bounds x="50" y="~y~" width="10" height="10" /></element>
-			<element name="piece_g~i~" ref="piece"><bounds x="60" y="~y~" width="10" height="10" /></element>
-			<element name="piece_h~i~" ref="piece"><bounds x="70" y="~y~" width="10" height="10" /></element>
-		</repeat>
-	</group>
-
-
-<!-- sb ui -->
-
-	<element name="hlub" defstate="0">
-		<rect state="1"><color red="0" green="0" blue="0" /></rect>
-	</element>
-
-	<element name="text_uit1"><text string="S.BOARD"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uit2"><text string="INTERFACE"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uib1"><text string="BOARD:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uib2">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="RESET"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uib3">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="CLEAR"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uis1"><text string="SPAWN:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uih1"><text string="HAND:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uih2">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="REMOVE"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu1"><text string="UNDO:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uiu2a">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string=" &lt;&lt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2b">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string=" &lt;  "><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2c">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="   &gt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2d">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string=" &gt;&gt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu3a" defstate="0">
-		<simplecounter maxstate="999" digits="1" align="2">
-			<color red="0.81" green="0.8" blue="0.79" />
-		</simplecounter>
-	</element>
-	<element name="text_uiu3b"><text string="/"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uiu3c" defstate="0">
-		<simplecounter maxstate="999" digits="1" align="1">
-			<color red="0.81" green="0.8" blue="0.79" />
-		</simplecounter>
-	</element>
-
-	<group name="sb_ui">
-		<bounds x="0" y="0" width="10" height="80" />
-		<element ref="cblack"><bounds x="0" y="0" width="10" height="1" /></element>
-		<element ref="cblack"><bounds x="0" y="7" width="10" height="1" /></element>
-		<element ref="cblack"><bounds x="0" y="79" width="10" height="1" /></element>
-		<element ref="text_uit1"><bounds x="0" y="2" width="10" height="2" /></element>
-		<element ref="text_uit2"><bounds x="0" y="4" width="10" height="2" /></element>
-
-		<!-- board -->
-		<element ref="text_uib1"><bounds x="0" y="9" width="10" height="2" /></element>
-		<element ref="cwhite"><bounds x="1" y="11.5" width="8" height="2.5" /></element>
-		<element ref="cwhite"><bounds x="1" y="15" width="8" height="2.5" /></element>
-
-		<element ref="text_uib2"><bounds x="1.5" y="11.75" width="7" height="2" /></element>
-		<element ref="text_uib3"><bounds x="1.5" y="15.25" width="7" height="2" /></element>
-
-		<element ref="hlub" inputtag="board:UI" inputmask="0x200"><bounds x="1" y="11.5" width="8" height="2.5" /><color alpha="0.25" /></element>
-		<element ref="hlub" inputtag="board:UI" inputmask="0x100"><bounds x="1" y="15" width="8" height="2.5" /><color alpha="0.25" /></element>
-
-		<!-- spawn -->
-		<element ref="text_uis1"><bounds x="0" y="20.5" width="10" height="2" /></element>
-		<element ref="cwhite"><bounds x="1" y="23" width="8" height="12" /></element>
-		<element ref="cwhite"><bounds x="1" y="36" width="8" height="12" /></element>
-
-		<element name="piece_ui1" ref="piece"><bounds x="1" y="23" width="4" height="4" /></element>
-		<element name="piece_ui2" ref="piece"><bounds x="1" y="27" width="4" height="4" /></element>
-		<element name="piece_ui3" ref="piece"><bounds x="1" y="31" width="4" height="4" /></element>
-		<element name="piece_ui4" ref="piece"><bounds x="5" y="23" width="4" height="4" /></element>
-		<element name="piece_ui5" ref="piece"><bounds x="5" y="27" width="4" height="4" /></element>
-		<element name="piece_ui6" ref="piece"><bounds x="5" y="31" width="4" height="4" /></element>
-		<element name="piece_ui7" ref="piece"><bounds x="1" y="36" width="4" height="4" /></element>
-		<element name="piece_ui8" ref="piece"><bounds x="1" y="40" width="4" height="4" /></element>
-		<element name="piece_ui9" ref="piece"><bounds x="1" y="44" width="4" height="4" /></element>
-		<element name="piece_ui10" ref="piece"><bounds x="5" y="36" width="4" height="4" /></element>
-		<element name="piece_ui11" ref="piece"><bounds x="5" y="40" width="4" height="4" /></element>
-		<element name="piece_ui12" ref="piece"><bounds x="5" y="44" width="4" height="4" /></element>
-
-		<element ref="hlub" inputtag="board:SPAWN" inputmask="0x0001"><bounds x="1" y="23" width="4" height="4" /><color alpha="0.25" /></element>
-		<element ref="hlub" inputtag="board:SPAWN" inputmask="0x0002"><bounds x="1" y="27" width="4" height="4" /><color alpha="0.25" /></element>
-		<element ref="hlub" inputtag="board:SPAWN" inputmask="0x0004"><bounds x="1" y="31" width="4" height="4" /><color alpha="0.25" /></element>
-		<element ref="hlub" inputtag="board:SPAWN" inputmask="0x0008"><bounds x="5" y="23" width="4" height="4" /><color alpha="0.25" /></element>
-		<element ref="hlub" inputtag="board:SPAWN" inputmask="0x0010"><bounds x="5" y="27" width="4" height="4" /><color alpha="0.25" /></element>
-		<element ref="hlub" inputtag="board:SPAWN" inputmask="0x0020"><bounds x="5" y="31" width="4" height="4" /><color alpha="0.25" /></element>
-		<element ref="hlub" inputtag="board:SPAWN" inputmask="0x0040"><bounds x="1" y="36" width="4" height="4" /><color alpha="0.25" /></element>
-		<element ref="hlub" inputtag="board:SPAWN" inputmask="0x0080"><bounds x="1" y="40" width="4" height="4" /><color alpha="0.25" /></element>
-		<element ref="hlub" inputtag="board:SPAWN" inputmask="0x0100"><bounds x="1" y="44" width="4" height="4" /><color alpha="0.25" /></element>
-		<element ref="hlub" inputtag="board:SPAWN" inputmask="0x0200"><bounds x="5" y="36" width="4" height="4" /><color alpha="0.25" /></element>
-		<element ref="hlub" inputtag="board:SPAWN" inputmask="0x0400"><bounds x="5" y="40" width="4" height="4" /><color alpha="0.25" /></element>
-		<element ref="hlub" inputtag="board:SPAWN" inputmask="0x0800"><bounds x="5" y="44" width="4" height="4" /><color alpha="0.25" /></element>
-
-		<!-- hand -->
-		<element ref="text_uih1"><bounds x="0" y="51" width="10" height="2" /></element>
-		<element ref="cblack"><bounds x="1" y="53.5" width="8" height="6" /></element>
-		<element name="piece_ui0" ref="piece"><bounds x="2" y="53.5" width="6" height="6" /></element>
-
-		<element ref="cwhite"><bounds x="1" y="60.5" width="8" height="2.5" /></element>
-		<element ref="text_uih2"><bounds x="1.5" y="60.75" width="7" height="2" /></element>
-		<element ref="hlub" inputtag="board:UI" inputmask="0x08"><bounds x="1" y="60.5" width="8" height="2.5" /><color alpha="0.25" /></element>
-
-		<!-- undo -->
-		<element ref="text_uiu1"><bounds x="0" y="66" width="10" height="2" /></element>
-		<element ref="cwhite"><bounds x="1" y="68.5" width="1.7" height="6" /></element>
-		<element ref="cwhite"><bounds x="3.1" y="68.5" width="1.7" height="6" /></element>
-		<element ref="cwhite"><bounds x="5.2" y="68.5" width="1.7" height="6" /></element>
-		<element ref="cwhite"><bounds x="7.3" y="68.5" width="1.7" height="6" /></element>
-		<element ref="text_uiu2a"><bounds x="1" y="69.5" width="1.7" height="4" /></element>
-		<element ref="text_uiu2b"><bounds x="3.1" y="69.5" width="1.7" height="4" /></element>
-		<element ref="text_uiu2c"><bounds x="5.2" y="69.5" width="1.7" height="4" /></element>
-		<element ref="text_uiu2d"><bounds x="7.3" y="69.5" width="1.7" height="4" /></element>
-
-		<element ref="hlub" inputtag="board:UI" inputmask="0x10"><bounds x="1" y="68.5" width="1.7" height="6" /><color alpha="0.25" /></element>
-		<element ref="hlub" inputtag="board:UI" inputmask="0x20"><bounds x="3.1" y="68.5" width="1.7" height="6" /><color alpha="0.25" /></element>
-		<element ref="hlub" inputtag="board:UI" inputmask="0x40"><bounds x="5.2" y="68.5" width="1.7" height="6" /><color alpha="0.25" /></element>
-		<element ref="hlub" inputtag="board:UI" inputmask="0x80"><bounds x="7.3" y="68.5" width="1.7" height="6" /><color alpha="0.25" /></element>
-
-		<element name="count_ui0" ref="text_uiu3a"><bounds x="0" y="75" width="4" height="2" /></element>
-		<element name="count_ui1" ref="text_uiu3c"><bounds x="6" y="75" width="4" height="2" /></element>
-		<element ref="text_uiu3b"><bounds x="4" y="75" width="2" height="2" /></element>
-	</group>
-
-
-<!-- build screen -->
-
-	<view name="Internal Layout">
-		<bounds left="-12.5" right="106.5" top="-1.5" bottom="87.5" />
-
-		<group ref="sb_board"><bounds x="4" y="3" width="80" height="80" /></group>
-		<group ref="sb_ui"><bounds x="-11" y="3" width="10" height="80" /></group>
-
-		<!-- chessboard leds -->
-		<element name="0.0" ref="led"><bounds x="1" y="7.25" width="1.5" height="1.5" /></element>
-		<element name="1.0" ref="led"><bounds x="1" y="17.25" width="1.5" height="1.5" /></element>
-		<element name="2.0" ref="led"><bounds x="1" y="27.25" width="1.5" height="1.5" /></element>
-		<element name="3.0" ref="led"><bounds x="1" y="37.25" width="1.5" height="1.5" /></element>
-		<element name="4.0" ref="led"><bounds x="1" y="47.25" width="1.5" height="1.5" /></element>
-		<element name="5.0" ref="led"><bounds x="1" y="57.25" width="1.5" height="1.5" /></element>
-		<element name="6.0" ref="led"><bounds x="1" y="67.25" width="1.5" height="1.5" /></element>
-		<element name="7.0" ref="led"><bounds x="1" y="77.25" width="1.5" height="1.5" /></element>
-
-		<element name="0.0" ref="led"><bounds x="85.5" y="7.25" width="1.5" height="1.5" /></element>
-		<element name="1.0" ref="led"><bounds x="85.5" y="17.25" width="1.5" height="1.5" /></element>
-		<element name="2.0" ref="led"><bounds x="85.5" y="27.25" width="1.5" height="1.5" /></element>
-		<element name="3.0" ref="led"><bounds x="85.5" y="37.25" width="1.5" height="1.5" /></element>
-		<element name="4.0" ref="led"><bounds x="85.5" y="47.25" width="1.5" height="1.5" /></element>
-		<element name="5.0" ref="led"><bounds x="85.5" y="57.25" width="1.5" height="1.5" /></element>
-		<element name="6.0" ref="led"><bounds x="85.5" y="67.25" width="1.5" height="1.5" /></element>
-		<element name="7.0" ref="led"><bounds x="85.5" y="77.25" width="1.5" height="1.5" /></element>
-
-		<element name="0.1" ref="led"><bounds x="8.25"  y="0" width="1.5" height="1.5" /></element>
-		<element name="1.1" ref="led"><bounds x="18.25" y="0" width="1.5" height="1.5" /></element>
-		<element name="2.1" ref="led"><bounds x="28.25" y="0" width="1.5" height="1.5" /></element>
-		<element name="3.1" ref="led"><bounds x="38.25" y="0" width="1.5" height="1.5" /></element>
-		<element name="4.1" ref="led"><bounds x="48.25" y="0" width="1.5" height="1.5" /></element>
-		<element name="5.1" ref="led"><bounds x="58.25" y="0" width="1.5" height="1.5" /></element>
-		<element name="6.1" ref="led"><bounds x="68.25" y="0" width="1.5" height="1.5" /></element>
-		<element name="7.1" ref="led"><bounds x="78.25" y="0" width="1.5" height="1.5" /></element>
-
-		<element name="0.1" ref="led"><bounds x="8.25"  y="84.5" width="1.5" height="1.5" /></element>
-		<element name="1.1" ref="led"><bounds x="18.25" y="84.5" width="1.5" height="1.5" /></element>
-		<element name="2.1" ref="led"><bounds x="28.25" y="84.5" width="1.5" height="1.5" /></element>
-		<element name="3.1" ref="led"><bounds x="38.25" y="84.5" width="1.5" height="1.5" /></element>
-		<element name="4.1" ref="led"><bounds x="48.25" y="84.5" width="1.5" height="1.5" /></element>
-		<element name="5.1" ref="led"><bounds x="58.25" y="84.5" width="1.5" height="1.5" /></element>
-		<element name="6.1" ref="led"><bounds x="68.25" y="84.5" width="1.5" height="1.5" /></element>
-		<element name="7.1" ref="led"><bounds x="78.25" y="84.5" width="1.5" height="1.5" /></element>
-
-		<element name="8.1" ref="ledg"><bounds x="85.5" y="3.5" width="1.5" height="1.5" /></element>
-
-		<!-- right side -->
-		<element ref="white"><bounds x="88.5" y="-1.5" width="18" height="89" /></element>
-		<element ref="black"><bounds x="90.666" y="2.833" width="13.666" height="80.333" /></element>
-
-		<element ref="white"><bounds x="91" y="3.166"  width="13" height="5" /></element>
-		<element ref="white"><bounds x="91" y="8.500"  width="13" height="5" /></element>
-		<element ref="white"><bounds x="91" y="13.833" width="13" height="5" /></element>
-		<element ref="white"><bounds x="91" y="19.166" width="13" height="5" /></element>
-		<element ref="white"><bounds x="91" y="24.500" width="13" height="5" /></element>
-		<element ref="white"><bounds x="91" y="29.833" width="13" height="5" /></element>
-		<element ref="white"><bounds x="91" y="35.166" width="13" height="5" /></element>
-		<element ref="white"><bounds x="91" y="40.500" width="13" height="5" /></element>
-		<element ref="white"><bounds x="91" y="45.833" width="13" height="5" /></element>
-		<element ref="white"><bounds x="91" y="51.166" width="13" height="5" /></element>
-		<element ref="white"><bounds x="91" y="56.500" width="13" height="5" /></element>
-		<element ref="white"><bounds x="91" y="61.833" width="13" height="5" /></element>
-		<element ref="white"><bounds x="91" y="67.166" width="13" height="5" /></element>
-		<element ref="white"><bounds x="91" y="72.500" width="13" height="5" /></element>
-		<element ref="white"><bounds x="91" y="77.833" width="13" height="5" /></element>
-
-		<element ref="text_l1"><bounds x="91.4" y="4.916"  width="12.5" height="1.5" /></element>
-		<element ref="text_l2"><bounds x="91.4" y="10.250" width="12.5" height="1.5" /></element>
-		<element ref="text_l3"><bounds x="91.4" y="15.583" width="12.5" height="1.5" /></element>
-		<element ref="text_l4"><bounds x="91.4" y="20.916" width="12.5" height="1.5" /></element>
-		<element ref="text_l13"><bounds x="91.4" y="68.916" width="12.5" height="1.5" /></element>
-		<element ref="text_l14"><bounds x="91.4" y="74.250" width="12.5" height="1.5" /></element>
-		<element ref="text_l15"><bounds x="91.4" y="79.583" width="12.5" height="1.5" /></element>
-
-		<repeat count="6">
-			<param name="y" start="24.7" increment="5.333333" />
-			<param name="i" start="1" increment="1" />
-			<element ref="text_p~i~" blend="multiply"><bounds x="95.25" y="~y~" width="4.5" height="4.5" /></element>
-		</repeat>
-
-		<element ref="black"><bounds x="96.25" y="57.75" width="2.5" height="2.5" /></element>
-		<element ref="white"><bounds x="96.5" y="58" width="2.0" height="2.0" /></element>
-		<element ref="black"><bounds x="96.25" y="63.083" width="2.5" height="2.5" /></element>
-
-		<element ref="hlb" inputtag="IN.0" inputmask="0x01"><bounds x="91" y="3.166"  width="13" height="5" /><color alpha="0.4" /></element>
-		<element ref="hlb" inputtag="IN.0" inputmask="0x02"><bounds x="91" y="8.500"  width="13" height="5" /><color alpha="0.4" /></element>
-		<element ref="hlb" inputtag="IN.0" inputmask="0x04"><bounds x="91" y="13.833" width="13" height="5" /><color alpha="0.4" /></element>
-		<element ref="hlb" inputtag="IN.0" inputmask="0x08"><bounds x="91" y="19.166" width="13" height="5" /><color alpha="0.4" /></element>
-		<element ref="hlb" inputtag="IN.0" inputmask="0x10"><bounds x="91" y="24.500" width="13" height="5" /><color alpha="0.4" /></element>
-		<element ref="hlb" inputtag="IN.0" inputmask="0x20"><bounds x="91" y="29.833" width="13" height="5" /><color alpha="0.4" /></element>
-		<element ref="hlb" inputtag="IN.0" inputmask="0x40"><bounds x="91" y="35.166" width="13" height="5" /><color alpha="0.4" /></element>
-		<element ref="hlb" inputtag="IN.1" inputmask="0x01"><bounds x="91" y="40.500" width="13" height="5" /><color alpha="0.4" /></element>
-		<element ref="hlb" inputtag="IN.1" inputmask="0x02"><bounds x="91" y="45.833" width="13" height="5" /><color alpha="0.4" /></element>
-		<element ref="hlb" inputtag="IN.1" inputmask="0x04"><bounds x="91" y="51.166" width="13" height="5" /><color alpha="0.4" /></element>
-		<element ref="hlb" inputtag="IN.1" inputmask="0x08"><bounds x="91" y="56.500" width="13" height="5" /><color alpha="0.4" /></element>
-		<element ref="hlb" inputtag="IN.1" inputmask="0x10"><bounds x="91" y="61.833" width="13" height="5" /><color alpha="0.4" /></element>
-		<element ref="hlb" inputtag="IN.1" inputmask="0x20"><bounds x="91" y="67.166" width="13" height="5" /><color alpha="0.4" /></element>
-		<element ref="hlb" inputtag="IN.1" inputmask="0x40"><bounds x="91" y="72.500" width="13" height="5" /><color alpha="0.4" /></element>
-		<element ref="hlb" inputtag="IN.1" inputmask="0x80"><bounds x="91" y="77.833" width="13" height="5" /><color alpha="0.4" /></element>
-
-	</view>
-</mamelayout>
diff --git a/src/mame/layout/cking_master.lay b/src/mame/layout/cking_master.lay
new file mode 100644
index 00000000000..7ea20eea45f
--- /dev/null
+++ b/src/mame/layout/cking_master.lay
@@ -0,0 +1,409 @@
+<?xml version="1.0"?>
+<!--
+license:CC0-1.0
+-->
+<mamelayout version="2">
+
+<!-- define elements -->
+
+	<element name="black"><rect><color red="0.15" green="0.15" blue="0.15" /></rect></element>
+	<element name="white"><rect><color red="0.81" green="0.8" blue="0.79" /></rect></element>
+
+	<element name="led" defstate="0">
+		<disk state="1"><color red="1.0" green="0.1" blue="0.15" /></disk>
+		<disk state="0"><color red="0.1" green="0.01" blue="0.015" /></disk>
+	</element>
+	<element name="ledg" defstate="0">
+		<disk state="1"><color red="0.15" green="1.0" blue="0.1" /></disk>
+		<disk state="0"><color red="0.015" green="0.1" blue="0.01" /></disk>
+	</element>
+
+	<element name="hlb" defstate="0">
+		<text string=" ">
+			<bounds x="0.0" y="0.0" width="1.0" height="1.0" />
+			<color red="0.0" green="0.0" blue="0.0" />
+		</text>
+		<rect state="1">
+			<bounds x="0.0" y="0.0" width="1.0" height="1.0" />
+			<color red="1.0" green="1.0" blue="1.0" />
+		</rect>
+	</element>
+
+	<element name="text_l1"><text string="CHANGE POSITION"><color red="0.15" green="0.15" blue="0.15" /></text></element>
+	<element name="text_l2"><text string="CLEAR BOARD"><color red="0.15" green="0.15" blue="0.15" /></text></element>
+	<element name="text_l3"><text string="NEW GAME"><color red="0.15" green="0.15" blue="0.15" /></text></element>
+	<element name="text_l4"><text string="TAKE BACK"><color red="0.15" green="0.15" blue="0.15" /></text></element>
+	<element name="text_l13"><text string="MOVE"><color red="0.15" green="0.15" blue="0.15" /></text></element>
+	<element name="text_l14"><text string="LEVEL"><color red="0.15" green="0.15" blue="0.15" /></text></element>
+	<element name="text_l15"><text string="SOUND"><color red="0.15" green="0.15" blue="0.15" /></text></element>
+
+	<element name="text_p1"><rect><color red="1" green="1" blue="1" /></rect><image file="chess/wk.svg" /><rect><color red="1" green="1" blue="1" alpha="0.13" /></rect></element>
+	<element name="text_p2"><rect><color red="1" green="1" blue="1" /></rect><image file="chess/wq.svg" /><rect><color red="1" green="1" blue="1" alpha="0.13" /></rect></element>
+	<element name="text_p3"><rect><color red="1" green="1" blue="1" /></rect><image file="chess/wr.svg" /><rect><color red="1" green="1" blue="1" alpha="0.13" /></rect></element>
+	<element name="text_p4"><rect><color red="1" green="1" blue="1" /></rect><image file="chess/wb.svg" /><rect><color red="1" green="1" blue="1" alpha="0.13" /></rect></element>
+	<element name="text_p5"><rect><color red="1" green="1" blue="1" /></rect><image file="chess/wn.svg" /><rect><color red="1" green="1" blue="1" alpha="0.13" /></rect></element>
+	<element name="text_p6"><rect><color red="1" green="1" blue="1" /></rect><image file="chess/wp.svg" /><rect><color red="1" green="1" blue="1" alpha="0.13" /></rect></element>
+
+
+<!-- sb board -->
+
+	<element name="cblack"><rect><color red="0.41" green="0.4" blue="0.39" /></rect></element>
+	<element name="cwhite"><rect><color red="0.81" green="0.8" blue="0.79" /></rect></element>
+
+	<element name="hlbb" defstate="0">
+		<text string=" "><bounds x="0" y="0" width="1" height="1" /></text>
+		<disk state="1">
+			<bounds x="0.12" y="0.12" width="0.76" height="0.76" />
+			<color red="0" green="0" blue="0" />
+		</disk>
+	</element>
+
+	<element name="piece" defstate="0">
+		<image file="chess/wp.svg" state="1"/>
+		<image file="chess/wn.svg" state="2"/>
+		<image file="chess/wb.svg" state="3"/>
+		<image file="chess/wr.svg" state="4"/>
+		<image file="chess/wq.svg" state="5"/>
+		<image file="chess/wk.svg" state="6"/>
+
+		<image file="chess/bp.svg" state="7"/>
+		<image file="chess/bn.svg" state="8"/>
+		<image file="chess/bb.svg" state="9"/>
+		<image file="chess/br.svg" state="10"/>
+		<image file="chess/bq.svg" state="11"/>
+		<image file="chess/bk.svg" state="12"/>
+
+		<!-- selected pieces -->
+		<image file="chess/wp.svg" state="13"><color alpha="0.5" /></image>
+		<image file="chess/wn.svg" state="14"><color alpha="0.5" /></image>
+		<image file="chess/wb.svg" state="15"><color alpha="0.5" /></image>
+		<image file="chess/wr.svg" state="16"><color alpha="0.5" /></image>
+		<image file="chess/wq.svg" state="17"><color alpha="0.5" /></image>
+		<image file="chess/wk.svg" state="18"><color alpha="0.5" /></image>
+
+		<image file="chess/bp.svg" state="19"><color alpha="0.5" /></image>
+		<image file="chess/bn.svg" state="20"><color alpha="0.5" /></image>
+		<image file="chess/bb.svg" state="21"><color alpha="0.5" /></image>
+		<image file="chess/br.svg" state="22"><color alpha="0.5" /></image>
+		<image file="chess/bq.svg" state="23"><color alpha="0.5" /></image>
+		<image file="chess/bk.svg" state="24"><color alpha="0.5" /></image>
+	</element>
+
+	<group name="sb_board">
+		<bounds x="0" y="0" width="80" height="80" />
+
+		<!-- squares (avoid seams) -->
+		<element ref="cwhite"><bounds x="0"  y="0" width="11" height="11" /></element>
+		<element ref="cblack"><bounds x="10" y="0" width="11" height="11" /></element>
+		<element ref="cwhite"><bounds x="20" y="0" width="11" height="11" /></element>
+		<element ref="cblack"><bounds x="30" y="0" width="11" height="11" /></element>
+		<element ref="cwhite"><bounds x="40" y="0" width="11" height="11" /></element>
+		<element ref="cblack"><bounds x="50" y="0" width="11" height="11" /></element>
+		<element ref="cwhite"><bounds x="60" y="0" width="11" height="11" /></element>
+		<element ref="cblack"><bounds x="70" y="0" width="10" height="11" /></element>
+
+		<element ref="cblack"><bounds x="0"  y="10" width="11" height="11" /></element>
+		<element ref="cwhite"><bounds x="10" y="10" width="11" height="11" /></element>
+		<element ref="cblack"><bounds x="20" y="10" width="11" height="11" /></element>
+		<element ref="cwhite"><bounds x="30" y="10" width="11" height="11" /></element>
+		<element ref="cblack"><bounds x="40" y="10" width="11" height="11" /></element>
+		<element ref="cwhite"><bounds x="50" y="10" width="11" height="11" /></element>
+		<element ref="cblack"><bounds x="60" y="10" width="11" height="11" /></element>
+		<element ref="cwhite"><bounds x="70" y="10" width="10" height="11" /></element>
+
+		<element ref="cwhite"><bounds x="0"  y="20" width="11" height="11" /></element>
+		<element ref="cblack"><bounds x="10" y="20" width="11" height="11" /></element>
+		<element ref="cwhite"><bounds x="20" y="20" width="11" height="11" /></element>
+		<element ref="cblack"><bounds x="30" y="20" width="11" height="11" /></element>
+		<element ref="cwhite"><bounds x="40" y="20" width="11" height="11" /></element>
+		<element ref="cblack"><bounds x="50" y="20" width="11" height="11" /></element>
+		<element ref="cwhite"><bounds x="60" y="20" width="11" height="11" /></element>
+		<element ref="cblack"><bounds x="70" y="20" width="10" height="11" /></element>
+
+		<element ref="cblack"><bounds x="0"  y="30" width="11" height="11" /></element>
+		<element ref="cwhite"><bounds x="10" y="30" width="11" height="11" /></element>
+		<element ref="cblack"><bounds x="20" y="30" width="11" height="11" /></element>
+		<element ref="cwhite"><bounds x="30" y="30" width="11" height="11" /></element>
+		<element ref="cblack"><bounds x="40" y="30" width="11" height="11" /></element>
+		<element ref="cwhite"><bounds x="50" y="30" width="11" height="11" /></element>
+		<element ref="cblack"><bounds x="60" y="30" width="11" height="11" /></element>
+		<element ref="cwhite"><bounds x="70" y="30" width="10" height="11" /></element>
+
+		<element ref="cwhite"><bounds x="0"  y="40" width="11" height="11" /></element>
+		<element ref="cblack"><bounds x="10" y="40" width="11" height="11" /></element>
+		<element ref="cwhite"><bounds x="20" y="40" width="11" height="11" /></element>
+		<element ref="cblack"><bounds x="30" y="40" width="11" height="11" /></element>
+		<element ref="cwhite"><bounds x="40" y="40" width="11" height="11" /></element>
+		<element ref="cblack"><bounds x="50" y="40" width="11" height="11" /></element>
+		<element ref="cwhite"><bounds x="60" y="40" width="11" height="11" /></element>
+		<element ref="cblack"><bounds x="70" y="40" width="10" height="11" /></element>
+
+		<element ref="cblack"><bounds x="0"  y="50" width="11" height="11" /></element>
+		<element ref="cwhite"><bounds x="10" y="50" width="11" height="11" /></element>
+		<element ref="cblack"><bounds x="20" y="50" width="11" height="11" /></element>
+		<element ref="cwhite"><bounds x="30" y="50" width="11" height="11" /></element>
+		<element ref="cblack"><bounds x="40" y="50" width="11" height="11" /></element>
+		<element ref="cwhite"><bounds x="50" y="50" width="11" height="11" /></element>
+		<element ref="cblack"><bounds x="60" y="50" width="11" height="11" /></element>
+		<element ref="cwhite"><bounds x="70" y="50" width="10" height="11" /></element>
+
+		<element ref="cwhite"><bounds x="0"  y="60" width="11" height="11" /></element>
+		<element ref="cblack"><bounds x="10" y="60" width="11" height="11" /></element>
+		<element ref="cwhite"><bounds x="20" y="60" width="11" height="11" /></element>
+		<element ref="cblack"><bounds x="30" y="60" width="11" height="11" /></element>
+		<element ref="cwhite"><bounds x="40" y="60" width="11" height="11" /></element>
+		<element ref="cblack"><bounds x="50" y="60" width="11" height="11" /></element>
+		<element ref="cwhite"><bounds x="60" y="60" width="11" height="11" /></element>
+		<element ref="cblack"><bounds x="70" y="60" width="10" height="11" /></element>
+
+		<element ref="cblack"><bounds x="0"  y="70" width="11" height="10" /></element>
+		<element ref="cwhite"><bounds x="10" y="70" width="11" height="10" /></element>
+		<element ref="cblack"><bounds x="20" y="70" width="11" height="10" /></element>
+		<element ref="cwhite"><bounds x="30" y="70" width="11" height="10" /></element>
+		<element ref="cblack"><bounds x="40" y="70" width="11" height="10" /></element>
+		<element ref="cwhite"><bounds x="50" y="70" width="11" height="10" /></element>
+		<element ref="cblack"><bounds x="60" y="70" width="11" height="10" /></element>
+		<element ref="cwhite"><bounds x="70" y="70" width="10" height="10" /></element>
+
+		<!-- sensors, pieces -->
+		<repeat count="8">
+			<param name="y" start="0" increment="10" />
+			<param name="i" start="8" increment="-1" />
+
+			<element ref="hlbb" inputtag="board:RANK.~i~" inputmask="0x01"><bounds x="0"  y="~y~" width="10" height="10" /><color alpha="0.04" /></element>
+			<element ref="hlbb" inputtag="board:RANK.~i~" inputmask="0x02"><bounds x="10" y="~y~" width="10" height="10" /><color alpha="0.04" /></element>
+			<element ref="hlbb" inputtag="board:RANK.~i~" inputmask="0x04"><bounds x="20" y="~y~" width="10" height="10" /><color alpha="0.04" /></element>
+			<element ref="hlbb" inputtag="board:RANK.~i~" inputmask="0x08"><bounds x="30" y="~y~" width="10" height="10" /><color alpha="0.04" /></element>
+			<element ref="hlbb" inputtag="board:RANK.~i~" inputmask="0x10"><bounds x="40" y="~y~" width="10" height="10" /><color alpha="0.04" /></element>
+			<element ref="hlbb" inputtag="board:RANK.~i~" inputmask="0x20"><bounds x="50" y="~y~" width="10" height="10" /><color alpha="0.04" /></element>
+			<element ref="hlbb" inputtag="board:RANK.~i~" inputmask="0x40"><bounds x="60" y="~y~" width="10" height="10" /><color alpha="0.04" /></element>
+			<element ref="hlbb" inputtag="board:RANK.~i~" inputmask="0x80"><bounds x="70" y="~y~" width="10" height="10" /><color alpha="0.04" /></element>
+
+			<element name="piece_a~i~" ref="piece"><bounds x="0"  y="~y~" width="10" height="10" /></element>
+			<element name="piece_b~i~" ref="piece"><bounds x="10" y="~y~" width="10" height="10" /></element>
+			<element name="piece_c~i~" ref="piece"><bounds x="20" y="~y~" width="10" height="10" /></element>
+			<element name="piece_d~i~" ref="piece"><bounds x="30" y="~y~" width="10" height="10" /></element>
+			<element name="piece_e~i~" ref="piece"><bounds x="40" y="~y~" width="10" height="10" /></element>
+			<element name="piece_f~i~" ref="piece"><bounds x="50" y="~y~" width="10" height="10" /></element>
+			<element name="piece_g~i~" ref="piece"><bounds x="60" y="~y~" width="10" height="10" /></element>
+			<element name="piece_h~i~" ref="piece"><bounds x="70" y="~y~" width="10" height="10" /></element>
+		</repeat>
+	</group>
+
+
+<!-- sb ui -->
+
+	<element name="hlub" defstate="0">
+		<rect state="1"><color red="0" green="0" blue="0" /></rect>
+	</element>
+
+	<element name="text_uit1"><text string="S.BOARD"><color red="0.81" green="0.8" blue="0.79" /></text></element>
+	<element name="text_uit2"><text string="INTERFACE"><color red="0.81" green="0.8" blue="0.79" /></text></element>
+	<element name="text_uib1"><text string="BOARD:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
+	<element name="text_uib2"><text string="RESET"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uib3"><text string="CLEAR"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uis1"><text string="SPAWN:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
+	<element name="text_uih1"><text string="HAND:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
+	<element name="text_uih2"><text string="REMOVE"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu1"><text string="UNDO:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
+	<element name="text_uiu2a"><text string=" &lt;&lt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2b"><text string=" &lt;  "><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2c"><text string="   &gt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2d"><text string=" &gt;&gt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu3b"><text string="/"><color red="0.81" green="0.8" blue="0.79" /></text></element>
+
+	<element name="text_uiu3a" defstate="0">
+		<simplecounter maxstate="999" digits="1" align="2">
+			<color red="0.81" green="0.8" blue="0.79" />
+		</simplecounter>
+	</element>
+	<element name="text_uiu3c" defstate="0">
+		<simplecounter maxstate="999" digits="1" align="1">
+			<color red="0.81" green="0.8" blue="0.79" />
+		</simplecounter>
+	</element>
+
+	<group name="sb_ui">
+		<bounds x="0" y="0" width="10" height="80" />
+		<element ref="cblack"><bounds x="0" y="0" width="10" height="1" /></element>
+		<element ref="cblack"><bounds x="0" y="7" width="10" height="1" /></element>
+		<element ref="cblack"><bounds x="0" y="79" width="10" height="1" /></element>
+		<element ref="text_uit1"><bounds x="0" y="2" width="10" height="2" /></element>
+		<element ref="text_uit2"><bounds x="0" y="4" width="10" height="2" /></element>
+
+		<!-- board -->
+		<element ref="text_uib1"><bounds x="0" y="9" width="10" height="2" /></element>
+		<element ref="cwhite"><bounds x="1" y="11.5" width="8" height="2.5" /></element>
+		<element ref="cwhite"><bounds x="1" y="15" width="8" height="2.5" /></element>
+
+		<element ref="text_uib2"><bounds x="1.5" y="11.75" width="7" height="2" /></element>
+		<element ref="text_uib3"><bounds x="1.5" y="15.25" width="7" height="2" /></element>
+
+		<element ref="hlub" inputtag="board:UI" inputmask="0x200"><bounds x="1" y="11.5" width="8" height="2.5" /><color alpha="0.25" /></element>
+		<element ref="hlub" inputtag="board:UI" inputmask="0x100"><bounds x="1" y="15" width="8" height="2.5" /><color alpha="0.25" /></element>
+
+		<!-- spawn -->
+		<element ref="text_uis1"><bounds x="0" y="20.5" width="10" height="2" /></element>
+		<element ref="cwhite"><bounds x="1" y="23" width="8" height="12" /></element>
+		<element ref="cwhite"><bounds x="1" y="36" width="8" height="12" /></element>
+
+		<element name="piece_ui1" ref="piece"><bounds x="1" y="23" width="4" height="4" /></element>
+		<element name="piece_ui2" ref="piece"><bounds x="1" y="27" width="4" height="4" /></element>
+		<element name="piece_ui3" ref="piece"><bounds x="1" y="31" width="4" height="4" /></element>
+		<element name="piece_ui4" ref="piece"><bounds x="5" y="23" width="4" height="4" /></element>
+		<element name="piece_ui5" ref="piece"><bounds x="5" y="27" width="4" height="4" /></element>
+		<element name="piece_ui6" ref="piece"><bounds x="5" y="31" width="4" height="4" /></element>
+		<element name="piece_ui7" ref="piece"><bounds x="1" y="36" width="4" height="4" /></element>
+		<element name="piece_ui8" ref="piece"><bounds x="1" y="40" width="4" height="4" /></element>
+		<element name="piece_ui9" ref="piece"><bounds x="1" y="44" width="4" height="4" /></element>
+		<element name="piece_ui10" ref="piece"><bounds x="5" y="36" width="4" height="4" /></element>
+		<element name="piece_ui11" ref="piece"><bounds x="5" y="40" width="4" height="4" /></element>
+		<element name="piece_ui12" ref="piece"><bounds x="5" y="44" width="4" height="4" /></element>
+
+		<element ref="hlub" inputtag="board:SPAWN" inputmask="0x0001"><bounds x="1" y="23" width="4" height="4" /><color alpha="0.25" /></element>
+		<element ref="hlub" inputtag="board:SPAWN" inputmask="0x0002"><bounds x="1" y="27" width="4" height="4" /><color alpha="0.25" /></element>
+		<element ref="hlub" inputtag="board:SPAWN" inputmask="0x0004"><bounds x="1" y="31" width="4" height="4" /><color alpha="0.25" /></element>
+		<element ref="hlub" inputtag="board:SPAWN" inputmask="0x0008"><bounds x="5" y="23" width="4" height="4" /><color alpha="0.25" /></element>
+		<element ref="hlub" inputtag="board:SPAWN" inputmask="0x0010"><bounds x="5" y="27" width="4" height="4" /><color alpha="0.25" /></element>
+		<element ref="hlub" inputtag="board:SPAWN" inputmask="0x0020"><bounds x="5" y="31" width="4" height="4" /><color alpha="0.25" /></element>
+		<element ref="hlub" inputtag="board:SPAWN" inputmask="0x0040"><bounds x="1" y="36" width="4" height="4" /><color alpha="0.25" /></element>
+		<element ref="hlub" inputtag="board:SPAWN" inputmask="0x0080"><bounds x="1" y="40" width="4" height="4" /><color alpha="0.25" /></element>
+		<element ref="hlub" inputtag="board:SPAWN" inputmask="0x0100"><bounds x="1" y="44" width="4" height="4" /><color alpha="0.25" /></element>
+		<element ref="hlub" inputtag="board:SPAWN" inputmask="0x0200"><bounds x="5" y="36" width="4" height="4" /><color alpha="0.25" /></element>
+		<element ref="hlub" inputtag="board:SPAWN" inputmask="0x0400"><bounds x="5" y="40" width="4" height="4" /><color alpha="0.25" /></element>
+		<element ref="hlub" inputtag="board:SPAWN" inputmask="0x0800"><bounds x="5" y="44" width="4" height="4" /><color alpha="0.25" /></element>
+
+		<!-- hand -->
+		<element ref="text_uih1"><bounds x="0" y="51" width="10" height="2" /></element>
+		<element ref="cblack"><bounds x="1" y="53.5" width="8" height="6" /></element>
+		<element name="piece_ui0" ref="piece"><bounds x="2" y="53.5" width="6" height="6" /></element>
+
+		<element ref="cwhite"><bounds x="1" y="60.5" width="8" height="2.5" /></element>
+		<element ref="text_uih2"><bounds x="1.5" y="60.75" width="7" height="2" /></element>
+		<element ref="hlub" inputtag="board:UI" inputmask="0x08"><bounds x="1" y="60.5" width="8" height="2.5" /><color alpha="0.25" /></element>
+
+		<!-- undo -->
+		<element ref="text_uiu1"><bounds x="0" y="66" width="10" height="2" /></element>
+		<element ref="cwhite"><bounds x="1" y="68.5" width="1.7" height="6" /></element>
+		<element ref="cwhite"><bounds x="3.1" y="68.5" width="1.7" height="6" /></element>
+		<element ref="cwhite"><bounds x="5.2" y="68.5" width="1.7" height="6" /></element>
+		<element ref="cwhite"><bounds x="7.3" y="68.5" width="1.7" height="6" /></element>
+		<element ref="text_uiu2a"><bounds x="1" y="69.5" width="1.7" height="4" /></element>
+		<element ref="text_uiu2b"><bounds x="3.1" y="69.5" width="1.7" height="4" /></element>
+		<element ref="text_uiu2c"><bounds x="5.2" y="69.5" width="1.7" height="4" /></element>
+		<element ref="text_uiu2d"><bounds x="7.3" y="69.5" width="1.7" height="4" /></element>
+
+		<element ref="hlub" inputtag="board:UI" inputmask="0x10"><bounds x="1" y="68.5" width="1.7" height="6" /><color alpha="0.25" /></element>
+		<element ref="hlub" inputtag="board:UI" inputmask="0x20"><bounds x="3.1" y="68.5" width="1.7" height="6" /><color alpha="0.25" /></element>
+		<element ref="hlub" inputtag="board:UI" inputmask="0x40"><bounds x="5.2" y="68.5" width="1.7" height="6" /><color alpha="0.25" /></element>
+		<element ref="hlub" inputtag="board:UI" inputmask="0x80"><bounds x="7.3" y="68.5" width="1.7" height="6" /><color alpha="0.25" /></element>
+
+		<element name="count_ui0" ref="text_uiu3a"><bounds x="0" y="75" width="4" height="2" /></element>
+		<element name="count_ui1" ref="text_uiu3c"><bounds x="6" y="75" width="4" height="2" /></element>
+		<element ref="text_uiu3b"><bounds x="4" y="75" width="2" height="2" /></element>
+	</group>
+
+
+<!-- build screen -->
+
+	<view name="Internal Layout">
+		<bounds left="-12.5" right="106.5" top="-1.5" bottom="87.5" />
+
+		<group ref="sb_board"><bounds x="4" y="3" width="80" height="80" /></group>
+		<group ref="sb_ui"><bounds x="-11" y="3" width="10" height="80" /></group>
+
+		<!-- chessboard leds -->
+		<element name="0.0" ref="led"><bounds x="1" y="7.25" width="1.5" height="1.5" /></element>
+		<element name="1.0" ref="led"><bounds x="1" y="17.25" width="1.5" height="1.5" /></element>
+		<element name="2.0" ref="led"><bounds x="1" y="27.25" width="1.5" height="1.5" /></element>
+		<element name="3.0" ref="led"><bounds x="1" y="37.25" width="1.5" height="1.5" /></element>
+		<element name="4.0" ref="led"><bounds x="1" y="47.25" width="1.5" height="1.5" /></element>
+		<element name="5.0" ref="led"><bounds x="1" y="57.25" width="1.5" height="1.5" /></element>
+		<element name="6.0" ref="led"><bounds x="1" y="67.25" width="1.5" height="1.5" /></element>
+		<element name="7.0" ref="led"><bounds x="1" y="77.25" width="1.5" height="1.5" /></element>
+
+		<element name="0.0" ref="led"><bounds x="85.5" y="7.25" width="1.5" height="1.5" /></element>
+		<element name="1.0" ref="led"><bounds x="85.5" y="17.25" width="1.5" height="1.5" /></element>
+		<element name="2.0" ref="led"><bounds x="85.5" y="27.25" width="1.5" height="1.5" /></element>
+		<element name="3.0" ref="led"><bounds x="85.5" y="37.25" width="1.5" height="1.5" /></element>
+		<element name="4.0" ref="led"><bounds x="85.5" y="47.25" width="1.5" height="1.5" /></element>
+		<element name="5.0" ref="led"><bounds x="85.5" y="57.25" width="1.5" height="1.5" /></element>
+		<element name="6.0" ref="led"><bounds x="85.5" y="67.25" width="1.5" height="1.5" /></element>
+		<element name="7.0" ref="led"><bounds x="85.5" y="77.25" width="1.5" height="1.5" /></element>
+
+		<element name="0.1" ref="led"><bounds x="8.25"  y="0" width="1.5" height="1.5" /></element>
+		<element name="1.1" ref="led"><bounds x="18.25" y="0" width="1.5" height="1.5" /></element>
+		<element name="2.1" ref="led"><bounds x="28.25" y="0" width="1.5" height="1.5" /></element>
+		<element name="3.1" ref="led"><bounds x="38.25" y="0" width="1.5" height="1.5" /></element>
+		<element name="4.1" ref="led"><bounds x="48.25" y="0" width="1.5" height="1.5" /></element>
+		<element name="5.1" ref="led"><bounds x="58.25" y="0" width="1.5" height="1.5" /></element>
+		<element name="6.1" ref="led"><bounds x="68.25" y="0" width="1.5" height="1.5" /></element>
+		<element name="7.1" ref="led"><bounds x="78.25" y="0" width="1.5" height="1.5" /></element>
+
+		<element name="0.1" ref="led"><bounds x="8.25"  y="84.5" width="1.5" height="1.5" /></element>
+		<element name="1.1" ref="led"><bounds x="18.25" y="84.5" width="1.5" height="1.5" /></element>
+		<element name="2.1" ref="led"><bounds x="28.25" y="84.5" width="1.5" height="1.5" /></element>
+		<element name="3.1" ref="led"><bounds x="38.25" y="84.5" width="1.5" height="1.5" /></element>
+		<element name="4.1" ref="led"><bounds x="48.25" y="84.5" width="1.5" height="1.5" /></element>
+		<element name="5.1" ref="led"><bounds x="58.25" y="84.5" width="1.5" height="1.5" /></element>
+		<element name="6.1" ref="led"><bounds x="68.25" y="84.5" width="1.5" height="1.5" /></element>
+		<element name="7.1" ref="led"><bounds x="78.25" y="84.5" width="1.5" height="1.5" /></element>
+
+		<element name="8.1" ref="ledg"><bounds x="85.5" y="3.5" width="1.5" height="1.5" /></element>
+
+		<!-- right side -->
+		<element ref="white"><bounds x="88.5" y="-1.5" width="18" height="89" /></element>
+		<element ref="black"><bounds x="90.666" y="2.833" width="13.666" height="80.333" /></element>
+
+		<element ref="white"><bounds x="91" y="3.166"  width="13" height="5" /></element>
+		<element ref="white"><bounds x="91" y="8.500"  width="13" height="5" /></element>
+		<element ref="white"><bounds x="91" y="13.833" width="13" height="5" /></element>
+		<element ref="white"><bounds x="91" y="19.166" width="13" height="5" /></element>
+		<element ref="white"><bounds x="91" y="24.500" width="13" height="5" /></element>
+		<element ref="white"><bounds x="91" y="29.833" width="13" height="5" /></element>
+		<element ref="white"><bounds x="91" y="35.166" width="13" height="5" /></element>
+		<element ref="white"><bounds x="91" y="40.500" width="13" height="5" /></element>
+		<element ref="white"><bounds x="91" y="45.833" width="13" height="5" /></element>
+		<element ref="white"><bounds x="91" y="51.166" width="13" height="5" /></element>
+		<element ref="white"><bounds x="91" y="56.500" width="13" height="5" /></element>
+		<element ref="white"><bounds x="91" y="61.833" width="13" height="5" /></element>
+		<element ref="white"><bounds x="91" y="67.166" width="13" height="5" /></element>
+		<element ref="white"><bounds x="91" y="72.500" width="13" height="5" /></element>
+		<element ref="white"><bounds x="91" y="77.833" width="13" height="5" /></element>
+
+		<element ref="text_l1"><bounds x="91.4" y="4.916"  width="12.5" height="1.5" /></element>
+		<element ref="text_l2"><bounds x="91.4" y="10.250" width="12.5" height="1.5" /></element>
+		<element ref="text_l3"><bounds x="91.4" y="15.583" width="12.5" height="1.5" /></element>
+		<element ref="text_l4"><bounds x="91.4" y="20.916" width="12.5" height="1.5" /></element>
+		<element ref="text_l13"><bounds x="91.4" y="68.916" width="12.5" height="1.5" /></element>
+		<element ref="text_l14"><bounds x="91.4" y="74.250" width="12.5" height="1.5" /></element>
+		<element ref="text_l15"><bounds x="91.4" y="79.583" width="12.5" height="1.5" /></element>
+
+		<repeat count="6">
+			<param name="y" start="24.7" increment="5.333333" />
+			<param name="i" start="1" increment="1" />
+			<element ref="text_p~i~" blend="multiply"><bounds x="95.25" y="~y~" width="4.5" height="4.5" /></element>
+		</repeat>
+
+		<element ref="black"><bounds x="96.25" y="57.75" width="2.5" height="2.5" /></element>
+		<element ref="white"><bounds x="96.5" y="58" width="2.0" height="2.0" /></element>
+		<element ref="black"><bounds x="96.25" y="63.083" width="2.5" height="2.5" /></element>
+
+		<element ref="hlb" inputtag="IN.0" inputmask="0x01"><bounds x="91" y="3.166"  width="13" height="5" /><color alpha="0.4" /></element>
+		<element ref="hlb" inputtag="IN.0" inputmask="0x02"><bounds x="91" y="8.500"  width="13" height="5" /><color alpha="0.4" /></element>
+		<element ref="hlb" inputtag="IN.0" inputmask="0x04"><bounds x="91" y="13.833" width="13" height="5" /><color alpha="0.4" /></element>
+		<element ref="hlb" inputtag="IN.0" inputmask="0x08"><bounds x="91" y="19.166" width="13" height="5" /><color alpha="0.4" /></element>
+		<element ref="hlb" inputtag="IN.0" inputmask="0x10"><bounds x="91" y="24.500" width="13" height="5" /><color alpha="0.4" /></element>
+		<element ref="hlb" inputtag="IN.0" inputmask="0x20"><bounds x="91" y="29.833" width="13" height="5" /><color alpha="0.4" /></element>
+		<element ref="hlb" inputtag="IN.0" inputmask="0x40"><bounds x="91" y="35.166" width="13" height="5" /><color alpha="0.4" /></element>
+		<element ref="hlb" inputtag="IN.1" inputmask="0x01"><bounds x="91" y="40.500" width="13" height="5" /><color alpha="0.4" /></element>
+		<element ref="hlb" inputtag="IN.1" inputmask="0x02"><bounds x="91" y="45.833" width="13" height="5" /><color alpha="0.4" /></element>
+		<element ref="hlb" inputtag="IN.1" inputmask="0x04"><bounds x="91" y="51.166" width="13" height="5" /><color alpha="0.4" /></element>
+		<element ref="hlb" inputtag="IN.1" inputmask="0x08"><bounds x="91" y="56.500" width="13" height="5" /><color alpha="0.4" /></element>
+		<element ref="hlb" inputtag="IN.1" inputmask="0x10"><bounds x="91" y="61.833" width="13" height="5" /><color alpha="0.4" /></element>
+		<element ref="hlb" inputtag="IN.1" inputmask="0x20"><bounds x="91" y="67.166" width="13" height="5" /><color alpha="0.4" /></element>
+		<element ref="hlb" inputtag="IN.1" inputmask="0x40"><bounds x="91" y="72.500" width="13" height="5" /><color alpha="0.4" /></element>
+		<element ref="hlb" inputtag="IN.1" inputmask="0x80"><bounds x="91" y="77.833" width="13" height="5" /><color alpha="0.4" /></element>
+
+	</view>
+</mamelayout>
diff --git a/src/mame/layout/cmpchess.lay b/src/mame/layout/cmpchess.lay
index 3cf18959e2e..92d8fa27f35 100644
--- a/src/mame/layout/cmpchess.lay
+++ b/src/mame/layout/cmpchess.lay
@@ -40,135 +40,39 @@ license:CC0-1.0
 	<element name="text_r1"><text string="RUN"><color red="0.3" green="0.3" blue="0.3" /></text></element>
 	<element name="text_r2"><text string="RESET"><color red="0.3" green="0.3" blue="0.3" /></text></element>
 
-	<element name="text_b01a">
-		<rect><color red="0.8" green="0.8" blue="0.8" /></rect>
-		<text string="A"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="text_b01b">
-		<rect><color red="0.8" green="0.8" blue="0.8" /></rect>
-		<text string="wk"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="text_b02a">
-		<rect><color red="0.8" green="0.8" blue="0.8" /></rect>
-		<text string="B"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="text_b02b">
-		<rect><color red="0.8" green="0.8" blue="0.8" /></rect>
-		<text string="wq"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="text_b03a">
-		<rect><color red="0.8" green="0.8" blue="0.8" /></rect>
-		<text string="C"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="text_b03b">
-		<rect><color red="0.8" green="0.8" blue="0.8" /></rect>
-		<text string="wb"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="text_b05a">
-		<rect><color red="0.8" green="0.8" blue="0.8" /></rect>
-		<text string="E"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="text_b05b">
-		<rect><color red="0.8" green="0.8" blue="0.8" /></rect>
-		<text string="wn"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="text_b06a">
-		<rect><color red="0.8" green="0.8" blue="0.8" /></rect>
-		<text string="F"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="text_b06b">
-		<rect><color red="0.8" green="0.8" blue="0.8" /></rect>
-		<text string="wr"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="text_b07a">
-		<rect><color red="0.8" green="0.8" blue="0.8" /></rect>
-		<text string="G"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="text_b07b">
-		<rect><color red="0.8" green="0.8" blue="0.8" /></rect>
-		<text string="wp"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="text_b09a">
-		<rect><color red="0.8" green="0.8" blue="0.8" /></rect>
-		<text string="1"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="text_b09b">
-		<rect><color red="0.8" green="0.8" blue="0.8" /></rect>
-		<text string="bk"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="text_b10a">
-		<rect><color red="0.8" green="0.8" blue="0.8" /></rect>
-		<text string="2"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="text_b10b">
-		<rect><color red="0.8" green="0.8" blue="0.8" /></rect>
-		<text string="bq"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="text_b11a">
-		<rect><color red="0.8" green="0.8" blue="0.8" /></rect>
-		<text string="3"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="text_b11b">
-		<rect><color red="0.8" green="0.8" blue="0.8" /></rect>
-		<text string="bb"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="text_b13a">
-		<rect><color red="0.8" green="0.8" blue="0.8" /></rect>
-		<text string="5"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="text_b13b">
-		<rect><color red="0.8" green="0.8" blue="0.8" /></rect>
-		<text string="bn"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="text_b14a">
-		<rect><color red="0.8" green="0.8" blue="0.8" /></rect>
-		<text string="6"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="text_b14b">
-		<rect><color red="0.8" green="0.8" blue="0.8" /></rect>
-		<text string="br"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="text_b15a">
-		<rect><color red="0.8" green="0.8" blue="0.8" /></rect>
-		<text string="7"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="text_b15b">
-		<rect><color red="0.8" green="0.8" blue="0.8" /></rect>
-		<text string="bp"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-
-	<element name="text_b04a">
-		<rect><color red="0.82" green="0.82" blue="0.62" /></rect>
-		<text string="D"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="text_b04b">
-		<rect><color red="0.82" green="0.82" blue="0.62" /></rect>
-		<text string="play"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="text_b08a">
-		<rect><color red="0.82" green="0.82" blue="0.62" /></rect>
-		<text string="H"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="text_b08b">
-		<rect><color red="0.82" green="0.82" blue="0.62" /></rect>
-		<text string="md"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="text_b12a">
-		<rect><color red="0.82" green="0.82" blue="0.62" /></rect>
-		<text string="4"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="text_b12b">
-		<rect><color red="0.82" green="0.82" blue="0.62" /></rect>
-		<text string="fp"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="text_b16a">
-		<rect><color red="0.82" green="0.82" blue="0.62" /></rect>
-		<text string="8"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="text_b16b">
-		<rect><color red="0.82" green="0.82" blue="0.62" /></rect>
-		<text string="ep"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
+	<element name="text_b01a"><text string="A"><color red="0.1" green="0.1" blue="0.1" /></text></element>
+	<element name="text_b01b"><text string="wk"><color red="0.1" green="0.1" blue="0.1" /></text></element>
+	<element name="text_b02a"><text string="B"><color red="0.1" green="0.1" blue="0.1" /></text></element>
+	<element name="text_b02b"><text string="wq"><color red="0.1" green="0.1" blue="0.1" /></text></element>
+	<element name="text_b03a"><text string="C"><color red="0.1" green="0.1" blue="0.1" /></text></element>
+	<element name="text_b03b"><text string="wb"><color red="0.1" green="0.1" blue="0.1" /></text></element>
+	<element name="text_b05a"><text string="E"><color red="0.1" green="0.1" blue="0.1" /></text></element>
+	<element name="text_b05b"><text string="wn"><color red="0.1" green="0.1" blue="0.1" /></text></element>
+	<element name="text_b06a"><text string="F"><color red="0.1" green="0.1" blue="0.1" /></text></element>
+	<element name="text_b06b"><text string="wr"><color red="0.1" green="0.1" blue="0.1" /></text></element>
+	<element name="text_b07a"><text string="G"><color red="0.1" green="0.1" blue="0.1" /></text></element>
+	<element name="text_b07b"><text string="wp"><color red="0.1" green="0.1" blue="0.1" /></text></element>
+	<element name="text_b09a"><text string="1"><color red="0.1" green="0.1" blue="0.1" /></text></element>
+	<element name="text_b09b"><text string="bk"><color red="0.1" green="0.1" blue="0.1" /></text></element>
+	<element name="text_b10a"><text string="2"><color red="0.1" green="0.1" blue="0.1" /></text></element>
+	<element name="text_b10b"><text string="bq"><color red="0.1" green="0.1" blue="0.1" /></text></element>
+	<element name="text_b11a"><text string="3"><color red="0.1" green="0.1" blue="0.1" /></text></element>
+	<element name="text_b11b"><text string="bb"><color red="0.1" green="0.1" blue="0.1" /></text></element>
+	<element name="text_b13a"><text string="5"><color red="0.1" green="0.1" blue="0.1" /></text></element>
+	<element name="text_b13b"><text string="bn"><color red="0.1" green="0.1" blue="0.1" /></text></element>
+	<element name="text_b14a"><text string="6"><color red="0.1" green="0.1" blue="0.1" /></text></element>
+	<element name="text_b14b"><text string="br"><color red="0.1" green="0.1" blue="0.1" /></text></element>
+	<element name="text_b15a"><text string="7"><color red="0.1" green="0.1" blue="0.1" /></text></element>
+	<element name="text_b15b"><text string="bp"><color red="0.1" green="0.1" blue="0.1" /></text></element>
+
+	<element name="text_b04a"><text string="D"><color red="0.1" green="0.1" blue="0.1" /></text></element>
+	<element name="text_b04b"><text string="play"><color red="0.1" green="0.1" blue="0.1" /></text></element>
+	<element name="text_b08a"><text string="H"><color red="0.1" green="0.1" blue="0.1" /></text></element>
+	<element name="text_b08b"><text string="md"><color red="0.1" green="0.1" blue="0.1" /></text></element>
+	<element name="text_b12a"><text string="4"><color red="0.1" green="0.1" blue="0.1" /></text></element>
+	<element name="text_b12b"><text string="fp"><color red="0.1" green="0.1" blue="0.1" /></text></element>
+	<element name="text_b16a"><text string="8"><color red="0.1" green="0.1" blue="0.1" /></text></element>
+	<element name="text_b16b"><text string="ep"><color red="0.1" green="0.1" blue="0.1" /></text></element>
 
 
 <!-- build screen -->
@@ -188,8 +92,7 @@ license:CC0-1.0
 		<element ref="text_r2"><bounds x="10.5" y="20.5" width="5.4" height="2" /></element>
 		<element ref="reset" inputtag="RESET" inputmask="0x01"><bounds x="12.3" y="16.4" width="1.8" height="3.7" /></element>
 
-	<!-- button panel -->
-
+		<!-- button panel -->
 		<element ref="white1"><bounds x="10" y="30" width="9" height="9" /></element>
 		<element ref="white1"><bounds x="22" y="30" width="9" height="9" /></element>
 		<element ref="white1"><bounds x="34" y="30" width="9" height="9" /></element>
diff --git a/src/mame/layout/cnfball.lay b/src/mame/layout/cnfball.lay
index a89b585d35f..293b3bd6328 100644
--- a/src/mame/layout/cnfball.lay
+++ b/src/mame/layout/cnfball.lay
@@ -10,30 +10,12 @@ license:CC0-1.0
 	<element name="static_white"><rect><color red="0.8" green="0.8" blue="0.8" /></rect></element>
 	<element name="static_green"><rect><color red="0.1" green="0.5" blue="0.2" /></rect></element>
 
-	<element name="text_down">
-		<rect><color red="0.8" green="0.8" blue="0.8" /></rect>
-		<text string="DOWN"><color red="0.7" green="0.2" blue="0.3" /></text>
-	</element>
-	<element name="text_home">
-		<rect><color red="0.8" green="0.8" blue="0.8" /></rect>
-		<text string="HOME"><color red="0.7" green="0.2" blue="0.3" /></text>
-	</element>
-	<element name="text_yards">
-		<rect><color red="0.8" green="0.8" blue="0.8" /></rect>
-		<text string="YARDS TO GO"><color red="0.7" green="0.2" blue="0.3" /></text>
-	</element>
-	<element name="text_time">
-		<rect><color red="0.8" green="0.8" blue="0.8" /></rect>
-		<text string="TIME REMAINING"><color red="0.7" green="0.2" blue="0.3" /></text>
-	</element>
-	<element name="text_field">
-		<rect><color red="0.8" green="0.8" blue="0.8" /></rect>
-		<text string="FIELD POSITION"><color red="0.7" green="0.2" blue="0.3" /></text>
-	</element>
-	<element name="text_visitor">
-		<rect><color red="0.8" green="0.8" blue="0.8" /></rect>
-		<text string="VISITOR"><color red="0.7" green="0.2" blue="0.3" /></text>
-	</element>
+	<element name="text_down"><text string="DOWN"><color red="0.7" green="0.2" blue="0.3" /></text></element>
+	<element name="text_home"><text string="HOME"><color red="0.7" green="0.2" blue="0.3" /></text></element>
+	<element name="text_yards"><text string="YARDS TO GO"><color red="0.7" green="0.2" blue="0.3" /></text></element>
+	<element name="text_time"><text string="TIME REMAINING"><color red="0.7" green="0.2" blue="0.3" /></text></element>
+	<element name="text_field"><text string="FIELD POSITION"><color red="0.7" green="0.2" blue="0.3" /></text></element>
+	<element name="text_visitor"><text string="VISITOR"><color red="0.7" green="0.2" blue="0.3" /></text></element>
 
 	<element name="digit" defstate="0">
 		<led7seg><color red="1.0" green="0.1" blue="0.15" /></led7seg>
diff --git a/src/mame/layout/cnsector.lay b/src/mame/layout/cnsector.lay
index 9be6b5d8650..7d7583d5cee 100644
--- a/src/mame/layout/cnsector.lay
+++ b/src/mame/layout/cnsector.lay
@@ -31,126 +31,40 @@ license:CC0-1.0
 		<disk state="0"><color red="0.6" green="0.7" blue="0.65" /></disk>
 	</element>
 
-	<element name="text_rnext">
-		<rect><color red="0.35" green="0.02" blue="0.04" /></rect>
-		<text string="NEXT"><color red="0.75" green="0.73" blue="0.73" /></text>
-	</element>
-	<element name="text_rship">
-		<rect><color red="0.35" green="0.02" blue="0.04" /></rect>
-		<text string="SHIP"><color red="0.75" green="0.73" blue="0.73" /></text>
-	</element>
-	<element name="text_rmove">
-		<rect><color red="0.35" green="0.02" blue="0.04" /></rect>
-		<text string="MOVE"><color red="0.75" green="0.73" blue="0.73" /></text>
-	</element>
-	<element name="text_rrecall">
-		<rect><color red="0.35" green="0.02" blue="0.04" /></rect>
-		<text string="RECALL"><color red="0.75" green="0.73" blue="0.73" /></text>
-	</element>
-	<element name="text_rleft">
-		<rect><color red="0.35" green="0.02" blue="0.04" /></rect>
-		<text string="LEFT"><color red="0.75" green="0.73" blue="0.73" /></text>
-	</element>
-	<element name="text_rright">
-		<rect><color red="0.35" green="0.02" blue="0.04" /></rect>
-		<text string="RIGHT"><color red="0.75" green="0.73" blue="0.73" /></text>
-	</element>
-	<element name="text_rrange">
-		<rect><color red="0.35" green="0.02" blue="0.04" /></rect>
-		<text string="RANGE"><color red="0.75" green="0.73" blue="0.73" /></text>
-	</element>
-	<element name="text_raim">
-		<rect><color red="0.35" green="0.02" blue="0.04" /></rect>
-		<text string="AIM"><color red="0.75" green="0.73" blue="0.73" /></text>
-	</element>
-	<element name="text_rfire">
-		<rect><color red="0.35" green="0.02" blue="0.04" /></rect>
-		<text string="FIRE"><color red="0.75" green="0.73" blue="0.73" /></text>
-	</element>
-	<element name="text_rsteering">
-		<rect><color red="0.35" green="0.02" blue="0.04" /></rect>
-		<text string="STEERING"><color red="0.75" green="0.73" blue="0.73" /></text>
-	</element>
-	<element name="text_rspeed">
-		<rect><color red="0.35" green="0.02" blue="0.04" /></rect>
-		<text string="SPEED"><color red="0.75" green="0.73" blue="0.73" /></text>
-	</element>
-	<element name="text_rnav">
-		<rect><color red="0.35" green="0.02" blue="0.04" /></rect>
-		<text string="NAVIGATIONAL PROGRAMMING"><color red="0.75" green="0.73" blue="0.73" /></text>
-	</element>
-	<element name="text_rslower">
-		<rect><color red="0.35" green="0.02" blue="0.04" /></rect>
-		<text string="SLOWER"><color red="0.75" green="0.73" blue="0.73" /></text>
-	</element>
-	<element name="text_rfaster">
-		<rect><color red="0.35" green="0.02" blue="0.04" /></rect>
-		<text string="FASTER"><color red="0.75" green="0.73" blue="0.73" /></text>
-	</element>
-	<element name="text_rson">
-		<rect><color red="0.35" green="0.02" blue="0.04" /></rect>
-		<text string="SONAR CONTROL"><color red="0.75" green="0.73" blue="0.73" /></text>
-	</element>
-	<element name="text_rteach">
-		<rect><color red="0.35" green="0.02" blue="0.04" /></rect>
-		<text string="TEACH"><color red="0.75" green="0.73" blue="0.73" /></text>
-	</element>
-	<element name="text_rmode">
-		<rect><color red="0.35" green="0.02" blue="0.04" /></rect>
-		<text string="MODE"><color red="0.75" green="0.73" blue="0.73" /></text>
-	</element>
-	<element name="text_rsub">
-		<rect><color red="0.35" green="0.02" blue="0.04" /></rect>
-		<text string="SUB"><color red="0.75" green="0.73" blue="0.73" /></text>
-	</element>
-	<element name="text_rfinder">
-		<rect><color red="0.35" green="0.02" blue="0.04" /></rect>
-		<text string="FINDER"><color red="0.75" green="0.73" blue="0.73" /></text>
-	</element>
-	<element name="text_revasive">
-		<rect><color red="0.35" green="0.02" blue="0.04" /></rect>
-		<text string="EVASIVE"><color red="0.75" green="0.73" blue="0.73" /></text>
-	</element>
-	<element name="text_rcom">
-		<rect><color red="0.35" green="0.02" blue="0.04" /></rect>
-		<text string="COMBAT INFORMATION CENTER"><color red="0.75" green="0.73" blue="0.73" /></text>
-	</element>
-
-	<element name="text_ship">
-		<text string="SHIP"><color red="0.95" green="0.95" blue="0.95" /></text>
-	</element>
-	<element name="text_speed">
-		<text string="SPEED"><color red="0.95" green="0.95" blue="0.95" /></text>
-	</element>
-	<element name="text_north">
-		<text string="NORTH" align="2"><color red="0.95" green="0.95" blue="0.95" /></text>
-	</element>
-	<element name="text_east">
-		<text string="EAST" align="1"><color red="0.95" green="0.95" blue="0.95" /></text>
-	</element>
-	<element name="text_depth">
-		<text string="DEPTH"><color red="0.95" green="0.95" blue="0.95" /></text>
-	</element>
-	<element name="text_range">
-		<text string="RANGE"><color red="0.95" green="0.95" blue="0.95" /></text>
-	</element>
+	<element name="text_rnext"><text string="NEXT"><color red="0.75" green="0.73" blue="0.73" /></text></element>
+	<element name="text_rship"><text string="SHIP"><color red="0.75" green="0.73" blue="0.73" /></text></element>
+	<element name="text_rmove"><text string="MOVE"><color red="0.75" green="0.73" blue="0.73" /></text></element>
+	<element name="text_rrecall"><text string="RECALL"><color red="0.75" green="0.73" blue="0.73" /></text></element>
+	<element name="text_rleft"><text string="LEFT"><color red="0.75" green="0.73" blue="0.73" /></text></element>
+	<element name="text_rright"><text string="RIGHT"><color red="0.75" green="0.73" blue="0.73" /></text></element>
+	<element name="text_rrange"><text string="RANGE"><color red="0.75" green="0.73" blue="0.73" /></text></element>
+	<element name="text_raim"><text string="AIM"><color red="0.75" green="0.73" blue="0.73" /></text></element>
+	<element name="text_rfire"><text string="FIRE"><color red="0.75" green="0.73" blue="0.73" /></text></element>
+	<element name="text_rsteering"><text string="STEERING"><color red="0.75" green="0.73" blue="0.73" /></text></element>
+	<element name="text_rspeed"><text string="SPEED"><color red="0.75" green="0.73" blue="0.73" /></text></element>
+	<element name="text_rnav"><text string="NAVIGATIONAL PROGRAMMING"><color red="0.75" green="0.73" blue="0.73" /></text></element>
+	<element name="text_rslower"><text string="SLOWER"><color red="0.75" green="0.73" blue="0.73" /></text></element>
+	<element name="text_rfaster"><text string="FASTER"><color red="0.75" green="0.73" blue="0.73" /></text></element>
+	<element name="text_rson"><text string="SONAR CONTROL"><color red="0.75" green="0.73" blue="0.73" /></text></element>
+	<element name="text_rteach"><text string="TEACH"><color red="0.75" green="0.73" blue="0.73" /></text></element>
+	<element name="text_rmode"><text string="MODE"><color red="0.75" green="0.73" blue="0.73" /></text></element>
+	<element name="text_rsub"><text string="SUB"><color red="0.75" green="0.73" blue="0.73" /></text></element>
+	<element name="text_rfinder"><text string="FINDER"><color red="0.75" green="0.73" blue="0.73" /></text></element>
+	<element name="text_revasive"><text string="EVASIVE"><color red="0.75" green="0.73" blue="0.73" /></text></element>
+	<element name="text_rcom"><text string="COMBAT INFORMATION CENTER"><color red="0.75" green="0.73" blue="0.73" /></text></element>
+
+	<element name="text_ship"><text string="SHIP"><color red="0.95" green="0.95" blue="0.95" /></text></element>
+	<element name="text_speed"><text string="SPEED"><color red="0.95" green="0.95" blue="0.95" /></text></element>
+	<element name="text_north"><text string="NORTH" align="2"><color red="0.95" green="0.95" blue="0.95" /></text></element>
+	<element name="text_east"><text string="EAST" align="1"><color red="0.95" green="0.95" blue="0.95" /></text></element>
+	<element name="text_depth"><text string="DEPTH"><color red="0.95" green="0.95" blue="0.95" /></text></element>
+	<element name="text_range"><text string="RANGE"><color red="0.95" green="0.95" blue="0.95" /></text></element>
+
+	<element name="text_n"><text string="N"><color red="0.88" green="0.85" blue="0.85" /></text></element>
+	<element name="text_s"><text string="S"><color red="0.88" green="0.85" blue="0.85" /></text></element>
+	<element name="text_e"><text string="E"><color red="0.88" green="0.85" blue="0.85" /></text></element>
+	<element name="text_w"><text string="W"><color red="0.88" green="0.85" blue="0.85" /></text></element>
 
-	<element name="text_n">
-		<rect><color red="0.35" green="0.02" blue="0.04" /></rect>
-		<text string="N"><color red="0.88" green="0.85" blue="0.85" /></text>
-	</element>
-	<element name="text_s">
-		<rect><color red="0.35" green="0.02" blue="0.04" /></rect>
-		<text string="S"><color red="0.88" green="0.85" blue="0.85" /></text>
-	</element>
-	<element name="text_e">
-		<rect><color red="0.35" green="0.02" blue="0.04" /></rect>
-		<text string="E"><color red="0.88" green="0.85" blue="0.85" /></text>
-	</element>
-	<element name="text_w">
-		<rect><color red="0.35" green="0.02" blue="0.04" /></rect>
-		<text string="W"><color red="0.88" green="0.85" blue="0.85" /></text>
-	</element>
 	<element name="text_nw">
 		<rect><color red="0.35" green="0.02" blue="0.04" /></rect>
 		<text string="NW"><color red="0.88" green="0.85" blue="0.85" /></text>
@@ -174,8 +88,7 @@ license:CC0-1.0
 	<view name="Internal Layout">
 		<bounds left="-1" right="228" top="0" bottom="141" />
 
-	<!-- digits -->
-
+		<!-- digits -->
 		<element ref="static_white"><bounds x="0" y="4" width="100" height="1" /></element>
 		<element ref="static_white"><bounds x="0" y="12" width="100" height="1" /></element>
 		<element ref="static_white"><bounds x="20" y="4.5" width="1" height="40" /></element>
@@ -199,8 +112,7 @@ license:CC0-1.0
 		<element name="digit1" ref="digit"><bounds x="67" y="17" width="10" height="15" /></element>
 		<element name="digit0" ref="digit"><bounds x="77" y="17" width="10" height="15" /></element>
 
-	<!-- compass -->
-
+		<!-- compass -->
 		<element ref="static_gray"><bounds x="-2" y="50" width="102" height="6" /></element>
 		<element ref="static_red"><bounds x="-2" y="55" width="102" height="86" /></element>
 		<element ref="static_white2"><bounds x="13.5" y="65.5" width="65" height="65" /></element>
@@ -221,8 +133,7 @@ license:CC0-1.0
 		<element ref="text_e"><bounds x="63" y="93" width="10" height="10" /></element>
 		<element ref="text_w"><bounds x="21" y="93" width="10" height="10" /></element>
 
-	<!-- button panel -->
-
+		<!-- button panel -->
 		<element ref="static_gray"><bounds x="93" y="-1" width="6" height="143" /></element>
 		<element ref="static_red"><bounds x="98" y="-1" width="132" height="143" /></element>
 
@@ -285,8 +196,7 @@ license:CC0-1.0
 		<element ref="text_rmode"><bounds x="202" y="117" width="18" height="5" /></element>
 		<element ref="text_rson"><bounds x="107" y="117" width="64" height="8" /></element>
 
-	<!-- crop borders -->
-
+		<!-- crop borders -->
 		<element ref="static_black"><bounds x="-3" y="-3" width="232" height="2.9" /></element>
 		<element ref="static_black"><bounds x="-3" y="-3" width="1.9" height="150" /></element>
 		<element ref="static_black"><bounds x="-3" y="141.1" width="232" height="2" /></element>
diff --git a/src/mame/layout/comp4.lay b/src/mame/layout/comp4.lay
index faa5db5519a..58c30bbb2b9 100644
--- a/src/mame/layout/comp4.lay
+++ b/src/mame/layout/comp4.lay
@@ -21,54 +21,18 @@ license:CC0-1.0
 		</disk>
 	</element>
 
-	<element name="text_b0">
-		<rect><color red="0.87" green="0.87" blue="0.87" /></rect>
-		<text string="0"><color red="0.06" green="0.06" blue="0.06" /></text>
-	</element>
-	<element name="text_b1">
-		<rect><color red="0.87" green="0.87" blue="0.87" /></rect>
-		<text string="1"><color red="0.06" green="0.06" blue="0.06" /></text>
-	</element>
-	<element name="text_b2">
-		<rect><color red="0.87" green="0.87" blue="0.87" /></rect>
-		<text string="2"><color red="0.06" green="0.06" blue="0.06" /></text>
-	</element>
-	<element name="text_b3">
-		<rect><color red="0.87" green="0.87" blue="0.87" /></rect>
-		<text string="3"><color red="0.06" green="0.06" blue="0.06" /></text>
-	</element>
-	<element name="text_b4">
-		<rect><color red="0.87" green="0.87" blue="0.87" /></rect>
-		<text string="4"><color red="0.06" green="0.06" blue="0.06" /></text>
-	</element>
-	<element name="text_b5">
-		<rect><color red="0.87" green="0.87" blue="0.87" /></rect>
-		<text string="5"><color red="0.06" green="0.06" blue="0.06" /></text>
-	</element>
-	<element name="text_b6">
-		<rect><color red="0.87" green="0.87" blue="0.87" /></rect>
-		<text string="6"><color red="0.06" green="0.06" blue="0.06" /></text>
-	</element>
-	<element name="text_b7">
-		<rect><color red="0.87" green="0.87" blue="0.87" /></rect>
-		<text string="7"><color red="0.06" green="0.06" blue="0.06" /></text>
-	</element>
-	<element name="text_b8">
-		<rect><color red="0.87" green="0.87" blue="0.87" /></rect>
-		<text string="8"><color red="0.06" green="0.06" blue="0.06" /></text>
-	</element>
-	<element name="text_b9">
-		<rect><color red="0.87" green="0.87" blue="0.87" /></rect>
-		<text string="9"><color red="0.06" green="0.06" blue="0.06" /></text>
-	</element>
-	<element name="text_br">
-		<rect><color red="0.87" green="0.87" blue="0.87" /></rect>
-		<text string="R"><color red="0.06" green="0.06" blue="0.06" /></text>
-	</element>
-	<element name="text_be">
-		<rect><color red="0.87" green="0.87" blue="0.87" /></rect>
-		<text string="E"><color red="0.06" green="0.06" blue="0.06" /></text>
-	</element>
+	<element name="text_b0"><text string="0"><color red="0.06" green="0.06" blue="0.06" /></text></element>
+	<element name="text_b1"><text string="1"><color red="0.06" green="0.06" blue="0.06" /></text></element>
+	<element name="text_b2"><text string="2"><color red="0.06" green="0.06" blue="0.06" /></text></element>
+	<element name="text_b3"><text string="3"><color red="0.06" green="0.06" blue="0.06" /></text></element>
+	<element name="text_b4"><text string="4"><color red="0.06" green="0.06" blue="0.06" /></text></element>
+	<element name="text_b5"><text string="5"><color red="0.06" green="0.06" blue="0.06" /></text></element>
+	<element name="text_b6"><text string="6"><color red="0.06" green="0.06" blue="0.06" /></text></element>
+	<element name="text_b7"><text string="7"><color red="0.06" green="0.06" blue="0.06" /></text></element>
+	<element name="text_b8"><text string="8"><color red="0.06" green="0.06" blue="0.06" /></text></element>
+	<element name="text_b9"><text string="9"><color red="0.06" green="0.06" blue="0.06" /></text></element>
+	<element name="text_br"><text string="R"><color red="0.06" green="0.06" blue="0.06" /></text></element>
+	<element name="text_be"><text string="E"><color red="0.06" green="0.06" blue="0.06" /></text></element>
 
 	<element name="cg1"><rect><color red="0.85" green="0.85" blue="0.85" /></rect></element>
 	<element name="cg2"><rect><color red="0.74" green="0.80" blue="0.86" /></rect></element>
@@ -76,39 +40,15 @@ license:CC0-1.0
 	<element name="cg4"><rect><color red="0.52" green="0.66" blue="0.88" /></rect></element>
 	<element name="cg5"><rect><color red="0.41" green="0.59" blue="0.89" /></rect></element>
 
-	<element name="text_r">
-		<rect><color red="0.20" green="0.04" blue="0.01" /></rect>
-		<text string="R" align="2"><color red="0.87" green="0.87" blue="0.87" /></text>
-	</element>
-	<element name="text_5">
-		<rect><color red="0.20" green="0.04" blue="0.01" /></rect>
-		<text string="5" align="2"><color red="0.87" green="0.87" blue="0.87" /></text>
-	</element>
-	<element name="text_4">
-		<rect><color red="0.20" green="0.04" blue="0.01" /></rect>
-		<text string="4" align="2"><color red="0.87" green="0.87" blue="0.87" /></text>
-	</element>
-	<element name="text_3">
-		<rect><color red="0.20" green="0.04" blue="0.01" /></rect>
-		<text string="3" align="2"><color red="0.87" green="0.87" blue="0.87" /></text>
-	</element>
-	<element name="text_2">
-		<rect><color red="0.20" green="0.04" blue="0.01" /></rect>
-		<text string="2" align="2"><color red="0.87" green="0.87" blue="0.87" /></text>
-	</element>
-	<element name="text_1">
-		<rect><color red="0.20" green="0.04" blue="0.01" /></rect>
-		<text string="1" align="2"><color red="0.87" green="0.87" blue="0.87" /></text>
-	</element>
+	<element name="text_r"><text string="R" align="2"><color red="0.87" green="0.87" blue="0.87" /></text></element>
+	<element name="text_5"><text string="5" align="2"><color red="0.87" green="0.87" blue="0.87" /></text></element>
+	<element name="text_4"><text string="4" align="2"><color red="0.87" green="0.87" blue="0.87" /></text></element>
+	<element name="text_3"><text string="3" align="2"><color red="0.87" green="0.87" blue="0.87" /></text></element>
+	<element name="text_2"><text string="2" align="2"><color red="0.87" green="0.87" blue="0.87" /></text></element>
+	<element name="text_1"><text string="1" align="2"><color red="0.87" green="0.87" blue="0.87" /></text></element>
 
-	<element name="text_num">
-		<rect><color red="0.20" green="0.04" blue="0.01" /></rect>
-		<text string="NUMBER" align="1"><color red="0.85" green="0.85" blue="0.85" /></text>
-	</element>
-	<element name="text_seq">
-		<rect><color red="0.20" green="0.04" blue="0.01" /></rect>
-		<text string="SEQUENCE" align="2"><color red="0.85" green="0.85" blue="0.85" /></text>
-	</element>
+	<element name="text_num"><text string="NUMBER" align="1"><color red="0.85" green="0.85" blue="0.85" /></text></element>
+	<element name="text_seq"><text string="SEQUENCE" align="2"><color red="0.85" green="0.85" blue="0.85" /></text></element>
 
 	<element name="lamp" defstate="0">
 		<rect><color red="0.85" green="0.85" blue="0.85" /></rect>
@@ -133,8 +73,7 @@ license:CC0-1.0
 		<bounds left="0" right="60" top="0" bottom="95" />
 		<element ref="static_darkred"><bounds x="-1" y="-1" width="62" height="44" /></element>
 
-	<!-- game panel -->
-
+		<!-- game panel -->
 		<element ref="cg1"><bounds x="17" y="2" width="26" height="35" /></element>
 		<element ref="cg2"><bounds x="19" y="2" width="22" height="35" /></element>
 		<element ref="cg3"><bounds x="21" y="2" width="18" height="35" /></element>
@@ -173,8 +112,7 @@ license:CC0-1.0
 		<element name="0.6" ref="lamp"><bounds x="44" y="23" width="8" height="6" /></element>
 		<element name="0.5" ref="lamp"><bounds x="44" y="30" width="8" height="6" /></element>
 
-	<!-- button panel -->
-
+		<!-- button panel -->
 		<element ref="static_white"><bounds x="-1" y="42" width="62" height="2" /></element>
 		<element ref="static_blue"><bounds x="-1" y="43" width="62" height="53" /></element>
 
diff --git a/src/mame/layout/comparc.lay b/src/mame/layout/comparc.lay
index 4f086e7537f..8e2b81ac562 100644
--- a/src/mame/layout/comparc.lay
+++ b/src/mame/layout/comparc.lay
@@ -8,27 +8,12 @@ license:CC0-1.0
 
 	<element name="white"><rect><color red="0.8" green="0.8" blue="0.81" /></rect></element>
 
-	<element name="text_repeat">
-		<rect><color red="0.8" green="0.8" blue="0.81" /></rect>
-		<text string="REPEAT-2"><color red="0.6" green="0.6" blue="0.6" /></text>
-	</element>
-	<element name="text_space">
-		<rect><color red="0.8" green="0.8" blue="0.81" /></rect>
-		<text string="SPACE-2"><color red="0.6" green="0.6" blue="0.6" /></text>
-	</element>
+	<element name="text_repeat"><text string="REPEAT-2"><color red="0.6" green="0.6" blue="0.6" /></text></element>
+	<element name="text_space"><text string="SPACE-2"><color red="0.6" green="0.6" blue="0.6" /></text></element>
 
-	<element name="text_start">
-		<rect><color red="0.8" green="0.8" blue="0.81" /></rect>
-		<text string="START"><color red="0.6" green="0.6" blue="0.6" /></text>
-	</element>
-	<element name="text_select">
-		<rect><color red="0.8" green="0.8" blue="0.81" /></rect>
-		<text string="SELECT"><color red="0.6" green="0.6" blue="0.6" /></text>
-	</element>
-	<element name="text_play">
-		<rect><color red="0.8" green="0.8" blue="0.81" /></rect>
-		<text string="PLAY-2/HIT-7"><color red="0.6" green="0.6" blue="0.6" /></text>
-	</element>
+	<element name="text_start"><text string="START"><color red="0.6" green="0.6" blue="0.6" /></text></element>
+	<element name="text_select"><text string="SELECT"><color red="0.6" green="0.6" blue="0.6" /></text></element>
+	<element name="text_play"><text string="PLAY-2/HIT-7"><color red="0.6" green="0.6" blue="0.6" /></text></element>
 
 	<element name="buto" defstate="0">
 		<rect>
diff --git a/src/mame/layout/comparca.lay b/src/mame/layout/comparca.lay
index 45d6874aa3b..c4bf8e7a198 100644
--- a/src/mame/layout/comparca.lay
+++ b/src/mame/layout/comparca.lay
@@ -8,27 +8,12 @@ license:CC0-1.0
 
 	<element name="white"><rect><color red="0.8" green="0.8" blue="0.81" /></rect></element>
 
-	<element name="text_repeat">
-		<rect><color red="0.8" green="0.8" blue="0.81" /></rect>
-		<text string="REPEAT-2"><color red="0.6" green="0.6" blue="0.6" /></text>
-	</element>
-	<element name="text_space">
-		<rect><color red="0.8" green="0.8" blue="0.81" /></rect>
-		<text string="SPACE-2"><color red="0.6" green="0.6" blue="0.6" /></text>
-	</element>
+	<element name="text_repeat"><text string="REPEAT-2"><color red="0.6" green="0.6" blue="0.6" /></text></element>
+	<element name="text_space"><text string="SPACE-2"><color red="0.6" green="0.6" blue="0.6" /></text></element>
 
-	<element name="text_start">
-		<rect><color red="0.8" green="0.8" blue="0.81" /></rect>
-		<text string="START"><color red="0.6" green="0.6" blue="0.6" /></text>
-	</element>
-	<element name="text_select">
-		<rect><color red="0.8" green="0.8" blue="0.81" /></rect>
-		<text string="SELECT"><color red="0.6" green="0.6" blue="0.6" /></text>
-	</element>
-	<element name="text_play">
-		<rect><color red="0.8" green="0.8" blue="0.81" /></rect>
-		<text string="PLAY-2/HIT-7"><color red="0.6" green="0.6" blue="0.6" /></text>
-	</element>
+	<element name="text_start"><text string="START"><color red="0.6" green="0.6" blue="0.6" /></text></element>
+	<element name="text_select"><text string="SELECT"><color red="0.6" green="0.6" blue="0.6" /></text></element>
+	<element name="text_play"><text string="PLAY-2/HIT-7"><color red="0.6" green="0.6" blue="0.6" /></text></element>
 
 	<element name="buto" defstate="0">
 		<rect>
diff --git a/src/mame/layout/conchess.lay b/src/mame/layout/conchess.lay
index 0e273a9184b..e1d2c01f972 100644
--- a/src/mame/layout/conchess.lay
+++ b/src/mame/layout/conchess.lay
@@ -228,43 +228,23 @@ license:CC0-1.0
 	<element name="text_uit1"><text string="S.BOARD"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uit2"><text string="INTERFACE"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uib1"><text string="BOARD:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uib2">
-		<rect><color red="0.84" green="0.75" blue="0.50" /></rect>
-		<text string="RESET"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uib3">
-		<rect><color red="0.84" green="0.75" blue="0.50" /></rect>
-		<text string="CLEAR"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uib2"><text string="RESET"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uib3"><text string="CLEAR"><color red="0.01" green="0.01" blue="0.01" /></text></element>
 	<element name="text_uis1"><text string="SPAWN:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uih1"><text string="HAND:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uih2">
-		<rect><color red="0.84" green="0.75" blue="0.50" /></rect>
-		<text string="REMOVE"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uih2"><text string="REMOVE"><color red="0.01" green="0.01" blue="0.01" /></text></element>
 	<element name="text_uiu1"><text string="UNDO:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uiu2a">
-		<rect><color red="0.84" green="0.75" blue="0.50" /></rect>
-		<text string=" &lt;&lt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2b">
-		<rect><color red="0.84" green="0.75" blue="0.50" /></rect>
-		<text string=" &lt;  "><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2c">
-		<rect><color red="0.84" green="0.75" blue="0.50" /></rect>
-		<text string="   &gt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2d">
-		<rect><color red="0.84" green="0.75" blue="0.50" /></rect>
-		<text string=" &gt;&gt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uiu2a"><text string=" &lt;&lt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2b"><text string=" &lt;  "><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2c"><text string="   &gt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2d"><text string=" &gt;&gt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu3b"><text string="/"><color red="0.81" green="0.8" blue="0.79" /></text></element>
+
 	<element name="text_uiu3a" defstate="0">
 		<simplecounter maxstate="999" digits="1" align="2">
 			<color red="0.81" green="0.8" blue="0.79" />
 		</simplecounter>
 	</element>
-	<element name="text_uiu3b"><text string="/"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uiu3c" defstate="0">
 		<simplecounter maxstate="999" digits="1" align="1">
 			<color red="0.81" green="0.8" blue="0.79" />
@@ -360,8 +340,7 @@ license:CC0-1.0
 		<group ref="sb_board"><bounds x="4" y="3" width="80" height="80" /></group>
 		<group ref="sb_ui"><bounds x="-14.5" y="3" width="10" height="80" /></group>
 
-	<!-- chessboard coords -->
-
+		<!-- chessboard coords -->
 		<element ref="text_8"><bounds x="1.2" y="7" width="2" height="2" /></element>
 		<element ref="text_7"><bounds x="1.2" y="17" width="2" height="2" /></element>
 		<element ref="text_6"><bounds x="1.2" y="27" width="2" height="2" /></element>
@@ -398,8 +377,7 @@ license:CC0-1.0
 		<element ref="text_g"><bounds x="68" y="84" width="2" height="2" /></element>
 		<element ref="text_h"><bounds x="78" y="84" width="2" height="2" /></element>
 
-	<!-- side leds/buttons -->
-
+		<!-- side leds/buttons -->
 		<element name="9.7" ref="led2"><bounds x="1.35" y="5" width="1.5" height="1.5" /></element>
 		<element name="9.6" ref="led2"><bounds x="1.35" y="15" width="1.5" height="1.5" /></element>
 		<element name="9.5" ref="led2"><bounds x="1.35" y="25" width="1.5" height="1.5" /></element>
@@ -436,8 +414,7 @@ license:CC0-1.0
 		<element ref="but" inputtag="IN.0" inputmask="0x02"><bounds x="84.95" y="69.25" width="2" height="2" /></element>
 		<element ref="but" inputtag="IN.0" inputmask="0x01"><bounds x="84.95" y="79.25" width="2" height="2" /></element>
 
-	<!-- side labels -->
-
+		<!-- side labels -->
 		<element ref="white"><bounds x="-2.2" y="7" width="2" height="2" /></element>
 		<element ref="black"><bounds x="-1.9" y="7.3" width="1.4" height="1.4" /></element>
 		<element ref="white"><bounds x="-2.2" y="17" width="2" height="2" /></element>
diff --git a/src/mame/layout/conic_cchess.lay b/src/mame/layout/conic_cchess.lay
index 8d5e6a35cc2..5d1d5da6746 100644
--- a/src/mame/layout/conic_cchess.lay
+++ b/src/mame/layout/conic_cchess.lay
@@ -54,77 +54,23 @@ license:CC0-1.0
 	<element name="text_b05b"><image file="chess/wq.svg" /></element>
 	<element name="text_b06b"><image file="chess/wk.svg" /></element>
 
-	<element name="text_b09a">
-		<rect><color red="0.75" green="0.75" blue="0.75" /></rect>
-		<text string="1"><color red="0.05" green="0.05" blue="0.05" /></text>
-	</element>
-	<element name="text_b10a">
-		<rect><color red="0.75" green="0.75" blue="0.75" /></rect>
-		<text string="2"><color red="0.05" green="0.05" blue="0.05" /></text>
-	</element>
-	<element name="text_b11a">
-		<rect><color red="0.75" green="0.75" blue="0.75" /></rect>
-		<text string="3"><color red="0.05" green="0.05" blue="0.05" /></text>
-	</element>
-	<element name="text_b12a">
-		<rect><color red="0.75" green="0.75" blue="0.75" /></rect>
-		<text string="4"><color red="0.05" green="0.05" blue="0.05" /></text>
-	</element>
-	<element name="text_b13a">
-		<rect><color red="0.75" green="0.75" blue="0.75" /></rect>
-		<text string="5"><color red="0.05" green="0.05" blue="0.05" /></text>
-	</element>
-	<element name="text_b14a">
-		<rect><color red="0.75" green="0.75" blue="0.75" /></rect>
-		<text string="6"><color red="0.05" green="0.05" blue="0.05" /></text>
-	</element>
-	<element name="text_b15a">
-		<rect><color red="0.75" green="0.75" blue="0.75" /></rect>
-		<text string="7"><color red="0.05" green="0.05" blue="0.05" /></text>
-	</element>
-	<element name="text_b15b">
-		<rect><color red="0.75" green="0.75" blue="0.75" /></rect>
-		<text string="SP"><color red="0.05" green="0.05" blue="0.05" /></text>
-	</element>
-	<element name="text_b16a">
-		<rect><color red="0.75" green="0.75" blue="0.75" /></rect>
-		<text string="8"><color red="0.05" green="0.05" blue="0.05" /></text>
-	</element>
-	<element name="text_b16b">
-		<rect><color red="0.75" green="0.75" blue="0.75" /></rect>
-		<text string="IP"><color red="0.05" green="0.05" blue="0.05" /></text>
-	</element>
-
-	<element name="text_b09b">
-		<rect><color red="1" green="1" blue="1" /></rect>
-		<image file="chess/bp.svg" />
-		<rect><color red="1" green="1" blue="1" alpha="0.06" /></rect>
-	</element>
-	<element name="text_b10b">
-		<rect><color red="1" green="1" blue="1" /></rect>
-		<image file="chess/br.svg" />
-		<rect><color red="1" green="1" blue="1" alpha="0.06" /></rect>
-	</element>
-	<element name="text_b11b">
-		<rect><color red="1" green="1" blue="1" /></rect>
-		<image file="chess/bn.svg" />
-		<rect><color red="1" green="1" blue="1" alpha="0.06" /></rect>
-	</element>
-	<element name="text_b12b">
-		<rect><color red="1" green="1" blue="1" /></rect>
-		<image file="chess/bb.svg" />
-		<rect><color red="1" green="1" blue="1" alpha="0.06" /></rect>
-	</element>
-	<element name="text_b13b">
-		<rect><color red="1" green="1" blue="1" /></rect>
-		<image file="chess/bq.svg" />
-		<rect><color red="1" green="1" blue="1" alpha="0.06" /></rect>
-	</element>
-	<element name="text_b14b">
-		<rect><color red="1" green="1" blue="1" /></rect>
-		<image file="chess/bk.svg" />
-		<rect><color red="1" green="1" blue="1" alpha="0.06" /></rect>
-	</element>
+	<element name="text_b09a"><text string="1"><color red="0.05" green="0.05" blue="0.05" /></text></element>
+	<element name="text_b10a"><text string="2"><color red="0.05" green="0.05" blue="0.05" /></text></element>
+	<element name="text_b11a"><text string="3"><color red="0.05" green="0.05" blue="0.05" /></text></element>
+	<element name="text_b12a"><text string="4"><color red="0.05" green="0.05" blue="0.05" /></text></element>
+	<element name="text_b13a"><text string="5"><color red="0.05" green="0.05" blue="0.05" /></text></element>
+	<element name="text_b14a"><text string="6"><color red="0.05" green="0.05" blue="0.05" /></text></element>
+	<element name="text_b15a"><text string="7"><color red="0.05" green="0.05" blue="0.05" /></text></element>
+	<element name="text_b15b"><text string="SP"><color red="0.05" green="0.05" blue="0.05" /></text></element>
+	<element name="text_b16a"><text string="8"><color red="0.05" green="0.05" blue="0.05" /></text></element>
+	<element name="text_b16b"><text string="IP"><color red="0.05" green="0.05" blue="0.05" /></text></element>
+
+	<element name="text_b09b"><rect><color red="1" green="1" blue="1" /></rect><image file="chess/bp.svg" /><rect><color red="1" green="1" blue="1" alpha="0.06" /></rect></element>
+	<element name="text_b10b"><rect><color red="1" green="1" blue="1" /></rect><image file="chess/br.svg" /><rect><color red="1" green="1" blue="1" alpha="0.06" /></rect></element>
+	<element name="text_b11b"><rect><color red="1" green="1" blue="1" /></rect><image file="chess/bn.svg" /><rect><color red="1" green="1" blue="1" alpha="0.06" /></rect></element>
+	<element name="text_b12b"><rect><color red="1" green="1" blue="1" /></rect><image file="chess/bb.svg" /><rect><color red="1" green="1" blue="1" alpha="0.06" /></rect></element>
+	<element name="text_b13b"><rect><color red="1" green="1" blue="1" /></rect><image file="chess/bq.svg" /><rect><color red="1" green="1" blue="1" alpha="0.06" /></rect></element>
+	<element name="text_b14b"><rect><color red="1" green="1" blue="1" /></rect><image file="chess/bk.svg" /><rect><color red="1" green="1" blue="1" alpha="0.06" /></rect></element>
 
 
 <!-- build screen -->
@@ -132,8 +78,7 @@ license:CC0-1.0
 	<view name="Internal Layout">
 		<bounds left="8.8" right="55.3" top="20" bottom="42.5" />
 
-	<!-- outer part, display -->
-
+		<!-- outer part, display -->
 		<element ref="black"><bounds x="8.7" y="22" width="46.7" height="0.7" /></element>
 		<element ref="black"><bounds x="8.7" y="23.4" width="46.7" height="0.7" /></element>
 		<element ref="black"><bounds x="8.7" y="24.8" width="46.7" height="0.7" /></element>
diff --git a/src/mame/layout/conic_cchess2.lay b/src/mame/layout/conic_cchess2.lay
index 70d52f84dde..f175cfb88d0 100644
--- a/src/mame/layout/conic_cchess2.lay
+++ b/src/mame/layout/conic_cchess2.lay
@@ -11,71 +11,23 @@ license:CC0-1.0
 		<disk state="0"><color red="0.1" green="0.01" blue="0.015" /></disk>
 	</element>
 
-	<element name="text_1">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="1"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_2">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="2"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_3">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="3"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_4">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="4"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_5">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="5"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_6">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="6"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_7">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="7"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_8">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="8"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-
-	<element name="text_a">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="A"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_b">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="B"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_c">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="C"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_d">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="D"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_e">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="E"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_f">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="F"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_g">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="G"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_h">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="H"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_1"><text string="1"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_2"><text string="2"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_3"><text string="3"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_4"><text string="4"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_5"><text string="5"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_6"><text string="6"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_7"><text string="7"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_8"><text string="8"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+
+	<element name="text_a"><text string="A"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_b"><text string="B"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_c"><text string="C"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_d"><text string="D"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_e"><text string="E"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_f"><text string="F"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_g"><text string="G"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_h"><text string="H"><color red="0.01" green="0.01" blue="0.01" /></text></element>
 
 
 <!-- sb board -->
@@ -245,43 +197,23 @@ license:CC0-1.0
 	<element name="text_uit1"><text string="S.BOARD"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uit2"><text string="INTERFACE"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uib1"><text string="BOARD:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uib2">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="RESET"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uib3">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="CLEAR"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uib2"><text string="RESET"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uib3"><text string="CLEAR"><color red="0.01" green="0.01" blue="0.01" /></text></element>
 	<element name="text_uis1"><text string="SPAWN:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uih1"><text string="HAND:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uih2">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="REMOVE"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uih2"><text string="REMOVE"><color red="0.01" green="0.01" blue="0.01" /></text></element>
 	<element name="text_uiu1"><text string="UNDO:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uiu2a">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string=" &lt;&lt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2b">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string=" &lt;  "><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2c">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="   &gt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2d">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string=" &gt;&gt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uiu2a"><text string=" &lt;&lt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2b"><text string=" &lt;  "><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2c"><text string="   &gt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2d"><text string=" &gt;&gt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu3b"><text string="/"><color red="0.81" green="0.8" blue="0.79" /></text></element>
+
 	<element name="text_uiu3a" defstate="0">
 		<simplecounter maxstate="999" digits="1" align="2">
 			<color red="0.81" green="0.8" blue="0.79" />
 		</simplecounter>
 	</element>
-	<element name="text_uiu3b"><text string="/"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uiu3c" defstate="0">
 		<simplecounter maxstate="999" digits="1" align="1">
 			<color red="0.81" green="0.8" blue="0.79" />
diff --git a/src/mame/layout/cqback.lay b/src/mame/layout/cqback.lay
index 86e269393c8..d8724e04bee 100644
--- a/src/mame/layout/cqback.lay
+++ b/src/mame/layout/cqback.lay
@@ -11,30 +11,12 @@ license:CC0-1.0
 	<element name="static_green"><rect><color red="0.1" green="0.5" blue="0.2" /></rect></element>
 	<element name="static_orange"><rect><color red="0.8" green="0.25" blue="0.1" /></rect></element>
 
-	<element name="text_down">
-		<rect><color red="0.8" green="0.8" blue="0.8" /></rect>
-		<text string="DOWN"><color red="0.8" green="0.25" blue="0.1" /></text>
-	</element>
-	<element name="text_home">
-		<rect><color red="0.8" green="0.8" blue="0.8" /></rect>
-		<text string="HOME"><color red="0.8" green="0.25" blue="0.1" /></text>
-	</element>
-	<element name="text_yards">
-		<rect><color red="0.8" green="0.8" blue="0.8" /></rect>
-		<text string="YARDS TO GO"><color red="0.8" green="0.25" blue="0.1" /></text>
-	</element>
-	<element name="text_time">
-		<rect><color red="0.8" green="0.8" blue="0.8" /></rect>
-		<text string="TIME REMAINING"><color red="0.8" green="0.25" blue="0.1" /></text>
-	</element>
-	<element name="text_field">
-		<rect><color red="0.8" green="0.8" blue="0.8" /></rect>
-		<text string="FIELD POS."><color red="0.8" green="0.25" blue="0.1" /></text>
-	</element>
-	<element name="text_visitor">
-		<rect><color red="0.8" green="0.8" blue="0.8" /></rect>
-		<text string="VISITOR"><color red="0.8" green="0.25" blue="0.1" /></text>
-	</element>
+	<element name="text_down"><text string="DOWN"><color red="0.8" green="0.25" blue="0.1" /></text></element>
+	<element name="text_home"><text string="HOME"><color red="0.8" green="0.25" blue="0.1" /></text></element>
+	<element name="text_yards"><text string="YARDS TO GO"><color red="0.8" green="0.25" blue="0.1" /></text></element>
+	<element name="text_time"><text string="TIME REMAINING"><color red="0.8" green="0.25" blue="0.1" /></text></element>
+	<element name="text_field"><text string="FIELD POS."><color red="0.8" green="0.25" blue="0.1" /></text></element>
+	<element name="text_visitor"><text string="VISITOR"><color red="0.8" green="0.25" blue="0.1" /></text></element>
 
 	<element name="text_p1">
 		<rect><color red="0.06" green="0.3" blue="0.12" /></rect>
diff --git a/src/mame/layout/ctntune.lay b/src/mame/layout/ctntune.lay
index fec8b50da96..9f84e4c42ea 100644
--- a/src/mame/layout/ctntune.lay
+++ b/src/mame/layout/ctntune.lay
@@ -36,79 +36,25 @@ license:CC0-1.0
 		<disk state="1"><color red="1.0" green="1.0" blue="1.0" /></disk>
 	</element>
 
-	<element name="text_by1">
-		<rect><color red="1.0" green="0.75" blue="0.0" /></rect>
-		<text string="name"><color red="1.0" green="0.95" blue="0.45" /></text>
-	</element>
-	<element name="text_by2">
-		<rect><color red="1.0" green="0.75" blue="0.0" /></rect>
-		<text string="that"><color red="1.0" green="0.95" blue="0.45" /></text>
-	</element>
-	<element name="text_by3">
-		<rect><color red="1.0" green="0.75" blue="0.0" /></rect>
-		<text string="tune"><color red="1.0" green="0.95" blue="0.45" /></text>
-	</element>
-	<element name="text_br1">
-		<rect><color red="1.0" green="0.1" blue="0.2" /></rect>
-		<text string="name"><color red="1.0" green="0.5" blue="0.6" /></text>
-	</element>
-	<element name="text_br2">
-		<rect><color red="1.0" green="0.1" blue="0.2" /></rect>
-		<text string="that"><color red="1.0" green="0.5" blue="0.6" /></text>
-	</element>
-	<element name="text_br3">
-		<rect><color red="1.0" green="0.1" blue="0.2" /></rect>
-		<text string="tune"><color red="1.0" green="0.5" blue="0.6" /></text>
-	</element>
-	<element name="text_bg">
-		<rect><color red="0.15" green="0.5" blue="0.0" /></rect>
-		<text string="PLAY"><color red="0.3" green="0.75" blue="0.1" /></text>
-	</element>
-	<element name="text_bb">
-		<rect><color red="0.1" green="0.15" blue="0.7" /></rect>
-		<text string="START"><color red="0.3" green="0.5" blue="1.0" /></text>
-	</element>
-
-	<element name="text_b1">
-		<disk><color red="0.1" green="0.15" blue="0.7" /></disk>
-		<text string="1"><color red="0.3" green="0.5" blue="1.0" /></text>
-	</element>
-	<element name="text_b2">
-		<disk><color red="0.1" green="0.15" blue="0.7" /></disk>
-		<text string="2"><color red="0.3" green="0.5" blue="1.0" /></text>
-	</element>
-	<element name="text_b3">
-		<disk><color red="0.1" green="0.15" blue="0.7" /></disk>
-		<text string="3"><color red="0.3" green="0.5" blue="1.0" /></text>
-	</element>
-	<element name="text_b4">
-		<disk><color red="0.1" green="0.15" blue="0.7" /></disk>
-		<text string="4"><color red="0.3" green="0.5" blue="1.0" /></text>
-	</element>
-	<element name="text_b5">
-		<disk><color red="0.1" green="0.15" blue="0.7" /></disk>
-		<text string="5"><color red="0.3" green="0.5" blue="1.0" /></text>
-	</element>
-	<element name="text_b6">
-		<disk><color red="0.1" green="0.15" blue="0.7" /></disk>
-		<text string="6"><color red="0.3" green="0.5" blue="1.0" /></text>
-	</element>
-	<element name="text_b7">
-		<disk><color red="0.1" green="0.15" blue="0.7" /></disk>
-		<text string="7"><color red="0.3" green="0.5" blue="1.0" /></text>
-	</element>
-	<element name="text_b8">
-		<disk><color red="0.1" green="0.15" blue="0.7" /></disk>
-		<text string="8"><color red="0.3" green="0.5" blue="1.0" /></text>
-	</element>
-	<element name="text_b9">
-		<disk><color red="0.1" green="0.15" blue="0.7" /></disk>
-		<text string="9"><color red="0.3" green="0.5" blue="1.0" /></text>
-	</element>
-	<element name="text_b10">
-		<disk><color red="0.1" green="0.15" blue="0.7" /></disk>
-		<text string="10"><color red="0.3" green="0.5" blue="1.0" /></text>
-	</element>
+	<element name="text_by1"><text string="name"><color red="1.0" green="0.95" blue="0.45" /></text></element>
+	<element name="text_by2"><text string="that"><color red="1.0" green="0.95" blue="0.45" /></text></element>
+	<element name="text_by3"><text string="tune"><color red="1.0" green="0.95" blue="0.45" /></text></element>
+	<element name="text_br1"><text string="name"><color red="1.0" green="0.5" blue="0.6" /></text></element>
+	<element name="text_br2"><text string="that"><color red="1.0" green="0.5" blue="0.6" /></text></element>
+	<element name="text_br3"><text string="tune"><color red="1.0" green="0.5" blue="0.6" /></text></element>
+	<element name="text_bg"><text string="PLAY"><color red="0.3" green="0.75" blue="0.1" /></text></element>
+	<element name="text_bb"><text string="START"><color red="0.3" green="0.5" blue="1.0" /></text></element>
+
+	<element name="text_b1"><text string="1"><color red="0.3" green="0.5" blue="1.0" /></text></element>
+	<element name="text_b2"><text string="2"><color red="0.3" green="0.5" blue="1.0" /></text></element>
+	<element name="text_b3"><text string="3"><color red="0.3" green="0.5" blue="1.0" /></text></element>
+	<element name="text_b4"><text string="4"><color red="0.3" green="0.5" blue="1.0" /></text></element>
+	<element name="text_b5"><text string="5"><color red="0.3" green="0.5" blue="1.0" /></text></element>
+	<element name="text_b6"><text string="6"><color red="0.3" green="0.5" blue="1.0" /></text></element>
+	<element name="text_b7"><text string="7"><color red="0.3" green="0.5" blue="1.0" /></text></element>
+	<element name="text_b8"><text string="8"><color red="0.3" green="0.5" blue="1.0" /></text></element>
+	<element name="text_b9"><text string="9"><color red="0.3" green="0.5" blue="1.0" /></text></element>
+	<element name="text_b10"><text string="10"><color red="0.3" green="0.5" blue="1.0" /></text></element>
 
 
 <!-- build screen -->
diff --git a/src/mame/layout/ctstein.lay b/src/mame/layout/ctstein.lay
index 01acc8717d2..7094b34d034 100644
--- a/src/mame/layout/ctstein.lay
+++ b/src/mame/layout/ctstein.lay
@@ -10,42 +10,15 @@ license:CC0-1.0
 	<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>
 
-	<element name="text_best">
-		<rect><color red="0.6" green="0.59" blue="0.57" /></rect>
-		<text string="BEST"><color red="0.0" green="0.0" blue="0.0" /></text>
-	</element>
-	<element name="text_score">
-		<rect><color red="0.6" green="0.59" blue="0.57" /></rect>
-		<text string="SCORE"><color red="0.0" green="0.0" blue="0.0" /></text>
-	</element>
-	<element name="text_start">
-		<rect><color red="0.6" green="0.59" blue="0.57" /></rect>
-		<text string="START"><color red="0.0" green="0.0" blue="0.0" /></text>
-	</element>
-	<element name="text_game">
-		<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="text_best"><text string="BEST"><color red="0.0" green="0.0" blue="0.0" /></text></element>
+	<element name="text_score"><text string="SCORE"><color red="0.0" green="0.0" blue="0.0" /></text></element>
+	<element name="text_start"><text string="START"><color red="0.0" green="0.0" blue="0.0" /></text></element>
+	<element name="text_game"><text string="GAME"><color red="0.0" green="0.0" blue="0.0" /></text></element>
+	<element name="text_dif"><text string="DIFFICULTY"><color red="0.0" green="0.0" blue="0.0" /></text></element>
+	<element name="text_1"><text string="1"><color red="0.0" green="0.0" blue="0.0" /></text></element>
+	<element name="text_2"><text string="2"><color red="0.0" green="0.0" blue="0.0" /></text></element>
+	<element name="text_3"><text string="3"><color red="0.0" green="0.0" blue="0.0" /></text></element>
+	<element name="text_4"><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>
diff --git a/src/mame/layout/cxg_ch2001.lay b/src/mame/layout/cxg_ch2001.lay
index 8ed1d490c8f..16dd45aef38 100644
--- a/src/mame/layout/cxg_ch2001.lay
+++ b/src/mame/layout/cxg_ch2001.lay
@@ -28,71 +28,23 @@ license:CC0-1.0
 		<rect state="1"><color red="0.35" green="0.35" blue="0.35" /></rect>
 	</element>
 
-	<element name="text_1">
-		<rect><color red="0.85" green="0.74" blue="0.5" /></rect>
-		<text string="1"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_2">
-		<rect><color red="0.85" green="0.74" blue="0.5" /></rect>
-		<text string="2"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_3">
-		<rect><color red="0.85" green="0.74" blue="0.5" /></rect>
-		<text string="3"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_4">
-		<rect><color red="0.85" green="0.74" blue="0.5" /></rect>
-		<text string="4"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_5">
-		<rect><color red="0.85" green="0.74" blue="0.5" /></rect>
-		<text string="5"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_6">
-		<rect><color red="0.85" green="0.74" blue="0.5" /></rect>
-		<text string="6"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_7">
-		<rect><color red="0.85" green="0.74" blue="0.5" /></rect>
-		<text string="7"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_8">
-		<rect><color red="0.85" green="0.74" blue="0.5" /></rect>
-		<text string="8"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-
-	<element name="text_a">
-		<rect><color red="0.85" green="0.74" blue="0.5" /></rect>
-		<text string="A"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_b">
-		<rect><color red="0.85" green="0.74" blue="0.5" /></rect>
-		<text string="B"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_c">
-		<rect><color red="0.85" green="0.74" blue="0.5" /></rect>
-		<text string="C"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_d">
-		<rect><color red="0.85" green="0.74" blue="0.5" /></rect>
-		<text string="D"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_e">
-		<rect><color red="0.85" green="0.74" blue="0.5" /></rect>
-		<text string="E"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_f">
-		<rect><color red="0.85" green="0.74" blue="0.5" /></rect>
-		<text string="F"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_g">
-		<rect><color red="0.85" green="0.74" blue="0.5" /></rect>
-		<text string="G"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_h">
-		<rect><color red="0.85" green="0.74" blue="0.5" /></rect>
-		<text string="H"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_1"><text string="1"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_2"><text string="2"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_3"><text string="3"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_4"><text string="4"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_5"><text string="5"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_6"><text string="6"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_7"><text string="7"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_8"><text string="8"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+
+	<element name="text_a"><text string="A"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_b"><text string="B"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_c"><text string="C"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_d"><text string="D"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_e"><text string="E"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_f"><text string="F"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_g"><text string="G"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_h"><text string="H"><color red="0.01" green="0.01" blue="0.01" /></text></element>
 
 	<element name="text_white">
 		<rect><color red="0.7" green="0.7" blue="0.7" /></rect>
@@ -287,43 +239,23 @@ license:CC0-1.0
 	<element name="text_uit1"><text string="S.BOARD"><color red="0.7" green="0.7" blue="0.7" /></text></element>
 	<element name="text_uit2"><text string="INTERFACE"><color red="0.7" green="0.7" blue="0.7" /></text></element>
 	<element name="text_uib1"><text string="BOARD:"><color red="0.7" green="0.7" blue="0.7" /></text></element>
-	<element name="text_uib2">
-		<rect><color red="0.85" green="0.74" blue="0.5" /></rect>
-		<text string="RESET"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uib3">
-		<rect><color red="0.85" green="0.74" blue="0.5" /></rect>
-		<text string="CLEAR"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uib2"><text string="RESET"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uib3"><text string="CLEAR"><color red="0.01" green="0.01" blue="0.01" /></text></element>
 	<element name="text_uis1"><text string="SPAWN:"><color red="0.7" green="0.7" blue="0.7" /></text></element>
 	<element name="text_uih1"><text string="HAND:"><color red="0.7" green="0.7" blue="0.7" /></text></element>
-	<element name="text_uih2">
-		<rect><color red="0.85" green="0.74" blue="0.5" /></rect>
-		<text string="REMOVE"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uih2"><text string="REMOVE"><color red="0.01" green="0.01" blue="0.01" /></text></element>
 	<element name="text_uiu1"><text string="UNDO:"><color red="0.7" green="0.7" blue="0.7" /></text></element>
-	<element name="text_uiu2a">
-		<rect><color red="0.85" green="0.74" blue="0.5" /></rect>
-		<text string=" &lt;&lt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2b">
-		<rect><color red="0.85" green="0.74" blue="0.5" /></rect>
-		<text string=" &lt;  "><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2c">
-		<rect><color red="0.85" green="0.74" blue="0.5" /></rect>
-		<text string="   &gt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2d">
-		<rect><color red="0.85" green="0.74" blue="0.5" /></rect>
-		<text string=" &gt;&gt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uiu2a"><text string=" &lt;&lt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2b"><text string=" &lt;  "><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2c"><text string="   &gt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2d"><text string=" &gt;&gt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu3b"><text string="/"><color red="0.7" green="0.7" blue="0.7" /></text></element>
+
 	<element name="text_uiu3a" defstate="0">
 		<simplecounter maxstate="999" digits="1" align="2">
 			<color red="0.7" green="0.7" blue="0.7" />
 		</simplecounter>
 	</element>
-	<element name="text_uiu3b"><text string="/"><color red="0.7" green="0.7" blue="0.7" /></text></element>
 	<element name="text_uiu3c" defstate="0">
 		<simplecounter maxstate="999" digits="1" align="1">
 			<color red="0.7" green="0.7" blue="0.7" />
@@ -423,8 +355,7 @@ license:CC0-1.0
 
 		<group ref="sb_ui"><bounds x="-13" y="3" width="10" height="80" /></group>
 
-	<!-- chessboard coords -->
-
+		<!-- chessboard coords -->
 		<element ref="text_8"><bounds x="-0.8" y="7" width="2" height="2" /></element>
 		<element ref="text_7"><bounds x="-0.8" y="17" width="2" height="2" /></element>
 		<element ref="text_6"><bounds x="-0.8" y="27" width="2" height="2" /></element>
@@ -443,8 +374,7 @@ license:CC0-1.0
 		<element ref="text_g"><bounds x="67" y="85" width="2" height="2" /></element>
 		<element ref="text_h"><bounds x="77" y="85" width="2" height="2" /></element>
 
-	<!-- bottom side -->
-
+		<!-- bottom side -->
 		<element name="9.0" ref="led2"><bounds x="12.25" y="90" width="1.5" height="1.5" /></element>
 		<element ref="text_b1"><bounds x="7" y="91.9" width="12" height="1.8" /></element>
 		<element ref="butr" inputtag="IN.1" inputmask="0x01"><bounds x="10" y="94.3" width="6" height="2" /></element>
diff --git a/src/mame/layout/cxg_commander.lay b/src/mame/layout/cxg_commander.lay
index 1cbd711c2ea..f4d25c2285a 100644
--- a/src/mame/layout/cxg_commander.lay
+++ b/src/mame/layout/cxg_commander.lay
@@ -11,71 +11,23 @@ license:CC0-1.0
 		<disk state="0"><color red="0.1" green="0.01" blue="0.015" /></disk>
 	</element>
 
-	<element name="text_1">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="1"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_2">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="2"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_3">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="3"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_4">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="4"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_5">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="5"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_6">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="6"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_7">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="7"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_8">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="8"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-
-	<element name="text_a">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="A"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_b">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="B"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_c">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="C"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_d">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="D"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_e">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="E"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_f">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="F"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_g">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="G"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_h">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="H"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
+	<element name="text_1"><text string="1"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_2"><text string="2"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_3"><text string="3"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_4"><text string="4"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_5"><text string="5"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_6"><text string="6"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_7"><text string="7"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_8"><text string="8"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+
+	<element name="text_a"><text string="A"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_b"><text string="B"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_c"><text string="C"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_d"><text string="D"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_e"><text string="E"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_f"><text string="F"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_g"><text string="G"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_h"><text string="H"><color red="0.87" green="0.87" blue="0.84" /></text></element>
 
 	<element name="text_white"><text string="WHITE" align="2"><color red="0.05" green="0.65" blue="0.35" /></text></element>
 	<element name="text_black"><text string="BLACK" align="2"><color red="0.05" green="0.65" blue="0.35" /></text></element>
@@ -248,43 +200,23 @@ license:CC0-1.0
 	<element name="text_uit1"><text string="S.BOARD"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uit2"><text string="INTERFACE"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uib1"><text string="BOARD:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uib2">
-		<rect><color red="0.84" green="0.75" blue="0.50" /></rect>
-		<text string="RESET"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uib3">
-		<rect><color red="0.84" green="0.75" blue="0.50" /></rect>
-		<text string="CLEAR"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uib2"><text string="RESET"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uib3"><text string="CLEAR"><color red="0.01" green="0.01" blue="0.01" /></text></element>
 	<element name="text_uis1"><text string="SPAWN:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uih1"><text string="HAND:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uih2">
-		<rect><color red="0.84" green="0.75" blue="0.50" /></rect>
-		<text string="REMOVE"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uih2"><text string="REMOVE"><color red="0.01" green="0.01" blue="0.01" /></text></element>
 	<element name="text_uiu1"><text string="UNDO:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uiu2a">
-		<rect><color red="0.84" green="0.75" blue="0.50" /></rect>
-		<text string=" &lt;&lt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2b">
-		<rect><color red="0.84" green="0.75" blue="0.50" /></rect>
-		<text string=" &lt;  "><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2c">
-		<rect><color red="0.84" green="0.75" blue="0.50" /></rect>
-		<text string="   &gt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2d">
-		<rect><color red="0.84" green="0.75" blue="0.50" /></rect>
-		<text string=" &gt;&gt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uiu2a"><text string=" &lt;&lt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2b"><text string=" &lt;  "><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2c"><text string="   &gt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2d"><text string=" &gt;&gt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu3b"><text string="/"><color red="0.81" green="0.8" blue="0.79" /></text></element>
+
 	<element name="text_uiu3a" defstate="0">
 		<simplecounter maxstate="999" digits="1" align="2">
 			<color red="0.81" green="0.8" blue="0.79" />
 		</simplecounter>
 	</element>
-	<element name="text_uiu3b"><text string="/"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uiu3c" defstate="0">
 		<simplecounter maxstate="999" digits="1" align="1">
 			<color red="0.81" green="0.8" blue="0.79" />
diff --git a/src/mame/layout/cxg_dominator.lay b/src/mame/layout/cxg_dominator.lay
index 425eeb645a0..46f65501427 100644
--- a/src/mame/layout/cxg_dominator.lay
+++ b/src/mame/layout/cxg_dominator.lay
@@ -11,137 +11,41 @@ license:CC0-1.0
 		<disk state="0"><color red="0.1" green="0.01" blue="0.015" /></disk>
 	</element>
 
-	<element name="text_10">
-		<rect><color red="0.41" green="0.4" blue="0.39" /></rect>
-		<text string="1" align="1"><color red="0.9" green="0.9" blue="0.9" /></text>
-	</element>
-	<element name="text_20">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="2" align="1"><color red="0.05" green="0.05" blue="0.05" /></text>
-	</element>
-	<element name="text_30">
-		<rect><color red="0.41" green="0.4" blue="0.39" /></rect>
-		<text string="3" align="1"><color red="0.9" green="0.9" blue="0.9" /></text>
-	</element>
-	<element name="text_40">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="4" align="1"><color red="0.05" green="0.05" blue="0.05" /></text>
-	</element>
-	<element name="text_50">
-		<rect><color red="0.41" green="0.4" blue="0.39" /></rect>
-		<text string="5" align="1"><color red="0.9" green="0.9" blue="0.9" /></text>
-	</element>
-	<element name="text_60">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="6" align="1"><color red="0.05" green="0.05" blue="0.05" /></text>
-	</element>
-	<element name="text_70">
-		<rect><color red="0.41" green="0.4" blue="0.39" /></rect>
-		<text string="7" align="1"><color red="0.9" green="0.9" blue="0.9" /></text>
-	</element>
-	<element name="text_80">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="8" align="1"><color red="0.05" green="0.05" blue="0.05" /></text>
-	</element>
-
-	<element name="text_11">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="1" align="2"><color red="0.05" green="0.05" blue="0.05" /></text>
-	</element>
-	<element name="text_21">
-		<rect><color red="0.41" green="0.4" blue="0.39" /></rect>
-		<text string="2" align="2"><color red="0.9" green="0.9" blue="0.9" /></text>
-	</element>
-	<element name="text_31">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="3" align="2"><color red="0.05" green="0.05" blue="0.05" /></text>
-	</element>
-	<element name="text_41">
-		<rect><color red="0.41" green="0.4" blue="0.39" /></rect>
-		<text string="4" align="2"><color red="0.9" green="0.9" blue="0.9" /></text>
-	</element>
-	<element name="text_51">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="5" align="2"><color red="0.05" green="0.05" blue="0.05" /></text>
-	</element>
-	<element name="text_61">
-		<rect><color red="0.41" green="0.4" blue="0.39" /></rect>
-		<text string="6" align="2"><color red="0.9" green="0.9" blue="0.9" /></text>
-	</element>
-	<element name="text_71">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="7" align="2"><color red="0.05" green="0.05" blue="0.05" /></text>
-	</element>
-	<element name="text_81">
-		<rect><color red="0.41" green="0.4" blue="0.39" /></rect>
-		<text string="8" align="2"><color red="0.9" green="0.9" blue="0.9" /></text>
-	</element>
-
-	<element name="text_a0">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="A"><color red="0.05" green="0.05" blue="0.05" /></text>
-	</element>
-	<element name="text_b0">
-		<rect><color red="0.41" green="0.4" blue="0.39" /></rect>
-		<text string="B"><color red="0.9" green="0.9" blue="0.9" /></text>
-	</element>
-	<element name="text_c0">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="C"><color red="0.05" green="0.05" blue="0.05" /></text>
-	</element>
-	<element name="text_d0">
-		<rect><color red="0.41" green="0.4" blue="0.39" /></rect>
-		<text string="D"><color red="0.9" green="0.9" blue="0.9" /></text>
-	</element>
-	<element name="text_e0">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="E"><color red="0.05" green="0.05" blue="0.05" /></text>
-	</element>
-	<element name="text_f0">
-		<rect><color red="0.41" green="0.4" blue="0.39" /></rect>
-		<text string="F"><color red="0.9" green="0.9" blue="0.9" /></text>
-	</element>
-	<element name="text_g0">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="G"><color red="0.05" green="0.05" blue="0.05" /></text>
-	</element>
-	<element name="text_h0">
-		<rect><color red="0.41" green="0.4" blue="0.39" /></rect>
-		<text string="H"><color red="0.9" green="0.9" blue="0.9" /></text>
-	</element>
-
-	<element name="text_a1">
-		<rect><color red="0.41" green="0.4" blue="0.39" /></rect>
-		<text string="A"><color red="0.9" green="0.9" blue="0.9" /></text>
-	</element>
-	<element name="text_b1">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="B"><color red="0.05" green="0.05" blue="0.05" /></text>
-	</element>
-	<element name="text_c1">
-		<rect><color red="0.41" green="0.4" blue="0.39" /></rect>
-		<text string="C"><color red="0.9" green="0.9" blue="0.9" /></text>
-	</element>
-	<element name="text_d1">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="D"><color red="0.05" green="0.05" blue="0.05" /></text>
-	</element>
-	<element name="text_e1">
-		<rect><color red="0.41" green="0.4" blue="0.39" /></rect>
-		<text string="E"><color red="0.9" green="0.9" blue="0.9" /></text>
-	</element>
-	<element name="text_f1">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="F"><color red="0.05" green="0.05" blue="0.05" /></text>
-	</element>
-	<element name="text_g1">
-		<rect><color red="0.41" green="0.4" blue="0.39" /></rect>
-		<text string="G"><color red="0.9" green="0.9" blue="0.9" /></text>
-	</element>
-	<element name="text_h1">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="H"><color red="0.05" green="0.05" blue="0.05" /></text>
-	</element>
+	<element name="text_10"><text string="1" align="1"><color red="0.9" green="0.9" blue="0.9" /></text></element>
+	<element name="text_20"><text string="2" align="1"><color red="0.05" green="0.05" blue="0.05" /></text></element>
+	<element name="text_30"><text string="3" align="1"><color red="0.9" green="0.9" blue="0.9" /></text></element>
+	<element name="text_40"><text string="4" align="1"><color red="0.05" green="0.05" blue="0.05" /></text></element>
+	<element name="text_50"><text string="5" align="1"><color red="0.9" green="0.9" blue="0.9" /></text></element>
+	<element name="text_60"><text string="6" align="1"><color red="0.05" green="0.05" blue="0.05" /></text></element>
+	<element name="text_70"><text string="7" align="1"><color red="0.9" green="0.9" blue="0.9" /></text></element>
+	<element name="text_80"><text string="8" align="1"><color red="0.05" green="0.05" blue="0.05" /></text></element>
+
+	<element name="text_11"><text string="1" align="2"><color red="0.05" green="0.05" blue="0.05" /></text></element>
+	<element name="text_21"><text string="2" align="2"><color red="0.9" green="0.9" blue="0.9" /></text></element>
+	<element name="text_31"><text string="3" align="2"><color red="0.05" green="0.05" blue="0.05" /></text></element>
+	<element name="text_41"><text string="4" align="2"><color red="0.9" green="0.9" blue="0.9" /></text></element>
+	<element name="text_51"><text string="5" align="2"><color red="0.05" green="0.05" blue="0.05" /></text></element>
+	<element name="text_61"><text string="6" align="2"><color red="0.9" green="0.9" blue="0.9" /></text></element>
+	<element name="text_71"><text string="7" align="2"><color red="0.05" green="0.05" blue="0.05" /></text></element>
+	<element name="text_81"><text string="8" align="2"><color red="0.9" green="0.9" blue="0.9" /></text></element>
+
+	<element name="text_a0"><text string="A"><color red="0.05" green="0.05" blue="0.05" /></text></element>
+	<element name="text_b0"><text string="B"><color red="0.9" green="0.9" blue="0.9" /></text></element>
+	<element name="text_c0"><text string="C"><color red="0.05" green="0.05" blue="0.05" /></text></element>
+	<element name="text_d0"><text string="D"><color red="0.9" green="0.9" blue="0.9" /></text></element>
+	<element name="text_e0"><text string="E"><color red="0.05" green="0.05" blue="0.05" /></text></element>
+	<element name="text_f0"><text string="F"><color red="0.9" green="0.9" blue="0.9" /></text></element>
+	<element name="text_g0"><text string="G"><color red="0.05" green="0.05" blue="0.05" /></text></element>
+	<element name="text_h0"><text string="H"><color red="0.9" green="0.9" blue="0.9" /></text></element>
+
+	<element name="text_a1"><text string="A"><color red="0.9" green="0.9" blue="0.9" /></text></element>
+	<element name="text_b1"><text string="B"><color red="0.05" green="0.05" blue="0.05" /></text></element>
+	<element name="text_c1"><text string="C"><color red="0.9" green="0.9" blue="0.9" /></text></element>
+	<element name="text_d1"><text string="D"><color red="0.05" green="0.05" blue="0.05" /></text></element>
+	<element name="text_e1"><text string="E"><color red="0.9" green="0.9" blue="0.9" /></text></element>
+	<element name="text_f1"><text string="F"><color red="0.05" green="0.05" blue="0.05" /></text></element>
+	<element name="text_g1"><text string="G"><color red="0.9" green="0.9" blue="0.9" /></text></element>
+	<element name="text_h1"><text string="H"><color red="0.05" green="0.05" blue="0.05" /></text></element>
 
 
 <!-- sb board -->
@@ -348,43 +252,23 @@ license:CC0-1.0
 	<element name="text_uit1"><text string="S.BOARD"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uit2"><text string="INTERFACE"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uib1"><text string="BOARD:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uib2">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="RESET"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uib3">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="CLEAR"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uib2"><text string="RESET"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uib3"><text string="CLEAR"><color red="0.01" green="0.01" blue="0.01" /></text></element>
 	<element name="text_uis1"><text string="SPAWN:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uih1"><text string="HAND:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uih2">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="REMOVE"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uih2"><text string="REMOVE"><color red="0.01" green="0.01" blue="0.01" /></text></element>
 	<element name="text_uiu1"><text string="UNDO:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uiu2a">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string=" &lt;&lt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2b">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string=" &lt;  "><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2c">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="   &gt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2d">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string=" &gt;&gt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uiu2a"><text string=" &lt;&lt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2b"><text string=" &lt;  "><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2c"><text string="   &gt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2d"><text string=" &gt;&gt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu3b"><text string="/"><color red="0.81" green="0.8" blue="0.79" /></text></element>
+
 	<element name="text_uiu3a" defstate="0">
 		<simplecounter maxstate="999" digits="1" align="2">
 			<color red="0.81" green="0.8" blue="0.79" />
 		</simplecounter>
 	</element>
-	<element name="text_uiu3b"><text string="/"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uiu3c" defstate="0">
 		<simplecounter maxstate="999" digits="1" align="1">
 			<color red="0.81" green="0.8" blue="0.79" />
diff --git a/src/mame/layout/cxg_enterprise.lay b/src/mame/layout/cxg_enterprise.lay
index e56806ca575..8e63a264d87 100644
--- a/src/mame/layout/cxg_enterprise.lay
+++ b/src/mame/layout/cxg_enterprise.lay
@@ -11,137 +11,41 @@ license:CC0-1.0
 		<disk state="0"><color red="0.14" green="0.014" blue="0.02" /></disk>
 	</element>
 
-	<element name="text_10">
-		<rect><color red="0.41" green="0.4" blue="0.39" /></rect>
-		<text string="1" align="1"><color red="0.9" green="0.9" blue="0.9" /></text>
-	</element>
-	<element name="text_20">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="2" align="1"><color red="0.05" green="0.05" blue="0.05" /></text>
-	</element>
-	<element name="text_30">
-		<rect><color red="0.41" green="0.4" blue="0.39" /></rect>
-		<text string="3" align="1"><color red="0.9" green="0.9" blue="0.9" /></text>
-	</element>
-	<element name="text_40">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="4" align="1"><color red="0.05" green="0.05" blue="0.05" /></text>
-	</element>
-	<element name="text_50">
-		<rect><color red="0.41" green="0.4" blue="0.39" /></rect>
-		<text string="5" align="1"><color red="0.9" green="0.9" blue="0.9" /></text>
-	</element>
-	<element name="text_60">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="6" align="1"><color red="0.05" green="0.05" blue="0.05" /></text>
-	</element>
-	<element name="text_70">
-		<rect><color red="0.41" green="0.4" blue="0.39" /></rect>
-		<text string="7" align="1"><color red="0.9" green="0.9" blue="0.9" /></text>
-	</element>
-	<element name="text_80">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="8" align="1"><color red="0.05" green="0.05" blue="0.05" /></text>
-	</element>
-
-	<element name="text_11">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="1" align="2"><color red="0.05" green="0.05" blue="0.05" /></text>
-	</element>
-	<element name="text_21">
-		<rect><color red="0.41" green="0.4" blue="0.39" /></rect>
-		<text string="2" align="2"><color red="0.9" green="0.9" blue="0.9" /></text>
-	</element>
-	<element name="text_31">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="3" align="2"><color red="0.05" green="0.05" blue="0.05" /></text>
-	</element>
-	<element name="text_41">
-		<rect><color red="0.41" green="0.4" blue="0.39" /></rect>
-		<text string="4" align="2"><color red="0.9" green="0.9" blue="0.9" /></text>
-	</element>
-	<element name="text_51">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="5" align="2"><color red="0.05" green="0.05" blue="0.05" /></text>
-	</element>
-	<element name="text_61">
-		<rect><color red="0.41" green="0.4" blue="0.39" /></rect>
-		<text string="6" align="2"><color red="0.9" green="0.9" blue="0.9" /></text>
-	</element>
-	<element name="text_71">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="7" align="2"><color red="0.05" green="0.05" blue="0.05" /></text>
-	</element>
-	<element name="text_81">
-		<rect><color red="0.41" green="0.4" blue="0.39" /></rect>
-		<text string="8" align="2"><color red="0.9" green="0.9" blue="0.9" /></text>
-	</element>
-
-	<element name="text_a0">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="A"><color red="0.05" green="0.05" blue="0.05" /></text>
-	</element>
-	<element name="text_b0">
-		<rect><color red="0.41" green="0.4" blue="0.39" /></rect>
-		<text string="B"><color red="0.9" green="0.9" blue="0.9" /></text>
-	</element>
-	<element name="text_c0">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="C"><color red="0.05" green="0.05" blue="0.05" /></text>
-	</element>
-	<element name="text_d0">
-		<rect><color red="0.41" green="0.4" blue="0.39" /></rect>
-		<text string="D"><color red="0.9" green="0.9" blue="0.9" /></text>
-	</element>
-	<element name="text_e0">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="E"><color red="0.05" green="0.05" blue="0.05" /></text>
-	</element>
-	<element name="text_f0">
-		<rect><color red="0.41" green="0.4" blue="0.39" /></rect>
-		<text string="F"><color red="0.9" green="0.9" blue="0.9" /></text>
-	</element>
-	<element name="text_g0">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="G"><color red="0.05" green="0.05" blue="0.05" /></text>
-	</element>
-	<element name="text_h0">
-		<rect><color red="0.41" green="0.4" blue="0.39" /></rect>
-		<text string="H"><color red="0.9" green="0.9" blue="0.9" /></text>
-	</element>
-
-	<element name="text_a1">
-		<rect><color red="0.41" green="0.4" blue="0.39" /></rect>
-		<text string="A"><color red="0.9" green="0.9" blue="0.9" /></text>
-	</element>
-	<element name="text_b1">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="B"><color red="0.05" green="0.05" blue="0.05" /></text>
-	</element>
-	<element name="text_c1">
-		<rect><color red="0.41" green="0.4" blue="0.39" /></rect>
-		<text string="C"><color red="0.9" green="0.9" blue="0.9" /></text>
-	</element>
-	<element name="text_d1">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="D"><color red="0.05" green="0.05" blue="0.05" /></text>
-	</element>
-	<element name="text_e1">
-		<rect><color red="0.41" green="0.4" blue="0.39" /></rect>
-		<text string="E"><color red="0.9" green="0.9" blue="0.9" /></text>
-	</element>
-	<element name="text_f1">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="F"><color red="0.05" green="0.05" blue="0.05" /></text>
-	</element>
-	<element name="text_g1">
-		<rect><color red="0.41" green="0.4" blue="0.39" /></rect>
-		<text string="G"><color red="0.9" green="0.9" blue="0.9" /></text>
-	</element>
-	<element name="text_h1">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="H"><color red="0.05" green="0.05" blue="0.05" /></text>
-	</element>
+	<element name="text_10"><text string="1" align="1"><color red="0.9" green="0.9" blue="0.9" /></text></element>
+	<element name="text_20"><text string="2" align="1"><color red="0.05" green="0.05" blue="0.05" /></text></element>
+	<element name="text_30"><text string="3" align="1"><color red="0.9" green="0.9" blue="0.9" /></text></element>
+	<element name="text_40"><text string="4" align="1"><color red="0.05" green="0.05" blue="0.05" /></text></element>
+	<element name="text_50"><text string="5" align="1"><color red="0.9" green="0.9" blue="0.9" /></text></element>
+	<element name="text_60"><text string="6" align="1"><color red="0.05" green="0.05" blue="0.05" /></text></element>
+	<element name="text_70"><text string="7" align="1"><color red="0.9" green="0.9" blue="0.9" /></text></element>
+	<element name="text_80"><text string="8" align="1"><color red="0.05" green="0.05" blue="0.05" /></text></element>
+
+	<element name="text_11"><text string="1" align="2"><color red="0.05" green="0.05" blue="0.05" /></text></element>
+	<element name="text_21"><text string="2" align="2"><color red="0.9" green="0.9" blue="0.9" /></text></element>
+	<element name="text_31"><text string="3" align="2"><color red="0.05" green="0.05" blue="0.05" /></text></element>
+	<element name="text_41"><text string="4" align="2"><color red="0.9" green="0.9" blue="0.9" /></text></element>
+	<element name="text_51"><text string="5" align="2"><color red="0.05" green="0.05" blue="0.05" /></text></element>
+	<element name="text_61"><text string="6" align="2"><color red="0.9" green="0.9" blue="0.9" /></text></element>
+	<element name="text_71"><text string="7" align="2"><color red="0.05" green="0.05" blue="0.05" /></text></element>
+	<element name="text_81"><text string="8" align="2"><color red="0.9" green="0.9" blue="0.9" /></text></element>
+
+	<element name="text_a0"><text string="A"><color red="0.05" green="0.05" blue="0.05" /></text></element>
+	<element name="text_b0"><text string="B"><color red="0.9" green="0.9" blue="0.9" /></text></element>
+	<element name="text_c0"><text string="C"><color red="0.05" green="0.05" blue="0.05" /></text></element>
+	<element name="text_d0"><text string="D"><color red="0.9" green="0.9" blue="0.9" /></text></element>
+	<element name="text_e0"><text string="E"><color red="0.05" green="0.05" blue="0.05" /></text></element>
+	<element name="text_f0"><text string="F"><color red="0.9" green="0.9" blue="0.9" /></text></element>
+	<element name="text_g0"><text string="G"><color red="0.05" green="0.05" blue="0.05" /></text></element>
+	<element name="text_h0"><text string="H"><color red="0.9" green="0.9" blue="0.9" /></text></element>
+
+	<element name="text_a1"><text string="A"><color red="0.9" green="0.9" blue="0.9" /></text></element>
+	<element name="text_b1"><text string="B"><color red="0.05" green="0.05" blue="0.05" /></text></element>
+	<element name="text_c1"><text string="C"><color red="0.9" green="0.9" blue="0.9" /></text></element>
+	<element name="text_d1"><text string="D"><color red="0.05" green="0.05" blue="0.05" /></text></element>
+	<element name="text_e1"><text string="E"><color red="0.9" green="0.9" blue="0.9" /></text></element>
+	<element name="text_f1"><text string="F"><color red="0.05" green="0.05" blue="0.05" /></text></element>
+	<element name="text_g1"><text string="G"><color red="0.9" green="0.9" blue="0.9" /></text></element>
+	<element name="text_h1"><text string="H"><color red="0.05" green="0.05" blue="0.05" /></text></element>
 
 
 <!-- sb board -->
@@ -336,43 +240,23 @@ license:CC0-1.0
 	<element name="text_uit1"><text string="S.BOARD"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uit2"><text string="INTERFACE"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uib1"><text string="BOARD:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uib2">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="RESET"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uib3">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="CLEAR"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uib2"><text string="RESET"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uib3"><text string="CLEAR"><color red="0.01" green="0.01" blue="0.01" /></text></element>
 	<element name="text_uis1"><text string="SPAWN:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uih1"><text string="HAND:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uih2">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="REMOVE"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uih2"><text string="REMOVE"><color red="0.01" green="0.01" blue="0.01" /></text></element>
 	<element name="text_uiu1"><text string="UNDO:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uiu2a">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string=" &lt;&lt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2b">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string=" &lt;  "><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2c">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="   &gt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2d">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string=" &gt;&gt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uiu2a"><text string=" &lt;&lt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2b"><text string=" &lt;  "><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2c"><text string="   &gt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2d"><text string=" &gt;&gt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu3b"><text string="/"><color red="0.81" green="0.8" blue="0.79" /></text></element>
+
 	<element name="text_uiu3a" defstate="0">
 		<simplecounter maxstate="999" digits="1" align="2">
 			<color red="0.81" green="0.8" blue="0.79" />
 		</simplecounter>
 	</element>
-	<element name="text_uiu3b"><text string="/"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uiu3c" defstate="0">
 		<simplecounter maxstate="999" digits="1" align="1">
 			<color red="0.81" green="0.8" blue="0.79" />
diff --git a/src/mame/layout/cxg_galaxy.lay b/src/mame/layout/cxg_galaxy.lay
index bcb4c4ef2c8..9f5ff66b07d 100644
--- a/src/mame/layout/cxg_galaxy.lay
+++ b/src/mame/layout/cxg_galaxy.lay
@@ -11,137 +11,41 @@ license:CC0-1.0
 		<disk state="0"><color red="0.14" green="0.014" blue="0.02" /></disk>
 	</element>
 
-	<element name="text_10">
-		<rect><color red="0.41" green="0.4" blue="0.39" /></rect>
-		<text string="1" align="1"><color red="0.9" green="0.9" blue="0.9" /></text>
-	</element>
-	<element name="text_20">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="2" align="1"><color red="0.05" green="0.05" blue="0.05" /></text>
-	</element>
-	<element name="text_30">
-		<rect><color red="0.41" green="0.4" blue="0.39" /></rect>
-		<text string="3" align="1"><color red="0.9" green="0.9" blue="0.9" /></text>
-	</element>
-	<element name="text_40">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="4" align="1"><color red="0.05" green="0.05" blue="0.05" /></text>
-	</element>
-	<element name="text_50">
-		<rect><color red="0.41" green="0.4" blue="0.39" /></rect>
-		<text string="5" align="1"><color red="0.9" green="0.9" blue="0.9" /></text>
-	</element>
-	<element name="text_60">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="6" align="1"><color red="0.05" green="0.05" blue="0.05" /></text>
-	</element>
-	<element name="text_70">
-		<rect><color red="0.41" green="0.4" blue="0.39" /></rect>
-		<text string="7" align="1"><color red="0.9" green="0.9" blue="0.9" /></text>
-	</element>
-	<element name="text_80">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="8" align="1"><color red="0.05" green="0.05" blue="0.05" /></text>
-	</element>
-
-	<element name="text_11">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="1" align="2"><color red="0.05" green="0.05" blue="0.05" /></text>
-	</element>
-	<element name="text_21">
-		<rect><color red="0.41" green="0.4" blue="0.39" /></rect>
-		<text string="2" align="2"><color red="0.9" green="0.9" blue="0.9" /></text>
-	</element>
-	<element name="text_31">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="3" align="2"><color red="0.05" green="0.05" blue="0.05" /></text>
-	</element>
-	<element name="text_41">
-		<rect><color red="0.41" green="0.4" blue="0.39" /></rect>
-		<text string="4" align="2"><color red="0.9" green="0.9" blue="0.9" /></text>
-	</element>
-	<element name="text_51">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="5" align="2"><color red="0.05" green="0.05" blue="0.05" /></text>
-	</element>
-	<element name="text_61">
-		<rect><color red="0.41" green="0.4" blue="0.39" /></rect>
-		<text string="6" align="2"><color red="0.9" green="0.9" blue="0.9" /></text>
-	</element>
-	<element name="text_71">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="7" align="2"><color red="0.05" green="0.05" blue="0.05" /></text>
-	</element>
-	<element name="text_81">
-		<rect><color red="0.41" green="0.4" blue="0.39" /></rect>
-		<text string="8" align="2"><color red="0.9" green="0.9" blue="0.9" /></text>
-	</element>
-
-	<element name="text_a0">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="A"><color red="0.05" green="0.05" blue="0.05" /></text>
-	</element>
-	<element name="text_b0">
-		<rect><color red="0.41" green="0.4" blue="0.39" /></rect>
-		<text string="B"><color red="0.9" green="0.9" blue="0.9" /></text>
-	</element>
-	<element name="text_c0">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="C"><color red="0.05" green="0.05" blue="0.05" /></text>
-	</element>
-	<element name="text_d0">
-		<rect><color red="0.41" green="0.4" blue="0.39" /></rect>
-		<text string="D"><color red="0.9" green="0.9" blue="0.9" /></text>
-	</element>
-	<element name="text_e0">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="E"><color red="0.05" green="0.05" blue="0.05" /></text>
-	</element>
-	<element name="text_f0">
-		<rect><color red="0.41" green="0.4" blue="0.39" /></rect>
-		<text string="F"><color red="0.9" green="0.9" blue="0.9" /></text>
-	</element>
-	<element name="text_g0">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="G"><color red="0.05" green="0.05" blue="0.05" /></text>
-	</element>
-	<element name="text_h0">
-		<rect><color red="0.41" green="0.4" blue="0.39" /></rect>
-		<text string="H"><color red="0.9" green="0.9" blue="0.9" /></text>
-	</element>
-
-	<element name="text_a1">
-		<rect><color red="0.41" green="0.4" blue="0.39" /></rect>
-		<text string="A"><color red="0.9" green="0.9" blue="0.9" /></text>
-	</element>
-	<element name="text_b1">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="B"><color red="0.05" green="0.05" blue="0.05" /></text>
-	</element>
-	<element name="text_c1">
-		<rect><color red="0.41" green="0.4" blue="0.39" /></rect>
-		<text string="C"><color red="0.9" green="0.9" blue="0.9" /></text>
-	</element>
-	<element name="text_d1">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="D"><color red="0.05" green="0.05" blue="0.05" /></text>
-	</element>
-	<element name="text_e1">
-		<rect><color red="0.41" green="0.4" blue="0.39" /></rect>
-		<text string="E"><color red="0.9" green="0.9" blue="0.9" /></text>
-	</element>
-	<element name="text_f1">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="F"><color red="0.05" green="0.05" blue="0.05" /></text>
-	</element>
-	<element name="text_g1">
-		<rect><color red="0.41" green="0.4" blue="0.39" /></rect>
-		<text string="G"><color red="0.9" green="0.9" blue="0.9" /></text>
-	</element>
-	<element name="text_h1">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="H"><color red="0.05" green="0.05" blue="0.05" /></text>
-	</element>
+	<element name="text_10"><text string="1" align="1"><color red="0.9" green="0.9" blue="0.9" /></text></element>
+	<element name="text_20"><text string="2" align="1"><color red="0.05" green="0.05" blue="0.05" /></text></element>
+	<element name="text_30"><text string="3" align="1"><color red="0.9" green="0.9" blue="0.9" /></text></element>
+	<element name="text_40"><text string="4" align="1"><color red="0.05" green="0.05" blue="0.05" /></text></element>
+	<element name="text_50"><text string="5" align="1"><color red="0.9" green="0.9" blue="0.9" /></text></element>
+	<element name="text_60"><text string="6" align="1"><color red="0.05" green="0.05" blue="0.05" /></text></element>
+	<element name="text_70"><text string="7" align="1"><color red="0.9" green="0.9" blue="0.9" /></text></element>
+	<element name="text_80"><text string="8" align="1"><color red="0.05" green="0.05" blue="0.05" /></text></element>
+
+	<element name="text_11"><text string="1" align="2"><color red="0.05" green="0.05" blue="0.05" /></text></element>
+	<element name="text_21"><text string="2" align="2"><color red="0.9" green="0.9" blue="0.9" /></text></element>
+	<element name="text_31"><text string="3" align="2"><color red="0.05" green="0.05" blue="0.05" /></text></element>
+	<element name="text_41"><text string="4" align="2"><color red="0.9" green="0.9" blue="0.9" /></text></element>
+	<element name="text_51"><text string="5" align="2"><color red="0.05" green="0.05" blue="0.05" /></text></element>
+	<element name="text_61"><text string="6" align="2"><color red="0.9" green="0.9" blue="0.9" /></text></element>
+	<element name="text_71"><text string="7" align="2"><color red="0.05" green="0.05" blue="0.05" /></text></element>
+	<element name="text_81"><text string="8" align="2"><color red="0.9" green="0.9" blue="0.9" /></text></element>
+
+	<element name="text_a0"><text string="A"><color red="0.05" green="0.05" blue="0.05" /></text></element>
+	<element name="text_b0"><text string="B"><color red="0.9" green="0.9" blue="0.9" /></text></element>
+	<element name="text_c0"><text string="C"><color red="0.05" green="0.05" blue="0.05" /></text></element>
+	<element name="text_d0"><text string="D"><color red="0.9" green="0.9" blue="0.9" /></text></element>
+	<element name="text_e0"><text string="E"><color red="0.05" green="0.05" blue="0.05" /></text></element>
+	<element name="text_f0"><text string="F"><color red="0.9" green="0.9" blue="0.9" /></text></element>
+	<element name="text_g0"><text string="G"><color red="0.05" green="0.05" blue="0.05" /></text></element>
+	<element name="text_h0"><text string="H"><color red="0.9" green="0.9" blue="0.9" /></text></element>
+
+	<element name="text_a1"><text string="A"><color red="0.9" green="0.9" blue="0.9" /></text></element>
+	<element name="text_b1"><text string="B"><color red="0.05" green="0.05" blue="0.05" /></text></element>
+	<element name="text_c1"><text string="C"><color red="0.9" green="0.9" blue="0.9" /></text></element>
+	<element name="text_d1"><text string="D"><color red="0.05" green="0.05" blue="0.05" /></text></element>
+	<element name="text_e1"><text string="E"><color red="0.9" green="0.9" blue="0.9" /></text></element>
+	<element name="text_f1"><text string="F"><color red="0.05" green="0.05" blue="0.05" /></text></element>
+	<element name="text_g1"><text string="G"><color red="0.9" green="0.9" blue="0.9" /></text></element>
+	<element name="text_h1"><text string="H"><color red="0.05" green="0.05" blue="0.05" /></text></element>
 
 
 <!-- sb board -->
@@ -336,43 +240,23 @@ license:CC0-1.0
 	<element name="text_uit1"><text string="S.BOARD"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uit2"><text string="INTERFACE"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uib1"><text string="BOARD:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uib2">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="RESET"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uib3">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="CLEAR"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uib2"><text string="RESET"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uib3"><text string="CLEAR"><color red="0.01" green="0.01" blue="0.01" /></text></element>
 	<element name="text_uis1"><text string="SPAWN:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uih1"><text string="HAND:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uih2">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="REMOVE"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uih2"><text string="REMOVE"><color red="0.01" green="0.01" blue="0.01" /></text></element>
 	<element name="text_uiu1"><text string="UNDO:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uiu2a">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string=" &lt;&lt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2b">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string=" &lt;  "><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2c">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="   &gt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2d">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string=" &gt;&gt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uiu2a"><text string=" &lt;&lt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2b"><text string=" &lt;  "><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2c"><text string="   &gt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2d"><text string=" &gt;&gt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu3b"><text string="/"><color red="0.81" green="0.8" blue="0.79" /></text></element>
+
 	<element name="text_uiu3a" defstate="0">
 		<simplecounter maxstate="999" digits="1" align="2">
 			<color red="0.81" green="0.8" blue="0.79" />
 		</simplecounter>
 	</element>
-	<element name="text_uiu3b"><text string="/"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uiu3c" defstate="0">
 		<simplecounter maxstate="999" digits="1" align="1">
 			<color red="0.81" green="0.8" blue="0.79" />
diff --git a/src/mame/layout/cxg_scptchess_v1.lay b/src/mame/layout/cxg_scptchess_v1.lay
index b40f723c8cc..abe6c05baa0 100644
--- a/src/mame/layout/cxg_scptchess_v1.lay
+++ b/src/mame/layout/cxg_scptchess_v1.lay
@@ -200,43 +200,23 @@ license:CC0-1.0
 	<element name="text_uit1"><text string="S.BOARD"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uit2"><text string="INTERFACE"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uib1"><text string="BOARD:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uib2">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="RESET"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uib3">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="CLEAR"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uib2"><text string="RESET"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uib3"><text string="CLEAR"><color red="0.01" green="0.01" blue="0.01" /></text></element>
 	<element name="text_uis1"><text string="SPAWN:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uih1"><text string="HAND:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uih2">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="REMOVE"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uih2"><text string="REMOVE"><color red="0.01" green="0.01" blue="0.01" /></text></element>
 	<element name="text_uiu1"><text string="UNDO:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uiu2a">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string=" &lt;&lt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2b">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string=" &lt;  "><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2c">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="   &gt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2d">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string=" &gt;&gt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uiu2a"><text string=" &lt;&lt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2b"><text string=" &lt;  "><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2c"><text string="   &gt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2d"><text string=" &gt;&gt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu3b"><text string="/"><color red="0.81" green="0.8" blue="0.79" /></text></element>
+
 	<element name="text_uiu3a" defstate="0">
 		<simplecounter maxstate="999" digits="1" align="2">
 			<color red="0.81" green="0.8" blue="0.79" />
 		</simplecounter>
 	</element>
-	<element name="text_uiu3b"><text string="/"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uiu3c" defstate="0">
 		<simplecounter maxstate="999" digits="1" align="1">
 			<color red="0.81" green="0.8" blue="0.79" />
diff --git a/src/mame/layout/cxg_scptchess_v2.lay b/src/mame/layout/cxg_scptchess_v2.lay
index c39b121446d..880b254fa20 100644
--- a/src/mame/layout/cxg_scptchess_v2.lay
+++ b/src/mame/layout/cxg_scptchess_v2.lay
@@ -200,43 +200,23 @@ license:CC0-1.0
 	<element name="text_uit1"><text string="S.BOARD"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uit2"><text string="INTERFACE"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uib1"><text string="BOARD:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uib2">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="RESET"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uib3">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="CLEAR"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uib2"><text string="RESET"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uib3"><text string="CLEAR"><color red="0.01" green="0.01" blue="0.01" /></text></element>
 	<element name="text_uis1"><text string="SPAWN:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uih1"><text string="HAND:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uih2">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="REMOVE"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uih2"><text string="REMOVE"><color red="0.01" green="0.01" blue="0.01" /></text></element>
 	<element name="text_uiu1"><text string="UNDO:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uiu2a">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string=" &lt;&lt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2b">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string=" &lt;  "><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2c">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="   &gt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2d">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string=" &gt;&gt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uiu2a"><text string=" &lt;&lt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2b"><text string=" &lt;  "><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2c"><text string="   &gt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2d"><text string=" &gt;&gt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu3b"><text string="/"><color red="0.81" green="0.8" blue="0.79" /></text></element>
+
 	<element name="text_uiu3a" defstate="0">
 		<simplecounter maxstate="999" digits="1" align="2">
 			<color red="0.81" green="0.8" blue="0.79" />
 		</simplecounter>
 	</element>
-	<element name="text_uiu3b"><text string="/"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uiu3c" defstate="0">
 		<simplecounter maxstate="999" digits="1" align="1">
 			<color red="0.81" green="0.8" blue="0.79" />
diff --git a/src/mame/layout/cxg_senterprise.lay b/src/mame/layout/cxg_senterprise.lay
index b8939404ed3..722622dece8 100644
--- a/src/mame/layout/cxg_senterprise.lay
+++ b/src/mame/layout/cxg_senterprise.lay
@@ -11,137 +11,41 @@ license:CC0-1.0
 		<disk state="0"><color red="0.14" green="0.014" blue="0.02" /></disk>
 	</element>
 
-	<element name="text_10">
-		<rect><color red="0.41" green="0.4" blue="0.39" /></rect>
-		<text string="1" align="1"><color red="0.9" green="0.9" blue="0.9" /></text>
-	</element>
-	<element name="text_20">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="2" align="1"><color red="0.05" green="0.05" blue="0.05" /></text>
-	</element>
-	<element name="text_30">
-		<rect><color red="0.41" green="0.4" blue="0.39" /></rect>
-		<text string="3" align="1"><color red="0.9" green="0.9" blue="0.9" /></text>
-	</element>
-	<element name="text_40">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="4" align="1"><color red="0.05" green="0.05" blue="0.05" /></text>
-	</element>
-	<element name="text_50">
-		<rect><color red="0.41" green="0.4" blue="0.39" /></rect>
-		<text string="5" align="1"><color red="0.9" green="0.9" blue="0.9" /></text>
-	</element>
-	<element name="text_60">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="6" align="1"><color red="0.05" green="0.05" blue="0.05" /></text>
-	</element>
-	<element name="text_70">
-		<rect><color red="0.41" green="0.4" blue="0.39" /></rect>
-		<text string="7" align="1"><color red="0.9" green="0.9" blue="0.9" /></text>
-	</element>
-	<element name="text_80">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="8" align="1"><color red="0.05" green="0.05" blue="0.05" /></text>
-	</element>
-
-	<element name="text_11">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="1" align="2"><color red="0.05" green="0.05" blue="0.05" /></text>
-	</element>
-	<element name="text_21">
-		<rect><color red="0.41" green="0.4" blue="0.39" /></rect>
-		<text string="2" align="2"><color red="0.9" green="0.9" blue="0.9" /></text>
-	</element>
-	<element name="text_31">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="3" align="2"><color red="0.05" green="0.05" blue="0.05" /></text>
-	</element>
-	<element name="text_41">
-		<rect><color red="0.41" green="0.4" blue="0.39" /></rect>
-		<text string="4" align="2"><color red="0.9" green="0.9" blue="0.9" /></text>
-	</element>
-	<element name="text_51">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="5" align="2"><color red="0.05" green="0.05" blue="0.05" /></text>
-	</element>
-	<element name="text_61">
-		<rect><color red="0.41" green="0.4" blue="0.39" /></rect>
-		<text string="6" align="2"><color red="0.9" green="0.9" blue="0.9" /></text>
-	</element>
-	<element name="text_71">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="7" align="2"><color red="0.05" green="0.05" blue="0.05" /></text>
-	</element>
-	<element name="text_81">
-		<rect><color red="0.41" green="0.4" blue="0.39" /></rect>
-		<text string="8" align="2"><color red="0.9" green="0.9" blue="0.9" /></text>
-	</element>
-
-	<element name="text_a0">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="A"><color red="0.05" green="0.05" blue="0.05" /></text>
-	</element>
-	<element name="text_b0">
-		<rect><color red="0.41" green="0.4" blue="0.39" /></rect>
-		<text string="B"><color red="0.9" green="0.9" blue="0.9" /></text>
-	</element>
-	<element name="text_c0">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="C"><color red="0.05" green="0.05" blue="0.05" /></text>
-	</element>
-	<element name="text_d0">
-		<rect><color red="0.41" green="0.4" blue="0.39" /></rect>
-		<text string="D"><color red="0.9" green="0.9" blue="0.9" /></text>
-	</element>
-	<element name="text_e0">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="E"><color red="0.05" green="0.05" blue="0.05" /></text>
-	</element>
-	<element name="text_f0">
-		<rect><color red="0.41" green="0.4" blue="0.39" /></rect>
-		<text string="F"><color red="0.9" green="0.9" blue="0.9" /></text>
-	</element>
-	<element name="text_g0">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="G"><color red="0.05" green="0.05" blue="0.05" /></text>
-	</element>
-	<element name="text_h0">
-		<rect><color red="0.41" green="0.4" blue="0.39" /></rect>
-		<text string="H"><color red="0.9" green="0.9" blue="0.9" /></text>
-	</element>
-
-	<element name="text_a1">
-		<rect><color red="0.41" green="0.4" blue="0.39" /></rect>
-		<text string="A"><color red="0.9" green="0.9" blue="0.9" /></text>
-	</element>
-	<element name="text_b1">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="B"><color red="0.05" green="0.05" blue="0.05" /></text>
-	</element>
-	<element name="text_c1">
-		<rect><color red="0.41" green="0.4" blue="0.39" /></rect>
-		<text string="C"><color red="0.9" green="0.9" blue="0.9" /></text>
-	</element>
-	<element name="text_d1">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="D"><color red="0.05" green="0.05" blue="0.05" /></text>
-	</element>
-	<element name="text_e1">
-		<rect><color red="0.41" green="0.4" blue="0.39" /></rect>
-		<text string="E"><color red="0.9" green="0.9" blue="0.9" /></text>
-	</element>
-	<element name="text_f1">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="F"><color red="0.05" green="0.05" blue="0.05" /></text>
-	</element>
-	<element name="text_g1">
-		<rect><color red="0.41" green="0.4" blue="0.39" /></rect>
-		<text string="G"><color red="0.9" green="0.9" blue="0.9" /></text>
-	</element>
-	<element name="text_h1">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="H"><color red="0.05" green="0.05" blue="0.05" /></text>
-	</element>
+	<element name="text_10"><text string="1" align="1"><color red="0.9" green="0.9" blue="0.9" /></text></element>
+	<element name="text_20"><text string="2" align="1"><color red="0.05" green="0.05" blue="0.05" /></text></element>
+	<element name="text_30"><text string="3" align="1"><color red="0.9" green="0.9" blue="0.9" /></text></element>
+	<element name="text_40"><text string="4" align="1"><color red="0.05" green="0.05" blue="0.05" /></text></element>
+	<element name="text_50"><text string="5" align="1"><color red="0.9" green="0.9" blue="0.9" /></text></element>
+	<element name="text_60"><text string="6" align="1"><color red="0.05" green="0.05" blue="0.05" /></text></element>
+	<element name="text_70"><text string="7" align="1"><color red="0.9" green="0.9" blue="0.9" /></text></element>
+	<element name="text_80"><text string="8" align="1"><color red="0.05" green="0.05" blue="0.05" /></text></element>
+
+	<element name="text_11"><text string="1" align="2"><color red="0.05" green="0.05" blue="0.05" /></text></element>
+	<element name="text_21"><text string="2" align="2"><color red="0.9" green="0.9" blue="0.9" /></text></element>
+	<element name="text_31"><text string="3" align="2"><color red="0.05" green="0.05" blue="0.05" /></text></element>
+	<element name="text_41"><text string="4" align="2"><color red="0.9" green="0.9" blue="0.9" /></text></element>
+	<element name="text_51"><text string="5" align="2"><color red="0.05" green="0.05" blue="0.05" /></text></element>
+	<element name="text_61"><text string="6" align="2"><color red="0.9" green="0.9" blue="0.9" /></text></element>
+	<element name="text_71"><text string="7" align="2"><color red="0.05" green="0.05" blue="0.05" /></text></element>
+	<element name="text_81"><text string="8" align="2"><color red="0.9" green="0.9" blue="0.9" /></text></element>
+
+	<element name="text_a0"><text string="A"><color red="0.05" green="0.05" blue="0.05" /></text></element>
+	<element name="text_b0"><text string="B"><color red="0.9" green="0.9" blue="0.9" /></text></element>
+	<element name="text_c0"><text string="C"><color red="0.05" green="0.05" blue="0.05" /></text></element>
+	<element name="text_d0"><text string="D"><color red="0.9" green="0.9" blue="0.9" /></text></element>
+	<element name="text_e0"><text string="E"><color red="0.05" green="0.05" blue="0.05" /></text></element>
+	<element name="text_f0"><text string="F"><color red="0.9" green="0.9" blue="0.9" /></text></element>
+	<element name="text_g0"><text string="G"><color red="0.05" green="0.05" blue="0.05" /></text></element>
+	<element name="text_h0"><text string="H"><color red="0.9" green="0.9" blue="0.9" /></text></element>
+
+	<element name="text_a1"><text string="A"><color red="0.9" green="0.9" blue="0.9" /></text></element>
+	<element name="text_b1"><text string="B"><color red="0.05" green="0.05" blue="0.05" /></text></element>
+	<element name="text_c1"><text string="C"><color red="0.9" green="0.9" blue="0.9" /></text></element>
+	<element name="text_d1"><text string="D"><color red="0.05" green="0.05" blue="0.05" /></text></element>
+	<element name="text_e1"><text string="E"><color red="0.9" green="0.9" blue="0.9" /></text></element>
+	<element name="text_f1"><text string="F"><color red="0.05" green="0.05" blue="0.05" /></text></element>
+	<element name="text_g1"><text string="G"><color red="0.9" green="0.9" blue="0.9" /></text></element>
+	<element name="text_h1"><text string="H"><color red="0.05" green="0.05" blue="0.05" /></text></element>
 
 
 <!-- sb board -->
@@ -336,43 +240,23 @@ license:CC0-1.0
 	<element name="text_uit1"><text string="S.BOARD"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uit2"><text string="INTERFACE"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uib1"><text string="BOARD:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uib2">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="RESET"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uib3">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="CLEAR"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uib2"><text string="RESET"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uib3"><text string="CLEAR"><color red="0.01" green="0.01" blue="0.01" /></text></element>
 	<element name="text_uis1"><text string="SPAWN:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uih1"><text string="HAND:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uih2">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="REMOVE"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uih2"><text string="REMOVE"><color red="0.01" green="0.01" blue="0.01" /></text></element>
 	<element name="text_uiu1"><text string="UNDO:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uiu2a">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string=" &lt;&lt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2b">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string=" &lt;  "><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2c">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="   &gt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2d">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string=" &gt;&gt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uiu2a"><text string=" &lt;&lt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2b"><text string=" &lt;  "><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2c"><text string="   &gt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2d"><text string=" &gt;&gt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu3b"><text string="/"><color red="0.81" green="0.8" blue="0.79" /></text></element>
+
 	<element name="text_uiu3a" defstate="0">
 		<simplecounter maxstate="999" digits="1" align="2">
 			<color red="0.81" green="0.8" blue="0.79" />
 		</simplecounter>
 	</element>
-	<element name="text_uiu3b"><text string="/"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uiu3c" defstate="0">
 		<simplecounter maxstate="999" digits="1" align="1">
 			<color red="0.81" green="0.8" blue="0.79" />
diff --git a/src/mame/layout/cxg_sphinx40.lay b/src/mame/layout/cxg_sphinx40.lay
index 78f7a163e94..f1be714b2f9 100644
--- a/src/mame/layout/cxg_sphinx40.lay
+++ b/src/mame/layout/cxg_sphinx40.lay
@@ -11,71 +11,23 @@ license:CC0-1.0
 		<disk state="0"><color red="0.1" green="0.01" blue="0.015" /></disk>
 	</element>
 
-	<element name="text_1">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="1"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_2">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="2"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_3">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="3"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_4">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="4"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_5">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="5"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_6">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="6"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_7">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="7"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_8">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="8"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-
-	<element name="text_a">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="A"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_b">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="B"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_c">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="C"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_d">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="D"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_e">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="E"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_f">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="F"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_g">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="G"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_h">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="H"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
+	<element name="text_1"><text string="1"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_2"><text string="2"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_3"><text string="3"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_4"><text string="4"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_5"><text string="5"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_6"><text string="6"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_7"><text string="7"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_8"><text string="8"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+
+	<element name="text_a"><text string="A"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_b"><text string="B"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_c"><text string="C"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_d"><text string="D"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_e"><text string="E"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_f"><text string="F"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_g"><text string="G"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_h"><text string="H"><color red="0.87" green="0.87" blue="0.84" /></text></element>
 
 
 <!-- sb board -->
@@ -245,43 +197,23 @@ license:CC0-1.0
 	<element name="text_uit1"><text string="S.BOARD"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uit2"><text string="INTERFACE"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uib1"><text string="BOARD:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uib2">
-		<rect><color red="0.84" green="0.75" blue="0.50" /></rect>
-		<text string="RESET"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uib3">
-		<rect><color red="0.84" green="0.75" blue="0.50" /></rect>
-		<text string="CLEAR"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uib2"><text string="RESET"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uib3"><text string="CLEAR"><color red="0.01" green="0.01" blue="0.01" /></text></element>
 	<element name="text_uis1"><text string="SPAWN:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uih1"><text string="HAND:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uih2">
-		<rect><color red="0.84" green="0.75" blue="0.50" /></rect>
-		<text string="REMOVE"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uih2"><text string="REMOVE"><color red="0.01" green="0.01" blue="0.01" /></text></element>
 	<element name="text_uiu1"><text string="UNDO:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uiu2a">
-		<rect><color red="0.84" green="0.75" blue="0.50" /></rect>
-		<text string=" &lt;&lt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2b">
-		<rect><color red="0.84" green="0.75" blue="0.50" /></rect>
-		<text string=" &lt;  "><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2c">
-		<rect><color red="0.84" green="0.75" blue="0.50" /></rect>
-		<text string="   &gt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2d">
-		<rect><color red="0.84" green="0.75" blue="0.50" /></rect>
-		<text string=" &gt;&gt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uiu2a"><text string=" &lt;&lt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2b"><text string=" &lt;  "><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2c"><text string="   &gt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2d"><text string=" &gt;&gt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu3b"><text string="/"><color red="0.81" green="0.8" blue="0.79" /></text></element>
+
 	<element name="text_uiu3a" defstate="0">
 		<simplecounter maxstate="999" digits="1" align="2">
 			<color red="0.81" green="0.8" blue="0.79" />
 		</simplecounter>
 	</element>
-	<element name="text_uiu3b"><text string="/"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uiu3c" defstate="0">
 		<simplecounter maxstate="999" digits="1" align="1">
 			<color red="0.81" green="0.8" blue="0.79" />
diff --git a/src/mame/layout/debutm.lay b/src/mame/layout/debutm.lay
index a4cda2122d7..493d1bf5030 100644
--- a/src/mame/layout/debutm.lay
+++ b/src/mame/layout/debutm.lay
@@ -24,165 +24,48 @@ license:CC0-1.0
 		<rect state="0"><color red="0.17" green="0.15" blue="0.15" /></rect>
 	</element>
 
-	<element name="text_1">
-		<rect><color red="0.88" green="0.84" blue="0.65" /></rect>
-		<text string="1" align="1"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_2">
-		<rect><color red="0.88" green="0.84" blue="0.65" /></rect>
-		<text string="2" align="1"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_3">
-		<rect><color red="0.88" green="0.84" blue="0.65" /></rect>
-		<text string="3" align="1"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_4">
-		<rect><color red="0.88" green="0.84" blue="0.65" /></rect>
-		<text string="4" align="1"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_5">
-		<rect><color red="0.88" green="0.84" blue="0.65" /></rect>
-		<text string="5" align="1"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_6">
-		<rect><color red="0.88" green="0.84" blue="0.65" /></rect>
-		<text string="6" align="1"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_7">
-		<rect><color red="0.88" green="0.84" blue="0.65" /></rect>
-		<text string="7" align="1"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_8">
-		<rect><color red="0.88" green="0.84" blue="0.65" /></rect>
-		<text string="8" align="1"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-
-	<element name="text_a">
-		<rect><color red="0.88" green="0.84" blue="0.65" /></rect>
-		<text string="A"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_b">
-		<rect><color red="0.88" green="0.84" blue="0.65" /></rect>
-		<text string="B"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_c">
-		<rect><color red="0.88" green="0.84" blue="0.65" /></rect>
-		<text string="C"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_d">
-		<rect><color red="0.88" green="0.84" blue="0.65" /></rect>
-		<text string="D"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_e">
-		<rect><color red="0.88" green="0.84" blue="0.65" /></rect>
-		<text string="E"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_f">
-		<rect><color red="0.88" green="0.84" blue="0.65" /></rect>
-		<text string="F"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_g">
-		<rect><color red="0.88" green="0.84" blue="0.65" /></rect>
-		<text string="G"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_h">
-		<rect><color red="0.88" green="0.84" blue="0.65" /></rect>
-		<text string="H"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-
-	<element name="text_b1">
-		<rect><color red="0.88" green="0.84" blue="0.65" /></rect>
-		<text string="АН"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_b2">
-		<rect><color red="0.88" green="0.84" blue="0.65" /></rect>
-		<text string="ХОД"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_b3">
-		<rect><color red="0.88" green="0.84" blue="0.65" /></rect>
-		<text string="ИНТ"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_b4">
-		<rect><color red="0.88" green="0.84" blue="0.65" /></rect>
-		<text string="ПОЗ"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_b5">
-		<rect><color red="0.88" green="0.84" blue="0.65" /></rect>
-		<text string="ВФ"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_b6">
-		<rect><color red="0.88" green="0.84" blue="0.65" /></rect>
-		<text string="ВП"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_b7">
-		<rect><color red="0.88" green="0.84" blue="0.65" /></rect>
-		<text string="УР"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_b8">
-		<rect><color red="0.88" green="0.84" blue="0.65" /></rect>
-		<text string="ВВ"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_b9">
-		<rect><color red="0.88" green="0.84" blue="0.65" /></rect>
-		<text string="СБ"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-
-	<element name="text_tb1">
-		<rect><color red="0.88" green="0.84" blue="0.65" /></rect>
-		<text string="ANALYSIS"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_tb2a">
-		<rect><color red="0.88" green="0.84" blue="0.65" /></rect>
-		<text string="FORCE"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_tb2b">
-		<rect><color red="0.88" green="0.84" blue="0.65" /></rect>
-		<text string="MOVE"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_tb3">
-		<rect><color red="0.88" green="0.84" blue="0.65" /></rect>
-		<text string="1P/2P"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_tb4a">
-		<rect><color red="0.88" green="0.84" blue="0.65" /></rect>
-		<text string="POS."><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_tb4b">
-		<rect><color red="0.88" green="0.84" blue="0.65" /></rect>
-		<text string="MODE"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_tb5a">
-		<rect><color red="0.88" green="0.84" blue="0.65" /></rect>
-		<text string="SELECT"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_tb5b">
-		<rect><color red="0.88" green="0.84" blue="0.65" /></rect>
-		<text string="PIECE"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_tb6a">
-		<rect><color red="0.88" green="0.84" blue="0.65" /></rect>
-		<text string="TAKE"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_tb6b">
-		<rect><color red="0.88" green="0.84" blue="0.65" /></rect>
-		<text string="BACK"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_tb7">
-		<rect><color red="0.88" green="0.84" blue="0.65" /></rect>
-		<text string="LEVEL"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_tb8a">
-		<rect><color red="0.88" green="0.84" blue="0.65" /></rect>
-		<text string="ENTER"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_tb8b">
-		<rect><color red="0.88" green="0.84" blue="0.65" /></rect>
-		<text string="POS."><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_tb9">
-		<rect><color red="0.88" green="0.84" blue="0.65" /></rect>
-		<text string="RESET"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_1"><text string="1" align="1"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_2"><text string="2" align="1"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_3"><text string="3" align="1"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_4"><text string="4" align="1"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_5"><text string="5" align="1"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_6"><text string="6" align="1"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_7"><text string="7" align="1"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_8"><text string="8" align="1"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+
+	<element name="text_a"><text string="A"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_b"><text string="B"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_c"><text string="C"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_d"><text string="D"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_e"><text string="E"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_f"><text string="F"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_g"><text string="G"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_h"><text string="H"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+
+	<element name="text_b1"><text string="АН"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_b2"><text string="ХОД"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_b3"><text string="ИНТ"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_b4"><text string="ПОЗ"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_b5"><text string="ВФ"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_b6"><text string="ВП"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_b7"><text string="УР"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_b8"><text string="ВВ"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_b9"><text string="СБ"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+
+	<element name="text_tb1"><text string="ANALYSIS"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_tb2a"><text string="FORCE"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_tb2b"><text string="MOVE"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_tb3"><text string="1P/2P"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_tb4a"><text string="POS."><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_tb4b"><text string="MODE"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_tb5a"><text string="SELECT"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_tb5b"><text string="PIECE"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_tb6a"><text string="TAKE"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_tb6b"><text string="BACK"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_tb7"><text string="LEVEL"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_tb8a"><text string="ENTER"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_tb8b"><text string="POS."><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_tb9"><text string="RESET"><color red="0.01" green="0.01" blue="0.01" /></text></element>
 
 
 <!-- sb board -->
@@ -340,43 +223,23 @@ license:CC0-1.0
 	<element name="text_uit1"><text string="S.BOARD"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uit2"><text string="INTERFACE"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uib1"><text string="BOARD:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uib2">
-		<rect><color red="0.88" green="0.84" blue="0.65" /></rect>
-		<text string="RESET"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uib3">
-		<rect><color red="0.88" green="0.84" blue="0.65" /></rect>
-		<text string="CLEAR"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uib2"><text string="RESET"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uib3"><text string="CLEAR"><color red="0.01" green="0.01" blue="0.01" /></text></element>
 	<element name="text_uis1"><text string="SPAWN:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uih1"><text string="HAND:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uih2">
-		<rect><color red="0.88" green="0.84" blue="0.65" /></rect>
-		<text string="REMOVE"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uih2"><text string="REMOVE"><color red="0.01" green="0.01" blue="0.01" /></text></element>
 	<element name="text_uiu1"><text string="UNDO:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uiu2a">
-		<rect><color red="0.88" green="0.84" blue="0.65" /></rect>
-		<text string=" &lt;&lt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2b">
-		<rect><color red="0.88" green="0.84" blue="0.65" /></rect>
-		<text string=" &lt;  "><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2c">
-		<rect><color red="0.88" green="0.84" blue="0.65" /></rect>
-		<text string="   &gt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2d">
-		<rect><color red="0.88" green="0.84" blue="0.65" /></rect>
-		<text string=" &gt;&gt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uiu2a"><text string=" &lt;&lt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2b"><text string=" &lt;  "><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2c"><text string="   &gt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2d"><text string=" &gt;&gt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu3b"><text string="/"><color red="0.81" green="0.8" blue="0.79" /></text></element>
+
 	<element name="text_uiu3a" defstate="0">
 		<simplecounter maxstate="999" digits="1" align="2">
 			<color red="0.81" green="0.8" blue="0.79" />
 		</simplecounter>
 	</element>
-	<element name="text_uiu3b"><text string="/"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uiu3c" defstate="0">
 		<simplecounter maxstate="999" digits="1" align="1">
 			<color red="0.81" green="0.8" blue="0.79" />
diff --git a/src/mame/layout/ebball.lay b/src/mame/layout/ebball.lay
index 7609ecd1f96..cd96d6d6e76 100644
--- a/src/mame/layout/ebball.lay
+++ b/src/mame/layout/ebball.lay
@@ -13,24 +13,13 @@ license:CC0-1.0
 	<element name="disk_white"><disk><color red="0.75" green="0.75" blue="0.75" /></disk></element>
 	<element name="disk_white2"><disk><color red="0.85" green="0.85" blue="0.85" /></disk></element>
 
-<!-- background is dark-red, to hide the leds -->
-
+	<!-- background is dark-red, to hide the leds -->
 	<element name="static_bg"><rect><color red="0.2" green="0.04" blue="0.05" /></rect></element>
 	<element name="disk_bg"><disk><color red="0.2" green="0.04" blue="0.05" /></disk></element>
 
-
-	<element name="field_guy">
-		<rect><color red="0.0" green="0.38" blue="0.15" /></rect>
-		<text string=":-)"><color red="0.85" green="0.85" blue="0.85" /></text>
-	</element>
-	<element name="base_guy">
-		<rect><color red="0.2" green="0.04" blue="0.05" /></rect>
-		<text string=":-)"><color red="0.85" green="0.85" blue="0.85" /></text>
-	</element>
-	<element name="pitcher">
-		<rect><color red="0.2" green="0.04" blue="0.05" /></rect>
-		<text string=":-P"><color red="0.85" green="0.85" blue="0.85" /></text>
-	</element>
+	<element name="field_guy"><text string=":-)"><color red="0.85" green="0.85" blue="0.85" /></text></element>
+	<element name="base_guy"><text string=":-)"><color red="0.85" green="0.85" blue="0.85" /></text></element>
+	<element name="pitcher"><text string=":-P"><color red="0.85" green="0.85" blue="0.85" /></text></element>
 
 	<element name="text_s"><text string="S" align="1"><color red="0.95" green="0.95" blue="0.95" /></text></element>
 	<element name="text_b"><text string="B" align="1"><color red="0.95" green="0.95" blue="0.95" /></text></element>
@@ -52,7 +41,6 @@ license:CC0-1.0
 	<element name="text_score"><text string="SCORE"><color red="0.4" green="0.4" blue="0.4" /></text></element>
 	<element name="text_count"><text string="COUNT"><color red="0.4" green="0.4" blue="0.4" /></text></element>
 
-
 	<element name="digit" defstate="0">
 		<led7seg><color red="1.0" green="0.20" blue="0.22" /></led7seg>
 	</element>
@@ -71,8 +59,7 @@ license:CC0-1.0
 			<bounds left="0" right="100" top="0" bottom="114" />
 		</element>
 
-	<!-- outer bezel -->
-
+		<!-- outer bezel -->
 		<element ref="text_score"><bounds x="5.5" y="2" width="8" height="3" /></element>
 		<element ref="text_count"><bounds x="86" y="2" width="8" height="3" /></element>
 
@@ -91,8 +78,7 @@ license:CC0-1.0
 		<element name="7.2" ref="led"><bounds x="86" y="15" width="3" height="3" /></element>
 		<element name="7.3" ref="led"><bounds x="90" y="15" width="3" height="3" /></element>
 
-	<!-- board -->
-
+		<!-- board -->
 		<element ref="disk_green"><bounds x="-5" y="25" width="110" height="110" /></element>
 		<element ref="static_black"><bounds x="-10" y="75" width="120" height="65" /></element>
 		<element ref="disk_bg"><bounds x="15" y="45" width="70" height="70" /></element>
@@ -100,8 +86,7 @@ license:CC0-1.0
 		<element ref="static_bg"><bounds x="15" y="75" width="70" height="26" /></element>
 		<element ref="disk_bg"><bounds x="40" y="91" width="20" height="20" /></element>
 
-	<!-- top edge -->
-
+		<!-- top edge -->
 		<element ref="disk_black"><bounds x="-1.3" y="44.7" width="10" height="10" /></element>
 		<element ref="disk_black"><bounds x="91.3" y="44.7" width="10" height="10" /></element>
 		<element name="4.3" ref="led"><bounds x="2.2" y="48.2" width="3" height="3" /></element>
@@ -122,8 +107,7 @@ license:CC0-1.0
 		<element ref="text_home"><bounds x="36" y="21.5" width="8" height="2.5" /></element>
 		<element ref="text_run"><bounds x="56.5" y="21.5" width="8" height="2.5" /></element>
 
-	<!-- field -->
-
+		<!-- field -->
 		<element ref="field_guy"><bounds x="13" y="48.5" width="3" height="3" /></element>
 		<element ref="disk_bg"><bounds x="12" y="52" width="5" height="5" /></element>
 		<element name="4.2" ref="led"><bounds x="13" y="53" width="3" height="3" /></element>
@@ -136,8 +120,7 @@ license:CC0-1.0
 		<element ref="disk_bg"><bounds x="83" y="52" width="5" height="5" /></element>
 		<element name="4.0" ref="led"><bounds x="84" y="53" width="3" height="3" /></element>
 
-	<!-- pitcher -->
-
+		<!-- pitcher -->
 		<element ref="pitcher"><bounds x="48.5" y="66.5" width="3" height="3" /></element>
 		<element ref="static_white"><bounds x="46" y="71" width="0.5" height="18.5" /></element>
 		<element ref="static_white"><bounds x="53.5" y="71" width="0.5" height="18.5" /></element>
@@ -150,8 +133,7 @@ license:CC0-1.0
 		<element name="1.0" ref="led"><bounds x="45" y="92.5" width="3" height="3" /></element>
 		<element name="1.3" ref="led"><bounds x="52" y="92.5" width="3" height="3" /></element>
 
-	<!-- bases -->
-
+		<!-- bases -->
 		<element ref="base_guy"><bounds x="70" y="58" width="3" height="3" /></element>
 		<element name="3.0" ref="led"><bounds x="70" y="62" width="3" height="3" /></element>
 
@@ -176,8 +158,7 @@ license:CC0-1.0
 		<element ref="static_bg"><bounds x="22.5" y="72.5" width="5" height="5" /></element>
 		<element name="2.2" ref="led"><bounds x="23.5" y="73.5" width="3" height="3" /></element>
 
-	<!-- home -->
-
+		<!-- home -->
 		<element ref="static_white"><bounds x="47" y="97" width="6" height="3" /></element>
 		<element ref="disk_white"><bounds x="47" y="97" width="6" height="6" /></element>
 		<element ref="static_bg"><bounds x="47.5" y="97.5" width="5" height="2.51" /></element>
diff --git a/src/mame/layout/ebball2.lay b/src/mame/layout/ebball2.lay
index 5b4a3fc47ef..0009103c2a6 100644
--- a/src/mame/layout/ebball2.lay
+++ b/src/mame/layout/ebball2.lay
@@ -14,33 +14,19 @@ license:CC0-1.0
 	<element name="disk_white"><disk><color red="0.75" green="0.75" blue="0.75" /></disk></element>
 	<element name="disk_white2"><disk><color red="0.85" green="0.85" blue="0.85" /></disk></element>
 
-<!-- background is dark-red, to hide the leds -->
-
+	<!-- background is dark-red, to hide the leds -->
 	<element name="static_bg"><rect><color red="0.2" green="0.04" blue="0.05" /></rect></element>
 	<element name="disk_bg"><disk><color red="0.2" green="0.04" blue="0.05" /></disk></element>
 
-
-	<element name="field_guy">
-		<rect><color red="0.0" green="0.38" blue="0.15" /></rect>
-		<text string=":-)"><color red="0.85" green="0.85" blue="0.85" /></text>
-	</element>
-	<element name="base_guy">
-		<rect><color red="0.2" green="0.04" blue="0.05" /></rect>
-		<text string=":-)"><color red="0.85" green="0.85" blue="0.85" /></text>
-	</element>
-	<element name="pitcher">
-		<rect><color red="0.2" green="0.04" blue="0.05" /></rect>
-		<text string=":-P"><color red="0.85" green="0.85" blue="0.85" /></text>
-	</element>
+	<element name="field_guy"><text string=":-)"><color red="0.85" green="0.85" blue="0.85" /></text></element>
+	<element name="base_guy"><text string=":-)"><color red="0.85" green="0.85" blue="0.85" /></text></element>
+	<element name="pitcher"><text string=":-P"><color red="0.85" green="0.85" blue="0.85" /></text></element>
 
 	<element name="text_s"><text string="S" align="1"><color red="0.95" green="0.95" blue="0.95" /></text></element>
 	<element name="text_b"><text string="B" align="1"><color red="0.95" green="0.95" blue="0.95" /></text></element>
 	<element name="text_o"><text string="O" align="1"><color red="0.95" green="0.95" blue="0.95" /></text></element>
 
-	<element name="text_s2">
-		<rect><color red="0.2" green="0.04" blue="0.05" /></rect>
-		<text string="S"><color red="0.95" green="0.95" blue="0.95" /></text>
-	</element>
+	<element name="text_s2"><text string="S"><color red="0.95" green="0.95" blue="0.95" /></text></element>
 	<element name="text_b2"><text string="B"><color red="0.95" green="0.95" blue="0.95" /></text></element>
 
 	<element name="text_single"><text string="1B"><color red="0.95" green="0.95" blue="0.95" /></text></element>
@@ -55,7 +41,6 @@ license:CC0-1.0
 	<element name="text_visitor"><text string="VISITOR"><color red="0.95" green="0.95" blue="0.95" /></text></element>
 	<element name="text_home2"><text string="HOME"><color red="0.95" green="0.95" blue="0.95" /></text></element>
 
-
 	<element name="digit" defstate="0">
 		<led7seg><color red="1.0" green="0.20" blue="0.22" /></led7seg>
 	</element>
@@ -74,8 +59,7 @@ license:CC0-1.0
 			<bounds left="0" right="100" top="0" bottom="114" />
 		</element>
 
-	<!-- outer bezel -->
-
+		<!-- outer bezel -->
 		<element ref="text_count"><bounds x="16" y="2" width="8" height="3" /></element>
 
 		<element ref="text_s"><bounds x="12.5" y="7.2" width="2" height="2.5" /></element>
@@ -107,9 +91,7 @@ license:CC0-1.0
 		<element name="3.1" ref="led"><bounds x="66" y="13" width="3" height="3" /></element>
 		<element name="3.0" ref="led"><bounds x="82" y="13" width="3" height="3" /></element>
 
-
-	<!-- board -->
-
+		<!-- board -->
 		<element ref="disk_green"><bounds x="-5" y="25" width="110" height="110" /></element>
 		<element ref="static_black"><bounds x="-10" y="75" width="120" height="65" /></element>
 		<element ref="disk_bg"><bounds x="15" y="45" width="70" height="70" /></element>
@@ -117,8 +99,7 @@ license:CC0-1.0
 		<element ref="static_bg"><bounds x="15" y="75" width="70" height="26" /></element>
 		<element ref="disk_bg"><bounds x="40" y="91" width="20" height="20" /></element>
 
-	<!-- top edge -->
-
+		<!-- top edge -->
 		<element ref="disk_black"><bounds x="-1.3" y="44.7" width="10" height="10" /></element>
 		<element ref="disk_black"><bounds x="91.3" y="44.7" width="10" height="10" /></element>
 		<element name="8.1" ref="led"><bounds x="2.2" y="48.2" width="3" height="3" /></element>
@@ -139,8 +120,7 @@ license:CC0-1.0
 		<element ref="text_home"><bounds x="36" y="21.5" width="8" height="2.5" /></element>
 		<element ref="text_run"><bounds x="56.5" y="21.5" width="8" height="2.5" /></element>
 
-	<!-- field -->
-
+		<!-- field -->
 		<element ref="field_guy"><bounds x="13" y="48.5" width="3" height="3" /></element>
 		<element ref="disk_bg"><bounds x="12" y="52" width="5" height="5" /></element>
 		<element name="7.4" ref="led"><bounds x="13" y="53" width="3" height="3" /></element>
@@ -153,8 +133,7 @@ license:CC0-1.0
 		<element ref="disk_bg"><bounds x="83" y="52" width="5" height="5" /></element>
 		<element name="8.0" ref="led"><bounds x="84" y="53" width="3" height="3" /></element>
 
-	<!-- pitcher -->
-
+		<!-- pitcher -->
 		<element ref="pitcher"><bounds x="48.5" y="66.5" width="3" height="3" /></element>
 		<element ref="static_white"><bounds x="46" y="71" width="0.5" height="18.5" /></element>
 		<element ref="static_white"><bounds x="53.5" y="71" width="0.5" height="18.5" /></element>
@@ -167,8 +146,7 @@ license:CC0-1.0
 		<element name="9.7" ref="led"><bounds x="45" y="92.5" width="3" height="3" /></element>
 		<element name="9.0" ref="led"><bounds x="52" y="92.5" width="3" height="3" /></element>
 
-	<!-- bases -->
-
+		<!-- bases -->
 		<element ref="base_guy"><bounds x="70" y="58" width="3" height="3" /></element>
 		<element name="7.3" ref="led"><bounds x="70" y="62" width="3" height="3" /></element>
 
@@ -193,8 +171,7 @@ license:CC0-1.0
 		<element ref="static_bg"><bounds x="22.5" y="72.5" width="5" height="5" /></element>
 		<element name="6.2" ref="led"><bounds x="23.5" y="73.5" width="3" height="3" /></element>
 
-	<!-- home -->
-
+		<!-- home -->
 		<element ref="static_white"><bounds x="47" y="97" width="6" height="3" /></element>
 		<element ref="disk_white"><bounds x="47" y="97" width="6" height="6" /></element>
 		<element ref="static_bg"><bounds x="47.5" y="97.5" width="5" height="2.51" /></element>
diff --git a/src/mame/layout/ebball3.lay b/src/mame/layout/ebball3.lay
index 9c13c9d8c3c..379b9b6ce03 100644
--- a/src/mame/layout/ebball3.lay
+++ b/src/mame/layout/ebball3.lay
@@ -14,33 +14,19 @@ license:CC0-1.0
 	<element name="disk_white"><disk><color red="0.75" green="0.75" blue="0.75" /></disk></element>
 	<element name="disk_white2"><disk><color red="0.85" green="0.85" blue="0.85" /></disk></element>
 
-<!-- background is dark-red, to hide the leds -->
-
+	<!-- background is dark-red, to hide the leds -->
 	<element name="static_bg"><rect><color red="0.2" green="0.04" blue="0.05" /></rect></element>
 	<element name="disk_bg"><disk><color red="0.2" green="0.04" blue="0.05" /></disk></element>
 
-
-	<element name="field_guy">
-		<rect><color red="0.0" green="0.38" blue="0.15" /></rect>
-		<text string=":-)"><color red="0.85" green="0.85" blue="0.85" /></text>
-	</element>
-	<element name="base_guy">
-		<rect><color red="0.2" green="0.04" blue="0.05" /></rect>
-		<text string=":-)"><color red="0.85" green="0.85" blue="0.85" /></text>
-	</element>
-	<element name="pitcher">
-		<rect><color red="0.2" green="0.04" blue="0.05" /></rect>
-		<text string=":-P"><color red="0.85" green="0.85" blue="0.85" /></text>
-	</element>
+	<element name="field_guy"><text string=":-)"><color red="0.85" green="0.85" blue="0.85" /></text></element>
+	<element name="base_guy"><text string=":-)"><color red="0.85" green="0.85" blue="0.85" /></text></element>
+	<element name="pitcher"><text string=":-P"><color red="0.85" green="0.85" blue="0.85" /></text></element>
 
 	<element name="text_s"><text string="S" align="1"><color red="0.95" green="0.95" blue="0.95" /></text></element>
 	<element name="text_b"><text string="B" align="1"><color red="0.95" green="0.95" blue="0.95" /></text></element>
 	<element name="text_o"><text string="O" align="1"><color red="0.95" green="0.95" blue="0.95" /></text></element>
 
-	<element name="text_s2">
-		<rect><color red="0.2" green="0.04" blue="0.05" /></rect>
-		<text string="S"><color red="0.95" green="0.95" blue="0.95" /></text>
-	</element>
+	<element name="text_s2"><text string="S"><color red="0.95" green="0.95" blue="0.95" /></text></element>
 	<element name="text_b2"><text string="B"><color red="0.95" green="0.95" blue="0.95" /></text></element>
 	<element name="text_foul"><text string="FOUL"><color red="0.95" green="0.95" blue="0.95" /></text></element>
 
@@ -56,7 +42,6 @@ license:CC0-1.0
 	<element name="text_h"><text string="H"><color red="0.95" green="0.95" blue="0.95" /></text></element>
 	<element name="text_v"><text string="V"><color red="0.95" green="0.95" blue="0.95" /></text></element>
 
-
 	<element name="in1" defstate="0">
 		<rect><bounds x="0" y="0" width="1" height="1"/><color red="0.0" green="0.38" blue="0.15" /></rect>
 		<text state="0" string="1"><bounds x="0.15" y="0.12" width="0.7" height="0.7"/><color red="0.2" green="0.04" blue="0.05" /></text>
diff --git a/src/mame/layout/efball.lay b/src/mame/layout/efball.lay
index c56bbedd006..57951400b12 100644
--- a/src/mame/layout/efball.lay
+++ b/src/mame/layout/efball.lay
@@ -10,30 +10,12 @@ license:CC0-1.0
 	<element name="static_white"><rect><color red="0.81" green="0.82" blue="0.81" /></rect></element>
 	<element name="static_green"><rect><color red="0.03" green="0.7" blue="0.22" /></rect></element>
 
-	<element name="text_down">
-		<rect><color red="0.81" green="0.82" blue="0.81" /></rect>
-		<text string="DOWN"><color red="0.16" green="0.17" blue="0.16" /></text>
-	</element>
-	<element name="text_home">
-		<rect><color red="0.81" green="0.82" blue="0.81" /></rect>
-		<text string="HOME"><color red="0.16" green="0.17" blue="0.16" /></text>
-	</element>
-	<element name="text_yards">
-		<rect><color red="0.81" green="0.82" blue="0.81" /></rect>
-		<text string="YARDS TO GO"><color red="0.16" green="0.17" blue="0.16" /></text>
-	</element>
-	<element name="text_time">
-		<rect><color red="0.81" green="0.82" blue="0.81" /></rect>
-		<text string="TIME REMAINING"><color red="0.16" green="0.17" blue="0.16" /></text>
-	</element>
-	<element name="text_field">
-		<rect><color red="0.81" green="0.82" blue="0.81" /></rect>
-		<text string="FIELD POSITION"><color red="0.16" green="0.17" blue="0.16" /></text>
-	</element>
-	<element name="text_visitor">
-		<rect><color red="0.81" green="0.82" blue="0.81" /></rect>
-		<text string="VISITOR"><color red="0.16" green="0.17" blue="0.16" /></text>
-	</element>
+	<element name="text_down"><text string="DOWN"><color red="0.16" green="0.17" blue="0.16" /></text></element>
+	<element name="text_home"><text string="HOME"><color red="0.16" green="0.17" blue="0.16" /></text></element>
+	<element name="text_yards"><text string="YARDS TO GO"><color red="0.16" green="0.17" blue="0.16" /></text></element>
+	<element name="text_time"><text string="TIME REMAINING"><color red="0.16" green="0.17" blue="0.16" /></text></element>
+	<element name="text_field"><text string="FIELD POSITION"><color red="0.16" green="0.17" blue="0.16" /></text></element>
+	<element name="text_visitor"><text string="VISITOR"><color red="0.16" green="0.17" blue="0.16" /></text></element>
 
 	<element name="text_10"><text string="10"><color red="0.83" green="0.84" blue="0.83" /></text></element>
 	<element name="text_20"><text string="20"><color red="0.83" green="0.84" blue="0.83" /></text></element>
diff --git a/src/mame/layout/elecdet.lay b/src/mame/layout/elecdet.lay
index e8cfceb166c..b5ffc473338 100644
--- a/src/mame/layout/elecdet.lay
+++ b/src/mame/layout/elecdet.lay
@@ -38,186 +38,54 @@ license:CC0-1.0
 		<rect state="1"><color red="0" green="0" blue="0" /></rect>
 	</element>
 
-	<element name="text_w0">
-		<rect><color red="0.92" green="0.92" blue="0.93" /></rect>
-		<text align="1" string="&quot;I was with these suspects&quot;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-
-	<element name="text_y0">
-		<rect><color red="0.85" green="0.85" blue="0.1" /></rect>
-		<text align="1" string="&quot;I was at the.....&quot;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_y1a">
-		<rect><color red="0.85" green="0.85" blue="0.1" /></rect>
-		<text align="1" string="A"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_y1b">
-		<rect><color red="0.85" green="0.85" blue="0.1" /></rect>
-		<text align="1" string="Art Show"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_y2a">
-		<rect><color red="0.85" green="0.85" blue="0.1" /></rect>
-		<text align="1" string="b"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_y2b">
-		<rect><color red="0.85" green="0.85" blue="0.1" /></rect>
-		<text align="1" string="Theatre"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_y3a">
-		<rect><color red="0.85" green="0.85" blue="0.1" /></rect>
-		<text align="1" string="C"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_y3b">
-		<rect><color red="0.85" green="0.85" blue="0.1" /></rect>
-		<text align="1" string="Card Party"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_y4a">
-		<rect><color red="0.85" green="0.85" blue="0.1" /></rect>
-		<text align="1" string="d"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_y4b">
-		<rect><color red="0.85" green="0.85" blue="0.1" /></rect>
-		<text align="1" string="Docks"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_y5a">
-		<rect><color red="0.85" green="0.85" blue="0.1" /></rect>
-		<text align="1" string="E"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_y5b">
-		<rect><color red="0.85" green="0.85" blue="0.1" /></rect>
-		<text align="1" string="Embassy"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_y6a">
-		<rect><color red="0.85" green="0.85" blue="0.1" /></rect>
-		<text align="1" string="F"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_y6b">
-		<rect><color red="0.85" green="0.85" blue="0.1" /></rect>
-		<text align="1" string="Factory"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-
-	<element name="text_o1a">
-		<rect><color red="0.85" green="0.3" blue="0.05" /></rect>
-		<text align="1" string="3"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_o1b">
-		<rect><color red="0.85" green="0.3" blue="0.05" /></rect>
-		<text align="1" string="&quot;I was"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_o1c">
-		<rect><color red="0.85" green="0.3" blue="0.05" /></rect>
-		<text align="1" string="Uptown&quot;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_o2a">
-		<rect><color red="0.85" green="0.3" blue="0.05" /></rect>
-		<text align="1" string="4"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_o2b">
-		<rect><color red="0.85" green="0.3" blue="0.05" /></rect>
-		<text align="1" string="&quot;I was"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_o2c">
-		<rect><color red="0.85" green="0.3" blue="0.05" /></rect>
-		<text align="1" string="Midtown&quot;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_o3a">
-		<rect><color red="0.85" green="0.3" blue="0.05" /></rect>
-		<text align="1" string="5"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_o3b">
-		<rect><color red="0.85" green="0.3" blue="0.05" /></rect>
-		<text align="1" string="&quot;I was"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_o3c">
-		<rect><color red="0.85" green="0.3" blue="0.05" /></rect>
-		<text align="1" string="Downtown&quot;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-
-	<element name="text_r1a">
-		<rect><color red="0.8" green="0.1" blue="0.05" /></rect>
-		<text align="1" string="1"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_r1b">
-		<rect><color red="0.8" green="0.1" blue="0.05" /></rect>
-		<text align="1" string="&quot;I was on the West Side&quot;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_r2a">
-		<rect><color red="0.8" green="0.1" blue="0.05" /></rect>
-		<text align="1" string="2"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_r2b">
-		<rect><color red="0.8" green="0.1" blue="0.05" /></rect>
-		<text align="1" string="&quot;I was on the East Side&quot;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-
-	<element name="text_b1">
-		<rect><color red="0.1" green="0.55" blue="0.85" /></rect>
-		<text string="1"><color red="0.99" green="0.99" blue="0.99" /></text>
-	</element>
-	<element name="text_b2">
-		<rect><color red="0.1" green="0.55" blue="0.85" /></rect>
-		<text string="2"><color red="0.99" green="0.99" blue="0.99" /></text>
-	</element>
-	<element name="text_b3">
-		<rect><color red="0.1" green="0.55" blue="0.85" /></rect>
-		<text string="3"><color red="0.99" green="0.99" blue="0.99" /></text>
-	</element>
-	<element name="text_b4">
-		<rect><color red="0.1" green="0.55" blue="0.85" /></rect>
-		<text string="4"><color red="0.99" green="0.99" blue="0.99" /></text>
-	</element>
-	<element name="text_b5">
-		<rect><color red="0.1" green="0.55" blue="0.85" /></rect>
-		<text string="5"><color red="0.99" green="0.99" blue="0.99" /></text>
-	</element>
-	<element name="text_b6">
-		<rect><color red="0.1" green="0.55" blue="0.85" /></rect>
-		<text string="6"><color red="0.99" green="0.99" blue="0.99" /></text>
-	</element>
-	<element name="text_b7">
-		<rect><color red="0.1" green="0.55" blue="0.85" /></rect>
-		<text string="7"><color red="0.99" green="0.99" blue="0.99" /></text>
-	</element>
-	<element name="text_b8">
-		<rect><color red="0.1" green="0.55" blue="0.85" /></rect>
-		<text string="8"><color red="0.99" green="0.99" blue="0.99" /></text>
-	</element>
-	<element name="text_b9">
-		<rect><color red="0.1" green="0.55" blue="0.85" /></rect>
-		<text string="9"><color red="0.99" green="0.99" blue="0.99" /></text>
-	</element>
-	<element name="text_b0">
-		<rect><color red="0.1" green="0.55" blue="0.85" /></rect>
-		<text string="0"><color red="0.99" green="0.99" blue="0.99" /></text>
-	</element>
-	<element name="text_bon">
-		<rect><color red="0.1" green="0.55" blue="0.85" /></rect>
-		<text string="ON"><color red="0.99" green="0.99" blue="0.99" /></text>
-	</element>
-	<element name="text_boff">
-		<rect><color red="0.1" green="0.55" blue="0.85" /></rect>
-		<text string="OFF"><color red="0.99" green="0.99" blue="0.99" /></text>
-	</element>
-	<element name="text_bs">
-		<rect><color red="0.1" green="0.55" blue="0.85" /></rect>
-		<text string="SUSPECT"><color red="0.99" green="0.99" blue="0.99" /></text>
-	</element>
-	<element name="text_bpq">
-		<rect><color red="0.1" green="0.55" blue="0.85" /></rect>
-		<text string="PRIVATE QUESTION"><color red="0.99" green="0.99" blue="0.99" /></text>
-	</element>
-	<element name="text_bia">
-		<rect><color red="0.1" green="0.55" blue="0.85" /></rect>
-		<text string="I ACCUSE"><color red="0.99" green="0.99" blue="0.99" /></text>
-	</element>
-	<element name="text_bent">
-		<rect><color red="0.1" green="0.55" blue="0.85" /></rect>
-		<text string="ENTER"><color red="0.99" green="0.99" blue="0.99" /></text>
-	</element>
-	<element name="text_bet">
-		<rect><color red="0.1" green="0.55" blue="0.85" /></rect>
-		<text string="END TURN"><color red="0.99" green="0.99" blue="0.99" /></text>
-	</element>
+	<element name="text_w0"><text align="1" string="&quot;I was with these suspects&quot;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+
+	<element name="text_y0"><text align="1" string="&quot;I was at the.....&quot;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_y1a"><text align="1" string="A"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_y1b"><text align="1" string="Art Show"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_y2a"><text align="1" string="b"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_y2b"><text align="1" string="Theatre"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_y3a"><text align="1" string="C"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_y3b"><text align="1" string="Card Party"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_y4a"><text align="1" string="d"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_y4b"><text align="1" string="Docks"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_y5a"><text align="1" string="E"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_y5b"><text align="1" string="Embassy"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_y6a"><text align="1" string="F"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_y6b"><text align="1" string="Factory"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+
+	<element name="text_o1a"><text align="1" string="3"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_o1b"><text align="1" string="&quot;I was"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_o1c"><text align="1" string="Uptown&quot;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_o2a"><text align="1" string="4"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_o2b"><text align="1" string="&quot;I was"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_o2c"><text align="1" string="Midtown&quot;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_o3a"><text align="1" string="5"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_o3b"><text align="1" string="&quot;I was"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_o3c"><text align="1" string="Downtown&quot;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+
+	<element name="text_r1a"><text align="1" string="1"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_r1b"><text align="1" string="&quot;I was on the West Side&quot;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_r2a"><text align="1" string="2"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_r2b"><text align="1" string="&quot;I was on the East Side&quot;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+
+	<element name="text_b1"><text string="1"><color red="0.99" green="0.99" blue="0.99" /></text></element>
+	<element name="text_b2"><text string="2"><color red="0.99" green="0.99" blue="0.99" /></text></element>
+	<element name="text_b3"><text string="3"><color red="0.99" green="0.99" blue="0.99" /></text></element>
+	<element name="text_b4"><text string="4"><color red="0.99" green="0.99" blue="0.99" /></text></element>
+	<element name="text_b5"><text string="5"><color red="0.99" green="0.99" blue="0.99" /></text></element>
+	<element name="text_b6"><text string="6"><color red="0.99" green="0.99" blue="0.99" /></text></element>
+	<element name="text_b7"><text string="7"><color red="0.99" green="0.99" blue="0.99" /></text></element>
+	<element name="text_b8"><text string="8"><color red="0.99" green="0.99" blue="0.99" /></text></element>
+	<element name="text_b9"><text string="9"><color red="0.99" green="0.99" blue="0.99" /></text></element>
+	<element name="text_b0"><text string="0"><color red="0.99" green="0.99" blue="0.99" /></text></element>
+	<element name="text_bon"><text string="ON"><color red="0.99" green="0.99" blue="0.99" /></text></element>
+	<element name="text_boff"><text string="OFF"><color red="0.99" green="0.99" blue="0.99" /></text></element>
+	<element name="text_bs"><text string="SUSPECT"><color red="0.99" green="0.99" blue="0.99" /></text></element>
+	<element name="text_bpq"><text string="PRIVATE QUESTION"><color red="0.99" green="0.99" blue="0.99" /></text></element>
+	<element name="text_bia"><text string="I ACCUSE"><color red="0.99" green="0.99" blue="0.99" /></text></element>
+	<element name="text_bent"><text string="ENTER"><color red="0.99" green="0.99" blue="0.99" /></text></element>
+	<element name="text_bet"><text string="END TURN"><color red="0.99" green="0.99" blue="0.99" /></text></element>
 
 
 <!-- 7seg display -->
diff --git a/src/mame/layout/f2pbball.lay b/src/mame/layout/f2pbball.lay
index 54c85685036..f71866d4b5e 100644
--- a/src/mame/layout/f2pbball.lay
+++ b/src/mame/layout/f2pbball.lay
@@ -52,62 +52,20 @@ license:CC0-1.0
 		<led7seg><color red="1.0" green="0.1" blue="0.15" /></led7seg>
 	</element>
 
-	<element name="text_p">
-		<rect><color red="0.0" green="0.3804" blue="0.1491" /></rect>
-		<text string="P"><color red="0.8" green="0.8" blue="0.8" /></text>
-	</element>
-	<element name="text_1st">
-		<rect><color red="0.0" green="0.3804" blue="0.1491" /></rect>
-		<text string="1st"><color red="0.8" green="0.8" blue="0.8" /></text>
-	</element>
-	<element name="text_2nd">
-		<rect><color red="0.0" green="0.3804" blue="0.1491" /></rect>
-		<text string="2nd"><color red="0.8" green="0.8" blue="0.8" /></text>
-	</element>
-	<element name="text_3rd">
-		<rect><color red="0.0" green="0.3804" blue="0.1491" /></rect>
-		<text string="3rd"><color red="0.8" green="0.8" blue="0.8" /></text>
-	</element>
-	<element name="text_foul">
-		<rect><color red="0.0" green="0.3804" blue="0.1491" /></rect>
-		<text string="FOUL"><color red="0.8" green="0.8" blue="0.8" /></text>
-	</element>
-	<element name="text_curve">
-		<rect><color red="0.0" green="0.3804" blue="0.1491" /></rect>
-		<text string="CURVE"><color red="0.8" green="0.8" blue="0.8" /></text>
-	</element>
-	<element name="text_ball">
-		<rect><color red="0.0" green="0.3804" blue="0.1491" /></rect>
-		<text string="BALL"><color red="0.8" green="0.8" blue="0.8" /></text>
-	</element>
-	<element name="text_strike">
-		<rect><color red="0.0" green="0.3804" blue="0.1491" /></rect>
-		<text string="STRIKE"><color red="0.8" green="0.8" blue="0.8" /></text>
-	</element>
-	<element name="text_flyout">
-		<rect><color red="0.0" green="0.3804" blue="0.1491" /></rect>
-		<text string="FLY OUT"><color red="0.8" green="0.8" blue="0.8" /></text>
-	</element>
-	<element name="text_homerun">
-		<rect><color red="0.0" green="0.3804" blue="0.1491" /></rect>
-		<text string="HOME RUN"><color red="0.8" green="0.8" blue="0.8" /></text>
-	</element>
-	<element name="text_grout">
-		<rect><color red="0.0" green="0.3804" blue="0.1491" /></rect>
-		<text string="GR. OUT"><color red="0.8" green="0.8" blue="0.8" /></text>
-	</element>
-	<element name="text_single">
-		<rect><color red="0.0" green="0.3804" blue="0.1491" /></rect>
-		<text string="SINGLE"><color red="0.8" green="0.8" blue="0.8" /></text>
-	</element>
-	<element name="text_double">
-		<rect><color red="0.0" green="0.3804" blue="0.1491" /></rect>
-		<text string="DOUBLE"><color red="0.8" green="0.8" blue="0.8" /></text>
-	</element>
-	<element name="text_triple">
-		<rect><color red="0.0" green="0.3804" blue="0.1491" /></rect>
-		<text string="TRIPLE"><color red="0.8" green="0.8" blue="0.8" /></text>
-	</element>
+	<element name="text_p"><text string="P"><color red="0.8" green="0.8" blue="0.8" /></text></element>
+	<element name="text_1st"><text string="1st"><color red="0.8" green="0.8" blue="0.8" /></text></element>
+	<element name="text_2nd"><text string="2nd"><color red="0.8" green="0.8" blue="0.8" /></text></element>
+	<element name="text_3rd"><text string="3rd"><color red="0.8" green="0.8" blue="0.8" /></text></element>
+	<element name="text_foul"><text string="FOUL"><color red="0.8" green="0.8" blue="0.8" /></text></element>
+	<element name="text_curve"><text string="CURVE"><color red="0.8" green="0.8" blue="0.8" /></text></element>
+	<element name="text_ball"><text string="BALL"><color red="0.8" green="0.8" blue="0.8" /></text></element>
+	<element name="text_strike"><text string="STRIKE"><color red="0.8" green="0.8" blue="0.8" /></text></element>
+	<element name="text_flyout"><text string="FLY OUT"><color red="0.8" green="0.8" blue="0.8" /></text></element>
+	<element name="text_homerun"><text string="HOME RUN"><color red="0.8" green="0.8" blue="0.8" /></text></element>
+	<element name="text_grout"><text string="GR. OUT"><color red="0.8" green="0.8" blue="0.8" /></text></element>
+	<element name="text_single"><text string="SINGLE"><color red="0.8" green="0.8" blue="0.8" /></text></element>
+	<element name="text_double"><text string="DOUBLE"><color red="0.8" green="0.8" blue="0.8" /></text></element>
+	<element name="text_triple"><text string="TRIPLE"><color red="0.8" green="0.8" blue="0.8" /></text></element>
 
 	<element name="text_visitor"><text string="VISITOR"><color red="0.8" green="0.8" blue="0.8" /></text></element>
 	<element name="text_hometeam"><text string="HOME TEAM"><color red="0.8" green="0.8" blue="0.8" /></text></element>
@@ -137,8 +95,7 @@ license:CC0-1.0
 		<element ref="black"><bounds x="1" y="0" width="2" height="50" /></element>
 		<element ref="black"><bounds x="28" y="0" width="2" height="50" /></element>
 
-	<!-- score panel -->
-
+		<!-- score panel -->
 		<element ref="text_visitor"><bounds x="6.55" y="-1.7" width="6.4" height="1.2" /></element>
 		<element ref="white"><bounds x="6.55" y="-0.5" width="6.4" height="3.65" /></element>
 		<element ref="black"><bounds x="6.75" y="-0.3" width="6" height="3.25" /></element>
@@ -169,8 +126,7 @@ license:CC0-1.0
 		<element ref="white"><bounds x="20.1" y="-0.4" width="0.2" height="3.45" /></element>
 		<element ref="white"><bounds x="22.1" y="-0.4" width="0.2" height="3.45" /></element>
 
-	<!-- upper part -->
-
+		<!-- upper part -->
 		<element ref="text_flyout"><bounds x="4.5" y="8.1" width="4" height="0.7" /></element>
 		<element ref="text_homerun"><bounds x="7.5" y="7.1" width="4" height="0.7" /></element>
 		<element ref="text_grout"><bounds x="10.5" y="6.1" width="4" height="0.7" /></element>
@@ -199,8 +155,7 @@ license:CC0-1.0
 		<element name="3.3" ref="led"><bounds x="21" y="9" width="1" height="1" /></element>
 		<element name="2.4" ref="led"><bounds x="24" y="10" width="1" height="1" /></element>
 
-	<!-- field labels -->
-
+		<!-- field labels -->
 		<element ref="text_p"><bounds x="14" y="13.2" width="3" height="1.2" /></element>
 		<element ref="text_2nd"><bounds x="14" y="7" width="3" height="1.2" /></element>
 		<element ref="text_strike"><bounds x="13" y="31.2" width="5" height="1.2" /></element>
@@ -236,8 +191,7 @@ license:CC0-1.0
 		<element ref="white"><bounds x="16.25" y="26.5" width="0.25" height="1" /></element>
 		<element ref="white"><bounds x="16.25" y="26.5" width="0.2" height="1.2" /></element>
 
-	<!-- field leds -->
-
+		<!-- field leds -->
 		<element name="1.7" ref="led"><bounds x="15" y="9"  width="1" height="1" /></element>
 		<element name="1.0" ref="led"><bounds x="12" y="12" width="1" height="1" /></element>
 		<element name="2.1" ref="led"><bounds x="18" y="12" width="1" height="1" /></element>
diff --git a/src/mame/layout/fidel_acr.lay b/src/mame/layout/fidel_acr.lay
index 384445943f4..4a27fe78dfd 100644
--- a/src/mame/layout/fidel_acr.lay
+++ b/src/mame/layout/fidel_acr.lay
@@ -6,7 +6,7 @@ license:CC0-1.0
 
 <!-- define elements -->
 
-	<element name="static_gray"><rect><color red="0.6" green="0.6" blue="0.6" /></rect></element>
+	<element name="gray"><rect><color red="0.6" green="0.6" blue="0.6" /></rect></element>
 
 	<element name="digit" defstate="0">
 		<led7seg><color red="1.0" green="0.1" blue="0.15" /></led7seg>
@@ -33,70 +33,22 @@ license:CC0-1.0
 	<element name="text_from"><text string="FROM"><color red="0.6" green="0.6" blue="0.6" /></text></element>
 	<element name="text_to"><text string="TO"><color red="0.6" green="0.6" blue="0.6" /></text></element>
 
-	<element name="text_b1">
-		<rect><color red="0.6" green="0.6" blue="0.6" /></rect>
-		<text string="RE"><color red="0.04" green="0.04" blue="0.04" /></text>
-	</element>
-	<element name="text_b2">
-		<rect><color red="0.6" green="0.6" blue="0.6" /></rect>
-		<text string="CL"><color red="0.04" green="0.04" blue="0.04" /></text>
-	</element>
-	<element name="text_b3">
-		<rect><color red="0.6" green="0.6" blue="0.6" /></rect>
-		<text string="TO"><color red="0.04" green="0.04" blue="0.04" /></text>
-	</element>
-	<element name="text_b4">
-		<rect><color red="0.6" green="0.6" blue="0.6" /></rect>
-		<text string="EN"><color red="0.04" green="0.04" blue="0.04" /></text>
-	</element>
-	<element name="text_b5">
-		<rect><color red="0.6" green="0.6" blue="0.6" /></rect>
-		<text string="LV"><color red="0.04" green="0.04" blue="0.04" /></text>
-	</element>
-	<element name="text_b6">
-		<rect><color red="0.6" green="0.6" blue="0.6" /></rect>
-		<text string="7"><color red="0.04" green="0.04" blue="0.04" /></text>
-	</element>
-	<element name="text_b7">
-		<rect><color red="0.6" green="0.6" blue="0.6" /></rect>
-		<text string="8"><color red="0.04" green="0.04" blue="0.04" /></text>
-	</element>
-	<element name="text_b8">
-		<rect><color red="0.6" green="0.6" blue="0.6" /></rect>
-		<text string="9"><color red="0.04" green="0.04" blue="0.04" /></text>
-	</element>
-	<element name="text_b9">
-		<rect><color red="0.6" green="0.6" blue="0.6" /></rect>
-		<text string="PV"><color red="0.04" green="0.04" blue="0.04" /></text>
-	</element>
-	<element name="text_b10">
-		<rect><color red="0.6" green="0.6" blue="0.6" /></rect>
-		<text string="4"><color red="0.04" green="0.04" blue="0.04" /></text>
-	</element>
-	<element name="text_b11">
-		<rect><color red="0.6" green="0.6" blue="0.6" /></rect>
-		<text string="5"><color red="0.04" green="0.04" blue="0.04" /></text>
-	</element>
-	<element name="text_b12">
-		<rect><color red="0.6" green="0.6" blue="0.6" /></rect>
-		<text string="6"><color red="0.04" green="0.04" blue="0.04" /></text>
-	</element>
-	<element name="text_b13">
-		<rect><color red="0.6" green="0.6" blue="0.6" /></rect>
-		<text string="0"><color red="0.04" green="0.04" blue="0.04" /></text>
-	</element>
-	<element name="text_b14">
-		<rect><color red="0.6" green="0.6" blue="0.6" /></rect>
-		<text string="1"><color red="0.04" green="0.04" blue="0.04" /></text>
-	</element>
-	<element name="text_b15">
-		<rect><color red="0.6" green="0.6" blue="0.6" /></rect>
-		<text string="2"><color red="0.04" green="0.04" blue="0.04" /></text>
-	</element>
-	<element name="text_b16">
-		<rect><color red="0.6" green="0.6" blue="0.6" /></rect>
-		<text string="3"><color red="0.04" green="0.04" blue="0.04" /></text>
-	</element>
+	<element name="text_b1"><text string="RE"><color red="0.04" green="0.04" blue="0.04" /></text></element>
+	<element name="text_b2"><text string="CL"><color red="0.04" green="0.04" blue="0.04" /></text></element>
+	<element name="text_b3"><text string="TO"><color red="0.04" green="0.04" blue="0.04" /></text></element>
+	<element name="text_b4"><text string="EN"><color red="0.04" green="0.04" blue="0.04" /></text></element>
+	<element name="text_b5"><text string="LV"><color red="0.04" green="0.04" blue="0.04" /></text></element>
+	<element name="text_b6"><text string="7"><color red="0.04" green="0.04" blue="0.04" /></text></element>
+	<element name="text_b7"><text string="8"><color red="0.04" green="0.04" blue="0.04" /></text></element>
+	<element name="text_b8"><text string="9"><color red="0.04" green="0.04" blue="0.04" /></text></element>
+	<element name="text_b9"><text string="PV"><color red="0.04" green="0.04" blue="0.04" /></text></element>
+	<element name="text_b10"><text string="4"><color red="0.04" green="0.04" blue="0.04" /></text></element>
+	<element name="text_b11"><text string="5"><color red="0.04" green="0.04" blue="0.04" /></text></element>
+	<element name="text_b12"><text string="6"><color red="0.04" green="0.04" blue="0.04" /></text></element>
+	<element name="text_b13"><text string="0"><color red="0.04" green="0.04" blue="0.04" /></text></element>
+	<element name="text_b14"><text string="1"><color red="0.04" green="0.04" blue="0.04" /></text></element>
+	<element name="text_b15"><text string="2"><color red="0.04" green="0.04" blue="0.04" /></text></element>
+	<element name="text_b16"><text string="3"><color red="0.04" green="0.04" blue="0.04" /></text></element>
 
 
 <!-- build screen -->
@@ -119,22 +71,22 @@ license:CC0-1.0
 		<element name="digit3" ref="digit"><bounds x="13.5" y="11" width="4" height="6" /></element>
 
 		<!-- button panel -->
-		<element ref="static_gray"><bounds x="0" y="20" width="4" height="3.5" /></element>
-		<element ref="static_gray"><bounds x="4.5" y="20" width="4" height="3.5" /></element>
-		<element ref="static_gray"><bounds x="9" y="20" width="4" height="3.5" /></element>
-		<element ref="static_gray"><bounds x="13.5" y="20" width="4" height="3.5" /></element>
-		<element ref="static_gray"><bounds x="0" y="24" width="4" height="3.5" /></element>
-		<element ref="static_gray"><bounds x="4.5" y="24" width="4" height="3.5" /></element>
-		<element ref="static_gray"><bounds x="9" y="24" width="4" height="3.5" /></element>
-		<element ref="static_gray"><bounds x="13.5" y="24" width="4" height="3.5" /></element>
-		<element ref="static_gray"><bounds x="0" y="28" width="4" height="3.5" /></element>
-		<element ref="static_gray"><bounds x="4.5" y="28" width="4" height="3.5" /></element>
-		<element ref="static_gray"><bounds x="9" y="28" width="4" height="3.5" /></element>
-		<element ref="static_gray"><bounds x="13.5" y="28" width="4" height="3.5" /></element>
-		<element ref="static_gray"><bounds x="0" y="32" width="4" height="3.5" /></element>
-		<element ref="static_gray"><bounds x="4.5" y="32" width="4" height="3.5" /></element>
-		<element ref="static_gray"><bounds x="9" y="32" width="4" height="3.5" /></element>
-		<element ref="static_gray"><bounds x="13.5" y="32" width="4" height="3.5" /></element>
+		<element ref="gray"><bounds x="0" y="20" width="4" height="3.5" /></element>
+		<element ref="gray"><bounds x="4.5" y="20" width="4" height="3.5" /></element>
+		<element ref="gray"><bounds x="9" y="20" width="4" height="3.5" /></element>
+		<element ref="gray"><bounds x="13.5" y="20" width="4" height="3.5" /></element>
+		<element ref="gray"><bounds x="0" y="24" width="4" height="3.5" /></element>
+		<element ref="gray"><bounds x="4.5" y="24" width="4" height="3.5" /></element>
+		<element ref="gray"><bounds x="9" y="24" width="4" height="3.5" /></element>
+		<element ref="gray"><bounds x="13.5" y="24" width="4" height="3.5" /></element>
+		<element ref="gray"><bounds x="0" y="28" width="4" height="3.5" /></element>
+		<element ref="gray"><bounds x="4.5" y="28" width="4" height="3.5" /></element>
+		<element ref="gray"><bounds x="9" y="28" width="4" height="3.5" /></element>
+		<element ref="gray"><bounds x="13.5" y="28" width="4" height="3.5" /></element>
+		<element ref="gray"><bounds x="0" y="32" width="4" height="3.5" /></element>
+		<element ref="gray"><bounds x="4.5" y="32" width="4" height="3.5" /></element>
+		<element ref="gray"><bounds x="9" y="32" width="4" height="3.5" /></element>
+		<element ref="gray"><bounds x="13.5" y="32" width="4" height="3.5" /></element>
 
 		<element ref="text_b1"><bounds x="0.1" y="20.75" width="3.8" height="2" /></element>
 		<element ref="text_b2"><bounds x="4.6" y="20.75" width="3.8" height="2" /></element>
diff --git a/src/mame/layout/fidel_as12.lay b/src/mame/layout/fidel_as12.lay
index 103dd8a5bc6..b62e3159429 100644
--- a/src/mame/layout/fidel_as12.lay
+++ b/src/mame/layout/fidel_as12.lay
@@ -20,71 +20,23 @@ license:CC0-1.0
 		<disk state="1"><color red="0.34" green="0.3" blue="0.3" /></disk>
 	</element>
 
-	<element name="text_1">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="1"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_2">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="2"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_3">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="3"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_4">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="4"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_5">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="5"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_6">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="6"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_7">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="7"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_8">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="8"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-
-	<element name="text_a">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="A"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_b">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="B"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_c">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="C"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_d">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="D"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_e">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="E"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_f">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="F"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_g">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="G"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_h">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="H"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
+	<element name="text_1"><text string="1"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_2"><text string="2"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_3"><text string="3"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_4"><text string="4"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_5"><text string="5"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_6"><text string="6"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_7"><text string="7"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_8"><text string="8"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+
+	<element name="text_a"><text string="A"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_b"><text string="B"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_c"><text string="C"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_d"><text string="D"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_e"><text string="E"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_f"><text string="F"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_g"><text string="G"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_h"><text string="H"><color red="0.87" green="0.87" blue="0.84" /></text></element>
 
 	<element name="text_p1"><image file="chess/wk.svg"><color alpha="0.79" /></image></element>
 	<element name="text_p2"><image file="chess/wq.svg"><color alpha="0.79" /></image></element>
@@ -274,43 +226,23 @@ license:CC0-1.0
 	<element name="text_uit1"><text string="S.BOARD"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uit2"><text string="INTERFACE"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uib1"><text string="BOARD:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uib2">
-		<rect><color red="0.84" green="0.75" blue="0.50" /></rect>
-		<text string="RESET"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uib3">
-		<rect><color red="0.84" green="0.75" blue="0.50" /></rect>
-		<text string="CLEAR"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uib2"><text string="RESET"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uib3"><text string="CLEAR"><color red="0.01" green="0.01" blue="0.01" /></text></element>
 	<element name="text_uis1"><text string="SPAWN:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uih1"><text string="HAND:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uih2">
-		<rect><color red="0.84" green="0.75" blue="0.50" /></rect>
-		<text string="REMOVE"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uih2"><text string="REMOVE"><color red="0.01" green="0.01" blue="0.01" /></text></element>
 	<element name="text_uiu1"><text string="UNDO:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uiu2a">
-		<rect><color red="0.84" green="0.75" blue="0.50" /></rect>
-		<text string=" &lt;&lt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2b">
-		<rect><color red="0.84" green="0.75" blue="0.50" /></rect>
-		<text string=" &lt;  "><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2c">
-		<rect><color red="0.84" green="0.75" blue="0.50" /></rect>
-		<text string="   &gt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2d">
-		<rect><color red="0.84" green="0.75" blue="0.50" /></rect>
-		<text string=" &gt;&gt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uiu2a"><text string=" &lt;&lt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2b"><text string=" &lt;  "><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2c"><text string="   &gt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2d"><text string=" &gt;&gt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu3b"><text string="/"><color red="0.81" green="0.8" blue="0.79" /></text></element>
+
 	<element name="text_uiu3a" defstate="0">
 		<simplecounter maxstate="999" digits="1" align="2">
 			<color red="0.81" green="0.8" blue="0.79" />
 		</simplecounter>
 	</element>
-	<element name="text_uiu3b"><text string="/"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uiu3c" defstate="0">
 		<simplecounter maxstate="999" digits="1" align="1">
 			<color red="0.81" green="0.8" blue="0.79" />
diff --git a/src/mame/layout/fidel_bcc.lay b/src/mame/layout/fidel_bcc.lay
index fcfcb79194d..02289d3c70b 100644
--- a/src/mame/layout/fidel_bcc.lay
+++ b/src/mame/layout/fidel_bcc.lay
@@ -8,7 +8,7 @@ license:CC0-1.0
 
 <!-- define elements -->
 
-	<element name="static_gray"><rect><color red="0.6" green="0.6" blue="0.6" /></rect></element>
+	<element name="gray"><rect><color red="0.6" green="0.6" blue="0.6" /></rect></element>
 
 	<element name="digit" defstate="0">
 		<led7seg><color red="1.0" green="0.1" blue="0.15" /></led7seg>
@@ -35,70 +35,22 @@ license:CC0-1.0
 	<element name="text_from"><text string="FROM"><color red="0.6" green="0.6" blue="0.6" /></text></element>
 	<element name="text_to"><text string="TO"><color red="0.6" green="0.6" blue="0.6" /></text></element>
 
-	<element name="text_b1">
-		<rect><color red="0.6" green="0.6" blue="0.6" /></rect>
-		<text string="RE"><color red="0.04" green="0.04" blue="0.04" /></text>
-	</element>
-	<element name="text_b2">
-		<rect><color red="0.6" green="0.6" blue="0.6" /></rect>
-		<text string="CB"><color red="0.04" green="0.04" blue="0.04" /></text>
-	</element>
-	<element name="text_b3">
-		<rect><color red="0.6" green="0.6" blue="0.6" /></rect>
-		<text string="CL"><color red="0.04" green="0.04" blue="0.04" /></text>
-	</element>
-	<element name="text_b4">
-		<rect><color red="0.6" green="0.6" blue="0.6" /></rect>
-		<text string="EN"><color red="0.04" green="0.04" blue="0.04" /></text>
-	</element>
-	<element name="text_b5">
-		<rect><color red="0.6" green="0.6" blue="0.6" /></rect>
-		<text string="LV"><color red="0.04" green="0.04" blue="0.04" /></text>
-	</element>
-	<element name="text_b6">
-		<rect><color red="0.6" green="0.6" blue="0.6" /></rect>
-		<text string="DM"><color red="0.04" green="0.04" blue="0.04" /></text>
-	</element>
-	<element name="text_b7">
-		<rect><color red="0.6" green="0.6" blue="0.6" /></rect>
-		<text string="PB"><color red="0.04" green="0.04" blue="0.04" /></text>
-	</element>
-	<element name="text_b8">
-		<rect><color red="0.6" green="0.6" blue="0.6" /></rect>
-		<text string="PV"><color red="0.04" green="0.04" blue="0.04" /></text>
-	</element>
-	<element name="text_b9">
-		<rect><color red="0.6" green="0.6" blue="0.6" /></rect>
-		<text string="A1"><color red="0.04" green="0.04" blue="0.04" /></text>
-	</element>
-	<element name="text_b10">
-		<rect><color red="0.6" green="0.6" blue="0.6" /></rect>
-		<text string="b2"><color red="0.04" green="0.04" blue="0.04" /></text>
-	</element>
-	<element name="text_b11">
-		<rect><color red="0.6" green="0.6" blue="0.6" /></rect>
-		<text string="C3"><color red="0.04" green="0.04" blue="0.04" /></text>
-	</element>
-	<element name="text_b12">
-		<rect><color red="0.6" green="0.6" blue="0.6" /></rect>
-		<text string="d4"><color red="0.04" green="0.04" blue="0.04" /></text>
-	</element>
-	<element name="text_b13">
-		<rect><color red="0.6" green="0.6" blue="0.6" /></rect>
-		<text string="E5"><color red="0.04" green="0.04" blue="0.04" /></text>
-	</element>
-	<element name="text_b14">
-		<rect><color red="0.6" green="0.6" blue="0.6" /></rect>
-		<text string="F6"><color red="0.04" green="0.04" blue="0.04" /></text>
-	</element>
-	<element name="text_b15">
-		<rect><color red="0.6" green="0.6" blue="0.6" /></rect>
-		<text string="g7"><color red="0.04" green="0.04" blue="0.04" /></text>
-	</element>
-	<element name="text_b16">
-		<rect><color red="0.6" green="0.6" blue="0.6" /></rect>
-		<text string="H8"><color red="0.04" green="0.04" blue="0.04" /></text>
-	</element>
+	<element name="text_b1"><text string="RE"><color red="0.04" green="0.04" blue="0.04" /></text></element>
+	<element name="text_b2"><text string="CB"><color red="0.04" green="0.04" blue="0.04" /></text></element>
+	<element name="text_b3"><text string="CL"><color red="0.04" green="0.04" blue="0.04" /></text></element>
+	<element name="text_b4"><text string="EN"><color red="0.04" green="0.04" blue="0.04" /></text></element>
+	<element name="text_b5"><text string="LV"><color red="0.04" green="0.04" blue="0.04" /></text></element>
+	<element name="text_b6"><text string="DM"><color red="0.04" green="0.04" blue="0.04" /></text></element>
+	<element name="text_b7"><text string="PB"><color red="0.04" green="0.04" blue="0.04" /></text></element>
+	<element name="text_b8"><text string="PV"><color red="0.04" green="0.04" blue="0.04" /></text></element>
+	<element name="text_b9"><text string="A1"><color red="0.04" green="0.04" blue="0.04" /></text></element>
+	<element name="text_b10"><text string="b2"><color red="0.04" green="0.04" blue="0.04" /></text></element>
+	<element name="text_b11"><text string="C3"><color red="0.04" green="0.04" blue="0.04" /></text></element>
+	<element name="text_b12"><text string="d4"><color red="0.04" green="0.04" blue="0.04" /></text></element>
+	<element name="text_b13"><text string="E5"><color red="0.04" green="0.04" blue="0.04" /></text></element>
+	<element name="text_b14"><text string="F6"><color red="0.04" green="0.04" blue="0.04" /></text></element>
+	<element name="text_b15"><text string="g7"><color red="0.04" green="0.04" blue="0.04" /></text></element>
+	<element name="text_b16"><text string="H8"><color red="0.04" green="0.04" blue="0.04" /></text></element>
 
 
 <!-- build screen -->
@@ -106,8 +58,7 @@ license:CC0-1.0
 	<view name="Internal Layout">
 		<bounds left="-0.5" right="18" top="7.7" bottom="36" />
 
-	<!-- 7segs/leds -->
-
+		<!-- 7segs/leds -->
 		<element ref="text_check"><bounds x="1" y="8.2" width="8" height="2" /></element>
 		<element ref="text_lose"><bounds x="10.5" y="8.2" width="8" height="2" /></element>
 		<element name="4.a" ref="led"><bounds x="0" y="8.5" width="1.5" height="1.5" /></element>
@@ -121,24 +72,23 @@ license:CC0-1.0
 		<element name="digit2" ref="digit"><bounds x="9.5" y="11" width="4" height="6" /></element>
 		<element name="digit3" ref="digit"><bounds x="13.5" y="11" width="4" height="6" /></element>
 
-	<!-- button panel -->
-
-		<element ref="static_gray"><bounds x="0" y="20" width="4" height="3" /></element>
-		<element ref="static_gray"><bounds x="4.5" y="20" width="4" height="3" /></element>
-		<element ref="static_gray"><bounds x="9" y="20" width="4" height="3" /></element>
-		<element ref="static_gray"><bounds x="13.5" y="20" width="4" height="3" /></element>
-		<element ref="static_gray"><bounds x="0" y="24" width="4" height="3" /></element>
-		<element ref="static_gray"><bounds x="4.5" y="24" width="4" height="3" /></element>
-		<element ref="static_gray"><bounds x="9" y="24" width="4" height="3" /></element>
-		<element ref="static_gray"><bounds x="13.5" y="24" width="4" height="3" /></element>
-		<element ref="static_gray"><bounds x="0" y="28" width="4" height="3" /></element>
-		<element ref="static_gray"><bounds x="4.5" y="28" width="4" height="3" /></element>
-		<element ref="static_gray"><bounds x="9" y="28" width="4" height="3" /></element>
-		<element ref="static_gray"><bounds x="13.5" y="28" width="4" height="3" /></element>
-		<element ref="static_gray"><bounds x="0" y="32" width="4" height="3" /></element>
-		<element ref="static_gray"><bounds x="4.5" y="32" width="4" height="3" /></element>
-		<element ref="static_gray"><bounds x="9" y="32" width="4" height="3" /></element>
-		<element ref="static_gray"><bounds x="13.5" y="32" width="4" height="3" /></element>
+		<!-- button panel -->
+		<element ref="gray"><bounds x="0" y="20" width="4" height="3" /></element>
+		<element ref="gray"><bounds x="4.5" y="20" width="4" height="3" /></element>
+		<element ref="gray"><bounds x="9" y="20" width="4" height="3" /></element>
+		<element ref="gray"><bounds x="13.5" y="20" width="4" height="3" /></element>
+		<element ref="gray"><bounds x="0" y="24" width="4" height="3" /></element>
+		<element ref="gray"><bounds x="4.5" y="24" width="4" height="3" /></element>
+		<element ref="gray"><bounds x="9" y="24" width="4" height="3" /></element>
+		<element ref="gray"><bounds x="13.5" y="24" width="4" height="3" /></element>
+		<element ref="gray"><bounds x="0" y="28" width="4" height="3" /></element>
+		<element ref="gray"><bounds x="4.5" y="28" width="4" height="3" /></element>
+		<element ref="gray"><bounds x="9" y="28" width="4" height="3" /></element>
+		<element ref="gray"><bounds x="13.5" y="28" width="4" height="3" /></element>
+		<element ref="gray"><bounds x="0" y="32" width="4" height="3" /></element>
+		<element ref="gray"><bounds x="4.5" y="32" width="4" height="3" /></element>
+		<element ref="gray"><bounds x="9" y="32" width="4" height="3" /></element>
+		<element ref="gray"><bounds x="13.5" y="32" width="4" height="3" /></element>
 
 		<element ref="text_b1"><bounds x="0.1" y="20.5" width="3.8" height="2" /></element>
 		<element ref="text_b2"><bounds x="4.6" y="20.5" width="3.8" height="2" /></element>
diff --git a/src/mame/layout/fidel_bkc.lay b/src/mame/layout/fidel_bkc.lay
index 94a2f0c0680..a8ac09110da 100644
--- a/src/mame/layout/fidel_bkc.lay
+++ b/src/mame/layout/fidel_bkc.lay
@@ -6,7 +6,7 @@ license:CC0-1.0
 
 <!-- define elements -->
 
-	<element name="static_gray"><rect><color red="0.6" green="0.6" blue="0.6" /></rect></element>
+	<element name="gray"><rect><color red="0.6" green="0.6" blue="0.6" /></rect></element>
 
 	<element name="digit" defstate="0">
 		<led7seg><color red="1.0" green="0.1" blue="0.15" /></led7seg>
@@ -34,70 +34,22 @@ license:CC0-1.0
 	<element name="text_dbl"><text string="DBL"><color red="0.6" green="0.6" blue="0.6" /></text></element>
 	<element name="text_to"><text string="TO"><color red="0.6" green="0.6" blue="0.6" /></text></element>
 
-	<element name="text_b1">
-		<rect><color red="0.6" green="0.6" blue="0.6" /></rect>
-		<text string="RE"><color red="0.04" green="0.04" blue="0.04" /></text>
-	</element>
-	<element name="text_b2">
-		<rect><color red="0.6" green="0.6" blue="0.6" /></rect>
-		<text string="GM"><color red="0.04" green="0.04" blue="0.04" /></text>
-	</element>
-	<element name="text_b3">
-		<rect><color red="0.6" green="0.6" blue="0.6" /></rect>
-		<text string="CL"><color red="0.04" green="0.04" blue="0.04" /></text>
-	</element>
-	<element name="text_b4">
-		<rect><color red="0.6" green="0.6" blue="0.6" /></rect>
-		<text string="EN"><color red="0.04" green="0.04" blue="0.04" /></text>
-	</element>
-	<element name="text_b5">
-		<rect><color red="0.6" green="0.6" blue="0.6" /></rect>
-		<text string="PB"><color red="0.04" green="0.04" blue="0.04" /></text>
-	</element>
-	<element name="text_b6">
-		<rect><color red="0.6" green="0.6" blue="0.6" /></rect>
-		<text string="7"><color red="0.04" green="0.04" blue="0.04" /></text>
-	</element>
-	<element name="text_b7">
-		<rect><color red="0.6" green="0.6" blue="0.6" /></rect>
-		<text string="8"><color red="0.04" green="0.04" blue="0.04" /></text>
-	</element>
-	<element name="text_b8">
-		<rect><color red="0.6" green="0.6" blue="0.6" /></rect>
-		<text string="9"><color red="0.04" green="0.04" blue="0.04" /></text>
-	</element>
-	<element name="text_b9">
-		<rect><color red="0.6" green="0.6" blue="0.6" /></rect>
-		<text string="PV"><color red="0.04" green="0.04" blue="0.04" /></text>
-	</element>
-	<element name="text_b10">
-		<rect><color red="0.6" green="0.6" blue="0.6" /></rect>
-		<text string="4"><color red="0.04" green="0.04" blue="0.04" /></text>
-	</element>
-	<element name="text_b11">
-		<rect><color red="0.6" green="0.6" blue="0.6" /></rect>
-		<text string="5"><color red="0.04" green="0.04" blue="0.04" /></text>
-	</element>
-	<element name="text_b12">
-		<rect><color red="0.6" green="0.6" blue="0.6" /></rect>
-		<text string="6"><color red="0.04" green="0.04" blue="0.04" /></text>
-	</element>
-	<element name="text_b13">
-		<rect><color red="0.6" green="0.6" blue="0.6" /></rect>
-		<text string="0"><color red="0.04" green="0.04" blue="0.04" /></text>
-	</element>
-	<element name="text_b14">
-		<rect><color red="0.6" green="0.6" blue="0.6" /></rect>
-		<text string="1"><color red="0.04" green="0.04" blue="0.04" /></text>
-	</element>
-	<element name="text_b15">
-		<rect><color red="0.6" green="0.6" blue="0.6" /></rect>
-		<text string="2"><color red="0.04" green="0.04" blue="0.04" /></text>
-	</element>
-	<element name="text_b16">
-		<rect><color red="0.6" green="0.6" blue="0.6" /></rect>
-		<text string="3"><color red="0.04" green="0.04" blue="0.04" /></text>
-	</element>
+	<element name="text_b1"><text string="RE"><color red="0.04" green="0.04" blue="0.04" /></text></element>
+	<element name="text_b2"><text string="GM"><color red="0.04" green="0.04" blue="0.04" /></text></element>
+	<element name="text_b3"><text string="CL"><color red="0.04" green="0.04" blue="0.04" /></text></element>
+	<element name="text_b4"><text string="EN"><color red="0.04" green="0.04" blue="0.04" /></text></element>
+	<element name="text_b5"><text string="PB"><color red="0.04" green="0.04" blue="0.04" /></text></element>
+	<element name="text_b6"><text string="7"><color red="0.04" green="0.04" blue="0.04" /></text></element>
+	<element name="text_b7"><text string="8"><color red="0.04" green="0.04" blue="0.04" /></text></element>
+	<element name="text_b8"><text string="9"><color red="0.04" green="0.04" blue="0.04" /></text></element>
+	<element name="text_b9"><text string="PV"><color red="0.04" green="0.04" blue="0.04" /></text></element>
+	<element name="text_b10"><text string="4"><color red="0.04" green="0.04" blue="0.04" /></text></element>
+	<element name="text_b11"><text string="5"><color red="0.04" green="0.04" blue="0.04" /></text></element>
+	<element name="text_b12"><text string="6"><color red="0.04" green="0.04" blue="0.04" /></text></element>
+	<element name="text_b13"><text string="0"><color red="0.04" green="0.04" blue="0.04" /></text></element>
+	<element name="text_b14"><text string="1"><color red="0.04" green="0.04" blue="0.04" /></text></element>
+	<element name="text_b15"><text string="2"><color red="0.04" green="0.04" blue="0.04" /></text></element>
+	<element name="text_b16"><text string="3"><color red="0.04" green="0.04" blue="0.04" /></text></element>
 
 
 <!-- build screen -->
@@ -105,8 +57,7 @@ license:CC0-1.0
 	<view name="Internal Layout">
 		<bounds left="-0.5" right="18" top="7.7" bottom="36" />
 
-	<!-- 7segs/leds -->
-
+		<!-- 7segs/leds -->
 		<element ref="text_win"><bounds x="0.7" y="8.2" width="8" height="2" /></element>
 		<element ref="text_lose"><bounds x="10.5" y="8.2" width="8" height="2" /></element>
 		<element name="4.a" ref="led"><bounds x="0" y="8.5" width="1.5" height="1.5" /></element>
@@ -124,24 +75,23 @@ license:CC0-1.0
 		<element name="1.7" ref="led"><bounds x="8.65" y="11.8" width="0.6" height="0.6" /></element>
 		<element name="0.7" ref="led"><bounds x="8.35" y="15.7" width="0.6" height="0.6" /></element>
 
-	<!-- button panel -->
-
-		<element ref="static_gray"><bounds x="0" y="20" width="4" height="3" /></element>
-		<element ref="static_gray"><bounds x="4.5" y="20" width="4" height="3" /></element>
-		<element ref="static_gray"><bounds x="9" y="20" width="4" height="3" /></element>
-		<element ref="static_gray"><bounds x="13.5" y="20" width="4" height="3" /></element>
-		<element ref="static_gray"><bounds x="0" y="24" width="4" height="3" /></element>
-		<element ref="static_gray"><bounds x="4.5" y="24" width="4" height="3" /></element>
-		<element ref="static_gray"><bounds x="9" y="24" width="4" height="3" /></element>
-		<element ref="static_gray"><bounds x="13.5" y="24" width="4" height="3" /></element>
-		<element ref="static_gray"><bounds x="0" y="28" width="4" height="3" /></element>
-		<element ref="static_gray"><bounds x="4.5" y="28" width="4" height="3" /></element>
-		<element ref="static_gray"><bounds x="9" y="28" width="4" height="3" /></element>
-		<element ref="static_gray"><bounds x="13.5" y="28" width="4" height="3" /></element>
-		<element ref="static_gray"><bounds x="0" y="32" width="4" height="3" /></element>
-		<element ref="static_gray"><bounds x="4.5" y="32" width="4" height="3" /></element>
-		<element ref="static_gray"><bounds x="9" y="32" width="4" height="3" /></element>
-		<element ref="static_gray"><bounds x="13.5" y="32" width="4" height="3" /></element>
+		<!-- button panel -->
+		<element ref="gray"><bounds x="0" y="20" width="4" height="3" /></element>
+		<element ref="gray"><bounds x="4.5" y="20" width="4" height="3" /></element>
+		<element ref="gray"><bounds x="9" y="20" width="4" height="3" /></element>
+		<element ref="gray"><bounds x="13.5" y="20" width="4" height="3" /></element>
+		<element ref="gray"><bounds x="0" y="24" width="4" height="3" /></element>
+		<element ref="gray"><bounds x="4.5" y="24" width="4" height="3" /></element>
+		<element ref="gray"><bounds x="9" y="24" width="4" height="3" /></element>
+		<element ref="gray"><bounds x="13.5" y="24" width="4" height="3" /></element>
+		<element ref="gray"><bounds x="0" y="28" width="4" height="3" /></element>
+		<element ref="gray"><bounds x="4.5" y="28" width="4" height="3" /></element>
+		<element ref="gray"><bounds x="9" y="28" width="4" height="3" /></element>
+		<element ref="gray"><bounds x="13.5" y="28" width="4" height="3" /></element>
+		<element ref="gray"><bounds x="0" y="32" width="4" height="3" /></element>
+		<element ref="gray"><bounds x="4.5" y="32" width="4" height="3" /></element>
+		<element ref="gray"><bounds x="9" y="32" width="4" height="3" /></element>
+		<element ref="gray"><bounds x="13.5" y="32" width="4" height="3" /></element>
 
 		<element ref="text_b1"><bounds x="0.1" y="20.5" width="3.8" height="2" /></element>
 		<element ref="text_b2"><bounds x="4.6" y="20.5" width="3.8" height="2" /></element>
diff --git a/src/mame/layout/fidel_brc.lay b/src/mame/layout/fidel_brc.lay
index eda7049a11c..943a01514cb 100644
--- a/src/mame/layout/fidel_brc.lay
+++ b/src/mame/layout/fidel_brc.lay
@@ -86,137 +86,41 @@ license:CC0-1.0
 		<text string=" "><color red="0.0" green="0.0" blue="0.0" /></text>
 	</element>
 
-	<element name="cba">
-		<rect><color red="0.9" green="0.9" blue="0.9" /></rect>
-		<text string="A" align="1"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="cb2">
-		<rect><color red="0.9" green="0.9" blue="0.9" /></rect>
-		<text string="2" align="1"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="cb3">
-		<rect><color red="0.9" green="0.9" blue="0.9" /></rect>
-		<text string="3" align="1"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="cb4">
-		<rect><color red="0.9" green="0.9" blue="0.9" /></rect>
-		<text string="4" align="1"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="cb5">
-		<rect><color red="0.9" green="0.9" blue="0.9" /></rect>
-		<text string="5" align="1"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="cb6">
-		<rect><color red="0.9" green="0.9" blue="0.9" /></rect>
-		<text string="6" align="1"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="cb7">
-		<rect><color red="0.9" green="0.9" blue="0.9" /></rect>
-		<text string="7" align="1"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="cb8">
-		<rect><color red="0.9" green="0.9" blue="0.9" /></rect>
-		<text string="8" align="1"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="cb9">
-		<rect><color red="0.9" green="0.9" blue="0.9" /></rect>
-		<text string="9" align="1"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="cb0">
-		<rect><color red="0.9" green="0.9" blue="0.9" /></rect>
-		<text string="10" align="1"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="cbj">
-		<rect><color red="0.9" green="0.9" blue="0.9" /></rect>
-		<text string="J" align="1"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="cbq">
-		<rect><color red="0.9" green="0.9" blue="0.9" /></rect>
-		<text string="Q" align="1"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="cbk">
-		<rect><color red="0.9" green="0.9" blue="0.9" /></rect>
-		<text string="K" align="1"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-
-	<element name="cra">
-		<rect><color red="0.9" green="0.9" blue="0.9" /></rect>
-		<text string="A" align="1"><color red="0.8" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="cr2">
-		<rect><color red="0.9" green="0.9" blue="0.9" /></rect>
-		<text string="2" align="1"><color red="0.8" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="cr3">
-		<rect><color red="0.9" green="0.9" blue="0.9" /></rect>
-		<text string="3" align="1"><color red="0.8" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="cr4">
-		<rect><color red="0.9" green="0.9" blue="0.9" /></rect>
-		<text string="4" align="1"><color red="0.8" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="cr5">
-		<rect><color red="0.9" green="0.9" blue="0.9" /></rect>
-		<text string="5" align="1"><color red="0.8" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="cr6">
-		<rect><color red="0.9" green="0.9" blue="0.9" /></rect>
-		<text string="6" align="1"><color red="0.8" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="cr7">
-		<rect><color red="0.9" green="0.9" blue="0.9" /></rect>
-		<text string="7" align="1"><color red="0.8" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="cr8">
-		<rect><color red="0.9" green="0.9" blue="0.9" /></rect>
-		<text string="8" align="1"><color red="0.8" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="cr9">
-		<rect><color red="0.9" green="0.9" blue="0.9" /></rect>
-		<text string="9" align="1"><color red="0.8" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="cr0">
-		<rect><color red="0.9" green="0.9" blue="0.9" /></rect>
-		<text string="10" align="1"><color red="0.8" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="crj">
-		<rect><color red="0.9" green="0.9" blue="0.9" /></rect>
-		<text string="J" align="1"><color red="0.8" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="crq">
-		<rect><color red="0.9" green="0.9" blue="0.9" /></rect>
-		<text string="Q" align="1"><color red="0.8" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="crk">
-		<rect><color red="0.9" green="0.9" blue="0.9" /></rect>
-		<text string="K" align="1"><color red="0.8" green="0.1" blue="0.1" /></text>
-	</element>
-
-	<element name="csh">
-		<rect><color red="0.9" green="0.9" blue="0.9" /></rect>
-		<text align="2" string="&#x2665;"><color red="0.8" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="csd">
-		<rect><color red="0.9" green="0.9" blue="0.9" /></rect>
-		<text align="2" string="&#x2666;"><color red="0.8" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="csc">
-		<rect><color red="0.9" green="0.9" blue="0.9" /></rect>
-		<text align="2" string="&#x2663;"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="css">
-		<rect><color red="0.9" green="0.9" blue="0.9" /></rect>
-		<text align="2" string="&#x2660;"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-
-	<element name="cbjk">
-		<rect><color red="0.9" green="0.9" blue="0.9" /></rect>
-		<text string="&#x263a;"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="crjk">
-		<rect><color red="0.9" green="0.9" blue="0.9" /></rect>
-		<text string="&#x263a;"><color red="0.8" green="0.1" blue="0.1" /></text>
-	</element>
+	<element name="cba"><text string="A" align="1"><color red="0.1" green="0.1" blue="0.1" /></text></element>
+	<element name="cb2"><text string="2" align="1"><color red="0.1" green="0.1" blue="0.1" /></text></element>
+	<element name="cb3"><text string="3" align="1"><color red="0.1" green="0.1" blue="0.1" /></text></element>
+	<element name="cb4"><text string="4" align="1"><color red="0.1" green="0.1" blue="0.1" /></text></element>
+	<element name="cb5"><text string="5" align="1"><color red="0.1" green="0.1" blue="0.1" /></text></element>
+	<element name="cb6"><text string="6" align="1"><color red="0.1" green="0.1" blue="0.1" /></text></element>
+	<element name="cb7"><text string="7" align="1"><color red="0.1" green="0.1" blue="0.1" /></text></element>
+	<element name="cb8"><text string="8" align="1"><color red="0.1" green="0.1" blue="0.1" /></text></element>
+	<element name="cb9"><text string="9" align="1"><color red="0.1" green="0.1" blue="0.1" /></text></element>
+	<element name="cb0"><text string="10" align="1"><color red="0.1" green="0.1" blue="0.1" /></text></element>
+	<element name="cbj"><text string="J" align="1"><color red="0.1" green="0.1" blue="0.1" /></text></element>
+	<element name="cbq"><text string="Q" align="1"><color red="0.1" green="0.1" blue="0.1" /></text></element>
+	<element name="cbk"><text string="K" align="1"><color red="0.1" green="0.1" blue="0.1" /></text></element>
+
+	<element name="cra"><text string="A" align="1"><color red="0.8" green="0.1" blue="0.1" /></text></element>
+	<element name="cr2"><text string="2" align="1"><color red="0.8" green="0.1" blue="0.1" /></text></element>
+	<element name="cr3"><text string="3" align="1"><color red="0.8" green="0.1" blue="0.1" /></text></element>
+	<element name="cr4"><text string="4" align="1"><color red="0.8" green="0.1" blue="0.1" /></text></element>
+	<element name="cr5"><text string="5" align="1"><color red="0.8" green="0.1" blue="0.1" /></text></element>
+	<element name="cr6"><text string="6" align="1"><color red="0.8" green="0.1" blue="0.1" /></text></element>
+	<element name="cr7"><text string="7" align="1"><color red="0.8" green="0.1" blue="0.1" /></text></element>
+	<element name="cr8"><text string="8" align="1"><color red="0.8" green="0.1" blue="0.1" /></text></element>
+	<element name="cr9"><text string="9" align="1"><color red="0.8" green="0.1" blue="0.1" /></text></element>
+	<element name="cr0"><text string="10" align="1"><color red="0.8" green="0.1" blue="0.1" /></text></element>
+	<element name="crj"><text string="J" align="1"><color red="0.8" green="0.1" blue="0.1" /></text></element>
+	<element name="crq"><text string="Q" align="1"><color red="0.8" green="0.1" blue="0.1" /></text></element>
+	<element name="crk"><text string="K" align="1"><color red="0.8" green="0.1" blue="0.1" /></text></element>
+
+	<element name="csh"><text align="2" string="&#x2665;"><color red="0.8" green="0.1" blue="0.1" /></text></element>
+	<element name="csd"><text align="2" string="&#x2666;"><color red="0.8" green="0.1" blue="0.1" /></text></element>
+	<element name="csc"><text align="2" string="&#x2663;"><color red="0.1" green="0.1" blue="0.1" /></text></element>
+	<element name="css"><text align="2" string="&#x2660;"><color red="0.1" green="0.1" blue="0.1" /></text></element>
+
+	<element name="cbjk"><text string="&#x263a;"><color red="0.1" green="0.1" blue="0.1" /></text></element>
+	<element name="crjk"><text string="&#x263a;"><color red="0.8" green="0.1" blue="0.1" /></text></element>
 
 
 <!-- build screen -->
diff --git a/src/mame/layout/fidel_bridgeb.lay b/src/mame/layout/fidel_bridgeb.lay
index 22d5a21278a..707aaff213b 100644
--- a/src/mame/layout/fidel_bridgeb.lay
+++ b/src/mame/layout/fidel_bridgeb.lay
@@ -8,45 +8,45 @@ license:CC0-1.0
 
 	<element name="beige"><rect><color red="0.8" green="0.75" blue="0.6" /></rect></element>
 
-	<element name="text_b11"><rect><color red="0.8" green="0.75" blue="0.6" /></rect><text string="RE"><color red="0.5" green="0.2" blue="0.1" /></text></element>
+	<element name="text_b11"><text string="RE"><color red="0.5" green="0.2" blue="0.1" /></text></element>
 	<element name="text_b12"><rect><color alpha="0" /></rect></element>
-	<element name="text_b13"><rect><color red="0.8" green="0.75" blue="0.6" /></rect><text string="CL"><color red="0.5" green="0.2" blue="0.1" /></text></element>
-	<element name="text_b14"><rect><color red="0.8" green="0.75" blue="0.6" /></rect><text string="EN"><color red="0.5" green="0.2" blue="0.1" /></text></element>
+	<element name="text_b13"><text string="CL"><color red="0.5" green="0.2" blue="0.1" /></text></element>
+	<element name="text_b14"><text string="EN"><color red="0.5" green="0.2" blue="0.1" /></text></element>
 	<element name="text_b15"><rect><color alpha="0" /></rect></element>
-	<element name="text_b16"><rect><color red="0.8" green="0.75" blue="0.6" /></rect><text string="J"><color red="0.5" green="0.2" blue="0.1" /></text></element>
-	<element name="text_b17"><rect><color red="0.8" green="0.75" blue="0.6" /></rect><text string="Q"><color red="0.5" green="0.2" blue="0.1" /></text></element>
-	<element name="text_b18"><rect><color red="0.8" green="0.75" blue="0.6" /></rect><text string="K"><color red="0.5" green="0.2" blue="0.1" /></text></element>
-	<element name="text_b19"><rect><color red="0.8" green="0.75" blue="0.6" /></rect><text string="A"><color red="0.5" green="0.2" blue="0.1" /></text></element>
-
-	<element name="text_b21"><rect><color red="0.8" green="0.75" blue="0.6" /></rect><text string="BR"><color red="0.5" green="0.2" blue="0.1" /></text></element>
-	<element name="text_b22"><rect><color red="0.8" green="0.75" blue="0.6" /></rect><text string="PR"><color red="0.5" green="0.2" blue="0.1" /></text></element>
-	<element name="text_b23"><rect><color red="0.8" green="0.75" blue="0.6" /></rect><text string="DB"><color red="0.5" green="0.2" blue="0.1" /></text></element>
-	<element name="text_b24"><rect><color red="0.8" green="0.75" blue="0.6" /></rect><text string="HD"><color red="0.5" green="0.2" blue="0.1" /></text></element>
+	<element name="text_b16"><text string="J"><color red="0.5" green="0.2" blue="0.1" /></text></element>
+	<element name="text_b17"><text string="Q"><color red="0.5" green="0.2" blue="0.1" /></text></element>
+	<element name="text_b18"><text string="K"><color red="0.5" green="0.2" blue="0.1" /></text></element>
+	<element name="text_b19"><text string="A"><color red="0.5" green="0.2" blue="0.1" /></text></element>
+
+	<element name="text_b21"><text string="BR"><color red="0.5" green="0.2" blue="0.1" /></text></element>
+	<element name="text_b22"><text string="PR"><color red="0.5" green="0.2" blue="0.1" /></text></element>
+	<element name="text_b23"><text string="DB"><color red="0.5" green="0.2" blue="0.1" /></text></element>
+	<element name="text_b24"><text string="HD"><color red="0.5" green="0.2" blue="0.1" /></text></element>
 	<element name="text_b25"><rect><color alpha="0" /></rect></element>
-	<element name="text_b26"><rect><color red="0.8" green="0.75" blue="0.6" /></rect><text string="7"><color red="0.5" green="0.2" blue="0.1" /></text></element>
-	<element name="text_b27"><rect><color red="0.8" green="0.75" blue="0.6" /></rect><text string="8"><color red="0.5" green="0.2" blue="0.1" /></text></element>
-	<element name="text_b28"><rect><color red="0.8" green="0.75" blue="0.6" /></rect><text string="9"><color red="0.5" green="0.2" blue="0.1" /></text></element>
-	<element name="text_b29"><rect><color red="0.8" green="0.75" blue="0.6" /></rect><text string="10"><color red="0.5" green="0.2" blue="0.1" /></text></element>
-
-	<element name="text_b31"><rect><color red="0.8" green="0.75" blue="0.6" /></rect><text string="DL"><color red="0.5" green="0.2" blue="0.1" /></text></element>
-	<element name="text_b32"><rect><color red="0.8" green="0.75" blue="0.6" /></rect><text string="CV"><color red="0.5" green="0.2" blue="0.1" /></text></element>
-	<element name="text_b33"><rect><color red="0.8" green="0.75" blue="0.6" /></rect><text string="VL"><color red="0.5" green="0.2" blue="0.1" /></text></element>
-	<element name="text_b34"><rect><color red="0.8" green="0.75" blue="0.6" /></rect><text string="IN"><color red="0.5" green="0.2" blue="0.1" /></text></element>
+	<element name="text_b26"><text string="7"><color red="0.5" green="0.2" blue="0.1" /></text></element>
+	<element name="text_b27"><text string="8"><color red="0.5" green="0.2" blue="0.1" /></text></element>
+	<element name="text_b28"><text string="9"><color red="0.5" green="0.2" blue="0.1" /></text></element>
+	<element name="text_b29"><text string="10"><color red="0.5" green="0.2" blue="0.1" /></text></element>
+
+	<element name="text_b31"><text string="DL"><color red="0.5" green="0.2" blue="0.1" /></text></element>
+	<element name="text_b32"><text string="CV"><color red="0.5" green="0.2" blue="0.1" /></text></element>
+	<element name="text_b33"><text string="VL"><color red="0.5" green="0.2" blue="0.1" /></text></element>
+	<element name="text_b34"><text string="IN"><color red="0.5" green="0.2" blue="0.1" /></text></element>
 	<element name="text_b35"><rect><color alpha="0" /></rect></element>
-	<element name="text_b36"><rect><color red="0.8" green="0.75" blue="0.6" /></rect><text string="3"><color red="0.5" green="0.2" blue="0.1" /></text></element>
-	<element name="text_b37"><rect><color red="0.8" green="0.75" blue="0.6" /></rect><text string="4"><color red="0.5" green="0.2" blue="0.1" /></text></element>
-	<element name="text_b38"><rect><color red="0.8" green="0.75" blue="0.6" /></rect><text string="5"><color red="0.5" green="0.2" blue="0.1" /></text></element>
-	<element name="text_b39"><rect><color red="0.8" green="0.75" blue="0.6" /></rect><text string="6"><color red="0.5" green="0.2" blue="0.1" /></text></element>
-
-	<element name="text_b41"><rect><color red="0.8" green="0.75" blue="0.6" /></rect><text string="&#x2663;"><color red="0.5" green="0.2" blue="0.1" /></text></element>
-	<element name="text_b42"><rect><color red="0.8" green="0.75" blue="0.6" /></rect><text string="&#x2666;"><color red="0.5" green="0.2" blue="0.1" /></text></element>
-	<element name="text_b43"><rect><color red="0.8" green="0.75" blue="0.6" /></rect><text string="&#x2665;"><color red="0.5" green="0.2" blue="0.1" /></text></element>
-	<element name="text_b44"><rect><color red="0.8" green="0.75" blue="0.6" /></rect><text string="&#x2660;"><color red="0.5" green="0.2" blue="0.1" /></text></element>
+	<element name="text_b36"><text string="3"><color red="0.5" green="0.2" blue="0.1" /></text></element>
+	<element name="text_b37"><text string="4"><color red="0.5" green="0.2" blue="0.1" /></text></element>
+	<element name="text_b38"><text string="5"><color red="0.5" green="0.2" blue="0.1" /></text></element>
+	<element name="text_b39"><text string="6"><color red="0.5" green="0.2" blue="0.1" /></text></element>
+
+	<element name="text_b41"><text string="&#x2663;"><color red="0.5" green="0.2" blue="0.1" /></text></element>
+	<element name="text_b42"><text string="&#x2666;"><color red="0.5" green="0.2" blue="0.1" /></text></element>
+	<element name="text_b43"><text string="&#x2665;"><color red="0.5" green="0.2" blue="0.1" /></text></element>
+	<element name="text_b44"><text string="&#x2660;"><color red="0.5" green="0.2" blue="0.1" /></text></element>
 	<element name="text_b45"><rect><color alpha="0" /></rect></element>
-	<element name="text_b46"><rect><color red="0.8" green="0.75" blue="0.6" /></rect><text string="NT"><color red="0.5" green="0.2" blue="0.1" /></text></element>
-	<element name="text_b47"><rect><color red="0.8" green="0.75" blue="0.6" /></rect><text string="P"><color red="0.5" green="0.2" blue="0.1" /></text></element>
-	<element name="text_b48"><rect><color red="0.8" green="0.75" blue="0.6" /></rect><text string="1"><color red="0.5" green="0.2" blue="0.1" /></text></element>
-	<element name="text_b49"><rect><color red="0.8" green="0.75" blue="0.6" /></rect><text string="2"><color red="0.5" green="0.2" blue="0.1" /></text></element>
+	<element name="text_b46"><text string="NT"><color red="0.5" green="0.2" blue="0.1" /></text></element>
+	<element name="text_b47"><text string="P"><color red="0.5" green="0.2" blue="0.1" /></text></element>
+	<element name="text_b48"><text string="1"><color red="0.5" green="0.2" blue="0.1" /></text></element>
+	<element name="text_b49"><text string="2"><color red="0.5" green="0.2" blue="0.1" /></text></element>
 
 	<element name="triangle">
 		<image><data><![CDATA[
diff --git a/src/mame/layout/fidel_bv3.lay b/src/mame/layout/fidel_bv3.lay
index 133c472accb..74a4d03f72b 100644
--- a/src/mame/layout/fidel_bv3.lay
+++ b/src/mame/layout/fidel_bv3.lay
@@ -72,137 +72,41 @@ license:CC0-1.0
 		<text string=" "><color red="0.0" green="0.0" blue="0.0" /></text>
 	</element>
 
-	<element name="cba">
-		<rect><color red="0.9" green="0.9" blue="0.9" /></rect>
-		<text string="A" align="1"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="cb2">
-		<rect><color red="0.9" green="0.9" blue="0.9" /></rect>
-		<text string="2" align="1"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="cb3">
-		<rect><color red="0.9" green="0.9" blue="0.9" /></rect>
-		<text string="3" align="1"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="cb4">
-		<rect><color red="0.9" green="0.9" blue="0.9" /></rect>
-		<text string="4" align="1"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="cb5">
-		<rect><color red="0.9" green="0.9" blue="0.9" /></rect>
-		<text string="5" align="1"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="cb6">
-		<rect><color red="0.9" green="0.9" blue="0.9" /></rect>
-		<text string="6" align="1"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="cb7">
-		<rect><color red="0.9" green="0.9" blue="0.9" /></rect>
-		<text string="7" align="1"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="cb8">
-		<rect><color red="0.9" green="0.9" blue="0.9" /></rect>
-		<text string="8" align="1"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="cb9">
-		<rect><color red="0.9" green="0.9" blue="0.9" /></rect>
-		<text string="9" align="1"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="cb0">
-		<rect><color red="0.9" green="0.9" blue="0.9" /></rect>
-		<text string="10" align="1"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="cbj">
-		<rect><color red="0.9" green="0.9" blue="0.9" /></rect>
-		<text string="J" align="1"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="cbq">
-		<rect><color red="0.9" green="0.9" blue="0.9" /></rect>
-		<text string="Q" align="1"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="cbk">
-		<rect><color red="0.9" green="0.9" blue="0.9" /></rect>
-		<text string="K" align="1"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-
-	<element name="cra">
-		<rect><color red="0.9" green="0.9" blue="0.9" /></rect>
-		<text string="A" align="1"><color red="0.8" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="cr2">
-		<rect><color red="0.9" green="0.9" blue="0.9" /></rect>
-		<text string="2" align="1"><color red="0.8" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="cr3">
-		<rect><color red="0.9" green="0.9" blue="0.9" /></rect>
-		<text string="3" align="1"><color red="0.8" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="cr4">
-		<rect><color red="0.9" green="0.9" blue="0.9" /></rect>
-		<text string="4" align="1"><color red="0.8" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="cr5">
-		<rect><color red="0.9" green="0.9" blue="0.9" /></rect>
-		<text string="5" align="1"><color red="0.8" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="cr6">
-		<rect><color red="0.9" green="0.9" blue="0.9" /></rect>
-		<text string="6" align="1"><color red="0.8" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="cr7">
-		<rect><color red="0.9" green="0.9" blue="0.9" /></rect>
-		<text string="7" align="1"><color red="0.8" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="cr8">
-		<rect><color red="0.9" green="0.9" blue="0.9" /></rect>
-		<text string="8" align="1"><color red="0.8" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="cr9">
-		<rect><color red="0.9" green="0.9" blue="0.9" /></rect>
-		<text string="9" align="1"><color red="0.8" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="cr0">
-		<rect><color red="0.9" green="0.9" blue="0.9" /></rect>
-		<text string="10" align="1"><color red="0.8" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="crj">
-		<rect><color red="0.9" green="0.9" blue="0.9" /></rect>
-		<text string="J" align="1"><color red="0.8" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="crq">
-		<rect><color red="0.9" green="0.9" blue="0.9" /></rect>
-		<text string="Q" align="1"><color red="0.8" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="crk">
-		<rect><color red="0.9" green="0.9" blue="0.9" /></rect>
-		<text string="K" align="1"><color red="0.8" green="0.1" blue="0.1" /></text>
-	</element>
-
-	<element name="csh">
-		<rect><color red="0.9" green="0.9" blue="0.9" /></rect>
-		<text align="2" string="&#x2665;"><color red="0.8" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="csd">
-		<rect><color red="0.9" green="0.9" blue="0.9" /></rect>
-		<text align="2" string="&#x2666;"><color red="0.8" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="csc">
-		<rect><color red="0.9" green="0.9" blue="0.9" /></rect>
-		<text align="2" string="&#x2663;"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="css">
-		<rect><color red="0.9" green="0.9" blue="0.9" /></rect>
-		<text align="2" string="&#x2660;"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-
-	<element name="cbjk">
-		<rect><color red="0.9" green="0.9" blue="0.9" /></rect>
-		<text string="&#x263a;"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="crjk">
-		<rect><color red="0.9" green="0.9" blue="0.9" /></rect>
-		<text string="&#x263a;"><color red="0.8" green="0.1" blue="0.1" /></text>
-	</element>
+	<element name="cba"><text string="A" align="1"><color red="0.1" green="0.1" blue="0.1" /></text></element>
+	<element name="cb2"><text string="2" align="1"><color red="0.1" green="0.1" blue="0.1" /></text></element>
+	<element name="cb3"><text string="3" align="1"><color red="0.1" green="0.1" blue="0.1" /></text></element>
+	<element name="cb4"><text string="4" align="1"><color red="0.1" green="0.1" blue="0.1" /></text></element>
+	<element name="cb5"><text string="5" align="1"><color red="0.1" green="0.1" blue="0.1" /></text></element>
+	<element name="cb6"><text string="6" align="1"><color red="0.1" green="0.1" blue="0.1" /></text></element>
+	<element name="cb7"><text string="7" align="1"><color red="0.1" green="0.1" blue="0.1" /></text></element>
+	<element name="cb8"><text string="8" align="1"><color red="0.1" green="0.1" blue="0.1" /></text></element>
+	<element name="cb9"><text string="9" align="1"><color red="0.1" green="0.1" blue="0.1" /></text></element>
+	<element name="cb0"><text string="10" align="1"><color red="0.1" green="0.1" blue="0.1" /></text></element>
+	<element name="cbj"><text string="J" align="1"><color red="0.1" green="0.1" blue="0.1" /></text></element>
+	<element name="cbq"><text string="Q" align="1"><color red="0.1" green="0.1" blue="0.1" /></text></element>
+	<element name="cbk"><text string="K" align="1"><color red="0.1" green="0.1" blue="0.1" /></text></element>
+
+	<element name="cra"><text string="A" align="1"><color red="0.8" green="0.1" blue="0.1" /></text></element>
+	<element name="cr2"><text string="2" align="1"><color red="0.8" green="0.1" blue="0.1" /></text></element>
+	<element name="cr3"><text string="3" align="1"><color red="0.8" green="0.1" blue="0.1" /></text></element>
+	<element name="cr4"><text string="4" align="1"><color red="0.8" green="0.1" blue="0.1" /></text></element>
+	<element name="cr5"><text string="5" align="1"><color red="0.8" green="0.1" blue="0.1" /></text></element>
+	<element name="cr6"><text string="6" align="1"><color red="0.8" green="0.1" blue="0.1" /></text></element>
+	<element name="cr7"><text string="7" align="1"><color red="0.8" green="0.1" blue="0.1" /></text></element>
+	<element name="cr8"><text string="8" align="1"><color red="0.8" green="0.1" blue="0.1" /></text></element>
+	<element name="cr9"><text string="9" align="1"><color red="0.8" green="0.1" blue="0.1" /></text></element>
+	<element name="cr0"><text string="10" align="1"><color red="0.8" green="0.1" blue="0.1" /></text></element>
+	<element name="crj"><text string="J" align="1"><color red="0.8" green="0.1" blue="0.1" /></text></element>
+	<element name="crq"><text string="Q" align="1"><color red="0.8" green="0.1" blue="0.1" /></text></element>
+	<element name="crk"><text string="K" align="1"><color red="0.8" green="0.1" blue="0.1" /></text></element>
+
+	<element name="csh"><text align="2" string="&#x2665;"><color red="0.8" green="0.1" blue="0.1" /></text></element>
+	<element name="csd"><text align="2" string="&#x2666;"><color red="0.8" green="0.1" blue="0.1" /></text></element>
+	<element name="csc"><text align="2" string="&#x2663;"><color red="0.1" green="0.1" blue="0.1" /></text></element>
+	<element name="css"><text align="2" string="&#x2660;"><color red="0.1" green="0.1" blue="0.1" /></text></element>
+
+	<element name="cbjk"><text string="&#x263a;"><color red="0.1" green="0.1" blue="0.1" /></text></element>
+	<element name="crjk"><text string="&#x263a;"><color red="0.8" green="0.1" blue="0.1" /></text></element>
 
 
 <!-- build screen -->
diff --git a/src/mame/layout/fidel_cc1.lay b/src/mame/layout/fidel_cc1.lay
index 316a3b8277d..cdadf21239c 100644
--- a/src/mame/layout/fidel_cc1.lay
+++ b/src/mame/layout/fidel_cc1.lay
@@ -8,7 +8,7 @@ license:CC0-1.0
 
 <!-- define elements -->
 
-	<element name="static_gray"><rect><color red="0.6" green="0.6" blue="0.6" /></rect></element>
+	<element name="gray"><rect><color red="0.6" green="0.6" blue="0.6" /></rect></element>
 
 	<element name="digit" defstate="0">
 		<led7seg><color red="1.0" green="0.1" blue="0.15" /></led7seg>
@@ -35,54 +35,18 @@ license:CC0-1.0
 	<element name="text_from"><text string="FROM"><color red="0.6" green="0.6" blue="0.6" /></text></element>
 	<element name="text_to"><text string="TO"><color red="0.6" green="0.6" blue="0.6" /></text></element>
 
-	<element name="text_b1">
-		<rect><color red="0.6" green="0.6" blue="0.6" /></rect>
-		<text string="RE"><color red="0.04" green="0.04" blue="0.04" /></text>
-	</element>
-	<element name="text_b2">
-		<rect><color red="0.6" green="0.6" blue="0.6" /></rect>
-		<text string="DM"><color red="0.04" green="0.04" blue="0.04" /></text>
-	</element>
-	<element name="text_b3">
-		<rect><color red="0.6" green="0.6" blue="0.6" /></rect>
-		<text string="CL"><color red="0.04" green="0.04" blue="0.04" /></text>
-	</element>
-	<element name="text_b4">
-		<rect><color red="0.6" green="0.6" blue="0.6" /></rect>
-		<text string="EN"><color red="0.04" green="0.04" blue="0.04" /></text>
-	</element>
-	<element name="text_b5">
-		<rect><color red="0.6" green="0.6" blue="0.6" /></rect>
-		<text string="1A"><color red="0.04" green="0.04" blue="0.04" /></text>
-	</element>
-	<element name="text_b6">
-		<rect><color red="0.6" green="0.6" blue="0.6" /></rect>
-		<text string="2b"><color red="0.04" green="0.04" blue="0.04" /></text>
-	</element>
-	<element name="text_b7">
-		<rect><color red="0.6" green="0.6" blue="0.6" /></rect>
-		<text string="3C"><color red="0.04" green="0.04" blue="0.04" /></text>
-	</element>
-	<element name="text_b8">
-		<rect><color red="0.6" green="0.6" blue="0.6" /></rect>
-		<text string="4d"><color red="0.04" green="0.04" blue="0.04" /></text>
-	</element>
-	<element name="text_b9">
-		<rect><color red="0.6" green="0.6" blue="0.6" /></rect>
-		<text string="5E"><color red="0.04" green="0.04" blue="0.04" /></text>
-	</element>
-	<element name="text_b10">
-		<rect><color red="0.6" green="0.6" blue="0.6" /></rect>
-		<text string="6F"><color red="0.04" green="0.04" blue="0.04" /></text>
-	</element>
-	<element name="text_b11">
-		<rect><color red="0.6" green="0.6" blue="0.6" /></rect>
-		<text string="7g"><color red="0.04" green="0.04" blue="0.04" /></text>
-	</element>
-	<element name="text_b12">
-		<rect><color red="0.6" green="0.6" blue="0.6" /></rect>
-		<text string="8H"><color red="0.04" green="0.04" blue="0.04" /></text>
-	</element>
+	<element name="text_b1"><text string="RE"><color red="0.04" green="0.04" blue="0.04" /></text></element>
+	<element name="text_b2"><text string="DM"><color red="0.04" green="0.04" blue="0.04" /></text></element>
+	<element name="text_b3"><text string="CL"><color red="0.04" green="0.04" blue="0.04" /></text></element>
+	<element name="text_b4"><text string="EN"><color red="0.04" green="0.04" blue="0.04" /></text></element>
+	<element name="text_b5"><text string="1A"><color red="0.04" green="0.04" blue="0.04" /></text></element>
+	<element name="text_b6"><text string="2b"><color red="0.04" green="0.04" blue="0.04" /></text></element>
+	<element name="text_b7"><text string="3C"><color red="0.04" green="0.04" blue="0.04" /></text></element>
+	<element name="text_b8"><text string="4d"><color red="0.04" green="0.04" blue="0.04" /></text></element>
+	<element name="text_b9"><text string="5E"><color red="0.04" green="0.04" blue="0.04" /></text></element>
+	<element name="text_b10"><text string="6F"><color red="0.04" green="0.04" blue="0.04" /></text></element>
+	<element name="text_b11"><text string="7g"><color red="0.04" green="0.04" blue="0.04" /></text></element>
+	<element name="text_b12"><text string="8H"><color red="0.04" green="0.04" blue="0.04" /></text></element>
 
 
 <!-- build screen -->
@@ -90,8 +54,7 @@ license:CC0-1.0
 	<view name="Internal Layout">
 		<bounds left="-0.5" right="18" top="7.7" bottom="32" />
 
-	<!-- 7segs/leds -->
-
+		<!-- 7segs/leds -->
 		<element ref="text_check"><bounds x="1" y="8.2" width="8" height="2" /></element>
 		<element ref="text_lose"><bounds x="10.5" y="8.2" width="8" height="2" /></element>
 		<element name="4.a" ref="led"><bounds x="0" y="8.5" width="1.5" height="1.5" /></element>
@@ -105,20 +68,19 @@ license:CC0-1.0
 		<element name="digit2" ref="digit"><bounds x="9.5" y="11" width="4" height="6" /></element>
 		<element name="digit3" ref="digit"><bounds x="13.5" y="11" width="4" height="6" /></element>
 
-	<!-- button panel -->
-
-		<element ref="static_gray"><bounds x="0" y="20" width="4" height="3.5" /></element>
-		<element ref="static_gray"><bounds x="4.5" y="20" width="4" height="3.5" /></element>
-		<element ref="static_gray"><bounds x="9" y="20" width="4" height="3.5" /></element>
-		<element ref="static_gray"><bounds x="13.5" y="20" width="4" height="3.5" /></element>
-		<element ref="static_gray"><bounds x="0" y="24" width="4" height="3.5" /></element>
-		<element ref="static_gray"><bounds x="4.5" y="24" width="4" height="3.5" /></element>
-		<element ref="static_gray"><bounds x="9" y="24" width="4" height="3.5" /></element>
-		<element ref="static_gray"><bounds x="13.5" y="24" width="4" height="3.5" /></element>
-		<element ref="static_gray"><bounds x="0" y="28" width="4" height="3.5" /></element>
-		<element ref="static_gray"><bounds x="4.5" y="28" width="4" height="3.5" /></element>
-		<element ref="static_gray"><bounds x="9" y="28" width="4" height="3.5" /></element>
-		<element ref="static_gray"><bounds x="13.5" y="28" width="4" height="3.5" /></element>
+		<!-- button panel -->
+		<element ref="gray"><bounds x="0" y="20" width="4" height="3.5" /></element>
+		<element ref="gray"><bounds x="4.5" y="20" width="4" height="3.5" /></element>
+		<element ref="gray"><bounds x="9" y="20" width="4" height="3.5" /></element>
+		<element ref="gray"><bounds x="13.5" y="20" width="4" height="3.5" /></element>
+		<element ref="gray"><bounds x="0" y="24" width="4" height="3.5" /></element>
+		<element ref="gray"><bounds x="4.5" y="24" width="4" height="3.5" /></element>
+		<element ref="gray"><bounds x="9" y="24" width="4" height="3.5" /></element>
+		<element ref="gray"><bounds x="13.5" y="24" width="4" height="3.5" /></element>
+		<element ref="gray"><bounds x="0" y="28" width="4" height="3.5" /></element>
+		<element ref="gray"><bounds x="4.5" y="28" width="4" height="3.5" /></element>
+		<element ref="gray"><bounds x="9" y="28" width="4" height="3.5" /></element>
+		<element ref="gray"><bounds x="13.5" y="28" width="4" height="3.5" /></element>
 
 		<element ref="text_b1"><bounds x="0.1" y="20.75" width="3.8" height="2" /></element>
 		<element ref="text_b2"><bounds x="4.6" y="20.75" width="3.8" height="2" /></element>
diff --git a/src/mame/layout/fidel_cc10.lay b/src/mame/layout/fidel_cc10.lay
index 23a39e54a32..f404252df0a 100644
--- a/src/mame/layout/fidel_cc10.lay
+++ b/src/mame/layout/fidel_cc10.lay
@@ -8,7 +8,7 @@ license:CC0-1.0
 
 <!-- define elements -->
 
-	<element name="static_gray"><rect><color red="0.6" green="0.6" blue="0.6" /></rect></element>
+	<element name="gray"><rect><color red="0.6" green="0.6" blue="0.6" /></rect></element>
 
 	<element name="digit" defstate="0">
 		<led7seg><color red="1.0" green="0.1" blue="0.15" /></led7seg>
@@ -35,70 +35,22 @@ license:CC0-1.0
 	<element name="text_from"><text string="FROM"><color red="0.6" green="0.6" blue="0.6" /></text></element>
 	<element name="text_to"><text string="TO"><color red="0.6" green="0.6" blue="0.6" /></text></element>
 
-	<element name="text_b1">
-		<rect><color red="0.6" green="0.6" blue="0.6" /></rect>
-		<text string="RE"><color red="0.04" green="0.04" blue="0.04" /></text>
-	</element>
-	<element name="text_b2">
-		<rect><color red="0.6" green="0.6" blue="0.6" /></rect>
-		<text string="&#x266a;"><color red="0.04" green="0.04" blue="0.04" /></text> <!-- music note -->
-	</element>
-	<element name="text_b3">
-		<rect><color red="0.6" green="0.6" blue="0.6" /></rect>
-		<text string="CL"><color red="0.04" green="0.04" blue="0.04" /></text>
-	</element>
-	<element name="text_b4">
-		<rect><color red="0.6" green="0.6" blue="0.6" /></rect>
-		<text string="EN"><color red="0.04" green="0.04" blue="0.04" /></text>
-	</element>
-	<element name="text_b5">
-		<rect><color red="0.6" green="0.6" blue="0.6" /></rect>
-		<text string="LV"><color red="0.04" green="0.04" blue="0.04" /></text>
-	</element>
-	<element name="text_b6">
-		<rect><color red="0.6" green="0.6" blue="0.6" /></rect>
-		<text string="DM"><color red="0.04" green="0.04" blue="0.04" /></text>
-	</element>
-	<element name="text_b7">
-		<rect><color red="0.6" green="0.6" blue="0.6" /></rect>
-		<text string="PB"><color red="0.04" green="0.04" blue="0.04" /></text>
-	</element>
-	<element name="text_b8">
-		<rect><color red="0.6" green="0.6" blue="0.6" /></rect>
-		<text string="PV"><color red="0.04" green="0.04" blue="0.04" /></text>
-	</element>
-	<element name="text_b9">
-		<rect><color red="0.6" green="0.6" blue="0.6" /></rect>
-		<text string="A1"><color red="0.04" green="0.04" blue="0.04" /></text>
-	</element>
-	<element name="text_b10">
-		<rect><color red="0.6" green="0.6" blue="0.6" /></rect>
-		<text string="b2"><color red="0.04" green="0.04" blue="0.04" /></text>
-	</element>
-	<element name="text_b11">
-		<rect><color red="0.6" green="0.6" blue="0.6" /></rect>
-		<text string="C3"><color red="0.04" green="0.04" blue="0.04" /></text>
-	</element>
-	<element name="text_b12">
-		<rect><color red="0.6" green="0.6" blue="0.6" /></rect>
-		<text string="d4"><color red="0.04" green="0.04" blue="0.04" /></text>
-	</element>
-	<element name="text_b13">
-		<rect><color red="0.6" green="0.6" blue="0.6" /></rect>
-		<text string="E5"><color red="0.04" green="0.04" blue="0.04" /></text>
-	</element>
-	<element name="text_b14">
-		<rect><color red="0.6" green="0.6" blue="0.6" /></rect>
-		<text string="F6"><color red="0.04" green="0.04" blue="0.04" /></text>
-	</element>
-	<element name="text_b15">
-		<rect><color red="0.6" green="0.6" blue="0.6" /></rect>
-		<text string="g7"><color red="0.04" green="0.04" blue="0.04" /></text>
-	</element>
-	<element name="text_b16">
-		<rect><color red="0.6" green="0.6" blue="0.6" /></rect>
-		<text string="H8"><color red="0.04" green="0.04" blue="0.04" /></text>
-	</element>
+	<element name="text_b1"><text string="RE"><color red="0.04" green="0.04" blue="0.04" /></text></element>
+	<element name="text_b2"><text string="&#x266a;"><color red="0.04" green="0.04" blue="0.04" /></text></element> <!-- music note -->
+	<element name="text_b3"><text string="CL"><color red="0.04" green="0.04" blue="0.04" /></text></element>
+	<element name="text_b4"><text string="EN"><color red="0.04" green="0.04" blue="0.04" /></text></element>
+	<element name="text_b5"><text string="LV"><color red="0.04" green="0.04" blue="0.04" /></text></element>
+	<element name="text_b6"><text string="DM"><color red="0.04" green="0.04" blue="0.04" /></text></element>
+	<element name="text_b7"><text string="PB"><color red="0.04" green="0.04" blue="0.04" /></text></element>
+	<element name="text_b8"><text string="PV"><color red="0.04" green="0.04" blue="0.04" /></text></element>
+	<element name="text_b9"><text string="A1"><color red="0.04" green="0.04" blue="0.04" /></text></element>
+	<element name="text_b10"><text string="b2"><color red="0.04" green="0.04" blue="0.04" /></text></element>
+	<element name="text_b11"><text string="C3"><color red="0.04" green="0.04" blue="0.04" /></text></element>
+	<element name="text_b12"><text string="d4"><color red="0.04" green="0.04" blue="0.04" /></text></element>
+	<element name="text_b13"><text string="E5"><color red="0.04" green="0.04" blue="0.04" /></text></element>
+	<element name="text_b14"><text string="F6"><color red="0.04" green="0.04" blue="0.04" /></text></element>
+	<element name="text_b15"><text string="g7"><color red="0.04" green="0.04" blue="0.04" /></text></element>
+	<element name="text_b16"><text string="H8"><color red="0.04" green="0.04" blue="0.04" /></text></element>
 
 
 <!-- build screen -->
@@ -106,8 +58,7 @@ license:CC0-1.0
 	<view name="Internal Layout">
 		<bounds left="-0.5" right="18" top="7.7" bottom="36" />
 
-	<!-- 7segs/leds -->
-
+		<!-- 7segs/leds -->
 		<element ref="text_check"><bounds x="1" y="8.2" width="8" height="2" /></element>
 		<element ref="text_lose"><bounds x="10.5" y="8.2" width="8" height="2" /></element>
 		<element name="4.a" ref="led"><bounds x="0" y="8.5" width="1.5" height="1.5" /></element>
@@ -121,24 +72,23 @@ license:CC0-1.0
 		<element name="digit2" ref="digit"><bounds x="9.5" y="11" width="4" height="6" /></element>
 		<element name="digit3" ref="digit"><bounds x="13.5" y="11" width="4" height="6" /></element>
 
-	<!-- button panel -->
-
-		<element ref="static_gray"><bounds x="0" y="20" width="4" height="3" /></element>
-		<element ref="static_gray"><bounds x="4.5" y="20" width="4" height="3" /></element>
-		<element ref="static_gray"><bounds x="9" y="20" width="4" height="3" /></element>
-		<element ref="static_gray"><bounds x="13.5" y="20" width="4" height="3" /></element>
-		<element ref="static_gray"><bounds x="0" y="24" width="4" height="3" /></element>
-		<element ref="static_gray"><bounds x="4.5" y="24" width="4" height="3" /></element>
-		<element ref="static_gray"><bounds x="9" y="24" width="4" height="3" /></element>
-		<element ref="static_gray"><bounds x="13.5" y="24" width="4" height="3" /></element>
-		<element ref="static_gray"><bounds x="0" y="28" width="4" height="3" /></element>
-		<element ref="static_gray"><bounds x="4.5" y="28" width="4" height="3" /></element>
-		<element ref="static_gray"><bounds x="9" y="28" width="4" height="3" /></element>
-		<element ref="static_gray"><bounds x="13.5" y="28" width="4" height="3" /></element>
-		<element ref="static_gray"><bounds x="0" y="32" width="4" height="3" /></element>
-		<element ref="static_gray"><bounds x="4.5" y="32" width="4" height="3" /></element>
-		<element ref="static_gray"><bounds x="9" y="32" width="4" height="3" /></element>
-		<element ref="static_gray"><bounds x="13.5" y="32" width="4" height="3" /></element>
+		<!-- button panel -->
+		<element ref="gray"><bounds x="0" y="20" width="4" height="3" /></element>
+		<element ref="gray"><bounds x="4.5" y="20" width="4" height="3" /></element>
+		<element ref="gray"><bounds x="9" y="20" width="4" height="3" /></element>
+		<element ref="gray"><bounds x="13.5" y="20" width="4" height="3" /></element>
+		<element ref="gray"><bounds x="0" y="24" width="4" height="3" /></element>
+		<element ref="gray"><bounds x="4.5" y="24" width="4" height="3" /></element>
+		<element ref="gray"><bounds x="9" y="24" width="4" height="3" /></element>
+		<element ref="gray"><bounds x="13.5" y="24" width="4" height="3" /></element>
+		<element ref="gray"><bounds x="0" y="28" width="4" height="3" /></element>
+		<element ref="gray"><bounds x="4.5" y="28" width="4" height="3" /></element>
+		<element ref="gray"><bounds x="9" y="28" width="4" height="3" /></element>
+		<element ref="gray"><bounds x="13.5" y="28" width="4" height="3" /></element>
+		<element ref="gray"><bounds x="0" y="32" width="4" height="3" /></element>
+		<element ref="gray"><bounds x="4.5" y="32" width="4" height="3" /></element>
+		<element ref="gray"><bounds x="9" y="32" width="4" height="3" /></element>
+		<element ref="gray"><bounds x="13.5" y="32" width="4" height="3" /></element>
 
 		<element ref="text_b1"><bounds x="0.1" y="20.5" width="3.8" height="2" /></element>
 		<element ref="text_b2"><bounds x="4.6" y="20.5" width="3.8" height="2" /></element>
diff --git a/src/mame/layout/fidel_cc10c.lay b/src/mame/layout/fidel_cc10c.lay
index 8d05b1bf756..26893a6d692 100644
--- a/src/mame/layout/fidel_cc10c.lay
+++ b/src/mame/layout/fidel_cc10c.lay
@@ -9,7 +9,6 @@ license:CC0-1.0
 <!-- define elements -->
 
 	<element name="blackb"><rect><color red="0" green="0" blue="0" /></rect></element>
-	<element name="white"><rect><color red="1" green="1" blue="1" /></rect></element>
 	<element name="gray"><rect><color red="0.6" green="0.6" blue="0.6" /></rect></element>
 
 	<element name="digit" defstate="0">
@@ -37,58 +36,19 @@ license:CC0-1.0
 	<element name="text_from"><text string="FROM"><color red="0.6" green="0.6" blue="0.6" /></text></element>
 	<element name="text_to"><text string="TO"><color red="0.6" green="0.6" blue="0.6" /></text></element>
 
-	<element name="text_b1">
-		<rect><color red="1" green="1" blue="1" /></rect>
-		<text string="RE"><color red="0.07" green="0.07" blue="0.07" /></text>
-	</element>
-	<element name="text_b2a">
-		<rect><color red="1" green="1" blue="1" /></rect>
-		<text string="DM"><color red="0.07" green="0.07" blue="0.07" /></text>
-	</element>
-	<element name="text_b2b">
-		<rect><color red="1" green="1" blue="1" /></rect>
-		<text string="PB"><color red="0.07" green="0.07" blue="0.07" /></text>
-	</element>
-	<element name="text_b3">
-		<rect><color red="1" green="1" blue="1" /></rect>
-		<text string="CL"><color red="0.07" green="0.07" blue="0.07" /></text>
-	</element>
-	<element name="text_b4">
-		<rect><color red="1" green="1" blue="1" /></rect>
-		<text string="EN"><color red="0.07" green="0.07" blue="0.07" /></text>
-	</element>
-	<element name="text_b5">
-		<rect><color red="1" green="1" blue="1" /></rect>
-		<text string="A1"><color red="0.07" green="0.07" blue="0.07" /></text>
-	</element>
-	<element name="text_b6">
-		<rect><color red="1" green="1" blue="1" /></rect>
-		<text string="b2"><color red="0.07" green="0.07" blue="0.07" /></text>
-	</element>
-	<element name="text_b7">
-		<rect><color red="1" green="1" blue="1" /></rect>
-		<text string="C3"><color red="0.07" green="0.07" blue="0.07" /></text>
-	</element>
-	<element name="text_b8">
-		<rect><color red="1" green="1" blue="1" /></rect>
-		<text string="d4"><color red="0.07" green="0.07" blue="0.07" /></text>
-	</element>
-	<element name="text_b9">
-		<rect><color red="1" green="1" blue="1" /></rect>
-		<text string="E5"><color red="0.07" green="0.07" blue="0.07" /></text>
-	</element>
-	<element name="text_b10">
-		<rect><color red="1" green="1" blue="1" /></rect>
-		<text string="F6"><color red="0.07" green="0.07" blue="0.07" /></text>
-	</element>
-	<element name="text_b11">
-		<rect><color red="1" green="1" blue="1" /></rect>
-		<text string="G7"><color red="0.07" green="0.07" blue="0.07" /></text>
-	</element>
-	<element name="text_b12">
-		<rect><color red="1" green="1" blue="1" /></rect>
-		<text string="H8"><color red="0.07" green="0.07" blue="0.07" /></text>
-	</element>
+	<element name="text_b1"><text string="RE"><color red="0.07" green="0.07" blue="0.07" /></text></element>
+	<element name="text_b2a"><text string="DM"><color red="0.07" green="0.07" blue="0.07" /></text></element>
+	<element name="text_b2b"><text string="PB"><color red="0.07" green="0.07" blue="0.07" /></text></element>
+	<element name="text_b3"><text string="CL"><color red="0.07" green="0.07" blue="0.07" /></text></element>
+	<element name="text_b4"><text string="EN"><color red="0.07" green="0.07" blue="0.07" /></text></element>
+	<element name="text_b5"><text string="A1"><color red="0.07" green="0.07" blue="0.07" /></text></element>
+	<element name="text_b6"><text string="b2"><color red="0.07" green="0.07" blue="0.07" /></text></element>
+	<element name="text_b7"><text string="C3"><color red="0.07" green="0.07" blue="0.07" /></text></element>
+	<element name="text_b8"><text string="d4"><color red="0.07" green="0.07" blue="0.07" /></text></element>
+	<element name="text_b9"><text string="E5"><color red="0.07" green="0.07" blue="0.07" /></text></element>
+	<element name="text_b10"><text string="F6"><color red="0.07" green="0.07" blue="0.07" /></text></element>
+	<element name="text_b11"><text string="G7"><color red="0.07" green="0.07" blue="0.07" /></text></element>
+	<element name="text_b12"><text string="H8"><color red="0.07" green="0.07" blue="0.07" /></text></element>
 
 
 <!-- build screen -->
@@ -96,8 +56,7 @@ license:CC0-1.0
 	<view name="Internal Layout">
 		<bounds left="-0.5" right="18" top="7.7" bottom="32" />
 
-	<!-- 7segs/leds -->
-
+		<!-- 7segs/leds -->
 		<element ref="text_check"><bounds x="1" y="8.2" width="8" height="2" /></element>
 		<element ref="text_lose"><bounds x="10.5" y="8.2" width="8" height="2" /></element>
 		<element name="4.a" ref="led"><bounds x="0" y="8.5" width="1.5" height="1.5" /></element>
@@ -111,24 +70,23 @@ license:CC0-1.0
 		<element name="digit2" ref="digit"><bounds x="9.5" y="11" width="4" height="6" /></element>
 		<element name="digit3" ref="digit"><bounds x="13.5" y="11" width="4" height="6" /></element>
 
-	<!-- button panel -->
-
-		<element ref="white"><bounds x="0" y="20" width="4" height="3.5" /></element>
-		<element ref="white"><bounds x="4.5" y="20" width="4" height="3.5" /></element>
-		<element ref="white"><bounds x="9" y="20" width="4" height="3.5" /></element>
-		<element ref="white"><bounds x="13.5" y="20" width="4" height="3.5" /></element>
-		<element ref="white"><bounds x="0" y="24" width="4" height="3.5" /></element>
-		<element ref="white"><bounds x="4.5" y="24" width="4" height="3.5" /></element>
-		<element ref="white"><bounds x="9" y="24" width="4" height="3.5" /></element>
-		<element ref="white"><bounds x="13.5" y="24" width="4" height="3.5" /></element>
-		<element ref="white"><bounds x="0" y="28" width="4" height="3.5" /></element>
-		<element ref="white"><bounds x="4.5" y="28" width="4" height="3.5" /></element>
-		<element ref="white"><bounds x="9" y="28" width="4" height="3.5" /></element>
-		<element ref="white"><bounds x="13.5" y="28" width="4" height="3.5" /></element>
+		<!-- button panel -->
+		<element ref="gray"><bounds x="0" y="20" width="4" height="3.5" /></element>
+		<element ref="gray"><bounds x="4.5" y="20" width="4" height="3.5" /></element>
+		<element ref="gray"><bounds x="9" y="20" width="4" height="3.5" /></element>
+		<element ref="gray"><bounds x="13.5" y="20" width="4" height="3.5" /></element>
+		<element ref="gray"><bounds x="0" y="24" width="4" height="3.5" /></element>
+		<element ref="gray"><bounds x="4.5" y="24" width="4" height="3.5" /></element>
+		<element ref="gray"><bounds x="9" y="24" width="4" height="3.5" /></element>
+		<element ref="gray"><bounds x="13.5" y="24" width="4" height="3.5" /></element>
+		<element ref="gray"><bounds x="0" y="28" width="4" height="3.5" /></element>
+		<element ref="gray"><bounds x="4.5" y="28" width="4" height="3.5" /></element>
+		<element ref="gray"><bounds x="9" y="28" width="4" height="3.5" /></element>
+		<element ref="gray"><bounds x="13.5" y="28" width="4" height="3.5" /></element>
 
 		<element ref="text_b1"><bounds x="0.1" y="20.75" width="3.8" height="2" /></element>
-		<element ref="text_b2a" blend="multiply"><bounds x="4.6" y="19.9" width="3.8" height="2" /></element>
-		<element ref="text_b2b" blend="multiply"><bounds x="4.6" y="21.6" width="3.8" height="2" /></element>
+		<element ref="text_b2a"><bounds x="4.6" y="19.9" width="3.8" height="2" /></element>
+		<element ref="text_b2b"><bounds x="4.6" y="21.6" width="3.8" height="2" /></element>
 		<element ref="text_b3"><bounds x="9.1" y="20.75" width="3.8" height="2" /></element>
 		<element ref="text_b4"><bounds x="13.6" y="20.75" width="3.8" height="2" /></element>
 		<element ref="text_b5"><bounds x="0.1" y="24.75" width="3.8" height="2" /></element>
@@ -140,8 +98,6 @@ license:CC0-1.0
 		<element ref="text_b11"><bounds x="9.1" y="28.75" width="3.8" height="2" /></element>
 		<element ref="text_b12"><bounds x="13.6" y="28.75" width="3.8" height="2" /></element>
 
-		<element ref="gray" blend="multiply"><bounds x="-0.2" y="19.8" width="17.9" height="11.9" /></element>
-
 		<element ref="hl" inputtag="RESET" inputmask="0x01"><bounds x="0" y="20" width="4" height="3.5" /><color alpha="0.2" /></element>
 		<element ref="hl" inputtag="IN.1" inputmask="0x02"><bounds x="4.5" y="20" width="4" height="3.5" /><color alpha="0.2" /></element>
 		<element ref="hl" inputtag="IN.1" inputmask="0x04"><bounds x="9" y="20" width="4" height="3.5" /><color alpha="0.2" /></element>
diff --git a/src/mame/layout/fidel_cc3.lay b/src/mame/layout/fidel_cc3.lay
index 8882361f960..653170fb6b6 100644
--- a/src/mame/layout/fidel_cc3.lay
+++ b/src/mame/layout/fidel_cc3.lay
@@ -8,7 +8,7 @@ license:CC0-1.0
 
 <!-- define elements -->
 
-	<element name="static_gray"><rect><color red="0.6" green="0.6" blue="0.6" /></rect></element>
+	<element name="gray"><rect><color red="0.6" green="0.6" blue="0.6" /></rect></element>
 
 	<element name="digit" defstate="0">
 		<led7seg><color red="1.0" green="0.1" blue="0.15" /></led7seg>
@@ -35,54 +35,18 @@ license:CC0-1.0
 	<element name="text_from"><text string="FROM"><color red="0.6" green="0.6" blue="0.6" /></text></element>
 	<element name="text_to"><text string="TO"><color red="0.6" green="0.6" blue="0.6" /></text></element>
 
-	<element name="text_b1">
-		<rect><color red="0.6" green="0.6" blue="0.6" /></rect>
-		<text string="RE"><color red="0.04" green="0.04" blue="0.04" /></text>
-	</element>
-	<element name="text_b2">
-		<rect><color red="0.6" green="0.6" blue="0.6" /></rect>
-		<text string="DM"><color red="0.04" green="0.04" blue="0.04" /></text>
-	</element>
-	<element name="text_b3">
-		<rect><color red="0.6" green="0.6" blue="0.6" /></rect>
-		<text string="CL"><color red="0.04" green="0.04" blue="0.04" /></text>
-	</element>
-	<element name="text_b4">
-		<rect><color red="0.6" green="0.6" blue="0.6" /></rect>
-		<text string="EN"><color red="0.04" green="0.04" blue="0.04" /></text>
-	</element>
-	<element name="text_b5">
-		<rect><color red="0.6" green="0.6" blue="0.6" /></rect>
-		<text string="A1"><color red="0.04" green="0.04" blue="0.04" /></text>
-	</element>
-	<element name="text_b6">
-		<rect><color red="0.6" green="0.6" blue="0.6" /></rect>
-		<text string="b2"><color red="0.04" green="0.04" blue="0.04" /></text>
-	</element>
-	<element name="text_b7">
-		<rect><color red="0.6" green="0.6" blue="0.6" /></rect>
-		<text string="C3"><color red="0.04" green="0.04" blue="0.04" /></text>
-	</element>
-	<element name="text_b8">
-		<rect><color red="0.6" green="0.6" blue="0.6" /></rect>
-		<text string="d4"><color red="0.04" green="0.04" blue="0.04" /></text>
-	</element>
-	<element name="text_b9">
-		<rect><color red="0.6" green="0.6" blue="0.6" /></rect>
-		<text string="E5"><color red="0.04" green="0.04" blue="0.04" /></text>
-	</element>
-	<element name="text_b10">
-		<rect><color red="0.6" green="0.6" blue="0.6" /></rect>
-		<text string="F6"><color red="0.04" green="0.04" blue="0.04" /></text>
-	</element>
-	<element name="text_b11">
-		<rect><color red="0.6" green="0.6" blue="0.6" /></rect>
-		<text string="G7"><color red="0.04" green="0.04" blue="0.04" /></text>
-	</element>
-	<element name="text_b12">
-		<rect><color red="0.6" green="0.6" blue="0.6" /></rect>
-		<text string="H8"><color red="0.04" green="0.04" blue="0.04" /></text>
-	</element>
+	<element name="text_b1"><text string="RE"><color red="0.04" green="0.04" blue="0.04" /></text></element>
+	<element name="text_b2"><text string="DM"><color red="0.04" green="0.04" blue="0.04" /></text></element>
+	<element name="text_b3"><text string="CL"><color red="0.04" green="0.04" blue="0.04" /></text></element>
+	<element name="text_b4"><text string="EN"><color red="0.04" green="0.04" blue="0.04" /></text></element>
+	<element name="text_b5"><text string="A1"><color red="0.04" green="0.04" blue="0.04" /></text></element>
+	<element name="text_b6"><text string="b2"><color red="0.04" green="0.04" blue="0.04" /></text></element>
+	<element name="text_b7"><text string="C3"><color red="0.04" green="0.04" blue="0.04" /></text></element>
+	<element name="text_b8"><text string="d4"><color red="0.04" green="0.04" blue="0.04" /></text></element>
+	<element name="text_b9"><text string="E5"><color red="0.04" green="0.04" blue="0.04" /></text></element>
+	<element name="text_b10"><text string="F6"><color red="0.04" green="0.04" blue="0.04" /></text></element>
+	<element name="text_b11"><text string="G7"><color red="0.04" green="0.04" blue="0.04" /></text></element>
+	<element name="text_b12"><text string="H8"><color red="0.04" green="0.04" blue="0.04" /></text></element>
 
 
 <!-- build screen -->
@@ -90,8 +54,7 @@ license:CC0-1.0
 	<view name="Internal Layout">
 		<bounds left="-0.5" right="18" top="7.7" bottom="32" />
 
-	<!-- 7segs/leds -->
-
+		<!-- 7segs/leds -->
 		<element ref="text_check"><bounds x="1" y="8.2" width="8" height="2" /></element>
 		<element ref="text_lose"><bounds x="10.5" y="8.2" width="8" height="2" /></element>
 		<element name="4.a" ref="led"><bounds x="0" y="8.5" width="1.5" height="1.5" /></element>
@@ -105,20 +68,19 @@ license:CC0-1.0
 		<element name="digit2" ref="digit"><bounds x="9.5" y="11" width="4" height="6" /></element>
 		<element name="digit3" ref="digit"><bounds x="13.5" y="11" width="4" height="6" /></element>
 
-	<!-- button panel -->
-
-		<element ref="static_gray"><bounds x="0" y="20" width="4" height="3.5" /></element>
-		<element ref="static_gray"><bounds x="4.5" y="20" width="4" height="3.5" /></element>
-		<element ref="static_gray"><bounds x="9" y="20" width="4" height="3.5" /></element>
-		<element ref="static_gray"><bounds x="13.5" y="20" width="4" height="3.5" /></element>
-		<element ref="static_gray"><bounds x="0" y="24" width="4" height="3.5" /></element>
-		<element ref="static_gray"><bounds x="4.5" y="24" width="4" height="3.5" /></element>
-		<element ref="static_gray"><bounds x="9" y="24" width="4" height="3.5" /></element>
-		<element ref="static_gray"><bounds x="13.5" y="24" width="4" height="3.5" /></element>
-		<element ref="static_gray"><bounds x="0" y="28" width="4" height="3.5" /></element>
-		<element ref="static_gray"><bounds x="4.5" y="28" width="4" height="3.5" /></element>
-		<element ref="static_gray"><bounds x="9" y="28" width="4" height="3.5" /></element>
-		<element ref="static_gray"><bounds x="13.5" y="28" width="4" height="3.5" /></element>
+		<!-- button panel -->
+		<element ref="gray"><bounds x="0" y="20" width="4" height="3.5" /></element>
+		<element ref="gray"><bounds x="4.5" y="20" width="4" height="3.5" /></element>
+		<element ref="gray"><bounds x="9" y="20" width="4" height="3.5" /></element>
+		<element ref="gray"><bounds x="13.5" y="20" width="4" height="3.5" /></element>
+		<element ref="gray"><bounds x="0" y="24" width="4" height="3.5" /></element>
+		<element ref="gray"><bounds x="4.5" y="24" width="4" height="3.5" /></element>
+		<element ref="gray"><bounds x="9" y="24" width="4" height="3.5" /></element>
+		<element ref="gray"><bounds x="13.5" y="24" width="4" height="3.5" /></element>
+		<element ref="gray"><bounds x="0" y="28" width="4" height="3.5" /></element>
+		<element ref="gray"><bounds x="4.5" y="28" width="4" height="3.5" /></element>
+		<element ref="gray"><bounds x="9" y="28" width="4" height="3.5" /></element>
+		<element ref="gray"><bounds x="13.5" y="28" width="4" height="3.5" /></element>
 
 		<element ref="text_b1"><bounds x="0.1" y="20.75" width="3.8" height="2" /></element>
 		<element ref="text_b2"><bounds x="4.6" y="20.75" width="3.8" height="2" /></element>
diff --git a/src/mame/layout/fidel_chesster.lay b/src/mame/layout/fidel_chesster.lay
index dc23db80403..8c8adaf05d6 100644
--- a/src/mame/layout/fidel_chesster.lay
+++ b/src/mame/layout/fidel_chesster.lay
@@ -38,137 +38,41 @@ license:CC0-1.0
 		</disk>
 	</element>
 
-	<element name="text_1">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="1"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_2">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="2"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_3">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="3"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_4">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="4"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_5">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="5"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_6">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="6"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_7">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="7"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_8">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="8"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-
-	<element name="text_a">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="A"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_b">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="B"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_c">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="C"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_d">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="D"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_e">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="E"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_f">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="F"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_g">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="G"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_h">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="H"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-
-	<element name="text_white">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="WHITE"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_black">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="BLACK"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_clear">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="CLEAR"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_u1">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="VERIFY"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_u2">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="OPTION"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_u3">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="LEVEL"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_u4">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="TAKE BACK"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_u5">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="HINT"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_u6">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="MOVE"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-
-	<element name="text_shift">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="SHIFT"><color red="0.81" green="0.3" blue="0.29" /></text>
-	</element>
-	<element name="text_s1">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="PROBLEM"><color red="0.81" green="0.3" blue="0.29" /></text>
-	</element>
-	<element name="text_s2">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="REPLAY"><color red="0.81" green="0.3" blue="0.29" /></text>
-	</element>
-	<element name="text_s3">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="NEW"><color red="0.81" green="0.3" blue="0.29" /></text>
-	</element>
-	<element name="text_s4">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="REPEAT"><color red="0.81" green="0.3" blue="0.29" /></text>
-	</element>
-	<element name="text_s5">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="YES"><color red="0.81" green="0.3" blue="0.29" /></text>
-	</element>
-	<element name="text_s6">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="NO"><color red="0.81" green="0.3" blue="0.29" /></text>
-	</element>
+	<element name="text_1"><text string="1"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_2"><text string="2"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_3"><text string="3"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_4"><text string="4"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_5"><text string="5"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_6"><text string="6"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_7"><text string="7"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_8"><text string="8"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+
+	<element name="text_a"><text string="A"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_b"><text string="B"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_c"><text string="C"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_d"><text string="D"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_e"><text string="E"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_f"><text string="F"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_g"><text string="G"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_h"><text string="H"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+
+	<element name="text_white"><text string="WHITE"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_black"><text string="BLACK"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_clear"><text string="CLEAR"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_u1"><text string="VERIFY"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_u2"><text string="OPTION"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_u3"><text string="LEVEL"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_u4"><text string="TAKE BACK"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_u5"><text string="HINT"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_u6"><text string="MOVE"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+
+	<element name="text_shift"><text string="SHIFT"><color red="0.81" green="0.3" blue="0.29" /></text></element>
+	<element name="text_s1"><text string="PROBLEM"><color red="0.81" green="0.3" blue="0.29" /></text></element>
+	<element name="text_s2"><text string="REPLAY"><color red="0.81" green="0.3" blue="0.29" /></text></element>
+	<element name="text_s3"><text string="NEW"><color red="0.81" green="0.3" blue="0.29" /></text></element>
+	<element name="text_s4"><text string="REPEAT"><color red="0.81" green="0.3" blue="0.29" /></text></element>
+	<element name="text_s5"><text string="YES"><color red="0.81" green="0.3" blue="0.29" /></text></element>
+	<element name="text_s6"><text string="NO"><color red="0.81" green="0.3" blue="0.29" /></text></element>
 
 	<element name="text_p1"><rect><color red="1" green="1" blue="1" /></rect><image file="chess/bk.svg" /><rect><color red="1" green="1" blue="1" alpha="0.1875" /></rect></element>
 	<element name="text_p2"><rect><color red="1" green="1" blue="1" /></rect><image file="chess/bq.svg" /><rect><color red="1" green="1" blue="1" alpha="0.1875" /></rect></element>
@@ -333,43 +237,23 @@ license:CC0-1.0
 	<element name="text_uit1"><text string="S.BOARD"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uit2"><text string="INTERFACE"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uib1"><text string="BOARD:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uib2">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="RESET"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uib3">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="CLEAR"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uib2"><text string="RESET"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uib3"><text string="CLEAR"><color red="0.01" green="0.01" blue="0.01" /></text></element>
 	<element name="text_uis1"><text string="SPAWN:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uih1"><text string="HAND:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uih2">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="REMOVE"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uih2"><text string="REMOVE"><color red="0.01" green="0.01" blue="0.01" /></text></element>
 	<element name="text_uiu1"><text string="UNDO:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uiu2a">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string=" &lt;&lt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2b">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string=" &lt;  "><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2c">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="   &gt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2d">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string=" &gt;&gt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uiu2a"><text string=" &lt;&lt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2b"><text string=" &lt;  "><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2c"><text string="   &gt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2d"><text string=" &gt;&gt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu3b"><text string="/"><color red="0.81" green="0.8" blue="0.79" /></text></element>
+
 	<element name="text_uiu3a" defstate="0">
 		<simplecounter maxstate="999" digits="1" align="2">
 			<color red="0.81" green="0.8" blue="0.79" />
 		</simplecounter>
 	</element>
-	<element name="text_uiu3b"><text string="/"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uiu3c" defstate="0">
 		<simplecounter maxstate="999" digits="1" align="1">
 			<color red="0.81" green="0.8" blue="0.79" />
diff --git a/src/mame/layout/fidel_cphantom.lay b/src/mame/layout/fidel_cphantom.lay
index bd41d321529..f120e092712 100644
--- a/src/mame/layout/fidel_cphantom.lay
+++ b/src/mame/layout/fidel_cphantom.lay
@@ -50,156 +50,51 @@ license:CC0-1.0
 		</disk>
 	</element>
 
-	<element name="text_1">
-		<rect><color red="0.209" green="0.209" blue="0.201" /></rect>
-		<text string="1"><color red="0.843" green="0.678" blue="0.482" /></text>
-	</element>
-	<element name="text_2">
-		<rect><color red="0.843" green="0.678" blue="0.482" /></rect>
-		<text string="2"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_3">
-		<rect><color red="0.209" green="0.209" blue="0.201" /></rect>
-		<text string="3"><color red="0.843" green="0.678" blue="0.482" /></text>
-	</element>
-	<element name="text_4">
-		<rect><color red="0.843" green="0.678" blue="0.482" /></rect>
-		<text string="4"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_5">
-		<rect><color red="0.209" green="0.209" blue="0.201" /></rect>
-		<text string="5"><color red="0.843" green="0.678" blue="0.482" /></text>
-	</element>
-	<element name="text_6">
-		<rect><color red="0.843" green="0.678" blue="0.482" /></rect>
-		<text string="6"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_7">
-		<rect><color red="0.209" green="0.209" blue="0.201" /></rect>
-		<text string="7"><color red="0.843" green="0.678" blue="0.482" /></text>
-	</element>
-	<element name="text_8">
-		<rect><color red="0.843" green="0.678" blue="0.482" /></rect>
-		<text string="8"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-
-	<element name="text_a">
-		<rect><color red="0.209" green="0.209" blue="0.201" /></rect>
-		<text string="A"><color red="0.843" green="0.678" blue="0.482" /></text>
-	</element>
-	<element name="text_b">
-		<rect><color red="0.843" green="0.678" blue="0.482" /></rect>
-		<text string="B"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_c">
-		<rect><color red="0.209" green="0.209" blue="0.201" /></rect>
-		<text string="C"><color red="0.843" green="0.678" blue="0.482" /></text>
-	</element>
-	<element name="text_d">
-		<rect><color red="0.843" green="0.678" blue="0.482" /></rect>
-		<text string="D"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_e">
-		<rect><color red="0.209" green="0.209" blue="0.201" /></rect>
-		<text string="E"><color red="0.843" green="0.678" blue="0.482" /></text>
-	</element>
-	<element name="text_f">
-		<rect><color red="0.843" green="0.678" blue="0.482" /></rect>
-		<text string="F"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_g">
-		<rect><color red="0.209" green="0.209" blue="0.201" /></rect>
-		<text string="G"><color red="0.843" green="0.678" blue="0.482" /></text>
-	</element>
-	<element name="text_h">
-		<rect><color red="0.843" green="0.678" blue="0.482" /></rect>
-		<text string="H"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-
-	<element name="text_white">
-		<rect><color red="0.17" green="0.15" blue="0.15" /></rect>
-		<text string="WHITE"><color red="0.99" green="0.99" blue="0.99" /></text>
-	</element>
-	<element name="text_black">
-		<rect><color red="0.17" green="0.15" blue="0.15" /></rect>
-		<text string="BLACK"><color red="0.99" green="0.99" blue="0.99" /></text>
-	</element>
-	<element name="text_u1">
-		<rect><color red="0.843" green="0.678" blue="0.482" /></rect>
-		<text string="VERIFY"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_u2">
-		<rect><color red="0.843" green="0.678" blue="0.482" /></rect>
-		<text string="OPTION"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_u3">
-		<rect><color red="0.843" green="0.678" blue="0.482" /></rect>
-		<text string="LEVEL"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_u4">
-		<rect><color red="0.843" green="0.678" blue="0.482" /></rect>
-		<text string="INFO"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_u5">
-		<rect><color red="0.843" green="0.678" blue="0.482" /></rect>
-		<text string="TAKE BACK"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_u6">
-		<rect><color red="0.843" green="0.678" blue="0.482" /></rect>
-		<text string="HINT"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_u7">
-		<rect><color red="0.843" green="0.678" blue="0.482" /></rect>
-		<text string="MOVE"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_u8">
-		<rect><color red="0.843" green="0.678" blue="0.482" /></rect>
-		<text string="CLEAR"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-
-	<element name="text_shift">
-		<rect><color red="0.843" green="0.678" blue="0.482" /></rect>
-		<text string="SHIFT"><color red="0.81" green="0.3" blue="0.29" /></text>
-	</element>
-	<element name="text_s1">
-		<rect><color red="0.843" green="0.678" blue="0.482" /></rect>
-		<text string="PROBLEM"><color red="0.81" green="0.3" blue="0.29" /></text>
-	</element>
-	<element name="text_s2">
-		<rect><color red="0.843" green="0.678" blue="0.482" /></rect>
-		<text string="REPLAY"><color red="0.81" green="0.3" blue="0.29" /></text>
-	</element>
-	<element name="text_s3">
-		<rect><color red="0.843" green="0.678" blue="0.482" /></rect>
-		<text string="NEW"><color red="0.81" green="0.3" blue="0.29" /></text>
-	</element>
-	<element name="text_s4">
-		<rect><color red="0.843" green="0.678" blue="0.482" /></rect>
-		<text string="AUTO"><color red="0.81" green="0.3" blue="0.29" /></text>
-	</element>
-	<element name="text_s5">
-		<rect><color red="0.843" green="0.678" blue="0.482" /></rect>
-		<text string="REPEAT"><color red="0.81" green="0.3" blue="0.29" /></text>
-	</element>
-	<element name="text_s6">
-		<rect><color red="0.843" green="0.678" blue="0.482" /></rect>
-		<text string="YES"><color red="0.81" green="0.3" blue="0.29" /></text>
-	</element>
-	<element name="text_s7">
-		<rect><color red="0.843" green="0.678" blue="0.482" /></rect>
-		<text string="NO/STOP"><color red="0.81" green="0.3" blue="0.29" /></text>
-	</element>
-	<element name="text_s8">
-		<rect><color red="0.843" green="0.678" blue="0.482" /></rect>
-		<text string="CLEAR"><color red="0.81" green="0.3" blue="0.29" /></text>
-	</element>
-
-	<element name="text_p1">      <image file="chess/wk.svg"/></element>
-	<element name="text_p2">      <image file="chess/wq.svg"/></element>
-	<element name="text_p3">      <image file="chess/wr.svg"/></element>
-	<element name="text_p4">      <image file="chess/wb.svg"/></element>
-	<element name="text_p5">      <image file="chess/wn.svg"/></element>
-	<element name="text_p6">      <image file="chess/wp.svg"/></element>
+	<element name="text_1"><text string="1"><color red="0.843" green="0.678" blue="0.482" /></text></element>
+	<element name="text_2"><text string="2"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_3"><text string="3"><color red="0.843" green="0.678" blue="0.482" /></text></element>
+	<element name="text_4"><text string="4"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_5"><text string="5"><color red="0.843" green="0.678" blue="0.482" /></text></element>
+	<element name="text_6"><text string="6"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_7"><text string="7"><color red="0.843" green="0.678" blue="0.482" /></text></element>
+	<element name="text_8"><text string="8"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+
+	<element name="text_a"><text string="A"><color red="0.843" green="0.678" blue="0.482" /></text></element>
+	<element name="text_b"><text string="B"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_c"><text string="C"><color red="0.843" green="0.678" blue="0.482" /></text></element>
+	<element name="text_d"><text string="D"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_e"><text string="E"><color red="0.843" green="0.678" blue="0.482" /></text></element>
+	<element name="text_f"><text string="F"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_g"><text string="G"><color red="0.843" green="0.678" blue="0.482" /></text></element>
+	<element name="text_h"><text string="H"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+
+	<element name="text_white"><text string="WHITE"><color red="0.99" green="0.99" blue="0.99" /></text></element>
+	<element name="text_black"><text string="BLACK"><color red="0.99" green="0.99" blue="0.99" /></text></element>
+	<element name="text_u1"><text string="VERIFY"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_u2"><text string="OPTION"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_u3"><text string="LEVEL"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_u4"><text string="INFO"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_u5"><text string="TAKE BACK"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_u6"><text string="HINT"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_u7"><text string="MOVE"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_u8"><text string="CLEAR"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+
+	<element name="text_shift"><text string="SHIFT"><color red="0.81" green="0.3" blue="0.29" /></text></element>
+	<element name="text_s1"><text string="PROBLEM"><color red="0.81" green="0.3" blue="0.29" /></text></element>
+	<element name="text_s2"><text string="REPLAY"><color red="0.81" green="0.3" blue="0.29" /></text></element>
+	<element name="text_s3"><text string="NEW"><color red="0.81" green="0.3" blue="0.29" /></text></element>
+	<element name="text_s4"><text string="AUTO"><color red="0.81" green="0.3" blue="0.29" /></text></element>
+	<element name="text_s5"><text string="REPEAT"><color red="0.81" green="0.3" blue="0.29" /></text></element>
+	<element name="text_s6"><text string="YES"><color red="0.81" green="0.3" blue="0.29" /></text></element>
+	<element name="text_s7"><text string="NO/STOP"><color red="0.81" green="0.3" blue="0.29" /></text></element>
+	<element name="text_s8"><text string="CLEAR"><color red="0.81" green="0.3" blue="0.29" /></text></element>
+
+	<element name="text_p1"><image file="chess/wk.svg"/></element>
+	<element name="text_p2"><image file="chess/wq.svg"/></element>
+	<element name="text_p3"><image file="chess/wr.svg"/></element>
+	<element name="text_p4"><image file="chess/wb.svg"/></element>
+	<element name="text_p5"><image file="chess/wn.svg"/></element>
+	<element name="text_p6"><image file="chess/wp.svg"/></element>
 
 
 <!-- sb board -->
@@ -426,43 +321,23 @@ license:CC0-1.0
 	<element name="text_uit1"><text string="S.BOARD"><color red="0.843" green="0.678" blue="0.482" /></text></element>
 	<element name="text_uit2"><text string="INTERFACE"><color red="0.843" green="0.678" blue="0.482" /></text></element>
 	<element name="text_uib1"><text string="BOARD:"><color red="0.843" green="0.678" blue="0.482" /></text></element>
-	<element name="text_uib2">
-		<rect><color red="0.843" green="0.678" blue="0.482" /></rect>
-		<text string="RESET"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uib3">
-		<rect><color red="0.843" green="0.678" blue="0.482" /></rect>
-		<text string="CLEAR"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uib2"><text string="RESET"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uib3"><text string="CLEAR"><color red="0.01" green="0.01" blue="0.01" /></text></element>
 	<element name="text_uis1"><text string="SPAWN:"><color red="0.843" green="0.678" blue="0.482" /></text></element>
 	<element name="text_uih1"><text string="HAND:"><color red="0.843" green="0.678" blue="0.482" /></text></element>
-	<element name="text_uih2">
-		<rect><color red="0.843" green="0.678" blue="0.482" /></rect>
-		<text string="REMOVE"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uih2"><text string="REMOVE"><color red="0.01" green="0.01" blue="0.01" /></text></element>
 	<element name="text_uiu1"><text string="UNDO:"><color red="0.843" green="0.678" blue="0.482" /></text></element>
-	<element name="text_uiu2a">
-		<rect><color red="0.843" green="0.678" blue="0.482" /></rect>
-		<text string=" &lt;&lt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2b">
-		<rect><color red="0.843" green="0.678" blue="0.482" /></rect>
-		<text string=" &lt;  "><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2c">
-		<rect><color red="0.843" green="0.678" blue="0.482" /></rect>
-		<text string="   &gt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2d">
-		<rect><color red="0.843" green="0.678" blue="0.482" /></rect>
-		<text string=" &gt;&gt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uiu2a"><text string=" &lt;&lt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2b"><text string=" &lt;  "><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2c"><text string="   &gt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2d"><text string=" &gt;&gt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu3b"><text string="/"><color red="0.843" green="0.678" blue="0.482" /></text></element>
+
 	<element name="text_uiu3a" defstate="0">
 		<simplecounter maxstate="999" digits="1" align="2">
 			<color red="0.843" green="0.678" blue="0.482" />
 		</simplecounter>
 	</element>
-	<element name="text_uiu3b"><text string="/"><color red="0.843" green="0.678" blue="0.482" /></text></element>
 	<element name="text_uiu3c" defstate="0">
 		<simplecounter maxstate="999" digits="1" align="1">
 			<color red="0.843" green="0.678" blue="0.482" />
diff --git a/src/mame/layout/fidel_cr.lay b/src/mame/layout/fidel_cr.lay
index bb54807f8cb..d852f5d9ca6 100644
--- a/src/mame/layout/fidel_cr.lay
+++ b/src/mame/layout/fidel_cr.lay
@@ -6,7 +6,7 @@ license:CC0-1.0
 
 <!-- define elements -->
 
-	<element name="static_gray"><rect><color red="0.6" green="0.6" blue="0.6" /></rect></element>
+	<element name="gray"><rect><color red="0.6" green="0.6" blue="0.6" /></rect></element>
 
 	<element name="digit" defstate="0">
 		<led7seg><color red="1.0" green="0.1" blue="0.15" /></led7seg>
@@ -33,70 +33,22 @@ license:CC0-1.0
 	<element name="text_from"><text string="FROM"><color red="0.6" green="0.6" blue="0.6" /></text></element>
 	<element name="text_to"><text string="TO"><color red="0.6" green="0.6" blue="0.6" /></text></element>
 
-	<element name="text_b1">
-		<rect><color red="0.6" green="0.6" blue="0.6" /></rect>
-		<text string="RE"><color red="0.04" green="0.04" blue="0.04" /></text>
-	</element>
-	<element name="text_b2">
-		<rect><color red="0.6" green="0.6" blue="0.6" /></rect>
-		<text string="CL"><color red="0.04" green="0.04" blue="0.04" /></text>
-	</element>
-	<element name="text_b3">
-		<rect><color red="0.6" green="0.6" blue="0.6" /></rect>
-		<text string="TO"><color red="0.04" green="0.04" blue="0.04" /></text>
-	</element>
-	<element name="text_b4">
-		<rect><color red="0.6" green="0.6" blue="0.6" /></rect>
-		<text string="EN"><color red="0.04" green="0.04" blue="0.04" /></text>
-	</element>
-	<element name="text_b5">
-		<rect><color red="0.6" green="0.6" blue="0.6" /></rect>
-		<text string="LV"><color red="0.04" green="0.04" blue="0.04" /></text>
-	</element>
-	<element name="text_b6">
-		<rect><color red="0.6" green="0.6" blue="0.6" /></rect>
-		<text string="7"><color red="0.04" green="0.04" blue="0.04" /></text>
-	</element>
-	<element name="text_b7">
-		<rect><color red="0.6" green="0.6" blue="0.6" /></rect>
-		<text string="8"><color red="0.04" green="0.04" blue="0.04" /></text>
-	</element>
-	<element name="text_b8">
-		<rect><color red="0.6" green="0.6" blue="0.6" /></rect>
-		<text string="9"><color red="0.04" green="0.04" blue="0.04" /></text>
-	</element>
-	<element name="text_b9">
-		<rect><color red="0.6" green="0.6" blue="0.6" /></rect>
-		<text string="PV"><color red="0.04" green="0.04" blue="0.04" /></text>
-	</element>
-	<element name="text_b10">
-		<rect><color red="0.6" green="0.6" blue="0.6" /></rect>
-		<text string="4"><color red="0.04" green="0.04" blue="0.04" /></text>
-	</element>
-	<element name="text_b11">
-		<rect><color red="0.6" green="0.6" blue="0.6" /></rect>
-		<text string="5"><color red="0.04" green="0.04" blue="0.04" /></text>
-	</element>
-	<element name="text_b12">
-		<rect><color red="0.6" green="0.6" blue="0.6" /></rect>
-		<text string="6"><color red="0.04" green="0.04" blue="0.04" /></text>
-	</element>
-	<element name="text_b13">
-		<rect><color red="0.6" green="0.6" blue="0.6" /></rect>
-		<text string="0"><color red="0.04" green="0.04" blue="0.04" /></text>
-	</element>
-	<element name="text_b14">
-		<rect><color red="0.6" green="0.6" blue="0.6" /></rect>
-		<text string="1"><color red="0.04" green="0.04" blue="0.04" /></text>
-	</element>
-	<element name="text_b15">
-		<rect><color red="0.6" green="0.6" blue="0.6" /></rect>
-		<text string="2"><color red="0.04" green="0.04" blue="0.04" /></text>
-	</element>
-	<element name="text_b16">
-		<rect><color red="0.6" green="0.6" blue="0.6" /></rect>
-		<text string="3"><color red="0.04" green="0.04" blue="0.04" /></text>
-	</element>
+	<element name="text_b1"><text string="RE"><color red="0.04" green="0.04" blue="0.04" /></text></element>
+	<element name="text_b2"><text string="CL"><color red="0.04" green="0.04" blue="0.04" /></text></element>
+	<element name="text_b3"><text string="TO"><color red="0.04" green="0.04" blue="0.04" /></text></element>
+	<element name="text_b4"><text string="EN"><color red="0.04" green="0.04" blue="0.04" /></text></element>
+	<element name="text_b5"><text string="LV"><color red="0.04" green="0.04" blue="0.04" /></text></element>
+	<element name="text_b6"><text string="7"><color red="0.04" green="0.04" blue="0.04" /></text></element>
+	<element name="text_b7"><text string="8"><color red="0.04" green="0.04" blue="0.04" /></text></element>
+	<element name="text_b8"><text string="9"><color red="0.04" green="0.04" blue="0.04" /></text></element>
+	<element name="text_b9"><text string="PV"><color red="0.04" green="0.04" blue="0.04" /></text></element>
+	<element name="text_b10"><text string="4"><color red="0.04" green="0.04" blue="0.04" /></text></element>
+	<element name="text_b11"><text string="5"><color red="0.04" green="0.04" blue="0.04" /></text></element>
+	<element name="text_b12"><text string="6"><color red="0.04" green="0.04" blue="0.04" /></text></element>
+	<element name="text_b13"><text string="0"><color red="0.04" green="0.04" blue="0.04" /></text></element>
+	<element name="text_b14"><text string="1"><color red="0.04" green="0.04" blue="0.04" /></text></element>
+	<element name="text_b15"><text string="2"><color red="0.04" green="0.04" blue="0.04" /></text></element>
+	<element name="text_b16"><text string="3"><color red="0.04" green="0.04" blue="0.04" /></text></element>
 
 
 <!-- build screen -->
@@ -119,22 +71,22 @@ license:CC0-1.0
 		<element name="digit0" ref="digit"><bounds x="13.5" y="11" width="4" height="6" /></element>
 
 		<!-- button panel -->
-		<element ref="static_gray"><bounds x="0" y="20" width="4" height="3.5" /></element>
-		<element ref="static_gray"><bounds x="4.5" y="20" width="4" height="3.5" /></element>
-		<element ref="static_gray"><bounds x="9" y="20" width="4" height="3.5" /></element>
-		<element ref="static_gray"><bounds x="13.5" y="20" width="4" height="3.5" /></element>
-		<element ref="static_gray"><bounds x="0" y="24" width="4" height="3.5" /></element>
-		<element ref="static_gray"><bounds x="4.5" y="24" width="4" height="3.5" /></element>
-		<element ref="static_gray"><bounds x="9" y="24" width="4" height="3.5" /></element>
-		<element ref="static_gray"><bounds x="13.5" y="24" width="4" height="3.5" /></element>
-		<element ref="static_gray"><bounds x="0" y="28" width="4" height="3.5" /></element>
-		<element ref="static_gray"><bounds x="4.5" y="28" width="4" height="3.5" /></element>
-		<element ref="static_gray"><bounds x="9" y="28" width="4" height="3.5" /></element>
-		<element ref="static_gray"><bounds x="13.5" y="28" width="4" height="3.5" /></element>
-		<element ref="static_gray"><bounds x="0" y="32" width="4" height="3.5" /></element>
-		<element ref="static_gray"><bounds x="4.5" y="32" width="4" height="3.5" /></element>
-		<element ref="static_gray"><bounds x="9" y="32" width="4" height="3.5" /></element>
-		<element ref="static_gray"><bounds x="13.5" y="32" width="4" height="3.5" /></element>
+		<element ref="gray"><bounds x="0" y="20" width="4" height="3.5" /></element>
+		<element ref="gray"><bounds x="4.5" y="20" width="4" height="3.5" /></element>
+		<element ref="gray"><bounds x="9" y="20" width="4" height="3.5" /></element>
+		<element ref="gray"><bounds x="13.5" y="20" width="4" height="3.5" /></element>
+		<element ref="gray"><bounds x="0" y="24" width="4" height="3.5" /></element>
+		<element ref="gray"><bounds x="4.5" y="24" width="4" height="3.5" /></element>
+		<element ref="gray"><bounds x="9" y="24" width="4" height="3.5" /></element>
+		<element ref="gray"><bounds x="13.5" y="24" width="4" height="3.5" /></element>
+		<element ref="gray"><bounds x="0" y="28" width="4" height="3.5" /></element>
+		<element ref="gray"><bounds x="4.5" y="28" width="4" height="3.5" /></element>
+		<element ref="gray"><bounds x="9" y="28" width="4" height="3.5" /></element>
+		<element ref="gray"><bounds x="13.5" y="28" width="4" height="3.5" /></element>
+		<element ref="gray"><bounds x="0" y="32" width="4" height="3.5" /></element>
+		<element ref="gray"><bounds x="4.5" y="32" width="4" height="3.5" /></element>
+		<element ref="gray"><bounds x="9" y="32" width="4" height="3.5" /></element>
+		<element ref="gray"><bounds x="13.5" y="32" width="4" height="3.5" /></element>
 
 		<element ref="text_b1"><bounds x="0.1" y="20.75" width="3.8" height="2" /></element>
 		<element ref="text_b2"><bounds x="4.6" y="20.75" width="3.8" height="2" /></element>
diff --git a/src/mame/layout/fidel_csc.lay b/src/mame/layout/fidel_csc.lay
index ed58f686b11..877e7c5c5a9 100644
--- a/src/mame/layout/fidel_csc.lay
+++ b/src/mame/layout/fidel_csc.lay
@@ -43,80 +43,26 @@ license:CC0-1.0
 		</rect>
 	</element>
 
-	<element name="text_1">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="1"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_2">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="2"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_3">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="3"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_4">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="4"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_5">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="5"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_6">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="6"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_7">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="7"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_8">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="8"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-
-	<element name="text_a">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="A"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_b">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="B"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_c">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="C"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_d">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="D"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_e">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="E"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_f">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="F"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_g">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="G"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_h">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="H"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-
-	<element name="text_re">
-		<disk><color red="0.81" green="0.8" blue="0.79" /></disk>
-		<text string="RE"><color red="0.15" green="0.15" blue="0.15" /></text>
-	</element>
-	<element name="text_cl">
-		<disk><color red="0.81" green="0.8" blue="0.79" /></disk>
-		<text string="CL"><color red="0.15" green="0.15" blue="0.15" /></text>
-	</element>
+	<element name="text_1"><text string="1"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_2"><text string="2"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_3"><text string="3"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_4"><text string="4"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_5"><text string="5"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_6"><text string="6"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_7"><text string="7"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_8"><text string="8"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+
+	<element name="text_a"><text string="A"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_b"><text string="B"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_c"><text string="C"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_d"><text string="D"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_e"><text string="E"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_f"><text string="F"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_g"><text string="G"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_h"><text string="H"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+
+	<element name="text_re"><text string="RE"><color red="0.15" green="0.15" blue="0.15" /></text></element>
+	<element name="text_cl"><text string="CL"><color red="0.15" green="0.15" blue="0.15" /></text></element>
 
 	<element name="text_p1"><rect><color red="1" green="1" blue="1" /></rect><image file="chess/bk.svg" /><rect><color red="1" green="1" blue="1" alpha="0.1875" /></rect></element>
 	<element name="text_p2"><rect><color red="1" green="1" blue="1" /></rect><image file="chess/bq.svg" /><rect><color red="1" green="1" blue="1" alpha="0.1875" /></rect></element>
@@ -135,26 +81,11 @@ license:CC0-1.0
 		]]></data></image>
 	</element>
 
-	<element name="text_tm">
-		<rect><color red="0.15" green="0.15" blue="0.15" /></rect>
-		<text string="TM"><color red="0.81" green="0.8" blue="0.79" /></text>
-	</element>
-	<element name="text_rv">
-		<rect><color red="0.15" green="0.15" blue="0.15" /></rect>
-		<text string="RV"><color red="0.81" green="0.8" blue="0.79" /></text>
-	</element>
-	<element name="text_st">
-		<rect><color red="0.15" green="0.15" blue="0.15" /></rect>
-		<text string="ST"><color red="0.81" green="0.8" blue="0.79" /></text>
-	</element>
-	<element name="text_dm">
-		<rect><color red="0.15" green="0.15" blue="0.15" /></rect>
-		<text string="DM"><color red="0.81" green="0.8" blue="0.79" /></text>
-	</element>
-	<element name="text_lv">
-		<rect><color red="0.15" green="0.15" blue="0.15" /></rect>
-		<text string="LV"><color red="0.81" green="0.8" blue="0.79" /></text>
-	</element>
+	<element name="text_tm"><text string="TM"><color red="0.81" green="0.8" blue="0.79" /></text></element>
+	<element name="text_rv"><text string="RV"><color red="0.81" green="0.8" blue="0.79" /></text></element>
+	<element name="text_st"><text string="ST"><color red="0.81" green="0.8" blue="0.79" /></text></element>
+	<element name="text_dm"><text string="DM"><color red="0.81" green="0.8" blue="0.79" /></text></element>
+	<element name="text_lv"><text string="LV"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 
 
 <!-- sb board -->
@@ -324,43 +255,23 @@ license:CC0-1.0
 	<element name="text_uit1"><text string="S.BOARD"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uit2"><text string="INTERFACE"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uib1"><text string="BOARD:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uib2">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="RESET"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uib3">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="CLEAR"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uib2"><text string="RESET"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uib3"><text string="CLEAR"><color red="0.01" green="0.01" blue="0.01" /></text></element>
 	<element name="text_uis1"><text string="SPAWN:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uih1"><text string="HAND:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uih2">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="REMOVE"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uih2"><text string="REMOVE"><color red="0.01" green="0.01" blue="0.01" /></text></element>
 	<element name="text_uiu1"><text string="UNDO:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uiu2a">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string=" &lt;&lt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2b">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string=" &lt;  "><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2c">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="   &gt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2d">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string=" &gt;&gt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uiu2a"><text string=" &lt;&lt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2b"><text string=" &lt;  "><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2c"><text string="   &gt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2d"><text string=" &gt;&gt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu3b"><text string="/"><color red="0.81" green="0.8" blue="0.79" /></text></element>
+
 	<element name="text_uiu3a" defstate="0">
 		<simplecounter maxstate="999" digits="1" align="2">
 			<color red="0.81" green="0.8" blue="0.79" />
 		</simplecounter>
 	</element>
-	<element name="text_uiu3b"><text string="/"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uiu3c" defstate="0">
 		<simplecounter maxstate="999" digits="1" align="1">
 			<color red="0.81" green="0.8" blue="0.79" />
diff --git a/src/mame/layout/fidel_des.lay b/src/mame/layout/fidel_des.lay
index 282592668fd..6d88bdc7a5e 100644
--- a/src/mame/layout/fidel_des.lay
+++ b/src/mame/layout/fidel_des.lay
@@ -27,158 +27,47 @@ license:CC0-1.0
 		</disk>
 	</element>
 
-	<element name="text_1">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="1" align="2"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_2">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="2" align="2"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_3">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="3" align="2"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_4">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="4" align="2"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_5">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="5" align="2"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_6">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="6" align="2"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_7">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="7" align="2"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_8">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="8" align="2"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-
-	<element name="text_9">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="9" align="2"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_10">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="10" align="2"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_11">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="11" align="2"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_12">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="12" align="2"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-
-	<element name="text_a">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="A"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_b">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="B"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_c">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="C"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_d">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="D"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_e">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="E"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_f">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="F"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_g">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="G"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_h">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="H"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-
-	<element name="text_lb">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="CHECK"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_lc">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="MATE"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_ld">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="WHITE"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_le">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="BLACK"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_lf">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="STALEMATE"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_lg">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="DRAW"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_lh">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="I LOSE"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-
-	<element name="text_t81">
-		<rect><color red="1" green="1" blue="1" /></rect>
-		<text string="NEW"><color red="0.1875" green="0.1875" blue="0.1875" /></text>
-	</element>
-	<element name="text_t82">
-		<rect><color red="1" green="1" blue="1" /></rect>
-		<text string="GAME"><color red="0.1875" green="0.1875" blue="0.1875" /></text>
-	</element>
-	<element name="text_t7">
-		<rect><color red="1" green="1" blue="1" /></rect>
-		<text string="VERIFY"><color red="0.1875" green="0.1875" blue="0.1875" /></text>
-	</element>
-	<element name="text_t6">
-		<rect><color red="1" green="1" blue="1" /></rect>
-		<text string=" OPTIONS"><color red="0.1875" green="0.1875" blue="0.1875" /></text>
-	</element>
-	<element name="text_t5">
-		<rect><color red="1" green="1" blue="1" /></rect>
-		<text string="LEVEL"><color red="0.1875" green="0.1875" blue="0.1875" /></text>
-	</element>
-	<element name="text_t41">
-		<rect><color red="1" green="1" blue="1" /></rect>
-		<text string="TAKE"><color red="0.1875" green="0.1875" blue="0.1875" /></text>
-	</element>
-	<element name="text_t42">
-		<rect><color red="1" green="1" blue="1" /></rect>
-		<text string="BACK"><color red="0.1875" green="0.1875" blue="0.1875" /></text>
-	</element>
-	<element name="text_t3">
-		<rect><color red="1" green="1" blue="1" /></rect>
-		<text string="HINT"><color red="0.1875" green="0.1875" blue="0.1875" /></text>
-	</element>
-	<element name="text_t2">
-		<rect><color red="1" green="1" blue="1" /></rect>
-		<text string="MOVE"><color red="0.1875" green="0.1875" blue="0.1875" /></text>
-	</element>
-	<element name="text_t1">
-		<rect><color red="1" green="1" blue="1" /></rect>
-		<text string="CLEAR"><color red="0.1875" green="0.1875" blue="0.1875" /></text>
-	</element>
+	<element name="text_1"><text string="1" align="2"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_2"><text string="2" align="2"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_3"><text string="3" align="2"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_4"><text string="4" align="2"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_5"><text string="5" align="2"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_6"><text string="6" align="2"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_7"><text string="7" align="2"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_8"><text string="8" align="2"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+
+	<element name="text_9"><text string="9" align="2"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_10"><text string="10" align="2"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_11"><text string="11" align="2"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_12"><text string="12" align="2"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+
+	<element name="text_a"><text string="A"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_b"><text string="B"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_c"><text string="C"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_d"><text string="D"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_e"><text string="E"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_f"><text string="F"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_g"><text string="G"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_h"><text string="H"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+
+	<element name="text_lb"><text string="CHECK"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_lc"><text string="MATE"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_ld"><text string="WHITE"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_le"><text string="BLACK"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_lf"><text string="STALEMATE"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_lg"><text string="DRAW"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_lh"><text string="I LOSE"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+
+	<element name="text_t81"><text string="NEW"><color red="0.15" green="0.15" blue="0.15" /></text></element>
+	<element name="text_t82"><text string="GAME"><color red="0.15" green="0.15" blue="0.15" /></text></element>
+	<element name="text_t7"><text string="VERIFY"><color red="0.15" green="0.15" blue="0.15" /></text></element>
+	<element name="text_t6"><text string=" OPTIONS"><color red="0.15" green="0.15" blue="0.15" /></text></element>
+	<element name="text_t5"><text string="LEVEL"><color red="0.15" green="0.15" blue="0.15" /></text></element>
+	<element name="text_t41"><text string="TAKE"><color red="0.15" green="0.15" blue="0.15" /></text></element>
+	<element name="text_t42"><text string="BACK"><color red="0.15" green="0.15" blue="0.15" /></text></element>
+	<element name="text_t3"><text string="HINT"><color red="0.15" green="0.15" blue="0.15" /></text></element>
+	<element name="text_t2"><text string="MOVE"><color red="0.15" green="0.15" blue="0.15" /></text></element>
+	<element name="text_t1"><text string="CLEAR"><color red="0.15" green="0.15" blue="0.15" /></text></element>
 
 	<element name="text_p1"><rect><color red="1" green="1" blue="1" /></rect><image file="chess/bk.svg" /><rect><color red="1" green="1" blue="1" alpha="0.1875" /></rect></element>
 	<element name="text_p2"><rect><color red="1" green="1" blue="1" /></rect><image file="chess/bq.svg" /><rect><color red="1" green="1" blue="1" alpha="0.1875" /></rect></element>
@@ -343,43 +232,23 @@ license:CC0-1.0
 	<element name="text_uit1"><text string="S.BOARD"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uit2"><text string="INTERFACE"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uib1"><text string="BOARD:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uib2">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="RESET"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uib3">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="CLEAR"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uib2"><text string="RESET"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uib3"><text string="CLEAR"><color red="0.01" green="0.01" blue="0.01" /></text></element>
 	<element name="text_uis1"><text string="SPAWN:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uih1"><text string="HAND:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uih2">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="REMOVE"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uih2"><text string="REMOVE"><color red="0.01" green="0.01" blue="0.01" /></text></element>
 	<element name="text_uiu1"><text string="UNDO:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uiu2a">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string=" &lt;&lt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2b">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string=" &lt;  "><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2c">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="   &gt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2d">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string=" &gt;&gt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uiu2a"><text string=" &lt;&lt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2b"><text string=" &lt;  "><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2c"><text string="   &gt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2d"><text string=" &gt;&gt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu3b"><text string="/"><color red="0.81" green="0.8" blue="0.79" /></text></element>
+
 	<element name="text_uiu3a" defstate="0">
 		<simplecounter maxstate="999" digits="1" align="2">
 			<color red="0.81" green="0.8" blue="0.79" />
 		</simplecounter>
 	</element>
-	<element name="text_uiu3b"><text string="/"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uiu3c" defstate="0">
 		<simplecounter maxstate="999" digits="1" align="1">
 			<color red="0.81" green="0.8" blue="0.79" />
@@ -551,16 +420,16 @@ license:CC0-1.0
 		<element ref="disk_white"><bounds x="87.7" y="65.7" width="4.6" height="4.6" /></element>
 		<element ref="disk_white"><bounds x="87.7" y="75.7" width="4.6" height="4.6" /></element>
 
-		<element ref="text_t81" blend="multiply"><bounds x="87" y="6.7" width="6" height="1.25" /></element>
-		<element ref="text_t82" blend="multiply"><bounds x="87" y="7.95" width="6" height="1.25" /></element>
-		<element ref="text_t7" blend="multiply"><bounds x="87" y="17.325" width="6" height="1.25" /></element>
-		<element ref="text_t6" blend="multiply"><bounds x="87" y="27.325" width="6" height="1.25" /></element>
-		<element ref="text_t5" blend="multiply"><bounds x="87" y="37.325" width="6" height="1.25" /></element>
-		<element ref="text_t41" blend="multiply"><bounds x="87" y="46.7" width="6" height="1.25" /></element>
-		<element ref="text_t42" blend="multiply"><bounds x="87" y="47.95" width="6" height="1.25" /></element>
-		<element ref="text_t3" blend="multiply"><bounds x="87" y="57.325" width="6" height="1.25" /></element>
-		<element ref="text_t2" blend="multiply"><bounds x="87" y="67.325" width="6" height="1.25" /></element>
-		<element ref="text_t1" blend="multiply"><bounds x="87" y="77.325" width="6" height="1.25" /></element>
+		<element ref="text_t81"><bounds x="87" y="6.7" width="6" height="1.25" /></element>
+		<element ref="text_t82"><bounds x="87" y="7.95" width="6" height="1.25" /></element>
+		<element ref="text_t7"><bounds x="87" y="17.325" width="6" height="1.25" /></element>
+		<element ref="text_t6"><bounds x="87" y="27.325" width="6" height="1.25" /></element>
+		<element ref="text_t5"><bounds x="87" y="37.325" width="6" height="1.25" /></element>
+		<element ref="text_t41"><bounds x="87" y="46.7" width="6" height="1.25" /></element>
+		<element ref="text_t42"><bounds x="87" y="47.95" width="6" height="1.25" /></element>
+		<element ref="text_t3"><bounds x="87" y="57.325" width="6" height="1.25" /></element>
+		<element ref="text_t2"><bounds x="87" y="67.325" width="6" height="1.25" /></element>
+		<element ref="text_t1"><bounds x="87" y="77.325" width="6" height="1.25" /></element>
 
 		<repeat count="6">
 			<param name="y" start="12" increment="10" />
diff --git a/src/mame/layout/fidel_desdis.lay b/src/mame/layout/fidel_desdis.lay
index 56045c0cdab..baf3f6e2223 100644
--- a/src/mame/layout/fidel_desdis.lay
+++ b/src/mame/layout/fidel_desdis.lay
@@ -47,137 +47,41 @@ license:CC0-1.0
 		</disk>
 	</element>
 
-	<element name="text_1">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="1"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_2">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="2"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_3">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="3"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_4">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="4"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_5">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="5"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_6">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="6"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_7">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="7"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_8">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="8"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-
-	<element name="text_a">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="A"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_b">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="B"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_c">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="C"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_d">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="D"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_e">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="E"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_f">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="F"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_g">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="G"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_h">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="H"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-
-	<element name="text_white">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="WHITE"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_black">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="BLACK"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_clear">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="CLEAR"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_u1">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="VERIFY"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_u2">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="OPTION"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_u3">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="LEVEL"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_u4">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="TAKE BACK"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_u5">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="HINT"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_u6">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="MOVE"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-
-	<element name="text_shift">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="SHIFT"><color red="0.81" green="0.3" blue="0.29" /></text>
-	</element>
-	<element name="text_s1">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="PROBLEM"><color red="0.81" green="0.3" blue="0.29" /></text>
-	</element>
-	<element name="text_s2">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="TIME"><color red="0.81" green="0.3" blue="0.29" /></text>
-	</element>
-	<element name="text_s3">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="NEW"><color red="0.81" green="0.3" blue="0.29" /></text>
-	</element>
-	<element name="text_s4">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="REPLAY"><color red="0.81" green="0.3" blue="0.29" /></text>
-	</element>
-	<element name="text_s5">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="INFO"><color red="0.81" green="0.3" blue="0.29" /></text>
-	</element>
-	<element name="text_s6">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="ALTERNATE"><color red="0.81" green="0.3" blue="0.29" /></text>
-	</element>
+	<element name="text_1"><text string="1"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_2"><text string="2"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_3"><text string="3"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_4"><text string="4"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_5"><text string="5"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_6"><text string="6"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_7"><text string="7"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_8"><text string="8"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+
+	<element name="text_a"><text string="A"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_b"><text string="B"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_c"><text string="C"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_d"><text string="D"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_e"><text string="E"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_f"><text string="F"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_g"><text string="G"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_h"><text string="H"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+
+	<element name="text_white"><text string="WHITE"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_black"><text string="BLACK"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_clear"><text string="CLEAR"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_u1"><text string="VERIFY"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_u2"><text string="OPTION"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_u3"><text string="LEVEL"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_u4"><text string="TAKE BACK"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_u5"><text string="HINT"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_u6"><text string="MOVE"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+
+	<element name="text_shift"><text string="SHIFT"><color red="0.81" green="0.3" blue="0.29" /></text></element>
+	<element name="text_s1"><text string="PROBLEM"><color red="0.81" green="0.3" blue="0.29" /></text></element>
+	<element name="text_s2"><text string="TIME"><color red="0.81" green="0.3" blue="0.29" /></text></element>
+	<element name="text_s3"><text string="NEW"><color red="0.81" green="0.3" blue="0.29" /></text></element>
+	<element name="text_s4"><text string="REPLAY"><color red="0.81" green="0.3" blue="0.29" /></text></element>
+	<element name="text_s5"><text string="INFO"><color red="0.81" green="0.3" blue="0.29" /></text></element>
+	<element name="text_s6"><text string="ALTERNATE"><color red="0.81" green="0.3" blue="0.29" /></text></element>
 
 	<element name="text_p1"><rect><color red="1" green="1" blue="1" /></rect><image file="chess/bk.svg" /><rect><color red="1" green="1" blue="1" alpha="0.1875" /></rect></element>
 	<element name="text_p2"><rect><color red="1" green="1" blue="1" /></rect><image file="chess/bq.svg" /><rect><color red="1" green="1" blue="1" alpha="0.1875" /></rect></element>
@@ -342,43 +246,23 @@ license:CC0-1.0
 	<element name="text_uit1"><text string="S.BOARD"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uit2"><text string="INTERFACE"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uib1"><text string="BOARD:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uib2">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="RESET"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uib3">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="CLEAR"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uib2"><text string="RESET"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uib3"><text string="CLEAR"><color red="0.01" green="0.01" blue="0.01" /></text></element>
 	<element name="text_uis1"><text string="SPAWN:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uih1"><text string="HAND:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uih2">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="REMOVE"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uih2"><text string="REMOVE"><color red="0.01" green="0.01" blue="0.01" /></text></element>
 	<element name="text_uiu1"><text string="UNDO:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uiu2a">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string=" &lt;&lt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2b">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string=" &lt;  "><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2c">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="   &gt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2d">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string=" &gt;&gt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uiu2a"><text string=" &lt;&lt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2b"><text string=" &lt;  "><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2c"><text string="   &gt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2d"><text string=" &gt;&gt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu3b"><text string="/"><color red="0.81" green="0.8" blue="0.79" /></text></element>
+
 	<element name="text_uiu3a" defstate="0">
 		<simplecounter maxstate="999" digits="1" align="2">
 			<color red="0.81" green="0.8" blue="0.79" />
 		</simplecounter>
 	</element>
-	<element name="text_uiu3b"><text string="/"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uiu3c" defstate="0">
 		<simplecounter maxstate="999" digits="1" align="1">
 			<color red="0.81" green="0.8" blue="0.79" />
diff --git a/src/mame/layout/fidel_desdis_68kg.lay b/src/mame/layout/fidel_desdis_68kg.lay
index 1d6295d08ae..0c4a1604538 100644
--- a/src/mame/layout/fidel_desdis_68kg.lay
+++ b/src/mame/layout/fidel_desdis_68kg.lay
@@ -51,137 +51,41 @@ license:CC0-1.0
 		</disk>
 	</element>
 
-	<element name="text_1">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="1"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_2">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="2"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_3">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="3"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_4">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="4"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_5">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="5"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_6">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="6"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_7">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="7"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_8">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="8"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-
-	<element name="text_a">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="A"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_b">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="B"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_c">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="C"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_d">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="D"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_e">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="E"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_f">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="F"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_g">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="G"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_h">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="H"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-
-	<element name="text_white">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="WHITE"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_black">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="BLACK"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_clear">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="CLEAR"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_u1">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="VERIFY"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_u2">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="OPTION"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_u3">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="LEVEL"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_u4">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="TAKE BACK"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_u5">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="HINT"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_u6">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="MOVE"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-
-	<element name="text_shift">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="SHIFT"><color red="0.10" green="0.30" blue="0.15" /></text>
-	</element>
-	<element name="text_s1">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="PROBLEM"><color red="0.10" green="0.30" blue="0.15" /></text>
-	</element>
-	<element name="text_s2">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="TIME"><color red="0.10" green="0.30" blue="0.15" /></text>
-	</element>
-	<element name="text_s3">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="NEW"><color red="0.10" green="0.30" blue="0.15" /></text>
-	</element>
-	<element name="text_s4">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="REPLAY"><color red="0.10" green="0.30" blue="0.15" /></text>
-	</element>
-	<element name="text_s5">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="INFO"><color red="0.10" green="0.30" blue="0.15" /></text>
-	</element>
-	<element name="text_s6">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="ALTERNATE"><color red="0.10" green="0.30" blue="0.15" /></text>
-	</element>
+	<element name="text_1"><text string="1"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_2"><text string="2"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_3"><text string="3"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_4"><text string="4"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_5"><text string="5"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_6"><text string="6"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_7"><text string="7"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_8"><text string="8"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+
+	<element name="text_a"><text string="A"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_b"><text string="B"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_c"><text string="C"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_d"><text string="D"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_e"><text string="E"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_f"><text string="F"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_g"><text string="G"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_h"><text string="H"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+
+	<element name="text_white"><text string="WHITE"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_black"><text string="BLACK"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_clear"><text string="CLEAR"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_u1"><text string="VERIFY"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_u2"><text string="OPTION"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_u3"><text string="LEVEL"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_u4"><text string="TAKE BACK"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_u5"><text string="HINT"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_u6"><text string="MOVE"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+
+	<element name="text_shift"><text string="SHIFT"><color red="0.10" green="0.30" blue="0.15" /></text></element>
+	<element name="text_s1"><text string="PROBLEM"><color red="0.10" green="0.30" blue="0.15" /></text></element>
+	<element name="text_s2"><text string="TIME"><color red="0.10" green="0.30" blue="0.15" /></text></element>
+	<element name="text_s3"><text string="NEW"><color red="0.10" green="0.30" blue="0.15" /></text></element>
+	<element name="text_s4"><text string="REPLAY"><color red="0.10" green="0.30" blue="0.15" /></text></element>
+	<element name="text_s5"><text string="INFO"><color red="0.10" green="0.30" blue="0.15" /></text></element>
+	<element name="text_s6"><text string="ALTERNATE"><color red="0.10" green="0.30" blue="0.15" /></text></element>
 
 	<element name="text_p1"><rect><color red="1" green="1" blue="1" /></rect><image file="chess/bk.svg" /><rect><color red="1" green="1" blue="1" alpha="0.1875" /></rect></element>
 	<element name="text_p2"><rect><color red="1" green="1" blue="1" /></rect><image file="chess/bq.svg" /><rect><color red="1" green="1" blue="1" alpha="0.1875" /></rect></element>
@@ -346,43 +250,23 @@ license:CC0-1.0
 	<element name="text_uit1"><text string="S.BOARD"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uit2"><text string="INTERFACE"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uib1"><text string="BOARD:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uib2">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="RESET"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uib3">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="CLEAR"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uib2"><text string="RESET"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uib3"><text string="CLEAR"><color red="0.01" green="0.01" blue="0.01" /></text></element>
 	<element name="text_uis1"><text string="SPAWN:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uih1"><text string="HAND:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uih2">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="REMOVE"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uih2"><text string="REMOVE"><color red="0.01" green="0.01" blue="0.01" /></text></element>
 	<element name="text_uiu1"><text string="UNDO:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uiu2a">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string=" &lt;&lt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2b">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string=" &lt;  "><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2c">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="   &gt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2d">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string=" &gt;&gt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uiu2a"><text string=" &lt;&lt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2b"><text string=" &lt;  "><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2c"><text string="   &gt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2d"><text string=" &gt;&gt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu3b"><text string="/"><color red="0.81" green="0.8" blue="0.79" /></text></element>
+
 	<element name="text_uiu3a" defstate="0">
 		<simplecounter maxstate="999" digits="1" align="2">
 			<color red="0.81" green="0.8" blue="0.79" />
 		</simplecounter>
 	</element>
-	<element name="text_uiu3b"><text string="/"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uiu3c" defstate="0">
 		<simplecounter maxstate="999" digits="1" align="1">
 			<color red="0.81" green="0.8" blue="0.79" />
diff --git a/src/mame/layout/fidel_desdis_68kr.lay b/src/mame/layout/fidel_desdis_68kr.lay
index 79c520b7ede..e2c0a07cac6 100644
--- a/src/mame/layout/fidel_desdis_68kr.lay
+++ b/src/mame/layout/fidel_desdis_68kr.lay
@@ -46,137 +46,41 @@ license:CC0-1.0
 		</disk>
 	</element>
 
-	<element name="text_1">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="1"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_2">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="2"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_3">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="3"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_4">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="4"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_5">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="5"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_6">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="6"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_7">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="7"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_8">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="8"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-
-	<element name="text_a">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="A"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_b">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="B"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_c">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="C"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_d">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="D"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_e">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="E"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_f">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="F"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_g">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="G"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_h">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="H"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-
-	<element name="text_white">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="WHITE"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_black">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="BLACK"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_clear">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="CLEAR"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_u1">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="VERIFY"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_u2">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="OPTION"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_u3">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="LEVEL"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_u4">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="TAKE BACK"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_u5">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="HINT"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_u6">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="MOVE"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-
-	<element name="text_shift">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="SHIFT"><color red="0.81" green="0.3" blue="0.29" /></text>
-	</element>
-	<element name="text_s1">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="PROBLEM"><color red="0.81" green="0.3" blue="0.29" /></text>
-	</element>
-	<element name="text_s2">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="TIME"><color red="0.81" green="0.3" blue="0.29" /></text>
-	</element>
-	<element name="text_s3">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="NEW"><color red="0.81" green="0.3" blue="0.29" /></text>
-	</element>
-	<element name="text_s4">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="REPLAY"><color red="0.81" green="0.3" blue="0.29" /></text>
-	</element>
-	<element name="text_s5">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="INFO"><color red="0.81" green="0.3" blue="0.29" /></text>
-	</element>
-	<element name="text_s6">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="ALTERNATE"><color red="0.81" green="0.3" blue="0.29" /></text>
-	</element>
+	<element name="text_1"><text string="1"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_2"><text string="2"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_3"><text string="3"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_4"><text string="4"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_5"><text string="5"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_6"><text string="6"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_7"><text string="7"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_8"><text string="8"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+
+	<element name="text_a"><text string="A"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_b"><text string="B"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_c"><text string="C"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_d"><text string="D"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_e"><text string="E"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_f"><text string="F"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_g"><text string="G"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_h"><text string="H"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+
+	<element name="text_white"><text string="WHITE"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_black"><text string="BLACK"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_clear"><text string="CLEAR"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_u1"><text string="VERIFY"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_u2"><text string="OPTION"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_u3"><text string="LEVEL"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_u4"><text string="TAKE BACK"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_u5"><text string="HINT"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_u6"><text string="MOVE"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+
+	<element name="text_shift"><text string="SHIFT"><color red="0.81" green="0.3" blue="0.29" /></text></element>
+	<element name="text_s1"><text string="PROBLEM"><color red="0.81" green="0.3" blue="0.29" /></text></element>
+	<element name="text_s2"><text string="TIME"><color red="0.81" green="0.3" blue="0.29" /></text></element>
+	<element name="text_s3"><text string="NEW"><color red="0.81" green="0.3" blue="0.29" /></text></element>
+	<element name="text_s4"><text string="REPLAY"><color red="0.81" green="0.3" blue="0.29" /></text></element>
+	<element name="text_s5"><text string="INFO"><color red="0.81" green="0.3" blue="0.29" /></text></element>
+	<element name="text_s6"><text string="ALTERNATE"><color red="0.81" green="0.3" blue="0.29" /></text></element>
 
 	<element name="text_p1"><rect><color red="1" green="1" blue="1" /></rect><image file="chess/bk.svg" /><rect><color red="1" green="1" blue="1" alpha="0.1875" /></rect></element>
 	<element name="text_p2"><rect><color red="1" green="1" blue="1" /></rect><image file="chess/bq.svg" /><rect><color red="1" green="1" blue="1" alpha="0.1875" /></rect></element>
@@ -341,43 +245,23 @@ license:CC0-1.0
 	<element name="text_uit1"><text string="S.BOARD"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uit2"><text string="INTERFACE"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uib1"><text string="BOARD:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uib2">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="RESET"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uib3">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="CLEAR"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uib2"><text string="RESET"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uib3"><text string="CLEAR"><color red="0.01" green="0.01" blue="0.01" /></text></element>
 	<element name="text_uis1"><text string="SPAWN:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uih1"><text string="HAND:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uih2">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="REMOVE"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uih2"><text string="REMOVE"><color red="0.01" green="0.01" blue="0.01" /></text></element>
 	<element name="text_uiu1"><text string="UNDO:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uiu2a">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string=" &lt;&lt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2b">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string=" &lt;  "><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2c">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="   &gt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2d">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string=" &gt;&gt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uiu2a"><text string=" &lt;&lt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2b"><text string=" &lt;  "><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2c"><text string="   &gt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2d"><text string=" &gt;&gt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu3b"><text string="/"><color red="0.81" green="0.8" blue="0.79" /></text></element>
+
 	<element name="text_uiu3a" defstate="0">
 		<simplecounter maxstate="999" digits="1" align="2">
 			<color red="0.81" green="0.8" blue="0.79" />
 		</simplecounter>
 	</element>
-	<element name="text_uiu3b"><text string="/"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uiu3c" defstate="0">
 		<simplecounter maxstate="999" digits="1" align="1">
 			<color red="0.81" green="0.8" blue="0.79" />
diff --git a/src/mame/layout/fidel_dsc.lay b/src/mame/layout/fidel_dsc.lay
index d922b443a81..fd46426fb90 100644
--- a/src/mame/layout/fidel_dsc.lay
+++ b/src/mame/layout/fidel_dsc.lay
@@ -52,235 +52,64 @@ license:CC0-1.0
 		</disk>
 	</element>
 
-	<element name="text_e00">
-		<rect><color red="0.41" green="0.4" blue="0.39" /></rect>
-		<text string="1" align="2"><color red="0.86" green="0.85" blue="0.84" /></text>
-	</element>
-	<element name="text_e01">
-		<rect><color red="0.41" green="0.4" blue="0.39" /></rect>
-		<text string="2" align="2"><color red="0.86" green="0.85" blue="0.84" /></text>
-	</element>
-	<element name="text_e02">
-		<rect><color red="0.41" green="0.4" blue="0.39" /></rect>
-		<text string="3" align="2"><color red="0.86" green="0.85" blue="0.84" /></text>
-	</element>
-	<element name="text_e03">
-		<rect><color red="0.41" green="0.4" blue="0.39" /></rect>
-		<text string="4" align="2"><color red="0.86" green="0.85" blue="0.84" /></text>
-	</element>
-	<element name="text_e04">
-		<rect><color red="0.41" green="0.4" blue="0.39" /></rect>
-		<text string="5" align="2"><color red="0.86" green="0.85" blue="0.84" /></text>
-	</element>
-	<element name="text_o00">
-		<rect><color red="0.41" green="0.4" blue="0.39" /></rect>
-		<text string="6" align="2"><color red="0.86" green="0.85" blue="0.84" /></text>
-	</element>
-	<element name="text_o01">
-		<rect><color red="0.41" green="0.4" blue="0.39" /></rect>
-		<text string="7" align="2"><color red="0.86" green="0.85" blue="0.84" /></text>
-	</element>
-	<element name="text_o02">
-		<rect><color red="0.41" green="0.4" blue="0.39" /></rect>
-		<text string="8" align="2"><color red="0.86" green="0.85" blue="0.84" /></text>
-	</element>
-	<element name="text_o03">
-		<rect><color red="0.41" green="0.4" blue="0.39" /></rect>
-		<text string="9" align="2"><color red="0.86" green="0.85" blue="0.84" /></text>
-	</element>
-	<element name="text_o04">
-		<rect><color red="0.41" green="0.4" blue="0.39" /></rect>
-		<text string="10" align="2"><color red="0.86" green="0.85" blue="0.84" /></text>
-	</element>
-	<element name="text_e10">
-		<rect><color red="0.41" green="0.4" blue="0.39" /></rect>
-		<text string="11" align="2"><color red="0.86" green="0.85" blue="0.84" /></text>
-	</element>
-	<element name="text_e11">
-		<rect><color red="0.41" green="0.4" blue="0.39" /></rect>
-		<text string="12" align="2"><color red="0.86" green="0.85" blue="0.84" /></text>
-	</element>
-	<element name="text_e12">
-		<rect><color red="0.41" green="0.4" blue="0.39" /></rect>
-		<text string="13" align="2"><color red="0.86" green="0.85" blue="0.84" /></text>
-	</element>
-	<element name="text_e13">
-		<rect><color red="0.41" green="0.4" blue="0.39" /></rect>
-		<text string="14" align="2"><color red="0.86" green="0.85" blue="0.84" /></text>
-	</element>
-	<element name="text_e14">
-		<rect><color red="0.41" green="0.4" blue="0.39" /></rect>
-		<text string="15" align="2"><color red="0.86" green="0.85" blue="0.84" /></text>
-	</element>
-	<element name="text_o10">
-		<rect><color red="0.41" green="0.4" blue="0.39" /></rect>
-		<text string="16" align="2"><color red="0.86" green="0.85" blue="0.84" /></text>
-	</element>
-	<element name="text_o11">
-		<rect><color red="0.41" green="0.4" blue="0.39" /></rect>
-		<text string="17" align="2"><color red="0.86" green="0.85" blue="0.84" /></text>
-	</element>
-	<element name="text_o12">
-		<rect><color red="0.41" green="0.4" blue="0.39" /></rect>
-		<text string="18" align="2"><color red="0.86" green="0.85" blue="0.84" /></text>
-	</element>
-	<element name="text_o13">
-		<rect><color red="0.41" green="0.4" blue="0.39" /></rect>
-		<text string="19" align="2"><color red="0.86" green="0.85" blue="0.84" /></text>
-	</element>
-	<element name="text_o14">
-		<rect><color red="0.41" green="0.4" blue="0.39" /></rect>
-		<text string="20" align="2"><color red="0.86" green="0.85" blue="0.84" /></text>
-	</element>
-	<element name="text_e20">
-		<rect><color red="0.41" green="0.4" blue="0.39" /></rect>
-		<text string="21" align="2"><color red="0.86" green="0.85" blue="0.84" /></text>
-	</element>
-	<element name="text_e21">
-		<rect><color red="0.41" green="0.4" blue="0.39" /></rect>
-		<text string="22" align="2"><color red="0.86" green="0.85" blue="0.84" /></text>
-	</element>
-	<element name="text_e22">
-		<rect><color red="0.41" green="0.4" blue="0.39" /></rect>
-		<text string="23" align="2"><color red="0.86" green="0.85" blue="0.84" /></text>
-	</element>
-	<element name="text_e23">
-		<rect><color red="0.41" green="0.4" blue="0.39" /></rect>
-		<text string="24" align="2"><color red="0.86" green="0.85" blue="0.84" /></text>
-	</element>
-	<element name="text_e24">
-		<rect><color red="0.41" green="0.4" blue="0.39" /></rect>
-		<text string="25" align="2"><color red="0.86" green="0.85" blue="0.84" /></text>
-	</element>
-	<element name="text_o20">
-		<rect><color red="0.41" green="0.4" blue="0.39" /></rect>
-		<text string="26" align="2"><color red="0.86" green="0.85" blue="0.84" /></text>
-	</element>
-	<element name="text_o21">
-		<rect><color red="0.41" green="0.4" blue="0.39" /></rect>
-		<text string="27" align="2"><color red="0.86" green="0.85" blue="0.84" /></text>
-	</element>
-	<element name="text_o22">
-		<rect><color red="0.41" green="0.4" blue="0.39" /></rect>
-		<text string="28" align="2"><color red="0.86" green="0.85" blue="0.84" /></text>
-	</element>
-	<element name="text_o23">
-		<rect><color red="0.41" green="0.4" blue="0.39" /></rect>
-		<text string="29" align="2"><color red="0.86" green="0.85" blue="0.84" /></text>
-	</element>
-	<element name="text_o24">
-		<rect><color red="0.41" green="0.4" blue="0.39" /></rect>
-		<text string="30" align="2"><color red="0.86" green="0.85" blue="0.84" /></text>
-	</element>
-	<element name="text_e30">
-		<rect><color red="0.41" green="0.4" blue="0.39" /></rect>
-		<text string="31" align="2"><color red="0.86" green="0.85" blue="0.84" /></text>
-	</element>
-	<element name="text_e31">
-		<rect><color red="0.41" green="0.4" blue="0.39" /></rect>
-		<text string="32" align="2"><color red="0.86" green="0.85" blue="0.84" /></text>
-	</element>
-	<element name="text_e32">
-		<rect><color red="0.41" green="0.4" blue="0.39" /></rect>
-		<text string="33" align="2"><color red="0.86" green="0.85" blue="0.84" /></text>
-	</element>
-	<element name="text_e33">
-		<rect><color red="0.41" green="0.4" blue="0.39" /></rect>
-		<text string="34" align="2"><color red="0.86" green="0.85" blue="0.84" /></text>
-	</element>
-	<element name="text_e34">
-		<rect><color red="0.41" green="0.4" blue="0.39" /></rect>
-		<text string="35" align="2"><color red="0.86" green="0.85" blue="0.84" /></text>
-	</element>
-	<element name="text_o30">
-		<rect><color red="0.41" green="0.4" blue="0.39" /></rect>
-		<text string="36" align="2"><color red="0.86" green="0.85" blue="0.84" /></text>
-	</element>
-	<element name="text_o31">
-		<rect><color red="0.41" green="0.4" blue="0.39" /></rect>
-		<text string="37" align="2"><color red="0.86" green="0.85" blue="0.84" /></text>
-	</element>
-	<element name="text_o32">
-		<rect><color red="0.41" green="0.4" blue="0.39" /></rect>
-		<text string="38" align="2"><color red="0.86" green="0.85" blue="0.84" /></text>
-	</element>
-	<element name="text_o33">
-		<rect><color red="0.41" green="0.4" blue="0.39" /></rect>
-		<text string="39" align="2"><color red="0.86" green="0.85" blue="0.84" /></text>
-	</element>
-	<element name="text_o34">
-		<rect><color red="0.41" green="0.4" blue="0.39" /></rect>
-		<text string="40" align="2"><color red="0.86" green="0.85" blue="0.84" /></text>
-	</element>
-	<element name="text_e40">
-		<rect><color red="0.41" green="0.4" blue="0.39" /></rect>
-		<text string="41" align="2"><color red="0.86" green="0.85" blue="0.84" /></text>
-	</element>
-	<element name="text_e41">
-		<rect><color red="0.41" green="0.4" blue="0.39" /></rect>
-		<text string="42" align="2"><color red="0.86" green="0.85" blue="0.84" /></text>
-	</element>
-	<element name="text_e42">
-		<rect><color red="0.41" green="0.4" blue="0.39" /></rect>
-		<text string="43" align="2"><color red="0.86" green="0.85" blue="0.84" /></text>
-	</element>
-	<element name="text_e43">
-		<rect><color red="0.41" green="0.4" blue="0.39" /></rect>
-		<text string="44" align="2"><color red="0.86" green="0.85" blue="0.84" /></text>
-	</element>
-	<element name="text_e44">
-		<rect><color red="0.41" green="0.4" blue="0.39" /></rect>
-		<text string="45" align="2"><color red="0.86" green="0.85" blue="0.84" /></text>
-	</element>
-	<element name="text_o40">
-		<rect><color red="0.41" green="0.4" blue="0.39" /></rect>
-		<text string="46" align="2"><color red="0.86" green="0.85" blue="0.84" /></text>
-	</element>
-	<element name="text_o41">
-		<rect><color red="0.41" green="0.4" blue="0.39" /></rect>
-		<text string="47" align="2"><color red="0.86" green="0.85" blue="0.84" /></text>
-	</element>
-	<element name="text_o42">
-		<rect><color red="0.41" green="0.4" blue="0.39" /></rect>
-		<text string="48" align="2"><color red="0.86" green="0.85" blue="0.84" /></text>
-	</element>
-	<element name="text_o43">
-		<rect><color red="0.41" green="0.4" blue="0.39" /></rect>
-		<text string="49" align="2"><color red="0.86" green="0.85" blue="0.84" /></text>
-	</element>
-	<element name="text_o44">
-		<rect><color red="0.41" green="0.4" blue="0.39" /></rect>
-		<text string="50" align="2"><color red="0.86" green="0.85" blue="0.84" /></text>
-	</element>
-
-	<element name="text_re">
-		<disk><color red="0.81" green="0.8" blue="0.79" /></disk>
-		<text string="RE"><color red="0.17" green="0.15" blue="0.15" /></text>
-	</element>
-	<element name="text_cl">
-		<disk><color red="0.81" green="0.8" blue="0.79" /></disk>
-		<text string="CL"><color red="0.17" green="0.15" blue="0.15" /></text>
-	</element>
-	<element name="text_pb">
-		<disk><color red="0.81" green="0.8" blue="0.79" /></disk>
-		<text string="PB"><color red="0.17" green="0.15" blue="0.15" /></text>
-	</element>
-	<element name="text_rv">
-		<disk><color red="0.81" green="0.8" blue="0.79" /></disk>
-		<text string="RV"><color red="0.17" green="0.15" blue="0.15" /></text>
-	</element>
-	<element name="text_lv">
-		<disk><color red="0.81" green="0.8" blue="0.79" /></disk>
-		<text string="LV"><color red="0.17" green="0.15" blue="0.15" /></text>
-	</element>
-	<element name="text_wk">
-		<disk><color red="0.81" green="0.8" blue="0.79" /></disk>
-		<text string="[K]"><color red="0.17" green="0.15" blue="0.15" /></text>
-	</element>
-	<element name="text_bk">
-		<disk><color red="0.17" green="0.15" blue="0.15" /></disk>
-		<text string="[K]"><color red="0.81" green="0.8" blue="0.79" /></text>
-	</element>
+	<element name="text_e00"><text string="1" align="2"><color red="0.86" green="0.85" blue="0.84" /></text></element>
+	<element name="text_e01"><text string="2" align="2"><color red="0.86" green="0.85" blue="0.84" /></text></element>
+	<element name="text_e02"><text string="3" align="2"><color red="0.86" green="0.85" blue="0.84" /></text></element>
+	<element name="text_e03"><text string="4" align="2"><color red="0.86" green="0.85" blue="0.84" /></text></element>
+	<element name="text_e04"><text string="5" align="2"><color red="0.86" green="0.85" blue="0.84" /></text></element>
+	<element name="text_o00"><text string="6" align="2"><color red="0.86" green="0.85" blue="0.84" /></text></element>
+	<element name="text_o01"><text string="7" align="2"><color red="0.86" green="0.85" blue="0.84" /></text></element>
+	<element name="text_o02"><text string="8" align="2"><color red="0.86" green="0.85" blue="0.84" /></text></element>
+	<element name="text_o03"><text string="9" align="2"><color red="0.86" green="0.85" blue="0.84" /></text></element>
+	<element name="text_o04"><text string="10" align="2"><color red="0.86" green="0.85" blue="0.84" /></text></element>
+	<element name="text_e10"><text string="11" align="2"><color red="0.86" green="0.85" blue="0.84" /></text></element>
+	<element name="text_e11"><text string="12" align="2"><color red="0.86" green="0.85" blue="0.84" /></text></element>
+	<element name="text_e12"><text string="13" align="2"><color red="0.86" green="0.85" blue="0.84" /></text></element>
+	<element name="text_e13"><text string="14" align="2"><color red="0.86" green="0.85" blue="0.84" /></text></element>
+	<element name="text_e14"><text string="15" align="2"><color red="0.86" green="0.85" blue="0.84" /></text></element>
+	<element name="text_o10"><text string="16" align="2"><color red="0.86" green="0.85" blue="0.84" /></text></element>
+	<element name="text_o11"><text string="17" align="2"><color red="0.86" green="0.85" blue="0.84" /></text></element>
+	<element name="text_o12"><text string="18" align="2"><color red="0.86" green="0.85" blue="0.84" /></text></element>
+	<element name="text_o13"><text string="19" align="2"><color red="0.86" green="0.85" blue="0.84" /></text></element>
+	<element name="text_o14"><text string="20" align="2"><color red="0.86" green="0.85" blue="0.84" /></text></element>
+	<element name="text_e20"><text string="21" align="2"><color red="0.86" green="0.85" blue="0.84" /></text></element>
+	<element name="text_e21"><text string="22" align="2"><color red="0.86" green="0.85" blue="0.84" /></text></element>
+	<element name="text_e22"><text string="23" align="2"><color red="0.86" green="0.85" blue="0.84" /></text></element>
+	<element name="text_e23"><text string="24" align="2"><color red="0.86" green="0.85" blue="0.84" /></text></element>
+	<element name="text_e24"><text string="25" align="2"><color red="0.86" green="0.85" blue="0.84" /></text></element>
+	<element name="text_o20"><text string="26" align="2"><color red="0.86" green="0.85" blue="0.84" /></text></element>
+	<element name="text_o21"><text string="27" align="2"><color red="0.86" green="0.85" blue="0.84" /></text></element>
+	<element name="text_o22"><text string="28" align="2"><color red="0.86" green="0.85" blue="0.84" /></text></element>
+	<element name="text_o23"><text string="29" align="2"><color red="0.86" green="0.85" blue="0.84" /></text></element>
+	<element name="text_o24"><text string="30" align="2"><color red="0.86" green="0.85" blue="0.84" /></text></element>
+	<element name="text_e30"><text string="31" align="2"><color red="0.86" green="0.85" blue="0.84" /></text></element>
+	<element name="text_e31"><text string="32" align="2"><color red="0.86" green="0.85" blue="0.84" /></text></element>
+	<element name="text_e32"><text string="33" align="2"><color red="0.86" green="0.85" blue="0.84" /></text></element>
+	<element name="text_e33"><text string="34" align="2"><color red="0.86" green="0.85" blue="0.84" /></text></element>
+	<element name="text_e34"><text string="35" align="2"><color red="0.86" green="0.85" blue="0.84" /></text></element>
+	<element name="text_o30"><text string="36" align="2"><color red="0.86" green="0.85" blue="0.84" /></text></element>
+	<element name="text_o31"><text string="37" align="2"><color red="0.86" green="0.85" blue="0.84" /></text></element>
+	<element name="text_o32"><text string="38" align="2"><color red="0.86" green="0.85" blue="0.84" /></text></element>
+	<element name="text_o33"><text string="39" align="2"><color red="0.86" green="0.85" blue="0.84" /></text></element>
+	<element name="text_o34"><text string="40" align="2"><color red="0.86" green="0.85" blue="0.84" /></text></element>
+	<element name="text_e40"><text string="41" align="2"><color red="0.86" green="0.85" blue="0.84" /></text></element>
+	<element name="text_e41"><text string="42" align="2"><color red="0.86" green="0.85" blue="0.84" /></text></element>
+	<element name="text_e42"><text string="43" align="2"><color red="0.86" green="0.85" blue="0.84" /></text></element>
+	<element name="text_e43"><text string="44" align="2"><color red="0.86" green="0.85" blue="0.84" /></text></element>
+	<element name="text_e44"><text string="45" align="2"><color red="0.86" green="0.85" blue="0.84" /></text></element>
+	<element name="text_o40"><text string="46" align="2"><color red="0.86" green="0.85" blue="0.84" /></text></element>
+	<element name="text_o41"><text string="47" align="2"><color red="0.86" green="0.85" blue="0.84" /></text></element>
+	<element name="text_o42"><text string="48" align="2"><color red="0.86" green="0.85" blue="0.84" /></text></element>
+	<element name="text_o43"><text string="49" align="2"><color red="0.86" green="0.85" blue="0.84" /></text></element>
+	<element name="text_o44"><text string="50" align="2"><color red="0.86" green="0.85" blue="0.84" /></text></element>
+
+	<element name="text_re"><text string="RE"><color red="0.17" green="0.15" blue="0.15" /></text></element>
+	<element name="text_cl"><text string="CL"><color red="0.17" green="0.15" blue="0.15" /></text></element>
+	<element name="text_pb"><text string="PB"><color red="0.17" green="0.15" blue="0.15" /></text></element>
+	<element name="text_rv"><text string="RV"><color red="0.17" green="0.15" blue="0.15" /></text></element>
+	<element name="text_lv"><text string="LV"><color red="0.17" green="0.15" blue="0.15" /></text></element>
+	<element name="text_wk"><text string="[K]"><color red="0.17" green="0.15" blue="0.15" /></text></element>
+	<element name="text_bk"><text string="[K]"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 
 
 <!-- sb board -->
@@ -494,43 +323,23 @@ license:CC0-1.0
 	<element name="text_uit1"><text string="S.BOARD"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uit2"><text string="INTERFACE"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uib1"><text string="BOARD:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uib2">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="RESET"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uib3">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="CLEAR"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uib2"><text string="RESET"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uib3"><text string="CLEAR"><color red="0.01" green="0.01" blue="0.01" /></text></element>
 	<element name="text_uis1"><text string="SPAWN:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uih1"><text string="HAND:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uih2">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="REMOVE"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uih2"><text string="REMOVE"><color red="0.01" green="0.01" blue="0.01" /></text></element>
 	<element name="text_uiu1"><text string="UNDO:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uiu2a">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string=" &lt;&lt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2b">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string=" &lt;  "><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2c">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="   &gt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2d">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string=" &gt;&gt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uiu2a"><text string=" &lt;&lt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2b"><text string=" &lt;  "><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2c"><text string="   &gt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2d"><text string=" &gt;&gt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu3b"><text string="/"><color red="0.81" green="0.8" blue="0.79" /></text></element>
+
 	<element name="text_uiu3a" defstate="0">
 		<simplecounter maxstate="999" digits="1" align="2">
 			<color red="0.81" green="0.8" blue="0.79" />
 		</simplecounter>
 	</element>
-	<element name="text_uiu3b"><text string="/"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uiu3c" defstate="0">
 		<simplecounter maxstate="999" digits="1" align="1">
 			<color red="0.81" green="0.8" blue="0.79" />
diff --git a/src/mame/layout/fidel_eag.lay b/src/mame/layout/fidel_eag.lay
index c8a08b2816c..4cacebea5b9 100644
--- a/src/mame/layout/fidel_eag.lay
+++ b/src/mame/layout/fidel_eag.lay
@@ -33,71 +33,23 @@ license:CC0-1.0
 		<disk state="1"><color red="0.4" green="0.41" blue="0.45" /></disk>
 	</element>
 
-	<element name="text_1">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="1"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_2">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="2"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_3">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="3"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_4">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="4"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_5">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="5"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_6">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="6"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_7">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="7"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_8">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="8"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-
-	<element name="text_a">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="A"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_b">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="B"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_c">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="C"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_d">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="D"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_e">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="E"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_f">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="F"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_g">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="G"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_h">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="H"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
+	<element name="text_1"><text string="1"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_2"><text string="2"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_3"><text string="3"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_4"><text string="4"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_5"><text string="5"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_6"><text string="6"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_7"><text string="7"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_8"><text string="8"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+
+	<element name="text_a"><text string="A"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_b"><text string="B"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_c"><text string="C"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_d"><text string="D"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_e"><text string="E"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_f"><text string="F"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_g"><text string="G"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_h"><text string="H"><color red="0.87" green="0.87" blue="0.84" /></text></element>
 
 	<element name="text_r11"><image file="chess/wk.svg"><color alpha="0.78" /></image></element>
 	<element name="text_r21"><image file="chess/wq.svg"><color alpha="0.78" /></image></element>
@@ -291,43 +243,23 @@ license:CC0-1.0
 	<element name="text_uit1"><text string="S.BOARD"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uit2"><text string="INTERFACE"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uib1"><text string="BOARD:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uib2">
-		<rect><color red="0.84" green="0.75" blue="0.50" /></rect>
-		<text string="RESET"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uib3">
-		<rect><color red="0.84" green="0.75" blue="0.50" /></rect>
-		<text string="CLEAR"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uib2"><text string="RESET"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uib3"><text string="CLEAR"><color red="0.01" green="0.01" blue="0.01" /></text></element>
 	<element name="text_uis1"><text string="SPAWN:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uih1"><text string="HAND:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uih2">
-		<rect><color red="0.84" green="0.75" blue="0.50" /></rect>
-		<text string="REMOVE"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uih2"><text string="REMOVE"><color red="0.01" green="0.01" blue="0.01" /></text></element>
 	<element name="text_uiu1"><text string="UNDO:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uiu2a">
-		<rect><color red="0.84" green="0.75" blue="0.50" /></rect>
-		<text string=" &lt;&lt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2b">
-		<rect><color red="0.84" green="0.75" blue="0.50" /></rect>
-		<text string=" &lt;  "><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2c">
-		<rect><color red="0.84" green="0.75" blue="0.50" /></rect>
-		<text string="   &gt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2d">
-		<rect><color red="0.84" green="0.75" blue="0.50" /></rect>
-		<text string=" &gt;&gt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uiu2a"><text string=" &lt;&lt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2b"><text string=" &lt;  "><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2c"><text string="   &gt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2d"><text string=" &gt;&gt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu3b"><text string="/"><color red="0.81" green="0.8" blue="0.79" /></text></element>
+
 	<element name="text_uiu3a" defstate="0">
 		<simplecounter maxstate="999" digits="1" align="2">
 			<color red="0.81" green="0.8" blue="0.79" />
 		</simplecounter>
 	</element>
-	<element name="text_uiu3b"><text string="/"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uiu3c" defstate="0">
 		<simplecounter maxstate="999" digits="1" align="1">
 			<color red="0.81" green="0.8" blue="0.79" />
diff --git a/src/mame/layout/fidel_eag_68k.lay b/src/mame/layout/fidel_eag_68k.lay
index 189cc08e5ad..b40752cf991 100644
--- a/src/mame/layout/fidel_eag_68k.lay
+++ b/src/mame/layout/fidel_eag_68k.lay
@@ -33,71 +33,23 @@ license:CC0-1.0
 		<disk state="1"><color red="0.4" green="0.41" blue="0.45" /></disk>
 	</element>
 
-	<element name="text_1">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="1"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_2">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="2"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_3">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="3"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_4">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="4"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_5">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="5"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_6">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="6"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_7">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="7"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_8">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="8"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-
-	<element name="text_a">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="A"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_b">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="B"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_c">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="C"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_d">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="D"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_e">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="E"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_f">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="F"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_g">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="G"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_h">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="H"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
+	<element name="text_1"><text string="1"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_2"><text string="2"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_3"><text string="3"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_4"><text string="4"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_5"><text string="5"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_6"><text string="6"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_7"><text string="7"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_8"><text string="8"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+
+	<element name="text_a"><text string="A"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_b"><text string="B"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_c"><text string="C"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_d"><text string="D"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_e"><text string="E"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_f"><text string="F"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_g"><text string="G"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_h"><text string="H"><color red="0.87" green="0.87" blue="0.84" /></text></element>
 
 	<element name="text_r11"><image file="chess/wk.svg"><color alpha="0.78" /></image></element>
 	<element name="text_r21"><image file="chess/wq.svg"><color alpha="0.78" /></image></element>
@@ -291,43 +243,23 @@ license:CC0-1.0
 	<element name="text_uit1"><text string="S.BOARD"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uit2"><text string="INTERFACE"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uib1"><text string="BOARD:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uib2">
-		<rect><color red="0.84" green="0.75" blue="0.50" /></rect>
-		<text string="RESET"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uib3">
-		<rect><color red="0.84" green="0.75" blue="0.50" /></rect>
-		<text string="CLEAR"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uib2"><text string="RESET"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uib3"><text string="CLEAR"><color red="0.01" green="0.01" blue="0.01" /></text></element>
 	<element name="text_uis1"><text string="SPAWN:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uih1"><text string="HAND:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uih2">
-		<rect><color red="0.84" green="0.75" blue="0.50" /></rect>
-		<text string="REMOVE"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uih2"><text string="REMOVE"><color red="0.01" green="0.01" blue="0.01" /></text></element>
 	<element name="text_uiu1"><text string="UNDO:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uiu2a">
-		<rect><color red="0.84" green="0.75" blue="0.50" /></rect>
-		<text string=" &lt;&lt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2b">
-		<rect><color red="0.84" green="0.75" blue="0.50" /></rect>
-		<text string=" &lt;  "><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2c">
-		<rect><color red="0.84" green="0.75" blue="0.50" /></rect>
-		<text string="   &gt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2d">
-		<rect><color red="0.84" green="0.75" blue="0.50" /></rect>
-		<text string=" &gt;&gt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uiu2a"><text string=" &lt;&lt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2b"><text string=" &lt;  "><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2c"><text string="   &gt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2d"><text string=" &gt;&gt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu3b"><text string="/"><color red="0.81" green="0.8" blue="0.79" /></text></element>
+
 	<element name="text_uiu3a" defstate="0">
 		<simplecounter maxstate="999" digits="1" align="2">
 			<color red="0.81" green="0.8" blue="0.79" />
 		</simplecounter>
 	</element>
-	<element name="text_uiu3b"><text string="/"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uiu3c" defstate="0">
 		<simplecounter maxstate="999" digits="1" align="1">
 			<color red="0.81" green="0.8" blue="0.79" />
diff --git a/src/mame/layout/fidel_eas.lay b/src/mame/layout/fidel_eas.lay
index f25dc3793db..fe40e0f0d87 100644
--- a/src/mame/layout/fidel_eas.lay
+++ b/src/mame/layout/fidel_eas.lay
@@ -24,71 +24,23 @@ license:CC0-1.0
 		<disk state="1"><color red="0.34" green="0.3" blue="0.3" /></disk>
 	</element>
 
-	<element name="text_1">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="1"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_2">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="2"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_3">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="3"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_4">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="4"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_5">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="5"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_6">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="6"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_7">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="7"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_8">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="8"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-
-	<element name="text_a">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="A"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_b">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="B"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_c">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="C"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_d">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="D"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_e">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="E"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_f">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="F"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_g">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="G"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_h">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="H"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
+	<element name="text_1"><text string="1"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_2"><text string="2"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_3"><text string="3"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_4"><text string="4"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_5"><text string="5"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_6"><text string="6"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_7"><text string="7"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_8"><text string="8"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+
+	<element name="text_a"><text string="A"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_b"><text string="B"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_c"><text string="C"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_d"><text string="D"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_e"><text string="E"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_f"><text string="F"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_g"><text string="G"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_h"><text string="H"><color red="0.87" green="0.87" blue="0.84" /></text></element>
 
 	<element name="text_p1"><image file="chess/wk.svg"><color alpha="0.78" /></image></element>
 	<element name="text_p2"><image file="chess/wq.svg"><color alpha="0.78" /></image></element>
@@ -291,43 +243,23 @@ license:CC0-1.0
 	<element name="text_uit1"><text string="S.BOARD"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uit2"><text string="INTERFACE"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uib1"><text string="BOARD:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uib2">
-		<rect><color red="0.84" green="0.75" blue="0.50" /></rect>
-		<text string="RESET"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uib3">
-		<rect><color red="0.84" green="0.75" blue="0.50" /></rect>
-		<text string="CLEAR"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uib2"><text string="RESET"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uib3"><text string="CLEAR"><color red="0.01" green="0.01" blue="0.01" /></text></element>
 	<element name="text_uis1"><text string="SPAWN:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uih1"><text string="HAND:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uih2">
-		<rect><color red="0.84" green="0.75" blue="0.50" /></rect>
-		<text string="REMOVE"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uih2"><text string="REMOVE"><color red="0.01" green="0.01" blue="0.01" /></text></element>
 	<element name="text_uiu1"><text string="UNDO:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uiu2a">
-		<rect><color red="0.84" green="0.75" blue="0.50" /></rect>
-		<text string=" &lt;&lt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2b">
-		<rect><color red="0.84" green="0.75" blue="0.50" /></rect>
-		<text string=" &lt;  "><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2c">
-		<rect><color red="0.84" green="0.75" blue="0.50" /></rect>
-		<text string="   &gt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2d">
-		<rect><color red="0.84" green="0.75" blue="0.50" /></rect>
-		<text string=" &gt;&gt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uiu2a"><text string=" &lt;&lt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2b"><text string=" &lt;  "><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2c"><text string="   &gt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2d"><text string=" &gt;&gt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu3b"><text string="/"><color red="0.81" green="0.8" blue="0.79" /></text></element>
+
 	<element name="text_uiu3a" defstate="0">
 		<simplecounter maxstate="999" digits="1" align="2">
 			<color red="0.81" green="0.8" blue="0.79" />
 		</simplecounter>
 	</element>
-	<element name="text_uiu3b"><text string="/"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uiu3c" defstate="0">
 		<simplecounter maxstate="999" digits="1" align="1">
 			<color red="0.81" green="0.8" blue="0.79" />
diff --git a/src/mame/layout/fidel_eldorado.lay b/src/mame/layout/fidel_eldorado.lay
index 58cf2cc475d..8b7b4373188 100644
--- a/src/mame/layout/fidel_eldorado.lay
+++ b/src/mame/layout/fidel_eldorado.lay
@@ -15,71 +15,23 @@ license:CC0-1.0
 		<rect state="1"><color red="0" green="0" blue="0" /></rect>
 	</element>
 
-	<element name="text_1">
-		<rect><color red="0.55" green="0.25" blue="0.15" /></rect>
-		<text string="1" align="1"><color red="0.9" green="0.9" blue="0.9" /></text>
-	</element>
-	<element name="text_2">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="2" align="1"><color red="0.05" green="0.05" blue="0.05" /></text>
-	</element>
-	<element name="text_3">
-		<rect><color red="0.55" green="0.25" blue="0.15" /></rect>
-		<text string="3" align="1"><color red="0.9" green="0.9" blue="0.9" /></text>
-	</element>
-	<element name="text_4">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="4" align="1"><color red="0.05" green="0.05" blue="0.05" /></text>
-	</element>
-	<element name="text_5">
-		<rect><color red="0.55" green="0.25" blue="0.15" /></rect>
-		<text string="5" align="1"><color red="0.9" green="0.9" blue="0.9" /></text>
-	</element>
-	<element name="text_6">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="6" align="1"><color red="0.05" green="0.05" blue="0.05" /></text>
-	</element>
-	<element name="text_7">
-		<rect><color red="0.55" green="0.25" blue="0.15" /></rect>
-		<text string="7" align="1"><color red="0.9" green="0.9" blue="0.9" /></text>
-	</element>
-	<element name="text_8">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="8" align="1"><color red="0.05" green="0.05" blue="0.05" /></text>
-	</element>
-
-	<element name="text_a">
-		<rect><color red="0.55" green="0.25" blue="0.15" /></rect>
-		<text string="A"><color red="0.9" green="0.9" blue="0.9" /></text>
-	</element>
-	<element name="text_b">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="B"><color red="0.05" green="0.05" blue="0.05" /></text>
-	</element>
-	<element name="text_c">
-		<rect><color red="0.55" green="0.25" blue="0.15" /></rect>
-		<text string="C"><color red="0.9" green="0.9" blue="0.9" /></text>
-	</element>
-	<element name="text_d">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="D"><color red="0.05" green="0.05" blue="0.05" /></text>
-	</element>
-	<element name="text_e">
-		<rect><color red="0.55" green="0.25" blue="0.15" /></rect>
-		<text string="E"><color red="0.9" green="0.9" blue="0.9" /></text>
-	</element>
-	<element name="text_f">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="F"><color red="0.05" green="0.05" blue="0.05" /></text>
-	</element>
-	<element name="text_g">
-		<rect><color red="0.55" green="0.25" blue="0.15" /></rect>
-		<text string="G"><color red="0.9" green="0.9" blue="0.9" /></text>
-	</element>
-	<element name="text_h">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="H"><color red="0.05" green="0.05" blue="0.05" /></text>
-	</element>
+	<element name="text_1"><text string="1" align="1"><color red="0.9" green="0.9" blue="0.9" /></text></element>
+	<element name="text_2"><text string="2" align="1"><color red="0.05" green="0.05" blue="0.05" /></text></element>
+	<element name="text_3"><text string="3" align="1"><color red="0.9" green="0.9" blue="0.9" /></text></element>
+	<element name="text_4"><text string="4" align="1"><color red="0.05" green="0.05" blue="0.05" /></text></element>
+	<element name="text_5"><text string="5" align="1"><color red="0.9" green="0.9" blue="0.9" /></text></element>
+	<element name="text_6"><text string="6" align="1"><color red="0.05" green="0.05" blue="0.05" /></text></element>
+	<element name="text_7"><text string="7" align="1"><color red="0.9" green="0.9" blue="0.9" /></text></element>
+	<element name="text_8"><text string="8" align="1"><color red="0.05" green="0.05" blue="0.05" /></text></element>
+
+	<element name="text_a"><text string="A"><color red="0.9" green="0.9" blue="0.9" /></text></element>
+	<element name="text_b"><text string="B"><color red="0.05" green="0.05" blue="0.05" /></text></element>
+	<element name="text_c"><text string="C"><color red="0.9" green="0.9" blue="0.9" /></text></element>
+	<element name="text_d"><text string="D"><color red="0.05" green="0.05" blue="0.05" /></text></element>
+	<element name="text_e"><text string="E"><color red="0.9" green="0.9" blue="0.9" /></text></element>
+	<element name="text_f"><text string="F"><color red="0.05" green="0.05" blue="0.05" /></text></element>
+	<element name="text_g"><text string="G"><color red="0.9" green="0.9" blue="0.9" /></text></element>
+	<element name="text_h"><text string="H"><color red="0.05" green="0.05" blue="0.05" /></text></element>
 
 	<element name="text_check">
 		<rect><color red="0.1" green="0.1" blue="0.1" /></rect>
@@ -97,43 +49,25 @@ license:CC0-1.0
 	<element name="text_p5"><image file="chess/wn.svg"/></element>
 	<element name="text_p6"><image file="chess/wp.svg"/></element>
 
-	<element name="text_l1a">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="NEW"><color red="0.05" green="0.05" blue="0.05" /></text>
-	</element>
-	<element name="text_l1b">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="GAME"><color red="0.05" green="0.05" blue="0.05" /></text>
-	</element>
-	<element name="text_l2">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="CLEAR"><color red="0.05" green="0.05" blue="0.05" /></text>
-	</element>
-	<element name="text_l3">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="PROBLEM"><color red="0.05" green="0.05" blue="0.05" /></text>
-	</element>
-	<element name="text_l4">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="VERIFY"><color red="0.05" green="0.05" blue="0.05" /></text>
-	</element>
-	<element name="text_l5">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="LEVEL"><color red="0.05" green="0.05" blue="0.05" /></text>
-	</element>
-	<element name="text_l6">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="SOUND"><color red="0.05" green="0.05" blue="0.05" /></text><!-- speaker symbol -->
-	</element>
-	<element name="text_l7">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="MOVE"><color red="0.05" green="0.05" blue="0.05" /></text>
-	</element>
-	<element name="text_l8">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="REVERSE"><color red="0.05" green="0.05" blue="0.05" /></text>
+	<!-- generic speaker icon, (C) Mobius, public domain -->
+	<element name="speaker">
+		<image><data><![CDATA[
+			<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="500" height="500" viewBox="0 0 75 75">
+				<path d="M39.389,13.769 L22.235,28.606 L6,28.606 L6,47.699 L21.989,47.699 L39.389,62.75 L39.389,13.769z" style="stroke:#141414;stroke-width:5;stroke-linejoin:round;fill:#141414;"/>
+				<path d="M48,27.6a19.5,19.5 0 0 1 0,21.4M55.1,20.5a30,30 0 0 1 0,35.6M61.6,14a38.8,38.8 0 0 1 0,48.6" style="fill:none;stroke:#141414;stroke-width:5;stroke-linecap:round"/>
+			</svg>
+		]]></data></image>
 	</element>
 
+	<element name="text_l1a"><text string="NEW"><color red="0.05" green="0.05" blue="0.05" /></text></element>
+	<element name="text_l1b"><text string="GAME"><color red="0.05" green="0.05" blue="0.05" /></text></element>
+	<element name="text_l2"><text string="CLEAR"><color red="0.05" green="0.05" blue="0.05" /></text></element>
+	<element name="text_l3"><text string="PROBLEM"><color red="0.05" green="0.05" blue="0.05" /></text></element>
+	<element name="text_l4"><text string="VERIFY"><color red="0.05" green="0.05" blue="0.05" /></text></element>
+	<element name="text_l5"><text string="LEVEL"><color red="0.05" green="0.05" blue="0.05" /></text></element>
+	<element name="text_l7"><text string="MOVE"><color red="0.05" green="0.05" blue="0.05" /></text></element>
+	<element name="text_l8"><text string="REVERSE"><color red="0.05" green="0.05" blue="0.05" /></text></element>
+
 
 <!-- sb board -->
 
@@ -312,43 +246,23 @@ license:CC0-1.0
 	<element name="text_uit1"><text string="S.BOARD"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uit2"><text string="INTERFACE"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uib1"><text string="BOARD:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uib2">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="RESET"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uib3">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="CLEAR"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uib2"><text string="RESET"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uib3"><text string="CLEAR"><color red="0.01" green="0.01" blue="0.01" /></text></element>
 	<element name="text_uis1"><text string="SPAWN:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uih1"><text string="HAND:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uih2">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="REMOVE"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uih2"><text string="REMOVE"><color red="0.01" green="0.01" blue="0.01" /></text></element>
 	<element name="text_uiu1"><text string="UNDO:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uiu2a">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string=" &lt;&lt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2b">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string=" &lt;  "><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2c">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="   &gt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2d">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string=" &gt;&gt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uiu2a"><text string=" &lt;&lt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2b"><text string=" &lt;  "><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2c"><text string="   &gt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2d"><text string=" &gt;&gt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu3b"><text string="/"><color red="0.81" green="0.8" blue="0.79" /></text></element>
+
 	<element name="text_uiu3a" defstate="0">
 		<simplecounter maxstate="999" digits="1" align="2">
 			<color red="0.81" green="0.8" blue="0.79" />
 		</simplecounter>
 	</element>
-	<element name="text_uiu3b"><text string="/"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uiu3c" defstate="0">
 		<simplecounter maxstate="999" digits="1" align="1">
 			<color red="0.81" green="0.8" blue="0.79" />
@@ -489,7 +403,7 @@ license:CC0-1.0
 		<element ref="text_l3"><bounds x="95" y="62.25" width="6" height="1.5" /></element>
 		<element ref="text_l4"><bounds x="95" y="67.25" width="6" height="1.5" /></element>
 		<element ref="text_l5"><bounds x="95" y="72.25" width="6" height="1.5" /></element>
-		<element ref="text_l6"><bounds x="95" y="77.25" width="6" height="1.5" /></element>
+		<element ref="speaker"><bounds xc="98" yc="78" width="2.1" height="2.1" /></element>
 		<element ref="text_l7"><bounds x="95" y="82.25" width="6" height="1.5" /></element>
 		<element ref="text_l8"><bounds x="95" y="87.25" width="6" height="1.5" /></element>
 
diff --git a/src/mame/layout/fidel_ex.lay b/src/mame/layout/fidel_ex.lay
index 1ba29571471..dec27f0a8b0 100644
--- a/src/mame/layout/fidel_ex.lay
+++ b/src/mame/layout/fidel_ex.lay
@@ -30,166 +30,49 @@ license:CC0-1.0
 		</rect>
 	</element>
 
-	<element name="text_1">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="1" align="2"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_2">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="2" align="2"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_3">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="3" align="2"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_4">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="4" align="2"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_5">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="5" align="2"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_6">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="6" align="2"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_7">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="7" align="2"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_8">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="8" align="2"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-
-	<element name="text_9">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="9" align="2"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_10">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="10" align="2"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_11">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="11" align="2"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_12">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="12" align="2"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-
-	<element name="text_a">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="A"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_b">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="B"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_c">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="C"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_d">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="D"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_e">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="E"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_f">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="F"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_g">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="G"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_h">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="H"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-
-	<element name="text_la">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="LOW BATTERY"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_lb">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="CHECK"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_lc">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="MATE"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_ld">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="WHITE"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_le">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="BLACK"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_lf">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="STALEMATE"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_lg">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="DRAW"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_lh">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="I LOSE"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-
-	<element name="text_t81">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="NEW"><color red="0.15" green="0.15" blue="0.15" /></text>
-	</element>
-	<element name="text_t82">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="GAME"><color red="0.15" green="0.15" blue="0.15" /></text>
-	</element>
-	<element name="text_t7">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="VERIFY"><color red="0.15" green="0.15" blue="0.15" /></text>
-	</element>
-	<element name="text_t6">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="OPTIONS"><color red="0.15" green="0.15" blue="0.15" /></text>
-	</element>
-	<element name="text_t5">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="LEVEL"><color red="0.15" green="0.15" blue="0.15" /></text>
-	</element>
-	<element name="text_t4">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string=" "><color red="0.15" green="0.15" blue="0.15" /></text>
-	</element>
-	<element name="text_t41">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="TAKE"><color red="0.15" green="0.15" blue="0.15" /></text>
-	</element>
-	<element name="text_t42">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="BACK"><color red="0.15" green="0.15" blue="0.15" /></text>
-	</element>
-	<element name="text_t3">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="HINT"><color red="0.15" green="0.15" blue="0.15" /></text>
-	</element>
-	<element name="text_t2">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="MOVE"><color red="0.15" green="0.15" blue="0.15" /></text>
-	</element>
-	<element name="text_t1">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="CLEAR"><color red="0.15" green="0.15" blue="0.15" /></text>
-	</element>
+	<element name="text_1"><text string="1" align="2"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_2"><text string="2" align="2"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_3"><text string="3" align="2"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_4"><text string="4" align="2"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_5"><text string="5" align="2"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_6"><text string="6" align="2"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_7"><text string="7" align="2"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_8"><text string="8" align="2"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+
+	<element name="text_9"><text string="9" align="2"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_10"><text string="10" align="2"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_11"><text string="11" align="2"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_12"><text string="12" align="2"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+
+	<element name="text_a"><text string="A"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_b"><text string="B"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_c"><text string="C"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_d"><text string="D"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_e"><text string="E"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_f"><text string="F"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_g"><text string="G"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_h"><text string="H"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+
+	<element name="text_la"><text string="LOW BATTERY"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_lb"><text string="CHECK"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_lc"><text string="MATE"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_ld"><text string="WHITE"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_le"><text string="BLACK"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_lf"><text string="STALEMATE"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_lg"><text string="DRAW"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_lh"><text string="I LOSE"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+
+	<element name="text_t81"><text string="NEW"><color red="0.15" green="0.15" blue="0.15" /></text></element>
+	<element name="text_t82"><text string="GAME"><color red="0.15" green="0.15" blue="0.15" /></text></element>
+	<element name="text_t7"><text string="VERIFY"><color red="0.15" green="0.15" blue="0.15" /></text></element>
+	<element name="text_t6"><text string="OPTIONS"><color red="0.15" green="0.15" blue="0.15" /></text></element>
+	<element name="text_t5"><text string="LEVEL"><color red="0.15" green="0.15" blue="0.15" /></text></element>
+	<element name="text_t4"><text string=" "><color red="0.15" green="0.15" blue="0.15" /></text></element>
+	<element name="text_t41"><text string="TAKE"><color red="0.15" green="0.15" blue="0.15" /></text></element>
+	<element name="text_t42"><text string="BACK"><color red="0.15" green="0.15" blue="0.15" /></text></element>
+	<element name="text_t3"><text string="HINT"><color red="0.15" green="0.15" blue="0.15" /></text></element>
+	<element name="text_t2"><text string="MOVE"><color red="0.15" green="0.15" blue="0.15" /></text></element>
+	<element name="text_t1"><text string="CLEAR"><color red="0.15" green="0.15" blue="0.15" /></text></element>
 
 	<element name="text_p1"><rect><color red="1" green="1" blue="1" /></rect><image file="chess/bk.svg" /><rect><color red="1" green="1" blue="1" alpha="0.1875" /></rect></element>
 	<element name="text_p2"><rect><color red="1" green="1" blue="1" /></rect><image file="chess/bq.svg" /><rect><color red="1" green="1" blue="1" alpha="0.1875" /></rect></element>
@@ -354,43 +237,23 @@ license:CC0-1.0
 	<element name="text_uit1"><text string="S.BOARD"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uit2"><text string="INTERFACE"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uib1"><text string="BOARD:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uib2">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="RESET"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uib3">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="CLEAR"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uib2"><text string="RESET"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uib3"><text string="CLEAR"><color red="0.01" green="0.01" blue="0.01" /></text></element>
 	<element name="text_uis1"><text string="SPAWN:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uih1"><text string="HAND:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uih2">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="REMOVE"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uih2"><text string="REMOVE"><color red="0.01" green="0.01" blue="0.01" /></text></element>
 	<element name="text_uiu1"><text string="UNDO:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uiu2a">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string=" &lt;&lt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2b">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string=" &lt;  "><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2c">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="   &gt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2d">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string=" &gt;&gt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uiu2a"><text string=" &lt;&lt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2b"><text string=" &lt;  "><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2c"><text string="   &gt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2d"><text string=" &gt;&gt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu3b"><text string="/"><color red="0.81" green="0.8" blue="0.79" /></text></element>
+
 	<element name="text_uiu3a" defstate="0">
 		<simplecounter maxstate="999" digits="1" align="2">
 			<color red="0.81" green="0.8" blue="0.79" />
 		</simplecounter>
 	</element>
-	<element name="text_uiu3b"><text string="/"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uiu3c" defstate="0">
 		<simplecounter maxstate="999" digits="1" align="1">
 			<color red="0.81" green="0.8" blue="0.79" />
diff --git a/src/mame/layout/fidel_ex_68k.lay b/src/mame/layout/fidel_ex_68k.lay
index 54be9707cac..51fa4044c10 100644
--- a/src/mame/layout/fidel_ex_68k.lay
+++ b/src/mame/layout/fidel_ex_68k.lay
@@ -32,162 +32,48 @@ license:CC0-1.0
 		</rect>
 	</element>
 
-	<element name="text_1">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="1" align="2"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_2">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="2" align="2"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_3">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="3" align="2"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_4">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="4" align="2"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_5">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="5" align="2"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_6">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="6" align="2"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_7">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="7" align="2"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_8">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="8" align="2"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-
-	<element name="text_9">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="9" align="2"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_10">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="10" align="2"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_11">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="11" align="2"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_12">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="12" align="2"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-
-	<element name="text_a">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="A"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_b">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="B"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_c">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="C"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_d">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="D"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_e">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="E"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_f">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="F"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_g">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="G"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_h">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="H"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-
-	<element name="text_lb">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="CHECK"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_lc">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="MATE"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_ld">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="WHITE"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_le">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="BLACK"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_lf">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="STALEMATE"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_lg">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="DRAW"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_lh">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="I LOSE"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-
-	<element name="text_t81">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="NEW"><color red="0.17" green="0.15" blue="0.15" /></text>
-	</element>
-	<element name="text_t82">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="GAME"><color red="0.17" green="0.15" blue="0.15" /></text>
-	</element>
-	<element name="text_t7">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="VERIFY"><color red="0.17" green="0.15" blue="0.15" /></text>
-	</element>
-	<element name="text_t6">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="OPTIONS"><color red="0.17" green="0.15" blue="0.15" /></text>
-	</element>
-	<element name="text_t5">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="LEVEL"><color red="0.17" green="0.15" blue="0.15" /></text>
-	</element>
-	<element name="text_t4">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string=" "><color red="0.17" green="0.15" blue="0.15" /></text>
-	</element>
-	<element name="text_t41">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="TAKE"><color red="0.17" green="0.15" blue="0.15" /></text>
-	</element>
-	<element name="text_t42">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="BACK"><color red="0.17" green="0.15" blue="0.15" /></text>
-	</element>
-	<element name="text_t3">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="HINT"><color red="0.17" green="0.15" blue="0.15" /></text>
-	</element>
-	<element name="text_t2">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="MOVE"><color red="0.17" green="0.15" blue="0.15" /></text>
-	</element>
-	<element name="text_t1">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="CLEAR"><color red="0.17" green="0.15" blue="0.15" /></text>
-	</element>
+	<element name="text_1"><text string="1" align="2"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_2"><text string="2" align="2"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_3"><text string="3" align="2"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_4"><text string="4" align="2"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_5"><text string="5" align="2"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_6"><text string="6" align="2"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_7"><text string="7" align="2"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_8"><text string="8" align="2"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+
+	<element name="text_9"><text string="9" align="2"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_10"><text string="10" align="2"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_11"><text string="11" align="2"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_12"><text string="12" align="2"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+
+	<element name="text_a"><text string="A"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_b"><text string="B"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_c"><text string="C"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_d"><text string="D"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_e"><text string="E"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_f"><text string="F"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_g"><text string="G"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_h"><text string="H"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+
+	<element name="text_lb"><text string="CHECK"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_lc"><text string="MATE"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_ld"><text string="WHITE"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_le"><text string="BLACK"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_lf"><text string="STALEMATE"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_lg"><text string="DRAW"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_lh"><text string="I LOSE"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+
+	<element name="text_t81"><text string="NEW"><color red="0.17" green="0.15" blue="0.15" /></text></element>
+	<element name="text_t82"><text string="GAME"><color red="0.17" green="0.15" blue="0.15" /></text></element>
+	<element name="text_t7"><text string="VERIFY"><color red="0.17" green="0.15" blue="0.15" /></text></element>
+	<element name="text_t6"><text string="OPTIONS"><color red="0.17" green="0.15" blue="0.15" /></text></element>
+	<element name="text_t5"><text string="LEVEL"><color red="0.17" green="0.15" blue="0.15" /></text></element>
+	<element name="text_t4"><text string=" "><color red="0.17" green="0.15" blue="0.15" /></text></element>
+	<element name="text_t41"><text string="TAKE"><color red="0.17" green="0.15" blue="0.15" /></text></element>
+	<element name="text_t42"><text string="BACK"><color red="0.17" green="0.15" blue="0.15" /></text></element>
+	<element name="text_t3"><text string="HINT"><color red="0.17" green="0.15" blue="0.15" /></text></element>
+	<element name="text_t2"><text string="MOVE"><color red="0.17" green="0.15" blue="0.15" /></text></element>
+	<element name="text_t1"><text string="CLEAR"><color red="0.17" green="0.15" blue="0.15" /></text></element>
 
 	<element name="text_p1"><image file="chess/wk.svg" /></element>
 	<element name="text_p2"><image file="chess/wq.svg" /></element>
@@ -364,43 +250,23 @@ license:CC0-1.0
 	<element name="text_uit1"><text string="S.BOARD"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uit2"><text string="INTERFACE"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uib1"><text string="BOARD:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uib2">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="RESET"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uib3">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="CLEAR"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uib2"><text string="RESET"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uib3"><text string="CLEAR"><color red="0.01" green="0.01" blue="0.01" /></text></element>
 	<element name="text_uis1"><text string="SPAWN:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uih1"><text string="HAND:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uih2">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="REMOVE"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uih2"><text string="REMOVE"><color red="0.01" green="0.01" blue="0.01" /></text></element>
 	<element name="text_uiu1"><text string="UNDO:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uiu2a">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string=" &lt;&lt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2b">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string=" &lt;  "><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2c">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="   &gt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2d">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string=" &gt;&gt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uiu2a"><text string=" &lt;&lt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2b"><text string=" &lt;  "><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2c"><text string="   &gt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2d"><text string=" &gt;&gt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu3b"><text string="/"><color red="0.81" green="0.8" blue="0.79" /></text></element>
+
 	<element name="text_uiu3a" defstate="0">
 		<simplecounter maxstate="999" digits="1" align="2">
 			<color red="0.81" green="0.8" blue="0.79" />
 		</simplecounter>
 	</element>
-	<element name="text_uiu3b"><text string="/"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uiu3c" defstate="0">
 		<simplecounter maxstate="999" digits="1" align="1">
 			<color red="0.81" green="0.8" blue="0.79" />
diff --git a/src/mame/layout/fidel_exb.lay b/src/mame/layout/fidel_exb.lay
index 7fc659ad19d..6bbe58ff32c 100644
--- a/src/mame/layout/fidel_exb.lay
+++ b/src/mame/layout/fidel_exb.lay
@@ -28,162 +28,48 @@ license:CC0-1.0
 		</rect>
 	</element>
 
-	<element name="text_1">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="1" align="2"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_2">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="2" align="2"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_3">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="3" align="2"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_4">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="4" align="2"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_5">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="5" align="2"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_6">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="6" align="2"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_7">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="7" align="2"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_8">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="8" align="2"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-
-	<element name="text_9">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="9" align="2"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_10">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="10" align="2"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_11">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="11" align="2"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_12">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="12" align="2"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-
-	<element name="text_a">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="A"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_b">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="B"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_c">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="C"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_d">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="D"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_e">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="E"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_f">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="F"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_g">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="G"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_h">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="H"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-
-	<element name="text_lb">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="CHECK"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_lc">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="MATE"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_ld">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="WHITE"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_le">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="BLACK"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_lf">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="STALEMATE"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_lg">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="DRAW"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_lh">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="I LOSE"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-
-	<element name="text_t81">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="NEW"><color red="0.15" green="0.15" blue="0.15" /></text>
-	</element>
-	<element name="text_t82">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="GAME"><color red="0.15" green="0.15" blue="0.15" /></text>
-	</element>
-	<element name="text_t7">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="VERIFY"><color red="0.15" green="0.15" blue="0.15" /></text>
-	</element>
-	<element name="text_t6">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="OPTIONS"><color red="0.15" green="0.15" blue="0.15" /></text>
-	</element>
-	<element name="text_t5">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="LEVEL"><color red="0.15" green="0.15" blue="0.15" /></text>
-	</element>
-	<element name="text_t4">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string=" "><color red="0.15" green="0.15" blue="0.15" /></text>
-	</element>
-	<element name="text_t41">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="TAKE"><color red="0.15" green="0.15" blue="0.15" /></text>
-	</element>
-	<element name="text_t42">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="BACK"><color red="0.15" green="0.15" blue="0.15" /></text>
-	</element>
-	<element name="text_t3">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="HINT"><color red="0.15" green="0.15" blue="0.15" /></text>
-	</element>
-	<element name="text_t2">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="MOVE"><color red="0.15" green="0.15" blue="0.15" /></text>
-	</element>
-	<element name="text_t1">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="CLEAR"><color red="0.15" green="0.15" blue="0.15" /></text>
-	</element>
+	<element name="text_1"><text string="1" align="2"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_2"><text string="2" align="2"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_3"><text string="3" align="2"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_4"><text string="4" align="2"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_5"><text string="5" align="2"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_6"><text string="6" align="2"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_7"><text string="7" align="2"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_8"><text string="8" align="2"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+
+	<element name="text_9"><text string="9" align="2"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_10"><text string="10" align="2"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_11"><text string="11" align="2"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_12"><text string="12" align="2"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+
+	<element name="text_a"><text string="A"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_b"><text string="B"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_c"><text string="C"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_d"><text string="D"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_e"><text string="E"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_f"><text string="F"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_g"><text string="G"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_h"><text string="H"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+
+	<element name="text_lb"><text string="CHECK"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_lc"><text string="MATE"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_ld"><text string="WHITE"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_le"><text string="BLACK"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_lf"><text string="STALEMATE"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_lg"><text string="DRAW"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_lh"><text string="I LOSE"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+
+	<element name="text_t81"><text string="NEW"><color red="0.15" green="0.15" blue="0.15" /></text></element>
+	<element name="text_t82"><text string="GAME"><color red="0.15" green="0.15" blue="0.15" /></text></element>
+	<element name="text_t7"><text string="VERIFY"><color red="0.15" green="0.15" blue="0.15" /></text></element>
+	<element name="text_t6"><text string="OPTIONS"><color red="0.15" green="0.15" blue="0.15" /></text></element>
+	<element name="text_t5"><text string="LEVEL"><color red="0.15" green="0.15" blue="0.15" /></text></element>
+	<element name="text_t4"><text string=" "><color red="0.15" green="0.15" blue="0.15" /></text></element>
+	<element name="text_t41"><text string="TAKE"><color red="0.15" green="0.15" blue="0.15" /></text></element>
+	<element name="text_t42"><text string="BACK"><color red="0.15" green="0.15" blue="0.15" /></text></element>
+	<element name="text_t3"><text string="HINT"><color red="0.15" green="0.15" blue="0.15" /></text></element>
+	<element name="text_t2"><text string="MOVE"><color red="0.15" green="0.15" blue="0.15" /></text></element>
+	<element name="text_t1"><text string="CLEAR"><color red="0.15" green="0.15" blue="0.15" /></text></element>
 
 	<element name="text_p1"><rect><color red="1" green="1" blue="1" /></rect><image file="chess/bk.svg" /><rect><color red="1" green="1" blue="1" alpha="0.1875" /></rect></element>
 	<element name="text_p2"><rect><color red="1" green="1" blue="1" /></rect><image file="chess/bq.svg" /><rect><color red="1" green="1" blue="1" alpha="0.1875" /></rect></element>
@@ -348,43 +234,23 @@ license:CC0-1.0
 	<element name="text_uit1"><text string="S.BOARD"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uit2"><text string="INTERFACE"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uib1"><text string="BOARD:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uib2">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="RESET"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uib3">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="CLEAR"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uib2"><text string="RESET"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uib3"><text string="CLEAR"><color red="0.01" green="0.01" blue="0.01" /></text></element>
 	<element name="text_uis1"><text string="SPAWN:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uih1"><text string="HAND:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uih2">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="REMOVE"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uih2"><text string="REMOVE"><color red="0.01" green="0.01" blue="0.01" /></text></element>
 	<element name="text_uiu1"><text string="UNDO:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uiu2a">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string=" &lt;&lt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2b">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string=" &lt;  "><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2c">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="   &gt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2d">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string=" &gt;&gt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uiu2a"><text string=" &lt;&lt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2b"><text string=" &lt;  "><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2c"><text string="   &gt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2d"><text string=" &gt;&gt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu3b"><text string="/"><color red="0.81" green="0.8" blue="0.79" /></text></element>
+
 	<element name="text_uiu3a" defstate="0">
 		<simplecounter maxstate="999" digits="1" align="2">
 			<color red="0.81" green="0.8" blue="0.79" />
 		</simplecounter>
 	</element>
-	<element name="text_uiu3b"><text string="/"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uiu3c" defstate="0">
 		<simplecounter maxstate="999" digits="1" align="1">
 			<color red="0.81" green="0.8" blue="0.79" />
diff --git a/src/mame/layout/fidel_exd.lay b/src/mame/layout/fidel_exd.lay
index c89f28410d0..c8c7cac6dca 100644
--- a/src/mame/layout/fidel_exd.lay
+++ b/src/mame/layout/fidel_exd.lay
@@ -38,162 +38,48 @@ license:CC0-1.0
 		</rect>
 	</element>
 
-	<element name="text_1">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="1" align="2"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_2">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="2" align="2"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_3">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="3" align="2"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_4">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="4" align="2"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_5">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="5" align="2"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_6">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="6" align="2"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_7">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="7" align="2"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_8">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="8" align="2"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-
-	<element name="text_9">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="9" align="2"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_10">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="10" align="2"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_11">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="11" align="2"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_12">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="12" align="2"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-
-	<element name="text_a">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="A"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_b">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="B"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_c">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="C"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_d">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="D"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_e">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="E"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_f">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="F"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_g">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="G"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_h">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="H"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-
-	<element name="text_lb">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="CHECK"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_lc">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="MATE"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_ld">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="WHITE"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_le">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="BLACK"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_lf">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="STALEMATE"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_lg">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="DRAW"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_lh">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="I LOSE"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-
-	<element name="text_t81">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="NEW"><color red="0.17" green="0.15" blue="0.15" /></text>
-	</element>
-	<element name="text_t82">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="GAME"><color red="0.17" green="0.15" blue="0.15" /></text>
-	</element>
-	<element name="text_t7">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="VERIFY"><color red="0.17" green="0.15" blue="0.15" /></text>
-	</element>
-	<element name="text_t6">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="OPTIONS"><color red="0.17" green="0.15" blue="0.15" /></text>
-	</element>
-	<element name="text_t5">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="LEVEL"><color red="0.17" green="0.15" blue="0.15" /></text>
-	</element>
-	<element name="text_t4">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string=" "><color red="0.17" green="0.15" blue="0.15" /></text>
-	</element>
-	<element name="text_t41">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="TAKE"><color red="0.17" green="0.15" blue="0.15" /></text>
-	</element>
-	<element name="text_t42">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="BACK"><color red="0.17" green="0.15" blue="0.15" /></text>
-	</element>
-	<element name="text_t3">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="HINT"><color red="0.17" green="0.15" blue="0.15" /></text>
-	</element>
-	<element name="text_t2">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="MOVE"><color red="0.17" green="0.15" blue="0.15" /></text>
-	</element>
-	<element name="text_t1">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="CLEAR"><color red="0.17" green="0.15" blue="0.15" /></text>
-	</element>
+	<element name="text_1"><text string="1" align="2"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_2"><text string="2" align="2"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_3"><text string="3" align="2"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_4"><text string="4" align="2"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_5"><text string="5" align="2"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_6"><text string="6" align="2"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_7"><text string="7" align="2"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_8"><text string="8" align="2"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+
+	<element name="text_9"><text string="9" align="2"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_10"><text string="10" align="2"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_11"><text string="11" align="2"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_12"><text string="12" align="2"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+
+	<element name="text_a"><text string="A"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_b"><text string="B"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_c"><text string="C"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_d"><text string="D"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_e"><text string="E"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_f"><text string="F"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_g"><text string="G"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_h"><text string="H"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+
+	<element name="text_lb"><text string="CHECK"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_lc"><text string="MATE"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_ld"><text string="WHITE"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_le"><text string="BLACK"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_lf"><text string="STALEMATE"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_lg"><text string="DRAW"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_lh"><text string="I LOSE"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+
+	<element name="text_t81"><text string="NEW"><color red="0.17" green="0.15" blue="0.15" /></text></element>
+	<element name="text_t82"><text string="GAME"><color red="0.17" green="0.15" blue="0.15" /></text></element>
+	<element name="text_t7"><text string="VERIFY"><color red="0.17" green="0.15" blue="0.15" /></text></element>
+	<element name="text_t6"><text string="OPTIONS"><color red="0.17" green="0.15" blue="0.15" /></text></element>
+	<element name="text_t5"><text string="LEVEL"><color red="0.17" green="0.15" blue="0.15" /></text></element>
+	<element name="text_t4"><text string=" "><color red="0.17" green="0.15" blue="0.15" /></text></element>
+	<element name="text_t41"><text string="TAKE"><color red="0.17" green="0.15" blue="0.15" /></text></element>
+	<element name="text_t42"><text string="BACK"><color red="0.17" green="0.15" blue="0.15" /></text></element>
+	<element name="text_t3"><text string="HINT"><color red="0.17" green="0.15" blue="0.15" /></text></element>
+	<element name="text_t2"><text string="MOVE"><color red="0.17" green="0.15" blue="0.15" /></text></element>
+	<element name="text_t1"><text string="CLEAR"><color red="0.17" green="0.15" blue="0.15" /></text></element>
 
 	<element name="text_p1"><image file="chess/wk.svg" /></element>
 	<element name="text_p2"><image file="chess/wq.svg" /></element>
@@ -358,43 +244,23 @@ license:CC0-1.0
 	<element name="text_uit1"><text string="S.BOARD"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uit2"><text string="INTERFACE"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uib1"><text string="BOARD:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uib2">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="RESET"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uib3">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="CLEAR"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uib2"><text string="RESET"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uib3"><text string="CLEAR"><color red="0.01" green="0.01" blue="0.01" /></text></element>
 	<element name="text_uis1"><text string="SPAWN:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uih1"><text string="HAND:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uih2">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="REMOVE"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uih2"><text string="REMOVE"><color red="0.01" green="0.01" blue="0.01" /></text></element>
 	<element name="text_uiu1"><text string="UNDO:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uiu2a">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string=" &lt;&lt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2b">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string=" &lt;  "><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2c">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="   &gt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2d">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string=" &gt;&gt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uiu2a"><text string=" &lt;&lt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2b"><text string=" &lt;  "><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2c"><text string="   &gt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2d"><text string=" &gt;&gt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu3b"><text string="/"><color red="0.81" green="0.8" blue="0.79" /></text></element>
+
 	<element name="text_uiu3a" defstate="0">
 		<simplecounter maxstate="999" digits="1" align="2">
 			<color red="0.81" green="0.8" blue="0.79" />
 		</simplecounter>
 	</element>
-	<element name="text_uiu3b"><text string="/"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uiu3c" defstate="0">
 		<simplecounter maxstate="999" digits="1" align="1">
 			<color red="0.81" green="0.8" blue="0.79" />
diff --git a/src/mame/layout/fidel_exv.lay b/src/mame/layout/fidel_exv.lay
index c330f3ace62..991af912b0f 100644
--- a/src/mame/layout/fidel_exv.lay
+++ b/src/mame/layout/fidel_exv.lay
@@ -32,162 +32,48 @@ license:CC0-1.0
 		</rect>
 	</element>
 
-	<element name="text_1">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="1" align="2"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_2">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="2" align="2"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_3">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="3" align="2"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_4">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="4" align="2"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_5">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="5" align="2"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_6">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="6" align="2"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_7">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="7" align="2"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_8">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="8" align="2"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-
-	<element name="text_9">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="9" align="2"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_10">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="10" align="2"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_11">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="11" align="2"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_12">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="12" align="2"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-
-	<element name="text_a">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="A"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_b">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="B"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_c">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="C"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_d">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="D"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_e">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="E"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_f">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="F"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_g">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="G"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_h">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="H"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-
-	<element name="text_lb">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="CHECK"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_lc">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="MATE"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_ld">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="WHITE"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_le">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="BLACK"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_lf">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="STALEMATE"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_lg">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="DRAW"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_lh">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="I LOSE"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-
-	<element name="text_t81">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="NEW"><color red="0.17" green="0.15" blue="0.15" /></text>
-	</element>
-	<element name="text_t82">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="GAME"><color red="0.17" green="0.15" blue="0.15" /></text>
-	</element>
-	<element name="text_t7">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="VERIFY"><color red="0.17" green="0.15" blue="0.15" /></text>
-	</element>
-	<element name="text_t6">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="OPTIONS"><color red="0.17" green="0.15" blue="0.15" /></text>
-	</element>
-	<element name="text_t5">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="LEVEL"><color red="0.17" green="0.15" blue="0.15" /></text>
-	</element>
-	<element name="text_t4">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string=" "><color red="0.17" green="0.15" blue="0.15" /></text>
-	</element>
-	<element name="text_t41">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="TAKE"><color red="0.17" green="0.15" blue="0.15" /></text>
-	</element>
-	<element name="text_t42">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="BACK"><color red="0.17" green="0.15" blue="0.15" /></text>
-	</element>
-	<element name="text_t3">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="HINT"><color red="0.17" green="0.15" blue="0.15" /></text>
-	</element>
-	<element name="text_t2">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="MOVE"><color red="0.17" green="0.15" blue="0.15" /></text>
-	</element>
-	<element name="text_t1">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="CLEAR"><color red="0.17" green="0.15" blue="0.15" /></text>
-	</element>
+	<element name="text_1"><text string="1" align="2"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_2"><text string="2" align="2"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_3"><text string="3" align="2"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_4"><text string="4" align="2"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_5"><text string="5" align="2"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_6"><text string="6" align="2"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_7"><text string="7" align="2"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_8"><text string="8" align="2"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+
+	<element name="text_9"><text string="9" align="2"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_10"><text string="10" align="2"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_11"><text string="11" align="2"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_12"><text string="12" align="2"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+
+	<element name="text_a"><text string="A"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_b"><text string="B"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_c"><text string="C"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_d"><text string="D"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_e"><text string="E"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_f"><text string="F"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_g"><text string="G"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_h"><text string="H"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+
+	<element name="text_lb"><text string="CHECK"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_lc"><text string="MATE"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_ld"><text string="WHITE"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_le"><text string="BLACK"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_lf"><text string="STALEMATE"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_lg"><text string="DRAW"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_lh"><text string="I LOSE"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+
+	<element name="text_t81"><text string="NEW"><color red="0.17" green="0.15" blue="0.15" /></text></element>
+	<element name="text_t82"><text string="GAME"><color red="0.17" green="0.15" blue="0.15" /></text></element>
+	<element name="text_t7"><text string="VERIFY"><color red="0.17" green="0.15" blue="0.15" /></text></element>
+	<element name="text_t6"><text string="OPTIONS"><color red="0.17" green="0.15" blue="0.15" /></text></element>
+	<element name="text_t5"><text string="LEVEL"><color red="0.17" green="0.15" blue="0.15" /></text></element>
+	<element name="text_t4"><text string=" "><color red="0.17" green="0.15" blue="0.15" /></text></element>
+	<element name="text_t41"><text string="TAKE"><color red="0.17" green="0.15" blue="0.15" /></text></element>
+	<element name="text_t42"><text string="BACK"><color red="0.17" green="0.15" blue="0.15" /></text></element>
+	<element name="text_t3"><text string="HINT"><color red="0.17" green="0.15" blue="0.15" /></text></element>
+	<element name="text_t2"><text string="MOVE"><color red="0.17" green="0.15" blue="0.15" /></text></element>
+	<element name="text_t1"><text string="CLEAR"><color red="0.17" green="0.15" blue="0.15" /></text></element>
 
 	<element name="text_p1"><image file="chess/wk.svg" /></element>
 	<element name="text_p2"><image file="chess/wq.svg" /></element>
@@ -352,43 +238,23 @@ license:CC0-1.0
 	<element name="text_uit1"><text string="S.BOARD"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uit2"><text string="INTERFACE"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uib1"><text string="BOARD:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uib2">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="RESET"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uib3">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="CLEAR"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uib2"><text string="RESET"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uib3"><text string="CLEAR"><color red="0.01" green="0.01" blue="0.01" /></text></element>
 	<element name="text_uis1"><text string="SPAWN:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uih1"><text string="HAND:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uih2">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="REMOVE"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uih2"><text string="REMOVE"><color red="0.01" green="0.01" blue="0.01" /></text></element>
 	<element name="text_uiu1"><text string="UNDO:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uiu2a">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string=" &lt;&lt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2b">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string=" &lt;  "><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2c">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="   &gt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2d">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string=" &gt;&gt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uiu2a"><text string=" &lt;&lt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2b"><text string=" &lt;  "><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2c"><text string="   &gt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2d"><text string=" &gt;&gt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu3b"><text string="/"><color red="0.81" green="0.8" blue="0.79" /></text></element>
+
 	<element name="text_uiu3a" defstate="0">
 		<simplecounter maxstate="999" digits="1" align="2">
 			<color red="0.81" green="0.8" blue="0.79" />
 		</simplecounter>
 	</element>
-	<element name="text_uiu3b"><text string="/"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uiu3c" defstate="0">
 		<simplecounter maxstate="999" digits="1" align="1">
 			<color red="0.81" green="0.8" blue="0.79" />
diff --git a/src/mame/layout/fidel_gambit.lay b/src/mame/layout/fidel_gambit.lay
index 03fc27f1aa9..f9370079f4c 100644
--- a/src/mame/layout/fidel_gambit.lay
+++ b/src/mame/layout/fidel_gambit.lay
@@ -32,137 +32,41 @@ license:CC0-1.0
 		</rect>
 	</element>
 
-	<element name="text_1">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="1" align="2"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_2">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="2" align="2"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_3">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="3" align="2"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_4">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="4" align="2"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_5">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="5" align="2"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_6">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="6" align="2"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_7">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="7" align="2"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_8">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="8" align="2"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-
-	<element name="text_a">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="A"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_b">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="B"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_c">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="C"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_d">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="D"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_e">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="E"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_f">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="F"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_g">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="G"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_h">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="H"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-
-	<element name="text_lb">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="CHECK"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_lc">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="MATE"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_ld">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="WHITE"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_le">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="BLACK"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_lf">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="I LOSE"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-
-	<element name="text_t81">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="NEW"><color red="0.17" green="0.15" blue="0.15" /></text>
-	</element>
-	<element name="text_t82">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="GAME"><color red="0.17" green="0.15" blue="0.15" /></text>
-	</element>
-	<element name="text_t7">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="CLEAR"><color red="0.17" green="0.15" blue="0.15" /></text>
-	</element>
-	<element name="text_t6">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="PROBLEM"><color red="0.17" green="0.15" blue="0.15" /></text>
-	</element>
-	<element name="text_t5">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="VERIFY"><color red="0.17" green="0.15" blue="0.15" /></text>
-	</element>
-	<element name="text_t4">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="LEVEL"><color red="0.17" green="0.15" blue="0.15" /></text>
-	</element>
-	<element name="text_t3">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string=" "><color red="0.17" green="0.15" blue="0.15" /></text>
-	</element>
-	<element name="text_t31">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="TAKE"><color red="0.17" green="0.15" blue="0.15" /></text>
-	</element>
-	<element name="text_t32">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="BACK"><color red="0.17" green="0.15" blue="0.15" /></text>
-	</element>
-	<element name="text_t2">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="HINT"><color red="0.17" green="0.15" blue="0.15" /></text>
-	</element>
-	<element name="text_t1">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="MOVE"><color red="0.17" green="0.15" blue="0.15" /></text>
-	</element>
+	<element name="text_1"><text string="1" align="2"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_2"><text string="2" align="2"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_3"><text string="3" align="2"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_4"><text string="4" align="2"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_5"><text string="5" align="2"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_6"><text string="6" align="2"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_7"><text string="7" align="2"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_8"><text string="8" align="2"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+
+	<element name="text_a"><text string="A"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_b"><text string="B"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_c"><text string="C"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_d"><text string="D"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_e"><text string="E"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_f"><text string="F"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_g"><text string="G"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_h"><text string="H"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+
+	<element name="text_lb"><text string="CHECK"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_lc"><text string="MATE"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_ld"><text string="WHITE"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_le"><text string="BLACK"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_lf"><text string="I LOSE"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+
+	<element name="text_t81"><text string="NEW"><color red="0.17" green="0.15" blue="0.15" /></text></element>
+	<element name="text_t82"><text string="GAME"><color red="0.17" green="0.15" blue="0.15" /></text></element>
+	<element name="text_t7"><text string="CLEAR"><color red="0.17" green="0.15" blue="0.15" /></text></element>
+	<element name="text_t6"><text string="PROBLEM"><color red="0.17" green="0.15" blue="0.15" /></text></element>
+	<element name="text_t5"><text string="VERIFY"><color red="0.17" green="0.15" blue="0.15" /></text></element>
+	<element name="text_t4"><text string="LEVEL"><color red="0.17" green="0.15" blue="0.15" /></text></element>
+	<element name="text_t3"><text string=" "><color red="0.17" green="0.15" blue="0.15" /></text></element>
+	<element name="text_t31"><text string="TAKE"><color red="0.17" green="0.15" blue="0.15" /></text></element>
+	<element name="text_t32"><text string="BACK"><color red="0.17" green="0.15" blue="0.15" /></text></element>
+	<element name="text_t2"><text string="HINT"><color red="0.17" green="0.15" blue="0.15" /></text></element>
+	<element name="text_t1"><text string="MOVE"><color red="0.17" green="0.15" blue="0.15" /></text></element>
 
 	<element name="text_p1"><image file="chess/wk.svg" /></element>
 	<element name="text_p2"><image file="chess/wq.svg" /></element>
@@ -327,43 +231,23 @@ license:CC0-1.0
 	<element name="text_uit1"><text string="S.BOARD"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uit2"><text string="INTERFACE"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uib1"><text string="BOARD:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uib2">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="RESET"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uib3">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="CLEAR"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uib2"><text string="RESET"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uib3"><text string="CLEAR"><color red="0.01" green="0.01" blue="0.01" /></text></element>
 	<element name="text_uis1"><text string="SPAWN:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uih1"><text string="HAND:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uih2">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="REMOVE"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uih2"><text string="REMOVE"><color red="0.01" green="0.01" blue="0.01" /></text></element>
 	<element name="text_uiu1"><text string="UNDO:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uiu2a">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string=" &lt;&lt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2b">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string=" &lt;  "><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2c">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="   &gt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2d">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string=" &gt;&gt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uiu2a"><text string=" &lt;&lt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2b"><text string=" &lt;  "><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2c"><text string="   &gt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2d"><text string=" &gt;&gt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu3b"><text string="/"><color red="0.81" green="0.8" blue="0.79" /></text></element>
+
 	<element name="text_uiu3a" defstate="0">
 		<simplecounter maxstate="999" digits="1" align="2">
 			<color red="0.81" green="0.8" blue="0.79" />
 		</simplecounter>
 	</element>
-	<element name="text_uiu3b"><text string="/"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uiu3c" defstate="0">
 		<simplecounter maxstate="999" digits="1" align="1">
 			<color red="0.81" green="0.8" blue="0.79" />
diff --git a/src/mame/layout/fidel_gin.lay b/src/mame/layout/fidel_gin.lay
index 2f0abfd9a6b..66c1a62bd3f 100644
--- a/src/mame/layout/fidel_gin.lay
+++ b/src/mame/layout/fidel_gin.lay
@@ -72,137 +72,41 @@ license:CC0-1.0
 		<text string=" "><color red="0.0" green="0.0" blue="0.0" /></text>
 	</element>
 
-	<element name="cba">
-		<rect><color red="0.9" green="0.9" blue="0.9" /></rect>
-		<text string="A" align="1"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="cb2">
-		<rect><color red="0.9" green="0.9" blue="0.9" /></rect>
-		<text string="2" align="1"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="cb3">
-		<rect><color red="0.9" green="0.9" blue="0.9" /></rect>
-		<text string="3" align="1"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="cb4">
-		<rect><color red="0.9" green="0.9" blue="0.9" /></rect>
-		<text string="4" align="1"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="cb5">
-		<rect><color red="0.9" green="0.9" blue="0.9" /></rect>
-		<text string="5" align="1"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="cb6">
-		<rect><color red="0.9" green="0.9" blue="0.9" /></rect>
-		<text string="6" align="1"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="cb7">
-		<rect><color red="0.9" green="0.9" blue="0.9" /></rect>
-		<text string="7" align="1"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="cb8">
-		<rect><color red="0.9" green="0.9" blue="0.9" /></rect>
-		<text string="8" align="1"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="cb9">
-		<rect><color red="0.9" green="0.9" blue="0.9" /></rect>
-		<text string="9" align="1"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="cb0">
-		<rect><color red="0.9" green="0.9" blue="0.9" /></rect>
-		<text string="10" align="1"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="cbj">
-		<rect><color red="0.9" green="0.9" blue="0.9" /></rect>
-		<text string="J" align="1"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="cbq">
-		<rect><color red="0.9" green="0.9" blue="0.9" /></rect>
-		<text string="Q" align="1"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="cbk">
-		<rect><color red="0.9" green="0.9" blue="0.9" /></rect>
-		<text string="K" align="1"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-
-	<element name="cra">
-		<rect><color red="0.9" green="0.9" blue="0.9" /></rect>
-		<text string="A" align="1"><color red="0.8" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="cr2">
-		<rect><color red="0.9" green="0.9" blue="0.9" /></rect>
-		<text string="2" align="1"><color red="0.8" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="cr3">
-		<rect><color red="0.9" green="0.9" blue="0.9" /></rect>
-		<text string="3" align="1"><color red="0.8" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="cr4">
-		<rect><color red="0.9" green="0.9" blue="0.9" /></rect>
-		<text string="4" align="1"><color red="0.8" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="cr5">
-		<rect><color red="0.9" green="0.9" blue="0.9" /></rect>
-		<text string="5" align="1"><color red="0.8" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="cr6">
-		<rect><color red="0.9" green="0.9" blue="0.9" /></rect>
-		<text string="6" align="1"><color red="0.8" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="cr7">
-		<rect><color red="0.9" green="0.9" blue="0.9" /></rect>
-		<text string="7" align="1"><color red="0.8" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="cr8">
-		<rect><color red="0.9" green="0.9" blue="0.9" /></rect>
-		<text string="8" align="1"><color red="0.8" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="cr9">
-		<rect><color red="0.9" green="0.9" blue="0.9" /></rect>
-		<text string="9" align="1"><color red="0.8" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="cr0">
-		<rect><color red="0.9" green="0.9" blue="0.9" /></rect>
-		<text string="10" align="1"><color red="0.8" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="crj">
-		<rect><color red="0.9" green="0.9" blue="0.9" /></rect>
-		<text string="J" align="1"><color red="0.8" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="crq">
-		<rect><color red="0.9" green="0.9" blue="0.9" /></rect>
-		<text string="Q" align="1"><color red="0.8" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="crk">
-		<rect><color red="0.9" green="0.9" blue="0.9" /></rect>
-		<text string="K" align="1"><color red="0.8" green="0.1" blue="0.1" /></text>
-	</element>
-
-	<element name="csh">
-		<rect><color red="0.9" green="0.9" blue="0.9" /></rect>
-		<text align="2" string="&#x2665;"><color red="0.8" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="csd">
-		<rect><color red="0.9" green="0.9" blue="0.9" /></rect>
-		<text align="2" string="&#x2666;"><color red="0.8" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="csc">
-		<rect><color red="0.9" green="0.9" blue="0.9" /></rect>
-		<text align="2" string="&#x2663;"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="css">
-		<rect><color red="0.9" green="0.9" blue="0.9" /></rect>
-		<text align="2" string="&#x2660;"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-
-	<element name="cbjk">
-		<rect><color red="0.9" green="0.9" blue="0.9" /></rect>
-		<text string="&#x263a;"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="crjk">
-		<rect><color red="0.9" green="0.9" blue="0.9" /></rect>
-		<text string="&#x263a;"><color red="0.8" green="0.1" blue="0.1" /></text>
-	</element>
+	<element name="cba"><text string="A" align="1"><color red="0.1" green="0.1" blue="0.1" /></text></element>
+	<element name="cb2"><text string="2" align="1"><color red="0.1" green="0.1" blue="0.1" /></text></element>
+	<element name="cb3"><text string="3" align="1"><color red="0.1" green="0.1" blue="0.1" /></text></element>
+	<element name="cb4"><text string="4" align="1"><color red="0.1" green="0.1" blue="0.1" /></text></element>
+	<element name="cb5"><text string="5" align="1"><color red="0.1" green="0.1" blue="0.1" /></text></element>
+	<element name="cb6"><text string="6" align="1"><color red="0.1" green="0.1" blue="0.1" /></text></element>
+	<element name="cb7"><text string="7" align="1"><color red="0.1" green="0.1" blue="0.1" /></text></element>
+	<element name="cb8"><text string="8" align="1"><color red="0.1" green="0.1" blue="0.1" /></text></element>
+	<element name="cb9"><text string="9" align="1"><color red="0.1" green="0.1" blue="0.1" /></text></element>
+	<element name="cb0"><text string="10" align="1"><color red="0.1" green="0.1" blue="0.1" /></text></element>
+	<element name="cbj"><text string="J" align="1"><color red="0.1" green="0.1" blue="0.1" /></text></element>
+	<element name="cbq"><text string="Q" align="1"><color red="0.1" green="0.1" blue="0.1" /></text></element>
+	<element name="cbk"><text string="K" align="1"><color red="0.1" green="0.1" blue="0.1" /></text></element>
+
+	<element name="cra"><text string="A" align="1"><color red="0.8" green="0.1" blue="0.1" /></text></element>
+	<element name="cr2"><text string="2" align="1"><color red="0.8" green="0.1" blue="0.1" /></text></element>
+	<element name="cr3"><text string="3" align="1"><color red="0.8" green="0.1" blue="0.1" /></text></element>
+	<element name="cr4"><text string="4" align="1"><color red="0.8" green="0.1" blue="0.1" /></text></element>
+	<element name="cr5"><text string="5" align="1"><color red="0.8" green="0.1" blue="0.1" /></text></element>
+	<element name="cr6"><text string="6" align="1"><color red="0.8" green="0.1" blue="0.1" /></text></element>
+	<element name="cr7"><text string="7" align="1"><color red="0.8" green="0.1" blue="0.1" /></text></element>
+	<element name="cr8"><text string="8" align="1"><color red="0.8" green="0.1" blue="0.1" /></text></element>
+	<element name="cr9"><text string="9" align="1"><color red="0.8" green="0.1" blue="0.1" /></text></element>
+	<element name="cr0"><text string="10" align="1"><color red="0.8" green="0.1" blue="0.1" /></text></element>
+	<element name="crj"><text string="J" align="1"><color red="0.8" green="0.1" blue="0.1" /></text></element>
+	<element name="crq"><text string="Q" align="1"><color red="0.8" green="0.1" blue="0.1" /></text></element>
+	<element name="crk"><text string="K" align="1"><color red="0.8" green="0.1" blue="0.1" /></text></element>
+
+	<element name="csh"><text align="2" string="&#x2665;"><color red="0.8" green="0.1" blue="0.1" /></text></element>
+	<element name="csd"><text align="2" string="&#x2666;"><color red="0.8" green="0.1" blue="0.1" /></text></element>
+	<element name="csc"><text align="2" string="&#x2663;"><color red="0.1" green="0.1" blue="0.1" /></text></element>
+	<element name="css"><text align="2" string="&#x2660;"><color red="0.1" green="0.1" blue="0.1" /></text></element>
+
+	<element name="cbjk"><text string="&#x263a;"><color red="0.1" green="0.1" blue="0.1" /></text></element>
+	<element name="crjk"><text string="&#x263a;"><color red="0.8" green="0.1" blue="0.1" /></text></element>
 
 
 <!-- build screen -->
diff --git a/src/mame/layout/fidel_msc_v1.lay b/src/mame/layout/fidel_msc_v1.lay
index 4bf12631cec..6810ae0d5e9 100644
--- a/src/mame/layout/fidel_msc_v1.lay
+++ b/src/mame/layout/fidel_msc_v1.lay
@@ -27,71 +27,23 @@ license:CC0-1.0
 		</disk>
 	</element>
 
-	<element name="text_1">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="1"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_2">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="2"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_3">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="3"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_4">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="4"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_5">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="5"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_6">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="6"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_7">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="7"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_8">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="8"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-
-	<element name="text_a">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="A"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_b">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="B"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_c">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="C"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_d">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="D"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_e">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="E"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_f">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="F"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_g">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="G"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_h">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="H"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_1"><text string="1"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_2"><text string="2"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_3"><text string="3"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_4"><text string="4"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_5"><text string="5"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_6"><text string="6"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_7"><text string="7"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_8"><text string="8"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+
+	<element name="text_a"><text string="A"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_b"><text string="B"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_c"><text string="C"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_d"><text string="D"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_e"><text string="E"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_f"><text string="F"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_g"><text string="G"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_h"><text string="H"><color red="0.01" green="0.01" blue="0.01" /></text></element>
 
 	<!-- generic speaker icon, (C) Mobius, public domain -->
 	<element name="speaker">
@@ -103,43 +55,16 @@ license:CC0-1.0
 		]]></data></image>
 	</element>
 
-	<element name="text_re">
-		<disk><color red="0.81" green="0.8" blue="0.79" /></disk>
-		<text string="RE"><color red="0.15" green="0.15" blue="0.15" /></text>
-	</element>
-	<element name="text_cl">
-		<disk><color red="0.81" green="0.8" blue="0.79" /></disk>
-		<text string="CL"><color red="0.15" green="0.15" blue="0.15" /></text>
-	</element>
-	<element name="text_pb">
-		<disk><color red="0.81" green="0.8" blue="0.79" /></disk>
-		<text string="PB"><color red="0.15" green="0.15" blue="0.15" /></text>
-	</element>
-	<element name="text_pv">
-		<disk><color red="0.81" green="0.8" blue="0.79" /></disk>
-		<text string="PV"><color red="0.15" green="0.15" blue="0.15" /></text>
-	</element>
-	<element name="text_lv">
-		<disk><color red="0.81" green="0.8" blue="0.79" /></disk>
-		<text string="LV"><color red="0.15" green="0.15" blue="0.15" /></text>
-	</element>
-	<element name="text_dm">
-		<disk><color red="0.81" green="0.8" blue="0.79" /></disk>
-		<text string="DM"><color red="0.15" green="0.15" blue="0.15" /></text>
-	</element>
-	<element name="text_rv">
-		<disk><color red="0.81" green="0.8" blue="0.79" /></disk>
-		<text string="RV"><color red="0.15" green="0.15" blue="0.15" /></text>
-	</element>
+	<element name="text_re"><text string="RE"><color red="0.15" green="0.15" blue="0.15" /></text></element>
+	<element name="text_cl"><text string="CL"><color red="0.15" green="0.15" blue="0.15" /></text></element>
+	<element name="text_pb"><text string="PB"><color red="0.15" green="0.15" blue="0.15" /></text></element>
+	<element name="text_pv"><text string="PV"><color red="0.15" green="0.15" blue="0.15" /></text></element>
+	<element name="text_lv"><text string="LV"><color red="0.15" green="0.15" blue="0.15" /></text></element>
+	<element name="text_dm"><text string="DM"><color red="0.15" green="0.15" blue="0.15" /></text></element>
+	<element name="text_rv"><text string="RV"><color red="0.15" green="0.15" blue="0.15" /></text></element>
 
-	<element name="text_lose">
-		<disk><color red="0.81" green="0.8" blue="0.79" /></disk>
-		<text string="I LOSE"><color red="0.15" green="0.15" blue="0.15" /></text>
-	</element>
-	<element name="text_check">
-		<disk><color red="0.81" green="0.8" blue="0.79" /></disk>
-		<text string="CHECK"><color red="0.15" green="0.15" blue="0.15" /></text>
-	</element>
+	<element name="text_lose"><text string="I LOSE"><color red="0.15" green="0.15" blue="0.15" /></text></element>
+	<element name="text_check"><text string="CHECK"><color red="0.15" green="0.15" blue="0.15" /></text></element>
 
 	<element name="text_p1"><rect><color red="1" green="1" blue="1" /></rect><image file="chess/bk.svg" /><rect><color red="1" green="1" blue="1" alpha="0.1875" /></rect></element>
 	<element name="text_p2"><rect><color red="1" green="1" blue="1" /></rect><image file="chess/bq.svg" /><rect><color red="1" green="1" blue="1" alpha="0.1875" /></rect></element>
@@ -304,43 +229,23 @@ license:CC0-1.0
 	<element name="text_uit1"><text string="S.BOARD"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uit2"><text string="INTERFACE"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uib1"><text string="BOARD:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uib2">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="RESET"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uib3">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="CLEAR"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uib2"><text string="RESET"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uib3"><text string="CLEAR"><color red="0.01" green="0.01" blue="0.01" /></text></element>
 	<element name="text_uis1"><text string="SPAWN:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uih1"><text string="HAND:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uih2">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="REMOVE"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uih2"><text string="REMOVE"><color red="0.01" green="0.01" blue="0.01" /></text></element>
 	<element name="text_uiu1"><text string="UNDO:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uiu2a">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string=" &lt;&lt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2b">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string=" &lt;  "><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2c">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="   &gt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2d">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string=" &gt;&gt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uiu2a"><text string=" &lt;&lt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2b"><text string=" &lt;  "><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2c"><text string="   &gt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2d"><text string=" &gt;&gt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu3b"><text string="/"><color red="0.81" green="0.8" blue="0.79" /></text></element>
+
 	<element name="text_uiu3a" defstate="0">
 		<simplecounter maxstate="999" digits="1" align="2">
 			<color red="0.81" green="0.8" blue="0.79" />
 		</simplecounter>
 	</element>
-	<element name="text_uiu3b"><text string="/"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uiu3c" defstate="0">
 		<simplecounter maxstate="999" digits="1" align="1">
 			<color red="0.81" green="0.8" blue="0.79" />
diff --git a/src/mame/layout/fidel_msc_v2.lay b/src/mame/layout/fidel_msc_v2.lay
index 4bf12631cec..6810ae0d5e9 100644
--- a/src/mame/layout/fidel_msc_v2.lay
+++ b/src/mame/layout/fidel_msc_v2.lay
@@ -27,71 +27,23 @@ license:CC0-1.0
 		</disk>
 	</element>
 
-	<element name="text_1">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="1"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_2">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="2"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_3">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="3"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_4">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="4"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_5">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="5"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_6">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="6"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_7">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="7"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_8">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="8"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-
-	<element name="text_a">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="A"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_b">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="B"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_c">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="C"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_d">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="D"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_e">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="E"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_f">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="F"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_g">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="G"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_h">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="H"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_1"><text string="1"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_2"><text string="2"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_3"><text string="3"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_4"><text string="4"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_5"><text string="5"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_6"><text string="6"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_7"><text string="7"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_8"><text string="8"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+
+	<element name="text_a"><text string="A"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_b"><text string="B"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_c"><text string="C"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_d"><text string="D"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_e"><text string="E"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_f"><text string="F"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_g"><text string="G"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_h"><text string="H"><color red="0.01" green="0.01" blue="0.01" /></text></element>
 
 	<!-- generic speaker icon, (C) Mobius, public domain -->
 	<element name="speaker">
@@ -103,43 +55,16 @@ license:CC0-1.0
 		]]></data></image>
 	</element>
 
-	<element name="text_re">
-		<disk><color red="0.81" green="0.8" blue="0.79" /></disk>
-		<text string="RE"><color red="0.15" green="0.15" blue="0.15" /></text>
-	</element>
-	<element name="text_cl">
-		<disk><color red="0.81" green="0.8" blue="0.79" /></disk>
-		<text string="CL"><color red="0.15" green="0.15" blue="0.15" /></text>
-	</element>
-	<element name="text_pb">
-		<disk><color red="0.81" green="0.8" blue="0.79" /></disk>
-		<text string="PB"><color red="0.15" green="0.15" blue="0.15" /></text>
-	</element>
-	<element name="text_pv">
-		<disk><color red="0.81" green="0.8" blue="0.79" /></disk>
-		<text string="PV"><color red="0.15" green="0.15" blue="0.15" /></text>
-	</element>
-	<element name="text_lv">
-		<disk><color red="0.81" green="0.8" blue="0.79" /></disk>
-		<text string="LV"><color red="0.15" green="0.15" blue="0.15" /></text>
-	</element>
-	<element name="text_dm">
-		<disk><color red="0.81" green="0.8" blue="0.79" /></disk>
-		<text string="DM"><color red="0.15" green="0.15" blue="0.15" /></text>
-	</element>
-	<element name="text_rv">
-		<disk><color red="0.81" green="0.8" blue="0.79" /></disk>
-		<text string="RV"><color red="0.15" green="0.15" blue="0.15" /></text>
-	</element>
+	<element name="text_re"><text string="RE"><color red="0.15" green="0.15" blue="0.15" /></text></element>
+	<element name="text_cl"><text string="CL"><color red="0.15" green="0.15" blue="0.15" /></text></element>
+	<element name="text_pb"><text string="PB"><color red="0.15" green="0.15" blue="0.15" /></text></element>
+	<element name="text_pv"><text string="PV"><color red="0.15" green="0.15" blue="0.15" /></text></element>
+	<element name="text_lv"><text string="LV"><color red="0.15" green="0.15" blue="0.15" /></text></element>
+	<element name="text_dm"><text string="DM"><color red="0.15" green="0.15" blue="0.15" /></text></element>
+	<element name="text_rv"><text string="RV"><color red="0.15" green="0.15" blue="0.15" /></text></element>
 
-	<element name="text_lose">
-		<disk><color red="0.81" green="0.8" blue="0.79" /></disk>
-		<text string="I LOSE"><color red="0.15" green="0.15" blue="0.15" /></text>
-	</element>
-	<element name="text_check">
-		<disk><color red="0.81" green="0.8" blue="0.79" /></disk>
-		<text string="CHECK"><color red="0.15" green="0.15" blue="0.15" /></text>
-	</element>
+	<element name="text_lose"><text string="I LOSE"><color red="0.15" green="0.15" blue="0.15" /></text></element>
+	<element name="text_check"><text string="CHECK"><color red="0.15" green="0.15" blue="0.15" /></text></element>
 
 	<element name="text_p1"><rect><color red="1" green="1" blue="1" /></rect><image file="chess/bk.svg" /><rect><color red="1" green="1" blue="1" alpha="0.1875" /></rect></element>
 	<element name="text_p2"><rect><color red="1" green="1" blue="1" /></rect><image file="chess/bq.svg" /><rect><color red="1" green="1" blue="1" alpha="0.1875" /></rect></element>
@@ -304,43 +229,23 @@ license:CC0-1.0
 	<element name="text_uit1"><text string="S.BOARD"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uit2"><text string="INTERFACE"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uib1"><text string="BOARD:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uib2">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="RESET"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uib3">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="CLEAR"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uib2"><text string="RESET"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uib3"><text string="CLEAR"><color red="0.01" green="0.01" blue="0.01" /></text></element>
 	<element name="text_uis1"><text string="SPAWN:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uih1"><text string="HAND:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uih2">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="REMOVE"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uih2"><text string="REMOVE"><color red="0.01" green="0.01" blue="0.01" /></text></element>
 	<element name="text_uiu1"><text string="UNDO:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uiu2a">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string=" &lt;&lt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2b">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string=" &lt;  "><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2c">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="   &gt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2d">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string=" &gt;&gt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uiu2a"><text string=" &lt;&lt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2b"><text string=" &lt;  "><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2c"><text string="   &gt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2d"><text string=" &gt;&gt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu3b"><text string="/"><color red="0.81" green="0.8" blue="0.79" /></text></element>
+
 	<element name="text_uiu3a" defstate="0">
 		<simplecounter maxstate="999" digits="1" align="2">
 			<color red="0.81" green="0.8" blue="0.79" />
 		</simplecounter>
 	</element>
-	<element name="text_uiu3b"><text string="/"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uiu3c" defstate="0">
 		<simplecounter maxstate="999" digits="1" align="1">
 			<color red="0.81" green="0.8" blue="0.79" />
diff --git a/src/mame/layout/fidel_pc.lay b/src/mame/layout/fidel_pc.lay
index 4a721c7ec10..038dcb61f5d 100644
--- a/src/mame/layout/fidel_pc.lay
+++ b/src/mame/layout/fidel_pc.lay
@@ -31,71 +31,23 @@ license:CC0-1.0
 		<disk state="1"><color red="0.34" green="0.3" blue="0.3" /></disk>
 	</element>
 
-	<element name="text_1">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="1"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_2">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="2"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_3">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="3"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_4">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="4"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_5">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="5"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_6">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="6"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_7">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="7"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_8">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="8"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-
-	<element name="text_a">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="A"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_b">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="B"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_c">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="C"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_d">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="D"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_e">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="E"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_f">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="F"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_g">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="G"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_h">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="H"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
+	<element name="text_1"><text string="1"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_2"><text string="2"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_3"><text string="3"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_4"><text string="4"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_5"><text string="5"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_6"><text string="6"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_7"><text string="7"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_8"><text string="8"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+
+	<element name="text_a"><text string="A"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_b"><text string="B"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_c"><text string="C"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_d"><text string="D"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_e"><text string="E"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_f"><text string="F"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_g"><text string="G"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_h"><text string="H"><color red="0.87" green="0.87" blue="0.84" /></text></element>
 
 	<element name="text_p1"><image file="chess/wk.svg"><color alpha="0.79" /></image></element>
 	<element name="text_p2"><image file="chess/wq.svg"><color alpha="0.79" /></image></element>
@@ -296,43 +248,23 @@ license:CC0-1.0
 	<element name="text_uit1"><text string="S.BOARD"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uit2"><text string="INTERFACE"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uib1"><text string="BOARD:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uib2">
-		<rect><color red="0.84" green="0.75" blue="0.50" /></rect>
-		<text string="RESET"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uib3">
-		<rect><color red="0.84" green="0.75" blue="0.50" /></rect>
-		<text string="CLEAR"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uib2"><text string="RESET"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uib3"><text string="CLEAR"><color red="0.01" green="0.01" blue="0.01" /></text></element>
 	<element name="text_uis1"><text string="SPAWN:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uih1"><text string="HAND:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uih2">
-		<rect><color red="0.84" green="0.75" blue="0.50" /></rect>
-		<text string="REMOVE"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uih2"><text string="REMOVE"><color red="0.01" green="0.01" blue="0.01" /></text></element>
 	<element name="text_uiu1"><text string="UNDO:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uiu2a">
-		<rect><color red="0.84" green="0.75" blue="0.50" /></rect>
-		<text string=" &lt;&lt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2b">
-		<rect><color red="0.84" green="0.75" blue="0.50" /></rect>
-		<text string=" &lt;  "><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2c">
-		<rect><color red="0.84" green="0.75" blue="0.50" /></rect>
-		<text string="   &gt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2d">
-		<rect><color red="0.84" green="0.75" blue="0.50" /></rect>
-		<text string=" &gt;&gt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uiu2a"><text string=" &lt;&lt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2b"><text string=" &lt;  "><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2c"><text string="   &gt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2d"><text string=" &gt;&gt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu3b"><text string="/"><color red="0.81" green="0.8" blue="0.79" /></text></element>
+
 	<element name="text_uiu3a" defstate="0">
 		<simplecounter maxstate="999" digits="1" align="2">
 			<color red="0.81" green="0.8" blue="0.79" />
 		</simplecounter>
 	</element>
-	<element name="text_uiu3b"><text string="/"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uiu3c" defstate="0">
 		<simplecounter maxstate="999" digits="1" align="1">
 			<color red="0.81" green="0.8" blue="0.79" />
diff --git a/src/mame/layout/fidel_phantom.lay b/src/mame/layout/fidel_phantom.lay
index 8e868935dd9..52821919a97 100644
--- a/src/mame/layout/fidel_phantom.lay
+++ b/src/mame/layout/fidel_phantom.lay
@@ -50,156 +50,51 @@ license:CC0-1.0
 		</disk>
 	</element>
 
-	<element name="text_1">
-		<rect><color red="0.209" green="0.209" blue="0.201" /></rect>
-		<text string="1"><color red="0.843" green="0.678" blue="0.482" /></text>
-	</element>
-	<element name="text_2">
-		<rect><color red="0.843" green="0.678" blue="0.482" /></rect>
-		<text string="2"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_3">
-		<rect><color red="0.209" green="0.209" blue="0.201" /></rect>
-		<text string="3"><color red="0.843" green="0.678" blue="0.482" /></text>
-	</element>
-	<element name="text_4">
-		<rect><color red="0.843" green="0.678" blue="0.482" /></rect>
-		<text string="4"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_5">
-		<rect><color red="0.209" green="0.209" blue="0.201" /></rect>
-		<text string="5"><color red="0.843" green="0.678" blue="0.482" /></text>
-	</element>
-	<element name="text_6">
-		<rect><color red="0.843" green="0.678" blue="0.482" /></rect>
-		<text string="6"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_7">
-		<rect><color red="0.209" green="0.209" blue="0.201" /></rect>
-		<text string="7"><color red="0.843" green="0.678" blue="0.482" /></text>
-	</element>
-	<element name="text_8">
-		<rect><color red="0.843" green="0.678" blue="0.482" /></rect>
-		<text string="8"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-
-	<element name="text_a">
-		<rect><color red="0.209" green="0.209" blue="0.201" /></rect>
-		<text string="A"><color red="0.843" green="0.678" blue="0.482" /></text>
-	</element>
-	<element name="text_b">
-		<rect><color red="0.843" green="0.678" blue="0.482" /></rect>
-		<text string="B"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_c">
-		<rect><color red="0.209" green="0.209" blue="0.201" /></rect>
-		<text string="C"><color red="0.843" green="0.678" blue="0.482" /></text>
-	</element>
-	<element name="text_d">
-		<rect><color red="0.843" green="0.678" blue="0.482" /></rect>
-		<text string="D"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_e">
-		<rect><color red="0.209" green="0.209" blue="0.201" /></rect>
-		<text string="E"><color red="0.843" green="0.678" blue="0.482" /></text>
-	</element>
-	<element name="text_f">
-		<rect><color red="0.843" green="0.678" blue="0.482" /></rect>
-		<text string="F"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_g">
-		<rect><color red="0.209" green="0.209" blue="0.201" /></rect>
-		<text string="G"><color red="0.843" green="0.678" blue="0.482" /></text>
-	</element>
-	<element name="text_h">
-		<rect><color red="0.843" green="0.678" blue="0.482" /></rect>
-		<text string="H"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-
-	<element name="text_white">
-		<rect><color red="0.17" green="0.15" blue="0.15" /></rect>
-		<text string="WHITE"><color red="0.99" green="0.99" blue="0.99" /></text>
-	</element>
-	<element name="text_black">
-		<rect><color red="0.17" green="0.15" blue="0.15" /></rect>
-		<text string="BLACK"><color red="0.99" green="0.99" blue="0.99" /></text>
-	</element>
-	<element name="text_u1">
-		<rect><color red="0.843" green="0.678" blue="0.482" /></rect>
-		<text string="VERIFY"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_u2">
-		<rect><color red="0.843" green="0.678" blue="0.482" /></rect>
-		<text string="OPTION"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_u3">
-		<rect><color red="0.843" green="0.678" blue="0.482" /></rect>
-		<text string="LEVEL"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_u4">
-		<rect><color red="0.843" green="0.678" blue="0.482" /></rect>
-		<text string="TAKE BACK"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_u5">
-		<rect><color red="0.843" green="0.678" blue="0.482" /></rect>
-		<text string="HINT"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_u6">
-		<rect><color red="0.843" green="0.678" blue="0.482" /></rect>
-		<text string="MOVE"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_u7">
-		<rect><color red="0.843" green="0.678" blue="0.482" /></rect>
-		<text string="AUTO"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_u8">
-		<rect><color red="0.843" green="0.678" blue="0.482" /></rect>
-		<text string="CLEAR"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-
-	<element name="text_shift">
-		<rect><color red="0.843" green="0.678" blue="0.482" /></rect>
-		<text string="SHIFT"><color red="0.81" green="0.3" blue="0.29" /></text>
-	</element>
-	<element name="text_s1">
-		<rect><color red="0.843" green="0.678" blue="0.482" /></rect>
-		<text string="PROBLEM"><color red="0.81" green="0.3" blue="0.29" /></text>
-	</element>
-	<element name="text_s2">
-		<rect><color red="0.843" green="0.678" blue="0.482" /></rect>
-		<text string="TIME"><color red="0.81" green="0.3" blue="0.29" /></text>
-	</element>
-	<element name="text_s3">
-		<rect><color red="0.843" green="0.678" blue="0.482" /></rect>
-		<text string="NEW"><color red="0.81" green="0.3" blue="0.29" /></text>
-	</element>
-	<element name="text_s4">
-		<rect><color red="0.843" green="0.678" blue="0.482" /></rect>
-		<text string="REPLAY"><color red="0.81" green="0.3" blue="0.29" /></text>
-	</element>
-	<element name="text_s5">
-		<rect><color red="0.843" green="0.678" blue="0.482" /></rect>
-		<text string="INFO"><color red="0.81" green="0.3" blue="0.29" /></text>
-	</element>
-	<element name="text_s6">
-		<rect><color red="0.843" green="0.678" blue="0.482" /></rect>
-		<text string="ALTERNATE"><color red="0.81" green="0.3" blue="0.29" /></text>
-	</element>
-	<element name="text_s7">
-		<rect><color red="0.843" green="0.678" blue="0.482" /></rect>
-		<text string="STOP"><color red="0.81" green="0.3" blue="0.29" /></text>
-	</element>
-	<element name="text_s8">
-		<rect><color red="0.843" green="0.678" blue="0.482" /></rect>
-		<text string="CLEAR"><color red="0.81" green="0.3" blue="0.29" /></text>
-	</element>
-
-	<element name="text_p1">      <image file="chess/wk.svg"/></element>
-	<element name="text_p2">      <image file="chess/wq.svg"/></element>
-	<element name="text_p3">      <image file="chess/wr.svg"/></element>
-	<element name="text_p4">      <image file="chess/wb.svg"/></element>
-	<element name="text_p5">      <image file="chess/wn.svg"/></element>
-	<element name="text_p6">      <image file="chess/wp.svg"/></element>
+	<element name="text_1"><text string="1"><color red="0.843" green="0.678" blue="0.482" /></text></element>
+	<element name="text_2"><text string="2"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_3"><text string="3"><color red="0.843" green="0.678" blue="0.482" /></text></element>
+	<element name="text_4"><text string="4"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_5"><text string="5"><color red="0.843" green="0.678" blue="0.482" /></text></element>
+	<element name="text_6"><text string="6"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_7"><text string="7"><color red="0.843" green="0.678" blue="0.482" /></text></element>
+	<element name="text_8"><text string="8"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+
+	<element name="text_a"><text string="A"><color red="0.843" green="0.678" blue="0.482" /></text></element>
+	<element name="text_b"><text string="B"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_c"><text string="C"><color red="0.843" green="0.678" blue="0.482" /></text></element>
+	<element name="text_d"><text string="D"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_e"><text string="E"><color red="0.843" green="0.678" blue="0.482" /></text></element>
+	<element name="text_f"><text string="F"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_g"><text string="G"><color red="0.843" green="0.678" blue="0.482" /></text></element>
+	<element name="text_h"><text string="H"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+
+	<element name="text_white"><text string="WHITE"><color red="0.99" green="0.99" blue="0.99" /></text></element>
+	<element name="text_black"><text string="BLACK"><color red="0.99" green="0.99" blue="0.99" /></text></element>
+	<element name="text_u1"><text string="VERIFY"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_u2"><text string="OPTION"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_u3"><text string="LEVEL"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_u4"><text string="TAKE BACK"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_u5"><text string="HINT"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_u6"><text string="MOVE"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_u7"><text string="AUTO"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_u8"><text string="CLEAR"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+
+	<element name="text_shift"><text string="SHIFT"><color red="0.81" green="0.3" blue="0.29" /></text></element>
+	<element name="text_s1"><text string="PROBLEM"><color red="0.81" green="0.3" blue="0.29" /></text></element>
+	<element name="text_s2"><text string="TIME"><color red="0.81" green="0.3" blue="0.29" /></text></element>
+	<element name="text_s3"><text string="NEW"><color red="0.81" green="0.3" blue="0.29" /></text></element>
+	<element name="text_s4"><text string="REPLAY"><color red="0.81" green="0.3" blue="0.29" /></text></element>
+	<element name="text_s5"><text string="INFO"><color red="0.81" green="0.3" blue="0.29" /></text></element>
+	<element name="text_s6"><text string="ALTERNATE"><color red="0.81" green="0.3" blue="0.29" /></text></element>
+	<element name="text_s7"><text string="STOP"><color red="0.81" green="0.3" blue="0.29" /></text></element>
+	<element name="text_s8"><text string="CLEAR"><color red="0.81" green="0.3" blue="0.29" /></text></element>
+
+	<element name="text_p1"><image file="chess/wk.svg"/></element>
+	<element name="text_p2"><image file="chess/wq.svg"/></element>
+	<element name="text_p3"><image file="chess/wr.svg"/></element>
+	<element name="text_p4"><image file="chess/wb.svg"/></element>
+	<element name="text_p5"><image file="chess/wn.svg"/></element>
+	<element name="text_p6"><image file="chess/wp.svg"/></element>
 
 
 <!-- sb board -->
@@ -426,43 +321,23 @@ license:CC0-1.0
 	<element name="text_uit1"><text string="S.BOARD"><color red="0.843" green="0.678" blue="0.482" /></text></element>
 	<element name="text_uit2"><text string="INTERFACE"><color red="0.843" green="0.678" blue="0.482" /></text></element>
 	<element name="text_uib1"><text string="BOARD:"><color red="0.843" green="0.678" blue="0.482" /></text></element>
-	<element name="text_uib2">
-		<rect><color red="0.843" green="0.678" blue="0.482" /></rect>
-		<text string="RESET"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uib3">
-		<rect><color red="0.843" green="0.678" blue="0.482" /></rect>
-		<text string="CLEAR"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uib2"><text string="RESET"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uib3"><text string="CLEAR"><color red="0.01" green="0.01" blue="0.01" /></text></element>
 	<element name="text_uis1"><text string="SPAWN:"><color red="0.843" green="0.678" blue="0.482" /></text></element>
 	<element name="text_uih1"><text string="HAND:"><color red="0.843" green="0.678" blue="0.482" /></text></element>
-	<element name="text_uih2">
-		<rect><color red="0.843" green="0.678" blue="0.482" /></rect>
-		<text string="REMOVE"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uih2"><text string="REMOVE"><color red="0.01" green="0.01" blue="0.01" /></text></element>
 	<element name="text_uiu1"><text string="UNDO:"><color red="0.843" green="0.678" blue="0.482" /></text></element>
-	<element name="text_uiu2a">
-		<rect><color red="0.843" green="0.678" blue="0.482" /></rect>
-		<text string=" &lt;&lt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2b">
-		<rect><color red="0.843" green="0.678" blue="0.482" /></rect>
-		<text string=" &lt;  "><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2c">
-		<rect><color red="0.843" green="0.678" blue="0.482" /></rect>
-		<text string="   &gt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2d">
-		<rect><color red="0.843" green="0.678" blue="0.482" /></rect>
-		<text string=" &gt;&gt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uiu2a"><text string=" &lt;&lt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2b"><text string=" &lt;  "><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2c"><text string="   &gt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2d"><text string=" &gt;&gt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu3b"><text string="/"><color red="0.843" green="0.678" blue="0.482" /></text></element>
+
 	<element name="text_uiu3a" defstate="0">
 		<simplecounter maxstate="999" digits="1" align="2">
 			<color red="0.843" green="0.678" blue="0.482" />
 		</simplecounter>
 	</element>
-	<element name="text_uiu3b"><text string="/"><color red="0.843" green="0.678" blue="0.482" /></text></element>
 	<element name="text_uiu3c" defstate="0">
 		<simplecounter maxstate="999" digits="1" align="1">
 			<color red="0.843" green="0.678" blue="0.482" />
diff --git a/src/mame/layout/fidel_playmatic.lay b/src/mame/layout/fidel_playmatic.lay
index 2d3e4472a78..4ed99256552 100644
--- a/src/mame/layout/fidel_playmatic.lay
+++ b/src/mame/layout/fidel_playmatic.lay
@@ -20,71 +20,23 @@ license:CC0-1.0
 		<disk state="1"><color red="0.34" green="0.3" blue="0.3" /></disk>
 	</element>
 
-	<element name="text_1">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="1"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_2">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="2"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_3">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="3"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_4">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="4"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_5">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="5"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_6">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="6"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_7">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="7"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_8">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="8"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-
-	<element name="text_a">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="A"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_b">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="B"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_c">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="C"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_d">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="D"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_e">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="E"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_f">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="F"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_g">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="G"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_h">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="H"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
+	<element name="text_1"><text string="1"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_2"><text string="2"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_3"><text string="3"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_4"><text string="4"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_5"><text string="5"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_6"><text string="6"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_7"><text string="7"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_8"><text string="8"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+
+	<element name="text_a"><text string="A"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_b"><text string="B"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_c"><text string="C"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_d"><text string="D"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_e"><text string="E"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_f"><text string="F"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_g"><text string="G"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_h"><text string="H"><color red="0.87" green="0.87" blue="0.84" /></text></element>
 
 	<element name="text_p1"><image file="chess/wk.svg"><color alpha="0.79" /></image></element>
 	<element name="text_p2"><image file="chess/wq.svg"><color alpha="0.79" /></image></element>
@@ -270,43 +222,23 @@ license:CC0-1.0
 	<element name="text_uit1"><text string="S.BOARD"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uit2"><text string="INTERFACE"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uib1"><text string="BOARD:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uib2">
-		<rect><color red="0.84" green="0.75" blue="0.50" /></rect>
-		<text string="RESET"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uib3">
-		<rect><color red="0.84" green="0.75" blue="0.50" /></rect>
-		<text string="CLEAR"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uib2"><text string="RESET"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uib3"><text string="CLEAR"><color red="0.01" green="0.01" blue="0.01" /></text></element>
 	<element name="text_uis1"><text string="SPAWN:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uih1"><text string="HAND:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uih2">
-		<rect><color red="0.84" green="0.75" blue="0.50" /></rect>
-		<text string="REMOVE"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uih2"><text string="REMOVE"><color red="0.01" green="0.01" blue="0.01" /></text></element>
 	<element name="text_uiu1"><text string="UNDO:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uiu2a">
-		<rect><color red="0.84" green="0.75" blue="0.50" /></rect>
-		<text string=" &lt;&lt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2b">
-		<rect><color red="0.84" green="0.75" blue="0.50" /></rect>
-		<text string=" &lt;  "><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2c">
-		<rect><color red="0.84" green="0.75" blue="0.50" /></rect>
-		<text string="   &gt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2d">
-		<rect><color red="0.84" green="0.75" blue="0.50" /></rect>
-		<text string=" &gt;&gt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uiu2a"><text string=" &lt;&lt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2b"><text string=" &lt;  "><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2c"><text string="   &gt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2d"><text string=" &gt;&gt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu3b"><text string="/"><color red="0.81" green="0.8" blue="0.79" /></text></element>
+
 	<element name="text_uiu3a" defstate="0">
 		<simplecounter maxstate="999" digits="1" align="2">
 			<color red="0.81" green="0.8" blue="0.79" />
 		</simplecounter>
 	</element>
-	<element name="text_uiu3b"><text string="/"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uiu3c" defstate="0">
 		<simplecounter maxstate="999" digits="1" align="1">
 			<color red="0.81" green="0.8" blue="0.79" />
diff --git a/src/mame/layout/fidel_rsc.lay b/src/mame/layout/fidel_rsc.lay
index 7a7dde9eb47..9ad977ef7c4 100644
--- a/src/mame/layout/fidel_rsc.lay
+++ b/src/mame/layout/fidel_rsc.lay
@@ -27,71 +27,23 @@ license:CC0-1.0
 		</disk>
 	</element>
 
-	<element name="text_1">
-		<rect><color red="0.1" green="0.65" blue="0.35" /></rect>
-		<text string="1"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_2">
-		<rect><color red="0.1" green="0.65" blue="0.35" /></rect>
-		<text string="2"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_3">
-		<rect><color red="0.1" green="0.65" blue="0.35" /></rect>
-		<text string="3"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_4">
-		<rect><color red="0.1" green="0.65" blue="0.35" /></rect>
-		<text string="4"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_5">
-		<rect><color red="0.1" green="0.65" blue="0.35" /></rect>
-		<text string="5"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_6">
-		<rect><color red="0.1" green="0.65" blue="0.35" /></rect>
-		<text string="6"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_7">
-		<rect><color red="0.1" green="0.65" blue="0.35" /></rect>
-		<text string="7"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_8">
-		<rect><color red="0.1" green="0.65" blue="0.35" /></rect>
-		<text string="8"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-
-	<element name="text_a">
-		<rect><color red="0.1" green="0.65" blue="0.35" /></rect>
-		<text string="A"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_b">
-		<rect><color red="0.1" green="0.65" blue="0.35" /></rect>
-		<text string="B"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_c">
-		<rect><color red="0.1" green="0.65" blue="0.35" /></rect>
-		<text string="C"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_d">
-		<rect><color red="0.1" green="0.65" blue="0.35" /></rect>
-		<text string="D"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_e">
-		<rect><color red="0.1" green="0.65" blue="0.35" /></rect>
-		<text string="E"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_f">
-		<rect><color red="0.1" green="0.65" blue="0.35" /></rect>
-		<text string="F"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_g">
-		<rect><color red="0.1" green="0.65" blue="0.35" /></rect>
-		<text string="G"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_h">
-		<rect><color red="0.1" green="0.65" blue="0.35" /></rect>
-		<text string="H"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_1"><text string="1"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_2"><text string="2"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_3"><text string="3"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_4"><text string="4"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_5"><text string="5"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_6"><text string="6"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_7"><text string="7"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_8"><text string="8"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+
+	<element name="text_a"><text string="A"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_b"><text string="B"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_c"><text string="C"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_d"><text string="D"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_e"><text string="E"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_f"><text string="F"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_g"><text string="G"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_h"><text string="H"><color red="0.01" green="0.01" blue="0.01" /></text></element>
 
 	<!-- generic speaker icon, (C) Mobius, public domain -->
 	<element name="speaker">
@@ -103,51 +55,18 @@ license:CC0-1.0
 		]]></data></image>
 	</element>
 
-	<element name="text_re">
-		<disk><color red="0.1" green="0.65" blue="0.35" /></disk>
-		<text string="RE"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_pv">
-		<disk><color red="0.1" green="0.65" blue="0.35" /></disk>
-		<text string="PV"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_lv">
-		<disk><color red="0.1" green="0.65" blue="0.35" /></disk>
-		<text string="LV"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_cl">
-		<disk><color red="0.1" green="0.65" blue="0.35" /></disk>
-		<text string="CL"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_dm">
-		<disk><color red="0.1" green="0.65" blue="0.35" /></disk>
-		<text string="DM"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_rv">
-		<disk><color red="0.1" green="0.65" blue="0.35" /></disk>
-		<text string="RV"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_st">
-		<disk><color red="0.1" green="0.65" blue="0.35" /></disk>
-		<text string="ST"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_re"><text string="RE"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_pv"><text string="PV"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_lv"><text string="LV"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_cl"><text string="CL"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_dm"><text string="DM"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_rv"><text string="RV"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_st"><text string="ST"><color red="0.01" green="0.01" blue="0.01" /></text></element>
 
-	<element name="text_exp">
-		<rect><color red="0.1" green="0.65" blue="0.35" /></rect>
-		<text string="EXPERT"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_mon">
-		<rect><color red="0.1" green="0.65" blue="0.35" /></rect>
-		<text string="MONITOR"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_sa">
-		<rect><color red="0.1" green="0.65" blue="0.35" /></rect>
-		<text string="Set-up &quot;A&quot;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_sb">
-		<rect><color red="0.1" green="0.65" blue="0.35" /></rect>
-		<text string="Set-up &quot;B&quot;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_exp"><text string="EXPERT"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_mon"><text string="MONITOR"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_sa"><text string="Set-up &quot;A&quot;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_sb"><text string="Set-up &quot;B&quot;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
 
 
 <!-- sb board -->
@@ -255,47 +174,24 @@ license:CC0-1.0
 	<element name="text_uit1"><text string="S.BOARD"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uit2"><text string="INTERFACE"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uib1"><text string="BOARD:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uib2a">
-		<rect><color red="0.1" green="0.65" blue="0.35" /></rect>
-		<text string="RESET A"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uib2b">
-		<rect><color red="0.1" green="0.65" blue="0.35" /></rect>
-		<text string="RESET B"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uib3">
-		<rect><color red="0.1" green="0.65" blue="0.35" /></rect>
-		<text string="CLEAR"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uib2a"><text string="RESET A"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uib2b"><text string="RESET B"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uib3"><text string="CLEAR"><color red="0.01" green="0.01" blue="0.01" /></text></element>
 	<element name="text_uis1"><text string="SPAWN:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uih1"><text string="HAND:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uih2">
-		<rect><color red="0.1" green="0.65" blue="0.35" /></rect>
-		<text string="REMOVE"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uih2"><text string="REMOVE"><color red="0.01" green="0.01" blue="0.01" /></text></element>
 	<element name="text_uiu1"><text string="UNDO:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uiu2a">
-		<rect><color red="0.1" green="0.65" blue="0.35" /></rect>
-		<text string=" &lt;&lt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2b">
-		<rect><color red="0.1" green="0.65" blue="0.35" /></rect>
-		<text string=" &lt;  "><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2c">
-		<rect><color red="0.1" green="0.65" blue="0.35" /></rect>
-		<text string="   &gt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2d">
-		<rect><color red="0.1" green="0.65" blue="0.35" /></rect>
-		<text string=" &gt;&gt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uiu2a"><text string=" &lt;&lt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2b"><text string=" &lt;  "><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2c"><text string="   &gt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2d"><text string=" &gt;&gt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu3b"><text string="/"><color red="0.81" green="0.8" blue="0.79" /></text></element>
+
 	<element name="text_uiu3a" defstate="0">
 		<simplecounter maxstate="999" digits="1" align="2">
 			<color red="0.81" green="0.8" blue="0.79" />
 		</simplecounter>
 	</element>
-	<element name="text_uiu3b"><text string="/"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uiu3c" defstate="0">
 		<simplecounter maxstate="999" digits="1" align="1">
 			<color red="0.81" green="0.8" blue="0.79" />
diff --git a/src/mame/layout/fidel_sc12.lay b/src/mame/layout/fidel_sc12.lay
index 52a4b9e51e1..3f81b9eb655 100644
--- a/src/mame/layout/fidel_sc12.lay
+++ b/src/mame/layout/fidel_sc12.lay
@@ -28,201 +28,60 @@ license:CC0-1.0
 		</disk>
 	</element>
 
-	<element name="text_1">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="1"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_2">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="2"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_3">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="3"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_4">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="4"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_5">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="5"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_6">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="6"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_7">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="7"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_8">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="8"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-
-	<element name="text_l1">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="9" align="2"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_l2">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="10" align="2"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_l3">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="11" align="2"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_l4">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="12" align="2"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-
-	<element name="text_l5">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="NO MATE"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_l61">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="DRAW"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_l62">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="ACCEPTED"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_l71">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="DRAW"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_l72">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="DECLINED"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-
-	<element name="text_a">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="A"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_b">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="B"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_c">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="C"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_d">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="D"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_e">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="E"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_f">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="F"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_g">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="G"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_h">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="H"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-
-	<element name="text_b1">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="WHITE" align="2"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_b9">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="BLACK" align="1"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-
-	<element name="text_b2">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="STALEMATE"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_b31">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="3 TIME"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_b32">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="REPEAT"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_b41">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="50 MOVE"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_b42">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="RULE"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_b5">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="YOUR MOVE"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_b61">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="DRAW"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_b62">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="OFFER"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_b7">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="I LOSE"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_b8">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="MATE"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-
-	<element name="text_illegal">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="ILLEGAL"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_check">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="CHECK"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-
-	<element name="text_re">
-		<disk><color red="0.81" green="0.8" blue="0.79" /></disk>
-		<text string="RE"><color red="0.15" green="0.15" blue="0.15" /></text>
-	</element>
-	<element name="text_cl">
-		<disk><color red="0.81" green="0.8" blue="0.79" /></disk>
-		<text string="CL"><color red="0.15" green="0.15" blue="0.15" /></text>
-	</element>
-	<element name="text_pb">
-		<disk><color red="0.81" green="0.8" blue="0.79" /></disk>
-		<text string="PB"><color red="0.15" green="0.15" blue="0.15" /></text>
-	</element>
-	<element name="text_pv">
-		<disk><color red="0.81" green="0.8" blue="0.79" /></disk>
-		<text string="PV"><color red="0.15" green="0.15" blue="0.15" /></text>
-	</element>
-	<element name="text_lv">
-		<disk><color red="0.81" green="0.8" blue="0.79" /></disk>
-		<text string="LV"><color red="0.15" green="0.15" blue="0.15" /></text>
-	</element>
-	<element name="text_tb">
-		<disk><color red="0.81" green="0.8" blue="0.79" /></disk>
-		<text string="TB"><color red="0.15" green="0.15" blue="0.15" /></text>
-	</element>
-	<element name="text_dm">
-		<disk><color red="0.81" green="0.8" blue="0.79" /></disk>
-		<text string="DM"><color red="0.15" green="0.15" blue="0.15" /></text>
-	</element>
-	<element name="text_rv">
-		<disk><color red="0.81" green="0.8" blue="0.79" /></disk>
-		<text string="RV"><color red="0.15" green="0.15" blue="0.15" /></text>
-	</element>
+	<element name="text_1"><text string="1"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_2"><text string="2"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_3"><text string="3"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_4"><text string="4"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_5"><text string="5"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_6"><text string="6"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_7"><text string="7"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_8"><text string="8"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+
+	<element name="text_l1"><text string="9" align="2"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_l2"><text string="10" align="2"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_l3"><text string="11" align="2"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_l4"><text string="12" align="2"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+
+	<element name="text_l5"><text string="NO MATE"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_l61"><text string="DRAW"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_l62"><text string="ACCEPTED"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_l71"><text string="DRAW"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_l72"><text string="DECLINED"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+
+	<element name="text_a"><text string="A"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_b"><text string="B"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_c"><text string="C"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_d"><text string="D"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_e"><text string="E"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_f"><text string="F"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_g"><text string="G"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_h"><text string="H"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+
+	<element name="text_b1"><text string="WHITE" align="2"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_b9"><text string="BLACK" align="1"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+
+	<element name="text_b2"><text string="STALEMATE"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_b31"><text string="3 TIME"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_b32"><text string="REPEAT"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_b41"><text string="50 MOVE"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_b42"><text string="RULE"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_b5"><text string="YOUR MOVE"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_b61"><text string="DRAW"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_b62"><text string="OFFER"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_b7"><text string="I LOSE"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_b8"><text string="MATE"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+
+	<element name="text_illegal"><text string="ILLEGAL"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_check"><text string="CHECK"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+
+	<element name="text_re"><text string="RE"><color red="0.15" green="0.15" blue="0.15" /></text></element>
+	<element name="text_cl"><text string="CL"><color red="0.15" green="0.15" blue="0.15" /></text></element>
+	<element name="text_pb"><text string="PB"><color red="0.15" green="0.15" blue="0.15" /></text></element>
+	<element name="text_pv"><text string="PV"><color red="0.15" green="0.15" blue="0.15" /></text></element>
+	<element name="text_lv"><text string="LV"><color red="0.15" green="0.15" blue="0.15" /></text></element>
+	<element name="text_tb"><text string="TB"><color red="0.15" green="0.15" blue="0.15" /></text></element>
+	<element name="text_dm"><text string="DM"><color red="0.15" green="0.15" blue="0.15" /></text></element>
+	<element name="text_rv"><text string="RV"><color red="0.15" green="0.15" blue="0.15" /></text></element>
 
 	<element name="text_p1"><rect><color red="1" green="1" blue="1" /></rect><image file="chess/wk.svg" /><rect><color red="1" green="1" blue="1" alpha="0.1875" /></rect></element>
 	<element name="text_p2"><rect><color red="1" green="1" blue="1" /></rect><image file="chess/wq.svg" /><rect><color red="1" green="1" blue="1" alpha="0.1875" /></rect></element>
@@ -387,43 +246,23 @@ license:CC0-1.0
 	<element name="text_uit1"><text string="S.BOARD"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uit2"><text string="INTERFACE"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uib1"><text string="BOARD:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uib2">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="RESET"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uib3">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="CLEAR"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uib2"><text string="RESET"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uib3"><text string="CLEAR"><color red="0.01" green="0.01" blue="0.01" /></text></element>
 	<element name="text_uis1"><text string="SPAWN:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uih1"><text string="HAND:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uih2">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="REMOVE"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uih2"><text string="REMOVE"><color red="0.01" green="0.01" blue="0.01" /></text></element>
 	<element name="text_uiu1"><text string="UNDO:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uiu2a">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string=" &lt;&lt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2b">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string=" &lt;  "><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2c">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="   &gt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2d">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string=" &gt;&gt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uiu2a"><text string=" &lt;&lt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2b"><text string=" &lt;  "><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2c"><text string="   &gt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2d"><text string=" &gt;&gt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu3b"><text string="/"><color red="0.81" green="0.8" blue="0.79" /></text></element>
+
 	<element name="text_uiu3a" defstate="0">
 		<simplecounter maxstate="999" digits="1" align="2">
 			<color red="0.81" green="0.8" blue="0.79" />
 		</simplecounter>
 	</element>
-	<element name="text_uiu3b"><text string="/"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uiu3c" defstate="0">
 		<simplecounter maxstate="999" digits="1" align="1">
 			<color red="0.81" green="0.8" blue="0.79" />
diff --git a/src/mame/layout/fidel_sc6.lay b/src/mame/layout/fidel_sc6.lay
index 18d085514e5..1ec9ad52727 100644
--- a/src/mame/layout/fidel_sc6.lay
+++ b/src/mame/layout/fidel_sc6.lay
@@ -26,104 +26,32 @@ license:CC0-1.0
 		</disk>
 	</element>
 
-	<element name="text_1">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="1"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_2">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="2"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_3">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="3"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_4">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="4"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_5">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="5"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_6">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="6"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_7">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="7"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_8">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="8"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-
-	<element name="text_a">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="A"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_b">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="B"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_c">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="C"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_d">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="D"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_e">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="E"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_f">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="F"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_g">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="G"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_h">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="H"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-
-	<element name="text_re">
-		<disk><color red="0.81" green="0.8" blue="0.79" /></disk>
-		<text string="RE"><color red="0.15" green="0.15" blue="0.15" /></text>
-	</element>
-	<element name="text_cl">
-		<disk><color red="0.81" green="0.8" blue="0.79" /></disk>
-		<text string="CL"><color red="0.15" green="0.15" blue="0.15" /></text>
-	</element>
-	<element name="text_pb">
-		<disk><color red="0.81" green="0.8" blue="0.79" /></disk>
-		<text string="PB"><color red="0.15" green="0.15" blue="0.15" /></text>
-	</element>
-	<element name="text_pv">
-		<disk><color red="0.81" green="0.8" blue="0.79" /></disk>
-		<text string="PV"><color red="0.15" green="0.15" blue="0.15" /></text>
-	</element>
-	<element name="text_lv">
-		<disk><color red="0.81" green="0.8" blue="0.79" /></disk>
-		<text string="LV"><color red="0.15" green="0.15" blue="0.15" /></text>
-	</element>
-	<element name="text_tb">
-		<disk><color red="0.81" green="0.8" blue="0.79" /></disk>
-		<text string="TB"><color red="0.15" green="0.15" blue="0.15" /></text>
-	</element>
-	<element name="text_dm">
-		<disk><color red="0.81" green="0.8" blue="0.79" /></disk>
-		<text string="DM"><color red="0.15" green="0.15" blue="0.15" /></text>
-	</element>
-	<element name="text_rv">
-		<disk><color red="0.81" green="0.8" blue="0.79" /></disk>
-		<text string="RV"><color red="0.15" green="0.15" blue="0.15" /></text>
-	</element>
+	<element name="text_1"><text string="1"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_2"><text string="2"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_3"><text string="3"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_4"><text string="4"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_5"><text string="5"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_6"><text string="6"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_7"><text string="7"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_8"><text string="8"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+
+	<element name="text_a"><text string="A"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_b"><text string="B"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_c"><text string="C"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_d"><text string="D"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_e"><text string="E"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_f"><text string="F"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_g"><text string="G"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_h"><text string="H"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+
+	<element name="text_re"><text string="RE"><color red="0.15" green="0.15" blue="0.15" /></text></element>
+	<element name="text_cl"><text string="CL"><color red="0.15" green="0.15" blue="0.15" /></text></element>
+	<element name="text_pb"><text string="PB"><color red="0.15" green="0.15" blue="0.15" /></text></element>
+	<element name="text_pv"><text string="PV"><color red="0.15" green="0.15" blue="0.15" /></text></element>
+	<element name="text_lv"><text string="LV"><color red="0.15" green="0.15" blue="0.15" /></text></element>
+	<element name="text_tb"><text string="TB"><color red="0.15" green="0.15" blue="0.15" /></text></element>
+	<element name="text_dm"><text string="DM"><color red="0.15" green="0.15" blue="0.15" /></text></element>
+	<element name="text_rv"><text string="RV"><color red="0.15" green="0.15" blue="0.15" /></text></element>
 
 	<element name="text_p1"><rect><color red="1" green="1" blue="1" /></rect><image file="chess/wk.svg" /><rect><color red="1" green="1" blue="1" alpha="0.1875" /></rect></element>
 	<element name="text_p2"><rect><color red="1" green="1" blue="1" /></rect><image file="chess/wq.svg" /><rect><color red="1" green="1" blue="1" alpha="0.1875" /></rect></element>
@@ -288,43 +216,23 @@ license:CC0-1.0
 	<element name="text_uit1"><text string="S.BOARD"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uit2"><text string="INTERFACE"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uib1"><text string="BOARD:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uib2">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="RESET"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uib3">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="CLEAR"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uib2"><text string="RESET"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uib3"><text string="CLEAR"><color red="0.01" green="0.01" blue="0.01" /></text></element>
 	<element name="text_uis1"><text string="SPAWN:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uih1"><text string="HAND:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uih2">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="REMOVE"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uih2"><text string="REMOVE"><color red="0.01" green="0.01" blue="0.01" /></text></element>
 	<element name="text_uiu1"><text string="UNDO:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uiu2a">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string=" &lt;&lt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2b">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string=" &lt;  "><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2c">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="   &gt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2d">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string=" &gt;&gt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uiu2a"><text string=" &lt;&lt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2b"><text string=" &lt;  "><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2c"><text string="   &gt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2d"><text string=" &gt;&gt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu3b"><text string="/"><color red="0.81" green="0.8" blue="0.79" /></text></element>
+
 	<element name="text_uiu3a" defstate="0">
 		<simplecounter maxstate="999" digits="1" align="2">
 			<color red="0.81" green="0.8" blue="0.79" />
 		</simplecounter>
 	</element>
-	<element name="text_uiu3b"><text string="/"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uiu3c" defstate="0">
 		<simplecounter maxstate="999" digits="1" align="1">
 			<color red="0.81" green="0.8" blue="0.79" />
diff --git a/src/mame/layout/fidel_sc8.lay b/src/mame/layout/fidel_sc8.lay
index bf58689d759..c0706e57db6 100644
--- a/src/mame/layout/fidel_sc8.lay
+++ b/src/mame/layout/fidel_sc8.lay
@@ -26,80 +26,26 @@ license:CC0-1.0
 		</disk>
 	</element>
 
-	<element name="text_1">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="1"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_2">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="2"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_3">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="3"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_4">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="4"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_5">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="5"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_6">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="6"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_7">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="7"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_8">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="8"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-
-	<element name="text_a">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="A"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_b">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="B"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_c">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="C"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_d">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="D"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_e">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="E"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_f">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="F"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_g">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="G"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_h">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="H"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-
-	<element name="text_re">
-		<disk><color red="0.81" green="0.8" blue="0.79" /></disk>
-		<text string="RE"><color red="0.15" green="0.15" blue="0.15" /></text>
-	</element>
-	<element name="text_cl">
-		<disk><color red="0.81" green="0.8" blue="0.79" /></disk>
-		<text string="CL"><color red="0.15" green="0.15" blue="0.15" /></text>
-	</element>
+	<element name="text_1"><text string="1"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_2"><text string="2"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_3"><text string="3"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_4"><text string="4"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_5"><text string="5"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_6"><text string="6"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_7"><text string="7"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_8"><text string="8"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+
+	<element name="text_a"><text string="A"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_b"><text string="B"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_c"><text string="C"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_d"><text string="D"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_e"><text string="E"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_f"><text string="F"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_g"><text string="G"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_h"><text string="H"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+
+	<element name="text_re"><text string="RE"><color red="0.15" green="0.15" blue="0.15" /></text></element>
+	<element name="text_cl"><text string="CL"><color red="0.15" green="0.15" blue="0.15" /></text></element>
 
 	<element name="text_p1"><rect><color red="1" green="1" blue="1" /></rect><image file="chess/bk.svg" /><rect><color red="1" green="1" blue="1" alpha="0.1875" /></rect></element>
 	<element name="text_p2"><rect><color red="1" green="1" blue="1" /></rect><image file="chess/bq.svg" /><rect><color red="1" green="1" blue="1" alpha="0.1875" /></rect></element>
@@ -276,43 +222,23 @@ license:CC0-1.0
 	<element name="text_uit1"><text string="S.BOARD"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uit2"><text string="INTERFACE"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uib1"><text string="BOARD:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uib2">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="RESET"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uib3">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="CLEAR"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uib2"><text string="RESET"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uib3"><text string="CLEAR"><color red="0.01" green="0.01" blue="0.01" /></text></element>
 	<element name="text_uis1"><text string="SPAWN:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uih1"><text string="HAND:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uih2">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="REMOVE"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uih2"><text string="REMOVE"><color red="0.01" green="0.01" blue="0.01" /></text></element>
 	<element name="text_uiu1"><text string="UNDO:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uiu2a">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string=" &lt;&lt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2b">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string=" &lt;  "><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2c">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="   &gt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2d">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string=" &gt;&gt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uiu2a"><text string=" &lt;&lt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2b"><text string=" &lt;  "><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2c"><text string="   &gt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2d"><text string=" &gt;&gt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu3b"><text string="/"><color red="0.81" green="0.8" blue="0.79" /></text></element>
+
 	<element name="text_uiu3a" defstate="0">
 		<simplecounter maxstate="999" digits="1" align="2">
 			<color red="0.81" green="0.8" blue="0.79" />
 		</simplecounter>
 	</element>
-	<element name="text_uiu3b"><text string="/"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uiu3c" defstate="0">
 		<simplecounter maxstate="999" digits="1" align="1">
 			<color red="0.81" green="0.8" blue="0.79" />
diff --git a/src/mame/layout/fidel_sc9.lay b/src/mame/layout/fidel_sc9.lay
index a3578140a55..d80c644457c 100644
--- a/src/mame/layout/fidel_sc9.lay
+++ b/src/mame/layout/fidel_sc9.lay
@@ -27,104 +27,32 @@ license:CC0-1.0
 		</disk>
 	</element>
 
-	<element name="text_1">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="1"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_2">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="2"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_3">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="3"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_4">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="4"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_5">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="5"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_6">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="6"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_7">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="7"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_8">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="8"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-
-	<element name="text_a">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="A"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_b">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="B"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_c">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="C"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_d">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="D"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_e">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="E"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_f">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="F"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_g">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="G"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_h">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="H"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-
-	<element name="text_re">
-		<disk><color red="0.81" green="0.8" blue="0.79" /></disk>
-		<text string="RE"><color red="0.15" green="0.15" blue="0.15" /></text>
-	</element>
-	<element name="text_cl">
-		<disk><color red="0.81" green="0.8" blue="0.79" /></disk>
-		<text string="CL"><color red="0.15" green="0.15" blue="0.15" /></text>
-	</element>
-	<element name="text_pb">
-		<disk><color red="0.81" green="0.8" blue="0.79" /></disk>
-		<text string="PB"><color red="0.15" green="0.15" blue="0.15" /></text>
-	</element>
-	<element name="text_pv">
-		<disk><color red="0.81" green="0.8" blue="0.79" /></disk>
-		<text string="PV"><color red="0.15" green="0.15" blue="0.15" /></text>
-	</element>
-	<element name="text_lv">
-		<disk><color red="0.81" green="0.8" blue="0.79" /></disk>
-		<text string="LV"><color red="0.15" green="0.15" blue="0.15" /></text>
-	</element>
-	<element name="text_tb">
-		<disk><color red="0.81" green="0.8" blue="0.79" /></disk>
-		<text string="TB"><color red="0.15" green="0.15" blue="0.15" /></text>
-	</element>
-	<element name="text_dm">
-		<disk><color red="0.81" green="0.8" blue="0.79" /></disk>
-		<text string="DM"><color red="0.15" green="0.15" blue="0.15" /></text>
-	</element>
-	<element name="text_rv">
-		<disk><color red="0.81" green="0.8" blue="0.79" /></disk>
-		<text string="RV"><color red="0.15" green="0.15" blue="0.15" /></text>
-	</element>
+	<element name="text_1"><text string="1"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_2"><text string="2"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_3"><text string="3"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_4"><text string="4"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_5"><text string="5"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_6"><text string="6"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_7"><text string="7"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_8"><text string="8"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+
+	<element name="text_a"><text string="A"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_b"><text string="B"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_c"><text string="C"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_d"><text string="D"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_e"><text string="E"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_f"><text string="F"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_g"><text string="G"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_h"><text string="H"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+
+	<element name="text_re"><text string="RE"><color red="0.15" green="0.15" blue="0.15" /></text></element>
+	<element name="text_cl"><text string="CL"><color red="0.15" green="0.15" blue="0.15" /></text></element>
+	<element name="text_pb"><text string="PB"><color red="0.15" green="0.15" blue="0.15" /></text></element>
+	<element name="text_pv"><text string="PV"><color red="0.15" green="0.15" blue="0.15" /></text></element>
+	<element name="text_lv"><text string="LV"><color red="0.15" green="0.15" blue="0.15" /></text></element>
+	<element name="text_tb"><text string="TB"><color red="0.15" green="0.15" blue="0.15" /></text></element>
+	<element name="text_dm"><text string="DM"><color red="0.15" green="0.15" blue="0.15" /></text></element>
+	<element name="text_rv"><text string="RV"><color red="0.15" green="0.15" blue="0.15" /></text></element>
 
 	<element name="text_p1"><rect><color red="1" green="1" blue="1" /></rect><image file="chess/wk.svg" /><rect><color red="1" green="1" blue="1" alpha="0.1875" /></rect></element>
 	<element name="text_p2"><rect><color red="1" green="1" blue="1" /></rect><image file="chess/wq.svg" /><rect><color red="1" green="1" blue="1" alpha="0.1875" /></rect></element>
@@ -301,43 +229,23 @@ license:CC0-1.0
 	<element name="text_uit1"><text string="S.BOARD"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uit2"><text string="INTERFACE"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uib1"><text string="BOARD:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uib2">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="RESET"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uib3">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="CLEAR"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uib2"><text string="RESET"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uib3"><text string="CLEAR"><color red="0.01" green="0.01" blue="0.01" /></text></element>
 	<element name="text_uis1"><text string="SPAWN:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uih1"><text string="HAND:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uih2">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="REMOVE"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uih2"><text string="REMOVE"><color red="0.01" green="0.01" blue="0.01" /></text></element>
 	<element name="text_uiu1"><text string="UNDO:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uiu2a">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string=" &lt;&lt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2b">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string=" &lt;  "><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2c">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="   &gt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2d">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string=" &gt;&gt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uiu2a"><text string=" &lt;&lt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2b"><text string=" &lt;  "><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2c"><text string="   &gt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2d"><text string=" &gt;&gt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu3b"><text string="/"><color red="0.81" green="0.8" blue="0.79" /></text></element>
+
 	<element name="text_uiu3a" defstate="0">
 		<simplecounter maxstate="999" digits="1" align="2">
 			<color red="0.81" green="0.8" blue="0.79" />
 		</simplecounter>
 	</element>
-	<element name="text_uiu3b"><text string="/"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uiu3c" defstate="0">
 		<simplecounter maxstate="999" digits="1" align="1">
 			<color red="0.81" green="0.8" blue="0.79" />
diff --git a/src/mame/layout/fidel_su9.lay b/src/mame/layout/fidel_su9.lay
index 8247b5480f9..735930a8638 100644
--- a/src/mame/layout/fidel_su9.lay
+++ b/src/mame/layout/fidel_su9.lay
@@ -43,104 +43,32 @@ license:CC0-1.0
 		</rect>
 	</element>
 
-	<element name="text_1">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="1"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_2">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="2"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_3">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="3"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_4">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="4"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_5">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="5"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_6">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="6"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_7">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="7"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_8">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="8"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-
-	<element name="text_a">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="A"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_b">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="B"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_c">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="C"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_d">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="D"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_e">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="E"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_f">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="F"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_g">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="G"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_h">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="H"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-
-	<element name="text_re">
-		<disk><color red="0.81" green="0.8" blue="0.79" /></disk>
-		<text string="RE"><color red="0.15" green="0.15" blue="0.15" /></text>
-	</element>
-	<element name="text_cl">
-		<disk><color red="0.81" green="0.8" blue="0.79" /></disk>
-		<text string="CL"><color red="0.15" green="0.15" blue="0.15" /></text>
-	</element>
-	<element name="text_pb">
-		<disk><color red="0.81" green="0.8" blue="0.79" /></disk>
-		<text string="PB"><color red="0.15" green="0.15" blue="0.15" /></text>
-	</element>
-	<element name="text_pv">
-		<disk><color red="0.81" green="0.8" blue="0.79" /></disk>
-		<text string="PV"><color red="0.15" green="0.15" blue="0.15" /></text>
-	</element>
-	<element name="text_lv">
-		<disk><color red="0.81" green="0.8" blue="0.79" /></disk>
-		<text string="LV"><color red="0.15" green="0.15" blue="0.15" /></text>
-	</element>
-	<element name="text_tb">
-		<disk><color red="0.81" green="0.8" blue="0.79" /></disk>
-		<text string="TB"><color red="0.15" green="0.15" blue="0.15" /></text>
-	</element>
-	<element name="text_dm">
-		<disk><color red="0.81" green="0.8" blue="0.79" /></disk>
-		<text string="DM"><color red="0.15" green="0.15" blue="0.15" /></text>
-	</element>
-	<element name="text_rv">
-		<disk><color red="0.81" green="0.8" blue="0.79" /></disk>
-		<text string="RV"><color red="0.15" green="0.15" blue="0.15" /></text>
-	</element>
+	<element name="text_1"><text string="1"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_2"><text string="2"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_3"><text string="3"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_4"><text string="4"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_5"><text string="5"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_6"><text string="6"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_7"><text string="7"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_8"><text string="8"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+
+	<element name="text_a"><text string="A"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_b"><text string="B"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_c"><text string="C"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_d"><text string="D"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_e"><text string="E"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_f"><text string="F"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_g"><text string="G"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_h"><text string="H"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+
+	<element name="text_re"><text string="RE"><color red="0.15" green="0.15" blue="0.15" /></text></element>
+	<element name="text_cl"><text string="CL"><color red="0.15" green="0.15" blue="0.15" /></text></element>
+	<element name="text_pb"><text string="PB"><color red="0.15" green="0.15" blue="0.15" /></text></element>
+	<element name="text_pv"><text string="PV"><color red="0.15" green="0.15" blue="0.15" /></text></element>
+	<element name="text_lv"><text string="LV"><color red="0.15" green="0.15" blue="0.15" /></text></element>
+	<element name="text_tb"><text string="TB"><color red="0.15" green="0.15" blue="0.15" /></text></element>
+	<element name="text_dm"><text string="DM"><color red="0.15" green="0.15" blue="0.15" /></text></element>
+	<element name="text_rv"><text string="RV"><color red="0.15" green="0.15" blue="0.15" /></text></element>
 
 	<element name="text_p1"><rect><color red="1" green="1" blue="1" /></rect><image file="chess/wk.svg" /><rect><color red="1" green="1" blue="1" alpha="0.1875" /></rect></element>
 	<element name="text_p2"><rect><color red="1" green="1" blue="1" /></rect><image file="chess/wq.svg" /><rect><color red="1" green="1" blue="1" alpha="0.1875" /></rect></element>
@@ -159,26 +87,11 @@ license:CC0-1.0
 		]]></data></image>
 	</element>
 
-	<element name="text_tmp">
-		<rect><color red="0.15" green="0.15" blue="0.15" /></rect>
-		<text string="TM"><color red="0.81" green="0.8" blue="0.79" /></text>
-	</element>
-	<element name="text_rvp">
-		<rect><color red="0.15" green="0.15" blue="0.15" /></rect>
-		<text string="RV"><color red="0.81" green="0.8" blue="0.79" /></text>
-	</element>
-	<element name="text_stp">
-		<rect><color red="0.15" green="0.15" blue="0.15" /></rect>
-		<text string="ST"><color red="0.81" green="0.8" blue="0.79" /></text>
-	</element>
-	<element name="text_dmp">
-		<rect><color red="0.15" green="0.15" blue="0.15" /></rect>
-		<text string="DM"><color red="0.81" green="0.8" blue="0.79" /></text>
-	</element>
-	<element name="text_lvp">
-		<rect><color red="0.15" green="0.15" blue="0.15" /></rect>
-		<text string="LV"><color red="0.81" green="0.8" blue="0.79" /></text>
-	</element>
+	<element name="text_tmp"><text string="TM"><color red="0.81" green="0.8" blue="0.79" /></text></element>
+	<element name="text_rvp"><text string="RV"><color red="0.81" green="0.8" blue="0.79" /></text></element>
+	<element name="text_stp"><text string="ST"><color red="0.81" green="0.8" blue="0.79" /></text></element>
+	<element name="text_dmp"><text string="DM"><color red="0.81" green="0.8" blue="0.79" /></text></element>
+	<element name="text_lvp"><text string="LV"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 
 
 <!-- sb board -->
@@ -348,43 +261,23 @@ license:CC0-1.0
 	<element name="text_uit1"><text string="S.BOARD"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uit2"><text string="INTERFACE"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uib1"><text string="BOARD:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uib2">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="RESET"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uib3">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="CLEAR"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uib2"><text string="RESET"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uib3"><text string="CLEAR"><color red="0.01" green="0.01" blue="0.01" /></text></element>
 	<element name="text_uis1"><text string="SPAWN:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uih1"><text string="HAND:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uih2">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="REMOVE"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uih2"><text string="REMOVE"><color red="0.01" green="0.01" blue="0.01" /></text></element>
 	<element name="text_uiu1"><text string="UNDO:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uiu2a">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string=" &lt;&lt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2b">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string=" &lt;  "><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2c">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="   &gt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2d">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string=" &gt;&gt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uiu2a"><text string=" &lt;&lt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2b"><text string=" &lt;  "><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2c"><text string="   &gt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2d"><text string=" &gt;&gt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu3b"><text string="/"><color red="0.81" green="0.8" blue="0.79" /></text></element>
+
 	<element name="text_uiu3a" defstate="0">
 		<simplecounter maxstate="999" digits="1" align="2">
 			<color red="0.81" green="0.8" blue="0.79" />
 		</simplecounter>
 	</element>
-	<element name="text_uiu3b"><text string="/"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uiu3c" defstate="0">
 		<simplecounter maxstate="999" digits="1" align="1">
 			<color red="0.81" green="0.8" blue="0.79" />
diff --git a/src/mame/layout/fidel_vcc.lay b/src/mame/layout/fidel_vcc.lay
index 012bb03d9b1..56ad4162995 100644
--- a/src/mame/layout/fidel_vcc.lay
+++ b/src/mame/layout/fidel_vcc.lay
@@ -8,7 +8,7 @@ license:CC0-1.0
 
 <!-- define elements -->
 
-	<element name="static_gray"><rect><color red="0.2" green="0.2" blue="0.2" /></rect></element>
+	<element name="gray"><rect><color red="0.2" green="0.2" blue="0.2" /></rect></element>
 
 	<element name="digit" defstate="0">
 		<led7seg><color red="1.0" green="0.1" blue="0.15" /></led7seg>
@@ -43,66 +43,21 @@ license:CC0-1.0
 		]]></data></image>
 	</element>
 
-	<element name="text_b1">
-		<rect><color red="0.2" green="0.2" blue="0.2" /></rect>
-		<text string="RE"><color red="0.8" green="0.8" blue="0.8" /></text>
-	</element>
-	<element name="text_b3">
-		<rect><color red="0.2" green="0.2" blue="0.2" /></rect>
-		<text string="CL"><color red="0.8" green="0.8" blue="0.8" /></text>
-	</element>
-	<element name="text_b4">
-		<rect><color red="0.2" green="0.2" blue="0.2" /></rect>
-		<text string="EN"><color red="0.8" green="0.8" blue="0.8" /></text>
-	</element>
-	<element name="text_b5">
-		<rect><color red="0.2" green="0.2" blue="0.2" /></rect>
-		<text string="LV"><color red="0.8" green="0.8" blue="0.8" /></text>
-	</element>
-	<element name="text_b6">
-		<rect><color red="0.2" green="0.2" blue="0.2" /></rect>
-		<text string="DM"><color red="0.8" green="0.8" blue="0.8" /></text>
-	</element>
-	<element name="text_b7">
-		<rect><color red="0.2" green="0.2" blue="0.2" /></rect>
-		<text string="PB"><color red="0.8" green="0.8" blue="0.8" /></text>
-	</element>
-	<element name="text_b8">
-		<rect><color red="0.2" green="0.2" blue="0.2" /></rect>
-		<text string="PV"><color red="0.8" green="0.8" blue="0.8" /></text>
-	</element>
-	<element name="text_b9">
-		<rect><color red="0.2" green="0.2" blue="0.2" /></rect>
-		<text string="A1"><color red="0.8" green="0.8" blue="0.8" /></text>
-	</element>
-	<element name="text_b10">
-		<rect><color red="0.2" green="0.2" blue="0.2" /></rect>
-		<text string="b2"><color red="0.8" green="0.8" blue="0.8" /></text>
-	</element>
-	<element name="text_b11">
-		<rect><color red="0.2" green="0.2" blue="0.2" /></rect>
-		<text string="C3"><color red="0.8" green="0.8" blue="0.8" /></text>
-	</element>
-	<element name="text_b12">
-		<rect><color red="0.2" green="0.2" blue="0.2" /></rect>
-		<text string="d4"><color red="0.8" green="0.8" blue="0.8" /></text>
-	</element>
-	<element name="text_b13">
-		<rect><color red="0.2" green="0.2" blue="0.2" /></rect>
-		<text string="E5"><color red="0.8" green="0.8" blue="0.8" /></text>
-	</element>
-	<element name="text_b14">
-		<rect><color red="0.2" green="0.2" blue="0.2" /></rect>
-		<text string="F6"><color red="0.8" green="0.8" blue="0.8" /></text>
-	</element>
-	<element name="text_b15">
-		<rect><color red="0.2" green="0.2" blue="0.2" /></rect>
-		<text string="g7"><color red="0.8" green="0.8" blue="0.8" /></text>
-	</element>
-	<element name="text_b16">
-		<rect><color red="0.2" green="0.2" blue="0.2" /></rect>
-		<text string="H8"><color red="0.8" green="0.8" blue="0.8" /></text>
-	</element>
+	<element name="text_b1"><text string="RE"><color red="0.8" green="0.8" blue="0.8" /></text></element>
+	<element name="text_b3"><text string="CL"><color red="0.8" green="0.8" blue="0.8" /></text></element>
+	<element name="text_b4"><text string="EN"><color red="0.8" green="0.8" blue="0.8" /></text></element>
+	<element name="text_b5"><text string="LV"><color red="0.8" green="0.8" blue="0.8" /></text></element>
+	<element name="text_b6"><text string="DM"><color red="0.8" green="0.8" blue="0.8" /></text></element>
+	<element name="text_b7"><text string="PB"><color red="0.8" green="0.8" blue="0.8" /></text></element>
+	<element name="text_b8"><text string="PV"><color red="0.8" green="0.8" blue="0.8" /></text></element>
+	<element name="text_b9"><text string="A1"><color red="0.8" green="0.8" blue="0.8" /></text></element>
+	<element name="text_b10"><text string="b2"><color red="0.8" green="0.8" blue="0.8" /></text></element>
+	<element name="text_b11"><text string="C3"><color red="0.8" green="0.8" blue="0.8" /></text></element>
+	<element name="text_b12"><text string="d4"><color red="0.8" green="0.8" blue="0.8" /></text></element>
+	<element name="text_b13"><text string="E5"><color red="0.8" green="0.8" blue="0.8" /></text></element>
+	<element name="text_b14"><text string="F6"><color red="0.8" green="0.8" blue="0.8" /></text></element>
+	<element name="text_b15"><text string="g7"><color red="0.8" green="0.8" blue="0.8" /></text></element>
+	<element name="text_b16"><text string="H8"><color red="0.8" green="0.8" blue="0.8" /></text></element>
 
 
 <!-- build screen -->
@@ -123,22 +78,22 @@ license:CC0-1.0
 		<element name="0.7" ref="led"><bounds x="8.35" y="15.7" width="0.6" height="0.6" /></element>
 
 		<!-- button panel -->
-		<element ref="static_gray"><bounds x="0" y="20" width="4" height="3" /></element>
-		<element ref="static_gray"><bounds x="4.5" y="20" width="4" height="3" /></element>
-		<element ref="static_gray"><bounds x="9" y="20" width="4" height="3" /></element>
-		<element ref="static_gray"><bounds x="13.5" y="20" width="4" height="3" /></element>
-		<element ref="static_gray"><bounds x="0" y="24" width="4" height="3" /></element>
-		<element ref="static_gray"><bounds x="4.5" y="24" width="4" height="3" /></element>
-		<element ref="static_gray"><bounds x="9" y="24" width="4" height="3" /></element>
-		<element ref="static_gray"><bounds x="13.5" y="24" width="4" height="3" /></element>
-		<element ref="static_gray"><bounds x="0" y="28" width="4" height="3" /></element>
-		<element ref="static_gray"><bounds x="4.5" y="28" width="4" height="3" /></element>
-		<element ref="static_gray"><bounds x="9" y="28" width="4" height="3" /></element>
-		<element ref="static_gray"><bounds x="13.5" y="28" width="4" height="3" /></element>
-		<element ref="static_gray"><bounds x="0" y="32" width="4" height="3" /></element>
-		<element ref="static_gray"><bounds x="4.5" y="32" width="4" height="3" /></element>
-		<element ref="static_gray"><bounds x="9" y="32" width="4" height="3" /></element>
-		<element ref="static_gray"><bounds x="13.5" y="32" width="4" height="3" /></element>
+		<element ref="gray"><bounds x="0" y="20" width="4" height="3" /></element>
+		<element ref="gray"><bounds x="4.5" y="20" width="4" height="3" /></element>
+		<element ref="gray"><bounds x="9" y="20" width="4" height="3" /></element>
+		<element ref="gray"><bounds x="13.5" y="20" width="4" height="3" /></element>
+		<element ref="gray"><bounds x="0" y="24" width="4" height="3" /></element>
+		<element ref="gray"><bounds x="4.5" y="24" width="4" height="3" /></element>
+		<element ref="gray"><bounds x="9" y="24" width="4" height="3" /></element>
+		<element ref="gray"><bounds x="13.5" y="24" width="4" height="3" /></element>
+		<element ref="gray"><bounds x="0" y="28" width="4" height="3" /></element>
+		<element ref="gray"><bounds x="4.5" y="28" width="4" height="3" /></element>
+		<element ref="gray"><bounds x="9" y="28" width="4" height="3" /></element>
+		<element ref="gray"><bounds x="13.5" y="28" width="4" height="3" /></element>
+		<element ref="gray"><bounds x="0" y="32" width="4" height="3" /></element>
+		<element ref="gray"><bounds x="4.5" y="32" width="4" height="3" /></element>
+		<element ref="gray"><bounds x="9" y="32" width="4" height="3" /></element>
+		<element ref="gray"><bounds x="13.5" y="32" width="4" height="3" /></element>
 
 		<element ref="text_b1"><bounds x="0.1" y="20.5" width="3.8" height="2" /></element>
 		<element ref="speaker"><bounds x="5.5" y="20.5" width="2" height="2" /><orientation flipx="yes" /></element>
diff --git a/src/mame/layout/fidel_vsc.lay b/src/mame/layout/fidel_vsc.lay
index 5d6bedbac2a..19d2509326e 100644
--- a/src/mame/layout/fidel_vsc.lay
+++ b/src/mame/layout/fidel_vsc.lay
@@ -41,80 +41,26 @@ license:CC0-1.0
 		</rect>
 	</element>
 
-	<element name="text_1">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="1"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_2">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="2"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_3">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="3"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_4">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="4"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_5">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="5"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_6">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="6"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_7">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="7"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_8">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="8"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-
-	<element name="text_a">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="A"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_b">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="B"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_c">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="C"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_d">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="D"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_e">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="E"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_f">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="F"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_g">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="G"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_h">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="H"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-
-	<element name="text_re">
-		<disk><color red="0.81" green="0.8" blue="0.79" /></disk>
-		<text string="RE"><color red="0.15" green="0.15" blue="0.15" /></text>
-	</element>
-	<element name="text_cl">
-		<disk><color red="0.81" green="0.8" blue="0.79" /></disk>
-		<text string="CL"><color red="0.15" green="0.15" blue="0.15" /></text>
-	</element>
+	<element name="text_1"><text string="1"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_2"><text string="2"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_3"><text string="3"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_4"><text string="4"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_5"><text string="5"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_6"><text string="6"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_7"><text string="7"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_8"><text string="8"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+
+	<element name="text_a"><text string="A"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_b"><text string="B"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_c"><text string="C"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_d"><text string="D"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_e"><text string="E"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_f"><text string="F"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_g"><text string="G"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_h"><text string="H"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+
+	<element name="text_re"><text string="RE"><color red="0.15" green="0.15" blue="0.15" /></text></element>
+	<element name="text_cl"><text string="CL"><color red="0.15" green="0.15" blue="0.15" /></text></element>
 
 	<element name="text_p1"><rect><color red="1" green="1" blue="1" /></rect><image file="chess/bk.svg" /><rect><color red="1" green="1" blue="1" alpha="0.1875" /></rect></element>
 	<element name="text_p2"><rect><color red="1" green="1" blue="1" /></rect><image file="chess/bq.svg" /><rect><color red="1" green="1" blue="1" alpha="0.1875" /></rect></element>
@@ -133,26 +79,11 @@ license:CC0-1.0
 		]]></data></image>
 	</element>
 
-	<element name="text_tm">
-		<rect><color red="0.15" green="0.15" blue="0.15" /></rect>
-		<text string="TM"><color red="0.81" green="0.8" blue="0.79" /></text>
-	</element>
-	<element name="text_rv">
-		<rect><color red="0.15" green="0.15" blue="0.15" /></rect>
-		<text string="RV"><color red="0.81" green="0.8" blue="0.79" /></text>
-	</element>
-	<element name="text_st">
-		<rect><color red="0.15" green="0.15" blue="0.15" /></rect>
-		<text string="ST"><color red="0.81" green="0.8" blue="0.79" /></text>
-	</element>
-	<element name="text_dm">
-		<rect><color red="0.15" green="0.15" blue="0.15" /></rect>
-		<text string="DM"><color red="0.81" green="0.8" blue="0.79" /></text>
-	</element>
-	<element name="text_lv">
-		<rect><color red="0.15" green="0.15" blue="0.15" /></rect>
-		<text string="LV"><color red="0.81" green="0.8" blue="0.79" /></text>
-	</element>
+	<element name="text_tm"><text string="TM"><color red="0.81" green="0.8" blue="0.79" /></text></element>
+	<element name="text_rv"><text string="RV"><color red="0.81" green="0.8" blue="0.79" /></text></element>
+	<element name="text_st"><text string="ST"><color red="0.81" green="0.8" blue="0.79" /></text></element>
+	<element name="text_dm"><text string="DM"><color red="0.81" green="0.8" blue="0.79" /></text></element>
+	<element name="text_lv"><text string="LV"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 
 
 <!-- sb board -->
@@ -322,43 +253,23 @@ license:CC0-1.0
 	<element name="text_uit1"><text string="S.BOARD"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uit2"><text string="INTERFACE"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uib1"><text string="BOARD:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uib2">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="RESET"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uib3">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="CLEAR"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uib2"><text string="RESET"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uib3"><text string="CLEAR"><color red="0.01" green="0.01" blue="0.01" /></text></element>
 	<element name="text_uis1"><text string="SPAWN:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uih1"><text string="HAND:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uih2">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="REMOVE"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uih2"><text string="REMOVE"><color red="0.01" green="0.01" blue="0.01" /></text></element>
 	<element name="text_uiu1"><text string="UNDO:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uiu2a">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string=" &lt;&lt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2b">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string=" &lt;  "><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2c">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="   &gt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2d">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string=" &gt;&gt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uiu2a"><text string=" &lt;&lt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2b"><text string=" &lt;  "><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2c"><text string="   &gt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2d"><text string=" &gt;&gt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu3b"><text string="/"><color red="0.81" green="0.8" blue="0.79" /></text></element>
+
 	<element name="text_uiu3a" defstate="0">
 		<simplecounter maxstate="999" digits="1" align="2">
 			<color red="0.81" green="0.8" blue="0.79" />
 		</simplecounter>
 	</element>
-	<element name="text_uiu3b"><text string="/"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uiu3c" defstate="0">
 		<simplecounter maxstate="999" digits="1" align="1">
 			<color red="0.81" green="0.8" blue="0.79" />
diff --git a/src/mame/layout/fingbowl.lay b/src/mame/layout/fingbowl.lay
index 370da6e0cec..408c65206c5 100644
--- a/src/mame/layout/fingbowl.lay
+++ b/src/mame/layout/fingbowl.lay
@@ -180,70 +180,22 @@ license:CC0-1.0
 		<text string="NUMBERS 1 THRU 7 - JUMP TO 13." align="1"><color red="0.02" green="0.47" blue="0.72" /></text>
 	</element>
 
-	<element name="text_n1">
-		<rect><color red="1" green="1" blue="1" /></rect>
-		<text string="1"><color red="0" green="0" blue="0" /></text>
-	</element>
-	<element name="text_n2">
-		<rect><color red="1" green="1" blue="1" /></rect>
-		<text string="2"><color red="0" green="0" blue="0" /></text>
-	</element>
-	<element name="text_n3">
-		<rect><color red="1" green="1" blue="1" /></rect>
-		<text string="3"><color red="0" green="0" blue="0" /></text>
-	</element>
-	<element name="text_n4">
-		<rect><color red="1" green="1" blue="1" /></rect>
-		<text string="4"><color red="0" green="0" blue="0" /></text>
-	</element>
-	<element name="text_n5">
-		<rect><color red="1" green="1" blue="1" /></rect>
-		<text string="5"><color red="0" green="0" blue="0" /></text>
-	</element>
-	<element name="text_n6">
-		<rect><color red="1" green="1" blue="1" /></rect>
-		<text string="6"><color red="0" green="0" blue="0" /></text>
-	</element>
-	<element name="text_n7">
-		<rect><color red="1" green="1" blue="1" /></rect>
-		<text string="7"><color red="0" green="0" blue="0" /></text>
-	</element>
-	<element name="text_n8">
-		<rect><color red="1" green="1" blue="1" /></rect>
-		<text string="8"><color red="0" green="0" blue="0" /></text>
-	</element>
-	<element name="text_n9">
-		<rect><color red="1" green="1" blue="1" /></rect>
-		<text string="9"><color red="0" green="0" blue="0" /></text>
-	</element>
-	<element name="text_n10">
-		<rect><color red="1" green="1" blue="1" /></rect>
-		<text string="10"><color red="0" green="0" blue="0" /></text>
-	</element>
-	<element name="text_n11">
-		<rect><color red="1" green="1" blue="1" /></rect>
-		<text string="11"><color red="0" green="0" blue="0" /></text>
-	</element>
-	<element name="text_n12">
-		<rect><color red="1" green="1" blue="1" /></rect>
-		<text string="12"><color red="0" green="0" blue="0" /></text>
-	</element>
-	<element name="text_n13">
-		<rect><color red="1" green="1" blue="1" /></rect>
-		<text string="13"><color red="0" green="0" blue="0" /></text>
-	</element>
-	<element name="text_n14">
-		<rect><color red="1" green="1" blue="1" /></rect>
-		<text string="14"><color red="0" green="0" blue="0" /></text>
-	</element>
-	<element name="text_n15">
-		<rect><color red="1" green="1" blue="1" /></rect>
-		<text string="15"><color red="0" green="0" blue="0" /></text>
-	</element>
-	<element name="text_n16">
-		<rect><color red="1" green="1" blue="1" /></rect>
-		<text string="16"><color red="0" green="0" blue="0" /></text>
-	</element>
+	<element name="text_n1"><text string="1"><color red="0" green="0" blue="0" /></text></element>
+	<element name="text_n2"><text string="2"><color red="0" green="0" blue="0" /></text></element>
+	<element name="text_n3"><text string="3"><color red="0" green="0" blue="0" /></text></element>
+	<element name="text_n4"><text string="4"><color red="0" green="0" blue="0" /></text></element>
+	<element name="text_n5"><text string="5"><color red="0" green="0" blue="0" /></text></element>
+	<element name="text_n6"><text string="6"><color red="0" green="0" blue="0" /></text></element>
+	<element name="text_n7"><text string="7"><color red="0" green="0" blue="0" /></text></element>
+	<element name="text_n8"><text string="8"><color red="0" green="0" blue="0" /></text></element>
+	<element name="text_n9"><text string="9"><color red="0" green="0" blue="0" /></text></element>
+	<element name="text_n10"><text string="10"><color red="0" green="0" blue="0" /></text></element>
+	<element name="text_n11"><text string="11"><color red="0" green="0" blue="0" /></text></element>
+	<element name="text_n12"><text string="12"><color red="0" green="0" blue="0" /></text></element>
+	<element name="text_n13"><text string="13"><color red="0" green="0" blue="0" /></text></element>
+	<element name="text_n14"><text string="14"><color red="0" green="0" blue="0" /></text></element>
+	<element name="text_n15"><text string="15"><color red="0" green="0" blue="0" /></text></element>
+	<element name="text_n16"><text string="16"><color red="0" green="0" blue="0" /></text></element>
 
 	<element name="text_l1a">
 		<text string="ALL SET"><color red="0.82" green="0.82" blue="0.82" /></text>
@@ -495,84 +447,84 @@ license:CC0-1.0
 
 		<!-- buttons -->
 		<element ref="oranged"><bounds xc="47.17" yc="85.25" width="7" height="7" /></element>
-		<element ref="text_n1" blend="multiply"><bounds xc="47.17" yc="85.25" width="5" height="5" /></element>
+		<element ref="text_n1"><bounds xc="47.17" yc="85.25" width="5" height="5" /></element>
 		<element ref="nothing" inputtag="IN.0" inputmask="0x08"><bounds xc="47.17" yc="85.25" width="11" height="11" /></element>
 		<element ref="hlb" inputtag="IN.0" inputmask="0x08"><bounds xc="47.17" yc="85.25" width="7" height="7" /><color alpha="0.25" /></element>
 
 		<element ref="oranged"><bounds xc="63" yc="81" width="7" height="7" /></element>
-		<element ref="text_n2" blend="multiply"><bounds xc="63" yc="81" width="5" height="5" /></element>
+		<element ref="text_n2"><bounds xc="63" yc="81" width="5" height="5" /></element>
 		<element ref="nothing" inputtag="IN.0" inputmask="0x04"><bounds xc="63" yc="81" width="11" height="11" /></element>
 		<element ref="hlb" inputtag="IN.0" inputmask="0x04"><bounds xc="63" yc="81" width="7" height="7" /><color alpha="0.25" /></element>
 
 		<element ref="oranged"><bounds xc="78.83" yc="85.25" width="7" height="7" /></element>
-		<element ref="text_n3" blend="multiply"><bounds xc="78.83" yc="85.25" width="5" height="5" /></element>
+		<element ref="text_n3"><bounds xc="78.83" yc="85.25" width="5" height="5" /></element>
 		<element ref="nothing" inputtag="IN.0" inputmask="0x02"><bounds xc="78.83" yc="85.25" width="11" height="11" /></element>
 		<element ref="hlb" inputtag="IN.0" inputmask="0x02"><bounds xc="78.83" yc="85.25" width="7" height="7" /><color alpha="0.25" /></element>
 
 		<element ref="oranged"><bounds xc="92.67" yc="75.75" width="7" height="7" /></element>
-		<element ref="text_n4" blend="multiply"><bounds xc="92.66" yc="75.75" width="5" height="5" /></element>
+		<element ref="text_n4"><bounds xc="92.66" yc="75.75" width="5" height="5" /></element>
 		<element ref="nothing" inputtag="IN.0" inputmask="0x01"><bounds xc="92.67" yc="75.75" width="11" height="11" /></element>
 		<element ref="hlb" inputtag="IN.0" inputmask="0x01"><bounds xc="92.67" yc="75.75" width="7" height="7" /><color alpha="0.25" /></element>
 
 		<element ref="oranged"><bounds xc="107.5" yc="66.5" width="7" height="7" /></element>
-		<element ref="text_n5" blend="multiply"><bounds xc="107.5" yc="66.5" width="5" height="5" /></element>
+		<element ref="text_n5"><bounds xc="107.5" yc="66.5" width="5" height="5" /></element>
 		<element ref="nothing" inputtag="IN.1" inputmask="0x08"><bounds xc="107.5" yc="66.5" width="11" height="11" /></element>
 		<element ref="hlb" inputtag="IN.1" inputmask="0x08"><bounds xc="107.5" yc="66.5" width="7" height="7" /><color alpha="0.25" /></element>
 
 		<element ref="oranged"><bounds xc="107.5" yc="50" width="7" height="7" /></element>
-		<element ref="text_n6" blend="multiply"><bounds xc="107.5" yc="50" width="5" height="5" /></element>
+		<element ref="text_n6"><bounds xc="107.5" yc="50" width="5" height="5" /></element>
 		<element ref="nothing" inputtag="IN.1" inputmask="0x04"><bounds xc="107.5" yc="50" width="11" height="11" /></element>
 		<element ref="hlb" inputtag="IN.1" inputmask="0x04"><bounds xc="107.5" yc="50" width="7" height="7" /><color alpha="0.25" /></element>
 
 		<element ref="whited"><bounds xc="107.5" yc="33.5" width="7" height="7" /></element>
 		<element ref="oranged"><bounds xc="107.5" yc="33.5" width="5.5" height="5.5" /></element>
-		<element ref="text_n7" blend="multiply"><bounds xc="107.5" yc="33.5" width="5" height="5" /></element>
+		<element ref="text_n7"><bounds xc="107.5" yc="33.5" width="5" height="5" /></element>
 		<element ref="nothing" inputtag="IN.1" inputmask="0x02"><bounds xc="107.5" yc="33.5" width="11" height="11" /></element>
 		<element ref="hlb" inputtag="IN.1" inputmask="0x02"><bounds xc="107.5" yc="33.5" width="7" height="7" /><color alpha="0.25" /></element>
 
 		<element ref="oranged"><bounds xc="92.67" yc="24.25" width="7" height="7" /></element>
-		<element ref="text_n8" blend="multiply"><bounds xc="92.66" yc="24.25" width="5" height="5" /></element>
+		<element ref="text_n8"><bounds xc="92.66" yc="24.25" width="5" height="5" /></element>
 		<element ref="nothing" inputtag="IN.1" inputmask="0x01"><bounds xc="92.67" yc="24.25" width="11" height="11" /></element>
 		<element ref="hlb" inputtag="IN.1" inputmask="0x01"><bounds xc="92.67" yc="24.25" width="7" height="7" /><color alpha="0.25" /></element>
 
 		<element ref="oranged"><bounds xc="78.83" yc="14.75" width="7" height="7" /></element>
-		<element ref="text_n9" blend="multiply"><bounds xc="78.83" yc="14.75" width="5" height="5" /></element>
+		<element ref="text_n9"><bounds xc="78.83" yc="14.75" width="5" height="5" /></element>
 		<element ref="nothing" inputtag="IN.2" inputmask="0x08"><bounds xc="78.83" yc="14.75" width="11" height="11" /></element>
 		<element ref="hlb" inputtag="IN.2" inputmask="0x08"><bounds xc="78.83" yc="14.75" width="7" height="7" /><color alpha="0.25" /></element>
 
 		<element ref="oranged"><bounds xc="63" yc="19" width="7" height="7" /></element>
-		<element ref="text_n10" blend="multiply"><bounds xc="63" yc="19" width="5" height="5" /></element>
+		<element ref="text_n10"><bounds xc="63" yc="19" width="5" height="5" /></element>
 		<element ref="nothing" inputtag="IN.2" inputmask="0x04"><bounds xc="63" yc="19" width="11" height="11" /></element>
 		<element ref="hlb" inputtag="IN.2" inputmask="0x04"><bounds xc="63" yc="19" width="7" height="7" /><color alpha="0.25" /></element>
 
 		<element ref="oranged"><bounds xc="47.17" yc="14.75" width="7" height="7" /></element>
-		<element ref="text_n11" blend="multiply"><bounds xc="47.17" yc="14.75" width="5" height="5" /></element>
+		<element ref="text_n11"><bounds xc="47.17" yc="14.75" width="5" height="5" /></element>
 		<element ref="nothing" inputtag="IN.2" inputmask="0x02"><bounds xc="47.17" yc="14.75" width="11" height="11" /></element>
 		<element ref="hlb" inputtag="IN.2" inputmask="0x02"><bounds xc="47.17" yc="14.75" width="7" height="7" /><color alpha="0.25" /></element>
 
 		<element ref="oranged"><bounds xc="33.33" yc="24.25" width="7" height="7" /></element>
-		<element ref="text_n12" blend="multiply"><bounds xc="33.33" yc="24.25" width="5" height="5" /></element>
+		<element ref="text_n12"><bounds xc="33.33" yc="24.25" width="5" height="5" /></element>
 		<element ref="nothing" inputtag="IN.2" inputmask="0x01"><bounds xc="33.33" yc="24.25" width="11" height="11" /></element>
 		<element ref="hlb" inputtag="IN.2" inputmask="0x01"><bounds xc="33.33" yc="24.25" width="7" height="7" /><color alpha="0.25" /></element>
 
 		<element ref="whited"><bounds xc="18.5" yc="33.5" width="7" height="7" /></element>
 		<element ref="greend"><bounds xc="18.5" yc="33.5" width="5.5" height="5.5" /></element>
-		<element ref="text_n13" blend="multiply"><bounds xc="18.5" yc="33.5" width="5" height="5" /></element>
+		<element ref="text_n13"><bounds xc="18.5" yc="33.5" width="5" height="5" /></element>
 		<element ref="nothing" inputtag="IN.3" inputmask="0x08"><bounds xc="18.5" yc="33.5" width="11" height="11" /></element>
 		<element ref="hlb" inputtag="IN.3" inputmask="0x08"><bounds xc="18.5" yc="33.5" width="7" height="7" /><color alpha="0.25" /></element>
 
 		<element ref="greend"><bounds xc="18.5" yc="50" width="7" height="7" /></element>
-		<element ref="text_n14" blend="multiply"><bounds xc="18.5" yc="50" width="5" height="5" /></element>
+		<element ref="text_n14"><bounds xc="18.5" yc="50" width="5" height="5" /></element>
 		<element ref="nothing" inputtag="IN.3" inputmask="0x04"><bounds xc="18.5" yc="50" width="11" height="11" /></element>
 		<element ref="hlb" inputtag="IN.3" inputmask="0x04"><bounds xc="18.5" yc="50" width="7" height="7" /><color alpha="0.25" /></element>
 
 		<element ref="greend"><bounds xc="18.5" yc="66.5" width="7" height="7" /></element>
-		<element ref="text_n15" blend="multiply"><bounds xc="18.5" yc="66.5" width="5" height="5" /></element>
+		<element ref="text_n15"><bounds xc="18.5" yc="66.5" width="5" height="5" /></element>
 		<element ref="nothing" inputtag="IN.3" inputmask="0x02"><bounds xc="18.5" yc="66.5" width="11" height="11" /></element>
 		<element ref="hlb" inputtag="IN.3" inputmask="0x02"><bounds xc="18.5" yc="66.5" width="7" height="7" /><color alpha="0.25" /></element>
 
 		<element ref="oranged"><bounds xc="33.33" yc="75.75" width="7" height="7" /></element>
-		<element ref="text_n16" blend="multiply"><bounds xc="33.33" yc="75.75" width="5" height="5" /></element>
+		<element ref="text_n16"><bounds xc="33.33" yc="75.75" width="5" height="5" /></element>
 		<element ref="nothing" inputtag="IN.3" inputmask="0x01"><bounds xc="33.33" yc="75.75" width="11" height="11" /></element>
 		<element ref="hlb" inputtag="IN.3" inputmask="0x01"><bounds xc="33.33" yc="75.75" width="7" height="7" /><color alpha="0.25" /></element>
 	</view>
diff --git a/src/mame/layout/ftri1.lay b/src/mame/layout/ftri1.lay
index 30f6ca373a2..56212abd1df 100644
--- a/src/mame/layout/ftri1.lay
+++ b/src/mame/layout/ftri1.lay
@@ -53,41 +53,15 @@ license:CC0-1.0
 		<led7seg><color red="1.0" green="0.1" blue="0.15" /></led7seg>
 	</element>
 
-	<element name="text_foul">
-		<rect><color red="0.0" green="0.3804" blue="0.1491" /></rect>
-		<text string="FOUL"><color red="0.8" green="0.8" blue="0.8" /></text>
-	</element>
-	<element name="text_ball">
-		<rect><color red="0.0" green="0.3804" blue="0.1491" /></rect>
-		<text string="BALL"><color red="0.8" green="0.8" blue="0.8" /></text>
-	</element>
-	<element name="text_strike">
-		<text string="STRIKE"><color red="0.8" green="0.8" blue="0.8" /></text>
-	</element>
-	<element name="text_flyout">
-		<rect><color red="0.0" green="0.3804" blue="0.1491" /></rect>
-		<text string="FLY OUT"><color red="0.8" green="0.8" blue="0.8" /></text>
-	</element>
-	<element name="text_homerun">
-		<rect><color red="0.0" green="0.3804" blue="0.1491" /></rect>
-		<text string="HOME RUN"><color red="0.8" green="0.8" blue="0.8" /></text>
-	</element>
-	<element name="text_grdout">
-		<rect><color red="0.0" green="0.3804" blue="0.1491" /></rect>
-		<text string="GRD. OUT"><color red="0.8" green="0.8" blue="0.8" /></text>
-	</element>
-	<element name="text_single">
-		<rect><color red="0.0" green="0.3804" blue="0.1491" /></rect>
-		<text string="SINGLE"><color red="0.8" green="0.8" blue="0.8" /></text>
-	</element>
-	<element name="text_double">
-		<rect><color red="0.0" green="0.3804" blue="0.1491" /></rect>
-		<text string="DOUBLE"><color red="0.8" green="0.8" blue="0.8" /></text>
-	</element>
-	<element name="text_triple">
-		<rect><color red="0.0" green="0.3804" blue="0.1491" /></rect>
-		<text string="TRIPLE"><color red="0.8" green="0.8" blue="0.8" /></text>
-	</element>
+	<element name="text_foul"><text string="FOUL"><color red="0.8" green="0.8" blue="0.8" /></text></element>
+	<element name="text_ball"><text string="BALL"><color red="0.8" green="0.8" blue="0.8" /></text></element>
+	<element name="text_strike"><text string="STRIKE"><color red="0.8" green="0.8" blue="0.8" /></text></element>
+	<element name="text_flyout"><text string="FLY OUT"><color red="0.8" green="0.8" blue="0.8" /></text></element>
+	<element name="text_homerun"><text string="HOME RUN"><color red="0.8" green="0.8" blue="0.8" /></text></element>
+	<element name="text_grdout"><text string="GRD. OUT"><color red="0.8" green="0.8" blue="0.8" /></text></element>
+	<element name="text_single"><text string="SINGLE"><color red="0.8" green="0.8" blue="0.8" /></text></element>
+	<element name="text_double"><text string="DOUBLE"><color red="0.8" green="0.8" blue="0.8" /></text></element>
+	<element name="text_triple"><text string="TRIPLE"><color red="0.8" green="0.8" blue="0.8" /></text></element>
 
 	<element name="text_visitor"><text string="VISITORS"><color red="0.8" green="0.8" blue="0.8" /></text></element>
 	<element name="text_hometeam"><text string="HOME TEAM"><color red="0.8" green="0.8" blue="0.8" /></text></element>
diff --git a/src/mame/layout/gammonm2.lay b/src/mame/layout/gammonm2.lay
index a22a41a4549..b0645d6a432 100644
--- a/src/mame/layout/gammonm2.lay
+++ b/src/mame/layout/gammonm2.lay
@@ -24,99 +24,30 @@ license:CC0-1.0
 	<element name="text_l7"><text string="TO"><color red="0.85" green="0.85" blue="0.85" /></text></element>
 	<element name="text_l8"><text string="Δ"><color red="0.85" green="0.85" blue="0.85" /></text></element>
 
-	<element name="text_b1">
-		<rect><color red="0.19" green="0.12" blue="0.11" /></rect>
-		<text string="ST"><color red="0.85" green="0.85" blue="0.85" /></text>
-	</element>
-	<element name="text_b2">
-		<rect><color red="0.19" green="0.12" blue="0.11" /></rect>
-		<text string="CL"><color red="0.85" green="0.85" blue="0.85" /></text>
-	</element>
-	<element name="text_b3">
-		<rect><color red="0.19" green="0.12" blue="0.11" /></rect>
-		<text string="EN"><color red="0.85" green="0.85" blue="0.85" /></text>
-	</element>
-	<element name="text_b4">
-		<rect><color red="0.19" green="0.12" blue="0.11" /></rect>
-		<text string="Δ"><color red="0.85" green="0.85" blue="0.85" /></text>
-	</element>
-	<element name="text_b5">
-		<rect><color red="0.19" green="0.12" blue="0.11" /></rect>
-		<text string="1"><color red="0.85" green="0.85" blue="0.85" /></text>
-	</element>
-	<element name="text_b6">
-		<rect><color red="0.19" green="0.12" blue="0.11" /></rect>
-		<text string="2"><color red="0.85" green="0.85" blue="0.85" /></text>
-	</element>
-	<element name="text_b7">
-		<rect><color red="0.19" green="0.12" blue="0.11" /></rect>
-		<text string="3"><color red="0.85" green="0.85" blue="0.85" /></text>
-	</element>
-	<element name="text_b8">
-		<rect><color red="0.19" green="0.12" blue="0.11" /></rect>
-		<text string="4"><color red="0.85" green="0.85" blue="0.85" /></text>
-	</element>
-	<element name="text_b9">
-		<rect><color red="0.19" green="0.12" blue="0.11" /></rect>
-		<text string="5"><color red="0.85" green="0.85" blue="0.85" /></text>
-	</element>
-	<element name="text_b10">
-		<rect><color red="0.19" green="0.12" blue="0.11" /></rect>
-		<text string="6"><color red="0.85" green="0.85" blue="0.85" /></text>
-	</element>
-	<element name="text_b11">
-		<rect><color red="0.19" green="0.12" blue="0.11" /></rect>
-		<text string="7"><color red="0.85" green="0.85" blue="0.85" /></text>
-	</element>
-	<element name="text_b12">
-		<rect><color red="0.19" green="0.12" blue="0.11" /></rect>
-		<text string="8"><color red="0.85" green="0.85" blue="0.85" /></text>
-	</element>
-	<element name="text_b13">
-		<rect><color red="0.19" green="0.12" blue="0.11" /></rect>
-		<text string="9"><color red="0.85" green="0.85" blue="0.85" /></text>
-	</element>
-	<element name="text_b14">
-		<rect><color red="0.19" green="0.12" blue="0.11" /></rect>
-		<text string="10"><color red="0.85" green="0.85" blue="0.85" /></text>
-	</element>
-	<element name="text_b15">
-		<rect><color red="0.19" green="0.12" blue="0.11" /></rect>
-		<text string="11"><color red="0.85" green="0.85" blue="0.85" /></text>
-	</element>
-	<element name="text_b16">
-		<rect><color red="0.19" green="0.12" blue="0.11" /></rect>
-		<text string="12"><color red="0.85" green="0.85" blue="0.85" /></text>
-	</element>
-	<element name="text_b17">
-		<rect><color red="0.19" green="0.12" blue="0.11" /></rect>
-		<text string="BA"><color red="0.85" green="0.85" blue="0.85" /></text>
-	</element>
-	<element name="text_b18">
-		<rect><color red="0.19" green="0.12" blue="0.11" /></rect>
-		<text string="BO"><color red="0.85" green="0.85" blue="0.85" /></text>
-	</element>
-	<element name="text_b19">
-		<rect><color red="0.19" green="0.12" blue="0.11" /></rect>
-		<text string="VR"><color red="0.85" green="0.85" blue="0.85" /></text>
-	</element>
-	<element name="text_b20">
-		<rect><color red="0.19" green="0.12" blue="0.11" /></rect>
-		<text string="Δ"><color red="0.85" green="0.85" blue="0.85" /></text>
-	</element>
-
-	<element name="text_u1">
-		<rect><color red="0.19" green="0.12" blue="0.11" /></rect>
-		<text string="REF"><color red="0.85" green="0.85" blue="0.85" /></text>
-	</element>
-	<element name="text_u2">
-		<rect><color red="0.19" green="0.12" blue="0.11" /></rect>
-		<text string="DBL"><color red="0.85" green="0.85" blue="0.85" /></text>
-	</element>
-	<element name="text_u3">
-		<rect><color red="0.19" green="0.12" blue="0.11" /></rect>
-		<text string="ACC"><color red="0.85" green="0.85" blue="0.85" /></text>
-	</element>
+	<element name="text_b1"><text string="ST"><color red="0.85" green="0.85" blue="0.85" /></text></element>
+	<element name="text_b2"><text string="CL"><color red="0.85" green="0.85" blue="0.85" /></text></element>
+	<element name="text_b3"><text string="EN"><color red="0.85" green="0.85" blue="0.85" /></text></element>
+	<element name="text_b4"><text string="Δ"><color red="0.85" green="0.85" blue="0.85" /></text></element>
+	<element name="text_b5"><text string="1"><color red="0.85" green="0.85" blue="0.85" /></text></element>
+	<element name="text_b6"><text string="2"><color red="0.85" green="0.85" blue="0.85" /></text></element>
+	<element name="text_b7"><text string="3"><color red="0.85" green="0.85" blue="0.85" /></text></element>
+	<element name="text_b8"><text string="4"><color red="0.85" green="0.85" blue="0.85" /></text></element>
+	<element name="text_b9"><text string="5"><color red="0.85" green="0.85" blue="0.85" /></text></element>
+	<element name="text_b10"><text string="6"><color red="0.85" green="0.85" blue="0.85" /></text></element>
+	<element name="text_b11"><text string="7"><color red="0.85" green="0.85" blue="0.85" /></text></element>
+	<element name="text_b12"><text string="8"><color red="0.85" green="0.85" blue="0.85" /></text></element>
+	<element name="text_b13"><text string="9"><color red="0.85" green="0.85" blue="0.85" /></text></element>
+	<element name="text_b14"><text string="10"><color red="0.85" green="0.85" blue="0.85" /></text></element>
+	<element name="text_b15"><text string="11"><color red="0.85" green="0.85" blue="0.85" /></text></element>
+	<element name="text_b16"><text string="12"><color red="0.85" green="0.85" blue="0.85" /></text></element>
+	<element name="text_b17"><text string="BA"><color red="0.85" green="0.85" blue="0.85" /></text></element>
+	<element name="text_b18"><text string="BO"><color red="0.85" green="0.85" blue="0.85" /></text></element>
+	<element name="text_b19"><text string="VR"><color red="0.85" green="0.85" blue="0.85" /></text></element>
+	<element name="text_b20"><text string="Δ"><color red="0.85" green="0.85" blue="0.85" /></text></element>
+
+	<element name="text_u1"><text string="REF"><color red="0.85" green="0.85" blue="0.85" /></text></element>
+	<element name="text_u2"><text string="DBL"><color red="0.85" green="0.85" blue="0.85" /></text></element>
+	<element name="text_u3"><text string="ACC"><color red="0.85" green="0.85" blue="0.85" /></text></element>
 
 
 <!-- dice display -->
diff --git a/src/mame/layout/h2hbaseb.lay b/src/mame/layout/h2hbaseb.lay
index 3cd79f52e1c..208eaf1f83a 100644
--- a/src/mame/layout/h2hbaseb.lay
+++ b/src/mame/layout/h2hbaseb.lay
@@ -17,55 +17,18 @@ license:CC0-1.0
 	<element name="static_yellowc"><disk><color red="0.77" green="0.7" blue="0.2" /></disk></element>
 	<element name="static_blue"><rect><color red="0.2" green="0.3" blue="1.0" /></rect></element>
 
-	<element name="text_balls">
-		<rect><color red="0.11" green="0.6" blue="0.31" /></rect>
-		<text string="BALLS"><color red="0.9" green="0.9" blue="0.9" /></text>
-	</element>
-	<element name="text_strikes">
-		<rect><color red="0.11" green="0.6" blue="0.31" /></rect>
-		<text string="STRIKES"><color red="0.9" green="0.9" blue="0.9" /></text>
-	</element>
-	<element name="text_outs">
-		<rect><color red="0.11" green="0.6" blue="0.31" /></rect>
-		<text string="OUTS"><color red="0.9" green="0.9" blue="0.9" /></text>
-	</element>
-	<element name="text_inning">
-		<rect><color red="0.11" green="0.6" blue="0.31" /></rect>
-		<text string="INNING"><color red="0.9" green="0.9" blue="0.9" /></text>
-	</element>
-	<element name="text_score">
-		<rect><color red="0.11" green="0.6" blue="0.31" /></rect>
-		<text string="SCOREBOARD"><color red="0.9" green="0.9" blue="0.9" /></text>
-	</element>
-	<element name="text_away">
-		<rect><color red="0.11" green="0.6" blue="0.31" /></rect>
-		<text string="AWAY"><color red="0.9" green="0.9" blue="0.9" /></text>
-	</element>
-	<element name="text_home">
-		<rect><color red="0.11" green="0.6" blue="0.31" /></rect>
-		<text string="HOME"><color red="0.9" green="0.9" blue="0.9" /></text>
-	</element>
-
-	<element name="text_pitcher">
-		<rect><color red="0.11" green="0.6" blue="0.31" /></rect>
-		<text string="PITCHER"><color red="0.91" green="0.91" blue="0.91" /></text>
-	</element>
-	<element name="text_b1">
-		<rect><color red="0.11" green="0.6" blue="0.31" /></rect>
-		<text string="1st"><color red="0.92" green="0.92" blue="0.92" /></text>
-	</element>
-	<element name="text_b2">
-		<rect><color red="0.11" green="0.6" blue="0.31" /></rect>
-		<text string="2nd"><color red="0.92" green="0.92" blue="0.92" /></text>
-	</element>
-	<element name="text_b3">
-		<rect><color red="0.11" green="0.6" blue="0.31" /></rect>
-		<text string="3rd"><color red="0.92" green="0.92" blue="0.92" /></text>
-	</element>
-
-	<element name="text_home2">
-		<text string="HOME"><color red="0.87" green="0.87" blue="0.87" /></text>
-	</element>
+	<element name="text_balls"><text string="BALLS"><color red="0.9" green="0.9" blue="0.9" /></text></element>
+	<element name="text_strikes"><text string="STRIKES"><color red="0.9" green="0.9" blue="0.9" /></text></element>
+	<element name="text_outs"><text string="OUTS"><color red="0.9" green="0.9" blue="0.9" /></text></element>
+	<element name="text_inning"><text string="INNING"><color red="0.9" green="0.9" blue="0.9" /></text></element>
+	<element name="text_score"><text string="SCOREBOARD"><color red="0.9" green="0.9" blue="0.9" /></text></element>
+	<element name="text_away"><text string="AWAY"><color red="0.9" green="0.9" blue="0.9" /></text></element>
+	<element name="text_home"><text string="HOME"><color red="0.9" green="0.9" blue="0.9" /></text></element>
+
+	<element name="text_pitcher"><text string="PITCHER"><color red="0.91" green="0.91" blue="0.91" /></text></element>
+	<element name="text_b1"><text string="1st"><color red="0.92" green="0.92" blue="0.92" /></text></element>
+	<element name="text_b2"><text string="2nd"><color red="0.92" green="0.92" blue="0.92" /></text></element>
+	<element name="text_b3"><text string="3rd"><color red="0.92" green="0.92" blue="0.92" /></text></element>
 
 	<element name="digit" defstate="0">
 		<led7seg><color red="0.2" green="1.0" blue="1.0" /></led7seg>
@@ -85,8 +48,7 @@ license:CC0-1.0
 			<bounds left="-50" right="150" top="-50" bottom="150" />
 		</element>
 
-	<!-- status/score panel -->
-
+		<!-- status/score panel -->
 		<element ref="static_white"><bounds x="12.3" y="6.7" width="54.4" height="35.6" /></element>
 		<element ref="static_green"><bounds x="12.7" y="7.1" width="53.6" height="13.5" /></element>
 		<element ref="static_black"><bounds x="12.7" y="21" width="53.6" height="13.5" /></element>
@@ -137,9 +99,7 @@ license:CC0-1.0
 		<element ref="static_white"><bounds x="30.3" y="6.8" width="0.4" height="28" /></element>
 		<element ref="static_white"><bounds x="36.3" y="6.8" width="0.4" height="35.4" /></element>
 
-
-	<!-- main bezel -->
-
+		<!-- main bezel -->
 		<element ref="static_whitec"><bounds x="0" y="50" width="80" height="80" /></element>
 		<element ref="static_yellowc"><bounds x="1" y="51" width="78" height="78" /></element>
 		<element ref="static_whitec"><bounds x="10.5" y="60.5" width="59" height="59" /></element>
@@ -183,11 +143,9 @@ license:CC0-1.0
 		<element ref="text_b2"><bounds x="37" y="66.5" width="6" height="2.3" /></element>
 		<element ref="text_b3"><bounds x="16.5" y="88.85" width="4" height="2.3" /></element>
 
-		<element ref="text_home2"><bounds x="30" y="124" width="20" height="3.6" /></element>
-
-
-	<!-- leds -->
+		<element ref="text_home"><bounds x="30" y="124" width="20" height="3.6" /></element>
 
+		<!-- leds -->
 		<element name="0.8" ref="led"><bounds x="38.3" y="81.3" width="3.4" height="3.4" /></element>
 		<element name="1.8" ref="led"><bounds x="38.3" y="93.3" width="3.4" height="3.4" /></element>
 		<element name="2.8" ref="led"><bounds x="38.3" y="105.3" width="3.4" height="3.4" /></element>
@@ -199,6 +157,5 @@ license:CC0-1.0
 		<element name="7.8" ref="led"><bounds x="38.3" y="56.3" width="3.4" height="3.4" /></element>
 		<element name="8.8" ref="led"><bounds x="6.3" y="88.3" width="3.4" height="3.4" /></element>
 
-
 	</view>
 </mamelayout>
diff --git a/src/mame/layout/h2hfootb.lay b/src/mame/layout/h2hfootb.lay
index b1c7151e410..853cc3e4dde 100644
--- a/src/mame/layout/h2hfootb.lay
+++ b/src/mame/layout/h2hfootb.lay
@@ -10,30 +10,12 @@ license:CC0-1.0
 	<element name="static_white"><rect><color red="0.8" green="0.8" blue="0.8" /></rect></element>
 	<element name="static_green"><rect><color red="0.39" green="0.64" blue="0.39" /></rect></element>
 
-	<element name="text_down">
-		<rect><color red="0.39" green="0.64" blue="0.39" /></rect>
-		<text string="DOWN"><color red="0.84" green="0.84" blue="0.84" /></text>
-	</element>
-	<element name="text_home">
-		<rect><color red="0.39" green="0.64" blue="0.39" /></rect>
-		<text string="HOME"><color red="0.84" green="0.84" blue="0.84" /></text>
-	</element>
-	<element name="text_yards">
-		<rect><color red="0.39" green="0.64" blue="0.39" /></rect>
-		<text string="YARDS TO GO"><color red="0.84" green="0.84" blue="0.84" /></text>
-	</element>
-	<element name="text_time">
-		<rect><color red="0.39" green="0.64" blue="0.39" /></rect>
-		<text string="TIME REMAINING"><color red="0.84" green="0.84" blue="0.84" /></text>
-	</element>
-	<element name="text_field">
-		<rect><color red="0.39" green="0.64" blue="0.39" /></rect>
-		<text string="FIELD POS."><color red="0.84" green="0.84" blue="0.84" /></text>
-	</element>
-	<element name="text_visitor">
-		<rect><color red="0.39" green="0.64" blue="0.39" /></rect>
-		<text string="VISITOR"><color red="0.84" green="0.84" blue="0.84" /></text>
-	</element>
+	<element name="text_down"><text string="DOWN"><color red="0.84" green="0.84" blue="0.84" /></text></element>
+	<element name="text_home"><text string="HOME"><color red="0.84" green="0.84" blue="0.84" /></text></element>
+	<element name="text_yards"><text string="YARDS TO GO"><color red="0.84" green="0.84" blue="0.84" /></text></element>
+	<element name="text_time"><text string="TIME REMAINING"><color red="0.84" green="0.84" blue="0.84" /></text></element>
+	<element name="text_field"><text string="FIELD POS."><color red="0.84" green="0.84" blue="0.84" /></text></element>
+	<element name="text_visitor"><text string="VISITOR"><color red="0.84" green="0.84" blue="0.84" /></text></element>
 
 	<element name="text_p1">
 		<rect><color red="0.24" green="0.4" blue="0.24" /></rect>
@@ -56,7 +38,6 @@ license:CC0-1.0
 	</element>
 
 	<!-- 7segs are not italic here, so let's make custom ones -->
-
 	<element name="seg" defstate="0">
 		<rect state="0"><color red="0.1" green="0.01" blue="0.015" /></rect>
 		<rect state="1"><color red="0.5" green="0.05" blue="0.075" /></rect>
@@ -74,8 +55,7 @@ license:CC0-1.0
 	<view name="Internal Layout">
 		<bounds left="-9" right="393" top="-130" bottom="156" />
 
-	<!-- bezel -->
-
+		<!-- bezel -->
 		<element ref="static_green"><bounds left="-9" right="393" top="-130" bottom="-60" /></element>
 		<element ref="static_green"><bounds left="-9" right="393" top="111" bottom="156" /></element>
 
@@ -140,8 +120,7 @@ license:CC0-1.0
 		<element ref="static_white"><bounds x="344" y="29" width="4" height="1" /></element>
 		<element ref="static_white"><bounds x="344" y="56" width="4" height="1" /></element>
 
-	<!-- leds -->
-
+		<!-- leds -->
 		<element name="0.5" ref="seg"><bounds x="0" y="0" width="5" height="20" /></element>
 		<element name="0.4" ref="seg"><bounds x="0" y="21" width="5" height="20" /></element>
 		<element name="0.1" ref="seg"><bounds x="27" y="0" width="5" height="20" /></element>
diff --git a/src/mame/layout/horseran.lay b/src/mame/layout/horseran.lay
index 1123236c32b..0191e8ee54c 100644
--- a/src/mame/layout/horseran.lay
+++ b/src/mame/layout/horseran.lay
@@ -9,124 +9,100 @@ license:CC0-1.0
 	<element name="lcd_bg"><rect><color red="0.54" green="0.57" blue="0.58" /></rect></element>
 
 	<element name="text_places" defstate="0">
-		<rect><color red="0.54" green="0.57" blue="0.58" /></rect>
 		<text state="0" string="PLACES" align="1"><color red="0.49412" green="0.51765" blue="0.51765" /></text>
 		<text state="1" string="PLACES" align="1"><color red="0.2" green="0.16" blue="0.16" /></text>
 	</element>
 	<element name="text_shows" defstate="0">
-		<rect><color red="0.54" green="0.57" blue="0.58" /></rect>
 		<text state="0" string="SHOWS" align="1"><color red="0.49412" green="0.51765" blue="0.51765" /></text>
 		<text state="1" string="SHOWS" align="1"><color red="0.2" green="0.16" blue="0.16" /></text>
 	</element>
 	<element name="text_earnings" defstate="0">
-		<rect><color red="0.54" green="0.57" blue="0.58" /></rect>
 		<text state="0" string="EARNINGS" align="1"><color red="0.49412" green="0.51765" blue="0.51765" /></text>
 		<text state="1" string="EARNINGS" align="1"><color red="0.2" green="0.16" blue="0.16" /></text>
 	</element>
 	<element name="text_oflast5" defstate="0">
-		<rect><color red="0.54" green="0.57" blue="0.58" /></rect>
 		<text state="0" string="OF LAST 5 RACES" align="1"><color red="0.49412" green="0.51765" blue="0.51765" /></text>
 		<text state="1" string="OF LAST 5 RACES" align="1"><color red="0.2" green="0.16" blue="0.16" /></text>
 	</element>
 	<element name="text_rating" defstate="0">
-		<rect><color red="0.54" green="0.57" blue="0.58" /></rect>
 		<text state="0" string="RATING" align="1"><color red="0.49412" green="0.51765" blue="0.51765" /></text>
 		<text state="1" string="RATING" align="1"><color red="0.2" green="0.16" blue="0.16" /></text>
 	</element>
 	<element name="text_finpos" defstate="0">
-		<rect><color red="0.54" green="0.57" blue="0.58" /></rect>
 		<text state="0" string="FINISH POSITION" align="1"><color red="0.49412" green="0.51765" blue="0.51765" /></text>
 		<text state="1" string="FINISH POSITION" align="1"><color red="0.2" green="0.16" blue="0.16" /></text>
 	</element>
 	<element name="text_finish" defstate="0">
-		<rect><color red="0.54" green="0.57" blue="0.58" /></rect>
 		<text state="0" string="FINISH" align="1"><color red="0.49412" green="0.51765" blue="0.51765" /></text>
 		<text state="1" string="FINISH" align="1"><color red="0.2" green="0.16" blue="0.16" /></text>
 	</element>
 	<element name="text_3call" defstate="0">
-		<rect><color red="0.54" green="0.57" blue="0.58" /></rect>
 		<text state="0" string="3RD CALL" align="1"><color red="0.49412" green="0.51765" blue="0.51765" /></text>
 		<text state="1" string="3RD CALL" align="1"><color red="0.2" green="0.16" blue="0.16" /></text>
 	</element>
 
 	<element name="text_curyear" defstate="0">
-		<rect><color red="0.54" green="0.57" blue="0.58" /></rect>
 		<text state="0" string="CURRENT YEAR" align="1"><color red="0.49412" green="0.51765" blue="0.51765" /></text>
 		<text state="1" string="CURRENT YEAR" align="1"><color red="0.2" green="0.16" blue="0.16" /></text>
 	</element>
 	<element name="text_pastyear" defstate="0">
-		<rect><color red="0.54" green="0.57" blue="0.58" /></rect>
 		<text state="0" string="PAST YEAR" align="1"><color red="0.49412" green="0.51765" blue="0.51765" /></text>
 		<text state="1" string="PAST YEAR" align="1"><color red="0.2" green="0.16" blue="0.16" /></text>
 	</element>
 	<element name="text_rsl" defstate="0">
-		<rect><color red="0.54" green="0.57" blue="0.58" /></rect>
 		<text state="0" string="RACES SINCE LAYOFF" align="1"><color red="0.49412" green="0.51765" blue="0.51765" /></text>
 		<text state="1" string="RACES SINCE LAYOFF" align="1"><color red="0.2" green="0.16" blue="0.16" /></text>
 	</element>
 	<element name="text_distance" defstate="0">
-		<rect><color red="0.54" green="0.57" blue="0.58" /></rect>
 		<text state="0" string="DISTANCE" align="2"><color red="0.49412" green="0.51765" blue="0.51765" /></text>
 		<text state="1" string="DISTANCE" align="2"><color red="0.2" green="0.16" blue="0.16" /></text>
 	</element>
 	<element name="text_postpos" defstate="0">
-		<rect><color red="0.54" green="0.57" blue="0.58" /></rect>
 		<text state="0" string="POST POSITION" align="1"><color red="0.49412" green="0.51765" blue="0.51765" /></text>
 		<text state="1" string="POST POSITION" align="1"><color red="0.2" green="0.16" blue="0.16" /></text>
 	</element>
 	<element name="text_3rb" defstate="0">
-		<rect><color red="0.54" green="0.57" blue="0.58" /></rect>
 		<text state="0" string="3RD RACE BACK" align="1"><color red="0.49412" green="0.51765" blue="0.51765" /></text>
 		<text state="1" string="3RD RACE BACK" align="1"><color red="0.2" green="0.16" blue="0.16" /></text>
 	</element>
 	<element name="text_2rb" defstate="0">
-		<rect><color red="0.54" green="0.57" blue="0.58" /></rect>
 		<text state="0" string="2ND RACE BACK" align="1"><color red="0.49412" green="0.51765" blue="0.51765" /></text>
 		<text state="1" string="2ND RACE BACK" align="1"><color red="0.2" green="0.16" blue="0.16" /></text>
 	</element>
 	<element name="text_lastrace" defstate="0">
-		<rect><color red="0.54" green="0.57" blue="0.58" /></rect>
 		<text state="0" string="LAST RACE" align="1"><color red="0.49412" green="0.51765" blue="0.51765" /></text>
 		<text state="1" string="LAST RACE" align="1"><color red="0.2" green="0.16" blue="0.16" /></text>
 	</element>
 	<element name="text_purse" defstate="0">
-		<rect><color red="0.54" green="0.57" blue="0.58" /></rect>
 		<text state="0" string="PURSE" align="1"><color red="0.49412" green="0.51765" blue="0.51765" /></text>
 		<text state="1" string="PURSE" align="1"><color red="0.2" green="0.16" blue="0.16" /></text>
 	</element>
 
 	<element name="text_lback" defstate="0">
-		<rect><color red="0.54" green="0.57" blue="0.58" /></rect>
 		<text state="0" string="LENGTHS BACK" align="1"><color red="0.49412" green="0.51765" blue="0.51765" /></text>
 		<text state="1" string="LENGTHS BACK" align="1"><color red="0.2" green="0.16" blue="0.16" /></text>
 	</element>
 	<element name="text_1call" defstate="0">
-		<rect><color red="0.54" green="0.57" blue="0.58" /></rect>
 		<text state="0" string="1ST CALL" align="1"><color red="0.49412" green="0.51765" blue="0.51765" /></text>
 		<text state="1" string="1ST CALL" align="1"><color red="0.2" green="0.16" blue="0.16" /></text>
 	</element>
 	<element name="text_2call" defstate="0">
-		<rect><color red="0.54" green="0.57" blue="0.58" /></rect>
 		<text state="0" string="2ND CALL" align="1"><color red="0.49412" green="0.51765" blue="0.51765" /></text>
 		<text state="1" string="2ND CALL" align="1"><color red="0.2" green="0.16" blue="0.16" /></text>
 	</element>
 	<element name="text_2bsr" defstate="0">
-		<rect><color red="0.54" green="0.57" blue="0.58" /></rect>
 		<text state="0" string="2 BEST SPEED RATINGS" align="0"><color red="0.49412" green="0.51765" blue="0.51765" /></text>
 		<text state="1" string="2 BEST SPEED RATINGS" align="0"><color red="0.2" green="0.16" blue="0.16" /></text>
 	</element>
 	<element name="text_daysaway" defstate="0">
-		<rect><color red="0.54" green="0.57" blue="0.58" /></rect>
 		<text state="0" string="DAYS AWAY" align="1"><color red="0.49412" green="0.51765" blue="0.51765" /></text>
 		<text state="1" string="DAYS AWAY" align="1"><color red="0.2" green="0.16" blue="0.16" /></text>
 	</element>
 	<element name="text_wins" defstate="0">
-		<rect><color red="0.54" green="0.57" blue="0.58" /></rect>
 		<text state="0" string="WINS" align="1"><color red="0.49412" green="0.51765" blue="0.51765" /></text>
 		<text state="1" string="WINS" align="1"><color red="0.2" green="0.16" blue="0.16" /></text>
 	</element>
 	<element name="text_races" defstate="0">
-		<rect><color red="0.54" green="0.57" blue="0.58" /></rect>
 		<text state="0" string="RACES" align="1"><color red="0.49412" green="0.51765" blue="0.51765" /></text>
 		<text state="1" string="RACES" align="1"><color red="0.2" green="0.16" blue="0.16" /></text>
 	</element>
diff --git a/src/mame/layout/im01.lay b/src/mame/layout/im01.lay
index af4e7d19895..23cc2dc0219 100644
--- a/src/mame/layout/im01.lay
+++ b/src/mame/layout/im01.lay
@@ -23,128 +23,38 @@ license:CC0-1.0
 		<rect state="0"><color red="0.1" green="0.1" blue="0.1" /></rect>
 	</element>
 
-	<element name="text_a">
-		<rect><color red="0.8" green="0.8" blue="0.8" /></rect>
-		<text string="a" align="1"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="text_b">
-		<rect><color red="0.8" green="0.8" blue="0.8" /></rect>
-		<text string="b" align="1"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="text_c">
-		<rect><color red="0.8" green="0.8" blue="0.8" /></rect>
-		<text string="c" align="1"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="text_d">
-		<rect><color red="0.8" green="0.8" blue="0.8" /></rect>
-		<text string="d" align="1"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="text_e">
-		<rect><color red="0.8" green="0.8" blue="0.8" /></rect>
-		<text string="e" align="1"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="text_f">
-		<rect><color red="0.8" green="0.8" blue="0.8" /></rect>
-		<text string="f" align="1"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="text_g">
-		<rect><color red="0.8" green="0.8" blue="0.8" /></rect>
-		<text string="g" align="1"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="text_h">
-		<rect><color red="0.8" green="0.8" blue="0.8" /></rect>
-		<text string="h" align="1"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-
-	<element name="text_1">
-		<rect><color red="0.8" green="0.8" blue="0.8" /></rect>
-		<text string="1" align="2"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="text_2">
-		<rect><color red="0.8" green="0.8" blue="0.8" /></rect>
-		<text string="2" align="2"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="text_3">
-		<rect><color red="0.8" green="0.8" blue="0.8" /></rect>
-		<text string="3" align="2"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="text_4">
-		<rect><color red="0.8" green="0.8" blue="0.8" /></rect>
-		<text string="4" align="2"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="text_5">
-		<rect><color red="0.8" green="0.8" blue="0.8" /></rect>
-		<text string="5" align="2"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="text_6">
-		<rect><color red="0.8" green="0.8" blue="0.8" /></rect>
-		<text string="6" align="2"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="text_7">
-		<rect><color red="0.8" green="0.8" blue="0.8" /></rect>
-		<text string="7" align="2"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="text_8">
-		<rect><color red="0.8" green="0.8" blue="0.8" /></rect>
-		<text string="8" align="2"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-
-	<element name="text_l1">
-		<rect><color red="0.8" green="0.8" blue="0.8" /></rect>
-		<text string="Фuг"><color red="0.1" green="0.1" blue="0.1" /></text> <!-- yes, "u" and not "и" -->
-	</element>
-	<element name="text_l2">
-		<rect><color red="0.8" green="0.8" blue="0.8" /></rect>
-		<text string="НП"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="text_l3">
-		<rect><color red="0.8" green="0.8" blue="0.8" /></rect>
-		<text string="И"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="text_l4">
-		<rect><color red="0.8" green="0.8" blue="0.8" /></rect>
-		<text string="СД"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="text_l5">
-		<rect><color red="0.8" green="0.8" blue="0.8" /></rect>
-		<text string="РЗ"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="text_l6">
-		<rect><color red="0.8" green="0.8" blue="0.8" /></rect>
-		<text string="&#x2261;"><color red="0.1" green="0.1" blue="0.1" /></text> <!-- triple dash -->
-	</element>
-	<element name="text_l7">
-		<rect><color red="0.8" green="0.8" blue="0.8" /></rect>
-		<text string="N"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="text_l8">
-		<rect><color red="0.8" green="0.8" blue="0.8" /></rect>
-		<text string="&#x2190;"><color red="0.1" green="0.1" blue="0.1" /></text> <!-- arrow left -->
-	</element>
-	<element name="text_l9">
-		<rect><color red="0.8" green="0.8" blue="0.8" /></rect>
-		<text string="Вар"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="text_l10">
-		<rect><color red="0.8" green="0.8" blue="0.8" /></rect>
-		<text string="ПХ"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="text_l11">
-		<rect><color red="0.8" green="0.8" blue="0.8" /></rect>
-		<text string="?"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="text_l12">
-		<rect><color red="0.8" green="0.8" blue="0.8" /></rect>
-		<text string="CИ"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="text_l13">
-		<rect><color red="0.8" green="0.8" blue="0.8" /></rect>
-		<text string="&#x2191;"><color red="0.1" green="0.1" blue="0.1" /></text> <!-- arrow up -->
-	</element>
-	<element name="text_l14">
-		<rect><color red="0.8" green="0.8" blue="0.8" /></rect>
-		<text string="&#x2193;"><color red="0.1" green="0.1" blue="0.1" /></text> <!-- arrow down -->
-	</element>
+	<element name="text_a"><text string="a" align="1"><color red="0.1" green="0.1" blue="0.1" /></text></element>
+	<element name="text_b"><text string="b" align="1"><color red="0.1" green="0.1" blue="0.1" /></text></element>
+	<element name="text_c"><text string="c" align="1"><color red="0.1" green="0.1" blue="0.1" /></text></element>
+	<element name="text_d"><text string="d" align="1"><color red="0.1" green="0.1" blue="0.1" /></text></element>
+	<element name="text_e"><text string="e" align="1"><color red="0.1" green="0.1" blue="0.1" /></text></element>
+	<element name="text_f"><text string="f" align="1"><color red="0.1" green="0.1" blue="0.1" /></text></element>
+	<element name="text_g"><text string="g" align="1"><color red="0.1" green="0.1" blue="0.1" /></text></element>
+	<element name="text_h"><text string="h" align="1"><color red="0.1" green="0.1" blue="0.1" /></text></element>
+
+	<element name="text_1"><text string="1" align="2"><color red="0.1" green="0.1" blue="0.1" /></text></element>
+	<element name="text_2"><text string="2" align="2"><color red="0.1" green="0.1" blue="0.1" /></text></element>
+	<element name="text_3"><text string="3" align="2"><color red="0.1" green="0.1" blue="0.1" /></text></element>
+	<element name="text_4"><text string="4" align="2"><color red="0.1" green="0.1" blue="0.1" /></text></element>
+	<element name="text_5"><text string="5" align="2"><color red="0.1" green="0.1" blue="0.1" /></text></element>
+	<element name="text_6"><text string="6" align="2"><color red="0.1" green="0.1" blue="0.1" /></text></element>
+	<element name="text_7"><text string="7" align="2"><color red="0.1" green="0.1" blue="0.1" /></text></element>
+	<element name="text_8"><text string="8" align="2"><color red="0.1" green="0.1" blue="0.1" /></text></element>
+
+	<element name="text_l1"><text string="Фuг"><color red="0.1" green="0.1" blue="0.1" /></text></element> <!-- yes, "u" and not "и" -->
+	<element name="text_l2"><text string="НП"><color red="0.1" green="0.1" blue="0.1" /></text></element>
+	<element name="text_l3"><text string="И"><color red="0.1" green="0.1" blue="0.1" /></text></element>
+	<element name="text_l4"><text string="СД"><color red="0.1" green="0.1" blue="0.1" /></text></element>
+	<element name="text_l5"><text string="РЗ"><color red="0.1" green="0.1" blue="0.1" /></text></element>
+	<element name="text_l6"><text string="&#x2261;"><color red="0.1" green="0.1" blue="0.1" /></text></element> <!-- triple dash -->
+	<element name="text_l7"><text string="N"><color red="0.1" green="0.1" blue="0.1" /></text></element>
+	<element name="text_l8"><text string="&#x2190;"><color red="0.1" green="0.1" blue="0.1" /></text></element> <!-- arrow left -->
+	<element name="text_l9"><text string="Вар"><color red="0.1" green="0.1" blue="0.1" /></text></element>
+	<element name="text_l10"><text string="ПХ"><color red="0.1" green="0.1" blue="0.1" /></text></element>
+	<element name="text_l11"><text string="?"><color red="0.1" green="0.1" blue="0.1" /></text></element>
+	<element name="text_l12"><text string="CИ"><color red="0.1" green="0.1" blue="0.1" /></text></element>
+	<element name="text_l13"><text string="&#x2191;"><color red="0.1" green="0.1" blue="0.1" /></text></element> <!-- arrow up -->
+	<element name="text_l14"><text string="&#x2193;"><color red="0.1" green="0.1" blue="0.1" /></text></element> <!-- arrow down -->
 
 	<element name="disk_w">
 		<disk>
diff --git a/src/mame/layout/im05.lay b/src/mame/layout/im05.lay
index c39e02cace3..202e0c03b4e 100644
--- a/src/mame/layout/im05.lay
+++ b/src/mame/layout/im05.lay
@@ -23,116 +23,35 @@ license:CC0-1.0
 		<rect state="0"><color red="0.1" green="0.1" blue="0.1" /></rect>
 	</element>
 
-	<element name="text_a">
-		<rect><color red="0.8" green="0.8" blue="0.8" /></rect>
-		<text string="a" align="1"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="text_b">
-		<rect><color red="0.8" green="0.8" blue="0.8" /></rect>
-		<text string="b" align="1"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="text_c">
-		<rect><color red="0.8" green="0.8" blue="0.8" /></rect>
-		<text string="c" align="1"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="text_d">
-		<rect><color red="0.8" green="0.8" blue="0.8" /></rect>
-		<text string="d" align="1"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="text_e">
-		<rect><color red="0.8" green="0.8" blue="0.8" /></rect>
-		<text string="e" align="1"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="text_f">
-		<rect><color red="0.8" green="0.8" blue="0.8" /></rect>
-		<text string="f" align="1"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="text_g">
-		<rect><color red="0.8" green="0.8" blue="0.8" /></rect>
-		<text string="g" align="1"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="text_h">
-		<rect><color red="0.8" green="0.8" blue="0.8" /></rect>
-		<text string="h" align="1"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-
-	<element name="text_0">
-		<rect><color red="0.8" green="0.8" blue="0.8" /></rect>
-		<text string="0" align="2"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="text_1">
-		<rect><color red="0.8" green="0.8" blue="0.8" /></rect>
-		<text string="1" align="2"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="text_2">
-		<rect><color red="0.8" green="0.8" blue="0.8" /></rect>
-		<text string="2" align="2"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="text_3">
-		<rect><color red="0.8" green="0.8" blue="0.8" /></rect>
-		<text string="3" align="2"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="text_4">
-		<rect><color red="0.8" green="0.8" blue="0.8" /></rect>
-		<text string="4" align="2"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="text_5">
-		<rect><color red="0.8" green="0.8" blue="0.8" /></rect>
-		<text string="5" align="2"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="text_6">
-		<rect><color red="0.8" green="0.8" blue="0.8" /></rect>
-		<text string="6" align="2"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="text_7">
-		<rect><color red="0.8" green="0.8" blue="0.8" /></rect>
-		<text string="7" align="2"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="text_8">
-		<rect><color red="0.8" green="0.8" blue="0.8" /></rect>
-		<text string="8" align="2"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="text_9">
-		<rect><color red="0.8" green="0.8" blue="0.8" /></rect>
-		<text string="9" align="2"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-
-	<element name="text_l1">
-		<rect><color red="0.8" green="0.8" blue="0.8" /></rect>
-		<text string="Реж"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="text_l2">
-		<rect><color red="0.8" green="0.8" blue="0.8" /></rect>
-		<text string="НП"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="text_l3">
-		<rect><color red="0.8" green="0.8" blue="0.8" /></rect>
-		<text string="И"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="text_l4">
-		<rect><color red="0.8" green="0.8" blue="0.8" /></rect>
-		<text string="СД"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="text_l5">
-		<rect><color red="0.8" green="0.8" blue="0.8" /></rect>
-		<text string="N"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="text_l6">
-		<rect><color red="0.8" green="0.8" blue="0.8" /></rect>
-		<text string="&#x2261;"><color red="0.1" green="0.1" blue="0.1" /></text> <!-- triple dash -->
-	</element>
-	<element name="text_l7">
-		<rect><color red="0.8" green="0.8" blue="0.8" /></rect>
-		<text string="&#x2192;"><color red="0.1" green="0.1" blue="0.1" /></text> <!-- arrow right -->
-	</element>
-	<element name="text_l8">
-		<rect><color red="0.8" green="0.8" blue="0.8" /></rect>
-		<text string="&#x2190;"><color red="0.1" green="0.1" blue="0.1" /></text> <!-- arrow left -->
-	</element>
-	<element name="text_l9">
-		<rect><color red="0.8" green="0.8" blue="0.8" /></rect>
-		<text string="ПХ"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
+	<element name="text_a"><text string="a" align="1"><color red="0.1" green="0.1" blue="0.1" /></text></element>
+	<element name="text_b"><text string="b" align="1"><color red="0.1" green="0.1" blue="0.1" /></text></element>
+	<element name="text_c"><text string="c" align="1"><color red="0.1" green="0.1" blue="0.1" /></text></element>
+	<element name="text_d"><text string="d" align="1"><color red="0.1" green="0.1" blue="0.1" /></text></element>
+	<element name="text_e"><text string="e" align="1"><color red="0.1" green="0.1" blue="0.1" /></text></element>
+	<element name="text_f"><text string="f" align="1"><color red="0.1" green="0.1" blue="0.1" /></text></element>
+	<element name="text_g"><text string="g" align="1"><color red="0.1" green="0.1" blue="0.1" /></text></element>
+	<element name="text_h"><text string="h" align="1"><color red="0.1" green="0.1" blue="0.1" /></text></element>
+
+	<element name="text_0"><text string="0" align="2"><color red="0.1" green="0.1" blue="0.1" /></text></element>
+	<element name="text_1"><text string="1" align="2"><color red="0.1" green="0.1" blue="0.1" /></text></element>
+	<element name="text_2"><text string="2" align="2"><color red="0.1" green="0.1" blue="0.1" /></text></element>
+	<element name="text_3"><text string="3" align="2"><color red="0.1" green="0.1" blue="0.1" /></text></element>
+	<element name="text_4"><text string="4" align="2"><color red="0.1" green="0.1" blue="0.1" /></text></element>
+	<element name="text_5"><text string="5" align="2"><color red="0.1" green="0.1" blue="0.1" /></text></element>
+	<element name="text_6"><text string="6" align="2"><color red="0.1" green="0.1" blue="0.1" /></text></element>
+	<element name="text_7"><text string="7" align="2"><color red="0.1" green="0.1" blue="0.1" /></text></element>
+	<element name="text_8"><text string="8" align="2"><color red="0.1" green="0.1" blue="0.1" /></text></element>
+	<element name="text_9"><text string="9" align="2"><color red="0.1" green="0.1" blue="0.1" /></text></element>
+
+	<element name="text_l1"><text string="Реж"><color red="0.1" green="0.1" blue="0.1" /></text></element>
+	<element name="text_l2"><text string="НП"><color red="0.1" green="0.1" blue="0.1" /></text></element>
+	<element name="text_l3"><text string="И"><color red="0.1" green="0.1" blue="0.1" /></text></element>
+	<element name="text_l4"><text string="СД"><color red="0.1" green="0.1" blue="0.1" /></text></element>
+	<element name="text_l5"><text string="N"><color red="0.1" green="0.1" blue="0.1" /></text></element>
+	<element name="text_l6"><text string="&#x2261;"><color red="0.1" green="0.1" blue="0.1" /></text></element> <!-- triple dash -->
+	<element name="text_l7"><text string="&#x2192;"><color red="0.1" green="0.1" blue="0.1" /></text></element> <!-- arrow right -->
+	<element name="text_l8"><text string="&#x2190;"><color red="0.1" green="0.1" blue="0.1" /></text></element> <!-- arrow left -->
+	<element name="text_l9"><text string="ПХ"><color red="0.1" green="0.1" blue="0.1" /></text></element>
 	<element name="text_l10">
 		<disk>
 			<bounds x="0" y="0" width="1" height="1" />
@@ -143,22 +62,10 @@ license:CC0-1.0
 			<color red="0.8" green="0.8" blue="0.8" />
 		</text>
 	</element>
-	<element name="text_l11">
-		<rect><color red="0.8" green="0.8" blue="0.8" /></rect>
-		<text string="?"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="text_l12">
-		<rect><color red="0.8" green="0.8" blue="0.8" /></rect>
-		<text string="CИ"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="text_l13">
-		<rect><color red="0.8" green="0.8" blue="0.8" /></rect>
-		<text string="Р"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="text_l14">
-		<rect><color red="0.8" green="0.8" blue="0.8" /></rect>
-		<text string="CТА"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
+	<element name="text_l11"><text string="?"><color red="0.1" green="0.1" blue="0.1" /></text></element>
+	<element name="text_l12"><text string="CИ"><color red="0.1" green="0.1" blue="0.1" /></text></element>
+	<element name="text_l13"><text string="Р"><color red="0.1" green="0.1" blue="0.1" /></text></element>
+	<element name="text_l14"><text string="CТА"><color red="0.1" green="0.1" blue="0.1" /></text></element>
 
 	<element name="disk_w">
 		<disk>
diff --git a/src/mame/layout/lchicken.lay b/src/mame/layout/lchicken.lay
index 7603163391b..0309151da1d 100644
--- a/src/mame/layout/lchicken.lay
+++ b/src/mame/layout/lchicken.lay
@@ -110,8 +110,7 @@ license:CC0-1.0
 		<element name="0.3" ref="led"><bounds x="5" y="28" width="1" height="1" /></element>
 		<element name="1.3" ref="led"><bounds x="5" y="29.5" width="1" height="1" /></element>
 
-	<!-- in reality the keypad is under the led panel, but here just put it on top of the led panel -->
-
+		<!-- in reality the keypad is under the led panel, but here just put it on top of the led panel -->
 		<element ref="hl" inputtag="IN.2" inputmask="0x01"><bounds x="0"  y="10" width="5" height="5" /><color alpha="0.15" /></element>
 		<element ref="hl" inputtag="IN.1" inputmask="0x01"><bounds x="6"  y="10" width="5" height="5" /><color alpha="0.15" /></element>
 		<element ref="hl" inputtag="IN.0" inputmask="0x01"><bounds x="12" y="10" width="5" height="5" /><color alpha="0.15" /></element>
@@ -122,8 +121,7 @@ license:CC0-1.0
 		<element ref="hl" inputtag="IN.1" inputmask="0x04"><bounds x="6"  y="22" width="5" height="5" /><color alpha="0.15" /></element>
 		<element ref="hl" inputtag="IN.0" inputmask="0x04"><bounds x="12" y="22" width="5" height="5" /><color alpha="0.15" /></element>
 
-	<!-- motor status info -->
-
+		<!-- motor status info -->
 		<element ref="text_m1"><bounds x="5.3" y="8" width="6" height="1" /></element>
 		<element name="motor_pos" ref="counter"><bounds x="10.46" y="8" width="3" height="1" /></element>
 		<element ref="text_m2"><bounds x="11.4" y="8" width="2" height="1" /></element>
diff --git a/src/mame/layout/leboom.lay b/src/mame/layout/leboom.lay
index 51895f8fa52..42e71870949 100644
--- a/src/mame/layout/leboom.lay
+++ b/src/mame/layout/leboom.lay
@@ -16,39 +16,15 @@ license:CC0-1.0
 	<element name="text_l2"><text string="ROWS"><color red="0.8" green="0.8" blue="0.8" /></text></element>
 	<element name="text_l3"><text string="FUSE"><color red="0.8" green="0.8" blue="0.8" /></text></element>
 
-	<element name="text_r1">
-		<rect><color red="0.9" green="0.15" blue="0.17" /></rect>
-		<text string="1"><color red="0.03" green="0.03" blue="0.03" /></text>
-	</element>
-	<element name="text_r2">
-		<rect><color red="0.9" green="0.15" blue="0.17" /></rect>
-		<text string="2"><color red="0.03" green="0.03" blue="0.03" /></text>
-	</element>
-	<element name="text_r3">
-		<rect><color red="0.9" green="0.15" blue="0.17" /></rect>
-		<text string="3"><color red="0.03" green="0.03" blue="0.03" /></text>
-	</element>
-	<element name="text_r4">
-		<rect><color red="0.9" green="0.15" blue="0.17" /></rect>
-		<text string="4"><color red="0.03" green="0.03" blue="0.03" /></text>
-	</element>
+	<element name="text_r1"><text string="1"><color red="0.03" green="0.03" blue="0.03" /></text></element>
+	<element name="text_r2"><text string="2"><color red="0.03" green="0.03" blue="0.03" /></text></element>
+	<element name="text_r3"><text string="3"><color red="0.03" green="0.03" blue="0.03" /></text></element>
+	<element name="text_r4"><text string="4"><color red="0.03" green="0.03" blue="0.03" /></text></element>
 
-	<element name="text_g1">
-		<rect><color red="0.3" green="0.9" blue="0.25" /></rect>
-		<text string="SHORTEST"><color red="0.03" green="0.03" blue="0.03" /></text>
-	</element>
-	<element name="text_g2">
-		<rect><color red="0.3" green="0.9" blue="0.25" /></rect>
-		<text string="SHORT"><color red="0.03" green="0.03" blue="0.03" /></text>
-	</element>
-	<element name="text_g3">
-		<rect><color red="0.3" green="0.9" blue="0.25" /></rect>
-		<text string="LONG"><color red="0.03" green="0.03" blue="0.03" /></text>
-	</element>
-	<element name="text_g4">
-		<rect><color red="0.3" green="0.9" blue="0.25" /></rect>
-		<text string="LONGEST"><color red="0.03" green="0.03" blue="0.03" /></text>
-	</element>
+	<element name="text_g1"><text string="SHORTEST"><color red="0.03" green="0.03" blue="0.03" /></text></element>
+	<element name="text_g2"><text string="SHORT"><color red="0.03" green="0.03" blue="0.03" /></text></element>
+	<element name="text_g3"><text string="LONG"><color red="0.03" green="0.03" blue="0.03" /></text></element>
+	<element name="text_g4"><text string="LONGEST"><color red="0.03" green="0.03" blue="0.03" /></text></element>
 
 	<element name="hl" defstate="0">
 		<text string=" "><color red="0.0" green="0.0" blue="0.0" /></text>
@@ -72,8 +48,7 @@ license:CC0-1.0
 
 		<element name="0.0" ref="led"><bounds x="31" y="7.75" width="2" height="2" /></element>
 
-	<!-- button panel -->
-
+		<!-- button panel -->
 		<element ref="disk_red"><bounds x="0" y="0.0"  width="4" height="4" /></element>
 		<element ref="disk_red"><bounds x="0" y="4.5"  width="4" height="4" /></element>
 		<element ref="disk_red"><bounds x="0" y="9.0"  width="4" height="4" /></element>
diff --git a/src/mame/layout/lightfgt.lay b/src/mame/layout/lightfgt.lay
index 330f316b0c3..e1fafd8a99c 100644
--- a/src/mame/layout/lightfgt.lay
+++ b/src/mame/layout/lightfgt.lay
@@ -12,39 +12,15 @@ license:CC0-1.0
 	<element name="static_yellow"><rect><color red="0.8" green="0.8" blue="0.2" /></rect></element>
 	<element name="static_blue"><rect><color red="0.1" green="0.4" blue="0.75" /></rect></element>
 
-	<element name="text_g1">
-		<rect><color red="0.8" green="0.8" blue="0.2" /></rect>
-		<text string="LightFight"><color red="0.0" green="0.0" blue="0.0" /></text>
-	</element>
-	<element name="text_g2">
-		<rect><color red="0.8" green="0.8" blue="0.2" /></rect>
-		<text string="NightFight"><color red="0.0" green="0.0" blue="0.0" /></text>
-	</element>
-	<element name="text_g3">
-		<rect><color red="0.8" green="0.8" blue="0.2" /></rect>
-		<text string="RiteSite"><color red="0.0" green="0.0" blue="0.0" /></text>
-	</element>
-	<element name="text_g4">
-		<rect><color red="0.8" green="0.8" blue="0.2" /></rect>
-		<text string="QuiteBrite"><color red="0.0" green="0.0" blue="0.0" /></text>
-	</element>
-	<element name="text_g5">
-		<rect><color red="0.8" green="0.8" blue="0.2" /></rect>
-		<text string="RightLight"><color red="0.0" green="0.0" blue="0.0" /></text>
-	</element>
+	<element name="text_g1"><text string="LightFight"><color red="0.0" green="0.0" blue="0.0" /></text></element>
+	<element name="text_g2"><text string="NightFight"><color red="0.0" green="0.0" blue="0.0" /></text></element>
+	<element name="text_g3"><text string="RiteSite"><color red="0.0" green="0.0" blue="0.0" /></text></element>
+	<element name="text_g4"><text string="QuiteBrite"><color red="0.0" green="0.0" blue="0.0" /></text></element>
+	<element name="text_g5"><text string="RightLight"><color red="0.0" green="0.0" blue="0.0" /></text></element>
 
-	<element name="text_s1">
-		<rect><color red="0.8" green="0.8" blue="0.2" /></rect>
-		<text string="BEGINNER"><color red="0.0" green="0.0" blue="0.0" /></text>
-	</element>
-	<element name="text_s2">
-		<rect><color red="0.8" green="0.8" blue="0.2" /></rect>
-		<text string="ADVANCED"><color red="0.0" green="0.0" blue="0.0" /></text>
-	</element>
-	<element name="text_s3">
-		<rect><color red="0.8" green="0.8" blue="0.2" /></rect>
-		<text string="EXPERT"><color red="0.0" green="0.0" blue="0.0" /></text>
-	</element>
+	<element name="text_s1"><text string="BEGINNER"><color red="0.0" green="0.0" blue="0.0" /></text></element>
+	<element name="text_s2"><text string="ADVANCED"><color red="0.0" green="0.0" blue="0.0" /></text></element>
+	<element name="text_s3"><text string="EXPERT"><color red="0.0" green="0.0" blue="0.0" /></text></element>
 
 	<element name="led" defstate="0">
 		<text string=" ">
@@ -111,8 +87,7 @@ license:CC0-1.0
 			<bounds left="4.57" right="20.43" top="4.57" bottom="20.43" />
 		</element>
 
-	<!-- led matrix -->
-
+		<!-- led matrix -->
 		<element name="4.4" ref="led"><bounds x="10" y="10" width="1" height="1" /></element>
 		<element name="4.3" ref="led"><bounds x="10" y="11" width="1" height="1" /></element>
 		<element name="4.2" ref="led"><bounds x="10" y="12" width="1" height="1" /></element>
@@ -143,8 +118,7 @@ license:CC0-1.0
 		<element name="0.1" ref="led"><bounds x="14" y="13" width="1" height="1" /></element>
 		<element name="0.0" ref="led"><bounds x="14" y="14" width="1" height="1" /></element>
 
-	<!-- buttons -->
-
+		<!-- buttons -->
 		<element ref="buttonh" inputtag="IN.0" inputmask="0x02"><bounds x="5" y="10" width="4.95" height="1" /></element>
 		<element ref="buttonh" inputtag="IN.1" inputmask="0x02"><bounds x="5" y="11" width="4.95" height="1" /></element>
 		<element ref="buttonh" inputtag="IN.2" inputmask="0x02"><bounds x="5" y="12" width="4.95" height="1" /></element>
@@ -193,8 +167,7 @@ license:CC0-1.0
 		<element ref="buttonm" inputtag="IN.3" inputmask="0x04"><bounds x="19" y="13" width="1" height="1" /><color alpha="0.2" /></element>
 		<element ref="buttonm" inputtag="IN.4" inputmask="0x04"><bounds x="19" y="14" width="1" height="1" /><color alpha="0.2" /></element>
 
-	<!-- bezel -->
-
+		<!-- bezel -->
 		<element ref="static_cyan"><bounds x="15" y="4.9" width="5.1" height="5.1" /></element>
 		<element ref="static_cyan"><bounds x="4.9" y="15" width="5.1" height="5.1" /></element>
 
diff --git a/src/mame/layout/lostreas.lay b/src/mame/layout/lostreas.lay
index d5d11493273..679000a7ffc 100644
--- a/src/mame/layout/lostreas.lay
+++ b/src/mame/layout/lostreas.lay
@@ -12,6 +12,10 @@ license:CC0-1.0
 	<element name="static_blue2"><rect><color red="0.04" green="0.1" blue="0.2" /></rect></element>
 	<element name="disk_cyan1"><disk><color red="0.0" green="0.75" blue="1.0" /></disk></element>
 	<element name="disk_cyan2"><disk><color red="0.8" green="0.9" blue="1.0" /></disk></element>
+	<element name="static_cyan1"><rect><color red="0.0" green="0.75" blue="1.0" /></rect></element>
+	<element name="static_cyan2"><rect><color red="0.6" green="0.85" blue="1.0" /></rect></element>
+	<element name="static_gold"><rect><color red="0.8" green="0.6" blue="0.1" /></rect></element>
+	<element name="static_silv"><rect><color red="0.45" green="0.45" blue="0.48" /></rect></element>
 
 	<element name="led" defstate="0">
 		<disk state="0"><color red="0.2" green="0.04" blue="0.046" /></disk>
@@ -29,194 +33,58 @@ license:CC0-1.0
 		</disk>
 	</element>
 
-	<element name="static_cyan1"><rect><color red="0.0" green="0.75" blue="1.0" /></rect></element>
-	<element name="text_k1">
-		<rect><color red="0.0" green="0.75" blue="1.0" /></rect>
-		<text string="1"><color red="1" green="1" blue="1" /></text>
-	</element>
-	<element name="text_k2">
-		<rect><color red="0.0" green="0.75" blue="1.0" /></rect>
-		<text string="2"><color red="1" green="1" blue="1" /></text>
-	</element>
-	<element name="text_k3">
-		<rect><color red="0.0" green="0.75" blue="1.0" /></rect>
-		<text string="3"><color red="1" green="1" blue="1" /></text>
-	</element>
-	<element name="text_k4">
-		<rect><color red="0.0" green="0.75" blue="1.0" /></rect>
-		<text string="4"><color red="1" green="1" blue="1" /></text>
-	</element>
-	<element name="text_k5">
-		<rect><color red="0.0" green="0.75" blue="1.0" /></rect>
-		<text string="5"><color red="1" green="1" blue="1" /></text>
-	</element>
-	<element name="text_k6">
-		<rect><color red="0.0" green="0.75" blue="1.0" /></rect>
-		<text string="6"><color red="1" green="1" blue="1" /></text>
-	</element>
-	<element name="text_k7">
-		<rect><color red="0.0" green="0.75" blue="1.0" /></rect>
-		<text string="7"><color red="1" green="1" blue="1" /></text>
-	</element>
-	<element name="text_k8">
-		<rect><color red="0.0" green="0.75" blue="1.0" /></rect>
-		<text string="8"><color red="1" green="1" blue="1" /></text>
-	</element>
-	<element name="text_k9">
-		<rect><color red="0.0" green="0.75" blue="1.0" /></rect>
-		<text string="9"><color red="1" green="1" blue="1" /></text>
-	</element>
-	<element name="text_br31">
-		<rect><color red="0.0" green="0.75" blue="1.0" /></rect>
-		<text string="$"><color red="1" green="1" blue="1" /></text>
-	</element>
-	<element name="text_br32">
-		<rect><color red="0.0" green="0.75" blue="1.0" /></rect>
-		<text string="VALUE"><color red="1" green="1" blue="1" /></text>
-	</element>
-	<element name="text_br4">
-		<rect><color red="0.0" green="0.75" blue="1.0" /></rect>
-		<text string="CLEAR"><color red="1" green="1" blue="1" /></text>
-	</element>
-
-	<element name="static_cyan2"><rect><color red="0.6" green="0.85" blue="1.0" /></rect></element>
-	<element name="text_br1">
-		<rect><color red="0.6" green="0.85" blue="1.0" /></rect>
-		<text string="AIR"><color red="0.02" green="0.02" blue="0.02" /></text>
-	</element>
-	<element name="text_br2">
-		<rect><color red="0.6" green="0.85" blue="1.0" /></rect>
-		<text string="UP"><color red="0.02" green="0.02" blue="0.02" /></text>
-	</element>
-
-	<element name="static_gold"><rect><color red="0.8" green="0.6" blue="0.1" /></rect></element>
-	<element name="text_bl1">
-		<rect><color red="0.8" green="0.6" blue="0.1" /></rect>
-		<text string="N-S"><color red="0.02" green="0.02" blue="0.02" /></text>
-	</element>
-	<element name="text_bl2">
-		<rect><color red="0.8" green="0.6" blue="0.1" /></rect>
-		<text string="E-W"><color red="0.02" green="0.02" blue="0.02" /></text>
-	</element>
-
-	<element name="static_silv"><rect><color red="0.45" green="0.45" blue="0.48" /></rect></element>
-	<element name="text_bl3">
-		<rect><color red="0.45" green="0.45" blue="0.48" /></rect>
-		<text string="N-S"><color red="0.98" green="0.98" blue="0.98" /></text>
-	</element>
-	<element name="text_bl4">
-		<rect><color red="0.45" green="0.45" blue="0.48" /></rect>
-		<text string="E-W"><color red="0.98" green="0.98" blue="0.98" /></text>
-	</element>
-
-	<element name="text_1">
-		<rect><color red="0.1" green="0.25" blue="0.5" /></rect>
-		<text string="1"><color red="0.04" green="0.1" blue="0.2" /></text>
-	</element>
-	<element name="text_2">
-		<rect><color red="0.1" green="0.25" blue="0.5" /></rect>
-		<text string="2"><color red="0.04" green="0.1" blue="0.2" /></text>
-	</element>
-	<element name="text_3">
-		<rect><color red="0.1" green="0.25" blue="0.5" /></rect>
-		<text string="3"><color red="0.04" green="0.1" blue="0.2" /></text>
-	</element>
-	<element name="text_4">
-		<rect><color red="0.1" green="0.25" blue="0.5" /></rect>
-		<text string="4"><color red="0.04" green="0.1" blue="0.2" /></text>
-	</element>
-	<element name="text_5">
-		<rect><color red="0.1" green="0.25" blue="0.5" /></rect>
-		<text string="5"><color red="0.04" green="0.1" blue="0.2" /></text>
-	</element>
-	<element name="text_6">
-		<rect><color red="0.1" green="0.25" blue="0.5" /></rect>
-		<text string="6"><color red="0.04" green="0.1" blue="0.2" /></text>
-	</element>
-	<element name="text_7">
-		<rect><color red="0.1" green="0.25" blue="0.5" /></rect>
-		<text string="7"><color red="0.04" green="0.1" blue="0.2" /></text>
-	</element>
-	<element name="text_8">
-		<rect><color red="0.1" green="0.25" blue="0.5" /></rect>
-		<text string="8"><color red="0.04" green="0.1" blue="0.2" /></text>
-	</element>
-	<element name="text_9">
-		<rect><color red="0.1" green="0.25" blue="0.5" /></rect>
-		<text string="9"><color red="0.04" green="0.1" blue="0.2" /></text>
-	</element>
-	<element name="text_10">
-		<rect><color red="0.1" green="0.25" blue="0.5" /></rect>
-		<text string="10"><color red="0.04" green="0.1" blue="0.2" /></text>
-	</element>
-	<element name="text_11">
-		<rect><color red="0.1" green="0.25" blue="0.5" /></rect>
-		<text string="11"><color red="0.04" green="0.1" blue="0.2" /></text>
-	</element>
-	<element name="text_12">
-		<rect><color red="0.1" green="0.25" blue="0.5" /></rect>
-		<text string="12"><color red="0.04" green="0.1" blue="0.2" /></text>
-	</element>
-
-	<element name="text_100">
-		<rect><color red="0.1" green="0.25" blue="0.5" /></rect>
-		<text string="100"><color red="0.04" green="0.1" blue="0.2" /></text>
-	</element>
-	<element name="text_150">
-		<rect><color red="0.1" green="0.25" blue="0.5" /></rect>
-		<text string="150"><color red="0.04" green="0.1" blue="0.2" /></text>
-	</element>
-	<element name="text_200">
-		<rect><color red="0.1" green="0.25" blue="0.5" /></rect>
-		<text string="200"><color red="0.04" green="0.1" blue="0.2" /></text>
-	</element>
-	<element name="text_250">
-		<rect><color red="0.1" green="0.25" blue="0.5" /></rect>
-		<text string="250"><color red="0.04" green="0.1" blue="0.2" /></text>
-	</element>
-	<element name="text_300">
-		<rect><color red="0.1" green="0.25" blue="0.5" /></rect>
-		<text string="300"><color red="0.04" green="0.1" blue="0.2" /></text>
-	</element>
-	<element name="text_350">
-		<rect><color red="0.1" green="0.25" blue="0.5" /></rect>
-		<text string="350"><color red="0.04" green="0.1" blue="0.2" /></text>
-	</element>
-
-	<element name="text_air">
-		<rect><color red="0.1" green="0.25" blue="0.5" /></rect>
-		<text string="AIR"><color red="0.04" green="0.1" blue="0.2" /></text>
-	</element>
-	<element name="text_ss">
-		<rect><color red="0.1" green="0.25" blue="0.5" /></rect>
-		<text string="$$"><color red="0.04" green="0.1" blue="0.2" /></text>
-	</element>
-
-	<element name="text_l1">
-		<rect><color red="0.1" green="0.25" blue="0.5" /></rect>
-		<text string="ELECTRONIC"><color red="0.04" green="0.1" blue="0.2" /></text>
-	</element>
-	<element name="text_l2">
-		<rect><color red="0.1" green="0.25" blue="0.5" /></rect>
-		<text string="DIVE-CONTROL CENTER"><color red="0.04" green="0.1" blue="0.2" /></text>
-	</element>
-
-	<element name="text_n">
-		<rect><color red="0.0" green="0.75" blue="1.0" /></rect>
-		<text string="N"><color red="1" green="1" blue="1" /></text>
-	</element>
-	<element name="text_s">
-		<rect><color red="0.0" green="0.75" blue="1.0" /></rect>
-		<text string="S"><color red="1" green="1" blue="1" /></text>
-	</element>
-	<element name="text_w">
-		<rect><color red="0.0" green="0.75" blue="1.0" /></rect>
-		<text string="W"><color red="1" green="1" blue="1" /></text>
-	</element>
-	<element name="text_e">
-		<rect><color red="0.0" green="0.75" blue="1.0" /></rect>
-		<text string="E"><color red="1" green="1" blue="1" /></text>
-	</element>
+	<element name="text_k1"><text string="1"><color red="1" green="1" blue="1" /></text></element>
+	<element name="text_k2"><text string="2"><color red="1" green="1" blue="1" /></text></element>
+	<element name="text_k3"><text string="3"><color red="1" green="1" blue="1" /></text></element>
+	<element name="text_k4"><text string="4"><color red="1" green="1" blue="1" /></text></element>
+	<element name="text_k5"><text string="5"><color red="1" green="1" blue="1" /></text></element>
+	<element name="text_k6"><text string="6"><color red="1" green="1" blue="1" /></text></element>
+	<element name="text_k7"><text string="7"><color red="1" green="1" blue="1" /></text></element>
+	<element name="text_k8"><text string="8"><color red="1" green="1" blue="1" /></text></element>
+	<element name="text_k9"><text string="9"><color red="1" green="1" blue="1" /></text></element>
+	<element name="text_br31"><text string="$"><color red="1" green="1" blue="1" /></text></element>
+	<element name="text_br32"><text string="VALUE"><color red="1" green="1" blue="1" /></text></element>
+	<element name="text_br4"><text string="CLEAR"><color red="1" green="1" blue="1" /></text></element>
+
+	<element name="text_br1"><text string="AIR"><color red="0.02" green="0.02" blue="0.02" /></text></element>
+	<element name="text_br2"><text string="UP"><color red="0.02" green="0.02" blue="0.02" /></text></element>
+
+	<element name="text_bl1"><text string="N-S"><color red="0.02" green="0.02" blue="0.02" /></text></element>
+	<element name="text_bl2"><text string="E-W"><color red="0.02" green="0.02" blue="0.02" /></text></element>
+
+	<element name="text_bl3"><text string="N-S"><color red="0.98" green="0.98" blue="0.98" /></text></element>
+	<element name="text_bl4"><text string="E-W"><color red="0.98" green="0.98" blue="0.98" /></text></element>
+
+	<element name="text_1"><text string="1"><color red="0.04" green="0.1" blue="0.2" /></text></element>
+	<element name="text_2"><text string="2"><color red="0.04" green="0.1" blue="0.2" /></text></element>
+	<element name="text_3"><text string="3"><color red="0.04" green="0.1" blue="0.2" /></text></element>
+	<element name="text_4"><text string="4"><color red="0.04" green="0.1" blue="0.2" /></text></element>
+	<element name="text_5"><text string="5"><color red="0.04" green="0.1" blue="0.2" /></text></element>
+	<element name="text_6"><text string="6"><color red="0.04" green="0.1" blue="0.2" /></text></element>
+	<element name="text_7"><text string="7"><color red="0.04" green="0.1" blue="0.2" /></text></element>
+	<element name="text_8"><text string="8"><color red="0.04" green="0.1" blue="0.2" /></text></element>
+	<element name="text_9"><text string="9"><color red="0.04" green="0.1" blue="0.2" /></text></element>
+	<element name="text_10"><text string="10"><color red="0.04" green="0.1" blue="0.2" /></text></element>
+	<element name="text_11"><text string="11"><color red="0.04" green="0.1" blue="0.2" /></text></element>
+	<element name="text_12"><text string="12"><color red="0.04" green="0.1" blue="0.2" /></text></element>
+
+	<element name="text_100"><text string="100"><color red="0.04" green="0.1" blue="0.2" /></text></element>
+	<element name="text_150"><text string="150"><color red="0.04" green="0.1" blue="0.2" /></text></element>
+	<element name="text_200"><text string="200"><color red="0.04" green="0.1" blue="0.2" /></text></element>
+	<element name="text_250"><text string="250"><color red="0.04" green="0.1" blue="0.2" /></text></element>
+	<element name="text_300"><text string="300"><color red="0.04" green="0.1" blue="0.2" /></text></element>
+	<element name="text_350"><text string="350"><color red="0.04" green="0.1" blue="0.2" /></text></element>
+
+	<element name="text_air"><text string="AIR"><color red="0.04" green="0.1" blue="0.2" /></text></element>
+	<element name="text_ss"><text string="$$"><color red="0.04" green="0.1" blue="0.2" /></text></element>
+
+	<element name="text_l1"><text string="ELECTRONIC"><color red="0.04" green="0.1" blue="0.2" /></text></element>
+	<element name="text_l2"><text string="DIVE-CONTROL CENTER"><color red="0.04" green="0.1" blue="0.2" /></text></element>
+
+	<element name="text_n"><text string="N"><color red="1" green="1" blue="1" /></text></element>
+	<element name="text_s"><text string="S"><color red="1" green="1" blue="1" /></text></element>
+	<element name="text_w"><text string="W"><color red="1" green="1" blue="1" /></text></element>
+	<element name="text_e"><text string="E"><color red="1" green="1" blue="1" /></text></element>
 
 
 <!-- build screen -->
@@ -229,8 +97,7 @@ license:CC0-1.0
 		<element ref="static_blue2"><bounds x="-1" y="-1" width="41" height="3.9" /></element>
 		<element ref="static_black"><bounds x="-1" y="-1" width="41" height="3.7" /></element>
 
-	<!-- left side -->
-
+		<!-- left side -->
 		<element ref="text_12"><bounds x="2.5" y="4" width="2" height="0.5" /></element>
 		<element ref="text_11"><bounds x="2.5" y="4.7" width="2" height="0.5" /></element>
 		<element ref="text_10"><bounds x="2.5" y="6" width="2" height="0.5" /></element>
@@ -267,8 +134,7 @@ license:CC0-1.0
 		<element name="0.1" ref="led"><bounds x="4" y="12" width="1.2" height="1.2" /></element>
 		<element name="0.0" ref="led"><bounds x="4" y="14" width="1.2" height="1.2" /></element>
 
-	<!-- compass -->
-
+		<!-- compass -->
 		<element ref="static_blue2"><bounds x="7.1" y="0" width="11" height="12.1" /></element>
 		<element ref="static_blue"><bounds x="7.3" y="1.2" width="10.6" height="10.7" /></element>
 		<element ref="static_blue2"><bounds x="7.5" y="1.4" width="10.2" height="10.3" /></element>
@@ -291,8 +157,7 @@ license:CC0-1.0
 		<element name="0.9" ref="led"><bounds x="14" y="6" width="1.2" height="1.2" /></element>
 		<element name="0.10" ref="led"><bounds x="12" y="6" width="1.2" height="1.2" /></element>
 
-	<!-- keypad -->
-
+		<!-- keypad -->
 		<element ref="static_blue2"><bounds x="23.15" y="0" width="11" height="12.1" /></element>
 		<element ref="static_blue"><bounds x="23.35" y="1.2" width="10.6" height="10.7" /></element>
 		<element ref="static_blue2"><bounds x="23.55" y="1.4" width="10.2" height="10.3" /></element>
@@ -331,8 +196,7 @@ license:CC0-1.0
 		<element ref="hl" inputtag="IN.1" inputmask="0x08"><bounds x="27.28333" y="8.1666" width="2.7333" height="2.7333" /><color alpha="0.15" /></element>
 		<element ref="hl" inputtag="IN.2" inputmask="0x01"><bounds x="30.21666" y="8.1666" width="2.7333" height="2.7333" /><color alpha="0.15" /></element>
 
-	<!-- other buttons -->
-
+		<!-- other buttons -->
 		<element ref="static_black2"><bounds x="19.1" y="3.8" width="3.05" height="11.6" /></element>
 		<element ref="static_gold"><bounds x="19.3" y="4" width="2.65" height="2.65" /></element>
 		<element ref="static_gold"><bounds x="19.3" y="6.85" width="2.65" height="2.65" /></element>
@@ -365,8 +229,7 @@ license:CC0-1.0
 		<element ref="hl" inputtag="IN.2" inputmask="0x08"><bounds x="35.35" y="9.7" width="2.65" height="2.65" /><color alpha="0.15" /></element>
 		<element ref="hl" inputtag="IN.2" inputmask="0x02"><bounds x="35.35" y="12.55" width="2.65" height="2.65" /><color alpha="0.15" /></element>
 
-	<!-- crop borders -->
-
+		<!-- crop borders -->
 		<element ref="static_black"><bounds x="-2" y="-2" width="4.1" height="21" /></element>
 		<element ref="static_black"><bounds x="-2" y="-2" width="43" height="3" /></element>
 		<element ref="static_black"><bounds x="39.3" y="-2" width="4" height="21" /></element>
diff --git a/src/mame/layout/matchme.lay b/src/mame/layout/matchme.lay
index 9c2f1ba1a8b..f1fe84d7ee3 100644
--- a/src/mame/layout/matchme.lay
+++ b/src/mame/layout/matchme.lay
@@ -33,22 +33,18 @@ license:CC0-1.0
 	</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>
@@ -68,68 +64,23 @@ license:CC0-1.0
 		</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_music"><text string="MUSIC:" align="1"><color red="0.02" green="0.02" blue="0.02" /></text></element>
+	<element name="text_speed"><text string="SPEED:" align="1"><color red="0.02" green="0.02" blue="0.02" /></text></element>
+	<element name="text_skill"><text string="SKILL:" align="1"><color red="0.02" green="0.02" blue="0.02" /></text></element>
+	<element name="text_game"><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.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.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.02" green="0.02" blue="0.02" /></text>
-	</element>
+	<element name="text_last"><text string="LAST"><color red="0.02" green="0.02" blue="0.02" /></text></element>
+	<element name="text_start"><text string="START"><color red="0.02" green="0.02" blue="0.02" /></text></element>
+	<element name="text_long"><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.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.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.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.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.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.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.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.02" green="0.02" blue="0.02" /></text>
-	</element>
+	<element name="text_1"><text string="1"><color red="0.02" green="0.02" blue="0.02" /></text></element>
+	<element name="text_2"><text string="2"><color red="0.02" green="0.02" blue="0.02" /></text></element>
+	<element name="text_3"><text string="3"><color red="0.02" green="0.02" blue="0.02" /></text></element>
+	<element name="text_4"><text string="4"><color red="0.02" green="0.02" blue="0.02" /></text></element>
+	<element name="text_5"><text string="5"><color red="0.02" green="0.02" blue="0.02" /></text></element>
+	<element name="text_6"><text string="6"><color red="0.02" green="0.02" blue="0.02" /></text></element>
+	<element name="text_7"><text string="7"><color red="0.02" green="0.02" blue="0.02" /></text></element>
+	<element name="text_8"><text string="8"><color red="0.02" green="0.02" blue="0.02" /></text></element>
 
 
 <!-- build screen -->
@@ -137,8 +88,7 @@ license:CC0-1.0
 	<view name="Internal Layout">
 		<bounds left="4" right="16" top="4" bottom="16" />
 
-	<!-- middle part -->
-
+		<!-- middle part -->
 		<element ref="disk_grey"><bounds x="6.75" y="6.75" width="6.5" height="6.5" /></element>
 
 		<element ref="text_1"><bounds x="8.6785" y="12.3369" width="0.5" height="0.5" /></element>
@@ -178,8 +128,7 @@ license:CC0-1.0
 		<element ref="text_start"><bounds x="9.35" y="12.45" width="1.3" height="0.29" /></element>
 		<element ref="text_long"><bounds x="11.1" y="11.55" width="1.3" height="0.29" /></element>
 
-	<!-- button lamps -->
-
+		<!-- button lamps -->
 		<element ref="disk_1"><bounds x="6.8366" y="13.3694" width="2.5" height="2.5" /></element>
 		<element ref="disk_2"><bounds x="4.1306" y="10.6634" width="2.5" height="2.5" /></element>
 		<element ref="disk_3"><bounds x="4.1306" y="6.8366" width="2.5" height="2.5" /></element>
diff --git a/src/mame/layout/matchnum.lay b/src/mame/layout/matchnum.lay
index bc85ff66880..3d3d1eb340d 100644
--- a/src/mame/layout/matchnum.lay
+++ b/src/mame/layout/matchnum.lay
@@ -45,22 +45,10 @@ license:CC0-1.0
 		<rect state="0x00"><color red="0.55" green="0.55" blue="0.55" /></rect>
 	</element>
 
-	<element name="text_1p">
-		<rect><color red="0.9" green="0.9" blue="0.9" /></rect>
-		<text string="1 PL."><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="text_2p">
-		<rect><color red="0.9" green="0.9" blue="0.9" /></rect>
-		<text string="2 PL."><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="text_change">
-		<rect><color red="0.9" green="0.9" blue="0.9" /></rect>
-		<text string="CHANGE"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="text_q">
-		<rect><color red="0.9" green="0.9" blue="0.9" /></rect>
-		<text string="Q"><color red="0.9" green="0.4" blue="0.1" /></text>
-	</element>
+	<element name="text_1p"><text string="1 PL."><color red="0.1" green="0.1" blue="0.1" /></text></element>
+	<element name="text_2p"><text string="2 PL."><color red="0.1" green="0.1" blue="0.1" /></text></element>
+	<element name="text_change"><text string="CHANGE"><color red="0.1" green="0.1" blue="0.1" /></text></element>
+	<element name="text_q"><text string="Q"><color red="0.9" green="0.4" blue="0.1" /></text></element>
 	<element name="text_t1"><text string="MATCH"><color red="0.9" green="0.4" blue="0.1" /></text></element>
 	<element name="text_t2"><text string="NUMBER"><color red="0.9" green="0.4" blue="0.1" /></text></element>
 	<element name="text_l1"><text string="ERROR"><color red="0.8" green="0.8" blue="0.8" /></text></element>
@@ -73,8 +61,7 @@ license:CC0-1.0
 	<view name="Internal Layout">
 		<bounds left="0" right="41" top="17" bottom="105" />
 
-	<!-- top part -->
-
+		<!-- top part -->
 		<element ref="static_white"><bounds x="-1" y="16" width="43" height="14" /></element>
 		<element ref="static_black"><bounds x="1" y="18" width="39" height="11" /></element>
 
@@ -94,8 +81,7 @@ license:CC0-1.0
 		<element name="3.7" ref="led"><bounds x="19.5" y="32" width="2" height="2" /></element>
 		<element name="2.7" ref="led"><bounds x="34.5" y="32" width="2" height="2" /></element>
 
-	<!-- face buttons -->
-
+		<!-- face buttons -->
 		<element ref="static_orange"><bounds x="-1" y="40" width="43" height="51" /></element>
 
 		<element ref="static_white"><bounds x="1" y="41" width="9" height="9" /></element>
@@ -142,8 +128,7 @@ license:CC0-1.0
 		<element ref="hl" inputtag="IN.1" inputmask="0x02"><bounds x="21" y="81" width="9" height="9" /><color alpha="0.15" /></element>
 		<element ref="hl" inputtag="IN.1" inputmask="0x01"><bounds x="31" y="81" width="9" height="9" /><color alpha="0.15" /></element>
 
-	<!-- bottom part -->
-
+		<!-- bottom part -->
 		<element ref="static_white"><bounds x="-1" y="92" width="43" height="13.5" /></element>
 
 		<element ref="text_1p"><bounds x="1" y="93" width="4" height="2" /></element>
diff --git a/src/mame/layout/mbaseb.lay b/src/mame/layout/mbaseb.lay
index e2afec61373..ecf078d0a2b 100644
--- a/src/mame/layout/mbaseb.lay
+++ b/src/mame/layout/mbaseb.lay
@@ -52,30 +52,12 @@ license:CC0-1.0
 	<element name="text_p"><text string="P"><color red="0.8" green="0.8" blue="0.8" /></text></element>
 	<element name="text_b"><text string="B"><color red="0.1" green="0.35" blue="0.7" /></text></element>
 
-	<element name="text_l1">
-		<rect><color red="0.8" green="0.8" blue="0.8" /></rect>
-		<text string="VISITORS"><color red="0.1" green="0.35" blue="0.7" /></text>
-	</element>
-	<element name="text_l2">
-		<rect><color red="0.8" green="0.8" blue="0.8" /></rect>
-		<text string="HOME"><color red="0.1" green="0.35" blue="0.7" /></text>
-	</element>
-	<element name="text_l3">
-		<rect><color red="0.8" green="0.8" blue="0.8" /></rect>
-		<text string="INNINGS"><color red="0.1" green="0.35" blue="0.7" /></text>
-	</element>
-	<element name="text_l4">
-		<rect><color red="0.8" green="0.8" blue="0.8" /></rect>
-		<text string="OUTS"><color red="0.1" green="0.35" blue="0.7" /></text>
-	</element>
-	<element name="text_l5">
-		<rect><color red="0.8" green="0.8" blue="0.8" /></rect>
-		<text string="BALLS"><color red="0.1" green="0.35" blue="0.7" /></text>
-	</element>
-	<element name="text_l6">
-		<rect><color red="0.8" green="0.8" blue="0.8" /></rect>
-		<text string="STRIKES"><color red="0.1" green="0.35" blue="0.7" /></text>
-	</element>
+	<element name="text_l1"><text string="VISITORS"><color red="0.1" green="0.35" blue="0.7" /></text></element>
+	<element name="text_l2"><text string="HOME"><color red="0.1" green="0.35" blue="0.7" /></text></element>
+	<element name="text_l3"><text string="INNINGS"><color red="0.1" green="0.35" blue="0.7" /></text></element>
+	<element name="text_l4"><text string="OUTS"><color red="0.1" green="0.35" blue="0.7" /></text></element>
+	<element name="text_l5"><text string="BALLS"><color red="0.1" green="0.35" blue="0.7" /></text></element>
+	<element name="text_l6"><text string="STRIKES"><color red="0.1" green="0.35" blue="0.7" /></text></element>
 
 	<element name="led" defstate="0">
 		<disk>
diff --git a/src/mame/layout/mbaskb.lay b/src/mame/layout/mbaskb.lay
index 16df0955e24..4459ea6cf07 100644
--- a/src/mame/layout/mbaskb.lay
+++ b/src/mame/layout/mbaskb.lay
@@ -20,14 +20,8 @@ license:CC0-1.0
 		]]></data></image>
 	</element>
 
-	<element name="text_l1">
-		<rect><color red="0.8" green="0.8" blue="0.8" /></rect>
-		<text string="HOME" align="1"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_l2">
-		<rect><color red="0.8" green="0.8" blue="0.8" /></rect>
-		<text string="VISITOR" align="2"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_l1"><text string="HOME" align="1"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_l2"><text string="VISITOR" align="2"><color red="0.01" green="0.01" blue="0.01" /></text></element>
 
 	<element name="led" defstate="0">
 		<rect state="0"><color red="0.1" green="0.01" blue="0.015" /></rect>
diff --git a/src/mame/layout/mbdtower.lay b/src/mame/layout/mbdtower.lay
index 428737a5c3d..84112a1712b 100644
--- a/src/mame/layout/mbdtower.lay
+++ b/src/mame/layout/mbdtower.lay
@@ -15,7 +15,17 @@ license:CC0-1.0
 		<led7seg><color red="1.0" green="0.20" blue="0.22" /></led7seg>
 	</element>
 
-	<!-- buttons -->
+
+<!-- buttons -->
+
+	<element name="b_green"><rect><color red="0.1" green="0.7" blue="0.2" /></rect></element>
+	<element name="b_red"><rect><color red="0.9" green="0.1" blue="0.1" /></rect></element>
+	<element name="b_orange"><rect><color red="0.9" green="0.3" blue="0.1" /></rect></element>
+	<element name="b_white"><rect><color red="0.9" green="0.9" blue="0.9" /></rect></element>
+	<element name="b_blue1"><rect><color red="0.3" green="0.7" blue="0.9" /></rect></element>
+	<element name="b_blue2"><rect><color red="0.7" green="0.8" blue="0.9" /></rect></element>
+	<element name="b_yellow1"><rect><color red="0.9" green="0.7" blue="0.1" /></rect></element>
+	<element name="b_yellow2"><rect><color red="0.7" green="0.6" blue="0.4" /></rect></element>
 
 	<element name="hl" defstate="0">
 		<text string=" ">
@@ -28,91 +38,26 @@ license:CC0-1.0
 		</disk>
 	</element>
 
-	<element name="b_green"><rect><color red="0.1" green="0.7" blue="0.2" /></rect></element>
-	<element name="text_yes">
-		<rect><color red="0.1" green="0.7" blue="0.2" /></rect>
-		<text string="YES"><color red="0.03" green="0.03" blue="0.03" /></text>
-	</element>
-	<element name="text_buy">
-		<rect><color red="0.1" green="0.7" blue="0.2" /></rect>
-		<text string="BUY"><color red="0.03" green="0.03" blue="0.03" /></text>
-	</element>
-
-	<element name="b_red"><rect><color red="0.9" green="0.1" blue="0.1" /></rect></element>
-	<element name="text_no">
-		<rect><color red="0.9" green="0.1" blue="0.1" /></rect>
-		<text string="NO"><color red="0.03" green="0.03" blue="0.03" /></text>
-	</element>
-	<element name="text_end">
-		<rect><color red="0.9" green="0.1" blue="0.1" /></rect>
-		<text string="END"><color red="0.03" green="0.03" blue="0.03" /></text>
-	</element>
-
-	<element name="b_orange"><rect><color red="0.9" green="0.3" blue="0.1" /></rect></element>
-	<element name="text_dark">
-		<rect><color red="0.9" green="0.3" blue="0.1" /></rect>
-		<text string="DARK"><color red="0.03" green="0.03" blue="0.03" /></text>
-	</element>
-	<element name="text_tower">
-		<rect><color red="0.9" green="0.3" blue="0.1" /></rect>
-		<text string="TOWER"><color red="0.03" green="0.03" blue="0.03" /></text>
-	</element>
-
-	<element name="b_white"><rect><color red="0.9" green="0.9" blue="0.9" /></rect></element>
-	<element name="text_clear">
-		<rect><color red="0.9" green="0.9" blue="0.9" /></rect>
-		<text string="CLEAR"><color red="0.03" green="0.03" blue="0.03" /></text>
-	</element>
-
-	<element name="b_blue1"><rect><color red="0.3" green="0.7" blue="0.9" /></rect></element>
-	<element name="text_bazaar">
-		<rect><color red="0.3" green="0.7" blue="0.9" /></rect>
-		<text string="BAZAAR"><color red="0.03" green="0.03" blue="0.03" /></text>
-	</element>
-	<element name="text_tomb">
-		<rect><color red="0.3" green="0.7" blue="0.9" /></rect>
-		<text string="TOMB"><color red="0.03" green="0.03" blue="0.03" /></text>
-	</element>
-	<element name="text_ruin">
-		<rect><color red="0.3" green="0.7" blue="0.9" /></rect>
-		<text string="RUIN"><color red="0.03" green="0.03" blue="0.03" /></text>
-	</element>
-	<element name="text_move">
-		<rect><color red="0.3" green="0.7" blue="0.9" /></rect>
-		<text string="MOVE"><color red="0.03" green="0.03" blue="0.03" /></text>
-	</element>
-	<element name="text_sanctuary">
-		<rect><color red="0.3" green="0.7" blue="0.9" /></rect>
-		<text string="SANCTUARY"><color red="0.03" green="0.03" blue="0.03" /></text>
-	</element>
-	<element name="text_citadel">
-		<rect><color red="0.3" green="0.7" blue="0.9" /></rect>
-		<text string="CITADEL"><color red="0.03" green="0.03" blue="0.03" /></text>
-	</element>
-	<element name="text_frontier">
-		<rect><color red="0.3" green="0.7" blue="0.9" /></rect>
-		<text string="FRONTIER"><color red="0.03" green="0.03" blue="0.03" /></text>
-	</element>
+	<element name="text_yes"><text string="YES"><color red="0.03" green="0.03" blue="0.03" /></text></element>
+	<element name="text_buy"><text string="BUY"><color red="0.03" green="0.03" blue="0.03" /></text></element>
+	<element name="text_no"><text string="NO"><color red="0.03" green="0.03" blue="0.03" /></text></element>
+	<element name="text_end"><text string="END"><color red="0.03" green="0.03" blue="0.03" /></text></element>
+	<element name="text_dark"><text string="DARK"><color red="0.03" green="0.03" blue="0.03" /></text></element>
+	<element name="text_tower"><text string="TOWER"><color red="0.03" green="0.03" blue="0.03" /></text></element>
+	<element name="text_clear"><text string="CLEAR"><color red="0.03" green="0.03" blue="0.03" /></text></element>
+	<element name="text_bazaar"><text string="BAZAAR"><color red="0.03" green="0.03" blue="0.03" /></text></element>
+	<element name="text_tomb"><text string="TOMB"><color red="0.03" green="0.03" blue="0.03" /></text></element>
+	<element name="text_ruin"><text string="RUIN"><color red="0.03" green="0.03" blue="0.03" /></text></element>
+	<element name="text_move"><text string="MOVE"><color red="0.03" green="0.03" blue="0.03" /></text></element>
+	<element name="text_sanctuary"><text string="SANCTUARY"><color red="0.03" green="0.03" blue="0.03" /></text></element>
+	<element name="text_citadel"><text string="CITADEL"><color red="0.03" green="0.03" blue="0.03" /></text></element>
+	<element name="text_frontier"><text string="FRONTIER"><color red="0.03" green="0.03" blue="0.03" /></text></element>
+	<element name="text_repeat"><text string="REPEAT"><color red="0.03" green="0.03" blue="0.03" /></text></element>
+	<element name="text_haggle"><text string="HAGGLE"><color red="0.03" green="0.03" blue="0.03" /></text></element>
+	<element name="text_inventory"><text string="INVENTORY"><color red="0.03" green="0.03" blue="0.03" /></text></element>
 
-	<element name="b_blue2"><rect><color red="0.7" green="0.8" blue="0.9" /></rect></element>
-	<element name="text_repeat">
-		<rect><color red="0.7" green="0.8" blue="0.9" /></rect>
-		<text string="REPEAT"><color red="0.03" green="0.03" blue="0.03" /></text>
-	</element>
 
-	<element name="b_yellow1"><rect><color red="0.9" green="0.7" blue="0.1" /></rect></element>
-	<element name="text_haggle">
-		<rect><color red="0.9" green="0.7" blue="0.1" /></rect>
-		<text string="HAGGLE"><color red="0.03" green="0.03" blue="0.03" /></text>
-	</element>
-
-	<element name="b_yellow2"><rect><color red="0.7" green="0.6" blue="0.4" /></rect></element>
-	<element name="text_inventory">
-		<rect><color red="0.7" green="0.6" blue="0.4" /></rect>
-		<text string="INVENTORY"><color red="0.03" green="0.03" blue="0.03" /></text>
-	</element>
-
-	<!-- cards -->
+<!-- cards -->
 
 	<element name="mask" defstate="0">
 		<text string=" "><color red="0.0" green="0.0" blue="0.0" /></text>
@@ -120,7 +65,6 @@ license:CC0-1.0
 	</element>
 
 	<element name="card1" defstate="0">
-		<rect><color red="1.0" green="1.0" blue="1.0" /></rect>
 		<text state="0" string="CURSED"><color red="0.0" green="0.0" blue="0.0" /></text>
 		<text state="1" string="VICTORY"><color red="0.0" green="0.0" blue="0.0" /></text>
 		<text state="2" string="WIZARD"><color red="0.0" green="0.0" blue="0.0" /></text>
@@ -132,7 +76,6 @@ license:CC0-1.0
 	</element>
 
 	<element name="card2" defstate="0">
-		<rect><color red="1.0" green="1.0" blue="1.0" /></rect>
 		<text state="0" string="LOST"><color red="0.0" green="0.0" blue="0.0" /></text>
 		<text state="1" string="WARRIORS"><color red="0.0" green="0.0" blue="0.0" /></text>
 		<text state="2" string="BAZAAR CLOSED"><color red="0.0" green="0.0" blue="0.0" /></text>
@@ -144,7 +87,6 @@ license:CC0-1.0
 	</element>
 
 	<element name="card3" defstate="0">
-		<rect><color red="1.0" green="1.0" blue="1.0" /></rect>
 		<text state="0" string="PLAGUE"><color red="0.0" green="0.0" blue="0.0" /></text>
 		<text state="1" string="BRIGANDS"><color red="0.0" green="0.0" blue="0.0" /></text>
 		<text state="2" string="KEY MISSING"><color red="0.0" green="0.0" blue="0.0" /></text>
@@ -172,8 +114,7 @@ license:CC0-1.0
 		<element name="digit1" ref="digit"><bounds x="10" y="3" width="10" height="15" /></element>
 		<element name="digit2" ref="digit"><bounds x="20" y="3" width="10" height="15" /></element>
 
-	<!-- button panel -->
-
+		<!-- button panel -->
 		<element ref="static_gray"><bounds x="40" y="56" width="40" height="53" /></element>
 		<element ref="static_black"><bounds x="41" y="57" width="40" height="53" /></element>
 
@@ -225,8 +166,7 @@ license:CC0-1.0
 		<element ref="hl" inputtag="IN.1" inputmask="0x01"><bounds x="55" y="97" width="12" height="12" /><color alpha="0.2" /></element>
 		<element ref="hl" inputtag="IN.0" inputmask="0x01"><bounds x="68" y="97" width="12" height="12" /><color alpha="0.2" /></element>
 
-	<!-- card lamps -->
-
+		<!-- card lamps -->
 		<element ref="static_white"><bounds x="1" y="28" width="38" height="25" /></element>
 		<element name="card_pos" ref="card1"><bounds x="1" y="38" width="38" height="5" /></element>
 		<element name="0.3" ref="mask">
@@ -248,8 +188,7 @@ license:CC0-1.0
 			<color alpha="0.8" />
 		</element>
 
-	<!-- motor status info -->
-
+		<!-- motor status info -->
 		<element ref="text_m1"><bounds x="7" y="112" width="22" height="4" /></element>
 		<element name="motor_pos" ref="counter"><bounds x="27.6" y="112" width="10" height="4" /></element>
 		<element ref="text_m2"><bounds x="31.4" y="112" width="5" height="4" /></element>
diff --git a/src/mame/layout/mcompgin.lay b/src/mame/layout/mcompgin.lay
index 4d54092e2bc..02b1c95128a 100644
--- a/src/mame/layout/mcompgin.lay
+++ b/src/mame/layout/mcompgin.lay
@@ -188,8 +188,7 @@ license:CC0-1.0
 		<element name="4.15" ref="text_draw"><bounds x="31" y="7" width="9" height="2.5" /></element>
 		<element name="4.12" ref="text_card"><bounds x="40" y="7" width="9" height="2.5" /></element>
 
-	<!-- cards -->
-
+		<!-- cards -->
 		<element name="3.22" ref="white"><bounds x="10" y="10" width="2.6" height="3.6" /></element>
 		<element name="3.21" ref="white"><bounds x="13" y="10" width="2.6" height="3.6" /></element>
 		<element name="3.20" ref="white"><bounds x="16" y="10" width="2.6" height="3.6" /></element>
diff --git a/src/mame/layout/mdndclab.lay b/src/mame/layout/mdndclab.lay
index 6ba765fbf09..02057781c19 100644
--- a/src/mame/layout/mdndclab.lay
+++ b/src/mame/layout/mdndclab.lay
@@ -122,101 +122,28 @@ license:CC0-1.0
 		</disk>
 	</element>
 
-	<element name="text_l01">
-		<rect><color red="0.55" green="0.1" blue="0.05" /></rect>
-		<text string="Switch"><color red="0.8" green="0.75" blue="0.7" /></text>
-	</element>
-	<element name="text_l02">
-		<rect><color red="0.55" green="0.1" blue="0.05" /></rect>
-		<text string="Key"><color red="0.8" green="0.75" blue="0.7" /></text>
-	</element>
-
-	<element name="text_l11">
-		<rect><color red="0.55" green="0.1" blue="0.05" /></rect>
-		<text string="Next Turn"><color red="0.8" green="0.75" blue="0.7" /></text>
-	</element>
-	<element name="text_l12">
-		<rect><color red="0.55" green="0.1" blue="0.05" /></rect>
-		<text string="Level 1/2"><color red="0.8" green="0.75" blue="0.7" /></text>
-	</element>
-
-	<element name="text_l21">
-		<rect><color red="0.55" green="0.1" blue="0.05" /></rect>
-		<text string="Dragon"><color red="0.8" green="0.75" blue="0.7" /></text>
-	</element>
-	<element name="text_l22">
-		<rect><color red="0.55" green="0.1" blue="0.05" /></rect>
-		<text string="Flying"><color red="0.8" green="0.75" blue="0.7" /></text>
-	</element>
-	<element name="text_l23">
-		<rect><color red="0.55" green="0.1" blue="0.05" /></rect>
-		<text string="Defeat"><color red="0.8" green="0.75" blue="0.7" /></text>
-	</element>
-	<element name="text_l24">
-		<rect><color red="0.55" green="0.1" blue="0.05" /></rect>
-		<text string="Tune"><color red="0.8" green="0.75" blue="0.7" /></text>
-	</element>
-
-	<element name="text_l31">
-		<rect><color red="0.55" green="0.1" blue="0.05" /></rect>
-		<text string="Dragon"><color red="0.8" green="0.75" blue="0.7" /></text>
-	</element>
-	<element name="text_l32">
-		<rect><color red="0.55" green="0.1" blue="0.05" /></rect>
-		<text string="Attacks"><color red="0.8" green="0.75" blue="0.7" /></text>
-	</element>
-	<element name="text_l33">
-		<rect><color red="0.55" green="0.1" blue="0.05" /></rect>
-		<text string="Dragon"><color red="0.8" green="0.75" blue="0.7" /></text>
-	</element>
-	<element name="text_l34">
-		<rect><color red="0.55" green="0.1" blue="0.05" /></rect>
-		<text string="Waits"><color red="0.8" green="0.75" blue="0.7" /></text>
-	</element>
-
-	<element name="text_l41">
-		<rect><color red="0.55" green="0.1" blue="0.05" /></rect>
-		<text string="Wall"><color red="0.8" green="0.75" blue="0.7" /></text>
-	</element>
-	<element name="text_l42">
-		<rect><color red="0.55" green="0.1" blue="0.05" /></rect>
-		<text string="Door"><color red="0.8" green="0.75" blue="0.7" /></text>
-	</element>
-
-	<element name="text_l51">
-		<rect><color red="0.55" green="0.1" blue="0.05" /></rect>
-		<text string="Illegal"><color red="0.8" green="0.75" blue="0.7" /></text>
-	</element>
-	<element name="text_l52">
-		<rect><color red="0.55" green="0.1" blue="0.05" /></rect>
-		<text string="Move"><color red="0.8" green="0.75" blue="0.7" /></text>
-	</element>
-	<element name="text_l53">
-		<rect><color red="0.55" green="0.1" blue="0.05" /></rect>
-		<text string="Warrior"><color red="0.8" green="0.75" blue="0.7" /></text>
-	</element>
-	<element name="text_l54">
-		<rect><color red="0.55" green="0.1" blue="0.05" /></rect>
-		<text string="Moves"><color red="0.8" green="0.75" blue="0.7" /></text>
-	</element>
-
-	<element name="text_l61">
-		<rect><color red="0.55" green="0.1" blue="0.05" /></rect>
-		<text string="Warrior 1"><color red="0.8" green="0.75" blue="0.7" /></text>
-	</element>
-	<element name="text_l62">
-		<rect><color red="0.55" green="0.1" blue="0.05" /></rect>
-		<text string="Winner"><color red="0.8" green="0.75" blue="0.7" /></text>
-	</element>
-
-	<element name="text_l71">
-		<rect><color red="0.55" green="0.1" blue="0.05" /></rect>
-		<text string="Warrior 2"><color red="0.8" green="0.75" blue="0.7" /></text>
-	</element>
-	<element name="text_l72">
-		<rect><color red="0.55" green="0.1" blue="0.05" /></rect>
-		<text string="Treasure"><color red="0.8" green="0.75" blue="0.7" /></text>
-	</element>
+	<element name="text_l01"><text string="Switch"><color red="0.8" green="0.75" blue="0.7" /></text></element>
+	<element name="text_l02"><text string="Key"><color red="0.8" green="0.75" blue="0.7" /></text></element>
+	<element name="text_l11"><text string="Next Turn"><color red="0.8" green="0.75" blue="0.7" /></text></element>
+	<element name="text_l12"><text string="Level 1/2"><color red="0.8" green="0.75" blue="0.7" /></text></element>
+	<element name="text_l21"><text string="Dragon"><color red="0.8" green="0.75" blue="0.7" /></text></element>
+	<element name="text_l22"><text string="Flying"><color red="0.8" green="0.75" blue="0.7" /></text></element>
+	<element name="text_l23"><text string="Defeat"><color red="0.8" green="0.75" blue="0.7" /></text></element>
+	<element name="text_l24"><text string="Tune"><color red="0.8" green="0.75" blue="0.7" /></text></element>
+	<element name="text_l31"><text string="Dragon"><color red="0.8" green="0.75" blue="0.7" /></text></element>
+	<element name="text_l32"><text string="Attacks"><color red="0.8" green="0.75" blue="0.7" /></text></element>
+	<element name="text_l33"><text string="Dragon"><color red="0.8" green="0.75" blue="0.7" /></text></element>
+	<element name="text_l34"><text string="Waits"><color red="0.8" green="0.75" blue="0.7" /></text></element>
+	<element name="text_l41"><text string="Wall"><color red="0.8" green="0.75" blue="0.7" /></text></element>
+	<element name="text_l42"><text string="Door"><color red="0.8" green="0.75" blue="0.7" /></text></element>
+	<element name="text_l51"><text string="Illegal"><color red="0.8" green="0.75" blue="0.7" /></text></element>
+	<element name="text_l52"><text string="Move"><color red="0.8" green="0.75" blue="0.7" /></text></element>
+	<element name="text_l53"><text string="Warrior"><color red="0.8" green="0.75" blue="0.7" /></text></element>
+	<element name="text_l54"><text string="Moves"><color red="0.8" green="0.75" blue="0.7" /></text></element>
+	<element name="text_l61"><text string="Warrior 1"><color red="0.8" green="0.75" blue="0.7" /></text></element>
+	<element name="text_l62"><text string="Winner"><color red="0.8" green="0.75" blue="0.7" /></text></element>
+	<element name="text_l71"><text string="Warrior 2"><color red="0.8" green="0.75" blue="0.7" /></text></element>
+	<element name="text_l72"><text string="Treasure"><color red="0.8" green="0.75" blue="0.7" /></text></element>
 
 	<element name="wall" defstate="0">
 		<rect state="1"><color red="0.55" green="0.1" blue="0.05" /></rect>
diff --git a/src/mame/layout/melodym.lay b/src/mame/layout/melodym.lay
index c045d9f7892..1909a56e588 100644
--- a/src/mame/layout/melodym.lay
+++ b/src/mame/layout/melodym.lay
@@ -6,7 +6,7 @@ license:CC0-1.0
 
 <!-- define elements -->
 
-	<element name="static_black2"><rect><color red="0.2" green="0.21" blue="0.23" /></rect></element>
+	<element name="black2"><rect><color red="0.2" green="0.21" blue="0.23" /></rect></element>
 	<element name="disk_yellow"><disk><color red="0.9" green="0.9" blue="0.2" /></disk></element>
 	<element name="disk_orange"><disk><color red="0.9" green="0.45" blue="0.15" /></disk></element>
 
@@ -15,120 +15,36 @@ license:CC0-1.0
 		<rect state="0"><color red="0.8" green="0.2" blue="0.1" /></rect>
 	</element>
 
-	<element name="text_l1">
-		<rect><color red="0.2" green="0.21" blue="0.23" /></rect>
-		<text string="Novice"><color red="0.9" green="0.9" blue="0.2" /></text>
-	</element>
-	<element name="text_l2">
-		<rect><color red="0.2" green="0.21" blue="0.23" /></rect>
-		<text string="Whiz"><color red="0.9" green="0.9" blue="0.2" /></text>
-	</element>
-	<element name="text_l3">
-		<rect><color red="0.2" green="0.21" blue="0.23" /></rect>
-		<text string="Pro"><color red="0.9" green="0.9" blue="0.2" /></text>
-	</element>
-	<element name="text_l4">
-		<rect><color red="0.2" green="0.21" blue="0.23" /></rect>
-		<text string="&#x266b;"><color red="0.9" green="0.9" blue="0.2" /></text>
-	</element>
-
-	<element name="text_b1">
-		<disk><color red="0.9" green="0.9" blue="0.2" /></disk>
-		<text string="1"><color red="0.02" green="0.02" blue="0.02" /></text>
-	</element>
-	<element name="text_b3">
-		<disk><color red="0.9" green="0.9" blue="0.2" /></disk>
-		<text string="3"><color red="0.02" green="0.02" blue="0.02" /></text>
-	</element>
-	<element name="text_b5">
-		<disk><color red="0.9" green="0.9" blue="0.2" /></disk>
-		<text string="5"><color red="0.02" green="0.02" blue="0.02" /></text>
-	</element>
-	<element name="text_b7">
-		<disk><color red="0.9" green="0.9" blue="0.2" /></disk>
-		<text string="7"><color red="0.02" green="0.02" blue="0.02" /></text>
-	</element>
-	<element name="text_b9">
-		<disk><color red="0.9" green="0.9" blue="0.2" /></disk>
-		<text string="9"><color red="0.02" green="0.02" blue="0.02" /></text>
-	</element>
-	<element name="text_b11">
-		<disk><color red="0.9" green="0.9" blue="0.2" /></disk>
-		<text string="11"><color red="0.02" green="0.02" blue="0.02" /></text>
-	</element>
-	<element name="text_b15">
-		<disk><color red="0.9" green="0.9" blue="0.2" /></disk>
-		<text string="15"><color red="0.02" green="0.02" blue="0.02" /></text>
-	</element>
-	<element name="text_b17">
-		<disk><color red="0.9" green="0.9" blue="0.2" /></disk>
-		<text string="17"><color red="0.02" green="0.02" blue="0.02" /></text>
-	</element>
-	<element name="text_b19">
-		<disk><color red="0.9" green="0.9" blue="0.2" /></disk>
-		<text string="19"><color red="0.02" green="0.02" blue="0.02" /></text>
-	</element>
-	<element name="text_b21">
-		<disk><color red="0.9" green="0.9" blue="0.2" /></disk>
-		<text string="21"><color red="0.02" green="0.02" blue="0.02" /></text>
-	</element>
-	<element name="text_b23">
-		<disk><color red="0.9" green="0.9" blue="0.2" /></disk>
-		<text string="23"><color red="0.02" green="0.02" blue="0.02" /></text>
-	</element>
-	<element name="text_b25">
-		<disk><color red="0.9" green="0.9" blue="0.2" /></disk>
-		<text string="25"><color red="0.02" green="0.02" blue="0.02" /></text>
-	</element>
-
-	<element name="text_b2">
-		<disk><color red="0.9" green="0.45" blue="0.15" /></disk>
-		<text string="2"><color red="0.02" green="0.02" blue="0.02" /></text>
-	</element>
-	<element name="text_b4">
-		<disk><color red="0.9" green="0.45" blue="0.15" /></disk>
-		<text string="4"><color red="0.02" green="0.02" blue="0.02" /></text>
-	</element>
-	<element name="text_b6">
-		<disk><color red="0.9" green="0.45" blue="0.15" /></disk>
-		<text string="6"><color red="0.02" green="0.02" blue="0.02" /></text>
-	</element>
-	<element name="text_b8">
-		<disk><color red="0.9" green="0.45" blue="0.15" /></disk>
-		<text string="8"><color red="0.02" green="0.02" blue="0.02" /></text>
-	</element>
-	<element name="text_b10">
-		<disk><color red="0.9" green="0.45" blue="0.15" /></disk>
-		<text string="10"><color red="0.02" green="0.02" blue="0.02" /></text>
-	</element>
-	<element name="text_b12">
-		<disk><color red="0.9" green="0.45" blue="0.15" /></disk>
-		<text string="12"><color red="0.02" green="0.02" blue="0.02" /></text>
-	</element>
-	<element name="text_b14">
-		<disk><color red="0.9" green="0.45" blue="0.15" /></disk>
-		<text string="14"><color red="0.02" green="0.02" blue="0.02" /></text>
-	</element>
-	<element name="text_b16">
-		<disk><color red="0.9" green="0.45" blue="0.15" /></disk>
-		<text string="16"><color red="0.02" green="0.02" blue="0.02" /></text>
-	</element>
-	<element name="text_b18">
-		<disk><color red="0.9" green="0.45" blue="0.15" /></disk>
-		<text string="18"><color red="0.02" green="0.02" blue="0.02" /></text>
-	</element>
-	<element name="text_b20">
-		<disk><color red="0.9" green="0.45" blue="0.15" /></disk>
-		<text string="20"><color red="0.02" green="0.02" blue="0.02" /></text>
-	</element>
-	<element name="text_b22">
-		<disk><color red="0.9" green="0.45" blue="0.15" /></disk>
-		<text string="22"><color red="0.02" green="0.02" blue="0.02" /></text>
-	</element>
-	<element name="text_b24">
-		<disk><color red="0.9" green="0.45" blue="0.15" /></disk>
-		<text string="24"><color red="0.02" green="0.02" blue="0.02" /></text>
-	</element>
+	<element name="text_l1"><text string="Novice"><color red="0.9" green="0.9" blue="0.2" /></text></element>
+	<element name="text_l2"><text string="Whiz"><color red="0.9" green="0.9" blue="0.2" /></text></element>
+	<element name="text_l3"><text string="Pro"><color red="0.9" green="0.9" blue="0.2" /></text></element>
+	<element name="text_l4"><text string="&#x266b;"><color red="0.9" green="0.9" blue="0.2" /></text></element> <!-- double music note -->
+
+	<element name="text_b1"><text string="1"><color red="0.02" green="0.02" blue="0.02" /></text></element>
+	<element name="text_b3"><text string="3"><color red="0.02" green="0.02" blue="0.02" /></text></element>
+	<element name="text_b5"><text string="5"><color red="0.02" green="0.02" blue="0.02" /></text></element>
+	<element name="text_b7"><text string="7"><color red="0.02" green="0.02" blue="0.02" /></text></element>
+	<element name="text_b9"><text string="9"><color red="0.02" green="0.02" blue="0.02" /></text></element>
+	<element name="text_b11"><text string="11"><color red="0.02" green="0.02" blue="0.02" /></text></element>
+	<element name="text_b15"><text string="15"><color red="0.02" green="0.02" blue="0.02" /></text></element>
+	<element name="text_b17"><text string="17"><color red="0.02" green="0.02" blue="0.02" /></text></element>
+	<element name="text_b19"><text string="19"><color red="0.02" green="0.02" blue="0.02" /></text></element>
+	<element name="text_b21"><text string="21"><color red="0.02" green="0.02" blue="0.02" /></text></element>
+	<element name="text_b23"><text string="23"><color red="0.02" green="0.02" blue="0.02" /></text></element>
+	<element name="text_b25"><text string="25"><color red="0.02" green="0.02" blue="0.02" /></text></element>
+
+	<element name="text_b2"><text string="2"><color red="0.02" green="0.02" blue="0.02" /></text></element>
+	<element name="text_b4"><text string="4"><color red="0.02" green="0.02" blue="0.02" /></text></element>
+	<element name="text_b6"><text string="6"><color red="0.02" green="0.02" blue="0.02" /></text></element>
+	<element name="text_b8"><text string="8"><color red="0.02" green="0.02" blue="0.02" /></text></element>
+	<element name="text_b10"><text string="10"><color red="0.02" green="0.02" blue="0.02" /></text></element>
+	<element name="text_b12"><text string="12"><color red="0.02" green="0.02" blue="0.02" /></text></element>
+	<element name="text_b14"><text string="14"><color red="0.02" green="0.02" blue="0.02" /></text></element>
+	<element name="text_b16"><text string="16"><color red="0.02" green="0.02" blue="0.02" /></text></element>
+	<element name="text_b18"><text string="18"><color red="0.02" green="0.02" blue="0.02" /></text></element>
+	<element name="text_b20"><text string="20"><color red="0.02" green="0.02" blue="0.02" /></text></element>
+	<element name="text_b22"><text string="22"><color red="0.02" green="0.02" blue="0.02" /></text></element>
+	<element name="text_b24"><text string="24"><color red="0.02" green="0.02" blue="0.02" /></text></element>
 
 	<element name="hl" defstate="0">
 		<text string=" "><color red="0.0" green="0.0" blue="0.0" /></text>
@@ -148,12 +64,11 @@ license:CC0-1.0
 		<element name="0.0" ref="lamp"><bounds x="0" y="-5" width="17" height="8" /></element>
 		<element name="0.0" ref="lamp"><bounds x="27" y="-5" width="17" height="8" /></element>
 
-	<!-- upper buttons -->
-
-		<element ref="static_black2"><bounds x="9"  y="4" width="8" height="5" /></element>
-		<element ref="static_black2"><bounds x="18" y="4" width="8" height="5" /></element>
-		<element ref="static_black2"><bounds x="27" y="4" width="8" height="5" /></element>
-		<element ref="static_black2"><bounds x="36" y="4" width="8" height="5" /></element>
+		<!-- upper buttons -->
+		<element ref="black2"><bounds x="9"  y="4" width="8" height="5" /></element>
+		<element ref="black2"><bounds x="18" y="4" width="8" height="5" /></element>
+		<element ref="black2"><bounds x="27" y="4" width="8" height="5" /></element>
+		<element ref="black2"><bounds x="36" y="4" width="8" height="5" /></element>
 
 		<element ref="text_l1"><bounds x="9"  y="5.1" width="8" height="2.8" /></element>
 		<element ref="text_l2"><bounds x="18" y="5.1" width="8" height="2.8" /></element>
@@ -165,8 +80,7 @@ license:CC0-1.0
 		<element ref="hl2" inputtag="IN.5" inputmask="0x04"><bounds x="27" y="4" width="8" height="5" /><color alpha="0.15" /></element>
 		<element ref="hl2" inputtag="IN.5" inputmask="0x08"><bounds x="36" y="4" width="8" height="5" /><color alpha="0.15" /></element>
 
-	<!-- main buttons -->
-
+		<!-- main buttons -->
 		<element ref="disk_yellow"><bounds x="0"  y="10" width="8" height="8" /></element>
 		<element ref="disk_orange"><bounds x="9"  y="10" width="8" height="8" /></element>
 		<element ref="disk_yellow"><bounds x="18" y="10" width="8" height="8" /></element>
diff --git a/src/mame/layout/mephisto_1.lay b/src/mame/layout/mephisto_1.lay
index 90fcac0d139..cfc460ca4b0 100644
--- a/src/mame/layout/mephisto_1.lay
+++ b/src/mame/layout/mephisto_1.lay
@@ -8,18 +8,9 @@ license:CC0-1.0
 
 <!-- schach labels -->
 
-	<element name="text_schach">
-		<rect><color red="0.11" green="0.105" blue="0.10" /></rect>
-		<text string="SCHACH"><color red="0.3" green="0.3" blue="0.31" /></text>
-	</element>
-	<element name="text_matt">
-		<rect><color red="0.11" green="0.105" blue="0.10" /></rect>
-		<text string="MATT"><color red="0.3" green="0.3" blue="0.31" /></text>
-	</element>
-	<element name="text_patt">
-		<rect><color red="0.11" green="0.105" blue="0.10" /></rect>
-		<text string="PATT"><color red="0.3" green="0.3" blue="0.31" /></text>
-	</element>
+	<element name="text_schach"><text string="SCHACH"><color red="0.3" green="0.3" blue="0.31" /></text></element>
+	<element name="text_matt"><text string="MATT"><color red="0.3" green="0.3" blue="0.31" /></text></element>
+	<element name="text_patt"><text string="PATT"><color red="0.3" green="0.3" blue="0.31" /></text></element>
 
 	<group name="labels">
 		<bounds x="0" y="0" width="22.5" height="6" />
diff --git a/src/mame/layout/mephisto_3.lay b/src/mame/layout/mephisto_3.lay
index 482feb185c3..754e510b067 100644
--- a/src/mame/layout/mephisto_3.lay
+++ b/src/mame/layout/mephisto_3.lay
@@ -15,71 +15,23 @@ license:CC0-1.0
 		<disk state="0"><color red="0.01" green="0.1" blue="0.015" /></disk>
 	</element>
 
-	<element name="text_1">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="1"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_2">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="2"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_3">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="3"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_4">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="4"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_5">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="5"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_6">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="6"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_7">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="7"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_8">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="8"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-
-	<element name="text_a">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="A"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_b">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="B"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_c">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="C"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_d">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="D"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_e">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="E"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_f">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="F"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_g">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="G"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
-	<element name="text_h">
-		<rect><color red="0.56" green="0.33" blue="0.12" /></rect>
-		<text string="H"><color red="0.87" green="0.87" blue="0.84" /></text>
-	</element>
+	<element name="text_1"><text string="1"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_2"><text string="2"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_3"><text string="3"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_4"><text string="4"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_5"><text string="5"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_6"><text string="6"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_7"><text string="7"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_8"><text string="8"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+
+	<element name="text_a"><text string="A"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_b"><text string="B"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_c"><text string="C"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_d"><text string="D"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_e"><text string="E"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_f"><text string="F"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_g"><text string="G"><color red="0.87" green="0.87" blue="0.84" /></text></element>
+	<element name="text_h"><text string="H"><color red="0.87" green="0.87" blue="0.84" /></text></element>
 
 
 <!-- sb board -->
@@ -258,43 +210,23 @@ license:CC0-1.0
 	<element name="text_uit1"><text string="S.BOARD"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uit2"><text string="INTERFACE"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uib1"><text string="BOARD:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uib2">
-		<rect><color red="0.84" green="0.75" blue="0.50" /></rect>
-		<text string="RESET"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uib3">
-		<rect><color red="0.84" green="0.75" blue="0.50" /></rect>
-		<text string="CLEAR"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uib2"><text string="RESET"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uib3"><text string="CLEAR"><color red="0.01" green="0.01" blue="0.01" /></text></element>
 	<element name="text_uis1"><text string="SPAWN:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uih1"><text string="HAND:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uih2">
-		<rect><color red="0.84" green="0.75" blue="0.50" /></rect>
-		<text string="REMOVE"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uih2"><text string="REMOVE"><color red="0.01" green="0.01" blue="0.01" /></text></element>
 	<element name="text_uiu1"><text string="UNDO:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uiu2a">
-		<rect><color red="0.84" green="0.75" blue="0.50" /></rect>
-		<text string=" &lt;&lt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2b">
-		<rect><color red="0.84" green="0.75" blue="0.50" /></rect>
-		<text string=" &lt;  "><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2c">
-		<rect><color red="0.84" green="0.75" blue="0.50" /></rect>
-		<text string="   &gt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2d">
-		<rect><color red="0.84" green="0.75" blue="0.50" /></rect>
-		<text string=" &gt;&gt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uiu2a"><text string=" &lt;&lt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2b"><text string=" &lt;  "><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2c"><text string="   &gt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2d"><text string=" &gt;&gt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu3b"><text string="/"><color red="0.81" green="0.8" blue="0.79" /></text></element>
+
 	<element name="text_uiu3a" defstate="0">
 		<simplecounter maxstate="999" digits="1" align="2">
 			<color red="0.81" green="0.8" blue="0.79" />
 		</simplecounter>
 	</element>
-	<element name="text_uiu3b"><text string="/"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uiu3c" defstate="0">
 		<simplecounter maxstate="999" digits="1" align="1">
 			<color red="0.81" green="0.8" blue="0.79" />
@@ -384,18 +316,9 @@ license:CC0-1.0
 
 <!-- schach labels -->
 
-	<element name="text_schach">
-		<rect><color red="0.11" green="0.105" blue="0.10" /></rect>
-		<text string="SCHACH"><color red="0.3" green="0.3" blue="0.31" /></text>
-	</element>
-	<element name="text_matt">
-		<rect><color red="0.11" green="0.105" blue="0.10" /></rect>
-		<text string="MATT"><color red="0.3" green="0.3" blue="0.31" /></text>
-	</element>
-	<element name="text_patt">
-		<rect><color red="0.11" green="0.105" blue="0.10" /></rect>
-		<text string="PATT"><color red="0.3" green="0.3" blue="0.31" /></text>
-	</element>
+	<element name="text_schach"><text string="SCHACH"><color red="0.3" green="0.3" blue="0.31" /></text></element>
+	<element name="text_matt"><text string="MATT"><color red="0.3" green="0.3" blue="0.31" /></text></element>
+	<element name="text_patt"><text string="PATT"><color red="0.3" green="0.3" blue="0.31" /></text></element>
 
 	<group name="labels">
 		<bounds x="0" y="0" width="22.5" height="6" />
diff --git a/src/mame/layout/mephisto_academy.lay b/src/mame/layout/mephisto_academy.lay
index 8b792c7eddc..0e46a6e3823 100644
--- a/src/mame/layout/mephisto_academy.lay
+++ b/src/mame/layout/mephisto_academy.lay
@@ -71,33 +71,33 @@ license:CC0-1.0
 	<element name="white"><rect><color red="0.84" green="0.75" blue="0.50" /></rect></element>
 	<element name="blackb"><rect><color red="0" green="0" blue="0" /></rect></element>
 
-	<element name="text_1">         <rect><color red="0.56" green="0.33" blue="0.12" /></rect>    <text string="1">             <color red="0.87" green="0.87" blue="0.84" /></text> </element>
-	<element name="text_2">         <rect><color red="0.56" green="0.33" blue="0.12" /></rect>    <text string="2">             <color red="0.87" green="0.87" blue="0.84" /></text> </element>
-	<element name="text_3">         <rect><color red="0.56" green="0.33" blue="0.12" /></rect>    <text string="3">             <color red="0.87" green="0.87" blue="0.84" /></text> </element>
-	<element name="text_4">         <rect><color red="0.56" green="0.33" blue="0.12" /></rect>    <text string="4">             <color red="0.87" green="0.87" blue="0.84" /></text> </element>
-	<element name="text_5">         <rect><color red="0.56" green="0.33" blue="0.12" /></rect>    <text string="5">             <color red="0.87" green="0.87" blue="0.84" /></text> </element>
-	<element name="text_6">         <rect><color red="0.56" green="0.33" blue="0.12" /></rect>    <text string="6">             <color red="0.87" green="0.87" blue="0.84" /></text> </element>
-	<element name="text_7">         <rect><color red="0.56" green="0.33" blue="0.12" /></rect>    <text string="7">             <color red="0.87" green="0.87" blue="0.84" /></text> </element>
-	<element name="text_8">         <rect><color red="0.56" green="0.33" blue="0.12" /></rect>    <text string="8">             <color red="0.87" green="0.87" blue="0.84" /></text> </element>
-	<element name="text_a">         <rect><color red="0.56" green="0.33" blue="0.12" /></rect>    <text string="A">             <color red="0.87" green="0.87" blue="0.84" /></text> </element>
-	<element name="text_b">         <rect><color red="0.56" green="0.33" blue="0.12" /></rect>    <text string="B">             <color red="0.87" green="0.87" blue="0.84" /></text> </element>
-	<element name="text_c">         <rect><color red="0.56" green="0.33" blue="0.12" /></rect>    <text string="C">             <color red="0.87" green="0.87" blue="0.84" /></text> </element>
-	<element name="text_d">         <rect><color red="0.56" green="0.33" blue="0.12" /></rect>    <text string="D">             <color red="0.87" green="0.87" blue="0.84" /></text> </element>
-	<element name="text_e">         <rect><color red="0.56" green="0.33" blue="0.12" /></rect>    <text string="E">             <color red="0.87" green="0.87" blue="0.84" /></text> </element>
-	<element name="text_f">         <rect><color red="0.56" green="0.33" blue="0.12" /></rect>    <text string="F">             <color red="0.87" green="0.87" blue="0.84" /></text> </element>
-	<element name="text_g">         <rect><color red="0.56" green="0.33" blue="0.12" /></rect>    <text string="G">             <color red="0.87" green="0.87" blue="0.84" /></text> </element>
-	<element name="text_h">         <rect><color red="0.56" green="0.33" blue="0.12" /></rect>    <text string="H">             <color red="0.87" green="0.87" blue="0.84" /></text> </element>
-
-	<element name="text_train">     <rect><color red="0.56" green="0.33" blue="0.12" /></rect>    <text string="TRAIN">         <color red="0.87" green="0.87" blue="0.84" /></text> </element>
-	<element name="text_info">      <rect><color red="0.56" green="0.33" blue="0.12" /></rect>    <text string="INFO">          <color red="0.87" green="0.87" blue="0.84" /></text> </element>
-	<element name="text_mem">       <rect><color red="0.56" green="0.33" blue="0.12" /></rect>    <text string="MEM">           <color red="0.87" green="0.87" blue="0.84" /></text> </element>
-	<element name="text_pos">       <rect><color red="0.56" green="0.33" blue="0.12" /></rect>    <text string="POS">           <color red="0.87" green="0.87" blue="0.84" /></text> </element>
-	<element name="text_lev">       <rect><color red="0.56" green="0.33" blue="0.12" /></rect>    <text string="LEV">           <color red="0.87" green="0.87" blue="0.84" /></text> </element>
-	<element name="text_fct">       <rect><color red="0.56" green="0.33" blue="0.12" /></rect>    <text string="FCT">           <color red="0.87" green="0.87" blue="0.84" /></text> </element>
-	<element name="text_ent">       <rect><color red="0.56" green="0.33" blue="0.12" /></rect>    <text string="ENT">           <color red="0.87" green="0.87" blue="0.84" /></text> </element>
-	<element name="text_cl">        <rect><color red="0.56" green="0.33" blue="0.12" /></rect>    <text string="CL">            <color red="0.87" green="0.87" blue="0.84" /></text> </element>
-	<element name="text_newgame">   <rect><color red="0.56" green="0.33" blue="0.12" /></rect>    <text string="NEW GAME">      <color red="0.87" green="0.87" blue="0.84" /></text> </element>
-	<element name="text_lcd">       <rect><color red="0.56" green="0.33" blue="0.12" /></rect>    <text string="MULTI INFO LCD"><color red="0.87" green="0.87" blue="0.84" /></text> </element>
+	<element name="text_1">       <text string="1">             <color red="0.87" green="0.87" blue="0.84" /></text> </element>
+	<element name="text_2">       <text string="2">             <color red="0.87" green="0.87" blue="0.84" /></text> </element>
+	<element name="text_3">       <text string="3">             <color red="0.87" green="0.87" blue="0.84" /></text> </element>
+	<element name="text_4">       <text string="4">             <color red="0.87" green="0.87" blue="0.84" /></text> </element>
+	<element name="text_5">       <text string="5">             <color red="0.87" green="0.87" blue="0.84" /></text> </element>
+	<element name="text_6">       <text string="6">             <color red="0.87" green="0.87" blue="0.84" /></text> </element>
+	<element name="text_7">       <text string="7">             <color red="0.87" green="0.87" blue="0.84" /></text> </element>
+	<element name="text_8">       <text string="8">             <color red="0.87" green="0.87" blue="0.84" /></text> </element>
+	<element name="text_a">       <text string="A">             <color red="0.87" green="0.87" blue="0.84" /></text> </element>
+	<element name="text_b">       <text string="B">             <color red="0.87" green="0.87" blue="0.84" /></text> </element>
+	<element name="text_c">       <text string="C">             <color red="0.87" green="0.87" blue="0.84" /></text> </element>
+	<element name="text_d">       <text string="D">             <color red="0.87" green="0.87" blue="0.84" /></text> </element>
+	<element name="text_e">       <text string="E">             <color red="0.87" green="0.87" blue="0.84" /></text> </element>
+	<element name="text_f">       <text string="F">             <color red="0.87" green="0.87" blue="0.84" /></text> </element>
+	<element name="text_g">       <text string="G">             <color red="0.87" green="0.87" blue="0.84" /></text> </element>
+	<element name="text_h">       <text string="H">             <color red="0.87" green="0.87" blue="0.84" /></text> </element>
+
+	<element name="text_train">   <text string="TRAIN">         <color red="0.87" green="0.87" blue="0.84" /></text> </element>
+	<element name="text_info">    <text string="INFO">          <color red="0.87" green="0.87" blue="0.84" /></text> </element>
+	<element name="text_mem">     <text string="MEM">           <color red="0.87" green="0.87" blue="0.84" /></text> </element>
+	<element name="text_pos">     <text string="POS">           <color red="0.87" green="0.87" blue="0.84" /></text> </element>
+	<element name="text_lev">     <text string="LEV">           <color red="0.87" green="0.87" blue="0.84" /></text> </element>
+	<element name="text_fct">     <text string="FCT">           <color red="0.87" green="0.87" blue="0.84" /></text> </element>
+	<element name="text_ent">     <text string="ENT">           <color red="0.87" green="0.87" blue="0.84" /></text> </element>
+	<element name="text_cl">      <text string="CL">            <color red="0.87" green="0.87" blue="0.84" /></text> </element>
+	<element name="text_newgame"> <text string="NEW GAME">      <color red="0.87" green="0.87" blue="0.84" /></text> </element>
+	<element name="text_lcd">     <text string="MULTI INFO LCD"><color red="0.87" green="0.87" blue="0.84" /></text> </element>
 
 	<element name="text_p1"><image file="chess/wk.svg"/></element>
 	<element name="text_p2"><image file="chess/wq.svg"/></element>
@@ -299,43 +299,23 @@ license:CC0-1.0
 	<element name="text_uit1"><text string="S.BOARD"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uit2"><text string="INTERFACE"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uib1"><text string="BOARD:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uib2">
-		<rect><color red="0.84" green="0.75" blue="0.50" /></rect>
-		<text string="RESET"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uib3">
-		<rect><color red="0.84" green="0.75" blue="0.50" /></rect>
-		<text string="CLEAR"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uib2"><text string="RESET"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uib3"><text string="CLEAR"><color red="0.01" green="0.01" blue="0.01" /></text></element>
 	<element name="text_uis1"><text string="SPAWN:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uih1"><text string="HAND:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uih2">
-		<rect><color red="0.84" green="0.75" blue="0.50" /></rect>
-		<text string="REMOVE"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uih2"><text string="REMOVE"><color red="0.01" green="0.01" blue="0.01" /></text></element>
 	<element name="text_uiu1"><text string="UNDO:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uiu2a">
-		<rect><color red="0.84" green="0.75" blue="0.50" /></rect>
-		<text string=" &lt;&lt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2b">
-		<rect><color red="0.84" green="0.75" blue="0.50" /></rect>
-		<text string=" &lt;  "><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2c">
-		<rect><color red="0.84" green="0.75" blue="0.50" /></rect>
-		<text string="   &gt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2d">
-		<rect><color red="0.84" green="0.75" blue="0.50" /></rect>
-		<text string=" &gt;&gt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uiu2a"><text string=" &lt;&lt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2b"><text string=" &lt;  "><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2c"><text string="   &gt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2d"><text string=" &gt;&gt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu3b"><text string="/"><color red="0.81" green="0.8" blue="0.79" /></text></element>
+
 	<element name="text_uiu3a" defstate="0">
 		<simplecounter maxstate="999" digits="1" align="2">
 			<color red="0.81" green="0.8" blue="0.79" />
 		</simplecounter>
 	</element>
-	<element name="text_uiu3b"><text string="/"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uiu3c" defstate="0">
 		<simplecounter maxstate="999" digits="1" align="1">
 			<color red="0.81" green="0.8" blue="0.79" />
diff --git a/src/mame/layout/mephisto_alm16.lay b/src/mame/layout/mephisto_alm16.lay
index 578ea2669fe..244200e59ab 100644
--- a/src/mame/layout/mephisto_alm16.lay
+++ b/src/mame/layout/mephisto_alm16.lay
@@ -11,22 +11,22 @@ license:CC0-1.0
 		<disk state="0"><color red="0.1" green="0.01" blue="0.015" /></disk>
 	</element>
 
-	<element name="text_1"> <rect><color red="0.56" green="0.33" blue="0.12" /></rect> <text string="1"><color red="0.87" green="0.87" blue="0.84" /></text> </element>
-	<element name="text_2"> <rect><color red="0.56" green="0.33" blue="0.12" /></rect> <text string="2"><color red="0.87" green="0.87" blue="0.84" /></text> </element>
-	<element name="text_3"> <rect><color red="0.56" green="0.33" blue="0.12" /></rect> <text string="3"><color red="0.87" green="0.87" blue="0.84" /></text> </element>
-	<element name="text_4"> <rect><color red="0.56" green="0.33" blue="0.12" /></rect> <text string="4"><color red="0.87" green="0.87" blue="0.84" /></text> </element>
-	<element name="text_5"> <rect><color red="0.56" green="0.33" blue="0.12" /></rect> <text string="5"><color red="0.87" green="0.87" blue="0.84" /></text> </element>
-	<element name="text_6"> <rect><color red="0.56" green="0.33" blue="0.12" /></rect> <text string="6"><color red="0.87" green="0.87" blue="0.84" /></text> </element>
-	<element name="text_7"> <rect><color red="0.56" green="0.33" blue="0.12" /></rect> <text string="7"><color red="0.87" green="0.87" blue="0.84" /></text> </element>
-	<element name="text_8"> <rect><color red="0.56" green="0.33" blue="0.12" /></rect> <text string="8"><color red="0.87" green="0.87" blue="0.84" /></text> </element>
-	<element name="text_a"> <rect><color red="0.56" green="0.33" blue="0.12" /></rect> <text string="A"><color red="0.87" green="0.87" blue="0.84" /></text> </element>
-	<element name="text_b"> <rect><color red="0.56" green="0.33" blue="0.12" /></rect> <text string="B"><color red="0.87" green="0.87" blue="0.84" /></text> </element>
-	<element name="text_c"> <rect><color red="0.56" green="0.33" blue="0.12" /></rect> <text string="C"><color red="0.87" green="0.87" blue="0.84" /></text> </element>
-	<element name="text_d"> <rect><color red="0.56" green="0.33" blue="0.12" /></rect> <text string="D"><color red="0.87" green="0.87" blue="0.84" /></text> </element>
-	<element name="text_e"> <rect><color red="0.56" green="0.33" blue="0.12" /></rect> <text string="E"><color red="0.87" green="0.87" blue="0.84" /></text> </element>
-	<element name="text_f"> <rect><color red="0.56" green="0.33" blue="0.12" /></rect> <text string="F"><color red="0.87" green="0.87" blue="0.84" /></text> </element>
-	<element name="text_g"> <rect><color red="0.56" green="0.33" blue="0.12" /></rect> <text string="G"><color red="0.87" green="0.87" blue="0.84" /></text> </element>
-	<element name="text_h"> <rect><color red="0.56" green="0.33" blue="0.12" /></rect> <text string="H"><color red="0.87" green="0.87" blue="0.84" /></text> </element>
+	<element name="text_1"> <text string="1"><color red="0.87" green="0.87" blue="0.84" /></text> </element>
+	<element name="text_2"> <text string="2"><color red="0.87" green="0.87" blue="0.84" /></text> </element>
+	<element name="text_3"> <text string="3"><color red="0.87" green="0.87" blue="0.84" /></text> </element>
+	<element name="text_4"> <text string="4"><color red="0.87" green="0.87" blue="0.84" /></text> </element>
+	<element name="text_5"> <text string="5"><color red="0.87" green="0.87" blue="0.84" /></text> </element>
+	<element name="text_6"> <text string="6"><color red="0.87" green="0.87" blue="0.84" /></text> </element>
+	<element name="text_7"> <text string="7"><color red="0.87" green="0.87" blue="0.84" /></text> </element>
+	<element name="text_8"> <text string="8"><color red="0.87" green="0.87" blue="0.84" /></text> </element>
+	<element name="text_a"> <text string="A"><color red="0.87" green="0.87" blue="0.84" /></text> </element>
+	<element name="text_b"> <text string="B"><color red="0.87" green="0.87" blue="0.84" /></text> </element>
+	<element name="text_c"> <text string="C"><color red="0.87" green="0.87" blue="0.84" /></text> </element>
+	<element name="text_d"> <text string="D"><color red="0.87" green="0.87" blue="0.84" /></text> </element>
+	<element name="text_e"> <text string="E"><color red="0.87" green="0.87" blue="0.84" /></text> </element>
+	<element name="text_f"> <text string="F"><color red="0.87" green="0.87" blue="0.84" /></text> </element>
+	<element name="text_g"> <text string="G"><color red="0.87" green="0.87" blue="0.84" /></text> </element>
+	<element name="text_h"> <text string="H"><color red="0.87" green="0.87" blue="0.84" /></text> </element>
 
 
 <!-- sb board -->
@@ -242,43 +242,23 @@ license:CC0-1.0
 	</element>
 	<element name="text_uit2"><text string="INTERFACE"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uib1"><text string="BOARD:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uib2">
-		<rect><color red="0.84" green="0.75" blue="0.50" /></rect>
-		<text string="RESET"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uib3">
-		<rect><color red="0.84" green="0.75" blue="0.50" /></rect>
-		<text string="CLEAR"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uib2"><text string="RESET"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uib3"><text string="CLEAR"><color red="0.01" green="0.01" blue="0.01" /></text></element>
 	<element name="text_uis1"><text string="SPAWN:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uih1"><text string="HAND:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uih2">
-		<rect><color red="0.84" green="0.75" blue="0.50" /></rect>
-		<text string="REMOVE"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uih2"><text string="REMOVE"><color red="0.01" green="0.01" blue="0.01" /></text></element>
 	<element name="text_uiu1"><text string="UNDO:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uiu2a">
-		<rect><color red="0.84" green="0.75" blue="0.50" /></rect>
-		<text string=" &lt;&lt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2b">
-		<rect><color red="0.84" green="0.75" blue="0.50" /></rect>
-		<text string=" &lt;  "><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2c">
-		<rect><color red="0.84" green="0.75" blue="0.50" /></rect>
-		<text string="   &gt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2d">
-		<rect><color red="0.84" green="0.75" blue="0.50" /></rect>
-		<text string=" &gt;&gt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uiu2a"><text string=" &lt;&lt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2b"><text string=" &lt;  "><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2c"><text string="   &gt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2d"><text string=" &gt;&gt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu3b"><text string="/"><color red="0.81" green="0.8" blue="0.79" /></text></element>
+
 	<element name="text_uiu3a" defstate="0">
 		<simplecounter maxstate="999" digits="1" align="2">
 			<color red="0.81" green="0.8" blue="0.79" />
 		</simplecounter>
 	</element>
-	<element name="text_uiu3b"><text string="/"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uiu3c" defstate="0">
 		<simplecounter maxstate="999" digits="1" align="1">
 			<color red="0.81" green="0.8" blue="0.79" />
@@ -400,12 +380,12 @@ license:CC0-1.0
 	<element name="green"><rect><color red="0" green="0.5" blue="0.25" /></rect></element>
 	<element name="red">  <rect><color red="0.75" green="0.15" blue="0.15" /></rect></element>
 
-	<element name="text_ent"><rect><color red="0" green="0.5" blue="0.25" /></rect>    <text string="ENT"> <color red="1" green="1" blue="1" /></text> </element>
-	<element name="text_cl"> <rect><color red="0.75" green="0.15" blue="0.15" /></rect><text string="CL">  <color red="1" green="1" blue="1" /></text> </element>
-	<element name="text_left"> <rect><color red="0.25" green="0.25" blue="0.25" /></rect><text string="&#x2190;"> <color red="1" green="1" blue="1" /></text> </element>
-	<element name="text_up">   <rect><color red="0.25" green="0.25" blue="0.25" /></rect><text string="&#x2191;"> <color red="1" green="1" blue="1" /></text> </element>
-	<element name="text_right"><rect><color red="0.25" green="0.25" blue="0.25" /></rect><text string="&#x2192;"> <color red="1" green="1" blue="1" /></text> </element>
-	<element name="text_down"> <rect><color red="0.25" green="0.25" blue="0.25" /></rect><text string="&#x2193;"> <color red="1" green="1" blue="1" /></text> </element>
+	<element name="text_ent">   <text string="ENT"> <color red="1" green="1" blue="1" /></text> </element>
+	<element name="text_cl">    <text string="CL">  <color red="1" green="1" blue="1" /></text> </element>
+	<element name="text_left">  <text string="&#x2190;"> <color red="1" green="1" blue="1" /></text> </element>
+	<element name="text_up">    <text string="&#x2191;"> <color red="1" green="1" blue="1" /></text> </element>
+	<element name="text_right"> <text string="&#x2192;"> <color red="1" green="1" blue="1" /></text> </element>
+	<element name="text_down">  <text string="&#x2193;"> <color red="1" green="1" blue="1" /></text> </element>
 
 	<element name="keys" defstate="0">
 		<rect state="1"><color red="0.0" green="0.0" blue="0.0" /></rect>
diff --git a/src/mame/layout/mephisto_alm32.lay b/src/mame/layout/mephisto_alm32.lay
index da9adb88623..61f4713b94a 100644
--- a/src/mame/layout/mephisto_alm32.lay
+++ b/src/mame/layout/mephisto_alm32.lay
@@ -11,22 +11,22 @@ license:CC0-1.0
 		<disk state="0"><color red="0.1" green="0.01" blue="0.015" /></disk>
 	</element>
 
-	<element name="text_1"> <rect><color red="0.56" green="0.33" blue="0.12" /></rect> <text string="1"><color red="0.87" green="0.87" blue="0.84" /></text> </element>
-	<element name="text_2"> <rect><color red="0.56" green="0.33" blue="0.12" /></rect> <text string="2"><color red="0.87" green="0.87" blue="0.84" /></text> </element>
-	<element name="text_3"> <rect><color red="0.56" green="0.33" blue="0.12" /></rect> <text string="3"><color red="0.87" green="0.87" blue="0.84" /></text> </element>
-	<element name="text_4"> <rect><color red="0.56" green="0.33" blue="0.12" /></rect> <text string="4"><color red="0.87" green="0.87" blue="0.84" /></text> </element>
-	<element name="text_5"> <rect><color red="0.56" green="0.33" blue="0.12" /></rect> <text string="5"><color red="0.87" green="0.87" blue="0.84" /></text> </element>
-	<element name="text_6"> <rect><color red="0.56" green="0.33" blue="0.12" /></rect> <text string="6"><color red="0.87" green="0.87" blue="0.84" /></text> </element>
-	<element name="text_7"> <rect><color red="0.56" green="0.33" blue="0.12" /></rect> <text string="7"><color red="0.87" green="0.87" blue="0.84" /></text> </element>
-	<element name="text_8"> <rect><color red="0.56" green="0.33" blue="0.12" /></rect> <text string="8"><color red="0.87" green="0.87" blue="0.84" /></text> </element>
-	<element name="text_a"> <rect><color red="0.56" green="0.33" blue="0.12" /></rect> <text string="A"><color red="0.87" green="0.87" blue="0.84" /></text> </element>
-	<element name="text_b"> <rect><color red="0.56" green="0.33" blue="0.12" /></rect> <text string="B"><color red="0.87" green="0.87" blue="0.84" /></text> </element>
-	<element name="text_c"> <rect><color red="0.56" green="0.33" blue="0.12" /></rect> <text string="C"><color red="0.87" green="0.87" blue="0.84" /></text> </element>
-	<element name="text_d"> <rect><color red="0.56" green="0.33" blue="0.12" /></rect> <text string="D"><color red="0.87" green="0.87" blue="0.84" /></text> </element>
-	<element name="text_e"> <rect><color red="0.56" green="0.33" blue="0.12" /></rect> <text string="E"><color red="0.87" green="0.87" blue="0.84" /></text> </element>
-	<element name="text_f"> <rect><color red="0.56" green="0.33" blue="0.12" /></rect> <text string="F"><color red="0.87" green="0.87" blue="0.84" /></text> </element>
-	<element name="text_g"> <rect><color red="0.56" green="0.33" blue="0.12" /></rect> <text string="G"><color red="0.87" green="0.87" blue="0.84" /></text> </element>
-	<element name="text_h"> <rect><color red="0.56" green="0.33" blue="0.12" /></rect> <text string="H"><color red="0.87" green="0.87" blue="0.84" /></text> </element>
+	<element name="text_1"> <text string="1"><color red="0.87" green="0.87" blue="0.84" /></text> </element>
+	<element name="text_2"> <text string="2"><color red="0.87" green="0.87" blue="0.84" /></text> </element>
+	<element name="text_3"> <text string="3"><color red="0.87" green="0.87" blue="0.84" /></text> </element>
+	<element name="text_4"> <text string="4"><color red="0.87" green="0.87" blue="0.84" /></text> </element>
+	<element name="text_5"> <text string="5"><color red="0.87" green="0.87" blue="0.84" /></text> </element>
+	<element name="text_6"> <text string="6"><color red="0.87" green="0.87" blue="0.84" /></text> </element>
+	<element name="text_7"> <text string="7"><color red="0.87" green="0.87" blue="0.84" /></text> </element>
+	<element name="text_8"> <text string="8"><color red="0.87" green="0.87" blue="0.84" /></text> </element>
+	<element name="text_a"> <text string="A"><color red="0.87" green="0.87" blue="0.84" /></text> </element>
+	<element name="text_b"> <text string="B"><color red="0.87" green="0.87" blue="0.84" /></text> </element>
+	<element name="text_c"> <text string="C"><color red="0.87" green="0.87" blue="0.84" /></text> </element>
+	<element name="text_d"> <text string="D"><color red="0.87" green="0.87" blue="0.84" /></text> </element>
+	<element name="text_e"> <text string="E"><color red="0.87" green="0.87" blue="0.84" /></text> </element>
+	<element name="text_f"> <text string="F"><color red="0.87" green="0.87" blue="0.84" /></text> </element>
+	<element name="text_g"> <text string="G"><color red="0.87" green="0.87" blue="0.84" /></text> </element>
+	<element name="text_h"> <text string="H"><color red="0.87" green="0.87" blue="0.84" /></text> </element>
 
 
 <!-- sb board -->
@@ -242,43 +242,23 @@ license:CC0-1.0
 	</element>
 	<element name="text_uit2"><text string="INTERFACE"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uib1"><text string="BOARD:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uib2">
-		<rect><color red="0.84" green="0.75" blue="0.50" /></rect>
-		<text string="RESET"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uib3">
-		<rect><color red="0.84" green="0.75" blue="0.50" /></rect>
-		<text string="CLEAR"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uib2"><text string="RESET"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uib3"><text string="CLEAR"><color red="0.01" green="0.01" blue="0.01" /></text></element>
 	<element name="text_uis1"><text string="SPAWN:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uih1"><text string="HAND:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uih2">
-		<rect><color red="0.84" green="0.75" blue="0.50" /></rect>
-		<text string="REMOVE"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uih2"><text string="REMOVE"><color red="0.01" green="0.01" blue="0.01" /></text></element>
 	<element name="text_uiu1"><text string="UNDO:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_uiu2a">
-		<rect><color red="0.84" green="0.75" blue="0.50" /></rect>
-		<text string=" &lt;&lt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2b">
-		<rect><color red="0.84" green="0.75" blue="0.50" /></rect>
-		<text string=" &lt;  "><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2c">
-		<rect><color red="0.84" green="0.75" blue="0.50" /></rect>
-		<text string="   &gt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
-	<element name="text_uiu2d">
-		<rect><color red="0.84" green="0.75" blue="0.50" /></rect>
-		<text string=" &gt;&gt;"><color red="0.01" green="0.01" blue="0.01" /></text>
-	</element>
+	<element name="text_uiu2a"><text string=" &lt;&lt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2b"><text string=" &lt;  "><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2c"><text string="   &gt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu2d"><text string=" &gt;&gt;"><color red="0.01" green="0.01" blue="0.01" /></text></element>
+	<element name="text_uiu3b"><text string="/"><color red="0.81" green="0.8" blue="0.79" /></text></element>
+
 	<element name="text_uiu3a" defstate="0">
 		<simplecounter maxstate="999" digits="1" align="2">
 			<color red="0.81" green="0.8" blue="0.79" />
 		</simplecounter>
 	</element>
-	<element name="text_uiu3b"><text string="/"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_uiu3c" defstate="0">
 		<simplecou