diff --git a/src/mame/drivers/goldstar.c b/src/mame/drivers/goldstar.c
index d6c126b4ba7..b55af56df68 100644
--- a/src/mame/drivers/goldstar.c
+++ b/src/mame/drivers/goldstar.c
@@ -166,8 +166,10 @@
#include "goldstar.lh"
#include "lucky8.lh"
#include "nfb96.lh"
+#include "nfb96tx.lh"
#include "pokonl97.lh"
#include "roypok96.lh"
+#include "skill98.lh"
#include "tonypok.lh"
@@ -13035,7 +13037,7 @@ GAME( 1991, magoddsd, magodds, magodds, magoddsc, wingco_state, magoddsc,
GAMEL( 1997, schery97, 0, amcoe1, schery97, cmaster_state, schery97, ROT0, "Amcoe", "Skill Cherry '97 (Talking ver. sc3.52)", 0, layout_nfb96 ) /* running in CB hardware */
GAMEL( 1997, schery97a, schery97, amcoe1, schery97, cmaster_state, schery97a, ROT0, "Amcoe", "Skill Cherry '97 (Talking ver. sc3.52c4)", 0, layout_nfb96 ) /* running in C4 hardware */
-GAMEL( 1998, skill98, 0, amcoe1, schery97, cmaster_state, skill98, ROT0, "Amcoe", "Skill '98 (Talking ver. s98-1.33)", 0, layout_nfb96 )
+GAMEL( 1998, skill98, 0, amcoe1, schery97, cmaster_state, skill98, ROT0, "Amcoe", "Skill '98 (Talking ver. s98-1.33)", 0, layout_skill98 )
GAMEL( 1997, pokonl97, 0, amcoe1, pokonl97, cmaster_state, po33, ROT0, "Amcoe", "Poker Only '97 (Talking ver. 3.3)", 0, layout_pokonl97 )
GAME( 1998, match98, 0, amcoe1a, match98, cmaster_state, match133, ROT0, "Amcoe", "Match '98 (ver. 1.33)", 0 )
@@ -13052,7 +13054,7 @@ GAMEL( 1996, nc96, 0, amcoe2, nfb96, cmaster_state, nfb96_c1,
GAMEL( 1996, nc96a, nc96, amcoe2, nfb96, cmaster_state, nfb96_c1, ROT0, "Amcoe", "New Cherry '96 Special Edition (v3.62, C1 PCB)", 0, layout_nfb96 ) /* C1 Sub-PCB */
GAMEL( 1996, nc96b, nc96, amcoe2, nfb96, cmaster_state, nfb96_d, ROT0, "Amcoe", "New Cherry '96 Special Edition (v3.54, D PCB)", 0, layout_nfb96 ) /* D Sub-PCB */
GAMEL( 1996, nc96c, nc96, amcoe2, nfb96, cmaster_state, nfb96_dk, ROT0, "Amcoe", "New Cherry '96 Special Edition (v3.62, DK PCB)", 0, layout_nfb96 ) /* DK Sub-PCB */
-GAMEL( 2000, nc96txt, nc96, amcoe2, nfb96tx, cmaster_state, nfb96_c2, ROT0, "Amcoe", "New Cherry '96 Special Edition (v1.32 Texas XT, C2 PCB)", 0, layout_nfb96 ) /* ver. tc1.32axt C2 Sub-PCB */
+GAMEL( 2000, nc96txt, nc96, amcoe2, nfb96tx, cmaster_state, nfb96_c2, ROT0, "Amcoe", "New Cherry '96 Special Edition (v1.32 Texas XT, C2 PCB)", 0, layout_nfb96tx ) /* ver. tc1.32axt C2 Sub-PCB */
GAME( 2009, fb2010, 0, amcoe2, nfb96tx, cmaster_state, fb2010, ROT0, "Amcoe", "Fruit Bonus 2010", GAME_NOT_WORKING ) // no gfx dumped
diff --git a/src/mame/layout/cmaster.lay b/src/mame/layout/cmaster.lay
index 82a1b22f670..f423f79e36a 100644
--- a/src/mame/layout/cmaster.lay
+++ b/src/mame/layout/cmaster.lay
@@ -32,7 +32,7 @@
-
+
diff --git a/src/mame/layout/cmasterb.lay b/src/mame/layout/cmasterb.lay
index df39c2f13e6..00f61ca3f7b 100644
--- a/src/mame/layout/cmasterb.lay
+++ b/src/mame/layout/cmasterb.lay
@@ -32,7 +32,7 @@
-
+
diff --git a/src/mame/layout/cmasterc.lay b/src/mame/layout/cmasterc.lay
index d9b0f43209b..b0c787281c9 100644
--- a/src/mame/layout/cmasterc.lay
+++ b/src/mame/layout/cmasterc.lay
@@ -49,7 +49,7 @@
-
+
diff --git a/src/mame/layout/cmpacman.lay b/src/mame/layout/cmpacman.lay
index af48e1a1541..7f7513bbc7c 100644
--- a/src/mame/layout/cmpacman.lay
+++ b/src/mame/layout/cmpacman.lay
@@ -32,7 +32,7 @@
-
+
diff --git a/src/mame/layout/cmv4.lay b/src/mame/layout/cmv4.lay
index 2fc6dfffb27..3581c676be7 100644
--- a/src/mame/layout/cmv4.lay
+++ b/src/mame/layout/cmv4.lay
@@ -32,7 +32,7 @@
-
+
diff --git a/src/mame/layout/goldstar.lay b/src/mame/layout/goldstar.lay
index cf2ede71722..81507522930 100644
--- a/src/mame/layout/goldstar.lay
+++ b/src/mame/layout/goldstar.lay
@@ -242,50 +242,50 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/src/mame/layout/nfb96.lay b/src/mame/layout/nfb96.lay
index c45fb01e452..c8dbb22cea4 100644
--- a/src/mame/layout/nfb96.lay
+++ b/src/mame/layout/nfb96.lay
@@ -17,11 +17,11 @@
-
+
-
+
@@ -30,15 +30,15 @@
-
+
-
+
-
+
@@ -47,19 +47,15 @@
-
+
-
+
-
-
-
-
-
+
-
+
@@ -68,19 +64,15 @@
-
+
-
+
-
-
-
-
-
+
-
+
@@ -93,7 +85,7 @@
-
+
@@ -106,7 +98,7 @@
-
+
@@ -119,7 +111,7 @@
-
+
@@ -128,6 +120,15 @@
+
+
+
+
+
+
+
+
+
@@ -184,77 +185,77 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
diff --git a/src/mame/layout/nfb96tx.lay b/src/mame/layout/nfb96tx.lay
new file mode 100644
index 00000000000..4373d2a3546
--- /dev/null
+++ b/src/mame/layout/nfb96tx.lay
@@ -0,0 +1,262 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/mame/layout/skill98.lay b/src/mame/layout/skill98.lay
new file mode 100644
index 00000000000..0ae14c87420
--- /dev/null
+++ b/src/mame/layout/skill98.lay
@@ -0,0 +1,253 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/mame/mame.mak b/src/mame/mame.mak
index ee68f57dfd7..edefdb39d97 100644
--- a/src/mame/mame.mak
+++ b/src/mame/mame.mak
@@ -2683,8 +2683,10 @@ $(DRIVERS)/goldstar.o: $(LAYOUT)/goldstar.lh \
$(LAYOUT)/crazybon.lh \
$(LAYOUT)/lucky8.lh \
$(LAYOUT)/nfb96.lh \
+ $(LAYOUT)/nfb96tx.lh \
$(LAYOUT)/pokonl97.lh \
$(LAYOUT)/roypok96.lh \
+ $(LAYOUT)/skill98.lh \
$(LAYOUT)/tonypok.lh
$(DRIVERS)/grchamp.o: $(LAYOUT)/grchamp.lh