diff --git a/src/mame/drivers/jpmimpct.cpp b/src/mame/drivers/jpmimpct.cpp
index dfe71a633aa..06dea5af005 100644
--- a/src/mame/drivers/jpmimpct.cpp
+++ b/src/mame/drivers/jpmimpct.cpp
@@ -1369,7 +1369,7 @@ void jpmimpct_state::impact_nonvideo_altreels(machine_config &config)
 	m_reel[5]->optic_handler().set(FUNC(jpmimpct_state::reel_optic_cb<5>));
 }
 
-void jpmimpct_state::impact_nonvideo_big50(machine_config &config)
+void jpmimpct_state::impact_nonvideo_disc(machine_config &config)
 {
 	impact_nonvideo_base(config);
 
@@ -1379,7 +1379,7 @@ void jpmimpct_state::impact_nonvideo_big50(machine_config &config)
 	m_reel[1]->optic_handler().set(FUNC(jpmimpct_state::reel_optic_cb<1>));
 	REEL(config, m_reel[2], STARPOINT_48STEP_REEL, 1, 3, 0x09, 4);
 	m_reel[2]->optic_handler().set(FUNC(jpmimpct_state::reel_optic_cb<2>));
-	// this is a wheel, not a standard reel, there are 2 open windows into it, and all other cards on it can be seen through grilles
+	// this is a wheel, not a standard reel, there are can be a number of open windows into it showing all symbols(e.g. 2 in big50, with other cards on it can be seen through grilles)
 	// to render this properly in the layout would require a new type of element
 	REEL(config, m_reel[3], STARPOINT_48STEP_REEL, 1, 3, 0x09, 4);
 	m_reel[3]->optic_handler().set(FUNC(jpmimpct_state::reel_optic_inv_cb<3>));
diff --git a/src/mame/drivers/jpmimpctsw.cpp b/src/mame/drivers/jpmimpctsw.cpp
index 8ae6c07d485..85bc3892229 100644
--- a/src/mame/drivers/jpmimpctsw.cpp
+++ b/src/mame/drivers/jpmimpctsw.cpp
@@ -11601,11 +11601,11 @@ GAMEL( 199?, j6bnkrcla,    j6bnkrcl,   impact_nonvideo, j6bnkrcl, jpmimpct_state
 GAMEL( 199?, j6bnkrclb,    j6bnkrcl,   impact_nonvideo, j6bnkrcl, jpmimpct_state, empty_init, ROT0, "JPM", "Banker Club (JPM) (IMPACT) (V6, set 3)", GAME_FLAGS_SOUND, layout_j6bnkrcl )
 GAMEL( 199?, j6bnkrclc,    j6bnkrcl,   impact_nonvideo, j6bnkrcl, jpmimpct_state, empty_init, ROT0, "JPM", "Banker Club (JPM) (IMPACT) (V2)", GAME_FLAGS_SOUND, layout_j6bnkrcl )
 
-GAMEL( 199?, j6big50,      0,          impact_nonvideo_big50, j6big50, jpmimpct_state, empty_init, ROT0, "JPM",  "Big 50 (JPM) (IMPACT) (BF12 L12)", GAME_FLAGS_WORKING, layout_j6big50 )
-GAMEL( 199?, j6big50a,     j6big50,    impact_nonvideo_big50, j6big50, jpmimpct_state, empty_init, ROT0, "JPM",  "Big 50 (JPM) (IMPACT) (BF12P F12, Protocol)", GAME_FLAGS_WORKING, layout_j6big50 )
-GAMEL( 199?, j6big50b,     j6big50,    impact_nonvideo_big50, j6big50, jpmimpct_state, empty_init, ROT0, "JPM",  "Big 50 (JPM) (IMPACT) (BF12 AH12)", GAME_FLAGS_WORKING, layout_j6big50 )
-GAMEL( 199?, j6big50c,     j6big50,    impact_nonvideo_big50, j6big50, jpmimpct_state, empty_init, ROT0, "JPM",  "Big 50 (JPM) (IMPACT) (BF12 L12, Whitbread)", GAME_FLAGS_WORKING, layout_j6big50 )
-GAMEL( 199?, j6big50d,     j6big50,    impact_nonvideo_big50, j6big50, jpmimpct_state, empty_init, ROT0, "JPM",  "Big 50 (JPM) (IMPACT) (BF L8)", GAME_FLAGS_WORKING, layout_j6big50 )
+GAMEL( 199?, j6big50,      0,          impact_nonvideo_disc, j6big50, jpmimpct_state, empty_init, ROT0, "JPM",  "Big 50 (JPM) (IMPACT) (BF12 L12)", GAME_FLAGS_WORKING, layout_j6big50 )
+GAMEL( 199?, j6big50a,     j6big50,    impact_nonvideo_disc, j6big50, jpmimpct_state, empty_init, ROT0, "JPM",  "Big 50 (JPM) (IMPACT) (BF12P F12, Protocol)", GAME_FLAGS_WORKING, layout_j6big50 )
+GAMEL( 199?, j6big50b,     j6big50,    impact_nonvideo_disc, j6big50, jpmimpct_state, empty_init, ROT0, "JPM",  "Big 50 (JPM) (IMPACT) (BF12 AH12)", GAME_FLAGS_WORKING, layout_j6big50 )
+GAMEL( 199?, j6big50c,     j6big50,    impact_nonvideo_disc, j6big50, jpmimpct_state, empty_init, ROT0, "JPM",  "Big 50 (JPM) (IMPACT) (BF12 L12, Whitbread)", GAME_FLAGS_WORKING, layout_j6big50 )
+GAMEL( 199?, j6big50d,     j6big50,    impact_nonvideo_disc, j6big50, jpmimpct_state, empty_init, ROT0, "JPM",  "Big 50 (JPM) (IMPACT) (BF L8)", GAME_FLAGS_WORKING, layout_j6big50 )
 
 GAMEL( 199?, j6bigbuk,     0,          impact_nonvideo, j6bigbuk, jpmimpct_state, empty_init, ROT0, "JPM", "Big Bucks (JPM) (IMPACT) (set 1)", GAME_FLAGS_WORKING, layout_j6bigbukc )
 GAMEL( 199?, j6bigbuka,    j6bigbuk,   impact_nonvideo, j6bigbuk, jpmimpct_state, empty_init, ROT0, "JPM", "Big Bucks (JPM) (IMPACT) (set 2)", GAME_FLAGS_WORKING, layout_j6bigbukc )
@@ -11772,10 +11772,9 @@ GAMEL( 199?, j6gogolda,    j6gogold,   impact_nonvideo, j6gogold, jpmimpct_state
 GAMEL( 199?, j6gogoldb,    j6gogold,   impact_nonvideo, j6gogold, jpmimpct_state, empty_init, ROT0, "JPM", "Go For Gold (JPM) (IMPACT) (set 3)", GAME_FLAGS_WORKING, layout_j6gogold )
 GAMEL( 199?, j6gogoldc,    j6gogold,   impact_nonvideo, j6gogold, jpmimpct_state, empty_init, ROT0, "JPM", "Go For Gold (JPM) (IMPACT) (set 4, Whitbread)", GAME_FLAGS_WORKING, layout_j6gogold )
 
-// layout off center
-GAMEL( 199?, j6hapyhr,     0,          impact_nonvideo, j6hapyhr, jpmimpct_state, empty_init, ROT0, "JPM", "Happy Hour (JPM) (IMPACT) (set 1)", GAME_FLAGS, layout_j6hapyhrb )
-GAMEL( 199?, j6hapyhra,    j6hapyhr,   impact_nonvideo, j6hapyhr, jpmimpct_state, empty_init, ROT0, "JPM", "Happy Hour (JPM) (IMPACT) (set 2)", GAME_FLAGS, layout_j6hapyhrb )
-GAMEL( 199?, j6hapyhrb,    j6hapyhr,   impact_nonvideo, j6hapyhr, jpmimpct_state, empty_init, ROT0, "JPM", "Happy Hour (JPM) (IMPACT) (set 3)", GAME_FLAGS, layout_j6hapyhrb )
+GAMEL( 199?, j6hapyhr,     0,          impact_nonvideo_disc, j6hapyhr, jpmimpct_state, empty_init, ROT0, "JPM", "Happy Hour (JPM) (IMPACT) (HH2 C5) (set 1)", GAME_FLAGS_WORKING, layout_j6hapyhrb )
+GAMEL( 199?, j6hapyhra,    j6hapyhr,   impact_nonvideo_disc, j6hapyhr, jpmimpct_state, empty_init, ROT0, "JPM", "Happy Hour (JPM) (IMPACT) (HH2 C5) (set 2)", GAME_FLAGS_WORKING, layout_j6hapyhrb )
+GAMEL( 199?, j6hapyhrb,    j6hapyhr,   impact_nonvideo_disc, j6hapyhr, jpmimpct_state, empty_init, ROT0, "JPM", "Happy Hour (JPM) (IMPACT) (HH2 C5) (set 3)", GAME_FLAGS_WORKING, layout_j6hapyhrb )
 
 GAME(  199?, j6hilosv,     0,          impact_nonvideo, j6hilosv, jpmimpct_state, empty_init, ROT0, "JPM", "Hi Lo Silver (JPM) (IMPACT) (set 1)", GAME_FLAGS )
 GAME(  199?, j6hilosva,    j6hilosv,   impact_nonvideo, j6hilosv, jpmimpct_state, empty_init, ROT0, "JPM", "Hi Lo Silver (JPM) (IMPACT) (set 2)", GAME_FLAGS )
diff --git a/src/mame/includes/jpmimpct.h b/src/mame/includes/jpmimpct.h
index c99687e302e..3e7efb67d67 100644
--- a/src/mame/includes/jpmimpct.h
+++ b/src/mame/includes/jpmimpct.h
@@ -74,7 +74,7 @@ public:
 
 	void impact_nonvideo(machine_config &config);
 	void impact_nonvideo_altreels(machine_config &config);
-	void impact_nonvideo_big50(machine_config &config);
+	void impact_nonvideo_disc(machine_config &config);
 	
 
 	DECLARE_INPUT_CHANGED_MEMBER(coin_changed);
diff --git a/src/mame/layout/j6guabcl.lay b/src/mame/layout/j6guabcl.lay
index 09770516d54..32ab8594a33 100644
--- a/src/mame/layout/j6guabcl.lay
+++ b/src/mame/layout/j6guabcl.lay
@@ -1522,7 +1522,7 @@
 			<color red="0.0" green="0.0" blue="0.0"/>
 			<bounds x="0.05" y="0.05" width="0.90" height="0.45"/>
 		</text>
-		<text string="WinS">
+		<text string="WinSpins">
 			<color red="0.0" green="0.0" blue="0.0"/>
 			<bounds x="0.05" y="0.50" width="0.90" height="0.45"/>
 		</text>
@@ -1546,7 +1546,7 @@
 			<color red="0.0" green="0.0" blue="0.0"/>
 			<bounds x="0.05" y="0.05" width="0.90" height="0.45"/>
 		</text>
-		<text string="WinS">
+		<text string="WinSpins">
 			<color red="0.0" green="0.0" blue="0.0"/>
 			<bounds x="0.05" y="0.50" width="0.90" height="0.45"/>
 		</text>
@@ -1570,7 +1570,7 @@
 			<color red="0.0" green="0.0" blue="0.0"/>
 			<bounds x="0.05" y="0.05" width="0.90" height="0.45"/>
 		</text>
-		<text string="WinS">
+		<text string="WinSpins">
 			<color red="0.0" green="0.0" blue="0.0"/>
 			<bounds x="0.05" y="0.50" width="0.90" height="0.45"/>
 		</text>
@@ -1594,7 +1594,7 @@
 			<color red="0.0" green="0.0" blue="0.0"/>
 			<bounds x="0.05" y="0.05" width="0.90" height="0.45"/>
 		</text>
-		<text string="WinSp">
+		<text string="WinSpins">
 			<color red="0.0" green="0.0" blue="0.0"/>
 			<bounds x="0.05" y="0.50" width="0.90" height="0.45"/>
 		</text>
@@ -1642,7 +1642,7 @@
 			<color red="0.0" green="0.0" blue="0.0"/>
 			<bounds x="0.05" y="0.05" width="0.90" height="0.45"/>
 		</text>
-		<text string="WinS">
+		<text string="WinSpins">
 			<color red="0.0" green="0.0" blue="0.0"/>
 			<bounds x="0.05" y="0.50" width="0.90" height="0.45"/>
 		</text>
@@ -1666,7 +1666,7 @@
 			<color red="0.0" green="0.0" blue="0.0"/>
 			<bounds x="0.05" y="0.05" width="0.90" height="0.45"/>
 		</text>
-		<text string="WinS">
+		<text string="WinSpins">
 			<color red="0.0" green="0.0" blue="0.0"/>
 			<bounds x="0.05" y="0.50" width="0.90" height="0.45"/>
 		</text>
@@ -1690,7 +1690,7 @@
 			<color red="0.0" green="0.0" blue="0.0"/>
 			<bounds x="0.05" y="0.05" width="0.90" height="0.45"/>
 		</text>
-		<text string="WinS">
+		<text string="WinSpins">
 			<color red="0.0" green="0.0" blue="0.0"/>
 			<bounds x="0.05" y="0.50" width="0.90" height="0.45"/>
 		</text>
@@ -1714,7 +1714,7 @@
 			<color red="0.0" green="0.0" blue="0.0"/>
 			<bounds x="0.05" y="0.05" width="0.90" height="0.45"/>
 		</text>
-		<text string="WinS">
+		<text string="WinSpins">
 			<color red="0.0" green="0.0" blue="0.0"/>
 			<bounds x="0.05" y="0.50" width="0.90" height="0.45"/>
 		</text>
@@ -1762,7 +1762,7 @@
 			<color red="0.0" green="0.0" blue="0.0"/>
 			<bounds x="0.05" y="0.05" width="0.90" height="0.45"/>
 		</text>
-		<text string="Cash Bel">
+		<text string="Cash Belt">
 			<color red="0.0" green="0.0" blue="0.0"/>
 			<bounds x="0.05" y="0.50" width="0.90" height="0.45"/>
 		</text>
@@ -1970,7 +1970,7 @@
 		<rect state="0">
 			<color red="0.11" green="0.07" blue="0.01"/>
 		</rect>
-		<text string="Chose">
+		<text string="Choose">
 			<color red="0.0" green="0.0" blue="0.0"/>
 			<bounds x="0.05" y="0.05" width="0.90" height="0.45"/>
 		</text>
@@ -2249,10 +2249,10 @@
 	</element>
 	<element name="lamp_121_1_border" defstate="0">
 		<disk state="1">
-			<color red="0.00" green="0.00" blue="0.00"/>
+			<color red="1.00" green="1.00" blue="1.00"/>
 		</disk>
 		<disk state="0">
-			<color red="0.00" green="0.00" blue="0.00"/>
+			<color red="1.00" green="1.00" blue="1.00"/>
 		</disk>
 	</element>
 	<element name="lamp_121_1" defstate="0">
@@ -2260,7 +2260,7 @@
 			<color red="0.00" green="0.00" blue="0.00"/>
 		</disk>
 		<disk state="0">
-			<color red="0.00" green="0.00" blue="0.00"/>
+			<color red="0.20" green="0.20" blue="0.20"/>
 		</disk>
 	</element>
 	<element name="lamp_120_1_border" defstate="0">
@@ -2880,39 +2880,21 @@
 			<color red="1.00" green="1.00" blue="1.00"/>
 		</disk>
 	</element>
-	<element name="label_5">
-		<text string="With Thanks to Bugs">
-			<color red="0.0" green="0.0" blue="0.0"/>
-			<bounds x="0.05" y="0.05" width="0.90" height="0.90"/>
-		</text>
-	</element>
-	<element name="label_6">
-		<text string="www.mfme.co.uk">
-			<color red="0.0" green="0.0" blue="0.0"/>
-			<bounds x="0.05" y="0.05" width="0.90" height="0.90"/>
-		</text>
-	</element>
-	<element name="label_54">
-		<text string="Hit 'Notes' for shortcut keys">
-			<color red="0.0" green="0.0" blue="0.0"/>
-			<bounds x="0.05" y="0.05" width="0.90" height="0.90"/>
-		</text>
-	</element>
 	<element name="label_143">
 		<text string="LIGHT ALL BALLS FOR FREE BALL">
-			<color red="0.0" green="0.0" blue="0.0"/>
+			<color red="1.0" green="1.0" blue="1.0"/>
 			<bounds x="0.05" y="0.05" width="0.90" height="0.90"/>
 		</text>
 	</element>
 	<element name="label_144">
 		<text string="CASHPOT">
-			<color red="0.0" green="0.0" blue="0.0"/>
+			<color red="1.0" green="1.0" blue="1.0"/>
 			<bounds x="0.05" y="0.05" width="0.90" height="0.90"/>
 		</text>
 	</element>
 	<element name="label_145">
 		<text string="RESERVE">
-			<color red="0.0" green="0.0" blue="0.0"/>
+			<color red="1.0" green="1.0" blue="1.0"/>
 			<bounds x="0.05" y="0.05" width="0.90" height="0.90"/>
 		</text>
 	</element>
@@ -4976,22 +4958,22 @@
 		<element name="lamp1" ref="reel_lamp_layer_5" state="0">
 			<bounds x="192.6667" y="511.4445" width="46.6667" height="31.1111"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_0" state="0">
+		<element name="lamp0" ref="reel_lamp_layer_0" state="0">
 			<bounds x="176.0000" y="553.6667" width="80.0000" height="53.3333"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_1" state="0">
+		<element name="lamp0" ref="reel_lamp_layer_1" state="0">
 			<bounds x="179.3333" y="555.8889" width="73.3333" height="48.8889"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_2" state="0">
+		<element name="lamp0" ref="reel_lamp_layer_2" state="0">
 			<bounds x="182.6667" y="558.1111" width="66.6667" height="44.4444"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_3" state="0">
+		<element name="lamp0" ref="reel_lamp_layer_3" state="0">
 			<bounds x="186.0000" y="560.3334" width="60.0000" height="40.0000"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_4" state="0">
+		<element name="lamp0" ref="reel_lamp_layer_4" state="0">
 			<bounds x="189.3333" y="562.5556" width="53.3333" height="35.5556"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_5" state="0">
+		<element name="lamp0" ref="reel_lamp_layer_5" state="0">
 			<bounds x="192.6667" y="564.7778" width="46.6667" height="31.1111"/>
 		</element>
 		<element name="sreel1" ref="reel0" state="0">
@@ -6108,15 +6090,6 @@
 		<element name="vfd15" ref="vfd0" state="0">
 			<bounds x="599" y="274" width="17" height="26"/>
 		</element>
-		<element name="label5" ref="label_5">
-			<bounds x="647" y="505" width="49" height="48"/>
-		</element>
-		<element name="label6" ref="label_6">
-			<bounds x="277" y="427" width="130" height="19"/>
-		</element>
-		<element name="label54" ref="label_54">
-			<bounds x="310" y="196" width="38" height="65"/>
-		</element>
 		<element name="label143" ref="label_143">
 			<bounds x="377" y="164" width="205" height="13"/>
 		</element>
diff --git a/src/mame/layout/j6hapyhrb.lay b/src/mame/layout/j6hapyhrb.lay
index efcf83a4a4b..1d6ebb17fd2 100644
--- a/src/mame/layout/j6hapyhrb.lay
+++ b/src/mame/layout/j6hapyhrb.lay
@@ -846,7 +846,7 @@
 		<rect state="0">
 			<color red="0.25" green="0.13" blue="0.06"/>
 		</rect>
-		<text string="&#xA3;5.">
+		<text string="Blue 7 &#xA3;5">
 			<color red="0.0" green="0.0" blue="0.0"/>
 			<bounds x="0.05" y="0.05" width="0.90" height="0.90"/>
 		</text>
@@ -866,7 +866,7 @@
 		<rect state="0">
 			<color red="0.25" green="0.13" blue="0.06"/>
 		</rect>
-		<text string="&#xA3;2.">
+		<text string="Single Bar &#xA3;2">
 			<color red="0.0" green="0.0" blue="0.0"/>
 			<bounds x="0.05" y="0.05" width="0.90" height="0.90"/>
 		</text>
@@ -886,7 +886,7 @@
 		<rect state="0">
 			<color red="0.25" green="0.13" blue="0.06"/>
 		</rect>
-		<text string="&#xA3;1.">
+		<text string="Mixed 7 &#xA3;1">
 			<color red="0.0" green="0.0" blue="0.0"/>
 			<bounds x="0.05" y="0.05" width="0.90" height="0.90"/>
 		</text>
@@ -906,7 +906,7 @@
 		<rect state="0">
 			<color red="0.25" green="0.13" blue="0.06"/>
 		</rect>
-		<text string="&#xA3;15.">
+		<text string="Red 7 &#xA3;15">
 			<color red="0.0" green="0.0" blue="0.0"/>
 			<bounds x="0.05" y="0.05" width="0.90" height="0.90"/>
 		</text>
@@ -926,7 +926,7 @@
 		<rect state="0">
 			<color red="0.25" green="0.13" blue="0.06"/>
 		</rect>
-		<text string="&#xA3;3.">
+		<text string="Double Bar &#xA3;3">
 			<color red="0.0" green="0.0" blue="0.0"/>
 			<bounds x="0.05" y="0.05" width="0.90" height="0.90"/>
 		</text>
@@ -946,7 +946,7 @@
 		<rect state="0">
 			<color red="0.25" green="0.13" blue="0.06"/>
 		</rect>
-		<text string="&#xA3;4.">
+		<text string="Triple Bar &#xA3;4">
 			<color red="0.0" green="0.0" blue="0.0"/>
 			<bounds x="0.05" y="0.05" width="0.90" height="0.90"/>
 		</text>
@@ -991,6 +991,48 @@
 			<bounds x="0.05" y="0.05" width="0.90" height="0.90"/>
 		</text>
 	</element>
+	<element name="lamp_217_1_border" defstate="0">
+		<rect state="1">
+			<color red="0.50" green="0.25" blue="0.13"/>
+		</rect>
+		<rect state="0">
+			<color red="0.12" green="0.06" blue="0.03"/>
+		</rect>
+	</element>
+	<element name="lamp_217_1" defstate="0">
+		<rect state="1">
+			<color red="1.00" green="0.50" blue="0.25"/>
+		</rect>
+		<rect state="0">
+			<color red="0.25" green="0.13" blue="0.06"/>
+		</rect>
+		<text string="3X Happy Hour">
+			<color red="0.0" green="0.0" blue="0.0"/>
+			<bounds x="0.05" y="0.05" width="0.90" height="0.90"/>
+		</text>
+	</element>
+
+	<element name="lamp_216_1_border" defstate="0">
+		<rect state="1">
+			<color red="0.50" green="0.25" blue="0.13"/>
+		</rect>
+		<rect state="0">
+			<color red="0.12" green="0.06" blue="0.03"/>
+		</rect>
+	</element>
+	<element name="lamp_216_1" defstate="0">
+		<rect state="1">
+			<color red="1.00" green="0.50" blue="0.25"/>
+		</rect>
+		<rect state="0">
+			<color red="0.25" green="0.13" blue="0.06"/>
+		</rect>
+		<text string="Happy Hour">
+			<color red="0.0" green="0.0" blue="0.0"/>
+			<bounds x="0.05" y="0.05" width="0.90" height="0.90"/>
+		</text>
+	</element>
+
 	<element name="colour_button_149_border">
 		<rect state="1">
 			<color red="0.50" green="0.50" blue="0.50"/>
@@ -1141,22 +1183,23 @@
 		</rect>
 	</element>
 	<element name="reel0" defstate="0">
-		<reel reelreversed="0" stateoffset="2730" numsymbolsvisible="3" symbollist="reel,reel,reel,reel,reel,reel,reel,reel,reel,reel,reel,reel,reel,reel,reel,reel">
+		<reel reelreversed="0" stateoffset="-5461" numsymbolsvisible="3" symbollist="Triple Bar,Blue 7,Single Bar,Double Bar,Happy Hour,Triple Bar,Single Bar,Red 7,Single Bar,Double Bar,Blue 7,Double Bar,Triple Bar,Red 7,Double Bar,Happy Hour">
 			<color red="0.0" green="0.0" blue="0.0"/>
 		</reel>
 	</element>
 	<element name="reel1" defstate="0">
-		<reel reelreversed="0" stateoffset="2730" numsymbolsvisible="3" symbollist="reel,reel,reel,reel,reel,reel,reel,reel,reel,reel,reel,reel,reel,reel,reel,reel">
+		<reel reelreversed="0" stateoffset="-5461" numsymbolsvisible="3" symbollist="Red 7,Single Bar,Double Bar,Red 7,Happy Hour,Single Bar,Blue 7,Single Bar,Double Bar,Red 7,Double Bar,Triple Bar,Blue 7,Happy Hour,Single Bar,Triple Bar">
 			<color red="0.0" green="0.0" blue="0.0"/>
 		</reel>
 	</element>
 	<element name="reel2" defstate="0">
-		<reel reelreversed="0" stateoffset="2730" numsymbolsvisible="3" symbollist="reel,reel,reel,reel,reel,reel,reel,reel,reel,reel,reel,reel,reel,reel,reel,reel">
+		<reel reelreversed="0" stateoffset="-5461" numsymbolsvisible="3" symbollist="Red 7,Double Bar,Single Bar,Double Bar,Blue 7,Happy Hour,Double Bar,Blue 7,Triple Bar,Single Bar,Red 7,Single Bar,Happy Hour,Blue 7,Double Bar,Triple Bar">
 			<color red="0.0" green="0.0" blue="0.0"/>
 		</reel>
 	</element>
+	<!-- should be a single wheel, not a reel, technically this appears as clock pointing to the relevant section -->
 	<element name="reel3" defstate="0">
-		<reel reelreversed="0" stateoffset="0" numsymbolsvisible="3" symbollist="">
+		<reel reelreversed="0" stateoffset="-1000" numsymbolsvisible="1" symbollist="6,5,4,3,2,1,12,11,10,9,8,7">
 			<color red="0.0" green="0.0" blue="0.0"/>
 		</reel>
 	</element>
@@ -1255,37 +1298,41 @@
 	</element>
 	<element name="label_71">
 		<text string="BANK">
-			<color red="0.0" green="0.0" blue="0.0"/>
+			<color red="1.0" green="1.0" blue="1.0"/>
 			<bounds x="0.05" y="0.05" width="0.90" height="0.90"/>
 		</text>
 	</element>
 	<element name="label_72">
 		<text string="&#xA3;">
-			<color red="0.0" green="0.0" blue="0.0"/>
+			<color red="1.0" green="1.0" blue="1.0"/>
 			<bounds x="0.05" y="0.05" width="0.90" height="0.90"/>
 		</text>
 	</element>
 	<element name="label_79">
 		<text string="CREDITS">
-			<color red="0.0" green="0.0" blue="0.0"/>
+			<color red="1.0" green="1.0" blue="1.0"/>
 			<bounds x="0.05" y="0.05" width="0.90" height="0.90"/>
 		</text>
 	</element>
 	<element name="label_80">
-		<text string="27 WAYS TO ENTER FEATURE">
-			<color red="0.0" green="0.0" blue="0.0"/>
-			<bounds x="0.05" y="0.05" width="0.90" height="0.90"/>
+		<text string="27 WAYS TO">
+			<color red="1.0" green="1.0" blue="1.0"/>
+			<bounds x="0.05" y="0.05" width="0.90" height="0.40"/>
+		</text>
+		<text string="ENTER FEATURE">
+			<color red="1.0" green="1.0" blue="1.0"/>
+			<bounds x="0.05" y="0.45" width="0.90" height="0.40"/>
 		</text>
 	</element>
 	<element name="label_147">
 		<text string="WIN">
-			<color red="0.0" green="0.0" blue="0.0"/>
+			<color red="1.0" green="1.0" blue="1.0"/>
 			<bounds x="0.05" y="0.05" width="0.90" height="0.90"/>
 		</text>
 	</element>
 	<element name="label_148">
 		<text string="LINE">
-			<color red="0.0" green="0.0" blue="0.0"/>
+			<color red="1.0" green="1.0" blue="1.0"/>
 			<bounds x="0.05" y="0.05" width="0.90" height="0.90"/>
 		</text>
 	</element>
@@ -3302,9 +3349,6 @@
 	</element>
 
 	<view name="AWP Simulated Video">
-		<element ref="backdrop_colour">
-			<bounds x="0" y="0" width="636" height="662"/>
-		</element>
 		<element ref="reel_background">
 			<bounds x="96" y="415" width="80" height="140"/>
 		</element>
@@ -3344,22 +3388,22 @@
 		<element name="lamp1" ref="reel_lamp_layer_5" state="0">
 			<bounds x="112.6667" y="471.3889" width="46.6667" height="27.2222"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_0" state="0">
+		<element name="lamp0" ref="reel_lamp_layer_0" state="0">
 			<bounds x="96.0000" y="508.3333" width="80.0000" height="46.6667"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_1" state="0">
+		<element name="lamp0" ref="reel_lamp_layer_1" state="0">
 			<bounds x="99.3333" y="510.2778" width="73.3333" height="42.7778"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_2" state="0">
+		<element name="lamp0" ref="reel_lamp_layer_2" state="0">
 			<bounds x="102.6667" y="512.2222" width="66.6667" height="38.8889"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_3" state="0">
+		<element name="lamp0" ref="reel_lamp_layer_3" state="0">
 			<bounds x="106.0000" y="514.1667" width="60.0000" height="35.0000"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_4" state="0">
+		<element name="lamp0" ref="reel_lamp_layer_4" state="0">
 			<bounds x="109.3333" y="516.1111" width="53.3333" height="31.1111"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_5" state="0">
+		<element name="lamp0" ref="reel_lamp_layer_5" state="0">
 			<bounds x="112.6667" y="518.0555" width="46.6667" height="27.2222"/>
 		</element>
 		<element name="sreel1" ref="reel0" state="0">
@@ -3486,65 +3530,31 @@
 			<bounds x="264" y="415" width="80" height="140"/>
 		</element>
 		<element ref="reel_background">
-			<bounds x="1265" y="660" width="16" height="13"/>
+			<bounds x="200" y="110" width="80" height="80"/>
 		</element>
-		<element name="lamp21" ref="reel_lamp_layer_0" state="0">
-			<bounds x="1265.0000" y="660.0000" width="16.0000" height="4.3333"/>
+		<element name="lamp20" ref="reel_lamp_layer_0" state="0">
+			<bounds x="200.0000" y="110.0000" width="80.0000" height="80.0000"/>
 		</element>
-		<element name="lamp21" ref="reel_lamp_layer_1" state="0">
-			<bounds x="1265.6666" y="660.1805" width="14.6667" height="3.9722"/>
+		<element name="lamp20" ref="reel_lamp_layer_1" state="0">
+			<bounds x="205.0000" y="113.3333" width="73.3333" height="73.3333"/>
 		</element>
-		<element name="lamp21" ref="reel_lamp_layer_2" state="0">
-			<bounds x="1266.3334" y="660.3611" width="13.3333" height="3.6111"/>
+		<element name="lamp20" ref="reel_lamp_layer_2" state="0">
+			<bounds x="210.0000" y="116.6667" width="66.6667" height="66.6667"/>
 		</element>
-		<element name="lamp21" ref="reel_lamp_layer_3" state="0">
-			<bounds x="1267.0000" y="660.5417" width="12.0000" height="3.2500"/>
+		<element name="lamp20" ref="reel_lamp_layer_3" state="0">
+			<bounds x="215.0000" y="119.0000" width="60.0000" height="60.0000"/>
 		</element>
-		<element name="lamp21" ref="reel_lamp_layer_4" state="0">
-			<bounds x="1267.6666" y="660.7222" width="10.6667" height="2.8889"/>
+		<element name="lamp20" ref="reel_lamp_layer_4" state="0">
+			<bounds x="220.0000" y="122.3333" width="53.3333" height="53.3333"/>
 		</element>
-		<element name="lamp21" ref="reel_lamp_layer_5" state="0">
-			<bounds x="1268.3334" y="660.9028" width="9.3333" height="2.5278"/>
-		</element>
-		<element name="lamp14" ref="reel_lamp_layer_0" state="0">
-			<bounds x="1265.0000" y="664.3333" width="16.0000" height="4.3333"/>
-		</element>
-		<element name="lamp14" ref="reel_lamp_layer_1" state="0">
-			<bounds x="1265.6666" y="664.5139" width="14.6667" height="3.9722"/>
-		</element>
-		<element name="lamp14" ref="reel_lamp_layer_2" state="0">
-			<bounds x="1266.3334" y="664.6944" width="13.3333" height="3.6111"/>
-		</element>
-		<element name="lamp14" ref="reel_lamp_layer_3" state="0">
-			<bounds x="1267.0000" y="664.8750" width="12.0000" height="3.2500"/>
-		</element>
-		<element name="lamp14" ref="reel_lamp_layer_4" state="0">
-			<bounds x="1267.6666" y="665.0555" width="10.6667" height="2.8889"/>
-		</element>
-		<element name="lamp14" ref="reel_lamp_layer_5" state="0">
-			<bounds x="1268.3334" y="665.2361" width="9.3333" height="2.5278"/>
-		</element>
-		<element name="lamp19" ref="reel_lamp_layer_0" state="0">
-			<bounds x="1265.0000" y="668.6667" width="16.0000" height="4.3333"/>
-		</element>
-		<element name="lamp19" ref="reel_lamp_layer_1" state="0">
-			<bounds x="1265.6666" y="668.8472" width="14.6667" height="3.9722"/>
-		</element>
-		<element name="lamp19" ref="reel_lamp_layer_2" state="0">
-			<bounds x="1266.3334" y="669.0278" width="13.3333" height="3.6111"/>
-		</element>
-		<element name="lamp19" ref="reel_lamp_layer_3" state="0">
-			<bounds x="1267.0000" y="669.2084" width="12.0000" height="3.2500"/>
-		</element>
-		<element name="lamp19" ref="reel_lamp_layer_4" state="0">
-			<bounds x="1267.6666" y="669.3889" width="10.6667" height="2.8889"/>
-		</element>
-		<element name="lamp19" ref="reel_lamp_layer_5" state="0">
-			<bounds x="1268.3334" y="669.5695" width="9.3333" height="2.5278"/>
+		<element name="lamp20" ref="reel_lamp_layer_5" state="0">
+			<bounds x="225.0000" y="125.6667" width="46.6667" height="46.6667"/>
 		</element>
 		<element name="sreel4" ref="reel3" state="0">
-			<bounds x="1265" y="660" width="16" height="13"/>
+			<bounds x="200" y="110" width="80" height="80"/>
 		</element>
+
+
 		<element name="lamp202" ref="lamp_202_1_border" state="0">
 			<bounds x="214" y="559" width="24" height="24"/>
 		</element>
@@ -3839,46 +3849,46 @@
 		<element name="lamp9" ref="lamp_9_1" state="0">
 			<bounds x="435" y="88" width="48" height="20"/>
 		</element>
-		<element name="lamp-1" ref="colour_button_149_border" state="0" inputtag="TODO" inputmask="0x01">
+		<element name="lamp14" ref="colour_button_149_border" state="0" inputtag="COINS" inputmask="0x01">
 			<bounds x="599" y="3" width="35" height="36"/>
 		</element>
-		<element name="lamp-1" ref="colour_button_149" state="0" inputtag="TODO" inputmask="0x01">
+		<element name="lamp14" ref="colour_button_149" state="0" inputtag="COINS" inputmask="0x01">
 			<bounds x="601" y="5" width="31" height="32"/>
 		</element>
-		<element name="lamp192" ref="colour_button_152_border" state="0" inputtag="TODO" inputmask="0x01">
+		<element name="lamp192" ref="colour_button_152_border" state="0" inputtag="J9_0" inputmask="0x01">
 			<bounds x="449" y="623" width="75" height="37"/>
 		</element>
-		<element name="lamp192" ref="colour_button_152" state="0" inputtag="TODO" inputmask="0x01">
+		<element name="lamp192" ref="colour_button_152" state="0" inputtag="J9_0" inputmask="0x01">
 			<bounds x="451" y="625" width="71" height="33"/>
 		</element>
-		<element name="lamp193" ref="colour_button_153_border" state="0" inputtag="TODO" inputmask="0x02">
+		<element name="lamp193" ref="colour_button_153_border" state="0" inputtag="J9_0" inputmask="0x02">
 			<bounds x="366" y="623" width="75" height="37"/>
 		</element>
-		<element name="lamp193" ref="colour_button_153" state="0" inputtag="TODO" inputmask="0x02">
+		<element name="lamp193" ref="colour_button_153" state="0" inputtag="J9_0" inputmask="0x02">
 			<bounds x="368" y="625" width="71" height="33"/>
 		</element>
-		<element name="lamp198" ref="colour_button_154_border" state="0" inputtag="TODO" inputmask="0x04">
+		<element name="lamp198" ref="colour_button_154_border" state="0" inputtag="J9_0" inputmask="0x04">
 			<bounds x="279" y="624" width="75" height="37"/>
 		</element>
-		<element name="lamp198" ref="colour_button_154" state="0" inputtag="TODO" inputmask="0x04">
+		<element name="lamp198" ref="colour_button_154" state="0" inputtag="J9_0" inputmask="0x04">
 			<bounds x="281" y="626" width="71" height="33"/>
 		</element>
-		<element name="lamp197" ref="colour_button_155_border" state="0" inputtag="TODO" inputmask="0x08">
+		<element name="lamp197" ref="colour_button_155_border" state="0" inputtag="J9_0" inputmask="0x08">
 			<bounds x="189" y="624" width="75" height="37"/>
 		</element>
-		<element name="lamp197" ref="colour_button_155" state="0" inputtag="TODO" inputmask="0x08">
+		<element name="lamp197" ref="colour_button_155" state="0" inputtag="J9_0" inputmask="0x08">
 			<bounds x="191" y="626" width="71" height="33"/>
 		</element>
-		<element name="lamp196" ref="colour_button_156_border" state="0" inputtag="TODO" inputmask="0x10">
+		<element name="lamp196" ref="colour_button_156_border" state="0" inputtag="J9_0" inputmask="0x10">
 			<bounds x="92" y="624" width="75" height="37"/>
 		</element>
-		<element name="lamp196" ref="colour_button_156" state="0" inputtag="TODO" inputmask="0x10">
+		<element name="lamp196" ref="colour_button_156" state="0" inputtag="J9_0" inputmask="0x10">
 			<bounds x="94" y="626" width="71" height="33"/>
 		</element>
-		<element name="lamp209" ref="colour_button_157_border" state="0" inputtag="TODO" inputmask="0x20">
+		<element name="lamp209" ref="colour_button_157_border" state="0" inputtag="J9_0" inputmask="0x20">
 			<bounds x="3" y="624" width="75" height="37"/>
 		</element>
-		<element name="lamp209" ref="colour_button_157" state="0" inputtag="TODO" inputmask="0x20">
+		<element name="lamp209" ref="colour_button_157" state="0" inputtag="J9_0" inputmask="0x20">
 			<bounds x="5" y="626" width="71" height="33"/>
 		</element>
 		<element ref="led_digit_rect_black">
@@ -3950,9 +3960,24 @@
 		<element name="label79" ref="label_79">
 			<bounds x="248" y="388" width="72" height="19"/>
 		</element>
+		<element name="lamp217" ref="lamp_217_1_border" state="0">
+			<bounds x="400" y="430" width="50" height="36"/>
+		</element>
+		<element name="lamp217" ref="lamp_217_1" state="0">
+			<bounds x="402" y="432" width="46" height="32"/>
+		</element>
+
 		<element name="label80" ref="label_80">
 			<bounds x="400" y="470" width="66" height="42"/>
 		</element>
+
+		<element name="lamp216" ref="lamp_216_1_border" state="0">
+			<bounds x="450" y="430" width="50" height="36"/>
+		</element>
+		<element name="lamp216" ref="lamp_216_1" state="0">
+			<bounds x="452" y="432" width="46" height="32"/>
+		</element>
+
 		<element name="label147" ref="label_147">
 			<bounds x="54" y="476" width="31" height="19"/>
 		</element>
@@ -5972,22 +5997,22 @@
 		<element name="lamp1" ref="reel_lamp_layer_5" state="0">
 			<bounds x="1125.0000" y="128.6667" width="70.0000" height="46.6667"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_0" state="0">
+		<element name="lamp0" ref="reel_lamp_layer_0" state="0">
 			<bounds x="1100.0000" y="192.0000" width="120.0000" height="80.0000"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_1" state="0">
+		<element name="lamp0" ref="reel_lamp_layer_1" state="0">
 			<bounds x="1105.0000" y="195.3333" width="110.0000" height="73.3333"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_2" state="0">
+		<element name="lamp0" ref="reel_lamp_layer_2" state="0">
 			<bounds x="1110.0000" y="198.6667" width="100.0000" height="66.6667"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_3" state="0">
+		<element name="lamp0" ref="reel_lamp_layer_3" state="0">
 			<bounds x="1115.0000" y="202.0000" width="90.0000" height="60.0000"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_4" state="0">
+		<element name="lamp0" ref="reel_lamp_layer_4" state="0">
 			<bounds x="1120.0000" y="205.3333" width="80.0000" height="53.3333"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_5" state="0">
+		<element name="lamp0" ref="reel_lamp_layer_5" state="0">
 			<bounds x="1125.0000" y="208.6667" width="70.0000" height="46.6667"/>
 		</element>
 		<element name="sreel1" ref="reel0" state="0">
@@ -6113,66 +6138,6 @@
 		<element name="sreel3" ref="reel2" state="0">
 			<bounds x="1380" y="32" width="120" height="240"/>
 		</element>
-		<element ref="reel_background">
-			<bounds x="1520" y="32" width="120" height="240"/>
-		</element>
-		<element name="lamp21" ref="reel_lamp_layer_0" state="0">
-			<bounds x="1520.0000" y="32.0000" width="120.0000" height="80.0000"/>
-		</element>
-		<element name="lamp21" ref="reel_lamp_layer_1" state="0">
-			<bounds x="1525.0000" y="35.3333" width="110.0000" height="73.3333"/>
-		</element>
-		<element name="lamp21" ref="reel_lamp_layer_2" state="0">
-			<bounds x="1530.0000" y="38.6667" width="100.0000" height="66.6667"/>
-		</element>
-		<element name="lamp21" ref="reel_lamp_layer_3" state="0">
-			<bounds x="1535.0000" y="42.0000" width="90.0000" height="60.0000"/>
-		</element>
-		<element name="lamp21" ref="reel_lamp_layer_4" state="0">
-			<bounds x="1540.0000" y="45.3333" width="80.0000" height="53.3333"/>
-		</element>
-		<element name="lamp21" ref="reel_lamp_layer_5" state="0">
-			<bounds x="1545.0000" y="48.6667" width="70.0000" height="46.6667"/>
-		</element>
-		<element name="lamp14" ref="reel_lamp_layer_0" state="0">
-			<bounds x="1520.0000" y="112.0000" width="120.0000" height="80.0000"/>
-		</element>
-		<element name="lamp14" ref="reel_lamp_layer_1" state="0">
-			<bounds x="1525.0000" y="115.3333" width="110.0000" height="73.3333"/>
-		</element>
-		<element name="lamp14" ref="reel_lamp_layer_2" state="0">
-			<bounds x="1530.0000" y="118.6667" width="100.0000" height="66.6667"/>
-		</element>
-		<element name="lamp14" ref="reel_lamp_layer_3" state="0">
-			<bounds x="1535.0000" y="122.0000" width="90.0000" height="60.0000"/>
-		</element>
-		<element name="lamp14" ref="reel_lamp_layer_4" state="0">
-			<bounds x="1540.0000" y="125.3333" width="80.0000" height="53.3333"/>
-		</element>
-		<element name="lamp14" ref="reel_lamp_layer_5" state="0">
-			<bounds x="1545.0000" y="128.6667" width="70.0000" height="46.6667"/>
-		</element>
-		<element name="lamp19" ref="reel_lamp_layer_0" state="0">
-			<bounds x="1520.0000" y="192.0000" width="120.0000" height="80.0000"/>
-		</element>
-		<element name="lamp19" ref="reel_lamp_layer_1" state="0">
-			<bounds x="1525.0000" y="195.3333" width="110.0000" height="73.3333"/>
-		</element>
-		<element name="lamp19" ref="reel_lamp_layer_2" state="0">
-			<bounds x="1530.0000" y="198.6667" width="100.0000" height="66.6667"/>
-		</element>
-		<element name="lamp19" ref="reel_lamp_layer_3" state="0">
-			<bounds x="1535.0000" y="202.0000" width="90.0000" height="60.0000"/>
-		</element>
-		<element name="lamp19" ref="reel_lamp_layer_4" state="0">
-			<bounds x="1540.0000" y="205.3333" width="80.0000" height="53.3333"/>
-		</element>
-		<element name="lamp19" ref="reel_lamp_layer_5" state="0">
-			<bounds x="1545.0000" y="208.6667" width="70.0000" height="46.6667"/>
-		</element>
-		<element name="sreel4" ref="reel3" state="0">
-			<bounds x="1520" y="32" width="120" height="240"/>
-		</element>
 		<element name="reel1" ref="debug_stepper_value">
 			<bounds x="1100" y="272" width="50" height="30"/>
 		</element>
@@ -6196,6 +6161,6 @@
 		</element>
 		<element name="debug_reel_symbol_count" ref="debug_reel_symbol_count_3">
 			<bounds x="1600" y="272" width="50" height="30"/>
-		</element>
-	</view>
+		</element>	
+		</view>
 </mamelayout>
diff --git a/src/mame/layout/j6impulsc.lay b/src/mame/layout/j6impulsc.lay
index 6bce3bc3776..fff56b6a863 100644
--- a/src/mame/layout/j6impulsc.lay
+++ b/src/mame/layout/j6impulsc.lay
@@ -2283,18 +2283,6 @@
 			<color red="1.00" green="1.00" blue="1.00"/>
 		</disk>
 	</element>
-	<element name="label_162">
-		<text string="Thanks To Bugs!">
-			<color red="0.0" green="0.0" blue="0.0"/>
-			<bounds x="0.05" y="0.05" width="0.90" height="0.90"/>
-		</text>
-	</element>
-	<element name="label_163">
-		<text string="www.mfme.co.uk">
-			<color red="0.0" green="0.0" blue="0.0"/>
-			<bounds x="0.05" y="0.05" width="0.90" height="0.90"/>
-		</text>
-	</element>
 	<element name="debug_backdrop_colour">
 		<rect>
 			<color red="0.0" green="0.0" blue="0.0"/>
@@ -4350,22 +4338,22 @@
 		<element name="lamp1" ref="reel_lamp_layer_5" state="0">
 			<bounds x="169.6667" y="519.2778" width="46.6667" height="19.4444"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_0" state="0">
+		<element name="lamp0" ref="reel_lamp_layer_0" state="0">
 			<bounds x="153.0000" y="545.6667" width="80.0000" height="33.3333"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_1" state="0">
+		<element name="lamp0" ref="reel_lamp_layer_1" state="0">
 			<bounds x="156.3333" y="547.0556" width="73.3333" height="30.5556"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_2" state="0">
+		<element name="lamp0" ref="reel_lamp_layer_2" state="0">
 			<bounds x="159.6667" y="548.4445" width="66.6667" height="27.7778"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_3" state="0">
+		<element name="lamp0" ref="reel_lamp_layer_3" state="0">
 			<bounds x="163.0000" y="549.8334" width="60.0000" height="25.0000"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_4" state="0">
+		<element name="lamp0" ref="reel_lamp_layer_4" state="0">
 			<bounds x="166.3333" y="551.2222" width="53.3333" height="22.2222"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_5" state="0">
+		<element name="lamp0" ref="reel_lamp_layer_5" state="0">
 			<bounds x="169.6667" y="552.6111" width="46.6667" height="19.4444"/>
 		</element>
 		<element name="sreel1" ref="reel0" state="0">
@@ -4494,22 +4482,22 @@
 		<element ref="reel_background">
 			<bounds x="459" y="395" width="50" height="50"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_0" state="0">
+		<element name="lamp20" ref="reel_lamp_layer_0" state="0">
 			<bounds x="459.0000" y="395.0000" width="50.0000" height="50.0000"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_1" state="0">
+		<element name="lamp20" ref="reel_lamp_layer_1" state="0">
 			<bounds x="461.0833" y="397.0833" width="45.8333" height="45.8333"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_2" state="0">
+		<element name="lamp20" ref="reel_lamp_layer_2" state="0">
 			<bounds x="463.1667" y="399.1667" width="41.6667" height="41.6667"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_3" state="0">
+		<element name="lamp20" ref="reel_lamp_layer_3" state="0">
 			<bounds x="465.2500" y="401.2500" width="37.5000" height="37.5000"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_4" state="0">
+		<element name="lamp20" ref="reel_lamp_layer_4" state="0">
 			<bounds x="467.3333" y="403.3333" width="33.3333" height="33.3333"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_5" state="0">
+		<element name="lamp20" ref="reel_lamp_layer_5" state="0">
 			<bounds x="469.4167" y="405.4167" width="29.1667" height="29.1667"/>
 		</element>
 		<element name="sreel4" ref="reel3" state="0">
@@ -5202,12 +5190,7 @@
 		<element name="vfd15" ref="vfd0" state="0">
 			<bounds x="398" y="435" width="17" height="30"/>
 		</element>
-		<element name="label162" ref="label_162">
-			<bounds x="420" y="2" width="45" height="48"/>
-		</element>
-		<element name="label163" ref="label_163">
-			<bounds x="229" y="464" width="99" height="14"/>
-		</element>
+
 	</view>
 
 	<view name="MFME2MAME Debug">
diff --git a/src/mame/layout/j6indyi.lay b/src/mame/layout/j6indyi.lay
index 4006ec94c4b..2f0d3dc0989 100644
--- a/src/mame/layout/j6indyi.lay
+++ b/src/mame/layout/j6indyi.lay
@@ -2697,105 +2697,105 @@
 	</element>
 	<element name="label_19">
 		<text string="Revolver">
-			<color red="0.0" green="0.0" blue="0.0"/>
+			<color red="1.0" green="1.0" blue="0.0"/>
 			<bounds x="0.05" y="0.05" width="0.90" height="0.90"/>
 		</text>
 	</element>
 	<element name="label_20">
 		<text string="Big Repeater">
-			<color red="0.0" green="0.0" blue="0.0"/>
+			<color red="1.0" green="1.0" blue="0.0"/>
 			<bounds x="0.05" y="0.05" width="0.90" height="0.90"/>
 		</text>
 	</element>
 	<element name="label_55">
 		<text string="Staff">
-			<color red="0.0" green="0.0" blue="0.0"/>
+			<color red="1.0" green="1.0" blue="0.0"/>
 			<bounds x="0.05" y="0.05" width="0.90" height="0.45"/>
 		</text>
 		<text string="Of Ra">
-			<color red="0.0" green="0.0" blue="0.0"/>
+			<color red="1.0" green="1.0" blue="0.0"/>
 			<bounds x="0.05" y="0.50" width="0.90" height="0.45"/>
 		</text>
 	</element>
 	<element name="label_65">
 		<text string="HIT">
-			<color red="0.0" green="0.0" blue="0.0"/>
+			<color red="1.0" green="1.0" blue="0.0"/>
 			<bounds x="0.05" y="0.05" width="0.90" height="0.90"/>
 		</text>
 	</element>
 	<element name="label_66">
 		<text string="MISSed">
-			<color red="0.0" green="0.0" blue="0.0"/>
+			<color red="1.0" green="1.0" blue="0.0"/>
 			<bounds x="0.05" y="0.05" width="0.90" height="0.90"/>
 		</text>
 	</element>
 	<element name="label_67">
 		<text string="Nudge">
-			<color red="0.0" green="0.0" blue="0.0"/>
+			<color red="1.0" green="1.0" blue="0.0"/>
 			<bounds x="0.05" y="0.05" width="0.90" height="0.45"/>
 		</text>
 		<text string="Pot">
-			<color red="0.0" green="0.0" blue="0.0"/>
+			<color red="1.0" green="1.0" blue="0.0"/>
 			<bounds x="0.05" y="0.50" width="0.90" height="0.45"/>
 		</text>
 	</element>
 	<element name="label_71">
 		<text string="Win">
-			<color red="0.0" green="0.0" blue="0.0"/>
+			<color red="1.0" green="1.0" blue="0.0"/>
 			<bounds x="0.05" y="0.05" width="0.90" height="0.45"/>
 		</text>
 		<text string="Line">
-			<color red="0.0" green="0.0" blue="0.0"/>
+			<color red="1.0" green="1.0" blue="0.0"/>
 			<bounds x="0.05" y="0.50" width="0.90" height="0.45"/>
 		</text>
 	</element>
 	<element name="label_72">
 		<text string="Win">
-			<color red="0.0" green="0.0" blue="0.0"/>
+			<color red="1.0" green="1.0" blue="0.0"/>
 			<bounds x="0.05" y="0.05" width="0.90" height="0.45"/>
 		</text>
 		<text string="Line">
-			<color red="0.0" green="0.0" blue="0.0"/>
+			<color red="1.0" green="1.0" blue="0.0"/>
 			<bounds x="0.05" y="0.50" width="0.90" height="0.45"/>
 		</text>
 	</element>
 	<element name="label_94">
 		<text string="Holy Grail">
-			<color red="0.0" green="0.0" blue="0.0"/>
+			<color red="1.0" green="1.0" blue="0.0"/>
 			<bounds x="0.05" y="0.05" width="0.90" height="0.90"/>
 		</text>
 	</element>
 	<element name="label_105">
 		<text string="Leap Of Faith">
-			<color red="0.0" green="0.0" blue="0.0"/>
+			<color red="1.0" green="1.0" blue="0.0"/>
 			<bounds x="0.05" y="0.05" width="0.90" height="0.90"/>
 		</text>
 	</element>
 	<element name="label_106">
 		<text string="Path To Riches">
-			<color red="0.0" green="0.0" blue="0.0"/>
+			<color red="1.0" green="1.0" blue="0.0"/>
 			<bounds x="0.05" y="0.05" width="0.90" height="0.90"/>
 		</text>
 	</element>
 	<element name="label_134">
 		<text string="Plays">
-			<color red="0.0" green="0.0" blue="0.0"/>
+			<color red="1.0" green="1.0" blue="0.0"/>
 			<bounds x="0.05" y="0.05" width="0.90" height="0.90"/>
 		</text>
 	</element>
 	<element name="label_140">
 		<text string="Snake">
-			<color red="0.0" green="0.0" blue="0.0"/>
+			<color red="1.0" green="1.0" blue="0.0"/>
 			<bounds x="0.05" y="0.05" width="0.90" height="0.45"/>
 		</text>
 		<text string="Pit">
-			<color red="0.0" green="0.0" blue="0.0"/>
+			<color red="1.0" green="1.0" blue="0.0"/>
 			<bounds x="0.05" y="0.50" width="0.90" height="0.45"/>
 		</text>
 	</element>
 	<element name="label_141">
 		<text string="1 - 12">
-			<color red="0.0" green="0.0" blue="0.0"/>
+			<color red="1.0" green="1.0" blue="0.0"/>
 			<bounds x="0.05" y="0.05" width="0.90" height="0.90"/>
 		</text>
 	</element>
@@ -4818,58 +4818,58 @@
 		<element ref="reel_background">
 			<bounds x="269" y="413" width="80" height="190"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_0" state="0">
+		<element name="lamp2" ref="reel_lamp_layer_0" state="0">
 			<bounds x="269.0000" y="413.0000" width="80.0000" height="63.3333"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_1" state="0">
+		<element name="lamp2" ref="reel_lamp_layer_1" state="0">
 			<bounds x="272.3333" y="415.6389" width="73.3333" height="58.0556"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_2" state="0">
+		<element name="lamp2" ref="reel_lamp_layer_2" state="0">
 			<bounds x="275.6667" y="418.2778" width="66.6667" height="52.7778"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_3" state="0">
+		<element name="lamp2" ref="reel_lamp_layer_3" state="0">
 			<bounds x="279.0000" y="420.9167" width="60.0000" height="47.5000"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_4" state="0">
+		<element name="lamp2" ref="reel_lamp_layer_4" state="0">
 			<bounds x="282.3333" y="423.5555" width="53.3333" height="42.2222"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_5" state="0">
+		<element name="lamp2" ref="reel_lamp_layer_5" state="0">
 			<bounds x="285.6667" y="426.1945" width="46.6667" height="36.9444"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_0" state="0">
+		<element name="lamp1" ref="reel_lamp_layer_0" state="0">
 			<bounds x="269.0000" y="476.3333" width="80.0000" height="63.3333"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_1" state="0">
+		<element name="lamp1" ref="reel_lamp_layer_1" state="0">
 			<bounds x="272.3333" y="478.9722" width="73.3333" height="58.0556"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_2" state="0">
+		<element name="lamp1" ref="reel_lamp_layer_2" state="0">
 			<bounds x="275.6667" y="481.6111" width="66.6667" height="52.7778"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_3" state="0">
+		<element name="lamp1" ref="reel_lamp_layer_3" state="0">
 			<bounds x="279.0000" y="484.2500" width="60.0000" height="47.5000"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_4" state="0">
+		<element name="lamp1" ref="reel_lamp_layer_4" state="0">
 			<bounds x="282.3333" y="486.8889" width="53.3333" height="42.2222"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_5" state="0">
+		<element name="lamp1" ref="reel_lamp_layer_5" state="0">
 			<bounds x="285.6667" y="489.5278" width="46.6667" height="36.9444"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_0" state="0">
+		<element name="lamp0" ref="reel_lamp_layer_0" state="0">
 			<bounds x="269.0000" y="539.6667" width="80.0000" height="63.3333"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_1" state="0">
+		<element name="lamp0" ref="reel_lamp_layer_1" state="0">
 			<bounds x="272.3333" y="542.3056" width="73.3333" height="58.0556"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_2" state="0">
+		<element name="lamp0" ref="reel_lamp_layer_2" state="0">
 			<bounds x="275.6667" y="544.9445" width="66.6667" height="52.7778"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_3" state="0">
+		<element name="lamp0" ref="reel_lamp_layer_3" state="0">
 			<bounds x="279.0000" y="547.5834" width="60.0000" height="47.5000"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_4" state="0">
+		<element name="lamp0" ref="reel_lamp_layer_4" state="0">
 			<bounds x="282.3333" y="550.2222" width="53.3333" height="42.2222"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_5" state="0">
+		<element name="lamp0" ref="reel_lamp_layer_5" state="0">
 			<bounds x="285.6667" y="552.8611" width="46.6667" height="36.9444"/>
 		</element>
 		<element name="sreel1" ref="reel0" state="0">
@@ -4878,58 +4878,58 @@
 		<element ref="reel_background">
 			<bounds x="351" y="413" width="80" height="190"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_0" state="0">
+		<element name="lamp5" ref="reel_lamp_layer_0" state="0">
 			<bounds x="351.0000" y="413.0000" width="80.0000" height="63.3333"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_1" state="0">
+		<element name="lamp5" ref="reel_lamp_layer_1" state="0">
 			<bounds x="354.3333" y="415.6389" width="73.3333" height="58.0556"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_2" state="0">
+		<element name="lamp5" ref="reel_lamp_layer_2" state="0">
 			<bounds x="357.6667" y="418.2778" width="66.6667" height="52.7778"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_3" state="0">
+		<element name="lamp5" ref="reel_lamp_layer_3" state="0">
 			<bounds x="361.0000" y="420.9167" width="60.0000" height="47.5000"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_4" state="0">
+		<element name="lamp5" ref="reel_lamp_layer_4" state="0">
 			<bounds x="364.3333" y="423.5555" width="53.3333" height="42.2222"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_5" state="0">
+		<element name="lamp5" ref="reel_lamp_layer_5" state="0">
 			<bounds x="367.6667" y="426.1945" width="46.6667" height="36.9444"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_0" state="0">
+		<element name="lamp4" ref="reel_lamp_layer_0" state="0">
 			<bounds x="351.0000" y="476.3333" width="80.0000" height="63.3333"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_1" state="0">
+		<element name="lamp4" ref="reel_lamp_layer_1" state="0">
 			<bounds x="354.3333" y="478.9722" width="73.3333" height="58.0556"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_2" state="0">
+		<element name="lamp4" ref="reel_lamp_layer_2" state="0">
 			<bounds x="357.6667" y="481.6111" width="66.6667" height="52.7778"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_3" state="0">
+		<element name="lamp4" ref="reel_lamp_layer_3" state="0">
 			<bounds x="361.0000" y="484.2500" width="60.0000" height="47.5000"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_4" state="0">
+		<element name="lamp4" ref="reel_lamp_layer_4" state="0">
 			<bounds x="364.3333" y="486.8889" width="53.3333" height="42.2222"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_5" state="0">
+		<element name="lamp4" ref="reel_lamp_layer_5" state="0">
 			<bounds x="367.6667" y="489.5278" width="46.6667" height="36.9444"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_0" state="0">
+		<element name="lamp3" ref="reel_lamp_layer_0" state="0">
 			<bounds x="351.0000" y="539.6667" width="80.0000" height="63.3333"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_1" state="0">
+		<element name="lamp3" ref="reel_lamp_layer_1" state="0">
 			<bounds x="354.3333" y="542.3056" width="73.3333" height="58.0556"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_2" state="0">
+		<element name="lamp3" ref="reel_lamp_layer_2" state="0">
 			<bounds x="357.6667" y="544.9445" width="66.6667" height="52.7778"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_3" state="0">
+		<element name="lamp3" ref="reel_lamp_layer_3" state="0">
 			<bounds x="361.0000" y="547.5834" width="60.0000" height="47.5000"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_4" state="0">
+		<element name="lamp3" ref="reel_lamp_layer_4" state="0">
 			<bounds x="364.3333" y="550.2222" width="53.3333" height="42.2222"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_5" state="0">
+		<element name="lamp3" ref="reel_lamp_layer_5" state="0">
 			<bounds x="367.6667" y="552.8611" width="46.6667" height="36.9444"/>
 		</element>
 		<element name="sreel2" ref="reel1" state="0">
@@ -4938,58 +4938,58 @@
 		<element ref="reel_background">
 			<bounds x="433" y="413" width="80" height="190"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_0" state="0">
+		<element name="lamp18" ref="reel_lamp_layer_0" state="0">
 			<bounds x="433.0000" y="413.0000" width="80.0000" height="63.3333"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_1" state="0">
+		<element name="lamp18" ref="reel_lamp_layer_1" state="0">
 			<bounds x="436.3333" y="415.6389" width="73.3333" height="58.0556"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_2" state="0">
+		<element name="lamp18" ref="reel_lamp_layer_2" state="0">
 			<bounds x="439.6667" y="418.2778" width="66.6667" height="52.7778"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_3" state="0">
+		<element name="lamp18" ref="reel_lamp_layer_3" state="0">
 			<bounds x="443.0000" y="420.9167" width="60.0000" height="47.5000"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_4" state="0">
+		<element name="lamp18" ref="reel_lamp_layer_4" state="0">
 			<bounds x="446.3333" y="423.5555" width="53.3333" height="42.2222"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_5" state="0">
+		<element name="lamp18" ref="reel_lamp_layer_5" state="0">
 			<bounds x="449.6667" y="426.1945" width="46.6667" height="36.9444"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_0" state="0">
+		<element name="lamp17" ref="reel_lamp_layer_0" state="0">
 			<bounds x="433.0000" y="476.3333" width="80.0000" height="63.3333"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_1" state="0">
+		<element name="lamp17" ref="reel_lamp_layer_1" state="0">
 			<bounds x="436.3333" y="478.9722" width="73.3333" height="58.0556"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_2" state="0">
+		<element name="lamp17" ref="reel_lamp_layer_2" state="0">
 			<bounds x="439.6667" y="481.6111" width="66.6667" height="52.7778"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_3" state="0">
+		<element name="lamp17" ref="reel_lamp_layer_3" state="0">
 			<bounds x="443.0000" y="484.2500" width="60.0000" height="47.5000"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_4" state="0">
+		<element name="lamp17" ref="reel_lamp_layer_4" state="0">
 			<bounds x="446.3333" y="486.8889" width="53.3333" height="42.2222"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_5" state="0">
+		<element name="lamp17" ref="reel_lamp_layer_5" state="0">
 			<bounds x="449.6667" y="489.5278" width="46.6667" height="36.9444"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_0" state="0">
+		<element name="lamp16" ref="reel_lamp_layer_0" state="0">
 			<bounds x="433.0000" y="539.6667" width="80.0000" height="63.3333"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_1" state="0">
+		<element name="lamp16" ref="reel_lamp_layer_1" state="0">
 			<bounds x="436.3333" y="542.3056" width="73.3333" height="58.0556"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_2" state="0">
+		<element name="lamp16" ref="reel_lamp_layer_2" state="0">
 			<bounds x="439.6667" y="544.9445" width="66.6667" height="52.7778"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_3" state="0">
+		<element name="lamp16" ref="reel_lamp_layer_3" state="0">
 			<bounds x="443.0000" y="547.5834" width="60.0000" height="47.5000"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_4" state="0">
+		<element name="lamp16" ref="reel_lamp_layer_4" state="0">
 			<bounds x="446.3333" y="550.2222" width="53.3333" height="42.2222"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_5" state="0">
+		<element name="lamp16" ref="reel_lamp_layer_5" state="0">
 			<bounds x="449.6667" y="552.8611" width="46.6667" height="36.9444"/>
 		</element>
 		<element name="sreel3" ref="reel2" state="0">
@@ -4998,8 +4998,26 @@
 		<element ref="reel_background">
 			<bounds x="399" y="77" width="70" height="70"/>
 		</element>
+		<element name="lamp20" ref="reel_lamp_layer_0" state="0">
+			<bounds x="399.0000" y="77.0000" width="50.0000" height="50.0000"/>
+		</element>
+		<element name="lamp20" ref="reel_lamp_layer_1" state="0">
+			<bounds x="411.0833" y="79.0833" width="45.8333" height="45.8333"/>
+		</element>
+		<element name="lamp20" ref="reel_lamp_layer_2" state="0">
+			<bounds x="413.1667" y="81.1667" width="41.6667" height="41.6667"/>
+		</element>
+		<element name="lamp20" ref="reel_lamp_layer_3" state="0">
+			<bounds x="415.2500" y="83.2500" width="37.5000" height="37.5000"/>
+		</element>
+		<element name="lamp20" ref="reel_lamp_layer_4" state="0">
+			<bounds x="417.3333" y="85.3333" width="33.3333" height="33.3333"/>
+		</element>
+		<element name="lamp20" ref="reel_lamp_layer_5" state="0">
+			<bounds x="419.4167" y="87.4167" width="29.1667" height="29.1667"/>
+		</element>
 		<element name="sreel4" ref="reel3" state="0">
-			<bounds x="399" y="77" width="70" height="70"/>
+			<bounds x="399" y="77" width="50" height="50"/>
 		</element>
 		<element name="lamp144" ref="lamp_144_1_border" state="0">
 			<bounds x="479" y="3" width="42" height="60"/>
diff --git a/src/mame/layout/j6kungfud.lay b/src/mame/layout/j6kungfud.lay
index 9d7e03327ea..94692a23447 100644
--- a/src/mame/layout/j6kungfud.lay
+++ b/src/mame/layout/j6kungfud.lay
@@ -26,7 +26,7 @@
 		<rect state="0">
 			<color red="0.00" green="0.13" blue="0.00"/>
 		</rect>
-		<text string="6 Nudge">
+		<text string="6 Nudges">
 			<color red="0.0" green="0.0" blue="0.0"/>
 			<bounds x="0.05" y="0.05" width="0.90" height="0.90"/>
 		</text>
@@ -46,7 +46,7 @@
 		<rect state="0">
 			<color red="0.00" green="0.13" blue="0.00"/>
 		</rect>
-		<text string="5 Nudge">
+		<text string="5 Nudges">
 			<color red="0.0" green="0.0" blue="0.0"/>
 			<bounds x="0.05" y="0.05" width="0.90" height="0.90"/>
 		</text>
@@ -66,7 +66,7 @@
 		<rect state="0">
 			<color red="0.00" green="0.13" blue="0.00"/>
 		</rect>
-		<text string="2 Nudge">
+		<text string="2 Nudges">
 			<color red="0.0" green="0.0" blue="0.0"/>
 			<bounds x="0.05" y="0.05" width="0.90" height="0.90"/>
 		</text>
@@ -86,7 +86,7 @@
 		<rect state="0">
 			<color red="0.00" green="0.13" blue="0.00"/>
 		</rect>
-		<text string="3 Nudge">
+		<text string="3 Nudges">
 			<color red="0.0" green="0.0" blue="0.0"/>
 			<bounds x="0.05" y="0.05" width="0.90" height="0.90"/>
 		</text>
@@ -106,7 +106,7 @@
 		<rect state="0">
 			<color red="0.00" green="0.13" blue="0.00"/>
 		</rect>
-		<text string="4 Nudge">
+		<text string="4 Nudges">
 			<color red="0.0" green="0.0" blue="0.0"/>
 			<bounds x="0.05" y="0.05" width="0.90" height="0.90"/>
 		</text>
@@ -146,7 +146,7 @@
 		<rect state="0">
 			<color red="0.00" green="0.13" blue="0.00"/>
 		</rect>
-		<text string="8 Nudge">
+		<text string="8 Nudges">
 			<color red="0.0" green="0.0" blue="0.0"/>
 			<bounds x="0.05" y="0.05" width="0.90" height="0.90"/>
 		</text>
@@ -166,7 +166,7 @@
 		<rect state="0">
 			<color red="0.00" green="0.13" blue="0.00"/>
 		</rect>
-		<text string="10 Nudge">
+		<text string="10 Nudges">
 			<color red="0.0" green="0.0" blue="0.0"/>
 			<bounds x="0.05" y="0.05" width="0.90" height="0.90"/>
 		</text>
@@ -186,7 +186,7 @@
 		<rect state="0">
 			<color red="0.00" green="0.13" blue="0.00"/>
 		</rect>
-		<text string="12 Nudge">
+		<text string="12 Nudges">
 			<color red="0.0" green="0.0" blue="0.0"/>
 			<bounds x="0.05" y="0.05" width="0.90" height="0.90"/>
 		</text>
@@ -206,7 +206,7 @@
 		<rect state="0">
 			<color red="0.00" green="0.13" blue="0.00"/>
 		</rect>
-		<text string="16 Nudge">
+		<text string="16 Nudges">
 			<color red="0.0" green="0.0" blue="0.0"/>
 			<bounds x="0.05" y="0.05" width="0.90" height="0.90"/>
 		</text>
@@ -1718,7 +1718,7 @@
 		<rect state="0">
 			<color red="0.00" green="0.13" blue="0.00"/>
 		</rect>
-		<text string=" START">
+		<text string="START">
 			<color red="0.0" green="0.0" blue="0.0"/>
 			<bounds x="0.05" y="0.05" width="0.90" height="0.90"/>
 		</text>
@@ -1758,7 +1758,7 @@
 		<rect state="0">
 			<color red="0.25" green="0.00" blue="0.13"/>
 		</rect>
-		<text string=" LO">
+		<text string="LO">
 			<color red="0.0" green="0.0" blue="0.0"/>
 			<bounds x="0.05" y="0.05" width="0.90" height="0.90"/>
 		</text>
@@ -1913,39 +1913,39 @@
 	</element>
 	<element name="label_25">
 		<text string="Win">
-			<color red="0.0" green="0.0" blue="0.0"/>
+			<color red="1.0" green="1.0" blue="1.0"/>
 			<bounds x="0.05" y="0.05" width="0.90" height="0.45"/>
 		</text>
 		<text string="Line">
-			<color red="0.0" green="0.0" blue="0.0"/>
+			<color red="1.0" green="1.0" blue="1.0"/>
 			<bounds x="0.05" y="0.50" width="0.90" height="0.45"/>
 		</text>
 	</element>
 	<element name="label_26">
 		<text string="Win">
-			<color red="0.0" green="0.0" blue="0.0"/>
+			<color red="1.0" green="1.0" blue="1.0"/>
 			<bounds x="0.05" y="0.05" width="0.90" height="0.45"/>
 		</text>
 		<text string="Line">
-			<color red="0.0" green="0.0" blue="0.0"/>
+			<color red="1.0" green="1.0" blue="1.0"/>
 			<bounds x="0.05" y="0.50" width="0.90" height="0.45"/>
 		</text>
 	</element>
 	<element name="label_39">
 		<text string="&#xA3;">
-			<color red="0.0" green="0.0" blue="0.0"/>
+			<color red="1.0" green="1.0" blue="1.0"/>
 			<bounds x="0.05" y="0.05" width="0.90" height="0.90"/>
 		</text>
 	</element>
 	<element name="label_44">
 		<text string="BANK">
-			<color red="0.0" green="0.0" blue="0.0"/>
+			<color red="1.0" green="1.0" blue="1.0"/>
 			<bounds x="0.05" y="0.05" width="0.90" height="0.90"/>
 		</text>
 	</element>
 	<element name="label_45">
-		<text string="Any 3boxed">
-			<color red="0.0" green="0.0" blue="0.0"/>
+		<text string="Any 3 [boxed]">
+			<color red="1.0" green="1.0" blue="1.0"/>
 			<bounds x="0.05" y="0.05" width="0.90" height="0.90"/>
 		</text>
 	</element>
@@ -3968,58 +3968,58 @@
 		<element ref="reel_background">
 			<bounds x="275" y="415" width="80" height="190"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_0" state="0">
+		<element name="lamp2" ref="reel_lamp_layer_0" state="0">
 			<bounds x="275.0000" y="415.0000" width="80.0000" height="63.3333"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_1" state="0">
+		<element name="lamp2" ref="reel_lamp_layer_1" state="0">
 			<bounds x="278.3333" y="417.6389" width="73.3333" height="58.0556"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_2" state="0">
+		<element name="lamp2" ref="reel_lamp_layer_2" state="0">
 			<bounds x="281.6667" y="420.2778" width="66.6667" height="52.7778"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_3" state="0">
+		<element name="lamp2" ref="reel_lamp_layer_3" state="0">
 			<bounds x="285.0000" y="422.9167" width="60.0000" height="47.5000"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_4" state="0">
+		<element name="lamp2" ref="reel_lamp_layer_4" state="0">
 			<bounds x="288.3333" y="425.5555" width="53.3333" height="42.2222"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_5" state="0">
+		<element name="lamp2" ref="reel_lamp_layer_5" state="0">
 			<bounds x="291.6667" y="428.1945" width="46.6667" height="36.9444"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_0" state="0">
+		<element name="lamp1" ref="reel_lamp_layer_0" state="0">
 			<bounds x="275.0000" y="478.3333" width="80.0000" height="63.3333"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_1" state="0">
+		<element name="lamp1" ref="reel_lamp_layer_1" state="0">
 			<bounds x="278.3333" y="480.9722" width="73.3333" height="58.0556"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_2" state="0">
+		<element name="lamp1" ref="reel_lamp_layer_2" state="0">
 			<bounds x="281.6667" y="483.6111" width="66.6667" height="52.7778"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_3" state="0">
+		<element name="lamp1" ref="reel_lamp_layer_3" state="0">
 			<bounds x="285.0000" y="486.2500" width="60.0000" height="47.5000"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_4" state="0">
+		<element name="lamp1" ref="reel_lamp_layer_4" state="0">
 			<bounds x="288.3333" y="488.8889" width="53.3333" height="42.2222"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_5" state="0">
+		<element name="lamp1" ref="reel_lamp_layer_5" state="0">
 			<bounds x="291.6667" y="491.5278" width="46.6667" height="36.9444"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_0" state="0">
+		<element name="lamp0" ref="reel_lamp_layer_0" state="0">
 			<bounds x="275.0000" y="541.6667" width="80.0000" height="63.3333"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_1" state="0">
+		<element name="lamp0" ref="reel_lamp_layer_1" state="0">
 			<bounds x="278.3333" y="544.3056" width="73.3333" height="58.0556"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_2" state="0">
+		<element name="lamp0" ref="reel_lamp_layer_2" state="0">
 			<bounds x="281.6667" y="546.9445" width="66.6667" height="52.7778"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_3" state="0">
+		<element name="lamp0" ref="reel_lamp_layer_3" state="0">
 			<bounds x="285.0000" y="549.5834" width="60.0000" height="47.5000"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_4" state="0">
+		<element name="lamp0" ref="reel_lamp_layer_4" state="0">
 			<bounds x="288.3333" y="552.2222" width="53.3333" height="42.2222"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_5" state="0">
+		<element name="lamp0" ref="reel_lamp_layer_5" state="0">
 			<bounds x="291.6667" y="554.8611" width="46.6667" height="36.9444"/>
 		</element>
 		<element name="sreel1" ref="reel0" state="0">
@@ -4028,58 +4028,58 @@
 		<element ref="reel_background">
 			<bounds x="357" y="415" width="80" height="190"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_0" state="0">
+		<element name="lamp5" ref="reel_lamp_layer_0" state="0">
 			<bounds x="357.0000" y="415.0000" width="80.0000" height="63.3333"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_1" state="0">
+		<element name="lamp5" ref="reel_lamp_layer_1" state="0">
 			<bounds x="360.3333" y="417.6389" width="73.3333" height="58.0556"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_2" state="0">
+		<element name="lamp5" ref="reel_lamp_layer_2" state="0">
 			<bounds x="363.6667" y="420.2778" width="66.6667" height="52.7778"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_3" state="0">
+		<element name="lamp5" ref="reel_lamp_layer_3" state="0">
 			<bounds x="367.0000" y="422.9167" width="60.0000" height="47.5000"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_4" state="0">
+		<element name="lamp5" ref="reel_lamp_layer_4" state="0">
 			<bounds x="370.3333" y="425.5555" width="53.3333" height="42.2222"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_5" state="0">
+		<element name="lamp5" ref="reel_lamp_layer_5" state="0">
 			<bounds x="373.6667" y="428.1945" width="46.6667" height="36.9444"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_0" state="0">
+		<element name="lamp4" ref="reel_lamp_layer_0" state="0">
 			<bounds x="357.0000" y="478.3333" width="80.0000" height="63.3333"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_1" state="0">
+		<element name="lamp4" ref="reel_lamp_layer_1" state="0">
 			<bounds x="360.3333" y="480.9722" width="73.3333" height="58.0556"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_2" state="0">
+		<element name="lamp4" ref="reel_lamp_layer_2" state="0">
 			<bounds x="363.6667" y="483.6111" width="66.6667" height="52.7778"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_3" state="0">
+		<element name="lamp4" ref="reel_lamp_layer_3" state="0">
 			<bounds x="367.0000" y="486.2500" width="60.0000" height="47.5000"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_4" state="0">
+		<element name="lamp4" ref="reel_lamp_layer_4" state="0">
 			<bounds x="370.3333" y="488.8889" width="53.3333" height="42.2222"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_5" state="0">
+		<element name="lamp4" ref="reel_lamp_layer_5" state="0">
 			<bounds x="373.6667" y="491.5278" width="46.6667" height="36.9444"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_0" state="0">
+		<element name="lamp3" ref="reel_lamp_layer_0" state="0">
 			<bounds x="357.0000" y="541.6667" width="80.0000" height="63.3333"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_1" state="0">
+		<element name="lamp3" ref="reel_lamp_layer_1" state="0">
 			<bounds x="360.3333" y="544.3056" width="73.3333" height="58.0556"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_2" state="0">
+		<element name="lamp3" ref="reel_lamp_layer_2" state="0">
 			<bounds x="363.6667" y="546.9445" width="66.6667" height="52.7778"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_3" state="0">
+		<element name="lamp3" ref="reel_lamp_layer_3" state="0">
 			<bounds x="367.0000" y="549.5834" width="60.0000" height="47.5000"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_4" state="0">
+		<element name="lamp3" ref="reel_lamp_layer_4" state="0">
 			<bounds x="370.3333" y="552.2222" width="53.3333" height="42.2222"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_5" state="0">
+		<element name="lamp3" ref="reel_lamp_layer_5" state="0">
 			<bounds x="373.6667" y="554.8611" width="46.6667" height="36.9444"/>
 		</element>
 		<element name="sreel2" ref="reel1" state="0">
@@ -4088,58 +4088,58 @@
 		<element ref="reel_background">
 			<bounds x="439" y="415" width="80" height="190"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_0" state="0">
+		<element name="lamp18" ref="reel_lamp_layer_0" state="0">
 			<bounds x="439.0000" y="415.0000" width="80.0000" height="63.3333"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_1" state="0">
+		<element name="lamp18" ref="reel_lamp_layer_1" state="0">
 			<bounds x="442.3333" y="417.6389" width="73.3333" height="58.0556"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_2" state="0">
+		<element name="lamp18" ref="reel_lamp_layer_2" state="0">
 			<bounds x="445.6667" y="420.2778" width="66.6667" height="52.7778"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_3" state="0">
+		<element name="lamp18" ref="reel_lamp_layer_3" state="0">
 			<bounds x="449.0000" y="422.9167" width="60.0000" height="47.5000"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_4" state="0">
+		<element name="lamp18" ref="reel_lamp_layer_4" state="0">
 			<bounds x="452.3333" y="425.5555" width="53.3333" height="42.2222"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_5" state="0">
+		<element name="lamp18" ref="reel_lamp_layer_5" state="0">
 			<bounds x="455.6667" y="428.1945" width="46.6667" height="36.9444"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_0" state="0">
+		<element name="lamp17" ref="reel_lamp_layer_0" state="0">
 			<bounds x="439.0000" y="478.3333" width="80.0000" height="63.3333"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_1" state="0">
+		<element name="lamp17" ref="reel_lamp_layer_1" state="0">
 			<bounds x="442.3333" y="480.9722" width="73.3333" height="58.0556"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_2" state="0">
+		<element name="lamp17" ref="reel_lamp_layer_2" state="0">
 			<bounds x="445.6667" y="483.6111" width="66.6667" height="52.7778"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_3" state="0">
+		<element name="lamp17" ref="reel_lamp_layer_3" state="0">
 			<bounds x="449.0000" y="486.2500" width="60.0000" height="47.5000"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_4" state="0">
+		<element name="lamp17" ref="reel_lamp_layer_4" state="0">
 			<bounds x="452.3333" y="488.8889" width="53.3333" height="42.2222"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_5" state="0">
+		<element name="lamp17" ref="reel_lamp_layer_5" state="0">
 			<bounds x="455.6667" y="491.5278" width="46.6667" height="36.9444"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_0" state="0">
+		<element name="lamp16" ref="reel_lamp_layer_0" state="0">
 			<bounds x="439.0000" y="541.6667" width="80.0000" height="63.3333"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_1" state="0">
+		<element name="lamp16" ref="reel_lamp_layer_1" state="0">
 			<bounds x="442.3333" y="544.3056" width="73.3333" height="58.0556"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_2" state="0">
+		<element name="lamp16" ref="reel_lamp_layer_2" state="0">
 			<bounds x="445.6667" y="546.9445" width="66.6667" height="52.7778"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_3" state="0">
+		<element name="lamp16" ref="reel_lamp_layer_3" state="0">
 			<bounds x="449.0000" y="549.5834" width="60.0000" height="47.5000"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_4" state="0">
+		<element name="lamp16" ref="reel_lamp_layer_4" state="0">
 			<bounds x="452.3333" y="552.2222" width="53.3333" height="42.2222"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_5" state="0">
+		<element name="lamp16" ref="reel_lamp_layer_5" state="0">
 			<bounds x="455.6667" y="554.8611" width="46.6667" height="36.9444"/>
 		</element>
 		<element name="sreel3" ref="reel2" state="0">
@@ -4148,22 +4148,22 @@
 		<element ref="reel_background">
 			<bounds x="236" y="56" width="180" height="60"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_0" state="0">
+		<element name="lamp20" ref="reel_lamp_layer_0" state="0">
 			<bounds x="236.0000" y="56.0000" width="180.0000" height="60.0000"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_1" state="0">
+		<element name="lamp20" ref="reel_lamp_layer_1" state="0">
 			<bounds x="243.5000" y="58.5000" width="165.0000" height="55.0000"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_2" state="0">
+		<element name="lamp20" ref="reel_lamp_layer_2" state="0">
 			<bounds x="251.0000" y="61.0000" width="150.0000" height="50.0000"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_3" state="0">
+		<element name="lamp20" ref="reel_lamp_layer_3" state="0">
 			<bounds x="258.5000" y="63.5000" width="135.0000" height="45.0000"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_4" state="0">
+		<element name="lamp20" ref="reel_lamp_layer_4" state="0">
 			<bounds x="266.0000" y="66.0000" width="120.0000" height="40.0000"/>
 		</element>
-		<element name="lamp-2" ref="reel_lamp_layer_5" state="0">
+		<element name="lamp20" ref="reel_lamp_layer_5" state="0">
 			<bounds x="273.5000" y="68.5000" width="105.0000" height="35.0000"/>
 		</element>
 		<element name="sreel4" ref="reel3" state="0">