diff --git a/src/mame/layout/amerihok.lay b/src/mame/layout/amerihok.lay
index 7e99d507559..7d49457fae8 100644
--- a/src/mame/layout/amerihok.lay
+++ b/src/mame/layout/amerihok.lay
@@ -14,7 +14,7 @@ license:CC0
 			<color red="0.0" green="0.0" blue="0.0" />
 		</rect>
 	</element>
-	<element name="disk" defstate="0"><disk><color red="0.8" green="0.8" blue="0" /></disk></element>
+	<element name="disk" defstate="0"><disk state="0"><color red="0.8" green="0.8" blue="0" /></disk></element>
 	<element name="label_left"><text string="Home"><color red="1.0" green="1.0" blue="1.0" /></text></element>
 	<element name="label_right"><text string="Visitor"><color red="1.0" green="1.0" blue="1.0" /></text></element>
 
diff --git a/src/mame/layout/s11.lay b/src/mame/layout/s11.lay
index b22a6e04108..9f6012cebd7 100644
--- a/src/mame/layout/s11.lay
+++ b/src/mame/layout/s11.lay
@@ -28,103 +28,44 @@ copyright-holders:Robbbert
 	<element name="P5"><text string="Player 3"><color red="1.0" green="1.0" blue="1.0" /></text></element>
 	<element name="P6"><text string="Player 4"><color red="1.0" green="1.0" blue="1.0" /></text></element>
 
+	<group name="score">
+		<repeat count="7">
+			<param name="n" start="~s~" increment="1" />
+			<param name="x" start="0" increment="24" />
+			<element name="digit~n~" ref="digit">
+				<bounds x="~x~" y="0" width="20" height="39" />
+			</element>
+		</repeat>
+	</group>
+
 	<view name="Default Layout">
 		<bounds left="0" top="25" right="364" bottom="249" />
 
 		<!-- LEDs -->
 
 		<!-- Player 1 Score -->
-
-		<element name="digit1" ref="digit">
-			<bounds left="10" top="45" right="30" bottom="84" />
-		</element>
-		<element name="digit2" ref="digit">
-			<bounds left="34" top="45" right="54" bottom="84" />
-		</element>
-		<element name="digit3" ref="digit">
-			<bounds left="58" top="45" right="78" bottom="84" />
-		</element>
-		<element name="digit4" ref="digit">
-			<bounds left="82" top="45" right="102" bottom="84" />
-		</element>
-		<element name="digit5" ref="digit">
-			<bounds left="106" top="45" right="126" bottom="84" />
-		</element>
-		<element name="digit6" ref="digit">
-			<bounds left="130" top="45" right="150" bottom="84" />
-		</element>
-		<element name="digit7" ref="digit">
-			<bounds left="154" top="45" right="174" bottom="84" />
-		</element>
+		<param name="s" value="1" />
+		<group ref="score">
+			<bounds left="10" top="45" right="174" bottom="84" />
+		</group>
 
 		<!-- Player 2 Score -->
-		<element name="digit9" ref="digit">
-			<bounds left="190" top="45" right="210" bottom="84" />
-		</element>
-		<element name="digit10" ref="digit">
-			<bounds left="214" top="45" right="234" bottom="84" />
-		</element>
-		<element name="digit11" ref="digit">
-			<bounds left="238" top="45" right="258" bottom="84" />
-		</element>
-		<element name="digit12" ref="digit">
-			<bounds left="262" top="45" right="282" bottom="84" />
-		</element>
-		<element name="digit13" ref="digit">
-			<bounds left="286" top="45" right="306" bottom="84" />
-		</element>
-		<element name="digit14" ref="digit">
-			<bounds left="310" top="45" right="330" bottom="84" />
-		</element>
-		<element name="digit15" ref="digit">
-			<bounds left="334" top="45" right="354" bottom="84" />
-		</element>
+		<param name="s" value="9" />
+		<group ref="score">
+			<bounds left="190" top="45" right="354" bottom="84" />
+		</group>
 
 		<!-- Player 3 Score -->
-		<element name="digit17" ref="digit">
-			<bounds left="10" top="100" right="30" bottom="139" />
-		</element>
-		<element name="digit18" ref="digit">
-			<bounds left="34" top="100" right="54" bottom="139" />
-		</element>
-		<element name="digit19" ref="digit">
-			<bounds left="58" top="100" right="78" bottom="139" />
-		</element>
-		<element name="digit20" ref="digit">
-			<bounds left="82" top="100" right="102" bottom="139" />
-		</element>
-		<element name="digit21" ref="digit">
-			<bounds left="106" top="100" right="126" bottom="139" />
-		</element>
-		<element name="digit22" ref="digit">
-			<bounds left="130" top="100" right="150" bottom="139" />
-		</element>
-		<element name="digit23" ref="digit">
-			<bounds left="154" top="100" right="174" bottom="139" />
-		</element>
+		<param name="s" value="17" />
+		<group ref="score">
+			<bounds left="10" top="100" right="174" bottom="139" />
+		</group>
 
 		<!-- Player 4 Score -->
-		<element name="digit25" ref="digit">
-			<bounds left="190" top="100" right="210" bottom="139" />
-		</element>
-		<element name="digit26" ref="digit">
-			<bounds left="214" top="100" right="234" bottom="139" />
-		</element>
-		<element name="digit27" ref="digit">
-			<bounds left="238" top="100" right="258" bottom="139" />
-		</element>
-		<element name="digit28" ref="digit">
-			<bounds left="262" top="100" right="282" bottom="139" />
-		</element>
-		<element name="digit29" ref="digit">
-			<bounds left="286" top="100" right="306" bottom="139" />
-		</element>
-		<element name="digit30" ref="digit">
-			<bounds left="310" top="100" right="330" bottom="139" />
-		</element>
-		<element name="digit31" ref="digit">
-			<bounds left="334" top="100" right="354" bottom="139" />
-		</element>
+		<param name="s" value="25" />
+		<group ref="score">
+			<bounds left="190" top="100" right="354" bottom="139" />
+		</group>
 
 		<!-- Credits and Balls -->
 		<element name="digit16" ref="digit">
diff --git a/src/mame/layout/s11a.lay b/src/mame/layout/s11a.lay
index 739fae1b1c6..cb38652e5bf 100644
--- a/src/mame/layout/s11a.lay
+++ b/src/mame/layout/s11a.lay
@@ -17,7 +17,7 @@ copyright-holders:Robbbert, Barry Rodewald
 		</led7seg>
 	</element>
 	<element name="diagled" defstate="0">
-		<disk>
+		<disk state="0">
 			<color red="1.0" green="0.0" blue="0.0" />
 		</disk>
 	</element>
@@ -28,103 +28,44 @@ copyright-holders:Robbbert, Barry Rodewald
 	<element name="P5"><text string="Player 3"><color red="1.0" green="1.0" blue="1.0" /></text></element>
 	<element name="P6"><text string="Player 4"><color red="1.0" green="1.0" blue="1.0" /></text></element>
 
+	<group name="score">
+		<repeat count="7">
+			<param name="n" start="~s~" increment="1" />
+			<param name="x" start="0" increment="24" />
+			<element name="digit~n~" ref="digit">
+				<bounds x="~x~" y="0" width="20" height="39" />
+			</element>
+		</repeat>
+	</group>
+
 	<view name="Default Layout">
 		<bounds left="0" top="25" right="364" bottom="249" />
 
 		<!-- LEDs -->
 
 		<!-- Player 1 Score -->
-
-		<element name="digit1" ref="digit">
-			<bounds left="10" top="45" right="30" bottom="84" />
-		</element>
-		<element name="digit2" ref="digit">
-			<bounds left="34" top="45" right="54" bottom="84" />
-		</element>
-		<element name="digit3" ref="digit">
-			<bounds left="58" top="45" right="78" bottom="84" />
-		</element>
-		<element name="digit4" ref="digit">
-			<bounds left="82" top="45" right="102" bottom="84" />
-		</element>
-		<element name="digit5" ref="digit">
-			<bounds left="106" top="45" right="126" bottom="84" />
-		</element>
-		<element name="digit6" ref="digit">
-			<bounds left="130" top="45" right="150" bottom="84" />
-		</element>
-		<element name="digit7" ref="digit">
-			<bounds left="154" top="45" right="174" bottom="84" />
-		</element>
+		<param name="s" value="1" />
+		<group ref="score">
+			<bounds left="10" top="45" right="174" bottom="84" />
+		</group>
 
 		<!-- Player 2 Score -->
-		<element name="digit9" ref="digit">
-			<bounds left="190" top="45" right="210" bottom="84" />
-		</element>
-		<element name="digit10" ref="digit">
-			<bounds left="214" top="45" right="234" bottom="84" />
-		</element>
-		<element name="digit11" ref="digit">
-			<bounds left="238" top="45" right="258" bottom="84" />
-		</element>
-		<element name="digit12" ref="digit">
-			<bounds left="262" top="45" right="282" bottom="84" />
-		</element>
-		<element name="digit13" ref="digit">
-			<bounds left="286" top="45" right="306" bottom="84" />
-		</element>
-		<element name="digit14" ref="digit">
-			<bounds left="310" top="45" right="330" bottom="84" />
-		</element>
-		<element name="digit15" ref="digit">
-			<bounds left="334" top="45" right="354" bottom="84" />
-		</element>
+		<param name="s" value="9" />
+		<group ref="score">
+			<bounds left="190" top="45" right="354" bottom="84" />
+		</group>
 
 		<!-- Player 3 Score -->
-		<element name="digit17" ref="digit">
-			<bounds left="10" top="100" right="30" bottom="139" />
-		</element>
-		<element name="digit18" ref="digit">
-			<bounds left="34" top="100" right="54" bottom="139" />
-		</element>
-		<element name="digit19" ref="digit">
-			<bounds left="58" top="100" right="78" bottom="139" />
-		</element>
-		<element name="digit20" ref="digit">
-			<bounds left="82" top="100" right="102" bottom="139" />
-		</element>
-		<element name="digit21" ref="digit">
-			<bounds left="106" top="100" right="126" bottom="139" />
-		</element>
-		<element name="digit22" ref="digit">
-			<bounds left="130" top="100" right="150" bottom="139" />
-		</element>
-		<element name="digit23" ref="digit">
-			<bounds left="154" top="100" right="174" bottom="139" />
-		</element>
+		<param name="s" value="17" />
+		<group ref="score">
+			<bounds left="10" top="100" right="174" bottom="139" />
+		</group>
 
 		<!-- Player 4 Score -->
-		<element name="digit25" ref="digit">
-			<bounds left="190" top="100" right="210" bottom="139" />
-		</element>
-		<element name="digit26" ref="digit">
-			<bounds left="214" top="100" right="234" bottom="139" />
-		</element>
-		<element name="digit27" ref="digit">
-			<bounds left="238" top="100" right="258" bottom="139" />
-		</element>
-		<element name="digit28" ref="digit">
-			<bounds left="262" top="100" right="282" bottom="139" />
-		</element>
-		<element name="digit29" ref="digit">
-			<bounds left="286" top="100" right="306" bottom="139" />
-		</element>
-		<element name="digit30" ref="digit">
-			<bounds left="310" top="100" right="330" bottom="139" />
-		</element>
-		<element name="digit31" ref="digit">
-			<bounds left="334" top="100" right="354" bottom="139" />
-		</element>
+		<param name="s" value="25" />
+		<group ref="score">
+			<bounds left="190" top="100" right="354" bottom="139" />
+		</group>
 
 		<!-- Credits and Balls -->
 		<element name="digit16" ref="digit">
diff --git a/src/mame/layout/s11b.lay b/src/mame/layout/s11b.lay
index d80df1e644f..7913a262642 100644
--- a/src/mame/layout/s11b.lay
+++ b/src/mame/layout/s11b.lay
@@ -16,7 +16,7 @@ license:CC0
 		</led7seg>
 	</element>
 	<element name="diagled" defstate="0">
-		<disk>
+		<disk state="0">
 			<color red="1.0" green="0.0" blue="0.0" />
 		</disk>
 	</element>
@@ -25,114 +25,44 @@ license:CC0
 	<element name="P5"><text string="Player 3"><color red="1.0" green="1.0" blue="1.0" /></text></element>
 	<element name="P6"><text string="Player 4"><color red="1.0" green="1.0" blue="1.0" /></text></element>
 
+	<group name="score">
+		<repeat count="8">
+			<param name="n" start="~s~" increment="1" />
+			<param name="x" start="0" increment="24" />
+			<element name="digit~n~" ref="digit">
+				<bounds x="~x~" y="0" width="20" height="39" />
+			</element>
+		</repeat>
+	</group>
+
 	<view name="Default Layout">
 		<bounds left="0" top="25" right="400" bottom="244" />
 
 		<!-- LEDs -->
 
 		<!-- Player 1 Score -->
-		<element name="digit0" ref="digit">
-			<bounds left="10" top="45" right="30" bottom="84" />
-		</element>
-		<element name="digit1" ref="digit">
-			<bounds left="34" top="45" right="54" bottom="84" />
-		</element>
-		<element name="digit2" ref="digit">
-			<bounds left="58" top="45" right="78" bottom="84" />
-		</element>
-		<element name="digit3" ref="digit">
-			<bounds left="82" top="45" right="102" bottom="84" />
-		</element>
-		<element name="digit4" ref="digit">
-			<bounds left="106" top="45" right="126" bottom="84" />
-		</element>
-		<element name="digit5" ref="digit">
-			<bounds left="130" top="45" right="150" bottom="84" />
-		</element>
-		<element name="digit6" ref="digit">
-			<bounds left="154" top="45" right="174" bottom="84" />
-		</element>
-		<element name="digit7" ref="digit">
-			<bounds left="178" top="45" right="198" bottom="84" />
-		</element>
+		<param name="s" value="0" />
+		<group ref="score">
+			<bounds left="10" top="45" right="198" bottom="84" />
+		</group>
 
 		<!-- Player 2 Score -->
-		<element name="digit8" ref="digit">
-			<bounds left="202" top="45" right="222" bottom="84" />
-		</element>
-		<element name="digit9" ref="digit">
-			<bounds left="226" top="45" right="246" bottom="84" />
-		</element>
-		<element name="digit10" ref="digit">
-			<bounds left="250" top="45" right="270" bottom="84" />
-		</element>
-		<element name="digit11" ref="digit">
-			<bounds left="274" top="45" right="294" bottom="84" />
-		</element>
-		<element name="digit12" ref="digit">
-			<bounds left="298" top="45" right="318" bottom="84" />
-		</element>
-		<element name="digit13" ref="digit">
-			<bounds left="322" top="45" right="342" bottom="84" />
-		</element>
-		<element name="digit14" ref="digit">
-			<bounds left="346" top="45" right="366" bottom="84" />
-		</element>
-		<element name="digit15" ref="digit">
-			<bounds left="370" top="45" right="390" bottom="84" />
-		</element>
+		<param name="s" value="8" />
+		<group ref="score">
+			<bounds left="202" top="45" right="390" bottom="84" />
+		</group>
 
 		<!-- Player 3 Score -->
-		<element name="digit16" ref="digit">
-			<bounds left="10" top="100" right="30" bottom="139" />
-		</element>
-		<element name="digit17" ref="digit">
-			<bounds left="34" top="100" right="54" bottom="139" />
-		</element>
-		<element name="digit18" ref="digit">
-			<bounds left="58" top="100" right="78" bottom="139" />
-		</element>
-		<element name="digit19" ref="digit">
-			<bounds left="82" top="100" right="102" bottom="139" />
-		</element>
-		<element name="digit20" ref="digit">
-			<bounds left="106" top="100" right="126" bottom="139" />
-		</element>
-		<element name="digit21" ref="digit">
-			<bounds left="130" top="100" right="150" bottom="139" />
-		</element>
-		<element name="digit22" ref="digit">
-			<bounds left="154" top="100" right="174" bottom="139" />
-		</element>
-		<element name="digit23" ref="digit">
-			<bounds left="178" top="100" right="198" bottom="139" />
-		</element>
+		<param name="s" value="16" />
+		<group ref="score">
+			<bounds left="10" top="100" right="198" bottom="139" />
+		</group>
 
 		<!-- Player 4 Score -->
-		<element name="digit24" ref="digit">
-			<bounds left="202" top="100" right="222" bottom="139" />
-		</element>
-		<element name="digit25" ref="digit">
-			<bounds left="226" top="100" right="246" bottom="139" />
-		</element>
-		<element name="digit26" ref="digit">
-			<bounds left="250" top="100" right="270" bottom="139" />
-		</element>
-		<element name="digit27" ref="digit">
-			<bounds left="274" top="100" right="294" bottom="139" />
-		</element>
-		<element name="digit28" ref="digit">
-			<bounds left="298" top="100" right="318" bottom="139" />
-		</element>
-		<element name="digit29" ref="digit">
-			<bounds left="322" top="100" right="342" bottom="139" />
-		</element>
-		<element name="digit30" ref="digit">
-			<bounds left="346" top="100" right="366" bottom="139" />
-		</element>
-		<element name="digit31" ref="digit">
-			<bounds left="370" top="100" right="390" bottom="139" />
-		</element>
+		<param name="s" value="24" />
+		<group ref="score">
+			<bounds left="202" top="100" right="390" bottom="139" />
+		</group>
 
 		<!-- Credits and Balls -->
 		<element name="digit60" ref="diagled">
diff --git a/src/mame/layout/s11c.lay b/src/mame/layout/s11c.lay
index d80df1e644f..7913a262642 100644
--- a/src/mame/layout/s11c.lay
+++ b/src/mame/layout/s11c.lay
@@ -16,7 +16,7 @@ license:CC0
 		</led7seg>
 	</element>
 	<element name="diagled" defstate="0">
-		<disk>
+		<disk state="0">
 			<color red="1.0" green="0.0" blue="0.0" />
 		</disk>
 	</element>
@@ -25,114 +25,44 @@ license:CC0
 	<element name="P5"><text string="Player 3"><color red="1.0" green="1.0" blue="1.0" /></text></element>
 	<element name="P6"><text string="Player 4"><color red="1.0" green="1.0" blue="1.0" /></text></element>
 
+	<group name="score">
+		<repeat count="8">
+			<param name="n" start="~s~" increment="1" />
+			<param name="x" start="0" increment="24" />
+			<element name="digit~n~" ref="digit">
+				<bounds x="~x~" y="0" width="20" height="39" />
+			</element>
+		</repeat>
+	</group>
+
 	<view name="Default Layout">
 		<bounds left="0" top="25" right="400" bottom="244" />
 
 		<!-- LEDs -->
 
 		<!-- Player 1 Score -->
-		<element name="digit0" ref="digit">
-			<bounds left="10" top="45" right="30" bottom="84" />
-		</element>
-		<element name="digit1" ref="digit">
-			<bounds left="34" top="45" right="54" bottom="84" />
-		</element>
-		<element name="digit2" ref="digit">
-			<bounds left="58" top="45" right="78" bottom="84" />
-		</element>
-		<element name="digit3" ref="digit">
-			<bounds left="82" top="45" right="102" bottom="84" />
-		</element>
-		<element name="digit4" ref="digit">
-			<bounds left="106" top="45" right="126" bottom="84" />
-		</element>
-		<element name="digit5" ref="digit">
-			<bounds left="130" top="45" right="150" bottom="84" />
-		</element>
-		<element name="digit6" ref="digit">
-			<bounds left="154" top="45" right="174" bottom="84" />
-		</element>
-		<element name="digit7" ref="digit">
-			<bounds left="178" top="45" right="198" bottom="84" />
-		</element>
+		<param name="s" value="0" />
+		<group ref="score">
+			<bounds left="10" top="45" right="198" bottom="84" />
+		</group>
 
 		<!-- Player 2 Score -->
-		<element name="digit8" ref="digit">
-			<bounds left="202" top="45" right="222" bottom="84" />
-		</element>
-		<element name="digit9" ref="digit">
-			<bounds left="226" top="45" right="246" bottom="84" />
-		</element>
-		<element name="digit10" ref="digit">
-			<bounds left="250" top="45" right="270" bottom="84" />
-		</element>
-		<element name="digit11" ref="digit">
-			<bounds left="274" top="45" right="294" bottom="84" />
-		</element>
-		<element name="digit12" ref="digit">
-			<bounds left="298" top="45" right="318" bottom="84" />
-		</element>
-		<element name="digit13" ref="digit">
-			<bounds left="322" top="45" right="342" bottom="84" />
-		</element>
-		<element name="digit14" ref="digit">
-			<bounds left="346" top="45" right="366" bottom="84" />
-		</element>
-		<element name="digit15" ref="digit">
-			<bounds left="370" top="45" right="390" bottom="84" />
-		</element>
+		<param name="s" value="8" />
+		<group ref="score">
+			<bounds left="202" top="45" right="390" bottom="84" />
+		</group>
 
 		<!-- Player 3 Score -->
-		<element name="digit16" ref="digit">
-			<bounds left="10" top="100" right="30" bottom="139" />
-		</element>
-		<element name="digit17" ref="digit">
-			<bounds left="34" top="100" right="54" bottom="139" />
-		</element>
-		<element name="digit18" ref="digit">
-			<bounds left="58" top="100" right="78" bottom="139" />
-		</element>
-		<element name="digit19" ref="digit">
-			<bounds left="82" top="100" right="102" bottom="139" />
-		</element>
-		<element name="digit20" ref="digit">
-			<bounds left="106" top="100" right="126" bottom="139" />
-		</element>
-		<element name="digit21" ref="digit">
-			<bounds left="130" top="100" right="150" bottom="139" />
-		</element>
-		<element name="digit22" ref="digit">
-			<bounds left="154" top="100" right="174" bottom="139" />
-		</element>
-		<element name="digit23" ref="digit">
-			<bounds left="178" top="100" right="198" bottom="139" />
-		</element>
+		<param name="s" value="16" />
+		<group ref="score">
+			<bounds left="10" top="100" right="198" bottom="139" />
+		</group>
 
 		<!-- Player 4 Score -->
-		<element name="digit24" ref="digit">
-			<bounds left="202" top="100" right="222" bottom="139" />
-		</element>
-		<element name="digit25" ref="digit">
-			<bounds left="226" top="100" right="246" bottom="139" />
-		</element>
-		<element name="digit26" ref="digit">
-			<bounds left="250" top="100" right="270" bottom="139" />
-		</element>
-		<element name="digit27" ref="digit">
-			<bounds left="274" top="100" right="294" bottom="139" />
-		</element>
-		<element name="digit28" ref="digit">
-			<bounds left="298" top="100" right="318" bottom="139" />
-		</element>
-		<element name="digit29" ref="digit">
-			<bounds left="322" top="100" right="342" bottom="139" />
-		</element>
-		<element name="digit30" ref="digit">
-			<bounds left="346" top="100" right="366" bottom="139" />
-		</element>
-		<element name="digit31" ref="digit">
-			<bounds left="370" top="100" right="390" bottom="139" />
-		</element>
+		<param name="s" value="24" />
+		<group ref="score">
+			<bounds left="202" top="100" right="390" bottom="139" />
+		</group>
 
 		<!-- Credits and Balls -->
 		<element name="digit60" ref="diagled">