From 74999d37496bee707fa111c90c781878424d7847 Mon Sep 17 00:00:00 2001
From: Giuseppe Gorgoglione <gorgogsp@gmail.com>
Date: Tue, 5 Apr 2016 13:20:04 +0200
Subject: [PATCH 001/122] Fix Windows rendering after post-fx snapshot or video
 recording

In Windows OSD, when post-processing effects are enabled, after taking a post-fx screenshot (L-ALT + F12) or enabling post-fx video recording (L-SHIFT + L-ALT + F12) the window is not updated anymore while the emulation goes on normally. This patch fixes that.
---
 src/osd/modules/render/d3d/d3dhlsl.cpp | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)
 mode change 100644 => 100755 src/osd/modules/render/d3d/d3dhlsl.cpp

diff --git a/src/osd/modules/render/d3d/d3dhlsl.cpp b/src/osd/modules/render/d3d/d3dhlsl.cpp
old mode 100644
new mode 100755
index 712b80b71af..b49c5d15483
--- a/src/osd/modules/render/d3d/d3dhlsl.cpp
+++ b/src/osd/modules/render/d3d/d3dhlsl.cpp
@@ -1562,18 +1562,30 @@ int shaders::screen_pass(d3d_render_target *rt, int source_index, poly_info *pol
 
 	curr_effect->set_texture("Diffuse", rt->target_texture[next_index]);
 
-	// we do not clear the backbuffe here because multiple screens might be rendered into
+	// we do not clear the backbuffer here because multiple screens might be rendered into
 	blit(backbuffer, false, poly->get_type(), vertnum, poly->get_count());
 
 	if (avi_output_file != nullptr)
 	{
 		blit(avi_final_target, false, poly->get_type(), vertnum, poly->get_count());
+
+		HRESULT result = (*d3dintf->device.set_render_target)(d3d->get_device(), 0, backbuffer);
+		if (result != D3D_OK)
+		{
+			osd_printf_verbose("Direct3D: Error %08X during device set_render_target call\n", (int)result);
+		}
 	}
 
 	if (render_snap)
 	{
 		blit(snap_target, false, poly->get_type(), vertnum, poly->get_count());
 
+		HRESULT result = (*d3dintf->device.set_render_target)(d3d->get_device(), 0, backbuffer);
+		if (result != D3D_OK)
+		{
+			osd_printf_verbose("Direct3D: Error %08X during device set_render_target call\n", (int)result);
+		}
+
 		snap_rendered = true;
 	}
 

From 990476526c911892baaa3a5c483126e194a864e1 Mon Sep 17 00:00:00 2001
From: Giuseppe Gorgoglione <gorgogsp@gmail.com>
Date: Tue, 5 Apr 2016 13:35:12 +0200
Subject: [PATCH 002/122] Save Windows post-fx scheenshots as a single .png

Currently in Windows post-fx screenshots (L-ALT + F12) are split in 4 chunks and saved as 4 separate .png files. This was probably done to facilitate fx code debugging, since post-fx screenshots are usually very big and old monitors were low in resolution. With current monitors this shouldn't be a problem any more.
---
 src/osd/modules/render/d3d/d3dhlsl.cpp | 227 ++++---------------------
 1 file changed, 34 insertions(+), 193 deletions(-)

diff --git a/src/osd/modules/render/d3d/d3dhlsl.cpp b/src/osd/modules/render/d3d/d3dhlsl.cpp
index b49c5d15483..c7705ac2063 100755
--- a/src/osd/modules/render/d3d/d3dhlsl.cpp
+++ b/src/osd/modules/render/d3d/d3dhlsl.cpp
@@ -38,7 +38,6 @@
 //============================================================
 
 static slider_state *g_slider_list;
-static osd_file::error open_next(renderer_d3d9 *d3d, emu_file &file, const char *templ, const char *extension, int idx);
 
 //============================================================
 //  PROTOTYPES
@@ -237,9 +236,9 @@ void shaders::render_snapshot(surface *surface)
 	render_snap = false;
 
 	// if we don't have a bitmap, or if it's not the right size, allocate a new one
-	if (!avi_snap.valid() || snap_width != (avi_snap.width() / 2) || snap_height != (avi_snap.height() / 2))
+	if (!avi_snap.valid() || snap_width != avi_snap.width() || snap_height != avi_snap.height())
 	{
-		avi_snap.allocate(snap_width / 2, snap_height / 2);
+		avi_snap.allocate(snap_width, snap_height);
 	}
 
 	// copy the texture
@@ -256,52 +255,42 @@ void shaders::render_snapshot(surface *surface)
 		return;
 	}
 
-	for (int cy = 0; cy < 2; cy++)
+	// loop over Y
+	for (int srcy = 0; srcy < snap_height; srcy++)
 	{
-		for (int cx = 0; cx < 2; cx++)
+		DWORD *src = (DWORD *)((BYTE *)rect.pBits + srcy * rect.Pitch);
+		UINT32 *dst = &avi_snap.pix32(srcy);
+
+		for (int x = 0; x < snap_width; x++)
 		{
-			// loop over Y
-			for (int srcy = 0; srcy < snap_height / 2; srcy++)
-			{
-				int toty = (srcy + cy * (snap_height / 2));
-				int totx = cx * (snap_width / 2);
-				DWORD *src = (DWORD *)((BYTE *)rect.pBits + toty * rect.Pitch + totx * 4);
-				UINT32 *dst = &avi_snap.pix32(srcy);
-
-				for (int x = 0; x < snap_width / 2; x++)
-				{
-					*dst++ = *src++;
-				}
-			}
-
-			int idx = cy * 2 + cx;
-
-			emu_file file(machine->options().snapshot_directory(), OPEN_FLAG_WRITE | OPEN_FLAG_CREATE | OPEN_FLAG_CREATE_PATHS);
-			osd_file::error filerr = open_next(d3d, file, nullptr, "png", idx);
-			if (filerr != osd_file::error::NONE)
-			{
-				return;
-			}
-
-			// add two text entries describing the image
-			std::string text1 = std::string(emulator_info::get_appname()).append(" ").append(build_version);
-			std::string text2 = std::string(machine->system().manufacturer).append(" ").append(machine->system().description);
-			png_info pnginfo = { 0 };
-			png_add_text(&pnginfo, "Software", text1.c_str());
-			png_add_text(&pnginfo, "System", text2.c_str());
-
-			// now do the actual work
-			png_error error = png_write_bitmap(file, &pnginfo, avi_snap, 1 << 24, nullptr);
-			if (error != PNGERR_NONE)
-			{
-				osd_printf_error("Error generating PNG for HLSL snapshot: png_error = %d\n", error);
-			}
-
-			// free any data allocated
-			png_free(&pnginfo);
+			*dst++ = *src++;
 		}
 	}
 
+	emu_file file(machine->options().snapshot_directory(), OPEN_FLAG_WRITE | OPEN_FLAG_CREATE | OPEN_FLAG_CREATE_PATHS);
+	osd_file::error filerr = machine->video().open_next(file, "png");
+	if (filerr != osd_file::error::NONE)
+	{
+		return;
+	}
+
+	// add two text entries describing the image
+	std::string text1 = std::string(emulator_info::get_appname()).append(" ").append(build_version);
+	std::string text2 = std::string(machine->system().manufacturer).append(" ").append(machine->system().description);
+	png_info pnginfo = { 0 };
+	png_add_text(&pnginfo, "Software", text1.c_str());
+	png_add_text(&pnginfo, "System", text2.c_str());
+
+	// now do the actual work
+	png_error error = png_write_bitmap(file, &pnginfo, avi_snap, 1 << 24, nullptr);
+	if (error != PNGERR_NONE)
+	{
+		osd_printf_error("Error generating PNG for HLSL snapshot: png_error = %d\n", error);
+	}
+
+	// free any data allocated
+	png_free(&pnginfo);
+
 	// unlock
 	result = (*d3dintf->surface.unlock_rect)(snap_copy_target);
 	if (result != D3D_OK) osd_printf_verbose("Direct3D: Error %08X during texture unlock_rect call\n", (int)result);
@@ -483,7 +472,7 @@ void shaders::begin_avi_recording(const char *name)
 		}
 		else
 		{
-			filerr = open_next(d3d, tempfile, nullptr, "avi", 0);
+			filerr = machine->video().open_next(tempfile, "avi");
 		}
 
 		// compute the frame time
@@ -3076,151 +3065,3 @@ slider_state *renderer_d3d9::get_slider_list()
 	}
 	return g_slider_list;
 }
-
-
-// NOTE: The function below is taken directly from src/emu/video.c and should likely be moved into a global helper function.
-//-------------------------------------------------
-//  open_next - open the next non-existing file of
-//  type filetype according to our numbering
-//  scheme
-//-------------------------------------------------
-
-static osd_file::error open_next(renderer_d3d9 *d3d, emu_file &file, const char *templ, const char *extension, int idx)
-{
-	UINT32 origflags = file.openflags();
-
-	// handle defaults
-	const char *snapname = templ ? templ : d3d->window().machine().options().snap_name();
-
-	if (snapname == nullptr || snapname[0] == 0)
-	{
-		snapname = "%g/%i";
-	}
-	std::string snapstr(snapname);
-
-	// strip any extension in the provided name
-	int index = snapstr.find_last_of('.');
-	if (index != -1)
-	{
-		snapstr.substr(0, index);
-	}
-
-	// handle %d in the template (for image devices)
-	std::string snapdev("%d_");
-	int pos = snapstr.find(snapdev,0);
-
-	if (pos != -1)
-	{
-		// if more %d are found, revert to default and ignore them all
-		if (snapstr.find(snapdev, pos + 3) != -1)
-		{
-			snapstr.assign("%g/%i");
-		}
-		// else if there is a single %d, try to create the correct snapname
-		else
-		{
-			int name_found = 0;
-
-			// find length of the device name
-			int end1 = snapstr.find("/", pos + 3);
-			int end2 = snapstr.find("%", pos + 3);
-			int end;
-
-			if ((end1 != -1) && (end2 != -1))
-			{
-				end = MIN(end1, end2);
-			}
-			else if (end1 != -1)
-			{
-				end = end1;
-			}
-			else if (end2 != -1)
-			{
-				end = end2;
-			}
-			else
-			{
-				end = snapstr.length();
-			}
-
-			if (end - pos < 3)
-			{
-				fatalerror("Something very wrong is going on!!!\n");
-			}
-
-			// copy the device name to a string
-			std::string snapdevname;
-			snapdevname.assign(snapstr.substr(pos + 3, end - pos - 3));
-
-			// verify that there is such a device for this system
-			image_interface_iterator iter(d3d->window().machine().root_device());
-			for (device_image_interface *image = iter.first(); image != nullptr; iter.next())
-			{
-				// get the device name
-				std::string tempdevname(image->brief_instance_name());
-
-				if (snapdevname.compare(tempdevname) == 0)
-				{
-					// verify that such a device has an image mounted
-					if (image->basename() != nullptr)
-					{
-						std::string filename(image->basename());
-
-						// strip extension
-						filename.substr(0, filename.find_last_of('.'));
-
-						// setup snapname and remove the %d_
-						strreplace(snapstr, snapdevname.c_str(), filename.c_str());
-						snapstr.erase(pos, 3);
-
-						name_found = 1;
-					}
-				}
-			}
-
-			// or fallback to default
-			if (name_found == 0)
-			{
-				snapstr.assign("%g/%i");
-			}
-		}
-	}
-
-	// add our own index
-	// add our own extension
-	snapstr.append(".").append(extension);
-
-	// substitute path and gamename up front
-	strreplace(snapstr, "/", PATH_SEPARATOR);
-	strreplace(snapstr, "%g", d3d->window().machine().basename());
-
-	// determine if the template has an index; if not, we always use the same name
-	std::string fname;
-	if (snapstr.find("%i") == -1)
-	{
-		fname.assign(snapstr);
-	}
-
-	// otherwise, we scan for the next available filename
-	else
-	{
-		// try until we succeed
-		file.set_openflags(OPEN_FLAG_READ);
-		for (int seq = 0; ; seq++)
-		{
-			// build up the filename
-			strreplace(fname.assign(snapstr), "%i", string_format("%04d_%d", seq, idx).c_str());
-
-			// try to open the file; stop when we fail
-			osd_file::error filerr = file.open(fname.c_str());
-			if (filerr != osd_file::error::NONE)
-			{
-				break;
-			}
-		}
-	}
-
-	// create the final file
-	file.set_openflags(origflags);
-	return file.open(fname.c_str());
-}

From 277220295929e95ddc3aaa432c5e67174349402e Mon Sep 17 00:00:00 2001
From: rfka01 <rfka01@freenet.de>
Date: Tue, 12 Apr 2016 23:05:23 +0200
Subject: [PATCH 003/122] Added older ROM revision of a Color DMV

---
 src/mame/drivers/dmv.cpp | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/mame/drivers/dmv.cpp b/src/mame/drivers/dmv.cpp
index 6683abc3ab2..1579ffb1055 100644
--- a/src/mame/drivers/dmv.cpp
+++ b/src/mame/drivers/dmv.cpp
@@ -824,19 +824,22 @@ MACHINE_CONFIG_END
 ROM_START( dmv )
 	ROM_REGION( 0x2000, "boot", 0 )
 	ROM_SYSTEM_BIOS(0, "c07", "C.07.00")    // ROM bears the handwritten note "Color 7.0", this is from the machine that originally had Color, 68K and internal 8088
-	ROM_SYSTEM_BIOS(1, "m07", "M.07.00")    // Mono machine with internal 8088 and internal HD
-	ROM_SYSTEM_BIOS(2, "m06", "M.06.00")    // Mono machine
-	ROM_SYSTEM_BIOS(3, "m05", "M.05.00")    // Mono machine, marked "updated"
+	ROM_SYSTEM_BIOS(1, "c06", "C.06.00")    // Color machine with older BIOS revision
+	ROM_SYSTEM_BIOS(2, "m07", "M.07.00")    // Mono machine with internal 8088 and internal HD
+	ROM_SYSTEM_BIOS(3, "m06", "M.06.00")    // Mono machine
+	ROM_SYSTEM_BIOS(4, "m05", "M.05.00")    // Mono machine, marked "updated"
 
 	ROMX_LOAD( "dmv_mb_rom_33610.bin", 0x00000,    0x02000,    CRC(bf25f3f0) SHA1(0c7dd37704db4799e340cc836f887cd543e5c964), ROM_BIOS(1) )
-	ROMX_LOAD( "dmv_mb_rom_33609.bin", 0x00000,    0x02000,    CRC(120951b6) SHA1(57bef9cc6379dea5730bc1477e8896508e00a349), ROM_BIOS(2) )
-	ROMX_LOAD( "dmv_mb_rom_32676.bin", 0x00000,    0x02000,    CRC(7796519e) SHA1(8d5dd9c1e66c96fcca271b6f673d6a0e784acb33), ROM_BIOS(3) )
-	ROMX_LOAD( "dmv_mb_rom_32664.bin", 0x00000,    0x02000,    CRC(6624610e) SHA1(e9226be897d2c5f875784ab77dad8807f14c7714), ROM_BIOS(4) )
+	ROMX_LOAD( "dmv_mb_rom_32838.bin", 0x00000,    0x02000,    CRC(d5ceb559) SHA1(e3a05e43aa1b09f0a857b8d54b00bcd321215bf6), ROM_BIOS(2) )
+	ROMX_LOAD( "dmv_mb_rom_33609.bin", 0x00000,    0x02000,    CRC(120951b6) SHA1(57bef9cc6379dea5730bc1477e8896508e00a349), ROM_BIOS(3) )
+	ROMX_LOAD( "dmv_mb_rom_32676.bin", 0x00000,    0x02000,    CRC(7796519e) SHA1(8d5dd9c1e66c96fcca271b6f673d6a0e784acb33), ROM_BIOS(4) )
+	ROMX_LOAD( "dmv_mb_rom_32664.bin", 0x00000,    0x02000,    CRC(6624610e) SHA1(e9226be897d2c5f875784ab77dad8807f14c7714), ROM_BIOS(5) )
 
 	ROM_REGION(0x400, "kb_ctrl_mcu", 0)
 	ROMX_LOAD( "dmv_mb_8741_32678.bin",    0x00000,    0x00400,    CRC(50d1dc4c) SHA1(2c8251d6c8df9f507e11bf920869657f4d074db1), ROM_BIOS(1) )
 	ROMX_LOAD( "dmv_mb_8741_32678.bin",    0x00000,    0x00400,    CRC(50d1dc4c) SHA1(2c8251d6c8df9f507e11bf920869657f4d074db1), ROM_BIOS(2) )
 	ROMX_LOAD( "dmv_mb_8741_32678.bin",    0x00000,    0x00400,    CRC(50d1dc4c) SHA1(2c8251d6c8df9f507e11bf920869657f4d074db1), ROM_BIOS(3) )
+	ROMX_LOAD( "dmv_mb_8741_32678.bin",    0x00000,    0x00400,    CRC(50d1dc4c) SHA1(2c8251d6c8df9f507e11bf920869657f4d074db1), ROM_BIOS(4) )
 	ROMX_LOAD( "dmv_mb_8741_32121.bin",    0x00000,    0x00400,    CRC(a03af298) SHA1(144cba41294c46f5ca79b7ad8ced0e4408168775), ROM_BIOS(4) )
 
 	ROM_REGION(0x800, "chargen", 0)

From 4422b2cf84c555ef238746cc88adbdf9974637e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jind=C5=99ich=20Makovi=C4=8Dka?= <makovick@gmail.com>
Date: Wed, 13 Apr 2016 09:44:42 +0200
Subject: [PATCH 004/122] Fix type mismatch

---
 src/lib/netlist/solver/nld_solver.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/lib/netlist/solver/nld_solver.cpp b/src/lib/netlist/solver/nld_solver.cpp
index 5dd0af53313..ff877152ca4 100644
--- a/src/lib/netlist/solver/nld_solver.cpp
+++ b/src/lib/netlist/solver/nld_solver.cpp
@@ -494,7 +494,7 @@ NETLIB_UPDATE(solver)
 				if (m_mat_solvers[i]->is_timestep())
 				{
 					// Ignore return value
-					ATTR_UNUSED const nl_double ts = m_mat_solvers[i]->solve();
+					ATTR_UNUSED const netlist_time ts = m_mat_solvers[i]->solve();
 				}
 		}
 	}
@@ -503,7 +503,7 @@ NETLIB_UPDATE(solver)
 			if (m_mat_solvers[i]->is_timestep())
 			{
 				// Ignore return value
-				ATTR_UNUSED const nl_double ts = m_mat_solvers[i]->solve();
+				ATTR_UNUSED const netlist_time ts = m_mat_solvers[i]->solve();
 			}
 #else
 	for (auto & solver : m_mat_solvers)

From 658a4b1862a9f9c54c5fed0eafe1a3c265832071 Mon Sep 17 00:00:00 2001
From: Santiago Vila <sanvila@debian.org>
Date: Fri, 15 Apr 2016 11:29:30 +0200
Subject: [PATCH 005/122] Show mame's program name lowercase in help output.

As the name of the binary is normally installed lowercase, the help
output should also reflect this.
---
 src/emu/clifront.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/emu/clifront.cpp b/src/emu/clifront.cpp
index 803b8a4db76..e2fe703adca 100644
--- a/src/emu/clifront.cpp
+++ b/src/emu/clifront.cpp
@@ -1713,14 +1713,14 @@ void cli_frontend::display_help()
 	osd_printf_info("This software reproduces, more or less faithfully, the behaviour of a wide range\n"
 					"of machines. But hardware is useless without software, so images of the ROMs and\n"
 					"other media which run on that hardware are also required.\n\n");
-	osd_printf_info("Usage:  %s [machine] [media] [software] [options]",emulator_info::get_appname());
+	osd_printf_info("Usage:  %s [machine] [media] [software] [options]",emulator_info::get_appname_lower());
 	osd_printf_info("\n\n"
 			"        %s -showusage    for a brief list of options\n"
 			"        %s -showconfig   for a list of configuration options\n"
 			"        %s -listmedia    for a full list of supported media\n"
 			"        %s -createconfig to create a %s.ini\n\n"
-			"For usage instructions, please consult the files config.txt and windows.txt.\n",emulator_info::get_appname(),
-			emulator_info::get_appname(),emulator_info::get_appname(),emulator_info::get_appname(),emulator_info::get_configname());
+			"For usage instructions, please consult the files config.txt and windows.txt.\n",emulator_info::get_appname_lower(),
+			emulator_info::get_appname_lower(),emulator_info::get_appname_lower(),emulator_info::get_appname_lower(),emulator_info::get_configname());
 }
 
 

From 3176347abcb8751becdca0889107fae061fb30f9 Mon Sep 17 00:00:00 2001
From: Sune Vuorela <sune@debian.org>
Date: Fri, 15 Apr 2016 11:43:52 +0200
Subject: [PATCH 006/122] Pass explicit -qt5 to all moc and qmake calls.

Some systems like Debian, Ubuntu and other derivatives, expect qtchooser
will be used to select the appropriate Qt version, as Qt5 and Qt4 can
co-exist.

As MAME's build system does calls to moc and qmake directly, and Qt5 is
now the required version for the debugger, pass -qt5 to all moc and qmake
calls to avoid the build fail.
---
 scripts/src/osd/modules.lua | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/scripts/src/osd/modules.lua b/scripts/src/osd/modules.lua
index 11c69108ec2..f3d6879355c 100644
--- a/scripts/src/osd/modules.lua
+++ b/scripts/src/osd/modules.lua
@@ -286,14 +286,14 @@ function qtdebuggerbuild()
 			MOC = "moc"
 		else
 			if _OPTIONS["QT_HOME"]~=nil then
-				QMAKETST = backtick(_OPTIONS["QT_HOME"] .. "/bin/qmake --version 2>/dev/null")
+				QMAKETST = backtick(_OPTIONS["QT_HOME"] .. "/bin/qmake -qt5 --version 2>/dev/null")
 				if (QMAKETST=='') then
 					print("Qt's Meta Object Compiler (moc) wasn't found!")
 					os.exit(1)
 				end
-				MOC = _OPTIONS["QT_HOME"] .. "/bin/moc"
+				MOC = _OPTIONS["QT_HOME"] .. "/bin/moc -qt5"
 			else
-				MOCTST = backtick("which moc-qt5 2>/dev/null")
+				MOCTST = backtick("which moc 2>/dev/null")
 				if (MOCTST=='') then
 					MOCTST = backtick("which moc 2>/dev/null")
 				end
@@ -301,7 +301,7 @@ function qtdebuggerbuild()
 					print("Qt's Meta Object Compiler (moc) wasn't found!")
 					os.exit(1)
 				end
-				MOC = MOCTST
+				MOC = MOCTST .. " -qt5"
 			end
 		end
 
@@ -322,17 +322,17 @@ function qtdebuggerbuild()
 		if _OPTIONS["targetos"]=="windows" then
 			configuration { "mingw*" }
 				buildoptions {
-					"-I$(shell qmake -query QT_INSTALL_HEADERS)",
+					"-I$(shell qmake -qt5 -query QT_INSTALL_HEADERS)",
 				}
 			configuration { }
 		elseif _OPTIONS["targetos"]=="macosx" then
 			buildoptions {
-				"-F" .. backtick("qmake -query QT_INSTALL_LIBS"),
+				"-F" .. backtick("qmake -qt5 -query QT_INSTALL_LIBS"),
 			}
 		else
 			if _OPTIONS["QT_HOME"]~=nil then
 				buildoptions {
-					"-I" .. backtick(_OPTIONS["QT_HOME"] .. "/bin/qmake -query QT_INSTALL_HEADERS"),
+					"-I" .. backtick(_OPTIONS["QT_HOME"] .. "/bin/qmake -qt5 -query QT_INSTALL_HEADERS"),
 				}
 			else
 				buildoptions {
@@ -384,7 +384,7 @@ function osdmodulestargetconf()
 	if _OPTIONS["USE_QTDEBUG"]=="1" then
 		if _OPTIONS["targetos"]=="windows" then
 			linkoptions {
-				"-L$(shell qmake -query QT_INSTALL_LIBS)",
+				"-L$(shell qmake -qt5 -query QT_INSTALL_LIBS)",
 			}
 			links {
 				"qtmain",
@@ -394,7 +394,7 @@ function osdmodulestargetconf()
 			}
 		elseif _OPTIONS["targetos"]=="macosx" then
 			linkoptions {
-				"-F" .. backtick("qmake -query QT_INSTALL_LIBS"),
+				"-F" .. backtick("qmake -qt5 -query QT_INSTALL_LIBS"),
 			}
 			links {
 				"Qt5Core.framework",
@@ -404,7 +404,7 @@ function osdmodulestargetconf()
 		else
 			if _OPTIONS["QT_HOME"]~=nil then
 				linkoptions {
-					"-L" .. backtick(_OPTIONS["QT_HOME"] .. "/bin/qmake -query QT_INSTALL_LIBS"),
+					"-L" .. backtick(_OPTIONS["QT_HOME"] .. "/bin/qmake -qt5 -query QT_INSTALL_LIBS"),
 				}
 				links {
 					"Qt5Core",

From a83a3c4497f2e5c09d0deb7468bde645ffb3e89e Mon Sep 17 00:00:00 2001
From: Miodrag Milanovic <mmicko@gmail.com>
Date: Fri, 15 Apr 2016 14:00:01 +0200
Subject: [PATCH 007/122] lower deps on clifront.h (nw)

---
 src/emu/clifront.cpp      | 1 +
 src/emu/cliopts.cpp       | 1 -
 src/emu/cliopts.h         | 2 +-
 src/emu/softlist.cpp      | 3 +--
 src/emu/ui/sndmenu.cpp    | 1 -
 src/emu/validity.cpp      | 3 ++-
 src/emu/validity.h        | 4 +++-
 src/osd/sdl/osdsdl.h      | 1 -
 src/osd/windows/winmain.h | 1 -
 9 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/emu/clifront.cpp b/src/emu/clifront.cpp
index 803b8a4db76..4a718febd0e 100644
--- a/src/emu/clifront.cpp
+++ b/src/emu/clifront.cpp
@@ -1602,6 +1602,7 @@ void cli_frontend::execute_commands(const char *exename)
 	if (strcmp(m_options.command(), CLICOMMAND_VALIDATE) == 0)
 	{
 		validity_checker valid(m_options);
+		valid.set_validate_all(true);
 		const char *sysname = m_options.system_name();
 		bool result = valid.check_all_matching((sysname[0] == 0) ? "*" : sysname);
 		if (!result)
diff --git a/src/emu/cliopts.cpp b/src/emu/cliopts.cpp
index ba2cb33afe9..48df5cf00d9 100644
--- a/src/emu/cliopts.cpp
+++ b/src/emu/cliopts.cpp
@@ -6,7 +6,6 @@
 
 ***************************************************************************/
 
-#include "clifront.h"
 #include "cliopts.h"
 
 //**************************************************************************
diff --git a/src/emu/cliopts.h b/src/emu/cliopts.h
index ce0cb7a9c58..d7a0a938d49 100644
--- a/src/emu/cliopts.h
+++ b/src/emu/cliopts.h
@@ -2,7 +2,7 @@
 // copyright-holders:Aaron Giles
 /***************************************************************************
 
-    clifront.h
+    cliopts.h
 
     Command-line interface frontend for MAME.
 
diff --git a/src/emu/softlist.cpp b/src/emu/softlist.cpp
index e86415b3d35..4288fa93f90 100644
--- a/src/emu/softlist.cpp
+++ b/src/emu/softlist.cpp
@@ -11,7 +11,6 @@
 #include "emu.h"
 #include "emuopts.h"
 #include "softlist.h"
-#include "clifront.h"
 #include "validity.h"
 #include "expat.h"
 
@@ -508,7 +507,7 @@ void software_list_device::device_validity_check(validity_checker &valid) const
 		return;
 
 	// do device validation only in case of validate command
-	if (strcmp(mconfig().options().command(), CLICOMMAND_VALIDATE) != 0)
+	if (!valid.validate_all())
 		return;
 
 	// actually do the validate
diff --git a/src/emu/ui/sndmenu.cpp b/src/emu/ui/sndmenu.cpp
index dd3e717d98a..52768c09b3a 100644
--- a/src/emu/ui/sndmenu.cpp
+++ b/src/emu/ui/sndmenu.cpp
@@ -13,7 +13,6 @@
 #include "ui/menu.h"
 #include "ui/sndmenu.h"
 #include "ui/selector.h"
-#include "cliopts.h"
 #include "../osd/modules/lib/osdobj_common.h" // TODO: remove
 
 const int ui_menu_sound_options::m_sound_rate[] = { 11025, 22050, 44100, 48000 };
diff --git a/src/emu/validity.cpp b/src/emu/validity.cpp
index 2397ad444a6..e4200759952 100644
--- a/src/emu/validity.cpp
+++ b/src/emu/validity.cpp
@@ -116,7 +116,8 @@ validity_checker::validity_checker(emu_options &options)
 		m_current_driver(nullptr),
 		m_current_config(nullptr),
 		m_current_device(nullptr),
-		m_current_ioport(nullptr)
+		m_current_ioport(nullptr),
+		m_validate_all(false)
 {
 	// pre-populate the defstr map with all the default strings
 	for (int strnum = 1; strnum < INPUT_STRING_COUNT; strnum++)
diff --git a/src/emu/validity.h b/src/emu/validity.h
index 66eaffd533b..eec10069aaa 100644
--- a/src/emu/validity.h
+++ b/src/emu/validity.h
@@ -39,9 +39,11 @@ public:
 	// getters
 	int errors() const { return m_errors; }
 	int warnings() const { return m_warnings; }
+	int validate_all() const { return m_validate_all; }
 
 	// setter
 	void set_verbose(bool verbose) { m_print_verbose = verbose; }
+	void set_validate_all(bool all) { m_validate_all = all; }
 
 	// operations
 	void check_driver(const game_driver &driver);
@@ -110,7 +112,7 @@ private:
 	const char *            m_current_ioport;
 	int_map                 m_region_map;
 	std::unordered_set<std::string>   m_already_checked;
-
+	bool					m_validate_all;
 };
 
 #endif
diff --git a/src/osd/sdl/osdsdl.h b/src/osd/sdl/osdsdl.h
index d3ce734b4d2..c239966c7ab 100644
--- a/src/osd/sdl/osdsdl.h
+++ b/src/osd/sdl/osdsdl.h
@@ -4,7 +4,6 @@
 #define _osdsdl_h_
 
 #include "watchdog.h"
-#include "clifront.h"
 #include "modules/lib/osdobj_common.h"
 #include "modules/osdmodule.h"
 #include "modules/font/font_module.h"
diff --git a/src/osd/windows/winmain.h b/src/osd/windows/winmain.h
index f4d1a611191..7bd2917a2a7 100644
--- a/src/osd/windows/winmain.h
+++ b/src/osd/windows/winmain.h
@@ -10,7 +10,6 @@
 #define __WINDOWS_WINMAIN_H__
 
 #include <winapifamily.h>
-#include "clifront.h"
 #include "osdepend.h"
 #include "modules/lib/osdobj_common.h"
 

From 59662e6c71625d3783bbdc351613f77358d57679 Mon Sep 17 00:00:00 2001
From: Miodrag Milanovic <mmicko@gmail.com>
Date: Fri, 15 Apr 2016 15:19:24 +0200
Subject: [PATCH 008/122] moved osdsync to root of OSD, removed osdmini (nw)

---
 makefile                                      |  21 +-
 scripts/src/osd/osdmini.lua                   | 133 -------------
 scripts/src/osd/osdmini_cfg.lua               |  12 --
 scripts/src/osd/sdl.lua                       |   5 +-
 scripts/src/osd/windows.lua                   |   5 +-
 src/osd/modules/lib/osdlib.h                  |  13 --
 src/osd/modules/sync/osdsync.cpp              |  14 --
 src/osd/osdcore.cpp                           |   9 -
 src/osd/osdmini/minidir.cpp                   |  44 -----
 src/osd/osdmini/minimain.cpp                  | 179 ------------------
 src/osd/osdmini/minimisc.cpp                  | 109 -----------
 src/osd/osdmini/minitime.cpp                  |  51 -----
 src/osd/osdmini/osdmini.h                     |  57 ------
 .../sync/work_osd.cpp => osdsync.cpp}         |  15 +-
 src/osd/{modules/sync => }/osdsync.h          |   0
 src/osd/sdl/watchdog.h                        |   2 +-
 16 files changed, 17 insertions(+), 652 deletions(-)
 delete mode 100644 scripts/src/osd/osdmini.lua
 delete mode 100644 scripts/src/osd/osdmini_cfg.lua
 delete mode 100644 src/osd/modules/sync/osdsync.cpp
 delete mode 100644 src/osd/osdmini/minidir.cpp
 delete mode 100644 src/osd/osdmini/minimain.cpp
 delete mode 100644 src/osd/osdmini/minimisc.cpp
 delete mode 100644 src/osd/osdmini/minitime.cpp
 delete mode 100644 src/osd/osdmini/osdmini.h
 rename src/osd/{modules/sync/work_osd.cpp => osdsync.cpp} (98%)
 rename src/osd/{modules/sync => }/osdsync.h (100%)

diff --git a/makefile b/makefile
index 7ee690d18b3..df813945c4c 100644
--- a/makefile
+++ b/makefile
@@ -345,7 +345,7 @@ CXX:= $(SILENT)g++
 
 ifndef OSD
 
-OSD := osdmini
+OSD := sdl
 
 ifeq ($(TARGETOS),windows)
 OSD := windows
@@ -874,7 +874,6 @@ else
 FULLTARGET := $(TARGET)$(SUBTARGET)
 endif
 PROJECTDIR := $(BUILDDIR)/projects/$(OSD)/$(FULLTARGET)
-PROJECTDIR_MINI := $(BUILDDIR)/projects/osdmini/$(FULLTARGET)
 PROJECTDIR_SDL := $(BUILDDIR)/projects/sdl/$(FULLTARGET)
 PROJECTDIR_WIN := $(BUILDDIR)/projects/windows/$(FULLTARGET)
 
@@ -1157,24 +1156,6 @@ endif
 	$(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR)/gmake-asmjs config=$(CONFIG) precompile
 	$(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR)/gmake-asmjs config=$(CONFIG)
 
-#-------------------------------------------------
-# PNaCl
-#-------------------------------------------------
-
-$(PROJECTDIR_MINI)/gmake-pnacl/Makefile: makefile $(SCRIPTS) $(GENIE)
-ifndef NACL_SDK_ROOT
-	$(error NACL_SDK_ROOT is not set)
-endif
-	$(SILENT) $(GENIE) $(PARAMS) --gcc=pnacl --gcc_version=3.7.0 --osd=osdmini --targetos=pnacl --NOASM=1 --USE_LIBUV=0 gmake
-
-.PHONY: pnacl
-pnacl: generate $(PROJECTDIR_MINI)/gmake-pnacl/Makefile
-ifndef NACL_SDK_ROOT
-	$(error NACL_SDK_ROOT is not set)
-endif
-	$(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR_MINI)/gmake-pnacl config=$(CONFIG) precompile
-	$(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR_MINI)/gmake-pnacl config=$(CONFIG)
-
 #-------------------------------------------------
 # gmake-linux
 #-------------------------------------------------
diff --git a/scripts/src/osd/osdmini.lua b/scripts/src/osd/osdmini.lua
deleted file mode 100644
index efdb28bd9c0..00000000000
--- a/scripts/src/osd/osdmini.lua
+++ /dev/null
@@ -1,133 +0,0 @@
--- license:BSD-3-Clause
--- copyright-holders:MAMEdev Team
-
----------------------------------------------------------------------------
---
---   osdmini.lua
---
---   Rules for the building of osdmini
---
----------------------------------------------------------------------------
-
-function maintargetosdoptions(_target,_subtarget)
-end
-
-project ("qtdbg_" .. _OPTIONS["osd"])
-	uuid (os.uuid("qtdbg_" .. _OPTIONS["osd"]))
-	kind (LIBTYPE)
-
-	dofile("osdmini_cfg.lua")
-	includedirs {
-		MAME_DIR .. "src/emu",
-		MAME_DIR .. "src/devices", -- accessing imagedev from debugger
-		MAME_DIR .. "src/osd",
-		MAME_DIR .. "src/lib",
-		MAME_DIR .. "src/lib/util",
-		MAME_DIR .. "src/osd/modules/render",
-		MAME_DIR .. "3rdparty",
-	}
-	removeflags {
-		"SingleOutputDir",
-	}
-
-	files {
-		MAME_DIR .. "src/osd/modules/debugger/debugqt.cpp",
-	}
-
-project ("osd_" .. _OPTIONS["osd"])
-	uuid (os.uuid("osd_" .. _OPTIONS["osd"]))
-	kind (LIBTYPE)
-
-	removeflags {
-		"SingleOutputDir",
-	}
-
-	dofile("osdmini_cfg.lua")
-
-	includedirs {
-		MAME_DIR .. "src/emu",
-		MAME_DIR .. "src/osd",
-		MAME_DIR .. "src/lib",
-		MAME_DIR .. "src/lib/util",
-		MAME_DIR .. "src/osd/sdl",
-		MAME_DIR .. "src/osd/modules/render",
-		MAME_DIR .. "3rdparty",
-		MAME_DIR .. "3rdparty/winpcap/Include",
-		MAME_DIR .. "3rdparty/bgfx/include",
-		MAME_DIR .. "3rdparty/bx/include",
-	}
-
-	files {
-		MAME_DIR .. "src/osd/osdmini/minimain.cpp",
-		MAME_DIR .. "src/osd/osdmini/osdmini.h",
-		MAME_DIR .. "src/osd/osdepend.h",
-		MAME_DIR .. "src/osd/modules/lib/osdobj_common.cpp",
-		MAME_DIR .. "src/osd/modules/lib/osdobj_common.h",
-		MAME_DIR .. "src/osd/modules/font/font_sdl.cpp",
-		MAME_DIR .. "src/osd/modules/font/font_windows.cpp",
-		MAME_DIR .. "src/osd/modules/font/font_dwrite.cpp",
-		MAME_DIR .. "src/osd/modules/font/font_osx.cpp",
-		MAME_DIR .. "src/osd/modules/font/font_none.cpp",
-		MAME_DIR .. "src/osd/modules/netdev/taptun.cpp",
-		MAME_DIR .. "src/osd/modules/netdev/pcap.cpp",
-		MAME_DIR .. "src/osd/modules/netdev/none.cpp",
-		MAME_DIR .. "src/osd/modules/midi/portmidi.cpp",
-		MAME_DIR .. "src/osd/modules/midi/none.cpp",
-		MAME_DIR .. "src/osd/modules/sound/js_sound.cpp",
-		MAME_DIR .. "src/osd/modules/sound/direct_sound.cpp",
-		MAME_DIR .. "src/osd/modules/sound/coreaudio_sound.cpp",
-		MAME_DIR .. "src/osd/modules/sound/sdl_sound.cpp",
-		MAME_DIR .. "src/osd/modules/sound/none.cpp",
-		MAME_DIR .. "src/osd/modules/sound/xaudio2_sound.cpp",
-		MAME_DIR .. "src/osd/modules/input/input_module.h",
-		MAME_DIR .. "src/osd/modules/input/input_common.cpp",
-		MAME_DIR .. "src/osd/modules/input/input_common.h",
-		MAME_DIR .. "src/osd/modules/input/input_dinput.cpp",
-		MAME_DIR .. "src/osd/modules/input/input_none.cpp",
-		MAME_DIR .. "src/osd/modules/input/input_rawinput.cpp",
-		MAME_DIR .. "src/osd/modules/input/input_win32.cpp",
-		MAME_DIR .. "src/osd/modules/input/input_sdl.cpp",
-		MAME_DIR .. "src/osd/modules/input/input_sdlcommon.cpp",
-		MAME_DIR .. "src/osd/modules/input/input_sdlcommon.h",
-		MAME_DIR .. "src/osd/modules/input/input_x11.cpp",
-		MAME_DIR .. "src/osd/modules/input/input_windows.cpp",
-		MAME_DIR .. "src/osd/modules/input/input_windows.h",
-		MAME_DIR .. "src/osd/modules/input/input_xinput.cpp",
-		MAME_DIR .. "src/osd/modules/output/output_module.h",
-		MAME_DIR .. "src/osd/modules/output/none.cpp",
-		MAME_DIR .. "src/osd/modules/output/console.cpp",
-		MAME_DIR .. "src/osd/modules/output/network.cpp",
-	}
-
-project ("ocore_" .. _OPTIONS["osd"])
-	uuid (os.uuid("ocore_" .. _OPTIONS["osd"]))
-	kind (LIBTYPE)
-
-	removeflags {
-		"SingleOutputDir",
-	}
-
-	dofile("osdmini_cfg.lua")
-
-	includedirs {
-		MAME_DIR .. "src/emu",
-		MAME_DIR .. "src/osd",
-		MAME_DIR .. "src/lib",
-		MAME_DIR .. "src/lib/util",
-	}
-
-	files {
-		MAME_DIR .. "src/osd/osdnet.cpp",
-		MAME_DIR .. "src/osd/osdnet.h",
-		MAME_DIR .. "src/osd/osdcore.cpp",
-		MAME_DIR .. "src/osd/osdcore.h",
-		MAME_DIR .. "src/osd/modules/osdmodule.cpp",
-		MAME_DIR .. "src/osd/modules/osdmodule.h",
-		MAME_DIR .. "src/osd/osdmini/minidir.cpp",
-		MAME_DIR .. "src/osd/osdmini/minimisc.cpp",
-		MAME_DIR .. "src/osd/osdmini/minitime.cpp",
-		MAME_DIR .. "src/osd/modules/file/stdfile.cpp",
-		MAME_DIR .. "src/osd/modules/sync/osdsync.cpp",
-		MAME_DIR .. "src/osd/modules/sync/osdsync.h",
-		MAME_DIR .. "src/osd/modules/sync/work_osd.cpp",
-	}
diff --git a/scripts/src/osd/osdmini_cfg.lua b/scripts/src/osd/osdmini_cfg.lua
deleted file mode 100644
index 586075d3cac..00000000000
--- a/scripts/src/osd/osdmini_cfg.lua
+++ /dev/null
@@ -1,12 +0,0 @@
--- license:BSD-3-Clause
--- copyright-holders:MAMEdev Team
-
-defines {
-	"OSD_MINI",
-	"USE_QTDEBUG=0",
-	"USE_SDL",
-	"SDLMAME_NOASM=1",
-	"USE_OPENGL=0",
-	"NO_USE_MIDI=1",
-	"USE_XAUDIO2=0",
-}
diff --git a/scripts/src/osd/sdl.lua b/scripts/src/osd/sdl.lua
index c42d9ab23ad..15da1878de5 100644
--- a/scripts/src/osd/sdl.lua
+++ b/scripts/src/osd/sdl.lua
@@ -459,14 +459,13 @@ project ("ocore_" .. _OPTIONS["osd"])
 		MAME_DIR .. "src/osd/osdcore.h",
 		MAME_DIR .. "src/osd/strconv.cpp",
 		MAME_DIR .. "src/osd/strconv.h",
+		MAME_DIR .. "src/osd/osdsync.cpp",
+		MAME_DIR .. "src/osd/osdsync.h",
 		MAME_DIR .. "src/osd/sdl/sdldir.cpp",
 		MAME_DIR .. "src/osd/modules/osdmodule.cpp",
 		MAME_DIR .. "src/osd/modules/osdmodule.h",
 		MAME_DIR .. "src/osd/modules/lib/osdlib_" .. SDLOS_TARGETOS .. ".cpp",
 		MAME_DIR .. "src/osd/modules/lib/osdlib.h",
-		MAME_DIR .. "src/osd/modules/sync/osdsync.cpp",
-		MAME_DIR .. "src/osd/modules/sync/osdsync.h",
-		MAME_DIR .. "src/osd/modules/sync/work_osd.cpp",
 	}
 
 	if BASE_TARGETOS=="unix" then
diff --git a/scripts/src/osd/windows.lua b/scripts/src/osd/windows.lua
index e4be22d6e55..b4be2dc7ce4 100644
--- a/scripts/src/osd/windows.lua
+++ b/scripts/src/osd/windows.lua
@@ -243,10 +243,10 @@ project ("ocore_" .. _OPTIONS["osd"])
 		MAME_DIR .. "src/osd/osdcore.h",
 		MAME_DIR .. "src/osd/strconv.cpp",
 		MAME_DIR .. "src/osd/strconv.h",
+		MAME_DIR .. "src/osd/osdsync.cpp",
+		MAME_DIR .. "src/osd/osdsync.h",
 		MAME_DIR .. "src/osd/windows/main.cpp",
 		MAME_DIR .. "src/osd/windows/windir.cpp",
-		MAME_DIR .. "src/osd/modules/sync/osdsync.cpp",
-		MAME_DIR .. "src/osd/modules/sync/osdsync.h",
 		MAME_DIR .. "src/osd/windows/winutf8.cpp",
 		MAME_DIR .. "src/osd/windows/winutf8.h",
 		MAME_DIR .. "src/osd/windows/winutil.cpp",
@@ -258,5 +258,4 @@ project ("ocore_" .. _OPTIONS["osd"])
 		MAME_DIR .. "src/osd/modules/file/winptty.cpp",
 		MAME_DIR .. "src/osd/modules/file/winsocket.cpp",
 		MAME_DIR .. "src/osd/modules/lib/osdlib_win32.cpp",
-		MAME_DIR .. "src/osd/modules/sync/work_osd.cpp",
 	}
diff --git a/src/osd/modules/lib/osdlib.h b/src/osd/modules/lib/osdlib.h
index dcba7a6bc81..f4a632dbbd1 100644
--- a/src/osd/modules/lib/osdlib.h
+++ b/src/osd/modules/lib/osdlib.h
@@ -19,19 +19,6 @@
 #ifndef __OSDLIB__
 #define __OSDLIB__
 
-/*-----------------------------------------------------------------------------
-    osd_num_processors: return the number of processors
-
-    Parameters:
-
-        None.
-
-    Return value:
-
-        Number of processors
------------------------------------------------------------------------------*/
-int osd_get_num_processors(void);
-
 /*-----------------------------------------------------------------------------
     osd_process_kill: kill the current process
 
diff --git a/src/osd/modules/sync/osdsync.cpp b/src/osd/modules/sync/osdsync.cpp
deleted file mode 100644
index 98690149358..00000000000
--- a/src/osd/modules/sync/osdsync.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-// license:BSD-3-Clause
-// copyright-holders:Aaron Giles,Miodrag Milanovic
-//============================================================
-//
-//  osdsync.cpp -OSD core synchronization functions
-//
-//============================================================
-// MAME headers
-#include "osdcore.h"
-#include "osdsync.h"
-
-#include <stdlib.h>
-
-
diff --git a/src/osd/osdcore.cpp b/src/osd/osdcore.cpp
index 3e783159a9b..badda762e16 100644
--- a/src/osd/osdcore.cpp
+++ b/src/osd/osdcore.cpp
@@ -195,12 +195,3 @@ void osd_sleep(osd_ticks_t duration)
 	std::this_thread::sleep_for(std::chrono::high_resolution_clock::duration(duration));
 }
 
-//============================================================
-//  osd_num_processors
-//============================================================
-
-int osd_get_num_processors(void)
-{
-	// max out at 4 for now since scaling above that seems to do poorly
-	return MIN(std::thread::hardware_concurrency(), 4);
-}
diff --git a/src/osd/osdmini/minidir.cpp b/src/osd/osdmini/minidir.cpp
deleted file mode 100644
index dde1448a694..00000000000
--- a/src/osd/osdmini/minidir.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-// license:BSD-3-Clause
-// copyright-holders:Aaron Giles
-//============================================================
-//
-//  minidir.c - Minimal core directory access functions
-//
-//============================================================
-
-#include "osdcore.h"
-
-
-//============================================================
-//  osd_opendir
-//============================================================
-
-osd_directory *osd_opendir(const char *dirname)
-{
-	// since there are no standard C library routines for walking directories,
-	// we always return an error here
-	return nullptr;
-}
-
-
-//============================================================
-//  osd_readdir
-//============================================================
-
-const osd_directory_entry *osd_readdir(osd_directory *dir)
-{
-	// since there are no standard C library routines for walking directories,
-	// we always return an error here
-	return nullptr;
-}
-
-
-//============================================================
-//  osd_closedir
-//============================================================
-
-void osd_closedir(osd_directory *dir)
-{
-	// since there are no standard C library routines for walking directories,
-	// we do nothing
-}
diff --git a/src/osd/osdmini/minimain.cpp b/src/osd/osdmini/minimain.cpp
deleted file mode 100644
index 18fbba1bc37..00000000000
--- a/src/osd/osdmini/minimain.cpp
+++ /dev/null
@@ -1,179 +0,0 @@
-// license:BSD-3-Clause
-// copyright-holders:Aaron Giles
-//============================================================
-//
-//  minimain.c - Main function for mini OSD
-//
-//============================================================
-
-#include "emu.h"
-#include "osdepend.h"
-#include "render.h"
-#include "clifront.h"
-#include "osdmini.h"
-
-
-//============================================================
-//  CONSTANTS
-//============================================================
-
-// we fake a keyboard with the following keys
-enum
-{
-	KEY_ESCAPE,
-	KEY_P1_START,
-	KEY_BUTTON_1,
-	KEY_BUTTON_2,
-	KEY_BUTTON_3,
-	KEY_JOYSTICK_U,
-	KEY_JOYSTICK_D,
-	KEY_JOYSTICK_L,
-	KEY_JOYSTICK_R,
-	KEY_TOTAL
-};
-
-
-//============================================================
-//  GLOBALS
-//============================================================
-
-// a single rendering target
-static render_target *our_target;
-
-// a single input device
-static input_device *keyboard_device;
-
-// the state of each key
-static UINT8 keyboard_state[KEY_TOTAL];
-
-
-//============================================================
-//  FUNCTION PROTOTYPES
-//============================================================
-
-static INT32 keyboard_get_state(void *device_internal, void *item_internal);
-
-
-//============================================================
-//  mini_osd_options
-//============================================================
-
-mini_osd_options::mini_osd_options()
-: osd_options()
-{
-	//add_entries(s_option_entries);
-}
-
-//============================================================
-//  main
-//============================================================
-
-int main(int argc, char *argv[])
-{
-	// cli_frontend does the heavy lifting; if we have osd-specific options, we
-	// create a derivative of cli_options and add our own
-	mini_osd_options options;
-	mini_osd_interface osd(options);
-	osd.register_options();
-	cli_frontend frontend(options, osd);
-	return frontend.execute(argc, argv);
-}
-
-
-//============================================================
-//  constructor
-//============================================================
-
-mini_osd_interface::mini_osd_interface(mini_osd_options &options)
-: osd_common_t(options)
-{
-}
-
-
-//============================================================
-//  destructor
-//============================================================
-
-mini_osd_interface::~mini_osd_interface()
-{
-}
-
-
-//============================================================
-//  init
-//============================================================
-
-void mini_osd_interface::init(running_machine &machine)
-{
-	// call our parent
-	osd_common_t::init(machine);
-
-	// initialize the video system by allocating a rendering target
-	our_target = machine.render().target_alloc();
-
-	// nothing yet to do to initialize sound, since we don't have any
-	// sound updates are handled by update_audio_stream() below
-
-	// initialize the input system by adding devices
-	// let's pretend like we have a keyboard device
-	keyboard_device = machine.input().device_class(DEVICE_CLASS_KEYBOARD).add_device("Keyboard");
-	if (keyboard_device == nullptr)
-		fatalerror("Error creating keyboard device\n");
-
-	// our faux keyboard only has a couple of keys (corresponding to the
-	// common defaults)
-	keyboard_device->add_item("Esc", ITEM_ID_ESC, keyboard_get_state, &keyboard_state[KEY_ESCAPE]);
-	keyboard_device->add_item("P1", ITEM_ID_1, keyboard_get_state, &keyboard_state[KEY_P1_START]);
-	keyboard_device->add_item("B1", ITEM_ID_LCONTROL, keyboard_get_state, &keyboard_state[KEY_BUTTON_1]);
-	keyboard_device->add_item("B2", ITEM_ID_LALT, keyboard_get_state, &keyboard_state[KEY_BUTTON_2]);
-	keyboard_device->add_item("B3", ITEM_ID_SPACE, keyboard_get_state, &keyboard_state[KEY_BUTTON_3]);
-	keyboard_device->add_item("JoyU", ITEM_ID_UP, keyboard_get_state, &keyboard_state[KEY_JOYSTICK_U]);
-	keyboard_device->add_item("JoyD", ITEM_ID_DOWN, keyboard_get_state, &keyboard_state[KEY_JOYSTICK_D]);
-	keyboard_device->add_item("JoyL", ITEM_ID_LEFT, keyboard_get_state, &keyboard_state[KEY_JOYSTICK_L]);
-	keyboard_device->add_item("JoyR", ITEM_ID_RIGHT, keyboard_get_state, &keyboard_state[KEY_JOYSTICK_R]);
-
-	// hook up the debugger log
-//  add_logerror_callback(machine, output_oslog);
-}
-
-
-//============================================================
-//  osd_update
-//============================================================
-
-void mini_osd_interface::update(bool skip_redraw)
-{
-	// get the minimum width/height for the current layout
-	int minwidth, minheight;
-	our_target->compute_minimum_size(minwidth, minheight);
-
-	// make that the size of our target
-	our_target->set_bounds(minwidth, minheight);
-
-	// get the list of primitives for the target at the current size
-	render_primitive_list &primlist = our_target->get_primitives();
-
-	// lock them, and then render them
-	primlist.acquire_lock();
-
-	// do the drawing here
-	primlist.release_lock();
-
-	// after 5 seconds, exit
-	if (machine().time() > attotime::from_seconds(5))
-		machine().schedule_exit();
-}
-
-
-//============================================================
-//  keyboard_get_state
-//============================================================
-
-static INT32 keyboard_get_state(void *device_internal, void *item_internal)
-{
-	// this function is called by the input system to get the current key
-	// state; it is specified as a callback when adding items to input
-	// devices
-	UINT8 *keystate = (UINT8 *)item_internal;
-	return *keystate;
-}
diff --git a/src/osd/osdmini/minimisc.cpp b/src/osd/osdmini/minimisc.cpp
deleted file mode 100644
index fb4901ca461..00000000000
--- a/src/osd/osdmini/minimisc.cpp
+++ /dev/null
@@ -1,109 +0,0 @@
-// license:BSD-3-Clause
-// copyright-holders:Aaron Giles
-//============================================================
-//
-//  minimisc.c - Minimal core miscellaneous functions
-//
-//============================================================
-
-#include "osdcore.h"
-#include <stdlib.h>
-
-
-//============================================================
-//  osd_malloc
-//============================================================
-
-void *osd_malloc(size_t size)
-{
-	return malloc(size);
-}
-
-
-//============================================================
-//  osd_malloc_array
-//============================================================
-
-void *osd_malloc_array(size_t size)
-{
-	return malloc(size);
-}
-
-
-//============================================================
-//  osd_free
-//============================================================
-
-void osd_free(void *ptr)
-{
-	free(ptr);
-}
-
-
-//============================================================
-//  osd_alloc_executable
-//============================================================
-
-void *osd_alloc_executable(size_t size)
-{
-	// to use this version of the code, we have to assume that
-	// code injected into a malloc'ed region can be safely executed
-	return malloc(size);
-}
-
-
-//============================================================
-//  osd_free_executable
-//============================================================
-
-void osd_free_executable(void *ptr, size_t size)
-{
-	free(ptr);
-}
-
-
-//============================================================
-//  osd_break_into_debugger
-//============================================================
-
-void osd_break_into_debugger(const char *message)
-{
-	// there is no standard way to do this, so ignore it
-}
-
-
-//============================================================
-//  osd_get_clipboard_text
-//============================================================
-
-char *osd_get_clipboard_text(void)
-{
-	// can't support clipboards generically
-	return nullptr;
-}
-
-//============================================================
-//  osd_getenv
-//============================================================
-
-const char *osd_getenv(const char *name)
-{
-	return nullptr;
-}
-
-//============================================================
-//  osd_setenv
-//============================================================
-
-int osd_setenv(const char *name, const char *value, int overwrite)
-{
-	return 0;
-}
-
-//============================================================
-//  osd_subst_env
-//============================================================
-void osd_subst_env(std::string &dst, const std::string &src)
-{
-	dst = src;
-}
diff --git a/src/osd/osdmini/minitime.cpp b/src/osd/osdmini/minitime.cpp
deleted file mode 100644
index b0d8ff17bb7..00000000000
--- a/src/osd/osdmini/minitime.cpp
+++ /dev/null
@@ -1,51 +0,0 @@
-// license:BSD-3-Clause
-// copyright-holders:Aaron Giles
-//============================================================
-//
-//  minitime.c - Minimal core timing functions
-//
-//============================================================
-
-#include "osdepend.h"
-#include <time.h>
-
-
-//============================================================
-//  osd_num_processors
-//============================================================
-
-int osd_get_num_processors(void)
-{
-	return 1;
-}
-
-//============================================================
-//  osd_ticks
-//============================================================
-
-osd_ticks_t osd_ticks(void)
-{
-	// use the standard library clock function
-	return clock();
-}
-
-
-//============================================================
-//  osd_ticks_per_second
-//============================================================
-
-osd_ticks_t osd_ticks_per_second(void)
-{
-	return CLOCKS_PER_SEC;
-}
-
-
-//============================================================
-//  osd_sleep
-//============================================================
-
-void osd_sleep(osd_ticks_t duration)
-{
-	// if there was a generic, cross-platform way to give up
-	// time, this is where we would do it
-}
diff --git a/src/osd/osdmini/osdmini.h b/src/osd/osdmini/osdmini.h
deleted file mode 100644
index c0519c98b12..00000000000
--- a/src/osd/osdmini/osdmini.h
+++ /dev/null
@@ -1,57 +0,0 @@
-// license:BSD-3-Clause
-// copyright-holders:Aaron Giles
-//============================================================
-//
-//  osdmini.h - Core header
-//
-//============================================================
-
-#include "options.h"
-#include "osdepend.h"
-#include "modules/lib/osdobj_common.h"
-
-
-class mini_osd_options : public osd_options
-{
-public:
-	// construction/destruction
-	mini_osd_options();
-
-};
-
-//============================================================
-//  TYPE DEFINITIONS
-//============================================================
-
-class mini_osd_interface : public osd_common_t
-{
-public:
-	// construction/destruction
-	mini_osd_interface(mini_osd_options &options);
-	virtual ~mini_osd_interface();
-
-	// general overridables
-	virtual void init(running_machine &machine);
-	virtual void update(bool skip_redraw);
-};
-
-
-
-//============================================================
-//  GLOBAL VARIABLES
-//============================================================
-
-extern const options_entry mame_win_options[];
-
-// defined in winwork.c
-extern int osd_num_processors;
-
-
-
-//============================================================
-//  FUNCTION PROTOTYPES
-//============================================================
-
-// use this to ping the watchdog
-void winmain_watchdog_ping(void);
-void winmain_dump_stack();
diff --git a/src/osd/modules/sync/work_osd.cpp b/src/osd/osdsync.cpp
similarity index 98%
rename from src/osd/modules/sync/work_osd.cpp
rename to src/osd/osdsync.cpp
index 3afe4e6c273..84c8bac6ccb 100644
--- a/src/osd/modules/sync/work_osd.cpp
+++ b/src/osd/osdsync.cpp
@@ -2,7 +2,7 @@
 // copyright-holders:Aaron Giles
 //============================================================
 //
-//  sdlwork.c - SDL OSD core work item functions
+//  osdsync.c - OSD core work item functions
 //
 //============================================================
 #if defined(OSD_WINDOWS) || defined(SDLMAME_WIN32)
@@ -24,9 +24,7 @@
 
 // MAME headers
 #include "osdcore.h"
-
-#include "modules/sync/osdsync.h"
-#include "modules/lib/osdlib.h"
+#include "osdsync.h"
 
 #include "eminline.h"
 
@@ -84,6 +82,15 @@ static void spin_while_not(const volatile _AtomType * volatile atom, const _Main
 	spin_while<_AtomType, _MainType>(atom, val, timeout, 1);
 }
 
+//============================================================
+//  osd_num_processors
+//============================================================
+
+int osd_get_num_processors(void)
+{
+	// max out at 4 for now since scaling above that seems to do poorly
+	return MIN(std::thread::hardware_concurrency(), 4);
+}
 
 //============================================================
 //  TYPE DEFINITIONS
diff --git a/src/osd/modules/sync/osdsync.h b/src/osd/osdsync.h
similarity index 100%
rename from src/osd/modules/sync/osdsync.h
rename to src/osd/osdsync.h
diff --git a/src/osd/sdl/watchdog.h b/src/osd/sdl/watchdog.h
index 9cc2ee03322..f9c06e72bb0 100644
--- a/src/osd/sdl/watchdog.h
+++ b/src/osd/sdl/watchdog.h
@@ -10,7 +10,7 @@
 //
 //============================================================
 
-#include "modules/sync/osdsync.h"
+#include "osdsync.h"
 #include <atomic>
 #include <thread>
 

From bd04e5b17dcf679cd8618a02e97ce957d2c62865 Mon Sep 17 00:00:00 2001
From: hap <happppp@users.noreply.github.com>
Date: Fri, 15 Apr 2016 15:31:33 +0200
Subject: [PATCH 009/122] tms1000: added TMS1700/1730 mcu types

---
 src/devices/cpu/tms1000/tms1000.cpp | 23 ++++++++++++++++++++++-
 src/devices/cpu/tms1000/tms1000.h   | 15 +++++++++++++++
 2 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/src/devices/cpu/tms1000/tms1000.cpp b/src/devices/cpu/tms1000/tms1000.cpp
index fbe1cb3c299..3058e9f8c04 100644
--- a/src/devices/cpu/tms1000/tms1000.cpp
+++ b/src/devices/cpu/tms1000/tms1000.cpp
@@ -2,7 +2,10 @@
 // copyright-holders:hap
 /*
 
-  TMS1000 family - TMS1000, TMS1070, TMS1040, TMS1200
+  TMS1000 family - TMS1000, TMS1070, TMS1040, TMS1200, TMS1700, TMS1730
+  
+  TODO:
+  - which O pins are connected on TMS1730?
 
 */
 
@@ -23,6 +26,8 @@ const device_type TMS1070 = &device_creator<tms1070_cpu_device>; // high voltage
 const device_type TMS1040 = &device_creator<tms1040_cpu_device>; // same as TMS1070 with just a different pinout?
 const device_type TMS1200 = &device_creator<tms1200_cpu_device>; // 40-pin DIP, 13 R pins
 // TMS1270 has 10 O pins, how does that work?
+const device_type TMS1700 = &device_creator<tms1000_cpu_device>; // 28-pin DIP, RAM/ROM size halved, 9 R pins
+const device_type TMS1730 = &device_creator<tms1000_cpu_device>; // 20-pin DIP, same die as TMS1700, package has less pins: 6 R pins, 5 O pins
 
 
 // internal memory maps
@@ -30,10 +35,18 @@ static ADDRESS_MAP_START(program_10bit_8, AS_PROGRAM, 8, tms1k_base_device)
 	AM_RANGE(0x000, 0x3ff) AM_ROM
 ADDRESS_MAP_END
 
+static ADDRESS_MAP_START(program_9bit_8, AS_PROGRAM, 8, tms1k_base_device)
+	AM_RANGE(0x000, 0x1ff) AM_ROM
+ADDRESS_MAP_END
+
 static ADDRESS_MAP_START(data_64x4, AS_DATA, 8, tms1k_base_device)
 	AM_RANGE(0x00, 0x3f) AM_RAM
 ADDRESS_MAP_END
 
+static ADDRESS_MAP_START(data_32x4, AS_DATA, 8, tms1k_base_device)
+	AM_RANGE(0x00, 0x1f) AM_RAM
+ADDRESS_MAP_END
+
 
 // device definitions
 tms1000_cpu_device::tms1000_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
@@ -56,6 +69,14 @@ tms1200_cpu_device::tms1200_cpu_device(const machine_config &mconfig, const char
 	: tms1000_cpu_device(mconfig, TMS1200, "TMS1200", tag, owner, clock, 8, 13, 6, 8, 2, 10, ADDRESS_MAP_NAME(program_10bit_8), 6, ADDRESS_MAP_NAME(data_64x4), "tms1200", __FILE__)
 { }
 
+tms1700_cpu_device::tms1700_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+	: tms1000_cpu_device(mconfig, TMS1700, "TMS1700", tag, owner, clock, 8, 9, 5, 8, 1, 10, ADDRESS_MAP_NAME(program_9bit_8), 6, ADDRESS_MAP_NAME(data_32x4), "tms1700", __FILE__)
+{ }
+
+tms1730_cpu_device::tms1730_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+	: tms1000_cpu_device(mconfig, TMS1730, "TMS1730", tag, owner, clock, 8, 9, 5, 8, 1, 10, ADDRESS_MAP_NAME(program_9bit_8), 6, ADDRESS_MAP_NAME(data_32x4), "tms1730", __FILE__)
+{ }
+
 
 // machine configs
 static MACHINE_CONFIG_FRAGMENT(tms1000)
diff --git a/src/devices/cpu/tms1000/tms1000.h b/src/devices/cpu/tms1000/tms1000.h
index 361e4e6fe83..af8dc3fd7ee 100644
--- a/src/devices/cpu/tms1000/tms1000.h
+++ b/src/devices/cpu/tms1000/tms1000.h
@@ -47,9 +47,24 @@ public:
 };
 
 
+class tms1700_cpu_device : public tms1000_cpu_device
+{
+public:
+	tms1700_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+};
+
+class tms1730_cpu_device : public tms1000_cpu_device
+{
+public:
+	tms1730_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+};
+
+
 extern const device_type TMS1000;
 extern const device_type TMS1070;
 extern const device_type TMS1040;
 extern const device_type TMS1200;
+extern const device_type TMS1700;
+extern const device_type TMS1730;
 
 #endif /* _TMS1000_H_ */

From 37c94e3373e18bd71095bf736ba5105bf3b04e2e Mon Sep 17 00:00:00 2001
From: Miodrag Milanovic <mmicko@gmail.com>
Date: Fri, 15 Apr 2016 16:01:35 +0200
Subject: [PATCH 010/122] Update windows to use platform independent watchdog
 implementation (nw)

---
 scripts/src/osd/modules.lua           |  2 +
 scripts/src/osd/sdl.lua               |  2 -
 src/osd/modules/lib/osdobj_common.cpp | 18 ++++++-
 src/osd/modules/lib/osdobj_common.h   | 16 +++---
 src/osd/sdl/osdsdl.h                  |  3 --
 src/osd/sdl/sdlmain.cpp               | 12 +----
 src/osd/sdl/video.cpp                 |  9 +---
 src/osd/{sdl => }/watchdog.cpp        |  0
 src/osd/{sdl => }/watchdog.h          |  0
 src/osd/windows/video.cpp             |  5 +-
 src/osd/windows/winmain.cpp           | 77 ---------------------------
 src/osd/windows/winmain.h             |  2 -
 12 files changed, 32 insertions(+), 114 deletions(-)
 rename src/osd/{sdl => }/watchdog.cpp (100%)
 rename src/osd/{sdl => }/watchdog.h (100%)

diff --git a/scripts/src/osd/modules.lua b/scripts/src/osd/modules.lua
index 11c69108ec2..fb48d20a2d5 100644
--- a/scripts/src/osd/modules.lua
+++ b/scripts/src/osd/modules.lua
@@ -44,6 +44,8 @@ function osdmodulesbuild()
 	files {
 		MAME_DIR .. "src/osd/osdnet.cpp",
 		MAME_DIR .. "src/osd/osdnet.h",
+		MAME_DIR .. "src/osd/watchdog.cpp",
+		MAME_DIR .. "src/osd/watchdog.h",
 		MAME_DIR .. "src/osd/modules/debugger/debug_module.h",
 		MAME_DIR .. "src/osd/modules/font/font_module.h",
 		MAME_DIR .. "src/osd/modules/midi/midi_module.h",
diff --git a/scripts/src/osd/sdl.lua b/scripts/src/osd/sdl.lua
index 15da1878de5..d1a83229698 100644
--- a/scripts/src/osd/sdl.lua
+++ b/scripts/src/osd/sdl.lua
@@ -425,8 +425,6 @@ project ("osd_" .. _OPTIONS["osd"])
 		MAME_DIR .. "src/osd/sdl/window.h",
 		MAME_DIR .. "src/osd/modules/osdwindow.cpp",
 		MAME_DIR .. "src/osd/modules/osdwindow.h",
-		MAME_DIR .. "src/osd/sdl/watchdog.cpp",
-		MAME_DIR .. "src/osd/sdl/watchdog.h",
 		MAME_DIR .. "src/osd/modules/render/drawsdl.cpp",
 	}
 	files {
diff --git a/src/osd/modules/lib/osdobj_common.cpp b/src/osd/modules/lib/osdobj_common.cpp
index 32f1a6047ac..adc202ce4db 100644
--- a/src/osd/modules/lib/osdobj_common.cpp
+++ b/src/osd/modules/lib/osdobj_common.cpp
@@ -175,7 +175,8 @@ osd_common_t::osd_common_t(osd_options &options)
 		m_mouse_input(nullptr),
 		m_lightgun_input(nullptr),
 		m_joystick_input(nullptr),
-		m_output(nullptr)
+		m_output(nullptr),
+		m_watchdog(nullptr)
 {
 	osd_output::push(this);
 }
@@ -420,6 +421,16 @@ void osd_common_t::init(running_machine &machine)
 
 	// ensure we get called on the way out
 	machine.add_notifier(MACHINE_NOTIFY_EXIT, machine_notify_delegate(FUNC(osd_common_t::osd_exit), this));
+	
+	
+	/* now setup watchdog */
+	int watchdog_timeout = options.watchdog();
+
+	if (watchdog_timeout != 0)
+	{
+		m_watchdog = std::make_unique<watchdog>();
+		m_watchdog->setTimeout(watchdog_timeout);
+	}
 }
 
 
@@ -437,6 +448,11 @@ void osd_common_t::update(bool skip_redraw)
 	// irregular intervals in some circumstances (e.g., multi-screen games
 	// or games with asynchronous updates).
 	//
+	if (m_watchdog != NULL)
+		m_watchdog->reset();
+
+	update_slider_list();
+
 }
 
 
diff --git a/src/osd/modules/lib/osdobj_common.h b/src/osd/modules/lib/osdobj_common.h
index cd83ba61e7b..9afce249eb1 100644
--- a/src/osd/modules/lib/osdobj_common.h
+++ b/src/osd/modules/lib/osdobj_common.h
@@ -14,6 +14,7 @@
 #define MAME_OSD_LIB_OSDOBJ_COMMON_H
 
 #include "osdepend.h"
+#include "watchdog.h"
 #include "modules/osdmodule.h"
 #include "modules/font/font_module.h"
 #include "modules/input/input_module.h"
@@ -273,14 +274,15 @@ private:
 	}
 
 protected:
-	sound_module* m_sound;
-	debug_module* m_debugger;
-	midi_module* m_midi;
-	input_module* m_keyboard_input;
-	input_module* m_mouse_input;
-	input_module* m_lightgun_input;
-	input_module* m_joystick_input;
+	sound_module*  m_sound;
+	debug_module*  m_debugger;
+	midi_module*   m_midi;
+	input_module*  m_keyboard_input;
+	input_module*  m_mouse_input;
+	input_module*  m_lightgun_input;
+	input_module*  m_joystick_input;
 	output_module* m_output;
+	std::unique_ptr<watchdog> m_watchdog;
 	std::vector<ui_menu_item> m_sliders;
 
 private:
diff --git a/src/osd/sdl/osdsdl.h b/src/osd/sdl/osdsdl.h
index c239966c7ab..d7d4a1a4a3c 100644
--- a/src/osd/sdl/osdsdl.h
+++ b/src/osd/sdl/osdsdl.h
@@ -3,7 +3,6 @@
 #ifndef _osdsdl_h_
 #define _osdsdl_h_
 
-#include "watchdog.h"
 #include "modules/lib/osdobj_common.h"
 #include "modules/osdmodule.h"
 #include "modules/font/font_module.h"
@@ -168,8 +167,6 @@ private:
 	void extract_video_config();
 
 	sdl_options &m_options;
-
-	watchdog *m_watchdog;
 };
 
 //============================================================
diff --git a/src/osd/sdl/sdlmain.cpp b/src/osd/sdl/sdlmain.cpp
index 270bc714320..43b1052df01 100644
--- a/src/osd/sdl/sdlmain.cpp
+++ b/src/osd/sdl/sdlmain.cpp
@@ -53,8 +53,6 @@
 #include <X11/Xutil.h>
 #endif
 
-#include "watchdog.h"
-
 //============================================================
 //  OPTIONS
 //============================================================
@@ -250,7 +248,7 @@ static void output_oslog(const running_machine &machine, const char *buffer)
 //============================================================
 
 sdl_osd_interface::sdl_osd_interface(sdl_options &options)
-: osd_common_t(options), m_options(options), m_watchdog(nullptr)
+: osd_common_t(options), m_options(options)
 {
 }
 
@@ -505,15 +503,7 @@ void sdl_osd_interface::init(running_machine &machine)
 	if (options().oslog())
 		machine.add_logerror_callback(output_oslog);
 
-	/* now setup watchdog */
 
-	int watchdog_timeout = options().watchdog();
-
-	if (watchdog_timeout != 0)
-	{
-		m_watchdog = auto_alloc(machine, watchdog);
-		m_watchdog->setTimeout(watchdog_timeout);
-	}
 
 #ifdef SDLMAME_EMSCRIPTEN
 	SDL_EventState(SDL_TEXTINPUT, SDL_FALSE);
diff --git a/src/osd/sdl/video.cpp b/src/osd/sdl/video.cpp
index 582836f0c8e..8a8402e44b3 100644
--- a/src/osd/sdl/video.cpp
+++ b/src/osd/sdl/video.cpp
@@ -134,18 +134,13 @@ void sdl_monitor_info::refresh()
 
 void sdl_osd_interface::update(bool skip_redraw)
 {
-	sdl_window_info *window;
-
-	if (m_watchdog != NULL)
-		m_watchdog->reset();
-
-	update_slider_list();
+	osd_common_t::update(skip_redraw);
 
 	// if we're not skipping this redraw, update all windows
 	if (!skip_redraw)
 	{
 //      profiler_mark(PROFILER_BLIT);
-		for (window = sdl_window_list; window != NULL; window = window->m_next)
+		for (sdl_window_info *window = sdl_window_list; window != NULL; window = window->m_next)
 			window->update();
 //      profiler_mark(PROFILER_END);
 	}
diff --git a/src/osd/sdl/watchdog.cpp b/src/osd/watchdog.cpp
similarity index 100%
rename from src/osd/sdl/watchdog.cpp
rename to src/osd/watchdog.cpp
diff --git a/src/osd/sdl/watchdog.h b/src/osd/watchdog.h
similarity index 100%
rename from src/osd/sdl/watchdog.h
rename to src/osd/watchdog.h
diff --git a/src/osd/windows/video.cpp b/src/osd/windows/video.cpp
index f6de9222c50..b0f28ee7d13 100644
--- a/src/osd/windows/video.cpp
+++ b/src/osd/windows/video.cpp
@@ -166,10 +166,7 @@ osd_monitor_info *win_monitor_info::monitor_from_handle(HMONITOR hmonitor)
 
 void windows_osd_interface::update(bool skip_redraw)
 {
-	// ping the watchdog on each update
-	winmain_watchdog_ping();
-
-	update_slider_list();
+	osd_common_t::update(skip_redraw);
 
 	// if we're not skipping this redraw, update all windows
 	if (!skip_redraw)
diff --git a/src/osd/windows/winmain.cpp b/src/osd/windows/winmain.cpp
index 7249c9ee747..0d0a8ed7b1c 100644
--- a/src/osd/windows/winmain.cpp
+++ b/src/osd/windows/winmain.cpp
@@ -280,10 +280,6 @@ static int timeresult = !TIMERR_NOERROR;
 static TIMECAPS timecaps;
 #endif
 
-static HANDLE watchdog_reset_event;
-static HANDLE watchdog_exit_event;
-static HANDLE watchdog_thread;
-
 static running_machine *g_current_machine;
 
 
@@ -293,7 +289,6 @@ static running_machine *g_current_machine;
 
 static BOOL WINAPI control_handler(DWORD type);
 static int is_double_click_start(int argc);
-static DWORD WINAPI watchdog_thread_entry(LPVOID lpParameter);
 static LONG WINAPI exception_filter(struct _EXCEPTION_POINTERS *info);
 
 
@@ -702,17 +697,6 @@ void windows_osd_interface::init(running_machine &machine)
 		timeBeginPeriod(timecaps.wPeriodMin);
 #endif
 
-	// if a watchdog thread is requested, create one
-	int watchdog = options.watchdog();
-	if (watchdog != 0)
-	{
-		watchdog_reset_event = CreateEvent(nullptr, FALSE, FALSE, nullptr);
-		assert_always(watchdog_reset_event != nullptr, "Failed to create watchdog reset event");
-		watchdog_exit_event = CreateEvent(nullptr, TRUE, FALSE, nullptr);
-		assert_always(watchdog_exit_event != nullptr, "Failed to create watchdog exit event");
-		watchdog_thread = CreateThread(nullptr, 0, watchdog_thread_entry, (LPVOID)(FPTR)watchdog, 0, nullptr);
-		assert_always(watchdog_thread != nullptr, "Failed to create watchdog thread");
-	}
 
 	// create and start the profiler
 #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
@@ -745,18 +729,6 @@ void windows_osd_interface::osd_exit()
 
 	osd_common_t::osd_exit();
 
-	// take down the watchdog thread if it exists
-	if (watchdog_thread != nullptr)
-	{
-		SetEvent(watchdog_exit_event);
-		WaitForSingleObject(watchdog_thread, INFINITE);
-		CloseHandle(watchdog_reset_event);
-		CloseHandle(watchdog_exit_event);
-		CloseHandle(watchdog_thread);
-		watchdog_reset_event = nullptr;
-		watchdog_exit_event = nullptr;
-		watchdog_thread = nullptr;
-	}
 
 #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
 	// stop the profiler
@@ -777,55 +749,6 @@ void windows_osd_interface::osd_exit()
 }
 
 
-//============================================================
-//  watchdog_thread_entry
-//============================================================
-
-static DWORD WINAPI watchdog_thread_entry(LPVOID lpParameter)
-{
-	DWORD timeout = (int)(FPTR)lpParameter * 1000;
-
-	while (TRUE)
-	{
-		HANDLE handle_list[2];
-		DWORD wait_result;
-
-		// wait for either a reset or an exit, or a timeout
-		handle_list[0] = watchdog_reset_event;
-		handle_list[1] = watchdog_exit_event;
-		wait_result = WaitForMultipleObjects(2, handle_list, FALSE, timeout);
-
-		// on a reset, just loop around and re-wait
-		if (wait_result == WAIT_OBJECT_0 + 0)
-			continue;
-
-		// on an exit, break out
-		if (wait_result == WAIT_OBJECT_0 + 1)
-			break;
-
-		// on a timeout, kill the process
-		if (wait_result == WAIT_TIMEOUT)
-		{
-			fprintf(stderr, "Terminating due to watchdog timeout\n");
-			fflush(stderr);
-			TerminateProcess(GetCurrentProcess(), -1);
-		}
-	}
-	return EXCEPTION_CONTINUE_SEARCH;
-}
-
-
-//============================================================
-//  winmain_watchdog_ping
-//============================================================
-
-void winmain_watchdog_ping(void)
-{
-	// if we have a watchdog, reset it
-	if (watchdog_reset_event != nullptr)
-		SetEvent(watchdog_reset_event);
-}
-
 
 #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
 
diff --git a/src/osd/windows/winmain.h b/src/osd/windows/winmain.h
index 7bd2917a2a7..b41092bf500 100644
--- a/src/osd/windows/winmain.h
+++ b/src/osd/windows/winmain.h
@@ -337,8 +337,6 @@ extern int osd_num_processors;
 //  FUNCTION PROTOTYPES
 //============================================================
 
-// use this to ping the watchdog
-void winmain_watchdog_ping(void);
 void winmain_dump_stack();
 
 #endif

From 1a83c84eaeede7f5a735ac1f299bb43a47ca4a47 Mon Sep 17 00:00:00 2001
From: Miodrag Milanovic <mmicko@gmail.com>
Date: Fri, 15 Apr 2016 16:04:15 +0200
Subject: [PATCH 011/122] Removed problematic licensed files (nw)

---
 3rdparty/rapidjson/bin/data/glossary.json     |   22 -
 3rdparty/rapidjson/bin/data/menu.json         |   27 -
 3rdparty/rapidjson/bin/data/readme.txt        |    1 -
 3rdparty/rapidjson/bin/data/sample.json       | 3315 -----------------
 3rdparty/rapidjson/bin/data/webapp.json       |   88 -
 3rdparty/rapidjson/bin/data/widget.json       |   26 -
 3rdparty/rapidjson/bin/draft-04/schema        |  150 -
 3rdparty/rapidjson/bin/encodings/utf16be.json |  Bin 368 -> 0 bytes
 .../rapidjson/bin/encodings/utf16bebom.json   |  Bin 370 -> 0 bytes
 3rdparty/rapidjson/bin/encodings/utf16le.json |  Bin 368 -> 0 bytes
 .../rapidjson/bin/encodings/utf16lebom.json   |  Bin 370 -> 0 bytes
 3rdparty/rapidjson/bin/encodings/utf32be.json |  Bin 736 -> 0 bytes
 .../rapidjson/bin/encodings/utf32bebom.json   |  Bin 740 -> 0 bytes
 3rdparty/rapidjson/bin/encodings/utf32le.json |  Bin 736 -> 0 bytes
 .../rapidjson/bin/encodings/utf32lebom.json   |  Bin 740 -> 0 bytes
 3rdparty/rapidjson/bin/encodings/utf8.json    |    7 -
 3rdparty/rapidjson/bin/encodings/utf8bom.json |    7 -
 3rdparty/rapidjson/bin/jsonchecker/fail1.json |    1 -
 .../rapidjson/bin/jsonchecker/fail10.json     |    1 -
 .../rapidjson/bin/jsonchecker/fail11.json     |    1 -
 .../rapidjson/bin/jsonchecker/fail12.json     |    1 -
 .../rapidjson/bin/jsonchecker/fail13.json     |    1 -
 .../rapidjson/bin/jsonchecker/fail14.json     |    1 -
 .../rapidjson/bin/jsonchecker/fail15.json     |    1 -
 .../rapidjson/bin/jsonchecker/fail16.json     |    1 -
 .../rapidjson/bin/jsonchecker/fail17.json     |    1 -
 .../rapidjson/bin/jsonchecker/fail18.json     |    1 -
 .../rapidjson/bin/jsonchecker/fail19.json     |    1 -
 3rdparty/rapidjson/bin/jsonchecker/fail2.json |    1 -
 .../rapidjson/bin/jsonchecker/fail20.json     |    1 -
 .../rapidjson/bin/jsonchecker/fail21.json     |    1 -
 .../rapidjson/bin/jsonchecker/fail22.json     |    1 -
 .../rapidjson/bin/jsonchecker/fail23.json     |    1 -
 .../rapidjson/bin/jsonchecker/fail24.json     |    1 -
 .../rapidjson/bin/jsonchecker/fail25.json     |    1 -
 .../rapidjson/bin/jsonchecker/fail26.json     |    1 -
 .../rapidjson/bin/jsonchecker/fail27.json     |    2 -
 .../rapidjson/bin/jsonchecker/fail28.json     |    2 -
 .../rapidjson/bin/jsonchecker/fail29.json     |    1 -
 3rdparty/rapidjson/bin/jsonchecker/fail3.json |    1 -
 .../rapidjson/bin/jsonchecker/fail30.json     |    1 -
 .../rapidjson/bin/jsonchecker/fail31.json     |    1 -
 .../rapidjson/bin/jsonchecker/fail32.json     |    1 -
 .../rapidjson/bin/jsonchecker/fail33.json     |    1 -
 3rdparty/rapidjson/bin/jsonchecker/fail4.json |    1 -
 3rdparty/rapidjson/bin/jsonchecker/fail5.json |    1 -
 3rdparty/rapidjson/bin/jsonchecker/fail6.json |    1 -
 3rdparty/rapidjson/bin/jsonchecker/fail7.json |    1 -
 3rdparty/rapidjson/bin/jsonchecker/fail8.json |    1 -
 3rdparty/rapidjson/bin/jsonchecker/fail9.json |    1 -
 3rdparty/rapidjson/bin/jsonchecker/pass1.json |   58 -
 3rdparty/rapidjson/bin/jsonchecker/pass2.json |    1 -
 3rdparty/rapidjson/bin/jsonchecker/pass3.json |    6 -
 3rdparty/rapidjson/bin/jsonchecker/readme.txt |    3 -
 3rdparty/rapidjson/bin/jsonschema/.gitignore  |    1 -
 3rdparty/rapidjson/bin/jsonschema/.travis.yml |    4 -
 3rdparty/rapidjson/bin/jsonschema/LICENSE     |   19 -
 3rdparty/rapidjson/bin/jsonschema/README.md   |  148 -
 .../bin/jsonschema/bin/jsonschema_suite       |  283 --
 .../bin/jsonschema/remotes/.DS_Store          |  Bin 6148 -> 0 bytes
 .../remotes/folder/folderInteger.json         |    3 -
 .../bin/jsonschema/remotes/integer.json       |    3 -
 .../bin/jsonschema/remotes/subSchemas.json    |    8 -
 .../rapidjson/bin/jsonschema/tests/.DS_Store  |  Bin 6148 -> 0 bytes
 .../tests/draft3/additionalItems.json         |   82 -
 .../tests/draft3/additionalProperties.json    |   88 -
 .../bin/jsonschema/tests/draft3/default.json  |   49 -
 .../jsonschema/tests/draft3/dependencies.json |  108 -
 .../bin/jsonschema/tests/draft3/disallow.json |   80 -
 .../jsonschema/tests/draft3/divisibleBy.json  |   60 -
 .../bin/jsonschema/tests/draft3/enum.json     |   71 -
 .../bin/jsonschema/tests/draft3/extends.json  |   94 -
 .../bin/jsonschema/tests/draft3/items.json    |   46 -
 .../bin/jsonschema/tests/draft3/maxItems.json |   28 -
 .../jsonschema/tests/draft3/maxLength.json    |   33 -
 .../bin/jsonschema/tests/draft3/maximum.json  |   42 -
 .../bin/jsonschema/tests/draft3/minItems.json |   28 -
 .../jsonschema/tests/draft3/minLength.json    |   33 -
 .../bin/jsonschema/tests/draft3/minimum.json  |   42 -
 .../tests/draft3/optional/bignum.json         |  107 -
 .../tests/draft3/optional/format.json         |  222 --
 .../tests/draft3/optional/jsregex.json        |   18 -
 .../draft3/optional/zeroTerminatedFloats.json |   15 -
 .../bin/jsonschema/tests/draft3/pattern.json  |   34 -
 .../tests/draft3/patternProperties.json       |  110 -
 .../jsonschema/tests/draft3/properties.json   |   92 -
 .../bin/jsonschema/tests/draft3/ref.json      |  159 -
 .../jsonschema/tests/draft3/refRemote.json    |   74 -
 .../bin/jsonschema/tests/draft3/required.json |   53 -
 .../bin/jsonschema/tests/draft3/type.json     |  474 ---
 .../jsonschema/tests/draft3/uniqueItems.json  |   79 -
 .../bin/jsonschema/tests/draft4/.DS_Store     |  Bin 6148 -> 0 bytes
 .../tests/draft4/additionalItems.json         |   82 -
 .../tests/draft4/additionalProperties.json    |   88 -
 .../bin/jsonschema/tests/draft4/allOf.json    |  112 -
 .../bin/jsonschema/tests/draft4/anyOf.json    |   68 -
 .../bin/jsonschema/tests/draft4/default.json  |   49 -
 .../jsonschema/tests/draft4/definitions.json  |   32 -
 .../jsonschema/tests/draft4/dependencies.json |  113 -
 .../bin/jsonschema/tests/draft4/enum.json     |   72 -
 .../bin/jsonschema/tests/draft4/items.json    |   46 -
 .../bin/jsonschema/tests/draft4/maxItems.json |   28 -
 .../jsonschema/tests/draft4/maxLength.json    |   33 -
 .../tests/draft4/maxProperties.json           |   28 -
 .../bin/jsonschema/tests/draft4/maximum.json  |   42 -
 .../bin/jsonschema/tests/draft4/minItems.json |   28 -
 .../jsonschema/tests/draft4/minLength.json    |   33 -
 .../tests/draft4/minProperties.json           |   28 -
 .../bin/jsonschema/tests/draft4/minimum.json  |   42 -
 .../jsonschema/tests/draft4/multipleOf.json   |   60 -
 .../bin/jsonschema/tests/draft4/not.json      |   96 -
 .../bin/jsonschema/tests/draft4/oneOf.json    |   68 -
 .../tests/draft4/optional/bignum.json         |  107 -
 .../tests/draft4/optional/format.json         |  148 -
 .../draft4/optional/zeroTerminatedFloats.json |   15 -
 .../bin/jsonschema/tests/draft4/pattern.json  |   34 -
 .../tests/draft4/patternProperties.json       |  110 -
 .../jsonschema/tests/draft4/properties.json   |   92 -
 .../bin/jsonschema/tests/draft4/ref.json      |  159 -
 .../jsonschema/tests/draft4/refRemote.json    |   74 -
 .../bin/jsonschema/tests/draft4/required.json |   39 -
 .../bin/jsonschema/tests/draft4/type.json     |  330 --
 .../jsonschema/tests/draft4/uniqueItems.json  |   79 -
 3rdparty/rapidjson/bin/jsonschema/tox.ini     |    8 -
 3rdparty/rapidjson/bin/types/booleans.json    |  102 -
 3rdparty/rapidjson/bin/types/floats.json      |  102 -
 3rdparty/rapidjson/bin/types/guids.json       |  102 -
 3rdparty/rapidjson/bin/types/integers.json    |  102 -
 3rdparty/rapidjson/bin/types/mixed.json       |  592 ---
 3rdparty/rapidjson/bin/types/nulls.json       |  102 -
 3rdparty/rapidjson/bin/types/paragraphs.json  |  102 -
 3rdparty/rapidjson/bin/types/readme.txt       |    1 -
 3rdparty/rapidjson/license.txt                |   24 -
 133 files changed, 10108 deletions(-)
 delete mode 100644 3rdparty/rapidjson/bin/data/glossary.json
 delete mode 100644 3rdparty/rapidjson/bin/data/menu.json
 delete mode 100644 3rdparty/rapidjson/bin/data/readme.txt
 delete mode 100644 3rdparty/rapidjson/bin/data/sample.json
 delete mode 100644 3rdparty/rapidjson/bin/data/webapp.json
 delete mode 100644 3rdparty/rapidjson/bin/data/widget.json
 delete mode 100644 3rdparty/rapidjson/bin/draft-04/schema
 delete mode 100644 3rdparty/rapidjson/bin/encodings/utf16be.json
 delete mode 100644 3rdparty/rapidjson/bin/encodings/utf16bebom.json
 delete mode 100644 3rdparty/rapidjson/bin/encodings/utf16le.json
 delete mode 100644 3rdparty/rapidjson/bin/encodings/utf16lebom.json
 delete mode 100644 3rdparty/rapidjson/bin/encodings/utf32be.json
 delete mode 100644 3rdparty/rapidjson/bin/encodings/utf32bebom.json
 delete mode 100644 3rdparty/rapidjson/bin/encodings/utf32le.json
 delete mode 100644 3rdparty/rapidjson/bin/encodings/utf32lebom.json
 delete mode 100644 3rdparty/rapidjson/bin/encodings/utf8.json
 delete mode 100644 3rdparty/rapidjson/bin/encodings/utf8bom.json
 delete mode 100644 3rdparty/rapidjson/bin/jsonchecker/fail1.json
 delete mode 100644 3rdparty/rapidjson/bin/jsonchecker/fail10.json
 delete mode 100644 3rdparty/rapidjson/bin/jsonchecker/fail11.json
 delete mode 100644 3rdparty/rapidjson/bin/jsonchecker/fail12.json
 delete mode 100644 3rdparty/rapidjson/bin/jsonchecker/fail13.json
 delete mode 100644 3rdparty/rapidjson/bin/jsonchecker/fail14.json
 delete mode 100644 3rdparty/rapidjson/bin/jsonchecker/fail15.json
 delete mode 100644 3rdparty/rapidjson/bin/jsonchecker/fail16.json
 delete mode 100644 3rdparty/rapidjson/bin/jsonchecker/fail17.json
 delete mode 100644 3rdparty/rapidjson/bin/jsonchecker/fail18.json
 delete mode 100644 3rdparty/rapidjson/bin/jsonchecker/fail19.json
 delete mode 100644 3rdparty/rapidjson/bin/jsonchecker/fail2.json
 delete mode 100644 3rdparty/rapidjson/bin/jsonchecker/fail20.json
 delete mode 100644 3rdparty/rapidjson/bin/jsonchecker/fail21.json
 delete mode 100644 3rdparty/rapidjson/bin/jsonchecker/fail22.json
 delete mode 100644 3rdparty/rapidjson/bin/jsonchecker/fail23.json
 delete mode 100644 3rdparty/rapidjson/bin/jsonchecker/fail24.json
 delete mode 100644 3rdparty/rapidjson/bin/jsonchecker/fail25.json
 delete mode 100644 3rdparty/rapidjson/bin/jsonchecker/fail26.json
 delete mode 100644 3rdparty/rapidjson/bin/jsonchecker/fail27.json
 delete mode 100644 3rdparty/rapidjson/bin/jsonchecker/fail28.json
 delete mode 100644 3rdparty/rapidjson/bin/jsonchecker/fail29.json
 delete mode 100644 3rdparty/rapidjson/bin/jsonchecker/fail3.json
 delete mode 100644 3rdparty/rapidjson/bin/jsonchecker/fail30.json
 delete mode 100644 3rdparty/rapidjson/bin/jsonchecker/fail31.json
 delete mode 100644 3rdparty/rapidjson/bin/jsonchecker/fail32.json
 delete mode 100644 3rdparty/rapidjson/bin/jsonchecker/fail33.json
 delete mode 100644 3rdparty/rapidjson/bin/jsonchecker/fail4.json
 delete mode 100644 3rdparty/rapidjson/bin/jsonchecker/fail5.json
 delete mode 100644 3rdparty/rapidjson/bin/jsonchecker/fail6.json
 delete mode 100644 3rdparty/rapidjson/bin/jsonchecker/fail7.json
 delete mode 100644 3rdparty/rapidjson/bin/jsonchecker/fail8.json
 delete mode 100644 3rdparty/rapidjson/bin/jsonchecker/fail9.json
 delete mode 100644 3rdparty/rapidjson/bin/jsonchecker/pass1.json
 delete mode 100644 3rdparty/rapidjson/bin/jsonchecker/pass2.json
 delete mode 100644 3rdparty/rapidjson/bin/jsonchecker/pass3.json
 delete mode 100644 3rdparty/rapidjson/bin/jsonchecker/readme.txt
 delete mode 100644 3rdparty/rapidjson/bin/jsonschema/.gitignore
 delete mode 100644 3rdparty/rapidjson/bin/jsonschema/.travis.yml
 delete mode 100644 3rdparty/rapidjson/bin/jsonschema/LICENSE
 delete mode 100644 3rdparty/rapidjson/bin/jsonschema/README.md
 delete mode 100644 3rdparty/rapidjson/bin/jsonschema/bin/jsonschema_suite
 delete mode 100644 3rdparty/rapidjson/bin/jsonschema/remotes/.DS_Store
 delete mode 100644 3rdparty/rapidjson/bin/jsonschema/remotes/folder/folderInteger.json
 delete mode 100644 3rdparty/rapidjson/bin/jsonschema/remotes/integer.json
 delete mode 100644 3rdparty/rapidjson/bin/jsonschema/remotes/subSchemas.json
 delete mode 100644 3rdparty/rapidjson/bin/jsonschema/tests/.DS_Store
 delete mode 100644 3rdparty/rapidjson/bin/jsonschema/tests/draft3/additionalItems.json
 delete mode 100644 3rdparty/rapidjson/bin/jsonschema/tests/draft3/additionalProperties.json
 delete mode 100644 3rdparty/rapidjson/bin/jsonschema/tests/draft3/default.json
 delete mode 100644 3rdparty/rapidjson/bin/jsonschema/tests/draft3/dependencies.json
 delete mode 100644 3rdparty/rapidjson/bin/jsonschema/tests/draft3/disallow.json
 delete mode 100644 3rdparty/rapidjson/bin/jsonschema/tests/draft3/divisibleBy.json
 delete mode 100644 3rdparty/rapidjson/bin/jsonschema/tests/draft3/enum.json
 delete mode 100644 3rdparty/rapidjson/bin/jsonschema/tests/draft3/extends.json
 delete mode 100644 3rdparty/rapidjson/bin/jsonschema/tests/draft3/items.json
 delete mode 100644 3rdparty/rapidjson/bin/jsonschema/tests/draft3/maxItems.json
 delete mode 100644 3rdparty/rapidjson/bin/jsonschema/tests/draft3/maxLength.json
 delete mode 100644 3rdparty/rapidjson/bin/jsonschema/tests/draft3/maximum.json
 delete mode 100644 3rdparty/rapidjson/bin/jsonschema/tests/draft3/minItems.json
 delete mode 100644 3rdparty/rapidjson/bin/jsonschema/tests/draft3/minLength.json
 delete mode 100644 3rdparty/rapidjson/bin/jsonschema/tests/draft3/minimum.json
 delete mode 100644 3rdparty/rapidjson/bin/jsonschema/tests/draft3/optional/bignum.json
 delete mode 100644 3rdparty/rapidjson/bin/jsonschema/tests/draft3/optional/format.json
 delete mode 100644 3rdparty/rapidjson/bin/jsonschema/tests/draft3/optional/jsregex.json
 delete mode 100644 3rdparty/rapidjson/bin/jsonschema/tests/draft3/optional/zeroTerminatedFloats.json
 delete mode 100644 3rdparty/rapidjson/bin/jsonschema/tests/draft3/pattern.json
 delete mode 100644 3rdparty/rapidjson/bin/jsonschema/tests/draft3/patternProperties.json
 delete mode 100644 3rdparty/rapidjson/bin/jsonschema/tests/draft3/properties.json
 delete mode 100644 3rdparty/rapidjson/bin/jsonschema/tests/draft3/ref.json
 delete mode 100644 3rdparty/rapidjson/bin/jsonschema/tests/draft3/refRemote.json
 delete mode 100644 3rdparty/rapidjson/bin/jsonschema/tests/draft3/required.json
 delete mode 100644 3rdparty/rapidjson/bin/jsonschema/tests/draft3/type.json
 delete mode 100644 3rdparty/rapidjson/bin/jsonschema/tests/draft3/uniqueItems.json
 delete mode 100644 3rdparty/rapidjson/bin/jsonschema/tests/draft4/.DS_Store
 delete mode 100644 3rdparty/rapidjson/bin/jsonschema/tests/draft4/additionalItems.json
 delete mode 100644 3rdparty/rapidjson/bin/jsonschema/tests/draft4/additionalProperties.json
 delete mode 100644 3rdparty/rapidjson/bin/jsonschema/tests/draft4/allOf.json
 delete mode 100644 3rdparty/rapidjson/bin/jsonschema/tests/draft4/anyOf.json
 delete mode 100644 3rdparty/rapidjson/bin/jsonschema/tests/draft4/default.json
 delete mode 100644 3rdparty/rapidjson/bin/jsonschema/tests/draft4/definitions.json
 delete mode 100644 3rdparty/rapidjson/bin/jsonschema/tests/draft4/dependencies.json
 delete mode 100644 3rdparty/rapidjson/bin/jsonschema/tests/draft4/enum.json
 delete mode 100644 3rdparty/rapidjson/bin/jsonschema/tests/draft4/items.json
 delete mode 100644 3rdparty/rapidjson/bin/jsonschema/tests/draft4/maxItems.json
 delete mode 100644 3rdparty/rapidjson/bin/jsonschema/tests/draft4/maxLength.json
 delete mode 100644 3rdparty/rapidjson/bin/jsonschema/tests/draft4/maxProperties.json
 delete mode 100644 3rdparty/rapidjson/bin/jsonschema/tests/draft4/maximum.json
 delete mode 100644 3rdparty/rapidjson/bin/jsonschema/tests/draft4/minItems.json
 delete mode 100644 3rdparty/rapidjson/bin/jsonschema/tests/draft4/minLength.json
 delete mode 100644 3rdparty/rapidjson/bin/jsonschema/tests/draft4/minProperties.json
 delete mode 100644 3rdparty/rapidjson/bin/jsonschema/tests/draft4/minimum.json
 delete mode 100644 3rdparty/rapidjson/bin/jsonschema/tests/draft4/multipleOf.json
 delete mode 100644 3rdparty/rapidjson/bin/jsonschema/tests/draft4/not.json
 delete mode 100644 3rdparty/rapidjson/bin/jsonschema/tests/draft4/oneOf.json
 delete mode 100644 3rdparty/rapidjson/bin/jsonschema/tests/draft4/optional/bignum.json
 delete mode 100644 3rdparty/rapidjson/bin/jsonschema/tests/draft4/optional/format.json
 delete mode 100644 3rdparty/rapidjson/bin/jsonschema/tests/draft4/optional/zeroTerminatedFloats.json
 delete mode 100644 3rdparty/rapidjson/bin/jsonschema/tests/draft4/pattern.json
 delete mode 100644 3rdparty/rapidjson/bin/jsonschema/tests/draft4/patternProperties.json
 delete mode 100644 3rdparty/rapidjson/bin/jsonschema/tests/draft4/properties.json
 delete mode 100644 3rdparty/rapidjson/bin/jsonschema/tests/draft4/ref.json
 delete mode 100644 3rdparty/rapidjson/bin/jsonschema/tests/draft4/refRemote.json
 delete mode 100644 3rdparty/rapidjson/bin/jsonschema/tests/draft4/required.json
 delete mode 100644 3rdparty/rapidjson/bin/jsonschema/tests/draft4/type.json
 delete mode 100644 3rdparty/rapidjson/bin/jsonschema/tests/draft4/uniqueItems.json
 delete mode 100644 3rdparty/rapidjson/bin/jsonschema/tox.ini
 delete mode 100644 3rdparty/rapidjson/bin/types/booleans.json
 delete mode 100644 3rdparty/rapidjson/bin/types/floats.json
 delete mode 100644 3rdparty/rapidjson/bin/types/guids.json
 delete mode 100644 3rdparty/rapidjson/bin/types/integers.json
 delete mode 100644 3rdparty/rapidjson/bin/types/mixed.json
 delete mode 100644 3rdparty/rapidjson/bin/types/nulls.json
 delete mode 100644 3rdparty/rapidjson/bin/types/paragraphs.json
 delete mode 100644 3rdparty/rapidjson/bin/types/readme.txt

diff --git a/3rdparty/rapidjson/bin/data/glossary.json b/3rdparty/rapidjson/bin/data/glossary.json
deleted file mode 100644
index d6e6ca15077..00000000000
--- a/3rdparty/rapidjson/bin/data/glossary.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    "glossary": {
-        "title": "example glossary",
-		"GlossDiv": {
-            "title": "S",
-			"GlossList": {
-                "GlossEntry": {
-                    "ID": "SGML",
-					"SortAs": "SGML",
-					"GlossTerm": "Standard Generalized Markup Language",
-					"Acronym": "SGML",
-					"Abbrev": "ISO 8879:1986",
-					"GlossDef": {
-                        "para": "A meta-markup language, used to create markup languages such as DocBook.",
-						"GlossSeeAlso": ["GML", "XML"]
-                    },
-					"GlossSee": "markup"
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/3rdparty/rapidjson/bin/data/menu.json b/3rdparty/rapidjson/bin/data/menu.json
deleted file mode 100644
index 539c3af2013..00000000000
--- a/3rdparty/rapidjson/bin/data/menu.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{"menu": {
-    "header": "SVG Viewer",
-    "items": [
-        {"id": "Open"},
-        {"id": "OpenNew", "label": "Open New"},
-        null,
-        {"id": "ZoomIn", "label": "Zoom In"},
-        {"id": "ZoomOut", "label": "Zoom Out"},
-        {"id": "OriginalView", "label": "Original View"},
-        null,
-        {"id": "Quality"},
-        {"id": "Pause"},
-        {"id": "Mute"},
-        null,
-        {"id": "Find", "label": "Find..."},
-        {"id": "FindAgain", "label": "Find Again"},
-        {"id": "Copy"},
-        {"id": "CopyAgain", "label": "Copy Again"},
-        {"id": "CopySVG", "label": "Copy SVG"},
-        {"id": "ViewSVG", "label": "View SVG"},
-        {"id": "ViewSource", "label": "View Source"},
-        {"id": "SaveAs", "label": "Save As"},
-        null,
-        {"id": "Help"},
-        {"id": "About", "label": "About Adobe CVG Viewer..."}
-    ]
-}}
\ No newline at end of file
diff --git a/3rdparty/rapidjson/bin/data/readme.txt b/3rdparty/rapidjson/bin/data/readme.txt
deleted file mode 100644
index c53bfb8b726..00000000000
--- a/3rdparty/rapidjson/bin/data/readme.txt
+++ /dev/null
@@ -1 +0,0 @@
-sample.json is obtained from http://code.google.com/p/json-test-suite/downloads/detail?name=sample.zip
diff --git a/3rdparty/rapidjson/bin/data/sample.json b/3rdparty/rapidjson/bin/data/sample.json
deleted file mode 100644
index 80e26c1f79e..00000000000
--- a/3rdparty/rapidjson/bin/data/sample.json
+++ /dev/null
@@ -1,3315 +0,0 @@
-{
- "a": {
-  "6U閆崬밺뀫颒myj츥휘:$薈mY햚#rz飏+玭V㭢뾿愴YꖚX亥ᮉ푊\u0006垡㐭룝\"厓ᔧḅ^Sqpv媫\"⤽걒\"˽Ἆ?ꇆ䬔未tv{DV鯀Tἆl凸g\\㈭ĭ즿UH㽤": null,
-  "b茤z\\.N": [[
-   "ZL:ￄዎ*Y|猫劁櫕荾Oj为1糕쪥泏S룂w࡛Ᏺ⸥蚙)",
-   {
-    "\"䬰ỐwD捾V`邀⠕VD㺝sH6[칑.:醥葹*뻵倻aD\"": true,
-    "e浱up蔽Cr෠JK軵xCʨ<뜡癙Y獩ｹ齈X/螗唻?<蘡+뷄㩤쳖3偑犾&\\첊xz坍崦ݻ鍴\"嵥B3㰃詤豺嚼aqJ⑆∥韼@\u000b㢊\u0015L臯.샥": false,
-    "l?Ǩ喳e6㔡$M꼄I,(3᝝縢,䊀疅뉲B㴔傳䂴\u0088㮰钘ꜵ!ᅛ韽>": -5514085325291784739,
-    "o㮚?\"춛㵉<\/﬊ࠃ䃪䝣wp6ἀ䱄[s*S嬈貒pᛥ㰉'돀": [{
-     "(QP윤懊FI<ꃣ『䕷[\"珒嶮?%Ḭ壍಻䇟0荤!藲끹bd浶tl\u2049#쯀@僞": {"i妾8홫": {
-      ",M맃䞛K5nAㆴVN㒊햬$n꩑&ꎝ椞阫?/ṏ세뉪1x쥼㻤㪙`\"$쟒薟B煌܀쨝ଢ଼2掳7㙟鴙X婢\u0002": "Vዉ菈᧷⦌kﮞఈnz*<?੃'ahhCFX(\u0007⮊E㭍䱾Gxꥩr❣.洎",
-      "뻴5bDD큯O傆盓왻U?ꞅꐊN鐭᧢τ\"迳豲8\u001b䃥ꂻ䴺ྸH筴,": {
-       "\"L鸔SE㬡XV&~͎'놅蔞눶l匛?'.K氁\\ƢẨ疇mΊ'꽳&!鹠m'|{P痊 秄쒿u\u00111䋧gϩx7t丗D䊨䠻z0.A0": -1.50139930144708198E18,
-       "8鋂뛷?첒B☚>﷜FM\"荭7ꍀ-VR<\/';䁙E9$䩉\f @s?퍪o3^衴cඎ䧪aK鼟ｑ䆨c{䳠5mᒲՙ蘹ᮩ": {
-        "F㲷JGo⯍P덵x뒳p䘧☔\"+ꨲ吿JfR㔹)4n紬G练Q፞!C|": true,
-        "p^㫮솎oc.೚A㤠??r\u000f)⾽⌲們M2.䴘䩳:⫭胃\\፾@Fᭌ\\K": false,
-        "蟌Tk愙潦伩": {
-         "a<\/@ᾛ慂侇瘎": -7271305752851720826,
-         "艓藬/>၄ṯ,XW~㲆w": {"E痧郶)㜓ha朗!N赻瞉駠uC\u20ad辠<Ve?폱!Im䁎搄:*s 9諚Prᵾ뒰髶B̌qWA8梸vS⫊⢳{t㺲q㺈랊뮣RqK밢쳪": [
-          false,
-          {
-           "\u000b=>x퓮⣫P1ࠫLMMX'M刼唳됤": null,
-           "P쓫晥%k覛ዩIUᇸ滨:噐혲lMR5䋈V梗>%幽u頖\\)쟟": null,
-           "eg+昉~矠䧞难\b?gQ쭷筝\\eꮠNl{ಢ哭|]Mn銌╥zꖘzⱷ⭤ᮜ^": [
-            -1.30142114406914976E17,
-            -1.7555215491128452E-19,
-            null,
-            "渾㨝ߏ牄귛r?돌?w[⚞ӻ~廩輫㼧/",
-            -4.5737191805302129E18,
-            null,
-            "xy࿑M[oc셒竓Ⓔx?뜓y䊦>-D켍(&&?XKkc꩖ﺸᏋ뵞K伕6ী)딀P朁yW揙?훻魢傎EG碸9類៌g踲C⟌aEX舲:z꒸许",
-            3808159498143417627,
-            null,
-            {"m試\u20df1{G8&뚈h홯J<\/": {
-             "3ஸ厠zs#1K7:rᥞoꅔꯧ&띇鵼鞫6跜#赿5l'8{7㕳(b/j\"厢aq籀ꏚ\u0015厼稥": [
-              -2226135764510113982,
-              true,
-              null,
-              {
-               "h%'맞S싅Hs&dl슾W0j鿏MםD놯L~S-㇡R쭬%": null,
-               "⟓咔謡칲\u0000孺ꛭx旑檉㶆?": null,
-               "恇I転;￸B2Y`z\\獓w,놏濐撐埵䂄)!䶢D=ഭ㴟jyY": {
-                "$ࡘt厛毣ൢI芁<겿骫⫦6tr惺a": [
-                 6.385779736989334E-20,
-                 false,
-                 true,
-                 true,
-                 [
-                  -6.891946211462334E-19,
-                  null,
-                  {
-                   "]-\\Ꟑ1/薓❧Ὂ\\l牑\u0007A郃)阜ᇒᓌ-塯`W峬G}SDb㬨Q臉⮻빌O鞟톴첂B㺱<ƈmu챑J㴹㷳픷Oㆩs": {
-                    "\"◉B\"pᶉt骔J꩸ᄇᛐi╰栛K쉷㉯鐩!㈐n칍䟅難>盥y铿e୔蒏M貹ヅ8嘋퀯䉶ጥ㏢殊뻳\"絧╿ꉑ䠥?∃蓊{}㣣Gk긔H1哵峱": false,
-                    "6.瀫cN䇮F㧺?\\椯=ڈT䘆4␘8qv": -3.5687501019676885E-19,
-                    "Q?yऴr혴{஀䳘p惭f1ﹸ䅷䕋贲<ྃᄊ繲hq\\b|#QSTs1c-7(䵢\u2069匏絘ꯉ:l毴汞t戀oෟᵶ뮱፣-醇Jx䙬䐁햢0࣫ᡁgrㄛ": "\u0011_xM/蘇Chv;dhA5.嗀绱V爤ﰦi뵲M",
-                    "⏑[\"ugoy^儣횎~U\\섯겜論l2jw஌yD腅̂\u0019": true,
-                    "ⵯɇ䐲᫿࢚!㯢l샅笶戮1꣖0Xe": null,
-                    "劅f넀識b宁焊E찓橵G!ʱ獓뭔雩괛": [{"p⹣켙[q>燣䍃㞽ᩲx:쓤삘7玑퇼0<\/q璂ᑁ[Z\\3䅵䧳\u0011㤧|妱緒C['췓Yꞟ3Z鳱雼P錻BU씧U`ᢶg蓱>.1ӧ譫'L_5V䏵Ц": [
-                     false,
-                     false,
-                     {"22䂍盥N霂얢<F8꼵7Gసyh뀍g᦭ꄢx硴嬢\u001a?E괆T|;7犟\"Wt%䐩O⨵t&#ᬋK'蜍Ძ揔⾠鲂T멷靃\u0018䓞cE": {"f=䏏츜瞾zw?孡鏣\\铀᫞yẆg(\u0011M6(s2]`ਫ": [[[{
-                      "'y몱纣4S@\\,i㷯럹Ua充Tᣢ9躘Zଞ쥿䐊s<\/刎\\\"뉦-8/": "蜑.X0꭛낢륹i젨ꚁ<8?s볕蝡|Q✬᯦@\\G㑢屿Mn졾J굤⥟JW뤵苑r쁕툄嵵?⾥O",
-                      "^1挲~[n귆誈央碠멪gI洷": -8214236471236116548,
-                      "sሣ%娌暡clr蟜㑓2\u000bS❟_X㨔⚴5~蔷ꀇ|Xu㬖,꤭卹r(g믇쩍%췸앙|栣U\\2]䤉+啠菡ꯎT鉹m\n/`SzDᅼ鞶": 1.1217523390167132E-19,
-                      "u톇=黚\\ ꂮ췵L>躰e9⑩_뵜斌n@B}$괻Yᐱ@䧋V\"☒-諯cV돯ʠ": true,
-                      "Ű螧ᔼ檍鍎땒딜qꄃH뜣<獧ूCY吓⸏>XQ㵡趌o끬k픀빯a(ܵ甏끆୯/6Nᪧ}搚ᆚ짌P牰泱鈷^d꣟#L삀\"㕹襻;k㸊\\f+": true,
-                      "쎣\",|⫝̸阊x庿k잣v庅$鈏괎炔k쬪O_": [
-                       "잩AzZGz3v愠ꉈⵎ?㊱}S尳௏p\r2>췝IP䘈M)w|\u000eE",
-                       -9222726055990423201,
-                       null,
-                       [
-                        false,
-                        {"´킮'뮤쯽Wx讐V,6ᩪ1紲aႈ\u205czD": [
-                         -930994432421097536,
-                         3157232031581030121,
-                         "l貚PY䃛5@䭄<nW\u001e",
-                         [
-                          3.801747732605161E18,
-                          [
-                           null,
-                           false,
-                           {
-                            "": 4.0442013775147072E16,
-                            "2J[sᡪ㞿|n'#廲꯬乞": true,
-                            "B[繰`\\㏏a̼㨀偛㽓<\/꥖ᵈO让\r43⡩徑ﬓ๨ﮕx:㣜o玐ꉟぢC珵὆ᓞ쇓Qs氯였9駵q혃Ljꂔ<\/昺+t䐋༻猙c沪~櫆bpJ9UᏐ:칣妙!皗F4㑄탎䕀櫳振讓": 7.3924182188256287E18,
-                            "H磵ai委曷n柋T<\/勿F&:ꣴfU@㿗榻Lb+?퍄sp\"᪟~>귻m㎮琸f": 1.0318894506812084E-19,
-                            "࢜⩢Ш䧔1肽씮+༎ᣰ闺馺窃䕨8Mƶq腽xc(៯夐J5굄䕁Qj_훨/~価.䢵慯틠퇱豠㼇Qﵘ$DuSp(8Uญ<\/ಟ룴𥳐ݩ$": 8350772684161555590,
-                            "ㆎQ䄾\u001bpᩭ${[諟^^骴᤮b^ㅥI┧T㉇⾞\"绦<AYJ⒃-oF<\/蛎mm;obh婃ᦢ": false,
-                            "䔤䣈?汝.p襟&d㱅\\Jᚠ@?O첁ࢽ휔VR蔩|㒢柺": [[
-                             "-ꕨ岓棻r@鿆^3~䪤Ѐ狼︌ﹲ\\᝸MlE쵠Q+",
-                             null,
-                             false,
-                             3346674396990536343,
-                             null,
-                             {
-                              "": null,
-                              "/䏨S쨑,&繷㉥8C엮赸3馢|뇲{鄎ꗇqFﶉ雕UD躢?Ꟛအ꽡[hᕱᗅ㦋쭞Mユ茍?L槽암V#성唐%㣕嘵\\ڹ(嘏躿&q": [
-                               -1364715155337673920,
-                               false,
-                               -8197733031775379251,
-                               "E팗鮲JwH\\觡܈᜝\"+뉞娂N휗v噙၂깼\u001dD帒l%-斔N",
-                               -3.844267973858711E-20,
-                               [{"쬯(褈Q 蟚뿢 /ⱖ㻥\u0017/?v邘䃡0U.Z1x?鯔V尠8Em<": [[[
-                                null,
-                                [
-                                 null,
-                                 -5841406347577698873,
-                                 "킷\"S⋄籞繗솸ᵣ浵w쑿ퟗ7nᎏx3앙z㘌쿸I葥覯㬏0ᆝb汆狺뷘ႀnꋋ",
-                                 -1227911573141158702,
-                                 {
-                                  "u㉮PᾺV鵸A\\g*ࡗ9슟晭+ͧↀ쿅H\u001c꾣犓}癇恛ᗬ黩䟘X梑鐆e>r䰂f矩'-7䡭桥Dz兔V9谶居㺍ᔊ䩯덲.\u001eL0ὅㅷ釣": [{
-                                   "<쯬J卷^숞u࠯䌗艞R9닪g㐾볎a䂈歖意:%鐔|ﵤ|y}>;2,覂⶚啵tb*仛8乒㓶B࿠㯉戩oX 貘5V嗆렽낁߼4h䧛ꍺM空\\b꿋貼": 8478577078537189402,
-                                   "VD*|吝z~h譺aᯒ": {
-                                    "YI췢K<\/濳xNne玗rJo쾘3핰鴊\"↱AR:ࢷ\"9?\"臁說)?誚ꊏe)_D翾W?&F6J@뺾ꍰNZ醊Z쾈വH嶿?炫㷱鬰M겈<bS}㎥l|刖k": {"H7鷮퇢_k": [
-                                     true,
-                                     "s㟑瀭좾쮀⑁Y찺k맢戲쀸俻ກ6儮끗扖puߖꜻ馶rꈞ痘?3ྚ畊惘䎗\"vv)*臔웅鿈䧲^v,껛㰙J <ᚶ5",
-                                     7950276470944656796,
-                                     4.9392301536234746E17,
-                                     -4796050478201554639,
-                                     "yꬴc<3㻚",
-                                     "o塁\u20a4蒵鮬裢CᴧnB㭱f.",
-                                     false,
-                                     [
-                                      false,
-                                      "㡐弑V?瀆䰺q!출㇞yᘪ꼼(IS~Ka 烿ꟿ샕桤\u0005HQҹ㯪罂q萾⚇懋⦕둡v",
-                                      1862560050083946970,
-                                      "\u20b6[|(뭹gꍒ펉O轄Dl묽]ﯨ髯QEbA㒾m@롴礠㕓2땫n6ْ엘঵篳R잷꙲m색摪|@㿫5aK设f胭r8/NI4춫栵\\꯬2]",
-                                      false,
-                                      {
-                                       "\u000b7*㙛燏.~?䔊p搕e_拺艿뷍f{ꔻ1s驙`$Ė戧?q⋬沭?塷᭚蹀unoa5": {
-                                        "S귯o紞㾕ᅶ侏銇12|ʟ畴iNAo?|Sw$M拲գ㭄紧螆+,梔": null,
-                                        "㭚0?xB疱敻ேBPwv뾃熉(ӠpJ]갢\"Bj'\u0016GE椱<\/zgៅx黢礇h},M9ﴦ?LḨ": "Si B%~㬒E",
-                                        "핇㉊살㍢숨~ȪRo䦅D桺0z]﬽蠆c9ᣨyPP㿷U~㞐?쯟퍸宒뉆U|}㉓郾ࣻ*櫎꼪䁗s?~7\u001e㘔h9{aឋ}:㶒P8": [{"\\R囡쐬nN柋琍؛7칾 :㶃衇徜V 深f1淍♠i?3S角폞^ᆞ\u20e8ṰD\u0007秡+躒臔&-6": {
-                                         "䨑g.fh㔗=8!\"狿ൻLU^뻱g䲚㻐'W}k欤?๒鲇S꧗䫾$ĥ피": -794055816303360636,
-                                         "外頮詋~텡竆繃䏩苨뾺朁꼃瘹f*㉀枙NH/\u2027ꢁ}j묎vペq︉식뜡Od5 N顯ି烅仟Qfㆤ嚢(i䬅c;맧?嶰㩼츱獡?-": {
-                                          "e݆㍡⬬'2㻒?U篲鿄\"隻Ҭ5NꭰꤺBꀈ拾᩺[刯5곑Na램ﴦ዆]㝓qw钄\u001b\"Y洊䗿祏塥迵[⼞⠳P$꠱5먃0轢`": [{"獰E賝﫚b먭N긆Ⰹ史2逶ꜛ?H짉~?P}jj}侷珿_T>᭨b,⻁鈵P䕡䀠८ⱄ홎鄣": {
-                                           "@?k2鶖㋮\"Oರ K㨇廪儲\u0017䍾J?);\b*묀㗠섳햭1MC V": null,
-                                           "UIICP!BUA`ᢈ㋸~袩㗪⾒=fB﮴l1ꡛ죘R辂여ҳ7쮡<䩲`熕8頁": 4481809488267626463,
-                                           "Y?+8먙ᚔ鋳蜩럶1㥔y璜౩`": [
-                                            null,
-                                            1.2850335807501874E-19,
-                                            "~V2",
-                                            2035406654801997866,
-                                            {
-                                             "<숻1>\"": -8062468865199390827,
-                                             "M㿣E]}qwG莎Gn᝶(ꔙ\\D⬲iꇲs寢t駇S뀡ꢜ": false,
-                                             "pꝤ㎏9W%>M;-U璏f(^j1?&RB隧 忓b똊E": "#G?C8.躬ꥯ'?냪#< 渟&헿란zpo왓Kj}鷧XﻘMツb䕖;㪻",
-                                             "vE풤幉xz뱕쫥Ug㦲aH} ᣟp:鬼Yᰟ<Fɋ잣緂頒⺏䉲瑑䅂,C~ޅG!f熢-B7~9Pqࡢ[츑#3ꕎ,Öඳ聁⩅㵧춀뿍xy䌏͂tdj!箧᳆|9蚡돬": -2.54467378964089632E17,
-                                             "䵈䅦5빖,궆-:໿댾仫0ᙚyᦝhqᚄ": null,
-                                             "侯Y\"湛졯劇U셎YX灍ⅸ2伴|筧\\䁒㶶᷏쁑Waᦵᗱ㜏늾膠<Jc63<G\u20fe䇹66僣k0O\"_@U": null,
-                                             "姪y$#s漴JH璌Ӊ脛J㝾펔ﹴoꈶ㚸PD:薠쏖%說ថ蹂1］⾕5튄": {
-                                              "᝾Huw3䮅如쿺䍟嫝]<鰨ݷ?꯯䫓傩|ᐶස媽\\澒≡闢": "Mm\"쏇ᯄ졽\"楇<\/ꥆ흭局n隴@鿣w⠊4P贈徎W㊋;䤞'.팇蒁䡴egpx嗎wஅ獗堮ᛐnˁ︖䀤4噙?໚郝᱋ޘॎt恑姫籕殥陃\"4[ꝬqL4Wꠎx",
-                                              "ℇj遌5B뒚\" U": "硄ꏘ{憠굏:&t䌨m Cઌ쿣鞛XFꠟs䝭ﶃ\"格a0x闊昵吲L\\杚聈aꁸj싹獅\"灟ﱡ馆*굖糠<ꔏ躎",
-                                              "톌賠弳ꟍb\"螖X50sĶ晠3f秂坯Iⓟ:萘": 5.573183333596288E18,
-                                              "%䴺": [[[[
-                                               -6957233336860166165,
-                                               false,
-                                               null,
-                                               {
-                                                "\"\\௮茒袀ᕥ23ୃ괶?䕎.嚲◉㏞L+ᵡ艱hL콇붆@": null,
-                                                "%螥9ꭌ<\/-t": true,
-                                                ",9|耢椸䁓Xk죱\u0015$Ώ鲞[?엢ᝲ혪즈ⴂ▂ℴ㗯\"g뺘\\ꍜ#\u0002ヮ}ሎ芲P[鹮轧@냲䃦=#(": 2.78562909315899616E17,
-                                                "R?H䧰ⵇ<,憰쮼Q總iR>H3镔ᴚ斦\\鏑r*2橱G⼔F/.j": true,
-                                                "RK좬뎂a홠f*f㱉ᮍ⦋潙㨋Gu곌SGI3I뿐\\F',)t`荁蘯囯ﮉ裲뇟쥼_ገ驪▵撏ᕤV": 1.52738225997956557E18,
-                                                "^k굲䪿꠹B逤%F㱢漥O披M㽯镞竇霒i꼂焅륓\u00059=皫之눃\u2047娤閍銤唫ၕb<\/w踲䔼u솆맚,䝒ᝳ'/it": "B餹饴is権ꖪ怯ꦂẉဎt\"!凢谵⧿0\\<=(uL䷍刨쑪>俆揓Cy襸Q힆䆭涷<\/ᐱ0ɧ䗾䚹\\ኜ?ꄢᇘ`䴢{囇}᠈䴥X4퓪檄]ꥷ/3謒ሴn+g騍X",
-                                                "GgG꽬[(嫓몍6\u0004궍宩㙻/>\u0011^辍dT腪hxǑ%ꊇk,8(W⧂結P鬜O": [{
-                                                 "M㴾c>\\ᓲ\u0019V{>ꤩ혙넪㭪躂TS-痴໸闓⍵/徯O.M㏥ʷD囎⧔쁳휤T??鉬뇙=#ꢫ숣BX䭼<\/d똬졬g榿)eꨋﯪ좇첻<?2K)": null,
-                                                 "Z17縬z]愀䖌 ᾋBCg5딒국憍꾓aⲷ턷u:U촳驿?雺楶\u0001\u001c{q*ᰗ苑B@k揰z.*蓗7ረIm\"Oᱍ@7?_": true,
-                                                 "㺃Z<": -4349275766673120695,
-                                                 "휃䠂fa塆ffixKe'덬鏗੄뺾w࠾鑎k땢m*႑햞鐮6攊&虜h黚,Y䱳Sﭼ둺pN6": [
-                                                  false,
-                                                  "IΎ䣲,\"ᬮ˪癘P~Qlnx喁Sᮔ༬˨I珌m䜛酛\u0003iꐸ㦧cQ帲晼D' \\(粋wQcN\\뵰跈",
-                                                  [
-                                                   "D0\\L?M1쥍Kaꏌsd+盌귤憊tz䌣댐בO坂wϢ%ὒgp,Ai⎧ᶆI餾ꦍ棩嘅᳉怴%m]ၶis纖D凜镧o심b U",
-                                                   {
-                                                    "?଼\u0011Rv&^[+匚I趈T媫\u0010.䥤ᆯ1q僤HydⲰl㒽K'ᅾiౕ豲초딨@\u0013J'쪪VD౼P4Ezg#8*㋤W馓]c쿯8": false,
-                                                    "c/擯X5~JmK䵶^쐎ച|B|u[솝(X뚤6v}W㤘⠛aR弌臌쾭諦eⒷ僡-;㩩⭖ⷴ徆龄갬{䱓ᥩ!﯏⊚ᇨ<v燡露`:볉癮꨽り★Ax7Ꮀ譥~舑\\Vꍋ\"$)v": "e&sFF쬘OBd슊寮f蠛জ봞mn~锆竒G脁\"趵G刕䕳&L唽붵<\/I,X팚B⍥X,kԇҗ眄_慡:U附ᓚA蕧>\u001a\u0011\";~쓆BH4坋攊7힪",
-                                                    "iT:L闞椕윚*滛gI≀Wਟඊ'ꢆ縺뱹鮚Nꩁ᧬蕼21줧\\䋯``⍐\\㏱鳨": 1927052677739832894,
-                                                    "쮁缦腃g]礿Y㬙 fヺSɪ꾾N㞈": [
-                                                     null,
-                                                     null,
-                                                     {
-                                                      "!t,灝Y 1䗉罵?c饃호䉂Cᐭ쒘z(즽sZG㬣sഖE4뢜㓕䏞丮Qp簍6EZឪ겛fx'ꩱQ0罣i{k锩*㤴㯞r迎jTⲤ渔m炅肳": [
-                                                       -3.3325685522591933E18,
-                                                       [{"㓁5]A䢕1룥BC?Ꙍ`r룔Ⳛ䙡u伲+\u0001്o": [
-                                                        null,
-                                                        4975309147809803991,
-                                                        null,
-                                                        null,
-                                                        {"T팘8Dﯲ稟MM☻㧚䥧/8ﻥ⥯aXLaH\"顾S☟耲ît7fS෉놁뮔/ꕼ䓈쁺4\\霶䠴ᩢ<\/t4?죵>uD5➶༆쉌럮⢀秙䘥\u20972ETR3濡恆vB? ~鸆\u0005": {
-                                                         "`閖m璝㥉b뜴?Wf;?DV콜\u2020퍉౓擝宏ZMj3mJ먡-傷뱙yח㸷꥿ ໘u=M읝!5吭L4v\\?ǎ7C홫": null,
-                                                         "|": false,
-                                                         "~Ztᛋ䚘\\擭㗝傪W陖+㗶qᵿ蘥ᙄp%䫎)}=⠔6ᮢS湟-螾-mXH?cp": 448751162044282216,
-                                                         "\u209fad놹j檋䇌ᶾ梕㉝bוּ<d䗱:줰M酄\u0000X#_r獢A饓ꍗُKo_跔?ᪧ嵜鼲<": null,
-                                                         "ꆘ)ubI@h@洭Ai㜎䏱k\u0003?T䉐3间%j6j棍j=❁\\U毮ᬹ*8䀔v6cpj⭬~Q꿾뺶펵悡!쩭厝l六㽫6퇓ޭ2>": {"?苴ꩠD䋓帘5騱qﱖPF?☸珗顒yU ᡫcb䫎 S@㥚gꮒ쎘泴멖\\:I鮱TZ듒ᶨQ3+f7캙\"?\f풾\\o杞紟﻽M.⏎靑OP": [
-                                                          -2.6990368911551596E18,
-                                                          [{"䒖@<᰿<\/⽬tTr腞&G%᳊秩蜰擻f㎳?S㵧\r*k뎾-乢겹隷j軛겷0룁鮁": {")DO0腦:춍逿:1㥨่!蛍樋2": [{
-                                                           ",ꌣf侴笾m๫ꆽ?1?U?\u0011ꌈꂇ": {
-                                                            "x捗甠nVq䅦w`CD⦂惺嘴0I#vỵ} \\귂S끴D얾?Ԓj溯\"v餄a": {
-                                                             "@翙c⢃趚痋i\u0015OQ⍝lq돆Y0pࢥ3쉨䜩^<8g懥0w)]䊑n洺o5쭝QL댊랖L镈Qnt⪟㒅십q헎鳒⮤眉ᔹ梠@O縠u泌ㄘb榚癸XޔFtj;iC": false,
-                                                             "I&뱋゘|蓔䔕측瓯%6ᗻHW\\N1貇#?僐ᗜgh᭪o'䗈꽹Rc욏/蔳迄༝!0邔䨷푪8疩)[쭶緄㇈୧ፐ": {
-                                                              "B+:ꉰ`s쾭)빼C羍A䫊pMgjdx䐝Hf9᥸W0!C樃'蘿f䫤סи\u0017Jve? 覝f둀⬣퓉Whk\"஼=չﳐ皆笁BIW虨쫓F廰饞": -642906201042308791,
-                                                              "sb,XcZ<\/m㉹ ;䑷@c䵀s奤⬷7`ꘖ蕘戚?Feb#輜}p4nH⬮eKL트}": [
-                                                               "RK鳗z=袤Pf|[,u욺",
-                                                               "Ẏᏻ罯뉋⺖锅젯㷻{H䰞쬙-쩓D]~\u0013O㳢gb@揶蔉|kᦂ❗!\u001ebM褐sca쨜襒y⺉룓",
-                                                               null,
-                                                               null,
-                                                               true,
-                                                               -1.650777344339075E-19,
-                                                               false,
-                                                               "☑lꄆs힨꤇]'uTന⌳농].1⋔괁沰\"IWഩ\u0019氜8쟇䔻;3衲恋,窌z펏喁횗?4?C넁问?ᥙ橭{稻Ⴗ_썔",
-                                                               "n?]讇빽嗁}1孅9#ꭨ靶v\u0014喈)vw祔}룼쮿I",
-                                                               -2.7033457331882025E18,
-                                                               {
-                                                                ";⚃^㱋x:饬ኡj'꧵T☽O㔬RO婎?향ᒭ搩$渣y4i;(Q>꿘e8q": "j~錘}0g;L萺*;ᕭꄮ0l潛烢5H▄쳂ꏒוֹꙶT犘≫x閦웧v",
-                                                                "~揯\u2018c4職렁E~ᑅቚꈂ?nq뎤.:慹`F햘+%鉎O瀜쟏敛菮⍌浢<\/㮺紿P鳆ࠉ8I-o?#jﮨ7v3Dt赻J9": null,
-                                                                "ࣝW䌈0ꍎqC逖,횅c၃swj;jJS櫍5槗OaB>D踾Y": {"㒰䵝F%?59.㍈cᕨ흕틎ḏ㋩B=9IېⓌ{:9.yw｝呰ㆮ肒᎒tI㾴62\"ዃ抡C﹬B<\/<EO꽓ᇕu&鋫\\禞퐹u꒍.7훯ಶ2䩦͉ᶱf깵ᷣ늎": [
-                                                                 5.5099570884646902E18,
-                                                                 "uQN濿m臇<%?谣鮢s]]x0躩慌闋<;( 鋤.0ᠵd1#벘a:Gs?햷'.)ㅴ䞟琯崈FS@O㌛ᓬ抢큌ើ냷쿟툥IZn[惵ꐧ3뙍[&v憙J>촋jo朣",
-                                                                 [
-                                                                  -7675533242647793366,
-                                                                  {"ᙧ呃:[㒺쳀쌡쏂H稈㢤\u001dᶗGG-{GHྻຊꡃ哸䵬;$?&d\\⥬こN圴됤挨-'ꕮ$PU%?冕눖i魁q騎Q": [
-                                                                   false,
-                                                                   [[
-                                                                    7929823049157504248,
-                                                                    [[
-                                                                     true,
-                                                                     "Z菙\u0017'eꕤ᱕l,0\\X\u001c[=雿8蠬L<\/낲긯W99g톉4ퟋb㝺\u0007劁'!麕Q궈oW:@X၎z蘻m絙璩귓죉+3柚怫tS捇蒣䝠-擶D[0=퉿8)q0ٟ",
-                                                                     "唉\nFA椭穒巯\\䥴䅺鿤S#b迅獘 ﶗ꬘\\?q1qN犠pX꜅^䤊⛤㢌[⬛휖岺q唻ⳡ틍\"㙙Eh@oA賑㗠y必Nꊑᗘ",
-                                                                     -2154220236962890773,
-                                                                     -3.2442003245397908E18,
-                                                                     "Wᄿ筠:瘫퀩?o貸q⊻(᎞KWf宛尨h^残3[U(='橄",
-                                                                     -7857990034281549164,
-                                                                     1.44283696979059942E18,
-                                                                     null,
-                                                                     {"ꫯAw跭喀 ?_9\"Aty背F=9缉ྦྷ@;?^鞀w:uN㘢Rỏ": [
-                                                                      7.393662029337442E15,
-                                                                      3564680942654233068,
-                                                                      [
-                                                                       false,
-                                                                       -5253931502642112194,
-                                                                       "煉\\辎ೆ罍5⒭1䪁䃑s䎢:[e5}峳ﴱn騎3?腳Hyꏃ膼N潭錖,Yᝋ˜YAၓ㬠bG렣䰣:",
-                                                                       true,
-                                                                       null,
-                                                                       {
-                                                                        "⒛'P&%죮|:⫶춞": -3818336746965687085,
-                                                                        "钖m<\/0ݎMtF2Pk=瓰୮洽겎.": [[
-                                                                         -8757574841556350607,
-                                                                         -3045234949333270161,
-                                                                         null,
-                                                                         {
-                                                                          "Ꮬr輳>⫇9hU##w@귪A\\C 鋺㘓ꖐ梒뒬묹㹻+郸嬏윤'+g<\/碴,}ꙫ>손;情d齆J䬁ຩ撛챝탹/R澡7剌tꤼ?ặ!`⏲睤\u00002똥଴⟏": null,
-                                                                          "\u20f2ܹe\\tAꥍư\\x当뿖렉禛;G檳ﯪS૰3~㘠#[J<}{奲 5箉⨔{놁<\/釿抋,嚠/曳m&WaOvT赋皺璑텁": [[
-                                                                           false,
-                                                                           null,
-                                                                           true,
-                                                                           -5.7131445659795661E18,
-                                                                           "萭m䓪D5|3婁ఞ>蠇晼6nﴺPp禽羱DS<睓닫屚삏姿",
-                                                                           true,
-                                                                           [
-                                                                            -8759747687917306831,
-                                                                            {
-                                                                             ">ⓛ\t,odKr{䘠?b퓸C嶈=DyEᙬ@ᴔ쨺芛髿UT퓻春<\/yꏸ>豚W釺N뜨^?꽴﨟5殺ᗃ翐%>퍂ဿ䄸沂Ea;A_\u0005閹殀W+窊?Ꭼd\u0013P汴G5썓揘": 4.342729067882445E-18,
-                                                                             "Q^즾眆@AN\u0011Kb榰냎Y#䝀ꀒᳺ'q暇睵s\"!3#I⊆畼寤@HxJ9": false,
-                                                                             "⿾D[)袨㇩i]웪䀤ᛰMvR<蟏㣨": {"v퇓L㪱ꖣ豛톤\\곱#kDTN": [{
-                                                                              "(쾴䡣,寴ph(C\"㳶w\"憳2s馆E!n!&柄<\/0Pꈗſ?㿳Qd鵔": {"娇堰孹L錮h嵅⛤躏顒?CglN束+쨣ﺜ\\MrH": {"獞䎇둃ቲ弭팭^ꄞ踦涟XK錆쳞ឌ`;੶S炥騞ଋ褂B៎{ڒ䭷ᶼ靜pI荗虶K$": [{"◖S~躘蒉꫿輜譝Q㽙闐@ᢗ¥E榁iء5┄^B[絮跉ᰥ遙PWi3wㄾⵀDJ9!w㞣ᄎ{듒ꓓb6\\篴??c⼰鶹⟧\\鮇ꮇ": [[
-                                                                               654120831325413520,
-                                                                               -1.9562073916357608E-19,
-                                                                               {
-                                                                                "DC(昐衵ἡ긙갵姭|֛[t": 7.6979110359897907E18,
-                                                                                "J␅))嫼❳9Xfd飉j7猬ᩉ+⤻眗벎E鰉Zﾶ63zၝ69}ZᶐL崭ᦥ⡦靚⋛ꎨ~i㨃咊ꧭo䰠阀3C(": -3.5844809362512589E17,
-                                                                                "p꣑팱쒬ꎑ뛡Ꙩ挴恍胔&7ᔈ묒4Hd硶훐㎖zꢼ豍㿢aሃ=<\/湉鵲EӅ%$F!퍶棌孼{O駍਺geu+": ")\u001b잓kŀX쩫A밁®ڣ癦狢)扔弒p}k縕ꩋ,䃉tࣼi",
-                                                                                "ァF肿輸<솄G-䢹䛸ꊏl`Tqꕗ蒞a氷⸅ᴉ蠰]S/{J왲m5{9.uέ~㕚㣹u>x8U讁B덺襪盎QhVS맅킃i识{벂磄Iහ䙅xZy/抍૭Z鲁-霳V据挦ℒ": null,
-                                                                                "㯛|Nꐸb7ⵐb?拠O\u0014ކ?-(EꞨ4ꕷᄤYᯕOW瞺~螸\"욿ќ<u鵵઎⸊倾쑷෻rT⪄牤銱;W殆͢芄ਰ嚝훚샢⊿+㲽": null,
-                                                                                "単逆ົ%_맛d)zJ%3칧_릟#95䌨怡\u001ci턠ॣi冘4赖'ਐ䧐_栔!": {
-                                                                                 "*?2~4㲌᭳쯁ftႷ1#oJ\b䊇镇됔 \u2079x䛁㊝ᮂN;穽跖s휇ᣄ홄傷z⸷(霸!3y뺏M쒿햏۽v㳉tở心3黎v쭻 Rp཮Vr~T?&˴k糒븥쩩r*D": null,
-                                                                                 "8@~홟ꔘk1[": -5570970366240640754,
-                                                                                 "BZt鏦ꡬc餖  s(mᛴ\u0000◄d腑t84C⟐坯VṊ뉙'噱Ꝕ珽GC顀?허0ꞹ&돇䛭C䷫](": 2.4303828213012387E-20,
-                                                                                 "y撔Z외放+}ḑ骈ᙝ&\u0016`G便2|-e]঳?QF㜹YF\"㿒緄햷㈟塚䷦ୀጤlM蘸N㾆▛럪㞂tᕬ镈쇝喠l amcxPnm\u001a᱋<\/]_]ﻹ瞧?H": false,
-                                                                                 "ፏ氏묢뜚I[♺뽛x?0H봬Wpn꨹Ra䝿쌑{㴂ni祻윸A'y|⺴ᚘ庌9{$恲{톽=m#@6ᨧfgs44陎J#<Ễ쨓瀵❩a୛㷉㙉ܸ◠냔嬯~呄籁羥镳": false,
-                                                                                 "㘱{<頬22?IF@곊I겂嶻L᝛D{@r쒂?IAᣧ洪惒誸b徂z췺꾍㠭\\刊%禨쌐ⶣ仵\\P[:47;<ᇅ<\/": {
-                                                                                  "^U釳-v㢈ꗝ◄菘rᜨi;起kR犺䵫\u0000锍쁙m-ԙ!lḃ꛸뻾F(W귛y": "#ᠺH㸢5v8_洑C",
-                                                                                  "䔵໳$ᙠ6菞\u206e摎q圩P|慍sV4:㜾(I溞I?": -6569206717947549676,
-                                                                                  "透Ꞃ緵퇝8 >e㺰\"'㌢ƐW\u0004瞕>0?V鷵엳": true,
-                                                                                  "뤥G\\迋䠿[庩'꼡\u001aiᩮV쯁ᳪ䦪Ô;倱ନ뛁誈": null,
-                                                                                  "쥹䄆䚟Q榁䎐᢭<\/2㕣p}HW蟔|䃏꿈ꚉ锳2Pb7㙑Tⅹᵅ": {
-                                                                                   "Y?֭$>#cVBꩨ:>eL蒁務": {
-                                                                                    "86柡0po 䏚&-捑Ћ祌<\/휃-G*㶢הּ쩍s㶟餇c걺yu꽎還5*턧簕Og婥SꝐ": null,
-                                                                                    "a+葞h٥ࠆ裈嗫ﵢ5輙퀟ᛜ,QDﹼ⟶Y騠锪E_|x죗j侵;m蜫轘趥?븅w5+mi콛L": {
-                                                                                     ";⯭ﱢ!买F⽍柤鶂n䵣V㫚墱2렾ELEl⣆": [
-                                                                                      true,
-                                                                                      -3.6479311868339015E-18,
-                                                                                      -7270785619461995400,
-                                                                                      3.334081886177621E18,
-                                                                                      2.581457786298155E18,
-                                                                                      -6.605252412954115E-20,
-                                                                                      -3.9232347037744167E-20,
-                                                                                      {
-                                                                                       "B6㊕.k1": null,
-                                                                                       "ZAꄮJ鮷ᳱo갘硥鈠䠒츼": {
-                                                                                        "ᕅ}럡}.@y陪鶁r業'援퀉x䉴ﵴl퍘):씭脴ᥞhiꃰblﲂ䡲엕8߇M㶭0燋標挝-?PCwe⾕J碻Ᾱ䬈䈥뷰憵賣뵓痬+": {"a췩v礗X⋈耓ፊf罅靮!㔽YYᣓw澍33⎔芲F|\"䜏T↮輦挑6ᓘL侘?ￆ]덆1R௯✎餘6ꏽ<\/௨\\?q喷ꁫj~@ulq": {"嗫欆뾔Xꆹ4H㌋F嵧]ࠎ]㠖1ꞤT<$m뫏O i댳0䲝i": {"?෩?\u20cd슮|ꯆjs{?d7?eNs⢚嫥氂䡮쎱:鑵롟2hJꎒﯭ鱢3춲亄:뼣v䊭諱Yj択cVmR䩃㘬T\"N홝*ै%x^F\\_s9보zz4淗?q": [
-                                                                                         null,
-                                                                                         "?",
-                                                                                         2941869570821073737,
-                                                                                         "{5{殇0䝾g6밖퍋臩綹R$䖭j紋釰7sXI繳漪행y",
-                                                                                         false,
-                                                                                         "aH磂?뛡#惇d婅?Fe,쐘+늵䍘\"3r瘆唊勐j⳧࠴ꇓ<\/唕윈x⬌讣䋵%拗ᛆⰿ妴᝔M2㳗必꧂淲?ゥ젯檢<8끒MidX䏒3᳻Q▮佐UT|⤪봦靏⊏",
-                                                                                         [[{
-                                                                                          "颉(&뜸귙{y^\"P퟉춝Ჟ䮭D顡9=?}Y誱<$b뱣RvO8cH煉＠tk~4ǂ⤧⩝屋SS;J{vV#剤餓ᯅc?#a6D,s": [
-                                                                                           -7.8781018564821536E16,
-                                                                                           true,
-                                                                                           [
-                                                                                            -2.28770899315832371E18,
-                                                                                            false,
-                                                                                            -1.0863912140143876E-20,
-                                                                                            -6282721572097446995,
-                                                                                            6767121921199223078,
-                                                                                            -2545487755405567831,
-                                                                                            false,
-                                                                                            null,
-                                                                                            -9065970397975641765,
-                                                                                            [
-                                                                                             -5.928721243413937E-20,
-                                                                                             {"6촊\u001a홯kB0w撨燠룉{绎6⳹!턍贑y▾鱧ժ[;7ᨷ∀*땒䪮1x霆Hᩭ☔\"r䝐7毟ᝰr惃3ꉭE+>僒澐": [
-                                                                                              "Ta쎩aƝt쵯ⰪVb",
-                                                                                              [
-                                                                                               -5222472249213580702,
-                                                                                               null,
-                                                                                               -2851641861541559595,
-                                                                                               null,
-                                                                                               4808804630502809099,
-                                                                                               5657671602244269874,
-                                                                                               "5犲﨣4mᥣ?yf젫꾯|䋬잁$`Iⳉﴷ扳兝,'c",
-                                                                                               false,
-                                                                                               [
-                                                                                                null,
-                                                                                                {
-                                                                                                 "DyUIN쎾M仼惀⮥裎岶泭lh扠\u001e礼.tEC癯튻@_Qd4c5S熯A<\/＼6U윲蹴Q=%푫汹\\\u20614b[௒C⒥Xe⊇囙b,服3ss땊뢍i~逇PA쇸1": -2.63273619193485312E17,
-                                                                                                 "Mq꺋貘k휕=nK硍뫞輩>㾆~἞ࡹ긐榵l⋙Hw뮢帋M엳뢯v⅃^": 1877913476688465125,
-                                                                                                 "ᶴ뻗`~筗免⚽টW˃⽝b犳䓺Iz篤p;乨A\u20ef쩏?疊m㝀컩뫡b탔鄃ᾈV(遢珳=뎲ିeF仢䆡谨8t0醄7㭧瘵⻰컆r厡궥d)a阄፷Ed&c﯄伮1p": null,
-                                                                                                 "⯁w4曢\"(欷輡": "\"M᭫]䣒頳B\\燧ࠃN㡇j姈g⊸⺌忉ꡥF矉স%^",
-                                                                                                 "㣡Oᄦ昵⫮Y祎S쐐級㭻撥>{I$": -378474210562741663,
-                                                                                                 "䛒掷留Q%쓗1*1J*끓헩ᦢ﫫哉쩧EↅIcꅡ\\?ⴊl귛顮4": false,
-                                                                                                 "寔愆샠5]䗄IH贈=d﯊/偶?ॊn%晥D視N򗘈'᫂⚦|X쵩넽z질tskxDQ莮Aoﱻ뛓": true,
-                                                                                                 "钣xp?&\u001e侉/y䴼~?U篔蘚缣/I畚?Q绊": -3034854258736382234,
-                                                                                                 "꺲໣眀)⿷J暘pИfAV삕쳭Nꯗ4々'唄ⶑ伻㷯騑倭D*Ok꧁3b␽_<\/챣Xm톰ၕ䆄`*fl㭀暮滠毡?": [
-                                                                                                  "D男p`V뙸擨忝븪9c麺`淂⢦Yw⡢+kzܖ\fY1䬡H歁)벾Z♤溊-혰셢?1<-\u0005;搢Tᐁle\\ᛵߓﭩ榩<QF;t=?Qꀞ",
-                                                                                                  [
-                                                                                                   null,
-                                                                                                   [{"-췫揲ᬨ墊臸<ࠒH跥 㔭쥃㫯W=z[wধ╌<~yW楄S!⑻h즓lĖN￧篌W듷튗乵᪪템먵Pf悥ᘀk䷭焼\\讄r擁鐬y6VF<\/6랿p)麡ꁠ㪁\"pழe": [
-                                                                                                    "#幎杴颒嶈)ㄛJ.嶤26_⋌东챯ꠉ⤋ؚ/⏚%秼Q룠QGztﾺ㎷អI翰Xp睔鍜ꨍ",
-                                                                                                    {",T?": [
-                                                                                                     false,
-                                                                                                     [[
-                                                                                                      true,
-                                                                                                      7974824014498027996,
-                                                                                                      false,
-                                                                                                      [
-                                                                                                       4.3305464880956252E18,
-                                                                                                       {
-                                                                                                        "᱿W^A]'rᮢ)鏥z餝;Hu\\Fk?ﴺ?IG浅-䙧>訝-xJ;巡8깊蠝ﻓU$K": {
-                                                                                                         "Vꕡ諅搓W=斸s︪vﲜ츧$)iꡟ싉e寳?ጭムVથ嵬i楝Fg<\/Z|៪ꩆ-5'@ꃱ80!燱R쇤t糳]罛逇dṌ֣XHiͦ{": true,
-                                                                                                         "Ya矲C멗Q9膲墅携휻c\\딶G甔<\/.齵휴": -1.1456247877031811E-19,
-                                                                                                         "z#.OO￝J": -8263224695871959017,
-                                                                                                         "崍_3夼ᮟ1F븍뽯ᦓ鴭V豈Ь": [{
-                                                                                                          "N蒬74": null,
-                                                                                                          "yuB?厅vK笗!ᔸcXQ旦컶P-녫mﾵ麟_": "1R@ 톘xa_|﩯遘s槞d!d껀筤⬫薐焵먑D{\\6k共倌☀G~AS_D\"딟쬚뮥馲렓쓠攥WTMܭ8nX㩴䕅檹E\u0007ﭨN 2 ℆涐ꥏ꠵3▙玽|됨_\u2048",
-                                                                                                          "恐A C䧩G": {":M큣5e들\\ꍀ恼ᔄ靸|I﨏$)n": {
-                                                                                                           "|U䬫㟯SKV6ꛤ㗮\bn봻䲄fＸT:㾯쳤'笓0b/ೢC쳖?2浓uO.䰴": "ཐ꼋e?``,ᚇ慐^8ꜙNM䂱\u0001IᖙꝧM'vKdꌊH牮r\\O@䊷ᓵ쀆(fy聻i툺\"?<\/峧ࣞ⓺ᤤ쵒߯ꎺ騬?)刦\u2072l慪y꺜ﲖTj+u",
-                                                                                                           "뽫<G;稳UL⸙q2n쵿C396炿J蓡z⣁zဩSOU?<\/뙍oE큸O鿅෴ꍈEm#\"[瑦⤫ᝆgl⡗q8\"큘덥係@ᆤ=\u0001爖羝췀㸩b9\\jeqt㟿㮸龾m㳳긄": {
-                                                                                                            "9\"V霟釜{/o0嫲C咀-饷䈍[녩)\r䤴tMW\\龟ϣ^ي㪙忩䞞N湆Y笕)萨ꖤ誥煽:14⫻57U$擒䲐薡Qvↇ櫲현誧?nஷ6": {"l웾䌵.䅋䦝ic碳g[糲Ƿ-ឈᚱ4쑧\u0004C࿼\u0018&쬑?멲<\/fD_檼픃pd쪼n㕊渪V䛉m揈W儅톳뗳䓆7㭽諤T煠Ney?0᪵鈑&": [
-                                                                                                             false,
-                                                                                                             null,
-                                                                                                             {
-                                                                                                              "\r;鼶j᠂꼍RLz~♔9gf?ӡ浐": -1.4843072575250897E-19,
-                                                                                                              "&ꊒ\"ꋟ䝭E诮ﯚO?SW뒁훪mb旙⎕ᗕ⶙|ᷤ5y4甥": "j5|庠t铱?v 횋0\"'rxz䃢杺Ɜ!\u0002",
-                                                                                                              "Q ၩ㟧": {"Hﬔ\u2058䪠틙izZㅛ탟H^ﶲA??R6呠Z솋R.࿶g8": [
-                                                                                                               -8762672252886298799,
-                                                                                                               -1.9486830507000208E17,
-                                                                                                               null,
-                                                                                                               -7157359405410123024,
-                                                                                                               null,
-                                                                                                               null,
-                                                                                                               -995856734219489233,
-                                                                                                               "呧㫹A4!",
-                                                                                                               null,
-                                                                                                               -1.9105609358624648E-19,
-                                                                                                               5888184370445333848,
-                                                                                                               2.25460605078245E-19,
-                                                                                                               2.5302739297121987E18,
-                                                                                                               "뢹sbEf捵2丯?뗾耸(Wd띙SବꭖrtU?筤P똙QpbbKqaE$来V웰3i/lK퉜,8︸e= g螓t竦컼?.寋8鵗",
-                                                                                                               7377742975895263424,
-                                                                                                               2.4218442017790503E-19,
-                                                                                                               {
-                                                                                                                "y꒚ཫ쨘醬킃糟}yTSt䡀⇂뿽4ൢ戰U": [[
-                                                                                                                 3600537227234741875,
-                                                                                                                 4435474101760273035,
-                                                                                                                 -1.42274517007951795E18,
-                                                                                                                 -5567915915496026866,
-                                                                                                                 null,
-                                                                                                                 null,
-                                                                                                                 [
-                                                                                                                  -3204084299154861161,
-                                                                                                                  {
-                                                                                                                   "7梧慸憏.a瘎\u00041U鵮Ck֨d惥耍ⳡY,⭏써E垁FFI鱑ⳬ줢7⧵Bﴠ耘줕햸q컴~*瑍W.떛ࡆ@'᐀+轳": -961121410259132975,
-                                                                                                                   "⥅]l黭㣓绶;!!⎃=朼㐿e&ἂ繤C﯀l䝣㌀6TM쑮w懃ꡡ#ᤆ䰓,墼湼゙뽸㲿䧽쫨xᵖ듨<\/ T0峸iQ:溫脐\\\"쎪ὴ砇宖^M泼큥➅鈫@ᄟ༩\u2008⥼": true,
-                                                                                                                   "⩐\"籽汎P싯鲘蟼sRᐯ䅩\u0019R(kRᖁ&ಌ 0\"鳶!馼YH": null,
-                                                                                                                   "鮼ꚇ싋։刟\rRLd步Nⴗ5Eࡆ訛갚[I醵NC(郴ṉy5D뤺౳QY壯5苴y훨(W\\Cଇ姚C艄깹\u001c歷㋵ZC᥂": [
-                                                                                                                    -6806235313106257498,
-                                                                                                                    null,
-                                                                                                                    "}N⸿讽sꚪ;\\p繇j苄䫨\u20e7%5x?t#",
-                                                                                                                    {
-                                                                                                                     "O〗k<墻yV$ఁrs-c1ఌ唪.C7_Yobᦜ褷'b帰mㄑl⌅": {"qB뗗擄3隂5뺍櫂䱟e촸P/鏩,3掁ꗩ=冉棓㑉|˞F襴뿴,:㞦<퓂⧙礞♗g뚎ᛩ<\/뉽ⶳ⸻A?_x2I㽝勒*I홱鍧粿~曟㤙2绥Ly6+썃uu鿜בf큘|歍ࣖÉ": [
-                                                                                                                      ">hh䈵w>1ⲏ쐭V[ⅎ\\헑벑F_㖝⠗㫇h恽;῝汰ᱼ瀖J옆9RR셏vsZ柺鶶툤r뢱橾/ꉇ囦FGm\"謗ꉦ⨶쒿⥡%]鵩#ᖣ_蹎 u5|祥?O",
-                                                                                                                      null,
-                                                                                                                      2.0150326776036215E-19,
-                                                                                                                      null,
-                                                                                                                      true,
-                                                                                                                      false,
-                                                                                                                      true,
-                                                                                                                      {"\fa᭶P捤WWc᠟f뚉ᬏ퓗ⳀW睹5:HXH=q7x찙X$)모r뚥ᆟ!Jﳸf": [
-                                                                                                                       -2995806398034583407,
-                                                                                                                       [
-                                                                                                                        6441377066589744683,
-                                                                                                                        "Mﶒ醹i)Gἦ廃s6몞 KJ౹礎VZ螺费힀\u0000冺업{谥'꡾뱻:.ꘘ굄奉攼Di᷑K鶲y繈욊阓v㻘}枭캗e矮1c?휐\"4\u0005厑莔뀾墓낝⽴洗ṹ䇃糞@b1\u0016즽Y轹",
-                                                                                                                        {
-                                                                                                                         "1⽕⌰鉟픏M㤭n⧴ỼD#%鐘⊯쿼稁븣몐紧ᅇ㓕ᛖcw嬀~ഌ㖓(0r⧦Q䑕髍ര铂㓻R儮\"@ꇱm❈௿᦯頌8}㿹犴?xn잆꥽R": 2.07321075750427366E18,
-                                                                                                                         "˳b18㗈䃟柵Z曆VTAu7+㛂cb0﯑Wp執<\/臋뭡뚋刼틮荋벲TLP预庰܈G\\O@VD'鱃#乖끺*鑪ꬳ?Mޞdﭹ{␇圯쇜㼞顄︖Y홡g": [{
-                                                                                                                          "0a,FZ": true,
-                                                                                                                          "2z̬蝣ꧦ驸\u0006L↛Ḣ4๚뿀'?lcwᄧ㐮!蓚䃦-|7.飑挴.樵*+1ﮊ\u0010ꛌ%貨啺/JdM:똍!FBe?鰴㨗0O财I藻ʔWA᫓G쳛u`<\/I": [{
-                                                                                                                           "$τ5V鴐a뾆両環iZp頻යn븃v": -4869131188151215571,
-                                                                                                                           "*즢[⦃b礞R◚nΰꕢH=귰燙[yc誘g䆌?ଜ臛": {
-                                                                                                                            "洤湌鲒)⟻\\䥳va}PeAMnＮ[": "㐳ɪ/(軆lZR,Cp殍ȮN啷\"3B婴?i=r$펽ᤐ쀸",
-                                                                                                                            "阄R4㒿㯔ڀ69ZᲦ2癁핌噗P崜#\\-쭍袛&鐑/$4童V꩑_ZHA澢fZ3": {"x;P{긳:G閉:9?活H": [
-                                                                                                                             "繺漮6?z犞焃슳\">ỏ[Ⳛ䌜녏䂹>聵⼶煜Y桥[泥뚩MvK$4jtﾛ",
-                                                                                                                             "E#갶霠좭㦻ୗ먵F+䪀o蝒ba쮎4X㣵 h",
-                                                                                                                             -335836610224228782,
-                                                                                                                             null,
-                                                                                                                             null,
-                                                                                                                             [
-                                                                                                                              "r1᫩0>danjY짿bs{",
-                                                                                                                              [
-                                                                                                                               -9.594464059325631E-23,
-                                                                                                                               1.0456894622831624E-20,
-                                                                                                                               null,
-                                                                                                                               5.803973284253454E-20,
-                                                                                                                               -8141787905188892123,
-                                                                                                                               true,
-                                                                                                                               -4735305442504973382,
-                                                                                                                               9.513150514479281E-20,
-                                                                                                                               "7넳$螔忷㶪}䪪l짴\u0007鹁P鰚HF銏ZJﳴ/⍎1ᷓ忉睇ᜋ쓈x뵠m䷐窥Ꮤ^\u0019ᶌ偭#ヂt☆၃pᎍ臶䟱5$䰵&๵分숝]䝈뉍♂坎\u0011<>",
-                                                                                                                               "C蒑貑藁lﰰ}X喇몛;t밿O7/᯹f\u0015kI嘦<ዴ㟮ᗎZ`GWퟩ瑹࡮ᅴB꿊칈??R校s脚",
-                                                                                                                               {
-                                                                                                                                "9珵戬+AU^洘拻ቒy柭床'粙XG鞕᠜繀伪%]hC,$輙?Ut乖Qm떚W8઼}~q⠪rU䤶CQ痗ig@#≲t샌f㈥酧l;y闥ZH斦e⸬]j⸗?ঢ拻퀆滌": null,
-                                                                                                                                "畯}㧢J罚帐VX㨑>1ꢶkT⿄蘥㝑o|<嗸層沈挄GEOM@-䞚䧰$만峬輏䠱V✩5宸-揂D'㗪yP掶7b⠟J㕻SfP?d}v㼂Ꮕ'猘": {
-                                                                                                                                 "陓y잀v>╪": null,
-                                                                                                                                 "鬿L+7:됑Y=焠U;킻䯌잫!韎ஔ\f": {
-                                                                                                                                  "駫WmGጶ": {
-                                                                                                                                   "\\~m6狩K": -2586304199791962143,
-                                                                                                                                   "ႜࠀ%͑l⿅D.瑢Dk%0紪dḨTI픸%뗜☓s榗኉\"?V籄7w髄♲쟗翛歂E䤓皹t ?)ᄟ鬲鐜6C": {
-                                                                                                                                    "_췤a圷1\u000eB-XOy缿請∎$`쳌eZ~杁튻/蜞`塣৙\"⪰\"沒l}蕌\\롃荫氌.望wZ|o!)Hn獝qg}": null,
-                                                                                                                                    "kOSܧ䖨钨:಼鉝ꭝO醧S`십`ꓭ쭁ﯢN&Et㺪馻㍢ⅳ㢺崡ຊ蜚锫\\%ahx켨|ż劻ꎄ㢄쐟A躊᰹p譞綨Ir쿯\u0016ﵚOd럂*僨郀N*b㕷63z": {
-                                                                                                                                     ":L5r+T㡲": [{
-                                                                                                                                      "VK泓돲ᮙRy㓤➙Ⱗ38oi}LJቨ7Ó㹡৘*q)1豢⛃e᫛뙪壥镇枝7G藯g㨛oI䄽 孂L缊ꋕ'EN`": -2148138481412096818,
-                                                                                                                                      "`⛝ᘑ$(खꊲ⤖ᄁꤒ䦦3=)]Y㢌跨NĴ驳줟秠++d孳>8ᎊ떩EꡣSv룃 쯫أ?#E|᭙㎐?zv:5祉^⋑V": [
-                                                                                                                                       -1.4691944435285607E-19,
-                                                                                                                                       3.4128661569395795E17,
-                                                                                                                                       "㐃촗^G9佭龶n募8R厞eEw⺡_ㆱ%⼨D뉄퉠2ꩵᛅⳍ搿L팹Lවn=\"慉념ᛮy>!`g!풲晴[/;?[v겁軇}⤳⤁핏∌T㽲R홓遉㓥",
-                                                                                                                                       "愰_⮹T䓒妒閤둥?0aB@㈧g焻-#~跬x<\/舁P݄ꐡ=\\׳P\u0015jᳪᢁq;㯏l%᭗;砢觨▝,謁ꍰGy?躤O黩퍋Y㒝a擯\n7覌똟_䔡]fJ晋IAS",
-                                                                                                                                       4367930106786121250,
-                                                                                                                                       -4.9421193149720582E17,
-                                                                                                                                       null,
-                                                                                                                                       {
-                                                                                                                                        ";ﾸ똾柉곟ⰺKpፇ䱻ฺ䖝{o~h!ｅꁿ઻욄ښ\u0002y?xUd\u207c悜ꌭ": [
-                                                                                                                                         1.6010824122815255E-19,
-                                                                                                                                         [
-                                                                                                                                          "宨︩9앉檥pr쇷?WxLb",
-                                                                                                                                          "氇9】J玚\u000f옛呲~ 輠1D嬛,*mW3?n휂糊γ虻*ᴫ꾠?q凐趗Ko↦GT铮",
-                                                                                                                                          "㶢ថmO㍔k'诔栀Z蛟}GZ钹D",
-                                                                                                                                          false,
-                                                                                                                                          -6.366995517736813E-20,
-                                                                                                                                          -4894479530745302899,
-                                                                                                                                          null,
-                                                                                                                                          "V%᫡II璅䅛䓎풹ﱢ/pU9se되뛞x梔~C)䨧䩻蜺(g㘚R?/Ự[忓C뾠ࢤc왈邠买?嫥挤풜隊枕",
-                                                                                                                                          ",v碍喔㌲쟚蔚톬៓ꭶ",
-                                                                                                                                          3.9625444752577524E-19,
-                                                                                                                                          null,
-                                                                                                                                          [
-                                                                                                                                           "kO8란뿒䱕馔b臻⍟隨\"㜮鲣Yq5m퐔<u뷆c譆\u001bN?<",
-                                                                                                                                           [{
-                                                                                                                                            ";涉c蒀ᴧN䘱䤳 ÿꭷ,핉dSTDB>K#ꢘug㼈ᝦ=P^6탲@䧔%$CqSw铜랊0&m⟭<\/a逎ym\u0013vᯗ": true,
-                                                                                                                                            "洫`|XN뤮\u0018詞=紩鴘_sX)㯅鿻Ố싹": 7.168252736947373E-20,
-                                                                                                                                            "ꛊ饤ﴏ袁(逊+~⽫얢鈮艬O힉7D筗S곯w操I斞᠈븘蓷x": [[[[
-                                                                                                                                             -7.3136069426336952E18,
-                                                                                                                                             -2.13572396712722688E18,
-                                                                                                                                             {
-                                                                                                                                              "硢3㇩R:o칢行E<=\u0018ၬYuH!\u00044U%卝炼2>\u001eSi$⓷ꒈ'렢gᙫ番ꯒ㛹럥嶀澈v;葷鄕x蓎\\惩+稘UEᖸﳊ㊈壋N嫿⏾挎,袯苷ኢ\\x|3c": 7540762493381776411,
-                                                                                                                                              "?!*^ᢏ窯?\u0001ڔꙃw虜돳FgJ?&⨫*uo籤:?}ꃹ=ٴ惨瓜Z媊@ત戹㔏똩Ԛ耦Wt轁\\枒^\\ꩵ}}}ꀣD\\]6M_⌫)H豣:36섘㑜": {
-                                                                                                                                               ";홗ᰰU஋㙛`D왔ཿЃS회爁\u001b-㢈`봆?盂㛣듿ᦾ蒽_AD~EEຆ㊋(eNwk=Rɠ峭q\"5Ἠ婾^>'ls\n8QAK<l_⭨穟": [
-                                                                                                                                                true,
-                                                                                                                                                true,
-                                                                                                                                                {"ﳷm箅6qⷈ?ﲈ憟b۷⫉἞V뚴少U呡瓴ꉆs~嘵得㌶4XR漊": [
-                                                                                                                                                 "폆介fM暪$9K[ㄇ샍큳撦g撟恸jҐF㹹aj bHᘀ踉ꎐＣ粄 a?\u000fK즉郝 幨9D舢槷Xh뵎u훩Ꜿ턾ƅ埂P埆k멀{䢹~?D<\/꼢XR\u001b〱䝽꼨i㘀ḟ㚺A-挸",
-                                                                                                                                                 false,
-                                                                                                                                                 null,
-                                                                                                                                                 -1.1710758021294953E-20,
-                                                                                                                                                 3996737830256461142,
-                                                                                                                                                 true,
-                                                                                                                                                 null,
-                                                                                                                                                 -8271596984134071193,
-                                                                                                                                                 "_1G퉁텑m䮔鰼6멲Nmꇩſt쓟튍N许FDj+3^ﶜ⎸\u0019⤕橥!\"s-뾞lz北׸ꍚ랬)?l⻮고i䑰\u001f䪬",
-                                                                                                                                                 4.459124464204517E-19,
-                                                                                                                                                 -4.0967172848578447E18,
-                                                                                                                                                 5643211135841796287,
-                                                                                                                                                 -9.482336221192844E-19,
-                                                                                                                                                 "౪冏釶9D?s螭X榈枸j2秀v]泌鰚岒聵轀쌶i텽qMbL]R,",
-                                                                                                                                                 null,
-                                                                                                                                                 [
-                                                                                                                                                  null,
-                                                                                                                                                  {"M쪊ꯪ@;\u0011罙ꕅ<e᝺|爑Yⵝ<\/&ᩎ<腊ሑᮔ੃F豭": [
-                                                                                                                                                   "^0࡟1볏P폋ፏ杈F⨥Iꂴ\"z磣VⅡ=8퀝2]䢹h1\u0017{jT<I煛5%D셍S⑙⅏J*샐 巙ດ;᧡䙞",
-                                                                                                                                                   [{
-                                                                                                                                                    "'㶡큾鄧`跊\"gV[?u᭒Ʊ髷%葉굵a띦N켧Qﯳy%y䩟髒L䯜S䵳r絅肾킂ၐ'ꔦg긓a'@혔যW谁ᝬF栩ŷ+7w鞚": 6.3544416675584832E17,
-                                                                                                                                                    "苎脷v改hm쏵|㋊g_ᔐ 뒨蹨峟썎㷸|Ο刢?Gͨ옛-?GꦱIEYUX4?%ꘋᆊ㱺": -2.8418378709165287E-19,
-                                                                                                                                                    "誰?(H]N맘]k洳\"q蒧蘞!R퐫\\(Q$T5N堍⫣윿6|럦속︅ﭗ(": [
-                                                                                                                                                     "峩_\u0003A瘘?✓[硫䎯ၽuጭ\"@Y綅첞m榾=贮9R벿῜Z",
-                                                                                                                                                     null,
-                                                                                                                                                     "䰉㗹㷾Iaᝃqcp쓘὾൫Q|ﵓ<\/ḙ>)- Q䲌mo펹L_칍樖庫9꩝쪹ᘹ䑖瀍aK ?*趤f뭓廝p=磕",
-                                                                                                                                                     "哑z懅ᤏ-ꍹux쀭",
-                                                                                                                                                     [
-                                                                                                                                                      true,
-                                                                                                                                                      3998739591332339511,
-                                                                                                                                                      "ጻ㙙?᳸aK<\/囩U`B3袗ﱱ?\"/k鏔䍧2l@쿎VZ쨎/6ꃭ脥|B?31+on颼-ꮧ,O嫚m ࡭`KH葦:粘i]aSU쓙$쐂f+詛頖b",
-                                                                                                                                                      [{"^<9<箝&絡;%i﫡2攑紴\\켉h쓙-柂䚝ven\u20f7浯-Ꮏ\r^훁䓚헬\u000e?\\ㅡֺJ떷VOt": [{
-                                                                                                                                                       "-௄卶k㘆혐஽y⎱㢬sS઄+^瞥h;ᾷj;抭\u0003밫f<\/5Ⱗ裏_朻%*[-撵䷮彈-芈": {
-                                                                                                                                                        "㩩p3篊G|宮hz䑊o곥j^Co0": [
-                                                                                                                                                         653239109285256503,
-                                                                                                                                                         {"궲?|\":N1ۿ氃NZ#깩:쇡o8킗ࡊ[\"됸Po핇1(6鰏$膓}⽐*)渽J'DN<썙긘毦끲Ys칖": {
-                                                                                                                                                          "2Pr?Xjㆠ?搮/?㓦柖馃5뚣Nᦼ|铢r衴㩖\"甝湗ܝ憍": "\"뾯i띇筝牻$珲/4ka $匝휴译zbAᩁꇸ瑅&뵲衯ꎀᆿ7@ꈋ'ᶨH@ᠴl+",
-                                                                                                                                                          "7뢽뚐v?4^ꊥ_⪛.>pởr渲<\/⢕疻c\"g䇘vU剺dஔ鮥꒚(dv祴X⼹\\a8y5坆": true,
-                                                                                                                                                          "o뼄B욞羁hr﷔폘뒚⿛U5pꪴfg!6\\\"爑쏍䢱W<ﶕ\\텣珇oI/BK뺡'谑♟[Ut븷亮g(\"t⡎有?ꬊ躺翁艩nl F⤿蠜": 1695826030502619742,
-                                                                                                                                                          "ۊ깖>ࡹ햹^ⵕ쌾BnN〳2C䌕tʬ]찠?ݾ2饺蹳ぶꌭ訍\"◹ᬁD鯎4e滨T輀ﵣ੃3\u20f3킙D瘮g\\擦+泙ၧ 鬹ﯨַ肋7놷郟lP冝{ߒhড়r5,꓋": null,
-                                                                                                                                                          "ΉN$y{}2\\N﹯ⱙK'8ɜͣwt,．钟廣䎘ꆚk媄_": null,
-                                                                                                                                                          "䎥eᾆᝦ읉,Jުn岪㥐s搖謽䚔5t㯏㰳㱊ZhD䃭f絕s鋡篟a`Q鬃┦鸳n_靂(E4迠_觅뷝_宪D(NL疶hL追V熑%]v肫=惂!㇫5⬒\u001f喺4랪옑": {
-                                                                                                                                                           "2a輍85먙R㮧㚪Sm}E2yꆣꫨrRym㐱膶ᔨ\\t綾A☰.焄뙗9<쫷챻䒵셴᭛䮜.<\/慌꽒9叻Ok䰊Z㥪幸k": [
-                                                                                                                                                            null,
-                                                                                                                                                            true,
-                                                                                                                                                            {"쌞쐍": {
-                                                                                                                                                             "▟GL K2i뛱iＱ\"̠.옛1X$}涺]靎懠ڦ늷?tf灟ݞゟ{": 1.227740268699265E-19,
-                                                                                                                                                             "꒶]퓚%ฬK❅": [{
-                                                                                                                                                              "(ෛ@Ǯっ䧼䵤[aﾃൖvEnAdU렖뗈@볓yꈪ,mԴ|꟢캁(而첸죕CX4Y믅": "2⯩㳿ꢚ훀~迯?᪑\\啚;4X\u20c2襏B箹)俣eỻw䇄",
-                                                                                                                                                              "75༂f詳䅫ꐧ鏿 }3\u20b5'∓䝱虀f菼Iq鈆﨤g퍩)BFa왢d0뮪痮M鋡nw∵謊;ꝧf美箈ḋ*\u001c`퇚퐋䳫$!V#N㹲抗ⱉ珎(V嵟鬒_b㳅\u0019": null,
-                                                                                                                                                              "e_m@(i㜀3ꦗ䕯䭰Oc+-련0뭦⢹苿蟰ꂏSV䰭勢덥.ྈ爑Vd,ᕥ=퀍)vz뱊ꈊB_6듯\"?{㒲&㵞뵫疝돡믈%Qw限,?\r枮\"? N~癃ruࡗdn&": null,
-                                                                                                                                                              "㉹&'Pfs䑜공j<\/?|8oc᧨L7\\pXᭁ 9᪘": -2.423073789014103E18,
-                                                                                                                                                              "䝄瑄䢸穊f盈᥸,B뾧푗횵B1쟢f\u001f凄": "魖⚝2儉j꼂긾껢嗎0ࢇ纬xI4](੓`蕞;픬\fC\"斒\")2櫷I﹥迧",
-                                                                                                                                                              "ퟯ詔x悝령+T?Bg⥄섅kOeQ큼㻴*{E靼6氿L缋\u001c둌๶-㥂2==-츫I즃㠐Lg踞ꙂEG貨鞠\"\u0014d'.缗gI-lIb䋱ᎂDy缦?": null,
-                                                                                                                                                              "紝M㦁犿w浴詟棓쵫G:䜁?V2ힽ7N*n&㖊Nd-'ຊ?-樹DIv⊜)g䑜9뉂ㄹ푍阉~ꅐ쵃#R^\u000bB䌎䦾]p.䀳": [{"ϒ爛\"ꄱ︗竒G䃓-ま帳あ.j)qgu扐徣ਁZ鼗A9A鸦甈!k蔁喙:3T%&㠘+,䷞|챽v䚞문H<\/醯r셓㶾\\a볜卺zE䝷_죤ဵ뿰᎟CB": [
-                                                                                                                                                               6233512720017661219,
-                                                                                                                                                               null,
-                                                                                                                                                               -1638543730522713294,
-                                                                                                                                                               false,
-                                                                                                                                                               -8901187771615024724,
-                                                                                                                                                               [
-                                                                                                                                                                3891351109509829590,
-                                                                                                                                                                true,
-                                                                                                                                                                false,
-                                                                                                                                                                -1.03836679125188032E18,
-                                                                                                                                                                {
-                                                                                                                                                                 "<?起HCᷭ죎劐莇逰/{gs\u0014⽛㰾愫tￖ<솞ڢ됌煲膺਻9x닳x࡭Q訽,ᶭඦtt掾\"秧㺌d˪䙻꫗:ᭈh4緞痐䤴c뫚떩త<?ᕢ謚6]폛O鰐鋛镠贩赟\"<G♷1'": true,
-                                                                                                                                                                 "቙ht4ߝBqꦤ+\u0006멲趫灔)椾": -1100102890585798710,
-                                                                                                                                                                 "総兎곇뇸粟F醇;朠?厱楛㶆ⶏ7r⾛o꯬᳡F\\머幖 㜦\f[搦᥽㮣0䕊?J㊳뀄e㔔+?<n↴复": [
-                                                                                                                                                                  "4~ꉍ羁\\偮(泤叕빜\u0014>j랎:g曞ѕᘼ}链N",
-                                                                                                                                                                  -1.1103819473845426E-19,
-                                                                                                                                                                  true,
-                                                                                                                                                                  [
-                                                                                                                                                                   true,
-                                                                                                                                                                   null,
-                                                                                                                                                                   -7.9091791735309888E17,
-                                                                                                                                                                   true,
-                                                                                                                                                                   {"}蔰鋈+ꐨ啵0?g*사%`J?*": [{
-                                                                                                                                                                    "\"2wG?yn,癷BK\\龞䑞x?蠢": -3.7220345009853505E-19,
-                                                                                                                                                                    ";饹়❀)皋`噿焒j(3⿏w>偍5X<np?<줯<Y]捘!J೸UⳂNे7v௸㛃ᄧ톿䨷鯻v焇=烻TQ!F⦰䣣눿K鷚눁'⭲m捠(䚻": [
-                                                                                                                                                                     "蹕 淜੃b\"+몾ⴕ",
-                                                                                                                                                                     null,
-                                                                                                                                                                     35892237756161615,
-                                                                                                                                                                     {
-                                                                                                                                                                      " 듹㏝)5慁箱&$~:遰쮐<\/堋?% \\勽唅z손帋䘺H髀麡M퇖uz\u0012m諦d᳤콌樝\rX싹̡Ო": -433791617729505482,
-                                                                                                                                                                      "-j溗ࢵcz!:}✽5ഇ,욨ݏs#덫=南浺^}E\\Y\\T*뼈cd꺐cۘ뎁䨸됱K䠴㉿恿逳@wf쏢<\/[L[": -9.3228549642908109E17,
-                                                                                                                                                                      "Ms킭u஗%\\u⍎/家欲ἅ答㓽/꯳齳|㭘Pr\"v<\/禇䔆$GA䊻˔-:틊[h?倬荤ᾞ৳.Gw\u000b": [
-                                                                                                                                                                       "0宜塙I@䏴蝉\\Uy뒅=2<h暒K._贡璐Yi檻_⮵uᐝ㘗聠[f\u0015힢Hꔮ}጑;誏yf0\"\u20cc?(=q斠➽5ꎾ鞘kⲃ",
-                                                                                                                                                                       -2.9234211354411E-19,
-                                                                                                                                                                       false,
-                                                                                                                                                                       true,
-                                                                                                                                                                       {
-                                                                                                                                                                        "\u0011⟴GH_;#怵:\u001c\u0002n1U\\p/왔(┫]hꐚ7\r0䵷첗岷O௷?㝎[殇|J=?韷pᶟ儜犆?5კ1kꍖiH竧뛈ପdmk游y(콪팱꾍k慧 y辣": [
-                                                                                                                                                                         false,
-                                                                                                                                                                         "O\"끍p覈ykv磂㢠㝵~뀬튍lC&4솎䇃:Mj",
-                                                                                                                                                                         -7.009964654003924E-20,
-                                                                                                                                                                         false,
-                                                                                                                                                                         -49306078522414046,
-                                                                                                                                                                         null,
-                                                                                                                                                                         null,
-                                                                                                                                                                         2160432477732354319,
-                                                                                                                                                                         true,
-                                                                                                                                                                         "4횡h+!踹ꐬP鮄{0&뱥M?샍鞅n㮞ᨹ?쒆毪l'箅^ꚥ頛`e㻨52柳⮙嫪࡟딯a.~䵮1f吘N&zȭL榓ۃ鳠5d㟆M@㣥ӋA΍q0縶$",
-                                                                                                                                                                         -3.848996532974368E16,
-                                                                                                                                                                         true,
-                                                                                                                                                                         null,
-                                                                                                                                                                         -3.5240055580952525E18,
-                                                                                                                                                                         {
-                                                                                                                                                                          " vﭷၵ#ce乃5僞?Z D`묨粇ᐔ绠vWL譢u뽀\\J|tⓙt№\"ꨋnT凮ᒩ蝂篝b騩:䢭Hbv읻峨z㹚T趗햆귣학津XiＹ@ᖥK": true,
-                                                                                                                                                                          "!F 醌y䉸W2ꇬ\u0006/䒏7~%9擛햀徉9⛰+?㌘;ꠓX䇻Dfi뼧쒒\u0012F謞՝絺+臕kऍLSQ쌁X쎬幦HZ98蒊枳": "澤令#\u001d抍⛳@N搕퀂[5,✄ꘇ~䘷?\u0011Xꈺ[硸⠘⛯X醪聡x\u0007쌇MiX/|ﾐ뚁K8䁡W)銀q僞綂蔕E",
-                                                                                                                                                                          "6␲䣖R৞@ငg?<\/೴x陙Xꈺ崸⠅ᇾ\\0X,H쟴셭A稂ힿゝF\\쑞\u0012懦(Aᯕ灭~\u0001껮X?逊": 5.7566819207732864E17,
-                                                                                                                                                                          "[c?椓": false,
-                                                                                                                                                                          "k䒇": 2583824107104166717,
-                                                                                                                                                                          "꙯N훙㏅ﮒ燣㨊瞯咽jMxby뻭뵫װ[\"1畈?ৱL": "띣ᔂ魠羓犴ꚃ+|rY",
-                                                                                                                                                                          "녺Z?䬝鉉:?ⳙ瘏Cኯ.Vs[釿䨉쐧\\\\*쵢猒$\\y溔^,㑳": {"藶꺟": [{
-                                                                                                                                                                           "\"d훣N2zq]?'檿죸忷篇ﮟ擤m'9!죶≓p뭻\\ᇷ\f퇶_䰸h๐Q嵃訾㘑従ꯦ䞶jL틊r澵Omᾫ!H䱤팼/;|᭺I7슎YhuXi⚼": -1.352716906472438E-19,
-                                                                                                                                                                           "M⽇倻5J䂫औ᝔楸#J[Fﹱ쫮W誻bWz?}1\"9硪뻶fe": "盬:Ѹ砿획땣T凊(m灦呜ﻝR㿎艴䂵h",
-                                                                                                                                                                           "R띾k힪CH钙_i苮ⰵoᾨ紑퉎7h؉\"柀蝽z0့\"<?嘭$蜝?礲7岇槀묡?V钿T⣜v+솒灚ԛ2米mH?>薙婏聿3aFÆÝ": "2,ꓴg?_섦_>Y쪥션钺;=趘F~?D㨫\bX?㹤+>/믟kᠪ멅쬂Uzỵ]$珧`m雁瑊ඖ鯬cꙉ梢f묛bB",
-                                                                                                                                                                           "♽n$YjKiXX*GO贩鏃豮祴遞K醞眡}ꗨv嵎꼷0୸+M菋eH徸J꣆:⼐悥B켽迚㯃b諂\u000bjꠜ碱逮m8": [
-                                                                                                                                                                            "푷᣺ﻯd8ﱖ嬇ភH鹎⡱᱅0g:果6$GQ췎{vᷧYy-脕x偹砡館⮸C蓼ꏚ=軄H犠G谖ES詤Z蠂3l봟hￒ7䦹1GPQG癸숟~[#駥8zQ뛣J소obg,",
-                                                                                                                                                                            null,
-                                                                                                                                                                            1513751096373485652,
-                                                                                                                                                                            null,
-                                                                                                                                                                            -6.851466660824754E-19,
-                                                                                                                                                                            {"䩂-⴮2ٰK솖풄꾚ႻP앳1H鷛wmR䗂皎칄?醜<\/&ࠧ㬍X濬䵈K`vJ륒Q/IC묛!;$vϑ": {
-                                                                                                                                                                             "@-ꚗxྐྵ@m瘬\u0010U絨ﮌ驐\\켑寛넆T=tQ㭤L연@脸삯e-:⩼u㎳VQ㋱襗ຓ<Ⅶ䌸cML3+\u001e_C)r\\9+Jn\\Pﺔ8蠱檾萅Pq鐳话T䄐I": -1.80683891195530061E18,
-                                                                                                                                                                             "ᷭዻU~ཷsgSJ`᪅'%㖔n5픆桪砳峣3獮枾䌷⊰呀": {
-                                                                                                                                                                              "Ş੉䓰邟自~X耤pl7间懑徛s첦5ਕXexh⬖鎥᐀nNr(J컗｜ૃF\"Q겮葲놔엞^겄+㈆话〾희紐G'E?飕1f❼텬悚泬먐U睬훶Qs": false,
-                                                                                                                                                                              "(\u20dag8큽튣>^Y{뤋.袊䂓;_g]S\u202a꽬L;^'#땏bႌ?C緡<䝲䲝断ꏏ6\u001asD7IK5Wxo8\u0006p弊⼂ꯍ扵\u0003`뵂픋%ꄰ⫙됶l囏尛+䗅E쟇\\": [
-                                                                                                                                                                               true,
-                                                                                                                                                                               {
-                                                                                                                                                                                "\n鱿aK㝡␒㼙2촹f;`쾏qIࡔG}㝷䐍瓰w늮*粅9뒪ㄊCj倡翑閳R渚MiUO~仨䜶RꙀA僈㉋⦋n{㖥0딿벑逦⥻0h薓쯴Ꝼ": [
-                                                                                                                                                                                 5188716534221998369,
-                                                                                                                                                                                 2579413015347802508,
-                                                                                                                                                                                 9.010794400256652E-21,
-                                                                                                                                                                                 -6.5327297761238093E17,
-                                                                                                                                                                                 1.11635352494065523E18,
-                                                                                                                                                                                 -6656281618760253655,
-                                                                                                                                                                                 {
-                                                                                                                                                                                  "": ")?",
-                                                                                                                                                                                  "TWKLꑙ裑꺔UE俸塑炌Ũ᜕-o\"徚#": {"M/癟6!oI51ni퐚=댡>xꍨ\u0004 ?": {
-                                                                                                                                                                                   "皭": {"⢫䋖>u%w잼<䕏꘍P䋵$魋拝U䮎緧皇Y훂&|羋ꋕ잿cJ䨈跓齳5\u001a삱籷I꿾뤔S8㌷繖_Yឯ䲱B턼O歵F\\l醴o_欬6籏=D": [
-                                                                                                                                                                                    false,
-                                                                                                                                                                                    true,
-                                                                                                                                                                                    {"Mt|ꏞD|F궣MQ뵕T,띺k+?㍵i": [
-                                                                                                                                                                                     7828094884540988137,
-                                                                                                                                                                                     false,
-                                                                                                                                                                                     {
-                                                                                                                                                                                      "!༦鯠,&aﳑ>[euJꏽ綷搐B.h": -7648546591767075632,
-                                                                                                                                                                                      "-n켧嘰{7挐毄Y,>❏螵煫乌pv醑Q嶚!|⌝責0왾덢ꏅ蛨S\\)竰'舓Q}A釡5#v": 3344849660672723988,
-                                                                                                                                                                                      "8閪麁V=鈢1녈幬6棉⪮둌\u207d᚛驉ꛃ'r䆉惏ै|bἧﺢᒙ<=穊强s혧eꮿ慩⌡ \\槳W븧J檀C,ᘉ의0俯퀉M;筷ࣴ瓿{늊埂鄧_4揸Nn阼Jੵ˥(社": true,
-                                                                                                                                                                                      "o뼀vw)4A뢵(a䵢)p姃뛸\u000fK#KiQp\u0005ꅍ芅쏅": null,
-                                                                                                                                                                                      "砥$ꥸ┇耽u斮Gc{z빔깎밇\\숰\u001e괷各㶇쵿_ᴄ+h穢p촀Ნ䃬z䝁酳ӂ31xꔄ1_砚W렘G#2葊P ": [
-                                                                                                                                                                                       -3709692921720865059,
-                                                                                                                                                                                       null,
-                                                                                                                                                                                       [
-                                                                                                                                                                                        6669892810652602379,
-                                                                                                                                                                                        -135535375466621127,
-                                                                                                                                                                                        "뎴iO}Z? 馢녱稹ᄾ䐩rSt帤넆&7i騏멗畖9誧鄜'w{Ͻ^2窭외b㑎粖i矪ꦨ탪跣)KEㆹ\u0015V8[W?⽉>'kc$䨘ᮛ뉻٬M5",
-                                                                                                                                                                                        1.10439588726055846E18,
-                                                                                                                                                                                        false,
-                                                                                                                                                                                        -4349729830749729097,
-                                                                                                                                                                                        null,
-                                                                                                                                                                                        [
-                                                                                                                                                                                         false,
-                                                                                                                                                                                         "_蠢㠝^䟪/D녒㡋ỎC䒈판\u0006એq@O펢%;鹐쏌o戥~A[ꡉ濽ỳ&虃᩾荣唙藍茨Ig楡꒻M窓冉?",
-                                                                                                                                                                                         true,
-                                                                                                                                                                                         2.17220752996421728E17,
-                                                                                                                                                                                         -5079714907315156164,
-                                                                                                                                                                                         -9.960375974658589E-20,
-                                                                                                                                                                                         "ᾎ戞༒",
-                                                                                                                                                                                         true,
-                                                                                                                                                                                         false,
-                                                                                                                                                                                         [[
-                                                                                                                                                                                          "ⶉᖌX⧕홇)g엃⹪x뚐癟\u0002",
-                                                                                                                                                                                          -5185853871623955469,
-                                                                                                                                                                                          {
-                                                                                                                                                                                           "L㜤9ợㇶK鐰⋓V뽋˖!斫as|9＂፬䆪?7胜&n薑~": -2.11545634977136992E17,
-                                                                                                                                                                                           "O8뀩D}캖q萂6༣㏗䈓煮吽ਆᎼDᣘ폛;": false,
-                                                                                                                                                                                           "YTᡅ^L㗎cbY$pᣞ縿#fh!ꘂb삵玊颟샞ဢ$䁗鼒몁~rkH^:닮먖츸륈⪺쒉砉?㙓扫㆕꣒`R䢱B酂?C뇞<5Iޚ讳騕S瞦z": null,
-                                                                                                                                                                                           "\\RB?`mG댵鉡幐物䵎有5*e骄T㌓ᛪ琾駒Ku\u001a[柆jUq8⋈5鿋츿myﻗ?雍ux঴?": 5828963951918205428,
-                                                                                                                                                                                           "n0晅:黯 xu씪^퓞cB㎊ᬍ⺘٤փ~B岚3㥕擄vᲂ~F?C䶖@$m~忔S왖㲚?챴⊟W#벌{'㰝I䝠縁s樘\\X뢻9핡I6菍ㄛ8쯶]wॽ0L\"q": null,
-                                                                                                                                                                                           "x增줖j⦦t䏢᎙㛿Yf鼘~꫓恄4惊\u209c": "oOhbᤃ᛽z&Bi犑\\3B㩬劇䄑oŁ쨅孥멁ຖacA㖫借㞝vg싰샂㐜#譞⢤@k]鋰嘘䜾L熶塥_<\/⍾屈ﮊ_mY菹t뙺}Ox=w鮮4S1ꐩמּ'巑",
-                                                                                                                                                                                           "㗓蟵ꂾe蠅匳(JP䗏෸\u0089耀왲": [{
-                                                                                                                                                                                            "ᤃ㵥韎뤽\r?挥O쯡⇔㞚3伖\u0005P⋪\"D궣QLn(⚘罩䩢Ŏv䤘尗뼤됛O淽鋋闚r崩a{4箙{煷m6〈": {
-                                                                                                                                                                                             "l곺1L": {
-                                                                                                                                                                                              "T'ਤ?砅|੬Km]䄩\"(࿶<\/6U爢䫈倔郴l2㴱^줣k'L浖L鰄Rp今鎗⒗C얨M훁㡧ΘX粜뫈N꤇輊㌻켑#㮮샶-䍗룲蠝癜㱐V>=\\I尬癤t=": 7648082845323511446,
-                                                                                                                                                                                              "鋞EP:<\/_`ၧe混ㇹBd⯢㮂驋\\q碽饩跓྿ᴜ+j箿렏㗑yK毢宸p謹h䦹乕U媣\\炤": [[
-                                                                                                                                                                                               "3",
-                                                                                                                                                                                               [
-                                                                                                                                                                                                true,
-                                                                                                                                                                                                3.4058271399411134E-20,
-                                                                                                                                                                                                true,
-                                                                                                                                                                                                "揀+憱f逮@먻BpW曉\u001a㣐⎊$n劈D枤㡞좾\u001aᛁ苔౩闝1B䷒Ṋ݋➐ꀞꐃ磍$t੤_:蘺⮼(#N",
-                                                                                                                                                                                                697483894874368636,
-                                                                                                                                                                                                [
-                                                                                                                                                                                                 "vᘯ锴)0訶}䳅⩚0O壱韈ߜ\u0018*U鍾䏖=䧉뽑单휻ID쿇嘗?ꌸῬ07",
-                                                                                                                                                                                                 -5.4858784319382006E18,
-                                                                                                                                                                                                 7.5467775182251151E18,
-                                                                                                                                                                                                 -8911128589670029195,
-                                                                                                                                                                                                 -7531052386005780140,
-                                                                                                                                                                                                 null,
-                                                                                                                                                                                                 [
-                                                                                                                                                                                                  null,
-                                                                                                                                                                                                  true,
-                                                                                                                                                                                                  [[{
-                                                                                                                                                                                                   "1欯twG<u䝮␽ꇣ_ჟﱴଶ-쪋\"?홺k:莝Ꜫ*⺵꽹댅釔좵}P?=9렿46b\u001c\\S?(筈僦⇶爷谰1ྷa": true,
-                                                                                                                                                                                                   "TҫJYxڪ\\鰔℮혡)m_WVi眪1[71><\/Q:0怯押殃탷聫사<ỗꕧ蚨䡁nDꌕ\u001c녬~蓩<N蹑\"{䫥lKc혁뫖앺:vⵑ": "g槵?",
-                                                                                                                                                                                                   "aꨩ뻃싥렌1`롗}Yg>鲃g儊>ꏡl㻿/⑷*챳6㻜W毤緛ﹺᨪ4\u0013뺚J髬e3쳸䘦伧?恪&{L掾p+꬜M䏊d娘6": {
-                                                                                                                                                                                                    "2p첼양棜h䜢﮶aQ*c扦v︥뮓kC寵횂S銩&ǝ{O*य़iH`U큅ࡓr䩕5ꄸ?`\\᧫?ᮼ?t〟崾훈k薐ì/ｉy꤃뵰z1<\/AQ#뿩8jJ1z@u䕥": 1.82135747285215155E18,
-                                                                                                                                                                                                    "ZdN &=d년ᅆ'쑏ⅉ:烋5&៏ᄂ汎来L㯄固{钧u\\㊏튚e摑&t嗄ꖄUb❌?m䴘熚9EW": [{
-                                                                                                                                                                                                     "ଛ{i*a(": -8.0314147546006822E17,
-                                                                                                                                                                                                     "⫾ꃆY\u000e+W`௸ \"M뒶+\\뷐lKE}(NT킶Yj選篒쁶'jNQ硾(똡\\\"逌ⴍy? IRꜘ὞鄬﨧:M\\f⠋Cꚜ쫊ᚴNV^D䕗ㅖἔIao꿬C⍏8": [
-                                                                                                                                                                                                      287156137829026547,
-                                                                                                                                                                                                      {
-                                                                                                                                                                                                       "H丞N逕<rO䎗:텕<\/䶩샌Sd%^ᵯ눐엑者g䖩똭蕮1U驣?Pⰰ\u001fp(W]67\u0015﫣6굺OR羸#촐F蒈;嘙i✵@_撶y㤏⤍(:᧗뼢༌朆@⏰㤨ꭲ?-n>⯲": {"": {
-                                                                                                                                                                                                        "7-;枮阕梒9ᑄZ": [[[[
-                                                                                                                                                                                                         null,
-                                                                                                                                                                                                         {
-                                                                                                                                                                                                          "": [[[[
-                                                                                                                                                                                                           -7.365909561486078E-19,
-                                                                                                                                                                                                           2948694324944243408,
-                                                                                                                                                                                                           null,
-                                                                                                                                                                                                           [
-                                                                                                                                                                                                            true,
-                                                                                                                                                                                                            "荒\"并孷䂡쵼9o䀘F\u0002龬7⮹Wz%厖/*? a*R枈㌦됾g뒠䤈q딄㺿$쮸tᶎ릑弣^鏎<\/Y鷇驜L鿽<\/춋9Mᲆឨ^<\/庲3'l낢",
-                                                                                                                                                                                                            "c鮦\u001b두\\~?眾ಢu݆綑෪蘛轋◜gȃ<\/ⴃcpkDt誩܅\"Y",
-                                                                                                                                                                                                            [[
-                                                                                                                                                                                                             null,
-                                                                                                                                                                                                             null,
-                                                                                                                                                                                                             [
-                                                                                                                                                                                                              3113744396744005402,
-                                                                                                                                                                                                              true,
-                                                                                                                                                                                                              "v(y",
-                                                                                                                                                                                                              {
-                                                                                                                                                                                                               "AQ幆h쾜O+꺷铀ꛉ練A蚗⼺螔j㌍3꽂楎䥯뎸먩?": null,
-                                                                                                                                                                                                               "蠗渗iz鱖w]擪E": 1.2927828494783804E-17,
-                                                                                                                                                                                                               "튷|䀭n*曎b✿~杤U]Gz鄭kW|㴚#㟗ഠ8u擨": [[
-                                                                                                                                                                                                                true,
-                                                                                                                                                                                                                null,
-                                                                                                                                                                                                                null,
-                                                                                                                                                                                                                {"⾪壯톽g7?㥜ώQꑐ㦀恃㧽伓\\*᧰閖樧뢇赸N휶䎈pI氇镊maᬠ탷#X?A+kНM ༑᩟؝?5꧎鰜ṚY즫궔 =ঈ;ﳈ?*s|켦蜌wM笙莔": [
-                                                                                                                                                                                                                 null,
-                                                                                                                                                                                                                 -3808207793125626469,
-                                                                                                                                                                                                                 [
-                                                                                                                                                                                                                  -469910450345251234,
-                                                                                                                                                                                                                  7852761921290328872,
-                                                                                                                                                                                                                  -2.7979740127017492E18,
-                                                                                                                                                                                                                  1.4458504352519893E-20,
-                                                                                                                                                                                                                  true,
-                                                                                                                                                                                                                  "㽙깹?먏䆢:䴎ۻg殠JBTU⇞}ꄹꗣi#I뵣鉍r혯~脀쏃#釯:场:䔁>䰮o'㼽HZ擓௧nd",
-                                                                                                                                                                                                                  [
-                                                                                                                                                                                                                   974441101787238751,
-                                                                                                                                                                                                                   null,
-                                                                                                                                                                                                                   -2.1647718292441327E-19,
-                                                                                                                                                                                                                   1.03602824249831488E18,
-                                                                                                                                                                                                                   [
-                                                                                                                                                                                                                    null,
-                                                                                                                                                                                                                    1.0311977941822604E-17,
-                                                                                                                                                                                                                    false,
-                                                                                                                                                                                                                    true,
-                                                                                                                                                                                                                    {
-                                                                                                                                                                                                                     "": -3.7019778830816707E18,
-                                                                                                                                                                                                                     "E峾恆茍6xLIm縂0n2视֯J-ᤜz+ᨣ跐mYD豍繹⹺䊓몓ﴀE(@詮(!Y膽#᎙2䟓섣A䈀㟎,囪QbK插wcG湎ꤧtG엝x⥏俎j'A一ᯥ뛙6ㅑ鬀": 8999803005418087004,
-                                                                                                                                                                                                                     "よ殳\\zD⧅%Y泥簳Uꈩ*wRL{3#3FYHା[d岀䉯T稉駅䞘礄P:闈W怏ElB㤍喬赔bG䠼U଄Nw鰯闀楈ePsDꥷ꭬⊊": [
-                                                                                                                                                                                                                      6.77723657904486E-20,
-                                                                                                                                                                                                                      null,
-                                                                                                                                                                                                                      [
-                                                                                                                                                                                                                       "ཚ_뷎꾑蹝q'㾱ꂓ钚蘞慵렜떆`ⴹ⎼櫯]J?[t9Ⓢ !컶躔I᮸uz>3a㠕i,錃L$氰텰@7녫W㸮?羧W뇧ꃞ,N鋮숪2ɼ콏┍䁲6",
-                                                                                                                                                                                                                       "&y?뢶=킕올Za惻HZk>c\u20b58i?ꦶcfBv잉ET9j䡡",
-                                                                                                                                                                                                                       "im珊Ճb칧<D-諂*u2ꡜ췛~䬢(텸ﵦ>校\\뼾쯀",
-                                                                                                                                                                                                                       9.555715121193197E-20,
-                                                                                                                                                                                                                       true,
-                                                                                                                                                                                                                       {
-                                                                                                                                                                                                                        "<㫚v6腓㨭e1㕔&&V∌ᗈT奄5Lጥ>탤?튣瑦㳆ꉰ!(ᙪ㿬擇_n쌯IMΉ㕨␰櫈ᱷ5풔蟹&L.첽e鰷쯃劼﫭b#ﭶ퓀7뷄Wr㢈๧Tʴશ㶑澕鍍%": -1810142373373748101,
-                                                                                                                                                                                                                        "fg晌o?߲ꗄ;>C>?=鑰監侯Kt굅": true,
-                                                                                                                                                                                                                        "䫡蓺ꑷ]C蒹㦘\"1ః@呫\u0014NL䏾eg呮፳,r$裢k>/\\<z": [[
-                                                                                                                                                                                                                         null,
-                                                                                                                                                                                                                         "C䡏>?ㄤᇰﻛ쉕1஥'Ċ\" \\_?쨔\"ʾr: 9S䘏禺ᪧꄂ㲄",
-                                                                                                                                                                                                                         [[{
-                                                                                                                                                                                                                          "*硙^+E쌺I1䀖ju?:⦈Ꞓl๴竣迃xKC/饉:\fl\"XTFﾨ蟭,芢<\/骡軺띜hꏘ\u001f銿<棔햳▨(궆*=乥b8\\媦䷀뫝}닶ꇭ(Kej䤑M": [{
-                                                                                                                                                                                                                           "1Ꮼ?>옿I╅C<ގ?ꊌ冉SV5A㢊㶆z-๎玶绢2F뵨@㉌뀌o嶔f9-庒茪珓뷳4": null,
-                                                                                                                                                                                                                           ";lᰳ": "CbB+肻a䄷苝*/볳+/4fq=㰁h6瘉샴4铢Y骐.⌖@哼猎㦞+'gꋸ㒕ߤ㞑(䶒跲ti⑴a硂#No볔",
-                                                                                                                                                                                                                           "t?/jE幸YHT셵⩎K!Eq糦ꗣv刴w\"l$ο:=6:移": {
-                                                                                                                                                                                                                            "z]鑪醊嫗J-Xm銌翁絨c里됏炙Ep㣋鏣똼嚌䀓GP﹖cmf4鹭T䅿꣭姧␸wy6ꦶ;S&(}ᎧKxᾂQ|t뻳k\"d6\"|Ml췆hwLt꼼4$&8Պ褵婶鯀9": {"嵃닢ᒯ'd᧫䳳#NXe3-붋鸿ଢ떓%dK\u0013䲎ꖍYV.裸R⍉rR3蟛\\:젯:南ĺLʆ넕>|텩鴷矔ꋅⒹ{t孶㓑4_": [
-                                                                                                                                                                                                                             true,
-                                                                                                                                                                                                                             null,
-                                                                                                                                                                                                                             [
-                                                                                                                                                                                                                              false,
-                                                                                                                                                                                                                              "l怨콈lᏒ",
-                                                                                                                                                                                                                              {
-                                                                                                                                                                                                                               "0w䲏嬧-:`䉅쉇漧\\܂yㄨb%㽄j7ᦶ涶<": 3.7899452730383747E-19,
-                                                                                                                                                                                                                               "ꯛTẀq纤q嶏V⿣?\"g}ი艹(쥯B T騠I=仵및X": {"KX6颠+&ᅃ^f畒y[": {
-                                                                                                                                                                                                                                "H?뱜^?꤂-⦲1a㋞&ꍃ精Ii᤾챪咽쬘唂쫷<땡劈훫놡o㥂\\ KⴙD秼F氮[{'좴:례晰Iq+I쭥_T綺砸GO煝䟪ᚪ`↹l羉q쐼D꽁ᜅ훦: vUV": true,
-                                                                                                                                                                                                                                "u^yﳍ0㱓#[y뜌앸ꊬL㷩?蕶蘾⻍KӼ": -7931695755102841701,
-                                                                                                                                                                                                                                "䤬轉車>\u001c鴵惋\"$쯃྆⇻n뽀G氠S坪]ಲꨍ捇Qxኻ椕駔\\9ࣼ﫻읜磡煮뺪ᶚ볝l㕆t+sζ": [[[
-                                                                                                                                                                                                                                 true,
-                                                                                                                                                                                                                                 false,
-                                                                                                                                                                                                                                 [
-                                                                                                                                                                                                                                  null,
-                                                                                                                                                                                                                                  3363739578828074923,
-                                                                                                                                                                                                                                  true,
-                                                                                                                                                                                                                                  {
-                                                                                                                                                                                                                                   "\"鸣詩 볰㑵gL㯦῅춝旫}ED辗ﮈI쀤-ꧤ|㠦Z\"娑ᕸ4爏騍㣐\"]쳝Af]茛⬻싦o蚁k䢯䩐菽3廇喑ޅ": 4.5017999150704666E17,
-                                                                                                                                                                                                                                   "TYႇ7ʠ值4챳唤~Zo&ݛ": false,
-                                                                                                                                                                                                                                   "`塄J袛㭆끺㳀N㺣`꽐嶥KﯝSVᶔ∲퀠獾N딂X\"ᤏhNﬨvI": {"\u20bb㭘I䖵䰼?sw䂷쇪](泒f\"~;꼪Fԝsᝦ": {"p,'ꉂ軿=A蚶?bƉ㏵䅰諬'LYKL6B깯⋩겦뎙(ᜭ\u0006噣d꾆㗼Z;䄝䚔cd<情@䞂3苼㸲U{)<6&ꩻ钛\u001au〷N숨囖愙j=BXW욕^x芜堏Ῑ爂뛷꒻t✘Q\b": [[
-                                                                                                                                                                                                                                    "籛&ଃ䩹.ꃩ㦔\\C颫#暪&!勹ꇶ놽攺J堬镙~軌C'꾖䣹㮅岃ᙴ鵣",
-                                                                                                                                                                                                                                    4.317829988264744E15,
-                                                                                                                                                                                                                                    6.013585322002147E-20,
-                                                                                                                                                                                                                                    false,
-                                                                                                                                                                                                                                    true,
-                                                                                                                                                                                                                                    null,
-                                                                                                                                                                                                                                    null,
-                                                                                                                                                                                                                                    -3.084633632357326E-20,
-                                                                                                                                                                                                                                    false,
-                                                                                                                                                                                                                                    null,
-                                                                                                                                                                                                                                    {
-                                                                                                                                                                                                                                     "\"짫愔昻  X\"藣j\"\"먁ཅѻ㘤㬯0晲DU꟒㸃d벀윒l䦾c੻*3": null,
-                                                                                                                                                                                                                                     "谈Wm陧阦咟ฯ歖擓N喴㋐銭rCCnVࢥ^♼Ⅾ젲씗刊S༝+_t赔\\b䚍뉨ꬫ6펛cL䊘᜼<\/澤pF懽&H": [
-                                                                                                                                                                                                                                      null,
-                                                                                                                                                                                                                                      {
-                                                                                                                                                                                                                                       "W\"HDUuΌ퀟M'P4࿰H똆ⰱﮯ<\/凐蘲\"C鴫ﭒж}ꭩ쥾t5yd诪ﮡ퍉ⴰ@?氐醳rj4I6Qt": 6.9090159359219891E17,
-                                                                                                                                                                                                                                       "絛ﳛ⺂": {"諰P㗮聦`ZQ?ꫦh*റcb⧱}埌茥h{棩렛툽o3钛5鮁l7Q榛6_g)ὄ\u0013kj뤬^爖eO4Ⱈ槞鉨ͺ订%qX0T썗嫷$?\\\"봅늆'%": [
-                                                                                                                                                                                                                                        -2.348150870600346E-19,
-                                                                                                                                                                                                                                        [[
-                                                                                                                                                                                                                                         true,
-                                                                                                                                                                                                                                         -6619392047819511778,
-                                                                                                                                                                                                                                         false,
-                                                                                                                                                                                                                                         [[
-                                                                                                                                                                                                                                          -1.2929189982356161E-20,
-                                                                                                                                                                                                                                          1.7417192219309838E-19,
-                                                                                                                                                                                                                                          {"?嵲2࿐2\u0001啑㷳c縯": [
-                                                                                                                                                                                                                                           null,
-                                                                                                                                                                                                                                           [
-                                                                                                                                                                                                                                            false,
-                                                                                                                                                                                                                                            true,
-                                                                                                                                                                                                                                            2578060295690793218,
-                                                                                                                                                                                                                                            {
-                                                                                                                                                                                                                                             "?\"殃呎#㑑F": true,
-                                                                                                                                                                                                                                             "}F炊_殛oU헢兔Ꝉ,赭9703.B数gTz3⏬": {
-                                                                                                                                                                                                                                              "5&t3,햓Mݸᵣ㴵;꣫䩍↳#@뫷䠅+W-ࣇzᓃ鿕ಔ梭?T䮑ꥬ旴]u뫵막bB讍:왳둛lEh=숾鱠p咐$짏#?g⹷ᗊv㷵.斈u頻\u0018-G.": "뽙m-ouࣤ஫牷\"`Ksꕞ筼3HlȨvC堈\"I]㖡玎r먞#'W賜鴇k'c룼髋䆿飉㗆xg巤9;芔cጐ/ax䊨♢큓r吓㸫೼䢗da᩾\"]屣`",
-                                                                                                                                                                                                                                              ":M딪<䢥喠\u0013㖅x9蕐㑂XO]ｆ*Q呰瞊吭VP@9,㨣 D\\穎vˤƩs㜂-曱唅L걬/롬j㈹EB8g<\/섩o渀\"u0y&룣": ">氍緩L/䕑돯Ꟙ蕞^aB뒣+0jK⪄瑨痜LXK^힦1qK{淚t츔X:Vm{2r獁B뾄H첚7氥?쉟䨗ꠂv팳圎踁齀\\",
-                                                                                                                                                                                                                                              "D彤5㢷Gꪻ[lㄆ@὜⓰絳[ଃ獽쮹☒[*0ꑚ㜳": 9022717159376231865,
-                                                                                                                                                                                                                                              "ҖaV銣tW+$魿\u20c3亜~뫡ᙰ禿쨽㏡fṼzE/h": "5臐㋇Ჯ쮺? 昨탰Wﾑ밎#'\"崲钅U?幫뺀⍾@4kh>騧\\0ҾEV=爐͌U捀%ꉼ 㮋<{j]{R>:gԩL\u001c瀈锌ﯲﳡꚒ'⫿E4暍㌗뵉X\"H᝜",
-                                                                                                                                                                                                                                              "ᱚגּ;s醒}犍SἿ㦣&{T$jkB\\\tḮ앾䤹o<避(tW": "vb⯽䴪䮢@|)",
-                                                                                                                                                                                                                                              "⥒퐁껉%惀뗌+녣迺顀q條g⚯i⤭룐M琹j̈́⽜A": -8385214638503106917,
-                                                                                                                                                                                                                                              "逨ꊶZ<\/W⫟솪㎮ᘇb?ꠔi\"H㧺x෷韒Xꫨฟ|]窽\u001a熑}Agn?Mᶖa<rఄ4Ů䢤슲Axģe곖㴤x竾郍B謉鸵k薽M)\"芣眜`菉ꉛ䴺": "鹏^ె캫?3耲]|Ü1䡒㝮]8e?䶍^",
-                                                                                                                                                                                                                                              "뿸樅#P㡊1M룮Uꪭ绢ꑮZ9꽸": {"\nJ^є|3袄ㅐ7⨆銦y睝⋷仴ct?[,<\/ㅬ`?갔髞%揁A೚C": {
-                                                                                                                                                                                                                                               " 䇞3갫䅪": [{
-                                                                                                                                                                                                                                                "0|⩁㑂砕ㅻ": null,
-                                                                                                                                                                                                                                                "D箳᠉`|=⼭)\"*࣊㦏LjO誋": "",
-                                                                                                                                                                                                                                                "ࠚDZmꗥ}ᷴ╈r7헴ȥ4Kp5a)o}鎘门L搰䆓'✎k俎c#T68ӏ⩶6L鎴<r൦$黊BQY㼳\\跿F慮⡨拵贀!甶V喅/": null,
-                                                                                                                                                                                                                                                "ⵣq⳹ﻨLk]晩1*y\\$%}䖶P煑㇆䈦E嫁櫕Y࣓嫨䓏OL낮梚㸇洛洚BYtgl∛S☕䉓宑⋢粚ꔯ꠼붠": ")ꬑ윤`\"Ⱓ<\/婽*Y䔸ᓰ_ﳍt슲坩隥&S糧䛮闵诌豐sh쯽邴*섴؏͎=㯨\"RVힳ,^t\"ac?䤒ꉀxHa=Uꛕ㐙TkF껾",
-                                                                                                                                                                                                                                                "弾cUAF?暤c덽.欀nK앭]r傊䀓ﯳ馽垃[䥛oI0N砊鈥헅Co쟋钄ㅷ㊌뷚7": [
-                                                                                                                                                                                                                                                 null,
-                                                                                                                                                                                                                                                 "૓鏨?^䆏{\u0006`X䧵儱&롡尙砡\u0006뻝쑬sj▻XfᬶgcㄢV >9韲4$3Ỵ^=쏍煤ፐ돷2䣃%鷠/eQ9頸쥎",
-                                                                                                                                                                                                                                                 2398360204813891033,
-                                                                                                                                                                                                                                                 false,
-                                                                                                                                                                                                                                                 3.2658897259932633E-19,
-                                                                                                                                                                                                                                                 null,
-                                                                                                                                                                                                                                                 "?ꚃ8Nn㞷幵d䲳䱲뀙ꪛQ瑓鎴]䩋-鰾捡䳡??掊",
-                                                                                                                                                                                                                                                 false,
-                                                                                                                                                                                                                                                 -1309779089385483661,
-                                                                                                                                                                                                                                                 "ᦲxu_/yecR.6芏.ᜇ過 ~",
-                                                                                                                                                                                                                                                 -5658779764160586501,
-                                                                                                                                                                                                                                                 "쒌:曠=l썜䢜wk#s蕚\"互㮉m䉤~0듐䋙#G;h숄옥顇෤勹(C7㢅雚㐯L⠅VV簅<",
-                                                                                                                                                                                                                                                 null,
-                                                                                                                                                                                                                                                 -4.664877097240962E18,
-                                                                                                                                                                                                                                                 -4.1931322262828017E18,
-                                                                                                                                                                                                                                                 {
-                                                                                                                                                                                                                                                  ",": {
-                                                                                                                                                                                                                                                   "v㮟麑䄠뤵g{M띮.\u001bzt뢜뵡0Ǥ龍떟Ᾰ怷ϓRT@Lꀌ樂U㏠⾕e扉|bJg(뵒㠶唺~ꂿ(땉x⻫싉쁊;%0鎻V(o\f,N鏊%nk郼螺": -1.73631993428376141E18,
-                                                                                                                                                                                                                                                   "쟧摑繮Q@Rᕾ㭚㾣4隅待㓎3蒟": [
-                                                                                                                                                                                                                                                    4971487283312058201,
-                                                                                                                                                                                                                                                    8973067552274458613,
-                                                                                                                                                                                                                                                    {
-                                                                                                                                                                                                                                                     "`a揙ᣗ\u0015i<S幼訃锭B0&槩✨[Wp皩[g≊k葾x2ᡆ橲䲢W": true,
-                                                                                                                                                                                                                                                     "kH皈Sꁱq傑u?솹풑~o^F=劣N*reJ沤wW苯7p㼹䎐a=ꮧL㷩냴nWꌑ㞱uu谁lVN珿᤻(e豶5#L쪉ᅄ઄\u0015숟봊P瀚X蓎": false,
-                                                                                                                                                                                                                                                     "䫯דּ〖Sc䛭점L뵾pCꙞ\"엇즓_ﰛ톣ꫀ먩㺣㮠⭴!\\W┏t䖰軅y\u0014~ᇰ렢E7*俜䥪W䀩䷐h봆vjஉ묣༏G39.뼳輼:㮿ᐦA饕TUL}~": [
-                                                                                                                                                                                                                                                      null,
-                                                                                                                                                                                                                                                      8.8648298810470003E17,
-                                                                                                                                                                                                                                                      5.735561205600924E-20,
-                                                                                                                                                                                                                                                      null,
-                                                                                                                                                                                                                                                      -102555823658171644,
-                                                                                                                                                                                                                                                      1.2674932032973067E-19,
-                                                                                                                                                                                                                                                      {
-                                                                                                                                                                                                                                                       "D胣O㯨\u0017Ku눓㒏텁nᨊ!Ꚇ廫_>Bo¸": 4.3236479112537999E18,
-                                                                                                                                                                                                                                                       "HW&퉡ぁ圍<W)6悰ꠑHEp14xy峑ft\u0005s亘V튉䢮ꦈX嵐꬝?lI_덝춇-6Ss噺Nk-ﮥ큃܁郪*PR(S6╋@仙V懸뺵ﯜV粹": "9䗌斀4㐈^Qs隄硏j\u0003",
-                                                                                                                                                                                                                                                       "Vk鶅C泹筁HX훉朗*r\\z顊誌儖4?n7᏾6몋䎡ﳈ],H頢p蚐㑄P4满E䏩V䬕ญL廂쒬쑨ꆷh迡ꍰ譖墎 ]鹿ฌ7ﶽ冭༽<ꈓS\\l䋮?_ﾕ檒?": -8598528325153980065,
-                                                                                                                                                                                                                                                       "t=q퍣疻тZ\\錅J.镎|nfḷ鴒1厰L灯纜E]୦⥪]Ꮾ'羝p/咩0닳ﳁqﳖཽk ?X1Ft%ś뭢v鋋⺃爵⒗": [[
-                                                                                                                                                                                                                                                        5.0824756359232045E-19,
-                                                                                                                                                                                                                                                        [
-                                                                                                                                                                                                                                                         7.268480839079619E-19,
-                                                                                                                                                                                                                                                         {"탿^굞⧕iј덊ꀛw껩6ꟳXs酚\\>Y?瑡Qy훍q!帰敏s舠㫸zꚗaS歲v`G株巷Jp6킼 (귶鍔⾏⡈>M汐㞍ቴ꙲dv@i㳓ᇆ?黍": [
-                                                                                                                                                                                                                                                          null,
-                                                                                                                                                                                                                                                          4997607199327183467,
-                                                                                                                                                                                                                                                          "E㻎蠫ᐾ高䙟蘬洼旾﫠텛㇛?'M$㣒蔸=A_亀绉앭rN帮",
-                                                                                                                                                                                                                                                          null,
-                                                                                                                                                                                                                                                          [{
-                                                                                                                                                                                                                                                           "Eᑞ)8<Z㡿W镀䛒C생V?0ꯦ+tL)`齳AjB姀XೳD빠㻲ƙgn9⑰ྍ῜&\"㚹>餧A5u&㗾q?": [
-                                                                                                                                                                                                                                                            -1.969987519306507E-19,
-                                                                                                                                                                                                                                                            null,
-                                                                                                                                                                                                                                                            [
-                                                                                                                                                                                                                                                             3.42437673373841E-20,
-                                                                                                                                                                                                                                                             true,
-                                                                                                                                                                                                                                                             "e걷M墁\"割P␛퍧厀R䱜3ﻴO퓫r﹉⹊",
-                                                                                                                                                                                                                                                             [
-                                                                                                                                                                                                                                                              -8164221302779285367,
-                                                                                                                                                                                                                                                              [
-                                                                                                                                                                                                                                                               true,
-                                                                                                                                                                                                                                                               null,
-                                                                                                                                                                                                                                                               "爘y^-?蘞Ⲽꪓa␅ꍨ}I",
-                                                                                                                                                                                                                                                               1.4645984996724427E-19,
-                                                                                                                                                                                                                                                               [{
-                                                                                                                                                                                                                                                                "tY좗⧑mrzﺝ㿥ⴖ᥷j諅\u0000q賋譁Ꞅ⮱S\nࡣB/큃굪3Zɑ复o<\/;롋": null,
-                                                                                                                                                                                                                                                                "彟h浠_|V4䦭Dᙣ♞u쿻=삮㍦\u001e哀鬌": [{"6횣楠,qʎꗇ鎆빙]㱭R굋鈌%栲j分僅ペ䇰w폦p蛃N溈ꡐꏀ?@(GI뉬$ﮄ9誁ꓚ2e甸ڋ[䁺,\u0011\u001cࢃ=\\+衪䷨ᯕ鬸K": [[
-                                                                                                                                                                                                                                                                 "ㅩ拏鈩勥\u000etgWVXs陂規p狵w퓼{뮵_i\u0002ퟑႢ⬐d6鋫F~챿搟\u0096䚼1ۼ칥0꣯儏=鋷牋ⅈꍞ龐",
-                                                                                                                                                                                                                                                                 -7283717290969427831,
-                                                                                                                                                                                                                                                                 true,
-                                                                                                                                                                                                                                                                 [
-                                                                                                                                                                                                                                                                  4911644391234541055,
-                                                                                                                                                                                                                                                                  {
-                                                                                                                                                                                                                                                                   "I鈒첽P릜朸W徨觘-Hᎄ퐟⓺>8kr1{겵䍃〛ᬡ̨O귑o䝕'쿡鉕p5": "fv粖RN瞖蛐a?q꤄\u001d⸥}'ꣴ犿ꦼ?뤋?鵆쥴덋䡫s矷̄?ඣ/;괱絢oWfV<\/\u202cC,㖦0䑾%n賹g&T;|lj_欂N4w",
-                                                                                                                                                                                                                                                                   "짨䠗;䌕u i+r๏0": [{"9䥁\\఩8\"馇z䇔<\/ႡY3e狚쐡\"ุ6ﰆZ遖c\"Ll:ꮾ疣<\/᭙Ｏ◌납୕湞9⡳Und㫜\u0018^4pj1;䧐儂䗷ୗ>@e톬": {
-                                                                                                                                                                                                                                                                    "a⑂F鋻Q螰'<퇽Q贝瀧{ᘪ,cP&~䮃Z?gＩ彃": [
-                                                                                                                                                                                                                                                                     -1.69158726118025933E18,
-                                                                                                                                                                                                                                                                     [
-                                                                                                                                                                                                                                                                      "궂z簽㔛㮨瘥⤜䛖Gℤ逆Y⪾j08Sn昞ꘔ캻禀鴚P謦b{ꓮmN靐Mᥙ5\"睏2냑I\u0011.L&=?6ᄠ뻷X鸌t刑\"#z)o꫚n쳟줋",
-                                                                                                                                                                                                                                                                      null,
-                                                                                                                                                                                                                                                                      7517598198523963704,
-                                                                                                                                                                                                                                                                      "ኑQp襟`uᩄr方]*F48ꔵn俺ሙ9뇒",
-                                                                                                                                                                                                                                                                      null,
-                                                                                                                                                                                                                                                                      null,
-                                                                                                                                                                                                                                                                      6645782462773449868,
-                                                                                                                                                                                                                                                                      1219168146640438184,
-                                                                                                                                                                                                                                                                      null,
-                                                                                                                                                                                                                                                                      {
-                                                                                                                                                                                                                                                                       ")ယ넌竀Sd䰾zq⫣⏌ʥ\u0010ΐ' |磪&p牢蔑mV蘸૰짬꺵;K": [
-                                                                                                                                                                                                                                                                        -7.539062290108008E-20,
-                                                                                                                                                                                                                                                                        [
-                                                                                                                                                                                                                                                                         true,
-                                                                                                                                                                                                                                                                         false,
-                                                                                                                                                                                                                                                                         null,
-                                                                                                                                                                                                                                                                         true,
-                                                                                                                                                                                                                                                                         6574577753576444630,
-                                                                                                                                                                                                                                                                         [[
-                                                                                                                                                                                                                                                                          1.2760162530699766E-19,
-                                                                                                                                                                                                                                                                          [
-                                                                                                                                                                                                                                                                           null,
-                                                                                                                                                                                                                                                                           [
-                                                                                                                                                                                                                                                                            "顊\\憎zXB,",
-                                                                                                                                                                                                                                                                            [{
-                                                                                                                                                                                                                                                                             "㇆{CVC9－MN㜋ઘR눽#{h@ퟨ!鼚׼XOvXS\u0017ᝣ=cS+梽៲綆16s덽휐y屬?ᇳG2ᴭ\u00054쫖y룇nKcW̭炦s/鰘ᬽ?J|퓀髣n勌\u0010홠P>j": false,
-                                                                                                                                                                                                                                                                             "箴": [
-                                                                                                                                                                                                                                                                              false,
-                                                                                                                                                                                                                                                                              "鍞j\"ꮾ*엇칬瘫xṬ⭽쩁䃳\"-⋵?ᦽ<cਔ↎⩧%鱩涎삧u9K⦈\"῝ᬑV绩킯愌ṱv@GꝾ跶Ꚇ(?䖃vI᧊xV\r哦j㠒?*=S굤紴ꊀ鹭쬈s<DrIu솹꧑?",
-                                                                                                                                                                                                                                                                              {
-                                                                                                                                                                                                                                                                               ".}S㸼L?t\u000fK⑤s~hU鱜꘦}쪍C滈4ꓗ蛌):ྦ\"顥이⢷ῳYLn\"?fꘌ>댎Ĝ": true,
-                                                                                                                                                                                                                                                                               "Pg帯佃籛n㔠⭹࠳뷏≻࿟3㞱!-쒾!}쭪䃕!籿n涻J5ਲ਼yvy;Rኂ%ᔡጀ裃;M⣼)쵂쑈": 1.80447711803435366E18,
-                                                                                                                                                                                                                                                                               "ꈑC⡂ᑆ㤉壂뎃Xub<\/쀆༈憓ق쨐ק\\": [
-                                                                                                                                                                                                                                                                                7706977185172797197,
-                                                                                                                                                                                                                                                                                {"": {"K╥踮砆NWࡆFy韣7ä밥{|紒︧䃀榫rᩛꦡTSy잺iH8}ퟴ,M?Ʂ勺ᴹ@T@~꾂=I㙕뾰_涀쑜嫴曣8IY?ҿo줫fऒ}\\S\"ᦨ뵼#nDX": {
-                                                                                                                                                                                                                                                                                 "♘k6?଱癫d68?㽚乳䬳-V顷\u0005蝕?\u0018䞊V{邾zじl]雏k臤~ൖH뒐iꢥ]g?.G碄懺䔛p<q꜉S岗_.%": 7688630934772863849,
-                                                                                                                                                                                                                                                                                 "溗摽嗙O㧀,⡢⼰呠ꅧ㓲/葇䢛icc@-r\b渂ꌳ뻨饑觝ᖜ\\鮭\u0014엙㥀᧺@浹W2꛵{W률G溮킀轡䬆g㨑'Q聨៪网Hd\"Q늴ᱢﶨ邮昕纚枑?▰hr羌驀[痹<\/": [
-                                                                                                                                                                                                                                                                                  -1.0189902027934687E-19,
-                                                                                                                                                                                                                                                                                  {"窶椸릎뚻shE\"ꪗႥꎳU矖佟{SJ": [{"-慜x櫹XY-澐ܨ⣷ઢ鯙%Fu\u0000迋▒}᥷L嗭臖oញc넨\u0016/迎1b꯸g뢱㐧蓤䒏8C散삭|\"컪輩鹩\"\\g$zG䥽긷?狸꿭扵㲐:URON&oU8": [
-                                                                                                                                                                                                                                                                                   null,
-                                                                                                                                                                                                                                                                                   true,
-                                                                                                                                                                                                                                                                                   null,
-                                                                                                                                                                                                                                                                                   -2.8907335031148883E17,
-                                                                                                                                                                                                                                                                                   -3864019407187144121,
-                                                                                                                                                                                                                                                                                   {
-                                                                                                                                                                                                                                                                                    "`빬d⵺4H뜳⧈쓑ohஸ*㶐ﻇ⸕䠵!i䝬﹑h夘▥ꗐ푹갇㵳TA鳠嚵\\B<X}3訒c⋝{*﫢w]璨-g捭\\j໵侠Ei层\u0011": 3.758356090089446E-19,
-                                                                                                                                                                                                                                                                                    "䄘ﮐ)Y놞씃㾱陰큁:{\u2059/S⓴": [[
-                                                                                                                                                                                                                                                                                     null,
-                                                                                                                                                                                                                                                                                     [[
-                                                                                                                                                                                                                                                                                      -3.8256602120220546E-20,
-                                                                                                                                                                                                                                                                                      null,
-                                                                                                                                                                                                                                                                                      7202317607724472882,
-                                                                                                                                                                                                                                                                                      "CWQ뚿",
-                                                                                                                                                                                                                                                                                      null,
-                                                                                                                                                                                                                                                                                      false,
-                                                                                                                                                                                                                                                                                      true,
-                                                                                                                                                                                                                                                                                      null,
-                                                                                                                                                                                                                                                                                      2857038485417498625,
-                                                                                                                                                                                                                                                                                      6.191302233218633E-20,
-                                                                                                                                                                                                                                                                                      null,
-                                                                                                                                                                                                                                                                                      -6795250594296208046,
-                                                                                                                                                                                                                                                                                      [
-                                                                                                                                                                                                                                                                                       true,
-                                                                                                                                                                                                                                                                                       {
-                                                                                                                                                                                                                                                                                        "%ዧ遰Yᚯ⚀x莰愒Vᔈ턗BN洝ꤟA1⍌l콹풪H;OX๫륞쪐ᰚц@͎黾a邬<L厒Xb龃7f웨窂二;": [[
-                                                                                                                                                                                                                                                                                         null,
-                                                                                                                                                                                                                                                                                         "耲?䙧㘓F6Xs틭멢.v뚌?鄟恠▽'묺競?WvᆾCtxo?dZ;䨸疎",
-                                                                                                                                                                                                                                                                                         {
-                                                                                                                                                                                                                                                                                          "@hWꉁ&\"빜4礚UO~C;う殩_ꀥ蘁奢^챟k→ᡱKMⵉ<\/Jㅲ붉L͟Q": false,
-                                                                                                                                                                                                                                                                                          "tU뢂8龰I먽7,.Y搽Z툼=&⨥覽K乫햶㠸%#@Z끖愓^⍊⾂몒3E_噆J(廊ឭyd䞜鈬Ћ档'⣘I": {
-                                                                                                                                                                                                                                                                                           "tK*ꔵ銂u艗ԃ쿏∳ꄂ霫X3♢9y?=ⲭdЊb&xy}": [
-                                                                                                                                                                                                                                                                                            -4.097346784534325E-20,
-                                                                                                                                                                                                                                                                                            null,
-                                                                                                                                                                                                                                                                                            6016848468610144624,
-                                                                                                                                                                                                                                                                                            -8194387253692332861,
-                                                                                                                                                                                                                                                                                            null,
-                                                                                                                                                                                                                                                                                            {
-                                                                                                                                                                                                                                                                                             "(祬诀譕쯠娣c봝r?畄kT뼾⌘⎨?noV䏘쥝硎n?": [
-                                                                                                                                                                                                                                                                                              1.82679422844617293E18,
-                                                                                                                                                                                                                                                                                              [
-                                                                                                                                                                                                                                                                                               false,
-                                                                                                                                                                                                                                                                                               2.6849944122427694E18,
-                                                                                                                                                                                                                                                                                               true,
-                                                                                                                                                                                                                                                                                               [
-                                                                                                                                                                                                                                                                                                false,
-                                                                                                                                                                                                                                                                                                {
-                                                                                                                                                                                                                                                                                                 ";0z⭆;화$bਔ瀓\"衱^?잢ᢛ⣿~`ꕉ薸⌳໿湘腌'&:ryБꋥၼ꒥筙꬜긨?X": -3536753685245791530,
-                                                                                                                                                                                                                                                                                                 "c;Y7釚Uꃣ割J༨Y戣w}c峰뢨㽑㫈0N>R$䅒X觨l봜A刊8R梒',}u邩퉕?;91Ea䈈믁G⊶芔h袪&廣㺄j;㡏綽\u001bN頸쳘橆": -2272208444812560733,
-                                                                                                                                                                                                                                                                                                 "拑Wﵚj鵼駳Oࣿ)#㾅顂N傓纝y僱栜'Bꐍ-!KF*ꭇK￤?䈴^:啤wG逭w᧯": "xᣱmYe1ۏ@霄F$ě꧘푫O䤕퀐Pq52憬ꀜ兴㑗ᡚ?L鷝ퟐ뭐zJꑙ}╆ᅨJB]\"袌㺲u8䯆f",
-                                                                                                                                                                                                                                                                                                 "꿽၅㔂긱Ǧ?SI": -1669030251960539193,
-                                                                                                                                                                                                                                                                                                 "쇝ɨ`!葎>瞺瘡驷錶❤ﻮ酜=": -6961311505642101651,
-                                                                                                                                                                                                                                                                                                 "?f7♄꫄Jᡔ훮e읇퍾፣䭴KhखT;Qty}O\\|뫁IῒNe(5惁ꥶㆷY9ﮡ\\ oy⭖-䆩婁m#x봉>Y鈕E疣s驇↙ᙰm<": {"퉻:dꂁ&efￎ쫢[\"돈늖꺙|Ô剐1͖-K:ʚ᭕/;쏖㷛]I痐职4g<Oꗢ뫺N쯂륬J╆.`ᇵP轆&fd$?苅o궓vO侃沲⍩嚅沗 E%⿰얦wi\\*趫": [
-                                                                                                                                                                                                                                                                                                  3504362220185634767,
-                                                                                                                                                                                                                                                                                                  false,
-                                                                                                                                                                                                                                                                                                  "qzX朝qT3軞T垈ꮲQ览ᚻ⻑쎎b驌䵆ꬠ5Fୗ䲁缿ꝁ蒇潇Ltᆄ钯蜀W欥ሺ",
-                                                                                                                                                                                                                                                                                                  "볰ɐ霬)젝鶼kwoc엷荁r \u001d쒷⎹8{%澡K늒?iﺩd=&皼倚J9s@３偛twὡgj䁠흪5⭉⨺役&놎cﺉ㺡N5",
-                                                                                                                                                                                                                                                                                                  false,
-                                                                                                                                                                                                                                                                                                  null,
-                                                                                                                                                                                                                                                                                                  "D0st[ni锹r*0k6ꀎ덇UX2⽼৞䃚粭#)Z桷36P]<\/`",
-                                                                                                                                                                                                                                                                                                  4281410120849816730,
-                                                                                                                                                                                                                                                                                                  null,
-                                                                                                                                                                                                                                                                                                  -3256922126984394461,
-                                                                                                                                                                                                                                                                                                  1.16174580369801549E18,
-                                                                                                                                                                                                                                                                                                  {
-                                                                                                                                                                                                                                                                                                   " ᆼꤗ~*TN긂<㡴턱℃酰^蘒涯잰淭傛2rൡet쾣䐇m*㸏y\"\\糮᧺qv쌜镜T@yg1譬ﭧﳭ\f": null,
-                                                                                                                                                                                                                                                                                                   "圾ᨿ0xᮛ禵ਗ਼D-㟻ẵ錚e\"赜.˶m)鴑B(I$<\/轴퉯揷⋏⏺*)宓쓌?*橯Lx\\f쩂㞼⇸\"ﺧ軂遳V\\땒\"캘c:G": null,
-                                                                                                                                                                                                                                                                                                   "?﵁_곢翸폈8㿠h열Q2㭛}RY㯕ＹT놂⽻e^B<\/맫ﻇ繱\u0017Gц⟊ᢑﵩS:jt櫣嗒⟰W㴚搦ᅉe[w䋺?藂翙Ⲱ芮䍘╢囥lpdu7r볺I 近qFyᗊ": [
-                                                                                                                                                                                                                                                                                                    "$b脬aﾠ襬育Bگ嵺Pw+'M<\/כֿn䚚v螁bN⒂}褺%lቦ阤\"ꓺᏗM牏,۞Ҷ!矬?ke9銊X괦)䈽틁脽ṫ䈞ᴆ^=Yᗿ遛4I귺⋥%",
-                                                                                                                                                                                                                                                                                                    false,
-                                                                                                                                                                                                                                                                                                    2.9444482723232051E18,
-                                                                                                                                                                                                                                                                                                    2072621064799640026,
-                                                                                                                                                                                                                                                                                                    "/_뇴뫢j㍒=Nꡦ↍Ժ赒❬톥䨞珯su*媸瀳鷔抡o흺-៳辏勷f绔:䵢搢2",
-                                                                                                                                                                                                                                                                                                    false,
-                                                                                                                                                                                                                                                                                                    "쒜 E䌐/큁\u0018懺_<\\隺&{wF⤊谼(<죽遠8?@*rᶊGd뻻갇&Ⳇq᣿e࢔t_ꩄ梸O詬C᧧Kꩠ풤9눙醅됞}竸rw?滨ӽK⥿ཊG魲']`๖5㄰",
-                                                                                                                                                                                                                                                                                                    -2375253967958699084,
-                                                                                                                                                                                                                                                                                                    {"嗱⿲\"f億ᝬ": {"v?䚑킡`◤k3,骥曘뒤Oᒱ㲹^圮᠀YT껛&촮P:G/T⣝#튣k3炩蠏k@橈䏷S䧕,熜晬k1鮥玸먚7䤡f绝嗚샴ᥒ~0q拮垑a뻱LⰖ_": [{
-                                                                                                                                                                                                                                                                                                     ":p尢": -6.688985172863383E17,
-                                                                                                                                                                                                                                                                                                     "A0\u0001疠ﻵ爻鼀湶I~W^岀mZx#㍈7r拣$Ꜷ疕≛⦒痋盩Vꬷ᭝ΩQꍪ療鈑A(劽詗ꭅo-獶鑺\"Ⓠ@$j탥;": [
-                                                                                                                                                                                                                                                                                                      8565614620787930994,
-                                                                                                                                                                                                                                                                                                      [
-                                                                                                                                                                                                                                                                                                       "嶗PC?උQ㪣$&j幾㾷h慑 즊慧⪉霄M窊ꁷ'鮕)䊏铨m趦䗲(g罣ЮKVﯦ鏮5囗ﰼ鿦",
-                                                                                                                                                                                                                                                                                                       -7168038789747526632,
-                                                                                                                                                                                                                                                                                                       null,
-                                                                                                                                                                                                                                                                                                       -7.8069738975270288E16,
-                                                                                                                                                                                                                                                                                                       2.25819579241348352E17,
-                                                                                                                                                                                                                                                                                                       -6.5597416611655936E18,
-                                                                                                                                                                                                                                                                                                       {
-                                                                                                                                                                                                                                                                                                        "瘕멦핓+?ﾌZ귢z鍛V": {
-                                                                                                                                                                                                                                                                                                         "ᕾ": 1.7363275204701887E-19,
-                                                                                                                                                                                                                                                                                                         "㭌s뎹㳉": {"\u00187FI6Yf靺+UC쬸麁␲䂿긕R\\ᆮC?Φ耭\rOத际핅홦*베W㸫㯼᡹cㅜ|G㮗\u0013[o`?jHV앝?蒪꩚!퍫ᜦ㌇䚇鿘:@": [
-                                                                                                                                                                                                                                                                                                          "}푛Г콲<䟏C藐呈#2㓋#ྕ፟尿9q竓gI%랙mꍬoa睕贿J咿D_熏Zz皳験I豼B扳ḢQ≖㻹㱣D䝦練2'ᗍ㗣▌砲8罿%హF姦;0悇<\/\"p嚧",
-                                                                                                                                                                                                                                                                                                          -710184373154164247,
-                                                                                                                                                                                                                                                                                                          "Vo쫬⬾ꝫⴷŻ\u0004靎HBꅸ_aVBＨbN>Z4⍜kเꛘZ⥺\\Bʫᇩ鄨魢弞&幟ᓮ2̊盜",
-                                                                                                                                                                                                                                                                                                          -9006004849098116748,
-                                                                                                                                                                                                                                                                                                          -3118404930403695681,
-                                                                                                                                                                                                                                                                                                          {
-                                                                                                                                                                                                                                                                                                           "_彃Y艘-\"Xx㤩㳷瑃?%2䐡鵛o<A?\"顜ᘌΈ;ⷅC洺L蚴蚀voq:,Oo4쪂)": 5719065258177391842,
-                                                                                                                                                                                                                                                                                                           "l륪맽耞塻論倐E㗑/㲕QM辬I\"qi酨玑㖪5q]尾魨鲡ƞY}⮯蠇%衟Fsf윔䐚찤i腳": {"ꢪ'a䣊糈": {"밑/♋S8s㼴5瓹O{댞\"9XﰇlJ近8}q{긧ⓈI᱑꿋腸D瀬H\"ﺬ'3?}\u0014#?丙㑯ᥨ圦',g鑠(樴턇?": [
-                                                                                                                                                                                                                                                                                                            2.5879275511391145E18,
-                                                                                                                                                                                                                                                                                                            null,
-                                                                                                                                                                                                                                                                                                            [
-                                                                                                                                                                                                                                                                                                             "3㼮ꔌ1Gẃ2W龙j͊{1囐㦭9x宠㑝oR䐕犽",
-                                                                                                                                                                                                                                                                                                             1268729930083267852,
-                                                                                                                                                                                                                                                                                                             "땕軚⿦7C",
-                                                                                                                                                                                                                                                                                                             [
-                                                                                                                                                                                                                                                                                                              -3.757935946502082E18,
-                                                                                                                                                                                                                                                                                                              "\"赌'糬_2뭾᝝b",
-                                                                                                                                                                                                                                                                                                              {
-                                                                                                                                                                                                                                                                                                               "(a䕎ጽjҰD4.ᴡ66ԃ畮<\/l`k癸\\㇋ࣆ욯R㫜픉녬挛;ڴ맺`.;焓q淞뮕ٹ趴r蔞ꯔ䟩v粏u5<\/pZ埖Skrvj帛=\u0005aa": null,
-                                                                                                                                                                                                                                                                                                               "璄≩ v몛ᘮ%?:1頌챀H㷪뉮k滘e": [
-                                                                                                                                                                                                                                                                                                                "ꤾ{`c샬왌펡[俊络vmz㪀悫⸹ᷥ5o'㾵 L蹦qjYIYណԠW냁剫<\/W嗂0,}",
-                                                                                                                                                                                                                                                                                                                2.4817616702666762E18,
-                                                                                                                                                                                                                                                                                                                false,
-                                                                                                                                                                                                                                                                                                                null,
-                                                                                                                                                                                                                                                                                                                null,
-                                                                                                                                                                                                                                                                                                                -8.6036958071260979E17,
-                                                                                                                                                                                                                                                                                                                null,
-                                                                                                                                                                                                                                                                                                                -1.2744078022652468E-19,
-                                                                                                                                                                                                                                                                                                                -4.4752020268429594E17,
-                                                                                                                                                                                                                                                                                                                1.13672865156637872E17,
-                                                                                                                                                                                                                                                                                                                [
-                                                                                                                                                                                                                                                                                                                 false,
-                                                                                                                                                                                                                                                                                                                 false,
-                                                                                                                                                                                                                                                                                                                 null,
-                                                                                                                                                                                                                                                                                                                 -4.178004168554046E-20,
-                                                                                                                                                                                                                                                                                                                 true,
-                                                                                                                                                                                                                                                                                                                 2927542512798605527,
-                                                                                                                                                                                                                                                                                                                 {
-                                                                                                                                                                                                                                                                                                                  ".ꔓ뉤1䵬cHy汼䊆賓ᐇƩ|樷❇醎㬅4\u0003赵}#yD5膏晹뱓9ꖁ虛J㺕 t䊛膎ؤ": {
-                                                                                                                                                                                                                                                                                                                   "rVtᓸ5^`েN⹻Yv᥋lꌫt拘?<鮰넿ZC?㒽^": {"␪k_:>귵옔夘v*탋职&㳈챗|O钧": [
-                                                                                                                                                                                                                                                                                                                    false,
-                                                                                                                                                                                                                                                                                                                    "daꧺdᗹ羞쯧H㍤鄳頳<型孒ン냆㹀f4㹰\u000f|C*ሟ鰠(O<ꨭ峹ipຠ*y೧4VQ蔔hV淬{?ᵌEfrI_",
-                                                                                                                                                                                                                                                                                                                    "j;ꗣ밷邍副]ᗓ",
-                                                                                                                                                                                                                                                                                                                    -4299029053086432759,
-                                                                                                                                                                                                                                                                                                                    -5610837526958786727,
-                                                                                                                                                                                                                                                                                                                    [
-                                                                                                                                                                                                                                                                                                                     null,
-                                                                                                                                                                                                                                                                                                                     [
-                                                                                                                                                                                                                                                                                                                      -1.3958390678662759E-19,
-                                                                                                                                                                                                                                                                                                                      {
-                                                                                                                                                                                                                                                                                                                       "lh좈T_믝Y\"伨\u001cꔌG爔겕ꫳ晚踍⿻읐T䯎]~e#฽燇\"5hٔ嶰`泯r;ᗜ쮪Q):/t筑,榄&5懶뎫狝(": [{
-                                                                                                                                                                                                                                                                                                                        "2ፁⓛ]r3C攟וּ9賵s⛔6'ஂ|\"ⵈ鶆䐹禝3\"痰ࢤ霏䵩옆䌀?栕r7O簂Isd?K᫜`^讶}z8?z얰T:X倫⨎ꑹ": -6731128077618251511,
-                                                                                                                                                                                                                                                                                                                        "|︦僰~m漿햭\\Y1'Vvخ굇ቍ챢c趖": [null]
-                                                                                                                                                                                                                                                                                                                       }],
-                                                                                                                                                                                                                                                                                                                       "虌魿閆5⛔煊뎰㞤ᗴꥰF䮥蘦䂪樳-K᝷-(^\u20dd_": 2.11318679791770592E17
-                                                                                                                                                                                                                                                                                                                      }
-                                                                                                                                                                                                                                                                                                                     ]
-                                                                                                                                                                                                                                                                                                                    ]
-                                                                                                                                                                                                                                                                                                                   ]},
-                                                                                                                                                                                                                                                                                                                   "묗E䀳㧯᳀逞GMc\b墹㓄끖Ơ&U??펌鑍 媋k))ᄊ": null,
-                                                                                                                                                                                                                                                                                                                   "묥7콽벼諌J_DɯﮪM殴䣏,煚ྼ`Y:씧<\/⩫%yf䦀!1Ჶk춎Q米W∠WC跉鬽*ᛱi<?,l<崣炂骵*?8푐៣ⰵ憉⎑.,Nw罣q+ο컆弎": false
-                                                                                                                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                                                                                                                  "e[|଀+lꑸ㝈TT?뿿|ꫛ9`㱯䊸楋-곳賨?쳁k棽擋wQ餈⟐Nq[q霩䵀뷮锅ꚢ": 5753148631596678144,
-                                                                                                                                                                                                                                                                                                                  "sᓝ鴻߸d렶ὕ蜗ဟ툑!诉౿": false,
-                                                                                                                                                                                                                                                                                                                  "|4䕳鵻?䈔(]틍/Ui#湻{듲ーMዀt7潔泄Ch⸨}쏣`螧銚㋼壯kⰥQ戵峉갑x辙'첛": "jd䘯$䕌茷!auw眶ㅥ䁣ꆢ民i",
-                                                                                                                                                                                                                                                                                                                  "剖駰ꞫsM2]ᾴ2ࡷ祅拌Av狔꩛'ꓗ킧ꣁ0酜✘O'": false,
-                                                                                                                                                                                                                                                                                                                  "澩뢣ꀁeU~D\\ꮡ킠": "v^YC嚈ί\u0007죋h>㴕L꘻ꀏ쓪\"_g鿄'#t⽙?,Wg㥖|D鑆e⥏쪸僬h鯔咼ඡ;4TK聎졠嫞"
-                                                                                                                                                                                                                                                                                                                 }
-                                                                                                                                                                                                                                                                                                                ]
-                                                                                                                                                                                                                                                                                                               ]
-                                                                                                                                                                                                                                                                                                              }
-                                                                                                                                                                                                                                                                                                             ]
-                                                                                                                                                                                                                                                                                                            ]
-                                                                                                                                                                                                                                                                                                           ]}}
-                                                                                                                                                                                                                                                                                                          }
-                                                                                                                                                                                                                                                                                                         ]}
-                                                                                                                                                                                                                                                                                                        },
-                                                                                                                                                                                                                                                                                                        "뿋뀾淣截䔲踀&XJ펖꙯^Xb訅ꫥgᬐ>棟S\"혧騾밫겁7-": "擹8C憎W\"쵮yR뢩浗絆䠣簿9䏈引Wcy䤶孖ꯥ;퐌]輩䍐3@{叝 뽸0ᡈ쵡Ⲇ\u001dL匁꧐2F~ݕ㪂@W^靽L襒ᦘ~沦zZ棸!꒲栬R"
-                                                                                                                                                                                                                                                                                                       }
-                                                                                                                                                                                                                                                                                                      ]
-                                                                                                                                                                                                                                                                                                     ],
-                                                                                                                                                                                                                                                                                                     "Z:덃൛5Iz찇䅄駠㭧蓡K1": "e8᧤좱U%?ⵇ䯿鿝\u0013縮R∱骒EO\u000fg?幤@֗퉙vU`",
-                                                                                                                                                                                                                                                                                                     "䐃쪈埽້=Ij,쭗쓇చ": false
-                                                                                                                                                                                                                                                                                                    }]}}
-                                                                                                                                                                                                                                                                                                   ]
-                                                                                                                                                                                                                                                                                                  }
-                                                                                                                                                                                                                                                                                                 ]}
-                                                                                                                                                                                                                                                                                                }
-                                                                                                                                                                                                                                                                                               ]
-                                                                                                                                                                                                                                                                                              ]
-                                                                                                                                                                                                                                                                                             ],
-                                                                                                                                                                                                                                                                                             "咰긖VM]᝼6䓑쇎琺etDҌ?㞏ꩄ퇫밉gj8蠃\"⩐5䛹1ࣚ㵪": "ക蹊?⎲⧘⾚̀I#\"䈈⦞돷`wo窭戕෱휾䃼)앷嵃꾞稧,Ⴆ윧9S?೗EMk3Მ3+e{⹔Te驨7䵒?타Ulg悳o43"
-                                                                                                                                                                                                                                                                                            }
-                                                                                                                                                                                                                                                                                           ],
-                                                                                                                                                                                                                                                                                           "zQᤚ纂땺6#ٽ﹧v￿#ࠫ휊冟蹧텈ꃊʆ?&a䥯De潝|쿓pt瓞㭻啹^盚2Ꝋf醪,얏T窧\\Di䕎谄nn父ꋊE": -2914269627845628872,
-                                                                                                                                                                                                                                                                                           "䉩跐|㨻ᷢ㝉B{蓧瞸`I!℄욃힕#ೲᙾ竛ᔺCjk췒늕貭词\u0017署?W딚%(pꍁ⤼띳^=on뺲l䆼bzrﳨ[&j狸䠠=ᜑꦦ\u2061յnj=牲攑)M\\龏": false,
-                                                                                                                                                                                                                                                                                           "뎕y絬᫡⥮Ϙᯑ㌔/NF*˓.,QEzvK!Iwz?|쥾\"ꩻL꼗Bꔧ賴緜s뉣隤茛>ロ?(?^`>冺飒=噸泥⺭Ᲊ婓鎔븜z^坷裮êⓅ໗jM7ﶕ找\\O": 1.376745434746303E-19
-                                                                                                                                                                                                                                                                                          },
-                                                                                                                                                                                                                                                                                          "䐛r滖w㏤<k;l8ꡔጵ⮂ny辶⋃퍼僮z\"﮲X@t5෼暧퓞猋♅䦖QC鹮|픨( ,>,|Nዜ": false
-                                                                                                                                                                                                                                                                                         }
-                                                                                                                                                                                                                                                                                        ]],
-                                                                                                                                                                                                                                                                                        "@꿙?薕尬 gd晆(띄5躕ﻫS蔺4)떒錸瓍?~": 1665108992286702624,
-                                                                                                                                                                                                                                                                                        "w믍nᏠ=`঺ￆC>'從됐槷䤝眷螄㎻揰扰XￊC贽uჍ낟jKD03T!lDV쀉Ӊy뢖,袛!终캨G?鉮Q)⑗1쾅庅O4ꁉH7?d\u0010蠈줘월ސ粯Q!낇껉6텝|{": null,
-                                                                                                                                                                                                                                                                                        "~˷jg쿤촖쉯y": -5.5527605669177098E18,
-                                                                                                                                                                                                                                                                                        "펅Wᶺzꐆと푭e?4j仪열[D<鈑皶婆䵽ehS?袪;HꍨM뗎ば[(嗏M3q퍟g4y╸鰧茀[Bi盤~﫝唎鋆彺⦊q?B4쉓癚O洙킋툈䶯_?ퟲ": null
-                                                                                                                                                                                                                                                                                       }
-                                                                                                                                                                                                                                                                                      ]
-                                                                                                                                                                                                                                                                                     ]]
-                                                                                                                                                                                                                                                                                    ]],
-                                                                                                                                                                                                                                                                                    "꟱Ԕ㍤7曁聯ಃ錐V䷰?v㪃૦~K\"$%请|ꇹn\"k䫛㏨鲨\u2023䄢\u0004[<S8ᐬ뭩脥7U.m࿹:D葍┆2蘸^U'w1젅;䠆ꋪB껮>︊VJ?䶟ាꮈ䗱=깘U빩": -4863152493797013264
-                                                                                                                                                                                                                                                                                   }
-                                                                                                                                                                                                                                                                                  ]}]}
-                                                                                                                                                                                                                                                                                 ]
-                                                                                                                                                                                                                                                                                }}}
-                                                                                                                                                                                                                                                                               ],
-                                                                                                                                                                                                                                                                               "쏷쐲۹퉃~aE唙a챑,9㮹gLHd'䔏|킗㍞䎥&KZYT맵7䥺N<Hp4ꕭ⹠꽐c~皽z": "课|ᖾ䡁廋萄䐪W\u0016&Jn괝b~摓M>ⱳ同莞鿧w\\༌疣n/+ꎥU\"封랾○ퟙAJᭌ?9䛝$?驔9讐짘魡T֯c藳`虉C읇쐦T"
-                                                                                                                                                                                                                                                                              }
-                                                                                                                                                                                                                                                                             ],
-                                                                                                                                                                                                                                                                             "谶개gTR￐>ၵ͚dt晑䉇陏滺}9㉸P漄": -3350307268584339381
-                                                                                                                                                                                                                                                                            }]
-                                                                                                                                                                                                                                                                           ]
-                                                                                                                                                                                                                                                                          ]
-                                                                                                                                                                                                                                                                         ]]
-                                                                                                                                                                                                                                                                        ]
-                                                                                                                                                                                                                                                                       ],
-                                                                                                                                                                                                                                                                       "0y꟭馋X뱔瑇:䌚￐廿jg-懲鸭䷭垤㒬茭u賚찶ಽ+\\mT땱\u20821殑㐄J쩩䭛ꬿNS潔*d\\X,壠뒦e殟%LxG9:摸": 3737064585881894882,
-                                                                                                                                                                                                                                                                       "풵O^-⧧ⅶvѪ8廸鉵㈉ר↝Q㿴뺟EႳvNM:磇>w/៻唎뷭୥!냹D䯙i뵱貁C#⼉NH6`柴ʗ#\\!2䂗Ⱨf?諳.P덈-返I꘶6?8ꐘ": -8934657287877777844,
-                                                                                                                                                                                                                                                                       "溎-蘍寃i诖ര\"汵\"\ftl,?d⼡쾪⺋h匱[,෩I8MҧF{k瓿PA'橸ꩯ綷퉲翓": null
-                                                                                                                                                                                                                                                                      }
-                                                                                                                                                                                                                                                                     ]
-                                                                                                                                                                                                                                                                    ],
-                                                                                                                                                                                                                                                                    "ោ係؁<元": 1.7926963090826924E-18
-                                                                                                                                                                                                                                                                   }}]
-                                                                                                                                                                                                                                                                  }
-                                                                                                                                                                                                                                                                 ]
-                                                                                                                                                                                                                                                                ]]}]
-                                                                                                                                                                                                                                                               }]
-                                                                                                                                                                                                                                                              ]
-                                                                                                                                                                                                                                                             ]
-                                                                                                                                                                                                                                                            ]
-                                                                                                                                                                                                                                                           ],
-                                                                                                                                                                                                                                                           "ጩV<\"ڸsOᤘ": 2.0527167903723048E-19
-                                                                                                                                                                                                                                                          }]
-                                                                                                                                                                                                                                                         ]}
-                                                                                                                                                                                                                                                        ]
-                                                                                                                                                                                                                                                       ]],
-                                                                                                                                                                                                                                                       "∳㙰3젴p᧗䱙?`<U὇<\/意E[ᮚAj诂ᒽ阚uv徢ဎ떗尔Ᵹ훀쩑J䐴?⪏=륪ᆩ푰ஓ㐕?럽VK\"X?檨လ齿I/耉A(AWA~⏯稐蹫": false,
-                                                                                                                                                                                                                                                       "偒妝뾇}䀼链i⇃%⋜&璪Ix渥5涧qq棩ᥝ-⠫AA낇yY颕A*裦O|n?䭬혗F": null,
-                                                                                                                                                                                                                                                       "琭CL얭B혆Kॎ`鎃nrsZiժW砏)?p~K~A眱䲏QO妣\u001b\u001b]ᵆᆯ&㐋ᏹ豉뺘$ꭧ#j=C)祤⫢歑1o㒙諩": 7028426989382601021,
-                                                                                                                                                                                                                                                       "쳱冲&ဤ䌏앧h胺-齱H忱8왪RDKᅒ䬋ᔶS*J}ስ漵'㼹뮠9걢9p봋경ጕtởꚳT䶽瘙%춴`@nಆ4<d??#僜ᙤ钴=薔ꭂbLXNam蹈": "樭る蹿= Uurwkn뙧⌲%\"쑃牪\"cq윕o@",
-                                                                                                                                                                                                                                                       "溌[H]焎SLㅁ?뀼䫨災W": 1.1714289118497062E-19,
-                                                                                                                                                                                                                                                       "ﬢp븇剌燇kĔ尘㶿㴞睠꾘Ia;s❺^)$穮?sHᢥ폪l": null
-                                                                                                                                                                                                                                                      }
-                                                                                                                                                                                                                                                     ]
-                                                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                                                   ]
-                                                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                                                  "TKnzj5o<\/K㊗ꗣ藠⦪駇>yZA8Ez0,^ᙛ4_0븢\u001ft:~䎼s.bb룦明yNP8弆C偯;⪾짍'蕴뮛": -6976654157771105701,
-                                                                                                                                                                                                                                                  "큵ꦀ\\㇑:nv+뒤燻䀪ﴣ﷍9ᚈ኷K㚊誦撪䚛,ꮪxሲ쳊\u0005HSf?asg昱dqꬌVꙇ㼺'k*'㈈": -5.937042203633044E-20
-                                                                                                                                                                                                                                                 }
-                                                                                                                                                                                                                                                ]
-                                                                                                                                                                                                                                               }],
-                                                                                                                                                                                                                                               "?}\u20e0],s嶳菋@#2u쒴sQS䩗=ꥮ;烌,|ꘔ䘆": "ᅩ영N璠kZ먕眻?2ቲ芋眑D륟渂⸑ﴃIRE]啗`K'"
-                                                                                                                                                                                                                                              }},
-                                                                                                                                                                                                                                              "쨀jmV賂ﰊ姐䂦玞㬙ᏪM᪟Վ씜~`uOn*ॠ8\u000ef6??\\@/?9見d筜ﳋB|S䝬葫㽁o": true
-                                                                                                                                                                                                                                             },
-                                                                                                                                                                                                                                             "즛ꄤ酳艚␂㺘봿㎨iG৕ࡿ?1\"䘓您\u001fSኝ⺿溏zៀ뻤B\u0019?윐a䳵᭱䉺膷d:<\/": 3935553551038864272
-                                                                                                                                                                                                                                            }
-                                                                                                                                                                                                                                           ]
-                                                                                                                                                                                                                                          ]}
-                                                                                                                                                                                                                                         ]]
-                                                                                                                                                                                                                                        ]]
-                                                                                                                                                                                                                                       ]}
-                                                                                                                                                                                                                                      }
-                                                                                                                                                                                                                                     ]
-                                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                                   ]]}},
-                                                                                                                                                                                                                                   "᥺3h↛!ꋰy\"攜(ெl䪕oUkc1A㘞ᡲ촾ᣫ<\/䒌E㛝潨i{v?W౾H\\RჅpz蝬R脾;v:碽✘↯삞鷱o㸧瑠jcmK7㶧뾥찲n": true,
-                                                                                                                                                                                                                                   "ⶸ?x䊺⬝-䰅≁!e쩆2ꎿ准G踌XXᩯ1߁}0?.헀Z馟;稄\baDꟹ{-寪⚈ꉷ鮸_L7ƽᾚ<\u001bጨA䧆송뇵⨔\\礍뗔d设룱㶉cq{HyぱR㥽吢ſtp": -7985372423148569301,
-                                                                                                                                                                                                                                   "緫#콮IB6<\/=5Eh礹\t8럭@饹韠r㰛斣$甝LV췐a갵'请o0g:^": "䔨(.",
-                                                                                                                                                                                                                                   "띳℡圤pﾝ௄ĝ倧訜B쁟G䙔\"Sb⓮;$$▏S1J뢙SF|赡g*\"Vu䲌y": "䪈&틐),\\kT鬜1풥;뷴'Zေ䩹@J鞽NぼM?坥eWb6榀ƩZڮ淽⺞삳煳xჿ絯8eⶍ羷V}ჿ쎱䄫R뱃9Z>'\u20f1ⓕ䏜齮"
-                                                                                                                                                                                                                                  }
-                                                                                                                                                                                                                                 ]
-                                                                                                                                                                                                                                ]]]
-                                                                                                                                                                                                                               }}
-                                                                                                                                                                                                                              }
-                                                                                                                                                                                                                             ]
-                                                                                                                                                                                                                            ]},
-                                                                                                                                                                                                                            "펮b.h粔폯2npX詫g錰鷇㇒<쐙S値bBi@?镬矉`剔}c2壧ଭfhY깨R()痩⺃a\\⍔?M&ﯟ<劜꺄멊ᄟA\"_=": null
-                                                                                                                                                                                                                           },
-                                                                                                                                                                                                                           "~潹Rqn榢㆓aR鬨侅?䜑亡V_翅㭔(䓷w劸ၳDp䀅<\/ﰎ鶊m䵱팱긽ꆘ<tD쇋>긓准D3掱;o:_ќ)껚콥8곤d矦8nP倥ꃸI": null,
-                                                                                                                                                                                                                           "뾎/Q㣩㫸벯➡㠦◕挮a鶧⋓偼\u00001뱓fm覞n?㛅\"": 2.8515592202045408E17
-                                                                                                                                                                                                                          }],
-                                                                                                                                                                                                                          ",": -5426918750465854828,
-                                                                                                                                                                                                                          "2櫫@0柡g䢻/gꆑ6演&D稒肩Y?艘/놘p{f투`飷ᒉ챻돎<늛䘍ﴡ줰쫄": false,
-                                                                                                                                                                                                                          "8(鸑嵀⵹ퟡ<9㣎Tߗ┘d슒ل蘯&㠦뮮eࠍk砝g 엻": false,
-                                                                                                                                                                                                                          "d-\u208b?0ﳮ嵙'(J`蔿d^踅⤔榥\\J⵲v7": 6.8002426206715341E17,
-                                                                                                                                                                                                                          "ཎ耰큓ꐕ㱷\u0013y=詽I\"盈xm{0쾽倻䉚ષso#鰑/8㸴짯%ꀄ떸b츟*\\鲷礬ZQ兩?np㋄椂榨kc᡹醅3": false,
-                                                                                                                                                                                                                          "싊j20": false
-                                                                                                                                                                                                                         }]]
-                                                                                                                                                                                                                        ]],
-                                                                                                                                                                                                                        "俛\u0017n緽Tu뫉蜍鼟烬.ꭠIⰓ\"Ἀ᜾uC쎆J@古%ꛍm뻨ᾀ画蛐휃T:錖㑸ዚ9죡$": true
-                                                                                                                                                                                                                       }
-                                                                                                                                                                                                                      ]
-                                                                                                                                                                                                                     ],
-                                                                                                                                                                                                                     "㍵⇘ꦖ辈s}㱮慀밒s`\"㞟j:`i픻Z<C1衽$\"-饧?℃\u0010⼒{p飗%R\"䲔\")칀\\%": true,
-                                                                                                                                                                                                                     "苧.8\u00120ݬ仓": 6912164821255417986,
-                                                                                                                                                                                                                     "떎顣俁X;.#Q틝.笂'p쟨唒퐏랩냆¦aⱍ{谐.b我$蜑SH\u000f琾=䟼⣼奔ᜏ攕B&挰繗㝔ꅂ-Qv\\0䶝䚥ぺio［㑮-ᇼ䬰컪ṼiY){데\u0010q螰掻~\n輚x\u0014罺)軴": 3.024364150712629E-20
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                   ]
-                                                                                                                                                                                                                  ]
-                                                                                                                                                                                                                 ]
-                                                                                                                                                                                                                ]}
-                                                                                                                                                                                                               ]]
-                                                                                                                                                                                                              }
-                                                                                                                                                                                                             ]
-                                                                                                                                                                                                            ]]
-                                                                                                                                                                                                           ]
-                                                                                                                                                                                                          ]]]],
-                                                                                                                                                                                                          "\"凲o肉Iz絾豉J8?i~傠᫽䇂!WD溊J?ᡒvs菆嵹➒淴>섫^諎0Ok{켿歁෣胰a2﨤[탳뚬쎼嫭뉮m": 409440660915023105,
-                                                                                                                                                                                                          "w墄#*ᢄ峠밮jLa`ㆪ꺊漓Lで끎!Agk'ꁛ뢃㯐岬D#㒦": false,
-                                                                                                                                                                                                          "ଦPGI䕺L몥罭ꃑ궩﮶#⮈ᢓӢ䚬p7웼臧%~S菠␌힀6&t䳙y㪘냏\\*;鉏ￊ鿵'嗕pa\"oL쇿꬈Cg": "㶽1灸D⟸䴅ᆤ뉎﷛渤csx 䝔цꬃ锚捬?ຽ+x~꘩uI࡞\u0007栲5呚ẓem?袝\")=㥴䨃pac!/揎Y",
-                                                                                                                                                                                                          "ᷱo\\||뎂몷r篙|#X䦜I#딌媸픕叞RD斳X4t⯩夬=[뭲r=绥jh뷱츝⪘%]⚋܈㖴スH텹m(WO曝劉0~K3c柢Ր㏉着逳~": false,
-                                                                                                                                                                                                          "煽_qb[첑\\륌wE❽ZtCNﭝ+餌ᕜOꛭ": "{ﳾ쉌&s惧ᭁⵆ3䢫;䨞팑꒪흘褀࢖Q䠿V5뭀䎂澻%받u5텸oA⮥U㎦;B䳌wz䕙$ឿ\\௅婺돵⪾퐆\\`Kyौꋟ._\u0006L챯l뇠Hi䧈偒5",
-                                                                                                                                                                                                          "艊佁ࣃ롇䱠爬!*;⨣捎慓q靓|儑ᨋL+迥=6㒺딉6弄3辅J-㕎뛄듘SG㆛(\noAzQꝱ䰩X*ぢO퀌%펠낌mo틮a^<\/F&_눊ᾉ㨦ы4\"8H": 2974648459619059400,
-                                                                                                                                                                                                          "鬙@뎣䫳ၮ끡?){y?5K;TA*k溱䫜J汃ꂯ싔썍\u001dA}룖(<\/^,": false,
-                                                                                                                                                                                                          "몏@QꋦFꊩᒐ뎶lXl垨4^郣|ꮇ;䝴ᝓ}쵲z珖": null
-                                                                                                                                                                                                         }
-                                                                                                                                                                                                        ]]]],
-                                                                                                                                                                                                        ":_=닧弗D䙋暨鏛. 㱻붘䂍J儒&ZK/녩䪜r囁⽯D喠죥7⹌䪥c\u001a\u2076￞妈朹oLk菮F౟覛쐧㮏7T;}蛙2{9\"崓bB<\/⡷룀;즮鿹)丒툃୤뷠5W⊢嶜(fb뭳갣": "E{响1WM"
-                                                                                                                                                                                                       }},
-                                                                                                                                                                                                       "䘨tjJ驳豨?y輊M*᳑梵瞻઻ofQG瑮e": 2.222802939724948E-19,
-                                                                                                                                                                                                       "䮴=❑➶T෋w䞜\"垦ꃼUt\u001dx;B$뵣䙶E↌艣ᡥ!᧟;䱀[䔯k쬃`੍8饙른熏'2_'袻tGf蒭J땟as꯳╖&啒zWࡇᒫYSᏬ\u0014ℑ첥鈤|cG~Pᓮ\">\"": "ႆl\f7V儊㦬nHꄬꨧC{쐢~C⮃⛓嶦vꄎ1w鰠嘩뿠魄&\"_qMⵖ釔녮ꝇ 㝚{糍J哋 cv?-jkﻯྌ鹑L舟r",
-                                                                                                                                                                                                       "龧葆yB✱H盋夔ﶉ?n*0(": "ꧣኆ㢓氥qZZ酒ຜ)鮢樛)X䣆gTSґG텞k.J圬疝롫쯭z L：\\ྤ@w炋塜쿖ᾳy뢀䶃뱝N䥨㚔勇겁#p",
-                                                                                                                                                                                                       "도畎Q娡\"@S/뼋:䵏!P衅촚fVHQs✜ᐫi㻑殡B䜇%믚k*U#濨낄~": "ꍟዕ쳸ꍈ敋&l妏\u0005憡멗瘌uPgᅪm<\/To쯬锩h뒓k"
-                                                                                                                                                                                                      }
-                                                                                                                                                                                                     ]
-                                                                                                                                                                                                    }],
-                                                                                                                                                                                                    "墥홞r绚<\/⸹ⰃB}<躅\\Y;๑@䔸>韫䜲뱀X뗩鿥쩗SI%ﴞ㳕䛇?<\/\u00018x\\&侂9鋙a[LR㋭W胕)⡿8㞙0JF,}?허d1cDMᐃ␛鄝ⱕ%X)!XQ": "ⳍꗳ=橇a;3t⦾꼑仈ူaᚯ⯋ꕃAs鴷N⍕_䎃ꙎAz\u0016䯷\\<࿫>8q{}ｷ?ᣰ}'0ᴕ펓B┦lF#趤厃T?㕊#撹圂䆲"
-                                                                                                                                                                                                   },
-                                                                                                                                                                                                   "܋닐龫論c웑": false,
-                                                                                                                                                                                                   "ㇿ/q\"6-co髨휝C큦#\u001b4~?3䐹E삇<<": 7.600917488140322E-20,
-                                                                                                                                                                                                   "䁝E6?㣖ꃁ间t祗*鑠{ḣV(浾h逇큞=W?ૉ?nꇽ8ꅉຉj으쮺@Ꚅ㰤u]Oyr": "v≁᫸_*όAඤԆl)ۓᦇQ}폠z༏q滚",
-                                                                                                                                                                                                   "ｿ᥊/넺I": true
-                                                                                                                                                                                                  }]]
-                                                                                                                                                                                                 ]
-                                                                                                                                                                                                ]
-                                                                                                                                                                                               ]
-                                                                                                                                                                                              ]]
-                                                                                                                                                                                             },
-                                                                                                                                                                                             "䭑Ik攑\u0002QV烄:芩.麑㟴㘨≕": true,
-                                                                                                                                                                                             "坄꿕C쇻풉~崍%碼\\8\"䬦꣙": null,
-                                                                                                                                                                                             "欌L圬䅘Y8c(♺2?ON}o椳s宥2䉀eJ%闹r冁O^K諭%凞⺉⡻,掜?$ꥉ?略焕찳㯊艼誜4?\"﯎<゛XፈINT:詓 +": -1.0750456770694562E-19,
-                                                                                                                                                                                             "獒àc뜭싼ﺳ뎤K`]p隨LtE": null,
-                                                                                                                                                                                             "甙8䵊神EIꩤ鐯ᢀ,ﵮU䝑u疒ử驺䚿≚ഋ梶秓F`覤譐#짾蔀묊4<媍쬦靪_Yzgcࡶ4k紥`kc[Lﮗ簐*I瀑[⾰L殽鑥_mGȠ<\/|囹灠g桰iri": true,
-                                                                                                                                                                                             "챓ꖙꟻ좝菇ou,嗠0\\jK핻뜠qwQ?ഩ㼕3Y彦b\u009bJ榶N棨f?됦鏖綃6鳵M[OE봨u햏.Ꮁ癜蟳뽲ꩌ뻾rM豈R嗀羫 uDꎚ%": null
-                                                                                                                                                                                            },
-                                                                                                                                                                                            "V傜2<": 7175127699521359521
-                                                                                                                                                                                           }],
-                                                                                                                                                                                           "铫aG切<\/\"ী⊆e<^g࢛)D顝ｎאַ饼\u008c猪繩嵿ﱚCꡬ㻊g엺A엦\u000f暿_f꿤볝㦕桦`蒦䎔j甬%岝rj 糏": "䚢偎눴Au<4箞7礦Iﱔ坠eȧ䪸u䵁p|逹$嗫쨘ꖾ﷐!胠z寓팢^㨔|u8Nሇe텔ꅦ抷]،鹎㳁#༔繁 ",
-                                                                                                                                                                                           "낂乕ꃻ볨ϱ-ꇋ㖍fs⿫)zꜦ/K?솞♞ꑌ宭hJ᤭瑥Fu": false,
-                                                                                                                                                                                           "쟰ぜ魛G\u0003u?`㾕ℾ㣭5螠烶這趩ꖢ:@咕ꐶx뒘느m䰨b痃렐0鳊喵熬딃$摉_~7*ⱦ녯1錾GKhJ惎秴6'H妈Tᧅ窹㺒疄矤铟wላ": null,
-                                                                                                                                                                                           "쯆q4!3錕㲏ⵆ㇛꘷Z瑩뭆\\◪NH\u001d\\㽰U~㯶<\"쑣낞3ᵤ'峉eꢬ;鬹o꣒木X*長PXᘱu\"䠹n惞": null,
-                                                                                                                                                                                           "ᅸ祊\"&ꥴCjࢼ﴿?䡉`U效5殼㮞V昽ꏪ#ﺸ\\&t6x꠹盥꣰a[\u001aꪍSpe鎿蠹": -1.1564713893659811E-19
-                                                                                                                                                                                          }
-                                                                                                                                                                                         ]]
-                                                                                                                                                                                        ]
-                                                                                                                                                                                       ]
-                                                                                                                                                                                      ],
-                                                                                                                                                                                      "羵䥳H,6ⱎ겾|@t\"#햊1|稃 섭)띜=뻔ꡜ???櫎~*ῡ꫌/繣ﻠq": null
-                                                                                                                                                                                     }
-                                                                                                                                                                                    ]}
-                                                                                                                                                                                   ]},
-                                                                                                                                                                                   "츤": false
-                                                                                                                                                                                  }},
-                                                                                                                                                                                  "s": 3.7339341963399598E18
-                                                                                                                                                                                 }
-                                                                                                                                                                                ],
-                                                                                                                                                                                "N,I?1+㢓|ࣱ嶃쩥V2\u0012(4EE虪朶$|w颇v步": "~읢~_,Mzr㐫YB溓E淚\"ⅹ䈔ᏺ抙 b,nt5V㐒J檶ꏨ⻔?",
-                                                                                                                                                                                "Q껑ꡡ}$넎qH煔惍/ez^!ẳF댙䝌馻剁8": "梲;yt钰$i冄}AL%a j뜐奷걳뚾d꿽*ሬuDY3?뮟鼯뮟w㍪틱V",
-                                                                                                                                                                                "o{Q/K O胟㍏zUdꀐm&⨺J舕⾏魸訟㌥[T籨櫉唐킝 aṭ뱫촙莛>碶覆⧬짙쭰ׯdAiH໥벤퐥_恸[ 0e:죃TC弼荎뵁DA:w唵ꣁ": null,
-                                                                                                                                                                                "὏樎䵮軧|?౗aWH쩃1 ꅭsu": null
-                                                                                                                                                                               }
-                                                                                                                                                                              ]
-                                                                                                                                                                             },
-                                                                                                                                                                             "勂\\&m鰈J釮=Ⲽ鳋+䂡郑": null,
-                                                                                                                                                                             "殣b綊倶5㥗惢⳷萢ᑀ䬄镧M^ﱴ3⣢翣n櫻1㨵}ኯ뗙顖Z.Q➷ꮨ뗇\u0004": "ꔙ䁼>n^[GीA䨟AM琢ᒊS쨲w?d㶣젊嘶纝麓+愣a%気ྞSc됓ᔘ:8bM7Xd8㶑臌]Ꙥ0ꐭ쒙䫣挵C薽Dfⵃ떼᷸",
-                                                                                                                                                                             "?紡.셪_෨j\u0013Ox┠$Xᶨ-ᅇo薹-}軫;y毝㪜K㣁?.EV쮱4둽⛻䤜'2盡\u001f60(|e쐰㼎ᦀ㒧-$l@ﻑ坳\u0003䭱响巗WFo5c㧆T턁Y맸♤(": -2.50917882560589088E17
-                                                                                                                                                                            }}
-                                                                                                                                                                           ],
-                                                                                                                                                                           "侸\\릩.᳠뎠狣살cs项䭩畳H1s瀉븇19?.w骴崖㤊h痠볭㞳㞳䁮Ql怠㦵": "@䟴-=7f",
-                                                                                                                                                                           "鹟1x௢+d ;vi䭴FSDS\u0004hꎹ㚍?⒍⦏ў6u,扩@됷Su)Pag휛TᒗV痩!瞏釀ꖞ蘥&ೞ蘐ꭰꞇᝎ": "ah懱Ժ&\u20f7䵅♎඀䞧鿪굛ౕ湚粎蚵ᯋ幌YOE)५襦㊝Y*^\"R+ඈ咷蝶9ꥂ榨艦멎헦閝돶v좛咊E)K㓷ྭr",
-                                                                                                                                                                           "搆q쮦4綱켙셁.f4<\/g<籽늷?#蚴픘:fF\u00051㹉뀭.ᰖ풎f֦Hv蔎㧤.!䭽=鞽]음H:?\"-4": 8.740133984938656E-20
-                                                                                                                                                                          }]}
-                                                                                                                                                                         }
-                                                                                                                                                                        ],
-                                                                                                                                                                        "tVKn딩꘥⊾蹓᤹{\u0003lR꼽ᄲQFᅏ傅ﱋ猢⤊ᔁ,E㓒秤nTතv`♛I\u0000]꫔ṞD\"麵c踝杰X&濿또꣹깳౥葂鿎\\aꡨ?": 3900062609292104525
-                                                                                                                                                                       }
-                                                                                                                                                                      ],
-                                                                                                                                                                      "ਉ샒⊩Lu@S䧰^g": -1.1487677090371648E18,
-                                                                                                                                                                      "⎢k⑊꬗yᏫ7^err糎Dt\u000bJ礯확ㆍ沑ｻꋽe赔㝢^J\u0004笲㿋idra剰-᪉C錇/Ĝ䂾ညS지?~콮gR敉⬹'䧭": 1901472137232418266,
-                                                                                                                                                                      "灗k䶥:?촽贍쓉꓈㒸g獘[뵎\\胕?\u0014_榙p.j稶,$`糉妋0>Fᡰly㘽$?": "]ꙛO赎&#㠃돱剳\"<◆>0誉齐_|z|裵씪>ᐌ㼍\"Z[琕}O?G뚇諦cs⠜撺5cu痑U圲\u001c?鴴計l춥/╓哼䄗茏ꮅ뫈댽A돌롖뤫V窗讬sHd&\nOi;_u"
-                                                                                                                                                                     }
-                                                                                                                                                                    ],
-                                                                                                                                                                    "Uﺗ\\Y\\梷䄬~\u0002": null,
-                                                                                                                                                                    "k\"Y磓ᗔ휎@U冈<\/w컑)[": false,
-                                                                                                                                                                    "曏J蝷⌻덦\u001f㙳s꥓⍟邫P늮쥄c∬ྡྷ舆렮칤Z趣5콡넛A쳨\\뀙骫(棻.*&輛LiIfi{@EA婳KᬰTXT": -4.3088230431977587E17
-                                                                                                                                                                   }]}
-                                                                                                                                                                  ]
-                                                                                                                                                                 ],
-                                                                                                                                                                 "곃㲧<\/dఓꂟs其ࡧ&N葶=?c㠤Ჴ'횠숄臼#\u001a~": false
-                                                                                                                                                                }
-                                                                                                                                                               ]
-                                                                                                                                                              ]}]
-                                                                                                                                                             }]
-                                                                                                                                                            }}
-                                                                                                                                                           ],
-                                                                                                                                                           "2f`⽰E쵟>J笂裭!〛觬囀ۺ쟰#桊l鹛ⲋ|RA_Vx፭gE됓h﵀mfỐ|?juTU档[d⢼⺻p濚7E峿": 5613688852456817133
-                                                                                                                                                          },
-                                                                                                                                                          "濘끶g忮7㏵殬W팕Q曁 뫰)惃廊5%-蹚zYZ樭ﴷQ锘쯤崫gg": true,
-                                                                                                                                                          "絥ᇑ⦏쒓븣爚H.㗊߄o蘵貆ꂚ(쎔O᥉ﮓ]姨Wꁓ!RMA|o퉢THx轮7M껁U즨'i뾘舯o": "跥f꜃?"
-                                                                                                                                                         }}
-                                                                                                                                                        ],
-                                                                                                                                                        "鷰鹮K-9k;ﰰ?_ݦѷ-ꅣ䩨Zꥱ\"mꠟ屎/콑Y╘2&鸞脇㏢ꀇ࠺ⰼ拾喭틮L꽩bt俸墶 [l/웄\"꾦\u20d3iও-&+\u000fQ+໱뵞": -1.296494662286671E-19
-                                                                                                                                                       },
-                                                                                                                                                       "HX੹/⨇୕붷Uﮘ旧\\쾜͔3l鄈磣糂̖䟎Eᐳw橖b῀_딕hu葰窳闹вU颵|染H죶.fP䗮:j䫢\\b뎖i燕ꜚG⮠W-≚뉗l趕": "ଊ칭Oa᡺$IV㷧L\u0019脴셀붿餲햪$迳向쐯켂PqfT\" ?I屉鴼쿕@硙z^鏕㊵M}㚛T젣쓌-W⩐-g%⺵<뮱~빅╴瑿浂脬\u0005왦燲4Ⴭb|D堧 <\/oEQh",
-                                                                                                                                                       "䘶#㥘੐캔f巋ἡAJ䢚쭈ࣨ뫒*mᇊK，ࣺAꑱ\u000bR<\/A\"1a6鵌㯀bh곿w(\"$ꘁ*rಐ趣.d࿩k/抶면䒎9W⊃9": "漩b挋Sw藎\u0000",
-                                                                                                                                                       "畀e㨼mK꙼HglKb,\"'䤜": null
-                                                                                                                                                      }]}]
-                                                                                                                                                     ]
-                                                                                                                                                    ]
-                                                                                                                                                   }]
-                                                                                                                                                  ]}
-                                                                                                                                                 ]
-                                                                                                                                                ]}
-                                                                                                                                               ],
-                                                                                                                                               "歙>駿ꣂ숰Q`J΋方樛(d鱾뼣(뫖턭\u20f9lচ9歌8o]8윶l얶?镖G摄탗6폋폵+g:䱫홊<멀뀿/س|ꭺs걐跶稚W々c㫣⎖": "㣮蔊깚Cꓔ舊|XRf遻㆚︆'쾉췝\\&言",
-                                                                                                                                               "殭\"cށɨꝙ䞘:嬮e潽Y펪㳅/\"O@ࠗ겴]췖YǞ(t>R\"N?梳LD恭=n氯T豰2R諸#N}*灧4}㶊G䍣b얚": null,
-                                                                                                                                               "襞<\/啧 B|싞W瓇)6簭鼡艆lN쩝`|펭佡\\間邝[z릶&쭟愱ꅅ\\T᰽1鯯偐栈4̸s윜R7⒝/똽?치X": "⏊躖Cﱰ2Qẫ脐&இ?%냝悊",
-                                                                                                                                               ",鰧偵셣싹xᎹ힨᯳EṬH㹖9": -4604276727380542356
-                                                                                                                                              }
-                                                                                                                                             }
-                                                                                                                                            ]]]],
-                                                                                                                                            "웺㚑xs}q䭵䪠馯8?LB犯zK'os䚛HZ\"L?셎s^㿧㴘Cv2": null
-                                                                                                                                           }]
-                                                                                                                                          ]
-                                                                                                                                         ]
-                                                                                                                                        ],
-                                                                                                                                        "Kd2Kv+|z": 7367845130646124107,
-                                                                                                                                        "ᦂⶨ?ᝢ 祂些ഷ牢㋇操\"腭䙾㖪\\(y4cE뽺ㆷ쫺ᔖ%zfۻ$ў1柦,㶢9r漢": -3.133230960444846E-20,
-                                                                                                                                        "琘M焀q%㢟f鸯O⣏蓑맕鯊$O噷|)z褫^㢦⠮ꚯ꫞`毕1qꢚ{ĭ䎀বώT\"뱘3G൴?^^of": null
-                                                                                                                                       }
-                                                                                                                                      ],
-                                                                                                                                      "a8V᯺?:ﺃ/8ꉿBq|9啓댚;*i2": null,
-                                                                                                                                      "cpT瀇H珰Ừpೃi鎪Rr␣숬-鹸ҩ䠚z脚цGoN8入y%趌I┽2ឪЀiJNcN)槣/▟6S숆牟\"箑X僛G殱娇葱T%杻:J諹昰qV쨰": 8331037591040855245
-                                                                                                                                     }],
-                                                                                                                                     "G5ᩜ䄗巢껳": true
-                                                                                                                                    }
-                                                                                                                                   },
-                                                                                                                                   "Ồ巢ゕ@_譙A`碫鄐㡥砄㠓(^K": "?܃B혢▦@犑ὺD~T⧁|醁;o=J牌9냚⢽㨘{4觍蚔9#$∺\u0016p囅\\3Xk阖⪚\"UzA穕롬✎➁㭒춺C㣌ဉ\"2瓑员ᅽꝶ뫍}꽚ꞇ鶂舟彺]ꍽJC蝧銉",
-                                                                                                                                   "␆Ě膝\"b-퉐ACR言J謈53~V튥x䜢?ꃽɄY뮩ꚜ": "K/↾e萃}]Bs⾿q룅鷦-膋?m+死^魊镲6",
-                                                                                                                                   "粡霦c枋AHퟁo礼Ke?qWcA趸㡔ꂏ?\u000e춂8iতᦜ婪\u0015㢼nﵿꍻ!ᐴ関\u001d5j㨻gfῩUK5Ju丝tかTI'?㓏t>⼟o a>i}ᰗ;뤕ܝ": false,
-                                                                                                                                   "ꄮ匴껢ꂰ涽+䜨B蛹H䛓-k蕞fu7kL谖,'涃V~챳逋穞cT\"vQ쓕ObaCRQ㓡Ⲯ?轭⫦輢墳?vA餽=h䮇킵n폲퉅喙?\"'1疬V嬗Qd灗'Lự": "6v!s믁㭟㣯獃!磸餠ቂh0C뿯봗F鷭gꖶ~ｺkK<ᦈTt\\跓w㭣횋钘ᆹ듡䑚W䟾X'ꅔ4FL勉Vܴ邨y)2'〚쭉⽵-鞣E,Q.?块",
-                                                                                                                                   "?(˧쩯@崟吋歄K": null
-                                                                                                                                  },
-                                                                                                                                  "Gc럃녧>?2DYI鴿\\륨)澔0ᔬlx'觔7젘⤡縷螩%Sv׫묈/]↱&S h\u0006歋ᑛxi̘}ひY蔯_醨鯘煑橾8?䵎쨋z儬ꁏ*@츾:": null
-                                                                                                                                 }
-                                                                                                                                }
-                                                                                                                               }
-                                                                                                                              ]
-                                                                                                                             ]
-                                                                                                                            ]}
-                                                                                                                           },
-                                                                                                                           "HO츧G": 3.694949578823609E17,
-                                                                                                                           "QC\u0012(翻曇Tf㷟bGBJ옉53\\嚇ᛎD/\u001b夾၉4\"핀@祎)쫆yD\"i먎Vn㿿V1W᨝䶀": -6150931500380982286,
-                                                                                                                           "Z㓮P翸鍱鉼K䋞꘺튿⭁Y": -7704503411315138850,
-                                                                                                                           "]모开ꬖP븣c霤<[3aΠ\"黁䖖䰑뮋ꤦ秽∼㑷冹T+YUt\"싳F↭䖏&鋌": -2.7231911483181824E18,
-                                                                                                                           "tꎖ": -4.9517948741799555E-19,
-                                                                                                                           "䋘즊.⬅IꬃۣQ챢ꄑ黐|f?C⾺|兕읯sC鬸섾整腨솷V": "旆柩l<K髝M戶鯮t:wR2ꉱ`9'l픪*폍芦㊢Pjjo堡^  읇얛嶅있ষ0?F",
-                                                                                                                           "下9T挞\\$yᮇk쌋⼇,ਉ": true,
-                                                                                                                           "櫨:ㆣ,邍lr崕祜㐮烜Z,XXD蕼㉴ kM꯽?P0﹉릗": null,
-                                                                                                                           "gv솠歽閘4镳䗄2澾>쪦sᖸMy㦅울썉瘗㎜檵9ꍂ駓ૉᚿ/u3씅徐拉[Z䞸ࡗ1ꆱ&Ｑ풘?ǂ8\u0011BCDY2볨;鸏": null,
-                                                                                                                           "幫 n煥s쁇펇 왊-$C\"衝:\u0014㣯舼.3뙗Yl⋇\"K迎멎[꽵s}9鉳UK8쐥\"掄㹖h㙈!얄સ?Ꜳ봺R伕UTD媚Ｉ䜘W鏨蔮": -4.150842714188901E-17,
-                                                                                                                           "ﺯ^㄄\b죵@fྉkf颡팋Ꞧ{/Pm0V둳⻿/落韒ꊔᚬ@5螺G\\咸a谆⊪ቧ慷绖?财(鷇u錝F=r၍橢ឳn:^iᴵtD볠覅N赴": null
-                                                                                                                          }]
-                                                                                                                         }]
-                                                                                                                        }
-                                                                                                                       ]
-                                                                                                                      ]}
-                                                                                                                     ]},
-                                                                                                                     "謯?w厓奰T李헗聝ឍ貖o⪇弒L!캶$ᆅ": -4299324168507841322,
-                                                                                                                     "뺊奉_垐浸延몏孄Z舰2i$q붿좾껇d▵餏\"v暜Ҭ섁m￴g>": -1.60911932510533427E18
-                                                                                                                    }
-                                                                                                                   ]
-                                                                                                                  }
-                                                                                                                 ]
-                                                                                                                ]],
-                                                                                                                "퉝꺔㠦楶Pꅱ": 7517896876489142899,
-                                                                                                                "": false
-                                                                                                               }
-                                                                                                              ]},
-                                                                                                              "是u&I狻餼|谖j\"7c됮sסּ-踳鉷`䣷쉄_A艣鳞凃*m⯾☦椿q㎭N溔铉tlㆈ^": 1.93547720203604352E18,
-                                                                                                              "kⲨ\\%vr#\u000bⒺY\\t<\/3﬌R訤='﹠8蝤Ꞵ렴曔r": false
-                                                                                                             }
-                                                                                                            ]},
-                                                                                                            "阨{c?C\u001d~K?鎌Ԭ8烫#뙣P초遗t㭱E­돒䆺}甗[R*1!\\~h㕅᰺@<9JꏏષI䳖栭6綘걹ￌM\"▯是∔v鬽顭⋊譬": "운ﶁK敂(欖C취پ℄爦賾"
-                                                                                                           }
-                                                                                                          }}
-                                                                                                         }],
-                                                                                                         "鷨赼鸙+\\䭣t圙ڹx᜾ČN<\/踘\"S_맶a鷺漇T彚⎲i㈥LT-xA캔$\u001cUH=a0츺l릦": "溣㣂0濕=鉵氬駘>Pꌢpb솇쬤h힊줎獪㪬CrQ矠a&脍꼬爼M茴/΅\u0017弝轼y#Ꞡc6둴=?R崏뷠麖w?"
-                                                                                                        },
-                                                                                                        "閕ᘜ]CT)䵞l9z'xZF{:ؐI/躅匽졁:䟇AGF૸\u001cퟗ9)駬慟ꡒꆒRS״툋A<>\u0010\"ꂔ炃7g덚E৏bꅰ輤]o㱏_뷕ܘ暂\"u": "芢+U^+㢩^鱆8*1鈶鮀\u0002뺰9⬳ꪮlL䃣괟,G8\u20a8DF㉪錖0ㄤ瓶8Nଷd?眡GLc陓\\_죌V쁰ल二?c띦捱 \u0019JC\u0011b⤉zẒT볕\"绣蘨뚋cꡉkI\u001e鳴",
-                                                                                                        "ꃣI'{6u^㡃#཰Kq4逹y൒䧠䵮!㱙/n??{L풓ZET㙠퍿X2᩟綳跠葿㚙w཮x캽扳B唕S|尾}촕%N?o䪨": null,
-                                                                                                        "ⰴFjෟ셈[\u0018辷px?椯\\1<ﲻ栘ᣁ봢憠뉴p": -5263694954586507640
-                                                                                                       }
-                                                                                                      ]
-                                                                                                     ]]
-                                                                                                    ]}
-                                                                                                   ]}]
-                                                                                                  ]
-                                                                                                 ],
-                                                                                                 "?#癘82禩鋆ꊝty?&": -1.9419029518535086E-19
-                                                                                                }
-                                                                                               ]
-                                                                                              ]
-                                                                                             ]}
-                                                                                            ]
-                                                                                           ]
-                                                                                          ],
-                                                                                          "훊榲.|῕戄&.㚏Zꛦ2\"䢥ሆ⤢fV_摕婔?≍Fji冀탆꜕i㏬_ẑKᅢ꫄蔻XWc|饡Siẘ^㲦?羡2ぴ1縁ᙅ?쐉Ou": false
-                                                                                         }]]
-                                                                                        ]}}},
-                                                                                        "慂뗄卓蓔ᐓ匐嚖/颹蘯/翻ㆼL?뇊,텵<\\獷ごCボ": null
-                                                                                       },
-                                                                                       "p溉ᑟi짣z:䒤棇r^٫%G9缑r砌롧.물农g?0׼ሩ4ƸO㣥㯄쩞ጩ": null,
-                                                                                       "껎繥YxK\"F젷쨹뤤1wq轫o?鱑뜀瘊?뎃h灑\\ꛣ}K峐^ኖ⤐林ꉓhy": null
-                                                                                      }
-                                                                                     ],
-                                                                                     "᱀n肓ㄛ\"堻2>m殮'1橌%Ꞵ군=Ӳ鯨9耛<\/n據0u彘8㬇៩f᏿诙]嚊": "䋯쪦S럶匏ㅛ#)O`ሀX_鐪渲⛀㨻宅闩➈ꢙஶDR⪍"
-                                                                                    },
-                                                                                    "tA썓龇 ⋥bj왎录r땽✒롰;羋^\\?툳*┎?썀ma䵳넅U䳆૘〹䆀LQ0\b疀U~u$M}(鵸g⳾i抦뛹?䤈땚검.鹆?ꩡtⶥGĒ;!ቹHS峻B츪켏f5≺": 2366175040075384032,
-                                                                                    "전pJjleb]ួ": -7.5418493141528422E18,
-                                                                                    "n.鎖ጲ\n?,$䪘": true
-                                                                                   },
-                                                                                   "欈Ar㉣螵᪚茩?O)": null
-                                                                                  },
-                                                                                  "쫸M#x}D秱欐K=侫们丐.KꕾxẠ\u001e㿯䣛F܍캗qq8꟞ṢFD훎⵳簕꭛^鳜\u205c٫~⑟~冫ऊ2쫰<\/戲윱o<\"": true
-                                                                                 },
-                                                                                 "㷝聥/T뱂\u0010锕|内䞇x侁≦㭖:M?iM᣿IJe煜dG࣯尃⚩gPt*辂.{磼럾䝪@a\\袛?}ᓺB珼": true
-                                                                                }
-                                                                               }
-                                                                              ]]}]}},
-                                                                              "tn\"6ꫤ샾䄄;銞^%VBPwu묪`Y僑N.↺Ws?3C⤻9唩S䠮ᐴm;sᇷ냞඘B/;툥B?lB∤)G+O9m裢0kC햪䪤": -4.5941249382502277E18,
-                                                                              "ᚔt'\\愫?鵀@\\びꂕP큠<<]煹G-b!S?\nꖽ鼫,ݛ&頺y踦?E揆릱H}햧캡b@手.p탻>췽㣬ꒅ`qe佭P>ᓂ&?u}毚ᜉ蟶頳졪ᎏzl2wO": -2.53561440423275936E17
-                                                                             }]}
-                                                                            }
-                                                                           ]
-                                                                          ]],
-                                                                          "潈촒⿂叡": 5495738871964062986
-                                                                         }
-                                                                        ]]
-                                                                       }
-                                                                      ]
-                                                                     ]}
-                                                                    ]]
-                                                                   ]]
-                                                                  ]}
-                                                                 ]
-                                                                ]},
-                                                                "ႁq킍蓅R`謈蟐ᦏ儂槐僻ﹶ9婌櫞釈~\"%匹躾ɢ뤥>࢟瀴愅?殕节/냔O✬H鲽엢?ᮈੁ⋧d␽㫐zCe*": 2.15062231586689536E17,
-                                                                "㶵Ui曚珰鋪ᾼ臧P{䍏䷪쨑̟A뼿T渠誈䏚D1!잶<\/㡍7?)2l≣穷᛾稝{:;㡹nemיּ訊`G": null,
-                                                                "䀕\"飕辭p圁f#뫆䶷뛮;⛴ᩍ3灚덏ᰝ쎓⦷詵%᜖Մfs⇫(\u001e~P|ﭗCⲾផv湟W첋(텪બT<บSꏉ੗⋲X婵i ӵ⇮?L䬇|ꈏ?졸": 1.548341247351782E-19
-                                                               }
-                                                              ]
-                                                             },
-                                                             "t;:N\u0015q鐦Rt缆{ꮐC?஛㷱敪\\+鲊㉫㓪몗릙竏(氵kYS": "XᰂT?൮ô",
-                                                             "碕飦幑|+ 㚦鏶`镥ꁩ B<\/加륙": -4314053432419755959,
-                                                             "秌孳(p!G?V傫%8ሽ8w;5鲗㦙LI檸\u2098": "zG N볞䆭鎍흘\\ONK3횙<\/樚立圌Q튅k쩎Ff쁋aׂJK銆ઘ즐狩6༥✙䩜篥CzP(聻駇HHퟲ讃%,ά{렍p而刲vy䦅ክ^톺M楒鍢㹳]Mdg2>䤉洞",
-                                                             "踛M젧>忔芿㌜Zk": 2215369545966507819,
-                                                             "씐A`$槭頰퍻^U覒\bG毲aᣴU;8!팲f꜇E⸃_卵{嫏羃X쀳C7뗮m(嚼u N܁谟D劯9]#": true,
-                                                             "ﻩ!뵸-筚P᭛}ἰ履lPh?౮ⶹꆛ穉뎃g萑㑓溢CX뾇G㖬A錟]RKaꄘ]Yo+@䘁's섎襠$^홰}F": null
-                                                            },
-                                                            "粘ꪒ4HXᕘ蹵.$區\r\u001d묁77pPc^y笲Q<\/ꖶ 訍䃍ᨕG?*": 1.73773035935040224E17
-                                                           },
-                                                           "婅拳?bkU;#D矠❴vVN쩆t㜷A풃갮娪a%鮏絪3dAv룒#tm쑬⌛qYwc4|L8KZ;xU⓭㳔밆拓EZ7襨eD|隰ऌ䧼u9Ԣ+]贴P荿": 2.9628516456987075E18
-                                                          }]}}]
-                                                         ]}
-                                                        }}
-                                                       ]}]
-                                                      ],
-                                                      "|g翉F*湹̶\u0005⏐1脉̀eI쩓ᖂ㫱0碞l䴨ꑅ㵽7AtἈ턧yq䳥塑:z:遀ﾼX눔擉)`N3昛oQ셖y-ڨ⾶恢ꈵq^<\/": null,
-                                                      "菹\\랓G^璬x৴뭸ゆUS겧﮷Bꮤ ┉銜᯻0%N7}~f洋坄Xꔼ<\/4妟Vꄟ9:౟곡t킅冩䧉笭裟炂4봋ⱳ叺怊t+怯涗\"0㖈Hq": false,
-                                                      "졬믟'ﺇফ圪쓬멤m邸QLব䗁愍4jvs翙 ྍ꧀艳H-|": null,
-                                                      "컮襱⣱뗠 R毪/鹙꾀%헳8&": -5770986448525107020
-                                                     }
-                                                    ],
-                                                    "B䔚bꐻ뙏姓展槰T-똌鷺tc灿᫽^㓟䏀o3o$꘭趙萬I顩)뇭Ἑ䓝\f@{ᣨ`x3蔛": null
-                                                   }
-                                                  ]
-                                                 ]
-                                                }],
-                                                "⦖扚vWꃱ꥙㾠壢輓{-⎳鹷贏璿䜑bG倛⋐磎c皇皩7a~ﳫU╣Q࠭ꎉS摅姽OW.홌ೞ.": null,
-                                                "蚪eVlH献r}ᮏ믠ﰩꔄ@瑄ⲱ": null,
-                                                "퀭$JWoꩢg역쁍䖔㑺h&ୢtXX愰㱇?㾫I_6 OaB瑈q裿": null,
-                                                "꽦ﲼLyr纛Zdu珍B絟쬴糔?㕂짹䏵e": "ḱ\u2009cX9멀i䶛簆㳀k"
-                                               }
-                                              ]]]],
-                                              "(_ꏮg່澮?ᩑyM<艷\u001aꪽ\\庼뙭Z맷㰩Vm\\lY筺]3㋲2㌩㄀Eਟ䝵⨄쐨ᔟgङHn鐖⤇놋瓇Q탚單oY\"♆臾jHᶈ征ቄ??uㇰA?#1侓": null
-                                             },
-                                             "觓^~ሢ&iI띆g륎ḱ캀.ᓡꀮ胙鈉": 1.0664523593012836E-19,
-                                             "y詭Gbᔶऽs댁U:杜⤎ϲ쁗⮼D醄诿q뙰I#즧v蔎xHᵿt᡽[**?崮耖p缫쿃L菝,봬ꤦC쯵#=X1瞻@OZc鱗CQTx": null
-                                            }
-                                           ]
-                                          }}],
-                                          "剘紁\u0004\\Xn⊠6,တױ;嵣崇}讃iႽ)d1\\䔓": null
-                                         },
-                                         "脨z\"{X,1u찜<'k&@?1}Yn$\u0015Rd輲ｰa쮂굄+B$l": true,
-                                         "諳>*쭮괐䵟Ґ+<箁}빀䅱⡔檏臒hIH脟ꩪC핝ଗP좕\"0i<\/C褻D۞恗+^5?'ꂱ䚫^7}㡠cq6\\쨪ꔞꥢ?纖䫀氮蒫侲빦敶q{A煲G": -6880961710038544266
-                                        }}]
-                                       },
-                                       "5s⨲JvಽῶꭂᄢI.a৊": null,
-                                       "?1q꽏쿻ꛋDR%U娝>DgN乭G": -1.2105047302732358E-19
-                                      }
-                                     ]
-                                    ]},
-                                    "qZz`撋뙹둣j碇쁏\\ꆥ\u0018@藴疰Wz)O{F䶛l᷂绘訥$]뮍夻䢋䩇萿獰樧猵⣭j萶q)$꬚⵷0馢W:Ⱍ!Qoe": -1666634370862219540,
-                                    "t": "=wp|~碎Q鬳Ӎ\\l-<\/^ﳊhn퐖}䍔t碵ḛ혷?靻䊗",
-                                    "邙쇡㯇%#=,E4勃驆V繚q[Y댻XV㡸[逹ᰏ葢B@u=JS5?bLRn얮㍉⏅ﰳ?a6[&큟!藈": 1.2722786745736667E-19
-                                   },
-                                   "X블땨4{ph鵋ꉯ웸 5p簂䦭s_E徔濧d稝~No穔噕뽲)뉈c5M윅>⚋[岦䲟懷恁?鎐꓆ฬ爋獠䜔s{\u001bm鐚儸煛%bﯿXT>ꗘ@8G": 1157841540507770724,
-                                   "媤娪Q杸\u0011SAyᡈ쿯": true,
-                                   "灚^ಸ%걁<\/蛯<O\"-刷㏠R(kO=䢊䅎l䰓팪A絫픧": "譔\\㚄 ?R7㔪G㋉⣰渆?\\#|gN⤴;W칷A׫癮଼ೣ㏳뒜7d恓꾲0扬S0ᆵi/贎ྡn䆋武",
-                                   "萇砇Gこ朦켋Wq`㞲攊*冁~霓L剢zI腧튴T繙Cঅ뫬╈뮜ㄾ䦧촄椘B⊬츩r2f㶱厊8eϬ{挚␯OM焄覤\\(Kӡ>?\"祴坓\\\\'흍": -3.4614808555942579E18,
-                                   "釴U:O湛㴑䀣렑縓\ta)<D8ﭳ槁髭D.L|xs斋敠\"띋早7wᎍ": true,
-                                   "쵈+쬎簨up䓬?q+~\u0019仇뵈᫯3ᵣ恘枰劫㪢u珘-퀭:컙:u`⌿A(9鄦!<珚nj3:Hࣨ巋䀁旸뎈맻v\"\\(곘vO㤰aZe<\/W鹙鄜;l厮둝": null,
-                                   "": -1.2019926774977002E-18,
-                                   "%者O7.Nꪍs梇接z蕜綛<\/䜭\"죊y<曋漵@Ś⹝sD⟓jݗᢜ?z/9ၲMa쨮긗贎8ᔮ㦛;6p뾥໭䭊0B찛+)(Y㿠鸁䕒^옥": "鬃뫤&痽舎J콮藐󽸰ᨨMꈫ髿v<N\\.삒껅я1ꭼ5䴷5쳬臨wj덥"
-                                  }],
-                                  "鷎'㳗@帚妇OAj' 谬f94ǯ(횡ﾋ%io쪖삐좛>(j:숾却䗌gCiB뽬Oyuq輥厁/7)?今hY︺Q": null
-                                 }
-                                ]
-                               ]]]}]
-                              ],
-                              "I笔趠Ph!<ཛྷ㸞诘X$畉F\u0005笷菟.Esr릙!W☆䲖뗷莾뒭U\"䀸犜Uo3Gꯌx4r蔇᡹㧪쨢準<䂀%ࡡꟼ瑍8炝Xs0䀝销?fi쥱ꆝલBB": -8571484181158525797,
-                              "L⦁o#J|\"⽩-㱢d㌛8d\\㶤傩儻E[Y熯)r噤὘勇 }": "e(濨쓌K䧚僒㘍蠤Vᛸ\"络QJL2,嬓왍伢㋒䴿考澰@(㏾`kX$끑эE斡,蜍&~y",
-                              "vj.|统圪ᵮPL?2oŶ`밧\"勃+0ue%⿥绬췈체$6:qa렐Q;~晘3㙘鹑": true,
-                              "ශؙ4獄⶿c︋i⚅:ん閝Ⳙ苆籦kw{䙞셕pC췃ꍬ␜꟯ꚓ酄b힝hwk꭭M鬋8B耳쑘WQ\\偙ac'唀x᪌\u2048*h짎#ፇ鮠뾏ឿ뀌": false,
-                              "⎀jꄒ牺3Ⓝ컴~?親ꕽぼܓ喏瘘!@<튋㐌꿱⩦{a?Yv%⪧笯Uܱ栅E搚i뚬:ꄃx7䙳ꦋ&䓹vq☶I䁘ᾘ涜\\썉뺌Lr%Bc㍜3?ꝭ砿裞]": null,
-                              "⭤뙓z(㡂%亳K䌽꫿AԾ岺㦦㼴輞낚Vꦴw냟鬓㹈뽈+o3譻K1잞": 2091209026076965894,
-                              "ㇲ\t⋇轑ꠤ룫X긒\"zoY읇희wj梐쐑l侸`e%s": -9.9240075473576563E17,
-                              "啸ꮑ㉰!ᚓ}銏": -4.0694813896301194E18,
-                              ">]囋੽EK뇜>_ꀣ緳碖{쐐裔[<ನ\"䇅\"5L?#xTwv#罐\u0005래t应\\N?빗;": "v쮽瞭p뭃"
-                             }
-                            ]],
-                            "斴槾?Z翁\"~慍弞ﻆ=꜡o5鐋dw\"?K蠡i샾ogDﲰ_C*⬟iㇷ4nય蟏[㟉U꽌娛苸 ঢ়操贻洞펻)쿗૊許X⨪VY츚Z䍾㶭~튃ᵦ<\/E臭tve猑x嚢": null,
-                            "锡⛩<\/칥ꈙᬙ蝀&Ꚑ籬■865?_>L詏쿨䈌浿弥爫̫lj&zx<\/C쉾?覯n?": null,
-                            "꾳鑤/꼩d=ᘈn挫ᑩ䰬ZC": "3錢爋6Ƹ䴗v⪿Wr益G韠[\u0010屗9쁡钁u?殢c䳀蓃樄욂NAq赟c튒瘁렶Aૡɚ捍"
-                           }
-                          ]
-                         ]
-                        ]}
-                       ]
-                      ]
-                     }]]]}}
-                    ]}],
-                    "Ej䗳U<\/Q=灒샎䞦,堰頠@褙g_\u0003ꤾfⶽ?퇋!łB〙ד3CC䌴鈌U:뭔咎(Qો臃䡬荋BO7㢝䟸\"Yb": 2.36010731779814E-20,
-                    "逸'0岔j\u000e눘먷翌C츊秦=ꭣ棭ှ;鳸=麱$XP⩉駚橄A\\좱⛌jqv䰞3Ь踌v㳆¹gT┌gvLB賖烡m?@E঳i": null
-                   },
-                   "曺v찘ׁ?&绫O័": 9107241066550187880
-                  }
-                 ]
-                ],
-                "(e屄\u0019昜훕琖b蓘ᬄ0/۲묇Z蘮ဏ⨏蛘胯뢃@㘉8ሪWᨮ⦬ᅳ䅴HI၇쨳z囕陻엣1赳o": true,
-                ",b刈Z,ၠ晐T솝ŕB⩆ou'퐼≃绗雗d譊": null,
-                "a唥KB\"ﳝ肕$u\n^⅄P䟼냉䞸⩪u윗瀱ꔨ#yşs꒬=1|ﲤ爢`t౐튼쳫_Az(Ṋ擬㦷좕耈6": 2099309172767331582,
-                "?㴸U<\/䢔ꯡ阽扆㐤q鐋?f㔫wM嬙-;UV죫嚔픞G&\"Cᗍ䪏풊Q": "VM7疹+陕枡툩窲}翡䖶8欞čsT뮐}璤:jﺋ鎴}HfA൝⧻Zd#Qu茅J髒皣Y-︴[?-~쉜v딏璮㹚䅊﩯<-#\u000e걀h\u0004u抱﵊㼃U<㱷⊱IC進"
-               },
-               "숌dee節鏽邺p넱蹓+e罕U": true
-              }
-             ],
-             "b⧴룏??ᔠ3ぱ>%郿劃翐ꏬꠛW瞳᫏누躨狀ໄy੽\"ីuS=㨞馸k乆E": "トz݈^9R䬑<ﮛG<s~<\/?ⵆᏥ老熷u듷"
-            }}
-           ]
-          }
-         ]}
-        }
-       }
-      }
-     }},
-     "宩j鬅쳜QꝖјy獔Z᭵1v擖}䨿F%cֲ᫺贴m塼딚NP亪\"ￋsa뺯ꘓ2:9뛓༂쌅䊈#>Rꨳ\u000fTT泠纷꽀MR<CBxP񱒫X쇤": -2.22390568492330598E18,
-     "?䯣ᄽ@Z鸅->ᴱ纊:㠭볮?%N56%鈕1䗍䜁a䲗j陇=뿻偂衋࿘ᓸ?ᕵZ+<\/}H耢b䀁z^f$&㝒LkꢳI脚뙛u": 5.694374481577558E-20
-    }]
-   }
-  ]],
-  "obj": {"key": "wrong value"},
-  "퓲꽪m{㶩/뇿#⼢&᭙硞㪔E嚉c樱㬇1a綑᝖DḾ䝩": null
- },
- "key": "6.908319653520691E8",
- "z": {
-  "6U閆崬밺뀫颒myj츥휘:$薈mY햚#rz飏+玭V㭢뾿愴YꖚX亥ᮉ푊\u0006垡㐭룝\"厓ᔧḅ^Sqpv媫\"⤽걒\"˽Ἆ?ꇆ䬔未tv{DV鯀Tἆl凸g\\㈭ĭ즿UH㽤": null,
-  "b茤z\\.N": [[
-   "ZL:ￄዎ*Y|猫劁櫕荾Oj为1糕쪥泏S룂w࡛Ᏺ⸥蚙)",
-   {
-    "\"䬰ỐwD捾V`邀⠕VD㺝sH6[칑.:醥葹*뻵倻aD\"": true,
-    "e浱up蔽Cr෠JK軵xCʨ<뜡癙Y獩ｹ齈X/螗唻?<蘡+뷄㩤쳖3偑犾&\\첊xz坍崦ݻ鍴\"嵥B3㰃詤豺嚼aqJ⑆∥韼@\u000b㢊\u0015L臯.샥": false,
-    "l?Ǩ喳e6㔡$M꼄I,(3᝝縢,䊀疅뉲B㴔傳䂴\u0088㮰钘ꜵ!ᅛ韽>": -5514085325291784739,
-    "o㮚?\"춛㵉<\/﬊ࠃ䃪䝣wp6ἀ䱄[s*S嬈貒pᛥ㰉'돀": [{
-     "(QP윤懊FI<ꃣ『䕷[\"珒嶮?%Ḭ壍಻䇟0荤!藲끹bd浶tl\u2049#쯀@僞": {"i妾8홫": {
-      ",M맃䞛K5nAㆴVN㒊햬$n꩑&ꎝ椞阫?/ṏ세뉪1x쥼㻤㪙`\"$쟒薟B煌܀쨝ଢ଼2掳7㙟鴙X婢\u0002": "Vዉ菈᧷⦌kﮞఈnz*<?੃'ahhCFX(\u0007⮊E㭍䱾Gxꥩr❣.洎",
-      "뻴5bDD큯O傆盓왻U?ꞅꐊN鐭᧢τ\"迳豲8\u001b䃥ꂻ䴺ྸH筴,": {
-       "\"L鸔SE㬡XV&~͎'놅蔞눶l匛?'.K氁\\ƢẨ疇mΊ'꽳&!鹠m'|{P痊 秄쒿u\u00111䋧gϩx7t丗D䊨䠻z0.A0": -1.50139930144708198E18,
-       "8鋂뛷?첒B☚>﷜FM\"荭7ꍀ-VR<\/';䁙E9$䩉\f @s?퍪o3^衴cඎ䧪aK鼟ｑ䆨c{䳠5mᒲՙ蘹ᮩ": {
-        "F㲷JGo⯍P덵x뒳p䘧☔\"+ꨲ吿JfR㔹)4n紬G练Q፞!C|": true,
-        "p^㫮솎oc.೚A㤠??r\u000f)⾽⌲們M2.䴘䩳:⫭胃\\፾@Fᭌ\\K": false,
-        "蟌Tk愙潦伩": {
-         "a<\/@ᾛ慂侇瘎": -7271305752851720826,
-         "艓藬/>၄ṯ,XW~㲆w": {"E痧郶)㜓ha朗!N赻瞉駠uC\u20ad辠<Ve?폱!Im䁎搄:*s 9諚Prᵾ뒰髶B̌qWA8梸vS⫊⢳{t㺲q㺈랊뮣RqK밢쳪": [
-          false,
-          {
-           "\u000b=>x퓮⣫P1ࠫLMMX'M刼唳됤": null,
-           "P쓫晥%k覛ዩIUᇸ滨:噐혲lMR5䋈V梗>%幽u頖\\)쟟": null,
-           "eg+昉~矠䧞难\b?gQ쭷筝\\eꮠNl{ಢ哭|]Mn銌╥zꖘzⱷ⭤ᮜ^": [
-            -1.30142114406914976E17,
-            -1.7555215491128452E-19,
-            null,
-            "渾㨝ߏ牄귛r?돌?w[⚞ӻ~廩輫㼧/",
-            -4.5737191805302129E18,
-            null,
-            "xy࿑M[oc셒竓Ⓔx?뜓y䊦>-D켍(&&?XKkc꩖ﺸᏋ뵞K伕6ী)딀P朁yW揙?훻魢傎EG碸9類៌g踲C⟌aEX舲:z꒸许",
-            3808159498143417627,
-            null,
-            {"m試\u20df1{G8&뚈h홯J<\/": {
-             "3ஸ厠zs#1K7:rᥞoꅔꯧ&띇鵼鞫6跜#赿5l'8{7㕳(b/j\"厢aq籀ꏚ\u0015厼稥": [
-              -2226135764510113982,
-              true,
-              null,
-              {
-               "h%'맞S싅Hs&dl슾W0j鿏MםD놯L~S-㇡R쭬%": null,
-               "⟓咔謡칲\u0000孺ꛭx旑檉㶆?": null,
-               "恇I転;￸B2Y`z\\獓w,놏濐撐埵䂄)!䶢D=ഭ㴟jyY": {
-                "$ࡘt厛毣ൢI芁<겿骫⫦6tr惺a": [
-                 6.385779736989334E-20,
-                 false,
-                 true,
-                 true,
-                 [
-                  -6.891946211462334E-19,
-                  null,
-                  {
-                   "]-\\Ꟑ1/薓❧Ὂ\\l牑\u0007A郃)阜ᇒᓌ-塯`W峬G}SDb㬨Q臉⮻빌O鞟톴첂B㺱<ƈmu챑J㴹㷳픷Oㆩs": {
-                    "\"◉B\"pᶉt骔J꩸ᄇᛐi╰栛K쉷㉯鐩!㈐n칍䟅難>盥y铿e୔蒏M貹ヅ8嘋퀯䉶ጥ㏢殊뻳\"絧╿ꉑ䠥?∃蓊{}㣣Gk긔H1哵峱": false,
-                    "6.瀫cN䇮F㧺?\\椯=ڈT䘆4␘8qv": -3.5687501019676885E-19,
-                    "Q?yऴr혴{஀䳘p惭f1ﹸ䅷䕋贲<ྃᄊ繲hq\\b|#QSTs1c-7(䵢\u2069匏絘ꯉ:l毴汞t戀oෟᵶ뮱፣-醇Jx䙬䐁햢0࣫ᡁgrㄛ": "\u0011_xM/蘇Chv;dhA5.嗀绱V爤ﰦi뵲M",
-                    "⏑[\"ugoy^儣횎~U\\섯겜論l2jw஌yD腅̂\u0019": true,
-                    "ⵯɇ䐲᫿࢚!㯢l샅笶戮1꣖0Xe": null,
-                    "劅f넀識b宁焊E찓橵G!ʱ獓뭔雩괛": [{"p⹣켙[q>燣䍃㞽ᩲx:쓤삘7玑퇼0<\/q璂ᑁ[Z\\3䅵䧳\u0011㤧|妱緒C['췓Yꞟ3Z鳱雼P錻BU씧U`ᢶg蓱>.1ӧ譫'L_5V䏵Ц": [
-                     false,
-                     false,
-                     {"22䂍盥N霂얢<F8꼵7Gసyh뀍g᦭ꄢx硴嬢\u001a?E괆T|;7犟\"Wt%䐩O⨵t&#ᬋK'蜍Ძ揔⾠鲂T멷靃\u0018䓞cE": {"f=䏏츜瞾zw?孡鏣\\铀᫞yẆg(\u0011M6(s2]`ਫ": [[[{
-                      "'y몱纣4S@\\,i㷯럹Ua充Tᣢ9躘Zଞ쥿䐊s<\/刎\\\"뉦-8/": "蜑.X0꭛낢륹i젨ꚁ<8?s볕蝡|Q✬᯦@\\G㑢屿Mn졾J굤⥟JW뤵苑r쁕툄嵵?⾥O",
-                      "^1挲~[n귆誈央碠멪gI洷": -8214236471236116548,
-                      "sሣ%娌暡clr蟜㑓2\u000bS❟_X㨔⚴5~蔷ꀇ|Xu㬖,꤭卹r(g믇쩍%췸앙|栣U\\2]䤉+啠菡ꯎT鉹m\n/`SzDᅼ鞶": 1.1217523390167132E-19,
-                      "u톇=黚\\ ꂮ췵L>躰e9⑩_뵜斌n@B}$괻Yᐱ@䧋V\"☒-諯cV돯ʠ": true,
-                      "Ű螧ᔼ檍鍎땒딜qꄃH뜣<獧ूCY吓⸏>XQ㵡趌o끬k픀빯a(ܵ甏끆୯/6Nᪧ}搚ᆚ짌P牰泱鈷^d꣟#L삀\"㕹襻;k㸊\\f+": true,
-                      "쎣\",|⫝̸阊x庿k잣v庅$鈏괎炔k쬪O_": [
-                       "잩AzZGz3v愠ꉈⵎ?㊱}S尳௏p\r2>췝IP䘈M)w|\u000eE",
-                       -9222726055990423201,
-                       null,
-                       [
-                        false,
-                        {"´킮'뮤쯽Wx讐V,6ᩪ1紲aႈ\u205czD": [
-                         -930994432421097536,
-                         3157232031581030121,
-                         "l貚PY䃛5@䭄<nW\u001e",
-                         [
-                          3.801747732605161E18,
-                          [
-                           null,
-                           false,
-                           {
-                            "": 4.0442013775147072E16,
-                            "2J[sᡪ㞿|n'#廲꯬乞": true,
-                            "B[繰`\\㏏a̼㨀偛㽓<\/꥖ᵈO让\r43⡩徑ﬓ๨ﮕx:㣜o玐ꉟぢC珵὆ᓞ쇓Qs氯였9駵q혃Ljꂔ<\/昺+t䐋༻猙c沪~櫆bpJ9UᏐ:칣妙!皗F4㑄탎䕀櫳振讓": 7.3924182188256287E18,
-                            "H磵ai委曷n柋T<\/勿F&:ꣴfU@㿗榻Lb+?퍄sp\"᪟~>귻m㎮琸f": 1.0318894506812084E-19,
-                            "࢜⩢Ш䧔1肽씮+༎ᣰ闺馺窃䕨8Mƶq腽xc(៯夐J5굄䕁Qj_훨/~価.䢵慯틠퇱豠㼇Qﵘ$DuSp(8Uญ<\/ಟ룴𥳐ݩ$": 8350772684161555590,
-                            "ㆎQ䄾\u001bpᩭ${[諟^^骴᤮b^ㅥI┧T㉇⾞\"绦<AYJ⒃-oF<\/蛎mm;obh婃ᦢ": false,
-                            "䔤䣈?汝.p襟&d㱅\\Jᚠ@?O첁ࢽ휔VR蔩|㒢柺": [[
-                             "-ꕨ岓棻r@鿆^3~䪤Ѐ狼︌ﹲ\\᝸MlE쵠Q+",
-                             null,
-                             false,
-                             3346674396990536343,
-                             null,
-                             {
-                              "": null,
-                              "/䏨S쨑,&繷㉥8C엮赸3馢|뇲{鄎ꗇqFﶉ雕UD躢?Ꟛအ꽡[hᕱᗅ㦋쭞Mユ茍?L槽암V#성唐%㣕嘵\\ڹ(嘏躿&q": [
-                               -1364715155337673920,
-                               false,
-                               -8197733031775379251,
-                               "E팗鮲JwH\\觡܈᜝\"+뉞娂N휗v噙၂깼\u001dD帒l%-斔N",
-                               -3.844267973858711E-20,
-                               [{"쬯(褈Q 蟚뿢 /ⱖ㻥\u0017/?v邘䃡0U.Z1x?鯔V尠8Em<": [[[
-                                null,
-                                [
-                                 null,
-                                 -5841406347577698873,
-                                 "킷\"S⋄籞繗솸ᵣ浵w쑿ퟗ7nᎏx3앙z㘌쿸I葥覯㬏0ᆝb汆狺뷘ႀnꋋ",
-                                 -1227911573141158702,
-                                 {
-                                  "u㉮PᾺV鵸A\\g*ࡗ9슟晭+ͧↀ쿅H\u001c꾣犓}癇恛ᗬ黩䟘X梑鐆e>r䰂f矩'-7䡭桥Dz兔V9谶居㺍ᔊ䩯덲.\u001eL0ὅㅷ釣": [{
-                                   "<쯬J卷^숞u࠯䌗艞R9닪g㐾볎a䂈歖意:%鐔|ﵤ|y}>;2,覂⶚啵tb*仛8乒㓶B࿠㯉戩oX 貘5V嗆렽낁߼4h䧛ꍺM空\\b꿋貼": 8478577078537189402,
-                                   "VD*|吝z~h譺aᯒ": {
-                                    "YI췢K<\/濳xNne玗rJo쾘3핰鴊\"↱AR:ࢷ\"9?\"臁說)?誚ꊏe)_D翾W?&F6J@뺾ꍰNZ醊Z쾈വH嶿?炫㷱鬰M겈<bS}㎥l|刖k": {"H7鷮퇢_k": [
-                                     true,
-                                     "s㟑瀭좾쮀⑁Y찺k맢戲쀸俻ກ6儮끗扖puߖꜻ馶rꈞ痘?3ྚ畊惘䎗\"vv)*臔웅鿈䧲^v,껛㰙J <ᚶ5",
-                                     7950276470944656796,
-                                     4.9392301536234746E17,
-                                     -4796050478201554639,
-                                     "yꬴc<3㻚",
-                                     "o塁\u20a4蒵鮬裢CᴧnB㭱f.",
-                                     false,
-                                     [
-                                      false,
-                                      "㡐弑V?瀆䰺q!출㇞yᘪ꼼(IS~Ka 烿ꟿ샕桤\u0005HQҹ㯪罂q萾⚇懋⦕둡v",
-                                      1862560050083946970,
-                                      "\u20b6[|(뭹gꍒ펉O轄Dl묽]ﯨ髯QEbA㒾m@롴礠㕓2땫n6ْ엘঵篳R잷꙲m색摪|@㿫5aK设f胭r8/NI4춫栵\\꯬2]",
-                                      false,
-                                      {
-                                       "\u000b7*㙛燏.~?䔊p搕e_拺艿뷍f{ꔻ1s驙`$Ė戧?q⋬沭?塷᭚蹀unoa5": {
-                                        "S귯o紞㾕ᅶ侏銇12|ʟ畴iNAo?|Sw$M拲գ㭄紧螆+,梔": null,
-                                        "㭚0?xB疱敻ேBPwv뾃熉(ӠpJ]갢\"Bj'\u0016GE椱<\/zgៅx黢礇h},M9ﴦ?LḨ": "Si B%~㬒E",
-                                        "핇㉊살㍢숨~ȪRo䦅D桺0z]﬽蠆c9ᣨyPP㿷U~㞐?쯟퍸宒뉆U|}㉓郾ࣻ*櫎꼪䁗s?~7\u001e㘔h9{aឋ}:㶒P8": [{"\\R囡쐬nN柋琍؛7칾 :㶃衇徜V 深f1淍♠i?3S角폞^ᆞ\u20e8ṰD\u0007秡+躒臔&-6": {
-                                         "䨑g.fh㔗=8!\"狿ൻLU^뻱g䲚㻐'W}k欤?๒鲇S꧗䫾$ĥ피": -794055816303360636,
-                                         "外頮詋~텡竆繃䏩苨뾺朁꼃瘹f*㉀枙NH/\u2027ꢁ}j묎vペq︉식뜡Od5 N顯ି烅仟Qfㆤ嚢(i䬅c;맧?嶰㩼츱獡?-": {
-                                          "e݆㍡⬬'2㻒?U篲鿄\"隻Ҭ5NꭰꤺBꀈ拾᩺[刯5곑Na램ﴦ዆]㝓qw钄\u001b\"Y洊䗿祏塥迵[⼞⠳P$꠱5먃0轢`": [{"獰E賝﫚b먭N긆Ⰹ史2逶ꜛ?H짉~?P}jj}侷珿_T>᭨b,⻁鈵P䕡䀠८ⱄ홎鄣": {
-                                           "@?k2鶖㋮\"Oರ K㨇廪儲\u0017䍾J?);\b*묀㗠섳햭1MC V": null,
-                                           "UIICP!BUA`ᢈ㋸~袩㗪⾒=fB﮴l1ꡛ죘R辂여ҳ7쮡<䩲`熕8頁": 4481809488267626463,
-                                           "Y?+8먙ᚔ鋳蜩럶1㥔y璜౩`": [
-                                            null,
-                                            1.2850335807501874E-19,
-                                            "~V2",
-                                            2035406654801997866,
-                                            {
-                                             "<숻1>\"": -8062468865199390827,
-                                             "M㿣E]}qwG莎Gn᝶(ꔙ\\D⬲iꇲs寢t駇S뀡ꢜ": false,
-                                             "pꝤ㎏9W%>M;-U璏f(^j1?&RB隧 忓b똊E": "#G?C8.躬ꥯ'?냪#< 渟&헿란zpo왓Kj}鷧XﻘMツb䕖;㪻",
-                                             "vE풤幉xz뱕쫥Ug㦲aH} ᣟp:鬼Yᰟ<Fɋ잣緂頒⺏䉲瑑䅂,C~ޅG!f熢-B7~9Pqࡢ[츑#3ꕎ,Öඳ聁⩅㵧춀뿍xy䌏͂tdj!箧᳆|9蚡돬": -2.54467378964089632E17,
-                                             "䵈䅦5빖,궆-:໿댾仫0ᙚyᦝhqᚄ": null,
-                                             "侯Y\"湛졯劇U셎YX灍ⅸ2伴|筧\\䁒㶶᷏쁑Waᦵᗱ㜏늾膠<Jc63<G\u20fe䇹66僣k0O\"_@U": null,
-                                             "姪y$#s漴JH璌Ӊ脛J㝾펔ﹴoꈶ㚸PD:薠쏖%說ថ蹂1］⾕5튄": {
-                                              "᝾Huw3䮅如쿺䍟嫝]<鰨ݷ?꯯䫓傩|ᐶස媽\\澒≡闢": "Mm\"쏇ᯄ졽\"楇<\/ꥆ흭局n隴@鿣w⠊4P贈徎W㊋;䤞'.팇蒁䡴egpx嗎wஅ獗堮ᛐnˁ︖䀤4噙?໚郝᱋ޘॎt恑姫籕殥陃\"4[ꝬqL4Wꠎx",
-                                              "ℇj遌5B뒚\" U": "硄ꏘ{憠굏:&t䌨m Cઌ쿣鞛XFꠟs䝭ﶃ\"格a0x闊昵吲L\\杚聈aꁸj싹獅\"灟ﱡ馆*굖糠<ꔏ躎",
-                                              "톌賠弳ꟍb\"螖X50sĶ晠3f秂坯Iⓟ:萘": 5.573183333596288E18,
-                                              "%䴺": [[[[
-                                               -6957233336860166165,
-                                               false,
-                                               null,
-                                               {
-                                                "\"\\௮茒袀ᕥ23ୃ괶?䕎.嚲◉㏞L+ᵡ艱hL콇붆@": null,
-                                                "%螥9ꭌ<\/-t": true,
-                                                ",9|耢椸䁓Xk죱\u0015$Ώ鲞[?엢ᝲ혪즈ⴂ▂ℴ㗯\"g뺘\\ꍜ#\u0002ヮ}ሎ芲P[鹮轧@냲䃦=#(": 2.78562909315899616E17,
-                                                "R?H䧰ⵇ<,憰쮼Q總iR>H3镔ᴚ斦\\鏑r*2橱G⼔F/.j": true,
-                                                "RK좬뎂a홠f*f㱉ᮍ⦋潙㨋Gu곌SGI3I뿐\\F',)t`荁蘯囯ﮉ裲뇟쥼_ገ驪▵撏ᕤV": 1.52738225997956557E18,
-                                                "^k굲䪿꠹B逤%F㱢漥O披M㽯镞竇霒i꼂焅륓\u00059=皫之눃\u2047娤閍銤唫ၕb<\/w踲䔼u솆맚,䝒ᝳ'/it": "B餹饴is権ꖪ怯ꦂẉဎt\"!凢谵⧿0\\<=(uL䷍刨쑪>俆揓Cy襸Q힆䆭涷<\/ᐱ0ɧ䗾䚹\\ኜ?ꄢᇘ`䴢{囇}᠈䴥X4퓪檄]ꥷ/3謒ሴn+g騍X",
-                                                "GgG꽬[(嫓몍6\u0004궍宩㙻/>\u0011^辍dT腪hxǑ%ꊇk,8(W⧂結P鬜O": [{
-                                                 "M㴾c>\\ᓲ\u0019V{>ꤩ혙넪㭪躂TS-痴໸闓⍵/徯O.M㏥ʷD囎⧔쁳휤T??鉬뇙=#ꢫ숣BX䭼<\/d똬졬g榿)eꨋﯪ좇첻<?2K)": null,
-                                                 "Z17縬z]愀䖌 ᾋBCg5딒국憍꾓aⲷ턷u:U촳驿?雺楶\u0001\u001c{q*ᰗ苑B@k揰z.*蓗7ረIm\"Oᱍ@7?_": true,
-                                                 "㺃Z<": -4349275766673120695,
-                                                 "휃䠂fa塆ffixKe'덬鏗੄뺾w࠾鑎k땢m*႑햞鐮6攊&虜h黚,Y䱳Sﭼ둺pN6": [
-                                                  false,
-                                                  "IΎ䣲,\"ᬮ˪癘P~Qlnx喁Sᮔ༬˨I珌m䜛酛\u0003iꐸ㦧cQ帲晼D' \\(粋wQcN\\뵰跈",
-                                                  [
-                                                   "D0\\L?M1쥍Kaꏌsd+盌귤憊tz䌣댐בO坂wϢ%ὒgp,Ai⎧ᶆI餾ꦍ棩嘅᳉怴%m]ၶis纖D凜镧o심b U",
-                                                   {
-                                                    "?଼\u0011Rv&^[+匚I趈T媫\u0010.䥤ᆯ1q僤HydⲰl㒽K'ᅾiౕ豲초딨@\u0013J'쪪VD౼P4Ezg#8*㋤W馓]c쿯8": false,
-                                                    "c/擯X5~JmK䵶^쐎ച|B|u[솝(X뚤6v}W㤘⠛aR弌臌쾭諦eⒷ僡-;㩩⭖ⷴ徆龄갬{䱓ᥩ!﯏⊚ᇨ<v燡露`:볉癮꨽り★Ax7Ꮀ譥~舑\\Vꍋ\"$)v": "e&sFF쬘OBd슊寮f蠛জ봞mn~锆竒G脁\"趵G刕䕳&L唽붵<\/I,X팚B⍥X,kԇҗ眄_慡:U附ᓚA蕧>\u001a\u0011\";~쓆BH4坋攊7힪",
-                                                    "iT:L闞椕윚*滛gI≀Wਟඊ'ꢆ縺뱹鮚Nꩁ᧬蕼21줧\\䋯``⍐\\㏱鳨": 1927052677739832894,
-                                                    "쮁缦腃g]礿Y㬙 fヺSɪ꾾N㞈": [
-                                                     null,
-                                                     null,
-                                                     {
-                                                      "!t,灝Y 1䗉罵?c饃호䉂Cᐭ쒘z(즽sZG㬣sഖE4뢜㓕䏞丮Qp簍6EZឪ겛fx'ꩱQ0罣i{k锩*㤴㯞r迎jTⲤ渔m炅肳": [
-                                                       -3.3325685522591933E18,
-                                                       [{"㓁5]A䢕1룥BC?Ꙍ`r룔Ⳛ䙡u伲+\u0001്o": [
-                                                        null,
-                                                        4975309147809803991,
-                                                        null,
-                                                        null,
-                                                        {"T팘8Dﯲ稟MM☻㧚䥧/8ﻥ⥯aXLaH\"顾S☟耲ît7fS෉놁뮔/ꕼ䓈쁺4\\霶䠴ᩢ<\/t4?죵>uD5➶༆쉌럮⢀秙䘥\u20972ETR3濡恆vB? ~鸆\u0005": {
-                                                         "`閖m璝㥉b뜴?Wf;?DV콜\u2020퍉౓擝宏ZMj3mJ먡-傷뱙yח㸷꥿ ໘u=M읝!5吭L4v\\?ǎ7C홫": null,
-                                                         "|": false,
-                                                         "~Ztᛋ䚘\\擭㗝傪W陖+㗶qᵿ蘥ᙄp%䫎)}=⠔6ᮢS湟-螾-mXH?cp": 448751162044282216,
-                                                         "\u209fad놹j檋䇌ᶾ梕㉝bוּ<d䗱:줰M酄\u0000X#_r獢A饓ꍗُKo_跔?ᪧ嵜鼲<": null,
-                                                         "ꆘ)ubI@h@洭Ai㜎䏱k\u0003?T䉐3间%j6j棍j=❁\\U毮ᬹ*8䀔v6cpj⭬~Q꿾뺶펵悡!쩭厝l六㽫6퇓ޭ2>": {"?苴ꩠD䋓帘5騱qﱖPF?☸珗顒yU ᡫcb䫎 S@㥚gꮒ쎘泴멖\\:I鮱TZ듒ᶨQ3+f7캙\"?\f풾\\o杞紟﻽M.⏎靑OP": [
-                                                          -2.6990368911551596E18,
-                                                          [{"䒖@<᰿<\/⽬tTr腞&G%᳊秩蜰擻f㎳?S㵧\r*k뎾-乢겹隷j軛겷0룁鮁": {")DO0腦:춍逿:1㥨่!蛍樋2": [{
-                                                           ",ꌣf侴笾m๫ꆽ?1?U?\u0011ꌈꂇ": {
-                                                            "x捗甠nVq䅦w`CD⦂惺嘴0I#vỵ} \\귂S끴D얾?Ԓj溯\"v餄a": {
-                                                             "@翙c⢃趚痋i\u0015OQ⍝lq돆Y0pࢥ3쉨䜩^<8g懥0w)]䊑n洺o5쭝QL댊랖L镈Qnt⪟㒅십q헎鳒⮤眉ᔹ梠@O縠u泌ㄘb榚癸XޔFtj;iC": false,
-                                                             "I&뱋゘|蓔䔕측瓯%6ᗻHW\\N1貇#?僐ᗜgh᭪o'䗈꽹Rc욏/蔳迄༝!0邔䨷푪8疩)[쭶緄㇈୧ፐ": {
-                                                              "B+:ꉰ`s쾭)빼C羍A䫊pMgjdx䐝Hf9᥸W0!C樃'蘿f䫤סи\u0017Jve? 覝f둀⬣퓉Whk\"஼=չﳐ皆笁BIW虨쫓F廰饞": -642906201042308791,
-                                                              "sb,XcZ<\/m㉹ ;䑷@c䵀s奤⬷7`ꘖ蕘戚?Feb#輜}p4nH⬮eKL트}": [
-                                                               "RK鳗z=袤Pf|[,u욺",
-                                                               "Ẏᏻ罯뉋⺖锅젯㷻{H䰞쬙-쩓D]~\u0013O㳢gb@揶蔉|kᦂ❗!\u001ebM褐sca쨜襒y⺉룓",
-                                                               null,
-                                                               null,
-                                                               true,
-                                                               -1.650777344339075E-19,
-                                                               false,
-                                                               "☑lꄆs힨꤇]'uTന⌳농].1⋔괁沰\"IWഩ\u0019氜8쟇䔻;3衲恋,窌z펏喁횗?4?C넁问?ᥙ橭{稻Ⴗ_썔",
-                                                               "n?]讇빽嗁}1孅9#ꭨ靶v\u0014喈)vw祔}룼쮿I",
-                                                               -2.7033457331882025E18,
-                                                               {
-                                                                ";⚃^㱋x:饬ኡj'꧵T☽O㔬RO婎?향ᒭ搩$渣y4i;(Q>꿘e8q": "j~錘}0g;L萺*;ᕭꄮ0l潛烢5H▄쳂ꏒוֹꙶT犘≫x閦웧v",
-                                                                "~揯\u2018c4職렁E~ᑅቚꈂ?nq뎤.:慹`F햘+%鉎O瀜쟏敛菮⍌浢<\/㮺紿P鳆ࠉ8I-o?#jﮨ7v3Dt赻J9": null,
-                                                                "ࣝW䌈0ꍎqC逖,횅c၃swj;jJS櫍5槗OaB>D踾Y": {"㒰䵝F%?59.㍈cᕨ흕틎ḏ㋩B=9IېⓌ{:9.yw｝呰ㆮ肒᎒tI㾴62\"ዃ抡C﹬B<\/<EO꽓ᇕu&鋫\\禞퐹u꒍.7훯ಶ2䩦͉ᶱf깵ᷣ늎": [
-                                                                 5.5099570884646902E18,
-                                                                 "uQN濿m臇<%?谣鮢s]]x0躩慌闋<;( 鋤.0ᠵd1#벘a:Gs?햷'.)ㅴ䞟琯崈FS@O㌛ᓬ抢큌ើ냷쿟툥IZn[惵ꐧ3뙍[&v憙J>촋jo朣",
-                                                                 [
-                                                                  -7675533242647793366,
-                                                                  {"ᙧ呃:[㒺쳀쌡쏂H稈㢤\u001dᶗGG-{GHྻຊꡃ哸䵬;$?&d\\⥬こN圴됤挨-'ꕮ$PU%?冕눖i魁q騎Q": [
-                                                                   false,
-                                                                   [[
-                                                                    7929823049157504248,
-                                                                    [[
-                                                                     true,
-                                                                     "Z菙\u0017'eꕤ᱕l,0\\X\u001c[=雿8蠬L<\/낲긯W99g톉4ퟋb㝺\u0007劁'!麕Q궈oW:@X၎z蘻m絙璩귓죉+3柚怫tS捇蒣䝠-擶D[0=퉿8)q0ٟ",
-                                                                     "唉\nFA椭穒巯\\䥴䅺鿤S#b迅獘 ﶗ꬘\\?q1qN犠pX꜅^䤊⛤㢌[⬛휖岺q唻ⳡ틍\"㙙Eh@oA賑㗠y必Nꊑᗘ",
-                                                                     -2154220236962890773,
-                                                                     -3.2442003245397908E18,
-                                                                     "Wᄿ筠:瘫퀩?o貸q⊻(᎞KWf宛尨h^残3[U(='橄",
-                                                                     -7857990034281549164,
-                                                                     1.44283696979059942E18,
-                                                                     null,
-                                                                     {"ꫯAw跭喀 ?_9\"Aty背F=9缉ྦྷ@;?^鞀w:uN㘢Rỏ": [
-                                                                      7.393662029337442E15,
-                                                                      3564680942654233068,
-                                                                      [
-                                                                       false,
-                                                                       -5253931502642112194,
-                                                                       "煉\\辎ೆ罍5⒭1䪁䃑s䎢:[e5}峳ﴱn騎3?腳Hyꏃ膼N潭錖,Yᝋ˜YAၓ㬠bG렣䰣:",
-                                                                       true,
-                                                                       null,
-                                                                       {
-                                                                        "⒛'P&%죮|:⫶춞": -3818336746965687085,
-                                                                        "钖m<\/0ݎMtF2Pk=瓰୮洽겎.": [[
-                                                                         -8757574841556350607,
-                                                                         -3045234949333270161,
-                                                                         null,
-                                                                         {
-                                                                          "Ꮬr輳>⫇9hU##w@귪A\\C 鋺㘓ꖐ梒뒬묹㹻+郸嬏윤'+g<\/碴,}ꙫ>손;情d齆J䬁ຩ撛챝탹/R澡7剌tꤼ?ặ!`⏲睤\u00002똥଴⟏": null,
-                                                                          "\u20f2ܹe\\tAꥍư\\x当뿖렉禛;G檳ﯪS૰3~㘠#[J<}{奲 5箉⨔{놁<\/釿抋,嚠/曳m&WaOvT赋皺璑텁": [[
-                                                                           false,
-                                                                           null,
-                                                                           true,
-                                                                           -5.7131445659795661E18,
-                                                                           "萭m䓪D5|3婁ఞ>蠇晼6nﴺPp禽羱DS<睓닫屚삏姿",
-                                                                           true,
-                                                                           [
-                                                                            -8759747687917306831,
-                                                                            {
-                                                                             ">ⓛ\t,odKr{䘠?b퓸C嶈=DyEᙬ@ᴔ쨺芛髿UT퓻春<\/yꏸ>豚W釺N뜨^?꽴﨟5殺ᗃ翐%>퍂ဿ䄸沂Ea;A_\u0005閹殀W+窊?Ꭼd\u0013P汴G5썓揘": 4.342729067882445E-18,
-                                                                             "Q^즾眆@AN\u0011Kb榰냎Y#䝀ꀒᳺ'q暇睵s\"!3#I⊆畼寤@HxJ9": false,
-                                                                             "⿾D[)袨㇩i]웪䀤ᛰMvR<蟏㣨": {"v퇓L㪱ꖣ豛톤\\곱#kDTN": [{
-                                                                              "(쾴䡣,寴ph(C\"㳶w\"憳2s馆E!n!&柄<\/0Pꈗſ?㿳Qd鵔": {"娇堰孹L錮h嵅⛤躏顒?CglN束+쨣ﺜ\\MrH": {"獞䎇둃ቲ弭팭^ꄞ踦涟XK錆쳞ឌ`;੶S炥騞ଋ褂B៎{ڒ䭷ᶼ靜pI荗虶K$": [{"◖S~躘蒉꫿輜譝Q㽙闐@ᢗ¥E榁iء5┄^B[絮跉ᰥ遙PWi3wㄾⵀDJ9!w㞣ᄎ{듒ꓓb6\\篴??c⼰鶹⟧\\鮇ꮇ": [[
-                                                                               654120831325413520,
-                                                                               -1.9562073916357608E-19,
-                                                                               {
-                                                                                "DC(昐衵ἡ긙갵姭|֛[t": 7.6979110359897907E18,
-                                                                                "J␅))嫼❳9Xfd飉j7猬ᩉ+⤻眗벎E鰉Zﾶ63zၝ69}ZᶐL崭ᦥ⡦靚⋛ꎨ~i㨃咊ꧭo䰠阀3C(": -3.5844809362512589E17,
-                                                                                "p꣑팱쒬ꎑ뛡Ꙩ挴恍胔&7ᔈ묒4Hd硶훐㎖zꢼ豍㿢aሃ=<\/湉鵲EӅ%$F!퍶棌孼{O駍਺geu+": ")\u001b잓kŀX쩫A밁®ڣ癦狢)扔弒p}k縕ꩋ,䃉tࣼi",
-                                                                                "ァF肿輸<솄G-䢹䛸ꊏl`Tqꕗ蒞a氷⸅ᴉ蠰]S/{J왲m5{9.uέ~㕚㣹u>x8U讁B덺襪盎QhVS맅킃i识{벂磄Iහ䙅xZy/抍૭Z鲁-霳V据挦ℒ": null,
-                                                                                "㯛|Nꐸb7ⵐb?拠O\u0014ކ?-(EꞨ4ꕷᄤYᯕOW瞺~螸\"욿ќ<u鵵઎⸊倾쑷෻rT⪄牤銱;W殆͢芄ਰ嚝훚샢⊿+㲽": null,
-                                                                                "単逆ົ%_맛d)zJ%3칧_릟#95䌨怡\u001ci턠ॣi冘4赖'ਐ䧐_栔!": {
-                                                                                 "*?2~4㲌᭳쯁ftႷ1#oJ\b䊇镇됔 \u2079x䛁㊝ᮂN;穽跖s휇ᣄ홄傷z⸷(霸!3y뺏M쒿햏۽v㳉tở心3黎v쭻 Rp཮Vr~T?&˴k糒븥쩩r*D": null,
-                                                                                 "8@~홟ꔘk1[": -5570970366240640754,
-                                                                                 "BZt鏦ꡬc餖  s(mᛴ\u0000◄d腑t84C⟐坯VṊ뉙'噱Ꝕ珽GC顀?허0ꞹ&돇䛭C䷫](": 2.4303828213012387E-20,
-                                                                                 "y撔Z외放+}ḑ骈ᙝ&\u0016`G便2|-e]঳?QF㜹YF\"㿒緄햷㈟塚䷦ୀጤlM蘸N㾆▛럪㞂tᕬ镈쇝喠l amcxPnm\u001a᱋<\/]_]ﻹ瞧?H": false,
-                                                                                 "ፏ氏묢뜚I[♺뽛x?0H봬Wpn꨹Ra䝿쌑{㴂ni祻윸A'y|⺴ᚘ庌9{$恲{톽=m#@6ᨧfgs44陎J#<Ễ쨓瀵❩a୛㷉㙉ܸ◠냔嬯~呄籁羥镳": false,
-                                                                                 "㘱{<頬22?IF@곊I겂嶻L᝛D{@r쒂?IAᣧ洪惒誸b徂z췺꾍㠭\\刊%禨쌐ⶣ仵\\P[:47;<ᇅ<\/": {
-                                                                                  "^U釳-v㢈ꗝ◄菘rᜨi;起kR犺䵫\u0000锍쁙m-ԙ!lḃ꛸뻾F(W귛y": "#ᠺH㸢5v8_洑C",
-                                                                                  "䔵໳$ᙠ6菞\u206e摎q圩P|慍sV4:㜾(I溞I?": -6569206717947549676,
-                                                                                  "透Ꞃ緵퇝8 >e㺰\"'㌢ƐW\u0004瞕>0?V鷵엳": true,
-                                                                                  "뤥G\\迋䠿[庩'꼡\u001aiᩮV쯁ᳪ䦪Ô;倱ନ뛁誈": null,
-                                                                                  "쥹䄆䚟Q榁䎐᢭<\/2㕣p}HW蟔|䃏꿈ꚉ锳2Pb7㙑Tⅹᵅ": {
-                                                                                   "Y?֭$>#cVBꩨ:>eL蒁務": {
-                                                                                    "86柡0po 䏚&-捑Ћ祌<\/휃-G*㶢הּ쩍s㶟餇c걺yu꽎還5*턧簕Og婥SꝐ": null,
-                                                                                    "a+葞h٥ࠆ裈嗫ﵢ5輙퀟ᛜ,QDﹼ⟶Y騠锪E_|x죗j侵;m蜫轘趥?븅w5+mi콛L": {
-                                                                                     ";⯭ﱢ!买F⽍柤鶂n䵣V㫚墱2렾ELEl⣆": [
-                                                                                      true,
-                                                                                      -3.6479311868339015E-18,
-                                                                                      -7270785619461995400,
-                                                                                      3.334081886177621E18,
-                                                                                      2.581457786298155E18,
-                                                                                      -6.605252412954115E-20,
-                                                                                      -3.9232347037744167E-20,
-                                                                                      {
-                                                                                       "B6㊕.k1": null,
-                                                                                       "ZAꄮJ鮷ᳱo갘硥鈠䠒츼": {
-                                                                                        "ᕅ}럡}.@y陪鶁r業'援퀉x䉴ﵴl퍘):씭脴ᥞhiꃰblﲂ䡲엕8߇M㶭0燋標挝-?PCwe⾕J碻Ᾱ䬈䈥뷰憵賣뵓痬+": {"a췩v礗X⋈耓ፊf罅靮!㔽YYᣓw澍33⎔芲F|\"䜏T↮輦挑6ᓘL侘?ￆ]덆1R௯✎餘6ꏽ<\/௨\\?q喷ꁫj~@ulq": {"嗫欆뾔Xꆹ4H㌋F嵧]ࠎ]㠖1ꞤT<$m뫏O i댳0䲝i": {"?෩?\u20cd슮|ꯆjs{?d7?eNs⢚嫥氂䡮쎱:鑵롟2hJꎒﯭ鱢3춲亄:뼣v䊭諱Yj択cVmR䩃㘬T\"N홝*ै%x^F\\_s9보zz4淗?q": [
-                                                                                         null,
-                                                                                         "?",
-                                                                                         2941869570821073737,
-                                                                                         "{5{殇0䝾g6밖퍋臩綹R$䖭j紋釰7sXI繳漪행y",
-                                                                                         false,
-                                                                                         "aH磂?뛡#惇d婅?Fe,쐘+늵䍘\"3r瘆唊勐j⳧࠴ꇓ<\/唕윈x⬌讣䋵%拗ᛆⰿ妴᝔M2㳗必꧂淲?ゥ젯檢<8끒MidX䏒3᳻Q▮佐UT|⤪봦靏⊏",
-                                                                                         [[{
-                                                                                          "颉(&뜸귙{y^\"P퟉춝Ჟ䮭D顡9=?}Y誱<$b뱣RvO8cH煉＠tk~4ǂ⤧⩝屋SS;J{vV#剤餓ᯅc?#a6D,s": [
-                                                                                           -7.8781018564821536E16,
-                                                                                           true,
-                                                                                           [
-                                                                                            -2.28770899315832371E18,
-                                                                                            false,
-                                                                                            -1.0863912140143876E-20,
-                                                                                            -6282721572097446995,
-                                                                                            6767121921199223078,
-                                                                                            -2545487755405567831,
-                                                                                            false,
-                                                                                            null,
-                                                                                            -9065970397975641765,
-                                                                                            [
-                                                                                             -5.928721243413937E-20,
-                                                                                             {"6촊\u001a홯kB0w撨燠룉{绎6⳹!턍贑y▾鱧ժ[;7ᨷ∀*땒䪮1x霆Hᩭ☔\"r䝐7毟ᝰr惃3ꉭE+>僒澐": [
-                                                                                              "Ta쎩aƝt쵯ⰪVb",
-                                                                                              [
-                                                                                               -5222472249213580702,
-                                                                                               null,
-                                                                                               -2851641861541559595,
-                                                                                               null,
-                                                                                               4808804630502809099,
-                                                                                               5657671602244269874,
-                                                                                               "5犲﨣4mᥣ?yf젫꾯|䋬잁$`Iⳉﴷ扳兝,'c",
-                                                                                               false,
-                                                                                               [
-                                                                                                null,
-                                                                                                {
-                                                                                                 "DyUIN쎾M仼惀⮥裎岶泭lh扠\u001e礼.tEC癯튻@_Qd4c5S熯A<\/＼6U윲蹴Q=%푫汹\\\u20614b[௒C⒥Xe⊇囙b,服3ss땊뢍i~逇PA쇸1": -2.63273619193485312E17,
-                                                                                                 "Mq꺋貘k휕=nK硍뫞輩>㾆~἞ࡹ긐榵l⋙Hw뮢帋M엳뢯v⅃^": 1877913476688465125,
-                                                                                                 "ᶴ뻗`~筗免⚽টW˃⽝b犳䓺Iz篤p;乨A\u20ef쩏?疊m㝀컩뫡b탔鄃ᾈV(遢珳=뎲ିeF仢䆡谨8t0醄7㭧瘵⻰컆r厡궥d)a阄፷Ed&c﯄伮1p": null,
-                                                                                                 "⯁w4曢\"(欷輡": "\"M᭫]䣒頳B\\燧ࠃN㡇j姈g⊸⺌忉ꡥF矉স%^",
-                                                                                                 "㣡Oᄦ昵⫮Y祎S쐐級㭻撥>{I$": -378474210562741663,
-                                                                                                 "䛒掷留Q%쓗1*1J*끓헩ᦢ﫫哉쩧EↅIcꅡ\\?ⴊl귛顮4": false,
-                                                                                                 "寔愆샠5]䗄IH贈=d﯊/偶?ॊn%晥D視N򗘈'᫂⚦|X쵩넽z질tskxDQ莮Aoﱻ뛓": true,
-                                                                                                 "钣xp?&\u001e侉/y䴼~?U篔蘚缣/I畚?Q绊": -3034854258736382234,
-                                                                                                 "꺲໣眀)⿷J暘pИfAV삕쳭Nꯗ4々'唄ⶑ伻㷯騑倭D*Ok꧁3b␽_<\/챣Xm톰ၕ䆄`*fl㭀暮滠毡?": [
-                                                                                                  "D男p`V뙸擨忝븪9c麺`淂⢦Yw⡢+kzܖ\fY1䬡H歁)벾Z♤溊-혰셢?1<-\u0005;搢Tᐁle\\ᛵߓﭩ榩<QF;t=?Qꀞ",
-                                                                                                  [
-                                                                                                   null,
-                                                                                                   [{"-췫揲ᬨ墊臸<ࠒH跥 㔭쥃㫯W=z[wধ╌<~yW楄S!⑻h즓lĖN￧篌W듷튗乵᪪템먵Pf悥ᘀk䷭焼\\讄r擁鐬y6VF<\/6랿p)麡ꁠ㪁\"pழe": [
-                                                                                                    "#幎杴颒嶈)ㄛJ.嶤26_⋌东챯ꠉ⤋ؚ/⏚%秼Q룠QGztﾺ㎷អI翰Xp睔鍜ꨍ",
-                                                                                                    {",T?": [
-                                                                                                     false,
-                                                                                                     [[
-                                                                                                      true,
-                                                                                                      7974824014498027996,
-                                                                                                      false,
-                                                                                                      [
-                                                                                                       4.3305464880956252E18,
-                                                                                                       {
-                                                                                                        "᱿W^A]'rᮢ)鏥z餝;Hu\\Fk?ﴺ?IG浅-䙧>訝-xJ;巡8깊蠝ﻓU$K": {
-                                                                                                         "Vꕡ諅搓W=斸s︪vﲜ츧$)iꡟ싉e寳?ጭムVથ嵬i楝Fg<\/Z|៪ꩆ-5'@ꃱ80!燱R쇤t糳]罛逇dṌ֣XHiͦ{": true,
-                                                                                                         "Ya矲C멗Q9膲墅携휻c\\딶G甔<\/.齵휴": -1.1456247877031811E-19,
-                                                                                                         "z#.OO￝J": -8263224695871959017,
-                                                                                                         "崍_3夼ᮟ1F븍뽯ᦓ鴭V豈Ь": [{
-                                                                                                          "N蒬74": null,
-                                                                                                          "yuB?厅vK笗!ᔸcXQ旦컶P-녫mﾵ麟_": "1R@ 톘xa_|﩯遘s槞d!d껀筤⬫薐焵먑D{\\6k共倌☀G~AS_D\"딟쬚뮥馲렓쓠攥WTMܭ8nX㩴䕅檹E\u0007ﭨN 2 ℆涐ꥏ꠵3▙玽|됨_\u2048",
-                                                                                                          "恐A C䧩G": {":M큣5e들\\ꍀ恼ᔄ靸|I﨏$)n": {
-                                                                                                           "|U䬫㟯SKV6ꛤ㗮\bn봻䲄fＸT:㾯쳤'笓0b/ೢC쳖?2浓uO.䰴": "ཐ꼋e?``,ᚇ慐^8ꜙNM䂱\u0001IᖙꝧM'vKdꌊH牮r\\O@䊷ᓵ쀆(fy聻i툺\"?<\/峧ࣞ⓺ᤤ쵒߯ꎺ騬?)刦\u2072l慪y꺜ﲖTj+u",
-                                                                                                           "뽫<G;稳UL⸙q2n쵿C396炿J蓡z⣁zဩSOU?<\/뙍oE큸O鿅෴ꍈEm#\"[瑦⤫ᝆgl⡗q8\"큘덥係@ᆤ=\u0001爖羝췀㸩b9\\jeqt㟿㮸龾m㳳긄": {
-                                                                                                            "9\"V霟釜{/o0嫲C咀-饷䈍[녩)\r䤴tMW\\龟ϣ^ي㪙忩䞞N湆Y笕)萨ꖤ誥煽:14⫻57U$擒䲐薡Qvↇ櫲현誧?nஷ6": {"l웾䌵.䅋䦝ic碳g[糲Ƿ-ឈᚱ4쑧\u0004C࿼\u0018&쬑?멲<\/fD_檼픃pd쪼n㕊渪V䛉m揈W儅톳뗳䓆7㭽諤T煠Ney?0᪵鈑&": [
-                                                                                                             false,
-                                                                                                             null,
-                                                                                                             {
-                                                                                                              "\r;鼶j᠂꼍RLz~♔9gf?ӡ浐": -1.4843072575250897E-19,
-                                                                                                              "&ꊒ\"ꋟ䝭E诮ﯚO?SW뒁훪mb旙⎕ᗕ⶙|ᷤ5y4甥": "j5|庠t铱?v 횋0\"'rxz䃢杺Ɜ!\u0002",
-                                                                                                              "Q ၩ㟧": {"Hﬔ\u2058䪠틙izZㅛ탟H^ﶲA??R6呠Z솋R.࿶g8": [
-                                                                                                               -8762672252886298799,
-                                                                                                               -1.9486830507000208E17,
-                                                                                                               null,
-                                                                                                               -7157359405410123024,
-                                                                                                               null,
-                                                                                                               null,
-                                                                                                               -995856734219489233,
-                                                                                                               "呧㫹A4!",
-                                                                                                               null,
-                                                                                                               -1.9105609358624648E-19,
-                                                                                                               5888184370445333848,
-                                                                                                               2.25460605078245E-19,
-                                                                                                               2.5302739297121987E18,
-                                                                                                               "뢹sbEf捵2丯?뗾耸(Wd띙SବꭖrtU?筤P똙QpbbKqaE$来V웰3i/lK퉜,8︸e= g螓t竦컼?.寋8鵗",
-                                                                                                               7377742975895263424,
-                                                                                                               2.4218442017790503E-19,
-                                                                                                               {
-                                                                                                                "y꒚ཫ쨘醬킃糟}yTSt䡀⇂뿽4ൢ戰U": [[
-                                                                                                                 3600537227234741875,
-                                                                                                                 4435474101760273035,
-                                                                                                                 -1.42274517007951795E18,
-                                                                                                                 -5567915915496026866,
-                                                                                                                 null,
-                                                                                                                 null,
-                                                                                                                 [
-                                                                                                                  -3204084299154861161,
-                                                                                                                  {
-                                                                                                                   "7梧慸憏.a瘎\u00041U鵮Ck֨d惥耍ⳡY,⭏써E垁FFI鱑ⳬ줢7⧵Bﴠ耘줕햸q컴~*瑍W.떛ࡆ@'᐀+轳": -961121410259132975,
-                                                                                                                   "⥅]l黭㣓绶;!!⎃=朼㐿e&ἂ繤C﯀l䝣㌀6TM쑮w懃ꡡ#ᤆ䰓,墼湼゙뽸㲿䧽쫨xᵖ듨<\/ T0峸iQ:溫脐\\\"쎪ὴ砇宖^M泼큥➅鈫@ᄟ༩\u2008⥼": true,
-                                                                                                                   "⩐\"籽汎P싯鲘蟼sRᐯ䅩\u0019R(kRᖁ&ಌ 0\"鳶!馼YH": null,
-                                                                                                                   "鮼ꚇ싋։刟\rRLd步Nⴗ5Eࡆ訛갚[I醵NC(郴ṉy5D뤺౳QY壯5苴y훨(W\\Cଇ姚C艄깹\u001c歷㋵ZC᥂": [
-                                                                                                                    -6806235313106257498,
-                                                                                                                    null,
-                                                                                                                    "}N⸿讽sꚪ;\\p繇j苄䫨\u20e7%5x?t#",
-                                                                                                                    {
-                                                                                                                     "O〗k<墻yV$ఁrs-c1ఌ唪.C7_Yobᦜ褷'b帰mㄑl⌅": {"qB뗗擄3隂5뺍櫂䱟e촸P/鏩,3掁ꗩ=冉棓㑉|˞F襴뿴,:㞦<퓂⧙礞♗g뚎ᛩ<\/뉽ⶳ⸻A?_x2I㽝勒*I홱鍧粿~曟㤙2绥Ly6+썃uu鿜בf큘|歍ࣖÉ": [
-                                                                                                                      ">hh䈵w>1ⲏ쐭V[ⅎ\\헑벑F_㖝⠗㫇h恽;῝汰ᱼ瀖J옆9RR셏vsZ柺鶶툤r뢱橾/ꉇ囦FGm\"謗ꉦ⨶쒿⥡%]鵩#ᖣ_蹎 u5|祥?O",
-                                                                                                                      null,
-                                                                                                                      2.0150326776036215E-19,
-                                                                                                                      null,
-                                                                                                                      true,
-                                                                                                                      false,
-                                                                                                                      true,
-                                                                                                                      {"\fa᭶P捤WWc᠟f뚉ᬏ퓗ⳀW睹5:HXH=q7x찙X$)모r뚥ᆟ!Jﳸf": [
-                                                                                                                       -2995806398034583407,
-                                                                                                                       [
-                                                                                                                        6441377066589744683,
-                                                                                                                        "Mﶒ醹i)Gἦ廃s6몞 KJ౹礎VZ螺费힀\u0000冺업{谥'꡾뱻:.ꘘ굄奉攼Di᷑K鶲y繈욊阓v㻘}枭캗e矮1c?휐\"4\u0005厑莔뀾墓낝⽴洗ṹ䇃糞@b1\u0016즽Y轹",
-                                                                                                                        {
-                                                                                                                         "1⽕⌰鉟픏M㤭n⧴ỼD#%鐘⊯쿼稁븣몐紧ᅇ㓕ᛖcw嬀~ഌ㖓(0r⧦Q䑕髍ര铂㓻R儮\"@ꇱm❈௿᦯頌8}㿹犴?xn잆꥽R": 2.07321075750427366E18,
-                                                                                                                         "˳b18㗈䃟柵Z曆VTAu7+㛂cb0﯑Wp執<\/臋뭡뚋刼틮荋벲TLP预庰܈G\\O@VD'鱃#乖끺*鑪ꬳ?Mޞdﭹ{␇圯쇜㼞顄︖Y홡g": [{
-                                                                                                                          "0a,FZ": true,
-                                                                                                                          "2z̬蝣ꧦ驸\u0006L↛Ḣ4๚뿀'?lcwᄧ㐮!蓚䃦-|7.飑挴.樵*+1ﮊ\u0010ꛌ%貨啺/JdM:똍!FBe?鰴㨗0O财I藻ʔWA᫓G쳛u`<\/I": [{
-                                                                                                                           "$τ5V鴐a뾆両環iZp頻යn븃v": -4869131188151215571,
-                                                                                                                           "*즢[⦃b礞R◚nΰꕢH=귰燙[yc誘g䆌?ଜ臛": {
-                                                                                                                            "洤湌鲒)⟻\\䥳va}PeAMnＮ[": "㐳ɪ/(軆lZR,Cp殍ȮN啷\"3B婴?i=r$펽ᤐ쀸",
-                                                                                                                            "阄R4㒿㯔ڀ69ZᲦ2癁핌噗P崜#\\-쭍袛&鐑/$4童V꩑_ZHA澢fZ3": {"x;P{긳:G閉:9?活H": [
-                                                                                                                             "繺漮6?z犞焃슳\">ỏ[Ⳛ䌜녏䂹>聵⼶煜Y桥[泥뚩MvK$4jtﾛ",
-                                                                                                                             "E#갶霠좭㦻ୗ먵F+䪀o蝒ba쮎4X㣵 h",
-                                                                                                                             -335836610224228782,
-                                                                                                                             null,
-                                                                                                                             null,
-                                                                                                                             [
-                                                                                                                              "r1᫩0>danjY짿bs{",
-                                                                                                                              [
-                                                                                                                               -9.594464059325631E-23,
-                                                                                                                               1.0456894622831624E-20,
-                                                                                                                               null,
-                                                                                                                               5.803973284253454E-20,
-                                                                                                                               -8141787905188892123,
-                                                                                                                               true,
-                                                                                                                               -4735305442504973382,
-                                                                                                                               9.513150514479281E-20,
-                                                                                                                               "7넳$螔忷㶪}䪪l짴\u0007鹁P鰚HF銏ZJﳴ/⍎1ᷓ忉睇ᜋ쓈x뵠m䷐窥Ꮤ^\u0019ᶌ偭#ヂt☆၃pᎍ臶䟱5$䰵&๵分숝]䝈뉍♂坎\u0011<>",
-                                                                                                                               "C蒑貑藁lﰰ}X喇몛;t밿O7/᯹f\u0015kI嘦<ዴ㟮ᗎZ`GWퟩ瑹࡮ᅴB꿊칈??R校s脚",
-                                                                                                                               {
-                                                                                                                                "9珵戬+AU^洘拻ቒy柭床'粙XG鞕᠜繀伪%]hC,$輙?Ut乖Qm떚W8઼}~q⠪rU䤶CQ痗ig@#≲t샌f㈥酧l;y闥ZH斦e⸬]j⸗?ঢ拻퀆滌": null,
-                                                                                                                                "畯}㧢J罚帐VX㨑>1ꢶkT⿄蘥㝑o|<嗸層沈挄GEOM@-䞚䧰$만峬輏䠱V✩5宸-揂D'㗪yP掶7b⠟J㕻SfP?d}v㼂Ꮕ'猘": {
-                                                                                                                                 "陓y잀v>╪": null,
-                                                                                                                                 "鬿L+7:됑Y=焠U;킻䯌잫!韎ஔ\f": {
-                                                                                                                                  "駫WmGጶ": {
-                                                                                                                                   "\\~m6狩K": -2586304199791962143,
-                                                                                                                                   "ႜࠀ%͑l⿅D.瑢Dk%0紪dḨTI픸%뗜☓s榗኉\"?V籄7w髄♲쟗翛歂E䤓皹t ?)ᄟ鬲鐜6C": {
-                                                                                                                                    "_췤a圷1\u000eB-XOy缿請∎$`쳌eZ~杁튻/蜞`塣৙\"⪰\"沒l}蕌\\롃荫氌.望wZ|o!)Hn獝qg}": null,
-                                                                                                                                    "kOSܧ䖨钨:಼鉝ꭝO醧S`십`ꓭ쭁ﯢN&Et㺪馻㍢ⅳ㢺崡ຊ蜚锫\\%ahx켨|ż劻ꎄ㢄쐟A躊᰹p譞綨Ir쿯\u0016ﵚOd럂*僨郀N*b㕷63z": {
-                                                                                                                                     ":L5r+T㡲": [{
-                                                                                                                                      "VK泓돲ᮙRy㓤➙Ⱗ38oi}LJቨ7Ó㹡৘*q)1豢⛃e᫛뙪壥镇枝7G藯g㨛oI䄽 孂L缊ꋕ'EN`": -2148138481412096818,
-                                                                                                                                      "`⛝ᘑ$(खꊲ⤖ᄁꤒ䦦3=)]Y㢌跨NĴ驳줟秠++d孳>8ᎊ떩EꡣSv룃 쯫أ?#E|᭙㎐?zv:5祉^⋑V": [
-                                                                                                                                       -1.4691944435285607E-19,
-                                                                                                                                       3.4128661569395795E17,
-                                                                                                                                       "㐃촗^G9佭龶n募8R厞eEw⺡_ㆱ%⼨D뉄퉠2ꩵᛅⳍ搿L팹Lවn=\"慉념ᛮy>!`g!풲晴[/;?[v겁軇}⤳⤁핏∌T㽲R홓遉㓥",
-                                                                                                                                       "愰_⮹T䓒妒閤둥?0aB@㈧g焻-#~跬x<\/舁P݄ꐡ=\\׳P\u0015jᳪᢁq;㯏l%᭗;砢觨▝,謁ꍰGy?躤O黩퍋Y㒝a擯\n7覌똟_䔡]fJ晋IAS",
-                                                                                                                                       4367930106786121250,
-                                                                                                                                       -4.9421193149720582E17,
-                                                                                                                                       null,
-                                                                                                                                       {
-                                                                                                                                        ";ﾸ똾柉곟ⰺKpፇ䱻ฺ䖝{o~h!ｅꁿ઻욄ښ\u0002y?xUd\u207c悜ꌭ": [
-                                                                                                                                         1.6010824122815255E-19,
-                                                                                                                                         [
-                                                                                                                                          "宨︩9앉檥pr쇷?WxLb",
-                                                                                                                                          "氇9】J玚\u000f옛呲~ 輠1D嬛,*mW3?n휂糊γ虻*ᴫ꾠?q凐趗Ko↦GT铮",
-                                                                                                                                          "㶢ថmO㍔k'诔栀Z蛟}GZ钹D",
-                                                                                                                                          false,
-                                                                                                                                          -6.366995517736813E-20,
-                                                                                                                                          -4894479530745302899,
-                                                                                                                                          null,
-                                                                                                                                          "V%᫡II璅䅛䓎풹ﱢ/pU9se되뛞x梔~C)䨧䩻蜺(g㘚R?/Ự[忓C뾠ࢤc왈邠买?嫥挤풜隊枕",
-                                                                                                                                          ",v碍喔㌲쟚蔚톬៓ꭶ",
-                                                                                                                                          3.9625444752577524E-19,
-                                                                                                                                          null,
-                                                                                                                                          [
-                                                                                                                                           "kO8란뿒䱕馔b臻⍟隨\"㜮鲣Yq5m퐔<u뷆c譆\u001bN?<",
-                                                                                                                                           [{
-                                                                                                                                            ";涉c蒀ᴧN䘱䤳 ÿꭷ,핉dSTDB>K#ꢘug㼈ᝦ=P^6탲@䧔%$CqSw铜랊0&m⟭<\/a逎ym\u0013vᯗ": true,
-                                                                                                                                            "洫`|XN뤮\u0018詞=紩鴘_sX)㯅鿻Ố싹": 7.168252736947373E-20,
-                                                                                                                                            "ꛊ饤ﴏ袁(逊+~⽫얢鈮艬O힉7D筗S곯w操I斞᠈븘蓷x": [[[[
-                                                                                                                                             -7.3136069426336952E18,
-                                                                                                                                             -2.13572396712722688E18,
-                                                                                                                                             {
-                                                                                                                                              "硢3㇩R:o칢行E<=\u0018ၬYuH!\u00044U%卝炼2>\u001eSi$⓷ꒈ'렢gᙫ番ꯒ㛹럥嶀澈v;葷鄕x蓎\\惩+稘UEᖸﳊ㊈壋N嫿⏾挎,袯苷ኢ\\x|3c": 7540762493381776411,
-                                                                                                                                              "?!*^ᢏ窯?\u0001ڔꙃw虜돳FgJ?&⨫*uo籤:?}ꃹ=ٴ惨瓜Z媊@ત戹㔏똩Ԛ耦Wt轁\\枒^\\ꩵ}}}ꀣD\\]6M_⌫)H豣:36섘㑜": {
-                                                                                                                                               ";홗ᰰU஋㙛`D왔ཿЃS회爁\u001b-㢈`봆?盂㛣듿ᦾ蒽_AD~EEຆ㊋(eNwk=Rɠ峭q\"5Ἠ婾^>'ls\n8QAK<l_⭨穟": [
-                                                                                                                                                true,
-                                                                                                                                                true,
-                                                                                                                                                {"ﳷm箅6qⷈ?ﲈ憟b۷⫉἞V뚴少U呡瓴ꉆs~嘵得㌶4XR漊": [
-                                                                                                                                                 "폆介fM暪$9K[ㄇ샍큳撦g撟恸jҐF㹹aj bHᘀ踉ꎐＣ粄 a?\u000fK즉郝 幨9D舢槷Xh뵎u훩Ꜿ턾ƅ埂P埆k멀{䢹~?D<\/꼢XR\u001b〱䝽꼨i㘀ḟ㚺A-挸",
-                                                                                                                                                 false,
-                                                                                                                                                 null,
-                                                                                                                                                 -1.1710758021294953E-20,
-                                                                                                                                                 3996737830256461142,
-                                                                                                                                                 true,
-                                                                                                                                                 null,
-                                                                                                                                                 -8271596984134071193,
-                                                                                                                                                 "_1G퉁텑m䮔鰼6멲Nmꇩſt쓟튍N许FDj+3^ﶜ⎸\u0019⤕橥!\"s-뾞lz北׸ꍚ랬)?l⻮고i䑰\u001f䪬",
-                                                                                                                                                 4.459124464204517E-19,
-                                                                                                                                                 -4.0967172848578447E18,
-                                                                                                                                                 5643211135841796287,
-                                                                                                                                                 -9.482336221192844E-19,
-                                                                                                                                                 "౪冏釶9D?s螭X榈枸j2秀v]泌鰚岒聵轀쌶i텽qMbL]R,",
-                                                                                                                                                 null,
-                                                                                                                                                 [
-                                                                                                                                                  null,
-                                                                                                                                                  {"M쪊ꯪ@;\u0011罙ꕅ<e᝺|爑Yⵝ<\/&ᩎ<腊ሑᮔ੃F豭": [
-                                                                                                                                                   "^0࡟1볏P폋ፏ杈F⨥Iꂴ\"z磣VⅡ=8퀝2]䢹h1\u0017{jT<I煛5%D셍S⑙⅏J*샐 巙ດ;᧡䙞",
-                                                                                                                                                   [{
-                                                                                                                                                    "'㶡큾鄧`跊\"gV[?u᭒Ʊ髷%葉굵a띦N켧Qﯳy%y䩟髒L䯜S䵳r絅肾킂ၐ'ꔦg긓a'@혔যW谁ᝬF栩ŷ+7w鞚": 6.3544416675584832E17,
-                                                                                                                                                    "苎脷v改hm쏵|㋊g_ᔐ 뒨蹨峟썎㷸|Ο刢?Gͨ옛-?GꦱIEYUX4?%ꘋᆊ㱺": -2.8418378709165287E-19,
-                                                                                                                                                    "誰?(H]N맘]k洳\"q蒧蘞!R퐫\\(Q$T5N堍⫣윿6|럦속︅ﭗ(": [
-                                                                                                                                                     "峩_\u0003A瘘?✓[硫䎯ၽuጭ\"@Y綅첞m榾=贮9R벿῜Z",
-                                                                                                                                                     null,
-                                                                                                                                                     "䰉㗹㷾Iaᝃqcp쓘὾൫Q|ﵓ<\/ḙ>)- Q䲌mo펹L_칍樖庫9꩝쪹ᘹ䑖瀍aK ?*趤f뭓廝p=磕",
-                                                                                                                                                     "哑z懅ᤏ-ꍹux쀭",
-                                                                                                                                                     [
-                                                                                                                                                      true,
-                                                                                                                                                      3998739591332339511,
-                                                                                                                                                      "ጻ㙙?᳸aK<\/囩U`B3袗ﱱ?\"/k鏔䍧2l@쿎VZ쨎/6ꃭ脥|B?31+on颼-ꮧ,O嫚m ࡭`KH葦:粘i]aSU쓙$쐂f+詛頖b",
-                                                                                                                                                      [{"^<9<箝&絡;%i﫡2攑紴\\켉h쓙-柂䚝ven\u20f7浯-Ꮏ\r^훁䓚헬\u000e?\\ㅡֺJ떷VOt": [{
-                                                                                                                                                       "-௄卶k㘆혐஽y⎱㢬sS઄+^瞥h;ᾷj;抭\u0003밫f<\/5Ⱗ裏_朻%*[-撵䷮彈-芈": {
-                                                                                                                                                        "㩩p3篊G|宮hz䑊o곥j^Co0": [
-                                                                                                                                                         653239109285256503,
-                                                                                                                                                         {"궲?|\":N1ۿ氃NZ#깩:쇡o8킗ࡊ[\"됸Po핇1(6鰏$膓}⽐*)渽J'DN<썙긘毦끲Ys칖": {
-                                                                                                                                                          "2Pr?Xjㆠ?搮/?㓦柖馃5뚣Nᦼ|铢r衴㩖\"甝湗ܝ憍": "\"뾯i띇筝牻$珲/4ka $匝휴译zbAᩁꇸ瑅&뵲衯ꎀᆿ7@ꈋ'ᶨH@ᠴl+",
-                                                                                                                                                          "7뢽뚐v?4^ꊥ_⪛.>pởr渲<\/⢕疻c\"g䇘vU剺dஔ鮥꒚(dv祴X⼹\\a8y5坆": true,
-                                                                                                                                                          "o뼄B욞羁hr﷔폘뒚⿛U5pꪴfg!6\\\"爑쏍䢱W<ﶕ\\텣珇oI/BK뺡'谑♟[Ut븷亮g(\"t⡎有?ꬊ躺翁艩nl F⤿蠜": 1695826030502619742,
-                                                                                                                                                          "ۊ깖>ࡹ햹^ⵕ쌾BnN〳2C䌕tʬ]찠?ݾ2饺蹳ぶꌭ訍\"◹ᬁD鯎4e滨T輀ﵣ੃3\u20f3킙D瘮g\\擦+泙ၧ 鬹ﯨַ肋7놷郟lP冝{ߒhড়r5,꓋": null,
-                                                                                                                                                          "ΉN$y{}2\\N﹯ⱙK'8ɜͣwt,．钟廣䎘ꆚk媄_": null,
-                                                                                                                                                          "䎥eᾆᝦ읉,Jުn岪㥐s搖謽䚔5t㯏㰳㱊ZhD䃭f絕s鋡篟a`Q鬃┦鸳n_靂(E4迠_觅뷝_宪D(NL疶hL追V熑%]v肫=惂!㇫5⬒\u001f喺4랪옑": {
-                                                                                                                                                           "2a輍85먙R㮧㚪Sm}E2yꆣꫨrRym㐱膶ᔨ\\t綾A☰.焄뙗9<쫷챻䒵셴᭛䮜.<\/慌꽒9叻Ok䰊Z㥪幸k": [
-                                                                                                                                                            null,
-                                                                                                                                                            true,
-                                                                                                                                                            {"쌞쐍": {
-                                                                                                                                                             "▟GL K2i뛱iＱ\"̠.옛1X$}涺]靎懠ڦ늷?tf灟ݞゟ{": 1.227740268699265E-19,
-                                                                                                                                                             "꒶]퓚%ฬK❅": [{
-                                                                                                                                                              "(ෛ@Ǯっ䧼䵤[aﾃൖvEnAdU렖뗈@볓yꈪ,mԴ|꟢캁(而첸죕CX4Y믅": "2⯩㳿ꢚ훀~迯?᪑\\啚;4X\u20c2襏B箹)俣eỻw䇄",
-                                                                                                                                                              "75༂f詳䅫ꐧ鏿 }3\u20b5'∓䝱虀f菼Iq鈆﨤g퍩)BFa왢d0뮪痮M鋡nw∵謊;ꝧf美箈ḋ*\u001c`퇚퐋䳫$!V#N㹲抗ⱉ珎(V嵟鬒_b㳅\u0019": null,
-                                                                                                                                                              "e_m@(i㜀3ꦗ䕯䭰Oc+-련0뭦⢹苿蟰ꂏSV䰭勢덥.ྈ爑Vd,ᕥ=퀍)vz뱊ꈊB_6듯\"?{㒲&㵞뵫疝돡믈%Qw限,?\r枮\"? N~癃ruࡗdn&": null,
-                                                                                                                                                              "㉹&'Pfs䑜공j<\/?|8oc᧨L7\\pXᭁ 9᪘": -2.423073789014103E18,
-                                                                                                                                                              "䝄瑄䢸穊f盈᥸,B뾧푗횵B1쟢f\u001f凄": "魖⚝2儉j꼂긾껢嗎0ࢇ纬xI4](੓`蕞;픬\fC\"斒\")2櫷I﹥迧",
-                                                                                                                                                              "ퟯ詔x悝령+T?Bg⥄섅kOeQ큼㻴*{E靼6氿L缋\u001c둌๶-㥂2==-츫I즃㠐Lg踞ꙂEG貨鞠\"\u0014d'.缗gI-lIb䋱ᎂDy缦?": null,
-                                                                                                                                                              "紝M㦁犿w浴詟棓쵫G:䜁?V2ힽ7N*n&㖊Nd-'ຊ?-樹DIv⊜)g䑜9뉂ㄹ푍阉~ꅐ쵃#R^\u000bB䌎䦾]p.䀳": [{"ϒ爛\"ꄱ︗竒G䃓-ま帳あ.j)qgu扐徣ਁZ鼗A9A鸦甈!k蔁喙:3T%&㠘+,䷞|챽v䚞문H<\/醯r셓㶾\\a볜卺zE䝷_죤ဵ뿰᎟CB": [
-                                                                                                                                                               6233512720017661219,
-                                                                                                                                                               null,
-                                                                                                                                                               -1638543730522713294,
-                                                                                                                                                               false,
-                                                                                                                                                               -8901187771615024724,
-                                                                                                                                                               [
-                                                                                                                                                                3891351109509829590,
-                                                                                                                                                                true,
-                                                                                                                                                                false,
-                                                                                                                                                                -1.03836679125188032E18,
-                                                                                                                                                                {
-                                                                                                                                                                 "<?起HCᷭ죎劐莇逰/{gs\u0014⽛㰾愫tￖ<솞ڢ됌煲膺਻9x닳x࡭Q訽,ᶭඦtt掾\"秧㺌d˪䙻꫗:ᭈh4緞痐䤴c뫚떩త<?ᕢ謚6]폛O鰐鋛镠贩赟\"<G♷1'": true,
-                                                                                                                                                                 "቙ht4ߝBqꦤ+\u0006멲趫灔)椾": -1100102890585798710,
-                                                                                                                                                                 "総兎곇뇸粟F醇;朠?厱楛㶆ⶏ7r⾛o꯬᳡F\\머幖 㜦\f[搦᥽㮣0䕊?J㊳뀄e㔔+?<n↴复": [
-                                                                                                                                                                  "4~ꉍ羁\\偮(泤叕빜\u0014>j랎:g曞ѕᘼ}链N",
-                                                                                                                                                                  -1.1103819473845426E-19,
-                                                                                                                                                                  true,
-                                                                                                                                                                  [
-                                                                                                                                                                   true,
-                                                                                                                                                                   null,
-                                                                                                                                                                   -7.9091791735309888E17,
-                                                                                                                                                                   true,
-                                                                                                                                                                   {"}蔰鋈+ꐨ啵0?g*사%`J?*": [{
-                                                                                                                                                                    "\"2wG?yn,癷BK\\龞䑞x?蠢": -3.7220345009853505E-19,
-                                                                                                                                                                    ";饹়❀)皋`噿焒j(3⿏w>偍5X<np?<줯<Y]捘!J೸UⳂNे7v௸㛃ᄧ톿䨷鯻v焇=烻TQ!F⦰䣣눿K鷚눁'⭲m捠(䚻": [
-                                                                                                                                                                     "蹕 淜੃b\"+몾ⴕ",
-                                                                                                                                                                     null,
-                                                                                                                                                                     35892237756161615,
-                                                                                                                                                                     {
-                                                                                                                                                                      " 듹㏝)5慁箱&$~:遰쮐<\/堋?% \\勽唅z손帋䘺H髀麡M퇖uz\u0012m諦d᳤콌樝\rX싹̡Ო": -433791617729505482,
-                                                                                                                                                                      "-j溗ࢵcz!:}✽5ഇ,욨ݏs#덫=南浺^}E\\Y\\T*뼈cd꺐cۘ뎁䨸됱K䠴㉿恿逳@wf쏢<\/[L[": -9.3228549642908109E17,
-                                                                                                                                                                      "Ms킭u஗%\\u⍎/家欲ἅ答㓽/꯳齳|㭘Pr\"v<\/禇䔆$GA䊻˔-:틊[h?倬荤ᾞ৳.Gw\u000b": [
-                                                                                                                                                                       "0宜塙I@䏴蝉\\Uy뒅=2<h暒K._贡璐Yi檻_⮵uᐝ㘗聠[f\u0015힢Hꔮ}጑;誏yf0\"\u20cc?(=q斠➽5ꎾ鞘kⲃ",
-                                                                                                                                                                       -2.9234211354411E-19,
-                                                                                                                                                                       false,
-                                                                                                                                                                       true,
-                                                                                                                                                                       {
-                                                                                                                                                                        "\u0011⟴GH_;#怵:\u001c\u0002n1U\\p/왔(┫]hꐚ7\r0䵷첗岷O௷?㝎[殇|J=?韷pᶟ儜犆?5კ1kꍖiH竧뛈ପdmk游y(콪팱꾍k慧 y辣": [
-                                                                                                                                                                         false,
-                                                                                                                                                                         "O\"끍p覈ykv磂㢠㝵~뀬튍lC&4솎䇃:Mj",
-                                                                                                                                                                         -7.009964654003924E-20,
-                                                                                                                                                                         false,
-                                                                                                                                                                         -49306078522414046,
-                                                                                                                                                                         null,
-                                                                                                                                                                         null,
-                                                                                                                                                                         2160432477732354319,
-                                                                                                                                                                         true,
-                                                                                                                                                                         "4횡h+!踹ꐬP鮄{0&뱥M?샍鞅n㮞ᨹ?쒆毪l'箅^ꚥ頛`e㻨52柳⮙嫪࡟딯a.~䵮1f吘N&zȭL榓ۃ鳠5d㟆M@㣥ӋA΍q0縶$",
-                                                                                                                                                                         -3.848996532974368E16,
-                                                                                                                                                                         true,
-                                                                                                                                                                         null,
-                                                                                                                                                                         -3.5240055580952525E18,
-                                                                                                                                                                         {
-                                                                                                                                                                          " vﭷၵ#ce乃5僞?Z D`묨粇ᐔ绠vWL譢u뽀\\J|tⓙt№\"ꨋnT凮ᒩ蝂篝b騩:䢭Hbv읻峨z㹚T趗햆귣학津XiＹ@ᖥK": true,
-                                                                                                                                                                          "!F 醌y䉸W2ꇬ\u0006/䒏7~%9擛햀徉9⛰+?㌘;ꠓX䇻Dfi뼧쒒\u0012F謞՝絺+臕kऍLSQ쌁X쎬幦HZ98蒊枳": "澤令#\u001d抍⛳@N搕퀂[5,✄ꘇ~䘷?\u0011Xꈺ[硸⠘⛯X醪聡x\u0007쌇MiX/|ﾐ뚁K8䁡W)銀q僞綂蔕E",
-                                                                                                                                                                          "6␲䣖R৞@ငg?<\/೴x陙Xꈺ崸⠅ᇾ\\0X,H쟴셭A稂ힿゝF\\쑞\u0012懦(Aᯕ灭~\u0001껮X?逊": 5.7566819207732864E17,
-                                                                                                                                                                          "[c?椓": false,
-                                                                                                                                                                          "k䒇": 2583824107104166717,
-                                                                                                                                                                          "꙯N훙㏅ﮒ燣㨊瞯咽jMxby뻭뵫װ[\"1畈?ৱL": "띣ᔂ魠羓犴ꚃ+|rY",
-                                                                                                                                                                          "녺Z?䬝鉉:?ⳙ瘏Cኯ.Vs[釿䨉쐧\\\\*쵢猒$\\y溔^,㑳": {"藶꺟": [{
-                                                                                                                                                                           "\"d훣N2zq]?'檿죸忷篇ﮟ擤m'9!죶≓p뭻\\ᇷ\f퇶_䰸h๐Q嵃訾㘑従ꯦ䞶jL틊r澵Omᾫ!H䱤팼/;|᭺I7슎YhuXi⚼": -1.352716906472438E-19,
-                                                                                                                                                                           "M⽇倻5J䂫औ᝔楸#J[Fﹱ쫮W誻bWz?}1\"9硪뻶fe": "盬:Ѹ砿획땣T凊(m灦呜ﻝR㿎艴䂵h",
-                                                                                                                                                                           "R띾k힪CH钙_i苮ⰵoᾨ紑퉎7h؉\"柀蝽z0့\"<?嘭$蜝?礲7岇槀묡?V钿T⣜v+솒灚ԛ2米mH?>薙婏聿3aFÆÝ": "2,ꓴg?_섦_>Y쪥션钺;=趘F~?D㨫\bX?㹤+>/믟kᠪ멅쬂Uzỵ]$珧`m雁瑊ඖ鯬cꙉ梢f묛bB",
-                                                                                                                                                                           "♽n$YjKiXX*GO贩鏃豮祴遞K醞眡}ꗨv嵎꼷0୸+M菋eH徸J꣆:⼐悥B켽迚㯃b諂\u000bjꠜ碱逮m8": [
-                                                                                                                                                                            "푷᣺ﻯd8ﱖ嬇ភH鹎⡱᱅0g:果6$GQ췎{vᷧYy-脕x偹砡館⮸C蓼ꏚ=軄H犠G谖ES詤Z蠂3l봟hￒ7䦹1GPQG癸숟~[#駥8zQ뛣J소obg,",
-                                                                                                                                                                            null,
-                                                                                                                                                                            1513751096373485652,
-                                                                                                                                                                            null,
-                                                                                                                                                                            -6.851466660824754E-19,
-                                                                                                                                                                            {"䩂-⴮2ٰK솖풄꾚ႻP앳1H鷛wmR䗂皎칄?醜<\/&ࠧ㬍X濬䵈K`vJ륒Q/IC묛!;$vϑ": {
-                                                                                                                                                                             "@-ꚗxྐྵ@m瘬\u0010U絨ﮌ驐\\켑寛넆T=tQ㭤L연@脸삯e-:⩼u㎳VQ㋱襗ຓ<Ⅶ䌸cML3+\u001e_C)r\\9+Jn\\Pﺔ8蠱檾萅Pq鐳话T䄐I": -1.80683891195530061E18,
-                                                                                                                                                                             "ᷭዻU~ཷsgSJ`᪅'%㖔n5픆桪砳峣3獮枾䌷⊰呀": {
-                                                                                                                                                                              "Ş੉䓰邟自~X耤pl7间懑徛s첦5ਕXexh⬖鎥᐀nNr(J컗｜ૃF\"Q겮葲놔엞^겄+㈆话〾희紐G'E?飕1f❼텬悚泬먐U睬훶Qs": false,
-                                                                                                                                                                              "(\u20dag8큽튣>^Y{뤋.袊䂓;_g]S\u202a꽬L;^'#땏bႌ?C緡<䝲䲝断ꏏ6\u001asD7IK5Wxo8\u0006p弊⼂ꯍ扵\u0003`뵂픋%ꄰ⫙됶l囏尛+䗅E쟇\\": [
-                                                                                                                                                                               true,
-                                                                                                                                                                               {
-                                                                                                                                                                                "\n鱿aK㝡␒㼙2촹f;`쾏qIࡔG}㝷䐍瓰w늮*粅9뒪ㄊCj倡翑閳R渚MiUO~仨䜶RꙀA僈㉋⦋n{㖥0딿벑逦⥻0h薓쯴Ꝼ": [
-                                                                                                                                                                                 5188716534221998369,
-                                                                                                                                                                                 2579413015347802508,
-                                                                                                                                                                                 9.010794400256652E-21,
-                                                                                                                                                                                 -6.5327297761238093E17,
-                                                                                                                                                                                 1.11635352494065523E18,
-                                                                                                                                                                                 -6656281618760253655,
-                                                                                                                                                                                 {
-                                                                                                                                                                                  "": ")?",
-                                                                                                                                                                                  "TWKLꑙ裑꺔UE俸塑炌Ũ᜕-o\"徚#": {"M/癟6!oI51ni퐚=댡>xꍨ\u0004 ?": {
-                                                                                                                                                                                   "皭": {"⢫䋖>u%w잼<䕏꘍P䋵$魋拝U䮎緧皇Y훂&|羋ꋕ잿cJ䨈跓齳5\u001a삱籷I꿾뤔S8㌷繖_Yឯ䲱B턼O歵F\\l醴o_欬6籏=D": [
-                                                                                                                                                                                    false,
-                                                                                                                                                                                    true,
-                                                                                                                                                                                    {"Mt|ꏞD|F궣MQ뵕T,띺k+?㍵i": [
-                                                                                                                                                                                     7828094884540988137,
-                                                                                                                                                                                     false,
-                                                                                                                                                                                     {
-                                                                                                                                                                                      "!༦鯠,&aﳑ>[euJꏽ綷搐B.h": -7648546591767075632,
-                                                                                                                                                                                      "-n켧嘰{7挐毄Y,>❏螵煫乌pv醑Q嶚!|⌝責0왾덢ꏅ蛨S\\)竰'舓Q}A釡5#v": 3344849660672723988,
-                                                                                                                                                                                      "8閪麁V=鈢1녈幬6棉⪮둌\u207d᚛驉ꛃ'r䆉惏ै|bἧﺢᒙ<=穊强s혧eꮿ慩⌡ \\槳W븧J檀C,ᘉ의0俯퀉M;筷ࣴ瓿{늊埂鄧_4揸Nn阼Jੵ˥(社": true,
-                                                                                                                                                                                      "o뼀vw)4A뢵(a䵢)p姃뛸\u000fK#KiQp\u0005ꅍ芅쏅": null,
-                                                                                                                                                                                      "砥$ꥸ┇耽u斮Gc{z빔깎밇\\숰\u001e괷各㶇쵿_ᴄ+h穢p촀Ნ䃬z䝁酳ӂ31xꔄ1_砚W렘G#2葊P ": [
-                                                                                                                                                                                       -3709692921720865059,
-                                                                                                                                                                                       null,
-                                                                                                                                                                                       [
-                                                                                                                                                                                        6669892810652602379,
-                                                                                                                                                                                        -135535375466621127,
-                                                                                                                                                                                        "뎴iO}Z? 馢녱稹ᄾ䐩rSt帤넆&7i騏멗畖9誧鄜'w{Ͻ^2窭외b㑎粖i矪ꦨ탪跣)KEㆹ\u0015V8[W?⽉>'kc$䨘ᮛ뉻٬M5",
-                                                                                                                                                                                        1.10439588726055846E18,
-                                                                                                                                                                                        false,
-                                                                                                                                                                                        -4349729830749729097,
-                                                                                                                                                                                        null,
-                                                                                                                                                                                        [
-                                                                                                                                                                                         false,
-                                                                                                                                                                                         "_蠢㠝^䟪/D녒㡋ỎC䒈판\u0006એq@O펢%;鹐쏌o戥~A[ꡉ濽ỳ&虃᩾荣唙藍茨Ig楡꒻M窓冉?",
-                                                                                                                                                                                         true,
-                                                                                                                                                                                         2.17220752996421728E17,
-                                                                                                                                                                                         -5079714907315156164,
-                                                                                                                                                                                         -9.960375974658589E-20,
-                                                                                                                                                                                         "ᾎ戞༒",
-                                                                                                                                                                                         true,
-                                                                                                                                                                                         false,
-                                                                                                                                                                                         [[
-                                                                                                                                                                                          "ⶉᖌX⧕홇)g엃⹪x뚐癟\u0002",
-                                                                                                                                                                                          -5185853871623955469,
-                                                                                                                                                                                          {
-                                                                                                                                                                                           "L㜤9ợㇶK鐰⋓V뽋˖!斫as|9＂፬䆪?7胜&n薑~": -2.11545634977136992E17,
-                                                                                                                                                                                           "O8뀩D}캖q萂6༣㏗䈓煮吽ਆᎼDᣘ폛;": false,
-                                                                                                                                                                                           "YTᡅ^L㗎cbY$pᣞ縿#fh!ꘂb삵玊颟샞ဢ$䁗鼒몁~rkH^:닮먖츸륈⪺쒉砉?㙓扫㆕꣒`R䢱B酂?C뇞<5Iޚ讳騕S瞦z": null,
-                                                                                                                                                                                           "\\RB?`mG댵鉡幐物䵎有5*e骄T㌓ᛪ琾駒Ku\u001a[柆jUq8⋈5鿋츿myﻗ?雍ux঴?": 5828963951918205428,
-                                                                                                                                                                                           "n0晅:黯 xu씪^퓞cB㎊ᬍ⺘٤փ~B岚3㥕擄vᲂ~F?C䶖@$m~忔S왖㲚?챴⊟W#벌{'㰝I䝠縁s樘\\X뢻9핡I6菍ㄛ8쯶]wॽ0L\"q": null,
-                                                                                                                                                                                           "x增줖j⦦t䏢᎙㛿Yf鼘~꫓恄4惊\u209c": "oOhbᤃ᛽z&Bi犑\\3B㩬劇䄑oŁ쨅孥멁ຖacA㖫借㞝vg싰샂㐜#譞⢤@k]鋰嘘䜾L熶塥_<\/⍾屈ﮊ_mY菹t뙺}Ox=w鮮4S1ꐩמּ'巑",
-                                                                                                                                                                                           "㗓蟵ꂾe蠅匳(JP䗏෸\u0089耀왲": [{
-                                                                                                                                                                                            "ᤃ㵥韎뤽\r?挥O쯡⇔㞚3伖\u0005P⋪\"D궣QLn(⚘罩䩢Ŏv䤘尗뼤됛O淽鋋闚r崩a{4箙{煷m6〈": {
-                                                                                                                                                                                             "l곺1L": {
-                                                                                                                                                                                              "T'ਤ?砅|੬Km]䄩\"(࿶<\/6U爢䫈倔郴l2㴱^줣k'L浖L鰄Rp今鎗⒗C얨M훁㡧ΘX粜뫈N꤇輊㌻켑#㮮샶-䍗룲蠝癜㱐V>=\\I尬癤t=": 7648082845323511446,
-                                                                                                                                                                                              "鋞EP:<\/_`ၧe混ㇹBd⯢㮂驋\\q碽饩跓྿ᴜ+j箿렏㗑yK毢宸p謹h䦹乕U媣\\炤": [[
-                                                                                                                                                                                               "3",
-                                                                                                                                                                                               [
-                                                                                                                                                                                                true,
-                                                                                                                                                                                                3.4058271399411134E-20,
-                                                                                                                                                                                                true,
-                                                                                                                                                                                                "揀+憱f逮@먻BpW曉\u001a㣐⎊$n劈D枤㡞좾\u001aᛁ苔౩闝1B䷒Ṋ݋➐ꀞꐃ磍$t੤_:蘺⮼(#N",
-                                                                                                                                                                                                697483894874368636,
-                                                                                                                                                                                                [
-                                                                                                                                                                                                 "vᘯ锴)0訶}䳅⩚0O壱韈ߜ\u0018*U鍾䏖=䧉뽑单휻ID쿇嘗?ꌸῬ07",
-                                                                                                                                                                                                 -5.4858784319382006E18,
-                                                                                                                                                                                                 7.5467775182251151E18,
-                                                                                                                                                                                                 -8911128589670029195,
-                                                                                                                                                                                                 -7531052386005780140,
-                                                                                                                                                                                                 null,
-                                                                                                                                                                                                 [
-                                                                                                                                                                                                  null,
-                                                                                                                                                                                                  true,
-                                                                                                                                                                                                  [[{
-                                                                                                                                                                                                   "1欯twG<u䝮␽ꇣ_ჟﱴଶ-쪋\"?홺k:莝Ꜫ*⺵꽹댅釔좵}P?=9렿46b\u001c\\S?(筈僦⇶爷谰1ྷa": true,
-                                                                                                                                                                                                   "TҫJYxڪ\\鰔℮혡)m_WVi眪1[71><\/Q:0怯押殃탷聫사<ỗꕧ蚨䡁nDꌕ\u001c녬~蓩<N蹑\"{䫥lKc혁뫖앺:vⵑ": "g槵?",
-                                                                                                                                                                                                   "aꨩ뻃싥렌1`롗}Yg>鲃g儊>ꏡl㻿/⑷*챳6㻜W毤緛ﹺᨪ4\u0013뺚J髬e3쳸䘦伧?恪&{L掾p+꬜M䏊d娘6": {
-                                                                                                                                                                                                    "2p첼양棜h䜢﮶aQ*c扦v︥뮓kC寵횂S銩&ǝ{O*य़iH`U큅ࡓr䩕5ꄸ?`\\᧫?ᮼ?t〟崾훈k薐ì/ｉy꤃뵰z1<\/AQ#뿩8jJ1z@u䕥": 1.82135747285215155E18,
-                                                                                                                                                                                                    "ZdN &=d년ᅆ'쑏ⅉ:烋5&៏ᄂ汎来L㯄固{钧u\\㊏튚e摑&t嗄ꖄUb❌?m䴘熚9EW": [{
-                                                                                                                                                                                                     "ଛ{i*a(": -8.0314147546006822E17,
-                                                                                                                                                                                                     "⫾ꃆY\u000e+W`௸ \"M뒶+\\뷐lKE}(NT킶Yj選篒쁶'jNQ硾(똡\\\"逌ⴍy? IRꜘ὞鄬﨧:M\\f⠋Cꚜ쫊ᚴNV^D䕗ㅖἔIao꿬C⍏8": [
-                                                                                                                                                                                                      287156137829026547,
-                                                                                                                                                                                                      {
-                                                                                                                                                                                                       "H丞N逕<rO䎗:텕<\/䶩샌Sd%^ᵯ눐엑者g䖩똭蕮1U驣?Pⰰ\u001fp(W]67\u0015﫣6굺OR羸#촐F蒈;嘙i✵@_撶y㤏⤍(:᧗뼢༌朆@⏰㤨ꭲ?-n>⯲": {"": {
-                                                                                                                                                                                                        "7-;枮阕梒9ᑄZ": [[[[
-                                                                                                                                                                                                         null,
-                                                                                                                                                                                                         {
-                                                                                                                                                                                                          "": [[[[
-                                                                                                                                                                                                           -7.365909561486078E-19,
-                                                                                                                                                                                                           2948694324944243408,
-                                                                                                                                                                                                           null,
-                                                                                                                                                                                                           [
-                                                                                                                                                                                                            true,
-                                                                                                                                                                                                            "荒\"并孷䂡쵼9o䀘F\u0002龬7⮹Wz%厖/*? a*R枈㌦됾g뒠䤈q딄㺿$쮸tᶎ릑弣^鏎<\/Y鷇驜L鿽<\/춋9Mᲆឨ^<\/庲3'l낢",
-                                                                                                                                                                                                            "c鮦\u001b두\\~?眾ಢu݆綑෪蘛轋◜gȃ<\/ⴃcpkDt誩܅\"Y",
-                                                                                                                                                                                                            [[
-                                                                                                                                                                                                             null,
-                                                                                                                                                                                                             null,
-                                                                                                                                                                                                             [
-                                                                                                                                                                                                              3113744396744005402,
-                                                                                                                                                                                                              true,
-                                                                                                                                                                                                              "v(y",
-                                                                                                                                                                                                              {
-                                                                                                                                                                                                               "AQ幆h쾜O+꺷铀ꛉ練A蚗⼺螔j㌍3꽂楎䥯뎸먩?": null,
-                                                                                                                                                                                                               "蠗渗iz鱖w]擪E": 1.2927828494783804E-17,
-                                                                                                                                                                                                               "튷|䀭n*曎b✿~杤U]Gz鄭kW|㴚#㟗ഠ8u擨": [[
-                                                                                                                                                                                                                true,
-                                                                                                                                                                                                                null,
-                                                                                                                                                                                                                null,
-                                                                                                                                                                                                                {"⾪壯톽g7?㥜ώQꑐ㦀恃㧽伓\\*᧰閖樧뢇赸N휶䎈pI氇镊maᬠ탷#X?A+kНM ༑᩟؝?5꧎鰜ṚY즫궔 =ঈ;ﳈ?*s|켦蜌wM笙莔": [
-                                                                                                                                                                                                                 null,
-                                                                                                                                                                                                                 -3808207793125626469,
-                                                                                                                                                                                                                 [
-                                                                                                                                                                                                                  -469910450345251234,
-                                                                                                                                                                                                                  7852761921290328872,
-                                                                                                                                                                                                                  -2.7979740127017492E18,
-                                                                                                                                                                                                                  1.4458504352519893E-20,
-                                                                                                                                                                                                                  true,
-                                                                                                                                                                                                                  "㽙깹?먏䆢:䴎ۻg殠JBTU⇞}ꄹꗣi#I뵣鉍r혯~脀쏃#釯:场:䔁>䰮o'㼽HZ擓௧nd",
-                                                                                                                                                                                                                  [
-                                                                                                                                                                                                                   974441101787238751,
-                                                                                                                                                                                                                   null,
-                                                                                                                                                                                                                   -2.1647718292441327E-19,
-                                                                                                                                                                                                                   1.03602824249831488E18,
-                                                                                                                                                                                                                   [
-                                                                                                                                                                                                                    null,
-                                                                                                                                                                                                                    1.0311977941822604E-17,
-                                                                                                                                                                                                                    false,
-                                                                                                                                                                                                                    true,
-                                                                                                                                                                                                                    {
-                                                                                                                                                                                                                     "": -3.7019778830816707E18,
-                                                                                                                                                                                                                     "E峾恆茍6xLIm縂0n2视֯J-ᤜz+ᨣ跐mYD豍繹⹺䊓몓ﴀE(@詮(!Y膽#᎙2䟓섣A䈀㟎,囪QbK插wcG湎ꤧtG엝x⥏俎j'A一ᯥ뛙6ㅑ鬀": 8999803005418087004,
-                                                                                                                                                                                                                     "よ殳\\zD⧅%Y泥簳Uꈩ*wRL{3#3FYHା[d岀䉯T稉駅䞘礄P:闈W怏ElB㤍喬赔bG䠼U଄Nw鰯闀楈ePsDꥷ꭬⊊": [
-                                                                                                                                                                                                                      6.77723657904486E-20,
-                                                                                                                                                                                                                      null,
-                                                                                                                                                                                                                      [
-                                                                                                                                                                                                                       "ཚ_뷎꾑蹝q'㾱ꂓ钚蘞慵렜떆`ⴹ⎼櫯]J?[t9Ⓢ !컶躔I᮸uz>3a㠕i,錃L$氰텰@7녫W㸮?羧W뇧ꃞ,N鋮숪2ɼ콏┍䁲6",
-                                                                                                                                                                                                                       "&y?뢶=킕올Za惻HZk>c\u20b58i?ꦶcfBv잉ET9j䡡",
-                                                                                                                                                                                                                       "im珊Ճb칧<D-諂*u2ꡜ췛~䬢(텸ﵦ>校\\뼾쯀",
-                                                                                                                                                                                                                       9.555715121193197E-20,
-                                                                                                                                                                                                                       true,
-                                                                                                                                                                                                                       {
-                                                                                                                                                                                                                        "<㫚v6腓㨭e1㕔&&V∌ᗈT奄5Lጥ>탤?튣瑦㳆ꉰ!(ᙪ㿬擇_n쌯IMΉ㕨␰櫈ᱷ5풔蟹&L.첽e鰷쯃劼﫭b#ﭶ퓀7뷄Wr㢈๧Tʴશ㶑澕鍍%": -1810142373373748101,
-                                                                                                                                                                                                                        "fg晌o?߲ꗄ;>C>?=鑰監侯Kt굅": true,
-                                                                                                                                                                                                                        "䫡蓺ꑷ]C蒹㦘\"1ః@呫\u0014NL䏾eg呮፳,r$裢k>/\\<z": [[
-                                                                                                                                                                                                                         null,
-                                                                                                                                                                                                                         "C䡏>?ㄤᇰﻛ쉕1஥'Ċ\" \\_?쨔\"ʾr: 9S䘏禺ᪧꄂ㲄",
-                                                                                                                                                                                                                         [[{
-                                                                                                                                                                                                                          "*硙^+E쌺I1䀖ju?:⦈Ꞓl๴竣迃xKC/饉:\fl\"XTFﾨ蟭,芢<\/骡軺띜hꏘ\u001f銿<棔햳▨(궆*=乥b8\\媦䷀뫝}닶ꇭ(Kej䤑M": [{
-                                                                                                                                                                                                                           "1Ꮼ?>옿I╅C<ގ?ꊌ冉SV5A㢊㶆z-๎玶绢2F뵨@㉌뀌o嶔f9-庒茪珓뷳4": null,
-                                                                                                                                                                                                                           ";lᰳ": "CbB+肻a䄷苝*/볳+/4fq=㰁h6瘉샴4铢Y骐.⌖@哼猎㦞+'gꋸ㒕ߤ㞑(䶒跲ti⑴a硂#No볔",
-                                                                                                                                                                                                                           "t?/jE幸YHT셵⩎K!Eq糦ꗣv刴w\"l$ο:=6:移": {
-                                                                                                                                                                                                                            "z]鑪醊嫗J-Xm銌翁絨c里됏炙Ep㣋鏣똼嚌䀓GP﹖cmf4鹭T䅿꣭姧␸wy6ꦶ;S&(}ᎧKxᾂQ|t뻳k\"d6\"|Ml췆hwLt꼼4$&8Պ褵婶鯀9": {"嵃닢ᒯ'd᧫䳳#NXe3-붋鸿ଢ떓%dK\u0013䲎ꖍYV.裸R⍉rR3蟛\\:젯:南ĺLʆ넕>|텩鴷矔ꋅⒹ{t孶㓑4_": [
-                                                                                                                                                                                                                             true,
-                                                                                                                                                                                                                             null,
-                                                                                                                                                                                                                             [
-                                                                                                                                                                                                                              false,
-                                                                                                                                                                                                                              "l怨콈lᏒ",
-                                                                                                                                                                                                                              {
-                                                                                                                                                                                                                               "0w䲏嬧-:`䉅쉇漧\\܂yㄨb%㽄j7ᦶ涶<": 3.7899452730383747E-19,
-                                                                                                                                                                                                                               "ꯛTẀq纤q嶏V⿣?\"g}ი艹(쥯B T騠I=仵및X": {"KX6颠+&ᅃ^f畒y[": {
-                                                                                                                                                                                                                                "H?뱜^?꤂-⦲1a㋞&ꍃ精Ii᤾챪咽쬘唂쫷<땡劈훫놡o㥂\\ KⴙD秼F氮[{'좴:례晰Iq+I쭥_T綺砸GO煝䟪ᚪ`↹l羉q쐼D꽁ᜅ훦: vUV": true,
-                                                                                                                                                                                                                                "u^yﳍ0㱓#[y뜌앸ꊬL㷩?蕶蘾⻍KӼ": -7931695755102841701,
-                                                                                                                                                                                                                                "䤬轉車>\u001c鴵惋\"$쯃྆⇻n뽀G氠S坪]ಲꨍ捇Qxኻ椕駔\\9ࣼ﫻읜磡煮뺪ᶚ볝l㕆t+sζ": [[[
-                                                                                                                                                                                                                                 true,
-                                                                                                                                                                                                                                 false,
-                                                                                                                                                                                                                                 [
-                                                                                                                                                                                                                                  null,
-                                                                                                                                                                                                                                  3363739578828074923,
-                                                                                                                                                                                                                                  true,
-                                                                                                                                                                                                                                  {
-                                                                                                                                                                                                                                   "\"鸣詩 볰㑵gL㯦῅춝旫}ED辗ﮈI쀤-ꧤ|㠦Z\"娑ᕸ4爏騍㣐\"]쳝Af]茛⬻싦o蚁k䢯䩐菽3廇喑ޅ": 4.5017999150704666E17,
-                                                                                                                                                                                                                                   "TYႇ7ʠ值4챳唤~Zo&ݛ": false,
-                                                                                                                                                                                                                                   "`塄J袛㭆끺㳀N㺣`꽐嶥KﯝSVᶔ∲퀠獾N딂X\"ᤏhNﬨvI": {"\u20bb㭘I䖵䰼?sw䂷쇪](泒f\"~;꼪Fԝsᝦ": {"p,'ꉂ軿=A蚶?bƉ㏵䅰諬'LYKL6B깯⋩겦뎙(ᜭ\u0006噣d꾆㗼Z;䄝䚔cd<情@䞂3苼㸲U{)<6&ꩻ钛\u001au〷N숨囖愙j=BXW욕^x芜堏Ῑ爂뛷꒻t✘Q\b": [[
-                                                                                                                                                                                                                                    "籛&ଃ䩹.ꃩ㦔\\C颫#暪&!勹ꇶ놽攺J堬镙~軌C'꾖䣹㮅岃ᙴ鵣",
-                                                                                                                                                                                                                                    4.317829988264744E15,
-                                                                                                                                                                                                                                    6.013585322002147E-20,
-                                                                                                                                                                                                                                    false,
-                                                                                                                                                                                                                                    true,
-                                                                                                                                                                                                                                    null,
-                                                                                                                                                                                                                                    null,
-                                                                                                                                                                                                                                    -3.084633632357326E-20,
-                                                                                                                                                                                                                                    false,
-                                                                                                                                                                                                                                    null,
-                                                                                                                                                                                                                                    {
-                                                                                                                                                                                                                                     "\"짫愔昻  X\"藣j\"\"먁ཅѻ㘤㬯0晲DU꟒㸃d벀윒l䦾c੻*3": null,
-                                                                                                                                                                                                                                     "谈Wm陧阦咟ฯ歖擓N喴㋐銭rCCnVࢥ^♼Ⅾ젲씗刊S༝+_t赔\\b䚍뉨ꬫ6펛cL䊘᜼<\/澤pF懽&H": [
-                                                                                                                                                                                                                                      null,
-                                                                                                                                                                                                                                      {
-                                                                                                                                                                                                                                       "W\"HDUuΌ퀟M'P4࿰H똆ⰱﮯ<\/凐蘲\"C鴫ﭒж}ꭩ쥾t5yd诪ﮡ퍉ⴰ@?氐醳rj4I6Qt": 6.9090159359219891E17,
-                                                                                                                                                                                                                                       "絛ﳛ⺂": {"諰P㗮聦`ZQ?ꫦh*റcb⧱}埌茥h{棩렛툽o3钛5鮁l7Q榛6_g)ὄ\u0013kj뤬^爖eO4Ⱈ槞鉨ͺ订%qX0T썗嫷$?\\\"봅늆'%": [
-                                                                                                                                                                                                                                        -2.348150870600346E-19,
-                                                                                                                                                                                                                                        [[
-                                                                                                                                                                                                                                         true,
-                                                                                                                                                                                                                                         -6619392047819511778,
-                                                                                                                                                                                                                                         false,
-                                                                                                                                                                                                                                         [[
-                                                                                                                                                                                                                                          -1.2929189982356161E-20,
-                                                                                                                                                                                                                                          1.7417192219309838E-19,
-                                                                                                                                                                                                                                          {"?嵲2࿐2\u0001啑㷳c縯": [
-                                                                                                                                                                                                                                           null,
-                                                                                                                                                                                                                                           [
-                                                                                                                                                                                                                                            false,
-                                                                                                                                                                                                                                            true,
-                                                                                                                                                                                                                                            2578060295690793218,
-                                                                                                                                                                                                                                            {
-                                                                                                                                                                                                                                             "?\"殃呎#㑑F": true,
-                                                                                                                                                                                                                                             "}F炊_殛oU헢兔Ꝉ,赭9703.B数gTz3⏬": {
-                                                                                                                                                                                                                                              "5&t3,햓Mݸᵣ㴵;꣫䩍↳#@뫷䠅+W-ࣇzᓃ鿕ಔ梭?T䮑ꥬ旴]u뫵막bB讍:왳둛lEh=숾鱠p咐$짏#?g⹷ᗊv㷵.斈u頻\u0018-G.": "뽙m-ouࣤ஫牷\"`Ksꕞ筼3HlȨvC堈\"I]㖡玎r먞#'W賜鴇k'c룼髋䆿飉㗆xg巤9;芔cጐ/ax䊨♢큓r吓㸫೼䢗da᩾\"]屣`",
-                                                                                                                                                                                                                                              ":M딪<䢥喠\u0013㖅x9蕐㑂XO]ｆ*Q呰瞊吭VP@9,㨣 D\\穎vˤƩs㜂-曱唅L걬/롬j㈹EB8g<\/섩o渀\"u0y&룣": ">氍緩L/䕑돯Ꟙ蕞^aB뒣+0jK⪄瑨痜LXK^힦1qK{淚t츔X:Vm{2r獁B뾄H첚7氥?쉟䨗ꠂv팳圎踁齀\\",
-                                                                                                                                                                                                                                              "D彤5㢷Gꪻ[lㄆ@὜⓰絳[ଃ獽쮹☒[*0ꑚ㜳": 9022717159376231865,
-                                                                                                                                                                                                                                              "ҖaV銣tW+$魿\u20c3亜~뫡ᙰ禿쨽㏡fṼzE/h": "5臐㋇Ჯ쮺? 昨탰Wﾑ밎#'\"崲钅U?幫뺀⍾@4kh>騧\\0ҾEV=爐͌U捀%ꉼ 㮋<{j]{R>:gԩL\u001c瀈锌ﯲﳡꚒ'⫿E4暍㌗뵉X\"H᝜",
-                                                                                                                                                                                                                                              "ᱚגּ;s醒}犍SἿ㦣&{T$jkB\\\tḮ앾䤹o<避(tW": "vb⯽䴪䮢@|)",
-                                                                                                                                                                                                                                              "⥒퐁껉%惀뗌+녣迺顀q條g⚯i⤭룐M琹j̈́⽜A": -8385214638503106917,
-                                                                                                                                                                                                                                              "逨ꊶZ<\/W⫟솪㎮ᘇb?ꠔi\"H㧺x෷韒Xꫨฟ|]窽\u001a熑}Agn?Mᶖa<rఄ4Ů䢤슲Axģe곖㴤x竾郍B謉鸵k薽M)\"芣眜`菉ꉛ䴺": "鹏^ె캫?3耲]|Ü1䡒㝮]8e?䶍^",
-                                                                                                                                                                                                                                              "뿸樅#P㡊1M룮Uꪭ绢ꑮZ9꽸": {"\nJ^є|3袄ㅐ7⨆銦y睝⋷仴ct?[,<\/ㅬ`?갔髞%揁A೚C": {
-                                                                                                                                                                                                                                               " 䇞3갫䅪": [{
-                                                                                                                                                                                                                                                "0|⩁㑂砕ㅻ": null,
-                                                                                                                                                                                                                                                "D箳᠉`|=⼭)\"*࣊㦏LjO誋": "",
-                                                                                                                                                                                                                                                "ࠚDZmꗥ}ᷴ╈r7헴ȥ4Kp5a)o}鎘门L搰䆓'✎k俎c#T68ӏ⩶6L鎴<r൦$黊BQY㼳\\跿F慮⡨拵贀!甶V喅/": null,
-                                                                                                                                                                                                                                                "ⵣq⳹ﻨLk]晩1*y\\$%}䖶P煑㇆䈦E嫁櫕Y࣓嫨䓏OL낮梚㸇洛洚BYtgl∛S☕䉓宑⋢粚ꔯ꠼붠": ")ꬑ윤`\"Ⱓ<\/婽*Y䔸ᓰ_ﳍt슲坩隥&S糧䛮闵诌豐sh쯽邴*섴؏͎=㯨\"RVힳ,^t\"ac?䤒ꉀxHa=Uꛕ㐙TkF껾",
-                                                                                                                                                                                                                                                "弾cUAF?暤c덽.欀nK앭]r傊䀓ﯳ馽垃[䥛oI0N砊鈥헅Co쟋钄ㅷ㊌뷚7": [
-                                                                                                                                                                                                                                                 null,
-                                                                                                                                                                                                                                                 "૓鏨?^䆏{\u0006`X䧵儱&롡尙砡\u0006뻝쑬sj▻XfᬶgcㄢV >9韲4$3Ỵ^=쏍煤ፐ돷2䣃%鷠/eQ9頸쥎",
-                                                                                                                                                                                                                                                 2398360204813891033,
-                                                                                                                                                                                                                                                 false,
-                                                                                                                                                                                                                                                 3.2658897259932633E-19,
-                                                                                                                                                                                                                                                 null,
-                                                                                                                                                                                                                                                 "?ꚃ8Nn㞷幵d䲳䱲뀙ꪛQ瑓鎴]䩋-鰾捡䳡??掊",
-                                                                                                                                                                                                                                                 false,
-                                                                                                                                                                                                                                                 -1309779089385483661,
-                                                                                                                                                                                                                                                 "ᦲxu_/yecR.6芏.ᜇ過 ~",
-                                                                                                                                                                                                                                                 -5658779764160586501,
-                                                                                                                                                                                                                                                 "쒌:曠=l썜䢜wk#s蕚\"互㮉m䉤~0듐䋙#G;h숄옥顇෤勹(C7㢅雚㐯L⠅VV簅<",
-                                                                                                                                                                                                                                                 null,
-                                                                                                                                                                                                                                                 -4.664877097240962E18,
-                                                                                                                                                                                                                                                 -4.1931322262828017E18,
-                                                                                                                                                                                                                                                 {
-                                                                                                                                                                                                                                                  ",": {
-                                                                                                                                                                                                                                                   "v㮟麑䄠뤵g{M띮.\u001bzt뢜뵡0Ǥ龍떟Ᾰ怷ϓRT@Lꀌ樂U㏠⾕e扉|bJg(뵒㠶唺~ꂿ(땉x⻫싉쁊;%0鎻V(o\f,N鏊%nk郼螺": -1.73631993428376141E18,
-                                                                                                                                                                                                                                                   "쟧摑繮Q@Rᕾ㭚㾣4隅待㓎3蒟": [
-                                                                                                                                                                                                                                                    4971487283312058201,
-                                                                                                                                                                                                                                                    8973067552274458613,
-                                                                                                                                                                                                                                                    {
-                                                                                                                                                                                                                                                     "`a揙ᣗ\u0015i<S幼訃锭B0&槩✨[Wp皩[g≊k葾x2ᡆ橲䲢W": true,
-                                                                                                                                                                                                                                                     "kH皈Sꁱq傑u?솹풑~o^F=劣N*reJ沤wW苯7p㼹䎐a=ꮧL㷩냴nWꌑ㞱uu谁lVN珿᤻(e豶5#L쪉ᅄ઄\u0015숟봊P瀚X蓎": false,
-                                                                                                                                                                                                                                                     "䫯דּ〖Sc䛭점L뵾pCꙞ\"엇즓_ﰛ톣ꫀ먩㺣㮠⭴!\\W┏t䖰軅y\u0014~ᇰ렢E7*俜䥪W䀩䷐h봆vjஉ묣༏G39.뼳輼:㮿ᐦA饕TUL}~": [
-                                                                                                                                                                                                                                                      null,
-                                                                                                                                                                                                                                                      8.8648298810470003E17,
-                                                                                                                                                                                                                                                      5.735561205600924E-20,
-                                                                                                                                                                                                                                                      null,
-                                                                                                                                                                                                                                                      -102555823658171644,
-                                                                                                                                                                                                                                                      1.2674932032973067E-19,
-                                                                                                                                                                                                                                                      {
-                                                                                                                                                                                                                                                       "D胣O㯨\u0017Ku눓㒏텁nᨊ!Ꚇ廫_>Bo¸": 4.3236479112537999E18,
-                                                                                                                                                                                                                                                       "HW&퉡ぁ圍<W)6悰ꠑHEp14xy峑ft\u0005s亘V튉䢮ꦈX嵐꬝?lI_덝춇-6Ss噺Nk-ﮥ큃܁郪*PR(S6╋@仙V懸뺵ﯜV粹": "9䗌斀4㐈^Qs隄硏j\u0003",
-                                                                                                                                                                                                                                                       "Vk鶅C泹筁HX훉朗*r\\z顊誌儖4?n7᏾6몋䎡ﳈ],H頢p蚐㑄P4满E䏩V䬕ญL廂쒬쑨ꆷh迡ꍰ譖墎 ]鹿ฌ7ﶽ冭༽<ꈓS\\l䋮?_ﾕ檒?": -8598528325153980065,
-                                                                                                                                                                                                                                                       "t=q퍣疻тZ\\錅J.镎|nfḷ鴒1厰L灯纜E]୦⥪]Ꮾ'羝p/咩0닳ﳁqﳖཽk ?X1Ft%ś뭢v鋋⺃爵⒗": [[
-                                                                                                                                                                                                                                                        5.0824756359232045E-19,
-                                                                                                                                                                                                                                                        [
-                                                                                                                                                                                                                                                         7.268480839079619E-19,
-                                                                                                                                                                                                                                                         {"탿^굞⧕iј덊ꀛw껩6ꟳXs酚\\>Y?瑡Qy훍q!帰敏s舠㫸zꚗaS歲v`G株巷Jp6킼 (귶鍔⾏⡈>M汐㞍ቴ꙲dv@i㳓ᇆ?黍": [
-                                                                                                                                                                                                                                                          null,
-                                                                                                                                                                                                                                                          4997607199327183467,
-                                                                                                                                                                                                                                                          "E㻎蠫ᐾ高䙟蘬洼旾﫠텛㇛?'M$㣒蔸=A_亀绉앭rN帮",
-                                                                                                                                                                                                                                                          null,
-                                                                                                                                                                                                                                                          [{
-                                                                                                                                                                                                                                                           "Eᑞ)8<Z㡿W镀䛒C생V?0ꯦ+tL)`齳AjB姀XೳD빠㻲ƙgn9⑰ྍ῜&\"㚹>餧A5u&㗾q?": [
-                                                                                                                                                                                                                                                            -1.969987519306507E-19,
-                                                                                                                                                                                                                                                            null,
-                                                                                                                                                                                                                                                            [
-                                                                                                                                                                                                                                                             3.42437673373841E-20,
-                                                                                                                                                                                                                                                             true,
-                                                                                                                                                                                                                                                             "e걷M墁\"割P␛퍧厀R䱜3ﻴO퓫r﹉⹊",
-                                                                                                                                                                                                                                                             [
-                                                                                                                                                                                                                                                              -8164221302779285367,
-                                                                                                                                                                                                                                                              [
-                                                                                                                                                                                                                                                               true,
-                                                                                                                                                                                                                                                               null,
-                                                                                                                                                                                                                                                               "爘y^-?蘞Ⲽꪓa␅ꍨ}I",
-                                                                                                                                                                                                                                                               1.4645984996724427E-19,
-                                                                                                                                                                                                                                                               [{
-                                                                                                                                                                                                                                                                "tY좗⧑mrzﺝ㿥ⴖ᥷j諅\u0000q賋譁Ꞅ⮱S\nࡣB/큃굪3Zɑ复o<\/;롋": null,
-                                                                                                                                                                                                                                                                "彟h浠_|V4䦭Dᙣ♞u쿻=삮㍦\u001e哀鬌": [{"6횣楠,qʎꗇ鎆빙]㱭R굋鈌%栲j分僅ペ䇰w폦p蛃N溈ꡐꏀ?@(GI뉬$ﮄ9誁ꓚ2e甸ڋ[䁺,\u0011\u001cࢃ=\\+衪䷨ᯕ鬸K": [[
-                                                                                                                                                                                                                                                                 "ㅩ拏鈩勥\u000etgWVXs陂規p狵w퓼{뮵_i\u0002ퟑႢ⬐d6鋫F~챿搟\u0096䚼1ۼ칥0꣯儏=鋷牋ⅈꍞ龐",
-                                                                                                                                                                                                                                                                 -7283717290969427831,
-                                                                                                                                                                                                                                                                 true,
-                                                                                                                                                                                                                                                                 [
-                                                                                                                                                                                                                                                                  4911644391234541055,
-                                                                                                                                                                                                                                                                  {
-                                                                                                                                                                                                                                                                   "I鈒첽P릜朸W徨觘-Hᎄ퐟⓺>8kr1{겵䍃〛ᬡ̨O귑o䝕'쿡鉕p5": "fv粖RN瞖蛐a?q꤄\u001d⸥}'ꣴ犿ꦼ?뤋?鵆쥴덋䡫s矷̄?ඣ/;괱絢oWfV<\/\u202cC,㖦0䑾%n賹g&T;|lj_欂N4w",
-                                                                                                                                                                                                                                                                   "짨䠗;䌕u i+r๏0": [{"9䥁\\఩8\"馇z䇔<\/ႡY3e狚쐡\"ุ6ﰆZ遖c\"Ll:ꮾ疣<\/᭙Ｏ◌납୕湞9⡳Und㫜\u0018^4pj1;䧐儂䗷ୗ>@e톬": {
-                                                                                                                                                                                                                                                                    "a⑂F鋻Q螰'<퇽Q贝瀧{ᘪ,cP&~䮃Z?gＩ彃": [
-                                                                                                                                                                                                                                                                     -1.69158726118025933E18,
-                                                                                                                                                                                                                                                                     [
-                                                                                                                                                                                                                                                                      "궂z簽㔛㮨瘥⤜䛖Gℤ逆Y⪾j08Sn昞ꘔ캻禀鴚P謦b{ꓮmN靐Mᥙ5\"睏2냑I\u0011.L&=?6ᄠ뻷X鸌t刑\"#z)o꫚n쳟줋",
-                                                                                                                                                                                                                                                                      null,
-                                                                                                                                                                                                                                                                      7517598198523963704,
-                                                                                                                                                                                                                                                                      "ኑQp襟`uᩄr方]*F48ꔵn俺ሙ9뇒",
-                                                                                                                                                                                                                                                                      null,
-                                                                                                                                                                                                                                                                      null,
-                                                                                                                                                                                                                                                                      6645782462773449868,
-                                                                                                                                                                                                                                                                      1219168146640438184,
-                                                                                                                                                                                                                                                                      null,
-                                                                                                                                                                                                                                                                      {
-                                                                                                                                                                                                                                                                       ")ယ넌竀Sd䰾zq⫣⏌ʥ\u0010ΐ' |磪&p牢蔑mV蘸૰짬꺵;K": [
-                                                                                                                                                                                                                                                                        -7.539062290108008E-20,
-                                                                                                                                                                                                                                                                        [
-                                                                                                                                                                                                                                                                         true,
-                                                                                                                                                                                                                                                                         false,
-                                                                                                                                                                                                                                                                         null,
-                                                                                                                                                                                                                                                                         true,
-                                                                                                                                                                                                                                                                         6574577753576444630,
-                                                                                                                                                                                                                                                                         [[
-                                                                                                                                                                                                                                                                          1.2760162530699766E-19,
-                                                                                                                                                                                                                                                                          [
-                                                                                                                                                                                                                                                                           null,
-                                                                                                                                                                                                                                                                           [
-                                                                                                                                                                                                                                                                            "顊\\憎zXB,",
-                                                                                                                                                                                                                                                                            [{
-                                                                                                                                                                                                                                                                             "㇆{CVC9－MN㜋ઘR눽#{h@ퟨ!鼚׼XOvXS\u0017ᝣ=cS+梽៲綆16s덽휐y屬?ᇳG2ᴭ\u00054쫖y룇nKcW̭炦s/鰘ᬽ?J|퓀髣n勌\u0010홠P>j": false,
-                                                                                                                                                                                                                                                                             "箴": [
-                                                                                                                                                                                                                                                                              false,
-                                                                                                                                                                                                                                                                              "鍞j\"ꮾ*엇칬瘫xṬ⭽쩁䃳\"-⋵?ᦽ<cਔ↎⩧%鱩涎삧u9K⦈\"῝ᬑV绩킯愌ṱv@GꝾ跶Ꚇ(?䖃vI᧊xV\r哦j㠒?*=S굤紴ꊀ鹭쬈s<DrIu솹꧑?",
-                                                                                                                                                                                                                                                                              {
-                                                                                                                                                                                                                                                                               ".}S㸼L?t\u000fK⑤s~hU鱜꘦}쪍C滈4ꓗ蛌):ྦ\"顥이⢷ῳYLn\"?fꘌ>댎Ĝ": true,
-                                                                                                                                                                                                                                                                               "Pg帯佃籛n㔠⭹࠳뷏≻࿟3㞱!-쒾!}쭪䃕!籿n涻J5ਲ਼yvy;Rኂ%ᔡጀ裃;M⣼)쵂쑈": 1.80447711803435366E18,
-                                                                                                                                                                                                                                                                               "ꈑC⡂ᑆ㤉壂뎃Xub<\/쀆༈憓ق쨐ק\\": [
-                                                                                                                                                                                                                                                                                7706977185172797197,
-                                                                                                                                                                                                                                                                                {"": {"K╥踮砆NWࡆFy韣7ä밥{|紒︧䃀榫rᩛꦡTSy잺iH8}ퟴ,M?Ʂ勺ᴹ@T@~꾂=I㙕뾰_涀쑜嫴曣8IY?ҿo줫fऒ}\\S\"ᦨ뵼#nDX": {
-                                                                                                                                                                                                                                                                                 "♘k6?଱癫d68?㽚乳䬳-V顷\u0005蝕?\u0018䞊V{邾zじl]雏k臤~ൖH뒐iꢥ]g?.G碄懺䔛p<q꜉S岗_.%": 7688630934772863849,
-                                                                                                                                                                                                                                                                                 "溗摽嗙O㧀,⡢⼰呠ꅧ㓲/葇䢛icc@-r\b渂ꌳ뻨饑觝ᖜ\\鮭\u0014엙㥀᧺@浹W2꛵{W률G溮킀轡䬆g㨑'Q聨៪网Hd\"Q늴ᱢﶨ邮昕纚枑?▰hr羌驀[痹<\/": [
-                                                                                                                                                                                                                                                                                  -1.0189902027934687E-19,
-                                                                                                                                                                                                                                                                                  {"窶椸릎뚻shE\"ꪗႥꎳU矖佟{SJ": [{"-慜x櫹XY-澐ܨ⣷ઢ鯙%Fu\u0000迋▒}᥷L嗭臖oញc넨\u0016/迎1b꯸g뢱㐧蓤䒏8C散삭|\"컪輩鹩\"\\g$zG䥽긷?狸꿭扵㲐:URON&oU8": [
-                                                                                                                                                                                                                                                                                   null,
-                                                                                                                                                                                                                                                                                   true,
-                                                                                                                                                                                                                                                                                   null,
-                                                                                                                                                                                                                                                                                   -2.8907335031148883E17,
-                                                                                                                                                                                                                                                                                   -3864019407187144121,
-                                                                                                                                                                                                                                                                                   {
-                                                                                                                                                                                                                                                                                    "`빬d⵺4H뜳⧈쓑ohஸ*㶐ﻇ⸕䠵!i䝬﹑h夘▥ꗐ푹갇㵳TA鳠嚵\\B<X}3訒c⋝{*﫢w]璨-g捭\\j໵侠Ei层\u0011": 3.758356090089446E-19,
-                                                                                                                                                                                                                                                                                    "䄘ﮐ)Y놞씃㾱陰큁:{\u2059/S⓴": [[
-                                                                                                                                                                                                                                                                                     null,
-                                                                                                                                                                                                                                                                                     [[
-                                                                                                                                                                                                                                                                                      -3.8256602120220546E-20,
-                                                                                                                                                                                                                                                                                      null,
-                                                                                                                                                                                                                                                                                      7202317607724472882,
-                                                                                                                                                                                                                                                                                      "CWQ뚿",
-                                                                                                                                                                                                                                                                                      null,
-                                                                                                                                                                                                                                                                                      false,
-                                                                                                                                                                                                                                                                                      true,
-                                                                                                                                                                                                                                                                                      null,
-                                                                                                                                                                                                                                                                                      2857038485417498625,
-                                                                                                                                                                                                                                                                                      6.191302233218633E-20,
-                                                                                                                                                                                                                                                                                      null,
-                                                                                                                                                                                                                                                                                      -6795250594296208046,
-                                                                                                                                                                                                                                                                                      [
-                                                                                                                                                                                                                                                                                       true,
-                                                                                                                                                                                                                                                                                       {
-                                                                                                                                                                                                                                                                                        "%ዧ遰Yᚯ⚀x莰愒Vᔈ턗BN洝ꤟA1⍌l콹풪H;OX๫륞쪐ᰚц@͎黾a邬<L厒Xb龃7f웨窂二;": [[
-                                                                                                                                                                                                                                                                                         null,
-                                                                                                                                                                                                                                                                                         "耲?䙧㘓F6Xs틭멢.v뚌?鄟恠▽'묺競?WvᆾCtxo?dZ;䨸疎",
-                                                                                                                                                                                                                                                                                         {
-                                                                                                                                                                                                                                                                                          "@hWꉁ&\"빜4礚UO~C;う殩_ꀥ蘁奢^챟k→ᡱKMⵉ<\/Jㅲ붉L͟Q": false,
-                                                                                                                                                                                                                                                                                          "tU뢂8龰I먽7,.Y搽Z툼=&⨥覽K乫햶㠸%#@Z끖愓^⍊⾂몒3E_噆J(廊ឭyd䞜鈬Ћ档'⣘I": {
-                                                                                                                                                                                                                                                                                           "tK*ꔵ銂u艗ԃ쿏∳ꄂ霫X3♢9y?=ⲭdЊb&xy}": [
-                                                                                                                                                                                                                                                                                            -4.097346784534325E-20,
-                                                                                                                                                                                                                                                                                            null,
-                                                                                                                                                                                                                                                                                            6016848468610144624,
-                                                                                                                                                                                                                                                                                            -8194387253692332861,
-                                                                                                                                                                                                                                                                                            null,
-                                                                                                                                                                                                                                                                                            {
-                                                                                                                                                                                                                                                                                             "(祬诀譕쯠娣c봝r?畄kT뼾⌘⎨?noV䏘쥝硎n?": [
-                                                                                                                                                                                                                                                                                              1.82679422844617293E18,
-                                                                                                                                                                                                                                                                                              [
-                                                                                                                                                                                                                                                                                               false,
-                                                                                                                                                                                                                                                                                               2.6849944122427694E18,
-                                                                                                                                                                                                                                                                                               true,
-                                                                                                                                                                                                                                                                                               [
-                                                                                                                                                                                                                                                                                                false,
-                                                                                                                                                                                                                                                                                                {
-                                                                                                                                                                                                                                                                                                 ";0z⭆;화$bਔ瀓\"衱^?잢ᢛ⣿~`ꕉ薸⌳໿湘腌'&:ryБꋥၼ꒥筙꬜긨?X": -3536753685245791530,
-                                                                                                                                                                                                                                                                                                 "c;Y7釚Uꃣ割J༨Y戣w}c峰뢨㽑㫈0N>R$䅒X觨l봜A刊8R梒',}u邩퉕?;91Ea䈈믁G⊶芔h袪&廣㺄j;㡏綽\u001bN頸쳘橆": -2272208444812560733,
-                                                                                                                                                                                                                                                                                                 "拑Wﵚj鵼駳Oࣿ)#㾅顂N傓纝y僱栜'Bꐍ-!KF*ꭇK￤?䈴^:啤wG逭w᧯": "xᣱmYe1ۏ@霄F$ě꧘푫O䤕퀐Pq52憬ꀜ兴㑗ᡚ?L鷝ퟐ뭐zJꑙ}╆ᅨJB]\"袌㺲u8䯆f",
-                                                                                                                                                                                                                                                                                                 "꿽၅㔂긱Ǧ?SI": -1669030251960539193,
-                                                                                                                                                                                                                                                                                                 "쇝ɨ`!葎>瞺瘡驷錶❤ﻮ酜=": -6961311505642101651,
-                                                                                                                                                                                                                                                                                                 "?f7♄꫄Jᡔ훮e읇퍾፣䭴KhखT;Qty}O\\|뫁IῒNe(5惁ꥶㆷY9ﮡ\\ oy⭖-䆩婁m#x봉>Y鈕E疣s驇↙ᙰm<": {"퉻:dꂁ&efￎ쫢[\"돈늖꺙|Ô剐1͖-K:ʚ᭕/;쏖㷛]I痐职4g<Oꗢ뫺N쯂륬J╆.`ᇵP轆&fd$?苅o궓vO侃沲⍩嚅沗 E%⿰얦wi\\*趫": [
-                                                                                                                                                                                                                                                                                                  3504362220185634767,
-                                                                                                                                                                                                                                                                                                  false,
-                                                                                                                                                                                                                                                                                                  "qzX朝qT3軞T垈ꮲQ览ᚻ⻑쎎b驌䵆ꬠ5Fୗ䲁缿ꝁ蒇潇Ltᆄ钯蜀W欥ሺ",
-                                                                                                                                                                                                                                                                                                  "볰ɐ霬)젝鶼kwoc엷荁r \u001d쒷⎹8{%澡K늒?iﺩd=&皼倚J9s@３偛twὡgj䁠흪5⭉⨺役&놎cﺉ㺡N5",
-                                                                                                                                                                                                                                                                                                  false,
-                                                                                                                                                                                                                                                                                                  null,
-                                                                                                                                                                                                                                                                                                  "D0st[ni锹r*0k6ꀎ덇UX2⽼৞䃚粭#)Z桷36P]<\/`",
-                                                                                                                                                                                                                                                                                                  4281410120849816730,
-                                                                                                                                                                                                                                                                                                  null,
-                                                                                                                                                                                                                                                                                                  -3256922126984394461,
-                                                                                                                                                                                                                                                                                                  1.16174580369801549E18,
-                                                                                                                                                                                                                                                                                                  {
-                                                                                                                                                                                                                                                                                                   " ᆼꤗ~*TN긂<㡴턱℃酰^蘒涯잰淭傛2rൡet쾣䐇m*㸏y\"\\糮᧺qv쌜镜T@yg1譬ﭧﳭ\f": null,
-                                                                                                                                                                                                                                                                                                   "圾ᨿ0xᮛ禵ਗ਼D-㟻ẵ錚e\"赜.˶m)鴑B(I$<\/轴퉯揷⋏⏺*)宓쓌?*橯Lx\\f쩂㞼⇸\"ﺧ軂遳V\\땒\"캘c:G": null,
-                                                                                                                                                                                                                                                                                                   "?﵁_곢翸폈8㿠h열Q2㭛}RY㯕ＹT놂⽻e^B<\/맫ﻇ繱\u0017Gц⟊ᢑﵩS:jt櫣嗒⟰W㴚搦ᅉe[w䋺?藂翙Ⲱ芮䍘╢囥lpdu7r볺I 近qFyᗊ": [
-                                                                                                                                                                                                                                                                                                    "$b脬aﾠ襬育Bگ嵺Pw+'M<\/כֿn䚚v螁bN⒂}褺%lቦ阤\"ꓺᏗM牏,۞Ҷ!矬?ke9銊X괦)䈽틁脽ṫ䈞ᴆ^=Yᗿ遛4I귺⋥%",
-                                                                                                                                                                                                                                                                                                    false,
-                                                                                                                                                                                                                                                                                                    2.9444482723232051E18,
-                                                                                                                                                                                                                                                                                                    2072621064799640026,
-                                                                                                                                                                                                                                                                                                    "/_뇴뫢j㍒=Nꡦ↍Ժ赒❬톥䨞珯su*媸瀳鷔抡o흺-៳辏勷f绔:䵢搢2",
-                                                                                                                                                                                                                                                                                                    false,
-                                                                                                                                                                                                                                                                                                    "쒜 E䌐/큁\u0018懺_<\\隺&{wF⤊谼(<죽遠8?@*rᶊGd뻻갇&Ⳇq᣿e࢔t_ꩄ梸O詬C᧧Kꩠ풤9눙醅됞}竸rw?滨ӽK⥿ཊG魲']`๖5㄰",
-                                                                                                                                                                                                                                                                                                    -2375253967958699084,
-                                                                                                                                                                                                                                                                                                    {"嗱⿲\"f億ᝬ": {"v?䚑킡`◤k3,骥曘뒤Oᒱ㲹^圮᠀YT껛&촮P:G/T⣝#튣k3炩蠏k@橈䏷S䧕,熜晬k1鮥玸먚7䤡f绝嗚샴ᥒ~0q拮垑a뻱LⰖ_": [{
-                                                                                                                                                                                                                                                                                                     ":p尢": -6.688985172863383E17,
-                                                                                                                                                                                                                                                                                                     "A0\u0001疠ﻵ爻鼀湶I~W^岀mZx#㍈7r拣$Ꜷ疕≛⦒痋盩Vꬷ᭝ΩQꍪ療鈑A(劽詗ꭅo-獶鑺\"Ⓠ@$j탥;": [
-                                                                                                                                                                                                                                                                                                      8565614620787930994,
-                                                                                                                                                                                                                                                                                                      [
-                                                                                                                                                                                                                                                                                                       "嶗PC?උQ㪣$&j幾㾷h慑 즊慧⪉霄M窊ꁷ'鮕)䊏铨m趦䗲(g罣ЮKVﯦ鏮5囗ﰼ鿦",
-                                                                                                                                                                                                                                                                                                       -7168038789747526632,
-                                                                                                                                                                                                                                                                                                       null,
-                                                                                                                                                                                                                                                                                                       -7.8069738975270288E16,
-                                                                                                                                                                                                                                                                                                       2.25819579241348352E17,
-                                                                                                                                                                                                                                                                                                       -6.5597416611655936E18,
-                                                                                                                                                                                                                                                                                                       {
-                                                                                                                                                                                                                                                                                                        "瘕멦핓+?ﾌZ귢z鍛V": {
-                                                                                                                                                                                                                                                                                                         "ᕾ": 1.7363275204701887E-19,
-                                                                                                                                                                                                                                                                                                         "㭌s뎹㳉": {"\u00187FI6Yf靺+UC쬸麁␲䂿긕R\\ᆮC?Φ耭\rOத际핅홦*베W㸫㯼᡹cㅜ|G㮗\u0013[o`?jHV앝?蒪꩚!퍫ᜦ㌇䚇鿘:@": [
-                                                                                                                                                                                                                                                                                                          "}푛Г콲<䟏C藐呈#2㓋#ྕ፟尿9q竓gI%랙mꍬoa睕贿J咿D_熏Zz皳験I豼B扳ḢQ≖㻹㱣D䝦練2'ᗍ㗣▌砲8罿%హF姦;0悇<\/\"p嚧",
-                                                                                                                                                                                                                                                                                                          -710184373154164247,
-                                                                                                                                                                                                                                                                                                          "Vo쫬⬾ꝫⴷŻ\u0004靎HBꅸ_aVBＨbN>Z4⍜kเꛘZ⥺\\Bʫᇩ鄨魢弞&幟ᓮ2̊盜",
-                                                                                                                                                                                                                                                                                                          -9006004849098116748,
-                                                                                                                                                                                                                                                                                                          -3118404930403695681,
-                                                                                                                                                                                                                                                                                                          {
-                                                                                                                                                                                                                                                                                                           "_彃Y艘-\"Xx㤩㳷瑃?%2䐡鵛o<A?\"顜ᘌΈ;ⷅC洺L蚴蚀voq:,Oo4쪂)": 5719065258177391842,
-                                                                                                                                                                                                                                                                                                           "l륪맽耞塻論倐E㗑/㲕QM辬I\"qi酨玑㖪5q]尾魨鲡ƞY}⮯蠇%衟Fsf윔䐚찤i腳": {"ꢪ'a䣊糈": {"밑/♋S8s㼴5瓹O{댞\"9XﰇlJ近8}q{긧ⓈI᱑꿋腸D瀬H\"ﺬ'3?}\u0014#?丙㑯ᥨ圦',g鑠(樴턇?": [
-                                                                                                                                                                                                                                                                                                            2.5879275511391145E18,
-                                                                                                                                                                                                                                                                                                            null,
-                                                                                                                                                                                                                                                                                                            [
-                                                                                                                                                                                                                                                                                                             "3㼮ꔌ1Gẃ2W龙j͊{1囐㦭9x宠㑝oR䐕犽",
-                                                                                                                                                                                                                                                                                                             1268729930083267852,
-                                                                                                                                                                                                                                                                                                             "땕軚⿦7C",
-                                                                                                                                                                                                                                                                                                             [
-                                                                                                                                                                                                                                                                                                              -3.757935946502082E18,
-                                                                                                                                                                                                                                                                                                              "\"赌'糬_2뭾᝝b",
-                                                                                                                                                                                                                                                                                                              {
-                                                                                                                                                                                                                                                                                                               "(a䕎ጽjҰD4.ᴡ66ԃ畮<\/l`k癸\\㇋ࣆ욯R㫜픉녬挛;ڴ맺`.;焓q淞뮕ٹ趴r蔞ꯔ䟩v粏u5<\/pZ埖Skrvj帛=\u0005aa": null,
-                                                                                                                                                                                                                                                                                                               "璄≩ v몛ᘮ%?:1頌챀H㷪뉮k滘e": [
-                                                                                                                                                                                                                                                                                                                "ꤾ{`c샬왌펡[俊络vmz㪀悫⸹ᷥ5o'㾵 L蹦qjYIYណԠW냁剫<\/W嗂0,}",
-                                                                                                                                                                                                                                                                                                                2.4817616702666762E18,
-                                                                                                                                                                                                                                                                                                                false,
-                                                                                                                                                                                                                                                                                                                null,
-                                                                                                                                                                                                                                                                                                                null,
-                                                                                                                                                                                                                                                                                                                -8.6036958071260979E17,
-                                                                                                                                                                                                                                                                                                                null,
-                                                                                                                                                                                                                                                                                                                -1.2744078022652468E-19,
-                                                                                                                                                                                                                                                                                                                -4.4752020268429594E17,
-                                                                                                                                                                                                                                                                                                                1.13672865156637872E17,
-                                                                                                                                                                                                                                                                                                                [
-                                                                                                                                                                                                                                                                                                                 false,
-                                                                                                                                                                                                                                                                                                                 false,
-                                                                                                                                                                                                                                                                                                                 null,
-                                                                                                                                                                                                                                                                                                                 -4.178004168554046E-20,
-                                                                                                                                                                                                                                                                                                                 true,
-                                                                                                                                                                                                                                                                                                                 2927542512798605527,
-                                                                                                                                                                                                                                                                                                                 {
-                                                                                                                                                                                                                                                                                                                  ".ꔓ뉤1䵬cHy汼䊆賓ᐇƩ|樷❇醎㬅4\u0003赵}#yD5膏晹뱓9ꖁ虛J㺕 t䊛膎ؤ": {
-                                                                                                                                                                                                                                                                                                                   "rVtᓸ5^`েN⹻Yv᥋lꌫt拘?<鮰넿ZC?㒽^": {"␪k_:>귵옔夘v*탋职&㳈챗|O钧": [
-                                                                                                                                                                                                                                                                                                                    false,
-                                                                                                                                                                                                                                                                                                                    "daꧺdᗹ羞쯧H㍤鄳頳<型孒ン냆㹀f4㹰\u000f|C*ሟ鰠(O<ꨭ峹ipຠ*y೧4VQ蔔hV淬{?ᵌEfrI_",
-                                                                                                                                                                                                                                                                                                                    "j;ꗣ밷邍副]ᗓ",
-                                                                                                                                                                                                                                                                                                                    -4299029053086432759,
-                                                                                                                                                                                                                                                                                                                    -5610837526958786727,
-                                                                                                                                                                                                                                                                                                                    [
-                                                                                                                                                                                                                                                                                                                     null,
-                                                                                                                                                                                                                                                                                                                     [
-                                                                                                                                                                                                                                                                                                                      -1.3958390678662759E-19,
-                                                                                                                                                                                                                                                                                                                      {
-                                                                                                                                                                                                                                                                                                                       "lh좈T_믝Y\"伨\u001cꔌG爔겕ꫳ晚踍⿻읐T䯎]~e#฽燇\"5hٔ嶰`泯r;ᗜ쮪Q):/t筑,榄&5懶뎫狝(": [{
-                                                                                                                                                                                                                                                                                                                        "2ፁⓛ]r3C攟וּ9賵s⛔6'ஂ|\"ⵈ鶆䐹禝3\"痰ࢤ霏䵩옆䌀?栕r7O簂Isd?K᫜`^讶}z8?z얰T:X倫⨎ꑹ": -6731128077618251511,
-                                                                                                                                                                                                                                                                                                                        "|︦僰~m漿햭\\Y1'Vvخ굇ቍ챢c趖": [null]
-                                                                                                                                                                                                                                                                                                                       }],
-                                                                                                                                                                                                                                                                                                                       "虌魿閆5⛔煊뎰㞤ᗴꥰF䮥蘦䂪樳-K᝷-(^\u20dd_": 2.11318679791770592E17
-                                                                                                                                                                                                                                                                                                                      }
-                                                                                                                                                                                                                                                                                                                     ]
-                                                                                                                                                                                                                                                                                                                    ]
-                                                                                                                                                                                                                                                                                                                   ]},
-                                                                                                                                                                                                                                                                                                                   "묗E䀳㧯᳀逞GMc\b墹㓄끖Ơ&U??펌鑍 媋k))ᄊ": null,
-                                                                                                                                                                                                                                                                                                                   "묥7콽벼諌J_DɯﮪM殴䣏,煚ྼ`Y:씧<\/⩫%yf䦀!1Ჶk춎Q米W∠WC跉鬽*ᛱi<?,l<崣炂骵*?8푐៣ⰵ憉⎑.,Nw罣q+ο컆弎": false
-                                                                                                                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                                                                                                                  "e[|଀+lꑸ㝈TT?뿿|ꫛ9`㱯䊸楋-곳賨?쳁k棽擋wQ餈⟐Nq[q霩䵀뷮锅ꚢ": 5753148631596678144,
-                                                                                                                                                                                                                                                                                                                  "sᓝ鴻߸d렶ὕ蜗ဟ툑!诉౿": false,
-                                                                                                                                                                                                                                                                                                                  "|4䕳鵻?䈔(]틍/Ui#湻{듲ーMዀt7潔泄Ch⸨}쏣`螧銚㋼壯kⰥQ戵峉갑x辙'첛": "jd䘯$䕌茷!auw眶ㅥ䁣ꆢ民i",
-                                                                                                                                                                                                                                                                                                                  "剖駰ꞫsM2]ᾴ2ࡷ祅拌Av狔꩛'ꓗ킧ꣁ0酜✘O'": false,
-                                                                                                                                                                                                                                                                                                                  "澩뢣ꀁeU~D\\ꮡ킠": "v^YC嚈ί\u0007죋h>㴕L꘻ꀏ쓪\"_g鿄'#t⽙?,Wg㥖|D鑆e⥏쪸僬h鯔咼ඡ;4TK聎졠嫞"
-                                                                                                                                                                                                                                                                                                                 }
-                                                                                                                                                                                                                                                                                                                ]
-                                                                                                                                                                                                                                                                                                               ]
-                                                                                                                                                                                                                                                                                                              }
-                                                                                                                                                                                                                                                                                                             ]
-                                                                                                                                                                                                                                                                                                            ]
-                                                                                                                                                                                                                                                                                                           ]}}
-                                                                                                                                                                                                                                                                                                          }
-                                                                                                                                                                                                                                                                                                         ]}
-                                                                                                                                                                                                                                                                                                        },
-                                                                                                                                                                                                                                                                                                        "뿋뀾淣截䔲踀&XJ펖꙯^Xb訅ꫥgᬐ>棟S\"혧騾밫겁7-": "擹8C憎W\"쵮yR뢩浗絆䠣簿9䏈引Wcy䤶孖ꯥ;퐌]輩䍐3@{叝 뽸0ᡈ쵡Ⲇ\u001dL匁꧐2F~ݕ㪂@W^靽L襒ᦘ~沦zZ棸!꒲栬R"
-                                                                                                                                                                                                                                                                                                       }
-                                                                                                                                                                                                                                                                                                      ]
-                                                                                                                                                                                                                                                                                                     ],
-                                                                                                                                                                                                                                                                                                     "Z:덃൛5Iz찇䅄駠㭧蓡K1": "e8᧤좱U%?ⵇ䯿鿝\u0013縮R∱骒EO\u000fg?幤@֗퉙vU`",
-                                                                                                                                                                                                                                                                                                     "䐃쪈埽້=Ij,쭗쓇చ": false
-                                                                                                                                                                                                                                                                                                    }]}}
-                                                                                                                                                                                                                                                                                                   ]
-                                                                                                                                                                                                                                                                                                  }
-                                                                                                                                                                                                                                                                                                 ]}
-                                                                                                                                                                                                                                                                                                }
-                                                                                                                                                                                                                                                                                               ]
-                                                                                                                                                                                                                                                                                              ]
-                                                                                                                                                                                                                                                                                             ],
-                                                                                                                                                                                                                                                                                             "咰긖VM]᝼6䓑쇎琺etDҌ?㞏ꩄ퇫밉gj8蠃\"⩐5䛹1ࣚ㵪": "ക蹊?⎲⧘⾚̀I#\"䈈⦞돷`wo窭戕෱휾䃼)앷嵃꾞稧,Ⴆ윧9S?೗EMk3Მ3+e{⹔Te驨7䵒?타Ulg悳o43"
-                                                                                                                                                                                                                                                                                            }
-                                                                                                                                                                                                                                                                                           ],
-                                                                                                                                                                                                                                                                                           "zQᤚ纂땺6#ٽ﹧v￿#ࠫ휊冟蹧텈ꃊʆ?&a䥯De潝|쿓pt瓞㭻啹^盚2Ꝋf醪,얏T窧\\Di䕎谄nn父ꋊE": -2914269627845628872,
-                                                                                                                                                                                                                                                                                           "䉩跐|㨻ᷢ㝉B{蓧瞸`I!℄욃힕#ೲᙾ竛ᔺCjk췒늕貭词\u0017署?W딚%(pꍁ⤼띳^=on뺲l䆼bzrﳨ[&j狸䠠=ᜑꦦ\u2061յnj=牲攑)M\\龏": false,
-                                                                                                                                                                                                                                                                                           "뎕y絬᫡⥮Ϙᯑ㌔/NF*˓.,QEzvK!Iwz?|쥾\"ꩻL꼗Bꔧ賴緜s뉣隤茛>ロ?(?^`>冺飒=噸泥⺭Ᲊ婓鎔븜z^坷裮êⓅ໗jM7ﶕ找\\O": 1.376745434746303E-19
-                                                                                                                                                                                                                                                                                          },
-                                                                                                                                                                                                                                                                                          "䐛r滖w㏤<k;l8ꡔጵ⮂ny辶⋃퍼僮z\"﮲X@t5෼暧퓞猋♅䦖QC鹮|픨( ,>,|Nዜ": false
-                                                                                                                                                                                                                                                                                         }
-                                                                                                                                                                                                                                                                                        ]],
-                                                                                                                                                                                                                                                                                        "@꿙?薕尬 gd晆(띄5躕ﻫS蔺4)떒錸瓍?~": 1665108992286702624,
-                                                                                                                                                                                                                                                                                        "w믍nᏠ=`঺ￆC>'從됐槷䤝眷螄㎻揰扰XￊC贽uჍ낟jKD03T!lDV쀉Ӊy뢖,袛!终캨G?鉮Q)⑗1쾅庅O4ꁉH7?d\u0010蠈줘월ސ粯Q!낇껉6텝|{": null,
-                                                                                                                                                                                                                                                                                        "~˷jg쿤촖쉯y": -5.5527605669177098E18,
-                                                                                                                                                                                                                                                                                        "펅Wᶺzꐆと푭e?4j仪열[D<鈑皶婆䵽ehS?袪;HꍨM뗎ば[(嗏M3q퍟g4y╸鰧茀[Bi盤~﫝唎鋆彺⦊q?B4쉓癚O洙킋툈䶯_?ퟲ": null
-                                                                                                                                                                                                                                                                                       }
-                                                                                                                                                                                                                                                                                      ]
-                                                                                                                                                                                                                                                                                     ]]
-                                                                                                                                                                                                                                                                                    ]],
-                                                                                                                                                                                                                                                                                    "꟱Ԕ㍤7曁聯ಃ錐V䷰?v㪃૦~K\"$%请|ꇹn\"k䫛㏨鲨\u2023䄢\u0004[<S8ᐬ뭩脥7U.m࿹:D葍┆2蘸^U'w1젅;䠆ꋪB껮>︊VJ?䶟ាꮈ䗱=깘U빩": -4863152493797013264
-                                                                                                                                                                                                                                                                                   }
-                                                                                                                                                                                                                                                                                  ]}]}
-                                                                                                                                                                                                                                                                                 ]
-                                                                                                                                                                                                                                                                                }}}
-                                                                                                                                                                                                                                                                               ],
-                                                                                                                                                                                                                                                                               "쏷쐲۹퉃~aE唙a챑,9㮹gLHd'䔏|킗㍞䎥&KZYT맵7䥺N<Hp4ꕭ⹠꽐c~皽z": "课|ᖾ䡁廋萄䐪W\u0016&Jn괝b~摓M>ⱳ同莞鿧w\\༌疣n/+ꎥU\"封랾○ퟙAJᭌ?9䛝$?驔9讐짘魡T֯c藳`虉C읇쐦T"
-                                                                                                                                                                                                                                                                              }
-                                                                                                                                                                                                                                                                             ],
-                                                                                                                                                                                                                                                                             "谶개gTR￐>ၵ͚dt晑䉇陏滺}9㉸P漄": -3350307268584339381
-                                                                                                                                                                                                                                                                            }]
-                                                                                                                                                                                                                                                                           ]
-                                                                                                                                                                                                                                                                          ]
-                                                                                                                                                                                                                                                                         ]]
-                                                                                                                                                                                                                                                                        ]
-                                                                                                                                                                                                                                                                       ],
-                                                                                                                                                                                                                                                                       "0y꟭馋X뱔瑇:䌚￐廿jg-懲鸭䷭垤㒬茭u賚찶ಽ+\\mT땱\u20821殑㐄J쩩䭛ꬿNS潔*d\\X,壠뒦e殟%LxG9:摸": 3737064585881894882,
-                                                                                                                                                                                                                                                                       "풵O^-⧧ⅶvѪ8廸鉵㈉ר↝Q㿴뺟EႳvNM:磇>w/៻唎뷭୥!냹D䯙i뵱貁C#⼉NH6`柴ʗ#\\!2䂗Ⱨf?諳.P덈-返I꘶6?8ꐘ": -8934657287877777844,
-                                                                                                                                                                                                                                                                       "溎-蘍寃i诖ര\"汵\"\ftl,?d⼡쾪⺋h匱[,෩I8MҧF{k瓿PA'橸ꩯ綷퉲翓": null
-                                                                                                                                                                                                                                                                      }
-                                                                                                                                                                                                                                                                     ]
-                                                                                                                                                                                                                                                                    ],
-                                                                                                                                                                                                                                                                    "ោ係؁<元": 1.7926963090826924E-18
-                                                                                                                                                                                                                                                                   }}]
-                                                                                                                                                                                                                                                                  }
-                                                                                                                                                                                                                                                                 ]
-                                                                                                                                                                                                                                                                ]]}]
-                                                                                                                                                                                                                                                               }]
-                                                                                                                                                                                                                                                              ]
-                                                                                                                                                                                                                                                             ]
-                                                                                                                                                                                                                                                            ]
-                                                                                                                                                                                                                                                           ],
-                                                                                                                                                                                                                                                           "ጩV<\"ڸsOᤘ": 2.0527167903723048E-19
-                                                                                                                                                                                                                                                          }]
-                                                                                                                                                                                                                                                         ]}
-                                                                                                                                                                                                                                                        ]
-                                                                                                                                                                                                                                                       ]],
-                                                                                                                                                                                                                                                       "∳㙰3젴p᧗䱙?`<U὇<\/意E[ᮚAj诂ᒽ阚uv徢ဎ떗尔Ᵹ훀쩑J䐴?⪏=륪ᆩ푰ஓ㐕?럽VK\"X?檨လ齿I/耉A(AWA~⏯稐蹫": false,
-                                                                                                                                                                                                                                                       "偒妝뾇}䀼链i⇃%⋜&璪Ix渥5涧qq棩ᥝ-⠫AA낇yY颕A*裦O|n?䭬혗F": null,
-                                                                                                                                                                                                                                                       "琭CL얭B혆Kॎ`鎃nrsZiժW砏)?p~K~A眱䲏QO妣\u001b\u001b]ᵆᆯ&㐋ᏹ豉뺘$ꭧ#j=C)祤⫢歑1o㒙諩": 7028426989382601021,
-                                                                                                                                                                                                                                                       "쳱冲&ဤ䌏앧h胺-齱H忱8왪RDKᅒ䬋ᔶS*J}ስ漵'㼹뮠9걢9p봋경ጕtởꚳT䶽瘙%춴`@nಆ4<d??#僜ᙤ钴=薔ꭂbLXNam蹈": "樭る蹿= Uurwkn뙧⌲%\"쑃牪\"cq윕o@",
-                                                                                                                                                                                                                                                       "溌[H]焎SLㅁ?뀼䫨災W": 1.1714289118497062E-19,
-                                                                                                                                                                                                                                                       "ﬢp븇剌燇kĔ尘㶿㴞睠꾘Ia;s❺^)$穮?sHᢥ폪l": null
-                                                                                                                                                                                                                                                      }
-                                                                                                                                                                                                                                                     ]
-                                                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                                                   ]
-                                                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                                                  "TKnzj5o<\/K㊗ꗣ藠⦪駇>yZA8Ez0,^ᙛ4_0븢\u001ft:~䎼s.bb룦明yNP8弆C偯;⪾짍'蕴뮛": -6976654157771105701,
-                                                                                                                                                                                                                                                  "큵ꦀ\\㇑:nv+뒤燻䀪ﴣ﷍9ᚈ኷K㚊誦撪䚛,ꮪxሲ쳊\u0005HSf?asg昱dqꬌVꙇ㼺'k*'㈈": -5.937042203633044E-20
-                                                                                                                                                                                                                                                 }
-                                                                                                                                                                                                                                                ]
-                                                                                                                                                                                                                                               }],
-                                                                                                                                                                                                                                               "?}\u20e0],s嶳菋@#2u쒴sQS䩗=ꥮ;烌,|ꘔ䘆": "ᅩ영N璠kZ먕眻?2ቲ芋眑D륟渂⸑ﴃIRE]啗`K'"
-                                                                                                                                                                                                                                              }},
-                                                                                                                                                                                                                                              "쨀jmV賂ﰊ姐䂦玞㬙ᏪM᪟Վ씜~`uOn*ॠ8\u000ef6??\\@/?9見d筜ﳋB|S䝬葫㽁o": true
-                                                                                                                                                                                                                                             },
-                                                                                                                                                                                                                                             "즛ꄤ酳艚␂㺘봿㎨iG৕ࡿ?1\"䘓您\u001fSኝ⺿溏zៀ뻤B\u0019?윐a䳵᭱䉺膷d:<\/": 3935553551038864272
-                                                                                                                                                                                                                                            }
-                                                                                                                                                                                                                                           ]
-                                                                                                                                                                                                                                          ]}
-                                                                                                                                                                                                                                         ]]
-                                                                                                                                                                                                                                        ]]
-                                                                                                                                                                                                                                       ]}
-                                                                                                                                                                                                                                      }
-                                                                                                                                                                                                                                     ]
-                                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                                   ]]}},
-                                                                                                                                                                                                                                   "᥺3h↛!ꋰy\"攜(ெl䪕oUkc1A㘞ᡲ촾ᣫ<\/䒌E㛝潨i{v?W౾H\\RჅpz蝬R脾;v:碽✘↯삞鷱o㸧瑠jcmK7㶧뾥찲n": true,
-                                                                                                                                                                                                                                   "ⶸ?x䊺⬝-䰅≁!e쩆2ꎿ准G踌XXᩯ1߁}0?.헀Z馟;稄\baDꟹ{-寪⚈ꉷ鮸_L7ƽᾚ<\u001bጨA䧆송뇵⨔\\礍뗔d设룱㶉cq{HyぱR㥽吢ſtp": -7985372423148569301,
-                                                                                                                                                                                                                                   "緫#콮IB6<\/=5Eh礹\t8럭@饹韠r㰛斣$甝LV췐a갵'请o0g:^": "䔨(.",
-                                                                                                                                                                                                                                   "띳℡圤pﾝ௄ĝ倧訜B쁟G䙔\"Sb⓮;$$▏S1J뢙SF|赡g*\"Vu䲌y": "䪈&틐),\\kT鬜1풥;뷴'Zေ䩹@J鞽NぼM?坥eWb6榀ƩZڮ淽⺞삳煳xჿ絯8eⶍ羷V}ჿ쎱䄫R뱃9Z>'\u20f1ⓕ䏜齮"
-                                                                                                                                                                                                                                  }
-                                                                                                                                                                                                                                 ]
-                                                                                                                                                                                                                                ]]]
-                                                                                                                                                                                                                               }}
-                                                                                                                                                                                                                              }
-                                                                                                                                                                                                                             ]
-                                                                                                                                                                                                                            ]},
-                                                                                                                                                                                                                            "펮b.h粔폯2npX詫g錰鷇㇒<쐙S値bBi@?镬矉`剔}c2壧ଭfhY깨R()痩⺃a\\⍔?M&ﯟ<劜꺄멊ᄟA\"_=": null
-                                                                                                                                                                                                                           },
-                                                                                                                                                                                                                           "~潹Rqn榢㆓aR鬨侅?䜑亡V_翅㭔(䓷w劸ၳDp䀅<\/ﰎ鶊m䵱팱긽ꆘ<tD쇋>긓准D3掱;o:_ќ)껚콥8곤d矦8nP倥ꃸI": null,
-                                                                                                                                                                                                                           "뾎/Q㣩㫸벯➡㠦◕挮a鶧⋓偼\u00001뱓fm覞n?㛅\"": 2.8515592202045408E17
-                                                                                                                                                                                                                          }],
-                                                                                                                                                                                                                          ",": -5426918750465854828,
-                                                                                                                                                                                                                          "2櫫@0柡g䢻/gꆑ6演&D稒肩Y?艘/놘p{f투`飷ᒉ챻돎<늛䘍ﴡ줰쫄": false,
-                                                                                                                                                                                                                          "8(鸑嵀⵹ퟡ<9㣎Tߗ┘d슒ل蘯&㠦뮮eࠍk砝g 엻": false,
-                                                                                                                                                                                                                          "d-\u208b?0ﳮ嵙'(J`蔿d^踅⤔榥\\J⵲v7": 6.8002426206715341E17,
-                                                                                                                                                                                                                          "ཎ耰큓ꐕ㱷\u0013y=詽I\"盈xm{0쾽倻䉚ષso#鰑/8㸴짯%ꀄ떸b츟*\\鲷礬ZQ兩?np㋄椂榨kc᡹醅3": false,
-                                                                                                                                                                                                                          "싊j20": false
-                                                                                                                                                                                                                         }]]
-                                                                                                                                                                                                                        ]],
-                                                                                                                                                                                                                        "俛\u0017n緽Tu뫉蜍鼟烬.ꭠIⰓ\"Ἀ᜾uC쎆J@古%ꛍm뻨ᾀ画蛐휃T:錖㑸ዚ9죡$": true
-                                                                                                                                                                                                                       }
-                                                                                                                                                                                                                      ]
-                                                                                                                                                                                                                     ],
-                                                                                                                                                                                                                     "㍵⇘ꦖ辈s}㱮慀밒s`\"㞟j:`i픻Z<C1衽$\"-饧?℃\u0010⼒{p飗%R\"䲔\")칀\\%": true,
-                                                                                                                                                                                                                     "苧.8\u00120ݬ仓": 6912164821255417986,
-                                                                                                                                                                                                                     "떎顣俁X;.#Q틝.笂'p쟨唒퐏랩냆¦aⱍ{谐.b我$蜑SH\u000f琾=䟼⣼奔ᜏ攕B&挰繗㝔ꅂ-Qv\\0䶝䚥ぺio［㑮-ᇼ䬰컪ṼiY){데\u0010q螰掻~\n輚x\u0014罺)軴": 3.024364150712629E-20
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                   ]
-                                                                                                                                                                                                                  ]
-                                                                                                                                                                                                                 ]
-                                                                                                                                                                                                                ]}
-                                                                                                                                                                                                               ]]
-                                                                                                                                                                                                              }
-                                                                                                                                                                                                             ]
-                                                                                                                                                                                                            ]]
-                                                                                                                                                                                                           ]
-                                                                                                                                                                                                          ]]]],
-                                                                                                                                                                                                          "\"凲o肉Iz絾豉J8?i~傠᫽䇂!WD溊J?ᡒvs菆嵹➒淴>섫^諎0Ok{켿歁෣胰a2﨤[탳뚬쎼嫭뉮m": 409440660915023105,
-                                                                                                                                                                                                          "w墄#*ᢄ峠밮jLa`ㆪ꺊漓Lで끎!Agk'ꁛ뢃㯐岬D#㒦": false,
-                                                                                                                                                                                                          "ଦPGI䕺L몥罭ꃑ궩﮶#⮈ᢓӢ䚬p7웼臧%~S菠␌힀6&t䳙y㪘냏\\*;鉏ￊ鿵'嗕pa\"oL쇿꬈Cg": "㶽1灸D⟸䴅ᆤ뉎﷛渤csx 䝔цꬃ锚捬?ຽ+x~꘩uI࡞\u0007栲5呚ẓem?袝\")=㥴䨃pac!/揎Y",
-                                                                                                                                                                                                          "ᷱo\\||뎂몷r篙|#X䦜I#딌媸픕叞RD斳X4t⯩夬=[뭲r=绥jh뷱츝⪘%]⚋܈㖴スH텹m(WO曝劉0~K3c柢Ր㏉着逳~": false,
-                                                                                                                                                                                                          "煽_qb[첑\\륌wE❽ZtCNﭝ+餌ᕜOꛭ": "{ﳾ쉌&s惧ᭁⵆ3䢫;䨞팑꒪흘褀࢖Q䠿V5뭀䎂澻%받u5텸oA⮥U㎦;B䳌wz䕙$ឿ\\௅婺돵⪾퐆\\`Kyौꋟ._\u0006L챯l뇠Hi䧈偒5",
-                                                                                                                                                                                                          "艊佁ࣃ롇䱠爬!*;⨣捎慓q靓|儑ᨋL+迥=6㒺딉6弄3辅J-㕎뛄듘SG㆛(\noAzQꝱ䰩X*ぢO퀌%펠낌mo틮a^<\/F&_눊ᾉ㨦ы4\"8H": 2974648459619059400,
-                                                                                                                                                                                                          "鬙@뎣䫳ၮ끡?){y?5K;TA*k溱䫜J汃ꂯ싔썍\u001dA}룖(<\/^,": false,
-                                                                                                                                                                                                          "몏@QꋦFꊩᒐ뎶lXl垨4^郣|ꮇ;䝴ᝓ}쵲z珖": null
-                                                                                                                                                                                                         }
-                                                                                                                                                                                                        ]]]],
-                                                                                                                                                                                                        ":_=닧弗D䙋暨鏛. 㱻붘䂍J儒&ZK/녩䪜r囁⽯D喠죥7⹌䪥c\u001a\u2076￞妈朹oLk菮F౟覛쐧㮏7T;}蛙2{9\"崓bB<\/⡷룀;즮鿹)丒툃୤뷠5W⊢嶜(fb뭳갣": "E{响1WM"
-                                                                                                                                                                                                       }},
-                                                                                                                                                                                                       "䘨tjJ驳豨?y輊M*᳑梵瞻઻ofQG瑮e": 2.222802939724948E-19,
-                                                                                                                                                                                                       "䮴=❑➶T෋w䞜\"垦ꃼUt\u001dx;B$뵣䙶E↌艣ᡥ!᧟;䱀[䔯k쬃`੍8饙른熏'2_'袻tGf蒭J땟as꯳╖&啒zWࡇᒫYSᏬ\u0014ℑ첥鈤|cG~Pᓮ\">\"": "ႆl\f7V儊㦬nHꄬꨧC{쐢~C⮃⛓嶦vꄎ1w鰠嘩뿠魄&\"_qMⵖ釔녮ꝇ 㝚{糍J哋 cv?-jkﻯྌ鹑L舟r",
-                                                                                                                                                                                                       "龧葆yB✱H盋夔ﶉ?n*0(": "ꧣኆ㢓氥qZZ酒ຜ)鮢樛)X䣆gTSґG텞k.J圬疝롫쯭z L：\\ྤ@w炋塜쿖ᾳy뢀䶃뱝N䥨㚔勇겁#p",
-                                                                                                                                                                                                       "도畎Q娡\"@S/뼋:䵏!P衅촚fVHQs✜ᐫi㻑殡B䜇%믚k*U#濨낄~": "ꍟዕ쳸ꍈ敋&l妏\u0005憡멗瘌uPgᅪm<\/To쯬锩h뒓k"
-                                                                                                                                                                                                      }
-                                                                                                                                                                                                     ]
-                                                                                                                                                                                                    }],
-                                                                                                                                                                                                    "墥홞r绚<\/⸹ⰃB}<躅\\Y;๑@䔸>韫䜲뱀X뗩鿥쩗SI%ﴞ㳕䛇?<\/\u00018x\\&侂9鋙a[LR㋭W胕)⡿8㞙0JF,}?허d1cDMᐃ␛鄝ⱕ%X)!XQ": "ⳍꗳ=橇a;3t⦾꼑仈ူaᚯ⯋ꕃAs鴷N⍕_䎃ꙎAz\u0016䯷\\<࿫>8q{}ｷ?ᣰ}'0ᴕ펓B┦lF#趤厃T?㕊#撹圂䆲"
-                                                                                                                                                                                                   },
-                                                                                                                                                                                                   "܋닐龫論c웑": false,
-                                                                                                                                                                                                   "ㇿ/q\"6-co髨휝C큦#\u001b4~?3䐹E삇<<": 7.600917488140322E-20,
-                                                                                                                                                                                                   "䁝E6?㣖ꃁ间t祗*鑠{ḣV(浾h逇큞=W?ૉ?nꇽ8ꅉຉj으쮺@Ꚅ㰤u]Oyr": "v≁᫸_*όAඤԆl)ۓᦇQ}폠z༏q滚",
-                                                                                                                                                                                                   "ｿ᥊/넺I": true
-                                                                                                                                                                                                  }]]
-                                                                                                                                                                                                 ]
-                                                                                                                                                                                                ]
-                                                                                                                                                                                               ]
-                                                                                                                                                                                              ]]
-                                                                                                                                                                                             },
-                                                                                                                                                                                             "䭑Ik攑\u0002QV烄:芩.麑㟴㘨≕": true,
-                                                                                                                                                                                             "坄꿕C쇻풉~崍%碼\\8\"䬦꣙": null,
-                                                                                                                                                                                             "欌L圬䅘Y8c(♺2?ON}o椳s宥2䉀eJ%闹r冁O^K諭%凞⺉⡻,掜?$ꥉ?略焕찳㯊艼誜4?\"﯎<゛XፈINT:詓 +": -1.0750456770694562E-19,
-                                                                                                                                                                                             "獒àc뜭싼ﺳ뎤K`]p隨LtE": null,
-                                                                                                                                                                                             "甙8䵊神EIꩤ鐯ᢀ,ﵮU䝑u疒ử驺䚿≚ഋ梶秓F`覤譐#짾蔀묊4<媍쬦靪_Yzgcࡶ4k紥`kc[Lﮗ簐*I瀑[⾰L殽鑥_mGȠ<\/|囹灠g桰iri": true,
-                                                                                                                                                                                             "챓ꖙꟻ좝菇ou,嗠0\\jK핻뜠qwQ?ഩ㼕3Y彦b\u009bJ榶N棨f?됦鏖綃6鳵M[OE봨u햏.Ꮁ癜蟳뽲ꩌ뻾rM豈R嗀羫 uDꎚ%": null
-                                                                                                                                                                                            },
-                                                                                                                                                                                            "V傜2<": 7175127699521359521
-                                                                                                                                                                                           }],
-                                                                                                                                                                                           "铫aG切<\/\"ী⊆e<^g࢛)D顝ｎאַ饼\u008c猪繩嵿ﱚCꡬ㻊g엺A엦\u000f暿_f꿤볝㦕桦`蒦䎔j甬%岝rj 糏": "䚢偎눴Au<4箞7礦Iﱔ坠eȧ䪸u䵁p|逹$嗫쨘ꖾ﷐!胠z寓팢^㨔|u8Nሇe텔ꅦ抷]،鹎㳁#༔繁 ",
-                                                                                                                                                                                           "낂乕ꃻ볨ϱ-ꇋ㖍fs⿫)zꜦ/K?솞♞ꑌ宭hJ᤭瑥Fu": false,
-                                                                                                                                                                                           "쟰ぜ魛G\u0003u?`㾕ℾ㣭5螠烶這趩ꖢ:@咕ꐶx뒘느m䰨b痃렐0鳊喵熬딃$摉_~7*ⱦ녯1錾GKhJ惎秴6'H妈Tᧅ窹㺒疄矤铟wላ": null,
-                                                                                                                                                                                           "쯆q4!3錕㲏ⵆ㇛꘷Z瑩뭆\\◪NH\u001d\\㽰U~㯶<\"쑣낞3ᵤ'峉eꢬ;鬹o꣒木X*長PXᘱu\"䠹n惞": null,
-                                                                                                                                                                                           "ᅸ祊\"&ꥴCjࢼ﴿?䡉`U效5殼㮞V昽ꏪ#ﺸ\\&t6x꠹盥꣰a[\u001aꪍSpe鎿蠹": -1.1564713893659811E-19
-                                                                                                                                                                                          }
-                                                                                                                                                                                         ]]
-                                                                                                                                                                                        ]
-                                                                                                                                                                                       ]
-                                                                                                                                                                                      ],
-                                                                                                                                                                                      "羵䥳H,6ⱎ겾|@t\"#햊1|稃 섭)띜=뻔ꡜ???櫎~*ῡ꫌/繣ﻠq": null
-                                                                                                                                                                                     }
-                                                                                                                                                                                    ]}
-                                                                                                                                                                                   ]},
-                                                                                                                                                                                   "츤": false
-                                                                                                                                                                                  }},
-                                                                                                                                                                                  "s": 3.7339341963399598E18
-                                                                                                                                                                                 }
-                                                                                                                                                                                ],
-                                                                                                                                                                                "N,I?1+㢓|ࣱ嶃쩥V2\u0012(4EE虪朶$|w颇v步": "~읢~_,Mzr㐫YB溓E淚\"ⅹ䈔ᏺ抙 b,nt5V㐒J檶ꏨ⻔?",
-                                                                                                                                                                                "Q껑ꡡ}$넎qH煔惍/ez^!ẳF댙䝌馻剁8": "梲;yt钰$i冄}AL%a j뜐奷걳뚾d꿽*ሬuDY3?뮟鼯뮟w㍪틱V",
-                                                                                                                                                                                "o{Q/K O胟㍏zUdꀐm&⨺J舕⾏魸訟㌥[T籨櫉唐킝 aṭ뱫촙莛>碶覆⧬짙쭰ׯdAiH໥벤퐥_恸[ 0e:죃TC弼荎뵁DA:w唵ꣁ": null,
-                                                                                                                                                                                "὏樎䵮軧|?౗aWH쩃1 ꅭsu": null
-                                                                                                                                                                               }
-                                                                                                                                                                              ]
-                                                                                                                                                                             },
-                                                                                                                                                                             "勂\\&m鰈J釮=Ⲽ鳋+䂡郑": null,
-                                                                                                                                                                             "殣b綊倶5㥗惢⳷萢ᑀ䬄镧M^ﱴ3⣢翣n櫻1㨵}ኯ뗙顖Z.Q➷ꮨ뗇\u0004": "ꔙ䁼>n^[GीA䨟AM琢ᒊS쨲w?d㶣젊嘶纝麓+愣a%気ྞSc됓ᔘ:8bM7Xd8㶑臌]Ꙥ0ꐭ쒙䫣挵C薽Dfⵃ떼᷸",
-                                                                                                                                                                             "?紡.셪_෨j\u0013Ox┠$Xᶨ-ᅇo薹-}軫;y毝㪜K㣁?.EV쮱4둽⛻䤜'2盡\u001f60(|e쐰㼎ᦀ㒧-$l@ﻑ坳\u0003䭱响巗WFo5c㧆T턁Y맸♤(": -2.50917882560589088E17
-                                                                                                                                                                            }}
-                                                                                                                                                                           ],
-                                                                                                                                                                           "侸\\릩.᳠뎠狣살cs项䭩畳H1s瀉븇19?.w骴崖㤊h痠볭㞳㞳䁮Ql怠㦵": "@䟴-=7f",
-                                                                                                                                                                           "鹟1x௢+d ;vi䭴FSDS\u0004hꎹ㚍?⒍⦏ў6u,扩@됷Su)Pag휛TᒗV痩!瞏釀ꖞ蘥&ೞ蘐ꭰꞇᝎ": "ah懱Ժ&\u20f7䵅♎඀䞧鿪굛ౕ湚粎蚵ᯋ幌YOE)५襦㊝Y*^\"R+ඈ咷蝶9ꥂ榨艦멎헦閝돶v좛咊E)K㓷ྭr",
-                                                                                                                                                                           "搆q쮦4綱켙셁.f4<\/g<籽늷?#蚴픘:fF\u00051㹉뀭.ᰖ풎f֦Hv蔎㧤.!䭽=鞽]음H:?\"-4": 8.740133984938656E-20
-                                                                                                                                                                          }]}
-                                                                                                                                                                         }
-                                                                                                                                                                        ],
-                                                                                                                                                                        "tVKn딩꘥⊾蹓᤹{\u0003lR꼽ᄲQFᅏ傅ﱋ猢⤊ᔁ,E㓒秤nTතv`♛I\u0000]꫔ṞD\"麵c踝杰X&濿또꣹깳౥葂鿎\\aꡨ?": 3900062609292104525
-                                                                                                                                                                       }
-                                                                                                                                                                      ],
-                                                                                                                                                                      "ਉ샒⊩Lu@S䧰^g": -1.1487677090371648E18,
-                                                                                                                                                                      "⎢k⑊꬗yᏫ7^err糎Dt\u000bJ礯확ㆍ沑ｻꋽe赔㝢^J\u0004笲㿋idra剰-᪉C錇/Ĝ䂾ညS지?~콮gR敉⬹'䧭": 1901472137232418266,
-                                                                                                                                                                      "灗k䶥:?촽贍쓉꓈㒸g獘[뵎\\胕?\u0014_榙p.j稶,$`糉妋0>Fᡰly㘽$?": "]ꙛO赎&#㠃돱剳\"<◆>0誉齐_|z|裵씪>ᐌ㼍\"Z[琕}O?G뚇諦cs⠜撺5cu痑U圲\u001c?鴴計l춥/╓哼䄗茏ꮅ뫈댽A돌롖뤫V窗讬sHd&\nOi;_u"
-                                                                                                                                                                     }
-                                                                                                                                                                    ],
-                                                                                                                                                                    "Uﺗ\\Y\\梷䄬~\u0002": null,
-                                                                                                                                                                    "k\"Y磓ᗔ휎@U冈<\/w컑)[": false,
-                                                                                                                                                                    "曏J蝷⌻덦\u001f㙳s꥓⍟邫P늮쥄c∬ྡྷ舆렮칤Z趣5콡넛A쳨\\뀙骫(棻.*&輛LiIfi{@EA婳KᬰTXT": -4.3088230431977587E17
-                                                                                                                                                                   }]}
-                                                                                                                                                                  ]
-                                                                                                                                                                 ],
-                                                                                                                                                                 "곃㲧<\/dఓꂟs其ࡧ&N葶=?c㠤Ჴ'횠숄臼#\u001a~": false
-                                                                                                                                                                }
-                                                                                                                                                               ]
-                                                                                                                                                              ]}]
-                                                                                                                                                             }]
-                                                                                                                                                            }}
-                                                                                                                                                           ],
-                                                                                                                                                           "2f`⽰E쵟>J笂裭!〛觬囀ۺ쟰#桊l鹛ⲋ|RA_Vx፭gE됓h﵀mfỐ|?juTU档[d⢼⺻p濚7E峿": 5613688852456817133
-                                                                                                                                                          },
-                                                                                                                                                          "濘끶g忮7㏵殬W팕Q曁 뫰)惃廊5%-蹚zYZ樭ﴷQ锘쯤崫gg": true,
-                                                                                                                                                          "絥ᇑ⦏쒓븣爚H.㗊߄o蘵貆ꂚ(쎔O᥉ﮓ]姨Wꁓ!RMA|o퉢THx轮7M껁U즨'i뾘舯o": "跥f꜃?"
-                                                                                                                                                         }}
-                                                                                                                                                        ],
-                                                                                                                                                        "鷰鹮K-9k;ﰰ?_ݦѷ-ꅣ䩨Zꥱ\"mꠟ屎/콑Y╘2&鸞脇㏢ꀇ࠺ⰼ拾喭틮L꽩bt俸墶 [l/웄\"꾦\u20d3iও-&+\u000fQ+໱뵞": -1.296494662286671E-19
-                                                                                                                                                       },
-                                                                                                                                                       "HX੹/⨇୕붷Uﮘ旧\\쾜͔3l鄈磣糂̖䟎Eᐳw橖b῀_딕hu葰窳闹вU颵|染H죶.fP䗮:j䫢\\b뎖i燕ꜚG⮠W-≚뉗l趕": "ଊ칭Oa᡺$IV㷧L\u0019脴셀붿餲햪$迳向쐯켂PqfT\" ?I屉鴼쿕@硙z^鏕㊵M}㚛T젣쓌-W⩐-g%⺵<뮱~빅╴瑿浂脬\u0005왦燲4Ⴭb|D堧 <\/oEQh",
-                                                                                                                                                       "䘶#㥘੐캔f巋ἡAJ䢚쭈ࣨ뫒*mᇊK，ࣺAꑱ\u000bR<\/A\"1a6鵌㯀bh곿w(\"$ꘁ*rಐ趣.d࿩k/抶면䒎9W⊃9": "漩b挋Sw藎\u0000",
-                                                                                                                                                       "畀e㨼mK꙼HglKb,\"'䤜": null
-                                                                                                                                                      }]}]
-                                                                                                                                                     ]
-                                                                                                                                                    ]
-                                                                                                                                                   }]
-                                                                                                                                                  ]}
-                                                                                                                                                 ]
-                                                                                                                                                ]}
-                                                                                                                                               ],
-                                                                                                                                               "歙>駿ꣂ숰Q`J΋方樛(d鱾뼣(뫖턭\u20f9lচ9歌8o]8윶l얶?镖G摄탗6폋폵+g:䱫홊<멀뀿/س|ꭺs걐跶稚W々c㫣⎖": "㣮蔊깚Cꓔ舊|XRf遻㆚︆'쾉췝\\&言",
-                                                                                                                                               "殭\"cށɨꝙ䞘:嬮e潽Y펪㳅/\"O@ࠗ겴]췖YǞ(t>R\"N?梳LD恭=n氯T豰2R諸#N}*灧4}㶊G䍣b얚": null,
-                                                                                                                                               "襞<\/啧 B|싞W瓇)6簭鼡艆lN쩝`|펭佡\\間邝[z릶&쭟愱ꅅ\\T᰽1鯯偐栈4̸s윜R7⒝/똽?치X": "⏊躖Cﱰ2Qẫ脐&இ?%냝悊",
-                                                                                                                                               ",鰧偵셣싹xᎹ힨᯳EṬH㹖9": -4604276727380542356
-                                                                                                                                              }
-                                                                                                                                             }
-                                                                                                                                            ]]]],
-                                                                                                                                            "웺㚑xs}q䭵䪠馯8?LB犯zK'os䚛HZ\"L?셎s^㿧㴘Cv2": null
-                                                                                                                                           }]
-                                                                                                                                          ]
-                                                                                                                                         ]
-                                                                                                                                        ],
-                                                                                                                                        "Kd2Kv+|z": 7367845130646124107,
-                                                                                                                                        "ᦂⶨ?ᝢ 祂些ഷ牢㋇操\"腭䙾㖪\\(y4cE뽺ㆷ쫺ᔖ%zfۻ$ў1柦,㶢9r漢": -3.133230960444846E-20,
-                                                                                                                                        "琘M焀q%㢟f鸯O⣏蓑맕鯊$O噷|)z褫^㢦⠮ꚯ꫞`毕1qꢚ{ĭ䎀বώT\"뱘3G൴?^^of": null
-                                                                                                                                       }
-                                                                                                                                      ],
-                                                                                                                                      "a8V᯺?:ﺃ/8ꉿBq|9啓댚;*i2": null,
-                                                                                                                                      "cpT瀇H珰Ừpೃi鎪Rr␣숬-鹸ҩ䠚z脚цGoN8入y%趌I┽2ឪЀiJNcN)槣/▟6S숆牟\"箑X僛G殱娇葱T%杻:J諹昰qV쨰": 8331037591040855245
-                                                                                                                                     }],
-                                                                                                                                     "G5ᩜ䄗巢껳": true
-                                                                                                                                    }
-                                                                                                                                   },
-                                                                                                                                   "Ồ巢ゕ@_譙A`碫鄐㡥砄㠓(^K": "?܃B혢▦@犑ὺD~T⧁|醁;o=J牌9냚⢽㨘{4觍蚔9#$∺\u0016p囅\\3Xk阖⪚\"UzA穕롬✎➁㭒춺C㣌ဉ\"2瓑员ᅽꝶ뫍}꽚ꞇ鶂舟彺]ꍽJC蝧銉",
-                                                                                                                                   "␆Ě膝\"b-퉐ACR言J謈53~V튥x䜢?ꃽɄY뮩ꚜ": "K/↾e萃}]Bs⾿q룅鷦-膋?m+死^魊镲6",
-                                                                                                                                   "粡霦c枋AHퟁo礼Ke?qWcA趸㡔ꂏ?\u000e춂8iতᦜ婪\u0015㢼nﵿꍻ!ᐴ関\u001d5j㨻gfῩUK5Ju丝tかTI'?㓏t>⼟o a>i}ᰗ;뤕ܝ": false,
-                                                                                                                                   "ꄮ匴껢ꂰ涽+䜨B蛹H䛓-k蕞fu7kL谖,'涃V~챳逋穞cT\"vQ쓕ObaCRQ㓡Ⲯ?轭⫦輢墳?vA餽=h䮇킵n폲퉅喙?\"'1疬V嬗Qd灗'Lự": "6v!s믁㭟㣯獃!磸餠ቂh0C뿯봗F鷭gꖶ~ｺkK<ᦈTt\\跓w㭣횋钘ᆹ듡䑚W䟾X'ꅔ4FL勉Vܴ邨y)2'〚쭉⽵-鞣E,Q.?块",
-                                                                                                                                   "?(˧쩯@崟吋歄K": null
-                                                                                                                                  },
-                                                                                                                                  "Gc럃녧>?2DYI鴿\\륨)澔0ᔬlx'觔7젘⤡縷螩%Sv׫묈/]↱&S h\u0006歋ᑛxi̘}ひY蔯_醨鯘煑橾8?䵎쨋z儬ꁏ*@츾:": null
-                                                                                                                                 }
-                                                                                                                                }
-                                                                                                                               }
-                                                                                                                              ]
-                                                                                                                             ]
-                                                                                                                            ]}
-                                                                                                                           },
-                                                                                                                           "HO츧G": 3.694949578823609E17,
-                                                                                                                           "QC\u0012(翻曇Tf㷟bGBJ옉53\\嚇ᛎD/\u001b夾၉4\"핀@祎)쫆yD\"i먎Vn㿿V1W᨝䶀": -6150931500380982286,
-                                                                                                                           "Z㓮P翸鍱鉼K䋞꘺튿⭁Y": -7704503411315138850,
-                                                                                                                           "]모开ꬖP븣c霤<[3aΠ\"黁䖖䰑뮋ꤦ秽∼㑷冹T+YUt\"싳F↭䖏&鋌": -2.7231911483181824E18,
-                                                                                                                           "tꎖ": -4.9517948741799555E-19,
-                                                                                                                           "䋘즊.⬅IꬃۣQ챢ꄑ黐|f?C⾺|兕읯sC鬸섾整腨솷V": "旆柩l<K髝M戶鯮t:wR2ꉱ`9'l픪*폍芦㊢Pjjo堡^  읇얛嶅있ষ0?F",
-                                                                                                                           "下9T挞\\$yᮇk쌋⼇,ਉ": true,
-                                                                                                                           "櫨:ㆣ,邍lr崕祜㐮烜Z,XXD蕼㉴ kM꯽?P0﹉릗": null,
-                                                                                                                           "gv솠歽閘4镳䗄2澾>쪦sᖸMy㦅울썉瘗㎜檵9ꍂ駓ૉᚿ/u3씅徐拉[Z䞸ࡗ1ꆱ&Ｑ풘?ǂ8\u0011BCDY2볨;鸏": null,
-                                                                                                                           "幫 n煥s쁇펇 왊-$C\"衝:\u0014㣯舼.3뙗Yl⋇\"K迎멎[꽵s}9鉳UK8쐥\"掄㹖h㙈!얄સ?Ꜳ봺R伕UTD媚Ｉ䜘W鏨蔮": -4.150842714188901E-17,
-                                                                                                                           "ﺯ^㄄\b죵@fྉkf颡팋Ꞧ{/Pm0V둳⻿/落韒ꊔᚬ@5螺G\\咸a谆⊪ቧ慷绖?财(鷇u錝F=r၍橢ឳn:^iᴵtD볠覅N赴": null
-                                                                                                                          }]
-                                                                                                                         }]
-                                                                                                                        }
-                                                                                                                       ]
-                                                                                                                      ]}
-                                                                                                                     ]},
-                                                                                                                     "謯?w厓奰T李헗聝ឍ貖o⪇弒L!캶$ᆅ": -4299324168507841322,
-                                                                                                                     "뺊奉_垐浸延몏孄Z舰2i$q붿좾껇d▵餏\"v暜Ҭ섁m￴g>": -1.60911932510533427E18
-                                                                                                                    }
-                                                                                                                   ]
-                                                                                                                  }
-                                                                                                                 ]
-                                                                                                                ]],
-                                                                                                                "퉝꺔㠦楶Pꅱ": 7517896876489142899,
-                                                                                                                "": false
-                                                                                                               }
-                                                                                                              ]},
-                                                                                                              "是u&I狻餼|谖j\"7c됮sסּ-踳鉷`䣷쉄_A艣鳞凃*m⯾☦椿q㎭N溔铉tlㆈ^": 1.93547720203604352E18,
-                                                                                                              "kⲨ\\%vr#\u000bⒺY\\t<\/3﬌R訤='﹠8蝤Ꞵ렴曔r": false
-                                                                                                             }
-                                                                                                            ]},
-                                                                                                            "阨{c?C\u001d~K?鎌Ԭ8烫#뙣P초遗t㭱E­돒䆺}甗[R*1!\\~h㕅᰺@<9JꏏષI䳖栭6綘걹ￌM\"▯是∔v鬽顭⋊譬": "운ﶁK敂(欖C취پ℄爦賾"
-                                                                                                           }
-                                                                                                          }}
-                                                                                                         }],
-                                                                                                         "鷨赼鸙+\\䭣t圙ڹx᜾ČN<\/踘\"S_맶a鷺漇T彚⎲i㈥LT-xA캔$\u001cUH=a0츺l릦": "溣㣂0濕=鉵氬駘>Pꌢpb솇쬤h힊줎獪㪬CrQ矠a&脍꼬爼M茴/΅\u0017弝轼y#Ꞡc6둴=?R崏뷠麖w?"
-                                                                                                        },
-                                                                                                        "閕ᘜ]CT)䵞l9z'xZF{:ؐI/躅匽졁:䟇AGF૸\u001cퟗ9)駬慟ꡒꆒRS״툋A<>\u0010\"ꂔ炃7g덚E৏bꅰ輤]o㱏_뷕ܘ暂\"u": "芢+U^+㢩^鱆8*1鈶鮀\u0002뺰9⬳ꪮlL䃣괟,G8\u20a8DF㉪錖0ㄤ瓶8Nଷd?眡GLc陓\\_죌V쁰ल二?c띦捱 \u0019JC\u0011b⤉zẒT볕\"绣蘨뚋cꡉkI\u001e鳴",
-                                                                                                        "ꃣI'{6u^㡃#཰Kq4逹y൒䧠䵮!㱙/n??{L풓ZET㙠퍿X2᩟綳跠葿㚙w཮x캽扳B唕S|尾}촕%N?o䪨": null,
-                                                                                                        "ⰴFjෟ셈[\u0018辷px?椯\\1<ﲻ栘ᣁ봢憠뉴p": -5263694954586507640
-                                                                                                       }
-                                                                                                      ]
-                                                                                                     ]]
-                                                                                                    ]}
-                                                                                                   ]}]
-                                                                                                  ]
-                                                                                                 ],
-                                                                                                 "?#癘82禩鋆ꊝty?&": -1.9419029518535086E-19
-                                                                                                }
-                                                                                               ]
-                                                                                              ]
-                                                                                             ]}
-                                                                                            ]
-                                                                                           ]
-                                                                                          ],
-                                                                                          "훊榲.|῕戄&.㚏Zꛦ2\"䢥ሆ⤢fV_摕婔?≍Fji冀탆꜕i㏬_ẑKᅢ꫄蔻XWc|饡Siẘ^㲦?羡2ぴ1縁ᙅ?쐉Ou": false
-                                                                                         }]]
-                                                                                        ]}}},
-                                                                                        "慂뗄卓蓔ᐓ匐嚖/颹蘯/翻ㆼL?뇊,텵<\\獷ごCボ": null
-                                                                                       },
-                                                                                       "p溉ᑟi짣z:䒤棇r^٫%G9缑r砌롧.물农g?0׼ሩ4ƸO㣥㯄쩞ጩ": null,
-                                                                                       "껎繥YxK\"F젷쨹뤤1wq轫o?鱑뜀瘊?뎃h灑\\ꛣ}K峐^ኖ⤐林ꉓhy": null
-                                                                                      }
-                                                                                     ],
-                                                                                     "᱀n肓ㄛ\"堻2>m殮'1橌%Ꞵ군=Ӳ鯨9耛<\/n據0u彘8㬇៩f᏿诙]嚊": "䋯쪦S럶匏ㅛ#)O`ሀX_鐪渲⛀㨻宅闩➈ꢙஶDR⪍"
-                                                                                    },
-                                                                                    "tA썓龇 ⋥bj왎录r땽✒롰;羋^\\?툳*┎?썀ma䵳넅U䳆૘〹䆀LQ0\b疀U~u$M}(鵸g⳾i抦뛹?䤈땚검.鹆?ꩡtⶥGĒ;!ቹHS峻B츪켏f5≺": 2366175040075384032,
-                                                                                    "전pJjleb]ួ": -7.5418493141528422E18,
-                                                                                    "n.鎖ጲ\n?,$䪘": true
-                                                                                   },
-                                                                                   "欈Ar㉣螵᪚茩?O)": null
-                                                                                  },
-                                                                                  "쫸M#x}D秱欐K=侫们丐.KꕾxẠ\u001e㿯䣛F܍캗qq8꟞ṢFD훎⵳簕꭛^鳜\u205c٫~⑟~冫ऊ2쫰<\/戲윱o<\"": true
-                                                                                 },
-                                                                                 "㷝聥/T뱂\u0010锕|内䞇x侁≦㭖:M?iM᣿IJe煜dG࣯尃⚩gPt*辂.{磼럾䝪@a\\袛?}ᓺB珼": true
-                                                                                }
-                                                                               }
-                                                                              ]]}]}},
-                                                                              "tn\"6ꫤ샾䄄;銞^%VBPwu묪`Y僑N.↺Ws?3C⤻9唩S䠮ᐴm;sᇷ냞඘B/;툥B?lB∤)G+O9m裢0kC햪䪤": -4.5941249382502277E18,
-                                                                              "ᚔt'\\愫?鵀@\\びꂕP큠<<]煹G-b!S?\nꖽ鼫,ݛ&頺y踦?E揆릱H}햧캡b@手.p탻>췽㣬ꒅ`qe佭P>ᓂ&?u}毚ᜉ蟶頳졪ᎏzl2wO": -2.53561440423275936E17
-                                                                             }]}
-                                                                            }
-                                                                           ]
-                                                                          ]],
-                                                                          "潈촒⿂叡": 5495738871964062986
-                                                                         }
-                                                                        ]]
-                                                                       }
-                                                                      ]
-                                                                     ]}
-                                                                    ]]
-                                                                   ]]
-                                                                  ]}
-                                                                 ]
-                                                                ]},
-                                                                "ႁq킍蓅R`謈蟐ᦏ儂槐僻ﹶ9婌櫞釈~\"%匹躾ɢ뤥>࢟瀴愅?殕节/냔O✬H鲽엢?ᮈੁ⋧d␽㫐zCe*": 2.15062231586689536E17,
-                                                                "㶵Ui曚珰鋪ᾼ臧P{䍏䷪쨑̟A뼿T渠誈䏚D1!잶<\/㡍7?)2l≣穷᛾稝{:;㡹nemיּ訊`G": null,
-                                                                "䀕\"飕辭p圁f#뫆䶷뛮;⛴ᩍ3灚덏ᰝ쎓⦷詵%᜖Մfs⇫(\u001e~P|ﭗCⲾផv湟W첋(텪બT<บSꏉ੗⋲X婵i ӵ⇮?L䬇|ꈏ?졸": 1.548341247351782E-19
-                                                               }
-                                                              ]
-                                                             },
-                                                             "t;:N\u0015q鐦Rt缆{ꮐC?஛㷱敪\\+鲊㉫㓪몗릙竏(氵kYS": "XᰂT?൮ô",
-                                                             "碕飦幑|+ 㚦鏶`镥ꁩ B<\/加륙": -4314053432419755959,
-                                                             "秌孳(p!G?V傫%8ሽ8w;5鲗㦙LI檸\u2098": "zG N볞䆭鎍흘\\ONK3횙<\/樚立圌Q튅k쩎Ff쁋aׂJK銆ઘ즐狩6༥✙䩜篥CzP(聻駇HHퟲ讃%,ά{렍p而刲vy䦅ክ^톺M楒鍢㹳]Mdg2>䤉洞",
-                                                             "踛M젧>忔芿㌜Zk": 2215369545966507819,
-                                                             "씐A`$槭頰퍻^U覒\bG毲aᣴU;8!팲f꜇E⸃_卵{嫏羃X쀳C7뗮m(嚼u N܁谟D劯9]#": true,
-                                                             "ﻩ!뵸-筚P᭛}ἰ履lPh?౮ⶹꆛ穉뎃g萑㑓溢CX뾇G㖬A錟]RKaꄘ]Yo+@䘁's섎襠$^홰}F": null
-                                                            },
-                                                            "粘ꪒ4HXᕘ蹵.$區\r\u001d묁77pPc^y笲Q<\/ꖶ 訍䃍ᨕG?*": 1.73773035935040224E17
-                                                           },
-                                                           "婅拳?bkU;#D矠❴vVN쩆t㜷A풃갮娪a%鮏絪3dAv룒#tm쑬⌛qYwc4|L8KZ;xU⓭㳔밆拓EZ7襨eD|隰ऌ䧼u9Ԣ+]贴P荿": 2.9628516456987075E18
-                                                          }]}}]
-                                                         ]}
-                                                        }}
-                                                       ]}]
-                                                      ],
-                                                      "|g翉F*湹̶\u0005⏐1脉̀eI쩓ᖂ㫱0碞l䴨ꑅ㵽7AtἈ턧yq䳥塑:z:遀ﾼX눔擉)`N3昛oQ셖y-ڨ⾶恢ꈵq^<\/": null,
-                                                      "菹\\랓G^璬x৴뭸ゆUS겧﮷Bꮤ ┉銜᯻0%N7}~f洋坄Xꔼ<\/4妟Vꄟ9:౟곡t킅冩䧉笭裟炂4봋ⱳ叺怊t+怯涗\"0㖈Hq": false,
-                                                      "졬믟'ﺇফ圪쓬멤m邸QLব䗁愍4jvs翙 ྍ꧀艳H-|": null,
-                                                      "컮襱⣱뗠 R毪/鹙꾀%헳8&": -5770986448525107020
-                                                     }
-                                                    ],
-                                                    "B䔚bꐻ뙏姓展槰T-똌鷺tc灿᫽^㓟䏀o3o$꘭趙萬I顩)뇭Ἑ䓝\f@{ᣨ`x3蔛": null
-                                                   }
-                                                  ]
-                                                 ]
-                                                }],
-                                                "⦖扚vWꃱ꥙㾠壢輓{-⎳鹷贏璿䜑bG倛⋐磎c皇皩7a~ﳫU╣Q࠭ꎉS摅姽OW.홌ೞ.": null,
-                                                "蚪eVlH献r}ᮏ믠ﰩꔄ@瑄ⲱ": null,
-                                                "퀭$JWoꩢg역쁍䖔㑺h&ୢtXX愰㱇?㾫I_6 OaB瑈q裿": null,
-                                                "꽦ﲼLyr纛Zdu珍B絟쬴糔?㕂짹䏵e": "ḱ\u2009cX9멀i䶛簆㳀k"
-                                               }
-                                              ]]]],
-                                              "(_ꏮg່澮?ᩑyM<艷\u001aꪽ\\庼뙭Z맷㰩Vm\\lY筺]3㋲2㌩㄀Eਟ䝵⨄쐨ᔟgङHn鐖⤇놋瓇Q탚單oY\"♆臾jHᶈ征ቄ??uㇰA?#1侓": null
-                                             },
-                                             "觓^~ሢ&iI띆g륎ḱ캀.ᓡꀮ胙鈉": 1.0664523593012836E-19,
-                                             "y詭Gbᔶऽs댁U:杜⤎ϲ쁗⮼D醄诿q뙰I#즧v蔎xHᵿt᡽[**?崮耖p缫쿃L菝,봬ꤦC쯵#=X1瞻@OZc鱗CQTx": null
-                                            }
-                                           ]
-                                          }}],
-                                          "剘紁\u0004\\Xn⊠6,တױ;嵣崇}讃iႽ)d1\\䔓": null
-                                         },
-                                         "脨z\"{X,1u찜<'k&@?1}Yn$\u0015Rd輲ｰa쮂굄+B$l": true,
-                                         "諳>*쭮괐䵟Ґ+<箁}빀䅱⡔檏臒hIH脟ꩪC핝ଗP좕\"0i<\/C褻D۞恗+^5?'ꂱ䚫^7}㡠cq6\\쨪ꔞꥢ?纖䫀氮蒫侲빦敶q{A煲G": -6880961710038544266
-                                        }}]
-                                       },
-                                       "5s⨲JvಽῶꭂᄢI.a৊": null,
-                                       "?1q꽏쿻ꛋDR%U娝>DgN乭G": -1.2105047302732358E-19
-                                      }
-                                     ]
-                                    ]},
-                                    "qZz`撋뙹둣j碇쁏\\ꆥ\u0018@藴疰Wz)O{F䶛l᷂绘訥$]뮍夻䢋䩇萿獰樧猵⣭j萶q)$꬚⵷0馢W:Ⱍ!Qoe": -1666634370862219540,
-                                    "t": "=wp|~碎Q鬳Ӎ\\l-<\/^ﳊhn퐖}䍔t碵ḛ혷?靻䊗",
-                                    "邙쇡㯇%#=,E4勃驆V繚q[Y댻XV㡸[逹ᰏ葢B@u=JS5?bLRn얮㍉⏅ﰳ?a6[&큟!藈": 1.2722786745736667E-19
-                                   },
-                                   "X블땨4{ph鵋ꉯ웸 5p簂䦭s_E徔濧d稝~No穔噕뽲)뉈c5M윅>⚋[岦䲟懷恁?鎐꓆ฬ爋獠䜔s{\u001bm鐚儸煛%bﯿXT>ꗘ@8G": 1157841540507770724,
-                                   "媤娪Q杸\u0011SAyᡈ쿯": true,
-                                   "灚^ಸ%걁<\/蛯<O\"-刷㏠R(kO=䢊䅎l䰓팪A絫픧": "譔\\㚄 ?R7㔪G㋉⣰渆?\\#|gN⤴;W칷A׫癮଼ೣ㏳뒜7d恓꾲0扬S0ᆵi/贎ྡn䆋武",
-                                   "萇砇Gこ朦켋Wq`㞲攊*冁~霓L剢zI腧튴T繙Cঅ뫬╈뮜ㄾ䦧촄椘B⊬츩r2f㶱厊8eϬ{挚␯OM焄覤\\(Kӡ>?\"祴坓\\\\'흍": -3.4614808555942579E18,
-                                   "釴U:O湛㴑䀣렑縓\ta)<D8ﭳ槁髭D.L|xs斋敠\"띋早7wᎍ": true,
-                                   "쵈+쬎簨up䓬?q+~\u0019仇뵈᫯3ᵣ恘枰劫㪢u珘-퀭:컙:u`⌿A(9鄦!<珚nj3:Hࣨ巋䀁旸뎈맻v\"\\(곘vO㤰aZe<\/W鹙鄜;l厮둝": null,
-                                   "": -1.2019926774977002E-18,
-                                   "%者O7.Nꪍs梇接z蕜綛<\/䜭\"죊y<曋漵@Ś⹝sD⟓jݗᢜ?z/9ၲMa쨮긗贎8ᔮ㦛;6p뾥໭䭊0B찛+)(Y㿠鸁䕒^옥": "鬃뫤&痽舎J콮藐󽸰ᨨMꈫ髿v<N\\.삒껅я1ꭼ5䴷5쳬臨wj덥"
-                                  }],
-                                  "鷎'㳗@帚妇OAj' 谬f94ǯ(횡ﾋ%io쪖삐좛>(j:숾却䗌gCiB뽬Oyuq輥厁/7)?今hY︺Q": null
-                                 }
-                                ]
-                               ]]]}]
-                              ],
-                              "I笔趠Ph!<ཛྷ㸞诘X$畉F\u0005笷菟.Esr릙!W☆䲖뗷莾뒭U\"䀸犜Uo3Gꯌx4r蔇᡹㧪쨢準<䂀%ࡡꟼ瑍8炝Xs0䀝销?fi쥱ꆝલBB": -8571484181158525797,
-                              "L⦁o#J|\"⽩-㱢d㌛8d\\㶤傩儻E[Y熯)r噤὘勇 }": "e(濨쓌K䧚僒㘍蠤Vᛸ\"络QJL2,嬓왍伢㋒䴿考澰@(㏾`kX$끑эE斡,蜍&~y",
-                              "vj.|统圪ᵮPL?2oŶ`밧\"勃+0ue%⿥绬췈체$6:qa렐Q;~晘3㙘鹑": true,
-                              "ශؙ4獄⶿c︋i⚅:ん閝Ⳙ苆籦kw{䙞셕pC췃ꍬ␜꟯ꚓ酄b힝hwk꭭M鬋8B耳쑘WQ\\偙ac'唀x᪌\u2048*h짎#ፇ鮠뾏ឿ뀌": false,
-                              "⎀jꄒ牺3Ⓝ컴~?親ꕽぼܓ喏瘘!@<튋㐌꿱⩦{a?Yv%⪧笯Uܱ栅E搚i뚬:ꄃx7䙳ꦋ&䓹vq☶I䁘ᾘ涜\\썉뺌Lr%Bc㍜3?ꝭ砿裞]": null,
-                              "⭤뙓z(㡂%亳K䌽꫿AԾ岺㦦㼴輞낚Vꦴw냟鬓㹈뽈+o3譻K1잞": 2091209026076965894,
-                              "ㇲ\t⋇轑ꠤ룫X긒\"zoY읇희wj梐쐑l侸`e%s": -9.9240075473576563E17,
-                              "啸ꮑ㉰!ᚓ}銏": -4.0694813896301194E18,
-                              ">]囋੽EK뇜>_ꀣ緳碖{쐐裔[<ನ\"䇅\"5L?#xTwv#罐\u0005래t应\\N?빗;": "v쮽瞭p뭃"
-                             }
-                            ]],
-                            "斴槾?Z翁\"~慍弞ﻆ=꜡o5鐋dw\"?K蠡i샾ogDﲰ_C*⬟iㇷ4nય蟏[㟉U꽌娛苸 ঢ়操贻洞펻)쿗૊許X⨪VY츚Z䍾㶭~튃ᵦ<\/E臭tve猑x嚢": null,
-                            "锡⛩<\/칥ꈙᬙ蝀&Ꚑ籬■865?_>L詏쿨䈌浿弥爫̫lj&zx<\/C쉾?覯n?": null,
-                            "꾳鑤/꼩d=ᘈn挫ᑩ䰬ZC": "3錢爋6Ƹ䴗v⪿Wr益G韠[\u0010屗9쁡钁u?殢c䳀蓃樄욂NAq赟c튒瘁렶Aૡɚ捍"
-                           }
-                          ]
-                         ]
-                        ]}
-                       ]
-                      ]
-                     }]]]}}
-                    ]}],
-                    "Ej䗳U<\/Q=灒샎䞦,堰頠@褙g_\u0003ꤾfⶽ?퇋!łB〙ד3CC䌴鈌U:뭔咎(Qો臃䡬荋BO7㢝䟸\"Yb": 2.36010731779814E-20,
-                    "逸'0岔j\u000e눘먷翌C츊秦=ꭣ棭ှ;鳸=麱$XP⩉駚橄A\\좱⛌jqv䰞3Ь踌v㳆¹gT┌gvLB賖烡m?@E঳i": null
-                   },
-                   "曺v찘ׁ?&绫O័": 9107241066550187880
-                  }
-                 ]
-                ],
-                "(e屄\u0019昜훕琖b蓘ᬄ0/۲묇Z蘮ဏ⨏蛘胯뢃@㘉8ሪWᨮ⦬ᅳ䅴HI၇쨳z囕陻엣1赳o": true,
-                ",b刈Z,ၠ晐T솝ŕB⩆ou'퐼≃绗雗d譊": null,
-                "a唥KB\"ﳝ肕$u\n^⅄P䟼냉䞸⩪u윗瀱ꔨ#yşs꒬=1|ﲤ爢`t౐튼쳫_Az(Ṋ擬㦷좕耈6": 2099309172767331582,
-                "?㴸U<\/䢔ꯡ阽扆㐤q鐋?f㔫wM嬙-;UV죫嚔픞G&\"Cᗍ䪏풊Q": "VM7疹+陕枡툩窲}翡䖶8欞čsT뮐}璤:jﺋ鎴}HfA൝⧻Zd#Qu茅J髒皣Y-︴[?-~쉜v딏璮㹚䅊﩯<-#\u000e걀h\u0004u抱﵊㼃U<㱷⊱IC進"
-               },
-               "숌dee節鏽邺p넱蹓+e罕U": true
-              }
-             ],
-             "b⧴룏??ᔠ3ぱ>%郿劃翐ꏬꠛW瞳᫏누躨狀ໄy੽\"ីuS=㨞馸k乆E": "トz݈^9R䬑<ﮛG<s~<\/?ⵆᏥ老熷u듷"
-            }}
-           ]
-          }
-         ]}
-        }
-       }
-      }
-     }},
-     "宩j鬅쳜QꝖјy獔Z᭵1v擖}䨿F%cֲ᫺贴m塼딚NP亪\"ￋsa뺯ꘓ2:9뛓༂쌅䊈#>Rꨳ\u000fTT泠纷꽀MR<CBxP񱒫X쇤": -2.22390568492330598E18,
-     "?䯣ᄽ@Z鸅->ᴱ纊:㠭볮?%N56%鈕1䗍䜁a䲗j陇=뿻偂衋࿘ᓸ?ᕵZ+<\/}H耢b䀁z^f$&㝒LkꢳI脚뙛u": 5.694374481577558E-20
-    }]
-   }
-  ]],
-  "obj": {"key": "wrong value"},
-  "퓲꽪m{㶩/뇿#⼢&᭙硞㪔E嚉c樱㬇1a綑᝖DḾ䝩": null
- }
-}
\ No newline at end of file
diff --git a/3rdparty/rapidjson/bin/data/webapp.json b/3rdparty/rapidjson/bin/data/webapp.json
deleted file mode 100644
index ee7b0f8bab2..00000000000
--- a/3rdparty/rapidjson/bin/data/webapp.json
+++ /dev/null
@@ -1,88 +0,0 @@
-{"web-app": {
-  "servlet": [   
-    {
-      "servlet-name": "cofaxCDS",
-      "servlet-class": "org.cofax.cds.CDSServlet",
-      "init-param": {
-        "configGlossary:installationAt": "Philadelphia, PA",
-        "configGlossary:adminEmail": "ksm@pobox.com",
-        "configGlossary:poweredBy": "Cofax",
-        "configGlossary:poweredByIcon": "/images/cofax.gif",
-        "configGlossary:staticPath": "/content/static",
-        "templateProcessorClass": "org.cofax.WysiwygTemplate",
-        "templateLoaderClass": "org.cofax.FilesTemplateLoader",
-        "templatePath": "templates",
-        "templateOverridePath": "",
-        "defaultListTemplate": "listTemplate.htm",
-        "defaultFileTemplate": "articleTemplate.htm",
-        "useJSP": false,
-        "jspListTemplate": "listTemplate.jsp",
-        "jspFileTemplate": "articleTemplate.jsp",
-        "cachePackageTagsTrack": 200,
-        "cachePackageTagsStore": 200,
-        "cachePackageTagsRefresh": 60,
-        "cacheTemplatesTrack": 100,
-        "cacheTemplatesStore": 50,
-        "cacheTemplatesRefresh": 15,
-        "cachePagesTrack": 200,
-        "cachePagesStore": 100,
-        "cachePagesRefresh": 10,
-        "cachePagesDirtyRead": 10,
-        "searchEngineListTemplate": "forSearchEnginesList.htm",
-        "searchEngineFileTemplate": "forSearchEngines.htm",
-        "searchEngineRobotsDb": "WEB-INF/robots.db",
-        "useDataStore": true,
-        "dataStoreClass": "org.cofax.SqlDataStore",
-        "redirectionClass": "org.cofax.SqlRedirection",
-        "dataStoreName": "cofax",
-        "dataStoreDriver": "com.microsoft.jdbc.sqlserver.SQLServerDriver",
-        "dataStoreUrl": "jdbc:microsoft:sqlserver://LOCALHOST:1433;DatabaseName=goon",
-        "dataStoreUser": "sa",
-        "dataStorePassword": "dataStoreTestQuery",
-        "dataStoreTestQuery": "SET NOCOUNT ON;select test='test';",
-        "dataStoreLogFile": "/usr/local/tomcat/logs/datastore.log",
-        "dataStoreInitConns": 10,
-        "dataStoreMaxConns": 100,
-        "dataStoreConnUsageLimit": 100,
-        "dataStoreLogLevel": "debug",
-        "maxUrlLength": 500}},
-    {
-      "servlet-name": "cofaxEmail",
-      "servlet-class": "org.cofax.cds.EmailServlet",
-      "init-param": {
-      "mailHost": "mail1",
-      "mailHostOverride": "mail2"}},
-    {
-      "servlet-name": "cofaxAdmin",
-      "servlet-class": "org.cofax.cds.AdminServlet"},
- 
-    {
-      "servlet-name": "fileServlet",
-      "servlet-class": "org.cofax.cds.FileServlet"},
-    {
-      "servlet-name": "cofaxTools",
-      "servlet-class": "org.cofax.cms.CofaxToolsServlet",
-      "init-param": {
-        "templatePath": "toolstemplates/",
-        "log": 1,
-        "logLocation": "/usr/local/tomcat/logs/CofaxTools.log",
-        "logMaxSize": "",
-        "dataLog": 1,
-        "dataLogLocation": "/usr/local/tomcat/logs/dataLog.log",
-        "dataLogMaxSize": "",
-        "removePageCache": "/content/admin/remove?cache=pages&id=",
-        "removeTemplateCache": "/content/admin/remove?cache=templates&id=",
-        "fileTransferFolder": "/usr/local/tomcat/webapps/content/fileTransferFolder",
-        "lookInContext": 1,
-        "adminGroupID": 4,
-        "betaServer": true}}],
-  "servlet-mapping": {
-    "cofaxCDS": "/",
-    "cofaxEmail": "/cofaxutil/aemail/*",
-    "cofaxAdmin": "/admin/*",
-    "fileServlet": "/static/*",
-    "cofaxTools": "/tools/*"},
- 
-  "taglib": {
-    "taglib-uri": "cofax.tld",
-    "taglib-location": "/WEB-INF/tlds/cofax.tld"}}}
\ No newline at end of file
diff --git a/3rdparty/rapidjson/bin/data/widget.json b/3rdparty/rapidjson/bin/data/widget.json
deleted file mode 100644
index 32690e8b763..00000000000
--- a/3rdparty/rapidjson/bin/data/widget.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{"widget": {
-    "debug": "on",
-    "window": {
-        "title": "Sample Konfabulator Widget",
-        "name": "main_window",
-        "width": 500,
-        "height": 500
-    },
-    "image": { 
-        "src": "Images/Sun.png",
-        "name": "sun1",
-        "hOffset": 250,
-        "vOffset": 250,
-        "alignment": "center"
-    },
-    "text": {
-        "data": "Click Here",
-        "size": 36,
-        "style": "bold",
-        "name": "text1",
-        "hOffset": 250,
-        "vOffset": 100,
-        "alignment": "center",
-        "onMouseUp": "sun1.opacity = (sun1.opacity / 100) * 90;"
-    }
-}}
\ No newline at end of file
diff --git a/3rdparty/rapidjson/bin/draft-04/schema b/3rdparty/rapidjson/bin/draft-04/schema
deleted file mode 100644
index 85eb502a680..00000000000
--- a/3rdparty/rapidjson/bin/draft-04/schema
+++ /dev/null
@@ -1,150 +0,0 @@
-{
-    "id": "http://json-schema.org/draft-04/schema#",
-    "$schema": "http://json-schema.org/draft-04/schema#",
-    "description": "Core schema meta-schema",
-    "definitions": {
-        "schemaArray": {
-            "type": "array",
-            "minItems": 1,
-            "items": { "$ref": "#" }
-        },
-        "positiveInteger": {
-            "type": "integer",
-            "minimum": 0
-        },
-        "positiveIntegerDefault0": {
-            "allOf": [ { "$ref": "#/definitions/positiveInteger" }, { "default": 0 } ]
-        },
-        "simpleTypes": {
-            "enum": [ "array", "boolean", "integer", "null", "number", "object", "string" ]
-        },
-        "stringArray": {
-            "type": "array",
-            "items": { "type": "string" },
-            "minItems": 1,
-            "uniqueItems": true
-        }
-    },
-    "type": "object",
-    "properties": {
-        "id": {
-            "type": "string",
-            "format": "uri"
-        },
-        "$schema": {
-            "type": "string",
-            "format": "uri"
-        },
-        "title": {
-            "type": "string"
-        },
-        "description": {
-            "type": "string"
-        },
-        "default": {},
-        "multipleOf": {
-            "type": "number",
-            "minimum": 0,
-            "exclusiveMinimum": true
-        },
-        "maximum": {
-            "type": "number"
-        },
-        "exclusiveMaximum": {
-            "type": "boolean",
-            "default": false
-        },
-        "minimum": {
-            "type": "number"
-        },
-        "exclusiveMinimum": {
-            "type": "boolean",
-            "default": false
-        },
-        "maxLength": { "$ref": "#/definitions/positiveInteger" },
-        "minLength": { "$ref": "#/definitions/positiveIntegerDefault0" },
-        "pattern": {
-            "type": "string",
-            "format": "regex"
-        },
-        "additionalItems": {
-            "anyOf": [
-                { "type": "boolean" },
-                { "$ref": "#" }
-            ],
-            "default": {}
-        },
-        "items": {
-            "anyOf": [
-                { "$ref": "#" },
-                { "$ref": "#/definitions/schemaArray" }
-            ],
-            "default": {}
-        },
-        "maxItems": { "$ref": "#/definitions/positiveInteger" },
-        "minItems": { "$ref": "#/definitions/positiveIntegerDefault0" },
-        "uniqueItems": {
-            "type": "boolean",
-            "default": false
-        },
-        "maxProperties": { "$ref": "#/definitions/positiveInteger" },
-        "minProperties": { "$ref": "#/definitions/positiveIntegerDefault0" },
-        "required": { "$ref": "#/definitions/stringArray" },
-        "additionalProperties": {
-            "anyOf": [
-                { "type": "boolean" },
-                { "$ref": "#" }
-            ],
-            "default": {}
-        },
-        "definitions": {
-            "type": "object",
-            "additionalProperties": { "$ref": "#" },
-            "default": {}
-        },
-        "properties": {
-            "type": "object",
-            "additionalProperties": { "$ref": "#" },
-            "default": {}
-        },
-        "patternProperties": {
-            "type": "object",
-            "additionalProperties": { "$ref": "#" },
-            "default": {}
-        },
-        "dependencies": {
-            "type": "object",
-            "additionalProperties": {
-                "anyOf": [
-                    { "$ref": "#" },
-                    { "$ref": "#/definitions/stringArray" }
-                ]
-            }
-        },
-        "enum": {
-            "type": "array",
-            "minItems": 1,
-            "uniqueItems": true
-        },
-        "type": {
-            "anyOf": [
-                { "$ref": "#/definitions/simpleTypes" },
-                {
-                    "type": "array",
-                    "items": { "$ref": "#/definitions/simpleTypes" },
-                    "minItems": 1,
-                    "uniqueItems": true
-                }
-            ]
-        },
-        "allOf": { "$ref": "#/definitions/schemaArray" },
-        "anyOf": { "$ref": "#/definitions/schemaArray" },
-        "oneOf": { "$ref": "#/definitions/schemaArray" },
-        "not": { "$ref": "#" }
-    },
-    "dependencies": {
-        "exclusiveMaximum": [ "maximum" ],
-        "exclusiveMinimum": [ "minimum" ]
-    },
-    "default": {}
-}
diff --git a/3rdparty/rapidjson/bin/encodings/utf16be.json b/3rdparty/rapidjson/bin/encodings/utf16be.json
deleted file mode 100644
index e46dbfb9ddc489f4e26450bd86626a3a55235533..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 368
zcmZRmX5eMuV&G&@Vn}7k1Cmxi?8%_Okj#(><SPJ06B$Z?bUH&0kW~zX3SgNOAe{-8
zNnywbswxJmRtNJl7)lw6z^q)LxE|0v9k?A;3>gf%3?5(;N+7l+2{!x<k@Mp&-d)n%
zz~jdou)S~ftSbggIQ11{*XOU&x7t4#O<xw!Ca|9>4;thftTA|Lu+w1DjQa+a2Au{y
z26YCJ222LAKvq6bep0}8gA{{6plGzgWHfWKfqn#=vth=jDGUn76?U%KS;L^P%ksDj
tgTf&Rph(BjEytz+eXFqc$MzYUk1!}4b-BuN@&J(bI_d(HQ38iSEdbokSsefX

diff --git a/3rdparty/rapidjson/bin/encodings/utf16bebom.json b/3rdparty/rapidjson/bin/encodings/utf16bebom.json
deleted file mode 100644
index 0a23ae205cb3354e828cd3c0f3fce322b9618815..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 370
zcmezOpP`z8mw}6clR=3gl_3vES^=>qg91Y`Ln4r`02EDRC;`&x3^_nnF%T+%Wm152
zCRiqgAs?u!7^qqu%+FvbWher(a)IJ{K=X9qc2qHBFz7OPfK4cY*p?*N@Ha%xkGptx
zNpk~_A8)|+zSXm?7%<_~SBzbsze?X~|6nwISwNe>eyTiZkZ-WY;HAM%gGn>)8&n!}
z8uS>{8AKW|8N>ov`9S$e0ox5y3<80o(FT*z%*h7&5p2$e8JngsC>&SVxn^e#gTgM$
v<1P#eha`X^9Y?nun*#K$!rC9(XKX&gpm5aXD$B_OK-%l53s6Q090s)jyQo_l

diff --git a/3rdparty/rapidjson/bin/encodings/utf16le.json b/3rdparty/rapidjson/bin/encodings/utf16le.json
deleted file mode 100644
index 92d504530cda3c0f6c775907f544e5b60fb9dcf8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 368
zcmb<s;AP-q;ABu@NM*<al2$<M$)LcH%#aA=D*#0k8A^b3IztYSRSbj*V3`ykoe7pn
zVaNxnDh8@n2lF!+N*Rj4tX!bD9?(1;xE)mt84S7%9$*tnptcDn{cVs7;r82I++4!b
z!0Wd?V0GV>Sxg4F^cCaKr{cf5FW4VdUl!0Nh@TEt<{PXrcxkZHV3NW88I=Z|20aFK
z29X9#2C+a^zQMuDNe0^kQVartqR|GEf#S&aX9N8RF=xhxDVr1+6ppXiS+i4t!E%?&
xaRmm6LkbKX$G04va!d~xDnHiF*nVWQ0)xv@ma7L&Dlm8*bpgsKfy1Dd0RZ`SSsefX

diff --git a/3rdparty/rapidjson/bin/encodings/utf16lebom.json b/3rdparty/rapidjson/bin/encodings/utf16lebom.json
deleted file mode 100644
index eaba00132cdfbc222ddce1333d0268821d68db0d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 370
zcmezWubP3Efs28YL5U%iArDAe0kJ280z)!GB9N~D6is9(0n+IVIY3r15GsIWQh;<O
zSSE!bAE>Grs9GJ&&tNEJC<3!`f#P~V^K{^LR54^Q=rVYKO(=odCYbcMK`w;bZ+CHX
z2~PvB-}ZpjeOG2N8Q{`aj6<J_|LVSAe^h;0K${?bI#`)+u*Tq}!A^ro2KQ%F8gv@;
z7}Oa=8Za5e0$KS62P-ETY!65=2n32o8%zd@Bio-1^drQa85^c-QeaRxzGi35P6Y<b
zT`tEJ7$goUFmxQ>a&*cuJz%K(SUY3;k<AJWE=O6e9yqDM;C0jmD5C@pgIWdv*il;=

diff --git a/3rdparty/rapidjson/bin/encodings/utf32be.json b/3rdparty/rapidjson/bin/encodings/utf32be.json
deleted file mode 100644
index 9cbb522279dabfe9bc5c686782219c54e54e242c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 736
zcmb7?J1<006opqr<5lQXaw8HAa$9Nz3PWf_6khQr@hHYC5)FwcP)z&<B!XmeX%J(g
zr&jw18i{Ysy^~B7WQs56>~;6rk2xc0Q&JsNLlrc^6f7n8&gAUj3}6Drz~2LKuH!Wb
zU>X*{+G;|O#P&>r<5?(rtSy6U+2gzxD1M*ez78uT+9G%7w}WSHh2MK@pxN67-QbyA
z+jZ?pb{nskcE6>eMyaoc5$;LZL#rjGW`9;XI+xDgq_86KmebEWmC-NN9QR8N{?l)c
zy56azcKQ(yzh!s<pAf;Zl=<LH!vP$^4h#ePgri^$U%^klcMf@%Z~&Y;0w?g-{`1V@
zcPyFbDkEK=q6JbOBIb&=;`puutt-AiHN<CrU&`G|FZTFt1L^Wh%2Ma%IgWF9-Ycco
Rha~RBgI4gkckzF){R2W(SsefX

diff --git a/3rdparty/rapidjson/bin/encodings/utf32bebom.json b/3rdparty/rapidjson/bin/encodings/utf32bebom.json
deleted file mode 100644
index bde6a99ab431dffb243b5857ca59a2b509520e12..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 740
zcmb7?IWI(E7==$nV=Htjxe<v5xh=H<g&{N|3R~<XmSSv?Xh=kXV&X3#5hRnLL5zu>
zTJ0ZbEYF#HCz&Y76i>eIJ@-BDGT%sF-;&m$1}dQf8ejqz;(L31c5wzU1|#6_0XWz3
z3Is3-b6{;bCWvEu#=-G46g<`z!L{shUK13)PjO#`r6O&fyYpMYGdIKUJ=W0dZGlek
zOs?&^_Qbo5)=Jx-(m=h`Q^g3kr0k$o6H~J{EghUnCofW17JEzS=bcLEmuQUoCHnvA
zH$z?TR8%{8kB8qfJcD=0z@e0S<4nRH?86oe0{eu+U=3g1Pri2!d6%#coI3<Z@Ynvc
z%;I+}n&%=VT^^$aQVufAmDz~mn>MtL=>AX_ow;2pdo4ZL<F^f@^A9OaovX(v&f<A3
Tm!9w9xEl{z-s9ed|H0-D{Qp}T

diff --git a/3rdparty/rapidjson/bin/encodings/utf32le.json b/3rdparty/rapidjson/bin/encodings/utf32le.json
deleted file mode 100644
index b00f290a64f15e81b260538a10db76c986fd6445..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 736
zcmb7?yDNop9EU&2;&KL?NpDgXWMw`B2A5b)GT_Laav6?W%0kJ2;myB*66$nVkV|%E
zv;V-NJfGh8tvAD|Gdz9oxA*sMO3FYj)Ic*#!BVVu$Fdh0z$A==;{iC=_8J5*4GUo3
zYD^H@uE~S#Sx9Q^TL$-Xjq_R|iO-;~!%E7xi0=Fj@Xl@U|BelOu5E`N@J{aSzOG4b
zYnYIJccrEgsjgqTXNf(M>hWc;i-Xenk@RsURdrTA&o@;vuVo;bH;gPdZ;rmcDc$?A
zz_(<_3;2c-9K%;A6_5vT2s@Ai_a6iMT<3b{`{q1y2%I|#Cs1ymd3NzTruPZ2q|@u@
z&4V}gDoI-qkk@r5W${^We2U~g_U#KbuhH8&_H!wPMd|q_%E=P1{*)fxBfAgVKG%45
J@*ixY{{az1SsefX

diff --git a/3rdparty/rapidjson/bin/encodings/utf32lebom.json b/3rdparty/rapidjson/bin/encodings/utf32lebom.json
deleted file mode 100644
index d3db39bf732c7055cb6053c23947c89d6859b2e9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 740
zcmb7?yDNop9EU&2;&KL?NpDgXWMw`B2A5bQ1CHD&m*KdjER@cG;myB*66$nVkV|%E
zv;V;2@_c&Vw@!vrXL$PFZ}0E@{gE~#rJx$Bpb;ivG1fa{*^LZf0>;4c0Gw-k6#|%o
zd9ZIKCWvj<WWe?eBsKOefqS{edCic-r_tA7xyZMG?)*0J&Mol&j&*#lZG|rIPVVi#
zu1RjI8<)O!q=q4>rdPUUiCvOv@ujfy{nBYpdOMLS+RLBko64Ej)ECVgM3$O2OJCnq
z-1|Puw`9jN_=Ex+!bd1&k^67}+b|67KMMA_&h^gs%^BnXIClh&pwvEd?BaJU-Y2|}
zjxVD(4_?@-AZ<cGUdN4;#%I0$A(DI8*H6?uM{n!c*SQqtrN^r%Cr!NaUAlXX>>h0U
MT;tivf3SuA2hZtS8UO$Q

diff --git a/3rdparty/rapidjson/bin/encodings/utf8.json b/3rdparty/rapidjson/bin/encodings/utf8.json
deleted file mode 100644
index c500c943f6b..00000000000
--- a/3rdparty/rapidjson/bin/encodings/utf8.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-	"en":"I can eat glass and it doesn't hurt me.",
-	"zh-Hant":"我能吞下玻璃而不傷身體。",
-	"zh-Hans":"我能吞下玻璃而不伤身体。",
-	"ja":"私はガラスを食べられます。それは私を傷つけません。",
-	"ko":"나는 유리를 먹을 수 있어요. 그래도 아프지 않아요"
-}
\ No newline at end of file
diff --git a/3rdparty/rapidjson/bin/encodings/utf8bom.json b/3rdparty/rapidjson/bin/encodings/utf8bom.json
deleted file mode 100644
index b9839fe2fa7..00000000000
--- a/3rdparty/rapidjson/bin/encodings/utf8bom.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-	"en":"I can eat glass and it doesn't hurt me.",
-	"zh-Hant":"我能吞下玻璃而不傷身體。",
-	"zh-Hans":"我能吞下玻璃而不伤身体。",
-	"ja":"私はガラスを食べられます。それは私を傷つけません。",
-	"ko":"나는 유리를 먹을 수 있어요. 그래도 아프지 않아요"
-}
\ No newline at end of file
diff --git a/3rdparty/rapidjson/bin/jsonchecker/fail1.json b/3rdparty/rapidjson/bin/jsonchecker/fail1.json
deleted file mode 100644
index 6216b865f10..00000000000
--- a/3rdparty/rapidjson/bin/jsonchecker/fail1.json
+++ /dev/null
@@ -1 +0,0 @@
-"A JSON payload should be an object or array, not a string."
\ No newline at end of file
diff --git a/3rdparty/rapidjson/bin/jsonchecker/fail10.json b/3rdparty/rapidjson/bin/jsonchecker/fail10.json
deleted file mode 100644
index 5d8c0047bd5..00000000000
--- a/3rdparty/rapidjson/bin/jsonchecker/fail10.json
+++ /dev/null
@@ -1 +0,0 @@
-{"Extra value after close": true} "misplaced quoted value"
\ No newline at end of file
diff --git a/3rdparty/rapidjson/bin/jsonchecker/fail11.json b/3rdparty/rapidjson/bin/jsonchecker/fail11.json
deleted file mode 100644
index 76eb95b4583..00000000000
--- a/3rdparty/rapidjson/bin/jsonchecker/fail11.json
+++ /dev/null
@@ -1 +0,0 @@
-{"Illegal expression": 1 + 2}
\ No newline at end of file
diff --git a/3rdparty/rapidjson/bin/jsonchecker/fail12.json b/3rdparty/rapidjson/bin/jsonchecker/fail12.json
deleted file mode 100644
index 77580a4522d..00000000000
--- a/3rdparty/rapidjson/bin/jsonchecker/fail12.json
+++ /dev/null
@@ -1 +0,0 @@
-{"Illegal invocation": alert()}
\ No newline at end of file
diff --git a/3rdparty/rapidjson/bin/jsonchecker/fail13.json b/3rdparty/rapidjson/bin/jsonchecker/fail13.json
deleted file mode 100644
index 379406b59bd..00000000000
--- a/3rdparty/rapidjson/bin/jsonchecker/fail13.json
+++ /dev/null
@@ -1 +0,0 @@
-{"Numbers cannot have leading zeroes": 013}
\ No newline at end of file
diff --git a/3rdparty/rapidjson/bin/jsonchecker/fail14.json b/3rdparty/rapidjson/bin/jsonchecker/fail14.json
deleted file mode 100644
index 0ed366b38a3..00000000000
--- a/3rdparty/rapidjson/bin/jsonchecker/fail14.json
+++ /dev/null
@@ -1 +0,0 @@
-{"Numbers cannot be hex": 0x14}
\ No newline at end of file
diff --git a/3rdparty/rapidjson/bin/jsonchecker/fail15.json b/3rdparty/rapidjson/bin/jsonchecker/fail15.json
deleted file mode 100644
index fc8376b605d..00000000000
--- a/3rdparty/rapidjson/bin/jsonchecker/fail15.json
+++ /dev/null
@@ -1 +0,0 @@
-["Illegal backslash escape: \x15"]
\ No newline at end of file
diff --git a/3rdparty/rapidjson/bin/jsonchecker/fail16.json b/3rdparty/rapidjson/bin/jsonchecker/fail16.json
deleted file mode 100644
index 3fe21d4b532..00000000000
--- a/3rdparty/rapidjson/bin/jsonchecker/fail16.json
+++ /dev/null
@@ -1 +0,0 @@
-[\naked]
\ No newline at end of file
diff --git a/3rdparty/rapidjson/bin/jsonchecker/fail17.json b/3rdparty/rapidjson/bin/jsonchecker/fail17.json
deleted file mode 100644
index 62b9214aeda..00000000000
--- a/3rdparty/rapidjson/bin/jsonchecker/fail17.json
+++ /dev/null
@@ -1 +0,0 @@
-["Illegal backslash escape: \017"]
\ No newline at end of file
diff --git a/3rdparty/rapidjson/bin/jsonchecker/fail18.json b/3rdparty/rapidjson/bin/jsonchecker/fail18.json
deleted file mode 100644
index edac92716f1..00000000000
--- a/3rdparty/rapidjson/bin/jsonchecker/fail18.json
+++ /dev/null
@@ -1 +0,0 @@
-[[[[[[[[[[[[[[[[[[[["Too deep"]]]]]]]]]]]]]]]]]]]]
\ No newline at end of file
diff --git a/3rdparty/rapidjson/bin/jsonchecker/fail19.json b/3rdparty/rapidjson/bin/jsonchecker/fail19.json
deleted file mode 100644
index 3b9c46fa9a2..00000000000
--- a/3rdparty/rapidjson/bin/jsonchecker/fail19.json
+++ /dev/null
@@ -1 +0,0 @@
-{"Missing colon" null}
\ No newline at end of file
diff --git a/3rdparty/rapidjson/bin/jsonchecker/fail2.json b/3rdparty/rapidjson/bin/jsonchecker/fail2.json
deleted file mode 100644
index 6b7c11e5a56..00000000000
--- a/3rdparty/rapidjson/bin/jsonchecker/fail2.json
+++ /dev/null
@@ -1 +0,0 @@
-["Unclosed array"
\ No newline at end of file
diff --git a/3rdparty/rapidjson/bin/jsonchecker/fail20.json b/3rdparty/rapidjson/bin/jsonchecker/fail20.json
deleted file mode 100644
index 27c1af3e72e..00000000000
--- a/3rdparty/rapidjson/bin/jsonchecker/fail20.json
+++ /dev/null
@@ -1 +0,0 @@
-{"Double colon":: null}
\ No newline at end of file
diff --git a/3rdparty/rapidjson/bin/jsonchecker/fail21.json b/3rdparty/rapidjson/bin/jsonchecker/fail21.json
deleted file mode 100644
index 62474573b21..00000000000
--- a/3rdparty/rapidjson/bin/jsonchecker/fail21.json
+++ /dev/null
@@ -1 +0,0 @@
-{"Comma instead of colon", null}
\ No newline at end of file
diff --git a/3rdparty/rapidjson/bin/jsonchecker/fail22.json b/3rdparty/rapidjson/bin/jsonchecker/fail22.json
deleted file mode 100644
index a7752581bcf..00000000000
--- a/3rdparty/rapidjson/bin/jsonchecker/fail22.json
+++ /dev/null
@@ -1 +0,0 @@
-["Colon instead of comma": false]
\ No newline at end of file
diff --git a/3rdparty/rapidjson/bin/jsonchecker/fail23.json b/3rdparty/rapidjson/bin/jsonchecker/fail23.json
deleted file mode 100644
index 494add1ca19..00000000000
--- a/3rdparty/rapidjson/bin/jsonchecker/fail23.json
+++ /dev/null
@@ -1 +0,0 @@
-["Bad value", truth]
\ No newline at end of file
diff --git a/3rdparty/rapidjson/bin/jsonchecker/fail24.json b/3rdparty/rapidjson/bin/jsonchecker/fail24.json
deleted file mode 100644
index caff239bfc3..00000000000
--- a/3rdparty/rapidjson/bin/jsonchecker/fail24.json
+++ /dev/null
@@ -1 +0,0 @@
-['single quote']
\ No newline at end of file
diff --git a/3rdparty/rapidjson/bin/jsonchecker/fail25.json b/3rdparty/rapidjson/bin/jsonchecker/fail25.json
deleted file mode 100644
index 8b7ad23e010..00000000000
--- a/3rdparty/rapidjson/bin/jsonchecker/fail25.json
+++ /dev/null
@@ -1 +0,0 @@
-["	tab	character	in	string	"]
\ No newline at end of file
diff --git a/3rdparty/rapidjson/bin/jsonchecker/fail26.json b/3rdparty/rapidjson/bin/jsonchecker/fail26.json
deleted file mode 100644
index 845d26a6a54..00000000000
--- a/3rdparty/rapidjson/bin/jsonchecker/fail26.json
+++ /dev/null
@@ -1 +0,0 @@
-["tab\   character\   in\  string\  "]
\ No newline at end of file
diff --git a/3rdparty/rapidjson/bin/jsonchecker/fail27.json b/3rdparty/rapidjson/bin/jsonchecker/fail27.json
deleted file mode 100644
index e2aeef5ca2a..00000000000
--- a/3rdparty/rapidjson/bin/jsonchecker/fail27.json
+++ /dev/null
@@ -1,2 +0,0 @@
-["line
-break"]
\ No newline at end of file
diff --git a/3rdparty/rapidjson/bin/jsonchecker/fail28.json b/3rdparty/rapidjson/bin/jsonchecker/fail28.json
deleted file mode 100644
index 3c8978fd8d3..00000000000
--- a/3rdparty/rapidjson/bin/jsonchecker/fail28.json
+++ /dev/null
@@ -1,2 +0,0 @@
-["line\
-break"]
\ No newline at end of file
diff --git a/3rdparty/rapidjson/bin/jsonchecker/fail29.json b/3rdparty/rapidjson/bin/jsonchecker/fail29.json
deleted file mode 100644
index 47ec421bb62..00000000000
--- a/3rdparty/rapidjson/bin/jsonchecker/fail29.json
+++ /dev/null
@@ -1 +0,0 @@
-[0e]
\ No newline at end of file
diff --git a/3rdparty/rapidjson/bin/jsonchecker/fail3.json b/3rdparty/rapidjson/bin/jsonchecker/fail3.json
deleted file mode 100644
index 168c81eb785..00000000000
--- a/3rdparty/rapidjson/bin/jsonchecker/fail3.json
+++ /dev/null
@@ -1 +0,0 @@
-{unquoted_key: "keys must be quoted"}
\ No newline at end of file
diff --git a/3rdparty/rapidjson/bin/jsonchecker/fail30.json b/3rdparty/rapidjson/bin/jsonchecker/fail30.json
deleted file mode 100644
index 8ab0bc4b8b2..00000000000
--- a/3rdparty/rapidjson/bin/jsonchecker/fail30.json
+++ /dev/null
@@ -1 +0,0 @@
-[0e+]
\ No newline at end of file
diff --git a/3rdparty/rapidjson/bin/jsonchecker/fail31.json b/3rdparty/rapidjson/bin/jsonchecker/fail31.json
deleted file mode 100644
index 1cce602b518..00000000000
--- a/3rdparty/rapidjson/bin/jsonchecker/fail31.json
+++ /dev/null
@@ -1 +0,0 @@
-[0e+-1]
\ No newline at end of file
diff --git a/3rdparty/rapidjson/bin/jsonchecker/fail32.json b/3rdparty/rapidjson/bin/jsonchecker/fail32.json
deleted file mode 100644
index 45cba7396ff..00000000000
--- a/3rdparty/rapidjson/bin/jsonchecker/fail32.json
+++ /dev/null
@@ -1 +0,0 @@
-{"Comma instead if closing brace": true,
\ No newline at end of file
diff --git a/3rdparty/rapidjson/bin/jsonchecker/fail33.json b/3rdparty/rapidjson/bin/jsonchecker/fail33.json
deleted file mode 100644
index ca5eb19dc97..00000000000
--- a/3rdparty/rapidjson/bin/jsonchecker/fail33.json
+++ /dev/null
@@ -1 +0,0 @@
-["mismatch"}
\ No newline at end of file
diff --git a/3rdparty/rapidjson/bin/jsonchecker/fail4.json b/3rdparty/rapidjson/bin/jsonchecker/fail4.json
deleted file mode 100644
index 9de168bf34e..00000000000
--- a/3rdparty/rapidjson/bin/jsonchecker/fail4.json
+++ /dev/null
@@ -1 +0,0 @@
-["extra comma",]
\ No newline at end of file
diff --git a/3rdparty/rapidjson/bin/jsonchecker/fail5.json b/3rdparty/rapidjson/bin/jsonchecker/fail5.json
deleted file mode 100644
index ddf3ce3d240..00000000000
--- a/3rdparty/rapidjson/bin/jsonchecker/fail5.json
+++ /dev/null
@@ -1 +0,0 @@
-["double extra comma",,]
\ No newline at end of file
diff --git a/3rdparty/rapidjson/bin/jsonchecker/fail6.json b/3rdparty/rapidjson/bin/jsonchecker/fail6.json
deleted file mode 100644
index ed91580e1b1..00000000000
--- a/3rdparty/rapidjson/bin/jsonchecker/fail6.json
+++ /dev/null
@@ -1 +0,0 @@
-[   , "<-- missing value"]
\ No newline at end of file
diff --git a/3rdparty/rapidjson/bin/jsonchecker/fail7.json b/3rdparty/rapidjson/bin/jsonchecker/fail7.json
deleted file mode 100644
index 8a96af3e4ee..00000000000
--- a/3rdparty/rapidjson/bin/jsonchecker/fail7.json
+++ /dev/null
@@ -1 +0,0 @@
-["Comma after the close"],
\ No newline at end of file
diff --git a/3rdparty/rapidjson/bin/jsonchecker/fail8.json b/3rdparty/rapidjson/bin/jsonchecker/fail8.json
deleted file mode 100644
index b28479c6ecb..00000000000
--- a/3rdparty/rapidjson/bin/jsonchecker/fail8.json
+++ /dev/null
@@ -1 +0,0 @@
-["Extra close"]]
\ No newline at end of file
diff --git a/3rdparty/rapidjson/bin/jsonchecker/fail9.json b/3rdparty/rapidjson/bin/jsonchecker/fail9.json
deleted file mode 100644
index 5815574f363..00000000000
--- a/3rdparty/rapidjson/bin/jsonchecker/fail9.json
+++ /dev/null
@@ -1 +0,0 @@
-{"Extra comma": true,}
\ No newline at end of file
diff --git a/3rdparty/rapidjson/bin/jsonchecker/pass1.json b/3rdparty/rapidjson/bin/jsonchecker/pass1.json
deleted file mode 100644
index 01305d4e487..00000000000
--- a/3rdparty/rapidjson/bin/jsonchecker/pass1.json
+++ /dev/null
@@ -1,58 +0,0 @@
-[
-    "JSON Test Pattern pass1",
-    {"object with 1 member":["array with 1 element"]},
-    {},
-    [],
-    -42,
-    true,
-    false,
-    null,
-    {
-        "integer": 1234567890,
-        "real": -9876.543210,
-        "e": 0.123456789e-12,
-        "E": 1.234567890E+34,
-        "":  23456789012E66,
-        "zero": 0,
-        "one": 1,
-        "space": " ",
-        "quote": "\"",
-        "backslash": "\\",
-        "controls": "\b\f\n\r\t",
-        "slash": "/ & \/",
-        "alpha": "abcdefghijklmnopqrstuvwyz",
-        "ALPHA": "ABCDEFGHIJKLMNOPQRSTUVWYZ",
-        "digit": "0123456789",
-        "0123456789": "digit",
-        "special": "`1~!@#$%^&*()_+-={':[,]}|;.</>?",
-        "hex": "\u0123\u4567\u89AB\uCDEF\uabcd\uef4A",
-        "true": true,
-        "false": false,
-        "null": null,
-        "array":[  ],
-        "object":{  },
-        "address": "50 St. James Street",
-        "url": "http://www.JSON.org/",
-        "comment": "// /* <!-- --",
-        "# -- --> */": " ",
-        " s p a c e d " :[1,2 , 3
-
-,
-
-4 , 5        ,          6           ,7        ],"compact":[1,2,3,4,5,6,7],
-        "jsontext": "{\"object with 1 member\":[\"array with 1 element\"]}",
-        "quotes": "&#34; \u0022 %22 0x22 034 &#x22;",
-        "\/\\\"\uCAFE\uBABE\uAB98\uFCDE\ubcda\uef4A\b\f\n\r\t`1~!@#$%^&*()_+-=[]{}|;:',./<>?"
-: "A key can be any string"
-    },
-    0.5 ,98.6
-,
-99.44
-,
-
-1066,
-1e1,
-0.1e1,
-1e-1,
-1e00,2e+00,2e-00
-,"rosebud"]
\ No newline at end of file
diff --git a/3rdparty/rapidjson/bin/jsonchecker/pass2.json b/3rdparty/rapidjson/bin/jsonchecker/pass2.json
deleted file mode 100644
index d3c63c7ad84..00000000000
--- a/3rdparty/rapidjson/bin/jsonchecker/pass2.json
+++ /dev/null
@@ -1 +0,0 @@
-[[[[[[[[[[[[[[[[[[["Not too deep"]]]]]]]]]]]]]]]]]]]
\ No newline at end of file
diff --git a/3rdparty/rapidjson/bin/jsonchecker/pass3.json b/3rdparty/rapidjson/bin/jsonchecker/pass3.json
deleted file mode 100644
index 27e6eb1d247..00000000000
--- a/3rdparty/rapidjson/bin/jsonchecker/pass3.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "JSON Test Pattern pass3": {
-        "The outermost value": "must be an object or array.",
-        "In this test": "It is an object."
-    }
-}
diff --git a/3rdparty/rapidjson/bin/jsonchecker/readme.txt b/3rdparty/rapidjson/bin/jsonchecker/readme.txt
deleted file mode 100644
index 321d89d998e..00000000000
--- a/3rdparty/rapidjson/bin/jsonchecker/readme.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-Test suite from http://json.org/JSON_checker/.
-
-If the JSON_checker is working correctly, it must accept all of the pass*.json files and reject all of the fail*.json files.
diff --git a/3rdparty/rapidjson/bin/jsonschema/.gitignore b/3rdparty/rapidjson/bin/jsonschema/.gitignore
deleted file mode 100644
index 1333ed77b7e..00000000000
--- a/3rdparty/rapidjson/bin/jsonschema/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-TODO
diff --git a/3rdparty/rapidjson/bin/jsonschema/.travis.yml b/3rdparty/rapidjson/bin/jsonschema/.travis.yml
deleted file mode 100644
index deecd61100e..00000000000
--- a/3rdparty/rapidjson/bin/jsonschema/.travis.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-language: python
-python: "2.7"
-install: pip install jsonschema
-script: bin/jsonschema_suite check
diff --git a/3rdparty/rapidjson/bin/jsonschema/LICENSE b/3rdparty/rapidjson/bin/jsonschema/LICENSE
deleted file mode 100644
index c28adbadd91..00000000000
--- a/3rdparty/rapidjson/bin/jsonschema/LICENSE
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (c) 2012 Julian Berman
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
diff --git a/3rdparty/rapidjson/bin/jsonschema/README.md b/3rdparty/rapidjson/bin/jsonschema/README.md
deleted file mode 100644
index 6d9da949323..00000000000
--- a/3rdparty/rapidjson/bin/jsonschema/README.md
+++ /dev/null
@@ -1,148 +0,0 @@
-JSON Schema Test Suite [![Build Status](https://travis-ci.org/json-schema/JSON-Schema-Test-Suite.png?branch=develop)](https://travis-ci.org/json-schema/JSON-Schema-Test-Suite)
-======================
-
-This repository contains a set of JSON objects that implementors of JSON Schema
-validation libraries can use to test their validators.
-
-It is meant to be language agnostic and should require only a JSON parser.
-
-The conversion of the JSON objects into tests within your test framework of
-choice is still the job of the validator implementor.
-
-Structure of a Test
--------------------
-
-If you're going to use this suite, you need to know how tests are laid out. The
-tests are contained in the `tests` directory at the root of this repository.
-
-Inside that directory is a subdirectory for each draft or version of the
-schema. We'll use `draft3` as an example.
-
-If you look inside the draft directory, there are a number of `.json` files,
-which logically group a set of test cases together. Often the grouping is by
-property under test, but not always, especially within optional test files
-(discussed below).
-
-Inside each `.json` file is a single array containing objects. It's easiest to
-illustrate the structure of these with an example:
-
-```json
-    {
-        "description": "the description of the test case",
-        "schema": {"the schema that should" : "be validated against"},
-        "tests": [
-            {
-                "description": "a specific test of a valid instance",
-                "data": "the instance",
-                "valid": true
-            },
-            {
-                "description": "another specific test this time, invalid",
-                "data": 15,
-                "valid": false
-            }
-        ]
-    }
-```
-
-So a description, a schema, and some tests, where tests is an array containing
-one or more objects with descriptions, data, and a boolean indicating whether
-they should be valid or invalid.
-
-Coverage
---------
-
-Draft 3 and 4 should have full coverage. If you see anything missing or think
-there is a useful test missing, please send a pull request or open an issue.
-
-Who Uses the Test Suite
------------------------
-
-This suite is being used by:
-
-### Coffeescript ###
-
-* [jsck](https://github.com/pandastrike/jsck)
-
-### Dart ###
-
-* [json_schema](https://github.com/patefacio/json_schema) 
-
-### Erlang ###
-
-* [jesse](https://github.com/klarna/jesse)
-
-### Go ###
-
-* [gojsonschema](https://github.com/sigu-399/gojsonschema) 
-* [validate-json](https://github.com/cesanta/validate-json)
-
-### Haskell ###
-
-* [aeson-schema](https://github.com/timjb/aeson-schema)
-* [hjsonschema](https://github.com/seagreen/hjsonschema)
-
-### Java ###
-
-* [json-schema-validator](https://github.com/fge/json-schema-validator)
-
-### JavaScript ###
-
-* [json-schema-benchmark](https://github.com/Muscula/json-schema-benchmark)
-* [direct-schema](https://github.com/IreneKnapp/direct-schema)
-* [is-my-json-valid](https://github.com/mafintosh/is-my-json-valid)
-* [jassi](https://github.com/iclanzan/jassi)
-* [JaySchema](https://github.com/natesilva/jayschema)
-* [json-schema-valid](https://github.com/ericgj/json-schema-valid)
-* [Jsonary](https://github.com/jsonary-js/jsonary)
-* [jsonschema](https://github.com/tdegrunt/jsonschema)
-* [request-validator](https://github.com/bugventure/request-validator)
-* [skeemas](https://github.com/Prestaul/skeemas)
-* [tv4](https://github.com/geraintluff/tv4)
-* [z-schema](https://github.com/zaggino/z-schema)
-* [jsen](https://github.com/bugventure/jsen)
-* [ajv](https://github.com/epoberezkin/ajv)
-
-### Node.js ###
-
-The JSON Schema Test Suite is also available as an
-[npm](https://www.npmjs.com/package/json-schema-test-suite) package.
-Node-specific support is maintained on the [node branch](https://github.com/json-schema/JSON-Schema-Test-Suite/tree/node).
-See [NODE-README.md](https://github.com/json-schema/JSON-Schema-Test-Suite/blob/node/NODE-README.md)
-for more information.
-
-### .NET ###
-
-* [Newtonsoft.Json.Schema](https://github.com/JamesNK/Newtonsoft.Json.Schema)
-
-### PHP ###
-
-* [json-schema](https://github.com/justinrainbow/json-schema)
-
-### Python ###
-
-* [jsonschema](https://github.com/Julian/jsonschema)
-
-### Ruby ###
-
-* [json-schema](https://github.com/hoxworth/json-schema)
-
-### Rust ###
-
-* [valico](https://github.com/rustless/valico)
-
-### Swift ###
-
-* [JSONSchema](https://github.com/kylef/JSONSchema.swift)
-
-If you use it as well, please fork and send a pull request adding yourself to
-the list :).
-
-Contributing
-------------
-
-If you see something missing or incorrect, a pull request is most welcome!
-
-There are some sanity checks in place for testing the test suite. You can run
-them with `bin/jsonschema_suite check` or `tox`. They will be run automatically by
-[Travis CI](https://travis-ci.org/) as well.
diff --git a/3rdparty/rapidjson/bin/jsonschema/bin/jsonschema_suite b/3rdparty/rapidjson/bin/jsonschema/bin/jsonschema_suite
deleted file mode 100644
index 96108c86ba2..00000000000
--- a/3rdparty/rapidjson/bin/jsonschema/bin/jsonschema_suite
+++ /dev/null
@@ -1,283 +0,0 @@
-#! /usr/bin/env python
-from __future__ import print_function
-import sys
-import textwrap
-
-try:
-    import argparse
-except ImportError:
-    print(textwrap.dedent("""
-        The argparse library could not be imported. jsonschema_suite requires
-        either Python 2.7 or for you to install argparse. You can do so by
-        running `pip install argparse`, `easy_install argparse` or by
-        downloading argparse and running `python2.6 setup.py install`.
-
-        See https://pypi.python.org/pypi/argparse for details.
-    """.strip("\n")))
-    sys.exit(1)
-
-import errno
-import fnmatch
-import json
-import os
-import random
-import shutil
-import unittest
-import warnings
-
-if getattr(unittest, "skipIf", None) is None:
-    unittest.skipIf = lambda cond, msg : lambda fn : fn
-
-try:
-    import jsonschema
-except ImportError:
-    jsonschema = None
-else:
-    validators = getattr(
-        jsonschema.validators, "validators", jsonschema.validators
-    )
-
-
-ROOT_DIR = os.path.join(
-    os.path.dirname(__file__), os.pardir).rstrip("__pycache__")
-SUITE_ROOT_DIR = os.path.join(ROOT_DIR, "tests")
-
-REMOTES = {
-    "integer.json": {"type": "integer"},
-    "subSchemas.json": {
-        "integer": {"type": "integer"},
-        "refToInteger": {"$ref": "#/integer"},
-    },
-    "folder/folderInteger.json": {"type": "integer"}
-}
-REMOTES_DIR = os.path.join(ROOT_DIR, "remotes")
-
-TESTSUITE_SCHEMA = {
-    "$schema": "http://json-schema.org/draft-03/schema#",
-    "type": "array",
-    "items": {
-        "type": "object",
-        "properties": {
-            "description": {"type": "string", "required": True},
-            "schema": {"required": True},
-            "tests": {
-                "type": "array",
-                "items": {
-                    "type": "object",
-                    "properties": {
-                        "description": {"type": "string", "required": True},
-                        "data": {"required": True},
-                        "valid": {"type": "boolean", "required": True}
-                    },
-                    "additionalProperties": False
-                },
-                "minItems": 1
-            }
-        },
-        "additionalProperties": False,
-        "minItems": 1
-    }
-}
-
-
-def files(paths):
-    for path in paths:
-        with open(path) as test_file:
-            yield json.load(test_file)
-
-
-def groups(paths):
-    for test_file in files(paths):
-        for group in test_file:
-            yield group
-
-
-def cases(paths):
-    for test_group in groups(paths):
-        for test in test_group["tests"]:
-            test["schema"] = test_group["schema"]
-            yield test
-
-
-def collect(root_dir):
-    for root, dirs, files in os.walk(root_dir):
-        for filename in fnmatch.filter(files, "*.json"):
-            yield os.path.join(root, filename)
-
-
-class SanityTests(unittest.TestCase):
-    @classmethod
-    def setUpClass(cls):
-        print("Looking for tests in %s" % SUITE_ROOT_DIR)
-        cls.test_files = list(collect(SUITE_ROOT_DIR))
-        print("Found %s test files" % len(cls.test_files))
-        assert cls.test_files, "Didn't find the test files!"
-
-    def test_all_files_are_valid_json(self):
-        for path in self.test_files:
-            with open(path) as test_file:
-                try:
-                    json.load(test_file)
-                except ValueError as error:
-                    self.fail("%s contains invalid JSON (%s)" % (path, error))
-
-    def test_all_descriptions_have_reasonable_length(self):
-        for case in cases(self.test_files):
-            descript = case["description"]
-            self.assertLess(
-                len(descript),
-                60,
-                "%r is too long! (keep it to less than 60 chars)" % (descript,)
-            )
-
-    def test_all_descriptions_are_unique(self):
-        for group in groups(self.test_files):
-            descriptions = set(test["description"] for test in group["tests"])
-            self.assertEqual(
-                len(descriptions),
-                len(group["tests"]),
-                "%r contains a duplicate description" % (group,)
-            )
-
-    @unittest.skipIf(jsonschema is None, "Validation library not present!")
-    def test_all_schemas_are_valid(self):
-        for schema in os.listdir(SUITE_ROOT_DIR):
-            schema_validator = validators.get(schema)
-            if schema_validator is not None:
-                test_files = collect(os.path.join(SUITE_ROOT_DIR, schema))
-                for case in cases(test_files):
-                    try:
-                        schema_validator.check_schema(case["schema"])
-                    except jsonschema.SchemaError as error:
-                        self.fail("%s contains an invalid schema (%s)" %
-                                  (case, error))
-            else:
-                warnings.warn("No schema validator for %s" % schema)
-
-    @unittest.skipIf(jsonschema is None, "Validation library not present!")
-    def test_suites_are_valid(self):
-        validator = jsonschema.Draft3Validator(TESTSUITE_SCHEMA)
-        for tests in files(self.test_files):
-            try:
-                validator.validate(tests)
-            except jsonschema.ValidationError as error:
-                self.fail(str(error))
-
-    def test_remote_schemas_are_updated(self):
-        for url, schema in REMOTES.items():
-            filepath = os.path.join(REMOTES_DIR, url)
-            with open(filepath) as schema_file:
-                self.assertEqual(json.load(schema_file), schema)
-
-
-def main(arguments):
-    if arguments.command == "check":
-        suite = unittest.TestLoader().loadTestsFromTestCase(SanityTests)
-        result = unittest.TextTestRunner(verbosity=2).run(suite)
-        sys.exit(not result.wasSuccessful())
-    elif arguments.command == "flatten":
-        selected_cases = [case for case in cases(collect(arguments.version))]
-
-        if arguments.randomize:
-            random.shuffle(selected_cases)
-
-        json.dump(selected_cases, sys.stdout, indent=4, sort_keys=True)
-    elif arguments.command == "remotes":
-        json.dump(REMOTES, sys.stdout, indent=4, sort_keys=True)
-    elif arguments.command == "dump_remotes":
-        if arguments.update:
-            shutil.rmtree(arguments.out_dir, ignore_errors=True)
-
-        try:
-            os.makedirs(arguments.out_dir)
-        except OSError as e:
-            if e.errno == errno.EEXIST:
-                print("%s already exists. Aborting." % arguments.out_dir)
-                sys.exit(1)
-            raise
-
-        for url, schema in REMOTES.items():
-            filepath = os.path.join(arguments.out_dir, url)
-
-            try:
-                os.makedirs(os.path.dirname(filepath))
-            except OSError as e:
-                if e.errno != errno.EEXIST:
-                    raise
-
-            with open(filepath, "wb") as out_file:
-                json.dump(schema, out_file, indent=4, sort_keys=True)
-    elif arguments.command == "serve":
-        try:
-            from flask import Flask, jsonify
-        except ImportError:
-            print(textwrap.dedent("""
-                The Flask library is required to serve the remote schemas.
-
-                You can install it by running `pip install Flask`.
-
-                Alternatively, see the `jsonschema_suite remotes` or
-                `jsonschema_suite dump_remotes` commands to create static files
-                that can be served with your own web server.
-            """.strip("\n")))
-            sys.exit(1)
-
-        app = Flask(__name__)
-
-        @app.route("/<path:path>")
-        def serve_path(path):
-            if path in REMOTES:
-                return jsonify(REMOTES[path])
-            return "Document does not exist.", 404
-
-        app.run(port=1234)
-
-
-parser = argparse.ArgumentParser(
-    description="JSON Schema Test Suite utilities",
-)
-subparsers = parser.add_subparsers(help="utility commands", dest="command")
-
-check = subparsers.add_parser("check", help="Sanity check the test suite.")
-
-flatten = subparsers.add_parser(
-    "flatten",
-    help="Output a flattened file containing a selected version's test cases."
-)
-flatten.add_argument(
-    "--randomize",
-    action="store_true",
-    help="Randomize the order of the outputted cases.",
-)
-flatten.add_argument(
-    "version", help="The directory containing the version to output",
-)
-
-remotes = subparsers.add_parser(
-    "remotes",
-    help="Output the expected URLs and their associated schemas for remote "
-         "ref tests as a JSON object."
-)
-
-dump_remotes = subparsers.add_parser(
-    "dump_remotes", help="Dump the remote ref schemas into a file tree",
-)
-dump_remotes.add_argument(
-    "--update",
-    action="store_true",
-    help="Update the remotes in an existing directory.",
-)
-dump_remotes.add_argument(
-    "--out-dir",
-    default=REMOTES_DIR,
-    type=os.path.abspath,
-    help="The output directory to create as the root of the file tree",
-)
-
-serve = subparsers.add_parser(
-    "serve",
-    help="Start a webserver to serve schemas used by remote ref tests."
-)
-
-if __name__ == "__main__":
-    main(parser.parse_args())
diff --git a/3rdparty/rapidjson/bin/jsonschema/remotes/.DS_Store b/3rdparty/rapidjson/bin/jsonschema/remotes/.DS_Store
deleted file mode 100644
index 1d098a4103d67f2b3b336934f3d7f42b462861a1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6148
zcmeHKOHRWu5S@X7Ds|H(?0kjZAgaO%dI3btXOYNNp?e>&D;7NuZ$2PWB6c8zW+eOB
z^Ks%A#p59&UhngYXh}qKG(ncZgot|5bmq<%K-M+xX_ue7{;rgMVxhmNl6SwP2P)K4
zrjz#{8T!Z7rYpnNcX53hIFz={`<IUB^>93>*C>7{`CI$;>GS&XK|+FoU?3O>27-Z~
zU;sH=WWF$rJ{SlFf`JbP<a|hIf{kM})T0BPmH@yR)G8S3)fJdT0c;$rAv6%SP@sjf
zml$l}&?on69IK&)6MON&{^a-Kh5h2pN!^JX!{~#7U|`I^xlNan|8MY1P8Rv&keCGn
z!N5ObfM@NdU1L+8Tfb~ia&1DpMH3OfDgy|{nu>v%iZPLM<VuZZPcnwRajb^2is&^Q
P7#9I0B)VYW7Z`X0=PNN`

diff --git a/3rdparty/rapidjson/bin/jsonschema/remotes/folder/folderInteger.json b/3rdparty/rapidjson/bin/jsonschema/remotes/folder/folderInteger.json
deleted file mode 100644
index dbe5c758ee3..00000000000
--- a/3rdparty/rapidjson/bin/jsonschema/remotes/folder/folderInteger.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "type": "integer"
-}
\ No newline at end of file
diff --git a/3rdparty/rapidjson/bin/jsonschema/remotes/integer.json b/3rdparty/rapidjson/bin/jsonschema/remotes/integer.json
deleted file mode 100644
index dbe5c758ee3..00000000000
--- a/3rdparty/rapidjson/bin/jsonschema/remotes/integer.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "type": "integer"
-}
\ No newline at end of file
diff --git a/3rdparty/rapidjson/bin/jsonschema/remotes/subSchemas.json b/3rdparty/rapidjson/bin/jsonschema/remotes/subSchemas.json
deleted file mode 100644
index 8b6d8f842fc..00000000000
--- a/3rdparty/rapidjson/bin/jsonschema/remotes/subSchemas.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "integer": {
-        "type": "integer"
-    }, 
-    "refToInteger": {
-        "$ref": "#/integer"
-    }
-}
\ No newline at end of file
diff --git a/3rdparty/rapidjson/bin/jsonschema/tests/.DS_Store b/3rdparty/rapidjson/bin/jsonschema/tests/.DS_Store
deleted file mode 100644
index dae9b18efac169b4f44a57c7926495a005607a85..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6148
zcmeHKJ8r`;3?&nz2$02NM_r*n4j=^133`F1H98qEkT$!goU2Fc<7bHBbW4X8j{x-~
zicf;xV45PL`*Z&!(u&9iZYUQUmS+3r3tMGGfpDDhDZBpTZFn8WVUc}1VB81k<s?UW
zzvkNpjS5f!DnJFO02R2q0$E}=+q<941E~NN`0EPT_o2WIYvL5>pAHP(0stF?-7xoF
z0$3~ntcg<~A}|dqFsPa>h6Ww+l6f_83JkhvHXoWdYj!B=x8wZc>7q4|BNd<ma|PD1
zY_0wu;6L>La}rlnfC~I81+?j&yFH$iwRQ10tF;CG0=JwmxEbb7!QkZ>=;as-E60zX
b6nVww*sqCGpwkg|I*>mDrVEV<{I&w$e{~fm

diff --git a/3rdparty/rapidjson/bin/jsonschema/tests/draft3/additionalItems.json b/3rdparty/rapidjson/bin/jsonschema/tests/draft3/additionalItems.json
deleted file mode 100644
index 6d4bff51cf3..00000000000
--- a/3rdparty/rapidjson/bin/jsonschema/tests/draft3/additionalItems.json
+++ /dev/null
@@ -1,82 +0,0 @@
-[
-    {
-        "description": "additionalItems as schema",
-        "schema": {
-            "items": [],
-            "additionalItems": {"type": "integer"}
-        },
-        "tests": [
-            {
-                "description": "additional items match schema",
-                "data": [ 1, 2, 3, 4 ],
-                "valid": true
-            },
-            {
-                "description": "additional items do not match schema",
-                "data": [ 1, 2, 3, "foo" ],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "items is schema, no additionalItems",
-        "schema": {
-            "items": {},
-            "additionalItems": false
-        },
-        "tests": [
-            {
-                "description": "all items match schema",
-                "data": [ 1, 2, 3, 4, 5 ],
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "array of items with no additionalItems",
-        "schema": {
-            "items": [{}, {}, {}],
-            "additionalItems": false
-        },
-        "tests": [
-            {
-                "description": "no additional items present",
-                "data": [ 1, 2, 3 ],
-                "valid": true
-            },
-            {
-                "description": "additional items are not permitted",
-                "data": [ 1, 2, 3, 4 ],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "additionalItems as false without items",
-        "schema": {"additionalItems": false},
-        "tests": [
-            {
-                "description":
-                    "items defaults to empty schema so everything is valid",
-                "data": [ 1, 2, 3, 4, 5 ],
-                "valid": true
-            },
-            {
-                "description": "ignores non-arrays",
-                "data": {"foo" : "bar"},
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "additionalItems are allowed by default",
-        "schema": {"items": []},
-        "tests": [
-            {
-                "description": "only the first items are validated",
-                "data": [1, "foo", false],
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/3rdparty/rapidjson/bin/jsonschema/tests/draft3/additionalProperties.json b/3rdparty/rapidjson/bin/jsonschema/tests/draft3/additionalProperties.json
deleted file mode 100644
index 40831f9e9aa..00000000000
--- a/3rdparty/rapidjson/bin/jsonschema/tests/draft3/additionalProperties.json
+++ /dev/null
@@ -1,88 +0,0 @@
-[
-    {
-        "description":
-            "additionalProperties being false does not allow other properties",
-        "schema": {
-            "properties": {"foo": {}, "bar": {}},
-            "patternProperties": { "^v": {} },
-            "additionalProperties": false
-        },
-        "tests": [
-            {
-                "description": "no additional properties is valid",
-                "data": {"foo": 1},
-                "valid": true
-            },
-            {
-                "description": "an additional property is invalid",
-                "data": {"foo" : 1, "bar" : 2, "quux" : "boom"},
-                "valid": false
-            },
-            {
-                "description": "ignores non-objects",
-                "data": [1, 2, 3],
-                "valid": true
-            },
-            {
-                "description": "patternProperties are not additional properties",
-                "data": {"foo":1, "vroom": 2},
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description":
-            "additionalProperties allows a schema which should validate",
-        "schema": {
-            "properties": {"foo": {}, "bar": {}},
-            "additionalProperties": {"type": "boolean"}
-        },
-        "tests": [
-            {
-                "description": "no additional properties is valid",
-                "data": {"foo": 1},
-                "valid": true
-            },
-            {
-                "description": "an additional valid property is valid",
-                "data": {"foo" : 1, "bar" : 2, "quux" : true},
-                "valid": true
-            },
-            {
-                "description": "an additional invalid property is invalid",
-                "data": {"foo" : 1, "bar" : 2, "quux" : 12},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description":
-            "additionalProperties can exist by itself",
-        "schema": {
-            "additionalProperties": {"type": "boolean"}
-        },
-        "tests": [
-            {
-                "description": "an additional valid property is valid",
-                "data": {"foo" : true},
-                "valid": true
-            },
-            {
-                "description": "an additional invalid property is invalid",
-                "data": {"foo" : 1},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "additionalProperties are allowed by default",
-        "schema": {"properties": {"foo": {}, "bar": {}}},
-        "tests": [
-            {
-                "description": "additional properties are allowed",
-                "data": {"foo": 1, "bar": 2, "quux": true},
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/3rdparty/rapidjson/bin/jsonschema/tests/draft3/default.json b/3rdparty/rapidjson/bin/jsonschema/tests/draft3/default.json
deleted file mode 100644
index 17629779fbe..00000000000
--- a/3rdparty/rapidjson/bin/jsonschema/tests/draft3/default.json
+++ /dev/null
@@ -1,49 +0,0 @@
-[
-    {
-        "description": "invalid type for default",
-        "schema": {
-            "properties": {
-                "foo": {
-                    "type": "integer",
-                    "default": []
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "valid when property is specified",
-                "data": {"foo": 13},
-                "valid": true
-            },
-            {
-                "description": "still valid when the invalid default is used",
-                "data": {},
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "invalid string value for default",
-        "schema": {
-            "properties": {
-                "bar": {
-                    "type": "string",
-                    "minLength": 4,
-                    "default": "bad"
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "valid when property is specified",
-                "data": {"bar": "good"},
-                "valid": true
-            },
-            {
-                "description": "still valid when the invalid default is used",
-                "data": {},
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/3rdparty/rapidjson/bin/jsonschema/tests/draft3/dependencies.json b/3rdparty/rapidjson/bin/jsonschema/tests/draft3/dependencies.json
deleted file mode 100644
index 2f6ae489aed..00000000000
--- a/3rdparty/rapidjson/bin/jsonschema/tests/draft3/dependencies.json
+++ /dev/null
@@ -1,108 +0,0 @@
-[
-    {
-        "description": "dependencies",
-        "schema": {
-            "dependencies": {"bar": "foo"}
-        },
-        "tests": [
-            {
-                "description": "neither",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "nondependant",
-                "data": {"foo": 1},
-                "valid": true
-            },
-            {
-                "description": "with dependency",
-                "data": {"foo": 1, "bar": 2},
-                "valid": true
-            },
-            {
-                "description": "missing dependency",
-                "data": {"bar": 2},
-                "valid": false
-            },
-            {
-                "description": "ignores non-objects",
-                "data": "foo",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "multiple dependencies",
-        "schema": {
-            "dependencies": {"quux": ["foo", "bar"]}
-        },
-        "tests": [
-            {
-                "description": "neither",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "nondependants",
-                "data": {"foo": 1, "bar": 2},
-                "valid": true
-            },
-            {
-                "description": "with dependencies",
-                "data": {"foo": 1, "bar": 2, "quux": 3},
-                "valid": true
-            },
-            {
-                "description": "missing dependency",
-                "data": {"foo": 1, "quux": 2},
-                "valid": false
-            },
-            {
-                "description": "missing other dependency",
-                "data": {"bar": 1, "quux": 2},
-                "valid": false
-            },
-            {
-                "description": "missing both dependencies",
-                "data": {"quux": 1},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "multiple dependencies subschema",
-        "schema": {
-            "dependencies": {
-                "bar": {
-                    "properties": {
-                        "foo": {"type": "integer"},
-                        "bar": {"type": "integer"}
-                    }
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "valid",
-                "data": {"foo": 1, "bar": 2},
-                "valid": true
-            },
-            {
-                "description": "wrong type",
-                "data": {"foo": "quux", "bar": 2},
-                "valid": false
-            },
-            {
-                "description": "wrong type other",
-                "data": {"foo": 2, "bar": "quux"},
-                "valid": false
-            },
-            {
-                "description": "wrong type both",
-                "data": {"foo": "quux", "bar": "quux"},
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/3rdparty/rapidjson/bin/jsonschema/tests/draft3/disallow.json b/3rdparty/rapidjson/bin/jsonschema/tests/draft3/disallow.json
deleted file mode 100644
index a5c9d90ccee..00000000000
--- a/3rdparty/rapidjson/bin/jsonschema/tests/draft3/disallow.json
+++ /dev/null
@@ -1,80 +0,0 @@
-[
-    {
-        "description": "disallow",
-        "schema": {
-            "disallow": "integer"
-        },
-        "tests": [
-            {
-                "description": "allowed",
-                "data": "foo",
-                "valid": true
-            },
-            {
-                "description": "disallowed",
-                "data": 1,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "multiple disallow",
-        "schema": {
-            "disallow": ["integer", "boolean"]
-        },
-        "tests": [
-            {
-                "description": "valid",
-                "data": "foo",
-                "valid": true
-            },
-            {
-                "description": "mismatch",
-                "data": 1,
-                "valid": false
-            },
-            {
-                "description": "other mismatch",
-                "data": true,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "multiple disallow subschema",
-        "schema": {
-            "disallow":
-                ["string",
-                 {
-                    "type": "object",
-                    "properties": {
-                        "foo": {
-                            "type": "string"
-                        }
-                    }
-                 }]
-        },
-        "tests": [
-            {
-                "description": "match",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "other match",
-                "data": {"foo": 1},
-                "valid": true
-            },
-            {
-                "description": "mismatch",
-                "data": "foo",
-                "valid": false
-            },
-            {
-                "description": "other mismatch",
-                "data": {"foo": "bar"},
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/3rdparty/rapidjson/bin/jsonschema/tests/draft3/divisibleBy.json b/3rdparty/rapidjson/bin/jsonschema/tests/draft3/divisibleBy.json
deleted file mode 100644
index ef7cc148902..00000000000
--- a/3rdparty/rapidjson/bin/jsonschema/tests/draft3/divisibleBy.json
+++ /dev/null
@@ -1,60 +0,0 @@
-[
-    {
-        "description": "by int",
-        "schema": {"divisibleBy": 2},
-        "tests": [
-            {
-                "description": "int by int",
-                "data": 10,
-                "valid": true
-            },
-            {
-                "description": "int by int fail",
-                "data": 7,
-                "valid": false
-            },
-            {
-                "description": "ignores non-numbers",
-                "data": "foo",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "by number",
-        "schema": {"divisibleBy": 1.5},
-        "tests": [
-            {
-                "description": "zero is divisible by anything (except 0)",
-                "data": 0,
-                "valid": true
-            },
-            {
-                "description": "4.5 is divisible by 1.5",
-                "data": 4.5,
-                "valid": true
-            },
-            {
-                "description": "35 is not divisible by 1.5",
-                "data": 35,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "by small number",
-        "schema": {"divisibleBy": 0.0001},
-        "tests": [
-            {
-                "description": "0.0075 is divisible by 0.0001",
-                "data": 0.0075,
-                "valid": true
-            },
-            {
-                "description": "0.00751 is not divisible by 0.0001",
-                "data": 0.00751,
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/3rdparty/rapidjson/bin/jsonschema/tests/draft3/enum.json b/3rdparty/rapidjson/bin/jsonschema/tests/draft3/enum.json
deleted file mode 100644
index 0c83f0804d0..00000000000
--- a/3rdparty/rapidjson/bin/jsonschema/tests/draft3/enum.json
+++ /dev/null
@@ -1,71 +0,0 @@
-[
-    {
-        "description": "simple enum validation",
-        "schema": {"enum": [1, 2, 3]},
-        "tests": [
-            {
-                "description": "one of the enum is valid",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "something else is invalid",
-                "data": 4,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "heterogeneous enum validation",
-        "schema": {"enum": [6, "foo", [], true, {"foo": 12}]},
-        "tests": [
-            {
-                "description": "one of the enum is valid",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "something else is invalid",
-                "data": null,
-                "valid": false
-            },
-            {
-                "description": "objects are deep compared",
-                "data": {"foo": false},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "enums in properties",
-        "schema": {
-           "type":"object",
-		     "properties": {
-		        "foo": {"enum":["foo"]},
-		        "bar": {"enum":["bar"], "required":true}
-		     }
-		  },
-        "tests": [
-            {
-                "description": "both properties are valid",
-                "data": {"foo":"foo", "bar":"bar"},
-                "valid": true
-            },
-            {
-                "description": "missing optional property is valid",
-                "data": {"bar":"bar"},
-                "valid": true
-            },
-            {
-                "description": "missing required property is invalid",
-                "data": {"foo":"foo"},
-                "valid": false
-            },
-            {
-                "description": "missing all properties is invalid",
-                "data": {},
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/3rdparty/rapidjson/bin/jsonschema/tests/draft3/extends.json b/3rdparty/rapidjson/bin/jsonschema/tests/draft3/extends.json
deleted file mode 100644
index 909bce575ae..00000000000
--- a/3rdparty/rapidjson/bin/jsonschema/tests/draft3/extends.json
+++ /dev/null
@@ -1,94 +0,0 @@
-[
-    {
-        "description": "extends",
-        "schema": {
-            "properties": {"bar": {"type": "integer", "required": true}},
-            "extends": {
-                "properties": {
-                    "foo": {"type": "string", "required": true}
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "extends",
-                "data": {"foo": "baz", "bar": 2},
-                "valid": true
-            },
-            {
-                "description": "mismatch extends",
-                "data": {"foo": "baz"},
-                "valid": false
-            },
-            {
-                "description": "mismatch extended",
-                "data": {"bar": 2},
-                "valid": false
-            },
-            {
-                "description": "wrong type",
-                "data": {"foo": "baz", "bar": "quux"},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "multiple extends",
-        "schema": {
-            "properties": {"bar": {"type": "integer", "required": true}},
-            "extends" : [
-                {
-                    "properties": {
-                        "foo": {"type": "string", "required": true}
-                    }
-                },
-                {
-                    "properties": {
-                        "baz": {"type": "null", "required": true}
-                    }
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "valid",
-                "data": {"foo": "quux", "bar": 2, "baz": null},
-                "valid": true
-            },
-            {
-                "description": "mismatch first extends",
-                "data": {"bar": 2, "baz": null},
-                "valid": false
-            },
-            {
-                "description": "mismatch second extends",
-                "data": {"foo": "quux", "bar": 2},
-                "valid": false
-            },
-            {
-                "description": "mismatch both",
-                "data": {"bar": 2},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "extends simple types",
-        "schema": {
-            "minimum": 20,
-            "extends": {"maximum": 30}
-        },
-        "tests": [
-            {
-                "description": "valid",
-                "data": 25,
-                "valid": true
-            },
-            {
-                "description": "mismatch extends",
-                "data": 35,
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/3rdparty/rapidjson/bin/jsonschema/tests/draft3/items.json b/3rdparty/rapidjson/bin/jsonschema/tests/draft3/items.json
deleted file mode 100644
index f5e18a13848..00000000000
--- a/3rdparty/rapidjson/bin/jsonschema/tests/draft3/items.json
+++ /dev/null
@@ -1,46 +0,0 @@
-[
-    {
-        "description": "a schema given for items",
-        "schema": {
-            "items": {"type": "integer"}
-        },
-        "tests": [
-            {
-                "description": "valid items",
-                "data": [ 1, 2, 3 ],
-                "valid": true
-            },
-            {
-                "description": "wrong type of items",
-                "data": [1, "x"],
-                "valid": false
-            },
-            {
-                "description": "ignores non-arrays",
-                "data": {"foo" : "bar"},
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "an array of schemas for items",
-        "schema": {
-            "items": [
-                {"type": "integer"},
-                {"type": "string"}
-            ]
-        },
-        "tests": [
-            {
-                "description": "correct types",
-                "data": [ 1, "foo" ],
-                "valid": true
-            },
-            {
-                "description": "wrong types",
-                "data": [ "foo", 1 ],
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/3rdparty/rapidjson/bin/jsonschema/tests/draft3/maxItems.json b/3rdparty/rapidjson/bin/jsonschema/tests/draft3/maxItems.json
deleted file mode 100644
index 3b53a6b371a..00000000000
--- a/3rdparty/rapidjson/bin/jsonschema/tests/draft3/maxItems.json
+++ /dev/null
@@ -1,28 +0,0 @@
-[
-    {
-        "description": "maxItems validation",
-        "schema": {"maxItems": 2},
-        "tests": [
-            {
-                "description": "shorter is valid",
-                "data": [1],
-                "valid": true
-            },
-            {
-                "description": "exact length is valid",
-                "data": [1, 2],
-                "valid": true
-            },
-            {
-                "description": "too long is invalid",
-                "data": [1, 2, 3],
-                "valid": false
-            },
-            {
-                "description": "ignores non-arrays",
-                "data": "foobar",
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/3rdparty/rapidjson/bin/jsonschema/tests/draft3/maxLength.json b/3rdparty/rapidjson/bin/jsonschema/tests/draft3/maxLength.json
deleted file mode 100644
index 4de42bcaba0..00000000000
--- a/3rdparty/rapidjson/bin/jsonschema/tests/draft3/maxLength.json
+++ /dev/null
@@ -1,33 +0,0 @@
-[
-    {
-        "description": "maxLength validation",
-        "schema": {"maxLength": 2},
-        "tests": [
-            {
-                "description": "shorter is valid",
-                "data": "f",
-                "valid": true
-            },
-            {
-                "description": "exact length is valid",
-                "data": "fo",
-                "valid": true
-            },
-            {
-                "description": "too long is invalid",
-                "data": "foo",
-                "valid": false
-            },
-            {
-                "description": "ignores non-strings",
-                "data": 10,
-                "valid": true
-            },
-            {
-                "description": "two supplementary Unicode code points is long enough",
-                "data": "\uD83D\uDCA9\uD83D\uDCA9",
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/3rdparty/rapidjson/bin/jsonschema/tests/draft3/maximum.json b/3rdparty/rapidjson/bin/jsonschema/tests/draft3/maximum.json
deleted file mode 100644
index 86c7b89c9a9..00000000000
--- a/3rdparty/rapidjson/bin/jsonschema/tests/draft3/maximum.json
+++ /dev/null
@@ -1,42 +0,0 @@
-[
-    {
-        "description": "maximum validation",
-        "schema": {"maximum": 3.0},
-        "tests": [
-            {
-                "description": "below the maximum is valid",
-                "data": 2.6,
-                "valid": true
-            },
-            {
-                "description": "above the maximum is invalid",
-                "data": 3.5,
-                "valid": false
-            },
-            {
-                "description": "ignores non-numbers",
-                "data": "x",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "exclusiveMaximum validation",
-        "schema": {
-            "maximum": 3.0,
-            "exclusiveMaximum": true
-        },
-        "tests": [
-            {
-                "description": "below the maximum is still valid",
-                "data": 2.2,
-                "valid": true
-            },
-            {
-                "description": "boundary point is invalid",
-                "data": 3.0,
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/3rdparty/rapidjson/bin/jsonschema/tests/draft3/minItems.json b/3rdparty/rapidjson/bin/jsonschema/tests/draft3/minItems.json
deleted file mode 100644
index ed5118815ee..00000000000
--- a/3rdparty/rapidjson/bin/jsonschema/tests/draft3/minItems.json
+++ /dev/null
@@ -1,28 +0,0 @@
-[
-    {
-        "description": "minItems validation",
-        "schema": {"minItems": 1},
-        "tests": [
-            {
-                "description": "longer is valid",
-                "data": [1, 2],
-                "valid": true
-            },
-            {
-                "description": "exact length is valid",
-                "data": [1],
-                "valid": true
-            },
-            {
-                "description": "too short is invalid",
-                "data": [],
-                "valid": false
-            },
-            {
-                "description": "ignores non-arrays",
-                "data": "",
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/3rdparty/rapidjson/bin/jsonschema/tests/draft3/minLength.json b/3rdparty/rapidjson/bin/jsonschema/tests/draft3/minLength.json
deleted file mode 100644
index 3f09158deef..00000000000
--- a/3rdparty/rapidjson/bin/jsonschema/tests/draft3/minLength.json
+++ /dev/null
@@ -1,33 +0,0 @@
-[
-    {
-        "description": "minLength validation",
-        "schema": {"minLength": 2},
-        "tests": [
-            {
-                "description": "longer is valid",
-                "data": "foo",
-                "valid": true
-            },
-            {
-                "description": "exact length is valid",
-                "data": "fo",
-                "valid": true
-            },
-            {
-                "description": "too short is invalid",
-                "data": "f",
-                "valid": false
-            },
-            {
-                "description": "ignores non-strings",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "one supplementary Unicode code point is not long enough",
-                "data": "\uD83D\uDCA9",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/3rdparty/rapidjson/bin/jsonschema/tests/draft3/minimum.json b/3rdparty/rapidjson/bin/jsonschema/tests/draft3/minimum.json
deleted file mode 100644
index d5bf000bcc6..00000000000
--- a/3rdparty/rapidjson/bin/jsonschema/tests/draft3/minimum.json
+++ /dev/null
@@ -1,42 +0,0 @@
-[
-    {
-        "description": "minimum validation",
-        "schema": {"minimum": 1.1},
-        "tests": [
-            {
-                "description": "above the minimum is valid",
-                "data": 2.6,
-                "valid": true
-            },
-            {
-                "description": "below the minimum is invalid",
-                "data": 0.6,
-                "valid": false
-            },
-            {
-                "description": "ignores non-numbers",
-                "data": "x",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "exclusiveMinimum validation",
-        "schema": {
-            "minimum": 1.1,
-            "exclusiveMinimum": true
-        },
-        "tests": [
-            {
-                "description": "above the minimum is still valid",
-                "data": 1.2,
-                "valid": true
-            },
-            {
-                "description": "boundary point is invalid",
-                "data": 1.1,
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/3rdparty/rapidjson/bin/jsonschema/tests/draft3/optional/bignum.json b/3rdparty/rapidjson/bin/jsonschema/tests/draft3/optional/bignum.json
deleted file mode 100644
index ccc7c17fe8d..00000000000
--- a/3rdparty/rapidjson/bin/jsonschema/tests/draft3/optional/bignum.json
+++ /dev/null
@@ -1,107 +0,0 @@
-[
-    {
-        "description": "integer",
-        "schema": {"type": "integer"},
-        "tests": [
-            {
-                "description": "a bignum is an integer",
-                "data": 12345678910111213141516171819202122232425262728293031,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "number",
-        "schema": {"type": "number"},
-        "tests": [
-            {
-                "description": "a bignum is a number",
-                "data": 98249283749234923498293171823948729348710298301928331,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "integer",
-        "schema": {"type": "integer"},
-        "tests": [
-            {
-                "description": "a negative bignum is an integer",
-                "data": -12345678910111213141516171819202122232425262728293031,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "number",
-        "schema": {"type": "number"},
-        "tests": [
-            {
-                "description": "a negative bignum is a number",
-                "data": -98249283749234923498293171823948729348710298301928331,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "string",
-        "schema": {"type": "string"},
-        "tests": [
-            {
-                "description": "a bignum is not a string",
-                "data": 98249283749234923498293171823948729348710298301928331,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "integer comparison",
-        "schema": {"maximum": 18446744073709551615},
-        "tests": [
-            {
-                "description": "comparison works for high numbers",
-                "data": 18446744073709551600,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "float comparison with high precision",
-        "schema": {
-            "maximum": 972783798187987123879878123.18878137,
-            "exclusiveMaximum": true
-        },
-        "tests": [
-            {
-                "description": "comparison works for high numbers",
-                "data": 972783798187987123879878123.188781371,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "integer comparison",
-        "schema": {"minimum": -18446744073709551615},
-        "tests": [
-            {
-                "description": "comparison works for very negative numbers",
-                "data": -18446744073709551600,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "float comparison with high precision on negative numbers",
-        "schema": {
-            "minimum": -972783798187987123879878123.18878137,
-            "exclusiveMinimum": true
-        },
-        "tests": [
-            {
-                "description": "comparison works for very negative numbers",
-                "data": -972783798187987123879878123.188781371,
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/3rdparty/rapidjson/bin/jsonschema/tests/draft3/optional/format.json b/3rdparty/rapidjson/bin/jsonschema/tests/draft3/optional/format.json
deleted file mode 100644
index 3ca7319dda0..00000000000
--- a/3rdparty/rapidjson/bin/jsonschema/tests/draft3/optional/format.json
+++ /dev/null
@@ -1,222 +0,0 @@
-[
-    {
-        "description": "validation of regular expressions",
-        "schema": {"format": "regex"},
-        "tests": [
-            {
-                "description": "a valid regular expression",
-                "data": "([abc])+\\s+$",
-                "valid": true
-            },
-            {
-                "description": "a regular expression with unclosed parens is invalid",
-                "data": "^(abc]",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "validation of date-time strings",
-        "schema": {"format": "date-time"},
-        "tests": [
-            {
-                "description": "a valid date-time string",
-                "data": "1963-06-19T08:30:06.283185Z",
-                "valid": true
-            },
-            {
-                "description": "an invalid date-time string",
-                "data": "06/19/1963 08:30:06 PST",
-                "valid": false
-            },
-            {
-                "description": "only RFC3339 not all of ISO 8601 are valid",
-                "data": "2013-350T01:01:01",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "validation of date strings",
-        "schema": {"format": "date"},
-        "tests": [
-            {
-                "description": "a valid date string",
-                "data": "1963-06-19",
-                "valid": true
-            },
-            {
-                "description": "an invalid date string",
-                "data": "06/19/1963",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "validation of time strings",
-        "schema": {"format": "time"},
-        "tests": [
-            {
-                "description": "a valid time string",
-                "data": "08:30:06",
-                "valid": true
-            },
-            {
-                "description": "an invalid time string",
-                "data": "8:30 AM",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "validation of URIs",
-        "schema": {"format": "uri"},
-        "tests": [
-            {
-                "description": "a valid URI",
-                "data": "http://foo.bar/?baz=qux#quux",
-                "valid": true
-            },
-            {
-                "description": "a valid protocol-relative URI",
-                "data": "//foo.bar/?baz=qux#quux",
-                "valid": true
-            },
-            {
-                "description": "an invalid URI",
-                "data": "\\\\WINDOWS\\fileshare",
-                "valid": false
-            },
-            {
-                "description": "an invalid URI though valid URI reference",
-                "data": "abc",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "validation of e-mail addresses",
-        "schema": {"format": "email"},
-        "tests": [
-            {
-                "description": "a valid e-mail address",
-                "data": "joe.bloggs@example.com",
-                "valid": true
-            },
-            {
-                "description": "an invalid e-mail address",
-                "data": "2962",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "validation of IP addresses",
-        "schema": {"format": "ip-address"},
-        "tests": [
-            {
-                "description": "a valid IP address",
-                "data": "192.168.0.1",
-                "valid": true
-            },
-            {
-                "description": "an IP address with too many components",
-                "data": "127.0.0.0.1",
-                "valid": false
-            },
-            {
-                "description": "an IP address with out-of-range values",
-                "data": "256.256.256.256",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "validation of IPv6 addresses",
-        "schema": {"format": "ipv6"},
-        "tests": [
-            {
-                "description": "a valid IPv6 address",
-                "data": "::1",
-                "valid": true
-            },
-            {
-                "description": "an IPv6 address with out-of-range values",
-                "data": "12345::",
-                "valid": false
-            },
-            {
-                "description": "an IPv6 address with too many components",
-                "data": "1:1:1:1:1:1:1:1:1:1:1:1:1:1:1:1",
-                "valid": false
-            },
-            {
-                "description": "an IPv6 address containing illegal characters",
-                "data": "::laptop",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "validation of host names",
-        "schema": {"format": "host-name"},
-        "tests": [
-            {
-                "description": "a valid host name",
-                "data": "www.example.com",
-                "valid": true
-            },
-            {
-                "description": "a host name starting with an illegal character",
-                "data": "-a-host-name-that-starts-with--",
-                "valid": false
-            },
-            {
-                "description": "a host name containing illegal characters",
-                "data": "not_a_valid_host_name",
-                "valid": false
-            },
-            {
-                "description": "a host name with a component too long",
-                "data": "a-vvvvvvvvvvvvvvvveeeeeeeeeeeeeeeerrrrrrrrrrrrrrrryyyyyyyyyyyyyyyy-long-host-name-component",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "validation of CSS colors",
-        "schema": {"format": "color"},
-        "tests": [
-            {
-                "description": "a valid CSS color name",
-                "data": "fuchsia",
-                "valid": true
-            },
-            {
-                "description": "a valid six-digit CSS color code",
-                "data": "#CC8899",
-                "valid": true
-            },
-            {
-                "description": "a valid three-digit CSS color code",
-                "data": "#C89",
-                "valid": true
-            },
-            {
-                "description": "an invalid CSS color code",
-                "data": "#00332520",
-                "valid": false
-            },
-            {
-                "description": "an invalid CSS color name",
-                "data": "puce",
-                "valid": false
-            },
-            {
-                "description": "a CSS color name containing invalid characters",
-                "data": "light_grayish_red-violet",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/3rdparty/rapidjson/bin/jsonschema/tests/draft3/optional/jsregex.json b/3rdparty/rapidjson/bin/jsonschema/tests/draft3/optional/jsregex.json
deleted file mode 100644
index 03fe97724c0..00000000000
--- a/3rdparty/rapidjson/bin/jsonschema/tests/draft3/optional/jsregex.json
+++ /dev/null
@@ -1,18 +0,0 @@
-[
-    {
-        "description": "ECMA 262 regex dialect recognition",
-        "schema": { "format": "regex" },
-        "tests": [
-            {
-                "description": "[^] is a valid regex",
-                "data": "[^]",
-                "valid": true
-            },
-            {
-                "description": "ECMA 262 has no support for lookbehind",
-                "data": "(?<=foo)bar",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/3rdparty/rapidjson/bin/jsonschema/tests/draft3/optional/zeroTerminatedFloats.json b/3rdparty/rapidjson/bin/jsonschema/tests/draft3/optional/zeroTerminatedFloats.json
deleted file mode 100644
index 9b50ea27769..00000000000
--- a/3rdparty/rapidjson/bin/jsonschema/tests/draft3/optional/zeroTerminatedFloats.json
+++ /dev/null
@@ -1,15 +0,0 @@
-[
-    {
-        "description": "some languages do not distinguish between different types of numeric value",
-        "schema": {
-            "type": "integer"
-        },
-        "tests": [
-            {
-                "description": "a float is not an integer even without fractional part",
-                "data": 1.0,
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/3rdparty/rapidjson/bin/jsonschema/tests/draft3/pattern.json b/3rdparty/rapidjson/bin/jsonschema/tests/draft3/pattern.json
deleted file mode 100644
index 25e72997314..00000000000
--- a/3rdparty/rapidjson/bin/jsonschema/tests/draft3/pattern.json
+++ /dev/null
@@ -1,34 +0,0 @@
-[
-    {
-        "description": "pattern validation",
-        "schema": {"pattern": "^a*$"},
-        "tests": [
-            {
-                "description": "a matching pattern is valid",
-                "data": "aaa",
-                "valid": true
-            },
-            {
-                "description": "a non-matching pattern is invalid",
-                "data": "abc",
-                "valid": false
-            },
-            {
-                "description": "ignores non-strings",
-                "data": true,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "pattern is not anchored",
-        "schema": {"pattern": "a+"},
-        "tests": [
-            {
-                "description": "matches a substring",
-                "data": "xxaayy",
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/3rdparty/rapidjson/bin/jsonschema/tests/draft3/patternProperties.json b/3rdparty/rapidjson/bin/jsonschema/tests/draft3/patternProperties.json
deleted file mode 100644
index 18586e5daba..00000000000
--- a/3rdparty/rapidjson/bin/jsonschema/tests/draft3/patternProperties.json
+++ /dev/null
@@ -1,110 +0,0 @@
-[
-    {
-        "description":
-            "patternProperties validates properties matching a regex",
-        "schema": {
-            "patternProperties": {
-                "f.*o": {"type": "integer"}
-            }
-        },
-        "tests": [
-            {
-                "description": "a single valid match is valid",
-                "data": {"foo": 1},
-                "valid": true
-            },
-            {
-                "description": "multiple valid matches is valid",
-                "data": {"foo": 1, "foooooo" : 2},
-                "valid": true
-            },
-            {
-                "description": "a single invalid match is invalid",
-                "data": {"foo": "bar", "fooooo": 2},
-                "valid": false
-            },
-            {
-                "description": "multiple invalid matches is invalid",
-                "data": {"foo": "bar", "foooooo" : "baz"},
-                "valid": false
-            },
-            {
-                "description": "ignores non-objects",
-                "data": 12,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "multiple simultaneous patternProperties are validated",
-        "schema": {
-            "patternProperties": {
-                "a*": {"type": "integer"},
-                "aaa*": {"maximum": 20}
-            }
-        },
-        "tests": [
-            {
-                "description": "a single valid match is valid",
-                "data": {"a": 21},
-                "valid": true
-            },
-            {
-                "description": "a simultaneous match is valid",
-                "data": {"aaaa": 18},
-                "valid": true
-            },
-            {
-                "description": "multiple matches is valid",
-                "data": {"a": 21, "aaaa": 18},
-                "valid": true
-            },
-            {
-                "description": "an invalid due to one is invalid",
-                "data": {"a": "bar"},
-                "valid": false
-            },
-            {
-                "description": "an invalid due to the other is invalid",
-                "data": {"aaaa": 31},
-                "valid": false
-            },
-            {
-                "description": "an invalid due to both is invalid",
-                "data": {"aaa": "foo", "aaaa": 31},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "regexes are not anchored by default and are case sensitive",
-        "schema": {
-            "patternProperties": {
-                "[0-9]{2,}": { "type": "boolean" },
-                "X_": { "type": "string" }
-            }
-        },
-        "tests": [
-            {
-                "description": "non recognized members are ignored",
-                "data": { "answer 1": "42" },
-                "valid": true
-            },
-            {
-                "description": "recognized members are accounted for",
-                "data": { "a31b": null },
-                "valid": false
-            },
-            {
-                "description": "regexes are case sensitive",
-                "data": { "a_x_3": 3 },
-                "valid": true
-            },
-            {
-                "description": "regexes are case sensitive, 2",
-                "data": { "a_X_3": 3 },
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/3rdparty/rapidjson/bin/jsonschema/tests/draft3/properties.json b/3rdparty/rapidjson/bin/jsonschema/tests/draft3/properties.json
deleted file mode 100644
index cd1644dcd91..00000000000
--- a/3rdparty/rapidjson/bin/jsonschema/tests/draft3/properties.json
+++ /dev/null
@@ -1,92 +0,0 @@
-[
-    {
-        "description": "object properties validation",
-        "schema": {
-            "properties": {
-                "foo": {"type": "integer"},
-                "bar": {"type": "string"}
-            }
-        },
-        "tests": [
-            {
-                "description": "both properties present and valid is valid",
-                "data": {"foo": 1, "bar": "baz"},
-                "valid": true
-            },
-            {
-                "description": "one property invalid is invalid",
-                "data": {"foo": 1, "bar": {}},
-                "valid": false
-            },
-            {
-                "description": "both properties invalid is invalid",
-                "data": {"foo": [], "bar": {}},
-                "valid": false
-            },
-            {
-                "description": "doesn't invalidate other properties",
-                "data": {"quux": []},
-                "valid": true
-            },
-            {
-                "description": "ignores non-objects",
-                "data": [],
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description":
-            "properties, patternProperties, additionalProperties interaction",
-        "schema": {
-            "properties": {
-                "foo": {"type": "array", "maxItems": 3},
-                "bar": {"type": "array"}
-            },
-            "patternProperties": {"f.o": {"minItems": 2}},
-            "additionalProperties": {"type": "integer"}
-        },
-        "tests": [
-            {
-                "description": "property validates property",
-                "data": {"foo": [1, 2]},
-                "valid": true
-            },
-            {
-                "description": "property invalidates property",
-                "data": {"foo": [1, 2, 3, 4]},
-                "valid": false
-            },
-            {
-                "description": "patternProperty invalidates property",
-                "data": {"foo": []},
-                "valid": false
-            },
-            {
-                "description": "patternProperty validates nonproperty",
-                "data": {"fxo": [1, 2]},
-                "valid": true
-            },
-            {
-                "description": "patternProperty invalidates nonproperty",
-                "data": {"fxo": []},
-                "valid": false
-            },
-            {
-                "description": "additionalProperty ignores property",
-                "data": {"bar": []},
-                "valid": true
-            },
-            {
-                "description": "additionalProperty validates others",
-                "data": {"quux": 3},
-                "valid": true
-            },
-            {
-                "description": "additionalProperty invalidates others",
-                "data": {"quux": "foo"},
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/3rdparty/rapidjson/bin/jsonschema/tests/draft3/ref.json b/3rdparty/rapidjson/bin/jsonschema/tests/draft3/ref.json
deleted file mode 100644
index 903ecb6bce1..00000000000
--- a/3rdparty/rapidjson/bin/jsonschema/tests/draft3/ref.json
+++ /dev/null
@@ -1,159 +0,0 @@
-[
-    {
-        "description": "root pointer ref",
-        "schema": {
-            "properties": {
-                "foo": {"$ref": "#"}
-            },
-            "additionalProperties": false
-        },
-        "tests": [
-            {
-                "description": "match",
-                "data": {"foo": false},
-                "valid": true
-            },
-            {
-                "description": "recursive match",
-                "data": {"foo": {"foo": false}},
-                "valid": true
-            },
-            {
-                "description": "mismatch",
-                "data": {"bar": false},
-                "valid": false
-            },
-            {
-                "description": "recursive mismatch",
-                "data": {"foo": {"bar": false}},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "relative pointer ref to object",
-        "schema": {
-            "properties": {
-                "foo": {"type": "integer"},
-                "bar": {"$ref": "#/properties/foo"}
-            }
-        },
-        "tests": [
-            {
-                "description": "match",
-                "data": {"bar": 3},
-                "valid": true
-            },
-            {
-                "description": "mismatch",
-                "data": {"bar": true},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "relative pointer ref to array",
-        "schema": {
-            "items": [
-                {"type": "integer"},
-                {"$ref": "#/items/0"}
-            ]
-        },
-        "tests": [
-            {
-                "description": "match array",
-                "data": [1, 2],
-                "valid": true
-            },
-            {
-                "description": "mismatch array",
-                "data": [1, "foo"],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "escaped pointer ref",
-        "schema": {
-            "tilda~field": {"type": "integer"},
-            "slash/field": {"type": "integer"},
-            "percent%field": {"type": "integer"},
-            "properties": {
-                "tilda": {"$ref": "#/tilda~0field"},
-                "slash": {"$ref": "#/slash~1field"},
-                "percent": {"$ref": "#/percent%25field"}
-            }
-        },
-        "tests": [
-            {
-                "description": "slash invalid",
-                "data": {"slash": "aoeu"},
-                "valid": false
-            },
-            {
-                "description": "tilda invalid",
-                "data": {"tilda": "aoeu"},
-                "valid": false
-            },
-            {
-                "description": "percent invalid",
-                "data": {"percent": "aoeu"},
-                "valid": false
-            },
-            {
-                "description": "slash valid",
-                "data": {"slash": 123},
-                "valid": true
-            },
-            {
-                "description": "tilda valid",
-                "data": {"tilda": 123},
-                "valid": true
-            },
-            {
-                "description": "percent valid",
-                "data": {"percent": 123},
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "nested refs",
-        "schema": {
-            "definitions": {
-                "a": {"type": "integer"},
-                "b": {"$ref": "#/definitions/a"},
-                "c": {"$ref": "#/definitions/b"}
-            },
-            "$ref": "#/definitions/c"
-        },
-        "tests": [
-            {
-                "description": "nested ref valid",
-                "data": 5,
-                "valid": true
-            },
-            {
-                "description": "nested ref invalid",
-                "data": "a",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "remote ref, containing refs itself",
-        "schema": {"$ref": "http://json-schema.org/draft-03/schema#"},
-        "tests": [
-            {
-                "description": "remote ref valid",
-                "data": {"items": {"type": "integer"}},
-                "valid": true
-            },
-            {
-                "description": "remote ref invalid",
-                "data": {"items": {"type": 1}},
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/3rdparty/rapidjson/bin/jsonschema/tests/draft3/refRemote.json b/3rdparty/rapidjson/bin/jsonschema/tests/draft3/refRemote.json
deleted file mode 100644
index 4ca804732c9..00000000000
--- a/3rdparty/rapidjson/bin/jsonschema/tests/draft3/refRemote.json
+++ /dev/null
@@ -1,74 +0,0 @@
-[
-    {
-        "description": "remote ref",
-        "schema": {"$ref": "http://localhost:1234/integer.json"},
-        "tests": [
-            {
-                "description": "remote ref valid",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "remote ref invalid",
-                "data": "a",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "fragment within remote ref",
-        "schema": {"$ref": "http://localhost:1234/subSchemas.json#/integer"},
-        "tests": [
-            {
-                "description": "remote fragment valid",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "remote fragment invalid",
-                "data": "a",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "ref within remote ref",
-        "schema": {
-            "$ref": "http://localhost:1234/subSchemas.json#/refToInteger"
-        },
-        "tests": [
-            {
-                "description": "ref within ref valid",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "ref within ref invalid",
-                "data": "a",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "change resolution scope",
-        "schema": {
-            "id": "http://localhost:1234/",
-            "items": {
-                "id": "folder/",
-                "items": {"$ref": "folderInteger.json"}
-            }
-        },
-        "tests": [
-            {
-                "description": "changed scope ref valid",
-                "data": [[1]],
-                "valid": true
-            },
-            {
-                "description": "changed scope ref invalid",
-                "data": [["a"]],
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/3rdparty/rapidjson/bin/jsonschema/tests/draft3/required.json b/3rdparty/rapidjson/bin/jsonschema/tests/draft3/required.json
deleted file mode 100644
index aaaf0242737..00000000000
--- a/3rdparty/rapidjson/bin/jsonschema/tests/draft3/required.json
+++ /dev/null
@@ -1,53 +0,0 @@
-[
-    {
-        "description": "required validation",
-        "schema": {
-            "properties": {
-                "foo": {"required" : true},
-                "bar": {}
-            }
-        },
-        "tests": [
-            {
-                "description": "present required property is valid",
-                "data": {"foo": 1},
-                "valid": true
-            },
-            {
-                "description": "non-present required property is invalid",
-                "data": {"bar": 1},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "required default validation",
-        "schema": {
-            "properties": {
-                "foo": {}
-            }
-        },
-        "tests": [
-            {
-                "description": "not required by default",
-                "data": {},
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "required explicitly false validation",
-        "schema": {
-            "properties": {
-                "foo": {"required": false}
-            }
-        },
-        "tests": [
-            {
-                "description": "not required if required is false",
-                "data": {},
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/3rdparty/rapidjson/bin/jsonschema/tests/draft3/type.json b/3rdparty/rapidjson/bin/jsonschema/tests/draft3/type.json
deleted file mode 100644
index 337da1206da..00000000000
--- a/3rdparty/rapidjson/bin/jsonschema/tests/draft3/type.json
+++ /dev/null
@@ -1,474 +0,0 @@
-[
-    {
-        "description": "integer type matches integers",
-        "schema": {"type": "integer"},
-        "tests": [
-            {
-                "description": "an integer is an integer",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "a float is not an integer",
-                "data": 1.1,
-                "valid": false
-            },
-            {
-                "description": "a string is not an integer",
-                "data": "foo",
-                "valid": false
-            },
-            {
-                "description": "an object is not an integer",
-                "data": {},
-                "valid": false
-            },
-            {
-                "description": "an array is not an integer",
-                "data": [],
-                "valid": false
-            },
-            {
-                "description": "a boolean is not an integer",
-                "data": true,
-                "valid": false
-            },
-            {
-                "description": "null is not an integer",
-                "data": null,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "number type matches numbers",
-        "schema": {"type": "number"},
-        "tests": [
-            {
-                "description": "an integer is a number",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "a float is a number",
-                "data": 1.1,
-                "valid": true
-            },
-            {
-                "description": "a string is not a number",
-                "data": "foo",
-                "valid": false
-            },
-            {
-                "description": "an object is not a number",
-                "data": {},
-                "valid": false
-            },
-            {
-                "description": "an array is not a number",
-                "data": [],
-                "valid": false
-            },
-            {
-                "description": "a boolean is not a number",
-                "data": true,
-                "valid": false
-            },
-            {
-                "description": "null is not a number",
-                "data": null,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "string type matches strings",
-        "schema": {"type": "string"},
-        "tests": [
-            {
-                "description": "1 is not a string",
-                "data": 1,
-                "valid": false
-            },
-            {
-                "description": "a float is not a string",
-                "data": 1.1,
-                "valid": false
-            },
-            {
-                "description": "a string is a string",
-                "data": "foo",
-                "valid": true
-            },
-            {
-                "description": "an object is not a string",
-                "data": {},
-                "valid": false
-            },
-            {
-                "description": "an array is not a string",
-                "data": [],
-                "valid": false
-            },
-            {
-                "description": "a boolean is not a string",
-                "data": true,
-                "valid": false
-            },
-            {
-                "description": "null is not a string",
-                "data": null,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "object type matches objects",
-        "schema": {"type": "object"},
-        "tests": [
-            {
-                "description": "an integer is not an object",
-                "data": 1,
-                "valid": false
-            },
-            {
-                "description": "a float is not an object",
-                "data": 1.1,
-                "valid": false
-            },
-            {
-                "description": "a string is not an object",
-                "data": "foo",
-                "valid": false
-            },
-            {
-                "description": "an object is an object",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "an array is not an object",
-                "data": [],
-                "valid": false
-            },
-            {
-                "description": "a boolean is not an object",
-                "data": true,
-                "valid": false
-            },
-            {
-                "description": "null is not an object",
-                "data": null,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "array type matches arrays",
-        "schema": {"type": "array"},
-        "tests": [
-            {
-                "description": "an integer is not an array",
-                "data": 1,
-                "valid": false
-            },
-            {
-                "description": "a float is not an array",
-                "data": 1.1,
-                "valid": false
-            },
-            {
-                "description": "a string is not an array",
-                "data": "foo",
-                "valid": false
-            },
-            {
-                "description": "an object is not an array",
-                "data": {},
-                "valid": false
-            },
-            {
-                "description": "an array is an array",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "a boolean is not an array",
-                "data": true,
-                "valid": false
-            },
-            {
-                "description": "null is not an array",
-                "data": null,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "boolean type matches booleans",
-        "schema": {"type": "boolean"},
-        "tests": [
-            {
-                "description": "an integer is not a boolean",
-                "data": 1,
-                "valid": false
-            },
-            {
-                "description": "a float is not a boolean",
-                "data": 1.1,
-                "valid": false
-            },
-            {
-                "description": "a string is not a boolean",
-                "data": "foo",
-                "valid": false
-            },
-            {
-                "description": "an object is not a boolean",
-                "data": {},
-                "valid": false
-            },
-            {
-                "description": "an array is not a boolean",
-                "data": [],
-                "valid": false
-            },
-            {
-                "description": "a boolean is a boolean",
-                "data": true,
-                "valid": true
-            },
-            {
-                "description": "null is not a boolean",
-                "data": null,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "null type matches only the null object",
-        "schema": {"type": "null"},
-        "tests": [
-            {
-                "description": "an integer is not null",
-                "data": 1,
-                "valid": false
-            },
-            {
-                "description": "a float is not null",
-                "data": 1.1,
-                "valid": false
-            },
-            {
-                "description": "a string is not null",
-                "data": "foo",
-                "valid": false
-            },
-            {
-                "description": "an object is not null",
-                "data": {},
-                "valid": false
-            },
-            {
-                "description": "an array is not null",
-                "data": [],
-                "valid": false
-            },
-            {
-                "description": "a boolean is not null",
-                "data": true,
-                "valid": false
-            },
-            {
-                "description": "null is null",
-                "data": null,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "any type matches any type",
-        "schema": {"type": "any"},
-        "tests": [
-            {
-                "description": "any type includes integers",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "any type includes float",
-                "data": 1.1,
-                "valid": true
-            },
-            {
-                "description": "any type includes string",
-                "data": "foo",
-                "valid": true
-            },
-            {
-                "description": "any type includes object",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "any type includes array",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "any type includes boolean",
-                "data": true,
-                "valid": true
-            },
-            {
-                "description": "any type includes null",
-                "data": null,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "multiple types can be specified in an array",
-        "schema": {"type": ["integer", "string"]},
-        "tests": [
-            {
-                "description": "an integer is valid",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "a string is valid",
-                "data": "foo",
-                "valid": true
-            },
-            {
-                "description": "a float is invalid",
-                "data": 1.1,
-                "valid": false
-            },
-            {
-                "description": "an object is invalid",
-                "data": {},
-                "valid": false
-            },
-            {
-                "description": "an array is invalid",
-                "data": [],
-                "valid": false
-            },
-            {
-                "description": "a boolean is invalid",
-                "data": true,
-                "valid": false
-            },
-            {
-                "description": "null is invalid",
-                "data": null,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "types can include schemas",
-        "schema": {
-            "type": [
-                "array",
-                {"type": "object"}
-            ]
-        },
-        "tests": [
-            {
-                "description": "an integer is invalid",
-                "data": 1,
-                "valid": false
-            },
-            {
-                "description": "a string is invalid",
-                "data": "foo",
-                "valid": false
-            },
-            {
-                "description": "a float is invalid",
-                "data": 1.1,
-                "valid": false
-            },
-            {
-                "description": "an object is valid",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "an array is valid",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "a boolean is invalid",
-                "data": true,
-                "valid": false
-            },
-            {
-                "description": "null is invalid",
-                "data": null,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": 
-            "when types includes a schema it should fully validate the schema",
-        "schema": {
-            "type": [
-                "integer",
-                {
-                    "properties": {
-                        "foo": {"type": "null"}
-                    }
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "an integer is valid",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "an object is valid only if it is fully valid",
-                "data": {"foo": null},
-                "valid": true
-            },
-            {
-                "description": "an object is invalid otherwise",
-                "data": {"foo": "bar"},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "types from separate schemas are merged",
-        "schema": {
-            "type": [
-                {"type": ["string"]},
-                {"type": ["array", "null"]}
-            ]
-        },
-        "tests": [
-            {
-                "description": "an integer is invalid",
-                "data": 1,
-                "valid": false
-            },
-            {
-                "description": "a string is valid",
-                "data": "foo",
-                "valid": true
-            },
-            {
-                "description": "an array is valid",
-                "data": [1, 2, 3],
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/3rdparty/rapidjson/bin/jsonschema/tests/draft3/uniqueItems.json b/3rdparty/rapidjson/bin/jsonschema/tests/draft3/uniqueItems.json
deleted file mode 100644
index c1f4ab99c9a..00000000000
--- a/3rdparty/rapidjson/bin/jsonschema/tests/draft3/uniqueItems.json
+++ /dev/null
@@ -1,79 +0,0 @@
-[
-    {
-        "description": "uniqueItems validation",
-        "schema": {"uniqueItems": true},
-        "tests": [
-            {
-                "description": "unique array of integers is valid",
-                "data": [1, 2],
-                "valid": true
-            },
-            {
-                "description": "non-unique array of integers is invalid",
-                "data": [1, 1],
-                "valid": false
-            },
-            {
-                "description": "numbers are unique if mathematically unequal",
-                "data": [1.0, 1.00, 1],
-                "valid": false
-            },
-            {
-                "description": "unique array of objects is valid",
-                "data": [{"foo": "bar"}, {"foo": "baz"}],
-                "valid": true
-            },
-            {
-                "description": "non-unique array of objects is invalid",
-                "data": [{"foo": "bar"}, {"foo": "bar"}],
-                "valid": false
-            },
-            {
-                "description": "unique array of nested objects is valid",
-                "data": [
-                    {"foo": {"bar" : {"baz" : true}}},
-                    {"foo": {"bar" : {"baz" : false}}}
-                ],
-                "valid": true
-            },
-            {
-                "description": "non-unique array of nested objects is invalid",
-                "data": [
-                    {"foo": {"bar" : {"baz" : true}}},
-                    {"foo": {"bar" : {"baz" : true}}}
-                ],
-                "valid": false
-            },
-            {
-                "description": "unique array of arrays is valid",
-                "data": [["foo"], ["bar"]],
-                "valid": true
-            },
-            {
-                "description": "non-unique array of arrays is invalid",
-                "data": [["foo"], ["foo"]],
-                "valid": false
-            },
-            {
-                "description": "1 and true are unique",
-                "data": [1, true],
-                "valid": true
-            },
-            {
-                "description": "0 and false are unique",
-                "data": [0, false],
-                "valid": true
-            },
-            {
-                "description": "unique heterogeneous types are valid",
-                "data": [{}, [1], true, null, 1],
-                "valid": true
-            },
-            {
-                "description": "non-unique heterogeneous types are invalid",
-                "data": [{}, [1], true, null, {}, 1],
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/3rdparty/rapidjson/bin/jsonschema/tests/draft4/.DS_Store b/3rdparty/rapidjson/bin/jsonschema/tests/draft4/.DS_Store
deleted file mode 100644
index ef142295ea00d1d19fc3d30cc4e82dd207530825..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6148
zcmeHK%}T^D5T4N$3SRc8x4go>L0IYo$i9Huf(orExO?vd?#YAC<2OGpmKHn+A~FM+
zFPY3tnh%;}h={j`c0;r#q6$rrrL!PnUYt5}=L;ZfjzTYVPhI=kbPI|8qDj8JqCx}h
z=^1$X{)bX@53|YcakFbmKiF=rZ<iAErLNn<z9D)$z8}?dmZvZ6w?4zu*R`@O89EpU
z27-ZLAQ<=&1GuwAs!PMr!9Xw&44fE{^C6)LX2;P`j}9m;0e~x*RnV7OLSm9*b{q{c
z17QmVS}1#o!4?jCa=+|28d^B97a!~^e-<ySt0R9>cj9aqIv5BBrVO0ha4q-$4St!$
zB7YhZqhKHy_-738s@~OGY|8J}+4khFO=x#$BH}kn2ZH|O5rBc5BUd_U^GW*f%Z{U=
TWD&cD1LGl}goFwPeu04xBO^7X

diff --git a/3rdparty/rapidjson/bin/jsonschema/tests/draft4/additionalItems.json b/3rdparty/rapidjson/bin/jsonschema/tests/draft4/additionalItems.json
deleted file mode 100644
index 521745c8d6e..00000000000
--- a/3rdparty/rapidjson/bin/jsonschema/tests/draft4/additionalItems.json
+++ /dev/null
@@ -1,82 +0,0 @@
-[
-    {
-        "description": "additionalItems as schema",
-        "schema": {
-            "items": [{}],
-            "additionalItems": {"type": "integer"}
-        },
-        "tests": [
-            {
-                "description": "additional items match schema",
-                "data": [ null, 2, 3, 4 ],
-                "valid": true
-            },
-            {
-                "description": "additional items do not match schema",
-                "data": [ null, 2, 3, "foo" ],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "items is schema, no additionalItems",
-        "schema": {
-            "items": {},
-            "additionalItems": false
-        },
-        "tests": [
-            {
-                "description": "all items match schema",
-                "data": [ 1, 2, 3, 4, 5 ],
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "array of items with no additionalItems",
-        "schema": {
-            "items": [{}, {}, {}],
-            "additionalItems": false
-        },
-        "tests": [
-            {
-                "description": "no additional items present",
-                "data": [ 1, 2, 3 ],
-                "valid": true
-            },
-            {
-                "description": "additional items are not permitted",
-                "data": [ 1, 2, 3, 4 ],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "additionalItems as false without items",
-        "schema": {"additionalItems": false},
-        "tests": [
-            {
-                "description":
-                    "items defaults to empty schema so everything is valid",
-                "data": [ 1, 2, 3, 4, 5 ],
-                "valid": true
-            },
-            {
-                "description": "ignores non-arrays",
-                "data": {"foo" : "bar"},
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "additionalItems are allowed by default",
-        "schema": {"items": [{"type": "integer"}]},
-        "tests": [
-            {
-                "description": "only the first item is validated",
-                "data": [1, "foo", false],
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/3rdparty/rapidjson/bin/jsonschema/tests/draft4/additionalProperties.json b/3rdparty/rapidjson/bin/jsonschema/tests/draft4/additionalProperties.json
deleted file mode 100644
index 40831f9e9aa..00000000000
--- a/3rdparty/rapidjson/bin/jsonschema/tests/draft4/additionalProperties.json
+++ /dev/null
@@ -1,88 +0,0 @@
-[
-    {
-        "description":
-            "additionalProperties being false does not allow other properties",
-        "schema": {
-            "properties": {"foo": {}, "bar": {}},
-            "patternProperties": { "^v": {} },
-            "additionalProperties": false
-        },
-        "tests": [
-            {
-                "description": "no additional properties is valid",
-                "data": {"foo": 1},
-                "valid": true
-            },
-            {
-                "description": "an additional property is invalid",
-                "data": {"foo" : 1, "bar" : 2, "quux" : "boom"},
-                "valid": false
-            },
-            {
-                "description": "ignores non-objects",
-                "data": [1, 2, 3],
-                "valid": true
-            },
-            {
-                "description": "patternProperties are not additional properties",
-                "data": {"foo":1, "vroom": 2},
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description":
-            "additionalProperties allows a schema which should validate",
-        "schema": {
-            "properties": {"foo": {}, "bar": {}},
-            "additionalProperties": {"type": "boolean"}
-        },
-        "tests": [
-            {
-                "description": "no additional properties is valid",
-                "data": {"foo": 1},
-                "valid": true
-            },
-            {
-                "description": "an additional valid property is valid",
-                "data": {"foo" : 1, "bar" : 2, "quux" : true},
-                "valid": true
-            },
-            {
-                "description": "an additional invalid property is invalid",
-                "data": {"foo" : 1, "bar" : 2, "quux" : 12},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description":
-            "additionalProperties can exist by itself",
-        "schema": {
-            "additionalProperties": {"type": "boolean"}
-        },
-        "tests": [
-            {
-                "description": "an additional valid property is valid",
-                "data": {"foo" : true},
-                "valid": true
-            },
-            {
-                "description": "an additional invalid property is invalid",
-                "data": {"foo" : 1},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "additionalProperties are allowed by default",
-        "schema": {"properties": {"foo": {}, "bar": {}}},
-        "tests": [
-            {
-                "description": "additional properties are allowed",
-                "data": {"foo": 1, "bar": 2, "quux": true},
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/3rdparty/rapidjson/bin/jsonschema/tests/draft4/allOf.json b/3rdparty/rapidjson/bin/jsonschema/tests/draft4/allOf.json
deleted file mode 100644
index bbb5f89e4bc..00000000000
--- a/3rdparty/rapidjson/bin/jsonschema/tests/draft4/allOf.json
+++ /dev/null
@@ -1,112 +0,0 @@
-[
-    {
-        "description": "allOf",
-        "schema": {
-            "allOf": [
-                {
-                    "properties": {
-                        "bar": {"type": "integer"}
-                    },
-                    "required": ["bar"]
-                },
-                {
-                    "properties": {
-                        "foo": {"type": "string"}
-                    },
-                    "required": ["foo"]
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "allOf",
-                "data": {"foo": "baz", "bar": 2},
-                "valid": true
-            },
-            {
-                "description": "mismatch second",
-                "data": {"foo": "baz"},
-                "valid": false
-            },
-            {
-                "description": "mismatch first",
-                "data": {"bar": 2},
-                "valid": false
-            },
-            {
-                "description": "wrong type",
-                "data": {"foo": "baz", "bar": "quux"},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "allOf with base schema",
-        "schema": {
-            "properties": {"bar": {"type": "integer"}},
-            "required": ["bar"],
-            "allOf" : [
-                {
-                    "properties": {
-                        "foo": {"type": "string"}
-                    },
-                    "required": ["foo"]
-                },
-                {
-                    "properties": {
-                        "baz": {"type": "null"}
-                    },
-                    "required": ["baz"]
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "valid",
-                "data": {"foo": "quux", "bar": 2, "baz": null},
-                "valid": true
-            },
-            {
-                "description": "mismatch base schema",
-                "data": {"foo": "quux", "baz": null},
-                "valid": false
-            },
-            {
-                "description": "mismatch first allOf",
-                "data": {"bar": 2, "baz": null},
-                "valid": false
-            },
-            {
-                "description": "mismatch second allOf",
-                "data": {"foo": "quux", "bar": 2},
-                "valid": false
-            },
-            {
-                "description": "mismatch both",
-                "data": {"bar": 2},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "allOf simple types",
-        "schema": {
-            "allOf": [
-                {"maximum": 30},
-                {"minimum": 20}
-            ]
-        },
-        "tests": [
-            {
-                "description": "valid",
-                "data": 25,
-                "valid": true
-            },
-            {
-                "description": "mismatch one",
-                "data": 35,
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/3rdparty/rapidjson/bin/jsonschema/tests/draft4/anyOf.json b/3rdparty/rapidjson/bin/jsonschema/tests/draft4/anyOf.json
deleted file mode 100644
index a58714afd89..00000000000
--- a/3rdparty/rapidjson/bin/jsonschema/tests/draft4/anyOf.json
+++ /dev/null
@@ -1,68 +0,0 @@
-[
-    {
-        "description": "anyOf",
-        "schema": {
-            "anyOf": [
-                {
-                    "type": "integer"
-                },
-                {
-                    "minimum": 2
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "first anyOf valid",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "second anyOf valid",
-                "data": 2.5,
-                "valid": true
-            },
-            {
-                "description": "both anyOf valid",
-                "data": 3,
-                "valid": true
-            },
-            {
-                "description": "neither anyOf valid",
-                "data": 1.5,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "anyOf with base schema",
-        "schema": {
-            "type": "string",
-            "anyOf" : [
-                {
-                    "maxLength": 2
-                },
-                {
-                    "minLength": 4
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "mismatch base schema",
-                "data": 3,
-                "valid": false
-            },
-            {
-                "description": "one anyOf valid",
-                "data": "foobar",
-                "valid": true
-            },
-            {
-                "description": "both anyOf invalid",
-                "data": "foo",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/3rdparty/rapidjson/bin/jsonschema/tests/draft4/default.json b/3rdparty/rapidjson/bin/jsonschema/tests/draft4/default.json
deleted file mode 100644
index 17629779fbe..00000000000
--- a/3rdparty/rapidjson/bin/jsonschema/tests/draft4/default.json
+++ /dev/null
@@ -1,49 +0,0 @@
-[
-    {
-        "description": "invalid type for default",
-        "schema": {
-            "properties": {
-                "foo": {
-                    "type": "integer",
-                    "default": []
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "valid when property is specified",
-                "data": {"foo": 13},
-                "valid": true
-            },
-            {
-                "description": "still valid when the invalid default is used",
-                "data": {},
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "invalid string value for default",
-        "schema": {
-            "properties": {
-                "bar": {
-                    "type": "string",
-                    "minLength": 4,
-                    "default": "bad"
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "valid when property is specified",
-                "data": {"bar": "good"},
-                "valid": true
-            },
-            {
-                "description": "still valid when the invalid default is used",
-                "data": {},
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/3rdparty/rapidjson/bin/jsonschema/tests/draft4/definitions.json b/3rdparty/rapidjson/bin/jsonschema/tests/draft4/definitions.json
deleted file mode 100644
index cf935a32153..00000000000
--- a/3rdparty/rapidjson/bin/jsonschema/tests/draft4/definitions.json
+++ /dev/null
@@ -1,32 +0,0 @@
-[
-    {
-        "description": "valid definition",
-        "schema": {"$ref": "http://json-schema.org/draft-04/schema#"},
-        "tests": [
-            {
-                "description": "valid definition schema",
-                "data": {
-                    "definitions": {
-                        "foo": {"type": "integer"}
-                    }
-                },
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "invalid definition",
-        "schema": {"$ref": "http://json-schema.org/draft-04/schema#"},
-        "tests": [
-            {
-                "description": "invalid definition schema",
-                "data": {
-                    "definitions": {
-                        "foo": {"type": 1}
-                    }
-                },
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/3rdparty/rapidjson/bin/jsonschema/tests/draft4/dependencies.json b/3rdparty/rapidjson/bin/jsonschema/tests/draft4/dependencies.json
deleted file mode 100644
index 7b9b16a7e12..00000000000
--- a/3rdparty/rapidjson/bin/jsonschema/tests/draft4/dependencies.json
+++ /dev/null
@@ -1,113 +0,0 @@
-[
-    {
-        "description": "dependencies",
-        "schema": {
-            "dependencies": {"bar": ["foo"]}
-        },
-        "tests": [
-            {
-                "description": "neither",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "nondependant",
-                "data": {"foo": 1},
-                "valid": true
-            },
-            {
-                "description": "with dependency",
-                "data": {"foo": 1, "bar": 2},
-                "valid": true
-            },
-            {
-                "description": "missing dependency",
-                "data": {"bar": 2},
-                "valid": false
-            },
-            {
-                "description": "ignores non-objects",
-                "data": "foo",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "multiple dependencies",
-        "schema": {
-            "dependencies": {"quux": ["foo", "bar"]}
-        },
-        "tests": [
-            {
-                "description": "neither",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "nondependants",
-                "data": {"foo": 1, "bar": 2},
-                "valid": true
-            },
-            {
-                "description": "with dependencies",
-                "data": {"foo": 1, "bar": 2, "quux": 3},
-                "valid": true
-            },
-            {
-                "description": "missing dependency",
-                "data": {"foo": 1, "quux": 2},
-                "valid": false
-            },
-            {
-                "description": "missing other dependency",
-                "data": {"bar": 1, "quux": 2},
-                "valid": false
-            },
-            {
-                "description": "missing both dependencies",
-                "data": {"quux": 1},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "multiple dependencies subschema",
-        "schema": {
-            "dependencies": {
-                "bar": {
-                    "properties": {
-                        "foo": {"type": "integer"},
-                        "bar": {"type": "integer"}
-                    }
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "valid",
-                "data": {"foo": 1, "bar": 2},
-                "valid": true
-            },
-            {
-                "description": "no dependency",
-                "data": {"foo": "quux"},
-                "valid": true
-            },
-            {
-                "description": "wrong type",
-                "data": {"foo": "quux", "bar": 2},
-                "valid": false
-            },
-            {
-                "description": "wrong type other",
-                "data": {"foo": 2, "bar": "quux"},
-                "valid": false
-            },
-            {
-                "description": "wrong type both",
-                "data": {"foo": "quux", "bar": "quux"},
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/3rdparty/rapidjson/bin/jsonschema/tests/draft4/enum.json b/3rdparty/rapidjson/bin/jsonschema/tests/draft4/enum.json
deleted file mode 100644
index f124436a7d9..00000000000
--- a/3rdparty/rapidjson/bin/jsonschema/tests/draft4/enum.json
+++ /dev/null
@@ -1,72 +0,0 @@
-[
-    {
-        "description": "simple enum validation",
-        "schema": {"enum": [1, 2, 3]},
-        "tests": [
-            {
-                "description": "one of the enum is valid",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "something else is invalid",
-                "data": 4,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "heterogeneous enum validation",
-        "schema": {"enum": [6, "foo", [], true, {"foo": 12}]},
-        "tests": [
-            {
-                "description": "one of the enum is valid",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "something else is invalid",
-                "data": null,
-                "valid": false
-            },
-            {
-                "description": "objects are deep compared",
-                "data": {"foo": false},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "enums in properties",
-        "schema": {
-           "type":"object",
-		     "properties": {
-		        "foo": {"enum":["foo"]},
-		        "bar": {"enum":["bar"]}
-		     },
-		     "required": ["bar"]
-		  },
-        "tests": [
-            {
-                "description": "both properties are valid",
-                "data": {"foo":"foo", "bar":"bar"},
-                "valid": true
-            },
-            {
-                "description": "missing optional property is valid",
-                "data": {"bar":"bar"},
-                "valid": true
-            },
-            {
-                "description": "missing required property is invalid",
-                "data": {"foo":"foo"},
-                "valid": false
-            },
-            {
-                "description": "missing all properties is invalid",
-                "data": {},
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/3rdparty/rapidjson/bin/jsonschema/tests/draft4/items.json b/3rdparty/rapidjson/bin/jsonschema/tests/draft4/items.json
deleted file mode 100644
index f5e18a13848..00000000000
--- a/3rdparty/rapidjson/bin/jsonschema/tests/draft4/items.json
+++ /dev/null
@@ -1,46 +0,0 @@
-[
-    {
-        "description": "a schema given for items",
-        "schema": {
-            "items": {"type": "integer"}
-        },
-        "tests": [
-            {
-                "description": "valid items",
-                "data": [ 1, 2, 3 ],
-                "valid": true
-            },
-            {
-                "description": "wrong type of items",
-                "data": [1, "x"],
-                "valid": false
-            },
-            {
-                "description": "ignores non-arrays",
-                "data": {"foo" : "bar"},
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "an array of schemas for items",
-        "schema": {
-            "items": [
-                {"type": "integer"},
-                {"type": "string"}
-            ]
-        },
-        "tests": [
-            {
-                "description": "correct types",
-                "data": [ 1, "foo" ],
-                "valid": true
-            },
-            {
-                "description": "wrong types",
-                "data": [ "foo", 1 ],
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/3rdparty/rapidjson/bin/jsonschema/tests/draft4/maxItems.json b/3rdparty/rapidjson/bin/jsonschema/tests/draft4/maxItems.json
deleted file mode 100644
index 3b53a6b371a..00000000000
--- a/3rdparty/rapidjson/bin/jsonschema/tests/draft4/maxItems.json
+++ /dev/null
@@ -1,28 +0,0 @@
-[
-    {
-        "description": "maxItems validation",
-        "schema": {"maxItems": 2},
-        "tests": [
-            {
-                "description": "shorter is valid",
-                "data": [1],
-                "valid": true
-            },
-            {
-                "description": "exact length is valid",
-                "data": [1, 2],
-                "valid": true
-            },
-            {
-                "description": "too long is invalid",
-                "data": [1, 2, 3],
-                "valid": false
-            },
-            {
-                "description": "ignores non-arrays",
-                "data": "foobar",
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/3rdparty/rapidjson/bin/jsonschema/tests/draft4/maxLength.json b/3rdparty/rapidjson/bin/jsonschema/tests/draft4/maxLength.json
deleted file mode 100644
index 811d35b253c..00000000000
--- a/3rdparty/rapidjson/bin/jsonschema/tests/draft4/maxLength.json
+++ /dev/null
@@ -1,33 +0,0 @@
-[
-    {
-        "description": "maxLength validation",
-        "schema": {"maxLength": 2},
-        "tests": [
-            {
-                "description": "shorter is valid",
-                "data": "f",
-                "valid": true
-            },
-            {
-                "description": "exact length is valid",
-                "data": "fo",
-                "valid": true
-            },
-            {
-                "description": "too long is invalid",
-                "data": "foo",
-                "valid": false
-            },
-            {
-                "description": "ignores non-strings",
-                "data": 100,
-                "valid": true
-            },
-            {
-                "description": "two supplementary Unicode code points is long enough",
-                "data": "\uD83D\uDCA9\uD83D\uDCA9",
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/3rdparty/rapidjson/bin/jsonschema/tests/draft4/maxProperties.json b/3rdparty/rapidjson/bin/jsonschema/tests/draft4/maxProperties.json
deleted file mode 100644
index d282446ad69..00000000000
--- a/3rdparty/rapidjson/bin/jsonschema/tests/draft4/maxProperties.json
+++ /dev/null
@@ -1,28 +0,0 @@
-[
-    {
-        "description": "maxProperties validation",
-        "schema": {"maxProperties": 2},
-        "tests": [
-            {
-                "description": "shorter is valid",
-                "data": {"foo": 1},
-                "valid": true
-            },
-            {
-                "description": "exact length is valid",
-                "data": {"foo": 1, "bar": 2},
-                "valid": true
-            },
-            {
-                "description": "too long is invalid",
-                "data": {"foo": 1, "bar": 2, "baz": 3},
-                "valid": false
-            },
-            {
-                "description": "ignores non-objects",
-                "data": "foobar",
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/3rdparty/rapidjson/bin/jsonschema/tests/draft4/maximum.json b/3rdparty/rapidjson/bin/jsonschema/tests/draft4/maximum.json
deleted file mode 100644
index 86c7b89c9a9..00000000000
--- a/3rdparty/rapidjson/bin/jsonschema/tests/draft4/maximum.json
+++ /dev/null
@@ -1,42 +0,0 @@
-[
-    {
-        "description": "maximum validation",
-        "schema": {"maximum": 3.0},
-        "tests": [
-            {
-                "description": "below the maximum is valid",
-                "data": 2.6,
-                "valid": true
-            },
-            {
-                "description": "above the maximum is invalid",
-                "data": 3.5,
-                "valid": false
-            },
-            {
-                "description": "ignores non-numbers",
-                "data": "x",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "exclusiveMaximum validation",
-        "schema": {
-            "maximum": 3.0,
-            "exclusiveMaximum": true
-        },
-        "tests": [
-            {
-                "description": "below the maximum is still valid",
-                "data": 2.2,
-                "valid": true
-            },
-            {
-                "description": "boundary point is invalid",
-                "data": 3.0,
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/3rdparty/rapidjson/bin/jsonschema/tests/draft4/minItems.json b/3rdparty/rapidjson/bin/jsonschema/tests/draft4/minItems.json
deleted file mode 100644
index ed5118815ee..00000000000
--- a/3rdparty/rapidjson/bin/jsonschema/tests/draft4/minItems.json
+++ /dev/null
@@ -1,28 +0,0 @@
-[
-    {
-        "description": "minItems validation",
-        "schema": {"minItems": 1},
-        "tests": [
-            {
-                "description": "longer is valid",
-                "data": [1, 2],
-                "valid": true
-            },
-            {
-                "description": "exact length is valid",
-                "data": [1],
-                "valid": true
-            },
-            {
-                "description": "too short is invalid",
-                "data": [],
-                "valid": false
-            },
-            {
-                "description": "ignores non-arrays",
-                "data": "",
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/3rdparty/rapidjson/bin/jsonschema/tests/draft4/minLength.json b/3rdparty/rapidjson/bin/jsonschema/tests/draft4/minLength.json
deleted file mode 100644
index 3f09158deef..00000000000
--- a/3rdparty/rapidjson/bin/jsonschema/tests/draft4/minLength.json
+++ /dev/null
@@ -1,33 +0,0 @@
-[
-    {
-        "description": "minLength validation",
-        "schema": {"minLength": 2},
-        "tests": [
-            {
-                "description": "longer is valid",
-                "data": "foo",
-                "valid": true
-            },
-            {
-                "description": "exact length is valid",
-                "data": "fo",
-                "valid": true
-            },
-            {
-                "description": "too short is invalid",
-                "data": "f",
-                "valid": false
-            },
-            {
-                "description": "ignores non-strings",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "one supplementary Unicode code point is not long enough",
-                "data": "\uD83D\uDCA9",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/3rdparty/rapidjson/bin/jsonschema/tests/draft4/minProperties.json b/3rdparty/rapidjson/bin/jsonschema/tests/draft4/minProperties.json
deleted file mode 100644
index a72c7d293e6..00000000000
--- a/3rdparty/rapidjson/bin/jsonschema/tests/draft4/minProperties.json
+++ /dev/null
@@ -1,28 +0,0 @@
-[
-    {
-        "description": "minProperties validation",
-        "schema": {"minProperties": 1},
-        "tests": [
-            {
-                "description": "longer is valid",
-                "data": {"foo": 1, "bar": 2},
-                "valid": true
-            },
-            {
-                "description": "exact length is valid",
-                "data": {"foo": 1},
-                "valid": true
-            },
-            {
-                "description": "too short is invalid",
-                "data": {},
-                "valid": false
-            },
-            {
-                "description": "ignores non-objects",
-                "data": "",
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/3rdparty/rapidjson/bin/jsonschema/tests/draft4/minimum.json b/3rdparty/rapidjson/bin/jsonschema/tests/draft4/minimum.json
deleted file mode 100644
index d5bf000bcc6..00000000000
--- a/3rdparty/rapidjson/bin/jsonschema/tests/draft4/minimum.json
+++ /dev/null
@@ -1,42 +0,0 @@
-[
-    {
-        "description": "minimum validation",
-        "schema": {"minimum": 1.1},
-        "tests": [
-            {
-                "description": "above the minimum is valid",
-                "data": 2.6,
-                "valid": true
-            },
-            {
-                "description": "below the minimum is invalid",
-                "data": 0.6,
-                "valid": false
-            },
-            {
-                "description": "ignores non-numbers",
-                "data": "x",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "exclusiveMinimum validation",
-        "schema": {
-            "minimum": 1.1,
-            "exclusiveMinimum": true
-        },
-        "tests": [
-            {
-                "description": "above the minimum is still valid",
-                "data": 1.2,
-                "valid": true
-            },
-            {
-                "description": "boundary point is invalid",
-                "data": 1.1,
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/3rdparty/rapidjson/bin/jsonschema/tests/draft4/multipleOf.json b/3rdparty/rapidjson/bin/jsonschema/tests/draft4/multipleOf.json
deleted file mode 100644
index ca3b7618053..00000000000
--- a/3rdparty/rapidjson/bin/jsonschema/tests/draft4/multipleOf.json
+++ /dev/null
@@ -1,60 +0,0 @@
-[
-    {
-        "description": "by int",
-        "schema": {"multipleOf": 2},
-        "tests": [
-            {
-                "description": "int by int",
-                "data": 10,
-                "valid": true
-            },
-            {
-                "description": "int by int fail",
-                "data": 7,
-                "valid": false
-            },
-            {
-                "description": "ignores non-numbers",
-                "data": "foo",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "by number",
-        "schema": {"multipleOf": 1.5},
-        "tests": [
-            {
-                "description": "zero is multiple of anything",
-                "data": 0,
-                "valid": true
-            },
-            {
-                "description": "4.5 is multiple of 1.5",
-                "data": 4.5,
-                "valid": true
-            },
-            {
-                "description": "35 is not multiple of 1.5",
-                "data": 35,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "by small number",
-        "schema": {"multipleOf": 0.0001},
-        "tests": [
-            {
-                "description": "0.0075 is multiple of 0.0001",
-                "data": 0.0075,
-                "valid": true
-            },
-            {
-                "description": "0.00751 is not multiple of 0.0001",
-                "data": 0.00751,
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/3rdparty/rapidjson/bin/jsonschema/tests/draft4/not.json b/3rdparty/rapidjson/bin/jsonschema/tests/draft4/not.json
deleted file mode 100644
index cbb7f46bf8b..00000000000
--- a/3rdparty/rapidjson/bin/jsonschema/tests/draft4/not.json
+++ /dev/null
@@ -1,96 +0,0 @@
-[
-    {
-        "description": "not",
-        "schema": {
-            "not": {"type": "integer"}
-        },
-        "tests": [
-            {
-                "description": "allowed",
-                "data": "foo",
-                "valid": true
-            },
-            {
-                "description": "disallowed",
-                "data": 1,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "not multiple types",
-        "schema": {
-            "not": {"type": ["integer", "boolean"]}
-        },
-        "tests": [
-            {
-                "description": "valid",
-                "data": "foo",
-                "valid": true
-            },
-            {
-                "description": "mismatch",
-                "data": 1,
-                "valid": false
-            },
-            {
-                "description": "other mismatch",
-                "data": true,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "not more complex schema",
-        "schema": {
-            "not": {
-                "type": "object",
-                "properties": {
-                    "foo": {
-                        "type": "string"
-                    }
-                }
-             }
-        },
-        "tests": [
-            {
-                "description": "match",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "other match",
-                "data": {"foo": 1},
-                "valid": true
-            },
-            {
-                "description": "mismatch",
-                "data": {"foo": "bar"},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "forbidden property",
-        "schema": {
-            "properties": {
-                "foo": { 
-                    "not": {}
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "property present",
-                "data": {"foo": 1, "bar": 2},
-                "valid": false
-            },
-            {
-                "description": "property absent",
-                "data": {"bar": 1, "baz": 2},
-                "valid": true
-            }
-        ]
-    }
-
-]
diff --git a/3rdparty/rapidjson/bin/jsonschema/tests/draft4/oneOf.json b/3rdparty/rapidjson/bin/jsonschema/tests/draft4/oneOf.json
deleted file mode 100644
index 1eaa4e47949..00000000000
--- a/3rdparty/rapidjson/bin/jsonschema/tests/draft4/oneOf.json
+++ /dev/null
@@ -1,68 +0,0 @@
-[
-    {
-        "description": "oneOf",
-        "schema": {
-            "oneOf": [
-                {
-                    "type": "integer"
-                },
-                {
-                    "minimum": 2
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "first oneOf valid",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "second oneOf valid",
-                "data": 2.5,
-                "valid": true
-            },
-            {
-                "description": "both oneOf valid",
-                "data": 3,
-                "valid": false
-            },
-            {
-                "description": "neither oneOf valid",
-                "data": 1.5,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "oneOf with base schema",
-        "schema": {
-            "type": "string",
-            "oneOf" : [
-                {
-                    "minLength": 2
-                },
-                {
-                    "maxLength": 4
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "mismatch base schema",
-                "data": 3,
-                "valid": false
-            },
-            {
-                "description": "one oneOf valid",
-                "data": "foobar",
-                "valid": true
-            },
-            {
-                "description": "both oneOf valid",
-                "data": "foo",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/3rdparty/rapidjson/bin/jsonschema/tests/draft4/optional/bignum.json b/3rdparty/rapidjson/bin/jsonschema/tests/draft4/optional/bignum.json
deleted file mode 100644
index ccc7c17fe8d..00000000000
--- a/3rdparty/rapidjson/bin/jsonschema/tests/draft4/optional/bignum.json
+++ /dev/null
@@ -1,107 +0,0 @@
-[
-    {
-        "description": "integer",
-        "schema": {"type": "integer"},
-        "tests": [
-            {
-                "description": "a bignum is an integer",
-                "data": 12345678910111213141516171819202122232425262728293031,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "number",
-        "schema": {"type": "number"},
-        "tests": [
-            {
-                "description": "a bignum is a number",
-                "data": 98249283749234923498293171823948729348710298301928331,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "integer",
-        "schema": {"type": "integer"},
-        "tests": [
-            {
-                "description": "a negative bignum is an integer",
-                "data": -12345678910111213141516171819202122232425262728293031,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "number",
-        "schema": {"type": "number"},
-        "tests": [
-            {
-                "description": "a negative bignum is a number",
-                "data": -98249283749234923498293171823948729348710298301928331,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "string",
-        "schema": {"type": "string"},
-        "tests": [
-            {
-                "description": "a bignum is not a string",
-                "data": 98249283749234923498293171823948729348710298301928331,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "integer comparison",
-        "schema": {"maximum": 18446744073709551615},
-        "tests": [
-            {
-                "description": "comparison works for high numbers",
-                "data": 18446744073709551600,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "float comparison with high precision",
-        "schema": {
-            "maximum": 972783798187987123879878123.18878137,
-            "exclusiveMaximum": true
-        },
-        "tests": [
-            {
-                "description": "comparison works for high numbers",
-                "data": 972783798187987123879878123.188781371,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "integer comparison",
-        "schema": {"minimum": -18446744073709551615},
-        "tests": [
-            {
-                "description": "comparison works for very negative numbers",
-                "data": -18446744073709551600,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "float comparison with high precision on negative numbers",
-        "schema": {
-            "minimum": -972783798187987123879878123.18878137,
-            "exclusiveMinimum": true
-        },
-        "tests": [
-            {
-                "description": "comparison works for very negative numbers",
-                "data": -972783798187987123879878123.188781371,
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/3rdparty/rapidjson/bin/jsonschema/tests/draft4/optional/format.json b/3rdparty/rapidjson/bin/jsonschema/tests/draft4/optional/format.json
deleted file mode 100644
index aacfd119843..00000000000
--- a/3rdparty/rapidjson/bin/jsonschema/tests/draft4/optional/format.json
+++ /dev/null
@@ -1,148 +0,0 @@
-[
-    {
-        "description": "validation of date-time strings",
-        "schema": {"format": "date-time"},
-        "tests": [
-            {
-                "description": "a valid date-time string",
-                "data": "1963-06-19T08:30:06.283185Z",
-                "valid": true
-            },
-            {
-                "description": "an invalid date-time string",
-                "data": "06/19/1963 08:30:06 PST",
-                "valid": false
-            },
-            {
-                "description": "only RFC3339 not all of ISO 8601 are valid",
-                "data": "2013-350T01:01:01",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "validation of URIs",
-        "schema": {"format": "uri"},
-        "tests": [
-            {
-                "description": "a valid URI",
-                "data": "http://foo.bar/?baz=qux#quux",
-                "valid": true
-            },
-            {
-                "description": "a valid protocol-relative URI",
-                "data": "//foo.bar/?baz=qux#quux",
-                "valid": true
-            },
-            {
-                "description": "an invalid URI",
-                "data": "\\\\WINDOWS\\fileshare",
-                "valid": false
-            },
-            {
-                "description": "an invalid URI though valid URI reference",
-                "data": "abc",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "validation of e-mail addresses",
-        "schema": {"format": "email"},
-        "tests": [
-            {
-                "description": "a valid e-mail address",
-                "data": "joe.bloggs@example.com",
-                "valid": true
-            },
-            {
-                "description": "an invalid e-mail address",
-                "data": "2962",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "validation of IP addresses",
-        "schema": {"format": "ipv4"},
-        "tests": [
-            {
-                "description": "a valid IP address",
-                "data": "192.168.0.1",
-                "valid": true
-            },
-            {
-                "description": "an IP address with too many components",
-                "data": "127.0.0.0.1",
-                "valid": false
-            },
-            {
-                "description": "an IP address with out-of-range values",
-                "data": "256.256.256.256",
-                "valid": false
-            },
-            {
-                "description": "an IP address without 4 components",
-                "data": "127.0",
-                "valid": false
-            },
-            {
-                "description": "an IP address as an integer",
-                "data": "0x7f000001",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "validation of IPv6 addresses",
-        "schema": {"format": "ipv6"},
-        "tests": [
-            {
-                "description": "a valid IPv6 address",
-                "data": "::1",
-                "valid": true
-            },
-            {
-                "description": "an IPv6 address with out-of-range values",
-                "data": "12345::",
-                "valid": false
-            },
-            {
-                "description": "an IPv6 address with too many components",
-                "data": "1:1:1:1:1:1:1:1:1:1:1:1:1:1:1:1",
-                "valid": false
-            },
-            {
-                "description": "an IPv6 address containing illegal characters",
-                "data": "::laptop",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "validation of host names",
-        "schema": {"format": "hostname"},
-        "tests": [
-            {
-                "description": "a valid host name",
-                "data": "www.example.com",
-                "valid": true
-            },
-            {
-                "description": "a host name starting with an illegal character",
-                "data": "-a-host-name-that-starts-with--",
-                "valid": false
-            },
-            {
-                "description": "a host name containing illegal characters",
-                "data": "not_a_valid_host_name",
-                "valid": false
-            },
-            {
-                "description": "a host name with a component too long",
-                "data": "a-vvvvvvvvvvvvvvvveeeeeeeeeeeeeeeerrrrrrrrrrrrrrrryyyyyyyyyyyyyyyy-long-host-name-component",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/3rdparty/rapidjson/bin/jsonschema/tests/draft4/optional/zeroTerminatedFloats.json b/3rdparty/rapidjson/bin/jsonschema/tests/draft4/optional/zeroTerminatedFloats.json
deleted file mode 100644
index 9b50ea27769..00000000000
--- a/3rdparty/rapidjson/bin/jsonschema/tests/draft4/optional/zeroTerminatedFloats.json
+++ /dev/null
@@ -1,15 +0,0 @@
-[
-    {
-        "description": "some languages do not distinguish between different types of numeric value",
-        "schema": {
-            "type": "integer"
-        },
-        "tests": [
-            {
-                "description": "a float is not an integer even without fractional part",
-                "data": 1.0,
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/3rdparty/rapidjson/bin/jsonschema/tests/draft4/pattern.json b/3rdparty/rapidjson/bin/jsonschema/tests/draft4/pattern.json
deleted file mode 100644
index 25e72997314..00000000000
--- a/3rdparty/rapidjson/bin/jsonschema/tests/draft4/pattern.json
+++ /dev/null
@@ -1,34 +0,0 @@
-[
-    {
-        "description": "pattern validation",
-        "schema": {"pattern": "^a*$"},
-        "tests": [
-            {
-                "description": "a matching pattern is valid",
-                "data": "aaa",
-                "valid": true
-            },
-            {
-                "description": "a non-matching pattern is invalid",
-                "data": "abc",
-                "valid": false
-            },
-            {
-                "description": "ignores non-strings",
-                "data": true,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "pattern is not anchored",
-        "schema": {"pattern": "a+"},
-        "tests": [
-            {
-                "description": "matches a substring",
-                "data": "xxaayy",
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/3rdparty/rapidjson/bin/jsonschema/tests/draft4/patternProperties.json b/3rdparty/rapidjson/bin/jsonschema/tests/draft4/patternProperties.json
deleted file mode 100644
index 18586e5daba..00000000000
--- a/3rdparty/rapidjson/bin/jsonschema/tests/draft4/patternProperties.json
+++ /dev/null
@@ -1,110 +0,0 @@
-[
-    {
-        "description":
-            "patternProperties validates properties matching a regex",
-        "schema": {
-            "patternProperties": {
-                "f.*o": {"type": "integer"}
-            }
-        },
-        "tests": [
-            {
-                "description": "a single valid match is valid",
-                "data": {"foo": 1},
-                "valid": true
-            },
-            {
-                "description": "multiple valid matches is valid",
-                "data": {"foo": 1, "foooooo" : 2},
-                "valid": true
-            },
-            {
-                "description": "a single invalid match is invalid",
-                "data": {"foo": "bar", "fooooo": 2},
-                "valid": false
-            },
-            {
-                "description": "multiple invalid matches is invalid",
-                "data": {"foo": "bar", "foooooo" : "baz"},
-                "valid": false
-            },
-            {
-                "description": "ignores non-objects",
-                "data": 12,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "multiple simultaneous patternProperties are validated",
-        "schema": {
-            "patternProperties": {
-                "a*": {"type": "integer"},
-                "aaa*": {"maximum": 20}
-            }
-        },
-        "tests": [
-            {
-                "description": "a single valid match is valid",
-                "data": {"a": 21},
-                "valid": true
-            },
-            {
-                "description": "a simultaneous match is valid",
-                "data": {"aaaa": 18},
-                "valid": true
-            },
-            {
-                "description": "multiple matches is valid",
-                "data": {"a": 21, "aaaa": 18},
-                "valid": true
-            },
-            {
-                "description": "an invalid due to one is invalid",
-                "data": {"a": "bar"},
-                "valid": false
-            },
-            {
-                "description": "an invalid due to the other is invalid",
-                "data": {"aaaa": 31},
-                "valid": false
-            },
-            {
-                "description": "an invalid due to both is invalid",
-                "data": {"aaa": "foo", "aaaa": 31},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "regexes are not anchored by default and are case sensitive",
-        "schema": {
-            "patternProperties": {
-                "[0-9]{2,}": { "type": "boolean" },
-                "X_": { "type": "string" }
-            }
-        },
-        "tests": [
-            {
-                "description": "non recognized members are ignored",
-                "data": { "answer 1": "42" },
-                "valid": true
-            },
-            {
-                "description": "recognized members are accounted for",
-                "data": { "a31b": null },
-                "valid": false
-            },
-            {
-                "description": "regexes are case sensitive",
-                "data": { "a_x_3": 3 },
-                "valid": true
-            },
-            {
-                "description": "regexes are case sensitive, 2",
-                "data": { "a_X_3": 3 },
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/3rdparty/rapidjson/bin/jsonschema/tests/draft4/properties.json b/3rdparty/rapidjson/bin/jsonschema/tests/draft4/properties.json
deleted file mode 100644
index cd1644dcd91..00000000000
--- a/3rdparty/rapidjson/bin/jsonschema/tests/draft4/properties.json
+++ /dev/null
@@ -1,92 +0,0 @@
-[
-    {
-        "description": "object properties validation",
-        "schema": {
-            "properties": {
-                "foo": {"type": "integer"},
-                "bar": {"type": "string"}
-            }
-        },
-        "tests": [
-            {
-                "description": "both properties present and valid is valid",
-                "data": {"foo": 1, "bar": "baz"},
-                "valid": true
-            },
-            {
-                "description": "one property invalid is invalid",
-                "data": {"foo": 1, "bar": {}},
-                "valid": false
-            },
-            {
-                "description": "both properties invalid is invalid",
-                "data": {"foo": [], "bar": {}},
-                "valid": false
-            },
-            {
-                "description": "doesn't invalidate other properties",
-                "data": {"quux": []},
-                "valid": true
-            },
-            {
-                "description": "ignores non-objects",
-                "data": [],
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description":
-            "properties, patternProperties, additionalProperties interaction",
-        "schema": {
-            "properties": {
-                "foo": {"type": "array", "maxItems": 3},
-                "bar": {"type": "array"}
-            },
-            "patternProperties": {"f.o": {"minItems": 2}},
-            "additionalProperties": {"type": "integer"}
-        },
-        "tests": [
-            {
-                "description": "property validates property",
-                "data": {"foo": [1, 2]},
-                "valid": true
-            },
-            {
-                "description": "property invalidates property",
-                "data": {"foo": [1, 2, 3, 4]},
-                "valid": false
-            },
-            {
-                "description": "patternProperty invalidates property",
-                "data": {"foo": []},
-                "valid": false
-            },
-            {
-                "description": "patternProperty validates nonproperty",
-                "data": {"fxo": [1, 2]},
-                "valid": true
-            },
-            {
-                "description": "patternProperty invalidates nonproperty",
-                "data": {"fxo": []},
-                "valid": false
-            },
-            {
-                "description": "additionalProperty ignores property",
-                "data": {"bar": []},
-                "valid": true
-            },
-            {
-                "description": "additionalProperty validates others",
-                "data": {"quux": 3},
-                "valid": true
-            },
-            {
-                "description": "additionalProperty invalidates others",
-                "data": {"quux": "foo"},
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/3rdparty/rapidjson/bin/jsonschema/tests/draft4/ref.json b/3rdparty/rapidjson/bin/jsonschema/tests/draft4/ref.json
deleted file mode 100644
index 7e805522492..00000000000
--- a/3rdparty/rapidjson/bin/jsonschema/tests/draft4/ref.json
+++ /dev/null
@@ -1,159 +0,0 @@
-[
-    {
-        "description": "root pointer ref",
-        "schema": {
-            "properties": {
-                "foo": {"$ref": "#"}
-            },
-            "additionalProperties": false
-        },
-        "tests": [
-            {
-                "description": "match",
-                "data": {"foo": false},
-                "valid": true
-            },
-            {
-                "description": "recursive match",
-                "data": {"foo": {"foo": false}},
-                "valid": true
-            },
-            {
-                "description": "mismatch",
-                "data": {"bar": false},
-                "valid": false
-            },
-            {
-                "description": "recursive mismatch",
-                "data": {"foo": {"bar": false}},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "relative pointer ref to object",
-        "schema": {
-            "properties": {
-                "foo": {"type": "integer"},
-                "bar": {"$ref": "#/properties/foo"}
-            }
-        },
-        "tests": [
-            {
-                "description": "match",
-                "data": {"bar": 3},
-                "valid": true
-            },
-            {
-                "description": "mismatch",
-                "data": {"bar": true},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "relative pointer ref to array",
-        "schema": {
-            "items": [
-                {"type": "integer"},
-                {"$ref": "#/items/0"}
-            ]
-        },
-        "tests": [
-            {
-                "description": "match array",
-                "data": [1, 2],
-                "valid": true
-            },
-            {
-                "description": "mismatch array",
-                "data": [1, "foo"],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "escaped pointer ref",
-        "schema": {
-            "tilda~field": {"type": "integer"},
-            "slash/field": {"type": "integer"},
-            "percent%field": {"type": "integer"},
-            "properties": {
-                "tilda": {"$ref": "#/tilda~0field"},
-                "slash": {"$ref": "#/slash~1field"},
-                "percent": {"$ref": "#/percent%25field"}
-            }
-        },
-        "tests": [
-            {
-                "description": "slash invalid",
-                "data": {"slash": "aoeu"},
-                "valid": false
-            },
-            {
-                "description": "tilda invalid",
-                "data": {"tilda": "aoeu"},
-                "valid": false
-            },
-            {
-                "description": "percent invalid",
-                "data": {"percent": "aoeu"},
-                "valid": false
-            },
-            {
-                "description": "slash valid",
-                "data": {"slash": 123},
-                "valid": true
-            },
-            {
-                "description": "tilda valid",
-                "data": {"tilda": 123},
-                "valid": true
-            },
-            {
-                "description": "percent valid",
-                "data": {"percent": 123},
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "nested refs",
-        "schema": {
-            "definitions": {
-                "a": {"type": "integer"},
-                "b": {"$ref": "#/definitions/a"},
-                "c": {"$ref": "#/definitions/b"}
-            },
-            "$ref": "#/definitions/c"
-        },
-        "tests": [
-            {
-                "description": "nested ref valid",
-                "data": 5,
-                "valid": true
-            },
-            {
-                "description": "nested ref invalid",
-                "data": "a",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "remote ref, containing refs itself",
-        "schema": {"$ref": "http://json-schema.org/draft-04/schema#"},
-        "tests": [
-            {
-                "description": "remote ref valid",
-                "data": {"minLength": 1},
-                "valid": true
-            },
-            {
-                "description": "remote ref invalid",
-                "data": {"minLength": -1},
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/3rdparty/rapidjson/bin/jsonschema/tests/draft4/refRemote.json b/3rdparty/rapidjson/bin/jsonschema/tests/draft4/refRemote.json
deleted file mode 100644
index 4ca804732c9..00000000000
--- a/3rdparty/rapidjson/bin/jsonschema/tests/draft4/refRemote.json
+++ /dev/null
@@ -1,74 +0,0 @@
-[
-    {
-        "description": "remote ref",
-        "schema": {"$ref": "http://localhost:1234/integer.json"},
-        "tests": [
-            {
-                "description": "remote ref valid",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "remote ref invalid",
-                "data": "a",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "fragment within remote ref",
-        "schema": {"$ref": "http://localhost:1234/subSchemas.json#/integer"},
-        "tests": [
-            {
-                "description": "remote fragment valid",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "remote fragment invalid",
-                "data": "a",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "ref within remote ref",
-        "schema": {
-            "$ref": "http://localhost:1234/subSchemas.json#/refToInteger"
-        },
-        "tests": [
-            {
-                "description": "ref within ref valid",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "ref within ref invalid",
-                "data": "a",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "change resolution scope",
-        "schema": {
-            "id": "http://localhost:1234/",
-            "items": {
-                "id": "folder/",
-                "items": {"$ref": "folderInteger.json"}
-            }
-        },
-        "tests": [
-            {
-                "description": "changed scope ref valid",
-                "data": [[1]],
-                "valid": true
-            },
-            {
-                "description": "changed scope ref invalid",
-                "data": [["a"]],
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/3rdparty/rapidjson/bin/jsonschema/tests/draft4/required.json b/3rdparty/rapidjson/bin/jsonschema/tests/draft4/required.json
deleted file mode 100644
index 612f73f3472..00000000000
--- a/3rdparty/rapidjson/bin/jsonschema/tests/draft4/required.json
+++ /dev/null
@@ -1,39 +0,0 @@
-[
-    {
-        "description": "required validation",
-        "schema": {
-            "properties": {
-                "foo": {},
-                "bar": {}
-            },
-            "required": ["foo"]
-        },
-        "tests": [
-            {
-                "description": "present required property is valid",
-                "data": {"foo": 1},
-                "valid": true
-            },
-            {
-                "description": "non-present required property is invalid",
-                "data": {"bar": 1},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "required default validation",
-        "schema": {
-            "properties": {
-                "foo": {}
-            }
-        },
-        "tests": [
-            {
-                "description": "not required by default",
-                "data": {},
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/3rdparty/rapidjson/bin/jsonschema/tests/draft4/type.json b/3rdparty/rapidjson/bin/jsonschema/tests/draft4/type.json
deleted file mode 100644
index db42a44d3fa..00000000000
--- a/3rdparty/rapidjson/bin/jsonschema/tests/draft4/type.json
+++ /dev/null
@@ -1,330 +0,0 @@
-[
-    {
-        "description": "integer type matches integers",
-        "schema": {"type": "integer"},
-        "tests": [
-            {
-                "description": "an integer is an integer",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "a float is not an integer",
-                "data": 1.1,
-                "valid": false
-            },
-            {
-                "description": "a string is not an integer",
-                "data": "foo",
-                "valid": false
-            },
-            {
-                "description": "an object is not an integer",
-                "data": {},
-                "valid": false
-            },
-            {
-                "description": "an array is not an integer",
-                "data": [],
-                "valid": false
-            },
-            {
-                "description": "a boolean is not an integer",
-                "data": true,
-                "valid": false
-            },
-            {
-                "description": "null is not an integer",
-                "data": null,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "number type matches numbers",
-        "schema": {"type": "number"},
-        "tests": [
-            {
-                "description": "an integer is a number",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "a float is a number",
-                "data": 1.1,
-                "valid": true
-            },
-            {
-                "description": "a string is not a number",
-                "data": "foo",
-                "valid": false
-            },
-            {
-                "description": "an object is not a number",
-                "data": {},
-                "valid": false
-            },
-            {
-                "description": "an array is not a number",
-                "data": [],
-                "valid": false
-            },
-            {
-                "description": "a boolean is not a number",
-                "data": true,
-                "valid": false
-            },
-            {
-                "description": "null is not a number",
-                "data": null,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "string type matches strings",
-        "schema": {"type": "string"},
-        "tests": [
-            {
-                "description": "1 is not a string",
-                "data": 1,
-                "valid": false
-            },
-            {
-                "description": "a float is not a string",
-                "data": 1.1,
-                "valid": false
-            },
-            {
-                "description": "a string is a string",
-                "data": "foo",
-                "valid": true
-            },
-            {
-                "description": "an object is not a string",
-                "data": {},
-                "valid": false
-            },
-            {
-                "description": "an array is not a string",
-                "data": [],
-                "valid": false
-            },
-            {
-                "description": "a boolean is not a string",
-                "data": true,
-                "valid": false
-            },
-            {
-                "description": "null is not a string",
-                "data": null,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "object type matches objects",
-        "schema": {"type": "object"},
-        "tests": [
-            {
-                "description": "an integer is not an object",
-                "data": 1,
-                "valid": false
-            },
-            {
-                "description": "a float is not an object",
-                "data": 1.1,
-                "valid": false
-            },
-            {
-                "description": "a string is not an object",
-                "data": "foo",
-                "valid": false
-            },
-            {
-                "description": "an object is an object",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "an array is not an object",
-                "data": [],
-                "valid": false
-            },
-            {
-                "description": "a boolean is not an object",
-                "data": true,
-                "valid": false
-            },
-            {
-                "description": "null is not an object",
-                "data": null,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "array type matches arrays",
-        "schema": {"type": "array"},
-        "tests": [
-            {
-                "description": "an integer is not an array",
-                "data": 1,
-                "valid": false
-            },
-            {
-                "description": "a float is not an array",
-                "data": 1.1,
-                "valid": false
-            },
-            {
-                "description": "a string is not an array",
-                "data": "foo",
-                "valid": false
-            },
-            {
-                "description": "an object is not an array",
-                "data": {},
-                "valid": false
-            },
-            {
-                "description": "an array is an array",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "a boolean is not an array",
-                "data": true,
-                "valid": false
-            },
-            {
-                "description": "null is not an array",
-                "data": null,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "boolean type matches booleans",
-        "schema": {"type": "boolean"},
-        "tests": [
-            {
-                "description": "an integer is not a boolean",
-                "data": 1,
-                "valid": false
-            },
-            {
-                "description": "a float is not a boolean",
-                "data": 1.1,
-                "valid": false
-            },
-            {
-                "description": "a string is not a boolean",
-                "data": "foo",
-                "valid": false
-            },
-            {
-                "description": "an object is not a boolean",
-                "data": {},
-                "valid": false
-            },
-            {
-                "description": "an array is not a boolean",
-                "data": [],
-                "valid": false
-            },
-            {
-                "description": "a boolean is a boolean",
-                "data": true,
-                "valid": true
-            },
-            {
-                "description": "null is not a boolean",
-                "data": null,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "null type matches only the null object",
-        "schema": {"type": "null"},
-        "tests": [
-            {
-                "description": "an integer is not null",
-                "data": 1,
-                "valid": false
-            },
-            {
-                "description": "a float is not null",
-                "data": 1.1,
-                "valid": false
-            },
-            {
-                "description": "a string is not null",
-                "data": "foo",
-                "valid": false
-            },
-            {
-                "description": "an object is not null",
-                "data": {},
-                "valid": false
-            },
-            {
-                "description": "an array is not null",
-                "data": [],
-                "valid": false
-            },
-            {
-                "description": "a boolean is not null",
-                "data": true,
-                "valid": false
-            },
-            {
-                "description": "null is null",
-                "data": null,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "multiple types can be specified in an array",
-        "schema": {"type": ["integer", "string"]},
-        "tests": [
-            {
-                "description": "an integer is valid",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "a string is valid",
-                "data": "foo",
-                "valid": true
-            },
-            {
-                "description": "a float is invalid",
-                "data": 1.1,
-                "valid": false
-            },
-            {
-                "description": "an object is invalid",
-                "data": {},
-                "valid": false
-            },
-            {
-                "description": "an array is invalid",
-                "data": [],
-                "valid": false
-            },
-            {
-                "description": "a boolean is invalid",
-                "data": true,
-                "valid": false
-            },
-            {
-                "description": "null is invalid",
-                "data": null,
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/3rdparty/rapidjson/bin/jsonschema/tests/draft4/uniqueItems.json b/3rdparty/rapidjson/bin/jsonschema/tests/draft4/uniqueItems.json
deleted file mode 100644
index c1f4ab99c9a..00000000000
--- a/3rdparty/rapidjson/bin/jsonschema/tests/draft4/uniqueItems.json
+++ /dev/null
@@ -1,79 +0,0 @@
-[
-    {
-        "description": "uniqueItems validation",
-        "schema": {"uniqueItems": true},
-        "tests": [
-            {
-                "description": "unique array of integers is valid",
-                "data": [1, 2],
-                "valid": true
-            },
-            {
-                "description": "non-unique array of integers is invalid",
-                "data": [1, 1],
-                "valid": false
-            },
-            {
-                "description": "numbers are unique if mathematically unequal",
-                "data": [1.0, 1.00, 1],
-                "valid": false
-            },
-            {
-                "description": "unique array of objects is valid",
-                "data": [{"foo": "bar"}, {"foo": "baz"}],
-                "valid": true
-            },
-            {
-                "description": "non-unique array of objects is invalid",
-                "data": [{"foo": "bar"}, {"foo": "bar"}],
-                "valid": false
-            },
-            {
-                "description": "unique array of nested objects is valid",
-                "data": [
-                    {"foo": {"bar" : {"baz" : true}}},
-                    {"foo": {"bar" : {"baz" : false}}}
-                ],
-                "valid": true
-            },
-            {
-                "description": "non-unique array of nested objects is invalid",
-                "data": [
-                    {"foo": {"bar" : {"baz" : true}}},
-                    {"foo": {"bar" : {"baz" : true}}}
-                ],
-                "valid": false
-            },
-            {
-                "description": "unique array of arrays is valid",
-                "data": [["foo"], ["bar"]],
-                "valid": true
-            },
-            {
-                "description": "non-unique array of arrays is invalid",
-                "data": [["foo"], ["foo"]],
-                "valid": false
-            },
-            {
-                "description": "1 and true are unique",
-                "data": [1, true],
-                "valid": true
-            },
-            {
-                "description": "0 and false are unique",
-                "data": [0, false],
-                "valid": true
-            },
-            {
-                "description": "unique heterogeneous types are valid",
-                "data": [{}, [1], true, null, 1],
-                "valid": true
-            },
-            {
-                "description": "non-unique heterogeneous types are invalid",
-                "data": [{}, [1], true, null, {}, 1],
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/3rdparty/rapidjson/bin/jsonschema/tox.ini b/3rdparty/rapidjson/bin/jsonschema/tox.ini
deleted file mode 100644
index 5301222a840..00000000000
--- a/3rdparty/rapidjson/bin/jsonschema/tox.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[tox]
-minversion = 1.6
-envlist = py27
-skipsdist = True
-
-[testenv]
-deps = jsonschema
-commands = {envpython} bin/jsonschema_suite check
diff --git a/3rdparty/rapidjson/bin/types/booleans.json b/3rdparty/rapidjson/bin/types/booleans.json
deleted file mode 100644
index 6ba33199d12..00000000000
--- a/3rdparty/rapidjson/bin/types/booleans.json
+++ /dev/null
@@ -1,102 +0,0 @@
-[
-  true,
-  true,
-  false,
-  false,
-  true,
-  true,
-  true,
-  false,
-  false,
-  true,
-  false,
-  false,
-  true,
-  false,
-  false,
-  false,
-  true,
-  false,
-  false,
-  true,
-  true,
-  false,
-  true,
-  true,
-  true,
-  false,
-  false,
-  false,
-  true,
-  false,
-  true,
-  false,
-  false,
-  true,
-  true,
-  true,
-  true,
-  true,
-  true,
-  false,
-  false,
-  true,
-  false,
-  false,
-  false,
-  true,
-  true,
-  false,
-  true,
-  true,
-  false,
-  true,
-  false,
-  true,
-  true,
-  true,
-  false,
-  false,
-  false,
-  true,
-  false,
-  false,
-  false,
-  true,
-  true,
-  false,
-  true,
-  true,
-  true,
-  true,
-  true,
-  true,
-  true,
-  true,
-  false,
-  false,
-  false,
-  false,
-  false,
-  true,
-  true,
-  true,
-  true,
-  true,
-  true,
-  true,
-  false,
-  false,
-  false,
-  true,
-  false,
-  false,
-  false,
-  true,
-  true,
-  true,
-  false,
-  false,
-  true,
-  false
-]
\ No newline at end of file
diff --git a/3rdparty/rapidjson/bin/types/floats.json b/3rdparty/rapidjson/bin/types/floats.json
deleted file mode 100644
index b46c682be57..00000000000
--- a/3rdparty/rapidjson/bin/types/floats.json
+++ /dev/null
@@ -1,102 +0,0 @@
-[
-  135.747111636,
-  123.377054008,
-  140.527504552,
-  -72.299143906,
-  -23.851678949,
-  73.586193519,
-  -158.299382442,
-  177.477876032,
-  32.268518982,
-  -139.560009969,
-  115.203105183,
-  -106.025823607,
-  167.224138231,
-  103.378383732,
-  -97.498486285,
-  18.184723416,
-  69.137075711,
-  33.849002681,
-  -120.185228215,
-  -20.841408615,
-  -172.659492727,
-  -2.691464061,
-  22.426164066,
-  -98.416909437,
-  -31.603082708,
-  -85.072296561,
-  108.620987395,
-  -43.127078238,
-  -126.473562057,
-  -158.595489097,
-  -57.890678254,
-  -13.254016573,
-  -85.024504709,
-  171.663552644,
-  -146.495558248,
-  -10.606748276,
-  -118.786969354,
-  153.352057804,
-  -45.215545083,
-  37.038725288,
-  106.344071897,
-  -64.607402031,
-  85.148030911,
-  28.897784566,
-  39.51082061,
-  20.450382102,
-  -113.174943618,
-  71.60785784,
-  -168.202648062,
-  -157.338200017,
-  10.879588527,
-  -114.261694831,
-  -5.622927072,
-  -173.330830616,
-  -29.47002003,
-  -39.829034201,
-  50.031545162,
-  82.815735508,
-  -119.188760828,
-  -48.455928081,
-  163.964263034,
-  46.30378861,
-  -26.248889762,
-  -47.354615322,
-  155.388677633,
-  -166.710356904,
-  42.987233558,
-  144.275297374,
-  37.394383186,
-  -122.550388725,
-  177.469945914,
-  101.104677413,
-  109.429869885,
-  -104.919625624,
-  147.522756541,
-  -81.294703727,
-  122.744731363,
-  81.803603684,
-  26.321556167,
-  147.045441354,
-  147.256895816,
-  -174.211095908,
-  52.518769316,
-  -78.58250334,
-  -173.356685435,
-  -107.728209264,
-  -69.982325771,
-  -113.776095893,
-  -35.785267074,
-  -105.748545976,
-  -30.206523864,
-  -76.185311723,
-  -126.400112781,
-  -26.864958639,
-  56.840053629,
-  93.781553535,
-  -116.002949803,
-  -46.617140948,
-  176.846840093,
-  -144.24821335
-]
diff --git a/3rdparty/rapidjson/bin/types/guids.json b/3rdparty/rapidjson/bin/types/guids.json
deleted file mode 100644
index 0f83f34e1e8..00000000000
--- a/3rdparty/rapidjson/bin/types/guids.json
+++ /dev/null
@@ -1,102 +0,0 @@
-[
-  "d35bf0d4-8d8f-4e17-a5c3-ad9bfd675266",
-  "db402774-eeb6-463b-9986-c458c44d8b5a",
-  "2a2e4101-b5f2-40b8-8750-e03f01661e60",
-  "76787cfa-f4eb-4d62-aaad-e1d588d00ad5",
-  "fd73894b-b500-4a7c-888c-06b5bd9cec65",
-  "cce1862a-cf31-4ef2-9e23-f1d23b4e6163",
-  "00a98bb0-2b6e-4368-8512-71c21aa87db7",
-  "ab9a8d69-cec7-4550-bd35-3ed678e22782",
-  "f18b48e1-5114-4fbe-9652-579e8d66950e",
-  "4efe3baa-7ac5-4d6a-a839-6b9cfe825764",
-  "b4aec119-5b0a-434c-b388-109816c482a5",
-  "e0ef0cbb-127a-4a28-9831-5741b4295275",
-  "d50286a5-cb7b-4c9e-be99-f214439bae8c",
-  "a981094c-f1ac-42ed-a9fa-86404c7210ff",
-  "2a34ee57-5815-4829-b77b-eeebaa8fe340",
-  "a0530d44-48f8-4eff-b9ea-8810c4308351",
-  "c6f91509-83e1-4ea1-9680-e667fbfd56ee",
-  "cab11402-dcdd-4454-b190-6da124947395",
-  "283d159c-2b18-4856-b4c7-5059252eaa15",
-  "146157c6-72a8-4051-9991-cb6ea6743d81",
-  "aef6f269-7306-4bd2-83f7-6d5605b5dc9a",
-  "37fe6027-d638-4017-80a9-e7b0567b278e",
-  "5003d731-33fb-4159-af61-d76348a44079",
-  "e0e06979-5f80-4713-9fe0-8a4d60dc89f8",
-  "7e85bdc3-0345-4cb6-9398-ccab06e79976",
-  "f2ebf5af-6568-4ffe-a46d-403863fd4b66",
-  "e0b5bb1c-b4dd-4535-9a9e-3c73f1167d46",
-  "c852d20b-6bcb-4b12-bd57-308296c64c5a",
-  "7ac3ae82-1818-49cd-a8a4-5ac77dfafd46",
-  "138004a9-76e2-4ad7-bd42-e74dabdbb803",
-  "ab25b5be-96be-45b0-b765-947b40ec36a6",
-  "08404734-fd57-499e-a4cf-71e9ec782ede",
-  "8dfdeb16-248b-4a21-bf89-2e22b11a4101",
-  "a0e44ef0-3b09-41e8-ad5d-ed8e6a1a2a67",
-  "a7981e49-188d-414a-9779-b1ad91e599d1",
-  "329186c0-bf27-4208-baf7-c0a0a5a2d5b7",
-  "cb5f3381-d33e-4b30-b1a9-f482623cad33",
-  "15031262-ca73-4e3c-bd0a-fcf89bdf0caf",
-  "6d7333d1-2e8c-4d78-bfde-5be47e70eb13",
-  "acaa160c-670a-4e8f-ac45-49416e77d5f9",
-  "228f87eb-cde4-4106-808b-2dbf3c7b6d2e",
-  "2ff830a3-5445-4d8e-b161-bddd30666697",
-  "f488bedd-ff6e-4108-b9a7-07f6da62f476",
-  "2e12b846-0a34-478e-adf7-a438493803e6",
-  "6686b8ef-7446-4d86-bd8c-df24119e3bfe",
-  "e474a5c5-5793-4d41-b4ab-5423acc56ef1",
-  "ac046573-e718-44dc-a0dc-9037eeaba6a9",
-  "6b0e9099-cf53-4d5a-8a71-977528628fcf",
-  "d51a3f22-0ff9-4087-ba9b-fcee2a2d8ade",
-  "bdc01286-3511-4d22-bfb8-76d01203d366",
-  "ca44eb84-17ff-4f27-8f1e-1bd25f4e8725",
-  "4e9a8c2f-be0b-4913-92d2-c801b9a50d04",
-  "7685d231-dadd-4041-9165-898397438ab7",
-  "86f0bf26-d66a-44d8-99f5-d6768addae3b",
-  "2ca1167c-72ba-45a0-aa42-faf033db0d0b",
-  "199a1182-ea55-49ff-ba51-71c29cdd0aac",
-  "be6a4dd2-c821-4aa0-8b83-d64d6644b5b2",
-  "4c5f4781-7f80-4daa-9c20-76b183000514",
-  "513b31bd-54fb-4d12-a427-42a7c13ff8e1",
-  "8e211bcb-d76c-4012-83ad-74dd7d23b687",
-  "44d5807e-0501-4f66-8779-e244d4fdca0a",
-  "db8cd555-0563-4b7b-b00c-eada300a7065",
-  "cb14d0c9-46cc-4797-bd3a-752b05629f07",
-  "4f68b3ef-ac9b-47a0-b6d7-57f398a5c6a5",
-  "77221aae-1bcf-471c-be45-7f31f733f9d6",
-  "42a7cac8-9e80-4c45-8c71-511d863c98ea",
-  "f9018d22-b82c-468c-bdb5-8864d5964801",
-  "75f4e9b8-62a2-4f21-ad8a-e19eff0419bc",
-  "9b7385c8-8653-4184-951c-b0ac1b36b42e",
-  "571018aa-ffbf-4b42-a16d-07b57a7f5f0e",
-  "35de4a2f-6bf1-45aa-b820-2a27ea833e44",
-  "0b8edb20-3bb4-4cb4-b089-31957466dbab",
-  "97da4778-9a7b-4140-a545-968148c81fb7",
-  "969f326c-8f2a-47c5-b41c-d9c2f06c9b9d",
-  "ae211037-8b53-4b17-bfc8-c06fc7774409",
-  "12c5c3c4-0bd5-45d3-bc1d-d04a3c65d3e6",
-  "ec02024f-ce43-4dd3-8169-a59f7baee043",
-  "5b6afe77-ce48-47ca-90a0-25cd10ca5ffd",
-  "2e3a61d4-6b8f-4d2f-ba86-878b4012efd8",
-  "19a88a67-a5d3-4647-898f-1cde07bce040",
-  "6db6f420-b5c8-48b9-bbb2-8864fe6fed65",
-  "5a45dbde-7b53-4f6b-b864-e3b63be3708a",
-  "c878321b-8a02-4239-9981-15760c2e7d15",
-  "4e36687f-8bf6-4b12-b496-3a8e382d067e",
-  "a59a63cd-43c0-4c6e-b208-6dbca86f8176",
-  "303308c4-2e4a-45b5-8bf3-3e66e9ad05a1",
-  "8b58fdf1-43a6-4c98-9547-6361b50791af",
-  "a3563591-72ed-42b5-8e41-bac1d76d70cf",
-  "38db8c78-3739-4f6e-8313-de4138082114",
-  "86615bea-7e73-4daf-95da-ae6b9eee1bbb",
-  "35d38e3e-076e-40dd-9aa8-05be2603bd59",
-  "9f84c62d-b454-4ba3-8c19-a01878985cdc",
-  "6721bbae-d765-4a06-8289-6fe46a1bf943",
-  "0837796f-d0dd-4e50-9b7c-1983e6cc7c48",
-  "021eb7d7-e869-49b9-80c3-9dd16ce2d981",
-  "819c56f8-e040-475d-aad5-c6d5e98b20aa",
-  "3a61ef02-735e-4229-937d-b3777a3f4e1f",
-  "79dfab84-12e6-4ec8-bfc8-460ae71e4eca",
-  "a106fabf-e149-476c-8053-b62388b6eb57",
-  "9a3900a5-bfb4-4de0-baa5-253a8bd0b634"
-]
\ No newline at end of file
diff --git a/3rdparty/rapidjson/bin/types/integers.json b/3rdparty/rapidjson/bin/types/integers.json
deleted file mode 100644
index 2d3aca096cf..00000000000
--- a/3rdparty/rapidjson/bin/types/integers.json
+++ /dev/null
@@ -1,102 +0,0 @@
-[
-  8125686,
-  8958709,
-  5976222,
-  1889524,
-  7968493,
-  1357486,
-  118415,
-  7081097,
-  4635968,
-  7555332,
-  2270233,
-  3428352,
-  8699968,
-  2087333,
-  7861337,
-  7554440,
-  2017031,
-  7981692,
-  6060687,
-  1877715,
-  3297474,
-  8373177,
-  6158629,
-  7853641,
-  3004441,
-  9650406,
-  2695251,
-  1180761,
-  4988426,
-  6043805,
-  8063373,
-  6103218,
-  2848339,
-  8188690,
-  9235573,
-  5949816,
-  6116081,
-  6471138,
-  3354531,
-  4787414,
-  9660600,
-  942529,
-  7278535,
-  7967399,
-  554292,
-  1436493,
-  267319,
-  2606657,
-  7900601,
-  4276634,
-  7996757,
-  8544466,
-  7266469,
-  3301373,
-  4005350,
-  6437652,
-  7717672,
-  7126292,
-  8588394,
-  2127902,
-  7410190,
-  1517806,
-  4583602,
-  3123440,
-  7747613,
-  5029464,
-  9834390,
-  3087227,
-  4913822,
-  7550487,
-  4518144,
-  5862588,
-  1778599,
-  9493290,
-  5588455,
-  3638706,
-  7394293,
-  4294719,
-  3837830,
-  6381878,
-  7175866,
-  8575492,
-  1415229,
-  1453733,
-  6972404,
-  9782571,
-  4234063,
-  7117418,
-  7293130,
-  8057071,
-  9345285,
-  7626648,
-  3358911,
-  4574537,
-  9371826,
-  7627107,
-  6154093,
-  5392367,
-  5398105,
-  6956377
-]
\ No newline at end of file
diff --git a/3rdparty/rapidjson/bin/types/mixed.json b/3rdparty/rapidjson/bin/types/mixed.json
deleted file mode 100644
index cec10a5660d..00000000000
--- a/3rdparty/rapidjson/bin/types/mixed.json
+++ /dev/null
@@ -1,592 +0,0 @@
-[
-  {
-    "favoriteFruit": "banana",
-    "greeting": "Hello, Kim! You have 10 unread messages.",
-    "friends": [
-      {
-        "name": "Higgins Rodriquez",
-        "id": 0
-      },
-      {
-        "name": "James Floyd",
-        "id": 1
-      },
-      {
-        "name": "Gay Stewart",
-        "id": 2
-      }
-    ],
-    "range": [
-      0,
-      1,
-      2,
-      3,
-      4,
-      5,
-      6,
-      7,
-      8,
-      9
-    ],
-    "tags": [
-      "pariatur",
-      "ad",
-      "eiusmod",
-      "sit",
-      "et",
-      "velit",
-      "culpa"
-    ],
-    "longitude": -57.919246,
-    "latitude": -36.022812,
-    "registered": "Friday, March 21, 2014 9:13 PM",
-    "about": "Laborum nulla aliquip ullamco proident excepteur est officia ipsum. Eiusmod exercitation minim ex do labore reprehenderit aliqua minim qui excepteur reprehenderit cupidatat. Sint enim exercitation duis id consequat nisi enim magna. Commodo aliqua id ipsum sit magna enim. Veniam officia in labore fugiat veniam ea laboris ex veniam duis.\r\n",
-    "address": "323 Pulaski Street, Ronco, North Carolina, 7701",
-    "phone": "+1 (919) 438-2678",
-    "email": "kim.griffith@cipromox.biz",
-    "company": "CIPROMOX",
-    "name": {
-      "last": "Griffith",
-      "first": "Kim"
-    },
-    "eyeColor": "green",
-    "age": 26,
-    "picture": "http://placehold.it/32x32",
-    "balance": "$1,283.55",
-    "isActive": false,
-    "guid": "10ab0392-c5e2-48a3-9473-aa725bad892d",
-    "index": 0,
-    "_id": "551b91198238a0bcf9a41133"
-  },
-  {
-    "favoriteFruit": "banana",
-    "greeting": "Hello, Skinner! You have 9 unread messages.",
-    "friends": [
-      {
-        "name": "Rhonda Justice",
-        "id": 0
-      },
-      {
-        "name": "Audra Castaneda",
-        "id": 1
-      },
-      {
-        "name": "Vicky Chavez",
-        "id": 2
-      }
-    ],
-    "range": [
-      0,
-      1,
-      2,
-      3,
-      4,
-      5,
-      6,
-      7,
-      8,
-      9
-    ],
-    "tags": [
-      "dolore",
-      "enim",
-      "sit",
-      "non",
-      "exercitation",
-      "fugiat",
-      "adipisicing"
-    ],
-    "longitude": -60.291407,
-    "latitude": -84.619318,
-    "registered": "Friday, February 7, 2014 3:17 AM",
-    "about": "Consectetur eiusmod laboris dolore est ullamco nulla in velit quis esse Lorem. Amet aliqua sunt aute occaecat veniam officia in duis proident aliqua cupidatat mollit. Sint eu qui anim duis ut anim duis eu cillum. Cillum nostrud adipisicing tempor Lorem commodo sit in ad qui non et irure qui. Labore eu aliquip id duis eiusmod veniam.\r\n",
-    "address": "347 Autumn Avenue, Fidelis, Puerto Rico, 543",
-    "phone": "+1 (889) 457-2319",
-    "email": "skinner.maddox@moltonic.co.uk",
-    "company": "MOLTONIC",
-    "name": {
-      "last": "Maddox",
-      "first": "Skinner"
-    },
-    "eyeColor": "green",
-    "age": 22,
-    "picture": "http://placehold.it/32x32",
-    "balance": "$3,553.10",
-    "isActive": false,
-    "guid": "cfbc2fb6-2641-4388-b06d-ec0212cfac1e",
-    "index": 1,
-    "_id": "551b91197e0abe92d6642700"
-  },
-  {
-    "favoriteFruit": "strawberry",
-    "greeting": "Hello, Reynolds! You have 5 unread messages.",
-    "friends": [
-      {
-        "name": "Brady Valdez",
-        "id": 0
-      },
-      {
-        "name": "Boyer Golden",
-        "id": 1
-      },
-      {
-        "name": "Gladys Knapp",
-        "id": 2
-      }
-    ],
-    "range": [
-      0,
-      1,
-      2,
-      3,
-      4,
-      5,
-      6,
-      7,
-      8,
-      9
-    ],
-    "tags": [
-      "commodo",
-      "eiusmod",
-      "cupidatat",
-      "et",
-      "occaecat",
-      "proident",
-      "Lorem"
-    ],
-    "longitude": 140.866287,
-    "latitude": 1.401032,
-    "registered": "Monday, October 20, 2014 8:01 AM",
-    "about": "Deserunt elit consequat ea dolor pariatur aute consectetur et nulla ipsum ad. Laboris occaecat ipsum ad duis et esse ea ut voluptate. Ex magna consequat pariatur amet. Quis excepteur non mollit dolore cillum dolor ex esse veniam esse deserunt non occaecat veniam. Sit amet proident proident amet. Nisi est id ut ut adipisicing esse fugiat non dolor aute.\r\n",
-    "address": "872 Montague Terrace, Haena, Montana, 3106",
-    "phone": "+1 (974) 410-2655",
-    "email": "reynolds.sanford@combot.biz",
-    "company": "COMBOT",
-    "name": {
-      "last": "Sanford",
-      "first": "Reynolds"
-    },
-    "eyeColor": "green",
-    "age": 21,
-    "picture": "http://placehold.it/32x32",
-    "balance": "$3,664.47",
-    "isActive": true,
-    "guid": "f9933a9c-c41a-412f-a18d-e727c569870b",
-    "index": 2,
-    "_id": "551b91197f170b65413a06e3"
-  },
-  {
-    "favoriteFruit": "banana",
-    "greeting": "Hello, Neva! You have 7 unread messages.",
-    "friends": [
-      {
-        "name": "Clara Cotton",
-        "id": 0
-      },
-      {
-        "name": "Ray Gates",
-        "id": 1
-      },
-      {
-        "name": "Jacobs Reese",
-        "id": 2
-      }
-    ],
-    "range": [
-      0,
-      1,
-      2,
-      3,
-      4,
-      5,
-      6,
-      7,
-      8,
-      9
-    ],
-    "tags": [
-      "magna",
-      "labore",
-      "incididunt",
-      "velit",
-      "ea",
-      "et",
-      "eiusmod"
-    ],
-    "longitude": -133.058479,
-    "latitude": 87.803677,
-    "registered": "Friday, May 9, 2014 5:41 PM",
-    "about": "Do duis occaecat ut officia occaecat officia nostrud reprehenderit ex excepteur aute anim in reprehenderit. Cupidatat nulla eiusmod nulla non minim veniam aute nulla deserunt adipisicing consectetur veniam. Sit consequat ex laboris aliqua labore consectetur tempor proident consequat est. Fugiat quis esse culpa aliquip. Excepteur laborum aliquip sunt eu cupidatat magna eiusmod amet nisi labore aliquip. Ut consectetur esse aliquip exercitation nulla ex occaecat elit do ex eiusmod deserunt. Ex eu voluptate minim deserunt fugiat minim est occaecat ad Lorem nisi.\r\n",
-    "address": "480 Eagle Street, Fostoria, Oklahoma, 2614",
-    "phone": "+1 (983) 439-3000",
-    "email": "neva.barker@pushcart.us",
-    "company": "PUSHCART",
-    "name": {
-      "last": "Barker",
-      "first": "Neva"
-    },
-    "eyeColor": "brown",
-    "age": 36,
-    "picture": "http://placehold.it/32x32",
-    "balance": "$3,182.24",
-    "isActive": true,
-    "guid": "52489849-78e1-4b27-8b86-e3e5ab2b7dc8",
-    "index": 3,
-    "_id": "551b9119a13061c083c878d5"
-  },
-  {
-    "favoriteFruit": "banana",
-    "greeting": "Hello, Rodgers! You have 6 unread messages.",
-    "friends": [
-      {
-        "name": "Marguerite Conway",
-        "id": 0
-      },
-      {
-        "name": "Margarita Cunningham",
-        "id": 1
-      },
-      {
-        "name": "Carmela Gallagher",
-        "id": 2
-      }
-    ],
-    "range": [
-      0,
-      1,
-      2,
-      3,
-      4,
-      5,
-      6,
-      7,
-      8,
-      9
-    ],
-    "tags": [
-      "ipsum",
-      "magna",
-      "amet",
-      "elit",
-      "sit",
-      "occaecat",
-      "elit"
-    ],
-    "longitude": -125.436981,
-    "latitude": 19.868524,
-    "registered": "Tuesday, July 8, 2014 8:09 PM",
-    "about": "In cillum esse tempor do magna id ad excepteur ex nostrud mollit deserunt aliqua. Minim aliqua commodo commodo consectetur exercitation nulla nisi dolore aliqua in. Incididunt deserunt mollit nostrud excepteur. Ipsum fugiat anim deserunt Lorem aliquip nisi consequat eu minim in ex duis.\r\n",
-    "address": "989 Varanda Place, Duryea, Palau, 3972",
-    "phone": "+1 (968) 578-2974",
-    "email": "rodgers.conner@frenex.net",
-    "company": "FRENEX",
-    "name": {
-      "last": "Conner",
-      "first": "Rodgers"
-    },
-    "eyeColor": "blue",
-    "age": 23,
-    "picture": "http://placehold.it/32x32",
-    "balance": "$1,665.17",
-    "isActive": true,
-    "guid": "ed3b2374-5afe-4fca-9325-8a7bbc9f81a0",
-    "index": 4,
-    "_id": "551b91197bcedb1b56a241ce"
-  },
-  {
-    "favoriteFruit": "strawberry",
-    "greeting": "Hello, Mari! You have 10 unread messages.",
-    "friends": [
-      {
-        "name": "Irwin Boyd",
-        "id": 0
-      },
-      {
-        "name": "Dejesus Flores",
-        "id": 1
-      },
-      {
-        "name": "Lane Mcmahon",
-        "id": 2
-      }
-    ],
-    "range": [
-      0,
-      1,
-      2,
-      3,
-      4,
-      5,
-      6,
-      7,
-      8,
-      9
-    ],
-    "tags": [
-      "esse",
-      "aliquip",
-      "excepteur",
-      "dolor",
-      "ex",
-      "commodo",
-      "anim"
-    ],
-    "longitude": -17.038176,
-    "latitude": 17.154663,
-    "registered": "Sunday, April 6, 2014 4:46 AM",
-    "about": "Excepteur veniam occaecat sint nulla magna in in officia elit. Eiusmod qui dolor fugiat tempor in minim esse officia minim consequat. Lorem ullamco labore proident ipsum id pariatur fugiat consectetur anim cupidatat qui proident non ipsum.\r\n",
-    "address": "563 Hendrickson Street, Westwood, South Dakota, 4959",
-    "phone": "+1 (980) 434-3976",
-    "email": "mari.fleming@beadzza.org",
-    "company": "BEADZZA",
-    "name": {
-      "last": "Fleming",
-      "first": "Mari"
-    },
-    "eyeColor": "blue",
-    "age": 21,
-    "picture": "http://placehold.it/32x32",
-    "balance": "$1,948.04",
-    "isActive": true,
-    "guid": "6bd02166-3b1f-4ed8-84c9-ed96cbf12abc",
-    "index": 5,
-    "_id": "551b9119b359ff6d24846f77"
-  },
-  {
-    "favoriteFruit": "strawberry",
-    "greeting": "Hello, Maxine! You have 7 unread messages.",
-    "friends": [
-      {
-        "name": "Sullivan Stark",
-        "id": 0
-      },
-      {
-        "name": "Underwood Mclaughlin",
-        "id": 1
-      },
-      {
-        "name": "Kristy Carlson",
-        "id": 2
-      }
-    ],
-    "range": [
-      0,
-      1,
-      2,
-      3,
-      4,
-      5,
-      6,
-      7,
-      8,
-      9
-    ],
-    "tags": [
-      "commodo",
-      "ipsum",
-      "quis",
-      "non",
-      "est",
-      "mollit",
-      "exercitation"
-    ],
-    "longitude": -105.40635,
-    "latitude": 37.197993,
-    "registered": "Tuesday, January 20, 2015 12:30 AM",
-    "about": "Proident ullamco Lorem est consequat consectetur non eiusmod esse nostrud pariatur eiusmod enim exercitation eiusmod. Consequat duis elit elit minim ullamco et dolor eu minim do tempor esse consequat excepteur. Mollit dolor do voluptate nostrud quis anim cillum velit tempor eiusmod adipisicing tempor do culpa. Eu magna dolor sit amet nisi do laborum dolore nisi. Deserunt ipsum et deserunt non nisi.\r\n",
-    "address": "252 Boulevard Court, Brenton, Tennessee, 9444",
-    "phone": "+1 (950) 466-3377",
-    "email": "maxine.moreno@zentia.tv",
-    "company": "ZENTIA",
-    "name": {
-      "last": "Moreno",
-      "first": "Maxine"
-    },
-    "eyeColor": "brown",
-    "age": 24,
-    "picture": "http://placehold.it/32x32",
-    "balance": "$1,200.24",
-    "isActive": false,
-    "guid": "ce307a37-ca1f-43f5-b637-dca2605712be",
-    "index": 6,
-    "_id": "551b91195a6164b2e35f6dc8"
-  },
-  {
-    "favoriteFruit": "strawberry",
-    "greeting": "Hello, Helga! You have 5 unread messages.",
-    "friends": [
-      {
-        "name": "Alicia Vance",
-        "id": 0
-      },
-      {
-        "name": "Vinson Phelps",
-        "id": 1
-      },
-      {
-        "name": "Francisca Kelley",
-        "id": 2
-      }
-    ],
-    "range": [
-      0,
-      1,
-      2,
-      3,
-      4,
-      5,
-      6,
-      7,
-      8,
-      9
-    ],
-    "tags": [
-      "nostrud",
-      "eiusmod",
-      "dolore",
-      "officia",
-      "sint",
-      "non",
-      "qui"
-    ],
-    "longitude": -7.275151,
-    "latitude": 75.54202,
-    "registered": "Wednesday, October 1, 2014 6:35 PM",
-    "about": "Quis duis ullamco velit qui. Consectetur non adipisicing id magna anim. Deserunt est officia qui esse. Et do pariatur incididunt anim ad mollit non. Et eiusmod sunt fugiat elit mollit ad excepteur anim nisi laboris eiusmod aliquip aliquip.\r\n",
-    "address": "981 Bush Street, Beaulieu, Vermont, 3775",
-    "phone": "+1 (956) 506-3807",
-    "email": "helga.burch@synkgen.name",
-    "company": "SYNKGEN",
-    "name": {
-      "last": "Burch",
-      "first": "Helga"
-    },
-    "eyeColor": "blue",
-    "age": 22,
-    "picture": "http://placehold.it/32x32",
-    "balance": "$3,827.89",
-    "isActive": false,
-    "guid": "ff5dfea0-1052-4ef2-8b66-4dc1aad0a4fb",
-    "index": 7,
-    "_id": "551b911946be8358ae40e90e"
-  },
-  {
-    "favoriteFruit": "banana",
-    "greeting": "Hello, Shaw! You have 5 unread messages.",
-    "friends": [
-      {
-        "name": "Christian Cardenas",
-        "id": 0
-      },
-      {
-        "name": "Cohen Pennington",
-        "id": 1
-      },
-      {
-        "name": "Mary Lindsay",
-        "id": 2
-      }
-    ],
-    "range": [
-      0,
-      1,
-      2,
-      3,
-      4,
-      5,
-      6,
-      7,
-      8,
-      9
-    ],
-    "tags": [
-      "occaecat",
-      "ut",
-      "occaecat",
-      "magna",
-      "exercitation",
-      "incididunt",
-      "irure"
-    ],
-    "longitude": -89.102972,
-    "latitude": 89.489596,
-    "registered": "Thursday, August 21, 2014 5:00 PM",
-    "about": "Amet cupidatat quis velit aute Lorem consequat pariatur mollit deserunt et sint culpa excepteur duis. Enim proident duis qui ex tempor sunt nostrud occaecat. Officia sit veniam mollit eiusmod minim do aute eiusmod fugiat qui anim adipisicing in laboris. Do tempor reprehenderit sunt laborum esse irure dolor ad consectetur aute sit id ipsum. Commodo et voluptate anim consequat do. Minim laborum ad veniam ad minim incididunt excepteur excepteur aliqua.\r\n",
-    "address": "237 Pierrepont Street, Herbster, New York, 3490",
-    "phone": "+1 (976) 455-2880",
-    "email": "shaw.zamora@shadease.me",
-    "company": "SHADEASE",
-    "name": {
-      "last": "Zamora",
-      "first": "Shaw"
-    },
-    "eyeColor": "blue",
-    "age": 38,
-    "picture": "http://placehold.it/32x32",
-    "balance": "$3,440.82",
-    "isActive": false,
-    "guid": "ac5fdb0e-e1fb-427e-881d-da461be0d1ca",
-    "index": 8,
-    "_id": "551b9119af0077bc28a2de25"
-  },
-  {
-    "favoriteFruit": "apple",
-    "greeting": "Hello, Melissa! You have 5 unread messages.",
-    "friends": [
-      {
-        "name": "Marion Villarreal",
-        "id": 0
-      },
-      {
-        "name": "Kate Rose",
-        "id": 1
-      },
-      {
-        "name": "Hines Simon",
-        "id": 2
-      }
-    ],
-    "range": [
-      0,
-      1,
-      2,
-      3,
-      4,
-      5,
-      6,
-      7,
-      8,
-      9
-    ],
-    "tags": [
-      "amet",
-      "veniam",
-      "mollit",
-      "ad",
-      "cupidatat",
-      "deserunt",
-      "Lorem"
-    ],
-    "longitude": -52.735052,
-    "latitude": 16.258838,
-    "registered": "Wednesday, April 16, 2014 7:56 PM",
-    "about": "Aute ut culpa eiusmod tempor duis dolor tempor incididunt. Nisi non proident excepteur eiusmod incididunt nisi minim irure sit. In veniam commodo deserunt proident reprehenderit et consectetur ullamco quis nulla cupidatat.\r\n",
-    "address": "642 Halsey Street, Blandburg, Kansas, 6761",
-    "phone": "+1 (941) 539-3851",
-    "email": "melissa.vaughn@memora.io",
-    "company": "MEMORA",
-    "name": {
-      "last": "Vaughn",
-      "first": "Melissa"
-    },
-    "eyeColor": "brown",
-    "age": 24,
-    "picture": "http://placehold.it/32x32",
-    "balance": "$2,399.44",
-    "isActive": true,
-    "guid": "1769f022-a7f1-4a69-bf4c-f5a5ebeab2d1",
-    "index": 9,
-    "_id": "551b9119b607c09c7ffc3b8a"
-  }
-]
\ No newline at end of file
diff --git a/3rdparty/rapidjson/bin/types/nulls.json b/3rdparty/rapidjson/bin/types/nulls.json
deleted file mode 100644
index 1cdf9a6888e..00000000000
--- a/3rdparty/rapidjson/bin/types/nulls.json
+++ /dev/null
@@ -1,102 +0,0 @@
-[
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null
-]
\ No newline at end of file
diff --git a/3rdparty/rapidjson/bin/types/paragraphs.json b/3rdparty/rapidjson/bin/types/paragraphs.json
deleted file mode 100644
index a335d9ece2c..00000000000
--- a/3rdparty/rapidjson/bin/types/paragraphs.json
+++ /dev/null
@@ -1,102 +0,0 @@
-[
-  "Commodo ullamco cupidatat nisi sit proident ex. Cillum pariatur occaecat in officia do commodo nisi cillum tempor minim. Ad dolor ut et aliquip fugiat eu officia cupidatat occaecat consectetur eiusmod veniam enim officia.\r\n",
-  "Adipisicing cillum laborum nisi irure. Cillum dolor proident duis nulla qui mollit dolore reprehenderit mollit. Irure nulla dolor ipsum irure nulla quis laboris do.\r\n",
-  "Est adipisicing consectetur incididunt in. Occaecat ea magna ex consequat irure sit laborum cillum officia magna sunt do exercitation aliquip. Laboris id aute in dolore reprehenderit voluptate non deserunt laborum.\r\n",
-  "Consectetur eu aute est est occaecat adipisicing sint enim dolor eu. Tempor amet id non mollit eu consectetur cillum duis. Eu labore velit nulla ipsum commodo consequat aliquip. Cupidatat commodo dolore mollit enim sit excepteur nisi duis laboris deserunt esse.\r\n",
-  "Incididunt ullamco est fugiat enim fugiat. Do sit mollit anim ad excepteur eu laboris exercitation officia labore nulla ut. Voluptate non voluptate cillum sit et voluptate anim duis velit consequat aliquip dolor. Elit et et esse laboris consectetur officia eiusmod aliquip nisi est. Qui labore dolore ad dolor.\r\n",
-  "Anim adipisicing est irure proident sit officia ullamco voluptate sunt consectetur duis mollit excepteur veniam. Nostrud ut duis aute exercitation officia et quis elit commodo elit tempor aute aliquip enim. Est officia non cillum consequat voluptate ipsum sit voluptate nulla id.\r\n",
-  "Ipsum enim consectetur aliquip nulla commodo ut ex aliqua elit duis do. Officia et sunt aliqua dolor minim voluptate veniam esse elit enim. Adipisicing reprehenderit duis ex magna non in fugiat sunt ipsum nostrud fugiat aliquip. Labore voluptate id officia voluptate eu. Magna do nostrud excepteur sunt aliqua adipisicing qui.\r\n",
-  "Est occaecat non non cupidatat laborum qui. Veniam sit est voluptate labore sit irure consectetur fugiat. Anim enim enim fugiat exercitation anim ad proident esse in aliqua. Laboris ut aute culpa ullamco.\r\n",
-  "Sit et aliquip cupidatat deserunt eiusmod sint aliquip occaecat nostrud aliqua elit commodo ut magna. Amet sit est deserunt id duis in officia pariatur cupidatat ex. Mollit duis est consequat nulla aute velit ipsum sit consectetur pariatur ut non ex ipsum. Tempor esse velit pariatur reprehenderit et nostrud commodo laborum mollit labore.\r\n",
-  "Aliquip irure quis esse aliquip. Ex non deserunt culpa aliqua ad anim occaecat ad. Lorem consectetur mollit eu consectetur est non nisi non ipsum. Qui veniam ullamco officia est ut excepteur. Nulla elit dolore cupidatat aliqua enim Lorem elit consequat eiusmod non aliqua eu in. Pariatur in culpa labore sint ipsum consectetur occaecat ad ex ipsum laboris aliquip officia. Non officia eiusmod nisi officia id id laboris deserunt sunt enim magna mollit sit.\r\n",
-  "Mollit velit laboris laborum nulla aliquip consequat Lorem non incididunt irure. Eu voluptate sint do consectetur tempor sit Lorem in. Laborum eiusmod nisi Lorem ipsum dolore do aute laborum occaecat aute sunt. Sit laborum in ea do ipsum officia irure cillum irure nisi laboris. Ad anim deserunt excepteur ea veniam eiusmod culpa velit veniam. Commodo incididunt ea Lorem eu enim esse nisi incididunt mollit.\r\n",
-  "Velit proident sunt aute dolore reprehenderit culpa. Pariatur reprehenderit commodo ad ea voluptate anim nulla ipsum eu irure fugiat aliqua et. Adipisicing incididunt anim excepteur voluptate minim qui culpa. Sunt veniam enim reprehenderit magna magna. Sit ad amet deserunt ut aute dolore ad minim.\r\n",
-  "Esse ullamco sunt mollit mollit. Eu enim dolore laboris cupidatat. Cupidatat adipisicing non aute exercitation fugiat. Non ut cillum labore fugiat aliquip ex duis quis consectetur ut nisi Lorem amet qui. Proident veniam amet qui reprehenderit duis qui. Nisi culpa sit occaecat ullamco occaecat laborum fugiat ut. Non duis deserunt culpa duis.\r\n",
-  "Id ipsum eiusmod laboris non est ipsum deserunt labore duis reprehenderit deserunt. Sint tempor fugiat eiusmod nostrud in ut laborum esse in nostrud sit deserunt nostrud reprehenderit. Cupidatat aliqua qui anim consequat eu quis consequat consequat elit ipsum pariatur. Cupidatat in dolore velit quis. Exercitation cillum ullamco ex consectetur commodo tempor incididunt exercitation labore ad dolore. Minim incididunt consequat adipisicing esse eu eu voluptate.\r\n",
-  "Anim sint eiusmod nisi anim do deserunt voluptate ut cillum eiusmod esse ex reprehenderit laborum. Dolore nulla excepteur duis excepteur. Magna nisi nostrud duis non commodo velit esse ipsum Lorem incididunt. Nulla enim consequat ad aliqua. Incididunt irure culpa nostrud ea aute ex sit non ad esse.\r\n",
-  "Ullamco nostrud cupidatat adipisicing anim fugiat mollit eu. Et ut eu in nulla consequat. Sunt do pariatur culpa non est.\r\n",
-  "Pariatur incididunt reprehenderit non qui excepteur cillum exercitation nisi occaecat ad. Lorem aliquip laborum commodo reprehenderit sint. Laboris qui ut veniam magna quis et et ullamco voluptate. Tempor reprehenderit deserunt consequat nisi. Esse duis sint in tempor. Amet aute cupidatat in sint et.\r\n",
-  "Est officia nisi dolore consequat irure et excepteur. Sit qui elit tempor magna qui cillum anim amet proident exercitation proident. Eu cupidatat laborum consectetur duis ullamco irure nulla. Adipisicing culpa non reprehenderit anim aute.\r\n",
-  "Eu est laborum culpa velit dolore non sunt. Tempor magna veniam ea sit non qui Lorem qui exercitation aliqua aliqua et excepteur eiusmod. Culpa aute anim proident culpa adipisicing duis tempor elit aliquip elit nulla laboris esse dolore. Sit adipisicing non dolor eiusmod occaecat cupidatat.\r\n",
-  "Culpa velit eu esse sunt. Laborum irure aliqua reprehenderit velit ipsum fugiat officia dolor ut aute officia deserunt. Ipsum sit quis fugiat nostrud aliqua cupidatat ex pariatur et. Cillum proident est irure nisi dolor aliqua deserunt esse occaecat velit dolor.\r\n",
-  "Exercitation nulla officia sit eiusmod cillum eu incididunt officia exercitation qui Lorem deserunt. Voluptate Lorem minim commodo laborum esse in duis excepteur do duis aliquip nisi voluptate consectetur. Amet tempor officia enim ex esse minim reprehenderit.\r\n",
-  "Laboris sint deserunt ad aute incididunt. Anim officia sunt elit qui laborum labore commodo irure non. Mollit adipisicing ullamco do aute nulla eu laborum et quis sint aute adipisicing amet. Aliqua officia irure nostrud duis ex.\r\n",
-  "Eiusmod ipsum aliqua reprehenderit esse est non aute id veniam eiusmod. Elit consequat ad sit tempor elit eu incididunt quis irure ad. Eu incididunt veniam consequat Lorem nostrud cillum officia ea consequat ad cillum. Non nisi irure cupidatat incididunt pariatur incididunt. Duis velit officia ad cillum qui. Aliquip consequat sint aute nisi cillum. Officia commodo nisi incididunt laborum nisi voluptate aliquip Lorem cupidatat anim consequat sit laboris.\r\n",
-  "Veniam cupidatat et incididunt mollit do ex voluptate veniam nostrud labore esse. Eiusmod irure sint fugiat esse. Aute irure consectetur ut mollit nulla sint esse. Lorem ut quis ex proident nostrud mollit nostrud ea duis duis in magna anim consectetur.\r\n",
-  "Irure culpa esse qui do dolor fugiat veniam ad. Elit commodo aute elit magna incididunt tempor pariatur velit irure pariatur cillum et ea ad. Ad consequat ea et ad minim ut sunt qui commodo voluptate. Laboris est aliquip anim reprehenderit eu officia et exercitation. Occaecat laboris cupidatat Lorem ullamco in nostrud commodo ipsum in quis esse ex.\r\n",
-  "Incididunt officia quis voluptate eiusmod esse nisi ipsum quis commodo. Eiusmod dolore tempor occaecat sit exercitation aliqua minim consequat minim mollit qui ad nisi. Aute quis irure adipisicing veniam nisi nisi velit deserunt incididunt anim nostrud.\r\n",
-  "Voluptate exercitation exercitation id minim excepteur excepteur mollit. Fugiat aute proident nulla ullamco ea. Nisi ea culpa duis dolore veniam anim tempor officia in dolore exercitation exercitation. Dolore quis cillum adipisicing sunt do nulla esse proident ad sint.\r\n",
-  "Laborum ut mollit sint commodo nulla laborum deserunt Lorem magna commodo mollit tempor deserunt ut. Qui aliquip commodo ea id. Consectetur dolor fugiat dolor excepteur eiusmod. Eu excepteur ex aute ex ex elit ex esse officia cillum exercitation. Duis ut labore ea nostrud excepteur. Reprehenderit labore aute sunt nisi quis Lorem officia. Ad aliquip cupidatat voluptate exercitation voluptate ad irure magna quis.\r\n",
-  "Tempor velit veniam sit labore elit minim do elit cillum eiusmod sunt excepteur nisi. Aliquip est deserunt excepteur duis fugiat incididunt veniam fugiat. Pariatur sit irure labore et minim non. Cillum quis aute anim sint laboris laboris ullamco exercitation nostrud. Nulla pariatur id laborum minim nisi est adipisicing irure.\r\n",
-  "Irure exercitation laboris nostrud in do consectetur ad. Magna aliqua Lorem culpa exercitation sint do culpa incididunt mollit eu exercitation. Elit tempor Lorem dolore enim deserunt. Anim et ullamco sint ullamco mollit cillum officia et. Proident incididunt laboris aliquip laborum sint veniam deserunt eu consequat deserunt voluptate laboris. Anim Lorem non laborum exercitation voluptate. Cupidatat reprehenderit culpa Lorem fugiat enim minim consectetur tempor quis ad reprehenderit laboris irure.\r\n",
-  "Deserunt elit mollit nostrud occaecat labore reprehenderit laboris ex. Esse reprehenderit adipisicing cillum minim in esse aliquip excepteur ex et nisi cillum quis. Cillum labore ut ex sunt. Occaecat proident et mollit magna consequat irure esse. Dolor do enim esse nisi ad.\r\n",
-  "Pariatur est anim cillum minim elit magna adipisicing quis tempor proident nisi laboris incididunt cupidatat. Nulla est adipisicing sit adipisicing id nostrud amet qui consequat eiusmod tempor voluptate ad. Adipisicing non magna sit occaecat magna mollit ad ex nulla velit ea pariatur. Irure labore ad ea exercitation ex cillum.\r\n",
-  "Lorem fugiat eu eu cillum nulla tempor sint. Lorem id officia nulla velit labore ut duis ad tempor non. Excepteur quis aute adipisicing nisi nisi consectetur aliquip enim Lorem id ullamco cillum sint voluptate. Qui aliquip incididunt tempor aliqua voluptate labore reprehenderit. Veniam eiusmod elit occaecat voluptate tempor culpa consectetur ea ut exercitation eiusmod exercitation qui.\r\n",
-  "Aliqua esse pariatur nulla veniam velit ea. Aliquip consectetur tempor ex magna sit aliquip exercitation veniam. Dolor ullamco minim commodo pariatur. Et amet reprehenderit dolore proident elit tempor eiusmod eu incididunt enim ullamco. Adipisicing id officia incididunt esse dolor sunt cupidatat do deserunt mollit do non. Magna ut officia fugiat adipisicing quis ea cillum laborum dolore ad nostrud magna minim est. Dolor voluptate officia proident enim ea deserunt eu voluptate dolore proident laborum officia ea.\r\n",
-  "Culpa aute consequat esse fugiat cupidatat minim voluptate voluptate eiusmod irure anim elit. Do eiusmod culpa laboris consequat incididunt minim nostrud eiusmod commodo velit ea ullamco proident. Culpa pariatur magna ut mollit nisi. Ea officia do magna deserunt minim nisi tempor ea deserunt veniam cillum exercitation esse.\r\n",
-  "Anim ullamco nostrud commodo Lorem. Do sunt laborum exercitation proident proident magna. Lorem officia laborum laborum dolor sunt duis commodo Lorem. Officia aute adipisicing ea cupidatat ea dolore. Aliquip adipisicing pariatur consectetur aliqua sit amet officia reprehenderit laborum culpa. Occaecat Lorem eu nisi do Lorem occaecat enim eiusmod laboris id quis. Ad mollit adipisicing sunt adipisicing esse.\r\n",
-  "Laborum quis sit adipisicing cupidatat. Veniam Lorem eiusmod esse esse sint nisi labore elit et. Deserunt aliqua mollit ut commodo aliqua non incididunt ipsum reprehenderit consectetur. Eiusmod nulla minim laboris Lorem ea Lorem aute tempor pariatur in sit. Incididunt culpa ut do irure amet irure cupidatat est anim anim culpa occaecat. Est velit consectetur eiusmod veniam reprehenderit officia sunt occaecat eiusmod ut sunt occaecat amet.\r\n",
-  "Elit minim aute fugiat nulla ex quis. Labore fugiat sint nostrud amet quis culpa excepteur in. Consectetur exercitation cupidatat laborum sit. Aute nisi eu aliqua est deserunt eiusmod commodo dolor id. Mollit laborum esse sint ipsum voluptate reprehenderit velit et. Veniam aliquip enim in veniam Lorem voluptate quis deserunt consequat qui commodo ut excepteur aute.\r\n",
-  "Dolore deserunt veniam aute nisi labore sunt et voluptate irure nisi anim ea. Magna nisi quis anim mollit nisi est dolor do ex aliquip elit aliquip ipsum minim. Dolore est officia nostrud eiusmod ex laborum ea amet est. Officia culpa non est et tempor consectetur exercitation tempor eiusmod enim. Ea tempor laboris qui amet ex nisi culpa dolore consectetur incididunt sunt sunt. Lorem aliquip incididunt magna do et ullamco ex elit aliqua eiusmod qui. Commodo amet dolor sint incididunt ex veniam non Lorem fugiat.\r\n",
-  "Officia culpa enim voluptate dolore commodo. Minim commodo aliqua minim ex sint excepteur cupidatat adipisicing eu irure. Anim magna deserunt anim Lorem non.\r\n",
-  "Cupidatat aliquip nulla excepteur sunt cupidatat cupidatat laborum cupidatat exercitation. Laboris minim ex cupidatat culpa elit. Amet enim reprehenderit aliqua laborum est tempor exercitation cupidatat ex dolore do. Do incididunt labore fugiat commodo consectetur nisi incididunt irure sit culpa sit. Elit aute occaecat qui excepteur velit proident cillum qui aliqua ex do ex. Dolore irure ex excepteur veniam id proident mollit Lorem.\r\n",
-  "Ad commodo cillum duis deserunt elit officia consectetur veniam eiusmod. Reprehenderit et veniam ad commodo reprehenderit magna elit laboris sunt non quis. Adipisicing dolor aute proident ea magna sunt et proident in consectetur.\r\n",
-  "Veniam exercitation esse esse veniam est nisi. Minim velit incididunt sint aute dolor anim. Fugiat cupidatat id ad nisi in voluptate dolor culpa eiusmod magna eiusmod amet id. Duis aliquip labore et ex amet amet aliquip laborum eiusmod ipsum. Quis qui ut duis duis. Minim in voluptate reprehenderit aliqua.\r\n",
-  "Elit ut pariatur dolor veniam ipsum consequat. Voluptate Lorem mollit et esse dolore mollit Lorem ad. Elit nostrud eu Lorem labore mollit minim cupidatat officia quis minim dolore incididunt. In cillum aute cillum ut.\r\n",
-  "Commodo laborum deserunt ut cupidatat pariatur ullamco in esse anim exercitation cillum duis. Consectetur incididunt sit esse Lorem in aute. Eiusmod mollit Lorem consequat minim reprehenderit laborum enim excepteur irure nisi elit. Laborum esse proident aute aute proident adipisicing laborum. Pariatur tempor duis incididunt qui velit pariatur ut officia ea mollit labore dolore. Cillum pariatur minim ullamco sunt incididunt culpa id ullamco exercitation consectetur. Ea exercitation consequat reprehenderit ut ullamco velit eu ad velit magna excepteur eiusmod.\r\n",
-  "Eu deserunt magna laboris laborum laborum in consequat dolore. Officia proident consectetur proident do occaecat minim pariatur officia ipsum sit non velit officia cillum. Laborum excepteur labore eu minim eiusmod. Sit anim dolore cillum ad do minim culpa sit est ad.\r\n",
-  "Cupidatat dolor nostrud Lorem sint consequat quis. Quis labore sint incididunt officia tempor. Fugiat nostrud in elit reprehenderit dolor. Nisi sit enim officia minim est adipisicing nulla aute labore nulla nostrud cupidatat est. Deserunt dolore qui irure Lorem esse voluptate velit qui nostrud.\r\n",
-  "Fugiat Lorem amet nulla nisi qui amet laboris enim cillum. Dolore occaecat exercitation id labore velit do commodo ut cupidatat laborum velit fugiat mollit. Ut et aliqua pariatur occaecat. Lorem occaecat dolore quis esse enim cupidatat exercitation ut tempor sit laboris fugiat adipisicing. Est tempor ex irure consectetur ipsum magna labore. Lorem non quis qui minim nisi magna amet aliquip ex cillum fugiat tempor.\r\n",
-  "Aliquip eiusmod laborum ipsum deserunt velit esse do magna excepteur consectetur exercitation sit. Minim ullamco reprehenderit commodo nostrud exercitation id irure ex qui ullamco sit esse laboris. Nulla cillum non minim qui cillum nisi aute proident. Dolor anim culpa elit quis excepteur aliqua eiusmod. Elit ea est excepteur consectetur sunt eiusmod enim id commodo irure amet et pariatur laboris. Voluptate magna ad magna dolore cillum cillum irure laboris ipsum officia id Lorem veniam.\r\n",
-  "Esse sunt elit est aliquip cupidatat commodo deserunt. Deserunt pariatur ipsum qui ad esse esse magna qui cillum laborum. Exercitation veniam pariatur elit amet enim.\r\n",
-  "Esse quis in id elit nulla occaecat incididunt. Et amet Lorem mollit in veniam do. Velit mollit Lorem consequat commodo Lorem aliquip cupidatat. Minim consequat nostrud nulla in nostrud.\r\n",
-  "Cillum nulla et eu est nostrud quis elit cupidatat dolor enim excepteur exercitation nisi voluptate. Nulla dolore non ex velit et qui tempor proident id deserunt nisi eu. Tempor ad Lorem ipsum reprehenderit in anim. Anim dolore ullamco enim deserunt quis ex id exercitation velit. Magna exercitation fugiat mollit pariatur ipsum ex consectetur nostrud. Id dolore officia nostrud excepteur laborum. Magna incididunt elit ipsum pariatur adipisicing enim duis est qui commodo velit aute.\r\n",
-  "Quis esse ex qui nisi dolor. Ullamco laborum dolor esse laboris eiusmod ea magna laboris ea esse ut. Dolore ipsum pariatur veniam sint mollit. Lorem ea proident fugiat ullamco ut nisi culpa eu exercitation exercitation aliquip veniam laborum consectetur.\r\n",
-  "Pariatur veniam laboris sit aliquip pariatur tempor aute sunt id et ut. Laboris excepteur eiusmod nisi qui quis elit enim ut cupidatat. Et et laborum in fugiat veniam consectetur ipsum laboris duis excepteur ullamco aliqua dolor Lorem. Aliqua ex amet sint anim cupidatat nisi ipsum anim et sunt deserunt. Occaecat culpa ut tempor cillum pariatur ex tempor.\r\n",
-  "Dolor deserunt eiusmod magna do officia voluptate excepteur est cupidatat. Veniam qui cupidatat amet anim est qui consectetur sit commodo commodo ea ad. Enim ad adipisicing qui nostrud. Non nulla esse ullamco nulla et ex.\r\n",
-  "Id ullamco ea consectetur est incididunt deserunt et esse. Elit nostrud voluptate eiusmod ut. Excepteur adipisicing qui cupidatat consequat labore id. Qui dolor aliqua do dolore do cupidatat labore ex consectetur ea sit cillum. Sint veniam eiusmod in consectetur consequat fugiat et mollit ut fugiat esse dolor adipisicing.\r\n",
-  "Ea magna proident labore duis pariatur. Esse cillum aliquip dolor duis fugiat ea ex officia ea irure. Sint elit nisi pariatur sunt nostrud exercitation ullamco culpa magna do.\r\n",
-  "Minim aliqua voluptate dolor consequat sint tempor deserunt amet magna excepteur. Irure do voluptate magna velit. Nostrud in reprehenderit magna officia nostrud. Cupidatat nulla irure laboris non fugiat ex ex est cupidatat excepteur officia aute velit duis. Sit voluptate id ea exercitation deserunt culpa voluptate nostrud est adipisicing incididunt. Amet proident laborum commodo magna ipsum quis.\r\n",
-  "Ipsum consectetur consectetur excepteur tempor eiusmod ea fugiat aute velit magna in officia sunt. Sit ut sunt dolore cupidatat dolor adipisicing. Veniam nisi adipisicing esse reprehenderit amet aliqua voluptate ex commodo occaecat est voluptate mollit sunt. Pariatur aliqua qui qui in dolor. Fugiat reprehenderit sit nostrud do sint esse. Tempor sit irure adipisicing ea pariatur duis est sit est incididunt laboris quis do. Et voluptate anim minim aliquip excepteur consequat nisi anim pariatur aliquip ut ipsum dolor magna.\r\n",
-  "Cillum sit labore excepteur magna id aliqua exercitation consequat laborum Lorem id pariatur nostrud. Lorem qui est labore sint cupidatat sint excepteur nulla in eu aliqua et. Adipisicing velit do enim occaecat laboris quis excepteur ipsum dolor occaecat Lorem dolore id exercitation.\r\n",
-  "Incididunt in laborum reprehenderit eiusmod irure ex. Elit duis consequat minim magna. Esse consectetur aliquip cillum excepteur excepteur fugiat. Sint tempor consequat minim reprehenderit consectetur adipisicing dolor id Lorem elit non. Occaecat esse quis mollit ea et sint aute fugiat qui tempor. Adipisicing tempor duis non dolore irure elit deserunt qui do.\r\n",
-  "Labore fugiat eiusmod sint laborum sit duis occaecat. Magna in laborum non cillum excepteur nostrud sit proident pariatur voluptate voluptate adipisicing exercitation occaecat. Ad non dolor aute ex sint do do minim exercitation veniam laborum irure magna ea. Magna do non quis sit consequat Lorem aliquip.\r\n",
-  "Velit anim do laborum laboris laborum Lorem. Sunt do Lorem amet ipsum est sint velit sit do voluptate mollit veniam enim. Commodo do deserunt in pariatur ut elit sint elit deserunt ea. Ad dolor anim consequat aliquip ut mollit nostrud tempor sunt mollit elit. Reprehenderit laboris labore excepteur occaecat veniam adipisicing cupidatat esse. Ad enim aliquip ea minim excepteur magna. Sint velit veniam pariatur qui dolor est adipisicing ex laboris.\r\n",
-  "Ea cupidatat ex nulla in sunt est sit dolor enim ad. Eu tempor consequat cupidatat consequat ex incididunt sint culpa. Est Lorem Lorem non cupidatat sunt ut aliqua non nostrud do ullamco. Reprehenderit ad ad nulla nostrud do nulla in. Ipsum adipisicing commodo mollit ipsum exercitation. Aliqua ea anim anim est elit. Ea incididunt consequat minim ad sunt eu cillum.\r\n",
-  "Tempor quis excepteur eiusmod cupidatat ipsum occaecat id et occaecat. Eiusmod magna aliquip excepteur id amet elit. Ullamco dolore amet anim dolor enim ea magna magna elit. Occaecat magna pariatur in deserunt consectetur officia aliquip ullamco ex aute anim. Minim laborum eu sit elit officia esse do irure pariatur tempor et reprehenderit ullamco labore.\r\n",
-  "Sit tempor eu minim dolore velit pariatur magna duis reprehenderit ea nulla in. Amet est do consectetur commodo do adipisicing adipisicing in amet. Cillum id ut commodo do pariatur duis aliqua nisi sint ad irure officia reprehenderit. Mollit labore id enim fugiat ullamco irure mollit cupidatat. Quis nisi amet labore eu dolor occaecat commodo aliqua laboris deserunt excepteur deserunt officia. Aliqua non ut sit ad. Laborum veniam ad velit minim dolore ea id magna dolor qui in.\r\n",
-  "Dolore nostrud ipsum aliqua pariatur id reprehenderit enim ad eiusmod qui. Deserunt anim commodo pariatur excepteur velit eu irure nulla ex labore ipsum aliqua minim aute. Id consequat amet tempor aliquip ex elit adipisicing est do. Eu enim Lorem consectetur minim id irure nulla culpa. Consectetur do consequat aute tempor anim. Qui ad non elit dolor est adipisicing nisi amet cillum sunt quis anim laboris incididunt. Incididunt proident adipisicing labore Lorem.\r\n",
-  "Et reprehenderit ea officia veniam. Aliquip ullamco consequat elit nisi magna mollit id elit. Amet amet sint velit labore ad nisi. Consectetur tempor id dolor aliqua esse deserunt amet. Qui laborum enim proident voluptate aute eu aute aute sit sit incididunt eu. Sunt ullamco nisi nostrud labore commodo non consectetur quis do duis minim irure. Tempor sint dolor sint aliquip dolore nostrud fugiat.\r\n",
-  "Aute ullamco quis nisi ut excepteur nostrud duis elit. Veniam ex ad incididunt veniam voluptate. Commodo dolore ullamco sit sint adipisicing proident amet aute duis deserunt.\r\n",
-  "Labore velit eu cillum nisi. Laboris do cupidatat et non duis cillum. Ullamco dolor tempor cupidatat voluptate laborum ullamco ea duis.\r\n",
-  "Deserunt consequat aliqua duis aliquip nostrud nostrud dolore nisi. Culpa do sint laborum consectetur ipsum quis laborum laborum pariatur eiusmod. Consectetur laboris ad ad ut quis. Ullamco laboris qui velit id laborum voluptate qui aute nostrud aliquip ea.\r\n",
-  "Ad cillum anim ex est consectetur mollit id in. Non enim aliquip consequat qui deserunt commodo cillum ad laborum fugiat. Dolor deserunt amet laborum tempor adipisicing voluptate dolor pariatur dolor cillum. Eu mollit ex sunt officia veniam qui est sunt proident. Non aliqua qui elit eu cupidatat ex enim ex proident. Lorem sit minim ullamco officia cupidatat duis minim. Exercitation laborum deserunt voluptate culpa tempor quis nulla id pariatur.\r\n",
-  "Nostrud quis consectetur ut aliqua excepteur elit consectetur occaecat. Occaecat voluptate Lorem pariatur consequat ullamco fugiat minim. Anim voluptate eu eu cillum tempor dolore aliquip aliqua. Fugiat incididunt ut tempor amet minim. Voluptate nostrud minim pariatur non excepteur ullamco.\r\n",
-  "Dolore nulla velit officia exercitation irure laboris incididunt anim in laborum in fugiat ut proident. Fugiat aute id consequat fugiat officia ut. Labore sint amet proident amet sint nisi laboris amet id ullamco culpa quis consequat proident. Magna do fugiat veniam dolore elit irure minim. Esse ullamco excepteur labore tempor labore fugiat dolore nisi cupidatat irure dolor pariatur. Magna excepteur laboris nisi eiusmod sit pariatur mollit.\r\n",
-  "In enim aliquip officia ea ad exercitation cillum culpa occaecat dolore Lorem. Irure cillum commodo adipisicing sunt pariatur ea duis fugiat exercitation laboris culpa ullamco aute. Ut voluptate exercitation qui dolor. Irure et duis elit consequat deserunt proident.\r\n",
-  "Officia ea Lorem sunt culpa id et tempor excepteur enim deserunt proident. Dolore aliquip dolor laboris cillum proident velit. Et culpa occaecat exercitation cupidatat irure sint adipisicing excepteur pariatur incididunt ad occaecat. Qui proident ipsum cillum minim. Quis ut culpa irure aliqua minim fugiat. In voluptate cupidatat fugiat est laborum dolor esse in pariatur voluptate.\r\n",
-  "Voluptate enim ipsum officia aute ea adipisicing nisi ut ex do aliquip amet. Reprehenderit enim voluptate tempor ex adipisicing culpa. Culpa occaecat voluptate dolor mollit ipsum exercitation labore et tempor sit ea consectetur aliqua. Elit elit sit minim ea ea commodo do tempor cupidatat irure dolore. Occaecat esse adipisicing anim eiusmod commodo fugiat mollit amet. Incididunt tempor tempor qui occaecat cupidatat in.\r\n",
-  "Ut qui anim velit enim aliquip do ut nulla labore. Mollit ut commodo ut eiusmod consectetur laboris aliqua qui voluptate culpa fugiat incididunt elit. Lorem ullamco esse elit elit. Labore amet incididunt ea nulla aliquip eiusmod. Sit nulla est voluptate officia ipsum aute aute cillum tempor deserunt. Laboris commodo eiusmod labore sunt aute excepteur ea consectetur reprehenderit veniam nisi. Culpa nisi sint sunt sint tempor laboris dolore cupidatat.\r\n",
-  "Duis cillum qui nisi duis amet velit ad cillum ut elit aute sint ad. Amet laboris pariatur excepteur ipsum Lorem aliqua veniam Lorem quis mollit cupidatat aliqua exercitation. Pariatur ex ullamco sit commodo cillum eiusmod ut proident elit cillum. Commodo ut ipsum excepteur occaecat sint elit consequat ex dolor adipisicing consectetur id ut ad. Velit sit eiusmod est esse tempor incididunt consectetur eiusmod duis commodo veniam.\r\n",
-  "Ut sunt qui officia anim laboris exercitation Lorem quis laborum do eiusmod officia. Enim consectetur occaecat fugiat cillum cillum. Dolore dolore nostrud in commodo fugiat mollit consequat occaecat non et et elit ullamco. Sit voluptate minim ut est culpa velit nulla fugiat reprehenderit eu aliquip adipisicing labore. Sit minim minim do dolor dolor. Lorem Lorem labore exercitation magna veniam eiusmod do.\r\n",
-  "Fugiat dolor adipisicing quis aliquip aute dolore. Qui proident anim elit veniam ex aliquip eiusmod ipsum sunt pariatur est. Non fugiat duis do est officia adipisicing.\r\n",
-  "Nulla deserunt do laboris cupidatat veniam do consectetur ipsum elit veniam in mollit eu. Ea in consequat cupidatat laboris sint fugiat irure. In commodo esse reprehenderit deserunt minim velit ullamco enim eu cupidatat tempor ex. Ullamco in non id culpa amet occaecat culpa nostrud id. Non occaecat culpa magna incididunt.\r\n",
-  "Enim laboris ex mollit reprehenderit eiusmod exercitation magna. Exercitation Lorem ex mollit non non culpa labore enim. Adipisicing labore dolore incididunt do amet aliquip excepteur ad et nostrud officia aute veniam voluptate. Fugiat enim eiusmod Lorem esse. Minim ullamco commodo consequat ex commodo aliqua eu nulla eu. Veniam non enim nulla ut Lorem nostrud minim sint duis.\r\n",
-  "Enim duis consectetur in ullamco cillum veniam nulla amet. Exercitation nisi sunt sunt duis in culpa nisi magna ex id ipsum laboris reprehenderit qui. Officia pariatur qui ex fugiat veniam et sunt sit nostrud. Veniam ullamco tempor fugiat minim Lorem proident velit in eiusmod elit. Enim minim excepteur aute aliquip ex magna commodo dolore qui et labore. Proident eu aliquip cillum dolor. Nostrud ipsum ut irure consequat fugiat nulla proident occaecat laborum.\r\n",
-  "Amet duis eiusmod sunt adipisicing esse ex nostrud consectetur voluptate cillum. Ipsum occaecat sit et anim velit irure ea incididunt cupidatat ullamco in nisi quis. Esse officia ipsum commodo qui quis qui do. Commodo aliquip amet aute sit sit ut cupidatat elit nostrud.\r\n",
-  "Laboris laboris sit mollit cillum nulla deserunt commodo culpa est commodo anim id anim sit. Officia id consectetur velit incididunt est dolor sunt ipsum magna aliqua consectetur. Eiusmod pariatur minim deserunt cupidatat veniam Lorem aliquip sunt proident eu Lorem sit dolor fugiat. Proident qui ut ex in incididunt nulla nulla dolor ex laboris ea ad.\r\n",
-  "Ex incididunt enim labore nulla cupidatat elit. Quis ut incididunt incididunt non irure commodo do mollit cillum anim excepteur. Qui consequat laborum dolore elit tempor aute ut nulla pariatur eu ullamco veniam. Nisi non velit labore in commodo excepteur culpa nulla tempor cillum. Ipsum qui sit sint reprehenderit ut labore incididunt dolor aliquip sunt. Reprehenderit occaecat tempor nisi laborum.\r\n",
-  "Lorem officia ullamco eu occaecat in magna eiusmod consectetur nisi aliqua mollit esse. Ullamco ex aute nostrud pariatur do enim cillum sint do fugiat nostrud culpa tempor. Do aliquip excepteur nostrud culpa eu pariatur eiusmod cillum excepteur do. Est sunt non quis cillum voluptate ex.\r\n",
-  "Deserunt consectetur tempor irure mollit qui tempor et. Labore enim eu irure laboris in. Nisi in tempor ex occaecat amet cupidatat laboris occaecat amet minim ut magna incididunt id. Consequat cillum laborum commodo mollit. Et magna culpa sunt dolore consequat laboris et sit. Deserunt qui voluptate excepteur dolor. Eu qui amet est proident.\r\n",
-  "Eu elit minim eiusmod occaecat eu nostrud dolor qui ut elit. Sunt dolore proident ea eu do eiusmod fugiat incididunt pariatur duis amet Lorem nisi ut. Adipisicing quis veniam cupidatat Lorem sint culpa sunt veniam sint. Excepteur eu exercitation est magna pariatur veniam dolore qui fugiat labore proident eiusmod cillum. Commodo reprehenderit elit proident duis sint magna.\r\n",
-  "Ut aliquip pariatur deserunt nostrud commodo ad proident est exercitation. Sit minim do ea enim sint officia nisi incididunt laborum. Ex amet duis commodo fugiat. Ut aute tempor deserunt irure occaecat aliquip voluptate cillum aute elit qui nostrud.\r\n",
-  "Irure et quis consectetur sit est do sunt aliquip eu. Cupidatat pariatur consequat dolore consectetur. Adipisicing magna velit mollit occaecat do id. Nisi pariatur cupidatat cillum incididunt excepteur consectetur excepteur do laborum deserunt irure pariatur cillum.\r\n",
-  "Adipisicing esse incididunt cillum est irure consequat irure ad aute voluptate. Incididunt do occaecat nostrud do ipsum pariatur Lorem qui laboris et pariatur. Est exercitation dolor culpa ad velit ut et.\r\n",
-  "Sit eiusmod id enim ad ex dolor pariatur do. Ullamco occaecat quis dolor minim non elit labore amet est. Commodo velit eu nulla eiusmod ullamco. Incididunt anim pariatur aute eiusmod veniam tempor enim officia elit id. Elit Lorem est commodo dolore nostrud. Labore et consectetur do exercitation veniam laboris incididunt aliqua proident dolore ea officia cupidatat. Velit laboris aliquip deserunt labore commodo.\r\n",
-  "Proident nostrud labore eu nostrud. Excepteur ut in velit labore ea proident labore ea sint cillum. Incididunt ipsum consectetur officia irure sit pariatur veniam id velit officia mollit. Adipisicing magna voluptate velit excepteur enim consectetur incididunt voluptate tempor occaecat fugiat velit excepteur labore. Do do incididunt qui nisi voluptate enim. Laboris aute sit voluptate cillum pariatur minim excepteur ullamco mollit deserunt.\r\n",
-  "Excepteur laborum adipisicing nisi elit fugiat tempor. Elit laboris qui enim labore duis. Proident tempor in consectetur proident excepteur do ex laboris sit.\r\n",
-  "Dolore do ea incididunt do duis dolore eu labore nisi cupidatat voluptate amet incididunt minim. Nulla pariatur mollit cupidatat adipisicing nulla et. Dolor aliquip in ex magna excepteur. Nulla consequat minim consequat ullamco dolor laboris ullamco eu reprehenderit duis nostrud pariatur.\r\n",
-  "Id nisi labore duis qui. Incididunt laboris tempor aute do sit. Occaecat excepteur est mollit ea in mollit ullamco est amet reprehenderit.\r\n",
-  "Aute labore ipsum velit non voluptate eiusmod et reprehenderit cupidatat occaecat. Lorem tempor tempor consectetur exercitation qui nostrud sunt cillum quis ut non dolore. Reprehenderit consequat reprehenderit laborum qui pariatur anim et officia est cupidatat enim velit velit.\r\n",
-  "Commodo ex et fugiat cupidatat non adipisicing commodo. Minim ad dolore fugiat mollit cupidatat aliqua sunt dolor sit. Labore esse labore velit aute enim. Nulla duis incididunt est aliquip consectetur elit qui incididunt minim minim labore amet sit cillum.\r\n"
-]
\ No newline at end of file
diff --git a/3rdparty/rapidjson/bin/types/readme.txt b/3rdparty/rapidjson/bin/types/readme.txt
deleted file mode 100644
index da1dae675e9..00000000000
--- a/3rdparty/rapidjson/bin/types/readme.txt
+++ /dev/null
@@ -1 +0,0 @@
-Test data obtained from https://github.com/xpol/lua-rapidjson/tree/master/performance
diff --git a/3rdparty/rapidjson/license.txt b/3rdparty/rapidjson/license.txt
index 7ccc161c84b..ea41e048ce7 100644
--- a/3rdparty/rapidjson/license.txt
+++ b/3rdparty/rapidjson/license.txt
@@ -23,30 +23,6 @@ Redistribution and use in source and binary forms, with or without modification,
 
 THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-Open Source Software Licensed Under the JSON License:
---------------------------------------------------------------------
-
-json.org 
-Copyright (c) 2002 JSON.org
-All Rights Reserved.
-
-JSON_checker
-Copyright (c) 2002 JSON.org
-All Rights Reserved.
-
-	
-Terms of the JSON License:
----------------------------------------------------
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-The Software shall be used for Good, not Evil.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
 Terms of the MIT License:
 --------------------------------------------------------------------
 

From 0bcc96406d187ce2907b05bd54c71ec7ef4085ed Mon Sep 17 00:00:00 2001
From: Miodrag Milanovic <mmicko@gmail.com>
Date: Fri, 15 Apr 2016 16:08:28 +0200
Subject: [PATCH 012/122] renamed class to osd_watchdog (nw)

---
 src/osd/modules/lib/osdobj_common.cpp | 2 +-
 src/osd/modules/lib/osdobj_common.h   | 2 +-
 src/osd/watchdog.cpp                  | 8 ++++----
 src/osd/watchdog.h                    | 6 +++---
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/osd/modules/lib/osdobj_common.cpp b/src/osd/modules/lib/osdobj_common.cpp
index adc202ce4db..c9d4a37798d 100644
--- a/src/osd/modules/lib/osdobj_common.cpp
+++ b/src/osd/modules/lib/osdobj_common.cpp
@@ -428,7 +428,7 @@ void osd_common_t::init(running_machine &machine)
 
 	if (watchdog_timeout != 0)
 	{
-		m_watchdog = std::make_unique<watchdog>();
+		m_watchdog = std::make_unique<osd_watchdog>();
 		m_watchdog->setTimeout(watchdog_timeout);
 	}
 }
diff --git a/src/osd/modules/lib/osdobj_common.h b/src/osd/modules/lib/osdobj_common.h
index 9afce249eb1..00778fac569 100644
--- a/src/osd/modules/lib/osdobj_common.h
+++ b/src/osd/modules/lib/osdobj_common.h
@@ -282,7 +282,7 @@ protected:
 	input_module*  m_lightgun_input;
 	input_module*  m_joystick_input;
 	output_module* m_output;
-	std::unique_ptr<watchdog> m_watchdog;
+	std::unique_ptr<osd_watchdog> m_watchdog;
 	std::vector<ui_menu_item> m_sliders;
 
 private:
diff --git a/src/osd/watchdog.cpp b/src/osd/watchdog.cpp
index 8a86464cb56..f963ef13f07 100644
--- a/src/osd/watchdog.cpp
+++ b/src/osd/watchdog.cpp
@@ -17,7 +17,7 @@
 
 static void *watchdog_thread(void *param)
 {
-	watchdog *thiz = (watchdog *) param;
+	osd_watchdog *thiz = (osd_watchdog *) param;
 
 	while (TRUE)
 	{
@@ -41,7 +41,7 @@ static void *watchdog_thread(void *param)
 	return nullptr;
 }
 
-watchdog::watchdog(void)
+osd_watchdog::osd_watchdog(void)
 : m_event(1,0)
 {
 	m_do_exit = 0;
@@ -49,7 +49,7 @@ watchdog::watchdog(void)
 	m_timeout = 60 * osd_ticks_per_second();
 }
 
-watchdog::~watchdog(void)
+osd_watchdog::~osd_watchdog(void)
 {
 	m_do_exit = 1;
 	m_event.set();
@@ -57,7 +57,7 @@ watchdog::~watchdog(void)
 	delete m_thread;
 }
 
-void watchdog::setTimeout(int timeout)
+void osd_watchdog::setTimeout(int timeout)
 {
 	m_timeout = timeout * osd_ticks_per_second();
 	this->reset();
diff --git a/src/osd/watchdog.h b/src/osd/watchdog.h
index f9c06e72bb0..dbcccf43abf 100644
--- a/src/osd/watchdog.h
+++ b/src/osd/watchdog.h
@@ -14,11 +14,11 @@
 #include <atomic>
 #include <thread>
 
-class watchdog
+class osd_watchdog
 {
 public:
-	watchdog(void);
-	~watchdog(void);
+	osd_watchdog(void);
+	~osd_watchdog(void);
 
 	void reset() { m_event.set(); }
 

From 570c743fcd610aa824c91ed0003ffe737477c6f6 Mon Sep 17 00:00:00 2001
From: Miodrag Milanovic <mmicko@gmail.com>
Date: Fri, 15 Apr 2016 16:16:56 +0200
Subject: [PATCH 013/122] this is no issue anymore (nw)

---
 src/osd/sdl/sdlinc.h | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/osd/sdl/sdlinc.h b/src/osd/sdl/sdlinc.h
index 47ead42c0cf..03bd37874ca 100644
--- a/src/osd/sdl/sdlinc.h
+++ b/src/osd/sdl/sdlinc.h
@@ -5,9 +5,6 @@
 
 #include <SDL2/SDL.h>
 #include <SDL2/SDL_version.h>
-// on win32 this includes windows.h by itself and breaks us!
-#ifndef SDLMAME_WIN32
 #include <SDL2/SDL_syswm.h>
-#endif
 
 #endif

From 295c7294d3dbccdd620529286c36423a390cca73 Mon Sep 17 00:00:00 2001
From: dankan1890 <mewuidev2@gmail.com>
Date: Fri, 15 Apr 2016 17:20:50 +0200
Subject: [PATCH 014/122] cdrom: declared (std::nothrow) some allocations. (nw)

---
 src/lib/util/cdrom.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/lib/util/cdrom.cpp b/src/lib/util/cdrom.cpp
index da3d921ae4a..74cc984a257 100644
--- a/src/lib/util/cdrom.cpp
+++ b/src/lib/util/cdrom.cpp
@@ -224,7 +224,7 @@ cdrom_file *cdrom_open(const char *inputfile)
 	UINT32 physofs, logofs;
 
 	/* allocate memory for the CD-ROM file */
-	file = new cdrom_file();
+	file = new (std::nothrow) cdrom_file();
 	if (file == nullptr)
 		return nullptr;
 
@@ -331,7 +331,7 @@ cdrom_file *cdrom_open(chd_file *chd)
 		return nullptr;
 
 	/* allocate memory for the CD-ROM file */
-	file = new cdrom_file();
+	file = new (std::nothrow) cdrom_file();
 	if (file == nullptr)
 		return nullptr;
 
@@ -1222,7 +1222,7 @@ chd_error cdrom_parse_metadata(chd_file *chd, cdrom_toc *toc)
 	if (toc->numtrks > 0)
 		return CHDERR_NONE;
 
-	printf("toc->numtrks = %d?!\n", toc->numtrks);
+	printf("toc->numtrks = %u?!\n", toc->numtrks);
 
 	/* look for old-style metadata */
 	dynamic_buffer oldmetadata;

From edb0904e763a6ff691700b3fb4685583665c497f Mon Sep 17 00:00:00 2001
From: dankan1890 <mewuidev2@gmail.com>
Date: Fri, 15 Apr 2016 17:23:56 +0200
Subject: [PATCH 015/122] chd: initialized m_hunknum inside the constructor.
 (nw)

---
 src/lib/util/chd.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/lib/util/chd.h b/src/lib/util/chd.h
index ee8a03f5d17..b178c6083ba 100644
--- a/src/lib/util/chd.h
+++ b/src/lib/util/chd.h
@@ -522,6 +522,7 @@ private:
 			: m_osd(nullptr)
 			, m_compressor(nullptr)
 			, m_status(WS_READY)
+			, m_hunknum(0)
 			, m_data(nullptr)
 			, m_compressed(nullptr)
 			, m_complen(0)

From a0715c7c400f1a7e41285a06eef23535fb0afa1d Mon Sep 17 00:00:00 2001
From: dankan1890 <mewuidev2@gmail.com>
Date: Fri, 15 Apr 2016 17:39:45 +0200
Subject: [PATCH 016/122] Reduction code for entries of "enum class
 ui_menu_item_type" and the use of item_append with separators.

---
 src/emu/clifront.cpp                         |  1 -
 src/emu/ui/barcode.cpp                       |  2 +-
 src/emu/ui/cheatopt.cpp                      | 12 ++++++------
 src/emu/ui/custmenu.cpp                      | 12 ++++++------
 src/emu/ui/custui.cpp                        | 14 +++++++-------
 src/emu/ui/datmenu.cpp                       | 10 +++++-----
 src/emu/ui/dirmenu.cpp                       |  8 ++++----
 src/emu/ui/filemngr.cpp                      |  4 ++--
 src/emu/ui/filesel.cpp                       |  4 ++--
 src/emu/ui/inputmap.cpp                      |  8 ++++----
 src/emu/ui/mainmenu.cpp                      |  4 ++--
 src/emu/ui/menu.cpp                          | 11 +++++++++++
 src/emu/ui/menu.h                            |  9 +++++----
 src/emu/ui/optsmenu.cpp                      |  4 ++--
 src/emu/ui/pluginopt.cpp                     |  4 ++--
 src/emu/ui/selector.cpp                      |  2 +-
 src/emu/ui/selsoft.cpp                       | 12 ++++++------
 src/emu/ui/simpleselgame.cpp                 |  2 +-
 src/emu/ui/sliders.cpp                       | 12 ++++++------
 src/emu/ui/slotopt.cpp                       |  2 +-
 src/emu/ui/sndmenu.cpp                       |  2 +-
 src/emu/ui/ui.cpp                            |  2 +-
 src/emu/ui/videoopt.cpp                      |  2 +-
 src/osd/modules/debugger/debugint.cpp        | 14 +++++++-------
 src/osd/modules/render/bgfx/chainmanager.cpp |  6 +++---
 src/osd/modules/render/d3d/d3dhlsl.cpp       |  2 +-
 26 files changed, 88 insertions(+), 77 deletions(-)

diff --git a/src/emu/clifront.cpp b/src/emu/clifront.cpp
index 4a718febd0e..0797974e379 100644
--- a/src/emu/clifront.cpp
+++ b/src/emu/clifront.cpp
@@ -107,7 +107,6 @@ int cli_frontend::execute(int argc, char **argv)
 
 		m_options.parse_standard_inis(option_errors);
 
-		//load_translation();
 		load_translation(m_options);
 
 		manager->start_luaengine();
diff --git a/src/emu/ui/barcode.cpp b/src/emu/ui/barcode.cpp
index 4dc734a2bd2..6478e7db3fc 100644
--- a/src/emu/ui/barcode.cpp
+++ b/src/emu/ui/barcode.cpp
@@ -72,7 +72,7 @@ void ui_menu_barcode_reader::populate()
 		item_append(_("New Barcode:"), new_barcode, 0, ITEMREF_NEW_BARCODE);
 
 		// finish up the menu
-		item_append(MENU_SEPARATOR_ITEM, nullptr, 0, nullptr);
+		item_append(ui_menu_item_type::SEPARATOR);
 		item_append(_("Enter Code"), nullptr, 0, ITEMREF_ENTER_BARCODE);
 
 		customtop = machine().ui().get_line_height() + 3.0f * UI_BOX_TB_BORDER;
diff --git a/src/emu/ui/cheatopt.cpp b/src/emu/ui/cheatopt.cpp
index fecb954cd0f..acb8710c51e 100644
--- a/src/emu/ui/cheatopt.cpp
+++ b/src/emu/ui/cheatopt.cpp
@@ -121,7 +121,7 @@ void ui_menu_cheat::populate()
 	item_append(_("Autofire Settings"), nullptr, 0, (void *)ITEMREF_CHEATS_AUTOFIRE_SETTINGS);
 
 	/* add a separator */
-	item_append(MENU_SEPARATOR_ITEM, nullptr, 0, nullptr);
+	item_append(ui_menu_item_type::SEPARATOR);
 
 	// add other cheats
 	if (!machine().cheat().entries().empty()) {
@@ -133,7 +133,7 @@ void ui_menu_cheat::populate()
 		}
 
 		/* add a separator */
-		item_append(MENU_SEPARATOR_ITEM, nullptr, 0, nullptr);
+		item_append(ui_menu_item_type::SEPARATOR);
 
 		/* add a reset all option */
 		item_append(_("Reset All"), nullptr, 0, (void *)ITEMREF_CHEATS_RESET_ALL);
@@ -272,7 +272,7 @@ void ui_menu_autofire::populate()
 				if (is_first_button)
 				{
 					/* add a separator for each player */
-					item_append(MENU_SEPARATOR_ITEM, nullptr, 0, nullptr);
+					item_append(ui_menu_item_type::SEPARATOR);
 					is_first_button = false;
 				}
 				/* add an autofire item */
@@ -295,12 +295,12 @@ void ui_menu_autofire::populate()
 	/* add text item if no buttons found */
 	if (menu_items==0)
 	{
-		item_append(MENU_SEPARATOR_ITEM, nullptr, 0, nullptr);
+		item_append(ui_menu_item_type::SEPARATOR);
 		item_append(_("No buttons found on this machine!"), nullptr, MENU_FLAG_DISABLE, nullptr);
 	}
 
 	/* add a separator */
-	item_append(MENU_SEPARATOR_ITEM, nullptr, 0, nullptr);
+	item_append(ui_menu_item_type::SEPARATOR);
 
 	/* add autofire delay item */
 	int value = machine().ioport().get_autofire_delay();
@@ -315,7 +315,7 @@ void ui_menu_autofire::populate()
 	}
 
 	/* add a separator */
-	item_append(MENU_SEPARATOR_ITEM, nullptr, 0, nullptr);
+	item_append(ui_menu_item_type::SEPARATOR);
 
 	last_toggle = autofire_toggle;
 }
diff --git a/src/emu/ui/custmenu.cpp b/src/emu/ui/custmenu.cpp
index 545f9b96e23..25ffdff8bde 100644
--- a/src/emu/ui/custmenu.cpp
+++ b/src/emu/ui/custmenu.cpp
@@ -159,7 +159,7 @@ void ui_menu_custom_filter::populate()
 	// add other filters
 	for (int x = 1; x <= custfltr::numother; x++)
 	{
-		item_append(MENU_SEPARATOR_ITEM, nullptr, 0, nullptr);
+		item_append(ui_menu_item_type::SEPARATOR);
 
 		// add filter items
 		arrow_flags = get_arrow_flags((int)FILTER_UNAVAILABLE + 1, (int)FILTER_LAST - 1, custfltr::other[x]);
@@ -187,7 +187,7 @@ void ui_menu_custom_filter::populate()
 		}
 	}
 
-	item_append(MENU_SEPARATOR_ITEM, nullptr, 0, nullptr);
+	item_append(ui_menu_item_type::SEPARATOR);
 
 	if (custfltr::numother > 0)
 		item_append(_("Remove last filter"), nullptr, 0, (void *)(FPTR)REMOVE_FILTER);
@@ -195,7 +195,7 @@ void ui_menu_custom_filter::populate()
 	if (custfltr::numother < MAX_CUST_FILTER - 2)
 		item_append(_("Add filter"), nullptr, 0, (void *)(FPTR)ADD_FILTER);
 
-	item_append(MENU_SEPARATOR_ITEM, nullptr, 0, nullptr);
+	item_append(ui_menu_item_type::SEPARATOR);
 	customtop = machine().ui().get_line_height() + 3.0f * UI_BOX_TB_BORDER;
 }
 
@@ -447,7 +447,7 @@ void ui_menu_swcustom_filter::populate()
 	// add other filters
 	for (int x = 1; x <= sw_custfltr::numother; x++)
 	{
-		item_append(MENU_SEPARATOR_ITEM, nullptr, 0, nullptr);
+		item_append(ui_menu_item_type::SEPARATOR);
 
 		// add filter items
 		arrow_flags = get_arrow_flags((int)UI_SW_UNAVAILABLE + 1, (int)UI_SW_LAST - 1, sw_custfltr::other[x]);
@@ -502,7 +502,7 @@ void ui_menu_swcustom_filter::populate()
 		}
 	}
 
-	item_append(MENU_SEPARATOR_ITEM, nullptr, 0, nullptr);
+	item_append(ui_menu_item_type::SEPARATOR);
 
 	if (sw_custfltr::numother > 0)
 		item_append(_("Remove last filter"), nullptr, 0, (void *)(FPTR)REMOVE_FILTER);
@@ -510,7 +510,7 @@ void ui_menu_swcustom_filter::populate()
 	if (sw_custfltr::numother < MAX_CUST_FILTER - 2)
 		item_append(_("Add filter"), nullptr, 0, (void *)(FPTR)ADD_FILTER);
 
-	item_append(MENU_SEPARATOR_ITEM, nullptr, 0, nullptr);
+	item_append(ui_menu_item_type::SEPARATOR);
 
 	customtop = machine().ui().get_line_height() + 3.0f * UI_BOX_TB_BORDER;
 }
diff --git a/src/emu/ui/custui.cpp b/src/emu/ui/custui.cpp
index 6eabfeb65b1..9b8c81a2de4 100644
--- a/src/emu/ui/custui.cpp
+++ b/src/emu/ui/custui.cpp
@@ -150,7 +150,7 @@ void ui_menu_custom_ui::populate()
 	arrow_flags = get_arrow_flags(0, (int)HIDE_BOTH, ui_globals::panels_status);
 	item_append(_("Show side panels"), _(hide_status[ui_globals::panels_status]), arrow_flags, (void *)(FPTR)HIDE_MENU);
 
-	item_append(MENU_SEPARATOR_ITEM, nullptr, 0, nullptr);
+	item_append(ui_menu_item_type::SEPARATOR);
 	customtop = machine().ui().get_line_height() + 3.0f * UI_BOX_TB_BORDER;
 }
 
@@ -357,13 +357,13 @@ void ui_menu_font_ui::populate()
 	arrow_flags = get_arrow_flags(m_font_min, m_font_max, m_font_size);
 	item_append(_("Lines"), string_format("%2d", m_font_size).c_str(), arrow_flags, (void *)(FPTR)FONT_SIZE);
 
-	item_append(MENU_SEPARATOR_ITEM, nullptr, 0, nullptr);
+	item_append(ui_menu_item_type::SEPARATOR);
 
 	// add item
 	arrow_flags = get_arrow_flags(m_info_min, m_info_max, m_info_size);
 	item_append(_("Infos text size"), string_format("%3.2f", m_info_size).c_str(), arrow_flags, (void *)(FPTR)INFOS_SIZE);
 
-	item_append(MENU_SEPARATOR_ITEM, nullptr, 0, nullptr);
+	item_append(ui_menu_item_type::SEPARATOR);
 
 	custombottom = customtop = machine().ui().get_line_height() + 3.0f * UI_BOX_TB_BORDER;
 }
@@ -520,7 +520,7 @@ void ui_menu_colors_ui::populate()
 	item_append(_("Mouse down color"), nullptr, 0, (void *)(FPTR)MUI_MOUSEDOWN_COLOR);
 	item_append(_("Mouse down background color"), nullptr, 0, (void *)(FPTR)MUI_MOUSEDOWN_BG_COLOR);
 
-	item_append(MENU_SEPARATOR_ITEM, nullptr, 0, nullptr);
+	item_append(ui_menu_item_type::SEPARATOR);
 	item_append(_("Restore originals colors"), nullptr, 0, (void *)(FPTR)MUI_RESTORE);
 
 	custombottom = customtop = machine().ui().get_line_height() + 3.0f * UI_BOX_TB_BORDER;
@@ -863,9 +863,9 @@ void ui_menu_rgb_ui::populate()
 	else
 		item_append(_("Blue"), s_text.c_str(), 0, (void *)(FPTR)RGB_BLUE);
 
-	item_append(MENU_SEPARATOR_ITEM, nullptr, 0, nullptr);
+	item_append(ui_menu_item_type::SEPARATOR);
 	item_append(_("Choose from palette"), nullptr, 0, (void *)(FPTR)PALETTE_CHOOSE);
-	item_append(MENU_SEPARATOR_ITEM, nullptr, 0, nullptr);
+	item_append(ui_menu_item_type::SEPARATOR);
 
 	custombottom = customtop = machine().ui().get_line_height() + 3.0f * UI_BOX_TB_BORDER;
 }
@@ -1057,7 +1057,7 @@ void ui_menu_palette_sel::populate()
 	for (int x = 0; x < ARRAY_LENGTH(m_palette); ++x)
 		item_append(_(m_palette[x].name), m_palette[x].argb, MENU_FLAG_UI_PALETTE, (void *)(FPTR)(x + 1));
 
-	item_append(MENU_SEPARATOR_ITEM, nullptr, 0, nullptr);
+	item_append(ui_menu_item_type::SEPARATOR);
 }
 
 //-------------------------------------------------
diff --git a/src/emu/ui/datmenu.cpp b/src/emu/ui/datmenu.cpp
index d97cc122ee1..85a237b582e 100644
--- a/src/emu/ui/datmenu.cpp
+++ b/src/emu/ui/datmenu.cpp
@@ -131,7 +131,7 @@ void ui_menu_dats_view::custom_render(void *selectedref, float top, float bottom
 	mui.draw_text_full(container, driver.c_str(), 0.0f, 0.0f, 1.0f, JUSTIFY_CENTER, WRAP_TRUNCATE,
 		DRAW_NONE, ARGB_WHITE, ARGB_BLACK, &width, nullptr);
 	width += 2 * UI_BOX_LR_BORDER;
-	maxwidth = MAX(origx2 - origx1, width);
+	maxwidth = MAX(maxwidth, width);
 
 	// compute our bounds
 	float x1 = 0.5f - 0.5f * maxwidth;
@@ -246,8 +246,8 @@ void ui_menu_dats_view::get_data()
 	else
 		machine().datfile().load_data_info(m_driver, buffer, m_items_list[m_actual].option);
 
-	int totallines = machine().ui().wrap_text(container, buffer.c_str(), 0.0f, 0.0f, 1.0f - (4.0f * UI_BOX_LR_BORDER), xstart, xend);
-	for (int x = 0; x < totallines; ++x)
+	int lines = machine().ui().wrap_text(container, buffer.c_str(), 0.0f, 0.0f, 1.0f - (4.0f * UI_BOX_LR_BORDER), xstart, xend);
+	for (int x = 0; x < lines; ++x)
 	{
 		std::string tempbuf(buffer.substr(xstart[x], xend[x] - xstart[x]));
 		item_append(tempbuf.c_str(), nullptr, (MENU_FLAG_UI_DATS | MENU_FLAG_DISABLE), (void *)(FPTR)(x + 1));
@@ -269,8 +269,8 @@ void ui_menu_dats_view::get_data_sw()
 			machine().datfile().load_software_info(m_swinfo->listname, buffer, m_swinfo->shortname, m_swinfo->parentname);
 	}
 
-	int totallines = machine().ui().wrap_text(container, buffer.c_str(), 0.0f, 0.0f, 1.0f - (4.0f * UI_BOX_LR_BORDER), xstart, xend);
-	for (int x = 0; x < totallines; ++x)
+	int lines = machine().ui().wrap_text(container, buffer.c_str(), 0.0f, 0.0f, 1.0f - (4.0f * UI_BOX_LR_BORDER), xstart, xend);
+	for (int x = 0; x < lines; ++x)
 	{
 		std::string tempbuf(buffer.substr(xstart[x], xend[x] - xstart[x]));
 		item_append(tempbuf.c_str(), nullptr, (MENU_FLAG_UI_DATS | MENU_FLAG_DISABLE), (void *)(FPTR)(x + 1));
diff --git a/src/emu/ui/dirmenu.cpp b/src/emu/ui/dirmenu.cpp
index 88c701b67ef..e4a9b693a1c 100644
--- a/src/emu/ui/dirmenu.cpp
+++ b/src/emu/ui/dirmenu.cpp
@@ -99,7 +99,7 @@ void ui_menu_directory::populate()
 	for (auto & elem : s_folders)
 		item_append(_(elem.name), nullptr, 0, (void *)(FPTR)elem.action);
 
-	item_append(MENU_SEPARATOR_ITEM, nullptr, 0, nullptr);
+	item_append(ui_menu_item_type::SEPARATOR);
 	customtop = machine().ui().get_line_height() + 3.0f * UI_BOX_TB_BORDER;
 }
 
@@ -197,7 +197,7 @@ void ui_menu_display_actual::populate()
 	if (m_folders.size() > 1)
 		item_append(_("Remove Folder"), nullptr, 0, (void *)REMOVE);
 
-	item_append(MENU_SEPARATOR_ITEM, nullptr, 0, nullptr);
+	item_append(ui_menu_item_type::SEPARATOR);
 	customtop = (m_folders.size() + 1) * machine().ui().get_line_height() + 6.0f * UI_BOX_TB_BORDER;
 }
 
@@ -475,7 +475,7 @@ void ui_menu_add_change_folder::populate()
 			item_append(dirent->name, "[DIR]", 0, (void *)(FPTR)++folders_count);
 	}
 
-	item_append(MENU_SEPARATOR_ITEM, nullptr, 0, nullptr);
+	item_append(ui_menu_item_type::SEPARATOR);
 
 	// configure the custom rendering
 	customtop = 2.0f * machine().ui().get_line_height() + 3.0f * UI_BOX_TB_BORDER;
@@ -625,7 +625,7 @@ void ui_menu_remove_folder::populate()
 	for (auto & elem : m_folders)
 		item_append(elem.c_str(), nullptr, 0, (void *)(FPTR)++folders_count);
 
-	item_append(MENU_SEPARATOR_ITEM, nullptr, 0, nullptr);
+	item_append(ui_menu_item_type::SEPARATOR);
 	customtop = machine().ui().get_line_height() + 3.0f * UI_BOX_TB_BORDER;
 }
 
diff --git a/src/emu/ui/filemngr.cpp b/src/emu/ui/filemngr.cpp
index 6c2cd3894bd..7fbff85217f 100644
--- a/src/emu/ui/filemngr.cpp
+++ b/src/emu/ui/filemngr.cpp
@@ -142,7 +142,7 @@ void ui_menu_file_manager::populate()
 							if (first_entry)
 								first_entry = false;
 							else
-								item_append(MENU_SEPARATOR_ITEM, nullptr, 0, nullptr);
+								item_append(ui_menu_item_type::SEPARATOR);
 							item_append(string_format("[root%s]", dev->tag()).c_str(), nullptr, 0, nullptr);
 							tag_appended = true;
 						}
@@ -153,7 +153,7 @@ void ui_menu_file_manager::populate()
 			}
 		}
 	}
-	item_append(MENU_SEPARATOR_ITEM, nullptr, 0, nullptr);
+	item_append(ui_menu_item_type::SEPARATOR);
 	item_append("Reset",  nullptr, 0, (void *)1);
 
 	custombottom = machine().ui().get_line_height() + 3.0f * UI_BOX_TB_BORDER;
diff --git a/src/emu/ui/filesel.cpp b/src/emu/ui/filesel.cpp
index 7acab761ea5..73edf1d6483 100644
--- a/src/emu/ui/filesel.cpp
+++ b/src/emu/ui/filesel.cpp
@@ -283,7 +283,7 @@ void ui_menu_file_create::populate()
 	}
 
 	// finish up the menu
-	item_append(MENU_SEPARATOR_ITEM, nullptr, 0, nullptr);
+	item_append(ui_menu_item_type::SEPARATOR);
 	item_append(_("Create"), nullptr, 0, ITEMREF_CREATE);
 
 	customtop = machine().ui().get_line_height() + 3.0f * UI_BOX_TB_BORDER;
@@ -809,7 +809,7 @@ void ui_menu_select_format::populate()
 		const floppy_image_format_t *fmt = m_formats[i];
 
 		if (i && i == m_ext_match)
-			item_append(MENU_SEPARATOR_ITEM, nullptr, 0, nullptr);
+			item_append(ui_menu_item_type::SEPARATOR);
 		item_append(fmt->description(), fmt->name(), 0, (void *)(FPTR)i);
 	}
 }
diff --git a/src/emu/ui/inputmap.cpp b/src/emu/ui/inputmap.cpp
index 616e3e80bfa..c78ef8da7b0 100644
--- a/src/emu/ui/inputmap.cpp
+++ b/src/emu/ui/inputmap.cpp
@@ -415,7 +415,7 @@ void ui_menu_input::populate_and_sort(input_item_data *itemlist)
 			if (first_entry)
 				first_entry = false;
 			else
-				item_append(MENU_SEPARATOR_ITEM, nullptr, 0, nullptr);
+				item_append(ui_menu_item_type::SEPARATOR);
 			item_append(string_format("[root%s]", item->owner_name).c_str(), nullptr, 0, nullptr);
 			prev_owner.assign(item->owner_name);
 		}
@@ -565,7 +565,7 @@ void ui_menu_settings::populate()
 					if (first_entry)
 						first_entry = false;
 					else
-						item_append(MENU_SEPARATOR_ITEM, nullptr, 0, nullptr);
+						item_append(ui_menu_item_type::SEPARATOR);
 					string_format("[root%s]", field.device().tag());
 					item_append(string_format("[root%s]", field.device().tag()).c_str(), nullptr, 0, nullptr);
 					prev_owner.assign(field.device().tag());
@@ -618,7 +618,7 @@ void ui_menu_settings::populate()
 	if (type == IPT_DIPSWITCH)
 		custombottom = dipcount ? dipcount * (DIP_SWITCH_HEIGHT + DIP_SWITCH_SPACING) + DIP_SWITCH_SPACING : 0;
 
-	item_append(MENU_SEPARATOR_ITEM, nullptr, 0, nullptr);
+	item_append(ui_menu_item_type::SEPARATOR);
 	item_append(_("Reset"),  nullptr, 0, (void *)1);
 }
 
@@ -862,7 +862,7 @@ void ui_menu_analog::populate()
 							if (first_entry)
 								first_entry = false;
 							else
-								item_append(MENU_SEPARATOR_ITEM, nullptr, 0, nullptr);
+								item_append(ui_menu_item_type::SEPARATOR);
 							item_append(string_format("[root%s]", field.device().tag()).c_str(), nullptr, 0, nullptr);
 							prev_owner.assign(field.device().tag());
 						}
diff --git a/src/emu/ui/mainmenu.cpp b/src/emu/ui/mainmenu.cpp
index b2935049b9a..079ffbf8be8 100644
--- a/src/emu/ui/mainmenu.cpp
+++ b/src/emu/ui/mainmenu.cpp
@@ -138,7 +138,7 @@ void ui_menu_main::populate()
 	if (machine().ui().options().enabled_dats() && machine().datfile().has_data())
 		item_append(_("External DAT View"), nullptr, 0, (void *)EXTERNAL_DATS);
 
-	item_append(MENU_SEPARATOR_ITEM, nullptr, 0, nullptr);
+	item_append(ui_menu_item_type::SEPARATOR);
 
 	/* add favorite menu */
 	if (!machine().favorite().isgame_favorite())
@@ -146,7 +146,7 @@ void ui_menu_main::populate()
 	else
 		item_append(_("Remove From Favorites"), nullptr, 0, (void *)REMOVE_FAVORITE);
 
-	item_append(MENU_SEPARATOR_ITEM, nullptr, 0, nullptr);
+	item_append(ui_menu_item_type::SEPARATOR);
 
 //  item_append(_("Quit from Machine"), nullptr, 0, (void *)QUIT_GAME);
 
diff --git a/src/emu/ui/menu.cpp b/src/emu/ui/menu.cpp
index 1d8ae588c0f..52c2eba048a 100644
--- a/src/emu/ui/menu.cpp
+++ b/src/emu/ui/menu.cpp
@@ -306,6 +306,17 @@ void ui_menu::item_append(ui_menu_item item)
 //  end of the menu
 //-------------------------------------------------
 
+void ui_menu::item_append(ui_menu_item_type type)
+{
+	if (type == ui_menu_item_type::SEPARATOR)
+		item_append(MENU_SEPARATOR_ITEM, nullptr, 0, nullptr);
+}
+
+//-------------------------------------------------
+//  item_append - append a new item to the
+//  end of the menu
+//-------------------------------------------------
+
 void ui_menu::item_append(const char *text, const char *subtext, UINT32 flags, void *ref, ui_menu_item_type type)
 {
 	// only allow multiline as the first item
diff --git a/src/emu/ui/menu.h b/src/emu/ui/menu.h
index a07bcd1c519..7c8aa73a1d8 100644
--- a/src/emu/ui/menu.h
+++ b/src/emu/ui/menu.h
@@ -56,9 +56,9 @@ enum ui_menu_reset_options
 // types of menu items (TODO: please expand)
 enum class ui_menu_item_type
 {
-	UI_MENU_ITEM_TYPE_UNKNOWN,
-    UI_MENU_ITEM_TYPE_SLIDER,
-    UI_MENU_ITEM_TYPE_SEPARATOR
+	UNKNOWN,
+	SLIDER,
+	SEPARATOR
 };
 
 
@@ -120,8 +120,9 @@ public:
 	void reset(ui_menu_reset_options options);
 
 	// append a new item to the end of the menu
-	void item_append(const char *text, const char *subtext, UINT32 flags, void *ref, ui_menu_item_type type = ui_menu_item_type::UI_MENU_ITEM_TYPE_UNKNOWN);
+	void item_append(const char *text, const char *subtext, UINT32 flags, void *ref, ui_menu_item_type type = ui_menu_item_type::UNKNOWN);
 	void item_append(ui_menu_item item);
+	void item_append(ui_menu_item_type type);
 
 	// process a menu, drawing it and returning any interesting events
 	const ui_menu_event *process(UINT32 flags);
diff --git a/src/emu/ui/optsmenu.cpp b/src/emu/ui/optsmenu.cpp
index 796bd665512..ffe9d2fddd3 100644
--- a/src/emu/ui/optsmenu.cpp
+++ b/src/emu/ui/optsmenu.cpp
@@ -255,7 +255,7 @@ void ui_menu_game_options::populate()
 			item_append(fbuff.c_str(), nullptr, 0, (void *)(FPTR)CUSTOM_FILTER);
 		}
 
-		item_append(MENU_SEPARATOR_ITEM, nullptr, 0, nullptr);
+		item_append(ui_menu_item_type::SEPARATOR);
 
 		// add options items
 		item_append(_("Customize UI"), nullptr, 0, (void *)(FPTR)CUSTOM_MENU);
@@ -267,7 +267,7 @@ void ui_menu_game_options::populate()
 	item_append(_(control_submenu_options[0].description), nullptr, 0, (void *)(FPTR)CONTROLLER_MENU);
 	item_append(_("General Inputs"), nullptr, 0, (void *)(FPTR)CGI_MENU);
 	item_append(_(advanced_submenu_options[0].description), nullptr, 0, (void *)(FPTR)ADVANCED_MENU);
-	item_append(MENU_SEPARATOR_ITEM, nullptr, 0, nullptr);
+	item_append(ui_menu_item_type::SEPARATOR);
 	item_append(_("Save Configuration"), nullptr, 0, (void *)(FPTR)SAVE_CONFIG);
 
 	custombottom = 2.0f * machine().ui().get_line_height() + 3.0f * UI_BOX_TB_BORDER;
diff --git a/src/emu/ui/pluginopt.cpp b/src/emu/ui/pluginopt.cpp
index 9fd02404a0a..b2f1d81579a 100644
--- a/src/emu/ui/pluginopt.cpp
+++ b/src/emu/ui/pluginopt.cpp
@@ -34,7 +34,7 @@ void ui_menu_plugin::populate()
 {
 	for (auto &curplugin : m_plugins)
 		item_append(curplugin.c_str(), 0, 0, (void *)curplugin.c_str());
-	item_append(MENU_SEPARATOR_ITEM, nullptr, 0, nullptr);
+	item_append(ui_menu_item_type::SEPARATOR);
 }
 
 ui_menu_plugin::~ui_menu_plugin()
@@ -104,7 +104,7 @@ void ui_menu_plugin_opt::populate()
 
 		item_append(item.text.c_str(), item.subtext.c_str(), flags, (void *)i++);
 	}
-	item_append(MENU_SEPARATOR_ITEM, nullptr, 0, nullptr);
+	item_append(ui_menu_item_type::SEPARATOR);
 }
 
 ui_menu_plugin_opt::~ui_menu_plugin_opt()
diff --git a/src/emu/ui/selector.cpp b/src/emu/ui/selector.cpp
index af199b1cfe8..7ef7545c685 100644
--- a/src/emu/ui/selector.cpp
+++ b/src/emu/ui/selector.cpp
@@ -149,7 +149,7 @@ void ui_menu_selector::populate()
 			}
 	}
 
-	item_append(MENU_SEPARATOR_ITEM, nullptr, 0, nullptr);
+	item_append(ui_menu_item_type::SEPARATOR);
 	customtop = custombottom = machine().ui().get_line_height() + 3.0f * UI_BOX_TB_BORDER;
 	m_first_pass = false;
 }
diff --git a/src/emu/ui/selsoft.cpp b/src/emu/ui/selsoft.cpp
index b302881a958..e545b070b17 100644
--- a/src/emu/ui/selsoft.cpp
+++ b/src/emu/ui/selsoft.cpp
@@ -89,7 +89,7 @@ bool compare_software(ui_software_info a, ui_software_info b)
 bool has_multiple_bios(const game_driver *driver, s_bios &biosname)
 {
 	if (driver->rom == nullptr)
-		return 0;
+		return false;
 
 	std::string default_name;
 	for (const rom_entry *rom = driver->rom; !ROMENTRY_ISEND(rom); ++rom)
@@ -366,7 +366,7 @@ void ui_menu_select_software::handle()
 		{
 			highlight++;
 		}
-		else if (m_event->iptkey == IPT_UI_SELECT && m_focus == focused_menu::left)
+		else if (m_event->iptkey == IPT_OTHER && m_focus == focused_menu::left)
 		{
 			l_sw_hover = highlight;
 			check_filter = true;
@@ -1946,7 +1946,7 @@ void ui_software_parts::populate()
 	for (auto & elem : m_parts)
 		item_append(elem.first.c_str(), elem.second.c_str(), 0, (void *)&elem);
 
-	item_append(MENU_SEPARATOR_ITEM, nullptr, 0, nullptr);
+	item_append(ui_menu_item_type::SEPARATOR);
 	customtop = machine().ui().get_line_height() + (3.0f * UI_BOX_TB_BORDER);
 }
 
@@ -2041,7 +2041,7 @@ void ui_bios_selection::populate()
 	for (auto & elem : m_bios)
 		item_append(elem.first.c_str(), nullptr, 0, (void *)&elem.first);
 
-	item_append(MENU_SEPARATOR_ITEM, nullptr, 0, nullptr);
+	item_append(ui_menu_item_type::SEPARATOR);
 	customtop = machine().ui().get_line_height() + (3.0f * UI_BOX_TB_BORDER);
 }
 
@@ -2072,7 +2072,7 @@ void ui_bios_selection::handle()
 					}
 
 					std::string error;
-					moptions.set_value("bios", elem.second, OPTION_PRIORITY_CMDLINE, error);
+					moptions.set_value(OPTION_BIOS, elem.second, OPTION_PRIORITY_CMDLINE, error);
 					machine().manager().schedule_new_driver(*s_driver);
 					machine().schedule_hard_reset();
 					ui_menu::stack_reset(machine());
@@ -2081,7 +2081,7 @@ void ui_bios_selection::handle()
 				{
 					ui_software_info *ui_swinfo = (ui_software_info *)m_driver;
 					std::string error;
-					machine().options().set_value("bios", elem.second, OPTION_PRIORITY_CMDLINE, error);
+					machine().options().set_value(OPTION_BIOS, elem.second, OPTION_PRIORITY_CMDLINE, error);
 					driver_enumerator drivlist(machine().options(), *ui_swinfo->driver);
 					drivlist.next();
 					software_list_device *swlist = software_list_device::find_by_name(drivlist.config(), ui_swinfo->listname.c_str());
diff --git a/src/emu/ui/simpleselgame.cpp b/src/emu/ui/simpleselgame.cpp
index e6c4b197e50..73575a21026 100644
--- a/src/emu/ui/simpleselgame.cpp
+++ b/src/emu/ui/simpleselgame.cpp
@@ -261,7 +261,7 @@ void ui_simple_menu_select_game::populate()
 	// if we're forced into this, allow general input configuration as well
 	if (ui_menu::stack_has_special_main_menu())
 	{
-		item_append(MENU_SEPARATOR_ITEM, nullptr, 0, nullptr);
+		item_append(ui_menu_item_type::SEPARATOR);
 		item_append(_("Configure Options"), nullptr, 0, (void *)1);
 		skip_main_items = 1;
 	}
diff --git a/src/emu/ui/sliders.cpp b/src/emu/ui/sliders.cpp
index 20cb435233a..53869500eb0 100644
--- a/src/emu/ui/sliders.cpp
+++ b/src/emu/ui/sliders.cpp
@@ -39,7 +39,7 @@ void ui_menu_sliders::handle()
 	if (menu_event != nullptr)
 	{
 		/* handle keys if there is a valid item selected */
-		if (menu_event->itemref != nullptr && menu_event->type == ui_menu_item_type::UI_MENU_ITEM_TYPE_SLIDER)
+		if (menu_event->itemref != nullptr && menu_event->type == ui_menu_item_type::SLIDER)
 		{
 			const slider_state *slider = (const slider_state *)menu_event->itemref;
 			INT32 curvalue = (*slider->update)(machine(), slider->arg, slider->id, nullptr, SLIDER_NOCHANGE);
@@ -143,7 +143,7 @@ void ui_menu_sliders::populate()
 	std::vector<ui_menu_item> ui_sliders = machine().ui().get_slider_list();
 	for (ui_menu_item item : ui_sliders)
 	{
-        if (item.type == ui_menu_item_type::UI_MENU_ITEM_TYPE_SLIDER)
+        if (item.type == ui_menu_item_type::SLIDER)
         {
             slider_state* slider = reinterpret_cast<slider_state *>(item.ref);
             INT32 curval = (*slider->update)(machine(), slider->arg, slider->id, &tempstring, SLIDER_NOCHANGE);
@@ -152,7 +152,7 @@ void ui_menu_sliders::populate()
                 flags |= MENU_FLAG_LEFT_ARROW;
             if (curval < slider->maxval)
                 flags |= MENU_FLAG_RIGHT_ARROW;
-            item_append(slider->description, tempstring.c_str(), flags, (void *)slider, ui_menu_item_type::UI_MENU_ITEM_TYPE_SLIDER);
+            item_append(slider->description, tempstring.c_str(), flags, (void *)slider, ui_menu_item_type::SLIDER);
         }
         else
         {
@@ -160,13 +160,13 @@ void ui_menu_sliders::populate()
         }
 	}
 
-	item_append(MENU_SEPARATOR_ITEM, nullptr, 0, nullptr);
+	item_append(ui_menu_item_type::SEPARATOR);
 
 	/* add OSD options */
 	std::vector<ui_menu_item> osd_sliders = machine().osd().get_slider_list();
 	for (ui_menu_item item : osd_sliders)
 	{
-        if (item.type == ui_menu_item_type::UI_MENU_ITEM_TYPE_SLIDER)
+        if (item.type == ui_menu_item_type::SLIDER)
         {
             slider_state* slider = reinterpret_cast<slider_state *>(item.ref);
             INT32 curval = (*slider->update)(machine(), slider->arg, slider->id, &tempstring, SLIDER_NOCHANGE);
@@ -175,7 +175,7 @@ void ui_menu_sliders::populate()
                 flags |= MENU_FLAG_LEFT_ARROW;
             if (curval < slider->maxval)
                 flags |= MENU_FLAG_RIGHT_ARROW;
-            item_append(slider->description, tempstring.c_str(), flags, (void *)slider, ui_menu_item_type::UI_MENU_ITEM_TYPE_SLIDER);
+            item_append(slider->description, tempstring.c_str(), flags, (void *)slider, ui_menu_item_type::SLIDER);
         }
         else
         {
diff --git a/src/emu/ui/slotopt.cpp b/src/emu/ui/slotopt.cpp
index 35c9cab14a7..e6d0a74a452 100644
--- a/src/emu/ui/slotopt.cpp
+++ b/src/emu/ui/slotopt.cpp
@@ -168,7 +168,7 @@ void ui_menu_slot_devices::populate()
 
 		item_append(slot->device().tag() + 1, opt_name.c_str(), (slot->fixed() || slot_get_length(slot) == 0) ? 0 : (MENU_FLAG_LEFT_ARROW | MENU_FLAG_RIGHT_ARROW), (void *)slot);
 	}
-	item_append(MENU_SEPARATOR_ITEM, nullptr, 0, nullptr);
+	item_append(ui_menu_item_type::SEPARATOR);
 	item_append(_("Reset"),  nullptr, 0, (void *)1);
 }
 
diff --git a/src/emu/ui/sndmenu.cpp b/src/emu/ui/sndmenu.cpp
index 52768c09b3a..2bdb835f09b 100644
--- a/src/emu/ui/sndmenu.cpp
+++ b/src/emu/ui/sndmenu.cpp
@@ -133,7 +133,7 @@ void ui_menu_sound_options::populate()
 	item_append(_("Sound"), m_sound ? _("On") : _("Off"), m_sound ? MENU_FLAG_RIGHT_ARROW : MENU_FLAG_LEFT_ARROW, (void *)(FPTR)ENABLE_SOUND);
 	item_append(_("Sample Rate"), string_format("%d", m_sample_rate).c_str(), arrow_flags, (void *)(FPTR)SAMPLE_RATE);
 	item_append(_("Use External Samples"), m_samples ? _("On") : _("Off"), m_samples ? MENU_FLAG_RIGHT_ARROW : MENU_FLAG_LEFT_ARROW, (void *)(FPTR)ENABLE_SAMPLES);
-	item_append(MENU_SEPARATOR_ITEM, nullptr, 0, nullptr);
+	item_append(ui_menu_item_type::SEPARATOR);
 
 	customtop = machine().ui().get_line_height() + (3.0f * UI_BOX_TB_BORDER);
 }
diff --git a/src/emu/ui/ui.cpp b/src/emu/ui/ui.cpp
index 718e73bb9ef..2ad16e99f0c 100644
--- a/src/emu/ui/ui.cpp
+++ b/src/emu/ui/ui.cpp
@@ -2048,7 +2048,7 @@ std::vector<ui_menu_item> ui_manager::slider_init(running_machine &machine)
         item.subtext = "";
         item.flags = 0;
         item.ref = slider;
-        item.type = ui_menu_item_type::UI_MENU_ITEM_TYPE_SLIDER;
+        item.type = ui_menu_item_type::SLIDER;
         items.push_back(item);
     }
 
diff --git a/src/emu/ui/videoopt.cpp b/src/emu/ui/videoopt.cpp
index 388ee07981b..f0f54a20702 100644
--- a/src/emu/ui/videoopt.cpp
+++ b/src/emu/ui/videoopt.cpp
@@ -190,7 +190,7 @@ void ui_menu_video_options::populate()
 	}
 
 	/* add a separator */
-	item_append(MENU_SEPARATOR_ITEM, nullptr, 0, nullptr);
+	item_append(ui_menu_item_type::SEPARATOR);
 
 	/* add a rotate item */
 	switch (target->orientation())
diff --git a/src/osd/modules/debugger/debugint.cpp b/src/osd/modules/debugger/debugint.cpp
index 205af4e1f15..d35a931c33e 100644
--- a/src/osd/modules/debugger/debugint.cpp
+++ b/src/osd/modules/debugger/debugint.cpp
@@ -1355,7 +1355,7 @@ static void CreateMainMenu(running_machine &machine)
 	}
 
 	menu->item_append(title.append(focus_view->title).c_str(), nullptr, MENU_FLAG_DISABLE, nullptr);
-	menu->item_append(MENU_SEPARATOR_ITEM, nullptr, 0, nullptr);
+	menu->item_append(ui_menu_item_type::SEPARATOR);
 
 	switch (focus_view->type)
 	{
@@ -1375,7 +1375,7 @@ static void CreateMainMenu(running_machine &machine)
 		{
 			menu->item_append("CPU", focus_view->view->source()->name(), MENU_FLAG_RIGHT_ARROW, (void *)on_disasm_cpu_activate);
 		}
-		menu->item_append(MENU_SEPARATOR_ITEM, nullptr, 0, nullptr);
+		menu->item_append(ui_menu_item_type::SEPARATOR);
 		break;
 	}
 	case DVT_MEMORY:
@@ -1399,7 +1399,7 @@ static void CreateMainMenu(running_machine &machine)
 		case 11: subtext = "80-bit floating point"; break;
 		}
 		menu->item_append("Format", subtext, MENU_FLAG_LEFT_ARROW | MENU_FLAG_RIGHT_ARROW, (void *)on_memory_data_format);
-		menu->item_append(MENU_SEPARATOR_ITEM, nullptr, 0, nullptr);
+		menu->item_append(ui_menu_item_type::SEPARATOR);
 		break;
 	}
 	}
@@ -1411,19 +1411,19 @@ static void CreateMainMenu(running_machine &machine)
 	menu->item_append("New Error Log Window", "[Ctrl+L]", 0, (void *)on_log_window_activate);
 	menu->item_append("New Breakpoints Window", "[Ctrl+B]", 0, (void *)on_bp_window_activate);
 	menu->item_append("New Watchpoints Window", "[Ctrl+W]", 0, (void *)on_wp_window_activate);
-	menu->item_append(MENU_SEPARATOR_ITEM, nullptr, 0, nullptr);
+	menu->item_append(ui_menu_item_type::SEPARATOR);
 	menu->item_append("Run", "[F5]", 0, (void *)on_run_activate);
 	menu->item_append("Run and Hide Debugger", "[F12]", 0, (void *)on_run_h_activate);
 	menu->item_append("Run to Next CPU", "[F6]", 0, (void *)on_run_cpu_activate);
 	menu->item_append("Run until Next Interrupt on This CPU", "[F7]", 0, (void *)on_run_irq_activate);
 	menu->item_append("Run until Next VBLANK", "[F8]", 0, (void *)on_run_vbl_activate);
-	menu->item_append(MENU_SEPARATOR_ITEM, nullptr, 0, nullptr);
+	menu->item_append(ui_menu_item_type::SEPARATOR);
 	menu->item_append("Step Into", "[F11]", 0, (void *)on_step_into_activate);
 	menu->item_append("Step Over", "[F10]", 0, (void *)on_step_over_activate);
-	menu->item_append(MENU_SEPARATOR_ITEM, nullptr, 0, nullptr);
+	menu->item_append(ui_menu_item_type::SEPARATOR);
 	menu->item_append("Soft Reset", "[F3]", 0, (void *)on_soft_reset_activate);
 	menu->item_append("Hard Reset", "[Shift+F3]", 0, (void *)on_hard_reset_activate);
-	menu->item_append(MENU_SEPARATOR_ITEM, nullptr, 0, nullptr);
+	menu->item_append(ui_menu_item_type::SEPARATOR);
 	if (!dview_is_state(focus_view, VIEW_STATE_FOLLOW_CPU))
 		menu->item_append("Close Window", "[Shift+F4]", 0, (void *)on_close_activate);
 	menu->item_append("Exit", nullptr, 0, (void *)on_exit_activate);
diff --git a/src/osd/modules/render/bgfx/chainmanager.cpp b/src/osd/modules/render/bgfx/chainmanager.cpp
index 25f79e5e456..e243748caac 100644
--- a/src/osd/modules/render/bgfx/chainmanager.cpp
+++ b/src/osd/modules/render/bgfx/chainmanager.cpp
@@ -373,7 +373,7 @@ void chain_manager::create_selection_slider(uint32_t screen_index)
     item.subtext = "";
     item.flags = 0;
     item.ref = state;
-    item.type = ui_menu_item_type::UI_MENU_ITEM_TYPE_SLIDER;
+    item.type = ui_menu_item_type::SLIDER;
     m_selection_sliders.push_back(item);
 }
 
@@ -455,7 +455,7 @@ std::vector<ui_menu_item> chain_manager::get_slider_list()
             item.subtext = "";
             item.flags = 0;
             item.ref = core_slider;
-            item.type = ui_menu_item_type::UI_MENU_ITEM_TYPE_SLIDER;
+            item.type = ui_menu_item_type::SLIDER;
             m_selection_sliders.push_back(item);
 
             sliders.push_back(item);
@@ -468,7 +468,7 @@ std::vector<ui_menu_item> chain_manager::get_slider_list()
             item.subtext = "";
             item.flags = 0;
             item.ref = nullptr;
-            item.type = ui_menu_item_type::UI_MENU_ITEM_TYPE_SEPARATOR;
+            item.type = ui_menu_item_type::SEPARATOR;
 
             sliders.push_back(item);
 		}
diff --git a/src/osd/modules/render/d3d/d3dhlsl.cpp b/src/osd/modules/render/d3d/d3dhlsl.cpp
index d89ead8938e..89141c70e77 100644
--- a/src/osd/modules/render/d3d/d3dhlsl.cpp
+++ b/src/osd/modules/render/d3d/d3dhlsl.cpp
@@ -2530,7 +2530,7 @@ std::vector<ui_menu_item> shaders::init_slider_list()
                 item.subtext = "";
                 item.flags = 0;
                 item.ref = core_slider;
-                item.type = ui_menu_item_type::UI_MENU_ITEM_TYPE_SLIDER;
+                item.type = ui_menu_item_type::SLIDER;
                 sliders.push_back(item);
 			}
 		}

From 1e3037baf794f6b0bac46ec75808488942b3df58 Mon Sep 17 00:00:00 2001
From: dankan1890 <mewuidev2@gmail.com>
Date: Fri, 15 Apr 2016 17:48:05 +0200
Subject: [PATCH 017/122] ui: Re-enabled configuration menu for single-machine
 and added some options. Adding handler for the right mouse button in the main
 menu, calls the machine configuration.

---
 src/emu/emuopts.cpp                 |   4 +-
 src/emu/emuopts.h                   |   2 +-
 src/emu/ui/menu.cpp                 | 354 ++++++++++++++++------------
 src/emu/ui/menu.h                   |   9 +-
 src/emu/ui/miscmenu.cpp             | 161 ++++++++++---
 src/emu/ui/miscmenu.h               |  41 ++--
 src/emu/ui/selgame.cpp              |  20 +-
 src/emu/ui/selgame.h                |   2 +-
 src/emu/ui/submenu.cpp              |  25 +-
 src/emu/ui/submenu.h                |   6 +-
 src/emu/uiinput.cpp                 |  30 +++
 src/emu/uiinput.h                   |   4 +
 src/osd/modules/input/input_sdl.cpp |  21 ++
 src/osd/windows/window.cpp          |   8 +
 14 files changed, 462 insertions(+), 225 deletions(-)

diff --git a/src/emu/emuopts.cpp b/src/emu/emuopts.cpp
index b3de757e453..d23a03ac479 100644
--- a/src/emu/emuopts.cpp
+++ b/src/emu/emuopts.cpp
@@ -451,7 +451,7 @@ bool emu_options::parse_command_line(int argc, char *argv[], std::string &error_
 //  of INI files
 //-------------------------------------------------
 
-void emu_options::parse_standard_inis(std::string &error_string)
+void emu_options::parse_standard_inis(std::string &error_string, const game_driver *driver)
 {
 	// start with an empty string
 	error_string.clear();
@@ -466,7 +466,7 @@ void emu_options::parse_standard_inis(std::string &error_string)
 		parse_one_ini("debug", OPTION_PRIORITY_DEBUG_INI, &error_string);
 
 	// if we have a valid system driver, parse system-specific INI files
-	const game_driver *cursystem = system();
+	const game_driver *cursystem = (driver == nullptr) ? system() : driver;
 	if (cursystem == nullptr)
 		return;
 
diff --git a/src/emu/emuopts.h b/src/emu/emuopts.h
index 522f128961e..a0e20153241 100644
--- a/src/emu/emuopts.h
+++ b/src/emu/emuopts.h
@@ -229,7 +229,7 @@ public:
 
 	// parsing wrappers
 	bool parse_command_line(int argc, char *argv[], std::string &error_string);
-	void parse_standard_inis(std::string &error_string);
+	void parse_standard_inis(std::string &error_string, const game_driver *driver = nullptr);
 	bool parse_slot_devices(int argc, char *argv[], std::string &error_string, const char *name = nullptr, const char *value = nullptr, const software_part *swpart = nullptr);
 
 	// core options
diff --git a/src/emu/ui/menu.cpp b/src/emu/ui/menu.cpp
index 52c2eba048a..08cb46a703e 100644
--- a/src/emu/ui/menu.cpp
+++ b/src/emu/ui/menu.cpp
@@ -24,6 +24,7 @@
 #include "ui/custmenu.h"
 #include "ui/icorender.h"
 #include "ui/toolbar.h"
+#include "ui/miscmenu.h"
 
 
 /***************************************************************************
@@ -358,26 +359,25 @@ void ui_menu::item_append(const char *text, const char *subtext, UINT32 flags, v
 //  and returning any interesting events
 //-------------------------------------------------
 
-const ui_menu_event *ui_menu::process(UINT32 flags)
+const ui_menu_event *ui_menu::process(UINT32 flags, float x0, float y0)
 {
 	// reset the menu_event
 	menu_event.iptkey = IPT_INVALID;
 
 	// first make sure our selection is valid
-//  if (!(flags & UI_MENU_PROCESS_NOINPUT))
-		validate_selection(1);
+	validate_selection(1);
 
 	// draw the menu
 	if (item.size() > 1 && (item[0].flags & MENU_FLAG_MULTILINE) != 0)
 		draw_text_box();
-	else if ((item[0].flags & MENU_FLAG_UI ) != 0 || (item[0].flags & MENU_FLAG_UI_SWLIST ) != 0)
-		draw_select_game(flags & UI_MENU_PROCESS_NOINPUT);
-	else if ((item[0].flags & MENU_FLAG_UI_PALETTE ) != 0)
+	else if ((item[0].flags & MENU_FLAG_UI) != 0 || (item[0].flags & MENU_FLAG_UI_SWLIST) != 0)
+		draw_select_game((flags & UI_MENU_PROCESS_NOINPUT));
+	else if ((item[0].flags & MENU_FLAG_UI_PALETTE) != 0)
 		draw_palette_menu();
 	else if ((item[0].flags & MENU_FLAG_UI_DATS) != 0)
 		draw_dats_menu();
 	else
-		draw(flags & UI_MENU_PROCESS_CUSTOM_ONLY, flags & UI_MENU_PROCESS_NOIMAGE, flags & UI_MENU_PROCESS_NOINPUT);
+		draw(flags, x0, y0);
 
 	// process input
 	if (!(flags & UI_MENU_PROCESS_NOKEYS) && !(flags & UI_MENU_PROCESS_NOINPUT))
@@ -489,15 +489,18 @@ void ui_menu::set_selection(void *selected_itemref)
 //  draw - draw a menu
 //-------------------------------------------------
 
-void ui_menu::draw(bool customonly, bool noimage, bool noinput)
+void ui_menu::draw(UINT32 flags, float origx0, float origy0)
 {
 	// first draw the FPS counter
 	if (machine().ui().show_fps_counter())
 	{
 		machine().ui().draw_text_full(container, machine().video().speed_text().c_str(), 0.0f, 0.0f, 1.0f,
-					JUSTIFY_RIGHT, WRAP_WORD, DRAW_OPAQUE, ARGB_WHITE, ARGB_BLACK, nullptr, nullptr);
+			JUSTIFY_RIGHT, WRAP_WORD, DRAW_OPAQUE, ARGB_WHITE, ARGB_BLACK, nullptr, nullptr);
 	}
 
+	bool customonly = (flags & UI_MENU_PROCESS_CUSTOM_ONLY);
+	bool noimage = (flags & UI_MENU_PROCESS_NOIMAGE);
+	bool noinput = (flags & UI_MENU_PROCESS_NOINPUT);
 	float line_height = machine().ui().get_line_height();
 	float lr_arrow_width = 0.4f * line_height * machine().render().ui_aspect();
 	float ud_arrow_width = line_height * machine().render().ui_aspect();
@@ -557,6 +560,38 @@ void ui_menu::draw(bool customonly, bool noimage, bool noinput)
 	float visible_left = (1.0f - visible_width) * 0.5f;
 	float visible_top = (1.0f - (visible_main_menu_height + visible_extra_menu_height)) * 0.5f;
 
+/*	float visible_left;
+	float visible_top;
+	if (origx0 == 0.0f && origy0 == 0.0f)
+	{
+		visible_left = (1.0f - visible_width) * 0.5f;
+		visible_top = (1.0f - (visible_main_menu_height + visible_extra_menu_height)) * 0.5f;
+	}
+	else
+	{
+		INT32 mouse_target_x, mouse_target_y;
+		float m_x, m_y;
+		render_target *mouse_target = machine().ui_input().find_mouse(&mouse_target_x, &mouse_target_y, &mouse_button);
+		if (mouse_target != nullptr)
+		{
+			if (mouse_target->map_point_container(origx0, origy0, *container, m_x, m_y))
+			{
+				visible_left = m_x;
+				visible_top = m_y;
+			}
+			else
+			{
+				visible_left = (1.0f - visible_width) * 0.5f;
+				visible_top = (1.0f - (visible_main_menu_height + visible_extra_menu_height)) * 0.5f;
+			}
+		}
+		else
+		{
+			visible_left = (1.0f - visible_width) * 0.5f;
+			visible_top = (1.0f - (visible_main_menu_height + visible_extra_menu_height)) * 0.5f;
+		}
+	}
+*/
 	// if the menu is at the bottom of the extra, adjust
 	visible_top += customtop;
 
@@ -1427,8 +1462,9 @@ void ui_menu::init_ui(running_machine &machine)
 //  draw main menu
 //-------------------------------------------------
 
-void ui_menu::draw_select_game(bool noinput)
+void ui_menu::draw_select_game(UINT32 flags)
 {
+	bool noinput = (flags & UI_MENU_PROCESS_NOINPUT);
 	float line_height = machine().ui().get_line_height();
 	float ud_arrow_width = line_height * machine().render().ui_aspect();
 	float gutter_width = 0.52f * ud_arrow_width;
@@ -1965,160 +2001,176 @@ void ui_menu::handle_main_events(UINT32 flags)
 		switch (local_menu_event.event_type)
 		{
 			// if we are hovering over a valid item, select it with a single click
-		case UI_EVENT_MOUSE_DOWN:
-		{
-			if (ui_error)
+			case UI_EVENT_MOUSE_DOWN:
 			{
-				menu_event.iptkey = IPT_OTHER;
-				stop = true;
+				if (ui_error)
+				{
+					menu_event.iptkey = IPT_OTHER;
+					stop = true;
+				}
+				else
+				{
+					if (hover >= 0 && hover < item.size())
+					{
+						if (hover >= visible_items - 1 && selected < visible_items)
+							m_prev_selected = item[selected].ref;
+						selected = hover;
+						m_focus = focused_menu::main;
+					}
+					else if (hover == HOVER_ARROW_UP)
+					{
+						selected -= visitems;
+						if (selected < 0)
+							selected = 0;
+						top_line -= visitems - (top_line + visible_lines == visible_items);
+						set_pressed();
+					}
+					else if (hover == HOVER_ARROW_DOWN)
+					{
+						selected += visible_lines - 2 + (selected == 0);
+						if (selected >= visible_items)
+							selected = visible_items - 1;
+						top_line += visible_lines - 2;
+						set_pressed();
+					}
+					else if (hover == HOVER_UI_RIGHT)
+						menu_event.iptkey = IPT_UI_RIGHT;
+					else if (hover == HOVER_UI_LEFT)
+						menu_event.iptkey = IPT_UI_LEFT;
+					else if (hover == HOVER_DAT_DOWN)
+						topline_datsview += right_visible_lines - 1;
+					else if (hover == HOVER_DAT_UP)
+						topline_datsview -= right_visible_lines - 1;
+					else if (hover == HOVER_LPANEL_ARROW)
+					{
+						if (ui_globals::panels_status == HIDE_LEFT_PANEL)
+							ui_globals::panels_status = SHOW_PANELS;
+						else if (ui_globals::panels_status == HIDE_BOTH)
+							ui_globals::panels_status = HIDE_RIGHT_PANEL;
+						else if (ui_globals::panels_status == SHOW_PANELS)
+							ui_globals::panels_status = HIDE_LEFT_PANEL;
+						else if (ui_globals::panels_status == HIDE_RIGHT_PANEL)
+							ui_globals::panels_status = HIDE_BOTH;
+					}
+					else if (hover == HOVER_RPANEL_ARROW)
+					{
+						if (ui_globals::panels_status == HIDE_RIGHT_PANEL)
+							ui_globals::panels_status = SHOW_PANELS;
+						else if (ui_globals::panels_status == HIDE_BOTH)
+							ui_globals::panels_status = HIDE_LEFT_PANEL;
+						else if (ui_globals::panels_status == SHOW_PANELS)
+							ui_globals::panels_status = HIDE_RIGHT_PANEL;
+						else if (ui_globals::panels_status == HIDE_LEFT_PANEL)
+							ui_globals::panels_status = HIDE_BOTH;
+					}
+					else if (hover == HOVER_B_FAV)
+					{
+						menu_event.iptkey = IPT_UI_FAVORITES;
+						stop = true;
+					}
+					else if (hover == HOVER_B_EXPORT)
+					{
+						menu_event.iptkey = IPT_UI_EXPORT;
+						stop = true;
+					}
+					else if (hover == HOVER_B_DATS)
+					{
+						menu_event.iptkey = IPT_UI_DATS;
+						stop = true;
+					}
+					else if (hover >= HOVER_RP_FIRST && hover <= HOVER_RP_LAST)
+					{
+						ui_globals::rpanel = (HOVER_RP_FIRST - hover) * (-1);
+						stop = true;
+					}
+					else if (hover >= HOVER_SW_FILTER_FIRST && hover <= HOVER_SW_FILTER_LAST)
+					{
+						l_sw_hover = (HOVER_SW_FILTER_FIRST - hover) * (-1);
+						menu_event.iptkey = IPT_OTHER;
+						stop = true;
+					}
+					else if (hover >= HOVER_FILTER_FIRST && hover <= HOVER_FILTER_LAST)
+					{
+						l_hover = (HOVER_FILTER_FIRST - hover) * (-1);
+						menu_event.iptkey = IPT_OTHER;
+						stop = true;
+					}
+				}
+				break;
 			}
-			else
-			{
+
+			// if we are hovering over a valid item, fake a UI_SELECT with a double-click
+			case UI_EVENT_MOUSE_DOUBLE_CLICK:
 				if (hover >= 0 && hover < item.size())
 				{
-					if (hover >= visible_items - 1 && selected < visible_items)
-						m_prev_selected = item[selected].ref;
 					selected = hover;
-					m_focus = focused_menu::main;
+					menu_event.iptkey = IPT_UI_SELECT;
 				}
-				else if (hover == HOVER_ARROW_UP)
-				{
-					selected -= visitems;
-					if (selected < 0)
-						selected = 0;
-					top_line -= visitems - (top_line + visible_lines == visible_items);
-					set_pressed();
-				}
-				else if (hover == HOVER_ARROW_DOWN)
-				{
-					selected += visible_lines - 2 + (selected == 0);
-					if (selected >= visible_items)
-						selected = visible_items - 1;
-					top_line += visible_lines - 2;
-					set_pressed();
-				}
-				else if (hover == HOVER_UI_RIGHT)
-					menu_event.iptkey = IPT_UI_RIGHT;
-				else if (hover == HOVER_UI_LEFT)
-					menu_event.iptkey = IPT_UI_LEFT;
-				else if (hover == HOVER_DAT_DOWN)
-					topline_datsview += right_visible_lines - 1;
-				else if (hover == HOVER_DAT_UP)
-					topline_datsview -= right_visible_lines - 1;
-				else if (hover == HOVER_LPANEL_ARROW)
-				{
-					if (ui_globals::panels_status == HIDE_LEFT_PANEL)
-						ui_globals::panels_status = SHOW_PANELS;
-					else if (ui_globals::panels_status == HIDE_BOTH)
-						ui_globals::panels_status = HIDE_RIGHT_PANEL;
-					else if (ui_globals::panels_status == SHOW_PANELS)
-						ui_globals::panels_status = HIDE_LEFT_PANEL;
-					else if (ui_globals::panels_status == HIDE_RIGHT_PANEL)
-						ui_globals::panels_status = HIDE_BOTH;
-				}
-				else if (hover == HOVER_RPANEL_ARROW)
-				{
-					if (ui_globals::panels_status == HIDE_RIGHT_PANEL)
-						ui_globals::panels_status = SHOW_PANELS;
-					else if (ui_globals::panels_status == HIDE_BOTH)
-						ui_globals::panels_status = HIDE_LEFT_PANEL;
-					else if (ui_globals::panels_status == SHOW_PANELS)
-						ui_globals::panels_status = HIDE_RIGHT_PANEL;
-					else if (ui_globals::panels_status == HIDE_LEFT_PANEL)
-						ui_globals::panels_status = HIDE_BOTH;
-				}
-				else if (hover == HOVER_B_FAV)
-				{
-					menu_event.iptkey = IPT_UI_FAVORITES;
-					stop = true;
-				}
-				else if (hover == HOVER_B_EXPORT)
-				{
-					menu_event.iptkey = IPT_UI_EXPORT;
-					stop = true;
-				}
-				else if (hover == HOVER_B_DATS)
-				{
-					menu_event.iptkey = IPT_UI_DATS;
-					stop = true;
-				}
-				else if (hover >= HOVER_RP_FIRST && hover <= HOVER_RP_LAST)
-				{
-					ui_globals::rpanel = (HOVER_RP_FIRST - hover) * (-1);
-					stop = true;
-				}
-				else if (hover >= HOVER_SW_FILTER_FIRST && hover <= HOVER_SW_FILTER_LAST)
-				{
-					l_sw_hover = (HOVER_SW_FILTER_FIRST - hover) * (-1);
-					menu_event.iptkey = IPT_OTHER;
-					stop = true;
-				}
-				else if (hover >= HOVER_FILTER_FIRST && hover <= HOVER_FILTER_LAST)
-				{
-					l_hover = (HOVER_FILTER_FIRST - hover) * (-1);
-					menu_event.iptkey = IPT_OTHER;
-					stop = true;
-				}
-			}
-			break;
-		}
 
-		// if we are hovering over a valid item, fake a UI_SELECT with a double-click
-		case UI_EVENT_MOUSE_DOUBLE_CLICK:
-			if (hover >= 0 && hover < item.size())
-			{
-				selected = hover;
-				menu_event.iptkey = IPT_UI_SELECT;
-			}
-
-			if (selected == item.size() - 1)
-			{
-				menu_event.iptkey = IPT_UI_CANCEL;
-				ui_menu::stack_pop(machine());
-			}
-			stop = true;
-			break;
+				if (selected == item.size() - 1)
+				{
+					menu_event.iptkey = IPT_UI_CANCEL;
+					ui_menu::stack_pop(machine());
+				}
+				stop = true;
+				break;
 
 			// caught scroll event
-		case UI_EVENT_MOUSE_WHEEL:
-			if (local_menu_event.zdelta > 0)
-			{
-				if (selected >= visible_items || selected == 0 || ui_error)
-					break;
-				selected -= local_menu_event.num_lines;
-				if (selected < top_line + (top_line != 0))
-					top_line -= local_menu_event.num_lines;
-			}
-			else
-			{
-				if (selected >= visible_items - 1 || ui_error)
-					break;
-				selected += local_menu_event.num_lines;
-				if (selected > visible_items - 1)
-					selected = visible_items - 1;
-				if (selected >= top_line + visitems + (top_line != 0))
-					top_line += local_menu_event.num_lines;
-			}
-			break;
+			case UI_EVENT_MOUSE_WHEEL:
+				if (hover >= 0 && hover < item.size() - skip_main_items - 1)
+				{
+					if (local_menu_event.zdelta > 0)
+					{
+						if (selected >= visible_items || selected == 0 || ui_error)
+							break;
+						selected -= local_menu_event.num_lines;
+						if (selected < top_line + (top_line != 0))
+							top_line -= local_menu_event.num_lines;
+					}
+					else
+					{
+						if (selected >= visible_items - 1 || ui_error)
+							break;
+						selected += local_menu_event.num_lines;
+						if (selected > visible_items - 1)
+							selected = visible_items - 1;
+						if (selected >= top_line + visitems + (top_line != 0))
+							top_line += local_menu_event.num_lines;
+					}
+				}
+				break;
 
 			// translate CHAR events into specials
-		case UI_EVENT_CHAR:
-			if (exclusive_input_pressed(IPT_UI_CONFIGURE, 0))
-			{
-				menu_event.iptkey = IPT_UI_CONFIGURE;
-				stop = true;
-			}
-			else
-			{
-				menu_event.iptkey = IPT_SPECIAL;
-				menu_event.unichar = local_menu_event.ch;
-				stop = true;
-			}
-			break;
+			case UI_EVENT_CHAR:
+				if (exclusive_input_pressed(IPT_UI_CONFIGURE, 0))
+				{
+					menu_event.iptkey = IPT_UI_CONFIGURE;
+					stop = true;
+				}
+				else
+				{
+					menu_event.iptkey = IPT_SPECIAL;
+					menu_event.unichar = local_menu_event.ch;
+					stop = true;
+				}
+				break;
+
+			case UI_EVENT_MOUSE_RDOWN:
+				if (hover >= 0 && hover < item.size() - skip_main_items - 1)
+				{
+					selected = hover;
+					m_prev_selected = item[selected].ref;
+					m_focus = focused_menu::main;
+					menu_event.iptkey = IPT_CUSTOM;
+					menu_event.mouse.x0 = local_menu_event.mouse_x;
+					menu_event.mouse.y0 = local_menu_event.mouse_y;
+					stop = true;
+				}
+				break;
 
 			// ignore everything else
-		default:
-			break;
+			default:
+				break;
 		}
 	}
 }
diff --git a/src/emu/ui/menu.h b/src/emu/ui/menu.h
index 7c8aa73a1d8..2b79990f2b8 100644
--- a/src/emu/ui/menu.h
+++ b/src/emu/ui/menu.h
@@ -70,9 +70,10 @@ enum class ui_menu_item_type
 struct ui_menu_event
 {
 	void         		*itemref;   // reference for the selected item
-	ui_menu_item_type	type;	// item type (eventually will go away when itemref is proper ui_menu_item class rather than void*)
+	ui_menu_item_type	type;		// item type (eventually will go away when itemref is proper ui_menu_item class rather than void*)
 	int          		iptkey;     // one of the IPT_* values from inptport.h
 	unicode_char 		unichar;    // unicode character if iptkey == IPT_SPECIAL
+	render_bounds       mouse;		// mouse position if iptkey == IPT_CUSTOM
 };
 
 struct ui_menu_pool
@@ -125,7 +126,7 @@ public:
 	void item_append(ui_menu_item_type type);
 
 	// process a menu, drawing it and returning any interesting events
-	const ui_menu_event *process(UINT32 flags);
+	const ui_menu_event *process(UINT32 flags, float x0 = 0.0f, float y0 = 0.0f);
 
 	// configure the menu for custom rendering
 	virtual void custom_render(void *selectedref, float top, float bottom, float x, float y, float x2, float y2);
@@ -194,7 +195,7 @@ private:
 	bool m_special_main_menu;
 	running_machine &m_machine;  // machine we are attached to
 
-	void draw(bool customonly, bool noimage, bool noinput);
+	void draw(UINT32 flags, float x0 = 0.0f, float y0 = 0.0f);
 	void draw_text_box();
 	void handle_events(UINT32 flags);
 	void handle_keys(UINT32 flags);
@@ -296,7 +297,7 @@ private:
 	static render_texture *toolbar_texture[], *sw_toolbar_texture[];
 
 	// draw game list
-	void draw_select_game(bool noinput);
+	void draw_select_game(UINT32 flags);
 
 	// draw palette menu
 	void draw_palette_menu();
diff --git a/src/emu/ui/miscmenu.cpp b/src/emu/ui/miscmenu.cpp
index 69f36b6cfda..3ae58da9aa4 100644
--- a/src/emu/ui/miscmenu.cpp
+++ b/src/emu/ui/miscmenu.cpp
@@ -17,6 +17,8 @@
 #include "ui/miscmenu.h"
 #include "ui/utils.h"
 #include "../info.h"
+#include "ui/inifile.h"
+#include "ui/submenu.h"
 
 /***************************************************************************
     MENU HANDLERS
@@ -86,7 +88,7 @@ void ui_menu_bios_selection::populate()
 		}
 	}
 
-	item_append(MENU_SEPARATOR_ITEM, nullptr, 0, nullptr);
+	item_append(ui_menu_item_type::SEPARATOR);
 	item_append(_("Reset"),  nullptr, 0, (void *)1);
 }
 
@@ -579,6 +581,7 @@ void ui_menu_export::handle()
 		switch ((FPTR)m_event->itemref)
 		{
 			case 1:
+			case 3:
 			{
 				if (m_event->iptkey == IPT_UI_SELECT)
 				{
@@ -611,7 +614,7 @@ void ui_menu_export::handle()
 							drvlist.include(driver_list::find(*elem));
 
 						info_xml_creator creator(drvlist);
-						creator.output(pfile, false);
+						creator.output(pfile, ((FPTR)m_event->itemref == 1) ? false : true);
 						fclose(pfile);
 						machine().popmessage(_("%s.xml saved under ui folder."), filename.c_str());
 					}
@@ -671,18 +674,28 @@ void ui_menu_export::handle()
 void ui_menu_export::populate()
 {
 	// add options items
-	item_append(_("Export XML format (like -listxml)"), nullptr, 0, (void *)(FPTR)1);
-	item_append(_("Export TXT format (like -listfull)"), nullptr, 0, (void *)(FPTR)2);
-	item_append(MENU_SEPARATOR_ITEM, nullptr, 0, nullptr);
+	item_append(_("Export list in XML format (like -listxml)"), nullptr, 0, (void *)(FPTR)1);
+	item_append(_("Export list in XML format (like -listxml, but exclude devices)"), nullptr, 0, (void *)(FPTR)3);
+	item_append(_("Export list in TXT format (like -listfull)"), nullptr, 0, (void *)(FPTR)2);
+	item_append(ui_menu_item_type::SEPARATOR);
 }
 
 //-------------------------------------------------
 //  ctor / dtor
 //-------------------------------------------------
 
-ui_menu_machine_configure::ui_menu_machine_configure(running_machine &machine, render_container *container, const game_driver *prev)
-	: ui_menu(machine, container), m_drv(prev)
+ui_menu_machine_configure::ui_menu_machine_configure(running_machine &machine, render_container *container, const game_driver *prev, float _x0, float _y0)
+	: ui_menu(machine, container)
+	, m_drv(prev)
+	, m_opts(machine.options())
+	, x0(_x0)
+	, y0(_y0)
+	, m_curbios(0)
 {
+	// parse the INI file
+	std::string error;
+	m_opts.parse_standard_inis(error, m_drv);
+	setup_bios();
 }
 
 ui_menu_machine_configure::~ui_menu_machine_configure()
@@ -697,28 +710,54 @@ void ui_menu_machine_configure::handle()
 {
 	// process the menu
 	ui_menu::menu_stack->parent->process(UI_MENU_PROCESS_NOINPUT);
-	const ui_menu_event *m_event = process(UI_MENU_PROCESS_NOIMAGE);
+	const ui_menu_event *m_event = process(UI_MENU_PROCESS_NOIMAGE, x0, y0);
 	if (m_event != nullptr && m_event->itemref != nullptr)
 	{
-		switch ((FPTR)m_event->itemref)
+		if (m_event->iptkey == IPT_UI_SELECT)
 		{
-			case 1:
+			switch ((FPTR)m_event->itemref)
 			{
-				if (m_event->iptkey == IPT_UI_SELECT)
+				case SAVE:
 				{
 					std::string filename(m_drv->name);
 					emu_file file(machine().options().ini_path(), OPEN_FLAG_WRITE | OPEN_FLAG_CREATE);
 					osd_file::error filerr = file.open(filename.c_str(), ".ini");
 					if (filerr == osd_file::error::NONE)
 					{
-						std::string inistring = machine().options().output_ini();
+						std::string inistring = m_opts.output_ini();
 						file.puts(inistring.c_str());
+						machine().ui().popup_time(2, "%s", _("\n    Configuration saved    \n\n"));
 					}
+					break;
 				}
-			break;
+				case ADDFAV:
+					machine().favorite().add_favorite_game(m_drv);
+					reset(UI_MENU_RESET_REMEMBER_POSITION);
+					break;
+
+				case DELFAV:
+					machine().favorite().remove_favorite_game();
+					reset(UI_MENU_RESET_REMEMBER_POSITION);
+					break;
+				case CONTROLLER:
+					if (m_event->iptkey == IPT_UI_SELECT)
+						ui_menu::stack_push(global_alloc_clear<ui_submenu>(machine(), container, control_submenu_options, m_drv, &m_opts));
+					break;
+				case VIDEO:
+					if (m_event->iptkey == IPT_UI_SELECT)
+						ui_menu::stack_push(global_alloc_clear<ui_submenu>(machine(), container, video_submenu_options, m_drv, &m_opts));
+					break;
+				default:
+					break;
 			}
-		default:
-			break;
+		}
+		else if (m_event->iptkey == IPT_UI_LEFT || m_event->iptkey == IPT_UI_RIGHT)
+		{
+			(m_event->iptkey == IPT_UI_LEFT) ? --m_curbios : ++m_curbios;
+			std::string error;
+			m_opts.set_value(OPTION_BIOS, m_bios[m_curbios].second, OPTION_PRIORITY_CMDLINE, error);
+			m_opts.mark_changed(OPTION_BIOS);
+			reset(UI_MENU_RESET_REMEMBER_POSITION);
 		}
 	}
 }
@@ -730,11 +769,27 @@ void ui_menu_machine_configure::handle()
 void ui_menu_machine_configure::populate()
 {
 	// add options items
-	item_append(_("Dummy"), nullptr, 0, (void *)(FPTR)10);
-	item_append(MENU_SEPARATOR_ITEM, nullptr, 0, nullptr);
-	item_append(_("Save machine configuration"), nullptr, 0, (void *)(FPTR)1);
-	item_append(MENU_SEPARATOR_ITEM, nullptr, 0, nullptr);
-	customtop = machine().ui().get_line_height() + (3.0f * UI_BOX_TB_BORDER);
+	if (!m_bios.empty())
+	{
+		item_append(_("Bios"), nullptr, MENU_FLAG_DISABLE | MENU_FLAG_UI_HEADING, nullptr);
+		UINT32 arrows = get_arrow_flags(0, m_bios.size() - 1, m_curbios);
+		item_append(_("Driver"), m_bios[m_curbios].first.c_str(), arrows, (void *)(FPTR)BIOS);
+	}
+
+	item_append(ui_menu_item_type::SEPARATOR);
+	item_append(_(video_submenu_options[0].description), nullptr, 0, (void *)(FPTR)VIDEO);
+	item_append(_(control_submenu_options[0].description), nullptr, 0, (void *)(FPTR)CONTROLLER);
+	item_append(ui_menu_item_type::SEPARATOR);
+
+	if (!machine().favorite().isgame_favorite(m_drv))
+		item_append(_("Add To Favorites"), nullptr, 0, (void *)ADDFAV);
+	else
+		item_append(_("Remove From Favorites"), nullptr, 0, (void *)DELFAV);
+
+	item_append(ui_menu_item_type::SEPARATOR);
+	item_append(_("Save machine configuration"), nullptr, 0, (void *)(FPTR)SAVE);
+	item_append(ui_menu_item_type::SEPARATOR);
+	customtop = 2.0f * machine().ui().get_line_height() + 3.0f * UI_BOX_TB_BORDER;
 }
 
 //-------------------------------------------------
@@ -745,14 +800,23 @@ void ui_menu_machine_configure::custom_render(void *selectedref, float top, floa
 {
 	float width;
 	ui_manager &mui = machine().ui();
+	std::string text[2];
+	float maxwidth = origx2 - origx1;
 
-	mui.draw_text_full(container, m_drv->description, 0.0f, 0.0f, 1.0f, JUSTIFY_CENTER, WRAP_TRUNCATE,
-		DRAW_NONE, ARGB_WHITE, ARGB_BLACK, &width, nullptr);
-	width += 2 * UI_BOX_LR_BORDER;
-	float maxwidth = MAX(origx2 - origx1, width);
+	text[0] = _("Configure machine:");
+	text[1] = m_drv->description;
+
+	for (auto & elem : text)
+	{
+		mui.draw_text_full(container, elem.c_str(), 0.0f, 0.0f, 1.0f, JUSTIFY_CENTER, WRAP_TRUNCATE,
+			DRAW_NONE, ARGB_WHITE, ARGB_BLACK, &width, nullptr);
+		width += 2 * UI_BOX_LR_BORDER;
+		maxwidth = MAX(maxwidth, width);
+	}
 
 	// compute our bounds
 	float x1 = 0.5f - 0.5f * maxwidth;
+//	float x1 = origx1;
 	float x2 = x1 + maxwidth;
 	float y1 = origy1 - top;
 	float y2 = origy1 - UI_BOX_TB_BORDER;
@@ -766,8 +830,51 @@ void ui_menu_machine_configure::custom_render(void *selectedref, float top, floa
 	y1 += UI_BOX_TB_BORDER;
 
 	// draw the text within it
-	mui.draw_text_full(container, m_drv->description, x1, y1, x2 - x1, JUSTIFY_CENTER, WRAP_TRUNCATE,
-		DRAW_NORMAL, UI_TEXT_COLOR, UI_TEXT_BG_COLOR, nullptr, nullptr);
+	for (auto & elem : text)
+	{
+		mui.draw_text_full(container, elem.c_str(), x1, y1, x2 - x1, JUSTIFY_CENTER, WRAP_TRUNCATE,
+			DRAW_NORMAL, UI_TEXT_COLOR, UI_TEXT_BG_COLOR, nullptr, nullptr);
+		y1 += mui.get_line_height();
+	}
+}
+
+void ui_menu_machine_configure::setup_bios()
+{
+	if (m_drv->rom == nullptr)
+		return;
+
+	std::string specbios(m_opts.bios());
+	std::string default_name;
+	for (const rom_entry *rom = m_drv->rom; !ROMENTRY_ISEND(rom); ++rom)
+		if (ROMENTRY_ISDEFAULT_BIOS(rom))
+			default_name = ROM_GETNAME(rom);
+	
+	int bios_count = 0;
+	for (const rom_entry *rom = m_drv->rom; !ROMENTRY_ISEND(rom); ++rom)
+	{
+		if (ROMENTRY_ISSYSTEM_BIOS(rom))
+		{
+			std::string name(ROM_GETHASHDATA(rom));
+			std::string biosname(ROM_GETNAME(rom));
+			int bios_flags = ROM_GETBIOSFLAGS(rom);
+			std::string bios_number = std::to_string(bios_flags - 1);
+
+			// check biosnumber and name
+			if (bios_number == specbios || biosname == specbios)
+				m_curbios = bios_count;
+
+			if (biosname == default_name)
+			{
+				name.append(_(" (default)"));
+				if (specbios == "default")
+					m_curbios = bios_count;
+			}
+
+			m_bios.emplace_back(name, bios_flags - 1);
+			bios_count++;
+		}
+	}
+
 }
 
 //-------------------------------------------------
@@ -830,7 +937,7 @@ void ui_menu_plugins_configure::populate()
 				enabled ? MENU_FLAG_RIGHT_ARROW : MENU_FLAG_LEFT_ARROW, (void *)(FPTR)curentry.name());
 		}
 	}
-	item_append(MENU_SEPARATOR_ITEM, nullptr, 0, nullptr);
+	item_append(ui_menu_item_type::SEPARATOR);
 	customtop = machine().ui().get_line_height() + (3.0f * UI_BOX_TB_BORDER);
 }
 
diff --git a/src/emu/ui/miscmenu.h b/src/emu/ui/miscmenu.h
index 00a7ccf4edc..c8881cbaf8d 100644
--- a/src/emu/ui/miscmenu.h
+++ b/src/emu/ui/miscmenu.h
@@ -15,6 +15,8 @@
 
 #include "drivenum.h"
 #include "crsshair.h"
+#include "emuopts.h"
+#include "ui/selsoft.h"
 
 class ui_menu_keyboard_mode : public ui_menu {
 public:
@@ -85,28 +87,6 @@ public:
 	virtual void handle() override;
 };
 
-//-------------------------------------------------
-//  class miscellaneous options menu
-//-------------------------------------------------
-class ui_menu_misc_options : public ui_menu
-{
-public:
-	ui_menu_misc_options(running_machine &machine, render_container *container);
-	virtual ~ui_menu_misc_options();
-	virtual void populate() override;
-	virtual void handle() override;
-	virtual void custom_render(void *selectedref, float top, float bottom, float x, float y, float x2, float y2) override;
-
-private:
-	struct misc_option
-	{
-		bool        status;
-		const char  *description;
-		const char  *option;
-	};
-
-	static misc_option m_options[];
-};
 
 //-------------------------------------------------
 //  export menu
@@ -131,14 +111,29 @@ private:
 class ui_menu_machine_configure : public ui_menu
 {
 public:
-	ui_menu_machine_configure(running_machine &machine, render_container *container, const game_driver *prev);
+	ui_menu_machine_configure(running_machine &machine, render_container *container, const game_driver *prev, float x0 = 0.0f, float y0 = 0.0f);
 	virtual ~ui_menu_machine_configure();
 	virtual void populate() override;
 	virtual void handle() override;
 	virtual void custom_render(void *selectedref, float top, float bottom, float x, float y, float x2, float y2) override;
 
 private:
+	enum
+	{
+		ADDFAV = 1,
+		DELFAV,
+		SAVE,
+		CONTROLLER,
+		VIDEO,
+		BIOS,
+		LAST = BIOS
+	};
 	const game_driver *m_drv;
+	emu_options m_opts;
+	float x0, y0;
+	s_bios m_bios;
+	int m_curbios;
+	void setup_bios();
 };
 
 //-------------------------------------------------
diff --git a/src/emu/ui/selgame.cpp b/src/emu/ui/selgame.cpp
index daaa072f9ef..a0c7f02fead 100644
--- a/src/emu/ui/selgame.cpp
+++ b/src/emu/ui/selgame.cpp
@@ -228,6 +228,13 @@ void ui_menu_select_game::handle()
 			}
 		}
 
+		// handle IPT_CUSTOM (mouse right click)
+		else if (m_event->iptkey == IPT_CUSTOM)
+		{
+			if (!isfavorite())
+				ui_menu::stack_push(global_alloc_clear<ui_menu_machine_configure>(machine(), container, (const game_driver *)m_prev_selected, m_event->mouse.x0, m_event->mouse.y0));
+		}
+
 		// handle UI_LEFT
 		else if (m_event->iptkey == IPT_UI_LEFT)
 		{
@@ -425,8 +432,9 @@ void ui_menu_select_game::handle()
 			inkey_special(m_event);
 		else if (m_event->iptkey == IPT_UI_CONFIGURE)
 			inkey_configure(m_event);
-		else if (m_event->iptkey == IPT_UI_SELECT && m_focus == focused_menu::left)
+		else if (m_event->iptkey == IPT_OTHER)
 		{
+			m_focus = focused_menu::left;
 			m_prev_selected = nullptr;
 			l_hover = highlight;
 			check_filter = true;
@@ -585,8 +593,8 @@ void ui_menu_select_game::populate()
 	{
 		UINT32 flags_ui = MENU_FLAG_UI | MENU_FLAG_LEFT_ARROW | MENU_FLAG_RIGHT_ARROW;
 		item_append(_("Configure Options"), nullptr, flags_ui, (void *)(FPTR)CONF_OPTS);
-//      item_append(_("Configure Machine"), nullptr, flags_ui, (void *)(FPTR)CONF_MACHINE); TODO
-		skip_main_items = 1;
+		item_append(_("Configure Machine"), nullptr, flags_ui, (void *)(FPTR)CONF_MACHINE);
+		skip_main_items = 2;
 		if (machine().options().plugins())
 		{
 			item_append(_("Plugins"), nullptr, flags_ui, (void *)(FPTR)CONF_PLUGINS);
@@ -1011,14 +1019,16 @@ void ui_menu_select_game::inkey_select(const ui_menu_event *m_event)
 	// special case for configure options
 	if ((FPTR)driver == CONF_OPTS)
 		ui_menu::stack_push(global_alloc_clear<ui_menu_game_options>(machine(), container));
-	/* special case for configure machine TODO
+	
+	// special case for configure machine
 	else if ((FPTR)driver == CONF_MACHINE)
 	{
 	    if (m_prev_selected != nullptr)
 	        ui_menu::stack_push(global_alloc_clear<ui_menu_machine_configure>(machine(), container, (const game_driver *)m_prev_selected));
 	    else
 	        return;
-	} */
+	}
+
 	// special case for configure plugins
 	else if ((FPTR)driver == CONF_PLUGINS)
 	{
diff --git a/src/emu/ui/selgame.h b/src/emu/ui/selgame.h
index 11dee880927..06401d3523d 100644
--- a/src/emu/ui/selgame.h
+++ b/src/emu/ui/selgame.h
@@ -40,7 +40,7 @@ private:
 	enum
 	{
 		CONF_OPTS = 1,
-//      CONF_MACHINE,
+		CONF_MACHINE,
 		CONF_PLUGINS,
 	};
 
diff --git a/src/emu/ui/submenu.cpp b/src/emu/ui/submenu.cpp
index a06d75adb83..ae85db7d7a8 100644
--- a/src/emu/ui/submenu.cpp
+++ b/src/emu/ui/submenu.cpp
@@ -19,17 +19,24 @@
 //  ctor / dtor
 //-------------------------------------------------
 
-ui_submenu::ui_submenu(running_machine &machine, render_container *container, std::vector<ui_submenu::option> &suboptions)
-	: ui_menu(machine, container),
-	m_options(suboptions)
+ui_submenu::ui_submenu(running_machine &machine, render_container *container, std::vector<ui_submenu::option> &suboptions, const game_driver *drv, emu_options *options)
+	: ui_menu(machine, container)
+	, m_options(suboptions)
+	, m_driver(drv)
 {
+	core_options *opts = nullptr;
+	if (m_driver == nullptr)
+		opts = dynamic_cast<core_options*>(&machine.options());
+	else
+		opts = dynamic_cast<core_options*>(options);
+
 	for (auto & sm_option : m_options)
 	{
 		switch (sm_option.type)
 		{
 			case ui_submenu::EMU:
-				sm_option.entry = machine.options().get_entry(sm_option.name);
-				sm_option.options = dynamic_cast<core_options*>(&machine.options());
+				sm_option.entry = opts->get_entry(sm_option.name);
+				sm_option.options = opts;
 				if (sm_option.entry->type() == OPTION_STRING)
 				{
 					sm_option.value.clear();
@@ -52,8 +59,8 @@ ui_submenu::ui_submenu(running_machine &machine, render_container *container, st
 				}
 				break;
 			case ui_submenu::OSD:
-				sm_option.entry = machine.options().get_entry(sm_option.name);
-				sm_option.options = dynamic_cast<core_options*>(&machine.options());
+				sm_option.entry = opts->get_entry(sm_option.name);
+				sm_option.options = opts;
 				if (sm_option.entry->type() == OPTION_STRING)
 				{
 					sm_option.value.clear();
@@ -208,7 +215,7 @@ void ui_submenu::populate()
 				item_append(_(sm_option->description), nullptr, MENU_FLAG_DISABLE | MENU_FLAG_UI_HEADING, nullptr);
 				break;
 			case ui_submenu::SEP:
-				item_append(MENU_SEPARATOR_ITEM, nullptr, 0, nullptr);
+				item_append(ui_menu_item_type::SEPARATOR);
 				break;
 			case ui_submenu::CMD:
 				item_append(_(sm_option->description), nullptr, 0, static_cast<void*>(&(*sm_option)));
@@ -292,7 +299,7 @@ void ui_submenu::populate()
 		}
 	}
 
-	item_append(MENU_SEPARATOR_ITEM, nullptr, 0, nullptr);
+	item_append(ui_menu_item_type::SEPARATOR);
 	custombottom = customtop = machine().ui().get_line_height() + (3.0f * UI_BOX_TB_BORDER);
 }
 
diff --git a/src/emu/ui/submenu.h b/src/emu/ui/submenu.h
index 3e25ba18c94..8168ab4bb7a 100644
--- a/src/emu/ui/submenu.h
+++ b/src/emu/ui/submenu.h
@@ -46,7 +46,7 @@ public:
 		std::vector<std::string> value;
 	};
 
-	ui_submenu(running_machine &machine, render_container *container, std::vector<ui_submenu::option> &suboptions);
+	ui_submenu(running_machine &machine, render_container *container, std::vector<ui_submenu::option> &suboptions, const game_driver *drv = nullptr, emu_options *options = nullptr);
 	virtual ~ui_submenu();
 	virtual void populate() override;
 	virtual void handle() override;
@@ -54,6 +54,7 @@ public:
 
 private:
 	std::vector<option> &m_options;
+	const game_driver  *m_driver;
 };
 
 static std::vector<ui_submenu::option> misc_submenu_options = {
@@ -134,8 +135,9 @@ static std::vector<ui_submenu::option> control_submenu_options = {
 };
 
 static std::vector<ui_submenu::option> video_submenu_options = {
-	{ ui_submenu::HEAD, __("Display Options") },
+	{ ui_submenu::HEAD, __("Video Options") },
 	{ ui_submenu::OSD,  __("Video Mode"),                              OSDOPTION_VIDEO },
+	{ ui_submenu::OSD,  __("Number Of Screens"),                       OSDOPTION_NUMSCREENS },
 #if defined(UI_WINDOWS) && !defined(UI_SDL)
 	{ ui_submenu::OSD,  __("Triple Buffering"),                        WINOPTION_TRIPLEBUFFER },
 	{ ui_submenu::OSD,  __("HLSL"),                                    WINOPTION_HLSL_ENABLE },
diff --git a/src/emu/uiinput.cpp b/src/emu/uiinput.cpp
index 1b65388bc14..8d710ebcbfc 100644
--- a/src/emu/uiinput.cpp
+++ b/src/emu/uiinput.cpp
@@ -297,6 +297,36 @@ void ui_input_manager::push_mouse_up_event(render_target* target, INT32 x, INT32
 	push_event(event);
 }
 
+/*-------------------------------------------------
+push_mouse_down_event - pushes a mouse
+down event to the specified render_target
+-------------------------------------------------*/
+
+void ui_input_manager::push_mouse_rdown_event(render_target* target, INT32 x, INT32 y)
+{
+	ui_event event = { UI_EVENT_NONE };
+	event.event_type = UI_EVENT_MOUSE_RDOWN;
+	event.target = target;
+	event.mouse_x = x;
+	event.mouse_y = y;
+	push_event(event);
+}
+
+/*-------------------------------------------------
+push_mouse_down_event - pushes a mouse
+down event to the specified render_target
+-------------------------------------------------*/
+
+void ui_input_manager::push_mouse_rup_event(render_target* target, INT32 x, INT32 y)
+{
+	ui_event event = { UI_EVENT_NONE };
+	event.event_type = UI_EVENT_MOUSE_RUP;
+	event.target = target;
+	event.mouse_x = x;
+	event.mouse_y = y;
+	push_event(event);
+}
+
 /*-------------------------------------------------
     push_mouse_double_click_event - pushes
     a mouse double-click event to the specified
diff --git a/src/emu/uiinput.h b/src/emu/uiinput.h
index fecc61c0c1a..2bd715e01aa 100644
--- a/src/emu/uiinput.h
+++ b/src/emu/uiinput.h
@@ -32,6 +32,8 @@ enum ui_event_type
 	UI_EVENT_MOUSE_LEAVE,
 	UI_EVENT_MOUSE_DOWN,
 	UI_EVENT_MOUSE_UP,
+	UI_EVENT_MOUSE_RDOWN,
+	UI_EVENT_MOUSE_RUP,
 	UI_EVENT_MOUSE_DOUBLE_CLICK,
 	UI_EVENT_MOUSE_WHEEL,
 	UI_EVENT_CHAR
@@ -86,6 +88,8 @@ public:
 	void push_mouse_leave_event(render_target* target);
 	void push_mouse_down_event(render_target* target, INT32 x, INT32 y);
 	void push_mouse_up_event(render_target* target, INT32 x, INT32 y);
+	void push_mouse_rdown_event(render_target* target, INT32 x, INT32 y);
+	void push_mouse_rup_event(render_target* target, INT32 x, INT32 y);
 	void push_mouse_double_click_event(render_target* target, INT32 x, INT32 y);
 	void push_char_event(render_target* target, unicode_char ch);
 	void push_mouse_wheel_event(render_target *target, INT32 x, INT32 y, short delta, int ucNumLines);
diff --git a/src/osd/modules/input/input_sdl.cpp b/src/osd/modules/input/input_sdl.cpp
index 06096a6961b..8814cfe3876 100644
--- a/src/osd/modules/input/input_sdl.cpp
+++ b/src/osd/modules/input/input_sdl.cpp
@@ -248,6 +248,17 @@ public:
 					}
 				}
 			}
+
+			else if (sdlevent.button.button == 3)
+			{
+				int cx, cy;
+				sdl_window_info *window = GET_FOCUS_WINDOW(&sdlevent.button);
+
+				if (window != NULL && window->xy_to_render_target(sdlevent.button.x, sdlevent.button.y, &cx, &cy))
+				{
+					machine().ui_input().push_mouse_rdown_event(window->target(), cx, cy);
+				}
+			}
 			break;
 
 		case SDL_MOUSEBUTTONUP:
@@ -264,6 +275,16 @@ public:
 					machine().ui_input().push_mouse_up_event(window->target(), cx, cy);
 				}
 			}
+			else if (sdlevent.button.button == 3)
+			{
+				int cx, cy;
+				sdl_window_info *window = GET_FOCUS_WINDOW(&sdlevent.button);
+
+				if (window != NULL && window->xy_to_render_target(sdlevent.button.x, sdlevent.button.y, &cx, &cy))
+				{
+					machine().ui_input().push_mouse_rup_event(window->target(), cx, cy);
+				}
+			}
 			break;
 
 		case SDL_MOUSEWHEEL:
diff --git a/src/osd/windows/window.cpp b/src/osd/windows/window.cpp
index 0e30da1b93d..faf16c9e4b8 100644
--- a/src/osd/windows/window.cpp
+++ b/src/osd/windows/window.cpp
@@ -1372,6 +1372,14 @@ LRESULT CALLBACK win_window_info::video_window_proc(HWND wnd, UINT message, WPAR
 			window->machine().ui_input().push_mouse_up_event(window->m_target, GET_X_LPARAM(lparam), GET_Y_LPARAM(lparam));
 			break;
 
+		case WM_RBUTTONDOWN:
+			window->machine().ui_input().push_mouse_rdown_event(window->m_target, GET_X_LPARAM(lparam), GET_Y_LPARAM(lparam));
+			break;
+
+		case WM_RBUTTONUP:
+			window->machine().ui_input().push_mouse_rup_event(window->m_target, GET_X_LPARAM(lparam), GET_Y_LPARAM(lparam));
+			break;
+
 		case WM_CHAR:
 			window->machine().ui_input().push_char_event(window->m_target, (unicode_char) wparam);
 			break;

From af31c6a20e841016b4c24bc0e6301ba55fd6713e Mon Sep 17 00:00:00 2001
From: dankan1890 <mewuidev2@gmail.com>
Date: Fri, 15 Apr 2016 17:49:12 +0200
Subject: [PATCH 018/122] Synchronized the translation files. (Nw)

---
 language/Afrikaans/strings.po           | 786 ++++++++++++-----------
 language/Albanian/strings.po            | 786 ++++++++++++-----------
 language/Arabic/strings.po              | 786 ++++++++++++-----------
 language/Basque/strings.po              | 786 ++++++++++++-----------
 language/Belarusian/strings.po          | 786 ++++++++++++-----------
 language/Bosnian/strings.po             | 786 ++++++++++++-----------
 language/Bulgarian/strings.po           | 786 ++++++++++++-----------
 language/Burmese/strings.po             | 786 ++++++++++++-----------
 language/Catalan/strings.po             | 791 ++++++++++++-----------
 language/Chinese_Simplified/strings.po  | 806 ++++++++++++-----------
 language/Chinese_Traditional/strings.po | 806 ++++++++++++-----------
 language/Croatian/strings.po            | 786 ++++++++++++-----------
 language/Czech/strings.po               | 806 ++++++++++++-----------
 language/Danish/strings.po              | 786 ++++++++++++-----------
 language/Dutch/strings.po               | 809 +++++++++++------------
 language/English/strings.po             | 786 ++++++++++++-----------
 language/Estonian/strings.po            | 786 ++++++++++++-----------
 language/Finnish/strings.po             | 786 ++++++++++++-----------
 language/French/strings.po              | 786 ++++++++++++-----------
 language/French_Belgium/strings.po      | 806 ++++++++++++-----------
 language/French_Canada/strings.po       | 786 ++++++++++++-----------
 language/Georgian/strings.po            | 786 ++++++++++++-----------
 language/German/strings.po              | 809 +++++++++++------------
 language/Greek/strings.po               | 806 ++++++++++++-----------
 language/Hebrew/strings.po              | 786 ++++++++++++-----------
 language/Hindi/strings.po               | 786 ++++++++++++-----------
 language/Hungarian/strings.po           | 786 ++++++++++++-----------
 language/Indonesian/strings.po          | 786 ++++++++++++-----------
 language/Italian/strings.po             | 802 ++++++++++++-----------
 language/Japanese/strings.po            | 809 +++++++++++------------
 language/Korean/strings.po              | 786 ++++++++++++-----------
 language/Latvian/strings.po             | 786 ++++++++++++-----------
 language/Lithuanian/strings.po          | 786 ++++++++++++-----------
 language/Macedonian/strings.po          | 786 ++++++++++++-----------
 language/Norwegian/strings.po           | 786 ++++++++++++-----------
 language/Persian/strings.po             | 786 ++++++++++++-----------
 language/Polish/strings.po              | 786 ++++++++++++-----------
 language/Portuguese/strings.po          | 786 ++++++++++++-----------
 language/Portuguese_Brazil/strings.po   | 817 ++++++++++++------------
 language/Romanian/strings.po            | 786 ++++++++++++-----------
 language/Russian/strings.po             | 796 ++++++++++++-----------
 language/Serbian/strings.po             | 801 ++++++++++++-----------
 language/Serbian_Cyrillic/strings.po    | 801 ++++++++++++-----------
 language/Slovak/strings.po              | 786 ++++++++++++-----------
 language/Slovenian/strings.po           | 786 ++++++++++++-----------
 language/Spanish/strings.po             | 807 +++++++++++------------
 language/Spanish_Mexico/strings.po      | 786 ++++++++++++-----------
 language/Swedish/strings.po             | 786 ++++++++++++-----------
 language/Thai/strings.po                | 786 ++++++++++++-----------
 language/Turkish/strings.po             | 786 ++++++++++++-----------
 language/Ukrainian/strings.po           | 786 ++++++++++++-----------
 language/Vietnamese/strings.po          | 786 ++++++++++++-----------
 52 files changed, 21065 insertions(+), 20089 deletions(-)

diff --git a/language/Afrikaans/strings.po b/language/Afrikaans/strings.po
index f01bf10ea12..f9616f984f5 100644
--- a/language/Afrikaans/strings.po
+++ b/language/Afrikaans/strings.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MAME\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-11 03:33+0200\n"
+"POT-Creation-Date: 2016-04-15 17:42+0200\n"
 "PO-Revision-Date: 2016-02-20 18:03+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: MAME Language Team\n"
@@ -59,14 +59,14 @@ msgstr ""
 msgid "Autofire Status"
 msgstr ""
 
-#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1698
+#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1695
 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211
 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219
 #: src/emu/ui/videoopt.cpp:223
 msgid "Disabled"
 msgstr ""
 
-#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1698
+#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1695
 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211
 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219
 #: src/emu/ui/videoopt.cpp:223
@@ -74,14 +74,14 @@ msgid "Enabled"
 msgstr ""
 
 #: src/emu/ui/cheatopt.cpp:282 src/emu/ui/cheatopt.cpp:288
-#: src/emu/ui/menu.cpp:710 src/emu/ui/miscmenu.cpp:831
-#: src/emu/ui/sndmenu.cpp:135 src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/menu.cpp:755 src/emu/ui/miscmenu.cpp:936
+#: src/emu/ui/sndmenu.cpp:133 src/emu/ui/sndmenu.cpp:135
 msgid "On"
 msgstr ""
 
 #: src/emu/ui/cheatopt.cpp:282 src/emu/ui/cheatopt.cpp:288
-#: src/emu/ui/menu.cpp:713 src/emu/ui/miscmenu.cpp:831
-#: src/emu/ui/sndmenu.cpp:135 src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/menu.cpp:758 src/emu/ui/miscmenu.cpp:936
+#: src/emu/ui/sndmenu.cpp:133 src/emu/ui/sndmenu.cpp:135
 msgid "Off"
 msgstr ""
 
@@ -93,316 +93,316 @@ msgstr ""
 msgid "Autofire Delay"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:158 src/emu/ui/custmenu.cpp:447
+#: src/emu/ui/custmenu.cpp:157 src/emu/ui/custmenu.cpp:445
 msgid "Main filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:167 src/emu/ui/custmenu.cpp:456
+#: src/emu/ui/custmenu.cpp:166 src/emu/ui/custmenu.cpp:454
 msgid "Other filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:176 src/emu/ui/optsmenu.cpp:239
+#: src/emu/ui/custmenu.cpp:175 src/emu/ui/optsmenu.cpp:238
 msgid "^!Manufacturer"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:185 src/emu/ui/custmenu.cpp:474
-#: src/emu/ui/optsmenu.cpp:247
+#: src/emu/ui/custmenu.cpp:184 src/emu/ui/custmenu.cpp:472
+#: src/emu/ui/optsmenu.cpp:246
 msgid "^!Year"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:194 src/emu/ui/custmenu.cpp:510
+#: src/emu/ui/custmenu.cpp:193 src/emu/ui/custmenu.cpp:508
 msgid "Remove last filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:197 src/emu/ui/custmenu.cpp:513
+#: src/emu/ui/custmenu.cpp:196 src/emu/ui/custmenu.cpp:511
 msgid "Add filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:212 src/emu/ui/custmenu.cpp:233
-#: src/emu/ui/custmenu.cpp:529 src/emu/ui/custmenu.cpp:550
+#: src/emu/ui/custmenu.cpp:211 src/emu/ui/custmenu.cpp:231
+#: src/emu/ui/custmenu.cpp:527 src/emu/ui/custmenu.cpp:547
 msgid "Select custom filters:"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:465
+#: src/emu/ui/custmenu.cpp:463
 msgid "^!Publisher"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:483
+#: src/emu/ui/custmenu.cpp:481
 msgid "^!Software List"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:492
+#: src/emu/ui/custmenu.cpp:490
 msgid "^!Device type"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:501
+#: src/emu/ui/custmenu.cpp:499
 msgid "^!Region"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:23
+#: src/emu/ui/custui.cpp:22
 msgid "Show All"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:24
+#: src/emu/ui/custui.cpp:23
 msgid "Hide Filters"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:25
+#: src/emu/ui/custui.cpp:24
 msgid "Hide Info/Image"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:26
+#: src/emu/ui/custui.cpp:25
 msgid "Hide Both"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:142
+#: src/emu/ui/custui.cpp:141
 msgid "Fonts"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:143
+#: src/emu/ui/custui.cpp:142
 msgid "Colors"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:148 src/emu/ui/dirmenu.cpp:33
+#: src/emu/ui/custui.cpp:147 src/emu/ui/dirmenu.cpp:33
 msgid "Language"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:152
+#: src/emu/ui/custui.cpp:151
 msgid "Show side panels"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:167 src/emu/ui/custui.cpp:188
+#: src/emu/ui/custui.cpp:166 src/emu/ui/custui.cpp:186
 msgid "Custom UI Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:246
+#: src/emu/ui/custui.cpp:244
 msgid "default"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:349
+#: src/emu/ui/custui.cpp:347
 msgid "UI Font"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:354
+#: src/emu/ui/custui.cpp:352
 msgid "Bold"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:355
+#: src/emu/ui/custui.cpp:353
 msgid "Italic"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:360
+#: src/emu/ui/custui.cpp:358
 msgid "Lines"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:366
+#: src/emu/ui/custui.cpp:364
 msgid "Infos text size"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:383
+#: src/emu/ui/custui.cpp:381
 msgid "UI Fonts Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:411
+#: src/emu/ui/custui.cpp:408
 msgid "Sample text - Lorem ipsum dolor sit amet, consectetur adipiscing elit."
 msgstr ""
 
-#: src/emu/ui/custui.cpp:509
+#: src/emu/ui/custui.cpp:506
 msgid "Normal text"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:510
+#: src/emu/ui/custui.cpp:507
 msgid "Selected color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:511
+#: src/emu/ui/custui.cpp:508
 msgid "Normal text background"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:512
+#: src/emu/ui/custui.cpp:509
 msgid "Selected background color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:513
+#: src/emu/ui/custui.cpp:510
 msgid "Subitem color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:514 src/emu/ui/custui.cpp:610
+#: src/emu/ui/custui.cpp:511 src/emu/ui/custui.cpp:606
 msgid "Clone"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:515
+#: src/emu/ui/custui.cpp:512
 msgid "Border"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:516
+#: src/emu/ui/custui.cpp:513
 msgid "Background"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:517
+#: src/emu/ui/custui.cpp:514
 msgid "Dipswitch"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:518
+#: src/emu/ui/custui.cpp:515
 msgid "Unavailable color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:519
+#: src/emu/ui/custui.cpp:516
 msgid "Slider color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:520
+#: src/emu/ui/custui.cpp:517
 msgid "Gfx viewer background"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:521
+#: src/emu/ui/custui.cpp:518
 msgid "Mouse over color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:522
+#: src/emu/ui/custui.cpp:519
 msgid "Mouse over background color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:523
+#: src/emu/ui/custui.cpp:520
 msgid "Mouse down color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:524
+#: src/emu/ui/custui.cpp:521
 msgid "Mouse down background color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:527
+#: src/emu/ui/custui.cpp:524
 msgid "Restore originals colors"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:543
+#: src/emu/ui/custui.cpp:540
 msgid "UI Colors Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:572
+#: src/emu/ui/custui.cpp:568
 #, c-format
 msgid "Double click or press %1$s to change the color value"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:598
+#: src/emu/ui/custui.cpp:594
 msgid "Menu Preview"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:606
+#: src/emu/ui/custui.cpp:602
 msgid "Normal"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:607
+#: src/emu/ui/custui.cpp:603
 msgid "Subitem"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:608
+#: src/emu/ui/custui.cpp:604
 msgid "Selected"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:609
+#: src/emu/ui/custui.cpp:605
 msgid "Mouse Over"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:841 src/emu/ui/custui.cpp:844
+#: src/emu/ui/custui.cpp:837 src/emu/ui/custui.cpp:840
 msgid "Alpha"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:849 src/emu/ui/custui.cpp:852
-#: src/emu/ui/custui.cpp:1013
+#: src/emu/ui/custui.cpp:845 src/emu/ui/custui.cpp:848
+#: src/emu/ui/custui.cpp:1007
 msgid "Red"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:857 src/emu/ui/custui.cpp:860
-#: src/emu/ui/custui.cpp:1016
+#: src/emu/ui/custui.cpp:853 src/emu/ui/custui.cpp:856
+#: src/emu/ui/custui.cpp:1010
 msgid "Green"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:865 src/emu/ui/custui.cpp:868
-#: src/emu/ui/custui.cpp:1017
+#: src/emu/ui/custui.cpp:861 src/emu/ui/custui.cpp:864
+#: src/emu/ui/custui.cpp:1011
 msgid "Blue"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:871
+#: src/emu/ui/custui.cpp:867
 msgid "Choose from palette"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:887
+#: src/emu/ui/custui.cpp:883
 msgid " - ARGB Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:912
+#: src/emu/ui/custui.cpp:907
 msgid "Color preview ="
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1009
+#: src/emu/ui/custui.cpp:1003
 msgid "White"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1010
+#: src/emu/ui/custui.cpp:1004
 msgid "Silver"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1011
+#: src/emu/ui/custui.cpp:1005
 msgid "Gray"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1012
+#: src/emu/ui/custui.cpp:1006
 msgid "Black"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1014
+#: src/emu/ui/custui.cpp:1008
 msgid "Orange"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1015
+#: src/emu/ui/custui.cpp:1009
 msgid "Yellow"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1018
+#: src/emu/ui/custui.cpp:1012
 msgid "Violet"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:65
+#: src/emu/ui/datmenu.cpp:64
 msgid "Software History"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:67
+#: src/emu/ui/datmenu.cpp:66
 msgid "Software Usage"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:199
+#: src/emu/ui/datmenu.cpp:196
 msgid "Revision: "
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:287 src/emu/ui/selgame.cpp:40
-#: src/emu/ui/selgame.cpp:2152 src/emu/ui/selgame.cpp:2161
-#: src/emu/ui/selsoft.cpp:1577 src/emu/ui/selsoft.cpp:1597
-#: src/emu/ui/selsoft.cpp:1606
+#: src/emu/ui/datmenu.cpp:284 src/emu/ui/selgame.cpp:39
+#: src/emu/ui/selgame.cpp:2158 src/emu/ui/selgame.cpp:2167
+#: src/emu/ui/selsoft.cpp:1574 src/emu/ui/selsoft.cpp:1592
+#: src/emu/ui/selsoft.cpp:1601
 msgid "History"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:289 src/emu/ui/selgame.cpp:41
+#: src/emu/ui/datmenu.cpp:286 src/emu/ui/selgame.cpp:40
 msgid "Mameinfo"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:291 src/emu/ui/selgame.cpp:43
+#: src/emu/ui/datmenu.cpp:288 src/emu/ui/selgame.cpp:42
 msgid "Messinfo"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:293 src/emu/ui/selgame.cpp:42
+#: src/emu/ui/datmenu.cpp:290 src/emu/ui/selgame.cpp:41
 msgid "Sysinfo"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:295 src/emu/ui/selgame.cpp:46
+#: src/emu/ui/datmenu.cpp:292 src/emu/ui/selgame.cpp:45
 msgid "Mamescore"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:297 src/emu/ui/selgame.cpp:45
+#: src/emu/ui/datmenu.cpp:294 src/emu/ui/selgame.cpp:44
 msgid "Gameinit"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:299 src/emu/ui/selgame.cpp:44
+#: src/emu/ui/datmenu.cpp:296 src/emu/ui/selgame.cpp:43
 msgid "Command"
 msgstr ""
 
@@ -554,75 +554,75 @@ msgstr ""
 msgid "Remove %1$s Folder"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:158
+#: src/emu/ui/filesel.cpp:161
 msgid "File Already Exists - Override?"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:160 src/emu/ui/selgame.cpp:1568
-#: src/emu/ui/selgame.cpp:1569 src/emu/ui/selgame.cpp:1570
-#: src/emu/ui/selgame.cpp:1571 src/emu/ui/selgame.cpp:1572
-#: src/emu/ui/selgame.cpp:1573 src/emu/ui/selgame.cpp:1574
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/filesel.cpp:163 src/emu/ui/selgame.cpp:1576
+#: src/emu/ui/selgame.cpp:1577 src/emu/ui/selgame.cpp:1578
+#: src/emu/ui/selgame.cpp:1579 src/emu/ui/selgame.cpp:1580
+#: src/emu/ui/selgame.cpp:1581 src/emu/ui/selgame.cpp:1582
+#: src/emu/ui/selgame.cpp:1591
 msgid "No"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:161 src/emu/ui/selgame.cpp:1568
-#: src/emu/ui/selgame.cpp:1569 src/emu/ui/selgame.cpp:1570
-#: src/emu/ui/selgame.cpp:1571 src/emu/ui/selgame.cpp:1572
-#: src/emu/ui/selgame.cpp:1573 src/emu/ui/selgame.cpp:1574
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/filesel.cpp:164 src/emu/ui/selgame.cpp:1576
+#: src/emu/ui/selgame.cpp:1577 src/emu/ui/selgame.cpp:1578
+#: src/emu/ui/selgame.cpp:1579 src/emu/ui/selgame.cpp:1580
+#: src/emu/ui/selgame.cpp:1581 src/emu/ui/selgame.cpp:1582
+#: src/emu/ui/selgame.cpp:1591
 msgid "Yes"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:272
+#: src/emu/ui/filesel.cpp:275
 msgid "New Image Name:"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:278
+#: src/emu/ui/filesel.cpp:281
 msgid "Image Format:"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:284
+#: src/emu/ui/filesel.cpp:287
 msgid "Create"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:315
+#: src/emu/ui/filesel.cpp:318
 msgid "Please enter a file extension too"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:503 src/emu/ui/swlist.cpp:65
+#: src/emu/ui/filesel.cpp:506 src/emu/ui/swlist.cpp:65
 msgid "[empty slot]"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:507
+#: src/emu/ui/filesel.cpp:510
 msgid "[create]"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:511 src/emu/ui/swlist.cpp:76
+#: src/emu/ui/filesel.cpp:514 src/emu/ui/swlist.cpp:76
 msgid "[software list]"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:803
+#: src/emu/ui/filesel.cpp:806
 msgid "Select image format"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:863
+#: src/emu/ui/filesel.cpp:866
 msgid "Select access mode"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:864
+#: src/emu/ui/filesel.cpp:867
 msgid "Read-only"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:866
+#: src/emu/ui/filesel.cpp:869
 msgid "Read-write"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:867
+#: src/emu/ui/filesel.cpp:870
 msgid "Read this image, write to another image"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:868
+#: src/emu/ui/filesel.cpp:871
 msgid "Read this image, write to diff"
 msgstr ""
 
@@ -648,7 +648,7 @@ msgstr ""
 msgid "[empty]"
 msgstr ""
 
-#: src/emu/ui/info_pty.cpp:26 src/emu/ui/mainmenu.cpp:91
+#: src/emu/ui/info_pty.cpp:26 src/emu/ui/mainmenu.cpp:96
 msgid "Pseudo terminals"
 msgstr ""
 
@@ -664,7 +664,7 @@ msgstr ""
 msgid "Other Controls"
 msgstr ""
 
-#: src/emu/ui/inputmap.cpp:622 src/emu/ui/miscmenu.cpp:91
+#: src/emu/ui/inputmap.cpp:622 src/emu/ui/miscmenu.cpp:92
 #: src/emu/ui/slotopt.cpp:172
 msgid "Reset"
 msgstr ""
@@ -697,27 +697,27 @@ msgstr ""
 msgid "Machine Information"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:78
+#: src/emu/ui/mainmenu.cpp:80
 msgid "Image Information"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:81
+#: src/emu/ui/mainmenu.cpp:83
 msgid "File Manager"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:86
+#: src/emu/ui/mainmenu.cpp:92
 msgid "Tape Control"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:94
+#: src/emu/ui/mainmenu.cpp:99
 msgid "Bios Selection"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:100
+#: src/emu/ui/mainmenu.cpp:104
 msgid "Slot Devices"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:107
+#: src/emu/ui/mainmenu.cpp:109
 msgid "Barcode Reader"
 msgstr ""
 
@@ -725,43 +725,43 @@ msgstr ""
 msgid "Network Devices"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:119
+#: src/emu/ui/mainmenu.cpp:118
 msgid "Keyboard Mode"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:122
+#: src/emu/ui/mainmenu.cpp:121
 msgid "Slider Controls"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:125
+#: src/emu/ui/mainmenu.cpp:124
 msgid "Video Options"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:129
+#: src/emu/ui/mainmenu.cpp:128
 msgid "Crosshair Options"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:133
+#: src/emu/ui/mainmenu.cpp:132
 msgid "Cheat"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:136
+#: src/emu/ui/mainmenu.cpp:135
 msgid "Plugin Options"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:140
+#: src/emu/ui/mainmenu.cpp:139
 msgid "External DAT View"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:146
+#: src/emu/ui/mainmenu.cpp:145 src/emu/ui/miscmenu.cpp:785
 msgid "Add To Favorites"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:148
+#: src/emu/ui/mainmenu.cpp:147 src/emu/ui/miscmenu.cpp:787
 msgid "Remove From Favorites"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:155
+#: src/emu/ui/mainmenu.cpp:154
 msgid "Select New Machine"
 msgstr ""
 
@@ -801,189 +801,205 @@ msgstr ""
 msgid "Return to Previous Menu"
 msgstr ""
 
-#: src/emu/ui/menu.cpp:716
+#: src/emu/ui/menu.cpp:761
 msgid "Auto"
 msgstr ""
 
-#: src/emu/ui/menu.cpp:2133
+#: src/emu/ui/menu.cpp:2195
 msgid "Images"
 msgstr ""
 
-#: src/emu/ui/menu.cpp:2134
+#: src/emu/ui/menu.cpp:2196
 msgid "Infos"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Keyboard Mode:"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Natural"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Emulated"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:240
+#: src/emu/ui/miscmenu.cpp:241
 #, c-format
 msgid ""
 "Uptime: %1$d:%2$02d:%3$02d\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:242
+#: src/emu/ui/miscmenu.cpp:243
 #, c-format
 msgid ""
 "Uptime: %1$d:%2$02d\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:246
+#: src/emu/ui/miscmenu.cpp:247
 #, c-format
 msgid ""
 "Tickets dispensed: %1$d\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:257
+#: src/emu/ui/miscmenu.cpp:258
 msgid "Coin %1$c: NA%3$s\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:257
+#: src/emu/ui/miscmenu.cpp:258
 #, c-format
 msgid "Coin %1$c: %2$d%3$s\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:260
+#: src/emu/ui/miscmenu.cpp:261
 msgid " (locked)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:519
+#: src/emu/ui/miscmenu.cpp:520
 msgid "Visible Delay"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:617
+#: src/emu/ui/miscmenu.cpp:619
 #, c-format
 msgid "%s.xml saved under ui folder."
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:645
+#: src/emu/ui/miscmenu.cpp:647
 msgid "Name:             Description:\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:657
+#: src/emu/ui/miscmenu.cpp:659
 #, c-format
 msgid "%s.txt saved under ui folder."
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:675
-msgid "Export XML format (like -listxml)"
+#: src/emu/ui/miscmenu.cpp:677
+msgid "Export list in XML format (like -listxml)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:676
-msgid "Export TXT format (like -listfull)"
+#: src/emu/ui/miscmenu.cpp:678
+msgid "Export list in XML format (like -listxml, but exclude devices)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:734
-msgid "Dummy"
+#: src/emu/ui/miscmenu.cpp:679
+msgid "Export list in TXT format (like -listfull)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:736
-msgid "Save machine configuration"
-msgstr ""
-
-#: src/emu/ui/miscmenu.cpp:848 src/emu/ui/miscmenu.cpp:869
-#: src/emu/ui/selgame.cpp:594
-msgid "Plugins"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:218
-msgid "Filter"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:226
-msgid " ^!File"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:231
-msgid " ^!Category"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:254
-msgid "^!Setup custom filter"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:262
-msgid "Customize UI"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:263
-msgid "Configure Directories"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:266 src/emu/ui/sndmenu.cpp:151
-#: src/emu/ui/sndmenu.cpp:172
-msgid "Sound Options"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:269
-msgid "General Inputs"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:272
-msgid "Save Configuration"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:286 src/emu/ui/optsmenu.cpp:307
-msgid "Settings"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:327
-msgid "**Error saving ui.ini**"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:374
-#, c-format
-msgid "**Error saving %s.ini**"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:378
+#: src/emu/ui/miscmenu.cpp:729 src/emu/ui/optsmenu.cpp:376
 msgid ""
 "\n"
 "    Configuration saved    \n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/selector.cpp:166
+#: src/emu/ui/miscmenu.cpp:774
+msgid "Bios"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:776
+msgid "Driver"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:790
+msgid "Save machine configuration"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:806
+msgid "Configure machine:"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:868 src/emu/ui/selsoft.cpp:109
+msgid " (default)"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:953 src/emu/ui/miscmenu.cpp:973
+#: src/emu/ui/selgame.cpp:600
+msgid "Plugins"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:217
+msgid "Filter"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:225
+msgid " ^!File"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:230
+msgid " ^!Category"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:253
+msgid "^!Setup custom filter"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:261
+msgid "Customize UI"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:262
+msgid "Configure Directories"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:265 src/emu/ui/sndmenu.cpp:149
+#: src/emu/ui/sndmenu.cpp:169
+msgid "Sound Options"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:268
+msgid "General Inputs"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:271
+msgid "Save Configuration"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:285 src/emu/ui/optsmenu.cpp:305
+msgid "Settings"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:325
+msgid "**Error saving ui.ini**"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:372
+#, c-format
+msgid "**Error saving %s.ini**"
+msgstr ""
+
+#: src/emu/ui/selector.cpp:165
 msgid "Selection List - Search: "
 msgstr ""
 
-#: src/emu/ui/selector.cpp:196
+#: src/emu/ui/selector.cpp:194
 #, c-format
 msgid "Double click or press %1$s to select"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:39
+#: src/emu/ui/selgame.cpp:38
 msgid "General Info"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:374 src/emu/ui/selsoft.cpp:282
+#: src/emu/ui/selgame.cpp:380 src/emu/ui/selsoft.cpp:281
 #, c-format
 msgid ""
 "%s\n"
 " added to favorites list."
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:380 src/emu/ui/selgame.cpp:389
-#: src/emu/ui/selsoft.cpp:287
+#: src/emu/ui/selgame.cpp:386 src/emu/ui/selgame.cpp:395
+#: src/emu/ui/selsoft.cpp:286
 #, c-format
 msgid ""
 "%s\n"
 " removed from favorites list."
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:450
+#: src/emu/ui/selgame.cpp:457
 msgid ""
 "The selected machine is missing one or more required ROM or CHD images. "
 "Please select a different machine.\n"
@@ -991,275 +1007,275 @@ msgid ""
 "Press any key to continue."
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:589 src/emu/ui/simpleselgame.cpp:265
+#: src/emu/ui/selgame.cpp:595 src/emu/ui/simpleselgame.cpp:265
 msgid "Configure Options"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:752
+#: src/emu/ui/selgame.cpp:596
+msgid "Configure Machine"
+msgstr ""
+
+#: src/emu/ui/selgame.cpp:758
 #, c-format
 msgid "%1$s %2$s ( %3$d / %4$d machines (%5$d BIOS) )"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:762
+#: src/emu/ui/selgame.cpp:768
 #, c-format
 msgid "%1$s (%2$s - %3$s) - "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:769 src/emu/ui/selgame.cpp:775
+#: src/emu/ui/selgame.cpp:775 src/emu/ui/selgame.cpp:781
 #, c-format
 msgid "%1$s (%2$s) - "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:784
+#: src/emu/ui/selgame.cpp:790
 #, c-format
 msgid "%1$s Search: %2$s_"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:838
+#: src/emu/ui/selgame.cpp:844
 #, c-format
 msgid "Romset: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:841 src/emu/ui/selgame.cpp:890
-#: src/emu/ui/selsoft.cpp:751 src/emu/ui/selsoft.cpp:801
+#: src/emu/ui/selgame.cpp:847 src/emu/ui/selgame.cpp:896
+#: src/emu/ui/selsoft.cpp:750 src/emu/ui/selsoft.cpp:800
 #: src/emu/ui/simpleselgame.cpp:328
 #, c-format
 msgid "%1$s, %2$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:847 src/emu/ui/selsoft.cpp:757
+#: src/emu/ui/selgame.cpp:853 src/emu/ui/selsoft.cpp:756
 #, c-format
 msgid "Driver is clone of: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:849 src/emu/ui/selsoft.cpp:759
+#: src/emu/ui/selgame.cpp:855 src/emu/ui/selsoft.cpp:758
 msgid "Driver is parent"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:853 src/emu/ui/selsoft.cpp:763
+#: src/emu/ui/selgame.cpp:859 src/emu/ui/selsoft.cpp:762
 #: src/emu/ui/simpleselgame.cpp:335
 msgid "Overall: NOT WORKING"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:855 src/emu/ui/selsoft.cpp:765
+#: src/emu/ui/selgame.cpp:861 src/emu/ui/selsoft.cpp:764
 #: src/emu/ui/simpleselgame.cpp:337
 msgid "Overall: Unemulated Protection"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:857 src/emu/ui/selsoft.cpp:767
+#: src/emu/ui/selgame.cpp:863 src/emu/ui/selsoft.cpp:766
 #: src/emu/ui/simpleselgame.cpp:339
 msgid "Overall: Working"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:861 src/emu/ui/selsoft.cpp:771
+#: src/emu/ui/selgame.cpp:867 src/emu/ui/selsoft.cpp:770
 msgid "Graphics: Imperfect, "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:863 src/emu/ui/selsoft.cpp:773
+#: src/emu/ui/selgame.cpp:869 src/emu/ui/selsoft.cpp:772
 msgid "Graphics: OK, "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:866 src/emu/ui/selsoft.cpp:776
+#: src/emu/ui/selgame.cpp:872 src/emu/ui/selsoft.cpp:775
 msgid "Sound: Unimplemented"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:868 src/emu/ui/selsoft.cpp:778
+#: src/emu/ui/selgame.cpp:874 src/emu/ui/selsoft.cpp:777
 msgid "Sound: Imperfect"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:870 src/emu/ui/selsoft.cpp:780
+#: src/emu/ui/selgame.cpp:876 src/emu/ui/selsoft.cpp:779
 msgid "Sound: OK"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:887
+#: src/emu/ui/selgame.cpp:893
 #, c-format
 msgid "System: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:894 src/emu/ui/selsoft.cpp:805
+#: src/emu/ui/selgame.cpp:900 src/emu/ui/selsoft.cpp:804
 #, c-format
 msgid "Software is clone of: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:896 src/emu/ui/selsoft.cpp:807
+#: src/emu/ui/selgame.cpp:902 src/emu/ui/selsoft.cpp:806
 msgid "Software is parent"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:901 src/emu/ui/selsoft.cpp:812
+#: src/emu/ui/selgame.cpp:907 src/emu/ui/selsoft.cpp:811
 msgid "Supported: No"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:906 src/emu/ui/selsoft.cpp:817
+#: src/emu/ui/selgame.cpp:912 src/emu/ui/selsoft.cpp:816
 msgid "Supported: Partial"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:911 src/emu/ui/selsoft.cpp:822
+#: src/emu/ui/selgame.cpp:917 src/emu/ui/selsoft.cpp:821
 msgid "Supported: Yes"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:916 src/emu/ui/selsoft.cpp:827
+#: src/emu/ui/selgame.cpp:922 src/emu/ui/selsoft.cpp:826
 #, c-format
 msgid "romset: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:923
+#: src/emu/ui/selgame.cpp:929
 #, c-format
 msgid "%1$s %2$s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1535
+#: src/emu/ui/selgame.cpp:1543
 #, c-format
 msgid "Romset: %1$-.100s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1536
+#: src/emu/ui/selgame.cpp:1544
 #, c-format
 msgid "Year: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1537
+#: src/emu/ui/selgame.cpp:1545
 #, c-format
 msgid "Manufacturer: %1$-.100s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1541
+#: src/emu/ui/selgame.cpp:1549
 #, c-format
 msgid "Driver is Clone of: %1$-.100s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1543
+#: src/emu/ui/selgame.cpp:1551
 msgid "Driver is Parent\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1546
+#: src/emu/ui/selgame.cpp:1554
 msgid "Overall: NOT WORKING\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1548
+#: src/emu/ui/selgame.cpp:1556
 msgid "Overall: Unemulated Protection\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1550
+#: src/emu/ui/selgame.cpp:1558
 msgid "Overall: Working\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1553
+#: src/emu/ui/selgame.cpp:1561
 msgid "Graphics: Imperfect Colors\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1557
+#: src/emu/ui/selgame.cpp:1565
 msgid "Graphics: Imperfect\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1559
+#: src/emu/ui/selgame.cpp:1567
 msgid "Graphics: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1562
+#: src/emu/ui/selgame.cpp:1570
 msgid "Sound: Unimplemented\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1564
+#: src/emu/ui/selgame.cpp:1572
 msgid "Sound: Imperfect\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1566
+#: src/emu/ui/selgame.cpp:1574
 msgid "Sound: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1568
+#: src/emu/ui/selgame.cpp:1576
 #, c-format
 msgid "Driver is Skeleton: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1569
+#: src/emu/ui/selgame.cpp:1577
 #, c-format
 msgid "Game is Mechanical: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1570
+#: src/emu/ui/selgame.cpp:1578
 #, c-format
 msgid "Requires Artwork: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1571
+#: src/emu/ui/selgame.cpp:1579
 #, c-format
 msgid "Requires Clickable Artwork: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1572
+#: src/emu/ui/selgame.cpp:1580
 #, c-format
 msgid "Support Cocktail: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1573
+#: src/emu/ui/selgame.cpp:1581
 #, c-format
 msgid "Driver is Bios: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1574
+#: src/emu/ui/selgame.cpp:1582
 #, c-format
 msgid "Support Save: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 #, c-format
 msgid "Screen Orientation: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 msgid "Vertical"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 msgid "Horizontal"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/selgame.cpp:1591
 #, c-format
 msgid "Requires CHD: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1596
+#: src/emu/ui/selgame.cpp:1604
 msgid "Roms Audit Pass: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1598
+#: src/emu/ui/selgame.cpp:1606
 msgid "Roms Audit Pass: BAD\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1601
+#: src/emu/ui/selgame.cpp:1609
 msgid "Samples Audit Pass: None Needed\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1603
+#: src/emu/ui/selgame.cpp:1611
 msgid "Samples Audit Pass: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1605
+#: src/emu/ui/selgame.cpp:1613
 msgid "Samples Audit Pass: BAD\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1608
+#: src/emu/ui/selgame.cpp:1616
 msgid ""
 "Roms Audit Pass: Disabled\n"
 "Samples Audit Pass: Disabled\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:2049 src/emu/ui/selgame.cpp:2212
-#: src/emu/ui/selsoft.cpp:1662
+#: src/emu/ui/selgame.cpp:2055 src/emu/ui/selgame.cpp:2216
+#: src/emu/ui/selsoft.cpp:1655
 msgid "No Infos Available"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:2162 src/emu/ui/selsoft.cpp:1607
+#: src/emu/ui/selgame.cpp:2168 src/emu/ui/selsoft.cpp:1602
 msgid "Usage"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:110
-msgid " (default)"
-msgstr ""
-
-#: src/emu/ui/selsoft.cpp:381
+#: src/emu/ui/selsoft.cpp:380
 msgid ""
 "The selected software is missing one or more required files. Please select a "
 "different software.\n"
@@ -1267,57 +1283,57 @@ msgid ""
 "Press any key to continue."
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:684
+#: src/emu/ui/selsoft.cpp:683
 #, c-format
-msgid "%1$s %2$s ( %3$d / %4$d softwares )"
+msgid "%1$s %2$s ( %3$d / %4$d software packages )"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:685
+#: src/emu/ui/selsoft.cpp:684
 #, c-format
 msgid "Driver: \"%1$s\" software list "
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:688
+#: src/emu/ui/selsoft.cpp:687
 #, c-format
 msgid "Region: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:690
+#: src/emu/ui/selsoft.cpp:689
 #, c-format
 msgid "Publisher: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:692
+#: src/emu/ui/selsoft.cpp:691
 #, c-format
 msgid "Year: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:694
+#: src/emu/ui/selsoft.cpp:693
 #, c-format
 msgid "Software List: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:696
+#: src/emu/ui/selsoft.cpp:695
 #, c-format
 msgid "Device type: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:698
+#: src/emu/ui/selsoft.cpp:697
 #, c-format
 msgid "%s Search: %s_"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:748 src/emu/ui/selsoft.cpp:798
+#: src/emu/ui/selsoft.cpp:747 src/emu/ui/selsoft.cpp:797
 #: src/emu/ui/simpleselgame.cpp:325
 #, c-format
 msgid "%1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:1998 src/emu/ui/selsoft.cpp:2018
+#: src/emu/ui/selsoft.cpp:1991 src/emu/ui/selsoft.cpp:2011
 msgid "Software part selection:"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:2136 src/emu/ui/selsoft.cpp:2156
+#: src/emu/ui/selsoft.cpp:2129 src/emu/ui/selsoft.cpp:2149
 msgid "Bios selection:"
 msgstr ""
 
@@ -1365,15 +1381,15 @@ msgstr ""
 msgid " [internal]"
 msgstr ""
 
-#: src/emu/ui/sndmenu.cpp:135
+#: src/emu/ui/sndmenu.cpp:133
 msgid "Sound"
 msgstr ""
 
-#: src/emu/ui/sndmenu.cpp:136
+#: src/emu/ui/sndmenu.cpp:134
 msgid "Sample Rate"
 msgstr ""
 
-#: src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/sndmenu.cpp:135
 msgid "Use External Samples"
 msgstr ""
 
@@ -1442,80 +1458,80 @@ msgstr ""
 msgid "Fast Forward"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:419
+#: src/emu/ui/ui.cpp:418
 msgid "This driver requires images to be loaded in the following device(s): "
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1074
+#: src/emu/ui/ui.cpp:1071
 msgid ""
 "One or more ROMs/CHDs for this machine are incorrect. The machine may not "
 "run correctly.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1087
+#: src/emu/ui/ui.cpp:1084
 msgid ""
 "There are known problems with this machine\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1091
+#: src/emu/ui/ui.cpp:1088
 msgid ""
 "One or more ROMs/CHDs for this machine have not been correctly dumped.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1095
+#: src/emu/ui/ui.cpp:1092
 #, c-format
 msgid "The keyboard emulation may not be 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1097
+#: src/emu/ui/ui.cpp:1094
 #, c-format
 msgid "The colors aren't 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1099
+#: src/emu/ui/ui.cpp:1096
 msgid "The colors are completely wrong.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1101
+#: src/emu/ui/ui.cpp:1098
 #, c-format
 msgid "The video emulation isn't 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1103
+#: src/emu/ui/ui.cpp:1100
 #, c-format
 msgid "The sound emulation isn't 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1105
+#: src/emu/ui/ui.cpp:1102
 msgid "The machine lacks sound.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1108
+#: src/emu/ui/ui.cpp:1105
 msgid "Screen flipping in cocktail mode is not supported.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1112
+#: src/emu/ui/ui.cpp:1109
 msgid "The machine requires external artwork files\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1117
+#: src/emu/ui/ui.cpp:1114
 msgid ""
 "This machine was never completed. It may exhibit strange behavior or missing "
 "elements that are not bugs in the emulation.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1122
+#: src/emu/ui/ui.cpp:1119
 msgid ""
 "This machine has no sound hardware, MAME will produce no sounds, this is "
 "expected behaviour.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1130
+#: src/emu/ui/ui.cpp:1127
 msgid "The machine has protection which isn't fully emulated.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1133
+#: src/emu/ui/ui.cpp:1130
 msgid ""
 "\n"
 "THIS MACHINE DOESN'T WORK. The emulation for this machine is not yet "
@@ -1523,7 +1539,7 @@ msgid ""
 "the developers to improve the emulation.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1137
+#: src/emu/ui/ui.cpp:1134
 msgid ""
 "\n"
 "Certain elements of this machine cannot be emulated as it requires actual "
@@ -1531,21 +1547,21 @@ msgid ""
 "to fully play this machine.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1156
+#: src/emu/ui/ui.cpp:1153
 msgid ""
 "\n"
 "\n"
 "There are working clones of this machine: "
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1170
+#: src/emu/ui/ui.cpp:1167
 msgid ""
 "\n"
 "\n"
 "Press any key to continue"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1185
+#: src/emu/ui/ui.cpp:1182
 #, c-format
 msgid ""
 "%1$s\n"
@@ -1555,98 +1571,98 @@ msgid ""
 "CPU:\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1221 src/emu/ui/ui.cpp:1260
+#: src/emu/ui/ui.cpp:1218 src/emu/ui/ui.cpp:1257
 msgid "MHz"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1221 src/emu/ui/ui.cpp:1260
+#: src/emu/ui/ui.cpp:1218 src/emu/ui/ui.cpp:1257
 msgid "kHz"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1235
+#: src/emu/ui/ui.cpp:1232
 msgid ""
 "\n"
 "Sound:\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1264
+#: src/emu/ui/ui.cpp:1261
 msgid ""
 "\n"
 "Video:\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1268
+#: src/emu/ui/ui.cpp:1265
 msgid "None\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1275
+#: src/emu/ui/ui.cpp:1272
 msgid "Vector"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1286
+#: src/emu/ui/ui.cpp:1283
 #, c-format
 msgid "%1$s: %2$s\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1286
+#: src/emu/ui/ui.cpp:1283
 msgid "%2$s\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1541 src/emu/ui/ui.cpp:1551
+#: src/emu/ui/ui.cpp:1538 src/emu/ui/ui.cpp:1548
 msgid "Keyboard Emulation Status"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1543
+#: src/emu/ui/ui.cpp:1540
 msgid "Mode: PARTIAL Emulation"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1544
+#: src/emu/ui/ui.cpp:1541
 msgid "UI:   Enabled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1546 src/emu/ui/ui.cpp:1556
+#: src/emu/ui/ui.cpp:1543 src/emu/ui/ui.cpp:1553
 msgid "**Use ScrLock to toggle**"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1553
+#: src/emu/ui/ui.cpp:1550
 msgid "Mode: FULL Emulation"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1554
+#: src/emu/ui/ui.cpp:1551
 msgid "UI:   Disabled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1692
+#: src/emu/ui/ui.cpp:1689
 msgid "Autofire can't be enabled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1731
+#: src/emu/ui/ui.cpp:1728
 msgid "Select position to save to"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1733
+#: src/emu/ui/ui.cpp:1730
 msgid "Select position to load from"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1757
+#: src/emu/ui/ui.cpp:1754
 msgid "Save cancelled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1759
+#: src/emu/ui/ui.cpp:1756
 msgid "Load cancelled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1802
+#: src/emu/ui/ui.cpp:1799
 #, c-format
 msgid "Save to position %s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1807
+#: src/emu/ui/ui.cpp:1804
 #, c-format
 msgid "Load from position %s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1847
+#: src/emu/ui/ui.cpp:1844
 #, c-format
 msgid ""
 "Are you sure you want to quit?\n"
@@ -1655,173 +1671,173 @@ msgid ""
 "Press ''%2$s'' to return to emulation."
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1917
+#: src/emu/ui/ui.cpp:1914
 msgid "Master Volume"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1926
+#: src/emu/ui/ui.cpp:1923
 #, c-format
 msgid "%1$s Volume"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1949
+#: src/emu/ui/ui.cpp:1946
 #, c-format
 msgid "Overclock CPU %1$s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1968
+#: src/emu/ui/ui.cpp:1965
 #, c-format
 msgid "%1$s Refresh Rate"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1973
+#: src/emu/ui/ui.cpp:1970
 #, c-format
 msgid "%1$s Brightness"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1975
+#: src/emu/ui/ui.cpp:1972
 #, c-format
 msgid "%1$s Contrast"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1977
+#: src/emu/ui/ui.cpp:1974
 #, c-format
 msgid "%1$s Gamma"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1981
+#: src/emu/ui/ui.cpp:1978
 #, c-format
 msgid "%1$s Horiz Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1983
+#: src/emu/ui/ui.cpp:1980
 #, c-format
 msgid "%1$s Horiz Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1985
+#: src/emu/ui/ui.cpp:1982
 #, c-format
 msgid "%1$s Vert Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1987
+#: src/emu/ui/ui.cpp:1984
 #, c-format
 msgid "%1$s Vert Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2005
+#: src/emu/ui/ui.cpp:2002
 #, c-format
 msgid "Laserdisc '%1$s' Horiz Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2007
+#: src/emu/ui/ui.cpp:2004
 #, c-format
 msgid "Laserdisc '%1$s' Horiz Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2009
+#: src/emu/ui/ui.cpp:2006
 #, c-format
 msgid "Laserdisc '%1$s' Vert Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2011
+#: src/emu/ui/ui.cpp:2008
 #, c-format
 msgid "Laserdisc '%1$s' Vert Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2021
+#: src/emu/ui/ui.cpp:2018
 msgid "Vector Flicker"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2022
+#: src/emu/ui/ui.cpp:2019
 msgid "Beam Width Minimum"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2023
+#: src/emu/ui/ui.cpp:2020
 msgid "Beam Width Maximum"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2024
+#: src/emu/ui/ui.cpp:2021
 msgid "Beam Intensity Weight"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2037
+#: src/emu/ui/ui.cpp:2034
 #, c-format
 msgid "Crosshair Scale %1$s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2037 src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2034 src/emu/ui/ui.cpp:2036
 msgid "X"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2037 src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2034 src/emu/ui/ui.cpp:2036
 msgid "Y"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2036
 #, c-format
 msgid "Crosshair Offset %1$s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2071
+#: src/emu/ui/ui.cpp:2068
 #, c-format
 msgid "%1$3ddB"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2115
+#: src/emu/ui/ui.cpp:2112
 #, c-format
 msgid "%1$d%%"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2131
+#: src/emu/ui/ui.cpp:2128
 #, c-format
 msgid "%1$3.0f%%"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2154
+#: src/emu/ui/ui.cpp:2151
 #, c-format
 msgid "%1$.3ffps"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2177 src/emu/ui/ui.cpp:2199 src/emu/ui/ui.cpp:2220
-#: src/emu/ui/ui.cpp:2242 src/emu/ui/ui.cpp:2264 src/emu/ui/ui.cpp:2286
-#: src/emu/ui/ui.cpp:2308 src/emu/ui/ui.cpp:2330 src/emu/ui/ui.cpp:2352
-#: src/emu/ui/ui.cpp:2374 src/emu/ui/ui.cpp:2396
+#: src/emu/ui/ui.cpp:2174 src/emu/ui/ui.cpp:2196 src/emu/ui/ui.cpp:2217
+#: src/emu/ui/ui.cpp:2239 src/emu/ui/ui.cpp:2261 src/emu/ui/ui.cpp:2283
+#: src/emu/ui/ui.cpp:2305 src/emu/ui/ui.cpp:2327 src/emu/ui/ui.cpp:2349
+#: src/emu/ui/ui.cpp:2371 src/emu/ui/ui.cpp:2393
 #, c-format
 msgid "%1$.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2412 src/emu/ui/ui.cpp:2428 src/emu/ui/ui.cpp:2444
-#: src/emu/ui/ui.cpp:2460
+#: src/emu/ui/ui.cpp:2408 src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2438
+#: src/emu/ui/ui.cpp:2453
 #, c-format
 msgid "%1$1.2f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2476
+#: src/emu/ui/ui.cpp:2469
 #, c-format
 msgid "Screen '%1$s'"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2478
+#: src/emu/ui/ui.cpp:2471
 msgid "Screen"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2494
+#: src/emu/ui/ui.cpp:2487
 #, c-format
 msgid "Crosshair Scale X %1$1.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2494
+#: src/emu/ui/ui.cpp:2487
 #, c-format
 msgid "Crosshair Scale Y %1$1.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2513
+#: src/emu/ui/ui.cpp:2506
 #, c-format
 msgid "Crosshair Offset X %1$1.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2513
+#: src/emu/ui/ui.cpp:2506
 #, c-format
 msgid "Crosshair Offset Y %1$1.3f"
 msgstr ""
@@ -1863,10 +1879,10 @@ msgstr ""
 msgid "Full"
 msgstr ""
 
-#: src/emu/ui/viewgfx.cpp:392
+#: src/emu/ui/viewgfx.cpp:391
 msgid " COLORS"
 msgstr ""
 
-#: src/emu/ui/viewgfx.cpp:392
+#: src/emu/ui/viewgfx.cpp:391
 msgid " PENS"
 msgstr ""
diff --git a/language/Albanian/strings.po b/language/Albanian/strings.po
index 83a89b1b267..84d5777942e 100644
--- a/language/Albanian/strings.po
+++ b/language/Albanian/strings.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MAME\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-11 03:33+0200\n"
+"POT-Creation-Date: 2016-04-15 17:42+0200\n"
 "PO-Revision-Date: 2016-02-20 18:03+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: MAME Language Team\n"
@@ -59,14 +59,14 @@ msgstr ""
 msgid "Autofire Status"
 msgstr ""
 
-#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1698
+#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1695
 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211
 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219
 #: src/emu/ui/videoopt.cpp:223
 msgid "Disabled"
 msgstr ""
 
-#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1698
+#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1695
 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211
 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219
 #: src/emu/ui/videoopt.cpp:223
@@ -74,14 +74,14 @@ msgid "Enabled"
 msgstr ""
 
 #: src/emu/ui/cheatopt.cpp:282 src/emu/ui/cheatopt.cpp:288
-#: src/emu/ui/menu.cpp:710 src/emu/ui/miscmenu.cpp:831
-#: src/emu/ui/sndmenu.cpp:135 src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/menu.cpp:755 src/emu/ui/miscmenu.cpp:936
+#: src/emu/ui/sndmenu.cpp:133 src/emu/ui/sndmenu.cpp:135
 msgid "On"
 msgstr ""
 
 #: src/emu/ui/cheatopt.cpp:282 src/emu/ui/cheatopt.cpp:288
-#: src/emu/ui/menu.cpp:713 src/emu/ui/miscmenu.cpp:831
-#: src/emu/ui/sndmenu.cpp:135 src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/menu.cpp:758 src/emu/ui/miscmenu.cpp:936
+#: src/emu/ui/sndmenu.cpp:133 src/emu/ui/sndmenu.cpp:135
 msgid "Off"
 msgstr ""
 
@@ -93,316 +93,316 @@ msgstr ""
 msgid "Autofire Delay"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:158 src/emu/ui/custmenu.cpp:447
+#: src/emu/ui/custmenu.cpp:157 src/emu/ui/custmenu.cpp:445
 msgid "Main filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:167 src/emu/ui/custmenu.cpp:456
+#: src/emu/ui/custmenu.cpp:166 src/emu/ui/custmenu.cpp:454
 msgid "Other filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:176 src/emu/ui/optsmenu.cpp:239
+#: src/emu/ui/custmenu.cpp:175 src/emu/ui/optsmenu.cpp:238
 msgid "^!Manufacturer"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:185 src/emu/ui/custmenu.cpp:474
-#: src/emu/ui/optsmenu.cpp:247
+#: src/emu/ui/custmenu.cpp:184 src/emu/ui/custmenu.cpp:472
+#: src/emu/ui/optsmenu.cpp:246
 msgid "^!Year"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:194 src/emu/ui/custmenu.cpp:510
+#: src/emu/ui/custmenu.cpp:193 src/emu/ui/custmenu.cpp:508
 msgid "Remove last filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:197 src/emu/ui/custmenu.cpp:513
+#: src/emu/ui/custmenu.cpp:196 src/emu/ui/custmenu.cpp:511
 msgid "Add filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:212 src/emu/ui/custmenu.cpp:233
-#: src/emu/ui/custmenu.cpp:529 src/emu/ui/custmenu.cpp:550
+#: src/emu/ui/custmenu.cpp:211 src/emu/ui/custmenu.cpp:231
+#: src/emu/ui/custmenu.cpp:527 src/emu/ui/custmenu.cpp:547
 msgid "Select custom filters:"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:465
+#: src/emu/ui/custmenu.cpp:463
 msgid "^!Publisher"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:483
+#: src/emu/ui/custmenu.cpp:481
 msgid "^!Software List"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:492
+#: src/emu/ui/custmenu.cpp:490
 msgid "^!Device type"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:501
+#: src/emu/ui/custmenu.cpp:499
 msgid "^!Region"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:23
+#: src/emu/ui/custui.cpp:22
 msgid "Show All"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:24
+#: src/emu/ui/custui.cpp:23
 msgid "Hide Filters"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:25
+#: src/emu/ui/custui.cpp:24
 msgid "Hide Info/Image"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:26
+#: src/emu/ui/custui.cpp:25
 msgid "Hide Both"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:142
+#: src/emu/ui/custui.cpp:141
 msgid "Fonts"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:143
+#: src/emu/ui/custui.cpp:142
 msgid "Colors"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:148 src/emu/ui/dirmenu.cpp:33
+#: src/emu/ui/custui.cpp:147 src/emu/ui/dirmenu.cpp:33
 msgid "Language"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:152
+#: src/emu/ui/custui.cpp:151
 msgid "Show side panels"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:167 src/emu/ui/custui.cpp:188
+#: src/emu/ui/custui.cpp:166 src/emu/ui/custui.cpp:186
 msgid "Custom UI Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:246
+#: src/emu/ui/custui.cpp:244
 msgid "default"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:349
+#: src/emu/ui/custui.cpp:347
 msgid "UI Font"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:354
+#: src/emu/ui/custui.cpp:352
 msgid "Bold"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:355
+#: src/emu/ui/custui.cpp:353
 msgid "Italic"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:360
+#: src/emu/ui/custui.cpp:358
 msgid "Lines"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:366
+#: src/emu/ui/custui.cpp:364
 msgid "Infos text size"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:383
+#: src/emu/ui/custui.cpp:381
 msgid "UI Fonts Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:411
+#: src/emu/ui/custui.cpp:408
 msgid "Sample text - Lorem ipsum dolor sit amet, consectetur adipiscing elit."
 msgstr ""
 
-#: src/emu/ui/custui.cpp:509
+#: src/emu/ui/custui.cpp:506
 msgid "Normal text"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:510
+#: src/emu/ui/custui.cpp:507
 msgid "Selected color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:511
+#: src/emu/ui/custui.cpp:508
 msgid "Normal text background"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:512
+#: src/emu/ui/custui.cpp:509
 msgid "Selected background color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:513
+#: src/emu/ui/custui.cpp:510
 msgid "Subitem color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:514 src/emu/ui/custui.cpp:610
+#: src/emu/ui/custui.cpp:511 src/emu/ui/custui.cpp:606
 msgid "Clone"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:515
+#: src/emu/ui/custui.cpp:512
 msgid "Border"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:516
+#: src/emu/ui/custui.cpp:513
 msgid "Background"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:517
+#: src/emu/ui/custui.cpp:514
 msgid "Dipswitch"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:518
+#: src/emu/ui/custui.cpp:515
 msgid "Unavailable color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:519
+#: src/emu/ui/custui.cpp:516
 msgid "Slider color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:520
+#: src/emu/ui/custui.cpp:517
 msgid "Gfx viewer background"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:521
+#: src/emu/ui/custui.cpp:518
 msgid "Mouse over color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:522
+#: src/emu/ui/custui.cpp:519
 msgid "Mouse over background color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:523
+#: src/emu/ui/custui.cpp:520
 msgid "Mouse down color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:524
+#: src/emu/ui/custui.cpp:521
 msgid "Mouse down background color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:527
+#: src/emu/ui/custui.cpp:524
 msgid "Restore originals colors"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:543
+#: src/emu/ui/custui.cpp:540
 msgid "UI Colors Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:572
+#: src/emu/ui/custui.cpp:568
 #, c-format
 msgid "Double click or press %1$s to change the color value"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:598
+#: src/emu/ui/custui.cpp:594
 msgid "Menu Preview"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:606
+#: src/emu/ui/custui.cpp:602
 msgid "Normal"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:607
+#: src/emu/ui/custui.cpp:603
 msgid "Subitem"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:608
+#: src/emu/ui/custui.cpp:604
 msgid "Selected"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:609
+#: src/emu/ui/custui.cpp:605
 msgid "Mouse Over"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:841 src/emu/ui/custui.cpp:844
+#: src/emu/ui/custui.cpp:837 src/emu/ui/custui.cpp:840
 msgid "Alpha"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:849 src/emu/ui/custui.cpp:852
-#: src/emu/ui/custui.cpp:1013
+#: src/emu/ui/custui.cpp:845 src/emu/ui/custui.cpp:848
+#: src/emu/ui/custui.cpp:1007
 msgid "Red"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:857 src/emu/ui/custui.cpp:860
-#: src/emu/ui/custui.cpp:1016
+#: src/emu/ui/custui.cpp:853 src/emu/ui/custui.cpp:856
+#: src/emu/ui/custui.cpp:1010
 msgid "Green"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:865 src/emu/ui/custui.cpp:868
-#: src/emu/ui/custui.cpp:1017
+#: src/emu/ui/custui.cpp:861 src/emu/ui/custui.cpp:864
+#: src/emu/ui/custui.cpp:1011
 msgid "Blue"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:871
+#: src/emu/ui/custui.cpp:867
 msgid "Choose from palette"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:887
+#: src/emu/ui/custui.cpp:883
 msgid " - ARGB Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:912
+#: src/emu/ui/custui.cpp:907
 msgid "Color preview ="
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1009
+#: src/emu/ui/custui.cpp:1003
 msgid "White"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1010
+#: src/emu/ui/custui.cpp:1004
 msgid "Silver"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1011
+#: src/emu/ui/custui.cpp:1005
 msgid "Gray"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1012
+#: src/emu/ui/custui.cpp:1006
 msgid "Black"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1014
+#: src/emu/ui/custui.cpp:1008
 msgid "Orange"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1015
+#: src/emu/ui/custui.cpp:1009
 msgid "Yellow"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1018
+#: src/emu/ui/custui.cpp:1012
 msgid "Violet"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:65
+#: src/emu/ui/datmenu.cpp:64
 msgid "Software History"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:67
+#: src/emu/ui/datmenu.cpp:66
 msgid "Software Usage"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:199
+#: src/emu/ui/datmenu.cpp:196
 msgid "Revision: "
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:287 src/emu/ui/selgame.cpp:40
-#: src/emu/ui/selgame.cpp:2152 src/emu/ui/selgame.cpp:2161
-#: src/emu/ui/selsoft.cpp:1577 src/emu/ui/selsoft.cpp:1597
-#: src/emu/ui/selsoft.cpp:1606
+#: src/emu/ui/datmenu.cpp:284 src/emu/ui/selgame.cpp:39
+#: src/emu/ui/selgame.cpp:2158 src/emu/ui/selgame.cpp:2167
+#: src/emu/ui/selsoft.cpp:1574 src/emu/ui/selsoft.cpp:1592
+#: src/emu/ui/selsoft.cpp:1601
 msgid "History"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:289 src/emu/ui/selgame.cpp:41
+#: src/emu/ui/datmenu.cpp:286 src/emu/ui/selgame.cpp:40
 msgid "Mameinfo"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:291 src/emu/ui/selgame.cpp:43
+#: src/emu/ui/datmenu.cpp:288 src/emu/ui/selgame.cpp:42
 msgid "Messinfo"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:293 src/emu/ui/selgame.cpp:42
+#: src/emu/ui/datmenu.cpp:290 src/emu/ui/selgame.cpp:41
 msgid "Sysinfo"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:295 src/emu/ui/selgame.cpp:46
+#: src/emu/ui/datmenu.cpp:292 src/emu/ui/selgame.cpp:45
 msgid "Mamescore"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:297 src/emu/ui/selgame.cpp:45
+#: src/emu/ui/datmenu.cpp:294 src/emu/ui/selgame.cpp:44
 msgid "Gameinit"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:299 src/emu/ui/selgame.cpp:44
+#: src/emu/ui/datmenu.cpp:296 src/emu/ui/selgame.cpp:43
 msgid "Command"
 msgstr ""
 
@@ -554,75 +554,75 @@ msgstr ""
 msgid "Remove %1$s Folder"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:158
+#: src/emu/ui/filesel.cpp:161
 msgid "File Already Exists - Override?"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:160 src/emu/ui/selgame.cpp:1568
-#: src/emu/ui/selgame.cpp:1569 src/emu/ui/selgame.cpp:1570
-#: src/emu/ui/selgame.cpp:1571 src/emu/ui/selgame.cpp:1572
-#: src/emu/ui/selgame.cpp:1573 src/emu/ui/selgame.cpp:1574
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/filesel.cpp:163 src/emu/ui/selgame.cpp:1576
+#: src/emu/ui/selgame.cpp:1577 src/emu/ui/selgame.cpp:1578
+#: src/emu/ui/selgame.cpp:1579 src/emu/ui/selgame.cpp:1580
+#: src/emu/ui/selgame.cpp:1581 src/emu/ui/selgame.cpp:1582
+#: src/emu/ui/selgame.cpp:1591
 msgid "No"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:161 src/emu/ui/selgame.cpp:1568
-#: src/emu/ui/selgame.cpp:1569 src/emu/ui/selgame.cpp:1570
-#: src/emu/ui/selgame.cpp:1571 src/emu/ui/selgame.cpp:1572
-#: src/emu/ui/selgame.cpp:1573 src/emu/ui/selgame.cpp:1574
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/filesel.cpp:164 src/emu/ui/selgame.cpp:1576
+#: src/emu/ui/selgame.cpp:1577 src/emu/ui/selgame.cpp:1578
+#: src/emu/ui/selgame.cpp:1579 src/emu/ui/selgame.cpp:1580
+#: src/emu/ui/selgame.cpp:1581 src/emu/ui/selgame.cpp:1582
+#: src/emu/ui/selgame.cpp:1591
 msgid "Yes"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:272
+#: src/emu/ui/filesel.cpp:275
 msgid "New Image Name:"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:278
+#: src/emu/ui/filesel.cpp:281
 msgid "Image Format:"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:284
+#: src/emu/ui/filesel.cpp:287
 msgid "Create"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:315
+#: src/emu/ui/filesel.cpp:318
 msgid "Please enter a file extension too"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:503 src/emu/ui/swlist.cpp:65
+#: src/emu/ui/filesel.cpp:506 src/emu/ui/swlist.cpp:65
 msgid "[empty slot]"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:507
+#: src/emu/ui/filesel.cpp:510
 msgid "[create]"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:511 src/emu/ui/swlist.cpp:76
+#: src/emu/ui/filesel.cpp:514 src/emu/ui/swlist.cpp:76
 msgid "[software list]"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:803
+#: src/emu/ui/filesel.cpp:806
 msgid "Select image format"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:863
+#: src/emu/ui/filesel.cpp:866
 msgid "Select access mode"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:864
+#: src/emu/ui/filesel.cpp:867
 msgid "Read-only"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:866
+#: src/emu/ui/filesel.cpp:869
 msgid "Read-write"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:867
+#: src/emu/ui/filesel.cpp:870
 msgid "Read this image, write to another image"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:868
+#: src/emu/ui/filesel.cpp:871
 msgid "Read this image, write to diff"
 msgstr ""
 
@@ -648,7 +648,7 @@ msgstr ""
 msgid "[empty]"
 msgstr ""
 
-#: src/emu/ui/info_pty.cpp:26 src/emu/ui/mainmenu.cpp:91
+#: src/emu/ui/info_pty.cpp:26 src/emu/ui/mainmenu.cpp:96
 msgid "Pseudo terminals"
 msgstr ""
 
@@ -664,7 +664,7 @@ msgstr ""
 msgid "Other Controls"
 msgstr ""
 
-#: src/emu/ui/inputmap.cpp:622 src/emu/ui/miscmenu.cpp:91
+#: src/emu/ui/inputmap.cpp:622 src/emu/ui/miscmenu.cpp:92
 #: src/emu/ui/slotopt.cpp:172
 msgid "Reset"
 msgstr ""
@@ -697,27 +697,27 @@ msgstr ""
 msgid "Machine Information"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:78
+#: src/emu/ui/mainmenu.cpp:80
 msgid "Image Information"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:81
+#: src/emu/ui/mainmenu.cpp:83
 msgid "File Manager"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:86
+#: src/emu/ui/mainmenu.cpp:92
 msgid "Tape Control"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:94
+#: src/emu/ui/mainmenu.cpp:99
 msgid "Bios Selection"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:100
+#: src/emu/ui/mainmenu.cpp:104
 msgid "Slot Devices"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:107
+#: src/emu/ui/mainmenu.cpp:109
 msgid "Barcode Reader"
 msgstr ""
 
@@ -725,43 +725,43 @@ msgstr ""
 msgid "Network Devices"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:119
+#: src/emu/ui/mainmenu.cpp:118
 msgid "Keyboard Mode"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:122
+#: src/emu/ui/mainmenu.cpp:121
 msgid "Slider Controls"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:125
+#: src/emu/ui/mainmenu.cpp:124
 msgid "Video Options"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:129
+#: src/emu/ui/mainmenu.cpp:128
 msgid "Crosshair Options"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:133
+#: src/emu/ui/mainmenu.cpp:132
 msgid "Cheat"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:136
+#: src/emu/ui/mainmenu.cpp:135
 msgid "Plugin Options"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:140
+#: src/emu/ui/mainmenu.cpp:139
 msgid "External DAT View"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:146
+#: src/emu/ui/mainmenu.cpp:145 src/emu/ui/miscmenu.cpp:785
 msgid "Add To Favorites"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:148
+#: src/emu/ui/mainmenu.cpp:147 src/emu/ui/miscmenu.cpp:787
 msgid "Remove From Favorites"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:155
+#: src/emu/ui/mainmenu.cpp:154
 msgid "Select New Machine"
 msgstr ""
 
@@ -801,189 +801,205 @@ msgstr ""
 msgid "Return to Previous Menu"
 msgstr ""
 
-#: src/emu/ui/menu.cpp:716
+#: src/emu/ui/menu.cpp:761
 msgid "Auto"
 msgstr ""
 
-#: src/emu/ui/menu.cpp:2133
+#: src/emu/ui/menu.cpp:2195
 msgid "Images"
 msgstr ""
 
-#: src/emu/ui/menu.cpp:2134
+#: src/emu/ui/menu.cpp:2196
 msgid "Infos"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Keyboard Mode:"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Natural"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Emulated"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:240
+#: src/emu/ui/miscmenu.cpp:241
 #, c-format
 msgid ""
 "Uptime: %1$d:%2$02d:%3$02d\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:242
+#: src/emu/ui/miscmenu.cpp:243
 #, c-format
 msgid ""
 "Uptime: %1$d:%2$02d\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:246
+#: src/emu/ui/miscmenu.cpp:247
 #, c-format
 msgid ""
 "Tickets dispensed: %1$d\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:257
+#: src/emu/ui/miscmenu.cpp:258
 msgid "Coin %1$c: NA%3$s\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:257
+#: src/emu/ui/miscmenu.cpp:258
 #, c-format
 msgid "Coin %1$c: %2$d%3$s\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:260
+#: src/emu/ui/miscmenu.cpp:261
 msgid " (locked)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:519
+#: src/emu/ui/miscmenu.cpp:520
 msgid "Visible Delay"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:617
+#: src/emu/ui/miscmenu.cpp:619
 #, c-format
 msgid "%s.xml saved under ui folder."
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:645
+#: src/emu/ui/miscmenu.cpp:647
 msgid "Name:             Description:\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:657
+#: src/emu/ui/miscmenu.cpp:659
 #, c-format
 msgid "%s.txt saved under ui folder."
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:675
-msgid "Export XML format (like -listxml)"
+#: src/emu/ui/miscmenu.cpp:677
+msgid "Export list in XML format (like -listxml)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:676
-msgid "Export TXT format (like -listfull)"
+#: src/emu/ui/miscmenu.cpp:678
+msgid "Export list in XML format (like -listxml, but exclude devices)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:734
-msgid "Dummy"
+#: src/emu/ui/miscmenu.cpp:679
+msgid "Export list in TXT format (like -listfull)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:736
-msgid "Save machine configuration"
-msgstr ""
-
-#: src/emu/ui/miscmenu.cpp:848 src/emu/ui/miscmenu.cpp:869
-#: src/emu/ui/selgame.cpp:594
-msgid "Plugins"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:218
-msgid "Filter"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:226
-msgid " ^!File"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:231
-msgid " ^!Category"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:254
-msgid "^!Setup custom filter"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:262
-msgid "Customize UI"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:263
-msgid "Configure Directories"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:266 src/emu/ui/sndmenu.cpp:151
-#: src/emu/ui/sndmenu.cpp:172
-msgid "Sound Options"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:269
-msgid "General Inputs"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:272
-msgid "Save Configuration"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:286 src/emu/ui/optsmenu.cpp:307
-msgid "Settings"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:327
-msgid "**Error saving ui.ini**"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:374
-#, c-format
-msgid "**Error saving %s.ini**"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:378
+#: src/emu/ui/miscmenu.cpp:729 src/emu/ui/optsmenu.cpp:376
 msgid ""
 "\n"
 "    Configuration saved    \n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/selector.cpp:166
+#: src/emu/ui/miscmenu.cpp:774
+msgid "Bios"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:776
+msgid "Driver"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:790
+msgid "Save machine configuration"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:806
+msgid "Configure machine:"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:868 src/emu/ui/selsoft.cpp:109
+msgid " (default)"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:953 src/emu/ui/miscmenu.cpp:973
+#: src/emu/ui/selgame.cpp:600
+msgid "Plugins"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:217
+msgid "Filter"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:225
+msgid " ^!File"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:230
+msgid " ^!Category"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:253
+msgid "^!Setup custom filter"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:261
+msgid "Customize UI"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:262
+msgid "Configure Directories"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:265 src/emu/ui/sndmenu.cpp:149
+#: src/emu/ui/sndmenu.cpp:169
+msgid "Sound Options"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:268
+msgid "General Inputs"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:271
+msgid "Save Configuration"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:285 src/emu/ui/optsmenu.cpp:305
+msgid "Settings"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:325
+msgid "**Error saving ui.ini**"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:372
+#, c-format
+msgid "**Error saving %s.ini**"
+msgstr ""
+
+#: src/emu/ui/selector.cpp:165
 msgid "Selection List - Search: "
 msgstr ""
 
-#: src/emu/ui/selector.cpp:196
+#: src/emu/ui/selector.cpp:194
 #, c-format
 msgid "Double click or press %1$s to select"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:39
+#: src/emu/ui/selgame.cpp:38
 msgid "General Info"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:374 src/emu/ui/selsoft.cpp:282
+#: src/emu/ui/selgame.cpp:380 src/emu/ui/selsoft.cpp:281
 #, c-format
 msgid ""
 "%s\n"
 " added to favorites list."
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:380 src/emu/ui/selgame.cpp:389
-#: src/emu/ui/selsoft.cpp:287
+#: src/emu/ui/selgame.cpp:386 src/emu/ui/selgame.cpp:395
+#: src/emu/ui/selsoft.cpp:286
 #, c-format
 msgid ""
 "%s\n"
 " removed from favorites list."
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:450
+#: src/emu/ui/selgame.cpp:457
 msgid ""
 "The selected machine is missing one or more required ROM or CHD images. "
 "Please select a different machine.\n"
@@ -991,275 +1007,275 @@ msgid ""
 "Press any key to continue."
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:589 src/emu/ui/simpleselgame.cpp:265
+#: src/emu/ui/selgame.cpp:595 src/emu/ui/simpleselgame.cpp:265
 msgid "Configure Options"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:752
+#: src/emu/ui/selgame.cpp:596
+msgid "Configure Machine"
+msgstr ""
+
+#: src/emu/ui/selgame.cpp:758
 #, c-format
 msgid "%1$s %2$s ( %3$d / %4$d machines (%5$d BIOS) )"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:762
+#: src/emu/ui/selgame.cpp:768
 #, c-format
 msgid "%1$s (%2$s - %3$s) - "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:769 src/emu/ui/selgame.cpp:775
+#: src/emu/ui/selgame.cpp:775 src/emu/ui/selgame.cpp:781
 #, c-format
 msgid "%1$s (%2$s) - "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:784
+#: src/emu/ui/selgame.cpp:790
 #, c-format
 msgid "%1$s Search: %2$s_"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:838
+#: src/emu/ui/selgame.cpp:844
 #, c-format
 msgid "Romset: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:841 src/emu/ui/selgame.cpp:890
-#: src/emu/ui/selsoft.cpp:751 src/emu/ui/selsoft.cpp:801
+#: src/emu/ui/selgame.cpp:847 src/emu/ui/selgame.cpp:896
+#: src/emu/ui/selsoft.cpp:750 src/emu/ui/selsoft.cpp:800
 #: src/emu/ui/simpleselgame.cpp:328
 #, c-format
 msgid "%1$s, %2$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:847 src/emu/ui/selsoft.cpp:757
+#: src/emu/ui/selgame.cpp:853 src/emu/ui/selsoft.cpp:756
 #, c-format
 msgid "Driver is clone of: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:849 src/emu/ui/selsoft.cpp:759
+#: src/emu/ui/selgame.cpp:855 src/emu/ui/selsoft.cpp:758
 msgid "Driver is parent"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:853 src/emu/ui/selsoft.cpp:763
+#: src/emu/ui/selgame.cpp:859 src/emu/ui/selsoft.cpp:762
 #: src/emu/ui/simpleselgame.cpp:335
 msgid "Overall: NOT WORKING"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:855 src/emu/ui/selsoft.cpp:765
+#: src/emu/ui/selgame.cpp:861 src/emu/ui/selsoft.cpp:764
 #: src/emu/ui/simpleselgame.cpp:337
 msgid "Overall: Unemulated Protection"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:857 src/emu/ui/selsoft.cpp:767
+#: src/emu/ui/selgame.cpp:863 src/emu/ui/selsoft.cpp:766
 #: src/emu/ui/simpleselgame.cpp:339
 msgid "Overall: Working"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:861 src/emu/ui/selsoft.cpp:771
+#: src/emu/ui/selgame.cpp:867 src/emu/ui/selsoft.cpp:770
 msgid "Graphics: Imperfect, "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:863 src/emu/ui/selsoft.cpp:773
+#: src/emu/ui/selgame.cpp:869 src/emu/ui/selsoft.cpp:772
 msgid "Graphics: OK, "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:866 src/emu/ui/selsoft.cpp:776
+#: src/emu/ui/selgame.cpp:872 src/emu/ui/selsoft.cpp:775
 msgid "Sound: Unimplemented"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:868 src/emu/ui/selsoft.cpp:778
+#: src/emu/ui/selgame.cpp:874 src/emu/ui/selsoft.cpp:777
 msgid "Sound: Imperfect"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:870 src/emu/ui/selsoft.cpp:780
+#: src/emu/ui/selgame.cpp:876 src/emu/ui/selsoft.cpp:779
 msgid "Sound: OK"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:887
+#: src/emu/ui/selgame.cpp:893
 #, c-format
 msgid "System: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:894 src/emu/ui/selsoft.cpp:805
+#: src/emu/ui/selgame.cpp:900 src/emu/ui/selsoft.cpp:804
 #, c-format
 msgid "Software is clone of: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:896 src/emu/ui/selsoft.cpp:807
+#: src/emu/ui/selgame.cpp:902 src/emu/ui/selsoft.cpp:806
 msgid "Software is parent"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:901 src/emu/ui/selsoft.cpp:812
+#: src/emu/ui/selgame.cpp:907 src/emu/ui/selsoft.cpp:811
 msgid "Supported: No"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:906 src/emu/ui/selsoft.cpp:817
+#: src/emu/ui/selgame.cpp:912 src/emu/ui/selsoft.cpp:816
 msgid "Supported: Partial"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:911 src/emu/ui/selsoft.cpp:822
+#: src/emu/ui/selgame.cpp:917 src/emu/ui/selsoft.cpp:821
 msgid "Supported: Yes"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:916 src/emu/ui/selsoft.cpp:827
+#: src/emu/ui/selgame.cpp:922 src/emu/ui/selsoft.cpp:826
 #, c-format
 msgid "romset: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:923
+#: src/emu/ui/selgame.cpp:929
 #, c-format
 msgid "%1$s %2$s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1535
+#: src/emu/ui/selgame.cpp:1543
 #, c-format
 msgid "Romset: %1$-.100s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1536
+#: src/emu/ui/selgame.cpp:1544
 #, c-format
 msgid "Year: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1537
+#: src/emu/ui/selgame.cpp:1545
 #, c-format
 msgid "Manufacturer: %1$-.100s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1541
+#: src/emu/ui/selgame.cpp:1549
 #, c-format
 msgid "Driver is Clone of: %1$-.100s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1543
+#: src/emu/ui/selgame.cpp:1551
 msgid "Driver is Parent\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1546
+#: src/emu/ui/selgame.cpp:1554
 msgid "Overall: NOT WORKING\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1548
+#: src/emu/ui/selgame.cpp:1556
 msgid "Overall: Unemulated Protection\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1550
+#: src/emu/ui/selgame.cpp:1558
 msgid "Overall: Working\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1553
+#: src/emu/ui/selgame.cpp:1561
 msgid "Graphics: Imperfect Colors\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1557
+#: src/emu/ui/selgame.cpp:1565
 msgid "Graphics: Imperfect\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1559
+#: src/emu/ui/selgame.cpp:1567
 msgid "Graphics: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1562
+#: src/emu/ui/selgame.cpp:1570
 msgid "Sound: Unimplemented\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1564
+#: src/emu/ui/selgame.cpp:1572
 msgid "Sound: Imperfect\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1566
+#: src/emu/ui/selgame.cpp:1574
 msgid "Sound: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1568
+#: src/emu/ui/selgame.cpp:1576
 #, c-format
 msgid "Driver is Skeleton: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1569
+#: src/emu/ui/selgame.cpp:1577
 #, c-format
 msgid "Game is Mechanical: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1570
+#: src/emu/ui/selgame.cpp:1578
 #, c-format
 msgid "Requires Artwork: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1571
+#: src/emu/ui/selgame.cpp:1579
 #, c-format
 msgid "Requires Clickable Artwork: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1572
+#: src/emu/ui/selgame.cpp:1580
 #, c-format
 msgid "Support Cocktail: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1573
+#: src/emu/ui/selgame.cpp:1581
 #, c-format
 msgid "Driver is Bios: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1574
+#: src/emu/ui/selgame.cpp:1582
 #, c-format
 msgid "Support Save: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 #, c-format
 msgid "Screen Orientation: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 msgid "Vertical"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 msgid "Horizontal"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/selgame.cpp:1591
 #, c-format
 msgid "Requires CHD: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1596
+#: src/emu/ui/selgame.cpp:1604
 msgid "Roms Audit Pass: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1598
+#: src/emu/ui/selgame.cpp:1606
 msgid "Roms Audit Pass: BAD\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1601
+#: src/emu/ui/selgame.cpp:1609
 msgid "Samples Audit Pass: None Needed\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1603
+#: src/emu/ui/selgame.cpp:1611
 msgid "Samples Audit Pass: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1605
+#: src/emu/ui/selgame.cpp:1613
 msgid "Samples Audit Pass: BAD\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1608
+#: src/emu/ui/selgame.cpp:1616
 msgid ""
 "Roms Audit Pass: Disabled\n"
 "Samples Audit Pass: Disabled\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:2049 src/emu/ui/selgame.cpp:2212
-#: src/emu/ui/selsoft.cpp:1662
+#: src/emu/ui/selgame.cpp:2055 src/emu/ui/selgame.cpp:2216
+#: src/emu/ui/selsoft.cpp:1655
 msgid "No Infos Available"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:2162 src/emu/ui/selsoft.cpp:1607
+#: src/emu/ui/selgame.cpp:2168 src/emu/ui/selsoft.cpp:1602
 msgid "Usage"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:110
-msgid " (default)"
-msgstr ""
-
-#: src/emu/ui/selsoft.cpp:381
+#: src/emu/ui/selsoft.cpp:380
 msgid ""
 "The selected software is missing one or more required files. Please select a "
 "different software.\n"
@@ -1267,57 +1283,57 @@ msgid ""
 "Press any key to continue."
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:684
+#: src/emu/ui/selsoft.cpp:683
 #, c-format
-msgid "%1$s %2$s ( %3$d / %4$d softwares )"
+msgid "%1$s %2$s ( %3$d / %4$d software packages )"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:685
+#: src/emu/ui/selsoft.cpp:684
 #, c-format
 msgid "Driver: \"%1$s\" software list "
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:688
+#: src/emu/ui/selsoft.cpp:687
 #, c-format
 msgid "Region: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:690
+#: src/emu/ui/selsoft.cpp:689
 #, c-format
 msgid "Publisher: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:692
+#: src/emu/ui/selsoft.cpp:691
 #, c-format
 msgid "Year: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:694
+#: src/emu/ui/selsoft.cpp:693
 #, c-format
 msgid "Software List: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:696
+#: src/emu/ui/selsoft.cpp:695
 #, c-format
 msgid "Device type: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:698
+#: src/emu/ui/selsoft.cpp:697
 #, c-format
 msgid "%s Search: %s_"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:748 src/emu/ui/selsoft.cpp:798
+#: src/emu/ui/selsoft.cpp:747 src/emu/ui/selsoft.cpp:797
 #: src/emu/ui/simpleselgame.cpp:325
 #, c-format
 msgid "%1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:1998 src/emu/ui/selsoft.cpp:2018
+#: src/emu/ui/selsoft.cpp:1991 src/emu/ui/selsoft.cpp:2011
 msgid "Software part selection:"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:2136 src/emu/ui/selsoft.cpp:2156
+#: src/emu/ui/selsoft.cpp:2129 src/emu/ui/selsoft.cpp:2149
 msgid "Bios selection:"
 msgstr ""
 
@@ -1365,15 +1381,15 @@ msgstr ""
 msgid " [internal]"
 msgstr ""
 
-#: src/emu/ui/sndmenu.cpp:135
+#: src/emu/ui/sndmenu.cpp:133
 msgid "Sound"
 msgstr ""
 
-#: src/emu/ui/sndmenu.cpp:136
+#: src/emu/ui/sndmenu.cpp:134
 msgid "Sample Rate"
 msgstr ""
 
-#: src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/sndmenu.cpp:135
 msgid "Use External Samples"
 msgstr ""
 
@@ -1442,80 +1458,80 @@ msgstr ""
 msgid "Fast Forward"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:419
+#: src/emu/ui/ui.cpp:418
 msgid "This driver requires images to be loaded in the following device(s): "
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1074
+#: src/emu/ui/ui.cpp:1071
 msgid ""
 "One or more ROMs/CHDs for this machine are incorrect. The machine may not "
 "run correctly.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1087
+#: src/emu/ui/ui.cpp:1084
 msgid ""
 "There are known problems with this machine\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1091
+#: src/emu/ui/ui.cpp:1088
 msgid ""
 "One or more ROMs/CHDs for this machine have not been correctly dumped.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1095
+#: src/emu/ui/ui.cpp:1092
 #, c-format
 msgid "The keyboard emulation may not be 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1097
+#: src/emu/ui/ui.cpp:1094
 #, c-format
 msgid "The colors aren't 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1099
+#: src/emu/ui/ui.cpp:1096
 msgid "The colors are completely wrong.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1101
+#: src/emu/ui/ui.cpp:1098
 #, c-format
 msgid "The video emulation isn't 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1103
+#: src/emu/ui/ui.cpp:1100
 #, c-format
 msgid "The sound emulation isn't 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1105
+#: src/emu/ui/ui.cpp:1102
 msgid "The machine lacks sound.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1108
+#: src/emu/ui/ui.cpp:1105
 msgid "Screen flipping in cocktail mode is not supported.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1112
+#: src/emu/ui/ui.cpp:1109
 msgid "The machine requires external artwork files\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1117
+#: src/emu/ui/ui.cpp:1114
 msgid ""
 "This machine was never completed. It may exhibit strange behavior or missing "
 "elements that are not bugs in the emulation.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1122
+#: src/emu/ui/ui.cpp:1119
 msgid ""
 "This machine has no sound hardware, MAME will produce no sounds, this is "
 "expected behaviour.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1130
+#: src/emu/ui/ui.cpp:1127
 msgid "The machine has protection which isn't fully emulated.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1133
+#: src/emu/ui/ui.cpp:1130
 msgid ""
 "\n"
 "THIS MACHINE DOESN'T WORK. The emulation for this machine is not yet "
@@ -1523,7 +1539,7 @@ msgid ""
 "the developers to improve the emulation.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1137
+#: src/emu/ui/ui.cpp:1134
 msgid ""
 "\n"
 "Certain elements of this machine cannot be emulated as it requires actual "
@@ -1531,21 +1547,21 @@ msgid ""
 "to fully play this machine.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1156
+#: src/emu/ui/ui.cpp:1153
 msgid ""
 "\n"
 "\n"
 "There are working clones of this machine: "
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1170
+#: src/emu/ui/ui.cpp:1167
 msgid ""
 "\n"
 "\n"
 "Press any key to continue"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1185
+#: src/emu/ui/ui.cpp:1182
 #, c-format
 msgid ""
 "%1$s\n"
@@ -1555,98 +1571,98 @@ msgid ""
 "CPU:\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1221 src/emu/ui/ui.cpp:1260
+#: src/emu/ui/ui.cpp:1218 src/emu/ui/ui.cpp:1257
 msgid "MHz"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1221 src/emu/ui/ui.cpp:1260
+#: src/emu/ui/ui.cpp:1218 src/emu/ui/ui.cpp:1257
 msgid "kHz"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1235
+#: src/emu/ui/ui.cpp:1232
 msgid ""
 "\n"
 "Sound:\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1264
+#: src/emu/ui/ui.cpp:1261
 msgid ""
 "\n"
 "Video:\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1268
+#: src/emu/ui/ui.cpp:1265
 msgid "None\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1275
+#: src/emu/ui/ui.cpp:1272
 msgid "Vector"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1286
+#: src/emu/ui/ui.cpp:1283
 #, c-format
 msgid "%1$s: %2$s\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1286
+#: src/emu/ui/ui.cpp:1283
 msgid "%2$s\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1541 src/emu/ui/ui.cpp:1551
+#: src/emu/ui/ui.cpp:1538 src/emu/ui/ui.cpp:1548
 msgid "Keyboard Emulation Status"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1543
+#: src/emu/ui/ui.cpp:1540
 msgid "Mode: PARTIAL Emulation"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1544
+#: src/emu/ui/ui.cpp:1541
 msgid "UI:   Enabled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1546 src/emu/ui/ui.cpp:1556
+#: src/emu/ui/ui.cpp:1543 src/emu/ui/ui.cpp:1553
 msgid "**Use ScrLock to toggle**"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1553
+#: src/emu/ui/ui.cpp:1550
 msgid "Mode: FULL Emulation"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1554
+#: src/emu/ui/ui.cpp:1551
 msgid "UI:   Disabled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1692
+#: src/emu/ui/ui.cpp:1689
 msgid "Autofire can't be enabled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1731
+#: src/emu/ui/ui.cpp:1728
 msgid "Select position to save to"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1733
+#: src/emu/ui/ui.cpp:1730
 msgid "Select position to load from"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1757
+#: src/emu/ui/ui.cpp:1754
 msgid "Save cancelled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1759
+#: src/emu/ui/ui.cpp:1756
 msgid "Load cancelled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1802
+#: src/emu/ui/ui.cpp:1799
 #, c-format
 msgid "Save to position %s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1807
+#: src/emu/ui/ui.cpp:1804
 #, c-format
 msgid "Load from position %s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1847
+#: src/emu/ui/ui.cpp:1844
 #, c-format
 msgid ""
 "Are you sure you want to quit?\n"
@@ -1655,173 +1671,173 @@ msgid ""
 "Press ''%2$s'' to return to emulation."
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1917
+#: src/emu/ui/ui.cpp:1914
 msgid "Master Volume"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1926
+#: src/emu/ui/ui.cpp:1923
 #, c-format
 msgid "%1$s Volume"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1949
+#: src/emu/ui/ui.cpp:1946
 #, c-format
 msgid "Overclock CPU %1$s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1968
+#: src/emu/ui/ui.cpp:1965
 #, c-format
 msgid "%1$s Refresh Rate"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1973
+#: src/emu/ui/ui.cpp:1970
 #, c-format
 msgid "%1$s Brightness"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1975
+#: src/emu/ui/ui.cpp:1972
 #, c-format
 msgid "%1$s Contrast"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1977
+#: src/emu/ui/ui.cpp:1974
 #, c-format
 msgid "%1$s Gamma"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1981
+#: src/emu/ui/ui.cpp:1978
 #, c-format
 msgid "%1$s Horiz Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1983
+#: src/emu/ui/ui.cpp:1980
 #, c-format
 msgid "%1$s Horiz Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1985
+#: src/emu/ui/ui.cpp:1982
 #, c-format
 msgid "%1$s Vert Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1987
+#: src/emu/ui/ui.cpp:1984
 #, c-format
 msgid "%1$s Vert Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2005
+#: src/emu/ui/ui.cpp:2002
 #, c-format
 msgid "Laserdisc '%1$s' Horiz Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2007
+#: src/emu/ui/ui.cpp:2004
 #, c-format
 msgid "Laserdisc '%1$s' Horiz Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2009
+#: src/emu/ui/ui.cpp:2006
 #, c-format
 msgid "Laserdisc '%1$s' Vert Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2011
+#: src/emu/ui/ui.cpp:2008
 #, c-format
 msgid "Laserdisc '%1$s' Vert Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2021
+#: src/emu/ui/ui.cpp:2018
 msgid "Vector Flicker"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2022
+#: src/emu/ui/ui.cpp:2019
 msgid "Beam Width Minimum"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2023
+#: src/emu/ui/ui.cpp:2020
 msgid "Beam Width Maximum"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2024
+#: src/emu/ui/ui.cpp:2021
 msgid "Beam Intensity Weight"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2037
+#: src/emu/ui/ui.cpp:2034
 #, c-format
 msgid "Crosshair Scale %1$s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2037 src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2034 src/emu/ui/ui.cpp:2036
 msgid "X"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2037 src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2034 src/emu/ui/ui.cpp:2036
 msgid "Y"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2036
 #, c-format
 msgid "Crosshair Offset %1$s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2071
+#: src/emu/ui/ui.cpp:2068
 #, c-format
 msgid "%1$3ddB"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2115
+#: src/emu/ui/ui.cpp:2112
 #, c-format
 msgid "%1$d%%"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2131
+#: src/emu/ui/ui.cpp:2128
 #, c-format
 msgid "%1$3.0f%%"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2154
+#: src/emu/ui/ui.cpp:2151
 #, c-format
 msgid "%1$.3ffps"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2177 src/emu/ui/ui.cpp:2199 src/emu/ui/ui.cpp:2220
-#: src/emu/ui/ui.cpp:2242 src/emu/ui/ui.cpp:2264 src/emu/ui/ui.cpp:2286
-#: src/emu/ui/ui.cpp:2308 src/emu/ui/ui.cpp:2330 src/emu/ui/ui.cpp:2352
-#: src/emu/ui/ui.cpp:2374 src/emu/ui/ui.cpp:2396
+#: src/emu/ui/ui.cpp:2174 src/emu/ui/ui.cpp:2196 src/emu/ui/ui.cpp:2217
+#: src/emu/ui/ui.cpp:2239 src/emu/ui/ui.cpp:2261 src/emu/ui/ui.cpp:2283
+#: src/emu/ui/ui.cpp:2305 src/emu/ui/ui.cpp:2327 src/emu/ui/ui.cpp:2349
+#: src/emu/ui/ui.cpp:2371 src/emu/ui/ui.cpp:2393
 #, c-format
 msgid "%1$.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2412 src/emu/ui/ui.cpp:2428 src/emu/ui/ui.cpp:2444
-#: src/emu/ui/ui.cpp:2460
+#: src/emu/ui/ui.cpp:2408 src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2438
+#: src/emu/ui/ui.cpp:2453
 #, c-format
 msgid "%1$1.2f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2476
+#: src/emu/ui/ui.cpp:2469
 #, c-format
 msgid "Screen '%1$s'"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2478
+#: src/emu/ui/ui.cpp:2471
 msgid "Screen"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2494
+#: src/emu/ui/ui.cpp:2487
 #, c-format
 msgid "Crosshair Scale X %1$1.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2494
+#: src/emu/ui/ui.cpp:2487
 #, c-format
 msgid "Crosshair Scale Y %1$1.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2513
+#: src/emu/ui/ui.cpp:2506
 #, c-format
 msgid "Crosshair Offset X %1$1.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2513
+#: src/emu/ui/ui.cpp:2506
 #, c-format
 msgid "Crosshair Offset Y %1$1.3f"
 msgstr ""
@@ -1863,10 +1879,10 @@ msgstr ""
 msgid "Full"
 msgstr ""
 
-#: src/emu/ui/viewgfx.cpp:392
+#: src/emu/ui/viewgfx.cpp:391
 msgid " COLORS"
 msgstr ""
 
-#: src/emu/ui/viewgfx.cpp:392
+#: src/emu/ui/viewgfx.cpp:391
 msgid " PENS"
 msgstr ""
diff --git a/language/Arabic/strings.po b/language/Arabic/strings.po
index a0e0e043426..8f350771d9e 100644
--- a/language/Arabic/strings.po
+++ b/language/Arabic/strings.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MAME\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-11 03:33+0200\n"
+"POT-Creation-Date: 2016-04-15 17:42+0200\n"
 "PO-Revision-Date: 2016-02-20 18:03+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: MAME Language Team\n"
@@ -59,14 +59,14 @@ msgstr ""
 msgid "Autofire Status"
 msgstr ""
 
-#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1698
+#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1695
 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211
 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219
 #: src/emu/ui/videoopt.cpp:223
 msgid "Disabled"
 msgstr ""
 
-#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1698
+#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1695
 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211
 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219
 #: src/emu/ui/videoopt.cpp:223
@@ -74,14 +74,14 @@ msgid "Enabled"
 msgstr ""
 
 #: src/emu/ui/cheatopt.cpp:282 src/emu/ui/cheatopt.cpp:288
-#: src/emu/ui/menu.cpp:710 src/emu/ui/miscmenu.cpp:831
-#: src/emu/ui/sndmenu.cpp:135 src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/menu.cpp:755 src/emu/ui/miscmenu.cpp:936
+#: src/emu/ui/sndmenu.cpp:133 src/emu/ui/sndmenu.cpp:135
 msgid "On"
 msgstr ""
 
 #: src/emu/ui/cheatopt.cpp:282 src/emu/ui/cheatopt.cpp:288
-#: src/emu/ui/menu.cpp:713 src/emu/ui/miscmenu.cpp:831
-#: src/emu/ui/sndmenu.cpp:135 src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/menu.cpp:758 src/emu/ui/miscmenu.cpp:936
+#: src/emu/ui/sndmenu.cpp:133 src/emu/ui/sndmenu.cpp:135
 msgid "Off"
 msgstr ""
 
@@ -93,316 +93,316 @@ msgstr ""
 msgid "Autofire Delay"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:158 src/emu/ui/custmenu.cpp:447
+#: src/emu/ui/custmenu.cpp:157 src/emu/ui/custmenu.cpp:445
 msgid "Main filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:167 src/emu/ui/custmenu.cpp:456
+#: src/emu/ui/custmenu.cpp:166 src/emu/ui/custmenu.cpp:454
 msgid "Other filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:176 src/emu/ui/optsmenu.cpp:239
+#: src/emu/ui/custmenu.cpp:175 src/emu/ui/optsmenu.cpp:238
 msgid "^!Manufacturer"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:185 src/emu/ui/custmenu.cpp:474
-#: src/emu/ui/optsmenu.cpp:247
+#: src/emu/ui/custmenu.cpp:184 src/emu/ui/custmenu.cpp:472
+#: src/emu/ui/optsmenu.cpp:246
 msgid "^!Year"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:194 src/emu/ui/custmenu.cpp:510
+#: src/emu/ui/custmenu.cpp:193 src/emu/ui/custmenu.cpp:508
 msgid "Remove last filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:197 src/emu/ui/custmenu.cpp:513
+#: src/emu/ui/custmenu.cpp:196 src/emu/ui/custmenu.cpp:511
 msgid "Add filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:212 src/emu/ui/custmenu.cpp:233
-#: src/emu/ui/custmenu.cpp:529 src/emu/ui/custmenu.cpp:550
+#: src/emu/ui/custmenu.cpp:211 src/emu/ui/custmenu.cpp:231
+#: src/emu/ui/custmenu.cpp:527 src/emu/ui/custmenu.cpp:547
 msgid "Select custom filters:"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:465
+#: src/emu/ui/custmenu.cpp:463
 msgid "^!Publisher"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:483
+#: src/emu/ui/custmenu.cpp:481
 msgid "^!Software List"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:492
+#: src/emu/ui/custmenu.cpp:490
 msgid "^!Device type"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:501
+#: src/emu/ui/custmenu.cpp:499
 msgid "^!Region"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:23
+#: src/emu/ui/custui.cpp:22
 msgid "Show All"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:24
+#: src/emu/ui/custui.cpp:23
 msgid "Hide Filters"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:25
+#: src/emu/ui/custui.cpp:24
 msgid "Hide Info/Image"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:26
+#: src/emu/ui/custui.cpp:25
 msgid "Hide Both"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:142
+#: src/emu/ui/custui.cpp:141
 msgid "Fonts"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:143
+#: src/emu/ui/custui.cpp:142
 msgid "Colors"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:148 src/emu/ui/dirmenu.cpp:33
+#: src/emu/ui/custui.cpp:147 src/emu/ui/dirmenu.cpp:33
 msgid "Language"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:152
+#: src/emu/ui/custui.cpp:151
 msgid "Show side panels"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:167 src/emu/ui/custui.cpp:188
+#: src/emu/ui/custui.cpp:166 src/emu/ui/custui.cpp:186
 msgid "Custom UI Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:246
+#: src/emu/ui/custui.cpp:244
 msgid "default"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:349
+#: src/emu/ui/custui.cpp:347
 msgid "UI Font"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:354
+#: src/emu/ui/custui.cpp:352
 msgid "Bold"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:355
+#: src/emu/ui/custui.cpp:353
 msgid "Italic"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:360
+#: src/emu/ui/custui.cpp:358
 msgid "Lines"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:366
+#: src/emu/ui/custui.cpp:364
 msgid "Infos text size"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:383
+#: src/emu/ui/custui.cpp:381
 msgid "UI Fonts Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:411
+#: src/emu/ui/custui.cpp:408
 msgid "Sample text - Lorem ipsum dolor sit amet, consectetur adipiscing elit."
 msgstr ""
 
-#: src/emu/ui/custui.cpp:509
+#: src/emu/ui/custui.cpp:506
 msgid "Normal text"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:510
+#: src/emu/ui/custui.cpp:507
 msgid "Selected color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:511
+#: src/emu/ui/custui.cpp:508
 msgid "Normal text background"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:512
+#: src/emu/ui/custui.cpp:509
 msgid "Selected background color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:513
+#: src/emu/ui/custui.cpp:510
 msgid "Subitem color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:514 src/emu/ui/custui.cpp:610
+#: src/emu/ui/custui.cpp:511 src/emu/ui/custui.cpp:606
 msgid "Clone"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:515
+#: src/emu/ui/custui.cpp:512
 msgid "Border"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:516
+#: src/emu/ui/custui.cpp:513
 msgid "Background"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:517
+#: src/emu/ui/custui.cpp:514
 msgid "Dipswitch"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:518
+#: src/emu/ui/custui.cpp:515
 msgid "Unavailable color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:519
+#: src/emu/ui/custui.cpp:516
 msgid "Slider color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:520
+#: src/emu/ui/custui.cpp:517
 msgid "Gfx viewer background"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:521
+#: src/emu/ui/custui.cpp:518
 msgid "Mouse over color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:522
+#: src/emu/ui/custui.cpp:519
 msgid "Mouse over background color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:523
+#: src/emu/ui/custui.cpp:520
 msgid "Mouse down color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:524
+#: src/emu/ui/custui.cpp:521
 msgid "Mouse down background color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:527
+#: src/emu/ui/custui.cpp:524
 msgid "Restore originals colors"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:543
+#: src/emu/ui/custui.cpp:540
 msgid "UI Colors Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:572
+#: src/emu/ui/custui.cpp:568
 #, c-format
 msgid "Double click or press %1$s to change the color value"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:598
+#: src/emu/ui/custui.cpp:594
 msgid "Menu Preview"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:606
+#: src/emu/ui/custui.cpp:602
 msgid "Normal"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:607
+#: src/emu/ui/custui.cpp:603
 msgid "Subitem"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:608
+#: src/emu/ui/custui.cpp:604
 msgid "Selected"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:609
+#: src/emu/ui/custui.cpp:605
 msgid "Mouse Over"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:841 src/emu/ui/custui.cpp:844
+#: src/emu/ui/custui.cpp:837 src/emu/ui/custui.cpp:840
 msgid "Alpha"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:849 src/emu/ui/custui.cpp:852
-#: src/emu/ui/custui.cpp:1013
+#: src/emu/ui/custui.cpp:845 src/emu/ui/custui.cpp:848
+#: src/emu/ui/custui.cpp:1007
 msgid "Red"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:857 src/emu/ui/custui.cpp:860
-#: src/emu/ui/custui.cpp:1016
+#: src/emu/ui/custui.cpp:853 src/emu/ui/custui.cpp:856
+#: src/emu/ui/custui.cpp:1010
 msgid "Green"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:865 src/emu/ui/custui.cpp:868
-#: src/emu/ui/custui.cpp:1017
+#: src/emu/ui/custui.cpp:861 src/emu/ui/custui.cpp:864
+#: src/emu/ui/custui.cpp:1011
 msgid "Blue"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:871
+#: src/emu/ui/custui.cpp:867
 msgid "Choose from palette"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:887
+#: src/emu/ui/custui.cpp:883
 msgid " - ARGB Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:912
+#: src/emu/ui/custui.cpp:907
 msgid "Color preview ="
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1009
+#: src/emu/ui/custui.cpp:1003
 msgid "White"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1010
+#: src/emu/ui/custui.cpp:1004
 msgid "Silver"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1011
+#: src/emu/ui/custui.cpp:1005
 msgid "Gray"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1012
+#: src/emu/ui/custui.cpp:1006
 msgid "Black"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1014
+#: src/emu/ui/custui.cpp:1008
 msgid "Orange"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1015
+#: src/emu/ui/custui.cpp:1009
 msgid "Yellow"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1018
+#: src/emu/ui/custui.cpp:1012
 msgid "Violet"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:65
+#: src/emu/ui/datmenu.cpp:64
 msgid "Software History"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:67
+#: src/emu/ui/datmenu.cpp:66
 msgid "Software Usage"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:199
+#: src/emu/ui/datmenu.cpp:196
 msgid "Revision: "
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:287 src/emu/ui/selgame.cpp:40
-#: src/emu/ui/selgame.cpp:2152 src/emu/ui/selgame.cpp:2161
-#: src/emu/ui/selsoft.cpp:1577 src/emu/ui/selsoft.cpp:1597
-#: src/emu/ui/selsoft.cpp:1606
+#: src/emu/ui/datmenu.cpp:284 src/emu/ui/selgame.cpp:39
+#: src/emu/ui/selgame.cpp:2158 src/emu/ui/selgame.cpp:2167
+#: src/emu/ui/selsoft.cpp:1574 src/emu/ui/selsoft.cpp:1592
+#: src/emu/ui/selsoft.cpp:1601
 msgid "History"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:289 src/emu/ui/selgame.cpp:41
+#: src/emu/ui/datmenu.cpp:286 src/emu/ui/selgame.cpp:40
 msgid "Mameinfo"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:291 src/emu/ui/selgame.cpp:43
+#: src/emu/ui/datmenu.cpp:288 src/emu/ui/selgame.cpp:42
 msgid "Messinfo"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:293 src/emu/ui/selgame.cpp:42
+#: src/emu/ui/datmenu.cpp:290 src/emu/ui/selgame.cpp:41
 msgid "Sysinfo"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:295 src/emu/ui/selgame.cpp:46
+#: src/emu/ui/datmenu.cpp:292 src/emu/ui/selgame.cpp:45
 msgid "Mamescore"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:297 src/emu/ui/selgame.cpp:45
+#: src/emu/ui/datmenu.cpp:294 src/emu/ui/selgame.cpp:44
 msgid "Gameinit"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:299 src/emu/ui/selgame.cpp:44
+#: src/emu/ui/datmenu.cpp:296 src/emu/ui/selgame.cpp:43
 msgid "Command"
 msgstr ""
 
@@ -554,75 +554,75 @@ msgstr ""
 msgid "Remove %1$s Folder"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:158
+#: src/emu/ui/filesel.cpp:161
 msgid "File Already Exists - Override?"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:160 src/emu/ui/selgame.cpp:1568
-#: src/emu/ui/selgame.cpp:1569 src/emu/ui/selgame.cpp:1570
-#: src/emu/ui/selgame.cpp:1571 src/emu/ui/selgame.cpp:1572
-#: src/emu/ui/selgame.cpp:1573 src/emu/ui/selgame.cpp:1574
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/filesel.cpp:163 src/emu/ui/selgame.cpp:1576
+#: src/emu/ui/selgame.cpp:1577 src/emu/ui/selgame.cpp:1578
+#: src/emu/ui/selgame.cpp:1579 src/emu/ui/selgame.cpp:1580
+#: src/emu/ui/selgame.cpp:1581 src/emu/ui/selgame.cpp:1582
+#: src/emu/ui/selgame.cpp:1591
 msgid "No"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:161 src/emu/ui/selgame.cpp:1568
-#: src/emu/ui/selgame.cpp:1569 src/emu/ui/selgame.cpp:1570
-#: src/emu/ui/selgame.cpp:1571 src/emu/ui/selgame.cpp:1572
-#: src/emu/ui/selgame.cpp:1573 src/emu/ui/selgame.cpp:1574
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/filesel.cpp:164 src/emu/ui/selgame.cpp:1576
+#: src/emu/ui/selgame.cpp:1577 src/emu/ui/selgame.cpp:1578
+#: src/emu/ui/selgame.cpp:1579 src/emu/ui/selgame.cpp:1580
+#: src/emu/ui/selgame.cpp:1581 src/emu/ui/selgame.cpp:1582
+#: src/emu/ui/selgame.cpp:1591
 msgid "Yes"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:272
+#: src/emu/ui/filesel.cpp:275
 msgid "New Image Name:"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:278
+#: src/emu/ui/filesel.cpp:281
 msgid "Image Format:"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:284
+#: src/emu/ui/filesel.cpp:287
 msgid "Create"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:315
+#: src/emu/ui/filesel.cpp:318
 msgid "Please enter a file extension too"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:503 src/emu/ui/swlist.cpp:65
+#: src/emu/ui/filesel.cpp:506 src/emu/ui/swlist.cpp:65
 msgid "[empty slot]"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:507
+#: src/emu/ui/filesel.cpp:510
 msgid "[create]"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:511 src/emu/ui/swlist.cpp:76
+#: src/emu/ui/filesel.cpp:514 src/emu/ui/swlist.cpp:76
 msgid "[software list]"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:803
+#: src/emu/ui/filesel.cpp:806
 msgid "Select image format"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:863
+#: src/emu/ui/filesel.cpp:866
 msgid "Select access mode"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:864
+#: src/emu/ui/filesel.cpp:867
 msgid "Read-only"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:866
+#: src/emu/ui/filesel.cpp:869
 msgid "Read-write"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:867
+#: src/emu/ui/filesel.cpp:870
 msgid "Read this image, write to another image"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:868
+#: src/emu/ui/filesel.cpp:871
 msgid "Read this image, write to diff"
 msgstr ""
 
@@ -648,7 +648,7 @@ msgstr ""
 msgid "[empty]"
 msgstr ""
 
-#: src/emu/ui/info_pty.cpp:26 src/emu/ui/mainmenu.cpp:91
+#: src/emu/ui/info_pty.cpp:26 src/emu/ui/mainmenu.cpp:96
 msgid "Pseudo terminals"
 msgstr ""
 
@@ -664,7 +664,7 @@ msgstr ""
 msgid "Other Controls"
 msgstr ""
 
-#: src/emu/ui/inputmap.cpp:622 src/emu/ui/miscmenu.cpp:91
+#: src/emu/ui/inputmap.cpp:622 src/emu/ui/miscmenu.cpp:92
 #: src/emu/ui/slotopt.cpp:172
 msgid "Reset"
 msgstr ""
@@ -697,27 +697,27 @@ msgstr ""
 msgid "Machine Information"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:78
+#: src/emu/ui/mainmenu.cpp:80
 msgid "Image Information"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:81
+#: src/emu/ui/mainmenu.cpp:83
 msgid "File Manager"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:86
+#: src/emu/ui/mainmenu.cpp:92
 msgid "Tape Control"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:94
+#: src/emu/ui/mainmenu.cpp:99
 msgid "Bios Selection"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:100
+#: src/emu/ui/mainmenu.cpp:104
 msgid "Slot Devices"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:107
+#: src/emu/ui/mainmenu.cpp:109
 msgid "Barcode Reader"
 msgstr ""
 
@@ -725,43 +725,43 @@ msgstr ""
 msgid "Network Devices"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:119
+#: src/emu/ui/mainmenu.cpp:118
 msgid "Keyboard Mode"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:122
+#: src/emu/ui/mainmenu.cpp:121
 msgid "Slider Controls"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:125
+#: src/emu/ui/mainmenu.cpp:124
 msgid "Video Options"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:129
+#: src/emu/ui/mainmenu.cpp:128
 msgid "Crosshair Options"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:133
+#: src/emu/ui/mainmenu.cpp:132
 msgid "Cheat"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:136
+#: src/emu/ui/mainmenu.cpp:135
 msgid "Plugin Options"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:140
+#: src/emu/ui/mainmenu.cpp:139
 msgid "External DAT View"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:146
+#: src/emu/ui/mainmenu.cpp:145 src/emu/ui/miscmenu.cpp:785
 msgid "Add To Favorites"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:148
+#: src/emu/ui/mainmenu.cpp:147 src/emu/ui/miscmenu.cpp:787
 msgid "Remove From Favorites"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:155
+#: src/emu/ui/mainmenu.cpp:154
 msgid "Select New Machine"
 msgstr ""
 
@@ -801,189 +801,205 @@ msgstr ""
 msgid "Return to Previous Menu"
 msgstr ""
 
-#: src/emu/ui/menu.cpp:716
+#: src/emu/ui/menu.cpp:761
 msgid "Auto"
 msgstr ""
 
-#: src/emu/ui/menu.cpp:2133
+#: src/emu/ui/menu.cpp:2195
 msgid "Images"
 msgstr ""
 
-#: src/emu/ui/menu.cpp:2134
+#: src/emu/ui/menu.cpp:2196
 msgid "Infos"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Keyboard Mode:"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Natural"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Emulated"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:240
+#: src/emu/ui/miscmenu.cpp:241
 #, c-format
 msgid ""
 "Uptime: %1$d:%2$02d:%3$02d\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:242
+#: src/emu/ui/miscmenu.cpp:243
 #, c-format
 msgid ""
 "Uptime: %1$d:%2$02d\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:246
+#: src/emu/ui/miscmenu.cpp:247
 #, c-format
 msgid ""
 "Tickets dispensed: %1$d\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:257
+#: src/emu/ui/miscmenu.cpp:258
 msgid "Coin %1$c: NA%3$s\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:257
+#: src/emu/ui/miscmenu.cpp:258
 #, c-format
 msgid "Coin %1$c: %2$d%3$s\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:260
+#: src/emu/ui/miscmenu.cpp:261
 msgid " (locked)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:519
+#: src/emu/ui/miscmenu.cpp:520
 msgid "Visible Delay"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:617
+#: src/emu/ui/miscmenu.cpp:619
 #, c-format
 msgid "%s.xml saved under ui folder."
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:645
+#: src/emu/ui/miscmenu.cpp:647
 msgid "Name:             Description:\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:657
+#: src/emu/ui/miscmenu.cpp:659
 #, c-format
 msgid "%s.txt saved under ui folder."
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:675
-msgid "Export XML format (like -listxml)"
+#: src/emu/ui/miscmenu.cpp:677
+msgid "Export list in XML format (like -listxml)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:676
-msgid "Export TXT format (like -listfull)"
+#: src/emu/ui/miscmenu.cpp:678
+msgid "Export list in XML format (like -listxml, but exclude devices)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:734
-msgid "Dummy"
+#: src/emu/ui/miscmenu.cpp:679
+msgid "Export list in TXT format (like -listfull)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:736
-msgid "Save machine configuration"
-msgstr ""
-
-#: src/emu/ui/miscmenu.cpp:848 src/emu/ui/miscmenu.cpp:869
-#: src/emu/ui/selgame.cpp:594
-msgid "Plugins"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:218
-msgid "Filter"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:226
-msgid " ^!File"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:231
-msgid " ^!Category"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:254
-msgid "^!Setup custom filter"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:262
-msgid "Customize UI"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:263
-msgid "Configure Directories"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:266 src/emu/ui/sndmenu.cpp:151
-#: src/emu/ui/sndmenu.cpp:172
-msgid "Sound Options"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:269
-msgid "General Inputs"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:272
-msgid "Save Configuration"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:286 src/emu/ui/optsmenu.cpp:307
-msgid "Settings"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:327
-msgid "**Error saving ui.ini**"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:374
-#, c-format
-msgid "**Error saving %s.ini**"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:378
+#: src/emu/ui/miscmenu.cpp:729 src/emu/ui/optsmenu.cpp:376
 msgid ""
 "\n"
 "    Configuration saved    \n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/selector.cpp:166
+#: src/emu/ui/miscmenu.cpp:774
+msgid "Bios"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:776
+msgid "Driver"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:790
+msgid "Save machine configuration"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:806
+msgid "Configure machine:"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:868 src/emu/ui/selsoft.cpp:109
+msgid " (default)"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:953 src/emu/ui/miscmenu.cpp:973
+#: src/emu/ui/selgame.cpp:600
+msgid "Plugins"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:217
+msgid "Filter"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:225
+msgid " ^!File"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:230
+msgid " ^!Category"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:253
+msgid "^!Setup custom filter"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:261
+msgid "Customize UI"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:262
+msgid "Configure Directories"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:265 src/emu/ui/sndmenu.cpp:149
+#: src/emu/ui/sndmenu.cpp:169
+msgid "Sound Options"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:268
+msgid "General Inputs"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:271
+msgid "Save Configuration"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:285 src/emu/ui/optsmenu.cpp:305
+msgid "Settings"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:325
+msgid "**Error saving ui.ini**"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:372
+#, c-format
+msgid "**Error saving %s.ini**"
+msgstr ""
+
+#: src/emu/ui/selector.cpp:165
 msgid "Selection List - Search: "
 msgstr ""
 
-#: src/emu/ui/selector.cpp:196
+#: src/emu/ui/selector.cpp:194
 #, c-format
 msgid "Double click or press %1$s to select"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:39
+#: src/emu/ui/selgame.cpp:38
 msgid "General Info"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:374 src/emu/ui/selsoft.cpp:282
+#: src/emu/ui/selgame.cpp:380 src/emu/ui/selsoft.cpp:281
 #, c-format
 msgid ""
 "%s\n"
 " added to favorites list."
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:380 src/emu/ui/selgame.cpp:389
-#: src/emu/ui/selsoft.cpp:287
+#: src/emu/ui/selgame.cpp:386 src/emu/ui/selgame.cpp:395
+#: src/emu/ui/selsoft.cpp:286
 #, c-format
 msgid ""
 "%s\n"
 " removed from favorites list."
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:450
+#: src/emu/ui/selgame.cpp:457
 msgid ""
 "The selected machine is missing one or more required ROM or CHD images. "
 "Please select a different machine.\n"
@@ -991,275 +1007,275 @@ msgid ""
 "Press any key to continue."
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:589 src/emu/ui/simpleselgame.cpp:265
+#: src/emu/ui/selgame.cpp:595 src/emu/ui/simpleselgame.cpp:265
 msgid "Configure Options"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:752
+#: src/emu/ui/selgame.cpp:596
+msgid "Configure Machine"
+msgstr ""
+
+#: src/emu/ui/selgame.cpp:758
 #, c-format
 msgid "%1$s %2$s ( %3$d / %4$d machines (%5$d BIOS) )"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:762
+#: src/emu/ui/selgame.cpp:768
 #, c-format
 msgid "%1$s (%2$s - %3$s) - "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:769 src/emu/ui/selgame.cpp:775
+#: src/emu/ui/selgame.cpp:775 src/emu/ui/selgame.cpp:781
 #, c-format
 msgid "%1$s (%2$s) - "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:784
+#: src/emu/ui/selgame.cpp:790
 #, c-format
 msgid "%1$s Search: %2$s_"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:838
+#: src/emu/ui/selgame.cpp:844
 #, c-format
 msgid "Romset: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:841 src/emu/ui/selgame.cpp:890
-#: src/emu/ui/selsoft.cpp:751 src/emu/ui/selsoft.cpp:801
+#: src/emu/ui/selgame.cpp:847 src/emu/ui/selgame.cpp:896
+#: src/emu/ui/selsoft.cpp:750 src/emu/ui/selsoft.cpp:800
 #: src/emu/ui/simpleselgame.cpp:328
 #, c-format
 msgid "%1$s, %2$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:847 src/emu/ui/selsoft.cpp:757
+#: src/emu/ui/selgame.cpp:853 src/emu/ui/selsoft.cpp:756
 #, c-format
 msgid "Driver is clone of: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:849 src/emu/ui/selsoft.cpp:759
+#: src/emu/ui/selgame.cpp:855 src/emu/ui/selsoft.cpp:758
 msgid "Driver is parent"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:853 src/emu/ui/selsoft.cpp:763
+#: src/emu/ui/selgame.cpp:859 src/emu/ui/selsoft.cpp:762
 #: src/emu/ui/simpleselgame.cpp:335
 msgid "Overall: NOT WORKING"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:855 src/emu/ui/selsoft.cpp:765
+#: src/emu/ui/selgame.cpp:861 src/emu/ui/selsoft.cpp:764
 #: src/emu/ui/simpleselgame.cpp:337
 msgid "Overall: Unemulated Protection"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:857 src/emu/ui/selsoft.cpp:767
+#: src/emu/ui/selgame.cpp:863 src/emu/ui/selsoft.cpp:766
 #: src/emu/ui/simpleselgame.cpp:339
 msgid "Overall: Working"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:861 src/emu/ui/selsoft.cpp:771
+#: src/emu/ui/selgame.cpp:867 src/emu/ui/selsoft.cpp:770
 msgid "Graphics: Imperfect, "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:863 src/emu/ui/selsoft.cpp:773
+#: src/emu/ui/selgame.cpp:869 src/emu/ui/selsoft.cpp:772
 msgid "Graphics: OK, "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:866 src/emu/ui/selsoft.cpp:776
+#: src/emu/ui/selgame.cpp:872 src/emu/ui/selsoft.cpp:775
 msgid "Sound: Unimplemented"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:868 src/emu/ui/selsoft.cpp:778
+#: src/emu/ui/selgame.cpp:874 src/emu/ui/selsoft.cpp:777
 msgid "Sound: Imperfect"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:870 src/emu/ui/selsoft.cpp:780
+#: src/emu/ui/selgame.cpp:876 src/emu/ui/selsoft.cpp:779
 msgid "Sound: OK"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:887
+#: src/emu/ui/selgame.cpp:893
 #, c-format
 msgid "System: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:894 src/emu/ui/selsoft.cpp:805
+#: src/emu/ui/selgame.cpp:900 src/emu/ui/selsoft.cpp:804
 #, c-format
 msgid "Software is clone of: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:896 src/emu/ui/selsoft.cpp:807
+#: src/emu/ui/selgame.cpp:902 src/emu/ui/selsoft.cpp:806
 msgid "Software is parent"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:901 src/emu/ui/selsoft.cpp:812
+#: src/emu/ui/selgame.cpp:907 src/emu/ui/selsoft.cpp:811
 msgid "Supported: No"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:906 src/emu/ui/selsoft.cpp:817
+#: src/emu/ui/selgame.cpp:912 src/emu/ui/selsoft.cpp:816
 msgid "Supported: Partial"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:911 src/emu/ui/selsoft.cpp:822
+#: src/emu/ui/selgame.cpp:917 src/emu/ui/selsoft.cpp:821
 msgid "Supported: Yes"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:916 src/emu/ui/selsoft.cpp:827
+#: src/emu/ui/selgame.cpp:922 src/emu/ui/selsoft.cpp:826
 #, c-format
 msgid "romset: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:923
+#: src/emu/ui/selgame.cpp:929
 #, c-format
 msgid "%1$s %2$s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1535
+#: src/emu/ui/selgame.cpp:1543
 #, c-format
 msgid "Romset: %1$-.100s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1536
+#: src/emu/ui/selgame.cpp:1544
 #, c-format
 msgid "Year: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1537
+#: src/emu/ui/selgame.cpp:1545
 #, c-format
 msgid "Manufacturer: %1$-.100s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1541
+#: src/emu/ui/selgame.cpp:1549
 #, c-format
 msgid "Driver is Clone of: %1$-.100s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1543
+#: src/emu/ui/selgame.cpp:1551
 msgid "Driver is Parent\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1546
+#: src/emu/ui/selgame.cpp:1554
 msgid "Overall: NOT WORKING\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1548
+#: src/emu/ui/selgame.cpp:1556
 msgid "Overall: Unemulated Protection\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1550
+#: src/emu/ui/selgame.cpp:1558
 msgid "Overall: Working\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1553
+#: src/emu/ui/selgame.cpp:1561
 msgid "Graphics: Imperfect Colors\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1557
+#: src/emu/ui/selgame.cpp:1565
 msgid "Graphics: Imperfect\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1559
+#: src/emu/ui/selgame.cpp:1567
 msgid "Graphics: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1562
+#: src/emu/ui/selgame.cpp:1570
 msgid "Sound: Unimplemented\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1564
+#: src/emu/ui/selgame.cpp:1572
 msgid "Sound: Imperfect\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1566
+#: src/emu/ui/selgame.cpp:1574
 msgid "Sound: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1568
+#: src/emu/ui/selgame.cpp:1576
 #, c-format
 msgid "Driver is Skeleton: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1569
+#: src/emu/ui/selgame.cpp:1577
 #, c-format
 msgid "Game is Mechanical: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1570
+#: src/emu/ui/selgame.cpp:1578
 #, c-format
 msgid "Requires Artwork: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1571
+#: src/emu/ui/selgame.cpp:1579
 #, c-format
 msgid "Requires Clickable Artwork: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1572
+#: src/emu/ui/selgame.cpp:1580
 #, c-format
 msgid "Support Cocktail: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1573
+#: src/emu/ui/selgame.cpp:1581
 #, c-format
 msgid "Driver is Bios: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1574
+#: src/emu/ui/selgame.cpp:1582
 #, c-format
 msgid "Support Save: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 #, c-format
 msgid "Screen Orientation: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 msgid "Vertical"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 msgid "Horizontal"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/selgame.cpp:1591
 #, c-format
 msgid "Requires CHD: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1596
+#: src/emu/ui/selgame.cpp:1604
 msgid "Roms Audit Pass: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1598
+#: src/emu/ui/selgame.cpp:1606
 msgid "Roms Audit Pass: BAD\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1601
+#: src/emu/ui/selgame.cpp:1609
 msgid "Samples Audit Pass: None Needed\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1603
+#: src/emu/ui/selgame.cpp:1611
 msgid "Samples Audit Pass: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1605
+#: src/emu/ui/selgame.cpp:1613
 msgid "Samples Audit Pass: BAD\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1608
+#: src/emu/ui/selgame.cpp:1616
 msgid ""
 "Roms Audit Pass: Disabled\n"
 "Samples Audit Pass: Disabled\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:2049 src/emu/ui/selgame.cpp:2212
-#: src/emu/ui/selsoft.cpp:1662
+#: src/emu/ui/selgame.cpp:2055 src/emu/ui/selgame.cpp:2216
+#: src/emu/ui/selsoft.cpp:1655
 msgid "No Infos Available"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:2162 src/emu/ui/selsoft.cpp:1607
+#: src/emu/ui/selgame.cpp:2168 src/emu/ui/selsoft.cpp:1602
 msgid "Usage"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:110
-msgid " (default)"
-msgstr ""
-
-#: src/emu/ui/selsoft.cpp:381
+#: src/emu/ui/selsoft.cpp:380
 msgid ""
 "The selected software is missing one or more required files. Please select a "
 "different software.\n"
@@ -1267,57 +1283,57 @@ msgid ""
 "Press any key to continue."
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:684
+#: src/emu/ui/selsoft.cpp:683
 #, c-format
-msgid "%1$s %2$s ( %3$d / %4$d softwares )"
+msgid "%1$s %2$s ( %3$d / %4$d software packages )"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:685
+#: src/emu/ui/selsoft.cpp:684
 #, c-format
 msgid "Driver: \"%1$s\" software list "
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:688
+#: src/emu/ui/selsoft.cpp:687
 #, c-format
 msgid "Region: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:690
+#: src/emu/ui/selsoft.cpp:689
 #, c-format
 msgid "Publisher: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:692
+#: src/emu/ui/selsoft.cpp:691
 #, c-format
 msgid "Year: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:694
+#: src/emu/ui/selsoft.cpp:693
 #, c-format
 msgid "Software List: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:696
+#: src/emu/ui/selsoft.cpp:695
 #, c-format
 msgid "Device type: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:698
+#: src/emu/ui/selsoft.cpp:697
 #, c-format
 msgid "%s Search: %s_"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:748 src/emu/ui/selsoft.cpp:798
+#: src/emu/ui/selsoft.cpp:747 src/emu/ui/selsoft.cpp:797
 #: src/emu/ui/simpleselgame.cpp:325
 #, c-format
 msgid "%1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:1998 src/emu/ui/selsoft.cpp:2018
+#: src/emu/ui/selsoft.cpp:1991 src/emu/ui/selsoft.cpp:2011
 msgid "Software part selection:"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:2136 src/emu/ui/selsoft.cpp:2156
+#: src/emu/ui/selsoft.cpp:2129 src/emu/ui/selsoft.cpp:2149
 msgid "Bios selection:"
 msgstr ""
 
@@ -1365,15 +1381,15 @@ msgstr ""
 msgid " [internal]"
 msgstr ""
 
-#: src/emu/ui/sndmenu.cpp:135
+#: src/emu/ui/sndmenu.cpp:133
 msgid "Sound"
 msgstr ""
 
-#: src/emu/ui/sndmenu.cpp:136
+#: src/emu/ui/sndmenu.cpp:134
 msgid "Sample Rate"
 msgstr ""
 
-#: src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/sndmenu.cpp:135
 msgid "Use External Samples"
 msgstr ""
 
@@ -1442,80 +1458,80 @@ msgstr ""
 msgid "Fast Forward"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:419
+#: src/emu/ui/ui.cpp:418
 msgid "This driver requires images to be loaded in the following device(s): "
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1074
+#: src/emu/ui/ui.cpp:1071
 msgid ""
 "One or more ROMs/CHDs for this machine are incorrect. The machine may not "
 "run correctly.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1087
+#: src/emu/ui/ui.cpp:1084
 msgid ""
 "There are known problems with this machine\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1091
+#: src/emu/ui/ui.cpp:1088
 msgid ""
 "One or more ROMs/CHDs for this machine have not been correctly dumped.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1095
+#: src/emu/ui/ui.cpp:1092
 #, c-format
 msgid "The keyboard emulation may not be 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1097
+#: src/emu/ui/ui.cpp:1094
 #, c-format
 msgid "The colors aren't 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1099
+#: src/emu/ui/ui.cpp:1096
 msgid "The colors are completely wrong.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1101
+#: src/emu/ui/ui.cpp:1098
 #, c-format
 msgid "The video emulation isn't 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1103
+#: src/emu/ui/ui.cpp:1100
 #, c-format
 msgid "The sound emulation isn't 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1105
+#: src/emu/ui/ui.cpp:1102
 msgid "The machine lacks sound.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1108
+#: src/emu/ui/ui.cpp:1105
 msgid "Screen flipping in cocktail mode is not supported.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1112
+#: src/emu/ui/ui.cpp:1109
 msgid "The machine requires external artwork files\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1117
+#: src/emu/ui/ui.cpp:1114
 msgid ""
 "This machine was never completed. It may exhibit strange behavior or missing "
 "elements that are not bugs in the emulation.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1122
+#: src/emu/ui/ui.cpp:1119
 msgid ""
 "This machine has no sound hardware, MAME will produce no sounds, this is "
 "expected behaviour.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1130
+#: src/emu/ui/ui.cpp:1127
 msgid "The machine has protection which isn't fully emulated.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1133
+#: src/emu/ui/ui.cpp:1130
 msgid ""
 "\n"
 "THIS MACHINE DOESN'T WORK. The emulation for this machine is not yet "
@@ -1523,7 +1539,7 @@ msgid ""
 "the developers to improve the emulation.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1137
+#: src/emu/ui/ui.cpp:1134
 msgid ""
 "\n"
 "Certain elements of this machine cannot be emulated as it requires actual "
@@ -1531,21 +1547,21 @@ msgid ""
 "to fully play this machine.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1156
+#: src/emu/ui/ui.cpp:1153
 msgid ""
 "\n"
 "\n"
 "There are working clones of this machine: "
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1170
+#: src/emu/ui/ui.cpp:1167
 msgid ""
 "\n"
 "\n"
 "Press any key to continue"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1185
+#: src/emu/ui/ui.cpp:1182
 #, c-format
 msgid ""
 "%1$s\n"
@@ -1555,98 +1571,98 @@ msgid ""
 "CPU:\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1221 src/emu/ui/ui.cpp:1260
+#: src/emu/ui/ui.cpp:1218 src/emu/ui/ui.cpp:1257
 msgid "MHz"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1221 src/emu/ui/ui.cpp:1260
+#: src/emu/ui/ui.cpp:1218 src/emu/ui/ui.cpp:1257
 msgid "kHz"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1235
+#: src/emu/ui/ui.cpp:1232
 msgid ""
 "\n"
 "Sound:\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1264
+#: src/emu/ui/ui.cpp:1261
 msgid ""
 "\n"
 "Video:\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1268
+#: src/emu/ui/ui.cpp:1265
 msgid "None\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1275
+#: src/emu/ui/ui.cpp:1272
 msgid "Vector"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1286
+#: src/emu/ui/ui.cpp:1283
 #, c-format
 msgid "%1$s: %2$s\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1286
+#: src/emu/ui/ui.cpp:1283
 msgid "%2$s\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1541 src/emu/ui/ui.cpp:1551
+#: src/emu/ui/ui.cpp:1538 src/emu/ui/ui.cpp:1548
 msgid "Keyboard Emulation Status"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1543
+#: src/emu/ui/ui.cpp:1540
 msgid "Mode: PARTIAL Emulation"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1544
+#: src/emu/ui/ui.cpp:1541
 msgid "UI:   Enabled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1546 src/emu/ui/ui.cpp:1556
+#: src/emu/ui/ui.cpp:1543 src/emu/ui/ui.cpp:1553
 msgid "**Use ScrLock to toggle**"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1553
+#: src/emu/ui/ui.cpp:1550
 msgid "Mode: FULL Emulation"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1554
+#: src/emu/ui/ui.cpp:1551
 msgid "UI:   Disabled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1692
+#: src/emu/ui/ui.cpp:1689
 msgid "Autofire can't be enabled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1731
+#: src/emu/ui/ui.cpp:1728
 msgid "Select position to save to"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1733
+#: src/emu/ui/ui.cpp:1730
 msgid "Select position to load from"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1757
+#: src/emu/ui/ui.cpp:1754
 msgid "Save cancelled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1759
+#: src/emu/ui/ui.cpp:1756
 msgid "Load cancelled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1802
+#: src/emu/ui/ui.cpp:1799
 #, c-format
 msgid "Save to position %s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1807
+#: src/emu/ui/ui.cpp:1804
 #, c-format
 msgid "Load from position %s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1847
+#: src/emu/ui/ui.cpp:1844
 #, c-format
 msgid ""
 "Are you sure you want to quit?\n"
@@ -1655,173 +1671,173 @@ msgid ""
 "Press ''%2$s'' to return to emulation."
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1917
+#: src/emu/ui/ui.cpp:1914
 msgid "Master Volume"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1926
+#: src/emu/ui/ui.cpp:1923
 #, c-format
 msgid "%1$s Volume"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1949
+#: src/emu/ui/ui.cpp:1946
 #, c-format
 msgid "Overclock CPU %1$s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1968
+#: src/emu/ui/ui.cpp:1965
 #, c-format
 msgid "%1$s Refresh Rate"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1973
+#: src/emu/ui/ui.cpp:1970
 #, c-format
 msgid "%1$s Brightness"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1975
+#: src/emu/ui/ui.cpp:1972
 #, c-format
 msgid "%1$s Contrast"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1977
+#: src/emu/ui/ui.cpp:1974
 #, c-format
 msgid "%1$s Gamma"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1981
+#: src/emu/ui/ui.cpp:1978
 #, c-format
 msgid "%1$s Horiz Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1983
+#: src/emu/ui/ui.cpp:1980
 #, c-format
 msgid "%1$s Horiz Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1985
+#: src/emu/ui/ui.cpp:1982
 #, c-format
 msgid "%1$s Vert Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1987
+#: src/emu/ui/ui.cpp:1984
 #, c-format
 msgid "%1$s Vert Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2005
+#: src/emu/ui/ui.cpp:2002
 #, c-format
 msgid "Laserdisc '%1$s' Horiz Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2007
+#: src/emu/ui/ui.cpp:2004
 #, c-format
 msgid "Laserdisc '%1$s' Horiz Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2009
+#: src/emu/ui/ui.cpp:2006
 #, c-format
 msgid "Laserdisc '%1$s' Vert Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2011
+#: src/emu/ui/ui.cpp:2008
 #, c-format
 msgid "Laserdisc '%1$s' Vert Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2021
+#: src/emu/ui/ui.cpp:2018
 msgid "Vector Flicker"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2022
+#: src/emu/ui/ui.cpp:2019
 msgid "Beam Width Minimum"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2023
+#: src/emu/ui/ui.cpp:2020
 msgid "Beam Width Maximum"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2024
+#: src/emu/ui/ui.cpp:2021
 msgid "Beam Intensity Weight"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2037
+#: src/emu/ui/ui.cpp:2034
 #, c-format
 msgid "Crosshair Scale %1$s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2037 src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2034 src/emu/ui/ui.cpp:2036
 msgid "X"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2037 src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2034 src/emu/ui/ui.cpp:2036
 msgid "Y"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2036
 #, c-format
 msgid "Crosshair Offset %1$s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2071
+#: src/emu/ui/ui.cpp:2068
 #, c-format
 msgid "%1$3ddB"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2115
+#: src/emu/ui/ui.cpp:2112
 #, c-format
 msgid "%1$d%%"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2131
+#: src/emu/ui/ui.cpp:2128
 #, c-format
 msgid "%1$3.0f%%"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2154
+#: src/emu/ui/ui.cpp:2151
 #, c-format
 msgid "%1$.3ffps"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2177 src/emu/ui/ui.cpp:2199 src/emu/ui/ui.cpp:2220
-#: src/emu/ui/ui.cpp:2242 src/emu/ui/ui.cpp:2264 src/emu/ui/ui.cpp:2286
-#: src/emu/ui/ui.cpp:2308 src/emu/ui/ui.cpp:2330 src/emu/ui/ui.cpp:2352
-#: src/emu/ui/ui.cpp:2374 src/emu/ui/ui.cpp:2396
+#: src/emu/ui/ui.cpp:2174 src/emu/ui/ui.cpp:2196 src/emu/ui/ui.cpp:2217
+#: src/emu/ui/ui.cpp:2239 src/emu/ui/ui.cpp:2261 src/emu/ui/ui.cpp:2283
+#: src/emu/ui/ui.cpp:2305 src/emu/ui/ui.cpp:2327 src/emu/ui/ui.cpp:2349
+#: src/emu/ui/ui.cpp:2371 src/emu/ui/ui.cpp:2393
 #, c-format
 msgid "%1$.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2412 src/emu/ui/ui.cpp:2428 src/emu/ui/ui.cpp:2444
-#: src/emu/ui/ui.cpp:2460
+#: src/emu/ui/ui.cpp:2408 src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2438
+#: src/emu/ui/ui.cpp:2453
 #, c-format
 msgid "%1$1.2f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2476
+#: src/emu/ui/ui.cpp:2469
 #, c-format
 msgid "Screen '%1$s'"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2478
+#: src/emu/ui/ui.cpp:2471
 msgid "Screen"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2494
+#: src/emu/ui/ui.cpp:2487
 #, c-format
 msgid "Crosshair Scale X %1$1.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2494
+#: src/emu/ui/ui.cpp:2487
 #, c-format
 msgid "Crosshair Scale Y %1$1.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2513
+#: src/emu/ui/ui.cpp:2506
 #, c-format
 msgid "Crosshair Offset X %1$1.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2513
+#: src/emu/ui/ui.cpp:2506
 #, c-format
 msgid "Crosshair Offset Y %1$1.3f"
 msgstr ""
@@ -1863,10 +1879,10 @@ msgstr ""
 msgid "Full"
 msgstr ""
 
-#: src/emu/ui/viewgfx.cpp:392
+#: src/emu/ui/viewgfx.cpp:391
 msgid " COLORS"
 msgstr ""
 
-#: src/emu/ui/viewgfx.cpp:392
+#: src/emu/ui/viewgfx.cpp:391
 msgid " PENS"
 msgstr ""
diff --git a/language/Basque/strings.po b/language/Basque/strings.po
index f8d0d4f026c..92f8ed25653 100644
--- a/language/Basque/strings.po
+++ b/language/Basque/strings.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MAME\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-11 03:33+0200\n"
+"POT-Creation-Date: 2016-04-15 17:42+0200\n"
 "PO-Revision-Date: 2016-02-20 18:03+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: MAME Language Team\n"
@@ -60,14 +60,14 @@ msgstr ""
 msgid "Autofire Status"
 msgstr ""
 
-#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1698
+#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1695
 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211
 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219
 #: src/emu/ui/videoopt.cpp:223
 msgid "Disabled"
 msgstr ""
 
-#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1698
+#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1695
 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211
 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219
 #: src/emu/ui/videoopt.cpp:223
@@ -75,14 +75,14 @@ msgid "Enabled"
 msgstr ""
 
 #: src/emu/ui/cheatopt.cpp:282 src/emu/ui/cheatopt.cpp:288
-#: src/emu/ui/menu.cpp:710 src/emu/ui/miscmenu.cpp:831
-#: src/emu/ui/sndmenu.cpp:135 src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/menu.cpp:755 src/emu/ui/miscmenu.cpp:936
+#: src/emu/ui/sndmenu.cpp:133 src/emu/ui/sndmenu.cpp:135
 msgid "On"
 msgstr ""
 
 #: src/emu/ui/cheatopt.cpp:282 src/emu/ui/cheatopt.cpp:288
-#: src/emu/ui/menu.cpp:713 src/emu/ui/miscmenu.cpp:831
-#: src/emu/ui/sndmenu.cpp:135 src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/menu.cpp:758 src/emu/ui/miscmenu.cpp:936
+#: src/emu/ui/sndmenu.cpp:133 src/emu/ui/sndmenu.cpp:135
 msgid "Off"
 msgstr ""
 
@@ -94,316 +94,316 @@ msgstr ""
 msgid "Autofire Delay"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:158 src/emu/ui/custmenu.cpp:447
+#: src/emu/ui/custmenu.cpp:157 src/emu/ui/custmenu.cpp:445
 msgid "Main filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:167 src/emu/ui/custmenu.cpp:456
+#: src/emu/ui/custmenu.cpp:166 src/emu/ui/custmenu.cpp:454
 msgid "Other filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:176 src/emu/ui/optsmenu.cpp:239
+#: src/emu/ui/custmenu.cpp:175 src/emu/ui/optsmenu.cpp:238
 msgid "^!Manufacturer"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:185 src/emu/ui/custmenu.cpp:474
-#: src/emu/ui/optsmenu.cpp:247
+#: src/emu/ui/custmenu.cpp:184 src/emu/ui/custmenu.cpp:472
+#: src/emu/ui/optsmenu.cpp:246
 msgid "^!Year"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:194 src/emu/ui/custmenu.cpp:510
+#: src/emu/ui/custmenu.cpp:193 src/emu/ui/custmenu.cpp:508
 msgid "Remove last filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:197 src/emu/ui/custmenu.cpp:513
+#: src/emu/ui/custmenu.cpp:196 src/emu/ui/custmenu.cpp:511
 msgid "Add filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:212 src/emu/ui/custmenu.cpp:233
-#: src/emu/ui/custmenu.cpp:529 src/emu/ui/custmenu.cpp:550
+#: src/emu/ui/custmenu.cpp:211 src/emu/ui/custmenu.cpp:231
+#: src/emu/ui/custmenu.cpp:527 src/emu/ui/custmenu.cpp:547
 msgid "Select custom filters:"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:465
+#: src/emu/ui/custmenu.cpp:463
 msgid "^!Publisher"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:483
+#: src/emu/ui/custmenu.cpp:481
 msgid "^!Software List"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:492
+#: src/emu/ui/custmenu.cpp:490
 msgid "^!Device type"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:501
+#: src/emu/ui/custmenu.cpp:499
 msgid "^!Region"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:23
+#: src/emu/ui/custui.cpp:22
 msgid "Show All"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:24
+#: src/emu/ui/custui.cpp:23
 msgid "Hide Filters"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:25
+#: src/emu/ui/custui.cpp:24
 msgid "Hide Info/Image"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:26
+#: src/emu/ui/custui.cpp:25
 msgid "Hide Both"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:142
+#: src/emu/ui/custui.cpp:141
 msgid "Fonts"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:143
+#: src/emu/ui/custui.cpp:142
 msgid "Colors"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:148 src/emu/ui/dirmenu.cpp:33
+#: src/emu/ui/custui.cpp:147 src/emu/ui/dirmenu.cpp:33
 msgid "Language"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:152
+#: src/emu/ui/custui.cpp:151
 msgid "Show side panels"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:167 src/emu/ui/custui.cpp:188
+#: src/emu/ui/custui.cpp:166 src/emu/ui/custui.cpp:186
 msgid "Custom UI Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:246
+#: src/emu/ui/custui.cpp:244
 msgid "default"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:349
+#: src/emu/ui/custui.cpp:347
 msgid "UI Font"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:354
+#: src/emu/ui/custui.cpp:352
 msgid "Bold"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:355
+#: src/emu/ui/custui.cpp:353
 msgid "Italic"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:360
+#: src/emu/ui/custui.cpp:358
 msgid "Lines"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:366
+#: src/emu/ui/custui.cpp:364
 msgid "Infos text size"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:383
+#: src/emu/ui/custui.cpp:381
 msgid "UI Fonts Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:411
+#: src/emu/ui/custui.cpp:408
 msgid "Sample text - Lorem ipsum dolor sit amet, consectetur adipiscing elit."
 msgstr ""
 
-#: src/emu/ui/custui.cpp:509
+#: src/emu/ui/custui.cpp:506
 msgid "Normal text"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:510
+#: src/emu/ui/custui.cpp:507
 msgid "Selected color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:511
+#: src/emu/ui/custui.cpp:508
 msgid "Normal text background"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:512
+#: src/emu/ui/custui.cpp:509
 msgid "Selected background color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:513
+#: src/emu/ui/custui.cpp:510
 msgid "Subitem color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:514 src/emu/ui/custui.cpp:610
+#: src/emu/ui/custui.cpp:511 src/emu/ui/custui.cpp:606
 msgid "Clone"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:515
+#: src/emu/ui/custui.cpp:512
 msgid "Border"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:516
+#: src/emu/ui/custui.cpp:513
 msgid "Background"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:517
+#: src/emu/ui/custui.cpp:514
 msgid "Dipswitch"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:518
+#: src/emu/ui/custui.cpp:515
 msgid "Unavailable color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:519
+#: src/emu/ui/custui.cpp:516
 msgid "Slider color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:520
+#: src/emu/ui/custui.cpp:517
 msgid "Gfx viewer background"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:521
+#: src/emu/ui/custui.cpp:518
 msgid "Mouse over color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:522
+#: src/emu/ui/custui.cpp:519
 msgid "Mouse over background color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:523
+#: src/emu/ui/custui.cpp:520
 msgid "Mouse down color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:524
+#: src/emu/ui/custui.cpp:521
 msgid "Mouse down background color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:527
+#: src/emu/ui/custui.cpp:524
 msgid "Restore originals colors"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:543
+#: src/emu/ui/custui.cpp:540
 msgid "UI Colors Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:572
+#: src/emu/ui/custui.cpp:568
 #, c-format
 msgid "Double click or press %1$s to change the color value"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:598
+#: src/emu/ui/custui.cpp:594
 msgid "Menu Preview"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:606
+#: src/emu/ui/custui.cpp:602
 msgid "Normal"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:607
+#: src/emu/ui/custui.cpp:603
 msgid "Subitem"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:608
+#: src/emu/ui/custui.cpp:604
 msgid "Selected"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:609
+#: src/emu/ui/custui.cpp:605
 msgid "Mouse Over"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:841 src/emu/ui/custui.cpp:844
+#: src/emu/ui/custui.cpp:837 src/emu/ui/custui.cpp:840
 msgid "Alpha"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:849 src/emu/ui/custui.cpp:852
-#: src/emu/ui/custui.cpp:1013
+#: src/emu/ui/custui.cpp:845 src/emu/ui/custui.cpp:848
+#: src/emu/ui/custui.cpp:1007
 msgid "Red"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:857 src/emu/ui/custui.cpp:860
-#: src/emu/ui/custui.cpp:1016
+#: src/emu/ui/custui.cpp:853 src/emu/ui/custui.cpp:856
+#: src/emu/ui/custui.cpp:1010
 msgid "Green"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:865 src/emu/ui/custui.cpp:868
-#: src/emu/ui/custui.cpp:1017
+#: src/emu/ui/custui.cpp:861 src/emu/ui/custui.cpp:864
+#: src/emu/ui/custui.cpp:1011
 msgid "Blue"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:871
+#: src/emu/ui/custui.cpp:867
 msgid "Choose from palette"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:887
+#: src/emu/ui/custui.cpp:883
 msgid " - ARGB Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:912
+#: src/emu/ui/custui.cpp:907
 msgid "Color preview ="
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1009
+#: src/emu/ui/custui.cpp:1003
 msgid "White"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1010
+#: src/emu/ui/custui.cpp:1004
 msgid "Silver"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1011
+#: src/emu/ui/custui.cpp:1005
 msgid "Gray"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1012
+#: src/emu/ui/custui.cpp:1006
 msgid "Black"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1014
+#: src/emu/ui/custui.cpp:1008
 msgid "Orange"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1015
+#: src/emu/ui/custui.cpp:1009
 msgid "Yellow"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1018
+#: src/emu/ui/custui.cpp:1012
 msgid "Violet"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:65
+#: src/emu/ui/datmenu.cpp:64
 msgid "Software History"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:67
+#: src/emu/ui/datmenu.cpp:66
 msgid "Software Usage"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:199
+#: src/emu/ui/datmenu.cpp:196
 msgid "Revision: "
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:287 src/emu/ui/selgame.cpp:40
-#: src/emu/ui/selgame.cpp:2152 src/emu/ui/selgame.cpp:2161
-#: src/emu/ui/selsoft.cpp:1577 src/emu/ui/selsoft.cpp:1597
-#: src/emu/ui/selsoft.cpp:1606
+#: src/emu/ui/datmenu.cpp:284 src/emu/ui/selgame.cpp:39
+#: src/emu/ui/selgame.cpp:2158 src/emu/ui/selgame.cpp:2167
+#: src/emu/ui/selsoft.cpp:1574 src/emu/ui/selsoft.cpp:1592
+#: src/emu/ui/selsoft.cpp:1601
 msgid "History"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:289 src/emu/ui/selgame.cpp:41
+#: src/emu/ui/datmenu.cpp:286 src/emu/ui/selgame.cpp:40
 msgid "Mameinfo"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:291 src/emu/ui/selgame.cpp:43
+#: src/emu/ui/datmenu.cpp:288 src/emu/ui/selgame.cpp:42
 msgid "Messinfo"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:293 src/emu/ui/selgame.cpp:42
+#: src/emu/ui/datmenu.cpp:290 src/emu/ui/selgame.cpp:41
 msgid "Sysinfo"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:295 src/emu/ui/selgame.cpp:46
+#: src/emu/ui/datmenu.cpp:292 src/emu/ui/selgame.cpp:45
 msgid "Mamescore"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:297 src/emu/ui/selgame.cpp:45
+#: src/emu/ui/datmenu.cpp:294 src/emu/ui/selgame.cpp:44
 msgid "Gameinit"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:299 src/emu/ui/selgame.cpp:44
+#: src/emu/ui/datmenu.cpp:296 src/emu/ui/selgame.cpp:43
 msgid "Command"
 msgstr ""
 
@@ -555,75 +555,75 @@ msgstr ""
 msgid "Remove %1$s Folder"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:158
+#: src/emu/ui/filesel.cpp:161
 msgid "File Already Exists - Override?"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:160 src/emu/ui/selgame.cpp:1568
-#: src/emu/ui/selgame.cpp:1569 src/emu/ui/selgame.cpp:1570
-#: src/emu/ui/selgame.cpp:1571 src/emu/ui/selgame.cpp:1572
-#: src/emu/ui/selgame.cpp:1573 src/emu/ui/selgame.cpp:1574
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/filesel.cpp:163 src/emu/ui/selgame.cpp:1576
+#: src/emu/ui/selgame.cpp:1577 src/emu/ui/selgame.cpp:1578
+#: src/emu/ui/selgame.cpp:1579 src/emu/ui/selgame.cpp:1580
+#: src/emu/ui/selgame.cpp:1581 src/emu/ui/selgame.cpp:1582
+#: src/emu/ui/selgame.cpp:1591
 msgid "No"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:161 src/emu/ui/selgame.cpp:1568
-#: src/emu/ui/selgame.cpp:1569 src/emu/ui/selgame.cpp:1570
-#: src/emu/ui/selgame.cpp:1571 src/emu/ui/selgame.cpp:1572
-#: src/emu/ui/selgame.cpp:1573 src/emu/ui/selgame.cpp:1574
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/filesel.cpp:164 src/emu/ui/selgame.cpp:1576
+#: src/emu/ui/selgame.cpp:1577 src/emu/ui/selgame.cpp:1578
+#: src/emu/ui/selgame.cpp:1579 src/emu/ui/selgame.cpp:1580
+#: src/emu/ui/selgame.cpp:1581 src/emu/ui/selgame.cpp:1582
+#: src/emu/ui/selgame.cpp:1591
 msgid "Yes"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:272
+#: src/emu/ui/filesel.cpp:275
 msgid "New Image Name:"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:278
+#: src/emu/ui/filesel.cpp:281
 msgid "Image Format:"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:284
+#: src/emu/ui/filesel.cpp:287
 msgid "Create"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:315
+#: src/emu/ui/filesel.cpp:318
 msgid "Please enter a file extension too"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:503 src/emu/ui/swlist.cpp:65
+#: src/emu/ui/filesel.cpp:506 src/emu/ui/swlist.cpp:65
 msgid "[empty slot]"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:507
+#: src/emu/ui/filesel.cpp:510
 msgid "[create]"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:511 src/emu/ui/swlist.cpp:76
+#: src/emu/ui/filesel.cpp:514 src/emu/ui/swlist.cpp:76
 msgid "[software list]"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:803
+#: src/emu/ui/filesel.cpp:806
 msgid "Select image format"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:863
+#: src/emu/ui/filesel.cpp:866
 msgid "Select access mode"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:864
+#: src/emu/ui/filesel.cpp:867
 msgid "Read-only"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:866
+#: src/emu/ui/filesel.cpp:869
 msgid "Read-write"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:867
+#: src/emu/ui/filesel.cpp:870
 msgid "Read this image, write to another image"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:868
+#: src/emu/ui/filesel.cpp:871
 msgid "Read this image, write to diff"
 msgstr ""
 
@@ -649,7 +649,7 @@ msgstr ""
 msgid "[empty]"
 msgstr ""
 
-#: src/emu/ui/info_pty.cpp:26 src/emu/ui/mainmenu.cpp:91
+#: src/emu/ui/info_pty.cpp:26 src/emu/ui/mainmenu.cpp:96
 msgid "Pseudo terminals"
 msgstr ""
 
@@ -665,7 +665,7 @@ msgstr ""
 msgid "Other Controls"
 msgstr ""
 
-#: src/emu/ui/inputmap.cpp:622 src/emu/ui/miscmenu.cpp:91
+#: src/emu/ui/inputmap.cpp:622 src/emu/ui/miscmenu.cpp:92
 #: src/emu/ui/slotopt.cpp:172
 msgid "Reset"
 msgstr ""
@@ -698,27 +698,27 @@ msgstr ""
 msgid "Machine Information"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:78
+#: src/emu/ui/mainmenu.cpp:80
 msgid "Image Information"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:81
+#: src/emu/ui/mainmenu.cpp:83
 msgid "File Manager"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:86
+#: src/emu/ui/mainmenu.cpp:92
 msgid "Tape Control"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:94
+#: src/emu/ui/mainmenu.cpp:99
 msgid "Bios Selection"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:100
+#: src/emu/ui/mainmenu.cpp:104
 msgid "Slot Devices"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:107
+#: src/emu/ui/mainmenu.cpp:109
 msgid "Barcode Reader"
 msgstr ""
 
@@ -726,43 +726,43 @@ msgstr ""
 msgid "Network Devices"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:119
+#: src/emu/ui/mainmenu.cpp:118
 msgid "Keyboard Mode"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:122
+#: src/emu/ui/mainmenu.cpp:121
 msgid "Slider Controls"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:125
+#: src/emu/ui/mainmenu.cpp:124
 msgid "Video Options"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:129
+#: src/emu/ui/mainmenu.cpp:128
 msgid "Crosshair Options"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:133
+#: src/emu/ui/mainmenu.cpp:132
 msgid "Cheat"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:136
+#: src/emu/ui/mainmenu.cpp:135
 msgid "Plugin Options"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:140
+#: src/emu/ui/mainmenu.cpp:139
 msgid "External DAT View"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:146
+#: src/emu/ui/mainmenu.cpp:145 src/emu/ui/miscmenu.cpp:785
 msgid "Add To Favorites"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:148
+#: src/emu/ui/mainmenu.cpp:147 src/emu/ui/miscmenu.cpp:787
 msgid "Remove From Favorites"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:155
+#: src/emu/ui/mainmenu.cpp:154
 msgid "Select New Machine"
 msgstr ""
 
@@ -802,189 +802,205 @@ msgstr ""
 msgid "Return to Previous Menu"
 msgstr ""
 
-#: src/emu/ui/menu.cpp:716
+#: src/emu/ui/menu.cpp:761
 msgid "Auto"
 msgstr ""
 
-#: src/emu/ui/menu.cpp:2133
+#: src/emu/ui/menu.cpp:2195
 msgid "Images"
 msgstr ""
 
-#: src/emu/ui/menu.cpp:2134
+#: src/emu/ui/menu.cpp:2196
 msgid "Infos"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Keyboard Mode:"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Natural"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Emulated"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:240
+#: src/emu/ui/miscmenu.cpp:241
 #, c-format
 msgid ""
 "Uptime: %1$d:%2$02d:%3$02d\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:242
+#: src/emu/ui/miscmenu.cpp:243
 #, c-format
 msgid ""
 "Uptime: %1$d:%2$02d\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:246
+#: src/emu/ui/miscmenu.cpp:247
 #, c-format
 msgid ""
 "Tickets dispensed: %1$d\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:257
+#: src/emu/ui/miscmenu.cpp:258
 msgid "Coin %1$c: NA%3$s\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:257
+#: src/emu/ui/miscmenu.cpp:258
 #, c-format
 msgid "Coin %1$c: %2$d%3$s\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:260
+#: src/emu/ui/miscmenu.cpp:261
 msgid " (locked)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:519
+#: src/emu/ui/miscmenu.cpp:520
 msgid "Visible Delay"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:617
+#: src/emu/ui/miscmenu.cpp:619
 #, c-format
 msgid "%s.xml saved under ui folder."
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:645
+#: src/emu/ui/miscmenu.cpp:647
 msgid "Name:             Description:\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:657
+#: src/emu/ui/miscmenu.cpp:659
 #, c-format
 msgid "%s.txt saved under ui folder."
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:675
-msgid "Export XML format (like -listxml)"
+#: src/emu/ui/miscmenu.cpp:677
+msgid "Export list in XML format (like -listxml)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:676
-msgid "Export TXT format (like -listfull)"
+#: src/emu/ui/miscmenu.cpp:678
+msgid "Export list in XML format (like -listxml, but exclude devices)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:734
-msgid "Dummy"
+#: src/emu/ui/miscmenu.cpp:679
+msgid "Export list in TXT format (like -listfull)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:736
-msgid "Save machine configuration"
-msgstr ""
-
-#: src/emu/ui/miscmenu.cpp:848 src/emu/ui/miscmenu.cpp:869
-#: src/emu/ui/selgame.cpp:594
-msgid "Plugins"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:218
-msgid "Filter"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:226
-msgid " ^!File"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:231
-msgid " ^!Category"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:254
-msgid "^!Setup custom filter"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:262
-msgid "Customize UI"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:263
-msgid "Configure Directories"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:266 src/emu/ui/sndmenu.cpp:151
-#: src/emu/ui/sndmenu.cpp:172
-msgid "Sound Options"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:269
-msgid "General Inputs"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:272
-msgid "Save Configuration"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:286 src/emu/ui/optsmenu.cpp:307
-msgid "Settings"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:327
-msgid "**Error saving ui.ini**"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:374
-#, c-format
-msgid "**Error saving %s.ini**"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:378
+#: src/emu/ui/miscmenu.cpp:729 src/emu/ui/optsmenu.cpp:376
 msgid ""
 "\n"
 "    Configuration saved    \n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/selector.cpp:166
+#: src/emu/ui/miscmenu.cpp:774
+msgid "Bios"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:776
+msgid "Driver"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:790
+msgid "Save machine configuration"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:806
+msgid "Configure machine:"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:868 src/emu/ui/selsoft.cpp:109
+msgid " (default)"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:953 src/emu/ui/miscmenu.cpp:973
+#: src/emu/ui/selgame.cpp:600
+msgid "Plugins"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:217
+msgid "Filter"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:225
+msgid " ^!File"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:230
+msgid " ^!Category"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:253
+msgid "^!Setup custom filter"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:261
+msgid "Customize UI"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:262
+msgid "Configure Directories"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:265 src/emu/ui/sndmenu.cpp:149
+#: src/emu/ui/sndmenu.cpp:169
+msgid "Sound Options"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:268
+msgid "General Inputs"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:271
+msgid "Save Configuration"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:285 src/emu/ui/optsmenu.cpp:305
+msgid "Settings"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:325
+msgid "**Error saving ui.ini**"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:372
+#, c-format
+msgid "**Error saving %s.ini**"
+msgstr ""
+
+#: src/emu/ui/selector.cpp:165
 msgid "Selection List - Search: "
 msgstr ""
 
-#: src/emu/ui/selector.cpp:196
+#: src/emu/ui/selector.cpp:194
 #, c-format
 msgid "Double click or press %1$s to select"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:39
+#: src/emu/ui/selgame.cpp:38
 msgid "General Info"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:374 src/emu/ui/selsoft.cpp:282
+#: src/emu/ui/selgame.cpp:380 src/emu/ui/selsoft.cpp:281
 #, c-format
 msgid ""
 "%s\n"
 " added to favorites list."
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:380 src/emu/ui/selgame.cpp:389
-#: src/emu/ui/selsoft.cpp:287
+#: src/emu/ui/selgame.cpp:386 src/emu/ui/selgame.cpp:395
+#: src/emu/ui/selsoft.cpp:286
 #, c-format
 msgid ""
 "%s\n"
 " removed from favorites list."
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:450
+#: src/emu/ui/selgame.cpp:457
 msgid ""
 "The selected machine is missing one or more required ROM or CHD images. "
 "Please select a different machine.\n"
@@ -992,275 +1008,275 @@ msgid ""
 "Press any key to continue."
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:589 src/emu/ui/simpleselgame.cpp:265
+#: src/emu/ui/selgame.cpp:595 src/emu/ui/simpleselgame.cpp:265
 msgid "Configure Options"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:752
+#: src/emu/ui/selgame.cpp:596
+msgid "Configure Machine"
+msgstr ""
+
+#: src/emu/ui/selgame.cpp:758
 #, c-format
 msgid "%1$s %2$s ( %3$d / %4$d machines (%5$d BIOS) )"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:762
+#: src/emu/ui/selgame.cpp:768
 #, c-format
 msgid "%1$s (%2$s - %3$s) - "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:769 src/emu/ui/selgame.cpp:775
+#: src/emu/ui/selgame.cpp:775 src/emu/ui/selgame.cpp:781
 #, c-format
 msgid "%1$s (%2$s) - "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:784
+#: src/emu/ui/selgame.cpp:790
 #, c-format
 msgid "%1$s Search: %2$s_"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:838
+#: src/emu/ui/selgame.cpp:844
 #, c-format
 msgid "Romset: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:841 src/emu/ui/selgame.cpp:890
-#: src/emu/ui/selsoft.cpp:751 src/emu/ui/selsoft.cpp:801
+#: src/emu/ui/selgame.cpp:847 src/emu/ui/selgame.cpp:896
+#: src/emu/ui/selsoft.cpp:750 src/emu/ui/selsoft.cpp:800
 #: src/emu/ui/simpleselgame.cpp:328
 #, c-format
 msgid "%1$s, %2$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:847 src/emu/ui/selsoft.cpp:757
+#: src/emu/ui/selgame.cpp:853 src/emu/ui/selsoft.cpp:756
 #, c-format
 msgid "Driver is clone of: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:849 src/emu/ui/selsoft.cpp:759
+#: src/emu/ui/selgame.cpp:855 src/emu/ui/selsoft.cpp:758
 msgid "Driver is parent"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:853 src/emu/ui/selsoft.cpp:763
+#: src/emu/ui/selgame.cpp:859 src/emu/ui/selsoft.cpp:762
 #: src/emu/ui/simpleselgame.cpp:335
 msgid "Overall: NOT WORKING"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:855 src/emu/ui/selsoft.cpp:765
+#: src/emu/ui/selgame.cpp:861 src/emu/ui/selsoft.cpp:764
 #: src/emu/ui/simpleselgame.cpp:337
 msgid "Overall: Unemulated Protection"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:857 src/emu/ui/selsoft.cpp:767
+#: src/emu/ui/selgame.cpp:863 src/emu/ui/selsoft.cpp:766
 #: src/emu/ui/simpleselgame.cpp:339
 msgid "Overall: Working"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:861 src/emu/ui/selsoft.cpp:771
+#: src/emu/ui/selgame.cpp:867 src/emu/ui/selsoft.cpp:770
 msgid "Graphics: Imperfect, "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:863 src/emu/ui/selsoft.cpp:773
+#: src/emu/ui/selgame.cpp:869 src/emu/ui/selsoft.cpp:772
 msgid "Graphics: OK, "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:866 src/emu/ui/selsoft.cpp:776
+#: src/emu/ui/selgame.cpp:872 src/emu/ui/selsoft.cpp:775
 msgid "Sound: Unimplemented"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:868 src/emu/ui/selsoft.cpp:778
+#: src/emu/ui/selgame.cpp:874 src/emu/ui/selsoft.cpp:777
 msgid "Sound: Imperfect"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:870 src/emu/ui/selsoft.cpp:780
+#: src/emu/ui/selgame.cpp:876 src/emu/ui/selsoft.cpp:779
 msgid "Sound: OK"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:887
+#: src/emu/ui/selgame.cpp:893
 #, c-format
 msgid "System: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:894 src/emu/ui/selsoft.cpp:805
+#: src/emu/ui/selgame.cpp:900 src/emu/ui/selsoft.cpp:804
 #, c-format
 msgid "Software is clone of: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:896 src/emu/ui/selsoft.cpp:807
+#: src/emu/ui/selgame.cpp:902 src/emu/ui/selsoft.cpp:806
 msgid "Software is parent"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:901 src/emu/ui/selsoft.cpp:812
+#: src/emu/ui/selgame.cpp:907 src/emu/ui/selsoft.cpp:811
 msgid "Supported: No"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:906 src/emu/ui/selsoft.cpp:817
+#: src/emu/ui/selgame.cpp:912 src/emu/ui/selsoft.cpp:816
 msgid "Supported: Partial"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:911 src/emu/ui/selsoft.cpp:822
+#: src/emu/ui/selgame.cpp:917 src/emu/ui/selsoft.cpp:821
 msgid "Supported: Yes"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:916 src/emu/ui/selsoft.cpp:827
+#: src/emu/ui/selgame.cpp:922 src/emu/ui/selsoft.cpp:826
 #, c-format
 msgid "romset: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:923
+#: src/emu/ui/selgame.cpp:929
 #, c-format
 msgid "%1$s %2$s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1535
+#: src/emu/ui/selgame.cpp:1543
 #, c-format
 msgid "Romset: %1$-.100s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1536
+#: src/emu/ui/selgame.cpp:1544
 #, c-format
 msgid "Year: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1537
+#: src/emu/ui/selgame.cpp:1545
 #, c-format
 msgid "Manufacturer: %1$-.100s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1541
+#: src/emu/ui/selgame.cpp:1549
 #, c-format
 msgid "Driver is Clone of: %1$-.100s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1543
+#: src/emu/ui/selgame.cpp:1551
 msgid "Driver is Parent\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1546
+#: src/emu/ui/selgame.cpp:1554
 msgid "Overall: NOT WORKING\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1548
+#: src/emu/ui/selgame.cpp:1556
 msgid "Overall: Unemulated Protection\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1550
+#: src/emu/ui/selgame.cpp:1558
 msgid "Overall: Working\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1553
+#: src/emu/ui/selgame.cpp:1561
 msgid "Graphics: Imperfect Colors\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1557
+#: src/emu/ui/selgame.cpp:1565
 msgid "Graphics: Imperfect\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1559
+#: src/emu/ui/selgame.cpp:1567
 msgid "Graphics: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1562
+#: src/emu/ui/selgame.cpp:1570
 msgid "Sound: Unimplemented\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1564
+#: src/emu/ui/selgame.cpp:1572
 msgid "Sound: Imperfect\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1566
+#: src/emu/ui/selgame.cpp:1574
 msgid "Sound: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1568
+#: src/emu/ui/selgame.cpp:1576
 #, c-format
 msgid "Driver is Skeleton: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1569
+#: src/emu/ui/selgame.cpp:1577
 #, c-format
 msgid "Game is Mechanical: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1570
+#: src/emu/ui/selgame.cpp:1578
 #, c-format
 msgid "Requires Artwork: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1571
+#: src/emu/ui/selgame.cpp:1579
 #, c-format
 msgid "Requires Clickable Artwork: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1572
+#: src/emu/ui/selgame.cpp:1580
 #, c-format
 msgid "Support Cocktail: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1573
+#: src/emu/ui/selgame.cpp:1581
 #, c-format
 msgid "Driver is Bios: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1574
+#: src/emu/ui/selgame.cpp:1582
 #, c-format
 msgid "Support Save: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 #, c-format
 msgid "Screen Orientation: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 msgid "Vertical"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 msgid "Horizontal"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/selgame.cpp:1591
 #, c-format
 msgid "Requires CHD: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1596
+#: src/emu/ui/selgame.cpp:1604
 msgid "Roms Audit Pass: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1598
+#: src/emu/ui/selgame.cpp:1606
 msgid "Roms Audit Pass: BAD\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1601
+#: src/emu/ui/selgame.cpp:1609
 msgid "Samples Audit Pass: None Needed\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1603
+#: src/emu/ui/selgame.cpp:1611
 msgid "Samples Audit Pass: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1605
+#: src/emu/ui/selgame.cpp:1613
 msgid "Samples Audit Pass: BAD\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1608
+#: src/emu/ui/selgame.cpp:1616
 msgid ""
 "Roms Audit Pass: Disabled\n"
 "Samples Audit Pass: Disabled\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:2049 src/emu/ui/selgame.cpp:2212
-#: src/emu/ui/selsoft.cpp:1662
+#: src/emu/ui/selgame.cpp:2055 src/emu/ui/selgame.cpp:2216
+#: src/emu/ui/selsoft.cpp:1655
 msgid "No Infos Available"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:2162 src/emu/ui/selsoft.cpp:1607
+#: src/emu/ui/selgame.cpp:2168 src/emu/ui/selsoft.cpp:1602
 msgid "Usage"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:110
-msgid " (default)"
-msgstr ""
-
-#: src/emu/ui/selsoft.cpp:381
+#: src/emu/ui/selsoft.cpp:380
 msgid ""
 "The selected software is missing one or more required files. Please select a "
 "different software.\n"
@@ -1268,57 +1284,57 @@ msgid ""
 "Press any key to continue."
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:684
+#: src/emu/ui/selsoft.cpp:683
 #, c-format
-msgid "%1$s %2$s ( %3$d / %4$d softwares )"
+msgid "%1$s %2$s ( %3$d / %4$d software packages )"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:685
+#: src/emu/ui/selsoft.cpp:684
 #, c-format
 msgid "Driver: \"%1$s\" software list "
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:688
+#: src/emu/ui/selsoft.cpp:687
 #, c-format
 msgid "Region: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:690
+#: src/emu/ui/selsoft.cpp:689
 #, c-format
 msgid "Publisher: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:692
+#: src/emu/ui/selsoft.cpp:691
 #, c-format
 msgid "Year: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:694
+#: src/emu/ui/selsoft.cpp:693
 #, c-format
 msgid "Software List: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:696
+#: src/emu/ui/selsoft.cpp:695
 #, c-format
 msgid "Device type: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:698
+#: src/emu/ui/selsoft.cpp:697
 #, c-format
 msgid "%s Search: %s_"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:748 src/emu/ui/selsoft.cpp:798
+#: src/emu/ui/selsoft.cpp:747 src/emu/ui/selsoft.cpp:797
 #: src/emu/ui/simpleselgame.cpp:325
 #, c-format
 msgid "%1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:1998 src/emu/ui/selsoft.cpp:2018
+#: src/emu/ui/selsoft.cpp:1991 src/emu/ui/selsoft.cpp:2011
 msgid "Software part selection:"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:2136 src/emu/ui/selsoft.cpp:2156
+#: src/emu/ui/selsoft.cpp:2129 src/emu/ui/selsoft.cpp:2149
 msgid "Bios selection:"
 msgstr ""
 
@@ -1366,15 +1382,15 @@ msgstr ""
 msgid " [internal]"
 msgstr ""
 
-#: src/emu/ui/sndmenu.cpp:135
+#: src/emu/ui/sndmenu.cpp:133
 msgid "Sound"
 msgstr ""
 
-#: src/emu/ui/sndmenu.cpp:136
+#: src/emu/ui/sndmenu.cpp:134
 msgid "Sample Rate"
 msgstr ""
 
-#: src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/sndmenu.cpp:135
 msgid "Use External Samples"
 msgstr ""
 
@@ -1443,80 +1459,80 @@ msgstr ""
 msgid "Fast Forward"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:419
+#: src/emu/ui/ui.cpp:418
 msgid "This driver requires images to be loaded in the following device(s): "
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1074
+#: src/emu/ui/ui.cpp:1071
 msgid ""
 "One or more ROMs/CHDs for this machine are incorrect. The machine may not "
 "run correctly.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1087
+#: src/emu/ui/ui.cpp:1084
 msgid ""
 "There are known problems with this machine\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1091
+#: src/emu/ui/ui.cpp:1088
 msgid ""
 "One or more ROMs/CHDs for this machine have not been correctly dumped.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1095
+#: src/emu/ui/ui.cpp:1092
 #, c-format
 msgid "The keyboard emulation may not be 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1097
+#: src/emu/ui/ui.cpp:1094
 #, c-format
 msgid "The colors aren't 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1099
+#: src/emu/ui/ui.cpp:1096
 msgid "The colors are completely wrong.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1101
+#: src/emu/ui/ui.cpp:1098
 #, c-format
 msgid "The video emulation isn't 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1103
+#: src/emu/ui/ui.cpp:1100
 #, c-format
 msgid "The sound emulation isn't 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1105
+#: src/emu/ui/ui.cpp:1102
 msgid "The machine lacks sound.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1108
+#: src/emu/ui/ui.cpp:1105
 msgid "Screen flipping in cocktail mode is not supported.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1112
+#: src/emu/ui/ui.cpp:1109
 msgid "The machine requires external artwork files\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1117
+#: src/emu/ui/ui.cpp:1114
 msgid ""
 "This machine was never completed. It may exhibit strange behavior or missing "
 "elements that are not bugs in the emulation.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1122
+#: src/emu/ui/ui.cpp:1119
 msgid ""
 "This machine has no sound hardware, MAME will produce no sounds, this is "
 "expected behaviour.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1130
+#: src/emu/ui/ui.cpp:1127
 msgid "The machine has protection which isn't fully emulated.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1133
+#: src/emu/ui/ui.cpp:1130
 msgid ""
 "\n"
 "THIS MACHINE DOESN'T WORK. The emulation for this machine is not yet "
@@ -1524,7 +1540,7 @@ msgid ""
 "the developers to improve the emulation.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1137
+#: src/emu/ui/ui.cpp:1134
 msgid ""
 "\n"
 "Certain elements of this machine cannot be emulated as it requires actual "
@@ -1532,21 +1548,21 @@ msgid ""
 "to fully play this machine.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1156
+#: src/emu/ui/ui.cpp:1153
 msgid ""
 "\n"
 "\n"
 "There are working clones of this machine: "
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1170
+#: src/emu/ui/ui.cpp:1167
 msgid ""
 "\n"
 "\n"
 "Press any key to continue"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1185
+#: src/emu/ui/ui.cpp:1182
 #, c-format
 msgid ""
 "%1$s\n"
@@ -1556,98 +1572,98 @@ msgid ""
 "CPU:\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1221 src/emu/ui/ui.cpp:1260
+#: src/emu/ui/ui.cpp:1218 src/emu/ui/ui.cpp:1257
 msgid "MHz"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1221 src/emu/ui/ui.cpp:1260
+#: src/emu/ui/ui.cpp:1218 src/emu/ui/ui.cpp:1257
 msgid "kHz"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1235
+#: src/emu/ui/ui.cpp:1232
 msgid ""
 "\n"
 "Sound:\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1264
+#: src/emu/ui/ui.cpp:1261
 msgid ""
 "\n"
 "Video:\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1268
+#: src/emu/ui/ui.cpp:1265
 msgid "None\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1275
+#: src/emu/ui/ui.cpp:1272
 msgid "Vector"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1286
+#: src/emu/ui/ui.cpp:1283
 #, c-format
 msgid "%1$s: %2$s\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1286
+#: src/emu/ui/ui.cpp:1283
 msgid "%2$s\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1541 src/emu/ui/ui.cpp:1551
+#: src/emu/ui/ui.cpp:1538 src/emu/ui/ui.cpp:1548
 msgid "Keyboard Emulation Status"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1543
+#: src/emu/ui/ui.cpp:1540
 msgid "Mode: PARTIAL Emulation"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1544
+#: src/emu/ui/ui.cpp:1541
 msgid "UI:   Enabled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1546 src/emu/ui/ui.cpp:1556
+#: src/emu/ui/ui.cpp:1543 src/emu/ui/ui.cpp:1553
 msgid "**Use ScrLock to toggle**"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1553
+#: src/emu/ui/ui.cpp:1550
 msgid "Mode: FULL Emulation"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1554
+#: src/emu/ui/ui.cpp:1551
 msgid "UI:   Disabled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1692
+#: src/emu/ui/ui.cpp:1689
 msgid "Autofire can't be enabled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1731
+#: src/emu/ui/ui.cpp:1728
 msgid "Select position to save to"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1733
+#: src/emu/ui/ui.cpp:1730
 msgid "Select position to load from"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1757
+#: src/emu/ui/ui.cpp:1754
 msgid "Save cancelled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1759
+#: src/emu/ui/ui.cpp:1756
 msgid "Load cancelled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1802
+#: src/emu/ui/ui.cpp:1799
 #, c-format
 msgid "Save to position %s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1807
+#: src/emu/ui/ui.cpp:1804
 #, c-format
 msgid "Load from position %s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1847
+#: src/emu/ui/ui.cpp:1844
 #, c-format
 msgid ""
 "Are you sure you want to quit?\n"
@@ -1656,173 +1672,173 @@ msgid ""
 "Press ''%2$s'' to return to emulation."
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1917
+#: src/emu/ui/ui.cpp:1914
 msgid "Master Volume"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1926
+#: src/emu/ui/ui.cpp:1923
 #, c-format
 msgid "%1$s Volume"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1949
+#: src/emu/ui/ui.cpp:1946
 #, c-format
 msgid "Overclock CPU %1$s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1968
+#: src/emu/ui/ui.cpp:1965
 #, c-format
 msgid "%1$s Refresh Rate"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1973
+#: src/emu/ui/ui.cpp:1970
 #, c-format
 msgid "%1$s Brightness"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1975
+#: src/emu/ui/ui.cpp:1972
 #, c-format
 msgid "%1$s Contrast"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1977
+#: src/emu/ui/ui.cpp:1974
 #, c-format
 msgid "%1$s Gamma"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1981
+#: src/emu/ui/ui.cpp:1978
 #, c-format
 msgid "%1$s Horiz Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1983
+#: src/emu/ui/ui.cpp:1980
 #, c-format
 msgid "%1$s Horiz Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1985
+#: src/emu/ui/ui.cpp:1982
 #, c-format
 msgid "%1$s Vert Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1987
+#: src/emu/ui/ui.cpp:1984
 #, c-format
 msgid "%1$s Vert Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2005
+#: src/emu/ui/ui.cpp:2002
 #, c-format
 msgid "Laserdisc '%1$s' Horiz Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2007
+#: src/emu/ui/ui.cpp:2004
 #, c-format
 msgid "Laserdisc '%1$s' Horiz Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2009
+#: src/emu/ui/ui.cpp:2006
 #, c-format
 msgid "Laserdisc '%1$s' Vert Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2011
+#: src/emu/ui/ui.cpp:2008
 #, c-format
 msgid "Laserdisc '%1$s' Vert Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2021
+#: src/emu/ui/ui.cpp:2018
 msgid "Vector Flicker"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2022
+#: src/emu/ui/ui.cpp:2019
 msgid "Beam Width Minimum"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2023
+#: src/emu/ui/ui.cpp:2020
 msgid "Beam Width Maximum"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2024
+#: src/emu/ui/ui.cpp:2021
 msgid "Beam Intensity Weight"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2037
+#: src/emu/ui/ui.cpp:2034
 #, c-format
 msgid "Crosshair Scale %1$s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2037 src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2034 src/emu/ui/ui.cpp:2036
 msgid "X"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2037 src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2034 src/emu/ui/ui.cpp:2036
 msgid "Y"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2036
 #, c-format
 msgid "Crosshair Offset %1$s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2071
+#: src/emu/ui/ui.cpp:2068
 #, c-format
 msgid "%1$3ddB"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2115
+#: src/emu/ui/ui.cpp:2112
 #, c-format
 msgid "%1$d%%"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2131
+#: src/emu/ui/ui.cpp:2128
 #, c-format
 msgid "%1$3.0f%%"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2154
+#: src/emu/ui/ui.cpp:2151
 #, c-format
 msgid "%1$.3ffps"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2177 src/emu/ui/ui.cpp:2199 src/emu/ui/ui.cpp:2220
-#: src/emu/ui/ui.cpp:2242 src/emu/ui/ui.cpp:2264 src/emu/ui/ui.cpp:2286
-#: src/emu/ui/ui.cpp:2308 src/emu/ui/ui.cpp:2330 src/emu/ui/ui.cpp:2352
-#: src/emu/ui/ui.cpp:2374 src/emu/ui/ui.cpp:2396
+#: src/emu/ui/ui.cpp:2174 src/emu/ui/ui.cpp:2196 src/emu/ui/ui.cpp:2217
+#: src/emu/ui/ui.cpp:2239 src/emu/ui/ui.cpp:2261 src/emu/ui/ui.cpp:2283
+#: src/emu/ui/ui.cpp:2305 src/emu/ui/ui.cpp:2327 src/emu/ui/ui.cpp:2349
+#: src/emu/ui/ui.cpp:2371 src/emu/ui/ui.cpp:2393
 #, c-format
 msgid "%1$.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2412 src/emu/ui/ui.cpp:2428 src/emu/ui/ui.cpp:2444
-#: src/emu/ui/ui.cpp:2460
+#: src/emu/ui/ui.cpp:2408 src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2438
+#: src/emu/ui/ui.cpp:2453
 #, c-format
 msgid "%1$1.2f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2476
+#: src/emu/ui/ui.cpp:2469
 #, c-format
 msgid "Screen '%1$s'"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2478
+#: src/emu/ui/ui.cpp:2471
 msgid "Screen"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2494
+#: src/emu/ui/ui.cpp:2487
 #, c-format
 msgid "Crosshair Scale X %1$1.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2494
+#: src/emu/ui/ui.cpp:2487
 #, c-format
 msgid "Crosshair Scale Y %1$1.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2513
+#: src/emu/ui/ui.cpp:2506
 #, c-format
 msgid "Crosshair Offset X %1$1.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2513
+#: src/emu/ui/ui.cpp:2506
 #, c-format
 msgid "Crosshair Offset Y %1$1.3f"
 msgstr ""
@@ -1864,10 +1880,10 @@ msgstr ""
 msgid "Full"
 msgstr ""
 
-#: src/emu/ui/viewgfx.cpp:392
+#: src/emu/ui/viewgfx.cpp:391
 msgid " COLORS"
 msgstr ""
 
-#: src/emu/ui/viewgfx.cpp:392
+#: src/emu/ui/viewgfx.cpp:391
 msgid " PENS"
 msgstr ""
diff --git a/language/Belarusian/strings.po b/language/Belarusian/strings.po
index 8b5d9b83f95..37208966998 100644
--- a/language/Belarusian/strings.po
+++ b/language/Belarusian/strings.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MAME\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-11 03:33+0200\n"
+"POT-Creation-Date: 2016-04-15 17:42+0200\n"
 "PO-Revision-Date: 2016-02-20 18:03+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: MAME Language Team\n"
@@ -62,14 +62,14 @@ msgstr ""
 msgid "Autofire Status"
 msgstr ""
 
-#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1698
+#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1695
 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211
 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219
 #: src/emu/ui/videoopt.cpp:223
 msgid "Disabled"
 msgstr ""
 
-#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1698
+#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1695
 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211
 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219
 #: src/emu/ui/videoopt.cpp:223
@@ -77,14 +77,14 @@ msgid "Enabled"
 msgstr ""
 
 #: src/emu/ui/cheatopt.cpp:282 src/emu/ui/cheatopt.cpp:288
-#: src/emu/ui/menu.cpp:710 src/emu/ui/miscmenu.cpp:831
-#: src/emu/ui/sndmenu.cpp:135 src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/menu.cpp:755 src/emu/ui/miscmenu.cpp:936
+#: src/emu/ui/sndmenu.cpp:133 src/emu/ui/sndmenu.cpp:135
 msgid "On"
 msgstr ""
 
 #: src/emu/ui/cheatopt.cpp:282 src/emu/ui/cheatopt.cpp:288
-#: src/emu/ui/menu.cpp:713 src/emu/ui/miscmenu.cpp:831
-#: src/emu/ui/sndmenu.cpp:135 src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/menu.cpp:758 src/emu/ui/miscmenu.cpp:936
+#: src/emu/ui/sndmenu.cpp:133 src/emu/ui/sndmenu.cpp:135
 msgid "Off"
 msgstr ""
 
@@ -96,316 +96,316 @@ msgstr ""
 msgid "Autofire Delay"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:158 src/emu/ui/custmenu.cpp:447
+#: src/emu/ui/custmenu.cpp:157 src/emu/ui/custmenu.cpp:445
 msgid "Main filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:167 src/emu/ui/custmenu.cpp:456
+#: src/emu/ui/custmenu.cpp:166 src/emu/ui/custmenu.cpp:454
 msgid "Other filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:176 src/emu/ui/optsmenu.cpp:239
+#: src/emu/ui/custmenu.cpp:175 src/emu/ui/optsmenu.cpp:238
 msgid "^!Manufacturer"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:185 src/emu/ui/custmenu.cpp:474
-#: src/emu/ui/optsmenu.cpp:247
+#: src/emu/ui/custmenu.cpp:184 src/emu/ui/custmenu.cpp:472
+#: src/emu/ui/optsmenu.cpp:246
 msgid "^!Year"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:194 src/emu/ui/custmenu.cpp:510
+#: src/emu/ui/custmenu.cpp:193 src/emu/ui/custmenu.cpp:508
 msgid "Remove last filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:197 src/emu/ui/custmenu.cpp:513
+#: src/emu/ui/custmenu.cpp:196 src/emu/ui/custmenu.cpp:511
 msgid "Add filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:212 src/emu/ui/custmenu.cpp:233
-#: src/emu/ui/custmenu.cpp:529 src/emu/ui/custmenu.cpp:550
+#: src/emu/ui/custmenu.cpp:211 src/emu/ui/custmenu.cpp:231
+#: src/emu/ui/custmenu.cpp:527 src/emu/ui/custmenu.cpp:547
 msgid "Select custom filters:"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:465
+#: src/emu/ui/custmenu.cpp:463
 msgid "^!Publisher"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:483
+#: src/emu/ui/custmenu.cpp:481
 msgid "^!Software List"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:492
+#: src/emu/ui/custmenu.cpp:490
 msgid "^!Device type"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:501
+#: src/emu/ui/custmenu.cpp:499
 msgid "^!Region"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:23
+#: src/emu/ui/custui.cpp:22
 msgid "Show All"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:24
+#: src/emu/ui/custui.cpp:23
 msgid "Hide Filters"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:25
+#: src/emu/ui/custui.cpp:24
 msgid "Hide Info/Image"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:26
+#: src/emu/ui/custui.cpp:25
 msgid "Hide Both"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:142
+#: src/emu/ui/custui.cpp:141
 msgid "Fonts"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:143
+#: src/emu/ui/custui.cpp:142
 msgid "Colors"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:148 src/emu/ui/dirmenu.cpp:33
+#: src/emu/ui/custui.cpp:147 src/emu/ui/dirmenu.cpp:33
 msgid "Language"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:152
+#: src/emu/ui/custui.cpp:151
 msgid "Show side panels"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:167 src/emu/ui/custui.cpp:188
+#: src/emu/ui/custui.cpp:166 src/emu/ui/custui.cpp:186
 msgid "Custom UI Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:246
+#: src/emu/ui/custui.cpp:244
 msgid "default"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:349
+#: src/emu/ui/custui.cpp:347
 msgid "UI Font"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:354
+#: src/emu/ui/custui.cpp:352
 msgid "Bold"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:355
+#: src/emu/ui/custui.cpp:353
 msgid "Italic"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:360
+#: src/emu/ui/custui.cpp:358
 msgid "Lines"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:366
+#: src/emu/ui/custui.cpp:364
 msgid "Infos text size"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:383
+#: src/emu/ui/custui.cpp:381
 msgid "UI Fonts Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:411
+#: src/emu/ui/custui.cpp:408
 msgid "Sample text - Lorem ipsum dolor sit amet, consectetur adipiscing elit."
 msgstr ""
 
-#: src/emu/ui/custui.cpp:509
+#: src/emu/ui/custui.cpp:506
 msgid "Normal text"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:510
+#: src/emu/ui/custui.cpp:507
 msgid "Selected color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:511
+#: src/emu/ui/custui.cpp:508
 msgid "Normal text background"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:512
+#: src/emu/ui/custui.cpp:509
 msgid "Selected background color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:513
+#: src/emu/ui/custui.cpp:510
 msgid "Subitem color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:514 src/emu/ui/custui.cpp:610
+#: src/emu/ui/custui.cpp:511 src/emu/ui/custui.cpp:606
 msgid "Clone"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:515
+#: src/emu/ui/custui.cpp:512
 msgid "Border"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:516
+#: src/emu/ui/custui.cpp:513
 msgid "Background"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:517
+#: src/emu/ui/custui.cpp:514
 msgid "Dipswitch"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:518
+#: src/emu/ui/custui.cpp:515
 msgid "Unavailable color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:519
+#: src/emu/ui/custui.cpp:516
 msgid "Slider color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:520
+#: src/emu/ui/custui.cpp:517
 msgid "Gfx viewer background"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:521
+#: src/emu/ui/custui.cpp:518
 msgid "Mouse over color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:522
+#: src/emu/ui/custui.cpp:519
 msgid "Mouse over background color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:523
+#: src/emu/ui/custui.cpp:520
 msgid "Mouse down color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:524
+#: src/emu/ui/custui.cpp:521
 msgid "Mouse down background color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:527
+#: src/emu/ui/custui.cpp:524
 msgid "Restore originals colors"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:543
+#: src/emu/ui/custui.cpp:540
 msgid "UI Colors Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:572
+#: src/emu/ui/custui.cpp:568
 #, c-format
 msgid "Double click or press %1$s to change the color value"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:598
+#: src/emu/ui/custui.cpp:594
 msgid "Menu Preview"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:606
+#: src/emu/ui/custui.cpp:602
 msgid "Normal"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:607
+#: src/emu/ui/custui.cpp:603
 msgid "Subitem"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:608
+#: src/emu/ui/custui.cpp:604
 msgid "Selected"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:609
+#: src/emu/ui/custui.cpp:605
 msgid "Mouse Over"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:841 src/emu/ui/custui.cpp:844
+#: src/emu/ui/custui.cpp:837 src/emu/ui/custui.cpp:840
 msgid "Alpha"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:849 src/emu/ui/custui.cpp:852
-#: src/emu/ui/custui.cpp:1013
+#: src/emu/ui/custui.cpp:845 src/emu/ui/custui.cpp:848
+#: src/emu/ui/custui.cpp:1007
 msgid "Red"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:857 src/emu/ui/custui.cpp:860
-#: src/emu/ui/custui.cpp:1016
+#: src/emu/ui/custui.cpp:853 src/emu/ui/custui.cpp:856
+#: src/emu/ui/custui.cpp:1010
 msgid "Green"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:865 src/emu/ui/custui.cpp:868
-#: src/emu/ui/custui.cpp:1017
+#: src/emu/ui/custui.cpp:861 src/emu/ui/custui.cpp:864
+#: src/emu/ui/custui.cpp:1011
 msgid "Blue"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:871
+#: src/emu/ui/custui.cpp:867
 msgid "Choose from palette"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:887
+#: src/emu/ui/custui.cpp:883
 msgid " - ARGB Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:912
+#: src/emu/ui/custui.cpp:907
 msgid "Color preview ="
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1009
+#: src/emu/ui/custui.cpp:1003
 msgid "White"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1010
+#: src/emu/ui/custui.cpp:1004
 msgid "Silver"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1011
+#: src/emu/ui/custui.cpp:1005
 msgid "Gray"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1012
+#: src/emu/ui/custui.cpp:1006
 msgid "Black"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1014
+#: src/emu/ui/custui.cpp:1008
 msgid "Orange"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1015
+#: src/emu/ui/custui.cpp:1009
 msgid "Yellow"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1018
+#: src/emu/ui/custui.cpp:1012
 msgid "Violet"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:65
+#: src/emu/ui/datmenu.cpp:64
 msgid "Software History"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:67
+#: src/emu/ui/datmenu.cpp:66
 msgid "Software Usage"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:199
+#: src/emu/ui/datmenu.cpp:196
 msgid "Revision: "
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:287 src/emu/ui/selgame.cpp:40
-#: src/emu/ui/selgame.cpp:2152 src/emu/ui/selgame.cpp:2161
-#: src/emu/ui/selsoft.cpp:1577 src/emu/ui/selsoft.cpp:1597
-#: src/emu/ui/selsoft.cpp:1606
+#: src/emu/ui/datmenu.cpp:284 src/emu/ui/selgame.cpp:39
+#: src/emu/ui/selgame.cpp:2158 src/emu/ui/selgame.cpp:2167
+#: src/emu/ui/selsoft.cpp:1574 src/emu/ui/selsoft.cpp:1592
+#: src/emu/ui/selsoft.cpp:1601
 msgid "History"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:289 src/emu/ui/selgame.cpp:41
+#: src/emu/ui/datmenu.cpp:286 src/emu/ui/selgame.cpp:40
 msgid "Mameinfo"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:291 src/emu/ui/selgame.cpp:43
+#: src/emu/ui/datmenu.cpp:288 src/emu/ui/selgame.cpp:42
 msgid "Messinfo"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:293 src/emu/ui/selgame.cpp:42
+#: src/emu/ui/datmenu.cpp:290 src/emu/ui/selgame.cpp:41
 msgid "Sysinfo"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:295 src/emu/ui/selgame.cpp:46
+#: src/emu/ui/datmenu.cpp:292 src/emu/ui/selgame.cpp:45
 msgid "Mamescore"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:297 src/emu/ui/selgame.cpp:45
+#: src/emu/ui/datmenu.cpp:294 src/emu/ui/selgame.cpp:44
 msgid "Gameinit"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:299 src/emu/ui/selgame.cpp:44
+#: src/emu/ui/datmenu.cpp:296 src/emu/ui/selgame.cpp:43
 msgid "Command"
 msgstr ""
 
@@ -557,75 +557,75 @@ msgstr ""
 msgid "Remove %1$s Folder"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:158
+#: src/emu/ui/filesel.cpp:161
 msgid "File Already Exists - Override?"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:160 src/emu/ui/selgame.cpp:1568
-#: src/emu/ui/selgame.cpp:1569 src/emu/ui/selgame.cpp:1570
-#: src/emu/ui/selgame.cpp:1571 src/emu/ui/selgame.cpp:1572
-#: src/emu/ui/selgame.cpp:1573 src/emu/ui/selgame.cpp:1574
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/filesel.cpp:163 src/emu/ui/selgame.cpp:1576
+#: src/emu/ui/selgame.cpp:1577 src/emu/ui/selgame.cpp:1578
+#: src/emu/ui/selgame.cpp:1579 src/emu/ui/selgame.cpp:1580
+#: src/emu/ui/selgame.cpp:1581 src/emu/ui/selgame.cpp:1582
+#: src/emu/ui/selgame.cpp:1591
 msgid "No"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:161 src/emu/ui/selgame.cpp:1568
-#: src/emu/ui/selgame.cpp:1569 src/emu/ui/selgame.cpp:1570
-#: src/emu/ui/selgame.cpp:1571 src/emu/ui/selgame.cpp:1572
-#: src/emu/ui/selgame.cpp:1573 src/emu/ui/selgame.cpp:1574
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/filesel.cpp:164 src/emu/ui/selgame.cpp:1576
+#: src/emu/ui/selgame.cpp:1577 src/emu/ui/selgame.cpp:1578
+#: src/emu/ui/selgame.cpp:1579 src/emu/ui/selgame.cpp:1580
+#: src/emu/ui/selgame.cpp:1581 src/emu/ui/selgame.cpp:1582
+#: src/emu/ui/selgame.cpp:1591
 msgid "Yes"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:272
+#: src/emu/ui/filesel.cpp:275
 msgid "New Image Name:"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:278
+#: src/emu/ui/filesel.cpp:281
 msgid "Image Format:"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:284
+#: src/emu/ui/filesel.cpp:287
 msgid "Create"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:315
+#: src/emu/ui/filesel.cpp:318
 msgid "Please enter a file extension too"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:503 src/emu/ui/swlist.cpp:65
+#: src/emu/ui/filesel.cpp:506 src/emu/ui/swlist.cpp:65
 msgid "[empty slot]"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:507
+#: src/emu/ui/filesel.cpp:510
 msgid "[create]"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:511 src/emu/ui/swlist.cpp:76
+#: src/emu/ui/filesel.cpp:514 src/emu/ui/swlist.cpp:76
 msgid "[software list]"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:803
+#: src/emu/ui/filesel.cpp:806
 msgid "Select image format"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:863
+#: src/emu/ui/filesel.cpp:866
 msgid "Select access mode"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:864
+#: src/emu/ui/filesel.cpp:867
 msgid "Read-only"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:866
+#: src/emu/ui/filesel.cpp:869
 msgid "Read-write"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:867
+#: src/emu/ui/filesel.cpp:870
 msgid "Read this image, write to another image"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:868
+#: src/emu/ui/filesel.cpp:871
 msgid "Read this image, write to diff"
 msgstr ""
 
@@ -651,7 +651,7 @@ msgstr ""
 msgid "[empty]"
 msgstr ""
 
-#: src/emu/ui/info_pty.cpp:26 src/emu/ui/mainmenu.cpp:91
+#: src/emu/ui/info_pty.cpp:26 src/emu/ui/mainmenu.cpp:96
 msgid "Pseudo terminals"
 msgstr ""
 
@@ -667,7 +667,7 @@ msgstr ""
 msgid "Other Controls"
 msgstr ""
 
-#: src/emu/ui/inputmap.cpp:622 src/emu/ui/miscmenu.cpp:91
+#: src/emu/ui/inputmap.cpp:622 src/emu/ui/miscmenu.cpp:92
 #: src/emu/ui/slotopt.cpp:172
 msgid "Reset"
 msgstr ""
@@ -700,27 +700,27 @@ msgstr ""
 msgid "Machine Information"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:78
+#: src/emu/ui/mainmenu.cpp:80
 msgid "Image Information"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:81
+#: src/emu/ui/mainmenu.cpp:83
 msgid "File Manager"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:86
+#: src/emu/ui/mainmenu.cpp:92
 msgid "Tape Control"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:94
+#: src/emu/ui/mainmenu.cpp:99
 msgid "Bios Selection"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:100
+#: src/emu/ui/mainmenu.cpp:104
 msgid "Slot Devices"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:107
+#: src/emu/ui/mainmenu.cpp:109
 msgid "Barcode Reader"
 msgstr ""
 
@@ -728,43 +728,43 @@ msgstr ""
 msgid "Network Devices"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:119
+#: src/emu/ui/mainmenu.cpp:118
 msgid "Keyboard Mode"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:122
+#: src/emu/ui/mainmenu.cpp:121
 msgid "Slider Controls"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:125
+#: src/emu/ui/mainmenu.cpp:124
 msgid "Video Options"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:129
+#: src/emu/ui/mainmenu.cpp:128
 msgid "Crosshair Options"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:133
+#: src/emu/ui/mainmenu.cpp:132
 msgid "Cheat"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:136
+#: src/emu/ui/mainmenu.cpp:135
 msgid "Plugin Options"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:140
+#: src/emu/ui/mainmenu.cpp:139
 msgid "External DAT View"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:146
+#: src/emu/ui/mainmenu.cpp:145 src/emu/ui/miscmenu.cpp:785
 msgid "Add To Favorites"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:148
+#: src/emu/ui/mainmenu.cpp:147 src/emu/ui/miscmenu.cpp:787
 msgid "Remove From Favorites"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:155
+#: src/emu/ui/mainmenu.cpp:154
 msgid "Select New Machine"
 msgstr ""
 
@@ -804,189 +804,205 @@ msgstr ""
 msgid "Return to Previous Menu"
 msgstr ""
 
-#: src/emu/ui/menu.cpp:716
+#: src/emu/ui/menu.cpp:761
 msgid "Auto"
 msgstr ""
 
-#: src/emu/ui/menu.cpp:2133
+#: src/emu/ui/menu.cpp:2195
 msgid "Images"
 msgstr ""
 
-#: src/emu/ui/menu.cpp:2134
+#: src/emu/ui/menu.cpp:2196
 msgid "Infos"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Keyboard Mode:"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Natural"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Emulated"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:240
+#: src/emu/ui/miscmenu.cpp:241
 #, c-format
 msgid ""
 "Uptime: %1$d:%2$02d:%3$02d\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:242
+#: src/emu/ui/miscmenu.cpp:243
 #, c-format
 msgid ""
 "Uptime: %1$d:%2$02d\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:246
+#: src/emu/ui/miscmenu.cpp:247
 #, c-format
 msgid ""
 "Tickets dispensed: %1$d\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:257
+#: src/emu/ui/miscmenu.cpp:258
 msgid "Coin %1$c: NA%3$s\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:257
+#: src/emu/ui/miscmenu.cpp:258
 #, c-format
 msgid "Coin %1$c: %2$d%3$s\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:260
+#: src/emu/ui/miscmenu.cpp:261
 msgid " (locked)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:519
+#: src/emu/ui/miscmenu.cpp:520
 msgid "Visible Delay"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:617
+#: src/emu/ui/miscmenu.cpp:619
 #, c-format
 msgid "%s.xml saved under ui folder."
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:645
+#: src/emu/ui/miscmenu.cpp:647
 msgid "Name:             Description:\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:657
+#: src/emu/ui/miscmenu.cpp:659
 #, c-format
 msgid "%s.txt saved under ui folder."
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:675
-msgid "Export XML format (like -listxml)"
+#: src/emu/ui/miscmenu.cpp:677
+msgid "Export list in XML format (like -listxml)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:676
-msgid "Export TXT format (like -listfull)"
+#: src/emu/ui/miscmenu.cpp:678
+msgid "Export list in XML format (like -listxml, but exclude devices)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:734
-msgid "Dummy"
+#: src/emu/ui/miscmenu.cpp:679
+msgid "Export list in TXT format (like -listfull)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:736
-msgid "Save machine configuration"
-msgstr ""
-
-#: src/emu/ui/miscmenu.cpp:848 src/emu/ui/miscmenu.cpp:869
-#: src/emu/ui/selgame.cpp:594
-msgid "Plugins"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:218
-msgid "Filter"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:226
-msgid " ^!File"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:231
-msgid " ^!Category"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:254
-msgid "^!Setup custom filter"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:262
-msgid "Customize UI"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:263
-msgid "Configure Directories"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:266 src/emu/ui/sndmenu.cpp:151
-#: src/emu/ui/sndmenu.cpp:172
-msgid "Sound Options"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:269
-msgid "General Inputs"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:272
-msgid "Save Configuration"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:286 src/emu/ui/optsmenu.cpp:307
-msgid "Settings"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:327
-msgid "**Error saving ui.ini**"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:374
-#, c-format
-msgid "**Error saving %s.ini**"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:378
+#: src/emu/ui/miscmenu.cpp:729 src/emu/ui/optsmenu.cpp:376
 msgid ""
 "\n"
 "    Configuration saved    \n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/selector.cpp:166
+#: src/emu/ui/miscmenu.cpp:774
+msgid "Bios"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:776
+msgid "Driver"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:790
+msgid "Save machine configuration"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:806
+msgid "Configure machine:"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:868 src/emu/ui/selsoft.cpp:109
+msgid " (default)"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:953 src/emu/ui/miscmenu.cpp:973
+#: src/emu/ui/selgame.cpp:600
+msgid "Plugins"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:217
+msgid "Filter"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:225
+msgid " ^!File"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:230
+msgid " ^!Category"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:253
+msgid "^!Setup custom filter"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:261
+msgid "Customize UI"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:262
+msgid "Configure Directories"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:265 src/emu/ui/sndmenu.cpp:149
+#: src/emu/ui/sndmenu.cpp:169
+msgid "Sound Options"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:268
+msgid "General Inputs"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:271
+msgid "Save Configuration"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:285 src/emu/ui/optsmenu.cpp:305
+msgid "Settings"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:325
+msgid "**Error saving ui.ini**"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:372
+#, c-format
+msgid "**Error saving %s.ini**"
+msgstr ""
+
+#: src/emu/ui/selector.cpp:165
 msgid "Selection List - Search: "
 msgstr ""
 
-#: src/emu/ui/selector.cpp:196
+#: src/emu/ui/selector.cpp:194
 #, c-format
 msgid "Double click or press %1$s to select"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:39
+#: src/emu/ui/selgame.cpp:38
 msgid "General Info"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:374 src/emu/ui/selsoft.cpp:282
+#: src/emu/ui/selgame.cpp:380 src/emu/ui/selsoft.cpp:281
 #, c-format
 msgid ""
 "%s\n"
 " added to favorites list."
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:380 src/emu/ui/selgame.cpp:389
-#: src/emu/ui/selsoft.cpp:287
+#: src/emu/ui/selgame.cpp:386 src/emu/ui/selgame.cpp:395
+#: src/emu/ui/selsoft.cpp:286
 #, c-format
 msgid ""
 "%s\n"
 " removed from favorites list."
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:450
+#: src/emu/ui/selgame.cpp:457
 msgid ""
 "The selected machine is missing one or more required ROM or CHD images. "
 "Please select a different machine.\n"
@@ -994,275 +1010,275 @@ msgid ""
 "Press any key to continue."
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:589 src/emu/ui/simpleselgame.cpp:265
+#: src/emu/ui/selgame.cpp:595 src/emu/ui/simpleselgame.cpp:265
 msgid "Configure Options"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:752
+#: src/emu/ui/selgame.cpp:596
+msgid "Configure Machine"
+msgstr ""
+
+#: src/emu/ui/selgame.cpp:758
 #, c-format
 msgid "%1$s %2$s ( %3$d / %4$d machines (%5$d BIOS) )"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:762
+#: src/emu/ui/selgame.cpp:768
 #, c-format
 msgid "%1$s (%2$s - %3$s) - "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:769 src/emu/ui/selgame.cpp:775
+#: src/emu/ui/selgame.cpp:775 src/emu/ui/selgame.cpp:781
 #, c-format
 msgid "%1$s (%2$s) - "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:784
+#: src/emu/ui/selgame.cpp:790
 #, c-format
 msgid "%1$s Search: %2$s_"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:838
+#: src/emu/ui/selgame.cpp:844
 #, c-format
 msgid "Romset: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:841 src/emu/ui/selgame.cpp:890
-#: src/emu/ui/selsoft.cpp:751 src/emu/ui/selsoft.cpp:801
+#: src/emu/ui/selgame.cpp:847 src/emu/ui/selgame.cpp:896
+#: src/emu/ui/selsoft.cpp:750 src/emu/ui/selsoft.cpp:800
 #: src/emu/ui/simpleselgame.cpp:328
 #, c-format
 msgid "%1$s, %2$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:847 src/emu/ui/selsoft.cpp:757
+#: src/emu/ui/selgame.cpp:853 src/emu/ui/selsoft.cpp:756
 #, c-format
 msgid "Driver is clone of: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:849 src/emu/ui/selsoft.cpp:759
+#: src/emu/ui/selgame.cpp:855 src/emu/ui/selsoft.cpp:758
 msgid "Driver is parent"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:853 src/emu/ui/selsoft.cpp:763
+#: src/emu/ui/selgame.cpp:859 src/emu/ui/selsoft.cpp:762
 #: src/emu/ui/simpleselgame.cpp:335
 msgid "Overall: NOT WORKING"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:855 src/emu/ui/selsoft.cpp:765
+#: src/emu/ui/selgame.cpp:861 src/emu/ui/selsoft.cpp:764
 #: src/emu/ui/simpleselgame.cpp:337
 msgid "Overall: Unemulated Protection"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:857 src/emu/ui/selsoft.cpp:767
+#: src/emu/ui/selgame.cpp:863 src/emu/ui/selsoft.cpp:766
 #: src/emu/ui/simpleselgame.cpp:339
 msgid "Overall: Working"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:861 src/emu/ui/selsoft.cpp:771
+#: src/emu/ui/selgame.cpp:867 src/emu/ui/selsoft.cpp:770
 msgid "Graphics: Imperfect, "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:863 src/emu/ui/selsoft.cpp:773
+#: src/emu/ui/selgame.cpp:869 src/emu/ui/selsoft.cpp:772
 msgid "Graphics: OK, "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:866 src/emu/ui/selsoft.cpp:776
+#: src/emu/ui/selgame.cpp:872 src/emu/ui/selsoft.cpp:775
 msgid "Sound: Unimplemented"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:868 src/emu/ui/selsoft.cpp:778
+#: src/emu/ui/selgame.cpp:874 src/emu/ui/selsoft.cpp:777
 msgid "Sound: Imperfect"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:870 src/emu/ui/selsoft.cpp:780
+#: src/emu/ui/selgame.cpp:876 src/emu/ui/selsoft.cpp:779
 msgid "Sound: OK"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:887
+#: src/emu/ui/selgame.cpp:893
 #, c-format
 msgid "System: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:894 src/emu/ui/selsoft.cpp:805
+#: src/emu/ui/selgame.cpp:900 src/emu/ui/selsoft.cpp:804
 #, c-format
 msgid "Software is clone of: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:896 src/emu/ui/selsoft.cpp:807
+#: src/emu/ui/selgame.cpp:902 src/emu/ui/selsoft.cpp:806
 msgid "Software is parent"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:901 src/emu/ui/selsoft.cpp:812
+#: src/emu/ui/selgame.cpp:907 src/emu/ui/selsoft.cpp:811
 msgid "Supported: No"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:906 src/emu/ui/selsoft.cpp:817
+#: src/emu/ui/selgame.cpp:912 src/emu/ui/selsoft.cpp:816
 msgid "Supported: Partial"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:911 src/emu/ui/selsoft.cpp:822
+#: src/emu/ui/selgame.cpp:917 src/emu/ui/selsoft.cpp:821
 msgid "Supported: Yes"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:916 src/emu/ui/selsoft.cpp:827
+#: src/emu/ui/selgame.cpp:922 src/emu/ui/selsoft.cpp:826
 #, c-format
 msgid "romset: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:923
+#: src/emu/ui/selgame.cpp:929
 #, c-format
 msgid "%1$s %2$s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1535
+#: src/emu/ui/selgame.cpp:1543
 #, c-format
 msgid "Romset: %1$-.100s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1536
+#: src/emu/ui/selgame.cpp:1544
 #, c-format
 msgid "Year: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1537
+#: src/emu/ui/selgame.cpp:1545
 #, c-format
 msgid "Manufacturer: %1$-.100s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1541
+#: src/emu/ui/selgame.cpp:1549
 #, c-format
 msgid "Driver is Clone of: %1$-.100s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1543
+#: src/emu/ui/selgame.cpp:1551
 msgid "Driver is Parent\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1546
+#: src/emu/ui/selgame.cpp:1554
 msgid "Overall: NOT WORKING\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1548
+#: src/emu/ui/selgame.cpp:1556
 msgid "Overall: Unemulated Protection\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1550
+#: src/emu/ui/selgame.cpp:1558
 msgid "Overall: Working\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1553
+#: src/emu/ui/selgame.cpp:1561
 msgid "Graphics: Imperfect Colors\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1557
+#: src/emu/ui/selgame.cpp:1565
 msgid "Graphics: Imperfect\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1559
+#: src/emu/ui/selgame.cpp:1567
 msgid "Graphics: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1562
+#: src/emu/ui/selgame.cpp:1570
 msgid "Sound: Unimplemented\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1564
+#: src/emu/ui/selgame.cpp:1572
 msgid "Sound: Imperfect\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1566
+#: src/emu/ui/selgame.cpp:1574
 msgid "Sound: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1568
+#: src/emu/ui/selgame.cpp:1576
 #, c-format
 msgid "Driver is Skeleton: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1569
+#: src/emu/ui/selgame.cpp:1577
 #, c-format
 msgid "Game is Mechanical: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1570
+#: src/emu/ui/selgame.cpp:1578
 #, c-format
 msgid "Requires Artwork: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1571
+#: src/emu/ui/selgame.cpp:1579
 #, c-format
 msgid "Requires Clickable Artwork: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1572
+#: src/emu/ui/selgame.cpp:1580
 #, c-format
 msgid "Support Cocktail: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1573
+#: src/emu/ui/selgame.cpp:1581
 #, c-format
 msgid "Driver is Bios: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1574
+#: src/emu/ui/selgame.cpp:1582
 #, c-format
 msgid "Support Save: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 #, c-format
 msgid "Screen Orientation: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 msgid "Vertical"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 msgid "Horizontal"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/selgame.cpp:1591
 #, c-format
 msgid "Requires CHD: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1596
+#: src/emu/ui/selgame.cpp:1604
 msgid "Roms Audit Pass: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1598
+#: src/emu/ui/selgame.cpp:1606
 msgid "Roms Audit Pass: BAD\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1601
+#: src/emu/ui/selgame.cpp:1609
 msgid "Samples Audit Pass: None Needed\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1603
+#: src/emu/ui/selgame.cpp:1611
 msgid "Samples Audit Pass: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1605
+#: src/emu/ui/selgame.cpp:1613
 msgid "Samples Audit Pass: BAD\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1608
+#: src/emu/ui/selgame.cpp:1616
 msgid ""
 "Roms Audit Pass: Disabled\n"
 "Samples Audit Pass: Disabled\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:2049 src/emu/ui/selgame.cpp:2212
-#: src/emu/ui/selsoft.cpp:1662
+#: src/emu/ui/selgame.cpp:2055 src/emu/ui/selgame.cpp:2216
+#: src/emu/ui/selsoft.cpp:1655
 msgid "No Infos Available"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:2162 src/emu/ui/selsoft.cpp:1607
+#: src/emu/ui/selgame.cpp:2168 src/emu/ui/selsoft.cpp:1602
 msgid "Usage"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:110
-msgid " (default)"
-msgstr ""
-
-#: src/emu/ui/selsoft.cpp:381
+#: src/emu/ui/selsoft.cpp:380
 msgid ""
 "The selected software is missing one or more required files. Please select a "
 "different software.\n"
@@ -1270,57 +1286,57 @@ msgid ""
 "Press any key to continue."
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:684
+#: src/emu/ui/selsoft.cpp:683
 #, c-format
-msgid "%1$s %2$s ( %3$d / %4$d softwares )"
+msgid "%1$s %2$s ( %3$d / %4$d software packages )"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:685
+#: src/emu/ui/selsoft.cpp:684
 #, c-format
 msgid "Driver: \"%1$s\" software list "
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:688
+#: src/emu/ui/selsoft.cpp:687
 #, c-format
 msgid "Region: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:690
+#: src/emu/ui/selsoft.cpp:689
 #, c-format
 msgid "Publisher: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:692
+#: src/emu/ui/selsoft.cpp:691
 #, c-format
 msgid "Year: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:694
+#: src/emu/ui/selsoft.cpp:693
 #, c-format
 msgid "Software List: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:696
+#: src/emu/ui/selsoft.cpp:695
 #, c-format
 msgid "Device type: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:698
+#: src/emu/ui/selsoft.cpp:697
 #, c-format
 msgid "%s Search: %s_"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:748 src/emu/ui/selsoft.cpp:798
+#: src/emu/ui/selsoft.cpp:747 src/emu/ui/selsoft.cpp:797
 #: src/emu/ui/simpleselgame.cpp:325
 #, c-format
 msgid "%1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:1998 src/emu/ui/selsoft.cpp:2018
+#: src/emu/ui/selsoft.cpp:1991 src/emu/ui/selsoft.cpp:2011
 msgid "Software part selection:"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:2136 src/emu/ui/selsoft.cpp:2156
+#: src/emu/ui/selsoft.cpp:2129 src/emu/ui/selsoft.cpp:2149
 msgid "Bios selection:"
 msgstr ""
 
@@ -1368,15 +1384,15 @@ msgstr ""
 msgid " [internal]"
 msgstr ""
 
-#: src/emu/ui/sndmenu.cpp:135
+#: src/emu/ui/sndmenu.cpp:133
 msgid "Sound"
 msgstr ""
 
-#: src/emu/ui/sndmenu.cpp:136
+#: src/emu/ui/sndmenu.cpp:134
 msgid "Sample Rate"
 msgstr ""
 
-#: src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/sndmenu.cpp:135
 msgid "Use External Samples"
 msgstr ""
 
@@ -1445,80 +1461,80 @@ msgstr ""
 msgid "Fast Forward"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:419
+#: src/emu/ui/ui.cpp:418
 msgid "This driver requires images to be loaded in the following device(s): "
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1074
+#: src/emu/ui/ui.cpp:1071
 msgid ""
 "One or more ROMs/CHDs for this machine are incorrect. The machine may not "
 "run correctly.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1087
+#: src/emu/ui/ui.cpp:1084
 msgid ""
 "There are known problems with this machine\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1091
+#: src/emu/ui/ui.cpp:1088
 msgid ""
 "One or more ROMs/CHDs for this machine have not been correctly dumped.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1095
+#: src/emu/ui/ui.cpp:1092
 #, c-format
 msgid "The keyboard emulation may not be 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1097
+#: src/emu/ui/ui.cpp:1094
 #, c-format
 msgid "The colors aren't 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1099
+#: src/emu/ui/ui.cpp:1096
 msgid "The colors are completely wrong.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1101
+#: src/emu/ui/ui.cpp:1098
 #, c-format
 msgid "The video emulation isn't 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1103
+#: src/emu/ui/ui.cpp:1100
 #, c-format
 msgid "The sound emulation isn't 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1105
+#: src/emu/ui/ui.cpp:1102
 msgid "The machine lacks sound.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1108
+#: src/emu/ui/ui.cpp:1105
 msgid "Screen flipping in cocktail mode is not supported.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1112
+#: src/emu/ui/ui.cpp:1109
 msgid "The machine requires external artwork files\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1117
+#: src/emu/ui/ui.cpp:1114
 msgid ""
 "This machine was never completed. It may exhibit strange behavior or missing "
 "elements that are not bugs in the emulation.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1122
+#: src/emu/ui/ui.cpp:1119
 msgid ""
 "This machine has no sound hardware, MAME will produce no sounds, this is "
 "expected behaviour.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1130
+#: src/emu/ui/ui.cpp:1127
 msgid "The machine has protection which isn't fully emulated.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1133
+#: src/emu/ui/ui.cpp:1130
 msgid ""
 "\n"
 "THIS MACHINE DOESN'T WORK. The emulation for this machine is not yet "
@@ -1526,7 +1542,7 @@ msgid ""
 "the developers to improve the emulation.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1137
+#: src/emu/ui/ui.cpp:1134
 msgid ""
 "\n"
 "Certain elements of this machine cannot be emulated as it requires actual "
@@ -1534,21 +1550,21 @@ msgid ""
 "to fully play this machine.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1156
+#: src/emu/ui/ui.cpp:1153
 msgid ""
 "\n"
 "\n"
 "There are working clones of this machine: "
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1170
+#: src/emu/ui/ui.cpp:1167
 msgid ""
 "\n"
 "\n"
 "Press any key to continue"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1185
+#: src/emu/ui/ui.cpp:1182
 #, c-format
 msgid ""
 "%1$s\n"
@@ -1558,98 +1574,98 @@ msgid ""
 "CPU:\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1221 src/emu/ui/ui.cpp:1260
+#: src/emu/ui/ui.cpp:1218 src/emu/ui/ui.cpp:1257
 msgid "MHz"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1221 src/emu/ui/ui.cpp:1260
+#: src/emu/ui/ui.cpp:1218 src/emu/ui/ui.cpp:1257
 msgid "kHz"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1235
+#: src/emu/ui/ui.cpp:1232
 msgid ""
 "\n"
 "Sound:\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1264
+#: src/emu/ui/ui.cpp:1261
 msgid ""
 "\n"
 "Video:\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1268
+#: src/emu/ui/ui.cpp:1265
 msgid "None\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1275
+#: src/emu/ui/ui.cpp:1272
 msgid "Vector"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1286
+#: src/emu/ui/ui.cpp:1283
 #, c-format
 msgid "%1$s: %2$s\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1286
+#: src/emu/ui/ui.cpp:1283
 msgid "%2$s\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1541 src/emu/ui/ui.cpp:1551
+#: src/emu/ui/ui.cpp:1538 src/emu/ui/ui.cpp:1548
 msgid "Keyboard Emulation Status"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1543
+#: src/emu/ui/ui.cpp:1540
 msgid "Mode: PARTIAL Emulation"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1544
+#: src/emu/ui/ui.cpp:1541
 msgid "UI:   Enabled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1546 src/emu/ui/ui.cpp:1556
+#: src/emu/ui/ui.cpp:1543 src/emu/ui/ui.cpp:1553
 msgid "**Use ScrLock to toggle**"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1553
+#: src/emu/ui/ui.cpp:1550
 msgid "Mode: FULL Emulation"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1554
+#: src/emu/ui/ui.cpp:1551
 msgid "UI:   Disabled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1692
+#: src/emu/ui/ui.cpp:1689
 msgid "Autofire can't be enabled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1731
+#: src/emu/ui/ui.cpp:1728
 msgid "Select position to save to"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1733
+#: src/emu/ui/ui.cpp:1730
 msgid "Select position to load from"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1757
+#: src/emu/ui/ui.cpp:1754
 msgid "Save cancelled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1759
+#: src/emu/ui/ui.cpp:1756
 msgid "Load cancelled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1802
+#: src/emu/ui/ui.cpp:1799
 #, c-format
 msgid "Save to position %s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1807
+#: src/emu/ui/ui.cpp:1804
 #, c-format
 msgid "Load from position %s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1847
+#: src/emu/ui/ui.cpp:1844
 #, c-format
 msgid ""
 "Are you sure you want to quit?\n"
@@ -1658,173 +1674,173 @@ msgid ""
 "Press ''%2$s'' to return to emulation."
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1917
+#: src/emu/ui/ui.cpp:1914
 msgid "Master Volume"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1926
+#: src/emu/ui/ui.cpp:1923
 #, c-format
 msgid "%1$s Volume"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1949
+#: src/emu/ui/ui.cpp:1946
 #, c-format
 msgid "Overclock CPU %1$s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1968
+#: src/emu/ui/ui.cpp:1965
 #, c-format
 msgid "%1$s Refresh Rate"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1973
+#: src/emu/ui/ui.cpp:1970
 #, c-format
 msgid "%1$s Brightness"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1975
+#: src/emu/ui/ui.cpp:1972
 #, c-format
 msgid "%1$s Contrast"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1977
+#: src/emu/ui/ui.cpp:1974
 #, c-format
 msgid "%1$s Gamma"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1981
+#: src/emu/ui/ui.cpp:1978
 #, c-format
 msgid "%1$s Horiz Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1983
+#: src/emu/ui/ui.cpp:1980
 #, c-format
 msgid "%1$s Horiz Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1985
+#: src/emu/ui/ui.cpp:1982
 #, c-format
 msgid "%1$s Vert Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1987
+#: src/emu/ui/ui.cpp:1984
 #, c-format
 msgid "%1$s Vert Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2005
+#: src/emu/ui/ui.cpp:2002
 #, c-format
 msgid "Laserdisc '%1$s' Horiz Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2007
+#: src/emu/ui/ui.cpp:2004
 #, c-format
 msgid "Laserdisc '%1$s' Horiz Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2009
+#: src/emu/ui/ui.cpp:2006
 #, c-format
 msgid "Laserdisc '%1$s' Vert Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2011
+#: src/emu/ui/ui.cpp:2008
 #, c-format
 msgid "Laserdisc '%1$s' Vert Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2021
+#: src/emu/ui/ui.cpp:2018
 msgid "Vector Flicker"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2022
+#: src/emu/ui/ui.cpp:2019
 msgid "Beam Width Minimum"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2023
+#: src/emu/ui/ui.cpp:2020
 msgid "Beam Width Maximum"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2024
+#: src/emu/ui/ui.cpp:2021
 msgid "Beam Intensity Weight"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2037
+#: src/emu/ui/ui.cpp:2034
 #, c-format
 msgid "Crosshair Scale %1$s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2037 src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2034 src/emu/ui/ui.cpp:2036
 msgid "X"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2037 src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2034 src/emu/ui/ui.cpp:2036
 msgid "Y"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2036
 #, c-format
 msgid "Crosshair Offset %1$s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2071
+#: src/emu/ui/ui.cpp:2068
 #, c-format
 msgid "%1$3ddB"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2115
+#: src/emu/ui/ui.cpp:2112
 #, c-format
 msgid "%1$d%%"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2131
+#: src/emu/ui/ui.cpp:2128
 #, c-format
 msgid "%1$3.0f%%"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2154
+#: src/emu/ui/ui.cpp:2151
 #, c-format
 msgid "%1$.3ffps"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2177 src/emu/ui/ui.cpp:2199 src/emu/ui/ui.cpp:2220
-#: src/emu/ui/ui.cpp:2242 src/emu/ui/ui.cpp:2264 src/emu/ui/ui.cpp:2286
-#: src/emu/ui/ui.cpp:2308 src/emu/ui/ui.cpp:2330 src/emu/ui/ui.cpp:2352
-#: src/emu/ui/ui.cpp:2374 src/emu/ui/ui.cpp:2396
+#: src/emu/ui/ui.cpp:2174 src/emu/ui/ui.cpp:2196 src/emu/ui/ui.cpp:2217
+#: src/emu/ui/ui.cpp:2239 src/emu/ui/ui.cpp:2261 src/emu/ui/ui.cpp:2283
+#: src/emu/ui/ui.cpp:2305 src/emu/ui/ui.cpp:2327 src/emu/ui/ui.cpp:2349
+#: src/emu/ui/ui.cpp:2371 src/emu/ui/ui.cpp:2393
 #, c-format
 msgid "%1$.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2412 src/emu/ui/ui.cpp:2428 src/emu/ui/ui.cpp:2444
-#: src/emu/ui/ui.cpp:2460
+#: src/emu/ui/ui.cpp:2408 src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2438
+#: src/emu/ui/ui.cpp:2453
 #, c-format
 msgid "%1$1.2f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2476
+#: src/emu/ui/ui.cpp:2469
 #, c-format
 msgid "Screen '%1$s'"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2478
+#: src/emu/ui/ui.cpp:2471
 msgid "Screen"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2494
+#: src/emu/ui/ui.cpp:2487
 #, c-format
 msgid "Crosshair Scale X %1$1.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2494
+#: src/emu/ui/ui.cpp:2487
 #, c-format
 msgid "Crosshair Scale Y %1$1.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2513
+#: src/emu/ui/ui.cpp:2506
 #, c-format
 msgid "Crosshair Offset X %1$1.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2513
+#: src/emu/ui/ui.cpp:2506
 #, c-format
 msgid "Crosshair Offset Y %1$1.3f"
 msgstr ""
@@ -1866,10 +1882,10 @@ msgstr ""
 msgid "Full"
 msgstr ""
 
-#: src/emu/ui/viewgfx.cpp:392
+#: src/emu/ui/viewgfx.cpp:391
 msgid " COLORS"
 msgstr ""
 
-#: src/emu/ui/viewgfx.cpp:392
+#: src/emu/ui/viewgfx.cpp:391
 msgid " PENS"
 msgstr ""
diff --git a/language/Bosnian/strings.po b/language/Bosnian/strings.po
index 1fa98e3f77e..ece142c28a3 100644
--- a/language/Bosnian/strings.po
+++ b/language/Bosnian/strings.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MAME\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-11 03:33+0200\n"
+"POT-Creation-Date: 2016-04-15 17:42+0200\n"
 "PO-Revision-Date: 2016-02-20 18:03+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: MAME Language Team\n"
@@ -59,14 +59,14 @@ msgstr ""
 msgid "Autofire Status"
 msgstr ""
 
-#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1698
+#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1695
 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211
 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219
 #: src/emu/ui/videoopt.cpp:223
 msgid "Disabled"
 msgstr ""
 
-#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1698
+#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1695
 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211
 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219
 #: src/emu/ui/videoopt.cpp:223
@@ -74,14 +74,14 @@ msgid "Enabled"
 msgstr ""
 
 #: src/emu/ui/cheatopt.cpp:282 src/emu/ui/cheatopt.cpp:288
-#: src/emu/ui/menu.cpp:710 src/emu/ui/miscmenu.cpp:831
-#: src/emu/ui/sndmenu.cpp:135 src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/menu.cpp:755 src/emu/ui/miscmenu.cpp:936
+#: src/emu/ui/sndmenu.cpp:133 src/emu/ui/sndmenu.cpp:135
 msgid "On"
 msgstr ""
 
 #: src/emu/ui/cheatopt.cpp:282 src/emu/ui/cheatopt.cpp:288
-#: src/emu/ui/menu.cpp:713 src/emu/ui/miscmenu.cpp:831
-#: src/emu/ui/sndmenu.cpp:135 src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/menu.cpp:758 src/emu/ui/miscmenu.cpp:936
+#: src/emu/ui/sndmenu.cpp:133 src/emu/ui/sndmenu.cpp:135
 msgid "Off"
 msgstr ""
 
@@ -93,316 +93,316 @@ msgstr ""
 msgid "Autofire Delay"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:158 src/emu/ui/custmenu.cpp:447
+#: src/emu/ui/custmenu.cpp:157 src/emu/ui/custmenu.cpp:445
 msgid "Main filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:167 src/emu/ui/custmenu.cpp:456
+#: src/emu/ui/custmenu.cpp:166 src/emu/ui/custmenu.cpp:454
 msgid "Other filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:176 src/emu/ui/optsmenu.cpp:239
+#: src/emu/ui/custmenu.cpp:175 src/emu/ui/optsmenu.cpp:238
 msgid "^!Manufacturer"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:185 src/emu/ui/custmenu.cpp:474
-#: src/emu/ui/optsmenu.cpp:247
+#: src/emu/ui/custmenu.cpp:184 src/emu/ui/custmenu.cpp:472
+#: src/emu/ui/optsmenu.cpp:246
 msgid "^!Year"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:194 src/emu/ui/custmenu.cpp:510
+#: src/emu/ui/custmenu.cpp:193 src/emu/ui/custmenu.cpp:508
 msgid "Remove last filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:197 src/emu/ui/custmenu.cpp:513
+#: src/emu/ui/custmenu.cpp:196 src/emu/ui/custmenu.cpp:511
 msgid "Add filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:212 src/emu/ui/custmenu.cpp:233
-#: src/emu/ui/custmenu.cpp:529 src/emu/ui/custmenu.cpp:550
+#: src/emu/ui/custmenu.cpp:211 src/emu/ui/custmenu.cpp:231
+#: src/emu/ui/custmenu.cpp:527 src/emu/ui/custmenu.cpp:547
 msgid "Select custom filters:"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:465
+#: src/emu/ui/custmenu.cpp:463
 msgid "^!Publisher"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:483
+#: src/emu/ui/custmenu.cpp:481
 msgid "^!Software List"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:492
+#: src/emu/ui/custmenu.cpp:490
 msgid "^!Device type"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:501
+#: src/emu/ui/custmenu.cpp:499
 msgid "^!Region"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:23
+#: src/emu/ui/custui.cpp:22
 msgid "Show All"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:24
+#: src/emu/ui/custui.cpp:23
 msgid "Hide Filters"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:25
+#: src/emu/ui/custui.cpp:24
 msgid "Hide Info/Image"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:26
+#: src/emu/ui/custui.cpp:25
 msgid "Hide Both"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:142
+#: src/emu/ui/custui.cpp:141
 msgid "Fonts"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:143
+#: src/emu/ui/custui.cpp:142
 msgid "Colors"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:148 src/emu/ui/dirmenu.cpp:33
+#: src/emu/ui/custui.cpp:147 src/emu/ui/dirmenu.cpp:33
 msgid "Language"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:152
+#: src/emu/ui/custui.cpp:151
 msgid "Show side panels"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:167 src/emu/ui/custui.cpp:188
+#: src/emu/ui/custui.cpp:166 src/emu/ui/custui.cpp:186
 msgid "Custom UI Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:246
+#: src/emu/ui/custui.cpp:244
 msgid "default"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:349
+#: src/emu/ui/custui.cpp:347
 msgid "UI Font"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:354
+#: src/emu/ui/custui.cpp:352
 msgid "Bold"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:355
+#: src/emu/ui/custui.cpp:353
 msgid "Italic"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:360
+#: src/emu/ui/custui.cpp:358
 msgid "Lines"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:366
+#: src/emu/ui/custui.cpp:364
 msgid "Infos text size"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:383
+#: src/emu/ui/custui.cpp:381
 msgid "UI Fonts Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:411
+#: src/emu/ui/custui.cpp:408
 msgid "Sample text - Lorem ipsum dolor sit amet, consectetur adipiscing elit."
 msgstr ""
 
-#: src/emu/ui/custui.cpp:509
+#: src/emu/ui/custui.cpp:506
 msgid "Normal text"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:510
+#: src/emu/ui/custui.cpp:507
 msgid "Selected color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:511
+#: src/emu/ui/custui.cpp:508
 msgid "Normal text background"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:512
+#: src/emu/ui/custui.cpp:509
 msgid "Selected background color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:513
+#: src/emu/ui/custui.cpp:510
 msgid "Subitem color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:514 src/emu/ui/custui.cpp:610
+#: src/emu/ui/custui.cpp:511 src/emu/ui/custui.cpp:606
 msgid "Clone"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:515
+#: src/emu/ui/custui.cpp:512
 msgid "Border"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:516
+#: src/emu/ui/custui.cpp:513
 msgid "Background"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:517
+#: src/emu/ui/custui.cpp:514
 msgid "Dipswitch"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:518
+#: src/emu/ui/custui.cpp:515
 msgid "Unavailable color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:519
+#: src/emu/ui/custui.cpp:516
 msgid "Slider color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:520
+#: src/emu/ui/custui.cpp:517
 msgid "Gfx viewer background"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:521
+#: src/emu/ui/custui.cpp:518
 msgid "Mouse over color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:522
+#: src/emu/ui/custui.cpp:519
 msgid "Mouse over background color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:523
+#: src/emu/ui/custui.cpp:520
 msgid "Mouse down color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:524
+#: src/emu/ui/custui.cpp:521
 msgid "Mouse down background color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:527
+#: src/emu/ui/custui.cpp:524
 msgid "Restore originals colors"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:543
+#: src/emu/ui/custui.cpp:540
 msgid "UI Colors Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:572
+#: src/emu/ui/custui.cpp:568
 #, c-format
 msgid "Double click or press %1$s to change the color value"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:598
+#: src/emu/ui/custui.cpp:594
 msgid "Menu Preview"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:606
+#: src/emu/ui/custui.cpp:602
 msgid "Normal"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:607
+#: src/emu/ui/custui.cpp:603
 msgid "Subitem"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:608
+#: src/emu/ui/custui.cpp:604
 msgid "Selected"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:609
+#: src/emu/ui/custui.cpp:605
 msgid "Mouse Over"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:841 src/emu/ui/custui.cpp:844
+#: src/emu/ui/custui.cpp:837 src/emu/ui/custui.cpp:840
 msgid "Alpha"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:849 src/emu/ui/custui.cpp:852
-#: src/emu/ui/custui.cpp:1013
+#: src/emu/ui/custui.cpp:845 src/emu/ui/custui.cpp:848
+#: src/emu/ui/custui.cpp:1007
 msgid "Red"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:857 src/emu/ui/custui.cpp:860
-#: src/emu/ui/custui.cpp:1016
+#: src/emu/ui/custui.cpp:853 src/emu/ui/custui.cpp:856
+#: src/emu/ui/custui.cpp:1010
 msgid "Green"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:865 src/emu/ui/custui.cpp:868
-#: src/emu/ui/custui.cpp:1017
+#: src/emu/ui/custui.cpp:861 src/emu/ui/custui.cpp:864
+#: src/emu/ui/custui.cpp:1011
 msgid "Blue"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:871
+#: src/emu/ui/custui.cpp:867
 msgid "Choose from palette"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:887
+#: src/emu/ui/custui.cpp:883
 msgid " - ARGB Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:912
+#: src/emu/ui/custui.cpp:907
 msgid "Color preview ="
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1009
+#: src/emu/ui/custui.cpp:1003
 msgid "White"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1010
+#: src/emu/ui/custui.cpp:1004
 msgid "Silver"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1011
+#: src/emu/ui/custui.cpp:1005
 msgid "Gray"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1012
+#: src/emu/ui/custui.cpp:1006
 msgid "Black"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1014
+#: src/emu/ui/custui.cpp:1008
 msgid "Orange"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1015
+#: src/emu/ui/custui.cpp:1009
 msgid "Yellow"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1018
+#: src/emu/ui/custui.cpp:1012
 msgid "Violet"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:65
+#: src/emu/ui/datmenu.cpp:64
 msgid "Software History"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:67
+#: src/emu/ui/datmenu.cpp:66
 msgid "Software Usage"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:199
+#: src/emu/ui/datmenu.cpp:196
 msgid "Revision: "
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:287 src/emu/ui/selgame.cpp:40
-#: src/emu/ui/selgame.cpp:2152 src/emu/ui/selgame.cpp:2161
-#: src/emu/ui/selsoft.cpp:1577 src/emu/ui/selsoft.cpp:1597
-#: src/emu/ui/selsoft.cpp:1606
+#: src/emu/ui/datmenu.cpp:284 src/emu/ui/selgame.cpp:39
+#: src/emu/ui/selgame.cpp:2158 src/emu/ui/selgame.cpp:2167
+#: src/emu/ui/selsoft.cpp:1574 src/emu/ui/selsoft.cpp:1592
+#: src/emu/ui/selsoft.cpp:1601
 msgid "History"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:289 src/emu/ui/selgame.cpp:41
+#: src/emu/ui/datmenu.cpp:286 src/emu/ui/selgame.cpp:40
 msgid "Mameinfo"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:291 src/emu/ui/selgame.cpp:43
+#: src/emu/ui/datmenu.cpp:288 src/emu/ui/selgame.cpp:42
 msgid "Messinfo"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:293 src/emu/ui/selgame.cpp:42
+#: src/emu/ui/datmenu.cpp:290 src/emu/ui/selgame.cpp:41
 msgid "Sysinfo"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:295 src/emu/ui/selgame.cpp:46
+#: src/emu/ui/datmenu.cpp:292 src/emu/ui/selgame.cpp:45
 msgid "Mamescore"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:297 src/emu/ui/selgame.cpp:45
+#: src/emu/ui/datmenu.cpp:294 src/emu/ui/selgame.cpp:44
 msgid "Gameinit"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:299 src/emu/ui/selgame.cpp:44
+#: src/emu/ui/datmenu.cpp:296 src/emu/ui/selgame.cpp:43
 msgid "Command"
 msgstr ""
 
@@ -554,75 +554,75 @@ msgstr ""
 msgid "Remove %1$s Folder"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:158
+#: src/emu/ui/filesel.cpp:161
 msgid "File Already Exists - Override?"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:160 src/emu/ui/selgame.cpp:1568
-#: src/emu/ui/selgame.cpp:1569 src/emu/ui/selgame.cpp:1570
-#: src/emu/ui/selgame.cpp:1571 src/emu/ui/selgame.cpp:1572
-#: src/emu/ui/selgame.cpp:1573 src/emu/ui/selgame.cpp:1574
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/filesel.cpp:163 src/emu/ui/selgame.cpp:1576
+#: src/emu/ui/selgame.cpp:1577 src/emu/ui/selgame.cpp:1578
+#: src/emu/ui/selgame.cpp:1579 src/emu/ui/selgame.cpp:1580
+#: src/emu/ui/selgame.cpp:1581 src/emu/ui/selgame.cpp:1582
+#: src/emu/ui/selgame.cpp:1591
 msgid "No"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:161 src/emu/ui/selgame.cpp:1568
-#: src/emu/ui/selgame.cpp:1569 src/emu/ui/selgame.cpp:1570
-#: src/emu/ui/selgame.cpp:1571 src/emu/ui/selgame.cpp:1572
-#: src/emu/ui/selgame.cpp:1573 src/emu/ui/selgame.cpp:1574
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/filesel.cpp:164 src/emu/ui/selgame.cpp:1576
+#: src/emu/ui/selgame.cpp:1577 src/emu/ui/selgame.cpp:1578
+#: src/emu/ui/selgame.cpp:1579 src/emu/ui/selgame.cpp:1580
+#: src/emu/ui/selgame.cpp:1581 src/emu/ui/selgame.cpp:1582
+#: src/emu/ui/selgame.cpp:1591
 msgid "Yes"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:272
+#: src/emu/ui/filesel.cpp:275
 msgid "New Image Name:"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:278
+#: src/emu/ui/filesel.cpp:281
 msgid "Image Format:"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:284
+#: src/emu/ui/filesel.cpp:287
 msgid "Create"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:315
+#: src/emu/ui/filesel.cpp:318
 msgid "Please enter a file extension too"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:503 src/emu/ui/swlist.cpp:65
+#: src/emu/ui/filesel.cpp:506 src/emu/ui/swlist.cpp:65
 msgid "[empty slot]"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:507
+#: src/emu/ui/filesel.cpp:510
 msgid "[create]"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:511 src/emu/ui/swlist.cpp:76
+#: src/emu/ui/filesel.cpp:514 src/emu/ui/swlist.cpp:76
 msgid "[software list]"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:803
+#: src/emu/ui/filesel.cpp:806
 msgid "Select image format"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:863
+#: src/emu/ui/filesel.cpp:866
 msgid "Select access mode"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:864
+#: src/emu/ui/filesel.cpp:867
 msgid "Read-only"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:866
+#: src/emu/ui/filesel.cpp:869
 msgid "Read-write"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:867
+#: src/emu/ui/filesel.cpp:870
 msgid "Read this image, write to another image"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:868
+#: src/emu/ui/filesel.cpp:871
 msgid "Read this image, write to diff"
 msgstr ""
 
@@ -648,7 +648,7 @@ msgstr ""
 msgid "[empty]"
 msgstr ""
 
-#: src/emu/ui/info_pty.cpp:26 src/emu/ui/mainmenu.cpp:91
+#: src/emu/ui/info_pty.cpp:26 src/emu/ui/mainmenu.cpp:96
 msgid "Pseudo terminals"
 msgstr ""
 
@@ -664,7 +664,7 @@ msgstr ""
 msgid "Other Controls"
 msgstr ""
 
-#: src/emu/ui/inputmap.cpp:622 src/emu/ui/miscmenu.cpp:91
+#: src/emu/ui/inputmap.cpp:622 src/emu/ui/miscmenu.cpp:92
 #: src/emu/ui/slotopt.cpp:172
 msgid "Reset"
 msgstr ""
@@ -697,27 +697,27 @@ msgstr ""
 msgid "Machine Information"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:78
+#: src/emu/ui/mainmenu.cpp:80
 msgid "Image Information"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:81
+#: src/emu/ui/mainmenu.cpp:83
 msgid "File Manager"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:86
+#: src/emu/ui/mainmenu.cpp:92
 msgid "Tape Control"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:94
+#: src/emu/ui/mainmenu.cpp:99
 msgid "Bios Selection"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:100
+#: src/emu/ui/mainmenu.cpp:104
 msgid "Slot Devices"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:107
+#: src/emu/ui/mainmenu.cpp:109
 msgid "Barcode Reader"
 msgstr ""
 
@@ -725,43 +725,43 @@ msgstr ""
 msgid "Network Devices"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:119
+#: src/emu/ui/mainmenu.cpp:118
 msgid "Keyboard Mode"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:122
+#: src/emu/ui/mainmenu.cpp:121
 msgid "Slider Controls"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:125
+#: src/emu/ui/mainmenu.cpp:124
 msgid "Video Options"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:129
+#: src/emu/ui/mainmenu.cpp:128
 msgid "Crosshair Options"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:133
+#: src/emu/ui/mainmenu.cpp:132
 msgid "Cheat"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:136
+#: src/emu/ui/mainmenu.cpp:135
 msgid "Plugin Options"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:140
+#: src/emu/ui/mainmenu.cpp:139
 msgid "External DAT View"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:146
+#: src/emu/ui/mainmenu.cpp:145 src/emu/ui/miscmenu.cpp:785
 msgid "Add To Favorites"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:148
+#: src/emu/ui/mainmenu.cpp:147 src/emu/ui/miscmenu.cpp:787
 msgid "Remove From Favorites"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:155
+#: src/emu/ui/mainmenu.cpp:154
 msgid "Select New Machine"
 msgstr ""
 
@@ -801,189 +801,205 @@ msgstr ""
 msgid "Return to Previous Menu"
 msgstr ""
 
-#: src/emu/ui/menu.cpp:716
+#: src/emu/ui/menu.cpp:761
 msgid "Auto"
 msgstr ""
 
-#: src/emu/ui/menu.cpp:2133
+#: src/emu/ui/menu.cpp:2195
 msgid "Images"
 msgstr ""
 
-#: src/emu/ui/menu.cpp:2134
+#: src/emu/ui/menu.cpp:2196
 msgid "Infos"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Keyboard Mode:"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Natural"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Emulated"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:240
+#: src/emu/ui/miscmenu.cpp:241
 #, c-format
 msgid ""
 "Uptime: %1$d:%2$02d:%3$02d\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:242
+#: src/emu/ui/miscmenu.cpp:243
 #, c-format
 msgid ""
 "Uptime: %1$d:%2$02d\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:246
+#: src/emu/ui/miscmenu.cpp:247
 #, c-format
 msgid ""
 "Tickets dispensed: %1$d\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:257
+#: src/emu/ui/miscmenu.cpp:258
 msgid "Coin %1$c: NA%3$s\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:257
+#: src/emu/ui/miscmenu.cpp:258
 #, c-format
 msgid "Coin %1$c: %2$d%3$s\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:260
+#: src/emu/ui/miscmenu.cpp:261
 msgid " (locked)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:519
+#: src/emu/ui/miscmenu.cpp:520
 msgid "Visible Delay"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:617
+#: src/emu/ui/miscmenu.cpp:619
 #, c-format
 msgid "%s.xml saved under ui folder."
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:645
+#: src/emu/ui/miscmenu.cpp:647
 msgid "Name:             Description:\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:657
+#: src/emu/ui/miscmenu.cpp:659
 #, c-format
 msgid "%s.txt saved under ui folder."
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:675
-msgid "Export XML format (like -listxml)"
+#: src/emu/ui/miscmenu.cpp:677
+msgid "Export list in XML format (like -listxml)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:676
-msgid "Export TXT format (like -listfull)"
+#: src/emu/ui/miscmenu.cpp:678
+msgid "Export list in XML format (like -listxml, but exclude devices)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:734
-msgid "Dummy"
+#: src/emu/ui/miscmenu.cpp:679
+msgid "Export list in TXT format (like -listfull)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:736
-msgid "Save machine configuration"
-msgstr ""
-
-#: src/emu/ui/miscmenu.cpp:848 src/emu/ui/miscmenu.cpp:869
-#: src/emu/ui/selgame.cpp:594
-msgid "Plugins"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:218
-msgid "Filter"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:226
-msgid " ^!File"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:231
-msgid " ^!Category"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:254
-msgid "^!Setup custom filter"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:262
-msgid "Customize UI"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:263
-msgid "Configure Directories"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:266 src/emu/ui/sndmenu.cpp:151
-#: src/emu/ui/sndmenu.cpp:172
-msgid "Sound Options"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:269
-msgid "General Inputs"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:272
-msgid "Save Configuration"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:286 src/emu/ui/optsmenu.cpp:307
-msgid "Settings"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:327
-msgid "**Error saving ui.ini**"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:374
-#, c-format
-msgid "**Error saving %s.ini**"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:378
+#: src/emu/ui/miscmenu.cpp:729 src/emu/ui/optsmenu.cpp:376
 msgid ""
 "\n"
 "    Configuration saved    \n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/selector.cpp:166
+#: src/emu/ui/miscmenu.cpp:774
+msgid "Bios"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:776
+msgid "Driver"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:790
+msgid "Save machine configuration"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:806
+msgid "Configure machine:"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:868 src/emu/ui/selsoft.cpp:109
+msgid " (default)"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:953 src/emu/ui/miscmenu.cpp:973
+#: src/emu/ui/selgame.cpp:600
+msgid "Plugins"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:217
+msgid "Filter"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:225
+msgid " ^!File"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:230
+msgid " ^!Category"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:253
+msgid "^!Setup custom filter"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:261
+msgid "Customize UI"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:262
+msgid "Configure Directories"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:265 src/emu/ui/sndmenu.cpp:149
+#: src/emu/ui/sndmenu.cpp:169
+msgid "Sound Options"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:268
+msgid "General Inputs"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:271
+msgid "Save Configuration"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:285 src/emu/ui/optsmenu.cpp:305
+msgid "Settings"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:325
+msgid "**Error saving ui.ini**"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:372
+#, c-format
+msgid "**Error saving %s.ini**"
+msgstr ""
+
+#: src/emu/ui/selector.cpp:165
 msgid "Selection List - Search: "
 msgstr ""
 
-#: src/emu/ui/selector.cpp:196
+#: src/emu/ui/selector.cpp:194
 #, c-format
 msgid "Double click or press %1$s to select"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:39
+#: src/emu/ui/selgame.cpp:38
 msgid "General Info"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:374 src/emu/ui/selsoft.cpp:282
+#: src/emu/ui/selgame.cpp:380 src/emu/ui/selsoft.cpp:281
 #, c-format
 msgid ""
 "%s\n"
 " added to favorites list."
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:380 src/emu/ui/selgame.cpp:389
-#: src/emu/ui/selsoft.cpp:287
+#: src/emu/ui/selgame.cpp:386 src/emu/ui/selgame.cpp:395
+#: src/emu/ui/selsoft.cpp:286
 #, c-format
 msgid ""
 "%s\n"
 " removed from favorites list."
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:450
+#: src/emu/ui/selgame.cpp:457
 msgid ""
 "The selected machine is missing one or more required ROM or CHD images. "
 "Please select a different machine.\n"
@@ -991,275 +1007,275 @@ msgid ""
 "Press any key to continue."
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:589 src/emu/ui/simpleselgame.cpp:265
+#: src/emu/ui/selgame.cpp:595 src/emu/ui/simpleselgame.cpp:265
 msgid "Configure Options"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:752
+#: src/emu/ui/selgame.cpp:596
+msgid "Configure Machine"
+msgstr ""
+
+#: src/emu/ui/selgame.cpp:758
 #, c-format
 msgid "%1$s %2$s ( %3$d / %4$d machines (%5$d BIOS) )"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:762
+#: src/emu/ui/selgame.cpp:768
 #, c-format
 msgid "%1$s (%2$s - %3$s) - "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:769 src/emu/ui/selgame.cpp:775
+#: src/emu/ui/selgame.cpp:775 src/emu/ui/selgame.cpp:781
 #, c-format
 msgid "%1$s (%2$s) - "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:784
+#: src/emu/ui/selgame.cpp:790
 #, c-format
 msgid "%1$s Search: %2$s_"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:838
+#: src/emu/ui/selgame.cpp:844
 #, c-format
 msgid "Romset: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:841 src/emu/ui/selgame.cpp:890
-#: src/emu/ui/selsoft.cpp:751 src/emu/ui/selsoft.cpp:801
+#: src/emu/ui/selgame.cpp:847 src/emu/ui/selgame.cpp:896
+#: src/emu/ui/selsoft.cpp:750 src/emu/ui/selsoft.cpp:800
 #: src/emu/ui/simpleselgame.cpp:328
 #, c-format
 msgid "%1$s, %2$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:847 src/emu/ui/selsoft.cpp:757
+#: src/emu/ui/selgame.cpp:853 src/emu/ui/selsoft.cpp:756
 #, c-format
 msgid "Driver is clone of: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:849 src/emu/ui/selsoft.cpp:759
+#: src/emu/ui/selgame.cpp:855 src/emu/ui/selsoft.cpp:758
 msgid "Driver is parent"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:853 src/emu/ui/selsoft.cpp:763
+#: src/emu/ui/selgame.cpp:859 src/emu/ui/selsoft.cpp:762
 #: src/emu/ui/simpleselgame.cpp:335
 msgid "Overall: NOT WORKING"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:855 src/emu/ui/selsoft.cpp:765
+#: src/emu/ui/selgame.cpp:861 src/emu/ui/selsoft.cpp:764
 #: src/emu/ui/simpleselgame.cpp:337
 msgid "Overall: Unemulated Protection"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:857 src/emu/ui/selsoft.cpp:767
+#: src/emu/ui/selgame.cpp:863 src/emu/ui/selsoft.cpp:766
 #: src/emu/ui/simpleselgame.cpp:339
 msgid "Overall: Working"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:861 src/emu/ui/selsoft.cpp:771
+#: src/emu/ui/selgame.cpp:867 src/emu/ui/selsoft.cpp:770
 msgid "Graphics: Imperfect, "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:863 src/emu/ui/selsoft.cpp:773
+#: src/emu/ui/selgame.cpp:869 src/emu/ui/selsoft.cpp:772
 msgid "Graphics: OK, "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:866 src/emu/ui/selsoft.cpp:776
+#: src/emu/ui/selgame.cpp:872 src/emu/ui/selsoft.cpp:775
 msgid "Sound: Unimplemented"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:868 src/emu/ui/selsoft.cpp:778
+#: src/emu/ui/selgame.cpp:874 src/emu/ui/selsoft.cpp:777
 msgid "Sound: Imperfect"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:870 src/emu/ui/selsoft.cpp:780
+#: src/emu/ui/selgame.cpp:876 src/emu/ui/selsoft.cpp:779
 msgid "Sound: OK"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:887
+#: src/emu/ui/selgame.cpp:893
 #, c-format
 msgid "System: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:894 src/emu/ui/selsoft.cpp:805
+#: src/emu/ui/selgame.cpp:900 src/emu/ui/selsoft.cpp:804
 #, c-format
 msgid "Software is clone of: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:896 src/emu/ui/selsoft.cpp:807
+#: src/emu/ui/selgame.cpp:902 src/emu/ui/selsoft.cpp:806
 msgid "Software is parent"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:901 src/emu/ui/selsoft.cpp:812
+#: src/emu/ui/selgame.cpp:907 src/emu/ui/selsoft.cpp:811
 msgid "Supported: No"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:906 src/emu/ui/selsoft.cpp:817
+#: src/emu/ui/selgame.cpp:912 src/emu/ui/selsoft.cpp:816
 msgid "Supported: Partial"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:911 src/emu/ui/selsoft.cpp:822
+#: src/emu/ui/selgame.cpp:917 src/emu/ui/selsoft.cpp:821
 msgid "Supported: Yes"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:916 src/emu/ui/selsoft.cpp:827
+#: src/emu/ui/selgame.cpp:922 src/emu/ui/selsoft.cpp:826
 #, c-format
 msgid "romset: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:923
+#: src/emu/ui/selgame.cpp:929
 #, c-format
 msgid "%1$s %2$s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1535
+#: src/emu/ui/selgame.cpp:1543
 #, c-format
 msgid "Romset: %1$-.100s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1536
+#: src/emu/ui/selgame.cpp:1544
 #, c-format
 msgid "Year: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1537
+#: src/emu/ui/selgame.cpp:1545
 #, c-format
 msgid "Manufacturer: %1$-.100s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1541
+#: src/emu/ui/selgame.cpp:1549
 #, c-format
 msgid "Driver is Clone of: %1$-.100s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1543
+#: src/emu/ui/selgame.cpp:1551
 msgid "Driver is Parent\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1546
+#: src/emu/ui/selgame.cpp:1554
 msgid "Overall: NOT WORKING\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1548
+#: src/emu/ui/selgame.cpp:1556
 msgid "Overall: Unemulated Protection\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1550
+#: src/emu/ui/selgame.cpp:1558
 msgid "Overall: Working\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1553
+#: src/emu/ui/selgame.cpp:1561
 msgid "Graphics: Imperfect Colors\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1557
+#: src/emu/ui/selgame.cpp:1565
 msgid "Graphics: Imperfect\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1559
+#: src/emu/ui/selgame.cpp:1567
 msgid "Graphics: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1562
+#: src/emu/ui/selgame.cpp:1570
 msgid "Sound: Unimplemented\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1564
+#: src/emu/ui/selgame.cpp:1572
 msgid "Sound: Imperfect\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1566
+#: src/emu/ui/selgame.cpp:1574
 msgid "Sound: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1568
+#: src/emu/ui/selgame.cpp:1576
 #, c-format
 msgid "Driver is Skeleton: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1569
+#: src/emu/ui/selgame.cpp:1577
 #, c-format
 msgid "Game is Mechanical: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1570
+#: src/emu/ui/selgame.cpp:1578
 #, c-format
 msgid "Requires Artwork: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1571
+#: src/emu/ui/selgame.cpp:1579
 #, c-format
 msgid "Requires Clickable Artwork: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1572
+#: src/emu/ui/selgame.cpp:1580
 #, c-format
 msgid "Support Cocktail: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1573
+#: src/emu/ui/selgame.cpp:1581
 #, c-format
 msgid "Driver is Bios: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1574
+#: src/emu/ui/selgame.cpp:1582
 #, c-format
 msgid "Support Save: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 #, c-format
 msgid "Screen Orientation: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 msgid "Vertical"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 msgid "Horizontal"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/selgame.cpp:1591
 #, c-format
 msgid "Requires CHD: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1596
+#: src/emu/ui/selgame.cpp:1604
 msgid "Roms Audit Pass: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1598
+#: src/emu/ui/selgame.cpp:1606
 msgid "Roms Audit Pass: BAD\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1601
+#: src/emu/ui/selgame.cpp:1609
 msgid "Samples Audit Pass: None Needed\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1603
+#: src/emu/ui/selgame.cpp:1611
 msgid "Samples Audit Pass: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1605
+#: src/emu/ui/selgame.cpp:1613
 msgid "Samples Audit Pass: BAD\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1608
+#: src/emu/ui/selgame.cpp:1616
 msgid ""
 "Roms Audit Pass: Disabled\n"
 "Samples Audit Pass: Disabled\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:2049 src/emu/ui/selgame.cpp:2212
-#: src/emu/ui/selsoft.cpp:1662
+#: src/emu/ui/selgame.cpp:2055 src/emu/ui/selgame.cpp:2216
+#: src/emu/ui/selsoft.cpp:1655
 msgid "No Infos Available"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:2162 src/emu/ui/selsoft.cpp:1607
+#: src/emu/ui/selgame.cpp:2168 src/emu/ui/selsoft.cpp:1602
 msgid "Usage"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:110
-msgid " (default)"
-msgstr ""
-
-#: src/emu/ui/selsoft.cpp:381
+#: src/emu/ui/selsoft.cpp:380
 msgid ""
 "The selected software is missing one or more required files. Please select a "
 "different software.\n"
@@ -1267,57 +1283,57 @@ msgid ""
 "Press any key to continue."
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:684
+#: src/emu/ui/selsoft.cpp:683
 #, c-format
-msgid "%1$s %2$s ( %3$d / %4$d softwares )"
+msgid "%1$s %2$s ( %3$d / %4$d software packages )"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:685
+#: src/emu/ui/selsoft.cpp:684
 #, c-format
 msgid "Driver: \"%1$s\" software list "
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:688
+#: src/emu/ui/selsoft.cpp:687
 #, c-format
 msgid "Region: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:690
+#: src/emu/ui/selsoft.cpp:689
 #, c-format
 msgid "Publisher: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:692
+#: src/emu/ui/selsoft.cpp:691
 #, c-format
 msgid "Year: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:694
+#: src/emu/ui/selsoft.cpp:693
 #, c-format
 msgid "Software List: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:696
+#: src/emu/ui/selsoft.cpp:695
 #, c-format
 msgid "Device type: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:698
+#: src/emu/ui/selsoft.cpp:697
 #, c-format
 msgid "%s Search: %s_"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:748 src/emu/ui/selsoft.cpp:798
+#: src/emu/ui/selsoft.cpp:747 src/emu/ui/selsoft.cpp:797
 #: src/emu/ui/simpleselgame.cpp:325
 #, c-format
 msgid "%1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:1998 src/emu/ui/selsoft.cpp:2018
+#: src/emu/ui/selsoft.cpp:1991 src/emu/ui/selsoft.cpp:2011
 msgid "Software part selection:"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:2136 src/emu/ui/selsoft.cpp:2156
+#: src/emu/ui/selsoft.cpp:2129 src/emu/ui/selsoft.cpp:2149
 msgid "Bios selection:"
 msgstr ""
 
@@ -1365,15 +1381,15 @@ msgstr ""
 msgid " [internal]"
 msgstr ""
 
-#: src/emu/ui/sndmenu.cpp:135
+#: src/emu/ui/sndmenu.cpp:133
 msgid "Sound"
 msgstr ""
 
-#: src/emu/ui/sndmenu.cpp:136
+#: src/emu/ui/sndmenu.cpp:134
 msgid "Sample Rate"
 msgstr ""
 
-#: src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/sndmenu.cpp:135
 msgid "Use External Samples"
 msgstr ""
 
@@ -1442,80 +1458,80 @@ msgstr ""
 msgid "Fast Forward"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:419
+#: src/emu/ui/ui.cpp:418
 msgid "This driver requires images to be loaded in the following device(s): "
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1074
+#: src/emu/ui/ui.cpp:1071
 msgid ""
 "One or more ROMs/CHDs for this machine are incorrect. The machine may not "
 "run correctly.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1087
+#: src/emu/ui/ui.cpp:1084
 msgid ""
 "There are known problems with this machine\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1091
+#: src/emu/ui/ui.cpp:1088
 msgid ""
 "One or more ROMs/CHDs for this machine have not been correctly dumped.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1095
+#: src/emu/ui/ui.cpp:1092
 #, c-format
 msgid "The keyboard emulation may not be 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1097
+#: src/emu/ui/ui.cpp:1094
 #, c-format
 msgid "The colors aren't 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1099
+#: src/emu/ui/ui.cpp:1096
 msgid "The colors are completely wrong.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1101
+#: src/emu/ui/ui.cpp:1098
 #, c-format
 msgid "The video emulation isn't 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1103
+#: src/emu/ui/ui.cpp:1100
 #, c-format
 msgid "The sound emulation isn't 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1105
+#: src/emu/ui/ui.cpp:1102
 msgid "The machine lacks sound.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1108
+#: src/emu/ui/ui.cpp:1105
 msgid "Screen flipping in cocktail mode is not supported.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1112
+#: src/emu/ui/ui.cpp:1109
 msgid "The machine requires external artwork files\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1117
+#: src/emu/ui/ui.cpp:1114
 msgid ""
 "This machine was never completed. It may exhibit strange behavior or missing "
 "elements that are not bugs in the emulation.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1122
+#: src/emu/ui/ui.cpp:1119
 msgid ""
 "This machine has no sound hardware, MAME will produce no sounds, this is "
 "expected behaviour.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1130
+#: src/emu/ui/ui.cpp:1127
 msgid "The machine has protection which isn't fully emulated.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1133
+#: src/emu/ui/ui.cpp:1130
 msgid ""
 "\n"
 "THIS MACHINE DOESN'T WORK. The emulation for this machine is not yet "
@@ -1523,7 +1539,7 @@ msgid ""
 "the developers to improve the emulation.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1137
+#: src/emu/ui/ui.cpp:1134
 msgid ""
 "\n"
 "Certain elements of this machine cannot be emulated as it requires actual "
@@ -1531,21 +1547,21 @@ msgid ""
 "to fully play this machine.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1156
+#: src/emu/ui/ui.cpp:1153
 msgid ""
 "\n"
 "\n"
 "There are working clones of this machine: "
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1170
+#: src/emu/ui/ui.cpp:1167
 msgid ""
 "\n"
 "\n"
 "Press any key to continue"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1185
+#: src/emu/ui/ui.cpp:1182
 #, c-format
 msgid ""
 "%1$s\n"
@@ -1555,98 +1571,98 @@ msgid ""
 "CPU:\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1221 src/emu/ui/ui.cpp:1260
+#: src/emu/ui/ui.cpp:1218 src/emu/ui/ui.cpp:1257
 msgid "MHz"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1221 src/emu/ui/ui.cpp:1260
+#: src/emu/ui/ui.cpp:1218 src/emu/ui/ui.cpp:1257
 msgid "kHz"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1235
+#: src/emu/ui/ui.cpp:1232
 msgid ""
 "\n"
 "Sound:\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1264
+#: src/emu/ui/ui.cpp:1261
 msgid ""
 "\n"
 "Video:\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1268
+#: src/emu/ui/ui.cpp:1265
 msgid "None\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1275
+#: src/emu/ui/ui.cpp:1272
 msgid "Vector"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1286
+#: src/emu/ui/ui.cpp:1283
 #, c-format
 msgid "%1$s: %2$s\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1286
+#: src/emu/ui/ui.cpp:1283
 msgid "%2$s\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1541 src/emu/ui/ui.cpp:1551
+#: src/emu/ui/ui.cpp:1538 src/emu/ui/ui.cpp:1548
 msgid "Keyboard Emulation Status"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1543
+#: src/emu/ui/ui.cpp:1540
 msgid "Mode: PARTIAL Emulation"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1544
+#: src/emu/ui/ui.cpp:1541
 msgid "UI:   Enabled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1546 src/emu/ui/ui.cpp:1556
+#: src/emu/ui/ui.cpp:1543 src/emu/ui/ui.cpp:1553
 msgid "**Use ScrLock to toggle**"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1553
+#: src/emu/ui/ui.cpp:1550
 msgid "Mode: FULL Emulation"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1554
+#: src/emu/ui/ui.cpp:1551
 msgid "UI:   Disabled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1692
+#: src/emu/ui/ui.cpp:1689
 msgid "Autofire can't be enabled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1731
+#: src/emu/ui/ui.cpp:1728
 msgid "Select position to save to"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1733
+#: src/emu/ui/ui.cpp:1730
 msgid "Select position to load from"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1757
+#: src/emu/ui/ui.cpp:1754
 msgid "Save cancelled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1759
+#: src/emu/ui/ui.cpp:1756
 msgid "Load cancelled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1802
+#: src/emu/ui/ui.cpp:1799
 #, c-format
 msgid "Save to position %s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1807
+#: src/emu/ui/ui.cpp:1804
 #, c-format
 msgid "Load from position %s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1847
+#: src/emu/ui/ui.cpp:1844
 #, c-format
 msgid ""
 "Are you sure you want to quit?\n"
@@ -1655,173 +1671,173 @@ msgid ""
 "Press ''%2$s'' to return to emulation."
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1917
+#: src/emu/ui/ui.cpp:1914
 msgid "Master Volume"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1926
+#: src/emu/ui/ui.cpp:1923
 #, c-format
 msgid "%1$s Volume"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1949
+#: src/emu/ui/ui.cpp:1946
 #, c-format
 msgid "Overclock CPU %1$s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1968
+#: src/emu/ui/ui.cpp:1965
 #, c-format
 msgid "%1$s Refresh Rate"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1973
+#: src/emu/ui/ui.cpp:1970
 #, c-format
 msgid "%1$s Brightness"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1975
+#: src/emu/ui/ui.cpp:1972
 #, c-format
 msgid "%1$s Contrast"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1977
+#: src/emu/ui/ui.cpp:1974
 #, c-format
 msgid "%1$s Gamma"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1981
+#: src/emu/ui/ui.cpp:1978
 #, c-format
 msgid "%1$s Horiz Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1983
+#: src/emu/ui/ui.cpp:1980
 #, c-format
 msgid "%1$s Horiz Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1985
+#: src/emu/ui/ui.cpp:1982
 #, c-format
 msgid "%1$s Vert Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1987
+#: src/emu/ui/ui.cpp:1984
 #, c-format
 msgid "%1$s Vert Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2005
+#: src/emu/ui/ui.cpp:2002
 #, c-format
 msgid "Laserdisc '%1$s' Horiz Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2007
+#: src/emu/ui/ui.cpp:2004
 #, c-format
 msgid "Laserdisc '%1$s' Horiz Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2009
+#: src/emu/ui/ui.cpp:2006
 #, c-format
 msgid "Laserdisc '%1$s' Vert Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2011
+#: src/emu/ui/ui.cpp:2008
 #, c-format
 msgid "Laserdisc '%1$s' Vert Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2021
+#: src/emu/ui/ui.cpp:2018
 msgid "Vector Flicker"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2022
+#: src/emu/ui/ui.cpp:2019
 msgid "Beam Width Minimum"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2023
+#: src/emu/ui/ui.cpp:2020
 msgid "Beam Width Maximum"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2024
+#: src/emu/ui/ui.cpp:2021
 msgid "Beam Intensity Weight"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2037
+#: src/emu/ui/ui.cpp:2034
 #, c-format
 msgid "Crosshair Scale %1$s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2037 src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2034 src/emu/ui/ui.cpp:2036
 msgid "X"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2037 src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2034 src/emu/ui/ui.cpp:2036
 msgid "Y"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2036
 #, c-format
 msgid "Crosshair Offset %1$s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2071
+#: src/emu/ui/ui.cpp:2068
 #, c-format
 msgid "%1$3ddB"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2115
+#: src/emu/ui/ui.cpp:2112
 #, c-format
 msgid "%1$d%%"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2131
+#: src/emu/ui/ui.cpp:2128
 #, c-format
 msgid "%1$3.0f%%"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2154
+#: src/emu/ui/ui.cpp:2151
 #, c-format
 msgid "%1$.3ffps"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2177 src/emu/ui/ui.cpp:2199 src/emu/ui/ui.cpp:2220
-#: src/emu/ui/ui.cpp:2242 src/emu/ui/ui.cpp:2264 src/emu/ui/ui.cpp:2286
-#: src/emu/ui/ui.cpp:2308 src/emu/ui/ui.cpp:2330 src/emu/ui/ui.cpp:2352
-#: src/emu/ui/ui.cpp:2374 src/emu/ui/ui.cpp:2396
+#: src/emu/ui/ui.cpp:2174 src/emu/ui/ui.cpp:2196 src/emu/ui/ui.cpp:2217
+#: src/emu/ui/ui.cpp:2239 src/emu/ui/ui.cpp:2261 src/emu/ui/ui.cpp:2283
+#: src/emu/ui/ui.cpp:2305 src/emu/ui/ui.cpp:2327 src/emu/ui/ui.cpp:2349
+#: src/emu/ui/ui.cpp:2371 src/emu/ui/ui.cpp:2393
 #, c-format
 msgid "%1$.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2412 src/emu/ui/ui.cpp:2428 src/emu/ui/ui.cpp:2444
-#: src/emu/ui/ui.cpp:2460
+#: src/emu/ui/ui.cpp:2408 src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2438
+#: src/emu/ui/ui.cpp:2453
 #, c-format
 msgid "%1$1.2f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2476
+#: src/emu/ui/ui.cpp:2469
 #, c-format
 msgid "Screen '%1$s'"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2478
+#: src/emu/ui/ui.cpp:2471
 msgid "Screen"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2494
+#: src/emu/ui/ui.cpp:2487
 #, c-format
 msgid "Crosshair Scale X %1$1.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2494
+#: src/emu/ui/ui.cpp:2487
 #, c-format
 msgid "Crosshair Scale Y %1$1.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2513
+#: src/emu/ui/ui.cpp:2506
 #, c-format
 msgid "Crosshair Offset X %1$1.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2513
+#: src/emu/ui/ui.cpp:2506
 #, c-format
 msgid "Crosshair Offset Y %1$1.3f"
 msgstr ""
@@ -1863,10 +1879,10 @@ msgstr ""
 msgid "Full"
 msgstr ""
 
-#: src/emu/ui/viewgfx.cpp:392
+#: src/emu/ui/viewgfx.cpp:391
 msgid " COLORS"
 msgstr ""
 
-#: src/emu/ui/viewgfx.cpp:392
+#: src/emu/ui/viewgfx.cpp:391
 msgid " PENS"
 msgstr ""
diff --git a/language/Bulgarian/strings.po b/language/Bulgarian/strings.po
index 6b88334404b..f14393e1615 100644
--- a/language/Bulgarian/strings.po
+++ b/language/Bulgarian/strings.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MAME\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-11 03:33+0200\n"
+"POT-Creation-Date: 2016-04-15 17:42+0200\n"
 "PO-Revision-Date: 2016-02-20 18:03+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: MAME Language Team\n"
@@ -61,14 +61,14 @@ msgstr ""
 msgid "Autofire Status"
 msgstr ""
 
-#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1698
+#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1695
 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211
 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219
 #: src/emu/ui/videoopt.cpp:223
 msgid "Disabled"
 msgstr ""
 
-#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1698
+#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1695
 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211
 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219
 #: src/emu/ui/videoopt.cpp:223
@@ -76,14 +76,14 @@ msgid "Enabled"
 msgstr ""
 
 #: src/emu/ui/cheatopt.cpp:282 src/emu/ui/cheatopt.cpp:288
-#: src/emu/ui/menu.cpp:710 src/emu/ui/miscmenu.cpp:831
-#: src/emu/ui/sndmenu.cpp:135 src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/menu.cpp:755 src/emu/ui/miscmenu.cpp:936
+#: src/emu/ui/sndmenu.cpp:133 src/emu/ui/sndmenu.cpp:135
 msgid "On"
 msgstr ""
 
 #: src/emu/ui/cheatopt.cpp:282 src/emu/ui/cheatopt.cpp:288
-#: src/emu/ui/menu.cpp:713 src/emu/ui/miscmenu.cpp:831
-#: src/emu/ui/sndmenu.cpp:135 src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/menu.cpp:758 src/emu/ui/miscmenu.cpp:936
+#: src/emu/ui/sndmenu.cpp:133 src/emu/ui/sndmenu.cpp:135
 msgid "Off"
 msgstr ""
 
@@ -95,316 +95,316 @@ msgstr ""
 msgid "Autofire Delay"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:158 src/emu/ui/custmenu.cpp:447
+#: src/emu/ui/custmenu.cpp:157 src/emu/ui/custmenu.cpp:445
 msgid "Main filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:167 src/emu/ui/custmenu.cpp:456
+#: src/emu/ui/custmenu.cpp:166 src/emu/ui/custmenu.cpp:454
 msgid "Other filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:176 src/emu/ui/optsmenu.cpp:239
+#: src/emu/ui/custmenu.cpp:175 src/emu/ui/optsmenu.cpp:238
 msgid "^!Manufacturer"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:185 src/emu/ui/custmenu.cpp:474
-#: src/emu/ui/optsmenu.cpp:247
+#: src/emu/ui/custmenu.cpp:184 src/emu/ui/custmenu.cpp:472
+#: src/emu/ui/optsmenu.cpp:246
 msgid "^!Year"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:194 src/emu/ui/custmenu.cpp:510
+#: src/emu/ui/custmenu.cpp:193 src/emu/ui/custmenu.cpp:508
 msgid "Remove last filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:197 src/emu/ui/custmenu.cpp:513
+#: src/emu/ui/custmenu.cpp:196 src/emu/ui/custmenu.cpp:511
 msgid "Add filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:212 src/emu/ui/custmenu.cpp:233
-#: src/emu/ui/custmenu.cpp:529 src/emu/ui/custmenu.cpp:550
+#: src/emu/ui/custmenu.cpp:211 src/emu/ui/custmenu.cpp:231
+#: src/emu/ui/custmenu.cpp:527 src/emu/ui/custmenu.cpp:547
 msgid "Select custom filters:"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:465
+#: src/emu/ui/custmenu.cpp:463
 msgid "^!Publisher"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:483
+#: src/emu/ui/custmenu.cpp:481
 msgid "^!Software List"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:492
+#: src/emu/ui/custmenu.cpp:490
 msgid "^!Device type"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:501
+#: src/emu/ui/custmenu.cpp:499
 msgid "^!Region"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:23
+#: src/emu/ui/custui.cpp:22
 msgid "Show All"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:24
+#: src/emu/ui/custui.cpp:23
 msgid "Hide Filters"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:25
+#: src/emu/ui/custui.cpp:24
 msgid "Hide Info/Image"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:26
+#: src/emu/ui/custui.cpp:25
 msgid "Hide Both"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:142
+#: src/emu/ui/custui.cpp:141
 msgid "Fonts"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:143
+#: src/emu/ui/custui.cpp:142
 msgid "Colors"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:148 src/emu/ui/dirmenu.cpp:33
+#: src/emu/ui/custui.cpp:147 src/emu/ui/dirmenu.cpp:33
 msgid "Language"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:152
+#: src/emu/ui/custui.cpp:151
 msgid "Show side panels"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:167 src/emu/ui/custui.cpp:188
+#: src/emu/ui/custui.cpp:166 src/emu/ui/custui.cpp:186
 msgid "Custom UI Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:246
+#: src/emu/ui/custui.cpp:244
 msgid "default"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:349
+#: src/emu/ui/custui.cpp:347
 msgid "UI Font"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:354
+#: src/emu/ui/custui.cpp:352
 msgid "Bold"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:355
+#: src/emu/ui/custui.cpp:353
 msgid "Italic"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:360
+#: src/emu/ui/custui.cpp:358
 msgid "Lines"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:366
+#: src/emu/ui/custui.cpp:364
 msgid "Infos text size"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:383
+#: src/emu/ui/custui.cpp:381
 msgid "UI Fonts Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:411
+#: src/emu/ui/custui.cpp:408
 msgid "Sample text - Lorem ipsum dolor sit amet, consectetur adipiscing elit."
 msgstr ""
 
-#: src/emu/ui/custui.cpp:509
+#: src/emu/ui/custui.cpp:506
 msgid "Normal text"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:510
+#: src/emu/ui/custui.cpp:507
 msgid "Selected color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:511
+#: src/emu/ui/custui.cpp:508
 msgid "Normal text background"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:512
+#: src/emu/ui/custui.cpp:509
 msgid "Selected background color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:513
+#: src/emu/ui/custui.cpp:510
 msgid "Subitem color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:514 src/emu/ui/custui.cpp:610
+#: src/emu/ui/custui.cpp:511 src/emu/ui/custui.cpp:606
 msgid "Clone"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:515
+#: src/emu/ui/custui.cpp:512
 msgid "Border"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:516
+#: src/emu/ui/custui.cpp:513
 msgid "Background"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:517
+#: src/emu/ui/custui.cpp:514
 msgid "Dipswitch"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:518
+#: src/emu/ui/custui.cpp:515
 msgid "Unavailable color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:519
+#: src/emu/ui/custui.cpp:516
 msgid "Slider color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:520
+#: src/emu/ui/custui.cpp:517
 msgid "Gfx viewer background"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:521
+#: src/emu/ui/custui.cpp:518
 msgid "Mouse over color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:522
+#: src/emu/ui/custui.cpp:519
 msgid "Mouse over background color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:523
+#: src/emu/ui/custui.cpp:520
 msgid "Mouse down color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:524
+#: src/emu/ui/custui.cpp:521
 msgid "Mouse down background color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:527
+#: src/emu/ui/custui.cpp:524
 msgid "Restore originals colors"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:543
+#: src/emu/ui/custui.cpp:540
 msgid "UI Colors Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:572
+#: src/emu/ui/custui.cpp:568
 #, c-format
 msgid "Double click or press %1$s to change the color value"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:598
+#: src/emu/ui/custui.cpp:594
 msgid "Menu Preview"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:606
+#: src/emu/ui/custui.cpp:602
 msgid "Normal"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:607
+#: src/emu/ui/custui.cpp:603
 msgid "Subitem"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:608
+#: src/emu/ui/custui.cpp:604
 msgid "Selected"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:609
+#: src/emu/ui/custui.cpp:605
 msgid "Mouse Over"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:841 src/emu/ui/custui.cpp:844
+#: src/emu/ui/custui.cpp:837 src/emu/ui/custui.cpp:840
 msgid "Alpha"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:849 src/emu/ui/custui.cpp:852
-#: src/emu/ui/custui.cpp:1013
+#: src/emu/ui/custui.cpp:845 src/emu/ui/custui.cpp:848
+#: src/emu/ui/custui.cpp:1007
 msgid "Red"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:857 src/emu/ui/custui.cpp:860
-#: src/emu/ui/custui.cpp:1016
+#: src/emu/ui/custui.cpp:853 src/emu/ui/custui.cpp:856
+#: src/emu/ui/custui.cpp:1010
 msgid "Green"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:865 src/emu/ui/custui.cpp:868
-#: src/emu/ui/custui.cpp:1017
+#: src/emu/ui/custui.cpp:861 src/emu/ui/custui.cpp:864
+#: src/emu/ui/custui.cpp:1011
 msgid "Blue"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:871
+#: src/emu/ui/custui.cpp:867
 msgid "Choose from palette"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:887
+#: src/emu/ui/custui.cpp:883
 msgid " - ARGB Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:912
+#: src/emu/ui/custui.cpp:907
 msgid "Color preview ="
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1009
+#: src/emu/ui/custui.cpp:1003
 msgid "White"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1010
+#: src/emu/ui/custui.cpp:1004
 msgid "Silver"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1011
+#: src/emu/ui/custui.cpp:1005
 msgid "Gray"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1012
+#: src/emu/ui/custui.cpp:1006
 msgid "Black"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1014
+#: src/emu/ui/custui.cpp:1008
 msgid "Orange"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1015
+#: src/emu/ui/custui.cpp:1009
 msgid "Yellow"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1018
+#: src/emu/ui/custui.cpp:1012
 msgid "Violet"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:65
+#: src/emu/ui/datmenu.cpp:64
 msgid "Software History"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:67
+#: src/emu/ui/datmenu.cpp:66
 msgid "Software Usage"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:199
+#: src/emu/ui/datmenu.cpp:196
 msgid "Revision: "
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:287 src/emu/ui/selgame.cpp:40
-#: src/emu/ui/selgame.cpp:2152 src/emu/ui/selgame.cpp:2161
-#: src/emu/ui/selsoft.cpp:1577 src/emu/ui/selsoft.cpp:1597
-#: src/emu/ui/selsoft.cpp:1606
+#: src/emu/ui/datmenu.cpp:284 src/emu/ui/selgame.cpp:39
+#: src/emu/ui/selgame.cpp:2158 src/emu/ui/selgame.cpp:2167
+#: src/emu/ui/selsoft.cpp:1574 src/emu/ui/selsoft.cpp:1592
+#: src/emu/ui/selsoft.cpp:1601
 msgid "History"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:289 src/emu/ui/selgame.cpp:41
+#: src/emu/ui/datmenu.cpp:286 src/emu/ui/selgame.cpp:40
 msgid "Mameinfo"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:291 src/emu/ui/selgame.cpp:43
+#: src/emu/ui/datmenu.cpp:288 src/emu/ui/selgame.cpp:42
 msgid "Messinfo"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:293 src/emu/ui/selgame.cpp:42
+#: src/emu/ui/datmenu.cpp:290 src/emu/ui/selgame.cpp:41
 msgid "Sysinfo"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:295 src/emu/ui/selgame.cpp:46
+#: src/emu/ui/datmenu.cpp:292 src/emu/ui/selgame.cpp:45
 msgid "Mamescore"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:297 src/emu/ui/selgame.cpp:45
+#: src/emu/ui/datmenu.cpp:294 src/emu/ui/selgame.cpp:44
 msgid "Gameinit"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:299 src/emu/ui/selgame.cpp:44
+#: src/emu/ui/datmenu.cpp:296 src/emu/ui/selgame.cpp:43
 msgid "Command"
 msgstr ""
 
@@ -556,75 +556,75 @@ msgstr ""
 msgid "Remove %1$s Folder"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:158
+#: src/emu/ui/filesel.cpp:161
 msgid "File Already Exists - Override?"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:160 src/emu/ui/selgame.cpp:1568
-#: src/emu/ui/selgame.cpp:1569 src/emu/ui/selgame.cpp:1570
-#: src/emu/ui/selgame.cpp:1571 src/emu/ui/selgame.cpp:1572
-#: src/emu/ui/selgame.cpp:1573 src/emu/ui/selgame.cpp:1574
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/filesel.cpp:163 src/emu/ui/selgame.cpp:1576
+#: src/emu/ui/selgame.cpp:1577 src/emu/ui/selgame.cpp:1578
+#: src/emu/ui/selgame.cpp:1579 src/emu/ui/selgame.cpp:1580
+#: src/emu/ui/selgame.cpp:1581 src/emu/ui/selgame.cpp:1582
+#: src/emu/ui/selgame.cpp:1591
 msgid "No"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:161 src/emu/ui/selgame.cpp:1568
-#: src/emu/ui/selgame.cpp:1569 src/emu/ui/selgame.cpp:1570
-#: src/emu/ui/selgame.cpp:1571 src/emu/ui/selgame.cpp:1572
-#: src/emu/ui/selgame.cpp:1573 src/emu/ui/selgame.cpp:1574
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/filesel.cpp:164 src/emu/ui/selgame.cpp:1576
+#: src/emu/ui/selgame.cpp:1577 src/emu/ui/selgame.cpp:1578
+#: src/emu/ui/selgame.cpp:1579 src/emu/ui/selgame.cpp:1580
+#: src/emu/ui/selgame.cpp:1581 src/emu/ui/selgame.cpp:1582
+#: src/emu/ui/selgame.cpp:1591
 msgid "Yes"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:272
+#: src/emu/ui/filesel.cpp:275
 msgid "New Image Name:"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:278
+#: src/emu/ui/filesel.cpp:281
 msgid "Image Format:"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:284
+#: src/emu/ui/filesel.cpp:287
 msgid "Create"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:315
+#: src/emu/ui/filesel.cpp:318
 msgid "Please enter a file extension too"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:503 src/emu/ui/swlist.cpp:65
+#: src/emu/ui/filesel.cpp:506 src/emu/ui/swlist.cpp:65
 msgid "[empty slot]"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:507
+#: src/emu/ui/filesel.cpp:510
 msgid "[create]"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:511 src/emu/ui/swlist.cpp:76
+#: src/emu/ui/filesel.cpp:514 src/emu/ui/swlist.cpp:76
 msgid "[software list]"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:803
+#: src/emu/ui/filesel.cpp:806
 msgid "Select image format"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:863
+#: src/emu/ui/filesel.cpp:866
 msgid "Select access mode"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:864
+#: src/emu/ui/filesel.cpp:867
 msgid "Read-only"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:866
+#: src/emu/ui/filesel.cpp:869
 msgid "Read-write"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:867
+#: src/emu/ui/filesel.cpp:870
 msgid "Read this image, write to another image"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:868
+#: src/emu/ui/filesel.cpp:871
 msgid "Read this image, write to diff"
 msgstr ""
 
@@ -650,7 +650,7 @@ msgstr ""
 msgid "[empty]"
 msgstr ""
 
-#: src/emu/ui/info_pty.cpp:26 src/emu/ui/mainmenu.cpp:91
+#: src/emu/ui/info_pty.cpp:26 src/emu/ui/mainmenu.cpp:96
 msgid "Pseudo terminals"
 msgstr ""
 
@@ -666,7 +666,7 @@ msgstr ""
 msgid "Other Controls"
 msgstr ""
 
-#: src/emu/ui/inputmap.cpp:622 src/emu/ui/miscmenu.cpp:91
+#: src/emu/ui/inputmap.cpp:622 src/emu/ui/miscmenu.cpp:92
 #: src/emu/ui/slotopt.cpp:172
 msgid "Reset"
 msgstr ""
@@ -699,27 +699,27 @@ msgstr ""
 msgid "Machine Information"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:78
+#: src/emu/ui/mainmenu.cpp:80
 msgid "Image Information"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:81
+#: src/emu/ui/mainmenu.cpp:83
 msgid "File Manager"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:86
+#: src/emu/ui/mainmenu.cpp:92
 msgid "Tape Control"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:94
+#: src/emu/ui/mainmenu.cpp:99
 msgid "Bios Selection"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:100
+#: src/emu/ui/mainmenu.cpp:104
 msgid "Slot Devices"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:107
+#: src/emu/ui/mainmenu.cpp:109
 msgid "Barcode Reader"
 msgstr ""
 
@@ -727,43 +727,43 @@ msgstr ""
 msgid "Network Devices"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:119
+#: src/emu/ui/mainmenu.cpp:118
 msgid "Keyboard Mode"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:122
+#: src/emu/ui/mainmenu.cpp:121
 msgid "Slider Controls"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:125
+#: src/emu/ui/mainmenu.cpp:124
 msgid "Video Options"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:129
+#: src/emu/ui/mainmenu.cpp:128
 msgid "Crosshair Options"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:133
+#: src/emu/ui/mainmenu.cpp:132
 msgid "Cheat"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:136
+#: src/emu/ui/mainmenu.cpp:135
 msgid "Plugin Options"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:140
+#: src/emu/ui/mainmenu.cpp:139
 msgid "External DAT View"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:146
+#: src/emu/ui/mainmenu.cpp:145 src/emu/ui/miscmenu.cpp:785
 msgid "Add To Favorites"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:148
+#: src/emu/ui/mainmenu.cpp:147 src/emu/ui/miscmenu.cpp:787
 msgid "Remove From Favorites"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:155
+#: src/emu/ui/mainmenu.cpp:154
 msgid "Select New Machine"
 msgstr ""
 
@@ -803,189 +803,205 @@ msgstr ""
 msgid "Return to Previous Menu"
 msgstr ""
 
-#: src/emu/ui/menu.cpp:716
+#: src/emu/ui/menu.cpp:761
 msgid "Auto"
 msgstr ""
 
-#: src/emu/ui/menu.cpp:2133
+#: src/emu/ui/menu.cpp:2195
 msgid "Images"
 msgstr ""
 
-#: src/emu/ui/menu.cpp:2134
+#: src/emu/ui/menu.cpp:2196
 msgid "Infos"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Keyboard Mode:"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Natural"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Emulated"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:240
+#: src/emu/ui/miscmenu.cpp:241
 #, c-format
 msgid ""
 "Uptime: %1$d:%2$02d:%3$02d\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:242
+#: src/emu/ui/miscmenu.cpp:243
 #, c-format
 msgid ""
 "Uptime: %1$d:%2$02d\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:246
+#: src/emu/ui/miscmenu.cpp:247
 #, c-format
 msgid ""
 "Tickets dispensed: %1$d\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:257
+#: src/emu/ui/miscmenu.cpp:258
 msgid "Coin %1$c: NA%3$s\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:257
+#: src/emu/ui/miscmenu.cpp:258
 #, c-format
 msgid "Coin %1$c: %2$d%3$s\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:260
+#: src/emu/ui/miscmenu.cpp:261
 msgid " (locked)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:519
+#: src/emu/ui/miscmenu.cpp:520
 msgid "Visible Delay"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:617
+#: src/emu/ui/miscmenu.cpp:619
 #, c-format
 msgid "%s.xml saved under ui folder."
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:645
+#: src/emu/ui/miscmenu.cpp:647
 msgid "Name:             Description:\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:657
+#: src/emu/ui/miscmenu.cpp:659
 #, c-format
 msgid "%s.txt saved under ui folder."
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:675
-msgid "Export XML format (like -listxml)"
+#: src/emu/ui/miscmenu.cpp:677
+msgid "Export list in XML format (like -listxml)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:676
-msgid "Export TXT format (like -listfull)"
+#: src/emu/ui/miscmenu.cpp:678
+msgid "Export list in XML format (like -listxml, but exclude devices)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:734
-msgid "Dummy"
+#: src/emu/ui/miscmenu.cpp:679
+msgid "Export list in TXT format (like -listfull)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:736
-msgid "Save machine configuration"
-msgstr ""
-
-#: src/emu/ui/miscmenu.cpp:848 src/emu/ui/miscmenu.cpp:869
-#: src/emu/ui/selgame.cpp:594
-msgid "Plugins"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:218
-msgid "Filter"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:226
-msgid " ^!File"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:231
-msgid " ^!Category"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:254
-msgid "^!Setup custom filter"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:262
-msgid "Customize UI"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:263
-msgid "Configure Directories"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:266 src/emu/ui/sndmenu.cpp:151
-#: src/emu/ui/sndmenu.cpp:172
-msgid "Sound Options"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:269
-msgid "General Inputs"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:272
-msgid "Save Configuration"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:286 src/emu/ui/optsmenu.cpp:307
-msgid "Settings"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:327
-msgid "**Error saving ui.ini**"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:374
-#, c-format
-msgid "**Error saving %s.ini**"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:378
+#: src/emu/ui/miscmenu.cpp:729 src/emu/ui/optsmenu.cpp:376
 msgid ""
 "\n"
 "    Configuration saved    \n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/selector.cpp:166
+#: src/emu/ui/miscmenu.cpp:774
+msgid "Bios"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:776
+msgid "Driver"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:790
+msgid "Save machine configuration"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:806
+msgid "Configure machine:"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:868 src/emu/ui/selsoft.cpp:109
+msgid " (default)"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:953 src/emu/ui/miscmenu.cpp:973
+#: src/emu/ui/selgame.cpp:600
+msgid "Plugins"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:217
+msgid "Filter"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:225
+msgid " ^!File"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:230
+msgid " ^!Category"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:253
+msgid "^!Setup custom filter"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:261
+msgid "Customize UI"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:262
+msgid "Configure Directories"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:265 src/emu/ui/sndmenu.cpp:149
+#: src/emu/ui/sndmenu.cpp:169
+msgid "Sound Options"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:268
+msgid "General Inputs"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:271
+msgid "Save Configuration"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:285 src/emu/ui/optsmenu.cpp:305
+msgid "Settings"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:325
+msgid "**Error saving ui.ini**"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:372
+#, c-format
+msgid "**Error saving %s.ini**"
+msgstr ""
+
+#: src/emu/ui/selector.cpp:165
 msgid "Selection List - Search: "
 msgstr ""
 
-#: src/emu/ui/selector.cpp:196
+#: src/emu/ui/selector.cpp:194
 #, c-format
 msgid "Double click or press %1$s to select"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:39
+#: src/emu/ui/selgame.cpp:38
 msgid "General Info"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:374 src/emu/ui/selsoft.cpp:282
+#: src/emu/ui/selgame.cpp:380 src/emu/ui/selsoft.cpp:281
 #, c-format
 msgid ""
 "%s\n"
 " added to favorites list."
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:380 src/emu/ui/selgame.cpp:389
-#: src/emu/ui/selsoft.cpp:287
+#: src/emu/ui/selgame.cpp:386 src/emu/ui/selgame.cpp:395
+#: src/emu/ui/selsoft.cpp:286
 #, c-format
 msgid ""
 "%s\n"
 " removed from favorites list."
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:450
+#: src/emu/ui/selgame.cpp:457
 msgid ""
 "The selected machine is missing one or more required ROM or CHD images. "
 "Please select a different machine.\n"
@@ -993,275 +1009,275 @@ msgid ""
 "Press any key to continue."
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:589 src/emu/ui/simpleselgame.cpp:265
+#: src/emu/ui/selgame.cpp:595 src/emu/ui/simpleselgame.cpp:265
 msgid "Configure Options"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:752
+#: src/emu/ui/selgame.cpp:596
+msgid "Configure Machine"
+msgstr ""
+
+#: src/emu/ui/selgame.cpp:758
 #, c-format
 msgid "%1$s %2$s ( %3$d / %4$d machines (%5$d BIOS) )"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:762
+#: src/emu/ui/selgame.cpp:768
 #, c-format
 msgid "%1$s (%2$s - %3$s) - "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:769 src/emu/ui/selgame.cpp:775
+#: src/emu/ui/selgame.cpp:775 src/emu/ui/selgame.cpp:781
 #, c-format
 msgid "%1$s (%2$s) - "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:784
+#: src/emu/ui/selgame.cpp:790
 #, c-format
 msgid "%1$s Search: %2$s_"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:838
+#: src/emu/ui/selgame.cpp:844
 #, c-format
 msgid "Romset: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:841 src/emu/ui/selgame.cpp:890
-#: src/emu/ui/selsoft.cpp:751 src/emu/ui/selsoft.cpp:801
+#: src/emu/ui/selgame.cpp:847 src/emu/ui/selgame.cpp:896
+#: src/emu/ui/selsoft.cpp:750 src/emu/ui/selsoft.cpp:800
 #: src/emu/ui/simpleselgame.cpp:328
 #, c-format
 msgid "%1$s, %2$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:847 src/emu/ui/selsoft.cpp:757
+#: src/emu/ui/selgame.cpp:853 src/emu/ui/selsoft.cpp:756
 #, c-format
 msgid "Driver is clone of: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:849 src/emu/ui/selsoft.cpp:759
+#: src/emu/ui/selgame.cpp:855 src/emu/ui/selsoft.cpp:758
 msgid "Driver is parent"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:853 src/emu/ui/selsoft.cpp:763
+#: src/emu/ui/selgame.cpp:859 src/emu/ui/selsoft.cpp:762
 #: src/emu/ui/simpleselgame.cpp:335
 msgid "Overall: NOT WORKING"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:855 src/emu/ui/selsoft.cpp:765
+#: src/emu/ui/selgame.cpp:861 src/emu/ui/selsoft.cpp:764
 #: src/emu/ui/simpleselgame.cpp:337
 msgid "Overall: Unemulated Protection"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:857 src/emu/ui/selsoft.cpp:767
+#: src/emu/ui/selgame.cpp:863 src/emu/ui/selsoft.cpp:766
 #: src/emu/ui/simpleselgame.cpp:339
 msgid "Overall: Working"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:861 src/emu/ui/selsoft.cpp:771
+#: src/emu/ui/selgame.cpp:867 src/emu/ui/selsoft.cpp:770
 msgid "Graphics: Imperfect, "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:863 src/emu/ui/selsoft.cpp:773
+#: src/emu/ui/selgame.cpp:869 src/emu/ui/selsoft.cpp:772
 msgid "Graphics: OK, "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:866 src/emu/ui/selsoft.cpp:776
+#: src/emu/ui/selgame.cpp:872 src/emu/ui/selsoft.cpp:775
 msgid "Sound: Unimplemented"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:868 src/emu/ui/selsoft.cpp:778
+#: src/emu/ui/selgame.cpp:874 src/emu/ui/selsoft.cpp:777
 msgid "Sound: Imperfect"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:870 src/emu/ui/selsoft.cpp:780
+#: src/emu/ui/selgame.cpp:876 src/emu/ui/selsoft.cpp:779
 msgid "Sound: OK"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:887
+#: src/emu/ui/selgame.cpp:893
 #, c-format
 msgid "System: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:894 src/emu/ui/selsoft.cpp:805
+#: src/emu/ui/selgame.cpp:900 src/emu/ui/selsoft.cpp:804
 #, c-format
 msgid "Software is clone of: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:896 src/emu/ui/selsoft.cpp:807
+#: src/emu/ui/selgame.cpp:902 src/emu/ui/selsoft.cpp:806
 msgid "Software is parent"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:901 src/emu/ui/selsoft.cpp:812
+#: src/emu/ui/selgame.cpp:907 src/emu/ui/selsoft.cpp:811
 msgid "Supported: No"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:906 src/emu/ui/selsoft.cpp:817
+#: src/emu/ui/selgame.cpp:912 src/emu/ui/selsoft.cpp:816
 msgid "Supported: Partial"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:911 src/emu/ui/selsoft.cpp:822
+#: src/emu/ui/selgame.cpp:917 src/emu/ui/selsoft.cpp:821
 msgid "Supported: Yes"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:916 src/emu/ui/selsoft.cpp:827
+#: src/emu/ui/selgame.cpp:922 src/emu/ui/selsoft.cpp:826
 #, c-format
 msgid "romset: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:923
+#: src/emu/ui/selgame.cpp:929
 #, c-format
 msgid "%1$s %2$s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1535
+#: src/emu/ui/selgame.cpp:1543
 #, c-format
 msgid "Romset: %1$-.100s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1536
+#: src/emu/ui/selgame.cpp:1544
 #, c-format
 msgid "Year: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1537
+#: src/emu/ui/selgame.cpp:1545
 #, c-format
 msgid "Manufacturer: %1$-.100s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1541
+#: src/emu/ui/selgame.cpp:1549
 #, c-format
 msgid "Driver is Clone of: %1$-.100s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1543
+#: src/emu/ui/selgame.cpp:1551
 msgid "Driver is Parent\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1546
+#: src/emu/ui/selgame.cpp:1554
 msgid "Overall: NOT WORKING\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1548
+#: src/emu/ui/selgame.cpp:1556
 msgid "Overall: Unemulated Protection\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1550
+#: src/emu/ui/selgame.cpp:1558
 msgid "Overall: Working\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1553
+#: src/emu/ui/selgame.cpp:1561
 msgid "Graphics: Imperfect Colors\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1557
+#: src/emu/ui/selgame.cpp:1565
 msgid "Graphics: Imperfect\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1559
+#: src/emu/ui/selgame.cpp:1567
 msgid "Graphics: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1562
+#: src/emu/ui/selgame.cpp:1570
 msgid "Sound: Unimplemented\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1564
+#: src/emu/ui/selgame.cpp:1572
 msgid "Sound: Imperfect\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1566
+#: src/emu/ui/selgame.cpp:1574
 msgid "Sound: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1568
+#: src/emu/ui/selgame.cpp:1576
 #, c-format
 msgid "Driver is Skeleton: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1569
+#: src/emu/ui/selgame.cpp:1577
 #, c-format
 msgid "Game is Mechanical: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1570
+#: src/emu/ui/selgame.cpp:1578
 #, c-format
 msgid "Requires Artwork: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1571
+#: src/emu/ui/selgame.cpp:1579
 #, c-format
 msgid "Requires Clickable Artwork: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1572
+#: src/emu/ui/selgame.cpp:1580
 #, c-format
 msgid "Support Cocktail: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1573
+#: src/emu/ui/selgame.cpp:1581
 #, c-format
 msgid "Driver is Bios: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1574
+#: src/emu/ui/selgame.cpp:1582
 #, c-format
 msgid "Support Save: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 #, c-format
 msgid "Screen Orientation: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 msgid "Vertical"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 msgid "Horizontal"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/selgame.cpp:1591
 #, c-format
 msgid "Requires CHD: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1596
+#: src/emu/ui/selgame.cpp:1604
 msgid "Roms Audit Pass: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1598
+#: src/emu/ui/selgame.cpp:1606
 msgid "Roms Audit Pass: BAD\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1601
+#: src/emu/ui/selgame.cpp:1609
 msgid "Samples Audit Pass: None Needed\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1603
+#: src/emu/ui/selgame.cpp:1611
 msgid "Samples Audit Pass: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1605
+#: src/emu/ui/selgame.cpp:1613
 msgid "Samples Audit Pass: BAD\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1608
+#: src/emu/ui/selgame.cpp:1616
 msgid ""
 "Roms Audit Pass: Disabled\n"
 "Samples Audit Pass: Disabled\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:2049 src/emu/ui/selgame.cpp:2212
-#: src/emu/ui/selsoft.cpp:1662
+#: src/emu/ui/selgame.cpp:2055 src/emu/ui/selgame.cpp:2216
+#: src/emu/ui/selsoft.cpp:1655
 msgid "No Infos Available"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:2162 src/emu/ui/selsoft.cpp:1607
+#: src/emu/ui/selgame.cpp:2168 src/emu/ui/selsoft.cpp:1602
 msgid "Usage"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:110
-msgid " (default)"
-msgstr ""
-
-#: src/emu/ui/selsoft.cpp:381
+#: src/emu/ui/selsoft.cpp:380
 msgid ""
 "The selected software is missing one or more required files. Please select a "
 "different software.\n"
@@ -1269,57 +1285,57 @@ msgid ""
 "Press any key to continue."
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:684
+#: src/emu/ui/selsoft.cpp:683
 #, c-format
-msgid "%1$s %2$s ( %3$d / %4$d softwares )"
+msgid "%1$s %2$s ( %3$d / %4$d software packages )"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:685
+#: src/emu/ui/selsoft.cpp:684
 #, c-format
 msgid "Driver: \"%1$s\" software list "
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:688
+#: src/emu/ui/selsoft.cpp:687
 #, c-format
 msgid "Region: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:690
+#: src/emu/ui/selsoft.cpp:689
 #, c-format
 msgid "Publisher: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:692
+#: src/emu/ui/selsoft.cpp:691
 #, c-format
 msgid "Year: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:694
+#: src/emu/ui/selsoft.cpp:693
 #, c-format
 msgid "Software List: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:696
+#: src/emu/ui/selsoft.cpp:695
 #, c-format
 msgid "Device type: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:698
+#: src/emu/ui/selsoft.cpp:697
 #, c-format
 msgid "%s Search: %s_"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:748 src/emu/ui/selsoft.cpp:798
+#: src/emu/ui/selsoft.cpp:747 src/emu/ui/selsoft.cpp:797
 #: src/emu/ui/simpleselgame.cpp:325
 #, c-format
 msgid "%1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:1998 src/emu/ui/selsoft.cpp:2018
+#: src/emu/ui/selsoft.cpp:1991 src/emu/ui/selsoft.cpp:2011
 msgid "Software part selection:"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:2136 src/emu/ui/selsoft.cpp:2156
+#: src/emu/ui/selsoft.cpp:2129 src/emu/ui/selsoft.cpp:2149
 msgid "Bios selection:"
 msgstr ""
 
@@ -1367,15 +1383,15 @@ msgstr ""
 msgid " [internal]"
 msgstr ""
 
-#: src/emu/ui/sndmenu.cpp:135
+#: src/emu/ui/sndmenu.cpp:133
 msgid "Sound"
 msgstr ""
 
-#: src/emu/ui/sndmenu.cpp:136
+#: src/emu/ui/sndmenu.cpp:134
 msgid "Sample Rate"
 msgstr ""
 
-#: src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/sndmenu.cpp:135
 msgid "Use External Samples"
 msgstr ""
 
@@ -1444,80 +1460,80 @@ msgstr ""
 msgid "Fast Forward"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:419
+#: src/emu/ui/ui.cpp:418
 msgid "This driver requires images to be loaded in the following device(s): "
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1074
+#: src/emu/ui/ui.cpp:1071
 msgid ""
 "One or more ROMs/CHDs for this machine are incorrect. The machine may not "
 "run correctly.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1087
+#: src/emu/ui/ui.cpp:1084
 msgid ""
 "There are known problems with this machine\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1091
+#: src/emu/ui/ui.cpp:1088
 msgid ""
 "One or more ROMs/CHDs for this machine have not been correctly dumped.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1095
+#: src/emu/ui/ui.cpp:1092
 #, c-format
 msgid "The keyboard emulation may not be 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1097
+#: src/emu/ui/ui.cpp:1094
 #, c-format
 msgid "The colors aren't 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1099
+#: src/emu/ui/ui.cpp:1096
 msgid "The colors are completely wrong.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1101
+#: src/emu/ui/ui.cpp:1098
 #, c-format
 msgid "The video emulation isn't 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1103
+#: src/emu/ui/ui.cpp:1100
 #, c-format
 msgid "The sound emulation isn't 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1105
+#: src/emu/ui/ui.cpp:1102
 msgid "The machine lacks sound.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1108
+#: src/emu/ui/ui.cpp:1105
 msgid "Screen flipping in cocktail mode is not supported.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1112
+#: src/emu/ui/ui.cpp:1109
 msgid "The machine requires external artwork files\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1117
+#: src/emu/ui/ui.cpp:1114
 msgid ""
 "This machine was never completed. It may exhibit strange behavior or missing "
 "elements that are not bugs in the emulation.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1122
+#: src/emu/ui/ui.cpp:1119
 msgid ""
 "This machine has no sound hardware, MAME will produce no sounds, this is "
 "expected behaviour.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1130
+#: src/emu/ui/ui.cpp:1127
 msgid "The machine has protection which isn't fully emulated.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1133
+#: src/emu/ui/ui.cpp:1130
 msgid ""
 "\n"
 "THIS MACHINE DOESN'T WORK. The emulation for this machine is not yet "
@@ -1525,7 +1541,7 @@ msgid ""
 "the developers to improve the emulation.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1137
+#: src/emu/ui/ui.cpp:1134
 msgid ""
 "\n"
 "Certain elements of this machine cannot be emulated as it requires actual "
@@ -1533,21 +1549,21 @@ msgid ""
 "to fully play this machine.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1156
+#: src/emu/ui/ui.cpp:1153
 msgid ""
 "\n"
 "\n"
 "There are working clones of this machine: "
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1170
+#: src/emu/ui/ui.cpp:1167
 msgid ""
 "\n"
 "\n"
 "Press any key to continue"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1185
+#: src/emu/ui/ui.cpp:1182
 #, c-format
 msgid ""
 "%1$s\n"
@@ -1557,98 +1573,98 @@ msgid ""
 "CPU:\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1221 src/emu/ui/ui.cpp:1260
+#: src/emu/ui/ui.cpp:1218 src/emu/ui/ui.cpp:1257
 msgid "MHz"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1221 src/emu/ui/ui.cpp:1260
+#: src/emu/ui/ui.cpp:1218 src/emu/ui/ui.cpp:1257
 msgid "kHz"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1235
+#: src/emu/ui/ui.cpp:1232
 msgid ""
 "\n"
 "Sound:\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1264
+#: src/emu/ui/ui.cpp:1261
 msgid ""
 "\n"
 "Video:\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1268
+#: src/emu/ui/ui.cpp:1265
 msgid "None\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1275
+#: src/emu/ui/ui.cpp:1272
 msgid "Vector"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1286
+#: src/emu/ui/ui.cpp:1283
 #, c-format
 msgid "%1$s: %2$s\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1286
+#: src/emu/ui/ui.cpp:1283
 msgid "%2$s\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1541 src/emu/ui/ui.cpp:1551
+#: src/emu/ui/ui.cpp:1538 src/emu/ui/ui.cpp:1548
 msgid "Keyboard Emulation Status"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1543
+#: src/emu/ui/ui.cpp:1540
 msgid "Mode: PARTIAL Emulation"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1544
+#: src/emu/ui/ui.cpp:1541
 msgid "UI:   Enabled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1546 src/emu/ui/ui.cpp:1556
+#: src/emu/ui/ui.cpp:1543 src/emu/ui/ui.cpp:1553
 msgid "**Use ScrLock to toggle**"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1553
+#: src/emu/ui/ui.cpp:1550
 msgid "Mode: FULL Emulation"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1554
+#: src/emu/ui/ui.cpp:1551
 msgid "UI:   Disabled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1692
+#: src/emu/ui/ui.cpp:1689
 msgid "Autofire can't be enabled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1731
+#: src/emu/ui/ui.cpp:1728
 msgid "Select position to save to"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1733
+#: src/emu/ui/ui.cpp:1730
 msgid "Select position to load from"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1757
+#: src/emu/ui/ui.cpp:1754
 msgid "Save cancelled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1759
+#: src/emu/ui/ui.cpp:1756
 msgid "Load cancelled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1802
+#: src/emu/ui/ui.cpp:1799
 #, c-format
 msgid "Save to position %s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1807
+#: src/emu/ui/ui.cpp:1804
 #, c-format
 msgid "Load from position %s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1847
+#: src/emu/ui/ui.cpp:1844
 #, c-format
 msgid ""
 "Are you sure you want to quit?\n"
@@ -1657,173 +1673,173 @@ msgid ""
 "Press ''%2$s'' to return to emulation."
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1917
+#: src/emu/ui/ui.cpp:1914
 msgid "Master Volume"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1926
+#: src/emu/ui/ui.cpp:1923
 #, c-format
 msgid "%1$s Volume"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1949
+#: src/emu/ui/ui.cpp:1946
 #, c-format
 msgid "Overclock CPU %1$s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1968
+#: src/emu/ui/ui.cpp:1965
 #, c-format
 msgid "%1$s Refresh Rate"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1973
+#: src/emu/ui/ui.cpp:1970
 #, c-format
 msgid "%1$s Brightness"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1975
+#: src/emu/ui/ui.cpp:1972
 #, c-format
 msgid "%1$s Contrast"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1977
+#: src/emu/ui/ui.cpp:1974
 #, c-format
 msgid "%1$s Gamma"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1981
+#: src/emu/ui/ui.cpp:1978
 #, c-format
 msgid "%1$s Horiz Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1983
+#: src/emu/ui/ui.cpp:1980
 #, c-format
 msgid "%1$s Horiz Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1985
+#: src/emu/ui/ui.cpp:1982
 #, c-format
 msgid "%1$s Vert Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1987
+#: src/emu/ui/ui.cpp:1984
 #, c-format
 msgid "%1$s Vert Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2005
+#: src/emu/ui/ui.cpp:2002
 #, c-format
 msgid "Laserdisc '%1$s' Horiz Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2007
+#: src/emu/ui/ui.cpp:2004
 #, c-format
 msgid "Laserdisc '%1$s' Horiz Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2009
+#: src/emu/ui/ui.cpp:2006
 #, c-format
 msgid "Laserdisc '%1$s' Vert Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2011
+#: src/emu/ui/ui.cpp:2008
 #, c-format
 msgid "Laserdisc '%1$s' Vert Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2021
+#: src/emu/ui/ui.cpp:2018
 msgid "Vector Flicker"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2022
+#: src/emu/ui/ui.cpp:2019
 msgid "Beam Width Minimum"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2023
+#: src/emu/ui/ui.cpp:2020
 msgid "Beam Width Maximum"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2024
+#: src/emu/ui/ui.cpp:2021
 msgid "Beam Intensity Weight"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2037
+#: src/emu/ui/ui.cpp:2034
 #, c-format
 msgid "Crosshair Scale %1$s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2037 src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2034 src/emu/ui/ui.cpp:2036
 msgid "X"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2037 src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2034 src/emu/ui/ui.cpp:2036
 msgid "Y"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2036
 #, c-format
 msgid "Crosshair Offset %1$s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2071
+#: src/emu/ui/ui.cpp:2068
 #, c-format
 msgid "%1$3ddB"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2115
+#: src/emu/ui/ui.cpp:2112
 #, c-format
 msgid "%1$d%%"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2131
+#: src/emu/ui/ui.cpp:2128
 #, c-format
 msgid "%1$3.0f%%"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2154
+#: src/emu/ui/ui.cpp:2151
 #, c-format
 msgid "%1$.3ffps"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2177 src/emu/ui/ui.cpp:2199 src/emu/ui/ui.cpp:2220
-#: src/emu/ui/ui.cpp:2242 src/emu/ui/ui.cpp:2264 src/emu/ui/ui.cpp:2286
-#: src/emu/ui/ui.cpp:2308 src/emu/ui/ui.cpp:2330 src/emu/ui/ui.cpp:2352
-#: src/emu/ui/ui.cpp:2374 src/emu/ui/ui.cpp:2396
+#: src/emu/ui/ui.cpp:2174 src/emu/ui/ui.cpp:2196 src/emu/ui/ui.cpp:2217
+#: src/emu/ui/ui.cpp:2239 src/emu/ui/ui.cpp:2261 src/emu/ui/ui.cpp:2283
+#: src/emu/ui/ui.cpp:2305 src/emu/ui/ui.cpp:2327 src/emu/ui/ui.cpp:2349
+#: src/emu/ui/ui.cpp:2371 src/emu/ui/ui.cpp:2393
 #, c-format
 msgid "%1$.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2412 src/emu/ui/ui.cpp:2428 src/emu/ui/ui.cpp:2444
-#: src/emu/ui/ui.cpp:2460
+#: src/emu/ui/ui.cpp:2408 src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2438
+#: src/emu/ui/ui.cpp:2453
 #, c-format
 msgid "%1$1.2f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2476
+#: src/emu/ui/ui.cpp:2469
 #, c-format
 msgid "Screen '%1$s'"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2478
+#: src/emu/ui/ui.cpp:2471
 msgid "Screen"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2494
+#: src/emu/ui/ui.cpp:2487
 #, c-format
 msgid "Crosshair Scale X %1$1.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2494
+#: src/emu/ui/ui.cpp:2487
 #, c-format
 msgid "Crosshair Scale Y %1$1.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2513
+#: src/emu/ui/ui.cpp:2506
 #, c-format
 msgid "Crosshair Offset X %1$1.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2513
+#: src/emu/ui/ui.cpp:2506
 #, c-format
 msgid "Crosshair Offset Y %1$1.3f"
 msgstr ""
@@ -1865,10 +1881,10 @@ msgstr ""
 msgid "Full"
 msgstr ""
 
-#: src/emu/ui/viewgfx.cpp:392
+#: src/emu/ui/viewgfx.cpp:391
 msgid " COLORS"
 msgstr ""
 
-#: src/emu/ui/viewgfx.cpp:392
+#: src/emu/ui/viewgfx.cpp:391
 msgid " PENS"
 msgstr ""
diff --git a/language/Burmese/strings.po b/language/Burmese/strings.po
index e19b8e3a16c..55356ea2a7c 100644
--- a/language/Burmese/strings.po
+++ b/language/Burmese/strings.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MAME\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-11 03:33+0200\n"
+"POT-Creation-Date: 2016-04-15 17:42+0200\n"
 "PO-Revision-Date: 2016-02-20 18:03+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: MAME Language Team\n"
@@ -59,14 +59,14 @@ msgstr ""
 msgid "Autofire Status"
 msgstr ""
 
-#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1698
+#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1695
 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211
 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219
 #: src/emu/ui/videoopt.cpp:223
 msgid "Disabled"
 msgstr ""
 
-#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1698
+#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1695
 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211
 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219
 #: src/emu/ui/videoopt.cpp:223
@@ -74,14 +74,14 @@ msgid "Enabled"
 msgstr ""
 
 #: src/emu/ui/cheatopt.cpp:282 src/emu/ui/cheatopt.cpp:288
-#: src/emu/ui/menu.cpp:710 src/emu/ui/miscmenu.cpp:831
-#: src/emu/ui/sndmenu.cpp:135 src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/menu.cpp:755 src/emu/ui/miscmenu.cpp:936
+#: src/emu/ui/sndmenu.cpp:133 src/emu/ui/sndmenu.cpp:135
 msgid "On"
 msgstr ""
 
 #: src/emu/ui/cheatopt.cpp:282 src/emu/ui/cheatopt.cpp:288
-#: src/emu/ui/menu.cpp:713 src/emu/ui/miscmenu.cpp:831
-#: src/emu/ui/sndmenu.cpp:135 src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/menu.cpp:758 src/emu/ui/miscmenu.cpp:936
+#: src/emu/ui/sndmenu.cpp:133 src/emu/ui/sndmenu.cpp:135
 msgid "Off"
 msgstr ""
 
@@ -93,316 +93,316 @@ msgstr ""
 msgid "Autofire Delay"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:158 src/emu/ui/custmenu.cpp:447
+#: src/emu/ui/custmenu.cpp:157 src/emu/ui/custmenu.cpp:445
 msgid "Main filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:167 src/emu/ui/custmenu.cpp:456
+#: src/emu/ui/custmenu.cpp:166 src/emu/ui/custmenu.cpp:454
 msgid "Other filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:176 src/emu/ui/optsmenu.cpp:239
+#: src/emu/ui/custmenu.cpp:175 src/emu/ui/optsmenu.cpp:238
 msgid "^!Manufacturer"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:185 src/emu/ui/custmenu.cpp:474
-#: src/emu/ui/optsmenu.cpp:247
+#: src/emu/ui/custmenu.cpp:184 src/emu/ui/custmenu.cpp:472
+#: src/emu/ui/optsmenu.cpp:246
 msgid "^!Year"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:194 src/emu/ui/custmenu.cpp:510
+#: src/emu/ui/custmenu.cpp:193 src/emu/ui/custmenu.cpp:508
 msgid "Remove last filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:197 src/emu/ui/custmenu.cpp:513
+#: src/emu/ui/custmenu.cpp:196 src/emu/ui/custmenu.cpp:511
 msgid "Add filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:212 src/emu/ui/custmenu.cpp:233
-#: src/emu/ui/custmenu.cpp:529 src/emu/ui/custmenu.cpp:550
+#: src/emu/ui/custmenu.cpp:211 src/emu/ui/custmenu.cpp:231
+#: src/emu/ui/custmenu.cpp:527 src/emu/ui/custmenu.cpp:547
 msgid "Select custom filters:"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:465
+#: src/emu/ui/custmenu.cpp:463
 msgid "^!Publisher"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:483
+#: src/emu/ui/custmenu.cpp:481
 msgid "^!Software List"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:492
+#: src/emu/ui/custmenu.cpp:490
 msgid "^!Device type"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:501
+#: src/emu/ui/custmenu.cpp:499
 msgid "^!Region"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:23
+#: src/emu/ui/custui.cpp:22
 msgid "Show All"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:24
+#: src/emu/ui/custui.cpp:23
 msgid "Hide Filters"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:25
+#: src/emu/ui/custui.cpp:24
 msgid "Hide Info/Image"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:26
+#: src/emu/ui/custui.cpp:25
 msgid "Hide Both"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:142
+#: src/emu/ui/custui.cpp:141
 msgid "Fonts"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:143
+#: src/emu/ui/custui.cpp:142
 msgid "Colors"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:148 src/emu/ui/dirmenu.cpp:33
+#: src/emu/ui/custui.cpp:147 src/emu/ui/dirmenu.cpp:33
 msgid "Language"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:152
+#: src/emu/ui/custui.cpp:151
 msgid "Show side panels"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:167 src/emu/ui/custui.cpp:188
+#: src/emu/ui/custui.cpp:166 src/emu/ui/custui.cpp:186
 msgid "Custom UI Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:246
+#: src/emu/ui/custui.cpp:244
 msgid "default"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:349
+#: src/emu/ui/custui.cpp:347
 msgid "UI Font"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:354
+#: src/emu/ui/custui.cpp:352
 msgid "Bold"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:355
+#: src/emu/ui/custui.cpp:353
 msgid "Italic"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:360
+#: src/emu/ui/custui.cpp:358
 msgid "Lines"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:366
+#: src/emu/ui/custui.cpp:364
 msgid "Infos text size"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:383
+#: src/emu/ui/custui.cpp:381
 msgid "UI Fonts Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:411
+#: src/emu/ui/custui.cpp:408
 msgid "Sample text - Lorem ipsum dolor sit amet, consectetur adipiscing elit."
 msgstr ""
 
-#: src/emu/ui/custui.cpp:509
+#: src/emu/ui/custui.cpp:506
 msgid "Normal text"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:510
+#: src/emu/ui/custui.cpp:507
 msgid "Selected color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:511
+#: src/emu/ui/custui.cpp:508
 msgid "Normal text background"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:512
+#: src/emu/ui/custui.cpp:509
 msgid "Selected background color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:513
+#: src/emu/ui/custui.cpp:510
 msgid "Subitem color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:514 src/emu/ui/custui.cpp:610
+#: src/emu/ui/custui.cpp:511 src/emu/ui/custui.cpp:606
 msgid "Clone"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:515
+#: src/emu/ui/custui.cpp:512
 msgid "Border"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:516
+#: src/emu/ui/custui.cpp:513
 msgid "Background"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:517
+#: src/emu/ui/custui.cpp:514
 msgid "Dipswitch"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:518
+#: src/emu/ui/custui.cpp:515
 msgid "Unavailable color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:519
+#: src/emu/ui/custui.cpp:516
 msgid "Slider color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:520
+#: src/emu/ui/custui.cpp:517
 msgid "Gfx viewer background"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:521
+#: src/emu/ui/custui.cpp:518
 msgid "Mouse over color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:522
+#: src/emu/ui/custui.cpp:519
 msgid "Mouse over background color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:523
+#: src/emu/ui/custui.cpp:520
 msgid "Mouse down color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:524
+#: src/emu/ui/custui.cpp:521
 msgid "Mouse down background color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:527
+#: src/emu/ui/custui.cpp:524
 msgid "Restore originals colors"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:543
+#: src/emu/ui/custui.cpp:540
 msgid "UI Colors Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:572
+#: src/emu/ui/custui.cpp:568
 #, c-format
 msgid "Double click or press %1$s to change the color value"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:598
+#: src/emu/ui/custui.cpp:594
 msgid "Menu Preview"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:606
+#: src/emu/ui/custui.cpp:602
 msgid "Normal"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:607
+#: src/emu/ui/custui.cpp:603
 msgid "Subitem"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:608
+#: src/emu/ui/custui.cpp:604
 msgid "Selected"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:609
+#: src/emu/ui/custui.cpp:605
 msgid "Mouse Over"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:841 src/emu/ui/custui.cpp:844
+#: src/emu/ui/custui.cpp:837 src/emu/ui/custui.cpp:840
 msgid "Alpha"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:849 src/emu/ui/custui.cpp:852
-#: src/emu/ui/custui.cpp:1013
+#: src/emu/ui/custui.cpp:845 src/emu/ui/custui.cpp:848
+#: src/emu/ui/custui.cpp:1007
 msgid "Red"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:857 src/emu/ui/custui.cpp:860
-#: src/emu/ui/custui.cpp:1016
+#: src/emu/ui/custui.cpp:853 src/emu/ui/custui.cpp:856
+#: src/emu/ui/custui.cpp:1010
 msgid "Green"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:865 src/emu/ui/custui.cpp:868
-#: src/emu/ui/custui.cpp:1017
+#: src/emu/ui/custui.cpp:861 src/emu/ui/custui.cpp:864
+#: src/emu/ui/custui.cpp:1011
 msgid "Blue"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:871
+#: src/emu/ui/custui.cpp:867
 msgid "Choose from palette"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:887
+#: src/emu/ui/custui.cpp:883
 msgid " - ARGB Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:912
+#: src/emu/ui/custui.cpp:907
 msgid "Color preview ="
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1009
+#: src/emu/ui/custui.cpp:1003
 msgid "White"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1010
+#: src/emu/ui/custui.cpp:1004
 msgid "Silver"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1011
+#: src/emu/ui/custui.cpp:1005
 msgid "Gray"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1012
+#: src/emu/ui/custui.cpp:1006
 msgid "Black"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1014
+#: src/emu/ui/custui.cpp:1008
 msgid "Orange"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1015
+#: src/emu/ui/custui.cpp:1009
 msgid "Yellow"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1018
+#: src/emu/ui/custui.cpp:1012
 msgid "Violet"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:65
+#: src/emu/ui/datmenu.cpp:64
 msgid "Software History"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:67
+#: src/emu/ui/datmenu.cpp:66
 msgid "Software Usage"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:199
+#: src/emu/ui/datmenu.cpp:196
 msgid "Revision: "
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:287 src/emu/ui/selgame.cpp:40
-#: src/emu/ui/selgame.cpp:2152 src/emu/ui/selgame.cpp:2161
-#: src/emu/ui/selsoft.cpp:1577 src/emu/ui/selsoft.cpp:1597
-#: src/emu/ui/selsoft.cpp:1606
+#: src/emu/ui/datmenu.cpp:284 src/emu/ui/selgame.cpp:39
+#: src/emu/ui/selgame.cpp:2158 src/emu/ui/selgame.cpp:2167
+#: src/emu/ui/selsoft.cpp:1574 src/emu/ui/selsoft.cpp:1592
+#: src/emu/ui/selsoft.cpp:1601
 msgid "History"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:289 src/emu/ui/selgame.cpp:41
+#: src/emu/ui/datmenu.cpp:286 src/emu/ui/selgame.cpp:40
 msgid "Mameinfo"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:291 src/emu/ui/selgame.cpp:43
+#: src/emu/ui/datmenu.cpp:288 src/emu/ui/selgame.cpp:42
 msgid "Messinfo"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:293 src/emu/ui/selgame.cpp:42
+#: src/emu/ui/datmenu.cpp:290 src/emu/ui/selgame.cpp:41
 msgid "Sysinfo"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:295 src/emu/ui/selgame.cpp:46
+#: src/emu/ui/datmenu.cpp:292 src/emu/ui/selgame.cpp:45
 msgid "Mamescore"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:297 src/emu/ui/selgame.cpp:45
+#: src/emu/ui/datmenu.cpp:294 src/emu/ui/selgame.cpp:44
 msgid "Gameinit"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:299 src/emu/ui/selgame.cpp:44
+#: src/emu/ui/datmenu.cpp:296 src/emu/ui/selgame.cpp:43
 msgid "Command"
 msgstr ""
 
@@ -554,75 +554,75 @@ msgstr ""
 msgid "Remove %1$s Folder"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:158
+#: src/emu/ui/filesel.cpp:161
 msgid "File Already Exists - Override?"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:160 src/emu/ui/selgame.cpp:1568
-#: src/emu/ui/selgame.cpp:1569 src/emu/ui/selgame.cpp:1570
-#: src/emu/ui/selgame.cpp:1571 src/emu/ui/selgame.cpp:1572
-#: src/emu/ui/selgame.cpp:1573 src/emu/ui/selgame.cpp:1574
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/filesel.cpp:163 src/emu/ui/selgame.cpp:1576
+#: src/emu/ui/selgame.cpp:1577 src/emu/ui/selgame.cpp:1578
+#: src/emu/ui/selgame.cpp:1579 src/emu/ui/selgame.cpp:1580
+#: src/emu/ui/selgame.cpp:1581 src/emu/ui/selgame.cpp:1582
+#: src/emu/ui/selgame.cpp:1591
 msgid "No"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:161 src/emu/ui/selgame.cpp:1568
-#: src/emu/ui/selgame.cpp:1569 src/emu/ui/selgame.cpp:1570
-#: src/emu/ui/selgame.cpp:1571 src/emu/ui/selgame.cpp:1572
-#: src/emu/ui/selgame.cpp:1573 src/emu/ui/selgame.cpp:1574
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/filesel.cpp:164 src/emu/ui/selgame.cpp:1576
+#: src/emu/ui/selgame.cpp:1577 src/emu/ui/selgame.cpp:1578
+#: src/emu/ui/selgame.cpp:1579 src/emu/ui/selgame.cpp:1580
+#: src/emu/ui/selgame.cpp:1581 src/emu/ui/selgame.cpp:1582
+#: src/emu/ui/selgame.cpp:1591
 msgid "Yes"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:272
+#: src/emu/ui/filesel.cpp:275
 msgid "New Image Name:"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:278
+#: src/emu/ui/filesel.cpp:281
 msgid "Image Format:"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:284
+#: src/emu/ui/filesel.cpp:287
 msgid "Create"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:315
+#: src/emu/ui/filesel.cpp:318
 msgid "Please enter a file extension too"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:503 src/emu/ui/swlist.cpp:65
+#: src/emu/ui/filesel.cpp:506 src/emu/ui/swlist.cpp:65
 msgid "[empty slot]"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:507
+#: src/emu/ui/filesel.cpp:510
 msgid "[create]"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:511 src/emu/ui/swlist.cpp:76
+#: src/emu/ui/filesel.cpp:514 src/emu/ui/swlist.cpp:76
 msgid "[software list]"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:803
+#: src/emu/ui/filesel.cpp:806
 msgid "Select image format"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:863
+#: src/emu/ui/filesel.cpp:866
 msgid "Select access mode"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:864
+#: src/emu/ui/filesel.cpp:867
 msgid "Read-only"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:866
+#: src/emu/ui/filesel.cpp:869
 msgid "Read-write"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:867
+#: src/emu/ui/filesel.cpp:870
 msgid "Read this image, write to another image"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:868
+#: src/emu/ui/filesel.cpp:871
 msgid "Read this image, write to diff"
 msgstr ""
 
@@ -648,7 +648,7 @@ msgstr ""
 msgid "[empty]"
 msgstr ""
 
-#: src/emu/ui/info_pty.cpp:26 src/emu/ui/mainmenu.cpp:91
+#: src/emu/ui/info_pty.cpp:26 src/emu/ui/mainmenu.cpp:96
 msgid "Pseudo terminals"
 msgstr ""
 
@@ -664,7 +664,7 @@ msgstr ""
 msgid "Other Controls"
 msgstr ""
 
-#: src/emu/ui/inputmap.cpp:622 src/emu/ui/miscmenu.cpp:91
+#: src/emu/ui/inputmap.cpp:622 src/emu/ui/miscmenu.cpp:92
 #: src/emu/ui/slotopt.cpp:172
 msgid "Reset"
 msgstr ""
@@ -697,27 +697,27 @@ msgstr ""
 msgid "Machine Information"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:78
+#: src/emu/ui/mainmenu.cpp:80
 msgid "Image Information"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:81
+#: src/emu/ui/mainmenu.cpp:83
 msgid "File Manager"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:86
+#: src/emu/ui/mainmenu.cpp:92
 msgid "Tape Control"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:94
+#: src/emu/ui/mainmenu.cpp:99
 msgid "Bios Selection"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:100
+#: src/emu/ui/mainmenu.cpp:104
 msgid "Slot Devices"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:107
+#: src/emu/ui/mainmenu.cpp:109
 msgid "Barcode Reader"
 msgstr ""
 
@@ -725,43 +725,43 @@ msgstr ""
 msgid "Network Devices"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:119
+#: src/emu/ui/mainmenu.cpp:118
 msgid "Keyboard Mode"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:122
+#: src/emu/ui/mainmenu.cpp:121
 msgid "Slider Controls"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:125
+#: src/emu/ui/mainmenu.cpp:124
 msgid "Video Options"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:129
+#: src/emu/ui/mainmenu.cpp:128
 msgid "Crosshair Options"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:133
+#: src/emu/ui/mainmenu.cpp:132
 msgid "Cheat"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:136
+#: src/emu/ui/mainmenu.cpp:135
 msgid "Plugin Options"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:140
+#: src/emu/ui/mainmenu.cpp:139
 msgid "External DAT View"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:146
+#: src/emu/ui/mainmenu.cpp:145 src/emu/ui/miscmenu.cpp:785
 msgid "Add To Favorites"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:148
+#: src/emu/ui/mainmenu.cpp:147 src/emu/ui/miscmenu.cpp:787
 msgid "Remove From Favorites"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:155
+#: src/emu/ui/mainmenu.cpp:154
 msgid "Select New Machine"
 msgstr ""
 
@@ -801,189 +801,205 @@ msgstr ""
 msgid "Return to Previous Menu"
 msgstr ""
 
-#: src/emu/ui/menu.cpp:716
+#: src/emu/ui/menu.cpp:761
 msgid "Auto"
 msgstr ""
 
-#: src/emu/ui/menu.cpp:2133
+#: src/emu/ui/menu.cpp:2195
 msgid "Images"
 msgstr ""
 
-#: src/emu/ui/menu.cpp:2134
+#: src/emu/ui/menu.cpp:2196
 msgid "Infos"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Keyboard Mode:"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Natural"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Emulated"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:240
+#: src/emu/ui/miscmenu.cpp:241
 #, c-format
 msgid ""
 "Uptime: %1$d:%2$02d:%3$02d\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:242
+#: src/emu/ui/miscmenu.cpp:243
 #, c-format
 msgid ""
 "Uptime: %1$d:%2$02d\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:246
+#: src/emu/ui/miscmenu.cpp:247
 #, c-format
 msgid ""
 "Tickets dispensed: %1$d\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:257
+#: src/emu/ui/miscmenu.cpp:258
 msgid "Coin %1$c: NA%3$s\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:257
+#: src/emu/ui/miscmenu.cpp:258
 #, c-format
 msgid "Coin %1$c: %2$d%3$s\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:260
+#: src/emu/ui/miscmenu.cpp:261
 msgid " (locked)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:519
+#: src/emu/ui/miscmenu.cpp:520
 msgid "Visible Delay"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:617
+#: src/emu/ui/miscmenu.cpp:619
 #, c-format
 msgid "%s.xml saved under ui folder."
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:645
+#: src/emu/ui/miscmenu.cpp:647
 msgid "Name:             Description:\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:657
+#: src/emu/ui/miscmenu.cpp:659
 #, c-format
 msgid "%s.txt saved under ui folder."
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:675
-msgid "Export XML format (like -listxml)"
+#: src/emu/ui/miscmenu.cpp:677
+msgid "Export list in XML format (like -listxml)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:676
-msgid "Export TXT format (like -listfull)"
+#: src/emu/ui/miscmenu.cpp:678
+msgid "Export list in XML format (like -listxml, but exclude devices)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:734
-msgid "Dummy"
+#: src/emu/ui/miscmenu.cpp:679
+msgid "Export list in TXT format (like -listfull)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:736
-msgid "Save machine configuration"
-msgstr ""
-
-#: src/emu/ui/miscmenu.cpp:848 src/emu/ui/miscmenu.cpp:869
-#: src/emu/ui/selgame.cpp:594
-msgid "Plugins"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:218
-msgid "Filter"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:226
-msgid " ^!File"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:231
-msgid " ^!Category"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:254
-msgid "^!Setup custom filter"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:262
-msgid "Customize UI"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:263
-msgid "Configure Directories"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:266 src/emu/ui/sndmenu.cpp:151
-#: src/emu/ui/sndmenu.cpp:172
-msgid "Sound Options"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:269
-msgid "General Inputs"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:272
-msgid "Save Configuration"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:286 src/emu/ui/optsmenu.cpp:307
-msgid "Settings"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:327
-msgid "**Error saving ui.ini**"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:374
-#, c-format
-msgid "**Error saving %s.ini**"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:378
+#: src/emu/ui/miscmenu.cpp:729 src/emu/ui/optsmenu.cpp:376
 msgid ""
 "\n"
 "    Configuration saved    \n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/selector.cpp:166
+#: src/emu/ui/miscmenu.cpp:774
+msgid "Bios"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:776
+msgid "Driver"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:790
+msgid "Save machine configuration"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:806
+msgid "Configure machine:"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:868 src/emu/ui/selsoft.cpp:109
+msgid " (default)"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:953 src/emu/ui/miscmenu.cpp:973
+#: src/emu/ui/selgame.cpp:600
+msgid "Plugins"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:217
+msgid "Filter"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:225
+msgid " ^!File"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:230
+msgid " ^!Category"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:253
+msgid "^!Setup custom filter"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:261
+msgid "Customize UI"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:262
+msgid "Configure Directories"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:265 src/emu/ui/sndmenu.cpp:149
+#: src/emu/ui/sndmenu.cpp:169
+msgid "Sound Options"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:268
+msgid "General Inputs"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:271
+msgid "Save Configuration"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:285 src/emu/ui/optsmenu.cpp:305
+msgid "Settings"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:325
+msgid "**Error saving ui.ini**"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:372
+#, c-format
+msgid "**Error saving %s.ini**"
+msgstr ""
+
+#: src/emu/ui/selector.cpp:165
 msgid "Selection List - Search: "
 msgstr ""
 
-#: src/emu/ui/selector.cpp:196
+#: src/emu/ui/selector.cpp:194
 #, c-format
 msgid "Double click or press %1$s to select"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:39
+#: src/emu/ui/selgame.cpp:38
 msgid "General Info"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:374 src/emu/ui/selsoft.cpp:282
+#: src/emu/ui/selgame.cpp:380 src/emu/ui/selsoft.cpp:281
 #, c-format
 msgid ""
 "%s\n"
 " added to favorites list."
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:380 src/emu/ui/selgame.cpp:389
-#: src/emu/ui/selsoft.cpp:287
+#: src/emu/ui/selgame.cpp:386 src/emu/ui/selgame.cpp:395
+#: src/emu/ui/selsoft.cpp:286
 #, c-format
 msgid ""
 "%s\n"
 " removed from favorites list."
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:450
+#: src/emu/ui/selgame.cpp:457
 msgid ""
 "The selected machine is missing one or more required ROM or CHD images. "
 "Please select a different machine.\n"
@@ -991,275 +1007,275 @@ msgid ""
 "Press any key to continue."
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:589 src/emu/ui/simpleselgame.cpp:265
+#: src/emu/ui/selgame.cpp:595 src/emu/ui/simpleselgame.cpp:265
 msgid "Configure Options"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:752
+#: src/emu/ui/selgame.cpp:596
+msgid "Configure Machine"
+msgstr ""
+
+#: src/emu/ui/selgame.cpp:758
 #, c-format
 msgid "%1$s %2$s ( %3$d / %4$d machines (%5$d BIOS) )"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:762
+#: src/emu/ui/selgame.cpp:768
 #, c-format
 msgid "%1$s (%2$s - %3$s) - "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:769 src/emu/ui/selgame.cpp:775
+#: src/emu/ui/selgame.cpp:775 src/emu/ui/selgame.cpp:781
 #, c-format
 msgid "%1$s (%2$s) - "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:784
+#: src/emu/ui/selgame.cpp:790
 #, c-format
 msgid "%1$s Search: %2$s_"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:838
+#: src/emu/ui/selgame.cpp:844
 #, c-format
 msgid "Romset: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:841 src/emu/ui/selgame.cpp:890
-#: src/emu/ui/selsoft.cpp:751 src/emu/ui/selsoft.cpp:801
+#: src/emu/ui/selgame.cpp:847 src/emu/ui/selgame.cpp:896
+#: src/emu/ui/selsoft.cpp:750 src/emu/ui/selsoft.cpp:800
 #: src/emu/ui/simpleselgame.cpp:328
 #, c-format
 msgid "%1$s, %2$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:847 src/emu/ui/selsoft.cpp:757
+#: src/emu/ui/selgame.cpp:853 src/emu/ui/selsoft.cpp:756
 #, c-format
 msgid "Driver is clone of: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:849 src/emu/ui/selsoft.cpp:759
+#: src/emu/ui/selgame.cpp:855 src/emu/ui/selsoft.cpp:758
 msgid "Driver is parent"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:853 src/emu/ui/selsoft.cpp:763
+#: src/emu/ui/selgame.cpp:859 src/emu/ui/selsoft.cpp:762
 #: src/emu/ui/simpleselgame.cpp:335
 msgid "Overall: NOT WORKING"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:855 src/emu/ui/selsoft.cpp:765
+#: src/emu/ui/selgame.cpp:861 src/emu/ui/selsoft.cpp:764
 #: src/emu/ui/simpleselgame.cpp:337
 msgid "Overall: Unemulated Protection"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:857 src/emu/ui/selsoft.cpp:767
+#: src/emu/ui/selgame.cpp:863 src/emu/ui/selsoft.cpp:766
 #: src/emu/ui/simpleselgame.cpp:339
 msgid "Overall: Working"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:861 src/emu/ui/selsoft.cpp:771
+#: src/emu/ui/selgame.cpp:867 src/emu/ui/selsoft.cpp:770
 msgid "Graphics: Imperfect, "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:863 src/emu/ui/selsoft.cpp:773
+#: src/emu/ui/selgame.cpp:869 src/emu/ui/selsoft.cpp:772
 msgid "Graphics: OK, "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:866 src/emu/ui/selsoft.cpp:776
+#: src/emu/ui/selgame.cpp:872 src/emu/ui/selsoft.cpp:775
 msgid "Sound: Unimplemented"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:868 src/emu/ui/selsoft.cpp:778
+#: src/emu/ui/selgame.cpp:874 src/emu/ui/selsoft.cpp:777
 msgid "Sound: Imperfect"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:870 src/emu/ui/selsoft.cpp:780
+#: src/emu/ui/selgame.cpp:876 src/emu/ui/selsoft.cpp:779
 msgid "Sound: OK"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:887
+#: src/emu/ui/selgame.cpp:893
 #, c-format
 msgid "System: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:894 src/emu/ui/selsoft.cpp:805
+#: src/emu/ui/selgame.cpp:900 src/emu/ui/selsoft.cpp:804
 #, c-format
 msgid "Software is clone of: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:896 src/emu/ui/selsoft.cpp:807
+#: src/emu/ui/selgame.cpp:902 src/emu/ui/selsoft.cpp:806
 msgid "Software is parent"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:901 src/emu/ui/selsoft.cpp:812
+#: src/emu/ui/selgame.cpp:907 src/emu/ui/selsoft.cpp:811
 msgid "Supported: No"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:906 src/emu/ui/selsoft.cpp:817
+#: src/emu/ui/selgame.cpp:912 src/emu/ui/selsoft.cpp:816
 msgid "Supported: Partial"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:911 src/emu/ui/selsoft.cpp:822
+#: src/emu/ui/selgame.cpp:917 src/emu/ui/selsoft.cpp:821
 msgid "Supported: Yes"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:916 src/emu/ui/selsoft.cpp:827
+#: src/emu/ui/selgame.cpp:922 src/emu/ui/selsoft.cpp:826
 #, c-format
 msgid "romset: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:923
+#: src/emu/ui/selgame.cpp:929
 #, c-format
 msgid "%1$s %2$s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1535
+#: src/emu/ui/selgame.cpp:1543
 #, c-format
 msgid "Romset: %1$-.100s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1536
+#: src/emu/ui/selgame.cpp:1544
 #, c-format
 msgid "Year: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1537
+#: src/emu/ui/selgame.cpp:1545
 #, c-format
 msgid "Manufacturer: %1$-.100s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1541
+#: src/emu/ui/selgame.cpp:1549
 #, c-format
 msgid "Driver is Clone of: %1$-.100s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1543
+#: src/emu/ui/selgame.cpp:1551
 msgid "Driver is Parent\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1546
+#: src/emu/ui/selgame.cpp:1554
 msgid "Overall: NOT WORKING\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1548
+#: src/emu/ui/selgame.cpp:1556
 msgid "Overall: Unemulated Protection\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1550
+#: src/emu/ui/selgame.cpp:1558
 msgid "Overall: Working\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1553
+#: src/emu/ui/selgame.cpp:1561
 msgid "Graphics: Imperfect Colors\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1557
+#: src/emu/ui/selgame.cpp:1565
 msgid "Graphics: Imperfect\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1559
+#: src/emu/ui/selgame.cpp:1567
 msgid "Graphics: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1562
+#: src/emu/ui/selgame.cpp:1570
 msgid "Sound: Unimplemented\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1564
+#: src/emu/ui/selgame.cpp:1572
 msgid "Sound: Imperfect\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1566
+#: src/emu/ui/selgame.cpp:1574
 msgid "Sound: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1568
+#: src/emu/ui/selgame.cpp:1576
 #, c-format
 msgid "Driver is Skeleton: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1569
+#: src/emu/ui/selgame.cpp:1577
 #, c-format
 msgid "Game is Mechanical: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1570
+#: src/emu/ui/selgame.cpp:1578
 #, c-format
 msgid "Requires Artwork: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1571
+#: src/emu/ui/selgame.cpp:1579
 #, c-format
 msgid "Requires Clickable Artwork: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1572
+#: src/emu/ui/selgame.cpp:1580
 #, c-format
 msgid "Support Cocktail: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1573
+#: src/emu/ui/selgame.cpp:1581
 #, c-format
 msgid "Driver is Bios: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1574
+#: src/emu/ui/selgame.cpp:1582
 #, c-format
 msgid "Support Save: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 #, c-format
 msgid "Screen Orientation: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 msgid "Vertical"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 msgid "Horizontal"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/selgame.cpp:1591
 #, c-format
 msgid "Requires CHD: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1596
+#: src/emu/ui/selgame.cpp:1604
 msgid "Roms Audit Pass: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1598
+#: src/emu/ui/selgame.cpp:1606
 msgid "Roms Audit Pass: BAD\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1601
+#: src/emu/ui/selgame.cpp:1609
 msgid "Samples Audit Pass: None Needed\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1603
+#: src/emu/ui/selgame.cpp:1611
 msgid "Samples Audit Pass: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1605
+#: src/emu/ui/selgame.cpp:1613
 msgid "Samples Audit Pass: BAD\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1608
+#: src/emu/ui/selgame.cpp:1616
 msgid ""
 "Roms Audit Pass: Disabled\n"
 "Samples Audit Pass: Disabled\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:2049 src/emu/ui/selgame.cpp:2212
-#: src/emu/ui/selsoft.cpp:1662
+#: src/emu/ui/selgame.cpp:2055 src/emu/ui/selgame.cpp:2216
+#: src/emu/ui/selsoft.cpp:1655
 msgid "No Infos Available"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:2162 src/emu/ui/selsoft.cpp:1607
+#: src/emu/ui/selgame.cpp:2168 src/emu/ui/selsoft.cpp:1602
 msgid "Usage"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:110
-msgid " (default)"
-msgstr ""
-
-#: src/emu/ui/selsoft.cpp:381
+#: src/emu/ui/selsoft.cpp:380
 msgid ""
 "The selected software is missing one or more required files. Please select a "
 "different software.\n"
@@ -1267,57 +1283,57 @@ msgid ""
 "Press any key to continue."
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:684
+#: src/emu/ui/selsoft.cpp:683
 #, c-format
-msgid "%1$s %2$s ( %3$d / %4$d softwares )"
+msgid "%1$s %2$s ( %3$d / %4$d software packages )"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:685
+#: src/emu/ui/selsoft.cpp:684
 #, c-format
 msgid "Driver: \"%1$s\" software list "
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:688
+#: src/emu/ui/selsoft.cpp:687
 #, c-format
 msgid "Region: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:690
+#: src/emu/ui/selsoft.cpp:689
 #, c-format
 msgid "Publisher: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:692
+#: src/emu/ui/selsoft.cpp:691
 #, c-format
 msgid "Year: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:694
+#: src/emu/ui/selsoft.cpp:693
 #, c-format
 msgid "Software List: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:696
+#: src/emu/ui/selsoft.cpp:695
 #, c-format
 msgid "Device type: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:698
+#: src/emu/ui/selsoft.cpp:697
 #, c-format
 msgid "%s Search: %s_"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:748 src/emu/ui/selsoft.cpp:798
+#: src/emu/ui/selsoft.cpp:747 src/emu/ui/selsoft.cpp:797
 #: src/emu/ui/simpleselgame.cpp:325
 #, c-format
 msgid "%1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:1998 src/emu/ui/selsoft.cpp:2018
+#: src/emu/ui/selsoft.cpp:1991 src/emu/ui/selsoft.cpp:2011
 msgid "Software part selection:"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:2136 src/emu/ui/selsoft.cpp:2156
+#: src/emu/ui/selsoft.cpp:2129 src/emu/ui/selsoft.cpp:2149
 msgid "Bios selection:"
 msgstr ""
 
@@ -1365,15 +1381,15 @@ msgstr ""
 msgid " [internal]"
 msgstr ""
 
-#: src/emu/ui/sndmenu.cpp:135
+#: src/emu/ui/sndmenu.cpp:133
 msgid "Sound"
 msgstr ""
 
-#: src/emu/ui/sndmenu.cpp:136
+#: src/emu/ui/sndmenu.cpp:134
 msgid "Sample Rate"
 msgstr ""
 
-#: src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/sndmenu.cpp:135
 msgid "Use External Samples"
 msgstr ""
 
@@ -1442,80 +1458,80 @@ msgstr ""
 msgid "Fast Forward"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:419
+#: src/emu/ui/ui.cpp:418
 msgid "This driver requires images to be loaded in the following device(s): "
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1074
+#: src/emu/ui/ui.cpp:1071
 msgid ""
 "One or more ROMs/CHDs for this machine are incorrect. The machine may not "
 "run correctly.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1087
+#: src/emu/ui/ui.cpp:1084
 msgid ""
 "There are known problems with this machine\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1091
+#: src/emu/ui/ui.cpp:1088
 msgid ""
 "One or more ROMs/CHDs for this machine have not been correctly dumped.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1095
+#: src/emu/ui/ui.cpp:1092
 #, c-format
 msgid "The keyboard emulation may not be 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1097
+#: src/emu/ui/ui.cpp:1094
 #, c-format
 msgid "The colors aren't 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1099
+#: src/emu/ui/ui.cpp:1096
 msgid "The colors are completely wrong.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1101
+#: src/emu/ui/ui.cpp:1098
 #, c-format
 msgid "The video emulation isn't 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1103
+#: src/emu/ui/ui.cpp:1100
 #, c-format
 msgid "The sound emulation isn't 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1105
+#: src/emu/ui/ui.cpp:1102
 msgid "The machine lacks sound.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1108
+#: src/emu/ui/ui.cpp:1105
 msgid "Screen flipping in cocktail mode is not supported.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1112
+#: src/emu/ui/ui.cpp:1109
 msgid "The machine requires external artwork files\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1117
+#: src/emu/ui/ui.cpp:1114
 msgid ""
 "This machine was never completed. It may exhibit strange behavior or missing "
 "elements that are not bugs in the emulation.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1122
+#: src/emu/ui/ui.cpp:1119
 msgid ""
 "This machine has no sound hardware, MAME will produce no sounds, this is "
 "expected behaviour.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1130
+#: src/emu/ui/ui.cpp:1127
 msgid "The machine has protection which isn't fully emulated.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1133
+#: src/emu/ui/ui.cpp:1130
 msgid ""
 "\n"
 "THIS MACHINE DOESN'T WORK. The emulation for this machine is not yet "
@@ -1523,7 +1539,7 @@ msgid ""
 "the developers to improve the emulation.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1137
+#: src/emu/ui/ui.cpp:1134
 msgid ""
 "\n"
 "Certain elements of this machine cannot be emulated as it requires actual "
@@ -1531,21 +1547,21 @@ msgid ""
 "to fully play this machine.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1156
+#: src/emu/ui/ui.cpp:1153
 msgid ""
 "\n"
 "\n"
 "There are working clones of this machine: "
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1170
+#: src/emu/ui/ui.cpp:1167
 msgid ""
 "\n"
 "\n"
 "Press any key to continue"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1185
+#: src/emu/ui/ui.cpp:1182
 #, c-format
 msgid ""
 "%1$s\n"
@@ -1555,98 +1571,98 @@ msgid ""
 "CPU:\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1221 src/emu/ui/ui.cpp:1260
+#: src/emu/ui/ui.cpp:1218 src/emu/ui/ui.cpp:1257
 msgid "MHz"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1221 src/emu/ui/ui.cpp:1260
+#: src/emu/ui/ui.cpp:1218 src/emu/ui/ui.cpp:1257
 msgid "kHz"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1235
+#: src/emu/ui/ui.cpp:1232
 msgid ""
 "\n"
 "Sound:\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1264
+#: src/emu/ui/ui.cpp:1261
 msgid ""
 "\n"
 "Video:\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1268
+#: src/emu/ui/ui.cpp:1265
 msgid "None\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1275
+#: src/emu/ui/ui.cpp:1272
 msgid "Vector"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1286
+#: src/emu/ui/ui.cpp:1283
 #, c-format
 msgid "%1$s: %2$s\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1286
+#: src/emu/ui/ui.cpp:1283
 msgid "%2$s\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1541 src/emu/ui/ui.cpp:1551
+#: src/emu/ui/ui.cpp:1538 src/emu/ui/ui.cpp:1548
 msgid "Keyboard Emulation Status"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1543
+#: src/emu/ui/ui.cpp:1540
 msgid "Mode: PARTIAL Emulation"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1544
+#: src/emu/ui/ui.cpp:1541
 msgid "UI:   Enabled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1546 src/emu/ui/ui.cpp:1556
+#: src/emu/ui/ui.cpp:1543 src/emu/ui/ui.cpp:1553
 msgid "**Use ScrLock to toggle**"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1553
+#: src/emu/ui/ui.cpp:1550
 msgid "Mode: FULL Emulation"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1554
+#: src/emu/ui/ui.cpp:1551
 msgid "UI:   Disabled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1692
+#: src/emu/ui/ui.cpp:1689
 msgid "Autofire can't be enabled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1731
+#: src/emu/ui/ui.cpp:1728
 msgid "Select position to save to"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1733
+#: src/emu/ui/ui.cpp:1730
 msgid "Select position to load from"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1757
+#: src/emu/ui/ui.cpp:1754
 msgid "Save cancelled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1759
+#: src/emu/ui/ui.cpp:1756
 msgid "Load cancelled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1802
+#: src/emu/ui/ui.cpp:1799
 #, c-format
 msgid "Save to position %s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1807
+#: src/emu/ui/ui.cpp:1804
 #, c-format
 msgid "Load from position %s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1847
+#: src/emu/ui/ui.cpp:1844
 #, c-format
 msgid ""
 "Are you sure you want to quit?\n"
@@ -1655,173 +1671,173 @@ msgid ""
 "Press ''%2$s'' to return to emulation."
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1917
+#: src/emu/ui/ui.cpp:1914
 msgid "Master Volume"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1926
+#: src/emu/ui/ui.cpp:1923
 #, c-format
 msgid "%1$s Volume"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1949
+#: src/emu/ui/ui.cpp:1946
 #, c-format
 msgid "Overclock CPU %1$s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1968
+#: src/emu/ui/ui.cpp:1965
 #, c-format
 msgid "%1$s Refresh Rate"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1973
+#: src/emu/ui/ui.cpp:1970
 #, c-format
 msgid "%1$s Brightness"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1975
+#: src/emu/ui/ui.cpp:1972
 #, c-format
 msgid "%1$s Contrast"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1977
+#: src/emu/ui/ui.cpp:1974
 #, c-format
 msgid "%1$s Gamma"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1981
+#: src/emu/ui/ui.cpp:1978
 #, c-format
 msgid "%1$s Horiz Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1983
+#: src/emu/ui/ui.cpp:1980
 #, c-format
 msgid "%1$s Horiz Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1985
+#: src/emu/ui/ui.cpp:1982
 #, c-format
 msgid "%1$s Vert Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1987
+#: src/emu/ui/ui.cpp:1984
 #, c-format
 msgid "%1$s Vert Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2005
+#: src/emu/ui/ui.cpp:2002
 #, c-format
 msgid "Laserdisc '%1$s' Horiz Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2007
+#: src/emu/ui/ui.cpp:2004
 #, c-format
 msgid "Laserdisc '%1$s' Horiz Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2009
+#: src/emu/ui/ui.cpp:2006
 #, c-format
 msgid "Laserdisc '%1$s' Vert Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2011
+#: src/emu/ui/ui.cpp:2008
 #, c-format
 msgid "Laserdisc '%1$s' Vert Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2021
+#: src/emu/ui/ui.cpp:2018
 msgid "Vector Flicker"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2022
+#: src/emu/ui/ui.cpp:2019
 msgid "Beam Width Minimum"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2023
+#: src/emu/ui/ui.cpp:2020
 msgid "Beam Width Maximum"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2024
+#: src/emu/ui/ui.cpp:2021
 msgid "Beam Intensity Weight"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2037
+#: src/emu/ui/ui.cpp:2034
 #, c-format
 msgid "Crosshair Scale %1$s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2037 src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2034 src/emu/ui/ui.cpp:2036
 msgid "X"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2037 src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2034 src/emu/ui/ui.cpp:2036
 msgid "Y"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2036
 #, c-format
 msgid "Crosshair Offset %1$s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2071
+#: src/emu/ui/ui.cpp:2068
 #, c-format
 msgid "%1$3ddB"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2115
+#: src/emu/ui/ui.cpp:2112
 #, c-format
 msgid "%1$d%%"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2131
+#: src/emu/ui/ui.cpp:2128
 #, c-format
 msgid "%1$3.0f%%"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2154
+#: src/emu/ui/ui.cpp:2151
 #, c-format
 msgid "%1$.3ffps"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2177 src/emu/ui/ui.cpp:2199 src/emu/ui/ui.cpp:2220
-#: src/emu/ui/ui.cpp:2242 src/emu/ui/ui.cpp:2264 src/emu/ui/ui.cpp:2286
-#: src/emu/ui/ui.cpp:2308 src/emu/ui/ui.cpp:2330 src/emu/ui/ui.cpp:2352
-#: src/emu/ui/ui.cpp:2374 src/emu/ui/ui.cpp:2396
+#: src/emu/ui/ui.cpp:2174 src/emu/ui/ui.cpp:2196 src/emu/ui/ui.cpp:2217
+#: src/emu/ui/ui.cpp:2239 src/emu/ui/ui.cpp:2261 src/emu/ui/ui.cpp:2283
+#: src/emu/ui/ui.cpp:2305 src/emu/ui/ui.cpp:2327 src/emu/ui/ui.cpp:2349
+#: src/emu/ui/ui.cpp:2371 src/emu/ui/ui.cpp:2393
 #, c-format
 msgid "%1$.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2412 src/emu/ui/ui.cpp:2428 src/emu/ui/ui.cpp:2444
-#: src/emu/ui/ui.cpp:2460
+#: src/emu/ui/ui.cpp:2408 src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2438
+#: src/emu/ui/ui.cpp:2453
 #, c-format
 msgid "%1$1.2f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2476
+#: src/emu/ui/ui.cpp:2469
 #, c-format
 msgid "Screen '%1$s'"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2478
+#: src/emu/ui/ui.cpp:2471
 msgid "Screen"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2494
+#: src/emu/ui/ui.cpp:2487
 #, c-format
 msgid "Crosshair Scale X %1$1.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2494
+#: src/emu/ui/ui.cpp:2487
 #, c-format
 msgid "Crosshair Scale Y %1$1.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2513
+#: src/emu/ui/ui.cpp:2506
 #, c-format
 msgid "Crosshair Offset X %1$1.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2513
+#: src/emu/ui/ui.cpp:2506
 #, c-format
 msgid "Crosshair Offset Y %1$1.3f"
 msgstr ""
@@ -1863,10 +1879,10 @@ msgstr ""
 msgid "Full"
 msgstr ""
 
-#: src/emu/ui/viewgfx.cpp:392
+#: src/emu/ui/viewgfx.cpp:391
 msgid " COLORS"
 msgstr ""
 
-#: src/emu/ui/viewgfx.cpp:392
+#: src/emu/ui/viewgfx.cpp:391
 msgid " PENS"
 msgstr ""
diff --git a/language/Catalan/strings.po b/language/Catalan/strings.po
index a5c76376088..38abcbbda54 100644
--- a/language/Catalan/strings.po
+++ b/language/Catalan/strings.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MAME 0.171\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-11 03:33+0200\n"
+"POT-Creation-Date: 2016-04-15 17:42+0200\n"
 "PO-Revision-Date: 2016-03-29 14:54+0200\n"
 "Last-Translator: Jordi Mallach <jordi@debian.org>\n"
 "Language-Team: Catalan <ca@dodds.net>\n"
@@ -59,14 +59,14 @@ msgstr "Torna a carregar-ho tot"
 msgid "Autofire Status"
 msgstr "Estat d'autotret"
 
-#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1698
+#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1695
 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211
 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219
 #: src/emu/ui/videoopt.cpp:223
 msgid "Disabled"
 msgstr "Inhabilitat"
 
-#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1698
+#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1695
 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211
 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219
 #: src/emu/ui/videoopt.cpp:223
@@ -74,14 +74,14 @@ msgid "Enabled"
 msgstr "Habilitat"
 
 #: src/emu/ui/cheatopt.cpp:282 src/emu/ui/cheatopt.cpp:288
-#: src/emu/ui/menu.cpp:710 src/emu/ui/miscmenu.cpp:831
-#: src/emu/ui/sndmenu.cpp:135 src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/menu.cpp:755 src/emu/ui/miscmenu.cpp:936
+#: src/emu/ui/sndmenu.cpp:133 src/emu/ui/sndmenu.cpp:135
 msgid "On"
 msgstr "Encès"
 
 #: src/emu/ui/cheatopt.cpp:282 src/emu/ui/cheatopt.cpp:288
-#: src/emu/ui/menu.cpp:713 src/emu/ui/miscmenu.cpp:831
-#: src/emu/ui/sndmenu.cpp:135 src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/menu.cpp:758 src/emu/ui/miscmenu.cpp:936
+#: src/emu/ui/sndmenu.cpp:133 src/emu/ui/sndmenu.cpp:135
 msgid "Off"
 msgstr "Apagat"
 
@@ -93,316 +93,316 @@ msgstr "No s'ha trobat cap botó en aquesta màquina!"
 msgid "Autofire Delay"
 msgstr "Retard d'autotret"
 
-#: src/emu/ui/custmenu.cpp:158 src/emu/ui/custmenu.cpp:447
+#: src/emu/ui/custmenu.cpp:157 src/emu/ui/custmenu.cpp:445
 msgid "Main filter"
 msgstr "Filtre principal"
 
-#: src/emu/ui/custmenu.cpp:167 src/emu/ui/custmenu.cpp:456
+#: src/emu/ui/custmenu.cpp:166 src/emu/ui/custmenu.cpp:454
 msgid "Other filter"
 msgstr "Altres filtres"
 
-#: src/emu/ui/custmenu.cpp:176 src/emu/ui/optsmenu.cpp:239
+#: src/emu/ui/custmenu.cpp:175 src/emu/ui/optsmenu.cpp:238
 msgid "^!Manufacturer"
 msgstr "^!Fabricant"
 
-#: src/emu/ui/custmenu.cpp:185 src/emu/ui/custmenu.cpp:474
-#: src/emu/ui/optsmenu.cpp:247
+#: src/emu/ui/custmenu.cpp:184 src/emu/ui/custmenu.cpp:472
+#: src/emu/ui/optsmenu.cpp:246
 msgid "^!Year"
 msgstr "^!Any"
 
-#: src/emu/ui/custmenu.cpp:194 src/emu/ui/custmenu.cpp:510
+#: src/emu/ui/custmenu.cpp:193 src/emu/ui/custmenu.cpp:508
 msgid "Remove last filter"
 msgstr "Suprimeix el darrer filtre"
 
-#: src/emu/ui/custmenu.cpp:197 src/emu/ui/custmenu.cpp:513
+#: src/emu/ui/custmenu.cpp:196 src/emu/ui/custmenu.cpp:511
 msgid "Add filter"
 msgstr "Afegeix un filtre"
 
-#: src/emu/ui/custmenu.cpp:212 src/emu/ui/custmenu.cpp:233
-#: src/emu/ui/custmenu.cpp:529 src/emu/ui/custmenu.cpp:550
+#: src/emu/ui/custmenu.cpp:211 src/emu/ui/custmenu.cpp:231
+#: src/emu/ui/custmenu.cpp:527 src/emu/ui/custmenu.cpp:547
 msgid "Select custom filters:"
 msgstr "Selecciona filtres personalitzats:"
 
-#: src/emu/ui/custmenu.cpp:465
+#: src/emu/ui/custmenu.cpp:463
 msgid "^!Publisher"
 msgstr "^!Publicador"
 
-#: src/emu/ui/custmenu.cpp:483
+#: src/emu/ui/custmenu.cpp:481
 msgid "^!Software List"
 msgstr "^!Llista de programari"
 
-#: src/emu/ui/custmenu.cpp:492
+#: src/emu/ui/custmenu.cpp:490
 msgid "^!Device type"
 msgstr "^!Tipus de dispositiu"
 
-#: src/emu/ui/custmenu.cpp:501
+#: src/emu/ui/custmenu.cpp:499
 msgid "^!Region"
 msgstr "^!Regió"
 
-#: src/emu/ui/custui.cpp:23
+#: src/emu/ui/custui.cpp:22
 msgid "Show All"
 msgstr "Mostra'ls tots"
 
-#: src/emu/ui/custui.cpp:24
+#: src/emu/ui/custui.cpp:23
 msgid "Hide Filters"
 msgstr "Amaga els filtres"
 
-#: src/emu/ui/custui.cpp:25
+#: src/emu/ui/custui.cpp:24
 msgid "Hide Info/Image"
 msgstr "Amaga la info/imatge"
 
-#: src/emu/ui/custui.cpp:26
+#: src/emu/ui/custui.cpp:25
 msgid "Hide Both"
 msgstr "Amaga ambdós"
 
-#: src/emu/ui/custui.cpp:142
+#: src/emu/ui/custui.cpp:141
 msgid "Fonts"
 msgstr "Tipus de lletra"
 
-#: src/emu/ui/custui.cpp:143
+#: src/emu/ui/custui.cpp:142
 msgid "Colors"
 msgstr "Colors"
 
-#: src/emu/ui/custui.cpp:148 src/emu/ui/dirmenu.cpp:33
+#: src/emu/ui/custui.cpp:147 src/emu/ui/dirmenu.cpp:33
 msgid "Language"
 msgstr "Llengua"
 
-#: src/emu/ui/custui.cpp:152
+#: src/emu/ui/custui.cpp:151
 msgid "Show side panels"
 msgstr "Mostra els panells laterals"
 
-#: src/emu/ui/custui.cpp:167 src/emu/ui/custui.cpp:188
+#: src/emu/ui/custui.cpp:166 src/emu/ui/custui.cpp:186
 msgid "Custom UI Settings"
 msgstr "Paràmetres personalitzats de la IU"
 
-#: src/emu/ui/custui.cpp:246
+#: src/emu/ui/custui.cpp:244
 msgid "default"
 msgstr "per defecte"
 
-#: src/emu/ui/custui.cpp:349
+#: src/emu/ui/custui.cpp:347
 msgid "UI Font"
 msgstr "Tipus de lletra de la IU"
 
-#: src/emu/ui/custui.cpp:354
+#: src/emu/ui/custui.cpp:352
 msgid "Bold"
 msgstr "Negreta"
 
-#: src/emu/ui/custui.cpp:355
+#: src/emu/ui/custui.cpp:353
 msgid "Italic"
 msgstr "Cursiva"
 
-#: src/emu/ui/custui.cpp:360
+#: src/emu/ui/custui.cpp:358
 msgid "Lines"
 msgstr "Línies"
 
-#: src/emu/ui/custui.cpp:366
+#: src/emu/ui/custui.cpp:364
 msgid "Infos text size"
 msgstr "Mida del text de la info"
 
-#: src/emu/ui/custui.cpp:383
+#: src/emu/ui/custui.cpp:381
 msgid "UI Fonts Settings"
 msgstr "Paràmetres del tipus de lletra de la IU"
 
-#: src/emu/ui/custui.cpp:411
+#: src/emu/ui/custui.cpp:408
 msgid "Sample text - Lorem ipsum dolor sit amet, consectetur adipiscing elit."
 msgstr ""
 
-#: src/emu/ui/custui.cpp:509
+#: src/emu/ui/custui.cpp:506
 msgid "Normal text"
 msgstr "Text normal"
 
-#: src/emu/ui/custui.cpp:510
+#: src/emu/ui/custui.cpp:507
 msgid "Selected color"
 msgstr "Color seleccionat"
 
-#: src/emu/ui/custui.cpp:511
+#: src/emu/ui/custui.cpp:508
 msgid "Normal text background"
 msgstr "Fons del text normal"
 
-#: src/emu/ui/custui.cpp:512
+#: src/emu/ui/custui.cpp:509
 msgid "Selected background color"
 msgstr "Color de fons seleccionat"
 
-#: src/emu/ui/custui.cpp:513
+#: src/emu/ui/custui.cpp:510
 msgid "Subitem color"
 msgstr "Color del subelement"
 
-#: src/emu/ui/custui.cpp:514 src/emu/ui/custui.cpp:610
+#: src/emu/ui/custui.cpp:511 src/emu/ui/custui.cpp:606
 msgid "Clone"
 msgstr "Clona"
 
-#: src/emu/ui/custui.cpp:515
+#: src/emu/ui/custui.cpp:512
 msgid "Border"
 msgstr "Vora"
 
-#: src/emu/ui/custui.cpp:516
+#: src/emu/ui/custui.cpp:513
 msgid "Background"
 msgstr "Fons"
 
-#: src/emu/ui/custui.cpp:517
+#: src/emu/ui/custui.cpp:514
 msgid "Dipswitch"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:518
+#: src/emu/ui/custui.cpp:515
 msgid "Unavailable color"
 msgstr "Color no disponible"
 
-#: src/emu/ui/custui.cpp:519
+#: src/emu/ui/custui.cpp:516
 msgid "Slider color"
 msgstr "Color del lliscador"
 
-#: src/emu/ui/custui.cpp:520
+#: src/emu/ui/custui.cpp:517
 msgid "Gfx viewer background"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:521
+#: src/emu/ui/custui.cpp:518
 msgid "Mouse over color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:522
+#: src/emu/ui/custui.cpp:519
 msgid "Mouse over background color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:523
+#: src/emu/ui/custui.cpp:520
 msgid "Mouse down color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:524
+#: src/emu/ui/custui.cpp:521
 msgid "Mouse down background color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:527
+#: src/emu/ui/custui.cpp:524
 msgid "Restore originals colors"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:543
+#: src/emu/ui/custui.cpp:540
 msgid "UI Colors Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:572
+#: src/emu/ui/custui.cpp:568
 #, c-format
 msgid "Double click or press %1$s to change the color value"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:598
+#: src/emu/ui/custui.cpp:594
 msgid "Menu Preview"
 msgstr "Previsualització del menú"
 
-#: src/emu/ui/custui.cpp:606
+#: src/emu/ui/custui.cpp:602
 msgid "Normal"
 msgstr "Normal"
 
-#: src/emu/ui/custui.cpp:607
+#: src/emu/ui/custui.cpp:603
 msgid "Subitem"
 msgstr "Subelement"
 
-#: src/emu/ui/custui.cpp:608
+#: src/emu/ui/custui.cpp:604
 msgid "Selected"
 msgstr "Seleccionat"
 
-#: src/emu/ui/custui.cpp:609
+#: src/emu/ui/custui.cpp:605
 msgid "Mouse Over"
 msgstr "Ratolí a sobre"
 
-#: src/emu/ui/custui.cpp:841 src/emu/ui/custui.cpp:844
+#: src/emu/ui/custui.cpp:837 src/emu/ui/custui.cpp:840
 msgid "Alpha"
 msgstr "Alfa"
 
-#: src/emu/ui/custui.cpp:849 src/emu/ui/custui.cpp:852
-#: src/emu/ui/custui.cpp:1013
+#: src/emu/ui/custui.cpp:845 src/emu/ui/custui.cpp:848
+#: src/emu/ui/custui.cpp:1007
 msgid "Red"
 msgstr "Vermell"
 
-#: src/emu/ui/custui.cpp:857 src/emu/ui/custui.cpp:860
-#: src/emu/ui/custui.cpp:1016
+#: src/emu/ui/custui.cpp:853 src/emu/ui/custui.cpp:856
+#: src/emu/ui/custui.cpp:1010
 msgid "Green"
 msgstr "Verd"
 
-#: src/emu/ui/custui.cpp:865 src/emu/ui/custui.cpp:868
-#: src/emu/ui/custui.cpp:1017
+#: src/emu/ui/custui.cpp:861 src/emu/ui/custui.cpp:864
+#: src/emu/ui/custui.cpp:1011
 msgid "Blue"
 msgstr "Blau"
 
-#: src/emu/ui/custui.cpp:871
+#: src/emu/ui/custui.cpp:867
 msgid "Choose from palette"
 msgstr "Selecciona des de la paleta"
 
-#: src/emu/ui/custui.cpp:887
+#: src/emu/ui/custui.cpp:883
 msgid " - ARGB Settings"
 msgstr " - Paràmetres d'ARGB"
 
-#: src/emu/ui/custui.cpp:912
+#: src/emu/ui/custui.cpp:907
 msgid "Color preview ="
 msgstr "Previsualització de color ="
 
-#: src/emu/ui/custui.cpp:1009
+#: src/emu/ui/custui.cpp:1003
 msgid "White"
 msgstr "Blanc"
 
-#: src/emu/ui/custui.cpp:1010
+#: src/emu/ui/custui.cpp:1004
 msgid "Silver"
 msgstr "Plata"
 
-#: src/emu/ui/custui.cpp:1011
+#: src/emu/ui/custui.cpp:1005
 msgid "Gray"
 msgstr "Gris"
 
-#: src/emu/ui/custui.cpp:1012
+#: src/emu/ui/custui.cpp:1006
 msgid "Black"
 msgstr "Negre"
 
-#: src/emu/ui/custui.cpp:1014
+#: src/emu/ui/custui.cpp:1008
 msgid "Orange"
 msgstr "Taronja"
 
-#: src/emu/ui/custui.cpp:1015
+#: src/emu/ui/custui.cpp:1009
 msgid "Yellow"
 msgstr "Groc"
 
-#: src/emu/ui/custui.cpp:1018
+#: src/emu/ui/custui.cpp:1012
 msgid "Violet"
 msgstr "Violeta"
 
-#: src/emu/ui/datmenu.cpp:65
+#: src/emu/ui/datmenu.cpp:64
 msgid "Software History"
 msgstr "Història del programari"
 
-#: src/emu/ui/datmenu.cpp:67
+#: src/emu/ui/datmenu.cpp:66
 msgid "Software Usage"
 msgstr "Ús del programari"
 
-#: src/emu/ui/datmenu.cpp:199
+#: src/emu/ui/datmenu.cpp:196
 msgid "Revision: "
 msgstr "Revisió: "
 
-#: src/emu/ui/datmenu.cpp:287 src/emu/ui/selgame.cpp:40
-#: src/emu/ui/selgame.cpp:2152 src/emu/ui/selgame.cpp:2161
-#: src/emu/ui/selsoft.cpp:1577 src/emu/ui/selsoft.cpp:1597
-#: src/emu/ui/selsoft.cpp:1606
+#: src/emu/ui/datmenu.cpp:284 src/emu/ui/selgame.cpp:39
+#: src/emu/ui/selgame.cpp:2158 src/emu/ui/selgame.cpp:2167
+#: src/emu/ui/selsoft.cpp:1574 src/emu/ui/selsoft.cpp:1592
+#: src/emu/ui/selsoft.cpp:1601
 msgid "History"
 msgstr "Història"
 
-#: src/emu/ui/datmenu.cpp:289 src/emu/ui/selgame.cpp:41
+#: src/emu/ui/datmenu.cpp:286 src/emu/ui/selgame.cpp:40
 msgid "Mameinfo"
 msgstr "Mameinfo"
 
-#: src/emu/ui/datmenu.cpp:291 src/emu/ui/selgame.cpp:43
+#: src/emu/ui/datmenu.cpp:288 src/emu/ui/selgame.cpp:42
 msgid "Messinfo"
 msgstr "Messinfo"
 
-#: src/emu/ui/datmenu.cpp:293 src/emu/ui/selgame.cpp:42
+#: src/emu/ui/datmenu.cpp:290 src/emu/ui/selgame.cpp:41
 msgid "Sysinfo"
 msgstr "Sysinfo"
 
-#: src/emu/ui/datmenu.cpp:295 src/emu/ui/selgame.cpp:46
+#: src/emu/ui/datmenu.cpp:292 src/emu/ui/selgame.cpp:45
 msgid "Mamescore"
 msgstr "Mamescore"
 
-#: src/emu/ui/datmenu.cpp:297 src/emu/ui/selgame.cpp:45
+#: src/emu/ui/datmenu.cpp:294 src/emu/ui/selgame.cpp:44
 msgid "Gameinit"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:299 src/emu/ui/selgame.cpp:44
+#: src/emu/ui/datmenu.cpp:296 src/emu/ui/selgame.cpp:43
 msgid "Command"
 msgstr "Ordre"
 
@@ -554,75 +554,75 @@ msgstr ""
 msgid "Remove %1$s Folder"
 msgstr "Suprimeix la carpeta %1$s"
 
-#: src/emu/ui/filesel.cpp:158
+#: src/emu/ui/filesel.cpp:161
 msgid "File Already Exists - Override?"
 msgstr "El fitxer ja existeix. Voleu sobreescriure'l?"
 
-#: src/emu/ui/filesel.cpp:160 src/emu/ui/selgame.cpp:1568
-#: src/emu/ui/selgame.cpp:1569 src/emu/ui/selgame.cpp:1570
-#: src/emu/ui/selgame.cpp:1571 src/emu/ui/selgame.cpp:1572
-#: src/emu/ui/selgame.cpp:1573 src/emu/ui/selgame.cpp:1574
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/filesel.cpp:163 src/emu/ui/selgame.cpp:1576
+#: src/emu/ui/selgame.cpp:1577 src/emu/ui/selgame.cpp:1578
+#: src/emu/ui/selgame.cpp:1579 src/emu/ui/selgame.cpp:1580
+#: src/emu/ui/selgame.cpp:1581 src/emu/ui/selgame.cpp:1582
+#: src/emu/ui/selgame.cpp:1591
 msgid "No"
 msgstr "No"
 
-#: src/emu/ui/filesel.cpp:161 src/emu/ui/selgame.cpp:1568
-#: src/emu/ui/selgame.cpp:1569 src/emu/ui/selgame.cpp:1570
-#: src/emu/ui/selgame.cpp:1571 src/emu/ui/selgame.cpp:1572
-#: src/emu/ui/selgame.cpp:1573 src/emu/ui/selgame.cpp:1574
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/filesel.cpp:164 src/emu/ui/selgame.cpp:1576
+#: src/emu/ui/selgame.cpp:1577 src/emu/ui/selgame.cpp:1578
+#: src/emu/ui/selgame.cpp:1579 src/emu/ui/selgame.cpp:1580
+#: src/emu/ui/selgame.cpp:1581 src/emu/ui/selgame.cpp:1582
+#: src/emu/ui/selgame.cpp:1591
 msgid "Yes"
 msgstr "Sí"
 
-#: src/emu/ui/filesel.cpp:272
+#: src/emu/ui/filesel.cpp:275
 msgid "New Image Name:"
 msgstr "Nom de la imatge nova:"
 
-#: src/emu/ui/filesel.cpp:278
+#: src/emu/ui/filesel.cpp:281
 msgid "Image Format:"
 msgstr "Format de la imatge:"
 
-#: src/emu/ui/filesel.cpp:284
+#: src/emu/ui/filesel.cpp:287
 msgid "Create"
 msgstr "Crea"
 
-#: src/emu/ui/filesel.cpp:315
+#: src/emu/ui/filesel.cpp:318
 msgid "Please enter a file extension too"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:503 src/emu/ui/swlist.cpp:65
+#: src/emu/ui/filesel.cpp:506 src/emu/ui/swlist.cpp:65
 msgid "[empty slot]"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:507
+#: src/emu/ui/filesel.cpp:510
 msgid "[create]"
 msgstr "[crea]"
 
-#: src/emu/ui/filesel.cpp:511 src/emu/ui/swlist.cpp:76
+#: src/emu/ui/filesel.cpp:514 src/emu/ui/swlist.cpp:76
 msgid "[software list]"
 msgstr "[llista de programari]"
 
-#: src/emu/ui/filesel.cpp:803
+#: src/emu/ui/filesel.cpp:806
 msgid "Select image format"
 msgstr "Seleccioneu el format de la imatge"
 
-#: src/emu/ui/filesel.cpp:863
+#: src/emu/ui/filesel.cpp:866
 msgid "Select access mode"
 msgstr "Seleccioneu el mode d'accés"
 
-#: src/emu/ui/filesel.cpp:864
+#: src/emu/ui/filesel.cpp:867
 msgid "Read-only"
 msgstr "Només lectura"
 
-#: src/emu/ui/filesel.cpp:866
+#: src/emu/ui/filesel.cpp:869
 msgid "Read-write"
 msgstr "Lectura i escriptura"
 
-#: src/emu/ui/filesel.cpp:867
+#: src/emu/ui/filesel.cpp:870
 msgid "Read this image, write to another image"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:868
+#: src/emu/ui/filesel.cpp:871
 msgid "Read this image, write to diff"
 msgstr ""
 
@@ -648,7 +648,7 @@ msgstr "Parcialment suportat"
 msgid "[empty]"
 msgstr ""
 
-#: src/emu/ui/info_pty.cpp:26 src/emu/ui/mainmenu.cpp:91
+#: src/emu/ui/info_pty.cpp:26 src/emu/ui/mainmenu.cpp:96
 msgid "Pseudo terminals"
 msgstr "Pseudo terminals"
 
@@ -664,7 +664,7 @@ msgstr "Interfície d'usuari"
 msgid "Other Controls"
 msgstr "Altres controls"
 
-#: src/emu/ui/inputmap.cpp:622 src/emu/ui/miscmenu.cpp:91
+#: src/emu/ui/inputmap.cpp:622 src/emu/ui/miscmenu.cpp:92
 #: src/emu/ui/slotopt.cpp:172
 msgid "Reset"
 msgstr "Reinicialitza"
@@ -697,27 +697,27 @@ msgstr ""
 msgid "Machine Information"
 msgstr "Informació de la màquina"
 
-#: src/emu/ui/mainmenu.cpp:78
+#: src/emu/ui/mainmenu.cpp:80
 msgid "Image Information"
 msgstr "Informació de la imatge"
 
-#: src/emu/ui/mainmenu.cpp:81
+#: src/emu/ui/mainmenu.cpp:83
 msgid "File Manager"
 msgstr "Gestor de fitxers"
 
-#: src/emu/ui/mainmenu.cpp:86
+#: src/emu/ui/mainmenu.cpp:92
 msgid "Tape Control"
 msgstr "Control de cinta"
 
-#: src/emu/ui/mainmenu.cpp:94
+#: src/emu/ui/mainmenu.cpp:99
 msgid "Bios Selection"
 msgstr "Selecció de BIOS"
 
-#: src/emu/ui/mainmenu.cpp:100
+#: src/emu/ui/mainmenu.cpp:104
 msgid "Slot Devices"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:107
+#: src/emu/ui/mainmenu.cpp:109
 msgid "Barcode Reader"
 msgstr "Lector de codi de barres"
 
@@ -725,43 +725,43 @@ msgstr "Lector de codi de barres"
 msgid "Network Devices"
 msgstr "Dispositius de xarxa"
 
-#: src/emu/ui/mainmenu.cpp:119
+#: src/emu/ui/mainmenu.cpp:118
 msgid "Keyboard Mode"
 msgstr "Mode de teclat"
 
-#: src/emu/ui/mainmenu.cpp:122
+#: src/emu/ui/mainmenu.cpp:121
 msgid "Slider Controls"
 msgstr "Controls dels lliscadors"
 
-#: src/emu/ui/mainmenu.cpp:125
+#: src/emu/ui/mainmenu.cpp:124
 msgid "Video Options"
 msgstr "Opcions de vídeo"
 
-#: src/emu/ui/mainmenu.cpp:129
+#: src/emu/ui/mainmenu.cpp:128
 msgid "Crosshair Options"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:133
+#: src/emu/ui/mainmenu.cpp:132
 msgid "Cheat"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:136
+#: src/emu/ui/mainmenu.cpp:135
 msgid "Plugin Options"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:140
+#: src/emu/ui/mainmenu.cpp:139
 msgid "External DAT View"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:146
+#: src/emu/ui/mainmenu.cpp:145 src/emu/ui/miscmenu.cpp:785
 msgid "Add To Favorites"
 msgstr "Afegeix als favorits"
 
-#: src/emu/ui/mainmenu.cpp:148
+#: src/emu/ui/mainmenu.cpp:147 src/emu/ui/miscmenu.cpp:787
 msgid "Remove From Favorites"
 msgstr "Suprimeix dels favorits"
 
-#: src/emu/ui/mainmenu.cpp:155
+#: src/emu/ui/mainmenu.cpp:154
 msgid "Select New Machine"
 msgstr "Selecciona una màquina nova"
 
@@ -801,189 +801,205 @@ msgstr "Surt"
 msgid "Return to Previous Menu"
 msgstr "Torna al menú anterior"
 
-#: src/emu/ui/menu.cpp:716
+#: src/emu/ui/menu.cpp:761
 msgid "Auto"
 msgstr "Auto"
 
-#: src/emu/ui/menu.cpp:2133
+#: src/emu/ui/menu.cpp:2195
 msgid "Images"
 msgstr "Imatges"
 
-#: src/emu/ui/menu.cpp:2134
+#: src/emu/ui/menu.cpp:2196
 msgid "Infos"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Keyboard Mode:"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Natural"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Emulated"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:240
+#: src/emu/ui/miscmenu.cpp:241
 #, c-format
 msgid ""
 "Uptime: %1$d:%2$02d:%3$02d\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:242
+#: src/emu/ui/miscmenu.cpp:243
 #, c-format
 msgid ""
 "Uptime: %1$d:%2$02d\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:246
+#: src/emu/ui/miscmenu.cpp:247
 #, c-format
 msgid ""
 "Tickets dispensed: %1$d\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:257
+#: src/emu/ui/miscmenu.cpp:258
 msgid "Coin %1$c: NA%3$s\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:257
+#: src/emu/ui/miscmenu.cpp:258
 #, c-format
 msgid "Coin %1$c: %2$d%3$s\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:260
+#: src/emu/ui/miscmenu.cpp:261
 msgid " (locked)"
 msgstr " (blocat)"
 
-#: src/emu/ui/miscmenu.cpp:519
+#: src/emu/ui/miscmenu.cpp:520
 msgid "Visible Delay"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:617
+#: src/emu/ui/miscmenu.cpp:619
 #, c-format
 msgid "%s.xml saved under ui folder."
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:645
+#: src/emu/ui/miscmenu.cpp:647
 msgid "Name:             Description:\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:657
+#: src/emu/ui/miscmenu.cpp:659
 #, c-format
 msgid "%s.txt saved under ui folder."
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:675
-msgid "Export XML format (like -listxml)"
+#: src/emu/ui/miscmenu.cpp:677
+msgid "Export list in XML format (like -listxml)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:676
-msgid "Export TXT format (like -listfull)"
+#: src/emu/ui/miscmenu.cpp:678
+msgid "Export list in XML format (like -listxml, but exclude devices)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:734
-msgid "Dummy"
+#: src/emu/ui/miscmenu.cpp:679
+msgid "Export list in TXT format (like -listfull)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:736
-msgid "Save machine configuration"
-msgstr ""
-
-#: src/emu/ui/miscmenu.cpp:848 src/emu/ui/miscmenu.cpp:869
-#: src/emu/ui/selgame.cpp:594
-msgid "Plugins"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:218
-msgid "Filter"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:226
-msgid " ^!File"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:231
-msgid " ^!Category"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:254
-msgid "^!Setup custom filter"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:262
-msgid "Customize UI"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:263
-msgid "Configure Directories"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:266 src/emu/ui/sndmenu.cpp:151
-#: src/emu/ui/sndmenu.cpp:172
-msgid "Sound Options"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:269
-msgid "General Inputs"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:272
-msgid "Save Configuration"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:286 src/emu/ui/optsmenu.cpp:307
-msgid "Settings"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:327
-msgid "**Error saving ui.ini**"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:374
-#, c-format
-msgid "**Error saving %s.ini**"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:378
+#: src/emu/ui/miscmenu.cpp:729 src/emu/ui/optsmenu.cpp:376
 msgid ""
 "\n"
 "    Configuration saved    \n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/selector.cpp:166
+#: src/emu/ui/miscmenu.cpp:774
+msgid "Bios"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:776
+msgid "Driver"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:790
+msgid "Save machine configuration"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:806
+msgid "Configure machine:"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:868 src/emu/ui/selsoft.cpp:109
+msgid " (default)"
+msgstr " (per defecte)"
+
+#: src/emu/ui/miscmenu.cpp:953 src/emu/ui/miscmenu.cpp:973
+#: src/emu/ui/selgame.cpp:600
+msgid "Plugins"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:217
+msgid "Filter"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:225
+msgid " ^!File"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:230
+msgid " ^!Category"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:253
+msgid "^!Setup custom filter"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:261
+msgid "Customize UI"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:262
+msgid "Configure Directories"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:265 src/emu/ui/sndmenu.cpp:149
+#: src/emu/ui/sndmenu.cpp:169
+msgid "Sound Options"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:268
+msgid "General Inputs"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:271
+msgid "Save Configuration"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:285 src/emu/ui/optsmenu.cpp:305
+msgid "Settings"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:325
+msgid "**Error saving ui.ini**"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:372
+#, c-format
+msgid "**Error saving %s.ini**"
+msgstr ""
+
+#: src/emu/ui/selector.cpp:165
 msgid "Selection List - Search: "
 msgstr ""
 
-#: src/emu/ui/selector.cpp:196
+#: src/emu/ui/selector.cpp:194
 #, c-format
 msgid "Double click or press %1$s to select"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:39
+#: src/emu/ui/selgame.cpp:38
 msgid "General Info"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:374 src/emu/ui/selsoft.cpp:282
+#: src/emu/ui/selgame.cpp:380 src/emu/ui/selsoft.cpp:281
 #, c-format
 msgid ""
 "%s\n"
 " added to favorites list."
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:380 src/emu/ui/selgame.cpp:389
-#: src/emu/ui/selsoft.cpp:287
+#: src/emu/ui/selgame.cpp:386 src/emu/ui/selgame.cpp:395
+#: src/emu/ui/selsoft.cpp:286
 #, c-format
 msgid ""
 "%s\n"
 " removed from favorites list."
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:450
+#: src/emu/ui/selgame.cpp:457
 msgid ""
 "The selected machine is missing one or more required ROM or CHD images. "
 "Please select a different machine.\n"
@@ -991,275 +1007,275 @@ msgid ""
 "Press any key to continue."
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:589 src/emu/ui/simpleselgame.cpp:265
+#: src/emu/ui/selgame.cpp:595 src/emu/ui/simpleselgame.cpp:265
 msgid "Configure Options"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:752
+#: src/emu/ui/selgame.cpp:596
+msgid "Configure Machine"
+msgstr ""
+
+#: src/emu/ui/selgame.cpp:758
 #, c-format
 msgid "%1$s %2$s ( %3$d / %4$d machines (%5$d BIOS) )"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:762
+#: src/emu/ui/selgame.cpp:768
 #, c-format
 msgid "%1$s (%2$s - %3$s) - "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:769 src/emu/ui/selgame.cpp:775
+#: src/emu/ui/selgame.cpp:775 src/emu/ui/selgame.cpp:781
 #, c-format
 msgid "%1$s (%2$s) - "
 msgstr "%1$s (%2$s) - "
 
-#: src/emu/ui/selgame.cpp:784
+#: src/emu/ui/selgame.cpp:790
 #, c-format
 msgid "%1$s Search: %2$s_"
 msgstr "Cerca %1$s: %2$s_"
 
-#: src/emu/ui/selgame.cpp:838
+#: src/emu/ui/selgame.cpp:844
 #, c-format
 msgid "Romset: %1$-.100s"
 msgstr "Conjunt de roms: %1$-.100s"
 
-#: src/emu/ui/selgame.cpp:841 src/emu/ui/selgame.cpp:890
-#: src/emu/ui/selsoft.cpp:751 src/emu/ui/selsoft.cpp:801
+#: src/emu/ui/selgame.cpp:847 src/emu/ui/selgame.cpp:896
+#: src/emu/ui/selsoft.cpp:750 src/emu/ui/selsoft.cpp:800
 #: src/emu/ui/simpleselgame.cpp:328
 #, c-format
 msgid "%1$s, %2$-.100s"
 msgstr "%1$s, %2$-.100s"
 
-#: src/emu/ui/selgame.cpp:847 src/emu/ui/selsoft.cpp:757
+#: src/emu/ui/selgame.cpp:853 src/emu/ui/selsoft.cpp:756
 #, c-format
 msgid "Driver is clone of: %1$-.100s"
 msgstr "El control·lador és un clon de: %1$-.100s"
 
-#: src/emu/ui/selgame.cpp:849 src/emu/ui/selsoft.cpp:759
+#: src/emu/ui/selgame.cpp:855 src/emu/ui/selsoft.cpp:758
 msgid "Driver is parent"
 msgstr "El controlador és el pare"
 
-#: src/emu/ui/selgame.cpp:853 src/emu/ui/selsoft.cpp:763
+#: src/emu/ui/selgame.cpp:859 src/emu/ui/selsoft.cpp:762
 #: src/emu/ui/simpleselgame.cpp:335
 msgid "Overall: NOT WORKING"
 msgstr "En resum: NO FUNCIONA"
 
-#: src/emu/ui/selgame.cpp:855 src/emu/ui/selsoft.cpp:765
+#: src/emu/ui/selgame.cpp:861 src/emu/ui/selsoft.cpp:764
 #: src/emu/ui/simpleselgame.cpp:337
 msgid "Overall: Unemulated Protection"
 msgstr "Resum: Protecció no emulada"
 
-#: src/emu/ui/selgame.cpp:857 src/emu/ui/selsoft.cpp:767
+#: src/emu/ui/selgame.cpp:863 src/emu/ui/selsoft.cpp:766
 #: src/emu/ui/simpleselgame.cpp:339
 msgid "Overall: Working"
 msgstr "En resum: Funciona"
 
-#: src/emu/ui/selgame.cpp:861 src/emu/ui/selsoft.cpp:771
+#: src/emu/ui/selgame.cpp:867 src/emu/ui/selsoft.cpp:770
 msgid "Graphics: Imperfect, "
 msgstr "Gràfics: Imperfectes, "
 
-#: src/emu/ui/selgame.cpp:863 src/emu/ui/selsoft.cpp:773
+#: src/emu/ui/selgame.cpp:869 src/emu/ui/selsoft.cpp:772
 msgid "Graphics: OK, "
 msgstr "Gràfics: OK, "
 
-#: src/emu/ui/selgame.cpp:866 src/emu/ui/selsoft.cpp:776
+#: src/emu/ui/selgame.cpp:872 src/emu/ui/selsoft.cpp:775
 msgid "Sound: Unimplemented"
 msgstr "So: No implementat"
 
-#: src/emu/ui/selgame.cpp:868 src/emu/ui/selsoft.cpp:778
+#: src/emu/ui/selgame.cpp:874 src/emu/ui/selsoft.cpp:777
 msgid "Sound: Imperfect"
 msgstr "So: Imperfecte"
 
-#: src/emu/ui/selgame.cpp:870 src/emu/ui/selsoft.cpp:780
+#: src/emu/ui/selgame.cpp:876 src/emu/ui/selsoft.cpp:779
 msgid "Sound: OK"
 msgstr "So: OK"
 
-#: src/emu/ui/selgame.cpp:887
+#: src/emu/ui/selgame.cpp:893
 #, c-format
 msgid "System: %1$-.100s"
 msgstr "Sistema: %1$-.100s"
 
-#: src/emu/ui/selgame.cpp:894 src/emu/ui/selsoft.cpp:805
+#: src/emu/ui/selgame.cpp:900 src/emu/ui/selsoft.cpp:804
 #, c-format
 msgid "Software is clone of: %1$-.100s"
 msgstr "El programari és un clon de: %1$-.100s"
 
-#: src/emu/ui/selgame.cpp:896 src/emu/ui/selsoft.cpp:807
+#: src/emu/ui/selgame.cpp:902 src/emu/ui/selsoft.cpp:806
 msgid "Software is parent"
 msgstr "El programari és el pare"
 
-#: src/emu/ui/selgame.cpp:901 src/emu/ui/selsoft.cpp:812
+#: src/emu/ui/selgame.cpp:907 src/emu/ui/selsoft.cpp:811
 msgid "Supported: No"
 msgstr "Suportat: No"
 
-#: src/emu/ui/selgame.cpp:906 src/emu/ui/selsoft.cpp:817
+#: src/emu/ui/selgame.cpp:912 src/emu/ui/selsoft.cpp:816
 msgid "Supported: Partial"
 msgstr "Suportat: Parcialment"
 
-#: src/emu/ui/selgame.cpp:911 src/emu/ui/selsoft.cpp:822
+#: src/emu/ui/selgame.cpp:917 src/emu/ui/selsoft.cpp:821
 msgid "Supported: Yes"
 msgstr "Suportat: Sí"
 
-#: src/emu/ui/selgame.cpp:916 src/emu/ui/selsoft.cpp:827
+#: src/emu/ui/selgame.cpp:922 src/emu/ui/selsoft.cpp:826
 #, c-format
 msgid "romset: %1$-.100s"
 msgstr "Conjunt de ROM: %1$-.100s"
 
-#: src/emu/ui/selgame.cpp:923
+#: src/emu/ui/selgame.cpp:929
 #, c-format
 msgid "%1$s %2$s"
 msgstr "%1$s %2$s"
 
-#: src/emu/ui/selgame.cpp:1535
+#: src/emu/ui/selgame.cpp:1543
 #, c-format
 msgid "Romset: %1$-.100s\n"
 msgstr "Conjunt de ROM: %1$-.100s\n"
 
-#: src/emu/ui/selgame.cpp:1536
+#: src/emu/ui/selgame.cpp:1544
 #, c-format
 msgid "Year: %1$s\n"
 msgstr "Any: %1$s\n"
 
-#: src/emu/ui/selgame.cpp:1537
+#: src/emu/ui/selgame.cpp:1545
 #, c-format
 msgid "Manufacturer: %1$-.100s\n"
 msgstr "Fabricant: %1$-.100s\n"
 
-#: src/emu/ui/selgame.cpp:1541
+#: src/emu/ui/selgame.cpp:1549
 #, c-format
 msgid "Driver is Clone of: %1$-.100s\n"
 msgstr "El control·lador és un clon de: %1$-.100s\n"
 
-#: src/emu/ui/selgame.cpp:1543
+#: src/emu/ui/selgame.cpp:1551
 msgid "Driver is Parent\n"
 msgstr "El controlador és el pare\n"
 
-#: src/emu/ui/selgame.cpp:1546
+#: src/emu/ui/selgame.cpp:1554
 msgid "Overall: NOT WORKING\n"
 msgstr "En resum: NO FUNCIONA\n"
 
-#: src/emu/ui/selgame.cpp:1548
+#: src/emu/ui/selgame.cpp:1556
 msgid "Overall: Unemulated Protection\n"
 msgstr "En resum: Protecció no emulada\n"
 
-#: src/emu/ui/selgame.cpp:1550
+#: src/emu/ui/selgame.cpp:1558
 msgid "Overall: Working\n"
 msgstr "En resum: Funciona\n"
 
-#: src/emu/ui/selgame.cpp:1553
+#: src/emu/ui/selgame.cpp:1561
 msgid "Graphics: Imperfect Colors\n"
 msgstr "Gràfics: Colors imperfectes\n"
 
-#: src/emu/ui/selgame.cpp:1557
+#: src/emu/ui/selgame.cpp:1565
 msgid "Graphics: Imperfect\n"
 msgstr "Gràfics: imperfectes\n"
 
-#: src/emu/ui/selgame.cpp:1559
+#: src/emu/ui/selgame.cpp:1567
 msgid "Graphics: OK\n"
 msgstr "Gràfics: OK\n"
 
-#: src/emu/ui/selgame.cpp:1562
+#: src/emu/ui/selgame.cpp:1570
 msgid "Sound: Unimplemented\n"
 msgstr "So: No implementat\n"
 
-#: src/emu/ui/selgame.cpp:1564
+#: src/emu/ui/selgame.cpp:1572
 msgid "Sound: Imperfect\n"
 msgstr "So: Imperfecte\n"
 
-#: src/emu/ui/selgame.cpp:1566
+#: src/emu/ui/selgame.cpp:1574
 msgid "Sound: OK\n"
 msgstr "So: OK\n"
 
-#: src/emu/ui/selgame.cpp:1568
+#: src/emu/ui/selgame.cpp:1576
 #, c-format
 msgid "Driver is Skeleton: %1$s\n"
 msgstr "El control·lador és un esquelet: %1$s\n"
 
-#: src/emu/ui/selgame.cpp:1569
+#: src/emu/ui/selgame.cpp:1577
 #, c-format
 msgid "Game is Mechanical: %1$s\n"
 msgstr "El joc és mecànic: %1$s\n"
 
-#: src/emu/ui/selgame.cpp:1570
+#: src/emu/ui/selgame.cpp:1578
 #, c-format
 msgid "Requires Artwork: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1571
+#: src/emu/ui/selgame.cpp:1579
 #, c-format
 msgid "Requires Clickable Artwork: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1572
+#: src/emu/ui/selgame.cpp:1580
 #, c-format
 msgid "Support Cocktail: %1$s\n"
 msgstr "Suporta cocktail: %1$s\n"
 
-#: src/emu/ui/selgame.cpp:1573
+#: src/emu/ui/selgame.cpp:1581
 #, c-format
 msgid "Driver is Bios: %1$s\n"
 msgstr "El control·lador és una BIOS: %1$s\n"
 
-#: src/emu/ui/selgame.cpp:1574
+#: src/emu/ui/selgame.cpp:1582
 #, c-format
 msgid "Support Save: %1$s\n"
 msgstr "Suporta desar: %1$s\n"
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 #, c-format
 msgid "Screen Orientation: %1$s\n"
 msgstr "Orientació de la pantalla: %1$s\n"
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 msgid "Vertical"
 msgstr "Vertical"
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 msgid "Horizontal"
 msgstr "Horitzontal"
 
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/selgame.cpp:1591
 #, c-format
 msgid "Requires CHD: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1596
+#: src/emu/ui/selgame.cpp:1604
 msgid "Roms Audit Pass: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1598
+#: src/emu/ui/selgame.cpp:1606
 msgid "Roms Audit Pass: BAD\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1601
+#: src/emu/ui/selgame.cpp:1609
 msgid "Samples Audit Pass: None Needed\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1603
+#: src/emu/ui/selgame.cpp:1611
 msgid "Samples Audit Pass: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1605
+#: src/emu/ui/selgame.cpp:1613
 msgid "Samples Audit Pass: BAD\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1608
+#: src/emu/ui/selgame.cpp:1616
 msgid ""
 "Roms Audit Pass: Disabled\n"
 "Samples Audit Pass: Disabled\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:2049 src/emu/ui/selgame.cpp:2212
-#: src/emu/ui/selsoft.cpp:1662
+#: src/emu/ui/selgame.cpp:2055 src/emu/ui/selgame.cpp:2216
+#: src/emu/ui/selsoft.cpp:1655
 msgid "No Infos Available"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:2162 src/emu/ui/selsoft.cpp:1607
+#: src/emu/ui/selgame.cpp:2168 src/emu/ui/selsoft.cpp:1602
 msgid "Usage"
 msgstr "Ús"
 
-#: src/emu/ui/selsoft.cpp:110
-msgid " (default)"
-msgstr " (per defecte)"
-
-#: src/emu/ui/selsoft.cpp:381
+#: src/emu/ui/selsoft.cpp:380
 msgid ""
 "The selected software is missing one or more required files. Please select a "
 "different software.\n"
@@ -1267,57 +1283,57 @@ msgid ""
 "Press any key to continue."
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:684
+#: src/emu/ui/selsoft.cpp:683
 #, c-format
-msgid "%1$s %2$s ( %3$d / %4$d softwares )"
-msgstr "%1$s %2$s ( %3$d / %4$d programaris )"
+msgid "%1$s %2$s ( %3$d / %4$d software packages )"
+msgstr ""
 
-#: src/emu/ui/selsoft.cpp:685
+#: src/emu/ui/selsoft.cpp:684
 #, c-format
 msgid "Driver: \"%1$s\" software list "
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:688
+#: src/emu/ui/selsoft.cpp:687
 #, c-format
 msgid "Region: %1$s -"
 msgstr "Regió: %1$s -"
 
-#: src/emu/ui/selsoft.cpp:690
+#: src/emu/ui/selsoft.cpp:689
 #, c-format
 msgid "Publisher: %1$s -"
 msgstr "Editor: %1$s -"
 
-#: src/emu/ui/selsoft.cpp:692
+#: src/emu/ui/selsoft.cpp:691
 #, c-format
 msgid "Year: %1$s -"
 msgstr "Any: %1$s -"
 
-#: src/emu/ui/selsoft.cpp:694
+#: src/emu/ui/selsoft.cpp:693
 #, c-format
 msgid "Software List: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:696
+#: src/emu/ui/selsoft.cpp:695
 #, c-format
 msgid "Device type: %1$s -"
 msgstr "Tipus de dispositiu: %1$s -"
 
-#: src/emu/ui/selsoft.cpp:698
+#: src/emu/ui/selsoft.cpp:697
 #, c-format
 msgid "%s Search: %s_"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:748 src/emu/ui/selsoft.cpp:798
+#: src/emu/ui/selsoft.cpp:747 src/emu/ui/selsoft.cpp:797
 #: src/emu/ui/simpleselgame.cpp:325
 #, c-format
 msgid "%1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:1998 src/emu/ui/selsoft.cpp:2018
+#: src/emu/ui/selsoft.cpp:1991 src/emu/ui/selsoft.cpp:2011
 msgid "Software part selection:"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:2136 src/emu/ui/selsoft.cpp:2156
+#: src/emu/ui/selsoft.cpp:2129 src/emu/ui/selsoft.cpp:2149
 msgid "Bios selection:"
 msgstr "Selecció de BIOS:"
 
@@ -1365,15 +1381,15 @@ msgstr ""
 msgid " [internal]"
 msgstr " [intern]"
 
-#: src/emu/ui/sndmenu.cpp:135
+#: src/emu/ui/sndmenu.cpp:133
 msgid "Sound"
 msgstr "So"
 
-#: src/emu/ui/sndmenu.cpp:136
+#: src/emu/ui/sndmenu.cpp:134
 msgid "Sample Rate"
 msgstr ""
 
-#: src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/sndmenu.cpp:135
 msgid "Use External Samples"
 msgstr ""
 
@@ -1442,80 +1458,80 @@ msgstr "Rebobina"
 msgid "Fast Forward"
 msgstr "Avanç ràpid"
 
-#: src/emu/ui/ui.cpp:419
+#: src/emu/ui/ui.cpp:418
 msgid "This driver requires images to be loaded in the following device(s): "
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1074
+#: src/emu/ui/ui.cpp:1071
 msgid ""
 "One or more ROMs/CHDs for this machine are incorrect. The machine may not "
 "run correctly.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1087
+#: src/emu/ui/ui.cpp:1084
 msgid ""
 "There are known problems with this machine\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1091
+#: src/emu/ui/ui.cpp:1088
 msgid ""
 "One or more ROMs/CHDs for this machine have not been correctly dumped.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1095
+#: src/emu/ui/ui.cpp:1092
 #, c-format
 msgid "The keyboard emulation may not be 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1097
+#: src/emu/ui/ui.cpp:1094
 #, c-format
 msgid "The colors aren't 100% accurate.\n"
 msgstr "Els colors no són 100% acurats.\n"
 
-#: src/emu/ui/ui.cpp:1099
+#: src/emu/ui/ui.cpp:1096
 msgid "The colors are completely wrong.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1101
+#: src/emu/ui/ui.cpp:1098
 #, c-format
 msgid "The video emulation isn't 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1103
+#: src/emu/ui/ui.cpp:1100
 #, c-format
 msgid "The sound emulation isn't 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1105
+#: src/emu/ui/ui.cpp:1102
 msgid "The machine lacks sound.\n"
 msgstr "La màquina manca so.\n"
 
-#: src/emu/ui/ui.cpp:1108
+#: src/emu/ui/ui.cpp:1105
 msgid "Screen flipping in cocktail mode is not supported.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1112
+#: src/emu/ui/ui.cpp:1109
 msgid "The machine requires external artwork files\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1117
+#: src/emu/ui/ui.cpp:1114
 msgid ""
 "This machine was never completed. It may exhibit strange behavior or missing "
 "elements that are not bugs in the emulation.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1122
+#: src/emu/ui/ui.cpp:1119
 msgid ""
 "This machine has no sound hardware, MAME will produce no sounds, this is "
 "expected behaviour.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1130
+#: src/emu/ui/ui.cpp:1127
 msgid "The machine has protection which isn't fully emulated.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1133
+#: src/emu/ui/ui.cpp:1130
 msgid ""
 "\n"
 "THIS MACHINE DOESN'T WORK. The emulation for this machine is not yet "
@@ -1523,7 +1539,7 @@ msgid ""
 "the developers to improve the emulation.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1137
+#: src/emu/ui/ui.cpp:1134
 msgid ""
 "\n"
 "Certain elements of this machine cannot be emulated as it requires actual "
@@ -1531,21 +1547,21 @@ msgid ""
 "to fully play this machine.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1156
+#: src/emu/ui/ui.cpp:1153
 msgid ""
 "\n"
 "\n"
 "There are working clones of this machine: "
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1170
+#: src/emu/ui/ui.cpp:1167
 msgid ""
 "\n"
 "\n"
 "Press any key to continue"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1185
+#: src/emu/ui/ui.cpp:1182
 #, c-format
 msgid ""
 "%1$s\n"
@@ -1555,15 +1571,15 @@ msgid ""
 "CPU:\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1221 src/emu/ui/ui.cpp:1260
+#: src/emu/ui/ui.cpp:1218 src/emu/ui/ui.cpp:1257
 msgid "MHz"
 msgstr "MHz"
 
-#: src/emu/ui/ui.cpp:1221 src/emu/ui/ui.cpp:1260
+#: src/emu/ui/ui.cpp:1218 src/emu/ui/ui.cpp:1257
 msgid "kHz"
 msgstr "kHz"
 
-#: src/emu/ui/ui.cpp:1235
+#: src/emu/ui/ui.cpp:1232
 msgid ""
 "\n"
 "Sound:\n"
@@ -1571,7 +1587,7 @@ msgstr ""
 "\n"
 "So:\n"
 
-#: src/emu/ui/ui.cpp:1264
+#: src/emu/ui/ui.cpp:1261
 msgid ""
 "\n"
 "Video:\n"
@@ -1579,78 +1595,78 @@ msgstr ""
 "\n"
 "Vídeo:\n"
 
-#: src/emu/ui/ui.cpp:1268
+#: src/emu/ui/ui.cpp:1265
 msgid "None\n"
 msgstr "Cap\n"
 
-#: src/emu/ui/ui.cpp:1275
+#: src/emu/ui/ui.cpp:1272
 msgid "Vector"
 msgstr "Vector"
 
-#: src/emu/ui/ui.cpp:1286
+#: src/emu/ui/ui.cpp:1283
 #, c-format
 msgid "%1$s: %2$s\n"
 msgstr "%1$s: %2$s\n"
 
-#: src/emu/ui/ui.cpp:1286
+#: src/emu/ui/ui.cpp:1283
 msgid "%2$s\n"
 msgstr "%2$s\n"
 
-#: src/emu/ui/ui.cpp:1541 src/emu/ui/ui.cpp:1551
+#: src/emu/ui/ui.cpp:1538 src/emu/ui/ui.cpp:1548
 msgid "Keyboard Emulation Status"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1543
+#: src/emu/ui/ui.cpp:1540
 msgid "Mode: PARTIAL Emulation"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1544
+#: src/emu/ui/ui.cpp:1541
 msgid "UI:   Enabled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1546 src/emu/ui/ui.cpp:1556
+#: src/emu/ui/ui.cpp:1543 src/emu/ui/ui.cpp:1553
 msgid "**Use ScrLock to toggle**"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1553
+#: src/emu/ui/ui.cpp:1550
 msgid "Mode: FULL Emulation"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1554
+#: src/emu/ui/ui.cpp:1551
 msgid "UI:   Disabled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1692
+#: src/emu/ui/ui.cpp:1689
 msgid "Autofire can't be enabled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1731
+#: src/emu/ui/ui.cpp:1728
 msgid "Select position to save to"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1733
+#: src/emu/ui/ui.cpp:1730
 msgid "Select position to load from"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1757
+#: src/emu/ui/ui.cpp:1754
 msgid "Save cancelled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1759
+#: src/emu/ui/ui.cpp:1756
 msgid "Load cancelled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1802
+#: src/emu/ui/ui.cpp:1799
 #, c-format
 msgid "Save to position %s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1807
+#: src/emu/ui/ui.cpp:1804
 #, c-format
 msgid "Load from position %s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1847
+#: src/emu/ui/ui.cpp:1844
 #, c-format
 msgid ""
 "Are you sure you want to quit?\n"
@@ -1659,173 +1675,173 @@ msgid ""
 "Press ''%2$s'' to return to emulation."
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1917
+#: src/emu/ui/ui.cpp:1914
 msgid "Master Volume"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1926
+#: src/emu/ui/ui.cpp:1923
 #, c-format
 msgid "%1$s Volume"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1949
+#: src/emu/ui/ui.cpp:1946
 #, c-format
 msgid "Overclock CPU %1$s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1968
+#: src/emu/ui/ui.cpp:1965
 #, c-format
 msgid "%1$s Refresh Rate"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1973
+#: src/emu/ui/ui.cpp:1970
 #, c-format
 msgid "%1$s Brightness"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1975
+#: src/emu/ui/ui.cpp:1972
 #, c-format
 msgid "%1$s Contrast"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1977
+#: src/emu/ui/ui.cpp:1974
 #, c-format
 msgid "%1$s Gamma"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1981
+#: src/emu/ui/ui.cpp:1978
 #, c-format
 msgid "%1$s Horiz Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1983
+#: src/emu/ui/ui.cpp:1980
 #, c-format
 msgid "%1$s Horiz Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1985
+#: src/emu/ui/ui.cpp:1982
 #, c-format
 msgid "%1$s Vert Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1987
+#: src/emu/ui/ui.cpp:1984
 #, c-format
 msgid "%1$s Vert Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2005
+#: src/emu/ui/ui.cpp:2002
 #, c-format
 msgid "Laserdisc '%1$s' Horiz Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2007
+#: src/emu/ui/ui.cpp:2004
 #, c-format
 msgid "Laserdisc '%1$s' Horiz Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2009
+#: src/emu/ui/ui.cpp:2006
 #, c-format
 msgid "Laserdisc '%1$s' Vert Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2011
+#: src/emu/ui/ui.cpp:2008
 #, c-format
 msgid "Laserdisc '%1$s' Vert Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2021
+#: src/emu/ui/ui.cpp:2018
 msgid "Vector Flicker"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2022
+#: src/emu/ui/ui.cpp:2019
 msgid "Beam Width Minimum"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2023
+#: src/emu/ui/ui.cpp:2020
 msgid "Beam Width Maximum"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2024
+#: src/emu/ui/ui.cpp:2021
 msgid "Beam Intensity Weight"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2037
+#: src/emu/ui/ui.cpp:2034
 #, c-format
 msgid "Crosshair Scale %1$s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2037 src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2034 src/emu/ui/ui.cpp:2036
 msgid "X"
 msgstr "X"
 
-#: src/emu/ui/ui.cpp:2037 src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2034 src/emu/ui/ui.cpp:2036
 msgid "Y"
 msgstr "Y"
 
-#: src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2036
 #, c-format
 msgid "Crosshair Offset %1$s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2071
+#: src/emu/ui/ui.cpp:2068
 #, c-format
 msgid "%1$3ddB"
 msgstr "%1$3ddB"
 
-#: src/emu/ui/ui.cpp:2115
+#: src/emu/ui/ui.cpp:2112
 #, c-format
 msgid "%1$d%%"
 msgstr "%1$d%%"
 
-#: src/emu/ui/ui.cpp:2131
+#: src/emu/ui/ui.cpp:2128
 #, c-format
 msgid "%1$3.0f%%"
 msgstr "%1$3.0f%%"
 
-#: src/emu/ui/ui.cpp:2154
+#: src/emu/ui/ui.cpp:2151
 #, c-format
 msgid "%1$.3ffps"
 msgstr "%1$.3ffps"
 
-#: src/emu/ui/ui.cpp:2177 src/emu/ui/ui.cpp:2199 src/emu/ui/ui.cpp:2220
-#: src/emu/ui/ui.cpp:2242 src/emu/ui/ui.cpp:2264 src/emu/ui/ui.cpp:2286
-#: src/emu/ui/ui.cpp:2308 src/emu/ui/ui.cpp:2330 src/emu/ui/ui.cpp:2352
-#: src/emu/ui/ui.cpp:2374 src/emu/ui/ui.cpp:2396
+#: src/emu/ui/ui.cpp:2174 src/emu/ui/ui.cpp:2196 src/emu/ui/ui.cpp:2217
+#: src/emu/ui/ui.cpp:2239 src/emu/ui/ui.cpp:2261 src/emu/ui/ui.cpp:2283
+#: src/emu/ui/ui.cpp:2305 src/emu/ui/ui.cpp:2327 src/emu/ui/ui.cpp:2349
+#: src/emu/ui/ui.cpp:2371 src/emu/ui/ui.cpp:2393
 #, c-format
 msgid "%1$.3f"
 msgstr "%1$.3f"
 
-#: src/emu/ui/ui.cpp:2412 src/emu/ui/ui.cpp:2428 src/emu/ui/ui.cpp:2444
-#: src/emu/ui/ui.cpp:2460
+#: src/emu/ui/ui.cpp:2408 src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2438
+#: src/emu/ui/ui.cpp:2453
 #, c-format
 msgid "%1$1.2f"
 msgstr "%1$1.2f"
 
-#: src/emu/ui/ui.cpp:2476
+#: src/emu/ui/ui.cpp:2469
 #, c-format
 msgid "Screen '%1$s'"
 msgstr "Pantalla «%1$s»"
 
-#: src/emu/ui/ui.cpp:2478
+#: src/emu/ui/ui.cpp:2471
 msgid "Screen"
 msgstr "Pantalla"
 
-#: src/emu/ui/ui.cpp:2494
+#: src/emu/ui/ui.cpp:2487
 #, c-format
 msgid "Crosshair Scale X %1$1.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2494
+#: src/emu/ui/ui.cpp:2487
 #, c-format
 msgid "Crosshair Scale Y %1$1.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2513
+#: src/emu/ui/ui.cpp:2506
 #, c-format
 msgid "Crosshair Offset X %1$1.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2513
+#: src/emu/ui/ui.cpp:2506
 #, c-format
 msgid "Crosshair Offset Y %1$1.3f"
 msgstr ""
@@ -1867,14 +1883,17 @@ msgstr "Escapçada"
 msgid "Full"
 msgstr "Completa"
 
-#: src/emu/ui/viewgfx.cpp:392
+#: src/emu/ui/viewgfx.cpp:391
 msgid " COLORS"
 msgstr " COLORS"
 
-#: src/emu/ui/viewgfx.cpp:392
+#: src/emu/ui/viewgfx.cpp:391
 msgid " PENS"
 msgstr ""
 
+#~ msgid "%1$s %2$s ( %3$d / %4$d softwares )"
+#~ msgstr "%1$s %2$s ( %3$d / %4$d programaris )"
+
 #~ msgid "Device Mapping"
 #~ msgstr "Mapeig de dispositius"
 
diff --git a/language/Chinese_Simplified/strings.po b/language/Chinese_Simplified/strings.po
index 6676a424d9e..b09a2fb84ca 100644
--- a/language/Chinese_Simplified/strings.po
+++ b/language/Chinese_Simplified/strings.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MAME\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-11 03:33+0200\n"
+"POT-Creation-Date: 2016-04-15 17:42+0200\n"
 "PO-Revision-Date: 2016-04-11 14:17+0800\n"
 "Last-Translator: YuiFAN\n"
 "Language-Team: MAME Language Team\n"
@@ -62,14 +62,14 @@ msgstr "全部重新载入"
 msgid "Autofire Status"
 msgstr "连发状态"
 
-#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1698
+#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1695
 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211
 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219
 #: src/emu/ui/videoopt.cpp:223
 msgid "Disabled"
 msgstr "已停用"
 
-#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1698
+#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1695
 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211
 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219
 #: src/emu/ui/videoopt.cpp:223
@@ -77,14 +77,14 @@ msgid "Enabled"
 msgstr "已启用"
 
 #: src/emu/ui/cheatopt.cpp:282 src/emu/ui/cheatopt.cpp:288
-#: src/emu/ui/menu.cpp:710 src/emu/ui/miscmenu.cpp:831
-#: src/emu/ui/sndmenu.cpp:135 src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/menu.cpp:755 src/emu/ui/miscmenu.cpp:936
+#: src/emu/ui/sndmenu.cpp:133 src/emu/ui/sndmenu.cpp:135
 msgid "On"
 msgstr "开"
 
 #: src/emu/ui/cheatopt.cpp:282 src/emu/ui/cheatopt.cpp:288
-#: src/emu/ui/menu.cpp:713 src/emu/ui/miscmenu.cpp:831
-#: src/emu/ui/sndmenu.cpp:135 src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/menu.cpp:758 src/emu/ui/miscmenu.cpp:936
+#: src/emu/ui/sndmenu.cpp:133 src/emu/ui/sndmenu.cpp:135
 msgid "Off"
 msgstr "关"
 
@@ -96,316 +96,316 @@ msgstr "在此机器上找不到按钮!"
 msgid "Autofire Delay"
 msgstr "连发延迟"
 
-#: src/emu/ui/custmenu.cpp:158 src/emu/ui/custmenu.cpp:447
+#: src/emu/ui/custmenu.cpp:157 src/emu/ui/custmenu.cpp:445
 msgid "Main filter"
 msgstr "主要过滤器"
 
-#: src/emu/ui/custmenu.cpp:167 src/emu/ui/custmenu.cpp:456
+#: src/emu/ui/custmenu.cpp:166 src/emu/ui/custmenu.cpp:454
 msgid "Other filter"
 msgstr "其他过滤器"
 
-#: src/emu/ui/custmenu.cpp:176 src/emu/ui/optsmenu.cpp:239
+#: src/emu/ui/custmenu.cpp:175 src/emu/ui/optsmenu.cpp:238
 msgid "^!Manufacturer"
 msgstr "^!制造商"
 
-#: src/emu/ui/custmenu.cpp:185 src/emu/ui/custmenu.cpp:474
-#: src/emu/ui/optsmenu.cpp:247
+#: src/emu/ui/custmenu.cpp:184 src/emu/ui/custmenu.cpp:472
+#: src/emu/ui/optsmenu.cpp:246
 msgid "^!Year"
 msgstr "^!年代"
 
-#: src/emu/ui/custmenu.cpp:194 src/emu/ui/custmenu.cpp:510
+#: src/emu/ui/custmenu.cpp:193 src/emu/ui/custmenu.cpp:508
 msgid "Remove last filter"
 msgstr "移除最后过滤器"
 
-#: src/emu/ui/custmenu.cpp:197 src/emu/ui/custmenu.cpp:513
+#: src/emu/ui/custmenu.cpp:196 src/emu/ui/custmenu.cpp:511
 msgid "Add filter"
 msgstr "新增过滤器"
 
-#: src/emu/ui/custmenu.cpp:212 src/emu/ui/custmenu.cpp:233
-#: src/emu/ui/custmenu.cpp:529 src/emu/ui/custmenu.cpp:550
+#: src/emu/ui/custmenu.cpp:211 src/emu/ui/custmenu.cpp:231
+#: src/emu/ui/custmenu.cpp:527 src/emu/ui/custmenu.cpp:547
 msgid "Select custom filters:"
 msgstr "选择自订过滤器:"
 
-#: src/emu/ui/custmenu.cpp:465
+#: src/emu/ui/custmenu.cpp:463
 msgid "^!Publisher"
 msgstr "^!出版商"
 
-#: src/emu/ui/custmenu.cpp:483
+#: src/emu/ui/custmenu.cpp:481
 msgid "^!Software List"
 msgstr "^!软件清单"
 
-#: src/emu/ui/custmenu.cpp:492
+#: src/emu/ui/custmenu.cpp:490
 msgid "^!Device type"
 msgstr "^!装置类别"
 
-#: src/emu/ui/custmenu.cpp:501
+#: src/emu/ui/custmenu.cpp:499
 msgid "^!Region"
 msgstr "^!区域"
 
-#: src/emu/ui/custui.cpp:23
+#: src/emu/ui/custui.cpp:22
 msgid "Show All"
 msgstr "显示全部"
 
-#: src/emu/ui/custui.cpp:24
+#: src/emu/ui/custui.cpp:23
 msgid "Hide Filters"
 msgstr "隐藏过滤器"
 
-#: src/emu/ui/custui.cpp:25
+#: src/emu/ui/custui.cpp:24
 msgid "Hide Info/Image"
 msgstr "隐藏信息/图片"
 
-#: src/emu/ui/custui.cpp:26
+#: src/emu/ui/custui.cpp:25
 msgid "Hide Both"
 msgstr "隐藏两者"
 
-#: src/emu/ui/custui.cpp:142
+#: src/emu/ui/custui.cpp:141
 msgid "Fonts"
 msgstr "字体"
 
-#: src/emu/ui/custui.cpp:143
+#: src/emu/ui/custui.cpp:142
 msgid "Colors"
 msgstr "颜色"
 
-#: src/emu/ui/custui.cpp:148 src/emu/ui/dirmenu.cpp:33
+#: src/emu/ui/custui.cpp:147 src/emu/ui/dirmenu.cpp:33
 msgid "Language"
 msgstr "语言"
 
-#: src/emu/ui/custui.cpp:152
+#: src/emu/ui/custui.cpp:151
 msgid "Show side panels"
 msgstr "显示侧面版"
 
-#: src/emu/ui/custui.cpp:167 src/emu/ui/custui.cpp:188
+#: src/emu/ui/custui.cpp:166 src/emu/ui/custui.cpp:186
 msgid "Custom UI Settings"
 msgstr "连发设定"
 
-#: src/emu/ui/custui.cpp:246
+#: src/emu/ui/custui.cpp:244
 msgid "default"
 msgstr "缺省"
 
-#: src/emu/ui/custui.cpp:349
+#: src/emu/ui/custui.cpp:347
 msgid "UI Font"
 msgstr "UI 字体"
 
-#: src/emu/ui/custui.cpp:354
+#: src/emu/ui/custui.cpp:352
 msgid "Bold"
 msgstr "粗体"
 
-#: src/emu/ui/custui.cpp:355
+#: src/emu/ui/custui.cpp:353
 msgid "Italic"
 msgstr "斜体"
 
-#: src/emu/ui/custui.cpp:360
+#: src/emu/ui/custui.cpp:358
 msgid "Lines"
 msgstr "行"
 
-#: src/emu/ui/custui.cpp:366
+#: src/emu/ui/custui.cpp:364
 msgid "Infos text size"
 msgstr "信息字体大小"
 
-#: src/emu/ui/custui.cpp:383
+#: src/emu/ui/custui.cpp:381
 msgid "UI Fonts Settings"
 msgstr "UI 字体设定"
 
-#: src/emu/ui/custui.cpp:411
+#: src/emu/ui/custui.cpp:408
 msgid "Sample text - Lorem ipsum dolor sit amet, consectetur adipiscing elit."
 msgstr "采样文字 - Lorem ipsum dolor sit amet, consectetur adipiscing elit."
 
-#: src/emu/ui/custui.cpp:509
+#: src/emu/ui/custui.cpp:506
 msgid "Normal text"
 msgstr "一般文本"
 
-#: src/emu/ui/custui.cpp:510
+#: src/emu/ui/custui.cpp:507
 msgid "Selected color"
 msgstr "选择色彩"
 
-#: src/emu/ui/custui.cpp:511
+#: src/emu/ui/custui.cpp:508
 msgid "Normal text background"
 msgstr "一般文本背景"
 
-#: src/emu/ui/custui.cpp:512
+#: src/emu/ui/custui.cpp:509
 msgid "Selected background color"
 msgstr "选择背景颜色"
 
-#: src/emu/ui/custui.cpp:513
+#: src/emu/ui/custui.cpp:510
 msgid "Subitem color"
 msgstr "子项目颜色"
 
-#: src/emu/ui/custui.cpp:514 src/emu/ui/custui.cpp:610
+#: src/emu/ui/custui.cpp:511 src/emu/ui/custui.cpp:606
 msgid "Clone"
 msgstr "克隆"
 
-#: src/emu/ui/custui.cpp:515
+#: src/emu/ui/custui.cpp:512
 msgid "Border"
 msgstr "边框"
 
-#: src/emu/ui/custui.cpp:516
+#: src/emu/ui/custui.cpp:513
 msgid "Background"
 msgstr "背景"
 
-#: src/emu/ui/custui.cpp:517
+#: src/emu/ui/custui.cpp:514
 msgid "Dipswitch"
 msgstr "机械设定开关"
 
-#: src/emu/ui/custui.cpp:518
+#: src/emu/ui/custui.cpp:515
 msgid "Unavailable color"
 msgstr "未拥有游戏颜色"
 
-#: src/emu/ui/custui.cpp:519
+#: src/emu/ui/custui.cpp:516
 msgid "Slider color"
 msgstr "参数调整"
 
-#: src/emu/ui/custui.cpp:520
+#: src/emu/ui/custui.cpp:517
 msgid "Gfx viewer background"
 msgstr "图形检视器背景"
 
-#: src/emu/ui/custui.cpp:521
+#: src/emu/ui/custui.cpp:518
 msgid "Mouse over color"
 msgstr "鼠标经过颜色"
 
-#: src/emu/ui/custui.cpp:522
+#: src/emu/ui/custui.cpp:519
 msgid "Mouse over background color"
 msgstr "鼠标经过背景颜色"
 
-#: src/emu/ui/custui.cpp:523
+#: src/emu/ui/custui.cpp:520
 msgid "Mouse down color"
 msgstr "鼠标按下颜色"
 
-#: src/emu/ui/custui.cpp:524
+#: src/emu/ui/custui.cpp:521
 msgid "Mouse down background color"
 msgstr "鼠标按下背景颜色"
 
-#: src/emu/ui/custui.cpp:527
+#: src/emu/ui/custui.cpp:524
 msgid "Restore originals colors"
 msgstr "还原至原本颜色"
 
-#: src/emu/ui/custui.cpp:543
+#: src/emu/ui/custui.cpp:540
 msgid "UI Colors Settings"
 msgstr "UI 色彩设定"
 
-#: src/emu/ui/custui.cpp:572
+#: src/emu/ui/custui.cpp:568
 #, c-format
 msgid "Double click or press %1$s to change the color value"
 msgstr "双击或按下 %1$s 以改变颜色值"
 
-#: src/emu/ui/custui.cpp:598
+#: src/emu/ui/custui.cpp:594
 msgid "Menu Preview"
 msgstr "菜单预览"
 
-#: src/emu/ui/custui.cpp:606
+#: src/emu/ui/custui.cpp:602
 msgid "Normal"
 msgstr "一般"
 
-#: src/emu/ui/custui.cpp:607
+#: src/emu/ui/custui.cpp:603
 msgid "Subitem"
 msgstr "子项目"
 
-#: src/emu/ui/custui.cpp:608
+#: src/emu/ui/custui.cpp:604
 msgid "Selected"
 msgstr "已选择"
 
-#: src/emu/ui/custui.cpp:609
+#: src/emu/ui/custui.cpp:605
 msgid "Mouse Over"
 msgstr "鼠标经过"
 
-#: src/emu/ui/custui.cpp:841 src/emu/ui/custui.cpp:844
+#: src/emu/ui/custui.cpp:837 src/emu/ui/custui.cpp:840
 msgid "Alpha"
 msgstr "透明度"
 
-#: src/emu/ui/custui.cpp:849 src/emu/ui/custui.cpp:852
-#: src/emu/ui/custui.cpp:1013
+#: src/emu/ui/custui.cpp:845 src/emu/ui/custui.cpp:848
+#: src/emu/ui/custui.cpp:1007
 msgid "Red"
 msgstr "红"
 
-#: src/emu/ui/custui.cpp:857 src/emu/ui/custui.cpp:860
-#: src/emu/ui/custui.cpp:1016
+#: src/emu/ui/custui.cpp:853 src/emu/ui/custui.cpp:856
+#: src/emu/ui/custui.cpp:1010
 msgid "Green"
 msgstr "绿"
 
-#: src/emu/ui/custui.cpp:865 src/emu/ui/custui.cpp:868
-#: src/emu/ui/custui.cpp:1017
+#: src/emu/ui/custui.cpp:861 src/emu/ui/custui.cpp:864
+#: src/emu/ui/custui.cpp:1011
 msgid "Blue"
 msgstr "蓝"
 
-#: src/emu/ui/custui.cpp:871
+#: src/emu/ui/custui.cpp:867
 msgid "Choose from palette"
 msgstr "从色盘选择"
 
-#: src/emu/ui/custui.cpp:887
+#: src/emu/ui/custui.cpp:883
 msgid " - ARGB Settings"
 msgstr " - ARGB 设定"
 
-#: src/emu/ui/custui.cpp:912
+#: src/emu/ui/custui.cpp:907
 msgid "Color preview ="
 msgstr "颜色预览＝"
 
-#: src/emu/ui/custui.cpp:1009
+#: src/emu/ui/custui.cpp:1003
 msgid "White"
 msgstr "白"
 
-#: src/emu/ui/custui.cpp:1010
+#: src/emu/ui/custui.cpp:1004
 msgid "Silver"
 msgstr "银"
 
-#: src/emu/ui/custui.cpp:1011
+#: src/emu/ui/custui.cpp:1005
 msgid "Gray"
 msgstr "灰"
 
-#: src/emu/ui/custui.cpp:1012
+#: src/emu/ui/custui.cpp:1006
 msgid "Black"
 msgstr "黑"
 
-#: src/emu/ui/custui.cpp:1014
+#: src/emu/ui/custui.cpp:1008
 msgid "Orange"
 msgstr "橘"
 
-#: src/emu/ui/custui.cpp:1015
+#: src/emu/ui/custui.cpp:1009
 msgid "Yellow"
 msgstr "黄"
 
-#: src/emu/ui/custui.cpp:1018
+#: src/emu/ui/custui.cpp:1012
 msgid "Violet"
 msgstr "紫"
 
-#: src/emu/ui/datmenu.cpp:65
+#: src/emu/ui/datmenu.cpp:64
 msgid "Software History"
 msgstr "软件历史"
 
-#: src/emu/ui/datmenu.cpp:67
+#: src/emu/ui/datmenu.cpp:66
 msgid "Software Usage"
 msgstr "软件用法"
 
-#: src/emu/ui/datmenu.cpp:199
+#: src/emu/ui/datmenu.cpp:196
 msgid "Revision: "
 msgstr "版本： "
 
-#: src/emu/ui/datmenu.cpp:287 src/emu/ui/selgame.cpp:40
-#: src/emu/ui/selgame.cpp:2152 src/emu/ui/selgame.cpp:2161
-#: src/emu/ui/selsoft.cpp:1577 src/emu/ui/selsoft.cpp:1597
-#: src/emu/ui/selsoft.cpp:1606
+#: src/emu/ui/datmenu.cpp:284 src/emu/ui/selgame.cpp:39
+#: src/emu/ui/selgame.cpp:2158 src/emu/ui/selgame.cpp:2167
+#: src/emu/ui/selsoft.cpp:1574 src/emu/ui/selsoft.cpp:1592
+#: src/emu/ui/selsoft.cpp:1601
 msgid "History"
 msgstr "历史"
 
-#: src/emu/ui/datmenu.cpp:289 src/emu/ui/selgame.cpp:41
+#: src/emu/ui/datmenu.cpp:286 src/emu/ui/selgame.cpp:40
 msgid "Mameinfo"
 msgstr "Mameinfo"
 
-#: src/emu/ui/datmenu.cpp:291 src/emu/ui/selgame.cpp:43
+#: src/emu/ui/datmenu.cpp:288 src/emu/ui/selgame.cpp:42
 msgid "Messinfo"
 msgstr "Messinfo"
 
-#: src/emu/ui/datmenu.cpp:293 src/emu/ui/selgame.cpp:42
+#: src/emu/ui/datmenu.cpp:290 src/emu/ui/selgame.cpp:41
 msgid "Sysinfo"
 msgstr "Sysinfo"
 
-#: src/emu/ui/datmenu.cpp:295 src/emu/ui/selgame.cpp:46
+#: src/emu/ui/datmenu.cpp:292 src/emu/ui/selgame.cpp:45
 msgid "Mamescore"
 msgstr "Mamescore"
 
-#: src/emu/ui/datmenu.cpp:297 src/emu/ui/selgame.cpp:45
+#: src/emu/ui/datmenu.cpp:294 src/emu/ui/selgame.cpp:44
 msgid "Gameinit"
 msgstr "Gameinit"
 
-#: src/emu/ui/datmenu.cpp:299 src/emu/ui/selgame.cpp:44
+#: src/emu/ui/datmenu.cpp:296 src/emu/ui/selgame.cpp:43
 msgid "Command"
 msgstr "出招表"
 
@@ -557,75 +557,75 @@ msgstr "按下 TAB 键设定"
 msgid "Remove %1$s Folder"
 msgstr "移除 %1$s 文件夹"
 
-#: src/emu/ui/filesel.cpp:158
+#: src/emu/ui/filesel.cpp:161
 msgid "File Already Exists - Override?"
 msgstr "档案已存在 — 是否覆写？"
 
-#: src/emu/ui/filesel.cpp:160 src/emu/ui/selgame.cpp:1568
-#: src/emu/ui/selgame.cpp:1569 src/emu/ui/selgame.cpp:1570
-#: src/emu/ui/selgame.cpp:1571 src/emu/ui/selgame.cpp:1572
-#: src/emu/ui/selgame.cpp:1573 src/emu/ui/selgame.cpp:1574
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/filesel.cpp:163 src/emu/ui/selgame.cpp:1576
+#: src/emu/ui/selgame.cpp:1577 src/emu/ui/selgame.cpp:1578
+#: src/emu/ui/selgame.cpp:1579 src/emu/ui/selgame.cpp:1580
+#: src/emu/ui/selgame.cpp:1581 src/emu/ui/selgame.cpp:1582
+#: src/emu/ui/selgame.cpp:1591
 msgid "No"
 msgstr "否"
 
-#: src/emu/ui/filesel.cpp:161 src/emu/ui/selgame.cpp:1568
-#: src/emu/ui/selgame.cpp:1569 src/emu/ui/selgame.cpp:1570
-#: src/emu/ui/selgame.cpp:1571 src/emu/ui/selgame.cpp:1572
-#: src/emu/ui/selgame.cpp:1573 src/emu/ui/selgame.cpp:1574
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/filesel.cpp:164 src/emu/ui/selgame.cpp:1576
+#: src/emu/ui/selgame.cpp:1577 src/emu/ui/selgame.cpp:1578
+#: src/emu/ui/selgame.cpp:1579 src/emu/ui/selgame.cpp:1580
+#: src/emu/ui/selgame.cpp:1581 src/emu/ui/selgame.cpp:1582
+#: src/emu/ui/selgame.cpp:1591
 msgid "Yes"
 msgstr "是"
 
-#: src/emu/ui/filesel.cpp:272
+#: src/emu/ui/filesel.cpp:275
 msgid "New Image Name:"
 msgstr "新映象档名称："
 
-#: src/emu/ui/filesel.cpp:278
+#: src/emu/ui/filesel.cpp:281
 msgid "Image Format:"
 msgstr "映像档格式"
 
-#: src/emu/ui/filesel.cpp:284
+#: src/emu/ui/filesel.cpp:287
 msgid "Create"
 msgstr "建立"
 
-#: src/emu/ui/filesel.cpp:315
+#: src/emu/ui/filesel.cpp:318
 msgid "Please enter a file extension too"
 msgstr "请一并输入副档名"
 
-#: src/emu/ui/filesel.cpp:503 src/emu/ui/swlist.cpp:65
+#: src/emu/ui/filesel.cpp:506 src/emu/ui/swlist.cpp:65
 msgid "[empty slot]"
 msgstr "[ 空插槽 ]"
 
-#: src/emu/ui/filesel.cpp:507
+#: src/emu/ui/filesel.cpp:510
 msgid "[create]"
 msgstr "[ 建立 ]"
 
-#: src/emu/ui/filesel.cpp:511 src/emu/ui/swlist.cpp:76
+#: src/emu/ui/filesel.cpp:514 src/emu/ui/swlist.cpp:76
 msgid "[software list]"
 msgstr "[ 软件清单 ]"
 
-#: src/emu/ui/filesel.cpp:803
+#: src/emu/ui/filesel.cpp:806
 msgid "Select image format"
 msgstr "选择映像档格式"
 
-#: src/emu/ui/filesel.cpp:863
+#: src/emu/ui/filesel.cpp:866
 msgid "Select access mode"
 msgstr "选择存取模式"
 
-#: src/emu/ui/filesel.cpp:864
+#: src/emu/ui/filesel.cpp:867
 msgid "Read-only"
 msgstr "唯读"
 
-#: src/emu/ui/filesel.cpp:866
+#: src/emu/ui/filesel.cpp:869
 msgid "Read-write"
 msgstr "读写"
 
-#: src/emu/ui/filesel.cpp:867
+#: src/emu/ui/filesel.cpp:870
 msgid "Read this image, write to another image"
 msgstr "读取此映像档，写入至其他映像档"
 
-#: src/emu/ui/filesel.cpp:868
+#: src/emu/ui/filesel.cpp:871
 msgid "Read this image, write to diff"
 msgstr "读取此映像档，写入差异档"
 
@@ -651,7 +651,7 @@ msgstr "部分支援"
 msgid "[empty]"
 msgstr "[ 空 ]"
 
-#: src/emu/ui/info_pty.cpp:26 src/emu/ui/mainmenu.cpp:91
+#: src/emu/ui/info_pty.cpp:26 src/emu/ui/mainmenu.cpp:96
 msgid "Pseudo terminals"
 msgstr "伪终端"
 
@@ -667,7 +667,7 @@ msgstr "使用者介面"
 msgid "Other Controls"
 msgstr "其他控制"
 
-#: src/emu/ui/inputmap.cpp:622 src/emu/ui/miscmenu.cpp:91
+#: src/emu/ui/inputmap.cpp:622 src/emu/ui/miscmenu.cpp:92
 #: src/emu/ui/slotopt.cpp:172
 msgid "Reset"
 msgstr "重设"
@@ -700,27 +700,27 @@ msgstr "收入信息"
 msgid "Machine Information"
 msgstr "机器信息"
 
-#: src/emu/ui/mainmenu.cpp:78
+#: src/emu/ui/mainmenu.cpp:80
 msgid "Image Information"
 msgstr "映像档信息"
 
-#: src/emu/ui/mainmenu.cpp:81
+#: src/emu/ui/mainmenu.cpp:83
 msgid "File Manager"
 msgstr "文件管理器"
 
-#: src/emu/ui/mainmenu.cpp:86
+#: src/emu/ui/mainmenu.cpp:92
 msgid "Tape Control"
 msgstr "磁带控制"
 
-#: src/emu/ui/mainmenu.cpp:94
+#: src/emu/ui/mainmenu.cpp:99
 msgid "Bios Selection"
 msgstr "选择 BIOS"
 
-#: src/emu/ui/mainmenu.cpp:100
+#: src/emu/ui/mainmenu.cpp:104
 msgid "Slot Devices"
 msgstr "插槽设备"
 
-#: src/emu/ui/mainmenu.cpp:107
+#: src/emu/ui/mainmenu.cpp:109
 msgid "Barcode Reader"
 msgstr "条码读取器"
 
@@ -728,43 +728,43 @@ msgstr "条码读取器"
 msgid "Network Devices"
 msgstr "网路装置"
 
-#: src/emu/ui/mainmenu.cpp:119
+#: src/emu/ui/mainmenu.cpp:118
 msgid "Keyboard Mode"
 msgstr "键盘模式"
 
-#: src/emu/ui/mainmenu.cpp:122
+#: src/emu/ui/mainmenu.cpp:121
 msgid "Slider Controls"
 msgstr "参数调整"
 
-#: src/emu/ui/mainmenu.cpp:125
+#: src/emu/ui/mainmenu.cpp:124
 msgid "Video Options"
 msgstr "视频选项"
 
-#: src/emu/ui/mainmenu.cpp:129
+#: src/emu/ui/mainmenu.cpp:128
 msgid "Crosshair Options"
 msgstr "十字准星选项"
 
-#: src/emu/ui/mainmenu.cpp:133
+#: src/emu/ui/mainmenu.cpp:132
 msgid "Cheat"
 msgstr "游戏作弊"
 
-#: src/emu/ui/mainmenu.cpp:136
+#: src/emu/ui/mainmenu.cpp:135
 msgid "Plugin Options"
 msgstr "插件选项"
 
-#: src/emu/ui/mainmenu.cpp:140
+#: src/emu/ui/mainmenu.cpp:139
 msgid "External DAT View"
 msgstr "檢視外部文件"
 
-#: src/emu/ui/mainmenu.cpp:146
+#: src/emu/ui/mainmenu.cpp:145 src/emu/ui/miscmenu.cpp:785
 msgid "Add To Favorites"
 msgstr "新增至最爱"
 
-#: src/emu/ui/mainmenu.cpp:148
+#: src/emu/ui/mainmenu.cpp:147 src/emu/ui/miscmenu.cpp:787
 msgid "Remove From Favorites"
 msgstr "从最爱移除"
 
-#: src/emu/ui/mainmenu.cpp:155
+#: src/emu/ui/mainmenu.cpp:154
 msgid "Select New Machine"
 msgstr "选择新机器"
 
@@ -804,31 +804,31 @@ msgstr "结束"
 msgid "Return to Previous Menu"
 msgstr "回上一层菜单"
 
-#: src/emu/ui/menu.cpp:716
+#: src/emu/ui/menu.cpp:761
 msgid "Auto"
 msgstr "自动"
 
-#: src/emu/ui/menu.cpp:2133
+#: src/emu/ui/menu.cpp:2195
 msgid "Images"
 msgstr "图像"
 
-#: src/emu/ui/menu.cpp:2134
+#: src/emu/ui/menu.cpp:2196
 msgid "Infos"
 msgstr "信息"
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Keyboard Mode:"
 msgstr "键盘模式:"
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Natural"
 msgstr "自然"
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Emulated"
 msgstr "模拟"
 
-#: src/emu/ui/miscmenu.cpp:240
+#: src/emu/ui/miscmenu.cpp:241
 #, c-format
 msgid ""
 "Uptime: %1$d:%2$02d:%3$02d\n"
@@ -837,7 +837,7 @@ msgstr ""
 "执行时间： %1$d:%2$02d:%3$02d\n"
 "\n"
 
-#: src/emu/ui/miscmenu.cpp:242
+#: src/emu/ui/miscmenu.cpp:243
 #, c-format
 msgid ""
 "Uptime: %1$d:%2$02d\n"
@@ -846,7 +846,7 @@ msgstr ""
 "执行时间： %1$d:%2$02d\n"
 "\n"
 
-#: src/emu/ui/miscmenu.cpp:246
+#: src/emu/ui/miscmenu.cpp:247
 #, c-format
 msgid ""
 "Tickets dispensed: %1$d\n"
@@ -855,109 +855,50 @@ msgstr ""
 "彩票分配数： %1$d\n"
 "\n"
 
-#: src/emu/ui/miscmenu.cpp:257
+#: src/emu/ui/miscmenu.cpp:258
 msgid "Coin %1$c: NA%3$s\n"
 msgstr "投币数 %1$c： NA%3$s\n"
 
-#: src/emu/ui/miscmenu.cpp:257
+#: src/emu/ui/miscmenu.cpp:258
 #, c-format
 msgid "Coin %1$c: %2$d%3$s\n"
 msgstr "投币数 %1$c： %2$d%3$s\n"
 
-#: src/emu/ui/miscmenu.cpp:260
+#: src/emu/ui/miscmenu.cpp:261
 msgid " (locked)"
 msgstr " （已锁定）"
 
-#: src/emu/ui/miscmenu.cpp:519
+#: src/emu/ui/miscmenu.cpp:520
 msgid "Visible Delay"
 msgstr "可见度延迟"
 
-#: src/emu/ui/miscmenu.cpp:617
+#: src/emu/ui/miscmenu.cpp:619
 #, c-format
 msgid "%s.xml saved under ui folder."
 msgstr "%s.xml 已储存于 ui 文件夹。"
 
-#: src/emu/ui/miscmenu.cpp:645
+#: src/emu/ui/miscmenu.cpp:647
 msgid "Name:             Description:\n"
 msgstr "名称：            描述：\n"
 
-#: src/emu/ui/miscmenu.cpp:657
+#: src/emu/ui/miscmenu.cpp:659
 #, c-format
 msgid "%s.txt saved under ui folder."
 msgstr "%s.txt 已储存于 ui 资料夹下。"
 
-#: src/emu/ui/miscmenu.cpp:675
-msgid "Export XML format (like -listxml)"
-msgstr "汇出为 XML 格式 （同 -listxml）"
+#: src/emu/ui/miscmenu.cpp:677
+msgid "Export list in XML format (like -listxml)"
+msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:676
-msgid "Export TXT format (like -listfull)"
-msgstr "汇出为 TXT 格式 （同 -listfull）"
+#: src/emu/ui/miscmenu.cpp:678
+msgid "Export list in XML format (like -listxml, but exclude devices)"
+msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:734
-msgid "Dummy"
-msgstr "Dummy"
+#: src/emu/ui/miscmenu.cpp:679
+msgid "Export list in TXT format (like -listfull)"
+msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:736
-msgid "Save machine configuration"
-msgstr "保存机械设定"
-
-#: src/emu/ui/miscmenu.cpp:848 src/emu/ui/miscmenu.cpp:869
-#: src/emu/ui/selgame.cpp:594
-msgid "Plugins"
-msgstr "插件"
-
-#: src/emu/ui/optsmenu.cpp:218
-msgid "Filter"
-msgstr "筛选"
-
-#: src/emu/ui/optsmenu.cpp:226
-msgid " ^!File"
-msgstr " ^!文件"
-
-#: src/emu/ui/optsmenu.cpp:231
-msgid " ^!Category"
-msgstr " ^!类别"
-
-#: src/emu/ui/optsmenu.cpp:254
-msgid "^!Setup custom filter"
-msgstr "^!设定自订筛选"
-
-#: src/emu/ui/optsmenu.cpp:262
-msgid "Customize UI"
-msgstr "自订 UI"
-
-#: src/emu/ui/optsmenu.cpp:263
-msgid "Configure Directories"
-msgstr "设定目录"
-
-#: src/emu/ui/optsmenu.cpp:266 src/emu/ui/sndmenu.cpp:151
-#: src/emu/ui/sndmenu.cpp:172
-msgid "Sound Options"
-msgstr "声音选项"
-
-#: src/emu/ui/optsmenu.cpp:269
-msgid "General Inputs"
-msgstr "一般输入"
-
-#: src/emu/ui/optsmenu.cpp:272
-msgid "Save Configuration"
-msgstr "保存设定"
-
-#: src/emu/ui/optsmenu.cpp:286 src/emu/ui/optsmenu.cpp:307
-msgid "Settings"
-msgstr "设定"
-
-#: src/emu/ui/optsmenu.cpp:327
-msgid "**Error saving ui.ini**"
-msgstr "**保存 ui.ini 时错误**"
-
-#: src/emu/ui/optsmenu.cpp:374
-#, c-format
-msgid "**Error saving %s.ini**"
-msgstr "**保存 %s.ini 时错误**"
-
-#: src/emu/ui/optsmenu.cpp:378
+#: src/emu/ui/miscmenu.cpp:729 src/emu/ui/optsmenu.cpp:376
 msgid ""
 "\n"
 "    Configuration saved    \n"
@@ -967,20 +908,95 @@ msgstr ""
 "        设定已保存        \n"
 "\n"
 
-#: src/emu/ui/selector.cpp:166
+#: src/emu/ui/miscmenu.cpp:774
+msgid "Bios"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:776
+msgid "Driver"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:790
+msgid "Save machine configuration"
+msgstr "保存机械设定"
+
+#: src/emu/ui/miscmenu.cpp:806
+msgid "Configure machine:"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:868 src/emu/ui/selsoft.cpp:109
+msgid " (default)"
+msgstr " (缺省)"
+
+#: src/emu/ui/miscmenu.cpp:953 src/emu/ui/miscmenu.cpp:973
+#: src/emu/ui/selgame.cpp:600
+msgid "Plugins"
+msgstr "插件"
+
+#: src/emu/ui/optsmenu.cpp:217
+msgid "Filter"
+msgstr "筛选"
+
+#: src/emu/ui/optsmenu.cpp:225
+msgid " ^!File"
+msgstr " ^!文件"
+
+#: src/emu/ui/optsmenu.cpp:230
+msgid " ^!Category"
+msgstr " ^!类别"
+
+#: src/emu/ui/optsmenu.cpp:253
+msgid "^!Setup custom filter"
+msgstr "^!设定自订筛选"
+
+#: src/emu/ui/optsmenu.cpp:261
+msgid "Customize UI"
+msgstr "自订 UI"
+
+#: src/emu/ui/optsmenu.cpp:262
+msgid "Configure Directories"
+msgstr "设定目录"
+
+#: src/emu/ui/optsmenu.cpp:265 src/emu/ui/sndmenu.cpp:149
+#: src/emu/ui/sndmenu.cpp:169
+msgid "Sound Options"
+msgstr "声音选项"
+
+#: src/emu/ui/optsmenu.cpp:268
+msgid "General Inputs"
+msgstr "一般输入"
+
+#: src/emu/ui/optsmenu.cpp:271
+msgid "Save Configuration"
+msgstr "保存设定"
+
+#: src/emu/ui/optsmenu.cpp:285 src/emu/ui/optsmenu.cpp:305
+msgid "Settings"
+msgstr "设定"
+
+#: src/emu/ui/optsmenu.cpp:325
+msgid "**Error saving ui.ini**"
+msgstr "**保存 ui.ini 时错误**"
+
+#: src/emu/ui/optsmenu.cpp:372
+#, c-format
+msgid "**Error saving %s.ini**"
+msgstr "**保存 %s.ini 时错误**"
+
+#: src/emu/ui/selector.cpp:165
 msgid "Selection List - Search: "
 msgstr "选项清单 - 搜寻： "
 
-#: src/emu/ui/selector.cpp:196
+#: src/emu/ui/selector.cpp:194
 #, c-format
 msgid "Double click or press %1$s to select"
 msgstr "双击或按下 %1$s 以选择"
 
-#: src/emu/ui/selgame.cpp:39
+#: src/emu/ui/selgame.cpp:38
 msgid "General Info"
 msgstr "一般信息"
 
-#: src/emu/ui/selgame.cpp:374 src/emu/ui/selsoft.cpp:282
+#: src/emu/ui/selgame.cpp:380 src/emu/ui/selsoft.cpp:281
 #, c-format
 msgid ""
 "%s\n"
@@ -989,15 +1005,15 @@ msgstr ""
 "%s\n"
 " 已新增至最爱清单。"
 
-#: src/emu/ui/selgame.cpp:380 src/emu/ui/selgame.cpp:389
-#: src/emu/ui/selsoft.cpp:287
+#: src/emu/ui/selgame.cpp:386 src/emu/ui/selgame.cpp:395
+#: src/emu/ui/selsoft.cpp:286
 #, c-format
 msgid ""
 "%s\n"
 " removed from favorites list."
 msgstr " 从最爱清单移除。"
 
-#: src/emu/ui/selgame.cpp:450
+#: src/emu/ui/selgame.cpp:457
 msgid ""
 "The selected machine is missing one or more required ROM or CHD images. "
 "Please select a different machine.\n"
@@ -1008,256 +1024,260 @@ msgstr ""
 "\n"
 "按任意键继续。"
 
-#: src/emu/ui/selgame.cpp:589 src/emu/ui/simpleselgame.cpp:265
+#: src/emu/ui/selgame.cpp:595 src/emu/ui/simpleselgame.cpp:265
 msgid "Configure Options"
 msgstr "设定选项"
 
-#: src/emu/ui/selgame.cpp:752
+#: src/emu/ui/selgame.cpp:596
+msgid "Configure Machine"
+msgstr ""
+
+#: src/emu/ui/selgame.cpp:758
 #, c-format
 msgid "%1$s %2$s ( %3$d / %4$d machines (%5$d BIOS) )"
 msgstr "%1$s %2$s ( %3$d / %4$d 机械 (%5$d BIOS) )"
 
-#: src/emu/ui/selgame.cpp:762
+#: src/emu/ui/selgame.cpp:768
 #, c-format
 msgid "%1$s (%2$s - %3$s) - "
 msgstr "%1$s (%2$s - %3$s) - "
 
-#: src/emu/ui/selgame.cpp:769 src/emu/ui/selgame.cpp:775
+#: src/emu/ui/selgame.cpp:775 src/emu/ui/selgame.cpp:781
 #, c-format
 msgid "%1$s (%2$s) - "
 msgstr "%1$s (%2$s) - "
 
-#: src/emu/ui/selgame.cpp:784
+#: src/emu/ui/selgame.cpp:790
 #, c-format
 msgid "%1$s Search: %2$s_"
 msgstr "%1$s 搜寻： %2$s_"
 
-#: src/emu/ui/selgame.cpp:838
+#: src/emu/ui/selgame.cpp:844
 #, c-format
 msgid "Romset: %1$-.100s"
 msgstr "Rom组： %1$-.100s"
 
-#: src/emu/ui/selgame.cpp:841 src/emu/ui/selgame.cpp:890
-#: src/emu/ui/selsoft.cpp:751 src/emu/ui/selsoft.cpp:801
+#: src/emu/ui/selgame.cpp:847 src/emu/ui/selgame.cpp:896
+#: src/emu/ui/selsoft.cpp:750 src/emu/ui/selsoft.cpp:800
 #: src/emu/ui/simpleselgame.cpp:328
 #, c-format
 msgid "%1$s, %2$-.100s"
 msgstr "%1$s, %2$-.100s"
 
-#: src/emu/ui/selgame.cpp:847 src/emu/ui/selsoft.cpp:757
+#: src/emu/ui/selgame.cpp:853 src/emu/ui/selsoft.cpp:756
 #, c-format
 msgid "Driver is clone of: %1$-.100s"
 msgstr "驱动相容于： %-.100s"
 
-#: src/emu/ui/selgame.cpp:849 src/emu/ui/selsoft.cpp:759
+#: src/emu/ui/selgame.cpp:855 src/emu/ui/selsoft.cpp:758
 msgid "Driver is parent"
 msgstr "驱动为主档"
 
-#: src/emu/ui/selgame.cpp:853 src/emu/ui/selsoft.cpp:763
+#: src/emu/ui/selgame.cpp:859 src/emu/ui/selsoft.cpp:762
 #: src/emu/ui/simpleselgame.cpp:335
 msgid "Overall: NOT WORKING"
 msgstr "整体： 不可执行"
 
-#: src/emu/ui/selgame.cpp:855 src/emu/ui/selsoft.cpp:765
+#: src/emu/ui/selgame.cpp:861 src/emu/ui/selsoft.cpp:764
 #: src/emu/ui/simpleselgame.cpp:337
 msgid "Overall: Unemulated Protection"
 msgstr "整体： 未模拟保护"
 
-#: src/emu/ui/selgame.cpp:857 src/emu/ui/selsoft.cpp:767
+#: src/emu/ui/selgame.cpp:863 src/emu/ui/selsoft.cpp:766
 #: src/emu/ui/simpleselgame.cpp:339
 msgid "Overall: Working"
 msgstr "整体： 可以执行"
 
-#: src/emu/ui/selgame.cpp:861 src/emu/ui/selsoft.cpp:771
+#: src/emu/ui/selgame.cpp:867 src/emu/ui/selsoft.cpp:770
 msgid "Graphics: Imperfect, "
 msgstr "图形： 不完美， "
 
-#: src/emu/ui/selgame.cpp:863 src/emu/ui/selsoft.cpp:773
+#: src/emu/ui/selgame.cpp:869 src/emu/ui/selsoft.cpp:772
 msgid "Graphics: OK, "
 msgstr "图形： OK， "
 
-#: src/emu/ui/selgame.cpp:866 src/emu/ui/selsoft.cpp:776
+#: src/emu/ui/selgame.cpp:872 src/emu/ui/selsoft.cpp:775
 msgid "Sound: Unimplemented"
 msgstr "声音： 无法执行"
 
-#: src/emu/ui/selgame.cpp:868 src/emu/ui/selsoft.cpp:778
+#: src/emu/ui/selgame.cpp:874 src/emu/ui/selsoft.cpp:777
 msgid "Sound: Imperfect"
 msgstr "声音： 不完美"
 
-#: src/emu/ui/selgame.cpp:870 src/emu/ui/selsoft.cpp:780
+#: src/emu/ui/selgame.cpp:876 src/emu/ui/selsoft.cpp:779
 msgid "Sound: OK"
 msgstr "声音： OK"
 
-#: src/emu/ui/selgame.cpp:887
+#: src/emu/ui/selgame.cpp:893
 #, c-format
 msgid "System: %1$-.100s"
 msgstr "系统： %1$-.100s"
 
-#: src/emu/ui/selgame.cpp:894 src/emu/ui/selsoft.cpp:805
+#: src/emu/ui/selgame.cpp:900 src/emu/ui/selsoft.cpp:804
 #, c-format
 msgid "Software is clone of: %1$-.100s"
 msgstr "软件相容于： %1$-.100s"
 
-#: src/emu/ui/selgame.cpp:896 src/emu/ui/selsoft.cpp:807
+#: src/emu/ui/selgame.cpp:902 src/emu/ui/selsoft.cpp:806
 msgid "Software is parent"
 msgstr "软件为主档"
 
-#: src/emu/ui/selgame.cpp:901 src/emu/ui/selsoft.cpp:812
+#: src/emu/ui/selgame.cpp:907 src/emu/ui/selsoft.cpp:811
 msgid "Supported: No"
 msgstr "已支援： 否"
 
-#: src/emu/ui/selgame.cpp:906 src/emu/ui/selsoft.cpp:817
+#: src/emu/ui/selgame.cpp:912 src/emu/ui/selsoft.cpp:816
 msgid "Supported: Partial"
 msgstr "已支援： 部分"
 
-#: src/emu/ui/selgame.cpp:911 src/emu/ui/selsoft.cpp:822
+#: src/emu/ui/selgame.cpp:917 src/emu/ui/selsoft.cpp:821
 msgid "Supported: Yes"
 msgstr "已支援： 是"
 
-#: src/emu/ui/selgame.cpp:916 src/emu/ui/selsoft.cpp:827
+#: src/emu/ui/selgame.cpp:922 src/emu/ui/selsoft.cpp:826
 #, c-format
 msgid "romset: %1$-.100s"
 msgstr "Rom套： %1$-.100s"
 
-#: src/emu/ui/selgame.cpp:923
+#: src/emu/ui/selgame.cpp:929
 #, c-format
 msgid "%1$s %2$s"
 msgstr "%1$s %2$s"
 
-#: src/emu/ui/selgame.cpp:1535
+#: src/emu/ui/selgame.cpp:1543
 #, c-format
 msgid "Romset: %1$-.100s\n"
 msgstr "Rom套： %1$-.100s\n"
 
-#: src/emu/ui/selgame.cpp:1536
+#: src/emu/ui/selgame.cpp:1544
 #, c-format
 msgid "Year: %1$s\n"
 msgstr "年份： %1$s\n"
 
-#: src/emu/ui/selgame.cpp:1537
+#: src/emu/ui/selgame.cpp:1545
 #, c-format
 msgid "Manufacturer: %1$-.100s\n"
 msgstr "制造商： %1$-.100s\n"
 
-#: src/emu/ui/selgame.cpp:1541
+#: src/emu/ui/selgame.cpp:1549
 #, c-format
 msgid "Driver is Clone of: %1$-.100s\n"
 msgstr "驱动程式相容于： %1$-.100s\n"
 
-#: src/emu/ui/selgame.cpp:1543
+#: src/emu/ui/selgame.cpp:1551
 msgid "Driver is Parent\n"
 msgstr "驱动程式为主档\n"
 
-#: src/emu/ui/selgame.cpp:1546
+#: src/emu/ui/selgame.cpp:1554
 msgid "Overall: NOT WORKING\n"
 msgstr "整体： 不可执行\n"
 
-#: src/emu/ui/selgame.cpp:1548
+#: src/emu/ui/selgame.cpp:1556
 msgid "Overall: Unemulated Protection\n"
 msgstr "整体： 未模拟保护\n"
 
-#: src/emu/ui/selgame.cpp:1550
+#: src/emu/ui/selgame.cpp:1558
 msgid "Overall: Working\n"
 msgstr "整体: 可以执行\n"
 
-#: src/emu/ui/selgame.cpp:1553
+#: src/emu/ui/selgame.cpp:1561
 msgid "Graphics: Imperfect Colors\n"
 msgstr "图形： 色彩不完美\n"
 
-#: src/emu/ui/selgame.cpp:1557
+#: src/emu/ui/selgame.cpp:1565
 msgid "Graphics: Imperfect\n"
 msgstr "图形： 不完美\n"
 
-#: src/emu/ui/selgame.cpp:1559
+#: src/emu/ui/selgame.cpp:1567
 msgid "Graphics: OK\n"
 msgstr "图形： OK\n"
 
-#: src/emu/ui/selgame.cpp:1562
+#: src/emu/ui/selgame.cpp:1570
 msgid "Sound: Unimplemented\n"
 msgstr "声音： 无法执行\n"
 
-#: src/emu/ui/selgame.cpp:1564
+#: src/emu/ui/selgame.cpp:1572
 msgid "Sound: Imperfect\n"
 msgstr "声音： 不完美\n"
 
-#: src/emu/ui/selgame.cpp:1566
+#: src/emu/ui/selgame.cpp:1574
 msgid "Sound: OK\n"
 msgstr "声音： OK\n"
 
-#: src/emu/ui/selgame.cpp:1568
+#: src/emu/ui/selgame.cpp:1576
 #, c-format
 msgid "Driver is Skeleton: %1$s\n"
 msgstr "驱动程式尚未完整： %1$s\n"
 
-#: src/emu/ui/selgame.cpp:1569
+#: src/emu/ui/selgame.cpp:1577
 #, c-format
 msgid "Game is Mechanical: %1$s\n"
 msgstr "游戏为机械式： %1$s\n"
 
-#: src/emu/ui/selgame.cpp:1570
+#: src/emu/ui/selgame.cpp:1578
 #, c-format
 msgid "Requires Artwork: %1$s\n"
 msgstr "需要装饰图： %1$s\n"
 
-#: src/emu/ui/selgame.cpp:1571
+#: src/emu/ui/selgame.cpp:1579
 #, c-format
 msgid "Requires Clickable Artwork: %1$s\n"
 msgstr "必要可点击的装饰图： %1$s\n"
 
-#: src/emu/ui/selgame.cpp:1572
+#: src/emu/ui/selgame.cpp:1580
 #, c-format
 msgid "Support Cocktail: %1$s\n"
 msgstr "支援台面型筐体： %1$s\n"
 
-#: src/emu/ui/selgame.cpp:1573
+#: src/emu/ui/selgame.cpp:1581
 #, c-format
 msgid "Driver is Bios: %1$s\n"
 msgstr "驱动为 BIOS： %1$s\n"
 
-#: src/emu/ui/selgame.cpp:1574
+#: src/emu/ui/selgame.cpp:1582
 #, c-format
 msgid "Support Save: %1$s\n"
 msgstr "支援即时存档： %1$s\n"
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 #, c-format
 msgid "Screen Orientation: %1$s\n"
 msgstr "画面方向： %1$s\n"
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 msgid "Vertical"
 msgstr "垂直"
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 msgid "Horizontal"
 msgstr "水平"
 
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/selgame.cpp:1591
 #, c-format
 msgid "Requires CHD: %1$s\n"
 msgstr "需要 CHD： %1$s\n"
 
-#: src/emu/ui/selgame.cpp:1596
+#: src/emu/ui/selgame.cpp:1604
 msgid "Roms Audit Pass: OK\n"
 msgstr "ROM 验证通过： OK\n"
 
-#: src/emu/ui/selgame.cpp:1598
+#: src/emu/ui/selgame.cpp:1606
 msgid "Roms Audit Pass: BAD\n"
 msgstr "ROM 验证通过： 错误\n"
 
-#: src/emu/ui/selgame.cpp:1601
+#: src/emu/ui/selgame.cpp:1609
 msgid "Samples Audit Pass: None Needed\n"
 msgstr "样本档验证通过： 不需要\n"
 
-#: src/emu/ui/selgame.cpp:1603
+#: src/emu/ui/selgame.cpp:1611
 msgid "Samples Audit Pass: OK\n"
 msgstr "样本档验证通过： OK\n"
 
-#: src/emu/ui/selgame.cpp:1605
+#: src/emu/ui/selgame.cpp:1613
 msgid "Samples Audit Pass: BAD\n"
 msgstr "样本档验证通过： 错误\n"
 
-#: src/emu/ui/selgame.cpp:1608
+#: src/emu/ui/selgame.cpp:1616
 msgid ""
 "Roms Audit Pass: Disabled\n"
 "Samples Audit Pass: Disabled\n"
@@ -1265,20 +1285,16 @@ msgstr ""
 "ROM 验证通过： 已停用\n"
 "样本档验证通过： 已停用\n"
 
-#: src/emu/ui/selgame.cpp:2049 src/emu/ui/selgame.cpp:2212
-#: src/emu/ui/selsoft.cpp:1662
+#: src/emu/ui/selgame.cpp:2055 src/emu/ui/selgame.cpp:2216
+#: src/emu/ui/selsoft.cpp:1655
 msgid "No Infos Available"
 msgstr "无可用信息"
 
-#: src/emu/ui/selgame.cpp:2162 src/emu/ui/selsoft.cpp:1607
+#: src/emu/ui/selgame.cpp:2168 src/emu/ui/selsoft.cpp:1602
 msgid "Usage"
 msgstr "用法"
 
-#: src/emu/ui/selsoft.cpp:110
-msgid " (default)"
-msgstr " (缺省)"
-
-#: src/emu/ui/selsoft.cpp:381
+#: src/emu/ui/selsoft.cpp:380
 msgid ""
 "The selected software is missing one or more required files. Please select a "
 "different software.\n"
@@ -1289,57 +1305,57 @@ msgstr ""
 "\n"
 "按任意键继续。"
 
-#: src/emu/ui/selsoft.cpp:684
+#: src/emu/ui/selsoft.cpp:683
 #, c-format
-msgid "%1$s %2$s ( %3$d / %4$d softwares )"
-msgstr "%1$s %2$s ( %3$d / %4$d 软件 )"
+msgid "%1$s %2$s ( %3$d / %4$d software packages )"
+msgstr ""
 
-#: src/emu/ui/selsoft.cpp:685
+#: src/emu/ui/selsoft.cpp:684
 #, c-format
 msgid "Driver: \"%1$s\" software list "
 msgstr "驱动： \"%1$s\" 软件清单 "
 
-#: src/emu/ui/selsoft.cpp:688
+#: src/emu/ui/selsoft.cpp:687
 #, c-format
 msgid "Region: %1$s -"
 msgstr "区域： %1$s -"
 
-#: src/emu/ui/selsoft.cpp:690
+#: src/emu/ui/selsoft.cpp:689
 #, c-format
 msgid "Publisher: %1$s -"
 msgstr "出版商： %1$s -"
 
-#: src/emu/ui/selsoft.cpp:692
+#: src/emu/ui/selsoft.cpp:691
 #, c-format
 msgid "Year: %1$s -"
 msgstr "年代： %1$s -"
 
-#: src/emu/ui/selsoft.cpp:694
+#: src/emu/ui/selsoft.cpp:693
 #, c-format
 msgid "Software List: %1$s -"
 msgstr "软件清单： %1$s -"
 
-#: src/emu/ui/selsoft.cpp:696
+#: src/emu/ui/selsoft.cpp:695
 #, c-format
 msgid "Device type: %1$s -"
 msgstr "装置类别： %1$s -"
 
-#: src/emu/ui/selsoft.cpp:698
+#: src/emu/ui/selsoft.cpp:697
 #, c-format
 msgid "%s Search: %s_"
 msgstr "%s 搜寻： %s_"
 
-#: src/emu/ui/selsoft.cpp:748 src/emu/ui/selsoft.cpp:798
+#: src/emu/ui/selsoft.cpp:747 src/emu/ui/selsoft.cpp:797
 #: src/emu/ui/simpleselgame.cpp:325
 #, c-format
 msgid "%1$-.100s"
 msgstr "%1$-.100s"
 
-#: src/emu/ui/selsoft.cpp:1998 src/emu/ui/selsoft.cpp:2018
+#: src/emu/ui/selsoft.cpp:1991 src/emu/ui/selsoft.cpp:2011
 msgid "Software part selection:"
 msgstr "软件部分选项： "
 
-#: src/emu/ui/selsoft.cpp:2136 src/emu/ui/selsoft.cpp:2156
+#: src/emu/ui/selsoft.cpp:2129 src/emu/ui/selsoft.cpp:2149
 msgid "Bios selection:"
 msgstr "选择 BIOS："
 
@@ -1391,15 +1407,15 @@ msgstr "图形： %s, 声音: %s"
 msgid " [internal]"
 msgstr " [内部]"
 
-#: src/emu/ui/sndmenu.cpp:135
+#: src/emu/ui/sndmenu.cpp:133
 msgid "Sound"
 msgstr "声音"
 
-#: src/emu/ui/sndmenu.cpp:136
+#: src/emu/ui/sndmenu.cpp:134
 msgid "Sample Rate"
 msgstr "采样率"
 
-#: src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/sndmenu.cpp:135
 msgid "Use External Samples"
 msgstr "使用外部采样率"
 
@@ -1468,17 +1484,17 @@ msgstr "倒带"
 msgid "Fast Forward"
 msgstr "快进"
 
-#: src/emu/ui/ui.cpp:419
+#: src/emu/ui/ui.cpp:418
 msgid "This driver requires images to be loaded in the following device(s): "
 msgstr "此驱动需要额外载入下列装置的映像档: "
 
-#: src/emu/ui/ui.cpp:1074
+#: src/emu/ui/ui.cpp:1071
 msgid ""
 "One or more ROMs/CHDs for this machine are incorrect. The machine may not "
 "run correctly.\n"
 msgstr "本机械有一个或更多的 ROM/CHD 是不正确的。此机械可能无法正确执行。\n"
 
-#: src/emu/ui/ui.cpp:1087
+#: src/emu/ui/ui.cpp:1084
 msgid ""
 "There are known problems with this machine\n"
 "\n"
@@ -1486,64 +1502,64 @@ msgstr ""
 "本机械已知具有下列的问题\n"
 "\n"
 
-#: src/emu/ui/ui.cpp:1091
+#: src/emu/ui/ui.cpp:1088
 msgid ""
 "One or more ROMs/CHDs for this machine have not been correctly dumped.\n"
 msgstr "本机械有一个或更多的 ROM/CHD 尚未正确地被 DUMP。\n"
 
-#: src/emu/ui/ui.cpp:1095
+#: src/emu/ui/ui.cpp:1092
 #, c-format
 msgid "The keyboard emulation may not be 100% accurate.\n"
 msgstr "键盘模拟可能未达到 100% 精确。"
 
-#: src/emu/ui/ui.cpp:1097
+#: src/emu/ui/ui.cpp:1094
 #, c-format
 msgid "The colors aren't 100% accurate.\n"
 msgstr "色彩是完全错误的。"
 
-#: src/emu/ui/ui.cpp:1099
+#: src/emu/ui/ui.cpp:1096
 msgid "The colors are completely wrong.\n"
 msgstr "色彩尚未达到 100% 精确。"
 
-#: src/emu/ui/ui.cpp:1101
+#: src/emu/ui/ui.cpp:1098
 #, c-format
 msgid "The video emulation isn't 100% accurate.\n"
 msgstr "视讯模拟尚未达到 100% 精确。"
 
-#: src/emu/ui/ui.cpp:1103
+#: src/emu/ui/ui.cpp:1100
 #, c-format
 msgid "The sound emulation isn't 100% accurate.\n"
 msgstr "声音模拟尚未达到 100% 精确。"
 
-#: src/emu/ui/ui.cpp:1105
+#: src/emu/ui/ui.cpp:1102
 msgid "The machine lacks sound.\n"
 msgstr "机械缺少声音。"
 
-#: src/emu/ui/ui.cpp:1108
+#: src/emu/ui/ui.cpp:1105
 msgid "Screen flipping in cocktail mode is not supported.\n"
 msgstr "尚未支援台面型筐体模式的画面翻转。"
 
-#: src/emu/ui/ui.cpp:1112
+#: src/emu/ui/ui.cpp:1109
 msgid "The machine requires external artwork files\n"
 msgstr "机械需要外部装饰图档案"
 
-#: src/emu/ui/ui.cpp:1117
+#: src/emu/ui/ui.cpp:1114
 msgid ""
 "This machine was never completed. It may exhibit strange behavior or missing "
 "elements that are not bugs in the emulation.\n"
 msgstr "本机械无法完成，并非模拟中的错误而可能呈现怪异的行为或缺少元件。\n"
 
-#: src/emu/ui/ui.cpp:1122
+#: src/emu/ui/ui.cpp:1119
 msgid ""
 "This machine has no sound hardware, MAME will produce no sounds, this is "
 "expected behaviour.\n"
 msgstr "本机械无声音硬体，故 MAME 将不会产生声音，这是可预期的行为。\n"
 
-#: src/emu/ui/ui.cpp:1130
+#: src/emu/ui/ui.cpp:1127
 msgid "The machine has protection which isn't fully emulated.\n"
 msgstr "机械具有保护尚未完全模拟。"
 
-#: src/emu/ui/ui.cpp:1133
+#: src/emu/ui/ui.cpp:1130
 msgid ""
 "\n"
 "THIS MACHINE DOESN'T WORK. The emulation for this machine is not yet "
@@ -1553,7 +1569,7 @@ msgstr ""
 "此机械无法执行，机械的模拟还不完全。除了等待开发人员改良模拟之外，没有方法可"
 "以解决这个问题。\n"
 
-#: src/emu/ui/ui.cpp:1137
+#: src/emu/ui/ui.cpp:1134
 msgid ""
 "\n"
 "Certain elements of this machine cannot be emulated as it requires actual "
@@ -1564,7 +1580,7 @@ msgstr ""
 "本机械的的部分元件无法模拟，因其需要实际活动的互动或机械装置的组合。故无法完"
 "成此游戏的执行。\n"
 
-#: src/emu/ui/ui.cpp:1156
+#: src/emu/ui/ui.cpp:1153
 msgid ""
 "\n"
 "\n"
@@ -1574,14 +1590,14 @@ msgstr ""
 "\n"
 "本机械尚有可执行的仿制版: "
 
-#: src/emu/ui/ui.cpp:1170
+#: src/emu/ui/ui.cpp:1167
 msgid ""
 "\n"
 "\n"
 "Press any key to continue"
 msgstr "按任意按键继续"
 
-#: src/emu/ui/ui.cpp:1185
+#: src/emu/ui/ui.cpp:1182
 #, c-format
 msgid ""
 "%1$s\n"
@@ -1596,15 +1612,15 @@ msgstr ""
 "\n"
 "CPU:\n"
 
-#: src/emu/ui/ui.cpp:1221 src/emu/ui/ui.cpp:1260
+#: src/emu/ui/ui.cpp:1218 src/emu/ui/ui.cpp:1257
 msgid "MHz"
 msgstr "MHz"
 
-#: src/emu/ui/ui.cpp:1221 src/emu/ui/ui.cpp:1260
+#: src/emu/ui/ui.cpp:1218 src/emu/ui/ui.cpp:1257
 msgid "kHz"
 msgstr "kHz"
 
-#: src/emu/ui/ui.cpp:1235
+#: src/emu/ui/ui.cpp:1232
 msgid ""
 "\n"
 "Sound:\n"
@@ -1612,7 +1628,7 @@ msgstr ""
 "\n"
 "声音：\n"
 
-#: src/emu/ui/ui.cpp:1264
+#: src/emu/ui/ui.cpp:1261
 msgid ""
 "\n"
 "Video:\n"
@@ -1620,78 +1636,78 @@ msgstr ""
 "\n"
 "视讯：\n"
 
-#: src/emu/ui/ui.cpp:1268
+#: src/emu/ui/ui.cpp:1265
 msgid "None\n"
 msgstr "无\n"
 
-#: src/emu/ui/ui.cpp:1275
+#: src/emu/ui/ui.cpp:1272
 msgid "Vector"
 msgstr "向量"
 
-#: src/emu/ui/ui.cpp:1286
+#: src/emu/ui/ui.cpp:1283
 #, c-format
 msgid "%1$s: %2$s\n"
 msgstr "%1$s: %2$s\n"
 
-#: src/emu/ui/ui.cpp:1286
+#: src/emu/ui/ui.cpp:1283
 msgid "%2$s\n"
 msgstr "%2$s\n"
 
-#: src/emu/ui/ui.cpp:1541 src/emu/ui/ui.cpp:1551
+#: src/emu/ui/ui.cpp:1538 src/emu/ui/ui.cpp:1548
 msgid "Keyboard Emulation Status"
 msgstr "键盘模拟状态"
 
-#: src/emu/ui/ui.cpp:1543
+#: src/emu/ui/ui.cpp:1540
 msgid "Mode: PARTIAL Emulation"
 msgstr "模式： 部分模拟"
 
-#: src/emu/ui/ui.cpp:1544
+#: src/emu/ui/ui.cpp:1541
 msgid "UI:   Enabled"
 msgstr "UI：   已启用"
 
-#: src/emu/ui/ui.cpp:1546 src/emu/ui/ui.cpp:1556
+#: src/emu/ui/ui.cpp:1543 src/emu/ui/ui.cpp:1553
 msgid "**Use ScrLock to toggle**"
 msgstr "**使用 ScrLock 键切换**"
 
-#: src/emu/ui/ui.cpp:1553
+#: src/emu/ui/ui.cpp:1550
 msgid "Mode: FULL Emulation"
 msgstr "模式： 完整模拟"
 
-#: src/emu/ui/ui.cpp:1554
+#: src/emu/ui/ui.cpp:1551
 msgid "UI:   Disabled"
 msgstr "UI：   已停用"
 
-#: src/emu/ui/ui.cpp:1692
+#: src/emu/ui/ui.cpp:1689
 msgid "Autofire can't be enabled"
 msgstr "无法启用连发"
 
-#: src/emu/ui/ui.cpp:1731
+#: src/emu/ui/ui.cpp:1728
 msgid "Select position to save to"
 msgstr "选择保存位置"
 
-#: src/emu/ui/ui.cpp:1733
+#: src/emu/ui/ui.cpp:1730
 msgid "Select position to load from"
 msgstr "选择载入位置"
 
-#: src/emu/ui/ui.cpp:1757
+#: src/emu/ui/ui.cpp:1754
 msgid "Save cancelled"
 msgstr "取消保存"
 
-#: src/emu/ui/ui.cpp:1759
+#: src/emu/ui/ui.cpp:1756
 msgid "Load cancelled"
 msgstr "取消载入"
 
-#: src/emu/ui/ui.cpp:1802
+#: src/emu/ui/ui.cpp:1799
 #, c-format
 msgid "Save to position %s"
 msgstr "保存至位置 %s"
 
-#: src/emu/ui/ui.cpp:1807
+#: src/emu/ui/ui.cpp:1804
 #, c-format
 msgid "Load from position %s"
 msgstr "从位置 %s 载入"
 
-#: src/emu/ui/ui.cpp:1847
+#: src/emu/ui/ui.cpp:1844
 #, c-format
 msgid ""
 "Are you sure you want to quit?\n"
@@ -1704,173 +1720,173 @@ msgstr ""
 "按 ''%1$s'' 退出,\n"
 "按 ''%2$s'' 继续模拟。"
 
-#: src/emu/ui/ui.cpp:1917
+#: src/emu/ui/ui.cpp:1914
 msgid "Master Volume"
 msgstr "主音量"
 
-#: src/emu/ui/ui.cpp:1926
+#: src/emu/ui/ui.cpp:1923
 #, c-format
 msgid "%1$s Volume"
 msgstr "%1$s 音量"
 
-#: src/emu/ui/ui.cpp:1949
+#: src/emu/ui/ui.cpp:1946
 #, c-format
 msgid "Overclock CPU %1$s"
 msgstr "超频 CPU %1$s"
 
-#: src/emu/ui/ui.cpp:1968
+#: src/emu/ui/ui.cpp:1965
 #, c-format
 msgid "%1$s Refresh Rate"
 msgstr "%1$s 刷新率"
 
-#: src/emu/ui/ui.cpp:1973
+#: src/emu/ui/ui.cpp:1970
 #, c-format
 msgid "%1$s Brightness"
 msgstr "%1$s 亮度"
 
-#: src/emu/ui/ui.cpp:1975
+#: src/emu/ui/ui.cpp:1972
 #, c-format
 msgid "%1$s Contrast"
 msgstr "%1$s 对比"
 
-#: src/emu/ui/ui.cpp:1977
+#: src/emu/ui/ui.cpp:1974
 #, c-format
 msgid "%1$s Gamma"
 msgstr "%1$s 迦玛值"
 
-#: src/emu/ui/ui.cpp:1981
+#: src/emu/ui/ui.cpp:1978
 #, c-format
 msgid "%1$s Horiz Stretch"
 msgstr "%1$s 水平延展"
 
-#: src/emu/ui/ui.cpp:1983
+#: src/emu/ui/ui.cpp:1980
 #, c-format
 msgid "%1$s Horiz Position"
 msgstr "%1$s 水平位置"
 
-#: src/emu/ui/ui.cpp:1985
+#: src/emu/ui/ui.cpp:1982
 #, c-format
 msgid "%1$s Vert Stretch"
 msgstr "%1$s 垂直延展"
 
-#: src/emu/ui/ui.cpp:1987
+#: src/emu/ui/ui.cpp:1984
 #, c-format
 msgid "%1$s Vert Position"
 msgstr "%1$s 垂直位置"
 
-#: src/emu/ui/ui.cpp:2005
+#: src/emu/ui/ui.cpp:2002
 #, c-format
 msgid "Laserdisc '%1$s' Horiz Stretch"
 msgstr "激光影碟 %1$s 水平延展"
 
-#: src/emu/ui/ui.cpp:2007
+#: src/emu/ui/ui.cpp:2004
 #, c-format
 msgid "Laserdisc '%1$s' Horiz Position"
 msgstr "激光影碟 %1$s 水平位置"
 
-#: src/emu/ui/ui.cpp:2009
+#: src/emu/ui/ui.cpp:2006
 #, c-format
 msgid "Laserdisc '%1$s' Vert Stretch"
 msgstr "激光影碟 %1$s 垂直延展"
 
-#: src/emu/ui/ui.cpp:2011
+#: src/emu/ui/ui.cpp:2008
 #, c-format
 msgid "Laserdisc '%1$s' Vert Position"
 msgstr "激光影碟 %1$s 垂直位置"
 
-#: src/emu/ui/ui.cpp:2021
+#: src/emu/ui/ui.cpp:2018
 msgid "Vector Flicker"
 msgstr "向量闪烁度"
 
-#: src/emu/ui/ui.cpp:2022
+#: src/emu/ui/ui.cpp:2019
 msgid "Beam Width Minimum"
 msgstr "最小光束宽度"
 
-#: src/emu/ui/ui.cpp:2023
+#: src/emu/ui/ui.cpp:2020
 msgid "Beam Width Maximum"
 msgstr "最大光束宽度"
 
-#: src/emu/ui/ui.cpp:2024
+#: src/emu/ui/ui.cpp:2021
 msgid "Beam Intensity Weight"
 msgstr "光束强度"
 
-#: src/emu/ui/ui.cpp:2037
+#: src/emu/ui/ui.cpp:2034
 #, c-format
 msgid "Crosshair Scale %1$s"
 msgstr "十字准星尺度 %1$s"
 
-#: src/emu/ui/ui.cpp:2037 src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2034 src/emu/ui/ui.cpp:2036
 msgid "X"
 msgstr "X"
 
-#: src/emu/ui/ui.cpp:2037 src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2034 src/emu/ui/ui.cpp:2036
 msgid "Y"
 msgstr "Y"
 
-#: src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2036
 #, c-format
 msgid "Crosshair Offset %1$s"
 msgstr "十字准星位移 %1$s"
 
-#: src/emu/ui/ui.cpp:2071
+#: src/emu/ui/ui.cpp:2068
 #, c-format
 msgid "%1$3ddB"
 msgstr "%1$3ddB"
 
-#: src/emu/ui/ui.cpp:2115
+#: src/emu/ui/ui.cpp:2112
 #, c-format
 msgid "%1$d%%"
 msgstr "%1$d%%"
 
-#: src/emu/ui/ui.cpp:2131
+#: src/emu/ui/ui.cpp:2128
 #, c-format
 msgid "%1$3.0f%%"
 msgstr "%1$3.0f%%"
 
-#: src/emu/ui/ui.cpp:2154
+#: src/emu/ui/ui.cpp:2151
 #, c-format
 msgid "%1$.3ffps"
 msgstr "%1$.3ffps"
 
-#: src/emu/ui/ui.cpp:2177 src/emu/ui/ui.cpp:2199 src/emu/ui/ui.cpp:2220
-#: src/emu/ui/ui.cpp:2242 src/emu/ui/ui.cpp:2264 src/emu/ui/ui.cpp:2286
-#: src/emu/ui/ui.cpp:2308 src/emu/ui/ui.cpp:2330 src/emu/ui/ui.cpp:2352
-#: src/emu/ui/ui.cpp:2374 src/emu/ui/ui.cpp:2396
+#: src/emu/ui/ui.cpp:2174 src/emu/ui/ui.cpp:2196 src/emu/ui/ui.cpp:2217
+#: src/emu/ui/ui.cpp:2239 src/emu/ui/ui.cpp:2261 src/emu/ui/ui.cpp:2283
+#: src/emu/ui/ui.cpp:2305 src/emu/ui/ui.cpp:2327 src/emu/ui/ui.cpp:2349
+#: src/emu/ui/ui.cpp:2371 src/emu/ui/ui.cpp:2393
 #, c-format
 msgid "%1$.3f"
 msgstr "%1$.3f"
 
-#: src/emu/ui/ui.cpp:2412 src/emu/ui/ui.cpp:2428 src/emu/ui/ui.cpp:2444
-#: src/emu/ui/ui.cpp:2460
+#: src/emu/ui/ui.cpp:2408 src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2438
+#: src/emu/ui/ui.cpp:2453
 #, c-format
 msgid "%1$1.2f"
 msgstr "%1$1.2f"
 
-#: src/emu/ui/ui.cpp:2476
+#: src/emu/ui/ui.cpp:2469
 #, c-format
 msgid "Screen '%1$s'"
 msgstr "画面 '%1$s'"
 
-#: src/emu/ui/ui.cpp:2478
+#: src/emu/ui/ui.cpp:2471
 msgid "Screen"
 msgstr "画面"
 
-#: src/emu/ui/ui.cpp:2494
+#: src/emu/ui/ui.cpp:2487
 #, c-format
 msgid "Crosshair Scale X %1$1.3f"
 msgstr "十字准星尺度 X %1$1.3f"
 
-#: src/emu/ui/ui.cpp:2494
+#: src/emu/ui/ui.cpp:2487
 #, c-format
 msgid "Crosshair Scale Y %1$1.3f"
 msgstr "十字准星尺度 Y %1$1.3f"
 
-#: src/emu/ui/ui.cpp:2513
+#: src/emu/ui/ui.cpp:2506
 #, c-format
 msgid "Crosshair Offset X %1$1.3f"
 msgstr "十字准星位移 X %1$1.3f"
 
-#: src/emu/ui/ui.cpp:2513
+#: src/emu/ui/ui.cpp:2506
 #, c-format
 msgid "Crosshair Offset Y %1$1.3f"
 msgstr "十字准星位移 Y %1$1.3f"
@@ -1912,14 +1928,26 @@ msgstr "裁切"
 msgid "Full"
 msgstr "全部"
 
-#: src/emu/ui/viewgfx.cpp:392
+#: src/emu/ui/viewgfx.cpp:391
 msgid " COLORS"
 msgstr " 色彩"
 
-#: src/emu/ui/viewgfx.cpp:392
+#: src/emu/ui/viewgfx.cpp:391
 msgid " PENS"
 msgstr " PENS"
 
+#~ msgid "Export XML format (like -listxml)"
+#~ msgstr "汇出为 XML 格式 （同 -listxml）"
+
+#~ msgid "Export TXT format (like -listfull)"
+#~ msgstr "汇出为 TXT 格式 （同 -listfull）"
+
+#~ msgid "Dummy"
+#~ msgstr "Dummy"
+
+#~ msgid "%1$s %2$s ( %3$d / %4$d softwares )"
+#~ msgstr "%1$s %2$s ( %3$d / %4$d 软件 )"
+
 #~ msgid "Lightgun Device Assignment"
 #~ msgstr "配置光枪设备"
 
diff --git a/language/Chinese_Traditional/strings.po b/language/Chinese_Traditional/strings.po
index 7d152ae09f4..15c2a0b7c76 100644
--- a/language/Chinese_Traditional/strings.po
+++ b/language/Chinese_Traditional/strings.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MAME\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-11 03:33+0200\n"
+"POT-Creation-Date: 2016-04-15 17:42+0200\n"
 "PO-Revision-Date: 2016-04-11 14:14+0800\n"
 "Last-Translator: YuiFAN\n"
 "Language-Team: MAME Language Team\n"
@@ -62,14 +62,14 @@ msgstr "全部重新載入"
 msgid "Autofire Status"
 msgstr "連射狀態"
 
-#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1698
+#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1695
 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211
 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219
 #: src/emu/ui/videoopt.cpp:223
 msgid "Disabled"
 msgstr "已停用"
 
-#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1698
+#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1695
 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211
 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219
 #: src/emu/ui/videoopt.cpp:223
@@ -77,14 +77,14 @@ msgid "Enabled"
 msgstr "已啟用"
 
 #: src/emu/ui/cheatopt.cpp:282 src/emu/ui/cheatopt.cpp:288
-#: src/emu/ui/menu.cpp:710 src/emu/ui/miscmenu.cpp:831
-#: src/emu/ui/sndmenu.cpp:135 src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/menu.cpp:755 src/emu/ui/miscmenu.cpp:936
+#: src/emu/ui/sndmenu.cpp:133 src/emu/ui/sndmenu.cpp:135
 msgid "On"
 msgstr "開"
 
 #: src/emu/ui/cheatopt.cpp:282 src/emu/ui/cheatopt.cpp:288
-#: src/emu/ui/menu.cpp:713 src/emu/ui/miscmenu.cpp:831
-#: src/emu/ui/sndmenu.cpp:135 src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/menu.cpp:758 src/emu/ui/miscmenu.cpp:936
+#: src/emu/ui/sndmenu.cpp:133 src/emu/ui/sndmenu.cpp:135
 msgid "Off"
 msgstr "關"
 
@@ -96,316 +96,316 @@ msgstr "此機台上無可用按鍵！"
 msgid "Autofire Delay"
 msgstr "連射延遲"
 
-#: src/emu/ui/custmenu.cpp:158 src/emu/ui/custmenu.cpp:447
+#: src/emu/ui/custmenu.cpp:157 src/emu/ui/custmenu.cpp:445
 msgid "Main filter"
 msgstr "主要篩選"
 
-#: src/emu/ui/custmenu.cpp:167 src/emu/ui/custmenu.cpp:456
+#: src/emu/ui/custmenu.cpp:166 src/emu/ui/custmenu.cpp:454
 msgid "Other filter"
 msgstr "其他篩選"
 
-#: src/emu/ui/custmenu.cpp:176 src/emu/ui/optsmenu.cpp:239
+#: src/emu/ui/custmenu.cpp:175 src/emu/ui/optsmenu.cpp:238
 msgid "^!Manufacturer"
 msgstr "^!製造商"
 
-#: src/emu/ui/custmenu.cpp:185 src/emu/ui/custmenu.cpp:474
-#: src/emu/ui/optsmenu.cpp:247
+#: src/emu/ui/custmenu.cpp:184 src/emu/ui/custmenu.cpp:472
+#: src/emu/ui/optsmenu.cpp:246
 msgid "^!Year"
 msgstr "^!年代"
 
-#: src/emu/ui/custmenu.cpp:194 src/emu/ui/custmenu.cpp:510
+#: src/emu/ui/custmenu.cpp:193 src/emu/ui/custmenu.cpp:508
 msgid "Remove last filter"
 msgstr "移除最後篩選"
 
-#: src/emu/ui/custmenu.cpp:197 src/emu/ui/custmenu.cpp:513
+#: src/emu/ui/custmenu.cpp:196 src/emu/ui/custmenu.cpp:511
 msgid "Add filter"
 msgstr "新增篩選"
 
-#: src/emu/ui/custmenu.cpp:212 src/emu/ui/custmenu.cpp:233
-#: src/emu/ui/custmenu.cpp:529 src/emu/ui/custmenu.cpp:550
+#: src/emu/ui/custmenu.cpp:211 src/emu/ui/custmenu.cpp:231
+#: src/emu/ui/custmenu.cpp:527 src/emu/ui/custmenu.cpp:547
 msgid "Select custom filters:"
 msgstr "選擇自訂篩選："
 
-#: src/emu/ui/custmenu.cpp:465
+#: src/emu/ui/custmenu.cpp:463
 msgid "^!Publisher"
 msgstr "^!出版商"
 
-#: src/emu/ui/custmenu.cpp:483
+#: src/emu/ui/custmenu.cpp:481
 msgid "^!Software List"
 msgstr "^!軟體清單"
 
-#: src/emu/ui/custmenu.cpp:492
+#: src/emu/ui/custmenu.cpp:490
 msgid "^!Device type"
 msgstr "^!裝置類別"
 
-#: src/emu/ui/custmenu.cpp:501
+#: src/emu/ui/custmenu.cpp:499
 msgid "^!Region"
 msgstr "^!區域"
 
-#: src/emu/ui/custui.cpp:23
+#: src/emu/ui/custui.cpp:22
 msgid "Show All"
 msgstr "顯示全部"
 
-#: src/emu/ui/custui.cpp:24
+#: src/emu/ui/custui.cpp:23
 msgid "Hide Filters"
 msgstr "隱藏篩選"
 
-#: src/emu/ui/custui.cpp:25
+#: src/emu/ui/custui.cpp:24
 msgid "Hide Info/Image"
 msgstr "隱藏資訊/圖片"
 
-#: src/emu/ui/custui.cpp:26
+#: src/emu/ui/custui.cpp:25
 msgid "Hide Both"
 msgstr "隱藏兩者"
 
-#: src/emu/ui/custui.cpp:142
+#: src/emu/ui/custui.cpp:141
 msgid "Fonts"
 msgstr "字體"
 
-#: src/emu/ui/custui.cpp:143
+#: src/emu/ui/custui.cpp:142
 msgid "Colors"
 msgstr "顏色"
 
-#: src/emu/ui/custui.cpp:148 src/emu/ui/dirmenu.cpp:33
+#: src/emu/ui/custui.cpp:147 src/emu/ui/dirmenu.cpp:33
 msgid "Language"
 msgstr "語言"
 
-#: src/emu/ui/custui.cpp:152
+#: src/emu/ui/custui.cpp:151
 msgid "Show side panels"
 msgstr "顯示側面版"
 
-#: src/emu/ui/custui.cpp:167 src/emu/ui/custui.cpp:188
+#: src/emu/ui/custui.cpp:166 src/emu/ui/custui.cpp:186
 msgid "Custom UI Settings"
 msgstr "連射設定"
 
-#: src/emu/ui/custui.cpp:246
+#: src/emu/ui/custui.cpp:244
 msgid "default"
 msgstr "預設"
 
-#: src/emu/ui/custui.cpp:349
+#: src/emu/ui/custui.cpp:347
 msgid "UI Font"
 msgstr "UI 字體"
 
-#: src/emu/ui/custui.cpp:354
+#: src/emu/ui/custui.cpp:352
 msgid "Bold"
 msgstr "粗體"
 
-#: src/emu/ui/custui.cpp:355
+#: src/emu/ui/custui.cpp:353
 msgid "Italic"
 msgstr "斜體"
 
-#: src/emu/ui/custui.cpp:360
+#: src/emu/ui/custui.cpp:358
 msgid "Lines"
 msgstr "行"
 
-#: src/emu/ui/custui.cpp:366
+#: src/emu/ui/custui.cpp:364
 msgid "Infos text size"
 msgstr "資訊字體大小"
 
-#: src/emu/ui/custui.cpp:383
+#: src/emu/ui/custui.cpp:381
 msgid "UI Fonts Settings"
 msgstr "UI 字體設定"
 
-#: src/emu/ui/custui.cpp:411
+#: src/emu/ui/custui.cpp:408
 msgid "Sample text - Lorem ipsum dolor sit amet, consectetur adipiscing elit."
 msgstr "文字樣本～永東國酬愛鬱靈鷹袋、南去經三國，東來過五湖。"
 
-#: src/emu/ui/custui.cpp:509
+#: src/emu/ui/custui.cpp:506
 msgid "Normal text"
 msgstr "一般文字"
 
-#: src/emu/ui/custui.cpp:510
+#: src/emu/ui/custui.cpp:507
 msgid "Selected color"
 msgstr "選擇色彩"
 
-#: src/emu/ui/custui.cpp:511
+#: src/emu/ui/custui.cpp:508
 msgid "Normal text background"
 msgstr "一般文字背景"
 
-#: src/emu/ui/custui.cpp:512
+#: src/emu/ui/custui.cpp:509
 msgid "Selected background color"
 msgstr "已選擇背景顏色"
 
-#: src/emu/ui/custui.cpp:513
+#: src/emu/ui/custui.cpp:510
 msgid "Subitem color"
 msgstr "子項目顏色"
 
-#: src/emu/ui/custui.cpp:514 src/emu/ui/custui.cpp:610
+#: src/emu/ui/custui.cpp:511 src/emu/ui/custui.cpp:606
 msgid "Clone"
 msgstr "相容版本"
 
-#: src/emu/ui/custui.cpp:515
+#: src/emu/ui/custui.cpp:512
 msgid "Border"
 msgstr "邊框"
 
-#: src/emu/ui/custui.cpp:516
+#: src/emu/ui/custui.cpp:513
 msgid "Background"
 msgstr "背景"
 
-#: src/emu/ui/custui.cpp:517
+#: src/emu/ui/custui.cpp:514
 msgid "Dipswitch"
 msgstr "機台設定開關"
 
-#: src/emu/ui/custui.cpp:518
+#: src/emu/ui/custui.cpp:515
 msgid "Unavailable color"
 msgstr "未擁有遊戲顏色"
 
-#: src/emu/ui/custui.cpp:519
+#: src/emu/ui/custui.cpp:516
 msgid "Slider color"
 msgstr "參數調整"
 
-#: src/emu/ui/custui.cpp:520
+#: src/emu/ui/custui.cpp:517
 msgid "Gfx viewer background"
 msgstr "圖形檢視器背景"
 
-#: src/emu/ui/custui.cpp:521
+#: src/emu/ui/custui.cpp:518
 msgid "Mouse over color"
 msgstr "滑鼠經過顏色"
 
-#: src/emu/ui/custui.cpp:522
+#: src/emu/ui/custui.cpp:519
 msgid "Mouse over background color"
 msgstr "滑鼠經過背景顏色"
 
-#: src/emu/ui/custui.cpp:523
+#: src/emu/ui/custui.cpp:520
 msgid "Mouse down color"
 msgstr "滑鼠按下顏色"
 
-#: src/emu/ui/custui.cpp:524
+#: src/emu/ui/custui.cpp:521
 msgid "Mouse down background color"
 msgstr "滑鼠按下背景顏色"
 
-#: src/emu/ui/custui.cpp:527
+#: src/emu/ui/custui.cpp:524
 msgid "Restore originals colors"
 msgstr "還原至原本顏色"
 
-#: src/emu/ui/custui.cpp:543
+#: src/emu/ui/custui.cpp:540
 msgid "UI Colors Settings"
 msgstr "UI 色彩設定"
 
-#: src/emu/ui/custui.cpp:572
+#: src/emu/ui/custui.cpp:568
 #, c-format
 msgid "Double click or press %1$s to change the color value"
 msgstr "雙擊或按下 %1$s 以改變顏色值"
 
-#: src/emu/ui/custui.cpp:598
+#: src/emu/ui/custui.cpp:594
 msgid "Menu Preview"
 msgstr "選單預覽"
 
-#: src/emu/ui/custui.cpp:606
+#: src/emu/ui/custui.cpp:602
 msgid "Normal"
 msgstr "一般項目"
 
-#: src/emu/ui/custui.cpp:607
+#: src/emu/ui/custui.cpp:603
 msgid "Subitem"
 msgstr "子項目"
 
-#: src/emu/ui/custui.cpp:608
+#: src/emu/ui/custui.cpp:604
 msgid "Selected"
 msgstr "已選擇"
 
-#: src/emu/ui/custui.cpp:609
+#: src/emu/ui/custui.cpp:605
 msgid "Mouse Over"
 msgstr "滑鼠經過"
 
-#: src/emu/ui/custui.cpp:841 src/emu/ui/custui.cpp:844
+#: src/emu/ui/custui.cpp:837 src/emu/ui/custui.cpp:840
 msgid "Alpha"
 msgstr "透明度"
 
-#: src/emu/ui/custui.cpp:849 src/emu/ui/custui.cpp:852
-#: src/emu/ui/custui.cpp:1013
+#: src/emu/ui/custui.cpp:845 src/emu/ui/custui.cpp:848
+#: src/emu/ui/custui.cpp:1007
 msgid "Red"
 msgstr "紅"
 
-#: src/emu/ui/custui.cpp:857 src/emu/ui/custui.cpp:860
-#: src/emu/ui/custui.cpp:1016
+#: src/emu/ui/custui.cpp:853 src/emu/ui/custui.cpp:856
+#: src/emu/ui/custui.cpp:1010
 msgid "Green"
 msgstr "綠"
 
-#: src/emu/ui/custui.cpp:865 src/emu/ui/custui.cpp:868
-#: src/emu/ui/custui.cpp:1017
+#: src/emu/ui/custui.cpp:861 src/emu/ui/custui.cpp:864
+#: src/emu/ui/custui.cpp:1011
 msgid "Blue"
 msgstr "藍"
 
-#: src/emu/ui/custui.cpp:871
+#: src/emu/ui/custui.cpp:867
 msgid "Choose from palette"
 msgstr "從色盤選擇"
 
-#: src/emu/ui/custui.cpp:887
+#: src/emu/ui/custui.cpp:883
 msgid " - ARGB Settings"
 msgstr " - ARGB 設定"
 
-#: src/emu/ui/custui.cpp:912
+#: src/emu/ui/custui.cpp:907
 msgid "Color preview ="
 msgstr "顏色預覽＝"
 
-#: src/emu/ui/custui.cpp:1009
+#: src/emu/ui/custui.cpp:1003
 msgid "White"
 msgstr "白"
 
-#: src/emu/ui/custui.cpp:1010
+#: src/emu/ui/custui.cpp:1004
 msgid "Silver"
 msgstr "銀"
 
-#: src/emu/ui/custui.cpp:1011
+#: src/emu/ui/custui.cpp:1005
 msgid "Gray"
 msgstr "灰"
 
-#: src/emu/ui/custui.cpp:1012
+#: src/emu/ui/custui.cpp:1006
 msgid "Black"
 msgstr "黑"
 
-#: src/emu/ui/custui.cpp:1014
+#: src/emu/ui/custui.cpp:1008
 msgid "Orange"
 msgstr "橘"
 
-#: src/emu/ui/custui.cpp:1015
+#: src/emu/ui/custui.cpp:1009
 msgid "Yellow"
 msgstr "黃"
 
-#: src/emu/ui/custui.cpp:1018
+#: src/emu/ui/custui.cpp:1012
 msgid "Violet"
 msgstr "紫"
 
-#: src/emu/ui/datmenu.cpp:65
+#: src/emu/ui/datmenu.cpp:64
 msgid "Software History"
 msgstr "軟體歷史"
 
-#: src/emu/ui/datmenu.cpp:67
+#: src/emu/ui/datmenu.cpp:66
 msgid "Software Usage"
 msgstr "軟體用法"
 
-#: src/emu/ui/datmenu.cpp:199
+#: src/emu/ui/datmenu.cpp:196
 msgid "Revision: "
 msgstr "版本： "
 
-#: src/emu/ui/datmenu.cpp:287 src/emu/ui/selgame.cpp:40
-#: src/emu/ui/selgame.cpp:2152 src/emu/ui/selgame.cpp:2161
-#: src/emu/ui/selsoft.cpp:1577 src/emu/ui/selsoft.cpp:1597
-#: src/emu/ui/selsoft.cpp:1606
+#: src/emu/ui/datmenu.cpp:284 src/emu/ui/selgame.cpp:39
+#: src/emu/ui/selgame.cpp:2158 src/emu/ui/selgame.cpp:2167
+#: src/emu/ui/selsoft.cpp:1574 src/emu/ui/selsoft.cpp:1592
+#: src/emu/ui/selsoft.cpp:1601
 msgid "History"
 msgstr "歷史"
 
-#: src/emu/ui/datmenu.cpp:289 src/emu/ui/selgame.cpp:41
+#: src/emu/ui/datmenu.cpp:286 src/emu/ui/selgame.cpp:40
 msgid "Mameinfo"
 msgstr "Mameinfo"
 
-#: src/emu/ui/datmenu.cpp:291 src/emu/ui/selgame.cpp:43
+#: src/emu/ui/datmenu.cpp:288 src/emu/ui/selgame.cpp:42
 msgid "Messinfo"
 msgstr "Messinfo"
 
-#: src/emu/ui/datmenu.cpp:293 src/emu/ui/selgame.cpp:42
+#: src/emu/ui/datmenu.cpp:290 src/emu/ui/selgame.cpp:41
 msgid "Sysinfo"
 msgstr "系統資訊"
 
-#: src/emu/ui/datmenu.cpp:295 src/emu/ui/selgame.cpp:46
+#: src/emu/ui/datmenu.cpp:292 src/emu/ui/selgame.cpp:45
 msgid "Mamescore"
 msgstr "Mamescore"
 
-#: src/emu/ui/datmenu.cpp:297 src/emu/ui/selgame.cpp:45
+#: src/emu/ui/datmenu.cpp:294 src/emu/ui/selgame.cpp:44
 msgid "Gameinit"
 msgstr "Gameinit"
 
-#: src/emu/ui/datmenu.cpp:299 src/emu/ui/selgame.cpp:44
+#: src/emu/ui/datmenu.cpp:296 src/emu/ui/selgame.cpp:43
 msgid "Command"
 msgstr "指令集"
 
@@ -557,75 +557,75 @@ msgstr "按下 TAB 鍵設定"
 msgid "Remove %1$s Folder"
 msgstr "移除 %1$s 資料夾"
 
-#: src/emu/ui/filesel.cpp:158
+#: src/emu/ui/filesel.cpp:161
 msgid "File Already Exists - Override?"
 msgstr "檔案已存在 — 是否覆蓋？"
 
-#: src/emu/ui/filesel.cpp:160 src/emu/ui/selgame.cpp:1568
-#: src/emu/ui/selgame.cpp:1569 src/emu/ui/selgame.cpp:1570
-#: src/emu/ui/selgame.cpp:1571 src/emu/ui/selgame.cpp:1572
-#: src/emu/ui/selgame.cpp:1573 src/emu/ui/selgame.cpp:1574
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/filesel.cpp:163 src/emu/ui/selgame.cpp:1576
+#: src/emu/ui/selgame.cpp:1577 src/emu/ui/selgame.cpp:1578
+#: src/emu/ui/selgame.cpp:1579 src/emu/ui/selgame.cpp:1580
+#: src/emu/ui/selgame.cpp:1581 src/emu/ui/selgame.cpp:1582
+#: src/emu/ui/selgame.cpp:1591
 msgid "No"
 msgstr "否"
 
-#: src/emu/ui/filesel.cpp:161 src/emu/ui/selgame.cpp:1568
-#: src/emu/ui/selgame.cpp:1569 src/emu/ui/selgame.cpp:1570
-#: src/emu/ui/selgame.cpp:1571 src/emu/ui/selgame.cpp:1572
-#: src/emu/ui/selgame.cpp:1573 src/emu/ui/selgame.cpp:1574
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/filesel.cpp:164 src/emu/ui/selgame.cpp:1576
+#: src/emu/ui/selgame.cpp:1577 src/emu/ui/selgame.cpp:1578
+#: src/emu/ui/selgame.cpp:1579 src/emu/ui/selgame.cpp:1580
+#: src/emu/ui/selgame.cpp:1581 src/emu/ui/selgame.cpp:1582
+#: src/emu/ui/selgame.cpp:1591
 msgid "Yes"
 msgstr "是"
 
-#: src/emu/ui/filesel.cpp:272
+#: src/emu/ui/filesel.cpp:275
 msgid "New Image Name:"
 msgstr "新映象檔名稱："
 
-#: src/emu/ui/filesel.cpp:278
+#: src/emu/ui/filesel.cpp:281
 msgid "Image Format:"
 msgstr "映像檔格式"
 
-#: src/emu/ui/filesel.cpp:284
+#: src/emu/ui/filesel.cpp:287
 msgid "Create"
 msgstr "建立"
 
-#: src/emu/ui/filesel.cpp:315
+#: src/emu/ui/filesel.cpp:318
 msgid "Please enter a file extension too"
 msgstr "請一併輸入副檔名"
 
-#: src/emu/ui/filesel.cpp:503 src/emu/ui/swlist.cpp:65
+#: src/emu/ui/filesel.cpp:506 src/emu/ui/swlist.cpp:65
 msgid "[empty slot]"
 msgstr "[ 空插槽 ]"
 
-#: src/emu/ui/filesel.cpp:507
+#: src/emu/ui/filesel.cpp:510
 msgid "[create]"
 msgstr "[ 建立 ]"
 
-#: src/emu/ui/filesel.cpp:511 src/emu/ui/swlist.cpp:76
+#: src/emu/ui/filesel.cpp:514 src/emu/ui/swlist.cpp:76
 msgid "[software list]"
 msgstr "[ 軟體清單 ]"
 
-#: src/emu/ui/filesel.cpp:803
+#: src/emu/ui/filesel.cpp:806
 msgid "Select image format"
 msgstr "選擇映像檔格式"
 
-#: src/emu/ui/filesel.cpp:863
+#: src/emu/ui/filesel.cpp:866
 msgid "Select access mode"
 msgstr "選擇存取模式"
 
-#: src/emu/ui/filesel.cpp:864
+#: src/emu/ui/filesel.cpp:867
 msgid "Read-only"
 msgstr "唯讀"
 
-#: src/emu/ui/filesel.cpp:866
+#: src/emu/ui/filesel.cpp:869
 msgid "Read-write"
 msgstr "讀寫"
 
-#: src/emu/ui/filesel.cpp:867
+#: src/emu/ui/filesel.cpp:870
 msgid "Read this image, write to another image"
 msgstr "讀取此映像檔，寫入至其他映像檔"
 
-#: src/emu/ui/filesel.cpp:868
+#: src/emu/ui/filesel.cpp:871
 msgid "Read this image, write to diff"
 msgstr "讀取此映像檔，寫入差異檔"
 
@@ -651,7 +651,7 @@ msgstr "部分支援"
 msgid "[empty]"
 msgstr "[ 空 ]"
 
-#: src/emu/ui/info_pty.cpp:26 src/emu/ui/mainmenu.cpp:91
+#: src/emu/ui/info_pty.cpp:26 src/emu/ui/mainmenu.cpp:96
 msgid "Pseudo terminals"
 msgstr "偽終端"
 
@@ -667,7 +667,7 @@ msgstr "使用者介面"
 msgid "Other Controls"
 msgstr "其他控制"
 
-#: src/emu/ui/inputmap.cpp:622 src/emu/ui/miscmenu.cpp:91
+#: src/emu/ui/inputmap.cpp:622 src/emu/ui/miscmenu.cpp:92
 #: src/emu/ui/slotopt.cpp:172
 msgid "Reset"
 msgstr "重設"
@@ -700,27 +700,27 @@ msgstr "收入資訊"
 msgid "Machine Information"
 msgstr "機台資訊"
 
-#: src/emu/ui/mainmenu.cpp:78
+#: src/emu/ui/mainmenu.cpp:80
 msgid "Image Information"
 msgstr "映像檔資訊"
 
-#: src/emu/ui/mainmenu.cpp:81
+#: src/emu/ui/mainmenu.cpp:83
 msgid "File Manager"
 msgstr "檔案管理員"
 
-#: src/emu/ui/mainmenu.cpp:86
+#: src/emu/ui/mainmenu.cpp:92
 msgid "Tape Control"
 msgstr "磁帶控制"
 
-#: src/emu/ui/mainmenu.cpp:94
+#: src/emu/ui/mainmenu.cpp:99
 msgid "Bios Selection"
 msgstr "選擇 BIOS"
 
-#: src/emu/ui/mainmenu.cpp:100
+#: src/emu/ui/mainmenu.cpp:104
 msgid "Slot Devices"
 msgstr "插槽裝置"
 
-#: src/emu/ui/mainmenu.cpp:107
+#: src/emu/ui/mainmenu.cpp:109
 msgid "Barcode Reader"
 msgstr "條碼讀取器"
 
@@ -728,43 +728,43 @@ msgstr "條碼讀取器"
 msgid "Network Devices"
 msgstr "網路裝置"
 
-#: src/emu/ui/mainmenu.cpp:119
+#: src/emu/ui/mainmenu.cpp:118
 msgid "Keyboard Mode"
 msgstr "鍵盤模式"
 
-#: src/emu/ui/mainmenu.cpp:122
+#: src/emu/ui/mainmenu.cpp:121
 msgid "Slider Controls"
 msgstr "參數調整"
 
-#: src/emu/ui/mainmenu.cpp:125
+#: src/emu/ui/mainmenu.cpp:124
 msgid "Video Options"
 msgstr "視訊選項"
 
-#: src/emu/ui/mainmenu.cpp:129
+#: src/emu/ui/mainmenu.cpp:128
 msgid "Crosshair Options"
 msgstr "十字準星選項"
 
-#: src/emu/ui/mainmenu.cpp:133
+#: src/emu/ui/mainmenu.cpp:132
 msgid "Cheat"
 msgstr "作弊引擎"
 
-#: src/emu/ui/mainmenu.cpp:136
+#: src/emu/ui/mainmenu.cpp:135
 msgid "Plugin Options"
 msgstr "外掛選項"
 
-#: src/emu/ui/mainmenu.cpp:140
+#: src/emu/ui/mainmenu.cpp:139
 msgid "External DAT View"
 msgstr "查閱外部文件"
 
-#: src/emu/ui/mainmenu.cpp:146
+#: src/emu/ui/mainmenu.cpp:145 src/emu/ui/miscmenu.cpp:785
 msgid "Add To Favorites"
 msgstr "新增至最愛"
 
-#: src/emu/ui/mainmenu.cpp:148
+#: src/emu/ui/mainmenu.cpp:147 src/emu/ui/miscmenu.cpp:787
 msgid "Remove From Favorites"
 msgstr "從最愛移除"
 
-#: src/emu/ui/mainmenu.cpp:155
+#: src/emu/ui/mainmenu.cpp:154
 msgid "Select New Machine"
 msgstr "選擇新機台"
 
@@ -804,31 +804,31 @@ msgstr "結束"
 msgid "Return to Previous Menu"
 msgstr "回上一層選單"
 
-#: src/emu/ui/menu.cpp:716
+#: src/emu/ui/menu.cpp:761
 msgid "Auto"
 msgstr "自動"
 
-#: src/emu/ui/menu.cpp:2133
+#: src/emu/ui/menu.cpp:2195
 msgid "Images"
 msgstr "圖片"
 
-#: src/emu/ui/menu.cpp:2134
+#: src/emu/ui/menu.cpp:2196
 msgid "Infos"
 msgstr "資訊"
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Keyboard Mode:"
 msgstr "鍵盤模式:"
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Natural"
 msgstr "自然"
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Emulated"
 msgstr "模擬"
 
-#: src/emu/ui/miscmenu.cpp:240
+#: src/emu/ui/miscmenu.cpp:241
 #, c-format
 msgid ""
 "Uptime: %1$d:%2$02d:%3$02d\n"
@@ -837,7 +837,7 @@ msgstr ""
 "執行時間： %1$d:%2$02d:%3$02d\n"
 "\n"
 
-#: src/emu/ui/miscmenu.cpp:242
+#: src/emu/ui/miscmenu.cpp:243
 #, c-format
 msgid ""
 "Uptime: %1$d:%2$02d\n"
@@ -846,7 +846,7 @@ msgstr ""
 "執行時間： %1$d:%2$02d\n"
 "\n"
 
-#: src/emu/ui/miscmenu.cpp:246
+#: src/emu/ui/miscmenu.cpp:247
 #, c-format
 msgid ""
 "Tickets dispensed: %1$d\n"
@@ -855,109 +855,50 @@ msgstr ""
 "彩票分配數： %1$d\n"
 "\n"
 
-#: src/emu/ui/miscmenu.cpp:257
+#: src/emu/ui/miscmenu.cpp:258
 msgid "Coin %1$c: NA%3$s\n"
 msgstr "投幣數 %1$c： NA%3$s\n"
 
-#: src/emu/ui/miscmenu.cpp:257
+#: src/emu/ui/miscmenu.cpp:258
 #, c-format
 msgid "Coin %1$c: %2$d%3$s\n"
 msgstr "投幣數 %1$c： %2$d%3$s\n"
 
-#: src/emu/ui/miscmenu.cpp:260
+#: src/emu/ui/miscmenu.cpp:261
 msgid " (locked)"
 msgstr " （已鎖定）"
 
-#: src/emu/ui/miscmenu.cpp:519
+#: src/emu/ui/miscmenu.cpp:520
 msgid "Visible Delay"
 msgstr "可見度延遲"
 
-#: src/emu/ui/miscmenu.cpp:617
+#: src/emu/ui/miscmenu.cpp:619
 #, c-format
 msgid "%s.xml saved under ui folder."
 msgstr "%s.xml 已儲存於 ui 資料夾下。"
 
-#: src/emu/ui/miscmenu.cpp:645
+#: src/emu/ui/miscmenu.cpp:647
 msgid "Name:             Description:\n"
 msgstr "名稱：            描述：\n"
 
-#: src/emu/ui/miscmenu.cpp:657
+#: src/emu/ui/miscmenu.cpp:659
 #, c-format
 msgid "%s.txt saved under ui folder."
 msgstr "%s.txt 已儲存於 ui 資料夾下。"
 
-#: src/emu/ui/miscmenu.cpp:675
-msgid "Export XML format (like -listxml)"
-msgstr "匯出為 XML 格式 （同 -listxml）"
+#: src/emu/ui/miscmenu.cpp:677
+msgid "Export list in XML format (like -listxml)"
+msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:676
-msgid "Export TXT format (like -listfull)"
-msgstr "匯出為 TXT 格式 （同 -listfull）"
+#: src/emu/ui/miscmenu.cpp:678
+msgid "Export list in XML format (like -listxml, but exclude devices)"
+msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:734
-msgid "Dummy"
-msgstr "Dummy"
+#: src/emu/ui/miscmenu.cpp:679
+msgid "Export list in TXT format (like -listfull)"
+msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:736
-msgid "Save machine configuration"
-msgstr "儲存機台設定"
-
-#: src/emu/ui/miscmenu.cpp:848 src/emu/ui/miscmenu.cpp:869
-#: src/emu/ui/selgame.cpp:594
-msgid "Plugins"
-msgstr "外掛"
-
-#: src/emu/ui/optsmenu.cpp:218
-msgid "Filter"
-msgstr "篩選"
-
-#: src/emu/ui/optsmenu.cpp:226
-msgid " ^!File"
-msgstr " ^!檔案"
-
-#: src/emu/ui/optsmenu.cpp:231
-msgid " ^!Category"
-msgstr " ^!類別"
-
-#: src/emu/ui/optsmenu.cpp:254
-msgid "^!Setup custom filter"
-msgstr "^!設定自訂篩選"
-
-#: src/emu/ui/optsmenu.cpp:262
-msgid "Customize UI"
-msgstr "自訂 UI"
-
-#: src/emu/ui/optsmenu.cpp:263
-msgid "Configure Directories"
-msgstr "設定目錄"
-
-#: src/emu/ui/optsmenu.cpp:266 src/emu/ui/sndmenu.cpp:151
-#: src/emu/ui/sndmenu.cpp:172
-msgid "Sound Options"
-msgstr "聲音選項"
-
-#: src/emu/ui/optsmenu.cpp:269
-msgid "General Inputs"
-msgstr "一般輸入"
-
-#: src/emu/ui/optsmenu.cpp:272
-msgid "Save Configuration"
-msgstr "儲存設定"
-
-#: src/emu/ui/optsmenu.cpp:286 src/emu/ui/optsmenu.cpp:307
-msgid "Settings"
-msgstr "設定"
-
-#: src/emu/ui/optsmenu.cpp:327
-msgid "**Error saving ui.ini**"
-msgstr "**儲存 ui.ini 時發生錯誤**"
-
-#: src/emu/ui/optsmenu.cpp:374
-#, c-format
-msgid "**Error saving %s.ini**"
-msgstr "**儲存 %s.ini 時發生錯誤**"
-
-#: src/emu/ui/optsmenu.cpp:378
+#: src/emu/ui/miscmenu.cpp:729 src/emu/ui/optsmenu.cpp:376
 msgid ""
 "\n"
 "    Configuration saved    \n"
@@ -967,20 +908,95 @@ msgstr ""
 "        設定已儲存        \n"
 "\n"
 
-#: src/emu/ui/selector.cpp:166
+#: src/emu/ui/miscmenu.cpp:774
+msgid "Bios"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:776
+msgid "Driver"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:790
+msgid "Save machine configuration"
+msgstr "儲存機台設定"
+
+#: src/emu/ui/miscmenu.cpp:806
+msgid "Configure machine:"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:868 src/emu/ui/selsoft.cpp:109
+msgid " (default)"
+msgstr " （預設）"
+
+#: src/emu/ui/miscmenu.cpp:953 src/emu/ui/miscmenu.cpp:973
+#: src/emu/ui/selgame.cpp:600
+msgid "Plugins"
+msgstr "外掛"
+
+#: src/emu/ui/optsmenu.cpp:217
+msgid "Filter"
+msgstr "篩選"
+
+#: src/emu/ui/optsmenu.cpp:225
+msgid " ^!File"
+msgstr " ^!檔案"
+
+#: src/emu/ui/optsmenu.cpp:230
+msgid " ^!Category"
+msgstr " ^!類別"
+
+#: src/emu/ui/optsmenu.cpp:253
+msgid "^!Setup custom filter"
+msgstr "^!設定自訂篩選"
+
+#: src/emu/ui/optsmenu.cpp:261
+msgid "Customize UI"
+msgstr "自訂 UI"
+
+#: src/emu/ui/optsmenu.cpp:262
+msgid "Configure Directories"
+msgstr "設定目錄"
+
+#: src/emu/ui/optsmenu.cpp:265 src/emu/ui/sndmenu.cpp:149
+#: src/emu/ui/sndmenu.cpp:169
+msgid "Sound Options"
+msgstr "聲音選項"
+
+#: src/emu/ui/optsmenu.cpp:268
+msgid "General Inputs"
+msgstr "一般輸入"
+
+#: src/emu/ui/optsmenu.cpp:271
+msgid "Save Configuration"
+msgstr "儲存設定"
+
+#: src/emu/ui/optsmenu.cpp:285 src/emu/ui/optsmenu.cpp:305
+msgid "Settings"
+msgstr "設定"
+
+#: src/emu/ui/optsmenu.cpp:325
+msgid "**Error saving ui.ini**"
+msgstr "**儲存 ui.ini 時發生錯誤**"
+
+#: src/emu/ui/optsmenu.cpp:372
+#, c-format
+msgid "**Error saving %s.ini**"
+msgstr "**儲存 %s.ini 時發生錯誤**"
+
+#: src/emu/ui/selector.cpp:165
 msgid "Selection List - Search: "
 msgstr "選項清單 - 搜尋： "
 
-#: src/emu/ui/selector.cpp:196
+#: src/emu/ui/selector.cpp:194
 #, c-format
 msgid "Double click or press %1$s to select"
 msgstr "雙擊或按下 %1$s 以選擇"
 
-#: src/emu/ui/selgame.cpp:39
+#: src/emu/ui/selgame.cpp:38
 msgid "General Info"
 msgstr "一般資訊"
 
-#: src/emu/ui/selgame.cpp:374 src/emu/ui/selsoft.cpp:282
+#: src/emu/ui/selgame.cpp:380 src/emu/ui/selsoft.cpp:281
 #, c-format
 msgid ""
 "%s\n"
@@ -989,15 +1005,15 @@ msgstr ""
 "%s\n"
 " 已新增至最愛清單。"
 
-#: src/emu/ui/selgame.cpp:380 src/emu/ui/selgame.cpp:389
-#: src/emu/ui/selsoft.cpp:287
+#: src/emu/ui/selgame.cpp:386 src/emu/ui/selgame.cpp:395
+#: src/emu/ui/selsoft.cpp:286
 #, c-format
 msgid ""
 "%s\n"
 " removed from favorites list."
 msgstr " 從最愛清單移除。"
 
-#: src/emu/ui/selgame.cpp:450
+#: src/emu/ui/selgame.cpp:457
 msgid ""
 "The selected machine is missing one or more required ROM or CHD images. "
 "Please select a different machine.\n"
@@ -1008,256 +1024,260 @@ msgstr ""
 "\n"
 "按任意鍵繼續。"
 
-#: src/emu/ui/selgame.cpp:589 src/emu/ui/simpleselgame.cpp:265
+#: src/emu/ui/selgame.cpp:595 src/emu/ui/simpleselgame.cpp:265
 msgid "Configure Options"
 msgstr "設定選項"
 
-#: src/emu/ui/selgame.cpp:752
+#: src/emu/ui/selgame.cpp:596
+msgid "Configure Machine"
+msgstr ""
+
+#: src/emu/ui/selgame.cpp:758
 #, c-format
 msgid "%1$s %2$s ( %3$d / %4$d machines (%5$d BIOS) )"
 msgstr "%1$s %2$s （ %3$d / %4$d 機台 (%5$d BIOS) ）"
 
-#: src/emu/ui/selgame.cpp:762
+#: src/emu/ui/selgame.cpp:768
 #, c-format
 msgid "%1$s (%2$s - %3$s) - "
 msgstr "%1$s (%2$s - %3$s) - "
 
-#: src/emu/ui/selgame.cpp:769 src/emu/ui/selgame.cpp:775
+#: src/emu/ui/selgame.cpp:775 src/emu/ui/selgame.cpp:781
 #, c-format
 msgid "%1$s (%2$s) - "
 msgstr "%1$s (%2$s) - "
 
-#: src/emu/ui/selgame.cpp:784
+#: src/emu/ui/selgame.cpp:790
 #, c-format
 msgid "%1$s Search: %2$s_"
 msgstr "%1$s 搜尋： %2$s_"
 
-#: src/emu/ui/selgame.cpp:838
+#: src/emu/ui/selgame.cpp:844
 #, c-format
 msgid "Romset: %1$-.100s"
 msgstr "Rom組： %1$-.100s"
 
-#: src/emu/ui/selgame.cpp:841 src/emu/ui/selgame.cpp:890
-#: src/emu/ui/selsoft.cpp:751 src/emu/ui/selsoft.cpp:801
+#: src/emu/ui/selgame.cpp:847 src/emu/ui/selgame.cpp:896
+#: src/emu/ui/selsoft.cpp:750 src/emu/ui/selsoft.cpp:800
 #: src/emu/ui/simpleselgame.cpp:328
 #, c-format
 msgid "%1$s, %2$-.100s"
 msgstr "%1$s, %2$-.100s"
 
-#: src/emu/ui/selgame.cpp:847 src/emu/ui/selsoft.cpp:757
+#: src/emu/ui/selgame.cpp:853 src/emu/ui/selsoft.cpp:756
 #, c-format
 msgid "Driver is clone of: %1$-.100s"
 msgstr "驅動程式相容於： %-.100s"
 
-#: src/emu/ui/selgame.cpp:849 src/emu/ui/selsoft.cpp:759
+#: src/emu/ui/selgame.cpp:855 src/emu/ui/selsoft.cpp:758
 msgid "Driver is parent"
 msgstr "驅動程式為主檔"
 
-#: src/emu/ui/selgame.cpp:853 src/emu/ui/selsoft.cpp:763
+#: src/emu/ui/selgame.cpp:859 src/emu/ui/selsoft.cpp:762
 #: src/emu/ui/simpleselgame.cpp:335
 msgid "Overall: NOT WORKING"
 msgstr "整體： 不可執行"
 
-#: src/emu/ui/selgame.cpp:855 src/emu/ui/selsoft.cpp:765
+#: src/emu/ui/selgame.cpp:861 src/emu/ui/selsoft.cpp:764
 #: src/emu/ui/simpleselgame.cpp:337
 msgid "Overall: Unemulated Protection"
 msgstr "整體： 未模擬保護"
 
-#: src/emu/ui/selgame.cpp:857 src/emu/ui/selsoft.cpp:767
+#: src/emu/ui/selgame.cpp:863 src/emu/ui/selsoft.cpp:766
 #: src/emu/ui/simpleselgame.cpp:339
 msgid "Overall: Working"
 msgstr "整體： 可以執行"
 
-#: src/emu/ui/selgame.cpp:861 src/emu/ui/selsoft.cpp:771
+#: src/emu/ui/selgame.cpp:867 src/emu/ui/selsoft.cpp:770
 msgid "Graphics: Imperfect, "
 msgstr "圖形： 不完美， "
 
-#: src/emu/ui/selgame.cpp:863 src/emu/ui/selsoft.cpp:773
+#: src/emu/ui/selgame.cpp:869 src/emu/ui/selsoft.cpp:772
 msgid "Graphics: OK, "
 msgstr "圖形： OK， "
 
-#: src/emu/ui/selgame.cpp:866 src/emu/ui/selsoft.cpp:776
+#: src/emu/ui/selgame.cpp:872 src/emu/ui/selsoft.cpp:775
 msgid "Sound: Unimplemented"
 msgstr "聲音： 無法執行"
 
-#: src/emu/ui/selgame.cpp:868 src/emu/ui/selsoft.cpp:778
+#: src/emu/ui/selgame.cpp:874 src/emu/ui/selsoft.cpp:777
 msgid "Sound: Imperfect"
 msgstr "聲音： 不完美"
 
-#: src/emu/ui/selgame.cpp:870 src/emu/ui/selsoft.cpp:780
+#: src/emu/ui/selgame.cpp:876 src/emu/ui/selsoft.cpp:779
 msgid "Sound: OK"
 msgstr "聲音： OK"
 
-#: src/emu/ui/selgame.cpp:887
+#: src/emu/ui/selgame.cpp:893
 #, c-format
 msgid "System: %1$-.100s"
 msgstr "系統： %1$-.100s"
 
-#: src/emu/ui/selgame.cpp:894 src/emu/ui/selsoft.cpp:805
+#: src/emu/ui/selgame.cpp:900 src/emu/ui/selsoft.cpp:804
 #, c-format
 msgid "Software is clone of: %1$-.100s"
 msgstr "軟體相容於： %1$-.100s"
 
-#: src/emu/ui/selgame.cpp:896 src/emu/ui/selsoft.cpp:807
+#: src/emu/ui/selgame.cpp:902 src/emu/ui/selsoft.cpp:806
 msgid "Software is parent"
 msgstr "軟體為主檔"
 
-#: src/emu/ui/selgame.cpp:901 src/emu/ui/selsoft.cpp:812
+#: src/emu/ui/selgame.cpp:907 src/emu/ui/selsoft.cpp:811
 msgid "Supported: No"
 msgstr "已支援： 否"
 
-#: src/emu/ui/selgame.cpp:906 src/emu/ui/selsoft.cpp:817
+#: src/emu/ui/selgame.cpp:912 src/emu/ui/selsoft.cpp:816
 msgid "Supported: Partial"
 msgstr "已支援： 部分"
 
-#: src/emu/ui/selgame.cpp:911 src/emu/ui/selsoft.cpp:822
+#: src/emu/ui/selgame.cpp:917 src/emu/ui/selsoft.cpp:821
 msgid "Supported: Yes"
 msgstr "已支援： 是"
 
-#: src/emu/ui/selgame.cpp:916 src/emu/ui/selsoft.cpp:827
+#: src/emu/ui/selgame.cpp:922 src/emu/ui/selsoft.cpp:826
 #, c-format
 msgid "romset: %1$-.100s"
 msgstr "Rom組： %1$-.100s"
 
-#: src/emu/ui/selgame.cpp:923
+#: src/emu/ui/selgame.cpp:929
 #, c-format
 msgid "%1$s %2$s"
 msgstr "%1$s %2$s"
 
-#: src/emu/ui/selgame.cpp:1535
+#: src/emu/ui/selgame.cpp:1543
 #, c-format
 msgid "Romset: %1$-.100s\n"
 msgstr "Rom組： %1$-.100s\n"
 
-#: src/emu/ui/selgame.cpp:1536
+#: src/emu/ui/selgame.cpp:1544
 #, c-format
 msgid "Year: %1$s\n"
 msgstr "年份： %1$s\n"
 
-#: src/emu/ui/selgame.cpp:1537
+#: src/emu/ui/selgame.cpp:1545
 #, c-format
 msgid "Manufacturer: %1$-.100s\n"
 msgstr "製造商： %1$-.100s\n"
 
-#: src/emu/ui/selgame.cpp:1541
+#: src/emu/ui/selgame.cpp:1549
 #, c-format
 msgid "Driver is Clone of: %1$-.100s\n"
 msgstr "驅動程式相容於： %1$-.100s\n"
 
-#: src/emu/ui/selgame.cpp:1543
+#: src/emu/ui/selgame.cpp:1551
 msgid "Driver is Parent\n"
 msgstr "驅動程式為主檔\n"
 
-#: src/emu/ui/selgame.cpp:1546
+#: src/emu/ui/selgame.cpp:1554
 msgid "Overall: NOT WORKING\n"
 msgstr "整體： 不可執行\n"
 
-#: src/emu/ui/selgame.cpp:1548
+#: src/emu/ui/selgame.cpp:1556
 msgid "Overall: Unemulated Protection\n"
 msgstr "整體： 未模擬保護\n"
 
-#: src/emu/ui/selgame.cpp:1550
+#: src/emu/ui/selgame.cpp:1558
 msgid "Overall: Working\n"
 msgstr "整體: 可以執行\n"
 
-#: src/emu/ui/selgame.cpp:1553
+#: src/emu/ui/selgame.cpp:1561
 msgid "Graphics: Imperfect Colors\n"
 msgstr "圖形： 色彩不完美\n"
 
-#: src/emu/ui/selgame.cpp:1557
+#: src/emu/ui/selgame.cpp:1565
 msgid "Graphics: Imperfect\n"
 msgstr "圖形： 不完美\n"
 
-#: src/emu/ui/selgame.cpp:1559
+#: src/emu/ui/selgame.cpp:1567
 msgid "Graphics: OK\n"
 msgstr "圖形： OK\n"
 
-#: src/emu/ui/selgame.cpp:1562
+#: src/emu/ui/selgame.cpp:1570
 msgid "Sound: Unimplemented\n"
 msgstr "聲音： 無法執行\n"
 
-#: src/emu/ui/selgame.cpp:1564
+#: src/emu/ui/selgame.cpp:1572
 msgid "Sound: Imperfect\n"
 msgstr "聲音： 不完美\n"
 
-#: src/emu/ui/selgame.cpp:1566
+#: src/emu/ui/selgame.cpp:1574
 msgid "Sound: OK\n"
 msgstr "聲音： OK\n"
 
-#: src/emu/ui/selgame.cpp:1568
+#: src/emu/ui/selgame.cpp:1576
 #, c-format
 msgid "Driver is Skeleton: %1$s\n"
 msgstr "驅動程式尚未完整： %1$s\n"
 
-#: src/emu/ui/selgame.cpp:1569
+#: src/emu/ui/selgame.cpp:1577
 #, c-format
 msgid "Game is Mechanical: %1$s\n"
 msgstr "遊戲為機械式： %1$s\n"
 
-#: src/emu/ui/selgame.cpp:1570
+#: src/emu/ui/selgame.cpp:1578
 #, c-format
 msgid "Requires Artwork: %1$s\n"
 msgstr "需要裝飾圖： %1$s\n"
 
-#: src/emu/ui/selgame.cpp:1571
+#: src/emu/ui/selgame.cpp:1579
 #, c-format
 msgid "Requires Clickable Artwork: %1$s\n"
 msgstr "需要可點擊的裝飾圖： %1$s\n"
 
-#: src/emu/ui/selgame.cpp:1572
+#: src/emu/ui/selgame.cpp:1580
 #, c-format
 msgid "Support Cocktail: %1$s\n"
 msgstr "支援檯面型筐體： %1$s\n"
 
-#: src/emu/ui/selgame.cpp:1573
+#: src/emu/ui/selgame.cpp:1581
 #, c-format
 msgid "Driver is Bios: %1$s\n"
 msgstr "驅動程式為 BIOS： %1$s\n"
 
-#: src/emu/ui/selgame.cpp:1574
+#: src/emu/ui/selgame.cpp:1582
 #, c-format
 msgid "Support Save: %1$s\n"
 msgstr "支援即時存檔： %1$s\n"
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 #, c-format
 msgid "Screen Orientation: %1$s\n"
 msgstr "畫面方向： %1$s\n"
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 msgid "Vertical"
 msgstr "垂直"
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 msgid "Horizontal"
 msgstr "水平"
 
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/selgame.cpp:1591
 #, c-format
 msgid "Requires CHD: %1$s\n"
 msgstr "需要 CHD： %1$s\n"
 
-#: src/emu/ui/selgame.cpp:1596
+#: src/emu/ui/selgame.cpp:1604
 msgid "Roms Audit Pass: OK\n"
 msgstr "ROM 驗證通過： OK\n"
 
-#: src/emu/ui/selgame.cpp:1598
+#: src/emu/ui/selgame.cpp:1606
 msgid "Roms Audit Pass: BAD\n"
 msgstr "ROM 驗證通過： 錯誤\n"
 
-#: src/emu/ui/selgame.cpp:1601
+#: src/emu/ui/selgame.cpp:1609
 msgid "Samples Audit Pass: None Needed\n"
 msgstr "樣本檔驗證通過： 不需要\n"
 
-#: src/emu/ui/selgame.cpp:1603
+#: src/emu/ui/selgame.cpp:1611
 msgid "Samples Audit Pass: OK\n"
 msgstr "樣本檔驗證通過： OK\n"
 
-#: src/emu/ui/selgame.cpp:1605
+#: src/emu/ui/selgame.cpp:1613
 msgid "Samples Audit Pass: BAD\n"
 msgstr "樣本檔驗證通過： 錯誤\n"
 
-#: src/emu/ui/selgame.cpp:1608
+#: src/emu/ui/selgame.cpp:1616
 msgid ""
 "Roms Audit Pass: Disabled\n"
 "Samples Audit Pass: Disabled\n"
@@ -1265,20 +1285,16 @@ msgstr ""
 "ROM 驗證通過： 已停用\n"
 "樣本檔驗證通過： 已停用\n"
 
-#: src/emu/ui/selgame.cpp:2049 src/emu/ui/selgame.cpp:2212
-#: src/emu/ui/selsoft.cpp:1662
+#: src/emu/ui/selgame.cpp:2055 src/emu/ui/selgame.cpp:2216
+#: src/emu/ui/selsoft.cpp:1655
 msgid "No Infos Available"
 msgstr "無可用資訊"
 
-#: src/emu/ui/selgame.cpp:2162 src/emu/ui/selsoft.cpp:1607
+#: src/emu/ui/selgame.cpp:2168 src/emu/ui/selsoft.cpp:1602
 msgid "Usage"
 msgstr "用法"
 
-#: src/emu/ui/selsoft.cpp:110
-msgid " (default)"
-msgstr " （預設）"
-
-#: src/emu/ui/selsoft.cpp:381
+#: src/emu/ui/selsoft.cpp:380
 msgid ""
 "The selected software is missing one or more required files. Please select a "
 "different software.\n"
@@ -1289,57 +1305,57 @@ msgstr ""
 "\n"
 "按任意鍵繼續。"
 
-#: src/emu/ui/selsoft.cpp:684
+#: src/emu/ui/selsoft.cpp:683
 #, c-format
-msgid "%1$s %2$s ( %3$d / %4$d softwares )"
-msgstr "%1$s %2$s ( %3$d / %4$d 軟體 )"
+msgid "%1$s %2$s ( %3$d / %4$d software packages )"
+msgstr ""
 
-#: src/emu/ui/selsoft.cpp:685
+#: src/emu/ui/selsoft.cpp:684
 #, c-format
 msgid "Driver: \"%1$s\" software list "
 msgstr "驅動程式： \"%1$s\" 軟體清單 "
 
-#: src/emu/ui/selsoft.cpp:688
+#: src/emu/ui/selsoft.cpp:687
 #, c-format
 msgid "Region: %1$s -"
 msgstr "區域： %1$s -"
 
-#: src/emu/ui/selsoft.cpp:690
+#: src/emu/ui/selsoft.cpp:689
 #, c-format
 msgid "Publisher: %1$s -"
 msgstr "出版商： %1$s -"
 
-#: src/emu/ui/selsoft.cpp:692
+#: src/emu/ui/selsoft.cpp:691
 #, c-format
 msgid "Year: %1$s -"
 msgstr "年代： %1$s -"
 
-#: src/emu/ui/selsoft.cpp:694
+#: src/emu/ui/selsoft.cpp:693
 #, c-format
 msgid "Software List: %1$s -"
 msgstr "軟體清單： %1$s -"
 
-#: src/emu/ui/selsoft.cpp:696
+#: src/emu/ui/selsoft.cpp:695
 #, c-format
 msgid "Device type: %1$s -"
 msgstr "裝置類別： %1$s -"
 
-#: src/emu/ui/selsoft.cpp:698
+#: src/emu/ui/selsoft.cpp:697
 #, c-format
 msgid "%s Search: %s_"
 msgstr "%s 搜尋： %s_"
 
-#: src/emu/ui/selsoft.cpp:748 src/emu/ui/selsoft.cpp:798
+#: src/emu/ui/selsoft.cpp:747 src/emu/ui/selsoft.cpp:797
 #: src/emu/ui/simpleselgame.cpp:325
 #, c-format
 msgid "%1$-.100s"
 msgstr "%1$-.100s"
 
-#: src/emu/ui/selsoft.cpp:1998 src/emu/ui/selsoft.cpp:2018
+#: src/emu/ui/selsoft.cpp:1991 src/emu/ui/selsoft.cpp:2011
 msgid "Software part selection:"
 msgstr "軟體部分選項： "
 
-#: src/emu/ui/selsoft.cpp:2136 src/emu/ui/selsoft.cpp:2156
+#: src/emu/ui/selsoft.cpp:2129 src/emu/ui/selsoft.cpp:2149
 msgid "Bios selection:"
 msgstr "選擇 BIOS："
 
@@ -1391,15 +1407,15 @@ msgstr "圖形： %s, 聲音: %s"
 msgid " [internal]"
 msgstr " [內部]"
 
-#: src/emu/ui/sndmenu.cpp:135
+#: src/emu/ui/sndmenu.cpp:133
 msgid "Sound"
 msgstr "聲音"
 
-#: src/emu/ui/sndmenu.cpp:136
+#: src/emu/ui/sndmenu.cpp:134
 msgid "Sample Rate"
 msgstr "取樣頻率"
 
-#: src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/sndmenu.cpp:135
 msgid "Use External Samples"
 msgstr "使用外部樣本檔"
 
@@ -1468,17 +1484,17 @@ msgstr "倒帶"
 msgid "Fast Forward"
 msgstr "快進"
 
-#: src/emu/ui/ui.cpp:419
+#: src/emu/ui/ui.cpp:418
 msgid "This driver requires images to be loaded in the following device(s): "
 msgstr "此驅動需要額外載入下列裝置的映像檔: "
 
-#: src/emu/ui/ui.cpp:1074
+#: src/emu/ui/ui.cpp:1071
 msgid ""
 "One or more ROMs/CHDs for this machine are incorrect. The machine may not "
 "run correctly.\n"
 msgstr "本機台有一個或更多的 ROM/CHD 是不正確的。此機台可能無法正確執行。\n"
 
-#: src/emu/ui/ui.cpp:1087
+#: src/emu/ui/ui.cpp:1084
 msgid ""
 "There are known problems with this machine\n"
 "\n"
@@ -1486,64 +1502,64 @@ msgstr ""
 "本機台已知具有下列的問題\n"
 "\n"
 
-#: src/emu/ui/ui.cpp:1091
+#: src/emu/ui/ui.cpp:1088
 msgid ""
 "One or more ROMs/CHDs for this machine have not been correctly dumped.\n"
 msgstr "本機台有一個或更多的 ROM/CHD 尚未正確地被 DUMP。\n"
 
-#: src/emu/ui/ui.cpp:1095
+#: src/emu/ui/ui.cpp:1092
 #, c-format
 msgid "The keyboard emulation may not be 100% accurate.\n"
 msgstr "鍵盤模擬可能未達到 100% 精確。"
 
-#: src/emu/ui/ui.cpp:1097
+#: src/emu/ui/ui.cpp:1094
 #, c-format
 msgid "The colors aren't 100% accurate.\n"
 msgstr "色彩是完全錯誤的。"
 
-#: src/emu/ui/ui.cpp:1099
+#: src/emu/ui/ui.cpp:1096
 msgid "The colors are completely wrong.\n"
 msgstr "色彩尚未達到 100% 精確。"
 
-#: src/emu/ui/ui.cpp:1101
+#: src/emu/ui/ui.cpp:1098
 #, c-format
 msgid "The video emulation isn't 100% accurate.\n"
 msgstr "視訊模擬尚未達到 100% 精確。"
 
-#: src/emu/ui/ui.cpp:1103
+#: src/emu/ui/ui.cpp:1100
 #, c-format
 msgid "The sound emulation isn't 100% accurate.\n"
 msgstr "聲音模擬尚未達到 100% 精確。"
 
-#: src/emu/ui/ui.cpp:1105
+#: src/emu/ui/ui.cpp:1102
 msgid "The machine lacks sound.\n"
 msgstr "機台缺少聲音。"
 
-#: src/emu/ui/ui.cpp:1108
+#: src/emu/ui/ui.cpp:1105
 msgid "Screen flipping in cocktail mode is not supported.\n"
 msgstr "尚未支援檯面型筐體模式的畫面翻轉。"
 
-#: src/emu/ui/ui.cpp:1112
+#: src/emu/ui/ui.cpp:1109
 msgid "The machine requires external artwork files\n"
 msgstr "機台需要外部裝飾圖檔案"
 
-#: src/emu/ui/ui.cpp:1117
+#: src/emu/ui/ui.cpp:1114
 msgid ""
 "This machine was never completed. It may exhibit strange behavior or missing "
 "elements that are not bugs in the emulation.\n"
 msgstr "本機台無法完成，並非模擬時的錯誤而可能呈現怪異的行為或缺少元件。\n"
 
-#: src/emu/ui/ui.cpp:1122
+#: src/emu/ui/ui.cpp:1119
 msgid ""
 "This machine has no sound hardware, MAME will produce no sounds, this is "
 "expected behaviour.\n"
 msgstr "本機台無聲音硬體，故 MAME 將不會產生聲音，這是可預期的行為。\n"
 
-#: src/emu/ui/ui.cpp:1130
+#: src/emu/ui/ui.cpp:1127
 msgid "The machine has protection which isn't fully emulated.\n"
 msgstr "機台具有保護尚未完全模擬。"
 
-#: src/emu/ui/ui.cpp:1133
+#: src/emu/ui/ui.cpp:1130
 msgid ""
 "\n"
 "THIS MACHINE DOESN'T WORK. The emulation for this machine is not yet "
@@ -1553,7 +1569,7 @@ msgstr ""
 "此機台無法執行，機台的模擬還不完全。除了等待開發人員改良模擬之外，沒有方法可"
 "以解決這個問題。\n"
 
-#: src/emu/ui/ui.cpp:1137
+#: src/emu/ui/ui.cpp:1134
 msgid ""
 "\n"
 "Certain elements of this machine cannot be emulated as it requires actual "
@@ -1564,7 +1580,7 @@ msgstr ""
 "本機台的的部分元件無法模擬，因其需要實際活動的互動或機械裝置的組合。故無法完"
 "成此遊戲的執行。\n"
 
-#: src/emu/ui/ui.cpp:1156
+#: src/emu/ui/ui.cpp:1153
 msgid ""
 "\n"
 "\n"
@@ -1574,14 +1590,14 @@ msgstr ""
 "\n"
 "本機台尚有可執行的仿製版： "
 
-#: src/emu/ui/ui.cpp:1170
+#: src/emu/ui/ui.cpp:1167
 msgid ""
 "\n"
 "\n"
 "Press any key to continue"
 msgstr "按任意鍵繼續"
 
-#: src/emu/ui/ui.cpp:1185
+#: src/emu/ui/ui.cpp:1182
 #, c-format
 msgid ""
 "%1$s\n"
@@ -1596,15 +1612,15 @@ msgstr ""
 "\n"
 "CPU：\n"
 
-#: src/emu/ui/ui.cpp:1221 src/emu/ui/ui.cpp:1260
+#: src/emu/ui/ui.cpp:1218 src/emu/ui/ui.cpp:1257
 msgid "MHz"
 msgstr "MHz"
 
-#: src/emu/ui/ui.cpp:1221 src/emu/ui/ui.cpp:1260
+#: src/emu/ui/ui.cpp:1218 src/emu/ui/ui.cpp:1257
 msgid "kHz"
 msgstr "kHz"
 
-#: src/emu/ui/ui.cpp:1235
+#: src/emu/ui/ui.cpp:1232
 msgid ""
 "\n"
 "Sound:\n"
@@ -1612,7 +1628,7 @@ msgstr ""
 "\n"
 "聲音：\n"
 
-#: src/emu/ui/ui.cpp:1264
+#: src/emu/ui/ui.cpp:1261
 msgid ""
 "\n"
 "Video:\n"
@@ -1620,78 +1636,78 @@ msgstr ""
 "\n"
 "視訊：\n"
 
-#: src/emu/ui/ui.cpp:1268
+#: src/emu/ui/ui.cpp:1265
 msgid "None\n"
 msgstr "無\n"
 
-#: src/emu/ui/ui.cpp:1275
+#: src/emu/ui/ui.cpp:1272
 msgid "Vector"
 msgstr "向量"
 
-#: src/emu/ui/ui.cpp:1286
+#: src/emu/ui/ui.cpp:1283
 #, c-format
 msgid "%1$s: %2$s\n"
 msgstr "%1$s: %2$s\n"
 
-#: src/emu/ui/ui.cpp:1286
+#: src/emu/ui/ui.cpp:1283
 msgid "%2$s\n"
 msgstr "%2$s\n"
 
-#: src/emu/ui/ui.cpp:1541 src/emu/ui/ui.cpp:1551
+#: src/emu/ui/ui.cpp:1538 src/emu/ui/ui.cpp:1548
 msgid "Keyboard Emulation Status"
 msgstr "鍵盤模擬狀態"
 
-#: src/emu/ui/ui.cpp:1543
+#: src/emu/ui/ui.cpp:1540
 msgid "Mode: PARTIAL Emulation"
 msgstr "模式： 部分模擬"
 
-#: src/emu/ui/ui.cpp:1544
+#: src/emu/ui/ui.cpp:1541
 msgid "UI:   Enabled"
 msgstr "UI：   已啟用"
 
-#: src/emu/ui/ui.cpp:1546 src/emu/ui/ui.cpp:1556
+#: src/emu/ui/ui.cpp:1543 src/emu/ui/ui.cpp:1553
 msgid "**Use ScrLock to toggle**"
 msgstr "**使用 ScrLock 鍵切換**"
 
-#: src/emu/ui/ui.cpp:1553
+#: src/emu/ui/ui.cpp:1550
 msgid "Mode: FULL Emulation"
 msgstr "模式： 完整模擬"
 
-#: src/emu/ui/ui.cpp:1554
+#: src/emu/ui/ui.cpp:1551
 msgid "UI:   Disabled"
 msgstr "UI：   已停用"
 
-#: src/emu/ui/ui.cpp:1692
+#: src/emu/ui/ui.cpp:1689
 msgid "Autofire can't be enabled"
 msgstr "無法啟用連射"
 
-#: src/emu/ui/ui.cpp:1731
+#: src/emu/ui/ui.cpp:1728
 msgid "Select position to save to"
 msgstr "選擇儲存位置"
 
-#: src/emu/ui/ui.cpp:1733
+#: src/emu/ui/ui.cpp:1730
 msgid "Select position to load from"
 msgstr "選擇載入位置"
 
-#: src/emu/ui/ui.cpp:1757
+#: src/emu/ui/ui.cpp:1754
 msgid "Save cancelled"
 msgstr "取消儲存"
 
-#: src/emu/ui/ui.cpp:1759
+#: src/emu/ui/ui.cpp:1756
 msgid "Load cancelled"
 msgstr "取消載入"
 
-#: src/emu/ui/ui.cpp:1802
+#: src/emu/ui/ui.cpp:1799
 #, c-format
 msgid "Save to position %s"
 msgstr "儲存至位置 %s"
 
-#: src/emu/ui/ui.cpp:1807
+#: src/emu/ui/ui.cpp:1804
 #, c-format
 msgid "Load from position %s"
 msgstr "從位置 %s 載入"
 
-#: src/emu/ui/ui.cpp:1847
+#: src/emu/ui/ui.cpp:1844
 #, c-format
 msgid ""
 "Are you sure you want to quit?\n"
@@ -1704,173 +1720,173 @@ msgstr ""
 "按『%1$s』退出，\n"
 "按『%2$s』繼續模擬。"
 
-#: src/emu/ui/ui.cpp:1917
+#: src/emu/ui/ui.cpp:1914
 msgid "Master Volume"
 msgstr "主音量"
 
-#: src/emu/ui/ui.cpp:1926
+#: src/emu/ui/ui.cpp:1923
 #, c-format
 msgid "%1$s Volume"
 msgstr "%1$s 音量"
 
-#: src/emu/ui/ui.cpp:1949
+#: src/emu/ui/ui.cpp:1946
 #, c-format
 msgid "Overclock CPU %1$s"
 msgstr "超頻 CPU %1$s"
 
-#: src/emu/ui/ui.cpp:1968
+#: src/emu/ui/ui.cpp:1965
 #, c-format
 msgid "%1$s Refresh Rate"
 msgstr "%1$s 更新率"
 
-#: src/emu/ui/ui.cpp:1973
+#: src/emu/ui/ui.cpp:1970
 #, c-format
 msgid "%1$s Brightness"
 msgstr "%1$s 亮度"
 
-#: src/emu/ui/ui.cpp:1975
+#: src/emu/ui/ui.cpp:1972
 #, c-format
 msgid "%1$s Contrast"
 msgstr "%1$s 對比"
 
-#: src/emu/ui/ui.cpp:1977
+#: src/emu/ui/ui.cpp:1974
 #, c-format
 msgid "%1$s Gamma"
 msgstr "%1$s Gamma 值"
 
-#: src/emu/ui/ui.cpp:1981
+#: src/emu/ui/ui.cpp:1978
 #, c-format
 msgid "%1$s Horiz Stretch"
 msgstr "%1$s 水平延展"
 
-#: src/emu/ui/ui.cpp:1983
+#: src/emu/ui/ui.cpp:1980
 #, c-format
 msgid "%1$s Horiz Position"
 msgstr "%1$s 水平位置"
 
-#: src/emu/ui/ui.cpp:1985
+#: src/emu/ui/ui.cpp:1982
 #, c-format
 msgid "%1$s Vert Stretch"
 msgstr "%1$s 垂直延展"
 
-#: src/emu/ui/ui.cpp:1987
+#: src/emu/ui/ui.cpp:1984
 #, c-format
 msgid "%1$s Vert Position"
 msgstr "%1$s 垂直位置"
 
-#: src/emu/ui/ui.cpp:2005
+#: src/emu/ui/ui.cpp:2002
 #, c-format
 msgid "Laserdisc '%1$s' Horiz Stretch"
 msgstr "雷射影碟 %1$s 水平延展"
 
-#: src/emu/ui/ui.cpp:2007
+#: src/emu/ui/ui.cpp:2004
 #, c-format
 msgid "Laserdisc '%1$s' Horiz Position"
 msgstr "雷射影碟 %1$s 水平位置"
 
-#: src/emu/ui/ui.cpp:2009
+#: src/emu/ui/ui.cpp:2006
 #, c-format
 msgid "Laserdisc '%1$s' Vert Stretch"
 msgstr "雷射影碟 %1$s 垂直延展"
 
-#: src/emu/ui/ui.cpp:2011
+#: src/emu/ui/ui.cpp:2008
 #, c-format
 msgid "Laserdisc '%1$s' Vert Position"
 msgstr "雷射影碟 %1$s 垂直位置"
 
-#: src/emu/ui/ui.cpp:2021
+#: src/emu/ui/ui.cpp:2018
 msgid "Vector Flicker"
 msgstr "向量閃爍度"
 
-#: src/emu/ui/ui.cpp:2022
+#: src/emu/ui/ui.cpp:2019
 msgid "Beam Width Minimum"
 msgstr "最小光束寬度"
 
-#: src/emu/ui/ui.cpp:2023
+#: src/emu/ui/ui.cpp:2020
 msgid "Beam Width Maximum"
 msgstr "最大光束寬度"
 
-#: src/emu/ui/ui.cpp:2024
+#: src/emu/ui/ui.cpp:2021
 msgid "Beam Intensity Weight"
 msgstr "光束強度"
 
-#: src/emu/ui/ui.cpp:2037
+#: src/emu/ui/ui.cpp:2034
 #, c-format
 msgid "Crosshair Scale %1$s"
 msgstr "十字準星尺度 %1$s"
 
-#: src/emu/ui/ui.cpp:2037 src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2034 src/emu/ui/ui.cpp:2036
 msgid "X"
 msgstr "X"
 
-#: src/emu/ui/ui.cpp:2037 src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2034 src/emu/ui/ui.cpp:2036
 msgid "Y"
 msgstr "Y"
 
-#: src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2036
 #, c-format
 msgid "Crosshair Offset %1$s"
 msgstr "十字準星位移 %1$s"
 
-#: src/emu/ui/ui.cpp:2071
+#: src/emu/ui/ui.cpp:2068
 #, c-format
 msgid "%1$3ddB"
 msgstr "%1$3ddB"
 
-#: src/emu/ui/ui.cpp:2115
+#: src/emu/ui/ui.cpp:2112
 #, c-format
 msgid "%1$d%%"
 msgstr "%1$d%%"
 
-#: src/emu/ui/ui.cpp:2131
+#: src/emu/ui/ui.cpp:2128
 #, c-format
 msgid "%1$3.0f%%"
 msgstr "%1$3.0f%%"
 
-#: src/emu/ui/ui.cpp:2154
+#: src/emu/ui/ui.cpp:2151
 #, c-format
 msgid "%1$.3ffps"
 msgstr "%1$.3ffps"
 
-#: src/emu/ui/ui.cpp:2177 src/emu/ui/ui.cpp:2199 src/emu/ui/ui.cpp:2220
-#: src/emu/ui/ui.cpp:2242 src/emu/ui/ui.cpp:2264 src/emu/ui/ui.cpp:2286
-#: src/emu/ui/ui.cpp:2308 src/emu/ui/ui.cpp:2330 src/emu/ui/ui.cpp:2352
-#: src/emu/ui/ui.cpp:2374 src/emu/ui/ui.cpp:2396
+#: src/emu/ui/ui.cpp:2174 src/emu/ui/ui.cpp:2196 src/emu/ui/ui.cpp:2217
+#: src/emu/ui/ui.cpp:2239 src/emu/ui/ui.cpp:2261 src/emu/ui/ui.cpp:2283
+#: src/emu/ui/ui.cpp:2305 src/emu/ui/ui.cpp:2327 src/emu/ui/ui.cpp:2349
+#: src/emu/ui/ui.cpp:2371 src/emu/ui/ui.cpp:2393
 #, c-format
 msgid "%1$.3f"
 msgstr "%1$.3f"
 
-#: src/emu/ui/ui.cpp:2412 src/emu/ui/ui.cpp:2428 src/emu/ui/ui.cpp:2444
-#: src/emu/ui/ui.cpp:2460
+#: src/emu/ui/ui.cpp:2408 src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2438
+#: src/emu/ui/ui.cpp:2453
 #, c-format
 msgid "%1$1.2f"
 msgstr "%1$1.2f"
 
-#: src/emu/ui/ui.cpp:2476
+#: src/emu/ui/ui.cpp:2469
 #, c-format
 msgid "Screen '%1$s'"
 msgstr "畫面 '%1$s'"
 
-#: src/emu/ui/ui.cpp:2478
+#: src/emu/ui/ui.cpp:2471
 msgid "Screen"
 msgstr "畫面"
 
-#: src/emu/ui/ui.cpp:2494
+#: src/emu/ui/ui.cpp:2487
 #, c-format
 msgid "Crosshair Scale X %1$1.3f"
 msgstr "十字準星尺度 X %1$1.3f"
 
-#: src/emu/ui/ui.cpp:2494
+#: src/emu/ui/ui.cpp:2487
 #, c-format
 msgid "Crosshair Scale Y %1$1.3f"
 msgstr "十字準星尺度 Y %1$1.3f"
 
-#: src/emu/ui/ui.cpp:2513
+#: src/emu/ui/ui.cpp:2506
 #, c-format
 msgid "Crosshair Offset X %1$1.3f"
 msgstr "十字準星位移 X %1$1.3f"
 
-#: src/emu/ui/ui.cpp:2513
+#: src/emu/ui/ui.cpp:2506
 #, c-format
 msgid "Crosshair Offset Y %1$1.3f"
 msgstr "十字準星位移 Y %1$1.3f"
@@ -1912,14 +1928,26 @@ msgstr "裁切"
 msgid "Full"
 msgstr "全部"
 
-#: src/emu/ui/viewgfx.cpp:392
+#: src/emu/ui/viewgfx.cpp:391
 msgid " COLORS"
 msgstr " 色彩"
 
-#: src/emu/ui/viewgfx.cpp:392
+#: src/emu/ui/viewgfx.cpp:391
 msgid " PENS"
 msgstr " PENS"
 
+#~ msgid "Export XML format (like -listxml)"
+#~ msgstr "匯出為 XML 格式 （同 -listxml）"
+
+#~ msgid "Export TXT format (like -listfull)"
+#~ msgstr "匯出為 TXT 格式 （同 -listfull）"
+
+#~ msgid "Dummy"
+#~ msgstr "Dummy"
+
+#~ msgid "%1$s %2$s ( %3$d / %4$d softwares )"
+#~ msgstr "%1$s %2$s ( %3$d / %4$d 軟體 )"
+
 #~ msgid "Lightgun Device Assignment"
 #~ msgstr "指派光線槍裝置"
 
diff --git a/language/Croatian/strings.po b/language/Croatian/strings.po
index 490b591c84f..17c51975f63 100644
--- a/language/Croatian/strings.po
+++ b/language/Croatian/strings.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MAME\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-11 03:33+0200\n"
+"POT-Creation-Date: 2016-04-15 17:42+0200\n"
 "PO-Revision-Date: 2016-02-20 18:03+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: MAME Language Team\n"
@@ -61,14 +61,14 @@ msgstr ""
 msgid "Autofire Status"
 msgstr ""
 
-#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1698
+#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1695
 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211
 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219
 #: src/emu/ui/videoopt.cpp:223
 msgid "Disabled"
 msgstr ""
 
-#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1698
+#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1695
 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211
 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219
 #: src/emu/ui/videoopt.cpp:223
@@ -76,14 +76,14 @@ msgid "Enabled"
 msgstr ""
 
 #: src/emu/ui/cheatopt.cpp:282 src/emu/ui/cheatopt.cpp:288
-#: src/emu/ui/menu.cpp:710 src/emu/ui/miscmenu.cpp:831
-#: src/emu/ui/sndmenu.cpp:135 src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/menu.cpp:755 src/emu/ui/miscmenu.cpp:936
+#: src/emu/ui/sndmenu.cpp:133 src/emu/ui/sndmenu.cpp:135
 msgid "On"
 msgstr ""
 
 #: src/emu/ui/cheatopt.cpp:282 src/emu/ui/cheatopt.cpp:288
-#: src/emu/ui/menu.cpp:713 src/emu/ui/miscmenu.cpp:831
-#: src/emu/ui/sndmenu.cpp:135 src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/menu.cpp:758 src/emu/ui/miscmenu.cpp:936
+#: src/emu/ui/sndmenu.cpp:133 src/emu/ui/sndmenu.cpp:135
 msgid "Off"
 msgstr ""
 
@@ -95,316 +95,316 @@ msgstr ""
 msgid "Autofire Delay"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:158 src/emu/ui/custmenu.cpp:447
+#: src/emu/ui/custmenu.cpp:157 src/emu/ui/custmenu.cpp:445
 msgid "Main filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:167 src/emu/ui/custmenu.cpp:456
+#: src/emu/ui/custmenu.cpp:166 src/emu/ui/custmenu.cpp:454
 msgid "Other filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:176 src/emu/ui/optsmenu.cpp:239
+#: src/emu/ui/custmenu.cpp:175 src/emu/ui/optsmenu.cpp:238
 msgid "^!Manufacturer"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:185 src/emu/ui/custmenu.cpp:474
-#: src/emu/ui/optsmenu.cpp:247
+#: src/emu/ui/custmenu.cpp:184 src/emu/ui/custmenu.cpp:472
+#: src/emu/ui/optsmenu.cpp:246
 msgid "^!Year"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:194 src/emu/ui/custmenu.cpp:510
+#: src/emu/ui/custmenu.cpp:193 src/emu/ui/custmenu.cpp:508
 msgid "Remove last filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:197 src/emu/ui/custmenu.cpp:513
+#: src/emu/ui/custmenu.cpp:196 src/emu/ui/custmenu.cpp:511
 msgid "Add filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:212 src/emu/ui/custmenu.cpp:233
-#: src/emu/ui/custmenu.cpp:529 src/emu/ui/custmenu.cpp:550
+#: src/emu/ui/custmenu.cpp:211 src/emu/ui/custmenu.cpp:231
+#: src/emu/ui/custmenu.cpp:527 src/emu/ui/custmenu.cpp:547
 msgid "Select custom filters:"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:465
+#: src/emu/ui/custmenu.cpp:463
 msgid "^!Publisher"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:483
+#: src/emu/ui/custmenu.cpp:481
 msgid "^!Software List"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:492
+#: src/emu/ui/custmenu.cpp:490
 msgid "^!Device type"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:501
+#: src/emu/ui/custmenu.cpp:499
 msgid "^!Region"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:23
+#: src/emu/ui/custui.cpp:22
 msgid "Show All"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:24
+#: src/emu/ui/custui.cpp:23
 msgid "Hide Filters"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:25
+#: src/emu/ui/custui.cpp:24
 msgid "Hide Info/Image"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:26
+#: src/emu/ui/custui.cpp:25
 msgid "Hide Both"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:142
+#: src/emu/ui/custui.cpp:141
 msgid "Fonts"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:143
+#: src/emu/ui/custui.cpp:142
 msgid "Colors"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:148 src/emu/ui/dirmenu.cpp:33
+#: src/emu/ui/custui.cpp:147 src/emu/ui/dirmenu.cpp:33
 msgid "Language"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:152
+#: src/emu/ui/custui.cpp:151
 msgid "Show side panels"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:167 src/emu/ui/custui.cpp:188
+#: src/emu/ui/custui.cpp:166 src/emu/ui/custui.cpp:186
 msgid "Custom UI Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:246
+#: src/emu/ui/custui.cpp:244
 msgid "default"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:349
+#: src/emu/ui/custui.cpp:347
 msgid "UI Font"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:354
+#: src/emu/ui/custui.cpp:352
 msgid "Bold"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:355
+#: src/emu/ui/custui.cpp:353
 msgid "Italic"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:360
+#: src/emu/ui/custui.cpp:358
 msgid "Lines"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:366
+#: src/emu/ui/custui.cpp:364
 msgid "Infos text size"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:383
+#: src/emu/ui/custui.cpp:381
 msgid "UI Fonts Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:411
+#: src/emu/ui/custui.cpp:408
 msgid "Sample text - Lorem ipsum dolor sit amet, consectetur adipiscing elit."
 msgstr ""
 
-#: src/emu/ui/custui.cpp:509
+#: src/emu/ui/custui.cpp:506
 msgid "Normal text"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:510
+#: src/emu/ui/custui.cpp:507
 msgid "Selected color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:511
+#: src/emu/ui/custui.cpp:508
 msgid "Normal text background"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:512
+#: src/emu/ui/custui.cpp:509
 msgid "Selected background color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:513
+#: src/emu/ui/custui.cpp:510
 msgid "Subitem color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:514 src/emu/ui/custui.cpp:610
+#: src/emu/ui/custui.cpp:511 src/emu/ui/custui.cpp:606
 msgid "Clone"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:515
+#: src/emu/ui/custui.cpp:512
 msgid "Border"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:516
+#: src/emu/ui/custui.cpp:513
 msgid "Background"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:517
+#: src/emu/ui/custui.cpp:514
 msgid "Dipswitch"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:518
+#: src/emu/ui/custui.cpp:515
 msgid "Unavailable color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:519
+#: src/emu/ui/custui.cpp:516
 msgid "Slider color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:520
+#: src/emu/ui/custui.cpp:517
 msgid "Gfx viewer background"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:521
+#: src/emu/ui/custui.cpp:518
 msgid "Mouse over color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:522
+#: src/emu/ui/custui.cpp:519
 msgid "Mouse over background color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:523
+#: src/emu/ui/custui.cpp:520
 msgid "Mouse down color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:524
+#: src/emu/ui/custui.cpp:521
 msgid "Mouse down background color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:527
+#: src/emu/ui/custui.cpp:524
 msgid "Restore originals colors"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:543
+#: src/emu/ui/custui.cpp:540
 msgid "UI Colors Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:572
+#: src/emu/ui/custui.cpp:568
 #, c-format
 msgid "Double click or press %1$s to change the color value"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:598
+#: src/emu/ui/custui.cpp:594
 msgid "Menu Preview"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:606
+#: src/emu/ui/custui.cpp:602
 msgid "Normal"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:607
+#: src/emu/ui/custui.cpp:603
 msgid "Subitem"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:608
+#: src/emu/ui/custui.cpp:604
 msgid "Selected"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:609
+#: src/emu/ui/custui.cpp:605
 msgid "Mouse Over"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:841 src/emu/ui/custui.cpp:844
+#: src/emu/ui/custui.cpp:837 src/emu/ui/custui.cpp:840
 msgid "Alpha"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:849 src/emu/ui/custui.cpp:852
-#: src/emu/ui/custui.cpp:1013
+#: src/emu/ui/custui.cpp:845 src/emu/ui/custui.cpp:848
+#: src/emu/ui/custui.cpp:1007
 msgid "Red"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:857 src/emu/ui/custui.cpp:860
-#: src/emu/ui/custui.cpp:1016
+#: src/emu/ui/custui.cpp:853 src/emu/ui/custui.cpp:856
+#: src/emu/ui/custui.cpp:1010
 msgid "Green"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:865 src/emu/ui/custui.cpp:868
-#: src/emu/ui/custui.cpp:1017
+#: src/emu/ui/custui.cpp:861 src/emu/ui/custui.cpp:864
+#: src/emu/ui/custui.cpp:1011
 msgid "Blue"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:871
+#: src/emu/ui/custui.cpp:867
 msgid "Choose from palette"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:887
+#: src/emu/ui/custui.cpp:883
 msgid " - ARGB Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:912
+#: src/emu/ui/custui.cpp:907
 msgid "Color preview ="
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1009
+#: src/emu/ui/custui.cpp:1003
 msgid "White"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1010
+#: src/emu/ui/custui.cpp:1004
 msgid "Silver"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1011
+#: src/emu/ui/custui.cpp:1005
 msgid "Gray"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1012
+#: src/emu/ui/custui.cpp:1006
 msgid "Black"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1014
+#: src/emu/ui/custui.cpp:1008
 msgid "Orange"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1015
+#: src/emu/ui/custui.cpp:1009
 msgid "Yellow"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1018
+#: src/emu/ui/custui.cpp:1012
 msgid "Violet"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:65
+#: src/emu/ui/datmenu.cpp:64
 msgid "Software History"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:67
+#: src/emu/ui/datmenu.cpp:66
 msgid "Software Usage"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:199
+#: src/emu/ui/datmenu.cpp:196
 msgid "Revision: "
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:287 src/emu/ui/selgame.cpp:40
-#: src/emu/ui/selgame.cpp:2152 src/emu/ui/selgame.cpp:2161
-#: src/emu/ui/selsoft.cpp:1577 src/emu/ui/selsoft.cpp:1597
-#: src/emu/ui/selsoft.cpp:1606
+#: src/emu/ui/datmenu.cpp:284 src/emu/ui/selgame.cpp:39
+#: src/emu/ui/selgame.cpp:2158 src/emu/ui/selgame.cpp:2167
+#: src/emu/ui/selsoft.cpp:1574 src/emu/ui/selsoft.cpp:1592
+#: src/emu/ui/selsoft.cpp:1601
 msgid "History"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:289 src/emu/ui/selgame.cpp:41
+#: src/emu/ui/datmenu.cpp:286 src/emu/ui/selgame.cpp:40
 msgid "Mameinfo"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:291 src/emu/ui/selgame.cpp:43
+#: src/emu/ui/datmenu.cpp:288 src/emu/ui/selgame.cpp:42
 msgid "Messinfo"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:293 src/emu/ui/selgame.cpp:42
+#: src/emu/ui/datmenu.cpp:290 src/emu/ui/selgame.cpp:41
 msgid "Sysinfo"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:295 src/emu/ui/selgame.cpp:46
+#: src/emu/ui/datmenu.cpp:292 src/emu/ui/selgame.cpp:45
 msgid "Mamescore"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:297 src/emu/ui/selgame.cpp:45
+#: src/emu/ui/datmenu.cpp:294 src/emu/ui/selgame.cpp:44
 msgid "Gameinit"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:299 src/emu/ui/selgame.cpp:44
+#: src/emu/ui/datmenu.cpp:296 src/emu/ui/selgame.cpp:43
 msgid "Command"
 msgstr ""
 
@@ -556,75 +556,75 @@ msgstr ""
 msgid "Remove %1$s Folder"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:158
+#: src/emu/ui/filesel.cpp:161
 msgid "File Already Exists - Override?"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:160 src/emu/ui/selgame.cpp:1568
-#: src/emu/ui/selgame.cpp:1569 src/emu/ui/selgame.cpp:1570
-#: src/emu/ui/selgame.cpp:1571 src/emu/ui/selgame.cpp:1572
-#: src/emu/ui/selgame.cpp:1573 src/emu/ui/selgame.cpp:1574
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/filesel.cpp:163 src/emu/ui/selgame.cpp:1576
+#: src/emu/ui/selgame.cpp:1577 src/emu/ui/selgame.cpp:1578
+#: src/emu/ui/selgame.cpp:1579 src/emu/ui/selgame.cpp:1580
+#: src/emu/ui/selgame.cpp:1581 src/emu/ui/selgame.cpp:1582
+#: src/emu/ui/selgame.cpp:1591
 msgid "No"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:161 src/emu/ui/selgame.cpp:1568
-#: src/emu/ui/selgame.cpp:1569 src/emu/ui/selgame.cpp:1570
-#: src/emu/ui/selgame.cpp:1571 src/emu/ui/selgame.cpp:1572
-#: src/emu/ui/selgame.cpp:1573 src/emu/ui/selgame.cpp:1574
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/filesel.cpp:164 src/emu/ui/selgame.cpp:1576
+#: src/emu/ui/selgame.cpp:1577 src/emu/ui/selgame.cpp:1578
+#: src/emu/ui/selgame.cpp:1579 src/emu/ui/selgame.cpp:1580
+#: src/emu/ui/selgame.cpp:1581 src/emu/ui/selgame.cpp:1582
+#: src/emu/ui/selgame.cpp:1591
 msgid "Yes"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:272
+#: src/emu/ui/filesel.cpp:275
 msgid "New Image Name:"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:278
+#: src/emu/ui/filesel.cpp:281
 msgid "Image Format:"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:284
+#: src/emu/ui/filesel.cpp:287
 msgid "Create"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:315
+#: src/emu/ui/filesel.cpp:318
 msgid "Please enter a file extension too"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:503 src/emu/ui/swlist.cpp:65
+#: src/emu/ui/filesel.cpp:506 src/emu/ui/swlist.cpp:65
 msgid "[empty slot]"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:507
+#: src/emu/ui/filesel.cpp:510
 msgid "[create]"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:511 src/emu/ui/swlist.cpp:76
+#: src/emu/ui/filesel.cpp:514 src/emu/ui/swlist.cpp:76
 msgid "[software list]"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:803
+#: src/emu/ui/filesel.cpp:806
 msgid "Select image format"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:863
+#: src/emu/ui/filesel.cpp:866
 msgid "Select access mode"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:864
+#: src/emu/ui/filesel.cpp:867
 msgid "Read-only"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:866
+#: src/emu/ui/filesel.cpp:869
 msgid "Read-write"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:867
+#: src/emu/ui/filesel.cpp:870
 msgid "Read this image, write to another image"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:868
+#: src/emu/ui/filesel.cpp:871
 msgid "Read this image, write to diff"
 msgstr ""
 
@@ -650,7 +650,7 @@ msgstr ""
 msgid "[empty]"
 msgstr ""
 
-#: src/emu/ui/info_pty.cpp:26 src/emu/ui/mainmenu.cpp:91
+#: src/emu/ui/info_pty.cpp:26 src/emu/ui/mainmenu.cpp:96
 msgid "Pseudo terminals"
 msgstr ""
 
@@ -666,7 +666,7 @@ msgstr ""
 msgid "Other Controls"
 msgstr ""
 
-#: src/emu/ui/inputmap.cpp:622 src/emu/ui/miscmenu.cpp:91
+#: src/emu/ui/inputmap.cpp:622 src/emu/ui/miscmenu.cpp:92
 #: src/emu/ui/slotopt.cpp:172
 msgid "Reset"
 msgstr ""
@@ -699,27 +699,27 @@ msgstr ""
 msgid "Machine Information"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:78
+#: src/emu/ui/mainmenu.cpp:80
 msgid "Image Information"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:81
+#: src/emu/ui/mainmenu.cpp:83
 msgid "File Manager"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:86
+#: src/emu/ui/mainmenu.cpp:92
 msgid "Tape Control"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:94
+#: src/emu/ui/mainmenu.cpp:99
 msgid "Bios Selection"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:100
+#: src/emu/ui/mainmenu.cpp:104
 msgid "Slot Devices"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:107
+#: src/emu/ui/mainmenu.cpp:109
 msgid "Barcode Reader"
 msgstr ""
 
@@ -727,43 +727,43 @@ msgstr ""
 msgid "Network Devices"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:119
+#: src/emu/ui/mainmenu.cpp:118
 msgid "Keyboard Mode"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:122
+#: src/emu/ui/mainmenu.cpp:121
 msgid "Slider Controls"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:125
+#: src/emu/ui/mainmenu.cpp:124
 msgid "Video Options"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:129
+#: src/emu/ui/mainmenu.cpp:128
 msgid "Crosshair Options"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:133
+#: src/emu/ui/mainmenu.cpp:132
 msgid "Cheat"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:136
+#: src/emu/ui/mainmenu.cpp:135
 msgid "Plugin Options"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:140
+#: src/emu/ui/mainmenu.cpp:139
 msgid "External DAT View"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:146
+#: src/emu/ui/mainmenu.cpp:145 src/emu/ui/miscmenu.cpp:785
 msgid "Add To Favorites"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:148
+#: src/emu/ui/mainmenu.cpp:147 src/emu/ui/miscmenu.cpp:787
 msgid "Remove From Favorites"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:155
+#: src/emu/ui/mainmenu.cpp:154
 msgid "Select New Machine"
 msgstr ""
 
@@ -803,189 +803,205 @@ msgstr ""
 msgid "Return to Previous Menu"
 msgstr ""
 
-#: src/emu/ui/menu.cpp:716
+#: src/emu/ui/menu.cpp:761
 msgid "Auto"
 msgstr ""
 
-#: src/emu/ui/menu.cpp:2133
+#: src/emu/ui/menu.cpp:2195
 msgid "Images"
 msgstr ""
 
-#: src/emu/ui/menu.cpp:2134
+#: src/emu/ui/menu.cpp:2196
 msgid "Infos"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Keyboard Mode:"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Natural"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Emulated"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:240
+#: src/emu/ui/miscmenu.cpp:241
 #, c-format
 msgid ""
 "Uptime: %1$d:%2$02d:%3$02d\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:242
+#: src/emu/ui/miscmenu.cpp:243
 #, c-format
 msgid ""
 "Uptime: %1$d:%2$02d\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:246
+#: src/emu/ui/miscmenu.cpp:247
 #, c-format
 msgid ""
 "Tickets dispensed: %1$d\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:257
+#: src/emu/ui/miscmenu.cpp:258
 msgid "Coin %1$c: NA%3$s\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:257
+#: src/emu/ui/miscmenu.cpp:258
 #, c-format
 msgid "Coin %1$c: %2$d%3$s\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:260
+#: src/emu/ui/miscmenu.cpp:261
 msgid " (locked)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:519
+#: src/emu/ui/miscmenu.cpp:520
 msgid "Visible Delay"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:617
+#: src/emu/ui/miscmenu.cpp:619
 #, c-format
 msgid "%s.xml saved under ui folder."
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:645
+#: src/emu/ui/miscmenu.cpp:647
 msgid "Name:             Description:\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:657
+#: src/emu/ui/miscmenu.cpp:659
 #, c-format
 msgid "%s.txt saved under ui folder."
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:675
-msgid "Export XML format (like -listxml)"
+#: src/emu/ui/miscmenu.cpp:677
+msgid "Export list in XML format (like -listxml)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:676
-msgid "Export TXT format (like -listfull)"
+#: src/emu/ui/miscmenu.cpp:678
+msgid "Export list in XML format (like -listxml, but exclude devices)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:734
-msgid "Dummy"
+#: src/emu/ui/miscmenu.cpp:679
+msgid "Export list in TXT format (like -listfull)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:736
-msgid "Save machine configuration"
-msgstr ""
-
-#: src/emu/ui/miscmenu.cpp:848 src/emu/ui/miscmenu.cpp:869
-#: src/emu/ui/selgame.cpp:594
-msgid "Plugins"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:218
-msgid "Filter"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:226
-msgid " ^!File"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:231
-msgid " ^!Category"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:254
-msgid "^!Setup custom filter"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:262
-msgid "Customize UI"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:263
-msgid "Configure Directories"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:266 src/emu/ui/sndmenu.cpp:151
-#: src/emu/ui/sndmenu.cpp:172
-msgid "Sound Options"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:269
-msgid "General Inputs"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:272
-msgid "Save Configuration"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:286 src/emu/ui/optsmenu.cpp:307
-msgid "Settings"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:327
-msgid "**Error saving ui.ini**"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:374
-#, c-format
-msgid "**Error saving %s.ini**"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:378
+#: src/emu/ui/miscmenu.cpp:729 src/emu/ui/optsmenu.cpp:376
 msgid ""
 "\n"
 "    Configuration saved    \n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/selector.cpp:166
+#: src/emu/ui/miscmenu.cpp:774
+msgid "Bios"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:776
+msgid "Driver"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:790
+msgid "Save machine configuration"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:806
+msgid "Configure machine:"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:868 src/emu/ui/selsoft.cpp:109
+msgid " (default)"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:953 src/emu/ui/miscmenu.cpp:973
+#: src/emu/ui/selgame.cpp:600
+msgid "Plugins"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:217
+msgid "Filter"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:225
+msgid " ^!File"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:230
+msgid " ^!Category"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:253
+msgid "^!Setup custom filter"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:261
+msgid "Customize UI"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:262
+msgid "Configure Directories"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:265 src/emu/ui/sndmenu.cpp:149
+#: src/emu/ui/sndmenu.cpp:169
+msgid "Sound Options"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:268
+msgid "General Inputs"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:271
+msgid "Save Configuration"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:285 src/emu/ui/optsmenu.cpp:305
+msgid "Settings"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:325
+msgid "**Error saving ui.ini**"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:372
+#, c-format
+msgid "**Error saving %s.ini**"
+msgstr ""
+
+#: src/emu/ui/selector.cpp:165
 msgid "Selection List - Search: "
 msgstr ""
 
-#: src/emu/ui/selector.cpp:196
+#: src/emu/ui/selector.cpp:194
 #, c-format
 msgid "Double click or press %1$s to select"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:39
+#: src/emu/ui/selgame.cpp:38
 msgid "General Info"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:374 src/emu/ui/selsoft.cpp:282
+#: src/emu/ui/selgame.cpp:380 src/emu/ui/selsoft.cpp:281
 #, c-format
 msgid ""
 "%s\n"
 " added to favorites list."
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:380 src/emu/ui/selgame.cpp:389
-#: src/emu/ui/selsoft.cpp:287
+#: src/emu/ui/selgame.cpp:386 src/emu/ui/selgame.cpp:395
+#: src/emu/ui/selsoft.cpp:286
 #, c-format
 msgid ""
 "%s\n"
 " removed from favorites list."
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:450
+#: src/emu/ui/selgame.cpp:457
 msgid ""
 "The selected machine is missing one or more required ROM or CHD images. "
 "Please select a different machine.\n"
@@ -993,275 +1009,275 @@ msgid ""
 "Press any key to continue."
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:589 src/emu/ui/simpleselgame.cpp:265
+#: src/emu/ui/selgame.cpp:595 src/emu/ui/simpleselgame.cpp:265
 msgid "Configure Options"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:752
+#: src/emu/ui/selgame.cpp:596
+msgid "Configure Machine"
+msgstr ""
+
+#: src/emu/ui/selgame.cpp:758
 #, c-format
 msgid "%1$s %2$s ( %3$d / %4$d machines (%5$d BIOS) )"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:762
+#: src/emu/ui/selgame.cpp:768
 #, c-format
 msgid "%1$s (%2$s - %3$s) - "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:769 src/emu/ui/selgame.cpp:775
+#: src/emu/ui/selgame.cpp:775 src/emu/ui/selgame.cpp:781
 #, c-format
 msgid "%1$s (%2$s) - "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:784
+#: src/emu/ui/selgame.cpp:790
 #, c-format
 msgid "%1$s Search: %2$s_"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:838
+#: src/emu/ui/selgame.cpp:844
 #, c-format
 msgid "Romset: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:841 src/emu/ui/selgame.cpp:890
-#: src/emu/ui/selsoft.cpp:751 src/emu/ui/selsoft.cpp:801
+#: src/emu/ui/selgame.cpp:847 src/emu/ui/selgame.cpp:896
+#: src/emu/ui/selsoft.cpp:750 src/emu/ui/selsoft.cpp:800
 #: src/emu/ui/simpleselgame.cpp:328
 #, c-format
 msgid "%1$s, %2$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:847 src/emu/ui/selsoft.cpp:757
+#: src/emu/ui/selgame.cpp:853 src/emu/ui/selsoft.cpp:756
 #, c-format
 msgid "Driver is clone of: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:849 src/emu/ui/selsoft.cpp:759
+#: src/emu/ui/selgame.cpp:855 src/emu/ui/selsoft.cpp:758
 msgid "Driver is parent"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:853 src/emu/ui/selsoft.cpp:763
+#: src/emu/ui/selgame.cpp:859 src/emu/ui/selsoft.cpp:762
 #: src/emu/ui/simpleselgame.cpp:335
 msgid "Overall: NOT WORKING"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:855 src/emu/ui/selsoft.cpp:765
+#: src/emu/ui/selgame.cpp:861 src/emu/ui/selsoft.cpp:764
 #: src/emu/ui/simpleselgame.cpp:337
 msgid "Overall: Unemulated Protection"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:857 src/emu/ui/selsoft.cpp:767
+#: src/emu/ui/selgame.cpp:863 src/emu/ui/selsoft.cpp:766
 #: src/emu/ui/simpleselgame.cpp:339
 msgid "Overall: Working"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:861 src/emu/ui/selsoft.cpp:771
+#: src/emu/ui/selgame.cpp:867 src/emu/ui/selsoft.cpp:770
 msgid "Graphics: Imperfect, "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:863 src/emu/ui/selsoft.cpp:773
+#: src/emu/ui/selgame.cpp:869 src/emu/ui/selsoft.cpp:772
 msgid "Graphics: OK, "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:866 src/emu/ui/selsoft.cpp:776
+#: src/emu/ui/selgame.cpp:872 src/emu/ui/selsoft.cpp:775
 msgid "Sound: Unimplemented"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:868 src/emu/ui/selsoft.cpp:778
+#: src/emu/ui/selgame.cpp:874 src/emu/ui/selsoft.cpp:777
 msgid "Sound: Imperfect"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:870 src/emu/ui/selsoft.cpp:780
+#: src/emu/ui/selgame.cpp:876 src/emu/ui/selsoft.cpp:779
 msgid "Sound: OK"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:887
+#: src/emu/ui/selgame.cpp:893
 #, c-format
 msgid "System: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:894 src/emu/ui/selsoft.cpp:805
+#: src/emu/ui/selgame.cpp:900 src/emu/ui/selsoft.cpp:804
 #, c-format
 msgid "Software is clone of: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:896 src/emu/ui/selsoft.cpp:807
+#: src/emu/ui/selgame.cpp:902 src/emu/ui/selsoft.cpp:806
 msgid "Software is parent"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:901 src/emu/ui/selsoft.cpp:812
+#: src/emu/ui/selgame.cpp:907 src/emu/ui/selsoft.cpp:811
 msgid "Supported: No"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:906 src/emu/ui/selsoft.cpp:817
+#: src/emu/ui/selgame.cpp:912 src/emu/ui/selsoft.cpp:816
 msgid "Supported: Partial"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:911 src/emu/ui/selsoft.cpp:822
+#: src/emu/ui/selgame.cpp:917 src/emu/ui/selsoft.cpp:821
 msgid "Supported: Yes"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:916 src/emu/ui/selsoft.cpp:827
+#: src/emu/ui/selgame.cpp:922 src/emu/ui/selsoft.cpp:826
 #, c-format
 msgid "romset: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:923
+#: src/emu/ui/selgame.cpp:929
 #, c-format
 msgid "%1$s %2$s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1535
+#: src/emu/ui/selgame.cpp:1543
 #, c-format
 msgid "Romset: %1$-.100s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1536
+#: src/emu/ui/selgame.cpp:1544
 #, c-format
 msgid "Year: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1537
+#: src/emu/ui/selgame.cpp:1545
 #, c-format
 msgid "Manufacturer: %1$-.100s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1541
+#: src/emu/ui/selgame.cpp:1549
 #, c-format
 msgid "Driver is Clone of: %1$-.100s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1543
+#: src/emu/ui/selgame.cpp:1551
 msgid "Driver is Parent\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1546
+#: src/emu/ui/selgame.cpp:1554
 msgid "Overall: NOT WORKING\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1548
+#: src/emu/ui/selgame.cpp:1556
 msgid "Overall: Unemulated Protection\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1550
+#: src/emu/ui/selgame.cpp:1558
 msgid "Overall: Working\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1553
+#: src/emu/ui/selgame.cpp:1561
 msgid "Graphics: Imperfect Colors\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1557
+#: src/emu/ui/selgame.cpp:1565
 msgid "Graphics: Imperfect\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1559
+#: src/emu/ui/selgame.cpp:1567
 msgid "Graphics: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1562
+#: src/emu/ui/selgame.cpp:1570
 msgid "Sound: Unimplemented\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1564
+#: src/emu/ui/selgame.cpp:1572
 msgid "Sound: Imperfect\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1566
+#: src/emu/ui/selgame.cpp:1574
 msgid "Sound: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1568
+#: src/emu/ui/selgame.cpp:1576
 #, c-format
 msgid "Driver is Skeleton: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1569
+#: src/emu/ui/selgame.cpp:1577
 #, c-format
 msgid "Game is Mechanical: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1570
+#: src/emu/ui/selgame.cpp:1578
 #, c-format
 msgid "Requires Artwork: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1571
+#: src/emu/ui/selgame.cpp:1579
 #, c-format
 msgid "Requires Clickable Artwork: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1572
+#: src/emu/ui/selgame.cpp:1580
 #, c-format
 msgid "Support Cocktail: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1573
+#: src/emu/ui/selgame.cpp:1581
 #, c-format
 msgid "Driver is Bios: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1574
+#: src/emu/ui/selgame.cpp:1582
 #, c-format
 msgid "Support Save: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 #, c-format
 msgid "Screen Orientation: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 msgid "Vertical"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 msgid "Horizontal"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/selgame.cpp:1591
 #, c-format
 msgid "Requires CHD: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1596
+#: src/emu/ui/selgame.cpp:1604
 msgid "Roms Audit Pass: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1598
+#: src/emu/ui/selgame.cpp:1606
 msgid "Roms Audit Pass: BAD\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1601
+#: src/emu/ui/selgame.cpp:1609
 msgid "Samples Audit Pass: None Needed\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1603
+#: src/emu/ui/selgame.cpp:1611
 msgid "Samples Audit Pass: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1605
+#: src/emu/ui/selgame.cpp:1613
 msgid "Samples Audit Pass: BAD\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1608
+#: src/emu/ui/selgame.cpp:1616
 msgid ""
 "Roms Audit Pass: Disabled\n"
 "Samples Audit Pass: Disabled\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:2049 src/emu/ui/selgame.cpp:2212
-#: src/emu/ui/selsoft.cpp:1662
+#: src/emu/ui/selgame.cpp:2055 src/emu/ui/selgame.cpp:2216
+#: src/emu/ui/selsoft.cpp:1655
 msgid "No Infos Available"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:2162 src/emu/ui/selsoft.cpp:1607
+#: src/emu/ui/selgame.cpp:2168 src/emu/ui/selsoft.cpp:1602
 msgid "Usage"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:110
-msgid " (default)"
-msgstr ""
-
-#: src/emu/ui/selsoft.cpp:381
+#: src/emu/ui/selsoft.cpp:380
 msgid ""
 "The selected software is missing one or more required files. Please select a "
 "different software.\n"
@@ -1269,57 +1285,57 @@ msgid ""
 "Press any key to continue."
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:684
+#: src/emu/ui/selsoft.cpp:683
 #, c-format
-msgid "%1$s %2$s ( %3$d / %4$d softwares )"
+msgid "%1$s %2$s ( %3$d / %4$d software packages )"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:685
+#: src/emu/ui/selsoft.cpp:684
 #, c-format
 msgid "Driver: \"%1$s\" software list "
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:688
+#: src/emu/ui/selsoft.cpp:687
 #, c-format
 msgid "Region: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:690
+#: src/emu/ui/selsoft.cpp:689
 #, c-format
 msgid "Publisher: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:692
+#: src/emu/ui/selsoft.cpp:691
 #, c-format
 msgid "Year: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:694
+#: src/emu/ui/selsoft.cpp:693
 #, c-format
 msgid "Software List: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:696
+#: src/emu/ui/selsoft.cpp:695
 #, c-format
 msgid "Device type: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:698
+#: src/emu/ui/selsoft.cpp:697
 #, c-format
 msgid "%s Search: %s_"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:748 src/emu/ui/selsoft.cpp:798
+#: src/emu/ui/selsoft.cpp:747 src/emu/ui/selsoft.cpp:797
 #: src/emu/ui/simpleselgame.cpp:325
 #, c-format
 msgid "%1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:1998 src/emu/ui/selsoft.cpp:2018
+#: src/emu/ui/selsoft.cpp:1991 src/emu/ui/selsoft.cpp:2011
 msgid "Software part selection:"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:2136 src/emu/ui/selsoft.cpp:2156
+#: src/emu/ui/selsoft.cpp:2129 src/emu/ui/selsoft.cpp:2149
 msgid "Bios selection:"
 msgstr ""
 
@@ -1367,15 +1383,15 @@ msgstr ""
 msgid " [internal]"
 msgstr ""
 
-#: src/emu/ui/sndmenu.cpp:135
+#: src/emu/ui/sndmenu.cpp:133
 msgid "Sound"
 msgstr ""
 
-#: src/emu/ui/sndmenu.cpp:136
+#: src/emu/ui/sndmenu.cpp:134
 msgid "Sample Rate"
 msgstr ""
 
-#: src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/sndmenu.cpp:135
 msgid "Use External Samples"
 msgstr ""
 
@@ -1444,80 +1460,80 @@ msgstr ""
 msgid "Fast Forward"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:419
+#: src/emu/ui/ui.cpp:418
 msgid "This driver requires images to be loaded in the following device(s): "
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1074
+#: src/emu/ui/ui.cpp:1071
 msgid ""
 "One or more ROMs/CHDs for this machine are incorrect. The machine may not "
 "run correctly.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1087
+#: src/emu/ui/ui.cpp:1084
 msgid ""
 "There are known problems with this machine\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1091
+#: src/emu/ui/ui.cpp:1088
 msgid ""
 "One or more ROMs/CHDs for this machine have not been correctly dumped.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1095
+#: src/emu/ui/ui.cpp:1092
 #, c-format
 msgid "The keyboard emulation may not be 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1097
+#: src/emu/ui/ui.cpp:1094
 #, c-format
 msgid "The colors aren't 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1099
+#: src/emu/ui/ui.cpp:1096
 msgid "The colors are completely wrong.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1101
+#: src/emu/ui/ui.cpp:1098
 #, c-format
 msgid "The video emulation isn't 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1103
+#: src/emu/ui/ui.cpp:1100
 #, c-format
 msgid "The sound emulation isn't 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1105
+#: src/emu/ui/ui.cpp:1102
 msgid "The machine lacks sound.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1108
+#: src/emu/ui/ui.cpp:1105
 msgid "Screen flipping in cocktail mode is not supported.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1112
+#: src/emu/ui/ui.cpp:1109
 msgid "The machine requires external artwork files\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1117
+#: src/emu/ui/ui.cpp:1114
 msgid ""
 "This machine was never completed. It may exhibit strange behavior or missing "
 "elements that are not bugs in the emulation.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1122
+#: src/emu/ui/ui.cpp:1119
 msgid ""
 "This machine has no sound hardware, MAME will produce no sounds, this is "
 "expected behaviour.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1130
+#: src/emu/ui/ui.cpp:1127
 msgid "The machine has protection which isn't fully emulated.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1133
+#: src/emu/ui/ui.cpp:1130
 msgid ""
 "\n"
 "THIS MACHINE DOESN'T WORK. The emulation for this machine is not yet "
@@ -1525,7 +1541,7 @@ msgid ""
 "the developers to improve the emulation.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1137
+#: src/emu/ui/ui.cpp:1134
 msgid ""
 "\n"
 "Certain elements of this machine cannot be emulated as it requires actual "
@@ -1533,21 +1549,21 @@ msgid ""
 "to fully play this machine.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1156
+#: src/emu/ui/ui.cpp:1153
 msgid ""
 "\n"
 "\n"
 "There are working clones of this machine: "
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1170
+#: src/emu/ui/ui.cpp:1167
 msgid ""
 "\n"
 "\n"
 "Press any key to continue"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1185
+#: src/emu/ui/ui.cpp:1182
 #, c-format
 msgid ""
 "%1$s\n"
@@ -1557,98 +1573,98 @@ msgid ""
 "CPU:\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1221 src/emu/ui/ui.cpp:1260
+#: src/emu/ui/ui.cpp:1218 src/emu/ui/ui.cpp:1257
 msgid "MHz"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1221 src/emu/ui/ui.cpp:1260
+#: src/emu/ui/ui.cpp:1218 src/emu/ui/ui.cpp:1257
 msgid "kHz"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1235
+#: src/emu/ui/ui.cpp:1232
 msgid ""
 "\n"
 "Sound:\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1264
+#: src/emu/ui/ui.cpp:1261
 msgid ""
 "\n"
 "Video:\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1268
+#: src/emu/ui/ui.cpp:1265
 msgid "None\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1275
+#: src/emu/ui/ui.cpp:1272
 msgid "Vector"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1286
+#: src/emu/ui/ui.cpp:1283
 #, c-format
 msgid "%1$s: %2$s\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1286
+#: src/emu/ui/ui.cpp:1283
 msgid "%2$s\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1541 src/emu/ui/ui.cpp:1551
+#: src/emu/ui/ui.cpp:1538 src/emu/ui/ui.cpp:1548
 msgid "Keyboard Emulation Status"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1543
+#: src/emu/ui/ui.cpp:1540
 msgid "Mode: PARTIAL Emulation"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1544
+#: src/emu/ui/ui.cpp:1541
 msgid "UI:   Enabled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1546 src/emu/ui/ui.cpp:1556
+#: src/emu/ui/ui.cpp:1543 src/emu/ui/ui.cpp:1553
 msgid "**Use ScrLock to toggle**"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1553
+#: src/emu/ui/ui.cpp:1550
 msgid "Mode: FULL Emulation"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1554
+#: src/emu/ui/ui.cpp:1551
 msgid "UI:   Disabled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1692
+#: src/emu/ui/ui.cpp:1689
 msgid "Autofire can't be enabled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1731
+#: src/emu/ui/ui.cpp:1728
 msgid "Select position to save to"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1733
+#: src/emu/ui/ui.cpp:1730
 msgid "Select position to load from"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1757
+#: src/emu/ui/ui.cpp:1754
 msgid "Save cancelled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1759
+#: src/emu/ui/ui.cpp:1756
 msgid "Load cancelled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1802
+#: src/emu/ui/ui.cpp:1799
 #, c-format
 msgid "Save to position %s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1807
+#: src/emu/ui/ui.cpp:1804
 #, c-format
 msgid "Load from position %s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1847
+#: src/emu/ui/ui.cpp:1844
 #, c-format
 msgid ""
 "Are you sure you want to quit?\n"
@@ -1657,173 +1673,173 @@ msgid ""
 "Press ''%2$s'' to return to emulation."
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1917
+#: src/emu/ui/ui.cpp:1914
 msgid "Master Volume"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1926
+#: src/emu/ui/ui.cpp:1923
 #, c-format
 msgid "%1$s Volume"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1949
+#: src/emu/ui/ui.cpp:1946
 #, c-format
 msgid "Overclock CPU %1$s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1968
+#: src/emu/ui/ui.cpp:1965
 #, c-format
 msgid "%1$s Refresh Rate"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1973
+#: src/emu/ui/ui.cpp:1970
 #, c-format
 msgid "%1$s Brightness"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1975
+#: src/emu/ui/ui.cpp:1972
 #, c-format
 msgid "%1$s Contrast"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1977
+#: src/emu/ui/ui.cpp:1974
 #, c-format
 msgid "%1$s Gamma"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1981
+#: src/emu/ui/ui.cpp:1978
 #, c-format
 msgid "%1$s Horiz Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1983
+#: src/emu/ui/ui.cpp:1980
 #, c-format
 msgid "%1$s Horiz Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1985
+#: src/emu/ui/ui.cpp:1982
 #, c-format
 msgid "%1$s Vert Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1987
+#: src/emu/ui/ui.cpp:1984
 #, c-format
 msgid "%1$s Vert Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2005
+#: src/emu/ui/ui.cpp:2002
 #, c-format
 msgid "Laserdisc '%1$s' Horiz Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2007
+#: src/emu/ui/ui.cpp:2004
 #, c-format
 msgid "Laserdisc '%1$s' Horiz Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2009
+#: src/emu/ui/ui.cpp:2006
 #, c-format
 msgid "Laserdisc '%1$s' Vert Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2011
+#: src/emu/ui/ui.cpp:2008
 #, c-format
 msgid "Laserdisc '%1$s' Vert Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2021
+#: src/emu/ui/ui.cpp:2018
 msgid "Vector Flicker"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2022
+#: src/emu/ui/ui.cpp:2019
 msgid "Beam Width Minimum"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2023
+#: src/emu/ui/ui.cpp:2020
 msgid "Beam Width Maximum"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2024
+#: src/emu/ui/ui.cpp:2021
 msgid "Beam Intensity Weight"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2037
+#: src/emu/ui/ui.cpp:2034
 #, c-format
 msgid "Crosshair Scale %1$s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2037 src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2034 src/emu/ui/ui.cpp:2036
 msgid "X"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2037 src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2034 src/emu/ui/ui.cpp:2036
 msgid "Y"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2036
 #, c-format
 msgid "Crosshair Offset %1$s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2071
+#: src/emu/ui/ui.cpp:2068
 #, c-format
 msgid "%1$3ddB"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2115
+#: src/emu/ui/ui.cpp:2112
 #, c-format
 msgid "%1$d%%"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2131
+#: src/emu/ui/ui.cpp:2128
 #, c-format
 msgid "%1$3.0f%%"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2154
+#: src/emu/ui/ui.cpp:2151
 #, c-format
 msgid "%1$.3ffps"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2177 src/emu/ui/ui.cpp:2199 src/emu/ui/ui.cpp:2220
-#: src/emu/ui/ui.cpp:2242 src/emu/ui/ui.cpp:2264 src/emu/ui/ui.cpp:2286
-#: src/emu/ui/ui.cpp:2308 src/emu/ui/ui.cpp:2330 src/emu/ui/ui.cpp:2352
-#: src/emu/ui/ui.cpp:2374 src/emu/ui/ui.cpp:2396
+#: src/emu/ui/ui.cpp:2174 src/emu/ui/ui.cpp:2196 src/emu/ui/ui.cpp:2217
+#: src/emu/ui/ui.cpp:2239 src/emu/ui/ui.cpp:2261 src/emu/ui/ui.cpp:2283
+#: src/emu/ui/ui.cpp:2305 src/emu/ui/ui.cpp:2327 src/emu/ui/ui.cpp:2349
+#: src/emu/ui/ui.cpp:2371 src/emu/ui/ui.cpp:2393
 #, c-format
 msgid "%1$.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2412 src/emu/ui/ui.cpp:2428 src/emu/ui/ui.cpp:2444
-#: src/emu/ui/ui.cpp:2460
+#: src/emu/ui/ui.cpp:2408 src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2438
+#: src/emu/ui/ui.cpp:2453
 #, c-format
 msgid "%1$1.2f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2476
+#: src/emu/ui/ui.cpp:2469
 #, c-format
 msgid "Screen '%1$s'"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2478
+#: src/emu/ui/ui.cpp:2471
 msgid "Screen"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2494
+#: src/emu/ui/ui.cpp:2487
 #, c-format
 msgid "Crosshair Scale X %1$1.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2494
+#: src/emu/ui/ui.cpp:2487
 #, c-format
 msgid "Crosshair Scale Y %1$1.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2513
+#: src/emu/ui/ui.cpp:2506
 #, c-format
 msgid "Crosshair Offset X %1$1.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2513
+#: src/emu/ui/ui.cpp:2506
 #, c-format
 msgid "Crosshair Offset Y %1$1.3f"
 msgstr ""
@@ -1865,10 +1881,10 @@ msgstr ""
 msgid "Full"
 msgstr ""
 
-#: src/emu/ui/viewgfx.cpp:392
+#: src/emu/ui/viewgfx.cpp:391
 msgid " COLORS"
 msgstr ""
 
-#: src/emu/ui/viewgfx.cpp:392
+#: src/emu/ui/viewgfx.cpp:391
 msgid " PENS"
 msgstr ""
diff --git a/language/Czech/strings.po b/language/Czech/strings.po
index e053a5d2564..48fdf96d310 100644
--- a/language/Czech/strings.po
+++ b/language/Czech/strings.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MAME\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-11 03:33+0200\n"
+"POT-Creation-Date: 2016-04-15 17:42+0200\n"
 "PO-Revision-Date: 2016-04-01 16:38+0200\n"
 "Last-Translator: Karel Brejcha <pankabre@gmail.com>\n"
 "Language-Team: MAME Language Team\n"
@@ -63,14 +63,14 @@ msgstr "Znovu načíst vše"
 msgid "Autofire Status"
 msgstr "Stav automatické střelby"
 
-#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1698
+#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1695
 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211
 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219
 #: src/emu/ui/videoopt.cpp:223
 msgid "Disabled"
 msgstr "Deaktivováno"
 
-#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1698
+#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1695
 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211
 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219
 #: src/emu/ui/videoopt.cpp:223
@@ -78,14 +78,14 @@ msgid "Enabled"
 msgstr "Aktivováno"
 
 #: src/emu/ui/cheatopt.cpp:282 src/emu/ui/cheatopt.cpp:288
-#: src/emu/ui/menu.cpp:710 src/emu/ui/miscmenu.cpp:831
-#: src/emu/ui/sndmenu.cpp:135 src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/menu.cpp:755 src/emu/ui/miscmenu.cpp:936
+#: src/emu/ui/sndmenu.cpp:133 src/emu/ui/sndmenu.cpp:135
 msgid "On"
 msgstr "Zapnuto"
 
 #: src/emu/ui/cheatopt.cpp:282 src/emu/ui/cheatopt.cpp:288
-#: src/emu/ui/menu.cpp:713 src/emu/ui/miscmenu.cpp:831
-#: src/emu/ui/sndmenu.cpp:135 src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/menu.cpp:758 src/emu/ui/miscmenu.cpp:936
+#: src/emu/ui/sndmenu.cpp:133 src/emu/ui/sndmenu.cpp:135
 msgid "Off"
 msgstr "Vypnuto"
 
@@ -97,317 +97,317 @@ msgstr "Žádná tlačítka na tomto zařízení nenalezena!"
 msgid "Autofire Delay"
 msgstr "Zpoždění autostřelby"
 
-#: src/emu/ui/custmenu.cpp:158 src/emu/ui/custmenu.cpp:447
+#: src/emu/ui/custmenu.cpp:157 src/emu/ui/custmenu.cpp:445
 msgid "Main filter"
 msgstr "Základní filtr"
 
-#: src/emu/ui/custmenu.cpp:167 src/emu/ui/custmenu.cpp:456
+#: src/emu/ui/custmenu.cpp:166 src/emu/ui/custmenu.cpp:454
 msgid "Other filter"
 msgstr "Další filtr"
 
-#: src/emu/ui/custmenu.cpp:176 src/emu/ui/optsmenu.cpp:239
+#: src/emu/ui/custmenu.cpp:175 src/emu/ui/optsmenu.cpp:238
 msgid "^!Manufacturer"
 msgstr "^!Výrobce"
 
-#: src/emu/ui/custmenu.cpp:185 src/emu/ui/custmenu.cpp:474
-#: src/emu/ui/optsmenu.cpp:247
+#: src/emu/ui/custmenu.cpp:184 src/emu/ui/custmenu.cpp:472
+#: src/emu/ui/optsmenu.cpp:246
 msgid "^!Year"
 msgstr "^!Rok"
 
-#: src/emu/ui/custmenu.cpp:194 src/emu/ui/custmenu.cpp:510
+#: src/emu/ui/custmenu.cpp:193 src/emu/ui/custmenu.cpp:508
 msgid "Remove last filter"
 msgstr "Odstranit poslední filtr"
 
-#: src/emu/ui/custmenu.cpp:197 src/emu/ui/custmenu.cpp:513
+#: src/emu/ui/custmenu.cpp:196 src/emu/ui/custmenu.cpp:511
 msgid "Add filter"
 msgstr "Přidat filtr"
 
-#: src/emu/ui/custmenu.cpp:212 src/emu/ui/custmenu.cpp:233
-#: src/emu/ui/custmenu.cpp:529 src/emu/ui/custmenu.cpp:550
+#: src/emu/ui/custmenu.cpp:211 src/emu/ui/custmenu.cpp:231
+#: src/emu/ui/custmenu.cpp:527 src/emu/ui/custmenu.cpp:547
 msgid "Select custom filters:"
 msgstr "Vyber uživatelský filtr:"
 
-#: src/emu/ui/custmenu.cpp:465
+#: src/emu/ui/custmenu.cpp:463
 msgid "^!Publisher"
 msgstr "^!Vydavatel"
 
-#: src/emu/ui/custmenu.cpp:483
+#: src/emu/ui/custmenu.cpp:481
 msgid "^!Software List"
 msgstr "^!Software List"
 
-#: src/emu/ui/custmenu.cpp:492
+#: src/emu/ui/custmenu.cpp:490
 msgid "^!Device type"
 msgstr "^!Typ zařízení"
 
-#: src/emu/ui/custmenu.cpp:501
+#: src/emu/ui/custmenu.cpp:499
 msgid "^!Region"
 msgstr "^!Region"
 
-#: src/emu/ui/custui.cpp:23
+#: src/emu/ui/custui.cpp:22
 msgid "Show All"
 msgstr "Zobrazit vše"
 
-#: src/emu/ui/custui.cpp:24
+#: src/emu/ui/custui.cpp:23
 msgid "Hide Filters"
 msgstr "Skrýt filtry"
 
-#: src/emu/ui/custui.cpp:25
+#: src/emu/ui/custui.cpp:24
 msgid "Hide Info/Image"
 msgstr "Skrýt info/obrázek"
 
-#: src/emu/ui/custui.cpp:26
+#: src/emu/ui/custui.cpp:25
 msgid "Hide Both"
 msgstr "Skrýt obojí"
 
-#: src/emu/ui/custui.cpp:142
+#: src/emu/ui/custui.cpp:141
 msgid "Fonts"
 msgstr "Písma"
 
-#: src/emu/ui/custui.cpp:143
+#: src/emu/ui/custui.cpp:142
 msgid "Colors"
 msgstr "Barvy"
 
-#: src/emu/ui/custui.cpp:148 src/emu/ui/dirmenu.cpp:33
+#: src/emu/ui/custui.cpp:147 src/emu/ui/dirmenu.cpp:33
 msgid "Language"
 msgstr "Jazyk"
 
-#: src/emu/ui/custui.cpp:152
+#: src/emu/ui/custui.cpp:151
 msgid "Show side panels"
 msgstr "Zobraz postranní panely"
 
-#: src/emu/ui/custui.cpp:167 src/emu/ui/custui.cpp:188
+#: src/emu/ui/custui.cpp:166 src/emu/ui/custui.cpp:186
 msgid "Custom UI Settings"
 msgstr "Uživatelská nastavení UI"
 
-#: src/emu/ui/custui.cpp:246
+#: src/emu/ui/custui.cpp:244
 msgid "default"
 msgstr "standardní"
 
-#: src/emu/ui/custui.cpp:349
+#: src/emu/ui/custui.cpp:347
 msgid "UI Font"
 msgstr "UI Písmo"
 
-#: src/emu/ui/custui.cpp:354
+#: src/emu/ui/custui.cpp:352
 msgid "Bold"
 msgstr "Tučné"
 
-#: src/emu/ui/custui.cpp:355
+#: src/emu/ui/custui.cpp:353
 msgid "Italic"
 msgstr "Kurzíva"
 
-#: src/emu/ui/custui.cpp:360
+#: src/emu/ui/custui.cpp:358
 msgid "Lines"
 msgstr "Linie"
 
-#: src/emu/ui/custui.cpp:366
+#: src/emu/ui/custui.cpp:364
 msgid "Infos text size"
 msgstr "Velikost info textů"
 
-#: src/emu/ui/custui.cpp:383
+#: src/emu/ui/custui.cpp:381
 msgid "UI Fonts Settings"
 msgstr "Nastavení písma UI"
 
-#: src/emu/ui/custui.cpp:411
+#: src/emu/ui/custui.cpp:408
 msgid "Sample text - Lorem ipsum dolor sit amet, consectetur adipiscing elit."
 msgstr ""
 "Ukázkový text - Lorem ipsum dolor sit amet, consectetur adipiscing elit."
 
-#: src/emu/ui/custui.cpp:509
+#: src/emu/ui/custui.cpp:506
 msgid "Normal text"
 msgstr "Normální text"
 
-#: src/emu/ui/custui.cpp:510
+#: src/emu/ui/custui.cpp:507
 msgid "Selected color"
 msgstr "Vybraná barva"
 
-#: src/emu/ui/custui.cpp:511
+#: src/emu/ui/custui.cpp:508
 msgid "Normal text background"
 msgstr "Pozadí normálního textu"
 
-#: src/emu/ui/custui.cpp:512
+#: src/emu/ui/custui.cpp:509
 msgid "Selected background color"
 msgstr "Barva pozadí vybraného textu"
 
-#: src/emu/ui/custui.cpp:513
+#: src/emu/ui/custui.cpp:510
 msgid "Subitem color"
 msgstr "Barva podpoložky"
 
-#: src/emu/ui/custui.cpp:514 src/emu/ui/custui.cpp:610
+#: src/emu/ui/custui.cpp:511 src/emu/ui/custui.cpp:606
 msgid "Clone"
 msgstr "Klon"
 
-#: src/emu/ui/custui.cpp:515
+#: src/emu/ui/custui.cpp:512
 msgid "Border"
 msgstr "Okraj"
 
-#: src/emu/ui/custui.cpp:516
+#: src/emu/ui/custui.cpp:513
 msgid "Background"
 msgstr "Pozadí"
 
-#: src/emu/ui/custui.cpp:517
+#: src/emu/ui/custui.cpp:514
 msgid "Dipswitch"
 msgstr "DIP přepínač"
 
-#: src/emu/ui/custui.cpp:518
+#: src/emu/ui/custui.cpp:515
 msgid "Unavailable color"
 msgstr "Barva nedostupné položky"
 
-#: src/emu/ui/custui.cpp:519
+#: src/emu/ui/custui.cpp:516
 msgid "Slider color"
 msgstr "Barva posuvníku"
 
-#: src/emu/ui/custui.cpp:520
+#: src/emu/ui/custui.cpp:517
 msgid "Gfx viewer background"
 msgstr "Pozadí Gfx prohlížeče"
 
-#: src/emu/ui/custui.cpp:521
+#: src/emu/ui/custui.cpp:518
 msgid "Mouse over color"
 msgstr "Barva při přejetí myši"
 
-#: src/emu/ui/custui.cpp:522
+#: src/emu/ui/custui.cpp:519
 msgid "Mouse over background color"
 msgstr "Barva pozadí při přejetí myši"
 
-#: src/emu/ui/custui.cpp:523
+#: src/emu/ui/custui.cpp:520
 msgid "Mouse down color"
 msgstr "Barva při stisku myši"
 
-#: src/emu/ui/custui.cpp:524
+#: src/emu/ui/custui.cpp:521
 msgid "Mouse down background color"
 msgstr "Barva pozadí při stisku myši"
 
-#: src/emu/ui/custui.cpp:527
+#: src/emu/ui/custui.cpp:524
 msgid "Restore originals colors"
 msgstr "Obnovit původní barvy"
 
-#: src/emu/ui/custui.cpp:543
+#: src/emu/ui/custui.cpp:540
 msgid "UI Colors Settings"
 msgstr "Nastavení barev UI"
 
-#: src/emu/ui/custui.cpp:572
+#: src/emu/ui/custui.cpp:568
 #, c-format
 msgid "Double click or press %1$s to change the color value"
 msgstr "Dvojklik nebo stisk %1$s pro změnu barvy"
 
-#: src/emu/ui/custui.cpp:598
+#: src/emu/ui/custui.cpp:594
 msgid "Menu Preview"
 msgstr "Menu náhled"
 
-#: src/emu/ui/custui.cpp:606
+#: src/emu/ui/custui.cpp:602
 msgid "Normal"
 msgstr "Normální"
 
-#: src/emu/ui/custui.cpp:607
+#: src/emu/ui/custui.cpp:603
 msgid "Subitem"
 msgstr "Podpoložka"
 
-#: src/emu/ui/custui.cpp:608
+#: src/emu/ui/custui.cpp:604
 msgid "Selected"
 msgstr "Vybraný"
 
-#: src/emu/ui/custui.cpp:609
+#: src/emu/ui/custui.cpp:605
 msgid "Mouse Over"
 msgstr "Přejetí myši"
 
-#: src/emu/ui/custui.cpp:841 src/emu/ui/custui.cpp:844
+#: src/emu/ui/custui.cpp:837 src/emu/ui/custui.cpp:840
 msgid "Alpha"
 msgstr "Průhlednost"
 
-#: src/emu/ui/custui.cpp:849 src/emu/ui/custui.cpp:852
-#: src/emu/ui/custui.cpp:1013
+#: src/emu/ui/custui.cpp:845 src/emu/ui/custui.cpp:848
+#: src/emu/ui/custui.cpp:1007
 msgid "Red"
 msgstr "Červená"
 
-#: src/emu/ui/custui.cpp:857 src/emu/ui/custui.cpp:860
-#: src/emu/ui/custui.cpp:1016
+#: src/emu/ui/custui.cpp:853 src/emu/ui/custui.cpp:856
+#: src/emu/ui/custui.cpp:1010
 msgid "Green"
 msgstr "Zelená"
 
-#: src/emu/ui/custui.cpp:865 src/emu/ui/custui.cpp:868
-#: src/emu/ui/custui.cpp:1017
+#: src/emu/ui/custui.cpp:861 src/emu/ui/custui.cpp:864
+#: src/emu/ui/custui.cpp:1011
 msgid "Blue"
 msgstr "Modrá"
 
-#: src/emu/ui/custui.cpp:871
+#: src/emu/ui/custui.cpp:867
 msgid "Choose from palette"
 msgstr "Výběr z palety"
 
-#: src/emu/ui/custui.cpp:887
+#: src/emu/ui/custui.cpp:883
 msgid " - ARGB Settings"
 msgstr " - ARGB nastavení"
 
-#: src/emu/ui/custui.cpp:912
+#: src/emu/ui/custui.cpp:907
 msgid "Color preview ="
 msgstr "Barevný náhled ="
 
-#: src/emu/ui/custui.cpp:1009
+#: src/emu/ui/custui.cpp:1003
 msgid "White"
 msgstr "Bílá"
 
-#: src/emu/ui/custui.cpp:1010
+#: src/emu/ui/custui.cpp:1004
 msgid "Silver"
 msgstr "Stříbrná"
 
-#: src/emu/ui/custui.cpp:1011
+#: src/emu/ui/custui.cpp:1005
 msgid "Gray"
 msgstr "Šedá"
 
-#: src/emu/ui/custui.cpp:1012
+#: src/emu/ui/custui.cpp:1006
 msgid "Black"
 msgstr "Černá"
 
-#: src/emu/ui/custui.cpp:1014
+#: src/emu/ui/custui.cpp:1008
 msgid "Orange"
 msgstr "Oranžová"
 
-#: src/emu/ui/custui.cpp:1015
+#: src/emu/ui/custui.cpp:1009
 msgid "Yellow"
 msgstr "Žlutá"
 
-#: src/emu/ui/custui.cpp:1018
+#: src/emu/ui/custui.cpp:1012
 msgid "Violet"
 msgstr "Fialová"
 
-#: src/emu/ui/datmenu.cpp:65
+#: src/emu/ui/datmenu.cpp:64
 msgid "Software History"
 msgstr "Software historie"
 
-#: src/emu/ui/datmenu.cpp:67
+#: src/emu/ui/datmenu.cpp:66
 msgid "Software Usage"
 msgstr "Software použití"
 
-#: src/emu/ui/datmenu.cpp:199
+#: src/emu/ui/datmenu.cpp:196
 msgid "Revision: "
 msgstr "Verze: "
 
-#: src/emu/ui/datmenu.cpp:287 src/emu/ui/selgame.cpp:40
-#: src/emu/ui/selgame.cpp:2152 src/emu/ui/selgame.cpp:2161
-#: src/emu/ui/selsoft.cpp:1577 src/emu/ui/selsoft.cpp:1597
-#: src/emu/ui/selsoft.cpp:1606
+#: src/emu/ui/datmenu.cpp:284 src/emu/ui/selgame.cpp:39
+#: src/emu/ui/selgame.cpp:2158 src/emu/ui/selgame.cpp:2167
+#: src/emu/ui/selsoft.cpp:1574 src/emu/ui/selsoft.cpp:1592
+#: src/emu/ui/selsoft.cpp:1601
 msgid "History"
 msgstr "Historie"
 
-#: src/emu/ui/datmenu.cpp:289 src/emu/ui/selgame.cpp:41
+#: src/emu/ui/datmenu.cpp:286 src/emu/ui/selgame.cpp:40
 msgid "Mameinfo"
 msgstr "Mameinfo"
 
-#: src/emu/ui/datmenu.cpp:291 src/emu/ui/selgame.cpp:43
+#: src/emu/ui/datmenu.cpp:288 src/emu/ui/selgame.cpp:42
 msgid "Messinfo"
 msgstr "Messinfo"
 
-#: src/emu/ui/datmenu.cpp:293 src/emu/ui/selgame.cpp:42
+#: src/emu/ui/datmenu.cpp:290 src/emu/ui/selgame.cpp:41
 msgid "Sysinfo"
 msgstr "Sysinfo"
 
-#: src/emu/ui/datmenu.cpp:295 src/emu/ui/selgame.cpp:46
+#: src/emu/ui/datmenu.cpp:292 src/emu/ui/selgame.cpp:45
 msgid "Mamescore"
 msgstr "Mameskóre"
 
-#: src/emu/ui/datmenu.cpp:297 src/emu/ui/selgame.cpp:45
+#: src/emu/ui/datmenu.cpp:294 src/emu/ui/selgame.cpp:44
 msgid "Gameinit"
 msgstr "Gameinit"
 
-#: src/emu/ui/datmenu.cpp:299 src/emu/ui/selgame.cpp:44
+#: src/emu/ui/datmenu.cpp:296 src/emu/ui/selgame.cpp:43
 msgid "Command"
 msgstr "Příkaz"
 
@@ -559,75 +559,75 @@ msgstr "Stiskni TAB pro nastavení"
 msgid "Remove %1$s Folder"
 msgstr "Odstranit %1$s Složku"
 
-#: src/emu/ui/filesel.cpp:158
+#: src/emu/ui/filesel.cpp:161
 msgid "File Already Exists - Override?"
 msgstr "Soubor již existuje - Přepsat?"
 
-#: src/emu/ui/filesel.cpp:160 src/emu/ui/selgame.cpp:1568
-#: src/emu/ui/selgame.cpp:1569 src/emu/ui/selgame.cpp:1570
-#: src/emu/ui/selgame.cpp:1571 src/emu/ui/selgame.cpp:1572
-#: src/emu/ui/selgame.cpp:1573 src/emu/ui/selgame.cpp:1574
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/filesel.cpp:163 src/emu/ui/selgame.cpp:1576
+#: src/emu/ui/selgame.cpp:1577 src/emu/ui/selgame.cpp:1578
+#: src/emu/ui/selgame.cpp:1579 src/emu/ui/selgame.cpp:1580
+#: src/emu/ui/selgame.cpp:1581 src/emu/ui/selgame.cpp:1582
+#: src/emu/ui/selgame.cpp:1591
 msgid "No"
 msgstr "Ne"
 
-#: src/emu/ui/filesel.cpp:161 src/emu/ui/selgame.cpp:1568
-#: src/emu/ui/selgame.cpp:1569 src/emu/ui/selgame.cpp:1570
-#: src/emu/ui/selgame.cpp:1571 src/emu/ui/selgame.cpp:1572
-#: src/emu/ui/selgame.cpp:1573 src/emu/ui/selgame.cpp:1574
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/filesel.cpp:164 src/emu/ui/selgame.cpp:1576
+#: src/emu/ui/selgame.cpp:1577 src/emu/ui/selgame.cpp:1578
+#: src/emu/ui/selgame.cpp:1579 src/emu/ui/selgame.cpp:1580
+#: src/emu/ui/selgame.cpp:1581 src/emu/ui/selgame.cpp:1582
+#: src/emu/ui/selgame.cpp:1591
 msgid "Yes"
 msgstr "Ano"
 
-#: src/emu/ui/filesel.cpp:272
+#: src/emu/ui/filesel.cpp:275
 msgid "New Image Name:"
 msgstr "Nové jméno obrázku:"
 
-#: src/emu/ui/filesel.cpp:278
+#: src/emu/ui/filesel.cpp:281
 msgid "Image Format:"
 msgstr "Formát obrázku:"
 
-#: src/emu/ui/filesel.cpp:284
+#: src/emu/ui/filesel.cpp:287
 msgid "Create"
 msgstr "Vytvořit"
 
-#: src/emu/ui/filesel.cpp:315
+#: src/emu/ui/filesel.cpp:318
 msgid "Please enter a file extension too"
 msgstr "Prosím vložte i příponu souboru"
 
-#: src/emu/ui/filesel.cpp:503 src/emu/ui/swlist.cpp:65
+#: src/emu/ui/filesel.cpp:506 src/emu/ui/swlist.cpp:65
 msgid "[empty slot]"
 msgstr "[prázdný slot]"
 
-#: src/emu/ui/filesel.cpp:507
+#: src/emu/ui/filesel.cpp:510
 msgid "[create]"
 msgstr "[vytvořit]"
 
-#: src/emu/ui/filesel.cpp:511 src/emu/ui/swlist.cpp:76
+#: src/emu/ui/filesel.cpp:514 src/emu/ui/swlist.cpp:76
 msgid "[software list]"
 msgstr "[software list]"
 
-#: src/emu/ui/filesel.cpp:803
+#: src/emu/ui/filesel.cpp:806
 msgid "Select image format"
 msgstr "Vyber formát obrázku"
 
-#: src/emu/ui/filesel.cpp:863
+#: src/emu/ui/filesel.cpp:866
 msgid "Select access mode"
 msgstr "Vyber přístupový režim"
 
-#: src/emu/ui/filesel.cpp:864
+#: src/emu/ui/filesel.cpp:867
 msgid "Read-only"
 msgstr "Pouze čtení"
 
-#: src/emu/ui/filesel.cpp:866
+#: src/emu/ui/filesel.cpp:869
 msgid "Read-write"
 msgstr "Čtení-Zápis"
 
-#: src/emu/ui/filesel.cpp:867
+#: src/emu/ui/filesel.cpp:870
 msgid "Read this image, write to another image"
 msgstr "Číst tento obrázek, zapsat do jiného obrázku"
 
-#: src/emu/ui/filesel.cpp:868
+#: src/emu/ui/filesel.cpp:871
 msgid "Read this image, write to diff"
 msgstr "Číst tento obrázek, zapsat do diff"
 
@@ -655,7 +655,7 @@ msgstr "Částečná podpora"
 msgid "[empty]"
 msgstr "[prázdný]"
 
-#: src/emu/ui/info_pty.cpp:26 src/emu/ui/mainmenu.cpp:91
+#: src/emu/ui/info_pty.cpp:26 src/emu/ui/mainmenu.cpp:96
 msgid "Pseudo terminals"
 msgstr "Pseudo terminály"
 
@@ -671,7 +671,7 @@ msgstr "Uživatelské rozhraní"
 msgid "Other Controls"
 msgstr "Ostatní ovládání"
 
-#: src/emu/ui/inputmap.cpp:622 src/emu/ui/miscmenu.cpp:91
+#: src/emu/ui/inputmap.cpp:622 src/emu/ui/miscmenu.cpp:92
 #: src/emu/ui/slotopt.cpp:172
 msgid "Reset"
 msgstr "Reset"
@@ -704,27 +704,27 @@ msgstr "Zapsané informace"
 msgid "Machine Information"
 msgstr "Informace o zařízení"
 
-#: src/emu/ui/mainmenu.cpp:78
+#: src/emu/ui/mainmenu.cpp:80
 msgid "Image Information"
 msgstr "Informace o programu"
 
-#: src/emu/ui/mainmenu.cpp:81
+#: src/emu/ui/mainmenu.cpp:83
 msgid "File Manager"
 msgstr "Souborový manažer"
 
-#: src/emu/ui/mainmenu.cpp:86
+#: src/emu/ui/mainmenu.cpp:92
 msgid "Tape Control"
 msgstr "Ovládání kazetového přehrávače"
 
-#: src/emu/ui/mainmenu.cpp:94
+#: src/emu/ui/mainmenu.cpp:99
 msgid "Bios Selection"
 msgstr "Výběr BIOSu"
 
-#: src/emu/ui/mainmenu.cpp:100
+#: src/emu/ui/mainmenu.cpp:104
 msgid "Slot Devices"
 msgstr "Zásuvná zařízení"
 
-#: src/emu/ui/mainmenu.cpp:107
+#: src/emu/ui/mainmenu.cpp:109
 msgid "Barcode Reader"
 msgstr "Čtečka čárového kódu"
 
@@ -732,43 +732,43 @@ msgstr "Čtečka čárového kódu"
 msgid "Network Devices"
 msgstr "Síťová zařízení"
 
-#: src/emu/ui/mainmenu.cpp:119
+#: src/emu/ui/mainmenu.cpp:118
 msgid "Keyboard Mode"
 msgstr "Režim klávesnice"
 
-#: src/emu/ui/mainmenu.cpp:122
+#: src/emu/ui/mainmenu.cpp:121
 msgid "Slider Controls"
 msgstr "Posuvné ovladače"
 
-#: src/emu/ui/mainmenu.cpp:125
+#: src/emu/ui/mainmenu.cpp:124
 msgid "Video Options"
 msgstr "Nastavení videa"
 
-#: src/emu/ui/mainmenu.cpp:129
+#: src/emu/ui/mainmenu.cpp:128
 msgid "Crosshair Options"
 msgstr "Nastavení zameřovače"
 
-#: src/emu/ui/mainmenu.cpp:133
+#: src/emu/ui/mainmenu.cpp:132
 msgid "Cheat"
 msgstr "Cheat"
 
-#: src/emu/ui/mainmenu.cpp:136
+#: src/emu/ui/mainmenu.cpp:135
 msgid "Plugin Options"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:140
+#: src/emu/ui/mainmenu.cpp:139
 msgid "External DAT View"
 msgstr "Externí DAT zobrazení"
 
-#: src/emu/ui/mainmenu.cpp:146
+#: src/emu/ui/mainmenu.cpp:145 src/emu/ui/miscmenu.cpp:785
 msgid "Add To Favorites"
 msgstr "Přidat do oblíbených"
 
-#: src/emu/ui/mainmenu.cpp:148
+#: src/emu/ui/mainmenu.cpp:147 src/emu/ui/miscmenu.cpp:787
 msgid "Remove From Favorites"
 msgstr "Odstranit z oblíbených"
 
-#: src/emu/ui/mainmenu.cpp:155
+#: src/emu/ui/mainmenu.cpp:154
 msgid "Select New Machine"
 msgstr "Vyber nové zařízení"
 
@@ -808,31 +808,31 @@ msgstr "Ukončení"
 msgid "Return to Previous Menu"
 msgstr "Zpět na předchozí menu"
 
-#: src/emu/ui/menu.cpp:716
+#: src/emu/ui/menu.cpp:761
 msgid "Auto"
 msgstr "Automaticky"
 
-#: src/emu/ui/menu.cpp:2133
+#: src/emu/ui/menu.cpp:2195
 msgid "Images"
 msgstr "Obrázky"
 
-#: src/emu/ui/menu.cpp:2134
+#: src/emu/ui/menu.cpp:2196
 msgid "Infos"
 msgstr "Informace"
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Keyboard Mode:"
 msgstr "Režim klávesnice:"
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Natural"
 msgstr "Přirozená"
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Emulated"
 msgstr "Emulovaná"
 
-#: src/emu/ui/miscmenu.cpp:240
+#: src/emu/ui/miscmenu.cpp:241
 #, c-format
 msgid ""
 "Uptime: %1$d:%2$02d:%3$02d\n"
@@ -841,7 +841,7 @@ msgstr ""
 "Čas běhu: %1$d:%2$02d:%3$02d\n"
 "\n"
 
-#: src/emu/ui/miscmenu.cpp:242
+#: src/emu/ui/miscmenu.cpp:243
 #, c-format
 msgid ""
 "Uptime: %1$d:%2$02d\n"
@@ -850,7 +850,7 @@ msgstr ""
 "Čas běhu: %1$d:%2$02d\n"
 "\n"
 
-#: src/emu/ui/miscmenu.cpp:246
+#: src/emu/ui/miscmenu.cpp:247
 #, c-format
 msgid ""
 "Tickets dispensed: %1$d\n"
@@ -859,109 +859,50 @@ msgstr ""
 "Lístků zahozeno: %1$d\n"
 "\n"
 
-#: src/emu/ui/miscmenu.cpp:257
+#: src/emu/ui/miscmenu.cpp:258
 msgid "Coin %1$c: NA%3$s\n"
 msgstr "Mince %1$c: NA%3$s\n"
 
-#: src/emu/ui/miscmenu.cpp:257
+#: src/emu/ui/miscmenu.cpp:258
 #, c-format
 msgid "Coin %1$c: %2$d%3$s\n"
 msgstr "Mince %1$c: %2$d%3$s\n"
 
-#: src/emu/ui/miscmenu.cpp:260
+#: src/emu/ui/miscmenu.cpp:261
 msgid " (locked)"
 msgstr " (zamčeno)"
 
-#: src/emu/ui/miscmenu.cpp:519
+#: src/emu/ui/miscmenu.cpp:520
 msgid "Visible Delay"
 msgstr "Viditelné zpoždění"
 
-#: src/emu/ui/miscmenu.cpp:617
+#: src/emu/ui/miscmenu.cpp:619
 #, c-format
 msgid "%s.xml saved under ui folder."
 msgstr "%s.xml uložen v ui složce."
 
-#: src/emu/ui/miscmenu.cpp:645
+#: src/emu/ui/miscmenu.cpp:647
 msgid "Name:             Description:\n"
 msgstr "Jméno:             Popis:\n"
 
-#: src/emu/ui/miscmenu.cpp:657
+#: src/emu/ui/miscmenu.cpp:659
 #, c-format
 msgid "%s.txt saved under ui folder."
 msgstr "%s.txt uložen v ui složce."
 
-#: src/emu/ui/miscmenu.cpp:675
-msgid "Export XML format (like -listxml)"
-msgstr "Exportuj XML formát (jako -listxml)"
+#: src/emu/ui/miscmenu.cpp:677
+msgid "Export list in XML format (like -listxml)"
+msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:676
-msgid "Export TXT format (like -listfull)"
-msgstr "Exportuj TXT formát (jako -listfull)"
+#: src/emu/ui/miscmenu.cpp:678
+msgid "Export list in XML format (like -listxml, but exclude devices)"
+msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:734
-msgid "Dummy"
-msgstr "Prázdný"
+#: src/emu/ui/miscmenu.cpp:679
+msgid "Export list in TXT format (like -listfull)"
+msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:736
-msgid "Save machine configuration"
-msgstr "Ulož konfiguraci zařízení"
-
-#: src/emu/ui/miscmenu.cpp:848 src/emu/ui/miscmenu.cpp:869
-#: src/emu/ui/selgame.cpp:594
-msgid "Plugins"
-msgstr "Pluginy"
-
-#: src/emu/ui/optsmenu.cpp:218
-msgid "Filter"
-msgstr "Filtr"
-
-#: src/emu/ui/optsmenu.cpp:226
-msgid " ^!File"
-msgstr " ^!Soubor"
-
-#: src/emu/ui/optsmenu.cpp:231
-msgid " ^!Category"
-msgstr " ^!Kategorie"
-
-#: src/emu/ui/optsmenu.cpp:254
-msgid "^!Setup custom filter"
-msgstr "^!Nastav uživatelský filtr"
-
-#: src/emu/ui/optsmenu.cpp:262
-msgid "Customize UI"
-msgstr "Upravení UI"
-
-#: src/emu/ui/optsmenu.cpp:263
-msgid "Configure Directories"
-msgstr "Konfigurace složek"
-
-#: src/emu/ui/optsmenu.cpp:266 src/emu/ui/sndmenu.cpp:151
-#: src/emu/ui/sndmenu.cpp:172
-msgid "Sound Options"
-msgstr "Možnosti zvuku"
-
-#: src/emu/ui/optsmenu.cpp:269
-msgid "General Inputs"
-msgstr "Základní vstupy"
-
-#: src/emu/ui/optsmenu.cpp:272
-msgid "Save Configuration"
-msgstr "Ulož konfiguraci"
-
-#: src/emu/ui/optsmenu.cpp:286 src/emu/ui/optsmenu.cpp:307
-msgid "Settings"
-msgstr "Nastavení"
-
-#: src/emu/ui/optsmenu.cpp:327
-msgid "**Error saving ui.ini**"
-msgstr "**Chyba ukládání ui.ini**"
-
-#: src/emu/ui/optsmenu.cpp:374
-#, c-format
-msgid "**Error saving %s.ini**"
-msgstr "**Chyba ukládání %s.ini**"
-
-#: src/emu/ui/optsmenu.cpp:378
+#: src/emu/ui/miscmenu.cpp:729 src/emu/ui/optsmenu.cpp:376
 msgid ""
 "\n"
 "    Configuration saved    \n"
@@ -971,20 +912,95 @@ msgstr ""
 "    Configurace uložena    \n"
 "\n"
 
-#: src/emu/ui/selector.cpp:166
+#: src/emu/ui/miscmenu.cpp:774
+msgid "Bios"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:776
+msgid "Driver"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:790
+msgid "Save machine configuration"
+msgstr "Ulož konfiguraci zařízení"
+
+#: src/emu/ui/miscmenu.cpp:806
+msgid "Configure machine:"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:868 src/emu/ui/selsoft.cpp:109
+msgid " (default)"
+msgstr " (standardní)"
+
+#: src/emu/ui/miscmenu.cpp:953 src/emu/ui/miscmenu.cpp:973
+#: src/emu/ui/selgame.cpp:600
+msgid "Plugins"
+msgstr "Pluginy"
+
+#: src/emu/ui/optsmenu.cpp:217
+msgid "Filter"
+msgstr "Filtr"
+
+#: src/emu/ui/optsmenu.cpp:225
+msgid " ^!File"
+msgstr " ^!Soubor"
+
+#: src/emu/ui/optsmenu.cpp:230
+msgid " ^!Category"
+msgstr " ^!Kategorie"
+
+#: src/emu/ui/optsmenu.cpp:253
+msgid "^!Setup custom filter"
+msgstr "^!Nastav uživatelský filtr"
+
+#: src/emu/ui/optsmenu.cpp:261
+msgid "Customize UI"
+msgstr "Upravení UI"
+
+#: src/emu/ui/optsmenu.cpp:262
+msgid "Configure Directories"
+msgstr "Konfigurace složek"
+
+#: src/emu/ui/optsmenu.cpp:265 src/emu/ui/sndmenu.cpp:149
+#: src/emu/ui/sndmenu.cpp:169
+msgid "Sound Options"
+msgstr "Možnosti zvuku"
+
+#: src/emu/ui/optsmenu.cpp:268
+msgid "General Inputs"
+msgstr "Základní vstupy"
+
+#: src/emu/ui/optsmenu.cpp:271
+msgid "Save Configuration"
+msgstr "Ulož konfiguraci"
+
+#: src/emu/ui/optsmenu.cpp:285 src/emu/ui/optsmenu.cpp:305
+msgid "Settings"
+msgstr "Nastavení"
+
+#: src/emu/ui/optsmenu.cpp:325
+msgid "**Error saving ui.ini**"
+msgstr "**Chyba ukládání ui.ini**"
+
+#: src/emu/ui/optsmenu.cpp:372
+#, c-format
+msgid "**Error saving %s.ini**"
+msgstr "**Chyba ukládání %s.ini**"
+
+#: src/emu/ui/selector.cpp:165
 msgid "Selection List - Search: "
 msgstr "Seznam výběru - Hledání: "
 
-#: src/emu/ui/selector.cpp:196
+#: src/emu/ui/selector.cpp:194
 #, c-format
 msgid "Double click or press %1$s to select"
 msgstr "Dvojklik nebo stisk %1$s pro výběr"
 
-#: src/emu/ui/selgame.cpp:39
+#: src/emu/ui/selgame.cpp:38
 msgid "General Info"
 msgstr "Základní informace"
 
-#: src/emu/ui/selgame.cpp:374 src/emu/ui/selsoft.cpp:282
+#: src/emu/ui/selgame.cpp:380 src/emu/ui/selsoft.cpp:281
 #, c-format
 msgid ""
 "%s\n"
@@ -993,8 +1009,8 @@ msgstr ""
 "%s\n"
 " přidán do seznamu oblíbených."
 
-#: src/emu/ui/selgame.cpp:380 src/emu/ui/selgame.cpp:389
-#: src/emu/ui/selsoft.cpp:287
+#: src/emu/ui/selgame.cpp:386 src/emu/ui/selgame.cpp:395
+#: src/emu/ui/selsoft.cpp:286
 #, c-format
 msgid ""
 "%s\n"
@@ -1003,7 +1019,7 @@ msgstr ""
 "%s\n"
 " odstraněn ze seznamu oblíbených."
 
-#: src/emu/ui/selgame.cpp:450
+#: src/emu/ui/selgame.cpp:457
 msgid ""
 "The selected machine is missing one or more required ROM or CHD images. "
 "Please select a different machine.\n"
@@ -1011,258 +1027,262 @@ msgid ""
 "Press any key to continue."
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:589 src/emu/ui/simpleselgame.cpp:265
+#: src/emu/ui/selgame.cpp:595 src/emu/ui/simpleselgame.cpp:265
 msgid "Configure Options"
 msgstr "Možnosti konfigurace"
 
-#: src/emu/ui/selgame.cpp:752
+#: src/emu/ui/selgame.cpp:596
+msgid "Configure Machine"
+msgstr ""
+
+#: src/emu/ui/selgame.cpp:758
 #, c-format
 msgid "%1$s %2$s ( %3$d / %4$d machines (%5$d BIOS) )"
 msgstr "%1$s %2$s ( %3$d / %4$d zařízení (%5$d BIOS) )"
 
-#: src/emu/ui/selgame.cpp:762
+#: src/emu/ui/selgame.cpp:768
 #, c-format
 msgid "%1$s (%2$s - %3$s) - "
 msgstr "%1$s (%2$s - %3$s) - "
 
-#: src/emu/ui/selgame.cpp:769 src/emu/ui/selgame.cpp:775
+#: src/emu/ui/selgame.cpp:775 src/emu/ui/selgame.cpp:781
 #, c-format
 msgid "%1$s (%2$s) - "
 msgstr "%1$s (%2$s) - "
 
-#: src/emu/ui/selgame.cpp:784
+#: src/emu/ui/selgame.cpp:790
 #, c-format
 msgid "%1$s Search: %2$s_"
 msgstr "%1$s Hledání: %2$s_"
 
-#: src/emu/ui/selgame.cpp:838
+#: src/emu/ui/selgame.cpp:844
 #, c-format
 msgid "Romset: %1$-.100s"
 msgstr "Romset: %1$-.100s"
 
-#: src/emu/ui/selgame.cpp:841 src/emu/ui/selgame.cpp:890
-#: src/emu/ui/selsoft.cpp:751 src/emu/ui/selsoft.cpp:801
+#: src/emu/ui/selgame.cpp:847 src/emu/ui/selgame.cpp:896
+#: src/emu/ui/selsoft.cpp:750 src/emu/ui/selsoft.cpp:800
 #: src/emu/ui/simpleselgame.cpp:328
 #, c-format
 msgid "%1$s, %2$-.100s"
 msgstr "%1$s, %2$-.100s"
 
-#: src/emu/ui/selgame.cpp:847 src/emu/ui/selsoft.cpp:757
+#: src/emu/ui/selgame.cpp:853 src/emu/ui/selsoft.cpp:756
 #, c-format
 msgid "Driver is clone of: %1$-.100s"
 msgstr "Driver je klon: %1$-.100s"
 
-#: src/emu/ui/selgame.cpp:849 src/emu/ui/selsoft.cpp:759
+#: src/emu/ui/selgame.cpp:855 src/emu/ui/selsoft.cpp:758
 msgid "Driver is parent"
 msgstr "Driver je parent"
 
-#: src/emu/ui/selgame.cpp:853 src/emu/ui/selsoft.cpp:763
+#: src/emu/ui/selgame.cpp:859 src/emu/ui/selsoft.cpp:762
 #: src/emu/ui/simpleselgame.cpp:335
 msgid "Overall: NOT WORKING"
 msgstr "Celkově: NEFUNGUJE"
 
-#: src/emu/ui/selgame.cpp:855 src/emu/ui/selsoft.cpp:765
+#: src/emu/ui/selgame.cpp:861 src/emu/ui/selsoft.cpp:764
 #: src/emu/ui/simpleselgame.cpp:337
 msgid "Overall: Unemulated Protection"
 msgstr "Celkově: Neemulovaná ochrana"
 
-#: src/emu/ui/selgame.cpp:857 src/emu/ui/selsoft.cpp:767
+#: src/emu/ui/selgame.cpp:863 src/emu/ui/selsoft.cpp:766
 #: src/emu/ui/simpleselgame.cpp:339
 msgid "Overall: Working"
 msgstr "Celkově: Funguje"
 
-#: src/emu/ui/selgame.cpp:861 src/emu/ui/selsoft.cpp:771
+#: src/emu/ui/selgame.cpp:867 src/emu/ui/selsoft.cpp:770
 msgid "Graphics: Imperfect, "
 msgstr "Grafika: Nedokonalá, "
 
-#: src/emu/ui/selgame.cpp:863 src/emu/ui/selsoft.cpp:773
+#: src/emu/ui/selgame.cpp:869 src/emu/ui/selsoft.cpp:772
 msgid "Graphics: OK, "
 msgstr "Grafika: OK, "
 
-#: src/emu/ui/selgame.cpp:866 src/emu/ui/selsoft.cpp:776
+#: src/emu/ui/selgame.cpp:872 src/emu/ui/selsoft.cpp:775
 msgid "Sound: Unimplemented"
 msgstr "Zvuk: Neimplementován"
 
-#: src/emu/ui/selgame.cpp:868 src/emu/ui/selsoft.cpp:778
+#: src/emu/ui/selgame.cpp:874 src/emu/ui/selsoft.cpp:777
 msgid "Sound: Imperfect"
 msgstr "Zvuk: Nedokonalý"
 
-#: src/emu/ui/selgame.cpp:870 src/emu/ui/selsoft.cpp:780
+#: src/emu/ui/selgame.cpp:876 src/emu/ui/selsoft.cpp:779
 msgid "Sound: OK"
 msgstr "Zvuk: OK"
 
-#: src/emu/ui/selgame.cpp:887
+#: src/emu/ui/selgame.cpp:893
 #, c-format
 msgid "System: %1$-.100s"
 msgstr "Systém: %1$-.100s"
 
-#: src/emu/ui/selgame.cpp:894 src/emu/ui/selsoft.cpp:805
+#: src/emu/ui/selgame.cpp:900 src/emu/ui/selsoft.cpp:804
 #, c-format
 msgid "Software is clone of: %1$-.100s"
 msgstr "Software je klon: %1$-.100s"
 
-#: src/emu/ui/selgame.cpp:896 src/emu/ui/selsoft.cpp:807
+#: src/emu/ui/selgame.cpp:902 src/emu/ui/selsoft.cpp:806
 msgid "Software is parent"
 msgstr "Software je parent"
 
-#: src/emu/ui/selgame.cpp:901 src/emu/ui/selsoft.cpp:812
+#: src/emu/ui/selgame.cpp:907 src/emu/ui/selsoft.cpp:811
 msgid "Supported: No"
 msgstr "Podpora: Ne"
 
-#: src/emu/ui/selgame.cpp:906 src/emu/ui/selsoft.cpp:817
+#: src/emu/ui/selgame.cpp:912 src/emu/ui/selsoft.cpp:816
 msgid "Supported: Partial"
 msgstr "Podpora: Částečně"
 
-#: src/emu/ui/selgame.cpp:911 src/emu/ui/selsoft.cpp:822
+#: src/emu/ui/selgame.cpp:917 src/emu/ui/selsoft.cpp:821
 msgid "Supported: Yes"
 msgstr "Podpora: Ano"
 
-#: src/emu/ui/selgame.cpp:916 src/emu/ui/selsoft.cpp:827
+#: src/emu/ui/selgame.cpp:922 src/emu/ui/selsoft.cpp:826
 #, c-format
 msgid "romset: %1$-.100s"
 msgstr "romset: %1$-.100s"
 
-#: src/emu/ui/selgame.cpp:923
+#: src/emu/ui/selgame.cpp:929
 #, c-format
 msgid "%1$s %2$s"
 msgstr "%1$s %2$s"
 
-#: src/emu/ui/selgame.cpp:1535
+#: src/emu/ui/selgame.cpp:1543
 #, c-format
 msgid "Romset: %1$-.100s\n"
 msgstr "Romset: %1$-.100s\n"
 
-#: src/emu/ui/selgame.cpp:1536
+#: src/emu/ui/selgame.cpp:1544
 #, c-format
 msgid "Year: %1$s\n"
 msgstr "Rok: %1$s\n"
 
-#: src/emu/ui/selgame.cpp:1537
+#: src/emu/ui/selgame.cpp:1545
 #, c-format
 msgid "Manufacturer: %1$-.100s\n"
 msgstr "Výrobce: %1$-.100s\n"
 
-#: src/emu/ui/selgame.cpp:1541
+#: src/emu/ui/selgame.cpp:1549
 #, c-format
 msgid "Driver is Clone of: %1$-.100s\n"
 msgstr "Driver je Klon: %1$-.100s\n"
 
-#: src/emu/ui/selgame.cpp:1543
+#: src/emu/ui/selgame.cpp:1551
 msgid "Driver is Parent\n"
 msgstr "Driver je Parent\n"
 
-#: src/emu/ui/selgame.cpp:1546
+#: src/emu/ui/selgame.cpp:1554
 msgid "Overall: NOT WORKING\n"
 msgstr "Celkově: NEFUNGUJE\n"
 
-#: src/emu/ui/selgame.cpp:1548
+#: src/emu/ui/selgame.cpp:1556
 msgid "Overall: Unemulated Protection\n"
 msgstr "Celkově: Neemulovaná ochrana\n"
 
-#: src/emu/ui/selgame.cpp:1550
+#: src/emu/ui/selgame.cpp:1558
 msgid "Overall: Working\n"
 msgstr "Celkově: Funguje\n"
 
-#: src/emu/ui/selgame.cpp:1553
+#: src/emu/ui/selgame.cpp:1561
 msgid "Graphics: Imperfect Colors\n"
 msgstr "Grafika: Nedokonalé barvy\n"
 
-#: src/emu/ui/selgame.cpp:1557
+#: src/emu/ui/selgame.cpp:1565
 msgid "Graphics: Imperfect\n"
 msgstr "Grafika: Nedokonalá\n"
 
-#: src/emu/ui/selgame.cpp:1559
+#: src/emu/ui/selgame.cpp:1567
 msgid "Graphics: OK\n"
 msgstr "Grafika: OK\n"
 
-#: src/emu/ui/selgame.cpp:1562
+#: src/emu/ui/selgame.cpp:1570
 msgid "Sound: Unimplemented\n"
 msgstr "Zvuk: Neimplementován\n"
 
-#: src/emu/ui/selgame.cpp:1564
+#: src/emu/ui/selgame.cpp:1572
 msgid "Sound: Imperfect\n"
 msgstr "Zvuk: Nedokonalý\n"
 
-#: src/emu/ui/selgame.cpp:1566
+#: src/emu/ui/selgame.cpp:1574
 msgid "Sound: OK\n"
 msgstr "Zvuk: OK\n"
 
-#: src/emu/ui/selgame.cpp:1568
+#: src/emu/ui/selgame.cpp:1576
 #, c-format
 msgid "Driver is Skeleton: %1$s\n"
 msgstr "Driver je Kostra: %1$s\n"
 
-#: src/emu/ui/selgame.cpp:1569
+#: src/emu/ui/selgame.cpp:1577
 #, c-format
 msgid "Game is Mechanical: %1$s\n"
 msgstr "Hra je mechanická: %1$s\n"
 
-#: src/emu/ui/selgame.cpp:1570
+#: src/emu/ui/selgame.cpp:1578
 #, c-format
 msgid "Requires Artwork: %1$s\n"
 msgstr "Vyžaduje artwork: %1$s\n"
 
-#: src/emu/ui/selgame.cpp:1571
+#: src/emu/ui/selgame.cpp:1579
 #, c-format
 msgid "Requires Clickable Artwork: %1$s\n"
 msgstr "Vyžaduje klikatelný artwork: %1$s\n"
 
-#: src/emu/ui/selgame.cpp:1572
+#: src/emu/ui/selgame.cpp:1580
 #, c-format
 msgid "Support Cocktail: %1$s\n"
 msgstr "Podporuje Cocktail: %1$s\n"
 
-#: src/emu/ui/selgame.cpp:1573
+#: src/emu/ui/selgame.cpp:1581
 #, c-format
 msgid "Driver is Bios: %1$s\n"
 msgstr "Driver je Bios: %1$s\n"
 
-#: src/emu/ui/selgame.cpp:1574
+#: src/emu/ui/selgame.cpp:1582
 #, c-format
 msgid "Support Save: %1$s\n"
 msgstr "Podpora Save: %1$s\n"
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 #, c-format
 msgid "Screen Orientation: %1$s\n"
 msgstr "Orientace obrazovky: %1$s\n"
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 msgid "Vertical"
 msgstr "Vertikální"
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 msgid "Horizontal"
 msgstr "Horizontální"
 
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/selgame.cpp:1591
 #, c-format
 msgid "Requires CHD: %1$s\n"
 msgstr "Vyžaduje CHD: %1$s\n"
 
-#: src/emu/ui/selgame.cpp:1596
+#: src/emu/ui/selgame.cpp:1604
 msgid "Roms Audit Pass: OK\n"
 msgstr ""
 "Audit ROM proběhl: OK\n"
 "\n"
 
-#: src/emu/ui/selgame.cpp:1598
+#: src/emu/ui/selgame.cpp:1606
 msgid "Roms Audit Pass: BAD\n"
 msgstr "Audit ROM proběhl: ŠPATNĚ\n"
 
-#: src/emu/ui/selgame.cpp:1601
+#: src/emu/ui/selgame.cpp:1609
 msgid "Samples Audit Pass: None Needed\n"
 msgstr "Samples Audit Pass: None Needed\n"
 
-#: src/emu/ui/selgame.cpp:1603
+#: src/emu/ui/selgame.cpp:1611
 msgid "Samples Audit Pass: OK\n"
 msgstr "Audit samplů proběhl: OK\n"
 
-#: src/emu/ui/selgame.cpp:1605
+#: src/emu/ui/selgame.cpp:1613
 msgid "Samples Audit Pass: BAD\n"
 msgstr "Audit samplů proběhl: ŠPATNĚ\n"
 
-#: src/emu/ui/selgame.cpp:1608
+#: src/emu/ui/selgame.cpp:1616
 msgid ""
 "Roms Audit Pass: Disabled\n"
 "Samples Audit Pass: Disabled\n"
@@ -1270,20 +1290,16 @@ msgstr ""
 "Audit ROM: Vypnutý\n"
 "Audit samplů: Vypnutý\n"
 
-#: src/emu/ui/selgame.cpp:2049 src/emu/ui/selgame.cpp:2212
-#: src/emu/ui/selsoft.cpp:1662
+#: src/emu/ui/selgame.cpp:2055 src/emu/ui/selgame.cpp:2216
+#: src/emu/ui/selsoft.cpp:1655
 msgid "No Infos Available"
 msgstr "Žádné dostupné informace"
 
-#: src/emu/ui/selgame.cpp:2162 src/emu/ui/selsoft.cpp:1607
+#: src/emu/ui/selgame.cpp:2168 src/emu/ui/selsoft.cpp:1602
 msgid "Usage"
 msgstr "Využití"
 
-#: src/emu/ui/selsoft.cpp:110
-msgid " (default)"
-msgstr " (standardní)"
-
-#: src/emu/ui/selsoft.cpp:381
+#: src/emu/ui/selsoft.cpp:380
 msgid ""
 "The selected software is missing one or more required files. Please select a "
 "different software.\n"
@@ -1291,57 +1307,57 @@ msgid ""
 "Press any key to continue."
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:684
+#: src/emu/ui/selsoft.cpp:683
 #, c-format
-msgid "%1$s %2$s ( %3$d / %4$d softwares )"
-msgstr "%1$s %2$s ( %3$d / %4$d softwares )"
+msgid "%1$s %2$s ( %3$d / %4$d software packages )"
+msgstr ""
 
-#: src/emu/ui/selsoft.cpp:685
+#: src/emu/ui/selsoft.cpp:684
 #, c-format
 msgid "Driver: \"%1$s\" software list "
 msgstr "Driver: \"%1$s\" software list "
 
-#: src/emu/ui/selsoft.cpp:688
+#: src/emu/ui/selsoft.cpp:687
 #, c-format
 msgid "Region: %1$s -"
 msgstr "Region: %1$s -"
 
-#: src/emu/ui/selsoft.cpp:690
+#: src/emu/ui/selsoft.cpp:689
 #, c-format
 msgid "Publisher: %1$s -"
 msgstr "Vydavatel: %1$s -"
 
-#: src/emu/ui/selsoft.cpp:692
+#: src/emu/ui/selsoft.cpp:691
 #, c-format
 msgid "Year: %1$s -"
 msgstr "Rok: %1$s -"
 
-#: src/emu/ui/selsoft.cpp:694
+#: src/emu/ui/selsoft.cpp:693
 #, c-format
 msgid "Software List: %1$s -"
 msgstr "Software List: %1$s -"
 
-#: src/emu/ui/selsoft.cpp:696
+#: src/emu/ui/selsoft.cpp:695
 #, c-format
 msgid "Device type: %1$s -"
 msgstr "Typ zařízení: %1$s -"
 
-#: src/emu/ui/selsoft.cpp:698
+#: src/emu/ui/selsoft.cpp:697
 #, c-format
 msgid "%s Search: %s_"
 msgstr "%s Hledání: %s_"
 
-#: src/emu/ui/selsoft.cpp:748 src/emu/ui/selsoft.cpp:798
+#: src/emu/ui/selsoft.cpp:747 src/emu/ui/selsoft.cpp:797
 #: src/emu/ui/simpleselgame.cpp:325
 #, c-format
 msgid "%1$-.100s"
 msgstr "%1$-.100s"
 
-#: src/emu/ui/selsoft.cpp:1998 src/emu/ui/selsoft.cpp:2018
+#: src/emu/ui/selsoft.cpp:1991 src/emu/ui/selsoft.cpp:2011
 msgid "Software part selection:"
 msgstr "Výběr části software:"
 
-#: src/emu/ui/selsoft.cpp:2136 src/emu/ui/selsoft.cpp:2156
+#: src/emu/ui/selsoft.cpp:2129 src/emu/ui/selsoft.cpp:2149
 msgid "Bios selection:"
 msgstr "Výběr BIOSu:"
 
@@ -1393,15 +1409,15 @@ msgstr "Gfx: %s, Zvuk: %s"
 msgid " [internal]"
 msgstr " [interní]"
 
-#: src/emu/ui/sndmenu.cpp:135
+#: src/emu/ui/sndmenu.cpp:133
 msgid "Sound"
 msgstr "Zvuk"
 
-#: src/emu/ui/sndmenu.cpp:136
+#: src/emu/ui/sndmenu.cpp:134
 msgid "Sample Rate"
 msgstr "Vzorkovací frekvence"
 
-#: src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/sndmenu.cpp:135
 msgid "Use External Samples"
 msgstr "Použít externí samply"
 
@@ -1470,12 +1486,12 @@ msgstr "Přetočit zpět"
 msgid "Fast Forward"
 msgstr "Přetočit dopředu"
 
-#: src/emu/ui/ui.cpp:419
+#: src/emu/ui/ui.cpp:418
 msgid "This driver requires images to be loaded in the following device(s): "
 msgstr ""
 "Tento ovladač vyžaduje aby byl obraz media nahrán do následujících zařízení: "
 
-#: src/emu/ui/ui.cpp:1074
+#: src/emu/ui/ui.cpp:1071
 msgid ""
 "One or more ROMs/CHDs for this machine are incorrect. The machine may not "
 "run correctly.\n"
@@ -1483,7 +1499,7 @@ msgstr ""
 "Jedna nebo více ROMs/CHDs pro toto zařízení je nekorektních. Zařízení nemusí "
 "fungovat správně.\n"
 
-#: src/emu/ui/ui.cpp:1087
+#: src/emu/ui/ui.cpp:1084
 msgid ""
 "There are known problems with this machine\n"
 "\n"
@@ -1491,51 +1507,51 @@ msgstr ""
 "S tímto zařízením jsou známy problémy\n"
 "\n"
 
-#: src/emu/ui/ui.cpp:1091
+#: src/emu/ui/ui.cpp:1088
 msgid ""
 "One or more ROMs/CHDs for this machine have not been correctly dumped.\n"
 msgstr ""
 "Jedna nebo více ROM/CHD pro toto zařízení je špatně stažena (dumpnuta).\n"
 
-#: src/emu/ui/ui.cpp:1095
+#: src/emu/ui/ui.cpp:1092
 #, c-format
 msgid "The keyboard emulation may not be 100% accurate.\n"
 msgstr "Emulace klávesnice nemusí být na 100% autentická.\n"
 
-#: src/emu/ui/ui.cpp:1097
+#: src/emu/ui/ui.cpp:1094
 #, c-format
 msgid "The colors aren't 100% accurate.\n"
 msgstr "Barvy nejsou 100% autentické.\n"
 
-#: src/emu/ui/ui.cpp:1099
+#: src/emu/ui/ui.cpp:1096
 msgid "The colors are completely wrong.\n"
 msgstr "Barvy jsou úplně špatné.\n"
 
-#: src/emu/ui/ui.cpp:1101
+#: src/emu/ui/ui.cpp:1098
 #, c-format
 msgid "The video emulation isn't 100% accurate.\n"
 msgstr "Emulace videa není 100% autentická.\n"
 
-#: src/emu/ui/ui.cpp:1103
+#: src/emu/ui/ui.cpp:1100
 #, c-format
 msgid "The sound emulation isn't 100% accurate.\n"
 msgstr ""
 "Emulace zvuku není 100% autentická.\n"
 "\n"
 
-#: src/emu/ui/ui.cpp:1105
+#: src/emu/ui/ui.cpp:1102
 msgid "The machine lacks sound.\n"
 msgstr "Zařízení postrádá zvuky.\n"
 
-#: src/emu/ui/ui.cpp:1108
+#: src/emu/ui/ui.cpp:1105
 msgid "Screen flipping in cocktail mode is not supported.\n"
 msgstr "Otočení obrazu v koktail módu není podporováno.\n"
 
-#: src/emu/ui/ui.cpp:1112
+#: src/emu/ui/ui.cpp:1109
 msgid "The machine requires external artwork files\n"
 msgstr "Zařízení vyžaduje externí artworky\n"
 
-#: src/emu/ui/ui.cpp:1117
+#: src/emu/ui/ui.cpp:1114
 msgid ""
 "This machine was never completed. It may exhibit strange behavior or missing "
 "elements that are not bugs in the emulation.\n"
@@ -1543,7 +1559,7 @@ msgstr ""
 "Zařízení nebylo nikdy dokončeno. Může se objevit zvláštní chování nebo "
 "chybějící části, jež nejsou chybou emulace.\n"
 
-#: src/emu/ui/ui.cpp:1122
+#: src/emu/ui/ui.cpp:1119
 msgid ""
 "This machine has no sound hardware, MAME will produce no sounds, this is "
 "expected behaviour.\n"
@@ -1551,11 +1567,11 @@ msgstr ""
 "Zařízení nemá zvukový hardware, MAME nebyde přehrávat zvuky, toto je "
 "očekávané chování.\n"
 
-#: src/emu/ui/ui.cpp:1130
+#: src/emu/ui/ui.cpp:1127
 msgid "The machine has protection which isn't fully emulated.\n"
 msgstr "Zařízení má ochranu která není plně emulovaná.\n"
 
-#: src/emu/ui/ui.cpp:1133
+#: src/emu/ui/ui.cpp:1130
 msgid ""
 "\n"
 "THIS MACHINE DOESN'T WORK. The emulation for this machine is not yet "
@@ -1566,7 +1582,7 @@ msgstr ""
 "ZAŘÍZENÍ NEFUNGUJE. Emulace tohoto zařízení není ještě kompletní. Nic s tím "
 "nemůžete udělat, jen čekat na vývojáře až vylepší emulaci.\n"
 
-#: src/emu/ui/ui.cpp:1137
+#: src/emu/ui/ui.cpp:1134
 msgid ""
 "\n"
 "Certain elements of this machine cannot be emulated as it requires actual "
@@ -1578,7 +1594,7 @@ msgstr ""
 "interakci nebo se skládají z mechanických zařízení. Není možné naplno "
 "rozeběhnout toto zařízení.\n"
 
-#: src/emu/ui/ui.cpp:1156
+#: src/emu/ui/ui.cpp:1153
 msgid ""
 "\n"
 "\n"
@@ -1588,7 +1604,7 @@ msgstr ""
 "\n"
 "Existují funkční klony tohoto zařízení: "
 
-#: src/emu/ui/ui.cpp:1170
+#: src/emu/ui/ui.cpp:1167
 msgid ""
 "\n"
 "\n"
@@ -1598,7 +1614,7 @@ msgstr ""
 "\n"
 "Stiskni klávesu pro pokračování"
 
-#: src/emu/ui/ui.cpp:1185
+#: src/emu/ui/ui.cpp:1182
 #, c-format
 msgid ""
 "%1$s\n"
@@ -1613,15 +1629,15 @@ msgstr ""
 "\n"
 "CPU:\n"
 
-#: src/emu/ui/ui.cpp:1221 src/emu/ui/ui.cpp:1260
+#: src/emu/ui/ui.cpp:1218 src/emu/ui/ui.cpp:1257
 msgid "MHz"
 msgstr "MHz"
 
-#: src/emu/ui/ui.cpp:1221 src/emu/ui/ui.cpp:1260
+#: src/emu/ui/ui.cpp:1218 src/emu/ui/ui.cpp:1257
 msgid "kHz"
 msgstr "kHz"
 
-#: src/emu/ui/ui.cpp:1235
+#: src/emu/ui/ui.cpp:1232
 msgid ""
 "\n"
 "Sound:\n"
@@ -1629,7 +1645,7 @@ msgstr ""
 "\n"
 "Zvuk:\n"
 
-#: src/emu/ui/ui.cpp:1264
+#: src/emu/ui/ui.cpp:1261
 msgid ""
 "\n"
 "Video:\n"
@@ -1637,78 +1653,78 @@ msgstr ""
 "\n"
 "Video:\n"
 
-#: src/emu/ui/ui.cpp:1268
+#: src/emu/ui/ui.cpp:1265
 msgid "None\n"
 msgstr "Žádný\n"
 
-#: src/emu/ui/ui.cpp:1275
+#: src/emu/ui/ui.cpp:1272
 msgid "Vector"
 msgstr "Vektor"
 
-#: src/emu/ui/ui.cpp:1286
+#: src/emu/ui/ui.cpp:1283
 #, c-format
 msgid "%1$s: %2$s\n"
 msgstr "%1$s: %2$s\n"
 
-#: src/emu/ui/ui.cpp:1286
+#: src/emu/ui/ui.cpp:1283
 msgid "%2$s\n"
 msgstr "%2$s\n"
 
-#: src/emu/ui/ui.cpp:1541 src/emu/ui/ui.cpp:1551
+#: src/emu/ui/ui.cpp:1538 src/emu/ui/ui.cpp:1548
 msgid "Keyboard Emulation Status"
 msgstr "Stav emulace klávesnice"
 
-#: src/emu/ui/ui.cpp:1543
+#: src/emu/ui/ui.cpp:1540
 msgid "Mode: PARTIAL Emulation"
 msgstr "Režim: ČÁSTEČNÁ Emulace"
 
-#: src/emu/ui/ui.cpp:1544
+#: src/emu/ui/ui.cpp:1541
 msgid "UI:   Enabled"
 msgstr "UI:   Povoleno"
 
-#: src/emu/ui/ui.cpp:1546 src/emu/ui/ui.cpp:1556
+#: src/emu/ui/ui.cpp:1543 src/emu/ui/ui.cpp:1553
 msgid "**Use ScrLock to toggle**"
 msgstr "**Použij ScrLock pro přepnutí**"
 
-#: src/emu/ui/ui.cpp:1553
+#: src/emu/ui/ui.cpp:1550
 msgid "Mode: FULL Emulation"
 msgstr "Režim: PLNÁ Emulace"
 
-#: src/emu/ui/ui.cpp:1554
+#: src/emu/ui/ui.cpp:1551
 msgid "UI:   Disabled"
 msgstr "UI:   Zakázáno"
 
-#: src/emu/ui/ui.cpp:1692
+#: src/emu/ui/ui.cpp:1689
 msgid "Autofire can't be enabled"
 msgstr "Autostřelba nemůže být povolena"
 
-#: src/emu/ui/ui.cpp:1731
+#: src/emu/ui/ui.cpp:1728
 msgid "Select position to save to"
 msgstr "Vyber pozici pro uložení"
 
-#: src/emu/ui/ui.cpp:1733
+#: src/emu/ui/ui.cpp:1730
 msgid "Select position to load from"
 msgstr "Vyber pozici pro načtení"
 
-#: src/emu/ui/ui.cpp:1757
+#: src/emu/ui/ui.cpp:1754
 msgid "Save cancelled"
 msgstr "Ukládání zrušeno"
 
-#: src/emu/ui/ui.cpp:1759
+#: src/emu/ui/ui.cpp:1756
 msgid "Load cancelled"
 msgstr "Načítání zrušeno"
 
-#: src/emu/ui/ui.cpp:1802
+#: src/emu/ui/ui.cpp:1799
 #, c-format
 msgid "Save to position %s"
 msgstr "Uložení do pozice %s"
 
-#: src/emu/ui/ui.cpp:1807
+#: src/emu/ui/ui.cpp:1804
 #, c-format
 msgid "Load from position %s"
 msgstr "Načtení z pozice %s"
 
-#: src/emu/ui/ui.cpp:1847
+#: src/emu/ui/ui.cpp:1844
 #, c-format
 msgid ""
 "Are you sure you want to quit?\n"
@@ -1721,173 +1737,173 @@ msgstr ""
 "Stiskni ''%1$s'' pro ukončení,\n"
 "Stiskni ''%2$s'' pro návrat do emulace."
 
-#: src/emu/ui/ui.cpp:1917
+#: src/emu/ui/ui.cpp:1914
 msgid "Master Volume"
 msgstr "Hlavní hlasitost"
 
-#: src/emu/ui/ui.cpp:1926
+#: src/emu/ui/ui.cpp:1923
 #, c-format
 msgid "%1$s Volume"
 msgstr "%1$s hlasitost"
 
-#: src/emu/ui/ui.cpp:1949
+#: src/emu/ui/ui.cpp:1946
 #, c-format
 msgid "Overclock CPU %1$s"
 msgstr "Přetakt CPU %1$s"
 
-#: src/emu/ui/ui.cpp:1968
+#: src/emu/ui/ui.cpp:1965
 #, c-format
 msgid "%1$s Refresh Rate"
 msgstr "%1$s Obnovovací frekvence"
 
-#: src/emu/ui/ui.cpp:1973
+#: src/emu/ui/ui.cpp:1970
 #, c-format
 msgid "%1$s Brightness"
 msgstr "%1$s Jas"
 
-#: src/emu/ui/ui.cpp:1975
+#: src/emu/ui/ui.cpp:1972
 #, c-format
 msgid "%1$s Contrast"
 msgstr "%1$s Kontrast"
 
-#: src/emu/ui/ui.cpp:1977
+#: src/emu/ui/ui.cpp:1974
 #, c-format
 msgid "%1$s Gamma"
 msgstr "%1$s Gamma"
 
-#: src/emu/ui/ui.cpp:1981
+#: src/emu/ui/ui.cpp:1978
 #, c-format
 msgid "%1$s Horiz Stretch"
 msgstr "%1$s Horiz Roztah"
 
-#: src/emu/ui/ui.cpp:1983
+#: src/emu/ui/ui.cpp:1980
 #, c-format
 msgid "%1$s Horiz Position"
 msgstr "%1$s Horiz Pozice"
 
-#: src/emu/ui/ui.cpp:1985
+#: src/emu/ui/ui.cpp:1982
 #, c-format
 msgid "%1$s Vert Stretch"
 msgstr "%1$s Vert Roztah"
 
-#: src/emu/ui/ui.cpp:1987
+#: src/emu/ui/ui.cpp:1984
 #, c-format
 msgid "%1$s Vert Position"
 msgstr "%1$s Vert Pozice"
 
-#: src/emu/ui/ui.cpp:2005
+#: src/emu/ui/ui.cpp:2002
 #, c-format
 msgid "Laserdisc '%1$s' Horiz Stretch"
 msgstr "Laserdisc '%1$s' Horiz Roztah"
 
-#: src/emu/ui/ui.cpp:2007
+#: src/emu/ui/ui.cpp:2004
 #, c-format
 msgid "Laserdisc '%1$s' Horiz Position"
 msgstr "Laserdisc '%1$s' Horiz Pozice"
 
-#: src/emu/ui/ui.cpp:2009
+#: src/emu/ui/ui.cpp:2006
 #, c-format
 msgid "Laserdisc '%1$s' Vert Stretch"
 msgstr "Laserdisc '%1$s' Vert Roztah"
 
-#: src/emu/ui/ui.cpp:2011
+#: src/emu/ui/ui.cpp:2008
 #, c-format
 msgid "Laserdisc '%1$s' Vert Position"
 msgstr "Laserdisc '%1$s' Vert Pozice"
 
-#: src/emu/ui/ui.cpp:2021
+#: src/emu/ui/ui.cpp:2018
 msgid "Vector Flicker"
 msgstr "Vektor Blikač"
 
-#: src/emu/ui/ui.cpp:2022
+#: src/emu/ui/ui.cpp:2019
 msgid "Beam Width Minimum"
 msgstr "Minimální šířka svazku"
 
-#: src/emu/ui/ui.cpp:2023
+#: src/emu/ui/ui.cpp:2020
 msgid "Beam Width Maximum"
 msgstr "Maximální šířka svazku"
 
-#: src/emu/ui/ui.cpp:2024
+#: src/emu/ui/ui.cpp:2021
 msgid "Beam Intensity Weight"
 msgstr "Váha intenzity svazku"
 
-#: src/emu/ui/ui.cpp:2037
+#: src/emu/ui/ui.cpp:2034
 #, c-format
 msgid "Crosshair Scale %1$s"
 msgstr "Zaměřovač škála %1$s"
 
-#: src/emu/ui/ui.cpp:2037 src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2034 src/emu/ui/ui.cpp:2036
 msgid "X"
 msgstr "X"
 
-#: src/emu/ui/ui.cpp:2037 src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2034 src/emu/ui/ui.cpp:2036
 msgid "Y"
 msgstr "Y"
 
-#: src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2036
 #, c-format
 msgid "Crosshair Offset %1$s"
 msgstr "Zaměřovač posun %1$s"
 
-#: src/emu/ui/ui.cpp:2071
+#: src/emu/ui/ui.cpp:2068
 #, c-format
 msgid "%1$3ddB"
 msgstr "%1$3ddB"
 
-#: src/emu/ui/ui.cpp:2115
+#: src/emu/ui/ui.cpp:2112
 #, c-format
 msgid "%1$d%%"
 msgstr "%1$d%%"
 
-#: src/emu/ui/ui.cpp:2131
+#: src/emu/ui/ui.cpp:2128
 #, c-format
 msgid "%1$3.0f%%"
 msgstr "%1$3.0f%%"
 
-#: src/emu/ui/ui.cpp:2154
+#: src/emu/ui/ui.cpp:2151
 #, c-format
 msgid "%1$.3ffps"
 msgstr "%1$.3ffps"
 
-#: src/emu/ui/ui.cpp:2177 src/emu/ui/ui.cpp:2199 src/emu/ui/ui.cpp:2220
-#: src/emu/ui/ui.cpp:2242 src/emu/ui/ui.cpp:2264 src/emu/ui/ui.cpp:2286
-#: src/emu/ui/ui.cpp:2308 src/emu/ui/ui.cpp:2330 src/emu/ui/ui.cpp:2352
-#: src/emu/ui/ui.cpp:2374 src/emu/ui/ui.cpp:2396
+#: src/emu/ui/ui.cpp:2174 src/emu/ui/ui.cpp:2196 src/emu/ui/ui.cpp:2217
+#: src/emu/ui/ui.cpp:2239 src/emu/ui/ui.cpp:2261 src/emu/ui/ui.cpp:2283
+#: src/emu/ui/ui.cpp:2305 src/emu/ui/ui.cpp:2327 src/emu/ui/ui.cpp:2349
+#: src/emu/ui/ui.cpp:2371 src/emu/ui/ui.cpp:2393
 #, c-format
 msgid "%1$.3f"
 msgstr "%1$.3f"
 
-#: src/emu/ui/ui.cpp:2412 src/emu/ui/ui.cpp:2428 src/emu/ui/ui.cpp:2444
-#: src/emu/ui/ui.cpp:2460
+#: src/emu/ui/ui.cpp:2408 src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2438
+#: src/emu/ui/ui.cpp:2453
 #, c-format
 msgid "%1$1.2f"
 msgstr "%1$1.2f"
 
-#: src/emu/ui/ui.cpp:2476
+#: src/emu/ui/ui.cpp:2469
 #, c-format
 msgid "Screen '%1$s'"
 msgstr "Obraz '%1$s'"
 
-#: src/emu/ui/ui.cpp:2478
+#: src/emu/ui/ui.cpp:2471
 msgid "Screen"
 msgstr "Obraz"
 
-#: src/emu/ui/ui.cpp:2494
+#: src/emu/ui/ui.cpp:2487
 #, c-format
 msgid "Crosshair Scale X %1$1.3f"
 msgstr "Zaměřovač škála X %1$1.3f"
 
-#: src/emu/ui/ui.cpp:2494
+#: src/emu/ui/ui.cpp:2487
 #, c-format
 msgid "Crosshair Scale Y %1$1.3f"
 msgstr "Zaměřovač škála Y %1$1.3f"
 
-#: src/emu/ui/ui.cpp:2513
+#: src/emu/ui/ui.cpp:2506
 #, c-format
 msgid "Crosshair Offset X %1$1.3f"
 msgstr "Zaměřovač posun X %1$1.3f"
 
-#: src/emu/ui/ui.cpp:2513
+#: src/emu/ui/ui.cpp:2506
 #, c-format
 msgid "Crosshair Offset Y %1$1.3f"
 msgstr "Zaměřovač posun Y %1$1.3f"
@@ -1929,14 +1945,26 @@ msgstr "Ořezaný"
 msgid "Full"
 msgstr "Plný"
 
-#: src/emu/ui/viewgfx.cpp:392
+#: src/emu/ui/viewgfx.cpp:391
 msgid " COLORS"
 msgstr " BARVY"
 
-#: src/emu/ui/viewgfx.cpp:392
+#: src/emu/ui/viewgfx.cpp:391
 msgid " PENS"
 msgstr " PERA"
 
+#~ msgid "Export XML format (like -listxml)"
+#~ msgstr "Exportuj XML formát (jako -listxml)"
+
+#~ msgid "Export TXT format (like -listfull)"
+#~ msgstr "Exportuj TXT formát (jako -listfull)"
+
+#~ msgid "Dummy"
+#~ msgstr "Prázdný"
+
+#~ msgid "%1$s %2$s ( %3$d / %4$d softwares )"
+#~ msgstr "%1$s %2$s ( %3$d / %4$d softwares )"
+
 #~ msgid "Lightgun Device Assignment"
 #~ msgstr "Lightgun zařízení přiřazení"
 
diff --git a/language/Danish/strings.po b/language/Danish/strings.po
index 5354094a599..e92de232468 100644
--- a/language/Danish/strings.po
+++ b/language/Danish/strings.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MAME\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-11 03:33+0200\n"
+"POT-Creation-Date: 2016-04-15 17:42+0200\n"
 "PO-Revision-Date: 2016-02-20 18:03+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: MAME Language Team\n"
@@ -61,14 +61,14 @@ msgstr ""
 msgid "Autofire Status"
 msgstr ""
 
-#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1698
+#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1695
 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211
 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219
 #: src/emu/ui/videoopt.cpp:223
 msgid "Disabled"
 msgstr ""
 
-#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1698
+#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1695
 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211
 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219
 #: src/emu/ui/videoopt.cpp:223
@@ -76,14 +76,14 @@ msgid "Enabled"
 msgstr ""
 
 #: src/emu/ui/cheatopt.cpp:282 src/emu/ui/cheatopt.cpp:288
-#: src/emu/ui/menu.cpp:710 src/emu/ui/miscmenu.cpp:831
-#: src/emu/ui/sndmenu.cpp:135 src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/menu.cpp:755 src/emu/ui/miscmenu.cpp:936
+#: src/emu/ui/sndmenu.cpp:133 src/emu/ui/sndmenu.cpp:135
 msgid "On"
 msgstr ""
 
 #: src/emu/ui/cheatopt.cpp:282 src/emu/ui/cheatopt.cpp:288
-#: src/emu/ui/menu.cpp:713 src/emu/ui/miscmenu.cpp:831
-#: src/emu/ui/sndmenu.cpp:135 src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/menu.cpp:758 src/emu/ui/miscmenu.cpp:936
+#: src/emu/ui/sndmenu.cpp:133 src/emu/ui/sndmenu.cpp:135
 msgid "Off"
 msgstr ""
 
@@ -95,316 +95,316 @@ msgstr ""
 msgid "Autofire Delay"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:158 src/emu/ui/custmenu.cpp:447
+#: src/emu/ui/custmenu.cpp:157 src/emu/ui/custmenu.cpp:445
 msgid "Main filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:167 src/emu/ui/custmenu.cpp:456
+#: src/emu/ui/custmenu.cpp:166 src/emu/ui/custmenu.cpp:454
 msgid "Other filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:176 src/emu/ui/optsmenu.cpp:239
+#: src/emu/ui/custmenu.cpp:175 src/emu/ui/optsmenu.cpp:238
 msgid "^!Manufacturer"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:185 src/emu/ui/custmenu.cpp:474
-#: src/emu/ui/optsmenu.cpp:247
+#: src/emu/ui/custmenu.cpp:184 src/emu/ui/custmenu.cpp:472
+#: src/emu/ui/optsmenu.cpp:246
 msgid "^!Year"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:194 src/emu/ui/custmenu.cpp:510
+#: src/emu/ui/custmenu.cpp:193 src/emu/ui/custmenu.cpp:508
 msgid "Remove last filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:197 src/emu/ui/custmenu.cpp:513
+#: src/emu/ui/custmenu.cpp:196 src/emu/ui/custmenu.cpp:511
 msgid "Add filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:212 src/emu/ui/custmenu.cpp:233
-#: src/emu/ui/custmenu.cpp:529 src/emu/ui/custmenu.cpp:550
+#: src/emu/ui/custmenu.cpp:211 src/emu/ui/custmenu.cpp:231
+#: src/emu/ui/custmenu.cpp:527 src/emu/ui/custmenu.cpp:547
 msgid "Select custom filters:"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:465
+#: src/emu/ui/custmenu.cpp:463
 msgid "^!Publisher"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:483
+#: src/emu/ui/custmenu.cpp:481
 msgid "^!Software List"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:492
+#: src/emu/ui/custmenu.cpp:490
 msgid "^!Device type"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:501
+#: src/emu/ui/custmenu.cpp:499
 msgid "^!Region"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:23
+#: src/emu/ui/custui.cpp:22
 msgid "Show All"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:24
+#: src/emu/ui/custui.cpp:23
 msgid "Hide Filters"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:25
+#: src/emu/ui/custui.cpp:24
 msgid "Hide Info/Image"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:26
+#: src/emu/ui/custui.cpp:25
 msgid "Hide Both"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:142
+#: src/emu/ui/custui.cpp:141
 msgid "Fonts"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:143
+#: src/emu/ui/custui.cpp:142
 msgid "Colors"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:148 src/emu/ui/dirmenu.cpp:33
+#: src/emu/ui/custui.cpp:147 src/emu/ui/dirmenu.cpp:33
 msgid "Language"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:152
+#: src/emu/ui/custui.cpp:151
 msgid "Show side panels"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:167 src/emu/ui/custui.cpp:188
+#: src/emu/ui/custui.cpp:166 src/emu/ui/custui.cpp:186
 msgid "Custom UI Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:246
+#: src/emu/ui/custui.cpp:244
 msgid "default"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:349
+#: src/emu/ui/custui.cpp:347
 msgid "UI Font"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:354
+#: src/emu/ui/custui.cpp:352
 msgid "Bold"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:355
+#: src/emu/ui/custui.cpp:353
 msgid "Italic"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:360
+#: src/emu/ui/custui.cpp:358
 msgid "Lines"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:366
+#: src/emu/ui/custui.cpp:364
 msgid "Infos text size"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:383
+#: src/emu/ui/custui.cpp:381
 msgid "UI Fonts Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:411
+#: src/emu/ui/custui.cpp:408
 msgid "Sample text - Lorem ipsum dolor sit amet, consectetur adipiscing elit."
 msgstr ""
 
-#: src/emu/ui/custui.cpp:509
+#: src/emu/ui/custui.cpp:506
 msgid "Normal text"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:510
+#: src/emu/ui/custui.cpp:507
 msgid "Selected color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:511
+#: src/emu/ui/custui.cpp:508
 msgid "Normal text background"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:512
+#: src/emu/ui/custui.cpp:509
 msgid "Selected background color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:513
+#: src/emu/ui/custui.cpp:510
 msgid "Subitem color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:514 src/emu/ui/custui.cpp:610
+#: src/emu/ui/custui.cpp:511 src/emu/ui/custui.cpp:606
 msgid "Clone"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:515
+#: src/emu/ui/custui.cpp:512
 msgid "Border"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:516
+#: src/emu/ui/custui.cpp:513
 msgid "Background"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:517
+#: src/emu/ui/custui.cpp:514
 msgid "Dipswitch"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:518
+#: src/emu/ui/custui.cpp:515
 msgid "Unavailable color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:519
+#: src/emu/ui/custui.cpp:516
 msgid "Slider color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:520
+#: src/emu/ui/custui.cpp:517
 msgid "Gfx viewer background"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:521
+#: src/emu/ui/custui.cpp:518
 msgid "Mouse over color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:522
+#: src/emu/ui/custui.cpp:519
 msgid "Mouse over background color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:523
+#: src/emu/ui/custui.cpp:520
 msgid "Mouse down color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:524
+#: src/emu/ui/custui.cpp:521
 msgid "Mouse down background color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:527
+#: src/emu/ui/custui.cpp:524
 msgid "Restore originals colors"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:543
+#: src/emu/ui/custui.cpp:540
 msgid "UI Colors Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:572
+#: src/emu/ui/custui.cpp:568
 #, c-format
 msgid "Double click or press %1$s to change the color value"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:598
+#: src/emu/ui/custui.cpp:594
 msgid "Menu Preview"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:606
+#: src/emu/ui/custui.cpp:602
 msgid "Normal"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:607
+#: src/emu/ui/custui.cpp:603
 msgid "Subitem"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:608
+#: src/emu/ui/custui.cpp:604
 msgid "Selected"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:609
+#: src/emu/ui/custui.cpp:605
 msgid "Mouse Over"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:841 src/emu/ui/custui.cpp:844
+#: src/emu/ui/custui.cpp:837 src/emu/ui/custui.cpp:840
 msgid "Alpha"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:849 src/emu/ui/custui.cpp:852
-#: src/emu/ui/custui.cpp:1013
+#: src/emu/ui/custui.cpp:845 src/emu/ui/custui.cpp:848
+#: src/emu/ui/custui.cpp:1007
 msgid "Red"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:857 src/emu/ui/custui.cpp:860
-#: src/emu/ui/custui.cpp:1016
+#: src/emu/ui/custui.cpp:853 src/emu/ui/custui.cpp:856
+#: src/emu/ui/custui.cpp:1010
 msgid "Green"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:865 src/emu/ui/custui.cpp:868
-#: src/emu/ui/custui.cpp:1017
+#: src/emu/ui/custui.cpp:861 src/emu/ui/custui.cpp:864
+#: src/emu/ui/custui.cpp:1011
 msgid "Blue"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:871
+#: src/emu/ui/custui.cpp:867
 msgid "Choose from palette"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:887
+#: src/emu/ui/custui.cpp:883
 msgid " - ARGB Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:912
+#: src/emu/ui/custui.cpp:907
 msgid "Color preview ="
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1009
+#: src/emu/ui/custui.cpp:1003
 msgid "White"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1010
+#: src/emu/ui/custui.cpp:1004
 msgid "Silver"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1011
+#: src/emu/ui/custui.cpp:1005
 msgid "Gray"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1012
+#: src/emu/ui/custui.cpp:1006
 msgid "Black"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1014
+#: src/emu/ui/custui.cpp:1008
 msgid "Orange"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1015
+#: src/emu/ui/custui.cpp:1009
 msgid "Yellow"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1018
+#: src/emu/ui/custui.cpp:1012
 msgid "Violet"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:65
+#: src/emu/ui/datmenu.cpp:64
 msgid "Software History"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:67
+#: src/emu/ui/datmenu.cpp:66
 msgid "Software Usage"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:199
+#: src/emu/ui/datmenu.cpp:196
 msgid "Revision: "
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:287 src/emu/ui/selgame.cpp:40
-#: src/emu/ui/selgame.cpp:2152 src/emu/ui/selgame.cpp:2161
-#: src/emu/ui/selsoft.cpp:1577 src/emu/ui/selsoft.cpp:1597
-#: src/emu/ui/selsoft.cpp:1606
+#: src/emu/ui/datmenu.cpp:284 src/emu/ui/selgame.cpp:39
+#: src/emu/ui/selgame.cpp:2158 src/emu/ui/selgame.cpp:2167
+#: src/emu/ui/selsoft.cpp:1574 src/emu/ui/selsoft.cpp:1592
+#: src/emu/ui/selsoft.cpp:1601
 msgid "History"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:289 src/emu/ui/selgame.cpp:41
+#: src/emu/ui/datmenu.cpp:286 src/emu/ui/selgame.cpp:40
 msgid "Mameinfo"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:291 src/emu/ui/selgame.cpp:43
+#: src/emu/ui/datmenu.cpp:288 src/emu/ui/selgame.cpp:42
 msgid "Messinfo"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:293 src/emu/ui/selgame.cpp:42
+#: src/emu/ui/datmenu.cpp:290 src/emu/ui/selgame.cpp:41
 msgid "Sysinfo"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:295 src/emu/ui/selgame.cpp:46
+#: src/emu/ui/datmenu.cpp:292 src/emu/ui/selgame.cpp:45
 msgid "Mamescore"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:297 src/emu/ui/selgame.cpp:45
+#: src/emu/ui/datmenu.cpp:294 src/emu/ui/selgame.cpp:44
 msgid "Gameinit"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:299 src/emu/ui/selgame.cpp:44
+#: src/emu/ui/datmenu.cpp:296 src/emu/ui/selgame.cpp:43
 msgid "Command"
 msgstr ""
 
@@ -556,75 +556,75 @@ msgstr ""
 msgid "Remove %1$s Folder"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:158
+#: src/emu/ui/filesel.cpp:161
 msgid "File Already Exists - Override?"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:160 src/emu/ui/selgame.cpp:1568
-#: src/emu/ui/selgame.cpp:1569 src/emu/ui/selgame.cpp:1570
-#: src/emu/ui/selgame.cpp:1571 src/emu/ui/selgame.cpp:1572
-#: src/emu/ui/selgame.cpp:1573 src/emu/ui/selgame.cpp:1574
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/filesel.cpp:163 src/emu/ui/selgame.cpp:1576
+#: src/emu/ui/selgame.cpp:1577 src/emu/ui/selgame.cpp:1578
+#: src/emu/ui/selgame.cpp:1579 src/emu/ui/selgame.cpp:1580
+#: src/emu/ui/selgame.cpp:1581 src/emu/ui/selgame.cpp:1582
+#: src/emu/ui/selgame.cpp:1591
 msgid "No"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:161 src/emu/ui/selgame.cpp:1568
-#: src/emu/ui/selgame.cpp:1569 src/emu/ui/selgame.cpp:1570
-#: src/emu/ui/selgame.cpp:1571 src/emu/ui/selgame.cpp:1572
-#: src/emu/ui/selgame.cpp:1573 src/emu/ui/selgame.cpp:1574
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/filesel.cpp:164 src/emu/ui/selgame.cpp:1576
+#: src/emu/ui/selgame.cpp:1577 src/emu/ui/selgame.cpp:1578
+#: src/emu/ui/selgame.cpp:1579 src/emu/ui/selgame.cpp:1580
+#: src/emu/ui/selgame.cpp:1581 src/emu/ui/selgame.cpp:1582
+#: src/emu/ui/selgame.cpp:1591
 msgid "Yes"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:272
+#: src/emu/ui/filesel.cpp:275
 msgid "New Image Name:"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:278
+#: src/emu/ui/filesel.cpp:281
 msgid "Image Format:"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:284
+#: src/emu/ui/filesel.cpp:287
 msgid "Create"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:315
+#: src/emu/ui/filesel.cpp:318
 msgid "Please enter a file extension too"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:503 src/emu/ui/swlist.cpp:65
+#: src/emu/ui/filesel.cpp:506 src/emu/ui/swlist.cpp:65
 msgid "[empty slot]"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:507
+#: src/emu/ui/filesel.cpp:510
 msgid "[create]"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:511 src/emu/ui/swlist.cpp:76
+#: src/emu/ui/filesel.cpp:514 src/emu/ui/swlist.cpp:76
 msgid "[software list]"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:803
+#: src/emu/ui/filesel.cpp:806
 msgid "Select image format"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:863
+#: src/emu/ui/filesel.cpp:866
 msgid "Select access mode"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:864
+#: src/emu/ui/filesel.cpp:867
 msgid "Read-only"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:866
+#: src/emu/ui/filesel.cpp:869
 msgid "Read-write"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:867
+#: src/emu/ui/filesel.cpp:870
 msgid "Read this image, write to another image"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:868
+#: src/emu/ui/filesel.cpp:871
 msgid "Read this image, write to diff"
 msgstr ""
 
@@ -650,7 +650,7 @@ msgstr ""
 msgid "[empty]"
 msgstr ""
 
-#: src/emu/ui/info_pty.cpp:26 src/emu/ui/mainmenu.cpp:91
+#: src/emu/ui/info_pty.cpp:26 src/emu/ui/mainmenu.cpp:96
 msgid "Pseudo terminals"
 msgstr ""
 
@@ -666,7 +666,7 @@ msgstr ""
 msgid "Other Controls"
 msgstr ""
 
-#: src/emu/ui/inputmap.cpp:622 src/emu/ui/miscmenu.cpp:91
+#: src/emu/ui/inputmap.cpp:622 src/emu/ui/miscmenu.cpp:92
 #: src/emu/ui/slotopt.cpp:172
 msgid "Reset"
 msgstr ""
@@ -699,27 +699,27 @@ msgstr ""
 msgid "Machine Information"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:78
+#: src/emu/ui/mainmenu.cpp:80
 msgid "Image Information"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:81
+#: src/emu/ui/mainmenu.cpp:83
 msgid "File Manager"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:86
+#: src/emu/ui/mainmenu.cpp:92
 msgid "Tape Control"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:94
+#: src/emu/ui/mainmenu.cpp:99
 msgid "Bios Selection"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:100
+#: src/emu/ui/mainmenu.cpp:104
 msgid "Slot Devices"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:107
+#: src/emu/ui/mainmenu.cpp:109
 msgid "Barcode Reader"
 msgstr ""
 
@@ -727,43 +727,43 @@ msgstr ""
 msgid "Network Devices"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:119
+#: src/emu/ui/mainmenu.cpp:118
 msgid "Keyboard Mode"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:122
+#: src/emu/ui/mainmenu.cpp:121
 msgid "Slider Controls"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:125
+#: src/emu/ui/mainmenu.cpp:124
 msgid "Video Options"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:129
+#: src/emu/ui/mainmenu.cpp:128
 msgid "Crosshair Options"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:133
+#: src/emu/ui/mainmenu.cpp:132
 msgid "Cheat"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:136
+#: src/emu/ui/mainmenu.cpp:135
 msgid "Plugin Options"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:140
+#: src/emu/ui/mainmenu.cpp:139
 msgid "External DAT View"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:146
+#: src/emu/ui/mainmenu.cpp:145 src/emu/ui/miscmenu.cpp:785
 msgid "Add To Favorites"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:148
+#: src/emu/ui/mainmenu.cpp:147 src/emu/ui/miscmenu.cpp:787
 msgid "Remove From Favorites"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:155
+#: src/emu/ui/mainmenu.cpp:154
 msgid "Select New Machine"
 msgstr ""
 
@@ -803,189 +803,205 @@ msgstr ""
 msgid "Return to Previous Menu"
 msgstr ""
 
-#: src/emu/ui/menu.cpp:716
+#: src/emu/ui/menu.cpp:761
 msgid "Auto"
 msgstr ""
 
-#: src/emu/ui/menu.cpp:2133
+#: src/emu/ui/menu.cpp:2195
 msgid "Images"
 msgstr ""
 
-#: src/emu/ui/menu.cpp:2134
+#: src/emu/ui/menu.cpp:2196
 msgid "Infos"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Keyboard Mode:"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Natural"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Emulated"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:240
+#: src/emu/ui/miscmenu.cpp:241
 #, c-format
 msgid ""
 "Uptime: %1$d:%2$02d:%3$02d\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:242
+#: src/emu/ui/miscmenu.cpp:243
 #, c-format
 msgid ""
 "Uptime: %1$d:%2$02d\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:246
+#: src/emu/ui/miscmenu.cpp:247
 #, c-format
 msgid ""
 "Tickets dispensed: %1$d\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:257
+#: src/emu/ui/miscmenu.cpp:258
 msgid "Coin %1$c: NA%3$s\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:257
+#: src/emu/ui/miscmenu.cpp:258
 #, c-format
 msgid "Coin %1$c: %2$d%3$s\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:260
+#: src/emu/ui/miscmenu.cpp:261
 msgid " (locked)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:519
+#: src/emu/ui/miscmenu.cpp:520
 msgid "Visible Delay"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:617
+#: src/emu/ui/miscmenu.cpp:619
 #, c-format
 msgid "%s.xml saved under ui folder."
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:645
+#: src/emu/ui/miscmenu.cpp:647
 msgid "Name:             Description:\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:657
+#: src/emu/ui/miscmenu.cpp:659
 #, c-format
 msgid "%s.txt saved under ui folder."
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:675
-msgid "Export XML format (like -listxml)"
+#: src/emu/ui/miscmenu.cpp:677
+msgid "Export list in XML format (like -listxml)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:676
-msgid "Export TXT format (like -listfull)"
+#: src/emu/ui/miscmenu.cpp:678
+msgid "Export list in XML format (like -listxml, but exclude devices)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:734
-msgid "Dummy"
+#: src/emu/ui/miscmenu.cpp:679
+msgid "Export list in TXT format (like -listfull)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:736
-msgid "Save machine configuration"
-msgstr ""
-
-#: src/emu/ui/miscmenu.cpp:848 src/emu/ui/miscmenu.cpp:869
-#: src/emu/ui/selgame.cpp:594
-msgid "Plugins"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:218
-msgid "Filter"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:226
-msgid " ^!File"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:231
-msgid " ^!Category"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:254
-msgid "^!Setup custom filter"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:262
-msgid "Customize UI"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:263
-msgid "Configure Directories"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:266 src/emu/ui/sndmenu.cpp:151
-#: src/emu/ui/sndmenu.cpp:172
-msgid "Sound Options"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:269
-msgid "General Inputs"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:272
-msgid "Save Configuration"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:286 src/emu/ui/optsmenu.cpp:307
-msgid "Settings"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:327
-msgid "**Error saving ui.ini**"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:374
-#, c-format
-msgid "**Error saving %s.ini**"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:378
+#: src/emu/ui/miscmenu.cpp:729 src/emu/ui/optsmenu.cpp:376
 msgid ""
 "\n"
 "    Configuration saved    \n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/selector.cpp:166
+#: src/emu/ui/miscmenu.cpp:774
+msgid "Bios"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:776
+msgid "Driver"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:790
+msgid "Save machine configuration"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:806
+msgid "Configure machine:"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:868 src/emu/ui/selsoft.cpp:109
+msgid " (default)"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:953 src/emu/ui/miscmenu.cpp:973
+#: src/emu/ui/selgame.cpp:600
+msgid "Plugins"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:217
+msgid "Filter"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:225
+msgid " ^!File"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:230
+msgid " ^!Category"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:253
+msgid "^!Setup custom filter"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:261
+msgid "Customize UI"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:262
+msgid "Configure Directories"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:265 src/emu/ui/sndmenu.cpp:149
+#: src/emu/ui/sndmenu.cpp:169
+msgid "Sound Options"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:268
+msgid "General Inputs"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:271
+msgid "Save Configuration"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:285 src/emu/ui/optsmenu.cpp:305
+msgid "Settings"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:325
+msgid "**Error saving ui.ini**"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:372
+#, c-format
+msgid "**Error saving %s.ini**"
+msgstr ""
+
+#: src/emu/ui/selector.cpp:165
 msgid "Selection List - Search: "
 msgstr ""
 
-#: src/emu/ui/selector.cpp:196
+#: src/emu/ui/selector.cpp:194
 #, c-format
 msgid "Double click or press %1$s to select"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:39
+#: src/emu/ui/selgame.cpp:38
 msgid "General Info"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:374 src/emu/ui/selsoft.cpp:282
+#: src/emu/ui/selgame.cpp:380 src/emu/ui/selsoft.cpp:281
 #, c-format
 msgid ""
 "%s\n"
 " added to favorites list."
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:380 src/emu/ui/selgame.cpp:389
-#: src/emu/ui/selsoft.cpp:287
+#: src/emu/ui/selgame.cpp:386 src/emu/ui/selgame.cpp:395
+#: src/emu/ui/selsoft.cpp:286
 #, c-format
 msgid ""
 "%s\n"
 " removed from favorites list."
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:450
+#: src/emu/ui/selgame.cpp:457
 msgid ""
 "The selected machine is missing one or more required ROM or CHD images. "
 "Please select a different machine.\n"
@@ -993,275 +1009,275 @@ msgid ""
 "Press any key to continue."
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:589 src/emu/ui/simpleselgame.cpp:265
+#: src/emu/ui/selgame.cpp:595 src/emu/ui/simpleselgame.cpp:265
 msgid "Configure Options"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:752
+#: src/emu/ui/selgame.cpp:596
+msgid "Configure Machine"
+msgstr ""
+
+#: src/emu/ui/selgame.cpp:758
 #, c-format
 msgid "%1$s %2$s ( %3$d / %4$d machines (%5$d BIOS) )"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:762
+#: src/emu/ui/selgame.cpp:768
 #, c-format
 msgid "%1$s (%2$s - %3$s) - "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:769 src/emu/ui/selgame.cpp:775
+#: src/emu/ui/selgame.cpp:775 src/emu/ui/selgame.cpp:781
 #, c-format
 msgid "%1$s (%2$s) - "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:784
+#: src/emu/ui/selgame.cpp:790
 #, c-format
 msgid "%1$s Search: %2$s_"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:838
+#: src/emu/ui/selgame.cpp:844
 #, c-format
 msgid "Romset: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:841 src/emu/ui/selgame.cpp:890
-#: src/emu/ui/selsoft.cpp:751 src/emu/ui/selsoft.cpp:801
+#: src/emu/ui/selgame.cpp:847 src/emu/ui/selgame.cpp:896
+#: src/emu/ui/selsoft.cpp:750 src/emu/ui/selsoft.cpp:800
 #: src/emu/ui/simpleselgame.cpp:328
 #, c-format
 msgid "%1$s, %2$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:847 src/emu/ui/selsoft.cpp:757
+#: src/emu/ui/selgame.cpp:853 src/emu/ui/selsoft.cpp:756
 #, c-format
 msgid "Driver is clone of: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:849 src/emu/ui/selsoft.cpp:759
+#: src/emu/ui/selgame.cpp:855 src/emu/ui/selsoft.cpp:758
 msgid "Driver is parent"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:853 src/emu/ui/selsoft.cpp:763
+#: src/emu/ui/selgame.cpp:859 src/emu/ui/selsoft.cpp:762
 #: src/emu/ui/simpleselgame.cpp:335
 msgid "Overall: NOT WORKING"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:855 src/emu/ui/selsoft.cpp:765
+#: src/emu/ui/selgame.cpp:861 src/emu/ui/selsoft.cpp:764
 #: src/emu/ui/simpleselgame.cpp:337
 msgid "Overall: Unemulated Protection"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:857 src/emu/ui/selsoft.cpp:767
+#: src/emu/ui/selgame.cpp:863 src/emu/ui/selsoft.cpp:766
 #: src/emu/ui/simpleselgame.cpp:339
 msgid "Overall: Working"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:861 src/emu/ui/selsoft.cpp:771
+#: src/emu/ui/selgame.cpp:867 src/emu/ui/selsoft.cpp:770
 msgid "Graphics: Imperfect, "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:863 src/emu/ui/selsoft.cpp:773
+#: src/emu/ui/selgame.cpp:869 src/emu/ui/selsoft.cpp:772
 msgid "Graphics: OK, "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:866 src/emu/ui/selsoft.cpp:776
+#: src/emu/ui/selgame.cpp:872 src/emu/ui/selsoft.cpp:775
 msgid "Sound: Unimplemented"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:868 src/emu/ui/selsoft.cpp:778
+#: src/emu/ui/selgame.cpp:874 src/emu/ui/selsoft.cpp:777
 msgid "Sound: Imperfect"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:870 src/emu/ui/selsoft.cpp:780
+#: src/emu/ui/selgame.cpp:876 src/emu/ui/selsoft.cpp:779
 msgid "Sound: OK"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:887
+#: src/emu/ui/selgame.cpp:893
 #, c-format
 msgid "System: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:894 src/emu/ui/selsoft.cpp:805
+#: src/emu/ui/selgame.cpp:900 src/emu/ui/selsoft.cpp:804
 #, c-format
 msgid "Software is clone of: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:896 src/emu/ui/selsoft.cpp:807
+#: src/emu/ui/selgame.cpp:902 src/emu/ui/selsoft.cpp:806
 msgid "Software is parent"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:901 src/emu/ui/selsoft.cpp:812
+#: src/emu/ui/selgame.cpp:907 src/emu/ui/selsoft.cpp:811
 msgid "Supported: No"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:906 src/emu/ui/selsoft.cpp:817
+#: src/emu/ui/selgame.cpp:912 src/emu/ui/selsoft.cpp:816
 msgid "Supported: Partial"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:911 src/emu/ui/selsoft.cpp:822
+#: src/emu/ui/selgame.cpp:917 src/emu/ui/selsoft.cpp:821
 msgid "Supported: Yes"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:916 src/emu/ui/selsoft.cpp:827
+#: src/emu/ui/selgame.cpp:922 src/emu/ui/selsoft.cpp:826
 #, c-format
 msgid "romset: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:923
+#: src/emu/ui/selgame.cpp:929
 #, c-format
 msgid "%1$s %2$s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1535
+#: src/emu/ui/selgame.cpp:1543
 #, c-format
 msgid "Romset: %1$-.100s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1536
+#: src/emu/ui/selgame.cpp:1544
 #, c-format
 msgid "Year: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1537
+#: src/emu/ui/selgame.cpp:1545
 #, c-format
 msgid "Manufacturer: %1$-.100s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1541
+#: src/emu/ui/selgame.cpp:1549
 #, c-format
 msgid "Driver is Clone of: %1$-.100s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1543
+#: src/emu/ui/selgame.cpp:1551
 msgid "Driver is Parent\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1546
+#: src/emu/ui/selgame.cpp:1554
 msgid "Overall: NOT WORKING\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1548
+#: src/emu/ui/selgame.cpp:1556
 msgid "Overall: Unemulated Protection\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1550
+#: src/emu/ui/selgame.cpp:1558
 msgid "Overall: Working\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1553
+#: src/emu/ui/selgame.cpp:1561
 msgid "Graphics: Imperfect Colors\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1557
+#: src/emu/ui/selgame.cpp:1565
 msgid "Graphics: Imperfect\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1559
+#: src/emu/ui/selgame.cpp:1567
 msgid "Graphics: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1562
+#: src/emu/ui/selgame.cpp:1570
 msgid "Sound: Unimplemented\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1564
+#: src/emu/ui/selgame.cpp:1572
 msgid "Sound: Imperfect\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1566
+#: src/emu/ui/selgame.cpp:1574
 msgid "Sound: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1568
+#: src/emu/ui/selgame.cpp:1576
 #, c-format
 msgid "Driver is Skeleton: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1569
+#: src/emu/ui/selgame.cpp:1577
 #, c-format
 msgid "Game is Mechanical: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1570
+#: src/emu/ui/selgame.cpp:1578
 #, c-format
 msgid "Requires Artwork: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1571
+#: src/emu/ui/selgame.cpp:1579
 #, c-format
 msgid "Requires Clickable Artwork: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1572
+#: src/emu/ui/selgame.cpp:1580
 #, c-format
 msgid "Support Cocktail: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1573
+#: src/emu/ui/selgame.cpp:1581
 #, c-format
 msgid "Driver is Bios: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1574
+#: src/emu/ui/selgame.cpp:1582
 #, c-format
 msgid "Support Save: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 #, c-format
 msgid "Screen Orientation: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 msgid "Vertical"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 msgid "Horizontal"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/selgame.cpp:1591
 #, c-format
 msgid "Requires CHD: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1596
+#: src/emu/ui/selgame.cpp:1604
 msgid "Roms Audit Pass: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1598
+#: src/emu/ui/selgame.cpp:1606
 msgid "Roms Audit Pass: BAD\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1601
+#: src/emu/ui/selgame.cpp:1609
 msgid "Samples Audit Pass: None Needed\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1603
+#: src/emu/ui/selgame.cpp:1611
 msgid "Samples Audit Pass: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1605
+#: src/emu/ui/selgame.cpp:1613
 msgid "Samples Audit Pass: BAD\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1608
+#: src/emu/ui/selgame.cpp:1616
 msgid ""
 "Roms Audit Pass: Disabled\n"
 "Samples Audit Pass: Disabled\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:2049 src/emu/ui/selgame.cpp:2212
-#: src/emu/ui/selsoft.cpp:1662
+#: src/emu/ui/selgame.cpp:2055 src/emu/ui/selgame.cpp:2216
+#: src/emu/ui/selsoft.cpp:1655
 msgid "No Infos Available"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:2162 src/emu/ui/selsoft.cpp:1607
+#: src/emu/ui/selgame.cpp:2168 src/emu/ui/selsoft.cpp:1602
 msgid "Usage"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:110
-msgid " (default)"
-msgstr ""
-
-#: src/emu/ui/selsoft.cpp:381
+#: src/emu/ui/selsoft.cpp:380
 msgid ""
 "The selected software is missing one or more required files. Please select a "
 "different software.\n"
@@ -1269,57 +1285,57 @@ msgid ""
 "Press any key to continue."
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:684
+#: src/emu/ui/selsoft.cpp:683
 #, c-format
-msgid "%1$s %2$s ( %3$d / %4$d softwares )"
+msgid "%1$s %2$s ( %3$d / %4$d software packages )"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:685
+#: src/emu/ui/selsoft.cpp:684
 #, c-format
 msgid "Driver: \"%1$s\" software list "
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:688
+#: src/emu/ui/selsoft.cpp:687
 #, c-format
 msgid "Region: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:690
+#: src/emu/ui/selsoft.cpp:689
 #, c-format
 msgid "Publisher: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:692
+#: src/emu/ui/selsoft.cpp:691
 #, c-format
 msgid "Year: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:694
+#: src/emu/ui/selsoft.cpp:693
 #, c-format
 msgid "Software List: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:696
+#: src/emu/ui/selsoft.cpp:695
 #, c-format
 msgid "Device type: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:698
+#: src/emu/ui/selsoft.cpp:697
 #, c-format
 msgid "%s Search: %s_"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:748 src/emu/ui/selsoft.cpp:798
+#: src/emu/ui/selsoft.cpp:747 src/emu/ui/selsoft.cpp:797
 #: src/emu/ui/simpleselgame.cpp:325
 #, c-format
 msgid "%1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:1998 src/emu/ui/selsoft.cpp:2018
+#: src/emu/ui/selsoft.cpp:1991 src/emu/ui/selsoft.cpp:2011
 msgid "Software part selection:"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:2136 src/emu/ui/selsoft.cpp:2156
+#: src/emu/ui/selsoft.cpp:2129 src/emu/ui/selsoft.cpp:2149
 msgid "Bios selection:"
 msgstr ""
 
@@ -1367,15 +1383,15 @@ msgstr ""
 msgid " [internal]"
 msgstr ""
 
-#: src/emu/ui/sndmenu.cpp:135
+#: src/emu/ui/sndmenu.cpp:133
 msgid "Sound"
 msgstr ""
 
-#: src/emu/ui/sndmenu.cpp:136
+#: src/emu/ui/sndmenu.cpp:134
 msgid "Sample Rate"
 msgstr ""
 
-#: src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/sndmenu.cpp:135
 msgid "Use External Samples"
 msgstr ""
 
@@ -1444,80 +1460,80 @@ msgstr ""
 msgid "Fast Forward"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:419
+#: src/emu/ui/ui.cpp:418
 msgid "This driver requires images to be loaded in the following device(s): "
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1074
+#: src/emu/ui/ui.cpp:1071
 msgid ""
 "One or more ROMs/CHDs for this machine are incorrect. The machine may not "
 "run correctly.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1087
+#: src/emu/ui/ui.cpp:1084
 msgid ""
 "There are known problems with this machine\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1091
+#: src/emu/ui/ui.cpp:1088
 msgid ""
 "One or more ROMs/CHDs for this machine have not been correctly dumped.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1095
+#: src/emu/ui/ui.cpp:1092
 #, c-format
 msgid "The keyboard emulation may not be 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1097
+#: src/emu/ui/ui.cpp:1094
 #, c-format
 msgid "The colors aren't 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1099
+#: src/emu/ui/ui.cpp:1096
 msgid "The colors are completely wrong.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1101
+#: src/emu/ui/ui.cpp:1098
 #, c-format
 msgid "The video emulation isn't 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1103
+#: src/emu/ui/ui.cpp:1100
 #, c-format
 msgid "The sound emulation isn't 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1105
+#: src/emu/ui/ui.cpp:1102
 msgid "The machine lacks sound.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1108
+#: src/emu/ui/ui.cpp:1105
 msgid "Screen flipping in cocktail mode is not supported.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1112
+#: src/emu/ui/ui.cpp:1109
 msgid "The machine requires external artwork files\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1117
+#: src/emu/ui/ui.cpp:1114
 msgid ""
 "This machine was never completed. It may exhibit strange behavior or missing "
 "elements that are not bugs in the emulation.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1122
+#: src/emu/ui/ui.cpp:1119
 msgid ""
 "This machine has no sound hardware, MAME will produce no sounds, this is "
 "expected behaviour.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1130
+#: src/emu/ui/ui.cpp:1127
 msgid "The machine has protection which isn't fully emulated.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1133
+#: src/emu/ui/ui.cpp:1130
 msgid ""
 "\n"
 "THIS MACHINE DOESN'T WORK. The emulation for this machine is not yet "
@@ -1525,7 +1541,7 @@ msgid ""
 "the developers to improve the emulation.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1137
+#: src/emu/ui/ui.cpp:1134
 msgid ""
 "\n"
 "Certain elements of this machine cannot be emulated as it requires actual "
@@ -1533,21 +1549,21 @@ msgid ""
 "to fully play this machine.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1156
+#: src/emu/ui/ui.cpp:1153
 msgid ""
 "\n"
 "\n"
 "There are working clones of this machine: "
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1170
+#: src/emu/ui/ui.cpp:1167
 msgid ""
 "\n"
 "\n"
 "Press any key to continue"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1185
+#: src/emu/ui/ui.cpp:1182
 #, c-format
 msgid ""
 "%1$s\n"
@@ -1557,98 +1573,98 @@ msgid ""
 "CPU:\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1221 src/emu/ui/ui.cpp:1260
+#: src/emu/ui/ui.cpp:1218 src/emu/ui/ui.cpp:1257
 msgid "MHz"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1221 src/emu/ui/ui.cpp:1260
+#: src/emu/ui/ui.cpp:1218 src/emu/ui/ui.cpp:1257
 msgid "kHz"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1235
+#: src/emu/ui/ui.cpp:1232
 msgid ""
 "\n"
 "Sound:\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1264
+#: src/emu/ui/ui.cpp:1261
 msgid ""
 "\n"
 "Video:\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1268
+#: src/emu/ui/ui.cpp:1265
 msgid "None\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1275
+#: src/emu/ui/ui.cpp:1272
 msgid "Vector"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1286
+#: src/emu/ui/ui.cpp:1283
 #, c-format
 msgid "%1$s: %2$s\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1286
+#: src/emu/ui/ui.cpp:1283
 msgid "%2$s\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1541 src/emu/ui/ui.cpp:1551
+#: src/emu/ui/ui.cpp:1538 src/emu/ui/ui.cpp:1548
 msgid "Keyboard Emulation Status"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1543
+#: src/emu/ui/ui.cpp:1540
 msgid "Mode: PARTIAL Emulation"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1544
+#: src/emu/ui/ui.cpp:1541
 msgid "UI:   Enabled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1546 src/emu/ui/ui.cpp:1556
+#: src/emu/ui/ui.cpp:1543 src/emu/ui/ui.cpp:1553
 msgid "**Use ScrLock to toggle**"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1553
+#: src/emu/ui/ui.cpp:1550
 msgid "Mode: FULL Emulation"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1554
+#: src/emu/ui/ui.cpp:1551
 msgid "UI:   Disabled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1692
+#: src/emu/ui/ui.cpp:1689
 msgid "Autofire can't be enabled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1731
+#: src/emu/ui/ui.cpp:1728
 msgid "Select position to save to"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1733
+#: src/emu/ui/ui.cpp:1730
 msgid "Select position to load from"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1757
+#: src/emu/ui/ui.cpp:1754
 msgid "Save cancelled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1759
+#: src/emu/ui/ui.cpp:1756
 msgid "Load cancelled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1802
+#: src/emu/ui/ui.cpp:1799
 #, c-format
 msgid "Save to position %s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1807
+#: src/emu/ui/ui.cpp:1804
 #, c-format
 msgid "Load from position %s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1847
+#: src/emu/ui/ui.cpp:1844
 #, c-format
 msgid ""
 "Are you sure you want to quit?\n"
@@ -1657,173 +1673,173 @@ msgid ""
 "Press ''%2$s'' to return to emulation."
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1917
+#: src/emu/ui/ui.cpp:1914
 msgid "Master Volume"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1926
+#: src/emu/ui/ui.cpp:1923
 #, c-format
 msgid "%1$s Volume"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1949
+#: src/emu/ui/ui.cpp:1946
 #, c-format
 msgid "Overclock CPU %1$s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1968
+#: src/emu/ui/ui.cpp:1965
 #, c-format
 msgid "%1$s Refresh Rate"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1973
+#: src/emu/ui/ui.cpp:1970
 #, c-format
 msgid "%1$s Brightness"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1975
+#: src/emu/ui/ui.cpp:1972
 #, c-format
 msgid "%1$s Contrast"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1977
+#: src/emu/ui/ui.cpp:1974
 #, c-format
 msgid "%1$s Gamma"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1981
+#: src/emu/ui/ui.cpp:1978
 #, c-format
 msgid "%1$s Horiz Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1983
+#: src/emu/ui/ui.cpp:1980
 #, c-format
 msgid "%1$s Horiz Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1985
+#: src/emu/ui/ui.cpp:1982
 #, c-format
 msgid "%1$s Vert Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1987
+#: src/emu/ui/ui.cpp:1984
 #, c-format
 msgid "%1$s Vert Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2005
+#: src/emu/ui/ui.cpp:2002
 #, c-format
 msgid "Laserdisc '%1$s' Horiz Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2007
+#: src/emu/ui/ui.cpp:2004
 #, c-format
 msgid "Laserdisc '%1$s' Horiz Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2009
+#: src/emu/ui/ui.cpp:2006
 #, c-format
 msgid "Laserdisc '%1$s' Vert Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2011
+#: src/emu/ui/ui.cpp:2008
 #, c-format
 msgid "Laserdisc '%1$s' Vert Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2021
+#: src/emu/ui/ui.cpp:2018
 msgid "Vector Flicker"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2022
+#: src/emu/ui/ui.cpp:2019
 msgid "Beam Width Minimum"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2023
+#: src/emu/ui/ui.cpp:2020
 msgid "Beam Width Maximum"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2024
+#: src/emu/ui/ui.cpp:2021
 msgid "Beam Intensity Weight"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2037
+#: src/emu/ui/ui.cpp:2034
 #, c-format
 msgid "Crosshair Scale %1$s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2037 src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2034 src/emu/ui/ui.cpp:2036
 msgid "X"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2037 src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2034 src/emu/ui/ui.cpp:2036
 msgid "Y"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2036
 #, c-format
 msgid "Crosshair Offset %1$s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2071
+#: src/emu/ui/ui.cpp:2068
 #, c-format
 msgid "%1$3ddB"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2115
+#: src/emu/ui/ui.cpp:2112
 #, c-format
 msgid "%1$d%%"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2131
+#: src/emu/ui/ui.cpp:2128
 #, c-format
 msgid "%1$3.0f%%"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2154
+#: src/emu/ui/ui.cpp:2151
 #, c-format
 msgid "%1$.3ffps"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2177 src/emu/ui/ui.cpp:2199 src/emu/ui/ui.cpp:2220
-#: src/emu/ui/ui.cpp:2242 src/emu/ui/ui.cpp:2264 src/emu/ui/ui.cpp:2286
-#: src/emu/ui/ui.cpp:2308 src/emu/ui/ui.cpp:2330 src/emu/ui/ui.cpp:2352
-#: src/emu/ui/ui.cpp:2374 src/emu/ui/ui.cpp:2396
+#: src/emu/ui/ui.cpp:2174 src/emu/ui/ui.cpp:2196 src/emu/ui/ui.cpp:2217
+#: src/emu/ui/ui.cpp:2239 src/emu/ui/ui.cpp:2261 src/emu/ui/ui.cpp:2283
+#: src/emu/ui/ui.cpp:2305 src/emu/ui/ui.cpp:2327 src/emu/ui/ui.cpp:2349
+#: src/emu/ui/ui.cpp:2371 src/emu/ui/ui.cpp:2393
 #, c-format
 msgid "%1$.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2412 src/emu/ui/ui.cpp:2428 src/emu/ui/ui.cpp:2444
-#: src/emu/ui/ui.cpp:2460
+#: src/emu/ui/ui.cpp:2408 src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2438
+#: src/emu/ui/ui.cpp:2453
 #, c-format
 msgid "%1$1.2f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2476
+#: src/emu/ui/ui.cpp:2469
 #, c-format
 msgid "Screen '%1$s'"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2478
+#: src/emu/ui/ui.cpp:2471
 msgid "Screen"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2494
+#: src/emu/ui/ui.cpp:2487
 #, c-format
 msgid "Crosshair Scale X %1$1.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2494
+#: src/emu/ui/ui.cpp:2487
 #, c-format
 msgid "Crosshair Scale Y %1$1.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2513
+#: src/emu/ui/ui.cpp:2506
 #, c-format
 msgid "Crosshair Offset X %1$1.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2513
+#: src/emu/ui/ui.cpp:2506
 #, c-format
 msgid "Crosshair Offset Y %1$1.3f"
 msgstr ""
@@ -1865,10 +1881,10 @@ msgstr ""
 msgid "Full"
 msgstr ""
 
-#: src/emu/ui/viewgfx.cpp:392
+#: src/emu/ui/viewgfx.cpp:391
 msgid " COLORS"
 msgstr ""
 
-#: src/emu/ui/viewgfx.cpp:392
+#: src/emu/ui/viewgfx.cpp:391
 msgid " PENS"
 msgstr ""
diff --git a/language/Dutch/strings.po b/language/Dutch/strings.po
index 61ed73f4968..2f489bdc592 100644
--- a/language/Dutch/strings.po
+++ b/language/Dutch/strings.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MAME\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-11 03:33+0200\n"
+"POT-Creation-Date: 2016-04-15 17:42+0200\n"
 "PO-Revision-Date: 2016-02-20 18:03+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: MAME Language Team\n"
@@ -63,14 +63,14 @@ msgstr "Alles opnieuw inlezen"
 msgid "Autofire Status"
 msgstr "Autofire status"
 
-#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1698
+#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1695
 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211
 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219
 #: src/emu/ui/videoopt.cpp:223
 msgid "Disabled"
 msgstr "Uitgeschakeld"
 
-#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1698
+#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1695
 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211
 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219
 #: src/emu/ui/videoopt.cpp:223
@@ -78,14 +78,14 @@ msgid "Enabled"
 msgstr "Ingeschakeld"
 
 #: src/emu/ui/cheatopt.cpp:282 src/emu/ui/cheatopt.cpp:288
-#: src/emu/ui/menu.cpp:710 src/emu/ui/miscmenu.cpp:831
-#: src/emu/ui/sndmenu.cpp:135 src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/menu.cpp:755 src/emu/ui/miscmenu.cpp:936
+#: src/emu/ui/sndmenu.cpp:133 src/emu/ui/sndmenu.cpp:135
 msgid "On"
 msgstr "Aan"
 
 #: src/emu/ui/cheatopt.cpp:282 src/emu/ui/cheatopt.cpp:288
-#: src/emu/ui/menu.cpp:713 src/emu/ui/miscmenu.cpp:831
-#: src/emu/ui/sndmenu.cpp:135 src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/menu.cpp:758 src/emu/ui/miscmenu.cpp:936
+#: src/emu/ui/sndmenu.cpp:133 src/emu/ui/sndmenu.cpp:135
 msgid "Off"
 msgstr "Uit"
 
@@ -97,317 +97,317 @@ msgstr "Geen knoppen gevonden op deze machine!"
 msgid "Autofire Delay"
 msgstr "Vertraging autofire"
 
-#: src/emu/ui/custmenu.cpp:158 src/emu/ui/custmenu.cpp:447
+#: src/emu/ui/custmenu.cpp:157 src/emu/ui/custmenu.cpp:445
 msgid "Main filter"
 msgstr "Hoofdfilter"
 
-#: src/emu/ui/custmenu.cpp:167 src/emu/ui/custmenu.cpp:456
+#: src/emu/ui/custmenu.cpp:166 src/emu/ui/custmenu.cpp:454
 msgid "Other filter"
 msgstr "Ander filter"
 
-#: src/emu/ui/custmenu.cpp:176 src/emu/ui/optsmenu.cpp:239
+#: src/emu/ui/custmenu.cpp:175 src/emu/ui/optsmenu.cpp:238
 msgid "^!Manufacturer"
 msgstr "^!Fabrikant"
 
-#: src/emu/ui/custmenu.cpp:185 src/emu/ui/custmenu.cpp:474
-#: src/emu/ui/optsmenu.cpp:247
+#: src/emu/ui/custmenu.cpp:184 src/emu/ui/custmenu.cpp:472
+#: src/emu/ui/optsmenu.cpp:246
 msgid "^!Year"
 msgstr "^!Jaar"
 
-#: src/emu/ui/custmenu.cpp:194 src/emu/ui/custmenu.cpp:510
+#: src/emu/ui/custmenu.cpp:193 src/emu/ui/custmenu.cpp:508
 msgid "Remove last filter"
 msgstr "Verwijder laatste filter"
 
-#: src/emu/ui/custmenu.cpp:197 src/emu/ui/custmenu.cpp:513
+#: src/emu/ui/custmenu.cpp:196 src/emu/ui/custmenu.cpp:511
 msgid "Add filter"
 msgstr "Voeg filter toe"
 
-#: src/emu/ui/custmenu.cpp:212 src/emu/ui/custmenu.cpp:233
-#: src/emu/ui/custmenu.cpp:529 src/emu/ui/custmenu.cpp:550
+#: src/emu/ui/custmenu.cpp:211 src/emu/ui/custmenu.cpp:231
+#: src/emu/ui/custmenu.cpp:527 src/emu/ui/custmenu.cpp:547
 msgid "Select custom filters:"
 msgstr "Kies custom filter:"
 
-#: src/emu/ui/custmenu.cpp:465
+#: src/emu/ui/custmenu.cpp:463
 msgid "^!Publisher"
 msgstr "^!Uitgever"
 
-#: src/emu/ui/custmenu.cpp:483
+#: src/emu/ui/custmenu.cpp:481
 msgid "^!Software List"
 msgstr "^!Softwarelijst"
 
-#: src/emu/ui/custmenu.cpp:492
+#: src/emu/ui/custmenu.cpp:490
 msgid "^!Device type"
 msgstr "^!Device type"
 
-#: src/emu/ui/custmenu.cpp:501
+#: src/emu/ui/custmenu.cpp:499
 msgid "^!Region"
 msgstr "^!Regio"
 
-#: src/emu/ui/custui.cpp:23
+#: src/emu/ui/custui.cpp:22
 msgid "Show All"
 msgstr "Toon alles"
 
-#: src/emu/ui/custui.cpp:24
+#: src/emu/ui/custui.cpp:23
 msgid "Hide Filters"
 msgstr "Verberg filters"
 
-#: src/emu/ui/custui.cpp:25
+#: src/emu/ui/custui.cpp:24
 msgid "Hide Info/Image"
 msgstr "Verberg info/plaatje"
 
-#: src/emu/ui/custui.cpp:26
+#: src/emu/ui/custui.cpp:25
 msgid "Hide Both"
 msgstr "Verberg beide"
 
-#: src/emu/ui/custui.cpp:142
+#: src/emu/ui/custui.cpp:141
 msgid "Fonts"
 msgstr "Lettertypes"
 
-#: src/emu/ui/custui.cpp:143
+#: src/emu/ui/custui.cpp:142
 msgid "Colors"
 msgstr "Kleuren"
 
-#: src/emu/ui/custui.cpp:148 src/emu/ui/dirmenu.cpp:33
+#: src/emu/ui/custui.cpp:147 src/emu/ui/dirmenu.cpp:33
 msgid "Language"
 msgstr "Taal"
 
-#: src/emu/ui/custui.cpp:152
+#: src/emu/ui/custui.cpp:151
 msgid "Show side panels"
 msgstr "Toon zijpanelen"
 
-#: src/emu/ui/custui.cpp:167 src/emu/ui/custui.cpp:188
+#: src/emu/ui/custui.cpp:166 src/emu/ui/custui.cpp:186
 msgid "Custom UI Settings"
 msgstr "Instellingen gebruikersinterface"
 
-#: src/emu/ui/custui.cpp:246
+#: src/emu/ui/custui.cpp:244
 msgid "default"
 msgstr "standaard"
 
-#: src/emu/ui/custui.cpp:349
+#: src/emu/ui/custui.cpp:347
 msgid "UI Font"
 msgstr "Lettertype gebruikersinterface"
 
-#: src/emu/ui/custui.cpp:354
+#: src/emu/ui/custui.cpp:352
 msgid "Bold"
 msgstr "Vet"
 
-#: src/emu/ui/custui.cpp:355
+#: src/emu/ui/custui.cpp:353
 msgid "Italic"
 msgstr "Cursief"
 
-#: src/emu/ui/custui.cpp:360
+#: src/emu/ui/custui.cpp:358
 msgid "Lines"
 msgstr "Lijnen"
 
-#: src/emu/ui/custui.cpp:366
+#: src/emu/ui/custui.cpp:364
 msgid "Infos text size"
 msgstr "Tekstgrootte informatie"
 
-#: src/emu/ui/custui.cpp:383
+#: src/emu/ui/custui.cpp:381
 msgid "UI Fonts Settings"
 msgstr "Instellingen lettertype gebruikersinterface"
 
-#: src/emu/ui/custui.cpp:411
+#: src/emu/ui/custui.cpp:408
 msgid "Sample text - Lorem ipsum dolor sit amet, consectetur adipiscing elit."
 msgstr ""
 "Voorbeeldtekst - Lorem ipsum dolor sit amet, consectetur adipiscing elit."
 
-#: src/emu/ui/custui.cpp:509
+#: src/emu/ui/custui.cpp:506
 msgid "Normal text"
 msgstr "Normale tekst"
 
-#: src/emu/ui/custui.cpp:510
+#: src/emu/ui/custui.cpp:507
 msgid "Selected color"
 msgstr "Geselecteerde kleur"
 
-#: src/emu/ui/custui.cpp:511
+#: src/emu/ui/custui.cpp:508
 msgid "Normal text background"
 msgstr "Normale tekst achtergrond"
 
-#: src/emu/ui/custui.cpp:512
+#: src/emu/ui/custui.cpp:509
 msgid "Selected background color"
 msgstr "Geselecteerde achtergrondkleur"
 
-#: src/emu/ui/custui.cpp:513
+#: src/emu/ui/custui.cpp:510
 msgid "Subitem color"
 msgstr "Kleur subitem"
 
-#: src/emu/ui/custui.cpp:514 src/emu/ui/custui.cpp:610
+#: src/emu/ui/custui.cpp:511 src/emu/ui/custui.cpp:606
 msgid "Clone"
 msgstr "Clone/Variant"
 
-#: src/emu/ui/custui.cpp:515
+#: src/emu/ui/custui.cpp:512
 msgid "Border"
 msgstr "Rand"
 
-#: src/emu/ui/custui.cpp:516
+#: src/emu/ui/custui.cpp:513
 msgid "Background"
 msgstr "Achtergrond"
 
-#: src/emu/ui/custui.cpp:517
+#: src/emu/ui/custui.cpp:514
 msgid "Dipswitch"
 msgstr "Dipswitch"
 
-#: src/emu/ui/custui.cpp:518
+#: src/emu/ui/custui.cpp:515
 msgid "Unavailable color"
 msgstr "Niet beschikbaar kleur"
 
-#: src/emu/ui/custui.cpp:519
+#: src/emu/ui/custui.cpp:516
 msgid "Slider color"
 msgstr "Slider kleur"
 
-#: src/emu/ui/custui.cpp:520
+#: src/emu/ui/custui.cpp:517
 msgid "Gfx viewer background"
 msgstr "Gfx-viewer achtergrond"
 
-#: src/emu/ui/custui.cpp:521
+#: src/emu/ui/custui.cpp:518
 msgid "Mouse over color"
 msgstr "Muis-over kleur"
 
-#: src/emu/ui/custui.cpp:522
+#: src/emu/ui/custui.cpp:519
 msgid "Mouse over background color"
 msgstr "Muis-over achtergrond kleur"
 
-#: src/emu/ui/custui.cpp:523
+#: src/emu/ui/custui.cpp:520
 msgid "Mouse down color"
 msgstr "Muis-down kleur"
 
-#: src/emu/ui/custui.cpp:524
+#: src/emu/ui/custui.cpp:521
 msgid "Mouse down background color"
 msgstr "Muis-down achtergrond kleur"
 
-#: src/emu/ui/custui.cpp:527
+#: src/emu/ui/custui.cpp:524
 msgid "Restore originals colors"
 msgstr "Herstel originele kleuren"
 
-#: src/emu/ui/custui.cpp:543
+#: src/emu/ui/custui.cpp:540
 msgid "UI Colors Settings"
 msgstr "Kleurinstellingen gebruikersinterface"
 
-#: src/emu/ui/custui.cpp:572
+#: src/emu/ui/custui.cpp:568
 #, c-format
 msgid "Double click or press %1$s to change the color value"
 msgstr "Dubbelklik of druk op %1$s om de kleurwaarde te wijzigen"
 
-#: src/emu/ui/custui.cpp:598
+#: src/emu/ui/custui.cpp:594
 msgid "Menu Preview"
 msgstr "Menu Voorbeeld"
 
-#: src/emu/ui/custui.cpp:606
+#: src/emu/ui/custui.cpp:602
 msgid "Normal"
 msgstr "Normaal"
 
-#: src/emu/ui/custui.cpp:607
+#: src/emu/ui/custui.cpp:603
 msgid "Subitem"
 msgstr "Onderdeel"
 
-#: src/emu/ui/custui.cpp:608
+#: src/emu/ui/custui.cpp:604
 msgid "Selected"
 msgstr "Geselecteerd"
 
-#: src/emu/ui/custui.cpp:609
+#: src/emu/ui/custui.cpp:605
 msgid "Mouse Over"
 msgstr "Muis-over"
 
-#: src/emu/ui/custui.cpp:841 src/emu/ui/custui.cpp:844
+#: src/emu/ui/custui.cpp:837 src/emu/ui/custui.cpp:840
 msgid "Alpha"
 msgstr "Alpha"
 
-#: src/emu/ui/custui.cpp:849 src/emu/ui/custui.cpp:852
-#: src/emu/ui/custui.cpp:1013
+#: src/emu/ui/custui.cpp:845 src/emu/ui/custui.cpp:848
+#: src/emu/ui/custui.cpp:1007
 msgid "Red"
 msgstr "Rood"
 
-#: src/emu/ui/custui.cpp:857 src/emu/ui/custui.cpp:860
-#: src/emu/ui/custui.cpp:1016
+#: src/emu/ui/custui.cpp:853 src/emu/ui/custui.cpp:856
+#: src/emu/ui/custui.cpp:1010
 msgid "Green"
 msgstr "Groen"
 
-#: src/emu/ui/custui.cpp:865 src/emu/ui/custui.cpp:868
-#: src/emu/ui/custui.cpp:1017
+#: src/emu/ui/custui.cpp:861 src/emu/ui/custui.cpp:864
+#: src/emu/ui/custui.cpp:1011
 msgid "Blue"
 msgstr "Blauw"
 
-#: src/emu/ui/custui.cpp:871
+#: src/emu/ui/custui.cpp:867
 msgid "Choose from palette"
 msgstr "Kies uit palet"
 
-#: src/emu/ui/custui.cpp:887
+#: src/emu/ui/custui.cpp:883
 msgid " - ARGB Settings"
 msgstr " - ARGB Instellingen"
 
-#: src/emu/ui/custui.cpp:912
+#: src/emu/ui/custui.cpp:907
 msgid "Color preview ="
 msgstr "Kleur voorbeeld ="
 
-#: src/emu/ui/custui.cpp:1009
+#: src/emu/ui/custui.cpp:1003
 msgid "White"
 msgstr "Wit"
 
-#: src/emu/ui/custui.cpp:1010
+#: src/emu/ui/custui.cpp:1004
 msgid "Silver"
 msgstr "Zilver"
 
-#: src/emu/ui/custui.cpp:1011
+#: src/emu/ui/custui.cpp:1005
 msgid "Gray"
 msgstr "Grijs"
 
-#: src/emu/ui/custui.cpp:1012
+#: src/emu/ui/custui.cpp:1006
 msgid "Black"
 msgstr "Zwart"
 
-#: src/emu/ui/custui.cpp:1014
+#: src/emu/ui/custui.cpp:1008
 msgid "Orange"
 msgstr "Oranje"
 
-#: src/emu/ui/custui.cpp:1015
+#: src/emu/ui/custui.cpp:1009
 msgid "Yellow"
 msgstr "Geel"
 
-#: src/emu/ui/custui.cpp:1018
+#: src/emu/ui/custui.cpp:1012
 msgid "Violet"
 msgstr "Violet"
 
-#: src/emu/ui/datmenu.cpp:65
+#: src/emu/ui/datmenu.cpp:64
 msgid "Software History"
 msgstr "Softwaregeschiedenis"
 
-#: src/emu/ui/datmenu.cpp:67
+#: src/emu/ui/datmenu.cpp:66
 msgid "Software Usage"
 msgstr "Softwaregebruik"
 
-#: src/emu/ui/datmenu.cpp:199
+#: src/emu/ui/datmenu.cpp:196
 msgid "Revision: "
 msgstr "Revisie: "
 
-#: src/emu/ui/datmenu.cpp:287 src/emu/ui/selgame.cpp:40
-#: src/emu/ui/selgame.cpp:2152 src/emu/ui/selgame.cpp:2161
-#: src/emu/ui/selsoft.cpp:1577 src/emu/ui/selsoft.cpp:1597
-#: src/emu/ui/selsoft.cpp:1606
+#: src/emu/ui/datmenu.cpp:284 src/emu/ui/selgame.cpp:39
+#: src/emu/ui/selgame.cpp:2158 src/emu/ui/selgame.cpp:2167
+#: src/emu/ui/selsoft.cpp:1574 src/emu/ui/selsoft.cpp:1592
+#: src/emu/ui/selsoft.cpp:1601
 msgid "History"
 msgstr "Geschiedenis"
 
-#: src/emu/ui/datmenu.cpp:289 src/emu/ui/selgame.cpp:41
+#: src/emu/ui/datmenu.cpp:286 src/emu/ui/selgame.cpp:40
 msgid "Mameinfo"
 msgstr "Mameinfo"
 
-#: src/emu/ui/datmenu.cpp:291 src/emu/ui/selgame.cpp:43
+#: src/emu/ui/datmenu.cpp:288 src/emu/ui/selgame.cpp:42
 msgid "Messinfo"
 msgstr "Messinfo"
 
-#: src/emu/ui/datmenu.cpp:293 src/emu/ui/selgame.cpp:42
+#: src/emu/ui/datmenu.cpp:290 src/emu/ui/selgame.cpp:41
 msgid "Sysinfo"
 msgstr "Sysinfo"
 
-#: src/emu/ui/datmenu.cpp:295 src/emu/ui/selgame.cpp:46
+#: src/emu/ui/datmenu.cpp:292 src/emu/ui/selgame.cpp:45
 msgid "Mamescore"
 msgstr "Mamescore"
 
-#: src/emu/ui/datmenu.cpp:297 src/emu/ui/selgame.cpp:45
+#: src/emu/ui/datmenu.cpp:294 src/emu/ui/selgame.cpp:44
 msgid "Gameinit"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:299 src/emu/ui/selgame.cpp:44
+#: src/emu/ui/datmenu.cpp:296 src/emu/ui/selgame.cpp:43
 msgid "Command"
 msgstr "Commando"
 
@@ -559,75 +559,75 @@ msgstr "Druk op TAB om te kiezen"
 msgid "Remove %1$s Folder"
 msgstr "Verwijder %1$s map"
 
-#: src/emu/ui/filesel.cpp:158
+#: src/emu/ui/filesel.cpp:161
 msgid "File Already Exists - Override?"
 msgstr "Bestand bestaat al - Overschrijven?"
 
-#: src/emu/ui/filesel.cpp:160 src/emu/ui/selgame.cpp:1568
-#: src/emu/ui/selgame.cpp:1569 src/emu/ui/selgame.cpp:1570
-#: src/emu/ui/selgame.cpp:1571 src/emu/ui/selgame.cpp:1572
-#: src/emu/ui/selgame.cpp:1573 src/emu/ui/selgame.cpp:1574
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/filesel.cpp:163 src/emu/ui/selgame.cpp:1576
+#: src/emu/ui/selgame.cpp:1577 src/emu/ui/selgame.cpp:1578
+#: src/emu/ui/selgame.cpp:1579 src/emu/ui/selgame.cpp:1580
+#: src/emu/ui/selgame.cpp:1581 src/emu/ui/selgame.cpp:1582
+#: src/emu/ui/selgame.cpp:1591
 msgid "No"
 msgstr "Nee"
 
-#: src/emu/ui/filesel.cpp:161 src/emu/ui/selgame.cpp:1568
-#: src/emu/ui/selgame.cpp:1569 src/emu/ui/selgame.cpp:1570
-#: src/emu/ui/selgame.cpp:1571 src/emu/ui/selgame.cpp:1572
-#: src/emu/ui/selgame.cpp:1573 src/emu/ui/selgame.cpp:1574
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/filesel.cpp:164 src/emu/ui/selgame.cpp:1576
+#: src/emu/ui/selgame.cpp:1577 src/emu/ui/selgame.cpp:1578
+#: src/emu/ui/selgame.cpp:1579 src/emu/ui/selgame.cpp:1580
+#: src/emu/ui/selgame.cpp:1581 src/emu/ui/selgame.cpp:1582
+#: src/emu/ui/selgame.cpp:1591
 msgid "Yes"
 msgstr "Ja"
 
-#: src/emu/ui/filesel.cpp:272
+#: src/emu/ui/filesel.cpp:275
 msgid "New Image Name:"
 msgstr "Nieuwe bestandsnaam:"
 
-#: src/emu/ui/filesel.cpp:278
+#: src/emu/ui/filesel.cpp:281
 msgid "Image Format:"
 msgstr "Bestandsformaat:"
 
-#: src/emu/ui/filesel.cpp:284
+#: src/emu/ui/filesel.cpp:287
 msgid "Create"
 msgstr "Aanmaken"
 
-#: src/emu/ui/filesel.cpp:315
+#: src/emu/ui/filesel.cpp:318
 msgid "Please enter a file extension too"
 msgstr "Vul ook een bestandsextensie in"
 
-#: src/emu/ui/filesel.cpp:503 src/emu/ui/swlist.cpp:65
+#: src/emu/ui/filesel.cpp:506 src/emu/ui/swlist.cpp:65
 msgid "[empty slot]"
 msgstr "[lege plek]"
 
-#: src/emu/ui/filesel.cpp:507
+#: src/emu/ui/filesel.cpp:510
 msgid "[create]"
 msgstr "[aanmaken]"
 
-#: src/emu/ui/filesel.cpp:511 src/emu/ui/swlist.cpp:76
+#: src/emu/ui/filesel.cpp:514 src/emu/ui/swlist.cpp:76
 msgid "[software list]"
 msgstr "[software lijst]"
 
-#: src/emu/ui/filesel.cpp:803
+#: src/emu/ui/filesel.cpp:806
 msgid "Select image format"
 msgstr "Selecteer bestandsformaat"
 
-#: src/emu/ui/filesel.cpp:863
+#: src/emu/ui/filesel.cpp:866
 msgid "Select access mode"
 msgstr "Selecteer toegangsmodus"
 
-#: src/emu/ui/filesel.cpp:864
+#: src/emu/ui/filesel.cpp:867
 msgid "Read-only"
 msgstr "Alleen lezen"
 
-#: src/emu/ui/filesel.cpp:866
+#: src/emu/ui/filesel.cpp:869
 msgid "Read-write"
 msgstr "Lezen en schrijven"
 
-#: src/emu/ui/filesel.cpp:867
+#: src/emu/ui/filesel.cpp:870
 msgid "Read this image, write to another image"
 msgstr "Lees dit bestamd, schrijf naar een ander bestand"
 
-#: src/emu/ui/filesel.cpp:868
+#: src/emu/ui/filesel.cpp:871
 msgid "Read this image, write to diff"
 msgstr "Lees dit bestand, schrijf naar een diff"
 
@@ -655,7 +655,7 @@ msgstr "Gedeeltelijk ondersteund"
 msgid "[empty]"
 msgstr "[leeg]"
 
-#: src/emu/ui/info_pty.cpp:26 src/emu/ui/mainmenu.cpp:91
+#: src/emu/ui/info_pty.cpp:26 src/emu/ui/mainmenu.cpp:96
 msgid "Pseudo terminals"
 msgstr "Pseudoterminals"
 
@@ -671,7 +671,7 @@ msgstr "Gebruikersinterface"
 msgid "Other Controls"
 msgstr "Andere controls"
 
-#: src/emu/ui/inputmap.cpp:622 src/emu/ui/miscmenu.cpp:91
+#: src/emu/ui/inputmap.cpp:622 src/emu/ui/miscmenu.cpp:92
 #: src/emu/ui/slotopt.cpp:172
 msgid "Reset"
 msgstr "Herstel"
@@ -704,27 +704,27 @@ msgstr "Boekhoudinginformatie"
 msgid "Machine Information"
 msgstr "Machineinformatie"
 
-#: src/emu/ui/mainmenu.cpp:78
+#: src/emu/ui/mainmenu.cpp:80
 msgid "Image Information"
 msgstr "Bestandsinformatie"
 
-#: src/emu/ui/mainmenu.cpp:81
+#: src/emu/ui/mainmenu.cpp:83
 msgid "File Manager"
 msgstr "Bestandsbeheer"
 
-#: src/emu/ui/mainmenu.cpp:86
+#: src/emu/ui/mainmenu.cpp:92
 msgid "Tape Control"
 msgstr "Cassettebediening"
 
-#: src/emu/ui/mainmenu.cpp:94
+#: src/emu/ui/mainmenu.cpp:99
 msgid "Bios Selection"
 msgstr "Biosselectie"
 
-#: src/emu/ui/mainmenu.cpp:100
+#: src/emu/ui/mainmenu.cpp:104
 msgid "Slot Devices"
 msgstr "Insteekapparaten"
 
-#: src/emu/ui/mainmenu.cpp:107
+#: src/emu/ui/mainmenu.cpp:109
 msgid "Barcode Reader"
 msgstr "Barcodelezer"
 
@@ -732,43 +732,43 @@ msgstr "Barcodelezer"
 msgid "Network Devices"
 msgstr "Netwerkapparaten"
 
-#: src/emu/ui/mainmenu.cpp:119
+#: src/emu/ui/mainmenu.cpp:118
 msgid "Keyboard Mode"
 msgstr "Keyboardmodus"
 
-#: src/emu/ui/mainmenu.cpp:122
+#: src/emu/ui/mainmenu.cpp:121
 msgid "Slider Controls"
 msgstr "Schuifinstellingen"
 
-#: src/emu/ui/mainmenu.cpp:125
+#: src/emu/ui/mainmenu.cpp:124
 msgid "Video Options"
 msgstr "Videoopties"
 
-#: src/emu/ui/mainmenu.cpp:129
+#: src/emu/ui/mainmenu.cpp:128
 msgid "Crosshair Options"
 msgstr "Vizieropties"
 
-#: src/emu/ui/mainmenu.cpp:133
+#: src/emu/ui/mainmenu.cpp:132
 msgid "Cheat"
 msgstr "Cheat"
 
-#: src/emu/ui/mainmenu.cpp:136
+#: src/emu/ui/mainmenu.cpp:135
 msgid "Plugin Options"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:140
+#: src/emu/ui/mainmenu.cpp:139
 msgid "External DAT View"
 msgstr "Externe DAT overzicht"
 
-#: src/emu/ui/mainmenu.cpp:146
+#: src/emu/ui/mainmenu.cpp:145 src/emu/ui/miscmenu.cpp:785
 msgid "Add To Favorites"
 msgstr "Voeg toe aan favorieten"
 
-#: src/emu/ui/mainmenu.cpp:148
+#: src/emu/ui/mainmenu.cpp:147 src/emu/ui/miscmenu.cpp:787
 msgid "Remove From Favorites"
 msgstr "Verwijder van favorieten"
 
-#: src/emu/ui/mainmenu.cpp:155
+#: src/emu/ui/mainmenu.cpp:154
 msgid "Select New Machine"
 msgstr "Selecteer nieuwe machine"
 
@@ -808,31 +808,31 @@ msgstr "Afsluiten"
 msgid "Return to Previous Menu"
 msgstr "Terug naar vorig menu"
 
-#: src/emu/ui/menu.cpp:716
+#: src/emu/ui/menu.cpp:761
 msgid "Auto"
 msgstr "Automatisch"
 
-#: src/emu/ui/menu.cpp:2133
+#: src/emu/ui/menu.cpp:2195
 msgid "Images"
 msgstr "Plaatjes"
 
-#: src/emu/ui/menu.cpp:2134
+#: src/emu/ui/menu.cpp:2196
 msgid "Infos"
 msgstr "Informatie"
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Keyboard Mode:"
 msgstr "Toetsenboordmodus:"
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Natural"
 msgstr "Natuurlijk"
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Emulated"
 msgstr "Geëmuleerd"
 
-#: src/emu/ui/miscmenu.cpp:240
+#: src/emu/ui/miscmenu.cpp:241
 #, c-format
 msgid ""
 "Uptime: %1$d:%2$02d:%3$02d\n"
@@ -841,7 +841,7 @@ msgstr ""
 "In bedrijf: %1$d:%2$02d:%3$02d\n"
 "\n"
 
-#: src/emu/ui/miscmenu.cpp:242
+#: src/emu/ui/miscmenu.cpp:243
 #, c-format
 msgid ""
 "Uptime: %1$d:%2$02d\n"
@@ -850,7 +850,7 @@ msgstr ""
 "In bedrijf: %1$d:%2$02d\n"
 "\n"
 
-#: src/emu/ui/miscmenu.cpp:246
+#: src/emu/ui/miscmenu.cpp:247
 #, c-format
 msgid ""
 "Tickets dispensed: %1$d\n"
@@ -859,109 +859,50 @@ msgstr ""
 "Kaartjes uitgegeven: %1$d\n"
 "\n"
 
-#: src/emu/ui/miscmenu.cpp:257
+#: src/emu/ui/miscmenu.cpp:258
 msgid "Coin %1$c: NA%3$s\n"
 msgstr "Munt %1$c: n.v.t.%3$s\n"
 
-#: src/emu/ui/miscmenu.cpp:257
+#: src/emu/ui/miscmenu.cpp:258
 #, c-format
 msgid "Coin %1$c: %2$d%3$s\n"
 msgstr "Munt %1$c: %2$d%3$s\n"
 
-#: src/emu/ui/miscmenu.cpp:260
+#: src/emu/ui/miscmenu.cpp:261
 msgid " (locked)"
 msgstr " (afgeschermd)"
 
-#: src/emu/ui/miscmenu.cpp:519
+#: src/emu/ui/miscmenu.cpp:520
 msgid "Visible Delay"
 msgstr "Vertraging zichtbaarheid"
 
-#: src/emu/ui/miscmenu.cpp:617
+#: src/emu/ui/miscmenu.cpp:619
 #, c-format
 msgid "%s.xml saved under ui folder."
 msgstr "%s.xml is opgeslagen in de map 'ui'."
 
-#: src/emu/ui/miscmenu.cpp:645
+#: src/emu/ui/miscmenu.cpp:647
 msgid "Name:             Description:\n"
 msgstr "Naam:             Omschrijving:\n"
 
-#: src/emu/ui/miscmenu.cpp:657
+#: src/emu/ui/miscmenu.cpp:659
 #, c-format
 msgid "%s.txt saved under ui folder."
 msgstr "%s.txt is opgeslagen in de map 'ui'."
 
-#: src/emu/ui/miscmenu.cpp:675
-msgid "Export XML format (like -listxml)"
-msgstr "Exporteer in XML formaat (zoals -listxml)"
+#: src/emu/ui/miscmenu.cpp:677
+msgid "Export list in XML format (like -listxml)"
+msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:676
-msgid "Export TXT format (like -listfull)"
-msgstr "Exporteer in TXT formaat (zoals -listfull)"
+#: src/emu/ui/miscmenu.cpp:678
+msgid "Export list in XML format (like -listxml, but exclude devices)"
+msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:734
-msgid "Dummy"
-msgstr "Dummie"
+#: src/emu/ui/miscmenu.cpp:679
+msgid "Export list in TXT format (like -listfull)"
+msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:736
-msgid "Save machine configuration"
-msgstr "Sla machineconfiguratie op"
-
-#: src/emu/ui/miscmenu.cpp:848 src/emu/ui/miscmenu.cpp:869
-#: src/emu/ui/selgame.cpp:594
-msgid "Plugins"
-msgstr "Plugins"
-
-#: src/emu/ui/optsmenu.cpp:218
-msgid "Filter"
-msgstr "Filter"
-
-#: src/emu/ui/optsmenu.cpp:226
-msgid " ^!File"
-msgstr " ^!Bestand"
-
-#: src/emu/ui/optsmenu.cpp:231
-msgid " ^!Category"
-msgstr " ^!Categorie"
-
-#: src/emu/ui/optsmenu.cpp:254
-msgid "^!Setup custom filter"
-msgstr "^!Stel eigen filter in"
-
-#: src/emu/ui/optsmenu.cpp:262
-msgid "Customize UI"
-msgstr "Pas gebruikersinterface aan"
-
-#: src/emu/ui/optsmenu.cpp:263
-msgid "Configure Directories"
-msgstr "Configureer mappen"
-
-#: src/emu/ui/optsmenu.cpp:266 src/emu/ui/sndmenu.cpp:151
-#: src/emu/ui/sndmenu.cpp:172
-msgid "Sound Options"
-msgstr "Geluidsopties"
-
-#: src/emu/ui/optsmenu.cpp:269
-msgid "General Inputs"
-msgstr "Algemene invoer"
-
-#: src/emu/ui/optsmenu.cpp:272
-msgid "Save Configuration"
-msgstr "Sla configuratie op"
-
-#: src/emu/ui/optsmenu.cpp:286 src/emu/ui/optsmenu.cpp:307
-msgid "Settings"
-msgstr "Instellingen"
-
-#: src/emu/ui/optsmenu.cpp:327
-msgid "**Error saving ui.ini**"
-msgstr "**Fout bij het opslaan van ui.ini**"
-
-#: src/emu/ui/optsmenu.cpp:374
-#, c-format
-msgid "**Error saving %s.ini**"
-msgstr "**Fout bij het opslaan van %s.ini**"
-
-#: src/emu/ui/optsmenu.cpp:378
+#: src/emu/ui/miscmenu.cpp:729 src/emu/ui/optsmenu.cpp:376
 msgid ""
 "\n"
 "    Configuration saved    \n"
@@ -971,20 +912,95 @@ msgstr ""
 "    Configuratie opgeslagen\n"
 "\n"
 
-#: src/emu/ui/selector.cpp:166
+#: src/emu/ui/miscmenu.cpp:774
+msgid "Bios"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:776
+msgid "Driver"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:790
+msgid "Save machine configuration"
+msgstr "Sla machineconfiguratie op"
+
+#: src/emu/ui/miscmenu.cpp:806
+msgid "Configure machine:"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:868 src/emu/ui/selsoft.cpp:109
+msgid " (default)"
+msgstr " (standaard)"
+
+#: src/emu/ui/miscmenu.cpp:953 src/emu/ui/miscmenu.cpp:973
+#: src/emu/ui/selgame.cpp:600
+msgid "Plugins"
+msgstr "Plugins"
+
+#: src/emu/ui/optsmenu.cpp:217
+msgid "Filter"
+msgstr "Filter"
+
+#: src/emu/ui/optsmenu.cpp:225
+msgid " ^!File"
+msgstr " ^!Bestand"
+
+#: src/emu/ui/optsmenu.cpp:230
+msgid " ^!Category"
+msgstr " ^!Categorie"
+
+#: src/emu/ui/optsmenu.cpp:253
+msgid "^!Setup custom filter"
+msgstr "^!Stel eigen filter in"
+
+#: src/emu/ui/optsmenu.cpp:261
+msgid "Customize UI"
+msgstr "Pas gebruikersinterface aan"
+
+#: src/emu/ui/optsmenu.cpp:262
+msgid "Configure Directories"
+msgstr "Configureer mappen"
+
+#: src/emu/ui/optsmenu.cpp:265 src/emu/ui/sndmenu.cpp:149
+#: src/emu/ui/sndmenu.cpp:169
+msgid "Sound Options"
+msgstr "Geluidsopties"
+
+#: src/emu/ui/optsmenu.cpp:268
+msgid "General Inputs"
+msgstr "Algemene invoer"
+
+#: src/emu/ui/optsmenu.cpp:271
+msgid "Save Configuration"
+msgstr "Sla configuratie op"
+
+#: src/emu/ui/optsmenu.cpp:285 src/emu/ui/optsmenu.cpp:305
+msgid "Settings"
+msgstr "Instellingen"
+
+#: src/emu/ui/optsmenu.cpp:325
+msgid "**Error saving ui.ini**"
+msgstr "**Fout bij het opslaan van ui.ini**"
+
+#: src/emu/ui/optsmenu.cpp:372
+#, c-format
+msgid "**Error saving %s.ini**"
+msgstr "**Fout bij het opslaan van %s.ini**"
+
+#: src/emu/ui/selector.cpp:165
 msgid "Selection List - Search: "
 msgstr "Selectielijst - Zoeken: "
 
-#: src/emu/ui/selector.cpp:196
+#: src/emu/ui/selector.cpp:194
 #, c-format
 msgid "Double click or press %1$s to select"
 msgstr "Dubbelklik of druk %1$s om te selecteren"
 
-#: src/emu/ui/selgame.cpp:39
+#: src/emu/ui/selgame.cpp:38
 msgid "General Info"
 msgstr "Algemene informatie"
 
-#: src/emu/ui/selgame.cpp:374 src/emu/ui/selsoft.cpp:282
+#: src/emu/ui/selgame.cpp:380 src/emu/ui/selsoft.cpp:281
 #, c-format
 msgid ""
 "%s\n"
@@ -993,8 +1009,8 @@ msgstr ""
 "%s\n"
 " toegevoegd aan favorietenlijst."
 
-#: src/emu/ui/selgame.cpp:380 src/emu/ui/selgame.cpp:389
-#: src/emu/ui/selsoft.cpp:287
+#: src/emu/ui/selgame.cpp:386 src/emu/ui/selgame.cpp:395
+#: src/emu/ui/selsoft.cpp:286
 #, c-format
 msgid ""
 "%s\n"
@@ -1003,7 +1019,7 @@ msgstr ""
 "%s\n"
 " verwijderd van favorietenlijst."
 
-#: src/emu/ui/selgame.cpp:450
+#: src/emu/ui/selgame.cpp:457
 msgid ""
 "The selected machine is missing one or more required ROM or CHD images. "
 "Please select a different machine.\n"
@@ -1011,256 +1027,260 @@ msgid ""
 "Press any key to continue."
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:589 src/emu/ui/simpleselgame.cpp:265
+#: src/emu/ui/selgame.cpp:595 src/emu/ui/simpleselgame.cpp:265
 msgid "Configure Options"
 msgstr "Configureer opties"
 
-#: src/emu/ui/selgame.cpp:752
+#: src/emu/ui/selgame.cpp:596
+msgid "Configure Machine"
+msgstr "Configureer machine"
+
+#: src/emu/ui/selgame.cpp:758
 #, c-format
 msgid "%1$s %2$s ( %3$d / %4$d machines (%5$d BIOS) )"
 msgstr "%1$s %2$s ( %3$d / %4$d machines (waarvan %5$d BIOS) )"
 
-#: src/emu/ui/selgame.cpp:762
+#: src/emu/ui/selgame.cpp:768
 #, c-format
 msgid "%1$s (%2$s - %3$s) - "
 msgstr "%1$s (%2$s - %3$s) - "
 
-#: src/emu/ui/selgame.cpp:769 src/emu/ui/selgame.cpp:775
+#: src/emu/ui/selgame.cpp:775 src/emu/ui/selgame.cpp:781
 #, c-format
 msgid "%1$s (%2$s) - "
 msgstr "%1$s (%2$s) - "
 
-#: src/emu/ui/selgame.cpp:784
+#: src/emu/ui/selgame.cpp:790
 #, c-format
 msgid "%1$s Search: %2$s_"
 msgstr "%1$s Zoek: %2$s_"
 
-#: src/emu/ui/selgame.cpp:838
+#: src/emu/ui/selgame.cpp:844
 #, c-format
 msgid "Romset: %1$-.100s"
 msgstr "Romset: %1$-.100s"
 
-#: src/emu/ui/selgame.cpp:841 src/emu/ui/selgame.cpp:890
-#: src/emu/ui/selsoft.cpp:751 src/emu/ui/selsoft.cpp:801
+#: src/emu/ui/selgame.cpp:847 src/emu/ui/selgame.cpp:896
+#: src/emu/ui/selsoft.cpp:750 src/emu/ui/selsoft.cpp:800
 #: src/emu/ui/simpleselgame.cpp:328
 #, c-format
 msgid "%1$s, %2$-.100s"
 msgstr "%1$s, %2$-.100s"
 
-#: src/emu/ui/selgame.cpp:847 src/emu/ui/selsoft.cpp:757
+#: src/emu/ui/selgame.cpp:853 src/emu/ui/selsoft.cpp:756
 #, c-format
 msgid "Driver is clone of: %1$-.100s"
 msgstr "Driver is een variant van: %1$-.100s"
 
-#: src/emu/ui/selgame.cpp:849 src/emu/ui/selsoft.cpp:759
+#: src/emu/ui/selgame.cpp:855 src/emu/ui/selsoft.cpp:758
 msgid "Driver is parent"
 msgstr "Driver is hoofddriver"
 
-#: src/emu/ui/selgame.cpp:853 src/emu/ui/selsoft.cpp:763
+#: src/emu/ui/selgame.cpp:859 src/emu/ui/selsoft.cpp:762
 #: src/emu/ui/simpleselgame.cpp:335
 msgid "Overall: NOT WORKING"
 msgstr "Status: WERKT NIET"
 
-#: src/emu/ui/selgame.cpp:855 src/emu/ui/selsoft.cpp:765
+#: src/emu/ui/selgame.cpp:861 src/emu/ui/selsoft.cpp:764
 #: src/emu/ui/simpleselgame.cpp:337
 msgid "Overall: Unemulated Protection"
 msgstr "Status: Beveiliging niet geëmuleerd"
 
-#: src/emu/ui/selgame.cpp:857 src/emu/ui/selsoft.cpp:767
+#: src/emu/ui/selgame.cpp:863 src/emu/ui/selsoft.cpp:766
 #: src/emu/ui/simpleselgame.cpp:339
 msgid "Overall: Working"
 msgstr "Status: Werkt"
 
-#: src/emu/ui/selgame.cpp:861 src/emu/ui/selsoft.cpp:771
+#: src/emu/ui/selgame.cpp:867 src/emu/ui/selsoft.cpp:770
 msgid "Graphics: Imperfect, "
 msgstr "Beeld: Niet volledig, "
 
-#: src/emu/ui/selgame.cpp:863 src/emu/ui/selsoft.cpp:773
+#: src/emu/ui/selgame.cpp:869 src/emu/ui/selsoft.cpp:772
 msgid "Graphics: OK, "
 msgstr "Beeld: OK, "
 
-#: src/emu/ui/selgame.cpp:866 src/emu/ui/selsoft.cpp:776
+#: src/emu/ui/selgame.cpp:872 src/emu/ui/selsoft.cpp:775
 msgid "Sound: Unimplemented"
 msgstr "Geluid: Niet geïmplementeerd"
 
-#: src/emu/ui/selgame.cpp:868 src/emu/ui/selsoft.cpp:778
+#: src/emu/ui/selgame.cpp:874 src/emu/ui/selsoft.cpp:777
 msgid "Sound: Imperfect"
 msgstr "Geluid: Niet volledig"
 
-#: src/emu/ui/selgame.cpp:870 src/emu/ui/selsoft.cpp:780
+#: src/emu/ui/selgame.cpp:876 src/emu/ui/selsoft.cpp:779
 msgid "Sound: OK"
 msgstr "Geluid: OK"
 
-#: src/emu/ui/selgame.cpp:887
+#: src/emu/ui/selgame.cpp:893
 #, c-format
 msgid "System: %1$-.100s"
 msgstr "Systeem: %1$-.100s"
 
-#: src/emu/ui/selgame.cpp:894 src/emu/ui/selsoft.cpp:805
+#: src/emu/ui/selgame.cpp:900 src/emu/ui/selsoft.cpp:804
 #, c-format
 msgid "Software is clone of: %1$-.100s"
 msgstr "Software is een variant van: %1$-.100s"
 
-#: src/emu/ui/selgame.cpp:896 src/emu/ui/selsoft.cpp:807
+#: src/emu/ui/selgame.cpp:902 src/emu/ui/selsoft.cpp:806
 msgid "Software is parent"
 msgstr "Software is hoofdsoftware"
 
-#: src/emu/ui/selgame.cpp:901 src/emu/ui/selsoft.cpp:812
+#: src/emu/ui/selgame.cpp:907 src/emu/ui/selsoft.cpp:811
 msgid "Supported: No"
 msgstr "Ondersteund: Nee"
 
-#: src/emu/ui/selgame.cpp:906 src/emu/ui/selsoft.cpp:817
+#: src/emu/ui/selgame.cpp:912 src/emu/ui/selsoft.cpp:816
 msgid "Supported: Partial"
 msgstr "Ondersteund: Gedeeltelijk"
 
-#: src/emu/ui/selgame.cpp:911 src/emu/ui/selsoft.cpp:822
+#: src/emu/ui/selgame.cpp:917 src/emu/ui/selsoft.cpp:821
 msgid "Supported: Yes"
 msgstr "Ondersteund: Ja"
 
-#: src/emu/ui/selgame.cpp:916 src/emu/ui/selsoft.cpp:827
+#: src/emu/ui/selgame.cpp:922 src/emu/ui/selsoft.cpp:826
 #, c-format
 msgid "romset: %1$-.100s"
 msgstr "romset: %1$-.100s"
 
-#: src/emu/ui/selgame.cpp:923
+#: src/emu/ui/selgame.cpp:929
 #, c-format
 msgid "%1$s %2$s"
 msgstr "%1$s %2$s"
 
-#: src/emu/ui/selgame.cpp:1535
+#: src/emu/ui/selgame.cpp:1543
 #, c-format
 msgid "Romset: %1$-.100s\n"
 msgstr "Romset: %1$-.100s\n"
 
-#: src/emu/ui/selgame.cpp:1536
+#: src/emu/ui/selgame.cpp:1544
 #, c-format
 msgid "Year: %1$s\n"
 msgstr "Jaar: %1$s\n"
 
-#: src/emu/ui/selgame.cpp:1537
+#: src/emu/ui/selgame.cpp:1545
 #, c-format
 msgid "Manufacturer: %1$-.100s\n"
 msgstr "Fabrikant: %1$-.100s\n"
 
-#: src/emu/ui/selgame.cpp:1541
+#: src/emu/ui/selgame.cpp:1549
 #, c-format
 msgid "Driver is Clone of: %1$-.100s\n"
 msgstr "Driver is een variant van: %1$-.100s\n"
 
-#: src/emu/ui/selgame.cpp:1543
+#: src/emu/ui/selgame.cpp:1551
 msgid "Driver is Parent\n"
 msgstr "Driver is hoofddriver\n"
 
-#: src/emu/ui/selgame.cpp:1546
+#: src/emu/ui/selgame.cpp:1554
 msgid "Overall: NOT WORKING\n"
 msgstr "Status: WERKT NIET\n"
 
-#: src/emu/ui/selgame.cpp:1548
+#: src/emu/ui/selgame.cpp:1556
 msgid "Overall: Unemulated Protection\n"
 msgstr "Status: Beveiliging niet geëmuleerd\n"
 
-#: src/emu/ui/selgame.cpp:1550
+#: src/emu/ui/selgame.cpp:1558
 msgid "Overall: Working\n"
 msgstr "Status: Werkt\n"
 
-#: src/emu/ui/selgame.cpp:1553
+#: src/emu/ui/selgame.cpp:1561
 msgid "Graphics: Imperfect Colors\n"
 msgstr "Beeld: Kleuren niet juist\n"
 
-#: src/emu/ui/selgame.cpp:1557
+#: src/emu/ui/selgame.cpp:1565
 msgid "Graphics: Imperfect\n"
 msgstr "Beeld: Onvolledig\n"
 
-#: src/emu/ui/selgame.cpp:1559
+#: src/emu/ui/selgame.cpp:1567
 msgid "Graphics: OK\n"
 msgstr "Beeld: OK\n"
 
-#: src/emu/ui/selgame.cpp:1562
+#: src/emu/ui/selgame.cpp:1570
 msgid "Sound: Unimplemented\n"
 msgstr "Geluid: Niet geïmplementeerd\n"
 
-#: src/emu/ui/selgame.cpp:1564
+#: src/emu/ui/selgame.cpp:1572
 msgid "Sound: Imperfect\n"
 msgstr "Geluid: Onvolledig\n"
 
-#: src/emu/ui/selgame.cpp:1566
+#: src/emu/ui/selgame.cpp:1574
 msgid "Sound: OK\n"
 msgstr "Geluid: OK\n"
 
-#: src/emu/ui/selgame.cpp:1568
+#: src/emu/ui/selgame.cpp:1576
 #, c-format
 msgid "Driver is Skeleton: %1$s\n"
 msgstr "Raamwerkdriver: %1$s\n"
 
-#: src/emu/ui/selgame.cpp:1569
+#: src/emu/ui/selgame.cpp:1577
 #, c-format
 msgid "Game is Mechanical: %1$s\n"
 msgstr "Machine heeft mechanische onderdelen: %1$s\n"
 
-#: src/emu/ui/selgame.cpp:1570
+#: src/emu/ui/selgame.cpp:1578
 #, c-format
 msgid "Requires Artwork: %1$s\n"
 msgstr "Vereist artwork: %1$s\n"
 
-#: src/emu/ui/selgame.cpp:1571
+#: src/emu/ui/selgame.cpp:1579
 #, c-format
 msgid "Requires Clickable Artwork: %1$s\n"
 msgstr "Vereist klikbare artwork: %1$s\n"
 
-#: src/emu/ui/selgame.cpp:1572
+#: src/emu/ui/selgame.cpp:1580
 #, c-format
 msgid "Support Cocktail: %1$s\n"
 msgstr "Ondersteunt cocktail: %1$s\n"
 
-#: src/emu/ui/selgame.cpp:1573
+#: src/emu/ui/selgame.cpp:1581
 #, c-format
 msgid "Driver is Bios: %1$s\n"
 msgstr "Driver is een BIOS-driver: %1$s\n"
 
-#: src/emu/ui/selgame.cpp:1574
+#: src/emu/ui/selgame.cpp:1582
 #, c-format
 msgid "Support Save: %1$s\n"
 msgstr "Ondersteund opslag: %1$s\n"
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 #, c-format
 msgid "Screen Orientation: %1$s\n"
 msgstr "Schermoriëntatie: %1$s\n"
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 msgid "Vertical"
 msgstr "Verticaal"
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 msgid "Horizontal"
 msgstr "Horizontaal"
 
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/selgame.cpp:1591
 #, c-format
 msgid "Requires CHD: %1$s\n"
 msgstr "Vereist CHD: %1$s\n"
 
-#: src/emu/ui/selgame.cpp:1596
+#: src/emu/ui/selgame.cpp:1604
 msgid "Roms Audit Pass: OK\n"
 msgstr "Roms controle: OK\n"
 
-#: src/emu/ui/selgame.cpp:1598
+#: src/emu/ui/selgame.cpp:1606
 msgid "Roms Audit Pass: BAD\n"
 msgstr "Roms controle: FOUT\n"
 
-#: src/emu/ui/selgame.cpp:1601
+#: src/emu/ui/selgame.cpp:1609
 msgid "Samples Audit Pass: None Needed\n"
 msgstr "Samples controle: Niet nodig\n"
 
-#: src/emu/ui/selgame.cpp:1603
+#: src/emu/ui/selgame.cpp:1611
 msgid "Samples Audit Pass: OK\n"
 msgstr "Samples controle: OK\n"
 
-#: src/emu/ui/selgame.cpp:1605
+#: src/emu/ui/selgame.cpp:1613
 msgid "Samples Audit Pass: BAD\n"
 msgstr "Samples controle: FOUT\n"
 
-#: src/emu/ui/selgame.cpp:1608
+#: src/emu/ui/selgame.cpp:1616
 msgid ""
 "Roms Audit Pass: Disabled\n"
 "Samples Audit Pass: Disabled\n"
@@ -1268,20 +1288,16 @@ msgstr ""
 "Roms controle: Uitgeschakeld\n"
 "Samples controle: Uitgeschakeld\n"
 
-#: src/emu/ui/selgame.cpp:2049 src/emu/ui/selgame.cpp:2212
-#: src/emu/ui/selsoft.cpp:1662
+#: src/emu/ui/selgame.cpp:2055 src/emu/ui/selgame.cpp:2216
+#: src/emu/ui/selsoft.cpp:1655
 msgid "No Infos Available"
 msgstr "Geen informatie beschikbaar"
 
-#: src/emu/ui/selgame.cpp:2162 src/emu/ui/selsoft.cpp:1607
+#: src/emu/ui/selgame.cpp:2168 src/emu/ui/selsoft.cpp:1602
 msgid "Usage"
 msgstr "Gebruik"
 
-#: src/emu/ui/selsoft.cpp:110
-msgid " (default)"
-msgstr " (standaard)"
-
-#: src/emu/ui/selsoft.cpp:381
+#: src/emu/ui/selsoft.cpp:380
 msgid ""
 "The selected software is missing one or more required files. Please select a "
 "different software.\n"
@@ -1289,57 +1305,57 @@ msgid ""
 "Press any key to continue."
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:684
+#: src/emu/ui/selsoft.cpp:683
 #, c-format
-msgid "%1$s %2$s ( %3$d / %4$d softwares )"
-msgstr "%1$s %2$s ( %3$d / %4$d software )"
+msgid "%1$s %2$s ( %3$d / %4$d software packages )"
+msgstr ""
 
-#: src/emu/ui/selsoft.cpp:685
+#: src/emu/ui/selsoft.cpp:684
 #, c-format
 msgid "Driver: \"%1$s\" software list "
 msgstr "Driver: \"%1$s\" softwarelijst "
 
-#: src/emu/ui/selsoft.cpp:688
+#: src/emu/ui/selsoft.cpp:687
 #, c-format
 msgid "Region: %1$s -"
 msgstr "Regio: %1$s -"
 
-#: src/emu/ui/selsoft.cpp:690
+#: src/emu/ui/selsoft.cpp:689
 #, c-format
 msgid "Publisher: %1$s -"
 msgstr "Uitgever: %1$s -"
 
-#: src/emu/ui/selsoft.cpp:692
+#: src/emu/ui/selsoft.cpp:691
 #, c-format
 msgid "Year: %1$s -"
 msgstr "Jaar: %1$s -"
 
-#: src/emu/ui/selsoft.cpp:694
+#: src/emu/ui/selsoft.cpp:693
 #, c-format
 msgid "Software List: %1$s -"
 msgstr "Softwarelijst: %1$s -"
 
-#: src/emu/ui/selsoft.cpp:696
+#: src/emu/ui/selsoft.cpp:695
 #, c-format
 msgid "Device type: %1$s -"
 msgstr "Apparaattype: %1$s -"
 
-#: src/emu/ui/selsoft.cpp:698
+#: src/emu/ui/selsoft.cpp:697
 #, c-format
 msgid "%s Search: %s_"
 msgstr "%s Zoek: %s_"
 
-#: src/emu/ui/selsoft.cpp:748 src/emu/ui/selsoft.cpp:798
+#: src/emu/ui/selsoft.cpp:747 src/emu/ui/selsoft.cpp:797
 #: src/emu/ui/simpleselgame.cpp:325
 #, c-format
 msgid "%1$-.100s"
 msgstr "%1$-.100s"
 
-#: src/emu/ui/selsoft.cpp:1998 src/emu/ui/selsoft.cpp:2018
+#: src/emu/ui/selsoft.cpp:1991 src/emu/ui/selsoft.cpp:2011
 msgid "Software part selection:"
 msgstr "Softwareonderdeel selectie:"
 
-#: src/emu/ui/selsoft.cpp:2136 src/emu/ui/selsoft.cpp:2156
+#: src/emu/ui/selsoft.cpp:2129 src/emu/ui/selsoft.cpp:2149
 msgid "Bios selection:"
 msgstr "Bios selectie:"
 
@@ -1392,15 +1408,15 @@ msgstr "Beeld: %s, Geluid: %s"
 msgid " [internal]"
 msgstr " [intern]"
 
-#: src/emu/ui/sndmenu.cpp:135
+#: src/emu/ui/sndmenu.cpp:133
 msgid "Sound"
 msgstr "Geluid"
 
-#: src/emu/ui/sndmenu.cpp:136
+#: src/emu/ui/sndmenu.cpp:134
 msgid "Sample Rate"
 msgstr "Samplesnelheid"
 
-#: src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/sndmenu.cpp:135
 msgid "Use External Samples"
 msgstr "Gebruik externe samples"
 
@@ -1469,11 +1485,11 @@ msgstr "Terug spoelen"
 msgid "Fast Forward"
 msgstr "Vooruit spoelen"
 
-#: src/emu/ui/ui.cpp:419
+#: src/emu/ui/ui.cpp:418
 msgid "This driver requires images to be loaded in the following device(s): "
 msgstr "Deze driver vereist software ingelezen in de volgende device(s): "
 
-#: src/emu/ui/ui.cpp:1074
+#: src/emu/ui/ui.cpp:1071
 msgid ""
 "One or more ROMs/CHDs for this machine are incorrect. The machine may not "
 "run correctly.\n"
@@ -1481,7 +1497,7 @@ msgstr ""
 "Één of meerdere ROMs/CHDs voor deze machine zijn niet correct. De machine "
 "kan mogelijk niet goed functioneren.\n"
 
-#: src/emu/ui/ui.cpp:1087
+#: src/emu/ui/ui.cpp:1084
 msgid ""
 "There are known problems with this machine\n"
 "\n"
@@ -1489,49 +1505,49 @@ msgstr ""
 "Er zijn problemen bekend met de emulatie van deze machine\n"
 "\n"
 
-#: src/emu/ui/ui.cpp:1091
+#: src/emu/ui/ui.cpp:1088
 msgid ""
 "One or more ROMs/CHDs for this machine have not been correctly dumped.\n"
 msgstr ""
 "Één of meerdere ROMs/CHDs voor deze machine zijn niet correct gedumpt.\n"
 
-#: src/emu/ui/ui.cpp:1095
+#: src/emu/ui/ui.cpp:1092
 #, c-format
 msgid "The keyboard emulation may not be 100% accurate.\n"
 msgstr "De toetsenbordemulatie is mogelijk niet 100% accuraat.\n"
 
-#: src/emu/ui/ui.cpp:1097
+#: src/emu/ui/ui.cpp:1094
 #, c-format
 msgid "The colors aren't 100% accurate.\n"
 msgstr "De kleuren zijn niet 100% accuraat.\n"
 
-#: src/emu/ui/ui.cpp:1099
+#: src/emu/ui/ui.cpp:1096
 msgid "The colors are completely wrong.\n"
 msgstr "De kleuren zijn zeker fout.\n"
 
-#: src/emu/ui/ui.cpp:1101
+#: src/emu/ui/ui.cpp:1098
 #, c-format
 msgid "The video emulation isn't 100% accurate.\n"
 msgstr "De beeldemulatie is niet 100% accuraat.\n"
 
-#: src/emu/ui/ui.cpp:1103
+#: src/emu/ui/ui.cpp:1100
 #, c-format
 msgid "The sound emulation isn't 100% accurate.\n"
 msgstr "De geluidsemulatie is niet 100% accuraat.\n"
 
-#: src/emu/ui/ui.cpp:1105
+#: src/emu/ui/ui.cpp:1102
 msgid "The machine lacks sound.\n"
 msgstr "Deze machine heeft geen geluid.\n"
 
-#: src/emu/ui/ui.cpp:1108
+#: src/emu/ui/ui.cpp:1105
 msgid "Screen flipping in cocktail mode is not supported.\n"
 msgstr "Schermflippen wordt in cocktailmodus niet ondersteund.\n"
 
-#: src/emu/ui/ui.cpp:1112
+#: src/emu/ui/ui.cpp:1109
 msgid "The machine requires external artwork files\n"
 msgstr "Deze machine vereist externe artwork bestanden\n"
 
-#: src/emu/ui/ui.cpp:1117
+#: src/emu/ui/ui.cpp:1114
 msgid ""
 "This machine was never completed. It may exhibit strange behavior or missing "
 "elements that are not bugs in the emulation.\n"
@@ -1539,7 +1555,7 @@ msgstr ""
 "Deze machine was nooit afgemaakt. Het kan vreemd gedrag vertonen of "
 "elementen missen; dit zijn geen fouten van de emulatie.\n"
 
-#: src/emu/ui/ui.cpp:1122
+#: src/emu/ui/ui.cpp:1119
 msgid ""
 "This machine has no sound hardware, MAME will produce no sounds, this is "
 "expected behaviour.\n"
@@ -1547,12 +1563,12 @@ msgstr ""
 "Deze machine heeft geen geluidshardware, MAME zal geen geluid produceren, "
 "dit is verwacht gedrag.\n"
 
-#: src/emu/ui/ui.cpp:1130
+#: src/emu/ui/ui.cpp:1127
 msgid "The machine has protection which isn't fully emulated.\n"
 msgstr ""
 "Deze machine heeft een beveiliging die nog niet volledig is geëmuleerd.\n"
 
-#: src/emu/ui/ui.cpp:1133
+#: src/emu/ui/ui.cpp:1130
 msgid ""
 "\n"
 "THIS MACHINE DOESN'T WORK. The emulation for this machine is not yet "
@@ -1563,7 +1579,7 @@ msgstr ""
 "compleet. Er is niets wat je kunt doen om dit probleem te verhelpen afgezien "
 "van het afwachten tot ontwikkelaars de emulatie verder verbeteren.\n"
 
-#: src/emu/ui/ui.cpp:1137
+#: src/emu/ui/ui.cpp:1134
 msgid ""
 "\n"
 "Certain elements of this machine cannot be emulated as it requires actual "
@@ -1575,7 +1591,7 @@ msgstr ""
 "verband met fysieke interactie of het gebruik van mechanische componenten. "
 "Het is niet mogelijk om deze machine volledig te spelen.\n"
 
-#: src/emu/ui/ui.cpp:1156
+#: src/emu/ui/ui.cpp:1153
 msgid ""
 "\n"
 "\n"
@@ -1585,14 +1601,14 @@ msgstr ""
 "\n"
 "Dit zijn werkende klonen van de machine: "
 
-#: src/emu/ui/ui.cpp:1170
+#: src/emu/ui/ui.cpp:1167
 msgid ""
 "\n"
 "\n"
 "Press any key to continue"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1185
+#: src/emu/ui/ui.cpp:1182
 #, c-format
 msgid ""
 "%1$s\n"
@@ -1607,15 +1623,15 @@ msgstr ""
 "\n"
 "Processor:\n"
 
-#: src/emu/ui/ui.cpp:1221 src/emu/ui/ui.cpp:1260
+#: src/emu/ui/ui.cpp:1218 src/emu/ui/ui.cpp:1257
 msgid "MHz"
 msgstr "MHz"
 
-#: src/emu/ui/ui.cpp:1221 src/emu/ui/ui.cpp:1260
+#: src/emu/ui/ui.cpp:1218 src/emu/ui/ui.cpp:1257
 msgid "kHz"
 msgstr "kHz"
 
-#: src/emu/ui/ui.cpp:1235
+#: src/emu/ui/ui.cpp:1232
 msgid ""
 "\n"
 "Sound:\n"
@@ -1623,7 +1639,7 @@ msgstr ""
 "\n"
 "Geluid:\n"
 
-#: src/emu/ui/ui.cpp:1264
+#: src/emu/ui/ui.cpp:1261
 msgid ""
 "\n"
 "Video:\n"
@@ -1631,78 +1647,78 @@ msgstr ""
 "\n"
 "Beeld:\n"
 
-#: src/emu/ui/ui.cpp:1268
+#: src/emu/ui/ui.cpp:1265
 msgid "None\n"
 msgstr "Geen\n"
 
-#: src/emu/ui/ui.cpp:1275
+#: src/emu/ui/ui.cpp:1272
 msgid "Vector"
 msgstr "Vector"
 
-#: src/emu/ui/ui.cpp:1286
+#: src/emu/ui/ui.cpp:1283
 #, c-format
 msgid "%1$s: %2$s\n"
 msgstr "%1$s: %2$s\n"
 
-#: src/emu/ui/ui.cpp:1286
+#: src/emu/ui/ui.cpp:1283
 msgid "%2$s\n"
 msgstr "%2$s\n"
 
-#: src/emu/ui/ui.cpp:1541 src/emu/ui/ui.cpp:1551
+#: src/emu/ui/ui.cpp:1538 src/emu/ui/ui.cpp:1548
 msgid "Keyboard Emulation Status"
 msgstr "Toetsenbord emulatiestatus"
 
-#: src/emu/ui/ui.cpp:1543
+#: src/emu/ui/ui.cpp:1540
 msgid "Mode: PARTIAL Emulation"
 msgstr "Modus: GEDEELTELIJKE emulatie"
 
-#: src/emu/ui/ui.cpp:1544
+#: src/emu/ui/ui.cpp:1541
 msgid "UI:   Enabled"
 msgstr "UI:   Ingeschakeld"
 
-#: src/emu/ui/ui.cpp:1546 src/emu/ui/ui.cpp:1556
+#: src/emu/ui/ui.cpp:1543 src/emu/ui/ui.cpp:1553
 msgid "**Use ScrLock to toggle**"
 msgstr "**Gebruik ScrLock om te wisselen**"
 
-#: src/emu/ui/ui.cpp:1553
+#: src/emu/ui/ui.cpp:1550
 msgid "Mode: FULL Emulation"
 msgstr "Modus: VOLLEDIGE emulatie"
 
-#: src/emu/ui/ui.cpp:1554
+#: src/emu/ui/ui.cpp:1551
 msgid "UI:   Disabled"
 msgstr "UI:   Uitgeschakeld"
 
-#: src/emu/ui/ui.cpp:1692
+#: src/emu/ui/ui.cpp:1689
 msgid "Autofire can't be enabled"
 msgstr "Autofire kan niet worden ingeschakeld"
 
-#: src/emu/ui/ui.cpp:1731
+#: src/emu/ui/ui.cpp:1728
 msgid "Select position to save to"
 msgstr "Selecteer positie om naar op te slaan"
 
-#: src/emu/ui/ui.cpp:1733
+#: src/emu/ui/ui.cpp:1730
 msgid "Select position to load from"
 msgstr "Selecteer positie om van in te lezen"
 
-#: src/emu/ui/ui.cpp:1757
+#: src/emu/ui/ui.cpp:1754
 msgid "Save cancelled"
 msgstr "Opslaan afgebroken"
 
-#: src/emu/ui/ui.cpp:1759
+#: src/emu/ui/ui.cpp:1756
 msgid "Load cancelled"
 msgstr "Inlezen afgebroken"
 
-#: src/emu/ui/ui.cpp:1802
+#: src/emu/ui/ui.cpp:1799
 #, c-format
 msgid "Save to position %s"
 msgstr "Opslaan naar positie %s"
 
-#: src/emu/ui/ui.cpp:1807
+#: src/emu/ui/ui.cpp:1804
 #, c-format
 msgid "Load from position %s"
 msgstr "Inlezen van positie %s"
 
-#: src/emu/ui/ui.cpp:1847
+#: src/emu/ui/ui.cpp:1844
 #, c-format
 msgid ""
 "Are you sure you want to quit?\n"
@@ -1715,173 +1731,173 @@ msgstr ""
 "Druk op ''%1%s'' om te stoppen,\n"
 "druk op ''%2$s'' om terug te keren naar de emulatie."
 
-#: src/emu/ui/ui.cpp:1917
+#: src/emu/ui/ui.cpp:1914
 msgid "Master Volume"
 msgstr "Hoofdvolume"
 
-#: src/emu/ui/ui.cpp:1926
+#: src/emu/ui/ui.cpp:1923
 #, c-format
 msgid "%1$s Volume"
 msgstr "%1$s volume"
 
-#: src/emu/ui/ui.cpp:1949
+#: src/emu/ui/ui.cpp:1946
 #, c-format
 msgid "Overclock CPU %1$s"
 msgstr "Overklok CPU %1$s"
 
-#: src/emu/ui/ui.cpp:1968
+#: src/emu/ui/ui.cpp:1965
 #, c-format
 msgid "%1$s Refresh Rate"
 msgstr "%1$s verversingfrequentie"
 
-#: src/emu/ui/ui.cpp:1973
+#: src/emu/ui/ui.cpp:1970
 #, c-format
 msgid "%1$s Brightness"
 msgstr "%1$s helderheid"
 
-#: src/emu/ui/ui.cpp:1975
+#: src/emu/ui/ui.cpp:1972
 #, c-format
 msgid "%1$s Contrast"
 msgstr "%1$s contrast"
 
-#: src/emu/ui/ui.cpp:1977
+#: src/emu/ui/ui.cpp:1974
 #, c-format
 msgid "%1$s Gamma"
 msgstr "%1$s gamma"
 
-#: src/emu/ui/ui.cpp:1981
+#: src/emu/ui/ui.cpp:1978
 #, c-format
 msgid "%1$s Horiz Stretch"
 msgstr "%1$s horizontale stretch"
 
-#: src/emu/ui/ui.cpp:1983
+#: src/emu/ui/ui.cpp:1980
 #, c-format
 msgid "%1$s Horiz Position"
 msgstr "%1$s horizontale positie"
 
-#: src/emu/ui/ui.cpp:1985
+#: src/emu/ui/ui.cpp:1982
 #, c-format
 msgid "%1$s Vert Stretch"
 msgstr "%1$s verticale stretch"
 
-#: src/emu/ui/ui.cpp:1987
+#: src/emu/ui/ui.cpp:1984
 #, c-format
 msgid "%1$s Vert Position"
 msgstr "%1$s verticale positie"
 
-#: src/emu/ui/ui.cpp:2005
+#: src/emu/ui/ui.cpp:2002
 #, c-format
 msgid "Laserdisc '%1$s' Horiz Stretch"
 msgstr "Laserdisc '%1$s' horizontale stretch"
 
-#: src/emu/ui/ui.cpp:2007
+#: src/emu/ui/ui.cpp:2004
 #, c-format
 msgid "Laserdisc '%1$s' Horiz Position"
 msgstr "Laserdisc '%1$s' horizontale positie"
 
-#: src/emu/ui/ui.cpp:2009
+#: src/emu/ui/ui.cpp:2006
 #, c-format
 msgid "Laserdisc '%1$s' Vert Stretch"
 msgstr "Laserdic '%1$s' verticale stretch"
 
-#: src/emu/ui/ui.cpp:2011
+#: src/emu/ui/ui.cpp:2008
 #, c-format
 msgid "Laserdisc '%1$s' Vert Position"
 msgstr "Laserdisc '%1$s' verticale positie"
 
-#: src/emu/ui/ui.cpp:2021
+#: src/emu/ui/ui.cpp:2018
 msgid "Vector Flicker"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2022
+#: src/emu/ui/ui.cpp:2019
 msgid "Beam Width Minimum"
 msgstr "Minimale straalbreedte"
 
-#: src/emu/ui/ui.cpp:2023
+#: src/emu/ui/ui.cpp:2020
 msgid "Beam Width Maximum"
 msgstr "Maximale straalbreedte"
 
-#: src/emu/ui/ui.cpp:2024
+#: src/emu/ui/ui.cpp:2021
 msgid "Beam Intensity Weight"
 msgstr "Gewicht straalintensiteit"
 
-#: src/emu/ui/ui.cpp:2037
+#: src/emu/ui/ui.cpp:2034
 #, c-format
 msgid "Crosshair Scale %1$s"
 msgstr "Vizier schaal %1$s"
 
-#: src/emu/ui/ui.cpp:2037 src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2034 src/emu/ui/ui.cpp:2036
 msgid "X"
 msgstr "X"
 
-#: src/emu/ui/ui.cpp:2037 src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2034 src/emu/ui/ui.cpp:2036
 msgid "Y"
 msgstr "Y"
 
-#: src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2036
 #, c-format
 msgid "Crosshair Offset %1$s"
 msgstr "Vizier offset %1$s"
 
-#: src/emu/ui/ui.cpp:2071
+#: src/emu/ui/ui.cpp:2068
 #, c-format
 msgid "%1$3ddB"
 msgstr "%1$3d dB"
 
-#: src/emu/ui/ui.cpp:2115
+#: src/emu/ui/ui.cpp:2112
 #, c-format
 msgid "%1$d%%"
 msgstr "%1$d%%"
 
-#: src/emu/ui/ui.cpp:2131
+#: src/emu/ui/ui.cpp:2128
 #, c-format
 msgid "%1$3.0f%%"
 msgstr "%1$3.0f%%"
 
-#: src/emu/ui/ui.cpp:2154
+#: src/emu/ui/ui.cpp:2151
 #, c-format
 msgid "%1$.3ffps"
 msgstr "%1$.3f fps"
 
-#: src/emu/ui/ui.cpp:2177 src/emu/ui/ui.cpp:2199 src/emu/ui/ui.cpp:2220
-#: src/emu/ui/ui.cpp:2242 src/emu/ui/ui.cpp:2264 src/emu/ui/ui.cpp:2286
-#: src/emu/ui/ui.cpp:2308 src/emu/ui/ui.cpp:2330 src/emu/ui/ui.cpp:2352
-#: src/emu/ui/ui.cpp:2374 src/emu/ui/ui.cpp:2396
+#: src/emu/ui/ui.cpp:2174 src/emu/ui/ui.cpp:2196 src/emu/ui/ui.cpp:2217
+#: src/emu/ui/ui.cpp:2239 src/emu/ui/ui.cpp:2261 src/emu/ui/ui.cpp:2283
+#: src/emu/ui/ui.cpp:2305 src/emu/ui/ui.cpp:2327 src/emu/ui/ui.cpp:2349
+#: src/emu/ui/ui.cpp:2371 src/emu/ui/ui.cpp:2393
 #, c-format
 msgid "%1$.3f"
 msgstr "%1$.3f"
 
-#: src/emu/ui/ui.cpp:2412 src/emu/ui/ui.cpp:2428 src/emu/ui/ui.cpp:2444
-#: src/emu/ui/ui.cpp:2460
+#: src/emu/ui/ui.cpp:2408 src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2438
+#: src/emu/ui/ui.cpp:2453
 #, c-format
 msgid "%1$1.2f"
 msgstr "%1$1.2f"
 
-#: src/emu/ui/ui.cpp:2476
+#: src/emu/ui/ui.cpp:2469
 #, c-format
 msgid "Screen '%1$s'"
 msgstr "Scherm '%1$s'"
 
-#: src/emu/ui/ui.cpp:2478
+#: src/emu/ui/ui.cpp:2471
 msgid "Screen"
 msgstr "Scherm"
 
-#: src/emu/ui/ui.cpp:2494
+#: src/emu/ui/ui.cpp:2487
 #, c-format
 msgid "Crosshair Scale X %1$1.3f"
 msgstr "Vizier X-schaal %1$1.3f"
 
-#: src/emu/ui/ui.cpp:2494
+#: src/emu/ui/ui.cpp:2487
 #, c-format
 msgid "Crosshair Scale Y %1$1.3f"
 msgstr "Vizier Y-schaal %1$1.3f"
 
-#: src/emu/ui/ui.cpp:2513
+#: src/emu/ui/ui.cpp:2506
 #, c-format
 msgid "Crosshair Offset X %1$1.3f"
 msgstr "Vizier X-offset %1$1.3f"
 
-#: src/emu/ui/ui.cpp:2513
+#: src/emu/ui/ui.cpp:2506
 #, c-format
 msgid "Crosshair Offset Y %1$1.3f"
 msgstr "Vizier Y-offset %1$1.3f"
@@ -1923,14 +1939,26 @@ msgstr ""
 msgid "Full"
 msgstr "Volledig"
 
-#: src/emu/ui/viewgfx.cpp:392
+#: src/emu/ui/viewgfx.cpp:391
 msgid " COLORS"
 msgstr " KLEUREN"
 
-#: src/emu/ui/viewgfx.cpp:392
+#: src/emu/ui/viewgfx.cpp:391
 msgid " PENS"
 msgstr " PENNEN"
 
+#~ msgid "Export XML format (like -listxml)"
+#~ msgstr "Exporteer in XML formaat (zoals -listxml)"
+
+#~ msgid "Export TXT format (like -listfull)"
+#~ msgstr "Exporteer in TXT formaat (zoals -listfull)"
+
+#~ msgid "Dummy"
+#~ msgstr "Dummie"
+
+#~ msgid "%1$s %2$s ( %3$d / %4$d softwares )"
+#~ msgstr "%1$s %2$s ( %3$d / %4$d software )"
+
 #~ msgid "Lightgun Device Assignment"
 #~ msgstr "Lightgun toewijzing"
 
@@ -2058,8 +2086,5 @@ msgstr " PENNEN"
 #~ "\n"
 #~ "Type OK of beweeg de joystick naar links en rechts om verder te gaan"
 
-#~ msgid "Configure Machine"
-#~ msgstr "Configureer machine"
-
 #~ msgid "Multi-Threaded Rendering"
 #~ msgstr "Multithreaded renderen"
diff --git a/language/English/strings.po b/language/English/strings.po
index a0303649f78..e991acf18ad 100644
--- a/language/English/strings.po
+++ b/language/English/strings.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MAME\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-11 03:33+0200\n"
+"POT-Creation-Date: 2016-04-15 17:42+0200\n"
 "PO-Revision-Date: 2016-02-20 18:03+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: MAME Language Team\n"
@@ -60,14 +60,14 @@ msgstr ""
 msgid "Autofire Status"
 msgstr ""
 
-#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1698
+#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1695
 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211
 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219
 #: src/emu/ui/videoopt.cpp:223
 msgid "Disabled"
 msgstr ""
 
-#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1698
+#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1695
 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211
 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219
 #: src/emu/ui/videoopt.cpp:223
@@ -75,14 +75,14 @@ msgid "Enabled"
 msgstr ""
 
 #: src/emu/ui/cheatopt.cpp:282 src/emu/ui/cheatopt.cpp:288
-#: src/emu/ui/menu.cpp:710 src/emu/ui/miscmenu.cpp:831
-#: src/emu/ui/sndmenu.cpp:135 src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/menu.cpp:755 src/emu/ui/miscmenu.cpp:936
+#: src/emu/ui/sndmenu.cpp:133 src/emu/ui/sndmenu.cpp:135
 msgid "On"
 msgstr ""
 
 #: src/emu/ui/cheatopt.cpp:282 src/emu/ui/cheatopt.cpp:288
-#: src/emu/ui/menu.cpp:713 src/emu/ui/miscmenu.cpp:831
-#: src/emu/ui/sndmenu.cpp:135 src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/menu.cpp:758 src/emu/ui/miscmenu.cpp:936
+#: src/emu/ui/sndmenu.cpp:133 src/emu/ui/sndmenu.cpp:135
 msgid "Off"
 msgstr ""
 
@@ -94,316 +94,316 @@ msgstr ""
 msgid "Autofire Delay"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:158 src/emu/ui/custmenu.cpp:447
+#: src/emu/ui/custmenu.cpp:157 src/emu/ui/custmenu.cpp:445
 msgid "Main filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:167 src/emu/ui/custmenu.cpp:456
+#: src/emu/ui/custmenu.cpp:166 src/emu/ui/custmenu.cpp:454
 msgid "Other filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:176 src/emu/ui/optsmenu.cpp:239
+#: src/emu/ui/custmenu.cpp:175 src/emu/ui/optsmenu.cpp:238
 msgid "^!Manufacturer"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:185 src/emu/ui/custmenu.cpp:474
-#: src/emu/ui/optsmenu.cpp:247
+#: src/emu/ui/custmenu.cpp:184 src/emu/ui/custmenu.cpp:472
+#: src/emu/ui/optsmenu.cpp:246
 msgid "^!Year"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:194 src/emu/ui/custmenu.cpp:510
+#: src/emu/ui/custmenu.cpp:193 src/emu/ui/custmenu.cpp:508
 msgid "Remove last filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:197 src/emu/ui/custmenu.cpp:513
+#: src/emu/ui/custmenu.cpp:196 src/emu/ui/custmenu.cpp:511
 msgid "Add filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:212 src/emu/ui/custmenu.cpp:233
-#: src/emu/ui/custmenu.cpp:529 src/emu/ui/custmenu.cpp:550
+#: src/emu/ui/custmenu.cpp:211 src/emu/ui/custmenu.cpp:231
+#: src/emu/ui/custmenu.cpp:527 src/emu/ui/custmenu.cpp:547
 msgid "Select custom filters:"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:465
+#: src/emu/ui/custmenu.cpp:463
 msgid "^!Publisher"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:483
+#: src/emu/ui/custmenu.cpp:481
 msgid "^!Software List"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:492
+#: src/emu/ui/custmenu.cpp:490
 msgid "^!Device type"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:501
+#: src/emu/ui/custmenu.cpp:499
 msgid "^!Region"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:23
+#: src/emu/ui/custui.cpp:22
 msgid "Show All"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:24
+#: src/emu/ui/custui.cpp:23
 msgid "Hide Filters"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:25
+#: src/emu/ui/custui.cpp:24
 msgid "Hide Info/Image"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:26
+#: src/emu/ui/custui.cpp:25
 msgid "Hide Both"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:142
+#: src/emu/ui/custui.cpp:141
 msgid "Fonts"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:143
+#: src/emu/ui/custui.cpp:142
 msgid "Colors"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:148 src/emu/ui/dirmenu.cpp:33
+#: src/emu/ui/custui.cpp:147 src/emu/ui/dirmenu.cpp:33
 msgid "Language"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:152
+#: src/emu/ui/custui.cpp:151
 msgid "Show side panels"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:167 src/emu/ui/custui.cpp:188
+#: src/emu/ui/custui.cpp:166 src/emu/ui/custui.cpp:186
 msgid "Custom UI Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:246
+#: src/emu/ui/custui.cpp:244
 msgid "default"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:349
+#: src/emu/ui/custui.cpp:347
 msgid "UI Font"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:354
+#: src/emu/ui/custui.cpp:352
 msgid "Bold"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:355
+#: src/emu/ui/custui.cpp:353
 msgid "Italic"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:360
+#: src/emu/ui/custui.cpp:358
 msgid "Lines"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:366
+#: src/emu/ui/custui.cpp:364
 msgid "Infos text size"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:383
+#: src/emu/ui/custui.cpp:381
 msgid "UI Fonts Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:411
+#: src/emu/ui/custui.cpp:408
 msgid "Sample text - Lorem ipsum dolor sit amet, consectetur adipiscing elit."
 msgstr ""
 
-#: src/emu/ui/custui.cpp:509
+#: src/emu/ui/custui.cpp:506
 msgid "Normal text"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:510
+#: src/emu/ui/custui.cpp:507
 msgid "Selected color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:511
+#: src/emu/ui/custui.cpp:508
 msgid "Normal text background"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:512
+#: src/emu/ui/custui.cpp:509
 msgid "Selected background color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:513
+#: src/emu/ui/custui.cpp:510
 msgid "Subitem color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:514 src/emu/ui/custui.cpp:610
+#: src/emu/ui/custui.cpp:511 src/emu/ui/custui.cpp:606
 msgid "Clone"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:515
+#: src/emu/ui/custui.cpp:512
 msgid "Border"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:516
+#: src/emu/ui/custui.cpp:513
 msgid "Background"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:517
+#: src/emu/ui/custui.cpp:514
 msgid "Dipswitch"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:518
+#: src/emu/ui/custui.cpp:515
 msgid "Unavailable color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:519
+#: src/emu/ui/custui.cpp:516
 msgid "Slider color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:520
+#: src/emu/ui/custui.cpp:517
 msgid "Gfx viewer background"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:521
+#: src/emu/ui/custui.cpp:518
 msgid "Mouse over color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:522
+#: src/emu/ui/custui.cpp:519
 msgid "Mouse over background color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:523
+#: src/emu/ui/custui.cpp:520
 msgid "Mouse down color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:524
+#: src/emu/ui/custui.cpp:521
 msgid "Mouse down background color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:527
+#: src/emu/ui/custui.cpp:524
 msgid "Restore originals colors"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:543
+#: src/emu/ui/custui.cpp:540
 msgid "UI Colors Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:572
+#: src/emu/ui/custui.cpp:568
 #, c-format
 msgid "Double click or press %1$s to change the color value"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:598
+#: src/emu/ui/custui.cpp:594
 msgid "Menu Preview"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:606
+#: src/emu/ui/custui.cpp:602
 msgid "Normal"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:607
+#: src/emu/ui/custui.cpp:603
 msgid "Subitem"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:608
+#: src/emu/ui/custui.cpp:604
 msgid "Selected"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:609
+#: src/emu/ui/custui.cpp:605
 msgid "Mouse Over"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:841 src/emu/ui/custui.cpp:844
+#: src/emu/ui/custui.cpp:837 src/emu/ui/custui.cpp:840
 msgid "Alpha"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:849 src/emu/ui/custui.cpp:852
-#: src/emu/ui/custui.cpp:1013
+#: src/emu/ui/custui.cpp:845 src/emu/ui/custui.cpp:848
+#: src/emu/ui/custui.cpp:1007
 msgid "Red"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:857 src/emu/ui/custui.cpp:860
-#: src/emu/ui/custui.cpp:1016
+#: src/emu/ui/custui.cpp:853 src/emu/ui/custui.cpp:856
+#: src/emu/ui/custui.cpp:1010
 msgid "Green"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:865 src/emu/ui/custui.cpp:868
-#: src/emu/ui/custui.cpp:1017
+#: src/emu/ui/custui.cpp:861 src/emu/ui/custui.cpp:864
+#: src/emu/ui/custui.cpp:1011
 msgid "Blue"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:871
+#: src/emu/ui/custui.cpp:867
 msgid "Choose from palette"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:887
+#: src/emu/ui/custui.cpp:883
 msgid " - ARGB Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:912
+#: src/emu/ui/custui.cpp:907
 msgid "Color preview ="
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1009
+#: src/emu/ui/custui.cpp:1003
 msgid "White"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1010
+#: src/emu/ui/custui.cpp:1004
 msgid "Silver"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1011
+#: src/emu/ui/custui.cpp:1005
 msgid "Gray"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1012
+#: src/emu/ui/custui.cpp:1006
 msgid "Black"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1014
+#: src/emu/ui/custui.cpp:1008
 msgid "Orange"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1015
+#: src/emu/ui/custui.cpp:1009
 msgid "Yellow"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1018
+#: src/emu/ui/custui.cpp:1012
 msgid "Violet"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:65
+#: src/emu/ui/datmenu.cpp:64
 msgid "Software History"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:67
+#: src/emu/ui/datmenu.cpp:66
 msgid "Software Usage"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:199
+#: src/emu/ui/datmenu.cpp:196
 msgid "Revision: "
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:287 src/emu/ui/selgame.cpp:40
-#: src/emu/ui/selgame.cpp:2152 src/emu/ui/selgame.cpp:2161
-#: src/emu/ui/selsoft.cpp:1577 src/emu/ui/selsoft.cpp:1597
-#: src/emu/ui/selsoft.cpp:1606
+#: src/emu/ui/datmenu.cpp:284 src/emu/ui/selgame.cpp:39
+#: src/emu/ui/selgame.cpp:2158 src/emu/ui/selgame.cpp:2167
+#: src/emu/ui/selsoft.cpp:1574 src/emu/ui/selsoft.cpp:1592
+#: src/emu/ui/selsoft.cpp:1601
 msgid "History"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:289 src/emu/ui/selgame.cpp:41
+#: src/emu/ui/datmenu.cpp:286 src/emu/ui/selgame.cpp:40
 msgid "Mameinfo"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:291 src/emu/ui/selgame.cpp:43
+#: src/emu/ui/datmenu.cpp:288 src/emu/ui/selgame.cpp:42
 msgid "Messinfo"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:293 src/emu/ui/selgame.cpp:42
+#: src/emu/ui/datmenu.cpp:290 src/emu/ui/selgame.cpp:41
 msgid "Sysinfo"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:295 src/emu/ui/selgame.cpp:46
+#: src/emu/ui/datmenu.cpp:292 src/emu/ui/selgame.cpp:45
 msgid "Mamescore"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:297 src/emu/ui/selgame.cpp:45
+#: src/emu/ui/datmenu.cpp:294 src/emu/ui/selgame.cpp:44
 msgid "Gameinit"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:299 src/emu/ui/selgame.cpp:44
+#: src/emu/ui/datmenu.cpp:296 src/emu/ui/selgame.cpp:43
 msgid "Command"
 msgstr ""
 
@@ -555,75 +555,75 @@ msgstr ""
 msgid "Remove %1$s Folder"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:158
+#: src/emu/ui/filesel.cpp:161
 msgid "File Already Exists - Override?"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:160 src/emu/ui/selgame.cpp:1568
-#: src/emu/ui/selgame.cpp:1569 src/emu/ui/selgame.cpp:1570
-#: src/emu/ui/selgame.cpp:1571 src/emu/ui/selgame.cpp:1572
-#: src/emu/ui/selgame.cpp:1573 src/emu/ui/selgame.cpp:1574
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/filesel.cpp:163 src/emu/ui/selgame.cpp:1576
+#: src/emu/ui/selgame.cpp:1577 src/emu/ui/selgame.cpp:1578
+#: src/emu/ui/selgame.cpp:1579 src/emu/ui/selgame.cpp:1580
+#: src/emu/ui/selgame.cpp:1581 src/emu/ui/selgame.cpp:1582
+#: src/emu/ui/selgame.cpp:1591
 msgid "No"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:161 src/emu/ui/selgame.cpp:1568
-#: src/emu/ui/selgame.cpp:1569 src/emu/ui/selgame.cpp:1570
-#: src/emu/ui/selgame.cpp:1571 src/emu/ui/selgame.cpp:1572
-#: src/emu/ui/selgame.cpp:1573 src/emu/ui/selgame.cpp:1574
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/filesel.cpp:164 src/emu/ui/selgame.cpp:1576
+#: src/emu/ui/selgame.cpp:1577 src/emu/ui/selgame.cpp:1578
+#: src/emu/ui/selgame.cpp:1579 src/emu/ui/selgame.cpp:1580
+#: src/emu/ui/selgame.cpp:1581 src/emu/ui/selgame.cpp:1582
+#: src/emu/ui/selgame.cpp:1591
 msgid "Yes"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:272
+#: src/emu/ui/filesel.cpp:275
 msgid "New Image Name:"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:278
+#: src/emu/ui/filesel.cpp:281
 msgid "Image Format:"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:284
+#: src/emu/ui/filesel.cpp:287
 msgid "Create"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:315
+#: src/emu/ui/filesel.cpp:318
 msgid "Please enter a file extension too"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:503 src/emu/ui/swlist.cpp:65
+#: src/emu/ui/filesel.cpp:506 src/emu/ui/swlist.cpp:65
 msgid "[empty slot]"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:507
+#: src/emu/ui/filesel.cpp:510
 msgid "[create]"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:511 src/emu/ui/swlist.cpp:76
+#: src/emu/ui/filesel.cpp:514 src/emu/ui/swlist.cpp:76
 msgid "[software list]"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:803
+#: src/emu/ui/filesel.cpp:806
 msgid "Select image format"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:863
+#: src/emu/ui/filesel.cpp:866
 msgid "Select access mode"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:864
+#: src/emu/ui/filesel.cpp:867
 msgid "Read-only"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:866
+#: src/emu/ui/filesel.cpp:869
 msgid "Read-write"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:867
+#: src/emu/ui/filesel.cpp:870
 msgid "Read this image, write to another image"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:868
+#: src/emu/ui/filesel.cpp:871
 msgid "Read this image, write to diff"
 msgstr ""
 
@@ -649,7 +649,7 @@ msgstr ""
 msgid "[empty]"
 msgstr ""
 
-#: src/emu/ui/info_pty.cpp:26 src/emu/ui/mainmenu.cpp:91
+#: src/emu/ui/info_pty.cpp:26 src/emu/ui/mainmenu.cpp:96
 msgid "Pseudo terminals"
 msgstr ""
 
@@ -665,7 +665,7 @@ msgstr ""
 msgid "Other Controls"
 msgstr ""
 
-#: src/emu/ui/inputmap.cpp:622 src/emu/ui/miscmenu.cpp:91
+#: src/emu/ui/inputmap.cpp:622 src/emu/ui/miscmenu.cpp:92
 #: src/emu/ui/slotopt.cpp:172
 msgid "Reset"
 msgstr ""
@@ -698,27 +698,27 @@ msgstr ""
 msgid "Machine Information"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:78
+#: src/emu/ui/mainmenu.cpp:80
 msgid "Image Information"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:81
+#: src/emu/ui/mainmenu.cpp:83
 msgid "File Manager"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:86
+#: src/emu/ui/mainmenu.cpp:92
 msgid "Tape Control"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:94
+#: src/emu/ui/mainmenu.cpp:99
 msgid "Bios Selection"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:100
+#: src/emu/ui/mainmenu.cpp:104
 msgid "Slot Devices"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:107
+#: src/emu/ui/mainmenu.cpp:109
 msgid "Barcode Reader"
 msgstr ""
 
@@ -726,43 +726,43 @@ msgstr ""
 msgid "Network Devices"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:119
+#: src/emu/ui/mainmenu.cpp:118
 msgid "Keyboard Mode"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:122
+#: src/emu/ui/mainmenu.cpp:121
 msgid "Slider Controls"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:125
+#: src/emu/ui/mainmenu.cpp:124
 msgid "Video Options"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:129
+#: src/emu/ui/mainmenu.cpp:128
 msgid "Crosshair Options"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:133
+#: src/emu/ui/mainmenu.cpp:132
 msgid "Cheat"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:136
+#: src/emu/ui/mainmenu.cpp:135
 msgid "Plugin Options"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:140
+#: src/emu/ui/mainmenu.cpp:139
 msgid "External DAT View"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:146
+#: src/emu/ui/mainmenu.cpp:145 src/emu/ui/miscmenu.cpp:785
 msgid "Add To Favorites"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:148
+#: src/emu/ui/mainmenu.cpp:147 src/emu/ui/miscmenu.cpp:787
 msgid "Remove From Favorites"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:155
+#: src/emu/ui/mainmenu.cpp:154
 msgid "Select New Machine"
 msgstr ""
 
@@ -802,189 +802,205 @@ msgstr ""
 msgid "Return to Previous Menu"
 msgstr ""
 
-#: src/emu/ui/menu.cpp:716
+#: src/emu/ui/menu.cpp:761
 msgid "Auto"
 msgstr ""
 
-#: src/emu/ui/menu.cpp:2133
+#: src/emu/ui/menu.cpp:2195
 msgid "Images"
 msgstr ""
 
-#: src/emu/ui/menu.cpp:2134
+#: src/emu/ui/menu.cpp:2196
 msgid "Infos"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Keyboard Mode:"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Natural"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Emulated"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:240
+#: src/emu/ui/miscmenu.cpp:241
 #, c-format
 msgid ""
 "Uptime: %1$d:%2$02d:%3$02d\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:242
+#: src/emu/ui/miscmenu.cpp:243
 #, c-format
 msgid ""
 "Uptime: %1$d:%2$02d\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:246
+#: src/emu/ui/miscmenu.cpp:247
 #, c-format
 msgid ""
 "Tickets dispensed: %1$d\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:257
+#: src/emu/ui/miscmenu.cpp:258
 msgid "Coin %1$c: NA%3$s\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:257
+#: src/emu/ui/miscmenu.cpp:258
 #, c-format
 msgid "Coin %1$c: %2$d%3$s\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:260
+#: src/emu/ui/miscmenu.cpp:261
 msgid " (locked)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:519
+#: src/emu/ui/miscmenu.cpp:520
 msgid "Visible Delay"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:617
+#: src/emu/ui/miscmenu.cpp:619
 #, c-format
 msgid "%s.xml saved under ui folder."
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:645
+#: src/emu/ui/miscmenu.cpp:647
 msgid "Name:             Description:\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:657
+#: src/emu/ui/miscmenu.cpp:659
 #, c-format
 msgid "%s.txt saved under ui folder."
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:675
-msgid "Export XML format (like -listxml)"
+#: src/emu/ui/miscmenu.cpp:677
+msgid "Export list in XML format (like -listxml)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:676
-msgid "Export TXT format (like -listfull)"
+#: src/emu/ui/miscmenu.cpp:678
+msgid "Export list in XML format (like -listxml, but exclude devices)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:734
-msgid "Dummy"
+#: src/emu/ui/miscmenu.cpp:679
+msgid "Export list in TXT format (like -listfull)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:736
-msgid "Save machine configuration"
-msgstr ""
-
-#: src/emu/ui/miscmenu.cpp:848 src/emu/ui/miscmenu.cpp:869
-#: src/emu/ui/selgame.cpp:594
-msgid "Plugins"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:218
-msgid "Filter"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:226
-msgid " ^!File"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:231
-msgid " ^!Category"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:254
-msgid "^!Setup custom filter"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:262
-msgid "Customize UI"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:263
-msgid "Configure Directories"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:266 src/emu/ui/sndmenu.cpp:151
-#: src/emu/ui/sndmenu.cpp:172
-msgid "Sound Options"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:269
-msgid "General Inputs"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:272
-msgid "Save Configuration"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:286 src/emu/ui/optsmenu.cpp:307
-msgid "Settings"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:327
-msgid "**Error saving ui.ini**"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:374
-#, c-format
-msgid "**Error saving %s.ini**"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:378
+#: src/emu/ui/miscmenu.cpp:729 src/emu/ui/optsmenu.cpp:376
 msgid ""
 "\n"
 "    Configuration saved    \n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/selector.cpp:166
+#: src/emu/ui/miscmenu.cpp:774
+msgid "Bios"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:776
+msgid "Driver"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:790
+msgid "Save machine configuration"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:806
+msgid "Configure machine:"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:868 src/emu/ui/selsoft.cpp:109
+msgid " (default)"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:953 src/emu/ui/miscmenu.cpp:973
+#: src/emu/ui/selgame.cpp:600
+msgid "Plugins"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:217
+msgid "Filter"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:225
+msgid " ^!File"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:230
+msgid " ^!Category"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:253
+msgid "^!Setup custom filter"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:261
+msgid "Customize UI"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:262
+msgid "Configure Directories"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:265 src/emu/ui/sndmenu.cpp:149
+#: src/emu/ui/sndmenu.cpp:169
+msgid "Sound Options"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:268
+msgid "General Inputs"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:271
+msgid "Save Configuration"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:285 src/emu/ui/optsmenu.cpp:305
+msgid "Settings"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:325
+msgid "**Error saving ui.ini**"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:372
+#, c-format
+msgid "**Error saving %s.ini**"
+msgstr ""
+
+#: src/emu/ui/selector.cpp:165
 msgid "Selection List - Search: "
 msgstr ""
 
-#: src/emu/ui/selector.cpp:196
+#: src/emu/ui/selector.cpp:194
 #, c-format
 msgid "Double click or press %1$s to select"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:39
+#: src/emu/ui/selgame.cpp:38
 msgid "General Info"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:374 src/emu/ui/selsoft.cpp:282
+#: src/emu/ui/selgame.cpp:380 src/emu/ui/selsoft.cpp:281
 #, c-format
 msgid ""
 "%s\n"
 " added to favorites list."
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:380 src/emu/ui/selgame.cpp:389
-#: src/emu/ui/selsoft.cpp:287
+#: src/emu/ui/selgame.cpp:386 src/emu/ui/selgame.cpp:395
+#: src/emu/ui/selsoft.cpp:286
 #, c-format
 msgid ""
 "%s\n"
 " removed from favorites list."
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:450
+#: src/emu/ui/selgame.cpp:457
 msgid ""
 "The selected machine is missing one or more required ROM or CHD images. "
 "Please select a different machine.\n"
@@ -992,275 +1008,275 @@ msgid ""
 "Press any key to continue."
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:589 src/emu/ui/simpleselgame.cpp:265
+#: src/emu/ui/selgame.cpp:595 src/emu/ui/simpleselgame.cpp:265
 msgid "Configure Options"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:752
+#: src/emu/ui/selgame.cpp:596
+msgid "Configure Machine"
+msgstr ""
+
+#: src/emu/ui/selgame.cpp:758
 #, c-format
 msgid "%1$s %2$s ( %3$d / %4$d machines (%5$d BIOS) )"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:762
+#: src/emu/ui/selgame.cpp:768
 #, c-format
 msgid "%1$s (%2$s - %3$s) - "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:769 src/emu/ui/selgame.cpp:775
+#: src/emu/ui/selgame.cpp:775 src/emu/ui/selgame.cpp:781
 #, c-format
 msgid "%1$s (%2$s) - "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:784
+#: src/emu/ui/selgame.cpp:790
 #, c-format
 msgid "%1$s Search: %2$s_"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:838
+#: src/emu/ui/selgame.cpp:844
 #, c-format
 msgid "Romset: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:841 src/emu/ui/selgame.cpp:890
-#: src/emu/ui/selsoft.cpp:751 src/emu/ui/selsoft.cpp:801
+#: src/emu/ui/selgame.cpp:847 src/emu/ui/selgame.cpp:896
+#: src/emu/ui/selsoft.cpp:750 src/emu/ui/selsoft.cpp:800
 #: src/emu/ui/simpleselgame.cpp:328
 #, c-format
 msgid "%1$s, %2$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:847 src/emu/ui/selsoft.cpp:757
+#: src/emu/ui/selgame.cpp:853 src/emu/ui/selsoft.cpp:756
 #, c-format
 msgid "Driver is clone of: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:849 src/emu/ui/selsoft.cpp:759
+#: src/emu/ui/selgame.cpp:855 src/emu/ui/selsoft.cpp:758
 msgid "Driver is parent"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:853 src/emu/ui/selsoft.cpp:763
+#: src/emu/ui/selgame.cpp:859 src/emu/ui/selsoft.cpp:762
 #: src/emu/ui/simpleselgame.cpp:335
 msgid "Overall: NOT WORKING"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:855 src/emu/ui/selsoft.cpp:765
+#: src/emu/ui/selgame.cpp:861 src/emu/ui/selsoft.cpp:764
 #: src/emu/ui/simpleselgame.cpp:337
 msgid "Overall: Unemulated Protection"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:857 src/emu/ui/selsoft.cpp:767
+#: src/emu/ui/selgame.cpp:863 src/emu/ui/selsoft.cpp:766
 #: src/emu/ui/simpleselgame.cpp:339
 msgid "Overall: Working"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:861 src/emu/ui/selsoft.cpp:771
+#: src/emu/ui/selgame.cpp:867 src/emu/ui/selsoft.cpp:770
 msgid "Graphics: Imperfect, "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:863 src/emu/ui/selsoft.cpp:773
+#: src/emu/ui/selgame.cpp:869 src/emu/ui/selsoft.cpp:772
 msgid "Graphics: OK, "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:866 src/emu/ui/selsoft.cpp:776
+#: src/emu/ui/selgame.cpp:872 src/emu/ui/selsoft.cpp:775
 msgid "Sound: Unimplemented"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:868 src/emu/ui/selsoft.cpp:778
+#: src/emu/ui/selgame.cpp:874 src/emu/ui/selsoft.cpp:777
 msgid "Sound: Imperfect"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:870 src/emu/ui/selsoft.cpp:780
+#: src/emu/ui/selgame.cpp:876 src/emu/ui/selsoft.cpp:779
 msgid "Sound: OK"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:887
+#: src/emu/ui/selgame.cpp:893
 #, c-format
 msgid "System: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:894 src/emu/ui/selsoft.cpp:805
+#: src/emu/ui/selgame.cpp:900 src/emu/ui/selsoft.cpp:804
 #, c-format
 msgid "Software is clone of: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:896 src/emu/ui/selsoft.cpp:807
+#: src/emu/ui/selgame.cpp:902 src/emu/ui/selsoft.cpp:806
 msgid "Software is parent"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:901 src/emu/ui/selsoft.cpp:812
+#: src/emu/ui/selgame.cpp:907 src/emu/ui/selsoft.cpp:811
 msgid "Supported: No"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:906 src/emu/ui/selsoft.cpp:817
+#: src/emu/ui/selgame.cpp:912 src/emu/ui/selsoft.cpp:816
 msgid "Supported: Partial"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:911 src/emu/ui/selsoft.cpp:822
+#: src/emu/ui/selgame.cpp:917 src/emu/ui/selsoft.cpp:821
 msgid "Supported: Yes"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:916 src/emu/ui/selsoft.cpp:827
+#: src/emu/ui/selgame.cpp:922 src/emu/ui/selsoft.cpp:826
 #, c-format
 msgid "romset: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:923
+#: src/emu/ui/selgame.cpp:929
 #, c-format
 msgid "%1$s %2$s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1535
+#: src/emu/ui/selgame.cpp:1543
 #, c-format
 msgid "Romset: %1$-.100s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1536
+#: src/emu/ui/selgame.cpp:1544
 #, c-format
 msgid "Year: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1537
+#: src/emu/ui/selgame.cpp:1545
 #, c-format
 msgid "Manufacturer: %1$-.100s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1541
+#: src/emu/ui/selgame.cpp:1549
 #, c-format
 msgid "Driver is Clone of: %1$-.100s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1543
+#: src/emu/ui/selgame.cpp:1551
 msgid "Driver is Parent\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1546
+#: src/emu/ui/selgame.cpp:1554
 msgid "Overall: NOT WORKING\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1548
+#: src/emu/ui/selgame.cpp:1556
 msgid "Overall: Unemulated Protection\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1550
+#: src/emu/ui/selgame.cpp:1558
 msgid "Overall: Working\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1553
+#: src/emu/ui/selgame.cpp:1561
 msgid "Graphics: Imperfect Colors\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1557
+#: src/emu/ui/selgame.cpp:1565
 msgid "Graphics: Imperfect\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1559
+#: src/emu/ui/selgame.cpp:1567
 msgid "Graphics: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1562
+#: src/emu/ui/selgame.cpp:1570
 msgid "Sound: Unimplemented\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1564
+#: src/emu/ui/selgame.cpp:1572
 msgid "Sound: Imperfect\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1566
+#: src/emu/ui/selgame.cpp:1574
 msgid "Sound: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1568
+#: src/emu/ui/selgame.cpp:1576
 #, c-format
 msgid "Driver is Skeleton: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1569
+#: src/emu/ui/selgame.cpp:1577
 #, c-format
 msgid "Game is Mechanical: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1570
+#: src/emu/ui/selgame.cpp:1578
 #, c-format
 msgid "Requires Artwork: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1571
+#: src/emu/ui/selgame.cpp:1579
 #, c-format
 msgid "Requires Clickable Artwork: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1572
+#: src/emu/ui/selgame.cpp:1580
 #, c-format
 msgid "Support Cocktail: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1573
+#: src/emu/ui/selgame.cpp:1581
 #, c-format
 msgid "Driver is Bios: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1574
+#: src/emu/ui/selgame.cpp:1582
 #, c-format
 msgid "Support Save: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 #, c-format
 msgid "Screen Orientation: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 msgid "Vertical"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 msgid "Horizontal"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/selgame.cpp:1591
 #, c-format
 msgid "Requires CHD: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1596
+#: src/emu/ui/selgame.cpp:1604
 msgid "Roms Audit Pass: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1598
+#: src/emu/ui/selgame.cpp:1606
 msgid "Roms Audit Pass: BAD\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1601
+#: src/emu/ui/selgame.cpp:1609
 msgid "Samples Audit Pass: None Needed\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1603
+#: src/emu/ui/selgame.cpp:1611
 msgid "Samples Audit Pass: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1605
+#: src/emu/ui/selgame.cpp:1613
 msgid "Samples Audit Pass: BAD\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1608
+#: src/emu/ui/selgame.cpp:1616
 msgid ""
 "Roms Audit Pass: Disabled\n"
 "Samples Audit Pass: Disabled\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:2049 src/emu/ui/selgame.cpp:2212
-#: src/emu/ui/selsoft.cpp:1662
+#: src/emu/ui/selgame.cpp:2055 src/emu/ui/selgame.cpp:2216
+#: src/emu/ui/selsoft.cpp:1655
 msgid "No Infos Available"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:2162 src/emu/ui/selsoft.cpp:1607
+#: src/emu/ui/selgame.cpp:2168 src/emu/ui/selsoft.cpp:1602
 msgid "Usage"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:110
-msgid " (default)"
-msgstr ""
-
-#: src/emu/ui/selsoft.cpp:381
+#: src/emu/ui/selsoft.cpp:380
 msgid ""
 "The selected software is missing one or more required files. Please select a "
 "different software.\n"
@@ -1268,57 +1284,57 @@ msgid ""
 "Press any key to continue."
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:684
+#: src/emu/ui/selsoft.cpp:683
 #, c-format
-msgid "%1$s %2$s ( %3$d / %4$d softwares )"
+msgid "%1$s %2$s ( %3$d / %4$d software packages )"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:685
+#: src/emu/ui/selsoft.cpp:684
 #, c-format
 msgid "Driver: \"%1$s\" software list "
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:688
+#: src/emu/ui/selsoft.cpp:687
 #, c-format
 msgid "Region: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:690
+#: src/emu/ui/selsoft.cpp:689
 #, c-format
 msgid "Publisher: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:692
+#: src/emu/ui/selsoft.cpp:691
 #, c-format
 msgid "Year: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:694
+#: src/emu/ui/selsoft.cpp:693
 #, c-format
 msgid "Software List: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:696
+#: src/emu/ui/selsoft.cpp:695
 #, c-format
 msgid "Device type: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:698
+#: src/emu/ui/selsoft.cpp:697
 #, c-format
 msgid "%s Search: %s_"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:748 src/emu/ui/selsoft.cpp:798
+#: src/emu/ui/selsoft.cpp:747 src/emu/ui/selsoft.cpp:797
 #: src/emu/ui/simpleselgame.cpp:325
 #, c-format
 msgid "%1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:1998 src/emu/ui/selsoft.cpp:2018
+#: src/emu/ui/selsoft.cpp:1991 src/emu/ui/selsoft.cpp:2011
 msgid "Software part selection:"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:2136 src/emu/ui/selsoft.cpp:2156
+#: src/emu/ui/selsoft.cpp:2129 src/emu/ui/selsoft.cpp:2149
 msgid "Bios selection:"
 msgstr ""
 
@@ -1366,15 +1382,15 @@ msgstr ""
 msgid " [internal]"
 msgstr ""
 
-#: src/emu/ui/sndmenu.cpp:135
+#: src/emu/ui/sndmenu.cpp:133
 msgid "Sound"
 msgstr ""
 
-#: src/emu/ui/sndmenu.cpp:136
+#: src/emu/ui/sndmenu.cpp:134
 msgid "Sample Rate"
 msgstr ""
 
-#: src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/sndmenu.cpp:135
 msgid "Use External Samples"
 msgstr ""
 
@@ -1443,80 +1459,80 @@ msgstr ""
 msgid "Fast Forward"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:419
+#: src/emu/ui/ui.cpp:418
 msgid "This driver requires images to be loaded in the following device(s): "
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1074
+#: src/emu/ui/ui.cpp:1071
 msgid ""
 "One or more ROMs/CHDs for this machine are incorrect. The machine may not "
 "run correctly.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1087
+#: src/emu/ui/ui.cpp:1084
 msgid ""
 "There are known problems with this machine\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1091
+#: src/emu/ui/ui.cpp:1088
 msgid ""
 "One or more ROMs/CHDs for this machine have not been correctly dumped.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1095
+#: src/emu/ui/ui.cpp:1092
 #, c-format
 msgid "The keyboard emulation may not be 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1097
+#: src/emu/ui/ui.cpp:1094
 #, c-format
 msgid "The colors aren't 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1099
+#: src/emu/ui/ui.cpp:1096
 msgid "The colors are completely wrong.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1101
+#: src/emu/ui/ui.cpp:1098
 #, c-format
 msgid "The video emulation isn't 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1103
+#: src/emu/ui/ui.cpp:1100
 #, c-format
 msgid "The sound emulation isn't 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1105
+#: src/emu/ui/ui.cpp:1102
 msgid "The machine lacks sound.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1108
+#: src/emu/ui/ui.cpp:1105
 msgid "Screen flipping in cocktail mode is not supported.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1112
+#: src/emu/ui/ui.cpp:1109
 msgid "The machine requires external artwork files\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1117
+#: src/emu/ui/ui.cpp:1114
 msgid ""
 "This machine was never completed. It may exhibit strange behavior or missing "
 "elements that are not bugs in the emulation.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1122
+#: src/emu/ui/ui.cpp:1119
 msgid ""
 "This machine has no sound hardware, MAME will produce no sounds, this is "
 "expected behaviour.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1130
+#: src/emu/ui/ui.cpp:1127
 msgid "The machine has protection which isn't fully emulated.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1133
+#: src/emu/ui/ui.cpp:1130
 msgid ""
 "\n"
 "THIS MACHINE DOESN'T WORK. The emulation for this machine is not yet "
@@ -1524,7 +1540,7 @@ msgid ""
 "the developers to improve the emulation.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1137
+#: src/emu/ui/ui.cpp:1134
 msgid ""
 "\n"
 "Certain elements of this machine cannot be emulated as it requires actual "
@@ -1532,21 +1548,21 @@ msgid ""
 "to fully play this machine.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1156
+#: src/emu/ui/ui.cpp:1153
 msgid ""
 "\n"
 "\n"
 "There are working clones of this machine: "
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1170
+#: src/emu/ui/ui.cpp:1167
 msgid ""
 "\n"
 "\n"
 "Press any key to continue"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1185
+#: src/emu/ui/ui.cpp:1182
 #, c-format
 msgid ""
 "%1$s\n"
@@ -1556,98 +1572,98 @@ msgid ""
 "CPU:\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1221 src/emu/ui/ui.cpp:1260
+#: src/emu/ui/ui.cpp:1218 src/emu/ui/ui.cpp:1257
 msgid "MHz"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1221 src/emu/ui/ui.cpp:1260
+#: src/emu/ui/ui.cpp:1218 src/emu/ui/ui.cpp:1257
 msgid "kHz"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1235
+#: src/emu/ui/ui.cpp:1232
 msgid ""
 "\n"
 "Sound:\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1264
+#: src/emu/ui/ui.cpp:1261
 msgid ""
 "\n"
 "Video:\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1268
+#: src/emu/ui/ui.cpp:1265
 msgid "None\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1275
+#: src/emu/ui/ui.cpp:1272
 msgid "Vector"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1286
+#: src/emu/ui/ui.cpp:1283
 #, c-format
 msgid "%1$s: %2$s\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1286
+#: src/emu/ui/ui.cpp:1283
 msgid "%2$s\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1541 src/emu/ui/ui.cpp:1551
+#: src/emu/ui/ui.cpp:1538 src/emu/ui/ui.cpp:1548
 msgid "Keyboard Emulation Status"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1543
+#: src/emu/ui/ui.cpp:1540
 msgid "Mode: PARTIAL Emulation"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1544
+#: src/emu/ui/ui.cpp:1541
 msgid "UI:   Enabled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1546 src/emu/ui/ui.cpp:1556
+#: src/emu/ui/ui.cpp:1543 src/emu/ui/ui.cpp:1553
 msgid "**Use ScrLock to toggle**"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1553
+#: src/emu/ui/ui.cpp:1550
 msgid "Mode: FULL Emulation"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1554
+#: src/emu/ui/ui.cpp:1551
 msgid "UI:   Disabled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1692
+#: src/emu/ui/ui.cpp:1689
 msgid "Autofire can't be enabled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1731
+#: src/emu/ui/ui.cpp:1728
 msgid "Select position to save to"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1733
+#: src/emu/ui/ui.cpp:1730
 msgid "Select position to load from"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1757
+#: src/emu/ui/ui.cpp:1754
 msgid "Save cancelled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1759
+#: src/emu/ui/ui.cpp:1756
 msgid "Load cancelled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1802
+#: src/emu/ui/ui.cpp:1799
 #, c-format
 msgid "Save to position %s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1807
+#: src/emu/ui/ui.cpp:1804
 #, c-format
 msgid "Load from position %s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1847
+#: src/emu/ui/ui.cpp:1844
 #, c-format
 msgid ""
 "Are you sure you want to quit?\n"
@@ -1656,173 +1672,173 @@ msgid ""
 "Press ''%2$s'' to return to emulation."
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1917
+#: src/emu/ui/ui.cpp:1914
 msgid "Master Volume"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1926
+#: src/emu/ui/ui.cpp:1923
 #, c-format
 msgid "%1$s Volume"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1949
+#: src/emu/ui/ui.cpp:1946
 #, c-format
 msgid "Overclock CPU %1$s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1968
+#: src/emu/ui/ui.cpp:1965
 #, c-format
 msgid "%1$s Refresh Rate"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1973
+#: src/emu/ui/ui.cpp:1970
 #, c-format
 msgid "%1$s Brightness"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1975
+#: src/emu/ui/ui.cpp:1972
 #, c-format
 msgid "%1$s Contrast"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1977
+#: src/emu/ui/ui.cpp:1974
 #, c-format
 msgid "%1$s Gamma"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1981
+#: src/emu/ui/ui.cpp:1978
 #, c-format
 msgid "%1$s Horiz Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1983
+#: src/emu/ui/ui.cpp:1980
 #, c-format
 msgid "%1$s Horiz Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1985
+#: src/emu/ui/ui.cpp:1982
 #, c-format
 msgid "%1$s Vert Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1987
+#: src/emu/ui/ui.cpp:1984
 #, c-format
 msgid "%1$s Vert Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2005
+#: src/emu/ui/ui.cpp:2002
 #, c-format
 msgid "Laserdisc '%1$s' Horiz Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2007
+#: src/emu/ui/ui.cpp:2004
 #, c-format
 msgid "Laserdisc '%1$s' Horiz Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2009
+#: src/emu/ui/ui.cpp:2006
 #, c-format
 msgid "Laserdisc '%1$s' Vert Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2011
+#: src/emu/ui/ui.cpp:2008
 #, c-format
 msgid "Laserdisc '%1$s' Vert Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2021
+#: src/emu/ui/ui.cpp:2018
 msgid "Vector Flicker"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2022
+#: src/emu/ui/ui.cpp:2019
 msgid "Beam Width Minimum"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2023
+#: src/emu/ui/ui.cpp:2020
 msgid "Beam Width Maximum"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2024
+#: src/emu/ui/ui.cpp:2021
 msgid "Beam Intensity Weight"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2037
+#: src/emu/ui/ui.cpp:2034
 #, c-format
 msgid "Crosshair Scale %1$s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2037 src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2034 src/emu/ui/ui.cpp:2036
 msgid "X"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2037 src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2034 src/emu/ui/ui.cpp:2036
 msgid "Y"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2036
 #, c-format
 msgid "Crosshair Offset %1$s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2071
+#: src/emu/ui/ui.cpp:2068
 #, c-format
 msgid "%1$3ddB"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2115
+#: src/emu/ui/ui.cpp:2112
 #, c-format
 msgid "%1$d%%"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2131
+#: src/emu/ui/ui.cpp:2128
 #, c-format
 msgid "%1$3.0f%%"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2154
+#: src/emu/ui/ui.cpp:2151
 #, c-format
 msgid "%1$.3ffps"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2177 src/emu/ui/ui.cpp:2199 src/emu/ui/ui.cpp:2220
-#: src/emu/ui/ui.cpp:2242 src/emu/ui/ui.cpp:2264 src/emu/ui/ui.cpp:2286
-#: src/emu/ui/ui.cpp:2308 src/emu/ui/ui.cpp:2330 src/emu/ui/ui.cpp:2352
-#: src/emu/ui/ui.cpp:2374 src/emu/ui/ui.cpp:2396
+#: src/emu/ui/ui.cpp:2174 src/emu/ui/ui.cpp:2196 src/emu/ui/ui.cpp:2217
+#: src/emu/ui/ui.cpp:2239 src/emu/ui/ui.cpp:2261 src/emu/ui/ui.cpp:2283
+#: src/emu/ui/ui.cpp:2305 src/emu/ui/ui.cpp:2327 src/emu/ui/ui.cpp:2349
+#: src/emu/ui/ui.cpp:2371 src/emu/ui/ui.cpp:2393
 #, c-format
 msgid "%1$.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2412 src/emu/ui/ui.cpp:2428 src/emu/ui/ui.cpp:2444
-#: src/emu/ui/ui.cpp:2460
+#: src/emu/ui/ui.cpp:2408 src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2438
+#: src/emu/ui/ui.cpp:2453
 #, c-format
 msgid "%1$1.2f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2476
+#: src/emu/ui/ui.cpp:2469
 #, c-format
 msgid "Screen '%1$s'"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2478
+#: src/emu/ui/ui.cpp:2471
 msgid "Screen"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2494
+#: src/emu/ui/ui.cpp:2487
 #, c-format
 msgid "Crosshair Scale X %1$1.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2494
+#: src/emu/ui/ui.cpp:2487
 #, c-format
 msgid "Crosshair Scale Y %1$1.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2513
+#: src/emu/ui/ui.cpp:2506
 #, c-format
 msgid "Crosshair Offset X %1$1.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2513
+#: src/emu/ui/ui.cpp:2506
 #, c-format
 msgid "Crosshair Offset Y %1$1.3f"
 msgstr ""
@@ -1864,10 +1880,10 @@ msgstr ""
 msgid "Full"
 msgstr ""
 
-#: src/emu/ui/viewgfx.cpp:392
+#: src/emu/ui/viewgfx.cpp:391
 msgid " COLORS"
 msgstr ""
 
-#: src/emu/ui/viewgfx.cpp:392
+#: src/emu/ui/viewgfx.cpp:391
 msgid " PENS"
 msgstr ""
diff --git a/language/Estonian/strings.po b/language/Estonian/strings.po
index 05c7c86a85b..7de2d95bea5 100644
--- a/language/Estonian/strings.po
+++ b/language/Estonian/strings.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MAME\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-11 03:33+0200\n"
+"POT-Creation-Date: 2016-04-15 17:42+0200\n"
 "PO-Revision-Date: 2016-02-20 18:03+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: MAME Language Team\n"
@@ -60,14 +60,14 @@ msgstr ""
 msgid "Autofire Status"
 msgstr ""
 
-#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1698
+#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1695
 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211
 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219
 #: src/emu/ui/videoopt.cpp:223
 msgid "Disabled"
 msgstr ""
 
-#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1698
+#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1695
 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211
 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219
 #: src/emu/ui/videoopt.cpp:223
@@ -75,14 +75,14 @@ msgid "Enabled"
 msgstr ""
 
 #: src/emu/ui/cheatopt.cpp:282 src/emu/ui/cheatopt.cpp:288
-#: src/emu/ui/menu.cpp:710 src/emu/ui/miscmenu.cpp:831
-#: src/emu/ui/sndmenu.cpp:135 src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/menu.cpp:755 src/emu/ui/miscmenu.cpp:936
+#: src/emu/ui/sndmenu.cpp:133 src/emu/ui/sndmenu.cpp:135
 msgid "On"
 msgstr ""
 
 #: src/emu/ui/cheatopt.cpp:282 src/emu/ui/cheatopt.cpp:288
-#: src/emu/ui/menu.cpp:713 src/emu/ui/miscmenu.cpp:831
-#: src/emu/ui/sndmenu.cpp:135 src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/menu.cpp:758 src/emu/ui/miscmenu.cpp:936
+#: src/emu/ui/sndmenu.cpp:133 src/emu/ui/sndmenu.cpp:135
 msgid "Off"
 msgstr ""
 
@@ -94,316 +94,316 @@ msgstr ""
 msgid "Autofire Delay"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:158 src/emu/ui/custmenu.cpp:447
+#: src/emu/ui/custmenu.cpp:157 src/emu/ui/custmenu.cpp:445
 msgid "Main filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:167 src/emu/ui/custmenu.cpp:456
+#: src/emu/ui/custmenu.cpp:166 src/emu/ui/custmenu.cpp:454
 msgid "Other filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:176 src/emu/ui/optsmenu.cpp:239
+#: src/emu/ui/custmenu.cpp:175 src/emu/ui/optsmenu.cpp:238
 msgid "^!Manufacturer"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:185 src/emu/ui/custmenu.cpp:474
-#: src/emu/ui/optsmenu.cpp:247
+#: src/emu/ui/custmenu.cpp:184 src/emu/ui/custmenu.cpp:472
+#: src/emu/ui/optsmenu.cpp:246
 msgid "^!Year"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:194 src/emu/ui/custmenu.cpp:510
+#: src/emu/ui/custmenu.cpp:193 src/emu/ui/custmenu.cpp:508
 msgid "Remove last filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:197 src/emu/ui/custmenu.cpp:513
+#: src/emu/ui/custmenu.cpp:196 src/emu/ui/custmenu.cpp:511
 msgid "Add filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:212 src/emu/ui/custmenu.cpp:233
-#: src/emu/ui/custmenu.cpp:529 src/emu/ui/custmenu.cpp:550
+#: src/emu/ui/custmenu.cpp:211 src/emu/ui/custmenu.cpp:231
+#: src/emu/ui/custmenu.cpp:527 src/emu/ui/custmenu.cpp:547
 msgid "Select custom filters:"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:465
+#: src/emu/ui/custmenu.cpp:463
 msgid "^!Publisher"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:483
+#: src/emu/ui/custmenu.cpp:481
 msgid "^!Software List"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:492
+#: src/emu/ui/custmenu.cpp:490
 msgid "^!Device type"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:501
+#: src/emu/ui/custmenu.cpp:499
 msgid "^!Region"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:23
+#: src/emu/ui/custui.cpp:22
 msgid "Show All"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:24
+#: src/emu/ui/custui.cpp:23
 msgid "Hide Filters"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:25
+#: src/emu/ui/custui.cpp:24
 msgid "Hide Info/Image"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:26
+#: src/emu/ui/custui.cpp:25
 msgid "Hide Both"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:142
+#: src/emu/ui/custui.cpp:141
 msgid "Fonts"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:143
+#: src/emu/ui/custui.cpp:142
 msgid "Colors"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:148 src/emu/ui/dirmenu.cpp:33
+#: src/emu/ui/custui.cpp:147 src/emu/ui/dirmenu.cpp:33
 msgid "Language"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:152
+#: src/emu/ui/custui.cpp:151
 msgid "Show side panels"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:167 src/emu/ui/custui.cpp:188
+#: src/emu/ui/custui.cpp:166 src/emu/ui/custui.cpp:186
 msgid "Custom UI Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:246
+#: src/emu/ui/custui.cpp:244
 msgid "default"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:349
+#: src/emu/ui/custui.cpp:347
 msgid "UI Font"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:354
+#: src/emu/ui/custui.cpp:352
 msgid "Bold"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:355
+#: src/emu/ui/custui.cpp:353
 msgid "Italic"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:360
+#: src/emu/ui/custui.cpp:358
 msgid "Lines"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:366
+#: src/emu/ui/custui.cpp:364
 msgid "Infos text size"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:383
+#: src/emu/ui/custui.cpp:381
 msgid "UI Fonts Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:411
+#: src/emu/ui/custui.cpp:408
 msgid "Sample text - Lorem ipsum dolor sit amet, consectetur adipiscing elit."
 msgstr ""
 
-#: src/emu/ui/custui.cpp:509
+#: src/emu/ui/custui.cpp:506
 msgid "Normal text"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:510
+#: src/emu/ui/custui.cpp:507
 msgid "Selected color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:511
+#: src/emu/ui/custui.cpp:508
 msgid "Normal text background"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:512
+#: src/emu/ui/custui.cpp:509
 msgid "Selected background color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:513
+#: src/emu/ui/custui.cpp:510
 msgid "Subitem color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:514 src/emu/ui/custui.cpp:610
+#: src/emu/ui/custui.cpp:511 src/emu/ui/custui.cpp:606
 msgid "Clone"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:515
+#: src/emu/ui/custui.cpp:512
 msgid "Border"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:516
+#: src/emu/ui/custui.cpp:513
 msgid "Background"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:517
+#: src/emu/ui/custui.cpp:514
 msgid "Dipswitch"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:518
+#: src/emu/ui/custui.cpp:515
 msgid "Unavailable color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:519
+#: src/emu/ui/custui.cpp:516
 msgid "Slider color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:520
+#: src/emu/ui/custui.cpp:517
 msgid "Gfx viewer background"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:521
+#: src/emu/ui/custui.cpp:518
 msgid "Mouse over color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:522
+#: src/emu/ui/custui.cpp:519
 msgid "Mouse over background color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:523
+#: src/emu/ui/custui.cpp:520
 msgid "Mouse down color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:524
+#: src/emu/ui/custui.cpp:521
 msgid "Mouse down background color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:527
+#: src/emu/ui/custui.cpp:524
 msgid "Restore originals colors"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:543
+#: src/emu/ui/custui.cpp:540
 msgid "UI Colors Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:572
+#: src/emu/ui/custui.cpp:568
 #, c-format
 msgid "Double click or press %1$s to change the color value"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:598
+#: src/emu/ui/custui.cpp:594
 msgid "Menu Preview"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:606
+#: src/emu/ui/custui.cpp:602
 msgid "Normal"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:607
+#: src/emu/ui/custui.cpp:603
 msgid "Subitem"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:608
+#: src/emu/ui/custui.cpp:604
 msgid "Selected"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:609
+#: src/emu/ui/custui.cpp:605
 msgid "Mouse Over"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:841 src/emu/ui/custui.cpp:844
+#: src/emu/ui/custui.cpp:837 src/emu/ui/custui.cpp:840
 msgid "Alpha"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:849 src/emu/ui/custui.cpp:852
-#: src/emu/ui/custui.cpp:1013
+#: src/emu/ui/custui.cpp:845 src/emu/ui/custui.cpp:848
+#: src/emu/ui/custui.cpp:1007
 msgid "Red"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:857 src/emu/ui/custui.cpp:860
-#: src/emu/ui/custui.cpp:1016
+#: src/emu/ui/custui.cpp:853 src/emu/ui/custui.cpp:856
+#: src/emu/ui/custui.cpp:1010
 msgid "Green"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:865 src/emu/ui/custui.cpp:868
-#: src/emu/ui/custui.cpp:1017
+#: src/emu/ui/custui.cpp:861 src/emu/ui/custui.cpp:864
+#: src/emu/ui/custui.cpp:1011
 msgid "Blue"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:871
+#: src/emu/ui/custui.cpp:867
 msgid "Choose from palette"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:887
+#: src/emu/ui/custui.cpp:883
 msgid " - ARGB Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:912
+#: src/emu/ui/custui.cpp:907
 msgid "Color preview ="
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1009
+#: src/emu/ui/custui.cpp:1003
 msgid "White"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1010
+#: src/emu/ui/custui.cpp:1004
 msgid "Silver"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1011
+#: src/emu/ui/custui.cpp:1005
 msgid "Gray"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1012
+#: src/emu/ui/custui.cpp:1006
 msgid "Black"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1014
+#: src/emu/ui/custui.cpp:1008
 msgid "Orange"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1015
+#: src/emu/ui/custui.cpp:1009
 msgid "Yellow"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1018
+#: src/emu/ui/custui.cpp:1012
 msgid "Violet"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:65
+#: src/emu/ui/datmenu.cpp:64
 msgid "Software History"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:67
+#: src/emu/ui/datmenu.cpp:66
 msgid "Software Usage"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:199
+#: src/emu/ui/datmenu.cpp:196
 msgid "Revision: "
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:287 src/emu/ui/selgame.cpp:40
-#: src/emu/ui/selgame.cpp:2152 src/emu/ui/selgame.cpp:2161
-#: src/emu/ui/selsoft.cpp:1577 src/emu/ui/selsoft.cpp:1597
-#: src/emu/ui/selsoft.cpp:1606
+#: src/emu/ui/datmenu.cpp:284 src/emu/ui/selgame.cpp:39
+#: src/emu/ui/selgame.cpp:2158 src/emu/ui/selgame.cpp:2167
+#: src/emu/ui/selsoft.cpp:1574 src/emu/ui/selsoft.cpp:1592
+#: src/emu/ui/selsoft.cpp:1601
 msgid "History"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:289 src/emu/ui/selgame.cpp:41
+#: src/emu/ui/datmenu.cpp:286 src/emu/ui/selgame.cpp:40
 msgid "Mameinfo"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:291 src/emu/ui/selgame.cpp:43
+#: src/emu/ui/datmenu.cpp:288 src/emu/ui/selgame.cpp:42
 msgid "Messinfo"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:293 src/emu/ui/selgame.cpp:42
+#: src/emu/ui/datmenu.cpp:290 src/emu/ui/selgame.cpp:41
 msgid "Sysinfo"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:295 src/emu/ui/selgame.cpp:46
+#: src/emu/ui/datmenu.cpp:292 src/emu/ui/selgame.cpp:45
 msgid "Mamescore"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:297 src/emu/ui/selgame.cpp:45
+#: src/emu/ui/datmenu.cpp:294 src/emu/ui/selgame.cpp:44
 msgid "Gameinit"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:299 src/emu/ui/selgame.cpp:44
+#: src/emu/ui/datmenu.cpp:296 src/emu/ui/selgame.cpp:43
 msgid "Command"
 msgstr ""
 
@@ -555,75 +555,75 @@ msgstr ""
 msgid "Remove %1$s Folder"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:158
+#: src/emu/ui/filesel.cpp:161
 msgid "File Already Exists - Override?"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:160 src/emu/ui/selgame.cpp:1568
-#: src/emu/ui/selgame.cpp:1569 src/emu/ui/selgame.cpp:1570
-#: src/emu/ui/selgame.cpp:1571 src/emu/ui/selgame.cpp:1572
-#: src/emu/ui/selgame.cpp:1573 src/emu/ui/selgame.cpp:1574
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/filesel.cpp:163 src/emu/ui/selgame.cpp:1576
+#: src/emu/ui/selgame.cpp:1577 src/emu/ui/selgame.cpp:1578
+#: src/emu/ui/selgame.cpp:1579 src/emu/ui/selgame.cpp:1580
+#: src/emu/ui/selgame.cpp:1581 src/emu/ui/selgame.cpp:1582
+#: src/emu/ui/selgame.cpp:1591
 msgid "No"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:161 src/emu/ui/selgame.cpp:1568
-#: src/emu/ui/selgame.cpp:1569 src/emu/ui/selgame.cpp:1570
-#: src/emu/ui/selgame.cpp:1571 src/emu/ui/selgame.cpp:1572
-#: src/emu/ui/selgame.cpp:1573 src/emu/ui/selgame.cpp:1574
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/filesel.cpp:164 src/emu/ui/selgame.cpp:1576
+#: src/emu/ui/selgame.cpp:1577 src/emu/ui/selgame.cpp:1578
+#: src/emu/ui/selgame.cpp:1579 src/emu/ui/selgame.cpp:1580
+#: src/emu/ui/selgame.cpp:1581 src/emu/ui/selgame.cpp:1582
+#: src/emu/ui/selgame.cpp:1591
 msgid "Yes"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:272
+#: src/emu/ui/filesel.cpp:275
 msgid "New Image Name:"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:278
+#: src/emu/ui/filesel.cpp:281
 msgid "Image Format:"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:284
+#: src/emu/ui/filesel.cpp:287
 msgid "Create"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:315
+#: src/emu/ui/filesel.cpp:318
 msgid "Please enter a file extension too"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:503 src/emu/ui/swlist.cpp:65
+#: src/emu/ui/filesel.cpp:506 src/emu/ui/swlist.cpp:65
 msgid "[empty slot]"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:507
+#: src/emu/ui/filesel.cpp:510
 msgid "[create]"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:511 src/emu/ui/swlist.cpp:76
+#: src/emu/ui/filesel.cpp:514 src/emu/ui/swlist.cpp:76
 msgid "[software list]"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:803
+#: src/emu/ui/filesel.cpp:806
 msgid "Select image format"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:863
+#: src/emu/ui/filesel.cpp:866
 msgid "Select access mode"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:864
+#: src/emu/ui/filesel.cpp:867
 msgid "Read-only"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:866
+#: src/emu/ui/filesel.cpp:869
 msgid "Read-write"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:867
+#: src/emu/ui/filesel.cpp:870
 msgid "Read this image, write to another image"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:868
+#: src/emu/ui/filesel.cpp:871
 msgid "Read this image, write to diff"
 msgstr ""
 
@@ -649,7 +649,7 @@ msgstr ""
 msgid "[empty]"
 msgstr ""
 
-#: src/emu/ui/info_pty.cpp:26 src/emu/ui/mainmenu.cpp:91
+#: src/emu/ui/info_pty.cpp:26 src/emu/ui/mainmenu.cpp:96
 msgid "Pseudo terminals"
 msgstr ""
 
@@ -665,7 +665,7 @@ msgstr ""
 msgid "Other Controls"
 msgstr ""
 
-#: src/emu/ui/inputmap.cpp:622 src/emu/ui/miscmenu.cpp:91
+#: src/emu/ui/inputmap.cpp:622 src/emu/ui/miscmenu.cpp:92
 #: src/emu/ui/slotopt.cpp:172
 msgid "Reset"
 msgstr ""
@@ -698,27 +698,27 @@ msgstr ""
 msgid "Machine Information"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:78
+#: src/emu/ui/mainmenu.cpp:80
 msgid "Image Information"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:81
+#: src/emu/ui/mainmenu.cpp:83
 msgid "File Manager"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:86
+#: src/emu/ui/mainmenu.cpp:92
 msgid "Tape Control"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:94
+#: src/emu/ui/mainmenu.cpp:99
 msgid "Bios Selection"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:100
+#: src/emu/ui/mainmenu.cpp:104
 msgid "Slot Devices"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:107
+#: src/emu/ui/mainmenu.cpp:109
 msgid "Barcode Reader"
 msgstr ""
 
@@ -726,43 +726,43 @@ msgstr ""
 msgid "Network Devices"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:119
+#: src/emu/ui/mainmenu.cpp:118
 msgid "Keyboard Mode"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:122
+#: src/emu/ui/mainmenu.cpp:121
 msgid "Slider Controls"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:125
+#: src/emu/ui/mainmenu.cpp:124
 msgid "Video Options"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:129
+#: src/emu/ui/mainmenu.cpp:128
 msgid "Crosshair Options"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:133
+#: src/emu/ui/mainmenu.cpp:132
 msgid "Cheat"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:136
+#: src/emu/ui/mainmenu.cpp:135
 msgid "Plugin Options"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:140
+#: src/emu/ui/mainmenu.cpp:139
 msgid "External DAT View"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:146
+#: src/emu/ui/mainmenu.cpp:145 src/emu/ui/miscmenu.cpp:785
 msgid "Add To Favorites"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:148
+#: src/emu/ui/mainmenu.cpp:147 src/emu/ui/miscmenu.cpp:787
 msgid "Remove From Favorites"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:155
+#: src/emu/ui/mainmenu.cpp:154
 msgid "Select New Machine"
 msgstr ""
 
@@ -802,189 +802,205 @@ msgstr ""
 msgid "Return to Previous Menu"
 msgstr ""
 
-#: src/emu/ui/menu.cpp:716
+#: src/emu/ui/menu.cpp:761
 msgid "Auto"
 msgstr ""
 
-#: src/emu/ui/menu.cpp:2133
+#: src/emu/ui/menu.cpp:2195
 msgid "Images"
 msgstr ""
 
-#: src/emu/ui/menu.cpp:2134
+#: src/emu/ui/menu.cpp:2196
 msgid "Infos"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Keyboard Mode:"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Natural"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Emulated"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:240
+#: src/emu/ui/miscmenu.cpp:241
 #, c-format
 msgid ""
 "Uptime: %1$d:%2$02d:%3$02d\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:242
+#: src/emu/ui/miscmenu.cpp:243
 #, c-format
 msgid ""
 "Uptime: %1$d:%2$02d\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:246
+#: src/emu/ui/miscmenu.cpp:247
 #, c-format
 msgid ""
 "Tickets dispensed: %1$d\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:257
+#: src/emu/ui/miscmenu.cpp:258
 msgid "Coin %1$c: NA%3$s\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:257
+#: src/emu/ui/miscmenu.cpp:258
 #, c-format
 msgid "Coin %1$c: %2$d%3$s\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:260
+#: src/emu/ui/miscmenu.cpp:261
 msgid " (locked)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:519
+#: src/emu/ui/miscmenu.cpp:520
 msgid "Visible Delay"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:617
+#: src/emu/ui/miscmenu.cpp:619
 #, c-format
 msgid "%s.xml saved under ui folder."
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:645
+#: src/emu/ui/miscmenu.cpp:647
 msgid "Name:             Description:\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:657
+#: src/emu/ui/miscmenu.cpp:659
 #, c-format
 msgid "%s.txt saved under ui folder."
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:675
-msgid "Export XML format (like -listxml)"
+#: src/emu/ui/miscmenu.cpp:677
+msgid "Export list in XML format (like -listxml)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:676
-msgid "Export TXT format (like -listfull)"
+#: src/emu/ui/miscmenu.cpp:678
+msgid "Export list in XML format (like -listxml, but exclude devices)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:734
-msgid "Dummy"
+#: src/emu/ui/miscmenu.cpp:679
+msgid "Export list in TXT format (like -listfull)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:736
-msgid "Save machine configuration"
-msgstr ""
-
-#: src/emu/ui/miscmenu.cpp:848 src/emu/ui/miscmenu.cpp:869
-#: src/emu/ui/selgame.cpp:594
-msgid "Plugins"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:218
-msgid "Filter"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:226
-msgid " ^!File"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:231
-msgid " ^!Category"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:254
-msgid "^!Setup custom filter"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:262
-msgid "Customize UI"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:263
-msgid "Configure Directories"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:266 src/emu/ui/sndmenu.cpp:151
-#: src/emu/ui/sndmenu.cpp:172
-msgid "Sound Options"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:269
-msgid "General Inputs"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:272
-msgid "Save Configuration"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:286 src/emu/ui/optsmenu.cpp:307
-msgid "Settings"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:327
-msgid "**Error saving ui.ini**"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:374
-#, c-format
-msgid "**Error saving %s.ini**"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:378
+#: src/emu/ui/miscmenu.cpp:729 src/emu/ui/optsmenu.cpp:376
 msgid ""
 "\n"
 "    Configuration saved    \n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/selector.cpp:166
+#: src/emu/ui/miscmenu.cpp:774
+msgid "Bios"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:776
+msgid "Driver"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:790
+msgid "Save machine configuration"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:806
+msgid "Configure machine:"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:868 src/emu/ui/selsoft.cpp:109
+msgid " (default)"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:953 src/emu/ui/miscmenu.cpp:973
+#: src/emu/ui/selgame.cpp:600
+msgid "Plugins"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:217
+msgid "Filter"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:225
+msgid " ^!File"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:230
+msgid " ^!Category"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:253
+msgid "^!Setup custom filter"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:261
+msgid "Customize UI"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:262
+msgid "Configure Directories"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:265 src/emu/ui/sndmenu.cpp:149
+#: src/emu/ui/sndmenu.cpp:169
+msgid "Sound Options"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:268
+msgid "General Inputs"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:271
+msgid "Save Configuration"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:285 src/emu/ui/optsmenu.cpp:305
+msgid "Settings"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:325
+msgid "**Error saving ui.ini**"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:372
+#, c-format
+msgid "**Error saving %s.ini**"
+msgstr ""
+
+#: src/emu/ui/selector.cpp:165
 msgid "Selection List - Search: "
 msgstr ""
 
-#: src/emu/ui/selector.cpp:196
+#: src/emu/ui/selector.cpp:194
 #, c-format
 msgid "Double click or press %1$s to select"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:39
+#: src/emu/ui/selgame.cpp:38
 msgid "General Info"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:374 src/emu/ui/selsoft.cpp:282
+#: src/emu/ui/selgame.cpp:380 src/emu/ui/selsoft.cpp:281
 #, c-format
 msgid ""
 "%s\n"
 " added to favorites list."
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:380 src/emu/ui/selgame.cpp:389
-#: src/emu/ui/selsoft.cpp:287
+#: src/emu/ui/selgame.cpp:386 src/emu/ui/selgame.cpp:395
+#: src/emu/ui/selsoft.cpp:286
 #, c-format
 msgid ""
 "%s\n"
 " removed from favorites list."
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:450
+#: src/emu/ui/selgame.cpp:457
 msgid ""
 "The selected machine is missing one or more required ROM or CHD images. "
 "Please select a different machine.\n"
@@ -992,275 +1008,275 @@ msgid ""
 "Press any key to continue."
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:589 src/emu/ui/simpleselgame.cpp:265
+#: src/emu/ui/selgame.cpp:595 src/emu/ui/simpleselgame.cpp:265
 msgid "Configure Options"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:752
+#: src/emu/ui/selgame.cpp:596
+msgid "Configure Machine"
+msgstr ""
+
+#: src/emu/ui/selgame.cpp:758
 #, c-format
 msgid "%1$s %2$s ( %3$d / %4$d machines (%5$d BIOS) )"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:762
+#: src/emu/ui/selgame.cpp:768
 #, c-format
 msgid "%1$s (%2$s - %3$s) - "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:769 src/emu/ui/selgame.cpp:775
+#: src/emu/ui/selgame.cpp:775 src/emu/ui/selgame.cpp:781
 #, c-format
 msgid "%1$s (%2$s) - "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:784
+#: src/emu/ui/selgame.cpp:790
 #, c-format
 msgid "%1$s Search: %2$s_"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:838
+#: src/emu/ui/selgame.cpp:844
 #, c-format
 msgid "Romset: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:841 src/emu/ui/selgame.cpp:890
-#: src/emu/ui/selsoft.cpp:751 src/emu/ui/selsoft.cpp:801
+#: src/emu/ui/selgame.cpp:847 src/emu/ui/selgame.cpp:896
+#: src/emu/ui/selsoft.cpp:750 src/emu/ui/selsoft.cpp:800
 #: src/emu/ui/simpleselgame.cpp:328
 #, c-format
 msgid "%1$s, %2$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:847 src/emu/ui/selsoft.cpp:757
+#: src/emu/ui/selgame.cpp:853 src/emu/ui/selsoft.cpp:756
 #, c-format
 msgid "Driver is clone of: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:849 src/emu/ui/selsoft.cpp:759
+#: src/emu/ui/selgame.cpp:855 src/emu/ui/selsoft.cpp:758
 msgid "Driver is parent"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:853 src/emu/ui/selsoft.cpp:763
+#: src/emu/ui/selgame.cpp:859 src/emu/ui/selsoft.cpp:762
 #: src/emu/ui/simpleselgame.cpp:335
 msgid "Overall: NOT WORKING"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:855 src/emu/ui/selsoft.cpp:765
+#: src/emu/ui/selgame.cpp:861 src/emu/ui/selsoft.cpp:764
 #: src/emu/ui/simpleselgame.cpp:337
 msgid "Overall: Unemulated Protection"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:857 src/emu/ui/selsoft.cpp:767
+#: src/emu/ui/selgame.cpp:863 src/emu/ui/selsoft.cpp:766
 #: src/emu/ui/simpleselgame.cpp:339
 msgid "Overall: Working"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:861 src/emu/ui/selsoft.cpp:771
+#: src/emu/ui/selgame.cpp:867 src/emu/ui/selsoft.cpp:770
 msgid "Graphics: Imperfect, "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:863 src/emu/ui/selsoft.cpp:773
+#: src/emu/ui/selgame.cpp:869 src/emu/ui/selsoft.cpp:772
 msgid "Graphics: OK, "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:866 src/emu/ui/selsoft.cpp:776
+#: src/emu/ui/selgame.cpp:872 src/emu/ui/selsoft.cpp:775
 msgid "Sound: Unimplemented"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:868 src/emu/ui/selsoft.cpp:778
+#: src/emu/ui/selgame.cpp:874 src/emu/ui/selsoft.cpp:777
 msgid "Sound: Imperfect"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:870 src/emu/ui/selsoft.cpp:780
+#: src/emu/ui/selgame.cpp:876 src/emu/ui/selsoft.cpp:779
 msgid "Sound: OK"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:887
+#: src/emu/ui/selgame.cpp:893
 #, c-format
 msgid "System: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:894 src/emu/ui/selsoft.cpp:805
+#: src/emu/ui/selgame.cpp:900 src/emu/ui/selsoft.cpp:804
 #, c-format
 msgid "Software is clone of: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:896 src/emu/ui/selsoft.cpp:807
+#: src/emu/ui/selgame.cpp:902 src/emu/ui/selsoft.cpp:806
 msgid "Software is parent"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:901 src/emu/ui/selsoft.cpp:812
+#: src/emu/ui/selgame.cpp:907 src/emu/ui/selsoft.cpp:811
 msgid "Supported: No"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:906 src/emu/ui/selsoft.cpp:817
+#: src/emu/ui/selgame.cpp:912 src/emu/ui/selsoft.cpp:816
 msgid "Supported: Partial"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:911 src/emu/ui/selsoft.cpp:822
+#: src/emu/ui/selgame.cpp:917 src/emu/ui/selsoft.cpp:821
 msgid "Supported: Yes"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:916 src/emu/ui/selsoft.cpp:827
+#: src/emu/ui/selgame.cpp:922 src/emu/ui/selsoft.cpp:826
 #, c-format
 msgid "romset: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:923
+#: src/emu/ui/selgame.cpp:929
 #, c-format
 msgid "%1$s %2$s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1535
+#: src/emu/ui/selgame.cpp:1543
 #, c-format
 msgid "Romset: %1$-.100s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1536
+#: src/emu/ui/selgame.cpp:1544
 #, c-format
 msgid "Year: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1537
+#: src/emu/ui/selgame.cpp:1545
 #, c-format
 msgid "Manufacturer: %1$-.100s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1541
+#: src/emu/ui/selgame.cpp:1549
 #, c-format
 msgid "Driver is Clone of: %1$-.100s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1543
+#: src/emu/ui/selgame.cpp:1551
 msgid "Driver is Parent\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1546
+#: src/emu/ui/selgame.cpp:1554
 msgid "Overall: NOT WORKING\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1548
+#: src/emu/ui/selgame.cpp:1556
 msgid "Overall: Unemulated Protection\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1550
+#: src/emu/ui/selgame.cpp:1558
 msgid "Overall: Working\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1553
+#: src/emu/ui/selgame.cpp:1561
 msgid "Graphics: Imperfect Colors\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1557
+#: src/emu/ui/selgame.cpp:1565
 msgid "Graphics: Imperfect\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1559
+#: src/emu/ui/selgame.cpp:1567
 msgid "Graphics: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1562
+#: src/emu/ui/selgame.cpp:1570
 msgid "Sound: Unimplemented\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1564
+#: src/emu/ui/selgame.cpp:1572
 msgid "Sound: Imperfect\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1566
+#: src/emu/ui/selgame.cpp:1574
 msgid "Sound: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1568
+#: src/emu/ui/selgame.cpp:1576
 #, c-format
 msgid "Driver is Skeleton: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1569
+#: src/emu/ui/selgame.cpp:1577
 #, c-format
 msgid "Game is Mechanical: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1570
+#: src/emu/ui/selgame.cpp:1578
 #, c-format
 msgid "Requires Artwork: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1571
+#: src/emu/ui/selgame.cpp:1579
 #, c-format
 msgid "Requires Clickable Artwork: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1572
+#: src/emu/ui/selgame.cpp:1580
 #, c-format
 msgid "Support Cocktail: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1573
+#: src/emu/ui/selgame.cpp:1581
 #, c-format
 msgid "Driver is Bios: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1574
+#: src/emu/ui/selgame.cpp:1582
 #, c-format
 msgid "Support Save: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 #, c-format
 msgid "Screen Orientation: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 msgid "Vertical"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 msgid "Horizontal"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/selgame.cpp:1591
 #, c-format
 msgid "Requires CHD: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1596
+#: src/emu/ui/selgame.cpp:1604
 msgid "Roms Audit Pass: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1598
+#: src/emu/ui/selgame.cpp:1606
 msgid "Roms Audit Pass: BAD\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1601
+#: src/emu/ui/selgame.cpp:1609
 msgid "Samples Audit Pass: None Needed\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1603
+#: src/emu/ui/selgame.cpp:1611
 msgid "Samples Audit Pass: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1605
+#: src/emu/ui/selgame.cpp:1613
 msgid "Samples Audit Pass: BAD\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1608
+#: src/emu/ui/selgame.cpp:1616
 msgid ""
 "Roms Audit Pass: Disabled\n"
 "Samples Audit Pass: Disabled\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:2049 src/emu/ui/selgame.cpp:2212
-#: src/emu/ui/selsoft.cpp:1662
+#: src/emu/ui/selgame.cpp:2055 src/emu/ui/selgame.cpp:2216
+#: src/emu/ui/selsoft.cpp:1655
 msgid "No Infos Available"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:2162 src/emu/ui/selsoft.cpp:1607
+#: src/emu/ui/selgame.cpp:2168 src/emu/ui/selsoft.cpp:1602
 msgid "Usage"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:110
-msgid " (default)"
-msgstr ""
-
-#: src/emu/ui/selsoft.cpp:381
+#: src/emu/ui/selsoft.cpp:380
 msgid ""
 "The selected software is missing one or more required files. Please select a "
 "different software.\n"
@@ -1268,57 +1284,57 @@ msgid ""
 "Press any key to continue."
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:684
+#: src/emu/ui/selsoft.cpp:683
 #, c-format
-msgid "%1$s %2$s ( %3$d / %4$d softwares )"
+msgid "%1$s %2$s ( %3$d / %4$d software packages )"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:685
+#: src/emu/ui/selsoft.cpp:684
 #, c-format
 msgid "Driver: \"%1$s\" software list "
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:688
+#: src/emu/ui/selsoft.cpp:687
 #, c-format
 msgid "Region: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:690
+#: src/emu/ui/selsoft.cpp:689
 #, c-format
 msgid "Publisher: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:692
+#: src/emu/ui/selsoft.cpp:691
 #, c-format
 msgid "Year: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:694
+#: src/emu/ui/selsoft.cpp:693
 #, c-format
 msgid "Software List: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:696
+#: src/emu/ui/selsoft.cpp:695
 #, c-format
 msgid "Device type: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:698
+#: src/emu/ui/selsoft.cpp:697
 #, c-format
 msgid "%s Search: %s_"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:748 src/emu/ui/selsoft.cpp:798
+#: src/emu/ui/selsoft.cpp:747 src/emu/ui/selsoft.cpp:797
 #: src/emu/ui/simpleselgame.cpp:325
 #, c-format
 msgid "%1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:1998 src/emu/ui/selsoft.cpp:2018
+#: src/emu/ui/selsoft.cpp:1991 src/emu/ui/selsoft.cpp:2011
 msgid "Software part selection:"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:2136 src/emu/ui/selsoft.cpp:2156
+#: src/emu/ui/selsoft.cpp:2129 src/emu/ui/selsoft.cpp:2149
 msgid "Bios selection:"
 msgstr ""
 
@@ -1366,15 +1382,15 @@ msgstr ""
 msgid " [internal]"
 msgstr ""
 
-#: src/emu/ui/sndmenu.cpp:135
+#: src/emu/ui/sndmenu.cpp:133
 msgid "Sound"
 msgstr ""
 
-#: src/emu/ui/sndmenu.cpp:136
+#: src/emu/ui/sndmenu.cpp:134
 msgid "Sample Rate"
 msgstr ""
 
-#: src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/sndmenu.cpp:135
 msgid "Use External Samples"
 msgstr ""
 
@@ -1443,80 +1459,80 @@ msgstr ""
 msgid "Fast Forward"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:419
+#: src/emu/ui/ui.cpp:418
 msgid "This driver requires images to be loaded in the following device(s): "
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1074
+#: src/emu/ui/ui.cpp:1071
 msgid ""
 "One or more ROMs/CHDs for this machine are incorrect. The machine may not "
 "run correctly.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1087
+#: src/emu/ui/ui.cpp:1084
 msgid ""
 "There are known problems with this machine\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1091
+#: src/emu/ui/ui.cpp:1088
 msgid ""
 "One or more ROMs/CHDs for this machine have not been correctly dumped.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1095
+#: src/emu/ui/ui.cpp:1092
 #, c-format
 msgid "The keyboard emulation may not be 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1097
+#: src/emu/ui/ui.cpp:1094
 #, c-format
 msgid "The colors aren't 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1099
+#: src/emu/ui/ui.cpp:1096
 msgid "The colors are completely wrong.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1101
+#: src/emu/ui/ui.cpp:1098
 #, c-format
 msgid "The video emulation isn't 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1103
+#: src/emu/ui/ui.cpp:1100
 #, c-format
 msgid "The sound emulation isn't 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1105
+#: src/emu/ui/ui.cpp:1102
 msgid "The machine lacks sound.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1108
+#: src/emu/ui/ui.cpp:1105
 msgid "Screen flipping in cocktail mode is not supported.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1112
+#: src/emu/ui/ui.cpp:1109
 msgid "The machine requires external artwork files\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1117
+#: src/emu/ui/ui.cpp:1114
 msgid ""
 "This machine was never completed. It may exhibit strange behavior or missing "
 "elements that are not bugs in the emulation.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1122
+#: src/emu/ui/ui.cpp:1119
 msgid ""
 "This machine has no sound hardware, MAME will produce no sounds, this is "
 "expected behaviour.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1130
+#: src/emu/ui/ui.cpp:1127
 msgid "The machine has protection which isn't fully emulated.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1133
+#: src/emu/ui/ui.cpp:1130
 msgid ""
 "\n"
 "THIS MACHINE DOESN'T WORK. The emulation for this machine is not yet "
@@ -1524,7 +1540,7 @@ msgid ""
 "the developers to improve the emulation.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1137
+#: src/emu/ui/ui.cpp:1134
 msgid ""
 "\n"
 "Certain elements of this machine cannot be emulated as it requires actual "
@@ -1532,21 +1548,21 @@ msgid ""
 "to fully play this machine.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1156
+#: src/emu/ui/ui.cpp:1153
 msgid ""
 "\n"
 "\n"
 "There are working clones of this machine: "
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1170
+#: src/emu/ui/ui.cpp:1167
 msgid ""
 "\n"
 "\n"
 "Press any key to continue"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1185
+#: src/emu/ui/ui.cpp:1182
 #, c-format
 msgid ""
 "%1$s\n"
@@ -1556,98 +1572,98 @@ msgid ""
 "CPU:\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1221 src/emu/ui/ui.cpp:1260
+#: src/emu/ui/ui.cpp:1218 src/emu/ui/ui.cpp:1257
 msgid "MHz"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1221 src/emu/ui/ui.cpp:1260
+#: src/emu/ui/ui.cpp:1218 src/emu/ui/ui.cpp:1257
 msgid "kHz"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1235
+#: src/emu/ui/ui.cpp:1232
 msgid ""
 "\n"
 "Sound:\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1264
+#: src/emu/ui/ui.cpp:1261
 msgid ""
 "\n"
 "Video:\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1268
+#: src/emu/ui/ui.cpp:1265
 msgid "None\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1275
+#: src/emu/ui/ui.cpp:1272
 msgid "Vector"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1286
+#: src/emu/ui/ui.cpp:1283
 #, c-format
 msgid "%1$s: %2$s\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1286
+#: src/emu/ui/ui.cpp:1283
 msgid "%2$s\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1541 src/emu/ui/ui.cpp:1551
+#: src/emu/ui/ui.cpp:1538 src/emu/ui/ui.cpp:1548
 msgid "Keyboard Emulation Status"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1543
+#: src/emu/ui/ui.cpp:1540
 msgid "Mode: PARTIAL Emulation"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1544
+#: src/emu/ui/ui.cpp:1541
 msgid "UI:   Enabled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1546 src/emu/ui/ui.cpp:1556
+#: src/emu/ui/ui.cpp:1543 src/emu/ui/ui.cpp:1553
 msgid "**Use ScrLock to toggle**"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1553
+#: src/emu/ui/ui.cpp:1550
 msgid "Mode: FULL Emulation"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1554
+#: src/emu/ui/ui.cpp:1551
 msgid "UI:   Disabled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1692
+#: src/emu/ui/ui.cpp:1689
 msgid "Autofire can't be enabled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1731
+#: src/emu/ui/ui.cpp:1728
 msgid "Select position to save to"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1733
+#: src/emu/ui/ui.cpp:1730
 msgid "Select position to load from"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1757
+#: src/emu/ui/ui.cpp:1754
 msgid "Save cancelled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1759
+#: src/emu/ui/ui.cpp:1756
 msgid "Load cancelled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1802
+#: src/emu/ui/ui.cpp:1799
 #, c-format
 msgid "Save to position %s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1807
+#: src/emu/ui/ui.cpp:1804
 #, c-format
 msgid "Load from position %s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1847
+#: src/emu/ui/ui.cpp:1844
 #, c-format
 msgid ""
 "Are you sure you want to quit?\n"
@@ -1656,173 +1672,173 @@ msgid ""
 "Press ''%2$s'' to return to emulation."
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1917
+#: src/emu/ui/ui.cpp:1914
 msgid "Master Volume"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1926
+#: src/emu/ui/ui.cpp:1923
 #, c-format
 msgid "%1$s Volume"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1949
+#: src/emu/ui/ui.cpp:1946
 #, c-format
 msgid "Overclock CPU %1$s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1968
+#: src/emu/ui/ui.cpp:1965
 #, c-format
 msgid "%1$s Refresh Rate"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1973
+#: src/emu/ui/ui.cpp:1970
 #, c-format
 msgid "%1$s Brightness"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1975
+#: src/emu/ui/ui.cpp:1972
 #, c-format
 msgid "%1$s Contrast"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1977
+#: src/emu/ui/ui.cpp:1974
 #, c-format
 msgid "%1$s Gamma"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1981
+#: src/emu/ui/ui.cpp:1978
 #, c-format
 msgid "%1$s Horiz Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1983
+#: src/emu/ui/ui.cpp:1980
 #, c-format
 msgid "%1$s Horiz Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1985
+#: src/emu/ui/ui.cpp:1982
 #, c-format
 msgid "%1$s Vert Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1987
+#: src/emu/ui/ui.cpp:1984
 #, c-format
 msgid "%1$s Vert Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2005
+#: src/emu/ui/ui.cpp:2002
 #, c-format
 msgid "Laserdisc '%1$s' Horiz Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2007
+#: src/emu/ui/ui.cpp:2004
 #, c-format
 msgid "Laserdisc '%1$s' Horiz Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2009
+#: src/emu/ui/ui.cpp:2006
 #, c-format
 msgid "Laserdisc '%1$s' Vert Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2011
+#: src/emu/ui/ui.cpp:2008
 #, c-format
 msgid "Laserdisc '%1$s' Vert Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2021
+#: src/emu/ui/ui.cpp:2018
 msgid "Vector Flicker"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2022
+#: src/emu/ui/ui.cpp:2019
 msgid "Beam Width Minimum"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2023
+#: src/emu/ui/ui.cpp:2020
 msgid "Beam Width Maximum"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2024
+#: src/emu/ui/ui.cpp:2021
 msgid "Beam Intensity Weight"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2037
+#: src/emu/ui/ui.cpp:2034
 #, c-format
 msgid "Crosshair Scale %1$s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2037 src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2034 src/emu/ui/ui.cpp:2036
 msgid "X"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2037 src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2034 src/emu/ui/ui.cpp:2036
 msgid "Y"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2036
 #, c-format
 msgid "Crosshair Offset %1$s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2071
+#: src/emu/ui/ui.cpp:2068
 #, c-format
 msgid "%1$3ddB"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2115
+#: src/emu/ui/ui.cpp:2112
 #, c-format
 msgid "%1$d%%"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2131
+#: src/emu/ui/ui.cpp:2128
 #, c-format
 msgid "%1$3.0f%%"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2154
+#: src/emu/ui/ui.cpp:2151
 #, c-format
 msgid "%1$.3ffps"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2177 src/emu/ui/ui.cpp:2199 src/emu/ui/ui.cpp:2220
-#: src/emu/ui/ui.cpp:2242 src/emu/ui/ui.cpp:2264 src/emu/ui/ui.cpp:2286
-#: src/emu/ui/ui.cpp:2308 src/emu/ui/ui.cpp:2330 src/emu/ui/ui.cpp:2352
-#: src/emu/ui/ui.cpp:2374 src/emu/ui/ui.cpp:2396
+#: src/emu/ui/ui.cpp:2174 src/emu/ui/ui.cpp:2196 src/emu/ui/ui.cpp:2217
+#: src/emu/ui/ui.cpp:2239 src/emu/ui/ui.cpp:2261 src/emu/ui/ui.cpp:2283
+#: src/emu/ui/ui.cpp:2305 src/emu/ui/ui.cpp:2327 src/emu/ui/ui.cpp:2349
+#: src/emu/ui/ui.cpp:2371 src/emu/ui/ui.cpp:2393
 #, c-format
 msgid "%1$.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2412 src/emu/ui/ui.cpp:2428 src/emu/ui/ui.cpp:2444
-#: src/emu/ui/ui.cpp:2460
+#: src/emu/ui/ui.cpp:2408 src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2438
+#: src/emu/ui/ui.cpp:2453
 #, c-format
 msgid "%1$1.2f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2476
+#: src/emu/ui/ui.cpp:2469
 #, c-format
 msgid "Screen '%1$s'"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2478
+#: src/emu/ui/ui.cpp:2471
 msgid "Screen"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2494
+#: src/emu/ui/ui.cpp:2487
 #, c-format
 msgid "Crosshair Scale X %1$1.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2494
+#: src/emu/ui/ui.cpp:2487
 #, c-format
 msgid "Crosshair Scale Y %1$1.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2513
+#: src/emu/ui/ui.cpp:2506
 #, c-format
 msgid "Crosshair Offset X %1$1.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2513
+#: src/emu/ui/ui.cpp:2506
 #, c-format
 msgid "Crosshair Offset Y %1$1.3f"
 msgstr ""
@@ -1864,10 +1880,10 @@ msgstr ""
 msgid "Full"
 msgstr ""
 
-#: src/emu/ui/viewgfx.cpp:392
+#: src/emu/ui/viewgfx.cpp:391
 msgid " COLORS"
 msgstr ""
 
-#: src/emu/ui/viewgfx.cpp:392
+#: src/emu/ui/viewgfx.cpp:391
 msgid " PENS"
 msgstr ""
diff --git a/language/Finnish/strings.po b/language/Finnish/strings.po
index 9ab54cac8bb..f352b0d86c4 100644
--- a/language/Finnish/strings.po
+++ b/language/Finnish/strings.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MAME\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-11 03:33+0200\n"
+"POT-Creation-Date: 2016-04-15 17:42+0200\n"
 "PO-Revision-Date: 2016-02-20 18:03+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: MAME Language Team\n"
@@ -61,14 +61,14 @@ msgstr ""
 msgid "Autofire Status"
 msgstr ""
 
-#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1698
+#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1695
 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211
 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219
 #: src/emu/ui/videoopt.cpp:223
 msgid "Disabled"
 msgstr ""
 
-#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1698
+#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1695
 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211
 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219
 #: src/emu/ui/videoopt.cpp:223
@@ -76,14 +76,14 @@ msgid "Enabled"
 msgstr ""
 
 #: src/emu/ui/cheatopt.cpp:282 src/emu/ui/cheatopt.cpp:288
-#: src/emu/ui/menu.cpp:710 src/emu/ui/miscmenu.cpp:831
-#: src/emu/ui/sndmenu.cpp:135 src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/menu.cpp:755 src/emu/ui/miscmenu.cpp:936
+#: src/emu/ui/sndmenu.cpp:133 src/emu/ui/sndmenu.cpp:135
 msgid "On"
 msgstr ""
 
 #: src/emu/ui/cheatopt.cpp:282 src/emu/ui/cheatopt.cpp:288
-#: src/emu/ui/menu.cpp:713 src/emu/ui/miscmenu.cpp:831
-#: src/emu/ui/sndmenu.cpp:135 src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/menu.cpp:758 src/emu/ui/miscmenu.cpp:936
+#: src/emu/ui/sndmenu.cpp:133 src/emu/ui/sndmenu.cpp:135
 msgid "Off"
 msgstr ""
 
@@ -95,316 +95,316 @@ msgstr ""
 msgid "Autofire Delay"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:158 src/emu/ui/custmenu.cpp:447
+#: src/emu/ui/custmenu.cpp:157 src/emu/ui/custmenu.cpp:445
 msgid "Main filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:167 src/emu/ui/custmenu.cpp:456
+#: src/emu/ui/custmenu.cpp:166 src/emu/ui/custmenu.cpp:454
 msgid "Other filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:176 src/emu/ui/optsmenu.cpp:239
+#: src/emu/ui/custmenu.cpp:175 src/emu/ui/optsmenu.cpp:238
 msgid "^!Manufacturer"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:185 src/emu/ui/custmenu.cpp:474
-#: src/emu/ui/optsmenu.cpp:247
+#: src/emu/ui/custmenu.cpp:184 src/emu/ui/custmenu.cpp:472
+#: src/emu/ui/optsmenu.cpp:246
 msgid "^!Year"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:194 src/emu/ui/custmenu.cpp:510
+#: src/emu/ui/custmenu.cpp:193 src/emu/ui/custmenu.cpp:508
 msgid "Remove last filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:197 src/emu/ui/custmenu.cpp:513
+#: src/emu/ui/custmenu.cpp:196 src/emu/ui/custmenu.cpp:511
 msgid "Add filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:212 src/emu/ui/custmenu.cpp:233
-#: src/emu/ui/custmenu.cpp:529 src/emu/ui/custmenu.cpp:550
+#: src/emu/ui/custmenu.cpp:211 src/emu/ui/custmenu.cpp:231
+#: src/emu/ui/custmenu.cpp:527 src/emu/ui/custmenu.cpp:547
 msgid "Select custom filters:"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:465
+#: src/emu/ui/custmenu.cpp:463
 msgid "^!Publisher"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:483
+#: src/emu/ui/custmenu.cpp:481
 msgid "^!Software List"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:492
+#: src/emu/ui/custmenu.cpp:490
 msgid "^!Device type"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:501
+#: src/emu/ui/custmenu.cpp:499
 msgid "^!Region"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:23
+#: src/emu/ui/custui.cpp:22
 msgid "Show All"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:24
+#: src/emu/ui/custui.cpp:23
 msgid "Hide Filters"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:25
+#: src/emu/ui/custui.cpp:24
 msgid "Hide Info/Image"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:26
+#: src/emu/ui/custui.cpp:25
 msgid "Hide Both"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:142
+#: src/emu/ui/custui.cpp:141
 msgid "Fonts"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:143
+#: src/emu/ui/custui.cpp:142
 msgid "Colors"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:148 src/emu/ui/dirmenu.cpp:33
+#: src/emu/ui/custui.cpp:147 src/emu/ui/dirmenu.cpp:33
 msgid "Language"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:152
+#: src/emu/ui/custui.cpp:151
 msgid "Show side panels"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:167 src/emu/ui/custui.cpp:188
+#: src/emu/ui/custui.cpp:166 src/emu/ui/custui.cpp:186
 msgid "Custom UI Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:246
+#: src/emu/ui/custui.cpp:244
 msgid "default"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:349
+#: src/emu/ui/custui.cpp:347
 msgid "UI Font"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:354
+#: src/emu/ui/custui.cpp:352
 msgid "Bold"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:355
+#: src/emu/ui/custui.cpp:353
 msgid "Italic"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:360
+#: src/emu/ui/custui.cpp:358
 msgid "Lines"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:366
+#: src/emu/ui/custui.cpp:364
 msgid "Infos text size"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:383
+#: src/emu/ui/custui.cpp:381
 msgid "UI Fonts Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:411
+#: src/emu/ui/custui.cpp:408
 msgid "Sample text - Lorem ipsum dolor sit amet, consectetur adipiscing elit."
 msgstr ""
 
-#: src/emu/ui/custui.cpp:509
+#: src/emu/ui/custui.cpp:506
 msgid "Normal text"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:510
+#: src/emu/ui/custui.cpp:507
 msgid "Selected color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:511
+#: src/emu/ui/custui.cpp:508
 msgid "Normal text background"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:512
+#: src/emu/ui/custui.cpp:509
 msgid "Selected background color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:513
+#: src/emu/ui/custui.cpp:510
 msgid "Subitem color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:514 src/emu/ui/custui.cpp:610
+#: src/emu/ui/custui.cpp:511 src/emu/ui/custui.cpp:606
 msgid "Clone"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:515
+#: src/emu/ui/custui.cpp:512
 msgid "Border"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:516
+#: src/emu/ui/custui.cpp:513
 msgid "Background"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:517
+#: src/emu/ui/custui.cpp:514
 msgid "Dipswitch"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:518
+#: src/emu/ui/custui.cpp:515
 msgid "Unavailable color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:519
+#: src/emu/ui/custui.cpp:516
 msgid "Slider color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:520
+#: src/emu/ui/custui.cpp:517
 msgid "Gfx viewer background"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:521
+#: src/emu/ui/custui.cpp:518
 msgid "Mouse over color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:522
+#: src/emu/ui/custui.cpp:519
 msgid "Mouse over background color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:523
+#: src/emu/ui/custui.cpp:520
 msgid "Mouse down color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:524
+#: src/emu/ui/custui.cpp:521
 msgid "Mouse down background color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:527
+#: src/emu/ui/custui.cpp:524
 msgid "Restore originals colors"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:543
+#: src/emu/ui/custui.cpp:540
 msgid "UI Colors Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:572
+#: src/emu/ui/custui.cpp:568
 #, c-format
 msgid "Double click or press %1$s to change the color value"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:598
+#: src/emu/ui/custui.cpp:594
 msgid "Menu Preview"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:606
+#: src/emu/ui/custui.cpp:602
 msgid "Normal"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:607
+#: src/emu/ui/custui.cpp:603
 msgid "Subitem"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:608
+#: src/emu/ui/custui.cpp:604
 msgid "Selected"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:609
+#: src/emu/ui/custui.cpp:605
 msgid "Mouse Over"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:841 src/emu/ui/custui.cpp:844
+#: src/emu/ui/custui.cpp:837 src/emu/ui/custui.cpp:840
 msgid "Alpha"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:849 src/emu/ui/custui.cpp:852
-#: src/emu/ui/custui.cpp:1013
+#: src/emu/ui/custui.cpp:845 src/emu/ui/custui.cpp:848
+#: src/emu/ui/custui.cpp:1007
 msgid "Red"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:857 src/emu/ui/custui.cpp:860
-#: src/emu/ui/custui.cpp:1016
+#: src/emu/ui/custui.cpp:853 src/emu/ui/custui.cpp:856
+#: src/emu/ui/custui.cpp:1010
 msgid "Green"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:865 src/emu/ui/custui.cpp:868
-#: src/emu/ui/custui.cpp:1017
+#: src/emu/ui/custui.cpp:861 src/emu/ui/custui.cpp:864
+#: src/emu/ui/custui.cpp:1011
 msgid "Blue"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:871
+#: src/emu/ui/custui.cpp:867
 msgid "Choose from palette"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:887
+#: src/emu/ui/custui.cpp:883
 msgid " - ARGB Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:912
+#: src/emu/ui/custui.cpp:907
 msgid "Color preview ="
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1009
+#: src/emu/ui/custui.cpp:1003
 msgid "White"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1010
+#: src/emu/ui/custui.cpp:1004
 msgid "Silver"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1011
+#: src/emu/ui/custui.cpp:1005
 msgid "Gray"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1012
+#: src/emu/ui/custui.cpp:1006
 msgid "Black"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1014
+#: src/emu/ui/custui.cpp:1008
 msgid "Orange"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1015
+#: src/emu/ui/custui.cpp:1009
 msgid "Yellow"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1018
+#: src/emu/ui/custui.cpp:1012
 msgid "Violet"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:65
+#: src/emu/ui/datmenu.cpp:64
 msgid "Software History"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:67
+#: src/emu/ui/datmenu.cpp:66
 msgid "Software Usage"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:199
+#: src/emu/ui/datmenu.cpp:196
 msgid "Revision: "
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:287 src/emu/ui/selgame.cpp:40
-#: src/emu/ui/selgame.cpp:2152 src/emu/ui/selgame.cpp:2161
-#: src/emu/ui/selsoft.cpp:1577 src/emu/ui/selsoft.cpp:1597
-#: src/emu/ui/selsoft.cpp:1606
+#: src/emu/ui/datmenu.cpp:284 src/emu/ui/selgame.cpp:39
+#: src/emu/ui/selgame.cpp:2158 src/emu/ui/selgame.cpp:2167
+#: src/emu/ui/selsoft.cpp:1574 src/emu/ui/selsoft.cpp:1592
+#: src/emu/ui/selsoft.cpp:1601
 msgid "History"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:289 src/emu/ui/selgame.cpp:41
+#: src/emu/ui/datmenu.cpp:286 src/emu/ui/selgame.cpp:40
 msgid "Mameinfo"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:291 src/emu/ui/selgame.cpp:43
+#: src/emu/ui/datmenu.cpp:288 src/emu/ui/selgame.cpp:42
 msgid "Messinfo"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:293 src/emu/ui/selgame.cpp:42
+#: src/emu/ui/datmenu.cpp:290 src/emu/ui/selgame.cpp:41
 msgid "Sysinfo"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:295 src/emu/ui/selgame.cpp:46
+#: src/emu/ui/datmenu.cpp:292 src/emu/ui/selgame.cpp:45
 msgid "Mamescore"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:297 src/emu/ui/selgame.cpp:45
+#: src/emu/ui/datmenu.cpp:294 src/emu/ui/selgame.cpp:44
 msgid "Gameinit"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:299 src/emu/ui/selgame.cpp:44
+#: src/emu/ui/datmenu.cpp:296 src/emu/ui/selgame.cpp:43
 msgid "Command"
 msgstr ""
 
@@ -556,75 +556,75 @@ msgstr ""
 msgid "Remove %1$s Folder"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:158
+#: src/emu/ui/filesel.cpp:161
 msgid "File Already Exists - Override?"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:160 src/emu/ui/selgame.cpp:1568
-#: src/emu/ui/selgame.cpp:1569 src/emu/ui/selgame.cpp:1570
-#: src/emu/ui/selgame.cpp:1571 src/emu/ui/selgame.cpp:1572
-#: src/emu/ui/selgame.cpp:1573 src/emu/ui/selgame.cpp:1574
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/filesel.cpp:163 src/emu/ui/selgame.cpp:1576
+#: src/emu/ui/selgame.cpp:1577 src/emu/ui/selgame.cpp:1578
+#: src/emu/ui/selgame.cpp:1579 src/emu/ui/selgame.cpp:1580
+#: src/emu/ui/selgame.cpp:1581 src/emu/ui/selgame.cpp:1582
+#: src/emu/ui/selgame.cpp:1591
 msgid "No"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:161 src/emu/ui/selgame.cpp:1568
-#: src/emu/ui/selgame.cpp:1569 src/emu/ui/selgame.cpp:1570
-#: src/emu/ui/selgame.cpp:1571 src/emu/ui/selgame.cpp:1572
-#: src/emu/ui/selgame.cpp:1573 src/emu/ui/selgame.cpp:1574
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/filesel.cpp:164 src/emu/ui/selgame.cpp:1576
+#: src/emu/ui/selgame.cpp:1577 src/emu/ui/selgame.cpp:1578
+#: src/emu/ui/selgame.cpp:1579 src/emu/ui/selgame.cpp:1580
+#: src/emu/ui/selgame.cpp:1581 src/emu/ui/selgame.cpp:1582
+#: src/emu/ui/selgame.cpp:1591
 msgid "Yes"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:272
+#: src/emu/ui/filesel.cpp:275
 msgid "New Image Name:"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:278
+#: src/emu/ui/filesel.cpp:281
 msgid "Image Format:"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:284
+#: src/emu/ui/filesel.cpp:287
 msgid "Create"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:315
+#: src/emu/ui/filesel.cpp:318
 msgid "Please enter a file extension too"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:503 src/emu/ui/swlist.cpp:65
+#: src/emu/ui/filesel.cpp:506 src/emu/ui/swlist.cpp:65
 msgid "[empty slot]"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:507
+#: src/emu/ui/filesel.cpp:510
 msgid "[create]"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:511 src/emu/ui/swlist.cpp:76
+#: src/emu/ui/filesel.cpp:514 src/emu/ui/swlist.cpp:76
 msgid "[software list]"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:803
+#: src/emu/ui/filesel.cpp:806
 msgid "Select image format"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:863
+#: src/emu/ui/filesel.cpp:866
 msgid "Select access mode"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:864
+#: src/emu/ui/filesel.cpp:867
 msgid "Read-only"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:866
+#: src/emu/ui/filesel.cpp:869
 msgid "Read-write"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:867
+#: src/emu/ui/filesel.cpp:870
 msgid "Read this image, write to another image"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:868
+#: src/emu/ui/filesel.cpp:871
 msgid "Read this image, write to diff"
 msgstr ""
 
@@ -650,7 +650,7 @@ msgstr ""
 msgid "[empty]"
 msgstr ""
 
-#: src/emu/ui/info_pty.cpp:26 src/emu/ui/mainmenu.cpp:91
+#: src/emu/ui/info_pty.cpp:26 src/emu/ui/mainmenu.cpp:96
 msgid "Pseudo terminals"
 msgstr ""
 
@@ -666,7 +666,7 @@ msgstr ""
 msgid "Other Controls"
 msgstr ""
 
-#: src/emu/ui/inputmap.cpp:622 src/emu/ui/miscmenu.cpp:91
+#: src/emu/ui/inputmap.cpp:622 src/emu/ui/miscmenu.cpp:92
 #: src/emu/ui/slotopt.cpp:172
 msgid "Reset"
 msgstr ""
@@ -699,27 +699,27 @@ msgstr ""
 msgid "Machine Information"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:78
+#: src/emu/ui/mainmenu.cpp:80
 msgid "Image Information"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:81
+#: src/emu/ui/mainmenu.cpp:83
 msgid "File Manager"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:86
+#: src/emu/ui/mainmenu.cpp:92
 msgid "Tape Control"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:94
+#: src/emu/ui/mainmenu.cpp:99
 msgid "Bios Selection"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:100
+#: src/emu/ui/mainmenu.cpp:104
 msgid "Slot Devices"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:107
+#: src/emu/ui/mainmenu.cpp:109
 msgid "Barcode Reader"
 msgstr ""
 
@@ -727,43 +727,43 @@ msgstr ""
 msgid "Network Devices"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:119
+#: src/emu/ui/mainmenu.cpp:118
 msgid "Keyboard Mode"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:122
+#: src/emu/ui/mainmenu.cpp:121
 msgid "Slider Controls"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:125
+#: src/emu/ui/mainmenu.cpp:124
 msgid "Video Options"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:129
+#: src/emu/ui/mainmenu.cpp:128
 msgid "Crosshair Options"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:133
+#: src/emu/ui/mainmenu.cpp:132
 msgid "Cheat"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:136
+#: src/emu/ui/mainmenu.cpp:135
 msgid "Plugin Options"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:140
+#: src/emu/ui/mainmenu.cpp:139
 msgid "External DAT View"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:146
+#: src/emu/ui/mainmenu.cpp:145 src/emu/ui/miscmenu.cpp:785
 msgid "Add To Favorites"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:148
+#: src/emu/ui/mainmenu.cpp:147 src/emu/ui/miscmenu.cpp:787
 msgid "Remove From Favorites"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:155
+#: src/emu/ui/mainmenu.cpp:154
 msgid "Select New Machine"
 msgstr ""
 
@@ -803,189 +803,205 @@ msgstr ""
 msgid "Return to Previous Menu"
 msgstr ""
 
-#: src/emu/ui/menu.cpp:716
+#: src/emu/ui/menu.cpp:761
 msgid "Auto"
 msgstr ""
 
-#: src/emu/ui/menu.cpp:2133
+#: src/emu/ui/menu.cpp:2195
 msgid "Images"
 msgstr ""
 
-#: src/emu/ui/menu.cpp:2134
+#: src/emu/ui/menu.cpp:2196
 msgid "Infos"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Keyboard Mode:"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Natural"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Emulated"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:240
+#: src/emu/ui/miscmenu.cpp:241
 #, c-format
 msgid ""
 "Uptime: %1$d:%2$02d:%3$02d\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:242
+#: src/emu/ui/miscmenu.cpp:243
 #, c-format
 msgid ""
 "Uptime: %1$d:%2$02d\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:246
+#: src/emu/ui/miscmenu.cpp:247
 #, c-format
 msgid ""
 "Tickets dispensed: %1$d\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:257
+#: src/emu/ui/miscmenu.cpp:258
 msgid "Coin %1$c: NA%3$s\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:257
+#: src/emu/ui/miscmenu.cpp:258
 #, c-format
 msgid "Coin %1$c: %2$d%3$s\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:260
+#: src/emu/ui/miscmenu.cpp:261
 msgid " (locked)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:519
+#: src/emu/ui/miscmenu.cpp:520
 msgid "Visible Delay"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:617
+#: src/emu/ui/miscmenu.cpp:619
 #, c-format
 msgid "%s.xml saved under ui folder."
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:645
+#: src/emu/ui/miscmenu.cpp:647
 msgid "Name:             Description:\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:657
+#: src/emu/ui/miscmenu.cpp:659
 #, c-format
 msgid "%s.txt saved under ui folder."
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:675
-msgid "Export XML format (like -listxml)"
+#: src/emu/ui/miscmenu.cpp:677
+msgid "Export list in XML format (like -listxml)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:676
-msgid "Export TXT format (like -listfull)"
+#: src/emu/ui/miscmenu.cpp:678
+msgid "Export list in XML format (like -listxml, but exclude devices)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:734
-msgid "Dummy"
+#: src/emu/ui/miscmenu.cpp:679
+msgid "Export list in TXT format (like -listfull)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:736
-msgid "Save machine configuration"
-msgstr ""
-
-#: src/emu/ui/miscmenu.cpp:848 src/emu/ui/miscmenu.cpp:869
-#: src/emu/ui/selgame.cpp:594
-msgid "Plugins"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:218
-msgid "Filter"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:226
-msgid " ^!File"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:231
-msgid " ^!Category"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:254
-msgid "^!Setup custom filter"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:262
-msgid "Customize UI"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:263
-msgid "Configure Directories"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:266 src/emu/ui/sndmenu.cpp:151
-#: src/emu/ui/sndmenu.cpp:172
-msgid "Sound Options"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:269
-msgid "General Inputs"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:272
-msgid "Save Configuration"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:286 src/emu/ui/optsmenu.cpp:307
-msgid "Settings"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:327
-msgid "**Error saving ui.ini**"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:374
-#, c-format
-msgid "**Error saving %s.ini**"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:378
+#: src/emu/ui/miscmenu.cpp:729 src/emu/ui/optsmenu.cpp:376
 msgid ""
 "\n"
 "    Configuration saved    \n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/selector.cpp:166
+#: src/emu/ui/miscmenu.cpp:774
+msgid "Bios"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:776
+msgid "Driver"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:790
+msgid "Save machine configuration"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:806
+msgid "Configure machine:"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:868 src/emu/ui/selsoft.cpp:109
+msgid " (default)"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:953 src/emu/ui/miscmenu.cpp:973
+#: src/emu/ui/selgame.cpp:600
+msgid "Plugins"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:217
+msgid "Filter"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:225
+msgid " ^!File"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:230
+msgid " ^!Category"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:253
+msgid "^!Setup custom filter"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:261
+msgid "Customize UI"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:262
+msgid "Configure Directories"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:265 src/emu/ui/sndmenu.cpp:149
+#: src/emu/ui/sndmenu.cpp:169
+msgid "Sound Options"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:268
+msgid "General Inputs"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:271
+msgid "Save Configuration"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:285 src/emu/ui/optsmenu.cpp:305
+msgid "Settings"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:325
+msgid "**Error saving ui.ini**"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:372
+#, c-format
+msgid "**Error saving %s.ini**"
+msgstr ""
+
+#: src/emu/ui/selector.cpp:165
 msgid "Selection List - Search: "
 msgstr ""
 
-#: src/emu/ui/selector.cpp:196
+#: src/emu/ui/selector.cpp:194
 #, c-format
 msgid "Double click or press %1$s to select"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:39
+#: src/emu/ui/selgame.cpp:38
 msgid "General Info"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:374 src/emu/ui/selsoft.cpp:282
+#: src/emu/ui/selgame.cpp:380 src/emu/ui/selsoft.cpp:281
 #, c-format
 msgid ""
 "%s\n"
 " added to favorites list."
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:380 src/emu/ui/selgame.cpp:389
-#: src/emu/ui/selsoft.cpp:287
+#: src/emu/ui/selgame.cpp:386 src/emu/ui/selgame.cpp:395
+#: src/emu/ui/selsoft.cpp:286
 #, c-format
 msgid ""
 "%s\n"
 " removed from favorites list."
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:450
+#: src/emu/ui/selgame.cpp:457
 msgid ""
 "The selected machine is missing one or more required ROM or CHD images. "
 "Please select a different machine.\n"
@@ -993,275 +1009,275 @@ msgid ""
 "Press any key to continue."
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:589 src/emu/ui/simpleselgame.cpp:265
+#: src/emu/ui/selgame.cpp:595 src/emu/ui/simpleselgame.cpp:265
 msgid "Configure Options"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:752
+#: src/emu/ui/selgame.cpp:596
+msgid "Configure Machine"
+msgstr ""
+
+#: src/emu/ui/selgame.cpp:758
 #, c-format
 msgid "%1$s %2$s ( %3$d / %4$d machines (%5$d BIOS) )"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:762
+#: src/emu/ui/selgame.cpp:768
 #, c-format
 msgid "%1$s (%2$s - %3$s) - "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:769 src/emu/ui/selgame.cpp:775
+#: src/emu/ui/selgame.cpp:775 src/emu/ui/selgame.cpp:781
 #, c-format
 msgid "%1$s (%2$s) - "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:784
+#: src/emu/ui/selgame.cpp:790
 #, c-format
 msgid "%1$s Search: %2$s_"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:838
+#: src/emu/ui/selgame.cpp:844
 #, c-format
 msgid "Romset: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:841 src/emu/ui/selgame.cpp:890
-#: src/emu/ui/selsoft.cpp:751 src/emu/ui/selsoft.cpp:801
+#: src/emu/ui/selgame.cpp:847 src/emu/ui/selgame.cpp:896
+#: src/emu/ui/selsoft.cpp:750 src/emu/ui/selsoft.cpp:800
 #: src/emu/ui/simpleselgame.cpp:328
 #, c-format
 msgid "%1$s, %2$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:847 src/emu/ui/selsoft.cpp:757
+#: src/emu/ui/selgame.cpp:853 src/emu/ui/selsoft.cpp:756
 #, c-format
 msgid "Driver is clone of: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:849 src/emu/ui/selsoft.cpp:759
+#: src/emu/ui/selgame.cpp:855 src/emu/ui/selsoft.cpp:758
 msgid "Driver is parent"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:853 src/emu/ui/selsoft.cpp:763
+#: src/emu/ui/selgame.cpp:859 src/emu/ui/selsoft.cpp:762
 #: src/emu/ui/simpleselgame.cpp:335
 msgid "Overall: NOT WORKING"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:855 src/emu/ui/selsoft.cpp:765
+#: src/emu/ui/selgame.cpp:861 src/emu/ui/selsoft.cpp:764
 #: src/emu/ui/simpleselgame.cpp:337
 msgid "Overall: Unemulated Protection"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:857 src/emu/ui/selsoft.cpp:767
+#: src/emu/ui/selgame.cpp:863 src/emu/ui/selsoft.cpp:766
 #: src/emu/ui/simpleselgame.cpp:339
 msgid "Overall: Working"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:861 src/emu/ui/selsoft.cpp:771
+#: src/emu/ui/selgame.cpp:867 src/emu/ui/selsoft.cpp:770
 msgid "Graphics: Imperfect, "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:863 src/emu/ui/selsoft.cpp:773
+#: src/emu/ui/selgame.cpp:869 src/emu/ui/selsoft.cpp:772
 msgid "Graphics: OK, "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:866 src/emu/ui/selsoft.cpp:776
+#: src/emu/ui/selgame.cpp:872 src/emu/ui/selsoft.cpp:775
 msgid "Sound: Unimplemented"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:868 src/emu/ui/selsoft.cpp:778
+#: src/emu/ui/selgame.cpp:874 src/emu/ui/selsoft.cpp:777
 msgid "Sound: Imperfect"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:870 src/emu/ui/selsoft.cpp:780
+#: src/emu/ui/selgame.cpp:876 src/emu/ui/selsoft.cpp:779
 msgid "Sound: OK"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:887
+#: src/emu/ui/selgame.cpp:893
 #, c-format
 msgid "System: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:894 src/emu/ui/selsoft.cpp:805
+#: src/emu/ui/selgame.cpp:900 src/emu/ui/selsoft.cpp:804
 #, c-format
 msgid "Software is clone of: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:896 src/emu/ui/selsoft.cpp:807
+#: src/emu/ui/selgame.cpp:902 src/emu/ui/selsoft.cpp:806
 msgid "Software is parent"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:901 src/emu/ui/selsoft.cpp:812
+#: src/emu/ui/selgame.cpp:907 src/emu/ui/selsoft.cpp:811
 msgid "Supported: No"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:906 src/emu/ui/selsoft.cpp:817
+#: src/emu/ui/selgame.cpp:912 src/emu/ui/selsoft.cpp:816
 msgid "Supported: Partial"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:911 src/emu/ui/selsoft.cpp:822
+#: src/emu/ui/selgame.cpp:917 src/emu/ui/selsoft.cpp:821
 msgid "Supported: Yes"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:916 src/emu/ui/selsoft.cpp:827
+#: src/emu/ui/selgame.cpp:922 src/emu/ui/selsoft.cpp:826
 #, c-format
 msgid "romset: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:923
+#: src/emu/ui/selgame.cpp:929
 #, c-format
 msgid "%1$s %2$s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1535
+#: src/emu/ui/selgame.cpp:1543
 #, c-format
 msgid "Romset: %1$-.100s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1536
+#: src/emu/ui/selgame.cpp:1544
 #, c-format
 msgid "Year: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1537
+#: src/emu/ui/selgame.cpp:1545
 #, c-format
 msgid "Manufacturer: %1$-.100s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1541
+#: src/emu/ui/selgame.cpp:1549
 #, c-format
 msgid "Driver is Clone of: %1$-.100s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1543
+#: src/emu/ui/selgame.cpp:1551
 msgid "Driver is Parent\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1546
+#: src/emu/ui/selgame.cpp:1554
 msgid "Overall: NOT WORKING\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1548
+#: src/emu/ui/selgame.cpp:1556
 msgid "Overall: Unemulated Protection\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1550
+#: src/emu/ui/selgame.cpp:1558
 msgid "Overall: Working\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1553
+#: src/emu/ui/selgame.cpp:1561
 msgid "Graphics: Imperfect Colors\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1557
+#: src/emu/ui/selgame.cpp:1565
 msgid "Graphics: Imperfect\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1559
+#: src/emu/ui/selgame.cpp:1567
 msgid "Graphics: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1562
+#: src/emu/ui/selgame.cpp:1570
 msgid "Sound: Unimplemented\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1564
+#: src/emu/ui/selgame.cpp:1572
 msgid "Sound: Imperfect\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1566
+#: src/emu/ui/selgame.cpp:1574
 msgid "Sound: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1568
+#: src/emu/ui/selgame.cpp:1576
 #, c-format
 msgid "Driver is Skeleton: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1569
+#: src/emu/ui/selgame.cpp:1577
 #, c-format
 msgid "Game is Mechanical: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1570
+#: src/emu/ui/selgame.cpp:1578
 #, c-format
 msgid "Requires Artwork: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1571
+#: src/emu/ui/selgame.cpp:1579
 #, c-format
 msgid "Requires Clickable Artwork: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1572
+#: src/emu/ui/selgame.cpp:1580
 #, c-format
 msgid "Support Cocktail: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1573
+#: src/emu/ui/selgame.cpp:1581
 #, c-format
 msgid "Driver is Bios: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1574
+#: src/emu/ui/selgame.cpp:1582
 #, c-format
 msgid "Support Save: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 #, c-format
 msgid "Screen Orientation: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 msgid "Vertical"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 msgid "Horizontal"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/selgame.cpp:1591
 #, c-format
 msgid "Requires CHD: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1596
+#: src/emu/ui/selgame.cpp:1604
 msgid "Roms Audit Pass: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1598
+#: src/emu/ui/selgame.cpp:1606
 msgid "Roms Audit Pass: BAD\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1601
+#: src/emu/ui/selgame.cpp:1609
 msgid "Samples Audit Pass: None Needed\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1603
+#: src/emu/ui/selgame.cpp:1611
 msgid "Samples Audit Pass: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1605
+#: src/emu/ui/selgame.cpp:1613
 msgid "Samples Audit Pass: BAD\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1608
+#: src/emu/ui/selgame.cpp:1616
 msgid ""
 "Roms Audit Pass: Disabled\n"
 "Samples Audit Pass: Disabled\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:2049 src/emu/ui/selgame.cpp:2212
-#: src/emu/ui/selsoft.cpp:1662
+#: src/emu/ui/selgame.cpp:2055 src/emu/ui/selgame.cpp:2216
+#: src/emu/ui/selsoft.cpp:1655
 msgid "No Infos Available"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:2162 src/emu/ui/selsoft.cpp:1607
+#: src/emu/ui/selgame.cpp:2168 src/emu/ui/selsoft.cpp:1602
 msgid "Usage"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:110
-msgid " (default)"
-msgstr ""
-
-#: src/emu/ui/selsoft.cpp:381
+#: src/emu/ui/selsoft.cpp:380
 msgid ""
 "The selected software is missing one or more required files. Please select a "
 "different software.\n"
@@ -1269,57 +1285,57 @@ msgid ""
 "Press any key to continue."
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:684
+#: src/emu/ui/selsoft.cpp:683
 #, c-format
-msgid "%1$s %2$s ( %3$d / %4$d softwares )"
+msgid "%1$s %2$s ( %3$d / %4$d software packages )"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:685
+#: src/emu/ui/selsoft.cpp:684
 #, c-format
 msgid "Driver: \"%1$s\" software list "
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:688
+#: src/emu/ui/selsoft.cpp:687
 #, c-format
 msgid "Region: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:690
+#: src/emu/ui/selsoft.cpp:689
 #, c-format
 msgid "Publisher: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:692
+#: src/emu/ui/selsoft.cpp:691
 #, c-format
 msgid "Year: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:694
+#: src/emu/ui/selsoft.cpp:693
 #, c-format
 msgid "Software List: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:696
+#: src/emu/ui/selsoft.cpp:695
 #, c-format
 msgid "Device type: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:698
+#: src/emu/ui/selsoft.cpp:697
 #, c-format
 msgid "%s Search: %s_"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:748 src/emu/ui/selsoft.cpp:798
+#: src/emu/ui/selsoft.cpp:747 src/emu/ui/selsoft.cpp:797
 #: src/emu/ui/simpleselgame.cpp:325
 #, c-format
 msgid "%1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:1998 src/emu/ui/selsoft.cpp:2018
+#: src/emu/ui/selsoft.cpp:1991 src/emu/ui/selsoft.cpp:2011
 msgid "Software part selection:"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:2136 src/emu/ui/selsoft.cpp:2156
+#: src/emu/ui/selsoft.cpp:2129 src/emu/ui/selsoft.cpp:2149
 msgid "Bios selection:"
 msgstr ""
 
@@ -1367,15 +1383,15 @@ msgstr ""
 msgid " [internal]"
 msgstr ""
 
-#: src/emu/ui/sndmenu.cpp:135
+#: src/emu/ui/sndmenu.cpp:133
 msgid "Sound"
 msgstr ""
 
-#: src/emu/ui/sndmenu.cpp:136
+#: src/emu/ui/sndmenu.cpp:134
 msgid "Sample Rate"
 msgstr ""
 
-#: src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/sndmenu.cpp:135
 msgid "Use External Samples"
 msgstr ""
 
@@ -1444,80 +1460,80 @@ msgstr ""
 msgid "Fast Forward"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:419
+#: src/emu/ui/ui.cpp:418
 msgid "This driver requires images to be loaded in the following device(s): "
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1074
+#: src/emu/ui/ui.cpp:1071
 msgid ""
 "One or more ROMs/CHDs for this machine are incorrect. The machine may not "
 "run correctly.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1087
+#: src/emu/ui/ui.cpp:1084
 msgid ""
 "There are known problems with this machine\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1091
+#: src/emu/ui/ui.cpp:1088
 msgid ""
 "One or more ROMs/CHDs for this machine have not been correctly dumped.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1095
+#: src/emu/ui/ui.cpp:1092
 #, c-format
 msgid "The keyboard emulation may not be 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1097
+#: src/emu/ui/ui.cpp:1094
 #, c-format
 msgid "The colors aren't 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1099
+#: src/emu/ui/ui.cpp:1096
 msgid "The colors are completely wrong.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1101
+#: src/emu/ui/ui.cpp:1098
 #, c-format
 msgid "The video emulation isn't 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1103
+#: src/emu/ui/ui.cpp:1100
 #, c-format
 msgid "The sound emulation isn't 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1105
+#: src/emu/ui/ui.cpp:1102
 msgid "The machine lacks sound.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1108
+#: src/emu/ui/ui.cpp:1105
 msgid "Screen flipping in cocktail mode is not supported.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1112
+#: src/emu/ui/ui.cpp:1109
 msgid "The machine requires external artwork files\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1117
+#: src/emu/ui/ui.cpp:1114
 msgid ""
 "This machine was never completed. It may exhibit strange behavior or missing "
 "elements that are not bugs in the emulation.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1122
+#: src/emu/ui/ui.cpp:1119
 msgid ""
 "This machine has no sound hardware, MAME will produce no sounds, this is "
 "expected behaviour.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1130
+#: src/emu/ui/ui.cpp:1127
 msgid "The machine has protection which isn't fully emulated.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1133
+#: src/emu/ui/ui.cpp:1130
 msgid ""
 "\n"
 "THIS MACHINE DOESN'T WORK. The emulation for this machine is not yet "
@@ -1525,7 +1541,7 @@ msgid ""
 "the developers to improve the emulation.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1137
+#: src/emu/ui/ui.cpp:1134
 msgid ""
 "\n"
 "Certain elements of this machine cannot be emulated as it requires actual "
@@ -1533,21 +1549,21 @@ msgid ""
 "to fully play this machine.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1156
+#: src/emu/ui/ui.cpp:1153
 msgid ""
 "\n"
 "\n"
 "There are working clones of this machine: "
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1170
+#: src/emu/ui/ui.cpp:1167
 msgid ""
 "\n"
 "\n"
 "Press any key to continue"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1185
+#: src/emu/ui/ui.cpp:1182
 #, c-format
 msgid ""
 "%1$s\n"
@@ -1557,98 +1573,98 @@ msgid ""
 "CPU:\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1221 src/emu/ui/ui.cpp:1260
+#: src/emu/ui/ui.cpp:1218 src/emu/ui/ui.cpp:1257
 msgid "MHz"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1221 src/emu/ui/ui.cpp:1260
+#: src/emu/ui/ui.cpp:1218 src/emu/ui/ui.cpp:1257
 msgid "kHz"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1235
+#: src/emu/ui/ui.cpp:1232
 msgid ""
 "\n"
 "Sound:\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1264
+#: src/emu/ui/ui.cpp:1261
 msgid ""
 "\n"
 "Video:\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1268
+#: src/emu/ui/ui.cpp:1265
 msgid "None\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1275
+#: src/emu/ui/ui.cpp:1272
 msgid "Vector"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1286
+#: src/emu/ui/ui.cpp:1283
 #, c-format
 msgid "%1$s: %2$s\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1286
+#: src/emu/ui/ui.cpp:1283
 msgid "%2$s\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1541 src/emu/ui/ui.cpp:1551
+#: src/emu/ui/ui.cpp:1538 src/emu/ui/ui.cpp:1548
 msgid "Keyboard Emulation Status"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1543
+#: src/emu/ui/ui.cpp:1540
 msgid "Mode: PARTIAL Emulation"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1544
+#: src/emu/ui/ui.cpp:1541
 msgid "UI:   Enabled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1546 src/emu/ui/ui.cpp:1556
+#: src/emu/ui/ui.cpp:1543 src/emu/ui/ui.cpp:1553
 msgid "**Use ScrLock to toggle**"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1553
+#: src/emu/ui/ui.cpp:1550
 msgid "Mode: FULL Emulation"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1554
+#: src/emu/ui/ui.cpp:1551
 msgid "UI:   Disabled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1692
+#: src/emu/ui/ui.cpp:1689
 msgid "Autofire can't be enabled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1731
+#: src/emu/ui/ui.cpp:1728
 msgid "Select position to save to"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1733
+#: src/emu/ui/ui.cpp:1730
 msgid "Select position to load from"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1757
+#: src/emu/ui/ui.cpp:1754
 msgid "Save cancelled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1759
+#: src/emu/ui/ui.cpp:1756
 msgid "Load cancelled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1802
+#: src/emu/ui/ui.cpp:1799
 #, c-format
 msgid "Save to position %s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1807
+#: src/emu/ui/ui.cpp:1804
 #, c-format
 msgid "Load from position %s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1847
+#: src/emu/ui/ui.cpp:1844
 #, c-format
 msgid ""
 "Are you sure you want to quit?\n"
@@ -1657,173 +1673,173 @@ msgid ""
 "Press ''%2$s'' to return to emulation."
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1917
+#: src/emu/ui/ui.cpp:1914
 msgid "Master Volume"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1926
+#: src/emu/ui/ui.cpp:1923
 #, c-format
 msgid "%1$s Volume"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1949
+#: src/emu/ui/ui.cpp:1946
 #, c-format
 msgid "Overclock CPU %1$s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1968
+#: src/emu/ui/ui.cpp:1965
 #, c-format
 msgid "%1$s Refresh Rate"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1973
+#: src/emu/ui/ui.cpp:1970
 #, c-format
 msgid "%1$s Brightness"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1975
+#: src/emu/ui/ui.cpp:1972
 #, c-format
 msgid "%1$s Contrast"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1977
+#: src/emu/ui/ui.cpp:1974
 #, c-format
 msgid "%1$s Gamma"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1981
+#: src/emu/ui/ui.cpp:1978
 #, c-format
 msgid "%1$s Horiz Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1983
+#: src/emu/ui/ui.cpp:1980
 #, c-format
 msgid "%1$s Horiz Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1985
+#: src/emu/ui/ui.cpp:1982
 #, c-format
 msgid "%1$s Vert Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1987
+#: src/emu/ui/ui.cpp:1984
 #, c-format
 msgid "%1$s Vert Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2005
+#: src/emu/ui/ui.cpp:2002
 #, c-format
 msgid "Laserdisc '%1$s' Horiz Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2007
+#: src/emu/ui/ui.cpp:2004
 #, c-format
 msgid "Laserdisc '%1$s' Horiz Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2009
+#: src/emu/ui/ui.cpp:2006
 #, c-format
 msgid "Laserdisc '%1$s' Vert Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2011
+#: src/emu/ui/ui.cpp:2008
 #, c-format
 msgid "Laserdisc '%1$s' Vert Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2021
+#: src/emu/ui/ui.cpp:2018
 msgid "Vector Flicker"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2022
+#: src/emu/ui/ui.cpp:2019
 msgid "Beam Width Minimum"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2023
+#: src/emu/ui/ui.cpp:2020
 msgid "Beam Width Maximum"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2024
+#: src/emu/ui/ui.cpp:2021
 msgid "Beam Intensity Weight"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2037
+#: src/emu/ui/ui.cpp:2034
 #, c-format
 msgid "Crosshair Scale %1$s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2037 src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2034 src/emu/ui/ui.cpp:2036
 msgid "X"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2037 src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2034 src/emu/ui/ui.cpp:2036
 msgid "Y"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2036
 #, c-format
 msgid "Crosshair Offset %1$s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2071
+#: src/emu/ui/ui.cpp:2068
 #, c-format
 msgid "%1$3ddB"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2115
+#: src/emu/ui/ui.cpp:2112
 #, c-format
 msgid "%1$d%%"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2131
+#: src/emu/ui/ui.cpp:2128
 #, c-format
 msgid "%1$3.0f%%"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2154
+#: src/emu/ui/ui.cpp:2151
 #, c-format
 msgid "%1$.3ffps"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2177 src/emu/ui/ui.cpp:2199 src/emu/ui/ui.cpp:2220
-#: src/emu/ui/ui.cpp:2242 src/emu/ui/ui.cpp:2264 src/emu/ui/ui.cpp:2286
-#: src/emu/ui/ui.cpp:2308 src/emu/ui/ui.cpp:2330 src/emu/ui/ui.cpp:2352
-#: src/emu/ui/ui.cpp:2374 src/emu/ui/ui.cpp:2396
+#: src/emu/ui/ui.cpp:2174 src/emu/ui/ui.cpp:2196 src/emu/ui/ui.cpp:2217
+#: src/emu/ui/ui.cpp:2239 src/emu/ui/ui.cpp:2261 src/emu/ui/ui.cpp:2283
+#: src/emu/ui/ui.cpp:2305 src/emu/ui/ui.cpp:2327 src/emu/ui/ui.cpp:2349
+#: src/emu/ui/ui.cpp:2371 src/emu/ui/ui.cpp:2393
 #, c-format
 msgid "%1$.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2412 src/emu/ui/ui.cpp:2428 src/emu/ui/ui.cpp:2444
-#: src/emu/ui/ui.cpp:2460
+#: src/emu/ui/ui.cpp:2408 src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2438
+#: src/emu/ui/ui.cpp:2453
 #, c-format
 msgid "%1$1.2f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2476
+#: src/emu/ui/ui.cpp:2469
 #, c-format
 msgid "Screen '%1$s'"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2478
+#: src/emu/ui/ui.cpp:2471
 msgid "Screen"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2494
+#: src/emu/ui/ui.cpp:2487
 #, c-format
 msgid "Crosshair Scale X %1$1.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2494
+#: src/emu/ui/ui.cpp:2487
 #, c-format
 msgid "Crosshair Scale Y %1$1.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2513
+#: src/emu/ui/ui.cpp:2506
 #, c-format
 msgid "Crosshair Offset X %1$1.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2513
+#: src/emu/ui/ui.cpp:2506
 #, c-format
 msgid "Crosshair Offset Y %1$1.3f"
 msgstr ""
@@ -1865,10 +1881,10 @@ msgstr ""
 msgid "Full"
 msgstr ""
 
-#: src/emu/ui/viewgfx.cpp:392
+#: src/emu/ui/viewgfx.cpp:391
 msgid " COLORS"
 msgstr ""
 
-#: src/emu/ui/viewgfx.cpp:392
+#: src/emu/ui/viewgfx.cpp:391
 msgid " PENS"
 msgstr ""
diff --git a/language/French/strings.po b/language/French/strings.po
index 6d81238f085..97c8777553f 100644
--- a/language/French/strings.po
+++ b/language/French/strings.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MAME\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-11 03:33+0200\n"
+"POT-Creation-Date: 2016-04-15 17:42+0200\n"
 "PO-Revision-Date: 2016-02-20 18:03+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: MAME Language Team\n"
@@ -59,14 +59,14 @@ msgstr ""
 msgid "Autofire Status"
 msgstr ""
 
-#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1698
+#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1695
 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211
 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219
 #: src/emu/ui/videoopt.cpp:223
 msgid "Disabled"
 msgstr ""
 
-#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1698
+#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1695
 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211
 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219
 #: src/emu/ui/videoopt.cpp:223
@@ -74,14 +74,14 @@ msgid "Enabled"
 msgstr ""
 
 #: src/emu/ui/cheatopt.cpp:282 src/emu/ui/cheatopt.cpp:288
-#: src/emu/ui/menu.cpp:710 src/emu/ui/miscmenu.cpp:831
-#: src/emu/ui/sndmenu.cpp:135 src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/menu.cpp:755 src/emu/ui/miscmenu.cpp:936
+#: src/emu/ui/sndmenu.cpp:133 src/emu/ui/sndmenu.cpp:135
 msgid "On"
 msgstr ""
 
 #: src/emu/ui/cheatopt.cpp:282 src/emu/ui/cheatopt.cpp:288
-#: src/emu/ui/menu.cpp:713 src/emu/ui/miscmenu.cpp:831
-#: src/emu/ui/sndmenu.cpp:135 src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/menu.cpp:758 src/emu/ui/miscmenu.cpp:936
+#: src/emu/ui/sndmenu.cpp:133 src/emu/ui/sndmenu.cpp:135
 msgid "Off"
 msgstr ""
 
@@ -93,316 +93,316 @@ msgstr ""
 msgid "Autofire Delay"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:158 src/emu/ui/custmenu.cpp:447
+#: src/emu/ui/custmenu.cpp:157 src/emu/ui/custmenu.cpp:445
 msgid "Main filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:167 src/emu/ui/custmenu.cpp:456
+#: src/emu/ui/custmenu.cpp:166 src/emu/ui/custmenu.cpp:454
 msgid "Other filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:176 src/emu/ui/optsmenu.cpp:239
+#: src/emu/ui/custmenu.cpp:175 src/emu/ui/optsmenu.cpp:238
 msgid "^!Manufacturer"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:185 src/emu/ui/custmenu.cpp:474
-#: src/emu/ui/optsmenu.cpp:247
+#: src/emu/ui/custmenu.cpp:184 src/emu/ui/custmenu.cpp:472
+#: src/emu/ui/optsmenu.cpp:246
 msgid "^!Year"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:194 src/emu/ui/custmenu.cpp:510
+#: src/emu/ui/custmenu.cpp:193 src/emu/ui/custmenu.cpp:508
 msgid "Remove last filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:197 src/emu/ui/custmenu.cpp:513
+#: src/emu/ui/custmenu.cpp:196 src/emu/ui/custmenu.cpp:511
 msgid "Add filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:212 src/emu/ui/custmenu.cpp:233
-#: src/emu/ui/custmenu.cpp:529 src/emu/ui/custmenu.cpp:550
+#: src/emu/ui/custmenu.cpp:211 src/emu/ui/custmenu.cpp:231
+#: src/emu/ui/custmenu.cpp:527 src/emu/ui/custmenu.cpp:547
 msgid "Select custom filters:"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:465
+#: src/emu/ui/custmenu.cpp:463
 msgid "^!Publisher"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:483
+#: src/emu/ui/custmenu.cpp:481
 msgid "^!Software List"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:492
+#: src/emu/ui/custmenu.cpp:490
 msgid "^!Device type"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:501
+#: src/emu/ui/custmenu.cpp:499
 msgid "^!Region"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:23
+#: src/emu/ui/custui.cpp:22
 msgid "Show All"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:24
+#: src/emu/ui/custui.cpp:23
 msgid "Hide Filters"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:25
+#: src/emu/ui/custui.cpp:24
 msgid "Hide Info/Image"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:26
+#: src/emu/ui/custui.cpp:25
 msgid "Hide Both"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:142
+#: src/emu/ui/custui.cpp:141
 msgid "Fonts"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:143
+#: src/emu/ui/custui.cpp:142
 msgid "Colors"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:148 src/emu/ui/dirmenu.cpp:33
+#: src/emu/ui/custui.cpp:147 src/emu/ui/dirmenu.cpp:33
 msgid "Language"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:152
+#: src/emu/ui/custui.cpp:151
 msgid "Show side panels"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:167 src/emu/ui/custui.cpp:188
+#: src/emu/ui/custui.cpp:166 src/emu/ui/custui.cpp:186
 msgid "Custom UI Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:246
+#: src/emu/ui/custui.cpp:244
 msgid "default"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:349
+#: src/emu/ui/custui.cpp:347
 msgid "UI Font"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:354
+#: src/emu/ui/custui.cpp:352
 msgid "Bold"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:355
+#: src/emu/ui/custui.cpp:353
 msgid "Italic"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:360
+#: src/emu/ui/custui.cpp:358
 msgid "Lines"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:366
+#: src/emu/ui/custui.cpp:364
 msgid "Infos text size"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:383
+#: src/emu/ui/custui.cpp:381
 msgid "UI Fonts Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:411
+#: src/emu/ui/custui.cpp:408
 msgid "Sample text - Lorem ipsum dolor sit amet, consectetur adipiscing elit."
 msgstr ""
 
-#: src/emu/ui/custui.cpp:509
+#: src/emu/ui/custui.cpp:506
 msgid "Normal text"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:510
+#: src/emu/ui/custui.cpp:507
 msgid "Selected color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:511
+#: src/emu/ui/custui.cpp:508
 msgid "Normal text background"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:512
+#: src/emu/ui/custui.cpp:509
 msgid "Selected background color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:513
+#: src/emu/ui/custui.cpp:510
 msgid "Subitem color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:514 src/emu/ui/custui.cpp:610
+#: src/emu/ui/custui.cpp:511 src/emu/ui/custui.cpp:606
 msgid "Clone"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:515
+#: src/emu/ui/custui.cpp:512
 msgid "Border"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:516
+#: src/emu/ui/custui.cpp:513
 msgid "Background"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:517
+#: src/emu/ui/custui.cpp:514
 msgid "Dipswitch"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:518
+#: src/emu/ui/custui.cpp:515
 msgid "Unavailable color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:519
+#: src/emu/ui/custui.cpp:516
 msgid "Slider color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:520
+#: src/emu/ui/custui.cpp:517
 msgid "Gfx viewer background"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:521
+#: src/emu/ui/custui.cpp:518
 msgid "Mouse over color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:522
+#: src/emu/ui/custui.cpp:519
 msgid "Mouse over background color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:523
+#: src/emu/ui/custui.cpp:520
 msgid "Mouse down color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:524
+#: src/emu/ui/custui.cpp:521
 msgid "Mouse down background color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:527
+#: src/emu/ui/custui.cpp:524
 msgid "Restore originals colors"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:543
+#: src/emu/ui/custui.cpp:540
 msgid "UI Colors Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:572
+#: src/emu/ui/custui.cpp:568
 #, c-format
 msgid "Double click or press %1$s to change the color value"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:598
+#: src/emu/ui/custui.cpp:594
 msgid "Menu Preview"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:606
+#: src/emu/ui/custui.cpp:602
 msgid "Normal"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:607
+#: src/emu/ui/custui.cpp:603
 msgid "Subitem"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:608
+#: src/emu/ui/custui.cpp:604
 msgid "Selected"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:609
+#: src/emu/ui/custui.cpp:605
 msgid "Mouse Over"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:841 src/emu/ui/custui.cpp:844
+#: src/emu/ui/custui.cpp:837 src/emu/ui/custui.cpp:840
 msgid "Alpha"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:849 src/emu/ui/custui.cpp:852
-#: src/emu/ui/custui.cpp:1013
+#: src/emu/ui/custui.cpp:845 src/emu/ui/custui.cpp:848
+#: src/emu/ui/custui.cpp:1007
 msgid "Red"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:857 src/emu/ui/custui.cpp:860
-#: src/emu/ui/custui.cpp:1016
+#: src/emu/ui/custui.cpp:853 src/emu/ui/custui.cpp:856
+#: src/emu/ui/custui.cpp:1010
 msgid "Green"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:865 src/emu/ui/custui.cpp:868
-#: src/emu/ui/custui.cpp:1017
+#: src/emu/ui/custui.cpp:861 src/emu/ui/custui.cpp:864
+#: src/emu/ui/custui.cpp:1011
 msgid "Blue"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:871
+#: src/emu/ui/custui.cpp:867
 msgid "Choose from palette"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:887
+#: src/emu/ui/custui.cpp:883
 msgid " - ARGB Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:912
+#: src/emu/ui/custui.cpp:907
 msgid "Color preview ="
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1009
+#: src/emu/ui/custui.cpp:1003
 msgid "White"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1010
+#: src/emu/ui/custui.cpp:1004
 msgid "Silver"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1011
+#: src/emu/ui/custui.cpp:1005
 msgid "Gray"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1012
+#: src/emu/ui/custui.cpp:1006
 msgid "Black"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1014
+#: src/emu/ui/custui.cpp:1008
 msgid "Orange"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1015
+#: src/emu/ui/custui.cpp:1009
 msgid "Yellow"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1018
+#: src/emu/ui/custui.cpp:1012
 msgid "Violet"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:65
+#: src/emu/ui/datmenu.cpp:64
 msgid "Software History"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:67
+#: src/emu/ui/datmenu.cpp:66
 msgid "Software Usage"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:199
+#: src/emu/ui/datmenu.cpp:196
 msgid "Revision: "
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:287 src/emu/ui/selgame.cpp:40
-#: src/emu/ui/selgame.cpp:2152 src/emu/ui/selgame.cpp:2161
-#: src/emu/ui/selsoft.cpp:1577 src/emu/ui/selsoft.cpp:1597
-#: src/emu/ui/selsoft.cpp:1606
+#: src/emu/ui/datmenu.cpp:284 src/emu/ui/selgame.cpp:39
+#: src/emu/ui/selgame.cpp:2158 src/emu/ui/selgame.cpp:2167
+#: src/emu/ui/selsoft.cpp:1574 src/emu/ui/selsoft.cpp:1592
+#: src/emu/ui/selsoft.cpp:1601
 msgid "History"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:289 src/emu/ui/selgame.cpp:41
+#: src/emu/ui/datmenu.cpp:286 src/emu/ui/selgame.cpp:40
 msgid "Mameinfo"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:291 src/emu/ui/selgame.cpp:43
+#: src/emu/ui/datmenu.cpp:288 src/emu/ui/selgame.cpp:42
 msgid "Messinfo"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:293 src/emu/ui/selgame.cpp:42
+#: src/emu/ui/datmenu.cpp:290 src/emu/ui/selgame.cpp:41
 msgid "Sysinfo"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:295 src/emu/ui/selgame.cpp:46
+#: src/emu/ui/datmenu.cpp:292 src/emu/ui/selgame.cpp:45
 msgid "Mamescore"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:297 src/emu/ui/selgame.cpp:45
+#: src/emu/ui/datmenu.cpp:294 src/emu/ui/selgame.cpp:44
 msgid "Gameinit"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:299 src/emu/ui/selgame.cpp:44
+#: src/emu/ui/datmenu.cpp:296 src/emu/ui/selgame.cpp:43
 msgid "Command"
 msgstr ""
 
@@ -554,75 +554,75 @@ msgstr ""
 msgid "Remove %1$s Folder"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:158
+#: src/emu/ui/filesel.cpp:161
 msgid "File Already Exists - Override?"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:160 src/emu/ui/selgame.cpp:1568
-#: src/emu/ui/selgame.cpp:1569 src/emu/ui/selgame.cpp:1570
-#: src/emu/ui/selgame.cpp:1571 src/emu/ui/selgame.cpp:1572
-#: src/emu/ui/selgame.cpp:1573 src/emu/ui/selgame.cpp:1574
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/filesel.cpp:163 src/emu/ui/selgame.cpp:1576
+#: src/emu/ui/selgame.cpp:1577 src/emu/ui/selgame.cpp:1578
+#: src/emu/ui/selgame.cpp:1579 src/emu/ui/selgame.cpp:1580
+#: src/emu/ui/selgame.cpp:1581 src/emu/ui/selgame.cpp:1582
+#: src/emu/ui/selgame.cpp:1591
 msgid "No"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:161 src/emu/ui/selgame.cpp:1568
-#: src/emu/ui/selgame.cpp:1569 src/emu/ui/selgame.cpp:1570
-#: src/emu/ui/selgame.cpp:1571 src/emu/ui/selgame.cpp:1572
-#: src/emu/ui/selgame.cpp:1573 src/emu/ui/selgame.cpp:1574
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/filesel.cpp:164 src/emu/ui/selgame.cpp:1576
+#: src/emu/ui/selgame.cpp:1577 src/emu/ui/selgame.cpp:1578
+#: src/emu/ui/selgame.cpp:1579 src/emu/ui/selgame.cpp:1580
+#: src/emu/ui/selgame.cpp:1581 src/emu/ui/selgame.cpp:1582
+#: src/emu/ui/selgame.cpp:1591
 msgid "Yes"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:272
+#: src/emu/ui/filesel.cpp:275
 msgid "New Image Name:"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:278
+#: src/emu/ui/filesel.cpp:281
 msgid "Image Format:"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:284
+#: src/emu/ui/filesel.cpp:287
 msgid "Create"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:315
+#: src/emu/ui/filesel.cpp:318
 msgid "Please enter a file extension too"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:503 src/emu/ui/swlist.cpp:65
+#: src/emu/ui/filesel.cpp:506 src/emu/ui/swlist.cpp:65
 msgid "[empty slot]"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:507
+#: src/emu/ui/filesel.cpp:510
 msgid "[create]"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:511 src/emu/ui/swlist.cpp:76
+#: src/emu/ui/filesel.cpp:514 src/emu/ui/swlist.cpp:76
 msgid "[software list]"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:803
+#: src/emu/ui/filesel.cpp:806
 msgid "Select image format"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:863
+#: src/emu/ui/filesel.cpp:866
 msgid "Select access mode"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:864
+#: src/emu/ui/filesel.cpp:867
 msgid "Read-only"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:866
+#: src/emu/ui/filesel.cpp:869
 msgid "Read-write"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:867
+#: src/emu/ui/filesel.cpp:870
 msgid "Read this image, write to another image"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:868
+#: src/emu/ui/filesel.cpp:871
 msgid "Read this image, write to diff"
 msgstr ""
 
@@ -648,7 +648,7 @@ msgstr ""
 msgid "[empty]"
 msgstr ""
 
-#: src/emu/ui/info_pty.cpp:26 src/emu/ui/mainmenu.cpp:91
+#: src/emu/ui/info_pty.cpp:26 src/emu/ui/mainmenu.cpp:96
 msgid "Pseudo terminals"
 msgstr ""
 
@@ -664,7 +664,7 @@ msgstr ""
 msgid "Other Controls"
 msgstr ""
 
-#: src/emu/ui/inputmap.cpp:622 src/emu/ui/miscmenu.cpp:91
+#: src/emu/ui/inputmap.cpp:622 src/emu/ui/miscmenu.cpp:92
 #: src/emu/ui/slotopt.cpp:172
 msgid "Reset"
 msgstr ""
@@ -697,27 +697,27 @@ msgstr ""
 msgid "Machine Information"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:78
+#: src/emu/ui/mainmenu.cpp:80
 msgid "Image Information"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:81
+#: src/emu/ui/mainmenu.cpp:83
 msgid "File Manager"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:86
+#: src/emu/ui/mainmenu.cpp:92
 msgid "Tape Control"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:94
+#: src/emu/ui/mainmenu.cpp:99
 msgid "Bios Selection"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:100
+#: src/emu/ui/mainmenu.cpp:104
 msgid "Slot Devices"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:107
+#: src/emu/ui/mainmenu.cpp:109
 msgid "Barcode Reader"
 msgstr ""
 
@@ -725,43 +725,43 @@ msgstr ""
 msgid "Network Devices"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:119
+#: src/emu/ui/mainmenu.cpp:118
 msgid "Keyboard Mode"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:122
+#: src/emu/ui/mainmenu.cpp:121
 msgid "Slider Controls"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:125
+#: src/emu/ui/mainmenu.cpp:124
 msgid "Video Options"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:129
+#: src/emu/ui/mainmenu.cpp:128
 msgid "Crosshair Options"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:133
+#: src/emu/ui/mainmenu.cpp:132
 msgid "Cheat"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:136
+#: src/emu/ui/mainmenu.cpp:135
 msgid "Plugin Options"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:140
+#: src/emu/ui/mainmenu.cpp:139
 msgid "External DAT View"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:146
+#: src/emu/ui/mainmenu.cpp:145 src/emu/ui/miscmenu.cpp:785
 msgid "Add To Favorites"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:148
+#: src/emu/ui/mainmenu.cpp:147 src/emu/ui/miscmenu.cpp:787
 msgid "Remove From Favorites"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:155
+#: src/emu/ui/mainmenu.cpp:154
 msgid "Select New Machine"
 msgstr ""
 
@@ -801,189 +801,205 @@ msgstr ""
 msgid "Return to Previous Menu"
 msgstr ""
 
-#: src/emu/ui/menu.cpp:716
+#: src/emu/ui/menu.cpp:761
 msgid "Auto"
 msgstr ""
 
-#: src/emu/ui/menu.cpp:2133
+#: src/emu/ui/menu.cpp:2195
 msgid "Images"
 msgstr ""
 
-#: src/emu/ui/menu.cpp:2134
+#: src/emu/ui/menu.cpp:2196
 msgid "Infos"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Keyboard Mode:"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Natural"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Emulated"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:240
+#: src/emu/ui/miscmenu.cpp:241
 #, c-format
 msgid ""
 "Uptime: %1$d:%2$02d:%3$02d\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:242
+#: src/emu/ui/miscmenu.cpp:243
 #, c-format
 msgid ""
 "Uptime: %1$d:%2$02d\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:246
+#: src/emu/ui/miscmenu.cpp:247
 #, c-format
 msgid ""
 "Tickets dispensed: %1$d\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:257
+#: src/emu/ui/miscmenu.cpp:258
 msgid "Coin %1$c: NA%3$s\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:257
+#: src/emu/ui/miscmenu.cpp:258
 #, c-format
 msgid "Coin %1$c: %2$d%3$s\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:260
+#: src/emu/ui/miscmenu.cpp:261
 msgid " (locked)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:519
+#: src/emu/ui/miscmenu.cpp:520
 msgid "Visible Delay"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:617
+#: src/emu/ui/miscmenu.cpp:619
 #, c-format
 msgid "%s.xml saved under ui folder."
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:645
+#: src/emu/ui/miscmenu.cpp:647
 msgid "Name:             Description:\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:657
+#: src/emu/ui/miscmenu.cpp:659
 #, c-format
 msgid "%s.txt saved under ui folder."
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:675
-msgid "Export XML format (like -listxml)"
+#: src/emu/ui/miscmenu.cpp:677
+msgid "Export list in XML format (like -listxml)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:676
-msgid "Export TXT format (like -listfull)"
+#: src/emu/ui/miscmenu.cpp:678
+msgid "Export list in XML format (like -listxml, but exclude devices)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:734
-msgid "Dummy"
+#: src/emu/ui/miscmenu.cpp:679
+msgid "Export list in TXT format (like -listfull)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:736
-msgid "Save machine configuration"
-msgstr ""
-
-#: src/emu/ui/miscmenu.cpp:848 src/emu/ui/miscmenu.cpp:869
-#: src/emu/ui/selgame.cpp:594
-msgid "Plugins"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:218
-msgid "Filter"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:226
-msgid " ^!File"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:231
-msgid " ^!Category"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:254
-msgid "^!Setup custom filter"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:262
-msgid "Customize UI"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:263
-msgid "Configure Directories"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:266 src/emu/ui/sndmenu.cpp:151
-#: src/emu/ui/sndmenu.cpp:172
-msgid "Sound Options"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:269
-msgid "General Inputs"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:272
-msgid "Save Configuration"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:286 src/emu/ui/optsmenu.cpp:307
-msgid "Settings"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:327
-msgid "**Error saving ui.ini**"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:374
-#, c-format
-msgid "**Error saving %s.ini**"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:378
+#: src/emu/ui/miscmenu.cpp:729 src/emu/ui/optsmenu.cpp:376
 msgid ""
 "\n"
 "    Configuration saved    \n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/selector.cpp:166
+#: src/emu/ui/miscmenu.cpp:774
+msgid "Bios"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:776
+msgid "Driver"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:790
+msgid "Save machine configuration"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:806
+msgid "Configure machine:"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:868 src/emu/ui/selsoft.cpp:109
+msgid " (default)"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:953 src/emu/ui/miscmenu.cpp:973
+#: src/emu/ui/selgame.cpp:600
+msgid "Plugins"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:217
+msgid "Filter"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:225
+msgid " ^!File"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:230
+msgid " ^!Category"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:253
+msgid "^!Setup custom filter"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:261
+msgid "Customize UI"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:262
+msgid "Configure Directories"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:265 src/emu/ui/sndmenu.cpp:149
+#: src/emu/ui/sndmenu.cpp:169
+msgid "Sound Options"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:268
+msgid "General Inputs"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:271
+msgid "Save Configuration"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:285 src/emu/ui/optsmenu.cpp:305
+msgid "Settings"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:325
+msgid "**Error saving ui.ini**"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:372
+#, c-format
+msgid "**Error saving %s.ini**"
+msgstr ""
+
+#: src/emu/ui/selector.cpp:165
 msgid "Selection List - Search: "
 msgstr ""
 
-#: src/emu/ui/selector.cpp:196
+#: src/emu/ui/selector.cpp:194
 #, c-format
 msgid "Double click or press %1$s to select"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:39
+#: src/emu/ui/selgame.cpp:38
 msgid "General Info"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:374 src/emu/ui/selsoft.cpp:282
+#: src/emu/ui/selgame.cpp:380 src/emu/ui/selsoft.cpp:281
 #, c-format
 msgid ""
 "%s\n"
 " added to favorites list."
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:380 src/emu/ui/selgame.cpp:389
-#: src/emu/ui/selsoft.cpp:287
+#: src/emu/ui/selgame.cpp:386 src/emu/ui/selgame.cpp:395
+#: src/emu/ui/selsoft.cpp:286
 #, c-format
 msgid ""
 "%s\n"
 " removed from favorites list."
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:450
+#: src/emu/ui/selgame.cpp:457
 msgid ""
 "The selected machine is missing one or more required ROM or CHD images. "
 "Please select a different machine.\n"
@@ -991,275 +1007,275 @@ msgid ""
 "Press any key to continue."
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:589 src/emu/ui/simpleselgame.cpp:265
+#: src/emu/ui/selgame.cpp:595 src/emu/ui/simpleselgame.cpp:265
 msgid "Configure Options"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:752
+#: src/emu/ui/selgame.cpp:596
+msgid "Configure Machine"
+msgstr ""
+
+#: src/emu/ui/selgame.cpp:758
 #, c-format
 msgid "%1$s %2$s ( %3$d / %4$d machines (%5$d BIOS) )"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:762
+#: src/emu/ui/selgame.cpp:768
 #, c-format
 msgid "%1$s (%2$s - %3$s) - "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:769 src/emu/ui/selgame.cpp:775
+#: src/emu/ui/selgame.cpp:775 src/emu/ui/selgame.cpp:781
 #, c-format
 msgid "%1$s (%2$s) - "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:784
+#: src/emu/ui/selgame.cpp:790
 #, c-format
 msgid "%1$s Search: %2$s_"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:838
+#: src/emu/ui/selgame.cpp:844
 #, c-format
 msgid "Romset: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:841 src/emu/ui/selgame.cpp:890
-#: src/emu/ui/selsoft.cpp:751 src/emu/ui/selsoft.cpp:801
+#: src/emu/ui/selgame.cpp:847 src/emu/ui/selgame.cpp:896
+#: src/emu/ui/selsoft.cpp:750 src/emu/ui/selsoft.cpp:800
 #: src/emu/ui/simpleselgame.cpp:328
 #, c-format
 msgid "%1$s, %2$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:847 src/emu/ui/selsoft.cpp:757
+#: src/emu/ui/selgame.cpp:853 src/emu/ui/selsoft.cpp:756
 #, c-format
 msgid "Driver is clone of: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:849 src/emu/ui/selsoft.cpp:759
+#: src/emu/ui/selgame.cpp:855 src/emu/ui/selsoft.cpp:758
 msgid "Driver is parent"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:853 src/emu/ui/selsoft.cpp:763
+#: src/emu/ui/selgame.cpp:859 src/emu/ui/selsoft.cpp:762
 #: src/emu/ui/simpleselgame.cpp:335
 msgid "Overall: NOT WORKING"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:855 src/emu/ui/selsoft.cpp:765
+#: src/emu/ui/selgame.cpp:861 src/emu/ui/selsoft.cpp:764
 #: src/emu/ui/simpleselgame.cpp:337
 msgid "Overall: Unemulated Protection"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:857 src/emu/ui/selsoft.cpp:767
+#: src/emu/ui/selgame.cpp:863 src/emu/ui/selsoft.cpp:766
 #: src/emu/ui/simpleselgame.cpp:339
 msgid "Overall: Working"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:861 src/emu/ui/selsoft.cpp:771
+#: src/emu/ui/selgame.cpp:867 src/emu/ui/selsoft.cpp:770
 msgid "Graphics: Imperfect, "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:863 src/emu/ui/selsoft.cpp:773
+#: src/emu/ui/selgame.cpp:869 src/emu/ui/selsoft.cpp:772
 msgid "Graphics: OK, "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:866 src/emu/ui/selsoft.cpp:776
+#: src/emu/ui/selgame.cpp:872 src/emu/ui/selsoft.cpp:775
 msgid "Sound: Unimplemented"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:868 src/emu/ui/selsoft.cpp:778
+#: src/emu/ui/selgame.cpp:874 src/emu/ui/selsoft.cpp:777
 msgid "Sound: Imperfect"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:870 src/emu/ui/selsoft.cpp:780
+#: src/emu/ui/selgame.cpp:876 src/emu/ui/selsoft.cpp:779
 msgid "Sound: OK"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:887
+#: src/emu/ui/selgame.cpp:893
 #, c-format
 msgid "System: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:894 src/emu/ui/selsoft.cpp:805
+#: src/emu/ui/selgame.cpp:900 src/emu/ui/selsoft.cpp:804
 #, c-format
 msgid "Software is clone of: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:896 src/emu/ui/selsoft.cpp:807
+#: src/emu/ui/selgame.cpp:902 src/emu/ui/selsoft.cpp:806
 msgid "Software is parent"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:901 src/emu/ui/selsoft.cpp:812
+#: src/emu/ui/selgame.cpp:907 src/emu/ui/selsoft.cpp:811
 msgid "Supported: No"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:906 src/emu/ui/selsoft.cpp:817
+#: src/emu/ui/selgame.cpp:912 src/emu/ui/selsoft.cpp:816
 msgid "Supported: Partial"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:911 src/emu/ui/selsoft.cpp:822
+#: src/emu/ui/selgame.cpp:917 src/emu/ui/selsoft.cpp:821
 msgid "Supported: Yes"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:916 src/emu/ui/selsoft.cpp:827
+#: src/emu/ui/selgame.cpp:922 src/emu/ui/selsoft.cpp:826
 #, c-format
 msgid "romset: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:923
+#: src/emu/ui/selgame.cpp:929
 #, c-format
 msgid "%1$s %2$s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1535
+#: src/emu/ui/selgame.cpp:1543
 #, c-format
 msgid "Romset: %1$-.100s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1536
+#: src/emu/ui/selgame.cpp:1544
 #, c-format
 msgid "Year: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1537
+#: src/emu/ui/selgame.cpp:1545
 #, c-format
 msgid "Manufacturer: %1$-.100s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1541
+#: src/emu/ui/selgame.cpp:1549
 #, c-format
 msgid "Driver is Clone of: %1$-.100s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1543
+#: src/emu/ui/selgame.cpp:1551
 msgid "Driver is Parent\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1546
+#: src/emu/ui/selgame.cpp:1554
 msgid "Overall: NOT WORKING\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1548
+#: src/emu/ui/selgame.cpp:1556
 msgid "Overall: Unemulated Protection\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1550
+#: src/emu/ui/selgame.cpp:1558
 msgid "Overall: Working\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1553
+#: src/emu/ui/selgame.cpp:1561
 msgid "Graphics: Imperfect Colors\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1557
+#: src/emu/ui/selgame.cpp:1565
 msgid "Graphics: Imperfect\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1559
+#: src/emu/ui/selgame.cpp:1567
 msgid "Graphics: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1562
+#: src/emu/ui/selgame.cpp:1570
 msgid "Sound: Unimplemented\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1564
+#: src/emu/ui/selgame.cpp:1572
 msgid "Sound: Imperfect\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1566
+#: src/emu/ui/selgame.cpp:1574
 msgid "Sound: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1568
+#: src/emu/ui/selgame.cpp:1576
 #, c-format
 msgid "Driver is Skeleton: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1569
+#: src/emu/ui/selgame.cpp:1577
 #, c-format
 msgid "Game is Mechanical: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1570
+#: src/emu/ui/selgame.cpp:1578
 #, c-format
 msgid "Requires Artwork: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1571
+#: src/emu/ui/selgame.cpp:1579
 #, c-format
 msgid "Requires Clickable Artwork: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1572
+#: src/emu/ui/selgame.cpp:1580
 #, c-format
 msgid "Support Cocktail: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1573
+#: src/emu/ui/selgame.cpp:1581
 #, c-format
 msgid "Driver is Bios: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1574
+#: src/emu/ui/selgame.cpp:1582
 #, c-format
 msgid "Support Save: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 #, c-format
 msgid "Screen Orientation: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 msgid "Vertical"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 msgid "Horizontal"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/selgame.cpp:1591
 #, c-format
 msgid "Requires CHD: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1596
+#: src/emu/ui/selgame.cpp:1604
 msgid "Roms Audit Pass: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1598
+#: src/emu/ui/selgame.cpp:1606
 msgid "Roms Audit Pass: BAD\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1601
+#: src/emu/ui/selgame.cpp:1609
 msgid "Samples Audit Pass: None Needed\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1603
+#: src/emu/ui/selgame.cpp:1611
 msgid "Samples Audit Pass: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1605
+#: src/emu/ui/selgame.cpp:1613
 msgid "Samples Audit Pass: BAD\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1608
+#: src/emu/ui/selgame.cpp:1616
 msgid ""
 "Roms Audit Pass: Disabled\n"
 "Samples Audit Pass: Disabled\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:2049 src/emu/ui/selgame.cpp:2212
-#: src/emu/ui/selsoft.cpp:1662
+#: src/emu/ui/selgame.cpp:2055 src/emu/ui/selgame.cpp:2216
+#: src/emu/ui/selsoft.cpp:1655
 msgid "No Infos Available"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:2162 src/emu/ui/selsoft.cpp:1607
+#: src/emu/ui/selgame.cpp:2168 src/emu/ui/selsoft.cpp:1602
 msgid "Usage"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:110
-msgid " (default)"
-msgstr ""
-
-#: src/emu/ui/selsoft.cpp:381
+#: src/emu/ui/selsoft.cpp:380
 msgid ""
 "The selected software is missing one or more required files. Please select a "
 "different software.\n"
@@ -1267,57 +1283,57 @@ msgid ""
 "Press any key to continue."
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:684
+#: src/emu/ui/selsoft.cpp:683
 #, c-format
-msgid "%1$s %2$s ( %3$d / %4$d softwares )"
+msgid "%1$s %2$s ( %3$d / %4$d software packages )"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:685
+#: src/emu/ui/selsoft.cpp:684
 #, c-format
 msgid "Driver: \"%1$s\" software list "
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:688
+#: src/emu/ui/selsoft.cpp:687
 #, c-format
 msgid "Region: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:690
+#: src/emu/ui/selsoft.cpp:689
 #, c-format
 msgid "Publisher: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:692
+#: src/emu/ui/selsoft.cpp:691
 #, c-format
 msgid "Year: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:694
+#: src/emu/ui/selsoft.cpp:693
 #, c-format
 msgid "Software List: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:696
+#: src/emu/ui/selsoft.cpp:695
 #, c-format
 msgid "Device type: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:698
+#: src/emu/ui/selsoft.cpp:697
 #, c-format
 msgid "%s Search: %s_"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:748 src/emu/ui/selsoft.cpp:798
+#: src/emu/ui/selsoft.cpp:747 src/emu/ui/selsoft.cpp:797
 #: src/emu/ui/simpleselgame.cpp:325
 #, c-format
 msgid "%1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:1998 src/emu/ui/selsoft.cpp:2018
+#: src/emu/ui/selsoft.cpp:1991 src/emu/ui/selsoft.cpp:2011
 msgid "Software part selection:"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:2136 src/emu/ui/selsoft.cpp:2156
+#: src/emu/ui/selsoft.cpp:2129 src/emu/ui/selsoft.cpp:2149
 msgid "Bios selection:"
 msgstr ""
 
@@ -1365,15 +1381,15 @@ msgstr ""
 msgid " [internal]"
 msgstr ""
 
-#: src/emu/ui/sndmenu.cpp:135
+#: src/emu/ui/sndmenu.cpp:133
 msgid "Sound"
 msgstr ""
 
-#: src/emu/ui/sndmenu.cpp:136
+#: src/emu/ui/sndmenu.cpp:134
 msgid "Sample Rate"
 msgstr ""
 
-#: src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/sndmenu.cpp:135
 msgid "Use External Samples"
 msgstr ""
 
@@ -1442,80 +1458,80 @@ msgstr ""
 msgid "Fast Forward"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:419
+#: src/emu/ui/ui.cpp:418
 msgid "This driver requires images to be loaded in the following device(s): "
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1074
+#: src/emu/ui/ui.cpp:1071
 msgid ""
 "One or more ROMs/CHDs for this machine are incorrect. The machine may not "
 "run correctly.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1087
+#: src/emu/ui/ui.cpp:1084
 msgid ""
 "There are known problems with this machine\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1091
+#: src/emu/ui/ui.cpp:1088
 msgid ""
 "One or more ROMs/CHDs for this machine have not been correctly dumped.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1095
+#: src/emu/ui/ui.cpp:1092
 #, c-format
 msgid "The keyboard emulation may not be 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1097
+#: src/emu/ui/ui.cpp:1094
 #, c-format
 msgid "The colors aren't 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1099
+#: src/emu/ui/ui.cpp:1096
 msgid "The colors are completely wrong.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1101
+#: src/emu/ui/ui.cpp:1098
 #, c-format
 msgid "The video emulation isn't 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1103
+#: src/emu/ui/ui.cpp:1100
 #, c-format
 msgid "The sound emulation isn't 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1105
+#: src/emu/ui/ui.cpp:1102
 msgid "The machine lacks sound.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1108
+#: src/emu/ui/ui.cpp:1105
 msgid "Screen flipping in cocktail mode is not supported.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1112
+#: src/emu/ui/ui.cpp:1109
 msgid "The machine requires external artwork files\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1117
+#: src/emu/ui/ui.cpp:1114
 msgid ""
 "This machine was never completed. It may exhibit strange behavior or missing "
 "elements that are not bugs in the emulation.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1122
+#: src/emu/ui/ui.cpp:1119
 msgid ""
 "This machine has no sound hardware, MAME will produce no sounds, this is "
 "expected behaviour.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1130
+#: src/emu/ui/ui.cpp:1127
 msgid "The machine has protection which isn't fully emulated.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1133
+#: src/emu/ui/ui.cpp:1130
 msgid ""
 "\n"
 "THIS MACHINE DOESN'T WORK. The emulation for this machine is not yet "
@@ -1523,7 +1539,7 @@ msgid ""
 "the developers to improve the emulation.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1137
+#: src/emu/ui/ui.cpp:1134
 msgid ""
 "\n"
 "Certain elements of this machine cannot be emulated as it requires actual "
@@ -1531,21 +1547,21 @@ msgid ""
 "to fully play this machine.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1156
+#: src/emu/ui/ui.cpp:1153
 msgid ""
 "\n"
 "\n"
 "There are working clones of this machine: "
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1170
+#: src/emu/ui/ui.cpp:1167
 msgid ""
 "\n"
 "\n"
 "Press any key to continue"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1185
+#: src/emu/ui/ui.cpp:1182
 #, c-format
 msgid ""
 "%1$s\n"
@@ -1555,98 +1571,98 @@ msgid ""
 "CPU:\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1221 src/emu/ui/ui.cpp:1260
+#: src/emu/ui/ui.cpp:1218 src/emu/ui/ui.cpp:1257
 msgid "MHz"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1221 src/emu/ui/ui.cpp:1260
+#: src/emu/ui/ui.cpp:1218 src/emu/ui/ui.cpp:1257
 msgid "kHz"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1235
+#: src/emu/ui/ui.cpp:1232
 msgid ""
 "\n"
 "Sound:\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1264
+#: src/emu/ui/ui.cpp:1261
 msgid ""
 "\n"
 "Video:\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1268
+#: src/emu/ui/ui.cpp:1265
 msgid "None\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1275
+#: src/emu/ui/ui.cpp:1272
 msgid "Vector"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1286
+#: src/emu/ui/ui.cpp:1283
 #, c-format
 msgid "%1$s: %2$s\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1286
+#: src/emu/ui/ui.cpp:1283
 msgid "%2$s\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1541 src/emu/ui/ui.cpp:1551
+#: src/emu/ui/ui.cpp:1538 src/emu/ui/ui.cpp:1548
 msgid "Keyboard Emulation Status"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1543
+#: src/emu/ui/ui.cpp:1540
 msgid "Mode: PARTIAL Emulation"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1544
+#: src/emu/ui/ui.cpp:1541
 msgid "UI:   Enabled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1546 src/emu/ui/ui.cpp:1556
+#: src/emu/ui/ui.cpp:1543 src/emu/ui/ui.cpp:1553
 msgid "**Use ScrLock to toggle**"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1553
+#: src/emu/ui/ui.cpp:1550
 msgid "Mode: FULL Emulation"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1554
+#: src/emu/ui/ui.cpp:1551
 msgid "UI:   Disabled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1692
+#: src/emu/ui/ui.cpp:1689
 msgid "Autofire can't be enabled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1731
+#: src/emu/ui/ui.cpp:1728
 msgid "Select position to save to"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1733
+#: src/emu/ui/ui.cpp:1730
 msgid "Select position to load from"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1757
+#: src/emu/ui/ui.cpp:1754
 msgid "Save cancelled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1759
+#: src/emu/ui/ui.cpp:1756
 msgid "Load cancelled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1802
+#: src/emu/ui/ui.cpp:1799
 #, c-format
 msgid "Save to position %s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1807
+#: src/emu/ui/ui.cpp:1804
 #, c-format
 msgid "Load from position %s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1847
+#: src/emu/ui/ui.cpp:1844
 #, c-format
 msgid ""
 "Are you sure you want to quit?\n"
@@ -1655,173 +1671,173 @@ msgid ""
 "Press ''%2$s'' to return to emulation."
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1917
+#: src/emu/ui/ui.cpp:1914
 msgid "Master Volume"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1926
+#: src/emu/ui/ui.cpp:1923
 #, c-format
 msgid "%1$s Volume"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1949
+#: src/emu/ui/ui.cpp:1946
 #, c-format
 msgid "Overclock CPU %1$s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1968
+#: src/emu/ui/ui.cpp:1965
 #, c-format
 msgid "%1$s Refresh Rate"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1973
+#: src/emu/ui/ui.cpp:1970
 #, c-format
 msgid "%1$s Brightness"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1975
+#: src/emu/ui/ui.cpp:1972
 #, c-format
 msgid "%1$s Contrast"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1977
+#: src/emu/ui/ui.cpp:1974
 #, c-format
 msgid "%1$s Gamma"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1981
+#: src/emu/ui/ui.cpp:1978
 #, c-format
 msgid "%1$s Horiz Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1983
+#: src/emu/ui/ui.cpp:1980
 #, c-format
 msgid "%1$s Horiz Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1985
+#: src/emu/ui/ui.cpp:1982
 #, c-format
 msgid "%1$s Vert Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1987
+#: src/emu/ui/ui.cpp:1984
 #, c-format
 msgid "%1$s Vert Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2005
+#: src/emu/ui/ui.cpp:2002
 #, c-format
 msgid "Laserdisc '%1$s' Horiz Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2007
+#: src/emu/ui/ui.cpp:2004
 #, c-format
 msgid "Laserdisc '%1$s' Horiz Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2009
+#: src/emu/ui/ui.cpp:2006
 #, c-format
 msgid "Laserdisc '%1$s' Vert Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2011
+#: src/emu/ui/ui.cpp:2008
 #, c-format
 msgid "Laserdisc '%1$s' Vert Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2021
+#: src/emu/ui/ui.cpp:2018
 msgid "Vector Flicker"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2022
+#: src/emu/ui/ui.cpp:2019
 msgid "Beam Width Minimum"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2023
+#: src/emu/ui/ui.cpp:2020
 msgid "Beam Width Maximum"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2024
+#: src/emu/ui/ui.cpp:2021
 msgid "Beam Intensity Weight"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2037
+#: src/emu/ui/ui.cpp:2034
 #, c-format
 msgid "Crosshair Scale %1$s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2037 src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2034 src/emu/ui/ui.cpp:2036
 msgid "X"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2037 src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2034 src/emu/ui/ui.cpp:2036
 msgid "Y"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2036
 #, c-format
 msgid "Crosshair Offset %1$s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2071
+#: src/emu/ui/ui.cpp:2068
 #, c-format
 msgid "%1$3ddB"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2115
+#: src/emu/ui/ui.cpp:2112
 #, c-format
 msgid "%1$d%%"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2131
+#: src/emu/ui/ui.cpp:2128
 #, c-format
 msgid "%1$3.0f%%"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2154
+#: src/emu/ui/ui.cpp:2151
 #, c-format
 msgid "%1$.3ffps"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2177 src/emu/ui/ui.cpp:2199 src/emu/ui/ui.cpp:2220
-#: src/emu/ui/ui.cpp:2242 src/emu/ui/ui.cpp:2264 src/emu/ui/ui.cpp:2286
-#: src/emu/ui/ui.cpp:2308 src/emu/ui/ui.cpp:2330 src/emu/ui/ui.cpp:2352
-#: src/emu/ui/ui.cpp:2374 src/emu/ui/ui.cpp:2396
+#: src/emu/ui/ui.cpp:2174 src/emu/ui/ui.cpp:2196 src/emu/ui/ui.cpp:2217
+#: src/emu/ui/ui.cpp:2239 src/emu/ui/ui.cpp:2261 src/emu/ui/ui.cpp:2283
+#: src/emu/ui/ui.cpp:2305 src/emu/ui/ui.cpp:2327 src/emu/ui/ui.cpp:2349
+#: src/emu/ui/ui.cpp:2371 src/emu/ui/ui.cpp:2393
 #, c-format
 msgid "%1$.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2412 src/emu/ui/ui.cpp:2428 src/emu/ui/ui.cpp:2444
-#: src/emu/ui/ui.cpp:2460
+#: src/emu/ui/ui.cpp:2408 src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2438
+#: src/emu/ui/ui.cpp:2453
 #, c-format
 msgid "%1$1.2f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2476
+#: src/emu/ui/ui.cpp:2469
 #, c-format
 msgid "Screen '%1$s'"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2478
+#: src/emu/ui/ui.cpp:2471
 msgid "Screen"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2494
+#: src/emu/ui/ui.cpp:2487
 #, c-format
 msgid "Crosshair Scale X %1$1.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2494
+#: src/emu/ui/ui.cpp:2487
 #, c-format
 msgid "Crosshair Scale Y %1$1.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2513
+#: src/emu/ui/ui.cpp:2506
 #, c-format
 msgid "Crosshair Offset X %1$1.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2513
+#: src/emu/ui/ui.cpp:2506
 #, c-format
 msgid "Crosshair Offset Y %1$1.3f"
 msgstr ""
@@ -1863,10 +1879,10 @@ msgstr ""
 msgid "Full"
 msgstr ""
 
-#: src/emu/ui/viewgfx.cpp:392
+#: src/emu/ui/viewgfx.cpp:391
 msgid " COLORS"
 msgstr ""
 
-#: src/emu/ui/viewgfx.cpp:392
+#: src/emu/ui/viewgfx.cpp:391
 msgid " PENS"
 msgstr ""
diff --git a/language/French_Belgium/strings.po b/language/French_Belgium/strings.po
index cbdc68051a6..29ded70f5f3 100644
--- a/language/French_Belgium/strings.po
+++ b/language/French_Belgium/strings.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MAME\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-11 03:33+0200\n"
+"POT-Creation-Date: 2016-04-15 17:42+0200\n"
 "PO-Revision-Date: 2016-03-28 23:49+0200\n"
 "Last-Translator: Mevi <mevi.mame@gmail.com>\n"
 "Language-Team: MAME Language Team\n"
@@ -62,14 +62,14 @@ msgstr "Tout recharger"
 msgid "Autofire Status"
 msgstr "Statut du tir automatique"
 
-#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1698
+#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1695
 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211
 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219
 #: src/emu/ui/videoopt.cpp:223
 msgid "Disabled"
 msgstr "Désactivé"
 
-#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1698
+#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1695
 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211
 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219
 #: src/emu/ui/videoopt.cpp:223
@@ -77,14 +77,14 @@ msgid "Enabled"
 msgstr "Activé"
 
 #: src/emu/ui/cheatopt.cpp:282 src/emu/ui/cheatopt.cpp:288
-#: src/emu/ui/menu.cpp:710 src/emu/ui/miscmenu.cpp:831
-#: src/emu/ui/sndmenu.cpp:135 src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/menu.cpp:755 src/emu/ui/miscmenu.cpp:936
+#: src/emu/ui/sndmenu.cpp:133 src/emu/ui/sndmenu.cpp:135
 msgid "On"
 msgstr "Actif"
 
 #: src/emu/ui/cheatopt.cpp:282 src/emu/ui/cheatopt.cpp:288
-#: src/emu/ui/menu.cpp:713 src/emu/ui/miscmenu.cpp:831
-#: src/emu/ui/sndmenu.cpp:135 src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/menu.cpp:758 src/emu/ui/miscmenu.cpp:936
+#: src/emu/ui/sndmenu.cpp:133 src/emu/ui/sndmenu.cpp:135
 msgid "Off"
 msgstr "Inactif"
 
@@ -96,318 +96,318 @@ msgstr "Aucun bouton trouvé sur cette machine !"
 msgid "Autofire Delay"
 msgstr "Attente du tir automatique"
 
-#: src/emu/ui/custmenu.cpp:158 src/emu/ui/custmenu.cpp:447
+#: src/emu/ui/custmenu.cpp:157 src/emu/ui/custmenu.cpp:445
 msgid "Main filter"
 msgstr "Filtre principal"
 
-#: src/emu/ui/custmenu.cpp:167 src/emu/ui/custmenu.cpp:456
+#: src/emu/ui/custmenu.cpp:166 src/emu/ui/custmenu.cpp:454
 msgid "Other filter"
 msgstr "Autre filtre"
 
-#: src/emu/ui/custmenu.cpp:176 src/emu/ui/optsmenu.cpp:239
+#: src/emu/ui/custmenu.cpp:175 src/emu/ui/optsmenu.cpp:238
 msgid "^!Manufacturer"
 msgstr "^!Constructeur"
 
-#: src/emu/ui/custmenu.cpp:185 src/emu/ui/custmenu.cpp:474
-#: src/emu/ui/optsmenu.cpp:247
+#: src/emu/ui/custmenu.cpp:184 src/emu/ui/custmenu.cpp:472
+#: src/emu/ui/optsmenu.cpp:246
 msgid "^!Year"
 msgstr "^!Année"
 
-#: src/emu/ui/custmenu.cpp:194 src/emu/ui/custmenu.cpp:510
+#: src/emu/ui/custmenu.cpp:193 src/emu/ui/custmenu.cpp:508
 msgid "Remove last filter"
 msgstr "Supprimer le dernier filtre"
 
-#: src/emu/ui/custmenu.cpp:197 src/emu/ui/custmenu.cpp:513
+#: src/emu/ui/custmenu.cpp:196 src/emu/ui/custmenu.cpp:511
 msgid "Add filter"
 msgstr "Ajouter un filtre"
 
-#: src/emu/ui/custmenu.cpp:212 src/emu/ui/custmenu.cpp:233
-#: src/emu/ui/custmenu.cpp:529 src/emu/ui/custmenu.cpp:550
+#: src/emu/ui/custmenu.cpp:211 src/emu/ui/custmenu.cpp:231
+#: src/emu/ui/custmenu.cpp:527 src/emu/ui/custmenu.cpp:547
 msgid "Select custom filters:"
 msgstr "Sélectionner les filtres personnalisés :"
 
-#: src/emu/ui/custmenu.cpp:465
+#: src/emu/ui/custmenu.cpp:463
 msgid "^!Publisher"
 msgstr "^!Éditeur"
 
-#: src/emu/ui/custmenu.cpp:483
+#: src/emu/ui/custmenu.cpp:481
 msgid "^!Software List"
 msgstr "^!Liste de logiciels"
 
-#: src/emu/ui/custmenu.cpp:492
+#: src/emu/ui/custmenu.cpp:490
 msgid "^!Device type"
 msgstr "^!Type de périphérique"
 
-#: src/emu/ui/custmenu.cpp:501
+#: src/emu/ui/custmenu.cpp:499
 msgid "^!Region"
 msgstr "^!Région"
 
-#: src/emu/ui/custui.cpp:23
+#: src/emu/ui/custui.cpp:22
 msgid "Show All"
 msgstr "Tout afficher"
 
-#: src/emu/ui/custui.cpp:24
+#: src/emu/ui/custui.cpp:23
 msgid "Hide Filters"
 msgstr "Cacher les filtres"
 
-#: src/emu/ui/custui.cpp:25
+#: src/emu/ui/custui.cpp:24
 msgid "Hide Info/Image"
 msgstr "Cacher Images/Infos"
 
-#: src/emu/ui/custui.cpp:26
+#: src/emu/ui/custui.cpp:25
 msgid "Hide Both"
 msgstr "Cacher les deux"
 
-#: src/emu/ui/custui.cpp:142
+#: src/emu/ui/custui.cpp:141
 msgid "Fonts"
 msgstr "Polices"
 
-#: src/emu/ui/custui.cpp:143
+#: src/emu/ui/custui.cpp:142
 msgid "Colors"
 msgstr "Couleurs"
 
-#: src/emu/ui/custui.cpp:148 src/emu/ui/dirmenu.cpp:33
+#: src/emu/ui/custui.cpp:147 src/emu/ui/dirmenu.cpp:33
 msgid "Language"
 msgstr "Langue"
 
-#: src/emu/ui/custui.cpp:152
+#: src/emu/ui/custui.cpp:151
 msgid "Show side panels"
 msgstr "Afficher les panneaux latéraux"
 
-#: src/emu/ui/custui.cpp:167 src/emu/ui/custui.cpp:188
+#: src/emu/ui/custui.cpp:166 src/emu/ui/custui.cpp:186
 msgid "Custom UI Settings"
 msgstr "Paramètres personnalisés de l'interface"
 
-#: src/emu/ui/custui.cpp:246
+#: src/emu/ui/custui.cpp:244
 msgid "default"
 msgstr "par défaut"
 
-#: src/emu/ui/custui.cpp:349
+#: src/emu/ui/custui.cpp:347
 msgid "UI Font"
 msgstr "Police de l'interface"
 
-#: src/emu/ui/custui.cpp:354
+#: src/emu/ui/custui.cpp:352
 msgid "Bold"
 msgstr "Gras"
 
-#: src/emu/ui/custui.cpp:355
+#: src/emu/ui/custui.cpp:353
 msgid "Italic"
 msgstr "Italique"
 
-#: src/emu/ui/custui.cpp:360
+#: src/emu/ui/custui.cpp:358
 msgid "Lines"
 msgstr "Lignes"
 
-#: src/emu/ui/custui.cpp:366
+#: src/emu/ui/custui.cpp:364
 msgid "Infos text size"
 msgstr "Taille du texte des infos"
 
-#: src/emu/ui/custui.cpp:383
+#: src/emu/ui/custui.cpp:381
 msgid "UI Fonts Settings"
 msgstr "Paramètres des polices de l'interface"
 
-#: src/emu/ui/custui.cpp:411
+#: src/emu/ui/custui.cpp:408
 msgid "Sample text - Lorem ipsum dolor sit amet, consectetur adipiscing elit."
 msgstr ""
 "Exemple de texte - Lorem ipsum dolor sit amet, consectetur adipiscing elit."
 
-#: src/emu/ui/custui.cpp:509
+#: src/emu/ui/custui.cpp:506
 msgid "Normal text"
 msgstr "Texte normal"
 
-#: src/emu/ui/custui.cpp:510
+#: src/emu/ui/custui.cpp:507
 msgid "Selected color"
 msgstr "Couleur sélectionnée"
 
-#: src/emu/ui/custui.cpp:511
+#: src/emu/ui/custui.cpp:508
 msgid "Normal text background"
 msgstr "Arrière-plan du texte normal"
 
-#: src/emu/ui/custui.cpp:512
+#: src/emu/ui/custui.cpp:509
 msgid "Selected background color"
 msgstr "Couleur de fond sélectionnée"
 
-#: src/emu/ui/custui.cpp:513
+#: src/emu/ui/custui.cpp:510
 msgid "Subitem color"
 msgstr "Couleur du sous-élément"
 
-#: src/emu/ui/custui.cpp:514 src/emu/ui/custui.cpp:610
+#: src/emu/ui/custui.cpp:511 src/emu/ui/custui.cpp:606
 msgid "Clone"
 msgstr "Clone"
 
-#: src/emu/ui/custui.cpp:515
+#: src/emu/ui/custui.cpp:512
 msgid "Border"
 msgstr "Bordure"
 
-#: src/emu/ui/custui.cpp:516
+#: src/emu/ui/custui.cpp:513
 msgid "Background"
 msgstr "Arrière-plan"
 
-#: src/emu/ui/custui.cpp:517
+#: src/emu/ui/custui.cpp:514
 msgid "Dipswitch"
 msgstr "DIP Switch"
 
-#: src/emu/ui/custui.cpp:518
+#: src/emu/ui/custui.cpp:515
 msgid "Unavailable color"
 msgstr "Couleur non disponible"
 
-#: src/emu/ui/custui.cpp:519
+#: src/emu/ui/custui.cpp:516
 msgid "Slider color"
 msgstr "Couleur du curseur"
 
-#: src/emu/ui/custui.cpp:520
+#: src/emu/ui/custui.cpp:517
 msgid "Gfx viewer background"
 msgstr "Arrière-plan du visualiseur GFX"
 
-#: src/emu/ui/custui.cpp:521
+#: src/emu/ui/custui.cpp:518
 msgid "Mouse over color"
 msgstr "Couleur lors du passage de la souris"
 
-#: src/emu/ui/custui.cpp:522
+#: src/emu/ui/custui.cpp:519
 msgid "Mouse over background color"
 msgstr "Couleur de fond lors du passage de la souris"
 
-#: src/emu/ui/custui.cpp:523
+#: src/emu/ui/custui.cpp:520
 msgid "Mouse down color"
 msgstr "Couleur lorsque le bouton de la souris est enfoncé"
 
-#: src/emu/ui/custui.cpp:524
+#: src/emu/ui/custui.cpp:521
 msgid "Mouse down background color"
 msgstr "Couleur de fond lorsque le bouton de la souris est enfoncé"
 
-#: src/emu/ui/custui.cpp:527
+#: src/emu/ui/custui.cpp:524
 msgid "Restore originals colors"
 msgstr "Restaurer les couleurs d'origine"
 
-#: src/emu/ui/custui.cpp:543
+#: src/emu/ui/custui.cpp:540
 msgid "UI Colors Settings"
 msgstr "Paramètres des couleurs de l'interface"
 
-#: src/emu/ui/custui.cpp:572
+#: src/emu/ui/custui.cpp:568
 #, c-format
 msgid "Double click or press %1$s to change the color value"
 msgstr ""
 "Double-cliquez ou appuyez sur %1$s pour changer la valeur de la couleur"
 
-#: src/emu/ui/custui.cpp:598
+#: src/emu/ui/custui.cpp:594
 msgid "Menu Preview"
 msgstr "Aperçu du menu"
 
-#: src/emu/ui/custui.cpp:606
+#: src/emu/ui/custui.cpp:602
 msgid "Normal"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:607
+#: src/emu/ui/custui.cpp:603
 msgid "Subitem"
 msgstr "Sous-élément"
 
-#: src/emu/ui/custui.cpp:608
+#: src/emu/ui/custui.cpp:604
 msgid "Selected"
 msgstr "Sélectionné"
 
-#: src/emu/ui/custui.cpp:609
+#: src/emu/ui/custui.cpp:605
 msgid "Mouse Over"
 msgstr "Passage de la souris"
 
-#: src/emu/ui/custui.cpp:841 src/emu/ui/custui.cpp:844
+#: src/emu/ui/custui.cpp:837 src/emu/ui/custui.cpp:840
 msgid "Alpha"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:849 src/emu/ui/custui.cpp:852
-#: src/emu/ui/custui.cpp:1013
+#: src/emu/ui/custui.cpp:845 src/emu/ui/custui.cpp:848
+#: src/emu/ui/custui.cpp:1007
 msgid "Red"
 msgstr "Rouge"
 
-#: src/emu/ui/custui.cpp:857 src/emu/ui/custui.cpp:860
-#: src/emu/ui/custui.cpp:1016
+#: src/emu/ui/custui.cpp:853 src/emu/ui/custui.cpp:856
+#: src/emu/ui/custui.cpp:1010
 msgid "Green"
 msgstr "Vert"
 
-#: src/emu/ui/custui.cpp:865 src/emu/ui/custui.cpp:868
-#: src/emu/ui/custui.cpp:1017
+#: src/emu/ui/custui.cpp:861 src/emu/ui/custui.cpp:864
+#: src/emu/ui/custui.cpp:1011
 msgid "Blue"
 msgstr "Bleu"
 
-#: src/emu/ui/custui.cpp:871
+#: src/emu/ui/custui.cpp:867
 msgid "Choose from palette"
 msgstr "Choisir parmi la palette"
 
-#: src/emu/ui/custui.cpp:887
+#: src/emu/ui/custui.cpp:883
 msgid " - ARGB Settings"
 msgstr " - Paramètres ARVB"
 
-#: src/emu/ui/custui.cpp:912
+#: src/emu/ui/custui.cpp:907
 msgid "Color preview ="
 msgstr "Aperçu de la couleur ="
 
-#: src/emu/ui/custui.cpp:1009
+#: src/emu/ui/custui.cpp:1003
 msgid "White"
 msgstr "Blanc"
 
-#: src/emu/ui/custui.cpp:1010
+#: src/emu/ui/custui.cpp:1004
 msgid "Silver"
 msgstr "Argent"
 
-#: src/emu/ui/custui.cpp:1011
+#: src/emu/ui/custui.cpp:1005
 msgid "Gray"
 msgstr "Gris"
 
-#: src/emu/ui/custui.cpp:1012
+#: src/emu/ui/custui.cpp:1006
 msgid "Black"
 msgstr "Noir"
 
-#: src/emu/ui/custui.cpp:1014
+#: src/emu/ui/custui.cpp:1008
 msgid "Orange"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1015
+#: src/emu/ui/custui.cpp:1009
 msgid "Yellow"
 msgstr "Jaune"
 
-#: src/emu/ui/custui.cpp:1018
+#: src/emu/ui/custui.cpp:1012
 msgid "Violet"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:65
+#: src/emu/ui/datmenu.cpp:64
 msgid "Software History"
 msgstr "Historique du logiciel"
 
-#: src/emu/ui/datmenu.cpp:67
+#: src/emu/ui/datmenu.cpp:66
 msgid "Software Usage"
 msgstr "Utilisation du logiciel"
 
-#: src/emu/ui/datmenu.cpp:199
+#: src/emu/ui/datmenu.cpp:196
 msgid "Revision: "
 msgstr "Révision : "
 
-#: src/emu/ui/datmenu.cpp:287 src/emu/ui/selgame.cpp:40
-#: src/emu/ui/selgame.cpp:2152 src/emu/ui/selgame.cpp:2161
-#: src/emu/ui/selsoft.cpp:1577 src/emu/ui/selsoft.cpp:1597
-#: src/emu/ui/selsoft.cpp:1606
+#: src/emu/ui/datmenu.cpp:284 src/emu/ui/selgame.cpp:39
+#: src/emu/ui/selgame.cpp:2158 src/emu/ui/selgame.cpp:2167
+#: src/emu/ui/selsoft.cpp:1574 src/emu/ui/selsoft.cpp:1592
+#: src/emu/ui/selsoft.cpp:1601
 msgid "History"
 msgstr "Aperçu history.dat"
 
-#: src/emu/ui/datmenu.cpp:289 src/emu/ui/selgame.cpp:41
+#: src/emu/ui/datmenu.cpp:286 src/emu/ui/selgame.cpp:40
 msgid "Mameinfo"
 msgstr "Aperçu mameinfo.dat"
 
-#: src/emu/ui/datmenu.cpp:291 src/emu/ui/selgame.cpp:43
+#: src/emu/ui/datmenu.cpp:288 src/emu/ui/selgame.cpp:42
 msgid "Messinfo"
 msgstr "Aperçu messinfo.dat"
 
-#: src/emu/ui/datmenu.cpp:293 src/emu/ui/selgame.cpp:42
+#: src/emu/ui/datmenu.cpp:290 src/emu/ui/selgame.cpp:41
 msgid "Sysinfo"
 msgstr "Aperçu sysinfo.dat"
 
-#: src/emu/ui/datmenu.cpp:295 src/emu/ui/selgame.cpp:46
+#: src/emu/ui/datmenu.cpp:292 src/emu/ui/selgame.cpp:45
 msgid "Mamescore"
 msgstr "Aperçu story.dat"
 
-#: src/emu/ui/datmenu.cpp:297 src/emu/ui/selgame.cpp:45
+#: src/emu/ui/datmenu.cpp:294 src/emu/ui/selgame.cpp:44
 msgid "Gameinit"
 msgstr "Aperçu gameinit.dat"
 
-#: src/emu/ui/datmenu.cpp:299 src/emu/ui/selgame.cpp:44
+#: src/emu/ui/datmenu.cpp:296 src/emu/ui/selgame.cpp:43
 msgid "Command"
 msgstr "Aperçu command.dat"
 
@@ -559,75 +559,75 @@ msgstr "Appuyez sur TAB pour définir"
 msgid "Remove %1$s Folder"
 msgstr "Supprimer le dossier %1$s"
 
-#: src/emu/ui/filesel.cpp:158
+#: src/emu/ui/filesel.cpp:161
 msgid "File Already Exists - Override?"
 msgstr "Ce fichier existe déjà - Écraser ?"
 
-#: src/emu/ui/filesel.cpp:160 src/emu/ui/selgame.cpp:1568
-#: src/emu/ui/selgame.cpp:1569 src/emu/ui/selgame.cpp:1570
-#: src/emu/ui/selgame.cpp:1571 src/emu/ui/selgame.cpp:1572
-#: src/emu/ui/selgame.cpp:1573 src/emu/ui/selgame.cpp:1574
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/filesel.cpp:163 src/emu/ui/selgame.cpp:1576
+#: src/emu/ui/selgame.cpp:1577 src/emu/ui/selgame.cpp:1578
+#: src/emu/ui/selgame.cpp:1579 src/emu/ui/selgame.cpp:1580
+#: src/emu/ui/selgame.cpp:1581 src/emu/ui/selgame.cpp:1582
+#: src/emu/ui/selgame.cpp:1591
 msgid "No"
 msgstr "Non"
 
-#: src/emu/ui/filesel.cpp:161 src/emu/ui/selgame.cpp:1568
-#: src/emu/ui/selgame.cpp:1569 src/emu/ui/selgame.cpp:1570
-#: src/emu/ui/selgame.cpp:1571 src/emu/ui/selgame.cpp:1572
-#: src/emu/ui/selgame.cpp:1573 src/emu/ui/selgame.cpp:1574
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/filesel.cpp:164 src/emu/ui/selgame.cpp:1576
+#: src/emu/ui/selgame.cpp:1577 src/emu/ui/selgame.cpp:1578
+#: src/emu/ui/selgame.cpp:1579 src/emu/ui/selgame.cpp:1580
+#: src/emu/ui/selgame.cpp:1581 src/emu/ui/selgame.cpp:1582
+#: src/emu/ui/selgame.cpp:1591
 msgid "Yes"
 msgstr "Oui"
 
-#: src/emu/ui/filesel.cpp:272
+#: src/emu/ui/filesel.cpp:275
 msgid "New Image Name:"
 msgstr "Nouveau nom de l'image :"
 
-#: src/emu/ui/filesel.cpp:278
+#: src/emu/ui/filesel.cpp:281
 msgid "Image Format:"
 msgstr "Format de l'image :"
 
-#: src/emu/ui/filesel.cpp:284
+#: src/emu/ui/filesel.cpp:287
 msgid "Create"
 msgstr "Créer"
 
-#: src/emu/ui/filesel.cpp:315
+#: src/emu/ui/filesel.cpp:318
 msgid "Please enter a file extension too"
 msgstr "Veuillez entrer également l'extension du fichier"
 
-#: src/emu/ui/filesel.cpp:503 src/emu/ui/swlist.cpp:65
+#: src/emu/ui/filesel.cpp:506 src/emu/ui/swlist.cpp:65
 msgid "[empty slot]"
 msgstr "[emplacement vide]"
 
-#: src/emu/ui/filesel.cpp:507
+#: src/emu/ui/filesel.cpp:510
 msgid "[create]"
 msgstr "[créer]"
 
-#: src/emu/ui/filesel.cpp:511 src/emu/ui/swlist.cpp:76
+#: src/emu/ui/filesel.cpp:514 src/emu/ui/swlist.cpp:76
 msgid "[software list]"
 msgstr "[liste des logiciels]"
 
-#: src/emu/ui/filesel.cpp:803
+#: src/emu/ui/filesel.cpp:806
 msgid "Select image format"
 msgstr "Sélectionner le format de l'image"
 
-#: src/emu/ui/filesel.cpp:863
+#: src/emu/ui/filesel.cpp:866
 msgid "Select access mode"
 msgstr "Sélectionner le mode d'accès"
 
-#: src/emu/ui/filesel.cpp:864
+#: src/emu/ui/filesel.cpp:867
 msgid "Read-only"
 msgstr "Lecture seule"
 
-#: src/emu/ui/filesel.cpp:866
+#: src/emu/ui/filesel.cpp:869
 msgid "Read-write"
 msgstr "Lecture-écriture"
 
-#: src/emu/ui/filesel.cpp:867
+#: src/emu/ui/filesel.cpp:870
 msgid "Read this image, write to another image"
 msgstr "Lire cette image, écrire dans une autre image"
 
-#: src/emu/ui/filesel.cpp:868
+#: src/emu/ui/filesel.cpp:871
 msgid "Read this image, write to diff"
 msgstr "Lire cette image, écrire vers diff"
 
@@ -655,7 +655,7 @@ msgstr "Partiellement supporté"
 msgid "[empty]"
 msgstr "[vide]"
 
-#: src/emu/ui/info_pty.cpp:26 src/emu/ui/mainmenu.cpp:91
+#: src/emu/ui/info_pty.cpp:26 src/emu/ui/mainmenu.cpp:96
 msgid "Pseudo terminals"
 msgstr ""
 
@@ -671,7 +671,7 @@ msgstr "Interface"
 msgid "Other Controls"
 msgstr "Autres contrôles"
 
-#: src/emu/ui/inputmap.cpp:622 src/emu/ui/miscmenu.cpp:91
+#: src/emu/ui/inputmap.cpp:622 src/emu/ui/miscmenu.cpp:92
 #: src/emu/ui/slotopt.cpp:172
 msgid "Reset"
 msgstr "Réinitialiser"
@@ -704,27 +704,27 @@ msgstr "Infos statistiques"
 msgid "Machine Information"
 msgstr "Informations sur la machine"
 
-#: src/emu/ui/mainmenu.cpp:78
+#: src/emu/ui/mainmenu.cpp:80
 msgid "Image Information"
 msgstr "Informations sur l'image"
 
-#: src/emu/ui/mainmenu.cpp:81
+#: src/emu/ui/mainmenu.cpp:83
 msgid "File Manager"
 msgstr "Gestionnaire de fichiers"
 
-#: src/emu/ui/mainmenu.cpp:86
+#: src/emu/ui/mainmenu.cpp:92
 msgid "Tape Control"
 msgstr "Contrôle de la cassette"
 
-#: src/emu/ui/mainmenu.cpp:94
+#: src/emu/ui/mainmenu.cpp:99
 msgid "Bios Selection"
 msgstr "Sélection du BIOS"
 
-#: src/emu/ui/mainmenu.cpp:100
+#: src/emu/ui/mainmenu.cpp:104
 msgid "Slot Devices"
 msgstr "Slot Devices (Périphériques d'emplacement)"
 
-#: src/emu/ui/mainmenu.cpp:107
+#: src/emu/ui/mainmenu.cpp:109
 msgid "Barcode Reader"
 msgstr "Lecteur de code-barres"
 
@@ -732,43 +732,43 @@ msgstr "Lecteur de code-barres"
 msgid "Network Devices"
 msgstr "Périphériques réseau"
 
-#: src/emu/ui/mainmenu.cpp:119
+#: src/emu/ui/mainmenu.cpp:118
 msgid "Keyboard Mode"
 msgstr "Mode clavier"
 
-#: src/emu/ui/mainmenu.cpp:122
+#: src/emu/ui/mainmenu.cpp:121
 msgid "Slider Controls"
 msgstr "Contrôles du curseur"
 
-#: src/emu/ui/mainmenu.cpp:125
+#: src/emu/ui/mainmenu.cpp:124
 msgid "Video Options"
 msgstr "Options vidéo"
 
-#: src/emu/ui/mainmenu.cpp:129
+#: src/emu/ui/mainmenu.cpp:128
 msgid "Crosshair Options"
 msgstr "Options du viseur"
 
-#: src/emu/ui/mainmenu.cpp:133
+#: src/emu/ui/mainmenu.cpp:132
 msgid "Cheat"
 msgstr "Codes de triche"
 
-#: src/emu/ui/mainmenu.cpp:136
+#: src/emu/ui/mainmenu.cpp:135
 msgid "Plugin Options"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:140
+#: src/emu/ui/mainmenu.cpp:139
 msgid "External DAT View"
 msgstr "Visualiser un DAT externe"
 
-#: src/emu/ui/mainmenu.cpp:146
+#: src/emu/ui/mainmenu.cpp:145 src/emu/ui/miscmenu.cpp:785
 msgid "Add To Favorites"
 msgstr "Ajouter aux favoris"
 
-#: src/emu/ui/mainmenu.cpp:148
+#: src/emu/ui/mainmenu.cpp:147 src/emu/ui/miscmenu.cpp:787
 msgid "Remove From Favorites"
 msgstr "Supprimer des favoris"
 
-#: src/emu/ui/mainmenu.cpp:155
+#: src/emu/ui/mainmenu.cpp:154
 msgid "Select New Machine"
 msgstr "Sélectionner une nouvelle machine"
 
@@ -808,31 +808,31 @@ msgstr "Quitter MAME"
 msgid "Return to Previous Menu"
 msgstr "Retour au menu précédent"
 
-#: src/emu/ui/menu.cpp:716
+#: src/emu/ui/menu.cpp:761
 msgid "Auto"
 msgstr ""
 
-#: src/emu/ui/menu.cpp:2133
+#: src/emu/ui/menu.cpp:2195
 msgid "Images"
 msgstr ""
 
-#: src/emu/ui/menu.cpp:2134
+#: src/emu/ui/menu.cpp:2196
 msgid "Infos"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Keyboard Mode:"
 msgstr "Mode clavier :"
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Natural"
 msgstr "Naturel"
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Emulated"
 msgstr "Émulé"
 
-#: src/emu/ui/miscmenu.cpp:240
+#: src/emu/ui/miscmenu.cpp:241
 #, c-format
 msgid ""
 "Uptime: %1$d:%2$02d:%3$02d\n"
@@ -841,7 +841,7 @@ msgstr ""
 "Temps écoulé : %1$d:%2$02d:%3$02d\n"
 "\n"
 
-#: src/emu/ui/miscmenu.cpp:242
+#: src/emu/ui/miscmenu.cpp:243
 #, c-format
 msgid ""
 "Uptime: %1$d:%2$02d\n"
@@ -850,7 +850,7 @@ msgstr ""
 "Temps écoulé : %1$d:%2$02d\n"
 "\n"
 
-#: src/emu/ui/miscmenu.cpp:246
+#: src/emu/ui/miscmenu.cpp:247
 #, c-format
 msgid ""
 "Tickets dispensed: %1$d\n"
@@ -859,109 +859,50 @@ msgstr ""
 "Tickets distribués : %1$d\n"
 "\n"
 
-#: src/emu/ui/miscmenu.cpp:257
+#: src/emu/ui/miscmenu.cpp:258
 msgid "Coin %1$c: NA%3$s\n"
 msgstr "Monnayeur %1$c : ND%3$s\n"
 
-#: src/emu/ui/miscmenu.cpp:257
+#: src/emu/ui/miscmenu.cpp:258
 #, c-format
 msgid "Coin %1$c: %2$d%3$s\n"
 msgstr "Monnayeur %1$c : %2$d%3$s\n"
 
-#: src/emu/ui/miscmenu.cpp:260
+#: src/emu/ui/miscmenu.cpp:261
 msgid " (locked)"
 msgstr " (verrouillé)"
 
-#: src/emu/ui/miscmenu.cpp:519
+#: src/emu/ui/miscmenu.cpp:520
 msgid "Visible Delay"
 msgstr "Attente visible"
 
-#: src/emu/ui/miscmenu.cpp:617
+#: src/emu/ui/miscmenu.cpp:619
 #, c-format
 msgid "%s.xml saved under ui folder."
 msgstr "%s.xml sauvegardé dans le dossier ui."
 
-#: src/emu/ui/miscmenu.cpp:645
+#: src/emu/ui/miscmenu.cpp:647
 msgid "Name:             Description:\n"
 msgstr "Nom :             Description :\n"
 
-#: src/emu/ui/miscmenu.cpp:657
+#: src/emu/ui/miscmenu.cpp:659
 #, c-format
 msgid "%s.txt saved under ui folder."
 msgstr "%s.txt sauvegardé dans le dossier ui."
 
-#: src/emu/ui/miscmenu.cpp:675
-msgid "Export XML format (like -listxml)"
-msgstr "Exporter au format XML (comme -listxml)"
+#: src/emu/ui/miscmenu.cpp:677
+msgid "Export list in XML format (like -listxml)"
+msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:676
-msgid "Export TXT format (like -listfull)"
-msgstr "Exporter au format TXT (comme -listfull)"
+#: src/emu/ui/miscmenu.cpp:678
+msgid "Export list in XML format (like -listxml, but exclude devices)"
+msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:734
-msgid "Dummy"
-msgstr "Fictif - Non chargé"
+#: src/emu/ui/miscmenu.cpp:679
+msgid "Export list in TXT format (like -listfull)"
+msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:736
-msgid "Save machine configuration"
-msgstr "Sauvegarder la configuration de la machine"
-
-#: src/emu/ui/miscmenu.cpp:848 src/emu/ui/miscmenu.cpp:869
-#: src/emu/ui/selgame.cpp:594
-msgid "Plugins"
-msgstr "Plugins (modules d'extension)"
-
-#: src/emu/ui/optsmenu.cpp:218
-msgid "Filter"
-msgstr "Filtre"
-
-#: src/emu/ui/optsmenu.cpp:226
-msgid " ^!File"
-msgstr "^!Fichier"
-
-#: src/emu/ui/optsmenu.cpp:231
-msgid " ^!Category"
-msgstr "^!Catégorie"
-
-#: src/emu/ui/optsmenu.cpp:254
-msgid "^!Setup custom filter"
-msgstr "^!Définir un filtre personnalisé"
-
-#: src/emu/ui/optsmenu.cpp:262
-msgid "Customize UI"
-msgstr "Personnaliser l'interface"
-
-#: src/emu/ui/optsmenu.cpp:263
-msgid "Configure Directories"
-msgstr "Configurer les dossiers"
-
-#: src/emu/ui/optsmenu.cpp:266 src/emu/ui/sndmenu.cpp:151
-#: src/emu/ui/sndmenu.cpp:172
-msgid "Sound Options"
-msgstr "Options du son"
-
-#: src/emu/ui/optsmenu.cpp:269
-msgid "General Inputs"
-msgstr "Périphériques d'entrée généraux"
-
-#: src/emu/ui/optsmenu.cpp:272
-msgid "Save Configuration"
-msgstr "Sauvegarder la configuration"
-
-#: src/emu/ui/optsmenu.cpp:286 src/emu/ui/optsmenu.cpp:307
-msgid "Settings"
-msgstr "Paramètres"
-
-#: src/emu/ui/optsmenu.cpp:327
-msgid "**Error saving ui.ini**"
-msgstr "**Erreur de sauvegarde du fichier ui.ini**"
-
-#: src/emu/ui/optsmenu.cpp:374
-#, c-format
-msgid "**Error saving %s.ini**"
-msgstr "**Erreur de sauvegarde du fichier %s.ini**"
-
-#: src/emu/ui/optsmenu.cpp:378
+#: src/emu/ui/miscmenu.cpp:729 src/emu/ui/optsmenu.cpp:376
 msgid ""
 "\n"
 "    Configuration saved    \n"
@@ -971,20 +912,95 @@ msgstr ""
 " Configuration sauvegardée \n"
 "\n"
 
-#: src/emu/ui/selector.cpp:166
+#: src/emu/ui/miscmenu.cpp:774
+msgid "Bios"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:776
+msgid "Driver"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:790
+msgid "Save machine configuration"
+msgstr "Sauvegarder la configuration de la machine"
+
+#: src/emu/ui/miscmenu.cpp:806
+msgid "Configure machine:"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:868 src/emu/ui/selsoft.cpp:109
+msgid " (default)"
+msgstr " (par défaut)"
+
+#: src/emu/ui/miscmenu.cpp:953 src/emu/ui/miscmenu.cpp:973
+#: src/emu/ui/selgame.cpp:600
+msgid "Plugins"
+msgstr "Plugins (modules d'extension)"
+
+#: src/emu/ui/optsmenu.cpp:217
+msgid "Filter"
+msgstr "Filtre"
+
+#: src/emu/ui/optsmenu.cpp:225
+msgid " ^!File"
+msgstr "^!Fichier"
+
+#: src/emu/ui/optsmenu.cpp:230
+msgid " ^!Category"
+msgstr "^!Catégorie"
+
+#: src/emu/ui/optsmenu.cpp:253
+msgid "^!Setup custom filter"
+msgstr "^!Définir un filtre personnalisé"
+
+#: src/emu/ui/optsmenu.cpp:261
+msgid "Customize UI"
+msgstr "Personnaliser l'interface"
+
+#: src/emu/ui/optsmenu.cpp:262
+msgid "Configure Directories"
+msgstr "Configurer les dossiers"
+
+#: src/emu/ui/optsmenu.cpp:265 src/emu/ui/sndmenu.cpp:149
+#: src/emu/ui/sndmenu.cpp:169
+msgid "Sound Options"
+msgstr "Options du son"
+
+#: src/emu/ui/optsmenu.cpp:268
+msgid "General Inputs"
+msgstr "Périphériques d'entrée généraux"
+
+#: src/emu/ui/optsmenu.cpp:271
+msgid "Save Configuration"
+msgstr "Sauvegarder la configuration"
+
+#: src/emu/ui/optsmenu.cpp:285 src/emu/ui/optsmenu.cpp:305
+msgid "Settings"
+msgstr "Paramètres"
+
+#: src/emu/ui/optsmenu.cpp:325
+msgid "**Error saving ui.ini**"
+msgstr "**Erreur de sauvegarde du fichier ui.ini**"
+
+#: src/emu/ui/optsmenu.cpp:372
+#, c-format
+msgid "**Error saving %s.ini**"
+msgstr "**Erreur de sauvegarde du fichier %s.ini**"
+
+#: src/emu/ui/selector.cpp:165
 msgid "Selection List - Search: "
 msgstr "Liste de sélection - Recherche : "
 
-#: src/emu/ui/selector.cpp:196
+#: src/emu/ui/selector.cpp:194
 #, c-format
 msgid "Double click or press %1$s to select"
 msgstr "Double-cliquez ou appuyez sur %1$s pour sélectionner"
 
-#: src/emu/ui/selgame.cpp:39
+#: src/emu/ui/selgame.cpp:38
 msgid "General Info"
 msgstr "Informations générales"
 
-#: src/emu/ui/selgame.cpp:374 src/emu/ui/selsoft.cpp:282
+#: src/emu/ui/selgame.cpp:380 src/emu/ui/selsoft.cpp:281
 #, c-format
 msgid ""
 "%s\n"
@@ -993,8 +1009,8 @@ msgstr ""
 "%s\n"
 " ajouté à la liste des favoris."
 
-#: src/emu/ui/selgame.cpp:380 src/emu/ui/selgame.cpp:389
-#: src/emu/ui/selsoft.cpp:287
+#: src/emu/ui/selgame.cpp:386 src/emu/ui/selgame.cpp:395
+#: src/emu/ui/selsoft.cpp:286
 #, c-format
 msgid ""
 "%s\n"
@@ -1003,7 +1019,7 @@ msgstr ""
 "%s\n"
 " supprimé de la liste des favoris."
 
-#: src/emu/ui/selgame.cpp:450
+#: src/emu/ui/selgame.cpp:457
 msgid ""
 "The selected machine is missing one or more required ROM or CHD images. "
 "Please select a different machine.\n"
@@ -1011,256 +1027,260 @@ msgid ""
 "Press any key to continue."
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:589 src/emu/ui/simpleselgame.cpp:265
+#: src/emu/ui/selgame.cpp:595 src/emu/ui/simpleselgame.cpp:265
 msgid "Configure Options"
 msgstr "Configurer les options"
 
-#: src/emu/ui/selgame.cpp:752
+#: src/emu/ui/selgame.cpp:596
+msgid "Configure Machine"
+msgstr ""
+
+#: src/emu/ui/selgame.cpp:758
 #, c-format
 msgid "%1$s %2$s ( %3$d / %4$d machines (%5$d BIOS) )"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:762
+#: src/emu/ui/selgame.cpp:768
 #, c-format
 msgid "%1$s (%2$s - %3$s) - "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:769 src/emu/ui/selgame.cpp:775
+#: src/emu/ui/selgame.cpp:775 src/emu/ui/selgame.cpp:781
 #, c-format
 msgid "%1$s (%2$s) - "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:784
+#: src/emu/ui/selgame.cpp:790
 #, c-format
 msgid "%1$s Search: %2$s_"
 msgstr "%1$s Recherche : %2$s_"
 
-#: src/emu/ui/selgame.cpp:838
+#: src/emu/ui/selgame.cpp:844
 #, c-format
 msgid "Romset: %1$-.100s"
 msgstr "Romset : %1$-.100s"
 
-#: src/emu/ui/selgame.cpp:841 src/emu/ui/selgame.cpp:890
-#: src/emu/ui/selsoft.cpp:751 src/emu/ui/selsoft.cpp:801
+#: src/emu/ui/selgame.cpp:847 src/emu/ui/selgame.cpp:896
+#: src/emu/ui/selsoft.cpp:750 src/emu/ui/selsoft.cpp:800
 #: src/emu/ui/simpleselgame.cpp:328
 #, c-format
 msgid "%1$s, %2$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:847 src/emu/ui/selsoft.cpp:757
+#: src/emu/ui/selgame.cpp:853 src/emu/ui/selsoft.cpp:756
 #, c-format
 msgid "Driver is clone of: %1$-.100s"
 msgstr "Ce driver est un clone de : %1$-.100s"
 
-#: src/emu/ui/selgame.cpp:849 src/emu/ui/selsoft.cpp:759
+#: src/emu/ui/selgame.cpp:855 src/emu/ui/selsoft.cpp:758
 msgid "Driver is parent"
 msgstr "Ce driver est le parent"
 
-#: src/emu/ui/selgame.cpp:853 src/emu/ui/selsoft.cpp:763
+#: src/emu/ui/selgame.cpp:859 src/emu/ui/selsoft.cpp:762
 #: src/emu/ui/simpleselgame.cpp:335
 msgid "Overall: NOT WORKING"
 msgstr "En résumé : NE FONCTIONNE PAS"
 
-#: src/emu/ui/selgame.cpp:855 src/emu/ui/selsoft.cpp:765
+#: src/emu/ui/selgame.cpp:861 src/emu/ui/selsoft.cpp:764
 #: src/emu/ui/simpleselgame.cpp:337
 msgid "Overall: Unemulated Protection"
 msgstr "En résumé : Protection non émulée"
 
-#: src/emu/ui/selgame.cpp:857 src/emu/ui/selsoft.cpp:767
+#: src/emu/ui/selgame.cpp:863 src/emu/ui/selsoft.cpp:766
 #: src/emu/ui/simpleselgame.cpp:339
 msgid "Overall: Working"
 msgstr "En résumé : Fonctionne correctement"
 
-#: src/emu/ui/selgame.cpp:861 src/emu/ui/selsoft.cpp:771
+#: src/emu/ui/selgame.cpp:867 src/emu/ui/selsoft.cpp:770
 msgid "Graphics: Imperfect, "
 msgstr "Graphismes : Imparfaits, "
 
-#: src/emu/ui/selgame.cpp:863 src/emu/ui/selsoft.cpp:773
+#: src/emu/ui/selgame.cpp:869 src/emu/ui/selsoft.cpp:772
 msgid "Graphics: OK, "
 msgstr "Graphismes : OK, "
 
-#: src/emu/ui/selgame.cpp:866 src/emu/ui/selsoft.cpp:776
+#: src/emu/ui/selgame.cpp:872 src/emu/ui/selsoft.cpp:775
 msgid "Sound: Unimplemented"
 msgstr "Son : Non implémenté"
 
-#: src/emu/ui/selgame.cpp:868 src/emu/ui/selsoft.cpp:778
+#: src/emu/ui/selgame.cpp:874 src/emu/ui/selsoft.cpp:777
 msgid "Sound: Imperfect"
 msgstr "Son : Imparfait"
 
-#: src/emu/ui/selgame.cpp:870 src/emu/ui/selsoft.cpp:780
+#: src/emu/ui/selgame.cpp:876 src/emu/ui/selsoft.cpp:779
 msgid "Sound: OK"
 msgstr "Son : OK"
 
-#: src/emu/ui/selgame.cpp:887
+#: src/emu/ui/selgame.cpp:893
 #, c-format
 msgid "System: %1$-.100s"
 msgstr "Système : %1$-.100s"
 
-#: src/emu/ui/selgame.cpp:894 src/emu/ui/selsoft.cpp:805
+#: src/emu/ui/selgame.cpp:900 src/emu/ui/selsoft.cpp:804
 #, c-format
 msgid "Software is clone of: %1$-.100s"
 msgstr "Ce logiciel est un clone de : %1$-.100s"
 
-#: src/emu/ui/selgame.cpp:896 src/emu/ui/selsoft.cpp:807
+#: src/emu/ui/selgame.cpp:902 src/emu/ui/selsoft.cpp:806
 msgid "Software is parent"
 msgstr "Ce logiciel est le parent"
 
-#: src/emu/ui/selgame.cpp:901 src/emu/ui/selsoft.cpp:812
+#: src/emu/ui/selgame.cpp:907 src/emu/ui/selsoft.cpp:811
 msgid "Supported: No"
 msgstr "Supporté : Non"
 
-#: src/emu/ui/selgame.cpp:906 src/emu/ui/selsoft.cpp:817
+#: src/emu/ui/selgame.cpp:912 src/emu/ui/selsoft.cpp:816
 msgid "Supported: Partial"
 msgstr "Supporté : Partiellement"
 
-#: src/emu/ui/selgame.cpp:911 src/emu/ui/selsoft.cpp:822
+#: src/emu/ui/selgame.cpp:917 src/emu/ui/selsoft.cpp:821
 msgid "Supported: Yes"
 msgstr "Supporté : Oui"
 
-#: src/emu/ui/selgame.cpp:916 src/emu/ui/selsoft.cpp:827
+#: src/emu/ui/selgame.cpp:922 src/emu/ui/selsoft.cpp:826
 #, c-format
 msgid "romset: %1$-.100s"
 msgstr "romset : %1$-.100s"
 
-#: src/emu/ui/selgame.cpp:923
+#: src/emu/ui/selgame.cpp:929
 #, c-format
 msgid "%1$s %2$s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1535
+#: src/emu/ui/selgame.cpp:1543
 #, c-format
 msgid "Romset: %1$-.100s\n"
 msgstr "Romset : %1$-.100s\n"
 
-#: src/emu/ui/selgame.cpp:1536
+#: src/emu/ui/selgame.cpp:1544
 #, c-format
 msgid "Year: %1$s\n"
 msgstr "Année : %1$s\n"
 
-#: src/emu/ui/selgame.cpp:1537
+#: src/emu/ui/selgame.cpp:1545
 #, c-format
 msgid "Manufacturer: %1$-.100s\n"
 msgstr "Constructeur : %1$-.100s\n"
 
-#: src/emu/ui/selgame.cpp:1541
+#: src/emu/ui/selgame.cpp:1549
 #, c-format
 msgid "Driver is Clone of: %1$-.100s\n"
 msgstr "Ce driver est un clone de : %1$-.100s\n"
 
-#: src/emu/ui/selgame.cpp:1543
+#: src/emu/ui/selgame.cpp:1551
 msgid "Driver is Parent\n"
 msgstr "Ce driver est le parent\n"
 
-#: src/emu/ui/selgame.cpp:1546
+#: src/emu/ui/selgame.cpp:1554
 msgid "Overall: NOT WORKING\n"
 msgstr "En résumé : NE FONCTIONNE PAS\n"
 
-#: src/emu/ui/selgame.cpp:1548
+#: src/emu/ui/selgame.cpp:1556
 msgid "Overall: Unemulated Protection\n"
 msgstr "En résumé : Protection non émulée\n"
 
-#: src/emu/ui/selgame.cpp:1550
+#: src/emu/ui/selgame.cpp:1558
 msgid "Overall: Working\n"
 msgstr "En résumé : Fonctionne correctement\n"
 
-#: src/emu/ui/selgame.cpp:1553
+#: src/emu/ui/selgame.cpp:1561
 msgid "Graphics: Imperfect Colors\n"
 msgstr "Graphismes : Couleurs imparfaites\n"
 
-#: src/emu/ui/selgame.cpp:1557
+#: src/emu/ui/selgame.cpp:1565
 msgid "Graphics: Imperfect\n"
 msgstr "Graphismes : Imparfaits\n"
 
-#: src/emu/ui/selgame.cpp:1559
+#: src/emu/ui/selgame.cpp:1567
 msgid "Graphics: OK\n"
 msgstr "Graphismes : OK\n"
 
-#: src/emu/ui/selgame.cpp:1562
+#: src/emu/ui/selgame.cpp:1570
 msgid "Sound: Unimplemented\n"
 msgstr "Son : Non implémenté\n"
 
-#: src/emu/ui/selgame.cpp:1564
+#: src/emu/ui/selgame.cpp:1572
 msgid "Sound: Imperfect\n"
 msgstr "Son : Imparfait\n"
 
-#: src/emu/ui/selgame.cpp:1566
+#: src/emu/ui/selgame.cpp:1574
 msgid "Sound: OK\n"
 msgstr "Son : OK\n"
 
-#: src/emu/ui/selgame.cpp:1568
+#: src/emu/ui/selgame.cpp:1576
 #, c-format
 msgid "Driver is Skeleton: %1$s\n"
 msgstr "Ce driver est embryonnaire : %1$s\n"
 
-#: src/emu/ui/selgame.cpp:1569
+#: src/emu/ui/selgame.cpp:1577
 #, c-format
 msgid "Game is Mechanical: %1$s\n"
 msgstr "Jeu comportant des éléments mécaniques : %1$s\n"
 
-#: src/emu/ui/selgame.cpp:1570
+#: src/emu/ui/selgame.cpp:1578
 #, c-format
 msgid "Requires Artwork: %1$s\n"
 msgstr "Artwork nécessaire : %1$s\n"
 
-#: src/emu/ui/selgame.cpp:1571
+#: src/emu/ui/selgame.cpp:1579
 #, c-format
 msgid "Requires Clickable Artwork: %1$s\n"
 msgstr "Artwork cliquable nécessaire : %1$s\n"
 
-#: src/emu/ui/selgame.cpp:1572
+#: src/emu/ui/selgame.cpp:1580
 #, c-format
 msgid "Support Cocktail: %1$s\n"
 msgstr "Support du mode cocktail : %1$s\n"
 
-#: src/emu/ui/selgame.cpp:1573
+#: src/emu/ui/selgame.cpp:1581
 #, c-format
 msgid "Driver is Bios: %1$s\n"
 msgstr "Ce driver est un BIOS : %1$s\n"
 
-#: src/emu/ui/selgame.cpp:1574
+#: src/emu/ui/selgame.cpp:1582
 #, c-format
 msgid "Support Save: %1$s\n"
 msgstr "Supporte les sauvegardes : %1$s\n"
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 #, c-format
 msgid "Screen Orientation: %1$s\n"
 msgstr "Orientation de l'écran: %1$s\n"
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 msgid "Vertical"
 msgstr "Verticale"
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 msgid "Horizontal"
 msgstr "Horizontale"
 
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/selgame.cpp:1591
 #, c-format
 msgid "Requires CHD: %1$s\n"
 msgstr "CHD nécessaire : %1$s\n"
 
-#: src/emu/ui/selgame.cpp:1596
+#: src/emu/ui/selgame.cpp:1604
 msgid "Roms Audit Pass: OK\n"
 msgstr "Vérification des ROMs : OK\n"
 
-#: src/emu/ui/selgame.cpp:1598
+#: src/emu/ui/selgame.cpp:1606
 msgid "Roms Audit Pass: BAD\n"
 msgstr "Vérification des ROMs : PAS OK\n"
 
-#: src/emu/ui/selgame.cpp:1601
+#: src/emu/ui/selgame.cpp:1609
 msgid "Samples Audit Pass: None Needed\n"
 msgstr "Vérification des samples : aucun n'est nécessaire\n"
 
-#: src/emu/ui/selgame.cpp:1603
+#: src/emu/ui/selgame.cpp:1611
 msgid "Samples Audit Pass: OK\n"
 msgstr "Vérification des samples : OK\n"
 
-#: src/emu/ui/selgame.cpp:1605
+#: src/emu/ui/selgame.cpp:1613
 msgid "Samples Audit Pass: BAD\n"
 msgstr "Vérification des samples : PAS OK\n"
 
-#: src/emu/ui/selgame.cpp:1608
+#: src/emu/ui/selgame.cpp:1616
 msgid ""
 "Roms Audit Pass: Disabled\n"
 "Samples Audit Pass: Disabled\n"
@@ -1268,20 +1288,16 @@ msgstr ""
 "Vérification des ROMs: Désactivée\n"
 "Vérification des samples : Désactivée\n"
 
-#: src/emu/ui/selgame.cpp:2049 src/emu/ui/selgame.cpp:2212
-#: src/emu/ui/selsoft.cpp:1662
+#: src/emu/ui/selgame.cpp:2055 src/emu/ui/selgame.cpp:2216
+#: src/emu/ui/selsoft.cpp:1655
 msgid "No Infos Available"
 msgstr "Aucune information disponible"
 
-#: src/emu/ui/selgame.cpp:2162 src/emu/ui/selsoft.cpp:1607
+#: src/emu/ui/selgame.cpp:2168 src/emu/ui/selsoft.cpp:1602
 msgid "Usage"
 msgstr "Utilisation"
 
-#: src/emu/ui/selsoft.cpp:110
-msgid " (default)"
-msgstr " (par défaut)"
-
-#: src/emu/ui/selsoft.cpp:381
+#: src/emu/ui/selsoft.cpp:380
 msgid ""
 "The selected software is missing one or more required files. Please select a "
 "different software.\n"
@@ -1289,57 +1305,57 @@ msgid ""
 "Press any key to continue."
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:684
+#: src/emu/ui/selsoft.cpp:683
 #, c-format
-msgid "%1$s %2$s ( %3$d / %4$d softwares )"
-msgstr "%1$s %2$s ( %3$d / %4$d logiciels )"
+msgid "%1$s %2$s ( %3$d / %4$d software packages )"
+msgstr ""
 
-#: src/emu/ui/selsoft.cpp:685
+#: src/emu/ui/selsoft.cpp:684
 #, c-format
 msgid "Driver: \"%1$s\" software list "
 msgstr "Liste de logiciels pour le driver : \"%1$s\" "
 
-#: src/emu/ui/selsoft.cpp:688
+#: src/emu/ui/selsoft.cpp:687
 #, c-format
 msgid "Region: %1$s -"
 msgstr "Région : %1$s -"
 
-#: src/emu/ui/selsoft.cpp:690
+#: src/emu/ui/selsoft.cpp:689
 #, c-format
 msgid "Publisher: %1$s -"
 msgstr "Éditeur : %1$s -"
 
-#: src/emu/ui/selsoft.cpp:692
+#: src/emu/ui/selsoft.cpp:691
 #, c-format
 msgid "Year: %1$s -"
 msgstr "Année : %1$s -"
 
-#: src/emu/ui/selsoft.cpp:694
+#: src/emu/ui/selsoft.cpp:693
 #, c-format
 msgid "Software List: %1$s -"
 msgstr "Liste de logiciels : %1$s -"
 
-#: src/emu/ui/selsoft.cpp:696
+#: src/emu/ui/selsoft.cpp:695
 #, c-format
 msgid "Device type: %1$s -"
 msgstr "Type de périphérique : %1$s -"
 
-#: src/emu/ui/selsoft.cpp:698
+#: src/emu/ui/selsoft.cpp:697
 #, c-format
 msgid "%s Search: %s_"
 msgstr "%s Recherche : %s_"
 
-#: src/emu/ui/selsoft.cpp:748 src/emu/ui/selsoft.cpp:798
+#: src/emu/ui/selsoft.cpp:747 src/emu/ui/selsoft.cpp:797
 #: src/emu/ui/simpleselgame.cpp:325
 #, c-format
 msgid "%1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:1998 src/emu/ui/selsoft.cpp:2018
+#: src/emu/ui/selsoft.cpp:1991 src/emu/ui/selsoft.cpp:2011
 msgid "Software part selection:"
 msgstr "Sélection du logiciel :"
 
-#: src/emu/ui/selsoft.cpp:2136 src/emu/ui/selsoft.cpp:2156
+#: src/emu/ui/selsoft.cpp:2129 src/emu/ui/selsoft.cpp:2149
 msgid "Bios selection:"
 msgstr "Sélection du BIOS :"
 
@@ -1393,15 +1409,15 @@ msgstr "GFX : %s, Son : %s"
 msgid " [internal]"
 msgstr "[interne]"
 
-#: src/emu/ui/sndmenu.cpp:135
+#: src/emu/ui/sndmenu.cpp:133
 msgid "Sound"
 msgstr "Son"
 
-#: src/emu/ui/sndmenu.cpp:136
+#: src/emu/ui/sndmenu.cpp:134
 msgid "Sample Rate"
 msgstr "Fréquence d'échantillonnage"
 
-#: src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/sndmenu.cpp:135
 msgid "Use External Samples"
 msgstr "Utiliser des samples externes"
 
@@ -1471,13 +1487,13 @@ msgstr "Rembobiner"
 msgid "Fast Forward"
 msgstr "Avance rapide"
 
-#: src/emu/ui/ui.cpp:419
+#: src/emu/ui/ui.cpp:418
 msgid "This driver requires images to be loaded in the following device(s): "
 msgstr ""
 "Ce driver nécessite le chargement d'images dans le(s) périphérique(s) "
 "suivant(s) : "
 
-#: src/emu/ui/ui.cpp:1074
+#: src/emu/ui/ui.cpp:1071
 msgid ""
 "One or more ROMs/CHDs for this machine are incorrect. The machine may not "
 "run correctly.\n"
@@ -1486,7 +1502,7 @@ msgstr ""
 "cette machine sont incorrects. Il est possible qu'elle ne fonctionne pas "
 "correctement.\n"
 
-#: src/emu/ui/ui.cpp:1087
+#: src/emu/ui/ui.cpp:1084
 msgid ""
 "There are known problems with this machine\n"
 "\n"
@@ -1494,50 +1510,50 @@ msgstr ""
 "On rencontre les problèmes suivants avec cette machine :\n"
 "\n"
 
-#: src/emu/ui/ui.cpp:1091
+#: src/emu/ui/ui.cpp:1088
 msgid ""
 "One or more ROMs/CHDs for this machine have not been correctly dumped.\n"
 msgstr ""
 "Un ou plusieurs fichiers ROMs/CHDs nécessaires à l'utilisation de cette "
 "machine n'ont pas été dumpés correctement.\n"
 
-#: src/emu/ui/ui.cpp:1095
+#: src/emu/ui/ui.cpp:1092
 #, c-format
 msgid "The keyboard emulation may not be 100% accurate.\n"
 msgstr "L'émulation du clavier peut ne pas être fidèle à 100%.\n"
 
-#: src/emu/ui/ui.cpp:1097
+#: src/emu/ui/ui.cpp:1094
 #, c-format
 msgid "The colors aren't 100% accurate.\n"
 msgstr "Les couleurs ne sont pas fidèles à 100%.\n"
 
-#: src/emu/ui/ui.cpp:1099
+#: src/emu/ui/ui.cpp:1096
 msgid "The colors are completely wrong.\n"
 msgstr "Les couleurs sont complètement fausses.\n"
 
-#: src/emu/ui/ui.cpp:1101
+#: src/emu/ui/ui.cpp:1098
 #, c-format
 msgid "The video emulation isn't 100% accurate.\n"
 msgstr "L'émulation vidéo n'est pas fidèle à 100%.\n"
 
-#: src/emu/ui/ui.cpp:1103
+#: src/emu/ui/ui.cpp:1100
 #, c-format
 msgid "The sound emulation isn't 100% accurate.\n"
 msgstr "L'émulation du son n'est pas fidèle à 100%.\n"
 
-#: src/emu/ui/ui.cpp:1105
+#: src/emu/ui/ui.cpp:1102
 msgid "The machine lacks sound.\n"
 msgstr "La machine n'a pas de son.\n"
 
-#: src/emu/ui/ui.cpp:1108
+#: src/emu/ui/ui.cpp:1105
 msgid "Screen flipping in cocktail mode is not supported.\n"
 msgstr "Le retournement de l'écran en mode cocktail n'est pas supporté.\n"
 
-#: src/emu/ui/ui.cpp:1112
+#: src/emu/ui/ui.cpp:1109
 msgid "The machine requires external artwork files\n"
 msgstr "La machine nécessite l'utilisation de fichiers artwork externes\n"
 
-#: src/emu/ui/ui.cpp:1117
+#: src/emu/ui/ui.cpp:1114
 msgid ""
 "This machine was never completed. It may exhibit strange behavior or missing "
 "elements that are not bugs in the emulation.\n"
@@ -1546,7 +1562,7 @@ msgstr ""
 "bizarrement ou que certains composants soient manquants. Cela ne constitue "
 "en aucun cas des bugs d'émulation.\n"
 
-#: src/emu/ui/ui.cpp:1122
+#: src/emu/ui/ui.cpp:1119
 msgid ""
 "This machine has no sound hardware, MAME will produce no sounds, this is "
 "expected behaviour.\n"
@@ -1554,11 +1570,11 @@ msgstr ""
 "Cette machine n'a pas de dispositif sonore. Par conséquent, MAME ne produira "
 "aucun son. Il s'agit d'un comportement attendu.\n"
 
-#: src/emu/ui/ui.cpp:1130
+#: src/emu/ui/ui.cpp:1127
 msgid "The machine has protection which isn't fully emulated.\n"
 msgstr "La machine possède une protection qui n'est pas complètement émulée.\n"
 
-#: src/emu/ui/ui.cpp:1133
+#: src/emu/ui/ui.cpp:1130
 msgid ""
 "\n"
 "THIS MACHINE DOESN'T WORK. The emulation for this machine is not yet "
@@ -1570,7 +1586,7 @@ msgstr ""
 "encore complète. Il n'y a rien que vous puissiez faire pour résoudre ce "
 "problème sauf attendre que les développeurs améliorent l'émulation.\n"
 
-#: src/emu/ui/ui.cpp:1137
+#: src/emu/ui/ui.cpp:1134
 msgid ""
 "\n"
 "Certain elements of this machine cannot be emulated as it requires actual "
@@ -1582,7 +1598,7 @@ msgstr ""
 "nécessitent une interaction physique ou comportent des éléments mécaniques. "
 "Il n'est donc pas possible d'y jouer complètement.\n"
 
-#: src/emu/ui/ui.cpp:1156
+#: src/emu/ui/ui.cpp:1153
 msgid ""
 "\n"
 "\n"
@@ -1592,7 +1608,7 @@ msgstr ""
 "\n"
 "Il existe des clones de cette machine qui fonctionnent correctement : "
 
-#: src/emu/ui/ui.cpp:1170
+#: src/emu/ui/ui.cpp:1167
 msgid ""
 "\n"
 "\n"
@@ -1602,7 +1618,7 @@ msgstr ""
 "\n"
 "Appuyez sur une touche pour continuer"
 
-#: src/emu/ui/ui.cpp:1185
+#: src/emu/ui/ui.cpp:1182
 #, c-format
 msgid ""
 "%1$s\n"
@@ -1617,15 +1633,15 @@ msgstr ""
 "\n"
 "Processeur(s) :\n"
 
-#: src/emu/ui/ui.cpp:1221 src/emu/ui/ui.cpp:1260
+#: src/emu/ui/ui.cpp:1218 src/emu/ui/ui.cpp:1257
 msgid "MHz"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1221 src/emu/ui/ui.cpp:1260
+#: src/emu/ui/ui.cpp:1218 src/emu/ui/ui.cpp:1257
 msgid "kHz"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1235
+#: src/emu/ui/ui.cpp:1232
 msgid ""
 "\n"
 "Sound:\n"
@@ -1633,7 +1649,7 @@ msgstr ""
 "\n"
 "Son :\n"
 
-#: src/emu/ui/ui.cpp:1264
+#: src/emu/ui/ui.cpp:1261
 msgid ""
 "\n"
 "Video:\n"
@@ -1641,78 +1657,78 @@ msgstr ""
 "\n"
 "Vidéo :\n"
 
-#: src/emu/ui/ui.cpp:1268
+#: src/emu/ui/ui.cpp:1265
 msgid "None\n"
 msgstr "Aucun\n"
 
-#: src/emu/ui/ui.cpp:1275
+#: src/emu/ui/ui.cpp:1272
 msgid "Vector"
 msgstr "Graphismes vectoriels"
 
-#: src/emu/ui/ui.cpp:1286
+#: src/emu/ui/ui.cpp:1283
 #, c-format
 msgid "%1$s: %2$s\n"
 msgstr "%1$s : %2$s\n"
 
-#: src/emu/ui/ui.cpp:1286
+#: src/emu/ui/ui.cpp:1283
 msgid "%2$s\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1541 src/emu/ui/ui.cpp:1551
+#: src/emu/ui/ui.cpp:1538 src/emu/ui/ui.cpp:1548
 msgid "Keyboard Emulation Status"
 msgstr "Statut de l'émulation du clavier"
 
-#: src/emu/ui/ui.cpp:1543
+#: src/emu/ui/ui.cpp:1540
 msgid "Mode: PARTIAL Emulation"
 msgstr "Mode : Émulation PARTIELLE"
 
-#: src/emu/ui/ui.cpp:1544
+#: src/emu/ui/ui.cpp:1541
 msgid "UI:   Enabled"
 msgstr "Interface : Activée"
 
-#: src/emu/ui/ui.cpp:1546 src/emu/ui/ui.cpp:1556
+#: src/emu/ui/ui.cpp:1543 src/emu/ui/ui.cpp:1553
 msgid "**Use ScrLock to toggle**"
 msgstr "**Utiliser ScrLock pour basculer**"
 
-#: src/emu/ui/ui.cpp:1553
+#: src/emu/ui/ui.cpp:1550
 msgid "Mode: FULL Emulation"
 msgstr "Mode : Émulation COMPLÈTE"
 
-#: src/emu/ui/ui.cpp:1554
+#: src/emu/ui/ui.cpp:1551
 msgid "UI:   Disabled"
 msgstr "Interface : désactivée"
 
-#: src/emu/ui/ui.cpp:1692
+#: src/emu/ui/ui.cpp:1689
 msgid "Autofire can't be enabled"
 msgstr "Le tir automatique ne peut pas être activé"
 
-#: src/emu/ui/ui.cpp:1731
+#: src/emu/ui/ui.cpp:1728
 msgid "Select position to save to"
 msgstr "Sauvegarder à la position"
 
-#: src/emu/ui/ui.cpp:1733
+#: src/emu/ui/ui.cpp:1730
 msgid "Select position to load from"
 msgstr "Charger depuis la position"
 
-#: src/emu/ui/ui.cpp:1757
+#: src/emu/ui/ui.cpp:1754
 msgid "Save cancelled"
 msgstr "Sauvegarde annulée"
 
-#: src/emu/ui/ui.cpp:1759
+#: src/emu/ui/ui.cpp:1756
 msgid "Load cancelled"
 msgstr "Chargement annulé"
 
-#: src/emu/ui/ui.cpp:1802
+#: src/emu/ui/ui.cpp:1799
 #, c-format
 msgid "Save to position %s"
 msgstr "Sauvegarde à la position %s"
 
-#: src/emu/ui/ui.cpp:1807
+#: src/emu/ui/ui.cpp:1804
 #, c-format
 msgid "Load from position %s"
 msgstr "Chargement depuis la position %s"
 
-#: src/emu/ui/ui.cpp:1847
+#: src/emu/ui/ui.cpp:1844
 #, c-format
 msgid ""
 "Are you sure you want to quit?\n"
@@ -1725,173 +1741,173 @@ msgstr ""
 "Appuyez sur ''%1$s'' pour quitter,\n"
 "Appuyez sur ''%2$s'' pour retourner à l'émulation."
 
-#: src/emu/ui/ui.cpp:1917
+#: src/emu/ui/ui.cpp:1914
 msgid "Master Volume"
 msgstr "Volume principal"
 
-#: src/emu/ui/ui.cpp:1926
+#: src/emu/ui/ui.cpp:1923
 #, c-format
 msgid "%1$s Volume"
 msgstr "Volume %1$s"
 
-#: src/emu/ui/ui.cpp:1949
+#: src/emu/ui/ui.cpp:1946
 #, c-format
 msgid "Overclock CPU %1$s"
 msgstr "Overclock du processeur %1$s"
 
-#: src/emu/ui/ui.cpp:1968
+#: src/emu/ui/ui.cpp:1965
 #, c-format
 msgid "%1$s Refresh Rate"
 msgstr "%1$s - Taux de rafraîchissement"
 
-#: src/emu/ui/ui.cpp:1973
+#: src/emu/ui/ui.cpp:1970
 #, c-format
 msgid "%1$s Brightness"
 msgstr "%1$s - Luminosité"
 
-#: src/emu/ui/ui.cpp:1975
+#: src/emu/ui/ui.cpp:1972
 #, c-format
 msgid "%1$s Contrast"
 msgstr "%1$s - Contraste"
 
-#: src/emu/ui/ui.cpp:1977
+#: src/emu/ui/ui.cpp:1974
 #, c-format
 msgid "%1$s Gamma"
 msgstr "%1$s - Gamma"
 
-#: src/emu/ui/ui.cpp:1981
+#: src/emu/ui/ui.cpp:1978
 #, c-format
 msgid "%1$s Horiz Stretch"
 msgstr "%1$s - Stretch horizontal"
 
-#: src/emu/ui/ui.cpp:1983
+#: src/emu/ui/ui.cpp:1980
 #, c-format
 msgid "%1$s Horiz Position"
 msgstr "%1$s - Position horizontale"
 
-#: src/emu/ui/ui.cpp:1985
+#: src/emu/ui/ui.cpp:1982
 #, c-format
 msgid "%1$s Vert Stretch"
 msgstr "%1$s - Stretch vertical"
 
-#: src/emu/ui/ui.cpp:1987
+#: src/emu/ui/ui.cpp:1984
 #, c-format
 msgid "%1$s Vert Position"
 msgstr "%1$s - Position verticale"
 
-#: src/emu/ui/ui.cpp:2005
+#: src/emu/ui/ui.cpp:2002
 #, c-format
 msgid "Laserdisc '%1$s' Horiz Stretch"
 msgstr "'%1$s' Laserdisc - Stretch horizontal"
 
-#: src/emu/ui/ui.cpp:2007
+#: src/emu/ui/ui.cpp:2004
 #, c-format
 msgid "Laserdisc '%1$s' Horiz Position"
 msgstr "'%1$s' Laserdisc - Position horizontale"
 
-#: src/emu/ui/ui.cpp:2009
+#: src/emu/ui/ui.cpp:2006
 #, c-format
 msgid "Laserdisc '%1$s' Vert Stretch"
 msgstr "'%1$s' Laserdisc - Stretch vertical"
 
-#: src/emu/ui/ui.cpp:2011
+#: src/emu/ui/ui.cpp:2008
 #, c-format
 msgid "Laserdisc '%1$s' Vert Position"
 msgstr "'%1$s' Laserdisc - Position verticale"
 
-#: src/emu/ui/ui.cpp:2021
+#: src/emu/ui/ui.cpp:2018
 msgid "Vector Flicker"
 msgstr "Scintillement de l'affichage vectoriel"
 
-#: src/emu/ui/ui.cpp:2022
+#: src/emu/ui/ui.cpp:2019
 msgid "Beam Width Minimum"
 msgstr "Largeur de rayon minimum"
 
-#: src/emu/ui/ui.cpp:2023
+#: src/emu/ui/ui.cpp:2020
 msgid "Beam Width Maximum"
 msgstr "Largeur de rayon maximum"
 
-#: src/emu/ui/ui.cpp:2024
+#: src/emu/ui/ui.cpp:2021
 msgid "Beam Intensity Weight"
 msgstr "Intensité du rayon"
 
-#: src/emu/ui/ui.cpp:2037
+#: src/emu/ui/ui.cpp:2034
 #, c-format
 msgid "Crosshair Scale %1$s"
 msgstr "Viseur - Échelle %1$s"
 
-#: src/emu/ui/ui.cpp:2037 src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2034 src/emu/ui/ui.cpp:2036
 msgid "X"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2037 src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2034 src/emu/ui/ui.cpp:2036
 msgid "Y"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2036
 #, c-format
 msgid "Crosshair Offset %1$s"
 msgstr "Viseur - Offset %1$s"
 
-#: src/emu/ui/ui.cpp:2071
+#: src/emu/ui/ui.cpp:2068
 #, c-format
 msgid "%1$3ddB"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2115
+#: src/emu/ui/ui.cpp:2112
 #, c-format
 msgid "%1$d%%"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2131
+#: src/emu/ui/ui.cpp:2128
 #, c-format
 msgid "%1$3.0f%%"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2154
+#: src/emu/ui/ui.cpp:2151
 #, c-format
 msgid "%1$.3ffps"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2177 src/emu/ui/ui.cpp:2199 src/emu/ui/ui.cpp:2220
-#: src/emu/ui/ui.cpp:2242 src/emu/ui/ui.cpp:2264 src/emu/ui/ui.cpp:2286
-#: src/emu/ui/ui.cpp:2308 src/emu/ui/ui.cpp:2330 src/emu/ui/ui.cpp:2352
-#: src/emu/ui/ui.cpp:2374 src/emu/ui/ui.cpp:2396
+#: src/emu/ui/ui.cpp:2174 src/emu/ui/ui.cpp:2196 src/emu/ui/ui.cpp:2217
+#: src/emu/ui/ui.cpp:2239 src/emu/ui/ui.cpp:2261 src/emu/ui/ui.cpp:2283
+#: src/emu/ui/ui.cpp:2305 src/emu/ui/ui.cpp:2327 src/emu/ui/ui.cpp:2349
+#: src/emu/ui/ui.cpp:2371 src/emu/ui/ui.cpp:2393
 #, c-format
 msgid "%1$.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2412 src/emu/ui/ui.cpp:2428 src/emu/ui/ui.cpp:2444
-#: src/emu/ui/ui.cpp:2460
+#: src/emu/ui/ui.cpp:2408 src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2438
+#: src/emu/ui/ui.cpp:2453
 #, c-format
 msgid "%1$1.2f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2476
+#: src/emu/ui/ui.cpp:2469
 #, c-format
 msgid "Screen '%1$s'"
 msgstr "Écran '%1$s'"
 
-#: src/emu/ui/ui.cpp:2478
+#: src/emu/ui/ui.cpp:2471
 msgid "Screen"
 msgstr "Écran"
 
-#: src/emu/ui/ui.cpp:2494
+#: src/emu/ui/ui.cpp:2487
 #, c-format
 msgid "Crosshair Scale X %1$1.3f"
 msgstr "Viseur - Échelle X %1$1.3f"
 
-#: src/emu/ui/ui.cpp:2494
+#: src/emu/ui/ui.cpp:2487
 #, c-format
 msgid "Crosshair Scale Y %1$1.3f"
 msgstr "Viseur - Échelle Y %1$1.3f"
 
-#: src/emu/ui/ui.cpp:2513
+#: src/emu/ui/ui.cpp:2506
 #, c-format
 msgid "Crosshair Offset X %1$1.3f"
 msgstr "Viseur - Offset X %1$1.3f"
 
-#: src/emu/ui/ui.cpp:2513
+#: src/emu/ui/ui.cpp:2506
 #, c-format
 msgid "Crosshair Offset Y %1$1.3f"
 msgstr "Viseur - Offset Y %1$1.3f"
@@ -1933,14 +1949,26 @@ msgstr "Tronquée"
 msgid "Full"
 msgstr "Complète"
 
-#: src/emu/ui/viewgfx.cpp:392
+#: src/emu/ui/viewgfx.cpp:391
 msgid " COLORS"
 msgstr " COULEURS"
 
-#: src/emu/ui/viewgfx.cpp:392
+#: src/emu/ui/viewgfx.cpp:391
 msgid " PENS"
 msgstr " MARQUEURS"
 
+#~ msgid "Export XML format (like -listxml)"
+#~ msgstr "Exporter au format XML (comme -listxml)"
+
+#~ msgid "Export TXT format (like -listfull)"
+#~ msgstr "Exporter au format TXT (comme -listfull)"
+
+#~ msgid "Dummy"
+#~ msgstr "Fictif - Non chargé"
+
+#~ msgid "%1$s %2$s ( %3$d / %4$d softwares )"
+#~ msgstr "%1$s %2$s ( %3$d / %4$d logiciels )"
+
 #~ msgid "Lightgun Device Assignment"
 #~ msgstr "Affecter au périphérique Pistolet"
 
diff --git a/language/French_Canada/strings.po b/language/French_Canada/strings.po
index beaeaece0e8..086cd125643 100644
--- a/language/French_Canada/strings.po
+++ b/language/French_Canada/strings.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MAME\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-11 03:33+0200\n"
+"POT-Creation-Date: 2016-04-15 17:42+0200\n"
 "PO-Revision-Date: 2016-02-20 18:03+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: MAME Language Team\n"
@@ -61,14 +61,14 @@ msgstr ""
 msgid "Autofire Status"
 msgstr ""
 
-#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1698
+#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1695
 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211
 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219
 #: src/emu/ui/videoopt.cpp:223
 msgid "Disabled"
 msgstr ""
 
-#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1698
+#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1695
 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211
 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219
 #: src/emu/ui/videoopt.cpp:223
@@ -76,14 +76,14 @@ msgid "Enabled"
 msgstr ""
 
 #: src/emu/ui/cheatopt.cpp:282 src/emu/ui/cheatopt.cpp:288
-#: src/emu/ui/menu.cpp:710 src/emu/ui/miscmenu.cpp:831
-#: src/emu/ui/sndmenu.cpp:135 src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/menu.cpp:755 src/emu/ui/miscmenu.cpp:936
+#: src/emu/ui/sndmenu.cpp:133 src/emu/ui/sndmenu.cpp:135
 msgid "On"
 msgstr ""
 
 #: src/emu/ui/cheatopt.cpp:282 src/emu/ui/cheatopt.cpp:288
-#: src/emu/ui/menu.cpp:713 src/emu/ui/miscmenu.cpp:831
-#: src/emu/ui/sndmenu.cpp:135 src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/menu.cpp:758 src/emu/ui/miscmenu.cpp:936
+#: src/emu/ui/sndmenu.cpp:133 src/emu/ui/sndmenu.cpp:135
 msgid "Off"
 msgstr ""
 
@@ -95,316 +95,316 @@ msgstr ""
 msgid "Autofire Delay"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:158 src/emu/ui/custmenu.cpp:447
+#: src/emu/ui/custmenu.cpp:157 src/emu/ui/custmenu.cpp:445
 msgid "Main filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:167 src/emu/ui/custmenu.cpp:456
+#: src/emu/ui/custmenu.cpp:166 src/emu/ui/custmenu.cpp:454
 msgid "Other filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:176 src/emu/ui/optsmenu.cpp:239
+#: src/emu/ui/custmenu.cpp:175 src/emu/ui/optsmenu.cpp:238
 msgid "^!Manufacturer"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:185 src/emu/ui/custmenu.cpp:474
-#: src/emu/ui/optsmenu.cpp:247
+#: src/emu/ui/custmenu.cpp:184 src/emu/ui/custmenu.cpp:472
+#: src/emu/ui/optsmenu.cpp:246
 msgid "^!Year"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:194 src/emu/ui/custmenu.cpp:510
+#: src/emu/ui/custmenu.cpp:193 src/emu/ui/custmenu.cpp:508
 msgid "Remove last filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:197 src/emu/ui/custmenu.cpp:513
+#: src/emu/ui/custmenu.cpp:196 src/emu/ui/custmenu.cpp:511
 msgid "Add filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:212 src/emu/ui/custmenu.cpp:233
-#: src/emu/ui/custmenu.cpp:529 src/emu/ui/custmenu.cpp:550
+#: src/emu/ui/custmenu.cpp:211 src/emu/ui/custmenu.cpp:231
+#: src/emu/ui/custmenu.cpp:527 src/emu/ui/custmenu.cpp:547
 msgid "Select custom filters:"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:465
+#: src/emu/ui/custmenu.cpp:463
 msgid "^!Publisher"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:483
+#: src/emu/ui/custmenu.cpp:481
 msgid "^!Software List"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:492
+#: src/emu/ui/custmenu.cpp:490
 msgid "^!Device type"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:501
+#: src/emu/ui/custmenu.cpp:499
 msgid "^!Region"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:23
+#: src/emu/ui/custui.cpp:22
 msgid "Show All"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:24
+#: src/emu/ui/custui.cpp:23
 msgid "Hide Filters"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:25
+#: src/emu/ui/custui.cpp:24
 msgid "Hide Info/Image"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:26
+#: src/emu/ui/custui.cpp:25
 msgid "Hide Both"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:142
+#: src/emu/ui/custui.cpp:141
 msgid "Fonts"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:143
+#: src/emu/ui/custui.cpp:142
 msgid "Colors"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:148 src/emu/ui/dirmenu.cpp:33
+#: src/emu/ui/custui.cpp:147 src/emu/ui/dirmenu.cpp:33
 msgid "Language"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:152
+#: src/emu/ui/custui.cpp:151
 msgid "Show side panels"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:167 src/emu/ui/custui.cpp:188
+#: src/emu/ui/custui.cpp:166 src/emu/ui/custui.cpp:186
 msgid "Custom UI Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:246
+#: src/emu/ui/custui.cpp:244
 msgid "default"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:349
+#: src/emu/ui/custui.cpp:347
 msgid "UI Font"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:354
+#: src/emu/ui/custui.cpp:352
 msgid "Bold"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:355
+#: src/emu/ui/custui.cpp:353
 msgid "Italic"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:360
+#: src/emu/ui/custui.cpp:358
 msgid "Lines"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:366
+#: src/emu/ui/custui.cpp:364
 msgid "Infos text size"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:383
+#: src/emu/ui/custui.cpp:381
 msgid "UI Fonts Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:411
+#: src/emu/ui/custui.cpp:408
 msgid "Sample text - Lorem ipsum dolor sit amet, consectetur adipiscing elit."
 msgstr ""
 
-#: src/emu/ui/custui.cpp:509
+#: src/emu/ui/custui.cpp:506
 msgid "Normal text"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:510
+#: src/emu/ui/custui.cpp:507
 msgid "Selected color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:511
+#: src/emu/ui/custui.cpp:508
 msgid "Normal text background"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:512
+#: src/emu/ui/custui.cpp:509
 msgid "Selected background color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:513
+#: src/emu/ui/custui.cpp:510
 msgid "Subitem color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:514 src/emu/ui/custui.cpp:610
+#: src/emu/ui/custui.cpp:511 src/emu/ui/custui.cpp:606
 msgid "Clone"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:515
+#: src/emu/ui/custui.cpp:512
 msgid "Border"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:516
+#: src/emu/ui/custui.cpp:513
 msgid "Background"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:517
+#: src/emu/ui/custui.cpp:514
 msgid "Dipswitch"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:518
+#: src/emu/ui/custui.cpp:515
 msgid "Unavailable color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:519
+#: src/emu/ui/custui.cpp:516
 msgid "Slider color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:520
+#: src/emu/ui/custui.cpp:517
 msgid "Gfx viewer background"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:521
+#: src/emu/ui/custui.cpp:518
 msgid "Mouse over color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:522
+#: src/emu/ui/custui.cpp:519
 msgid "Mouse over background color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:523
+#: src/emu/ui/custui.cpp:520
 msgid "Mouse down color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:524
+#: src/emu/ui/custui.cpp:521
 msgid "Mouse down background color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:527
+#: src/emu/ui/custui.cpp:524
 msgid "Restore originals colors"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:543
+#: src/emu/ui/custui.cpp:540
 msgid "UI Colors Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:572
+#: src/emu/ui/custui.cpp:568
 #, c-format
 msgid "Double click or press %1$s to change the color value"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:598
+#: src/emu/ui/custui.cpp:594
 msgid "Menu Preview"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:606
+#: src/emu/ui/custui.cpp:602
 msgid "Normal"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:607
+#: src/emu/ui/custui.cpp:603
 msgid "Subitem"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:608
+#: src/emu/ui/custui.cpp:604
 msgid "Selected"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:609
+#: src/emu/ui/custui.cpp:605
 msgid "Mouse Over"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:841 src/emu/ui/custui.cpp:844
+#: src/emu/ui/custui.cpp:837 src/emu/ui/custui.cpp:840
 msgid "Alpha"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:849 src/emu/ui/custui.cpp:852
-#: src/emu/ui/custui.cpp:1013
+#: src/emu/ui/custui.cpp:845 src/emu/ui/custui.cpp:848
+#: src/emu/ui/custui.cpp:1007
 msgid "Red"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:857 src/emu/ui/custui.cpp:860
-#: src/emu/ui/custui.cpp:1016
+#: src/emu/ui/custui.cpp:853 src/emu/ui/custui.cpp:856
+#: src/emu/ui/custui.cpp:1010
 msgid "Green"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:865 src/emu/ui/custui.cpp:868
-#: src/emu/ui/custui.cpp:1017
+#: src/emu/ui/custui.cpp:861 src/emu/ui/custui.cpp:864
+#: src/emu/ui/custui.cpp:1011
 msgid "Blue"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:871
+#: src/emu/ui/custui.cpp:867
 msgid "Choose from palette"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:887
+#: src/emu/ui/custui.cpp:883
 msgid " - ARGB Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:912
+#: src/emu/ui/custui.cpp:907
 msgid "Color preview ="
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1009
+#: src/emu/ui/custui.cpp:1003
 msgid "White"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1010
+#: src/emu/ui/custui.cpp:1004
 msgid "Silver"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1011
+#: src/emu/ui/custui.cpp:1005
 msgid "Gray"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1012
+#: src/emu/ui/custui.cpp:1006
 msgid "Black"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1014
+#: src/emu/ui/custui.cpp:1008
 msgid "Orange"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1015
+#: src/emu/ui/custui.cpp:1009
 msgid "Yellow"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1018
+#: src/emu/ui/custui.cpp:1012
 msgid "Violet"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:65
+#: src/emu/ui/datmenu.cpp:64
 msgid "Software History"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:67
+#: src/emu/ui/datmenu.cpp:66
 msgid "Software Usage"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:199
+#: src/emu/ui/datmenu.cpp:196
 msgid "Revision: "
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:287 src/emu/ui/selgame.cpp:40
-#: src/emu/ui/selgame.cpp:2152 src/emu/ui/selgame.cpp:2161
-#: src/emu/ui/selsoft.cpp:1577 src/emu/ui/selsoft.cpp:1597
-#: src/emu/ui/selsoft.cpp:1606
+#: src/emu/ui/datmenu.cpp:284 src/emu/ui/selgame.cpp:39
+#: src/emu/ui/selgame.cpp:2158 src/emu/ui/selgame.cpp:2167
+#: src/emu/ui/selsoft.cpp:1574 src/emu/ui/selsoft.cpp:1592
+#: src/emu/ui/selsoft.cpp:1601
 msgid "History"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:289 src/emu/ui/selgame.cpp:41
+#: src/emu/ui/datmenu.cpp:286 src/emu/ui/selgame.cpp:40
 msgid "Mameinfo"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:291 src/emu/ui/selgame.cpp:43
+#: src/emu/ui/datmenu.cpp:288 src/emu/ui/selgame.cpp:42
 msgid "Messinfo"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:293 src/emu/ui/selgame.cpp:42
+#: src/emu/ui/datmenu.cpp:290 src/emu/ui/selgame.cpp:41
 msgid "Sysinfo"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:295 src/emu/ui/selgame.cpp:46
+#: src/emu/ui/datmenu.cpp:292 src/emu/ui/selgame.cpp:45
 msgid "Mamescore"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:297 src/emu/ui/selgame.cpp:45
+#: src/emu/ui/datmenu.cpp:294 src/emu/ui/selgame.cpp:44
 msgid "Gameinit"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:299 src/emu/ui/selgame.cpp:44
+#: src/emu/ui/datmenu.cpp:296 src/emu/ui/selgame.cpp:43
 msgid "Command"
 msgstr ""
 
@@ -556,75 +556,75 @@ msgstr ""
 msgid "Remove %1$s Folder"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:158
+#: src/emu/ui/filesel.cpp:161
 msgid "File Already Exists - Override?"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:160 src/emu/ui/selgame.cpp:1568
-#: src/emu/ui/selgame.cpp:1569 src/emu/ui/selgame.cpp:1570
-#: src/emu/ui/selgame.cpp:1571 src/emu/ui/selgame.cpp:1572
-#: src/emu/ui/selgame.cpp:1573 src/emu/ui/selgame.cpp:1574
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/filesel.cpp:163 src/emu/ui/selgame.cpp:1576
+#: src/emu/ui/selgame.cpp:1577 src/emu/ui/selgame.cpp:1578
+#: src/emu/ui/selgame.cpp:1579 src/emu/ui/selgame.cpp:1580
+#: src/emu/ui/selgame.cpp:1581 src/emu/ui/selgame.cpp:1582
+#: src/emu/ui/selgame.cpp:1591
 msgid "No"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:161 src/emu/ui/selgame.cpp:1568
-#: src/emu/ui/selgame.cpp:1569 src/emu/ui/selgame.cpp:1570
-#: src/emu/ui/selgame.cpp:1571 src/emu/ui/selgame.cpp:1572
-#: src/emu/ui/selgame.cpp:1573 src/emu/ui/selgame.cpp:1574
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/filesel.cpp:164 src/emu/ui/selgame.cpp:1576
+#: src/emu/ui/selgame.cpp:1577 src/emu/ui/selgame.cpp:1578
+#: src/emu/ui/selgame.cpp:1579 src/emu/ui/selgame.cpp:1580
+#: src/emu/ui/selgame.cpp:1581 src/emu/ui/selgame.cpp:1582
+#: src/emu/ui/selgame.cpp:1591
 msgid "Yes"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:272
+#: src/emu/ui/filesel.cpp:275
 msgid "New Image Name:"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:278
+#: src/emu/ui/filesel.cpp:281
 msgid "Image Format:"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:284
+#: src/emu/ui/filesel.cpp:287
 msgid "Create"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:315
+#: src/emu/ui/filesel.cpp:318
 msgid "Please enter a file extension too"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:503 src/emu/ui/swlist.cpp:65
+#: src/emu/ui/filesel.cpp:506 src/emu/ui/swlist.cpp:65
 msgid "[empty slot]"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:507
+#: src/emu/ui/filesel.cpp:510
 msgid "[create]"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:511 src/emu/ui/swlist.cpp:76
+#: src/emu/ui/filesel.cpp:514 src/emu/ui/swlist.cpp:76
 msgid "[software list]"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:803
+#: src/emu/ui/filesel.cpp:806
 msgid "Select image format"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:863
+#: src/emu/ui/filesel.cpp:866
 msgid "Select access mode"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:864
+#: src/emu/ui/filesel.cpp:867
 msgid "Read-only"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:866
+#: src/emu/ui/filesel.cpp:869
 msgid "Read-write"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:867
+#: src/emu/ui/filesel.cpp:870
 msgid "Read this image, write to another image"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:868
+#: src/emu/ui/filesel.cpp:871
 msgid "Read this image, write to diff"
 msgstr ""
 
@@ -650,7 +650,7 @@ msgstr ""
 msgid "[empty]"
 msgstr ""
 
-#: src/emu/ui/info_pty.cpp:26 src/emu/ui/mainmenu.cpp:91
+#: src/emu/ui/info_pty.cpp:26 src/emu/ui/mainmenu.cpp:96
 msgid "Pseudo terminals"
 msgstr ""
 
@@ -666,7 +666,7 @@ msgstr ""
 msgid "Other Controls"
 msgstr ""
 
-#: src/emu/ui/inputmap.cpp:622 src/emu/ui/miscmenu.cpp:91
+#: src/emu/ui/inputmap.cpp:622 src/emu/ui/miscmenu.cpp:92
 #: src/emu/ui/slotopt.cpp:172
 msgid "Reset"
 msgstr ""
@@ -699,27 +699,27 @@ msgstr ""
 msgid "Machine Information"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:78
+#: src/emu/ui/mainmenu.cpp:80
 msgid "Image Information"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:81
+#: src/emu/ui/mainmenu.cpp:83
 msgid "File Manager"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:86
+#: src/emu/ui/mainmenu.cpp:92
 msgid "Tape Control"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:94
+#: src/emu/ui/mainmenu.cpp:99
 msgid "Bios Selection"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:100
+#: src/emu/ui/mainmenu.cpp:104
 msgid "Slot Devices"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:107
+#: src/emu/ui/mainmenu.cpp:109
 msgid "Barcode Reader"
 msgstr ""
 
@@ -727,43 +727,43 @@ msgstr ""
 msgid "Network Devices"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:119
+#: src/emu/ui/mainmenu.cpp:118
 msgid "Keyboard Mode"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:122
+#: src/emu/ui/mainmenu.cpp:121
 msgid "Slider Controls"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:125
+#: src/emu/ui/mainmenu.cpp:124
 msgid "Video Options"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:129
+#: src/emu/ui/mainmenu.cpp:128
 msgid "Crosshair Options"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:133
+#: src/emu/ui/mainmenu.cpp:132
 msgid "Cheat"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:136
+#: src/emu/ui/mainmenu.cpp:135
 msgid "Plugin Options"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:140
+#: src/emu/ui/mainmenu.cpp:139
 msgid "External DAT View"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:146
+#: src/emu/ui/mainmenu.cpp:145 src/emu/ui/miscmenu.cpp:785
 msgid "Add To Favorites"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:148
+#: src/emu/ui/mainmenu.cpp:147 src/emu/ui/miscmenu.cpp:787
 msgid "Remove From Favorites"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:155
+#: src/emu/ui/mainmenu.cpp:154
 msgid "Select New Machine"
 msgstr ""
 
@@ -803,189 +803,205 @@ msgstr ""
 msgid "Return to Previous Menu"
 msgstr ""
 
-#: src/emu/ui/menu.cpp:716
+#: src/emu/ui/menu.cpp:761
 msgid "Auto"
 msgstr ""
 
-#: src/emu/ui/menu.cpp:2133
+#: src/emu/ui/menu.cpp:2195
 msgid "Images"
 msgstr ""
 
-#: src/emu/ui/menu.cpp:2134
+#: src/emu/ui/menu.cpp:2196
 msgid "Infos"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Keyboard Mode:"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Natural"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Emulated"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:240
+#: src/emu/ui/miscmenu.cpp:241
 #, c-format
 msgid ""
 "Uptime: %1$d:%2$02d:%3$02d\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:242
+#: src/emu/ui/miscmenu.cpp:243
 #, c-format
 msgid ""
 "Uptime: %1$d:%2$02d\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:246
+#: src/emu/ui/miscmenu.cpp:247
 #, c-format
 msgid ""
 "Tickets dispensed: %1$d\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:257
+#: src/emu/ui/miscmenu.cpp:258
 msgid "Coin %1$c: NA%3$s\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:257
+#: src/emu/ui/miscmenu.cpp:258
 #, c-format
 msgid "Coin %1$c: %2$d%3$s\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:260
+#: src/emu/ui/miscmenu.cpp:261
 msgid " (locked)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:519
+#: src/emu/ui/miscmenu.cpp:520
 msgid "Visible Delay"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:617
+#: src/emu/ui/miscmenu.cpp:619
 #, c-format
 msgid "%s.xml saved under ui folder."
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:645
+#: src/emu/ui/miscmenu.cpp:647
 msgid "Name:             Description:\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:657
+#: src/emu/ui/miscmenu.cpp:659
 #, c-format
 msgid "%s.txt saved under ui folder."
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:675
-msgid "Export XML format (like -listxml)"
+#: src/emu/ui/miscmenu.cpp:677
+msgid "Export list in XML format (like -listxml)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:676
-msgid "Export TXT format (like -listfull)"
+#: src/emu/ui/miscmenu.cpp:678
+msgid "Export list in XML format (like -listxml, but exclude devices)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:734
-msgid "Dummy"
+#: src/emu/ui/miscmenu.cpp:679
+msgid "Export list in TXT format (like -listfull)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:736
-msgid "Save machine configuration"
-msgstr ""
-
-#: src/emu/ui/miscmenu.cpp:848 src/emu/ui/miscmenu.cpp:869
-#: src/emu/ui/selgame.cpp:594
-msgid "Plugins"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:218
-msgid "Filter"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:226
-msgid " ^!File"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:231
-msgid " ^!Category"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:254
-msgid "^!Setup custom filter"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:262
-msgid "Customize UI"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:263
-msgid "Configure Directories"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:266 src/emu/ui/sndmenu.cpp:151
-#: src/emu/ui/sndmenu.cpp:172
-msgid "Sound Options"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:269
-msgid "General Inputs"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:272
-msgid "Save Configuration"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:286 src/emu/ui/optsmenu.cpp:307
-msgid "Settings"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:327
-msgid "**Error saving ui.ini**"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:374
-#, c-format
-msgid "**Error saving %s.ini**"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:378
+#: src/emu/ui/miscmenu.cpp:729 src/emu/ui/optsmenu.cpp:376
 msgid ""
 "\n"
 "    Configuration saved    \n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/selector.cpp:166
+#: src/emu/ui/miscmenu.cpp:774
+msgid "Bios"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:776
+msgid "Driver"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:790
+msgid "Save machine configuration"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:806
+msgid "Configure machine:"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:868 src/emu/ui/selsoft.cpp:109
+msgid " (default)"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:953 src/emu/ui/miscmenu.cpp:973
+#: src/emu/ui/selgame.cpp:600
+msgid "Plugins"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:217
+msgid "Filter"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:225
+msgid " ^!File"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:230
+msgid " ^!Category"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:253
+msgid "^!Setup custom filter"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:261
+msgid "Customize UI"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:262
+msgid "Configure Directories"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:265 src/emu/ui/sndmenu.cpp:149
+#: src/emu/ui/sndmenu.cpp:169
+msgid "Sound Options"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:268
+msgid "General Inputs"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:271
+msgid "Save Configuration"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:285 src/emu/ui/optsmenu.cpp:305
+msgid "Settings"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:325
+msgid "**Error saving ui.ini**"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:372
+#, c-format
+msgid "**Error saving %s.ini**"
+msgstr ""
+
+#: src/emu/ui/selector.cpp:165
 msgid "Selection List - Search: "
 msgstr ""
 
-#: src/emu/ui/selector.cpp:196
+#: src/emu/ui/selector.cpp:194
 #, c-format
 msgid "Double click or press %1$s to select"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:39
+#: src/emu/ui/selgame.cpp:38
 msgid "General Info"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:374 src/emu/ui/selsoft.cpp:282
+#: src/emu/ui/selgame.cpp:380 src/emu/ui/selsoft.cpp:281
 #, c-format
 msgid ""
 "%s\n"
 " added to favorites list."
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:380 src/emu/ui/selgame.cpp:389
-#: src/emu/ui/selsoft.cpp:287
+#: src/emu/ui/selgame.cpp:386 src/emu/ui/selgame.cpp:395
+#: src/emu/ui/selsoft.cpp:286
 #, c-format
 msgid ""
 "%s\n"
 " removed from favorites list."
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:450
+#: src/emu/ui/selgame.cpp:457
 msgid ""
 "The selected machine is missing one or more required ROM or CHD images. "
 "Please select a different machine.\n"
@@ -993,275 +1009,275 @@ msgid ""
 "Press any key to continue."
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:589 src/emu/ui/simpleselgame.cpp:265
+#: src/emu/ui/selgame.cpp:595 src/emu/ui/simpleselgame.cpp:265
 msgid "Configure Options"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:752
+#: src/emu/ui/selgame.cpp:596
+msgid "Configure Machine"
+msgstr ""
+
+#: src/emu/ui/selgame.cpp:758
 #, c-format
 msgid "%1$s %2$s ( %3$d / %4$d machines (%5$d BIOS) )"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:762
+#: src/emu/ui/selgame.cpp:768
 #, c-format
 msgid "%1$s (%2$s - %3$s) - "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:769 src/emu/ui/selgame.cpp:775
+#: src/emu/ui/selgame.cpp:775 src/emu/ui/selgame.cpp:781
 #, c-format
 msgid "%1$s (%2$s) - "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:784
+#: src/emu/ui/selgame.cpp:790
 #, c-format
 msgid "%1$s Search: %2$s_"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:838
+#: src/emu/ui/selgame.cpp:844
 #, c-format
 msgid "Romset: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:841 src/emu/ui/selgame.cpp:890
-#: src/emu/ui/selsoft.cpp:751 src/emu/ui/selsoft.cpp:801
+#: src/emu/ui/selgame.cpp:847 src/emu/ui/selgame.cpp:896
+#: src/emu/ui/selsoft.cpp:750 src/emu/ui/selsoft.cpp:800
 #: src/emu/ui/simpleselgame.cpp:328
 #, c-format
 msgid "%1$s, %2$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:847 src/emu/ui/selsoft.cpp:757
+#: src/emu/ui/selgame.cpp:853 src/emu/ui/selsoft.cpp:756
 #, c-format
 msgid "Driver is clone of: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:849 src/emu/ui/selsoft.cpp:759
+#: src/emu/ui/selgame.cpp:855 src/emu/ui/selsoft.cpp:758
 msgid "Driver is parent"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:853 src/emu/ui/selsoft.cpp:763
+#: src/emu/ui/selgame.cpp:859 src/emu/ui/selsoft.cpp:762
 #: src/emu/ui/simpleselgame.cpp:335
 msgid "Overall: NOT WORKING"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:855 src/emu/ui/selsoft.cpp:765
+#: src/emu/ui/selgame.cpp:861 src/emu/ui/selsoft.cpp:764
 #: src/emu/ui/simpleselgame.cpp:337
 msgid "Overall: Unemulated Protection"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:857 src/emu/ui/selsoft.cpp:767
+#: src/emu/ui/selgame.cpp:863 src/emu/ui/selsoft.cpp:766
 #: src/emu/ui/simpleselgame.cpp:339
 msgid "Overall: Working"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:861 src/emu/ui/selsoft.cpp:771
+#: src/emu/ui/selgame.cpp:867 src/emu/ui/selsoft.cpp:770
 msgid "Graphics: Imperfect, "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:863 src/emu/ui/selsoft.cpp:773
+#: src/emu/ui/selgame.cpp:869 src/emu/ui/selsoft.cpp:772
 msgid "Graphics: OK, "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:866 src/emu/ui/selsoft.cpp:776
+#: src/emu/ui/selgame.cpp:872 src/emu/ui/selsoft.cpp:775
 msgid "Sound: Unimplemented"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:868 src/emu/ui/selsoft.cpp:778
+#: src/emu/ui/selgame.cpp:874 src/emu/ui/selsoft.cpp:777
 msgid "Sound: Imperfect"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:870 src/emu/ui/selsoft.cpp:780
+#: src/emu/ui/selgame.cpp:876 src/emu/ui/selsoft.cpp:779
 msgid "Sound: OK"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:887
+#: src/emu/ui/selgame.cpp:893
 #, c-format
 msgid "System: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:894 src/emu/ui/selsoft.cpp:805
+#: src/emu/ui/selgame.cpp:900 src/emu/ui/selsoft.cpp:804
 #, c-format
 msgid "Software is clone of: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:896 src/emu/ui/selsoft.cpp:807
+#: src/emu/ui/selgame.cpp:902 src/emu/ui/selsoft.cpp:806
 msgid "Software is parent"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:901 src/emu/ui/selsoft.cpp:812
+#: src/emu/ui/selgame.cpp:907 src/emu/ui/selsoft.cpp:811
 msgid "Supported: No"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:906 src/emu/ui/selsoft.cpp:817
+#: src/emu/ui/selgame.cpp:912 src/emu/ui/selsoft.cpp:816
 msgid "Supported: Partial"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:911 src/emu/ui/selsoft.cpp:822
+#: src/emu/ui/selgame.cpp:917 src/emu/ui/selsoft.cpp:821
 msgid "Supported: Yes"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:916 src/emu/ui/selsoft.cpp:827
+#: src/emu/ui/selgame.cpp:922 src/emu/ui/selsoft.cpp:826
 #, c-format
 msgid "romset: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:923
+#: src/emu/ui/selgame.cpp:929
 #, c-format
 msgid "%1$s %2$s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1535
+#: src/emu/ui/selgame.cpp:1543
 #, c-format
 msgid "Romset: %1$-.100s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1536
+#: src/emu/ui/selgame.cpp:1544
 #, c-format
 msgid "Year: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1537
+#: src/emu/ui/selgame.cpp:1545
 #, c-format
 msgid "Manufacturer: %1$-.100s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1541
+#: src/emu/ui/selgame.cpp:1549
 #, c-format
 msgid "Driver is Clone of: %1$-.100s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1543
+#: src/emu/ui/selgame.cpp:1551
 msgid "Driver is Parent\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1546
+#: src/emu/ui/selgame.cpp:1554
 msgid "Overall: NOT WORKING\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1548
+#: src/emu/ui/selgame.cpp:1556
 msgid "Overall: Unemulated Protection\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1550
+#: src/emu/ui/selgame.cpp:1558
 msgid "Overall: Working\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1553
+#: src/emu/ui/selgame.cpp:1561
 msgid "Graphics: Imperfect Colors\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1557
+#: src/emu/ui/selgame.cpp:1565
 msgid "Graphics: Imperfect\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1559
+#: src/emu/ui/selgame.cpp:1567
 msgid "Graphics: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1562
+#: src/emu/ui/selgame.cpp:1570
 msgid "Sound: Unimplemented\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1564
+#: src/emu/ui/selgame.cpp:1572
 msgid "Sound: Imperfect\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1566
+#: src/emu/ui/selgame.cpp:1574
 msgid "Sound: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1568
+#: src/emu/ui/selgame.cpp:1576
 #, c-format
 msgid "Driver is Skeleton: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1569
+#: src/emu/ui/selgame.cpp:1577
 #, c-format
 msgid "Game is Mechanical: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1570
+#: src/emu/ui/selgame.cpp:1578
 #, c-format
 msgid "Requires Artwork: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1571
+#: src/emu/ui/selgame.cpp:1579
 #, c-format
 msgid "Requires Clickable Artwork: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1572
+#: src/emu/ui/selgame.cpp:1580
 #, c-format
 msgid "Support Cocktail: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1573
+#: src/emu/ui/selgame.cpp:1581
 #, c-format
 msgid "Driver is Bios: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1574
+#: src/emu/ui/selgame.cpp:1582
 #, c-format
 msgid "Support Save: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 #, c-format
 msgid "Screen Orientation: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 msgid "Vertical"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 msgid "Horizontal"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/selgame.cpp:1591
 #, c-format
 msgid "Requires CHD: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1596
+#: src/emu/ui/selgame.cpp:1604
 msgid "Roms Audit Pass: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1598
+#: src/emu/ui/selgame.cpp:1606
 msgid "Roms Audit Pass: BAD\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1601
+#: src/emu/ui/selgame.cpp:1609
 msgid "Samples Audit Pass: None Needed\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1603
+#: src/emu/ui/selgame.cpp:1611
 msgid "Samples Audit Pass: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1605
+#: src/emu/ui/selgame.cpp:1613
 msgid "Samples Audit Pass: BAD\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1608
+#: src/emu/ui/selgame.cpp:1616
 msgid ""
 "Roms Audit Pass: Disabled\n"
 "Samples Audit Pass: Disabled\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:2049 src/emu/ui/selgame.cpp:2212
-#: src/emu/ui/selsoft.cpp:1662
+#: src/emu/ui/selgame.cpp:2055 src/emu/ui/selgame.cpp:2216
+#: src/emu/ui/selsoft.cpp:1655
 msgid "No Infos Available"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:2162 src/emu/ui/selsoft.cpp:1607
+#: src/emu/ui/selgame.cpp:2168 src/emu/ui/selsoft.cpp:1602
 msgid "Usage"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:110
-msgid " (default)"
-msgstr ""
-
-#: src/emu/ui/selsoft.cpp:381
+#: src/emu/ui/selsoft.cpp:380
 msgid ""
 "The selected software is missing one or more required files. Please select a "
 "different software.\n"
@@ -1269,57 +1285,57 @@ msgid ""
 "Press any key to continue."
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:684
+#: src/emu/ui/selsoft.cpp:683
 #, c-format
-msgid "%1$s %2$s ( %3$d / %4$d softwares )"
+msgid "%1$s %2$s ( %3$d / %4$d software packages )"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:685
+#: src/emu/ui/selsoft.cpp:684
 #, c-format
 msgid "Driver: \"%1$s\" software list "
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:688
+#: src/emu/ui/selsoft.cpp:687
 #, c-format
 msgid "Region: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:690
+#: src/emu/ui/selsoft.cpp:689
 #, c-format
 msgid "Publisher: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:692
+#: src/emu/ui/selsoft.cpp:691
 #, c-format
 msgid "Year: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:694
+#: src/emu/ui/selsoft.cpp:693
 #, c-format
 msgid "Software List: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:696
+#: src/emu/ui/selsoft.cpp:695
 #, c-format
 msgid "Device type: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:698
+#: src/emu/ui/selsoft.cpp:697
 #, c-format
 msgid "%s Search: %s_"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:748 src/emu/ui/selsoft.cpp:798
+#: src/emu/ui/selsoft.cpp:747 src/emu/ui/selsoft.cpp:797
 #: src/emu/ui/simpleselgame.cpp:325
 #, c-format
 msgid "%1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:1998 src/emu/ui/selsoft.cpp:2018
+#: src/emu/ui/selsoft.cpp:1991 src/emu/ui/selsoft.cpp:2011
 msgid "Software part selection:"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:2136 src/emu/ui/selsoft.cpp:2156
+#: src/emu/ui/selsoft.cpp:2129 src/emu/ui/selsoft.cpp:2149
 msgid "Bios selection:"
 msgstr ""
 
@@ -1367,15 +1383,15 @@ msgstr ""
 msgid " [internal]"
 msgstr ""
 
-#: src/emu/ui/sndmenu.cpp:135
+#: src/emu/ui/sndmenu.cpp:133
 msgid "Sound"
 msgstr ""
 
-#: src/emu/ui/sndmenu.cpp:136
+#: src/emu/ui/sndmenu.cpp:134
 msgid "Sample Rate"
 msgstr ""
 
-#: src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/sndmenu.cpp:135
 msgid "Use External Samples"
 msgstr ""
 
@@ -1444,80 +1460,80 @@ msgstr ""
 msgid "Fast Forward"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:419
+#: src/emu/ui/ui.cpp:418
 msgid "This driver requires images to be loaded in the following device(s): "
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1074
+#: src/emu/ui/ui.cpp:1071
 msgid ""
 "One or more ROMs/CHDs for this machine are incorrect. The machine may not "
 "run correctly.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1087
+#: src/emu/ui/ui.cpp:1084
 msgid ""
 "There are known problems with this machine\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1091
+#: src/emu/ui/ui.cpp:1088
 msgid ""
 "One or more ROMs/CHDs for this machine have not been correctly dumped.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1095
+#: src/emu/ui/ui.cpp:1092
 #, c-format
 msgid "The keyboard emulation may not be 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1097
+#: src/emu/ui/ui.cpp:1094
 #, c-format
 msgid "The colors aren't 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1099
+#: src/emu/ui/ui.cpp:1096
 msgid "The colors are completely wrong.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1101
+#: src/emu/ui/ui.cpp:1098
 #, c-format
 msgid "The video emulation isn't 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1103
+#: src/emu/ui/ui.cpp:1100
 #, c-format
 msgid "The sound emulation isn't 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1105
+#: src/emu/ui/ui.cpp:1102
 msgid "The machine lacks sound.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1108
+#: src/emu/ui/ui.cpp:1105
 msgid "Screen flipping in cocktail mode is not supported.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1112
+#: src/emu/ui/ui.cpp:1109
 msgid "The machine requires external artwork files\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1117
+#: src/emu/ui/ui.cpp:1114
 msgid ""
 "This machine was never completed. It may exhibit strange behavior or missing "
 "elements that are not bugs in the emulation.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1122
+#: src/emu/ui/ui.cpp:1119
 msgid ""
 "This machine has no sound hardware, MAME will produce no sounds, this is "
 "expected behaviour.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1130
+#: src/emu/ui/ui.cpp:1127
 msgid "The machine has protection which isn't fully emulated.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1133
+#: src/emu/ui/ui.cpp:1130
 msgid ""
 "\n"
 "THIS MACHINE DOESN'T WORK. The emulation for this machine is not yet "
@@ -1525,7 +1541,7 @@ msgid ""
 "the developers to improve the emulation.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1137
+#: src/emu/ui/ui.cpp:1134
 msgid ""
 "\n"
 "Certain elements of this machine cannot be emulated as it requires actual "
@@ -1533,21 +1549,21 @@ msgid ""
 "to fully play this machine.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1156
+#: src/emu/ui/ui.cpp:1153
 msgid ""
 "\n"
 "\n"
 "There are working clones of this machine: "
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1170
+#: src/emu/ui/ui.cpp:1167
 msgid ""
 "\n"
 "\n"
 "Press any key to continue"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1185
+#: src/emu/ui/ui.cpp:1182
 #, c-format
 msgid ""
 "%1$s\n"
@@ -1557,98 +1573,98 @@ msgid ""
 "CPU:\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1221 src/emu/ui/ui.cpp:1260
+#: src/emu/ui/ui.cpp:1218 src/emu/ui/ui.cpp:1257
 msgid "MHz"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1221 src/emu/ui/ui.cpp:1260
+#: src/emu/ui/ui.cpp:1218 src/emu/ui/ui.cpp:1257
 msgid "kHz"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1235
+#: src/emu/ui/ui.cpp:1232
 msgid ""
 "\n"
 "Sound:\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1264
+#: src/emu/ui/ui.cpp:1261
 msgid ""
 "\n"
 "Video:\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1268
+#: src/emu/ui/ui.cpp:1265
 msgid "None\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1275
+#: src/emu/ui/ui.cpp:1272
 msgid "Vector"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1286
+#: src/emu/ui/ui.cpp:1283
 #, c-format
 msgid "%1$s: %2$s\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1286
+#: src/emu/ui/ui.cpp:1283
 msgid "%2$s\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1541 src/emu/ui/ui.cpp:1551
+#: src/emu/ui/ui.cpp:1538 src/emu/ui/ui.cpp:1548
 msgid "Keyboard Emulation Status"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1543
+#: src/emu/ui/ui.cpp:1540
 msgid "Mode: PARTIAL Emulation"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1544
+#: src/emu/ui/ui.cpp:1541
 msgid "UI:   Enabled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1546 src/emu/ui/ui.cpp:1556
+#: src/emu/ui/ui.cpp:1543 src/emu/ui/ui.cpp:1553
 msgid "**Use ScrLock to toggle**"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1553
+#: src/emu/ui/ui.cpp:1550
 msgid "Mode: FULL Emulation"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1554
+#: src/emu/ui/ui.cpp:1551
 msgid "UI:   Disabled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1692
+#: src/emu/ui/ui.cpp:1689
 msgid "Autofire can't be enabled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1731
+#: src/emu/ui/ui.cpp:1728
 msgid "Select position to save to"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1733
+#: src/emu/ui/ui.cpp:1730
 msgid "Select position to load from"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1757
+#: src/emu/ui/ui.cpp:1754
 msgid "Save cancelled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1759
+#: src/emu/ui/ui.cpp:1756
 msgid "Load cancelled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1802
+#: src/emu/ui/ui.cpp:1799
 #, c-format
 msgid "Save to position %s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1807
+#: src/emu/ui/ui.cpp:1804
 #, c-format
 msgid "Load from position %s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1847
+#: src/emu/ui/ui.cpp:1844
 #, c-format
 msgid ""
 "Are you sure you want to quit?\n"
@@ -1657,173 +1673,173 @@ msgid ""
 "Press ''%2$s'' to return to emulation."
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1917
+#: src/emu/ui/ui.cpp:1914
 msgid "Master Volume"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1926
+#: src/emu/ui/ui.cpp:1923
 #, c-format
 msgid "%1$s Volume"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1949
+#: src/emu/ui/ui.cpp:1946
 #, c-format
 msgid "Overclock CPU %1$s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1968
+#: src/emu/ui/ui.cpp:1965
 #, c-format
 msgid "%1$s Refresh Rate"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1973
+#: src/emu/ui/ui.cpp:1970
 #, c-format
 msgid "%1$s Brightness"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1975
+#: src/emu/ui/ui.cpp:1972
 #, c-format
 msgid "%1$s Contrast"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1977
+#: src/emu/ui/ui.cpp:1974
 #, c-format
 msgid "%1$s Gamma"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1981
+#: src/emu/ui/ui.cpp:1978
 #, c-format
 msgid "%1$s Horiz Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1983
+#: src/emu/ui/ui.cpp:1980
 #, c-format
 msgid "%1$s Horiz Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1985
+#: src/emu/ui/ui.cpp:1982
 #, c-format
 msgid "%1$s Vert Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1987
+#: src/emu/ui/ui.cpp:1984
 #, c-format
 msgid "%1$s Vert Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2005
+#: src/emu/ui/ui.cpp:2002
 #, c-format
 msgid "Laserdisc '%1$s' Horiz Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2007
+#: src/emu/ui/ui.cpp:2004
 #, c-format
 msgid "Laserdisc '%1$s' Horiz Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2009
+#: src/emu/ui/ui.cpp:2006
 #, c-format
 msgid "Laserdisc '%1$s' Vert Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2011
+#: src/emu/ui/ui.cpp:2008
 #, c-format
 msgid "Laserdisc '%1$s' Vert Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2021
+#: src/emu/ui/ui.cpp:2018
 msgid "Vector Flicker"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2022
+#: src/emu/ui/ui.cpp:2019
 msgid "Beam Width Minimum"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2023
+#: src/emu/ui/ui.cpp:2020
 msgid "Beam Width Maximum"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2024
+#: src/emu/ui/ui.cpp:2021
 msgid "Beam Intensity Weight"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2037
+#: src/emu/ui/ui.cpp:2034
 #, c-format
 msgid "Crosshair Scale %1$s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2037 src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2034 src/emu/ui/ui.cpp:2036
 msgid "X"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2037 src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2034 src/emu/ui/ui.cpp:2036
 msgid "Y"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2036
 #, c-format
 msgid "Crosshair Offset %1$s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2071
+#: src/emu/ui/ui.cpp:2068
 #, c-format
 msgid "%1$3ddB"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2115
+#: src/emu/ui/ui.cpp:2112
 #, c-format
 msgid "%1$d%%"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2131
+#: src/emu/ui/ui.cpp:2128
 #, c-format
 msgid "%1$3.0f%%"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2154
+#: src/emu/ui/ui.cpp:2151
 #, c-format
 msgid "%1$.3ffps"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2177 src/emu/ui/ui.cpp:2199 src/emu/ui/ui.cpp:2220
-#: src/emu/ui/ui.cpp:2242 src/emu/ui/ui.cpp:2264 src/emu/ui/ui.cpp:2286
-#: src/emu/ui/ui.cpp:2308 src/emu/ui/ui.cpp:2330 src/emu/ui/ui.cpp:2352
-#: src/emu/ui/ui.cpp:2374 src/emu/ui/ui.cpp:2396
+#: src/emu/ui/ui.cpp:2174 src/emu/ui/ui.cpp:2196 src/emu/ui/ui.cpp:2217
+#: src/emu/ui/ui.cpp:2239 src/emu/ui/ui.cpp:2261 src/emu/ui/ui.cpp:2283
+#: src/emu/ui/ui.cpp:2305 src/emu/ui/ui.cpp:2327 src/emu/ui/ui.cpp:2349
+#: src/emu/ui/ui.cpp:2371 src/emu/ui/ui.cpp:2393
 #, c-format
 msgid "%1$.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2412 src/emu/ui/ui.cpp:2428 src/emu/ui/ui.cpp:2444
-#: src/emu/ui/ui.cpp:2460
+#: src/emu/ui/ui.cpp:2408 src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2438
+#: src/emu/ui/ui.cpp:2453
 #, c-format
 msgid "%1$1.2f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2476
+#: src/emu/ui/ui.cpp:2469
 #, c-format
 msgid "Screen '%1$s'"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2478
+#: src/emu/ui/ui.cpp:2471
 msgid "Screen"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2494
+#: src/emu/ui/ui.cpp:2487
 #, c-format
 msgid "Crosshair Scale X %1$1.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2494
+#: src/emu/ui/ui.cpp:2487
 #, c-format
 msgid "Crosshair Scale Y %1$1.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2513
+#: src/emu/ui/ui.cpp:2506
 #, c-format
 msgid "Crosshair Offset X %1$1.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2513
+#: src/emu/ui/ui.cpp:2506
 #, c-format
 msgid "Crosshair Offset Y %1$1.3f"
 msgstr ""
@@ -1865,10 +1881,10 @@ msgstr ""
 msgid "Full"
 msgstr ""
 
-#: src/emu/ui/viewgfx.cpp:392
+#: src/emu/ui/viewgfx.cpp:391
 msgid " COLORS"
 msgstr ""
 
-#: src/emu/ui/viewgfx.cpp:392
+#: src/emu/ui/viewgfx.cpp:391
 msgid " PENS"
 msgstr ""
diff --git a/language/Georgian/strings.po b/language/Georgian/strings.po
index bdb5db66592..5cc95a9fbb8 100644
--- a/language/Georgian/strings.po
+++ b/language/Georgian/strings.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MAME\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-11 03:33+0200\n"
+"POT-Creation-Date: 2016-04-15 17:42+0200\n"
 "PO-Revision-Date: 2016-02-20 18:03+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: MAME Language Team\n"
@@ -59,14 +59,14 @@ msgstr ""
 msgid "Autofire Status"
 msgstr ""
 
-#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1698
+#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1695
 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211
 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219
 #: src/emu/ui/videoopt.cpp:223
 msgid "Disabled"
 msgstr ""
 
-#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1698
+#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1695
 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211
 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219
 #: src/emu/ui/videoopt.cpp:223
@@ -74,14 +74,14 @@ msgid "Enabled"
 msgstr ""
 
 #: src/emu/ui/cheatopt.cpp:282 src/emu/ui/cheatopt.cpp:288
-#: src/emu/ui/menu.cpp:710 src/emu/ui/miscmenu.cpp:831
-#: src/emu/ui/sndmenu.cpp:135 src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/menu.cpp:755 src/emu/ui/miscmenu.cpp:936
+#: src/emu/ui/sndmenu.cpp:133 src/emu/ui/sndmenu.cpp:135
 msgid "On"
 msgstr ""
 
 #: src/emu/ui/cheatopt.cpp:282 src/emu/ui/cheatopt.cpp:288
-#: src/emu/ui/menu.cpp:713 src/emu/ui/miscmenu.cpp:831
-#: src/emu/ui/sndmenu.cpp:135 src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/menu.cpp:758 src/emu/ui/miscmenu.cpp:936
+#: src/emu/ui/sndmenu.cpp:133 src/emu/ui/sndmenu.cpp:135
 msgid "Off"
 msgstr ""
 
@@ -93,316 +93,316 @@ msgstr ""
 msgid "Autofire Delay"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:158 src/emu/ui/custmenu.cpp:447
+#: src/emu/ui/custmenu.cpp:157 src/emu/ui/custmenu.cpp:445
 msgid "Main filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:167 src/emu/ui/custmenu.cpp:456
+#: src/emu/ui/custmenu.cpp:166 src/emu/ui/custmenu.cpp:454
 msgid "Other filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:176 src/emu/ui/optsmenu.cpp:239
+#: src/emu/ui/custmenu.cpp:175 src/emu/ui/optsmenu.cpp:238
 msgid "^!Manufacturer"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:185 src/emu/ui/custmenu.cpp:474
-#: src/emu/ui/optsmenu.cpp:247
+#: src/emu/ui/custmenu.cpp:184 src/emu/ui/custmenu.cpp:472
+#: src/emu/ui/optsmenu.cpp:246
 msgid "^!Year"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:194 src/emu/ui/custmenu.cpp:510
+#: src/emu/ui/custmenu.cpp:193 src/emu/ui/custmenu.cpp:508
 msgid "Remove last filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:197 src/emu/ui/custmenu.cpp:513
+#: src/emu/ui/custmenu.cpp:196 src/emu/ui/custmenu.cpp:511
 msgid "Add filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:212 src/emu/ui/custmenu.cpp:233
-#: src/emu/ui/custmenu.cpp:529 src/emu/ui/custmenu.cpp:550
+#: src/emu/ui/custmenu.cpp:211 src/emu/ui/custmenu.cpp:231
+#: src/emu/ui/custmenu.cpp:527 src/emu/ui/custmenu.cpp:547
 msgid "Select custom filters:"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:465
+#: src/emu/ui/custmenu.cpp:463
 msgid "^!Publisher"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:483
+#: src/emu/ui/custmenu.cpp:481
 msgid "^!Software List"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:492
+#: src/emu/ui/custmenu.cpp:490
 msgid "^!Device type"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:501
+#: src/emu/ui/custmenu.cpp:499
 msgid "^!Region"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:23
+#: src/emu/ui/custui.cpp:22
 msgid "Show All"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:24
+#: src/emu/ui/custui.cpp:23
 msgid "Hide Filters"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:25
+#: src/emu/ui/custui.cpp:24
 msgid "Hide Info/Image"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:26
+#: src/emu/ui/custui.cpp:25
 msgid "Hide Both"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:142
+#: src/emu/ui/custui.cpp:141
 msgid "Fonts"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:143
+#: src/emu/ui/custui.cpp:142
 msgid "Colors"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:148 src/emu/ui/dirmenu.cpp:33
+#: src/emu/ui/custui.cpp:147 src/emu/ui/dirmenu.cpp:33
 msgid "Language"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:152
+#: src/emu/ui/custui.cpp:151
 msgid "Show side panels"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:167 src/emu/ui/custui.cpp:188
+#: src/emu/ui/custui.cpp:166 src/emu/ui/custui.cpp:186
 msgid "Custom UI Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:246
+#: src/emu/ui/custui.cpp:244
 msgid "default"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:349
+#: src/emu/ui/custui.cpp:347
 msgid "UI Font"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:354
+#: src/emu/ui/custui.cpp:352
 msgid "Bold"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:355
+#: src/emu/ui/custui.cpp:353
 msgid "Italic"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:360
+#: src/emu/ui/custui.cpp:358
 msgid "Lines"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:366
+#: src/emu/ui/custui.cpp:364
 msgid "Infos text size"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:383
+#: src/emu/ui/custui.cpp:381
 msgid "UI Fonts Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:411
+#: src/emu/ui/custui.cpp:408
 msgid "Sample text - Lorem ipsum dolor sit amet, consectetur adipiscing elit."
 msgstr ""
 
-#: src/emu/ui/custui.cpp:509
+#: src/emu/ui/custui.cpp:506
 msgid "Normal text"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:510
+#: src/emu/ui/custui.cpp:507
 msgid "Selected color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:511
+#: src/emu/ui/custui.cpp:508
 msgid "Normal text background"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:512
+#: src/emu/ui/custui.cpp:509
 msgid "Selected background color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:513
+#: src/emu/ui/custui.cpp:510
 msgid "Subitem color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:514 src/emu/ui/custui.cpp:610
+#: src/emu/ui/custui.cpp:511 src/emu/ui/custui.cpp:606
 msgid "Clone"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:515
+#: src/emu/ui/custui.cpp:512
 msgid "Border"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:516
+#: src/emu/ui/custui.cpp:513
 msgid "Background"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:517
+#: src/emu/ui/custui.cpp:514
 msgid "Dipswitch"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:518
+#: src/emu/ui/custui.cpp:515
 msgid "Unavailable color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:519
+#: src/emu/ui/custui.cpp:516
 msgid "Slider color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:520
+#: src/emu/ui/custui.cpp:517
 msgid "Gfx viewer background"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:521
+#: src/emu/ui/custui.cpp:518
 msgid "Mouse over color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:522
+#: src/emu/ui/custui.cpp:519
 msgid "Mouse over background color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:523
+#: src/emu/ui/custui.cpp:520
 msgid "Mouse down color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:524
+#: src/emu/ui/custui.cpp:521
 msgid "Mouse down background color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:527
+#: src/emu/ui/custui.cpp:524
 msgid "Restore originals colors"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:543
+#: src/emu/ui/custui.cpp:540
 msgid "UI Colors Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:572
+#: src/emu/ui/custui.cpp:568
 #, c-format
 msgid "Double click or press %1$s to change the color value"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:598
+#: src/emu/ui/custui.cpp:594
 msgid "Menu Preview"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:606
+#: src/emu/ui/custui.cpp:602
 msgid "Normal"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:607
+#: src/emu/ui/custui.cpp:603
 msgid "Subitem"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:608
+#: src/emu/ui/custui.cpp:604
 msgid "Selected"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:609
+#: src/emu/ui/custui.cpp:605
 msgid "Mouse Over"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:841 src/emu/ui/custui.cpp:844
+#: src/emu/ui/custui.cpp:837 src/emu/ui/custui.cpp:840
 msgid "Alpha"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:849 src/emu/ui/custui.cpp:852
-#: src/emu/ui/custui.cpp:1013
+#: src/emu/ui/custui.cpp:845 src/emu/ui/custui.cpp:848
+#: src/emu/ui/custui.cpp:1007
 msgid "Red"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:857 src/emu/ui/custui.cpp:860
-#: src/emu/ui/custui.cpp:1016
+#: src/emu/ui/custui.cpp:853 src/emu/ui/custui.cpp:856
+#: src/emu/ui/custui.cpp:1010
 msgid "Green"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:865 src/emu/ui/custui.cpp:868
-#: src/emu/ui/custui.cpp:1017
+#: src/emu/ui/custui.cpp:861 src/emu/ui/custui.cpp:864
+#: src/emu/ui/custui.cpp:1011
 msgid "Blue"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:871
+#: src/emu/ui/custui.cpp:867
 msgid "Choose from palette"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:887
+#: src/emu/ui/custui.cpp:883
 msgid " - ARGB Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:912
+#: src/emu/ui/custui.cpp:907
 msgid "Color preview ="
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1009
+#: src/emu/ui/custui.cpp:1003
 msgid "White"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1010
+#: src/emu/ui/custui.cpp:1004
 msgid "Silver"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1011
+#: src/emu/ui/custui.cpp:1005
 msgid "Gray"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1012
+#: src/emu/ui/custui.cpp:1006
 msgid "Black"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1014
+#: src/emu/ui/custui.cpp:1008
 msgid "Orange"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1015
+#: src/emu/ui/custui.cpp:1009
 msgid "Yellow"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1018
+#: src/emu/ui/custui.cpp:1012
 msgid "Violet"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:65
+#: src/emu/ui/datmenu.cpp:64
 msgid "Software History"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:67
+#: src/emu/ui/datmenu.cpp:66
 msgid "Software Usage"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:199
+#: src/emu/ui/datmenu.cpp:196
 msgid "Revision: "
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:287 src/emu/ui/selgame.cpp:40
-#: src/emu/ui/selgame.cpp:2152 src/emu/ui/selgame.cpp:2161
-#: src/emu/ui/selsoft.cpp:1577 src/emu/ui/selsoft.cpp:1597
-#: src/emu/ui/selsoft.cpp:1606
+#: src/emu/ui/datmenu.cpp:284 src/emu/ui/selgame.cpp:39
+#: src/emu/ui/selgame.cpp:2158 src/emu/ui/selgame.cpp:2167
+#: src/emu/ui/selsoft.cpp:1574 src/emu/ui/selsoft.cpp:1592
+#: src/emu/ui/selsoft.cpp:1601
 msgid "History"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:289 src/emu/ui/selgame.cpp:41
+#: src/emu/ui/datmenu.cpp:286 src/emu/ui/selgame.cpp:40
 msgid "Mameinfo"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:291 src/emu/ui/selgame.cpp:43
+#: src/emu/ui/datmenu.cpp:288 src/emu/ui/selgame.cpp:42
 msgid "Messinfo"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:293 src/emu/ui/selgame.cpp:42
+#: src/emu/ui/datmenu.cpp:290 src/emu/ui/selgame.cpp:41
 msgid "Sysinfo"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:295 src/emu/ui/selgame.cpp:46
+#: src/emu/ui/datmenu.cpp:292 src/emu/ui/selgame.cpp:45
 msgid "Mamescore"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:297 src/emu/ui/selgame.cpp:45
+#: src/emu/ui/datmenu.cpp:294 src/emu/ui/selgame.cpp:44
 msgid "Gameinit"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:299 src/emu/ui/selgame.cpp:44
+#: src/emu/ui/datmenu.cpp:296 src/emu/ui/selgame.cpp:43
 msgid "Command"
 msgstr ""
 
@@ -554,75 +554,75 @@ msgstr ""
 msgid "Remove %1$s Folder"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:158
+#: src/emu/ui/filesel.cpp:161
 msgid "File Already Exists - Override?"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:160 src/emu/ui/selgame.cpp:1568
-#: src/emu/ui/selgame.cpp:1569 src/emu/ui/selgame.cpp:1570
-#: src/emu/ui/selgame.cpp:1571 src/emu/ui/selgame.cpp:1572
-#: src/emu/ui/selgame.cpp:1573 src/emu/ui/selgame.cpp:1574
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/filesel.cpp:163 src/emu/ui/selgame.cpp:1576
+#: src/emu/ui/selgame.cpp:1577 src/emu/ui/selgame.cpp:1578
+#: src/emu/ui/selgame.cpp:1579 src/emu/ui/selgame.cpp:1580
+#: src/emu/ui/selgame.cpp:1581 src/emu/ui/selgame.cpp:1582
+#: src/emu/ui/selgame.cpp:1591
 msgid "No"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:161 src/emu/ui/selgame.cpp:1568
-#: src/emu/ui/selgame.cpp:1569 src/emu/ui/selgame.cpp:1570
-#: src/emu/ui/selgame.cpp:1571 src/emu/ui/selgame.cpp:1572
-#: src/emu/ui/selgame.cpp:1573 src/emu/ui/selgame.cpp:1574
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/filesel.cpp:164 src/emu/ui/selgame.cpp:1576
+#: src/emu/ui/selgame.cpp:1577 src/emu/ui/selgame.cpp:1578
+#: src/emu/ui/selgame.cpp:1579 src/emu/ui/selgame.cpp:1580
+#: src/emu/ui/selgame.cpp:1581 src/emu/ui/selgame.cpp:1582
+#: src/emu/ui/selgame.cpp:1591
 msgid "Yes"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:272
+#: src/emu/ui/filesel.cpp:275
 msgid "New Image Name:"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:278
+#: src/emu/ui/filesel.cpp:281
 msgid "Image Format:"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:284
+#: src/emu/ui/filesel.cpp:287
 msgid "Create"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:315
+#: src/emu/ui/filesel.cpp:318
 msgid "Please enter a file extension too"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:503 src/emu/ui/swlist.cpp:65
+#: src/emu/ui/filesel.cpp:506 src/emu/ui/swlist.cpp:65
 msgid "[empty slot]"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:507
+#: src/emu/ui/filesel.cpp:510
 msgid "[create]"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:511 src/emu/ui/swlist.cpp:76
+#: src/emu/ui/filesel.cpp:514 src/emu/ui/swlist.cpp:76
 msgid "[software list]"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:803
+#: src/emu/ui/filesel.cpp:806
 msgid "Select image format"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:863
+#: src/emu/ui/filesel.cpp:866
 msgid "Select access mode"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:864
+#: src/emu/ui/filesel.cpp:867
 msgid "Read-only"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:866
+#: src/emu/ui/filesel.cpp:869
 msgid "Read-write"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:867
+#: src/emu/ui/filesel.cpp:870
 msgid "Read this image, write to another image"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:868
+#: src/emu/ui/filesel.cpp:871
 msgid "Read this image, write to diff"
 msgstr ""
 
@@ -648,7 +648,7 @@ msgstr ""
 msgid "[empty]"
 msgstr ""
 
-#: src/emu/ui/info_pty.cpp:26 src/emu/ui/mainmenu.cpp:91
+#: src/emu/ui/info_pty.cpp:26 src/emu/ui/mainmenu.cpp:96
 msgid "Pseudo terminals"
 msgstr ""
 
@@ -664,7 +664,7 @@ msgstr ""
 msgid "Other Controls"
 msgstr ""
 
-#: src/emu/ui/inputmap.cpp:622 src/emu/ui/miscmenu.cpp:91
+#: src/emu/ui/inputmap.cpp:622 src/emu/ui/miscmenu.cpp:92
 #: src/emu/ui/slotopt.cpp:172
 msgid "Reset"
 msgstr ""
@@ -697,27 +697,27 @@ msgstr ""
 msgid "Machine Information"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:78
+#: src/emu/ui/mainmenu.cpp:80
 msgid "Image Information"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:81
+#: src/emu/ui/mainmenu.cpp:83
 msgid "File Manager"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:86
+#: src/emu/ui/mainmenu.cpp:92
 msgid "Tape Control"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:94
+#: src/emu/ui/mainmenu.cpp:99
 msgid "Bios Selection"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:100
+#: src/emu/ui/mainmenu.cpp:104
 msgid "Slot Devices"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:107
+#: src/emu/ui/mainmenu.cpp:109
 msgid "Barcode Reader"
 msgstr ""
 
@@ -725,43 +725,43 @@ msgstr ""
 msgid "Network Devices"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:119
+#: src/emu/ui/mainmenu.cpp:118
 msgid "Keyboard Mode"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:122
+#: src/emu/ui/mainmenu.cpp:121
 msgid "Slider Controls"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:125
+#: src/emu/ui/mainmenu.cpp:124
 msgid "Video Options"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:129
+#: src/emu/ui/mainmenu.cpp:128
 msgid "Crosshair Options"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:133
+#: src/emu/ui/mainmenu.cpp:132
 msgid "Cheat"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:136
+#: src/emu/ui/mainmenu.cpp:135
 msgid "Plugin Options"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:140
+#: src/emu/ui/mainmenu.cpp:139
 msgid "External DAT View"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:146
+#: src/emu/ui/mainmenu.cpp:145 src/emu/ui/miscmenu.cpp:785
 msgid "Add To Favorites"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:148
+#: src/emu/ui/mainmenu.cpp:147 src/emu/ui/miscmenu.cpp:787
 msgid "Remove From Favorites"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:155
+#: src/emu/ui/mainmenu.cpp:154
 msgid "Select New Machine"
 msgstr ""
 
@@ -801,189 +801,205 @@ msgstr ""
 msgid "Return to Previous Menu"
 msgstr ""
 
-#: src/emu/ui/menu.cpp:716
+#: src/emu/ui/menu.cpp:761
 msgid "Auto"
 msgstr ""
 
-#: src/emu/ui/menu.cpp:2133
+#: src/emu/ui/menu.cpp:2195
 msgid "Images"
 msgstr ""
 
-#: src/emu/ui/menu.cpp:2134
+#: src/emu/ui/menu.cpp:2196
 msgid "Infos"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Keyboard Mode:"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Natural"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Emulated"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:240
+#: src/emu/ui/miscmenu.cpp:241
 #, c-format
 msgid ""
 "Uptime: %1$d:%2$02d:%3$02d\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:242
+#: src/emu/ui/miscmenu.cpp:243
 #, c-format
 msgid ""
 "Uptime: %1$d:%2$02d\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:246
+#: src/emu/ui/miscmenu.cpp:247
 #, c-format
 msgid ""
 "Tickets dispensed: %1$d\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:257
+#: src/emu/ui/miscmenu.cpp:258
 msgid "Coin %1$c: NA%3$s\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:257
+#: src/emu/ui/miscmenu.cpp:258
 #, c-format
 msgid "Coin %1$c: %2$d%3$s\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:260
+#: src/emu/ui/miscmenu.cpp:261
 msgid " (locked)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:519
+#: src/emu/ui/miscmenu.cpp:520
 msgid "Visible Delay"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:617
+#: src/emu/ui/miscmenu.cpp:619
 #, c-format
 msgid "%s.xml saved under ui folder."
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:645
+#: src/emu/ui/miscmenu.cpp:647
 msgid "Name:             Description:\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:657
+#: src/emu/ui/miscmenu.cpp:659
 #, c-format
 msgid "%s.txt saved under ui folder."
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:675
-msgid "Export XML format (like -listxml)"
+#: src/emu/ui/miscmenu.cpp:677
+msgid "Export list in XML format (like -listxml)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:676
-msgid "Export TXT format (like -listfull)"
+#: src/emu/ui/miscmenu.cpp:678
+msgid "Export list in XML format (like -listxml, but exclude devices)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:734
-msgid "Dummy"
+#: src/emu/ui/miscmenu.cpp:679
+msgid "Export list in TXT format (like -listfull)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:736
-msgid "Save machine configuration"
-msgstr ""
-
-#: src/emu/ui/miscmenu.cpp:848 src/emu/ui/miscmenu.cpp:869
-#: src/emu/ui/selgame.cpp:594
-msgid "Plugins"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:218
-msgid "Filter"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:226
-msgid " ^!File"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:231
-msgid " ^!Category"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:254
-msgid "^!Setup custom filter"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:262
-msgid "Customize UI"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:263
-msgid "Configure Directories"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:266 src/emu/ui/sndmenu.cpp:151
-#: src/emu/ui/sndmenu.cpp:172
-msgid "Sound Options"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:269
-msgid "General Inputs"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:272
-msgid "Save Configuration"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:286 src/emu/ui/optsmenu.cpp:307
-msgid "Settings"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:327
-msgid "**Error saving ui.ini**"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:374
-#, c-format
-msgid "**Error saving %s.ini**"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:378
+#: src/emu/ui/miscmenu.cpp:729 src/emu/ui/optsmenu.cpp:376
 msgid ""
 "\n"
 "    Configuration saved    \n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/selector.cpp:166
+#: src/emu/ui/miscmenu.cpp:774
+msgid "Bios"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:776
+msgid "Driver"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:790
+msgid "Save machine configuration"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:806
+msgid "Configure machine:"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:868 src/emu/ui/selsoft.cpp:109
+msgid " (default)"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:953 src/emu/ui/miscmenu.cpp:973
+#: src/emu/ui/selgame.cpp:600
+msgid "Plugins"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:217
+msgid "Filter"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:225
+msgid " ^!File"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:230
+msgid " ^!Category"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:253
+msgid "^!Setup custom filter"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:261
+msgid "Customize UI"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:262
+msgid "Configure Directories"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:265 src/emu/ui/sndmenu.cpp:149
+#: src/emu/ui/sndmenu.cpp:169
+msgid "Sound Options"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:268
+msgid "General Inputs"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:271
+msgid "Save Configuration"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:285 src/emu/ui/optsmenu.cpp:305
+msgid "Settings"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:325
+msgid "**Error saving ui.ini**"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:372
+#, c-format
+msgid "**Error saving %s.ini**"
+msgstr ""
+
+#: src/emu/ui/selector.cpp:165
 msgid "Selection List - Search: "
 msgstr ""
 
-#: src/emu/ui/selector.cpp:196
+#: src/emu/ui/selector.cpp:194
 #, c-format
 msgid "Double click or press %1$s to select"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:39
+#: src/emu/ui/selgame.cpp:38
 msgid "General Info"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:374 src/emu/ui/selsoft.cpp:282
+#: src/emu/ui/selgame.cpp:380 src/emu/ui/selsoft.cpp:281
 #, c-format
 msgid ""
 "%s\n"
 " added to favorites list."
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:380 src/emu/ui/selgame.cpp:389
-#: src/emu/ui/selsoft.cpp:287
+#: src/emu/ui/selgame.cpp:386 src/emu/ui/selgame.cpp:395
+#: src/emu/ui/selsoft.cpp:286
 #, c-format
 msgid ""
 "%s\n"
 " removed from favorites list."
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:450
+#: src/emu/ui/selgame.cpp:457
 msgid ""
 "The selected machine is missing one or more required ROM or CHD images. "
 "Please select a different machine.\n"
@@ -991,275 +1007,275 @@ msgid ""
 "Press any key to continue."
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:589 src/emu/ui/simpleselgame.cpp:265
+#: src/emu/ui/selgame.cpp:595 src/emu/ui/simpleselgame.cpp:265
 msgid "Configure Options"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:752
+#: src/emu/ui/selgame.cpp:596
+msgid "Configure Machine"
+msgstr ""
+
+#: src/emu/ui/selgame.cpp:758
 #, c-format
 msgid "%1$s %2$s ( %3$d / %4$d machines (%5$d BIOS) )"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:762
+#: src/emu/ui/selgame.cpp:768
 #, c-format
 msgid "%1$s (%2$s - %3$s) - "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:769 src/emu/ui/selgame.cpp:775
+#: src/emu/ui/selgame.cpp:775 src/emu/ui/selgame.cpp:781
 #, c-format
 msgid "%1$s (%2$s) - "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:784
+#: src/emu/ui/selgame.cpp:790
 #, c-format
 msgid "%1$s Search: %2$s_"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:838
+#: src/emu/ui/selgame.cpp:844
 #, c-format
 msgid "Romset: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:841 src/emu/ui/selgame.cpp:890
-#: src/emu/ui/selsoft.cpp:751 src/emu/ui/selsoft.cpp:801
+#: src/emu/ui/selgame.cpp:847 src/emu/ui/selgame.cpp:896
+#: src/emu/ui/selsoft.cpp:750 src/emu/ui/selsoft.cpp:800
 #: src/emu/ui/simpleselgame.cpp:328
 #, c-format
 msgid "%1$s, %2$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:847 src/emu/ui/selsoft.cpp:757
+#: src/emu/ui/selgame.cpp:853 src/emu/ui/selsoft.cpp:756
 #, c-format
 msgid "Driver is clone of: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:849 src/emu/ui/selsoft.cpp:759
+#: src/emu/ui/selgame.cpp:855 src/emu/ui/selsoft.cpp:758
 msgid "Driver is parent"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:853 src/emu/ui/selsoft.cpp:763
+#: src/emu/ui/selgame.cpp:859 src/emu/ui/selsoft.cpp:762
 #: src/emu/ui/simpleselgame.cpp:335
 msgid "Overall: NOT WORKING"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:855 src/emu/ui/selsoft.cpp:765
+#: src/emu/ui/selgame.cpp:861 src/emu/ui/selsoft.cpp:764
 #: src/emu/ui/simpleselgame.cpp:337
 msgid "Overall: Unemulated Protection"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:857 src/emu/ui/selsoft.cpp:767
+#: src/emu/ui/selgame.cpp:863 src/emu/ui/selsoft.cpp:766
 #: src/emu/ui/simpleselgame.cpp:339
 msgid "Overall: Working"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:861 src/emu/ui/selsoft.cpp:771
+#: src/emu/ui/selgame.cpp:867 src/emu/ui/selsoft.cpp:770
 msgid "Graphics: Imperfect, "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:863 src/emu/ui/selsoft.cpp:773
+#: src/emu/ui/selgame.cpp:869 src/emu/ui/selsoft.cpp:772
 msgid "Graphics: OK, "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:866 src/emu/ui/selsoft.cpp:776
+#: src/emu/ui/selgame.cpp:872 src/emu/ui/selsoft.cpp:775
 msgid "Sound: Unimplemented"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:868 src/emu/ui/selsoft.cpp:778
+#: src/emu/ui/selgame.cpp:874 src/emu/ui/selsoft.cpp:777
 msgid "Sound: Imperfect"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:870 src/emu/ui/selsoft.cpp:780
+#: src/emu/ui/selgame.cpp:876 src/emu/ui/selsoft.cpp:779
 msgid "Sound: OK"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:887
+#: src/emu/ui/selgame.cpp:893
 #, c-format
 msgid "System: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:894 src/emu/ui/selsoft.cpp:805
+#: src/emu/ui/selgame.cpp:900 src/emu/ui/selsoft.cpp:804
 #, c-format
 msgid "Software is clone of: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:896 src/emu/ui/selsoft.cpp:807
+#: src/emu/ui/selgame.cpp:902 src/emu/ui/selsoft.cpp:806
 msgid "Software is parent"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:901 src/emu/ui/selsoft.cpp:812
+#: src/emu/ui/selgame.cpp:907 src/emu/ui/selsoft.cpp:811
 msgid "Supported: No"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:906 src/emu/ui/selsoft.cpp:817
+#: src/emu/ui/selgame.cpp:912 src/emu/ui/selsoft.cpp:816
 msgid "Supported: Partial"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:911 src/emu/ui/selsoft.cpp:822
+#: src/emu/ui/selgame.cpp:917 src/emu/ui/selsoft.cpp:821
 msgid "Supported: Yes"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:916 src/emu/ui/selsoft.cpp:827
+#: src/emu/ui/selgame.cpp:922 src/emu/ui/selsoft.cpp:826
 #, c-format
 msgid "romset: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:923
+#: src/emu/ui/selgame.cpp:929
 #, c-format
 msgid "%1$s %2$s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1535
+#: src/emu/ui/selgame.cpp:1543
 #, c-format
 msgid "Romset: %1$-.100s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1536
+#: src/emu/ui/selgame.cpp:1544
 #, c-format
 msgid "Year: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1537
+#: src/emu/ui/selgame.cpp:1545
 #, c-format
 msgid "Manufacturer: %1$-.100s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1541
+#: src/emu/ui/selgame.cpp:1549
 #, c-format
 msgid "Driver is Clone of: %1$-.100s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1543
+#: src/emu/ui/selgame.cpp:1551
 msgid "Driver is Parent\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1546
+#: src/emu/ui/selgame.cpp:1554
 msgid "Overall: NOT WORKING\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1548
+#: src/emu/ui/selgame.cpp:1556
 msgid "Overall: Unemulated Protection\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1550
+#: src/emu/ui/selgame.cpp:1558
 msgid "Overall: Working\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1553
+#: src/emu/ui/selgame.cpp:1561
 msgid "Graphics: Imperfect Colors\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1557
+#: src/emu/ui/selgame.cpp:1565
 msgid "Graphics: Imperfect\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1559
+#: src/emu/ui/selgame.cpp:1567
 msgid "Graphics: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1562
+#: src/emu/ui/selgame.cpp:1570
 msgid "Sound: Unimplemented\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1564
+#: src/emu/ui/selgame.cpp:1572
 msgid "Sound: Imperfect\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1566
+#: src/emu/ui/selgame.cpp:1574
 msgid "Sound: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1568
+#: src/emu/ui/selgame.cpp:1576
 #, c-format
 msgid "Driver is Skeleton: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1569
+#: src/emu/ui/selgame.cpp:1577
 #, c-format
 msgid "Game is Mechanical: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1570
+#: src/emu/ui/selgame.cpp:1578
 #, c-format
 msgid "Requires Artwork: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1571
+#: src/emu/ui/selgame.cpp:1579
 #, c-format
 msgid "Requires Clickable Artwork: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1572
+#: src/emu/ui/selgame.cpp:1580
 #, c-format
 msgid "Support Cocktail: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1573
+#: src/emu/ui/selgame.cpp:1581
 #, c-format
 msgid "Driver is Bios: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1574
+#: src/emu/ui/selgame.cpp:1582
 #, c-format
 msgid "Support Save: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 #, c-format
 msgid "Screen Orientation: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 msgid "Vertical"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 msgid "Horizontal"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/selgame.cpp:1591
 #, c-format
 msgid "Requires CHD: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1596
+#: src/emu/ui/selgame.cpp:1604
 msgid "Roms Audit Pass: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1598
+#: src/emu/ui/selgame.cpp:1606
 msgid "Roms Audit Pass: BAD\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1601
+#: src/emu/ui/selgame.cpp:1609
 msgid "Samples Audit Pass: None Needed\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1603
+#: src/emu/ui/selgame.cpp:1611
 msgid "Samples Audit Pass: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1605
+#: src/emu/ui/selgame.cpp:1613
 msgid "Samples Audit Pass: BAD\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1608
+#: src/emu/ui/selgame.cpp:1616
 msgid ""
 "Roms Audit Pass: Disabled\n"
 "Samples Audit Pass: Disabled\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:2049 src/emu/ui/selgame.cpp:2212
-#: src/emu/ui/selsoft.cpp:1662
+#: src/emu/ui/selgame.cpp:2055 src/emu/ui/selgame.cpp:2216
+#: src/emu/ui/selsoft.cpp:1655
 msgid "No Infos Available"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:2162 src/emu/ui/selsoft.cpp:1607
+#: src/emu/ui/selgame.cpp:2168 src/emu/ui/selsoft.cpp:1602
 msgid "Usage"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:110
-msgid " (default)"
-msgstr ""
-
-#: src/emu/ui/selsoft.cpp:381
+#: src/emu/ui/selsoft.cpp:380
 msgid ""
 "The selected software is missing one or more required files. Please select a "
 "different software.\n"
@@ -1267,57 +1283,57 @@ msgid ""
 "Press any key to continue."
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:684
+#: src/emu/ui/selsoft.cpp:683
 #, c-format
-msgid "%1$s %2$s ( %3$d / %4$d softwares )"
+msgid "%1$s %2$s ( %3$d / %4$d software packages )"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:685
+#: src/emu/ui/selsoft.cpp:684
 #, c-format
 msgid "Driver: \"%1$s\" software list "
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:688
+#: src/emu/ui/selsoft.cpp:687
 #, c-format
 msgid "Region: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:690
+#: src/emu/ui/selsoft.cpp:689
 #, c-format
 msgid "Publisher: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:692
+#: src/emu/ui/selsoft.cpp:691
 #, c-format
 msgid "Year: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:694
+#: src/emu/ui/selsoft.cpp:693
 #, c-format
 msgid "Software List: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:696
+#: src/emu/ui/selsoft.cpp:695
 #, c-format
 msgid "Device type: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:698
+#: src/emu/ui/selsoft.cpp:697
 #, c-format
 msgid "%s Search: %s_"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:748 src/emu/ui/selsoft.cpp:798
+#: src/emu/ui/selsoft.cpp:747 src/emu/ui/selsoft.cpp:797
 #: src/emu/ui/simpleselgame.cpp:325
 #, c-format
 msgid "%1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:1998 src/emu/ui/selsoft.cpp:2018
+#: src/emu/ui/selsoft.cpp:1991 src/emu/ui/selsoft.cpp:2011
 msgid "Software part selection:"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:2136 src/emu/ui/selsoft.cpp:2156
+#: src/emu/ui/selsoft.cpp:2129 src/emu/ui/selsoft.cpp:2149
 msgid "Bios selection:"
 msgstr ""
 
@@ -1365,15 +1381,15 @@ msgstr ""
 msgid " [internal]"
 msgstr ""
 
-#: src/emu/ui/sndmenu.cpp:135
+#: src/emu/ui/sndmenu.cpp:133
 msgid "Sound"
 msgstr ""
 
-#: src/emu/ui/sndmenu.cpp:136
+#: src/emu/ui/sndmenu.cpp:134
 msgid "Sample Rate"
 msgstr ""
 
-#: src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/sndmenu.cpp:135
 msgid "Use External Samples"
 msgstr ""
 
@@ -1442,80 +1458,80 @@ msgstr ""
 msgid "Fast Forward"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:419
+#: src/emu/ui/ui.cpp:418
 msgid "This driver requires images to be loaded in the following device(s): "
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1074
+#: src/emu/ui/ui.cpp:1071
 msgid ""
 "One or more ROMs/CHDs for this machine are incorrect. The machine may not "
 "run correctly.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1087
+#: src/emu/ui/ui.cpp:1084
 msgid ""
 "There are known problems with this machine\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1091
+#: src/emu/ui/ui.cpp:1088
 msgid ""
 "One or more ROMs/CHDs for this machine have not been correctly dumped.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1095
+#: src/emu/ui/ui.cpp:1092
 #, c-format
 msgid "The keyboard emulation may not be 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1097
+#: src/emu/ui/ui.cpp:1094
 #, c-format
 msgid "The colors aren't 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1099
+#: src/emu/ui/ui.cpp:1096
 msgid "The colors are completely wrong.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1101
+#: src/emu/ui/ui.cpp:1098
 #, c-format
 msgid "The video emulation isn't 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1103
+#: src/emu/ui/ui.cpp:1100
 #, c-format
 msgid "The sound emulation isn't 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1105
+#: src/emu/ui/ui.cpp:1102
 msgid "The machine lacks sound.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1108
+#: src/emu/ui/ui.cpp:1105
 msgid "Screen flipping in cocktail mode is not supported.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1112
+#: src/emu/ui/ui.cpp:1109
 msgid "The machine requires external artwork files\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1117
+#: src/emu/ui/ui.cpp:1114
 msgid ""
 "This machine was never completed. It may exhibit strange behavior or missing "
 "elements that are not bugs in the emulation.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1122
+#: src/emu/ui/ui.cpp:1119
 msgid ""
 "This machine has no sound hardware, MAME will produce no sounds, this is "
 "expected behaviour.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1130
+#: src/emu/ui/ui.cpp:1127
 msgid "The machine has protection which isn't fully emulated.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1133
+#: src/emu/ui/ui.cpp:1130
 msgid ""
 "\n"
 "THIS MACHINE DOESN'T WORK. The emulation for this machine is not yet "
@@ -1523,7 +1539,7 @@ msgid ""
 "the developers to improve the emulation.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1137
+#: src/emu/ui/ui.cpp:1134
 msgid ""
 "\n"
 "Certain elements of this machine cannot be emulated as it requires actual "
@@ -1531,21 +1547,21 @@ msgid ""
 "to fully play this machine.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1156
+#: src/emu/ui/ui.cpp:1153
 msgid ""
 "\n"
 "\n"
 "There are working clones of this machine: "
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1170
+#: src/emu/ui/ui.cpp:1167
 msgid ""
 "\n"
 "\n"
 "Press any key to continue"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1185
+#: src/emu/ui/ui.cpp:1182
 #, c-format
 msgid ""
 "%1$s\n"
@@ -1555,98 +1571,98 @@ msgid ""
 "CPU:\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1221 src/emu/ui/ui.cpp:1260
+#: src/emu/ui/ui.cpp:1218 src/emu/ui/ui.cpp:1257
 msgid "MHz"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1221 src/emu/ui/ui.cpp:1260
+#: src/emu/ui/ui.cpp:1218 src/emu/ui/ui.cpp:1257
 msgid "kHz"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1235
+#: src/emu/ui/ui.cpp:1232
 msgid ""
 "\n"
 "Sound:\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1264
+#: src/emu/ui/ui.cpp:1261
 msgid ""
 "\n"
 "Video:\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1268
+#: src/emu/ui/ui.cpp:1265
 msgid "None\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1275
+#: src/emu/ui/ui.cpp:1272
 msgid "Vector"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1286
+#: src/emu/ui/ui.cpp:1283
 #, c-format
 msgid "%1$s: %2$s\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1286
+#: src/emu/ui/ui.cpp:1283
 msgid "%2$s\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1541 src/emu/ui/ui.cpp:1551
+#: src/emu/ui/ui.cpp:1538 src/emu/ui/ui.cpp:1548
 msgid "Keyboard Emulation Status"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1543
+#: src/emu/ui/ui.cpp:1540
 msgid "Mode: PARTIAL Emulation"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1544
+#: src/emu/ui/ui.cpp:1541
 msgid "UI:   Enabled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1546 src/emu/ui/ui.cpp:1556
+#: src/emu/ui/ui.cpp:1543 src/emu/ui/ui.cpp:1553
 msgid "**Use ScrLock to toggle**"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1553
+#: src/emu/ui/ui.cpp:1550
 msgid "Mode: FULL Emulation"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1554
+#: src/emu/ui/ui.cpp:1551
 msgid "UI:   Disabled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1692
+#: src/emu/ui/ui.cpp:1689
 msgid "Autofire can't be enabled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1731
+#: src/emu/ui/ui.cpp:1728
 msgid "Select position to save to"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1733
+#: src/emu/ui/ui.cpp:1730
 msgid "Select position to load from"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1757
+#: src/emu/ui/ui.cpp:1754
 msgid "Save cancelled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1759
+#: src/emu/ui/ui.cpp:1756
 msgid "Load cancelled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1802
+#: src/emu/ui/ui.cpp:1799
 #, c-format
 msgid "Save to position %s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1807
+#: src/emu/ui/ui.cpp:1804
 #, c-format
 msgid "Load from position %s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1847
+#: src/emu/ui/ui.cpp:1844
 #, c-format
 msgid ""
 "Are you sure you want to quit?\n"
@@ -1655,173 +1671,173 @@ msgid ""
 "Press ''%2$s'' to return to emulation."
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1917
+#: src/emu/ui/ui.cpp:1914
 msgid "Master Volume"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1926
+#: src/emu/ui/ui.cpp:1923
 #, c-format
 msgid "%1$s Volume"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1949
+#: src/emu/ui/ui.cpp:1946
 #, c-format
 msgid "Overclock CPU %1$s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1968
+#: src/emu/ui/ui.cpp:1965
 #, c-format
 msgid "%1$s Refresh Rate"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1973
+#: src/emu/ui/ui.cpp:1970
 #, c-format
 msgid "%1$s Brightness"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1975
+#: src/emu/ui/ui.cpp:1972
 #, c-format
 msgid "%1$s Contrast"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1977
+#: src/emu/ui/ui.cpp:1974
 #, c-format
 msgid "%1$s Gamma"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1981
+#: src/emu/ui/ui.cpp:1978
 #, c-format
 msgid "%1$s Horiz Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1983
+#: src/emu/ui/ui.cpp:1980
 #, c-format
 msgid "%1$s Horiz Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1985
+#: src/emu/ui/ui.cpp:1982
 #, c-format
 msgid "%1$s Vert Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1987
+#: src/emu/ui/ui.cpp:1984
 #, c-format
 msgid "%1$s Vert Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2005
+#: src/emu/ui/ui.cpp:2002
 #, c-format
 msgid "Laserdisc '%1$s' Horiz Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2007
+#: src/emu/ui/ui.cpp:2004
 #, c-format
 msgid "Laserdisc '%1$s' Horiz Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2009
+#: src/emu/ui/ui.cpp:2006
 #, c-format
 msgid "Laserdisc '%1$s' Vert Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2011
+#: src/emu/ui/ui.cpp:2008
 #, c-format
 msgid "Laserdisc '%1$s' Vert Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2021
+#: src/emu/ui/ui.cpp:2018
 msgid "Vector Flicker"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2022
+#: src/emu/ui/ui.cpp:2019
 msgid "Beam Width Minimum"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2023
+#: src/emu/ui/ui.cpp:2020
 msgid "Beam Width Maximum"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2024
+#: src/emu/ui/ui.cpp:2021
 msgid "Beam Intensity Weight"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2037
+#: src/emu/ui/ui.cpp:2034
 #, c-format
 msgid "Crosshair Scale %1$s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2037 src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2034 src/emu/ui/ui.cpp:2036
 msgid "X"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2037 src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2034 src/emu/ui/ui.cpp:2036
 msgid "Y"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2036
 #, c-format
 msgid "Crosshair Offset %1$s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2071
+#: src/emu/ui/ui.cpp:2068
 #, c-format
 msgid "%1$3ddB"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2115
+#: src/emu/ui/ui.cpp:2112
 #, c-format
 msgid "%1$d%%"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2131
+#: src/emu/ui/ui.cpp:2128
 #, c-format
 msgid "%1$3.0f%%"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2154
+#: src/emu/ui/ui.cpp:2151
 #, c-format
 msgid "%1$.3ffps"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2177 src/emu/ui/ui.cpp:2199 src/emu/ui/ui.cpp:2220
-#: src/emu/ui/ui.cpp:2242 src/emu/ui/ui.cpp:2264 src/emu/ui/ui.cpp:2286
-#: src/emu/ui/ui.cpp:2308 src/emu/ui/ui.cpp:2330 src/emu/ui/ui.cpp:2352
-#: src/emu/ui/ui.cpp:2374 src/emu/ui/ui.cpp:2396
+#: src/emu/ui/ui.cpp:2174 src/emu/ui/ui.cpp:2196 src/emu/ui/ui.cpp:2217
+#: src/emu/ui/ui.cpp:2239 src/emu/ui/ui.cpp:2261 src/emu/ui/ui.cpp:2283
+#: src/emu/ui/ui.cpp:2305 src/emu/ui/ui.cpp:2327 src/emu/ui/ui.cpp:2349
+#: src/emu/ui/ui.cpp:2371 src/emu/ui/ui.cpp:2393
 #, c-format
 msgid "%1$.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2412 src/emu/ui/ui.cpp:2428 src/emu/ui/ui.cpp:2444
-#: src/emu/ui/ui.cpp:2460
+#: src/emu/ui/ui.cpp:2408 src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2438
+#: src/emu/ui/ui.cpp:2453
 #, c-format
 msgid "%1$1.2f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2476
+#: src/emu/ui/ui.cpp:2469
 #, c-format
 msgid "Screen '%1$s'"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2478
+#: src/emu/ui/ui.cpp:2471
 msgid "Screen"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2494
+#: src/emu/ui/ui.cpp:2487
 #, c-format
 msgid "Crosshair Scale X %1$1.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2494
+#: src/emu/ui/ui.cpp:2487
 #, c-format
 msgid "Crosshair Scale Y %1$1.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2513
+#: src/emu/ui/ui.cpp:2506
 #, c-format
 msgid "Crosshair Offset X %1$1.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2513
+#: src/emu/ui/ui.cpp:2506
 #, c-format
 msgid "Crosshair Offset Y %1$1.3f"
 msgstr ""
@@ -1863,10 +1879,10 @@ msgstr ""
 msgid "Full"
 msgstr ""
 
-#: src/emu/ui/viewgfx.cpp:392
+#: src/emu/ui/viewgfx.cpp:391
 msgid " COLORS"
 msgstr ""
 
-#: src/emu/ui/viewgfx.cpp:392
+#: src/emu/ui/viewgfx.cpp:391
 msgid " PENS"
 msgstr ""
diff --git a/language/German/strings.po b/language/German/strings.po
index 73df5b5a440..fb604dc9ed7 100644
--- a/language/German/strings.po
+++ b/language/German/strings.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MAME\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-11 03:33+0200\n"
+"POT-Creation-Date: 2016-04-15 17:42+0200\n"
 "PO-Revision-Date: 2016-04-11 09:57+0200\n"
 "Last-Translator: Lothar Serra Mari <scummvm@rootfather.de>\n"
 "Language-Team: MAME Language Team\n"
@@ -64,14 +64,14 @@ msgstr "Alle neu laden"
 msgid "Autofire Status"
 msgstr "Dauerfeuer-Status"
 
-#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1698
+#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1695
 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211
 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219
 #: src/emu/ui/videoopt.cpp:223
 msgid "Disabled"
 msgstr "Deaktiviert"
 
-#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1698
+#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1695
 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211
 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219
 #: src/emu/ui/videoopt.cpp:223
@@ -79,14 +79,14 @@ msgid "Enabled"
 msgstr "Aktiviert"
 
 #: src/emu/ui/cheatopt.cpp:282 src/emu/ui/cheatopt.cpp:288
-#: src/emu/ui/menu.cpp:710 src/emu/ui/miscmenu.cpp:831
-#: src/emu/ui/sndmenu.cpp:135 src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/menu.cpp:755 src/emu/ui/miscmenu.cpp:936
+#: src/emu/ui/sndmenu.cpp:133 src/emu/ui/sndmenu.cpp:135
 msgid "On"
 msgstr "An"
 
 #: src/emu/ui/cheatopt.cpp:282 src/emu/ui/cheatopt.cpp:288
-#: src/emu/ui/menu.cpp:713 src/emu/ui/miscmenu.cpp:831
-#: src/emu/ui/sndmenu.cpp:135 src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/menu.cpp:758 src/emu/ui/miscmenu.cpp:936
+#: src/emu/ui/sndmenu.cpp:133 src/emu/ui/sndmenu.cpp:135
 msgid "Off"
 msgstr "Aus"
 
@@ -98,317 +98,317 @@ msgstr "Keine Knöpfe für diese Maschine gefunden!"
 msgid "Autofire Delay"
 msgstr "Verzögerung für Dauerfeuer"
 
-#: src/emu/ui/custmenu.cpp:158 src/emu/ui/custmenu.cpp:447
+#: src/emu/ui/custmenu.cpp:157 src/emu/ui/custmenu.cpp:445
 msgid "Main filter"
 msgstr "Hauptfilter"
 
-#: src/emu/ui/custmenu.cpp:167 src/emu/ui/custmenu.cpp:456
+#: src/emu/ui/custmenu.cpp:166 src/emu/ui/custmenu.cpp:454
 msgid "Other filter"
 msgstr "Weiterer Filter"
 
-#: src/emu/ui/custmenu.cpp:176 src/emu/ui/optsmenu.cpp:239
+#: src/emu/ui/custmenu.cpp:175 src/emu/ui/optsmenu.cpp:238
 msgid "^!Manufacturer"
 msgstr "^!Hersteller"
 
-#: src/emu/ui/custmenu.cpp:185 src/emu/ui/custmenu.cpp:474
-#: src/emu/ui/optsmenu.cpp:247
+#: src/emu/ui/custmenu.cpp:184 src/emu/ui/custmenu.cpp:472
+#: src/emu/ui/optsmenu.cpp:246
 msgid "^!Year"
 msgstr "Jahr: "
 
-#: src/emu/ui/custmenu.cpp:194 src/emu/ui/custmenu.cpp:510
+#: src/emu/ui/custmenu.cpp:193 src/emu/ui/custmenu.cpp:508
 msgid "Remove last filter"
 msgstr "Letzten Filter entfernen"
 
-#: src/emu/ui/custmenu.cpp:197 src/emu/ui/custmenu.cpp:513
+#: src/emu/ui/custmenu.cpp:196 src/emu/ui/custmenu.cpp:511
 msgid "Add filter"
 msgstr "Filter hinzufügen"
 
-#: src/emu/ui/custmenu.cpp:212 src/emu/ui/custmenu.cpp:233
-#: src/emu/ui/custmenu.cpp:529 src/emu/ui/custmenu.cpp:550
+#: src/emu/ui/custmenu.cpp:211 src/emu/ui/custmenu.cpp:231
+#: src/emu/ui/custmenu.cpp:527 src/emu/ui/custmenu.cpp:547
 msgid "Select custom filters:"
 msgstr "Filter auswählen"
 
-#: src/emu/ui/custmenu.cpp:465
+#: src/emu/ui/custmenu.cpp:463
 msgid "^!Publisher"
 msgstr "^!Herausgeber"
 
-#: src/emu/ui/custmenu.cpp:483
+#: src/emu/ui/custmenu.cpp:481
 msgid "^!Software List"
 msgstr "^!Softwareliste"
 
-#: src/emu/ui/custmenu.cpp:492
+#: src/emu/ui/custmenu.cpp:490
 msgid "^!Device type"
 msgstr "^!Gerätetyp"
 
-#: src/emu/ui/custmenu.cpp:501
+#: src/emu/ui/custmenu.cpp:499
 msgid "^!Region"
 msgstr "^!Region"
 
-#: src/emu/ui/custui.cpp:23
+#: src/emu/ui/custui.cpp:22
 msgid "Show All"
 msgstr "Alle anzeigen"
 
-#: src/emu/ui/custui.cpp:24
+#: src/emu/ui/custui.cpp:23
 msgid "Hide Filters"
 msgstr "Filter ausblenden"
 
-#: src/emu/ui/custui.cpp:25
+#: src/emu/ui/custui.cpp:24
 msgid "Hide Info/Image"
 msgstr "Info/Bild ausblenden"
 
-#: src/emu/ui/custui.cpp:26
+#: src/emu/ui/custui.cpp:25
 msgid "Hide Both"
 msgstr "Beide ausblenden"
 
-#: src/emu/ui/custui.cpp:142
+#: src/emu/ui/custui.cpp:141
 msgid "Fonts"
 msgstr "Schriftarten"
 
-#: src/emu/ui/custui.cpp:143
+#: src/emu/ui/custui.cpp:142
 msgid "Colors"
 msgstr "Farben"
 
-#: src/emu/ui/custui.cpp:148 src/emu/ui/dirmenu.cpp:33
+#: src/emu/ui/custui.cpp:147 src/emu/ui/dirmenu.cpp:33
 msgid "Language"
 msgstr "Sprache"
 
-#: src/emu/ui/custui.cpp:152
+#: src/emu/ui/custui.cpp:151
 msgid "Show side panels"
 msgstr "Seitenbereiche anzeigen"
 
-#: src/emu/ui/custui.cpp:167 src/emu/ui/custui.cpp:188
+#: src/emu/ui/custui.cpp:166 src/emu/ui/custui.cpp:186
 msgid "Custom UI Settings"
 msgstr "Einstellungen Benutzeroberfläche"
 
-#: src/emu/ui/custui.cpp:246
+#: src/emu/ui/custui.cpp:244
 msgid "default"
 msgstr "Standard"
 
-#: src/emu/ui/custui.cpp:349
+#: src/emu/ui/custui.cpp:347
 msgid "UI Font"
 msgstr "Schriftart für Benutzeroberfläche"
 
-#: src/emu/ui/custui.cpp:354
+#: src/emu/ui/custui.cpp:352
 msgid "Bold"
 msgstr "Fett"
 
-#: src/emu/ui/custui.cpp:355
+#: src/emu/ui/custui.cpp:353
 msgid "Italic"
 msgstr "Kursiv"
 
-#: src/emu/ui/custui.cpp:360
+#: src/emu/ui/custui.cpp:358
 msgid "Lines"
 msgstr "Linien"
 
-#: src/emu/ui/custui.cpp:366
+#: src/emu/ui/custui.cpp:364
 msgid "Infos text size"
 msgstr "Textgröße für Informationen"
 
-#: src/emu/ui/custui.cpp:383
+#: src/emu/ui/custui.cpp:381
 msgid "UI Fonts Settings"
 msgstr "Schriftart-Einstellungen für Benutzeroberfläche"
 
-#: src/emu/ui/custui.cpp:411
+#: src/emu/ui/custui.cpp:408
 msgid "Sample text - Lorem ipsum dolor sit amet, consectetur adipiscing elit."
 msgstr ""
 "Beispieltext - Lorem ipsum dolor sit amet, consectetur adipiscing elit."
 
-#: src/emu/ui/custui.cpp:509
+#: src/emu/ui/custui.cpp:506
 msgid "Normal text"
 msgstr "Normaler Text"
 
-#: src/emu/ui/custui.cpp:510
+#: src/emu/ui/custui.cpp:507
 msgid "Selected color"
 msgstr "Farbe für Auswahl"
 
-#: src/emu/ui/custui.cpp:511
+#: src/emu/ui/custui.cpp:508
 msgid "Normal text background"
 msgstr "Normaler Texthintergrund"
 
-#: src/emu/ui/custui.cpp:512
+#: src/emu/ui/custui.cpp:509
 msgid "Selected background color"
 msgstr "Hintergrundfarbe für Auswahl"
 
-#: src/emu/ui/custui.cpp:513
+#: src/emu/ui/custui.cpp:510
 msgid "Subitem color"
 msgstr "Farbe für Unterelement"
 
-#: src/emu/ui/custui.cpp:514 src/emu/ui/custui.cpp:610
+#: src/emu/ui/custui.cpp:511 src/emu/ui/custui.cpp:606
 msgid "Clone"
 msgstr "Klon"
 
-#: src/emu/ui/custui.cpp:515
+#: src/emu/ui/custui.cpp:512
 msgid "Border"
 msgstr "Rand"
 
-#: src/emu/ui/custui.cpp:516
+#: src/emu/ui/custui.cpp:513
 msgid "Background"
 msgstr "Hintergrund"
 
-#: src/emu/ui/custui.cpp:517
+#: src/emu/ui/custui.cpp:514
 msgid "Dipswitch"
 msgstr "DIP-Schalter"
 
-#: src/emu/ui/custui.cpp:518
+#: src/emu/ui/custui.cpp:515
 msgid "Unavailable color"
 msgstr "Nicht verfügbare Farbe"
 
-#: src/emu/ui/custui.cpp:519
+#: src/emu/ui/custui.cpp:516
 msgid "Slider color"
 msgstr "Schieberegler-Farbe"
 
-#: src/emu/ui/custui.cpp:520
+#: src/emu/ui/custui.cpp:517
 msgid "Gfx viewer background"
 msgstr "Hintergrund Gfx-Anzeige"
 
-#: src/emu/ui/custui.cpp:521
+#: src/emu/ui/custui.cpp:518
 msgid "Mouse over color"
 msgstr "Farbe für Mouseover"
 
-#: src/emu/ui/custui.cpp:522
+#: src/emu/ui/custui.cpp:519
 msgid "Mouse over background color"
 msgstr "Hintergrundfarbe für Mouseover"
 
-#: src/emu/ui/custui.cpp:523
+#: src/emu/ui/custui.cpp:520
 msgid "Mouse down color"
 msgstr "Farbe für Mausklick"
 
-#: src/emu/ui/custui.cpp:524
+#: src/emu/ui/custui.cpp:521
 msgid "Mouse down background color"
 msgstr "Hintergrundfarbe für Mausklick"
 
-#: src/emu/ui/custui.cpp:527
+#: src/emu/ui/custui.cpp:524
 msgid "Restore originals colors"
 msgstr "Auf Originalfarben zurücksetzen"
 
-#: src/emu/ui/custui.cpp:543
+#: src/emu/ui/custui.cpp:540
 msgid "UI Colors Settings"
 msgstr "Farbeinstellungen für Benutzeroberfläche"
 
-#: src/emu/ui/custui.cpp:572
+#: src/emu/ui/custui.cpp:568
 #, c-format
 msgid "Double click or press %1$s to change the color value"
 msgstr "Doppelklicken oder drücken Sie %1$s, um den Farbwert zu ändern"
 
-#: src/emu/ui/custui.cpp:598
+#: src/emu/ui/custui.cpp:594
 msgid "Menu Preview"
 msgstr "Menüvorschau"
 
-#: src/emu/ui/custui.cpp:606
+#: src/emu/ui/custui.cpp:602
 msgid "Normal"
 msgstr "Normal"
 
-#: src/emu/ui/custui.cpp:607
+#: src/emu/ui/custui.cpp:603
 msgid "Subitem"
 msgstr "Unterelement"
 
-#: src/emu/ui/custui.cpp:608
+#: src/emu/ui/custui.cpp:604
 msgid "Selected"
 msgstr "Auswahl"
 
-#: src/emu/ui/custui.cpp:609
+#: src/emu/ui/custui.cpp:605
 msgid "Mouse Over"
 msgstr "Mouseover"
 
-#: src/emu/ui/custui.cpp:841 src/emu/ui/custui.cpp:844
+#: src/emu/ui/custui.cpp:837 src/emu/ui/custui.cpp:840
 msgid "Alpha"
 msgstr "Alpha"
 
-#: src/emu/ui/custui.cpp:849 src/emu/ui/custui.cpp:852
-#: src/emu/ui/custui.cpp:1013
+#: src/emu/ui/custui.cpp:845 src/emu/ui/custui.cpp:848
+#: src/emu/ui/custui.cpp:1007
 msgid "Red"
 msgstr "Rot"
 
-#: src/emu/ui/custui.cpp:857 src/emu/ui/custui.cpp:860
-#: src/emu/ui/custui.cpp:1016
+#: src/emu/ui/custui.cpp:853 src/emu/ui/custui.cpp:856
+#: src/emu/ui/custui.cpp:1010
 msgid "Green"
 msgstr "Grün"
 
-#: src/emu/ui/custui.cpp:865 src/emu/ui/custui.cpp:868
-#: src/emu/ui/custui.cpp:1017
+#: src/emu/ui/custui.cpp:861 src/emu/ui/custui.cpp:864
+#: src/emu/ui/custui.cpp:1011
 msgid "Blue"
 msgstr "Blau"
 
-#: src/emu/ui/custui.cpp:871
+#: src/emu/ui/custui.cpp:867
 msgid "Choose from palette"
 msgstr "Aus Palette wählen"
 
-#: src/emu/ui/custui.cpp:887
+#: src/emu/ui/custui.cpp:883
 msgid " - ARGB Settings"
 msgstr " - ARGB-Einstellungen"
 
-#: src/emu/ui/custui.cpp:912
+#: src/emu/ui/custui.cpp:907
 msgid "Color preview ="
 msgstr "Farbvorschau ="
 
-#: src/emu/ui/custui.cpp:1009
+#: src/emu/ui/custui.cpp:1003
 msgid "White"
 msgstr "Weiß"
 
-#: src/emu/ui/custui.cpp:1010
+#: src/emu/ui/custui.cpp:1004
 msgid "Silver"
 msgstr "Silber"
 
-#: src/emu/ui/custui.cpp:1011
+#: src/emu/ui/custui.cpp:1005
 msgid "Gray"
 msgstr "Grau"
 
-#: src/emu/ui/custui.cpp:1012
+#: src/emu/ui/custui.cpp:1006
 msgid "Black"
 msgstr "Schwarz"
 
-#: src/emu/ui/custui.cpp:1014
+#: src/emu/ui/custui.cpp:1008
 msgid "Orange"
 msgstr "Orange"
 
-#: src/emu/ui/custui.cpp:1015
+#: src/emu/ui/custui.cpp:1009
 msgid "Yellow"
 msgstr "Gelb"
 
-#: src/emu/ui/custui.cpp:1018
+#: src/emu/ui/custui.cpp:1012
 msgid "Violet"
 msgstr "Violett"
 
-#: src/emu/ui/datmenu.cpp:65
+#: src/emu/ui/datmenu.cpp:64
 msgid "Software History"
 msgstr "Geschichte der Software"
 
-#: src/emu/ui/datmenu.cpp:67
+#: src/emu/ui/datmenu.cpp:66
 msgid "Software Usage"
 msgstr "Verwendung der Software"
 
-#: src/emu/ui/datmenu.cpp:199
+#: src/emu/ui/datmenu.cpp:196
 msgid "Revision: "
 msgstr "Version: "
 
-#: src/emu/ui/datmenu.cpp:287 src/emu/ui/selgame.cpp:40
-#: src/emu/ui/selgame.cpp:2152 src/emu/ui/selgame.cpp:2161
-#: src/emu/ui/selsoft.cpp:1577 src/emu/ui/selsoft.cpp:1597
-#: src/emu/ui/selsoft.cpp:1606
+#: src/emu/ui/datmenu.cpp:284 src/emu/ui/selgame.cpp:39
+#: src/emu/ui/selgame.cpp:2158 src/emu/ui/selgame.cpp:2167
+#: src/emu/ui/selsoft.cpp:1574 src/emu/ui/selsoft.cpp:1592
+#: src/emu/ui/selsoft.cpp:1601
 msgid "History"
 msgstr "Geschichte"
 
-#: src/emu/ui/datmenu.cpp:289 src/emu/ui/selgame.cpp:41
+#: src/emu/ui/datmenu.cpp:286 src/emu/ui/selgame.cpp:40
 msgid "Mameinfo"
 msgstr "Mameinfo"
 
-#: src/emu/ui/datmenu.cpp:291 src/emu/ui/selgame.cpp:43
+#: src/emu/ui/datmenu.cpp:288 src/emu/ui/selgame.cpp:42
 msgid "Messinfo"
 msgstr "Messinfo"
 
-#: src/emu/ui/datmenu.cpp:293 src/emu/ui/selgame.cpp:42
+#: src/emu/ui/datmenu.cpp:290 src/emu/ui/selgame.cpp:41
 msgid "Sysinfo"
 msgstr "Sysinfo"
 
-#: src/emu/ui/datmenu.cpp:295 src/emu/ui/selgame.cpp:46
+#: src/emu/ui/datmenu.cpp:292 src/emu/ui/selgame.cpp:45
 msgid "Mamescore"
 msgstr "Mamespielstand"
 
-#: src/emu/ui/datmenu.cpp:297 src/emu/ui/selgame.cpp:45
+#: src/emu/ui/datmenu.cpp:294 src/emu/ui/selgame.cpp:44
 msgid "Gameinit"
 msgstr "Gameinit"
 
-#: src/emu/ui/datmenu.cpp:299 src/emu/ui/selgame.cpp:44
+#: src/emu/ui/datmenu.cpp:296 src/emu/ui/selgame.cpp:43
 msgid "Command"
 msgstr "Befehl"
 
@@ -560,75 +560,75 @@ msgstr "Zum Setzen drücken Sie TAB"
 msgid "Remove %1$s Folder"
 msgstr "%1$s-Ordner entfernen"
 
-#: src/emu/ui/filesel.cpp:158
+#: src/emu/ui/filesel.cpp:161
 msgid "File Already Exists - Override?"
 msgstr "Datei existiert bereits - Überschreiben?"
 
-#: src/emu/ui/filesel.cpp:160 src/emu/ui/selgame.cpp:1568
-#: src/emu/ui/selgame.cpp:1569 src/emu/ui/selgame.cpp:1570
-#: src/emu/ui/selgame.cpp:1571 src/emu/ui/selgame.cpp:1572
-#: src/emu/ui/selgame.cpp:1573 src/emu/ui/selgame.cpp:1574
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/filesel.cpp:163 src/emu/ui/selgame.cpp:1576
+#: src/emu/ui/selgame.cpp:1577 src/emu/ui/selgame.cpp:1578
+#: src/emu/ui/selgame.cpp:1579 src/emu/ui/selgame.cpp:1580
+#: src/emu/ui/selgame.cpp:1581 src/emu/ui/selgame.cpp:1582
+#: src/emu/ui/selgame.cpp:1591
 msgid "No"
 msgstr "Nein"
 
-#: src/emu/ui/filesel.cpp:161 src/emu/ui/selgame.cpp:1568
-#: src/emu/ui/selgame.cpp:1569 src/emu/ui/selgame.cpp:1570
-#: src/emu/ui/selgame.cpp:1571 src/emu/ui/selgame.cpp:1572
-#: src/emu/ui/selgame.cpp:1573 src/emu/ui/selgame.cpp:1574
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/filesel.cpp:164 src/emu/ui/selgame.cpp:1576
+#: src/emu/ui/selgame.cpp:1577 src/emu/ui/selgame.cpp:1578
+#: src/emu/ui/selgame.cpp:1579 src/emu/ui/selgame.cpp:1580
+#: src/emu/ui/selgame.cpp:1581 src/emu/ui/selgame.cpp:1582
+#: src/emu/ui/selgame.cpp:1591
 msgid "Yes"
 msgstr "Ja"
 
-#: src/emu/ui/filesel.cpp:272
+#: src/emu/ui/filesel.cpp:275
 msgid "New Image Name:"
 msgstr "Neuer Image-Name:"
 
-#: src/emu/ui/filesel.cpp:278
+#: src/emu/ui/filesel.cpp:281
 msgid "Image Format:"
 msgstr "Image-Format"
 
-#: src/emu/ui/filesel.cpp:284
+#: src/emu/ui/filesel.cpp:287
 msgid "Create"
 msgstr "Erzeugen"
 
-#: src/emu/ui/filesel.cpp:315
+#: src/emu/ui/filesel.cpp:318
 msgid "Please enter a file extension too"
 msgstr "Bitte geben Sie auch eine Dateierweiterung ein"
 
-#: src/emu/ui/filesel.cpp:503 src/emu/ui/swlist.cpp:65
+#: src/emu/ui/filesel.cpp:506 src/emu/ui/swlist.cpp:65
 msgid "[empty slot]"
 msgstr "[leerer Steckplatz]"
 
-#: src/emu/ui/filesel.cpp:507
+#: src/emu/ui/filesel.cpp:510
 msgid "[create]"
 msgstr "[erzeugen]"
 
-#: src/emu/ui/filesel.cpp:511 src/emu/ui/swlist.cpp:76
+#: src/emu/ui/filesel.cpp:514 src/emu/ui/swlist.cpp:76
 msgid "[software list]"
 msgstr "[Softwareliste]"
 
-#: src/emu/ui/filesel.cpp:803
+#: src/emu/ui/filesel.cpp:806
 msgid "Select image format"
 msgstr "Image-Format auswählen"
 
-#: src/emu/ui/filesel.cpp:863
+#: src/emu/ui/filesel.cpp:866
 msgid "Select access mode"
 msgstr "Zugriffsart wählen"
 
-#: src/emu/ui/filesel.cpp:864
+#: src/emu/ui/filesel.cpp:867
 msgid "Read-only"
 msgstr "Nur lesend"
 
-#: src/emu/ui/filesel.cpp:866
+#: src/emu/ui/filesel.cpp:869
 msgid "Read-write"
 msgstr "Lesend und schreibend"
 
-#: src/emu/ui/filesel.cpp:867
+#: src/emu/ui/filesel.cpp:870
 msgid "Read this image, write to another image"
 msgstr "Lesen von diesem Image, Schreiben auf ein anderes Image"
 
-#: src/emu/ui/filesel.cpp:868
+#: src/emu/ui/filesel.cpp:871
 msgid "Read this image, write to diff"
 msgstr "Lesen von diesem Image, Schreiben in diff"
 
@@ -656,7 +656,7 @@ msgstr "Teilweise unterstützt"
 msgid "[empty]"
 msgstr "[leer]"
 
-#: src/emu/ui/info_pty.cpp:26 src/emu/ui/mainmenu.cpp:91
+#: src/emu/ui/info_pty.cpp:26 src/emu/ui/mainmenu.cpp:96
 msgid "Pseudo terminals"
 msgstr "Pseudoterminals"
 
@@ -672,7 +672,7 @@ msgstr "Benutzerschnittstelle"
 msgid "Other Controls"
 msgstr "Weitere Bedienelemente"
 
-#: src/emu/ui/inputmap.cpp:622 src/emu/ui/miscmenu.cpp:91
+#: src/emu/ui/inputmap.cpp:622 src/emu/ui/miscmenu.cpp:92
 #: src/emu/ui/slotopt.cpp:172
 msgid "Reset"
 msgstr "Zurücksetzen"
@@ -705,27 +705,27 @@ msgstr "Buchhaltungsinformationen"
 msgid "Machine Information"
 msgstr "Informationen über diese Maschine"
 
-#: src/emu/ui/mainmenu.cpp:78
+#: src/emu/ui/mainmenu.cpp:80
 msgid "Image Information"
 msgstr "Informationen über diese Software"
 
-#: src/emu/ui/mainmenu.cpp:81
+#: src/emu/ui/mainmenu.cpp:83
 msgid "File Manager"
 msgstr "Dateimanager"
 
-#: src/emu/ui/mainmenu.cpp:86
+#: src/emu/ui/mainmenu.cpp:92
 msgid "Tape Control"
 msgstr "Bedienung Cassettendeck"
 
-#: src/emu/ui/mainmenu.cpp:94
+#: src/emu/ui/mainmenu.cpp:99
 msgid "Bios Selection"
 msgstr "BIOS-Auswahl"
 
-#: src/emu/ui/mainmenu.cpp:100
+#: src/emu/ui/mainmenu.cpp:104
 msgid "Slot Devices"
 msgstr "Steckplatzgeräte"
 
-#: src/emu/ui/mainmenu.cpp:107
+#: src/emu/ui/mainmenu.cpp:109
 msgid "Barcode Reader"
 msgstr "Barcodeleser"
 
@@ -733,43 +733,43 @@ msgstr "Barcodeleser"
 msgid "Network Devices"
 msgstr "Netzwerkgeräte"
 
-#: src/emu/ui/mainmenu.cpp:119
+#: src/emu/ui/mainmenu.cpp:118
 msgid "Keyboard Mode"
 msgstr "Tastaturmodus"
 
-#: src/emu/ui/mainmenu.cpp:122
+#: src/emu/ui/mainmenu.cpp:121
 msgid "Slider Controls"
 msgstr "Schieberegler"
 
-#: src/emu/ui/mainmenu.cpp:125
+#: src/emu/ui/mainmenu.cpp:124
 msgid "Video Options"
 msgstr "Videoeinstellungen"
 
-#: src/emu/ui/mainmenu.cpp:129
+#: src/emu/ui/mainmenu.cpp:128
 msgid "Crosshair Options"
 msgstr "Fadenkreuzeinstellungen"
 
-#: src/emu/ui/mainmenu.cpp:133
+#: src/emu/ui/mainmenu.cpp:132
 msgid "Cheat"
 msgstr "Cheat"
 
-#: src/emu/ui/mainmenu.cpp:136
+#: src/emu/ui/mainmenu.cpp:135
 msgid "Plugin Options"
 msgstr "Erweiterungs-Optionen"
 
-#: src/emu/ui/mainmenu.cpp:140
+#: src/emu/ui/mainmenu.cpp:139
 msgid "External DAT View"
 msgstr "Externe DAT-Anzeige"
 
-#: src/emu/ui/mainmenu.cpp:146
+#: src/emu/ui/mainmenu.cpp:145 src/emu/ui/miscmenu.cpp:785
 msgid "Add To Favorites"
 msgstr "Zu Favoriten hinzufügen"
 
-#: src/emu/ui/mainmenu.cpp:148
+#: src/emu/ui/mainmenu.cpp:147 src/emu/ui/miscmenu.cpp:787
 msgid "Remove From Favorites"
 msgstr "Aus Favoriten entfernen"
 
-#: src/emu/ui/mainmenu.cpp:155
+#: src/emu/ui/mainmenu.cpp:154
 msgid "Select New Machine"
 msgstr "Neue Maschine auswählen"
 
@@ -809,31 +809,31 @@ msgstr "Verlassen"
 msgid "Return to Previous Menu"
 msgstr "Zurück zum vorherigen Menü"
 
-#: src/emu/ui/menu.cpp:716
+#: src/emu/ui/menu.cpp:761
 msgid "Auto"
 msgstr "Auto"
 
-#: src/emu/ui/menu.cpp:2133
+#: src/emu/ui/menu.cpp:2195
 msgid "Images"
 msgstr "Images"
 
-#: src/emu/ui/menu.cpp:2134
+#: src/emu/ui/menu.cpp:2196
 msgid "Infos"
 msgstr "Informationen"
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Keyboard Mode:"
 msgstr "Tastaturmodus:"
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Natural"
 msgstr "Natürlich"
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Emulated"
 msgstr "Emuliert"
 
-#: src/emu/ui/miscmenu.cpp:240
+#: src/emu/ui/miscmenu.cpp:241
 #, c-format
 msgid ""
 "Uptime: %1$d:%2$02d:%3$02d\n"
@@ -842,7 +842,7 @@ msgstr ""
 "Laufzeit: %1$d:%2$02d:%3$02d\n"
 "\n"
 
-#: src/emu/ui/miscmenu.cpp:242
+#: src/emu/ui/miscmenu.cpp:243
 #, c-format
 msgid ""
 "Uptime: %1$d:%2$02d\n"
@@ -851,7 +851,7 @@ msgstr ""
 "Laufzeit: %1$d:%2$02d\n"
 "\n"
 
-#: src/emu/ui/miscmenu.cpp:246
+#: src/emu/ui/miscmenu.cpp:247
 #, c-format
 msgid ""
 "Tickets dispensed: %1$d\n"
@@ -860,109 +860,50 @@ msgstr ""
 "Ausgegebene Tickets: %1$d\n"
 "\n"
 
-#: src/emu/ui/miscmenu.cpp:257
+#: src/emu/ui/miscmenu.cpp:258
 msgid "Coin %1$c: NA%3$s\n"
 msgstr "Münzen %1$c: NA%3$s\n"
 
-#: src/emu/ui/miscmenu.cpp:257
+#: src/emu/ui/miscmenu.cpp:258
 #, c-format
 msgid "Coin %1$c: %2$d%3$s\n"
 msgstr "Münzen %1$c: %2$d%3$s\n"
 
-#: src/emu/ui/miscmenu.cpp:260
+#: src/emu/ui/miscmenu.cpp:261
 msgid " (locked)"
 msgstr " (gesperrt)"
 
-#: src/emu/ui/miscmenu.cpp:519
+#: src/emu/ui/miscmenu.cpp:520
 msgid "Visible Delay"
 msgstr "Sichtbare Verzögerung"
 
-#: src/emu/ui/miscmenu.cpp:617
+#: src/emu/ui/miscmenu.cpp:619
 #, c-format
 msgid "%s.xml saved under ui folder."
 msgstr "%s.xml im Ordner der Benutzeroberfläche gespeichert."
 
-#: src/emu/ui/miscmenu.cpp:645
+#: src/emu/ui/miscmenu.cpp:647
 msgid "Name:             Description:\n"
 msgstr "Name:             Beschreibung:\n"
 
-#: src/emu/ui/miscmenu.cpp:657
+#: src/emu/ui/miscmenu.cpp:659
 #, c-format
 msgid "%s.txt saved under ui folder."
 msgstr "%s.txt im Ordner der Benutzeroberfläche gespeichert."
 
-#: src/emu/ui/miscmenu.cpp:675
-msgid "Export XML format (like -listxml)"
-msgstr "Im XML-Format exportieren"
+#: src/emu/ui/miscmenu.cpp:677
+msgid "Export list in XML format (like -listxml)"
+msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:676
-msgid "Export TXT format (like -listfull)"
-msgstr "Im TXT-Format exportieren"
+#: src/emu/ui/miscmenu.cpp:678
+msgid "Export list in XML format (like -listxml, but exclude devices)"
+msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:734
-msgid "Dummy"
-msgstr "Platzhalter"
+#: src/emu/ui/miscmenu.cpp:679
+msgid "Export list in TXT format (like -listfull)"
+msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:736
-msgid "Save machine configuration"
-msgstr "Konfiguration der Maschine speichern"
-
-#: src/emu/ui/miscmenu.cpp:848 src/emu/ui/miscmenu.cpp:869
-#: src/emu/ui/selgame.cpp:594
-msgid "Plugins"
-msgstr "Erweiterungen"
-
-#: src/emu/ui/optsmenu.cpp:218
-msgid "Filter"
-msgstr "Filter"
-
-#: src/emu/ui/optsmenu.cpp:226
-msgid " ^!File"
-msgstr " ^!Datei"
-
-#: src/emu/ui/optsmenu.cpp:231
-msgid " ^!Category"
-msgstr " ^!Kategorie"
-
-#: src/emu/ui/optsmenu.cpp:254
-msgid "^!Setup custom filter"
-msgstr "^!Filter konfigurieren"
-
-#: src/emu/ui/optsmenu.cpp:262
-msgid "Customize UI"
-msgstr "Benutzeroberfläche anpassen"
-
-#: src/emu/ui/optsmenu.cpp:263
-msgid "Configure Directories"
-msgstr "Verzeichnisse konfigurieren"
-
-#: src/emu/ui/optsmenu.cpp:266 src/emu/ui/sndmenu.cpp:151
-#: src/emu/ui/sndmenu.cpp:172
-msgid "Sound Options"
-msgstr "Soundeinstellungen"
-
-#: src/emu/ui/optsmenu.cpp:269
-msgid "General Inputs"
-msgstr "Haupteingaben"
-
-#: src/emu/ui/optsmenu.cpp:272
-msgid "Save Configuration"
-msgstr "Konfiguration speichern"
-
-#: src/emu/ui/optsmenu.cpp:286 src/emu/ui/optsmenu.cpp:307
-msgid "Settings"
-msgstr "Einstellungen"
-
-#: src/emu/ui/optsmenu.cpp:327
-msgid "**Error saving ui.ini**"
-msgstr "**Fehler beim Speichern von ui.ini**"
-
-#: src/emu/ui/optsmenu.cpp:374
-#, c-format
-msgid "**Error saving %s.ini**"
-msgstr "**Fehler beim Speichern von %s.ini**"
-
-#: src/emu/ui/optsmenu.cpp:378
+#: src/emu/ui/miscmenu.cpp:729 src/emu/ui/optsmenu.cpp:376
 msgid ""
 "\n"
 "    Configuration saved    \n"
@@ -972,20 +913,95 @@ msgstr ""
 "    Konfiguration gespeichert    \n"
 "\n"
 
-#: src/emu/ui/selector.cpp:166
+#: src/emu/ui/miscmenu.cpp:774
+msgid "Bios"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:776
+msgid "Driver"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:790
+msgid "Save machine configuration"
+msgstr "Konfiguration der Maschine speichern"
+
+#: src/emu/ui/miscmenu.cpp:806
+msgid "Configure machine:"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:868 src/emu/ui/selsoft.cpp:109
+msgid " (default)"
+msgstr " (Standard)"
+
+#: src/emu/ui/miscmenu.cpp:953 src/emu/ui/miscmenu.cpp:973
+#: src/emu/ui/selgame.cpp:600
+msgid "Plugins"
+msgstr "Erweiterungen"
+
+#: src/emu/ui/optsmenu.cpp:217
+msgid "Filter"
+msgstr "Filter"
+
+#: src/emu/ui/optsmenu.cpp:225
+msgid " ^!File"
+msgstr " ^!Datei"
+
+#: src/emu/ui/optsmenu.cpp:230
+msgid " ^!Category"
+msgstr " ^!Kategorie"
+
+#: src/emu/ui/optsmenu.cpp:253
+msgid "^!Setup custom filter"
+msgstr "^!Filter konfigurieren"
+
+#: src/emu/ui/optsmenu.cpp:261
+msgid "Customize UI"
+msgstr "Benutzeroberfläche anpassen"
+
+#: src/emu/ui/optsmenu.cpp:262
+msgid "Configure Directories"
+msgstr "Verzeichnisse konfigurieren"
+
+#: src/emu/ui/optsmenu.cpp:265 src/emu/ui/sndmenu.cpp:149
+#: src/emu/ui/sndmenu.cpp:169
+msgid "Sound Options"
+msgstr "Soundeinstellungen"
+
+#: src/emu/ui/optsmenu.cpp:268
+msgid "General Inputs"
+msgstr "Haupteingaben"
+
+#: src/emu/ui/optsmenu.cpp:271
+msgid "Save Configuration"
+msgstr "Konfiguration speichern"
+
+#: src/emu/ui/optsmenu.cpp:285 src/emu/ui/optsmenu.cpp:305
+msgid "Settings"
+msgstr "Einstellungen"
+
+#: src/emu/ui/optsmenu.cpp:325
+msgid "**Error saving ui.ini**"
+msgstr "**Fehler beim Speichern von ui.ini**"
+
+#: src/emu/ui/optsmenu.cpp:372
+#, c-format
+msgid "**Error saving %s.ini**"
+msgstr "**Fehler beim Speichern von %s.ini**"
+
+#: src/emu/ui/selector.cpp:165
 msgid "Selection List - Search: "
 msgstr "Auswahlliste - Suche: "
 
-#: src/emu/ui/selector.cpp:196
+#: src/emu/ui/selector.cpp:194
 #, c-format
 msgid "Double click or press %1$s to select"
 msgstr "Zum Auswählen, doppelklicken oder drücken Sie %1$s"
 
-#: src/emu/ui/selgame.cpp:39
+#: src/emu/ui/selgame.cpp:38
 msgid "General Info"
 msgstr "Allgemeine Informationen"
 
-#: src/emu/ui/selgame.cpp:374 src/emu/ui/selsoft.cpp:282
+#: src/emu/ui/selgame.cpp:380 src/emu/ui/selsoft.cpp:281
 #, c-format
 msgid ""
 "%s\n"
@@ -994,8 +1010,8 @@ msgstr ""
 "%s\n"
 " zur Favoritenliste hinzugefügt."
 
-#: src/emu/ui/selgame.cpp:380 src/emu/ui/selgame.cpp:389
-#: src/emu/ui/selsoft.cpp:287
+#: src/emu/ui/selgame.cpp:386 src/emu/ui/selgame.cpp:395
+#: src/emu/ui/selsoft.cpp:286
 #, c-format
 msgid ""
 "%s\n"
@@ -1004,7 +1020,7 @@ msgstr ""
 "%s\n"
 " von der Favoritenliste entfernt."
 
-#: src/emu/ui/selgame.cpp:450
+#: src/emu/ui/selgame.cpp:457
 msgid ""
 "The selected machine is missing one or more required ROM or CHD images. "
 "Please select a different machine.\n"
@@ -1016,256 +1032,260 @@ msgstr ""
 "\n"
 "Drücken Sie eine beliebige Taste, um fortzufahren."
 
-#: src/emu/ui/selgame.cpp:589 src/emu/ui/simpleselgame.cpp:265
+#: src/emu/ui/selgame.cpp:595 src/emu/ui/simpleselgame.cpp:265
 msgid "Configure Options"
 msgstr "Optionen konfigurieren"
 
-#: src/emu/ui/selgame.cpp:752
+#: src/emu/ui/selgame.cpp:596
+msgid "Configure Machine"
+msgstr "Maschine konfigurieren"
+
+#: src/emu/ui/selgame.cpp:758
 #, c-format
 msgid "%1$s %2$s ( %3$d / %4$d machines (%5$d BIOS) )"
 msgstr "%1$s %2$s ( %3$d / %4$d Maschinen (%5$d BIOS) )"
 
-#: src/emu/ui/selgame.cpp:762
+#: src/emu/ui/selgame.cpp:768
 #, c-format
 msgid "%1$s (%2$s - %3$s) - "
 msgstr "%1$s (%2$s - %3$s) - "
 
-#: src/emu/ui/selgame.cpp:769 src/emu/ui/selgame.cpp:775
+#: src/emu/ui/selgame.cpp:775 src/emu/ui/selgame.cpp:781
 #, c-format
 msgid "%1$s (%2$s) - "
 msgstr "%1$s (%2$s) - "
 
-#: src/emu/ui/selgame.cpp:784
+#: src/emu/ui/selgame.cpp:790
 #, c-format
 msgid "%1$s Search: %2$s_"
 msgstr "%1$s Suche: %2$s_"
 
-#: src/emu/ui/selgame.cpp:838
+#: src/emu/ui/selgame.cpp:844
 #, c-format
 msgid "Romset: %1$-.100s"
 msgstr "ROM-Satz: %1$-.100s\n"
 
-#: src/emu/ui/selgame.cpp:841 src/emu/ui/selgame.cpp:890
-#: src/emu/ui/selsoft.cpp:751 src/emu/ui/selsoft.cpp:801
+#: src/emu/ui/selgame.cpp:847 src/emu/ui/selgame.cpp:896
+#: src/emu/ui/selsoft.cpp:750 src/emu/ui/selsoft.cpp:800
 #: src/emu/ui/simpleselgame.cpp:328
 #, c-format
 msgid "%1$s, %2$-.100s"
 msgstr "%1$s, %2$-.100s"
 
-#: src/emu/ui/selgame.cpp:847 src/emu/ui/selsoft.cpp:757
+#: src/emu/ui/selgame.cpp:853 src/emu/ui/selsoft.cpp:756
 #, c-format
 msgid "Driver is clone of: %1$-.100s"
 msgstr "Treiber ist ein Klon von: %1$-.100s\n"
 
-#: src/emu/ui/selgame.cpp:849 src/emu/ui/selsoft.cpp:759
+#: src/emu/ui/selgame.cpp:855 src/emu/ui/selsoft.cpp:758
 msgid "Driver is parent"
 msgstr "Treiber ist Ursprungs-Treiber"
 
-#: src/emu/ui/selgame.cpp:853 src/emu/ui/selsoft.cpp:763
+#: src/emu/ui/selgame.cpp:859 src/emu/ui/selsoft.cpp:762
 #: src/emu/ui/simpleselgame.cpp:335
 msgid "Overall: NOT WORKING"
 msgstr "Insgesamt: FUNKTIONIERT NICHT\n"
 
-#: src/emu/ui/selgame.cpp:855 src/emu/ui/selsoft.cpp:765
+#: src/emu/ui/selgame.cpp:861 src/emu/ui/selsoft.cpp:764
 #: src/emu/ui/simpleselgame.cpp:337
 msgid "Overall: Unemulated Protection"
 msgstr "Insgesamt: Nicht emulierter Kopierschutz\n"
 
-#: src/emu/ui/selgame.cpp:857 src/emu/ui/selsoft.cpp:767
+#: src/emu/ui/selgame.cpp:863 src/emu/ui/selsoft.cpp:766
 #: src/emu/ui/simpleselgame.cpp:339
 msgid "Overall: Working"
 msgstr "Insgesamt: Funktioniert\n"
 
-#: src/emu/ui/selgame.cpp:861 src/emu/ui/selsoft.cpp:771
+#: src/emu/ui/selgame.cpp:867 src/emu/ui/selsoft.cpp:770
 msgid "Graphics: Imperfect, "
 msgstr "Grafik: Fehlerhaft, "
 
-#: src/emu/ui/selgame.cpp:863 src/emu/ui/selsoft.cpp:773
+#: src/emu/ui/selgame.cpp:869 src/emu/ui/selsoft.cpp:772
 msgid "Graphics: OK, "
 msgstr "Grafik: OK, "
 
-#: src/emu/ui/selgame.cpp:866 src/emu/ui/selsoft.cpp:776
+#: src/emu/ui/selgame.cpp:872 src/emu/ui/selsoft.cpp:775
 msgid "Sound: Unimplemented"
 msgstr "Sound: nicht implementiert"
 
-#: src/emu/ui/selgame.cpp:868 src/emu/ui/selsoft.cpp:778
+#: src/emu/ui/selgame.cpp:874 src/emu/ui/selsoft.cpp:777
 msgid "Sound: Imperfect"
 msgstr "Sound: Fehlerhaft"
 
-#: src/emu/ui/selgame.cpp:870 src/emu/ui/selsoft.cpp:780
+#: src/emu/ui/selgame.cpp:876 src/emu/ui/selsoft.cpp:779
 msgid "Sound: OK"
 msgstr "Sound: OK"
 
-#: src/emu/ui/selgame.cpp:887
+#: src/emu/ui/selgame.cpp:893
 #, c-format
 msgid "System: %1$-.100s"
 msgstr "System: %1$-.100s\n"
 
-#: src/emu/ui/selgame.cpp:894 src/emu/ui/selsoft.cpp:805
+#: src/emu/ui/selgame.cpp:900 src/emu/ui/selsoft.cpp:804
 #, c-format
 msgid "Software is clone of: %1$-.100s"
 msgstr "Programm ist ein Klon von: %1$-.100s\n"
 
-#: src/emu/ui/selgame.cpp:896 src/emu/ui/selsoft.cpp:807
+#: src/emu/ui/selgame.cpp:902 src/emu/ui/selsoft.cpp:806
 msgid "Software is parent"
 msgstr "Programm ist Ursprungs-Programm"
 
-#: src/emu/ui/selgame.cpp:901 src/emu/ui/selsoft.cpp:812
+#: src/emu/ui/selgame.cpp:907 src/emu/ui/selsoft.cpp:811
 msgid "Supported: No"
 msgstr "Unterstützt: Nein"
 
-#: src/emu/ui/selgame.cpp:906 src/emu/ui/selsoft.cpp:817
+#: src/emu/ui/selgame.cpp:912 src/emu/ui/selsoft.cpp:816
 msgid "Supported: Partial"
 msgstr "Unterstützt: Teilweise"
 
-#: src/emu/ui/selgame.cpp:911 src/emu/ui/selsoft.cpp:822
+#: src/emu/ui/selgame.cpp:917 src/emu/ui/selsoft.cpp:821
 msgid "Supported: Yes"
 msgstr "Unterstützt: Ja"
 
-#: src/emu/ui/selgame.cpp:916 src/emu/ui/selsoft.cpp:827
+#: src/emu/ui/selgame.cpp:922 src/emu/ui/selsoft.cpp:826
 #, c-format
 msgid "romset: %1$-.100s"
 msgstr "ROM-Satz: %1$-.100s\n"
 
-#: src/emu/ui/selgame.cpp:923
+#: src/emu/ui/selgame.cpp:929
 #, c-format
 msgid "%1$s %2$s"
 msgstr "%1$s %2$s"
 
-#: src/emu/ui/selgame.cpp:1535
+#: src/emu/ui/selgame.cpp:1543
 #, c-format
 msgid "Romset: %1$-.100s\n"
 msgstr "ROM-Satz: %1$-.100s\n"
 
-#: src/emu/ui/selgame.cpp:1536
+#: src/emu/ui/selgame.cpp:1544
 #, c-format
 msgid "Year: %1$s\n"
 msgstr "Jahr: %1$s\n"
 
-#: src/emu/ui/selgame.cpp:1537
+#: src/emu/ui/selgame.cpp:1545
 #, c-format
 msgid "Manufacturer: %1$-.100s\n"
 msgstr "Hersteller: %1$-.100s\n"
 
-#: src/emu/ui/selgame.cpp:1541
+#: src/emu/ui/selgame.cpp:1549
 #, c-format
 msgid "Driver is Clone of: %1$-.100s\n"
 msgstr "Treiber ist ein Klon von: %1$-.100s\n"
 
-#: src/emu/ui/selgame.cpp:1543
+#: src/emu/ui/selgame.cpp:1551
 msgid "Driver is Parent\n"
 msgstr "Treiber ist Ursprungs-Treiber\n"
 
-#: src/emu/ui/selgame.cpp:1546
+#: src/emu/ui/selgame.cpp:1554
 msgid "Overall: NOT WORKING\n"
 msgstr "Insgesamt: FUNKTIONIERT NICHT\n"
 
-#: src/emu/ui/selgame.cpp:1548
+#: src/emu/ui/selgame.cpp:1556
 msgid "Overall: Unemulated Protection\n"
 msgstr "Insgesamt: Nicht emulierter Kopierschutz\n"
 
-#: src/emu/ui/selgame.cpp:1550
+#: src/emu/ui/selgame.cpp:1558
 msgid "Overall: Working\n"
 msgstr "Insgesamt: Funktioniert\n"
 
-#: src/emu/ui/selgame.cpp:1553
+#: src/emu/ui/selgame.cpp:1561
 msgid "Graphics: Imperfect Colors\n"
 msgstr "Grafik: Fehlerhafte Farben\n"
 
-#: src/emu/ui/selgame.cpp:1557
+#: src/emu/ui/selgame.cpp:1565
 msgid "Graphics: Imperfect\n"
 msgstr "Grafik: Fehlerhaft\n"
 
-#: src/emu/ui/selgame.cpp:1559
+#: src/emu/ui/selgame.cpp:1567
 msgid "Graphics: OK\n"
 msgstr "Grafik: OK\n"
 
-#: src/emu/ui/selgame.cpp:1562
+#: src/emu/ui/selgame.cpp:1570
 msgid "Sound: Unimplemented\n"
 msgstr "Sound: nicht implementiert\n"
 
-#: src/emu/ui/selgame.cpp:1564
+#: src/emu/ui/selgame.cpp:1572
 msgid "Sound: Imperfect\n"
 msgstr "Sound: Fehlerhaft\n"
 
-#: src/emu/ui/selgame.cpp:1566
+#: src/emu/ui/selgame.cpp:1574
 msgid "Sound: OK\n"
 msgstr "Sound: OK\n"
 
-#: src/emu/ui/selgame.cpp:1568
+#: src/emu/ui/selgame.cpp:1576
 #, c-format
 msgid "Driver is Skeleton: %1$s\n"
 msgstr "Treiber ist ein \"Skelett\": %s\n"
 
-#: src/emu/ui/selgame.cpp:1569
+#: src/emu/ui/selgame.cpp:1577
 #, c-format
 msgid "Game is Mechanical: %1$s\n"
 msgstr "Spiel ist mechanisch: %1$s\n"
 
-#: src/emu/ui/selgame.cpp:1570
+#: src/emu/ui/selgame.cpp:1578
 #, c-format
 msgid "Requires Artwork: %1$s\n"
 msgstr "Benötigt Illustrationen: %1$s\n"
 
-#: src/emu/ui/selgame.cpp:1571
+#: src/emu/ui/selgame.cpp:1579
 #, c-format
 msgid "Requires Clickable Artwork: %1$s\n"
 msgstr "Benötigt klickbare Illustrationen: %1$s\n"
 
-#: src/emu/ui/selgame.cpp:1572
+#: src/emu/ui/selgame.cpp:1580
 #, c-format
 msgid "Support Cocktail: %1$s\n"
 msgstr "Unterstützt Cocktail-Modus: %1$s\n"
 
-#: src/emu/ui/selgame.cpp:1573
+#: src/emu/ui/selgame.cpp:1581
 #, c-format
 msgid "Driver is Bios: %1$s\n"
 msgstr "Treiber ist BIOS: %1$s\n"
 
-#: src/emu/ui/selgame.cpp:1574
+#: src/emu/ui/selgame.cpp:1582
 #, c-format
 msgid "Support Save: %1$s\n"
 msgstr "Unterstützt Speichern: %1$s\n"
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 #, c-format
 msgid "Screen Orientation: %1$s\n"
 msgstr "Bildschirm-Ausrichtung: %1$s\n"
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 msgid "Vertical"
 msgstr "Vertikal"
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 msgid "Horizontal"
 msgstr "Horizontal"
 
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/selgame.cpp:1591
 #, c-format
 msgid "Requires CHD: %1$s\n"
 msgstr "Benötigt CHD: %1$s\n"
 
-#: src/emu/ui/selgame.cpp:1596
+#: src/emu/ui/selgame.cpp:1604
 msgid "Roms Audit Pass: OK\n"
 msgstr "ROM-Überprüfung: OK\n"
 
-#: src/emu/ui/selgame.cpp:1598
+#: src/emu/ui/selgame.cpp:1606
 msgid "Roms Audit Pass: BAD\n"
 msgstr "ROM-Überprüfung: FEHLERHAFT\n"
 
-#: src/emu/ui/selgame.cpp:1601
+#: src/emu/ui/selgame.cpp:1609
 msgid "Samples Audit Pass: None Needed\n"
 msgstr "Samples-Überprüfung: Nicht nötig\n"
 
-#: src/emu/ui/selgame.cpp:1603
+#: src/emu/ui/selgame.cpp:1611
 msgid "Samples Audit Pass: OK\n"
 msgstr "Samples-Überprüfung: OK\n"
 
-#: src/emu/ui/selgame.cpp:1605
+#: src/emu/ui/selgame.cpp:1613
 msgid "Samples Audit Pass: BAD\n"
 msgstr "Samples-Überprüfung: FEHLERHAFT\n"
 
-#: src/emu/ui/selgame.cpp:1608
+#: src/emu/ui/selgame.cpp:1616
 msgid ""
 "Roms Audit Pass: Disabled\n"
 "Samples Audit Pass: Disabled\n"
@@ -1273,20 +1293,16 @@ msgstr ""
 "ROM-Überprüfung: Deaktiviert\n"
 "Samples-Überprüfung: Deaktiviert\n"
 
-#: src/emu/ui/selgame.cpp:2049 src/emu/ui/selgame.cpp:2212
-#: src/emu/ui/selsoft.cpp:1662
+#: src/emu/ui/selgame.cpp:2055 src/emu/ui/selgame.cpp:2216
+#: src/emu/ui/selsoft.cpp:1655
 msgid "No Infos Available"
 msgstr "Keine Informationen verfügbar"
 
-#: src/emu/ui/selgame.cpp:2162 src/emu/ui/selsoft.cpp:1607
+#: src/emu/ui/selgame.cpp:2168 src/emu/ui/selsoft.cpp:1602
 msgid "Usage"
 msgstr "Verwendung"
 
-#: src/emu/ui/selsoft.cpp:110
-msgid " (default)"
-msgstr " (Standard)"
-
-#: src/emu/ui/selsoft.cpp:381
+#: src/emu/ui/selsoft.cpp:380
 msgid ""
 "The selected software is missing one or more required files. Please select a "
 "different software.\n"
@@ -1298,57 +1314,57 @@ msgstr ""
 "\n"
 "Drücken Sie eine beliebige Taste, um fortzufahren."
 
-#: src/emu/ui/selsoft.cpp:684
+#: src/emu/ui/selsoft.cpp:683
 #, c-format
-msgid "%1$s %2$s ( %3$d / %4$d softwares )"
-msgstr "%1$s %2$s ( %3$d / %4$d Programme )"
+msgid "%1$s %2$s ( %3$d / %4$d software packages )"
+msgstr ""
 
-#: src/emu/ui/selsoft.cpp:685
+#: src/emu/ui/selsoft.cpp:684
 #, c-format
 msgid "Driver: \"%1$s\" software list "
 msgstr "Treiber: \"%1$s\" Softwareliste "
 
-#: src/emu/ui/selsoft.cpp:688
+#: src/emu/ui/selsoft.cpp:687
 #, c-format
 msgid "Region: %1$s -"
 msgstr "Region: %1$s -"
 
-#: src/emu/ui/selsoft.cpp:690
+#: src/emu/ui/selsoft.cpp:689
 #, c-format
 msgid "Publisher: %1$s -"
 msgstr "Herausgeber: %1$s -"
 
-#: src/emu/ui/selsoft.cpp:692
+#: src/emu/ui/selsoft.cpp:691
 #, c-format
 msgid "Year: %1$s -"
 msgstr "Jahr: %1$s -"
 
-#: src/emu/ui/selsoft.cpp:694
+#: src/emu/ui/selsoft.cpp:693
 #, c-format
 msgid "Software List: %1$s -"
 msgstr "Softwareliste: %1$s -"
 
-#: src/emu/ui/selsoft.cpp:696
+#: src/emu/ui/selsoft.cpp:695
 #, c-format
 msgid "Device type: %1$s -"
 msgstr "Gerätetyp: %1$s -"
 
-#: src/emu/ui/selsoft.cpp:698
+#: src/emu/ui/selsoft.cpp:697
 #, c-format
 msgid "%s Search: %s_"
 msgstr "%s Suche: %s_"
 
-#: src/emu/ui/selsoft.cpp:748 src/emu/ui/selsoft.cpp:798
+#: src/emu/ui/selsoft.cpp:747 src/emu/ui/selsoft.cpp:797
 #: src/emu/ui/simpleselgame.cpp:325
 #, c-format
 msgid "%1$-.100s"
 msgstr "%1$-.100s"
 
-#: src/emu/ui/selsoft.cpp:1998 src/emu/ui/selsoft.cpp:2018
+#: src/emu/ui/selsoft.cpp:1991 src/emu/ui/selsoft.cpp:2011
 msgid "Software part selection:"
 msgstr "Softwareauswahl:"
 
-#: src/emu/ui/selsoft.cpp:2136 src/emu/ui/selsoft.cpp:2156
+#: src/emu/ui/selsoft.cpp:2129 src/emu/ui/selsoft.cpp:2149
 msgid "Bios selection:"
 msgstr "BIOS-Auswahl"
 
@@ -1401,15 +1417,15 @@ msgstr "Grafik: %s, Sound: %s"
 msgid " [internal]"
 msgstr " [intern]"
 
-#: src/emu/ui/sndmenu.cpp:135
+#: src/emu/ui/sndmenu.cpp:133
 msgid "Sound"
 msgstr "Sound"
 
-#: src/emu/ui/sndmenu.cpp:136
+#: src/emu/ui/sndmenu.cpp:134
 msgid "Sample Rate"
 msgstr "Samplerate"
 
-#: src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/sndmenu.cpp:135
 msgid "Use External Samples"
 msgstr "Verwende externe Samples"
 
@@ -1478,12 +1494,12 @@ msgstr "Zurückspulen"
 msgid "Fast Forward"
 msgstr "Vorspulen"
 
-#: src/emu/ui/ui.cpp:419
+#: src/emu/ui/ui.cpp:418
 msgid "This driver requires images to be loaded in the following device(s): "
 msgstr ""
 "Für diese Maschine müssen Abbilder in die folgenden Geräte eingehängt werden:"
 
-#: src/emu/ui/ui.cpp:1074
+#: src/emu/ui/ui.cpp:1071
 msgid ""
 "One or more ROMs/CHDs for this machine are incorrect. The machine may not "
 "run correctly.\n"
@@ -1491,7 +1507,7 @@ msgstr ""
 "Ein oder mehrere ROMs/CHDs für diese Maschine sind nicht korrekt. Eventuell "
 "wird die Maschine nicht richtig laufen.\n"
 
-#: src/emu/ui/ui.cpp:1087
+#: src/emu/ui/ui.cpp:1084
 msgid ""
 "There are known problems with this machine\n"
 "\n"
@@ -1499,49 +1515,49 @@ msgstr ""
 "Es gibt bekannte Probleme mit dieser Maschine\n"
 "\n"
 
-#: src/emu/ui/ui.cpp:1091
+#: src/emu/ui/ui.cpp:1088
 msgid ""
 "One or more ROMs/CHDs for this machine have not been correctly dumped.\n"
 msgstr ""
 "Ein oder mehrere ROMs/CHDs dieser Maschine wurden nicht korrekt ausgelesen.\n"
 
-#: src/emu/ui/ui.cpp:1095
+#: src/emu/ui/ui.cpp:1092
 #, c-format
 msgid "The keyboard emulation may not be 100% accurate.\n"
 msgstr "Die Tastaturemulation könnte nicht 100% korrekt sein.\n"
 
-#: src/emu/ui/ui.cpp:1097
+#: src/emu/ui/ui.cpp:1094
 #, c-format
 msgid "The colors aren't 100% accurate.\n"
 msgstr "Die Farben sind nicht 100% korrekt.\n"
 
-#: src/emu/ui/ui.cpp:1099
+#: src/emu/ui/ui.cpp:1096
 msgid "The colors are completely wrong.\n"
 msgstr "Die Farben sind völlig falsch.\n"
 
-#: src/emu/ui/ui.cpp:1101
+#: src/emu/ui/ui.cpp:1098
 #, c-format
 msgid "The video emulation isn't 100% accurate.\n"
 msgstr "Die Videoemulation ist nicht 100% korrekt.\n"
 
-#: src/emu/ui/ui.cpp:1103
+#: src/emu/ui/ui.cpp:1100
 #, c-format
 msgid "The sound emulation isn't 100% accurate.\n"
 msgstr "Die Soundemulation ist nicht 100% korrekt.\n"
 
-#: src/emu/ui/ui.cpp:1105
+#: src/emu/ui/ui.cpp:1102
 msgid "The machine lacks sound.\n"
 msgstr "Der Maschine fehlt die Soundemulation.\n"
 
-#: src/emu/ui/ui.cpp:1108
+#: src/emu/ui/ui.cpp:1105
 msgid "Screen flipping in cocktail mode is not supported.\n"
 msgstr "Die Bildschirmdrehung im Cocktailmodus wird nicht unterstützt.\n"
 
-#: src/emu/ui/ui.cpp:1112
+#: src/emu/ui/ui.cpp:1109
 msgid "The machine requires external artwork files\n"
 msgstr "Die Maschine benötigt externe Illustrationsdateien\n"
 
-#: src/emu/ui/ui.cpp:1117
+#: src/emu/ui/ui.cpp:1114
 msgid ""
 "This machine was never completed. It may exhibit strange behavior or missing "
 "elements that are not bugs in the emulation.\n"
@@ -1550,7 +1566,7 @@ msgstr ""
 "oder fehlende Elemente aufweisen, die nicht auf Fehler der Emulation "
 "zurückzuführen sind.\n"
 
-#: src/emu/ui/ui.cpp:1122
+#: src/emu/ui/ui.cpp:1119
 msgid ""
 "This machine has no sound hardware, MAME will produce no sounds, this is "
 "expected behaviour.\n"
@@ -1558,13 +1574,13 @@ msgstr ""
 "Diese Maschine besitzt keine Sound-Hardware; MAME wird erwartungsgemäß keine "
 "Töne ausgeben.\n"
 
-#: src/emu/ui/ui.cpp:1130
+#: src/emu/ui/ui.cpp:1127
 msgid "The machine has protection which isn't fully emulated.\n"
 msgstr ""
 "Die Maschine besitzt einen Kopierschutz, der nicht vollständig emuliert "
 "ist.\n"
 
-#: src/emu/ui/ui.cpp:1133
+#: src/emu/ui/ui.cpp:1130
 msgid ""
 "\n"
 "THIS MACHINE DOESN'T WORK. The emulation for this machine is not yet "
@@ -1576,7 +1592,7 @@ msgstr ""
 "nicht vollständig. Sie können nur darauf warten, dass die Entwickler die "
 "Emulation verbessern.\n"
 
-#: src/emu/ui/ui.cpp:1137
+#: src/emu/ui/ui.cpp:1134
 msgid ""
 "\n"
 "Certain elements of this machine cannot be emulated as it requires actual "
@@ -1588,7 +1604,7 @@ msgstr ""
 "echte physische Interaktion voraussetzen oder mechanische Komponenten "
 "beinhalten. Es ist nicht möglich, diese Maschine vollständig zu verwenden.\n"
 
-#: src/emu/ui/ui.cpp:1156
+#: src/emu/ui/ui.cpp:1153
 msgid ""
 "\n"
 "\n"
@@ -1598,7 +1614,7 @@ msgstr ""
 "\n"
 "Es gibt funktionsfähige Klone dieser Maschine: "
 
-#: src/emu/ui/ui.cpp:1170
+#: src/emu/ui/ui.cpp:1167
 msgid ""
 "\n"
 "\n"
@@ -1608,7 +1624,7 @@ msgstr ""
 "\n"
 "Drücken Sie eine beliebige Taste zum Fortfahren."
 
-#: src/emu/ui/ui.cpp:1185
+#: src/emu/ui/ui.cpp:1182
 #, c-format
 msgid ""
 "%1$s\n"
@@ -1623,15 +1639,15 @@ msgstr ""
 "\n"
 "CPU:\n"
 
-#: src/emu/ui/ui.cpp:1221 src/emu/ui/ui.cpp:1260
+#: src/emu/ui/ui.cpp:1218 src/emu/ui/ui.cpp:1257
 msgid "MHz"
 msgstr "MHz"
 
-#: src/emu/ui/ui.cpp:1221 src/emu/ui/ui.cpp:1260
+#: src/emu/ui/ui.cpp:1218 src/emu/ui/ui.cpp:1257
 msgid "kHz"
 msgstr "kHz"
 
-#: src/emu/ui/ui.cpp:1235
+#: src/emu/ui/ui.cpp:1232
 msgid ""
 "\n"
 "Sound:\n"
@@ -1639,7 +1655,7 @@ msgstr ""
 "\n"
 "Sound:\n"
 
-#: src/emu/ui/ui.cpp:1264
+#: src/emu/ui/ui.cpp:1261
 msgid ""
 "\n"
 "Video:\n"
@@ -1647,78 +1663,78 @@ msgstr ""
 "\n"
 "Video:\n"
 
-#: src/emu/ui/ui.cpp:1268
+#: src/emu/ui/ui.cpp:1265
 msgid "None\n"
 msgstr "Keine\n"
 
-#: src/emu/ui/ui.cpp:1275
+#: src/emu/ui/ui.cpp:1272
 msgid "Vector"
 msgstr "Vektor"
 
-#: src/emu/ui/ui.cpp:1286
+#: src/emu/ui/ui.cpp:1283
 #, c-format
 msgid "%1$s: %2$s\n"
 msgstr "%1$s: %2$s\n"
 
-#: src/emu/ui/ui.cpp:1286
+#: src/emu/ui/ui.cpp:1283
 msgid "%2$s\n"
 msgstr "%2$s\n"
 
-#: src/emu/ui/ui.cpp:1541 src/emu/ui/ui.cpp:1551
+#: src/emu/ui/ui.cpp:1538 src/emu/ui/ui.cpp:1548
 msgid "Keyboard Emulation Status"
 msgstr "Status Tastaturemulation"
 
-#: src/emu/ui/ui.cpp:1543
+#: src/emu/ui/ui.cpp:1540
 msgid "Mode: PARTIAL Emulation"
 msgstr "Modus: TEILWEISE Emulation"
 
-#: src/emu/ui/ui.cpp:1544
+#: src/emu/ui/ui.cpp:1541
 msgid "UI:   Enabled"
 msgstr "Benutzeroberfläche:   Aktiviert"
 
-#: src/emu/ui/ui.cpp:1546 src/emu/ui/ui.cpp:1556
+#: src/emu/ui/ui.cpp:1543 src/emu/ui/ui.cpp:1553
 msgid "**Use ScrLock to toggle**"
 msgstr "** Verwenden Sie ScrLock zum Umschalten**"
 
-#: src/emu/ui/ui.cpp:1553
+#: src/emu/ui/ui.cpp:1550
 msgid "Mode: FULL Emulation"
 msgstr "Modus: VOLLSTÄNDIGE Emulation"
 
-#: src/emu/ui/ui.cpp:1554
+#: src/emu/ui/ui.cpp:1551
 msgid "UI:   Disabled"
 msgstr "Benutzeroberfläche:   Deaktiviert"
 
-#: src/emu/ui/ui.cpp:1692
+#: src/emu/ui/ui.cpp:1689
 msgid "Autofire can't be enabled"
 msgstr "Dauerfeuer kann nicht aktiviert werden"
 
-#: src/emu/ui/ui.cpp:1731
+#: src/emu/ui/ui.cpp:1728
 msgid "Select position to save to"
 msgstr "Speicherposition wählen"
 
-#: src/emu/ui/ui.cpp:1733
+#: src/emu/ui/ui.cpp:1730
 msgid "Select position to load from"
 msgstr "Ladeposition wählen"
 
-#: src/emu/ui/ui.cpp:1757
+#: src/emu/ui/ui.cpp:1754
 msgid "Save cancelled"
 msgstr "Speichern abgebrochen"
 
-#: src/emu/ui/ui.cpp:1759
+#: src/emu/ui/ui.cpp:1756
 msgid "Load cancelled"
 msgstr "Laden abgebrochen"
 
-#: src/emu/ui/ui.cpp:1802
+#: src/emu/ui/ui.cpp:1799
 #, c-format
 msgid "Save to position %s"
 msgstr "Speichere an Position %s"
 
-#: src/emu/ui/ui.cpp:1807
+#: src/emu/ui/ui.cpp:1804
 #, c-format
 msgid "Load from position %s"
 msgstr "Lade von Position %s"
 
-#: src/emu/ui/ui.cpp:1847
+#: src/emu/ui/ui.cpp:1844
 #, c-format
 msgid ""
 "Are you sure you want to quit?\n"
@@ -1731,173 +1747,173 @@ msgstr ""
 "Zum Beenden drücken Sie ''%1$s''.\n"
 "Um zur Emulation zurückzukehren drücken Sie ''%2$s''."
 
-#: src/emu/ui/ui.cpp:1917
+#: src/emu/ui/ui.cpp:1914
 msgid "Master Volume"
 msgstr "Gesamtlautstärke"
 
-#: src/emu/ui/ui.cpp:1926
+#: src/emu/ui/ui.cpp:1923
 #, c-format
 msgid "%1$s Volume"
 msgstr "%1$s Lautstärke"
 
-#: src/emu/ui/ui.cpp:1949
+#: src/emu/ui/ui.cpp:1946
 #, c-format
 msgid "Overclock CPU %1$s"
 msgstr "CPU %1$s übertakten"
 
-#: src/emu/ui/ui.cpp:1968
+#: src/emu/ui/ui.cpp:1965
 #, c-format
 msgid "%1$s Refresh Rate"
 msgstr "%1$s Aktualisierungsrate"
 
-#: src/emu/ui/ui.cpp:1973
+#: src/emu/ui/ui.cpp:1970
 #, c-format
 msgid "%1$s Brightness"
 msgstr "%1$s Helligkeit"
 
-#: src/emu/ui/ui.cpp:1975
+#: src/emu/ui/ui.cpp:1972
 #, c-format
 msgid "%1$s Contrast"
 msgstr "%1$s Kontrast"
 
-#: src/emu/ui/ui.cpp:1977
+#: src/emu/ui/ui.cpp:1974
 #, c-format
 msgid "%1$s Gamma"
 msgstr "%1$s Gamma"
 
-#: src/emu/ui/ui.cpp:1981
+#: src/emu/ui/ui.cpp:1978
 #, c-format
 msgid "%1$s Horiz Stretch"
 msgstr "%1$s Horizontale Streckung"
 
-#: src/emu/ui/ui.cpp:1983
+#: src/emu/ui/ui.cpp:1980
 #, c-format
 msgid "%1$s Horiz Position"
 msgstr "%1$s Horizontale Position"
 
-#: src/emu/ui/ui.cpp:1985
+#: src/emu/ui/ui.cpp:1982
 #, c-format
 msgid "%1$s Vert Stretch"
 msgstr "%1$s Vertikale Streckung"
 
-#: src/emu/ui/ui.cpp:1987
+#: src/emu/ui/ui.cpp:1984
 #, c-format
 msgid "%1$s Vert Position"
 msgstr "%1$s Vertikale Position"
 
-#: src/emu/ui/ui.cpp:2005
+#: src/emu/ui/ui.cpp:2002
 #, c-format
 msgid "Laserdisc '%1$s' Horiz Stretch"
 msgstr "Laserdisc '%1$s' Horizontale Streckung"
 
-#: src/emu/ui/ui.cpp:2007
+#: src/emu/ui/ui.cpp:2004
 #, c-format
 msgid "Laserdisc '%1$s' Horiz Position"
 msgstr "Laserdisc '%1$s' Horizontale Position"
 
-#: src/emu/ui/ui.cpp:2009
+#: src/emu/ui/ui.cpp:2006
 #, c-format
 msgid "Laserdisc '%1$s' Vert Stretch"
 msgstr "Laserdisc '%1$s' Vertikale Streckung"
 
-#: src/emu/ui/ui.cpp:2011
+#: src/emu/ui/ui.cpp:2008
 #, c-format
 msgid "Laserdisc '%1$s' Vert Position"
 msgstr "Laserdisc '%1$s' Vertikale Position"
 
-#: src/emu/ui/ui.cpp:2021
+#: src/emu/ui/ui.cpp:2018
 msgid "Vector Flicker"
 msgstr "Vektorflimmern"
 
-#: src/emu/ui/ui.cpp:2022
+#: src/emu/ui/ui.cpp:2019
 msgid "Beam Width Minimum"
 msgstr "Minimale Strahlbreite"
 
-#: src/emu/ui/ui.cpp:2023
+#: src/emu/ui/ui.cpp:2020
 msgid "Beam Width Maximum"
 msgstr "Maximale Strahlbreite"
 
-#: src/emu/ui/ui.cpp:2024
+#: src/emu/ui/ui.cpp:2021
 msgid "Beam Intensity Weight"
 msgstr "Gewichtung der Strahlintensität"
 
-#: src/emu/ui/ui.cpp:2037
+#: src/emu/ui/ui.cpp:2034
 #, c-format
 msgid "Crosshair Scale %1$s"
 msgstr "Fadenkreuzskalierung %1$s"
 
-#: src/emu/ui/ui.cpp:2037 src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2034 src/emu/ui/ui.cpp:2036
 msgid "X"
 msgstr "X"
 
-#: src/emu/ui/ui.cpp:2037 src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2034 src/emu/ui/ui.cpp:2036
 msgid "Y"
 msgstr "Y"
 
-#: src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2036
 #, c-format
 msgid "Crosshair Offset %1$s"
 msgstr "Fadenkreuzversatz %1$s"
 
-#: src/emu/ui/ui.cpp:2071
+#: src/emu/ui/ui.cpp:2068
 #, c-format
 msgid "%1$3ddB"
 msgstr "%1$3ddB"
 
-#: src/emu/ui/ui.cpp:2115
+#: src/emu/ui/ui.cpp:2112
 #, c-format
 msgid "%1$d%%"
 msgstr "%1$d%%"
 
-#: src/emu/ui/ui.cpp:2131
+#: src/emu/ui/ui.cpp:2128
 #, c-format
 msgid "%1$3.0f%%"
 msgstr "%1$3.0f%%"
 
-#: src/emu/ui/ui.cpp:2154
+#: src/emu/ui/ui.cpp:2151
 #, c-format
 msgid "%1$.3ffps"
 msgstr "%1$.3ffps"
 
-#: src/emu/ui/ui.cpp:2177 src/emu/ui/ui.cpp:2199 src/emu/ui/ui.cpp:2220
-#: src/emu/ui/ui.cpp:2242 src/emu/ui/ui.cpp:2264 src/emu/ui/ui.cpp:2286
-#: src/emu/ui/ui.cpp:2308 src/emu/ui/ui.cpp:2330 src/emu/ui/ui.cpp:2352
-#: src/emu/ui/ui.cpp:2374 src/emu/ui/ui.cpp:2396
+#: src/emu/ui/ui.cpp:2174 src/emu/ui/ui.cpp:2196 src/emu/ui/ui.cpp:2217
+#: src/emu/ui/ui.cpp:2239 src/emu/ui/ui.cpp:2261 src/emu/ui/ui.cpp:2283
+#: src/emu/ui/ui.cpp:2305 src/emu/ui/ui.cpp:2327 src/emu/ui/ui.cpp:2349
+#: src/emu/ui/ui.cpp:2371 src/emu/ui/ui.cpp:2393
 #, c-format
 msgid "%1$.3f"
 msgstr "%1$.3f"
 
-#: src/emu/ui/ui.cpp:2412 src/emu/ui/ui.cpp:2428 src/emu/ui/ui.cpp:2444
-#: src/emu/ui/ui.cpp:2460
+#: src/emu/ui/ui.cpp:2408 src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2438
+#: src/emu/ui/ui.cpp:2453
 #, c-format
 msgid "%1$1.2f"
 msgstr "%1$1.2f"
 
-#: src/emu/ui/ui.cpp:2476
+#: src/emu/ui/ui.cpp:2469
 #, c-format
 msgid "Screen '%1$s'"
 msgstr "Bildschirm '%1$s'"
 
-#: src/emu/ui/ui.cpp:2478
+#: src/emu/ui/ui.cpp:2471
 msgid "Screen"
 msgstr "Bildschirm"
 
-#: src/emu/ui/ui.cpp:2494
+#: src/emu/ui/ui.cpp:2487
 #, c-format
 msgid "Crosshair Scale X %1$1.3f"
 msgstr "Fadenkreuzskalierung X %1$1.3f"
 
-#: src/emu/ui/ui.cpp:2494
+#: src/emu/ui/ui.cpp:2487
 #, c-format
 msgid "Crosshair Scale Y %1$1.3f"
 msgstr "Fadenkreuzskalierung Y %1$1.3f"
 
-#: src/emu/ui/ui.cpp:2513
+#: src/emu/ui/ui.cpp:2506
 #, c-format
 msgid "Crosshair Offset X %1$1.3f"
 msgstr "Fadenkreuzversatz X %1$1.3f"
 
-#: src/emu/ui/ui.cpp:2513
+#: src/emu/ui/ui.cpp:2506
 #, c-format
 msgid "Crosshair Offset Y %1$1.3f"
 msgstr "Fadenkreuzversatz Y %1$1.3f"
@@ -1939,14 +1955,26 @@ msgstr "Beschnitten"
 msgid "Full"
 msgstr "Voll"
 
-#: src/emu/ui/viewgfx.cpp:392
+#: src/emu/ui/viewgfx.cpp:391
 msgid " COLORS"
 msgstr " FARBEN"
 
-#: src/emu/ui/viewgfx.cpp:392
+#: src/emu/ui/viewgfx.cpp:391
 msgid " PENS"
 msgstr " STIFTE"
 
+#~ msgid "Export XML format (like -listxml)"
+#~ msgstr "Im XML-Format exportieren"
+
+#~ msgid "Export TXT format (like -listfull)"
+#~ msgstr "Im TXT-Format exportieren"
+
+#~ msgid "Dummy"
+#~ msgstr "Platzhalter"
+
+#~ msgid "%1$s %2$s ( %3$d / %4$d softwares )"
+#~ msgstr "%1$s %2$s ( %3$d / %4$d Programme )"
+
 #~ msgid "Lightgun Device Assignment"
 #~ msgstr "Lightgun-Zuordnung"
 
@@ -2094,9 +2122,6 @@ msgstr " STIFTE"
 #~ "Geben Sie \"OK\" ein oder bewegen Sie den Joystick nach links und dann "
 #~ "nach rechts, um fortzufahren"
 
-#~ msgid "Configure Machine"
-#~ msgstr "Maschine konfigurieren"
-
 #~ msgid "Multi-Threaded Rendering"
 #~ msgstr "Multi-Thread-Rendering"
 
diff --git a/language/Greek/strings.po b/language/Greek/strings.po
index 084154c820d..06d6f2c0d6b 100644
--- a/language/Greek/strings.po
+++ b/language/Greek/strings.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MAME\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-11 03:33+0200\n"
+"POT-Creation-Date: 2016-04-15 17:42+0200\n"
 "PO-Revision-Date: 2016-03-28 15:32+0300\n"
 "Last-Translator: Mame.gr\n"
 "Language-Team: MAME Language Team\n"
@@ -62,14 +62,14 @@ msgstr "Επαναφόρτωση όλων"
 msgid "Autofire Status"
 msgstr "Κατάσταση Autofire"
 
-#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1698
+#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1695
 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211
 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219
 #: src/emu/ui/videoopt.cpp:223
 msgid "Disabled"
 msgstr "Απενεργοποιημένο"
 
-#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1698
+#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1695
 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211
 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219
 #: src/emu/ui/videoopt.cpp:223
@@ -77,14 +77,14 @@ msgid "Enabled"
 msgstr "Ενεργοποιημένο"
 
 #: src/emu/ui/cheatopt.cpp:282 src/emu/ui/cheatopt.cpp:288
-#: src/emu/ui/menu.cpp:710 src/emu/ui/miscmenu.cpp:831
-#: src/emu/ui/sndmenu.cpp:135 src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/menu.cpp:755 src/emu/ui/miscmenu.cpp:936
+#: src/emu/ui/sndmenu.cpp:133 src/emu/ui/sndmenu.cpp:135
 msgid "On"
 msgstr "On"
 
 #: src/emu/ui/cheatopt.cpp:282 src/emu/ui/cheatopt.cpp:288
-#: src/emu/ui/menu.cpp:713 src/emu/ui/miscmenu.cpp:831
-#: src/emu/ui/sndmenu.cpp:135 src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/menu.cpp:758 src/emu/ui/miscmenu.cpp:936
+#: src/emu/ui/sndmenu.cpp:133 src/emu/ui/sndmenu.cpp:135
 msgid "Off"
 msgstr "Off"
 
@@ -96,317 +96,317 @@ msgstr "Δεν βρέθηκαν κουμπιά σε αυτό το μηχάνημ
 msgid "Autofire Delay"
 msgstr "Καθυστέρηση Autofire"
 
-#: src/emu/ui/custmenu.cpp:158 src/emu/ui/custmenu.cpp:447
+#: src/emu/ui/custmenu.cpp:157 src/emu/ui/custmenu.cpp:445
 msgid "Main filter"
 msgstr "Κύριο φίλτρο"
 
-#: src/emu/ui/custmenu.cpp:167 src/emu/ui/custmenu.cpp:456
+#: src/emu/ui/custmenu.cpp:166 src/emu/ui/custmenu.cpp:454
 msgid "Other filter"
 msgstr "Άλλο φίλτρο"
 
-#: src/emu/ui/custmenu.cpp:176 src/emu/ui/optsmenu.cpp:239
+#: src/emu/ui/custmenu.cpp:175 src/emu/ui/optsmenu.cpp:238
 msgid "^!Manufacturer"
 msgstr "^!Κατασκευαστής"
 
-#: src/emu/ui/custmenu.cpp:185 src/emu/ui/custmenu.cpp:474
-#: src/emu/ui/optsmenu.cpp:247
+#: src/emu/ui/custmenu.cpp:184 src/emu/ui/custmenu.cpp:472
+#: src/emu/ui/optsmenu.cpp:246
 msgid "^!Year"
 msgstr "^!Έτος"
 
-#: src/emu/ui/custmenu.cpp:194 src/emu/ui/custmenu.cpp:510
+#: src/emu/ui/custmenu.cpp:193 src/emu/ui/custmenu.cpp:508
 msgid "Remove last filter"
 msgstr "Αφαίρεση τελευταίου φίλτρου"
 
-#: src/emu/ui/custmenu.cpp:197 src/emu/ui/custmenu.cpp:513
+#: src/emu/ui/custmenu.cpp:196 src/emu/ui/custmenu.cpp:511
 msgid "Add filter"
 msgstr "Προσθήκη φίλτρου"
 
-#: src/emu/ui/custmenu.cpp:212 src/emu/ui/custmenu.cpp:233
-#: src/emu/ui/custmenu.cpp:529 src/emu/ui/custmenu.cpp:550
+#: src/emu/ui/custmenu.cpp:211 src/emu/ui/custmenu.cpp:231
+#: src/emu/ui/custmenu.cpp:527 src/emu/ui/custmenu.cpp:547
 msgid "Select custom filters:"
 msgstr "Επιλογή προσαρμοσμένων φίλτρων:"
 
-#: src/emu/ui/custmenu.cpp:465
+#: src/emu/ui/custmenu.cpp:463
 msgid "^!Publisher"
 msgstr "^!Εκδότης"
 
-#: src/emu/ui/custmenu.cpp:483
+#: src/emu/ui/custmenu.cpp:481
 msgid "^!Software List"
 msgstr "^!Λίστα Λογισμικού"
 
-#: src/emu/ui/custmenu.cpp:492
+#: src/emu/ui/custmenu.cpp:490
 msgid "^!Device type"
 msgstr "^!Τύπος συσκευής"
 
-#: src/emu/ui/custmenu.cpp:501
+#: src/emu/ui/custmenu.cpp:499
 msgid "^!Region"
 msgstr "^!Περιοχή"
 
-#: src/emu/ui/custui.cpp:23
+#: src/emu/ui/custui.cpp:22
 msgid "Show All"
 msgstr "Προβολή όλων"
 
-#: src/emu/ui/custui.cpp:24
+#: src/emu/ui/custui.cpp:23
 msgid "Hide Filters"
 msgstr "Απόκρυψη Φίλτρων"
 
-#: src/emu/ui/custui.cpp:25
+#: src/emu/ui/custui.cpp:24
 msgid "Hide Info/Image"
 msgstr "Απόκρυψη Πληροφορίων/Εικόνας"
 
-#: src/emu/ui/custui.cpp:26
+#: src/emu/ui/custui.cpp:25
 msgid "Hide Both"
 msgstr "Απόκρυψη Όλων"
 
-#: src/emu/ui/custui.cpp:142
+#: src/emu/ui/custui.cpp:141
 msgid "Fonts"
 msgstr "Γραμματοσειρές"
 
-#: src/emu/ui/custui.cpp:143
+#: src/emu/ui/custui.cpp:142
 msgid "Colors"
 msgstr "Χρώματα"
 
-#: src/emu/ui/custui.cpp:148 src/emu/ui/dirmenu.cpp:33
+#: src/emu/ui/custui.cpp:147 src/emu/ui/dirmenu.cpp:33
 msgid "Language"
 msgstr "Γλώσσα"
 
-#: src/emu/ui/custui.cpp:152
+#: src/emu/ui/custui.cpp:151
 msgid "Show side panels"
 msgstr "Εμφάνιση πλευρικών πάνελ"
 
-#: src/emu/ui/custui.cpp:167 src/emu/ui/custui.cpp:188
+#: src/emu/ui/custui.cpp:166 src/emu/ui/custui.cpp:186
 msgid "Custom UI Settings"
 msgstr "Προσαρμοσμένες Ρυθμίσεις UI"
 
-#: src/emu/ui/custui.cpp:246
+#: src/emu/ui/custui.cpp:244
 msgid "default"
 msgstr "προεπιλογή"
 
-#: src/emu/ui/custui.cpp:349
+#: src/emu/ui/custui.cpp:347
 msgid "UI Font"
 msgstr "Γραμματοσειρά UI"
 
-#: src/emu/ui/custui.cpp:354
+#: src/emu/ui/custui.cpp:352
 msgid "Bold"
 msgstr "Έντονα"
 
-#: src/emu/ui/custui.cpp:355
+#: src/emu/ui/custui.cpp:353
 msgid "Italic"
 msgstr "Πλάγια"
 
-#: src/emu/ui/custui.cpp:360
+#: src/emu/ui/custui.cpp:358
 msgid "Lines"
 msgstr "Γραμμές"
 
-#: src/emu/ui/custui.cpp:366
+#: src/emu/ui/custui.cpp:364
 msgid "Infos text size"
 msgstr "Μέγεθος κειμένου πληροφοριών"
 
-#: src/emu/ui/custui.cpp:383
+#: src/emu/ui/custui.cpp:381
 msgid "UI Fonts Settings"
 msgstr "Ρυθμίσεις γραμματοσειρών UI"
 
-#: src/emu/ui/custui.cpp:411
+#: src/emu/ui/custui.cpp:408
 msgid "Sample text - Lorem ipsum dolor sit amet, consectetur adipiscing elit."
 msgstr ""
 "Δείγμα κειμένου - Lorem ipsum dolor sit amet, consectetur adipiscing elit."
 
-#: src/emu/ui/custui.cpp:509
+#: src/emu/ui/custui.cpp:506
 msgid "Normal text"
 msgstr "Κανονικό κείμενο"
 
-#: src/emu/ui/custui.cpp:510
+#: src/emu/ui/custui.cpp:507
 msgid "Selected color"
 msgstr "Χρώμα επιλεγμένου"
 
-#: src/emu/ui/custui.cpp:511
+#: src/emu/ui/custui.cpp:508
 msgid "Normal text background"
 msgstr "Φόντο κανονικού κειμένου"
 
-#: src/emu/ui/custui.cpp:512
+#: src/emu/ui/custui.cpp:509
 msgid "Selected background color"
 msgstr "Χρώμα φόντου επιλεγμένου"
 
-#: src/emu/ui/custui.cpp:513
+#: src/emu/ui/custui.cpp:510
 msgid "Subitem color"
 msgstr "Χρώμα δευτερεύοντος στοιχείου"
 
-#: src/emu/ui/custui.cpp:514 src/emu/ui/custui.cpp:610
+#: src/emu/ui/custui.cpp:511 src/emu/ui/custui.cpp:606
 msgid "Clone"
 msgstr "Κλώνος"
 
-#: src/emu/ui/custui.cpp:515
+#: src/emu/ui/custui.cpp:512
 msgid "Border"
 msgstr "Περίγραμμα"
 
-#: src/emu/ui/custui.cpp:516
+#: src/emu/ui/custui.cpp:513
 msgid "Background"
 msgstr "Φόντο"
 
-#: src/emu/ui/custui.cpp:517
+#: src/emu/ui/custui.cpp:514
 msgid "Dipswitch"
 msgstr "Μικροδιακόπτης"
 
-#: src/emu/ui/custui.cpp:518
+#: src/emu/ui/custui.cpp:515
 msgid "Unavailable color"
 msgstr "Χρώμα μη διαθέσιμου"
 
-#: src/emu/ui/custui.cpp:519
+#: src/emu/ui/custui.cpp:516
 msgid "Slider color"
 msgstr "Χρώμα Slider"
 
-#: src/emu/ui/custui.cpp:520
+#: src/emu/ui/custui.cpp:517
 msgid "Gfx viewer background"
 msgstr "Φόντο Gfx προβολής"
 
-#: src/emu/ui/custui.cpp:521
+#: src/emu/ui/custui.cpp:518
 msgid "Mouse over color"
 msgstr "Χρώμα Mouse over"
 
-#: src/emu/ui/custui.cpp:522
+#: src/emu/ui/custui.cpp:519
 msgid "Mouse over background color"
 msgstr "Χρώμα φόντου Mouse over"
 
-#: src/emu/ui/custui.cpp:523
+#: src/emu/ui/custui.cpp:520
 msgid "Mouse down color"
 msgstr "Χρώμα Mouse down"
 
-#: src/emu/ui/custui.cpp:524
+#: src/emu/ui/custui.cpp:521
 msgid "Mouse down background color"
 msgstr "Χρώμα φόντου Mouse down"
 
-#: src/emu/ui/custui.cpp:527
+#: src/emu/ui/custui.cpp:524
 msgid "Restore originals colors"
 msgstr "Επαναφορά αρχικών χρωμάτων"
 
-#: src/emu/ui/custui.cpp:543
+#: src/emu/ui/custui.cpp:540
 msgid "UI Colors Settings"
 msgstr "Ρυθμίσεις χρωμάτων UI"
 
-#: src/emu/ui/custui.cpp:572
+#: src/emu/ui/custui.cpp:568
 #, c-format
 msgid "Double click or press %1$s to change the color value"
 msgstr "Κάντε διπλό κλικ ή πατήστε %1$s για να αλλάξετε την τιμή του χρώματος"
 
-#: src/emu/ui/custui.cpp:598
+#: src/emu/ui/custui.cpp:594
 msgid "Menu Preview"
 msgstr "Προεπισκόπηση του μενού"
 
-#: src/emu/ui/custui.cpp:606
+#: src/emu/ui/custui.cpp:602
 msgid "Normal"
 msgstr "Κανονικό"
 
-#: src/emu/ui/custui.cpp:607
+#: src/emu/ui/custui.cpp:603
 msgid "Subitem"
 msgstr "Δευτερεύον στοιχείο "
 
-#: src/emu/ui/custui.cpp:608
+#: src/emu/ui/custui.cpp:604
 msgid "Selected"
 msgstr "Επιλεγμένο"
 
-#: src/emu/ui/custui.cpp:609
+#: src/emu/ui/custui.cpp:605
 msgid "Mouse Over"
 msgstr "Mouse Over"
 
-#: src/emu/ui/custui.cpp:841 src/emu/ui/custui.cpp:844
+#: src/emu/ui/custui.cpp:837 src/emu/ui/custui.cpp:840
 msgid "Alpha"
 msgstr "Άλφα"
 
-#: src/emu/ui/custui.cpp:849 src/emu/ui/custui.cpp:852
-#: src/emu/ui/custui.cpp:1013
+#: src/emu/ui/custui.cpp:845 src/emu/ui/custui.cpp:848
+#: src/emu/ui/custui.cpp:1007
 msgid "Red"
 msgstr "Κόκκινο"
 
-#: src/emu/ui/custui.cpp:857 src/emu/ui/custui.cpp:860
-#: src/emu/ui/custui.cpp:1016
+#: src/emu/ui/custui.cpp:853 src/emu/ui/custui.cpp:856
+#: src/emu/ui/custui.cpp:1010
 msgid "Green"
 msgstr "Πράσινο"
 
-#: src/emu/ui/custui.cpp:865 src/emu/ui/custui.cpp:868
-#: src/emu/ui/custui.cpp:1017
+#: src/emu/ui/custui.cpp:861 src/emu/ui/custui.cpp:864
+#: src/emu/ui/custui.cpp:1011
 msgid "Blue"
 msgstr "Μπλε"
 
-#: src/emu/ui/custui.cpp:871
+#: src/emu/ui/custui.cpp:867
 msgid "Choose from palette"
 msgstr "Επιλέξτε από την παλέτα"
 
-#: src/emu/ui/custui.cpp:887
+#: src/emu/ui/custui.cpp:883
 msgid " - ARGB Settings"
 msgstr " - Ρυθμίσεις ARGB"
 
-#: src/emu/ui/custui.cpp:912
+#: src/emu/ui/custui.cpp:907
 msgid "Color preview ="
 msgstr "Προεπισκόπηση χρώματος="
 
-#: src/emu/ui/custui.cpp:1009
+#: src/emu/ui/custui.cpp:1003
 msgid "White"
 msgstr "Λευκό"
 
-#: src/emu/ui/custui.cpp:1010
+#: src/emu/ui/custui.cpp:1004
 msgid "Silver"
 msgstr "Ασημί"
 
-#: src/emu/ui/custui.cpp:1011
+#: src/emu/ui/custui.cpp:1005
 msgid "Gray"
 msgstr "Γκρίζο"
 
-#: src/emu/ui/custui.cpp:1012
+#: src/emu/ui/custui.cpp:1006
 msgid "Black"
 msgstr "Μαύρο"
 
-#: src/emu/ui/custui.cpp:1014
+#: src/emu/ui/custui.cpp:1008
 msgid "Orange"
 msgstr "Πορτοκαλί"
 
-#: src/emu/ui/custui.cpp:1015
+#: src/emu/ui/custui.cpp:1009
 msgid "Yellow"
 msgstr "Κίτρινο"
 
-#: src/emu/ui/custui.cpp:1018
+#: src/emu/ui/custui.cpp:1012
 msgid "Violet"
 msgstr "Βιολετί"
 
-#: src/emu/ui/datmenu.cpp:65
+#: src/emu/ui/datmenu.cpp:64
 msgid "Software History"
 msgstr "Ιστορικό Λογισμικού"
 
-#: src/emu/ui/datmenu.cpp:67
+#: src/emu/ui/datmenu.cpp:66
 msgid "Software Usage"
 msgstr "Χρήση λογισμικού"
 
-#: src/emu/ui/datmenu.cpp:199
+#: src/emu/ui/datmenu.cpp:196
 msgid "Revision: "
 msgstr "Αναθεώρηση: "
 
-#: src/emu/ui/datmenu.cpp:287 src/emu/ui/selgame.cpp:40
-#: src/emu/ui/selgame.cpp:2152 src/emu/ui/selgame.cpp:2161
-#: src/emu/ui/selsoft.cpp:1577 src/emu/ui/selsoft.cpp:1597
-#: src/emu/ui/selsoft.cpp:1606
+#: src/emu/ui/datmenu.cpp:284 src/emu/ui/selgame.cpp:39
+#: src/emu/ui/selgame.cpp:2158 src/emu/ui/selgame.cpp:2167
+#: src/emu/ui/selsoft.cpp:1574 src/emu/ui/selsoft.cpp:1592
+#: src/emu/ui/selsoft.cpp:1601
 msgid "History"
 msgstr "Ιστορία"
 
-#: src/emu/ui/datmenu.cpp:289 src/emu/ui/selgame.cpp:41
+#: src/emu/ui/datmenu.cpp:286 src/emu/ui/selgame.cpp:40
 msgid "Mameinfo"
 msgstr "Mameinfo"
 
-#: src/emu/ui/datmenu.cpp:291 src/emu/ui/selgame.cpp:43
+#: src/emu/ui/datmenu.cpp:288 src/emu/ui/selgame.cpp:42
 msgid "Messinfo"
 msgstr "Messinfo"
 
-#: src/emu/ui/datmenu.cpp:293 src/emu/ui/selgame.cpp:42
+#: src/emu/ui/datmenu.cpp:290 src/emu/ui/selgame.cpp:41
 msgid "Sysinfo"
 msgstr "Sysinfo"
 
-#: src/emu/ui/datmenu.cpp:295 src/emu/ui/selgame.cpp:46
+#: src/emu/ui/datmenu.cpp:292 src/emu/ui/selgame.cpp:45
 msgid "Mamescore"
 msgstr "Mamescore"
 
-#: src/emu/ui/datmenu.cpp:297 src/emu/ui/selgame.cpp:45
+#: src/emu/ui/datmenu.cpp:294 src/emu/ui/selgame.cpp:44
 msgid "Gameinit"
 msgstr "Gameinit"
 
-#: src/emu/ui/datmenu.cpp:299 src/emu/ui/selgame.cpp:44
+#: src/emu/ui/datmenu.cpp:296 src/emu/ui/selgame.cpp:43
 msgid "Command"
 msgstr "Εντολή"
 
@@ -558,75 +558,75 @@ msgstr "Πιέστε το πλήκτρο TAB για να ορίσετε"
 msgid "Remove %1$s Folder"
 msgstr "Αφαίρεση Φακέλου %1$s"
 
-#: src/emu/ui/filesel.cpp:158
+#: src/emu/ui/filesel.cpp:161
 msgid "File Already Exists - Override?"
 msgstr "Το Αρχείο Υπάρχει Ήδη - Να Αντικατασταθεί;"
 
-#: src/emu/ui/filesel.cpp:160 src/emu/ui/selgame.cpp:1568
-#: src/emu/ui/selgame.cpp:1569 src/emu/ui/selgame.cpp:1570
-#: src/emu/ui/selgame.cpp:1571 src/emu/ui/selgame.cpp:1572
-#: src/emu/ui/selgame.cpp:1573 src/emu/ui/selgame.cpp:1574
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/filesel.cpp:163 src/emu/ui/selgame.cpp:1576
+#: src/emu/ui/selgame.cpp:1577 src/emu/ui/selgame.cpp:1578
+#: src/emu/ui/selgame.cpp:1579 src/emu/ui/selgame.cpp:1580
+#: src/emu/ui/selgame.cpp:1581 src/emu/ui/selgame.cpp:1582
+#: src/emu/ui/selgame.cpp:1591
 msgid "No"
 msgstr "Όχι"
 
-#: src/emu/ui/filesel.cpp:161 src/emu/ui/selgame.cpp:1568
-#: src/emu/ui/selgame.cpp:1569 src/emu/ui/selgame.cpp:1570
-#: src/emu/ui/selgame.cpp:1571 src/emu/ui/selgame.cpp:1572
-#: src/emu/ui/selgame.cpp:1573 src/emu/ui/selgame.cpp:1574
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/filesel.cpp:164 src/emu/ui/selgame.cpp:1576
+#: src/emu/ui/selgame.cpp:1577 src/emu/ui/selgame.cpp:1578
+#: src/emu/ui/selgame.cpp:1579 src/emu/ui/selgame.cpp:1580
+#: src/emu/ui/selgame.cpp:1581 src/emu/ui/selgame.cpp:1582
+#: src/emu/ui/selgame.cpp:1591
 msgid "Yes"
 msgstr "Ναι"
 
-#: src/emu/ui/filesel.cpp:272
+#: src/emu/ui/filesel.cpp:275
 msgid "New Image Name:"
 msgstr "Νέο Όνομα Εικόνας:"
 
-#: src/emu/ui/filesel.cpp:278
+#: src/emu/ui/filesel.cpp:281
 msgid "Image Format:"
 msgstr "Μορφή Εικόνας:"
 
-#: src/emu/ui/filesel.cpp:284
+#: src/emu/ui/filesel.cpp:287
 msgid "Create"
 msgstr "Δημιουργία"
 
-#: src/emu/ui/filesel.cpp:315
+#: src/emu/ui/filesel.cpp:318
 msgid "Please enter a file extension too"
 msgstr "Παρακαλούμε εισάγετε μια επέκταση αρχείου"
 
-#: src/emu/ui/filesel.cpp:503 src/emu/ui/swlist.cpp:65
+#: src/emu/ui/filesel.cpp:506 src/emu/ui/swlist.cpp:65
 msgid "[empty slot]"
 msgstr "[κενή υποδοχή]"
 
-#: src/emu/ui/filesel.cpp:507
+#: src/emu/ui/filesel.cpp:510
 msgid "[create]"
 msgstr "[δημιουργία]"
 
-#: src/emu/ui/filesel.cpp:511 src/emu/ui/swlist.cpp:76
+#: src/emu/ui/filesel.cpp:514 src/emu/ui/swlist.cpp:76
 msgid "[software list]"
 msgstr "[λίστα λογισμικού]"
 
-#: src/emu/ui/filesel.cpp:803
+#: src/emu/ui/filesel.cpp:806
 msgid "Select image format"
 msgstr "Επιλέξτε μορφή εικόνας"
 
-#: src/emu/ui/filesel.cpp:863
+#: src/emu/ui/filesel.cpp:866
 msgid "Select access mode"
 msgstr "Επιλέξτε λειτουργία πρόσβασης"
 
-#: src/emu/ui/filesel.cpp:864
+#: src/emu/ui/filesel.cpp:867
 msgid "Read-only"
 msgstr "Μόνο για Ανάγνωση"
 
-#: src/emu/ui/filesel.cpp:866
+#: src/emu/ui/filesel.cpp:869
 msgid "Read-write"
 msgstr "Ανάγνωσης-εγγραφής"
 
-#: src/emu/ui/filesel.cpp:867
+#: src/emu/ui/filesel.cpp:870
 msgid "Read this image, write to another image"
 msgstr "Ανάγνωση αυτής της εικόνας, εγγραφή σε άλλη"
 
-#: src/emu/ui/filesel.cpp:868
+#: src/emu/ui/filesel.cpp:871
 msgid "Read this image, write to diff"
 msgstr "Ανάγνωση αυτής της εικόνας, εγγραφή σε αρχείο αλλαγών"
 
@@ -654,7 +654,7 @@ msgstr "Υποστηρίζεται μερικώς"
 msgid "[empty]"
 msgstr "[κενό]"
 
-#: src/emu/ui/info_pty.cpp:26 src/emu/ui/mainmenu.cpp:91
+#: src/emu/ui/info_pty.cpp:26 src/emu/ui/mainmenu.cpp:96
 msgid "Pseudo terminals"
 msgstr "Ψευδο τερματικά"
 
@@ -670,7 +670,7 @@ msgstr "Περιβάλλον Χρήστη"
 msgid "Other Controls"
 msgstr "Άλλα Στοιχεία Ελέγχου"
 
-#: src/emu/ui/inputmap.cpp:622 src/emu/ui/miscmenu.cpp:91
+#: src/emu/ui/inputmap.cpp:622 src/emu/ui/miscmenu.cpp:92
 #: src/emu/ui/slotopt.cpp:172
 msgid "Reset"
 msgstr "Επαναφορά"
@@ -703,27 +703,27 @@ msgstr "Λογιστικές Πληροφορίες"
 msgid "Machine Information"
 msgstr "Πληροφορίες Μηχανήματος"
 
-#: src/emu/ui/mainmenu.cpp:78
+#: src/emu/ui/mainmenu.cpp:80
 msgid "Image Information"
 msgstr "Πληροφορίες Τίτλου"
 
-#: src/emu/ui/mainmenu.cpp:81
+#: src/emu/ui/mainmenu.cpp:83
 msgid "File Manager"
 msgstr "Διαχείριση Αρχείων"
 
-#: src/emu/ui/mainmenu.cpp:86
+#: src/emu/ui/mainmenu.cpp:92
 msgid "Tape Control"
 msgstr "Έλεγχος Κασσέτας"
 
-#: src/emu/ui/mainmenu.cpp:94
+#: src/emu/ui/mainmenu.cpp:99
 msgid "Bios Selection"
 msgstr "Επιλογή BIOS"
 
-#: src/emu/ui/mainmenu.cpp:100
+#: src/emu/ui/mainmenu.cpp:104
 msgid "Slot Devices"
 msgstr "Συσκευές Υποδοχής"
 
-#: src/emu/ui/mainmenu.cpp:107
+#: src/emu/ui/mainmenu.cpp:109
 msgid "Barcode Reader"
 msgstr "Συσκευή Ανάγνωσης Γραμμωτού Κώδικα"
 
@@ -731,43 +731,43 @@ msgstr "Συσκευή Ανάγνωσης Γραμμωτού Κώδικα"
 msgid "Network Devices"
 msgstr "Συσκευές Δικτύου"
 
-#: src/emu/ui/mainmenu.cpp:119
+#: src/emu/ui/mainmenu.cpp:118
 msgid "Keyboard Mode"
 msgstr "Λειτουργία Πληκτρολογίου"
 
-#: src/emu/ui/mainmenu.cpp:122
+#: src/emu/ui/mainmenu.cpp:121
 msgid "Slider Controls"
 msgstr "Έλεγχος Slider "
 
-#: src/emu/ui/mainmenu.cpp:125
+#: src/emu/ui/mainmenu.cpp:124
 msgid "Video Options"
 msgstr "Επιλογές Βίντεο"
 
-#: src/emu/ui/mainmenu.cpp:129
+#: src/emu/ui/mainmenu.cpp:128
 msgid "Crosshair Options"
 msgstr "Επιλογές Στόχαστρου"
 
-#: src/emu/ui/mainmenu.cpp:133
+#: src/emu/ui/mainmenu.cpp:132
 msgid "Cheat"
 msgstr "Cheat"
 
-#: src/emu/ui/mainmenu.cpp:136
+#: src/emu/ui/mainmenu.cpp:135
 msgid "Plugin Options"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:140
+#: src/emu/ui/mainmenu.cpp:139
 msgid "External DAT View"
 msgstr "Προβολή Εξωτερικού DAT"
 
-#: src/emu/ui/mainmenu.cpp:146
+#: src/emu/ui/mainmenu.cpp:145 src/emu/ui/miscmenu.cpp:785
 msgid "Add To Favorites"
 msgstr "Προσθήκη Στα Αγαπημένα"
 
-#: src/emu/ui/mainmenu.cpp:148
+#: src/emu/ui/mainmenu.cpp:147 src/emu/ui/miscmenu.cpp:787
 msgid "Remove From Favorites"
 msgstr "Αφαίρεση Από Τα Αγαπημένα"
 
-#: src/emu/ui/mainmenu.cpp:155
+#: src/emu/ui/mainmenu.cpp:154
 msgid "Select New Machine"
 msgstr "Επιλέξτε Νέο Μηχάνημα"
 
@@ -807,31 +807,31 @@ msgstr "Έξοδος"
 msgid "Return to Previous Menu"
 msgstr "Επιστροφή στο Προηγούμενο Μενού"
 
-#: src/emu/ui/menu.cpp:716
+#: src/emu/ui/menu.cpp:761
 msgid "Auto"
 msgstr "Αυτόματο"
 
-#: src/emu/ui/menu.cpp:2133
+#: src/emu/ui/menu.cpp:2195
 msgid "Images"
 msgstr "Εικόνες"
 
-#: src/emu/ui/menu.cpp:2134
+#: src/emu/ui/menu.cpp:2196
 msgid "Infos"
 msgstr "Πληροφορίες"
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Keyboard Mode:"
 msgstr "Λειτουργία Πληκτρολογίου:"
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Natural"
 msgstr "Φυσικό"
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Emulated"
 msgstr "Εξομοιωμένο"
 
-#: src/emu/ui/miscmenu.cpp:240
+#: src/emu/ui/miscmenu.cpp:241
 #, c-format
 msgid ""
 "Uptime: %1$d:%2$02d:%3$02d\n"
@@ -840,7 +840,7 @@ msgstr ""
 "Ώρα λειτουργίας: %1$d:%2$02d:%3$02d\n"
 "\n"
 
-#: src/emu/ui/miscmenu.cpp:242
+#: src/emu/ui/miscmenu.cpp:243
 #, c-format
 msgid ""
 "Uptime: %1$d:%2$02d\n"
@@ -849,7 +849,7 @@ msgstr ""
 "Ώρα λειτουργίας: %1$d:%2$02d\n"
 "\n"
 
-#: src/emu/ui/miscmenu.cpp:246
+#: src/emu/ui/miscmenu.cpp:247
 #, c-format
 msgid ""
 "Tickets dispensed: %1$d\n"
@@ -858,109 +858,50 @@ msgstr ""
 "Εισιτήρια που διανέμονται: %1$d\n"
 "\n"
 
-#: src/emu/ui/miscmenu.cpp:257
+#: src/emu/ui/miscmenu.cpp:258
 msgid "Coin %1$c: NA%3$s\n"
 msgstr "Κέρμα %1$c: NA%3$s\n"
 
-#: src/emu/ui/miscmenu.cpp:257
+#: src/emu/ui/miscmenu.cpp:258
 #, c-format
 msgid "Coin %1$c: %2$d%3$s\n"
 msgstr "Κέρμα %1$c: %2$d%3$s\n"
 
-#: src/emu/ui/miscmenu.cpp:260
+#: src/emu/ui/miscmenu.cpp:261
 msgid " (locked)"
 msgstr " (κλειδωμένο)"
 
-#: src/emu/ui/miscmenu.cpp:519
+#: src/emu/ui/miscmenu.cpp:520
 msgid "Visible Delay"
 msgstr "Ορατή Καθυστέρηση"
 
-#: src/emu/ui/miscmenu.cpp:617
+#: src/emu/ui/miscmenu.cpp:619
 #, c-format
 msgid "%s.xml saved under ui folder."
 msgstr "%s.XML αποθηκεύτηκε στο φάκελο ui."
 
-#: src/emu/ui/miscmenu.cpp:645
+#: src/emu/ui/miscmenu.cpp:647
 msgid "Name:             Description:\n"
 msgstr "Όνομα:             Περιγραφή:\n"
 
-#: src/emu/ui/miscmenu.cpp:657
+#: src/emu/ui/miscmenu.cpp:659
 #, c-format
 msgid "%s.txt saved under ui folder."
 msgstr "%s.txt αποθηκεύτηκε στο φάκελο ui."
 
-#: src/emu/ui/miscmenu.cpp:675
-msgid "Export XML format (like -listxml)"
-msgstr "Εξαγωγή σε μορφή XML (όπως -listxml)"
+#: src/emu/ui/miscmenu.cpp:677
+msgid "Export list in XML format (like -listxml)"
+msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:676
-msgid "Export TXT format (like -listfull)"
-msgstr "Εξαγωγή σε μορφή XML TXT(όπως -listfull)"
+#: src/emu/ui/miscmenu.cpp:678
+msgid "Export list in XML format (like -listxml, but exclude devices)"
+msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:734
-msgid "Dummy"
-msgstr "Dummy"
+#: src/emu/ui/miscmenu.cpp:679
+msgid "Export list in TXT format (like -listfull)"
+msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:736
-msgid "Save machine configuration"
-msgstr "Αποθήκευση παραμετροποίησης μηχανήματος"
-
-#: src/emu/ui/miscmenu.cpp:848 src/emu/ui/miscmenu.cpp:869
-#: src/emu/ui/selgame.cpp:594
-msgid "Plugins"
-msgstr "Πρόσθετα"
-
-#: src/emu/ui/optsmenu.cpp:218
-msgid "Filter"
-msgstr "Φίλτρο"
-
-#: src/emu/ui/optsmenu.cpp:226
-msgid " ^!File"
-msgstr " ^!Αρχείο"
-
-#: src/emu/ui/optsmenu.cpp:231
-msgid " ^!Category"
-msgstr " ^!Κατηγορία"
-
-#: src/emu/ui/optsmenu.cpp:254
-msgid "^!Setup custom filter"
-msgstr "^!Ρύθμιση προσαρμοσμένου φίλτρου"
-
-#: src/emu/ui/optsmenu.cpp:262
-msgid "Customize UI"
-msgstr "Προσαρμογή UI"
-
-#: src/emu/ui/optsmenu.cpp:263
-msgid "Configure Directories"
-msgstr "Ρύθμιση Φακέλων"
-
-#: src/emu/ui/optsmenu.cpp:266 src/emu/ui/sndmenu.cpp:151
-#: src/emu/ui/sndmenu.cpp:172
-msgid "Sound Options"
-msgstr "Επιλογές Ήχου"
-
-#: src/emu/ui/optsmenu.cpp:269
-msgid "General Inputs"
-msgstr "Γενικός Χειρισμός"
-
-#: src/emu/ui/optsmenu.cpp:272
-msgid "Save Configuration"
-msgstr "Αποθήκευση Ρυθμίσεων"
-
-#: src/emu/ui/optsmenu.cpp:286 src/emu/ui/optsmenu.cpp:307
-msgid "Settings"
-msgstr "Ρυθμίσεις"
-
-#: src/emu/ui/optsmenu.cpp:327
-msgid "**Error saving ui.ini**"
-msgstr "**Σφάλμα αποθήκευσης ui.ini**"
-
-#: src/emu/ui/optsmenu.cpp:374
-#, c-format
-msgid "**Error saving %s.ini**"
-msgstr "**Σφάλμα αποθήκευσης %s.ini**"
-
-#: src/emu/ui/optsmenu.cpp:378
+#: src/emu/ui/miscmenu.cpp:729 src/emu/ui/optsmenu.cpp:376
 msgid ""
 "\n"
 "    Configuration saved    \n"
@@ -970,20 +911,95 @@ msgstr ""
 "    Οι ρυθμίσεις αποθηκεύτηκαν    \n"
 "\n"
 
-#: src/emu/ui/selector.cpp:166
+#: src/emu/ui/miscmenu.cpp:774
+msgid "Bios"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:776
+msgid "Driver"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:790
+msgid "Save machine configuration"
+msgstr "Αποθήκευση παραμετροποίησης μηχανήματος"
+
+#: src/emu/ui/miscmenu.cpp:806
+msgid "Configure machine:"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:868 src/emu/ui/selsoft.cpp:109
+msgid " (default)"
+msgstr " (προεπιλογή)"
+
+#: src/emu/ui/miscmenu.cpp:953 src/emu/ui/miscmenu.cpp:973
+#: src/emu/ui/selgame.cpp:600
+msgid "Plugins"
+msgstr "Πρόσθετα"
+
+#: src/emu/ui/optsmenu.cpp:217
+msgid "Filter"
+msgstr "Φίλτρο"
+
+#: src/emu/ui/optsmenu.cpp:225
+msgid " ^!File"
+msgstr " ^!Αρχείο"
+
+#: src/emu/ui/optsmenu.cpp:230
+msgid " ^!Category"
+msgstr " ^!Κατηγορία"
+
+#: src/emu/ui/optsmenu.cpp:253
+msgid "^!Setup custom filter"
+msgstr "^!Ρύθμιση προσαρμοσμένου φίλτρου"
+
+#: src/emu/ui/optsmenu.cpp:261
+msgid "Customize UI"
+msgstr "Προσαρμογή UI"
+
+#: src/emu/ui/optsmenu.cpp:262
+msgid "Configure Directories"
+msgstr "Ρύθμιση Φακέλων"
+
+#: src/emu/ui/optsmenu.cpp:265 src/emu/ui/sndmenu.cpp:149
+#: src/emu/ui/sndmenu.cpp:169
+msgid "Sound Options"
+msgstr "Επιλογές Ήχου"
+
+#: src/emu/ui/optsmenu.cpp:268
+msgid "General Inputs"
+msgstr "Γενικός Χειρισμός"
+
+#: src/emu/ui/optsmenu.cpp:271
+msgid "Save Configuration"
+msgstr "Αποθήκευση Ρυθμίσεων"
+
+#: src/emu/ui/optsmenu.cpp:285 src/emu/ui/optsmenu.cpp:305
+msgid "Settings"
+msgstr "Ρυθμίσεις"
+
+#: src/emu/ui/optsmenu.cpp:325
+msgid "**Error saving ui.ini**"
+msgstr "**Σφάλμα αποθήκευσης ui.ini**"
+
+#: src/emu/ui/optsmenu.cpp:372
+#, c-format
+msgid "**Error saving %s.ini**"
+msgstr "**Σφάλμα αποθήκευσης %s.ini**"
+
+#: src/emu/ui/selector.cpp:165
 msgid "Selection List - Search: "
 msgstr "Λίστα Επιλογής- Αναζήτηση: "
 
-#: src/emu/ui/selector.cpp:196
+#: src/emu/ui/selector.cpp:194
 #, c-format
 msgid "Double click or press %1$s to select"
 msgstr "Κάντε διπλό κλικ ή πατήστε %1$s για να επιλέξετε"
 
-#: src/emu/ui/selgame.cpp:39
+#: src/emu/ui/selgame.cpp:38
 msgid "General Info"
 msgstr "Γενικές Πληροφορίες"
 
-#: src/emu/ui/selgame.cpp:374 src/emu/ui/selsoft.cpp:282
+#: src/emu/ui/selgame.cpp:380 src/emu/ui/selsoft.cpp:281
 #, c-format
 msgid ""
 "%s\n"
@@ -992,8 +1008,8 @@ msgstr ""
 "%s\n"
 " προστέθηκε στη λίστα αγαπημένων."
 
-#: src/emu/ui/selgame.cpp:380 src/emu/ui/selgame.cpp:389
-#: src/emu/ui/selsoft.cpp:287
+#: src/emu/ui/selgame.cpp:386 src/emu/ui/selgame.cpp:395
+#: src/emu/ui/selsoft.cpp:286
 #, c-format
 msgid ""
 "%s\n"
@@ -1002,7 +1018,7 @@ msgstr ""
 "%s\n"
 " αφαιρέθηκε από τη λίστα αγαπημένων."
 
-#: src/emu/ui/selgame.cpp:450
+#: src/emu/ui/selgame.cpp:457
 msgid ""
 "The selected machine is missing one or more required ROM or CHD images. "
 "Please select a different machine.\n"
@@ -1010,256 +1026,260 @@ msgid ""
 "Press any key to continue."
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:589 src/emu/ui/simpleselgame.cpp:265
+#: src/emu/ui/selgame.cpp:595 src/emu/ui/simpleselgame.cpp:265
 msgid "Configure Options"
 msgstr "Ρύθμιση Επιλογών"
 
-#: src/emu/ui/selgame.cpp:752
+#: src/emu/ui/selgame.cpp:596
+msgid "Configure Machine"
+msgstr ""
+
+#: src/emu/ui/selgame.cpp:758
 #, c-format
 msgid "%1$s %2$s ( %3$d / %4$d machines (%5$d BIOS) )"
 msgstr "%1$s %2$s ( %3$d / %4$d μηχανήματα (%5$d BIOS) )"
 
-#: src/emu/ui/selgame.cpp:762
+#: src/emu/ui/selgame.cpp:768
 #, c-format
 msgid "%1$s (%2$s - %3$s) - "
 msgstr "%1$s (%2$s - %3$s) - "
 
-#: src/emu/ui/selgame.cpp:769 src/emu/ui/selgame.cpp:775
+#: src/emu/ui/selgame.cpp:775 src/emu/ui/selgame.cpp:781
 #, c-format
 msgid "%1$s (%2$s) - "
 msgstr "%1$s (%2$s) - "
 
-#: src/emu/ui/selgame.cpp:784
+#: src/emu/ui/selgame.cpp:790
 #, c-format
 msgid "%1$s Search: %2$s_"
 msgstr "%1$s Αναζήτηση: %2$s_"
 
-#: src/emu/ui/selgame.cpp:838
+#: src/emu/ui/selgame.cpp:844
 #, c-format
 msgid "Romset: %1$-.100s"
 msgstr "Romset: %1$-.100s"
 
-#: src/emu/ui/selgame.cpp:841 src/emu/ui/selgame.cpp:890
-#: src/emu/ui/selsoft.cpp:751 src/emu/ui/selsoft.cpp:801
+#: src/emu/ui/selgame.cpp:847 src/emu/ui/selgame.cpp:896
+#: src/emu/ui/selsoft.cpp:750 src/emu/ui/selsoft.cpp:800
 #: src/emu/ui/simpleselgame.cpp:328
 #, c-format
 msgid "%1$s, %2$-.100s"
 msgstr "%1$s, %2$-.100s"
 
-#: src/emu/ui/selgame.cpp:847 src/emu/ui/selsoft.cpp:757
+#: src/emu/ui/selgame.cpp:853 src/emu/ui/selsoft.cpp:756
 #, c-format
 msgid "Driver is clone of: %1$-.100s"
 msgstr "Ο Οδηγός είναι κλώνος του: %1$-.100s"
 
-#: src/emu/ui/selgame.cpp:849 src/emu/ui/selsoft.cpp:759
+#: src/emu/ui/selgame.cpp:855 src/emu/ui/selsoft.cpp:758
 msgid "Driver is parent"
 msgstr "Ο Οδηγός είναι γονικός"
 
-#: src/emu/ui/selgame.cpp:853 src/emu/ui/selsoft.cpp:763
+#: src/emu/ui/selgame.cpp:859 src/emu/ui/selsoft.cpp:762
 #: src/emu/ui/simpleselgame.cpp:335
 msgid "Overall: NOT WORKING"
 msgstr "Συνολικά: ΔΕΝ ΛΕΙΤΟΥΡΓΕΙ"
 
-#: src/emu/ui/selgame.cpp:855 src/emu/ui/selsoft.cpp:765
+#: src/emu/ui/selgame.cpp:861 src/emu/ui/selsoft.cpp:764
 #: src/emu/ui/simpleselgame.cpp:337
 msgid "Overall: Unemulated Protection"
 msgstr "Συνολικά: Προστασία Μη Εξομοιωμένη"
 
-#: src/emu/ui/selgame.cpp:857 src/emu/ui/selsoft.cpp:767
+#: src/emu/ui/selgame.cpp:863 src/emu/ui/selsoft.cpp:766
 #: src/emu/ui/simpleselgame.cpp:339
 msgid "Overall: Working"
 msgstr "Συνολικά: Λειτουργεί"
 
-#: src/emu/ui/selgame.cpp:861 src/emu/ui/selsoft.cpp:771
+#: src/emu/ui/selgame.cpp:867 src/emu/ui/selsoft.cpp:770
 msgid "Graphics: Imperfect, "
 msgstr "Γραφικά: Ατελή, "
 
-#: src/emu/ui/selgame.cpp:863 src/emu/ui/selsoft.cpp:773
+#: src/emu/ui/selgame.cpp:869 src/emu/ui/selsoft.cpp:772
 msgid "Graphics: OK, "
 msgstr "Γραφικά: OK, "
 
-#: src/emu/ui/selgame.cpp:866 src/emu/ui/selsoft.cpp:776
+#: src/emu/ui/selgame.cpp:872 src/emu/ui/selsoft.cpp:775
 msgid "Sound: Unimplemented"
 msgstr "Ήχος: Δεν Έχει Υλοποιηθεί"
 
-#: src/emu/ui/selgame.cpp:868 src/emu/ui/selsoft.cpp:778
+#: src/emu/ui/selgame.cpp:874 src/emu/ui/selsoft.cpp:777
 msgid "Sound: Imperfect"
 msgstr "Ήχος: Ατελής"
 
-#: src/emu/ui/selgame.cpp:870 src/emu/ui/selsoft.cpp:780
+#: src/emu/ui/selgame.cpp:876 src/emu/ui/selsoft.cpp:779
 msgid "Sound: OK"
 msgstr "Ήχος: OK"
 
-#: src/emu/ui/selgame.cpp:887
+#: src/emu/ui/selgame.cpp:893
 #, c-format
 msgid "System: %1$-.100s"
 msgstr "Σύστημα: %1$-.100s"
 
-#: src/emu/ui/selgame.cpp:894 src/emu/ui/selsoft.cpp:805
+#: src/emu/ui/selgame.cpp:900 src/emu/ui/selsoft.cpp:804
 #, c-format
 msgid "Software is clone of: %1$-.100s"
 msgstr "Το Λογισμικό είναι κλώνος του: %1$-.100s"
 
-#: src/emu/ui/selgame.cpp:896 src/emu/ui/selsoft.cpp:807
+#: src/emu/ui/selgame.cpp:902 src/emu/ui/selsoft.cpp:806
 msgid "Software is parent"
 msgstr "Το λογισμικό είναι γονικό"
 
-#: src/emu/ui/selgame.cpp:901 src/emu/ui/selsoft.cpp:812
+#: src/emu/ui/selgame.cpp:907 src/emu/ui/selsoft.cpp:811
 msgid "Supported: No"
 msgstr "Υποστηρίζεται: Όχι"
 
-#: src/emu/ui/selgame.cpp:906 src/emu/ui/selsoft.cpp:817
+#: src/emu/ui/selgame.cpp:912 src/emu/ui/selsoft.cpp:816
 msgid "Supported: Partial"
 msgstr "Υποστηρίζεται: Μερικώς"
 
-#: src/emu/ui/selgame.cpp:911 src/emu/ui/selsoft.cpp:822
+#: src/emu/ui/selgame.cpp:917 src/emu/ui/selsoft.cpp:821
 msgid "Supported: Yes"
 msgstr "Υποστηρίζεται: Ναι"
 
-#: src/emu/ui/selgame.cpp:916 src/emu/ui/selsoft.cpp:827
+#: src/emu/ui/selgame.cpp:922 src/emu/ui/selsoft.cpp:826
 #, c-format
 msgid "romset: %1$-.100s"
 msgstr "romset: %1$-.100s"
 
-#: src/emu/ui/selgame.cpp:923
+#: src/emu/ui/selgame.cpp:929
 #, c-format
 msgid "%1$s %2$s"
 msgstr "%1$s %2$s"
 
-#: src/emu/ui/selgame.cpp:1535
+#: src/emu/ui/selgame.cpp:1543
 #, c-format
 msgid "Romset: %1$-.100s\n"
 msgstr "Romset: %1$-.100s\n"
 
-#: src/emu/ui/selgame.cpp:1536
+#: src/emu/ui/selgame.cpp:1544
 #, c-format
 msgid "Year: %1$s\n"
 msgstr "Έτος: %1$s\n"
 
-#: src/emu/ui/selgame.cpp:1537
+#: src/emu/ui/selgame.cpp:1545
 #, c-format
 msgid "Manufacturer: %1$-.100s\n"
 msgstr "Κατασκευαστής: %1$-.100s\n"
 
-#: src/emu/ui/selgame.cpp:1541
+#: src/emu/ui/selgame.cpp:1549
 #, c-format
 msgid "Driver is Clone of: %1$-.100s\n"
 msgstr "Ο Οδηγός είναι Κλώνος του: %1$-.100s\n"
 
-#: src/emu/ui/selgame.cpp:1543
+#: src/emu/ui/selgame.cpp:1551
 msgid "Driver is Parent\n"
 msgstr "Ο Οδηγός είναι Γονικός\n"
 
-#: src/emu/ui/selgame.cpp:1546
+#: src/emu/ui/selgame.cpp:1554
 msgid "Overall: NOT WORKING\n"
 msgstr "Συνολικά: ΔΕΝ ΛΕΙΤΟΥΡΓΕΙ\n"
 
-#: src/emu/ui/selgame.cpp:1548
+#: src/emu/ui/selgame.cpp:1556
 msgid "Overall: Unemulated Protection\n"
 msgstr "Συνολικά: Προστασία Μη Εξομοιωμένη\n"
 
-#: src/emu/ui/selgame.cpp:1550
+#: src/emu/ui/selgame.cpp:1558
 msgid "Overall: Working\n"
 msgstr "Συνολικά: Λειτουργεί\n"
 
-#: src/emu/ui/selgame.cpp:1553
+#: src/emu/ui/selgame.cpp:1561
 msgid "Graphics: Imperfect Colors\n"
 msgstr "Γραφικά: Ατελή Χρώματα\n"
 
-#: src/emu/ui/selgame.cpp:1557
+#: src/emu/ui/selgame.cpp:1565
 msgid "Graphics: Imperfect\n"
 msgstr "Γραφικά: Ατελή\n"
 
-#: src/emu/ui/selgame.cpp:1559
+#: src/emu/ui/selgame.cpp:1567
 msgid "Graphics: OK\n"
 msgstr "Γραφικά: OK\n"
 
-#: src/emu/ui/selgame.cpp:1562
+#: src/emu/ui/selgame.cpp:1570
 msgid "Sound: Unimplemented\n"
 msgstr "Ήχος: Δεν Έχει Υλοποιηθεί\n"
 
-#: src/emu/ui/selgame.cpp:1564
+#: src/emu/ui/selgame.cpp:1572
 msgid "Sound: Imperfect\n"
 msgstr "Ήχος: Ατελής\n"
 
-#: src/emu/ui/selgame.cpp:1566
+#: src/emu/ui/selgame.cpp:1574
 msgid "Sound: OK\n"
 msgstr "Ήχος: OK\n"
 
-#: src/emu/ui/selgame.cpp:1568
+#: src/emu/ui/selgame.cpp:1576
 #, c-format
 msgid "Driver is Skeleton: %1$s\n"
 msgstr "Ο Οδηγός είναι Σκελετός: %1$s\n"
 
-#: src/emu/ui/selgame.cpp:1569
+#: src/emu/ui/selgame.cpp:1577
 #, c-format
 msgid "Game is Mechanical: %1$s\n"
 msgstr "Το παιχνίδι είναι Μηχανικό: %1$s\n"
 
-#: src/emu/ui/selgame.cpp:1570
+#: src/emu/ui/selgame.cpp:1578
 #, c-format
 msgid "Requires Artwork: %1$s\n"
 msgstr "Απαιτεί Artwork: %1$s\n"
 
-#: src/emu/ui/selgame.cpp:1571
+#: src/emu/ui/selgame.cpp:1579
 #, c-format
 msgid "Requires Clickable Artwork: %1$s\n"
 msgstr "Απαιτεί Artwork για κλικ: %1$s\n"
 
-#: src/emu/ui/selgame.cpp:1572
+#: src/emu/ui/selgame.cpp:1580
 #, c-format
 msgid "Support Cocktail: %1$s\n"
 msgstr "Υποστήριξη Κοκτέιλ: %1$s\n"
 
-#: src/emu/ui/selgame.cpp:1573
+#: src/emu/ui/selgame.cpp:1581
 #, c-format
 msgid "Driver is Bios: %1$s\n"
 msgstr "Ο Οδηγός είναι Bios: %1$s\n"
 
-#: src/emu/ui/selgame.cpp:1574
+#: src/emu/ui/selgame.cpp:1582
 #, c-format
 msgid "Support Save: %1$s\n"
 msgstr "Υποστηρίζει Αποθήκευση: %1$s\n"
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 #, c-format
 msgid "Screen Orientation: %1$s\n"
 msgstr "Προσανατολισμός Οθόνης: %1$s\n"
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 msgid "Vertical"
 msgstr "Κάθετος"
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 msgid "Horizontal"
 msgstr "Οριζόντιος"
 
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/selgame.cpp:1591
 #, c-format
 msgid "Requires CHD: %1$s\n"
 msgstr "Απαιτεί CHD: %1$s\n"
 
-#: src/emu/ui/selgame.cpp:1596
+#: src/emu/ui/selgame.cpp:1604
 msgid "Roms Audit Pass: OK\n"
 msgstr "Έλεγχος ROMs: OK\n"
 
-#: src/emu/ui/selgame.cpp:1598
+#: src/emu/ui/selgame.cpp:1606
 msgid "Roms Audit Pass: BAD\n"
 msgstr "Έλεγχος ROMs: Λάθος\n"
 
-#: src/emu/ui/selgame.cpp:1601
+#: src/emu/ui/selgame.cpp:1609
 msgid "Samples Audit Pass: None Needed\n"
 msgstr "Έλεγχος Δειγμάτων Ήχου: Δεν απαιτείται\n"
 
-#: src/emu/ui/selgame.cpp:1603
+#: src/emu/ui/selgame.cpp:1611
 msgid "Samples Audit Pass: OK\n"
 msgstr "Έλεγχος Δειγμάτων Ήχου: OK\n"
 
-#: src/emu/ui/selgame.cpp:1605
+#: src/emu/ui/selgame.cpp:1613
 msgid "Samples Audit Pass: BAD\n"
 msgstr "Έλεγχος Δειγμάτων Ήχου: Λάθος\n"
 
-#: src/emu/ui/selgame.cpp:1608
+#: src/emu/ui/selgame.cpp:1616
 msgid ""
 "Roms Audit Pass: Disabled\n"
 "Samples Audit Pass: Disabled\n"
@@ -1267,20 +1287,16 @@ msgstr ""
 "Έλεγχος ROMs: Απενεργοποιημένος\n"
 "Έλεγχος Δειγμάτων Ήχου: Απενεργοποιημένος\n"
 
-#: src/emu/ui/selgame.cpp:2049 src/emu/ui/selgame.cpp:2212
-#: src/emu/ui/selsoft.cpp:1662
+#: src/emu/ui/selgame.cpp:2055 src/emu/ui/selgame.cpp:2216
+#: src/emu/ui/selsoft.cpp:1655
 msgid "No Infos Available"
 msgstr "Καμία διαθέσιμη πληροφορία"
 
-#: src/emu/ui/selgame.cpp:2162 src/emu/ui/selsoft.cpp:1607
+#: src/emu/ui/selgame.cpp:2168 src/emu/ui/selsoft.cpp:1602
 msgid "Usage"
 msgstr "Χρήση"
 
-#: src/emu/ui/selsoft.cpp:110
-msgid " (default)"
-msgstr " (προεπιλογή)"
-
-#: src/emu/ui/selsoft.cpp:381
+#: src/emu/ui/selsoft.cpp:380
 msgid ""
 "The selected software is missing one or more required files. Please select a "
 "different software.\n"
@@ -1288,57 +1304,57 @@ msgid ""
 "Press any key to continue."
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:684
+#: src/emu/ui/selsoft.cpp:683
 #, c-format
-msgid "%1$s %2$s ( %3$d / %4$d softwares )"
-msgstr "%1$s %2$s ( %3$d / %4$d λογισμικό )"
+msgid "%1$s %2$s ( %3$d / %4$d software packages )"
+msgstr ""
 
-#: src/emu/ui/selsoft.cpp:685
+#: src/emu/ui/selsoft.cpp:684
 #, c-format
 msgid "Driver: \"%1$s\" software list "
 msgstr "Οδηγός: \"%1$s\" λίστα λογισμικού "
 
-#: src/emu/ui/selsoft.cpp:688
+#: src/emu/ui/selsoft.cpp:687
 #, c-format
 msgid "Region: %1$s -"
 msgstr "Περιοχή: %1$s -"
 
-#: src/emu/ui/selsoft.cpp:690
+#: src/emu/ui/selsoft.cpp:689
 #, c-format
 msgid "Publisher: %1$s -"
 msgstr "Εκδότης: %1$s -"
 
-#: src/emu/ui/selsoft.cpp:692
+#: src/emu/ui/selsoft.cpp:691
 #, c-format
 msgid "Year: %1$s -"
 msgstr "Έτος: %1$s -"
 
-#: src/emu/ui/selsoft.cpp:694
+#: src/emu/ui/selsoft.cpp:693
 #, c-format
 msgid "Software List: %1$s -"
 msgstr "Λίστα Λογισμικού: %1$s -"
 
-#: src/emu/ui/selsoft.cpp:696
+#: src/emu/ui/selsoft.cpp:695
 #, c-format
 msgid "Device type: %1$s -"
 msgstr "Τύπος συσκευής: %1$s -"
 
-#: src/emu/ui/selsoft.cpp:698
+#: src/emu/ui/selsoft.cpp:697
 #, c-format
 msgid "%s Search: %s_"
 msgstr "%s Αναζήτηση: %s_"
 
-#: src/emu/ui/selsoft.cpp:748 src/emu/ui/selsoft.cpp:798
+#: src/emu/ui/selsoft.cpp:747 src/emu/ui/selsoft.cpp:797
 #: src/emu/ui/simpleselgame.cpp:325
 #, c-format
 msgid "%1$-.100s"
 msgstr "%1$-.100s"
 
-#: src/emu/ui/selsoft.cpp:1998 src/emu/ui/selsoft.cpp:2018
+#: src/emu/ui/selsoft.cpp:1991 src/emu/ui/selsoft.cpp:2011
 msgid "Software part selection:"
 msgstr "Επιλογή τμημάτων λογισμικού:"
 
-#: src/emu/ui/selsoft.cpp:2136 src/emu/ui/selsoft.cpp:2156
+#: src/emu/ui/selsoft.cpp:2129 src/emu/ui/selsoft.cpp:2149
 msgid "Bios selection:"
 msgstr "Επιλογή BIOS:"
 
@@ -1392,15 +1408,15 @@ msgstr "Gfx: %s, Ήχος: %s"
 msgid " [internal]"
 msgstr " [εσωτερικό]"
 
-#: src/emu/ui/sndmenu.cpp:135
+#: src/emu/ui/sndmenu.cpp:133
 msgid "Sound"
 msgstr "Ήχος"
 
-#: src/emu/ui/sndmenu.cpp:136
+#: src/emu/ui/sndmenu.cpp:134
 msgid "Sample Rate"
 msgstr "Ρυθμός Δειγματοληψίας"
 
-#: src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/sndmenu.cpp:135
 msgid "Use External Samples"
 msgstr "Χρήση Εξωτερικών Δειγμάτων Ήχου"
 
@@ -1469,12 +1485,12 @@ msgstr "Επαναφορά"
 msgid "Fast Forward"
 msgstr "Γρήγορη Προώθηση"
 
-#: src/emu/ui/ui.cpp:419
+#: src/emu/ui/ui.cpp:418
 msgid "This driver requires images to be loaded in the following device(s): "
 msgstr ""
 "Αυτός ο οδηγός απαιτεί εικόνες να φορτωθούν στην ακόλουθη συσκευή (ες): "
 
-#: src/emu/ui/ui.cpp:1074
+#: src/emu/ui/ui.cpp:1071
 msgid ""
 "One or more ROMs/CHDs for this machine are incorrect. The machine may not "
 "run correctly.\n"
@@ -1482,7 +1498,7 @@ msgstr ""
 "Μία ή περισσότερες ROMs/CHDs για αυτό το μηχάνημα είναι εσφαλμένες. Το "
 "μηχάνημα μπορεί να μην εκτελείται σωστά.\n"
 
-#: src/emu/ui/ui.cpp:1087
+#: src/emu/ui/ui.cpp:1084
 msgid ""
 "There are known problems with this machine\n"
 "\n"
@@ -1490,51 +1506,51 @@ msgstr ""
 "Υπάρχουν γνωστά προβλήματα με αυτό το μηχάνημα\n"
 "\n"
 
-#: src/emu/ui/ui.cpp:1091
+#: src/emu/ui/ui.cpp:1088
 msgid ""
 "One or more ROMs/CHDs for this machine have not been correctly dumped.\n"
 msgstr ""
 "Μία ή περισσότερες ROMs/CHDs για αυτό το μηχάνημα δεν έχουν γίνει dump "
 "σωστά.\n"
 
-#: src/emu/ui/ui.cpp:1095
+#: src/emu/ui/ui.cpp:1092
 #, c-format
 msgid "The keyboard emulation may not be 100% accurate.\n"
 msgstr "Η εξομοίωση πληκτρολογίου δεν είναι σωστή 100%.\n"
 
-#: src/emu/ui/ui.cpp:1097
+#: src/emu/ui/ui.cpp:1094
 #, c-format
 msgid "The colors aren't 100% accurate.\n"
 msgstr "Τα χρώματα δεν είναι σωστά 100%.\n"
 
-#: src/emu/ui/ui.cpp:1099
+#: src/emu/ui/ui.cpp:1096
 msgid "The colors are completely wrong.\n"
 msgstr "Τα χρώματα είναι εντελώς λάθος.\n"
 
-#: src/emu/ui/ui.cpp:1101
+#: src/emu/ui/ui.cpp:1098
 #, c-format
 msgid "The video emulation isn't 100% accurate.\n"
 msgstr "Η εξομοίωση βίντεο δεν είναι σωστή 100%.\n"
 
-#: src/emu/ui/ui.cpp:1103
+#: src/emu/ui/ui.cpp:1100
 #, c-format
 msgid "The sound emulation isn't 100% accurate.\n"
 msgstr "Η εξομοίωση ήχου δεν είναι σωστή 100%.\n"
 
-#: src/emu/ui/ui.cpp:1105
+#: src/emu/ui/ui.cpp:1102
 msgid "The machine lacks sound.\n"
 msgstr "Το μηχάνημα δεν έχει ήχο.\n"
 
-#: src/emu/ui/ui.cpp:1108
+#: src/emu/ui/ui.cpp:1105
 msgid "Screen flipping in cocktail mode is not supported.\n"
 msgstr ""
 "Το αναποδογύρισμα της οθόνης σε κοκτέιλ λειτουργία δεν υποστηρίζεται.\n"
 
-#: src/emu/ui/ui.cpp:1112
+#: src/emu/ui/ui.cpp:1109
 msgid "The machine requires external artwork files\n"
 msgstr "Το μηχάνημα απαιτεί εξωτερικό αρχείο Artwork\n"
 
-#: src/emu/ui/ui.cpp:1117
+#: src/emu/ui/ui.cpp:1114
 msgid ""
 "This machine was never completed. It may exhibit strange behavior or missing "
 "elements that are not bugs in the emulation.\n"
@@ -1542,7 +1558,7 @@ msgstr ""
 "Αυτό το μηχάνημα δεν ολοκληρώθηκε ποτέ. Αυτό μπορεί να εμφανίσει ασυνήθιστη "
 "συμπεριφορά ή στοιχεία να λείπουν που δεν είναι σφάλματα στην εξομοίωση.\n"
 
-#: src/emu/ui/ui.cpp:1122
+#: src/emu/ui/ui.cpp:1119
 msgid ""
 "This machine has no sound hardware, MAME will produce no sounds, this is "
 "expected behaviour.\n"
@@ -1550,12 +1566,12 @@ msgstr ""
 "Αυτό το μηχάνημα δεν έχει κανένα υλικό ήχου, το MAME δεν θα παράγει κανένα "
 "ήχο, αυτή είναι αναμενόμενη συμπεριφορά.\n"
 
-#: src/emu/ui/ui.cpp:1130
+#: src/emu/ui/ui.cpp:1127
 msgid "The machine has protection which isn't fully emulated.\n"
 msgstr ""
 "Αυτό το μηχάνημα έχει προστασία η οποία δεν είναι πλήρως εξομοιωμένη.\n"
 
-#: src/emu/ui/ui.cpp:1133
+#: src/emu/ui/ui.cpp:1130
 msgid ""
 "\n"
 "THIS MACHINE DOESN'T WORK. The emulation for this machine is not yet "
@@ -1568,7 +1584,7 @@ msgstr ""
 "αυτό το πρόβλημα εκτός από την αναμονή για τους προγραμματιστές να "
 "βελτιώσουν την εξομοίωση.\n"
 
-#: src/emu/ui/ui.cpp:1137
+#: src/emu/ui/ui.cpp:1134
 msgid ""
 "\n"
 "Certain elements of this machine cannot be emulated as it requires actual "
@@ -1580,7 +1596,7 @@ msgstr ""
 "καθώς απαιτείται πραγματική φυσική αλληλεπίδραση ή αποτελείται από μηχανικές "
 "συσκευές. Δεν είναι δυνατόν να παιχτεί πλήρως αυτό το μηχάνημα.\n"
 
-#: src/emu/ui/ui.cpp:1156
+#: src/emu/ui/ui.cpp:1153
 msgid ""
 "\n"
 "\n"
@@ -1590,7 +1606,7 @@ msgstr ""
 "\n"
 "Υπάρχουν κλώνοι αυτού του μηχανήματος που λειτουργούν: "
 
-#: src/emu/ui/ui.cpp:1170
+#: src/emu/ui/ui.cpp:1167
 msgid ""
 "\n"
 "\n"
@@ -1600,7 +1616,7 @@ msgstr ""
 "\n"
 "Πιέστε ένα πλήκτρο για συνέχεια"
 
-#: src/emu/ui/ui.cpp:1185
+#: src/emu/ui/ui.cpp:1182
 #, c-format
 msgid ""
 "%1$s\n"
@@ -1615,15 +1631,15 @@ msgstr ""
 "\n"
 "CPU:\n"
 
-#: src/emu/ui/ui.cpp:1221 src/emu/ui/ui.cpp:1260
+#: src/emu/ui/ui.cpp:1218 src/emu/ui/ui.cpp:1257
 msgid "MHz"
 msgstr "MHz"
 
-#: src/emu/ui/ui.cpp:1221 src/emu/ui/ui.cpp:1260
+#: src/emu/ui/ui.cpp:1218 src/emu/ui/ui.cpp:1257
 msgid "kHz"
 msgstr "kHz"
 
-#: src/emu/ui/ui.cpp:1235
+#: src/emu/ui/ui.cpp:1232
 msgid ""
 "\n"
 "Sound:\n"
@@ -1631,7 +1647,7 @@ msgstr ""
 "\n"
 "Ήχος:\n"
 
-#: src/emu/ui/ui.cpp:1264
+#: src/emu/ui/ui.cpp:1261
 msgid ""
 "\n"
 "Video:\n"
@@ -1639,78 +1655,78 @@ msgstr ""
 "\n"
 "Βίντεο:\n"
 
-#: src/emu/ui/ui.cpp:1268
+#: src/emu/ui/ui.cpp:1265
 msgid "None\n"
 msgstr "Κανένα\n"
 
-#: src/emu/ui/ui.cpp:1275
+#: src/emu/ui/ui.cpp:1272
 msgid "Vector"
 msgstr "Διάνυσμα"
 
-#: src/emu/ui/ui.cpp:1286
+#: src/emu/ui/ui.cpp:1283
 #, c-format
 msgid "%1$s: %2$s\n"
 msgstr "%1$s: %2$s\n"
 
-#: src/emu/ui/ui.cpp:1286
+#: src/emu/ui/ui.cpp:1283
 msgid "%2$s\n"
 msgstr "%2$s\n"
 
-#: src/emu/ui/ui.cpp:1541 src/emu/ui/ui.cpp:1551
+#: src/emu/ui/ui.cpp:1538 src/emu/ui/ui.cpp:1548
 msgid "Keyboard Emulation Status"
 msgstr "Κατάσταση Εξομοίωσης Πληκτρολογίου"
 
-#: src/emu/ui/ui.cpp:1543
+#: src/emu/ui/ui.cpp:1540
 msgid "Mode: PARTIAL Emulation"
 msgstr "Λειτουργία: ΜΕΡΙΚΗ Εξομοίωση"
 
-#: src/emu/ui/ui.cpp:1544
+#: src/emu/ui/ui.cpp:1541
 msgid "UI:   Enabled"
 msgstr "UI:   Ενεργοποιημένο"
 
-#: src/emu/ui/ui.cpp:1546 src/emu/ui/ui.cpp:1556
+#: src/emu/ui/ui.cpp:1543 src/emu/ui/ui.cpp:1553
 msgid "**Use ScrLock to toggle**"
 msgstr "**Χρήση ScrLock να εναλλαγή**"
 
-#: src/emu/ui/ui.cpp:1553
+#: src/emu/ui/ui.cpp:1550
 msgid "Mode: FULL Emulation"
 msgstr "Λειτουργία: ΠΛΗΡΗΣ Εξομοίωση"
 
-#: src/emu/ui/ui.cpp:1554
+#: src/emu/ui/ui.cpp:1551
 msgid "UI:   Disabled"
 msgstr "UI:   Απενεργοποιημένο"
 
-#: src/emu/ui/ui.cpp:1692
+#: src/emu/ui/ui.cpp:1689
 msgid "Autofire can't be enabled"
 msgstr "Δεν μπορεί να ενεργοποιηθεί το Autofire"
 
-#: src/emu/ui/ui.cpp:1731
+#: src/emu/ui/ui.cpp:1728
 msgid "Select position to save to"
 msgstr "Επιλέξτε τη θέση για αποθήκευση σε"
 
-#: src/emu/ui/ui.cpp:1733
+#: src/emu/ui/ui.cpp:1730
 msgid "Select position to load from"
 msgstr "Επιλέξτε τη θέση φόρτωσης από"
 
-#: src/emu/ui/ui.cpp:1757
+#: src/emu/ui/ui.cpp:1754
 msgid "Save cancelled"
 msgstr "Η αποθήκευση ακυρώθηκε"
 
-#: src/emu/ui/ui.cpp:1759
+#: src/emu/ui/ui.cpp:1756
 msgid "Load cancelled"
 msgstr "Η φόρτωση ακυρώθηκε"
 
-#: src/emu/ui/ui.cpp:1802
+#: src/emu/ui/ui.cpp:1799
 #, c-format
 msgid "Save to position %s"
 msgstr "Αποθήκευση σε θέση %s"
 
-#: src/emu/ui/ui.cpp:1807
+#: src/emu/ui/ui.cpp:1804
 #, c-format
 msgid "Load from position %s"
 msgstr "Φόρτωση από θέση %s"
 
-#: src/emu/ui/ui.cpp:1847
+#: src/emu/ui/ui.cpp:1844
 #, c-format
 msgid ""
 "Are you sure you want to quit?\n"
@@ -1723,173 +1739,173 @@ msgstr ""
 "Πατήστε ''%1$s'' για να εγκαταλείψετε,\n"
 "Πατήστε ''%2$s'' για να επιστρέψετε στην εξομοίωση."
 
-#: src/emu/ui/ui.cpp:1917
+#: src/emu/ui/ui.cpp:1914
 msgid "Master Volume"
 msgstr "Κύρια Ένταση"
 
-#: src/emu/ui/ui.cpp:1926
+#: src/emu/ui/ui.cpp:1923
 #, c-format
 msgid "%1$s Volume"
 msgstr "%1$s Ένταση"
 
-#: src/emu/ui/ui.cpp:1949
+#: src/emu/ui/ui.cpp:1946
 #, c-format
 msgid "Overclock CPU %1$s"
 msgstr "Υπερχρονισμός CPU %1$s"
 
-#: src/emu/ui/ui.cpp:1968
+#: src/emu/ui/ui.cpp:1965
 #, c-format
 msgid "%1$s Refresh Rate"
 msgstr "%1$s Ρυθμός Ανανέωσης"
 
-#: src/emu/ui/ui.cpp:1973
+#: src/emu/ui/ui.cpp:1970
 #, c-format
 msgid "%1$s Brightness"
 msgstr "%1$s Φωτεινότητα"
 
-#: src/emu/ui/ui.cpp:1975
+#: src/emu/ui/ui.cpp:1972
 #, c-format
 msgid "%1$s Contrast"
 msgstr "%1$s Αντίθεση"
 
-#: src/emu/ui/ui.cpp:1977
+#: src/emu/ui/ui.cpp:1974
 #, c-format
 msgid "%1$s Gamma"
 msgstr "%1$s Γάμμα"
 
-#: src/emu/ui/ui.cpp:1981
+#: src/emu/ui/ui.cpp:1978
 #, c-format
 msgid "%1$s Horiz Stretch"
 msgstr "%1$s Οριζόντια Επέκταση"
 
-#: src/emu/ui/ui.cpp:1983
+#: src/emu/ui/ui.cpp:1980
 #, c-format
 msgid "%1$s Horiz Position"
 msgstr "%1$s Οριζόντια Θέση"
 
-#: src/emu/ui/ui.cpp:1985
+#: src/emu/ui/ui.cpp:1982
 #, c-format
 msgid "%1$s Vert Stretch"
 msgstr "%1$s Κάθετη Επέκταση"
 
-#: src/emu/ui/ui.cpp:1987
+#: src/emu/ui/ui.cpp:1984
 #, c-format
 msgid "%1$s Vert Position"
 msgstr "%1$s Κάθετη Θέση"
 
-#: src/emu/ui/ui.cpp:2005
+#: src/emu/ui/ui.cpp:2002
 #, c-format
 msgid "Laserdisc '%1$s' Horiz Stretch"
 msgstr "Laserdisc '%1$s' Οριζόντια Επέκταση"
 
-#: src/emu/ui/ui.cpp:2007
+#: src/emu/ui/ui.cpp:2004
 #, c-format
 msgid "Laserdisc '%1$s' Horiz Position"
 msgstr "Laserdisc '%1$s' Οριζόντια Θέση"
 
-#: src/emu/ui/ui.cpp:2009
+#: src/emu/ui/ui.cpp:2006
 #, c-format
 msgid "Laserdisc '%1$s' Vert Stretch"
 msgstr "Laserdisc '%1$s' Κάθετη Επέκταση"
 
-#: src/emu/ui/ui.cpp:2011
+#: src/emu/ui/ui.cpp:2008
 #, c-format
 msgid "Laserdisc '%1$s' Vert Position"
 msgstr "Laserdisc '%1$s' Κάθετη Θέση"
 
-#: src/emu/ui/ui.cpp:2021
+#: src/emu/ui/ui.cpp:2018
 msgid "Vector Flicker"
 msgstr "Τρεμόπαιγμα Διανύσματος"
 
-#: src/emu/ui/ui.cpp:2022
+#: src/emu/ui/ui.cpp:2019
 msgid "Beam Width Minimum"
 msgstr "Ελάχιστο Πλάτος Ακτινών"
 
-#: src/emu/ui/ui.cpp:2023
+#: src/emu/ui/ui.cpp:2020
 msgid "Beam Width Maximum"
 msgstr "Μέγιστο Πλάτος Ακτινών"
 
-#: src/emu/ui/ui.cpp:2024
+#: src/emu/ui/ui.cpp:2021
 msgid "Beam Intensity Weight"
 msgstr "Βάρος Έντασης Ακτίνας"
 
-#: src/emu/ui/ui.cpp:2037
+#: src/emu/ui/ui.cpp:2034
 #, c-format
 msgid "Crosshair Scale %1$s"
 msgstr "Κλίμακα Στόχαστρου %1$s"
 
-#: src/emu/ui/ui.cpp:2037 src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2034 src/emu/ui/ui.cpp:2036
 msgid "X"
 msgstr "X"
 
-#: src/emu/ui/ui.cpp:2037 src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2034 src/emu/ui/ui.cpp:2036
 msgid "Y"
 msgstr "Y"
 
-#: src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2036
 #, c-format
 msgid "Crosshair Offset %1$s"
 msgstr "Μετατόπιση Στοχάστρου %1$s"
 
-#: src/emu/ui/ui.cpp:2071
+#: src/emu/ui/ui.cpp:2068
 #, c-format
 msgid "%1$3ddB"
 msgstr "%1$3ddB"
 
-#: src/emu/ui/ui.cpp:2115
+#: src/emu/ui/ui.cpp:2112
 #, c-format
 msgid "%1$d%%"
 msgstr "%1$d%%"
 
-#: src/emu/ui/ui.cpp:2131
+#: src/emu/ui/ui.cpp:2128
 #, c-format
 msgid "%1$3.0f%%"
 msgstr "%1$3.0f%%"
 
-#: src/emu/ui/ui.cpp:2154
+#: src/emu/ui/ui.cpp:2151
 #, c-format
 msgid "%1$.3ffps"
 msgstr "%1$.3ffps"
 
-#: src/emu/ui/ui.cpp:2177 src/emu/ui/ui.cpp:2199 src/emu/ui/ui.cpp:2220
-#: src/emu/ui/ui.cpp:2242 src/emu/ui/ui.cpp:2264 src/emu/ui/ui.cpp:2286
-#: src/emu/ui/ui.cpp:2308 src/emu/ui/ui.cpp:2330 src/emu/ui/ui.cpp:2352
-#: src/emu/ui/ui.cpp:2374 src/emu/ui/ui.cpp:2396
+#: src/emu/ui/ui.cpp:2174 src/emu/ui/ui.cpp:2196 src/emu/ui/ui.cpp:2217
+#: src/emu/ui/ui.cpp:2239 src/emu/ui/ui.cpp:2261 src/emu/ui/ui.cpp:2283
+#: src/emu/ui/ui.cpp:2305 src/emu/ui/ui.cpp:2327 src/emu/ui/ui.cpp:2349
+#: src/emu/ui/ui.cpp:2371 src/emu/ui/ui.cpp:2393
 #, c-format
 msgid "%1$.3f"
 msgstr "%1$.3f"
 
-#: src/emu/ui/ui.cpp:2412 src/emu/ui/ui.cpp:2428 src/emu/ui/ui.cpp:2444
-#: src/emu/ui/ui.cpp:2460
+#: src/emu/ui/ui.cpp:2408 src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2438
+#: src/emu/ui/ui.cpp:2453
 #, c-format
 msgid "%1$1.2f"
 msgstr "%1$1.2f"
 
-#: src/emu/ui/ui.cpp:2476
+#: src/emu/ui/ui.cpp:2469
 #, c-format
 msgid "Screen '%1$s'"
 msgstr "Οθόνη '%1$s'"
 
-#: src/emu/ui/ui.cpp:2478
+#: src/emu/ui/ui.cpp:2471
 msgid "Screen"
 msgstr "Οθόνη"
 
-#: src/emu/ui/ui.cpp:2494
+#: src/emu/ui/ui.cpp:2487
 #, c-format
 msgid "Crosshair Scale X %1$1.3f"
 msgstr "Κλίμακα Στόχαστρου X %1$1.3f"
 
-#: src/emu/ui/ui.cpp:2494
+#: src/emu/ui/ui.cpp:2487
 #, c-format
 msgid "Crosshair Scale Y %1$1.3f"
 msgstr "Κλίμακα Στόχαστρου Y %1$1.3f"
 
-#: src/emu/ui/ui.cpp:2513
+#: src/emu/ui/ui.cpp:2506
 #, c-format
 msgid "Crosshair Offset X %1$1.3f"
 msgstr "Μετατόπιση Στοχάστρου X %1$1.3f"
 
-#: src/emu/ui/ui.cpp:2513
+#: src/emu/ui/ui.cpp:2506
 #, c-format
 msgid "Crosshair Offset Y %1$1.3f"
 msgstr "Μετατόπιση Στοχάστρου Y %1$1.3f"
@@ -1931,14 +1947,26 @@ msgstr "Περικοπή"
 msgid "Full"
 msgstr "Πλήρες"
 
-#: src/emu/ui/viewgfx.cpp:392
+#: src/emu/ui/viewgfx.cpp:391
 msgid " COLORS"
 msgstr " ΧΡΩΜΑΤΑ"
 
-#: src/emu/ui/viewgfx.cpp:392
+#: src/emu/ui/viewgfx.cpp:391
 msgid " PENS"
 msgstr " ΓΡΑΦΙΔΕΣ"
 
+#~ msgid "Export XML format (like -listxml)"
+#~ msgstr "Εξαγωγή σε μορφή XML (όπως -listxml)"
+
+#~ msgid "Export TXT format (like -listfull)"
+#~ msgstr "Εξαγωγή σε μορφή XML TXT(όπως -listfull)"
+
+#~ msgid "Dummy"
+#~ msgstr "Dummy"
+
+#~ msgid "%1$s %2$s ( %3$d / %4$d softwares )"
+#~ msgstr "%1$s %2$s ( %3$d / %4$d λογισμικό )"
+
 #~ msgid "Lightgun Device Assignment"
 #~ msgstr "Ανάθεση συσκευής Lightgun"
 
diff --git a/language/Hebrew/strings.po b/language/Hebrew/strings.po
index 8ed4ffd182e..cc5fd6df05c 100644
--- a/language/Hebrew/strings.po
+++ b/language/Hebrew/strings.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MAME\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-11 03:33+0200\n"
+"POT-Creation-Date: 2016-04-15 17:42+0200\n"
 "PO-Revision-Date: 2016-02-20 18:03+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: MAME Language Team\n"
@@ -60,14 +60,14 @@ msgstr ""
 msgid "Autofire Status"
 msgstr ""
 
-#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1698
+#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1695
 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211
 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219
 #: src/emu/ui/videoopt.cpp:223
 msgid "Disabled"
 msgstr ""
 
-#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1698
+#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1695
 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211
 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219
 #: src/emu/ui/videoopt.cpp:223
@@ -75,14 +75,14 @@ msgid "Enabled"
 msgstr ""
 
 #: src/emu/ui/cheatopt.cpp:282 src/emu/ui/cheatopt.cpp:288
-#: src/emu/ui/menu.cpp:710 src/emu/ui/miscmenu.cpp:831
-#: src/emu/ui/sndmenu.cpp:135 src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/menu.cpp:755 src/emu/ui/miscmenu.cpp:936
+#: src/emu/ui/sndmenu.cpp:133 src/emu/ui/sndmenu.cpp:135
 msgid "On"
 msgstr ""
 
 #: src/emu/ui/cheatopt.cpp:282 src/emu/ui/cheatopt.cpp:288
-#: src/emu/ui/menu.cpp:713 src/emu/ui/miscmenu.cpp:831
-#: src/emu/ui/sndmenu.cpp:135 src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/menu.cpp:758 src/emu/ui/miscmenu.cpp:936
+#: src/emu/ui/sndmenu.cpp:133 src/emu/ui/sndmenu.cpp:135
 msgid "Off"
 msgstr ""
 
@@ -94,316 +94,316 @@ msgstr ""
 msgid "Autofire Delay"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:158 src/emu/ui/custmenu.cpp:447
+#: src/emu/ui/custmenu.cpp:157 src/emu/ui/custmenu.cpp:445
 msgid "Main filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:167 src/emu/ui/custmenu.cpp:456
+#: src/emu/ui/custmenu.cpp:166 src/emu/ui/custmenu.cpp:454
 msgid "Other filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:176 src/emu/ui/optsmenu.cpp:239
+#: src/emu/ui/custmenu.cpp:175 src/emu/ui/optsmenu.cpp:238
 msgid "^!Manufacturer"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:185 src/emu/ui/custmenu.cpp:474
-#: src/emu/ui/optsmenu.cpp:247
+#: src/emu/ui/custmenu.cpp:184 src/emu/ui/custmenu.cpp:472
+#: src/emu/ui/optsmenu.cpp:246
 msgid "^!Year"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:194 src/emu/ui/custmenu.cpp:510
+#: src/emu/ui/custmenu.cpp:193 src/emu/ui/custmenu.cpp:508
 msgid "Remove last filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:197 src/emu/ui/custmenu.cpp:513
+#: src/emu/ui/custmenu.cpp:196 src/emu/ui/custmenu.cpp:511
 msgid "Add filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:212 src/emu/ui/custmenu.cpp:233
-#: src/emu/ui/custmenu.cpp:529 src/emu/ui/custmenu.cpp:550
+#: src/emu/ui/custmenu.cpp:211 src/emu/ui/custmenu.cpp:231
+#: src/emu/ui/custmenu.cpp:527 src/emu/ui/custmenu.cpp:547
 msgid "Select custom filters:"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:465
+#: src/emu/ui/custmenu.cpp:463
 msgid "^!Publisher"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:483
+#: src/emu/ui/custmenu.cpp:481
 msgid "^!Software List"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:492
+#: src/emu/ui/custmenu.cpp:490
 msgid "^!Device type"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:501
+#: src/emu/ui/custmenu.cpp:499
 msgid "^!Region"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:23
+#: src/emu/ui/custui.cpp:22
 msgid "Show All"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:24
+#: src/emu/ui/custui.cpp:23
 msgid "Hide Filters"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:25
+#: src/emu/ui/custui.cpp:24
 msgid "Hide Info/Image"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:26
+#: src/emu/ui/custui.cpp:25
 msgid "Hide Both"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:142
+#: src/emu/ui/custui.cpp:141
 msgid "Fonts"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:143
+#: src/emu/ui/custui.cpp:142
 msgid "Colors"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:148 src/emu/ui/dirmenu.cpp:33
+#: src/emu/ui/custui.cpp:147 src/emu/ui/dirmenu.cpp:33
 msgid "Language"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:152
+#: src/emu/ui/custui.cpp:151
 msgid "Show side panels"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:167 src/emu/ui/custui.cpp:188
+#: src/emu/ui/custui.cpp:166 src/emu/ui/custui.cpp:186
 msgid "Custom UI Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:246
+#: src/emu/ui/custui.cpp:244
 msgid "default"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:349
+#: src/emu/ui/custui.cpp:347
 msgid "UI Font"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:354
+#: src/emu/ui/custui.cpp:352
 msgid "Bold"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:355
+#: src/emu/ui/custui.cpp:353
 msgid "Italic"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:360
+#: src/emu/ui/custui.cpp:358
 msgid "Lines"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:366
+#: src/emu/ui/custui.cpp:364
 msgid "Infos text size"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:383
+#: src/emu/ui/custui.cpp:381
 msgid "UI Fonts Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:411
+#: src/emu/ui/custui.cpp:408
 msgid "Sample text - Lorem ipsum dolor sit amet, consectetur adipiscing elit."
 msgstr ""
 
-#: src/emu/ui/custui.cpp:509
+#: src/emu/ui/custui.cpp:506
 msgid "Normal text"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:510
+#: src/emu/ui/custui.cpp:507
 msgid "Selected color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:511
+#: src/emu/ui/custui.cpp:508
 msgid "Normal text background"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:512
+#: src/emu/ui/custui.cpp:509
 msgid "Selected background color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:513
+#: src/emu/ui/custui.cpp:510
 msgid "Subitem color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:514 src/emu/ui/custui.cpp:610
+#: src/emu/ui/custui.cpp:511 src/emu/ui/custui.cpp:606
 msgid "Clone"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:515
+#: src/emu/ui/custui.cpp:512
 msgid "Border"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:516
+#: src/emu/ui/custui.cpp:513
 msgid "Background"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:517
+#: src/emu/ui/custui.cpp:514
 msgid "Dipswitch"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:518
+#: src/emu/ui/custui.cpp:515
 msgid "Unavailable color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:519
+#: src/emu/ui/custui.cpp:516
 msgid "Slider color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:520
+#: src/emu/ui/custui.cpp:517
 msgid "Gfx viewer background"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:521
+#: src/emu/ui/custui.cpp:518
 msgid "Mouse over color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:522
+#: src/emu/ui/custui.cpp:519
 msgid "Mouse over background color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:523
+#: src/emu/ui/custui.cpp:520
 msgid "Mouse down color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:524
+#: src/emu/ui/custui.cpp:521
 msgid "Mouse down background color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:527
+#: src/emu/ui/custui.cpp:524
 msgid "Restore originals colors"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:543
+#: src/emu/ui/custui.cpp:540
 msgid "UI Colors Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:572
+#: src/emu/ui/custui.cpp:568
 #, c-format
 msgid "Double click or press %1$s to change the color value"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:598
+#: src/emu/ui/custui.cpp:594
 msgid "Menu Preview"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:606
+#: src/emu/ui/custui.cpp:602
 msgid "Normal"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:607
+#: src/emu/ui/custui.cpp:603
 msgid "Subitem"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:608
+#: src/emu/ui/custui.cpp:604
 msgid "Selected"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:609
+#: src/emu/ui/custui.cpp:605
 msgid "Mouse Over"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:841 src/emu/ui/custui.cpp:844
+#: src/emu/ui/custui.cpp:837 src/emu/ui/custui.cpp:840
 msgid "Alpha"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:849 src/emu/ui/custui.cpp:852
-#: src/emu/ui/custui.cpp:1013
+#: src/emu/ui/custui.cpp:845 src/emu/ui/custui.cpp:848
+#: src/emu/ui/custui.cpp:1007
 msgid "Red"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:857 src/emu/ui/custui.cpp:860
-#: src/emu/ui/custui.cpp:1016
+#: src/emu/ui/custui.cpp:853 src/emu/ui/custui.cpp:856
+#: src/emu/ui/custui.cpp:1010
 msgid "Green"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:865 src/emu/ui/custui.cpp:868
-#: src/emu/ui/custui.cpp:1017
+#: src/emu/ui/custui.cpp:861 src/emu/ui/custui.cpp:864
+#: src/emu/ui/custui.cpp:1011
 msgid "Blue"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:871
+#: src/emu/ui/custui.cpp:867
 msgid "Choose from palette"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:887
+#: src/emu/ui/custui.cpp:883
 msgid " - ARGB Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:912
+#: src/emu/ui/custui.cpp:907
 msgid "Color preview ="
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1009
+#: src/emu/ui/custui.cpp:1003
 msgid "White"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1010
+#: src/emu/ui/custui.cpp:1004
 msgid "Silver"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1011
+#: src/emu/ui/custui.cpp:1005
 msgid "Gray"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1012
+#: src/emu/ui/custui.cpp:1006
 msgid "Black"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1014
+#: src/emu/ui/custui.cpp:1008
 msgid "Orange"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1015
+#: src/emu/ui/custui.cpp:1009
 msgid "Yellow"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1018
+#: src/emu/ui/custui.cpp:1012
 msgid "Violet"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:65
+#: src/emu/ui/datmenu.cpp:64
 msgid "Software History"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:67
+#: src/emu/ui/datmenu.cpp:66
 msgid "Software Usage"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:199
+#: src/emu/ui/datmenu.cpp:196
 msgid "Revision: "
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:287 src/emu/ui/selgame.cpp:40
-#: src/emu/ui/selgame.cpp:2152 src/emu/ui/selgame.cpp:2161
-#: src/emu/ui/selsoft.cpp:1577 src/emu/ui/selsoft.cpp:1597
-#: src/emu/ui/selsoft.cpp:1606
+#: src/emu/ui/datmenu.cpp:284 src/emu/ui/selgame.cpp:39
+#: src/emu/ui/selgame.cpp:2158 src/emu/ui/selgame.cpp:2167
+#: src/emu/ui/selsoft.cpp:1574 src/emu/ui/selsoft.cpp:1592
+#: src/emu/ui/selsoft.cpp:1601
 msgid "History"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:289 src/emu/ui/selgame.cpp:41
+#: src/emu/ui/datmenu.cpp:286 src/emu/ui/selgame.cpp:40
 msgid "Mameinfo"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:291 src/emu/ui/selgame.cpp:43
+#: src/emu/ui/datmenu.cpp:288 src/emu/ui/selgame.cpp:42
 msgid "Messinfo"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:293 src/emu/ui/selgame.cpp:42
+#: src/emu/ui/datmenu.cpp:290 src/emu/ui/selgame.cpp:41
 msgid "Sysinfo"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:295 src/emu/ui/selgame.cpp:46
+#: src/emu/ui/datmenu.cpp:292 src/emu/ui/selgame.cpp:45
 msgid "Mamescore"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:297 src/emu/ui/selgame.cpp:45
+#: src/emu/ui/datmenu.cpp:294 src/emu/ui/selgame.cpp:44
 msgid "Gameinit"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:299 src/emu/ui/selgame.cpp:44
+#: src/emu/ui/datmenu.cpp:296 src/emu/ui/selgame.cpp:43
 msgid "Command"
 msgstr ""
 
@@ -555,75 +555,75 @@ msgstr ""
 msgid "Remove %1$s Folder"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:158
+#: src/emu/ui/filesel.cpp:161
 msgid "File Already Exists - Override?"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:160 src/emu/ui/selgame.cpp:1568
-#: src/emu/ui/selgame.cpp:1569 src/emu/ui/selgame.cpp:1570
-#: src/emu/ui/selgame.cpp:1571 src/emu/ui/selgame.cpp:1572
-#: src/emu/ui/selgame.cpp:1573 src/emu/ui/selgame.cpp:1574
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/filesel.cpp:163 src/emu/ui/selgame.cpp:1576
+#: src/emu/ui/selgame.cpp:1577 src/emu/ui/selgame.cpp:1578
+#: src/emu/ui/selgame.cpp:1579 src/emu/ui/selgame.cpp:1580
+#: src/emu/ui/selgame.cpp:1581 src/emu/ui/selgame.cpp:1582
+#: src/emu/ui/selgame.cpp:1591
 msgid "No"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:161 src/emu/ui/selgame.cpp:1568
-#: src/emu/ui/selgame.cpp:1569 src/emu/ui/selgame.cpp:1570
-#: src/emu/ui/selgame.cpp:1571 src/emu/ui/selgame.cpp:1572
-#: src/emu/ui/selgame.cpp:1573 src/emu/ui/selgame.cpp:1574
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/filesel.cpp:164 src/emu/ui/selgame.cpp:1576
+#: src/emu/ui/selgame.cpp:1577 src/emu/ui/selgame.cpp:1578
+#: src/emu/ui/selgame.cpp:1579 src/emu/ui/selgame.cpp:1580
+#: src/emu/ui/selgame.cpp:1581 src/emu/ui/selgame.cpp:1582
+#: src/emu/ui/selgame.cpp:1591
 msgid "Yes"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:272
+#: src/emu/ui/filesel.cpp:275
 msgid "New Image Name:"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:278
+#: src/emu/ui/filesel.cpp:281
 msgid "Image Format:"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:284
+#: src/emu/ui/filesel.cpp:287
 msgid "Create"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:315
+#: src/emu/ui/filesel.cpp:318
 msgid "Please enter a file extension too"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:503 src/emu/ui/swlist.cpp:65
+#: src/emu/ui/filesel.cpp:506 src/emu/ui/swlist.cpp:65
 msgid "[empty slot]"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:507
+#: src/emu/ui/filesel.cpp:510
 msgid "[create]"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:511 src/emu/ui/swlist.cpp:76
+#: src/emu/ui/filesel.cpp:514 src/emu/ui/swlist.cpp:76
 msgid "[software list]"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:803
+#: src/emu/ui/filesel.cpp:806
 msgid "Select image format"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:863
+#: src/emu/ui/filesel.cpp:866
 msgid "Select access mode"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:864
+#: src/emu/ui/filesel.cpp:867
 msgid "Read-only"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:866
+#: src/emu/ui/filesel.cpp:869
 msgid "Read-write"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:867
+#: src/emu/ui/filesel.cpp:870
 msgid "Read this image, write to another image"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:868
+#: src/emu/ui/filesel.cpp:871
 msgid "Read this image, write to diff"
 msgstr ""
 
@@ -649,7 +649,7 @@ msgstr ""
 msgid "[empty]"
 msgstr ""
 
-#: src/emu/ui/info_pty.cpp:26 src/emu/ui/mainmenu.cpp:91
+#: src/emu/ui/info_pty.cpp:26 src/emu/ui/mainmenu.cpp:96
 msgid "Pseudo terminals"
 msgstr ""
 
@@ -665,7 +665,7 @@ msgstr ""
 msgid "Other Controls"
 msgstr ""
 
-#: src/emu/ui/inputmap.cpp:622 src/emu/ui/miscmenu.cpp:91
+#: src/emu/ui/inputmap.cpp:622 src/emu/ui/miscmenu.cpp:92
 #: src/emu/ui/slotopt.cpp:172
 msgid "Reset"
 msgstr ""
@@ -698,27 +698,27 @@ msgstr ""
 msgid "Machine Information"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:78
+#: src/emu/ui/mainmenu.cpp:80
 msgid "Image Information"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:81
+#: src/emu/ui/mainmenu.cpp:83
 msgid "File Manager"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:86
+#: src/emu/ui/mainmenu.cpp:92
 msgid "Tape Control"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:94
+#: src/emu/ui/mainmenu.cpp:99
 msgid "Bios Selection"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:100
+#: src/emu/ui/mainmenu.cpp:104
 msgid "Slot Devices"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:107
+#: src/emu/ui/mainmenu.cpp:109
 msgid "Barcode Reader"
 msgstr ""
 
@@ -726,43 +726,43 @@ msgstr ""
 msgid "Network Devices"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:119
+#: src/emu/ui/mainmenu.cpp:118
 msgid "Keyboard Mode"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:122
+#: src/emu/ui/mainmenu.cpp:121
 msgid "Slider Controls"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:125
+#: src/emu/ui/mainmenu.cpp:124
 msgid "Video Options"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:129
+#: src/emu/ui/mainmenu.cpp:128
 msgid "Crosshair Options"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:133
+#: src/emu/ui/mainmenu.cpp:132
 msgid "Cheat"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:136
+#: src/emu/ui/mainmenu.cpp:135
 msgid "Plugin Options"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:140
+#: src/emu/ui/mainmenu.cpp:139
 msgid "External DAT View"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:146
+#: src/emu/ui/mainmenu.cpp:145 src/emu/ui/miscmenu.cpp:785
 msgid "Add To Favorites"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:148
+#: src/emu/ui/mainmenu.cpp:147 src/emu/ui/miscmenu.cpp:787
 msgid "Remove From Favorites"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:155
+#: src/emu/ui/mainmenu.cpp:154
 msgid "Select New Machine"
 msgstr ""
 
@@ -802,189 +802,205 @@ msgstr ""
 msgid "Return to Previous Menu"
 msgstr ""
 
-#: src/emu/ui/menu.cpp:716
+#: src/emu/ui/menu.cpp:761
 msgid "Auto"
 msgstr ""
 
-#: src/emu/ui/menu.cpp:2133
+#: src/emu/ui/menu.cpp:2195
 msgid "Images"
 msgstr ""
 
-#: src/emu/ui/menu.cpp:2134
+#: src/emu/ui/menu.cpp:2196
 msgid "Infos"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Keyboard Mode:"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Natural"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Emulated"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:240
+#: src/emu/ui/miscmenu.cpp:241
 #, c-format
 msgid ""
 "Uptime: %1$d:%2$02d:%3$02d\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:242
+#: src/emu/ui/miscmenu.cpp:243
 #, c-format
 msgid ""
 "Uptime: %1$d:%2$02d\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:246
+#: src/emu/ui/miscmenu.cpp:247
 #, c-format
 msgid ""
 "Tickets dispensed: %1$d\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:257
+#: src/emu/ui/miscmenu.cpp:258
 msgid "Coin %1$c: NA%3$s\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:257
+#: src/emu/ui/miscmenu.cpp:258
 #, c-format
 msgid "Coin %1$c: %2$d%3$s\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:260
+#: src/emu/ui/miscmenu.cpp:261
 msgid " (locked)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:519
+#: src/emu/ui/miscmenu.cpp:520
 msgid "Visible Delay"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:617
+#: src/emu/ui/miscmenu.cpp:619
 #, c-format
 msgid "%s.xml saved under ui folder."
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:645
+#: src/emu/ui/miscmenu.cpp:647
 msgid "Name:             Description:\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:657
+#: src/emu/ui/miscmenu.cpp:659
 #, c-format
 msgid "%s.txt saved under ui folder."
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:675
-msgid "Export XML format (like -listxml)"
+#: src/emu/ui/miscmenu.cpp:677
+msgid "Export list in XML format (like -listxml)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:676
-msgid "Export TXT format (like -listfull)"
+#: src/emu/ui/miscmenu.cpp:678
+msgid "Export list in XML format (like -listxml, but exclude devices)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:734
-msgid "Dummy"
+#: src/emu/ui/miscmenu.cpp:679
+msgid "Export list in TXT format (like -listfull)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:736
-msgid "Save machine configuration"
-msgstr ""
-
-#: src/emu/ui/miscmenu.cpp:848 src/emu/ui/miscmenu.cpp:869
-#: src/emu/ui/selgame.cpp:594
-msgid "Plugins"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:218
-msgid "Filter"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:226
-msgid " ^!File"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:231
-msgid " ^!Category"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:254
-msgid "^!Setup custom filter"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:262
-msgid "Customize UI"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:263
-msgid "Configure Directories"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:266 src/emu/ui/sndmenu.cpp:151
-#: src/emu/ui/sndmenu.cpp:172
-msgid "Sound Options"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:269
-msgid "General Inputs"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:272
-msgid "Save Configuration"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:286 src/emu/ui/optsmenu.cpp:307
-msgid "Settings"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:327
-msgid "**Error saving ui.ini**"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:374
-#, c-format
-msgid "**Error saving %s.ini**"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:378
+#: src/emu/ui/miscmenu.cpp:729 src/emu/ui/optsmenu.cpp:376
 msgid ""
 "\n"
 "    Configuration saved    \n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/selector.cpp:166
+#: src/emu/ui/miscmenu.cpp:774
+msgid "Bios"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:776
+msgid "Driver"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:790
+msgid "Save machine configuration"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:806
+msgid "Configure machine:"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:868 src/emu/ui/selsoft.cpp:109
+msgid " (default)"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:953 src/emu/ui/miscmenu.cpp:973
+#: src/emu/ui/selgame.cpp:600
+msgid "Plugins"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:217
+msgid "Filter"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:225
+msgid " ^!File"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:230
+msgid " ^!Category"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:253
+msgid "^!Setup custom filter"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:261
+msgid "Customize UI"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:262
+msgid "Configure Directories"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:265 src/emu/ui/sndmenu.cpp:149
+#: src/emu/ui/sndmenu.cpp:169
+msgid "Sound Options"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:268
+msgid "General Inputs"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:271
+msgid "Save Configuration"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:285 src/emu/ui/optsmenu.cpp:305
+msgid "Settings"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:325
+msgid "**Error saving ui.ini**"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:372
+#, c-format
+msgid "**Error saving %s.ini**"
+msgstr ""
+
+#: src/emu/ui/selector.cpp:165
 msgid "Selection List - Search: "
 msgstr ""
 
-#: src/emu/ui/selector.cpp:196
+#: src/emu/ui/selector.cpp:194
 #, c-format
 msgid "Double click or press %1$s to select"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:39
+#: src/emu/ui/selgame.cpp:38
 msgid "General Info"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:374 src/emu/ui/selsoft.cpp:282
+#: src/emu/ui/selgame.cpp:380 src/emu/ui/selsoft.cpp:281
 #, c-format
 msgid ""
 "%s\n"
 " added to favorites list."
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:380 src/emu/ui/selgame.cpp:389
-#: src/emu/ui/selsoft.cpp:287
+#: src/emu/ui/selgame.cpp:386 src/emu/ui/selgame.cpp:395
+#: src/emu/ui/selsoft.cpp:286
 #, c-format
 msgid ""
 "%s\n"
 " removed from favorites list."
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:450
+#: src/emu/ui/selgame.cpp:457
 msgid ""
 "The selected machine is missing one or more required ROM or CHD images. "
 "Please select a different machine.\n"
@@ -992,275 +1008,275 @@ msgid ""
 "Press any key to continue."
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:589 src/emu/ui/simpleselgame.cpp:265
+#: src/emu/ui/selgame.cpp:595 src/emu/ui/simpleselgame.cpp:265
 msgid "Configure Options"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:752
+#: src/emu/ui/selgame.cpp:596
+msgid "Configure Machine"
+msgstr ""
+
+#: src/emu/ui/selgame.cpp:758
 #, c-format
 msgid "%1$s %2$s ( %3$d / %4$d machines (%5$d BIOS) )"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:762
+#: src/emu/ui/selgame.cpp:768
 #, c-format
 msgid "%1$s (%2$s - %3$s) - "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:769 src/emu/ui/selgame.cpp:775
+#: src/emu/ui/selgame.cpp:775 src/emu/ui/selgame.cpp:781
 #, c-format
 msgid "%1$s (%2$s) - "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:784
+#: src/emu/ui/selgame.cpp:790
 #, c-format
 msgid "%1$s Search: %2$s_"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:838
+#: src/emu/ui/selgame.cpp:844
 #, c-format
 msgid "Romset: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:841 src/emu/ui/selgame.cpp:890
-#: src/emu/ui/selsoft.cpp:751 src/emu/ui/selsoft.cpp:801
+#: src/emu/ui/selgame.cpp:847 src/emu/ui/selgame.cpp:896
+#: src/emu/ui/selsoft.cpp:750 src/emu/ui/selsoft.cpp:800
 #: src/emu/ui/simpleselgame.cpp:328
 #, c-format
 msgid "%1$s, %2$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:847 src/emu/ui/selsoft.cpp:757
+#: src/emu/ui/selgame.cpp:853 src/emu/ui/selsoft.cpp:756
 #, c-format
 msgid "Driver is clone of: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:849 src/emu/ui/selsoft.cpp:759
+#: src/emu/ui/selgame.cpp:855 src/emu/ui/selsoft.cpp:758
 msgid "Driver is parent"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:853 src/emu/ui/selsoft.cpp:763
+#: src/emu/ui/selgame.cpp:859 src/emu/ui/selsoft.cpp:762
 #: src/emu/ui/simpleselgame.cpp:335
 msgid "Overall: NOT WORKING"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:855 src/emu/ui/selsoft.cpp:765
+#: src/emu/ui/selgame.cpp:861 src/emu/ui/selsoft.cpp:764
 #: src/emu/ui/simpleselgame.cpp:337
 msgid "Overall: Unemulated Protection"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:857 src/emu/ui/selsoft.cpp:767
+#: src/emu/ui/selgame.cpp:863 src/emu/ui/selsoft.cpp:766
 #: src/emu/ui/simpleselgame.cpp:339
 msgid "Overall: Working"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:861 src/emu/ui/selsoft.cpp:771
+#: src/emu/ui/selgame.cpp:867 src/emu/ui/selsoft.cpp:770
 msgid "Graphics: Imperfect, "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:863 src/emu/ui/selsoft.cpp:773
+#: src/emu/ui/selgame.cpp:869 src/emu/ui/selsoft.cpp:772
 msgid "Graphics: OK, "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:866 src/emu/ui/selsoft.cpp:776
+#: src/emu/ui/selgame.cpp:872 src/emu/ui/selsoft.cpp:775
 msgid "Sound: Unimplemented"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:868 src/emu/ui/selsoft.cpp:778
+#: src/emu/ui/selgame.cpp:874 src/emu/ui/selsoft.cpp:777
 msgid "Sound: Imperfect"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:870 src/emu/ui/selsoft.cpp:780
+#: src/emu/ui/selgame.cpp:876 src/emu/ui/selsoft.cpp:779
 msgid "Sound: OK"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:887
+#: src/emu/ui/selgame.cpp:893
 #, c-format
 msgid "System: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:894 src/emu/ui/selsoft.cpp:805
+#: src/emu/ui/selgame.cpp:900 src/emu/ui/selsoft.cpp:804
 #, c-format
 msgid "Software is clone of: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:896 src/emu/ui/selsoft.cpp:807
+#: src/emu/ui/selgame.cpp:902 src/emu/ui/selsoft.cpp:806
 msgid "Software is parent"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:901 src/emu/ui/selsoft.cpp:812
+#: src/emu/ui/selgame.cpp:907 src/emu/ui/selsoft.cpp:811
 msgid "Supported: No"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:906 src/emu/ui/selsoft.cpp:817
+#: src/emu/ui/selgame.cpp:912 src/emu/ui/selsoft.cpp:816
 msgid "Supported: Partial"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:911 src/emu/ui/selsoft.cpp:822
+#: src/emu/ui/selgame.cpp:917 src/emu/ui/selsoft.cpp:821
 msgid "Supported: Yes"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:916 src/emu/ui/selsoft.cpp:827
+#: src/emu/ui/selgame.cpp:922 src/emu/ui/selsoft.cpp:826
 #, c-format
 msgid "romset: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:923
+#: src/emu/ui/selgame.cpp:929
 #, c-format
 msgid "%1$s %2$s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1535
+#: src/emu/ui/selgame.cpp:1543
 #, c-format
 msgid "Romset: %1$-.100s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1536
+#: src/emu/ui/selgame.cpp:1544
 #, c-format
 msgid "Year: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1537
+#: src/emu/ui/selgame.cpp:1545
 #, c-format
 msgid "Manufacturer: %1$-.100s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1541
+#: src/emu/ui/selgame.cpp:1549
 #, c-format
 msgid "Driver is Clone of: %1$-.100s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1543
+#: src/emu/ui/selgame.cpp:1551
 msgid "Driver is Parent\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1546
+#: src/emu/ui/selgame.cpp:1554
 msgid "Overall: NOT WORKING\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1548
+#: src/emu/ui/selgame.cpp:1556
 msgid "Overall: Unemulated Protection\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1550
+#: src/emu/ui/selgame.cpp:1558
 msgid "Overall: Working\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1553
+#: src/emu/ui/selgame.cpp:1561
 msgid "Graphics: Imperfect Colors\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1557
+#: src/emu/ui/selgame.cpp:1565
 msgid "Graphics: Imperfect\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1559
+#: src/emu/ui/selgame.cpp:1567
 msgid "Graphics: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1562
+#: src/emu/ui/selgame.cpp:1570
 msgid "Sound: Unimplemented\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1564
+#: src/emu/ui/selgame.cpp:1572
 msgid "Sound: Imperfect\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1566
+#: src/emu/ui/selgame.cpp:1574
 msgid "Sound: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1568
+#: src/emu/ui/selgame.cpp:1576
 #, c-format
 msgid "Driver is Skeleton: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1569
+#: src/emu/ui/selgame.cpp:1577
 #, c-format
 msgid "Game is Mechanical: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1570
+#: src/emu/ui/selgame.cpp:1578
 #, c-format
 msgid "Requires Artwork: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1571
+#: src/emu/ui/selgame.cpp:1579
 #, c-format
 msgid "Requires Clickable Artwork: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1572
+#: src/emu/ui/selgame.cpp:1580
 #, c-format
 msgid "Support Cocktail: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1573
+#: src/emu/ui/selgame.cpp:1581
 #, c-format
 msgid "Driver is Bios: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1574
+#: src/emu/ui/selgame.cpp:1582
 #, c-format
 msgid "Support Save: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 #, c-format
 msgid "Screen Orientation: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 msgid "Vertical"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 msgid "Horizontal"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/selgame.cpp:1591
 #, c-format
 msgid "Requires CHD: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1596
+#: src/emu/ui/selgame.cpp:1604
 msgid "Roms Audit Pass: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1598
+#: src/emu/ui/selgame.cpp:1606
 msgid "Roms Audit Pass: BAD\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1601
+#: src/emu/ui/selgame.cpp:1609
 msgid "Samples Audit Pass: None Needed\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1603
+#: src/emu/ui/selgame.cpp:1611
 msgid "Samples Audit Pass: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1605
+#: src/emu/ui/selgame.cpp:1613
 msgid "Samples Audit Pass: BAD\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1608
+#: src/emu/ui/selgame.cpp:1616
 msgid ""
 "Roms Audit Pass: Disabled\n"
 "Samples Audit Pass: Disabled\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:2049 src/emu/ui/selgame.cpp:2212
-#: src/emu/ui/selsoft.cpp:1662
+#: src/emu/ui/selgame.cpp:2055 src/emu/ui/selgame.cpp:2216
+#: src/emu/ui/selsoft.cpp:1655
 msgid "No Infos Available"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:2162 src/emu/ui/selsoft.cpp:1607
+#: src/emu/ui/selgame.cpp:2168 src/emu/ui/selsoft.cpp:1602
 msgid "Usage"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:110
-msgid " (default)"
-msgstr ""
-
-#: src/emu/ui/selsoft.cpp:381
+#: src/emu/ui/selsoft.cpp:380
 msgid ""
 "The selected software is missing one or more required files. Please select a "
 "different software.\n"
@@ -1268,57 +1284,57 @@ msgid ""
 "Press any key to continue."
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:684
+#: src/emu/ui/selsoft.cpp:683
 #, c-format
-msgid "%1$s %2$s ( %3$d / %4$d softwares )"
+msgid "%1$s %2$s ( %3$d / %4$d software packages )"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:685
+#: src/emu/ui/selsoft.cpp:684
 #, c-format
 msgid "Driver: \"%1$s\" software list "
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:688
+#: src/emu/ui/selsoft.cpp:687
 #, c-format
 msgid "Region: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:690
+#: src/emu/ui/selsoft.cpp:689
 #, c-format
 msgid "Publisher: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:692
+#: src/emu/ui/selsoft.cpp:691
 #, c-format
 msgid "Year: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:694
+#: src/emu/ui/selsoft.cpp:693
 #, c-format
 msgid "Software List: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:696
+#: src/emu/ui/selsoft.cpp:695
 #, c-format
 msgid "Device type: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:698
+#: src/emu/ui/selsoft.cpp:697
 #, c-format
 msgid "%s Search: %s_"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:748 src/emu/ui/selsoft.cpp:798
+#: src/emu/ui/selsoft.cpp:747 src/emu/ui/selsoft.cpp:797
 #: src/emu/ui/simpleselgame.cpp:325
 #, c-format
 msgid "%1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:1998 src/emu/ui/selsoft.cpp:2018
+#: src/emu/ui/selsoft.cpp:1991 src/emu/ui/selsoft.cpp:2011
 msgid "Software part selection:"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:2136 src/emu/ui/selsoft.cpp:2156
+#: src/emu/ui/selsoft.cpp:2129 src/emu/ui/selsoft.cpp:2149
 msgid "Bios selection:"
 msgstr ""
 
@@ -1366,15 +1382,15 @@ msgstr ""
 msgid " [internal]"
 msgstr ""
 
-#: src/emu/ui/sndmenu.cpp:135
+#: src/emu/ui/sndmenu.cpp:133
 msgid "Sound"
 msgstr ""
 
-#: src/emu/ui/sndmenu.cpp:136
+#: src/emu/ui/sndmenu.cpp:134
 msgid "Sample Rate"
 msgstr ""
 
-#: src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/sndmenu.cpp:135
 msgid "Use External Samples"
 msgstr ""
 
@@ -1443,80 +1459,80 @@ msgstr ""
 msgid "Fast Forward"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:419
+#: src/emu/ui/ui.cpp:418
 msgid "This driver requires images to be loaded in the following device(s): "
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1074
+#: src/emu/ui/ui.cpp:1071
 msgid ""
 "One or more ROMs/CHDs for this machine are incorrect. The machine may not "
 "run correctly.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1087
+#: src/emu/ui/ui.cpp:1084
 msgid ""
 "There are known problems with this machine\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1091
+#: src/emu/ui/ui.cpp:1088
 msgid ""
 "One or more ROMs/CHDs for this machine have not been correctly dumped.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1095
+#: src/emu/ui/ui.cpp:1092
 #, c-format
 msgid "The keyboard emulation may not be 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1097
+#: src/emu/ui/ui.cpp:1094
 #, c-format
 msgid "The colors aren't 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1099
+#: src/emu/ui/ui.cpp:1096
 msgid "The colors are completely wrong.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1101
+#: src/emu/ui/ui.cpp:1098
 #, c-format
 msgid "The video emulation isn't 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1103
+#: src/emu/ui/ui.cpp:1100
 #, c-format
 msgid "The sound emulation isn't 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1105
+#: src/emu/ui/ui.cpp:1102
 msgid "The machine lacks sound.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1108
+#: src/emu/ui/ui.cpp:1105
 msgid "Screen flipping in cocktail mode is not supported.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1112
+#: src/emu/ui/ui.cpp:1109
 msgid "The machine requires external artwork files\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1117
+#: src/emu/ui/ui.cpp:1114
 msgid ""
 "This machine was never completed. It may exhibit strange behavior or missing "
 "elements that are not bugs in the emulation.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1122
+#: src/emu/ui/ui.cpp:1119
 msgid ""
 "This machine has no sound hardware, MAME will produce no sounds, this is "
 "expected behaviour.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1130
+#: src/emu/ui/ui.cpp:1127
 msgid "The machine has protection which isn't fully emulated.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1133
+#: src/emu/ui/ui.cpp:1130
 msgid ""
 "\n"
 "THIS MACHINE DOESN'T WORK. The emulation for this machine is not yet "
@@ -1524,7 +1540,7 @@ msgid ""
 "the developers to improve the emulation.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1137
+#: src/emu/ui/ui.cpp:1134
 msgid ""
 "\n"
 "Certain elements of this machine cannot be emulated as it requires actual "
@@ -1532,21 +1548,21 @@ msgid ""
 "to fully play this machine.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1156
+#: src/emu/ui/ui.cpp:1153
 msgid ""
 "\n"
 "\n"
 "There are working clones of this machine: "
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1170
+#: src/emu/ui/ui.cpp:1167
 msgid ""
 "\n"
 "\n"
 "Press any key to continue"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1185
+#: src/emu/ui/ui.cpp:1182
 #, c-format
 msgid ""
 "%1$s\n"
@@ -1556,98 +1572,98 @@ msgid ""
 "CPU:\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1221 src/emu/ui/ui.cpp:1260
+#: src/emu/ui/ui.cpp:1218 src/emu/ui/ui.cpp:1257
 msgid "MHz"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1221 src/emu/ui/ui.cpp:1260
+#: src/emu/ui/ui.cpp:1218 src/emu/ui/ui.cpp:1257
 msgid "kHz"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1235
+#: src/emu/ui/ui.cpp:1232
 msgid ""
 "\n"
 "Sound:\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1264
+#: src/emu/ui/ui.cpp:1261
 msgid ""
 "\n"
 "Video:\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1268
+#: src/emu/ui/ui.cpp:1265
 msgid "None\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1275
+#: src/emu/ui/ui.cpp:1272
 msgid "Vector"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1286
+#: src/emu/ui/ui.cpp:1283
 #, c-format
 msgid "%1$s: %2$s\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1286
+#: src/emu/ui/ui.cpp:1283
 msgid "%2$s\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1541 src/emu/ui/ui.cpp:1551
+#: src/emu/ui/ui.cpp:1538 src/emu/ui/ui.cpp:1548
 msgid "Keyboard Emulation Status"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1543
+#: src/emu/ui/ui.cpp:1540
 msgid "Mode: PARTIAL Emulation"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1544
+#: src/emu/ui/ui.cpp:1541
 msgid "UI:   Enabled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1546 src/emu/ui/ui.cpp:1556
+#: src/emu/ui/ui.cpp:1543 src/emu/ui/ui.cpp:1553
 msgid "**Use ScrLock to toggle**"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1553
+#: src/emu/ui/ui.cpp:1550
 msgid "Mode: FULL Emulation"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1554
+#: src/emu/ui/ui.cpp:1551
 msgid "UI:   Disabled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1692
+#: src/emu/ui/ui.cpp:1689
 msgid "Autofire can't be enabled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1731
+#: src/emu/ui/ui.cpp:1728
 msgid "Select position to save to"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1733
+#: src/emu/ui/ui.cpp:1730
 msgid "Select position to load from"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1757
+#: src/emu/ui/ui.cpp:1754
 msgid "Save cancelled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1759
+#: src/emu/ui/ui.cpp:1756
 msgid "Load cancelled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1802
+#: src/emu/ui/ui.cpp:1799
 #, c-format
 msgid "Save to position %s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1807
+#: src/emu/ui/ui.cpp:1804
 #, c-format
 msgid "Load from position %s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1847
+#: src/emu/ui/ui.cpp:1844
 #, c-format
 msgid ""
 "Are you sure you want to quit?\n"
@@ -1656,173 +1672,173 @@ msgid ""
 "Press ''%2$s'' to return to emulation."
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1917
+#: src/emu/ui/ui.cpp:1914
 msgid "Master Volume"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1926
+#: src/emu/ui/ui.cpp:1923
 #, c-format
 msgid "%1$s Volume"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1949
+#: src/emu/ui/ui.cpp:1946
 #, c-format
 msgid "Overclock CPU %1$s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1968
+#: src/emu/ui/ui.cpp:1965
 #, c-format
 msgid "%1$s Refresh Rate"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1973
+#: src/emu/ui/ui.cpp:1970
 #, c-format
 msgid "%1$s Brightness"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1975
+#: src/emu/ui/ui.cpp:1972
 #, c-format
 msgid "%1$s Contrast"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1977
+#: src/emu/ui/ui.cpp:1974
 #, c-format
 msgid "%1$s Gamma"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1981
+#: src/emu/ui/ui.cpp:1978
 #, c-format
 msgid "%1$s Horiz Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1983
+#: src/emu/ui/ui.cpp:1980
 #, c-format
 msgid "%1$s Horiz Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1985
+#: src/emu/ui/ui.cpp:1982
 #, c-format
 msgid "%1$s Vert Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1987
+#: src/emu/ui/ui.cpp:1984
 #, c-format
 msgid "%1$s Vert Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2005
+#: src/emu/ui/ui.cpp:2002
 #, c-format
 msgid "Laserdisc '%1$s' Horiz Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2007
+#: src/emu/ui/ui.cpp:2004
 #, c-format
 msgid "Laserdisc '%1$s' Horiz Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2009
+#: src/emu/ui/ui.cpp:2006
 #, c-format
 msgid "Laserdisc '%1$s' Vert Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2011
+#: src/emu/ui/ui.cpp:2008
 #, c-format
 msgid "Laserdisc '%1$s' Vert Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2021
+#: src/emu/ui/ui.cpp:2018
 msgid "Vector Flicker"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2022
+#: src/emu/ui/ui.cpp:2019
 msgid "Beam Width Minimum"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2023
+#: src/emu/ui/ui.cpp:2020
 msgid "Beam Width Maximum"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2024
+#: src/emu/ui/ui.cpp:2021
 msgid "Beam Intensity Weight"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2037
+#: src/emu/ui/ui.cpp:2034
 #, c-format
 msgid "Crosshair Scale %1$s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2037 src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2034 src/emu/ui/ui.cpp:2036
 msgid "X"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2037 src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2034 src/emu/ui/ui.cpp:2036
 msgid "Y"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2036
 #, c-format
 msgid "Crosshair Offset %1$s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2071
+#: src/emu/ui/ui.cpp:2068
 #, c-format
 msgid "%1$3ddB"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2115
+#: src/emu/ui/ui.cpp:2112
 #, c-format
 msgid "%1$d%%"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2131
+#: src/emu/ui/ui.cpp:2128
 #, c-format
 msgid "%1$3.0f%%"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2154
+#: src/emu/ui/ui.cpp:2151
 #, c-format
 msgid "%1$.3ffps"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2177 src/emu/ui/ui.cpp:2199 src/emu/ui/ui.cpp:2220
-#: src/emu/ui/ui.cpp:2242 src/emu/ui/ui.cpp:2264 src/emu/ui/ui.cpp:2286
-#: src/emu/ui/ui.cpp:2308 src/emu/ui/ui.cpp:2330 src/emu/ui/ui.cpp:2352
-#: src/emu/ui/ui.cpp:2374 src/emu/ui/ui.cpp:2396
+#: src/emu/ui/ui.cpp:2174 src/emu/ui/ui.cpp:2196 src/emu/ui/ui.cpp:2217
+#: src/emu/ui/ui.cpp:2239 src/emu/ui/ui.cpp:2261 src/emu/ui/ui.cpp:2283
+#: src/emu/ui/ui.cpp:2305 src/emu/ui/ui.cpp:2327 src/emu/ui/ui.cpp:2349
+#: src/emu/ui/ui.cpp:2371 src/emu/ui/ui.cpp:2393
 #, c-format
 msgid "%1$.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2412 src/emu/ui/ui.cpp:2428 src/emu/ui/ui.cpp:2444
-#: src/emu/ui/ui.cpp:2460
+#: src/emu/ui/ui.cpp:2408 src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2438
+#: src/emu/ui/ui.cpp:2453
 #, c-format
 msgid "%1$1.2f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2476
+#: src/emu/ui/ui.cpp:2469
 #, c-format
 msgid "Screen '%1$s'"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2478
+#: src/emu/ui/ui.cpp:2471
 msgid "Screen"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2494
+#: src/emu/ui/ui.cpp:2487
 #, c-format
 msgid "Crosshair Scale X %1$1.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2494
+#: src/emu/ui/ui.cpp:2487
 #, c-format
 msgid "Crosshair Scale Y %1$1.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2513
+#: src/emu/ui/ui.cpp:2506
 #, c-format
 msgid "Crosshair Offset X %1$1.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2513
+#: src/emu/ui/ui.cpp:2506
 #, c-format
 msgid "Crosshair Offset Y %1$1.3f"
 msgstr ""
@@ -1864,10 +1880,10 @@ msgstr ""
 msgid "Full"
 msgstr ""
 
-#: src/emu/ui/viewgfx.cpp:392
+#: src/emu/ui/viewgfx.cpp:391
 msgid " COLORS"
 msgstr ""
 
-#: src/emu/ui/viewgfx.cpp:392
+#: src/emu/ui/viewgfx.cpp:391
 msgid " PENS"
 msgstr ""
diff --git a/language/Hindi/strings.po b/language/Hindi/strings.po
index a7e5e7c1804..ced24725c26 100644
--- a/language/Hindi/strings.po
+++ b/language/Hindi/strings.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MAME\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-11 03:33+0200\n"
+"POT-Creation-Date: 2016-04-15 17:42+0200\n"
 "PO-Revision-Date: 2016-02-20 18:03+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: MAME Language Team\n"
@@ -59,14 +59,14 @@ msgstr ""
 msgid "Autofire Status"
 msgstr ""
 
-#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1698
+#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1695
 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211
 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219
 #: src/emu/ui/videoopt.cpp:223
 msgid "Disabled"
 msgstr ""
 
-#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1698
+#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1695
 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211
 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219
 #: src/emu/ui/videoopt.cpp:223
@@ -74,14 +74,14 @@ msgid "Enabled"
 msgstr ""
 
 #: src/emu/ui/cheatopt.cpp:282 src/emu/ui/cheatopt.cpp:288
-#: src/emu/ui/menu.cpp:710 src/emu/ui/miscmenu.cpp:831
-#: src/emu/ui/sndmenu.cpp:135 src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/menu.cpp:755 src/emu/ui/miscmenu.cpp:936
+#: src/emu/ui/sndmenu.cpp:133 src/emu/ui/sndmenu.cpp:135
 msgid "On"
 msgstr ""
 
 #: src/emu/ui/cheatopt.cpp:282 src/emu/ui/cheatopt.cpp:288
-#: src/emu/ui/menu.cpp:713 src/emu/ui/miscmenu.cpp:831
-#: src/emu/ui/sndmenu.cpp:135 src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/menu.cpp:758 src/emu/ui/miscmenu.cpp:936
+#: src/emu/ui/sndmenu.cpp:133 src/emu/ui/sndmenu.cpp:135
 msgid "Off"
 msgstr ""
 
@@ -93,316 +93,316 @@ msgstr ""
 msgid "Autofire Delay"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:158 src/emu/ui/custmenu.cpp:447
+#: src/emu/ui/custmenu.cpp:157 src/emu/ui/custmenu.cpp:445
 msgid "Main filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:167 src/emu/ui/custmenu.cpp:456
+#: src/emu/ui/custmenu.cpp:166 src/emu/ui/custmenu.cpp:454
 msgid "Other filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:176 src/emu/ui/optsmenu.cpp:239
+#: src/emu/ui/custmenu.cpp:175 src/emu/ui/optsmenu.cpp:238
 msgid "^!Manufacturer"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:185 src/emu/ui/custmenu.cpp:474
-#: src/emu/ui/optsmenu.cpp:247
+#: src/emu/ui/custmenu.cpp:184 src/emu/ui/custmenu.cpp:472
+#: src/emu/ui/optsmenu.cpp:246
 msgid "^!Year"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:194 src/emu/ui/custmenu.cpp:510
+#: src/emu/ui/custmenu.cpp:193 src/emu/ui/custmenu.cpp:508
 msgid "Remove last filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:197 src/emu/ui/custmenu.cpp:513
+#: src/emu/ui/custmenu.cpp:196 src/emu/ui/custmenu.cpp:511
 msgid "Add filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:212 src/emu/ui/custmenu.cpp:233
-#: src/emu/ui/custmenu.cpp:529 src/emu/ui/custmenu.cpp:550
+#: src/emu/ui/custmenu.cpp:211 src/emu/ui/custmenu.cpp:231
+#: src/emu/ui/custmenu.cpp:527 src/emu/ui/custmenu.cpp:547
 msgid "Select custom filters:"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:465
+#: src/emu/ui/custmenu.cpp:463
 msgid "^!Publisher"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:483
+#: src/emu/ui/custmenu.cpp:481
 msgid "^!Software List"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:492
+#: src/emu/ui/custmenu.cpp:490
 msgid "^!Device type"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:501
+#: src/emu/ui/custmenu.cpp:499
 msgid "^!Region"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:23
+#: src/emu/ui/custui.cpp:22
 msgid "Show All"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:24
+#: src/emu/ui/custui.cpp:23
 msgid "Hide Filters"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:25
+#: src/emu/ui/custui.cpp:24
 msgid "Hide Info/Image"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:26
+#: src/emu/ui/custui.cpp:25
 msgid "Hide Both"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:142
+#: src/emu/ui/custui.cpp:141
 msgid "Fonts"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:143
+#: src/emu/ui/custui.cpp:142
 msgid "Colors"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:148 src/emu/ui/dirmenu.cpp:33
+#: src/emu/ui/custui.cpp:147 src/emu/ui/dirmenu.cpp:33
 msgid "Language"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:152
+#: src/emu/ui/custui.cpp:151
 msgid "Show side panels"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:167 src/emu/ui/custui.cpp:188
+#: src/emu/ui/custui.cpp:166 src/emu/ui/custui.cpp:186
 msgid "Custom UI Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:246
+#: src/emu/ui/custui.cpp:244
 msgid "default"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:349
+#: src/emu/ui/custui.cpp:347
 msgid "UI Font"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:354
+#: src/emu/ui/custui.cpp:352
 msgid "Bold"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:355
+#: src/emu/ui/custui.cpp:353
 msgid "Italic"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:360
+#: src/emu/ui/custui.cpp:358
 msgid "Lines"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:366
+#: src/emu/ui/custui.cpp:364
 msgid "Infos text size"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:383
+#: src/emu/ui/custui.cpp:381
 msgid "UI Fonts Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:411
+#: src/emu/ui/custui.cpp:408
 msgid "Sample text - Lorem ipsum dolor sit amet, consectetur adipiscing elit."
 msgstr ""
 
-#: src/emu/ui/custui.cpp:509
+#: src/emu/ui/custui.cpp:506
 msgid "Normal text"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:510
+#: src/emu/ui/custui.cpp:507
 msgid "Selected color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:511
+#: src/emu/ui/custui.cpp:508
 msgid "Normal text background"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:512
+#: src/emu/ui/custui.cpp:509
 msgid "Selected background color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:513
+#: src/emu/ui/custui.cpp:510
 msgid "Subitem color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:514 src/emu/ui/custui.cpp:610
+#: src/emu/ui/custui.cpp:511 src/emu/ui/custui.cpp:606
 msgid "Clone"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:515
+#: src/emu/ui/custui.cpp:512
 msgid "Border"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:516
+#: src/emu/ui/custui.cpp:513
 msgid "Background"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:517
+#: src/emu/ui/custui.cpp:514
 msgid "Dipswitch"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:518
+#: src/emu/ui/custui.cpp:515
 msgid "Unavailable color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:519
+#: src/emu/ui/custui.cpp:516
 msgid "Slider color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:520
+#: src/emu/ui/custui.cpp:517
 msgid "Gfx viewer background"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:521
+#: src/emu/ui/custui.cpp:518
 msgid "Mouse over color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:522
+#: src/emu/ui/custui.cpp:519
 msgid "Mouse over background color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:523
+#: src/emu/ui/custui.cpp:520
 msgid "Mouse down color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:524
+#: src/emu/ui/custui.cpp:521
 msgid "Mouse down background color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:527
+#: src/emu/ui/custui.cpp:524
 msgid "Restore originals colors"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:543
+#: src/emu/ui/custui.cpp:540
 msgid "UI Colors Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:572
+#: src/emu/ui/custui.cpp:568
 #, c-format
 msgid "Double click or press %1$s to change the color value"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:598
+#: src/emu/ui/custui.cpp:594
 msgid "Menu Preview"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:606
+#: src/emu/ui/custui.cpp:602
 msgid "Normal"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:607
+#: src/emu/ui/custui.cpp:603
 msgid "Subitem"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:608
+#: src/emu/ui/custui.cpp:604
 msgid "Selected"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:609
+#: src/emu/ui/custui.cpp:605
 msgid "Mouse Over"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:841 src/emu/ui/custui.cpp:844
+#: src/emu/ui/custui.cpp:837 src/emu/ui/custui.cpp:840
 msgid "Alpha"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:849 src/emu/ui/custui.cpp:852
-#: src/emu/ui/custui.cpp:1013
+#: src/emu/ui/custui.cpp:845 src/emu/ui/custui.cpp:848
+#: src/emu/ui/custui.cpp:1007
 msgid "Red"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:857 src/emu/ui/custui.cpp:860
-#: src/emu/ui/custui.cpp:1016
+#: src/emu/ui/custui.cpp:853 src/emu/ui/custui.cpp:856
+#: src/emu/ui/custui.cpp:1010
 msgid "Green"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:865 src/emu/ui/custui.cpp:868
-#: src/emu/ui/custui.cpp:1017
+#: src/emu/ui/custui.cpp:861 src/emu/ui/custui.cpp:864
+#: src/emu/ui/custui.cpp:1011
 msgid "Blue"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:871
+#: src/emu/ui/custui.cpp:867
 msgid "Choose from palette"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:887
+#: src/emu/ui/custui.cpp:883
 msgid " - ARGB Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:912
+#: src/emu/ui/custui.cpp:907
 msgid "Color preview ="
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1009
+#: src/emu/ui/custui.cpp:1003
 msgid "White"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1010
+#: src/emu/ui/custui.cpp:1004
 msgid "Silver"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1011
+#: src/emu/ui/custui.cpp:1005
 msgid "Gray"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1012
+#: src/emu/ui/custui.cpp:1006
 msgid "Black"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1014
+#: src/emu/ui/custui.cpp:1008
 msgid "Orange"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1015
+#: src/emu/ui/custui.cpp:1009
 msgid "Yellow"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1018
+#: src/emu/ui/custui.cpp:1012
 msgid "Violet"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:65
+#: src/emu/ui/datmenu.cpp:64
 msgid "Software History"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:67
+#: src/emu/ui/datmenu.cpp:66
 msgid "Software Usage"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:199
+#: src/emu/ui/datmenu.cpp:196
 msgid "Revision: "
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:287 src/emu/ui/selgame.cpp:40
-#: src/emu/ui/selgame.cpp:2152 src/emu/ui/selgame.cpp:2161
-#: src/emu/ui/selsoft.cpp:1577 src/emu/ui/selsoft.cpp:1597
-#: src/emu/ui/selsoft.cpp:1606
+#: src/emu/ui/datmenu.cpp:284 src/emu/ui/selgame.cpp:39
+#: src/emu/ui/selgame.cpp:2158 src/emu/ui/selgame.cpp:2167
+#: src/emu/ui/selsoft.cpp:1574 src/emu/ui/selsoft.cpp:1592
+#: src/emu/ui/selsoft.cpp:1601
 msgid "History"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:289 src/emu/ui/selgame.cpp:41
+#: src/emu/ui/datmenu.cpp:286 src/emu/ui/selgame.cpp:40
 msgid "Mameinfo"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:291 src/emu/ui/selgame.cpp:43
+#: src/emu/ui/datmenu.cpp:288 src/emu/ui/selgame.cpp:42
 msgid "Messinfo"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:293 src/emu/ui/selgame.cpp:42
+#: src/emu/ui/datmenu.cpp:290 src/emu/ui/selgame.cpp:41
 msgid "Sysinfo"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:295 src/emu/ui/selgame.cpp:46
+#: src/emu/ui/datmenu.cpp:292 src/emu/ui/selgame.cpp:45
 msgid "Mamescore"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:297 src/emu/ui/selgame.cpp:45
+#: src/emu/ui/datmenu.cpp:294 src/emu/ui/selgame.cpp:44
 msgid "Gameinit"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:299 src/emu/ui/selgame.cpp:44
+#: src/emu/ui/datmenu.cpp:296 src/emu/ui/selgame.cpp:43
 msgid "Command"
 msgstr ""
 
@@ -554,75 +554,75 @@ msgstr ""
 msgid "Remove %1$s Folder"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:158
+#: src/emu/ui/filesel.cpp:161
 msgid "File Already Exists - Override?"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:160 src/emu/ui/selgame.cpp:1568
-#: src/emu/ui/selgame.cpp:1569 src/emu/ui/selgame.cpp:1570
-#: src/emu/ui/selgame.cpp:1571 src/emu/ui/selgame.cpp:1572
-#: src/emu/ui/selgame.cpp:1573 src/emu/ui/selgame.cpp:1574
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/filesel.cpp:163 src/emu/ui/selgame.cpp:1576
+#: src/emu/ui/selgame.cpp:1577 src/emu/ui/selgame.cpp:1578
+#: src/emu/ui/selgame.cpp:1579 src/emu/ui/selgame.cpp:1580
+#: src/emu/ui/selgame.cpp:1581 src/emu/ui/selgame.cpp:1582
+#: src/emu/ui/selgame.cpp:1591
 msgid "No"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:161 src/emu/ui/selgame.cpp:1568
-#: src/emu/ui/selgame.cpp:1569 src/emu/ui/selgame.cpp:1570
-#: src/emu/ui/selgame.cpp:1571 src/emu/ui/selgame.cpp:1572
-#: src/emu/ui/selgame.cpp:1573 src/emu/ui/selgame.cpp:1574
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/filesel.cpp:164 src/emu/ui/selgame.cpp:1576
+#: src/emu/ui/selgame.cpp:1577 src/emu/ui/selgame.cpp:1578
+#: src/emu/ui/selgame.cpp:1579 src/emu/ui/selgame.cpp:1580
+#: src/emu/ui/selgame.cpp:1581 src/emu/ui/selgame.cpp:1582
+#: src/emu/ui/selgame.cpp:1591
 msgid "Yes"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:272
+#: src/emu/ui/filesel.cpp:275
 msgid "New Image Name:"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:278
+#: src/emu/ui/filesel.cpp:281
 msgid "Image Format:"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:284
+#: src/emu/ui/filesel.cpp:287
 msgid "Create"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:315
+#: src/emu/ui/filesel.cpp:318
 msgid "Please enter a file extension too"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:503 src/emu/ui/swlist.cpp:65
+#: src/emu/ui/filesel.cpp:506 src/emu/ui/swlist.cpp:65
 msgid "[empty slot]"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:507
+#: src/emu/ui/filesel.cpp:510
 msgid "[create]"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:511 src/emu/ui/swlist.cpp:76
+#: src/emu/ui/filesel.cpp:514 src/emu/ui/swlist.cpp:76
 msgid "[software list]"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:803
+#: src/emu/ui/filesel.cpp:806
 msgid "Select image format"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:863
+#: src/emu/ui/filesel.cpp:866
 msgid "Select access mode"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:864
+#: src/emu/ui/filesel.cpp:867
 msgid "Read-only"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:866
+#: src/emu/ui/filesel.cpp:869
 msgid "Read-write"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:867
+#: src/emu/ui/filesel.cpp:870
 msgid "Read this image, write to another image"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:868
+#: src/emu/ui/filesel.cpp:871
 msgid "Read this image, write to diff"
 msgstr ""
 
@@ -648,7 +648,7 @@ msgstr ""
 msgid "[empty]"
 msgstr ""
 
-#: src/emu/ui/info_pty.cpp:26 src/emu/ui/mainmenu.cpp:91
+#: src/emu/ui/info_pty.cpp:26 src/emu/ui/mainmenu.cpp:96
 msgid "Pseudo terminals"
 msgstr ""
 
@@ -664,7 +664,7 @@ msgstr ""
 msgid "Other Controls"
 msgstr ""
 
-#: src/emu/ui/inputmap.cpp:622 src/emu/ui/miscmenu.cpp:91
+#: src/emu/ui/inputmap.cpp:622 src/emu/ui/miscmenu.cpp:92
 #: src/emu/ui/slotopt.cpp:172
 msgid "Reset"
 msgstr ""
@@ -697,27 +697,27 @@ msgstr ""
 msgid "Machine Information"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:78
+#: src/emu/ui/mainmenu.cpp:80
 msgid "Image Information"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:81
+#: src/emu/ui/mainmenu.cpp:83
 msgid "File Manager"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:86
+#: src/emu/ui/mainmenu.cpp:92
 msgid "Tape Control"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:94
+#: src/emu/ui/mainmenu.cpp:99
 msgid "Bios Selection"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:100
+#: src/emu/ui/mainmenu.cpp:104
 msgid "Slot Devices"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:107
+#: src/emu/ui/mainmenu.cpp:109
 msgid "Barcode Reader"
 msgstr ""
 
@@ -725,43 +725,43 @@ msgstr ""
 msgid "Network Devices"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:119
+#: src/emu/ui/mainmenu.cpp:118
 msgid "Keyboard Mode"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:122
+#: src/emu/ui/mainmenu.cpp:121
 msgid "Slider Controls"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:125
+#: src/emu/ui/mainmenu.cpp:124
 msgid "Video Options"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:129
+#: src/emu/ui/mainmenu.cpp:128
 msgid "Crosshair Options"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:133
+#: src/emu/ui/mainmenu.cpp:132
 msgid "Cheat"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:136
+#: src/emu/ui/mainmenu.cpp:135
 msgid "Plugin Options"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:140
+#: src/emu/ui/mainmenu.cpp:139
 msgid "External DAT View"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:146
+#: src/emu/ui/mainmenu.cpp:145 src/emu/ui/miscmenu.cpp:785
 msgid "Add To Favorites"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:148
+#: src/emu/ui/mainmenu.cpp:147 src/emu/ui/miscmenu.cpp:787
 msgid "Remove From Favorites"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:155
+#: src/emu/ui/mainmenu.cpp:154
 msgid "Select New Machine"
 msgstr ""
 
@@ -801,189 +801,205 @@ msgstr ""
 msgid "Return to Previous Menu"
 msgstr ""
 
-#: src/emu/ui/menu.cpp:716
+#: src/emu/ui/menu.cpp:761
 msgid "Auto"
 msgstr ""
 
-#: src/emu/ui/menu.cpp:2133
+#: src/emu/ui/menu.cpp:2195
 msgid "Images"
 msgstr ""
 
-#: src/emu/ui/menu.cpp:2134
+#: src/emu/ui/menu.cpp:2196
 msgid "Infos"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Keyboard Mode:"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Natural"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Emulated"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:240
+#: src/emu/ui/miscmenu.cpp:241
 #, c-format
 msgid ""
 "Uptime: %1$d:%2$02d:%3$02d\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:242
+#: src/emu/ui/miscmenu.cpp:243
 #, c-format
 msgid ""
 "Uptime: %1$d:%2$02d\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:246
+#: src/emu/ui/miscmenu.cpp:247
 #, c-format
 msgid ""
 "Tickets dispensed: %1$d\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:257
+#: src/emu/ui/miscmenu.cpp:258
 msgid "Coin %1$c: NA%3$s\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:257
+#: src/emu/ui/miscmenu.cpp:258
 #, c-format
 msgid "Coin %1$c: %2$d%3$s\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:260
+#: src/emu/ui/miscmenu.cpp:261
 msgid " (locked)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:519
+#: src/emu/ui/miscmenu.cpp:520
 msgid "Visible Delay"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:617
+#: src/emu/ui/miscmenu.cpp:619
 #, c-format
 msgid "%s.xml saved under ui folder."
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:645
+#: src/emu/ui/miscmenu.cpp:647
 msgid "Name:             Description:\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:657
+#: src/emu/ui/miscmenu.cpp:659
 #, c-format
 msgid "%s.txt saved under ui folder."
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:675
-msgid "Export XML format (like -listxml)"
+#: src/emu/ui/miscmenu.cpp:677
+msgid "Export list in XML format (like -listxml)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:676
-msgid "Export TXT format (like -listfull)"
+#: src/emu/ui/miscmenu.cpp:678
+msgid "Export list in XML format (like -listxml, but exclude devices)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:734
-msgid "Dummy"
+#: src/emu/ui/miscmenu.cpp:679
+msgid "Export list in TXT format (like -listfull)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:736
-msgid "Save machine configuration"
-msgstr ""
-
-#: src/emu/ui/miscmenu.cpp:848 src/emu/ui/miscmenu.cpp:869
-#: src/emu/ui/selgame.cpp:594
-msgid "Plugins"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:218
-msgid "Filter"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:226
-msgid " ^!File"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:231
-msgid " ^!Category"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:254
-msgid "^!Setup custom filter"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:262
-msgid "Customize UI"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:263
-msgid "Configure Directories"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:266 src/emu/ui/sndmenu.cpp:151
-#: src/emu/ui/sndmenu.cpp:172
-msgid "Sound Options"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:269
-msgid "General Inputs"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:272
-msgid "Save Configuration"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:286 src/emu/ui/optsmenu.cpp:307
-msgid "Settings"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:327
-msgid "**Error saving ui.ini**"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:374
-#, c-format
-msgid "**Error saving %s.ini**"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:378
+#: src/emu/ui/miscmenu.cpp:729 src/emu/ui/optsmenu.cpp:376
 msgid ""
 "\n"
 "    Configuration saved    \n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/selector.cpp:166
+#: src/emu/ui/miscmenu.cpp:774
+msgid "Bios"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:776
+msgid "Driver"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:790
+msgid "Save machine configuration"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:806
+msgid "Configure machine:"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:868 src/emu/ui/selsoft.cpp:109
+msgid " (default)"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:953 src/emu/ui/miscmenu.cpp:973
+#: src/emu/ui/selgame.cpp:600
+msgid "Plugins"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:217
+msgid "Filter"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:225
+msgid " ^!File"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:230
+msgid " ^!Category"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:253
+msgid "^!Setup custom filter"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:261
+msgid "Customize UI"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:262
+msgid "Configure Directories"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:265 src/emu/ui/sndmenu.cpp:149
+#: src/emu/ui/sndmenu.cpp:169
+msgid "Sound Options"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:268
+msgid "General Inputs"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:271
+msgid "Save Configuration"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:285 src/emu/ui/optsmenu.cpp:305
+msgid "Settings"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:325
+msgid "**Error saving ui.ini**"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:372
+#, c-format
+msgid "**Error saving %s.ini**"
+msgstr ""
+
+#: src/emu/ui/selector.cpp:165
 msgid "Selection List - Search: "
 msgstr ""
 
-#: src/emu/ui/selector.cpp:196
+#: src/emu/ui/selector.cpp:194
 #, c-format
 msgid "Double click or press %1$s to select"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:39
+#: src/emu/ui/selgame.cpp:38
 msgid "General Info"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:374 src/emu/ui/selsoft.cpp:282
+#: src/emu/ui/selgame.cpp:380 src/emu/ui/selsoft.cpp:281
 #, c-format
 msgid ""
 "%s\n"
 " added to favorites list."
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:380 src/emu/ui/selgame.cpp:389
-#: src/emu/ui/selsoft.cpp:287
+#: src/emu/ui/selgame.cpp:386 src/emu/ui/selgame.cpp:395
+#: src/emu/ui/selsoft.cpp:286
 #, c-format
 msgid ""
 "%s\n"
 " removed from favorites list."
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:450
+#: src/emu/ui/selgame.cpp:457
 msgid ""
 "The selected machine is missing one or more required ROM or CHD images. "
 "Please select a different machine.\n"
@@ -991,275 +1007,275 @@ msgid ""
 "Press any key to continue."
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:589 src/emu/ui/simpleselgame.cpp:265
+#: src/emu/ui/selgame.cpp:595 src/emu/ui/simpleselgame.cpp:265
 msgid "Configure Options"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:752
+#: src/emu/ui/selgame.cpp:596
+msgid "Configure Machine"
+msgstr ""
+
+#: src/emu/ui/selgame.cpp:758
 #, c-format
 msgid "%1$s %2$s ( %3$d / %4$d machines (%5$d BIOS) )"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:762
+#: src/emu/ui/selgame.cpp:768
 #, c-format
 msgid "%1$s (%2$s - %3$s) - "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:769 src/emu/ui/selgame.cpp:775
+#: src/emu/ui/selgame.cpp:775 src/emu/ui/selgame.cpp:781
 #, c-format
 msgid "%1$s (%2$s) - "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:784
+#: src/emu/ui/selgame.cpp:790
 #, c-format
 msgid "%1$s Search: %2$s_"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:838
+#: src/emu/ui/selgame.cpp:844
 #, c-format
 msgid "Romset: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:841 src/emu/ui/selgame.cpp:890
-#: src/emu/ui/selsoft.cpp:751 src/emu/ui/selsoft.cpp:801
+#: src/emu/ui/selgame.cpp:847 src/emu/ui/selgame.cpp:896
+#: src/emu/ui/selsoft.cpp:750 src/emu/ui/selsoft.cpp:800
 #: src/emu/ui/simpleselgame.cpp:328
 #, c-format
 msgid "%1$s, %2$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:847 src/emu/ui/selsoft.cpp:757
+#: src/emu/ui/selgame.cpp:853 src/emu/ui/selsoft.cpp:756
 #, c-format
 msgid "Driver is clone of: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:849 src/emu/ui/selsoft.cpp:759
+#: src/emu/ui/selgame.cpp:855 src/emu/ui/selsoft.cpp:758
 msgid "Driver is parent"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:853 src/emu/ui/selsoft.cpp:763
+#: src/emu/ui/selgame.cpp:859 src/emu/ui/selsoft.cpp:762
 #: src/emu/ui/simpleselgame.cpp:335
 msgid "Overall: NOT WORKING"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:855 src/emu/ui/selsoft.cpp:765
+#: src/emu/ui/selgame.cpp:861 src/emu/ui/selsoft.cpp:764
 #: src/emu/ui/simpleselgame.cpp:337
 msgid "Overall: Unemulated Protection"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:857 src/emu/ui/selsoft.cpp:767
+#: src/emu/ui/selgame.cpp:863 src/emu/ui/selsoft.cpp:766
 #: src/emu/ui/simpleselgame.cpp:339
 msgid "Overall: Working"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:861 src/emu/ui/selsoft.cpp:771
+#: src/emu/ui/selgame.cpp:867 src/emu/ui/selsoft.cpp:770
 msgid "Graphics: Imperfect, "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:863 src/emu/ui/selsoft.cpp:773
+#: src/emu/ui/selgame.cpp:869 src/emu/ui/selsoft.cpp:772
 msgid "Graphics: OK, "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:866 src/emu/ui/selsoft.cpp:776
+#: src/emu/ui/selgame.cpp:872 src/emu/ui/selsoft.cpp:775
 msgid "Sound: Unimplemented"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:868 src/emu/ui/selsoft.cpp:778
+#: src/emu/ui/selgame.cpp:874 src/emu/ui/selsoft.cpp:777
 msgid "Sound: Imperfect"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:870 src/emu/ui/selsoft.cpp:780
+#: src/emu/ui/selgame.cpp:876 src/emu/ui/selsoft.cpp:779
 msgid "Sound: OK"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:887
+#: src/emu/ui/selgame.cpp:893
 #, c-format
 msgid "System: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:894 src/emu/ui/selsoft.cpp:805
+#: src/emu/ui/selgame.cpp:900 src/emu/ui/selsoft.cpp:804
 #, c-format
 msgid "Software is clone of: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:896 src/emu/ui/selsoft.cpp:807
+#: src/emu/ui/selgame.cpp:902 src/emu/ui/selsoft.cpp:806
 msgid "Software is parent"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:901 src/emu/ui/selsoft.cpp:812
+#: src/emu/ui/selgame.cpp:907 src/emu/ui/selsoft.cpp:811
 msgid "Supported: No"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:906 src/emu/ui/selsoft.cpp:817
+#: src/emu/ui/selgame.cpp:912 src/emu/ui/selsoft.cpp:816
 msgid "Supported: Partial"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:911 src/emu/ui/selsoft.cpp:822
+#: src/emu/ui/selgame.cpp:917 src/emu/ui/selsoft.cpp:821
 msgid "Supported: Yes"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:916 src/emu/ui/selsoft.cpp:827
+#: src/emu/ui/selgame.cpp:922 src/emu/ui/selsoft.cpp:826
 #, c-format
 msgid "romset: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:923
+#: src/emu/ui/selgame.cpp:929
 #, c-format
 msgid "%1$s %2$s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1535
+#: src/emu/ui/selgame.cpp:1543
 #, c-format
 msgid "Romset: %1$-.100s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1536
+#: src/emu/ui/selgame.cpp:1544
 #, c-format
 msgid "Year: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1537
+#: src/emu/ui/selgame.cpp:1545
 #, c-format
 msgid "Manufacturer: %1$-.100s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1541
+#: src/emu/ui/selgame.cpp:1549
 #, c-format
 msgid "Driver is Clone of: %1$-.100s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1543
+#: src/emu/ui/selgame.cpp:1551
 msgid "Driver is Parent\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1546
+#: src/emu/ui/selgame.cpp:1554
 msgid "Overall: NOT WORKING\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1548
+#: src/emu/ui/selgame.cpp:1556
 msgid "Overall: Unemulated Protection\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1550
+#: src/emu/ui/selgame.cpp:1558
 msgid "Overall: Working\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1553
+#: src/emu/ui/selgame.cpp:1561
 msgid "Graphics: Imperfect Colors\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1557
+#: src/emu/ui/selgame.cpp:1565
 msgid "Graphics: Imperfect\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1559
+#: src/emu/ui/selgame.cpp:1567
 msgid "Graphics: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1562
+#: src/emu/ui/selgame.cpp:1570
 msgid "Sound: Unimplemented\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1564
+#: src/emu/ui/selgame.cpp:1572
 msgid "Sound: Imperfect\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1566
+#: src/emu/ui/selgame.cpp:1574
 msgid "Sound: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1568
+#: src/emu/ui/selgame.cpp:1576
 #, c-format
 msgid "Driver is Skeleton: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1569
+#: src/emu/ui/selgame.cpp:1577
 #, c-format
 msgid "Game is Mechanical: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1570
+#: src/emu/ui/selgame.cpp:1578
 #, c-format
 msgid "Requires Artwork: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1571
+#: src/emu/ui/selgame.cpp:1579
 #, c-format
 msgid "Requires Clickable Artwork: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1572
+#: src/emu/ui/selgame.cpp:1580
 #, c-format
 msgid "Support Cocktail: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1573
+#: src/emu/ui/selgame.cpp:1581
 #, c-format
 msgid "Driver is Bios: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1574
+#: src/emu/ui/selgame.cpp:1582
 #, c-format
 msgid "Support Save: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 #, c-format
 msgid "Screen Orientation: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 msgid "Vertical"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 msgid "Horizontal"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/selgame.cpp:1591
 #, c-format
 msgid "Requires CHD: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1596
+#: src/emu/ui/selgame.cpp:1604
 msgid "Roms Audit Pass: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1598
+#: src/emu/ui/selgame.cpp:1606
 msgid "Roms Audit Pass: BAD\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1601
+#: src/emu/ui/selgame.cpp:1609
 msgid "Samples Audit Pass: None Needed\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1603
+#: src/emu/ui/selgame.cpp:1611
 msgid "Samples Audit Pass: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1605
+#: src/emu/ui/selgame.cpp:1613
 msgid "Samples Audit Pass: BAD\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1608
+#: src/emu/ui/selgame.cpp:1616
 msgid ""
 "Roms Audit Pass: Disabled\n"
 "Samples Audit Pass: Disabled\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:2049 src/emu/ui/selgame.cpp:2212
-#: src/emu/ui/selsoft.cpp:1662
+#: src/emu/ui/selgame.cpp:2055 src/emu/ui/selgame.cpp:2216
+#: src/emu/ui/selsoft.cpp:1655
 msgid "No Infos Available"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:2162 src/emu/ui/selsoft.cpp:1607
+#: src/emu/ui/selgame.cpp:2168 src/emu/ui/selsoft.cpp:1602
 msgid "Usage"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:110
-msgid " (default)"
-msgstr ""
-
-#: src/emu/ui/selsoft.cpp:381
+#: src/emu/ui/selsoft.cpp:380
 msgid ""
 "The selected software is missing one or more required files. Please select a "
 "different software.\n"
@@ -1267,57 +1283,57 @@ msgid ""
 "Press any key to continue."
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:684
+#: src/emu/ui/selsoft.cpp:683
 #, c-format
-msgid "%1$s %2$s ( %3$d / %4$d softwares )"
+msgid "%1$s %2$s ( %3$d / %4$d software packages )"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:685
+#: src/emu/ui/selsoft.cpp:684
 #, c-format
 msgid "Driver: \"%1$s\" software list "
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:688
+#: src/emu/ui/selsoft.cpp:687
 #, c-format
 msgid "Region: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:690
+#: src/emu/ui/selsoft.cpp:689
 #, c-format
 msgid "Publisher: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:692
+#: src/emu/ui/selsoft.cpp:691
 #, c-format
 msgid "Year: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:694
+#: src/emu/ui/selsoft.cpp:693
 #, c-format
 msgid "Software List: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:696
+#: src/emu/ui/selsoft.cpp:695
 #, c-format
 msgid "Device type: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:698
+#: src/emu/ui/selsoft.cpp:697
 #, c-format
 msgid "%s Search: %s_"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:748 src/emu/ui/selsoft.cpp:798
+#: src/emu/ui/selsoft.cpp:747 src/emu/ui/selsoft.cpp:797
 #: src/emu/ui/simpleselgame.cpp:325
 #, c-format
 msgid "%1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:1998 src/emu/ui/selsoft.cpp:2018
+#: src/emu/ui/selsoft.cpp:1991 src/emu/ui/selsoft.cpp:2011
 msgid "Software part selection:"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:2136 src/emu/ui/selsoft.cpp:2156
+#: src/emu/ui/selsoft.cpp:2129 src/emu/ui/selsoft.cpp:2149
 msgid "Bios selection:"
 msgstr ""
 
@@ -1365,15 +1381,15 @@ msgstr ""
 msgid " [internal]"
 msgstr ""
 
-#: src/emu/ui/sndmenu.cpp:135
+#: src/emu/ui/sndmenu.cpp:133
 msgid "Sound"
 msgstr ""
 
-#: src/emu/ui/sndmenu.cpp:136
+#: src/emu/ui/sndmenu.cpp:134
 msgid "Sample Rate"
 msgstr ""
 
-#: src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/sndmenu.cpp:135
 msgid "Use External Samples"
 msgstr ""
 
@@ -1442,80 +1458,80 @@ msgstr ""
 msgid "Fast Forward"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:419
+#: src/emu/ui/ui.cpp:418
 msgid "This driver requires images to be loaded in the following device(s): "
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1074
+#: src/emu/ui/ui.cpp:1071
 msgid ""
 "One or more ROMs/CHDs for this machine are incorrect. The machine may not "
 "run correctly.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1087
+#: src/emu/ui/ui.cpp:1084
 msgid ""
 "There are known problems with this machine\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1091
+#: src/emu/ui/ui.cpp:1088
 msgid ""
 "One or more ROMs/CHDs for this machine have not been correctly dumped.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1095
+#: src/emu/ui/ui.cpp:1092
 #, c-format
 msgid "The keyboard emulation may not be 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1097
+#: src/emu/ui/ui.cpp:1094
 #, c-format
 msgid "The colors aren't 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1099
+#: src/emu/ui/ui.cpp:1096
 msgid "The colors are completely wrong.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1101
+#: src/emu/ui/ui.cpp:1098
 #, c-format
 msgid "The video emulation isn't 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1103
+#: src/emu/ui/ui.cpp:1100
 #, c-format
 msgid "The sound emulation isn't 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1105
+#: src/emu/ui/ui.cpp:1102
 msgid "The machine lacks sound.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1108
+#: src/emu/ui/ui.cpp:1105
 msgid "Screen flipping in cocktail mode is not supported.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1112
+#: src/emu/ui/ui.cpp:1109
 msgid "The machine requires external artwork files\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1117
+#: src/emu/ui/ui.cpp:1114
 msgid ""
 "This machine was never completed. It may exhibit strange behavior or missing "
 "elements that are not bugs in the emulation.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1122
+#: src/emu/ui/ui.cpp:1119
 msgid ""
 "This machine has no sound hardware, MAME will produce no sounds, this is "
 "expected behaviour.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1130
+#: src/emu/ui/ui.cpp:1127
 msgid "The machine has protection which isn't fully emulated.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1133
+#: src/emu/ui/ui.cpp:1130
 msgid ""
 "\n"
 "THIS MACHINE DOESN'T WORK. The emulation for this machine is not yet "
@@ -1523,7 +1539,7 @@ msgid ""
 "the developers to improve the emulation.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1137
+#: src/emu/ui/ui.cpp:1134
 msgid ""
 "\n"
 "Certain elements of this machine cannot be emulated as it requires actual "
@@ -1531,21 +1547,21 @@ msgid ""
 "to fully play this machine.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1156
+#: src/emu/ui/ui.cpp:1153
 msgid ""
 "\n"
 "\n"
 "There are working clones of this machine: "
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1170
+#: src/emu/ui/ui.cpp:1167
 msgid ""
 "\n"
 "\n"
 "Press any key to continue"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1185
+#: src/emu/ui/ui.cpp:1182
 #, c-format
 msgid ""
 "%1$s\n"
@@ -1555,98 +1571,98 @@ msgid ""
 "CPU:\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1221 src/emu/ui/ui.cpp:1260
+#: src/emu/ui/ui.cpp:1218 src/emu/ui/ui.cpp:1257
 msgid "MHz"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1221 src/emu/ui/ui.cpp:1260
+#: src/emu/ui/ui.cpp:1218 src/emu/ui/ui.cpp:1257
 msgid "kHz"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1235
+#: src/emu/ui/ui.cpp:1232
 msgid ""
 "\n"
 "Sound:\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1264
+#: src/emu/ui/ui.cpp:1261
 msgid ""
 "\n"
 "Video:\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1268
+#: src/emu/ui/ui.cpp:1265
 msgid "None\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1275
+#: src/emu/ui/ui.cpp:1272
 msgid "Vector"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1286
+#: src/emu/ui/ui.cpp:1283
 #, c-format
 msgid "%1$s: %2$s\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1286
+#: src/emu/ui/ui.cpp:1283
 msgid "%2$s\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1541 src/emu/ui/ui.cpp:1551
+#: src/emu/ui/ui.cpp:1538 src/emu/ui/ui.cpp:1548
 msgid "Keyboard Emulation Status"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1543
+#: src/emu/ui/ui.cpp:1540
 msgid "Mode: PARTIAL Emulation"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1544
+#: src/emu/ui/ui.cpp:1541
 msgid "UI:   Enabled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1546 src/emu/ui/ui.cpp:1556
+#: src/emu/ui/ui.cpp:1543 src/emu/ui/ui.cpp:1553
 msgid "**Use ScrLock to toggle**"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1553
+#: src/emu/ui/ui.cpp:1550
 msgid "Mode: FULL Emulation"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1554
+#: src/emu/ui/ui.cpp:1551
 msgid "UI:   Disabled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1692
+#: src/emu/ui/ui.cpp:1689
 msgid "Autofire can't be enabled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1731
+#: src/emu/ui/ui.cpp:1728
 msgid "Select position to save to"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1733
+#: src/emu/ui/ui.cpp:1730
 msgid "Select position to load from"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1757
+#: src/emu/ui/ui.cpp:1754
 msgid "Save cancelled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1759
+#: src/emu/ui/ui.cpp:1756
 msgid "Load cancelled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1802
+#: src/emu/ui/ui.cpp:1799
 #, c-format
 msgid "Save to position %s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1807
+#: src/emu/ui/ui.cpp:1804
 #, c-format
 msgid "Load from position %s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1847
+#: src/emu/ui/ui.cpp:1844
 #, c-format
 msgid ""
 "Are you sure you want to quit?\n"
@@ -1655,173 +1671,173 @@ msgid ""
 "Press ''%2$s'' to return to emulation."
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1917
+#: src/emu/ui/ui.cpp:1914
 msgid "Master Volume"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1926
+#: src/emu/ui/ui.cpp:1923
 #, c-format
 msgid "%1$s Volume"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1949
+#: src/emu/ui/ui.cpp:1946
 #, c-format
 msgid "Overclock CPU %1$s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1968
+#: src/emu/ui/ui.cpp:1965
 #, c-format
 msgid "%1$s Refresh Rate"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1973
+#: src/emu/ui/ui.cpp:1970
 #, c-format
 msgid "%1$s Brightness"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1975
+#: src/emu/ui/ui.cpp:1972
 #, c-format
 msgid "%1$s Contrast"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1977
+#: src/emu/ui/ui.cpp:1974
 #, c-format
 msgid "%1$s Gamma"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1981
+#: src/emu/ui/ui.cpp:1978
 #, c-format
 msgid "%1$s Horiz Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1983
+#: src/emu/ui/ui.cpp:1980
 #, c-format
 msgid "%1$s Horiz Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1985
+#: src/emu/ui/ui.cpp:1982
 #, c-format
 msgid "%1$s Vert Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1987
+#: src/emu/ui/ui.cpp:1984
 #, c-format
 msgid "%1$s Vert Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2005
+#: src/emu/ui/ui.cpp:2002
 #, c-format
 msgid "Laserdisc '%1$s' Horiz Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2007
+#: src/emu/ui/ui.cpp:2004
 #, c-format
 msgid "Laserdisc '%1$s' Horiz Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2009
+#: src/emu/ui/ui.cpp:2006
 #, c-format
 msgid "Laserdisc '%1$s' Vert Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2011
+#: src/emu/ui/ui.cpp:2008
 #, c-format
 msgid "Laserdisc '%1$s' Vert Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2021
+#: src/emu/ui/ui.cpp:2018
 msgid "Vector Flicker"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2022
+#: src/emu/ui/ui.cpp:2019
 msgid "Beam Width Minimum"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2023
+#: src/emu/ui/ui.cpp:2020
 msgid "Beam Width Maximum"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2024
+#: src/emu/ui/ui.cpp:2021
 msgid "Beam Intensity Weight"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2037
+#: src/emu/ui/ui.cpp:2034
 #, c-format
 msgid "Crosshair Scale %1$s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2037 src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2034 src/emu/ui/ui.cpp:2036
 msgid "X"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2037 src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2034 src/emu/ui/ui.cpp:2036
 msgid "Y"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2036
 #, c-format
 msgid "Crosshair Offset %1$s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2071
+#: src/emu/ui/ui.cpp:2068
 #, c-format
 msgid "%1$3ddB"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2115
+#: src/emu/ui/ui.cpp:2112
 #, c-format
 msgid "%1$d%%"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2131
+#: src/emu/ui/ui.cpp:2128
 #, c-format
 msgid "%1$3.0f%%"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2154
+#: src/emu/ui/ui.cpp:2151
 #, c-format
 msgid "%1$.3ffps"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2177 src/emu/ui/ui.cpp:2199 src/emu/ui/ui.cpp:2220
-#: src/emu/ui/ui.cpp:2242 src/emu/ui/ui.cpp:2264 src/emu/ui/ui.cpp:2286
-#: src/emu/ui/ui.cpp:2308 src/emu/ui/ui.cpp:2330 src/emu/ui/ui.cpp:2352
-#: src/emu/ui/ui.cpp:2374 src/emu/ui/ui.cpp:2396
+#: src/emu/ui/ui.cpp:2174 src/emu/ui/ui.cpp:2196 src/emu/ui/ui.cpp:2217
+#: src/emu/ui/ui.cpp:2239 src/emu/ui/ui.cpp:2261 src/emu/ui/ui.cpp:2283
+#: src/emu/ui/ui.cpp:2305 src/emu/ui/ui.cpp:2327 src/emu/ui/ui.cpp:2349
+#: src/emu/ui/ui.cpp:2371 src/emu/ui/ui.cpp:2393
 #, c-format
 msgid "%1$.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2412 src/emu/ui/ui.cpp:2428 src/emu/ui/ui.cpp:2444
-#: src/emu/ui/ui.cpp:2460
+#: src/emu/ui/ui.cpp:2408 src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2438
+#: src/emu/ui/ui.cpp:2453
 #, c-format
 msgid "%1$1.2f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2476
+#: src/emu/ui/ui.cpp:2469
 #, c-format
 msgid "Screen '%1$s'"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2478
+#: src/emu/ui/ui.cpp:2471
 msgid "Screen"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2494
+#: src/emu/ui/ui.cpp:2487
 #, c-format
 msgid "Crosshair Scale X %1$1.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2494
+#: src/emu/ui/ui.cpp:2487
 #, c-format
 msgid "Crosshair Scale Y %1$1.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2513
+#: src/emu/ui/ui.cpp:2506
 #, c-format
 msgid "Crosshair Offset X %1$1.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2513
+#: src/emu/ui/ui.cpp:2506
 #, c-format
 msgid "Crosshair Offset Y %1$1.3f"
 msgstr ""
@@ -1863,10 +1879,10 @@ msgstr ""
 msgid "Full"
 msgstr ""
 
-#: src/emu/ui/viewgfx.cpp:392
+#: src/emu/ui/viewgfx.cpp:391
 msgid " COLORS"
 msgstr ""
 
-#: src/emu/ui/viewgfx.cpp:392
+#: src/emu/ui/viewgfx.cpp:391
 msgid " PENS"
 msgstr ""
diff --git a/language/Hungarian/strings.po b/language/Hungarian/strings.po
index 75ed66915bc..23384533498 100644
--- a/language/Hungarian/strings.po
+++ b/language/Hungarian/strings.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MAME\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-11 03:33+0200\n"
+"POT-Creation-Date: 2016-04-15 17:42+0200\n"
 "PO-Revision-Date: 2016-02-20 18:03+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: MAME Language Team\n"
@@ -60,14 +60,14 @@ msgstr ""
 msgid "Autofire Status"
 msgstr ""
 
-#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1698
+#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1695
 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211
 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219
 #: src/emu/ui/videoopt.cpp:223
 msgid "Disabled"
 msgstr ""
 
-#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1698
+#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1695
 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211
 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219
 #: src/emu/ui/videoopt.cpp:223
@@ -75,14 +75,14 @@ msgid "Enabled"
 msgstr ""
 
 #: src/emu/ui/cheatopt.cpp:282 src/emu/ui/cheatopt.cpp:288
-#: src/emu/ui/menu.cpp:710 src/emu/ui/miscmenu.cpp:831
-#: src/emu/ui/sndmenu.cpp:135 src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/menu.cpp:755 src/emu/ui/miscmenu.cpp:936
+#: src/emu/ui/sndmenu.cpp:133 src/emu/ui/sndmenu.cpp:135
 msgid "On"
 msgstr ""
 
 #: src/emu/ui/cheatopt.cpp:282 src/emu/ui/cheatopt.cpp:288
-#: src/emu/ui/menu.cpp:713 src/emu/ui/miscmenu.cpp:831
-#: src/emu/ui/sndmenu.cpp:135 src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/menu.cpp:758 src/emu/ui/miscmenu.cpp:936
+#: src/emu/ui/sndmenu.cpp:133 src/emu/ui/sndmenu.cpp:135
 msgid "Off"
 msgstr ""
 
@@ -94,316 +94,316 @@ msgstr ""
 msgid "Autofire Delay"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:158 src/emu/ui/custmenu.cpp:447
+#: src/emu/ui/custmenu.cpp:157 src/emu/ui/custmenu.cpp:445
 msgid "Main filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:167 src/emu/ui/custmenu.cpp:456
+#: src/emu/ui/custmenu.cpp:166 src/emu/ui/custmenu.cpp:454
 msgid "Other filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:176 src/emu/ui/optsmenu.cpp:239
+#: src/emu/ui/custmenu.cpp:175 src/emu/ui/optsmenu.cpp:238
 msgid "^!Manufacturer"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:185 src/emu/ui/custmenu.cpp:474
-#: src/emu/ui/optsmenu.cpp:247
+#: src/emu/ui/custmenu.cpp:184 src/emu/ui/custmenu.cpp:472
+#: src/emu/ui/optsmenu.cpp:246
 msgid "^!Year"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:194 src/emu/ui/custmenu.cpp:510
+#: src/emu/ui/custmenu.cpp:193 src/emu/ui/custmenu.cpp:508
 msgid "Remove last filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:197 src/emu/ui/custmenu.cpp:513
+#: src/emu/ui/custmenu.cpp:196 src/emu/ui/custmenu.cpp:511
 msgid "Add filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:212 src/emu/ui/custmenu.cpp:233
-#: src/emu/ui/custmenu.cpp:529 src/emu/ui/custmenu.cpp:550
+#: src/emu/ui/custmenu.cpp:211 src/emu/ui/custmenu.cpp:231
+#: src/emu/ui/custmenu.cpp:527 src/emu/ui/custmenu.cpp:547
 msgid "Select custom filters:"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:465
+#: src/emu/ui/custmenu.cpp:463
 msgid "^!Publisher"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:483
+#: src/emu/ui/custmenu.cpp:481
 msgid "^!Software List"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:492
+#: src/emu/ui/custmenu.cpp:490
 msgid "^!Device type"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:501
+#: src/emu/ui/custmenu.cpp:499
 msgid "^!Region"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:23
+#: src/emu/ui/custui.cpp:22
 msgid "Show All"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:24
+#: src/emu/ui/custui.cpp:23
 msgid "Hide Filters"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:25
+#: src/emu/ui/custui.cpp:24
 msgid "Hide Info/Image"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:26
+#: src/emu/ui/custui.cpp:25
 msgid "Hide Both"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:142
+#: src/emu/ui/custui.cpp:141
 msgid "Fonts"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:143
+#: src/emu/ui/custui.cpp:142
 msgid "Colors"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:148 src/emu/ui/dirmenu.cpp:33
+#: src/emu/ui/custui.cpp:147 src/emu/ui/dirmenu.cpp:33
 msgid "Language"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:152
+#: src/emu/ui/custui.cpp:151
 msgid "Show side panels"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:167 src/emu/ui/custui.cpp:188
+#: src/emu/ui/custui.cpp:166 src/emu/ui/custui.cpp:186
 msgid "Custom UI Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:246
+#: src/emu/ui/custui.cpp:244
 msgid "default"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:349
+#: src/emu/ui/custui.cpp:347
 msgid "UI Font"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:354
+#: src/emu/ui/custui.cpp:352
 msgid "Bold"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:355
+#: src/emu/ui/custui.cpp:353
 msgid "Italic"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:360
+#: src/emu/ui/custui.cpp:358
 msgid "Lines"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:366
+#: src/emu/ui/custui.cpp:364
 msgid "Infos text size"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:383
+#: src/emu/ui/custui.cpp:381
 msgid "UI Fonts Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:411
+#: src/emu/ui/custui.cpp:408
 msgid "Sample text - Lorem ipsum dolor sit amet, consectetur adipiscing elit."
 msgstr ""
 
-#: src/emu/ui/custui.cpp:509
+#: src/emu/ui/custui.cpp:506
 msgid "Normal text"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:510
+#: src/emu/ui/custui.cpp:507
 msgid "Selected color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:511
+#: src/emu/ui/custui.cpp:508
 msgid "Normal text background"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:512
+#: src/emu/ui/custui.cpp:509
 msgid "Selected background color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:513
+#: src/emu/ui/custui.cpp:510
 msgid "Subitem color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:514 src/emu/ui/custui.cpp:610
+#: src/emu/ui/custui.cpp:511 src/emu/ui/custui.cpp:606
 msgid "Clone"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:515
+#: src/emu/ui/custui.cpp:512
 msgid "Border"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:516
+#: src/emu/ui/custui.cpp:513
 msgid "Background"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:517
+#: src/emu/ui/custui.cpp:514
 msgid "Dipswitch"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:518
+#: src/emu/ui/custui.cpp:515
 msgid "Unavailable color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:519
+#: src/emu/ui/custui.cpp:516
 msgid "Slider color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:520
+#: src/emu/ui/custui.cpp:517
 msgid "Gfx viewer background"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:521
+#: src/emu/ui/custui.cpp:518
 msgid "Mouse over color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:522
+#: src/emu/ui/custui.cpp:519
 msgid "Mouse over background color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:523
+#: src/emu/ui/custui.cpp:520
 msgid "Mouse down color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:524
+#: src/emu/ui/custui.cpp:521
 msgid "Mouse down background color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:527
+#: src/emu/ui/custui.cpp:524
 msgid "Restore originals colors"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:543
+#: src/emu/ui/custui.cpp:540
 msgid "UI Colors Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:572
+#: src/emu/ui/custui.cpp:568
 #, c-format
 msgid "Double click or press %1$s to change the color value"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:598
+#: src/emu/ui/custui.cpp:594
 msgid "Menu Preview"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:606
+#: src/emu/ui/custui.cpp:602
 msgid "Normal"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:607
+#: src/emu/ui/custui.cpp:603
 msgid "Subitem"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:608
+#: src/emu/ui/custui.cpp:604
 msgid "Selected"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:609
+#: src/emu/ui/custui.cpp:605
 msgid "Mouse Over"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:841 src/emu/ui/custui.cpp:844
+#: src/emu/ui/custui.cpp:837 src/emu/ui/custui.cpp:840
 msgid "Alpha"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:849 src/emu/ui/custui.cpp:852
-#: src/emu/ui/custui.cpp:1013
+#: src/emu/ui/custui.cpp:845 src/emu/ui/custui.cpp:848
+#: src/emu/ui/custui.cpp:1007
 msgid "Red"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:857 src/emu/ui/custui.cpp:860
-#: src/emu/ui/custui.cpp:1016
+#: src/emu/ui/custui.cpp:853 src/emu/ui/custui.cpp:856
+#: src/emu/ui/custui.cpp:1010
 msgid "Green"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:865 src/emu/ui/custui.cpp:868
-#: src/emu/ui/custui.cpp:1017
+#: src/emu/ui/custui.cpp:861 src/emu/ui/custui.cpp:864
+#: src/emu/ui/custui.cpp:1011
 msgid "Blue"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:871
+#: src/emu/ui/custui.cpp:867
 msgid "Choose from palette"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:887
+#: src/emu/ui/custui.cpp:883
 msgid " - ARGB Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:912
+#: src/emu/ui/custui.cpp:907
 msgid "Color preview ="
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1009
+#: src/emu/ui/custui.cpp:1003
 msgid "White"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1010
+#: src/emu/ui/custui.cpp:1004
 msgid "Silver"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1011
+#: src/emu/ui/custui.cpp:1005
 msgid "Gray"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1012
+#: src/emu/ui/custui.cpp:1006
 msgid "Black"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1014
+#: src/emu/ui/custui.cpp:1008
 msgid "Orange"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1015
+#: src/emu/ui/custui.cpp:1009
 msgid "Yellow"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1018
+#: src/emu/ui/custui.cpp:1012
 msgid "Violet"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:65
+#: src/emu/ui/datmenu.cpp:64
 msgid "Software History"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:67
+#: src/emu/ui/datmenu.cpp:66
 msgid "Software Usage"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:199
+#: src/emu/ui/datmenu.cpp:196
 msgid "Revision: "
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:287 src/emu/ui/selgame.cpp:40
-#: src/emu/ui/selgame.cpp:2152 src/emu/ui/selgame.cpp:2161
-#: src/emu/ui/selsoft.cpp:1577 src/emu/ui/selsoft.cpp:1597
-#: src/emu/ui/selsoft.cpp:1606
+#: src/emu/ui/datmenu.cpp:284 src/emu/ui/selgame.cpp:39
+#: src/emu/ui/selgame.cpp:2158 src/emu/ui/selgame.cpp:2167
+#: src/emu/ui/selsoft.cpp:1574 src/emu/ui/selsoft.cpp:1592
+#: src/emu/ui/selsoft.cpp:1601
 msgid "History"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:289 src/emu/ui/selgame.cpp:41
+#: src/emu/ui/datmenu.cpp:286 src/emu/ui/selgame.cpp:40
 msgid "Mameinfo"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:291 src/emu/ui/selgame.cpp:43
+#: src/emu/ui/datmenu.cpp:288 src/emu/ui/selgame.cpp:42
 msgid "Messinfo"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:293 src/emu/ui/selgame.cpp:42
+#: src/emu/ui/datmenu.cpp:290 src/emu/ui/selgame.cpp:41
 msgid "Sysinfo"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:295 src/emu/ui/selgame.cpp:46
+#: src/emu/ui/datmenu.cpp:292 src/emu/ui/selgame.cpp:45
 msgid "Mamescore"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:297 src/emu/ui/selgame.cpp:45
+#: src/emu/ui/datmenu.cpp:294 src/emu/ui/selgame.cpp:44
 msgid "Gameinit"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:299 src/emu/ui/selgame.cpp:44
+#: src/emu/ui/datmenu.cpp:296 src/emu/ui/selgame.cpp:43
 msgid "Command"
 msgstr ""
 
@@ -555,75 +555,75 @@ msgstr ""
 msgid "Remove %1$s Folder"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:158
+#: src/emu/ui/filesel.cpp:161
 msgid "File Already Exists - Override?"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:160 src/emu/ui/selgame.cpp:1568
-#: src/emu/ui/selgame.cpp:1569 src/emu/ui/selgame.cpp:1570
-#: src/emu/ui/selgame.cpp:1571 src/emu/ui/selgame.cpp:1572
-#: src/emu/ui/selgame.cpp:1573 src/emu/ui/selgame.cpp:1574
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/filesel.cpp:163 src/emu/ui/selgame.cpp:1576
+#: src/emu/ui/selgame.cpp:1577 src/emu/ui/selgame.cpp:1578
+#: src/emu/ui/selgame.cpp:1579 src/emu/ui/selgame.cpp:1580
+#: src/emu/ui/selgame.cpp:1581 src/emu/ui/selgame.cpp:1582
+#: src/emu/ui/selgame.cpp:1591
 msgid "No"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:161 src/emu/ui/selgame.cpp:1568
-#: src/emu/ui/selgame.cpp:1569 src/emu/ui/selgame.cpp:1570
-#: src/emu/ui/selgame.cpp:1571 src/emu/ui/selgame.cpp:1572
-#: src/emu/ui/selgame.cpp:1573 src/emu/ui/selgame.cpp:1574
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/filesel.cpp:164 src/emu/ui/selgame.cpp:1576
+#: src/emu/ui/selgame.cpp:1577 src/emu/ui/selgame.cpp:1578
+#: src/emu/ui/selgame.cpp:1579 src/emu/ui/selgame.cpp:1580
+#: src/emu/ui/selgame.cpp:1581 src/emu/ui/selgame.cpp:1582
+#: src/emu/ui/selgame.cpp:1591
 msgid "Yes"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:272
+#: src/emu/ui/filesel.cpp:275
 msgid "New Image Name:"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:278
+#: src/emu/ui/filesel.cpp:281
 msgid "Image Format:"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:284
+#: src/emu/ui/filesel.cpp:287
 msgid "Create"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:315
+#: src/emu/ui/filesel.cpp:318
 msgid "Please enter a file extension too"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:503 src/emu/ui/swlist.cpp:65
+#: src/emu/ui/filesel.cpp:506 src/emu/ui/swlist.cpp:65
 msgid "[empty slot]"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:507
+#: src/emu/ui/filesel.cpp:510
 msgid "[create]"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:511 src/emu/ui/swlist.cpp:76
+#: src/emu/ui/filesel.cpp:514 src/emu/ui/swlist.cpp:76
 msgid "[software list]"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:803
+#: src/emu/ui/filesel.cpp:806
 msgid "Select image format"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:863
+#: src/emu/ui/filesel.cpp:866
 msgid "Select access mode"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:864
+#: src/emu/ui/filesel.cpp:867
 msgid "Read-only"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:866
+#: src/emu/ui/filesel.cpp:869
 msgid "Read-write"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:867
+#: src/emu/ui/filesel.cpp:870
 msgid "Read this image, write to another image"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:868
+#: src/emu/ui/filesel.cpp:871
 msgid "Read this image, write to diff"
 msgstr ""
 
@@ -649,7 +649,7 @@ msgstr ""
 msgid "[empty]"
 msgstr ""
 
-#: src/emu/ui/info_pty.cpp:26 src/emu/ui/mainmenu.cpp:91
+#: src/emu/ui/info_pty.cpp:26 src/emu/ui/mainmenu.cpp:96
 msgid "Pseudo terminals"
 msgstr ""
 
@@ -665,7 +665,7 @@ msgstr ""
 msgid "Other Controls"
 msgstr ""
 
-#: src/emu/ui/inputmap.cpp:622 src/emu/ui/miscmenu.cpp:91
+#: src/emu/ui/inputmap.cpp:622 src/emu/ui/miscmenu.cpp:92
 #: src/emu/ui/slotopt.cpp:172
 msgid "Reset"
 msgstr ""
@@ -698,27 +698,27 @@ msgstr ""
 msgid "Machine Information"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:78
+#: src/emu/ui/mainmenu.cpp:80
 msgid "Image Information"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:81
+#: src/emu/ui/mainmenu.cpp:83
 msgid "File Manager"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:86
+#: src/emu/ui/mainmenu.cpp:92
 msgid "Tape Control"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:94
+#: src/emu/ui/mainmenu.cpp:99
 msgid "Bios Selection"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:100
+#: src/emu/ui/mainmenu.cpp:104
 msgid "Slot Devices"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:107
+#: src/emu/ui/mainmenu.cpp:109
 msgid "Barcode Reader"
 msgstr ""
 
@@ -726,43 +726,43 @@ msgstr ""
 msgid "Network Devices"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:119
+#: src/emu/ui/mainmenu.cpp:118
 msgid "Keyboard Mode"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:122
+#: src/emu/ui/mainmenu.cpp:121
 msgid "Slider Controls"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:125
+#: src/emu/ui/mainmenu.cpp:124
 msgid "Video Options"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:129
+#: src/emu/ui/mainmenu.cpp:128
 msgid "Crosshair Options"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:133
+#: src/emu/ui/mainmenu.cpp:132
 msgid "Cheat"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:136
+#: src/emu/ui/mainmenu.cpp:135
 msgid "Plugin Options"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:140
+#: src/emu/ui/mainmenu.cpp:139
 msgid "External DAT View"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:146
+#: src/emu/ui/mainmenu.cpp:145 src/emu/ui/miscmenu.cpp:785
 msgid "Add To Favorites"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:148
+#: src/emu/ui/mainmenu.cpp:147 src/emu/ui/miscmenu.cpp:787
 msgid "Remove From Favorites"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:155
+#: src/emu/ui/mainmenu.cpp:154
 msgid "Select New Machine"
 msgstr ""
 
@@ -802,189 +802,205 @@ msgstr ""
 msgid "Return to Previous Menu"
 msgstr ""
 
-#: src/emu/ui/menu.cpp:716
+#: src/emu/ui/menu.cpp:761
 msgid "Auto"
 msgstr ""
 
-#: src/emu/ui/menu.cpp:2133
+#: src/emu/ui/menu.cpp:2195
 msgid "Images"
 msgstr ""
 
-#: src/emu/ui/menu.cpp:2134
+#: src/emu/ui/menu.cpp:2196
 msgid "Infos"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Keyboard Mode:"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Natural"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Emulated"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:240
+#: src/emu/ui/miscmenu.cpp:241
 #, c-format
 msgid ""
 "Uptime: %1$d:%2$02d:%3$02d\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:242
+#: src/emu/ui/miscmenu.cpp:243
 #, c-format
 msgid ""
 "Uptime: %1$d:%2$02d\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:246
+#: src/emu/ui/miscmenu.cpp:247
 #, c-format
 msgid ""
 "Tickets dispensed: %1$d\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:257
+#: src/emu/ui/miscmenu.cpp:258
 msgid "Coin %1$c: NA%3$s\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:257
+#: src/emu/ui/miscmenu.cpp:258
 #, c-format
 msgid "Coin %1$c: %2$d%3$s\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:260
+#: src/emu/ui/miscmenu.cpp:261
 msgid " (locked)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:519
+#: src/emu/ui/miscmenu.cpp:520
 msgid "Visible Delay"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:617
+#: src/emu/ui/miscmenu.cpp:619
 #, c-format
 msgid "%s.xml saved under ui folder."
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:645
+#: src/emu/ui/miscmenu.cpp:647
 msgid "Name:             Description:\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:657
+#: src/emu/ui/miscmenu.cpp:659
 #, c-format
 msgid "%s.txt saved under ui folder."
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:675
-msgid "Export XML format (like -listxml)"
+#: src/emu/ui/miscmenu.cpp:677
+msgid "Export list in XML format (like -listxml)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:676
-msgid "Export TXT format (like -listfull)"
+#: src/emu/ui/miscmenu.cpp:678
+msgid "Export list in XML format (like -listxml, but exclude devices)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:734
-msgid "Dummy"
+#: src/emu/ui/miscmenu.cpp:679
+msgid "Export list in TXT format (like -listfull)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:736
-msgid "Save machine configuration"
-msgstr ""
-
-#: src/emu/ui/miscmenu.cpp:848 src/emu/ui/miscmenu.cpp:869
-#: src/emu/ui/selgame.cpp:594
-msgid "Plugins"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:218
-msgid "Filter"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:226
-msgid " ^!File"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:231
-msgid " ^!Category"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:254
-msgid "^!Setup custom filter"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:262
-msgid "Customize UI"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:263
-msgid "Configure Directories"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:266 src/emu/ui/sndmenu.cpp:151
-#: src/emu/ui/sndmenu.cpp:172
-msgid "Sound Options"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:269
-msgid "General Inputs"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:272
-msgid "Save Configuration"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:286 src/emu/ui/optsmenu.cpp:307
-msgid "Settings"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:327
-msgid "**Error saving ui.ini**"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:374
-#, c-format
-msgid "**Error saving %s.ini**"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:378
+#: src/emu/ui/miscmenu.cpp:729 src/emu/ui/optsmenu.cpp:376
 msgid ""
 "\n"
 "    Configuration saved    \n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/selector.cpp:166
+#: src/emu/ui/miscmenu.cpp:774
+msgid "Bios"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:776
+msgid "Driver"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:790
+msgid "Save machine configuration"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:806
+msgid "Configure machine:"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:868 src/emu/ui/selsoft.cpp:109
+msgid " (default)"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:953 src/emu/ui/miscmenu.cpp:973
+#: src/emu/ui/selgame.cpp:600
+msgid "Plugins"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:217
+msgid "Filter"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:225
+msgid " ^!File"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:230
+msgid " ^!Category"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:253
+msgid "^!Setup custom filter"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:261
+msgid "Customize UI"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:262
+msgid "Configure Directories"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:265 src/emu/ui/sndmenu.cpp:149
+#: src/emu/ui/sndmenu.cpp:169
+msgid "Sound Options"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:268
+msgid "General Inputs"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:271
+msgid "Save Configuration"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:285 src/emu/ui/optsmenu.cpp:305
+msgid "Settings"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:325
+msgid "**Error saving ui.ini**"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:372
+#, c-format
+msgid "**Error saving %s.ini**"
+msgstr ""
+
+#: src/emu/ui/selector.cpp:165
 msgid "Selection List - Search: "
 msgstr ""
 
-#: src/emu/ui/selector.cpp:196
+#: src/emu/ui/selector.cpp:194
 #, c-format
 msgid "Double click or press %1$s to select"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:39
+#: src/emu/ui/selgame.cpp:38
 msgid "General Info"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:374 src/emu/ui/selsoft.cpp:282
+#: src/emu/ui/selgame.cpp:380 src/emu/ui/selsoft.cpp:281
 #, c-format
 msgid ""
 "%s\n"
 " added to favorites list."
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:380 src/emu/ui/selgame.cpp:389
-#: src/emu/ui/selsoft.cpp:287
+#: src/emu/ui/selgame.cpp:386 src/emu/ui/selgame.cpp:395
+#: src/emu/ui/selsoft.cpp:286
 #, c-format
 msgid ""
 "%s\n"
 " removed from favorites list."
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:450
+#: src/emu/ui/selgame.cpp:457
 msgid ""
 "The selected machine is missing one or more required ROM or CHD images. "
 "Please select a different machine.\n"
@@ -992,275 +1008,275 @@ msgid ""
 "Press any key to continue."
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:589 src/emu/ui/simpleselgame.cpp:265
+#: src/emu/ui/selgame.cpp:595 src/emu/ui/simpleselgame.cpp:265
 msgid "Configure Options"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:752
+#: src/emu/ui/selgame.cpp:596
+msgid "Configure Machine"
+msgstr ""
+
+#: src/emu/ui/selgame.cpp:758
 #, c-format
 msgid "%1$s %2$s ( %3$d / %4$d machines (%5$d BIOS) )"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:762
+#: src/emu/ui/selgame.cpp:768
 #, c-format
 msgid "%1$s (%2$s - %3$s) - "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:769 src/emu/ui/selgame.cpp:775
+#: src/emu/ui/selgame.cpp:775 src/emu/ui/selgame.cpp:781
 #, c-format
 msgid "%1$s (%2$s) - "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:784
+#: src/emu/ui/selgame.cpp:790
 #, c-format
 msgid "%1$s Search: %2$s_"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:838
+#: src/emu/ui/selgame.cpp:844
 #, c-format
 msgid "Romset: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:841 src/emu/ui/selgame.cpp:890
-#: src/emu/ui/selsoft.cpp:751 src/emu/ui/selsoft.cpp:801
+#: src/emu/ui/selgame.cpp:847 src/emu/ui/selgame.cpp:896
+#: src/emu/ui/selsoft.cpp:750 src/emu/ui/selsoft.cpp:800
 #: src/emu/ui/simpleselgame.cpp:328
 #, c-format
 msgid "%1$s, %2$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:847 src/emu/ui/selsoft.cpp:757
+#: src/emu/ui/selgame.cpp:853 src/emu/ui/selsoft.cpp:756
 #, c-format
 msgid "Driver is clone of: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:849 src/emu/ui/selsoft.cpp:759
+#: src/emu/ui/selgame.cpp:855 src/emu/ui/selsoft.cpp:758
 msgid "Driver is parent"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:853 src/emu/ui/selsoft.cpp:763
+#: src/emu/ui/selgame.cpp:859 src/emu/ui/selsoft.cpp:762
 #: src/emu/ui/simpleselgame.cpp:335
 msgid "Overall: NOT WORKING"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:855 src/emu/ui/selsoft.cpp:765
+#: src/emu/ui/selgame.cpp:861 src/emu/ui/selsoft.cpp:764
 #: src/emu/ui/simpleselgame.cpp:337
 msgid "Overall: Unemulated Protection"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:857 src/emu/ui/selsoft.cpp:767
+#: src/emu/ui/selgame.cpp:863 src/emu/ui/selsoft.cpp:766
 #: src/emu/ui/simpleselgame.cpp:339
 msgid "Overall: Working"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:861 src/emu/ui/selsoft.cpp:771
+#: src/emu/ui/selgame.cpp:867 src/emu/ui/selsoft.cpp:770
 msgid "Graphics: Imperfect, "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:863 src/emu/ui/selsoft.cpp:773
+#: src/emu/ui/selgame.cpp:869 src/emu/ui/selsoft.cpp:772
 msgid "Graphics: OK, "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:866 src/emu/ui/selsoft.cpp:776
+#: src/emu/ui/selgame.cpp:872 src/emu/ui/selsoft.cpp:775
 msgid "Sound: Unimplemented"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:868 src/emu/ui/selsoft.cpp:778
+#: src/emu/ui/selgame.cpp:874 src/emu/ui/selsoft.cpp:777
 msgid "Sound: Imperfect"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:870 src/emu/ui/selsoft.cpp:780
+#: src/emu/ui/selgame.cpp:876 src/emu/ui/selsoft.cpp:779
 msgid "Sound: OK"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:887
+#: src/emu/ui/selgame.cpp:893
 #, c-format
 msgid "System: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:894 src/emu/ui/selsoft.cpp:805
+#: src/emu/ui/selgame.cpp:900 src/emu/ui/selsoft.cpp:804
 #, c-format
 msgid "Software is clone of: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:896 src/emu/ui/selsoft.cpp:807
+#: src/emu/ui/selgame.cpp:902 src/emu/ui/selsoft.cpp:806
 msgid "Software is parent"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:901 src/emu/ui/selsoft.cpp:812
+#: src/emu/ui/selgame.cpp:907 src/emu/ui/selsoft.cpp:811
 msgid "Supported: No"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:906 src/emu/ui/selsoft.cpp:817
+#: src/emu/ui/selgame.cpp:912 src/emu/ui/selsoft.cpp:816
 msgid "Supported: Partial"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:911 src/emu/ui/selsoft.cpp:822
+#: src/emu/ui/selgame.cpp:917 src/emu/ui/selsoft.cpp:821
 msgid "Supported: Yes"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:916 src/emu/ui/selsoft.cpp:827
+#: src/emu/ui/selgame.cpp:922 src/emu/ui/selsoft.cpp:826
 #, c-format
 msgid "romset: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:923
+#: src/emu/ui/selgame.cpp:929
 #, c-format
 msgid "%1$s %2$s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1535
+#: src/emu/ui/selgame.cpp:1543
 #, c-format
 msgid "Romset: %1$-.100s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1536
+#: src/emu/ui/selgame.cpp:1544
 #, c-format
 msgid "Year: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1537
+#: src/emu/ui/selgame.cpp:1545
 #, c-format
 msgid "Manufacturer: %1$-.100s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1541
+#: src/emu/ui/selgame.cpp:1549
 #, c-format
 msgid "Driver is Clone of: %1$-.100s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1543
+#: src/emu/ui/selgame.cpp:1551
 msgid "Driver is Parent\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1546
+#: src/emu/ui/selgame.cpp:1554
 msgid "Overall: NOT WORKING\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1548
+#: src/emu/ui/selgame.cpp:1556
 msgid "Overall: Unemulated Protection\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1550
+#: src/emu/ui/selgame.cpp:1558
 msgid "Overall: Working\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1553
+#: src/emu/ui/selgame.cpp:1561
 msgid "Graphics: Imperfect Colors\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1557
+#: src/emu/ui/selgame.cpp:1565
 msgid "Graphics: Imperfect\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1559
+#: src/emu/ui/selgame.cpp:1567
 msgid "Graphics: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1562
+#: src/emu/ui/selgame.cpp:1570
 msgid "Sound: Unimplemented\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1564
+#: src/emu/ui/selgame.cpp:1572
 msgid "Sound: Imperfect\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1566
+#: src/emu/ui/selgame.cpp:1574
 msgid "Sound: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1568
+#: src/emu/ui/selgame.cpp:1576
 #, c-format
 msgid "Driver is Skeleton: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1569
+#: src/emu/ui/selgame.cpp:1577
 #, c-format
 msgid "Game is Mechanical: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1570
+#: src/emu/ui/selgame.cpp:1578
 #, c-format
 msgid "Requires Artwork: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1571
+#: src/emu/ui/selgame.cpp:1579
 #, c-format
 msgid "Requires Clickable Artwork: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1572
+#: src/emu/ui/selgame.cpp:1580
 #, c-format
 msgid "Support Cocktail: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1573
+#: src/emu/ui/selgame.cpp:1581
 #, c-format
 msgid "Driver is Bios: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1574
+#: src/emu/ui/selgame.cpp:1582
 #, c-format
 msgid "Support Save: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 #, c-format
 msgid "Screen Orientation: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 msgid "Vertical"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 msgid "Horizontal"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/selgame.cpp:1591
 #, c-format
 msgid "Requires CHD: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1596
+#: src/emu/ui/selgame.cpp:1604
 msgid "Roms Audit Pass: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1598
+#: src/emu/ui/selgame.cpp:1606
 msgid "Roms Audit Pass: BAD\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1601
+#: src/emu/ui/selgame.cpp:1609
 msgid "Samples Audit Pass: None Needed\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1603
+#: src/emu/ui/selgame.cpp:1611
 msgid "Samples Audit Pass: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1605
+#: src/emu/ui/selgame.cpp:1613
 msgid "Samples Audit Pass: BAD\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1608
+#: src/emu/ui/selgame.cpp:1616
 msgid ""
 "Roms Audit Pass: Disabled\n"
 "Samples Audit Pass: Disabled\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:2049 src/emu/ui/selgame.cpp:2212
-#: src/emu/ui/selsoft.cpp:1662
+#: src/emu/ui/selgame.cpp:2055 src/emu/ui/selgame.cpp:2216
+#: src/emu/ui/selsoft.cpp:1655
 msgid "No Infos Available"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:2162 src/emu/ui/selsoft.cpp:1607
+#: src/emu/ui/selgame.cpp:2168 src/emu/ui/selsoft.cpp:1602
 msgid "Usage"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:110
-msgid " (default)"
-msgstr ""
-
-#: src/emu/ui/selsoft.cpp:381
+#: src/emu/ui/selsoft.cpp:380
 msgid ""
 "The selected software is missing one or more required files. Please select a "
 "different software.\n"
@@ -1268,57 +1284,57 @@ msgid ""
 "Press any key to continue."
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:684
+#: src/emu/ui/selsoft.cpp:683
 #, c-format
-msgid "%1$s %2$s ( %3$d / %4$d softwares )"
+msgid "%1$s %2$s ( %3$d / %4$d software packages )"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:685
+#: src/emu/ui/selsoft.cpp:684
 #, c-format
 msgid "Driver: \"%1$s\" software list "
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:688
+#: src/emu/ui/selsoft.cpp:687
 #, c-format
 msgid "Region: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:690
+#: src/emu/ui/selsoft.cpp:689
 #, c-format
 msgid "Publisher: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:692
+#: src/emu/ui/selsoft.cpp:691
 #, c-format
 msgid "Year: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:694
+#: src/emu/ui/selsoft.cpp:693
 #, c-format
 msgid "Software List: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:696
+#: src/emu/ui/selsoft.cpp:695
 #, c-format
 msgid "Device type: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:698
+#: src/emu/ui/selsoft.cpp:697
 #, c-format
 msgid "%s Search: %s_"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:748 src/emu/ui/selsoft.cpp:798
+#: src/emu/ui/selsoft.cpp:747 src/emu/ui/selsoft.cpp:797
 #: src/emu/ui/simpleselgame.cpp:325
 #, c-format
 msgid "%1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:1998 src/emu/ui/selsoft.cpp:2018
+#: src/emu/ui/selsoft.cpp:1991 src/emu/ui/selsoft.cpp:2011
 msgid "Software part selection:"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:2136 src/emu/ui/selsoft.cpp:2156
+#: src/emu/ui/selsoft.cpp:2129 src/emu/ui/selsoft.cpp:2149
 msgid "Bios selection:"
 msgstr ""
 
@@ -1366,15 +1382,15 @@ msgstr ""
 msgid " [internal]"
 msgstr ""
 
-#: src/emu/ui/sndmenu.cpp:135
+#: src/emu/ui/sndmenu.cpp:133
 msgid "Sound"
 msgstr ""
 
-#: src/emu/ui/sndmenu.cpp:136
+#: src/emu/ui/sndmenu.cpp:134
 msgid "Sample Rate"
 msgstr ""
 
-#: src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/sndmenu.cpp:135
 msgid "Use External Samples"
 msgstr ""
 
@@ -1443,80 +1459,80 @@ msgstr ""
 msgid "Fast Forward"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:419
+#: src/emu/ui/ui.cpp:418
 msgid "This driver requires images to be loaded in the following device(s): "
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1074
+#: src/emu/ui/ui.cpp:1071
 msgid ""
 "One or more ROMs/CHDs for this machine are incorrect. The machine may not "
 "run correctly.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1087
+#: src/emu/ui/ui.cpp:1084
 msgid ""
 "There are known problems with this machine\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1091
+#: src/emu/ui/ui.cpp:1088
 msgid ""
 "One or more ROMs/CHDs for this machine have not been correctly dumped.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1095
+#: src/emu/ui/ui.cpp:1092
 #, c-format
 msgid "The keyboard emulation may not be 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1097
+#: src/emu/ui/ui.cpp:1094
 #, c-format
 msgid "The colors aren't 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1099
+#: src/emu/ui/ui.cpp:1096
 msgid "The colors are completely wrong.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1101
+#: src/emu/ui/ui.cpp:1098
 #, c-format
 msgid "The video emulation isn't 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1103
+#: src/emu/ui/ui.cpp:1100
 #, c-format
 msgid "The sound emulation isn't 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1105
+#: src/emu/ui/ui.cpp:1102
 msgid "The machine lacks sound.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1108
+#: src/emu/ui/ui.cpp:1105
 msgid "Screen flipping in cocktail mode is not supported.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1112
+#: src/emu/ui/ui.cpp:1109
 msgid "The machine requires external artwork files\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1117
+#: src/emu/ui/ui.cpp:1114
 msgid ""
 "This machine was never completed. It may exhibit strange behavior or missing "
 "elements that are not bugs in the emulation.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1122
+#: src/emu/ui/ui.cpp:1119
 msgid ""
 "This machine has no sound hardware, MAME will produce no sounds, this is "
 "expected behaviour.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1130
+#: src/emu/ui/ui.cpp:1127
 msgid "The machine has protection which isn't fully emulated.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1133
+#: src/emu/ui/ui.cpp:1130
 msgid ""
 "\n"
 "THIS MACHINE DOESN'T WORK. The emulation for this machine is not yet "
@@ -1524,7 +1540,7 @@ msgid ""
 "the developers to improve the emulation.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1137
+#: src/emu/ui/ui.cpp:1134
 msgid ""
 "\n"
 "Certain elements of this machine cannot be emulated as it requires actual "
@@ -1532,21 +1548,21 @@ msgid ""
 "to fully play this machine.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1156
+#: src/emu/ui/ui.cpp:1153
 msgid ""
 "\n"
 "\n"
 "There are working clones of this machine: "
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1170
+#: src/emu/ui/ui.cpp:1167
 msgid ""
 "\n"
 "\n"
 "Press any key to continue"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1185
+#: src/emu/ui/ui.cpp:1182
 #, c-format
 msgid ""
 "%1$s\n"
@@ -1556,98 +1572,98 @@ msgid ""
 "CPU:\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1221 src/emu/ui/ui.cpp:1260
+#: src/emu/ui/ui.cpp:1218 src/emu/ui/ui.cpp:1257
 msgid "MHz"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1221 src/emu/ui/ui.cpp:1260
+#: src/emu/ui/ui.cpp:1218 src/emu/ui/ui.cpp:1257
 msgid "kHz"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1235
+#: src/emu/ui/ui.cpp:1232
 msgid ""
 "\n"
 "Sound:\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1264
+#: src/emu/ui/ui.cpp:1261
 msgid ""
 "\n"
 "Video:\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1268
+#: src/emu/ui/ui.cpp:1265
 msgid "None\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1275
+#: src/emu/ui/ui.cpp:1272
 msgid "Vector"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1286
+#: src/emu/ui/ui.cpp:1283
 #, c-format
 msgid "%1$s: %2$s\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1286
+#: src/emu/ui/ui.cpp:1283
 msgid "%2$s\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1541 src/emu/ui/ui.cpp:1551
+#: src/emu/ui/ui.cpp:1538 src/emu/ui/ui.cpp:1548
 msgid "Keyboard Emulation Status"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1543
+#: src/emu/ui/ui.cpp:1540
 msgid "Mode: PARTIAL Emulation"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1544
+#: src/emu/ui/ui.cpp:1541
 msgid "UI:   Enabled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1546 src/emu/ui/ui.cpp:1556
+#: src/emu/ui/ui.cpp:1543 src/emu/ui/ui.cpp:1553
 msgid "**Use ScrLock to toggle**"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1553
+#: src/emu/ui/ui.cpp:1550
 msgid "Mode: FULL Emulation"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1554
+#: src/emu/ui/ui.cpp:1551
 msgid "UI:   Disabled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1692
+#: src/emu/ui/ui.cpp:1689
 msgid "Autofire can't be enabled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1731
+#: src/emu/ui/ui.cpp:1728
 msgid "Select position to save to"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1733
+#: src/emu/ui/ui.cpp:1730
 msgid "Select position to load from"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1757
+#: src/emu/ui/ui.cpp:1754
 msgid "Save cancelled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1759
+#: src/emu/ui/ui.cpp:1756
 msgid "Load cancelled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1802
+#: src/emu/ui/ui.cpp:1799
 #, c-format
 msgid "Save to position %s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1807
+#: src/emu/ui/ui.cpp:1804
 #, c-format
 msgid "Load from position %s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1847
+#: src/emu/ui/ui.cpp:1844
 #, c-format
 msgid ""
 "Are you sure you want to quit?\n"
@@ -1656,173 +1672,173 @@ msgid ""
 "Press ''%2$s'' to return to emulation."
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1917
+#: src/emu/ui/ui.cpp:1914
 msgid "Master Volume"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1926
+#: src/emu/ui/ui.cpp:1923
 #, c-format
 msgid "%1$s Volume"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1949
+#: src/emu/ui/ui.cpp:1946
 #, c-format
 msgid "Overclock CPU %1$s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1968
+#: src/emu/ui/ui.cpp:1965
 #, c-format
 msgid "%1$s Refresh Rate"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1973
+#: src/emu/ui/ui.cpp:1970
 #, c-format
 msgid "%1$s Brightness"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1975
+#: src/emu/ui/ui.cpp:1972
 #, c-format
 msgid "%1$s Contrast"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1977
+#: src/emu/ui/ui.cpp:1974
 #, c-format
 msgid "%1$s Gamma"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1981
+#: src/emu/ui/ui.cpp:1978
 #, c-format
 msgid "%1$s Horiz Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1983
+#: src/emu/ui/ui.cpp:1980
 #, c-format
 msgid "%1$s Horiz Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1985
+#: src/emu/ui/ui.cpp:1982
 #, c-format
 msgid "%1$s Vert Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1987
+#: src/emu/ui/ui.cpp:1984
 #, c-format
 msgid "%1$s Vert Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2005
+#: src/emu/ui/ui.cpp:2002
 #, c-format
 msgid "Laserdisc '%1$s' Horiz Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2007
+#: src/emu/ui/ui.cpp:2004
 #, c-format
 msgid "Laserdisc '%1$s' Horiz Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2009
+#: src/emu/ui/ui.cpp:2006
 #, c-format
 msgid "Laserdisc '%1$s' Vert Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2011
+#: src/emu/ui/ui.cpp:2008
 #, c-format
 msgid "Laserdisc '%1$s' Vert Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2021
+#: src/emu/ui/ui.cpp:2018
 msgid "Vector Flicker"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2022
+#: src/emu/ui/ui.cpp:2019
 msgid "Beam Width Minimum"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2023
+#: src/emu/ui/ui.cpp:2020
 msgid "Beam Width Maximum"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2024
+#: src/emu/ui/ui.cpp:2021
 msgid "Beam Intensity Weight"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2037
+#: src/emu/ui/ui.cpp:2034
 #, c-format
 msgid "Crosshair Scale %1$s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2037 src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2034 src/emu/ui/ui.cpp:2036
 msgid "X"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2037 src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2034 src/emu/ui/ui.cpp:2036
 msgid "Y"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2036
 #, c-format
 msgid "Crosshair Offset %1$s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2071
+#: src/emu/ui/ui.cpp:2068
 #, c-format
 msgid "%1$3ddB"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2115
+#: src/emu/ui/ui.cpp:2112
 #, c-format
 msgid "%1$d%%"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2131
+#: src/emu/ui/ui.cpp:2128
 #, c-format
 msgid "%1$3.0f%%"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2154
+#: src/emu/ui/ui.cpp:2151
 #, c-format
 msgid "%1$.3ffps"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2177 src/emu/ui/ui.cpp:2199 src/emu/ui/ui.cpp:2220
-#: src/emu/ui/ui.cpp:2242 src/emu/ui/ui.cpp:2264 src/emu/ui/ui.cpp:2286
-#: src/emu/ui/ui.cpp:2308 src/emu/ui/ui.cpp:2330 src/emu/ui/ui.cpp:2352
-#: src/emu/ui/ui.cpp:2374 src/emu/ui/ui.cpp:2396
+#: src/emu/ui/ui.cpp:2174 src/emu/ui/ui.cpp:2196 src/emu/ui/ui.cpp:2217
+#: src/emu/ui/ui.cpp:2239 src/emu/ui/ui.cpp:2261 src/emu/ui/ui.cpp:2283
+#: src/emu/ui/ui.cpp:2305 src/emu/ui/ui.cpp:2327 src/emu/ui/ui.cpp:2349
+#: src/emu/ui/ui.cpp:2371 src/emu/ui/ui.cpp:2393
 #, c-format
 msgid "%1$.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2412 src/emu/ui/ui.cpp:2428 src/emu/ui/ui.cpp:2444
-#: src/emu/ui/ui.cpp:2460
+#: src/emu/ui/ui.cpp:2408 src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2438
+#: src/emu/ui/ui.cpp:2453
 #, c-format
 msgid "%1$1.2f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2476
+#: src/emu/ui/ui.cpp:2469
 #, c-format
 msgid "Screen '%1$s'"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2478
+#: src/emu/ui/ui.cpp:2471
 msgid "Screen"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2494
+#: src/emu/ui/ui.cpp:2487
 #, c-format
 msgid "Crosshair Scale X %1$1.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2494
+#: src/emu/ui/ui.cpp:2487
 #, c-format
 msgid "Crosshair Scale Y %1$1.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2513
+#: src/emu/ui/ui.cpp:2506
 #, c-format
 msgid "Crosshair Offset X %1$1.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2513
+#: src/emu/ui/ui.cpp:2506
 #, c-format
 msgid "Crosshair Offset Y %1$1.3f"
 msgstr ""
@@ -1864,10 +1880,10 @@ msgstr ""
 msgid "Full"
 msgstr ""
 
-#: src/emu/ui/viewgfx.cpp:392
+#: src/emu/ui/viewgfx.cpp:391
 msgid " COLORS"
 msgstr ""
 
-#: src/emu/ui/viewgfx.cpp:392
+#: src/emu/ui/viewgfx.cpp:391
 msgid " PENS"
 msgstr ""
diff --git a/language/Indonesian/strings.po b/language/Indonesian/strings.po
index 0ffdd1a4431..079c23df047 100644
--- a/language/Indonesian/strings.po
+++ b/language/Indonesian/strings.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MAME\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-11 03:33+0200\n"
+"POT-Creation-Date: 2016-04-15 17:42+0200\n"
 "PO-Revision-Date: 2016-02-20 18:03+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: MAME Language Team\n"
@@ -60,14 +60,14 @@ msgstr ""
 msgid "Autofire Status"
 msgstr ""
 
-#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1698
+#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1695
 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211
 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219
 #: src/emu/ui/videoopt.cpp:223
 msgid "Disabled"
 msgstr ""
 
-#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1698
+#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1695
 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211
 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219
 #: src/emu/ui/videoopt.cpp:223
@@ -75,14 +75,14 @@ msgid "Enabled"
 msgstr ""
 
 #: src/emu/ui/cheatopt.cpp:282 src/emu/ui/cheatopt.cpp:288
-#: src/emu/ui/menu.cpp:710 src/emu/ui/miscmenu.cpp:831
-#: src/emu/ui/sndmenu.cpp:135 src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/menu.cpp:755 src/emu/ui/miscmenu.cpp:936
+#: src/emu/ui/sndmenu.cpp:133 src/emu/ui/sndmenu.cpp:135
 msgid "On"
 msgstr ""
 
 #: src/emu/ui/cheatopt.cpp:282 src/emu/ui/cheatopt.cpp:288
-#: src/emu/ui/menu.cpp:713 src/emu/ui/miscmenu.cpp:831
-#: src/emu/ui/sndmenu.cpp:135 src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/menu.cpp:758 src/emu/ui/miscmenu.cpp:936
+#: src/emu/ui/sndmenu.cpp:133 src/emu/ui/sndmenu.cpp:135
 msgid "Off"
 msgstr ""
 
@@ -94,316 +94,316 @@ msgstr ""
 msgid "Autofire Delay"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:158 src/emu/ui/custmenu.cpp:447
+#: src/emu/ui/custmenu.cpp:157 src/emu/ui/custmenu.cpp:445
 msgid "Main filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:167 src/emu/ui/custmenu.cpp:456
+#: src/emu/ui/custmenu.cpp:166 src/emu/ui/custmenu.cpp:454
 msgid "Other filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:176 src/emu/ui/optsmenu.cpp:239
+#: src/emu/ui/custmenu.cpp:175 src/emu/ui/optsmenu.cpp:238
 msgid "^!Manufacturer"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:185 src/emu/ui/custmenu.cpp:474
-#: src/emu/ui/optsmenu.cpp:247
+#: src/emu/ui/custmenu.cpp:184 src/emu/ui/custmenu.cpp:472
+#: src/emu/ui/optsmenu.cpp:246
 msgid "^!Year"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:194 src/emu/ui/custmenu.cpp:510
+#: src/emu/ui/custmenu.cpp:193 src/emu/ui/custmenu.cpp:508
 msgid "Remove last filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:197 src/emu/ui/custmenu.cpp:513
+#: src/emu/ui/custmenu.cpp:196 src/emu/ui/custmenu.cpp:511
 msgid "Add filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:212 src/emu/ui/custmenu.cpp:233
-#: src/emu/ui/custmenu.cpp:529 src/emu/ui/custmenu.cpp:550
+#: src/emu/ui/custmenu.cpp:211 src/emu/ui/custmenu.cpp:231
+#: src/emu/ui/custmenu.cpp:527 src/emu/ui/custmenu.cpp:547
 msgid "Select custom filters:"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:465
+#: src/emu/ui/custmenu.cpp:463
 msgid "^!Publisher"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:483
+#: src/emu/ui/custmenu.cpp:481
 msgid "^!Software List"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:492
+#: src/emu/ui/custmenu.cpp:490
 msgid "^!Device type"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:501
+#: src/emu/ui/custmenu.cpp:499
 msgid "^!Region"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:23
+#: src/emu/ui/custui.cpp:22
 msgid "Show All"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:24
+#: src/emu/ui/custui.cpp:23
 msgid "Hide Filters"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:25
+#: src/emu/ui/custui.cpp:24
 msgid "Hide Info/Image"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:26
+#: src/emu/ui/custui.cpp:25
 msgid "Hide Both"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:142
+#: src/emu/ui/custui.cpp:141
 msgid "Fonts"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:143
+#: src/emu/ui/custui.cpp:142
 msgid "Colors"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:148 src/emu/ui/dirmenu.cpp:33
+#: src/emu/ui/custui.cpp:147 src/emu/ui/dirmenu.cpp:33
 msgid "Language"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:152
+#: src/emu/ui/custui.cpp:151
 msgid "Show side panels"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:167 src/emu/ui/custui.cpp:188
+#: src/emu/ui/custui.cpp:166 src/emu/ui/custui.cpp:186
 msgid "Custom UI Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:246
+#: src/emu/ui/custui.cpp:244
 msgid "default"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:349
+#: src/emu/ui/custui.cpp:347
 msgid "UI Font"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:354
+#: src/emu/ui/custui.cpp:352
 msgid "Bold"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:355
+#: src/emu/ui/custui.cpp:353
 msgid "Italic"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:360
+#: src/emu/ui/custui.cpp:358
 msgid "Lines"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:366
+#: src/emu/ui/custui.cpp:364
 msgid "Infos text size"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:383
+#: src/emu/ui/custui.cpp:381
 msgid "UI Fonts Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:411
+#: src/emu/ui/custui.cpp:408
 msgid "Sample text - Lorem ipsum dolor sit amet, consectetur adipiscing elit."
 msgstr ""
 
-#: src/emu/ui/custui.cpp:509
+#: src/emu/ui/custui.cpp:506
 msgid "Normal text"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:510
+#: src/emu/ui/custui.cpp:507
 msgid "Selected color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:511
+#: src/emu/ui/custui.cpp:508
 msgid "Normal text background"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:512
+#: src/emu/ui/custui.cpp:509
 msgid "Selected background color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:513
+#: src/emu/ui/custui.cpp:510
 msgid "Subitem color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:514 src/emu/ui/custui.cpp:610
+#: src/emu/ui/custui.cpp:511 src/emu/ui/custui.cpp:606
 msgid "Clone"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:515
+#: src/emu/ui/custui.cpp:512
 msgid "Border"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:516
+#: src/emu/ui/custui.cpp:513
 msgid "Background"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:517
+#: src/emu/ui/custui.cpp:514
 msgid "Dipswitch"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:518
+#: src/emu/ui/custui.cpp:515
 msgid "Unavailable color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:519
+#: src/emu/ui/custui.cpp:516
 msgid "Slider color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:520
+#: src/emu/ui/custui.cpp:517
 msgid "Gfx viewer background"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:521
+#: src/emu/ui/custui.cpp:518
 msgid "Mouse over color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:522
+#: src/emu/ui/custui.cpp:519
 msgid "Mouse over background color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:523
+#: src/emu/ui/custui.cpp:520
 msgid "Mouse down color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:524
+#: src/emu/ui/custui.cpp:521
 msgid "Mouse down background color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:527
+#: src/emu/ui/custui.cpp:524
 msgid "Restore originals colors"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:543
+#: src/emu/ui/custui.cpp:540
 msgid "UI Colors Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:572
+#: src/emu/ui/custui.cpp:568
 #, c-format
 msgid "Double click or press %1$s to change the color value"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:598
+#: src/emu/ui/custui.cpp:594
 msgid "Menu Preview"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:606
+#: src/emu/ui/custui.cpp:602
 msgid "Normal"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:607
+#: src/emu/ui/custui.cpp:603
 msgid "Subitem"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:608
+#: src/emu/ui/custui.cpp:604
 msgid "Selected"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:609
+#: src/emu/ui/custui.cpp:605
 msgid "Mouse Over"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:841 src/emu/ui/custui.cpp:844
+#: src/emu/ui/custui.cpp:837 src/emu/ui/custui.cpp:840
 msgid "Alpha"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:849 src/emu/ui/custui.cpp:852
-#: src/emu/ui/custui.cpp:1013
+#: src/emu/ui/custui.cpp:845 src/emu/ui/custui.cpp:848
+#: src/emu/ui/custui.cpp:1007
 msgid "Red"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:857 src/emu/ui/custui.cpp:860
-#: src/emu/ui/custui.cpp:1016
+#: src/emu/ui/custui.cpp:853 src/emu/ui/custui.cpp:856
+#: src/emu/ui/custui.cpp:1010
 msgid "Green"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:865 src/emu/ui/custui.cpp:868
-#: src/emu/ui/custui.cpp:1017
+#: src/emu/ui/custui.cpp:861 src/emu/ui/custui.cpp:864
+#: src/emu/ui/custui.cpp:1011
 msgid "Blue"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:871
+#: src/emu/ui/custui.cpp:867
 msgid "Choose from palette"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:887
+#: src/emu/ui/custui.cpp:883
 msgid " - ARGB Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:912
+#: src/emu/ui/custui.cpp:907
 msgid "Color preview ="
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1009
+#: src/emu/ui/custui.cpp:1003
 msgid "White"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1010
+#: src/emu/ui/custui.cpp:1004
 msgid "Silver"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1011
+#: src/emu/ui/custui.cpp:1005
 msgid "Gray"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1012
+#: src/emu/ui/custui.cpp:1006
 msgid "Black"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1014
+#: src/emu/ui/custui.cpp:1008
 msgid "Orange"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1015
+#: src/emu/ui/custui.cpp:1009
 msgid "Yellow"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1018
+#: src/emu/ui/custui.cpp:1012
 msgid "Violet"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:65
+#: src/emu/ui/datmenu.cpp:64
 msgid "Software History"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:67
+#: src/emu/ui/datmenu.cpp:66
 msgid "Software Usage"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:199
+#: src/emu/ui/datmenu.cpp:196
 msgid "Revision: "
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:287 src/emu/ui/selgame.cpp:40
-#: src/emu/ui/selgame.cpp:2152 src/emu/ui/selgame.cpp:2161
-#: src/emu/ui/selsoft.cpp:1577 src/emu/ui/selsoft.cpp:1597
-#: src/emu/ui/selsoft.cpp:1606
+#: src/emu/ui/datmenu.cpp:284 src/emu/ui/selgame.cpp:39
+#: src/emu/ui/selgame.cpp:2158 src/emu/ui/selgame.cpp:2167
+#: src/emu/ui/selsoft.cpp:1574 src/emu/ui/selsoft.cpp:1592
+#: src/emu/ui/selsoft.cpp:1601
 msgid "History"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:289 src/emu/ui/selgame.cpp:41
+#: src/emu/ui/datmenu.cpp:286 src/emu/ui/selgame.cpp:40
 msgid "Mameinfo"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:291 src/emu/ui/selgame.cpp:43
+#: src/emu/ui/datmenu.cpp:288 src/emu/ui/selgame.cpp:42
 msgid "Messinfo"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:293 src/emu/ui/selgame.cpp:42
+#: src/emu/ui/datmenu.cpp:290 src/emu/ui/selgame.cpp:41
 msgid "Sysinfo"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:295 src/emu/ui/selgame.cpp:46
+#: src/emu/ui/datmenu.cpp:292 src/emu/ui/selgame.cpp:45
 msgid "Mamescore"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:297 src/emu/ui/selgame.cpp:45
+#: src/emu/ui/datmenu.cpp:294 src/emu/ui/selgame.cpp:44
 msgid "Gameinit"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:299 src/emu/ui/selgame.cpp:44
+#: src/emu/ui/datmenu.cpp:296 src/emu/ui/selgame.cpp:43
 msgid "Command"
 msgstr ""
 
@@ -555,75 +555,75 @@ msgstr ""
 msgid "Remove %1$s Folder"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:158
+#: src/emu/ui/filesel.cpp:161
 msgid "File Already Exists - Override?"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:160 src/emu/ui/selgame.cpp:1568
-#: src/emu/ui/selgame.cpp:1569 src/emu/ui/selgame.cpp:1570
-#: src/emu/ui/selgame.cpp:1571 src/emu/ui/selgame.cpp:1572
-#: src/emu/ui/selgame.cpp:1573 src/emu/ui/selgame.cpp:1574
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/filesel.cpp:163 src/emu/ui/selgame.cpp:1576
+#: src/emu/ui/selgame.cpp:1577 src/emu/ui/selgame.cpp:1578
+#: src/emu/ui/selgame.cpp:1579 src/emu/ui/selgame.cpp:1580
+#: src/emu/ui/selgame.cpp:1581 src/emu/ui/selgame.cpp:1582
+#: src/emu/ui/selgame.cpp:1591
 msgid "No"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:161 src/emu/ui/selgame.cpp:1568
-#: src/emu/ui/selgame.cpp:1569 src/emu/ui/selgame.cpp:1570
-#: src/emu/ui/selgame.cpp:1571 src/emu/ui/selgame.cpp:1572
-#: src/emu/ui/selgame.cpp:1573 src/emu/ui/selgame.cpp:1574
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/filesel.cpp:164 src/emu/ui/selgame.cpp:1576
+#: src/emu/ui/selgame.cpp:1577 src/emu/ui/selgame.cpp:1578
+#: src/emu/ui/selgame.cpp:1579 src/emu/ui/selgame.cpp:1580
+#: src/emu/ui/selgame.cpp:1581 src/emu/ui/selgame.cpp:1582
+#: src/emu/ui/selgame.cpp:1591
 msgid "Yes"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:272
+#: src/emu/ui/filesel.cpp:275
 msgid "New Image Name:"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:278
+#: src/emu/ui/filesel.cpp:281
 msgid "Image Format:"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:284
+#: src/emu/ui/filesel.cpp:287
 msgid "Create"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:315
+#: src/emu/ui/filesel.cpp:318
 msgid "Please enter a file extension too"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:503 src/emu/ui/swlist.cpp:65
+#: src/emu/ui/filesel.cpp:506 src/emu/ui/swlist.cpp:65
 msgid "[empty slot]"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:507
+#: src/emu/ui/filesel.cpp:510
 msgid "[create]"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:511 src/emu/ui/swlist.cpp:76
+#: src/emu/ui/filesel.cpp:514 src/emu/ui/swlist.cpp:76
 msgid "[software list]"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:803
+#: src/emu/ui/filesel.cpp:806
 msgid "Select image format"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:863
+#: src/emu/ui/filesel.cpp:866
 msgid "Select access mode"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:864
+#: src/emu/ui/filesel.cpp:867
 msgid "Read-only"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:866
+#: src/emu/ui/filesel.cpp:869
 msgid "Read-write"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:867
+#: src/emu/ui/filesel.cpp:870
 msgid "Read this image, write to another image"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:868
+#: src/emu/ui/filesel.cpp:871
 msgid "Read this image, write to diff"
 msgstr ""
 
@@ -649,7 +649,7 @@ msgstr ""
 msgid "[empty]"
 msgstr ""
 
-#: src/emu/ui/info_pty.cpp:26 src/emu/ui/mainmenu.cpp:91
+#: src/emu/ui/info_pty.cpp:26 src/emu/ui/mainmenu.cpp:96
 msgid "Pseudo terminals"
 msgstr ""
 
@@ -665,7 +665,7 @@ msgstr ""
 msgid "Other Controls"
 msgstr ""
 
-#: src/emu/ui/inputmap.cpp:622 src/emu/ui/miscmenu.cpp:91
+#: src/emu/ui/inputmap.cpp:622 src/emu/ui/miscmenu.cpp:92
 #: src/emu/ui/slotopt.cpp:172
 msgid "Reset"
 msgstr ""
@@ -698,27 +698,27 @@ msgstr ""
 msgid "Machine Information"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:78
+#: src/emu/ui/mainmenu.cpp:80
 msgid "Image Information"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:81
+#: src/emu/ui/mainmenu.cpp:83
 msgid "File Manager"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:86
+#: src/emu/ui/mainmenu.cpp:92
 msgid "Tape Control"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:94
+#: src/emu/ui/mainmenu.cpp:99
 msgid "Bios Selection"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:100
+#: src/emu/ui/mainmenu.cpp:104
 msgid "Slot Devices"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:107
+#: src/emu/ui/mainmenu.cpp:109
 msgid "Barcode Reader"
 msgstr ""
 
@@ -726,43 +726,43 @@ msgstr ""
 msgid "Network Devices"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:119
+#: src/emu/ui/mainmenu.cpp:118
 msgid "Keyboard Mode"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:122
+#: src/emu/ui/mainmenu.cpp:121
 msgid "Slider Controls"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:125
+#: src/emu/ui/mainmenu.cpp:124
 msgid "Video Options"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:129
+#: src/emu/ui/mainmenu.cpp:128
 msgid "Crosshair Options"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:133
+#: src/emu/ui/mainmenu.cpp:132
 msgid "Cheat"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:136
+#: src/emu/ui/mainmenu.cpp:135
 msgid "Plugin Options"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:140
+#: src/emu/ui/mainmenu.cpp:139
 msgid "External DAT View"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:146
+#: src/emu/ui/mainmenu.cpp:145 src/emu/ui/miscmenu.cpp:785
 msgid "Add To Favorites"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:148
+#: src/emu/ui/mainmenu.cpp:147 src/emu/ui/miscmenu.cpp:787
 msgid "Remove From Favorites"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:155
+#: src/emu/ui/mainmenu.cpp:154
 msgid "Select New Machine"
 msgstr ""
 
@@ -802,189 +802,205 @@ msgstr ""
 msgid "Return to Previous Menu"
 msgstr ""
 
-#: src/emu/ui/menu.cpp:716
+#: src/emu/ui/menu.cpp:761
 msgid "Auto"
 msgstr ""
 
-#: src/emu/ui/menu.cpp:2133
+#: src/emu/ui/menu.cpp:2195
 msgid "Images"
 msgstr ""
 
-#: src/emu/ui/menu.cpp:2134
+#: src/emu/ui/menu.cpp:2196
 msgid "Infos"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Keyboard Mode:"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Natural"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Emulated"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:240
+#: src/emu/ui/miscmenu.cpp:241
 #, c-format
 msgid ""
 "Uptime: %1$d:%2$02d:%3$02d\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:242
+#: src/emu/ui/miscmenu.cpp:243
 #, c-format
 msgid ""
 "Uptime: %1$d:%2$02d\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:246
+#: src/emu/ui/miscmenu.cpp:247
 #, c-format
 msgid ""
 "Tickets dispensed: %1$d\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:257
+#: src/emu/ui/miscmenu.cpp:258
 msgid "Coin %1$c: NA%3$s\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:257
+#: src/emu/ui/miscmenu.cpp:258
 #, c-format
 msgid "Coin %1$c: %2$d%3$s\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:260
+#: src/emu/ui/miscmenu.cpp:261
 msgid " (locked)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:519
+#: src/emu/ui/miscmenu.cpp:520
 msgid "Visible Delay"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:617
+#: src/emu/ui/miscmenu.cpp:619
 #, c-format
 msgid "%s.xml saved under ui folder."
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:645
+#: src/emu/ui/miscmenu.cpp:647
 msgid "Name:             Description:\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:657
+#: src/emu/ui/miscmenu.cpp:659
 #, c-format
 msgid "%s.txt saved under ui folder."
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:675
-msgid "Export XML format (like -listxml)"
+#: src/emu/ui/miscmenu.cpp:677
+msgid "Export list in XML format (like -listxml)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:676
-msgid "Export TXT format (like -listfull)"
+#: src/emu/ui/miscmenu.cpp:678
+msgid "Export list in XML format (like -listxml, but exclude devices)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:734
-msgid "Dummy"
+#: src/emu/ui/miscmenu.cpp:679
+msgid "Export list in TXT format (like -listfull)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:736
-msgid "Save machine configuration"
-msgstr ""
-
-#: src/emu/ui/miscmenu.cpp:848 src/emu/ui/miscmenu.cpp:869
-#: src/emu/ui/selgame.cpp:594
-msgid "Plugins"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:218
-msgid "Filter"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:226
-msgid " ^!File"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:231
-msgid " ^!Category"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:254
-msgid "^!Setup custom filter"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:262
-msgid "Customize UI"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:263
-msgid "Configure Directories"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:266 src/emu/ui/sndmenu.cpp:151
-#: src/emu/ui/sndmenu.cpp:172
-msgid "Sound Options"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:269
-msgid "General Inputs"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:272
-msgid "Save Configuration"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:286 src/emu/ui/optsmenu.cpp:307
-msgid "Settings"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:327
-msgid "**Error saving ui.ini**"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:374
-#, c-format
-msgid "**Error saving %s.ini**"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:378
+#: src/emu/ui/miscmenu.cpp:729 src/emu/ui/optsmenu.cpp:376
 msgid ""
 "\n"
 "    Configuration saved    \n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/selector.cpp:166
+#: src/emu/ui/miscmenu.cpp:774
+msgid "Bios"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:776
+msgid "Driver"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:790
+msgid "Save machine configuration"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:806
+msgid "Configure machine:"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:868 src/emu/ui/selsoft.cpp:109
+msgid " (default)"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:953 src/emu/ui/miscmenu.cpp:973
+#: src/emu/ui/selgame.cpp:600
+msgid "Plugins"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:217
+msgid "Filter"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:225
+msgid " ^!File"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:230
+msgid " ^!Category"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:253
+msgid "^!Setup custom filter"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:261
+msgid "Customize UI"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:262
+msgid "Configure Directories"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:265 src/emu/ui/sndmenu.cpp:149
+#: src/emu/ui/sndmenu.cpp:169
+msgid "Sound Options"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:268
+msgid "General Inputs"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:271
+msgid "Save Configuration"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:285 src/emu/ui/optsmenu.cpp:305
+msgid "Settings"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:325
+msgid "**Error saving ui.ini**"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:372
+#, c-format
+msgid "**Error saving %s.ini**"
+msgstr ""
+
+#: src/emu/ui/selector.cpp:165
 msgid "Selection List - Search: "
 msgstr ""
 
-#: src/emu/ui/selector.cpp:196
+#: src/emu/ui/selector.cpp:194
 #, c-format
 msgid "Double click or press %1$s to select"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:39
+#: src/emu/ui/selgame.cpp:38
 msgid "General Info"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:374 src/emu/ui/selsoft.cpp:282
+#: src/emu/ui/selgame.cpp:380 src/emu/ui/selsoft.cpp:281
 #, c-format
 msgid ""
 "%s\n"
 " added to favorites list."
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:380 src/emu/ui/selgame.cpp:389
-#: src/emu/ui/selsoft.cpp:287
+#: src/emu/ui/selgame.cpp:386 src/emu/ui/selgame.cpp:395
+#: src/emu/ui/selsoft.cpp:286
 #, c-format
 msgid ""
 "%s\n"
 " removed from favorites list."
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:450
+#: src/emu/ui/selgame.cpp:457
 msgid ""
 "The selected machine is missing one or more required ROM or CHD images. "
 "Please select a different machine.\n"
@@ -992,275 +1008,275 @@ msgid ""
 "Press any key to continue."
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:589 src/emu/ui/simpleselgame.cpp:265
+#: src/emu/ui/selgame.cpp:595 src/emu/ui/simpleselgame.cpp:265
 msgid "Configure Options"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:752
+#: src/emu/ui/selgame.cpp:596
+msgid "Configure Machine"
+msgstr ""
+
+#: src/emu/ui/selgame.cpp:758
 #, c-format
 msgid "%1$s %2$s ( %3$d / %4$d machines (%5$d BIOS) )"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:762
+#: src/emu/ui/selgame.cpp:768
 #, c-format
 msgid "%1$s (%2$s - %3$s) - "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:769 src/emu/ui/selgame.cpp:775
+#: src/emu/ui/selgame.cpp:775 src/emu/ui/selgame.cpp:781
 #, c-format
 msgid "%1$s (%2$s) - "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:784
+#: src/emu/ui/selgame.cpp:790
 #, c-format
 msgid "%1$s Search: %2$s_"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:838
+#: src/emu/ui/selgame.cpp:844
 #, c-format
 msgid "Romset: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:841 src/emu/ui/selgame.cpp:890
-#: src/emu/ui/selsoft.cpp:751 src/emu/ui/selsoft.cpp:801
+#: src/emu/ui/selgame.cpp:847 src/emu/ui/selgame.cpp:896
+#: src/emu/ui/selsoft.cpp:750 src/emu/ui/selsoft.cpp:800
 #: src/emu/ui/simpleselgame.cpp:328
 #, c-format
 msgid "%1$s, %2$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:847 src/emu/ui/selsoft.cpp:757
+#: src/emu/ui/selgame.cpp:853 src/emu/ui/selsoft.cpp:756
 #, c-format
 msgid "Driver is clone of: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:849 src/emu/ui/selsoft.cpp:759
+#: src/emu/ui/selgame.cpp:855 src/emu/ui/selsoft.cpp:758
 msgid "Driver is parent"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:853 src/emu/ui/selsoft.cpp:763
+#: src/emu/ui/selgame.cpp:859 src/emu/ui/selsoft.cpp:762
 #: src/emu/ui/simpleselgame.cpp:335
 msgid "Overall: NOT WORKING"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:855 src/emu/ui/selsoft.cpp:765
+#: src/emu/ui/selgame.cpp:861 src/emu/ui/selsoft.cpp:764
 #: src/emu/ui/simpleselgame.cpp:337
 msgid "Overall: Unemulated Protection"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:857 src/emu/ui/selsoft.cpp:767
+#: src/emu/ui/selgame.cpp:863 src/emu/ui/selsoft.cpp:766
 #: src/emu/ui/simpleselgame.cpp:339
 msgid "Overall: Working"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:861 src/emu/ui/selsoft.cpp:771
+#: src/emu/ui/selgame.cpp:867 src/emu/ui/selsoft.cpp:770
 msgid "Graphics: Imperfect, "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:863 src/emu/ui/selsoft.cpp:773
+#: src/emu/ui/selgame.cpp:869 src/emu/ui/selsoft.cpp:772
 msgid "Graphics: OK, "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:866 src/emu/ui/selsoft.cpp:776
+#: src/emu/ui/selgame.cpp:872 src/emu/ui/selsoft.cpp:775
 msgid "Sound: Unimplemented"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:868 src/emu/ui/selsoft.cpp:778
+#: src/emu/ui/selgame.cpp:874 src/emu/ui/selsoft.cpp:777
 msgid "Sound: Imperfect"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:870 src/emu/ui/selsoft.cpp:780
+#: src/emu/ui/selgame.cpp:876 src/emu/ui/selsoft.cpp:779
 msgid "Sound: OK"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:887
+#: src/emu/ui/selgame.cpp:893
 #, c-format
 msgid "System: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:894 src/emu/ui/selsoft.cpp:805
+#: src/emu/ui/selgame.cpp:900 src/emu/ui/selsoft.cpp:804
 #, c-format
 msgid "Software is clone of: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:896 src/emu/ui/selsoft.cpp:807
+#: src/emu/ui/selgame.cpp:902 src/emu/ui/selsoft.cpp:806
 msgid "Software is parent"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:901 src/emu/ui/selsoft.cpp:812
+#: src/emu/ui/selgame.cpp:907 src/emu/ui/selsoft.cpp:811
 msgid "Supported: No"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:906 src/emu/ui/selsoft.cpp:817
+#: src/emu/ui/selgame.cpp:912 src/emu/ui/selsoft.cpp:816
 msgid "Supported: Partial"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:911 src/emu/ui/selsoft.cpp:822
+#: src/emu/ui/selgame.cpp:917 src/emu/ui/selsoft.cpp:821
 msgid "Supported: Yes"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:916 src/emu/ui/selsoft.cpp:827
+#: src/emu/ui/selgame.cpp:922 src/emu/ui/selsoft.cpp:826
 #, c-format
 msgid "romset: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:923
+#: src/emu/ui/selgame.cpp:929
 #, c-format
 msgid "%1$s %2$s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1535
+#: src/emu/ui/selgame.cpp:1543
 #, c-format
 msgid "Romset: %1$-.100s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1536
+#: src/emu/ui/selgame.cpp:1544
 #, c-format
 msgid "Year: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1537
+#: src/emu/ui/selgame.cpp:1545
 #, c-format
 msgid "Manufacturer: %1$-.100s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1541
+#: src/emu/ui/selgame.cpp:1549
 #, c-format
 msgid "Driver is Clone of: %1$-.100s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1543
+#: src/emu/ui/selgame.cpp:1551
 msgid "Driver is Parent\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1546
+#: src/emu/ui/selgame.cpp:1554
 msgid "Overall: NOT WORKING\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1548
+#: src/emu/ui/selgame.cpp:1556
 msgid "Overall: Unemulated Protection\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1550
+#: src/emu/ui/selgame.cpp:1558
 msgid "Overall: Working\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1553
+#: src/emu/ui/selgame.cpp:1561
 msgid "Graphics: Imperfect Colors\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1557
+#: src/emu/ui/selgame.cpp:1565
 msgid "Graphics: Imperfect\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1559
+#: src/emu/ui/selgame.cpp:1567
 msgid "Graphics: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1562
+#: src/emu/ui/selgame.cpp:1570
 msgid "Sound: Unimplemented\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1564
+#: src/emu/ui/selgame.cpp:1572
 msgid "Sound: Imperfect\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1566
+#: src/emu/ui/selgame.cpp:1574
 msgid "Sound: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1568
+#: src/emu/ui/selgame.cpp:1576
 #, c-format
 msgid "Driver is Skeleton: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1569
+#: src/emu/ui/selgame.cpp:1577
 #, c-format
 msgid "Game is Mechanical: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1570
+#: src/emu/ui/selgame.cpp:1578
 #, c-format
 msgid "Requires Artwork: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1571
+#: src/emu/ui/selgame.cpp:1579
 #, c-format
 msgid "Requires Clickable Artwork: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1572
+#: src/emu/ui/selgame.cpp:1580
 #, c-format
 msgid "Support Cocktail: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1573
+#: src/emu/ui/selgame.cpp:1581
 #, c-format
 msgid "Driver is Bios: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1574
+#: src/emu/ui/selgame.cpp:1582
 #, c-format
 msgid "Support Save: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 #, c-format
 msgid "Screen Orientation: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 msgid "Vertical"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 msgid "Horizontal"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/selgame.cpp:1591
 #, c-format
 msgid "Requires CHD: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1596
+#: src/emu/ui/selgame.cpp:1604
 msgid "Roms Audit Pass: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1598
+#: src/emu/ui/selgame.cpp:1606
 msgid "Roms Audit Pass: BAD\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1601
+#: src/emu/ui/selgame.cpp:1609
 msgid "Samples Audit Pass: None Needed\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1603
+#: src/emu/ui/selgame.cpp:1611
 msgid "Samples Audit Pass: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1605
+#: src/emu/ui/selgame.cpp:1613
 msgid "Samples Audit Pass: BAD\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1608
+#: src/emu/ui/selgame.cpp:1616
 msgid ""
 "Roms Audit Pass: Disabled\n"
 "Samples Audit Pass: Disabled\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:2049 src/emu/ui/selgame.cpp:2212
-#: src/emu/ui/selsoft.cpp:1662
+#: src/emu/ui/selgame.cpp:2055 src/emu/ui/selgame.cpp:2216
+#: src/emu/ui/selsoft.cpp:1655
 msgid "No Infos Available"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:2162 src/emu/ui/selsoft.cpp:1607
+#: src/emu/ui/selgame.cpp:2168 src/emu/ui/selsoft.cpp:1602
 msgid "Usage"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:110
-msgid " (default)"
-msgstr ""
-
-#: src/emu/ui/selsoft.cpp:381
+#: src/emu/ui/selsoft.cpp:380
 msgid ""
 "The selected software is missing one or more required files. Please select a "
 "different software.\n"
@@ -1268,57 +1284,57 @@ msgid ""
 "Press any key to continue."
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:684
+#: src/emu/ui/selsoft.cpp:683
 #, c-format
-msgid "%1$s %2$s ( %3$d / %4$d softwares )"
+msgid "%1$s %2$s ( %3$d / %4$d software packages )"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:685
+#: src/emu/ui/selsoft.cpp:684
 #, c-format
 msgid "Driver: \"%1$s\" software list "
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:688
+#: src/emu/ui/selsoft.cpp:687
 #, c-format
 msgid "Region: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:690
+#: src/emu/ui/selsoft.cpp:689
 #, c-format
 msgid "Publisher: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:692
+#: src/emu/ui/selsoft.cpp:691
 #, c-format
 msgid "Year: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:694
+#: src/emu/ui/selsoft.cpp:693
 #, c-format
 msgid "Software List: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:696
+#: src/emu/ui/selsoft.cpp:695
 #, c-format
 msgid "Device type: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:698
+#: src/emu/ui/selsoft.cpp:697
 #, c-format
 msgid "%s Search: %s_"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:748 src/emu/ui/selsoft.cpp:798
+#: src/emu/ui/selsoft.cpp:747 src/emu/ui/selsoft.cpp:797
 #: src/emu/ui/simpleselgame.cpp:325
 #, c-format
 msgid "%1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:1998 src/emu/ui/selsoft.cpp:2018
+#: src/emu/ui/selsoft.cpp:1991 src/emu/ui/selsoft.cpp:2011
 msgid "Software part selection:"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:2136 src/emu/ui/selsoft.cpp:2156
+#: src/emu/ui/selsoft.cpp:2129 src/emu/ui/selsoft.cpp:2149
 msgid "Bios selection:"
 msgstr ""
 
@@ -1366,15 +1382,15 @@ msgstr ""
 msgid " [internal]"
 msgstr ""
 
-#: src/emu/ui/sndmenu.cpp:135
+#: src/emu/ui/sndmenu.cpp:133
 msgid "Sound"
 msgstr ""
 
-#: src/emu/ui/sndmenu.cpp:136
+#: src/emu/ui/sndmenu.cpp:134
 msgid "Sample Rate"
 msgstr ""
 
-#: src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/sndmenu.cpp:135
 msgid "Use External Samples"
 msgstr ""
 
@@ -1443,80 +1459,80 @@ msgstr ""
 msgid "Fast Forward"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:419
+#: src/emu/ui/ui.cpp:418
 msgid "This driver requires images to be loaded in the following device(s): "
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1074
+#: src/emu/ui/ui.cpp:1071
 msgid ""
 "One or more ROMs/CHDs for this machine are incorrect. The machine may not "
 "run correctly.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1087
+#: src/emu/ui/ui.cpp:1084
 msgid ""
 "There are known problems with this machine\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1091
+#: src/emu/ui/ui.cpp:1088
 msgid ""
 "One or more ROMs/CHDs for this machine have not been correctly dumped.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1095
+#: src/emu/ui/ui.cpp:1092
 #, c-format
 msgid "The keyboard emulation may not be 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1097
+#: src/emu/ui/ui.cpp:1094
 #, c-format
 msgid "The colors aren't 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1099
+#: src/emu/ui/ui.cpp:1096
 msgid "The colors are completely wrong.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1101
+#: src/emu/ui/ui.cpp:1098
 #, c-format
 msgid "The video emulation isn't 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1103
+#: src/emu/ui/ui.cpp:1100
 #, c-format
 msgid "The sound emulation isn't 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1105
+#: src/emu/ui/ui.cpp:1102
 msgid "The machine lacks sound.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1108
+#: src/emu/ui/ui.cpp:1105
 msgid "Screen flipping in cocktail mode is not supported.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1112
+#: src/emu/ui/ui.cpp:1109
 msgid "The machine requires external artwork files\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1117
+#: src/emu/ui/ui.cpp:1114
 msgid ""
 "This machine was never completed. It may exhibit strange behavior or missing "
 "elements that are not bugs in the emulation.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1122
+#: src/emu/ui/ui.cpp:1119
 msgid ""
 "This machine has no sound hardware, MAME will produce no sounds, this is "
 "expected behaviour.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1130
+#: src/emu/ui/ui.cpp:1127
 msgid "The machine has protection which isn't fully emulated.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1133
+#: src/emu/ui/ui.cpp:1130
 msgid ""
 "\n"
 "THIS MACHINE DOESN'T WORK. The emulation for this machine is not yet "
@@ -1524,7 +1540,7 @@ msgid ""
 "the developers to improve the emulation.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1137
+#: src/emu/ui/ui.cpp:1134
 msgid ""
 "\n"
 "Certain elements of this machine cannot be emulated as it requires actual "
@@ -1532,21 +1548,21 @@ msgid ""
 "to fully play this machine.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1156
+#: src/emu/ui/ui.cpp:1153
 msgid ""
 "\n"
 "\n"
 "There are working clones of this machine: "
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1170
+#: src/emu/ui/ui.cpp:1167
 msgid ""
 "\n"
 "\n"
 "Press any key to continue"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1185
+#: src/emu/ui/ui.cpp:1182
 #, c-format
 msgid ""
 "%1$s\n"
@@ -1556,98 +1572,98 @@ msgid ""
 "CPU:\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1221 src/emu/ui/ui.cpp:1260
+#: src/emu/ui/ui.cpp:1218 src/emu/ui/ui.cpp:1257
 msgid "MHz"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1221 src/emu/ui/ui.cpp:1260
+#: src/emu/ui/ui.cpp:1218 src/emu/ui/ui.cpp:1257
 msgid "kHz"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1235
+#: src/emu/ui/ui.cpp:1232
 msgid ""
 "\n"
 "Sound:\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1264
+#: src/emu/ui/ui.cpp:1261
 msgid ""
 "\n"
 "Video:\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1268
+#: src/emu/ui/ui.cpp:1265
 msgid "None\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1275
+#: src/emu/ui/ui.cpp:1272
 msgid "Vector"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1286
+#: src/emu/ui/ui.cpp:1283
 #, c-format
 msgid "%1$s: %2$s\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1286
+#: src/emu/ui/ui.cpp:1283
 msgid "%2$s\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1541 src/emu/ui/ui.cpp:1551
+#: src/emu/ui/ui.cpp:1538 src/emu/ui/ui.cpp:1548
 msgid "Keyboard Emulation Status"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1543
+#: src/emu/ui/ui.cpp:1540
 msgid "Mode: PARTIAL Emulation"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1544
+#: src/emu/ui/ui.cpp:1541
 msgid "UI:   Enabled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1546 src/emu/ui/ui.cpp:1556
+#: src/emu/ui/ui.cpp:1543 src/emu/ui/ui.cpp:1553
 msgid "**Use ScrLock to toggle**"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1553
+#: src/emu/ui/ui.cpp:1550
 msgid "Mode: FULL Emulation"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1554
+#: src/emu/ui/ui.cpp:1551
 msgid "UI:   Disabled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1692
+#: src/emu/ui/ui.cpp:1689
 msgid "Autofire can't be enabled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1731
+#: src/emu/ui/ui.cpp:1728
 msgid "Select position to save to"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1733
+#: src/emu/ui/ui.cpp:1730
 msgid "Select position to load from"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1757
+#: src/emu/ui/ui.cpp:1754
 msgid "Save cancelled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1759
+#: src/emu/ui/ui.cpp:1756
 msgid "Load cancelled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1802
+#: src/emu/ui/ui.cpp:1799
 #, c-format
 msgid "Save to position %s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1807
+#: src/emu/ui/ui.cpp:1804
 #, c-format
 msgid "Load from position %s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1847
+#: src/emu/ui/ui.cpp:1844
 #, c-format
 msgid ""
 "Are you sure you want to quit?\n"
@@ -1656,173 +1672,173 @@ msgid ""
 "Press ''%2$s'' to return to emulation."
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1917
+#: src/emu/ui/ui.cpp:1914
 msgid "Master Volume"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1926
+#: src/emu/ui/ui.cpp:1923
 #, c-format
 msgid "%1$s Volume"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1949
+#: src/emu/ui/ui.cpp:1946
 #, c-format
 msgid "Overclock CPU %1$s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1968
+#: src/emu/ui/ui.cpp:1965
 #, c-format
 msgid "%1$s Refresh Rate"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1973
+#: src/emu/ui/ui.cpp:1970
 #, c-format
 msgid "%1$s Brightness"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1975
+#: src/emu/ui/ui.cpp:1972
 #, c-format
 msgid "%1$s Contrast"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1977
+#: src/emu/ui/ui.cpp:1974
 #, c-format
 msgid "%1$s Gamma"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1981
+#: src/emu/ui/ui.cpp:1978
 #, c-format
 msgid "%1$s Horiz Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1983
+#: src/emu/ui/ui.cpp:1980
 #, c-format
 msgid "%1$s Horiz Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1985
+#: src/emu/ui/ui.cpp:1982
 #, c-format
 msgid "%1$s Vert Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1987
+#: src/emu/ui/ui.cpp:1984
 #, c-format
 msgid "%1$s Vert Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2005
+#: src/emu/ui/ui.cpp:2002
 #, c-format
 msgid "Laserdisc '%1$s' Horiz Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2007
+#: src/emu/ui/ui.cpp:2004
 #, c-format
 msgid "Laserdisc '%1$s' Horiz Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2009
+#: src/emu/ui/ui.cpp:2006
 #, c-format
 msgid "Laserdisc '%1$s' Vert Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2011
+#: src/emu/ui/ui.cpp:2008
 #, c-format
 msgid "Laserdisc '%1$s' Vert Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2021
+#: src/emu/ui/ui.cpp:2018
 msgid "Vector Flicker"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2022
+#: src/emu/ui/ui.cpp:2019
 msgid "Beam Width Minimum"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2023
+#: src/emu/ui/ui.cpp:2020
 msgid "Beam Width Maximum"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2024
+#: src/emu/ui/ui.cpp:2021
 msgid "Beam Intensity Weight"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2037
+#: src/emu/ui/ui.cpp:2034
 #, c-format
 msgid "Crosshair Scale %1$s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2037 src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2034 src/emu/ui/ui.cpp:2036
 msgid "X"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2037 src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2034 src/emu/ui/ui.cpp:2036
 msgid "Y"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2036
 #, c-format
 msgid "Crosshair Offset %1$s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2071
+#: src/emu/ui/ui.cpp:2068
 #, c-format
 msgid "%1$3ddB"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2115
+#: src/emu/ui/ui.cpp:2112
 #, c-format
 msgid "%1$d%%"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2131
+#: src/emu/ui/ui.cpp:2128
 #, c-format
 msgid "%1$3.0f%%"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2154
+#: src/emu/ui/ui.cpp:2151
 #, c-format
 msgid "%1$.3ffps"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2177 src/emu/ui/ui.cpp:2199 src/emu/ui/ui.cpp:2220
-#: src/emu/ui/ui.cpp:2242 src/emu/ui/ui.cpp:2264 src/emu/ui/ui.cpp:2286
-#: src/emu/ui/ui.cpp:2308 src/emu/ui/ui.cpp:2330 src/emu/ui/ui.cpp:2352
-#: src/emu/ui/ui.cpp:2374 src/emu/ui/ui.cpp:2396
+#: src/emu/ui/ui.cpp:2174 src/emu/ui/ui.cpp:2196 src/emu/ui/ui.cpp:2217
+#: src/emu/ui/ui.cpp:2239 src/emu/ui/ui.cpp:2261 src/emu/ui/ui.cpp:2283
+#: src/emu/ui/ui.cpp:2305 src/emu/ui/ui.cpp:2327 src/emu/ui/ui.cpp:2349
+#: src/emu/ui/ui.cpp:2371 src/emu/ui/ui.cpp:2393
 #, c-format
 msgid "%1$.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2412 src/emu/ui/ui.cpp:2428 src/emu/ui/ui.cpp:2444
-#: src/emu/ui/ui.cpp:2460
+#: src/emu/ui/ui.cpp:2408 src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2438
+#: src/emu/ui/ui.cpp:2453
 #, c-format
 msgid "%1$1.2f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2476
+#: src/emu/ui/ui.cpp:2469
 #, c-format
 msgid "Screen '%1$s'"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2478
+#: src/emu/ui/ui.cpp:2471
 msgid "Screen"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2494
+#: src/emu/ui/ui.cpp:2487
 #, c-format
 msgid "Crosshair Scale X %1$1.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2494
+#: src/emu/ui/ui.cpp:2487
 #, c-format
 msgid "Crosshair Scale Y %1$1.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2513
+#: src/emu/ui/ui.cpp:2506
 #, c-format
 msgid "Crosshair Offset X %1$1.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2513
+#: src/emu/ui/ui.cpp:2506
 #, c-format
 msgid "Crosshair Offset Y %1$1.3f"
 msgstr ""
@@ -1864,10 +1880,10 @@ msgstr ""
 msgid "Full"
 msgstr ""
 
-#: src/emu/ui/viewgfx.cpp:392
+#: src/emu/ui/viewgfx.cpp:391
 msgid " COLORS"
 msgstr ""
 
-#: src/emu/ui/viewgfx.cpp:392
+#: src/emu/ui/viewgfx.cpp:391
 msgid " PENS"
 msgstr ""
diff --git a/language/Italian/strings.po b/language/Italian/strings.po
index 406b24e78e9..0d236775895 100644
--- a/language/Italian/strings.po
+++ b/language/Italian/strings.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MAME\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-11 03:33+0200\n"
+"POT-Creation-Date: 2016-04-15 17:42+0200\n"
 "PO-Revision-Date: 2016-02-20 18:03+0100\n"
 "Last-Translator: Angelo Salese,Antonio Paradossi,Fabio Priuli\n"
 "Language-Team: MAME Language Team\n"
@@ -63,14 +63,14 @@ msgstr "Ricarica Tutto"
 msgid "Autofire Status"
 msgstr "Stato Autofire"
 
-#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1698
+#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1695
 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211
 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219
 #: src/emu/ui/videoopt.cpp:223
 msgid "Disabled"
 msgstr "Disabilitato"
 
-#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1698
+#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1695
 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211
 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219
 #: src/emu/ui/videoopt.cpp:223
@@ -78,14 +78,14 @@ msgid "Enabled"
 msgstr "Abilitato"
 
 #: src/emu/ui/cheatopt.cpp:282 src/emu/ui/cheatopt.cpp:288
-#: src/emu/ui/menu.cpp:710 src/emu/ui/miscmenu.cpp:831
-#: src/emu/ui/sndmenu.cpp:135 src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/menu.cpp:755 src/emu/ui/miscmenu.cpp:936
+#: src/emu/ui/sndmenu.cpp:133 src/emu/ui/sndmenu.cpp:135
 msgid "On"
 msgstr "Attivo"
 
 #: src/emu/ui/cheatopt.cpp:282 src/emu/ui/cheatopt.cpp:288
-#: src/emu/ui/menu.cpp:713 src/emu/ui/miscmenu.cpp:831
-#: src/emu/ui/sndmenu.cpp:135 src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/menu.cpp:758 src/emu/ui/miscmenu.cpp:936
+#: src/emu/ui/sndmenu.cpp:133 src/emu/ui/sndmenu.cpp:135
 msgid "Off"
 msgstr "Non Attivo"
 
@@ -97,317 +97,317 @@ msgstr "Nessun tasto/pulsante trovato per questa macchina!"
 msgid "Autofire Delay"
 msgstr "Ritardo Autofire"
 
-#: src/emu/ui/custmenu.cpp:158 src/emu/ui/custmenu.cpp:447
+#: src/emu/ui/custmenu.cpp:157 src/emu/ui/custmenu.cpp:445
 msgid "Main filter"
 msgstr "Filtro principale"
 
-#: src/emu/ui/custmenu.cpp:167 src/emu/ui/custmenu.cpp:456
+#: src/emu/ui/custmenu.cpp:166 src/emu/ui/custmenu.cpp:454
 msgid "Other filter"
 msgstr "Altri filtri"
 
-#: src/emu/ui/custmenu.cpp:176 src/emu/ui/optsmenu.cpp:239
+#: src/emu/ui/custmenu.cpp:175 src/emu/ui/optsmenu.cpp:238
 msgid "^!Manufacturer"
 msgstr "^!Produttore"
 
-#: src/emu/ui/custmenu.cpp:185 src/emu/ui/custmenu.cpp:474
-#: src/emu/ui/optsmenu.cpp:247
+#: src/emu/ui/custmenu.cpp:184 src/emu/ui/custmenu.cpp:472
+#: src/emu/ui/optsmenu.cpp:246
 msgid "^!Year"
 msgstr "^!Anno"
 
-#: src/emu/ui/custmenu.cpp:194 src/emu/ui/custmenu.cpp:510
+#: src/emu/ui/custmenu.cpp:193 src/emu/ui/custmenu.cpp:508
 msgid "Remove last filter"
 msgstr "Rimuovi ultimo filtro"
 
-#: src/emu/ui/custmenu.cpp:197 src/emu/ui/custmenu.cpp:513
+#: src/emu/ui/custmenu.cpp:196 src/emu/ui/custmenu.cpp:511
 msgid "Add filter"
 msgstr "Aggiungi filtro"
 
-#: src/emu/ui/custmenu.cpp:212 src/emu/ui/custmenu.cpp:233
-#: src/emu/ui/custmenu.cpp:529 src/emu/ui/custmenu.cpp:550
+#: src/emu/ui/custmenu.cpp:211 src/emu/ui/custmenu.cpp:231
+#: src/emu/ui/custmenu.cpp:527 src/emu/ui/custmenu.cpp:547
 msgid "Select custom filters:"
 msgstr "Seleziona filtro personalizzato:"
 
-#: src/emu/ui/custmenu.cpp:465
+#: src/emu/ui/custmenu.cpp:463
 msgid "^!Publisher"
 msgstr "^!Editore"
 
-#: src/emu/ui/custmenu.cpp:483
+#: src/emu/ui/custmenu.cpp:481
 msgid "^!Software List"
 msgstr "^!Lista Software"
 
-#: src/emu/ui/custmenu.cpp:492
+#: src/emu/ui/custmenu.cpp:490
 msgid "^!Device type"
 msgstr "^!Tipo Dispositivo"
 
-#: src/emu/ui/custmenu.cpp:501
+#: src/emu/ui/custmenu.cpp:499
 msgid "^!Region"
 msgstr "^!Regione"
 
-#: src/emu/ui/custui.cpp:23
+#: src/emu/ui/custui.cpp:22
 msgid "Show All"
 msgstr "Mostra Tutti"
 
-#: src/emu/ui/custui.cpp:24
+#: src/emu/ui/custui.cpp:23
 msgid "Hide Filters"
 msgstr "Nascondi Filtri"
 
-#: src/emu/ui/custui.cpp:25
+#: src/emu/ui/custui.cpp:24
 msgid "Hide Info/Image"
 msgstr "Nascondi Info/Immagine"
 
-#: src/emu/ui/custui.cpp:26
+#: src/emu/ui/custui.cpp:25
 msgid "Hide Both"
 msgstr "Nascondi Entrambi"
 
-#: src/emu/ui/custui.cpp:142
+#: src/emu/ui/custui.cpp:141
 msgid "Fonts"
 msgstr "Font"
 
-#: src/emu/ui/custui.cpp:143
+#: src/emu/ui/custui.cpp:142
 msgid "Colors"
 msgstr "Colori"
 
-#: src/emu/ui/custui.cpp:148 src/emu/ui/dirmenu.cpp:33
+#: src/emu/ui/custui.cpp:147 src/emu/ui/dirmenu.cpp:33
 msgid "Language"
 msgstr "Lingua"
 
-#: src/emu/ui/custui.cpp:152
+#: src/emu/ui/custui.cpp:151
 msgid "Show side panels"
 msgstr "Mostra pannelli laterali"
 
-#: src/emu/ui/custui.cpp:167 src/emu/ui/custui.cpp:188
+#: src/emu/ui/custui.cpp:166 src/emu/ui/custui.cpp:186
 msgid "Custom UI Settings"
 msgstr "Impostazioni UI Personalizzate"
 
-#: src/emu/ui/custui.cpp:246
+#: src/emu/ui/custui.cpp:244
 msgid "default"
 msgstr "predefinito"
 
-#: src/emu/ui/custui.cpp:349
+#: src/emu/ui/custui.cpp:347
 msgid "UI Font"
 msgstr "Font UI"
 
-#: src/emu/ui/custui.cpp:354
+#: src/emu/ui/custui.cpp:352
 msgid "Bold"
 msgstr "Grassetto"
 
-#: src/emu/ui/custui.cpp:355
+#: src/emu/ui/custui.cpp:353
 msgid "Italic"
 msgstr "Corsivo"
 
-#: src/emu/ui/custui.cpp:360
+#: src/emu/ui/custui.cpp:358
 msgid "Lines"
 msgstr "Linee"
 
-#: src/emu/ui/custui.cpp:366
+#: src/emu/ui/custui.cpp:364
 msgid "Infos text size"
 msgstr "Dimensione testo info"
 
-#: src/emu/ui/custui.cpp:383
+#: src/emu/ui/custui.cpp:381
 msgid "UI Fonts Settings"
 msgstr "Impostazioni Font UI"
 
-#: src/emu/ui/custui.cpp:411
+#: src/emu/ui/custui.cpp:408
 msgid "Sample text - Lorem ipsum dolor sit amet, consectetur adipiscing elit."
 msgstr ""
 "Testo di esempio - Lorem ipsum dolor sit amet, consectetur adipiscing elit."
 
-#: src/emu/ui/custui.cpp:509
+#: src/emu/ui/custui.cpp:506
 msgid "Normal text"
 msgstr "Testo normale"
 
-#: src/emu/ui/custui.cpp:510
+#: src/emu/ui/custui.cpp:507
 msgid "Selected color"
 msgstr "Colore selezionato"
 
-#: src/emu/ui/custui.cpp:511
+#: src/emu/ui/custui.cpp:508
 msgid "Normal text background"
 msgstr "Sfondo testo normale"
 
-#: src/emu/ui/custui.cpp:512
+#: src/emu/ui/custui.cpp:509
 msgid "Selected background color"
 msgstr "Colore sfondo selezionato"
 
-#: src/emu/ui/custui.cpp:513
+#: src/emu/ui/custui.cpp:510
 msgid "Subitem color"
 msgstr "Colore opzione menu"
 
-#: src/emu/ui/custui.cpp:514 src/emu/ui/custui.cpp:610
+#: src/emu/ui/custui.cpp:511 src/emu/ui/custui.cpp:606
 msgid "Clone"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:515
+#: src/emu/ui/custui.cpp:512
 msgid "Border"
 msgstr "Bordo"
 
-#: src/emu/ui/custui.cpp:516
+#: src/emu/ui/custui.cpp:513
 msgid "Background"
 msgstr "Sfondo"
 
-#: src/emu/ui/custui.cpp:517
+#: src/emu/ui/custui.cpp:514
 msgid "Dipswitch"
 msgstr "Dip-Switch"
 
-#: src/emu/ui/custui.cpp:518
+#: src/emu/ui/custui.cpp:515
 msgid "Unavailable color"
 msgstr "Colore non disponibile"
 
-#: src/emu/ui/custui.cpp:519
+#: src/emu/ui/custui.cpp:516
 msgid "Slider color"
 msgstr "Colore cursore"
 
-#: src/emu/ui/custui.cpp:520
+#: src/emu/ui/custui.cpp:517
 msgid "Gfx viewer background"
 msgstr "Sfondo visualizzatore Gfx"
 
-#: src/emu/ui/custui.cpp:521
+#: src/emu/ui/custui.cpp:518
 msgid "Mouse over color"
 msgstr "Colore mouse over"
 
-#: src/emu/ui/custui.cpp:522
+#: src/emu/ui/custui.cpp:519
 msgid "Mouse over background color"
 msgstr "Colore sfondo mouse over"
 
-#: src/emu/ui/custui.cpp:523
+#: src/emu/ui/custui.cpp:520
 msgid "Mouse down color"
 msgstr "Colore mouse down"
 
-#: src/emu/ui/custui.cpp:524
+#: src/emu/ui/custui.cpp:521
 msgid "Mouse down background color"
 msgstr "Colore sfondo mouse down"
 
-#: src/emu/ui/custui.cpp:527
+#: src/emu/ui/custui.cpp:524
 msgid "Restore originals colors"
 msgstr "Ripristina colori originali"
 
-#: src/emu/ui/custui.cpp:543
+#: src/emu/ui/custui.cpp:540
 msgid "UI Colors Settings"
 msgstr "Impostazione Colori UI"
 
-#: src/emu/ui/custui.cpp:572
+#: src/emu/ui/custui.cpp:568
 #, c-format
 msgid "Double click or press %1$s to change the color value"
 msgstr "Doppio click o premi %1$s per cambiare colore"
 
-#: src/emu/ui/custui.cpp:598
+#: src/emu/ui/custui.cpp:594
 msgid "Menu Preview"
 msgstr "Anteprima Menu"
 
-#: src/emu/ui/custui.cpp:606
+#: src/emu/ui/custui.cpp:602
 msgid "Normal"
 msgstr "Normale"
 
-#: src/emu/ui/custui.cpp:607
+#: src/emu/ui/custui.cpp:603
 msgid "Subitem"
 msgstr "Opzione menu"
 
-#: src/emu/ui/custui.cpp:608
+#: src/emu/ui/custui.cpp:604
 msgid "Selected"
 msgstr "Selezionato"
 
-#: src/emu/ui/custui.cpp:609
+#: src/emu/ui/custui.cpp:605
 msgid "Mouse Over"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:841 src/emu/ui/custui.cpp:844
+#: src/emu/ui/custui.cpp:837 src/emu/ui/custui.cpp:840
 msgid "Alpha"
 msgstr "Alfa"
 
-#: src/emu/ui/custui.cpp:849 src/emu/ui/custui.cpp:852
-#: src/emu/ui/custui.cpp:1013
+#: src/emu/ui/custui.cpp:845 src/emu/ui/custui.cpp:848
+#: src/emu/ui/custui.cpp:1007
 msgid "Red"
 msgstr "Rosso"
 
-#: src/emu/ui/custui.cpp:857 src/emu/ui/custui.cpp:860
-#: src/emu/ui/custui.cpp:1016
+#: src/emu/ui/custui.cpp:853 src/emu/ui/custui.cpp:856
+#: src/emu/ui/custui.cpp:1010
 msgid "Green"
 msgstr "Verde"
 
-#: src/emu/ui/custui.cpp:865 src/emu/ui/custui.cpp:868
-#: src/emu/ui/custui.cpp:1017
+#: src/emu/ui/custui.cpp:861 src/emu/ui/custui.cpp:864
+#: src/emu/ui/custui.cpp:1011
 msgid "Blue"
 msgstr "Blu"
 
-#: src/emu/ui/custui.cpp:871
+#: src/emu/ui/custui.cpp:867
 msgid "Choose from palette"
 msgstr "Seleziona dalla tavolozza"
 
-#: src/emu/ui/custui.cpp:887
+#: src/emu/ui/custui.cpp:883
 msgid " - ARGB Settings"
 msgstr " - Impostazioni ARGB"
 
-#: src/emu/ui/custui.cpp:912
+#: src/emu/ui/custui.cpp:907
 msgid "Color preview ="
 msgstr "Anteprima colore ="
 
-#: src/emu/ui/custui.cpp:1009
+#: src/emu/ui/custui.cpp:1003
 msgid "White"
 msgstr "Bianco"
 
-#: src/emu/ui/custui.cpp:1010
+#: src/emu/ui/custui.cpp:1004
 msgid "Silver"
 msgstr "Argento"
 
-#: src/emu/ui/custui.cpp:1011
+#: src/emu/ui/custui.cpp:1005
 msgid "Gray"
 msgstr "Grigio"
 
-#: src/emu/ui/custui.cpp:1012
+#: src/emu/ui/custui.cpp:1006
 msgid "Black"
 msgstr "Nero"
 
-#: src/emu/ui/custui.cpp:1014
+#: src/emu/ui/custui.cpp:1008
 msgid "Orange"
 msgstr "Arancio"
 
-#: src/emu/ui/custui.cpp:1015
+#: src/emu/ui/custui.cpp:1009
 msgid "Yellow"
 msgstr "Giallo"
 
-#: src/emu/ui/custui.cpp:1018
+#: src/emu/ui/custui.cpp:1012
 msgid "Violet"
 msgstr "Viola"
 
-#: src/emu/ui/datmenu.cpp:65
+#: src/emu/ui/datmenu.cpp:64
 msgid "Software History"
 msgstr "History Software"
 
-#: src/emu/ui/datmenu.cpp:67
+#: src/emu/ui/datmenu.cpp:66
 msgid "Software Usage"
 msgstr "Utilizzo Software"
 
-#: src/emu/ui/datmenu.cpp:199
+#: src/emu/ui/datmenu.cpp:196
 msgid "Revision: "
 msgstr "Revisione: "
 
-#: src/emu/ui/datmenu.cpp:287 src/emu/ui/selgame.cpp:40
-#: src/emu/ui/selgame.cpp:2152 src/emu/ui/selgame.cpp:2161
-#: src/emu/ui/selsoft.cpp:1577 src/emu/ui/selsoft.cpp:1597
-#: src/emu/ui/selsoft.cpp:1606
+#: src/emu/ui/datmenu.cpp:284 src/emu/ui/selgame.cpp:39
+#: src/emu/ui/selgame.cpp:2158 src/emu/ui/selgame.cpp:2167
+#: src/emu/ui/selsoft.cpp:1574 src/emu/ui/selsoft.cpp:1592
+#: src/emu/ui/selsoft.cpp:1601
 msgid "History"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:289 src/emu/ui/selgame.cpp:41
+#: src/emu/ui/datmenu.cpp:286 src/emu/ui/selgame.cpp:40
 msgid "Mameinfo"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:291 src/emu/ui/selgame.cpp:43
+#: src/emu/ui/datmenu.cpp:288 src/emu/ui/selgame.cpp:42
 msgid "Messinfo"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:293 src/emu/ui/selgame.cpp:42
+#: src/emu/ui/datmenu.cpp:290 src/emu/ui/selgame.cpp:41
 msgid "Sysinfo"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:295 src/emu/ui/selgame.cpp:46
+#: src/emu/ui/datmenu.cpp:292 src/emu/ui/selgame.cpp:45
 msgid "Mamescore"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:297 src/emu/ui/selgame.cpp:45
+#: src/emu/ui/datmenu.cpp:294 src/emu/ui/selgame.cpp:44
 msgid "Gameinit"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:299 src/emu/ui/selgame.cpp:44
+#: src/emu/ui/datmenu.cpp:296 src/emu/ui/selgame.cpp:43
 msgid "Command"
 msgstr ""
 
@@ -559,75 +559,75 @@ msgstr "Premi TAB per impostare"
 msgid "Remove %1$s Folder"
 msgstr "Rimuovi Cartella %1$sr"
 
-#: src/emu/ui/filesel.cpp:158
+#: src/emu/ui/filesel.cpp:161
 msgid "File Already Exists - Override?"
 msgstr "File Già Esistente - Sovrascrivo?"
 
-#: src/emu/ui/filesel.cpp:160 src/emu/ui/selgame.cpp:1568
-#: src/emu/ui/selgame.cpp:1569 src/emu/ui/selgame.cpp:1570
-#: src/emu/ui/selgame.cpp:1571 src/emu/ui/selgame.cpp:1572
-#: src/emu/ui/selgame.cpp:1573 src/emu/ui/selgame.cpp:1574
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/filesel.cpp:163 src/emu/ui/selgame.cpp:1576
+#: src/emu/ui/selgame.cpp:1577 src/emu/ui/selgame.cpp:1578
+#: src/emu/ui/selgame.cpp:1579 src/emu/ui/selgame.cpp:1580
+#: src/emu/ui/selgame.cpp:1581 src/emu/ui/selgame.cpp:1582
+#: src/emu/ui/selgame.cpp:1591
 msgid "No"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:161 src/emu/ui/selgame.cpp:1568
-#: src/emu/ui/selgame.cpp:1569 src/emu/ui/selgame.cpp:1570
-#: src/emu/ui/selgame.cpp:1571 src/emu/ui/selgame.cpp:1572
-#: src/emu/ui/selgame.cpp:1573 src/emu/ui/selgame.cpp:1574
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/filesel.cpp:164 src/emu/ui/selgame.cpp:1576
+#: src/emu/ui/selgame.cpp:1577 src/emu/ui/selgame.cpp:1578
+#: src/emu/ui/selgame.cpp:1579 src/emu/ui/selgame.cpp:1580
+#: src/emu/ui/selgame.cpp:1581 src/emu/ui/selgame.cpp:1582
+#: src/emu/ui/selgame.cpp:1591
 msgid "Yes"
 msgstr "Si"
 
-#: src/emu/ui/filesel.cpp:272
+#: src/emu/ui/filesel.cpp:275
 msgid "New Image Name:"
 msgstr "Nuovo Nome Immagine:"
 
-#: src/emu/ui/filesel.cpp:278
+#: src/emu/ui/filesel.cpp:281
 msgid "Image Format:"
 msgstr "Formato Immagine:"
 
-#: src/emu/ui/filesel.cpp:284
+#: src/emu/ui/filesel.cpp:287
 msgid "Create"
 msgstr "Crea"
 
-#: src/emu/ui/filesel.cpp:315
+#: src/emu/ui/filesel.cpp:318
 msgid "Please enter a file extension too"
 msgstr "Inserisci anche l'estensione"
 
-#: src/emu/ui/filesel.cpp:503 src/emu/ui/swlist.cpp:65
+#: src/emu/ui/filesel.cpp:506 src/emu/ui/swlist.cpp:65
 msgid "[empty slot]"
 msgstr "[slot vuoto]"
 
-#: src/emu/ui/filesel.cpp:507
+#: src/emu/ui/filesel.cpp:510
 msgid "[create]"
 msgstr "[crea]"
 
-#: src/emu/ui/filesel.cpp:511 src/emu/ui/swlist.cpp:76
+#: src/emu/ui/filesel.cpp:514 src/emu/ui/swlist.cpp:76
 msgid "[software list]"
 msgstr "[lista software]"
 
-#: src/emu/ui/filesel.cpp:803
+#: src/emu/ui/filesel.cpp:806
 msgid "Select image format"
 msgstr "Seleziona formato immagine"
 
-#: src/emu/ui/filesel.cpp:863
+#: src/emu/ui/filesel.cpp:866
 msgid "Select access mode"
 msgstr "Selezione modalità di accesso"
 
-#: src/emu/ui/filesel.cpp:864
+#: src/emu/ui/filesel.cpp:867
 msgid "Read-only"
 msgstr "Sola-Lettura"
 
-#: src/emu/ui/filesel.cpp:866
+#: src/emu/ui/filesel.cpp:869
 msgid "Read-write"
 msgstr "Lettura-Scrittura"
 
-#: src/emu/ui/filesel.cpp:867
+#: src/emu/ui/filesel.cpp:870
 msgid "Read this image, write to another image"
 msgstr "Leggi da questo file, scrivi su un altro"
 
-#: src/emu/ui/filesel.cpp:868
+#: src/emu/ui/filesel.cpp:871
 msgid "Read this image, write to diff"
 msgstr "Leggi da questo file, scrivi su diff"
 
@@ -655,7 +655,7 @@ msgstr ""
 msgid "[empty]"
 msgstr "[vuoto]"
 
-#: src/emu/ui/info_pty.cpp:26 src/emu/ui/mainmenu.cpp:91
+#: src/emu/ui/info_pty.cpp:26 src/emu/ui/mainmenu.cpp:96
 msgid "Pseudo terminals"
 msgstr "Pseudo terminali"
 
@@ -671,7 +671,7 @@ msgstr "Interfaccia Utente"
 msgid "Other Controls"
 msgstr "Altri Controlli"
 
-#: src/emu/ui/inputmap.cpp:622 src/emu/ui/miscmenu.cpp:91
+#: src/emu/ui/inputmap.cpp:622 src/emu/ui/miscmenu.cpp:92
 #: src/emu/ui/slotopt.cpp:172
 msgid "Reset"
 msgstr "Azzera"
@@ -704,27 +704,27 @@ msgstr "Info Crediti e Tempi d'Utilizzo"
 msgid "Machine Information"
 msgstr "Informazioni Macchina"
 
-#: src/emu/ui/mainmenu.cpp:78
+#: src/emu/ui/mainmenu.cpp:80
 msgid "Image Information"
 msgstr "Informazioni Software"
 
-#: src/emu/ui/mainmenu.cpp:81
+#: src/emu/ui/mainmenu.cpp:83
 msgid "File Manager"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:86
+#: src/emu/ui/mainmenu.cpp:92
 msgid "Tape Control"
 msgstr "Controllo Cassetta"
 
-#: src/emu/ui/mainmenu.cpp:94
+#: src/emu/ui/mainmenu.cpp:99
 msgid "Bios Selection"
 msgstr "Selezione BIOS"
 
-#: src/emu/ui/mainmenu.cpp:100
+#: src/emu/ui/mainmenu.cpp:104
 msgid "Slot Devices"
 msgstr "Slot"
 
-#: src/emu/ui/mainmenu.cpp:107
+#: src/emu/ui/mainmenu.cpp:109
 msgid "Barcode Reader"
 msgstr "Lettore Codice a Barre"
 
@@ -732,43 +732,43 @@ msgstr "Lettore Codice a Barre"
 msgid "Network Devices"
 msgstr "Dispositivi di Rete"
 
-#: src/emu/ui/mainmenu.cpp:119
+#: src/emu/ui/mainmenu.cpp:118
 msgid "Keyboard Mode"
 msgstr "Modalità Tastiera"
 
-#: src/emu/ui/mainmenu.cpp:122
+#: src/emu/ui/mainmenu.cpp:121
 msgid "Slider Controls"
 msgstr "Regolazione Cursori"
 
-#: src/emu/ui/mainmenu.cpp:125
+#: src/emu/ui/mainmenu.cpp:124
 msgid "Video Options"
 msgstr "Opzioni Video"
 
-#: src/emu/ui/mainmenu.cpp:129
+#: src/emu/ui/mainmenu.cpp:128
 msgid "Crosshair Options"
 msgstr "Opzioni Puntamento"
 
-#: src/emu/ui/mainmenu.cpp:133
+#: src/emu/ui/mainmenu.cpp:132
 msgid "Cheat"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:136
+#: src/emu/ui/mainmenu.cpp:135
 msgid "Plugin Options"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:140
+#: src/emu/ui/mainmenu.cpp:139
 msgid "External DAT View"
 msgstr "Visualizza DAT Aggiuntivi"
 
-#: src/emu/ui/mainmenu.cpp:146
+#: src/emu/ui/mainmenu.cpp:145 src/emu/ui/miscmenu.cpp:785
 msgid "Add To Favorites"
 msgstr "Aggiungi ai Preferiti"
 
-#: src/emu/ui/mainmenu.cpp:148
+#: src/emu/ui/mainmenu.cpp:147 src/emu/ui/miscmenu.cpp:787
 msgid "Remove From Favorites"
 msgstr "Rimuovi dai Preferiti"
 
-#: src/emu/ui/mainmenu.cpp:155
+#: src/emu/ui/mainmenu.cpp:154
 msgid "Select New Machine"
 msgstr "Seleziona Nuova Macchina"
 
@@ -808,31 +808,31 @@ msgstr "Esci"
 msgid "Return to Previous Menu"
 msgstr "Torna al Menu Precedente"
 
-#: src/emu/ui/menu.cpp:716
+#: src/emu/ui/menu.cpp:761
 msgid "Auto"
 msgstr ""
 
-#: src/emu/ui/menu.cpp:2133
+#: src/emu/ui/menu.cpp:2195
 msgid "Images"
 msgstr "Immagini"
 
-#: src/emu/ui/menu.cpp:2134
+#: src/emu/ui/menu.cpp:2196
 msgid "Infos"
 msgstr "Informazioni"
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Keyboard Mode:"
 msgstr "Modalità Tastiera:"
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Natural"
 msgstr "Naturale"
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Emulated"
 msgstr "Emulata"
 
-#: src/emu/ui/miscmenu.cpp:240
+#: src/emu/ui/miscmenu.cpp:241
 #, c-format
 msgid ""
 "Uptime: %1$d:%2$02d:%3$02d\n"
@@ -841,7 +841,7 @@ msgstr ""
 "Tempo di utilizzo: %1$d:%2$02d:%3$02d\n"
 "\n"
 
-#: src/emu/ui/miscmenu.cpp:242
+#: src/emu/ui/miscmenu.cpp:243
 #, c-format
 msgid ""
 "Uptime: %1$d:%2$02d\n"
@@ -850,7 +850,7 @@ msgstr ""
 "Tempo di utilizzo: %1$d:%2$02d\n"
 "\n"
 
-#: src/emu/ui/miscmenu.cpp:246
+#: src/emu/ui/miscmenu.cpp:247
 #, c-format
 msgid ""
 "Tickets dispensed: %1$d\n"
@@ -859,109 +859,50 @@ msgstr ""
 "Biglietti emessi: %1$d\n"
 "\n"
 
-#: src/emu/ui/miscmenu.cpp:257
+#: src/emu/ui/miscmenu.cpp:258
 msgid "Coin %1$c: NA%3$s\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:257
+#: src/emu/ui/miscmenu.cpp:258
 #, c-format
 msgid "Coin %1$c: %2$d%3$s\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:260
+#: src/emu/ui/miscmenu.cpp:261
 msgid " (locked)"
 msgstr " (bloccati)"
 
-#: src/emu/ui/miscmenu.cpp:519
+#: src/emu/ui/miscmenu.cpp:520
 msgid "Visible Delay"
 msgstr "Ritardo Visibilità"
 
-#: src/emu/ui/miscmenu.cpp:617
+#: src/emu/ui/miscmenu.cpp:619
 #, c-format
 msgid "%s.xml saved under ui folder."
 msgstr "%s.xml salvato nella cartella UI."
 
-#: src/emu/ui/miscmenu.cpp:645
+#: src/emu/ui/miscmenu.cpp:647
 msgid "Name:             Description:\n"
 msgstr "Nome:             Descrizione:\n"
 
-#: src/emu/ui/miscmenu.cpp:657
+#: src/emu/ui/miscmenu.cpp:659
 #, c-format
 msgid "%s.txt saved under ui folder."
 msgstr "%s.txt salvato nella cartella UI."
 
-#: src/emu/ui/miscmenu.cpp:675
-msgid "Export XML format (like -listxml)"
-msgstr "Esporta in formato XML (come -listxml)"
-
-#: src/emu/ui/miscmenu.cpp:676
-msgid "Export TXT format (like -listfull)"
-msgstr "Esporta in formato TXT (come -listfull)"
-
-#: src/emu/ui/miscmenu.cpp:734
-msgid "Dummy"
-msgstr "Fittizio"
-
-#: src/emu/ui/miscmenu.cpp:736
-msgid "Save machine configuration"
+#: src/emu/ui/miscmenu.cpp:677
+msgid "Export list in XML format (like -listxml)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:848 src/emu/ui/miscmenu.cpp:869
-#: src/emu/ui/selgame.cpp:594
-msgid "Plugins"
-msgstr "Plugin"
-
-#: src/emu/ui/optsmenu.cpp:218
-msgid "Filter"
-msgstr "Filtri"
-
-#: src/emu/ui/optsmenu.cpp:226
-msgid " ^!File"
+#: src/emu/ui/miscmenu.cpp:678
+msgid "Export list in XML format (like -listxml, but exclude devices)"
 msgstr ""
 
-#: src/emu/ui/optsmenu.cpp:231
-msgid " ^!Category"
-msgstr " ^!Categoria"
+#: src/emu/ui/miscmenu.cpp:679
+msgid "Export list in TXT format (like -listfull)"
+msgstr ""
 
-#: src/emu/ui/optsmenu.cpp:254
-msgid "^!Setup custom filter"
-msgstr "^!Configura filtri personali"
-
-#: src/emu/ui/optsmenu.cpp:262
-msgid "Customize UI"
-msgstr "Personalizza UI"
-
-#: src/emu/ui/optsmenu.cpp:263
-msgid "Configure Directories"
-msgstr "Configura Cartelle"
-
-#: src/emu/ui/optsmenu.cpp:266 src/emu/ui/sndmenu.cpp:151
-#: src/emu/ui/sndmenu.cpp:172
-msgid "Sound Options"
-msgstr "Opzioni Audio"
-
-#: src/emu/ui/optsmenu.cpp:269
-msgid "General Inputs"
-msgstr "Input Generali"
-
-#: src/emu/ui/optsmenu.cpp:272
-msgid "Save Configuration"
-msgstr "Salva Configurazione"
-
-#: src/emu/ui/optsmenu.cpp:286 src/emu/ui/optsmenu.cpp:307
-msgid "Settings"
-msgstr "Impostazioni"
-
-#: src/emu/ui/optsmenu.cpp:327
-msgid "**Error saving ui.ini**"
-msgstr "**Errore nel salvataggio del file ui.ini**"
-
-#: src/emu/ui/optsmenu.cpp:374
-#, c-format
-msgid "**Error saving %s.ini**"
-msgstr "**Errore nel salvataggio del file %s.ini**"
-
-#: src/emu/ui/optsmenu.cpp:378
+#: src/emu/ui/miscmenu.cpp:729 src/emu/ui/optsmenu.cpp:376
 msgid ""
 "\n"
 "    Configuration saved    \n"
@@ -971,20 +912,95 @@ msgstr ""
 "  Configurazione salvata   \n"
 "\n"
 
-#: src/emu/ui/selector.cpp:166
+#: src/emu/ui/miscmenu.cpp:774
+msgid "Bios"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:776
+msgid "Driver"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:790
+msgid "Save machine configuration"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:806
+msgid "Configure machine:"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:868 src/emu/ui/selsoft.cpp:109
+msgid " (default)"
+msgstr " (predefinito)"
+
+#: src/emu/ui/miscmenu.cpp:953 src/emu/ui/miscmenu.cpp:973
+#: src/emu/ui/selgame.cpp:600
+msgid "Plugins"
+msgstr "Plugin"
+
+#: src/emu/ui/optsmenu.cpp:217
+msgid "Filter"
+msgstr "Filtri"
+
+#: src/emu/ui/optsmenu.cpp:225
+msgid " ^!File"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:230
+msgid " ^!Category"
+msgstr " ^!Categoria"
+
+#: src/emu/ui/optsmenu.cpp:253
+msgid "^!Setup custom filter"
+msgstr "^!Configura filtri personali"
+
+#: src/emu/ui/optsmenu.cpp:261
+msgid "Customize UI"
+msgstr "Personalizza UI"
+
+#: src/emu/ui/optsmenu.cpp:262
+msgid "Configure Directories"
+msgstr "Configura Cartelle"
+
+#: src/emu/ui/optsmenu.cpp:265 src/emu/ui/sndmenu.cpp:149
+#: src/emu/ui/sndmenu.cpp:169
+msgid "Sound Options"
+msgstr "Opzioni Audio"
+
+#: src/emu/ui/optsmenu.cpp:268
+msgid "General Inputs"
+msgstr "Input Generali"
+
+#: src/emu/ui/optsmenu.cpp:271
+msgid "Save Configuration"
+msgstr "Salva Configurazione"
+
+#: src/emu/ui/optsmenu.cpp:285 src/emu/ui/optsmenu.cpp:305
+msgid "Settings"
+msgstr "Impostazioni"
+
+#: src/emu/ui/optsmenu.cpp:325
+msgid "**Error saving ui.ini**"
+msgstr "**Errore nel salvataggio del file ui.ini**"
+
+#: src/emu/ui/optsmenu.cpp:372
+#, c-format
+msgid "**Error saving %s.ini**"
+msgstr "**Errore nel salvataggio del file %s.ini**"
+
+#: src/emu/ui/selector.cpp:165
 msgid "Selection List - Search: "
 msgstr "Lista Selezione - Cerca: "
 
-#: src/emu/ui/selector.cpp:196
+#: src/emu/ui/selector.cpp:194
 #, c-format
 msgid "Double click or press %1$s to select"
 msgstr "Doppio click o premi %1$s per selezionare"
 
-#: src/emu/ui/selgame.cpp:39
+#: src/emu/ui/selgame.cpp:38
 msgid "General Info"
 msgstr "Informazioni Generali"
 
-#: src/emu/ui/selgame.cpp:374 src/emu/ui/selsoft.cpp:282
+#: src/emu/ui/selgame.cpp:380 src/emu/ui/selsoft.cpp:281
 #, c-format
 msgid ""
 "%s\n"
@@ -993,8 +1009,8 @@ msgstr ""
 "%s\n"
 " aggiunto ai preferiti."
 
-#: src/emu/ui/selgame.cpp:380 src/emu/ui/selgame.cpp:389
-#: src/emu/ui/selsoft.cpp:287
+#: src/emu/ui/selgame.cpp:386 src/emu/ui/selgame.cpp:395
+#: src/emu/ui/selsoft.cpp:286
 #, c-format
 msgid ""
 "%s\n"
@@ -1003,7 +1019,7 @@ msgstr ""
 "%s\n"
 " rimosso dai preferiti."
 
-#: src/emu/ui/selgame.cpp:450
+#: src/emu/ui/selgame.cpp:457
 msgid ""
 "The selected machine is missing one or more required ROM or CHD images. "
 "Please select a different machine.\n"
@@ -1011,256 +1027,260 @@ msgid ""
 "Press any key to continue."
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:589 src/emu/ui/simpleselgame.cpp:265
+#: src/emu/ui/selgame.cpp:595 src/emu/ui/simpleselgame.cpp:265
 msgid "Configure Options"
 msgstr "Configura Opzioni"
 
-#: src/emu/ui/selgame.cpp:752
+#: src/emu/ui/selgame.cpp:596
+msgid "Configure Machine"
+msgstr ""
+
+#: src/emu/ui/selgame.cpp:758
 #, c-format
 msgid "%1$s %2$s ( %3$d / %4$d machines (%5$d BIOS) )"
 msgstr "%1$s %2$s ( %3$d / %4$d macchine (%5$d BIOS) )"
 
-#: src/emu/ui/selgame.cpp:762
+#: src/emu/ui/selgame.cpp:768
 #, c-format
 msgid "%1$s (%2$s - %3$s) - "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:769 src/emu/ui/selgame.cpp:775
+#: src/emu/ui/selgame.cpp:775 src/emu/ui/selgame.cpp:781
 #, c-format
 msgid "%1$s (%2$s) - "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:784
+#: src/emu/ui/selgame.cpp:790
 #, c-format
 msgid "%1$s Search: %2$s_"
 msgstr "%1$s Cerca: %2$s_"
 
-#: src/emu/ui/selgame.cpp:838
+#: src/emu/ui/selgame.cpp:844
 #, c-format
 msgid "Romset: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:841 src/emu/ui/selgame.cpp:890
-#: src/emu/ui/selsoft.cpp:751 src/emu/ui/selsoft.cpp:801
+#: src/emu/ui/selgame.cpp:847 src/emu/ui/selgame.cpp:896
+#: src/emu/ui/selsoft.cpp:750 src/emu/ui/selsoft.cpp:800
 #: src/emu/ui/simpleselgame.cpp:328
 #, c-format
 msgid "%1$s, %2$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:847 src/emu/ui/selsoft.cpp:757
+#: src/emu/ui/selgame.cpp:853 src/emu/ui/selsoft.cpp:756
 #, c-format
 msgid "Driver is clone of: %1$-.100s"
 msgstr "Il Driver è un clone di: %-.100s"
 
-#: src/emu/ui/selgame.cpp:849 src/emu/ui/selsoft.cpp:759
+#: src/emu/ui/selgame.cpp:855 src/emu/ui/selsoft.cpp:758
 msgid "Driver is parent"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:853 src/emu/ui/selsoft.cpp:763
+#: src/emu/ui/selgame.cpp:859 src/emu/ui/selsoft.cpp:762
 #: src/emu/ui/simpleselgame.cpp:335
 msgid "Overall: NOT WORKING"
 msgstr "Complessivamente: NON FUNZIONANTE"
 
-#: src/emu/ui/selgame.cpp:855 src/emu/ui/selsoft.cpp:765
+#: src/emu/ui/selgame.cpp:861 src/emu/ui/selsoft.cpp:764
 #: src/emu/ui/simpleselgame.cpp:337
 msgid "Overall: Unemulated Protection"
 msgstr "Complessivamente: Protezione Non Emulata"
 
-#: src/emu/ui/selgame.cpp:857 src/emu/ui/selsoft.cpp:767
+#: src/emu/ui/selgame.cpp:863 src/emu/ui/selsoft.cpp:766
 #: src/emu/ui/simpleselgame.cpp:339
 msgid "Overall: Working"
 msgstr "Complessivamente: Funzionante"
 
-#: src/emu/ui/selgame.cpp:861 src/emu/ui/selsoft.cpp:771
+#: src/emu/ui/selgame.cpp:867 src/emu/ui/selsoft.cpp:770
 msgid "Graphics: Imperfect, "
 msgstr "Grafica: Non Perfetta, "
 
-#: src/emu/ui/selgame.cpp:863 src/emu/ui/selsoft.cpp:773
+#: src/emu/ui/selgame.cpp:869 src/emu/ui/selsoft.cpp:772
 msgid "Graphics: OK, "
 msgstr "Grafica: OK, "
 
-#: src/emu/ui/selgame.cpp:866 src/emu/ui/selsoft.cpp:776
+#: src/emu/ui/selgame.cpp:872 src/emu/ui/selsoft.cpp:775
 msgid "Sound: Unimplemented"
 msgstr "Audio: Non Implementato"
 
-#: src/emu/ui/selgame.cpp:868 src/emu/ui/selsoft.cpp:778
+#: src/emu/ui/selgame.cpp:874 src/emu/ui/selsoft.cpp:777
 msgid "Sound: Imperfect"
 msgstr "Audio: Non Perfetto"
 
-#: src/emu/ui/selgame.cpp:870 src/emu/ui/selsoft.cpp:780
+#: src/emu/ui/selgame.cpp:876 src/emu/ui/selsoft.cpp:779
 msgid "Sound: OK"
 msgstr "Audio: OK"
 
-#: src/emu/ui/selgame.cpp:887
+#: src/emu/ui/selgame.cpp:893
 #, c-format
 msgid "System: %1$-.100s"
 msgstr "Sistema: %1$-.100s"
 
-#: src/emu/ui/selgame.cpp:894 src/emu/ui/selsoft.cpp:805
+#: src/emu/ui/selgame.cpp:900 src/emu/ui/selsoft.cpp:804
 #, c-format
 msgid "Software is clone of: %1$-.100s"
 msgstr "Il software è clone di: %1$-.100s"
 
-#: src/emu/ui/selgame.cpp:896 src/emu/ui/selsoft.cpp:807
+#: src/emu/ui/selgame.cpp:902 src/emu/ui/selsoft.cpp:806
 msgid "Software is parent"
 msgstr "Il software è parent"
 
-#: src/emu/ui/selgame.cpp:901 src/emu/ui/selsoft.cpp:812
+#: src/emu/ui/selgame.cpp:907 src/emu/ui/selsoft.cpp:811
 msgid "Supported: No"
 msgstr "Supportato: No"
 
-#: src/emu/ui/selgame.cpp:906 src/emu/ui/selsoft.cpp:817
+#: src/emu/ui/selgame.cpp:912 src/emu/ui/selsoft.cpp:816
 msgid "Supported: Partial"
 msgstr "Supportato: Parzialmente"
 
-#: src/emu/ui/selgame.cpp:911 src/emu/ui/selsoft.cpp:822
+#: src/emu/ui/selgame.cpp:917 src/emu/ui/selsoft.cpp:821
 msgid "Supported: Yes"
 msgstr "Supportato: Si"
 
-#: src/emu/ui/selgame.cpp:916 src/emu/ui/selsoft.cpp:827
+#: src/emu/ui/selgame.cpp:922 src/emu/ui/selsoft.cpp:826
 #, c-format
 msgid "romset: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:923
+#: src/emu/ui/selgame.cpp:929
 #, c-format
 msgid "%1$s %2$s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1535
+#: src/emu/ui/selgame.cpp:1543
 #, c-format
 msgid "Romset: %1$-.100s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1536
+#: src/emu/ui/selgame.cpp:1544
 #, c-format
 msgid "Year: %1$s\n"
 msgstr "Anno: %1$s\n"
 
-#: src/emu/ui/selgame.cpp:1537
+#: src/emu/ui/selgame.cpp:1545
 #, c-format
 msgid "Manufacturer: %1$-.100s\n"
 msgstr "Produttore: %1$-.100s\n"
 
-#: src/emu/ui/selgame.cpp:1541
+#: src/emu/ui/selgame.cpp:1549
 #, c-format
 msgid "Driver is Clone of: %1$-.100s\n"
 msgstr "Il Driver è un Clone di: %1$-.100s\n"
 
-#: src/emu/ui/selgame.cpp:1543
+#: src/emu/ui/selgame.cpp:1551
 msgid "Driver is Parent\n"
 msgstr "Il Driver è un Parent\n"
 
-#: src/emu/ui/selgame.cpp:1546
+#: src/emu/ui/selgame.cpp:1554
 msgid "Overall: NOT WORKING\n"
 msgstr "Complessivamente: NON FUNZIONANTE\n"
 
-#: src/emu/ui/selgame.cpp:1548
+#: src/emu/ui/selgame.cpp:1556
 msgid "Overall: Unemulated Protection\n"
 msgstr "Complessivamente: Protezione Non Emulata\n"
 
-#: src/emu/ui/selgame.cpp:1550
+#: src/emu/ui/selgame.cpp:1558
 msgid "Overall: Working\n"
 msgstr "Complessivamente: Funzionante\n"
 
-#: src/emu/ui/selgame.cpp:1553
+#: src/emu/ui/selgame.cpp:1561
 msgid "Graphics: Imperfect Colors\n"
 msgstr "Grafica: Colori Non Perfetti\n"
 
-#: src/emu/ui/selgame.cpp:1557
+#: src/emu/ui/selgame.cpp:1565
 msgid "Graphics: Imperfect\n"
 msgstr "Grafica: Non Perfetta\n"
 
-#: src/emu/ui/selgame.cpp:1559
+#: src/emu/ui/selgame.cpp:1567
 msgid "Graphics: OK\n"
 msgstr "Grafica: OK\n"
 
-#: src/emu/ui/selgame.cpp:1562
+#: src/emu/ui/selgame.cpp:1570
 msgid "Sound: Unimplemented\n"
 msgstr "Audio: Non Implementato\n"
 
-#: src/emu/ui/selgame.cpp:1564
+#: src/emu/ui/selgame.cpp:1572
 msgid "Sound: Imperfect\n"
 msgstr "Audio: Non Perfetto\n"
 
-#: src/emu/ui/selgame.cpp:1566
+#: src/emu/ui/selgame.cpp:1574
 msgid "Sound: OK\n"
 msgstr "Audio: OK\n"
 
-#: src/emu/ui/selgame.cpp:1568
+#: src/emu/ui/selgame.cpp:1576
 #, c-format
 msgid "Driver is Skeleton: %1$s\n"
 msgstr "Il Driver è Skeleton: %s\n"
 
-#: src/emu/ui/selgame.cpp:1569
+#: src/emu/ui/selgame.cpp:1577
 #, c-format
 msgid "Game is Mechanical: %1$s\n"
 msgstr "Il gioco è Meccanico: %1$s\n"
 
-#: src/emu/ui/selgame.cpp:1570
+#: src/emu/ui/selgame.cpp:1578
 #, c-format
 msgid "Requires Artwork: %1$s\n"
 msgstr "Richiede Artwork: %1$s\n"
 
-#: src/emu/ui/selgame.cpp:1571
+#: src/emu/ui/selgame.cpp:1579
 #, c-format
 msgid "Requires Clickable Artwork: %1$s\n"
 msgstr "Richiede Artwork Cliccabile: %1$s\n"
 
-#: src/emu/ui/selgame.cpp:1572
+#: src/emu/ui/selgame.cpp:1580
 #, c-format
 msgid "Support Cocktail: %1$s\n"
 msgstr "Supporta Modalità Cocktail: %1$s\n"
 
-#: src/emu/ui/selgame.cpp:1573
+#: src/emu/ui/selgame.cpp:1581
 #, c-format
 msgid "Driver is Bios: %1$s\n"
 msgstr "Il Driver è un Bios: %1$s\n"
 
-#: src/emu/ui/selgame.cpp:1574
+#: src/emu/ui/selgame.cpp:1582
 #, c-format
 msgid "Support Save: %1$s\n"
 msgstr "Salvataggio Supportato: %1$s\n"
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 #, c-format
 msgid "Screen Orientation: %1$s\n"
 msgstr "Orientamento Schermo: %1$s\n"
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 msgid "Vertical"
 msgstr "Verticale"
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 msgid "Horizontal"
 msgstr "Orizzontale"
 
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/selgame.cpp:1591
 #, c-format
 msgid "Requires CHD: %1$s\n"
 msgstr "Richiede CHD: %1$s\n"
 
-#: src/emu/ui/selgame.cpp:1596
+#: src/emu/ui/selgame.cpp:1604
 msgid "Roms Audit Pass: OK\n"
 msgstr "Esito Audit Rom: OK\n"
 
-#: src/emu/ui/selgame.cpp:1598
+#: src/emu/ui/selgame.cpp:1606
 msgid "Roms Audit Pass: BAD\n"
 msgstr "Esito Audit Rom: BAD\n"
 
-#: src/emu/ui/selgame.cpp:1601
+#: src/emu/ui/selgame.cpp:1609
 msgid "Samples Audit Pass: None Needed\n"
 msgstr "Esito Audit Sample: Non Necessario\n"
 
-#: src/emu/ui/selgame.cpp:1603
+#: src/emu/ui/selgame.cpp:1611
 msgid "Samples Audit Pass: OK\n"
 msgstr "Esito Audit Sample: OK\n"
 
-#: src/emu/ui/selgame.cpp:1605
+#: src/emu/ui/selgame.cpp:1613
 msgid "Samples Audit Pass: BAD\n"
 msgstr "Esito Audit Sample: BAD\n"
 
-#: src/emu/ui/selgame.cpp:1608
+#: src/emu/ui/selgame.cpp:1616
 msgid ""
 "Roms Audit Pass: Disabled\n"
 "Samples Audit Pass: Disabled\n"
@@ -1268,20 +1288,16 @@ msgstr ""
 "Esito Audit Rom: Disabilitato\n"
 "Esito Audit Sample: Disabilitato\n"
 
-#: src/emu/ui/selgame.cpp:2049 src/emu/ui/selgame.cpp:2212
-#: src/emu/ui/selsoft.cpp:1662
+#: src/emu/ui/selgame.cpp:2055 src/emu/ui/selgame.cpp:2216
+#: src/emu/ui/selsoft.cpp:1655
 msgid "No Infos Available"
 msgstr "Nessuna Informazione Disponibile"
 
-#: src/emu/ui/selgame.cpp:2162 src/emu/ui/selsoft.cpp:1607
+#: src/emu/ui/selgame.cpp:2168 src/emu/ui/selsoft.cpp:1602
 msgid "Usage"
 msgstr "Utilizzo"
 
-#: src/emu/ui/selsoft.cpp:110
-msgid " (default)"
-msgstr " (predefinito)"
-
-#: src/emu/ui/selsoft.cpp:381
+#: src/emu/ui/selsoft.cpp:380
 msgid ""
 "The selected software is missing one or more required files. Please select a "
 "different software.\n"
@@ -1289,57 +1305,57 @@ msgid ""
 "Press any key to continue."
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:684
+#: src/emu/ui/selsoft.cpp:683
 #, c-format
-msgid "%1$s %2$s ( %3$d / %4$d softwares )"
-msgstr "%1$s %2$s ( %3$d / %4$d software )"
+msgid "%1$s %2$s ( %3$d / %4$d software packages )"
+msgstr ""
 
-#: src/emu/ui/selsoft.cpp:685
+#: src/emu/ui/selsoft.cpp:684
 #, c-format
 msgid "Driver: \"%1$s\" software list "
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:688
+#: src/emu/ui/selsoft.cpp:687
 #, c-format
 msgid "Region: %1$s -"
 msgstr "Regione: %1$s -"
 
-#: src/emu/ui/selsoft.cpp:690
+#: src/emu/ui/selsoft.cpp:689
 #, c-format
 msgid "Publisher: %1$s -"
 msgstr "Editore: %1$s -"
 
-#: src/emu/ui/selsoft.cpp:692
+#: src/emu/ui/selsoft.cpp:691
 #, c-format
 msgid "Year: %1$s -"
 msgstr "Anno: %1$s -"
 
-#: src/emu/ui/selsoft.cpp:694
+#: src/emu/ui/selsoft.cpp:693
 #, c-format
 msgid "Software List: %1$s -"
 msgstr "Lista Software: %1$s -"
 
-#: src/emu/ui/selsoft.cpp:696
+#: src/emu/ui/selsoft.cpp:695
 #, c-format
 msgid "Device type: %1$s -"
 msgstr "Tipo di Dispositivo: %1$s -"
 
-#: src/emu/ui/selsoft.cpp:698
+#: src/emu/ui/selsoft.cpp:697
 #, c-format
 msgid "%s Search: %s_"
 msgstr "%s Cerca: %s_"
 
-#: src/emu/ui/selsoft.cpp:748 src/emu/ui/selsoft.cpp:798
+#: src/emu/ui/selsoft.cpp:747 src/emu/ui/selsoft.cpp:797
 #: src/emu/ui/simpleselgame.cpp:325
 #, c-format
 msgid "%1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:1998 src/emu/ui/selsoft.cpp:2018
+#: src/emu/ui/selsoft.cpp:1991 src/emu/ui/selsoft.cpp:2011
 msgid "Software part selection:"
 msgstr "Selezione parte software:"
 
-#: src/emu/ui/selsoft.cpp:2136 src/emu/ui/selsoft.cpp:2156
+#: src/emu/ui/selsoft.cpp:2129 src/emu/ui/selsoft.cpp:2149
 msgid "Bios selection:"
 msgstr "Selezione BIOS:"
 
@@ -1392,15 +1408,15 @@ msgstr "Gfx: %s, Audio: %s"
 msgid " [internal]"
 msgstr " [interno]"
 
-#: src/emu/ui/sndmenu.cpp:135
+#: src/emu/ui/sndmenu.cpp:133
 msgid "Sound"
 msgstr "Audio"
 
-#: src/emu/ui/sndmenu.cpp:136
+#: src/emu/ui/sndmenu.cpp:134
 msgid "Sample Rate"
 msgstr "Frequenza di Campionamento"
 
-#: src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/sndmenu.cpp:135
 msgid "Use External Samples"
 msgstr "Usa Sample Aggiuntivi"
 
@@ -1469,12 +1485,12 @@ msgstr ""
 msgid "Fast Forward"
 msgstr "Avanti Veloce"
 
-#: src/emu/ui/ui.cpp:419
+#: src/emu/ui/ui.cpp:418
 msgid "This driver requires images to be loaded in the following device(s): "
 msgstr ""
 "Questo driver richiede software caricato nel(i) dispositivo(i) seguente(i): "
 
-#: src/emu/ui/ui.cpp:1074
+#: src/emu/ui/ui.cpp:1071
 msgid ""
 "One or more ROMs/CHDs for this machine are incorrect. The machine may not "
 "run correctly.\n"
@@ -1482,7 +1498,7 @@ msgstr ""
 "Uno o più ROM/CHD per questa macchina non sono corretti. La macchina "
 "potrebbe non funzionare correttamente.\n"
 
-#: src/emu/ui/ui.cpp:1087
+#: src/emu/ui/ui.cpp:1084
 msgid ""
 "There are known problems with this machine\n"
 "\n"
@@ -1490,48 +1506,48 @@ msgstr ""
 "Ci sono problemi noti per questa macchina\n"
 "\n"
 
-#: src/emu/ui/ui.cpp:1091
+#: src/emu/ui/ui.cpp:1088
 msgid ""
 "One or more ROMs/CHDs for this machine have not been correctly dumped.\n"
 msgstr "Uno o più ROM/CHD per questa macchina non è dumpato correttamente.\n"
 
-#: src/emu/ui/ui.cpp:1095
+#: src/emu/ui/ui.cpp:1092
 #, c-format
 msgid "The keyboard emulation may not be 100% accurate.\n"
 msgstr "L'emulazione della tastiera potrebbe non essere corretta al 100%.\n"
 
-#: src/emu/ui/ui.cpp:1097
+#: src/emu/ui/ui.cpp:1094
 #, c-format
 msgid "The colors aren't 100% accurate.\n"
 msgstr "I colori non sono corretti al 100%.\n"
 
-#: src/emu/ui/ui.cpp:1099
+#: src/emu/ui/ui.cpp:1096
 msgid "The colors are completely wrong.\n"
 msgstr "I colori sono completamente sbagliati.\n"
 
-#: src/emu/ui/ui.cpp:1101
+#: src/emu/ui/ui.cpp:1098
 #, c-format
 msgid "The video emulation isn't 100% accurate.\n"
 msgstr "L'emulazione video non è corretta al 100%.\n"
 
-#: src/emu/ui/ui.cpp:1103
+#: src/emu/ui/ui.cpp:1100
 #, c-format
 msgid "The sound emulation isn't 100% accurate.\n"
 msgstr "L'emulazione audio non è corretta al 100%.\n"
 
-#: src/emu/ui/ui.cpp:1105
+#: src/emu/ui/ui.cpp:1102
 msgid "The machine lacks sound.\n"
 msgstr "La macchina non ha audio.\n"
 
-#: src/emu/ui/ui.cpp:1108
+#: src/emu/ui/ui.cpp:1105
 msgid "Screen flipping in cocktail mode is not supported.\n"
 msgstr "L'inversione dello schermo in modalità cocktail non è supportata.\n"
 
-#: src/emu/ui/ui.cpp:1112
+#: src/emu/ui/ui.cpp:1109
 msgid "The machine requires external artwork files\n"
 msgstr "La macchina richiede file di artwork extra\n"
 
-#: src/emu/ui/ui.cpp:1117
+#: src/emu/ui/ui.cpp:1114
 msgid ""
 "This machine was never completed. It may exhibit strange behavior or missing "
 "elements that are not bugs in the emulation.\n"
@@ -1539,7 +1555,7 @@ msgstr ""
 "Questa macchina non è mai stata completata. Potrebbe mostrare comportamenti "
 "strani o elementi mancanti che non sono bug nell'emulazione.\n"
 
-#: src/emu/ui/ui.cpp:1122
+#: src/emu/ui/ui.cpp:1119
 msgid ""
 "This machine has no sound hardware, MAME will produce no sounds, this is "
 "expected behaviour.\n"
@@ -1547,11 +1563,11 @@ msgstr ""
 "Questa macchina non ha alcun componente audio, MAME non produrrà alcun suono "
 "e questo è il comportamento atteso e non un bug.\n"
 
-#: src/emu/ui/ui.cpp:1130
+#: src/emu/ui/ui.cpp:1127
 msgid "The machine has protection which isn't fully emulated.\n"
 msgstr "La macchina ha delle protezioni che non sono emulate completamente.\n"
 
-#: src/emu/ui/ui.cpp:1133
+#: src/emu/ui/ui.cpp:1130
 msgid ""
 "\n"
 "THIS MACHINE DOESN'T WORK. The emulation for this machine is not yet "
@@ -1563,7 +1579,7 @@ msgstr ""
 "completa. Non c'è nulla che tu possa fare per risolvere questo problema "
 "eccetto aspettare che gli sviluppatori migliorino l'emulazione.\n"
 
-#: src/emu/ui/ui.cpp:1137
+#: src/emu/ui/ui.cpp:1134
 msgid ""
 "\n"
 "Certain elements of this machine cannot be emulated as it requires actual "
@@ -1575,7 +1591,7 @@ msgstr ""
 "richiedono interazioni fisiche oppure dispositivi meccanici. Non è possibile "
 "giocare in maniera completa con questa macchina.\n"
 
-#: src/emu/ui/ui.cpp:1156
+#: src/emu/ui/ui.cpp:1153
 msgid ""
 "\n"
 "\n"
@@ -1585,7 +1601,7 @@ msgstr ""
 "\n"
 "Ci sono cloni funzionanti di questa macchina: "
 
-#: src/emu/ui/ui.cpp:1170
+#: src/emu/ui/ui.cpp:1167
 msgid ""
 "\n"
 "\n"
@@ -1595,7 +1611,7 @@ msgstr ""
 "\n"
 "Premi un tasto per proseguire"
 
-#: src/emu/ui/ui.cpp:1185
+#: src/emu/ui/ui.cpp:1182
 #, c-format
 msgid ""
 "%1$s\n"
@@ -1605,15 +1621,15 @@ msgid ""
 "CPU:\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1221 src/emu/ui/ui.cpp:1260
+#: src/emu/ui/ui.cpp:1218 src/emu/ui/ui.cpp:1257
 msgid "MHz"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1221 src/emu/ui/ui.cpp:1260
+#: src/emu/ui/ui.cpp:1218 src/emu/ui/ui.cpp:1257
 msgid "kHz"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1235
+#: src/emu/ui/ui.cpp:1232
 msgid ""
 "\n"
 "Sound:\n"
@@ -1621,7 +1637,7 @@ msgstr ""
 "\n"
 "Audio:\n"
 
-#: src/emu/ui/ui.cpp:1264
+#: src/emu/ui/ui.cpp:1261
 msgid ""
 "\n"
 "Video:\n"
@@ -1629,78 +1645,78 @@ msgstr ""
 "\n"
 "Video:\n"
 
-#: src/emu/ui/ui.cpp:1268
+#: src/emu/ui/ui.cpp:1265
 msgid "None\n"
 msgstr "Nessuno\n"
 
-#: src/emu/ui/ui.cpp:1275
+#: src/emu/ui/ui.cpp:1272
 msgid "Vector"
 msgstr "Vettoriale"
 
-#: src/emu/ui/ui.cpp:1286
+#: src/emu/ui/ui.cpp:1283
 #, c-format
 msgid "%1$s: %2$s\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1286
+#: src/emu/ui/ui.cpp:1283
 msgid "%2$s\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1541 src/emu/ui/ui.cpp:1551
+#: src/emu/ui/ui.cpp:1538 src/emu/ui/ui.cpp:1548
 msgid "Keyboard Emulation Status"
 msgstr "Stato Emulazione Tastiera"
 
-#: src/emu/ui/ui.cpp:1543
+#: src/emu/ui/ui.cpp:1540
 msgid "Mode: PARTIAL Emulation"
 msgstr "Modalità: Emulazione PARZIALE"
 
-#: src/emu/ui/ui.cpp:1544
+#: src/emu/ui/ui.cpp:1541
 msgid "UI:   Enabled"
 msgstr "UI:   Abilitato"
 
-#: src/emu/ui/ui.cpp:1546 src/emu/ui/ui.cpp:1556
+#: src/emu/ui/ui.cpp:1543 src/emu/ui/ui.cpp:1553
 msgid "**Use ScrLock to toggle**"
 msgstr "**Usa ScrLock per cambiare**"
 
-#: src/emu/ui/ui.cpp:1553
+#: src/emu/ui/ui.cpp:1550
 msgid "Mode: FULL Emulation"
 msgstr "Modalità: Emulazione COMPLETA"
 
-#: src/emu/ui/ui.cpp:1554
+#: src/emu/ui/ui.cpp:1551
 msgid "UI:   Disabled"
 msgstr "UI:   Disabilitato"
 
-#: src/emu/ui/ui.cpp:1692
+#: src/emu/ui/ui.cpp:1689
 msgid "Autofire can't be enabled"
 msgstr "Autofire non può essere abilitato"
 
-#: src/emu/ui/ui.cpp:1731
+#: src/emu/ui/ui.cpp:1728
 msgid "Select position to save to"
 msgstr "Seleziona la posizione in cui salvare"
 
-#: src/emu/ui/ui.cpp:1733
+#: src/emu/ui/ui.cpp:1730
 msgid "Select position to load from"
 msgstr "Seleziona la posizione da cui caricare"
 
-#: src/emu/ui/ui.cpp:1757
+#: src/emu/ui/ui.cpp:1754
 msgid "Save cancelled"
 msgstr "Salvataggio annullato"
 
-#: src/emu/ui/ui.cpp:1759
+#: src/emu/ui/ui.cpp:1756
 msgid "Load cancelled"
 msgstr "Caricamento annullato"
 
-#: src/emu/ui/ui.cpp:1802
+#: src/emu/ui/ui.cpp:1799
 #, c-format
 msgid "Save to position %s"
 msgstr "Salva in %s"
 
-#: src/emu/ui/ui.cpp:1807
+#: src/emu/ui/ui.cpp:1804
 #, c-format
 msgid "Load from position %s"
 msgstr "Carica da %s"
 
-#: src/emu/ui/ui.cpp:1847
+#: src/emu/ui/ui.cpp:1844
 #, c-format
 msgid ""
 "Are you sure you want to quit?\n"
@@ -1713,173 +1729,173 @@ msgstr ""
 "Premi ''%1$s'' per uscire,\n"
 "Premi ''%2$s'' per contrinuare l'emulazione."
 
-#: src/emu/ui/ui.cpp:1917
+#: src/emu/ui/ui.cpp:1914
 msgid "Master Volume"
 msgstr "Volume Principale"
 
-#: src/emu/ui/ui.cpp:1926
+#: src/emu/ui/ui.cpp:1923
 #, c-format
 msgid "%1$s Volume"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1949
+#: src/emu/ui/ui.cpp:1946
 #, c-format
 msgid "Overclock CPU %1$s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1968
+#: src/emu/ui/ui.cpp:1965
 #, c-format
 msgid "%1$s Refresh Rate"
 msgstr "%1$s Frequenza di aggiornamento"
 
-#: src/emu/ui/ui.cpp:1973
+#: src/emu/ui/ui.cpp:1970
 #, c-format
 msgid "%1$s Brightness"
 msgstr "%1$s Luminosità"
 
-#: src/emu/ui/ui.cpp:1975
+#: src/emu/ui/ui.cpp:1972
 #, c-format
 msgid "%1$s Contrast"
 msgstr "%1$s Contrasto"
 
-#: src/emu/ui/ui.cpp:1977
+#: src/emu/ui/ui.cpp:1974
 #, c-format
 msgid "%1$s Gamma"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1981
+#: src/emu/ui/ui.cpp:1978
 #, c-format
 msgid "%1$s Horiz Stretch"
 msgstr "%1$s Allungamento Orizzontale"
 
-#: src/emu/ui/ui.cpp:1983
+#: src/emu/ui/ui.cpp:1980
 #, c-format
 msgid "%1$s Horiz Position"
 msgstr "%1$s Posizione Orizzontale"
 
-#: src/emu/ui/ui.cpp:1985
+#: src/emu/ui/ui.cpp:1982
 #, c-format
 msgid "%1$s Vert Stretch"
 msgstr "%1$s Allungamento Verticale"
 
-#: src/emu/ui/ui.cpp:1987
+#: src/emu/ui/ui.cpp:1984
 #, c-format
 msgid "%1$s Vert Position"
 msgstr "%1$s Posizione Verticale"
 
-#: src/emu/ui/ui.cpp:2005
+#: src/emu/ui/ui.cpp:2002
 #, c-format
 msgid "Laserdisc '%1$s' Horiz Stretch"
 msgstr "Laserdisc '%1$s' Allungamento Orizzontale"
 
-#: src/emu/ui/ui.cpp:2007
+#: src/emu/ui/ui.cpp:2004
 #, c-format
 msgid "Laserdisc '%1$s' Horiz Position"
 msgstr "Laserdisc '%1$s' Posizione Orizzontale"
 
-#: src/emu/ui/ui.cpp:2009
+#: src/emu/ui/ui.cpp:2006
 #, c-format
 msgid "Laserdisc '%1$s' Vert Stretch"
 msgstr "Laserdisc '%1$s' Allungamento Verticale"
 
-#: src/emu/ui/ui.cpp:2011
+#: src/emu/ui/ui.cpp:2008
 #, c-format
 msgid "Laserdisc '%1$s' Vert Position"
 msgstr "Laserdisc '%1$s' Posizione Verticale"
 
-#: src/emu/ui/ui.cpp:2021
+#: src/emu/ui/ui.cpp:2018
 msgid "Vector Flicker"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2022
+#: src/emu/ui/ui.cpp:2019
 msgid "Beam Width Minimum"
 msgstr "Larghezza Minima del Raggio"
 
-#: src/emu/ui/ui.cpp:2023
+#: src/emu/ui/ui.cpp:2020
 msgid "Beam Width Maximum"
 msgstr "Larghezza Massima del Raggio"
 
-#: src/emu/ui/ui.cpp:2024
+#: src/emu/ui/ui.cpp:2021
 msgid "Beam Intensity Weight"
 msgstr "Peso intensità del Raggio"
 
-#: src/emu/ui/ui.cpp:2037
+#: src/emu/ui/ui.cpp:2034
 #, c-format
 msgid "Crosshair Scale %1$s"
 msgstr "Scala del Puntatore %1$s"
 
-#: src/emu/ui/ui.cpp:2037 src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2034 src/emu/ui/ui.cpp:2036
 msgid "X"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2037 src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2034 src/emu/ui/ui.cpp:2036
 msgid "Y"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2036
 #, c-format
 msgid "Crosshair Offset %1$s"
 msgstr "Offset del Puntatore %1$s"
 
-#: src/emu/ui/ui.cpp:2071
+#: src/emu/ui/ui.cpp:2068
 #, c-format
 msgid "%1$3ddB"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2115
+#: src/emu/ui/ui.cpp:2112
 #, c-format
 msgid "%1$d%%"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2131
+#: src/emu/ui/ui.cpp:2128
 #, c-format
 msgid "%1$3.0f%%"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2154
+#: src/emu/ui/ui.cpp:2151
 #, c-format
 msgid "%1$.3ffps"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2177 src/emu/ui/ui.cpp:2199 src/emu/ui/ui.cpp:2220
-#: src/emu/ui/ui.cpp:2242 src/emu/ui/ui.cpp:2264 src/emu/ui/ui.cpp:2286
-#: src/emu/ui/ui.cpp:2308 src/emu/ui/ui.cpp:2330 src/emu/ui/ui.cpp:2352
-#: src/emu/ui/ui.cpp:2374 src/emu/ui/ui.cpp:2396
+#: src/emu/ui/ui.cpp:2174 src/emu/ui/ui.cpp:2196 src/emu/ui/ui.cpp:2217
+#: src/emu/ui/ui.cpp:2239 src/emu/ui/ui.cpp:2261 src/emu/ui/ui.cpp:2283
+#: src/emu/ui/ui.cpp:2305 src/emu/ui/ui.cpp:2327 src/emu/ui/ui.cpp:2349
+#: src/emu/ui/ui.cpp:2371 src/emu/ui/ui.cpp:2393
 #, c-format
 msgid "%1$.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2412 src/emu/ui/ui.cpp:2428 src/emu/ui/ui.cpp:2444
-#: src/emu/ui/ui.cpp:2460
+#: src/emu/ui/ui.cpp:2408 src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2438
+#: src/emu/ui/ui.cpp:2453
 #, c-format
 msgid "%1$1.2f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2476
+#: src/emu/ui/ui.cpp:2469
 #, c-format
 msgid "Screen '%1$s'"
 msgstr "Schermo '%1$s'"
 
-#: src/emu/ui/ui.cpp:2478
+#: src/emu/ui/ui.cpp:2471
 msgid "Screen"
 msgstr "Schermo"
 
-#: src/emu/ui/ui.cpp:2494
+#: src/emu/ui/ui.cpp:2487
 #, c-format
 msgid "Crosshair Scale X %1$1.3f"
 msgstr "Scala del Puntatore X %1$1.3f"
 
-#: src/emu/ui/ui.cpp:2494
+#: src/emu/ui/ui.cpp:2487
 #, c-format
 msgid "Crosshair Scale Y %1$1.3f"
 msgstr "Scala del Puntatore Y %1$1.3f"
 
-#: src/emu/ui/ui.cpp:2513
+#: src/emu/ui/ui.cpp:2506
 #, c-format
 msgid "Crosshair Offset X %1$1.3f"
 msgstr "Offset del Puntatore X %1$1.3f"
 
-#: src/emu/ui/ui.cpp:2513
+#: src/emu/ui/ui.cpp:2506
 #, c-format
 msgid "Crosshair Offset Y %1$1.3f"
 msgstr "Offset del Puntatore Y %1$1.3f"
@@ -1921,14 +1937,26 @@ msgstr "Tagliata"
 msgid "Full"
 msgstr "Completa"
 
-#: src/emu/ui/viewgfx.cpp:392
+#: src/emu/ui/viewgfx.cpp:391
 msgid " COLORS"
 msgstr " COLORI"
 
-#: src/emu/ui/viewgfx.cpp:392
+#: src/emu/ui/viewgfx.cpp:391
 msgid " PENS"
 msgstr " PEN"
 
+#~ msgid "Export XML format (like -listxml)"
+#~ msgstr "Esporta in formato XML (come -listxml)"
+
+#~ msgid "Export TXT format (like -listfull)"
+#~ msgstr "Esporta in formato TXT (come -listfull)"
+
+#~ msgid "Dummy"
+#~ msgstr "Fittizio"
+
+#~ msgid "%1$s %2$s ( %3$d / %4$d softwares )"
+#~ msgstr "%1$s %2$s ( %3$d / %4$d software )"
+
 #~ msgid "Lightgun Device Assignment"
 #~ msgstr "Assegnazione Dispositivo Lightgun"
 
diff --git a/language/Japanese/strings.po b/language/Japanese/strings.po
index 23b174e9043..cd68eb62131 100644
--- a/language/Japanese/strings.po
+++ b/language/Japanese/strings.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MAME\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-11 03:33+0200\n"
+"POT-Creation-Date: 2016-04-15 17:42+0200\n"
 "PO-Revision-Date: 2016-02-23 01:39+0900\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: MAME Language Team\n"
@@ -63,14 +63,14 @@ msgstr "全て再読み込み"
 msgid "Autofire Status"
 msgstr "連射設定ステータス"
 
-#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1698
+#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1695
 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211
 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219
 #: src/emu/ui/videoopt.cpp:223
 msgid "Disabled"
 msgstr "無効"
 
-#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1698
+#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1695
 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211
 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219
 #: src/emu/ui/videoopt.cpp:223
@@ -78,14 +78,14 @@ msgid "Enabled"
 msgstr "有効"
 
 #: src/emu/ui/cheatopt.cpp:282 src/emu/ui/cheatopt.cpp:288
-#: src/emu/ui/menu.cpp:710 src/emu/ui/miscmenu.cpp:831
-#: src/emu/ui/sndmenu.cpp:135 src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/menu.cpp:755 src/emu/ui/miscmenu.cpp:936
+#: src/emu/ui/sndmenu.cpp:133 src/emu/ui/sndmenu.cpp:135
 msgid "On"
 msgstr "オン"
 
 #: src/emu/ui/cheatopt.cpp:282 src/emu/ui/cheatopt.cpp:288
-#: src/emu/ui/menu.cpp:713 src/emu/ui/miscmenu.cpp:831
-#: src/emu/ui/sndmenu.cpp:135 src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/menu.cpp:758 src/emu/ui/miscmenu.cpp:936
+#: src/emu/ui/sndmenu.cpp:133 src/emu/ui/sndmenu.cpp:135
 msgid "Off"
 msgstr "オフ"
 
@@ -97,317 +97,317 @@ msgstr "このマシンにはボタンがありません！"
 msgid "Autofire Delay"
 msgstr "連射間隔"
 
-#: src/emu/ui/custmenu.cpp:158 src/emu/ui/custmenu.cpp:447
+#: src/emu/ui/custmenu.cpp:157 src/emu/ui/custmenu.cpp:445
 msgid "Main filter"
 msgstr "メインフィルタ"
 
-#: src/emu/ui/custmenu.cpp:167 src/emu/ui/custmenu.cpp:456
+#: src/emu/ui/custmenu.cpp:166 src/emu/ui/custmenu.cpp:454
 msgid "Other filter"
 msgstr "他のフィルタ"
 
-#: src/emu/ui/custmenu.cpp:176 src/emu/ui/optsmenu.cpp:239
+#: src/emu/ui/custmenu.cpp:175 src/emu/ui/optsmenu.cpp:238
 msgid "^!Manufacturer"
 msgstr "^!製造元"
 
-#: src/emu/ui/custmenu.cpp:185 src/emu/ui/custmenu.cpp:474
-#: src/emu/ui/optsmenu.cpp:247
+#: src/emu/ui/custmenu.cpp:184 src/emu/ui/custmenu.cpp:472
+#: src/emu/ui/optsmenu.cpp:246
 msgid "^!Year"
 msgstr "^!年度"
 
-#: src/emu/ui/custmenu.cpp:194 src/emu/ui/custmenu.cpp:510
+#: src/emu/ui/custmenu.cpp:193 src/emu/ui/custmenu.cpp:508
 msgid "Remove last filter"
 msgstr "最後のフィルタを削除"
 
-#: src/emu/ui/custmenu.cpp:197 src/emu/ui/custmenu.cpp:513
+#: src/emu/ui/custmenu.cpp:196 src/emu/ui/custmenu.cpp:511
 msgid "Add filter"
 msgstr "フィルタを追加"
 
-#: src/emu/ui/custmenu.cpp:212 src/emu/ui/custmenu.cpp:233
-#: src/emu/ui/custmenu.cpp:529 src/emu/ui/custmenu.cpp:550
+#: src/emu/ui/custmenu.cpp:211 src/emu/ui/custmenu.cpp:231
+#: src/emu/ui/custmenu.cpp:527 src/emu/ui/custmenu.cpp:547
 msgid "Select custom filters:"
 msgstr "カスタムフィルタ選択:"
 
-#: src/emu/ui/custmenu.cpp:465
+#: src/emu/ui/custmenu.cpp:463
 msgid "^!Publisher"
 msgstr "^!発売元"
 
-#: src/emu/ui/custmenu.cpp:483
+#: src/emu/ui/custmenu.cpp:481
 msgid "^!Software List"
 msgstr "^!ソフトウェアリスト"
 
-#: src/emu/ui/custmenu.cpp:492
+#: src/emu/ui/custmenu.cpp:490
 msgid "^!Device type"
 msgstr "^!デバイスタイプ"
 
-#: src/emu/ui/custmenu.cpp:501
+#: src/emu/ui/custmenu.cpp:499
 msgid "^!Region"
 msgstr "^!リージョン"
 
-#: src/emu/ui/custui.cpp:23
+#: src/emu/ui/custui.cpp:22
 msgid "Show All"
 msgstr "全て表示"
 
-#: src/emu/ui/custui.cpp:24
+#: src/emu/ui/custui.cpp:23
 msgid "Hide Filters"
 msgstr "フィルタを非表示にする"
 
-#: src/emu/ui/custui.cpp:25
+#: src/emu/ui/custui.cpp:24
 msgid "Hide Info/Image"
 msgstr "情報・画像を非表示にする"
 
-#: src/emu/ui/custui.cpp:26
+#: src/emu/ui/custui.cpp:25
 msgid "Hide Both"
 msgstr "両方を非表示にする"
 
-#: src/emu/ui/custui.cpp:142
+#: src/emu/ui/custui.cpp:141
 msgid "Fonts"
 msgstr "フォント"
 
-#: src/emu/ui/custui.cpp:143
+#: src/emu/ui/custui.cpp:142
 msgid "Colors"
 msgstr "色"
 
-#: src/emu/ui/custui.cpp:148 src/emu/ui/dirmenu.cpp:33
+#: src/emu/ui/custui.cpp:147 src/emu/ui/dirmenu.cpp:33
 msgid "Language"
 msgstr "言語"
 
-#: src/emu/ui/custui.cpp:152
+#: src/emu/ui/custui.cpp:151
 msgid "Show side panels"
 msgstr "サイドパネルを表示"
 
-#: src/emu/ui/custui.cpp:167 src/emu/ui/custui.cpp:188
+#: src/emu/ui/custui.cpp:166 src/emu/ui/custui.cpp:186
 msgid "Custom UI Settings"
 msgstr "カスタムUI設定"
 
-#: src/emu/ui/custui.cpp:246
+#: src/emu/ui/custui.cpp:244
 msgid "default"
 msgstr "デフォルト"
 
-#: src/emu/ui/custui.cpp:349
+#: src/emu/ui/custui.cpp:347
 msgid "UI Font"
 msgstr "UIフォント"
 
-#: src/emu/ui/custui.cpp:354
+#: src/emu/ui/custui.cpp:352
 msgid "Bold"
 msgstr "太字"
 
-#: src/emu/ui/custui.cpp:355
+#: src/emu/ui/custui.cpp:353
 msgid "Italic"
 msgstr "イタリック"
 
-#: src/emu/ui/custui.cpp:360
+#: src/emu/ui/custui.cpp:358
 msgid "Lines"
 msgstr "行数"
 
-#: src/emu/ui/custui.cpp:366
+#: src/emu/ui/custui.cpp:364
 msgid "Infos text size"
 msgstr "情報のテキストサイズ"
 
-#: src/emu/ui/custui.cpp:383
+#: src/emu/ui/custui.cpp:381
 msgid "UI Fonts Settings"
 msgstr "UIフォント設定"
 
-#: src/emu/ui/custui.cpp:411
+#: src/emu/ui/custui.cpp:408
 msgid "Sample text - Lorem ipsum dolor sit amet, consectetur adipiscing elit."
 msgstr ""
 "サンプルテキスト - Lorem ipsum dolor sit amet, consectetur adipiscing elit."
 
-#: src/emu/ui/custui.cpp:509
+#: src/emu/ui/custui.cpp:506
 msgid "Normal text"
 msgstr "通常のテキスト"
 
-#: src/emu/ui/custui.cpp:510
+#: src/emu/ui/custui.cpp:507
 msgid "Selected color"
 msgstr "選択色"
 
-#: src/emu/ui/custui.cpp:511
+#: src/emu/ui/custui.cpp:508
 msgid "Normal text background"
 msgstr "通常テキストの背景"
 
-#: src/emu/ui/custui.cpp:512
+#: src/emu/ui/custui.cpp:509
 msgid "Selected background color"
 msgstr "選択済テキストの背景"
 
-#: src/emu/ui/custui.cpp:513
+#: src/emu/ui/custui.cpp:510
 msgid "Subitem color"
 msgstr "サブ項目の色"
 
-#: src/emu/ui/custui.cpp:514 src/emu/ui/custui.cpp:610
+#: src/emu/ui/custui.cpp:511 src/emu/ui/custui.cpp:606
 msgid "Clone"
 msgstr "クローン"
 
-#: src/emu/ui/custui.cpp:515
+#: src/emu/ui/custui.cpp:512
 msgid "Border"
 msgstr "枠線"
 
-#: src/emu/ui/custui.cpp:516
+#: src/emu/ui/custui.cpp:513
 msgid "Background"
 msgstr "背景"
 
-#: src/emu/ui/custui.cpp:517
+#: src/emu/ui/custui.cpp:514
 msgid "Dipswitch"
 msgstr "DIPスイッチ"
 
-#: src/emu/ui/custui.cpp:518
+#: src/emu/ui/custui.cpp:515
 msgid "Unavailable color"
 msgstr "動作不可の色"
 
-#: src/emu/ui/custui.cpp:519
+#: src/emu/ui/custui.cpp:516
 msgid "Slider color"
 msgstr "スライダの色"
 
-#: src/emu/ui/custui.cpp:520
+#: src/emu/ui/custui.cpp:517
 msgid "Gfx viewer background"
 msgstr "グラフィックビューアの背景"
 
-#: src/emu/ui/custui.cpp:521
+#: src/emu/ui/custui.cpp:518
 msgid "Mouse over color"
 msgstr "マウスオーバー時の色"
 
-#: src/emu/ui/custui.cpp:522
+#: src/emu/ui/custui.cpp:519
 msgid "Mouse over background color"
 msgstr "マウスオーバー時の背景色"
 
-#: src/emu/ui/custui.cpp:523
+#: src/emu/ui/custui.cpp:520
 msgid "Mouse down color"
 msgstr "マウスダウン時の色"
 
-#: src/emu/ui/custui.cpp:524
+#: src/emu/ui/custui.cpp:521
 msgid "Mouse down background color"
 msgstr "マウスダウン時の背景色"
 
-#: src/emu/ui/custui.cpp:527
+#: src/emu/ui/custui.cpp:524
 msgid "Restore originals colors"
 msgstr "元の色に戻す"
 
-#: src/emu/ui/custui.cpp:543
+#: src/emu/ui/custui.cpp:540
 msgid "UI Colors Settings"
 msgstr "UIの色設定"
 
-#: src/emu/ui/custui.cpp:572
+#: src/emu/ui/custui.cpp:568
 #, c-format
 msgid "Double click or press %1$s to change the color value"
 msgstr "色の値を変更するには%1$sを押すかダブルクリックしてください"
 
-#: src/emu/ui/custui.cpp:598
+#: src/emu/ui/custui.cpp:594
 msgid "Menu Preview"
 msgstr "メニューのプレビュー"
 
-#: src/emu/ui/custui.cpp:606
+#: src/emu/ui/custui.cpp:602
 msgid "Normal"
 msgstr "通常項目"
 
-#: src/emu/ui/custui.cpp:607
+#: src/emu/ui/custui.cpp:603
 msgid "Subitem"
 msgstr "サブ項目"
 
-#: src/emu/ui/custui.cpp:608
+#: src/emu/ui/custui.cpp:604
 msgid "Selected"
 msgstr "選択済の項目"
 
-#: src/emu/ui/custui.cpp:609
+#: src/emu/ui/custui.cpp:605
 msgid "Mouse Over"
 msgstr "マウスオーバー"
 
-#: src/emu/ui/custui.cpp:841 src/emu/ui/custui.cpp:844
+#: src/emu/ui/custui.cpp:837 src/emu/ui/custui.cpp:840
 msgid "Alpha"
 msgstr "アルファ"
 
-#: src/emu/ui/custui.cpp:849 src/emu/ui/custui.cpp:852
-#: src/emu/ui/custui.cpp:1013
+#: src/emu/ui/custui.cpp:845 src/emu/ui/custui.cpp:848
+#: src/emu/ui/custui.cpp:1007
 msgid "Red"
 msgstr "赤"
 
-#: src/emu/ui/custui.cpp:857 src/emu/ui/custui.cpp:860
-#: src/emu/ui/custui.cpp:1016
+#: src/emu/ui/custui.cpp:853 src/emu/ui/custui.cpp:856
+#: src/emu/ui/custui.cpp:1010
 msgid "Green"
 msgstr "緑"
 
-#: src/emu/ui/custui.cpp:865 src/emu/ui/custui.cpp:868
-#: src/emu/ui/custui.cpp:1017
+#: src/emu/ui/custui.cpp:861 src/emu/ui/custui.cpp:864
+#: src/emu/ui/custui.cpp:1011
 msgid "Blue"
 msgstr "青"
 
-#: src/emu/ui/custui.cpp:871
+#: src/emu/ui/custui.cpp:867
 msgid "Choose from palette"
 msgstr "パレットから選ぶ"
 
-#: src/emu/ui/custui.cpp:887
+#: src/emu/ui/custui.cpp:883
 msgid " - ARGB Settings"
 msgstr "のARGB設定"
 
-#: src/emu/ui/custui.cpp:912
+#: src/emu/ui/custui.cpp:907
 msgid "Color preview ="
 msgstr "色のプレビュー ="
 
-#: src/emu/ui/custui.cpp:1009
+#: src/emu/ui/custui.cpp:1003
 msgid "White"
 msgstr "白"
 
-#: src/emu/ui/custui.cpp:1010
+#: src/emu/ui/custui.cpp:1004
 msgid "Silver"
 msgstr "銀色"
 
-#: src/emu/ui/custui.cpp:1011
+#: src/emu/ui/custui.cpp:1005
 msgid "Gray"
 msgstr "灰色"
 
-#: src/emu/ui/custui.cpp:1012
+#: src/emu/ui/custui.cpp:1006
 msgid "Black"
 msgstr "黒"
 
-#: src/emu/ui/custui.cpp:1014
+#: src/emu/ui/custui.cpp:1008
 msgid "Orange"
 msgstr "オレンジ"
 
-#: src/emu/ui/custui.cpp:1015
+#: src/emu/ui/custui.cpp:1009
 msgid "Yellow"
 msgstr "黄"
 
-#: src/emu/ui/custui.cpp:1018
+#: src/emu/ui/custui.cpp:1012
 msgid "Violet"
 msgstr "紫"
 
-#: src/emu/ui/datmenu.cpp:65
+#: src/emu/ui/datmenu.cpp:64
 msgid "Software History"
 msgstr "ソフトウェアのヒストリ"
 
-#: src/emu/ui/datmenu.cpp:67
+#: src/emu/ui/datmenu.cpp:66
 msgid "Software Usage"
 msgstr "ソフトウェアの使い方"
 
-#: src/emu/ui/datmenu.cpp:199
+#: src/emu/ui/datmenu.cpp:196
 msgid "Revision: "
 msgstr "リビジョン："
 
-#: src/emu/ui/datmenu.cpp:287 src/emu/ui/selgame.cpp:40
-#: src/emu/ui/selgame.cpp:2152 src/emu/ui/selgame.cpp:2161
-#: src/emu/ui/selsoft.cpp:1577 src/emu/ui/selsoft.cpp:1597
-#: src/emu/ui/selsoft.cpp:1606
+#: src/emu/ui/datmenu.cpp:284 src/emu/ui/selgame.cpp:39
+#: src/emu/ui/selgame.cpp:2158 src/emu/ui/selgame.cpp:2167
+#: src/emu/ui/selsoft.cpp:1574 src/emu/ui/selsoft.cpp:1592
+#: src/emu/ui/selsoft.cpp:1601
 msgid "History"
 msgstr "ヒストリファイル"
 
-#: src/emu/ui/datmenu.cpp:289 src/emu/ui/selgame.cpp:41
+#: src/emu/ui/datmenu.cpp:286 src/emu/ui/selgame.cpp:40
 msgid "Mameinfo"
 msgstr "Mameinfoファイル"
 
-#: src/emu/ui/datmenu.cpp:291 src/emu/ui/selgame.cpp:43
+#: src/emu/ui/datmenu.cpp:288 src/emu/ui/selgame.cpp:42
 msgid "Messinfo"
 msgstr "Messinfoファイル"
 
-#: src/emu/ui/datmenu.cpp:293 src/emu/ui/selgame.cpp:42
+#: src/emu/ui/datmenu.cpp:290 src/emu/ui/selgame.cpp:41
 msgid "Sysinfo"
 msgstr "Sysinfoファイル"
 
-#: src/emu/ui/datmenu.cpp:295 src/emu/ui/selgame.cpp:46
+#: src/emu/ui/datmenu.cpp:292 src/emu/ui/selgame.cpp:45
 msgid "Mamescore"
 msgstr "Mamescoreファイル"
 
-#: src/emu/ui/datmenu.cpp:297 src/emu/ui/selgame.cpp:45
+#: src/emu/ui/datmenu.cpp:294 src/emu/ui/selgame.cpp:44
 msgid "Gameinit"
 msgstr "Gameinitファイル"
 
-#: src/emu/ui/datmenu.cpp:299 src/emu/ui/selgame.cpp:44
+#: src/emu/ui/datmenu.cpp:296 src/emu/ui/selgame.cpp:43
 msgid "Command"
 msgstr "コマンドファイル"
 
@@ -559,75 +559,75 @@ msgstr "TABキーを押して設定"
 msgid "Remove %1$s Folder"
 msgstr "%1$sフォルダを削除"
 
-#: src/emu/ui/filesel.cpp:158
+#: src/emu/ui/filesel.cpp:161
 msgid "File Already Exists - Override?"
 msgstr "ファイルが存在します－上書きしますか？"
 
-#: src/emu/ui/filesel.cpp:160 src/emu/ui/selgame.cpp:1568
-#: src/emu/ui/selgame.cpp:1569 src/emu/ui/selgame.cpp:1570
-#: src/emu/ui/selgame.cpp:1571 src/emu/ui/selgame.cpp:1572
-#: src/emu/ui/selgame.cpp:1573 src/emu/ui/selgame.cpp:1574
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/filesel.cpp:163 src/emu/ui/selgame.cpp:1576
+#: src/emu/ui/selgame.cpp:1577 src/emu/ui/selgame.cpp:1578
+#: src/emu/ui/selgame.cpp:1579 src/emu/ui/selgame.cpp:1580
+#: src/emu/ui/selgame.cpp:1581 src/emu/ui/selgame.cpp:1582
+#: src/emu/ui/selgame.cpp:1591
 msgid "No"
 msgstr "いいえ"
 
-#: src/emu/ui/filesel.cpp:161 src/emu/ui/selgame.cpp:1568
-#: src/emu/ui/selgame.cpp:1569 src/emu/ui/selgame.cpp:1570
-#: src/emu/ui/selgame.cpp:1571 src/emu/ui/selgame.cpp:1572
-#: src/emu/ui/selgame.cpp:1573 src/emu/ui/selgame.cpp:1574
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/filesel.cpp:164 src/emu/ui/selgame.cpp:1576
+#: src/emu/ui/selgame.cpp:1577 src/emu/ui/selgame.cpp:1578
+#: src/emu/ui/selgame.cpp:1579 src/emu/ui/selgame.cpp:1580
+#: src/emu/ui/selgame.cpp:1581 src/emu/ui/selgame.cpp:1582
+#: src/emu/ui/selgame.cpp:1591
 msgid "Yes"
 msgstr "はい"
 
-#: src/emu/ui/filesel.cpp:272
+#: src/emu/ui/filesel.cpp:275
 msgid "New Image Name:"
 msgstr "新しいイメージ名:"
 
-#: src/emu/ui/filesel.cpp:278
+#: src/emu/ui/filesel.cpp:281
 msgid "Image Format:"
 msgstr "イメージ形式:"
 
-#: src/emu/ui/filesel.cpp:284
+#: src/emu/ui/filesel.cpp:287
 msgid "Create"
 msgstr "作成"
 
-#: src/emu/ui/filesel.cpp:315
+#: src/emu/ui/filesel.cpp:318
 msgid "Please enter a file extension too"
 msgstr "ファイルの拡張子を入力してください"
 
-#: src/emu/ui/filesel.cpp:503 src/emu/ui/swlist.cpp:65
+#: src/emu/ui/filesel.cpp:506 src/emu/ui/swlist.cpp:65
 msgid "[empty slot]"
 msgstr "〔空のスロット〕"
 
-#: src/emu/ui/filesel.cpp:507
+#: src/emu/ui/filesel.cpp:510
 msgid "[create]"
 msgstr "〔作成〕"
 
-#: src/emu/ui/filesel.cpp:511 src/emu/ui/swlist.cpp:76
+#: src/emu/ui/filesel.cpp:514 src/emu/ui/swlist.cpp:76
 msgid "[software list]"
 msgstr "〔ソフトウェアリスト〕"
 
-#: src/emu/ui/filesel.cpp:803
+#: src/emu/ui/filesel.cpp:806
 msgid "Select image format"
 msgstr "イメージ形式の選択"
 
-#: src/emu/ui/filesel.cpp:863
+#: src/emu/ui/filesel.cpp:866
 msgid "Select access mode"
 msgstr "アクセスモードの選択"
 
-#: src/emu/ui/filesel.cpp:864
+#: src/emu/ui/filesel.cpp:867
 msgid "Read-only"
 msgstr "読み取り専用"
 
-#: src/emu/ui/filesel.cpp:866
+#: src/emu/ui/filesel.cpp:869
 msgid "Read-write"
 msgstr "読み取り／書き込み"
 
-#: src/emu/ui/filesel.cpp:867
+#: src/emu/ui/filesel.cpp:870
 msgid "Read this image, write to another image"
 msgstr "このイメージから読み取り、別のイメージに書き込む"
 
-#: src/emu/ui/filesel.cpp:868
+#: src/emu/ui/filesel.cpp:871
 msgid "Read this image, write to diff"
 msgstr "このイメージから読み取り、差分（diff）に書き込む"
 
@@ -655,7 +655,7 @@ msgstr "部分的に対応"
 msgid "[empty]"
 msgstr "〔空〕"
 
-#: src/emu/ui/info_pty.cpp:26 src/emu/ui/mainmenu.cpp:91
+#: src/emu/ui/info_pty.cpp:26 src/emu/ui/mainmenu.cpp:96
 msgid "Pseudo terminals"
 msgstr "擬似ターミナル"
 
@@ -671,7 +671,7 @@ msgstr "ユーザーインターフェイス"
 msgid "Other Controls"
 msgstr "その他のコントロール"
 
-#: src/emu/ui/inputmap.cpp:622 src/emu/ui/miscmenu.cpp:91
+#: src/emu/ui/inputmap.cpp:622 src/emu/ui/miscmenu.cpp:92
 #: src/emu/ui/slotopt.cpp:172
 msgid "Reset"
 msgstr "リセット"
@@ -704,27 +704,27 @@ msgstr "ブックキーピング情報"
 msgid "Machine Information"
 msgstr "マシン情報"
 
-#: src/emu/ui/mainmenu.cpp:78
+#: src/emu/ui/mainmenu.cpp:80
 msgid "Image Information"
 msgstr "イメージ情報"
 
-#: src/emu/ui/mainmenu.cpp:81
+#: src/emu/ui/mainmenu.cpp:83
 msgid "File Manager"
 msgstr "ファイルマネージャ"
 
-#: src/emu/ui/mainmenu.cpp:86
+#: src/emu/ui/mainmenu.cpp:92
 msgid "Tape Control"
 msgstr "テープ操作"
 
-#: src/emu/ui/mainmenu.cpp:94
+#: src/emu/ui/mainmenu.cpp:99
 msgid "Bios Selection"
 msgstr "BIOS選択"
 
-#: src/emu/ui/mainmenu.cpp:100
+#: src/emu/ui/mainmenu.cpp:104
 msgid "Slot Devices"
 msgstr "スロットデバイス"
 
-#: src/emu/ui/mainmenu.cpp:107
+#: src/emu/ui/mainmenu.cpp:109
 msgid "Barcode Reader"
 msgstr "バーコードリーダ"
 
@@ -732,43 +732,43 @@ msgstr "バーコードリーダ"
 msgid "Network Devices"
 msgstr "ネットワークデバイス"
 
-#: src/emu/ui/mainmenu.cpp:119
+#: src/emu/ui/mainmenu.cpp:118
 msgid "Keyboard Mode"
 msgstr "キーボードモード"
 
-#: src/emu/ui/mainmenu.cpp:122
+#: src/emu/ui/mainmenu.cpp:121
 msgid "Slider Controls"
 msgstr "スライダ設定"
 
-#: src/emu/ui/mainmenu.cpp:125
+#: src/emu/ui/mainmenu.cpp:124
 msgid "Video Options"
 msgstr "表示設定"
 
-#: src/emu/ui/mainmenu.cpp:129
+#: src/emu/ui/mainmenu.cpp:128
 msgid "Crosshair Options"
 msgstr "照準設定"
 
-#: src/emu/ui/mainmenu.cpp:133
+#: src/emu/ui/mainmenu.cpp:132
 msgid "Cheat"
 msgstr "チート"
 
-#: src/emu/ui/mainmenu.cpp:136
+#: src/emu/ui/mainmenu.cpp:135
 msgid "Plugin Options"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:140
+#: src/emu/ui/mainmenu.cpp:139
 msgid "External DAT View"
 msgstr "外部DATビュー"
 
-#: src/emu/ui/mainmenu.cpp:146
+#: src/emu/ui/mainmenu.cpp:145 src/emu/ui/miscmenu.cpp:785
 msgid "Add To Favorites"
 msgstr "お気に入りに追加"
 
-#: src/emu/ui/mainmenu.cpp:148
+#: src/emu/ui/mainmenu.cpp:147 src/emu/ui/miscmenu.cpp:787
 msgid "Remove From Favorites"
 msgstr "お気に入りから削除"
 
-#: src/emu/ui/mainmenu.cpp:155
+#: src/emu/ui/mainmenu.cpp:154
 msgid "Select New Machine"
 msgstr "新しいマシンを選択"
 
@@ -808,31 +808,31 @@ msgstr "終了"
 msgid "Return to Previous Menu"
 msgstr "前のメニューに戻る"
 
-#: src/emu/ui/menu.cpp:716
+#: src/emu/ui/menu.cpp:761
 msgid "Auto"
 msgstr "自動"
 
-#: src/emu/ui/menu.cpp:2133
+#: src/emu/ui/menu.cpp:2195
 msgid "Images"
 msgstr "画像"
 
-#: src/emu/ui/menu.cpp:2134
+#: src/emu/ui/menu.cpp:2196
 msgid "Infos"
 msgstr "情報"
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Keyboard Mode:"
 msgstr "キーボードモード:"
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Natural"
 msgstr "ナチュラル"
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Emulated"
 msgstr "エミュレート"
 
-#: src/emu/ui/miscmenu.cpp:240
+#: src/emu/ui/miscmenu.cpp:241
 #, c-format
 msgid ""
 "Uptime: %1$d:%2$02d:%3$02d\n"
@@ -841,7 +841,7 @@ msgstr ""
 "稼働時間：%1$d:%2$02d:%3$02d\n"
 "\n"
 
-#: src/emu/ui/miscmenu.cpp:242
+#: src/emu/ui/miscmenu.cpp:243
 #, c-format
 msgid ""
 "Uptime: %1$d:%2$02d\n"
@@ -850,7 +850,7 @@ msgstr ""
 "稼働時間：%1$d:%2$02d\n"
 "\n"
 
-#: src/emu/ui/miscmenu.cpp:246
+#: src/emu/ui/miscmenu.cpp:247
 #, c-format
 msgid ""
 "Tickets dispensed: %1$d\n"
@@ -859,109 +859,50 @@ msgstr ""
 "チケット発行: %1$d\n"
 "\n"
 
-#: src/emu/ui/miscmenu.cpp:257
+#: src/emu/ui/miscmenu.cpp:258
 msgid "Coin %1$c: NA%3$s\n"
 msgstr "コイン%1$c：NA%3$s\n"
 
-#: src/emu/ui/miscmenu.cpp:257
+#: src/emu/ui/miscmenu.cpp:258
 #, c-format
 msgid "Coin %1$c: %2$d%3$s\n"
 msgstr "コイン%1$c：%2$d%3$s\n"
 
-#: src/emu/ui/miscmenu.cpp:260
+#: src/emu/ui/miscmenu.cpp:261
 msgid " (locked)"
 msgstr "（ロック）"
 
-#: src/emu/ui/miscmenu.cpp:519
+#: src/emu/ui/miscmenu.cpp:520
 msgid "Visible Delay"
 msgstr "表示する長さ"
 
-#: src/emu/ui/miscmenu.cpp:617
+#: src/emu/ui/miscmenu.cpp:619
 #, c-format
 msgid "%s.xml saved under ui folder."
 msgstr "%s.xmlをuiフォルダーに保存しました。"
 
-#: src/emu/ui/miscmenu.cpp:645
+#: src/emu/ui/miscmenu.cpp:647
 msgid "Name:             Description:\n"
 msgstr "ROMセット：       名前：\n"
 
-#: src/emu/ui/miscmenu.cpp:657
+#: src/emu/ui/miscmenu.cpp:659
 #, c-format
 msgid "%s.txt saved under ui folder."
 msgstr "%s.txtをuiフォルダーに保存しました。"
 
-#: src/emu/ui/miscmenu.cpp:675
-msgid "Export XML format (like -listxml)"
-msgstr "XML形式で出力（-listxml同様）"
+#: src/emu/ui/miscmenu.cpp:677
+msgid "Export list in XML format (like -listxml)"
+msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:676
-msgid "Export TXT format (like -listfull)"
-msgstr "TXT形式で出力（-listfull同様）"
+#: src/emu/ui/miscmenu.cpp:678
+msgid "Export list in XML format (like -listxml, but exclude devices)"
+msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:734
-msgid "Dummy"
-msgstr "ダミー"
+#: src/emu/ui/miscmenu.cpp:679
+msgid "Export list in TXT format (like -listfull)"
+msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:736
-msgid "Save machine configuration"
-msgstr "マシン設定を保存する"
-
-#: src/emu/ui/miscmenu.cpp:848 src/emu/ui/miscmenu.cpp:869
-#: src/emu/ui/selgame.cpp:594
-msgid "Plugins"
-msgstr "プラグイン"
-
-#: src/emu/ui/optsmenu.cpp:218
-msgid "Filter"
-msgstr "フィルタ"
-
-#: src/emu/ui/optsmenu.cpp:226
-msgid " ^!File"
-msgstr "^!ファイル"
-
-#: src/emu/ui/optsmenu.cpp:231
-msgid " ^!Category"
-msgstr " ^!カテゴリ"
-
-#: src/emu/ui/optsmenu.cpp:254
-msgid "^!Setup custom filter"
-msgstr "^!カスタムフィルタを設定する"
-
-#: src/emu/ui/optsmenu.cpp:262
-msgid "Customize UI"
-msgstr "UIをカスタマイズする"
-
-#: src/emu/ui/optsmenu.cpp:263
-msgid "Configure Directories"
-msgstr "フォルダ設定"
-
-#: src/emu/ui/optsmenu.cpp:266 src/emu/ui/sndmenu.cpp:151
-#: src/emu/ui/sndmenu.cpp:172
-msgid "Sound Options"
-msgstr "サウンド設定"
-
-#: src/emu/ui/optsmenu.cpp:269
-msgid "General Inputs"
-msgstr "共通の入力設定"
-
-#: src/emu/ui/optsmenu.cpp:272
-msgid "Save Configuration"
-msgstr "設定を保存する"
-
-#: src/emu/ui/optsmenu.cpp:286 src/emu/ui/optsmenu.cpp:307
-msgid "Settings"
-msgstr "設定"
-
-#: src/emu/ui/optsmenu.cpp:327
-msgid "**Error saving ui.ini**"
-msgstr "*** ui.iniの保存エラー ***"
-
-#: src/emu/ui/optsmenu.cpp:374
-#, c-format
-msgid "**Error saving %s.ini**"
-msgstr "*** %s.iniの保存エラー ***"
-
-#: src/emu/ui/optsmenu.cpp:378
+#: src/emu/ui/miscmenu.cpp:729 src/emu/ui/optsmenu.cpp:376
 msgid ""
 "\n"
 "    Configuration saved    \n"
@@ -971,20 +912,95 @@ msgstr ""
 "    設定を保存しました    \n"
 "\n"
 
-#: src/emu/ui/selector.cpp:166
+#: src/emu/ui/miscmenu.cpp:774
+msgid "Bios"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:776
+msgid "Driver"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:790
+msgid "Save machine configuration"
+msgstr "マシン設定を保存する"
+
+#: src/emu/ui/miscmenu.cpp:806
+msgid "Configure machine:"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:868 src/emu/ui/selsoft.cpp:109
+msgid " (default)"
+msgstr "（デフォルト）"
+
+#: src/emu/ui/miscmenu.cpp:953 src/emu/ui/miscmenu.cpp:973
+#: src/emu/ui/selgame.cpp:600
+msgid "Plugins"
+msgstr "プラグイン"
+
+#: src/emu/ui/optsmenu.cpp:217
+msgid "Filter"
+msgstr "フィルタ"
+
+#: src/emu/ui/optsmenu.cpp:225
+msgid " ^!File"
+msgstr "^!ファイル"
+
+#: src/emu/ui/optsmenu.cpp:230
+msgid " ^!Category"
+msgstr " ^!カテゴリ"
+
+#: src/emu/ui/optsmenu.cpp:253
+msgid "^!Setup custom filter"
+msgstr "^!カスタムフィルタを設定する"
+
+#: src/emu/ui/optsmenu.cpp:261
+msgid "Customize UI"
+msgstr "UIをカスタマイズする"
+
+#: src/emu/ui/optsmenu.cpp:262
+msgid "Configure Directories"
+msgstr "フォルダ設定"
+
+#: src/emu/ui/optsmenu.cpp:265 src/emu/ui/sndmenu.cpp:149
+#: src/emu/ui/sndmenu.cpp:169
+msgid "Sound Options"
+msgstr "サウンド設定"
+
+#: src/emu/ui/optsmenu.cpp:268
+msgid "General Inputs"
+msgstr "共通の入力設定"
+
+#: src/emu/ui/optsmenu.cpp:271
+msgid "Save Configuration"
+msgstr "設定を保存する"
+
+#: src/emu/ui/optsmenu.cpp:285 src/emu/ui/optsmenu.cpp:305
+msgid "Settings"
+msgstr "設定"
+
+#: src/emu/ui/optsmenu.cpp:325
+msgid "**Error saving ui.ini**"
+msgstr "*** ui.iniの保存エラー ***"
+
+#: src/emu/ui/optsmenu.cpp:372
+#, c-format
+msgid "**Error saving %s.ini**"
+msgstr "*** %s.iniの保存エラー ***"
+
+#: src/emu/ui/selector.cpp:165
 msgid "Selection List - Search: "
 msgstr "選択リスト - 検索:"
 
-#: src/emu/ui/selector.cpp:196
+#: src/emu/ui/selector.cpp:194
 #, c-format
 msgid "Double click or press %1$s to select"
 msgstr "%1$sを押すかダブルクリックで選択してください"
 
-#: src/emu/ui/selgame.cpp:39
+#: src/emu/ui/selgame.cpp:38
 msgid "General Info"
 msgstr "一般情報"
 
-#: src/emu/ui/selgame.cpp:374 src/emu/ui/selsoft.cpp:282
+#: src/emu/ui/selgame.cpp:380 src/emu/ui/selsoft.cpp:281
 #, c-format
 msgid ""
 "%s\n"
@@ -993,8 +1009,8 @@ msgstr ""
 "「%s」を\n"
 "お気に入りに追加しました。"
 
-#: src/emu/ui/selgame.cpp:380 src/emu/ui/selgame.cpp:389
-#: src/emu/ui/selsoft.cpp:287
+#: src/emu/ui/selgame.cpp:386 src/emu/ui/selgame.cpp:395
+#: src/emu/ui/selsoft.cpp:286
 #, c-format
 msgid ""
 "%s\n"
@@ -1003,7 +1019,7 @@ msgstr ""
 "「%s」を\n"
 "お気に入りから削除しました。"
 
-#: src/emu/ui/selgame.cpp:450
+#: src/emu/ui/selgame.cpp:457
 msgid ""
 "The selected machine is missing one or more required ROM or CHD images. "
 "Please select a different machine.\n"
@@ -1011,256 +1027,260 @@ msgid ""
 "Press any key to continue."
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:589 src/emu/ui/simpleselgame.cpp:265
+#: src/emu/ui/selgame.cpp:595 src/emu/ui/simpleselgame.cpp:265
 msgid "Configure Options"
 msgstr "オプションの設定"
 
-#: src/emu/ui/selgame.cpp:752
+#: src/emu/ui/selgame.cpp:596
+msgid "Configure Machine"
+msgstr "マシンの設定"
+
+#: src/emu/ui/selgame.cpp:758
 #, c-format
 msgid "%1$s %2$s ( %3$d / %4$d machines (%5$d BIOS) )"
 msgstr "%1$s %2$s ( %3$d / %4$d マシン (%5$d BIOS) )"
 
-#: src/emu/ui/selgame.cpp:762
+#: src/emu/ui/selgame.cpp:768
 #, c-format
 msgid "%1$s (%2$s - %3$s) - "
 msgstr "%1$s（%2$s〜%3$s）〜"
 
-#: src/emu/ui/selgame.cpp:769 src/emu/ui/selgame.cpp:775
+#: src/emu/ui/selgame.cpp:775 src/emu/ui/selgame.cpp:781
 #, c-format
 msgid "%1$s (%2$s) - "
 msgstr "%1$s（%2$s）〜"
 
-#: src/emu/ui/selgame.cpp:784
+#: src/emu/ui/selgame.cpp:790
 #, c-format
 msgid "%1$s Search: %2$s_"
 msgstr "%1$s検索：%2$s_"
 
-#: src/emu/ui/selgame.cpp:838
+#: src/emu/ui/selgame.cpp:844
 #, c-format
 msgid "Romset: %1$-.100s"
 msgstr "ROMセット：%1$-.100s"
 
-#: src/emu/ui/selgame.cpp:841 src/emu/ui/selgame.cpp:890
-#: src/emu/ui/selsoft.cpp:751 src/emu/ui/selsoft.cpp:801
+#: src/emu/ui/selgame.cpp:847 src/emu/ui/selgame.cpp:896
+#: src/emu/ui/selsoft.cpp:750 src/emu/ui/selsoft.cpp:800
 #: src/emu/ui/simpleselgame.cpp:328
 #, c-format
 msgid "%1$s, %2$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:847 src/emu/ui/selsoft.cpp:757
+#: src/emu/ui/selgame.cpp:853 src/emu/ui/selsoft.cpp:756
 #, c-format
 msgid "Driver is clone of: %1$-.100s"
 msgstr "次のクローンのドライバ：%1$-.100s"
 
-#: src/emu/ui/selgame.cpp:849 src/emu/ui/selsoft.cpp:759
+#: src/emu/ui/selgame.cpp:855 src/emu/ui/selsoft.cpp:758
 msgid "Driver is parent"
 msgstr "親セットのドライバ"
 
-#: src/emu/ui/selgame.cpp:853 src/emu/ui/selsoft.cpp:763
+#: src/emu/ui/selgame.cpp:859 src/emu/ui/selsoft.cpp:762
 #: src/emu/ui/simpleselgame.cpp:335
 msgid "Overall: NOT WORKING"
 msgstr "概略：動作不可"
 
-#: src/emu/ui/selgame.cpp:855 src/emu/ui/selsoft.cpp:765
+#: src/emu/ui/selgame.cpp:861 src/emu/ui/selsoft.cpp:764
 #: src/emu/ui/simpleselgame.cpp:337
 msgid "Overall: Unemulated Protection"
 msgstr "概略：プロテクトが未エミュレート"
 
-#: src/emu/ui/selgame.cpp:857 src/emu/ui/selsoft.cpp:767
+#: src/emu/ui/selgame.cpp:863 src/emu/ui/selsoft.cpp:766
 #: src/emu/ui/simpleselgame.cpp:339
 msgid "Overall: Working"
 msgstr "概略：動作可"
 
-#: src/emu/ui/selgame.cpp:861 src/emu/ui/selsoft.cpp:771
+#: src/emu/ui/selgame.cpp:867 src/emu/ui/selsoft.cpp:770
 msgid "Graphics: Imperfect, "
 msgstr "グラフィック：不完全、"
 
-#: src/emu/ui/selgame.cpp:863 src/emu/ui/selsoft.cpp:773
+#: src/emu/ui/selgame.cpp:869 src/emu/ui/selsoft.cpp:772
 msgid "Graphics: OK, "
 msgstr "グラフィック：正常、"
 
-#: src/emu/ui/selgame.cpp:866 src/emu/ui/selsoft.cpp:776
+#: src/emu/ui/selgame.cpp:872 src/emu/ui/selsoft.cpp:775
 msgid "Sound: Unimplemented"
 msgstr "サウンド：未実装"
 
-#: src/emu/ui/selgame.cpp:868 src/emu/ui/selsoft.cpp:778
+#: src/emu/ui/selgame.cpp:874 src/emu/ui/selsoft.cpp:777
 msgid "Sound: Imperfect"
 msgstr "サウンド：不完全"
 
-#: src/emu/ui/selgame.cpp:870 src/emu/ui/selsoft.cpp:780
+#: src/emu/ui/selgame.cpp:876 src/emu/ui/selsoft.cpp:779
 msgid "Sound: OK"
 msgstr "サウンド：正常"
 
-#: src/emu/ui/selgame.cpp:887
+#: src/emu/ui/selgame.cpp:893
 #, c-format
 msgid "System: %1$-.100s"
 msgstr "システム：%1$-.100s"
 
-#: src/emu/ui/selgame.cpp:894 src/emu/ui/selsoft.cpp:805
+#: src/emu/ui/selgame.cpp:900 src/emu/ui/selsoft.cpp:804
 #, c-format
 msgid "Software is clone of: %1$-.100s"
 msgstr "次のクローンのソフトウェア：%1$-.100s"
 
-#: src/emu/ui/selgame.cpp:896 src/emu/ui/selsoft.cpp:807
+#: src/emu/ui/selgame.cpp:902 src/emu/ui/selsoft.cpp:806
 msgid "Software is parent"
 msgstr "親セットのソフトウェア"
 
-#: src/emu/ui/selgame.cpp:901 src/emu/ui/selsoft.cpp:812
+#: src/emu/ui/selgame.cpp:907 src/emu/ui/selsoft.cpp:811
 msgid "Supported: No"
 msgstr "対応状況：いいえ"
 
-#: src/emu/ui/selgame.cpp:906 src/emu/ui/selsoft.cpp:817
+#: src/emu/ui/selgame.cpp:912 src/emu/ui/selsoft.cpp:816
 msgid "Supported: Partial"
 msgstr "対応状況：部分的"
 
-#: src/emu/ui/selgame.cpp:911 src/emu/ui/selsoft.cpp:822
+#: src/emu/ui/selgame.cpp:917 src/emu/ui/selsoft.cpp:821
 msgid "Supported: Yes"
 msgstr "対応状況：はい"
 
-#: src/emu/ui/selgame.cpp:916 src/emu/ui/selsoft.cpp:827
+#: src/emu/ui/selgame.cpp:922 src/emu/ui/selsoft.cpp:826
 #, c-format
 msgid "romset: %1$-.100s"
 msgstr "ソフト：%1$-.100s"
 
-#: src/emu/ui/selgame.cpp:923
+#: src/emu/ui/selgame.cpp:929
 #, c-format
 msgid "%1$s %2$s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1535
+#: src/emu/ui/selgame.cpp:1543
 #, c-format
 msgid "Romset: %1$-.100s\n"
 msgstr "ROMセット: %1$-.100s\n"
 
-#: src/emu/ui/selgame.cpp:1536
+#: src/emu/ui/selgame.cpp:1544
 #, c-format
 msgid "Year: %1$s\n"
 msgstr "年度: %1$s\n"
 
-#: src/emu/ui/selgame.cpp:1537
+#: src/emu/ui/selgame.cpp:1545
 #, c-format
 msgid "Manufacturer: %1$-.100s\n"
 msgstr "製造元: %1$-.100s\n"
 
-#: src/emu/ui/selgame.cpp:1541
+#: src/emu/ui/selgame.cpp:1549
 #, c-format
 msgid "Driver is Clone of: %1$-.100s\n"
 msgstr "次のクローンのドライバ: %1$-.100s\n"
 
-#: src/emu/ui/selgame.cpp:1543
+#: src/emu/ui/selgame.cpp:1551
 msgid "Driver is Parent\n"
 msgstr "親セットのドライバ\n"
 
-#: src/emu/ui/selgame.cpp:1546
+#: src/emu/ui/selgame.cpp:1554
 msgid "Overall: NOT WORKING\n"
 msgstr "概略: 動作不可\n"
 
-#: src/emu/ui/selgame.cpp:1548
+#: src/emu/ui/selgame.cpp:1556
 msgid "Overall: Unemulated Protection\n"
 msgstr "概略: プロテクトが未エミュレート\n"
 
-#: src/emu/ui/selgame.cpp:1550
+#: src/emu/ui/selgame.cpp:1558
 msgid "Overall: Working\n"
 msgstr "概略: 動作可\n"
 
-#: src/emu/ui/selgame.cpp:1553
+#: src/emu/ui/selgame.cpp:1561
 msgid "Graphics: Imperfect Colors\n"
 msgstr "グラフィック: 色が不完全\n"
 
-#: src/emu/ui/selgame.cpp:1557
+#: src/emu/ui/selgame.cpp:1565
 msgid "Graphics: Imperfect\n"
 msgstr "グラフィック: 不完全\n"
 
-#: src/emu/ui/selgame.cpp:1559
+#: src/emu/ui/selgame.cpp:1567
 msgid "Graphics: OK\n"
 msgstr "グラフィック: 正常\n"
 
-#: src/emu/ui/selgame.cpp:1562
+#: src/emu/ui/selgame.cpp:1570
 msgid "Sound: Unimplemented\n"
 msgstr "サウンド: 未実装\n"
 
-#: src/emu/ui/selgame.cpp:1564
+#: src/emu/ui/selgame.cpp:1572
 msgid "Sound: Imperfect\n"
 msgstr "サウンド: 不完全\n"
 
-#: src/emu/ui/selgame.cpp:1566
+#: src/emu/ui/selgame.cpp:1574
 msgid "Sound: OK\n"
 msgstr "サウンド: 正常\n"
 
-#: src/emu/ui/selgame.cpp:1568
+#: src/emu/ui/selgame.cpp:1576
 #, c-format
 msgid "Driver is Skeleton: %1$s\n"
 msgstr "スケルトンドライバ: %1$s\n"
 
-#: src/emu/ui/selgame.cpp:1569
+#: src/emu/ui/selgame.cpp:1577
 #, c-format
 msgid "Game is Mechanical: %1$s\n"
 msgstr "機械仕掛けのゲーム: %1$s\n"
 
-#: src/emu/ui/selgame.cpp:1570
+#: src/emu/ui/selgame.cpp:1578
 #, c-format
 msgid "Requires Artwork: %1$s\n"
 msgstr "アートワークが必要: %1$s\n"
 
-#: src/emu/ui/selgame.cpp:1571
+#: src/emu/ui/selgame.cpp:1579
 #, c-format
 msgid "Requires Clickable Artwork: %1$s\n"
 msgstr "クリック可のアートワークが必要: %1$s\n"
 
-#: src/emu/ui/selgame.cpp:1572
+#: src/emu/ui/selgame.cpp:1580
 #, c-format
 msgid "Support Cocktail: %1$s\n"
 msgstr "カクテルモード対応: %1$s\n"
 
-#: src/emu/ui/selgame.cpp:1573
+#: src/emu/ui/selgame.cpp:1581
 #, c-format
 msgid "Driver is Bios: %1$s\n"
 msgstr "BIOSドライバ: %1$s\n"
 
-#: src/emu/ui/selgame.cpp:1574
+#: src/emu/ui/selgame.cpp:1582
 #, c-format
 msgid "Support Save: %1$s\n"
 msgstr "セーブ対応: %1$s\n"
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 #, c-format
 msgid "Screen Orientation: %1$s\n"
 msgstr "画面の向き: %1$s\n"
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 msgid "Vertical"
 msgstr "縦"
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 msgid "Horizontal"
 msgstr "横"
 
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/selgame.cpp:1591
 #, c-format
 msgid "Requires CHD: %1$s\n"
 msgstr "CHDが必要: %1$s\n"
 
-#: src/emu/ui/selgame.cpp:1596
+#: src/emu/ui/selgame.cpp:1604
 msgid "Roms Audit Pass: OK\n"
 msgstr "ROM検証結果: 正常\n"
 
-#: src/emu/ui/selgame.cpp:1598
+#: src/emu/ui/selgame.cpp:1606
 msgid "Roms Audit Pass: BAD\n"
 msgstr "ROM検証結果: 異常\n"
 
-#: src/emu/ui/selgame.cpp:1601
+#: src/emu/ui/selgame.cpp:1609
 msgid "Samples Audit Pass: None Needed\n"
 msgstr "サンプル検証結果: 不要\n"
 
-#: src/emu/ui/selgame.cpp:1603
+#: src/emu/ui/selgame.cpp:1611
 msgid "Samples Audit Pass: OK\n"
 msgstr "サンプル検証結果: 正常\n"
 
-#: src/emu/ui/selgame.cpp:1605
+#: src/emu/ui/selgame.cpp:1613
 msgid "Samples Audit Pass: BAD\n"
 msgstr "サンプル検証結果: 異常\n"
 
-#: src/emu/ui/selgame.cpp:1608
+#: src/emu/ui/selgame.cpp:1616
 msgid ""
 "Roms Audit Pass: Disabled\n"
 "Samples Audit Pass: Disabled\n"
@@ -1268,20 +1288,16 @@ msgstr ""
 "ROM検証結果: 無効\n"
 "サンプル検証結果: 無効\n"
 
-#: src/emu/ui/selgame.cpp:2049 src/emu/ui/selgame.cpp:2212
-#: src/emu/ui/selsoft.cpp:1662
+#: src/emu/ui/selgame.cpp:2055 src/emu/ui/selgame.cpp:2216
+#: src/emu/ui/selsoft.cpp:1655
 msgid "No Infos Available"
 msgstr "利用可能な情報はありません"
 
-#: src/emu/ui/selgame.cpp:2162 src/emu/ui/selsoft.cpp:1607
+#: src/emu/ui/selgame.cpp:2168 src/emu/ui/selsoft.cpp:1602
 msgid "Usage"
 msgstr "使い方"
 
-#: src/emu/ui/selsoft.cpp:110
-msgid " (default)"
-msgstr "（デフォルト）"
-
-#: src/emu/ui/selsoft.cpp:381
+#: src/emu/ui/selsoft.cpp:380
 msgid ""
 "The selected software is missing one or more required files. Please select a "
 "different software.\n"
@@ -1289,57 +1305,57 @@ msgid ""
 "Press any key to continue."
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:684
+#: src/emu/ui/selsoft.cpp:683
 #, c-format
-msgid "%1$s %2$s ( %3$d / %4$d softwares )"
-msgstr "%1$s %2$s ( %3$d / %4$d ソフトウェア )"
+msgid "%1$s %2$s ( %3$d / %4$d software packages )"
+msgstr ""
 
-#: src/emu/ui/selsoft.cpp:685
+#: src/emu/ui/selsoft.cpp:684
 #, c-format
 msgid "Driver: \"%1$s\" software list "
 msgstr "ドライバ：「%1$s」　ソフトウェアリスト"
 
-#: src/emu/ui/selsoft.cpp:688
+#: src/emu/ui/selsoft.cpp:687
 #, c-format
 msgid "Region: %1$s -"
 msgstr "リージョン：%1$s〜"
 
-#: src/emu/ui/selsoft.cpp:690
+#: src/emu/ui/selsoft.cpp:689
 #, c-format
 msgid "Publisher: %1$s -"
 msgstr "発売元：%1$s〜"
 
-#: src/emu/ui/selsoft.cpp:692
+#: src/emu/ui/selsoft.cpp:691
 #, c-format
 msgid "Year: %1$s -"
 msgstr "年度：%1$s〜"
 
-#: src/emu/ui/selsoft.cpp:694
+#: src/emu/ui/selsoft.cpp:693
 #, c-format
 msgid "Software List: %1$s -"
 msgstr "ソフトウェアリスト：%1$s〜"
 
-#: src/emu/ui/selsoft.cpp:696
+#: src/emu/ui/selsoft.cpp:695
 #, c-format
 msgid "Device type: %1$s -"
 msgstr "デバイスタイプ：%1$s〜"
 
-#: src/emu/ui/selsoft.cpp:698
+#: src/emu/ui/selsoft.cpp:697
 #, c-format
 msgid "%s Search: %s_"
 msgstr "%1$s検索：%2$s_"
 
-#: src/emu/ui/selsoft.cpp:748 src/emu/ui/selsoft.cpp:798
+#: src/emu/ui/selsoft.cpp:747 src/emu/ui/selsoft.cpp:797
 #: src/emu/ui/simpleselgame.cpp:325
 #, c-format
 msgid "%1$-.100s"
 msgstr "%1$-.100s"
 
-#: src/emu/ui/selsoft.cpp:1998 src/emu/ui/selsoft.cpp:2018
+#: src/emu/ui/selsoft.cpp:1991 src/emu/ui/selsoft.cpp:2011
 msgid "Software part selection:"
 msgstr "選択中のソフトウェアパーツ:"
 
-#: src/emu/ui/selsoft.cpp:2136 src/emu/ui/selsoft.cpp:2156
+#: src/emu/ui/selsoft.cpp:2129 src/emu/ui/selsoft.cpp:2149
 msgid "Bios selection:"
 msgstr "BIOS選択："
 
@@ -1392,15 +1408,15 @@ msgstr "グラフィックス：%s　サウンド：%s"
 msgid " [internal]"
 msgstr " [内部]"
 
-#: src/emu/ui/sndmenu.cpp:135
+#: src/emu/ui/sndmenu.cpp:133
 msgid "Sound"
 msgstr "サウンド"
 
-#: src/emu/ui/sndmenu.cpp:136
+#: src/emu/ui/sndmenu.cpp:134
 msgid "Sample Rate"
 msgstr "サンプルレート"
 
-#: src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/sndmenu.cpp:135
 msgid "Use External Samples"
 msgstr "外部サンプル使用"
 
@@ -1469,11 +1485,11 @@ msgstr "巻き戻す"
 msgid "Fast Forward"
 msgstr "早送り"
 
-#: src/emu/ui/ui.cpp:419
+#: src/emu/ui/ui.cpp:418
 msgid "This driver requires images to be loaded in the following device(s): "
 msgstr "このドライバは以下のデバイスでイメージの読み込みが必要です:"
 
-#: src/emu/ui/ui.cpp:1074
+#: src/emu/ui/ui.cpp:1071
 msgid ""
 "One or more ROMs/CHDs for this machine are incorrect. The machine may not "
 "run correctly.\n"
@@ -1481,7 +1497,7 @@ msgstr ""
 "このマシン用のROM/CHDが正しくありません。そのため正しく動作しない可能性があり"
 "ます。\n"
 
-#: src/emu/ui/ui.cpp:1087
+#: src/emu/ui/ui.cpp:1084
 msgid ""
 "There are known problems with this machine\n"
 "\n"
@@ -1489,50 +1505,50 @@ msgstr ""
 "このマシンには以下のような問題点があります\n"
 "\n"
 
-#: src/emu/ui/ui.cpp:1091
+#: src/emu/ui/ui.cpp:1088
 msgid ""
 "One or more ROMs/CHDs for this machine have not been correctly dumped.\n"
 msgstr ""
 "このマシン用のROM/CHDは全て正しく吸い出されていません。\n"
 "\n"
 
-#: src/emu/ui/ui.cpp:1095
+#: src/emu/ui/ui.cpp:1092
 #, c-format
 msgid "The keyboard emulation may not be 100% accurate.\n"
 msgstr "キーボードエミュレーションが100%正確ではありません。\n"
 
-#: src/emu/ui/ui.cpp:1097
+#: src/emu/ui/ui.cpp:1094
 #, c-format
 msgid "The colors aren't 100% accurate.\n"
 msgstr "表示色が100%正確ではありません。\n"
 
-#: src/emu/ui/ui.cpp:1099
+#: src/emu/ui/ui.cpp:1096
 msgid "The colors are completely wrong.\n"
 msgstr "表示色が完全に間違っています。\n"
 
-#: src/emu/ui/ui.cpp:1101
+#: src/emu/ui/ui.cpp:1098
 #, c-format
 msgid "The video emulation isn't 100% accurate.\n"
 msgstr "表示系のエミュレーションが100%正確ではありません。\n"
 
-#: src/emu/ui/ui.cpp:1103
+#: src/emu/ui/ui.cpp:1100
 #, c-format
 msgid "The sound emulation isn't 100% accurate.\n"
 msgstr "サウンドエミュレーションが100%正確ではありません。\n"
 
-#: src/emu/ui/ui.cpp:1105
+#: src/emu/ui/ui.cpp:1102
 msgid "The machine lacks sound.\n"
 msgstr "このマシンは音が鳴りません。\n"
 
-#: src/emu/ui/ui.cpp:1108
+#: src/emu/ui/ui.cpp:1105
 msgid "Screen flipping in cocktail mode is not supported.\n"
 msgstr "カクテルモードでの画面反転表示はサポートされていません。\n"
 
-#: src/emu/ui/ui.cpp:1112
+#: src/emu/ui/ui.cpp:1109
 msgid "The machine requires external artwork files\n"
 msgstr "このマシンは別途アートワークファイルが必要です。\n"
 
-#: src/emu/ui/ui.cpp:1117
+#: src/emu/ui/ui.cpp:1114
 msgid ""
 "This machine was never completed. It may exhibit strange behavior or missing "
 "elements that are not bugs in the emulation.\n"
@@ -1540,7 +1556,7 @@ msgstr ""
 "このマシンは未完成です。動作の不具合や不足した要素があってもエミュレーション"
 "のバグではありません。\n"
 
-#: src/emu/ui/ui.cpp:1122
+#: src/emu/ui/ui.cpp:1119
 msgid ""
 "This machine has no sound hardware, MAME will produce no sounds, this is "
 "expected behaviour.\n"
@@ -1548,11 +1564,11 @@ msgstr ""
 "このマシンにはサウンドハードウェアがありません。音が出なくても正常な動作で"
 "す。\n"
 
-#: src/emu/ui/ui.cpp:1130
+#: src/emu/ui/ui.cpp:1127
 msgid "The machine has protection which isn't fully emulated.\n"
 msgstr "このマシンのプロテクトは完全にエミュレートされていません。\n"
 
-#: src/emu/ui/ui.cpp:1133
+#: src/emu/ui/ui.cpp:1130
 msgid ""
 "\n"
 "THIS MACHINE DOESN'T WORK. The emulation for this machine is not yet "
@@ -1563,7 +1579,7 @@ msgstr ""
 "このマシンは動作しません。エミュレーションは未完成です。開発者がエミュレー"
 "ションを改良するのをお待ち下さい。\n"
 
-#: src/emu/ui/ui.cpp:1137
+#: src/emu/ui/ui.cpp:1134
 msgid ""
 "\n"
 "Certain elements of this machine cannot be emulated as it requires actual "
@@ -1574,7 +1590,7 @@ msgstr ""
 "このマシンの一部の要素は、機械的デバイスによる実際の動作が必要なためエミュ"
 "レートできません。そのため、このマシンを完全にプレイすることはできません。\n"
 
-#: src/emu/ui/ui.cpp:1156
+#: src/emu/ui/ui.cpp:1153
 msgid ""
 "\n"
 "\n"
@@ -1584,7 +1600,7 @@ msgstr ""
 "\n"
 "このマシンの動作可能なクローンセット:"
 
-#: src/emu/ui/ui.cpp:1170
+#: src/emu/ui/ui.cpp:1167
 msgid ""
 "\n"
 "\n"
@@ -1594,7 +1610,7 @@ msgstr ""
 "\n"
 "進めるには、何かキーを押してください。"
 
-#: src/emu/ui/ui.cpp:1185
+#: src/emu/ui/ui.cpp:1182
 #, c-format
 msgid ""
 "%1$s\n"
@@ -1609,15 +1625,15 @@ msgstr ""
 "\n"
 "CPU:\n"
 
-#: src/emu/ui/ui.cpp:1221 src/emu/ui/ui.cpp:1260
+#: src/emu/ui/ui.cpp:1218 src/emu/ui/ui.cpp:1257
 msgid "MHz"
 msgstr "MHz"
 
-#: src/emu/ui/ui.cpp:1221 src/emu/ui/ui.cpp:1260
+#: src/emu/ui/ui.cpp:1218 src/emu/ui/ui.cpp:1257
 msgid "kHz"
 msgstr "kHz"
 
-#: src/emu/ui/ui.cpp:1235
+#: src/emu/ui/ui.cpp:1232
 msgid ""
 "\n"
 "Sound:\n"
@@ -1625,7 +1641,7 @@ msgstr ""
 "\n"
 "サウンド:\n"
 
-#: src/emu/ui/ui.cpp:1264
+#: src/emu/ui/ui.cpp:1261
 msgid ""
 "\n"
 "Video:\n"
@@ -1633,78 +1649,78 @@ msgstr ""
 "\n"
 "表示:\n"
 
-#: src/emu/ui/ui.cpp:1268
+#: src/emu/ui/ui.cpp:1265
 msgid "None\n"
 msgstr "なし\n"
 
-#: src/emu/ui/ui.cpp:1275
+#: src/emu/ui/ui.cpp:1272
 msgid "Vector"
 msgstr "ベクター"
 
-#: src/emu/ui/ui.cpp:1286
+#: src/emu/ui/ui.cpp:1283
 #, c-format
 msgid "%1$s: %2$s\n"
 msgstr "%1$s：%2$s\n"
 
-#: src/emu/ui/ui.cpp:1286
+#: src/emu/ui/ui.cpp:1283
 msgid "%2$s\n"
 msgstr "%2$s\n"
 
-#: src/emu/ui/ui.cpp:1541 src/emu/ui/ui.cpp:1551
+#: src/emu/ui/ui.cpp:1538 src/emu/ui/ui.cpp:1548
 msgid "Keyboard Emulation Status"
 msgstr "キーボードエミュレーションステータス"
 
-#: src/emu/ui/ui.cpp:1543
+#: src/emu/ui/ui.cpp:1540
 msgid "Mode: PARTIAL Emulation"
 msgstr "モード: 部分的エミュレーション"
 
-#: src/emu/ui/ui.cpp:1544
+#: src/emu/ui/ui.cpp:1541
 msgid "UI:   Enabled"
 msgstr "UI:   有効"
 
-#: src/emu/ui/ui.cpp:1546 src/emu/ui/ui.cpp:1556
+#: src/emu/ui/ui.cpp:1543 src/emu/ui/ui.cpp:1553
 msgid "**Use ScrLock to toggle**"
 msgstr "** ScrLockキーで切り替え **"
 
-#: src/emu/ui/ui.cpp:1553
+#: src/emu/ui/ui.cpp:1550
 msgid "Mode: FULL Emulation"
 msgstr "モード：完全エミュレーション"
 
-#: src/emu/ui/ui.cpp:1554
+#: src/emu/ui/ui.cpp:1551
 msgid "UI:   Disabled"
 msgstr "UI:   無効"
 
-#: src/emu/ui/ui.cpp:1692
+#: src/emu/ui/ui.cpp:1689
 msgid "Autofire can't be enabled"
 msgstr "連射機能は有効にできません"
 
-#: src/emu/ui/ui.cpp:1731
+#: src/emu/ui/ui.cpp:1728
 msgid "Select position to save to"
 msgstr "セーブ先を選択"
 
-#: src/emu/ui/ui.cpp:1733
+#: src/emu/ui/ui.cpp:1730
 msgid "Select position to load from"
 msgstr "セーブ元を選択"
 
-#: src/emu/ui/ui.cpp:1757
+#: src/emu/ui/ui.cpp:1754
 msgid "Save cancelled"
 msgstr "セーブはキャンセルされました"
 
-#: src/emu/ui/ui.cpp:1759
+#: src/emu/ui/ui.cpp:1756
 msgid "Load cancelled"
 msgstr "ロードはキャンセルされました"
 
-#: src/emu/ui/ui.cpp:1802
+#: src/emu/ui/ui.cpp:1799
 #, c-format
 msgid "Save to position %s"
 msgstr "%sにセーブしました"
 
-#: src/emu/ui/ui.cpp:1807
+#: src/emu/ui/ui.cpp:1804
 #, c-format
 msgid "Load from position %s"
 msgstr "%sからロードしました"
 
-#: src/emu/ui/ui.cpp:1847
+#: src/emu/ui/ui.cpp:1844
 #, c-format
 msgid ""
 "Are you sure you want to quit?\n"
@@ -1717,173 +1733,173 @@ msgstr ""
 "「%1$s」で終了\n"
 "「%2$s」でエミュレーションに戻る"
 
-#: src/emu/ui/ui.cpp:1917
+#: src/emu/ui/ui.cpp:1914
 msgid "Master Volume"
 msgstr "マスター音量"
 
-#: src/emu/ui/ui.cpp:1926
+#: src/emu/ui/ui.cpp:1923
 #, c-format
 msgid "%1$s Volume"
 msgstr "%1$sの音量"
 
-#: src/emu/ui/ui.cpp:1949
+#: src/emu/ui/ui.cpp:1946
 #, c-format
 msgid "Overclock CPU %1$s"
 msgstr "CPU %1$sのオーバークロック"
 
-#: src/emu/ui/ui.cpp:1968
+#: src/emu/ui/ui.cpp:1965
 #, c-format
 msgid "%1$s Refresh Rate"
 msgstr "%1$sのリフレッシュレート"
 
-#: src/emu/ui/ui.cpp:1973
+#: src/emu/ui/ui.cpp:1970
 #, c-format
 msgid "%1$s Brightness"
 msgstr "%1$sの輝度"
 
-#: src/emu/ui/ui.cpp:1975
+#: src/emu/ui/ui.cpp:1972
 #, c-format
 msgid "%1$s Contrast"
 msgstr "%1$sのコントラスト"
 
-#: src/emu/ui/ui.cpp:1977
+#: src/emu/ui/ui.cpp:1974
 #, c-format
 msgid "%1$s Gamma"
 msgstr "%1$sのガンマ"
 
-#: src/emu/ui/ui.cpp:1981
+#: src/emu/ui/ui.cpp:1978
 #, c-format
 msgid "%1$s Horiz Stretch"
 msgstr "%1$s 横方向の拡大"
 
-#: src/emu/ui/ui.cpp:1983
+#: src/emu/ui/ui.cpp:1980
 #, c-format
 msgid "%1$s Horiz Position"
 msgstr "%1$s 横方向の位置"
 
-#: src/emu/ui/ui.cpp:1985
+#: src/emu/ui/ui.cpp:1982
 #, c-format
 msgid "%1$s Vert Stretch"
 msgstr "%1$s 縦方向の拡大"
 
-#: src/emu/ui/ui.cpp:1987
+#: src/emu/ui/ui.cpp:1984
 #, c-format
 msgid "%1$s Vert Position"
 msgstr "%1$s 縦方向の位置"
 
-#: src/emu/ui/ui.cpp:2005
+#: src/emu/ui/ui.cpp:2002
 #, c-format
 msgid "Laserdisc '%1$s' Horiz Stretch"
 msgstr "レーザーディスク '%1$s' 横方向の拡大"
 
-#: src/emu/ui/ui.cpp:2007
+#: src/emu/ui/ui.cpp:2004
 #, c-format
 msgid "Laserdisc '%1$s' Horiz Position"
 msgstr "レーザーディスク '%1$s' 横方向の位置"
 
-#: src/emu/ui/ui.cpp:2009
+#: src/emu/ui/ui.cpp:2006
 #, c-format
 msgid "Laserdisc '%1$s' Vert Stretch"
 msgstr "レーザーディスク '%1$s' 縦方向の拡大"
 
-#: src/emu/ui/ui.cpp:2011
+#: src/emu/ui/ui.cpp:2008
 #, c-format
 msgid "Laserdisc '%1$s' Vert Position"
 msgstr "レーザーディスク '%1$s' 縦方向の位置"
 
-#: src/emu/ui/ui.cpp:2021
+#: src/emu/ui/ui.cpp:2018
 msgid "Vector Flicker"
 msgstr "ベクターのちらつき"
 
-#: src/emu/ui/ui.cpp:2022
+#: src/emu/ui/ui.cpp:2019
 msgid "Beam Width Minimum"
 msgstr "ビーム幅（最小）"
 
-#: src/emu/ui/ui.cpp:2023
+#: src/emu/ui/ui.cpp:2020
 msgid "Beam Width Maximum"
 msgstr "ビーム幅（最大）"
 
-#: src/emu/ui/ui.cpp:2024
+#: src/emu/ui/ui.cpp:2021
 msgid "Beam Intensity Weight"
 msgstr "ビーム強度比重"
 
-#: src/emu/ui/ui.cpp:2037
+#: src/emu/ui/ui.cpp:2034
 #, c-format
 msgid "Crosshair Scale %1$s"
 msgstr "照準の大きさ %1$s"
 
-#: src/emu/ui/ui.cpp:2037 src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2034 src/emu/ui/ui.cpp:2036
 msgid "X"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2037 src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2034 src/emu/ui/ui.cpp:2036
 msgid "Y"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2036
 #, c-format
 msgid "Crosshair Offset %1$s"
 msgstr "照準のオフセット %1$s"
 
-#: src/emu/ui/ui.cpp:2071
+#: src/emu/ui/ui.cpp:2068
 #, c-format
 msgid "%1$3ddB"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2115
+#: src/emu/ui/ui.cpp:2112
 #, c-format
 msgid "%1$d%%"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2131
+#: src/emu/ui/ui.cpp:2128
 #, c-format
 msgid "%1$3.0f%%"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2154
+#: src/emu/ui/ui.cpp:2151
 #, c-format
 msgid "%1$.3ffps"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2177 src/emu/ui/ui.cpp:2199 src/emu/ui/ui.cpp:2220
-#: src/emu/ui/ui.cpp:2242 src/emu/ui/ui.cpp:2264 src/emu/ui/ui.cpp:2286
-#: src/emu/ui/ui.cpp:2308 src/emu/ui/ui.cpp:2330 src/emu/ui/ui.cpp:2352
-#: src/emu/ui/ui.cpp:2374 src/emu/ui/ui.cpp:2396
+#: src/emu/ui/ui.cpp:2174 src/emu/ui/ui.cpp:2196 src/emu/ui/ui.cpp:2217
+#: src/emu/ui/ui.cpp:2239 src/emu/ui/ui.cpp:2261 src/emu/ui/ui.cpp:2283
+#: src/emu/ui/ui.cpp:2305 src/emu/ui/ui.cpp:2327 src/emu/ui/ui.cpp:2349
+#: src/emu/ui/ui.cpp:2371 src/emu/ui/ui.cpp:2393
 #, c-format
 msgid "%1$.3f"
 msgstr "%1$.3f"
 
-#: src/emu/ui/ui.cpp:2412 src/emu/ui/ui.cpp:2428 src/emu/ui/ui.cpp:2444
-#: src/emu/ui/ui.cpp:2460
+#: src/emu/ui/ui.cpp:2408 src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2438
+#: src/emu/ui/ui.cpp:2453
 #, c-format
 msgid "%1$1.2f"
 msgstr "%1$1.2f"
 
-#: src/emu/ui/ui.cpp:2476
+#: src/emu/ui/ui.cpp:2469
 #, c-format
 msgid "Screen '%1$s'"
 msgstr "画面「%1$s」"
 
-#: src/emu/ui/ui.cpp:2478
+#: src/emu/ui/ui.cpp:2471
 msgid "Screen"
 msgstr "画面"
 
-#: src/emu/ui/ui.cpp:2494
+#: src/emu/ui/ui.cpp:2487
 #, c-format
 msgid "Crosshair Scale X %1$1.3f"
 msgstr "照準の大きさ X %1$1.3f"
 
-#: src/emu/ui/ui.cpp:2494
+#: src/emu/ui/ui.cpp:2487
 #, c-format
 msgid "Crosshair Scale Y %1$1.3f"
 msgstr "照準の大きさ Y %1$1.3f"
 
-#: src/emu/ui/ui.cpp:2513
+#: src/emu/ui/ui.cpp:2506
 #, c-format
 msgid "Crosshair Offset X %1$1.3f"
 msgstr "照準のオフセット X %1$1.3f"
 
-#: src/emu/ui/ui.cpp:2513
+#: src/emu/ui/ui.cpp:2506
 #, c-format
 msgid "Crosshair Offset Y %1$1.3f"
 msgstr "照準のオフセット Y %1$1.3f"
@@ -1925,14 +1941,26 @@ msgstr "切り落とし"
 msgid "Full"
 msgstr "全体"
 
-#: src/emu/ui/viewgfx.cpp:392
+#: src/emu/ui/viewgfx.cpp:391
 msgid " COLORS"
 msgstr " 色"
 
-#: src/emu/ui/viewgfx.cpp:392
+#: src/emu/ui/viewgfx.cpp:391
 msgid " PENS"
 msgstr " ペン"
 
+#~ msgid "Export XML format (like -listxml)"
+#~ msgstr "XML形式で出力（-listxml同様）"
+
+#~ msgid "Export TXT format (like -listfull)"
+#~ msgstr "TXT形式で出力（-listfull同様）"
+
+#~ msgid "Dummy"
+#~ msgstr "ダミー"
+
+#~ msgid "%1$s %2$s ( %3$d / %4$d softwares )"
+#~ msgstr "%1$s %2$s ( %3$d / %4$d ソフトウェア )"
+
 #~ msgid "Lightgun Device Assignment"
 #~ msgstr "光線銃デバイス割り当て"
 
@@ -2077,9 +2105,6 @@ msgstr " ペン"
 #~ "\n"
 #~ "OKとタイプするか、ジョイスティックを左右に動かして進む"
 
-#~ msgid "Configure Machine"
-#~ msgstr "マシンの設定"
-
 #~ msgid "Multi-Threaded Rendering"
 #~ msgstr "マルチスレッド描画"
 
diff --git a/language/Korean/strings.po b/language/Korean/strings.po
index 99667df3918..20707719174 100644
--- a/language/Korean/strings.po
+++ b/language/Korean/strings.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MAME\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-11 03:33+0200\n"
+"POT-Creation-Date: 2016-04-15 17:42+0200\n"
 "PO-Revision-Date: 2016-02-20 18:03+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: MAME Language Team\n"
@@ -61,14 +61,14 @@ msgstr ""
 msgid "Autofire Status"
 msgstr ""
 
-#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1698
+#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1695
 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211
 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219
 #: src/emu/ui/videoopt.cpp:223
 msgid "Disabled"
 msgstr ""
 
-#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1698
+#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1695
 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211
 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219
 #: src/emu/ui/videoopt.cpp:223
@@ -76,14 +76,14 @@ msgid "Enabled"
 msgstr ""
 
 #: src/emu/ui/cheatopt.cpp:282 src/emu/ui/cheatopt.cpp:288
-#: src/emu/ui/menu.cpp:710 src/emu/ui/miscmenu.cpp:831
-#: src/emu/ui/sndmenu.cpp:135 src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/menu.cpp:755 src/emu/ui/miscmenu.cpp:936
+#: src/emu/ui/sndmenu.cpp:133 src/emu/ui/sndmenu.cpp:135
 msgid "On"
 msgstr ""
 
 #: src/emu/ui/cheatopt.cpp:282 src/emu/ui/cheatopt.cpp:288
-#: src/emu/ui/menu.cpp:713 src/emu/ui/miscmenu.cpp:831
-#: src/emu/ui/sndmenu.cpp:135 src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/menu.cpp:758 src/emu/ui/miscmenu.cpp:936
+#: src/emu/ui/sndmenu.cpp:133 src/emu/ui/sndmenu.cpp:135
 msgid "Off"
 msgstr ""
 
@@ -95,316 +95,316 @@ msgstr ""
 msgid "Autofire Delay"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:158 src/emu/ui/custmenu.cpp:447
+#: src/emu/ui/custmenu.cpp:157 src/emu/ui/custmenu.cpp:445
 msgid "Main filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:167 src/emu/ui/custmenu.cpp:456
+#: src/emu/ui/custmenu.cpp:166 src/emu/ui/custmenu.cpp:454
 msgid "Other filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:176 src/emu/ui/optsmenu.cpp:239
+#: src/emu/ui/custmenu.cpp:175 src/emu/ui/optsmenu.cpp:238
 msgid "^!Manufacturer"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:185 src/emu/ui/custmenu.cpp:474
-#: src/emu/ui/optsmenu.cpp:247
+#: src/emu/ui/custmenu.cpp:184 src/emu/ui/custmenu.cpp:472
+#: src/emu/ui/optsmenu.cpp:246
 msgid "^!Year"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:194 src/emu/ui/custmenu.cpp:510
+#: src/emu/ui/custmenu.cpp:193 src/emu/ui/custmenu.cpp:508
 msgid "Remove last filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:197 src/emu/ui/custmenu.cpp:513
+#: src/emu/ui/custmenu.cpp:196 src/emu/ui/custmenu.cpp:511
 msgid "Add filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:212 src/emu/ui/custmenu.cpp:233
-#: src/emu/ui/custmenu.cpp:529 src/emu/ui/custmenu.cpp:550
+#: src/emu/ui/custmenu.cpp:211 src/emu/ui/custmenu.cpp:231
+#: src/emu/ui/custmenu.cpp:527 src/emu/ui/custmenu.cpp:547
 msgid "Select custom filters:"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:465
+#: src/emu/ui/custmenu.cpp:463
 msgid "^!Publisher"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:483
+#: src/emu/ui/custmenu.cpp:481
 msgid "^!Software List"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:492
+#: src/emu/ui/custmenu.cpp:490
 msgid "^!Device type"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:501
+#: src/emu/ui/custmenu.cpp:499
 msgid "^!Region"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:23
+#: src/emu/ui/custui.cpp:22
 msgid "Show All"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:24
+#: src/emu/ui/custui.cpp:23
 msgid "Hide Filters"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:25
+#: src/emu/ui/custui.cpp:24
 msgid "Hide Info/Image"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:26
+#: src/emu/ui/custui.cpp:25
 msgid "Hide Both"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:142
+#: src/emu/ui/custui.cpp:141
 msgid "Fonts"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:143
+#: src/emu/ui/custui.cpp:142
 msgid "Colors"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:148 src/emu/ui/dirmenu.cpp:33
+#: src/emu/ui/custui.cpp:147 src/emu/ui/dirmenu.cpp:33
 msgid "Language"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:152
+#: src/emu/ui/custui.cpp:151
 msgid "Show side panels"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:167 src/emu/ui/custui.cpp:188
+#: src/emu/ui/custui.cpp:166 src/emu/ui/custui.cpp:186
 msgid "Custom UI Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:246
+#: src/emu/ui/custui.cpp:244
 msgid "default"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:349
+#: src/emu/ui/custui.cpp:347
 msgid "UI Font"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:354
+#: src/emu/ui/custui.cpp:352
 msgid "Bold"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:355
+#: src/emu/ui/custui.cpp:353
 msgid "Italic"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:360
+#: src/emu/ui/custui.cpp:358
 msgid "Lines"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:366
+#: src/emu/ui/custui.cpp:364
 msgid "Infos text size"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:383
+#: src/emu/ui/custui.cpp:381
 msgid "UI Fonts Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:411
+#: src/emu/ui/custui.cpp:408
 msgid "Sample text - Lorem ipsum dolor sit amet, consectetur adipiscing elit."
 msgstr ""
 
-#: src/emu/ui/custui.cpp:509
+#: src/emu/ui/custui.cpp:506
 msgid "Normal text"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:510
+#: src/emu/ui/custui.cpp:507
 msgid "Selected color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:511
+#: src/emu/ui/custui.cpp:508
 msgid "Normal text background"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:512
+#: src/emu/ui/custui.cpp:509
 msgid "Selected background color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:513
+#: src/emu/ui/custui.cpp:510
 msgid "Subitem color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:514 src/emu/ui/custui.cpp:610
+#: src/emu/ui/custui.cpp:511 src/emu/ui/custui.cpp:606
 msgid "Clone"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:515
+#: src/emu/ui/custui.cpp:512
 msgid "Border"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:516
+#: src/emu/ui/custui.cpp:513
 msgid "Background"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:517
+#: src/emu/ui/custui.cpp:514
 msgid "Dipswitch"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:518
+#: src/emu/ui/custui.cpp:515
 msgid "Unavailable color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:519
+#: src/emu/ui/custui.cpp:516
 msgid "Slider color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:520
+#: src/emu/ui/custui.cpp:517
 msgid "Gfx viewer background"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:521
+#: src/emu/ui/custui.cpp:518
 msgid "Mouse over color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:522
+#: src/emu/ui/custui.cpp:519
 msgid "Mouse over background color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:523
+#: src/emu/ui/custui.cpp:520
 msgid "Mouse down color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:524
+#: src/emu/ui/custui.cpp:521
 msgid "Mouse down background color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:527
+#: src/emu/ui/custui.cpp:524
 msgid "Restore originals colors"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:543
+#: src/emu/ui/custui.cpp:540
 msgid "UI Colors Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:572
+#: src/emu/ui/custui.cpp:568
 #, c-format
 msgid "Double click or press %1$s to change the color value"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:598
+#: src/emu/ui/custui.cpp:594
 msgid "Menu Preview"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:606
+#: src/emu/ui/custui.cpp:602
 msgid "Normal"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:607
+#: src/emu/ui/custui.cpp:603
 msgid "Subitem"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:608
+#: src/emu/ui/custui.cpp:604
 msgid "Selected"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:609
+#: src/emu/ui/custui.cpp:605
 msgid "Mouse Over"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:841 src/emu/ui/custui.cpp:844
+#: src/emu/ui/custui.cpp:837 src/emu/ui/custui.cpp:840
 msgid "Alpha"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:849 src/emu/ui/custui.cpp:852
-#: src/emu/ui/custui.cpp:1013
+#: src/emu/ui/custui.cpp:845 src/emu/ui/custui.cpp:848
+#: src/emu/ui/custui.cpp:1007
 msgid "Red"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:857 src/emu/ui/custui.cpp:860
-#: src/emu/ui/custui.cpp:1016
+#: src/emu/ui/custui.cpp:853 src/emu/ui/custui.cpp:856
+#: src/emu/ui/custui.cpp:1010
 msgid "Green"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:865 src/emu/ui/custui.cpp:868
-#: src/emu/ui/custui.cpp:1017
+#: src/emu/ui/custui.cpp:861 src/emu/ui/custui.cpp:864
+#: src/emu/ui/custui.cpp:1011
 msgid "Blue"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:871
+#: src/emu/ui/custui.cpp:867
 msgid "Choose from palette"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:887
+#: src/emu/ui/custui.cpp:883
 msgid " - ARGB Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:912
+#: src/emu/ui/custui.cpp:907
 msgid "Color preview ="
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1009
+#: src/emu/ui/custui.cpp:1003
 msgid "White"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1010
+#: src/emu/ui/custui.cpp:1004
 msgid "Silver"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1011
+#: src/emu/ui/custui.cpp:1005
 msgid "Gray"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1012
+#: src/emu/ui/custui.cpp:1006
 msgid "Black"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1014
+#: src/emu/ui/custui.cpp:1008
 msgid "Orange"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1015
+#: src/emu/ui/custui.cpp:1009
 msgid "Yellow"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1018
+#: src/emu/ui/custui.cpp:1012
 msgid "Violet"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:65
+#: src/emu/ui/datmenu.cpp:64
 msgid "Software History"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:67
+#: src/emu/ui/datmenu.cpp:66
 msgid "Software Usage"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:199
+#: src/emu/ui/datmenu.cpp:196
 msgid "Revision: "
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:287 src/emu/ui/selgame.cpp:40
-#: src/emu/ui/selgame.cpp:2152 src/emu/ui/selgame.cpp:2161
-#: src/emu/ui/selsoft.cpp:1577 src/emu/ui/selsoft.cpp:1597
-#: src/emu/ui/selsoft.cpp:1606
+#: src/emu/ui/datmenu.cpp:284 src/emu/ui/selgame.cpp:39
+#: src/emu/ui/selgame.cpp:2158 src/emu/ui/selgame.cpp:2167
+#: src/emu/ui/selsoft.cpp:1574 src/emu/ui/selsoft.cpp:1592
+#: src/emu/ui/selsoft.cpp:1601
 msgid "History"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:289 src/emu/ui/selgame.cpp:41
+#: src/emu/ui/datmenu.cpp:286 src/emu/ui/selgame.cpp:40
 msgid "Mameinfo"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:291 src/emu/ui/selgame.cpp:43
+#: src/emu/ui/datmenu.cpp:288 src/emu/ui/selgame.cpp:42
 msgid "Messinfo"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:293 src/emu/ui/selgame.cpp:42
+#: src/emu/ui/datmenu.cpp:290 src/emu/ui/selgame.cpp:41
 msgid "Sysinfo"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:295 src/emu/ui/selgame.cpp:46
+#: src/emu/ui/datmenu.cpp:292 src/emu/ui/selgame.cpp:45
 msgid "Mamescore"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:297 src/emu/ui/selgame.cpp:45
+#: src/emu/ui/datmenu.cpp:294 src/emu/ui/selgame.cpp:44
 msgid "Gameinit"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:299 src/emu/ui/selgame.cpp:44
+#: src/emu/ui/datmenu.cpp:296 src/emu/ui/selgame.cpp:43
 msgid "Command"
 msgstr ""
 
@@ -556,75 +556,75 @@ msgstr ""
 msgid "Remove %1$s Folder"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:158
+#: src/emu/ui/filesel.cpp:161
 msgid "File Already Exists - Override?"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:160 src/emu/ui/selgame.cpp:1568
-#: src/emu/ui/selgame.cpp:1569 src/emu/ui/selgame.cpp:1570
-#: src/emu/ui/selgame.cpp:1571 src/emu/ui/selgame.cpp:1572
-#: src/emu/ui/selgame.cpp:1573 src/emu/ui/selgame.cpp:1574
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/filesel.cpp:163 src/emu/ui/selgame.cpp:1576
+#: src/emu/ui/selgame.cpp:1577 src/emu/ui/selgame.cpp:1578
+#: src/emu/ui/selgame.cpp:1579 src/emu/ui/selgame.cpp:1580
+#: src/emu/ui/selgame.cpp:1581 src/emu/ui/selgame.cpp:1582
+#: src/emu/ui/selgame.cpp:1591
 msgid "No"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:161 src/emu/ui/selgame.cpp:1568
-#: src/emu/ui/selgame.cpp:1569 src/emu/ui/selgame.cpp:1570
-#: src/emu/ui/selgame.cpp:1571 src/emu/ui/selgame.cpp:1572
-#: src/emu/ui/selgame.cpp:1573 src/emu/ui/selgame.cpp:1574
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/filesel.cpp:164 src/emu/ui/selgame.cpp:1576
+#: src/emu/ui/selgame.cpp:1577 src/emu/ui/selgame.cpp:1578
+#: src/emu/ui/selgame.cpp:1579 src/emu/ui/selgame.cpp:1580
+#: src/emu/ui/selgame.cpp:1581 src/emu/ui/selgame.cpp:1582
+#: src/emu/ui/selgame.cpp:1591
 msgid "Yes"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:272
+#: src/emu/ui/filesel.cpp:275
 msgid "New Image Name:"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:278
+#: src/emu/ui/filesel.cpp:281
 msgid "Image Format:"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:284
+#: src/emu/ui/filesel.cpp:287
 msgid "Create"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:315
+#: src/emu/ui/filesel.cpp:318
 msgid "Please enter a file extension too"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:503 src/emu/ui/swlist.cpp:65
+#: src/emu/ui/filesel.cpp:506 src/emu/ui/swlist.cpp:65
 msgid "[empty slot]"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:507
+#: src/emu/ui/filesel.cpp:510
 msgid "[create]"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:511 src/emu/ui/swlist.cpp:76
+#: src/emu/ui/filesel.cpp:514 src/emu/ui/swlist.cpp:76
 msgid "[software list]"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:803
+#: src/emu/ui/filesel.cpp:806
 msgid "Select image format"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:863
+#: src/emu/ui/filesel.cpp:866
 msgid "Select access mode"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:864
+#: src/emu/ui/filesel.cpp:867
 msgid "Read-only"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:866
+#: src/emu/ui/filesel.cpp:869
 msgid "Read-write"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:867
+#: src/emu/ui/filesel.cpp:870
 msgid "Read this image, write to another image"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:868
+#: src/emu/ui/filesel.cpp:871
 msgid "Read this image, write to diff"
 msgstr ""
 
@@ -650,7 +650,7 @@ msgstr ""
 msgid "[empty]"
 msgstr ""
 
-#: src/emu/ui/info_pty.cpp:26 src/emu/ui/mainmenu.cpp:91
+#: src/emu/ui/info_pty.cpp:26 src/emu/ui/mainmenu.cpp:96
 msgid "Pseudo terminals"
 msgstr ""
 
@@ -666,7 +666,7 @@ msgstr ""
 msgid "Other Controls"
 msgstr ""
 
-#: src/emu/ui/inputmap.cpp:622 src/emu/ui/miscmenu.cpp:91
+#: src/emu/ui/inputmap.cpp:622 src/emu/ui/miscmenu.cpp:92
 #: src/emu/ui/slotopt.cpp:172
 msgid "Reset"
 msgstr ""
@@ -699,27 +699,27 @@ msgstr ""
 msgid "Machine Information"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:78
+#: src/emu/ui/mainmenu.cpp:80
 msgid "Image Information"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:81
+#: src/emu/ui/mainmenu.cpp:83
 msgid "File Manager"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:86
+#: src/emu/ui/mainmenu.cpp:92
 msgid "Tape Control"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:94
+#: src/emu/ui/mainmenu.cpp:99
 msgid "Bios Selection"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:100
+#: src/emu/ui/mainmenu.cpp:104
 msgid "Slot Devices"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:107
+#: src/emu/ui/mainmenu.cpp:109
 msgid "Barcode Reader"
 msgstr ""
 
@@ -727,43 +727,43 @@ msgstr ""
 msgid "Network Devices"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:119
+#: src/emu/ui/mainmenu.cpp:118
 msgid "Keyboard Mode"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:122
+#: src/emu/ui/mainmenu.cpp:121
 msgid "Slider Controls"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:125
+#: src/emu/ui/mainmenu.cpp:124
 msgid "Video Options"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:129
+#: src/emu/ui/mainmenu.cpp:128
 msgid "Crosshair Options"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:133
+#: src/emu/ui/mainmenu.cpp:132
 msgid "Cheat"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:136
+#: src/emu/ui/mainmenu.cpp:135
 msgid "Plugin Options"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:140
+#: src/emu/ui/mainmenu.cpp:139
 msgid "External DAT View"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:146
+#: src/emu/ui/mainmenu.cpp:145 src/emu/ui/miscmenu.cpp:785
 msgid "Add To Favorites"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:148
+#: src/emu/ui/mainmenu.cpp:147 src/emu/ui/miscmenu.cpp:787
 msgid "Remove From Favorites"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:155
+#: src/emu/ui/mainmenu.cpp:154
 msgid "Select New Machine"
 msgstr ""
 
@@ -803,189 +803,205 @@ msgstr ""
 msgid "Return to Previous Menu"
 msgstr ""
 
-#: src/emu/ui/menu.cpp:716
+#: src/emu/ui/menu.cpp:761
 msgid "Auto"
 msgstr ""
 
-#: src/emu/ui/menu.cpp:2133
+#: src/emu/ui/menu.cpp:2195
 msgid "Images"
 msgstr ""
 
-#: src/emu/ui/menu.cpp:2134
+#: src/emu/ui/menu.cpp:2196
 msgid "Infos"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Keyboard Mode:"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Natural"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Emulated"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:240
+#: src/emu/ui/miscmenu.cpp:241
 #, c-format
 msgid ""
 "Uptime: %1$d:%2$02d:%3$02d\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:242
+#: src/emu/ui/miscmenu.cpp:243
 #, c-format
 msgid ""
 "Uptime: %1$d:%2$02d\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:246
+#: src/emu/ui/miscmenu.cpp:247
 #, c-format
 msgid ""
 "Tickets dispensed: %1$d\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:257
+#: src/emu/ui/miscmenu.cpp:258
 msgid "Coin %1$c: NA%3$s\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:257
+#: src/emu/ui/miscmenu.cpp:258
 #, c-format
 msgid "Coin %1$c: %2$d%3$s\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:260
+#: src/emu/ui/miscmenu.cpp:261
 msgid " (locked)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:519
+#: src/emu/ui/miscmenu.cpp:520
 msgid "Visible Delay"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:617
+#: src/emu/ui/miscmenu.cpp:619
 #, c-format
 msgid "%s.xml saved under ui folder."
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:645
+#: src/emu/ui/miscmenu.cpp:647
 msgid "Name:             Description:\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:657
+#: src/emu/ui/miscmenu.cpp:659
 #, c-format
 msgid "%s.txt saved under ui folder."
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:675
-msgid "Export XML format (like -listxml)"
+#: src/emu/ui/miscmenu.cpp:677
+msgid "Export list in XML format (like -listxml)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:676
-msgid "Export TXT format (like -listfull)"
+#: src/emu/ui/miscmenu.cpp:678
+msgid "Export list in XML format (like -listxml, but exclude devices)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:734
-msgid "Dummy"
+#: src/emu/ui/miscmenu.cpp:679
+msgid "Export list in TXT format (like -listfull)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:736
-msgid "Save machine configuration"
-msgstr ""
-
-#: src/emu/ui/miscmenu.cpp:848 src/emu/ui/miscmenu.cpp:869
-#: src/emu/ui/selgame.cpp:594
-msgid "Plugins"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:218
-msgid "Filter"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:226
-msgid " ^!File"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:231
-msgid " ^!Category"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:254
-msgid "^!Setup custom filter"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:262
-msgid "Customize UI"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:263
-msgid "Configure Directories"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:266 src/emu/ui/sndmenu.cpp:151
-#: src/emu/ui/sndmenu.cpp:172
-msgid "Sound Options"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:269
-msgid "General Inputs"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:272
-msgid "Save Configuration"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:286 src/emu/ui/optsmenu.cpp:307
-msgid "Settings"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:327
-msgid "**Error saving ui.ini**"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:374
-#, c-format
-msgid "**Error saving %s.ini**"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:378
+#: src/emu/ui/miscmenu.cpp:729 src/emu/ui/optsmenu.cpp:376
 msgid ""
 "\n"
 "    Configuration saved    \n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/selector.cpp:166
+#: src/emu/ui/miscmenu.cpp:774
+msgid "Bios"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:776
+msgid "Driver"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:790
+msgid "Save machine configuration"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:806
+msgid "Configure machine:"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:868 src/emu/ui/selsoft.cpp:109
+msgid " (default)"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:953 src/emu/ui/miscmenu.cpp:973
+#: src/emu/ui/selgame.cpp:600
+msgid "Plugins"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:217
+msgid "Filter"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:225
+msgid " ^!File"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:230
+msgid " ^!Category"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:253
+msgid "^!Setup custom filter"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:261
+msgid "Customize UI"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:262
+msgid "Configure Directories"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:265 src/emu/ui/sndmenu.cpp:149
+#: src/emu/ui/sndmenu.cpp:169
+msgid "Sound Options"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:268
+msgid "General Inputs"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:271
+msgid "Save Configuration"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:285 src/emu/ui/optsmenu.cpp:305
+msgid "Settings"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:325
+msgid "**Error saving ui.ini**"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:372
+#, c-format
+msgid "**Error saving %s.ini**"
+msgstr ""
+
+#: src/emu/ui/selector.cpp:165
 msgid "Selection List - Search: "
 msgstr ""
 
-#: src/emu/ui/selector.cpp:196
+#: src/emu/ui/selector.cpp:194
 #, c-format
 msgid "Double click or press %1$s to select"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:39
+#: src/emu/ui/selgame.cpp:38
 msgid "General Info"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:374 src/emu/ui/selsoft.cpp:282
+#: src/emu/ui/selgame.cpp:380 src/emu/ui/selsoft.cpp:281
 #, c-format
 msgid ""
 "%s\n"
 " added to favorites list."
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:380 src/emu/ui/selgame.cpp:389
-#: src/emu/ui/selsoft.cpp:287
+#: src/emu/ui/selgame.cpp:386 src/emu/ui/selgame.cpp:395
+#: src/emu/ui/selsoft.cpp:286
 #, c-format
 msgid ""
 "%s\n"
 " removed from favorites list."
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:450
+#: src/emu/ui/selgame.cpp:457
 msgid ""
 "The selected machine is missing one or more required ROM or CHD images. "
 "Please select a different machine.\n"
@@ -993,275 +1009,275 @@ msgid ""
 "Press any key to continue."
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:589 src/emu/ui/simpleselgame.cpp:265
+#: src/emu/ui/selgame.cpp:595 src/emu/ui/simpleselgame.cpp:265
 msgid "Configure Options"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:752
+#: src/emu/ui/selgame.cpp:596
+msgid "Configure Machine"
+msgstr ""
+
+#: src/emu/ui/selgame.cpp:758
 #, c-format
 msgid "%1$s %2$s ( %3$d / %4$d machines (%5$d BIOS) )"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:762
+#: src/emu/ui/selgame.cpp:768
 #, c-format
 msgid "%1$s (%2$s - %3$s) - "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:769 src/emu/ui/selgame.cpp:775
+#: src/emu/ui/selgame.cpp:775 src/emu/ui/selgame.cpp:781
 #, c-format
 msgid "%1$s (%2$s) - "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:784
+#: src/emu/ui/selgame.cpp:790
 #, c-format
 msgid "%1$s Search: %2$s_"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:838
+#: src/emu/ui/selgame.cpp:844
 #, c-format
 msgid "Romset: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:841 src/emu/ui/selgame.cpp:890
-#: src/emu/ui/selsoft.cpp:751 src/emu/ui/selsoft.cpp:801
+#: src/emu/ui/selgame.cpp:847 src/emu/ui/selgame.cpp:896
+#: src/emu/ui/selsoft.cpp:750 src/emu/ui/selsoft.cpp:800
 #: src/emu/ui/simpleselgame.cpp:328
 #, c-format
 msgid "%1$s, %2$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:847 src/emu/ui/selsoft.cpp:757
+#: src/emu/ui/selgame.cpp:853 src/emu/ui/selsoft.cpp:756
 #, c-format
 msgid "Driver is clone of: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:849 src/emu/ui/selsoft.cpp:759
+#: src/emu/ui/selgame.cpp:855 src/emu/ui/selsoft.cpp:758
 msgid "Driver is parent"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:853 src/emu/ui/selsoft.cpp:763
+#: src/emu/ui/selgame.cpp:859 src/emu/ui/selsoft.cpp:762
 #: src/emu/ui/simpleselgame.cpp:335
 msgid "Overall: NOT WORKING"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:855 src/emu/ui/selsoft.cpp:765
+#: src/emu/ui/selgame.cpp:861 src/emu/ui/selsoft.cpp:764
 #: src/emu/ui/simpleselgame.cpp:337
 msgid "Overall: Unemulated Protection"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:857 src/emu/ui/selsoft.cpp:767
+#: src/emu/ui/selgame.cpp:863 src/emu/ui/selsoft.cpp:766
 #: src/emu/ui/simpleselgame.cpp:339
 msgid "Overall: Working"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:861 src/emu/ui/selsoft.cpp:771
+#: src/emu/ui/selgame.cpp:867 src/emu/ui/selsoft.cpp:770
 msgid "Graphics: Imperfect, "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:863 src/emu/ui/selsoft.cpp:773
+#: src/emu/ui/selgame.cpp:869 src/emu/ui/selsoft.cpp:772
 msgid "Graphics: OK, "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:866 src/emu/ui/selsoft.cpp:776
+#: src/emu/ui/selgame.cpp:872 src/emu/ui/selsoft.cpp:775
 msgid "Sound: Unimplemented"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:868 src/emu/ui/selsoft.cpp:778
+#: src/emu/ui/selgame.cpp:874 src/emu/ui/selsoft.cpp:777
 msgid "Sound: Imperfect"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:870 src/emu/ui/selsoft.cpp:780
+#: src/emu/ui/selgame.cpp:876 src/emu/ui/selsoft.cpp:779
 msgid "Sound: OK"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:887
+#: src/emu/ui/selgame.cpp:893
 #, c-format
 msgid "System: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:894 src/emu/ui/selsoft.cpp:805
+#: src/emu/ui/selgame.cpp:900 src/emu/ui/selsoft.cpp:804
 #, c-format
 msgid "Software is clone of: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:896 src/emu/ui/selsoft.cpp:807
+#: src/emu/ui/selgame.cpp:902 src/emu/ui/selsoft.cpp:806
 msgid "Software is parent"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:901 src/emu/ui/selsoft.cpp:812
+#: src/emu/ui/selgame.cpp:907 src/emu/ui/selsoft.cpp:811
 msgid "Supported: No"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:906 src/emu/ui/selsoft.cpp:817
+#: src/emu/ui/selgame.cpp:912 src/emu/ui/selsoft.cpp:816
 msgid "Supported: Partial"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:911 src/emu/ui/selsoft.cpp:822
+#: src/emu/ui/selgame.cpp:917 src/emu/ui/selsoft.cpp:821
 msgid "Supported: Yes"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:916 src/emu/ui/selsoft.cpp:827
+#: src/emu/ui/selgame.cpp:922 src/emu/ui/selsoft.cpp:826
 #, c-format
 msgid "romset: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:923
+#: src/emu/ui/selgame.cpp:929
 #, c-format
 msgid "%1$s %2$s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1535
+#: src/emu/ui/selgame.cpp:1543
 #, c-format
 msgid "Romset: %1$-.100s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1536
+#: src/emu/ui/selgame.cpp:1544
 #, c-format
 msgid "Year: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1537
+#: src/emu/ui/selgame.cpp:1545
 #, c-format
 msgid "Manufacturer: %1$-.100s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1541
+#: src/emu/ui/selgame.cpp:1549
 #, c-format
 msgid "Driver is Clone of: %1$-.100s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1543
+#: src/emu/ui/selgame.cpp:1551
 msgid "Driver is Parent\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1546
+#: src/emu/ui/selgame.cpp:1554
 msgid "Overall: NOT WORKING\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1548
+#: src/emu/ui/selgame.cpp:1556
 msgid "Overall: Unemulated Protection\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1550
+#: src/emu/ui/selgame.cpp:1558
 msgid "Overall: Working\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1553
+#: src/emu/ui/selgame.cpp:1561
 msgid "Graphics: Imperfect Colors\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1557
+#: src/emu/ui/selgame.cpp:1565
 msgid "Graphics: Imperfect\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1559
+#: src/emu/ui/selgame.cpp:1567
 msgid "Graphics: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1562
+#: src/emu/ui/selgame.cpp:1570
 msgid "Sound: Unimplemented\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1564
+#: src/emu/ui/selgame.cpp:1572
 msgid "Sound: Imperfect\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1566
+#: src/emu/ui/selgame.cpp:1574
 msgid "Sound: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1568
+#: src/emu/ui/selgame.cpp:1576
 #, c-format
 msgid "Driver is Skeleton: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1569
+#: src/emu/ui/selgame.cpp:1577
 #, c-format
 msgid "Game is Mechanical: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1570
+#: src/emu/ui/selgame.cpp:1578
 #, c-format
 msgid "Requires Artwork: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1571
+#: src/emu/ui/selgame.cpp:1579
 #, c-format
 msgid "Requires Clickable Artwork: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1572
+#: src/emu/ui/selgame.cpp:1580
 #, c-format
 msgid "Support Cocktail: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1573
+#: src/emu/ui/selgame.cpp:1581
 #, c-format
 msgid "Driver is Bios: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1574
+#: src/emu/ui/selgame.cpp:1582
 #, c-format
 msgid "Support Save: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 #, c-format
 msgid "Screen Orientation: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 msgid "Vertical"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 msgid "Horizontal"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/selgame.cpp:1591
 #, c-format
 msgid "Requires CHD: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1596
+#: src/emu/ui/selgame.cpp:1604
 msgid "Roms Audit Pass: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1598
+#: src/emu/ui/selgame.cpp:1606
 msgid "Roms Audit Pass: BAD\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1601
+#: src/emu/ui/selgame.cpp:1609
 msgid "Samples Audit Pass: None Needed\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1603
+#: src/emu/ui/selgame.cpp:1611
 msgid "Samples Audit Pass: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1605
+#: src/emu/ui/selgame.cpp:1613
 msgid "Samples Audit Pass: BAD\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1608
+#: src/emu/ui/selgame.cpp:1616
 msgid ""
 "Roms Audit Pass: Disabled\n"
 "Samples Audit Pass: Disabled\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:2049 src/emu/ui/selgame.cpp:2212
-#: src/emu/ui/selsoft.cpp:1662
+#: src/emu/ui/selgame.cpp:2055 src/emu/ui/selgame.cpp:2216
+#: src/emu/ui/selsoft.cpp:1655
 msgid "No Infos Available"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:2162 src/emu/ui/selsoft.cpp:1607
+#: src/emu/ui/selgame.cpp:2168 src/emu/ui/selsoft.cpp:1602
 msgid "Usage"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:110
-msgid " (default)"
-msgstr ""
-
-#: src/emu/ui/selsoft.cpp:381
+#: src/emu/ui/selsoft.cpp:380
 msgid ""
 "The selected software is missing one or more required files. Please select a "
 "different software.\n"
@@ -1269,57 +1285,57 @@ msgid ""
 "Press any key to continue."
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:684
+#: src/emu/ui/selsoft.cpp:683
 #, c-format
-msgid "%1$s %2$s ( %3$d / %4$d softwares )"
+msgid "%1$s %2$s ( %3$d / %4$d software packages )"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:685
+#: src/emu/ui/selsoft.cpp:684
 #, c-format
 msgid "Driver: \"%1$s\" software list "
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:688
+#: src/emu/ui/selsoft.cpp:687
 #, c-format
 msgid "Region: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:690
+#: src/emu/ui/selsoft.cpp:689
 #, c-format
 msgid "Publisher: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:692
+#: src/emu/ui/selsoft.cpp:691
 #, c-format
 msgid "Year: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:694
+#: src/emu/ui/selsoft.cpp:693
 #, c-format
 msgid "Software List: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:696
+#: src/emu/ui/selsoft.cpp:695
 #, c-format
 msgid "Device type: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:698
+#: src/emu/ui/selsoft.cpp:697
 #, c-format
 msgid "%s Search: %s_"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:748 src/emu/ui/selsoft.cpp:798
+#: src/emu/ui/selsoft.cpp:747 src/emu/ui/selsoft.cpp:797
 #: src/emu/ui/simpleselgame.cpp:325
 #, c-format
 msgid "%1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:1998 src/emu/ui/selsoft.cpp:2018
+#: src/emu/ui/selsoft.cpp:1991 src/emu/ui/selsoft.cpp:2011
 msgid "Software part selection:"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:2136 src/emu/ui/selsoft.cpp:2156
+#: src/emu/ui/selsoft.cpp:2129 src/emu/ui/selsoft.cpp:2149
 msgid "Bios selection:"
 msgstr ""
 
@@ -1367,15 +1383,15 @@ msgstr ""
 msgid " [internal]"
 msgstr ""
 
-#: src/emu/ui/sndmenu.cpp:135
+#: src/emu/ui/sndmenu.cpp:133
 msgid "Sound"
 msgstr ""
 
-#: src/emu/ui/sndmenu.cpp:136
+#: src/emu/ui/sndmenu.cpp:134
 msgid "Sample Rate"
 msgstr ""
 
-#: src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/sndmenu.cpp:135
 msgid "Use External Samples"
 msgstr ""
 
@@ -1444,80 +1460,80 @@ msgstr ""
 msgid "Fast Forward"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:419
+#: src/emu/ui/ui.cpp:418
 msgid "This driver requires images to be loaded in the following device(s): "
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1074
+#: src/emu/ui/ui.cpp:1071
 msgid ""
 "One or more ROMs/CHDs for this machine are incorrect. The machine may not "
 "run correctly.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1087
+#: src/emu/ui/ui.cpp:1084
 msgid ""
 "There are known problems with this machine\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1091
+#: src/emu/ui/ui.cpp:1088
 msgid ""
 "One or more ROMs/CHDs for this machine have not been correctly dumped.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1095
+#: src/emu/ui/ui.cpp:1092
 #, c-format
 msgid "The keyboard emulation may not be 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1097
+#: src/emu/ui/ui.cpp:1094
 #, c-format
 msgid "The colors aren't 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1099
+#: src/emu/ui/ui.cpp:1096
 msgid "The colors are completely wrong.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1101
+#: src/emu/ui/ui.cpp:1098
 #, c-format
 msgid "The video emulation isn't 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1103
+#: src/emu/ui/ui.cpp:1100
 #, c-format
 msgid "The sound emulation isn't 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1105
+#: src/emu/ui/ui.cpp:1102
 msgid "The machine lacks sound.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1108
+#: src/emu/ui/ui.cpp:1105
 msgid "Screen flipping in cocktail mode is not supported.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1112
+#: src/emu/ui/ui.cpp:1109
 msgid "The machine requires external artwork files\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1117
+#: src/emu/ui/ui.cpp:1114
 msgid ""
 "This machine was never completed. It may exhibit strange behavior or missing "
 "elements that are not bugs in the emulation.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1122
+#: src/emu/ui/ui.cpp:1119
 msgid ""
 "This machine has no sound hardware, MAME will produce no sounds, this is "
 "expected behaviour.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1130
+#: src/emu/ui/ui.cpp:1127
 msgid "The machine has protection which isn't fully emulated.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1133
+#: src/emu/ui/ui.cpp:1130
 msgid ""
 "\n"
 "THIS MACHINE DOESN'T WORK. The emulation for this machine is not yet "
@@ -1525,7 +1541,7 @@ msgid ""
 "the developers to improve the emulation.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1137
+#: src/emu/ui/ui.cpp:1134
 msgid ""
 "\n"
 "Certain elements of this machine cannot be emulated as it requires actual "
@@ -1533,21 +1549,21 @@ msgid ""
 "to fully play this machine.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1156
+#: src/emu/ui/ui.cpp:1153
 msgid ""
 "\n"
 "\n"
 "There are working clones of this machine: "
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1170
+#: src/emu/ui/ui.cpp:1167
 msgid ""
 "\n"
 "\n"
 "Press any key to continue"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1185
+#: src/emu/ui/ui.cpp:1182
 #, c-format
 msgid ""
 "%1$s\n"
@@ -1557,98 +1573,98 @@ msgid ""
 "CPU:\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1221 src/emu/ui/ui.cpp:1260
+#: src/emu/ui/ui.cpp:1218 src/emu/ui/ui.cpp:1257
 msgid "MHz"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1221 src/emu/ui/ui.cpp:1260
+#: src/emu/ui/ui.cpp:1218 src/emu/ui/ui.cpp:1257
 msgid "kHz"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1235
+#: src/emu/ui/ui.cpp:1232
 msgid ""
 "\n"
 "Sound:\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1264
+#: src/emu/ui/ui.cpp:1261
 msgid ""
 "\n"
 "Video:\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1268
+#: src/emu/ui/ui.cpp:1265
 msgid "None\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1275
+#: src/emu/ui/ui.cpp:1272
 msgid "Vector"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1286
+#: src/emu/ui/ui.cpp:1283
 #, c-format
 msgid "%1$s: %2$s\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1286
+#: src/emu/ui/ui.cpp:1283
 msgid "%2$s\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1541 src/emu/ui/ui.cpp:1551
+#: src/emu/ui/ui.cpp:1538 src/emu/ui/ui.cpp:1548
 msgid "Keyboard Emulation Status"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1543
+#: src/emu/ui/ui.cpp:1540
 msgid "Mode: PARTIAL Emulation"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1544
+#: src/emu/ui/ui.cpp:1541
 msgid "UI:   Enabled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1546 src/emu/ui/ui.cpp:1556
+#: src/emu/ui/ui.cpp:1543 src/emu/ui/ui.cpp:1553
 msgid "**Use ScrLock to toggle**"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1553
+#: src/emu/ui/ui.cpp:1550
 msgid "Mode: FULL Emulation"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1554
+#: src/emu/ui/ui.cpp:1551
 msgid "UI:   Disabled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1692
+#: src/emu/ui/ui.cpp:1689
 msgid "Autofire can't be enabled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1731
+#: src/emu/ui/ui.cpp:1728
 msgid "Select position to save to"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1733
+#: src/emu/ui/ui.cpp:1730
 msgid "Select position to load from"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1757
+#: src/emu/ui/ui.cpp:1754
 msgid "Save cancelled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1759
+#: src/emu/ui/ui.cpp:1756
 msgid "Load cancelled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1802
+#: src/emu/ui/ui.cpp:1799
 #, c-format
 msgid "Save to position %s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1807
+#: src/emu/ui/ui.cpp:1804
 #, c-format
 msgid "Load from position %s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1847
+#: src/emu/ui/ui.cpp:1844
 #, c-format
 msgid ""
 "Are you sure you want to quit?\n"
@@ -1657,173 +1673,173 @@ msgid ""
 "Press ''%2$s'' to return to emulation."
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1917
+#: src/emu/ui/ui.cpp:1914
 msgid "Master Volume"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1926
+#: src/emu/ui/ui.cpp:1923
 #, c-format
 msgid "%1$s Volume"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1949
+#: src/emu/ui/ui.cpp:1946
 #, c-format
 msgid "Overclock CPU %1$s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1968
+#: src/emu/ui/ui.cpp:1965
 #, c-format
 msgid "%1$s Refresh Rate"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1973
+#: src/emu/ui/ui.cpp:1970
 #, c-format
 msgid "%1$s Brightness"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1975
+#: src/emu/ui/ui.cpp:1972
 #, c-format
 msgid "%1$s Contrast"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1977
+#: src/emu/ui/ui.cpp:1974
 #, c-format
 msgid "%1$s Gamma"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1981
+#: src/emu/ui/ui.cpp:1978
 #, c-format
 msgid "%1$s Horiz Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1983
+#: src/emu/ui/ui.cpp:1980
 #, c-format
 msgid "%1$s Horiz Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1985
+#: src/emu/ui/ui.cpp:1982
 #, c-format
 msgid "%1$s Vert Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1987
+#: src/emu/ui/ui.cpp:1984
 #, c-format
 msgid "%1$s Vert Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2005
+#: src/emu/ui/ui.cpp:2002
 #, c-format
 msgid "Laserdisc '%1$s' Horiz Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2007
+#: src/emu/ui/ui.cpp:2004
 #, c-format
 msgid "Laserdisc '%1$s' Horiz Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2009
+#: src/emu/ui/ui.cpp:2006
 #, c-format
 msgid "Laserdisc '%1$s' Vert Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2011
+#: src/emu/ui/ui.cpp:2008
 #, c-format
 msgid "Laserdisc '%1$s' Vert Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2021
+#: src/emu/ui/ui.cpp:2018
 msgid "Vector Flicker"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2022
+#: src/emu/ui/ui.cpp:2019
 msgid "Beam Width Minimum"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2023
+#: src/emu/ui/ui.cpp:2020
 msgid "Beam Width Maximum"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2024
+#: src/emu/ui/ui.cpp:2021
 msgid "Beam Intensity Weight"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2037
+#: src/emu/ui/ui.cpp:2034
 #, c-format
 msgid "Crosshair Scale %1$s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2037 src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2034 src/emu/ui/ui.cpp:2036
 msgid "X"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2037 src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2034 src/emu/ui/ui.cpp:2036
 msgid "Y"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2036
 #, c-format
 msgid "Crosshair Offset %1$s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2071
+#: src/emu/ui/ui.cpp:2068
 #, c-format
 msgid "%1$3ddB"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2115
+#: src/emu/ui/ui.cpp:2112
 #, c-format
 msgid "%1$d%%"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2131
+#: src/emu/ui/ui.cpp:2128
 #, c-format
 msgid "%1$3.0f%%"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2154
+#: src/emu/ui/ui.cpp:2151
 #, c-format
 msgid "%1$.3ffps"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2177 src/emu/ui/ui.cpp:2199 src/emu/ui/ui.cpp:2220
-#: src/emu/ui/ui.cpp:2242 src/emu/ui/ui.cpp:2264 src/emu/ui/ui.cpp:2286
-#: src/emu/ui/ui.cpp:2308 src/emu/ui/ui.cpp:2330 src/emu/ui/ui.cpp:2352
-#: src/emu/ui/ui.cpp:2374 src/emu/ui/ui.cpp:2396
+#: src/emu/ui/ui.cpp:2174 src/emu/ui/ui.cpp:2196 src/emu/ui/ui.cpp:2217
+#: src/emu/ui/ui.cpp:2239 src/emu/ui/ui.cpp:2261 src/emu/ui/ui.cpp:2283
+#: src/emu/ui/ui.cpp:2305 src/emu/ui/ui.cpp:2327 src/emu/ui/ui.cpp:2349
+#: src/emu/ui/ui.cpp:2371 src/emu/ui/ui.cpp:2393
 #, c-format
 msgid "%1$.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2412 src/emu/ui/ui.cpp:2428 src/emu/ui/ui.cpp:2444
-#: src/emu/ui/ui.cpp:2460
+#: src/emu/ui/ui.cpp:2408 src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2438
+#: src/emu/ui/ui.cpp:2453
 #, c-format
 msgid "%1$1.2f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2476
+#: src/emu/ui/ui.cpp:2469
 #, c-format
 msgid "Screen '%1$s'"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2478
+#: src/emu/ui/ui.cpp:2471
 msgid "Screen"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2494
+#: src/emu/ui/ui.cpp:2487
 #, c-format
 msgid "Crosshair Scale X %1$1.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2494
+#: src/emu/ui/ui.cpp:2487
 #, c-format
 msgid "Crosshair Scale Y %1$1.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2513
+#: src/emu/ui/ui.cpp:2506
 #, c-format
 msgid "Crosshair Offset X %1$1.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2513
+#: src/emu/ui/ui.cpp:2506
 #, c-format
 msgid "Crosshair Offset Y %1$1.3f"
 msgstr ""
@@ -1865,10 +1881,10 @@ msgstr ""
 msgid "Full"
 msgstr ""
 
-#: src/emu/ui/viewgfx.cpp:392
+#: src/emu/ui/viewgfx.cpp:391
 msgid " COLORS"
 msgstr ""
 
-#: src/emu/ui/viewgfx.cpp:392
+#: src/emu/ui/viewgfx.cpp:391
 msgid " PENS"
 msgstr ""
diff --git a/language/Latvian/strings.po b/language/Latvian/strings.po
index 6d2cf55bde0..edeafe44d2b 100644
--- a/language/Latvian/strings.po
+++ b/language/Latvian/strings.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MAME\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-11 03:33+0200\n"
+"POT-Creation-Date: 2016-04-15 17:42+0200\n"
 "PO-Revision-Date: 2016-02-20 18:03+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: MAME Language Team\n"
@@ -61,14 +61,14 @@ msgstr ""
 msgid "Autofire Status"
 msgstr ""
 
-#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1698
+#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1695
 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211
 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219
 #: src/emu/ui/videoopt.cpp:223
 msgid "Disabled"
 msgstr ""
 
-#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1698
+#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1695
 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211
 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219
 #: src/emu/ui/videoopt.cpp:223
@@ -76,14 +76,14 @@ msgid "Enabled"
 msgstr ""
 
 #: src/emu/ui/cheatopt.cpp:282 src/emu/ui/cheatopt.cpp:288
-#: src/emu/ui/menu.cpp:710 src/emu/ui/miscmenu.cpp:831
-#: src/emu/ui/sndmenu.cpp:135 src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/menu.cpp:755 src/emu/ui/miscmenu.cpp:936
+#: src/emu/ui/sndmenu.cpp:133 src/emu/ui/sndmenu.cpp:135
 msgid "On"
 msgstr ""
 
 #: src/emu/ui/cheatopt.cpp:282 src/emu/ui/cheatopt.cpp:288
-#: src/emu/ui/menu.cpp:713 src/emu/ui/miscmenu.cpp:831
-#: src/emu/ui/sndmenu.cpp:135 src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/menu.cpp:758 src/emu/ui/miscmenu.cpp:936
+#: src/emu/ui/sndmenu.cpp:133 src/emu/ui/sndmenu.cpp:135
 msgid "Off"
 msgstr ""
 
@@ -95,316 +95,316 @@ msgstr ""
 msgid "Autofire Delay"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:158 src/emu/ui/custmenu.cpp:447
+#: src/emu/ui/custmenu.cpp:157 src/emu/ui/custmenu.cpp:445
 msgid "Main filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:167 src/emu/ui/custmenu.cpp:456
+#: src/emu/ui/custmenu.cpp:166 src/emu/ui/custmenu.cpp:454
 msgid "Other filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:176 src/emu/ui/optsmenu.cpp:239
+#: src/emu/ui/custmenu.cpp:175 src/emu/ui/optsmenu.cpp:238
 msgid "^!Manufacturer"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:185 src/emu/ui/custmenu.cpp:474
-#: src/emu/ui/optsmenu.cpp:247
+#: src/emu/ui/custmenu.cpp:184 src/emu/ui/custmenu.cpp:472
+#: src/emu/ui/optsmenu.cpp:246
 msgid "^!Year"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:194 src/emu/ui/custmenu.cpp:510
+#: src/emu/ui/custmenu.cpp:193 src/emu/ui/custmenu.cpp:508
 msgid "Remove last filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:197 src/emu/ui/custmenu.cpp:513
+#: src/emu/ui/custmenu.cpp:196 src/emu/ui/custmenu.cpp:511
 msgid "Add filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:212 src/emu/ui/custmenu.cpp:233
-#: src/emu/ui/custmenu.cpp:529 src/emu/ui/custmenu.cpp:550
+#: src/emu/ui/custmenu.cpp:211 src/emu/ui/custmenu.cpp:231
+#: src/emu/ui/custmenu.cpp:527 src/emu/ui/custmenu.cpp:547
 msgid "Select custom filters:"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:465
+#: src/emu/ui/custmenu.cpp:463
 msgid "^!Publisher"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:483
+#: src/emu/ui/custmenu.cpp:481
 msgid "^!Software List"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:492
+#: src/emu/ui/custmenu.cpp:490
 msgid "^!Device type"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:501
+#: src/emu/ui/custmenu.cpp:499
 msgid "^!Region"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:23
+#: src/emu/ui/custui.cpp:22
 msgid "Show All"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:24
+#: src/emu/ui/custui.cpp:23
 msgid "Hide Filters"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:25
+#: src/emu/ui/custui.cpp:24
 msgid "Hide Info/Image"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:26
+#: src/emu/ui/custui.cpp:25
 msgid "Hide Both"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:142
+#: src/emu/ui/custui.cpp:141
 msgid "Fonts"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:143
+#: src/emu/ui/custui.cpp:142
 msgid "Colors"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:148 src/emu/ui/dirmenu.cpp:33
+#: src/emu/ui/custui.cpp:147 src/emu/ui/dirmenu.cpp:33
 msgid "Language"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:152
+#: src/emu/ui/custui.cpp:151
 msgid "Show side panels"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:167 src/emu/ui/custui.cpp:188
+#: src/emu/ui/custui.cpp:166 src/emu/ui/custui.cpp:186
 msgid "Custom UI Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:246
+#: src/emu/ui/custui.cpp:244
 msgid "default"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:349
+#: src/emu/ui/custui.cpp:347
 msgid "UI Font"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:354
+#: src/emu/ui/custui.cpp:352
 msgid "Bold"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:355
+#: src/emu/ui/custui.cpp:353
 msgid "Italic"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:360
+#: src/emu/ui/custui.cpp:358
 msgid "Lines"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:366
+#: src/emu/ui/custui.cpp:364
 msgid "Infos text size"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:383
+#: src/emu/ui/custui.cpp:381
 msgid "UI Fonts Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:411
+#: src/emu/ui/custui.cpp:408
 msgid "Sample text - Lorem ipsum dolor sit amet, consectetur adipiscing elit."
 msgstr ""
 
-#: src/emu/ui/custui.cpp:509
+#: src/emu/ui/custui.cpp:506
 msgid "Normal text"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:510
+#: src/emu/ui/custui.cpp:507
 msgid "Selected color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:511
+#: src/emu/ui/custui.cpp:508
 msgid "Normal text background"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:512
+#: src/emu/ui/custui.cpp:509
 msgid "Selected background color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:513
+#: src/emu/ui/custui.cpp:510
 msgid "Subitem color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:514 src/emu/ui/custui.cpp:610
+#: src/emu/ui/custui.cpp:511 src/emu/ui/custui.cpp:606
 msgid "Clone"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:515
+#: src/emu/ui/custui.cpp:512
 msgid "Border"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:516
+#: src/emu/ui/custui.cpp:513
 msgid "Background"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:517
+#: src/emu/ui/custui.cpp:514
 msgid "Dipswitch"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:518
+#: src/emu/ui/custui.cpp:515
 msgid "Unavailable color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:519
+#: src/emu/ui/custui.cpp:516
 msgid "Slider color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:520
+#: src/emu/ui/custui.cpp:517
 msgid "Gfx viewer background"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:521
+#: src/emu/ui/custui.cpp:518
 msgid "Mouse over color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:522
+#: src/emu/ui/custui.cpp:519
 msgid "Mouse over background color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:523
+#: src/emu/ui/custui.cpp:520
 msgid "Mouse down color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:524
+#: src/emu/ui/custui.cpp:521
 msgid "Mouse down background color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:527
+#: src/emu/ui/custui.cpp:524
 msgid "Restore originals colors"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:543
+#: src/emu/ui/custui.cpp:540
 msgid "UI Colors Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:572
+#: src/emu/ui/custui.cpp:568
 #, c-format
 msgid "Double click or press %1$s to change the color value"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:598
+#: src/emu/ui/custui.cpp:594
 msgid "Menu Preview"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:606
+#: src/emu/ui/custui.cpp:602
 msgid "Normal"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:607
+#: src/emu/ui/custui.cpp:603
 msgid "Subitem"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:608
+#: src/emu/ui/custui.cpp:604
 msgid "Selected"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:609
+#: src/emu/ui/custui.cpp:605
 msgid "Mouse Over"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:841 src/emu/ui/custui.cpp:844
+#: src/emu/ui/custui.cpp:837 src/emu/ui/custui.cpp:840
 msgid "Alpha"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:849 src/emu/ui/custui.cpp:852
-#: src/emu/ui/custui.cpp:1013
+#: src/emu/ui/custui.cpp:845 src/emu/ui/custui.cpp:848
+#: src/emu/ui/custui.cpp:1007
 msgid "Red"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:857 src/emu/ui/custui.cpp:860
-#: src/emu/ui/custui.cpp:1016
+#: src/emu/ui/custui.cpp:853 src/emu/ui/custui.cpp:856
+#: src/emu/ui/custui.cpp:1010
 msgid "Green"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:865 src/emu/ui/custui.cpp:868
-#: src/emu/ui/custui.cpp:1017
+#: src/emu/ui/custui.cpp:861 src/emu/ui/custui.cpp:864
+#: src/emu/ui/custui.cpp:1011
 msgid "Blue"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:871
+#: src/emu/ui/custui.cpp:867
 msgid "Choose from palette"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:887
+#: src/emu/ui/custui.cpp:883
 msgid " - ARGB Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:912
+#: src/emu/ui/custui.cpp:907
 msgid "Color preview ="
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1009
+#: src/emu/ui/custui.cpp:1003
 msgid "White"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1010
+#: src/emu/ui/custui.cpp:1004
 msgid "Silver"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1011
+#: src/emu/ui/custui.cpp:1005
 msgid "Gray"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1012
+#: src/emu/ui/custui.cpp:1006
 msgid "Black"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1014
+#: src/emu/ui/custui.cpp:1008
 msgid "Orange"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1015
+#: src/emu/ui/custui.cpp:1009
 msgid "Yellow"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1018
+#: src/emu/ui/custui.cpp:1012
 msgid "Violet"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:65
+#: src/emu/ui/datmenu.cpp:64
 msgid "Software History"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:67
+#: src/emu/ui/datmenu.cpp:66
 msgid "Software Usage"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:199
+#: src/emu/ui/datmenu.cpp:196
 msgid "Revision: "
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:287 src/emu/ui/selgame.cpp:40
-#: src/emu/ui/selgame.cpp:2152 src/emu/ui/selgame.cpp:2161
-#: src/emu/ui/selsoft.cpp:1577 src/emu/ui/selsoft.cpp:1597
-#: src/emu/ui/selsoft.cpp:1606
+#: src/emu/ui/datmenu.cpp:284 src/emu/ui/selgame.cpp:39
+#: src/emu/ui/selgame.cpp:2158 src/emu/ui/selgame.cpp:2167
+#: src/emu/ui/selsoft.cpp:1574 src/emu/ui/selsoft.cpp:1592
+#: src/emu/ui/selsoft.cpp:1601
 msgid "History"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:289 src/emu/ui/selgame.cpp:41
+#: src/emu/ui/datmenu.cpp:286 src/emu/ui/selgame.cpp:40
 msgid "Mameinfo"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:291 src/emu/ui/selgame.cpp:43
+#: src/emu/ui/datmenu.cpp:288 src/emu/ui/selgame.cpp:42
 msgid "Messinfo"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:293 src/emu/ui/selgame.cpp:42
+#: src/emu/ui/datmenu.cpp:290 src/emu/ui/selgame.cpp:41
 msgid "Sysinfo"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:295 src/emu/ui/selgame.cpp:46
+#: src/emu/ui/datmenu.cpp:292 src/emu/ui/selgame.cpp:45
 msgid "Mamescore"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:297 src/emu/ui/selgame.cpp:45
+#: src/emu/ui/datmenu.cpp:294 src/emu/ui/selgame.cpp:44
 msgid "Gameinit"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:299 src/emu/ui/selgame.cpp:44
+#: src/emu/ui/datmenu.cpp:296 src/emu/ui/selgame.cpp:43
 msgid "Command"
 msgstr ""
 
@@ -556,75 +556,75 @@ msgstr ""
 msgid "Remove %1$s Folder"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:158
+#: src/emu/ui/filesel.cpp:161
 msgid "File Already Exists - Override?"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:160 src/emu/ui/selgame.cpp:1568
-#: src/emu/ui/selgame.cpp:1569 src/emu/ui/selgame.cpp:1570
-#: src/emu/ui/selgame.cpp:1571 src/emu/ui/selgame.cpp:1572
-#: src/emu/ui/selgame.cpp:1573 src/emu/ui/selgame.cpp:1574
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/filesel.cpp:163 src/emu/ui/selgame.cpp:1576
+#: src/emu/ui/selgame.cpp:1577 src/emu/ui/selgame.cpp:1578
+#: src/emu/ui/selgame.cpp:1579 src/emu/ui/selgame.cpp:1580
+#: src/emu/ui/selgame.cpp:1581 src/emu/ui/selgame.cpp:1582
+#: src/emu/ui/selgame.cpp:1591
 msgid "No"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:161 src/emu/ui/selgame.cpp:1568
-#: src/emu/ui/selgame.cpp:1569 src/emu/ui/selgame.cpp:1570
-#: src/emu/ui/selgame.cpp:1571 src/emu/ui/selgame.cpp:1572
-#: src/emu/ui/selgame.cpp:1573 src/emu/ui/selgame.cpp:1574
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/filesel.cpp:164 src/emu/ui/selgame.cpp:1576
+#: src/emu/ui/selgame.cpp:1577 src/emu/ui/selgame.cpp:1578
+#: src/emu/ui/selgame.cpp:1579 src/emu/ui/selgame.cpp:1580
+#: src/emu/ui/selgame.cpp:1581 src/emu/ui/selgame.cpp:1582
+#: src/emu/ui/selgame.cpp:1591
 msgid "Yes"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:272
+#: src/emu/ui/filesel.cpp:275
 msgid "New Image Name:"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:278
+#: src/emu/ui/filesel.cpp:281
 msgid "Image Format:"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:284
+#: src/emu/ui/filesel.cpp:287
 msgid "Create"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:315
+#: src/emu/ui/filesel.cpp:318
 msgid "Please enter a file extension too"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:503 src/emu/ui/swlist.cpp:65
+#: src/emu/ui/filesel.cpp:506 src/emu/ui/swlist.cpp:65
 msgid "[empty slot]"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:507
+#: src/emu/ui/filesel.cpp:510
 msgid "[create]"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:511 src/emu/ui/swlist.cpp:76
+#: src/emu/ui/filesel.cpp:514 src/emu/ui/swlist.cpp:76
 msgid "[software list]"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:803
+#: src/emu/ui/filesel.cpp:806
 msgid "Select image format"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:863
+#: src/emu/ui/filesel.cpp:866
 msgid "Select access mode"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:864
+#: src/emu/ui/filesel.cpp:867
 msgid "Read-only"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:866
+#: src/emu/ui/filesel.cpp:869
 msgid "Read-write"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:867
+#: src/emu/ui/filesel.cpp:870
 msgid "Read this image, write to another image"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:868
+#: src/emu/ui/filesel.cpp:871
 msgid "Read this image, write to diff"
 msgstr ""
 
@@ -650,7 +650,7 @@ msgstr ""
 msgid "[empty]"
 msgstr ""
 
-#: src/emu/ui/info_pty.cpp:26 src/emu/ui/mainmenu.cpp:91
+#: src/emu/ui/info_pty.cpp:26 src/emu/ui/mainmenu.cpp:96
 msgid "Pseudo terminals"
 msgstr ""
 
@@ -666,7 +666,7 @@ msgstr ""
 msgid "Other Controls"
 msgstr ""
 
-#: src/emu/ui/inputmap.cpp:622 src/emu/ui/miscmenu.cpp:91
+#: src/emu/ui/inputmap.cpp:622 src/emu/ui/miscmenu.cpp:92
 #: src/emu/ui/slotopt.cpp:172
 msgid "Reset"
 msgstr ""
@@ -699,27 +699,27 @@ msgstr ""
 msgid "Machine Information"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:78
+#: src/emu/ui/mainmenu.cpp:80
 msgid "Image Information"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:81
+#: src/emu/ui/mainmenu.cpp:83
 msgid "File Manager"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:86
+#: src/emu/ui/mainmenu.cpp:92
 msgid "Tape Control"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:94
+#: src/emu/ui/mainmenu.cpp:99
 msgid "Bios Selection"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:100
+#: src/emu/ui/mainmenu.cpp:104
 msgid "Slot Devices"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:107
+#: src/emu/ui/mainmenu.cpp:109
 msgid "Barcode Reader"
 msgstr ""
 
@@ -727,43 +727,43 @@ msgstr ""
 msgid "Network Devices"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:119
+#: src/emu/ui/mainmenu.cpp:118
 msgid "Keyboard Mode"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:122
+#: src/emu/ui/mainmenu.cpp:121
 msgid "Slider Controls"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:125
+#: src/emu/ui/mainmenu.cpp:124
 msgid "Video Options"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:129
+#: src/emu/ui/mainmenu.cpp:128
 msgid "Crosshair Options"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:133
+#: src/emu/ui/mainmenu.cpp:132
 msgid "Cheat"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:136
+#: src/emu/ui/mainmenu.cpp:135
 msgid "Plugin Options"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:140
+#: src/emu/ui/mainmenu.cpp:139
 msgid "External DAT View"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:146
+#: src/emu/ui/mainmenu.cpp:145 src/emu/ui/miscmenu.cpp:785
 msgid "Add To Favorites"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:148
+#: src/emu/ui/mainmenu.cpp:147 src/emu/ui/miscmenu.cpp:787
 msgid "Remove From Favorites"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:155
+#: src/emu/ui/mainmenu.cpp:154
 msgid "Select New Machine"
 msgstr ""
 
@@ -803,189 +803,205 @@ msgstr ""
 msgid "Return to Previous Menu"
 msgstr ""
 
-#: src/emu/ui/menu.cpp:716
+#: src/emu/ui/menu.cpp:761
 msgid "Auto"
 msgstr ""
 
-#: src/emu/ui/menu.cpp:2133
+#: src/emu/ui/menu.cpp:2195
 msgid "Images"
 msgstr ""
 
-#: src/emu/ui/menu.cpp:2134
+#: src/emu/ui/menu.cpp:2196
 msgid "Infos"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Keyboard Mode:"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Natural"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Emulated"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:240
+#: src/emu/ui/miscmenu.cpp:241
 #, c-format
 msgid ""
 "Uptime: %1$d:%2$02d:%3$02d\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:242
+#: src/emu/ui/miscmenu.cpp:243
 #, c-format
 msgid ""
 "Uptime: %1$d:%2$02d\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:246
+#: src/emu/ui/miscmenu.cpp:247
 #, c-format
 msgid ""
 "Tickets dispensed: %1$d\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:257
+#: src/emu/ui/miscmenu.cpp:258
 msgid "Coin %1$c: NA%3$s\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:257
+#: src/emu/ui/miscmenu.cpp:258
 #, c-format
 msgid "Coin %1$c: %2$d%3$s\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:260
+#: src/emu/ui/miscmenu.cpp:261
 msgid " (locked)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:519
+#: src/emu/ui/miscmenu.cpp:520
 msgid "Visible Delay"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:617
+#: src/emu/ui/miscmenu.cpp:619
 #, c-format
 msgid "%s.xml saved under ui folder."
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:645
+#: src/emu/ui/miscmenu.cpp:647
 msgid "Name:             Description:\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:657
+#: src/emu/ui/miscmenu.cpp:659
 #, c-format
 msgid "%s.txt saved under ui folder."
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:675
-msgid "Export XML format (like -listxml)"
+#: src/emu/ui/miscmenu.cpp:677
+msgid "Export list in XML format (like -listxml)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:676
-msgid "Export TXT format (like -listfull)"
+#: src/emu/ui/miscmenu.cpp:678
+msgid "Export list in XML format (like -listxml, but exclude devices)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:734
-msgid "Dummy"
+#: src/emu/ui/miscmenu.cpp:679
+msgid "Export list in TXT format (like -listfull)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:736
-msgid "Save machine configuration"
-msgstr ""
-
-#: src/emu/ui/miscmenu.cpp:848 src/emu/ui/miscmenu.cpp:869
-#: src/emu/ui/selgame.cpp:594
-msgid "Plugins"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:218
-msgid "Filter"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:226
-msgid " ^!File"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:231
-msgid " ^!Category"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:254
-msgid "^!Setup custom filter"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:262
-msgid "Customize UI"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:263
-msgid "Configure Directories"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:266 src/emu/ui/sndmenu.cpp:151
-#: src/emu/ui/sndmenu.cpp:172
-msgid "Sound Options"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:269
-msgid "General Inputs"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:272
-msgid "Save Configuration"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:286 src/emu/ui/optsmenu.cpp:307
-msgid "Settings"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:327
-msgid "**Error saving ui.ini**"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:374
-#, c-format
-msgid "**Error saving %s.ini**"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:378
+#: src/emu/ui/miscmenu.cpp:729 src/emu/ui/optsmenu.cpp:376
 msgid ""
 "\n"
 "    Configuration saved    \n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/selector.cpp:166
+#: src/emu/ui/miscmenu.cpp:774
+msgid "Bios"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:776
+msgid "Driver"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:790
+msgid "Save machine configuration"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:806
+msgid "Configure machine:"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:868 src/emu/ui/selsoft.cpp:109
+msgid " (default)"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:953 src/emu/ui/miscmenu.cpp:973
+#: src/emu/ui/selgame.cpp:600
+msgid "Plugins"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:217
+msgid "Filter"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:225
+msgid " ^!File"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:230
+msgid " ^!Category"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:253
+msgid "^!Setup custom filter"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:261
+msgid "Customize UI"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:262
+msgid "Configure Directories"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:265 src/emu/ui/sndmenu.cpp:149
+#: src/emu/ui/sndmenu.cpp:169
+msgid "Sound Options"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:268
+msgid "General Inputs"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:271
+msgid "Save Configuration"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:285 src/emu/ui/optsmenu.cpp:305
+msgid "Settings"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:325
+msgid "**Error saving ui.ini**"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:372
+#, c-format
+msgid "**Error saving %s.ini**"
+msgstr ""
+
+#: src/emu/ui/selector.cpp:165
 msgid "Selection List - Search: "
 msgstr ""
 
-#: src/emu/ui/selector.cpp:196
+#: src/emu/ui/selector.cpp:194
 #, c-format
 msgid "Double click or press %1$s to select"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:39
+#: src/emu/ui/selgame.cpp:38
 msgid "General Info"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:374 src/emu/ui/selsoft.cpp:282
+#: src/emu/ui/selgame.cpp:380 src/emu/ui/selsoft.cpp:281
 #, c-format
 msgid ""
 "%s\n"
 " added to favorites list."
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:380 src/emu/ui/selgame.cpp:389
-#: src/emu/ui/selsoft.cpp:287
+#: src/emu/ui/selgame.cpp:386 src/emu/ui/selgame.cpp:395
+#: src/emu/ui/selsoft.cpp:286
 #, c-format
 msgid ""
 "%s\n"
 " removed from favorites list."
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:450
+#: src/emu/ui/selgame.cpp:457
 msgid ""
 "The selected machine is missing one or more required ROM or CHD images. "
 "Please select a different machine.\n"
@@ -993,275 +1009,275 @@ msgid ""
 "Press any key to continue."
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:589 src/emu/ui/simpleselgame.cpp:265
+#: src/emu/ui/selgame.cpp:595 src/emu/ui/simpleselgame.cpp:265
 msgid "Configure Options"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:752
+#: src/emu/ui/selgame.cpp:596
+msgid "Configure Machine"
+msgstr ""
+
+#: src/emu/ui/selgame.cpp:758
 #, c-format
 msgid "%1$s %2$s ( %3$d / %4$d machines (%5$d BIOS) )"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:762
+#: src/emu/ui/selgame.cpp:768
 #, c-format
 msgid "%1$s (%2$s - %3$s) - "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:769 src/emu/ui/selgame.cpp:775
+#: src/emu/ui/selgame.cpp:775 src/emu/ui/selgame.cpp:781
 #, c-format
 msgid "%1$s (%2$s) - "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:784
+#: src/emu/ui/selgame.cpp:790
 #, c-format
 msgid "%1$s Search: %2$s_"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:838
+#: src/emu/ui/selgame.cpp:844
 #, c-format
 msgid "Romset: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:841 src/emu/ui/selgame.cpp:890
-#: src/emu/ui/selsoft.cpp:751 src/emu/ui/selsoft.cpp:801
+#: src/emu/ui/selgame.cpp:847 src/emu/ui/selgame.cpp:896
+#: src/emu/ui/selsoft.cpp:750 src/emu/ui/selsoft.cpp:800
 #: src/emu/ui/simpleselgame.cpp:328
 #, c-format
 msgid "%1$s, %2$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:847 src/emu/ui/selsoft.cpp:757
+#: src/emu/ui/selgame.cpp:853 src/emu/ui/selsoft.cpp:756
 #, c-format
 msgid "Driver is clone of: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:849 src/emu/ui/selsoft.cpp:759
+#: src/emu/ui/selgame.cpp:855 src/emu/ui/selsoft.cpp:758
 msgid "Driver is parent"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:853 src/emu/ui/selsoft.cpp:763
+#: src/emu/ui/selgame.cpp:859 src/emu/ui/selsoft.cpp:762
 #: src/emu/ui/simpleselgame.cpp:335
 msgid "Overall: NOT WORKING"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:855 src/emu/ui/selsoft.cpp:765
+#: src/emu/ui/selgame.cpp:861 src/emu/ui/selsoft.cpp:764
 #: src/emu/ui/simpleselgame.cpp:337
 msgid "Overall: Unemulated Protection"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:857 src/emu/ui/selsoft.cpp:767
+#: src/emu/ui/selgame.cpp:863 src/emu/ui/selsoft.cpp:766
 #: src/emu/ui/simpleselgame.cpp:339
 msgid "Overall: Working"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:861 src/emu/ui/selsoft.cpp:771
+#: src/emu/ui/selgame.cpp:867 src/emu/ui/selsoft.cpp:770
 msgid "Graphics: Imperfect, "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:863 src/emu/ui/selsoft.cpp:773
+#: src/emu/ui/selgame.cpp:869 src/emu/ui/selsoft.cpp:772
 msgid "Graphics: OK, "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:866 src/emu/ui/selsoft.cpp:776
+#: src/emu/ui/selgame.cpp:872 src/emu/ui/selsoft.cpp:775
 msgid "Sound: Unimplemented"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:868 src/emu/ui/selsoft.cpp:778
+#: src/emu/ui/selgame.cpp:874 src/emu/ui/selsoft.cpp:777
 msgid "Sound: Imperfect"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:870 src/emu/ui/selsoft.cpp:780
+#: src/emu/ui/selgame.cpp:876 src/emu/ui/selsoft.cpp:779
 msgid "Sound: OK"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:887
+#: src/emu/ui/selgame.cpp:893
 #, c-format
 msgid "System: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:894 src/emu/ui/selsoft.cpp:805
+#: src/emu/ui/selgame.cpp:900 src/emu/ui/selsoft.cpp:804
 #, c-format
 msgid "Software is clone of: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:896 src/emu/ui/selsoft.cpp:807
+#: src/emu/ui/selgame.cpp:902 src/emu/ui/selsoft.cpp:806
 msgid "Software is parent"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:901 src/emu/ui/selsoft.cpp:812
+#: src/emu/ui/selgame.cpp:907 src/emu/ui/selsoft.cpp:811
 msgid "Supported: No"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:906 src/emu/ui/selsoft.cpp:817
+#: src/emu/ui/selgame.cpp:912 src/emu/ui/selsoft.cpp:816
 msgid "Supported: Partial"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:911 src/emu/ui/selsoft.cpp:822
+#: src/emu/ui/selgame.cpp:917 src/emu/ui/selsoft.cpp:821
 msgid "Supported: Yes"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:916 src/emu/ui/selsoft.cpp:827
+#: src/emu/ui/selgame.cpp:922 src/emu/ui/selsoft.cpp:826
 #, c-format
 msgid "romset: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:923
+#: src/emu/ui/selgame.cpp:929
 #, c-format
 msgid "%1$s %2$s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1535
+#: src/emu/ui/selgame.cpp:1543
 #, c-format
 msgid "Romset: %1$-.100s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1536
+#: src/emu/ui/selgame.cpp:1544
 #, c-format
 msgid "Year: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1537
+#: src/emu/ui/selgame.cpp:1545
 #, c-format
 msgid "Manufacturer: %1$-.100s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1541
+#: src/emu/ui/selgame.cpp:1549
 #, c-format
 msgid "Driver is Clone of: %1$-.100s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1543
+#: src/emu/ui/selgame.cpp:1551
 msgid "Driver is Parent\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1546
+#: src/emu/ui/selgame.cpp:1554
 msgid "Overall: NOT WORKING\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1548
+#: src/emu/ui/selgame.cpp:1556
 msgid "Overall: Unemulated Protection\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1550
+#: src/emu/ui/selgame.cpp:1558
 msgid "Overall: Working\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1553
+#: src/emu/ui/selgame.cpp:1561
 msgid "Graphics: Imperfect Colors\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1557
+#: src/emu/ui/selgame.cpp:1565
 msgid "Graphics: Imperfect\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1559
+#: src/emu/ui/selgame.cpp:1567
 msgid "Graphics: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1562
+#: src/emu/ui/selgame.cpp:1570
 msgid "Sound: Unimplemented\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1564
+#: src/emu/ui/selgame.cpp:1572
 msgid "Sound: Imperfect\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1566
+#: src/emu/ui/selgame.cpp:1574
 msgid "Sound: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1568
+#: src/emu/ui/selgame.cpp:1576
 #, c-format
 msgid "Driver is Skeleton: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1569
+#: src/emu/ui/selgame.cpp:1577
 #, c-format
 msgid "Game is Mechanical: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1570
+#: src/emu/ui/selgame.cpp:1578
 #, c-format
 msgid "Requires Artwork: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1571
+#: src/emu/ui/selgame.cpp:1579
 #, c-format
 msgid "Requires Clickable Artwork: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1572
+#: src/emu/ui/selgame.cpp:1580
 #, c-format
 msgid "Support Cocktail: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1573
+#: src/emu/ui/selgame.cpp:1581
 #, c-format
 msgid "Driver is Bios: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1574
+#: src/emu/ui/selgame.cpp:1582
 #, c-format
 msgid "Support Save: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 #, c-format
 msgid "Screen Orientation: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 msgid "Vertical"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 msgid "Horizontal"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/selgame.cpp:1591
 #, c-format
 msgid "Requires CHD: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1596
+#: src/emu/ui/selgame.cpp:1604
 msgid "Roms Audit Pass: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1598
+#: src/emu/ui/selgame.cpp:1606
 msgid "Roms Audit Pass: BAD\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1601
+#: src/emu/ui/selgame.cpp:1609
 msgid "Samples Audit Pass: None Needed\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1603
+#: src/emu/ui/selgame.cpp:1611
 msgid "Samples Audit Pass: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1605
+#: src/emu/ui/selgame.cpp:1613
 msgid "Samples Audit Pass: BAD\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1608
+#: src/emu/ui/selgame.cpp:1616
 msgid ""
 "Roms Audit Pass: Disabled\n"
 "Samples Audit Pass: Disabled\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:2049 src/emu/ui/selgame.cpp:2212
-#: src/emu/ui/selsoft.cpp:1662
+#: src/emu/ui/selgame.cpp:2055 src/emu/ui/selgame.cpp:2216
+#: src/emu/ui/selsoft.cpp:1655
 msgid "No Infos Available"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:2162 src/emu/ui/selsoft.cpp:1607
+#: src/emu/ui/selgame.cpp:2168 src/emu/ui/selsoft.cpp:1602
 msgid "Usage"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:110
-msgid " (default)"
-msgstr ""
-
-#: src/emu/ui/selsoft.cpp:381
+#: src/emu/ui/selsoft.cpp:380
 msgid ""
 "The selected software is missing one or more required files. Please select a "
 "different software.\n"
@@ -1269,57 +1285,57 @@ msgid ""
 "Press any key to continue."
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:684
+#: src/emu/ui/selsoft.cpp:683
 #, c-format
-msgid "%1$s %2$s ( %3$d / %4$d softwares )"
+msgid "%1$s %2$s ( %3$d / %4$d software packages )"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:685
+#: src/emu/ui/selsoft.cpp:684
 #, c-format
 msgid "Driver: \"%1$s\" software list "
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:688
+#: src/emu/ui/selsoft.cpp:687
 #, c-format
 msgid "Region: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:690
+#: src/emu/ui/selsoft.cpp:689
 #, c-format
 msgid "Publisher: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:692
+#: src/emu/ui/selsoft.cpp:691
 #, c-format
 msgid "Year: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:694
+#: src/emu/ui/selsoft.cpp:693
 #, c-format
 msgid "Software List: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:696
+#: src/emu/ui/selsoft.cpp:695
 #, c-format
 msgid "Device type: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:698
+#: src/emu/ui/selsoft.cpp:697
 #, c-format
 msgid "%s Search: %s_"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:748 src/emu/ui/selsoft.cpp:798
+#: src/emu/ui/selsoft.cpp:747 src/emu/ui/selsoft.cpp:797
 #: src/emu/ui/simpleselgame.cpp:325
 #, c-format
 msgid "%1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:1998 src/emu/ui/selsoft.cpp:2018
+#: src/emu/ui/selsoft.cpp:1991 src/emu/ui/selsoft.cpp:2011
 msgid "Software part selection:"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:2136 src/emu/ui/selsoft.cpp:2156
+#: src/emu/ui/selsoft.cpp:2129 src/emu/ui/selsoft.cpp:2149
 msgid "Bios selection:"
 msgstr ""
 
@@ -1367,15 +1383,15 @@ msgstr ""
 msgid " [internal]"
 msgstr ""
 
-#: src/emu/ui/sndmenu.cpp:135
+#: src/emu/ui/sndmenu.cpp:133
 msgid "Sound"
 msgstr ""
 
-#: src/emu/ui/sndmenu.cpp:136
+#: src/emu/ui/sndmenu.cpp:134
 msgid "Sample Rate"
 msgstr ""
 
-#: src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/sndmenu.cpp:135
 msgid "Use External Samples"
 msgstr ""
 
@@ -1444,80 +1460,80 @@ msgstr ""
 msgid "Fast Forward"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:419
+#: src/emu/ui/ui.cpp:418
 msgid "This driver requires images to be loaded in the following device(s): "
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1074
+#: src/emu/ui/ui.cpp:1071
 msgid ""
 "One or more ROMs/CHDs for this machine are incorrect. The machine may not "
 "run correctly.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1087
+#: src/emu/ui/ui.cpp:1084
 msgid ""
 "There are known problems with this machine\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1091
+#: src/emu/ui/ui.cpp:1088
 msgid ""
 "One or more ROMs/CHDs for this machine have not been correctly dumped.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1095
+#: src/emu/ui/ui.cpp:1092
 #, c-format
 msgid "The keyboard emulation may not be 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1097
+#: src/emu/ui/ui.cpp:1094
 #, c-format
 msgid "The colors aren't 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1099
+#: src/emu/ui/ui.cpp:1096
 msgid "The colors are completely wrong.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1101
+#: src/emu/ui/ui.cpp:1098
 #, c-format
 msgid "The video emulation isn't 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1103
+#: src/emu/ui/ui.cpp:1100
 #, c-format
 msgid "The sound emulation isn't 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1105
+#: src/emu/ui/ui.cpp:1102
 msgid "The machine lacks sound.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1108
+#: src/emu/ui/ui.cpp:1105
 msgid "Screen flipping in cocktail mode is not supported.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1112
+#: src/emu/ui/ui.cpp:1109
 msgid "The machine requires external artwork files\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1117
+#: src/emu/ui/ui.cpp:1114
 msgid ""
 "This machine was never completed. It may exhibit strange behavior or missing "
 "elements that are not bugs in the emulation.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1122
+#: src/emu/ui/ui.cpp:1119
 msgid ""
 "This machine has no sound hardware, MAME will produce no sounds, this is "
 "expected behaviour.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1130
+#: src/emu/ui/ui.cpp:1127
 msgid "The machine has protection which isn't fully emulated.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1133
+#: src/emu/ui/ui.cpp:1130
 msgid ""
 "\n"
 "THIS MACHINE DOESN'T WORK. The emulation for this machine is not yet "
@@ -1525,7 +1541,7 @@ msgid ""
 "the developers to improve the emulation.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1137
+#: src/emu/ui/ui.cpp:1134
 msgid ""
 "\n"
 "Certain elements of this machine cannot be emulated as it requires actual "
@@ -1533,21 +1549,21 @@ msgid ""
 "to fully play this machine.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1156
+#: src/emu/ui/ui.cpp:1153
 msgid ""
 "\n"
 "\n"
 "There are working clones of this machine: "
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1170
+#: src/emu/ui/ui.cpp:1167
 msgid ""
 "\n"
 "\n"
 "Press any key to continue"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1185
+#: src/emu/ui/ui.cpp:1182
 #, c-format
 msgid ""
 "%1$s\n"
@@ -1557,98 +1573,98 @@ msgid ""
 "CPU:\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1221 src/emu/ui/ui.cpp:1260
+#: src/emu/ui/ui.cpp:1218 src/emu/ui/ui.cpp:1257
 msgid "MHz"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1221 src/emu/ui/ui.cpp:1260
+#: src/emu/ui/ui.cpp:1218 src/emu/ui/ui.cpp:1257
 msgid "kHz"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1235
+#: src/emu/ui/ui.cpp:1232
 msgid ""
 "\n"
 "Sound:\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1264
+#: src/emu/ui/ui.cpp:1261
 msgid ""
 "\n"
 "Video:\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1268
+#: src/emu/ui/ui.cpp:1265
 msgid "None\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1275
+#: src/emu/ui/ui.cpp:1272
 msgid "Vector"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1286
+#: src/emu/ui/ui.cpp:1283
 #, c-format
 msgid "%1$s: %2$s\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1286
+#: src/emu/ui/ui.cpp:1283
 msgid "%2$s\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1541 src/emu/ui/ui.cpp:1551
+#: src/emu/ui/ui.cpp:1538 src/emu/ui/ui.cpp:1548
 msgid "Keyboard Emulation Status"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1543
+#: src/emu/ui/ui.cpp:1540
 msgid "Mode: PARTIAL Emulation"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1544
+#: src/emu/ui/ui.cpp:1541
 msgid "UI:   Enabled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1546 src/emu/ui/ui.cpp:1556
+#: src/emu/ui/ui.cpp:1543 src/emu/ui/ui.cpp:1553
 msgid "**Use ScrLock to toggle**"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1553
+#: src/emu/ui/ui.cpp:1550
 msgid "Mode: FULL Emulation"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1554
+#: src/emu/ui/ui.cpp:1551
 msgid "UI:   Disabled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1692
+#: src/emu/ui/ui.cpp:1689
 msgid "Autofire can't be enabled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1731
+#: src/emu/ui/ui.cpp:1728
 msgid "Select position to save to"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1733
+#: src/emu/ui/ui.cpp:1730
 msgid "Select position to load from"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1757
+#: src/emu/ui/ui.cpp:1754
 msgid "Save cancelled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1759
+#: src/emu/ui/ui.cpp:1756
 msgid "Load cancelled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1802
+#: src/emu/ui/ui.cpp:1799
 #, c-format
 msgid "Save to position %s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1807
+#: src/emu/ui/ui.cpp:1804
 #, c-format
 msgid "Load from position %s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1847
+#: src/emu/ui/ui.cpp:1844
 #, c-format
 msgid ""
 "Are you sure you want to quit?\n"
@@ -1657,173 +1673,173 @@ msgid ""
 "Press ''%2$s'' to return to emulation."
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1917
+#: src/emu/ui/ui.cpp:1914
 msgid "Master Volume"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1926
+#: src/emu/ui/ui.cpp:1923
 #, c-format
 msgid "%1$s Volume"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1949
+#: src/emu/ui/ui.cpp:1946
 #, c-format
 msgid "Overclock CPU %1$s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1968
+#: src/emu/ui/ui.cpp:1965
 #, c-format
 msgid "%1$s Refresh Rate"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1973
+#: src/emu/ui/ui.cpp:1970
 #, c-format
 msgid "%1$s Brightness"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1975
+#: src/emu/ui/ui.cpp:1972
 #, c-format
 msgid "%1$s Contrast"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1977
+#: src/emu/ui/ui.cpp:1974
 #, c-format
 msgid "%1$s Gamma"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1981
+#: src/emu/ui/ui.cpp:1978
 #, c-format
 msgid "%1$s Horiz Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1983
+#: src/emu/ui/ui.cpp:1980
 #, c-format
 msgid "%1$s Horiz Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1985
+#: src/emu/ui/ui.cpp:1982
 #, c-format
 msgid "%1$s Vert Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1987
+#: src/emu/ui/ui.cpp:1984
 #, c-format
 msgid "%1$s Vert Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2005
+#: src/emu/ui/ui.cpp:2002
 #, c-format
 msgid "Laserdisc '%1$s' Horiz Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2007
+#: src/emu/ui/ui.cpp:2004
 #, c-format
 msgid "Laserdisc '%1$s' Horiz Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2009
+#: src/emu/ui/ui.cpp:2006
 #, c-format
 msgid "Laserdisc '%1$s' Vert Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2011
+#: src/emu/ui/ui.cpp:2008
 #, c-format
 msgid "Laserdisc '%1$s' Vert Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2021
+#: src/emu/ui/ui.cpp:2018
 msgid "Vector Flicker"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2022
+#: src/emu/ui/ui.cpp:2019
 msgid "Beam Width Minimum"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2023
+#: src/emu/ui/ui.cpp:2020
 msgid "Beam Width Maximum"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2024
+#: src/emu/ui/ui.cpp:2021
 msgid "Beam Intensity Weight"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2037
+#: src/emu/ui/ui.cpp:2034
 #, c-format
 msgid "Crosshair Scale %1$s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2037 src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2034 src/emu/ui/ui.cpp:2036
 msgid "X"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2037 src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2034 src/emu/ui/ui.cpp:2036
 msgid "Y"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2036
 #, c-format
 msgid "Crosshair Offset %1$s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2071
+#: src/emu/ui/ui.cpp:2068
 #, c-format
 msgid "%1$3ddB"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2115
+#: src/emu/ui/ui.cpp:2112
 #, c-format
 msgid "%1$d%%"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2131
+#: src/emu/ui/ui.cpp:2128
 #, c-format
 msgid "%1$3.0f%%"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2154
+#: src/emu/ui/ui.cpp:2151
 #, c-format
 msgid "%1$.3ffps"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2177 src/emu/ui/ui.cpp:2199 src/emu/ui/ui.cpp:2220
-#: src/emu/ui/ui.cpp:2242 src/emu/ui/ui.cpp:2264 src/emu/ui/ui.cpp:2286
-#: src/emu/ui/ui.cpp:2308 src/emu/ui/ui.cpp:2330 src/emu/ui/ui.cpp:2352
-#: src/emu/ui/ui.cpp:2374 src/emu/ui/ui.cpp:2396
+#: src/emu/ui/ui.cpp:2174 src/emu/ui/ui.cpp:2196 src/emu/ui/ui.cpp:2217
+#: src/emu/ui/ui.cpp:2239 src/emu/ui/ui.cpp:2261 src/emu/ui/ui.cpp:2283
+#: src/emu/ui/ui.cpp:2305 src/emu/ui/ui.cpp:2327 src/emu/ui/ui.cpp:2349
+#: src/emu/ui/ui.cpp:2371 src/emu/ui/ui.cpp:2393
 #, c-format
 msgid "%1$.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2412 src/emu/ui/ui.cpp:2428 src/emu/ui/ui.cpp:2444
-#: src/emu/ui/ui.cpp:2460
+#: src/emu/ui/ui.cpp:2408 src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2438
+#: src/emu/ui/ui.cpp:2453
 #, c-format
 msgid "%1$1.2f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2476
+#: src/emu/ui/ui.cpp:2469
 #, c-format
 msgid "Screen '%1$s'"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2478
+#: src/emu/ui/ui.cpp:2471
 msgid "Screen"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2494
+#: src/emu/ui/ui.cpp:2487
 #, c-format
 msgid "Crosshair Scale X %1$1.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2494
+#: src/emu/ui/ui.cpp:2487
 #, c-format
 msgid "Crosshair Scale Y %1$1.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2513
+#: src/emu/ui/ui.cpp:2506
 #, c-format
 msgid "Crosshair Offset X %1$1.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2513
+#: src/emu/ui/ui.cpp:2506
 #, c-format
 msgid "Crosshair Offset Y %1$1.3f"
 msgstr ""
@@ -1865,10 +1881,10 @@ msgstr ""
 msgid "Full"
 msgstr ""
 
-#: src/emu/ui/viewgfx.cpp:392
+#: src/emu/ui/viewgfx.cpp:391
 msgid " COLORS"
 msgstr ""
 
-#: src/emu/ui/viewgfx.cpp:392
+#: src/emu/ui/viewgfx.cpp:391
 msgid " PENS"
 msgstr ""
diff --git a/language/Lithuanian/strings.po b/language/Lithuanian/strings.po
index 3114e518767..06b5399a5b9 100644
--- a/language/Lithuanian/strings.po
+++ b/language/Lithuanian/strings.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MAME\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-11 03:33+0200\n"
+"POT-Creation-Date: 2016-04-15 17:42+0200\n"
 "PO-Revision-Date: 2016-02-20 18:03+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: MAME Language Team\n"
@@ -61,14 +61,14 @@ msgstr ""
 msgid "Autofire Status"
 msgstr ""
 
-#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1698
+#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1695
 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211
 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219
 #: src/emu/ui/videoopt.cpp:223
 msgid "Disabled"
 msgstr ""
 
-#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1698
+#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1695
 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211
 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219
 #: src/emu/ui/videoopt.cpp:223
@@ -76,14 +76,14 @@ msgid "Enabled"
 msgstr ""
 
 #: src/emu/ui/cheatopt.cpp:282 src/emu/ui/cheatopt.cpp:288
-#: src/emu/ui/menu.cpp:710 src/emu/ui/miscmenu.cpp:831
-#: src/emu/ui/sndmenu.cpp:135 src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/menu.cpp:755 src/emu/ui/miscmenu.cpp:936
+#: src/emu/ui/sndmenu.cpp:133 src/emu/ui/sndmenu.cpp:135
 msgid "On"
 msgstr ""
 
 #: src/emu/ui/cheatopt.cpp:282 src/emu/ui/cheatopt.cpp:288
-#: src/emu/ui/menu.cpp:713 src/emu/ui/miscmenu.cpp:831
-#: src/emu/ui/sndmenu.cpp:135 src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/menu.cpp:758 src/emu/ui/miscmenu.cpp:936
+#: src/emu/ui/sndmenu.cpp:133 src/emu/ui/sndmenu.cpp:135
 msgid "Off"
 msgstr ""
 
@@ -95,316 +95,316 @@ msgstr ""
 msgid "Autofire Delay"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:158 src/emu/ui/custmenu.cpp:447
+#: src/emu/ui/custmenu.cpp:157 src/emu/ui/custmenu.cpp:445
 msgid "Main filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:167 src/emu/ui/custmenu.cpp:456
+#: src/emu/ui/custmenu.cpp:166 src/emu/ui/custmenu.cpp:454
 msgid "Other filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:176 src/emu/ui/optsmenu.cpp:239
+#: src/emu/ui/custmenu.cpp:175 src/emu/ui/optsmenu.cpp:238
 msgid "^!Manufacturer"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:185 src/emu/ui/custmenu.cpp:474
-#: src/emu/ui/optsmenu.cpp:247
+#: src/emu/ui/custmenu.cpp:184 src/emu/ui/custmenu.cpp:472
+#: src/emu/ui/optsmenu.cpp:246
 msgid "^!Year"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:194 src/emu/ui/custmenu.cpp:510
+#: src/emu/ui/custmenu.cpp:193 src/emu/ui/custmenu.cpp:508
 msgid "Remove last filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:197 src/emu/ui/custmenu.cpp:513
+#: src/emu/ui/custmenu.cpp:196 src/emu/ui/custmenu.cpp:511
 msgid "Add filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:212 src/emu/ui/custmenu.cpp:233
-#: src/emu/ui/custmenu.cpp:529 src/emu/ui/custmenu.cpp:550
+#: src/emu/ui/custmenu.cpp:211 src/emu/ui/custmenu.cpp:231
+#: src/emu/ui/custmenu.cpp:527 src/emu/ui/custmenu.cpp:547
 msgid "Select custom filters:"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:465
+#: src/emu/ui/custmenu.cpp:463
 msgid "^!Publisher"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:483
+#: src/emu/ui/custmenu.cpp:481
 msgid "^!Software List"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:492
+#: src/emu/ui/custmenu.cpp:490
 msgid "^!Device type"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:501
+#: src/emu/ui/custmenu.cpp:499
 msgid "^!Region"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:23
+#: src/emu/ui/custui.cpp:22
 msgid "Show All"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:24
+#: src/emu/ui/custui.cpp:23
 msgid "Hide Filters"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:25
+#: src/emu/ui/custui.cpp:24
 msgid "Hide Info/Image"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:26
+#: src/emu/ui/custui.cpp:25
 msgid "Hide Both"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:142
+#: src/emu/ui/custui.cpp:141
 msgid "Fonts"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:143
+#: src/emu/ui/custui.cpp:142
 msgid "Colors"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:148 src/emu/ui/dirmenu.cpp:33
+#: src/emu/ui/custui.cpp:147 src/emu/ui/dirmenu.cpp:33
 msgid "Language"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:152
+#: src/emu/ui/custui.cpp:151
 msgid "Show side panels"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:167 src/emu/ui/custui.cpp:188
+#: src/emu/ui/custui.cpp:166 src/emu/ui/custui.cpp:186
 msgid "Custom UI Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:246
+#: src/emu/ui/custui.cpp:244
 msgid "default"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:349
+#: src/emu/ui/custui.cpp:347
 msgid "UI Font"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:354
+#: src/emu/ui/custui.cpp:352
 msgid "Bold"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:355
+#: src/emu/ui/custui.cpp:353
 msgid "Italic"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:360
+#: src/emu/ui/custui.cpp:358
 msgid "Lines"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:366
+#: src/emu/ui/custui.cpp:364
 msgid "Infos text size"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:383
+#: src/emu/ui/custui.cpp:381
 msgid "UI Fonts Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:411
+#: src/emu/ui/custui.cpp:408
 msgid "Sample text - Lorem ipsum dolor sit amet, consectetur adipiscing elit."
 msgstr ""
 
-#: src/emu/ui/custui.cpp:509
+#: src/emu/ui/custui.cpp:506
 msgid "Normal text"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:510
+#: src/emu/ui/custui.cpp:507
 msgid "Selected color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:511
+#: src/emu/ui/custui.cpp:508
 msgid "Normal text background"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:512
+#: src/emu/ui/custui.cpp:509
 msgid "Selected background color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:513
+#: src/emu/ui/custui.cpp:510
 msgid "Subitem color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:514 src/emu/ui/custui.cpp:610
+#: src/emu/ui/custui.cpp:511 src/emu/ui/custui.cpp:606
 msgid "Clone"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:515
+#: src/emu/ui/custui.cpp:512
 msgid "Border"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:516
+#: src/emu/ui/custui.cpp:513
 msgid "Background"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:517
+#: src/emu/ui/custui.cpp:514
 msgid "Dipswitch"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:518
+#: src/emu/ui/custui.cpp:515
 msgid "Unavailable color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:519
+#: src/emu/ui/custui.cpp:516
 msgid "Slider color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:520
+#: src/emu/ui/custui.cpp:517
 msgid "Gfx viewer background"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:521
+#: src/emu/ui/custui.cpp:518
 msgid "Mouse over color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:522
+#: src/emu/ui/custui.cpp:519
 msgid "Mouse over background color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:523
+#: src/emu/ui/custui.cpp:520
 msgid "Mouse down color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:524
+#: src/emu/ui/custui.cpp:521
 msgid "Mouse down background color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:527
+#: src/emu/ui/custui.cpp:524
 msgid "Restore originals colors"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:543
+#: src/emu/ui/custui.cpp:540
 msgid "UI Colors Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:572
+#: src/emu/ui/custui.cpp:568
 #, c-format
 msgid "Double click or press %1$s to change the color value"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:598
+#: src/emu/ui/custui.cpp:594
 msgid "Menu Preview"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:606
+#: src/emu/ui/custui.cpp:602
 msgid "Normal"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:607
+#: src/emu/ui/custui.cpp:603
 msgid "Subitem"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:608
+#: src/emu/ui/custui.cpp:604
 msgid "Selected"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:609
+#: src/emu/ui/custui.cpp:605
 msgid "Mouse Over"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:841 src/emu/ui/custui.cpp:844
+#: src/emu/ui/custui.cpp:837 src/emu/ui/custui.cpp:840
 msgid "Alpha"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:849 src/emu/ui/custui.cpp:852
-#: src/emu/ui/custui.cpp:1013
+#: src/emu/ui/custui.cpp:845 src/emu/ui/custui.cpp:848
+#: src/emu/ui/custui.cpp:1007
 msgid "Red"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:857 src/emu/ui/custui.cpp:860
-#: src/emu/ui/custui.cpp:1016
+#: src/emu/ui/custui.cpp:853 src/emu/ui/custui.cpp:856
+#: src/emu/ui/custui.cpp:1010
 msgid "Green"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:865 src/emu/ui/custui.cpp:868
-#: src/emu/ui/custui.cpp:1017
+#: src/emu/ui/custui.cpp:861 src/emu/ui/custui.cpp:864
+#: src/emu/ui/custui.cpp:1011
 msgid "Blue"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:871
+#: src/emu/ui/custui.cpp:867
 msgid "Choose from palette"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:887
+#: src/emu/ui/custui.cpp:883
 msgid " - ARGB Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:912
+#: src/emu/ui/custui.cpp:907
 msgid "Color preview ="
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1009
+#: src/emu/ui/custui.cpp:1003
 msgid "White"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1010
+#: src/emu/ui/custui.cpp:1004
 msgid "Silver"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1011
+#: src/emu/ui/custui.cpp:1005
 msgid "Gray"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1012
+#: src/emu/ui/custui.cpp:1006
 msgid "Black"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1014
+#: src/emu/ui/custui.cpp:1008
 msgid "Orange"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1015
+#: src/emu/ui/custui.cpp:1009
 msgid "Yellow"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1018
+#: src/emu/ui/custui.cpp:1012
 msgid "Violet"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:65
+#: src/emu/ui/datmenu.cpp:64
 msgid "Software History"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:67
+#: src/emu/ui/datmenu.cpp:66
 msgid "Software Usage"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:199
+#: src/emu/ui/datmenu.cpp:196
 msgid "Revision: "
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:287 src/emu/ui/selgame.cpp:40
-#: src/emu/ui/selgame.cpp:2152 src/emu/ui/selgame.cpp:2161
-#: src/emu/ui/selsoft.cpp:1577 src/emu/ui/selsoft.cpp:1597
-#: src/emu/ui/selsoft.cpp:1606
+#: src/emu/ui/datmenu.cpp:284 src/emu/ui/selgame.cpp:39
+#: src/emu/ui/selgame.cpp:2158 src/emu/ui/selgame.cpp:2167
+#: src/emu/ui/selsoft.cpp:1574 src/emu/ui/selsoft.cpp:1592
+#: src/emu/ui/selsoft.cpp:1601
 msgid "History"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:289 src/emu/ui/selgame.cpp:41
+#: src/emu/ui/datmenu.cpp:286 src/emu/ui/selgame.cpp:40
 msgid "Mameinfo"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:291 src/emu/ui/selgame.cpp:43
+#: src/emu/ui/datmenu.cpp:288 src/emu/ui/selgame.cpp:42
 msgid "Messinfo"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:293 src/emu/ui/selgame.cpp:42
+#: src/emu/ui/datmenu.cpp:290 src/emu/ui/selgame.cpp:41
 msgid "Sysinfo"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:295 src/emu/ui/selgame.cpp:46
+#: src/emu/ui/datmenu.cpp:292 src/emu/ui/selgame.cpp:45
 msgid "Mamescore"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:297 src/emu/ui/selgame.cpp:45
+#: src/emu/ui/datmenu.cpp:294 src/emu/ui/selgame.cpp:44
 msgid "Gameinit"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:299 src/emu/ui/selgame.cpp:44
+#: src/emu/ui/datmenu.cpp:296 src/emu/ui/selgame.cpp:43
 msgid "Command"
 msgstr ""
 
@@ -556,75 +556,75 @@ msgstr ""
 msgid "Remove %1$s Folder"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:158
+#: src/emu/ui/filesel.cpp:161
 msgid "File Already Exists - Override?"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:160 src/emu/ui/selgame.cpp:1568
-#: src/emu/ui/selgame.cpp:1569 src/emu/ui/selgame.cpp:1570
-#: src/emu/ui/selgame.cpp:1571 src/emu/ui/selgame.cpp:1572
-#: src/emu/ui/selgame.cpp:1573 src/emu/ui/selgame.cpp:1574
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/filesel.cpp:163 src/emu/ui/selgame.cpp:1576
+#: src/emu/ui/selgame.cpp:1577 src/emu/ui/selgame.cpp:1578
+#: src/emu/ui/selgame.cpp:1579 src/emu/ui/selgame.cpp:1580
+#: src/emu/ui/selgame.cpp:1581 src/emu/ui/selgame.cpp:1582
+#: src/emu/ui/selgame.cpp:1591
 msgid "No"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:161 src/emu/ui/selgame.cpp:1568
-#: src/emu/ui/selgame.cpp:1569 src/emu/ui/selgame.cpp:1570
-#: src/emu/ui/selgame.cpp:1571 src/emu/ui/selgame.cpp:1572
-#: src/emu/ui/selgame.cpp:1573 src/emu/ui/selgame.cpp:1574
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/filesel.cpp:164 src/emu/ui/selgame.cpp:1576
+#: src/emu/ui/selgame.cpp:1577 src/emu/ui/selgame.cpp:1578
+#: src/emu/ui/selgame.cpp:1579 src/emu/ui/selgame.cpp:1580
+#: src/emu/ui/selgame.cpp:1581 src/emu/ui/selgame.cpp:1582
+#: src/emu/ui/selgame.cpp:1591
 msgid "Yes"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:272
+#: src/emu/ui/filesel.cpp:275
 msgid "New Image Name:"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:278
+#: src/emu/ui/filesel.cpp:281
 msgid "Image Format:"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:284
+#: src/emu/ui/filesel.cpp:287
 msgid "Create"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:315
+#: src/emu/ui/filesel.cpp:318
 msgid "Please enter a file extension too"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:503 src/emu/ui/swlist.cpp:65
+#: src/emu/ui/filesel.cpp:506 src/emu/ui/swlist.cpp:65
 msgid "[empty slot]"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:507
+#: src/emu/ui/filesel.cpp:510
 msgid "[create]"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:511 src/emu/ui/swlist.cpp:76
+#: src/emu/ui/filesel.cpp:514 src/emu/ui/swlist.cpp:76
 msgid "[software list]"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:803
+#: src/emu/ui/filesel.cpp:806
 msgid "Select image format"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:863
+#: src/emu/ui/filesel.cpp:866
 msgid "Select access mode"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:864
+#: src/emu/ui/filesel.cpp:867
 msgid "Read-only"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:866
+#: src/emu/ui/filesel.cpp:869
 msgid "Read-write"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:867
+#: src/emu/ui/filesel.cpp:870
 msgid "Read this image, write to another image"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:868
+#: src/emu/ui/filesel.cpp:871
 msgid "Read this image, write to diff"
 msgstr ""
 
@@ -650,7 +650,7 @@ msgstr ""
 msgid "[empty]"
 msgstr ""
 
-#: src/emu/ui/info_pty.cpp:26 src/emu/ui/mainmenu.cpp:91
+#: src/emu/ui/info_pty.cpp:26 src/emu/ui/mainmenu.cpp:96
 msgid "Pseudo terminals"
 msgstr ""
 
@@ -666,7 +666,7 @@ msgstr ""
 msgid "Other Controls"
 msgstr ""
 
-#: src/emu/ui/inputmap.cpp:622 src/emu/ui/miscmenu.cpp:91
+#: src/emu/ui/inputmap.cpp:622 src/emu/ui/miscmenu.cpp:92
 #: src/emu/ui/slotopt.cpp:172
 msgid "Reset"
 msgstr ""
@@ -699,27 +699,27 @@ msgstr ""
 msgid "Machine Information"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:78
+#: src/emu/ui/mainmenu.cpp:80
 msgid "Image Information"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:81
+#: src/emu/ui/mainmenu.cpp:83
 msgid "File Manager"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:86
+#: src/emu/ui/mainmenu.cpp:92
 msgid "Tape Control"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:94
+#: src/emu/ui/mainmenu.cpp:99
 msgid "Bios Selection"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:100
+#: src/emu/ui/mainmenu.cpp:104
 msgid "Slot Devices"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:107
+#: src/emu/ui/mainmenu.cpp:109
 msgid "Barcode Reader"
 msgstr ""
 
@@ -727,43 +727,43 @@ msgstr ""
 msgid "Network Devices"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:119
+#: src/emu/ui/mainmenu.cpp:118
 msgid "Keyboard Mode"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:122
+#: src/emu/ui/mainmenu.cpp:121
 msgid "Slider Controls"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:125
+#: src/emu/ui/mainmenu.cpp:124
 msgid "Video Options"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:129
+#: src/emu/ui/mainmenu.cpp:128
 msgid "Crosshair Options"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:133
+#: src/emu/ui/mainmenu.cpp:132
 msgid "Cheat"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:136
+#: src/emu/ui/mainmenu.cpp:135
 msgid "Plugin Options"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:140
+#: src/emu/ui/mainmenu.cpp:139
 msgid "External DAT View"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:146
+#: src/emu/ui/mainmenu.cpp:145 src/emu/ui/miscmenu.cpp:785
 msgid "Add To Favorites"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:148
+#: src/emu/ui/mainmenu.cpp:147 src/emu/ui/miscmenu.cpp:787
 msgid "Remove From Favorites"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:155
+#: src/emu/ui/mainmenu.cpp:154
 msgid "Select New Machine"
 msgstr ""
 
@@ -803,189 +803,205 @@ msgstr ""
 msgid "Return to Previous Menu"
 msgstr ""
 
-#: src/emu/ui/menu.cpp:716
+#: src/emu/ui/menu.cpp:761
 msgid "Auto"
 msgstr ""
 
-#: src/emu/ui/menu.cpp:2133
+#: src/emu/ui/menu.cpp:2195
 msgid "Images"
 msgstr ""
 
-#: src/emu/ui/menu.cpp:2134
+#: src/emu/ui/menu.cpp:2196
 msgid "Infos"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Keyboard Mode:"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Natural"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Emulated"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:240
+#: src/emu/ui/miscmenu.cpp:241
 #, c-format
 msgid ""
 "Uptime: %1$d:%2$02d:%3$02d\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:242
+#: src/emu/ui/miscmenu.cpp:243
 #, c-format
 msgid ""
 "Uptime: %1$d:%2$02d\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:246
+#: src/emu/ui/miscmenu.cpp:247
 #, c-format
 msgid ""
 "Tickets dispensed: %1$d\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:257
+#: src/emu/ui/miscmenu.cpp:258
 msgid "Coin %1$c: NA%3$s\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:257
+#: src/emu/ui/miscmenu.cpp:258
 #, c-format
 msgid "Coin %1$c: %2$d%3$s\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:260
+#: src/emu/ui/miscmenu.cpp:261
 msgid " (locked)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:519
+#: src/emu/ui/miscmenu.cpp:520
 msgid "Visible Delay"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:617
+#: src/emu/ui/miscmenu.cpp:619
 #, c-format
 msgid "%s.xml saved under ui folder."
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:645
+#: src/emu/ui/miscmenu.cpp:647
 msgid "Name:             Description:\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:657
+#: src/emu/ui/miscmenu.cpp:659
 #, c-format
 msgid "%s.txt saved under ui folder."
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:675
-msgid "Export XML format (like -listxml)"
+#: src/emu/ui/miscmenu.cpp:677
+msgid "Export list in XML format (like -listxml)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:676
-msgid "Export TXT format (like -listfull)"
+#: src/emu/ui/miscmenu.cpp:678
+msgid "Export list in XML format (like -listxml, but exclude devices)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:734
-msgid "Dummy"
+#: src/emu/ui/miscmenu.cpp:679
+msgid "Export list in TXT format (like -listfull)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:736
-msgid "Save machine configuration"
-msgstr ""
-
-#: src/emu/ui/miscmenu.cpp:848 src/emu/ui/miscmenu.cpp:869
-#: src/emu/ui/selgame.cpp:594
-msgid "Plugins"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:218
-msgid "Filter"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:226
-msgid " ^!File"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:231
-msgid " ^!Category"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:254
-msgid "^!Setup custom filter"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:262
-msgid "Customize UI"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:263
-msgid "Configure Directories"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:266 src/emu/ui/sndmenu.cpp:151
-#: src/emu/ui/sndmenu.cpp:172
-msgid "Sound Options"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:269
-msgid "General Inputs"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:272
-msgid "Save Configuration"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:286 src/emu/ui/optsmenu.cpp:307
-msgid "Settings"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:327
-msgid "**Error saving ui.ini**"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:374
-#, c-format
-msgid "**Error saving %s.ini**"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:378
+#: src/emu/ui/miscmenu.cpp:729 src/emu/ui/optsmenu.cpp:376
 msgid ""
 "\n"
 "    Configuration saved    \n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/selector.cpp:166
+#: src/emu/ui/miscmenu.cpp:774
+msgid "Bios"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:776
+msgid "Driver"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:790
+msgid "Save machine configuration"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:806
+msgid "Configure machine:"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:868 src/emu/ui/selsoft.cpp:109
+msgid " (default)"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:953 src/emu/ui/miscmenu.cpp:973
+#: src/emu/ui/selgame.cpp:600
+msgid "Plugins"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:217
+msgid "Filter"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:225
+msgid " ^!File"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:230
+msgid " ^!Category"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:253
+msgid "^!Setup custom filter"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:261
+msgid "Customize UI"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:262
+msgid "Configure Directories"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:265 src/emu/ui/sndmenu.cpp:149
+#: src/emu/ui/sndmenu.cpp:169
+msgid "Sound Options"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:268
+msgid "General Inputs"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:271
+msgid "Save Configuration"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:285 src/emu/ui/optsmenu.cpp:305
+msgid "Settings"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:325
+msgid "**Error saving ui.ini**"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:372
+#, c-format
+msgid "**Error saving %s.ini**"
+msgstr ""
+
+#: src/emu/ui/selector.cpp:165
 msgid "Selection List - Search: "
 msgstr ""
 
-#: src/emu/ui/selector.cpp:196
+#: src/emu/ui/selector.cpp:194
 #, c-format
 msgid "Double click or press %1$s to select"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:39
+#: src/emu/ui/selgame.cpp:38
 msgid "General Info"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:374 src/emu/ui/selsoft.cpp:282
+#: src/emu/ui/selgame.cpp:380 src/emu/ui/selsoft.cpp:281
 #, c-format
 msgid ""
 "%s\n"
 " added to favorites list."
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:380 src/emu/ui/selgame.cpp:389
-#: src/emu/ui/selsoft.cpp:287
+#: src/emu/ui/selgame.cpp:386 src/emu/ui/selgame.cpp:395
+#: src/emu/ui/selsoft.cpp:286
 #, c-format
 msgid ""
 "%s\n"
 " removed from favorites list."
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:450
+#: src/emu/ui/selgame.cpp:457
 msgid ""
 "The selected machine is missing one or more required ROM or CHD images. "
 "Please select a different machine.\n"
@@ -993,275 +1009,275 @@ msgid ""
 "Press any key to continue."
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:589 src/emu/ui/simpleselgame.cpp:265
+#: src/emu/ui/selgame.cpp:595 src/emu/ui/simpleselgame.cpp:265
 msgid "Configure Options"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:752
+#: src/emu/ui/selgame.cpp:596
+msgid "Configure Machine"
+msgstr ""
+
+#: src/emu/ui/selgame.cpp:758
 #, c-format
 msgid "%1$s %2$s ( %3$d / %4$d machines (%5$d BIOS) )"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:762
+#: src/emu/ui/selgame.cpp:768
 #, c-format
 msgid "%1$s (%2$s - %3$s) - "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:769 src/emu/ui/selgame.cpp:775
+#: src/emu/ui/selgame.cpp:775 src/emu/ui/selgame.cpp:781
 #, c-format
 msgid "%1$s (%2$s) - "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:784
+#: src/emu/ui/selgame.cpp:790
 #, c-format
 msgid "%1$s Search: %2$s_"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:838
+#: src/emu/ui/selgame.cpp:844
 #, c-format
 msgid "Romset: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:841 src/emu/ui/selgame.cpp:890
-#: src/emu/ui/selsoft.cpp:751 src/emu/ui/selsoft.cpp:801
+#: src/emu/ui/selgame.cpp:847 src/emu/ui/selgame.cpp:896
+#: src/emu/ui/selsoft.cpp:750 src/emu/ui/selsoft.cpp:800
 #: src/emu/ui/simpleselgame.cpp:328
 #, c-format
 msgid "%1$s, %2$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:847 src/emu/ui/selsoft.cpp:757
+#: src/emu/ui/selgame.cpp:853 src/emu/ui/selsoft.cpp:756
 #, c-format
 msgid "Driver is clone of: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:849 src/emu/ui/selsoft.cpp:759
+#: src/emu/ui/selgame.cpp:855 src/emu/ui/selsoft.cpp:758
 msgid "Driver is parent"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:853 src/emu/ui/selsoft.cpp:763
+#: src/emu/ui/selgame.cpp:859 src/emu/ui/selsoft.cpp:762
 #: src/emu/ui/simpleselgame.cpp:335
 msgid "Overall: NOT WORKING"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:855 src/emu/ui/selsoft.cpp:765
+#: src/emu/ui/selgame.cpp:861 src/emu/ui/selsoft.cpp:764
 #: src/emu/ui/simpleselgame.cpp:337
 msgid "Overall: Unemulated Protection"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:857 src/emu/ui/selsoft.cpp:767
+#: src/emu/ui/selgame.cpp:863 src/emu/ui/selsoft.cpp:766
 #: src/emu/ui/simpleselgame.cpp:339
 msgid "Overall: Working"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:861 src/emu/ui/selsoft.cpp:771
+#: src/emu/ui/selgame.cpp:867 src/emu/ui/selsoft.cpp:770
 msgid "Graphics: Imperfect, "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:863 src/emu/ui/selsoft.cpp:773
+#: src/emu/ui/selgame.cpp:869 src/emu/ui/selsoft.cpp:772
 msgid "Graphics: OK, "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:866 src/emu/ui/selsoft.cpp:776
+#: src/emu/ui/selgame.cpp:872 src/emu/ui/selsoft.cpp:775
 msgid "Sound: Unimplemented"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:868 src/emu/ui/selsoft.cpp:778
+#: src/emu/ui/selgame.cpp:874 src/emu/ui/selsoft.cpp:777
 msgid "Sound: Imperfect"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:870 src/emu/ui/selsoft.cpp:780
+#: src/emu/ui/selgame.cpp:876 src/emu/ui/selsoft.cpp:779
 msgid "Sound: OK"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:887
+#: src/emu/ui/selgame.cpp:893
 #, c-format
 msgid "System: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:894 src/emu/ui/selsoft.cpp:805
+#: src/emu/ui/selgame.cpp:900 src/emu/ui/selsoft.cpp:804
 #, c-format
 msgid "Software is clone of: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:896 src/emu/ui/selsoft.cpp:807
+#: src/emu/ui/selgame.cpp:902 src/emu/ui/selsoft.cpp:806
 msgid "Software is parent"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:901 src/emu/ui/selsoft.cpp:812
+#: src/emu/ui/selgame.cpp:907 src/emu/ui/selsoft.cpp:811
 msgid "Supported: No"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:906 src/emu/ui/selsoft.cpp:817
+#: src/emu/ui/selgame.cpp:912 src/emu/ui/selsoft.cpp:816
 msgid "Supported: Partial"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:911 src/emu/ui/selsoft.cpp:822
+#: src/emu/ui/selgame.cpp:917 src/emu/ui/selsoft.cpp:821
 msgid "Supported: Yes"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:916 src/emu/ui/selsoft.cpp:827
+#: src/emu/ui/selgame.cpp:922 src/emu/ui/selsoft.cpp:826
 #, c-format
 msgid "romset: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:923
+#: src/emu/ui/selgame.cpp:929
 #, c-format
 msgid "%1$s %2$s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1535
+#: src/emu/ui/selgame.cpp:1543
 #, c-format
 msgid "Romset: %1$-.100s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1536
+#: src/emu/ui/selgame.cpp:1544
 #, c-format
 msgid "Year: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1537
+#: src/emu/ui/selgame.cpp:1545
 #, c-format
 msgid "Manufacturer: %1$-.100s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1541
+#: src/emu/ui/selgame.cpp:1549
 #, c-format
 msgid "Driver is Clone of: %1$-.100s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1543
+#: src/emu/ui/selgame.cpp:1551
 msgid "Driver is Parent\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1546
+#: src/emu/ui/selgame.cpp:1554
 msgid "Overall: NOT WORKING\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1548
+#: src/emu/ui/selgame.cpp:1556
 msgid "Overall: Unemulated Protection\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1550
+#: src/emu/ui/selgame.cpp:1558
 msgid "Overall: Working\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1553
+#: src/emu/ui/selgame.cpp:1561
 msgid "Graphics: Imperfect Colors\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1557
+#: src/emu/ui/selgame.cpp:1565
 msgid "Graphics: Imperfect\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1559
+#: src/emu/ui/selgame.cpp:1567
 msgid "Graphics: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1562
+#: src/emu/ui/selgame.cpp:1570
 msgid "Sound: Unimplemented\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1564
+#: src/emu/ui/selgame.cpp:1572
 msgid "Sound: Imperfect\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1566
+#: src/emu/ui/selgame.cpp:1574
 msgid "Sound: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1568
+#: src/emu/ui/selgame.cpp:1576
 #, c-format
 msgid "Driver is Skeleton: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1569
+#: src/emu/ui/selgame.cpp:1577
 #, c-format
 msgid "Game is Mechanical: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1570
+#: src/emu/ui/selgame.cpp:1578
 #, c-format
 msgid "Requires Artwork: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1571
+#: src/emu/ui/selgame.cpp:1579
 #, c-format
 msgid "Requires Clickable Artwork: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1572
+#: src/emu/ui/selgame.cpp:1580
 #, c-format
 msgid "Support Cocktail: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1573
+#: src/emu/ui/selgame.cpp:1581
 #, c-format
 msgid "Driver is Bios: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1574
+#: src/emu/ui/selgame.cpp:1582
 #, c-format
 msgid "Support Save: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 #, c-format
 msgid "Screen Orientation: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 msgid "Vertical"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 msgid "Horizontal"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/selgame.cpp:1591
 #, c-format
 msgid "Requires CHD: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1596
+#: src/emu/ui/selgame.cpp:1604
 msgid "Roms Audit Pass: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1598
+#: src/emu/ui/selgame.cpp:1606
 msgid "Roms Audit Pass: BAD\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1601
+#: src/emu/ui/selgame.cpp:1609
 msgid "Samples Audit Pass: None Needed\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1603
+#: src/emu/ui/selgame.cpp:1611
 msgid "Samples Audit Pass: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1605
+#: src/emu/ui/selgame.cpp:1613
 msgid "Samples Audit Pass: BAD\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1608
+#: src/emu/ui/selgame.cpp:1616
 msgid ""
 "Roms Audit Pass: Disabled\n"
 "Samples Audit Pass: Disabled\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:2049 src/emu/ui/selgame.cpp:2212
-#: src/emu/ui/selsoft.cpp:1662
+#: src/emu/ui/selgame.cpp:2055 src/emu/ui/selgame.cpp:2216
+#: src/emu/ui/selsoft.cpp:1655
 msgid "No Infos Available"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:2162 src/emu/ui/selsoft.cpp:1607
+#: src/emu/ui/selgame.cpp:2168 src/emu/ui/selsoft.cpp:1602
 msgid "Usage"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:110
-msgid " (default)"
-msgstr ""
-
-#: src/emu/ui/selsoft.cpp:381
+#: src/emu/ui/selsoft.cpp:380
 msgid ""
 "The selected software is missing one or more required files. Please select a "
 "different software.\n"
@@ -1269,57 +1285,57 @@ msgid ""
 "Press any key to continue."
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:684
+#: src/emu/ui/selsoft.cpp:683
 #, c-format
-msgid "%1$s %2$s ( %3$d / %4$d softwares )"
+msgid "%1$s %2$s ( %3$d / %4$d software packages )"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:685
+#: src/emu/ui/selsoft.cpp:684
 #, c-format
 msgid "Driver: \"%1$s\" software list "
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:688
+#: src/emu/ui/selsoft.cpp:687
 #, c-format
 msgid "Region: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:690
+#: src/emu/ui/selsoft.cpp:689
 #, c-format
 msgid "Publisher: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:692
+#: src/emu/ui/selsoft.cpp:691
 #, c-format
 msgid "Year: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:694
+#: src/emu/ui/selsoft.cpp:693
 #, c-format
 msgid "Software List: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:696
+#: src/emu/ui/selsoft.cpp:695
 #, c-format
 msgid "Device type: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:698
+#: src/emu/ui/selsoft.cpp:697
 #, c-format
 msgid "%s Search: %s_"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:748 src/emu/ui/selsoft.cpp:798
+#: src/emu/ui/selsoft.cpp:747 src/emu/ui/selsoft.cpp:797
 #: src/emu/ui/simpleselgame.cpp:325
 #, c-format
 msgid "%1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:1998 src/emu/ui/selsoft.cpp:2018
+#: src/emu/ui/selsoft.cpp:1991 src/emu/ui/selsoft.cpp:2011
 msgid "Software part selection:"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:2136 src/emu/ui/selsoft.cpp:2156
+#: src/emu/ui/selsoft.cpp:2129 src/emu/ui/selsoft.cpp:2149
 msgid "Bios selection:"
 msgstr ""
 
@@ -1367,15 +1383,15 @@ msgstr ""
 msgid " [internal]"
 msgstr ""
 
-#: src/emu/ui/sndmenu.cpp:135
+#: src/emu/ui/sndmenu.cpp:133
 msgid "Sound"
 msgstr ""
 
-#: src/emu/ui/sndmenu.cpp:136
+#: src/emu/ui/sndmenu.cpp:134
 msgid "Sample Rate"
 msgstr ""
 
-#: src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/sndmenu.cpp:135
 msgid "Use External Samples"
 msgstr ""
 
@@ -1444,80 +1460,80 @@ msgstr ""
 msgid "Fast Forward"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:419
+#: src/emu/ui/ui.cpp:418
 msgid "This driver requires images to be loaded in the following device(s): "
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1074
+#: src/emu/ui/ui.cpp:1071
 msgid ""
 "One or more ROMs/CHDs for this machine are incorrect. The machine may not "
 "run correctly.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1087
+#: src/emu/ui/ui.cpp:1084
 msgid ""
 "There are known problems with this machine\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1091
+#: src/emu/ui/ui.cpp:1088
 msgid ""
 "One or more ROMs/CHDs for this machine have not been correctly dumped.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1095
+#: src/emu/ui/ui.cpp:1092
 #, c-format
 msgid "The keyboard emulation may not be 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1097
+#: src/emu/ui/ui.cpp:1094
 #, c-format
 msgid "The colors aren't 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1099
+#: src/emu/ui/ui.cpp:1096
 msgid "The colors are completely wrong.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1101
+#: src/emu/ui/ui.cpp:1098
 #, c-format
 msgid "The video emulation isn't 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1103
+#: src/emu/ui/ui.cpp:1100
 #, c-format
 msgid "The sound emulation isn't 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1105
+#: src/emu/ui/ui.cpp:1102
 msgid "The machine lacks sound.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1108
+#: src/emu/ui/ui.cpp:1105
 msgid "Screen flipping in cocktail mode is not supported.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1112
+#: src/emu/ui/ui.cpp:1109
 msgid "The machine requires external artwork files\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1117
+#: src/emu/ui/ui.cpp:1114
 msgid ""
 "This machine was never completed. It may exhibit strange behavior or missing "
 "elements that are not bugs in the emulation.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1122
+#: src/emu/ui/ui.cpp:1119
 msgid ""
 "This machine has no sound hardware, MAME will produce no sounds, this is "
 "expected behaviour.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1130
+#: src/emu/ui/ui.cpp:1127
 msgid "The machine has protection which isn't fully emulated.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1133
+#: src/emu/ui/ui.cpp:1130
 msgid ""
 "\n"
 "THIS MACHINE DOESN'T WORK. The emulation for this machine is not yet "
@@ -1525,7 +1541,7 @@ msgid ""
 "the developers to improve the emulation.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1137
+#: src/emu/ui/ui.cpp:1134
 msgid ""
 "\n"
 "Certain elements of this machine cannot be emulated as it requires actual "
@@ -1533,21 +1549,21 @@ msgid ""
 "to fully play this machine.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1156
+#: src/emu/ui/ui.cpp:1153
 msgid ""
 "\n"
 "\n"
 "There are working clones of this machine: "
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1170
+#: src/emu/ui/ui.cpp:1167
 msgid ""
 "\n"
 "\n"
 "Press any key to continue"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1185
+#: src/emu/ui/ui.cpp:1182
 #, c-format
 msgid ""
 "%1$s\n"
@@ -1557,98 +1573,98 @@ msgid ""
 "CPU:\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1221 src/emu/ui/ui.cpp:1260
+#: src/emu/ui/ui.cpp:1218 src/emu/ui/ui.cpp:1257
 msgid "MHz"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1221 src/emu/ui/ui.cpp:1260
+#: src/emu/ui/ui.cpp:1218 src/emu/ui/ui.cpp:1257
 msgid "kHz"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1235
+#: src/emu/ui/ui.cpp:1232
 msgid ""
 "\n"
 "Sound:\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1264
+#: src/emu/ui/ui.cpp:1261
 msgid ""
 "\n"
 "Video:\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1268
+#: src/emu/ui/ui.cpp:1265
 msgid "None\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1275
+#: src/emu/ui/ui.cpp:1272
 msgid "Vector"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1286
+#: src/emu/ui/ui.cpp:1283
 #, c-format
 msgid "%1$s: %2$s\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1286
+#: src/emu/ui/ui.cpp:1283
 msgid "%2$s\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1541 src/emu/ui/ui.cpp:1551
+#: src/emu/ui/ui.cpp:1538 src/emu/ui/ui.cpp:1548
 msgid "Keyboard Emulation Status"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1543
+#: src/emu/ui/ui.cpp:1540
 msgid "Mode: PARTIAL Emulation"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1544
+#: src/emu/ui/ui.cpp:1541
 msgid "UI:   Enabled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1546 src/emu/ui/ui.cpp:1556
+#: src/emu/ui/ui.cpp:1543 src/emu/ui/ui.cpp:1553
 msgid "**Use ScrLock to toggle**"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1553
+#: src/emu/ui/ui.cpp:1550
 msgid "Mode: FULL Emulation"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1554
+#: src/emu/ui/ui.cpp:1551
 msgid "UI:   Disabled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1692
+#: src/emu/ui/ui.cpp:1689
 msgid "Autofire can't be enabled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1731
+#: src/emu/ui/ui.cpp:1728
 msgid "Select position to save to"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1733
+#: src/emu/ui/ui.cpp:1730
 msgid "Select position to load from"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1757
+#: src/emu/ui/ui.cpp:1754
 msgid "Save cancelled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1759
+#: src/emu/ui/ui.cpp:1756
 msgid "Load cancelled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1802
+#: src/emu/ui/ui.cpp:1799
 #, c-format
 msgid "Save to position %s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1807
+#: src/emu/ui/ui.cpp:1804
 #, c-format
 msgid "Load from position %s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1847
+#: src/emu/ui/ui.cpp:1844
 #, c-format
 msgid ""
 "Are you sure you want to quit?\n"
@@ -1657,173 +1673,173 @@ msgid ""
 "Press ''%2$s'' to return to emulation."
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1917
+#: src/emu/ui/ui.cpp:1914
 msgid "Master Volume"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1926
+#: src/emu/ui/ui.cpp:1923
 #, c-format
 msgid "%1$s Volume"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1949
+#: src/emu/ui/ui.cpp:1946
 #, c-format
 msgid "Overclock CPU %1$s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1968
+#: src/emu/ui/ui.cpp:1965
 #, c-format
 msgid "%1$s Refresh Rate"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1973
+#: src/emu/ui/ui.cpp:1970
 #, c-format
 msgid "%1$s Brightness"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1975
+#: src/emu/ui/ui.cpp:1972
 #, c-format
 msgid "%1$s Contrast"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1977
+#: src/emu/ui/ui.cpp:1974
 #, c-format
 msgid "%1$s Gamma"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1981
+#: src/emu/ui/ui.cpp:1978
 #, c-format
 msgid "%1$s Horiz Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1983
+#: src/emu/ui/ui.cpp:1980
 #, c-format
 msgid "%1$s Horiz Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1985
+#: src/emu/ui/ui.cpp:1982
 #, c-format
 msgid "%1$s Vert Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1987
+#: src/emu/ui/ui.cpp:1984
 #, c-format
 msgid "%1$s Vert Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2005
+#: src/emu/ui/ui.cpp:2002
 #, c-format
 msgid "Laserdisc '%1$s' Horiz Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2007
+#: src/emu/ui/ui.cpp:2004
 #, c-format
 msgid "Laserdisc '%1$s' Horiz Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2009
+#: src/emu/ui/ui.cpp:2006
 #, c-format
 msgid "Laserdisc '%1$s' Vert Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2011
+#: src/emu/ui/ui.cpp:2008
 #, c-format
 msgid "Laserdisc '%1$s' Vert Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2021
+#: src/emu/ui/ui.cpp:2018
 msgid "Vector Flicker"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2022
+#: src/emu/ui/ui.cpp:2019
 msgid "Beam Width Minimum"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2023
+#: src/emu/ui/ui.cpp:2020
 msgid "Beam Width Maximum"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2024
+#: src/emu/ui/ui.cpp:2021
 msgid "Beam Intensity Weight"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2037
+#: src/emu/ui/ui.cpp:2034
 #, c-format
 msgid "Crosshair Scale %1$s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2037 src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2034 src/emu/ui/ui.cpp:2036
 msgid "X"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2037 src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2034 src/emu/ui/ui.cpp:2036
 msgid "Y"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2036
 #, c-format
 msgid "Crosshair Offset %1$s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2071
+#: src/emu/ui/ui.cpp:2068
 #, c-format
 msgid "%1$3ddB"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2115
+#: src/emu/ui/ui.cpp:2112
 #, c-format
 msgid "%1$d%%"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2131
+#: src/emu/ui/ui.cpp:2128
 #, c-format
 msgid "%1$3.0f%%"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2154
+#: src/emu/ui/ui.cpp:2151
 #, c-format
 msgid "%1$.3ffps"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2177 src/emu/ui/ui.cpp:2199 src/emu/ui/ui.cpp:2220
-#: src/emu/ui/ui.cpp:2242 src/emu/ui/ui.cpp:2264 src/emu/ui/ui.cpp:2286
-#: src/emu/ui/ui.cpp:2308 src/emu/ui/ui.cpp:2330 src/emu/ui/ui.cpp:2352
-#: src/emu/ui/ui.cpp:2374 src/emu/ui/ui.cpp:2396
+#: src/emu/ui/ui.cpp:2174 src/emu/ui/ui.cpp:2196 src/emu/ui/ui.cpp:2217
+#: src/emu/ui/ui.cpp:2239 src/emu/ui/ui.cpp:2261 src/emu/ui/ui.cpp:2283
+#: src/emu/ui/ui.cpp:2305 src/emu/ui/ui.cpp:2327 src/emu/ui/ui.cpp:2349
+#: src/emu/ui/ui.cpp:2371 src/emu/ui/ui.cpp:2393
 #, c-format
 msgid "%1$.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2412 src/emu/ui/ui.cpp:2428 src/emu/ui/ui.cpp:2444
-#: src/emu/ui/ui.cpp:2460
+#: src/emu/ui/ui.cpp:2408 src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2438
+#: src/emu/ui/ui.cpp:2453
 #, c-format
 msgid "%1$1.2f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2476
+#: src/emu/ui/ui.cpp:2469
 #, c-format
 msgid "Screen '%1$s'"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2478
+#: src/emu/ui/ui.cpp:2471
 msgid "Screen"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2494
+#: src/emu/ui/ui.cpp:2487
 #, c-format
 msgid "Crosshair Scale X %1$1.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2494
+#: src/emu/ui/ui.cpp:2487
 #, c-format
 msgid "Crosshair Scale Y %1$1.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2513
+#: src/emu/ui/ui.cpp:2506
 #, c-format
 msgid "Crosshair Offset X %1$1.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2513
+#: src/emu/ui/ui.cpp:2506
 #, c-format
 msgid "Crosshair Offset Y %1$1.3f"
 msgstr ""
@@ -1865,10 +1881,10 @@ msgstr ""
 msgid "Full"
 msgstr ""
 
-#: src/emu/ui/viewgfx.cpp:392
+#: src/emu/ui/viewgfx.cpp:391
 msgid " COLORS"
 msgstr ""
 
-#: src/emu/ui/viewgfx.cpp:392
+#: src/emu/ui/viewgfx.cpp:391
 msgid " PENS"
 msgstr ""
diff --git a/language/Macedonian/strings.po b/language/Macedonian/strings.po
index 9f5c71ebfb6..97dcac597a8 100644
--- a/language/Macedonian/strings.po
+++ b/language/Macedonian/strings.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MAME\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-11 03:33+0200\n"
+"POT-Creation-Date: 2016-04-15 17:42+0200\n"
 "PO-Revision-Date: 2016-02-20 18:03+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: MAME Language Team\n"
@@ -59,14 +59,14 @@ msgstr ""
 msgid "Autofire Status"
 msgstr ""
 
-#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1698
+#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1695
 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211
 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219
 #: src/emu/ui/videoopt.cpp:223
 msgid "Disabled"
 msgstr ""
 
-#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1698
+#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1695
 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211
 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219
 #: src/emu/ui/videoopt.cpp:223
@@ -74,14 +74,14 @@ msgid "Enabled"
 msgstr ""
 
 #: src/emu/ui/cheatopt.cpp:282 src/emu/ui/cheatopt.cpp:288
-#: src/emu/ui/menu.cpp:710 src/emu/ui/miscmenu.cpp:831
-#: src/emu/ui/sndmenu.cpp:135 src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/menu.cpp:755 src/emu/ui/miscmenu.cpp:936
+#: src/emu/ui/sndmenu.cpp:133 src/emu/ui/sndmenu.cpp:135
 msgid "On"
 msgstr ""
 
 #: src/emu/ui/cheatopt.cpp:282 src/emu/ui/cheatopt.cpp:288
-#: src/emu/ui/menu.cpp:713 src/emu/ui/miscmenu.cpp:831
-#: src/emu/ui/sndmenu.cpp:135 src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/menu.cpp:758 src/emu/ui/miscmenu.cpp:936
+#: src/emu/ui/sndmenu.cpp:133 src/emu/ui/sndmenu.cpp:135
 msgid "Off"
 msgstr ""
 
@@ -93,316 +93,316 @@ msgstr ""
 msgid "Autofire Delay"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:158 src/emu/ui/custmenu.cpp:447
+#: src/emu/ui/custmenu.cpp:157 src/emu/ui/custmenu.cpp:445
 msgid "Main filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:167 src/emu/ui/custmenu.cpp:456
+#: src/emu/ui/custmenu.cpp:166 src/emu/ui/custmenu.cpp:454
 msgid "Other filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:176 src/emu/ui/optsmenu.cpp:239
+#: src/emu/ui/custmenu.cpp:175 src/emu/ui/optsmenu.cpp:238
 msgid "^!Manufacturer"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:185 src/emu/ui/custmenu.cpp:474
-#: src/emu/ui/optsmenu.cpp:247
+#: src/emu/ui/custmenu.cpp:184 src/emu/ui/custmenu.cpp:472
+#: src/emu/ui/optsmenu.cpp:246
 msgid "^!Year"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:194 src/emu/ui/custmenu.cpp:510
+#: src/emu/ui/custmenu.cpp:193 src/emu/ui/custmenu.cpp:508
 msgid "Remove last filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:197 src/emu/ui/custmenu.cpp:513
+#: src/emu/ui/custmenu.cpp:196 src/emu/ui/custmenu.cpp:511
 msgid "Add filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:212 src/emu/ui/custmenu.cpp:233
-#: src/emu/ui/custmenu.cpp:529 src/emu/ui/custmenu.cpp:550
+#: src/emu/ui/custmenu.cpp:211 src/emu/ui/custmenu.cpp:231
+#: src/emu/ui/custmenu.cpp:527 src/emu/ui/custmenu.cpp:547
 msgid "Select custom filters:"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:465
+#: src/emu/ui/custmenu.cpp:463
 msgid "^!Publisher"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:483
+#: src/emu/ui/custmenu.cpp:481
 msgid "^!Software List"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:492
+#: src/emu/ui/custmenu.cpp:490
 msgid "^!Device type"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:501
+#: src/emu/ui/custmenu.cpp:499
 msgid "^!Region"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:23
+#: src/emu/ui/custui.cpp:22
 msgid "Show All"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:24
+#: src/emu/ui/custui.cpp:23
 msgid "Hide Filters"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:25
+#: src/emu/ui/custui.cpp:24
 msgid "Hide Info/Image"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:26
+#: src/emu/ui/custui.cpp:25
 msgid "Hide Both"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:142
+#: src/emu/ui/custui.cpp:141
 msgid "Fonts"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:143
+#: src/emu/ui/custui.cpp:142
 msgid "Colors"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:148 src/emu/ui/dirmenu.cpp:33
+#: src/emu/ui/custui.cpp:147 src/emu/ui/dirmenu.cpp:33
 msgid "Language"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:152
+#: src/emu/ui/custui.cpp:151
 msgid "Show side panels"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:167 src/emu/ui/custui.cpp:188
+#: src/emu/ui/custui.cpp:166 src/emu/ui/custui.cpp:186
 msgid "Custom UI Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:246
+#: src/emu/ui/custui.cpp:244
 msgid "default"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:349
+#: src/emu/ui/custui.cpp:347
 msgid "UI Font"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:354
+#: src/emu/ui/custui.cpp:352
 msgid "Bold"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:355
+#: src/emu/ui/custui.cpp:353
 msgid "Italic"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:360
+#: src/emu/ui/custui.cpp:358
 msgid "Lines"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:366
+#: src/emu/ui/custui.cpp:364
 msgid "Infos text size"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:383
+#: src/emu/ui/custui.cpp:381
 msgid "UI Fonts Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:411
+#: src/emu/ui/custui.cpp:408
 msgid "Sample text - Lorem ipsum dolor sit amet, consectetur adipiscing elit."
 msgstr ""
 
-#: src/emu/ui/custui.cpp:509
+#: src/emu/ui/custui.cpp:506
 msgid "Normal text"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:510
+#: src/emu/ui/custui.cpp:507
 msgid "Selected color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:511
+#: src/emu/ui/custui.cpp:508
 msgid "Normal text background"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:512
+#: src/emu/ui/custui.cpp:509
 msgid "Selected background color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:513
+#: src/emu/ui/custui.cpp:510
 msgid "Subitem color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:514 src/emu/ui/custui.cpp:610
+#: src/emu/ui/custui.cpp:511 src/emu/ui/custui.cpp:606
 msgid "Clone"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:515
+#: src/emu/ui/custui.cpp:512
 msgid "Border"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:516
+#: src/emu/ui/custui.cpp:513
 msgid "Background"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:517
+#: src/emu/ui/custui.cpp:514
 msgid "Dipswitch"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:518
+#: src/emu/ui/custui.cpp:515
 msgid "Unavailable color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:519
+#: src/emu/ui/custui.cpp:516
 msgid "Slider color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:520
+#: src/emu/ui/custui.cpp:517
 msgid "Gfx viewer background"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:521
+#: src/emu/ui/custui.cpp:518
 msgid "Mouse over color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:522
+#: src/emu/ui/custui.cpp:519
 msgid "Mouse over background color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:523
+#: src/emu/ui/custui.cpp:520
 msgid "Mouse down color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:524
+#: src/emu/ui/custui.cpp:521
 msgid "Mouse down background color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:527
+#: src/emu/ui/custui.cpp:524
 msgid "Restore originals colors"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:543
+#: src/emu/ui/custui.cpp:540
 msgid "UI Colors Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:572
+#: src/emu/ui/custui.cpp:568
 #, c-format
 msgid "Double click or press %1$s to change the color value"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:598
+#: src/emu/ui/custui.cpp:594
 msgid "Menu Preview"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:606
+#: src/emu/ui/custui.cpp:602
 msgid "Normal"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:607
+#: src/emu/ui/custui.cpp:603
 msgid "Subitem"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:608
+#: src/emu/ui/custui.cpp:604
 msgid "Selected"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:609
+#: src/emu/ui/custui.cpp:605
 msgid "Mouse Over"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:841 src/emu/ui/custui.cpp:844
+#: src/emu/ui/custui.cpp:837 src/emu/ui/custui.cpp:840
 msgid "Alpha"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:849 src/emu/ui/custui.cpp:852
-#: src/emu/ui/custui.cpp:1013
+#: src/emu/ui/custui.cpp:845 src/emu/ui/custui.cpp:848
+#: src/emu/ui/custui.cpp:1007
 msgid "Red"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:857 src/emu/ui/custui.cpp:860
-#: src/emu/ui/custui.cpp:1016
+#: src/emu/ui/custui.cpp:853 src/emu/ui/custui.cpp:856
+#: src/emu/ui/custui.cpp:1010
 msgid "Green"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:865 src/emu/ui/custui.cpp:868
-#: src/emu/ui/custui.cpp:1017
+#: src/emu/ui/custui.cpp:861 src/emu/ui/custui.cpp:864
+#: src/emu/ui/custui.cpp:1011
 msgid "Blue"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:871
+#: src/emu/ui/custui.cpp:867
 msgid "Choose from palette"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:887
+#: src/emu/ui/custui.cpp:883
 msgid " - ARGB Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:912
+#: src/emu/ui/custui.cpp:907
 msgid "Color preview ="
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1009
+#: src/emu/ui/custui.cpp:1003
 msgid "White"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1010
+#: src/emu/ui/custui.cpp:1004
 msgid "Silver"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1011
+#: src/emu/ui/custui.cpp:1005
 msgid "Gray"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1012
+#: src/emu/ui/custui.cpp:1006
 msgid "Black"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1014
+#: src/emu/ui/custui.cpp:1008
 msgid "Orange"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1015
+#: src/emu/ui/custui.cpp:1009
 msgid "Yellow"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1018
+#: src/emu/ui/custui.cpp:1012
 msgid "Violet"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:65
+#: src/emu/ui/datmenu.cpp:64
 msgid "Software History"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:67
+#: src/emu/ui/datmenu.cpp:66
 msgid "Software Usage"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:199
+#: src/emu/ui/datmenu.cpp:196
 msgid "Revision: "
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:287 src/emu/ui/selgame.cpp:40
-#: src/emu/ui/selgame.cpp:2152 src/emu/ui/selgame.cpp:2161
-#: src/emu/ui/selsoft.cpp:1577 src/emu/ui/selsoft.cpp:1597
-#: src/emu/ui/selsoft.cpp:1606
+#: src/emu/ui/datmenu.cpp:284 src/emu/ui/selgame.cpp:39
+#: src/emu/ui/selgame.cpp:2158 src/emu/ui/selgame.cpp:2167
+#: src/emu/ui/selsoft.cpp:1574 src/emu/ui/selsoft.cpp:1592
+#: src/emu/ui/selsoft.cpp:1601
 msgid "History"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:289 src/emu/ui/selgame.cpp:41
+#: src/emu/ui/datmenu.cpp:286 src/emu/ui/selgame.cpp:40
 msgid "Mameinfo"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:291 src/emu/ui/selgame.cpp:43
+#: src/emu/ui/datmenu.cpp:288 src/emu/ui/selgame.cpp:42
 msgid "Messinfo"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:293 src/emu/ui/selgame.cpp:42
+#: src/emu/ui/datmenu.cpp:290 src/emu/ui/selgame.cpp:41
 msgid "Sysinfo"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:295 src/emu/ui/selgame.cpp:46
+#: src/emu/ui/datmenu.cpp:292 src/emu/ui/selgame.cpp:45
 msgid "Mamescore"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:297 src/emu/ui/selgame.cpp:45
+#: src/emu/ui/datmenu.cpp:294 src/emu/ui/selgame.cpp:44
 msgid "Gameinit"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:299 src/emu/ui/selgame.cpp:44
+#: src/emu/ui/datmenu.cpp:296 src/emu/ui/selgame.cpp:43
 msgid "Command"
 msgstr ""
 
@@ -554,75 +554,75 @@ msgstr ""
 msgid "Remove %1$s Folder"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:158
+#: src/emu/ui/filesel.cpp:161
 msgid "File Already Exists - Override?"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:160 src/emu/ui/selgame.cpp:1568
-#: src/emu/ui/selgame.cpp:1569 src/emu/ui/selgame.cpp:1570
-#: src/emu/ui/selgame.cpp:1571 src/emu/ui/selgame.cpp:1572
-#: src/emu/ui/selgame.cpp:1573 src/emu/ui/selgame.cpp:1574
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/filesel.cpp:163 src/emu/ui/selgame.cpp:1576
+#: src/emu/ui/selgame.cpp:1577 src/emu/ui/selgame.cpp:1578
+#: src/emu/ui/selgame.cpp:1579 src/emu/ui/selgame.cpp:1580
+#: src/emu/ui/selgame.cpp:1581 src/emu/ui/selgame.cpp:1582
+#: src/emu/ui/selgame.cpp:1591
 msgid "No"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:161 src/emu/ui/selgame.cpp:1568
-#: src/emu/ui/selgame.cpp:1569 src/emu/ui/selgame.cpp:1570
-#: src/emu/ui/selgame.cpp:1571 src/emu/ui/selgame.cpp:1572
-#: src/emu/ui/selgame.cpp:1573 src/emu/ui/selgame.cpp:1574
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/filesel.cpp:164 src/emu/ui/selgame.cpp:1576
+#: src/emu/ui/selgame.cpp:1577 src/emu/ui/selgame.cpp:1578
+#: src/emu/ui/selgame.cpp:1579 src/emu/ui/selgame.cpp:1580
+#: src/emu/ui/selgame.cpp:1581 src/emu/ui/selgame.cpp:1582
+#: src/emu/ui/selgame.cpp:1591
 msgid "Yes"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:272
+#: src/emu/ui/filesel.cpp:275
 msgid "New Image Name:"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:278
+#: src/emu/ui/filesel.cpp:281
 msgid "Image Format:"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:284
+#: src/emu/ui/filesel.cpp:287
 msgid "Create"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:315
+#: src/emu/ui/filesel.cpp:318
 msgid "Please enter a file extension too"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:503 src/emu/ui/swlist.cpp:65
+#: src/emu/ui/filesel.cpp:506 src/emu/ui/swlist.cpp:65
 msgid "[empty slot]"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:507
+#: src/emu/ui/filesel.cpp:510
 msgid "[create]"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:511 src/emu/ui/swlist.cpp:76
+#: src/emu/ui/filesel.cpp:514 src/emu/ui/swlist.cpp:76
 msgid "[software list]"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:803
+#: src/emu/ui/filesel.cpp:806
 msgid "Select image format"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:863
+#: src/emu/ui/filesel.cpp:866
 msgid "Select access mode"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:864
+#: src/emu/ui/filesel.cpp:867
 msgid "Read-only"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:866
+#: src/emu/ui/filesel.cpp:869
 msgid "Read-write"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:867
+#: src/emu/ui/filesel.cpp:870
 msgid "Read this image, write to another image"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:868
+#: src/emu/ui/filesel.cpp:871
 msgid "Read this image, write to diff"
 msgstr ""
 
@@ -648,7 +648,7 @@ msgstr ""
 msgid "[empty]"
 msgstr ""
 
-#: src/emu/ui/info_pty.cpp:26 src/emu/ui/mainmenu.cpp:91
+#: src/emu/ui/info_pty.cpp:26 src/emu/ui/mainmenu.cpp:96
 msgid "Pseudo terminals"
 msgstr ""
 
@@ -664,7 +664,7 @@ msgstr ""
 msgid "Other Controls"
 msgstr ""
 
-#: src/emu/ui/inputmap.cpp:622 src/emu/ui/miscmenu.cpp:91
+#: src/emu/ui/inputmap.cpp:622 src/emu/ui/miscmenu.cpp:92
 #: src/emu/ui/slotopt.cpp:172
 msgid "Reset"
 msgstr ""
@@ -697,27 +697,27 @@ msgstr ""
 msgid "Machine Information"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:78
+#: src/emu/ui/mainmenu.cpp:80
 msgid "Image Information"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:81
+#: src/emu/ui/mainmenu.cpp:83
 msgid "File Manager"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:86
+#: src/emu/ui/mainmenu.cpp:92
 msgid "Tape Control"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:94
+#: src/emu/ui/mainmenu.cpp:99
 msgid "Bios Selection"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:100
+#: src/emu/ui/mainmenu.cpp:104
 msgid "Slot Devices"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:107
+#: src/emu/ui/mainmenu.cpp:109
 msgid "Barcode Reader"
 msgstr ""
 
@@ -725,43 +725,43 @@ msgstr ""
 msgid "Network Devices"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:119
+#: src/emu/ui/mainmenu.cpp:118
 msgid "Keyboard Mode"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:122
+#: src/emu/ui/mainmenu.cpp:121
 msgid "Slider Controls"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:125
+#: src/emu/ui/mainmenu.cpp:124
 msgid "Video Options"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:129
+#: src/emu/ui/mainmenu.cpp:128
 msgid "Crosshair Options"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:133
+#: src/emu/ui/mainmenu.cpp:132
 msgid "Cheat"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:136
+#: src/emu/ui/mainmenu.cpp:135
 msgid "Plugin Options"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:140
+#: src/emu/ui/mainmenu.cpp:139
 msgid "External DAT View"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:146
+#: src/emu/ui/mainmenu.cpp:145 src/emu/ui/miscmenu.cpp:785
 msgid "Add To Favorites"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:148
+#: src/emu/ui/mainmenu.cpp:147 src/emu/ui/miscmenu.cpp:787
 msgid "Remove From Favorites"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:155
+#: src/emu/ui/mainmenu.cpp:154
 msgid "Select New Machine"
 msgstr ""
 
@@ -801,189 +801,205 @@ msgstr ""
 msgid "Return to Previous Menu"
 msgstr ""
 
-#: src/emu/ui/menu.cpp:716
+#: src/emu/ui/menu.cpp:761
 msgid "Auto"
 msgstr ""
 
-#: src/emu/ui/menu.cpp:2133
+#: src/emu/ui/menu.cpp:2195
 msgid "Images"
 msgstr ""
 
-#: src/emu/ui/menu.cpp:2134
+#: src/emu/ui/menu.cpp:2196
 msgid "Infos"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Keyboard Mode:"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Natural"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Emulated"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:240
+#: src/emu/ui/miscmenu.cpp:241
 #, c-format
 msgid ""
 "Uptime: %1$d:%2$02d:%3$02d\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:242
+#: src/emu/ui/miscmenu.cpp:243
 #, c-format
 msgid ""
 "Uptime: %1$d:%2$02d\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:246
+#: src/emu/ui/miscmenu.cpp:247
 #, c-format
 msgid ""
 "Tickets dispensed: %1$d\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:257
+#: src/emu/ui/miscmenu.cpp:258
 msgid "Coin %1$c: NA%3$s\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:257
+#: src/emu/ui/miscmenu.cpp:258
 #, c-format
 msgid "Coin %1$c: %2$d%3$s\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:260
+#: src/emu/ui/miscmenu.cpp:261
 msgid " (locked)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:519
+#: src/emu/ui/miscmenu.cpp:520
 msgid "Visible Delay"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:617
+#: src/emu/ui/miscmenu.cpp:619
 #, c-format
 msgid "%s.xml saved under ui folder."
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:645
+#: src/emu/ui/miscmenu.cpp:647
 msgid "Name:             Description:\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:657
+#: src/emu/ui/miscmenu.cpp:659
 #, c-format
 msgid "%s.txt saved under ui folder."
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:675
-msgid "Export XML format (like -listxml)"
+#: src/emu/ui/miscmenu.cpp:677
+msgid "Export list in XML format (like -listxml)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:676
-msgid "Export TXT format (like -listfull)"
+#: src/emu/ui/miscmenu.cpp:678
+msgid "Export list in XML format (like -listxml, but exclude devices)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:734
-msgid "Dummy"
+#: src/emu/ui/miscmenu.cpp:679
+msgid "Export list in TXT format (like -listfull)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:736
-msgid "Save machine configuration"
-msgstr ""
-
-#: src/emu/ui/miscmenu.cpp:848 src/emu/ui/miscmenu.cpp:869
-#: src/emu/ui/selgame.cpp:594
-msgid "Plugins"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:218
-msgid "Filter"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:226
-msgid " ^!File"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:231
-msgid " ^!Category"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:254
-msgid "^!Setup custom filter"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:262
-msgid "Customize UI"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:263
-msgid "Configure Directories"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:266 src/emu/ui/sndmenu.cpp:151
-#: src/emu/ui/sndmenu.cpp:172
-msgid "Sound Options"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:269
-msgid "General Inputs"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:272
-msgid "Save Configuration"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:286 src/emu/ui/optsmenu.cpp:307
-msgid "Settings"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:327
-msgid "**Error saving ui.ini**"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:374
-#, c-format
-msgid "**Error saving %s.ini**"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:378
+#: src/emu/ui/miscmenu.cpp:729 src/emu/ui/optsmenu.cpp:376
 msgid ""
 "\n"
 "    Configuration saved    \n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/selector.cpp:166
+#: src/emu/ui/miscmenu.cpp:774
+msgid "Bios"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:776
+msgid "Driver"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:790
+msgid "Save machine configuration"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:806
+msgid "Configure machine:"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:868 src/emu/ui/selsoft.cpp:109
+msgid " (default)"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:953 src/emu/ui/miscmenu.cpp:973
+#: src/emu/ui/selgame.cpp:600
+msgid "Plugins"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:217
+msgid "Filter"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:225
+msgid " ^!File"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:230
+msgid " ^!Category"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:253
+msgid "^!Setup custom filter"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:261
+msgid "Customize UI"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:262
+msgid "Configure Directories"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:265 src/emu/ui/sndmenu.cpp:149
+#: src/emu/ui/sndmenu.cpp:169
+msgid "Sound Options"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:268
+msgid "General Inputs"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:271
+msgid "Save Configuration"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:285 src/emu/ui/optsmenu.cpp:305
+msgid "Settings"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:325
+msgid "**Error saving ui.ini**"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:372
+#, c-format
+msgid "**Error saving %s.ini**"
+msgstr ""
+
+#: src/emu/ui/selector.cpp:165
 msgid "Selection List - Search: "
 msgstr ""
 
-#: src/emu/ui/selector.cpp:196
+#: src/emu/ui/selector.cpp:194
 #, c-format
 msgid "Double click or press %1$s to select"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:39
+#: src/emu/ui/selgame.cpp:38
 msgid "General Info"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:374 src/emu/ui/selsoft.cpp:282
+#: src/emu/ui/selgame.cpp:380 src/emu/ui/selsoft.cpp:281
 #, c-format
 msgid ""
 "%s\n"
 " added to favorites list."
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:380 src/emu/ui/selgame.cpp:389
-#: src/emu/ui/selsoft.cpp:287
+#: src/emu/ui/selgame.cpp:386 src/emu/ui/selgame.cpp:395
+#: src/emu/ui/selsoft.cpp:286
 #, c-format
 msgid ""
 "%s\n"
 " removed from favorites list."
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:450
+#: src/emu/ui/selgame.cpp:457
 msgid ""
 "The selected machine is missing one or more required ROM or CHD images. "
 "Please select a different machine.\n"
@@ -991,275 +1007,275 @@ msgid ""
 "Press any key to continue."
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:589 src/emu/ui/simpleselgame.cpp:265
+#: src/emu/ui/selgame.cpp:595 src/emu/ui/simpleselgame.cpp:265
 msgid "Configure Options"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:752
+#: src/emu/ui/selgame.cpp:596
+msgid "Configure Machine"
+msgstr ""
+
+#: src/emu/ui/selgame.cpp:758
 #, c-format
 msgid "%1$s %2$s ( %3$d / %4$d machines (%5$d BIOS) )"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:762
+#: src/emu/ui/selgame.cpp:768
 #, c-format
 msgid "%1$s (%2$s - %3$s) - "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:769 src/emu/ui/selgame.cpp:775
+#: src/emu/ui/selgame.cpp:775 src/emu/ui/selgame.cpp:781
 #, c-format
 msgid "%1$s (%2$s) - "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:784
+#: src/emu/ui/selgame.cpp:790
 #, c-format
 msgid "%1$s Search: %2$s_"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:838
+#: src/emu/ui/selgame.cpp:844
 #, c-format
 msgid "Romset: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:841 src/emu/ui/selgame.cpp:890
-#: src/emu/ui/selsoft.cpp:751 src/emu/ui/selsoft.cpp:801
+#: src/emu/ui/selgame.cpp:847 src/emu/ui/selgame.cpp:896
+#: src/emu/ui/selsoft.cpp:750 src/emu/ui/selsoft.cpp:800
 #: src/emu/ui/simpleselgame.cpp:328
 #, c-format
 msgid "%1$s, %2$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:847 src/emu/ui/selsoft.cpp:757
+#: src/emu/ui/selgame.cpp:853 src/emu/ui/selsoft.cpp:756
 #, c-format
 msgid "Driver is clone of: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:849 src/emu/ui/selsoft.cpp:759
+#: src/emu/ui/selgame.cpp:855 src/emu/ui/selsoft.cpp:758
 msgid "Driver is parent"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:853 src/emu/ui/selsoft.cpp:763
+#: src/emu/ui/selgame.cpp:859 src/emu/ui/selsoft.cpp:762
 #: src/emu/ui/simpleselgame.cpp:335
 msgid "Overall: NOT WORKING"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:855 src/emu/ui/selsoft.cpp:765
+#: src/emu/ui/selgame.cpp:861 src/emu/ui/selsoft.cpp:764
 #: src/emu/ui/simpleselgame.cpp:337
 msgid "Overall: Unemulated Protection"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:857 src/emu/ui/selsoft.cpp:767
+#: src/emu/ui/selgame.cpp:863 src/emu/ui/selsoft.cpp:766
 #: src/emu/ui/simpleselgame.cpp:339
 msgid "Overall: Working"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:861 src/emu/ui/selsoft.cpp:771
+#: src/emu/ui/selgame.cpp:867 src/emu/ui/selsoft.cpp:770
 msgid "Graphics: Imperfect, "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:863 src/emu/ui/selsoft.cpp:773
+#: src/emu/ui/selgame.cpp:869 src/emu/ui/selsoft.cpp:772
 msgid "Graphics: OK, "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:866 src/emu/ui/selsoft.cpp:776
+#: src/emu/ui/selgame.cpp:872 src/emu/ui/selsoft.cpp:775
 msgid "Sound: Unimplemented"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:868 src/emu/ui/selsoft.cpp:778
+#: src/emu/ui/selgame.cpp:874 src/emu/ui/selsoft.cpp:777
 msgid "Sound: Imperfect"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:870 src/emu/ui/selsoft.cpp:780
+#: src/emu/ui/selgame.cpp:876 src/emu/ui/selsoft.cpp:779
 msgid "Sound: OK"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:887
+#: src/emu/ui/selgame.cpp:893
 #, c-format
 msgid "System: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:894 src/emu/ui/selsoft.cpp:805
+#: src/emu/ui/selgame.cpp:900 src/emu/ui/selsoft.cpp:804
 #, c-format
 msgid "Software is clone of: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:896 src/emu/ui/selsoft.cpp:807
+#: src/emu/ui/selgame.cpp:902 src/emu/ui/selsoft.cpp:806
 msgid "Software is parent"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:901 src/emu/ui/selsoft.cpp:812
+#: src/emu/ui/selgame.cpp:907 src/emu/ui/selsoft.cpp:811
 msgid "Supported: No"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:906 src/emu/ui/selsoft.cpp:817
+#: src/emu/ui/selgame.cpp:912 src/emu/ui/selsoft.cpp:816
 msgid "Supported: Partial"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:911 src/emu/ui/selsoft.cpp:822
+#: src/emu/ui/selgame.cpp:917 src/emu/ui/selsoft.cpp:821
 msgid "Supported: Yes"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:916 src/emu/ui/selsoft.cpp:827
+#: src/emu/ui/selgame.cpp:922 src/emu/ui/selsoft.cpp:826
 #, c-format
 msgid "romset: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:923
+#: src/emu/ui/selgame.cpp:929
 #, c-format
 msgid "%1$s %2$s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1535
+#: src/emu/ui/selgame.cpp:1543
 #, c-format
 msgid "Romset: %1$-.100s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1536
+#: src/emu/ui/selgame.cpp:1544
 #, c-format
 msgid "Year: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1537
+#: src/emu/ui/selgame.cpp:1545
 #, c-format
 msgid "Manufacturer: %1$-.100s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1541
+#: src/emu/ui/selgame.cpp:1549
 #, c-format
 msgid "Driver is Clone of: %1$-.100s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1543
+#: src/emu/ui/selgame.cpp:1551
 msgid "Driver is Parent\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1546
+#: src/emu/ui/selgame.cpp:1554
 msgid "Overall: NOT WORKING\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1548
+#: src/emu/ui/selgame.cpp:1556
 msgid "Overall: Unemulated Protection\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1550
+#: src/emu/ui/selgame.cpp:1558
 msgid "Overall: Working\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1553
+#: src/emu/ui/selgame.cpp:1561
 msgid "Graphics: Imperfect Colors\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1557
+#: src/emu/ui/selgame.cpp:1565
 msgid "Graphics: Imperfect\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1559
+#: src/emu/ui/selgame.cpp:1567
 msgid "Graphics: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1562
+#: src/emu/ui/selgame.cpp:1570
 msgid "Sound: Unimplemented\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1564
+#: src/emu/ui/selgame.cpp:1572
 msgid "Sound: Imperfect\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1566
+#: src/emu/ui/selgame.cpp:1574
 msgid "Sound: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1568
+#: src/emu/ui/selgame.cpp:1576
 #, c-format
 msgid "Driver is Skeleton: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1569
+#: src/emu/ui/selgame.cpp:1577
 #, c-format
 msgid "Game is Mechanical: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1570
+#: src/emu/ui/selgame.cpp:1578
 #, c-format
 msgid "Requires Artwork: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1571
+#: src/emu/ui/selgame.cpp:1579
 #, c-format
 msgid "Requires Clickable Artwork: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1572
+#: src/emu/ui/selgame.cpp:1580
 #, c-format
 msgid "Support Cocktail: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1573
+#: src/emu/ui/selgame.cpp:1581
 #, c-format
 msgid "Driver is Bios: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1574
+#: src/emu/ui/selgame.cpp:1582
 #, c-format
 msgid "Support Save: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 #, c-format
 msgid "Screen Orientation: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 msgid "Vertical"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 msgid "Horizontal"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/selgame.cpp:1591
 #, c-format
 msgid "Requires CHD: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1596
+#: src/emu/ui/selgame.cpp:1604
 msgid "Roms Audit Pass: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1598
+#: src/emu/ui/selgame.cpp:1606
 msgid "Roms Audit Pass: BAD\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1601
+#: src/emu/ui/selgame.cpp:1609
 msgid "Samples Audit Pass: None Needed\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1603
+#: src/emu/ui/selgame.cpp:1611
 msgid "Samples Audit Pass: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1605
+#: src/emu/ui/selgame.cpp:1613
 msgid "Samples Audit Pass: BAD\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1608
+#: src/emu/ui/selgame.cpp:1616
 msgid ""
 "Roms Audit Pass: Disabled\n"
 "Samples Audit Pass: Disabled\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:2049 src/emu/ui/selgame.cpp:2212
-#: src/emu/ui/selsoft.cpp:1662
+#: src/emu/ui/selgame.cpp:2055 src/emu/ui/selgame.cpp:2216
+#: src/emu/ui/selsoft.cpp:1655
 msgid "No Infos Available"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:2162 src/emu/ui/selsoft.cpp:1607
+#: src/emu/ui/selgame.cpp:2168 src/emu/ui/selsoft.cpp:1602
 msgid "Usage"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:110
-msgid " (default)"
-msgstr ""
-
-#: src/emu/ui/selsoft.cpp:381
+#: src/emu/ui/selsoft.cpp:380
 msgid ""
 "The selected software is missing one or more required files. Please select a "
 "different software.\n"
@@ -1267,57 +1283,57 @@ msgid ""
 "Press any key to continue."
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:684
+#: src/emu/ui/selsoft.cpp:683
 #, c-format
-msgid "%1$s %2$s ( %3$d / %4$d softwares )"
+msgid "%1$s %2$s ( %3$d / %4$d software packages )"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:685
+#: src/emu/ui/selsoft.cpp:684
 #, c-format
 msgid "Driver: \"%1$s\" software list "
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:688
+#: src/emu/ui/selsoft.cpp:687
 #, c-format
 msgid "Region: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:690
+#: src/emu/ui/selsoft.cpp:689
 #, c-format
 msgid "Publisher: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:692
+#: src/emu/ui/selsoft.cpp:691
 #, c-format
 msgid "Year: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:694
+#: src/emu/ui/selsoft.cpp:693
 #, c-format
 msgid "Software List: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:696
+#: src/emu/ui/selsoft.cpp:695
 #, c-format
 msgid "Device type: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:698
+#: src/emu/ui/selsoft.cpp:697
 #, c-format
 msgid "%s Search: %s_"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:748 src/emu/ui/selsoft.cpp:798
+#: src/emu/ui/selsoft.cpp:747 src/emu/ui/selsoft.cpp:797
 #: src/emu/ui/simpleselgame.cpp:325
 #, c-format
 msgid "%1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:1998 src/emu/ui/selsoft.cpp:2018
+#: src/emu/ui/selsoft.cpp:1991 src/emu/ui/selsoft.cpp:2011
 msgid "Software part selection:"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:2136 src/emu/ui/selsoft.cpp:2156
+#: src/emu/ui/selsoft.cpp:2129 src/emu/ui/selsoft.cpp:2149
 msgid "Bios selection:"
 msgstr ""
 
@@ -1365,15 +1381,15 @@ msgstr ""
 msgid " [internal]"
 msgstr ""
 
-#: src/emu/ui/sndmenu.cpp:135
+#: src/emu/ui/sndmenu.cpp:133
 msgid "Sound"
 msgstr ""
 
-#: src/emu/ui/sndmenu.cpp:136
+#: src/emu/ui/sndmenu.cpp:134
 msgid "Sample Rate"
 msgstr ""
 
-#: src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/sndmenu.cpp:135
 msgid "Use External Samples"
 msgstr ""
 
@@ -1442,80 +1458,80 @@ msgstr ""
 msgid "Fast Forward"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:419
+#: src/emu/ui/ui.cpp:418
 msgid "This driver requires images to be loaded in the following device(s): "
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1074
+#: src/emu/ui/ui.cpp:1071
 msgid ""
 "One or more ROMs/CHDs for this machine are incorrect. The machine may not "
 "run correctly.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1087
+#: src/emu/ui/ui.cpp:1084
 msgid ""
 "There are known problems with this machine\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1091
+#: src/emu/ui/ui.cpp:1088
 msgid ""
 "One or more ROMs/CHDs for this machine have not been correctly dumped.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1095
+#: src/emu/ui/ui.cpp:1092
 #, c-format
 msgid "The keyboard emulation may not be 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1097
+#: src/emu/ui/ui.cpp:1094
 #, c-format
 msgid "The colors aren't 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1099
+#: src/emu/ui/ui.cpp:1096
 msgid "The colors are completely wrong.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1101
+#: src/emu/ui/ui.cpp:1098
 #, c-format
 msgid "The video emulation isn't 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1103
+#: src/emu/ui/ui.cpp:1100
 #, c-format
 msgid "The sound emulation isn't 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1105
+#: src/emu/ui/ui.cpp:1102
 msgid "The machine lacks sound.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1108
+#: src/emu/ui/ui.cpp:1105
 msgid "Screen flipping in cocktail mode is not supported.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1112
+#: src/emu/ui/ui.cpp:1109
 msgid "The machine requires external artwork files\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1117
+#: src/emu/ui/ui.cpp:1114
 msgid ""
 "This machine was never completed. It may exhibit strange behavior or missing "
 "elements that are not bugs in the emulation.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1122
+#: src/emu/ui/ui.cpp:1119
 msgid ""
 "This machine has no sound hardware, MAME will produce no sounds, this is "
 "expected behaviour.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1130
+#: src/emu/ui/ui.cpp:1127
 msgid "The machine has protection which isn't fully emulated.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1133
+#: src/emu/ui/ui.cpp:1130
 msgid ""
 "\n"
 "THIS MACHINE DOESN'T WORK. The emulation for this machine is not yet "
@@ -1523,7 +1539,7 @@ msgid ""
 "the developers to improve the emulation.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1137
+#: src/emu/ui/ui.cpp:1134
 msgid ""
 "\n"
 "Certain elements of this machine cannot be emulated as it requires actual "
@@ -1531,21 +1547,21 @@ msgid ""
 "to fully play this machine.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1156
+#: src/emu/ui/ui.cpp:1153
 msgid ""
 "\n"
 "\n"
 "There are working clones of this machine: "
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1170
+#: src/emu/ui/ui.cpp:1167
 msgid ""
 "\n"
 "\n"
 "Press any key to continue"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1185
+#: src/emu/ui/ui.cpp:1182
 #, c-format
 msgid ""
 "%1$s\n"
@@ -1555,98 +1571,98 @@ msgid ""
 "CPU:\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1221 src/emu/ui/ui.cpp:1260
+#: src/emu/ui/ui.cpp:1218 src/emu/ui/ui.cpp:1257
 msgid "MHz"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1221 src/emu/ui/ui.cpp:1260
+#: src/emu/ui/ui.cpp:1218 src/emu/ui/ui.cpp:1257
 msgid "kHz"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1235
+#: src/emu/ui/ui.cpp:1232
 msgid ""
 "\n"
 "Sound:\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1264
+#: src/emu/ui/ui.cpp:1261
 msgid ""
 "\n"
 "Video:\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1268
+#: src/emu/ui/ui.cpp:1265
 msgid "None\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1275
+#: src/emu/ui/ui.cpp:1272
 msgid "Vector"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1286
+#: src/emu/ui/ui.cpp:1283
 #, c-format
 msgid "%1$s: %2$s\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1286
+#: src/emu/ui/ui.cpp:1283
 msgid "%2$s\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1541 src/emu/ui/ui.cpp:1551
+#: src/emu/ui/ui.cpp:1538 src/emu/ui/ui.cpp:1548
 msgid "Keyboard Emulation Status"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1543
+#: src/emu/ui/ui.cpp:1540
 msgid "Mode: PARTIAL Emulation"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1544
+#: src/emu/ui/ui.cpp:1541
 msgid "UI:   Enabled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1546 src/emu/ui/ui.cpp:1556
+#: src/emu/ui/ui.cpp:1543 src/emu/ui/ui.cpp:1553
 msgid "**Use ScrLock to toggle**"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1553
+#: src/emu/ui/ui.cpp:1550
 msgid "Mode: FULL Emulation"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1554
+#: src/emu/ui/ui.cpp:1551
 msgid "UI:   Disabled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1692
+#: src/emu/ui/ui.cpp:1689
 msgid "Autofire can't be enabled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1731
+#: src/emu/ui/ui.cpp:1728
 msgid "Select position to save to"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1733
+#: src/emu/ui/ui.cpp:1730
 msgid "Select position to load from"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1757
+#: src/emu/ui/ui.cpp:1754
 msgid "Save cancelled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1759
+#: src/emu/ui/ui.cpp:1756
 msgid "Load cancelled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1802
+#: src/emu/ui/ui.cpp:1799
 #, c-format
 msgid "Save to position %s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1807
+#: src/emu/ui/ui.cpp:1804
 #, c-format
 msgid "Load from position %s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1847
+#: src/emu/ui/ui.cpp:1844
 #, c-format
 msgid ""
 "Are you sure you want to quit?\n"
@@ -1655,173 +1671,173 @@ msgid ""
 "Press ''%2$s'' to return to emulation."
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1917
+#: src/emu/ui/ui.cpp:1914
 msgid "Master Volume"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1926
+#: src/emu/ui/ui.cpp:1923
 #, c-format
 msgid "%1$s Volume"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1949
+#: src/emu/ui/ui.cpp:1946
 #, c-format
 msgid "Overclock CPU %1$s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1968
+#: src/emu/ui/ui.cpp:1965
 #, c-format
 msgid "%1$s Refresh Rate"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1973
+#: src/emu/ui/ui.cpp:1970
 #, c-format
 msgid "%1$s Brightness"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1975
+#: src/emu/ui/ui.cpp:1972
 #, c-format
 msgid "%1$s Contrast"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1977
+#: src/emu/ui/ui.cpp:1974
 #, c-format
 msgid "%1$s Gamma"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1981
+#: src/emu/ui/ui.cpp:1978
 #, c-format
 msgid "%1$s Horiz Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1983
+#: src/emu/ui/ui.cpp:1980
 #, c-format
 msgid "%1$s Horiz Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1985
+#: src/emu/ui/ui.cpp:1982
 #, c-format
 msgid "%1$s Vert Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1987
+#: src/emu/ui/ui.cpp:1984
 #, c-format
 msgid "%1$s Vert Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2005
+#: src/emu/ui/ui.cpp:2002
 #, c-format
 msgid "Laserdisc '%1$s' Horiz Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2007
+#: src/emu/ui/ui.cpp:2004
 #, c-format
 msgid "Laserdisc '%1$s' Horiz Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2009
+#: src/emu/ui/ui.cpp:2006
 #, c-format
 msgid "Laserdisc '%1$s' Vert Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2011
+#: src/emu/ui/ui.cpp:2008
 #, c-format
 msgid "Laserdisc '%1$s' Vert Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2021
+#: src/emu/ui/ui.cpp:2018
 msgid "Vector Flicker"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2022
+#: src/emu/ui/ui.cpp:2019
 msgid "Beam Width Minimum"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2023
+#: src/emu/ui/ui.cpp:2020
 msgid "Beam Width Maximum"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2024
+#: src/emu/ui/ui.cpp:2021
 msgid "Beam Intensity Weight"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2037
+#: src/emu/ui/ui.cpp:2034
 #, c-format
 msgid "Crosshair Scale %1$s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2037 src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2034 src/emu/ui/ui.cpp:2036
 msgid "X"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2037 src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2034 src/emu/ui/ui.cpp:2036
 msgid "Y"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2036
 #, c-format
 msgid "Crosshair Offset %1$s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2071
+#: src/emu/ui/ui.cpp:2068
 #, c-format
 msgid "%1$3ddB"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2115
+#: src/emu/ui/ui.cpp:2112
 #, c-format
 msgid "%1$d%%"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2131
+#: src/emu/ui/ui.cpp:2128
 #, c-format
 msgid "%1$3.0f%%"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2154
+#: src/emu/ui/ui.cpp:2151
 #, c-format
 msgid "%1$.3ffps"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2177 src/emu/ui/ui.cpp:2199 src/emu/ui/ui.cpp:2220
-#: src/emu/ui/ui.cpp:2242 src/emu/ui/ui.cpp:2264 src/emu/ui/ui.cpp:2286
-#: src/emu/ui/ui.cpp:2308 src/emu/ui/ui.cpp:2330 src/emu/ui/ui.cpp:2352
-#: src/emu/ui/ui.cpp:2374 src/emu/ui/ui.cpp:2396
+#: src/emu/ui/ui.cpp:2174 src/emu/ui/ui.cpp:2196 src/emu/ui/ui.cpp:2217
+#: src/emu/ui/ui.cpp:2239 src/emu/ui/ui.cpp:2261 src/emu/ui/ui.cpp:2283
+#: src/emu/ui/ui.cpp:2305 src/emu/ui/ui.cpp:2327 src/emu/ui/ui.cpp:2349
+#: src/emu/ui/ui.cpp:2371 src/emu/ui/ui.cpp:2393
 #, c-format
 msgid "%1$.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2412 src/emu/ui/ui.cpp:2428 src/emu/ui/ui.cpp:2444
-#: src/emu/ui/ui.cpp:2460
+#: src/emu/ui/ui.cpp:2408 src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2438
+#: src/emu/ui/ui.cpp:2453
 #, c-format
 msgid "%1$1.2f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2476
+#: src/emu/ui/ui.cpp:2469
 #, c-format
 msgid "Screen '%1$s'"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2478
+#: src/emu/ui/ui.cpp:2471
 msgid "Screen"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2494
+#: src/emu/ui/ui.cpp:2487
 #, c-format
 msgid "Crosshair Scale X %1$1.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2494
+#: src/emu/ui/ui.cpp:2487
 #, c-format
 msgid "Crosshair Scale Y %1$1.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2513
+#: src/emu/ui/ui.cpp:2506
 #, c-format
 msgid "Crosshair Offset X %1$1.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2513
+#: src/emu/ui/ui.cpp:2506
 #, c-format
 msgid "Crosshair Offset Y %1$1.3f"
 msgstr ""
@@ -1863,10 +1879,10 @@ msgstr ""
 msgid "Full"
 msgstr ""
 
-#: src/emu/ui/viewgfx.cpp:392
+#: src/emu/ui/viewgfx.cpp:391
 msgid " COLORS"
 msgstr ""
 
-#: src/emu/ui/viewgfx.cpp:392
+#: src/emu/ui/viewgfx.cpp:391
 msgid " PENS"
 msgstr ""
diff --git a/language/Norwegian/strings.po b/language/Norwegian/strings.po
index 805e11beed6..47c8a3c812b 100644
--- a/language/Norwegian/strings.po
+++ b/language/Norwegian/strings.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MAME\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-11 03:33+0200\n"
+"POT-Creation-Date: 2016-04-15 17:42+0200\n"
 "PO-Revision-Date: 2016-02-20 18:03+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: MAME Language Team\n"
@@ -60,14 +60,14 @@ msgstr ""
 msgid "Autofire Status"
 msgstr ""
 
-#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1698
+#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1695
 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211
 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219
 #: src/emu/ui/videoopt.cpp:223
 msgid "Disabled"
 msgstr ""
 
-#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1698
+#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1695
 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211
 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219
 #: src/emu/ui/videoopt.cpp:223
@@ -75,14 +75,14 @@ msgid "Enabled"
 msgstr ""
 
 #: src/emu/ui/cheatopt.cpp:282 src/emu/ui/cheatopt.cpp:288
-#: src/emu/ui/menu.cpp:710 src/emu/ui/miscmenu.cpp:831
-#: src/emu/ui/sndmenu.cpp:135 src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/menu.cpp:755 src/emu/ui/miscmenu.cpp:936
+#: src/emu/ui/sndmenu.cpp:133 src/emu/ui/sndmenu.cpp:135
 msgid "On"
 msgstr ""
 
 #: src/emu/ui/cheatopt.cpp:282 src/emu/ui/cheatopt.cpp:288
-#: src/emu/ui/menu.cpp:713 src/emu/ui/miscmenu.cpp:831
-#: src/emu/ui/sndmenu.cpp:135 src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/menu.cpp:758 src/emu/ui/miscmenu.cpp:936
+#: src/emu/ui/sndmenu.cpp:133 src/emu/ui/sndmenu.cpp:135
 msgid "Off"
 msgstr ""
 
@@ -94,316 +94,316 @@ msgstr ""
 msgid "Autofire Delay"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:158 src/emu/ui/custmenu.cpp:447
+#: src/emu/ui/custmenu.cpp:157 src/emu/ui/custmenu.cpp:445
 msgid "Main filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:167 src/emu/ui/custmenu.cpp:456
+#: src/emu/ui/custmenu.cpp:166 src/emu/ui/custmenu.cpp:454
 msgid "Other filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:176 src/emu/ui/optsmenu.cpp:239
+#: src/emu/ui/custmenu.cpp:175 src/emu/ui/optsmenu.cpp:238
 msgid "^!Manufacturer"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:185 src/emu/ui/custmenu.cpp:474
-#: src/emu/ui/optsmenu.cpp:247
+#: src/emu/ui/custmenu.cpp:184 src/emu/ui/custmenu.cpp:472
+#: src/emu/ui/optsmenu.cpp:246
 msgid "^!Year"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:194 src/emu/ui/custmenu.cpp:510
+#: src/emu/ui/custmenu.cpp:193 src/emu/ui/custmenu.cpp:508
 msgid "Remove last filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:197 src/emu/ui/custmenu.cpp:513
+#: src/emu/ui/custmenu.cpp:196 src/emu/ui/custmenu.cpp:511
 msgid "Add filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:212 src/emu/ui/custmenu.cpp:233
-#: src/emu/ui/custmenu.cpp:529 src/emu/ui/custmenu.cpp:550
+#: src/emu/ui/custmenu.cpp:211 src/emu/ui/custmenu.cpp:231
+#: src/emu/ui/custmenu.cpp:527 src/emu/ui/custmenu.cpp:547
 msgid "Select custom filters:"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:465
+#: src/emu/ui/custmenu.cpp:463
 msgid "^!Publisher"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:483
+#: src/emu/ui/custmenu.cpp:481
 msgid "^!Software List"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:492
+#: src/emu/ui/custmenu.cpp:490
 msgid "^!Device type"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:501
+#: src/emu/ui/custmenu.cpp:499
 msgid "^!Region"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:23
+#: src/emu/ui/custui.cpp:22
 msgid "Show All"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:24
+#: src/emu/ui/custui.cpp:23
 msgid "Hide Filters"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:25
+#: src/emu/ui/custui.cpp:24
 msgid "Hide Info/Image"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:26
+#: src/emu/ui/custui.cpp:25
 msgid "Hide Both"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:142
+#: src/emu/ui/custui.cpp:141
 msgid "Fonts"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:143
+#: src/emu/ui/custui.cpp:142
 msgid "Colors"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:148 src/emu/ui/dirmenu.cpp:33
+#: src/emu/ui/custui.cpp:147 src/emu/ui/dirmenu.cpp:33
 msgid "Language"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:152
+#: src/emu/ui/custui.cpp:151
 msgid "Show side panels"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:167 src/emu/ui/custui.cpp:188
+#: src/emu/ui/custui.cpp:166 src/emu/ui/custui.cpp:186
 msgid "Custom UI Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:246
+#: src/emu/ui/custui.cpp:244
 msgid "default"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:349
+#: src/emu/ui/custui.cpp:347
 msgid "UI Font"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:354
+#: src/emu/ui/custui.cpp:352
 msgid "Bold"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:355
+#: src/emu/ui/custui.cpp:353
 msgid "Italic"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:360
+#: src/emu/ui/custui.cpp:358
 msgid "Lines"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:366
+#: src/emu/ui/custui.cpp:364
 msgid "Infos text size"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:383
+#: src/emu/ui/custui.cpp:381
 msgid "UI Fonts Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:411
+#: src/emu/ui/custui.cpp:408
 msgid "Sample text - Lorem ipsum dolor sit amet, consectetur adipiscing elit."
 msgstr ""
 
-#: src/emu/ui/custui.cpp:509
+#: src/emu/ui/custui.cpp:506
 msgid "Normal text"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:510
+#: src/emu/ui/custui.cpp:507
 msgid "Selected color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:511
+#: src/emu/ui/custui.cpp:508
 msgid "Normal text background"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:512
+#: src/emu/ui/custui.cpp:509
 msgid "Selected background color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:513
+#: src/emu/ui/custui.cpp:510
 msgid "Subitem color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:514 src/emu/ui/custui.cpp:610
+#: src/emu/ui/custui.cpp:511 src/emu/ui/custui.cpp:606
 msgid "Clone"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:515
+#: src/emu/ui/custui.cpp:512
 msgid "Border"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:516
+#: src/emu/ui/custui.cpp:513
 msgid "Background"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:517
+#: src/emu/ui/custui.cpp:514
 msgid "Dipswitch"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:518
+#: src/emu/ui/custui.cpp:515
 msgid "Unavailable color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:519
+#: src/emu/ui/custui.cpp:516
 msgid "Slider color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:520
+#: src/emu/ui/custui.cpp:517
 msgid "Gfx viewer background"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:521
+#: src/emu/ui/custui.cpp:518
 msgid "Mouse over color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:522
+#: src/emu/ui/custui.cpp:519
 msgid "Mouse over background color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:523
+#: src/emu/ui/custui.cpp:520
 msgid "Mouse down color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:524
+#: src/emu/ui/custui.cpp:521
 msgid "Mouse down background color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:527
+#: src/emu/ui/custui.cpp:524
 msgid "Restore originals colors"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:543
+#: src/emu/ui/custui.cpp:540
 msgid "UI Colors Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:572
+#: src/emu/ui/custui.cpp:568
 #, c-format
 msgid "Double click or press %1$s to change the color value"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:598
+#: src/emu/ui/custui.cpp:594
 msgid "Menu Preview"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:606
+#: src/emu/ui/custui.cpp:602
 msgid "Normal"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:607
+#: src/emu/ui/custui.cpp:603
 msgid "Subitem"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:608
+#: src/emu/ui/custui.cpp:604
 msgid "Selected"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:609
+#: src/emu/ui/custui.cpp:605
 msgid "Mouse Over"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:841 src/emu/ui/custui.cpp:844
+#: src/emu/ui/custui.cpp:837 src/emu/ui/custui.cpp:840
 msgid "Alpha"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:849 src/emu/ui/custui.cpp:852
-#: src/emu/ui/custui.cpp:1013
+#: src/emu/ui/custui.cpp:845 src/emu/ui/custui.cpp:848
+#: src/emu/ui/custui.cpp:1007
 msgid "Red"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:857 src/emu/ui/custui.cpp:860
-#: src/emu/ui/custui.cpp:1016
+#: src/emu/ui/custui.cpp:853 src/emu/ui/custui.cpp:856
+#: src/emu/ui/custui.cpp:1010
 msgid "Green"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:865 src/emu/ui/custui.cpp:868
-#: src/emu/ui/custui.cpp:1017
+#: src/emu/ui/custui.cpp:861 src/emu/ui/custui.cpp:864
+#: src/emu/ui/custui.cpp:1011
 msgid "Blue"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:871
+#: src/emu/ui/custui.cpp:867
 msgid "Choose from palette"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:887
+#: src/emu/ui/custui.cpp:883
 msgid " - ARGB Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:912
+#: src/emu/ui/custui.cpp:907
 msgid "Color preview ="
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1009
+#: src/emu/ui/custui.cpp:1003
 msgid "White"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1010
+#: src/emu/ui/custui.cpp:1004
 msgid "Silver"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1011
+#: src/emu/ui/custui.cpp:1005
 msgid "Gray"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1012
+#: src/emu/ui/custui.cpp:1006
 msgid "Black"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1014
+#: src/emu/ui/custui.cpp:1008
 msgid "Orange"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1015
+#: src/emu/ui/custui.cpp:1009
 msgid "Yellow"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1018
+#: src/emu/ui/custui.cpp:1012
 msgid "Violet"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:65
+#: src/emu/ui/datmenu.cpp:64
 msgid "Software History"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:67
+#: src/emu/ui/datmenu.cpp:66
 msgid "Software Usage"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:199
+#: src/emu/ui/datmenu.cpp:196
 msgid "Revision: "
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:287 src/emu/ui/selgame.cpp:40
-#: src/emu/ui/selgame.cpp:2152 src/emu/ui/selgame.cpp:2161
-#: src/emu/ui/selsoft.cpp:1577 src/emu/ui/selsoft.cpp:1597
-#: src/emu/ui/selsoft.cpp:1606
+#: src/emu/ui/datmenu.cpp:284 src/emu/ui/selgame.cpp:39
+#: src/emu/ui/selgame.cpp:2158 src/emu/ui/selgame.cpp:2167
+#: src/emu/ui/selsoft.cpp:1574 src/emu/ui/selsoft.cpp:1592
+#: src/emu/ui/selsoft.cpp:1601
 msgid "History"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:289 src/emu/ui/selgame.cpp:41
+#: src/emu/ui/datmenu.cpp:286 src/emu/ui/selgame.cpp:40
 msgid "Mameinfo"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:291 src/emu/ui/selgame.cpp:43
+#: src/emu/ui/datmenu.cpp:288 src/emu/ui/selgame.cpp:42
 msgid "Messinfo"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:293 src/emu/ui/selgame.cpp:42
+#: src/emu/ui/datmenu.cpp:290 src/emu/ui/selgame.cpp:41
 msgid "Sysinfo"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:295 src/emu/ui/selgame.cpp:46
+#: src/emu/ui/datmenu.cpp:292 src/emu/ui/selgame.cpp:45
 msgid "Mamescore"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:297 src/emu/ui/selgame.cpp:45
+#: src/emu/ui/datmenu.cpp:294 src/emu/ui/selgame.cpp:44
 msgid "Gameinit"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:299 src/emu/ui/selgame.cpp:44
+#: src/emu/ui/datmenu.cpp:296 src/emu/ui/selgame.cpp:43
 msgid "Command"
 msgstr ""
 
@@ -555,75 +555,75 @@ msgstr ""
 msgid "Remove %1$s Folder"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:158
+#: src/emu/ui/filesel.cpp:161
 msgid "File Already Exists - Override?"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:160 src/emu/ui/selgame.cpp:1568
-#: src/emu/ui/selgame.cpp:1569 src/emu/ui/selgame.cpp:1570
-#: src/emu/ui/selgame.cpp:1571 src/emu/ui/selgame.cpp:1572
-#: src/emu/ui/selgame.cpp:1573 src/emu/ui/selgame.cpp:1574
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/filesel.cpp:163 src/emu/ui/selgame.cpp:1576
+#: src/emu/ui/selgame.cpp:1577 src/emu/ui/selgame.cpp:1578
+#: src/emu/ui/selgame.cpp:1579 src/emu/ui/selgame.cpp:1580
+#: src/emu/ui/selgame.cpp:1581 src/emu/ui/selgame.cpp:1582
+#: src/emu/ui/selgame.cpp:1591
 msgid "No"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:161 src/emu/ui/selgame.cpp:1568
-#: src/emu/ui/selgame.cpp:1569 src/emu/ui/selgame.cpp:1570
-#: src/emu/ui/selgame.cpp:1571 src/emu/ui/selgame.cpp:1572
-#: src/emu/ui/selgame.cpp:1573 src/emu/ui/selgame.cpp:1574
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/filesel.cpp:164 src/emu/ui/selgame.cpp:1576
+#: src/emu/ui/selgame.cpp:1577 src/emu/ui/selgame.cpp:1578
+#: src/emu/ui/selgame.cpp:1579 src/emu/ui/selgame.cpp:1580
+#: src/emu/ui/selgame.cpp:1581 src/emu/ui/selgame.cpp:1582
+#: src/emu/ui/selgame.cpp:1591
 msgid "Yes"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:272
+#: src/emu/ui/filesel.cpp:275
 msgid "New Image Name:"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:278
+#: src/emu/ui/filesel.cpp:281
 msgid "Image Format:"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:284
+#: src/emu/ui/filesel.cpp:287
 msgid "Create"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:315
+#: src/emu/ui/filesel.cpp:318
 msgid "Please enter a file extension too"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:503 src/emu/ui/swlist.cpp:65
+#: src/emu/ui/filesel.cpp:506 src/emu/ui/swlist.cpp:65
 msgid "[empty slot]"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:507
+#: src/emu/ui/filesel.cpp:510
 msgid "[create]"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:511 src/emu/ui/swlist.cpp:76
+#: src/emu/ui/filesel.cpp:514 src/emu/ui/swlist.cpp:76
 msgid "[software list]"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:803
+#: src/emu/ui/filesel.cpp:806
 msgid "Select image format"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:863
+#: src/emu/ui/filesel.cpp:866
 msgid "Select access mode"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:864
+#: src/emu/ui/filesel.cpp:867
 msgid "Read-only"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:866
+#: src/emu/ui/filesel.cpp:869
 msgid "Read-write"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:867
+#: src/emu/ui/filesel.cpp:870
 msgid "Read this image, write to another image"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:868
+#: src/emu/ui/filesel.cpp:871
 msgid "Read this image, write to diff"
 msgstr ""
 
@@ -649,7 +649,7 @@ msgstr ""
 msgid "[empty]"
 msgstr ""
 
-#: src/emu/ui/info_pty.cpp:26 src/emu/ui/mainmenu.cpp:91
+#: src/emu/ui/info_pty.cpp:26 src/emu/ui/mainmenu.cpp:96
 msgid "Pseudo terminals"
 msgstr ""
 
@@ -665,7 +665,7 @@ msgstr ""
 msgid "Other Controls"
 msgstr ""
 
-#: src/emu/ui/inputmap.cpp:622 src/emu/ui/miscmenu.cpp:91
+#: src/emu/ui/inputmap.cpp:622 src/emu/ui/miscmenu.cpp:92
 #: src/emu/ui/slotopt.cpp:172
 msgid "Reset"
 msgstr ""
@@ -698,27 +698,27 @@ msgstr ""
 msgid "Machine Information"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:78
+#: src/emu/ui/mainmenu.cpp:80
 msgid "Image Information"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:81
+#: src/emu/ui/mainmenu.cpp:83
 msgid "File Manager"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:86
+#: src/emu/ui/mainmenu.cpp:92
 msgid "Tape Control"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:94
+#: src/emu/ui/mainmenu.cpp:99
 msgid "Bios Selection"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:100
+#: src/emu/ui/mainmenu.cpp:104
 msgid "Slot Devices"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:107
+#: src/emu/ui/mainmenu.cpp:109
 msgid "Barcode Reader"
 msgstr ""
 
@@ -726,43 +726,43 @@ msgstr ""
 msgid "Network Devices"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:119
+#: src/emu/ui/mainmenu.cpp:118
 msgid "Keyboard Mode"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:122
+#: src/emu/ui/mainmenu.cpp:121
 msgid "Slider Controls"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:125
+#: src/emu/ui/mainmenu.cpp:124
 msgid "Video Options"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:129
+#: src/emu/ui/mainmenu.cpp:128
 msgid "Crosshair Options"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:133
+#: src/emu/ui/mainmenu.cpp:132
 msgid "Cheat"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:136
+#: src/emu/ui/mainmenu.cpp:135
 msgid "Plugin Options"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:140
+#: src/emu/ui/mainmenu.cpp:139
 msgid "External DAT View"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:146
+#: src/emu/ui/mainmenu.cpp:145 src/emu/ui/miscmenu.cpp:785
 msgid "Add To Favorites"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:148
+#: src/emu/ui/mainmenu.cpp:147 src/emu/ui/miscmenu.cpp:787
 msgid "Remove From Favorites"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:155
+#: src/emu/ui/mainmenu.cpp:154
 msgid "Select New Machine"
 msgstr ""
 
@@ -802,189 +802,205 @@ msgstr ""
 msgid "Return to Previous Menu"
 msgstr ""
 
-#: src/emu/ui/menu.cpp:716
+#: src/emu/ui/menu.cpp:761
 msgid "Auto"
 msgstr ""
 
-#: src/emu/ui/menu.cpp:2133
+#: src/emu/ui/menu.cpp:2195
 msgid "Images"
 msgstr ""
 
-#: src/emu/ui/menu.cpp:2134
+#: src/emu/ui/menu.cpp:2196
 msgid "Infos"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Keyboard Mode:"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Natural"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Emulated"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:240
+#: src/emu/ui/miscmenu.cpp:241
 #, c-format
 msgid ""
 "Uptime: %1$d:%2$02d:%3$02d\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:242
+#: src/emu/ui/miscmenu.cpp:243
 #, c-format
 msgid ""
 "Uptime: %1$d:%2$02d\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:246
+#: src/emu/ui/miscmenu.cpp:247
 #, c-format
 msgid ""
 "Tickets dispensed: %1$d\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:257
+#: src/emu/ui/miscmenu.cpp:258
 msgid "Coin %1$c: NA%3$s\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:257
+#: src/emu/ui/miscmenu.cpp:258
 #, c-format
 msgid "Coin %1$c: %2$d%3$s\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:260
+#: src/emu/ui/miscmenu.cpp:261
 msgid " (locked)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:519
+#: src/emu/ui/miscmenu.cpp:520
 msgid "Visible Delay"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:617
+#: src/emu/ui/miscmenu.cpp:619
 #, c-format
 msgid "%s.xml saved under ui folder."
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:645
+#: src/emu/ui/miscmenu.cpp:647
 msgid "Name:             Description:\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:657
+#: src/emu/ui/miscmenu.cpp:659
 #, c-format
 msgid "%s.txt saved under ui folder."
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:675
-msgid "Export XML format (like -listxml)"
+#: src/emu/ui/miscmenu.cpp:677
+msgid "Export list in XML format (like -listxml)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:676
-msgid "Export TXT format (like -listfull)"
+#: src/emu/ui/miscmenu.cpp:678
+msgid "Export list in XML format (like -listxml, but exclude devices)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:734
-msgid "Dummy"
+#: src/emu/ui/miscmenu.cpp:679
+msgid "Export list in TXT format (like -listfull)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:736
-msgid "Save machine configuration"
-msgstr ""
-
-#: src/emu/ui/miscmenu.cpp:848 src/emu/ui/miscmenu.cpp:869
-#: src/emu/ui/selgame.cpp:594
-msgid "Plugins"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:218
-msgid "Filter"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:226
-msgid " ^!File"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:231
-msgid " ^!Category"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:254
-msgid "^!Setup custom filter"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:262
-msgid "Customize UI"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:263
-msgid "Configure Directories"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:266 src/emu/ui/sndmenu.cpp:151
-#: src/emu/ui/sndmenu.cpp:172
-msgid "Sound Options"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:269
-msgid "General Inputs"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:272
-msgid "Save Configuration"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:286 src/emu/ui/optsmenu.cpp:307
-msgid "Settings"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:327
-msgid "**Error saving ui.ini**"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:374
-#, c-format
-msgid "**Error saving %s.ini**"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:378
+#: src/emu/ui/miscmenu.cpp:729 src/emu/ui/optsmenu.cpp:376
 msgid ""
 "\n"
 "    Configuration saved    \n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/selector.cpp:166
+#: src/emu/ui/miscmenu.cpp:774
+msgid "Bios"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:776
+msgid "Driver"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:790
+msgid "Save machine configuration"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:806
+msgid "Configure machine:"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:868 src/emu/ui/selsoft.cpp:109
+msgid " (default)"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:953 src/emu/ui/miscmenu.cpp:973
+#: src/emu/ui/selgame.cpp:600
+msgid "Plugins"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:217
+msgid "Filter"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:225
+msgid " ^!File"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:230
+msgid " ^!Category"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:253
+msgid "^!Setup custom filter"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:261
+msgid "Customize UI"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:262
+msgid "Configure Directories"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:265 src/emu/ui/sndmenu.cpp:149
+#: src/emu/ui/sndmenu.cpp:169
+msgid "Sound Options"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:268
+msgid "General Inputs"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:271
+msgid "Save Configuration"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:285 src/emu/ui/optsmenu.cpp:305
+msgid "Settings"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:325
+msgid "**Error saving ui.ini**"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:372
+#, c-format
+msgid "**Error saving %s.ini**"
+msgstr ""
+
+#: src/emu/ui/selector.cpp:165
 msgid "Selection List - Search: "
 msgstr ""
 
-#: src/emu/ui/selector.cpp:196
+#: src/emu/ui/selector.cpp:194
 #, c-format
 msgid "Double click or press %1$s to select"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:39
+#: src/emu/ui/selgame.cpp:38
 msgid "General Info"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:374 src/emu/ui/selsoft.cpp:282
+#: src/emu/ui/selgame.cpp:380 src/emu/ui/selsoft.cpp:281
 #, c-format
 msgid ""
 "%s\n"
 " added to favorites list."
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:380 src/emu/ui/selgame.cpp:389
-#: src/emu/ui/selsoft.cpp:287
+#: src/emu/ui/selgame.cpp:386 src/emu/ui/selgame.cpp:395
+#: src/emu/ui/selsoft.cpp:286
 #, c-format
 msgid ""
 "%s\n"
 " removed from favorites list."
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:450
+#: src/emu/ui/selgame.cpp:457
 msgid ""
 "The selected machine is missing one or more required ROM or CHD images. "
 "Please select a different machine.\n"
@@ -992,275 +1008,275 @@ msgid ""
 "Press any key to continue."
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:589 src/emu/ui/simpleselgame.cpp:265
+#: src/emu/ui/selgame.cpp:595 src/emu/ui/simpleselgame.cpp:265
 msgid "Configure Options"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:752
+#: src/emu/ui/selgame.cpp:596
+msgid "Configure Machine"
+msgstr ""
+
+#: src/emu/ui/selgame.cpp:758
 #, c-format
 msgid "%1$s %2$s ( %3$d / %4$d machines (%5$d BIOS) )"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:762
+#: src/emu/ui/selgame.cpp:768
 #, c-format
 msgid "%1$s (%2$s - %3$s) - "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:769 src/emu/ui/selgame.cpp:775
+#: src/emu/ui/selgame.cpp:775 src/emu/ui/selgame.cpp:781
 #, c-format
 msgid "%1$s (%2$s) - "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:784
+#: src/emu/ui/selgame.cpp:790
 #, c-format
 msgid "%1$s Search: %2$s_"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:838
+#: src/emu/ui/selgame.cpp:844
 #, c-format
 msgid "Romset: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:841 src/emu/ui/selgame.cpp:890
-#: src/emu/ui/selsoft.cpp:751 src/emu/ui/selsoft.cpp:801
+#: src/emu/ui/selgame.cpp:847 src/emu/ui/selgame.cpp:896
+#: src/emu/ui/selsoft.cpp:750 src/emu/ui/selsoft.cpp:800
 #: src/emu/ui/simpleselgame.cpp:328
 #, c-format
 msgid "%1$s, %2$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:847 src/emu/ui/selsoft.cpp:757
+#: src/emu/ui/selgame.cpp:853 src/emu/ui/selsoft.cpp:756
 #, c-format
 msgid "Driver is clone of: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:849 src/emu/ui/selsoft.cpp:759
+#: src/emu/ui/selgame.cpp:855 src/emu/ui/selsoft.cpp:758
 msgid "Driver is parent"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:853 src/emu/ui/selsoft.cpp:763
+#: src/emu/ui/selgame.cpp:859 src/emu/ui/selsoft.cpp:762
 #: src/emu/ui/simpleselgame.cpp:335
 msgid "Overall: NOT WORKING"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:855 src/emu/ui/selsoft.cpp:765
+#: src/emu/ui/selgame.cpp:861 src/emu/ui/selsoft.cpp:764
 #: src/emu/ui/simpleselgame.cpp:337
 msgid "Overall: Unemulated Protection"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:857 src/emu/ui/selsoft.cpp:767
+#: src/emu/ui/selgame.cpp:863 src/emu/ui/selsoft.cpp:766
 #: src/emu/ui/simpleselgame.cpp:339
 msgid "Overall: Working"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:861 src/emu/ui/selsoft.cpp:771
+#: src/emu/ui/selgame.cpp:867 src/emu/ui/selsoft.cpp:770
 msgid "Graphics: Imperfect, "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:863 src/emu/ui/selsoft.cpp:773
+#: src/emu/ui/selgame.cpp:869 src/emu/ui/selsoft.cpp:772
 msgid "Graphics: OK, "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:866 src/emu/ui/selsoft.cpp:776
+#: src/emu/ui/selgame.cpp:872 src/emu/ui/selsoft.cpp:775
 msgid "Sound: Unimplemented"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:868 src/emu/ui/selsoft.cpp:778
+#: src/emu/ui/selgame.cpp:874 src/emu/ui/selsoft.cpp:777
 msgid "Sound: Imperfect"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:870 src/emu/ui/selsoft.cpp:780
+#: src/emu/ui/selgame.cpp:876 src/emu/ui/selsoft.cpp:779
 msgid "Sound: OK"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:887
+#: src/emu/ui/selgame.cpp:893
 #, c-format
 msgid "System: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:894 src/emu/ui/selsoft.cpp:805
+#: src/emu/ui/selgame.cpp:900 src/emu/ui/selsoft.cpp:804
 #, c-format
 msgid "Software is clone of: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:896 src/emu/ui/selsoft.cpp:807
+#: src/emu/ui/selgame.cpp:902 src/emu/ui/selsoft.cpp:806
 msgid "Software is parent"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:901 src/emu/ui/selsoft.cpp:812
+#: src/emu/ui/selgame.cpp:907 src/emu/ui/selsoft.cpp:811
 msgid "Supported: No"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:906 src/emu/ui/selsoft.cpp:817
+#: src/emu/ui/selgame.cpp:912 src/emu/ui/selsoft.cpp:816
 msgid "Supported: Partial"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:911 src/emu/ui/selsoft.cpp:822
+#: src/emu/ui/selgame.cpp:917 src/emu/ui/selsoft.cpp:821
 msgid "Supported: Yes"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:916 src/emu/ui/selsoft.cpp:827
+#: src/emu/ui/selgame.cpp:922 src/emu/ui/selsoft.cpp:826
 #, c-format
 msgid "romset: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:923
+#: src/emu/ui/selgame.cpp:929
 #, c-format
 msgid "%1$s %2$s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1535
+#: src/emu/ui/selgame.cpp:1543
 #, c-format
 msgid "Romset: %1$-.100s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1536
+#: src/emu/ui/selgame.cpp:1544
 #, c-format
 msgid "Year: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1537
+#: src/emu/ui/selgame.cpp:1545
 #, c-format
 msgid "Manufacturer: %1$-.100s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1541
+#: src/emu/ui/selgame.cpp:1549
 #, c-format
 msgid "Driver is Clone of: %1$-.100s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1543
+#: src/emu/ui/selgame.cpp:1551
 msgid "Driver is Parent\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1546
+#: src/emu/ui/selgame.cpp:1554
 msgid "Overall: NOT WORKING\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1548
+#: src/emu/ui/selgame.cpp:1556
 msgid "Overall: Unemulated Protection\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1550
+#: src/emu/ui/selgame.cpp:1558
 msgid "Overall: Working\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1553
+#: src/emu/ui/selgame.cpp:1561
 msgid "Graphics: Imperfect Colors\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1557
+#: src/emu/ui/selgame.cpp:1565
 msgid "Graphics: Imperfect\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1559
+#: src/emu/ui/selgame.cpp:1567
 msgid "Graphics: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1562
+#: src/emu/ui/selgame.cpp:1570
 msgid "Sound: Unimplemented\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1564
+#: src/emu/ui/selgame.cpp:1572
 msgid "Sound: Imperfect\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1566
+#: src/emu/ui/selgame.cpp:1574
 msgid "Sound: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1568
+#: src/emu/ui/selgame.cpp:1576
 #, c-format
 msgid "Driver is Skeleton: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1569
+#: src/emu/ui/selgame.cpp:1577
 #, c-format
 msgid "Game is Mechanical: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1570
+#: src/emu/ui/selgame.cpp:1578
 #, c-format
 msgid "Requires Artwork: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1571
+#: src/emu/ui/selgame.cpp:1579
 #, c-format
 msgid "Requires Clickable Artwork: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1572
+#: src/emu/ui/selgame.cpp:1580
 #, c-format
 msgid "Support Cocktail: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1573
+#: src/emu/ui/selgame.cpp:1581
 #, c-format
 msgid "Driver is Bios: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1574
+#: src/emu/ui/selgame.cpp:1582
 #, c-format
 msgid "Support Save: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 #, c-format
 msgid "Screen Orientation: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 msgid "Vertical"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 msgid "Horizontal"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/selgame.cpp:1591
 #, c-format
 msgid "Requires CHD: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1596
+#: src/emu/ui/selgame.cpp:1604
 msgid "Roms Audit Pass: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1598
+#: src/emu/ui/selgame.cpp:1606
 msgid "Roms Audit Pass: BAD\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1601
+#: src/emu/ui/selgame.cpp:1609
 msgid "Samples Audit Pass: None Needed\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1603
+#: src/emu/ui/selgame.cpp:1611
 msgid "Samples Audit Pass: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1605
+#: src/emu/ui/selgame.cpp:1613
 msgid "Samples Audit Pass: BAD\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1608
+#: src/emu/ui/selgame.cpp:1616
 msgid ""
 "Roms Audit Pass: Disabled\n"
 "Samples Audit Pass: Disabled\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:2049 src/emu/ui/selgame.cpp:2212
-#: src/emu/ui/selsoft.cpp:1662
+#: src/emu/ui/selgame.cpp:2055 src/emu/ui/selgame.cpp:2216
+#: src/emu/ui/selsoft.cpp:1655
 msgid "No Infos Available"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:2162 src/emu/ui/selsoft.cpp:1607
+#: src/emu/ui/selgame.cpp:2168 src/emu/ui/selsoft.cpp:1602
 msgid "Usage"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:110
-msgid " (default)"
-msgstr ""
-
-#: src/emu/ui/selsoft.cpp:381
+#: src/emu/ui/selsoft.cpp:380
 msgid ""
 "The selected software is missing one or more required files. Please select a "
 "different software.\n"
@@ -1268,57 +1284,57 @@ msgid ""
 "Press any key to continue."
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:684
+#: src/emu/ui/selsoft.cpp:683
 #, c-format
-msgid "%1$s %2$s ( %3$d / %4$d softwares )"
+msgid "%1$s %2$s ( %3$d / %4$d software packages )"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:685
+#: src/emu/ui/selsoft.cpp:684
 #, c-format
 msgid "Driver: \"%1$s\" software list "
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:688
+#: src/emu/ui/selsoft.cpp:687
 #, c-format
 msgid "Region: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:690
+#: src/emu/ui/selsoft.cpp:689
 #, c-format
 msgid "Publisher: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:692
+#: src/emu/ui/selsoft.cpp:691
 #, c-format
 msgid "Year: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:694
+#: src/emu/ui/selsoft.cpp:693
 #, c-format
 msgid "Software List: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:696
+#: src/emu/ui/selsoft.cpp:695
 #, c-format
 msgid "Device type: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:698
+#: src/emu/ui/selsoft.cpp:697
 #, c-format
 msgid "%s Search: %s_"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:748 src/emu/ui/selsoft.cpp:798
+#: src/emu/ui/selsoft.cpp:747 src/emu/ui/selsoft.cpp:797
 #: src/emu/ui/simpleselgame.cpp:325
 #, c-format
 msgid "%1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:1998 src/emu/ui/selsoft.cpp:2018
+#: src/emu/ui/selsoft.cpp:1991 src/emu/ui/selsoft.cpp:2011
 msgid "Software part selection:"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:2136 src/emu/ui/selsoft.cpp:2156
+#: src/emu/ui/selsoft.cpp:2129 src/emu/ui/selsoft.cpp:2149
 msgid "Bios selection:"
 msgstr ""
 
@@ -1366,15 +1382,15 @@ msgstr ""
 msgid " [internal]"
 msgstr ""
 
-#: src/emu/ui/sndmenu.cpp:135
+#: src/emu/ui/sndmenu.cpp:133
 msgid "Sound"
 msgstr ""
 
-#: src/emu/ui/sndmenu.cpp:136
+#: src/emu/ui/sndmenu.cpp:134
 msgid "Sample Rate"
 msgstr ""
 
-#: src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/sndmenu.cpp:135
 msgid "Use External Samples"
 msgstr ""
 
@@ -1443,80 +1459,80 @@ msgstr ""
 msgid "Fast Forward"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:419
+#: src/emu/ui/ui.cpp:418
 msgid "This driver requires images to be loaded in the following device(s): "
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1074
+#: src/emu/ui/ui.cpp:1071
 msgid ""
 "One or more ROMs/CHDs for this machine are incorrect. The machine may not "
 "run correctly.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1087
+#: src/emu/ui/ui.cpp:1084
 msgid ""
 "There are known problems with this machine\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1091
+#: src/emu/ui/ui.cpp:1088
 msgid ""
 "One or more ROMs/CHDs for this machine have not been correctly dumped.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1095
+#: src/emu/ui/ui.cpp:1092
 #, c-format
 msgid "The keyboard emulation may not be 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1097
+#: src/emu/ui/ui.cpp:1094
 #, c-format
 msgid "The colors aren't 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1099
+#: src/emu/ui/ui.cpp:1096
 msgid "The colors are completely wrong.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1101
+#: src/emu/ui/ui.cpp:1098
 #, c-format
 msgid "The video emulation isn't 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1103
+#: src/emu/ui/ui.cpp:1100
 #, c-format
 msgid "The sound emulation isn't 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1105
+#: src/emu/ui/ui.cpp:1102
 msgid "The machine lacks sound.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1108
+#: src/emu/ui/ui.cpp:1105
 msgid "Screen flipping in cocktail mode is not supported.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1112
+#: src/emu/ui/ui.cpp:1109
 msgid "The machine requires external artwork files\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1117
+#: src/emu/ui/ui.cpp:1114
 msgid ""
 "This machine was never completed. It may exhibit strange behavior or missing "
 "elements that are not bugs in the emulation.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1122
+#: src/emu/ui/ui.cpp:1119
 msgid ""
 "This machine has no sound hardware, MAME will produce no sounds, this is "
 "expected behaviour.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1130
+#: src/emu/ui/ui.cpp:1127
 msgid "The machine has protection which isn't fully emulated.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1133
+#: src/emu/ui/ui.cpp:1130
 msgid ""
 "\n"
 "THIS MACHINE DOESN'T WORK. The emulation for this machine is not yet "
@@ -1524,7 +1540,7 @@ msgid ""
 "the developers to improve the emulation.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1137
+#: src/emu/ui/ui.cpp:1134
 msgid ""
 "\n"
 "Certain elements of this machine cannot be emulated as it requires actual "
@@ -1532,21 +1548,21 @@ msgid ""
 "to fully play this machine.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1156
+#: src/emu/ui/ui.cpp:1153
 msgid ""
 "\n"
 "\n"
 "There are working clones of this machine: "
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1170
+#: src/emu/ui/ui.cpp:1167
 msgid ""
 "\n"
 "\n"
 "Press any key to continue"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1185
+#: src/emu/ui/ui.cpp:1182
 #, c-format
 msgid ""
 "%1$s\n"
@@ -1556,98 +1572,98 @@ msgid ""
 "CPU:\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1221 src/emu/ui/ui.cpp:1260
+#: src/emu/ui/ui.cpp:1218 src/emu/ui/ui.cpp:1257
 msgid "MHz"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1221 src/emu/ui/ui.cpp:1260
+#: src/emu/ui/ui.cpp:1218 src/emu/ui/ui.cpp:1257
 msgid "kHz"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1235
+#: src/emu/ui/ui.cpp:1232
 msgid ""
 "\n"
 "Sound:\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1264
+#: src/emu/ui/ui.cpp:1261
 msgid ""
 "\n"
 "Video:\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1268
+#: src/emu/ui/ui.cpp:1265
 msgid "None\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1275
+#: src/emu/ui/ui.cpp:1272
 msgid "Vector"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1286
+#: src/emu/ui/ui.cpp:1283
 #, c-format
 msgid "%1$s: %2$s\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1286
+#: src/emu/ui/ui.cpp:1283
 msgid "%2$s\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1541 src/emu/ui/ui.cpp:1551
+#: src/emu/ui/ui.cpp:1538 src/emu/ui/ui.cpp:1548
 msgid "Keyboard Emulation Status"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1543
+#: src/emu/ui/ui.cpp:1540
 msgid "Mode: PARTIAL Emulation"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1544
+#: src/emu/ui/ui.cpp:1541
 msgid "UI:   Enabled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1546 src/emu/ui/ui.cpp:1556
+#: src/emu/ui/ui.cpp:1543 src/emu/ui/ui.cpp:1553
 msgid "**Use ScrLock to toggle**"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1553
+#: src/emu/ui/ui.cpp:1550
 msgid "Mode: FULL Emulation"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1554
+#: src/emu/ui/ui.cpp:1551
 msgid "UI:   Disabled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1692
+#: src/emu/ui/ui.cpp:1689
 msgid "Autofire can't be enabled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1731
+#: src/emu/ui/ui.cpp:1728
 msgid "Select position to save to"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1733
+#: src/emu/ui/ui.cpp:1730
 msgid "Select position to load from"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1757
+#: src/emu/ui/ui.cpp:1754
 msgid "Save cancelled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1759
+#: src/emu/ui/ui.cpp:1756
 msgid "Load cancelled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1802
+#: src/emu/ui/ui.cpp:1799
 #, c-format
 msgid "Save to position %s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1807
+#: src/emu/ui/ui.cpp:1804
 #, c-format
 msgid "Load from position %s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1847
+#: src/emu/ui/ui.cpp:1844
 #, c-format
 msgid ""
 "Are you sure you want to quit?\n"
@@ -1656,173 +1672,173 @@ msgid ""
 "Press ''%2$s'' to return to emulation."
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1917
+#: src/emu/ui/ui.cpp:1914
 msgid "Master Volume"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1926
+#: src/emu/ui/ui.cpp:1923
 #, c-format
 msgid "%1$s Volume"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1949
+#: src/emu/ui/ui.cpp:1946
 #, c-format
 msgid "Overclock CPU %1$s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1968
+#: src/emu/ui/ui.cpp:1965
 #, c-format
 msgid "%1$s Refresh Rate"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1973
+#: src/emu/ui/ui.cpp:1970
 #, c-format
 msgid "%1$s Brightness"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1975
+#: src/emu/ui/ui.cpp:1972
 #, c-format
 msgid "%1$s Contrast"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1977
+#: src/emu/ui/ui.cpp:1974
 #, c-format
 msgid "%1$s Gamma"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1981
+#: src/emu/ui/ui.cpp:1978
 #, c-format
 msgid "%1$s Horiz Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1983
+#: src/emu/ui/ui.cpp:1980
 #, c-format
 msgid "%1$s Horiz Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1985
+#: src/emu/ui/ui.cpp:1982
 #, c-format
 msgid "%1$s Vert Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1987
+#: src/emu/ui/ui.cpp:1984
 #, c-format
 msgid "%1$s Vert Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2005
+#: src/emu/ui/ui.cpp:2002
 #, c-format
 msgid "Laserdisc '%1$s' Horiz Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2007
+#: src/emu/ui/ui.cpp:2004
 #, c-format
 msgid "Laserdisc '%1$s' Horiz Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2009
+#: src/emu/ui/ui.cpp:2006
 #, c-format
 msgid "Laserdisc '%1$s' Vert Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2011
+#: src/emu/ui/ui.cpp:2008
 #, c-format
 msgid "Laserdisc '%1$s' Vert Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2021
+#: src/emu/ui/ui.cpp:2018
 msgid "Vector Flicker"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2022
+#: src/emu/ui/ui.cpp:2019
 msgid "Beam Width Minimum"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2023
+#: src/emu/ui/ui.cpp:2020
 msgid "Beam Width Maximum"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2024
+#: src/emu/ui/ui.cpp:2021
 msgid "Beam Intensity Weight"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2037
+#: src/emu/ui/ui.cpp:2034
 #, c-format
 msgid "Crosshair Scale %1$s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2037 src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2034 src/emu/ui/ui.cpp:2036
 msgid "X"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2037 src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2034 src/emu/ui/ui.cpp:2036
 msgid "Y"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2036
 #, c-format
 msgid "Crosshair Offset %1$s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2071
+#: src/emu/ui/ui.cpp:2068
 #, c-format
 msgid "%1$3ddB"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2115
+#: src/emu/ui/ui.cpp:2112
 #, c-format
 msgid "%1$d%%"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2131
+#: src/emu/ui/ui.cpp:2128
 #, c-format
 msgid "%1$3.0f%%"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2154
+#: src/emu/ui/ui.cpp:2151
 #, c-format
 msgid "%1$.3ffps"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2177 src/emu/ui/ui.cpp:2199 src/emu/ui/ui.cpp:2220
-#: src/emu/ui/ui.cpp:2242 src/emu/ui/ui.cpp:2264 src/emu/ui/ui.cpp:2286
-#: src/emu/ui/ui.cpp:2308 src/emu/ui/ui.cpp:2330 src/emu/ui/ui.cpp:2352
-#: src/emu/ui/ui.cpp:2374 src/emu/ui/ui.cpp:2396
+#: src/emu/ui/ui.cpp:2174 src/emu/ui/ui.cpp:2196 src/emu/ui/ui.cpp:2217
+#: src/emu/ui/ui.cpp:2239 src/emu/ui/ui.cpp:2261 src/emu/ui/ui.cpp:2283
+#: src/emu/ui/ui.cpp:2305 src/emu/ui/ui.cpp:2327 src/emu/ui/ui.cpp:2349
+#: src/emu/ui/ui.cpp:2371 src/emu/ui/ui.cpp:2393
 #, c-format
 msgid "%1$.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2412 src/emu/ui/ui.cpp:2428 src/emu/ui/ui.cpp:2444
-#: src/emu/ui/ui.cpp:2460
+#: src/emu/ui/ui.cpp:2408 src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2438
+#: src/emu/ui/ui.cpp:2453
 #, c-format
 msgid "%1$1.2f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2476
+#: src/emu/ui/ui.cpp:2469
 #, c-format
 msgid "Screen '%1$s'"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2478
+#: src/emu/ui/ui.cpp:2471
 msgid "Screen"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2494
+#: src/emu/ui/ui.cpp:2487
 #, c-format
 msgid "Crosshair Scale X %1$1.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2494
+#: src/emu/ui/ui.cpp:2487
 #, c-format
 msgid "Crosshair Scale Y %1$1.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2513
+#: src/emu/ui/ui.cpp:2506
 #, c-format
 msgid "Crosshair Offset X %1$1.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2513
+#: src/emu/ui/ui.cpp:2506
 #, c-format
 msgid "Crosshair Offset Y %1$1.3f"
 msgstr ""
@@ -1864,10 +1880,10 @@ msgstr ""
 msgid "Full"
 msgstr ""
 
-#: src/emu/ui/viewgfx.cpp:392
+#: src/emu/ui/viewgfx.cpp:391
 msgid " COLORS"
 msgstr ""
 
-#: src/emu/ui/viewgfx.cpp:392
+#: src/emu/ui/viewgfx.cpp:391
 msgid " PENS"
 msgstr ""
diff --git a/language/Persian/strings.po b/language/Persian/strings.po
index c9b51faa763..6182c050e3a 100644
--- a/language/Persian/strings.po
+++ b/language/Persian/strings.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MAME\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-11 03:33+0200\n"
+"POT-Creation-Date: 2016-04-15 17:42+0200\n"
 "PO-Revision-Date: 2016-02-20 18:03+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: MAME Language Team\n"
@@ -59,14 +59,14 @@ msgstr ""
 msgid "Autofire Status"
 msgstr ""
 
-#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1698
+#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1695
 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211
 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219
 #: src/emu/ui/videoopt.cpp:223
 msgid "Disabled"
 msgstr ""
 
-#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1698
+#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1695
 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211
 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219
 #: src/emu/ui/videoopt.cpp:223
@@ -74,14 +74,14 @@ msgid "Enabled"
 msgstr ""
 
 #: src/emu/ui/cheatopt.cpp:282 src/emu/ui/cheatopt.cpp:288
-#: src/emu/ui/menu.cpp:710 src/emu/ui/miscmenu.cpp:831
-#: src/emu/ui/sndmenu.cpp:135 src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/menu.cpp:755 src/emu/ui/miscmenu.cpp:936
+#: src/emu/ui/sndmenu.cpp:133 src/emu/ui/sndmenu.cpp:135
 msgid "On"
 msgstr ""
 
 #: src/emu/ui/cheatopt.cpp:282 src/emu/ui/cheatopt.cpp:288
-#: src/emu/ui/menu.cpp:713 src/emu/ui/miscmenu.cpp:831
-#: src/emu/ui/sndmenu.cpp:135 src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/menu.cpp:758 src/emu/ui/miscmenu.cpp:936
+#: src/emu/ui/sndmenu.cpp:133 src/emu/ui/sndmenu.cpp:135
 msgid "Off"
 msgstr ""
 
@@ -93,316 +93,316 @@ msgstr ""
 msgid "Autofire Delay"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:158 src/emu/ui/custmenu.cpp:447
+#: src/emu/ui/custmenu.cpp:157 src/emu/ui/custmenu.cpp:445
 msgid "Main filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:167 src/emu/ui/custmenu.cpp:456
+#: src/emu/ui/custmenu.cpp:166 src/emu/ui/custmenu.cpp:454
 msgid "Other filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:176 src/emu/ui/optsmenu.cpp:239
+#: src/emu/ui/custmenu.cpp:175 src/emu/ui/optsmenu.cpp:238
 msgid "^!Manufacturer"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:185 src/emu/ui/custmenu.cpp:474
-#: src/emu/ui/optsmenu.cpp:247
+#: src/emu/ui/custmenu.cpp:184 src/emu/ui/custmenu.cpp:472
+#: src/emu/ui/optsmenu.cpp:246
 msgid "^!Year"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:194 src/emu/ui/custmenu.cpp:510
+#: src/emu/ui/custmenu.cpp:193 src/emu/ui/custmenu.cpp:508
 msgid "Remove last filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:197 src/emu/ui/custmenu.cpp:513
+#: src/emu/ui/custmenu.cpp:196 src/emu/ui/custmenu.cpp:511
 msgid "Add filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:212 src/emu/ui/custmenu.cpp:233
-#: src/emu/ui/custmenu.cpp:529 src/emu/ui/custmenu.cpp:550
+#: src/emu/ui/custmenu.cpp:211 src/emu/ui/custmenu.cpp:231
+#: src/emu/ui/custmenu.cpp:527 src/emu/ui/custmenu.cpp:547
 msgid "Select custom filters:"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:465
+#: src/emu/ui/custmenu.cpp:463
 msgid "^!Publisher"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:483
+#: src/emu/ui/custmenu.cpp:481
 msgid "^!Software List"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:492
+#: src/emu/ui/custmenu.cpp:490
 msgid "^!Device type"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:501
+#: src/emu/ui/custmenu.cpp:499
 msgid "^!Region"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:23
+#: src/emu/ui/custui.cpp:22
 msgid "Show All"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:24
+#: src/emu/ui/custui.cpp:23
 msgid "Hide Filters"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:25
+#: src/emu/ui/custui.cpp:24
 msgid "Hide Info/Image"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:26
+#: src/emu/ui/custui.cpp:25
 msgid "Hide Both"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:142
+#: src/emu/ui/custui.cpp:141
 msgid "Fonts"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:143
+#: src/emu/ui/custui.cpp:142
 msgid "Colors"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:148 src/emu/ui/dirmenu.cpp:33
+#: src/emu/ui/custui.cpp:147 src/emu/ui/dirmenu.cpp:33
 msgid "Language"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:152
+#: src/emu/ui/custui.cpp:151
 msgid "Show side panels"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:167 src/emu/ui/custui.cpp:188
+#: src/emu/ui/custui.cpp:166 src/emu/ui/custui.cpp:186
 msgid "Custom UI Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:246
+#: src/emu/ui/custui.cpp:244
 msgid "default"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:349
+#: src/emu/ui/custui.cpp:347
 msgid "UI Font"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:354
+#: src/emu/ui/custui.cpp:352
 msgid "Bold"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:355
+#: src/emu/ui/custui.cpp:353
 msgid "Italic"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:360
+#: src/emu/ui/custui.cpp:358
 msgid "Lines"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:366
+#: src/emu/ui/custui.cpp:364
 msgid "Infos text size"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:383
+#: src/emu/ui/custui.cpp:381
 msgid "UI Fonts Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:411
+#: src/emu/ui/custui.cpp:408
 msgid "Sample text - Lorem ipsum dolor sit amet, consectetur adipiscing elit."
 msgstr ""
 
-#: src/emu/ui/custui.cpp:509
+#: src/emu/ui/custui.cpp:506
 msgid "Normal text"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:510
+#: src/emu/ui/custui.cpp:507
 msgid "Selected color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:511
+#: src/emu/ui/custui.cpp:508
 msgid "Normal text background"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:512
+#: src/emu/ui/custui.cpp:509
 msgid "Selected background color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:513
+#: src/emu/ui/custui.cpp:510
 msgid "Subitem color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:514 src/emu/ui/custui.cpp:610
+#: src/emu/ui/custui.cpp:511 src/emu/ui/custui.cpp:606
 msgid "Clone"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:515
+#: src/emu/ui/custui.cpp:512
 msgid "Border"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:516
+#: src/emu/ui/custui.cpp:513
 msgid "Background"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:517
+#: src/emu/ui/custui.cpp:514
 msgid "Dipswitch"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:518
+#: src/emu/ui/custui.cpp:515
 msgid "Unavailable color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:519
+#: src/emu/ui/custui.cpp:516
 msgid "Slider color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:520
+#: src/emu/ui/custui.cpp:517
 msgid "Gfx viewer background"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:521
+#: src/emu/ui/custui.cpp:518
 msgid "Mouse over color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:522
+#: src/emu/ui/custui.cpp:519
 msgid "Mouse over background color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:523
+#: src/emu/ui/custui.cpp:520
 msgid "Mouse down color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:524
+#: src/emu/ui/custui.cpp:521
 msgid "Mouse down background color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:527
+#: src/emu/ui/custui.cpp:524
 msgid "Restore originals colors"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:543
+#: src/emu/ui/custui.cpp:540
 msgid "UI Colors Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:572
+#: src/emu/ui/custui.cpp:568
 #, c-format
 msgid "Double click or press %1$s to change the color value"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:598
+#: src/emu/ui/custui.cpp:594
 msgid "Menu Preview"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:606
+#: src/emu/ui/custui.cpp:602
 msgid "Normal"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:607
+#: src/emu/ui/custui.cpp:603
 msgid "Subitem"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:608
+#: src/emu/ui/custui.cpp:604
 msgid "Selected"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:609
+#: src/emu/ui/custui.cpp:605
 msgid "Mouse Over"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:841 src/emu/ui/custui.cpp:844
+#: src/emu/ui/custui.cpp:837 src/emu/ui/custui.cpp:840
 msgid "Alpha"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:849 src/emu/ui/custui.cpp:852
-#: src/emu/ui/custui.cpp:1013
+#: src/emu/ui/custui.cpp:845 src/emu/ui/custui.cpp:848
+#: src/emu/ui/custui.cpp:1007
 msgid "Red"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:857 src/emu/ui/custui.cpp:860
-#: src/emu/ui/custui.cpp:1016
+#: src/emu/ui/custui.cpp:853 src/emu/ui/custui.cpp:856
+#: src/emu/ui/custui.cpp:1010
 msgid "Green"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:865 src/emu/ui/custui.cpp:868
-#: src/emu/ui/custui.cpp:1017
+#: src/emu/ui/custui.cpp:861 src/emu/ui/custui.cpp:864
+#: src/emu/ui/custui.cpp:1011
 msgid "Blue"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:871
+#: src/emu/ui/custui.cpp:867
 msgid "Choose from palette"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:887
+#: src/emu/ui/custui.cpp:883
 msgid " - ARGB Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:912
+#: src/emu/ui/custui.cpp:907
 msgid "Color preview ="
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1009
+#: src/emu/ui/custui.cpp:1003
 msgid "White"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1010
+#: src/emu/ui/custui.cpp:1004
 msgid "Silver"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1011
+#: src/emu/ui/custui.cpp:1005
 msgid "Gray"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1012
+#: src/emu/ui/custui.cpp:1006
 msgid "Black"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1014
+#: src/emu/ui/custui.cpp:1008
 msgid "Orange"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1015
+#: src/emu/ui/custui.cpp:1009
 msgid "Yellow"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1018
+#: src/emu/ui/custui.cpp:1012
 msgid "Violet"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:65
+#: src/emu/ui/datmenu.cpp:64
 msgid "Software History"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:67
+#: src/emu/ui/datmenu.cpp:66
 msgid "Software Usage"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:199
+#: src/emu/ui/datmenu.cpp:196
 msgid "Revision: "
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:287 src/emu/ui/selgame.cpp:40
-#: src/emu/ui/selgame.cpp:2152 src/emu/ui/selgame.cpp:2161
-#: src/emu/ui/selsoft.cpp:1577 src/emu/ui/selsoft.cpp:1597
-#: src/emu/ui/selsoft.cpp:1606
+#: src/emu/ui/datmenu.cpp:284 src/emu/ui/selgame.cpp:39
+#: src/emu/ui/selgame.cpp:2158 src/emu/ui/selgame.cpp:2167
+#: src/emu/ui/selsoft.cpp:1574 src/emu/ui/selsoft.cpp:1592
+#: src/emu/ui/selsoft.cpp:1601
 msgid "History"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:289 src/emu/ui/selgame.cpp:41
+#: src/emu/ui/datmenu.cpp:286 src/emu/ui/selgame.cpp:40
 msgid "Mameinfo"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:291 src/emu/ui/selgame.cpp:43
+#: src/emu/ui/datmenu.cpp:288 src/emu/ui/selgame.cpp:42
 msgid "Messinfo"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:293 src/emu/ui/selgame.cpp:42
+#: src/emu/ui/datmenu.cpp:290 src/emu/ui/selgame.cpp:41
 msgid "Sysinfo"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:295 src/emu/ui/selgame.cpp:46
+#: src/emu/ui/datmenu.cpp:292 src/emu/ui/selgame.cpp:45
 msgid "Mamescore"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:297 src/emu/ui/selgame.cpp:45
+#: src/emu/ui/datmenu.cpp:294 src/emu/ui/selgame.cpp:44
 msgid "Gameinit"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:299 src/emu/ui/selgame.cpp:44
+#: src/emu/ui/datmenu.cpp:296 src/emu/ui/selgame.cpp:43
 msgid "Command"
 msgstr ""
 
@@ -554,75 +554,75 @@ msgstr ""
 msgid "Remove %1$s Folder"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:158
+#: src/emu/ui/filesel.cpp:161
 msgid "File Already Exists - Override?"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:160 src/emu/ui/selgame.cpp:1568
-#: src/emu/ui/selgame.cpp:1569 src/emu/ui/selgame.cpp:1570
-#: src/emu/ui/selgame.cpp:1571 src/emu/ui/selgame.cpp:1572
-#: src/emu/ui/selgame.cpp:1573 src/emu/ui/selgame.cpp:1574
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/filesel.cpp:163 src/emu/ui/selgame.cpp:1576
+#: src/emu/ui/selgame.cpp:1577 src/emu/ui/selgame.cpp:1578
+#: src/emu/ui/selgame.cpp:1579 src/emu/ui/selgame.cpp:1580
+#: src/emu/ui/selgame.cpp:1581 src/emu/ui/selgame.cpp:1582
+#: src/emu/ui/selgame.cpp:1591
 msgid "No"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:161 src/emu/ui/selgame.cpp:1568
-#: src/emu/ui/selgame.cpp:1569 src/emu/ui/selgame.cpp:1570
-#: src/emu/ui/selgame.cpp:1571 src/emu/ui/selgame.cpp:1572
-#: src/emu/ui/selgame.cpp:1573 src/emu/ui/selgame.cpp:1574
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/filesel.cpp:164 src/emu/ui/selgame.cpp:1576
+#: src/emu/ui/selgame.cpp:1577 src/emu/ui/selgame.cpp:1578
+#: src/emu/ui/selgame.cpp:1579 src/emu/ui/selgame.cpp:1580
+#: src/emu/ui/selgame.cpp:1581 src/emu/ui/selgame.cpp:1582
+#: src/emu/ui/selgame.cpp:1591
 msgid "Yes"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:272
+#: src/emu/ui/filesel.cpp:275
 msgid "New Image Name:"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:278
+#: src/emu/ui/filesel.cpp:281
 msgid "Image Format:"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:284
+#: src/emu/ui/filesel.cpp:287
 msgid "Create"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:315
+#: src/emu/ui/filesel.cpp:318
 msgid "Please enter a file extension too"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:503 src/emu/ui/swlist.cpp:65
+#: src/emu/ui/filesel.cpp:506 src/emu/ui/swlist.cpp:65
 msgid "[empty slot]"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:507
+#: src/emu/ui/filesel.cpp:510
 msgid "[create]"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:511 src/emu/ui/swlist.cpp:76
+#: src/emu/ui/filesel.cpp:514 src/emu/ui/swlist.cpp:76
 msgid "[software list]"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:803
+#: src/emu/ui/filesel.cpp:806
 msgid "Select image format"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:863
+#: src/emu/ui/filesel.cpp:866
 msgid "Select access mode"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:864
+#: src/emu/ui/filesel.cpp:867
 msgid "Read-only"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:866
+#: src/emu/ui/filesel.cpp:869
 msgid "Read-write"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:867
+#: src/emu/ui/filesel.cpp:870
 msgid "Read this image, write to another image"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:868
+#: src/emu/ui/filesel.cpp:871
 msgid "Read this image, write to diff"
 msgstr ""
 
@@ -648,7 +648,7 @@ msgstr ""
 msgid "[empty]"
 msgstr ""
 
-#: src/emu/ui/info_pty.cpp:26 src/emu/ui/mainmenu.cpp:91
+#: src/emu/ui/info_pty.cpp:26 src/emu/ui/mainmenu.cpp:96
 msgid "Pseudo terminals"
 msgstr ""
 
@@ -664,7 +664,7 @@ msgstr ""
 msgid "Other Controls"
 msgstr ""
 
-#: src/emu/ui/inputmap.cpp:622 src/emu/ui/miscmenu.cpp:91
+#: src/emu/ui/inputmap.cpp:622 src/emu/ui/miscmenu.cpp:92
 #: src/emu/ui/slotopt.cpp:172
 msgid "Reset"
 msgstr ""
@@ -697,27 +697,27 @@ msgstr ""
 msgid "Machine Information"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:78
+#: src/emu/ui/mainmenu.cpp:80
 msgid "Image Information"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:81
+#: src/emu/ui/mainmenu.cpp:83
 msgid "File Manager"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:86
+#: src/emu/ui/mainmenu.cpp:92
 msgid "Tape Control"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:94
+#: src/emu/ui/mainmenu.cpp:99
 msgid "Bios Selection"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:100
+#: src/emu/ui/mainmenu.cpp:104
 msgid "Slot Devices"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:107
+#: src/emu/ui/mainmenu.cpp:109
 msgid "Barcode Reader"
 msgstr ""
 
@@ -725,43 +725,43 @@ msgstr ""
 msgid "Network Devices"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:119
+#: src/emu/ui/mainmenu.cpp:118
 msgid "Keyboard Mode"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:122
+#: src/emu/ui/mainmenu.cpp:121
 msgid "Slider Controls"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:125
+#: src/emu/ui/mainmenu.cpp:124
 msgid "Video Options"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:129
+#: src/emu/ui/mainmenu.cpp:128
 msgid "Crosshair Options"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:133
+#: src/emu/ui/mainmenu.cpp:132
 msgid "Cheat"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:136
+#: src/emu/ui/mainmenu.cpp:135
 msgid "Plugin Options"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:140
+#: src/emu/ui/mainmenu.cpp:139
 msgid "External DAT View"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:146
+#: src/emu/ui/mainmenu.cpp:145 src/emu/ui/miscmenu.cpp:785
 msgid "Add To Favorites"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:148
+#: src/emu/ui/mainmenu.cpp:147 src/emu/ui/miscmenu.cpp:787
 msgid "Remove From Favorites"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:155
+#: src/emu/ui/mainmenu.cpp:154
 msgid "Select New Machine"
 msgstr ""
 
@@ -801,189 +801,205 @@ msgstr ""
 msgid "Return to Previous Menu"
 msgstr ""
 
-#: src/emu/ui/menu.cpp:716
+#: src/emu/ui/menu.cpp:761
 msgid "Auto"
 msgstr ""
 
-#: src/emu/ui/menu.cpp:2133
+#: src/emu/ui/menu.cpp:2195
 msgid "Images"
 msgstr ""
 
-#: src/emu/ui/menu.cpp:2134
+#: src/emu/ui/menu.cpp:2196
 msgid "Infos"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Keyboard Mode:"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Natural"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Emulated"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:240
+#: src/emu/ui/miscmenu.cpp:241
 #, c-format
 msgid ""
 "Uptime: %1$d:%2$02d:%3$02d\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:242
+#: src/emu/ui/miscmenu.cpp:243
 #, c-format
 msgid ""
 "Uptime: %1$d:%2$02d\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:246
+#: src/emu/ui/miscmenu.cpp:247
 #, c-format
 msgid ""
 "Tickets dispensed: %1$d\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:257
+#: src/emu/ui/miscmenu.cpp:258
 msgid "Coin %1$c: NA%3$s\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:257
+#: src/emu/ui/miscmenu.cpp:258
 #, c-format
 msgid "Coin %1$c: %2$d%3$s\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:260
+#: src/emu/ui/miscmenu.cpp:261
 msgid " (locked)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:519
+#: src/emu/ui/miscmenu.cpp:520
 msgid "Visible Delay"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:617
+#: src/emu/ui/miscmenu.cpp:619
 #, c-format
 msgid "%s.xml saved under ui folder."
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:645
+#: src/emu/ui/miscmenu.cpp:647
 msgid "Name:             Description:\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:657
+#: src/emu/ui/miscmenu.cpp:659
 #, c-format
 msgid "%s.txt saved under ui folder."
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:675
-msgid "Export XML format (like -listxml)"
+#: src/emu/ui/miscmenu.cpp:677
+msgid "Export list in XML format (like -listxml)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:676
-msgid "Export TXT format (like -listfull)"
+#: src/emu/ui/miscmenu.cpp:678
+msgid "Export list in XML format (like -listxml, but exclude devices)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:734
-msgid "Dummy"
+#: src/emu/ui/miscmenu.cpp:679
+msgid "Export list in TXT format (like -listfull)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:736
-msgid "Save machine configuration"
-msgstr ""
-
-#: src/emu/ui/miscmenu.cpp:848 src/emu/ui/miscmenu.cpp:869
-#: src/emu/ui/selgame.cpp:594
-msgid "Plugins"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:218
-msgid "Filter"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:226
-msgid " ^!File"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:231
-msgid " ^!Category"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:254
-msgid "^!Setup custom filter"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:262
-msgid "Customize UI"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:263
-msgid "Configure Directories"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:266 src/emu/ui/sndmenu.cpp:151
-#: src/emu/ui/sndmenu.cpp:172
-msgid "Sound Options"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:269
-msgid "General Inputs"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:272
-msgid "Save Configuration"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:286 src/emu/ui/optsmenu.cpp:307
-msgid "Settings"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:327
-msgid "**Error saving ui.ini**"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:374
-#, c-format
-msgid "**Error saving %s.ini**"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:378
+#: src/emu/ui/miscmenu.cpp:729 src/emu/ui/optsmenu.cpp:376
 msgid ""
 "\n"
 "    Configuration saved    \n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/selector.cpp:166
+#: src/emu/ui/miscmenu.cpp:774
+msgid "Bios"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:776
+msgid "Driver"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:790
+msgid "Save machine configuration"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:806
+msgid "Configure machine:"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:868 src/emu/ui/selsoft.cpp:109
+msgid " (default)"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:953 src/emu/ui/miscmenu.cpp:973
+#: src/emu/ui/selgame.cpp:600
+msgid "Plugins"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:217
+msgid "Filter"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:225
+msgid " ^!File"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:230
+msgid " ^!Category"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:253
+msgid "^!Setup custom filter"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:261
+msgid "Customize UI"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:262
+msgid "Configure Directories"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:265 src/emu/ui/sndmenu.cpp:149
+#: src/emu/ui/sndmenu.cpp:169
+msgid "Sound Options"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:268
+msgid "General Inputs"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:271
+msgid "Save Configuration"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:285 src/emu/ui/optsmenu.cpp:305
+msgid "Settings"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:325
+msgid "**Error saving ui.ini**"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:372
+#, c-format
+msgid "**Error saving %s.ini**"
+msgstr ""
+
+#: src/emu/ui/selector.cpp:165
 msgid "Selection List - Search: "
 msgstr ""
 
-#: src/emu/ui/selector.cpp:196
+#: src/emu/ui/selector.cpp:194
 #, c-format
 msgid "Double click or press %1$s to select"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:39
+#: src/emu/ui/selgame.cpp:38
 msgid "General Info"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:374 src/emu/ui/selsoft.cpp:282
+#: src/emu/ui/selgame.cpp:380 src/emu/ui/selsoft.cpp:281
 #, c-format
 msgid ""
 "%s\n"
 " added to favorites list."
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:380 src/emu/ui/selgame.cpp:389
-#: src/emu/ui/selsoft.cpp:287
+#: src/emu/ui/selgame.cpp:386 src/emu/ui/selgame.cpp:395
+#: src/emu/ui/selsoft.cpp:286
 #, c-format
 msgid ""
 "%s\n"
 " removed from favorites list."
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:450
+#: src/emu/ui/selgame.cpp:457
 msgid ""
 "The selected machine is missing one or more required ROM or CHD images. "
 "Please select a different machine.\n"
@@ -991,275 +1007,275 @@ msgid ""
 "Press any key to continue."
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:589 src/emu/ui/simpleselgame.cpp:265
+#: src/emu/ui/selgame.cpp:595 src/emu/ui/simpleselgame.cpp:265
 msgid "Configure Options"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:752
+#: src/emu/ui/selgame.cpp:596
+msgid "Configure Machine"
+msgstr ""
+
+#: src/emu/ui/selgame.cpp:758
 #, c-format
 msgid "%1$s %2$s ( %3$d / %4$d machines (%5$d BIOS) )"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:762
+#: src/emu/ui/selgame.cpp:768
 #, c-format
 msgid "%1$s (%2$s - %3$s) - "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:769 src/emu/ui/selgame.cpp:775
+#: src/emu/ui/selgame.cpp:775 src/emu/ui/selgame.cpp:781
 #, c-format
 msgid "%1$s (%2$s) - "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:784
+#: src/emu/ui/selgame.cpp:790
 #, c-format
 msgid "%1$s Search: %2$s_"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:838
+#: src/emu/ui/selgame.cpp:844
 #, c-format
 msgid "Romset: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:841 src/emu/ui/selgame.cpp:890
-#: src/emu/ui/selsoft.cpp:751 src/emu/ui/selsoft.cpp:801
+#: src/emu/ui/selgame.cpp:847 src/emu/ui/selgame.cpp:896
+#: src/emu/ui/selsoft.cpp:750 src/emu/ui/selsoft.cpp:800
 #: src/emu/ui/simpleselgame.cpp:328
 #, c-format
 msgid "%1$s, %2$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:847 src/emu/ui/selsoft.cpp:757
+#: src/emu/ui/selgame.cpp:853 src/emu/ui/selsoft.cpp:756
 #, c-format
 msgid "Driver is clone of: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:849 src/emu/ui/selsoft.cpp:759
+#: src/emu/ui/selgame.cpp:855 src/emu/ui/selsoft.cpp:758
 msgid "Driver is parent"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:853 src/emu/ui/selsoft.cpp:763
+#: src/emu/ui/selgame.cpp:859 src/emu/ui/selsoft.cpp:762
 #: src/emu/ui/simpleselgame.cpp:335
 msgid "Overall: NOT WORKING"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:855 src/emu/ui/selsoft.cpp:765
+#: src/emu/ui/selgame.cpp:861 src/emu/ui/selsoft.cpp:764
 #: src/emu/ui/simpleselgame.cpp:337
 msgid "Overall: Unemulated Protection"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:857 src/emu/ui/selsoft.cpp:767
+#: src/emu/ui/selgame.cpp:863 src/emu/ui/selsoft.cpp:766
 #: src/emu/ui/simpleselgame.cpp:339
 msgid "Overall: Working"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:861 src/emu/ui/selsoft.cpp:771
+#: src/emu/ui/selgame.cpp:867 src/emu/ui/selsoft.cpp:770
 msgid "Graphics: Imperfect, "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:863 src/emu/ui/selsoft.cpp:773
+#: src/emu/ui/selgame.cpp:869 src/emu/ui/selsoft.cpp:772
 msgid "Graphics: OK, "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:866 src/emu/ui/selsoft.cpp:776
+#: src/emu/ui/selgame.cpp:872 src/emu/ui/selsoft.cpp:775
 msgid "Sound: Unimplemented"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:868 src/emu/ui/selsoft.cpp:778
+#: src/emu/ui/selgame.cpp:874 src/emu/ui/selsoft.cpp:777
 msgid "Sound: Imperfect"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:870 src/emu/ui/selsoft.cpp:780
+#: src/emu/ui/selgame.cpp:876 src/emu/ui/selsoft.cpp:779
 msgid "Sound: OK"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:887
+#: src/emu/ui/selgame.cpp:893
 #, c-format
 msgid "System: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:894 src/emu/ui/selsoft.cpp:805
+#: src/emu/ui/selgame.cpp:900 src/emu/ui/selsoft.cpp:804
 #, c-format
 msgid "Software is clone of: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:896 src/emu/ui/selsoft.cpp:807
+#: src/emu/ui/selgame.cpp:902 src/emu/ui/selsoft.cpp:806
 msgid "Software is parent"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:901 src/emu/ui/selsoft.cpp:812
+#: src/emu/ui/selgame.cpp:907 src/emu/ui/selsoft.cpp:811
 msgid "Supported: No"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:906 src/emu/ui/selsoft.cpp:817
+#: src/emu/ui/selgame.cpp:912 src/emu/ui/selsoft.cpp:816
 msgid "Supported: Partial"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:911 src/emu/ui/selsoft.cpp:822
+#: src/emu/ui/selgame.cpp:917 src/emu/ui/selsoft.cpp:821
 msgid "Supported: Yes"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:916 src/emu/ui/selsoft.cpp:827
+#: src/emu/ui/selgame.cpp:922 src/emu/ui/selsoft.cpp:826
 #, c-format
 msgid "romset: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:923
+#: src/emu/ui/selgame.cpp:929
 #, c-format
 msgid "%1$s %2$s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1535
+#: src/emu/ui/selgame.cpp:1543
 #, c-format
 msgid "Romset: %1$-.100s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1536
+#: src/emu/ui/selgame.cpp:1544
 #, c-format
 msgid "Year: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1537
+#: src/emu/ui/selgame.cpp:1545
 #, c-format
 msgid "Manufacturer: %1$-.100s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1541
+#: src/emu/ui/selgame.cpp:1549
 #, c-format
 msgid "Driver is Clone of: %1$-.100s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1543
+#: src/emu/ui/selgame.cpp:1551
 msgid "Driver is Parent\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1546
+#: src/emu/ui/selgame.cpp:1554
 msgid "Overall: NOT WORKING\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1548
+#: src/emu/ui/selgame.cpp:1556
 msgid "Overall: Unemulated Protection\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1550
+#: src/emu/ui/selgame.cpp:1558
 msgid "Overall: Working\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1553
+#: src/emu/ui/selgame.cpp:1561
 msgid "Graphics: Imperfect Colors\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1557
+#: src/emu/ui/selgame.cpp:1565
 msgid "Graphics: Imperfect\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1559
+#: src/emu/ui/selgame.cpp:1567
 msgid "Graphics: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1562
+#: src/emu/ui/selgame.cpp:1570
 msgid "Sound: Unimplemented\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1564
+#: src/emu/ui/selgame.cpp:1572
 msgid "Sound: Imperfect\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1566
+#: src/emu/ui/selgame.cpp:1574
 msgid "Sound: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1568
+#: src/emu/ui/selgame.cpp:1576
 #, c-format
 msgid "Driver is Skeleton: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1569
+#: src/emu/ui/selgame.cpp:1577
 #, c-format
 msgid "Game is Mechanical: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1570
+#: src/emu/ui/selgame.cpp:1578
 #, c-format
 msgid "Requires Artwork: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1571
+#: src/emu/ui/selgame.cpp:1579
 #, c-format
 msgid "Requires Clickable Artwork: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1572
+#: src/emu/ui/selgame.cpp:1580
 #, c-format
 msgid "Support Cocktail: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1573
+#: src/emu/ui/selgame.cpp:1581
 #, c-format
 msgid "Driver is Bios: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1574
+#: src/emu/ui/selgame.cpp:1582
 #, c-format
 msgid "Support Save: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 #, c-format
 msgid "Screen Orientation: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 msgid "Vertical"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 msgid "Horizontal"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/selgame.cpp:1591
 #, c-format
 msgid "Requires CHD: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1596
+#: src/emu/ui/selgame.cpp:1604
 msgid "Roms Audit Pass: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1598
+#: src/emu/ui/selgame.cpp:1606
 msgid "Roms Audit Pass: BAD\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1601
+#: src/emu/ui/selgame.cpp:1609
 msgid "Samples Audit Pass: None Needed\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1603
+#: src/emu/ui/selgame.cpp:1611
 msgid "Samples Audit Pass: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1605
+#: src/emu/ui/selgame.cpp:1613
 msgid "Samples Audit Pass: BAD\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1608
+#: src/emu/ui/selgame.cpp:1616
 msgid ""
 "Roms Audit Pass: Disabled\n"
 "Samples Audit Pass: Disabled\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:2049 src/emu/ui/selgame.cpp:2212
-#: src/emu/ui/selsoft.cpp:1662
+#: src/emu/ui/selgame.cpp:2055 src/emu/ui/selgame.cpp:2216
+#: src/emu/ui/selsoft.cpp:1655
 msgid "No Infos Available"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:2162 src/emu/ui/selsoft.cpp:1607
+#: src/emu/ui/selgame.cpp:2168 src/emu/ui/selsoft.cpp:1602
 msgid "Usage"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:110
-msgid " (default)"
-msgstr ""
-
-#: src/emu/ui/selsoft.cpp:381
+#: src/emu/ui/selsoft.cpp:380
 msgid ""
 "The selected software is missing one or more required files. Please select a "
 "different software.\n"
@@ -1267,57 +1283,57 @@ msgid ""
 "Press any key to continue."
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:684
+#: src/emu/ui/selsoft.cpp:683
 #, c-format
-msgid "%1$s %2$s ( %3$d / %4$d softwares )"
+msgid "%1$s %2$s ( %3$d / %4$d software packages )"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:685
+#: src/emu/ui/selsoft.cpp:684
 #, c-format
 msgid "Driver: \"%1$s\" software list "
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:688
+#: src/emu/ui/selsoft.cpp:687
 #, c-format
 msgid "Region: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:690
+#: src/emu/ui/selsoft.cpp:689
 #, c-format
 msgid "Publisher: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:692
+#: src/emu/ui/selsoft.cpp:691
 #, c-format
 msgid "Year: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:694
+#: src/emu/ui/selsoft.cpp:693
 #, c-format
 msgid "Software List: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:696
+#: src/emu/ui/selsoft.cpp:695
 #, c-format
 msgid "Device type: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:698
+#: src/emu/ui/selsoft.cpp:697
 #, c-format
 msgid "%s Search: %s_"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:748 src/emu/ui/selsoft.cpp:798
+#: src/emu/ui/selsoft.cpp:747 src/emu/ui/selsoft.cpp:797
 #: src/emu/ui/simpleselgame.cpp:325
 #, c-format
 msgid "%1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:1998 src/emu/ui/selsoft.cpp:2018
+#: src/emu/ui/selsoft.cpp:1991 src/emu/ui/selsoft.cpp:2011
 msgid "Software part selection:"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:2136 src/emu/ui/selsoft.cpp:2156
+#: src/emu/ui/selsoft.cpp:2129 src/emu/ui/selsoft.cpp:2149
 msgid "Bios selection:"
 msgstr ""
 
@@ -1365,15 +1381,15 @@ msgstr ""
 msgid " [internal]"
 msgstr ""
 
-#: src/emu/ui/sndmenu.cpp:135
+#: src/emu/ui/sndmenu.cpp:133
 msgid "Sound"
 msgstr ""
 
-#: src/emu/ui/sndmenu.cpp:136
+#: src/emu/ui/sndmenu.cpp:134
 msgid "Sample Rate"
 msgstr ""
 
-#: src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/sndmenu.cpp:135
 msgid "Use External Samples"
 msgstr ""
 
@@ -1442,80 +1458,80 @@ msgstr ""
 msgid "Fast Forward"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:419
+#: src/emu/ui/ui.cpp:418
 msgid "This driver requires images to be loaded in the following device(s): "
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1074
+#: src/emu/ui/ui.cpp:1071
 msgid ""
 "One or more ROMs/CHDs for this machine are incorrect. The machine may not "
 "run correctly.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1087
+#: src/emu/ui/ui.cpp:1084
 msgid ""
 "There are known problems with this machine\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1091
+#: src/emu/ui/ui.cpp:1088
 msgid ""
 "One or more ROMs/CHDs for this machine have not been correctly dumped.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1095
+#: src/emu/ui/ui.cpp:1092
 #, c-format
 msgid "The keyboard emulation may not be 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1097
+#: src/emu/ui/ui.cpp:1094
 #, c-format
 msgid "The colors aren't 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1099
+#: src/emu/ui/ui.cpp:1096
 msgid "The colors are completely wrong.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1101
+#: src/emu/ui/ui.cpp:1098
 #, c-format
 msgid "The video emulation isn't 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1103
+#: src/emu/ui/ui.cpp:1100
 #, c-format
 msgid "The sound emulation isn't 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1105
+#: src/emu/ui/ui.cpp:1102
 msgid "The machine lacks sound.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1108
+#: src/emu/ui/ui.cpp:1105
 msgid "Screen flipping in cocktail mode is not supported.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1112
+#: src/emu/ui/ui.cpp:1109
 msgid "The machine requires external artwork files\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1117
+#: src/emu/ui/ui.cpp:1114
 msgid ""
 "This machine was never completed. It may exhibit strange behavior or missing "
 "elements that are not bugs in the emulation.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1122
+#: src/emu/ui/ui.cpp:1119
 msgid ""
 "This machine has no sound hardware, MAME will produce no sounds, this is "
 "expected behaviour.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1130
+#: src/emu/ui/ui.cpp:1127
 msgid "The machine has protection which isn't fully emulated.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1133
+#: src/emu/ui/ui.cpp:1130
 msgid ""
 "\n"
 "THIS MACHINE DOESN'T WORK. The emulation for this machine is not yet "
@@ -1523,7 +1539,7 @@ msgid ""
 "the developers to improve the emulation.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1137
+#: src/emu/ui/ui.cpp:1134
 msgid ""
 "\n"
 "Certain elements of this machine cannot be emulated as it requires actual "
@@ -1531,21 +1547,21 @@ msgid ""
 "to fully play this machine.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1156
+#: src/emu/ui/ui.cpp:1153
 msgid ""
 "\n"
 "\n"
 "There are working clones of this machine: "
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1170
+#: src/emu/ui/ui.cpp:1167
 msgid ""
 "\n"
 "\n"
 "Press any key to continue"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1185
+#: src/emu/ui/ui.cpp:1182
 #, c-format
 msgid ""
 "%1$s\n"
@@ -1555,98 +1571,98 @@ msgid ""
 "CPU:\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1221 src/emu/ui/ui.cpp:1260
+#: src/emu/ui/ui.cpp:1218 src/emu/ui/ui.cpp:1257
 msgid "MHz"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1221 src/emu/ui/ui.cpp:1260
+#: src/emu/ui/ui.cpp:1218 src/emu/ui/ui.cpp:1257
 msgid "kHz"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1235
+#: src/emu/ui/ui.cpp:1232
 msgid ""
 "\n"
 "Sound:\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1264
+#: src/emu/ui/ui.cpp:1261
 msgid ""
 "\n"
 "Video:\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1268
+#: src/emu/ui/ui.cpp:1265
 msgid "None\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1275
+#: src/emu/ui/ui.cpp:1272
 msgid "Vector"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1286
+#: src/emu/ui/ui.cpp:1283
 #, c-format
 msgid "%1$s: %2$s\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1286
+#: src/emu/ui/ui.cpp:1283
 msgid "%2$s\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1541 src/emu/ui/ui.cpp:1551
+#: src/emu/ui/ui.cpp:1538 src/emu/ui/ui.cpp:1548
 msgid "Keyboard Emulation Status"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1543
+#: src/emu/ui/ui.cpp:1540
 msgid "Mode: PARTIAL Emulation"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1544
+#: src/emu/ui/ui.cpp:1541
 msgid "UI:   Enabled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1546 src/emu/ui/ui.cpp:1556
+#: src/emu/ui/ui.cpp:1543 src/emu/ui/ui.cpp:1553
 msgid "**Use ScrLock to toggle**"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1553
+#: src/emu/ui/ui.cpp:1550
 msgid "Mode: FULL Emulation"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1554
+#: src/emu/ui/ui.cpp:1551
 msgid "UI:   Disabled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1692
+#: src/emu/ui/ui.cpp:1689
 msgid "Autofire can't be enabled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1731
+#: src/emu/ui/ui.cpp:1728
 msgid "Select position to save to"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1733
+#: src/emu/ui/ui.cpp:1730
 msgid "Select position to load from"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1757
+#: src/emu/ui/ui.cpp:1754
 msgid "Save cancelled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1759
+#: src/emu/ui/ui.cpp:1756
 msgid "Load cancelled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1802
+#: src/emu/ui/ui.cpp:1799
 #, c-format
 msgid "Save to position %s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1807
+#: src/emu/ui/ui.cpp:1804
 #, c-format
 msgid "Load from position %s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1847
+#: src/emu/ui/ui.cpp:1844
 #, c-format
 msgid ""
 "Are you sure you want to quit?\n"
@@ -1655,173 +1671,173 @@ msgid ""
 "Press ''%2$s'' to return to emulation."
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1917
+#: src/emu/ui/ui.cpp:1914
 msgid "Master Volume"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1926
+#: src/emu/ui/ui.cpp:1923
 #, c-format
 msgid "%1$s Volume"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1949
+#: src/emu/ui/ui.cpp:1946
 #, c-format
 msgid "Overclock CPU %1$s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1968
+#: src/emu/ui/ui.cpp:1965
 #, c-format
 msgid "%1$s Refresh Rate"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1973
+#: src/emu/ui/ui.cpp:1970
 #, c-format
 msgid "%1$s Brightness"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1975
+#: src/emu/ui/ui.cpp:1972
 #, c-format
 msgid "%1$s Contrast"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1977
+#: src/emu/ui/ui.cpp:1974
 #, c-format
 msgid "%1$s Gamma"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1981
+#: src/emu/ui/ui.cpp:1978
 #, c-format
 msgid "%1$s Horiz Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1983
+#: src/emu/ui/ui.cpp:1980
 #, c-format
 msgid "%1$s Horiz Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1985
+#: src/emu/ui/ui.cpp:1982
 #, c-format
 msgid "%1$s Vert Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1987
+#: src/emu/ui/ui.cpp:1984
 #, c-format
 msgid "%1$s Vert Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2005
+#: src/emu/ui/ui.cpp:2002
 #, c-format
 msgid "Laserdisc '%1$s' Horiz Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2007
+#: src/emu/ui/ui.cpp:2004
 #, c-format
 msgid "Laserdisc '%1$s' Horiz Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2009
+#: src/emu/ui/ui.cpp:2006
 #, c-format
 msgid "Laserdisc '%1$s' Vert Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2011
+#: src/emu/ui/ui.cpp:2008
 #, c-format
 msgid "Laserdisc '%1$s' Vert Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2021
+#: src/emu/ui/ui.cpp:2018
 msgid "Vector Flicker"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2022
+#: src/emu/ui/ui.cpp:2019
 msgid "Beam Width Minimum"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2023
+#: src/emu/ui/ui.cpp:2020
 msgid "Beam Width Maximum"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2024
+#: src/emu/ui/ui.cpp:2021
 msgid "Beam Intensity Weight"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2037
+#: src/emu/ui/ui.cpp:2034
 #, c-format
 msgid "Crosshair Scale %1$s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2037 src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2034 src/emu/ui/ui.cpp:2036
 msgid "X"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2037 src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2034 src/emu/ui/ui.cpp:2036
 msgid "Y"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2036
 #, c-format
 msgid "Crosshair Offset %1$s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2071
+#: src/emu/ui/ui.cpp:2068
 #, c-format
 msgid "%1$3ddB"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2115
+#: src/emu/ui/ui.cpp:2112
 #, c-format
 msgid "%1$d%%"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2131
+#: src/emu/ui/ui.cpp:2128
 #, c-format
 msgid "%1$3.0f%%"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2154
+#: src/emu/ui/ui.cpp:2151
 #, c-format
 msgid "%1$.3ffps"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2177 src/emu/ui/ui.cpp:2199 src/emu/ui/ui.cpp:2220
-#: src/emu/ui/ui.cpp:2242 src/emu/ui/ui.cpp:2264 src/emu/ui/ui.cpp:2286
-#: src/emu/ui/ui.cpp:2308 src/emu/ui/ui.cpp:2330 src/emu/ui/ui.cpp:2352
-#: src/emu/ui/ui.cpp:2374 src/emu/ui/ui.cpp:2396
+#: src/emu/ui/ui.cpp:2174 src/emu/ui/ui.cpp:2196 src/emu/ui/ui.cpp:2217
+#: src/emu/ui/ui.cpp:2239 src/emu/ui/ui.cpp:2261 src/emu/ui/ui.cpp:2283
+#: src/emu/ui/ui.cpp:2305 src/emu/ui/ui.cpp:2327 src/emu/ui/ui.cpp:2349
+#: src/emu/ui/ui.cpp:2371 src/emu/ui/ui.cpp:2393
 #, c-format
 msgid "%1$.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2412 src/emu/ui/ui.cpp:2428 src/emu/ui/ui.cpp:2444
-#: src/emu/ui/ui.cpp:2460
+#: src/emu/ui/ui.cpp:2408 src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2438
+#: src/emu/ui/ui.cpp:2453
 #, c-format
 msgid "%1$1.2f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2476
+#: src/emu/ui/ui.cpp:2469
 #, c-format
 msgid "Screen '%1$s'"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2478
+#: src/emu/ui/ui.cpp:2471
 msgid "Screen"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2494
+#: src/emu/ui/ui.cpp:2487
 #, c-format
 msgid "Crosshair Scale X %1$1.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2494
+#: src/emu/ui/ui.cpp:2487
 #, c-format
 msgid "Crosshair Scale Y %1$1.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2513
+#: src/emu/ui/ui.cpp:2506
 #, c-format
 msgid "Crosshair Offset X %1$1.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2513
+#: src/emu/ui/ui.cpp:2506
 #, c-format
 msgid "Crosshair Offset Y %1$1.3f"
 msgstr ""
@@ -1863,10 +1879,10 @@ msgstr ""
 msgid "Full"
 msgstr ""
 
-#: src/emu/ui/viewgfx.cpp:392
+#: src/emu/ui/viewgfx.cpp:391
 msgid " COLORS"
 msgstr ""
 
-#: src/emu/ui/viewgfx.cpp:392
+#: src/emu/ui/viewgfx.cpp:391
 msgid " PENS"
 msgstr ""
diff --git a/language/Polish/strings.po b/language/Polish/strings.po
index a77314ec6d7..bca52e526a1 100644
--- a/language/Polish/strings.po
+++ b/language/Polish/strings.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MAME\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-11 03:33+0200\n"
+"POT-Creation-Date: 2016-04-15 17:42+0200\n"
 "PO-Revision-Date: 2016-02-20 18:03+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: MAME Language Team\n"
@@ -62,14 +62,14 @@ msgstr ""
 msgid "Autofire Status"
 msgstr ""
 
-#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1698
+#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1695
 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211
 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219
 #: src/emu/ui/videoopt.cpp:223
 msgid "Disabled"
 msgstr ""
 
-#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1698
+#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1695
 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211
 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219
 #: src/emu/ui/videoopt.cpp:223
@@ -77,14 +77,14 @@ msgid "Enabled"
 msgstr ""
 
 #: src/emu/ui/cheatopt.cpp:282 src/emu/ui/cheatopt.cpp:288
-#: src/emu/ui/menu.cpp:710 src/emu/ui/miscmenu.cpp:831
-#: src/emu/ui/sndmenu.cpp:135 src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/menu.cpp:755 src/emu/ui/miscmenu.cpp:936
+#: src/emu/ui/sndmenu.cpp:133 src/emu/ui/sndmenu.cpp:135
 msgid "On"
 msgstr ""
 
 #: src/emu/ui/cheatopt.cpp:282 src/emu/ui/cheatopt.cpp:288
-#: src/emu/ui/menu.cpp:713 src/emu/ui/miscmenu.cpp:831
-#: src/emu/ui/sndmenu.cpp:135 src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/menu.cpp:758 src/emu/ui/miscmenu.cpp:936
+#: src/emu/ui/sndmenu.cpp:133 src/emu/ui/sndmenu.cpp:135
 msgid "Off"
 msgstr ""
 
@@ -96,316 +96,316 @@ msgstr ""
 msgid "Autofire Delay"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:158 src/emu/ui/custmenu.cpp:447
+#: src/emu/ui/custmenu.cpp:157 src/emu/ui/custmenu.cpp:445
 msgid "Main filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:167 src/emu/ui/custmenu.cpp:456
+#: src/emu/ui/custmenu.cpp:166 src/emu/ui/custmenu.cpp:454
 msgid "Other filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:176 src/emu/ui/optsmenu.cpp:239
+#: src/emu/ui/custmenu.cpp:175 src/emu/ui/optsmenu.cpp:238
 msgid "^!Manufacturer"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:185 src/emu/ui/custmenu.cpp:474
-#: src/emu/ui/optsmenu.cpp:247
+#: src/emu/ui/custmenu.cpp:184 src/emu/ui/custmenu.cpp:472
+#: src/emu/ui/optsmenu.cpp:246
 msgid "^!Year"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:194 src/emu/ui/custmenu.cpp:510
+#: src/emu/ui/custmenu.cpp:193 src/emu/ui/custmenu.cpp:508
 msgid "Remove last filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:197 src/emu/ui/custmenu.cpp:513
+#: src/emu/ui/custmenu.cpp:196 src/emu/ui/custmenu.cpp:511
 msgid "Add filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:212 src/emu/ui/custmenu.cpp:233
-#: src/emu/ui/custmenu.cpp:529 src/emu/ui/custmenu.cpp:550
+#: src/emu/ui/custmenu.cpp:211 src/emu/ui/custmenu.cpp:231
+#: src/emu/ui/custmenu.cpp:527 src/emu/ui/custmenu.cpp:547
 msgid "Select custom filters:"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:465
+#: src/emu/ui/custmenu.cpp:463
 msgid "^!Publisher"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:483
+#: src/emu/ui/custmenu.cpp:481
 msgid "^!Software List"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:492
+#: src/emu/ui/custmenu.cpp:490
 msgid "^!Device type"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:501
+#: src/emu/ui/custmenu.cpp:499
 msgid "^!Region"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:23
+#: src/emu/ui/custui.cpp:22
 msgid "Show All"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:24
+#: src/emu/ui/custui.cpp:23
 msgid "Hide Filters"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:25
+#: src/emu/ui/custui.cpp:24
 msgid "Hide Info/Image"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:26
+#: src/emu/ui/custui.cpp:25
 msgid "Hide Both"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:142
+#: src/emu/ui/custui.cpp:141
 msgid "Fonts"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:143
+#: src/emu/ui/custui.cpp:142
 msgid "Colors"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:148 src/emu/ui/dirmenu.cpp:33
+#: src/emu/ui/custui.cpp:147 src/emu/ui/dirmenu.cpp:33
 msgid "Language"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:152
+#: src/emu/ui/custui.cpp:151
 msgid "Show side panels"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:167 src/emu/ui/custui.cpp:188
+#: src/emu/ui/custui.cpp:166 src/emu/ui/custui.cpp:186
 msgid "Custom UI Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:246
+#: src/emu/ui/custui.cpp:244
 msgid "default"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:349
+#: src/emu/ui/custui.cpp:347
 msgid "UI Font"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:354
+#: src/emu/ui/custui.cpp:352
 msgid "Bold"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:355
+#: src/emu/ui/custui.cpp:353
 msgid "Italic"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:360
+#: src/emu/ui/custui.cpp:358
 msgid "Lines"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:366
+#: src/emu/ui/custui.cpp:364
 msgid "Infos text size"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:383
+#: src/emu/ui/custui.cpp:381
 msgid "UI Fonts Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:411
+#: src/emu/ui/custui.cpp:408
 msgid "Sample text - Lorem ipsum dolor sit amet, consectetur adipiscing elit."
 msgstr ""
 
-#: src/emu/ui/custui.cpp:509
+#: src/emu/ui/custui.cpp:506
 msgid "Normal text"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:510
+#: src/emu/ui/custui.cpp:507
 msgid "Selected color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:511
+#: src/emu/ui/custui.cpp:508
 msgid "Normal text background"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:512
+#: src/emu/ui/custui.cpp:509
 msgid "Selected background color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:513
+#: src/emu/ui/custui.cpp:510
 msgid "Subitem color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:514 src/emu/ui/custui.cpp:610
+#: src/emu/ui/custui.cpp:511 src/emu/ui/custui.cpp:606
 msgid "Clone"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:515
+#: src/emu/ui/custui.cpp:512
 msgid "Border"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:516
+#: src/emu/ui/custui.cpp:513
 msgid "Background"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:517
+#: src/emu/ui/custui.cpp:514
 msgid "Dipswitch"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:518
+#: src/emu/ui/custui.cpp:515
 msgid "Unavailable color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:519
+#: src/emu/ui/custui.cpp:516
 msgid "Slider color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:520
+#: src/emu/ui/custui.cpp:517
 msgid "Gfx viewer background"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:521
+#: src/emu/ui/custui.cpp:518
 msgid "Mouse over color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:522
+#: src/emu/ui/custui.cpp:519
 msgid "Mouse over background color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:523
+#: src/emu/ui/custui.cpp:520
 msgid "Mouse down color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:524
+#: src/emu/ui/custui.cpp:521
 msgid "Mouse down background color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:527
+#: src/emu/ui/custui.cpp:524
 msgid "Restore originals colors"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:543
+#: src/emu/ui/custui.cpp:540
 msgid "UI Colors Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:572
+#: src/emu/ui/custui.cpp:568
 #, c-format
 msgid "Double click or press %1$s to change the color value"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:598
+#: src/emu/ui/custui.cpp:594
 msgid "Menu Preview"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:606
+#: src/emu/ui/custui.cpp:602
 msgid "Normal"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:607
+#: src/emu/ui/custui.cpp:603
 msgid "Subitem"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:608
+#: src/emu/ui/custui.cpp:604
 msgid "Selected"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:609
+#: src/emu/ui/custui.cpp:605
 msgid "Mouse Over"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:841 src/emu/ui/custui.cpp:844
+#: src/emu/ui/custui.cpp:837 src/emu/ui/custui.cpp:840
 msgid "Alpha"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:849 src/emu/ui/custui.cpp:852
-#: src/emu/ui/custui.cpp:1013
+#: src/emu/ui/custui.cpp:845 src/emu/ui/custui.cpp:848
+#: src/emu/ui/custui.cpp:1007
 msgid "Red"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:857 src/emu/ui/custui.cpp:860
-#: src/emu/ui/custui.cpp:1016
+#: src/emu/ui/custui.cpp:853 src/emu/ui/custui.cpp:856
+#: src/emu/ui/custui.cpp:1010
 msgid "Green"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:865 src/emu/ui/custui.cpp:868
-#: src/emu/ui/custui.cpp:1017
+#: src/emu/ui/custui.cpp:861 src/emu/ui/custui.cpp:864
+#: src/emu/ui/custui.cpp:1011
 msgid "Blue"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:871
+#: src/emu/ui/custui.cpp:867
 msgid "Choose from palette"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:887
+#: src/emu/ui/custui.cpp:883
 msgid " - ARGB Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:912
+#: src/emu/ui/custui.cpp:907
 msgid "Color preview ="
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1009
+#: src/emu/ui/custui.cpp:1003
 msgid "White"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1010
+#: src/emu/ui/custui.cpp:1004
 msgid "Silver"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1011
+#: src/emu/ui/custui.cpp:1005
 msgid "Gray"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1012
+#: src/emu/ui/custui.cpp:1006
 msgid "Black"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1014
+#: src/emu/ui/custui.cpp:1008
 msgid "Orange"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1015
+#: src/emu/ui/custui.cpp:1009
 msgid "Yellow"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1018
+#: src/emu/ui/custui.cpp:1012
 msgid "Violet"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:65
+#: src/emu/ui/datmenu.cpp:64
 msgid "Software History"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:67
+#: src/emu/ui/datmenu.cpp:66
 msgid "Software Usage"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:199
+#: src/emu/ui/datmenu.cpp:196
 msgid "Revision: "
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:287 src/emu/ui/selgame.cpp:40
-#: src/emu/ui/selgame.cpp:2152 src/emu/ui/selgame.cpp:2161
-#: src/emu/ui/selsoft.cpp:1577 src/emu/ui/selsoft.cpp:1597
-#: src/emu/ui/selsoft.cpp:1606
+#: src/emu/ui/datmenu.cpp:284 src/emu/ui/selgame.cpp:39
+#: src/emu/ui/selgame.cpp:2158 src/emu/ui/selgame.cpp:2167
+#: src/emu/ui/selsoft.cpp:1574 src/emu/ui/selsoft.cpp:1592
+#: src/emu/ui/selsoft.cpp:1601
 msgid "History"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:289 src/emu/ui/selgame.cpp:41
+#: src/emu/ui/datmenu.cpp:286 src/emu/ui/selgame.cpp:40
 msgid "Mameinfo"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:291 src/emu/ui/selgame.cpp:43
+#: src/emu/ui/datmenu.cpp:288 src/emu/ui/selgame.cpp:42
 msgid "Messinfo"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:293 src/emu/ui/selgame.cpp:42
+#: src/emu/ui/datmenu.cpp:290 src/emu/ui/selgame.cpp:41
 msgid "Sysinfo"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:295 src/emu/ui/selgame.cpp:46
+#: src/emu/ui/datmenu.cpp:292 src/emu/ui/selgame.cpp:45
 msgid "Mamescore"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:297 src/emu/ui/selgame.cpp:45
+#: src/emu/ui/datmenu.cpp:294 src/emu/ui/selgame.cpp:44
 msgid "Gameinit"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:299 src/emu/ui/selgame.cpp:44
+#: src/emu/ui/datmenu.cpp:296 src/emu/ui/selgame.cpp:43
 msgid "Command"
 msgstr ""
 
@@ -557,75 +557,75 @@ msgstr ""
 msgid "Remove %1$s Folder"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:158
+#: src/emu/ui/filesel.cpp:161
 msgid "File Already Exists - Override?"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:160 src/emu/ui/selgame.cpp:1568
-#: src/emu/ui/selgame.cpp:1569 src/emu/ui/selgame.cpp:1570
-#: src/emu/ui/selgame.cpp:1571 src/emu/ui/selgame.cpp:1572
-#: src/emu/ui/selgame.cpp:1573 src/emu/ui/selgame.cpp:1574
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/filesel.cpp:163 src/emu/ui/selgame.cpp:1576
+#: src/emu/ui/selgame.cpp:1577 src/emu/ui/selgame.cpp:1578
+#: src/emu/ui/selgame.cpp:1579 src/emu/ui/selgame.cpp:1580
+#: src/emu/ui/selgame.cpp:1581 src/emu/ui/selgame.cpp:1582
+#: src/emu/ui/selgame.cpp:1591
 msgid "No"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:161 src/emu/ui/selgame.cpp:1568
-#: src/emu/ui/selgame.cpp:1569 src/emu/ui/selgame.cpp:1570
-#: src/emu/ui/selgame.cpp:1571 src/emu/ui/selgame.cpp:1572
-#: src/emu/ui/selgame.cpp:1573 src/emu/ui/selgame.cpp:1574
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/filesel.cpp:164 src/emu/ui/selgame.cpp:1576
+#: src/emu/ui/selgame.cpp:1577 src/emu/ui/selgame.cpp:1578
+#: src/emu/ui/selgame.cpp:1579 src/emu/ui/selgame.cpp:1580
+#: src/emu/ui/selgame.cpp:1581 src/emu/ui/selgame.cpp:1582
+#: src/emu/ui/selgame.cpp:1591
 msgid "Yes"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:272
+#: src/emu/ui/filesel.cpp:275
 msgid "New Image Name:"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:278
+#: src/emu/ui/filesel.cpp:281
 msgid "Image Format:"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:284
+#: src/emu/ui/filesel.cpp:287
 msgid "Create"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:315
+#: src/emu/ui/filesel.cpp:318
 msgid "Please enter a file extension too"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:503 src/emu/ui/swlist.cpp:65
+#: src/emu/ui/filesel.cpp:506 src/emu/ui/swlist.cpp:65
 msgid "[empty slot]"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:507
+#: src/emu/ui/filesel.cpp:510
 msgid "[create]"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:511 src/emu/ui/swlist.cpp:76
+#: src/emu/ui/filesel.cpp:514 src/emu/ui/swlist.cpp:76
 msgid "[software list]"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:803
+#: src/emu/ui/filesel.cpp:806
 msgid "Select image format"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:863
+#: src/emu/ui/filesel.cpp:866
 msgid "Select access mode"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:864
+#: src/emu/ui/filesel.cpp:867
 msgid "Read-only"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:866
+#: src/emu/ui/filesel.cpp:869
 msgid "Read-write"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:867
+#: src/emu/ui/filesel.cpp:870
 msgid "Read this image, write to another image"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:868
+#: src/emu/ui/filesel.cpp:871
 msgid "Read this image, write to diff"
 msgstr ""
 
@@ -651,7 +651,7 @@ msgstr ""
 msgid "[empty]"
 msgstr ""
 
-#: src/emu/ui/info_pty.cpp:26 src/emu/ui/mainmenu.cpp:91
+#: src/emu/ui/info_pty.cpp:26 src/emu/ui/mainmenu.cpp:96
 msgid "Pseudo terminals"
 msgstr ""
 
@@ -667,7 +667,7 @@ msgstr ""
 msgid "Other Controls"
 msgstr ""
 
-#: src/emu/ui/inputmap.cpp:622 src/emu/ui/miscmenu.cpp:91
+#: src/emu/ui/inputmap.cpp:622 src/emu/ui/miscmenu.cpp:92
 #: src/emu/ui/slotopt.cpp:172
 msgid "Reset"
 msgstr ""
@@ -700,27 +700,27 @@ msgstr ""
 msgid "Machine Information"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:78
+#: src/emu/ui/mainmenu.cpp:80
 msgid "Image Information"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:81
+#: src/emu/ui/mainmenu.cpp:83
 msgid "File Manager"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:86
+#: src/emu/ui/mainmenu.cpp:92
 msgid "Tape Control"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:94
+#: src/emu/ui/mainmenu.cpp:99
 msgid "Bios Selection"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:100
+#: src/emu/ui/mainmenu.cpp:104
 msgid "Slot Devices"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:107
+#: src/emu/ui/mainmenu.cpp:109
 msgid "Barcode Reader"
 msgstr ""
 
@@ -728,43 +728,43 @@ msgstr ""
 msgid "Network Devices"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:119
+#: src/emu/ui/mainmenu.cpp:118
 msgid "Keyboard Mode"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:122
+#: src/emu/ui/mainmenu.cpp:121
 msgid "Slider Controls"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:125
+#: src/emu/ui/mainmenu.cpp:124
 msgid "Video Options"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:129
+#: src/emu/ui/mainmenu.cpp:128
 msgid "Crosshair Options"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:133
+#: src/emu/ui/mainmenu.cpp:132
 msgid "Cheat"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:136
+#: src/emu/ui/mainmenu.cpp:135
 msgid "Plugin Options"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:140
+#: src/emu/ui/mainmenu.cpp:139
 msgid "External DAT View"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:146
+#: src/emu/ui/mainmenu.cpp:145 src/emu/ui/miscmenu.cpp:785
 msgid "Add To Favorites"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:148
+#: src/emu/ui/mainmenu.cpp:147 src/emu/ui/miscmenu.cpp:787
 msgid "Remove From Favorites"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:155
+#: src/emu/ui/mainmenu.cpp:154
 msgid "Select New Machine"
 msgstr ""
 
@@ -804,189 +804,205 @@ msgstr ""
 msgid "Return to Previous Menu"
 msgstr ""
 
-#: src/emu/ui/menu.cpp:716
+#: src/emu/ui/menu.cpp:761
 msgid "Auto"
 msgstr ""
 
-#: src/emu/ui/menu.cpp:2133
+#: src/emu/ui/menu.cpp:2195
 msgid "Images"
 msgstr ""
 
-#: src/emu/ui/menu.cpp:2134
+#: src/emu/ui/menu.cpp:2196
 msgid "Infos"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Keyboard Mode:"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Natural"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Emulated"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:240
+#: src/emu/ui/miscmenu.cpp:241
 #, c-format
 msgid ""
 "Uptime: %1$d:%2$02d:%3$02d\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:242
+#: src/emu/ui/miscmenu.cpp:243
 #, c-format
 msgid ""
 "Uptime: %1$d:%2$02d\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:246
+#: src/emu/ui/miscmenu.cpp:247
 #, c-format
 msgid ""
 "Tickets dispensed: %1$d\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:257
+#: src/emu/ui/miscmenu.cpp:258
 msgid "Coin %1$c: NA%3$s\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:257
+#: src/emu/ui/miscmenu.cpp:258
 #, c-format
 msgid "Coin %1$c: %2$d%3$s\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:260
+#: src/emu/ui/miscmenu.cpp:261
 msgid " (locked)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:519
+#: src/emu/ui/miscmenu.cpp:520
 msgid "Visible Delay"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:617
+#: src/emu/ui/miscmenu.cpp:619
 #, c-format
 msgid "%s.xml saved under ui folder."
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:645
+#: src/emu/ui/miscmenu.cpp:647
 msgid "Name:             Description:\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:657
+#: src/emu/ui/miscmenu.cpp:659
 #, c-format
 msgid "%s.txt saved under ui folder."
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:675
-msgid "Export XML format (like -listxml)"
+#: src/emu/ui/miscmenu.cpp:677
+msgid "Export list in XML format (like -listxml)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:676
-msgid "Export TXT format (like -listfull)"
+#: src/emu/ui/miscmenu.cpp:678
+msgid "Export list in XML format (like -listxml, but exclude devices)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:734
-msgid "Dummy"
+#: src/emu/ui/miscmenu.cpp:679
+msgid "Export list in TXT format (like -listfull)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:736
-msgid "Save machine configuration"
-msgstr ""
-
-#: src/emu/ui/miscmenu.cpp:848 src/emu/ui/miscmenu.cpp:869
-#: src/emu/ui/selgame.cpp:594
-msgid "Plugins"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:218
-msgid "Filter"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:226
-msgid " ^!File"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:231
-msgid " ^!Category"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:254
-msgid "^!Setup custom filter"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:262
-msgid "Customize UI"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:263
-msgid "Configure Directories"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:266 src/emu/ui/sndmenu.cpp:151
-#: src/emu/ui/sndmenu.cpp:172
-msgid "Sound Options"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:269
-msgid "General Inputs"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:272
-msgid "Save Configuration"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:286 src/emu/ui/optsmenu.cpp:307
-msgid "Settings"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:327
-msgid "**Error saving ui.ini**"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:374
-#, c-format
-msgid "**Error saving %s.ini**"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:378
+#: src/emu/ui/miscmenu.cpp:729 src/emu/ui/optsmenu.cpp:376
 msgid ""
 "\n"
 "    Configuration saved    \n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/selector.cpp:166
+#: src/emu/ui/miscmenu.cpp:774
+msgid "Bios"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:776
+msgid "Driver"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:790
+msgid "Save machine configuration"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:806
+msgid "Configure machine:"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:868 src/emu/ui/selsoft.cpp:109
+msgid " (default)"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:953 src/emu/ui/miscmenu.cpp:973
+#: src/emu/ui/selgame.cpp:600
+msgid "Plugins"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:217
+msgid "Filter"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:225
+msgid " ^!File"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:230
+msgid " ^!Category"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:253
+msgid "^!Setup custom filter"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:261
+msgid "Customize UI"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:262
+msgid "Configure Directories"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:265 src/emu/ui/sndmenu.cpp:149
+#: src/emu/ui/sndmenu.cpp:169
+msgid "Sound Options"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:268
+msgid "General Inputs"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:271
+msgid "Save Configuration"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:285 src/emu/ui/optsmenu.cpp:305
+msgid "Settings"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:325
+msgid "**Error saving ui.ini**"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:372
+#, c-format
+msgid "**Error saving %s.ini**"
+msgstr ""
+
+#: src/emu/ui/selector.cpp:165
 msgid "Selection List - Search: "
 msgstr ""
 
-#: src/emu/ui/selector.cpp:196
+#: src/emu/ui/selector.cpp:194
 #, c-format
 msgid "Double click or press %1$s to select"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:39
+#: src/emu/ui/selgame.cpp:38
 msgid "General Info"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:374 src/emu/ui/selsoft.cpp:282
+#: src/emu/ui/selgame.cpp:380 src/emu/ui/selsoft.cpp:281
 #, c-format
 msgid ""
 "%s\n"
 " added to favorites list."
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:380 src/emu/ui/selgame.cpp:389
-#: src/emu/ui/selsoft.cpp:287
+#: src/emu/ui/selgame.cpp:386 src/emu/ui/selgame.cpp:395
+#: src/emu/ui/selsoft.cpp:286
 #, c-format
 msgid ""
 "%s\n"
 " removed from favorites list."
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:450
+#: src/emu/ui/selgame.cpp:457
 msgid ""
 "The selected machine is missing one or more required ROM or CHD images. "
 "Please select a different machine.\n"
@@ -994,275 +1010,275 @@ msgid ""
 "Press any key to continue."
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:589 src/emu/ui/simpleselgame.cpp:265
+#: src/emu/ui/selgame.cpp:595 src/emu/ui/simpleselgame.cpp:265
 msgid "Configure Options"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:752
+#: src/emu/ui/selgame.cpp:596
+msgid "Configure Machine"
+msgstr ""
+
+#: src/emu/ui/selgame.cpp:758
 #, c-format
 msgid "%1$s %2$s ( %3$d / %4$d machines (%5$d BIOS) )"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:762
+#: src/emu/ui/selgame.cpp:768
 #, c-format
 msgid "%1$s (%2$s - %3$s) - "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:769 src/emu/ui/selgame.cpp:775
+#: src/emu/ui/selgame.cpp:775 src/emu/ui/selgame.cpp:781
 #, c-format
 msgid "%1$s (%2$s) - "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:784
+#: src/emu/ui/selgame.cpp:790
 #, c-format
 msgid "%1$s Search: %2$s_"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:838
+#: src/emu/ui/selgame.cpp:844
 #, c-format
 msgid "Romset: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:841 src/emu/ui/selgame.cpp:890
-#: src/emu/ui/selsoft.cpp:751 src/emu/ui/selsoft.cpp:801
+#: src/emu/ui/selgame.cpp:847 src/emu/ui/selgame.cpp:896
+#: src/emu/ui/selsoft.cpp:750 src/emu/ui/selsoft.cpp:800
 #: src/emu/ui/simpleselgame.cpp:328
 #, c-format
 msgid "%1$s, %2$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:847 src/emu/ui/selsoft.cpp:757
+#: src/emu/ui/selgame.cpp:853 src/emu/ui/selsoft.cpp:756
 #, c-format
 msgid "Driver is clone of: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:849 src/emu/ui/selsoft.cpp:759
+#: src/emu/ui/selgame.cpp:855 src/emu/ui/selsoft.cpp:758
 msgid "Driver is parent"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:853 src/emu/ui/selsoft.cpp:763
+#: src/emu/ui/selgame.cpp:859 src/emu/ui/selsoft.cpp:762
 #: src/emu/ui/simpleselgame.cpp:335
 msgid "Overall: NOT WORKING"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:855 src/emu/ui/selsoft.cpp:765
+#: src/emu/ui/selgame.cpp:861 src/emu/ui/selsoft.cpp:764
 #: src/emu/ui/simpleselgame.cpp:337
 msgid "Overall: Unemulated Protection"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:857 src/emu/ui/selsoft.cpp:767
+#: src/emu/ui/selgame.cpp:863 src/emu/ui/selsoft.cpp:766
 #: src/emu/ui/simpleselgame.cpp:339
 msgid "Overall: Working"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:861 src/emu/ui/selsoft.cpp:771
+#: src/emu/ui/selgame.cpp:867 src/emu/ui/selsoft.cpp:770
 msgid "Graphics: Imperfect, "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:863 src/emu/ui/selsoft.cpp:773
+#: src/emu/ui/selgame.cpp:869 src/emu/ui/selsoft.cpp:772
 msgid "Graphics: OK, "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:866 src/emu/ui/selsoft.cpp:776
+#: src/emu/ui/selgame.cpp:872 src/emu/ui/selsoft.cpp:775
 msgid "Sound: Unimplemented"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:868 src/emu/ui/selsoft.cpp:778
+#: src/emu/ui/selgame.cpp:874 src/emu/ui/selsoft.cpp:777
 msgid "Sound: Imperfect"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:870 src/emu/ui/selsoft.cpp:780
+#: src/emu/ui/selgame.cpp:876 src/emu/ui/selsoft.cpp:779
 msgid "Sound: OK"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:887
+#: src/emu/ui/selgame.cpp:893
 #, c-format
 msgid "System: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:894 src/emu/ui/selsoft.cpp:805
+#: src/emu/ui/selgame.cpp:900 src/emu/ui/selsoft.cpp:804
 #, c-format
 msgid "Software is clone of: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:896 src/emu/ui/selsoft.cpp:807
+#: src/emu/ui/selgame.cpp:902 src/emu/ui/selsoft.cpp:806
 msgid "Software is parent"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:901 src/emu/ui/selsoft.cpp:812
+#: src/emu/ui/selgame.cpp:907 src/emu/ui/selsoft.cpp:811
 msgid "Supported: No"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:906 src/emu/ui/selsoft.cpp:817
+#: src/emu/ui/selgame.cpp:912 src/emu/ui/selsoft.cpp:816
 msgid "Supported: Partial"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:911 src/emu/ui/selsoft.cpp:822
+#: src/emu/ui/selgame.cpp:917 src/emu/ui/selsoft.cpp:821
 msgid "Supported: Yes"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:916 src/emu/ui/selsoft.cpp:827
+#: src/emu/ui/selgame.cpp:922 src/emu/ui/selsoft.cpp:826
 #, c-format
 msgid "romset: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:923
+#: src/emu/ui/selgame.cpp:929
 #, c-format
 msgid "%1$s %2$s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1535
+#: src/emu/ui/selgame.cpp:1543
 #, c-format
 msgid "Romset: %1$-.100s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1536
+#: src/emu/ui/selgame.cpp:1544
 #, c-format
 msgid "Year: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1537
+#: src/emu/ui/selgame.cpp:1545
 #, c-format
 msgid "Manufacturer: %1$-.100s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1541
+#: src/emu/ui/selgame.cpp:1549
 #, c-format
 msgid "Driver is Clone of: %1$-.100s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1543
+#: src/emu/ui/selgame.cpp:1551
 msgid "Driver is Parent\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1546
+#: src/emu/ui/selgame.cpp:1554
 msgid "Overall: NOT WORKING\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1548
+#: src/emu/ui/selgame.cpp:1556
 msgid "Overall: Unemulated Protection\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1550
+#: src/emu/ui/selgame.cpp:1558
 msgid "Overall: Working\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1553
+#: src/emu/ui/selgame.cpp:1561
 msgid "Graphics: Imperfect Colors\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1557
+#: src/emu/ui/selgame.cpp:1565
 msgid "Graphics: Imperfect\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1559
+#: src/emu/ui/selgame.cpp:1567
 msgid "Graphics: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1562
+#: src/emu/ui/selgame.cpp:1570
 msgid "Sound: Unimplemented\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1564
+#: src/emu/ui/selgame.cpp:1572
 msgid "Sound: Imperfect\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1566
+#: src/emu/ui/selgame.cpp:1574
 msgid "Sound: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1568
+#: src/emu/ui/selgame.cpp:1576
 #, c-format
 msgid "Driver is Skeleton: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1569
+#: src/emu/ui/selgame.cpp:1577
 #, c-format
 msgid "Game is Mechanical: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1570
+#: src/emu/ui/selgame.cpp:1578
 #, c-format
 msgid "Requires Artwork: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1571
+#: src/emu/ui/selgame.cpp:1579
 #, c-format
 msgid "Requires Clickable Artwork: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1572
+#: src/emu/ui/selgame.cpp:1580
 #, c-format
 msgid "Support Cocktail: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1573
+#: src/emu/ui/selgame.cpp:1581
 #, c-format
 msgid "Driver is Bios: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1574
+#: src/emu/ui/selgame.cpp:1582
 #, c-format
 msgid "Support Save: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 #, c-format
 msgid "Screen Orientation: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 msgid "Vertical"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 msgid "Horizontal"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/selgame.cpp:1591
 #, c-format
 msgid "Requires CHD: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1596
+#: src/emu/ui/selgame.cpp:1604
 msgid "Roms Audit Pass: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1598
+#: src/emu/ui/selgame.cpp:1606
 msgid "Roms Audit Pass: BAD\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1601
+#: src/emu/ui/selgame.cpp:1609
 msgid "Samples Audit Pass: None Needed\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1603
+#: src/emu/ui/selgame.cpp:1611
 msgid "Samples Audit Pass: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1605
+#: src/emu/ui/selgame.cpp:1613
 msgid "Samples Audit Pass: BAD\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1608
+#: src/emu/ui/selgame.cpp:1616
 msgid ""
 "Roms Audit Pass: Disabled\n"
 "Samples Audit Pass: Disabled\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:2049 src/emu/ui/selgame.cpp:2212
-#: src/emu/ui/selsoft.cpp:1662
+#: src/emu/ui/selgame.cpp:2055 src/emu/ui/selgame.cpp:2216
+#: src/emu/ui/selsoft.cpp:1655
 msgid "No Infos Available"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:2162 src/emu/ui/selsoft.cpp:1607
+#: src/emu/ui/selgame.cpp:2168 src/emu/ui/selsoft.cpp:1602
 msgid "Usage"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:110
-msgid " (default)"
-msgstr ""
-
-#: src/emu/ui/selsoft.cpp:381
+#: src/emu/ui/selsoft.cpp:380
 msgid ""
 "The selected software is missing one or more required files. Please select a "
 "different software.\n"
@@ -1270,57 +1286,57 @@ msgid ""
 "Press any key to continue."
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:684
+#: src/emu/ui/selsoft.cpp:683
 #, c-format
-msgid "%1$s %2$s ( %3$d / %4$d softwares )"
+msgid "%1$s %2$s ( %3$d / %4$d software packages )"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:685
+#: src/emu/ui/selsoft.cpp:684
 #, c-format
 msgid "Driver: \"%1$s\" software list "
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:688
+#: src/emu/ui/selsoft.cpp:687
 #, c-format
 msgid "Region: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:690
+#: src/emu/ui/selsoft.cpp:689
 #, c-format
 msgid "Publisher: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:692
+#: src/emu/ui/selsoft.cpp:691
 #, c-format
 msgid "Year: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:694
+#: src/emu/ui/selsoft.cpp:693
 #, c-format
 msgid "Software List: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:696
+#: src/emu/ui/selsoft.cpp:695
 #, c-format
 msgid "Device type: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:698
+#: src/emu/ui/selsoft.cpp:697
 #, c-format
 msgid "%s Search: %s_"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:748 src/emu/ui/selsoft.cpp:798
+#: src/emu/ui/selsoft.cpp:747 src/emu/ui/selsoft.cpp:797
 #: src/emu/ui/simpleselgame.cpp:325
 #, c-format
 msgid "%1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:1998 src/emu/ui/selsoft.cpp:2018
+#: src/emu/ui/selsoft.cpp:1991 src/emu/ui/selsoft.cpp:2011
 msgid "Software part selection:"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:2136 src/emu/ui/selsoft.cpp:2156
+#: src/emu/ui/selsoft.cpp:2129 src/emu/ui/selsoft.cpp:2149
 msgid "Bios selection:"
 msgstr ""
 
@@ -1368,15 +1384,15 @@ msgstr ""
 msgid " [internal]"
 msgstr ""
 
-#: src/emu/ui/sndmenu.cpp:135
+#: src/emu/ui/sndmenu.cpp:133
 msgid "Sound"
 msgstr ""
 
-#: src/emu/ui/sndmenu.cpp:136
+#: src/emu/ui/sndmenu.cpp:134
 msgid "Sample Rate"
 msgstr ""
 
-#: src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/sndmenu.cpp:135
 msgid "Use External Samples"
 msgstr ""
 
@@ -1445,80 +1461,80 @@ msgstr ""
 msgid "Fast Forward"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:419
+#: src/emu/ui/ui.cpp:418
 msgid "This driver requires images to be loaded in the following device(s): "
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1074
+#: src/emu/ui/ui.cpp:1071
 msgid ""
 "One or more ROMs/CHDs for this machine are incorrect. The machine may not "
 "run correctly.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1087
+#: src/emu/ui/ui.cpp:1084
 msgid ""
 "There are known problems with this machine\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1091
+#: src/emu/ui/ui.cpp:1088
 msgid ""
 "One or more ROMs/CHDs for this machine have not been correctly dumped.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1095
+#: src/emu/ui/ui.cpp:1092
 #, c-format
 msgid "The keyboard emulation may not be 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1097
+#: src/emu/ui/ui.cpp:1094
 #, c-format
 msgid "The colors aren't 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1099
+#: src/emu/ui/ui.cpp:1096
 msgid "The colors are completely wrong.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1101
+#: src/emu/ui/ui.cpp:1098
 #, c-format
 msgid "The video emulation isn't 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1103
+#: src/emu/ui/ui.cpp:1100
 #, c-format
 msgid "The sound emulation isn't 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1105
+#: src/emu/ui/ui.cpp:1102
 msgid "The machine lacks sound.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1108
+#: src/emu/ui/ui.cpp:1105
 msgid "Screen flipping in cocktail mode is not supported.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1112
+#: src/emu/ui/ui.cpp:1109
 msgid "The machine requires external artwork files\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1117
+#: src/emu/ui/ui.cpp:1114
 msgid ""
 "This machine was never completed. It may exhibit strange behavior or missing "
 "elements that are not bugs in the emulation.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1122
+#: src/emu/ui/ui.cpp:1119
 msgid ""
 "This machine has no sound hardware, MAME will produce no sounds, this is "
 "expected behaviour.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1130
+#: src/emu/ui/ui.cpp:1127
 msgid "The machine has protection which isn't fully emulated.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1133
+#: src/emu/ui/ui.cpp:1130
 msgid ""
 "\n"
 "THIS MACHINE DOESN'T WORK. The emulation for this machine is not yet "
@@ -1526,7 +1542,7 @@ msgid ""
 "the developers to improve the emulation.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1137
+#: src/emu/ui/ui.cpp:1134
 msgid ""
 "\n"
 "Certain elements of this machine cannot be emulated as it requires actual "
@@ -1534,21 +1550,21 @@ msgid ""
 "to fully play this machine.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1156
+#: src/emu/ui/ui.cpp:1153
 msgid ""
 "\n"
 "\n"
 "There are working clones of this machine: "
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1170
+#: src/emu/ui/ui.cpp:1167
 msgid ""
 "\n"
 "\n"
 "Press any key to continue"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1185
+#: src/emu/ui/ui.cpp:1182
 #, c-format
 msgid ""
 "%1$s\n"
@@ -1558,98 +1574,98 @@ msgid ""
 "CPU:\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1221 src/emu/ui/ui.cpp:1260
+#: src/emu/ui/ui.cpp:1218 src/emu/ui/ui.cpp:1257
 msgid "MHz"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1221 src/emu/ui/ui.cpp:1260
+#: src/emu/ui/ui.cpp:1218 src/emu/ui/ui.cpp:1257
 msgid "kHz"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1235
+#: src/emu/ui/ui.cpp:1232
 msgid ""
 "\n"
 "Sound:\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1264
+#: src/emu/ui/ui.cpp:1261
 msgid ""
 "\n"
 "Video:\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1268
+#: src/emu/ui/ui.cpp:1265
 msgid "None\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1275
+#: src/emu/ui/ui.cpp:1272
 msgid "Vector"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1286
+#: src/emu/ui/ui.cpp:1283
 #, c-format
 msgid "%1$s: %2$s\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1286
+#: src/emu/ui/ui.cpp:1283
 msgid "%2$s\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1541 src/emu/ui/ui.cpp:1551
+#: src/emu/ui/ui.cpp:1538 src/emu/ui/ui.cpp:1548
 msgid "Keyboard Emulation Status"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1543
+#: src/emu/ui/ui.cpp:1540
 msgid "Mode: PARTIAL Emulation"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1544
+#: src/emu/ui/ui.cpp:1541
 msgid "UI:   Enabled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1546 src/emu/ui/ui.cpp:1556
+#: src/emu/ui/ui.cpp:1543 src/emu/ui/ui.cpp:1553
 msgid "**Use ScrLock to toggle**"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1553
+#: src/emu/ui/ui.cpp:1550
 msgid "Mode: FULL Emulation"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1554
+#: src/emu/ui/ui.cpp:1551
 msgid "UI:   Disabled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1692
+#: src/emu/ui/ui.cpp:1689
 msgid "Autofire can't be enabled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1731
+#: src/emu/ui/ui.cpp:1728
 msgid "Select position to save to"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1733
+#: src/emu/ui/ui.cpp:1730
 msgid "Select position to load from"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1757
+#: src/emu/ui/ui.cpp:1754
 msgid "Save cancelled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1759
+#: src/emu/ui/ui.cpp:1756
 msgid "Load cancelled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1802
+#: src/emu/ui/ui.cpp:1799
 #, c-format
 msgid "Save to position %s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1807
+#: src/emu/ui/ui.cpp:1804
 #, c-format
 msgid "Load from position %s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1847
+#: src/emu/ui/ui.cpp:1844
 #, c-format
 msgid ""
 "Are you sure you want to quit?\n"
@@ -1658,173 +1674,173 @@ msgid ""
 "Press ''%2$s'' to return to emulation."
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1917
+#: src/emu/ui/ui.cpp:1914
 msgid "Master Volume"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1926
+#: src/emu/ui/ui.cpp:1923
 #, c-format
 msgid "%1$s Volume"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1949
+#: src/emu/ui/ui.cpp:1946
 #, c-format
 msgid "Overclock CPU %1$s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1968
+#: src/emu/ui/ui.cpp:1965
 #, c-format
 msgid "%1$s Refresh Rate"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1973
+#: src/emu/ui/ui.cpp:1970
 #, c-format
 msgid "%1$s Brightness"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1975
+#: src/emu/ui/ui.cpp:1972
 #, c-format
 msgid "%1$s Contrast"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1977
+#: src/emu/ui/ui.cpp:1974
 #, c-format
 msgid "%1$s Gamma"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1981
+#: src/emu/ui/ui.cpp:1978
 #, c-format
 msgid "%1$s Horiz Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1983
+#: src/emu/ui/ui.cpp:1980
 #, c-format
 msgid "%1$s Horiz Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1985
+#: src/emu/ui/ui.cpp:1982
 #, c-format
 msgid "%1$s Vert Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1987
+#: src/emu/ui/ui.cpp:1984
 #, c-format
 msgid "%1$s Vert Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2005
+#: src/emu/ui/ui.cpp:2002
 #, c-format
 msgid "Laserdisc '%1$s' Horiz Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2007
+#: src/emu/ui/ui.cpp:2004
 #, c-format
 msgid "Laserdisc '%1$s' Horiz Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2009
+#: src/emu/ui/ui.cpp:2006
 #, c-format
 msgid "Laserdisc '%1$s' Vert Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2011
+#: src/emu/ui/ui.cpp:2008
 #, c-format
 msgid "Laserdisc '%1$s' Vert Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2021
+#: src/emu/ui/ui.cpp:2018
 msgid "Vector Flicker"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2022
+#: src/emu/ui/ui.cpp:2019
 msgid "Beam Width Minimum"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2023
+#: src/emu/ui/ui.cpp:2020
 msgid "Beam Width Maximum"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2024
+#: src/emu/ui/ui.cpp:2021
 msgid "Beam Intensity Weight"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2037
+#: src/emu/ui/ui.cpp:2034
 #, c-format
 msgid "Crosshair Scale %1$s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2037 src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2034 src/emu/ui/ui.cpp:2036
 msgid "X"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2037 src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2034 src/emu/ui/ui.cpp:2036
 msgid "Y"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2036
 #, c-format
 msgid "Crosshair Offset %1$s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2071
+#: src/emu/ui/ui.cpp:2068
 #, c-format
 msgid "%1$3ddB"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2115
+#: src/emu/ui/ui.cpp:2112
 #, c-format
 msgid "%1$d%%"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2131
+#: src/emu/ui/ui.cpp:2128
 #, c-format
 msgid "%1$3.0f%%"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2154
+#: src/emu/ui/ui.cpp:2151
 #, c-format
 msgid "%1$.3ffps"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2177 src/emu/ui/ui.cpp:2199 src/emu/ui/ui.cpp:2220
-#: src/emu/ui/ui.cpp:2242 src/emu/ui/ui.cpp:2264 src/emu/ui/ui.cpp:2286
-#: src/emu/ui/ui.cpp:2308 src/emu/ui/ui.cpp:2330 src/emu/ui/ui.cpp:2352
-#: src/emu/ui/ui.cpp:2374 src/emu/ui/ui.cpp:2396
+#: src/emu/ui/ui.cpp:2174 src/emu/ui/ui.cpp:2196 src/emu/ui/ui.cpp:2217
+#: src/emu/ui/ui.cpp:2239 src/emu/ui/ui.cpp:2261 src/emu/ui/ui.cpp:2283
+#: src/emu/ui/ui.cpp:2305 src/emu/ui/ui.cpp:2327 src/emu/ui/ui.cpp:2349
+#: src/emu/ui/ui.cpp:2371 src/emu/ui/ui.cpp:2393
 #, c-format
 msgid "%1$.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2412 src/emu/ui/ui.cpp:2428 src/emu/ui/ui.cpp:2444
-#: src/emu/ui/ui.cpp:2460
+#: src/emu/ui/ui.cpp:2408 src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2438
+#: src/emu/ui/ui.cpp:2453
 #, c-format
 msgid "%1$1.2f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2476
+#: src/emu/ui/ui.cpp:2469
 #, c-format
 msgid "Screen '%1$s'"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2478
+#: src/emu/ui/ui.cpp:2471
 msgid "Screen"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2494
+#: src/emu/ui/ui.cpp:2487
 #, c-format
 msgid "Crosshair Scale X %1$1.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2494
+#: src/emu/ui/ui.cpp:2487
 #, c-format
 msgid "Crosshair Scale Y %1$1.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2513
+#: src/emu/ui/ui.cpp:2506
 #, c-format
 msgid "Crosshair Offset X %1$1.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2513
+#: src/emu/ui/ui.cpp:2506
 #, c-format
 msgid "Crosshair Offset Y %1$1.3f"
 msgstr ""
@@ -1866,10 +1882,10 @@ msgstr ""
 msgid "Full"
 msgstr ""
 
-#: src/emu/ui/viewgfx.cpp:392
+#: src/emu/ui/viewgfx.cpp:391
 msgid " COLORS"
 msgstr ""
 
-#: src/emu/ui/viewgfx.cpp:392
+#: src/emu/ui/viewgfx.cpp:391
 msgid " PENS"
 msgstr ""
diff --git a/language/Portuguese/strings.po b/language/Portuguese/strings.po
index e23528b295e..61004bafa6d 100644
--- a/language/Portuguese/strings.po
+++ b/language/Portuguese/strings.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MAME\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-11 03:33+0200\n"
+"POT-Creation-Date: 2016-04-15 17:42+0200\n"
 "PO-Revision-Date: 2016-02-20 18:03+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: MAME Language Team\n"
@@ -60,14 +60,14 @@ msgstr ""
 msgid "Autofire Status"
 msgstr ""
 
-#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1698
+#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1695
 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211
 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219
 #: src/emu/ui/videoopt.cpp:223
 msgid "Disabled"
 msgstr ""
 
-#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1698
+#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1695
 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211
 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219
 #: src/emu/ui/videoopt.cpp:223
@@ -75,14 +75,14 @@ msgid "Enabled"
 msgstr ""
 
 #: src/emu/ui/cheatopt.cpp:282 src/emu/ui/cheatopt.cpp:288
-#: src/emu/ui/menu.cpp:710 src/emu/ui/miscmenu.cpp:831
-#: src/emu/ui/sndmenu.cpp:135 src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/menu.cpp:755 src/emu/ui/miscmenu.cpp:936
+#: src/emu/ui/sndmenu.cpp:133 src/emu/ui/sndmenu.cpp:135
 msgid "On"
 msgstr ""
 
 #: src/emu/ui/cheatopt.cpp:282 src/emu/ui/cheatopt.cpp:288
-#: src/emu/ui/menu.cpp:713 src/emu/ui/miscmenu.cpp:831
-#: src/emu/ui/sndmenu.cpp:135 src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/menu.cpp:758 src/emu/ui/miscmenu.cpp:936
+#: src/emu/ui/sndmenu.cpp:133 src/emu/ui/sndmenu.cpp:135
 msgid "Off"
 msgstr ""
 
@@ -94,316 +94,316 @@ msgstr ""
 msgid "Autofire Delay"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:158 src/emu/ui/custmenu.cpp:447
+#: src/emu/ui/custmenu.cpp:157 src/emu/ui/custmenu.cpp:445
 msgid "Main filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:167 src/emu/ui/custmenu.cpp:456
+#: src/emu/ui/custmenu.cpp:166 src/emu/ui/custmenu.cpp:454
 msgid "Other filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:176 src/emu/ui/optsmenu.cpp:239
+#: src/emu/ui/custmenu.cpp:175 src/emu/ui/optsmenu.cpp:238
 msgid "^!Manufacturer"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:185 src/emu/ui/custmenu.cpp:474
-#: src/emu/ui/optsmenu.cpp:247
+#: src/emu/ui/custmenu.cpp:184 src/emu/ui/custmenu.cpp:472
+#: src/emu/ui/optsmenu.cpp:246
 msgid "^!Year"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:194 src/emu/ui/custmenu.cpp:510
+#: src/emu/ui/custmenu.cpp:193 src/emu/ui/custmenu.cpp:508
 msgid "Remove last filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:197 src/emu/ui/custmenu.cpp:513
+#: src/emu/ui/custmenu.cpp:196 src/emu/ui/custmenu.cpp:511
 msgid "Add filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:212 src/emu/ui/custmenu.cpp:233
-#: src/emu/ui/custmenu.cpp:529 src/emu/ui/custmenu.cpp:550
+#: src/emu/ui/custmenu.cpp:211 src/emu/ui/custmenu.cpp:231
+#: src/emu/ui/custmenu.cpp:527 src/emu/ui/custmenu.cpp:547
 msgid "Select custom filters:"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:465
+#: src/emu/ui/custmenu.cpp:463
 msgid "^!Publisher"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:483
+#: src/emu/ui/custmenu.cpp:481
 msgid "^!Software List"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:492
+#: src/emu/ui/custmenu.cpp:490
 msgid "^!Device type"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:501
+#: src/emu/ui/custmenu.cpp:499
 msgid "^!Region"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:23
+#: src/emu/ui/custui.cpp:22
 msgid "Show All"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:24
+#: src/emu/ui/custui.cpp:23
 msgid "Hide Filters"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:25
+#: src/emu/ui/custui.cpp:24
 msgid "Hide Info/Image"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:26
+#: src/emu/ui/custui.cpp:25
 msgid "Hide Both"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:142
+#: src/emu/ui/custui.cpp:141
 msgid "Fonts"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:143
+#: src/emu/ui/custui.cpp:142
 msgid "Colors"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:148 src/emu/ui/dirmenu.cpp:33
+#: src/emu/ui/custui.cpp:147 src/emu/ui/dirmenu.cpp:33
 msgid "Language"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:152
+#: src/emu/ui/custui.cpp:151
 msgid "Show side panels"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:167 src/emu/ui/custui.cpp:188
+#: src/emu/ui/custui.cpp:166 src/emu/ui/custui.cpp:186
 msgid "Custom UI Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:246
+#: src/emu/ui/custui.cpp:244
 msgid "default"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:349
+#: src/emu/ui/custui.cpp:347
 msgid "UI Font"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:354
+#: src/emu/ui/custui.cpp:352
 msgid "Bold"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:355
+#: src/emu/ui/custui.cpp:353
 msgid "Italic"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:360
+#: src/emu/ui/custui.cpp:358
 msgid "Lines"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:366
+#: src/emu/ui/custui.cpp:364
 msgid "Infos text size"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:383
+#: src/emu/ui/custui.cpp:381
 msgid "UI Fonts Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:411
+#: src/emu/ui/custui.cpp:408
 msgid "Sample text - Lorem ipsum dolor sit amet, consectetur adipiscing elit."
 msgstr ""
 
-#: src/emu/ui/custui.cpp:509
+#: src/emu/ui/custui.cpp:506
 msgid "Normal text"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:510
+#: src/emu/ui/custui.cpp:507
 msgid "Selected color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:511
+#: src/emu/ui/custui.cpp:508
 msgid "Normal text background"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:512
+#: src/emu/ui/custui.cpp:509
 msgid "Selected background color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:513
+#: src/emu/ui/custui.cpp:510
 msgid "Subitem color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:514 src/emu/ui/custui.cpp:610
+#: src/emu/ui/custui.cpp:511 src/emu/ui/custui.cpp:606
 msgid "Clone"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:515
+#: src/emu/ui/custui.cpp:512
 msgid "Border"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:516
+#: src/emu/ui/custui.cpp:513
 msgid "Background"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:517
+#: src/emu/ui/custui.cpp:514
 msgid "Dipswitch"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:518
+#: src/emu/ui/custui.cpp:515
 msgid "Unavailable color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:519
+#: src/emu/ui/custui.cpp:516
 msgid "Slider color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:520
+#: src/emu/ui/custui.cpp:517
 msgid "Gfx viewer background"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:521
+#: src/emu/ui/custui.cpp:518
 msgid "Mouse over color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:522
+#: src/emu/ui/custui.cpp:519
 msgid "Mouse over background color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:523
+#: src/emu/ui/custui.cpp:520
 msgid "Mouse down color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:524
+#: src/emu/ui/custui.cpp:521
 msgid "Mouse down background color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:527
+#: src/emu/ui/custui.cpp:524
 msgid "Restore originals colors"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:543
+#: src/emu/ui/custui.cpp:540
 msgid "UI Colors Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:572
+#: src/emu/ui/custui.cpp:568
 #, c-format
 msgid "Double click or press %1$s to change the color value"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:598
+#: src/emu/ui/custui.cpp:594
 msgid "Menu Preview"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:606
+#: src/emu/ui/custui.cpp:602
 msgid "Normal"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:607
+#: src/emu/ui/custui.cpp:603
 msgid "Subitem"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:608
+#: src/emu/ui/custui.cpp:604
 msgid "Selected"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:609
+#: src/emu/ui/custui.cpp:605
 msgid "Mouse Over"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:841 src/emu/ui/custui.cpp:844
+#: src/emu/ui/custui.cpp:837 src/emu/ui/custui.cpp:840
 msgid "Alpha"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:849 src/emu/ui/custui.cpp:852
-#: src/emu/ui/custui.cpp:1013
+#: src/emu/ui/custui.cpp:845 src/emu/ui/custui.cpp:848
+#: src/emu/ui/custui.cpp:1007
 msgid "Red"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:857 src/emu/ui/custui.cpp:860
-#: src/emu/ui/custui.cpp:1016
+#: src/emu/ui/custui.cpp:853 src/emu/ui/custui.cpp:856
+#: src/emu/ui/custui.cpp:1010
 msgid "Green"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:865 src/emu/ui/custui.cpp:868
-#: src/emu/ui/custui.cpp:1017
+#: src/emu/ui/custui.cpp:861 src/emu/ui/custui.cpp:864
+#: src/emu/ui/custui.cpp:1011
 msgid "Blue"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:871
+#: src/emu/ui/custui.cpp:867
 msgid "Choose from palette"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:887
+#: src/emu/ui/custui.cpp:883
 msgid " - ARGB Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:912
+#: src/emu/ui/custui.cpp:907
 msgid "Color preview ="
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1009
+#: src/emu/ui/custui.cpp:1003
 msgid "White"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1010
+#: src/emu/ui/custui.cpp:1004
 msgid "Silver"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1011
+#: src/emu/ui/custui.cpp:1005
 msgid "Gray"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1012
+#: src/emu/ui/custui.cpp:1006
 msgid "Black"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1014
+#: src/emu/ui/custui.cpp:1008
 msgid "Orange"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1015
+#: src/emu/ui/custui.cpp:1009
 msgid "Yellow"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1018
+#: src/emu/ui/custui.cpp:1012
 msgid "Violet"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:65
+#: src/emu/ui/datmenu.cpp:64
 msgid "Software History"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:67
+#: src/emu/ui/datmenu.cpp:66
 msgid "Software Usage"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:199
+#: src/emu/ui/datmenu.cpp:196
 msgid "Revision: "
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:287 src/emu/ui/selgame.cpp:40
-#: src/emu/ui/selgame.cpp:2152 src/emu/ui/selgame.cpp:2161
-#: src/emu/ui/selsoft.cpp:1577 src/emu/ui/selsoft.cpp:1597
-#: src/emu/ui/selsoft.cpp:1606
+#: src/emu/ui/datmenu.cpp:284 src/emu/ui/selgame.cpp:39
+#: src/emu/ui/selgame.cpp:2158 src/emu/ui/selgame.cpp:2167
+#: src/emu/ui/selsoft.cpp:1574 src/emu/ui/selsoft.cpp:1592
+#: src/emu/ui/selsoft.cpp:1601
 msgid "History"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:289 src/emu/ui/selgame.cpp:41
+#: src/emu/ui/datmenu.cpp:286 src/emu/ui/selgame.cpp:40
 msgid "Mameinfo"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:291 src/emu/ui/selgame.cpp:43
+#: src/emu/ui/datmenu.cpp:288 src/emu/ui/selgame.cpp:42
 msgid "Messinfo"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:293 src/emu/ui/selgame.cpp:42
+#: src/emu/ui/datmenu.cpp:290 src/emu/ui/selgame.cpp:41
 msgid "Sysinfo"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:295 src/emu/ui/selgame.cpp:46
+#: src/emu/ui/datmenu.cpp:292 src/emu/ui/selgame.cpp:45
 msgid "Mamescore"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:297 src/emu/ui/selgame.cpp:45
+#: src/emu/ui/datmenu.cpp:294 src/emu/ui/selgame.cpp:44
 msgid "Gameinit"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:299 src/emu/ui/selgame.cpp:44
+#: src/emu/ui/datmenu.cpp:296 src/emu/ui/selgame.cpp:43
 msgid "Command"
 msgstr ""
 
@@ -555,75 +555,75 @@ msgstr ""
 msgid "Remove %1$s Folder"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:158
+#: src/emu/ui/filesel.cpp:161
 msgid "File Already Exists - Override?"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:160 src/emu/ui/selgame.cpp:1568
-#: src/emu/ui/selgame.cpp:1569 src/emu/ui/selgame.cpp:1570
-#: src/emu/ui/selgame.cpp:1571 src/emu/ui/selgame.cpp:1572
-#: src/emu/ui/selgame.cpp:1573 src/emu/ui/selgame.cpp:1574
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/filesel.cpp:163 src/emu/ui/selgame.cpp:1576
+#: src/emu/ui/selgame.cpp:1577 src/emu/ui/selgame.cpp:1578
+#: src/emu/ui/selgame.cpp:1579 src/emu/ui/selgame.cpp:1580
+#: src/emu/ui/selgame.cpp:1581 src/emu/ui/selgame.cpp:1582
+#: src/emu/ui/selgame.cpp:1591
 msgid "No"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:161 src/emu/ui/selgame.cpp:1568
-#: src/emu/ui/selgame.cpp:1569 src/emu/ui/selgame.cpp:1570
-#: src/emu/ui/selgame.cpp:1571 src/emu/ui/selgame.cpp:1572
-#: src/emu/ui/selgame.cpp:1573 src/emu/ui/selgame.cpp:1574
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/filesel.cpp:164 src/emu/ui/selgame.cpp:1576
+#: src/emu/ui/selgame.cpp:1577 src/emu/ui/selgame.cpp:1578
+#: src/emu/ui/selgame.cpp:1579 src/emu/ui/selgame.cpp:1580
+#: src/emu/ui/selgame.cpp:1581 src/emu/ui/selgame.cpp:1582
+#: src/emu/ui/selgame.cpp:1591
 msgid "Yes"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:272
+#: src/emu/ui/filesel.cpp:275
 msgid "New Image Name:"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:278
+#: src/emu/ui/filesel.cpp:281
 msgid "Image Format:"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:284
+#: src/emu/ui/filesel.cpp:287
 msgid "Create"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:315
+#: src/emu/ui/filesel.cpp:318
 msgid "Please enter a file extension too"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:503 src/emu/ui/swlist.cpp:65
+#: src/emu/ui/filesel.cpp:506 src/emu/ui/swlist.cpp:65
 msgid "[empty slot]"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:507
+#: src/emu/ui/filesel.cpp:510
 msgid "[create]"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:511 src/emu/ui/swlist.cpp:76
+#: src/emu/ui/filesel.cpp:514 src/emu/ui/swlist.cpp:76
 msgid "[software list]"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:803
+#: src/emu/ui/filesel.cpp:806
 msgid "Select image format"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:863
+#: src/emu/ui/filesel.cpp:866
 msgid "Select access mode"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:864
+#: src/emu/ui/filesel.cpp:867
 msgid "Read-only"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:866
+#: src/emu/ui/filesel.cpp:869
 msgid "Read-write"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:867
+#: src/emu/ui/filesel.cpp:870
 msgid "Read this image, write to another image"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:868
+#: src/emu/ui/filesel.cpp:871
 msgid "Read this image, write to diff"
 msgstr ""
 
@@ -649,7 +649,7 @@ msgstr ""
 msgid "[empty]"
 msgstr ""
 
-#: src/emu/ui/info_pty.cpp:26 src/emu/ui/mainmenu.cpp:91
+#: src/emu/ui/info_pty.cpp:26 src/emu/ui/mainmenu.cpp:96
 msgid "Pseudo terminals"
 msgstr ""
 
@@ -665,7 +665,7 @@ msgstr ""
 msgid "Other Controls"
 msgstr ""
 
-#: src/emu/ui/inputmap.cpp:622 src/emu/ui/miscmenu.cpp:91
+#: src/emu/ui/inputmap.cpp:622 src/emu/ui/miscmenu.cpp:92
 #: src/emu/ui/slotopt.cpp:172
 msgid "Reset"
 msgstr ""
@@ -698,27 +698,27 @@ msgstr ""
 msgid "Machine Information"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:78
+#: src/emu/ui/mainmenu.cpp:80
 msgid "Image Information"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:81
+#: src/emu/ui/mainmenu.cpp:83
 msgid "File Manager"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:86
+#: src/emu/ui/mainmenu.cpp:92
 msgid "Tape Control"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:94
+#: src/emu/ui/mainmenu.cpp:99
 msgid "Bios Selection"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:100
+#: src/emu/ui/mainmenu.cpp:104
 msgid "Slot Devices"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:107
+#: src/emu/ui/mainmenu.cpp:109
 msgid "Barcode Reader"
 msgstr ""
 
@@ -726,43 +726,43 @@ msgstr ""
 msgid "Network Devices"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:119
+#: src/emu/ui/mainmenu.cpp:118
 msgid "Keyboard Mode"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:122
+#: src/emu/ui/mainmenu.cpp:121
 msgid "Slider Controls"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:125
+#: src/emu/ui/mainmenu.cpp:124
 msgid "Video Options"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:129
+#: src/emu/ui/mainmenu.cpp:128
 msgid "Crosshair Options"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:133
+#: src/emu/ui/mainmenu.cpp:132
 msgid "Cheat"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:136
+#: src/emu/ui/mainmenu.cpp:135
 msgid "Plugin Options"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:140
+#: src/emu/ui/mainmenu.cpp:139
 msgid "External DAT View"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:146
+#: src/emu/ui/mainmenu.cpp:145 src/emu/ui/miscmenu.cpp:785
 msgid "Add To Favorites"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:148
+#: src/emu/ui/mainmenu.cpp:147 src/emu/ui/miscmenu.cpp:787
 msgid "Remove From Favorites"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:155
+#: src/emu/ui/mainmenu.cpp:154
 msgid "Select New Machine"
 msgstr ""
 
@@ -802,189 +802,205 @@ msgstr ""
 msgid "Return to Previous Menu"
 msgstr ""
 
-#: src/emu/ui/menu.cpp:716
+#: src/emu/ui/menu.cpp:761
 msgid "Auto"
 msgstr ""
 
-#: src/emu/ui/menu.cpp:2133
+#: src/emu/ui/menu.cpp:2195
 msgid "Images"
 msgstr ""
 
-#: src/emu/ui/menu.cpp:2134
+#: src/emu/ui/menu.cpp:2196
 msgid "Infos"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Keyboard Mode:"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Natural"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Emulated"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:240
+#: src/emu/ui/miscmenu.cpp:241
 #, c-format
 msgid ""
 "Uptime: %1$d:%2$02d:%3$02d\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:242
+#: src/emu/ui/miscmenu.cpp:243
 #, c-format
 msgid ""
 "Uptime: %1$d:%2$02d\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:246
+#: src/emu/ui/miscmenu.cpp:247
 #, c-format
 msgid ""
 "Tickets dispensed: %1$d\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:257
+#: src/emu/ui/miscmenu.cpp:258
 msgid "Coin %1$c: NA%3$s\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:257
+#: src/emu/ui/miscmenu.cpp:258
 #, c-format
 msgid "Coin %1$c: %2$d%3$s\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:260
+#: src/emu/ui/miscmenu.cpp:261
 msgid " (locked)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:519
+#: src/emu/ui/miscmenu.cpp:520
 msgid "Visible Delay"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:617
+#: src/emu/ui/miscmenu.cpp:619
 #, c-format
 msgid "%s.xml saved under ui folder."
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:645
+#: src/emu/ui/miscmenu.cpp:647
 msgid "Name:             Description:\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:657
+#: src/emu/ui/miscmenu.cpp:659
 #, c-format
 msgid "%s.txt saved under ui folder."
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:675
-msgid "Export XML format (like -listxml)"
+#: src/emu/ui/miscmenu.cpp:677
+msgid "Export list in XML format (like -listxml)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:676
-msgid "Export TXT format (like -listfull)"
+#: src/emu/ui/miscmenu.cpp:678
+msgid "Export list in XML format (like -listxml, but exclude devices)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:734
-msgid "Dummy"
+#: src/emu/ui/miscmenu.cpp:679
+msgid "Export list in TXT format (like -listfull)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:736
-msgid "Save machine configuration"
-msgstr ""
-
-#: src/emu/ui/miscmenu.cpp:848 src/emu/ui/miscmenu.cpp:869
-#: src/emu/ui/selgame.cpp:594
-msgid "Plugins"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:218
-msgid "Filter"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:226
-msgid " ^!File"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:231
-msgid " ^!Category"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:254
-msgid "^!Setup custom filter"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:262
-msgid "Customize UI"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:263
-msgid "Configure Directories"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:266 src/emu/ui/sndmenu.cpp:151
-#: src/emu/ui/sndmenu.cpp:172
-msgid "Sound Options"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:269
-msgid "General Inputs"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:272
-msgid "Save Configuration"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:286 src/emu/ui/optsmenu.cpp:307
-msgid "Settings"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:327
-msgid "**Error saving ui.ini**"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:374
-#, c-format
-msgid "**Error saving %s.ini**"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:378
+#: src/emu/ui/miscmenu.cpp:729 src/emu/ui/optsmenu.cpp:376
 msgid ""
 "\n"
 "    Configuration saved    \n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/selector.cpp:166
+#: src/emu/ui/miscmenu.cpp:774
+msgid "Bios"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:776
+msgid "Driver"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:790
+msgid "Save machine configuration"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:806
+msgid "Configure machine:"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:868 src/emu/ui/selsoft.cpp:109
+msgid " (default)"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:953 src/emu/ui/miscmenu.cpp:973
+#: src/emu/ui/selgame.cpp:600
+msgid "Plugins"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:217
+msgid "Filter"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:225
+msgid " ^!File"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:230
+msgid " ^!Category"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:253
+msgid "^!Setup custom filter"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:261
+msgid "Customize UI"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:262
+msgid "Configure Directories"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:265 src/emu/ui/sndmenu.cpp:149
+#: src/emu/ui/sndmenu.cpp:169
+msgid "Sound Options"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:268
+msgid "General Inputs"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:271
+msgid "Save Configuration"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:285 src/emu/ui/optsmenu.cpp:305
+msgid "Settings"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:325
+msgid "**Error saving ui.ini**"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:372
+#, c-format
+msgid "**Error saving %s.ini**"
+msgstr ""
+
+#: src/emu/ui/selector.cpp:165
 msgid "Selection List - Search: "
 msgstr ""
 
-#: src/emu/ui/selector.cpp:196
+#: src/emu/ui/selector.cpp:194
 #, c-format
 msgid "Double click or press %1$s to select"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:39
+#: src/emu/ui/selgame.cpp:38
 msgid "General Info"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:374 src/emu/ui/selsoft.cpp:282
+#: src/emu/ui/selgame.cpp:380 src/emu/ui/selsoft.cpp:281
 #, c-format
 msgid ""
 "%s\n"
 " added to favorites list."
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:380 src/emu/ui/selgame.cpp:389
-#: src/emu/ui/selsoft.cpp:287
+#: src/emu/ui/selgame.cpp:386 src/emu/ui/selgame.cpp:395
+#: src/emu/ui/selsoft.cpp:286
 #, c-format
 msgid ""
 "%s\n"
 " removed from favorites list."
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:450
+#: src/emu/ui/selgame.cpp:457
 msgid ""
 "The selected machine is missing one or more required ROM or CHD images. "
 "Please select a different machine.\n"
@@ -992,275 +1008,275 @@ msgid ""
 "Press any key to continue."
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:589 src/emu/ui/simpleselgame.cpp:265
+#: src/emu/ui/selgame.cpp:595 src/emu/ui/simpleselgame.cpp:265
 msgid "Configure Options"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:752
+#: src/emu/ui/selgame.cpp:596
+msgid "Configure Machine"
+msgstr ""
+
+#: src/emu/ui/selgame.cpp:758
 #, c-format
 msgid "%1$s %2$s ( %3$d / %4$d machines (%5$d BIOS) )"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:762
+#: src/emu/ui/selgame.cpp:768
 #, c-format
 msgid "%1$s (%2$s - %3$s) - "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:769 src/emu/ui/selgame.cpp:775
+#: src/emu/ui/selgame.cpp:775 src/emu/ui/selgame.cpp:781
 #, c-format
 msgid "%1$s (%2$s) - "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:784
+#: src/emu/ui/selgame.cpp:790
 #, c-format
 msgid "%1$s Search: %2$s_"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:838
+#: src/emu/ui/selgame.cpp:844
 #, c-format
 msgid "Romset: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:841 src/emu/ui/selgame.cpp:890
-#: src/emu/ui/selsoft.cpp:751 src/emu/ui/selsoft.cpp:801
+#: src/emu/ui/selgame.cpp:847 src/emu/ui/selgame.cpp:896
+#: src/emu/ui/selsoft.cpp:750 src/emu/ui/selsoft.cpp:800
 #: src/emu/ui/simpleselgame.cpp:328
 #, c-format
 msgid "%1$s, %2$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:847 src/emu/ui/selsoft.cpp:757
+#: src/emu/ui/selgame.cpp:853 src/emu/ui/selsoft.cpp:756
 #, c-format
 msgid "Driver is clone of: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:849 src/emu/ui/selsoft.cpp:759
+#: src/emu/ui/selgame.cpp:855 src/emu/ui/selsoft.cpp:758
 msgid "Driver is parent"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:853 src/emu/ui/selsoft.cpp:763
+#: src/emu/ui/selgame.cpp:859 src/emu/ui/selsoft.cpp:762
 #: src/emu/ui/simpleselgame.cpp:335
 msgid "Overall: NOT WORKING"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:855 src/emu/ui/selsoft.cpp:765
+#: src/emu/ui/selgame.cpp:861 src/emu/ui/selsoft.cpp:764
 #: src/emu/ui/simpleselgame.cpp:337
 msgid "Overall: Unemulated Protection"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:857 src/emu/ui/selsoft.cpp:767
+#: src/emu/ui/selgame.cpp:863 src/emu/ui/selsoft.cpp:766
 #: src/emu/ui/simpleselgame.cpp:339
 msgid "Overall: Working"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:861 src/emu/ui/selsoft.cpp:771
+#: src/emu/ui/selgame.cpp:867 src/emu/ui/selsoft.cpp:770
 msgid "Graphics: Imperfect, "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:863 src/emu/ui/selsoft.cpp:773
+#: src/emu/ui/selgame.cpp:869 src/emu/ui/selsoft.cpp:772
 msgid "Graphics: OK, "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:866 src/emu/ui/selsoft.cpp:776
+#: src/emu/ui/selgame.cpp:872 src/emu/ui/selsoft.cpp:775
 msgid "Sound: Unimplemented"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:868 src/emu/ui/selsoft.cpp:778
+#: src/emu/ui/selgame.cpp:874 src/emu/ui/selsoft.cpp:777
 msgid "Sound: Imperfect"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:870 src/emu/ui/selsoft.cpp:780
+#: src/emu/ui/selgame.cpp:876 src/emu/ui/selsoft.cpp:779
 msgid "Sound: OK"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:887
+#: src/emu/ui/selgame.cpp:893
 #, c-format
 msgid "System: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:894 src/emu/ui/selsoft.cpp:805
+#: src/emu/ui/selgame.cpp:900 src/emu/ui/selsoft.cpp:804
 #, c-format
 msgid "Software is clone of: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:896 src/emu/ui/selsoft.cpp:807
+#: src/emu/ui/selgame.cpp:902 src/emu/ui/selsoft.cpp:806
 msgid "Software is parent"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:901 src/emu/ui/selsoft.cpp:812
+#: src/emu/ui/selgame.cpp:907 src/emu/ui/selsoft.cpp:811
 msgid "Supported: No"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:906 src/emu/ui/selsoft.cpp:817
+#: src/emu/ui/selgame.cpp:912 src/emu/ui/selsoft.cpp:816
 msgid "Supported: Partial"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:911 src/emu/ui/selsoft.cpp:822
+#: src/emu/ui/selgame.cpp:917 src/emu/ui/selsoft.cpp:821
 msgid "Supported: Yes"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:916 src/emu/ui/selsoft.cpp:827
+#: src/emu/ui/selgame.cpp:922 src/emu/ui/selsoft.cpp:826
 #, c-format
 msgid "romset: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:923
+#: src/emu/ui/selgame.cpp:929
 #, c-format
 msgid "%1$s %2$s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1535
+#: src/emu/ui/selgame.cpp:1543
 #, c-format
 msgid "Romset: %1$-.100s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1536
+#: src/emu/ui/selgame.cpp:1544
 #, c-format
 msgid "Year: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1537
+#: src/emu/ui/selgame.cpp:1545
 #, c-format
 msgid "Manufacturer: %1$-.100s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1541
+#: src/emu/ui/selgame.cpp:1549
 #, c-format
 msgid "Driver is Clone of: %1$-.100s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1543
+#: src/emu/ui/selgame.cpp:1551
 msgid "Driver is Parent\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1546
+#: src/emu/ui/selgame.cpp:1554
 msgid "Overall: NOT WORKING\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1548
+#: src/emu/ui/selgame.cpp:1556
 msgid "Overall: Unemulated Protection\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1550
+#: src/emu/ui/selgame.cpp:1558
 msgid "Overall: Working\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1553
+#: src/emu/ui/selgame.cpp:1561
 msgid "Graphics: Imperfect Colors\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1557
+#: src/emu/ui/selgame.cpp:1565
 msgid "Graphics: Imperfect\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1559
+#: src/emu/ui/selgame.cpp:1567
 msgid "Graphics: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1562
+#: src/emu/ui/selgame.cpp:1570
 msgid "Sound: Unimplemented\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1564
+#: src/emu/ui/selgame.cpp:1572
 msgid "Sound: Imperfect\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1566
+#: src/emu/ui/selgame.cpp:1574
 msgid "Sound: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1568
+#: src/emu/ui/selgame.cpp:1576
 #, c-format
 msgid "Driver is Skeleton: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1569
+#: src/emu/ui/selgame.cpp:1577
 #, c-format
 msgid "Game is Mechanical: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1570
+#: src/emu/ui/selgame.cpp:1578
 #, c-format
 msgid "Requires Artwork: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1571
+#: src/emu/ui/selgame.cpp:1579
 #, c-format
 msgid "Requires Clickable Artwork: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1572
+#: src/emu/ui/selgame.cpp:1580
 #, c-format
 msgid "Support Cocktail: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1573
+#: src/emu/ui/selgame.cpp:1581
 #, c-format
 msgid "Driver is Bios: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1574
+#: src/emu/ui/selgame.cpp:1582
 #, c-format
 msgid "Support Save: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 #, c-format
 msgid "Screen Orientation: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 msgid "Vertical"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 msgid "Horizontal"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/selgame.cpp:1591
 #, c-format
 msgid "Requires CHD: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1596
+#: src/emu/ui/selgame.cpp:1604
 msgid "Roms Audit Pass: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1598
+#: src/emu/ui/selgame.cpp:1606
 msgid "Roms Audit Pass: BAD\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1601
+#: src/emu/ui/selgame.cpp:1609
 msgid "Samples Audit Pass: None Needed\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1603
+#: src/emu/ui/selgame.cpp:1611
 msgid "Samples Audit Pass: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1605
+#: src/emu/ui/selgame.cpp:1613
 msgid "Samples Audit Pass: BAD\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1608
+#: src/emu/ui/selgame.cpp:1616
 msgid ""
 "Roms Audit Pass: Disabled\n"
 "Samples Audit Pass: Disabled\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:2049 src/emu/ui/selgame.cpp:2212
-#: src/emu/ui/selsoft.cpp:1662
+#: src/emu/ui/selgame.cpp:2055 src/emu/ui/selgame.cpp:2216
+#: src/emu/ui/selsoft.cpp:1655
 msgid "No Infos Available"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:2162 src/emu/ui/selsoft.cpp:1607
+#: src/emu/ui/selgame.cpp:2168 src/emu/ui/selsoft.cpp:1602
 msgid "Usage"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:110
-msgid " (default)"
-msgstr ""
-
-#: src/emu/ui/selsoft.cpp:381
+#: src/emu/ui/selsoft.cpp:380
 msgid ""
 "The selected software is missing one or more required files. Please select a "
 "different software.\n"
@@ -1268,57 +1284,57 @@ msgid ""
 "Press any key to continue."
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:684
+#: src/emu/ui/selsoft.cpp:683
 #, c-format
-msgid "%1$s %2$s ( %3$d / %4$d softwares )"
+msgid "%1$s %2$s ( %3$d / %4$d software packages )"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:685
+#: src/emu/ui/selsoft.cpp:684
 #, c-format
 msgid "Driver: \"%1$s\" software list "
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:688
+#: src/emu/ui/selsoft.cpp:687
 #, c-format
 msgid "Region: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:690
+#: src/emu/ui/selsoft.cpp:689
 #, c-format
 msgid "Publisher: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:692
+#: src/emu/ui/selsoft.cpp:691
 #, c-format
 msgid "Year: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:694
+#: src/emu/ui/selsoft.cpp:693
 #, c-format
 msgid "Software List: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:696
+#: src/emu/ui/selsoft.cpp:695
 #, c-format
 msgid "Device type: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:698
+#: src/emu/ui/selsoft.cpp:697
 #, c-format
 msgid "%s Search: %s_"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:748 src/emu/ui/selsoft.cpp:798
+#: src/emu/ui/selsoft.cpp:747 src/emu/ui/selsoft.cpp:797
 #: src/emu/ui/simpleselgame.cpp:325
 #, c-format
 msgid "%1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:1998 src/emu/ui/selsoft.cpp:2018
+#: src/emu/ui/selsoft.cpp:1991 src/emu/ui/selsoft.cpp:2011
 msgid "Software part selection:"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:2136 src/emu/ui/selsoft.cpp:2156
+#: src/emu/ui/selsoft.cpp:2129 src/emu/ui/selsoft.cpp:2149
 msgid "Bios selection:"
 msgstr ""
 
@@ -1366,15 +1382,15 @@ msgstr ""
 msgid " [internal]"
 msgstr ""
 
-#: src/emu/ui/sndmenu.cpp:135
+#: src/emu/ui/sndmenu.cpp:133
 msgid "Sound"
 msgstr ""
 
-#: src/emu/ui/sndmenu.cpp:136
+#: src/emu/ui/sndmenu.cpp:134
 msgid "Sample Rate"
 msgstr ""
 
-#: src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/sndmenu.cpp:135
 msgid "Use External Samples"
 msgstr ""
 
@@ -1443,80 +1459,80 @@ msgstr ""
 msgid "Fast Forward"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:419
+#: src/emu/ui/ui.cpp:418
 msgid "This driver requires images to be loaded in the following device(s): "
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1074
+#: src/emu/ui/ui.cpp:1071
 msgid ""
 "One or more ROMs/CHDs for this machine are incorrect. The machine may not "
 "run correctly.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1087
+#: src/emu/ui/ui.cpp:1084
 msgid ""
 "There are known problems with this machine\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1091
+#: src/emu/ui/ui.cpp:1088
 msgid ""
 "One or more ROMs/CHDs for this machine have not been correctly dumped.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1095
+#: src/emu/ui/ui.cpp:1092
 #, c-format
 msgid "The keyboard emulation may not be 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1097
+#: src/emu/ui/ui.cpp:1094
 #, c-format
 msgid "The colors aren't 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1099
+#: src/emu/ui/ui.cpp:1096
 msgid "The colors are completely wrong.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1101
+#: src/emu/ui/ui.cpp:1098
 #, c-format
 msgid "The video emulation isn't 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1103
+#: src/emu/ui/ui.cpp:1100
 #, c-format
 msgid "The sound emulation isn't 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1105
+#: src/emu/ui/ui.cpp:1102
 msgid "The machine lacks sound.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1108
+#: src/emu/ui/ui.cpp:1105
 msgid "Screen flipping in cocktail mode is not supported.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1112
+#: src/emu/ui/ui.cpp:1109
 msgid "The machine requires external artwork files\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1117
+#: src/emu/ui/ui.cpp:1114
 msgid ""
 "This machine was never completed. It may exhibit strange behavior or missing "
 "elements that are not bugs in the emulation.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1122
+#: src/emu/ui/ui.cpp:1119
 msgid ""
 "This machine has no sound hardware, MAME will produce no sounds, this is "
 "expected behaviour.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1130
+#: src/emu/ui/ui.cpp:1127
 msgid "The machine has protection which isn't fully emulated.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1133
+#: src/emu/ui/ui.cpp:1130
 msgid ""
 "\n"
 "THIS MACHINE DOESN'T WORK. The emulation for this machine is not yet "
@@ -1524,7 +1540,7 @@ msgid ""
 "the developers to improve the emulation.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1137
+#: src/emu/ui/ui.cpp:1134
 msgid ""
 "\n"
 "Certain elements of this machine cannot be emulated as it requires actual "
@@ -1532,21 +1548,21 @@ msgid ""
 "to fully play this machine.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1156
+#: src/emu/ui/ui.cpp:1153
 msgid ""
 "\n"
 "\n"
 "There are working clones of this machine: "
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1170
+#: src/emu/ui/ui.cpp:1167
 msgid ""
 "\n"
 "\n"
 "Press any key to continue"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1185
+#: src/emu/ui/ui.cpp:1182
 #, c-format
 msgid ""
 "%1$s\n"
@@ -1556,98 +1572,98 @@ msgid ""
 "CPU:\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1221 src/emu/ui/ui.cpp:1260
+#: src/emu/ui/ui.cpp:1218 src/emu/ui/ui.cpp:1257
 msgid "MHz"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1221 src/emu/ui/ui.cpp:1260
+#: src/emu/ui/ui.cpp:1218 src/emu/ui/ui.cpp:1257
 msgid "kHz"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1235
+#: src/emu/ui/ui.cpp:1232
 msgid ""
 "\n"
 "Sound:\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1264
+#: src/emu/ui/ui.cpp:1261
 msgid ""
 "\n"
 "Video:\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1268
+#: src/emu/ui/ui.cpp:1265
 msgid "None\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1275
+#: src/emu/ui/ui.cpp:1272
 msgid "Vector"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1286
+#: src/emu/ui/ui.cpp:1283
 #, c-format
 msgid "%1$s: %2$s\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1286
+#: src/emu/ui/ui.cpp:1283
 msgid "%2$s\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1541 src/emu/ui/ui.cpp:1551
+#: src/emu/ui/ui.cpp:1538 src/emu/ui/ui.cpp:1548
 msgid "Keyboard Emulation Status"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1543
+#: src/emu/ui/ui.cpp:1540
 msgid "Mode: PARTIAL Emulation"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1544
+#: src/emu/ui/ui.cpp:1541
 msgid "UI:   Enabled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1546 src/emu/ui/ui.cpp:1556
+#: src/emu/ui/ui.cpp:1543 src/emu/ui/ui.cpp:1553
 msgid "**Use ScrLock to toggle**"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1553
+#: src/emu/ui/ui.cpp:1550
 msgid "Mode: FULL Emulation"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1554
+#: src/emu/ui/ui.cpp:1551
 msgid "UI:   Disabled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1692
+#: src/emu/ui/ui.cpp:1689
 msgid "Autofire can't be enabled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1731
+#: src/emu/ui/ui.cpp:1728
 msgid "Select position to save to"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1733
+#: src/emu/ui/ui.cpp:1730
 msgid "Select position to load from"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1757
+#: src/emu/ui/ui.cpp:1754
 msgid "Save cancelled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1759
+#: src/emu/ui/ui.cpp:1756
 msgid "Load cancelled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1802
+#: src/emu/ui/ui.cpp:1799
 #, c-format
 msgid "Save to position %s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1807
+#: src/emu/ui/ui.cpp:1804
 #, c-format
 msgid "Load from position %s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1847
+#: src/emu/ui/ui.cpp:1844
 #, c-format
 msgid ""
 "Are you sure you want to quit?\n"
@@ -1656,173 +1672,173 @@ msgid ""
 "Press ''%2$s'' to return to emulation."
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1917
+#: src/emu/ui/ui.cpp:1914
 msgid "Master Volume"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1926
+#: src/emu/ui/ui.cpp:1923
 #, c-format
 msgid "%1$s Volume"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1949
+#: src/emu/ui/ui.cpp:1946
 #, c-format
 msgid "Overclock CPU %1$s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1968
+#: src/emu/ui/ui.cpp:1965
 #, c-format
 msgid "%1$s Refresh Rate"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1973
+#: src/emu/ui/ui.cpp:1970
 #, c-format
 msgid "%1$s Brightness"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1975
+#: src/emu/ui/ui.cpp:1972
 #, c-format
 msgid "%1$s Contrast"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1977
+#: src/emu/ui/ui.cpp:1974
 #, c-format
 msgid "%1$s Gamma"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1981
+#: src/emu/ui/ui.cpp:1978
 #, c-format
 msgid "%1$s Horiz Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1983
+#: src/emu/ui/ui.cpp:1980
 #, c-format
 msgid "%1$s Horiz Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1985
+#: src/emu/ui/ui.cpp:1982
 #, c-format
 msgid "%1$s Vert Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1987
+#: src/emu/ui/ui.cpp:1984
 #, c-format
 msgid "%1$s Vert Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2005
+#: src/emu/ui/ui.cpp:2002
 #, c-format
 msgid "Laserdisc '%1$s' Horiz Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2007
+#: src/emu/ui/ui.cpp:2004
 #, c-format
 msgid "Laserdisc '%1$s' Horiz Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2009
+#: src/emu/ui/ui.cpp:2006
 #, c-format
 msgid "Laserdisc '%1$s' Vert Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2011
+#: src/emu/ui/ui.cpp:2008
 #, c-format
 msgid "Laserdisc '%1$s' Vert Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2021
+#: src/emu/ui/ui.cpp:2018
 msgid "Vector Flicker"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2022
+#: src/emu/ui/ui.cpp:2019
 msgid "Beam Width Minimum"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2023
+#: src/emu/ui/ui.cpp:2020
 msgid "Beam Width Maximum"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2024
+#: src/emu/ui/ui.cpp:2021
 msgid "Beam Intensity Weight"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2037
+#: src/emu/ui/ui.cpp:2034
 #, c-format
 msgid "Crosshair Scale %1$s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2037 src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2034 src/emu/ui/ui.cpp:2036
 msgid "X"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2037 src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2034 src/emu/ui/ui.cpp:2036
 msgid "Y"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2036
 #, c-format
 msgid "Crosshair Offset %1$s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2071
+#: src/emu/ui/ui.cpp:2068
 #, c-format
 msgid "%1$3ddB"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2115
+#: src/emu/ui/ui.cpp:2112
 #, c-format
 msgid "%1$d%%"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2131
+#: src/emu/ui/ui.cpp:2128
 #, c-format
 msgid "%1$3.0f%%"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2154
+#: src/emu/ui/ui.cpp:2151
 #, c-format
 msgid "%1$.3ffps"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2177 src/emu/ui/ui.cpp:2199 src/emu/ui/ui.cpp:2220
-#: src/emu/ui/ui.cpp:2242 src/emu/ui/ui.cpp:2264 src/emu/ui/ui.cpp:2286
-#: src/emu/ui/ui.cpp:2308 src/emu/ui/ui.cpp:2330 src/emu/ui/ui.cpp:2352
-#: src/emu/ui/ui.cpp:2374 src/emu/ui/ui.cpp:2396
+#: src/emu/ui/ui.cpp:2174 src/emu/ui/ui.cpp:2196 src/emu/ui/ui.cpp:2217
+#: src/emu/ui/ui.cpp:2239 src/emu/ui/ui.cpp:2261 src/emu/ui/ui.cpp:2283
+#: src/emu/ui/ui.cpp:2305 src/emu/ui/ui.cpp:2327 src/emu/ui/ui.cpp:2349
+#: src/emu/ui/ui.cpp:2371 src/emu/ui/ui.cpp:2393
 #, c-format
 msgid "%1$.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2412 src/emu/ui/ui.cpp:2428 src/emu/ui/ui.cpp:2444
-#: src/emu/ui/ui.cpp:2460
+#: src/emu/ui/ui.cpp:2408 src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2438
+#: src/emu/ui/ui.cpp:2453
 #, c-format
 msgid "%1$1.2f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2476
+#: src/emu/ui/ui.cpp:2469
 #, c-format
 msgid "Screen '%1$s'"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2478
+#: src/emu/ui/ui.cpp:2471
 msgid "Screen"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2494
+#: src/emu/ui/ui.cpp:2487
 #, c-format
 msgid "Crosshair Scale X %1$1.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2494
+#: src/emu/ui/ui.cpp:2487
 #, c-format
 msgid "Crosshair Scale Y %1$1.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2513
+#: src/emu/ui/ui.cpp:2506
 #, c-format
 msgid "Crosshair Offset X %1$1.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2513
+#: src/emu/ui/ui.cpp:2506
 #, c-format
 msgid "Crosshair Offset Y %1$1.3f"
 msgstr ""
@@ -1864,10 +1880,10 @@ msgstr ""
 msgid "Full"
 msgstr ""
 
-#: src/emu/ui/viewgfx.cpp:392
+#: src/emu/ui/viewgfx.cpp:391
 msgid " COLORS"
 msgstr ""
 
-#: src/emu/ui/viewgfx.cpp:392
+#: src/emu/ui/viewgfx.cpp:391
 msgid " PENS"
 msgstr ""
diff --git a/language/Portuguese_Brazil/strings.po b/language/Portuguese_Brazil/strings.po
index 044f0766978..96275cfb8ee 100644
--- a/language/Portuguese_Brazil/strings.po
+++ b/language/Portuguese_Brazil/strings.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MAME\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-11 03:33+0200\n"
+"POT-Creation-Date: 2016-04-15 17:42+0200\n"
 "PO-Revision-Date: 2016-04-04 09:05+0100\n"
 "Last-Translator: Ashura-X\n"
 "Language-Team: MAME Language Team\n"
@@ -61,14 +61,14 @@ msgstr "Recarregar Tudo"
 msgid "Autofire Status"
 msgstr "Situação do Autodisparo"
 
-#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1698
+#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1695
 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211
 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219
 #: src/emu/ui/videoopt.cpp:223
 msgid "Disabled"
 msgstr "Desativado"
 
-#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1698
+#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1695
 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211
 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219
 #: src/emu/ui/videoopt.cpp:223
@@ -76,14 +76,14 @@ msgid "Enabled"
 msgstr "Ativado"
 
 #: src/emu/ui/cheatopt.cpp:282 src/emu/ui/cheatopt.cpp:288
-#: src/emu/ui/menu.cpp:710 src/emu/ui/miscmenu.cpp:831
-#: src/emu/ui/sndmenu.cpp:135 src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/menu.cpp:755 src/emu/ui/miscmenu.cpp:936
+#: src/emu/ui/sndmenu.cpp:133 src/emu/ui/sndmenu.cpp:135
 msgid "On"
 msgstr "Ligado"
 
 #: src/emu/ui/cheatopt.cpp:282 src/emu/ui/cheatopt.cpp:288
-#: src/emu/ui/menu.cpp:713 src/emu/ui/miscmenu.cpp:831
-#: src/emu/ui/sndmenu.cpp:135 src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/menu.cpp:758 src/emu/ui/miscmenu.cpp:936
+#: src/emu/ui/sndmenu.cpp:133 src/emu/ui/sndmenu.cpp:135
 msgid "Off"
 msgstr "Desligado"
 
@@ -95,317 +95,317 @@ msgstr "Nenhum botão encontrado nesta máquina!"
 msgid "Autofire Delay"
 msgstr "Atraso do Autodisparo"
 
-#: src/emu/ui/custmenu.cpp:158 src/emu/ui/custmenu.cpp:447
+#: src/emu/ui/custmenu.cpp:157 src/emu/ui/custmenu.cpp:445
 msgid "Main filter"
 msgstr "Filtro Principal"
 
-#: src/emu/ui/custmenu.cpp:167 src/emu/ui/custmenu.cpp:456
+#: src/emu/ui/custmenu.cpp:166 src/emu/ui/custmenu.cpp:454
 msgid "Other filter"
 msgstr "Outro filtro"
 
-#: src/emu/ui/custmenu.cpp:176 src/emu/ui/optsmenu.cpp:239
+#: src/emu/ui/custmenu.cpp:175 src/emu/ui/optsmenu.cpp:238
 msgid "^!Manufacturer"
 msgstr "^!Fabricante"
 
-#: src/emu/ui/custmenu.cpp:185 src/emu/ui/custmenu.cpp:474
-#: src/emu/ui/optsmenu.cpp:247
+#: src/emu/ui/custmenu.cpp:184 src/emu/ui/custmenu.cpp:472
+#: src/emu/ui/optsmenu.cpp:246
 msgid "^!Year"
 msgstr "^!Ano"
 
-#: src/emu/ui/custmenu.cpp:194 src/emu/ui/custmenu.cpp:510
+#: src/emu/ui/custmenu.cpp:193 src/emu/ui/custmenu.cpp:508
 msgid "Remove last filter"
 msgstr "Remover o último filtro"
 
-#: src/emu/ui/custmenu.cpp:197 src/emu/ui/custmenu.cpp:513
+#: src/emu/ui/custmenu.cpp:196 src/emu/ui/custmenu.cpp:511
 msgid "Add filter"
 msgstr "Adicionar filtro"
 
-#: src/emu/ui/custmenu.cpp:212 src/emu/ui/custmenu.cpp:233
-#: src/emu/ui/custmenu.cpp:529 src/emu/ui/custmenu.cpp:550
+#: src/emu/ui/custmenu.cpp:211 src/emu/ui/custmenu.cpp:231
+#: src/emu/ui/custmenu.cpp:527 src/emu/ui/custmenu.cpp:547
 msgid "Select custom filters:"
 msgstr "Selecionar filtros customizáveis:"
 
-#: src/emu/ui/custmenu.cpp:465
+#: src/emu/ui/custmenu.cpp:463
 msgid "^!Publisher"
 msgstr "^!Editor"
 
-#: src/emu/ui/custmenu.cpp:483
+#: src/emu/ui/custmenu.cpp:481
 msgid "^!Software List"
 msgstr "^!Lista de Programas"
 
-#: src/emu/ui/custmenu.cpp:492
+#: src/emu/ui/custmenu.cpp:490
 msgid "^!Device type"
 msgstr "^!Tipo de dispositivo"
 
-#: src/emu/ui/custmenu.cpp:501
+#: src/emu/ui/custmenu.cpp:499
 msgid "^!Region"
 msgstr "^!Região"
 
-#: src/emu/ui/custui.cpp:23
+#: src/emu/ui/custui.cpp:22
 msgid "Show All"
 msgstr "Mostrar Tudo"
 
-#: src/emu/ui/custui.cpp:24
+#: src/emu/ui/custui.cpp:23
 msgid "Hide Filters"
 msgstr "Esconder Filtros"
 
-#: src/emu/ui/custui.cpp:25
+#: src/emu/ui/custui.cpp:24
 msgid "Hide Info/Image"
 msgstr "Esconder Info/Imagem"
 
-#: src/emu/ui/custui.cpp:26
+#: src/emu/ui/custui.cpp:25
 msgid "Hide Both"
 msgstr "Esconder Ambos"
 
-#: src/emu/ui/custui.cpp:142
+#: src/emu/ui/custui.cpp:141
 msgid "Fonts"
 msgstr "Fontes"
 
-#: src/emu/ui/custui.cpp:143
+#: src/emu/ui/custui.cpp:142
 msgid "Colors"
 msgstr "Cores"
 
-#: src/emu/ui/custui.cpp:148 src/emu/ui/dirmenu.cpp:33
+#: src/emu/ui/custui.cpp:147 src/emu/ui/dirmenu.cpp:33
 msgid "Language"
 msgstr "Linguagem"
 
-#: src/emu/ui/custui.cpp:152
+#: src/emu/ui/custui.cpp:151
 msgid "Show side panels"
 msgstr "Mostrar painéis laterais"
 
-#: src/emu/ui/custui.cpp:167 src/emu/ui/custui.cpp:188
+#: src/emu/ui/custui.cpp:166 src/emu/ui/custui.cpp:186
 msgid "Custom UI Settings"
 msgstr "Configurações Customizadas do UI"
 
-#: src/emu/ui/custui.cpp:246
+#: src/emu/ui/custui.cpp:244
 msgid "default"
 msgstr "padrão"
 
-#: src/emu/ui/custui.cpp:349
+#: src/emu/ui/custui.cpp:347
 msgid "UI Font"
 msgstr "Fonte do UI"
 
-#: src/emu/ui/custui.cpp:354
+#: src/emu/ui/custui.cpp:352
 msgid "Bold"
 msgstr "Negrito"
 
-#: src/emu/ui/custui.cpp:355
+#: src/emu/ui/custui.cpp:353
 msgid "Italic"
 msgstr "Itálico"
 
-#: src/emu/ui/custui.cpp:360
+#: src/emu/ui/custui.cpp:358
 msgid "Lines"
 msgstr "Linhas"
 
-#: src/emu/ui/custui.cpp:366
+#: src/emu/ui/custui.cpp:364
 msgid "Infos text size"
 msgstr "Infos do tamanho do texto"
 
-#: src/emu/ui/custui.cpp:383
+#: src/emu/ui/custui.cpp:381
 msgid "UI Fonts Settings"
 msgstr "Configurações das fontes do UI"
 
-#: src/emu/ui/custui.cpp:411
+#: src/emu/ui/custui.cpp:408
 msgid "Sample text - Lorem ipsum dolor sit amet, consectetur adipiscing elit."
 msgstr ""
 "Texto de amostra - Lorem ipsum dolor sit amet, consectetur adipiscing elit."
 
-#: src/emu/ui/custui.cpp:509
+#: src/emu/ui/custui.cpp:506
 msgid "Normal text"
 msgstr "Texto Normal"
 
-#: src/emu/ui/custui.cpp:510
+#: src/emu/ui/custui.cpp:507
 msgid "Selected color"
 msgstr "Cor Selecionada"
 
-#: src/emu/ui/custui.cpp:511
+#: src/emu/ui/custui.cpp:508
 msgid "Normal text background"
 msgstr "Fundo do texto normal"
 
-#: src/emu/ui/custui.cpp:512
+#: src/emu/ui/custui.cpp:509
 msgid "Selected background color"
 msgstr "Cor de fundo selecionada"
 
-#: src/emu/ui/custui.cpp:513
+#: src/emu/ui/custui.cpp:510
 msgid "Subitem color"
 msgstr "Cor do Sub-item"
 
-#: src/emu/ui/custui.cpp:514 src/emu/ui/custui.cpp:610
+#: src/emu/ui/custui.cpp:511 src/emu/ui/custui.cpp:606
 msgid "Clone"
 msgstr "Clone"
 
-#: src/emu/ui/custui.cpp:515
+#: src/emu/ui/custui.cpp:512
 msgid "Border"
 msgstr "Borda"
 
-#: src/emu/ui/custui.cpp:516
+#: src/emu/ui/custui.cpp:513
 msgid "Background"
 msgstr "Fundo"
 
-#: src/emu/ui/custui.cpp:517
+#: src/emu/ui/custui.cpp:514
 msgid "Dipswitch"
 msgstr "Chave DIP"
 
-#: src/emu/ui/custui.cpp:518
+#: src/emu/ui/custui.cpp:515
 msgid "Unavailable color"
 msgstr "Cor indisponível"
 
-#: src/emu/ui/custui.cpp:519
+#: src/emu/ui/custui.cpp:516
 msgid "Slider color"
 msgstr "Cor do controle deslizante"
 
-#: src/emu/ui/custui.cpp:520
+#: src/emu/ui/custui.cpp:517
 msgid "Gfx viewer background"
 msgstr "Fundo do visualizador GFX"
 
-#: src/emu/ui/custui.cpp:521
+#: src/emu/ui/custui.cpp:518
 msgid "Mouse over color"
 msgstr "Cor do Mouse over"
 
-#: src/emu/ui/custui.cpp:522
+#: src/emu/ui/custui.cpp:519
 msgid "Mouse over background color"
 msgstr "Cor de fundo do Mouse over"
 
-#: src/emu/ui/custui.cpp:523
+#: src/emu/ui/custui.cpp:520
 msgid "Mouse down color"
 msgstr "Cor do Mouse down"
 
-#: src/emu/ui/custui.cpp:524
+#: src/emu/ui/custui.cpp:521
 msgid "Mouse down background color"
 msgstr "Cor de fundo do Mouse down"
 
-#: src/emu/ui/custui.cpp:527
+#: src/emu/ui/custui.cpp:524
 msgid "Restore originals colors"
 msgstr "Restaurar as cores originais"
 
-#: src/emu/ui/custui.cpp:543
+#: src/emu/ui/custui.cpp:540
 msgid "UI Colors Settings"
 msgstr "Configurações de cores do UI"
 
-#: src/emu/ui/custui.cpp:572
+#: src/emu/ui/custui.cpp:568
 #, c-format
 msgid "Double click or press %1$s to change the color value"
 msgstr "Duplo-clique ou pressione %1$s para mudar o valor da cor"
 
-#: src/emu/ui/custui.cpp:598
+#: src/emu/ui/custui.cpp:594
 msgid "Menu Preview"
 msgstr "Menu de Visualização"
 
-#: src/emu/ui/custui.cpp:606
+#: src/emu/ui/custui.cpp:602
 msgid "Normal"
 msgstr "Normal"
 
-#: src/emu/ui/custui.cpp:607
+#: src/emu/ui/custui.cpp:603
 msgid "Subitem"
 msgstr "Sub-item"
 
-#: src/emu/ui/custui.cpp:608
+#: src/emu/ui/custui.cpp:604
 msgid "Selected"
 msgstr "Selecionado"
 
-#: src/emu/ui/custui.cpp:609
+#: src/emu/ui/custui.cpp:605
 msgid "Mouse Over"
 msgstr "Mouse Over"
 
-#: src/emu/ui/custui.cpp:841 src/emu/ui/custui.cpp:844
+#: src/emu/ui/custui.cpp:837 src/emu/ui/custui.cpp:840
 msgid "Alpha"
 msgstr "Opacidade"
 
-#: src/emu/ui/custui.cpp:849 src/emu/ui/custui.cpp:852
-#: src/emu/ui/custui.cpp:1013
+#: src/emu/ui/custui.cpp:845 src/emu/ui/custui.cpp:848
+#: src/emu/ui/custui.cpp:1007
 msgid "Red"
 msgstr "Vermelho"
 
-#: src/emu/ui/custui.cpp:857 src/emu/ui/custui.cpp:860
-#: src/emu/ui/custui.cpp:1016
+#: src/emu/ui/custui.cpp:853 src/emu/ui/custui.cpp:856
+#: src/emu/ui/custui.cpp:1010
 msgid "Green"
 msgstr "Verde"
 
-#: src/emu/ui/custui.cpp:865 src/emu/ui/custui.cpp:868
-#: src/emu/ui/custui.cpp:1017
+#: src/emu/ui/custui.cpp:861 src/emu/ui/custui.cpp:864
+#: src/emu/ui/custui.cpp:1011
 msgid "Blue"
 msgstr "Azul"
 
-#: src/emu/ui/custui.cpp:871
+#: src/emu/ui/custui.cpp:867
 msgid "Choose from palette"
 msgstr "Escolha da paleta"
 
-#: src/emu/ui/custui.cpp:887
+#: src/emu/ui/custui.cpp:883
 msgid " - ARGB Settings"
 msgstr "Configurações ARGB"
 
-#: src/emu/ui/custui.cpp:912
+#: src/emu/ui/custui.cpp:907
 msgid "Color preview ="
 msgstr "Visualização da cor"
 
-#: src/emu/ui/custui.cpp:1009
+#: src/emu/ui/custui.cpp:1003
 msgid "White"
 msgstr "Branco"
 
-#: src/emu/ui/custui.cpp:1010
+#: src/emu/ui/custui.cpp:1004
 msgid "Silver"
 msgstr "Prata"
 
-#: src/emu/ui/custui.cpp:1011
+#: src/emu/ui/custui.cpp:1005
 msgid "Gray"
 msgstr "Cinza"
 
-#: src/emu/ui/custui.cpp:1012
+#: src/emu/ui/custui.cpp:1006
 msgid "Black"
 msgstr "Preto"
 
-#: src/emu/ui/custui.cpp:1014
+#: src/emu/ui/custui.cpp:1008
 msgid "Orange"
 msgstr "Laranja"
 
-#: src/emu/ui/custui.cpp:1015
+#: src/emu/ui/custui.cpp:1009
 msgid "Yellow"
 msgstr "Amarelo"
 
-#: src/emu/ui/custui.cpp:1018
+#: src/emu/ui/custui.cpp:1012
 msgid "Violet"
 msgstr "Violeta"
 
-#: src/emu/ui/datmenu.cpp:65
+#: src/emu/ui/datmenu.cpp:64
 msgid "Software History"
 msgstr "História do Programa"
 
-#: src/emu/ui/datmenu.cpp:67
+#: src/emu/ui/datmenu.cpp:66
 msgid "Software Usage"
 msgstr "Uso do Programa"
 
-#: src/emu/ui/datmenu.cpp:199
+#: src/emu/ui/datmenu.cpp:196
 msgid "Revision: "
 msgstr "Revisão: "
 
-#: src/emu/ui/datmenu.cpp:287 src/emu/ui/selgame.cpp:40
-#: src/emu/ui/selgame.cpp:2152 src/emu/ui/selgame.cpp:2161
-#: src/emu/ui/selsoft.cpp:1577 src/emu/ui/selsoft.cpp:1597
-#: src/emu/ui/selsoft.cpp:1606
+#: src/emu/ui/datmenu.cpp:284 src/emu/ui/selgame.cpp:39
+#: src/emu/ui/selgame.cpp:2158 src/emu/ui/selgame.cpp:2167
+#: src/emu/ui/selsoft.cpp:1574 src/emu/ui/selsoft.cpp:1592
+#: src/emu/ui/selsoft.cpp:1601
 msgid "History"
 msgstr "História"
 
-#: src/emu/ui/datmenu.cpp:289 src/emu/ui/selgame.cpp:41
+#: src/emu/ui/datmenu.cpp:286 src/emu/ui/selgame.cpp:40
 msgid "Mameinfo"
 msgstr "Mameinfo"
 
-#: src/emu/ui/datmenu.cpp:291 src/emu/ui/selgame.cpp:43
+#: src/emu/ui/datmenu.cpp:288 src/emu/ui/selgame.cpp:42
 msgid "Messinfo"
 msgstr "Messinfo"
 
-#: src/emu/ui/datmenu.cpp:293 src/emu/ui/selgame.cpp:42
+#: src/emu/ui/datmenu.cpp:290 src/emu/ui/selgame.cpp:41
 msgid "Sysinfo"
 msgstr "Sysinfo"
 
-#: src/emu/ui/datmenu.cpp:295 src/emu/ui/selgame.cpp:46
+#: src/emu/ui/datmenu.cpp:292 src/emu/ui/selgame.cpp:45
 msgid "Mamescore"
 msgstr "Mamescore"
 
-#: src/emu/ui/datmenu.cpp:297 src/emu/ui/selgame.cpp:45
+#: src/emu/ui/datmenu.cpp:294 src/emu/ui/selgame.cpp:44
 msgid "Gameinit"
 msgstr "Gameinit"
 
-#: src/emu/ui/datmenu.cpp:299 src/emu/ui/selgame.cpp:44
+#: src/emu/ui/datmenu.cpp:296 src/emu/ui/selgame.cpp:43
 msgid "Command"
 msgstr "Command"
 
@@ -557,75 +557,75 @@ msgstr "Pressione TAB para definir"
 msgid "Remove %1$s Folder"
 msgstr "Remover %1$s Pasta"
 
-#: src/emu/ui/filesel.cpp:158
+#: src/emu/ui/filesel.cpp:161
 msgid "File Already Exists - Override?"
 msgstr "Arquivo Já Existe - Sobrescrever?"
 
-#: src/emu/ui/filesel.cpp:160 src/emu/ui/selgame.cpp:1568
-#: src/emu/ui/selgame.cpp:1569 src/emu/ui/selgame.cpp:1570
-#: src/emu/ui/selgame.cpp:1571 src/emu/ui/selgame.cpp:1572
-#: src/emu/ui/selgame.cpp:1573 src/emu/ui/selgame.cpp:1574
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/filesel.cpp:163 src/emu/ui/selgame.cpp:1576
+#: src/emu/ui/selgame.cpp:1577 src/emu/ui/selgame.cpp:1578
+#: src/emu/ui/selgame.cpp:1579 src/emu/ui/selgame.cpp:1580
+#: src/emu/ui/selgame.cpp:1581 src/emu/ui/selgame.cpp:1582
+#: src/emu/ui/selgame.cpp:1591
 msgid "No"
 msgstr "Não"
 
-#: src/emu/ui/filesel.cpp:161 src/emu/ui/selgame.cpp:1568
-#: src/emu/ui/selgame.cpp:1569 src/emu/ui/selgame.cpp:1570
-#: src/emu/ui/selgame.cpp:1571 src/emu/ui/selgame.cpp:1572
-#: src/emu/ui/selgame.cpp:1573 src/emu/ui/selgame.cpp:1574
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/filesel.cpp:164 src/emu/ui/selgame.cpp:1576
+#: src/emu/ui/selgame.cpp:1577 src/emu/ui/selgame.cpp:1578
+#: src/emu/ui/selgame.cpp:1579 src/emu/ui/selgame.cpp:1580
+#: src/emu/ui/selgame.cpp:1581 src/emu/ui/selgame.cpp:1582
+#: src/emu/ui/selgame.cpp:1591
 msgid "Yes"
 msgstr "Sim"
 
-#: src/emu/ui/filesel.cpp:272
+#: src/emu/ui/filesel.cpp:275
 msgid "New Image Name:"
 msgstr "Novo Nome da Imagem:"
 
-#: src/emu/ui/filesel.cpp:278
+#: src/emu/ui/filesel.cpp:281
 msgid "Image Format:"
 msgstr "Formato da Imagem:"
 
-#: src/emu/ui/filesel.cpp:284
+#: src/emu/ui/filesel.cpp:287
 msgid "Create"
 msgstr "Criar"
 
-#: src/emu/ui/filesel.cpp:315
+#: src/emu/ui/filesel.cpp:318
 msgid "Please enter a file extension too"
 msgstr "Por favor entre também com uma extensão do arquivo"
 
-#: src/emu/ui/filesel.cpp:503 src/emu/ui/swlist.cpp:65
+#: src/emu/ui/filesel.cpp:506 src/emu/ui/swlist.cpp:65
 msgid "[empty slot]"
 msgstr "[slot vazio]"
 
-#: src/emu/ui/filesel.cpp:507
+#: src/emu/ui/filesel.cpp:510
 msgid "[create]"
 msgstr "[criar]"
 
-#: src/emu/ui/filesel.cpp:511 src/emu/ui/swlist.cpp:76
+#: src/emu/ui/filesel.cpp:514 src/emu/ui/swlist.cpp:76
 msgid "[software list]"
 msgstr "[lista de programa]"
 
-#: src/emu/ui/filesel.cpp:803
+#: src/emu/ui/filesel.cpp:806
 msgid "Select image format"
 msgstr "Selecione o formato da imagem"
 
-#: src/emu/ui/filesel.cpp:863
+#: src/emu/ui/filesel.cpp:866
 msgid "Select access mode"
 msgstr "Selecione o modo de acesso"
 
-#: src/emu/ui/filesel.cpp:864
+#: src/emu/ui/filesel.cpp:867
 msgid "Read-only"
 msgstr "Somente-leitura"
 
-#: src/emu/ui/filesel.cpp:866
+#: src/emu/ui/filesel.cpp:869
 msgid "Read-write"
 msgstr "Somente-escrita"
 
-#: src/emu/ui/filesel.cpp:867
+#: src/emu/ui/filesel.cpp:870
 msgid "Read this image, write to another image"
 msgstr "Ler esta imagem, escrever para outra imagem"
 
-#: src/emu/ui/filesel.cpp:868
+#: src/emu/ui/filesel.cpp:871
 msgid "Read this image, write to diff"
 msgstr "Ler esta imagem, escrever para diff"
 
@@ -653,7 +653,7 @@ msgstr "Parcialmente suportado"
 msgid "[empty]"
 msgstr "[vazio]"
 
-#: src/emu/ui/info_pty.cpp:26 src/emu/ui/mainmenu.cpp:91
+#: src/emu/ui/info_pty.cpp:26 src/emu/ui/mainmenu.cpp:96
 msgid "Pseudo terminals"
 msgstr "Pseudo terminais"
 
@@ -669,7 +669,7 @@ msgstr "Interface do usuário"
 msgid "Other Controls"
 msgstr "Outros Controles"
 
-#: src/emu/ui/inputmap.cpp:622 src/emu/ui/miscmenu.cpp:91
+#: src/emu/ui/inputmap.cpp:622 src/emu/ui/miscmenu.cpp:92
 #: src/emu/ui/slotopt.cpp:172
 msgid "Reset"
 msgstr "Reiniciar"
@@ -702,27 +702,27 @@ msgstr "Info de Bookkeeping"
 msgid "Machine Information"
 msgstr "Informação da Máquina"
 
-#: src/emu/ui/mainmenu.cpp:78
+#: src/emu/ui/mainmenu.cpp:80
 msgid "Image Information"
 msgstr "Informação da Imagem"
 
-#: src/emu/ui/mainmenu.cpp:81
+#: src/emu/ui/mainmenu.cpp:83
 msgid "File Manager"
 msgstr "Gerenciador de Arquivos"
 
-#: src/emu/ui/mainmenu.cpp:86
+#: src/emu/ui/mainmenu.cpp:92
 msgid "Tape Control"
 msgstr "Controle da Fita"
 
-#: src/emu/ui/mainmenu.cpp:94
+#: src/emu/ui/mainmenu.cpp:99
 msgid "Bios Selection"
 msgstr "Seleção da Bios"
 
-#: src/emu/ui/mainmenu.cpp:100
+#: src/emu/ui/mainmenu.cpp:104
 msgid "Slot Devices"
 msgstr "Dispositivos de Slot"
 
-#: src/emu/ui/mainmenu.cpp:107
+#: src/emu/ui/mainmenu.cpp:109
 msgid "Barcode Reader"
 msgstr "Leitor de código de barras"
 
@@ -730,43 +730,43 @@ msgstr "Leitor de código de barras"
 msgid "Network Devices"
 msgstr "Dispositivos de rede"
 
-#: src/emu/ui/mainmenu.cpp:119
+#: src/emu/ui/mainmenu.cpp:118
 msgid "Keyboard Mode"
 msgstr "Modo Teclado"
 
-#: src/emu/ui/mainmenu.cpp:122
+#: src/emu/ui/mainmenu.cpp:121
 msgid "Slider Controls"
 msgstr "Controles Deslizantes"
 
-#: src/emu/ui/mainmenu.cpp:125
+#: src/emu/ui/mainmenu.cpp:124
 msgid "Video Options"
 msgstr "Opções de Vídeo"
 
-#: src/emu/ui/mainmenu.cpp:129
+#: src/emu/ui/mainmenu.cpp:128
 msgid "Crosshair Options"
 msgstr "Opções de Mira"
 
-#: src/emu/ui/mainmenu.cpp:133
+#: src/emu/ui/mainmenu.cpp:132
 msgid "Cheat"
 msgstr "Truques"
 
-#: src/emu/ui/mainmenu.cpp:136
+#: src/emu/ui/mainmenu.cpp:135
 msgid "Plugin Options"
 msgstr "Opções dos Plugins"
 
-#: src/emu/ui/mainmenu.cpp:140
+#: src/emu/ui/mainmenu.cpp:139
 msgid "External DAT View"
 msgstr "Visualização de DAT Externa"
 
-#: src/emu/ui/mainmenu.cpp:146
+#: src/emu/ui/mainmenu.cpp:145 src/emu/ui/miscmenu.cpp:785
 msgid "Add To Favorites"
 msgstr "Adicionar aos Favoritos"
 
-#: src/emu/ui/mainmenu.cpp:148
+#: src/emu/ui/mainmenu.cpp:147 src/emu/ui/miscmenu.cpp:787
 msgid "Remove From Favorites"
 msgstr "Remover dos Favoritos"
 
-#: src/emu/ui/mainmenu.cpp:155
+#: src/emu/ui/mainmenu.cpp:154
 msgid "Select New Machine"
 msgstr "Selecionar Nova Máquina"
 
@@ -806,45 +806,45 @@ msgstr "Sair"
 msgid "Return to Previous Menu"
 msgstr "Voltar ao Menu Anterior"
 
-#: src/emu/ui/menu.cpp:716
+#: src/emu/ui/menu.cpp:761
 msgid "Auto"
 msgstr "Automático"
 
-#: src/emu/ui/menu.cpp:2133
+#: src/emu/ui/menu.cpp:2195
 msgid "Images"
 msgstr "Imagens"
 
-#: src/emu/ui/menu.cpp:2134
+#: src/emu/ui/menu.cpp:2196
 msgid "Infos"
 msgstr "Informações"
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Keyboard Mode:"
 msgstr "Modo Teclado"
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Natural"
 msgstr "Natural"
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Emulated"
 msgstr "Emulado"
 
-#: src/emu/ui/miscmenu.cpp:240
+#: src/emu/ui/miscmenu.cpp:241
 #, c-format
 msgid ""
 "Uptime: %1$d:%2$02d:%3$02d\n"
 "\n"
 msgstr "Tempo em execução: %1$d:%2$02d:%3$02d\n"
 
-#: src/emu/ui/miscmenu.cpp:242
+#: src/emu/ui/miscmenu.cpp:243
 #, c-format
 msgid ""
 "Uptime: %1$d:%2$02d\n"
 "\n"
 msgstr "Tempo em execução: %1$d:%2$02d\n"
 
-#: src/emu/ui/miscmenu.cpp:246
+#: src/emu/ui/miscmenu.cpp:247
 #, c-format
 msgid ""
 "Tickets dispensed: %1$d\n"
@@ -853,109 +853,50 @@ msgstr ""
 "Tickets emitidos: %1$d\n"
 "\n"
 
-#: src/emu/ui/miscmenu.cpp:257
+#: src/emu/ui/miscmenu.cpp:258
 msgid "Coin %1$c: NA%3$s\n"
 msgstr "Ficha %1$c: NA%3$s\n"
 
-#: src/emu/ui/miscmenu.cpp:257
+#: src/emu/ui/miscmenu.cpp:258
 #, c-format
 msgid "Coin %1$c: %2$d%3$s\n"
 msgstr "Ficha %1$c: %2$d%3$s\n"
 
-#: src/emu/ui/miscmenu.cpp:260
+#: src/emu/ui/miscmenu.cpp:261
 msgid " (locked)"
 msgstr "(travado)"
 
-#: src/emu/ui/miscmenu.cpp:519
+#: src/emu/ui/miscmenu.cpp:520
 msgid "Visible Delay"
 msgstr "Atraso Visível"
 
-#: src/emu/ui/miscmenu.cpp:617
+#: src/emu/ui/miscmenu.cpp:619
 #, c-format
 msgid "%s.xml saved under ui folder."
 msgstr "%/.xml salvo no diretório ui."
 
-#: src/emu/ui/miscmenu.cpp:645
+#: src/emu/ui/miscmenu.cpp:647
 msgid "Name:             Description:\n"
 msgstr "Nome:             Descrição:\n"
 
-#: src/emu/ui/miscmenu.cpp:657
+#: src/emu/ui/miscmenu.cpp:659
 #, c-format
 msgid "%s.txt saved under ui folder."
 msgstr "%s.txt salvo no diretório ui."
 
-#: src/emu/ui/miscmenu.cpp:675
-msgid "Export XML format (like -listxml)"
-msgstr "Exportar em formato XML (como -listxml)"
+#: src/emu/ui/miscmenu.cpp:677
+msgid "Export list in XML format (like -listxml)"
+msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:676
-msgid "Export TXT format (like -listfull)"
-msgstr "Exportar em formato TXT (como -listfull)"
+#: src/emu/ui/miscmenu.cpp:678
+msgid "Export list in XML format (like -listxml, but exclude devices)"
+msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:734
-msgid "Dummy"
-msgstr "Simulado"
+#: src/emu/ui/miscmenu.cpp:679
+msgid "Export list in TXT format (like -listfull)"
+msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:736
-msgid "Save machine configuration"
-msgstr "Salvar Configuração da Máquina"
-
-#: src/emu/ui/miscmenu.cpp:848 src/emu/ui/miscmenu.cpp:869
-#: src/emu/ui/selgame.cpp:594
-msgid "Plugins"
-msgstr "Plugins"
-
-#: src/emu/ui/optsmenu.cpp:218
-msgid "Filter"
-msgstr "Filtro"
-
-#: src/emu/ui/optsmenu.cpp:226
-msgid " ^!File"
-msgstr " ^!Arquivo"
-
-#: src/emu/ui/optsmenu.cpp:231
-msgid " ^!Category"
-msgstr " ^!Categoria"
-
-#: src/emu/ui/optsmenu.cpp:254
-msgid "^!Setup custom filter"
-msgstr "^!Configurar filtro personalizado"
-
-#: src/emu/ui/optsmenu.cpp:262
-msgid "Customize UI"
-msgstr "Customizar Interface"
-
-#: src/emu/ui/optsmenu.cpp:263
-msgid "Configure Directories"
-msgstr "Configurar Diretórios"
-
-#: src/emu/ui/optsmenu.cpp:266 src/emu/ui/sndmenu.cpp:151
-#: src/emu/ui/sndmenu.cpp:172
-msgid "Sound Options"
-msgstr "Opções de Som"
-
-#: src/emu/ui/optsmenu.cpp:269
-msgid "General Inputs"
-msgstr "Entradas Gerais"
-
-#: src/emu/ui/optsmenu.cpp:272
-msgid "Save Configuration"
-msgstr "Salvar Configuração"
-
-#: src/emu/ui/optsmenu.cpp:286 src/emu/ui/optsmenu.cpp:307
-msgid "Settings"
-msgstr "Configurações"
-
-#: src/emu/ui/optsmenu.cpp:327
-msgid "**Error saving ui.ini**"
-msgstr "**Erro ao salvar ui.ini**"
-
-#: src/emu/ui/optsmenu.cpp:374
-#, c-format
-msgid "**Error saving %s.ini**"
-msgstr "**Erro ao salvar %s.ini**"
-
-#: src/emu/ui/optsmenu.cpp:378
+#: src/emu/ui/miscmenu.cpp:729 src/emu/ui/optsmenu.cpp:376
 msgid ""
 "\n"
 "    Configuration saved    \n"
@@ -965,296 +906,375 @@ msgstr ""
 "    Configuração salva    \n"
 "\n"
 
-#: src/emu/ui/selector.cpp:166
+#: src/emu/ui/miscmenu.cpp:774
+msgid "Bios"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:776
+msgid "Driver"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:790
+msgid "Save machine configuration"
+msgstr "Salvar Configuração da Máquina"
+
+#: src/emu/ui/miscmenu.cpp:806
+msgid "Configure machine:"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:868 src/emu/ui/selsoft.cpp:109
+msgid " (default)"
+msgstr " (padrão)"
+
+#: src/emu/ui/miscmenu.cpp:953 src/emu/ui/miscmenu.cpp:973
+#: src/emu/ui/selgame.cpp:600
+msgid "Plugins"
+msgstr "Plugins"
+
+#: src/emu/ui/optsmenu.cpp:217
+msgid "Filter"
+msgstr "Filtro"
+
+#: src/emu/ui/optsmenu.cpp:225
+msgid " ^!File"
+msgstr " ^!Arquivo"
+
+#: src/emu/ui/optsmenu.cpp:230
+msgid " ^!Category"
+msgstr " ^!Categoria"
+
+#: src/emu/ui/optsmenu.cpp:253
+msgid "^!Setup custom filter"
+msgstr "^!Configurar filtro personalizado"
+
+#: src/emu/ui/optsmenu.cpp:261
+msgid "Customize UI"
+msgstr "Customizar Interface"
+
+#: src/emu/ui/optsmenu.cpp:262
+msgid "Configure Directories"
+msgstr "Configurar Diretórios"
+
+#: src/emu/ui/optsmenu.cpp:265 src/emu/ui/sndmenu.cpp:149
+#: src/emu/ui/sndmenu.cpp:169
+msgid "Sound Options"
+msgstr "Opções de Som"
+
+#: src/emu/ui/optsmenu.cpp:268
+msgid "General Inputs"
+msgstr "Entradas Gerais"
+
+#: src/emu/ui/optsmenu.cpp:271
+msgid "Save Configuration"
+msgstr "Salvar Configuração"
+
+#: src/emu/ui/optsmenu.cpp:285 src/emu/ui/optsmenu.cpp:305
+msgid "Settings"
+msgstr "Configurações"
+
+#: src/emu/ui/optsmenu.cpp:325
+msgid "**Error saving ui.ini**"
+msgstr "**Erro ao salvar ui.ini**"
+
+#: src/emu/ui/optsmenu.cpp:372
+#, c-format
+msgid "**Error saving %s.ini**"
+msgstr "**Erro ao salvar %s.ini**"
+
+#: src/emu/ui/selector.cpp:165
 msgid "Selection List - Search: "
 msgstr "Lista de Seleção - Busca: "
 
-#: src/emu/ui/selector.cpp:196
+#: src/emu/ui/selector.cpp:194
 #, c-format
 msgid "Double click or press %1$s to select"
 msgstr "Pressione %1$s ou clique duas vezes para selecionar"
 
-#: src/emu/ui/selgame.cpp:39
+#: src/emu/ui/selgame.cpp:38
 msgid "General Info"
 msgstr "Informações Gerais"
 
-#: src/emu/ui/selgame.cpp:374 src/emu/ui/selsoft.cpp:282
+#: src/emu/ui/selgame.cpp:380 src/emu/ui/selsoft.cpp:281
 #, c-format
 msgid ""
 "%s\n"
 " added to favorites list."
 msgstr " adicionado à lista de favoritos."
 
-#: src/emu/ui/selgame.cpp:380 src/emu/ui/selgame.cpp:389
-#: src/emu/ui/selsoft.cpp:287
+#: src/emu/ui/selgame.cpp:386 src/emu/ui/selgame.cpp:395
+#: src/emu/ui/selsoft.cpp:286
 #, c-format
 msgid ""
 "%s\n"
 " removed from favorites list."
 msgstr " removido da lista de favoritos."
 
-#: src/emu/ui/selgame.cpp:450
+#: src/emu/ui/selgame.cpp:457
 msgid ""
 "The selected machine is missing one or more required ROM or CHD images. "
 "Please select a different machine.\n"
 "\n"
 "Press any key to continue."
 msgstr ""
-"A máquina selecionada está faltando uma ou mais imagens CHD ou ROMS necessárias. "
-"Por favor selecione uma máquina diferente.\n"
+"A máquina selecionada está faltando uma ou mais imagens CHD ou ROMS "
+"necessárias. Por favor selecione uma máquina diferente.\n"
 "\n"
 "Pressione qualquer tecla para continuar."
 
-#: src/emu/ui/selgame.cpp:589 src/emu/ui/simpleselgame.cpp:265
+#: src/emu/ui/selgame.cpp:595 src/emu/ui/simpleselgame.cpp:265
 msgid "Configure Options"
 msgstr "Opções de configuração"
 
-#: src/emu/ui/selgame.cpp:752
+#: src/emu/ui/selgame.cpp:596
+msgid "Configure Machine"
+msgstr "Configurar Máquina"
+
+#: src/emu/ui/selgame.cpp:758
 #, c-format
 msgid "%1$s %2$s ( %3$d / %4$d machines (%5$d BIOS) )"
 msgstr "%1$s %2$s ( %3$d / %4$d máquinas (%5$d BIOS) )"
 
-#: src/emu/ui/selgame.cpp:762
+#: src/emu/ui/selgame.cpp:768
 #, c-format
 msgid "%1$s (%2$s - %3$s) - "
 msgstr "%1$s (%2$s - %3$s) -"
 
-#: src/emu/ui/selgame.cpp:769 src/emu/ui/selgame.cpp:775
+#: src/emu/ui/selgame.cpp:775 src/emu/ui/selgame.cpp:781
 #, c-format
 msgid "%1$s (%2$s) - "
 msgstr "%1$s (%2$s) - "
 
-#: src/emu/ui/selgame.cpp:784
+#: src/emu/ui/selgame.cpp:790
 #, c-format
 msgid "%1$s Search: %2$s_"
 msgstr "%1$s Busca: %2$s_"
 
-#: src/emu/ui/selgame.cpp:838
+#: src/emu/ui/selgame.cpp:844
 #, c-format
 msgid "Romset: %1$-.100s"
 msgstr "Romset: %1$-.100s"
 
-#: src/emu/ui/selgame.cpp:841 src/emu/ui/selgame.cpp:890
-#: src/emu/ui/selsoft.cpp:751 src/emu/ui/selsoft.cpp:801
+#: src/emu/ui/selgame.cpp:847 src/emu/ui/selgame.cpp:896
+#: src/emu/ui/selsoft.cpp:750 src/emu/ui/selsoft.cpp:800
 #: src/emu/ui/simpleselgame.cpp:328
 #, c-format
 msgid "%1$s, %2$-.100s"
 msgstr "%1$s, %2$-.100s"
 
-#: src/emu/ui/selgame.cpp:847 src/emu/ui/selsoft.cpp:757
+#: src/emu/ui/selgame.cpp:853 src/emu/ui/selsoft.cpp:756
 #, c-format
 msgid "Driver is clone of: %1$-.100s"
 msgstr "Driver é clone de: %1$-.100s"
 
-#: src/emu/ui/selgame.cpp:849 src/emu/ui/selsoft.cpp:759
+#: src/emu/ui/selgame.cpp:855 src/emu/ui/selsoft.cpp:758
 msgid "Driver is parent"
 msgstr "Driver é o principal"
 
-#: src/emu/ui/selgame.cpp:853 src/emu/ui/selsoft.cpp:763
+#: src/emu/ui/selgame.cpp:859 src/emu/ui/selsoft.cpp:762
 #: src/emu/ui/simpleselgame.cpp:335
 msgid "Overall: NOT WORKING"
 msgstr "Geral: NÃO FUNCIONA"
 
-#: src/emu/ui/selgame.cpp:855 src/emu/ui/selsoft.cpp:765
+#: src/emu/ui/selgame.cpp:861 src/emu/ui/selsoft.cpp:764
 #: src/emu/ui/simpleselgame.cpp:337
 msgid "Overall: Unemulated Protection"
 msgstr "Geral: Proteção Não Emulada"
 
-#: src/emu/ui/selgame.cpp:857 src/emu/ui/selsoft.cpp:767
+#: src/emu/ui/selgame.cpp:863 src/emu/ui/selsoft.cpp:766
 #: src/emu/ui/simpleselgame.cpp:339
 msgid "Overall: Working"
 msgstr "Geral: Funcionando"
 
-#: src/emu/ui/selgame.cpp:861 src/emu/ui/selsoft.cpp:771
+#: src/emu/ui/selgame.cpp:867 src/emu/ui/selsoft.cpp:770
 msgid "Graphics: Imperfect, "
 msgstr "Gráficos: Imperfeitos, "
 
-#: src/emu/ui/selgame.cpp:863 src/emu/ui/selsoft.cpp:773
+#: src/emu/ui/selgame.cpp:869 src/emu/ui/selsoft.cpp:772
 msgid "Graphics: OK, "
 msgstr "Gráficos: OK, "
 
-#: src/emu/ui/selgame.cpp:866 src/emu/ui/selsoft.cpp:776
+#: src/emu/ui/selgame.cpp:872 src/emu/ui/selsoft.cpp:775
 msgid "Sound: Unimplemented"
 msgstr "Som: Não Implementado"
 
-#: src/emu/ui/selgame.cpp:868 src/emu/ui/selsoft.cpp:778
+#: src/emu/ui/selgame.cpp:874 src/emu/ui/selsoft.cpp:777
 msgid "Sound: Imperfect"
 msgstr "Som: Imperfeito"
 
-#: src/emu/ui/selgame.cpp:870 src/emu/ui/selsoft.cpp:780
+#: src/emu/ui/selgame.cpp:876 src/emu/ui/selsoft.cpp:779
 msgid "Sound: OK"
 msgstr "Som: OK"
 
-#: src/emu/ui/selgame.cpp:887
+#: src/emu/ui/selgame.cpp:893
 #, c-format
 msgid "System: %1$-.100s"
 msgstr "Sistema: %1$-.100s"
 
-#: src/emu/ui/selgame.cpp:894 src/emu/ui/selsoft.cpp:805
+#: src/emu/ui/selgame.cpp:900 src/emu/ui/selsoft.cpp:804
 #, c-format
 msgid "Software is clone of: %1$-.100s"
 msgstr "Programa é clone de: %1$-.100s"
 
-#: src/emu/ui/selgame.cpp:896 src/emu/ui/selsoft.cpp:807
+#: src/emu/ui/selgame.cpp:902 src/emu/ui/selsoft.cpp:806
 msgid "Software is parent"
 msgstr "Programa é o principal"
 
-#: src/emu/ui/selgame.cpp:901 src/emu/ui/selsoft.cpp:812
+#: src/emu/ui/selgame.cpp:907 src/emu/ui/selsoft.cpp:811
 msgid "Supported: No"
 msgstr "Suportado: Não"
 
-#: src/emu/ui/selgame.cpp:906 src/emu/ui/selsoft.cpp:817
+#: src/emu/ui/selgame.cpp:912 src/emu/ui/selsoft.cpp:816
 msgid "Supported: Partial"
 msgstr "Suportado: Parcialmente"
 
-#: src/emu/ui/selgame.cpp:911 src/emu/ui/selsoft.cpp:822
+#: src/emu/ui/selgame.cpp:917 src/emu/ui/selsoft.cpp:821
 msgid "Supported: Yes"
 msgstr "Suportado: Sim"
 
-#: src/emu/ui/selgame.cpp:916 src/emu/ui/selsoft.cpp:827
+#: src/emu/ui/selgame.cpp:922 src/emu/ui/selsoft.cpp:826
 #, c-format
 msgid "romset: %1$-.100s"
 msgstr "romset: %1$-.100s"
 
-#: src/emu/ui/selgame.cpp:923
+#: src/emu/ui/selgame.cpp:929
 #, c-format
 msgid "%1$s %2$s"
 msgstr "%1$s %2$s"
 
-#: src/emu/ui/selgame.cpp:1535
+#: src/emu/ui/selgame.cpp:1543
 #, c-format
 msgid "Romset: %1$-.100s\n"
 msgstr "Romset: %1$-.100s\n"
 
-#: src/emu/ui/selgame.cpp:1536
+#: src/emu/ui/selgame.cpp:1544
 #, c-format
 msgid "Year: %1$s\n"
 msgstr "Ano: %1$s\n"
 
-#: src/emu/ui/selgame.cpp:1537
+#: src/emu/ui/selgame.cpp:1545
 #, c-format
 msgid "Manufacturer: %1$-.100s\n"
 msgstr "Fabricante: %1$-.100s\n"
 
-#: src/emu/ui/selgame.cpp:1541
+#: src/emu/ui/selgame.cpp:1549
 #, c-format
 msgid "Driver is Clone of: %1$-.100s\n"
 msgstr "Driver é Clone de: %1$-.100s\n"
 
-#: src/emu/ui/selgame.cpp:1543
+#: src/emu/ui/selgame.cpp:1551
 msgid "Driver is Parent\n"
 msgstr "Driver é o Principal\n"
 
-#: src/emu/ui/selgame.cpp:1546
+#: src/emu/ui/selgame.cpp:1554
 msgid "Overall: NOT WORKING\n"
 msgstr "Geral: NÃO FUNCIONA\n"
 
-#: src/emu/ui/selgame.cpp:1548
+#: src/emu/ui/selgame.cpp:1556
 msgid "Overall: Unemulated Protection\n"
 msgstr "Geral: Proteção Não Emulada\n"
 
-#: src/emu/ui/selgame.cpp:1550
+#: src/emu/ui/selgame.cpp:1558
 msgid "Overall: Working\n"
 msgstr "Geral: Funcionando\n"
 
-#: src/emu/ui/selgame.cpp:1553
+#: src/emu/ui/selgame.cpp:1561
 msgid "Graphics: Imperfect Colors\n"
 msgstr "Gráficos: Cores Imperfeitas\n"
 
-#: src/emu/ui/selgame.cpp:1557
+#: src/emu/ui/selgame.cpp:1565
 msgid "Graphics: Imperfect\n"
 msgstr "Gráficos: Imperfeitos\n"
 
-#: src/emu/ui/selgame.cpp:1559
+#: src/emu/ui/selgame.cpp:1567
 msgid "Graphics: OK\n"
 msgstr "Gráficos: OK\n"
 
-#: src/emu/ui/selgame.cpp:1562
+#: src/emu/ui/selgame.cpp:1570
 msgid "Sound: Unimplemented\n"
 msgstr "Som: Não Implementado\n"
 
-#: src/emu/ui/selgame.cpp:1564
+#: src/emu/ui/selgame.cpp:1572
 msgid "Sound: Imperfect\n"
 msgstr "Som: Imperfeito\n"
 
-#: src/emu/ui/selgame.cpp:1566
+#: src/emu/ui/selgame.cpp:1574
 msgid "Sound: OK\n"
 msgstr "Som: OK\n"
 
-#: src/emu/ui/selgame.cpp:1568
+#: src/emu/ui/selgame.cpp:1576
 #, c-format
 msgid "Driver is Skeleton: %1$s\n"
 msgstr "Driver é Preliminar: %1$s\n"
 
-#: src/emu/ui/selgame.cpp:1569
+#: src/emu/ui/selgame.cpp:1577
 #, c-format
 msgid "Game is Mechanical: %1$s\n"
 msgstr "Jogo é Mecânico: %1$s\n"
 
-#: src/emu/ui/selgame.cpp:1570
+#: src/emu/ui/selgame.cpp:1578
 #, c-format
 msgid "Requires Artwork: %1$s\n"
 msgstr "Requer Arte: %1$s\n"
 
-#: src/emu/ui/selgame.cpp:1571
+#: src/emu/ui/selgame.cpp:1579
 #, c-format
 msgid "Requires Clickable Artwork: %1$s\n"
 msgstr "Requer Arte Clicável: %1$s\n"
 
-#: src/emu/ui/selgame.cpp:1572
+#: src/emu/ui/selgame.cpp:1580
 #, c-format
 msgid "Support Cocktail: %1$s\n"
 msgstr "Suporta Cocktail: %1$s\n"
 
-#: src/emu/ui/selgame.cpp:1573
+#: src/emu/ui/selgame.cpp:1581
 #, c-format
 msgid "Driver is Bios: %1$s\n"
 msgstr "Driver é Bios: %1$s\n"
 
-#: src/emu/ui/selgame.cpp:1574
+#: src/emu/ui/selgame.cpp:1582
 #, c-format
 msgid "Support Save: %1$s\n"
 msgstr "Suporta Salvar: %1$s\n"
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 #, c-format
 msgid "Screen Orientation: %1$s\n"
 msgstr "Orientação da Tela: %1$s\n"
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 msgid "Vertical"
 msgstr "Vertical"
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 msgid "Horizontal"
 msgstr "Horizontal"
 
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/selgame.cpp:1591
 #, c-format
 msgid "Requires CHD: %1$s\n"
 msgstr "Requer CHD: %1$s\n"
 
-#: src/emu/ui/selgame.cpp:1596
+#: src/emu/ui/selgame.cpp:1604
 msgid "Roms Audit Pass: OK\n"
 msgstr "Checagem de Roms: OK\n"
 
-#: src/emu/ui/selgame.cpp:1598
+#: src/emu/ui/selgame.cpp:1606
 msgid "Roms Audit Pass: BAD\n"
 msgstr "Checagem de Roms: ERRO\n"
 
-#: src/emu/ui/selgame.cpp:1601
+#: src/emu/ui/selgame.cpp:1609
 msgid "Samples Audit Pass: None Needed\n"
 msgstr "Checagem de Amostras Sonoras: Não Necessárias\n"
 
-#: src/emu/ui/selgame.cpp:1603
+#: src/emu/ui/selgame.cpp:1611
 msgid "Samples Audit Pass: OK\n"
 msgstr "Checagem de Amostras Sonoras: OK\n"
 
-#: src/emu/ui/selgame.cpp:1605
+#: src/emu/ui/selgame.cpp:1613
 msgid "Samples Audit Pass: BAD\n"
 msgstr "Checagem de Amostras Sonoras: ERRO\n"
 
-#: src/emu/ui/selgame.cpp:1608
+#: src/emu/ui/selgame.cpp:1616
 msgid ""
 "Roms Audit Pass: Disabled\n"
 "Samples Audit Pass: Disabled\n"
@@ -1262,82 +1282,78 @@ msgstr ""
 "Progresso da Auditoria de Roms: Desativado\n"
 "Progresso da Auditoria de Amostras: Desativado\n"
 
-#: src/emu/ui/selgame.cpp:2049 src/emu/ui/selgame.cpp:2212
-#: src/emu/ui/selsoft.cpp:1662
+#: src/emu/ui/selgame.cpp:2055 src/emu/ui/selgame.cpp:2216
+#: src/emu/ui/selsoft.cpp:1655
 msgid "No Infos Available"
 msgstr "Sem Informação Disponível"
 
-#: src/emu/ui/selgame.cpp:2162 src/emu/ui/selsoft.cpp:1607
+#: src/emu/ui/selgame.cpp:2168 src/emu/ui/selsoft.cpp:1602
 msgid "Usage"
 msgstr "Uso"
 
-#: src/emu/ui/selsoft.cpp:110
-msgid " (default)"
-msgstr " (padrão)"
-
-#: src/emu/ui/selsoft.cpp:381
+#: src/emu/ui/selsoft.cpp:380
 msgid ""
 "The selected software is missing one or more required files. Please select a "
 "different software.\n"
 "\n"
 "Press any key to continue."
 msgstr ""
-"O programa selecionado está faltando um ou mais arquivos necessários. Por favor selecione um"
-"programa diferente.\n"
+"O programa selecionado está faltando um ou mais arquivos necessários. Por "
+"favor selecione umprograma diferente.\n"
 "\n"
 "Pressione qualquer tecla para continuar."
 
-#: src/emu/ui/selsoft.cpp:684
+#: src/emu/ui/selsoft.cpp:683
 #, c-format
-msgid "%1$s %2$s ( %3$d / %4$d softwares )"
-msgstr "%1$s %2$s ( %3$d / %4$d programas )"
+msgid "%1$s %2$s ( %3$d / %4$d software packages )"
+msgstr ""
 
-#: src/emu/ui/selsoft.cpp:685
+#: src/emu/ui/selsoft.cpp:684
 #, c-format
 msgid "Driver: \"%1$s\" software list "
 msgstr "Driver: \"%1$s\" lista de programas "
 
-#: src/emu/ui/selsoft.cpp:688
+#: src/emu/ui/selsoft.cpp:687
 #, c-format
 msgid "Region: %1$s -"
 msgstr "Região: %1$s -"
 
-#: src/emu/ui/selsoft.cpp:690
+#: src/emu/ui/selsoft.cpp:689
 #, c-format
 msgid "Publisher: %1$s -"
 msgstr "Editor: %1$s -"
 
-#: src/emu/ui/selsoft.cpp:692
+#: src/emu/ui/selsoft.cpp:691
 #, c-format
 msgid "Year: %1$s -"
 msgstr "Ano: %1$s -"
 
-#: src/emu/ui/selsoft.cpp:694
+#: src/emu/ui/selsoft.cpp:693
 #, c-format
 msgid "Software List: %1$s -"
 msgstr "Lista de Programa: %1$s -"
 
-#: src/emu/ui/selsoft.cpp:696
+#: src/emu/ui/selsoft.cpp:695
 #, c-format
 msgid "Device type: %1$s -"
 msgstr "Tipo de Dispositivo"
 
-#: src/emu/ui/selsoft.cpp:698
+#: src/emu/ui/selsoft.cpp:697
 #, c-format
 msgid "%s Search: %s_"
 msgstr "%s Busca: %s_"
 
-#: src/emu/ui/selsoft.cpp:748 src/emu/ui/selsoft.cpp:798
+#: src/emu/ui/selsoft.cpp:747 src/emu/ui/selsoft.cpp:797
 #: src/emu/ui/simpleselgame.cpp:325
 #, c-format
 msgid "%1$-.100s"
 msgstr "%1$-.100s"
 
-#: src/emu/ui/selsoft.cpp:1998 src/emu/ui/selsoft.cpp:2018
+#: src/emu/ui/selsoft.cpp:1991 src/emu/ui/selsoft.cpp:2011
 msgid "Software part selection:"
 msgstr "Seleção por parte de Programa"
 
-#: src/emu/ui/selsoft.cpp:2136 src/emu/ui/selsoft.cpp:2156
+#: src/emu/ui/selsoft.cpp:2129 src/emu/ui/selsoft.cpp:2149
 msgid "Bios selection:"
 msgstr "Seleção da Bios"
 
@@ -1390,15 +1406,15 @@ msgstr "Gfx: %s, Som: %s"
 msgid " [internal]"
 msgstr " [interno]"
 
-#: src/emu/ui/sndmenu.cpp:135
+#: src/emu/ui/sndmenu.cpp:133
 msgid "Sound"
 msgstr "Som"
 
-#: src/emu/ui/sndmenu.cpp:136
+#: src/emu/ui/sndmenu.cpp:134
 msgid "Sample Rate"
 msgstr "Taxa de Amostragem"
 
-#: src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/sndmenu.cpp:135
 msgid "Use External Samples"
 msgstr "Usar Amostras Externas"
 
@@ -1467,13 +1483,13 @@ msgstr "Rebobinar"
 msgid "Fast Forward"
 msgstr "Avanço Rápido"
 
-#: src/emu/ui/ui.cpp:419
+#: src/emu/ui/ui.cpp:418
 msgid "This driver requires images to be loaded in the following device(s): "
 msgstr ""
 "Este driver necessita de imagens para ser carregado nos seguintes "
 "dispositivo(s): "
 
-#: src/emu/ui/ui.cpp:1074
+#: src/emu/ui/ui.cpp:1071
 msgid ""
 "One or more ROMs/CHDs for this machine are incorrect. The machine may not "
 "run correctly.\n"
@@ -1481,56 +1497,56 @@ msgstr ""
 "Uma ou mais ROMs/CHDs para esta máquina estão incorretas. A máquina não irá "
 "funcionar corretamente"
 
-#: src/emu/ui/ui.cpp:1087
+#: src/emu/ui/ui.cpp:1084
 msgid ""
 "There are known problems with this machine\n"
 "\n"
 msgstr "Existem problemas conhecidos com esta máquina"
 
-#: src/emu/ui/ui.cpp:1091
+#: src/emu/ui/ui.cpp:1088
 msgid ""
 "One or more ROMs/CHDs for this machine have not been correctly dumped.\n"
 msgstr ""
 "Uma ou mais ROMs/CHDs para esta máquina não foram corretamente dumpadas. \n"
 " "
 
-#: src/emu/ui/ui.cpp:1095
+#: src/emu/ui/ui.cpp:1092
 #, c-format
 msgid "The keyboard emulation may not be 100% accurate.\n"
 msgstr "A emulação do teclado talvez não seja 100% perfeita.\n"
 
-#: src/emu/ui/ui.cpp:1097
+#: src/emu/ui/ui.cpp:1094
 #, c-format
 msgid "The colors aren't 100% accurate.\n"
 msgstr "As cores não são 100% perfeitas.\n"
 
-#: src/emu/ui/ui.cpp:1099
+#: src/emu/ui/ui.cpp:1096
 msgid "The colors are completely wrong.\n"
 msgstr "As cores são completamente erradas.\n"
 
-#: src/emu/ui/ui.cpp:1101
+#: src/emu/ui/ui.cpp:1098
 #, c-format
 msgid "The video emulation isn't 100% accurate.\n"
 msgstr "A emulação do vídeo não é 100% perfeita.\n"
 
-#: src/emu/ui/ui.cpp:1103
+#: src/emu/ui/ui.cpp:1100
 #, c-format
 msgid "The sound emulation isn't 100% accurate.\n"
 msgstr "A emulação do som não é 100% perfeita.\n"
 
-#: src/emu/ui/ui.cpp:1105
+#: src/emu/ui/ui.cpp:1102
 msgid "The machine lacks sound.\n"
 msgstr "A máquina tem problemas no som.\n"
 
-#: src/emu/ui/ui.cpp:1108
+#: src/emu/ui/ui.cpp:1105
 msgid "Screen flipping in cocktail mode is not supported.\n"
 msgstr "Inversão de tela no modo coquetel não é suportada.\n"
 
-#: src/emu/ui/ui.cpp:1112
+#: src/emu/ui/ui.cpp:1109
 msgid "The machine requires external artwork files\n"
 msgstr "Esta máquina requer arquivos externos de artwork\n"
 
-#: src/emu/ui/ui.cpp:1117
+#: src/emu/ui/ui.cpp:1114
 msgid ""
 "This machine was never completed. It may exhibit strange behavior or missing "
 "elements that are not bugs in the emulation.\n"
@@ -1538,7 +1554,7 @@ msgstr ""
 "Esta máquina nunca foi completada. Ela poderá ter um comportamento estranho "
 "or faltar elementos que não são bugs na emulação"
 
-#: src/emu/ui/ui.cpp:1122
+#: src/emu/ui/ui.cpp:1119
 msgid ""
 "This machine has no sound hardware, MAME will produce no sounds, this is "
 "expected behaviour.\n"
@@ -1546,11 +1562,11 @@ msgstr ""
 "Esta máquina não tem hardware de som, MAME não irá produzir som algum, isto "
 "já é esperado."
 
-#: src/emu/ui/ui.cpp:1130
+#: src/emu/ui/ui.cpp:1127
 msgid "The machine has protection which isn't fully emulated.\n"
 msgstr "A máquina possui proteção a qual não é completamente emulada.\n"
 
-#: src/emu/ui/ui.cpp:1133
+#: src/emu/ui/ui.cpp:1130
 msgid ""
 "\n"
 "THIS MACHINE DOESN'T WORK. The emulation for this machine is not yet "
@@ -1561,7 +1577,7 @@ msgstr ""
 "Não há nada que você possa fazer para fixar isto exceto aguardar os "
 "desenvolvedores improvisarem a emulação.\n"
 
-#: src/emu/ui/ui.cpp:1137
+#: src/emu/ui/ui.cpp:1134
 msgid ""
 "\n"
 "Certain elements of this machine cannot be emulated as it requires actual "
@@ -1572,21 +1588,21 @@ msgstr ""
 "interação física ou de dispositivos mecânicos. Não é possível jogar esta "
 "máquina plenamente.\n"
 
-#: src/emu/ui/ui.cpp:1156
+#: src/emu/ui/ui.cpp:1153
 msgid ""
 "\n"
 "\n"
 "There are working clones of this machine: "
 msgstr "Existem clones funcionando para esta máquina: "
 
-#: src/emu/ui/ui.cpp:1170
+#: src/emu/ui/ui.cpp:1167
 msgid ""
 "\n"
 "\n"
 "Press any key to continue"
 msgstr "Pressione qualquer tecla para continuar"
 
-#: src/emu/ui/ui.cpp:1185
+#: src/emu/ui/ui.cpp:1182
 #, c-format
 msgid ""
 "%1$s\n"
@@ -1601,98 +1617,98 @@ msgstr ""
 "\n"
 "CPU:\n"
 
-#: src/emu/ui/ui.cpp:1221 src/emu/ui/ui.cpp:1260
+#: src/emu/ui/ui.cpp:1218 src/emu/ui/ui.cpp:1257
 msgid "MHz"
 msgstr "MHz"
 
-#: src/emu/ui/ui.cpp:1221 src/emu/ui/ui.cpp:1260
+#: src/emu/ui/ui.cpp:1218 src/emu/ui/ui.cpp:1257
 msgid "kHz"
 msgstr "kHz"
 
-#: src/emu/ui/ui.cpp:1235
+#: src/emu/ui/ui.cpp:1232
 msgid ""
 "\n"
 "Sound:\n"
 msgstr "Som:"
 
-#: src/emu/ui/ui.cpp:1264
+#: src/emu/ui/ui.cpp:1261
 msgid ""
 "\n"
 "Video:\n"
 msgstr "Vídeo:"
 
-#: src/emu/ui/ui.cpp:1268
+#: src/emu/ui/ui.cpp:1265
 msgid "None\n"
 msgstr "Nada"
 
-#: src/emu/ui/ui.cpp:1275
+#: src/emu/ui/ui.cpp:1272
 msgid "Vector"
 msgstr "Vetorial"
 
-#: src/emu/ui/ui.cpp:1286
+#: src/emu/ui/ui.cpp:1283
 #, c-format
 msgid "%1$s: %2$s\n"
 msgstr "%1$s: %2$s\n"
 
-#: src/emu/ui/ui.cpp:1286
+#: src/emu/ui/ui.cpp:1283
 msgid "%2$s\n"
 msgstr "%2$s\n"
 
-#: src/emu/ui/ui.cpp:1541 src/emu/ui/ui.cpp:1551
+#: src/emu/ui/ui.cpp:1538 src/emu/ui/ui.cpp:1548
 msgid "Keyboard Emulation Status"
 msgstr "Situação da Emulação do Teclado"
 
-#: src/emu/ui/ui.cpp:1543
+#: src/emu/ui/ui.cpp:1540
 msgid "Mode: PARTIAL Emulation"
 msgstr "Modo: Emulação PARCIAL"
 
-#: src/emu/ui/ui.cpp:1544
+#: src/emu/ui/ui.cpp:1541
 msgid "UI:   Enabled"
 msgstr "UI:   Ativo"
 
-#: src/emu/ui/ui.cpp:1546 src/emu/ui/ui.cpp:1556
+#: src/emu/ui/ui.cpp:1543 src/emu/ui/ui.cpp:1553
 msgid "**Use ScrLock to toggle**"
 msgstr "**Usar ScrLock para alternar"
 
-#: src/emu/ui/ui.cpp:1553
+#: src/emu/ui/ui.cpp:1550
 msgid "Mode: FULL Emulation"
 msgstr "Modo: Emulação COMPLETA"
 
-#: src/emu/ui/ui.cpp:1554
+#: src/emu/ui/ui.cpp:1551
 msgid "UI:   Disabled"
 msgstr "UI:   Desativado"
 
-#: src/emu/ui/ui.cpp:1692
+#: src/emu/ui/ui.cpp:1689
 msgid "Autofire can't be enabled"
 msgstr "Autodisparo não pode ser ativado"
 
-#: src/emu/ui/ui.cpp:1731
+#: src/emu/ui/ui.cpp:1728
 msgid "Select position to save to"
 msgstr "Selecione a posição para salvar em"
 
-#: src/emu/ui/ui.cpp:1733
+#: src/emu/ui/ui.cpp:1730
 msgid "Select position to load from"
 msgstr "Selecione a posição para carregar de"
 
-#: src/emu/ui/ui.cpp:1757
+#: src/emu/ui/ui.cpp:1754
 msgid "Save cancelled"
 msgstr "Salvar cancelado"
 
-#: src/emu/ui/ui.cpp:1759
+#: src/emu/ui/ui.cpp:1756
 msgid "Load cancelled"
 msgstr "Carregar cancelado"
 
-#: src/emu/ui/ui.cpp:1802
+#: src/emu/ui/ui.cpp:1799
 #, c-format
 msgid "Save to position %s"
 msgstr "Salvar para a posição %s"
 
-#: src/emu/ui/ui.cpp:1807
+#: src/emu/ui/ui.cpp:1804
 #, c-format
 msgid "Load from position %s"
 msgstr "Carregar da posição %s"
 
-#: src/emu/ui/ui.cpp:1847
+#: src/emu/ui/ui.cpp:1844
 #, c-format
 msgid ""
 "Are you sure you want to quit?\n"
@@ -1705,173 +1721,173 @@ msgstr ""
 "Pressione ''%1$s'' para sair,\n"
 "Pressione ''%2$s'' para retornar à emulação."
 
-#: src/emu/ui/ui.cpp:1917
+#: src/emu/ui/ui.cpp:1914
 msgid "Master Volume"
 msgstr "Volume Mestre"
 
-#: src/emu/ui/ui.cpp:1926
+#: src/emu/ui/ui.cpp:1923
 #, c-format
 msgid "%1$s Volume"
 msgstr "%1$s Volume"
 
-#: src/emu/ui/ui.cpp:1949
+#: src/emu/ui/ui.cpp:1946
 #, c-format
 msgid "Overclock CPU %1$s"
 msgstr "Overclock CPU %1$s"
 
-#: src/emu/ui/ui.cpp:1968
+#: src/emu/ui/ui.cpp:1965
 #, c-format
 msgid "%1$s Refresh Rate"
 msgstr "Taxa de Atualização da %1$s"
 
-#: src/emu/ui/ui.cpp:1973
+#: src/emu/ui/ui.cpp:1970
 #, c-format
 msgid "%1$s Brightness"
 msgstr "Brilho da %1$s"
 
-#: src/emu/ui/ui.cpp:1975
+#: src/emu/ui/ui.cpp:1972
 #, c-format
 msgid "%1$s Contrast"
 msgstr "Contraste da %1$s"
 
-#: src/emu/ui/ui.cpp:1977
+#: src/emu/ui/ui.cpp:1974
 #, c-format
 msgid "%1$s Gamma"
 msgstr "Gama da %1$s"
 
-#: src/emu/ui/ui.cpp:1981
+#: src/emu/ui/ui.cpp:1978
 #, c-format
 msgid "%1$s Horiz Stretch"
 msgstr "Extensão Horizontal da %1$s"
 
-#: src/emu/ui/ui.cpp:1983
+#: src/emu/ui/ui.cpp:1980
 #, c-format
 msgid "%1$s Horiz Position"
 msgstr "Posição Horizontal %1$s"
 
-#: src/emu/ui/ui.cpp:1985
+#: src/emu/ui/ui.cpp:1982
 #, c-format
 msgid "%1$s Vert Stretch"
 msgstr "Extensão Vertical da %1$s"
 
-#: src/emu/ui/ui.cpp:1987
+#: src/emu/ui/ui.cpp:1984
 #, c-format
 msgid "%1$s Vert Position"
 msgstr "Posição Vertical da %1$s"
 
-#: src/emu/ui/ui.cpp:2005
+#: src/emu/ui/ui.cpp:2002
 #, c-format
 msgid "Laserdisc '%1$s' Horiz Stretch"
 msgstr "Laserdisc '%1$s' Extensão Horizontal"
 
-#: src/emu/ui/ui.cpp:2007
+#: src/emu/ui/ui.cpp:2004
 #, c-format
 msgid "Laserdisc '%1$s' Horiz Position"
 msgstr "Laserdisc '%1$s' Posição Horizontal"
 
-#: src/emu/ui/ui.cpp:2009
+#: src/emu/ui/ui.cpp:2006
 #, c-format
 msgid "Laserdisc '%1$s' Vert Stretch"
 msgstr "Laserdisc '%1$s' Extensão Vertical"
 
-#: src/emu/ui/ui.cpp:2011
+#: src/emu/ui/ui.cpp:2008
 #, c-format
 msgid "Laserdisc '%1$s' Vert Position"
 msgstr "Laserdisc '%1$s' Posição Vertical"
 
-#: src/emu/ui/ui.cpp:2021
+#: src/emu/ui/ui.cpp:2018
 msgid "Vector Flicker"
 msgstr "Flicker Vetorial"
 
-#: src/emu/ui/ui.cpp:2022
+#: src/emu/ui/ui.cpp:2019
 msgid "Beam Width Minimum"
 msgstr "Largura Mínima do Feixe de Luz"
 
-#: src/emu/ui/ui.cpp:2023
+#: src/emu/ui/ui.cpp:2020
 msgid "Beam Width Maximum"
 msgstr "Largura Máxima do Feixe de Luz"
 
-#: src/emu/ui/ui.cpp:2024
+#: src/emu/ui/ui.cpp:2021
 msgid "Beam Intensity Weight"
 msgstr "Intensidade do tamanho do Feixe de Luz"
 
-#: src/emu/ui/ui.cpp:2037
+#: src/emu/ui/ui.cpp:2034
 #, c-format
 msgid "Crosshair Scale %1$s"
 msgstr "Escala da Mira %1$s"
 
-#: src/emu/ui/ui.cpp:2037 src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2034 src/emu/ui/ui.cpp:2036
 msgid "X"
 msgstr "X"
 
-#: src/emu/ui/ui.cpp:2037 src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2034 src/emu/ui/ui.cpp:2036
 msgid "Y"
 msgstr "Y"
 
-#: src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2036
 #, c-format
 msgid "Crosshair Offset %1$s"
 msgstr "Ajuste da Mira"
 
-#: src/emu/ui/ui.cpp:2071
+#: src/emu/ui/ui.cpp:2068
 #, c-format
 msgid "%1$3ddB"
 msgstr "%1$3ddB"
 
-#: src/emu/ui/ui.cpp:2115
+#: src/emu/ui/ui.cpp:2112
 #, c-format
 msgid "%1$d%%"
 msgstr "%1$d%%"
 
-#: src/emu/ui/ui.cpp:2131
+#: src/emu/ui/ui.cpp:2128
 #, c-format
 msgid "%1$3.0f%%"
 msgstr "%1$3.0f%%"
 
-#: src/emu/ui/ui.cpp:2154
+#: src/emu/ui/ui.cpp:2151
 #, c-format
 msgid "%1$.3ffps"
 msgstr "%1$.3ffps"
 
-#: src/emu/ui/ui.cpp:2177 src/emu/ui/ui.cpp:2199 src/emu/ui/ui.cpp:2220
-#: src/emu/ui/ui.cpp:2242 src/emu/ui/ui.cpp:2264 src/emu/ui/ui.cpp:2286
-#: src/emu/ui/ui.cpp:2308 src/emu/ui/ui.cpp:2330 src/emu/ui/ui.cpp:2352
-#: src/emu/ui/ui.cpp:2374 src/emu/ui/ui.cpp:2396
+#: src/emu/ui/ui.cpp:2174 src/emu/ui/ui.cpp:2196 src/emu/ui/ui.cpp:2217
+#: src/emu/ui/ui.cpp:2239 src/emu/ui/ui.cpp:2261 src/emu/ui/ui.cpp:2283
+#: src/emu/ui/ui.cpp:2305 src/emu/ui/ui.cpp:2327 src/emu/ui/ui.cpp:2349
+#: src/emu/ui/ui.cpp:2371 src/emu/ui/ui.cpp:2393
 #, c-format
 msgid "%1$.3f"
 msgstr "%1$.3f"
 
-#: src/emu/ui/ui.cpp:2412 src/emu/ui/ui.cpp:2428 src/emu/ui/ui.cpp:2444
-#: src/emu/ui/ui.cpp:2460
+#: src/emu/ui/ui.cpp:2408 src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2438
+#: src/emu/ui/ui.cpp:2453
 #, c-format
 msgid "%1$1.2f"
 msgstr "%1$1.2f"
 
-#: src/emu/ui/ui.cpp:2476
+#: src/emu/ui/ui.cpp:2469
 #, c-format
 msgid "Screen '%1$s'"
 msgstr "Tela '%1$s'"
 
-#: src/emu/ui/ui.cpp:2478
+#: src/emu/ui/ui.cpp:2471
 msgid "Screen"
 msgstr "Tela"
 
-#: src/emu/ui/ui.cpp:2494
+#: src/emu/ui/ui.cpp:2487
 #, c-format
 msgid "Crosshair Scale X %1$1.3f"
 msgstr "Escala da Mira X %1$1.3f"
 
-#: src/emu/ui/ui.cpp:2494
+#: src/emu/ui/ui.cpp:2487
 #, c-format
 msgid "Crosshair Scale Y %1$1.3f"
 msgstr "Escala da Mira Y %1$1.3f"
 
-#: src/emu/ui/ui.cpp:2513
+#: src/emu/ui/ui.cpp:2506
 #, c-format
 msgid "Crosshair Offset X %1$1.3f"
 msgstr "Ajuste da Mira X %1$1.3f"
 
-#: src/emu/ui/ui.cpp:2513
+#: src/emu/ui/ui.cpp:2506
 #, c-format
 msgid "Crosshair Offset Y %1$1.3f"
 msgstr "Ajuste da Mira Y %1$1.3f"
@@ -1913,14 +1929,26 @@ msgstr "Cortado"
 msgid "Full"
 msgstr "Cheio"
 
-#: src/emu/ui/viewgfx.cpp:392
+#: src/emu/ui/viewgfx.cpp:391
 msgid " COLORS"
 msgstr " CORES"
 
-#: src/emu/ui/viewgfx.cpp:392
+#: src/emu/ui/viewgfx.cpp:391
 msgid " PENS"
 msgstr " CANETAS"
 
+#~ msgid "Export XML format (like -listxml)"
+#~ msgstr "Exportar em formato XML (como -listxml)"
+
+#~ msgid "Export TXT format (like -listfull)"
+#~ msgstr "Exportar em formato TXT (como -listfull)"
+
+#~ msgid "Dummy"
+#~ msgstr "Simulado"
+
+#~ msgid "%1$s %2$s ( %3$d / %4$d softwares )"
+#~ msgstr "%1$s %2$s ( %3$d / %4$d programas )"
+
 #~ msgid "Lightgun Device Assignment"
 #~ msgstr "Atribuição do Dispositivo Pistola de Luz"
 
@@ -2064,9 +2092,6 @@ msgstr " CANETAS"
 #~ msgstr ""
 #~ "Pressione OK ou mova o joysticks para esquerda e direita para continuar"
 
-#~ msgid "Configure Machine"
-#~ msgstr "Configurar Máquina"
-
 #~ msgid "Multi-Threaded Rendering"
 #~ msgstr "Renderização em Múltiplas Threads"
 
diff --git a/language/Romanian/strings.po b/language/Romanian/strings.po
index d9f999eb051..b0fc8ca7209 100644
--- a/language/Romanian/strings.po
+++ b/language/Romanian/strings.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MAME\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-11 03:33+0200\n"
+"POT-Creation-Date: 2016-04-15 17:42+0200\n"
 "PO-Revision-Date: 2016-02-20 18:03+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: MAME Language Team\n"
@@ -62,14 +62,14 @@ msgstr ""
 msgid "Autofire Status"
 msgstr ""
 
-#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1698
+#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1695
 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211
 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219
 #: src/emu/ui/videoopt.cpp:223
 msgid "Disabled"
 msgstr ""
 
-#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1698
+#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1695
 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211
 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219
 #: src/emu/ui/videoopt.cpp:223
@@ -77,14 +77,14 @@ msgid "Enabled"
 msgstr ""
 
 #: src/emu/ui/cheatopt.cpp:282 src/emu/ui/cheatopt.cpp:288
-#: src/emu/ui/menu.cpp:710 src/emu/ui/miscmenu.cpp:831
-#: src/emu/ui/sndmenu.cpp:135 src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/menu.cpp:755 src/emu/ui/miscmenu.cpp:936
+#: src/emu/ui/sndmenu.cpp:133 src/emu/ui/sndmenu.cpp:135
 msgid "On"
 msgstr ""
 
 #: src/emu/ui/cheatopt.cpp:282 src/emu/ui/cheatopt.cpp:288
-#: src/emu/ui/menu.cpp:713 src/emu/ui/miscmenu.cpp:831
-#: src/emu/ui/sndmenu.cpp:135 src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/menu.cpp:758 src/emu/ui/miscmenu.cpp:936
+#: src/emu/ui/sndmenu.cpp:133 src/emu/ui/sndmenu.cpp:135
 msgid "Off"
 msgstr ""
 
@@ -96,316 +96,316 @@ msgstr ""
 msgid "Autofire Delay"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:158 src/emu/ui/custmenu.cpp:447
+#: src/emu/ui/custmenu.cpp:157 src/emu/ui/custmenu.cpp:445
 msgid "Main filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:167 src/emu/ui/custmenu.cpp:456
+#: src/emu/ui/custmenu.cpp:166 src/emu/ui/custmenu.cpp:454
 msgid "Other filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:176 src/emu/ui/optsmenu.cpp:239
+#: src/emu/ui/custmenu.cpp:175 src/emu/ui/optsmenu.cpp:238
 msgid "^!Manufacturer"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:185 src/emu/ui/custmenu.cpp:474
-#: src/emu/ui/optsmenu.cpp:247
+#: src/emu/ui/custmenu.cpp:184 src/emu/ui/custmenu.cpp:472
+#: src/emu/ui/optsmenu.cpp:246
 msgid "^!Year"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:194 src/emu/ui/custmenu.cpp:510
+#: src/emu/ui/custmenu.cpp:193 src/emu/ui/custmenu.cpp:508
 msgid "Remove last filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:197 src/emu/ui/custmenu.cpp:513
+#: src/emu/ui/custmenu.cpp:196 src/emu/ui/custmenu.cpp:511
 msgid "Add filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:212 src/emu/ui/custmenu.cpp:233
-#: src/emu/ui/custmenu.cpp:529 src/emu/ui/custmenu.cpp:550
+#: src/emu/ui/custmenu.cpp:211 src/emu/ui/custmenu.cpp:231
+#: src/emu/ui/custmenu.cpp:527 src/emu/ui/custmenu.cpp:547
 msgid "Select custom filters:"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:465
+#: src/emu/ui/custmenu.cpp:463
 msgid "^!Publisher"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:483
+#: src/emu/ui/custmenu.cpp:481
 msgid "^!Software List"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:492
+#: src/emu/ui/custmenu.cpp:490
 msgid "^!Device type"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:501
+#: src/emu/ui/custmenu.cpp:499
 msgid "^!Region"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:23
+#: src/emu/ui/custui.cpp:22
 msgid "Show All"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:24
+#: src/emu/ui/custui.cpp:23
 msgid "Hide Filters"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:25
+#: src/emu/ui/custui.cpp:24
 msgid "Hide Info/Image"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:26
+#: src/emu/ui/custui.cpp:25
 msgid "Hide Both"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:142
+#: src/emu/ui/custui.cpp:141
 msgid "Fonts"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:143
+#: src/emu/ui/custui.cpp:142
 msgid "Colors"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:148 src/emu/ui/dirmenu.cpp:33
+#: src/emu/ui/custui.cpp:147 src/emu/ui/dirmenu.cpp:33
 msgid "Language"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:152
+#: src/emu/ui/custui.cpp:151
 msgid "Show side panels"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:167 src/emu/ui/custui.cpp:188
+#: src/emu/ui/custui.cpp:166 src/emu/ui/custui.cpp:186
 msgid "Custom UI Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:246
+#: src/emu/ui/custui.cpp:244
 msgid "default"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:349
+#: src/emu/ui/custui.cpp:347
 msgid "UI Font"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:354
+#: src/emu/ui/custui.cpp:352
 msgid "Bold"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:355
+#: src/emu/ui/custui.cpp:353
 msgid "Italic"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:360
+#: src/emu/ui/custui.cpp:358
 msgid "Lines"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:366
+#: src/emu/ui/custui.cpp:364
 msgid "Infos text size"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:383
+#: src/emu/ui/custui.cpp:381
 msgid "UI Fonts Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:411
+#: src/emu/ui/custui.cpp:408
 msgid "Sample text - Lorem ipsum dolor sit amet, consectetur adipiscing elit."
 msgstr ""
 
-#: src/emu/ui/custui.cpp:509
+#: src/emu/ui/custui.cpp:506
 msgid "Normal text"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:510
+#: src/emu/ui/custui.cpp:507
 msgid "Selected color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:511
+#: src/emu/ui/custui.cpp:508
 msgid "Normal text background"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:512
+#: src/emu/ui/custui.cpp:509
 msgid "Selected background color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:513
+#: src/emu/ui/custui.cpp:510
 msgid "Subitem color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:514 src/emu/ui/custui.cpp:610
+#: src/emu/ui/custui.cpp:511 src/emu/ui/custui.cpp:606
 msgid "Clone"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:515
+#: src/emu/ui/custui.cpp:512
 msgid "Border"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:516
+#: src/emu/ui/custui.cpp:513
 msgid "Background"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:517
+#: src/emu/ui/custui.cpp:514
 msgid "Dipswitch"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:518
+#: src/emu/ui/custui.cpp:515
 msgid "Unavailable color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:519
+#: src/emu/ui/custui.cpp:516
 msgid "Slider color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:520
+#: src/emu/ui/custui.cpp:517
 msgid "Gfx viewer background"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:521
+#: src/emu/ui/custui.cpp:518
 msgid "Mouse over color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:522
+#: src/emu/ui/custui.cpp:519
 msgid "Mouse over background color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:523
+#: src/emu/ui/custui.cpp:520
 msgid "Mouse down color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:524
+#: src/emu/ui/custui.cpp:521
 msgid "Mouse down background color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:527
+#: src/emu/ui/custui.cpp:524
 msgid "Restore originals colors"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:543
+#: src/emu/ui/custui.cpp:540
 msgid "UI Colors Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:572
+#: src/emu/ui/custui.cpp:568
 #, c-format
 msgid "Double click or press %1$s to change the color value"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:598
+#: src/emu/ui/custui.cpp:594
 msgid "Menu Preview"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:606
+#: src/emu/ui/custui.cpp:602
 msgid "Normal"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:607
+#: src/emu/ui/custui.cpp:603
 msgid "Subitem"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:608
+#: src/emu/ui/custui.cpp:604
 msgid "Selected"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:609
+#: src/emu/ui/custui.cpp:605
 msgid "Mouse Over"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:841 src/emu/ui/custui.cpp:844
+#: src/emu/ui/custui.cpp:837 src/emu/ui/custui.cpp:840
 msgid "Alpha"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:849 src/emu/ui/custui.cpp:852
-#: src/emu/ui/custui.cpp:1013
+#: src/emu/ui/custui.cpp:845 src/emu/ui/custui.cpp:848
+#: src/emu/ui/custui.cpp:1007
 msgid "Red"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:857 src/emu/ui/custui.cpp:860
-#: src/emu/ui/custui.cpp:1016
+#: src/emu/ui/custui.cpp:853 src/emu/ui/custui.cpp:856
+#: src/emu/ui/custui.cpp:1010
 msgid "Green"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:865 src/emu/ui/custui.cpp:868
-#: src/emu/ui/custui.cpp:1017
+#: src/emu/ui/custui.cpp:861 src/emu/ui/custui.cpp:864
+#: src/emu/ui/custui.cpp:1011
 msgid "Blue"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:871
+#: src/emu/ui/custui.cpp:867
 msgid "Choose from palette"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:887
+#: src/emu/ui/custui.cpp:883
 msgid " - ARGB Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:912
+#: src/emu/ui/custui.cpp:907
 msgid "Color preview ="
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1009
+#: src/emu/ui/custui.cpp:1003
 msgid "White"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1010
+#: src/emu/ui/custui.cpp:1004
 msgid "Silver"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1011
+#: src/emu/ui/custui.cpp:1005
 msgid "Gray"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1012
+#: src/emu/ui/custui.cpp:1006
 msgid "Black"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1014
+#: src/emu/ui/custui.cpp:1008
 msgid "Orange"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1015
+#: src/emu/ui/custui.cpp:1009
 msgid "Yellow"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1018
+#: src/emu/ui/custui.cpp:1012
 msgid "Violet"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:65
+#: src/emu/ui/datmenu.cpp:64
 msgid "Software History"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:67
+#: src/emu/ui/datmenu.cpp:66
 msgid "Software Usage"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:199
+#: src/emu/ui/datmenu.cpp:196
 msgid "Revision: "
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:287 src/emu/ui/selgame.cpp:40
-#: src/emu/ui/selgame.cpp:2152 src/emu/ui/selgame.cpp:2161
-#: src/emu/ui/selsoft.cpp:1577 src/emu/ui/selsoft.cpp:1597
-#: src/emu/ui/selsoft.cpp:1606
+#: src/emu/ui/datmenu.cpp:284 src/emu/ui/selgame.cpp:39
+#: src/emu/ui/selgame.cpp:2158 src/emu/ui/selgame.cpp:2167
+#: src/emu/ui/selsoft.cpp:1574 src/emu/ui/selsoft.cpp:1592
+#: src/emu/ui/selsoft.cpp:1601
 msgid "History"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:289 src/emu/ui/selgame.cpp:41
+#: src/emu/ui/datmenu.cpp:286 src/emu/ui/selgame.cpp:40
 msgid "Mameinfo"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:291 src/emu/ui/selgame.cpp:43
+#: src/emu/ui/datmenu.cpp:288 src/emu/ui/selgame.cpp:42
 msgid "Messinfo"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:293 src/emu/ui/selgame.cpp:42
+#: src/emu/ui/datmenu.cpp:290 src/emu/ui/selgame.cpp:41
 msgid "Sysinfo"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:295 src/emu/ui/selgame.cpp:46
+#: src/emu/ui/datmenu.cpp:292 src/emu/ui/selgame.cpp:45
 msgid "Mamescore"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:297 src/emu/ui/selgame.cpp:45
+#: src/emu/ui/datmenu.cpp:294 src/emu/ui/selgame.cpp:44
 msgid "Gameinit"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:299 src/emu/ui/selgame.cpp:44
+#: src/emu/ui/datmenu.cpp:296 src/emu/ui/selgame.cpp:43
 msgid "Command"
 msgstr ""
 
@@ -557,75 +557,75 @@ msgstr ""
 msgid "Remove %1$s Folder"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:158
+#: src/emu/ui/filesel.cpp:161
 msgid "File Already Exists - Override?"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:160 src/emu/ui/selgame.cpp:1568
-#: src/emu/ui/selgame.cpp:1569 src/emu/ui/selgame.cpp:1570
-#: src/emu/ui/selgame.cpp:1571 src/emu/ui/selgame.cpp:1572
-#: src/emu/ui/selgame.cpp:1573 src/emu/ui/selgame.cpp:1574
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/filesel.cpp:163 src/emu/ui/selgame.cpp:1576
+#: src/emu/ui/selgame.cpp:1577 src/emu/ui/selgame.cpp:1578
+#: src/emu/ui/selgame.cpp:1579 src/emu/ui/selgame.cpp:1580
+#: src/emu/ui/selgame.cpp:1581 src/emu/ui/selgame.cpp:1582
+#: src/emu/ui/selgame.cpp:1591
 msgid "No"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:161 src/emu/ui/selgame.cpp:1568
-#: src/emu/ui/selgame.cpp:1569 src/emu/ui/selgame.cpp:1570
-#: src/emu/ui/selgame.cpp:1571 src/emu/ui/selgame.cpp:1572
-#: src/emu/ui/selgame.cpp:1573 src/emu/ui/selgame.cpp:1574
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/filesel.cpp:164 src/emu/ui/selgame.cpp:1576
+#: src/emu/ui/selgame.cpp:1577 src/emu/ui/selgame.cpp:1578
+#: src/emu/ui/selgame.cpp:1579 src/emu/ui/selgame.cpp:1580
+#: src/emu/ui/selgame.cpp:1581 src/emu/ui/selgame.cpp:1582
+#: src/emu/ui/selgame.cpp:1591
 msgid "Yes"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:272
+#: src/emu/ui/filesel.cpp:275
 msgid "New Image Name:"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:278
+#: src/emu/ui/filesel.cpp:281
 msgid "Image Format:"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:284
+#: src/emu/ui/filesel.cpp:287
 msgid "Create"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:315
+#: src/emu/ui/filesel.cpp:318
 msgid "Please enter a file extension too"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:503 src/emu/ui/swlist.cpp:65
+#: src/emu/ui/filesel.cpp:506 src/emu/ui/swlist.cpp:65
 msgid "[empty slot]"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:507
+#: src/emu/ui/filesel.cpp:510
 msgid "[create]"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:511 src/emu/ui/swlist.cpp:76
+#: src/emu/ui/filesel.cpp:514 src/emu/ui/swlist.cpp:76
 msgid "[software list]"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:803
+#: src/emu/ui/filesel.cpp:806
 msgid "Select image format"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:863
+#: src/emu/ui/filesel.cpp:866
 msgid "Select access mode"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:864
+#: src/emu/ui/filesel.cpp:867
 msgid "Read-only"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:866
+#: src/emu/ui/filesel.cpp:869
 msgid "Read-write"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:867
+#: src/emu/ui/filesel.cpp:870
 msgid "Read this image, write to another image"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:868
+#: src/emu/ui/filesel.cpp:871
 msgid "Read this image, write to diff"
 msgstr ""
 
@@ -651,7 +651,7 @@ msgstr ""
 msgid "[empty]"
 msgstr ""
 
-#: src/emu/ui/info_pty.cpp:26 src/emu/ui/mainmenu.cpp:91
+#: src/emu/ui/info_pty.cpp:26 src/emu/ui/mainmenu.cpp:96
 msgid "Pseudo terminals"
 msgstr ""
 
@@ -667,7 +667,7 @@ msgstr ""
 msgid "Other Controls"
 msgstr ""
 
-#: src/emu/ui/inputmap.cpp:622 src/emu/ui/miscmenu.cpp:91
+#: src/emu/ui/inputmap.cpp:622 src/emu/ui/miscmenu.cpp:92
 #: src/emu/ui/slotopt.cpp:172
 msgid "Reset"
 msgstr ""
@@ -700,27 +700,27 @@ msgstr ""
 msgid "Machine Information"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:78
+#: src/emu/ui/mainmenu.cpp:80
 msgid "Image Information"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:81
+#: src/emu/ui/mainmenu.cpp:83
 msgid "File Manager"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:86
+#: src/emu/ui/mainmenu.cpp:92
 msgid "Tape Control"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:94
+#: src/emu/ui/mainmenu.cpp:99
 msgid "Bios Selection"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:100
+#: src/emu/ui/mainmenu.cpp:104
 msgid "Slot Devices"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:107
+#: src/emu/ui/mainmenu.cpp:109
 msgid "Barcode Reader"
 msgstr ""
 
@@ -728,43 +728,43 @@ msgstr ""
 msgid "Network Devices"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:119
+#: src/emu/ui/mainmenu.cpp:118
 msgid "Keyboard Mode"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:122
+#: src/emu/ui/mainmenu.cpp:121
 msgid "Slider Controls"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:125
+#: src/emu/ui/mainmenu.cpp:124
 msgid "Video Options"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:129
+#: src/emu/ui/mainmenu.cpp:128
 msgid "Crosshair Options"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:133
+#: src/emu/ui/mainmenu.cpp:132
 msgid "Cheat"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:136
+#: src/emu/ui/mainmenu.cpp:135
 msgid "Plugin Options"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:140
+#: src/emu/ui/mainmenu.cpp:139
 msgid "External DAT View"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:146
+#: src/emu/ui/mainmenu.cpp:145 src/emu/ui/miscmenu.cpp:785
 msgid "Add To Favorites"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:148
+#: src/emu/ui/mainmenu.cpp:147 src/emu/ui/miscmenu.cpp:787
 msgid "Remove From Favorites"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:155
+#: src/emu/ui/mainmenu.cpp:154
 msgid "Select New Machine"
 msgstr ""
 
@@ -804,189 +804,205 @@ msgstr ""
 msgid "Return to Previous Menu"
 msgstr ""
 
-#: src/emu/ui/menu.cpp:716
+#: src/emu/ui/menu.cpp:761
 msgid "Auto"
 msgstr ""
 
-#: src/emu/ui/menu.cpp:2133
+#: src/emu/ui/menu.cpp:2195
 msgid "Images"
 msgstr ""
 
-#: src/emu/ui/menu.cpp:2134
+#: src/emu/ui/menu.cpp:2196
 msgid "Infos"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Keyboard Mode:"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Natural"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Emulated"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:240
+#: src/emu/ui/miscmenu.cpp:241
 #, c-format
 msgid ""
 "Uptime: %1$d:%2$02d:%3$02d\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:242
+#: src/emu/ui/miscmenu.cpp:243
 #, c-format
 msgid ""
 "Uptime: %1$d:%2$02d\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:246
+#: src/emu/ui/miscmenu.cpp:247
 #, c-format
 msgid ""
 "Tickets dispensed: %1$d\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:257
+#: src/emu/ui/miscmenu.cpp:258
 msgid "Coin %1$c: NA%3$s\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:257
+#: src/emu/ui/miscmenu.cpp:258
 #, c-format
 msgid "Coin %1$c: %2$d%3$s\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:260
+#: src/emu/ui/miscmenu.cpp:261
 msgid " (locked)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:519
+#: src/emu/ui/miscmenu.cpp:520
 msgid "Visible Delay"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:617
+#: src/emu/ui/miscmenu.cpp:619
 #, c-format
 msgid "%s.xml saved under ui folder."
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:645
+#: src/emu/ui/miscmenu.cpp:647
 msgid "Name:             Description:\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:657
+#: src/emu/ui/miscmenu.cpp:659
 #, c-format
 msgid "%s.txt saved under ui folder."
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:675
-msgid "Export XML format (like -listxml)"
+#: src/emu/ui/miscmenu.cpp:677
+msgid "Export list in XML format (like -listxml)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:676
-msgid "Export TXT format (like -listfull)"
+#: src/emu/ui/miscmenu.cpp:678
+msgid "Export list in XML format (like -listxml, but exclude devices)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:734
-msgid "Dummy"
+#: src/emu/ui/miscmenu.cpp:679
+msgid "Export list in TXT format (like -listfull)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:736
-msgid "Save machine configuration"
-msgstr ""
-
-#: src/emu/ui/miscmenu.cpp:848 src/emu/ui/miscmenu.cpp:869
-#: src/emu/ui/selgame.cpp:594
-msgid "Plugins"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:218
-msgid "Filter"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:226
-msgid " ^!File"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:231
-msgid " ^!Category"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:254
-msgid "^!Setup custom filter"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:262
-msgid "Customize UI"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:263
-msgid "Configure Directories"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:266 src/emu/ui/sndmenu.cpp:151
-#: src/emu/ui/sndmenu.cpp:172
-msgid "Sound Options"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:269
-msgid "General Inputs"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:272
-msgid "Save Configuration"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:286 src/emu/ui/optsmenu.cpp:307
-msgid "Settings"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:327
-msgid "**Error saving ui.ini**"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:374
-#, c-format
-msgid "**Error saving %s.ini**"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:378
+#: src/emu/ui/miscmenu.cpp:729 src/emu/ui/optsmenu.cpp:376
 msgid ""
 "\n"
 "    Configuration saved    \n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/selector.cpp:166
+#: src/emu/ui/miscmenu.cpp:774
+msgid "Bios"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:776
+msgid "Driver"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:790
+msgid "Save machine configuration"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:806
+msgid "Configure machine:"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:868 src/emu/ui/selsoft.cpp:109
+msgid " (default)"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:953 src/emu/ui/miscmenu.cpp:973
+#: src/emu/ui/selgame.cpp:600
+msgid "Plugins"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:217
+msgid "Filter"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:225
+msgid " ^!File"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:230
+msgid " ^!Category"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:253
+msgid "^!Setup custom filter"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:261
+msgid "Customize UI"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:262
+msgid "Configure Directories"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:265 src/emu/ui/sndmenu.cpp:149
+#: src/emu/ui/sndmenu.cpp:169
+msgid "Sound Options"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:268
+msgid "General Inputs"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:271
+msgid "Save Configuration"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:285 src/emu/ui/optsmenu.cpp:305
+msgid "Settings"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:325
+msgid "**Error saving ui.ini**"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:372
+#, c-format
+msgid "**Error saving %s.ini**"
+msgstr ""
+
+#: src/emu/ui/selector.cpp:165
 msgid "Selection List - Search: "
 msgstr ""
 
-#: src/emu/ui/selector.cpp:196
+#: src/emu/ui/selector.cpp:194
 #, c-format
 msgid "Double click or press %1$s to select"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:39
+#: src/emu/ui/selgame.cpp:38
 msgid "General Info"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:374 src/emu/ui/selsoft.cpp:282
+#: src/emu/ui/selgame.cpp:380 src/emu/ui/selsoft.cpp:281
 #, c-format
 msgid ""
 "%s\n"
 " added to favorites list."
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:380 src/emu/ui/selgame.cpp:389
-#: src/emu/ui/selsoft.cpp:287
+#: src/emu/ui/selgame.cpp:386 src/emu/ui/selgame.cpp:395
+#: src/emu/ui/selsoft.cpp:286
 #, c-format
 msgid ""
 "%s\n"
 " removed from favorites list."
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:450
+#: src/emu/ui/selgame.cpp:457
 msgid ""
 "The selected machine is missing one or more required ROM or CHD images. "
 "Please select a different machine.\n"
@@ -994,275 +1010,275 @@ msgid ""
 "Press any key to continue."
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:589 src/emu/ui/simpleselgame.cpp:265
+#: src/emu/ui/selgame.cpp:595 src/emu/ui/simpleselgame.cpp:265
 msgid "Configure Options"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:752
+#: src/emu/ui/selgame.cpp:596
+msgid "Configure Machine"
+msgstr ""
+
+#: src/emu/ui/selgame.cpp:758
 #, c-format
 msgid "%1$s %2$s ( %3$d / %4$d machines (%5$d BIOS) )"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:762
+#: src/emu/ui/selgame.cpp:768
 #, c-format
 msgid "%1$s (%2$s - %3$s) - "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:769 src/emu/ui/selgame.cpp:775
+#: src/emu/ui/selgame.cpp:775 src/emu/ui/selgame.cpp:781
 #, c-format
 msgid "%1$s (%2$s) - "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:784
+#: src/emu/ui/selgame.cpp:790
 #, c-format
 msgid "%1$s Search: %2$s_"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:838
+#: src/emu/ui/selgame.cpp:844
 #, c-format
 msgid "Romset: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:841 src/emu/ui/selgame.cpp:890
-#: src/emu/ui/selsoft.cpp:751 src/emu/ui/selsoft.cpp:801
+#: src/emu/ui/selgame.cpp:847 src/emu/ui/selgame.cpp:896
+#: src/emu/ui/selsoft.cpp:750 src/emu/ui/selsoft.cpp:800
 #: src/emu/ui/simpleselgame.cpp:328
 #, c-format
 msgid "%1$s, %2$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:847 src/emu/ui/selsoft.cpp:757
+#: src/emu/ui/selgame.cpp:853 src/emu/ui/selsoft.cpp:756
 #, c-format
 msgid "Driver is clone of: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:849 src/emu/ui/selsoft.cpp:759
+#: src/emu/ui/selgame.cpp:855 src/emu/ui/selsoft.cpp:758
 msgid "Driver is parent"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:853 src/emu/ui/selsoft.cpp:763
+#: src/emu/ui/selgame.cpp:859 src/emu/ui/selsoft.cpp:762
 #: src/emu/ui/simpleselgame.cpp:335
 msgid "Overall: NOT WORKING"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:855 src/emu/ui/selsoft.cpp:765
+#: src/emu/ui/selgame.cpp:861 src/emu/ui/selsoft.cpp:764
 #: src/emu/ui/simpleselgame.cpp:337
 msgid "Overall: Unemulated Protection"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:857 src/emu/ui/selsoft.cpp:767
+#: src/emu/ui/selgame.cpp:863 src/emu/ui/selsoft.cpp:766
 #: src/emu/ui/simpleselgame.cpp:339
 msgid "Overall: Working"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:861 src/emu/ui/selsoft.cpp:771
+#: src/emu/ui/selgame.cpp:867 src/emu/ui/selsoft.cpp:770
 msgid "Graphics: Imperfect, "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:863 src/emu/ui/selsoft.cpp:773
+#: src/emu/ui/selgame.cpp:869 src/emu/ui/selsoft.cpp:772
 msgid "Graphics: OK, "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:866 src/emu/ui/selsoft.cpp:776
+#: src/emu/ui/selgame.cpp:872 src/emu/ui/selsoft.cpp:775
 msgid "Sound: Unimplemented"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:868 src/emu/ui/selsoft.cpp:778
+#: src/emu/ui/selgame.cpp:874 src/emu/ui/selsoft.cpp:777
 msgid "Sound: Imperfect"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:870 src/emu/ui/selsoft.cpp:780
+#: src/emu/ui/selgame.cpp:876 src/emu/ui/selsoft.cpp:779
 msgid "Sound: OK"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:887
+#: src/emu/ui/selgame.cpp:893
 #, c-format
 msgid "System: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:894 src/emu/ui/selsoft.cpp:805
+#: src/emu/ui/selgame.cpp:900 src/emu/ui/selsoft.cpp:804
 #, c-format
 msgid "Software is clone of: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:896 src/emu/ui/selsoft.cpp:807
+#: src/emu/ui/selgame.cpp:902 src/emu/ui/selsoft.cpp:806
 msgid "Software is parent"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:901 src/emu/ui/selsoft.cpp:812
+#: src/emu/ui/selgame.cpp:907 src/emu/ui/selsoft.cpp:811
 msgid "Supported: No"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:906 src/emu/ui/selsoft.cpp:817
+#: src/emu/ui/selgame.cpp:912 src/emu/ui/selsoft.cpp:816
 msgid "Supported: Partial"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:911 src/emu/ui/selsoft.cpp:822
+#: src/emu/ui/selgame.cpp:917 src/emu/ui/selsoft.cpp:821
 msgid "Supported: Yes"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:916 src/emu/ui/selsoft.cpp:827
+#: src/emu/ui/selgame.cpp:922 src/emu/ui/selsoft.cpp:826
 #, c-format
 msgid "romset: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:923
+#: src/emu/ui/selgame.cpp:929
 #, c-format
 msgid "%1$s %2$s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1535
+#: src/emu/ui/selgame.cpp:1543
 #, c-format
 msgid "Romset: %1$-.100s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1536
+#: src/emu/ui/selgame.cpp:1544
 #, c-format
 msgid "Year: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1537
+#: src/emu/ui/selgame.cpp:1545
 #, c-format
 msgid "Manufacturer: %1$-.100s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1541
+#: src/emu/ui/selgame.cpp:1549
 #, c-format
 msgid "Driver is Clone of: %1$-.100s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1543
+#: src/emu/ui/selgame.cpp:1551
 msgid "Driver is Parent\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1546
+#: src/emu/ui/selgame.cpp:1554
 msgid "Overall: NOT WORKING\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1548
+#: src/emu/ui/selgame.cpp:1556
 msgid "Overall: Unemulated Protection\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1550
+#: src/emu/ui/selgame.cpp:1558
 msgid "Overall: Working\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1553
+#: src/emu/ui/selgame.cpp:1561
 msgid "Graphics: Imperfect Colors\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1557
+#: src/emu/ui/selgame.cpp:1565
 msgid "Graphics: Imperfect\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1559
+#: src/emu/ui/selgame.cpp:1567
 msgid "Graphics: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1562
+#: src/emu/ui/selgame.cpp:1570
 msgid "Sound: Unimplemented\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1564
+#: src/emu/ui/selgame.cpp:1572
 msgid "Sound: Imperfect\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1566
+#: src/emu/ui/selgame.cpp:1574
 msgid "Sound: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1568
+#: src/emu/ui/selgame.cpp:1576
 #, c-format
 msgid "Driver is Skeleton: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1569
+#: src/emu/ui/selgame.cpp:1577
 #, c-format
 msgid "Game is Mechanical: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1570
+#: src/emu/ui/selgame.cpp:1578
 #, c-format
 msgid "Requires Artwork: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1571
+#: src/emu/ui/selgame.cpp:1579
 #, c-format
 msgid "Requires Clickable Artwork: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1572
+#: src/emu/ui/selgame.cpp:1580
 #, c-format
 msgid "Support Cocktail: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1573
+#: src/emu/ui/selgame.cpp:1581
 #, c-format
 msgid "Driver is Bios: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1574
+#: src/emu/ui/selgame.cpp:1582
 #, c-format
 msgid "Support Save: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 #, c-format
 msgid "Screen Orientation: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 msgid "Vertical"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 msgid "Horizontal"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/selgame.cpp:1591
 #, c-format
 msgid "Requires CHD: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1596
+#: src/emu/ui/selgame.cpp:1604
 msgid "Roms Audit Pass: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1598
+#: src/emu/ui/selgame.cpp:1606
 msgid "Roms Audit Pass: BAD\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1601
+#: src/emu/ui/selgame.cpp:1609
 msgid "Samples Audit Pass: None Needed\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1603
+#: src/emu/ui/selgame.cpp:1611
 msgid "Samples Audit Pass: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1605
+#: src/emu/ui/selgame.cpp:1613
 msgid "Samples Audit Pass: BAD\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1608
+#: src/emu/ui/selgame.cpp:1616
 msgid ""
 "Roms Audit Pass: Disabled\n"
 "Samples Audit Pass: Disabled\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:2049 src/emu/ui/selgame.cpp:2212
-#: src/emu/ui/selsoft.cpp:1662
+#: src/emu/ui/selgame.cpp:2055 src/emu/ui/selgame.cpp:2216
+#: src/emu/ui/selsoft.cpp:1655
 msgid "No Infos Available"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:2162 src/emu/ui/selsoft.cpp:1607
+#: src/emu/ui/selgame.cpp:2168 src/emu/ui/selsoft.cpp:1602
 msgid "Usage"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:110
-msgid " (default)"
-msgstr ""
-
-#: src/emu/ui/selsoft.cpp:381
+#: src/emu/ui/selsoft.cpp:380
 msgid ""
 "The selected software is missing one or more required files. Please select a "
 "different software.\n"
@@ -1270,57 +1286,57 @@ msgid ""
 "Press any key to continue."
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:684
+#: src/emu/ui/selsoft.cpp:683
 #, c-format
-msgid "%1$s %2$s ( %3$d / %4$d softwares )"
+msgid "%1$s %2$s ( %3$d / %4$d software packages )"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:685
+#: src/emu/ui/selsoft.cpp:684
 #, c-format
 msgid "Driver: \"%1$s\" software list "
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:688
+#: src/emu/ui/selsoft.cpp:687
 #, c-format
 msgid "Region: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:690
+#: src/emu/ui/selsoft.cpp:689
 #, c-format
 msgid "Publisher: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:692
+#: src/emu/ui/selsoft.cpp:691
 #, c-format
 msgid "Year: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:694
+#: src/emu/ui/selsoft.cpp:693
 #, c-format
 msgid "Software List: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:696
+#: src/emu/ui/selsoft.cpp:695
 #, c-format
 msgid "Device type: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:698
+#: src/emu/ui/selsoft.cpp:697
 #, c-format
 msgid "%s Search: %s_"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:748 src/emu/ui/selsoft.cpp:798
+#: src/emu/ui/selsoft.cpp:747 src/emu/ui/selsoft.cpp:797
 #: src/emu/ui/simpleselgame.cpp:325
 #, c-format
 msgid "%1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:1998 src/emu/ui/selsoft.cpp:2018
+#: src/emu/ui/selsoft.cpp:1991 src/emu/ui/selsoft.cpp:2011
 msgid "Software part selection:"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:2136 src/emu/ui/selsoft.cpp:2156
+#: src/emu/ui/selsoft.cpp:2129 src/emu/ui/selsoft.cpp:2149
 msgid "Bios selection:"
 msgstr ""
 
@@ -1368,15 +1384,15 @@ msgstr ""
 msgid " [internal]"
 msgstr ""
 
-#: src/emu/ui/sndmenu.cpp:135
+#: src/emu/ui/sndmenu.cpp:133
 msgid "Sound"
 msgstr ""
 
-#: src/emu/ui/sndmenu.cpp:136
+#: src/emu/ui/sndmenu.cpp:134
 msgid "Sample Rate"
 msgstr ""
 
-#: src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/sndmenu.cpp:135
 msgid "Use External Samples"
 msgstr ""
 
@@ -1445,80 +1461,80 @@ msgstr ""
 msgid "Fast Forward"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:419
+#: src/emu/ui/ui.cpp:418
 msgid "This driver requires images to be loaded in the following device(s): "
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1074
+#: src/emu/ui/ui.cpp:1071
 msgid ""
 "One or more ROMs/CHDs for this machine are incorrect. The machine may not "
 "run correctly.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1087
+#: src/emu/ui/ui.cpp:1084
 msgid ""
 "There are known problems with this machine\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1091
+#: src/emu/ui/ui.cpp:1088
 msgid ""
 "One or more ROMs/CHDs for this machine have not been correctly dumped.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1095
+#: src/emu/ui/ui.cpp:1092
 #, c-format
 msgid "The keyboard emulation may not be 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1097
+#: src/emu/ui/ui.cpp:1094
 #, c-format
 msgid "The colors aren't 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1099
+#: src/emu/ui/ui.cpp:1096
 msgid "The colors are completely wrong.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1101
+#: src/emu/ui/ui.cpp:1098
 #, c-format
 msgid "The video emulation isn't 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1103
+#: src/emu/ui/ui.cpp:1100
 #, c-format
 msgid "The sound emulation isn't 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1105
+#: src/emu/ui/ui.cpp:1102
 msgid "The machine lacks sound.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1108
+#: src/emu/ui/ui.cpp:1105
 msgid "Screen flipping in cocktail mode is not supported.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1112
+#: src/emu/ui/ui.cpp:1109
 msgid "The machine requires external artwork files\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1117
+#: src/emu/ui/ui.cpp:1114
 msgid ""
 "This machine was never completed. It may exhibit strange behavior or missing "
 "elements that are not bugs in the emulation.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1122
+#: src/emu/ui/ui.cpp:1119
 msgid ""
 "This machine has no sound hardware, MAME will produce no sounds, this is "
 "expected behaviour.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1130
+#: src/emu/ui/ui.cpp:1127
 msgid "The machine has protection which isn't fully emulated.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1133
+#: src/emu/ui/ui.cpp:1130
 msgid ""
 "\n"
 "THIS MACHINE DOESN'T WORK. The emulation for this machine is not yet "
@@ -1526,7 +1542,7 @@ msgid ""
 "the developers to improve the emulation.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1137
+#: src/emu/ui/ui.cpp:1134
 msgid ""
 "\n"
 "Certain elements of this machine cannot be emulated as it requires actual "
@@ -1534,21 +1550,21 @@ msgid ""
 "to fully play this machine.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1156
+#: src/emu/ui/ui.cpp:1153
 msgid ""
 "\n"
 "\n"
 "There are working clones of this machine: "
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1170
+#: src/emu/ui/ui.cpp:1167
 msgid ""
 "\n"
 "\n"
 "Press any key to continue"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1185
+#: src/emu/ui/ui.cpp:1182
 #, c-format
 msgid ""
 "%1$s\n"
@@ -1558,98 +1574,98 @@ msgid ""
 "CPU:\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1221 src/emu/ui/ui.cpp:1260
+#: src/emu/ui/ui.cpp:1218 src/emu/ui/ui.cpp:1257
 msgid "MHz"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1221 src/emu/ui/ui.cpp:1260
+#: src/emu/ui/ui.cpp:1218 src/emu/ui/ui.cpp:1257
 msgid "kHz"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1235
+#: src/emu/ui/ui.cpp:1232
 msgid ""
 "\n"
 "Sound:\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1264
+#: src/emu/ui/ui.cpp:1261
 msgid ""
 "\n"
 "Video:\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1268
+#: src/emu/ui/ui.cpp:1265
 msgid "None\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1275
+#: src/emu/ui/ui.cpp:1272
 msgid "Vector"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1286
+#: src/emu/ui/ui.cpp:1283
 #, c-format
 msgid "%1$s: %2$s\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1286
+#: src/emu/ui/ui.cpp:1283
 msgid "%2$s\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1541 src/emu/ui/ui.cpp:1551
+#: src/emu/ui/ui.cpp:1538 src/emu/ui/ui.cpp:1548
 msgid "Keyboard Emulation Status"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1543
+#: src/emu/ui/ui.cpp:1540
 msgid "Mode: PARTIAL Emulation"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1544
+#: src/emu/ui/ui.cpp:1541
 msgid "UI:   Enabled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1546 src/emu/ui/ui.cpp:1556
+#: src/emu/ui/ui.cpp:1543 src/emu/ui/ui.cpp:1553
 msgid "**Use ScrLock to toggle**"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1553
+#: src/emu/ui/ui.cpp:1550
 msgid "Mode: FULL Emulation"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1554
+#: src/emu/ui/ui.cpp:1551
 msgid "UI:   Disabled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1692
+#: src/emu/ui/ui.cpp:1689
 msgid "Autofire can't be enabled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1731
+#: src/emu/ui/ui.cpp:1728
 msgid "Select position to save to"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1733
+#: src/emu/ui/ui.cpp:1730
 msgid "Select position to load from"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1757
+#: src/emu/ui/ui.cpp:1754
 msgid "Save cancelled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1759
+#: src/emu/ui/ui.cpp:1756
 msgid "Load cancelled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1802
+#: src/emu/ui/ui.cpp:1799
 #, c-format
 msgid "Save to position %s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1807
+#: src/emu/ui/ui.cpp:1804
 #, c-format
 msgid "Load from position %s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1847
+#: src/emu/ui/ui.cpp:1844
 #, c-format
 msgid ""
 "Are you sure you want to quit?\n"
@@ -1658,173 +1674,173 @@ msgid ""
 "Press ''%2$s'' to return to emulation."
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1917
+#: src/emu/ui/ui.cpp:1914
 msgid "Master Volume"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1926
+#: src/emu/ui/ui.cpp:1923
 #, c-format
 msgid "%1$s Volume"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1949
+#: src/emu/ui/ui.cpp:1946
 #, c-format
 msgid "Overclock CPU %1$s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1968
+#: src/emu/ui/ui.cpp:1965
 #, c-format
 msgid "%1$s Refresh Rate"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1973
+#: src/emu/ui/ui.cpp:1970
 #, c-format
 msgid "%1$s Brightness"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1975
+#: src/emu/ui/ui.cpp:1972
 #, c-format
 msgid "%1$s Contrast"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1977
+#: src/emu/ui/ui.cpp:1974
 #, c-format
 msgid "%1$s Gamma"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1981
+#: src/emu/ui/ui.cpp:1978
 #, c-format
 msgid "%1$s Horiz Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1983
+#: src/emu/ui/ui.cpp:1980
 #, c-format
 msgid "%1$s Horiz Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1985
+#: src/emu/ui/ui.cpp:1982
 #, c-format
 msgid "%1$s Vert Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1987
+#: src/emu/ui/ui.cpp:1984
 #, c-format
 msgid "%1$s Vert Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2005
+#: src/emu/ui/ui.cpp:2002
 #, c-format
 msgid "Laserdisc '%1$s' Horiz Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2007
+#: src/emu/ui/ui.cpp:2004
 #, c-format
 msgid "Laserdisc '%1$s' Horiz Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2009
+#: src/emu/ui/ui.cpp:2006
 #, c-format
 msgid "Laserdisc '%1$s' Vert Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2011
+#: src/emu/ui/ui.cpp:2008
 #, c-format
 msgid "Laserdisc '%1$s' Vert Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2021
+#: src/emu/ui/ui.cpp:2018
 msgid "Vector Flicker"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2022
+#: src/emu/ui/ui.cpp:2019
 msgid "Beam Width Minimum"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2023
+#: src/emu/ui/ui.cpp:2020
 msgid "Beam Width Maximum"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2024
+#: src/emu/ui/ui.cpp:2021
 msgid "Beam Intensity Weight"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2037
+#: src/emu/ui/ui.cpp:2034
 #, c-format
 msgid "Crosshair Scale %1$s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2037 src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2034 src/emu/ui/ui.cpp:2036
 msgid "X"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2037 src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2034 src/emu/ui/ui.cpp:2036
 msgid "Y"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2036
 #, c-format
 msgid "Crosshair Offset %1$s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2071
+#: src/emu/ui/ui.cpp:2068
 #, c-format
 msgid "%1$3ddB"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2115
+#: src/emu/ui/ui.cpp:2112
 #, c-format
 msgid "%1$d%%"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2131
+#: src/emu/ui/ui.cpp:2128
 #, c-format
 msgid "%1$3.0f%%"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2154
+#: src/emu/ui/ui.cpp:2151
 #, c-format
 msgid "%1$.3ffps"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2177 src/emu/ui/ui.cpp:2199 src/emu/ui/ui.cpp:2220
-#: src/emu/ui/ui.cpp:2242 src/emu/ui/ui.cpp:2264 src/emu/ui/ui.cpp:2286
-#: src/emu/ui/ui.cpp:2308 src/emu/ui/ui.cpp:2330 src/emu/ui/ui.cpp:2352
-#: src/emu/ui/ui.cpp:2374 src/emu/ui/ui.cpp:2396
+#: src/emu/ui/ui.cpp:2174 src/emu/ui/ui.cpp:2196 src/emu/ui/ui.cpp:2217
+#: src/emu/ui/ui.cpp:2239 src/emu/ui/ui.cpp:2261 src/emu/ui/ui.cpp:2283
+#: src/emu/ui/ui.cpp:2305 src/emu/ui/ui.cpp:2327 src/emu/ui/ui.cpp:2349
+#: src/emu/ui/ui.cpp:2371 src/emu/ui/ui.cpp:2393
 #, c-format
 msgid "%1$.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2412 src/emu/ui/ui.cpp:2428 src/emu/ui/ui.cpp:2444
-#: src/emu/ui/ui.cpp:2460
+#: src/emu/ui/ui.cpp:2408 src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2438
+#: src/emu/ui/ui.cpp:2453
 #, c-format
 msgid "%1$1.2f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2476
+#: src/emu/ui/ui.cpp:2469
 #, c-format
 msgid "Screen '%1$s'"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2478
+#: src/emu/ui/ui.cpp:2471
 msgid "Screen"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2494
+#: src/emu/ui/ui.cpp:2487
 #, c-format
 msgid "Crosshair Scale X %1$1.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2494
+#: src/emu/ui/ui.cpp:2487
 #, c-format
 msgid "Crosshair Scale Y %1$1.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2513
+#: src/emu/ui/ui.cpp:2506
 #, c-format
 msgid "Crosshair Offset X %1$1.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2513
+#: src/emu/ui/ui.cpp:2506
 #, c-format
 msgid "Crosshair Offset Y %1$1.3f"
 msgstr ""
@@ -1866,10 +1882,10 @@ msgstr ""
 msgid "Full"
 msgstr ""
 
-#: src/emu/ui/viewgfx.cpp:392
+#: src/emu/ui/viewgfx.cpp:391
 msgid " COLORS"
 msgstr ""
 
-#: src/emu/ui/viewgfx.cpp:392
+#: src/emu/ui/viewgfx.cpp:391
 msgid " PENS"
 msgstr ""
diff --git a/language/Russian/strings.po b/language/Russian/strings.po
index d2c9902beb0..6f404bf8f85 100644
--- a/language/Russian/strings.po
+++ b/language/Russian/strings.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MAME\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-11 03:33+0200\n"
+"POT-Creation-Date: 2016-04-15 17:42+0200\n"
 "PO-Revision-Date: 2016-02-20 18:03+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: MAME Language Team\n"
@@ -64,14 +64,14 @@ msgstr "Перезагрузить все"
 msgid "Autofire Status"
 msgstr "Состояние"
 
-#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1698
+#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1695
 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211
 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219
 #: src/emu/ui/videoopt.cpp:223
 msgid "Disabled"
 msgstr "Выключен"
 
-#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1698
+#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1695
 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211
 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219
 #: src/emu/ui/videoopt.cpp:223
@@ -79,14 +79,14 @@ msgid "Enabled"
 msgstr "Включен"
 
 #: src/emu/ui/cheatopt.cpp:282 src/emu/ui/cheatopt.cpp:288
-#: src/emu/ui/menu.cpp:710 src/emu/ui/miscmenu.cpp:831
-#: src/emu/ui/sndmenu.cpp:135 src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/menu.cpp:755 src/emu/ui/miscmenu.cpp:936
+#: src/emu/ui/sndmenu.cpp:133 src/emu/ui/sndmenu.cpp:135
 msgid "On"
 msgstr "Вкл"
 
 #: src/emu/ui/cheatopt.cpp:282 src/emu/ui/cheatopt.cpp:288
-#: src/emu/ui/menu.cpp:713 src/emu/ui/miscmenu.cpp:831
-#: src/emu/ui/sndmenu.cpp:135 src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/menu.cpp:758 src/emu/ui/miscmenu.cpp:936
+#: src/emu/ui/sndmenu.cpp:133 src/emu/ui/sndmenu.cpp:135
 msgid "Off"
 msgstr "Выкл"
 
@@ -98,316 +98,316 @@ msgstr "У этой системы нет кнопок огонь!"
 msgid "Autofire Delay"
 msgstr "Частота"
 
-#: src/emu/ui/custmenu.cpp:158 src/emu/ui/custmenu.cpp:447
+#: src/emu/ui/custmenu.cpp:157 src/emu/ui/custmenu.cpp:445
 msgid "Main filter"
 msgstr "Основной фильтр"
 
-#: src/emu/ui/custmenu.cpp:167 src/emu/ui/custmenu.cpp:456
+#: src/emu/ui/custmenu.cpp:166 src/emu/ui/custmenu.cpp:454
 msgid "Other filter"
 msgstr "Дополнительные фильтры"
 
-#: src/emu/ui/custmenu.cpp:176 src/emu/ui/optsmenu.cpp:239
+#: src/emu/ui/custmenu.cpp:175 src/emu/ui/optsmenu.cpp:238
 msgid "^!Manufacturer"
 msgstr "^!Производитель"
 
-#: src/emu/ui/custmenu.cpp:185 src/emu/ui/custmenu.cpp:474
-#: src/emu/ui/optsmenu.cpp:247
+#: src/emu/ui/custmenu.cpp:184 src/emu/ui/custmenu.cpp:472
+#: src/emu/ui/optsmenu.cpp:246
 msgid "^!Year"
 msgstr "^!Год"
 
-#: src/emu/ui/custmenu.cpp:194 src/emu/ui/custmenu.cpp:510
+#: src/emu/ui/custmenu.cpp:193 src/emu/ui/custmenu.cpp:508
 msgid "Remove last filter"
 msgstr "Удалить последний фильтр"
 
-#: src/emu/ui/custmenu.cpp:197 src/emu/ui/custmenu.cpp:513
+#: src/emu/ui/custmenu.cpp:196 src/emu/ui/custmenu.cpp:511
 msgid "Add filter"
 msgstr "Добавить фильтр"
 
-#: src/emu/ui/custmenu.cpp:212 src/emu/ui/custmenu.cpp:233
-#: src/emu/ui/custmenu.cpp:529 src/emu/ui/custmenu.cpp:550
+#: src/emu/ui/custmenu.cpp:211 src/emu/ui/custmenu.cpp:231
+#: src/emu/ui/custmenu.cpp:527 src/emu/ui/custmenu.cpp:547
 msgid "Select custom filters:"
 msgstr "Выберите пользовательские фильтры:"
 
-#: src/emu/ui/custmenu.cpp:465
+#: src/emu/ui/custmenu.cpp:463
 msgid "^!Publisher"
 msgstr "^!Издатель"
 
-#: src/emu/ui/custmenu.cpp:483
+#: src/emu/ui/custmenu.cpp:481
 msgid "^!Software List"
 msgstr "^!Список ПО"
 
-#: src/emu/ui/custmenu.cpp:492
+#: src/emu/ui/custmenu.cpp:490
 msgid "^!Device type"
 msgstr "^!Тип устройства"
 
-#: src/emu/ui/custmenu.cpp:501
+#: src/emu/ui/custmenu.cpp:499
 msgid "^!Region"
 msgstr "^!Регион"
 
-#: src/emu/ui/custui.cpp:23
+#: src/emu/ui/custui.cpp:22
 msgid "Show All"
 msgstr "Показать все"
 
-#: src/emu/ui/custui.cpp:24
+#: src/emu/ui/custui.cpp:23
 msgid "Hide Filters"
 msgstr "Скрыть фильтры"
 
-#: src/emu/ui/custui.cpp:25
+#: src/emu/ui/custui.cpp:24
 msgid "Hide Info/Image"
 msgstr "Скрыть информацию / изображение"
 
-#: src/emu/ui/custui.cpp:26
+#: src/emu/ui/custui.cpp:25
 msgid "Hide Both"
 msgstr "Скрыть оба"
 
-#: src/emu/ui/custui.cpp:142
+#: src/emu/ui/custui.cpp:141
 msgid "Fonts"
 msgstr "Шрифты"
 
-#: src/emu/ui/custui.cpp:143
+#: src/emu/ui/custui.cpp:142
 msgid "Colors"
 msgstr "Цвета"
 
-#: src/emu/ui/custui.cpp:148 src/emu/ui/dirmenu.cpp:33
+#: src/emu/ui/custui.cpp:147 src/emu/ui/dirmenu.cpp:33
 msgid "Language"
 msgstr "Язык"
 
-#: src/emu/ui/custui.cpp:152
+#: src/emu/ui/custui.cpp:151
 msgid "Show side panels"
 msgstr "Скрыть боковые панели"
 
-#: src/emu/ui/custui.cpp:167 src/emu/ui/custui.cpp:188
+#: src/emu/ui/custui.cpp:166 src/emu/ui/custui.cpp:186
 msgid "Custom UI Settings"
 msgstr "Пользовательские настройки интерфейса"
 
-#: src/emu/ui/custui.cpp:246
+#: src/emu/ui/custui.cpp:244
 msgid "default"
 msgstr "по-умолчанию"
 
-#: src/emu/ui/custui.cpp:349
+#: src/emu/ui/custui.cpp:347
 msgid "UI Font"
 msgstr "Шрифт интерфейса"
 
-#: src/emu/ui/custui.cpp:354
+#: src/emu/ui/custui.cpp:352
 msgid "Bold"
 msgstr "Жирный"
 
-#: src/emu/ui/custui.cpp:355
+#: src/emu/ui/custui.cpp:353
 msgid "Italic"
 msgstr "Наклонный"
 
-#: src/emu/ui/custui.cpp:360
+#: src/emu/ui/custui.cpp:358
 msgid "Lines"
 msgstr "Линии"
 
-#: src/emu/ui/custui.cpp:366
+#: src/emu/ui/custui.cpp:364
 msgid "Infos text size"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:383
+#: src/emu/ui/custui.cpp:381
 msgid "UI Fonts Settings"
 msgstr "Настройки шрифта интерфейса"
 
-#: src/emu/ui/custui.cpp:411
+#: src/emu/ui/custui.cpp:408
 msgid "Sample text - Lorem ipsum dolor sit amet, consectetur adipiscing elit."
 msgstr ""
 
-#: src/emu/ui/custui.cpp:509
+#: src/emu/ui/custui.cpp:506
 msgid "Normal text"
 msgstr "Обычный текст"
 
-#: src/emu/ui/custui.cpp:510
+#: src/emu/ui/custui.cpp:507
 msgid "Selected color"
 msgstr "Выделенный цвет"
 
-#: src/emu/ui/custui.cpp:511
+#: src/emu/ui/custui.cpp:508
 msgid "Normal text background"
 msgstr "Обычный текст задника"
 
-#: src/emu/ui/custui.cpp:512
+#: src/emu/ui/custui.cpp:509
 msgid "Selected background color"
 msgstr "Выделенный цвет задника"
 
-#: src/emu/ui/custui.cpp:513
+#: src/emu/ui/custui.cpp:510
 msgid "Subitem color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:514 src/emu/ui/custui.cpp:610
+#: src/emu/ui/custui.cpp:511 src/emu/ui/custui.cpp:606
 msgid "Clone"
 msgstr "Клон"
 
-#: src/emu/ui/custui.cpp:515
+#: src/emu/ui/custui.cpp:512
 msgid "Border"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:516
+#: src/emu/ui/custui.cpp:513
 msgid "Background"
 msgstr "Задний фон"
 
-#: src/emu/ui/custui.cpp:517
+#: src/emu/ui/custui.cpp:514
 msgid "Dipswitch"
 msgstr "DIP-переключатель"
 
-#: src/emu/ui/custui.cpp:518
+#: src/emu/ui/custui.cpp:515
 msgid "Unavailable color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:519
+#: src/emu/ui/custui.cpp:516
 msgid "Slider color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:520
+#: src/emu/ui/custui.cpp:517
 msgid "Gfx viewer background"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:521
+#: src/emu/ui/custui.cpp:518
 msgid "Mouse over color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:522
+#: src/emu/ui/custui.cpp:519
 msgid "Mouse over background color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:523
+#: src/emu/ui/custui.cpp:520
 msgid "Mouse down color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:524
+#: src/emu/ui/custui.cpp:521
 msgid "Mouse down background color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:527
+#: src/emu/ui/custui.cpp:524
 msgid "Restore originals colors"
 msgstr "Восстановить изначальные цвета"
 
-#: src/emu/ui/custui.cpp:543
+#: src/emu/ui/custui.cpp:540
 msgid "UI Colors Settings"
 msgstr "Настройка цветов интерфейса"
 
-#: src/emu/ui/custui.cpp:572
+#: src/emu/ui/custui.cpp:568
 #, c-format
 msgid "Double click or press %1$s to change the color value"
 msgstr "Кликните два раза или нажмите %1$s для изменения цвета"
 
-#: src/emu/ui/custui.cpp:598
+#: src/emu/ui/custui.cpp:594
 msgid "Menu Preview"
 msgstr "Предпросмотр меню"
 
-#: src/emu/ui/custui.cpp:606
+#: src/emu/ui/custui.cpp:602
 msgid "Normal"
 msgstr "Обычный"
 
-#: src/emu/ui/custui.cpp:607
+#: src/emu/ui/custui.cpp:603
 msgid "Subitem"
 msgstr "Подпункт"
 
-#: src/emu/ui/custui.cpp:608
+#: src/emu/ui/custui.cpp:604
 msgid "Selected"
 msgstr "Выделенный"
 
-#: src/emu/ui/custui.cpp:609
+#: src/emu/ui/custui.cpp:605
 msgid "Mouse Over"
 msgstr "Под мышью"
 
-#: src/emu/ui/custui.cpp:841 src/emu/ui/custui.cpp:844
+#: src/emu/ui/custui.cpp:837 src/emu/ui/custui.cpp:840
 msgid "Alpha"
 msgstr "Альфа"
 
-#: src/emu/ui/custui.cpp:849 src/emu/ui/custui.cpp:852
-#: src/emu/ui/custui.cpp:1013
+#: src/emu/ui/custui.cpp:845 src/emu/ui/custui.cpp:848
+#: src/emu/ui/custui.cpp:1007
 msgid "Red"
 msgstr "Красный"
 
-#: src/emu/ui/custui.cpp:857 src/emu/ui/custui.cpp:860
-#: src/emu/ui/custui.cpp:1016
+#: src/emu/ui/custui.cpp:853 src/emu/ui/custui.cpp:856
+#: src/emu/ui/custui.cpp:1010
 msgid "Green"
 msgstr "Зеленый"
 
-#: src/emu/ui/custui.cpp:865 src/emu/ui/custui.cpp:868
-#: src/emu/ui/custui.cpp:1017
+#: src/emu/ui/custui.cpp:861 src/emu/ui/custui.cpp:864
+#: src/emu/ui/custui.cpp:1011
 msgid "Blue"
 msgstr "Синий"
 
-#: src/emu/ui/custui.cpp:871
+#: src/emu/ui/custui.cpp:867
 msgid "Choose from palette"
 msgstr "Выберите из палитры"
 
-#: src/emu/ui/custui.cpp:887
+#: src/emu/ui/custui.cpp:883
 msgid " - ARGB Settings"
 msgstr "- Настройки ARGB"
 
-#: src/emu/ui/custui.cpp:912
+#: src/emu/ui/custui.cpp:907
 msgid "Color preview ="
 msgstr "Предпросмотр цвета ="
 
-#: src/emu/ui/custui.cpp:1009
+#: src/emu/ui/custui.cpp:1003
 msgid "White"
 msgstr "Белый"
 
-#: src/emu/ui/custui.cpp:1010
+#: src/emu/ui/custui.cpp:1004
 msgid "Silver"
 msgstr "Серебристый"
 
-#: src/emu/ui/custui.cpp:1011
+#: src/emu/ui/custui.cpp:1005
 msgid "Gray"
 msgstr "Серый"
 
-#: src/emu/ui/custui.cpp:1012
+#: src/emu/ui/custui.cpp:1006
 msgid "Black"
 msgstr "Черный"
 
-#: src/emu/ui/custui.cpp:1014
+#: src/emu/ui/custui.cpp:1008
 msgid "Orange"
 msgstr "Оранжевый"
 
-#: src/emu/ui/custui.cpp:1015
+#: src/emu/ui/custui.cpp:1009
 msgid "Yellow"
 msgstr "Желтый"
 
-#: src/emu/ui/custui.cpp:1018
+#: src/emu/ui/custui.cpp:1012
 msgid "Violet"
 msgstr "Фиолетовый"
 
-#: src/emu/ui/datmenu.cpp:65
+#: src/emu/ui/datmenu.cpp:64
 msgid "Software History"
 msgstr "История ПО"
 
-#: src/emu/ui/datmenu.cpp:67
+#: src/emu/ui/datmenu.cpp:66
 msgid "Software Usage"
 msgstr "Использование ПО"
 
-#: src/emu/ui/datmenu.cpp:199
+#: src/emu/ui/datmenu.cpp:196
 msgid "Revision: "
 msgstr "Ревизия: "
 
-#: src/emu/ui/datmenu.cpp:287 src/emu/ui/selgame.cpp:40
-#: src/emu/ui/selgame.cpp:2152 src/emu/ui/selgame.cpp:2161
-#: src/emu/ui/selsoft.cpp:1577 src/emu/ui/selsoft.cpp:1597
-#: src/emu/ui/selsoft.cpp:1606
+#: src/emu/ui/datmenu.cpp:284 src/emu/ui/selgame.cpp:39
+#: src/emu/ui/selgame.cpp:2158 src/emu/ui/selgame.cpp:2167
+#: src/emu/ui/selsoft.cpp:1574 src/emu/ui/selsoft.cpp:1592
+#: src/emu/ui/selsoft.cpp:1601
 msgid "History"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:289 src/emu/ui/selgame.cpp:41
+#: src/emu/ui/datmenu.cpp:286 src/emu/ui/selgame.cpp:40
 msgid "Mameinfo"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:291 src/emu/ui/selgame.cpp:43
+#: src/emu/ui/datmenu.cpp:288 src/emu/ui/selgame.cpp:42
 msgid "Messinfo"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:293 src/emu/ui/selgame.cpp:42
+#: src/emu/ui/datmenu.cpp:290 src/emu/ui/selgame.cpp:41
 msgid "Sysinfo"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:295 src/emu/ui/selgame.cpp:46
+#: src/emu/ui/datmenu.cpp:292 src/emu/ui/selgame.cpp:45
 msgid "Mamescore"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:297 src/emu/ui/selgame.cpp:45
+#: src/emu/ui/datmenu.cpp:294 src/emu/ui/selgame.cpp:44
 msgid "Gameinit"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:299 src/emu/ui/selgame.cpp:44
+#: src/emu/ui/datmenu.cpp:296 src/emu/ui/selgame.cpp:43
 msgid "Command"
 msgstr ""
 
@@ -559,75 +559,75 @@ msgstr "Нажмите TAB для выбора"
 msgid "Remove %1$s Folder"
 msgstr "Убрать папку %1$s"
 
-#: src/emu/ui/filesel.cpp:158
+#: src/emu/ui/filesel.cpp:161
 msgid "File Already Exists - Override?"
 msgstr "Файл уже существует - Заменить?"
 
-#: src/emu/ui/filesel.cpp:160 src/emu/ui/selgame.cpp:1568
-#: src/emu/ui/selgame.cpp:1569 src/emu/ui/selgame.cpp:1570
-#: src/emu/ui/selgame.cpp:1571 src/emu/ui/selgame.cpp:1572
-#: src/emu/ui/selgame.cpp:1573 src/emu/ui/selgame.cpp:1574
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/filesel.cpp:163 src/emu/ui/selgame.cpp:1576
+#: src/emu/ui/selgame.cpp:1577 src/emu/ui/selgame.cpp:1578
+#: src/emu/ui/selgame.cpp:1579 src/emu/ui/selgame.cpp:1580
+#: src/emu/ui/selgame.cpp:1581 src/emu/ui/selgame.cpp:1582
+#: src/emu/ui/selgame.cpp:1591
 msgid "No"
 msgstr "Нет"
 
-#: src/emu/ui/filesel.cpp:161 src/emu/ui/selgame.cpp:1568
-#: src/emu/ui/selgame.cpp:1569 src/emu/ui/selgame.cpp:1570
-#: src/emu/ui/selgame.cpp:1571 src/emu/ui/selgame.cpp:1572
-#: src/emu/ui/selgame.cpp:1573 src/emu/ui/selgame.cpp:1574
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/filesel.cpp:164 src/emu/ui/selgame.cpp:1576
+#: src/emu/ui/selgame.cpp:1577 src/emu/ui/selgame.cpp:1578
+#: src/emu/ui/selgame.cpp:1579 src/emu/ui/selgame.cpp:1580
+#: src/emu/ui/selgame.cpp:1581 src/emu/ui/selgame.cpp:1582
+#: src/emu/ui/selgame.cpp:1591
 msgid "Yes"
 msgstr "Да"
 
-#: src/emu/ui/filesel.cpp:272
+#: src/emu/ui/filesel.cpp:275
 msgid "New Image Name:"
 msgstr "Новый образ:"
 
-#: src/emu/ui/filesel.cpp:278
+#: src/emu/ui/filesel.cpp:281
 msgid "Image Format:"
 msgstr "Формат образа:"
 
-#: src/emu/ui/filesel.cpp:284
+#: src/emu/ui/filesel.cpp:287
 msgid "Create"
 msgstr "Создать"
 
-#: src/emu/ui/filesel.cpp:315
+#: src/emu/ui/filesel.cpp:318
 msgid "Please enter a file extension too"
 msgstr "Введите также расширение файла"
 
-#: src/emu/ui/filesel.cpp:503 src/emu/ui/swlist.cpp:65
+#: src/emu/ui/filesel.cpp:506 src/emu/ui/swlist.cpp:65
 msgid "[empty slot]"
 msgstr "[пустой слот]"
 
-#: src/emu/ui/filesel.cpp:507
+#: src/emu/ui/filesel.cpp:510
 msgid "[create]"
 msgstr "[создать]"
 
-#: src/emu/ui/filesel.cpp:511 src/emu/ui/swlist.cpp:76
+#: src/emu/ui/filesel.cpp:514 src/emu/ui/swlist.cpp:76
 msgid "[software list]"
 msgstr "[список ПО]"
 
-#: src/emu/ui/filesel.cpp:803
+#: src/emu/ui/filesel.cpp:806
 msgid "Select image format"
 msgstr "Выберите формат образа"
 
-#: src/emu/ui/filesel.cpp:863
+#: src/emu/ui/filesel.cpp:866
 msgid "Select access mode"
 msgstr "Выберите режим доступа"
 
-#: src/emu/ui/filesel.cpp:864
+#: src/emu/ui/filesel.cpp:867
 msgid "Read-only"
 msgstr "Только чтение"
 
-#: src/emu/ui/filesel.cpp:866
+#: src/emu/ui/filesel.cpp:869
 msgid "Read-write"
 msgstr "Чтение-запись"
 
-#: src/emu/ui/filesel.cpp:867
+#: src/emu/ui/filesel.cpp:870
 msgid "Read this image, write to another image"
 msgstr "Чтение из этого образа, запись в другой"
 
-#: src/emu/ui/filesel.cpp:868
+#: src/emu/ui/filesel.cpp:871
 msgid "Read this image, write to diff"
 msgstr "Чтение из этого образа, запись в diff"
 
@@ -653,7 +653,7 @@ msgstr "Частично поддерживается"
 msgid "[empty]"
 msgstr "[пусто]"
 
-#: src/emu/ui/info_pty.cpp:26 src/emu/ui/mainmenu.cpp:91
+#: src/emu/ui/info_pty.cpp:26 src/emu/ui/mainmenu.cpp:96
 msgid "Pseudo terminals"
 msgstr "Псевдо-терминалы"
 
@@ -669,7 +669,7 @@ msgstr "Интерфейс пользователя"
 msgid "Other Controls"
 msgstr "Дополнительное управление"
 
-#: src/emu/ui/inputmap.cpp:622 src/emu/ui/miscmenu.cpp:91
+#: src/emu/ui/inputmap.cpp:622 src/emu/ui/miscmenu.cpp:92
 #: src/emu/ui/slotopt.cpp:172
 msgid "Reset"
 msgstr "Сброс"
@@ -702,27 +702,27 @@ msgstr "Статистика игры"
 msgid "Machine Information"
 msgstr "Информация о системе"
 
-#: src/emu/ui/mainmenu.cpp:78
+#: src/emu/ui/mainmenu.cpp:80
 msgid "Image Information"
 msgstr "Информация о образах"
 
-#: src/emu/ui/mainmenu.cpp:81
+#: src/emu/ui/mainmenu.cpp:83
 msgid "File Manager"
 msgstr "Файловый менеджер"
 
-#: src/emu/ui/mainmenu.cpp:86
+#: src/emu/ui/mainmenu.cpp:92
 msgid "Tape Control"
 msgstr "Управление лентой"
 
-#: src/emu/ui/mainmenu.cpp:94
+#: src/emu/ui/mainmenu.cpp:99
 msgid "Bios Selection"
 msgstr "Выбор BIOS"
 
-#: src/emu/ui/mainmenu.cpp:100
+#: src/emu/ui/mainmenu.cpp:104
 msgid "Slot Devices"
 msgstr "Подключаемые устройства"
 
-#: src/emu/ui/mainmenu.cpp:107
+#: src/emu/ui/mainmenu.cpp:109
 msgid "Barcode Reader"
 msgstr "Сканер штрих-кодов"
 
@@ -730,43 +730,43 @@ msgstr "Сканер штрих-кодов"
 msgid "Network Devices"
 msgstr "Сетевые устройства"
 
-#: src/emu/ui/mainmenu.cpp:119
+#: src/emu/ui/mainmenu.cpp:118
 msgid "Keyboard Mode"
 msgstr "Режим клавиатуры"
 
-#: src/emu/ui/mainmenu.cpp:122
+#: src/emu/ui/mainmenu.cpp:121
 msgid "Slider Controls"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:125
+#: src/emu/ui/mainmenu.cpp:124
 msgid "Video Options"
 msgstr "Настройки видео"
 
-#: src/emu/ui/mainmenu.cpp:129
+#: src/emu/ui/mainmenu.cpp:128
 msgid "Crosshair Options"
 msgstr "Настройки прицела"
 
-#: src/emu/ui/mainmenu.cpp:133
+#: src/emu/ui/mainmenu.cpp:132
 msgid "Cheat"
 msgstr "Читы"
 
-#: src/emu/ui/mainmenu.cpp:136
+#: src/emu/ui/mainmenu.cpp:135
 msgid "Plugin Options"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:140
+#: src/emu/ui/mainmenu.cpp:139
 msgid "External DAT View"
 msgstr "Просмотр DAT-файлов"
 
-#: src/emu/ui/mainmenu.cpp:146
+#: src/emu/ui/mainmenu.cpp:145 src/emu/ui/miscmenu.cpp:785
 msgid "Add To Favorites"
 msgstr "Добавить в Избранное"
 
-#: src/emu/ui/mainmenu.cpp:148
+#: src/emu/ui/mainmenu.cpp:147 src/emu/ui/miscmenu.cpp:787
 msgid "Remove From Favorites"
 msgstr "Удалить из Избранного"
 
-#: src/emu/ui/mainmenu.cpp:155
+#: src/emu/ui/mainmenu.cpp:154
 msgid "Select New Machine"
 msgstr "Выбрать новую систему"
 
@@ -806,154 +806,95 @@ msgstr "Выход"
 msgid "Return to Previous Menu"
 msgstr "Возврат в предыдущее меню"
 
-#: src/emu/ui/menu.cpp:716
+#: src/emu/ui/menu.cpp:761
 msgid "Auto"
 msgstr "Авто"
 
-#: src/emu/ui/menu.cpp:2133
+#: src/emu/ui/menu.cpp:2195
 msgid "Images"
 msgstr ""
 
-#: src/emu/ui/menu.cpp:2134
+#: src/emu/ui/menu.cpp:2196
 msgid "Infos"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Keyboard Mode:"
 msgstr "Режим клавиатуры:"
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Natural"
 msgstr "Обычная"
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Emulated"
 msgstr "Эмулируется"
 
-#: src/emu/ui/miscmenu.cpp:240
+#: src/emu/ui/miscmenu.cpp:241
 #, c-format
 msgid ""
 "Uptime: %1$d:%2$02d:%3$02d\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:242
+#: src/emu/ui/miscmenu.cpp:243
 #, c-format
 msgid ""
 "Uptime: %1$d:%2$02d\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:246
+#: src/emu/ui/miscmenu.cpp:247
 #, c-format
 msgid ""
 "Tickets dispensed: %1$d\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:257
+#: src/emu/ui/miscmenu.cpp:258
 msgid "Coin %1$c: NA%3$s\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:257
+#: src/emu/ui/miscmenu.cpp:258
 #, c-format
 msgid "Coin %1$c: %2$d%3$s\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:260
+#: src/emu/ui/miscmenu.cpp:261
 msgid " (locked)"
 msgstr " (закрыт)"
 
-#: src/emu/ui/miscmenu.cpp:519
+#: src/emu/ui/miscmenu.cpp:520
 msgid "Visible Delay"
 msgstr "Видимый экран"
 
-#: src/emu/ui/miscmenu.cpp:617
+#: src/emu/ui/miscmenu.cpp:619
 #, c-format
 msgid "%s.xml saved under ui folder."
 msgstr "%s.xml сохранен в папку ui."
 
-#: src/emu/ui/miscmenu.cpp:645
+#: src/emu/ui/miscmenu.cpp:647
 msgid "Name:             Description:\n"
 msgstr "Имя:              Описание:\n"
 
-#: src/emu/ui/miscmenu.cpp:657
+#: src/emu/ui/miscmenu.cpp:659
 #, c-format
 msgid "%s.txt saved under ui folder."
 msgstr "%s.txt сохранен в папку ui."
 
-#: src/emu/ui/miscmenu.cpp:675
-msgid "Export XML format (like -listxml)"
-msgstr "Экспорт в формат XML (как -listxml)"
-
-#: src/emu/ui/miscmenu.cpp:676
-msgid "Export TXT format (like -listfull)"
-msgstr "Экспорт в формат TXT (как -listfull)"
-
-#: src/emu/ui/miscmenu.cpp:734
-msgid "Dummy"
+#: src/emu/ui/miscmenu.cpp:677
+msgid "Export list in XML format (like -listxml)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:736
-msgid "Save machine configuration"
-msgstr "Сохранить настройки этой системы"
+#: src/emu/ui/miscmenu.cpp:678
+msgid "Export list in XML format (like -listxml, but exclude devices)"
+msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:848 src/emu/ui/miscmenu.cpp:869
-#: src/emu/ui/selgame.cpp:594
-msgid "Plugins"
-msgstr "Плагины"
+#: src/emu/ui/miscmenu.cpp:679
+msgid "Export list in TXT format (like -listfull)"
+msgstr ""
 
-#: src/emu/ui/optsmenu.cpp:218
-msgid "Filter"
-msgstr "Фильтр"
-
-#: src/emu/ui/optsmenu.cpp:226
-msgid " ^!File"
-msgstr " ^!Файл"
-
-#: src/emu/ui/optsmenu.cpp:231
-msgid " ^!Category"
-msgstr " ^!Категория"
-
-#: src/emu/ui/optsmenu.cpp:254
-msgid "^!Setup custom filter"
-msgstr "^!Задать свой фильтр"
-
-#: src/emu/ui/optsmenu.cpp:262
-msgid "Customize UI"
-msgstr "Настройка интерфейса"
-
-#: src/emu/ui/optsmenu.cpp:263
-msgid "Configure Directories"
-msgstr "Настройки путей"
-
-#: src/emu/ui/optsmenu.cpp:266 src/emu/ui/sndmenu.cpp:151
-#: src/emu/ui/sndmenu.cpp:172
-msgid "Sound Options"
-msgstr "Настройки звука"
-
-#: src/emu/ui/optsmenu.cpp:269
-msgid "General Inputs"
-msgstr "Управление (общее)"
-
-#: src/emu/ui/optsmenu.cpp:272
-msgid "Save Configuration"
-msgstr "Сохранить настройки"
-
-#: src/emu/ui/optsmenu.cpp:286 src/emu/ui/optsmenu.cpp:307
-msgid "Settings"
-msgstr "Настройки"
-
-#: src/emu/ui/optsmenu.cpp:327
-msgid "**Error saving ui.ini**"
-msgstr "**Ошибка сохранения ui.ini**"
-
-#: src/emu/ui/optsmenu.cpp:374
-#, c-format
-msgid "**Error saving %s.ini**"
-msgstr "**Ошибка сохранения %s.ini**"
-
-#: src/emu/ui/optsmenu.cpp:378
+#: src/emu/ui/miscmenu.cpp:729 src/emu/ui/optsmenu.cpp:376
 msgid ""
 "\n"
 "    Configuration saved    \n"
@@ -963,20 +904,95 @@ msgstr ""
 "    Настройки сохранены    \n"
 "\n"
 
-#: src/emu/ui/selector.cpp:166
+#: src/emu/ui/miscmenu.cpp:774
+msgid "Bios"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:776
+msgid "Driver"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:790
+msgid "Save machine configuration"
+msgstr "Сохранить настройки этой системы"
+
+#: src/emu/ui/miscmenu.cpp:806
+msgid "Configure machine:"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:868 src/emu/ui/selsoft.cpp:109
+msgid " (default)"
+msgstr " (по-умолчанию)"
+
+#: src/emu/ui/miscmenu.cpp:953 src/emu/ui/miscmenu.cpp:973
+#: src/emu/ui/selgame.cpp:600
+msgid "Plugins"
+msgstr "Плагины"
+
+#: src/emu/ui/optsmenu.cpp:217
+msgid "Filter"
+msgstr "Фильтр"
+
+#: src/emu/ui/optsmenu.cpp:225
+msgid " ^!File"
+msgstr " ^!Файл"
+
+#: src/emu/ui/optsmenu.cpp:230
+msgid " ^!Category"
+msgstr " ^!Категория"
+
+#: src/emu/ui/optsmenu.cpp:253
+msgid "^!Setup custom filter"
+msgstr "^!Задать свой фильтр"
+
+#: src/emu/ui/optsmenu.cpp:261
+msgid "Customize UI"
+msgstr "Настройка интерфейса"
+
+#: src/emu/ui/optsmenu.cpp:262
+msgid "Configure Directories"
+msgstr "Настройки путей"
+
+#: src/emu/ui/optsmenu.cpp:265 src/emu/ui/sndmenu.cpp:149
+#: src/emu/ui/sndmenu.cpp:169
+msgid "Sound Options"
+msgstr "Настройки звука"
+
+#: src/emu/ui/optsmenu.cpp:268
+msgid "General Inputs"
+msgstr "Управление (общее)"
+
+#: src/emu/ui/optsmenu.cpp:271
+msgid "Save Configuration"
+msgstr "Сохранить настройки"
+
+#: src/emu/ui/optsmenu.cpp:285 src/emu/ui/optsmenu.cpp:305
+msgid "Settings"
+msgstr "Настройки"
+
+#: src/emu/ui/optsmenu.cpp:325
+msgid "**Error saving ui.ini**"
+msgstr "**Ошибка сохранения ui.ini**"
+
+#: src/emu/ui/optsmenu.cpp:372
+#, c-format
+msgid "**Error saving %s.ini**"
+msgstr "**Ошибка сохранения %s.ini**"
+
+#: src/emu/ui/selector.cpp:165
 msgid "Selection List - Search: "
 msgstr "Список выбора - Поиск: "
 
-#: src/emu/ui/selector.cpp:196
+#: src/emu/ui/selector.cpp:194
 #, c-format
 msgid "Double click or press %1$s to select"
 msgstr "Кликние два раза или нажмите %1$s для выбора"
 
-#: src/emu/ui/selgame.cpp:39
+#: src/emu/ui/selgame.cpp:38
 msgid "General Info"
 msgstr "Общая информация"
 
-#: src/emu/ui/selgame.cpp:374 src/emu/ui/selsoft.cpp:282
+#: src/emu/ui/selgame.cpp:380 src/emu/ui/selsoft.cpp:281
 #, c-format
 msgid ""
 "%s\n"
@@ -985,8 +1001,8 @@ msgstr ""
 "%s\n"
 " добавлен в список избранного."
 
-#: src/emu/ui/selgame.cpp:380 src/emu/ui/selgame.cpp:389
-#: src/emu/ui/selsoft.cpp:287
+#: src/emu/ui/selgame.cpp:386 src/emu/ui/selgame.cpp:395
+#: src/emu/ui/selsoft.cpp:286
 #, c-format
 msgid ""
 "%s\n"
@@ -995,7 +1011,7 @@ msgstr ""
 "%s\n"
 " убран из списка избранного."
 
-#: src/emu/ui/selgame.cpp:450
+#: src/emu/ui/selgame.cpp:457
 msgid ""
 "The selected machine is missing one or more required ROM or CHD images. "
 "Please select a different machine.\n"
@@ -1003,275 +1019,275 @@ msgid ""
 "Press any key to continue."
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:589 src/emu/ui/simpleselgame.cpp:265
+#: src/emu/ui/selgame.cpp:595 src/emu/ui/simpleselgame.cpp:265
 msgid "Configure Options"
 msgstr "Изменение настроек"
 
-#: src/emu/ui/selgame.cpp:752
+#: src/emu/ui/selgame.cpp:596
+msgid "Configure Machine"
+msgstr ""
+
+#: src/emu/ui/selgame.cpp:758
 #, c-format
 msgid "%1$s %2$s ( %3$d / %4$d machines (%5$d BIOS) )"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:762
+#: src/emu/ui/selgame.cpp:768
 #, c-format
 msgid "%1$s (%2$s - %3$s) - "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:769 src/emu/ui/selgame.cpp:775
+#: src/emu/ui/selgame.cpp:775 src/emu/ui/selgame.cpp:781
 #, c-format
 msgid "%1$s (%2$s) - "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:784
+#: src/emu/ui/selgame.cpp:790
 #, c-format
 msgid "%1$s Search: %2$s_"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:838
+#: src/emu/ui/selgame.cpp:844
 #, c-format
 msgid "Romset: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:841 src/emu/ui/selgame.cpp:890
-#: src/emu/ui/selsoft.cpp:751 src/emu/ui/selsoft.cpp:801
+#: src/emu/ui/selgame.cpp:847 src/emu/ui/selgame.cpp:896
+#: src/emu/ui/selsoft.cpp:750 src/emu/ui/selsoft.cpp:800
 #: src/emu/ui/simpleselgame.cpp:328
 #, c-format
 msgid "%1$s, %2$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:847 src/emu/ui/selsoft.cpp:757
+#: src/emu/ui/selgame.cpp:853 src/emu/ui/selsoft.cpp:756
 #, c-format
 msgid "Driver is clone of: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:849 src/emu/ui/selsoft.cpp:759
+#: src/emu/ui/selgame.cpp:855 src/emu/ui/selsoft.cpp:758
 msgid "Driver is parent"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:853 src/emu/ui/selsoft.cpp:763
+#: src/emu/ui/selgame.cpp:859 src/emu/ui/selsoft.cpp:762
 #: src/emu/ui/simpleselgame.cpp:335
 msgid "Overall: NOT WORKING"
 msgstr "В целом: НЕ РАБОТАЕТ"
 
-#: src/emu/ui/selgame.cpp:855 src/emu/ui/selsoft.cpp:765
+#: src/emu/ui/selgame.cpp:861 src/emu/ui/selsoft.cpp:764
 #: src/emu/ui/simpleselgame.cpp:337
 msgid "Overall: Unemulated Protection"
 msgstr "В целом: Не эмулируется защита"
 
-#: src/emu/ui/selgame.cpp:857 src/emu/ui/selsoft.cpp:767
+#: src/emu/ui/selgame.cpp:863 src/emu/ui/selsoft.cpp:766
 #: src/emu/ui/simpleselgame.cpp:339
 msgid "Overall: Working"
 msgstr "В целом: Работает"
 
-#: src/emu/ui/selgame.cpp:861 src/emu/ui/selsoft.cpp:771
+#: src/emu/ui/selgame.cpp:867 src/emu/ui/selsoft.cpp:770
 msgid "Graphics: Imperfect, "
 msgstr "Графика: Не идеально, "
 
-#: src/emu/ui/selgame.cpp:863 src/emu/ui/selsoft.cpp:773
+#: src/emu/ui/selgame.cpp:869 src/emu/ui/selsoft.cpp:772
 msgid "Graphics: OK, "
 msgstr "Графика: OK, "
 
-#: src/emu/ui/selgame.cpp:866 src/emu/ui/selsoft.cpp:776
+#: src/emu/ui/selgame.cpp:872 src/emu/ui/selsoft.cpp:775
 msgid "Sound: Unimplemented"
 msgstr "Звук: Не реализован"
 
-#: src/emu/ui/selgame.cpp:868 src/emu/ui/selsoft.cpp:778
+#: src/emu/ui/selgame.cpp:874 src/emu/ui/selsoft.cpp:777
 msgid "Sound: Imperfect"
 msgstr "Звук: Не идеально"
 
-#: src/emu/ui/selgame.cpp:870 src/emu/ui/selsoft.cpp:780
+#: src/emu/ui/selgame.cpp:876 src/emu/ui/selsoft.cpp:779
 msgid "Sound: OK"
 msgstr "Звук: OK"
 
-#: src/emu/ui/selgame.cpp:887
+#: src/emu/ui/selgame.cpp:893
 #, c-format
 msgid "System: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:894 src/emu/ui/selsoft.cpp:805
+#: src/emu/ui/selgame.cpp:900 src/emu/ui/selsoft.cpp:804
 #, c-format
 msgid "Software is clone of: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:896 src/emu/ui/selsoft.cpp:807
+#: src/emu/ui/selgame.cpp:902 src/emu/ui/selsoft.cpp:806
 msgid "Software is parent"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:901 src/emu/ui/selsoft.cpp:812
+#: src/emu/ui/selgame.cpp:907 src/emu/ui/selsoft.cpp:811
 msgid "Supported: No"
 msgstr "Поддерживается: Нет"
 
-#: src/emu/ui/selgame.cpp:906 src/emu/ui/selsoft.cpp:817
+#: src/emu/ui/selgame.cpp:912 src/emu/ui/selsoft.cpp:816
 msgid "Supported: Partial"
 msgstr "Поддерживается: Частично"
 
-#: src/emu/ui/selgame.cpp:911 src/emu/ui/selsoft.cpp:822
+#: src/emu/ui/selgame.cpp:917 src/emu/ui/selsoft.cpp:821
 msgid "Supported: Yes"
 msgstr "Поддерживается: Да"
 
-#: src/emu/ui/selgame.cpp:916 src/emu/ui/selsoft.cpp:827
+#: src/emu/ui/selgame.cpp:922 src/emu/ui/selsoft.cpp:826
 #, c-format
 msgid "romset: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:923
+#: src/emu/ui/selgame.cpp:929
 #, c-format
 msgid "%1$s %2$s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1535
+#: src/emu/ui/selgame.cpp:1543
 #, c-format
 msgid "Romset: %1$-.100s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1536
+#: src/emu/ui/selgame.cpp:1544
 #, c-format
 msgid "Year: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1537
+#: src/emu/ui/selgame.cpp:1545
 #, c-format
 msgid "Manufacturer: %1$-.100s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1541
+#: src/emu/ui/selgame.cpp:1549
 #, c-format
 msgid "Driver is Clone of: %1$-.100s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1543
+#: src/emu/ui/selgame.cpp:1551
 msgid "Driver is Parent\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1546
+#: src/emu/ui/selgame.cpp:1554
 msgid "Overall: NOT WORKING\n"
 msgstr "В целом: НЕ РАБОТАЕТ\n"
 
-#: src/emu/ui/selgame.cpp:1548
+#: src/emu/ui/selgame.cpp:1556
 msgid "Overall: Unemulated Protection\n"
 msgstr "В целом: Не эмулируется защита\n"
 
-#: src/emu/ui/selgame.cpp:1550
+#: src/emu/ui/selgame.cpp:1558
 msgid "Overall: Working\n"
 msgstr "В целом: Работает\n"
 
-#: src/emu/ui/selgame.cpp:1553
+#: src/emu/ui/selgame.cpp:1561
 msgid "Graphics: Imperfect Colors\n"
 msgstr "Графика: Не точные цвета"
 
-#: src/emu/ui/selgame.cpp:1557
+#: src/emu/ui/selgame.cpp:1565
 msgid "Graphics: Imperfect\n"
 msgstr "Графика: Не идеально\n"
 
-#: src/emu/ui/selgame.cpp:1559
+#: src/emu/ui/selgame.cpp:1567
 msgid "Graphics: OK\n"
 msgstr "Графика: OK\n"
 
-#: src/emu/ui/selgame.cpp:1562
+#: src/emu/ui/selgame.cpp:1570
 msgid "Sound: Unimplemented\n"
 msgstr "Звук: Не реализован\n"
 
-#: src/emu/ui/selgame.cpp:1564
+#: src/emu/ui/selgame.cpp:1572
 msgid "Sound: Imperfect\n"
 msgstr "Звук: Не идеально\n"
 
-#: src/emu/ui/selgame.cpp:1566
+#: src/emu/ui/selgame.cpp:1574
 msgid "Sound: OK\n"
 msgstr "Звук: OK\n"
 
-#: src/emu/ui/selgame.cpp:1568
+#: src/emu/ui/selgame.cpp:1576
 #, c-format
 msgid "Driver is Skeleton: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1569
+#: src/emu/ui/selgame.cpp:1577
 #, c-format
 msgid "Game is Mechanical: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1570
+#: src/emu/ui/selgame.cpp:1578
 #, c-format
 msgid "Requires Artwork: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1571
+#: src/emu/ui/selgame.cpp:1579
 #, c-format
 msgid "Requires Clickable Artwork: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1572
+#: src/emu/ui/selgame.cpp:1580
 #, c-format
 msgid "Support Cocktail: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1573
+#: src/emu/ui/selgame.cpp:1581
 #, c-format
 msgid "Driver is Bios: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1574
+#: src/emu/ui/selgame.cpp:1582
 #, c-format
 msgid "Support Save: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 #, c-format
 msgid "Screen Orientation: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 msgid "Vertical"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 msgid "Horizontal"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/selgame.cpp:1591
 #, c-format
 msgid "Requires CHD: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1596
+#: src/emu/ui/selgame.cpp:1604
 msgid "Roms Audit Pass: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1598
+#: src/emu/ui/selgame.cpp:1606
 msgid "Roms Audit Pass: BAD\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1601
+#: src/emu/ui/selgame.cpp:1609
 msgid "Samples Audit Pass: None Needed\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1603
+#: src/emu/ui/selgame.cpp:1611
 msgid "Samples Audit Pass: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1605
+#: src/emu/ui/selgame.cpp:1613
 msgid "Samples Audit Pass: BAD\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1608
+#: src/emu/ui/selgame.cpp:1616
 msgid ""
 "Roms Audit Pass: Disabled\n"
 "Samples Audit Pass: Disabled\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:2049 src/emu/ui/selgame.cpp:2212
-#: src/emu/ui/selsoft.cpp:1662
+#: src/emu/ui/selgame.cpp:2055 src/emu/ui/selgame.cpp:2216
+#: src/emu/ui/selsoft.cpp:1655
 msgid "No Infos Available"
 msgstr "Нет информации"
 
-#: src/emu/ui/selgame.cpp:2162 src/emu/ui/selsoft.cpp:1607
+#: src/emu/ui/selgame.cpp:2168 src/emu/ui/selsoft.cpp:1602
 msgid "Usage"
 msgstr "Использование"
 
-#: src/emu/ui/selsoft.cpp:110
-msgid " (default)"
-msgstr " (по-умолчанию)"
-
-#: src/emu/ui/selsoft.cpp:381
+#: src/emu/ui/selsoft.cpp:380
 msgid ""
 "The selected software is missing one or more required files. Please select a "
 "different software.\n"
@@ -1279,57 +1295,57 @@ msgid ""
 "Press any key to continue."
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:684
+#: src/emu/ui/selsoft.cpp:683
 #, c-format
-msgid "%1$s %2$s ( %3$d / %4$d softwares )"
+msgid "%1$s %2$s ( %3$d / %4$d software packages )"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:685
+#: src/emu/ui/selsoft.cpp:684
 #, c-format
 msgid "Driver: \"%1$s\" software list "
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:688
+#: src/emu/ui/selsoft.cpp:687
 #, c-format
 msgid "Region: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:690
+#: src/emu/ui/selsoft.cpp:689
 #, c-format
 msgid "Publisher: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:692
+#: src/emu/ui/selsoft.cpp:691
 #, c-format
 msgid "Year: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:694
+#: src/emu/ui/selsoft.cpp:693
 #, c-format
 msgid "Software List: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:696
+#: src/emu/ui/selsoft.cpp:695
 #, c-format
 msgid "Device type: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:698
+#: src/emu/ui/selsoft.cpp:697
 #, c-format
 msgid "%s Search: %s_"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:748 src/emu/ui/selsoft.cpp:798
+#: src/emu/ui/selsoft.cpp:747 src/emu/ui/selsoft.cpp:797
 #: src/emu/ui/simpleselgame.cpp:325
 #, c-format
 msgid "%1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:1998 src/emu/ui/selsoft.cpp:2018
+#: src/emu/ui/selsoft.cpp:1991 src/emu/ui/selsoft.cpp:2011
 msgid "Software part selection:"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:2136 src/emu/ui/selsoft.cpp:2156
+#: src/emu/ui/selsoft.cpp:2129 src/emu/ui/selsoft.cpp:2149
 msgid "Bios selection:"
 msgstr "Выбор BIOS:"
 
@@ -1377,15 +1393,15 @@ msgstr ""
 msgid " [internal]"
 msgstr " [внутренний]"
 
-#: src/emu/ui/sndmenu.cpp:135
+#: src/emu/ui/sndmenu.cpp:133
 msgid "Sound"
 msgstr "Звук"
 
-#: src/emu/ui/sndmenu.cpp:136
+#: src/emu/ui/sndmenu.cpp:134
 msgid "Sample Rate"
 msgstr "Частота звука"
 
-#: src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/sndmenu.cpp:135
 msgid "Use External Samples"
 msgstr "Использовать внешние звуки"
 
@@ -1454,11 +1470,11 @@ msgstr ""
 msgid "Fast Forward"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:419
+#: src/emu/ui/ui.cpp:418
 msgid "This driver requires images to be loaded in the following device(s): "
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1074
+#: src/emu/ui/ui.cpp:1071
 msgid ""
 "One or more ROMs/CHDs for this machine are incorrect. The machine may not "
 "run correctly.\n"
@@ -1466,7 +1482,7 @@ msgstr ""
 "Один или несколько ROMов/CHD этой системы не верные. Эта система может "
 "работать не правильно.\n"
 
-#: src/emu/ui/ui.cpp:1087
+#: src/emu/ui/ui.cpp:1084
 msgid ""
 "There are known problems with this machine\n"
 "\n"
@@ -1474,48 +1490,48 @@ msgstr ""
 "Имеются известные проблемы с этой системой\n"
 "\n"
 
-#: src/emu/ui/ui.cpp:1091
+#: src/emu/ui/ui.cpp:1088
 msgid ""
 "One or more ROMs/CHDs for this machine have not been correctly dumped.\n"
 msgstr "Один или несколько ROM/CHD этой системы не были нормально сдамплены.\n"
 
-#: src/emu/ui/ui.cpp:1095
+#: src/emu/ui/ui.cpp:1092
 #, c-format
 msgid "The keyboard emulation may not be 100% accurate.\n"
 msgstr "Эмуляция клавиатуры не 100% точная.\n"
 
-#: src/emu/ui/ui.cpp:1097
+#: src/emu/ui/ui.cpp:1094
 #, c-format
 msgid "The colors aren't 100% accurate.\n"
 msgstr "Цвета не 100% точные.\n"
 
-#: src/emu/ui/ui.cpp:1099
+#: src/emu/ui/ui.cpp:1096
 msgid "The colors are completely wrong.\n"
 msgstr "Цвета совсем не правильные.\n"
 
-#: src/emu/ui/ui.cpp:1101
+#: src/emu/ui/ui.cpp:1098
 #, c-format
 msgid "The video emulation isn't 100% accurate.\n"
 msgstr "Эмуляция видео не 100% точная.\n"
 
-#: src/emu/ui/ui.cpp:1103
+#: src/emu/ui/ui.cpp:1100
 #, c-format
 msgid "The sound emulation isn't 100% accurate.\n"
 msgstr "Эмуляция звука не 100% точная.\n"
 
-#: src/emu/ui/ui.cpp:1105
+#: src/emu/ui/ui.cpp:1102
 msgid "The machine lacks sound.\n"
 msgstr "Звук не эмулируется.\n"
 
-#: src/emu/ui/ui.cpp:1108
+#: src/emu/ui/ui.cpp:1105
 msgid "Screen flipping in cocktail mode is not supported.\n"
 msgstr "Переворот экрана в режиме коктейль-стола не поддерживается.\n"
 
-#: src/emu/ui/ui.cpp:1112
+#: src/emu/ui/ui.cpp:1109
 msgid "The machine requires external artwork files\n"
 msgstr "Этой системе нужны внешние файлы оформления\n"
 
-#: src/emu/ui/ui.cpp:1117
+#: src/emu/ui/ui.cpp:1114
 msgid ""
 "This machine was never completed. It may exhibit strange behavior or missing "
 "elements that are not bugs in the emulation.\n"
@@ -1523,7 +1539,7 @@ msgstr ""
 "Разработка этой системы так и не была завершена. Может наблюдаться странное "
 "поведение или отсутсвующие элементы. Это не является ошибками эмуляции.\n"
 
-#: src/emu/ui/ui.cpp:1122
+#: src/emu/ui/ui.cpp:1119
 msgid ""
 "This machine has no sound hardware, MAME will produce no sounds, this is "
 "expected behaviour.\n"
@@ -1531,11 +1547,11 @@ msgstr ""
 "У этой системы нет звукового оборудования, в процессе эмуляции не будет "
 "никаких звуков, так и должно быть.\n"
 
-#: src/emu/ui/ui.cpp:1130
+#: src/emu/ui/ui.cpp:1127
 msgid "The machine has protection which isn't fully emulated.\n"
 msgstr "Защита этой системы эмулируется не полностью.\n"
 
-#: src/emu/ui/ui.cpp:1133
+#: src/emu/ui/ui.cpp:1130
 msgid ""
 "\n"
 "THIS MACHINE DOESN'T WORK. The emulation for this machine is not yet "
@@ -1546,7 +1562,7 @@ msgstr ""
 "ЭТА СИСТЕМА НЕ РАБОТАЕТ. Эмуляция этой системы не завершена. Вы никак не "
 "сможете исправить проблемы, лишь ждать когда разработчики улучшат эмуляцию.\n"
 
-#: src/emu/ui/ui.cpp:1137
+#: src/emu/ui/ui.cpp:1134
 msgid ""
 "\n"
 "Certain elements of this machine cannot be emulated as it requires actual "
@@ -1554,7 +1570,7 @@ msgid ""
 "to fully play this machine.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1156
+#: src/emu/ui/ui.cpp:1153
 msgid ""
 "\n"
 "\n"
@@ -1564,7 +1580,7 @@ msgstr ""
 "\n"
 "Известные работающие клоны этой системы: "
 
-#: src/emu/ui/ui.cpp:1170
+#: src/emu/ui/ui.cpp:1167
 msgid ""
 "\n"
 "\n"
@@ -1574,7 +1590,7 @@ msgstr ""
 "\n"
 "Нажмите любую клавишу для продолжения"
 
-#: src/emu/ui/ui.cpp:1185
+#: src/emu/ui/ui.cpp:1182
 #, c-format
 msgid ""
 "%1$s\n"
@@ -1584,15 +1600,15 @@ msgid ""
 "CPU:\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1221 src/emu/ui/ui.cpp:1260
+#: src/emu/ui/ui.cpp:1218 src/emu/ui/ui.cpp:1257
 msgid "MHz"
 msgstr "МГц"
 
-#: src/emu/ui/ui.cpp:1221 src/emu/ui/ui.cpp:1260
+#: src/emu/ui/ui.cpp:1218 src/emu/ui/ui.cpp:1257
 msgid "kHz"
 msgstr "кГц"
 
-#: src/emu/ui/ui.cpp:1235
+#: src/emu/ui/ui.cpp:1232
 msgid ""
 "\n"
 "Sound:\n"
@@ -1600,7 +1616,7 @@ msgstr ""
 "\n"
 "Звук:\n"
 
-#: src/emu/ui/ui.cpp:1264
+#: src/emu/ui/ui.cpp:1261
 msgid ""
 "\n"
 "Video:\n"
@@ -1608,78 +1624,78 @@ msgstr ""
 "\n"
 "Видео:\n"
 
-#: src/emu/ui/ui.cpp:1268
+#: src/emu/ui/ui.cpp:1265
 msgid "None\n"
 msgstr "Нет\n"
 
-#: src/emu/ui/ui.cpp:1275
+#: src/emu/ui/ui.cpp:1272
 msgid "Vector"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1286
+#: src/emu/ui/ui.cpp:1283
 #, c-format
 msgid "%1$s: %2$s\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1286
+#: src/emu/ui/ui.cpp:1283
 msgid "%2$s\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1541 src/emu/ui/ui.cpp:1551
+#: src/emu/ui/ui.cpp:1538 src/emu/ui/ui.cpp:1548
 msgid "Keyboard Emulation Status"
 msgstr "Состояние эмуляции клавиатуры"
 
-#: src/emu/ui/ui.cpp:1543
+#: src/emu/ui/ui.cpp:1540
 msgid "Mode: PARTIAL Emulation"
 msgstr "Режим: Частичная эмуляция"
 
-#: src/emu/ui/ui.cpp:1544
+#: src/emu/ui/ui.cpp:1541
 msgid "UI:   Enabled"
 msgstr "UI:   Включен"
 
-#: src/emu/ui/ui.cpp:1546 src/emu/ui/ui.cpp:1556
+#: src/emu/ui/ui.cpp:1543 src/emu/ui/ui.cpp:1553
 msgid "**Use ScrLock to toggle**"
 msgstr "**Нажмите ScrLock для переключения**"
 
-#: src/emu/ui/ui.cpp:1553
+#: src/emu/ui/ui.cpp:1550
 msgid "Mode: FULL Emulation"
 msgstr "Режим: Полная эмуляция"
 
-#: src/emu/ui/ui.cpp:1554
+#: src/emu/ui/ui.cpp:1551
 msgid "UI:   Disabled"
 msgstr "UI:   Выключен"
 
-#: src/emu/ui/ui.cpp:1692
+#: src/emu/ui/ui.cpp:1689
 msgid "Autofire can't be enabled"
 msgstr "Авто-огонь не может быть включен"
 
-#: src/emu/ui/ui.cpp:1731
+#: src/emu/ui/ui.cpp:1728
 msgid "Select position to save to"
 msgstr "Укажите слот сохранения"
 
-#: src/emu/ui/ui.cpp:1733
+#: src/emu/ui/ui.cpp:1730
 msgid "Select position to load from"
 msgstr "Укажите слот загрузки"
 
-#: src/emu/ui/ui.cpp:1757
+#: src/emu/ui/ui.cpp:1754
 msgid "Save cancelled"
 msgstr "Сохранение отменено"
 
-#: src/emu/ui/ui.cpp:1759
+#: src/emu/ui/ui.cpp:1756
 msgid "Load cancelled"
 msgstr "Загрузка отменена"
 
-#: src/emu/ui/ui.cpp:1802
+#: src/emu/ui/ui.cpp:1799
 #, c-format
 msgid "Save to position %s"
 msgstr "Сохранение состояния %s"
 
-#: src/emu/ui/ui.cpp:1807
+#: src/emu/ui/ui.cpp:1804
 #, c-format
 msgid "Load from position %s"
 msgstr "Загрузка состояния %s"
 
-#: src/emu/ui/ui.cpp:1847
+#: src/emu/ui/ui.cpp:1844
 #, c-format
 msgid ""
 "Are you sure you want to quit?\n"
@@ -1688,173 +1704,173 @@ msgid ""
 "Press ''%2$s'' to return to emulation."
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1917
+#: src/emu/ui/ui.cpp:1914
 msgid "Master Volume"
 msgstr "Общая громкость"
 
-#: src/emu/ui/ui.cpp:1926
+#: src/emu/ui/ui.cpp:1923
 #, c-format
 msgid "%1$s Volume"
 msgstr "%1$s Громкость"
 
-#: src/emu/ui/ui.cpp:1949
+#: src/emu/ui/ui.cpp:1946
 #, c-format
 msgid "Overclock CPU %1$s"
 msgstr "Разгон процессора %1$s"
 
-#: src/emu/ui/ui.cpp:1968
+#: src/emu/ui/ui.cpp:1965
 #, c-format
 msgid "%1$s Refresh Rate"
 msgstr "%1$s Частота обновления"
 
-#: src/emu/ui/ui.cpp:1973
+#: src/emu/ui/ui.cpp:1970
 #, c-format
 msgid "%1$s Brightness"
 msgstr "%1$s Яркость"
 
-#: src/emu/ui/ui.cpp:1975
+#: src/emu/ui/ui.cpp:1972
 #, c-format
 msgid "%1$s Contrast"
 msgstr "%1$s Контраст"
 
-#: src/emu/ui/ui.cpp:1977
+#: src/emu/ui/ui.cpp:1974
 #, c-format
 msgid "%1$s Gamma"
 msgstr "%1$s Гамма"
 
-#: src/emu/ui/ui.cpp:1981
+#: src/emu/ui/ui.cpp:1978
 #, c-format
 msgid "%1$s Horiz Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1983
+#: src/emu/ui/ui.cpp:1980
 #, c-format
 msgid "%1$s Horiz Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1985
+#: src/emu/ui/ui.cpp:1982
 #, c-format
 msgid "%1$s Vert Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1987
+#: src/emu/ui/ui.cpp:1984
 #, c-format
 msgid "%1$s Vert Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2005
+#: src/emu/ui/ui.cpp:2002
 #, c-format
 msgid "Laserdisc '%1$s' Horiz Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2007
+#: src/emu/ui/ui.cpp:2004
 #, c-format
 msgid "Laserdisc '%1$s' Horiz Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2009
+#: src/emu/ui/ui.cpp:2006
 #, c-format
 msgid "Laserdisc '%1$s' Vert Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2011
+#: src/emu/ui/ui.cpp:2008
 #, c-format
 msgid "Laserdisc '%1$s' Vert Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2021
+#: src/emu/ui/ui.cpp:2018
 msgid "Vector Flicker"
 msgstr "Мерцание луча"
 
-#: src/emu/ui/ui.cpp:2022
+#: src/emu/ui/ui.cpp:2019
 msgid "Beam Width Minimum"
 msgstr "Минимальная ширина луча"
 
-#: src/emu/ui/ui.cpp:2023
+#: src/emu/ui/ui.cpp:2020
 msgid "Beam Width Maximum"
 msgstr "Максимальная ширина луча"
 
-#: src/emu/ui/ui.cpp:2024
+#: src/emu/ui/ui.cpp:2021
 msgid "Beam Intensity Weight"
 msgstr "Насыщенность луча"
 
-#: src/emu/ui/ui.cpp:2037
+#: src/emu/ui/ui.cpp:2034
 #, c-format
 msgid "Crosshair Scale %1$s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2037 src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2034 src/emu/ui/ui.cpp:2036
 msgid "X"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2037 src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2034 src/emu/ui/ui.cpp:2036
 msgid "Y"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2036
 #, c-format
 msgid "Crosshair Offset %1$s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2071
+#: src/emu/ui/ui.cpp:2068
 #, c-format
 msgid "%1$3ddB"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2115
+#: src/emu/ui/ui.cpp:2112
 #, c-format
 msgid "%1$d%%"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2131
+#: src/emu/ui/ui.cpp:2128
 #, c-format
 msgid "%1$3.0f%%"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2154
+#: src/emu/ui/ui.cpp:2151
 #, c-format
 msgid "%1$.3ffps"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2177 src/emu/ui/ui.cpp:2199 src/emu/ui/ui.cpp:2220
-#: src/emu/ui/ui.cpp:2242 src/emu/ui/ui.cpp:2264 src/emu/ui/ui.cpp:2286
-#: src/emu/ui/ui.cpp:2308 src/emu/ui/ui.cpp:2330 src/emu/ui/ui.cpp:2352
-#: src/emu/ui/ui.cpp:2374 src/emu/ui/ui.cpp:2396
+#: src/emu/ui/ui.cpp:2174 src/emu/ui/ui.cpp:2196 src/emu/ui/ui.cpp:2217
+#: src/emu/ui/ui.cpp:2239 src/emu/ui/ui.cpp:2261 src/emu/ui/ui.cpp:2283
+#: src/emu/ui/ui.cpp:2305 src/emu/ui/ui.cpp:2327 src/emu/ui/ui.cpp:2349
+#: src/emu/ui/ui.cpp:2371 src/emu/ui/ui.cpp:2393
 #, c-format
 msgid "%1$.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2412 src/emu/ui/ui.cpp:2428 src/emu/ui/ui.cpp:2444
-#: src/emu/ui/ui.cpp:2460
+#: src/emu/ui/ui.cpp:2408 src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2438
+#: src/emu/ui/ui.cpp:2453
 #, c-format
 msgid "%1$1.2f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2476
+#: src/emu/ui/ui.cpp:2469
 #, c-format
 msgid "Screen '%1$s'"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2478
+#: src/emu/ui/ui.cpp:2471
 msgid "Screen"
 msgstr "Экран"
 
-#: src/emu/ui/ui.cpp:2494
+#: src/emu/ui/ui.cpp:2487
 #, c-format
 msgid "Crosshair Scale X %1$1.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2494
+#: src/emu/ui/ui.cpp:2487
 #, c-format
 msgid "Crosshair Scale Y %1$1.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2513
+#: src/emu/ui/ui.cpp:2506
 #, c-format
 msgid "Crosshair Offset X %1$1.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2513
+#: src/emu/ui/ui.cpp:2506
 #, c-format
 msgid "Crosshair Offset Y %1$1.3f"
 msgstr ""
@@ -1896,14 +1912,20 @@ msgstr "Урезанный"
 msgid "Full"
 msgstr "Полный"
 
-#: src/emu/ui/viewgfx.cpp:392
+#: src/emu/ui/viewgfx.cpp:391
 msgid " COLORS"
 msgstr " ЦВЕТА"
 
-#: src/emu/ui/viewgfx.cpp:392
+#: src/emu/ui/viewgfx.cpp:391
 msgid " PENS"
 msgstr ""
 
+#~ msgid "Export XML format (like -listxml)"
+#~ msgstr "Экспорт в формат XML (как -listxml)"
+
+#~ msgid "Export TXT format (like -listfull)"
+#~ msgstr "Экспорт в формат TXT (как -listfull)"
+
 #~ msgid "Device Mapping"
 #~ msgstr "Устройства управленя"
 
diff --git a/language/Serbian/strings.po b/language/Serbian/strings.po
index eb7957cac6d..2e23e880532 100644
--- a/language/Serbian/strings.po
+++ b/language/Serbian/strings.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MAME\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-11 03:33+0200\n"
+"POT-Creation-Date: 2016-04-15 17:42+0200\n"
 "PO-Revision-Date: 2016-03-02 21:46+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: MAME Language Team\n"
@@ -64,14 +64,14 @@ msgstr "Ponovo učitaj sve"
 msgid "Autofire Status"
 msgstr "Stanje automatskog pucanja"
 
-#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1698
+#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1695
 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211
 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219
 #: src/emu/ui/videoopt.cpp:223
 msgid "Disabled"
 msgstr "Onemogućeno"
 
-#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1698
+#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1695
 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211
 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219
 #: src/emu/ui/videoopt.cpp:223
@@ -79,14 +79,14 @@ msgid "Enabled"
 msgstr "Omogućeno"
 
 #: src/emu/ui/cheatopt.cpp:282 src/emu/ui/cheatopt.cpp:288
-#: src/emu/ui/menu.cpp:710 src/emu/ui/miscmenu.cpp:831
-#: src/emu/ui/sndmenu.cpp:135 src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/menu.cpp:755 src/emu/ui/miscmenu.cpp:936
+#: src/emu/ui/sndmenu.cpp:133 src/emu/ui/sndmenu.cpp:135
 msgid "On"
 msgstr "Uključeno"
 
 #: src/emu/ui/cheatopt.cpp:282 src/emu/ui/cheatopt.cpp:288
-#: src/emu/ui/menu.cpp:713 src/emu/ui/miscmenu.cpp:831
-#: src/emu/ui/sndmenu.cpp:135 src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/menu.cpp:758 src/emu/ui/miscmenu.cpp:936
+#: src/emu/ui/sndmenu.cpp:133 src/emu/ui/sndmenu.cpp:135
 msgid "Off"
 msgstr "Isključeno"
 
@@ -98,317 +98,317 @@ msgstr "Nema tastera na ovoj mašini!"
 msgid "Autofire Delay"
 msgstr "Zadrška automatskog pucanja"
 
-#: src/emu/ui/custmenu.cpp:158 src/emu/ui/custmenu.cpp:447
+#: src/emu/ui/custmenu.cpp:157 src/emu/ui/custmenu.cpp:445
 msgid "Main filter"
 msgstr "Glavni filter"
 
-#: src/emu/ui/custmenu.cpp:167 src/emu/ui/custmenu.cpp:456
+#: src/emu/ui/custmenu.cpp:166 src/emu/ui/custmenu.cpp:454
 msgid "Other filter"
 msgstr "Drugi filter"
 
-#: src/emu/ui/custmenu.cpp:176 src/emu/ui/optsmenu.cpp:239
+#: src/emu/ui/custmenu.cpp:175 src/emu/ui/optsmenu.cpp:238
 msgid "^!Manufacturer"
 msgstr "^!Proizvođač"
 
-#: src/emu/ui/custmenu.cpp:185 src/emu/ui/custmenu.cpp:474
-#: src/emu/ui/optsmenu.cpp:247
+#: src/emu/ui/custmenu.cpp:184 src/emu/ui/custmenu.cpp:472
+#: src/emu/ui/optsmenu.cpp:246
 msgid "^!Year"
 msgstr "^!Godina"
 
-#: src/emu/ui/custmenu.cpp:194 src/emu/ui/custmenu.cpp:510
+#: src/emu/ui/custmenu.cpp:193 src/emu/ui/custmenu.cpp:508
 msgid "Remove last filter"
 msgstr "Ukloni poslednji filter"
 
-#: src/emu/ui/custmenu.cpp:197 src/emu/ui/custmenu.cpp:513
+#: src/emu/ui/custmenu.cpp:196 src/emu/ui/custmenu.cpp:511
 msgid "Add filter"
 msgstr "Dodaj filter"
 
-#: src/emu/ui/custmenu.cpp:212 src/emu/ui/custmenu.cpp:233
-#: src/emu/ui/custmenu.cpp:529 src/emu/ui/custmenu.cpp:550
+#: src/emu/ui/custmenu.cpp:211 src/emu/ui/custmenu.cpp:231
+#: src/emu/ui/custmenu.cpp:527 src/emu/ui/custmenu.cpp:547
 msgid "Select custom filters:"
 msgstr "Izbor proizvoljnih filtera"
 
-#: src/emu/ui/custmenu.cpp:465
+#: src/emu/ui/custmenu.cpp:463
 msgid "^!Publisher"
 msgstr "^!Izdavač"
 
-#: src/emu/ui/custmenu.cpp:483
+#: src/emu/ui/custmenu.cpp:481
 msgid "^!Software List"
 msgstr "^!Lista programa"
 
-#: src/emu/ui/custmenu.cpp:492
+#: src/emu/ui/custmenu.cpp:490
 msgid "^!Device type"
 msgstr "^!Tip uredjaja"
 
-#: src/emu/ui/custmenu.cpp:501
+#: src/emu/ui/custmenu.cpp:499
 msgid "^!Region"
 msgstr "^!Region"
 
-#: src/emu/ui/custui.cpp:23
+#: src/emu/ui/custui.cpp:22
 msgid "Show All"
 msgstr "Prikaži sve"
 
-#: src/emu/ui/custui.cpp:24
+#: src/emu/ui/custui.cpp:23
 msgid "Hide Filters"
 msgstr "Sakrij filtere"
 
-#: src/emu/ui/custui.cpp:25
+#: src/emu/ui/custui.cpp:24
 msgid "Hide Info/Image"
 msgstr "Sakrij Info/Sliku"
 
-#: src/emu/ui/custui.cpp:26
+#: src/emu/ui/custui.cpp:25
 msgid "Hide Both"
 msgstr "Sakrij oboje"
 
-#: src/emu/ui/custui.cpp:142
+#: src/emu/ui/custui.cpp:141
 msgid "Fonts"
 msgstr "Fontovi"
 
-#: src/emu/ui/custui.cpp:143
+#: src/emu/ui/custui.cpp:142
 msgid "Colors"
 msgstr "Boje"
 
-#: src/emu/ui/custui.cpp:148 src/emu/ui/dirmenu.cpp:33
+#: src/emu/ui/custui.cpp:147 src/emu/ui/dirmenu.cpp:33
 msgid "Language"
 msgstr "Jezici"
 
-#: src/emu/ui/custui.cpp:152
+#: src/emu/ui/custui.cpp:151
 msgid "Show side panels"
 msgstr "Prikaži bočne panele"
 
-#: src/emu/ui/custui.cpp:167 src/emu/ui/custui.cpp:188
+#: src/emu/ui/custui.cpp:166 src/emu/ui/custui.cpp:186
 msgid "Custom UI Settings"
 msgstr "Podešavanja korisničkog interfejsa"
 
-#: src/emu/ui/custui.cpp:246
+#: src/emu/ui/custui.cpp:244
 msgid "default"
 msgstr "uobičajeno"
 
-#: src/emu/ui/custui.cpp:349
+#: src/emu/ui/custui.cpp:347
 msgid "UI Font"
 msgstr "Font korisničkog interfejsa"
 
-#: src/emu/ui/custui.cpp:354
+#: src/emu/ui/custui.cpp:352
 msgid "Bold"
 msgstr "Podebljano"
 
-#: src/emu/ui/custui.cpp:355
+#: src/emu/ui/custui.cpp:353
 msgid "Italic"
 msgstr "Iskošeno"
 
-#: src/emu/ui/custui.cpp:360
+#: src/emu/ui/custui.cpp:358
 msgid "Lines"
 msgstr "Linije"
 
-#: src/emu/ui/custui.cpp:366
+#: src/emu/ui/custui.cpp:364
 msgid "Infos text size"
 msgstr "Visina teksta za informacije"
 
-#: src/emu/ui/custui.cpp:383
+#: src/emu/ui/custui.cpp:381
 msgid "UI Fonts Settings"
 msgstr "Podešavanje fontova za korisnički interfejs"
 
-#: src/emu/ui/custui.cpp:411
+#: src/emu/ui/custui.cpp:408
 msgid "Sample text - Lorem ipsum dolor sit amet, consectetur adipiscing elit."
 msgstr ""
 "Primer teksta - Lorem ipsum dolor sit amet, consectetur adipiscing elit."
 
-#: src/emu/ui/custui.cpp:509
+#: src/emu/ui/custui.cpp:506
 msgid "Normal text"
 msgstr "Normalni tekst"
 
-#: src/emu/ui/custui.cpp:510
+#: src/emu/ui/custui.cpp:507
 msgid "Selected color"
 msgstr "Boja izabranog"
 
-#: src/emu/ui/custui.cpp:511
+#: src/emu/ui/custui.cpp:508
 msgid "Normal text background"
 msgstr "Pozadina normalnog teksta"
 
-#: src/emu/ui/custui.cpp:512
+#: src/emu/ui/custui.cpp:509
 msgid "Selected background color"
 msgstr "Boja pozadine za izabranu stavku"
 
-#: src/emu/ui/custui.cpp:513
+#: src/emu/ui/custui.cpp:510
 msgid "Subitem color"
 msgstr "Boja pod-stavke"
 
-#: src/emu/ui/custui.cpp:514 src/emu/ui/custui.cpp:610
+#: src/emu/ui/custui.cpp:511 src/emu/ui/custui.cpp:606
 msgid "Clone"
 msgstr "Kloniraj"
 
-#: src/emu/ui/custui.cpp:515
+#: src/emu/ui/custui.cpp:512
 msgid "Border"
 msgstr "Granica"
 
-#: src/emu/ui/custui.cpp:516
+#: src/emu/ui/custui.cpp:513
 msgid "Background"
 msgstr "Pozadina"
 
-#: src/emu/ui/custui.cpp:517
+#: src/emu/ui/custui.cpp:514
 msgid "Dipswitch"
 msgstr "DIP prekidač"
 
-#: src/emu/ui/custui.cpp:518
+#: src/emu/ui/custui.cpp:515
 msgid "Unavailable color"
 msgstr "Boja za nedostupno"
 
-#: src/emu/ui/custui.cpp:519
+#: src/emu/ui/custui.cpp:516
 msgid "Slider color"
 msgstr "Boja klizača"
 
-#: src/emu/ui/custui.cpp:520
+#: src/emu/ui/custui.cpp:517
 msgid "Gfx viewer background"
 msgstr "Grafički prikaz pozadine"
 
-#: src/emu/ui/custui.cpp:521
+#: src/emu/ui/custui.cpp:518
 msgid "Mouse over color"
 msgstr "Boja pri prelasku miša"
 
-#: src/emu/ui/custui.cpp:522
+#: src/emu/ui/custui.cpp:519
 msgid "Mouse over background color"
 msgstr "Boja pozadine pri prelasku miša"
 
-#: src/emu/ui/custui.cpp:523
+#: src/emu/ui/custui.cpp:520
 msgid "Mouse down color"
 msgstr "Boja pri pritisku miša"
 
-#: src/emu/ui/custui.cpp:524
+#: src/emu/ui/custui.cpp:521
 msgid "Mouse down background color"
 msgstr "Boja pozadine miša"
 
-#: src/emu/ui/custui.cpp:527
+#: src/emu/ui/custui.cpp:524
 msgid "Restore originals colors"
 msgstr "Vrati originalne boje"
 
-#: src/emu/ui/custui.cpp:543
+#: src/emu/ui/custui.cpp:540
 msgid "UI Colors Settings"
 msgstr "Podešavanje boja korisničkog interfejsa"
 
-#: src/emu/ui/custui.cpp:572
+#: src/emu/ui/custui.cpp:568
 #, c-format
 msgid "Double click or press %1$s to change the color value"
 msgstr "Dupli klik ili pritisnite %1$s da promenite boju"
 
-#: src/emu/ui/custui.cpp:598
+#: src/emu/ui/custui.cpp:594
 msgid "Menu Preview"
 msgstr "Probni prikaz menija"
 
-#: src/emu/ui/custui.cpp:606
+#: src/emu/ui/custui.cpp:602
 msgid "Normal"
 msgstr "Normalno"
 
-#: src/emu/ui/custui.cpp:607
+#: src/emu/ui/custui.cpp:603
 msgid "Subitem"
 msgstr "Pod-stavka"
 
-#: src/emu/ui/custui.cpp:608
+#: src/emu/ui/custui.cpp:604
 msgid "Selected"
 msgstr "Izabrano"
 
-#: src/emu/ui/custui.cpp:609
+#: src/emu/ui/custui.cpp:605
 msgid "Mouse Over"
 msgstr "Prelay mišem"
 
-#: src/emu/ui/custui.cpp:841 src/emu/ui/custui.cpp:844
+#: src/emu/ui/custui.cpp:837 src/emu/ui/custui.cpp:840
 msgid "Alpha"
 msgstr "Alfa"
 
-#: src/emu/ui/custui.cpp:849 src/emu/ui/custui.cpp:852
-#: src/emu/ui/custui.cpp:1013
+#: src/emu/ui/custui.cpp:845 src/emu/ui/custui.cpp:848
+#: src/emu/ui/custui.cpp:1007
 msgid "Red"
 msgstr "Crvenа"
 
-#: src/emu/ui/custui.cpp:857 src/emu/ui/custui.cpp:860
-#: src/emu/ui/custui.cpp:1016
+#: src/emu/ui/custui.cpp:853 src/emu/ui/custui.cpp:856
+#: src/emu/ui/custui.cpp:1010
 msgid "Green"
 msgstr "Zelenа"
 
-#: src/emu/ui/custui.cpp:865 src/emu/ui/custui.cpp:868
-#: src/emu/ui/custui.cpp:1017
+#: src/emu/ui/custui.cpp:861 src/emu/ui/custui.cpp:864
+#: src/emu/ui/custui.cpp:1011
 msgid "Blue"
 msgstr "Plavа"
 
-#: src/emu/ui/custui.cpp:871
+#: src/emu/ui/custui.cpp:867
 msgid "Choose from palette"
 msgstr "Izabrati iz palete"
 
-#: src/emu/ui/custui.cpp:887
+#: src/emu/ui/custui.cpp:883
 msgid " - ARGB Settings"
 msgstr " - ARGB podešavanja"
 
-#: src/emu/ui/custui.cpp:912
+#: src/emu/ui/custui.cpp:907
 msgid "Color preview ="
 msgstr "Prikaz boja ="
 
-#: src/emu/ui/custui.cpp:1009
+#: src/emu/ui/custui.cpp:1003
 msgid "White"
 msgstr "Bela"
 
-#: src/emu/ui/custui.cpp:1010
+#: src/emu/ui/custui.cpp:1004
 msgid "Silver"
 msgstr "Srebrna"
 
-#: src/emu/ui/custui.cpp:1011
+#: src/emu/ui/custui.cpp:1005
 msgid "Gray"
 msgstr "Siva"
 
-#: src/emu/ui/custui.cpp:1012
+#: src/emu/ui/custui.cpp:1006
 msgid "Black"
 msgstr "Crna"
 
-#: src/emu/ui/custui.cpp:1014
+#: src/emu/ui/custui.cpp:1008
 msgid "Orange"
 msgstr "Narandžasta"
 
-#: src/emu/ui/custui.cpp:1015
+#: src/emu/ui/custui.cpp:1009
 msgid "Yellow"
 msgstr "Žuta"
 
-#: src/emu/ui/custui.cpp:1018
+#: src/emu/ui/custui.cpp:1012
 msgid "Violet"
 msgstr "Ljubičasta"
 
-#: src/emu/ui/datmenu.cpp:65
+#: src/emu/ui/datmenu.cpp:64
 msgid "Software History"
 msgstr "Istorija softvera"
 
-#: src/emu/ui/datmenu.cpp:67
+#: src/emu/ui/datmenu.cpp:66
 msgid "Software Usage"
 msgstr "Upotreba softvera"
 
-#: src/emu/ui/datmenu.cpp:199
+#: src/emu/ui/datmenu.cpp:196
 msgid "Revision: "
 msgstr "Revizija"
 
-#: src/emu/ui/datmenu.cpp:287 src/emu/ui/selgame.cpp:40
-#: src/emu/ui/selgame.cpp:2152 src/emu/ui/selgame.cpp:2161
-#: src/emu/ui/selsoft.cpp:1577 src/emu/ui/selsoft.cpp:1597
-#: src/emu/ui/selsoft.cpp:1606
+#: src/emu/ui/datmenu.cpp:284 src/emu/ui/selgame.cpp:39
+#: src/emu/ui/selgame.cpp:2158 src/emu/ui/selgame.cpp:2167
+#: src/emu/ui/selsoft.cpp:1574 src/emu/ui/selsoft.cpp:1592
+#: src/emu/ui/selsoft.cpp:1601
 msgid "History"
 msgstr "Istorija"
 
-#: src/emu/ui/datmenu.cpp:289 src/emu/ui/selgame.cpp:41
+#: src/emu/ui/datmenu.cpp:286 src/emu/ui/selgame.cpp:40
 msgid "Mameinfo"
 msgstr "МАМЕ - informacije"
 
-#: src/emu/ui/datmenu.cpp:291 src/emu/ui/selgame.cpp:43
+#: src/emu/ui/datmenu.cpp:288 src/emu/ui/selgame.cpp:42
 msgid "Messinfo"
 msgstr "МESS - informacije"
 
-#: src/emu/ui/datmenu.cpp:293 src/emu/ui/selgame.cpp:42
+#: src/emu/ui/datmenu.cpp:290 src/emu/ui/selgame.cpp:41
 msgid "Sysinfo"
 msgstr "Systemske informacije"
 
-#: src/emu/ui/datmenu.cpp:295 src/emu/ui/selgame.cpp:46
+#: src/emu/ui/datmenu.cpp:292 src/emu/ui/selgame.cpp:45
 msgid "Mamescore"
 msgstr "Mamescore"
 
-#: src/emu/ui/datmenu.cpp:297 src/emu/ui/selgame.cpp:45
+#: src/emu/ui/datmenu.cpp:294 src/emu/ui/selgame.cpp:44
 msgid "Gameinit"
 msgstr "Inicijalizacija"
 
-#: src/emu/ui/datmenu.cpp:299 src/emu/ui/selgame.cpp:44
+#: src/emu/ui/datmenu.cpp:296 src/emu/ui/selgame.cpp:43
 msgid "Command"
 msgstr "Komanda"
 
@@ -560,75 +560,75 @@ msgstr "Pritisnite TAB da podesite"
 msgid "Remove %1$s Folder"
 msgstr "Ukloni %1$s direktorijum"
 
-#: src/emu/ui/filesel.cpp:158
+#: src/emu/ui/filesel.cpp:161
 msgid "File Already Exists - Override?"
 msgstr "Fajl već postoji - prepiši?"
 
-#: src/emu/ui/filesel.cpp:160 src/emu/ui/selgame.cpp:1568
-#: src/emu/ui/selgame.cpp:1569 src/emu/ui/selgame.cpp:1570
-#: src/emu/ui/selgame.cpp:1571 src/emu/ui/selgame.cpp:1572
-#: src/emu/ui/selgame.cpp:1573 src/emu/ui/selgame.cpp:1574
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/filesel.cpp:163 src/emu/ui/selgame.cpp:1576
+#: src/emu/ui/selgame.cpp:1577 src/emu/ui/selgame.cpp:1578
+#: src/emu/ui/selgame.cpp:1579 src/emu/ui/selgame.cpp:1580
+#: src/emu/ui/selgame.cpp:1581 src/emu/ui/selgame.cpp:1582
+#: src/emu/ui/selgame.cpp:1591
 msgid "No"
 msgstr "Ne"
 
-#: src/emu/ui/filesel.cpp:161 src/emu/ui/selgame.cpp:1568
-#: src/emu/ui/selgame.cpp:1569 src/emu/ui/selgame.cpp:1570
-#: src/emu/ui/selgame.cpp:1571 src/emu/ui/selgame.cpp:1572
-#: src/emu/ui/selgame.cpp:1573 src/emu/ui/selgame.cpp:1574
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/filesel.cpp:164 src/emu/ui/selgame.cpp:1576
+#: src/emu/ui/selgame.cpp:1577 src/emu/ui/selgame.cpp:1578
+#: src/emu/ui/selgame.cpp:1579 src/emu/ui/selgame.cpp:1580
+#: src/emu/ui/selgame.cpp:1581 src/emu/ui/selgame.cpp:1582
+#: src/emu/ui/selgame.cpp:1591
 msgid "Yes"
 msgstr "Da"
 
-#: src/emu/ui/filesel.cpp:272
+#: src/emu/ui/filesel.cpp:275
 msgid "New Image Name:"
 msgstr "Novo ime:"
 
-#: src/emu/ui/filesel.cpp:278
+#: src/emu/ui/filesel.cpp:281
 msgid "Image Format:"
 msgstr "Format zapisa:"
 
-#: src/emu/ui/filesel.cpp:284
+#: src/emu/ui/filesel.cpp:287
 msgid "Create"
 msgstr "Kreiraj"
 
-#: src/emu/ui/filesel.cpp:315
+#: src/emu/ui/filesel.cpp:318
 msgid "Please enter a file extension too"
 msgstr "Molim unesite i ekstenziju"
 
-#: src/emu/ui/filesel.cpp:503 src/emu/ui/swlist.cpp:65
+#: src/emu/ui/filesel.cpp:506 src/emu/ui/swlist.cpp:65
 msgid "[empty slot]"
 msgstr "[prazan slot]"
 
-#: src/emu/ui/filesel.cpp:507
+#: src/emu/ui/filesel.cpp:510
 msgid "[create]"
 msgstr "[kreiraj]"
 
-#: src/emu/ui/filesel.cpp:511 src/emu/ui/swlist.cpp:76
+#: src/emu/ui/filesel.cpp:514 src/emu/ui/swlist.cpp:76
 msgid "[software list]"
 msgstr "[lista programa]"
 
-#: src/emu/ui/filesel.cpp:803
+#: src/emu/ui/filesel.cpp:806
 msgid "Select image format"
 msgstr "Odaberi format"
 
-#: src/emu/ui/filesel.cpp:863
+#: src/emu/ui/filesel.cpp:866
 msgid "Select access mode"
 msgstr "Odaberi mod pristupa"
 
-#: src/emu/ui/filesel.cpp:864
+#: src/emu/ui/filesel.cpp:867
 msgid "Read-only"
 msgstr "Samo čitanje"
 
-#: src/emu/ui/filesel.cpp:866
+#: src/emu/ui/filesel.cpp:869
 msgid "Read-write"
 msgstr "Čitanje-pisanje"
 
-#: src/emu/ui/filesel.cpp:867
+#: src/emu/ui/filesel.cpp:870
 msgid "Read this image, write to another image"
 msgstr "Čitaj ovaj fajl, piši u drugi"
 
-#: src/emu/ui/filesel.cpp:868
+#: src/emu/ui/filesel.cpp:871
 msgid "Read this image, write to diff"
 msgstr "Čitaj ovaj fajl, piši razlike"
 
@@ -656,7 +656,7 @@ msgstr "Delimično podržano"
 msgid "[empty]"
 msgstr "[prazno]"
 
-#: src/emu/ui/info_pty.cpp:26 src/emu/ui/mainmenu.cpp:91
+#: src/emu/ui/info_pty.cpp:26 src/emu/ui/mainmenu.cpp:96
 msgid "Pseudo terminals"
 msgstr "Pseudo terminali"
 
@@ -672,7 +672,7 @@ msgstr "Korisnički interfejs"
 msgid "Other Controls"
 msgstr "Ostale kontrole"
 
-#: src/emu/ui/inputmap.cpp:622 src/emu/ui/miscmenu.cpp:91
+#: src/emu/ui/inputmap.cpp:622 src/emu/ui/miscmenu.cpp:92
 #: src/emu/ui/slotopt.cpp:172
 msgid "Reset"
 msgstr "Resetuj"
@@ -705,27 +705,27 @@ msgstr "Informacije o statistici mašine"
 msgid "Machine Information"
 msgstr "Informacije o mašini"
 
-#: src/emu/ui/mainmenu.cpp:78
+#: src/emu/ui/mainmenu.cpp:80
 msgid "Image Information"
 msgstr "Informacije o programu"
 
-#: src/emu/ui/mainmenu.cpp:81
+#: src/emu/ui/mainmenu.cpp:83
 msgid "File Manager"
 msgstr "Upravljanje fajlovima"
 
-#: src/emu/ui/mainmenu.cpp:86
+#: src/emu/ui/mainmenu.cpp:92
 msgid "Tape Control"
 msgstr "Kontrola trake"
 
-#: src/emu/ui/mainmenu.cpp:94
+#: src/emu/ui/mainmenu.cpp:99
 msgid "Bios Selection"
 msgstr "Izbor BIOS-a"
 
-#: src/emu/ui/mainmenu.cpp:100
+#: src/emu/ui/mainmenu.cpp:104
 msgid "Slot Devices"
 msgstr "Slot uređaji"
 
-#: src/emu/ui/mainmenu.cpp:107
+#: src/emu/ui/mainmenu.cpp:109
 msgid "Barcode Reader"
 msgstr "Barkod čitač"
 
@@ -733,43 +733,43 @@ msgstr "Barkod čitač"
 msgid "Network Devices"
 msgstr "Mrežni uređaji"
 
-#: src/emu/ui/mainmenu.cpp:119
+#: src/emu/ui/mainmenu.cpp:118
 msgid "Keyboard Mode"
 msgstr "Mod tastature"
 
-#: src/emu/ui/mainmenu.cpp:122
+#: src/emu/ui/mainmenu.cpp:121
 msgid "Slider Controls"
 msgstr "Kontrole klizača"
 
-#: src/emu/ui/mainmenu.cpp:125
+#: src/emu/ui/mainmenu.cpp:124
 msgid "Video Options"
 msgstr "Video opcije"
 
-#: src/emu/ui/mainmenu.cpp:129
+#: src/emu/ui/mainmenu.cpp:128
 msgid "Crosshair Options"
 msgstr "Opcije nišana"
 
-#: src/emu/ui/mainmenu.cpp:133
+#: src/emu/ui/mainmenu.cpp:132
 msgid "Cheat"
 msgstr "Varanje"
 
-#: src/emu/ui/mainmenu.cpp:136
+#: src/emu/ui/mainmenu.cpp:135
 msgid "Plugin Options"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:140
+#: src/emu/ui/mainmenu.cpp:139
 msgid "External DAT View"
 msgstr "Prikaz spoljašnjeg DAT"
 
-#: src/emu/ui/mainmenu.cpp:146
+#: src/emu/ui/mainmenu.cpp:145 src/emu/ui/miscmenu.cpp:785
 msgid "Add To Favorites"
 msgstr "Dodaj u listu omiljenih"
 
-#: src/emu/ui/mainmenu.cpp:148
+#: src/emu/ui/mainmenu.cpp:147 src/emu/ui/miscmenu.cpp:787
 msgid "Remove From Favorites"
 msgstr "Izbriši iz liste omiljenih"
 
-#: src/emu/ui/mainmenu.cpp:155
+#: src/emu/ui/mainmenu.cpp:154
 msgid "Select New Machine"
 msgstr "Izaberi novu mašinu"
 
@@ -809,31 +809,31 @@ msgstr "Izlaz"
 msgid "Return to Previous Menu"
 msgstr "Povratak u prethodni meni"
 
-#: src/emu/ui/menu.cpp:716
+#: src/emu/ui/menu.cpp:761
 msgid "Auto"
 msgstr "Automatski"
 
-#: src/emu/ui/menu.cpp:2133
+#: src/emu/ui/menu.cpp:2195
 msgid "Images"
 msgstr "Programi"
 
-#: src/emu/ui/menu.cpp:2134
+#: src/emu/ui/menu.cpp:2196
 msgid "Infos"
 msgstr "Informacije"
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Keyboard Mode:"
 msgstr "Mod tastature:"
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Natural"
 msgstr "Prirodni"
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Emulated"
 msgstr "Emulirani"
 
-#: src/emu/ui/miscmenu.cpp:240
+#: src/emu/ui/miscmenu.cpp:241
 #, c-format
 msgid ""
 "Uptime: %1$d:%2$02d:%3$02d\n"
@@ -842,7 +842,7 @@ msgstr ""
 "Vreme rada: %1$d:%2$02d:%3$02d\n"
 "\n"
 
-#: src/emu/ui/miscmenu.cpp:242
+#: src/emu/ui/miscmenu.cpp:243
 #, c-format
 msgid ""
 "Uptime: %1$d:%2$02d\n"
@@ -851,7 +851,7 @@ msgstr ""
 "Vreme rada: %1$d:%2$02d\n"
 "\n"
 
-#: src/emu/ui/miscmenu.cpp:246
+#: src/emu/ui/miscmenu.cpp:247
 #, c-format
 msgid ""
 "Tickets dispensed: %1$d\n"
@@ -860,109 +860,50 @@ msgstr ""
 "Izdate karte: %1$d\n"
 "\n"
 
-#: src/emu/ui/miscmenu.cpp:257
+#: src/emu/ui/miscmenu.cpp:258
 msgid "Coin %1$c: NA%3$s\n"
 msgstr "Žeton %1$c: NA%3$s\n"
 
-#: src/emu/ui/miscmenu.cpp:257
+#: src/emu/ui/miscmenu.cpp:258
 #, c-format
 msgid "Coin %1$c: %2$d%3$s\n"
 msgstr "Žeton %1$c: %2$d%3$s\n"
 
-#: src/emu/ui/miscmenu.cpp:260
+#: src/emu/ui/miscmenu.cpp:261
 msgid " (locked)"
 msgstr " (zaključano)"
 
-#: src/emu/ui/miscmenu.cpp:519
+#: src/emu/ui/miscmenu.cpp:520
 msgid "Visible Delay"
 msgstr "Vidljivo kašnjenje"
 
-#: src/emu/ui/miscmenu.cpp:617
+#: src/emu/ui/miscmenu.cpp:619
 #, c-format
 msgid "%s.xml saved under ui folder."
 msgstr "%s.xml sačuvan u ui direktorijum."
 
-#: src/emu/ui/miscmenu.cpp:645
+#: src/emu/ui/miscmenu.cpp:647
 msgid "Name:             Description:\n"
 msgstr "Ime:              Opis:\n"
 
-#: src/emu/ui/miscmenu.cpp:657
+#: src/emu/ui/miscmenu.cpp:659
 #, c-format
 msgid "%s.txt saved under ui folder."
 msgstr "%s.txt sačuvan u ui direktorijum."
 
-#: src/emu/ui/miscmenu.cpp:675
-msgid "Export XML format (like -listxml)"
-msgstr "Izvezi XML format (kao -listxml)"
-
-#: src/emu/ui/miscmenu.cpp:676
-msgid "Export TXT format (like -listfull)"
-msgstr "Izvezi TXT format (kao -listfull)"
-
-#: src/emu/ui/miscmenu.cpp:734
-msgid "Dummy"
+#: src/emu/ui/miscmenu.cpp:677
+msgid "Export list in XML format (like -listxml)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:736
-msgid "Save machine configuration"
-msgstr "Sačuvaj konfiguraciju mašine"
+#: src/emu/ui/miscmenu.cpp:678
+msgid "Export list in XML format (like -listxml, but exclude devices)"
+msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:848 src/emu/ui/miscmenu.cpp:869
-#: src/emu/ui/selgame.cpp:594
-msgid "Plugins"
-msgstr "Dodatci"
+#: src/emu/ui/miscmenu.cpp:679
+msgid "Export list in TXT format (like -listfull)"
+msgstr ""
 
-#: src/emu/ui/optsmenu.cpp:218
-msgid "Filter"
-msgstr "Filter"
-
-#: src/emu/ui/optsmenu.cpp:226
-msgid " ^!File"
-msgstr " ^!Fajl"
-
-#: src/emu/ui/optsmenu.cpp:231
-msgid " ^!Category"
-msgstr " ^!Kategorija"
-
-#: src/emu/ui/optsmenu.cpp:254
-msgid "^!Setup custom filter"
-msgstr "^!Pripremi filter"
-
-#: src/emu/ui/optsmenu.cpp:262
-msgid "Customize UI"
-msgstr "Prilagodi korisnički interfejs"
-
-#: src/emu/ui/optsmenu.cpp:263
-msgid "Configure Directories"
-msgstr "Konfiguracija direktorijuma"
-
-#: src/emu/ui/optsmenu.cpp:266 src/emu/ui/sndmenu.cpp:151
-#: src/emu/ui/sndmenu.cpp:172
-msgid "Sound Options"
-msgstr "Opcije za zvuk"
-
-#: src/emu/ui/optsmenu.cpp:269
-msgid "General Inputs"
-msgstr "Globalne kontrole"
-
-#: src/emu/ui/optsmenu.cpp:272
-msgid "Save Configuration"
-msgstr "Sačuvaj konfiguraciju"
-
-#: src/emu/ui/optsmenu.cpp:286 src/emu/ui/optsmenu.cpp:307
-msgid "Settings"
-msgstr "Podešavanja"
-
-#: src/emu/ui/optsmenu.cpp:327
-msgid "**Error saving ui.ini**"
-msgstr "**Greška prilikom snimanja ui.ini**"
-
-#: src/emu/ui/optsmenu.cpp:374
-#, c-format
-msgid "**Error saving %s.ini**"
-msgstr "**Greška prlikom zapisivanja %s.ini**"
-
-#: src/emu/ui/optsmenu.cpp:378
+#: src/emu/ui/miscmenu.cpp:729 src/emu/ui/optsmenu.cpp:376
 msgid ""
 "\n"
 "    Configuration saved    \n"
@@ -972,20 +913,95 @@ msgstr ""
 "    Konfiguracija sačuvana    \n"
 "\n"
 
-#: src/emu/ui/selector.cpp:166
+#: src/emu/ui/miscmenu.cpp:774
+msgid "Bios"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:776
+msgid "Driver"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:790
+msgid "Save machine configuration"
+msgstr "Sačuvaj konfiguraciju mašine"
+
+#: src/emu/ui/miscmenu.cpp:806
+msgid "Configure machine:"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:868 src/emu/ui/selsoft.cpp:109
+msgid " (default)"
+msgstr " (uobičajeno)"
+
+#: src/emu/ui/miscmenu.cpp:953 src/emu/ui/miscmenu.cpp:973
+#: src/emu/ui/selgame.cpp:600
+msgid "Plugins"
+msgstr "Dodatci"
+
+#: src/emu/ui/optsmenu.cpp:217
+msgid "Filter"
+msgstr "Filter"
+
+#: src/emu/ui/optsmenu.cpp:225
+msgid " ^!File"
+msgstr " ^!Fajl"
+
+#: src/emu/ui/optsmenu.cpp:230
+msgid " ^!Category"
+msgstr " ^!Kategorija"
+
+#: src/emu/ui/optsmenu.cpp:253
+msgid "^!Setup custom filter"
+msgstr "^!Pripremi filter"
+
+#: src/emu/ui/optsmenu.cpp:261
+msgid "Customize UI"
+msgstr "Prilagodi korisnički interfejs"
+
+#: src/emu/ui/optsmenu.cpp:262
+msgid "Configure Directories"
+msgstr "Konfiguracija direktorijuma"
+
+#: src/emu/ui/optsmenu.cpp:265 src/emu/ui/sndmenu.cpp:149
+#: src/emu/ui/sndmenu.cpp:169
+msgid "Sound Options"
+msgstr "Opcije za zvuk"
+
+#: src/emu/ui/optsmenu.cpp:268
+msgid "General Inputs"
+msgstr "Globalne kontrole"
+
+#: src/emu/ui/optsmenu.cpp:271
+msgid "Save Configuration"
+msgstr "Sačuvaj konfiguraciju"
+
+#: src/emu/ui/optsmenu.cpp:285 src/emu/ui/optsmenu.cpp:305
+msgid "Settings"
+msgstr "Podešavanja"
+
+#: src/emu/ui/optsmenu.cpp:325
+msgid "**Error saving ui.ini**"
+msgstr "**Greška prilikom snimanja ui.ini**"
+
+#: src/emu/ui/optsmenu.cpp:372
+#, c-format
+msgid "**Error saving %s.ini**"
+msgstr "**Greška prlikom zapisivanja %s.ini**"
+
+#: src/emu/ui/selector.cpp:165
 msgid "Selection List - Search: "
 msgstr "Izborna lista - pretraga:"
 
-#: src/emu/ui/selector.cpp:196
+#: src/emu/ui/selector.cpp:194
 #, c-format
 msgid "Double click or press %1$s to select"
 msgstr "Dupli klik ili pritisnite %1$s za selektovanje"
 
-#: src/emu/ui/selgame.cpp:39
+#: src/emu/ui/selgame.cpp:38
 msgid "General Info"
 msgstr "Opšte informacije"
 
-#: src/emu/ui/selgame.cpp:374 src/emu/ui/selsoft.cpp:282
+#: src/emu/ui/selgame.cpp:380 src/emu/ui/selsoft.cpp:281
 #, c-format
 msgid ""
 "%s\n"
@@ -994,8 +1010,8 @@ msgstr ""
 "%s\n"
 " dodato u listu omiljenih"
 
-#: src/emu/ui/selgame.cpp:380 src/emu/ui/selgame.cpp:389
-#: src/emu/ui/selsoft.cpp:287
+#: src/emu/ui/selgame.cpp:386 src/emu/ui/selgame.cpp:395
+#: src/emu/ui/selsoft.cpp:286
 #, c-format
 msgid ""
 "%s\n"
@@ -1004,7 +1020,7 @@ msgstr ""
 "%s\n"
 " izbrisano iz liste omiljenih."
 
-#: src/emu/ui/selgame.cpp:450
+#: src/emu/ui/selgame.cpp:457
 msgid ""
 "The selected machine is missing one or more required ROM or CHD images. "
 "Please select a different machine.\n"
@@ -1012,256 +1028,260 @@ msgid ""
 "Press any key to continue."
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:589 src/emu/ui/simpleselgame.cpp:265
+#: src/emu/ui/selgame.cpp:595 src/emu/ui/simpleselgame.cpp:265
 msgid "Configure Options"
 msgstr "Konfiguracija opcija"
 
-#: src/emu/ui/selgame.cpp:752
+#: src/emu/ui/selgame.cpp:596
+msgid "Configure Machine"
+msgstr ""
+
+#: src/emu/ui/selgame.cpp:758
 #, c-format
 msgid "%1$s %2$s ( %3$d / %4$d machines (%5$d BIOS) )"
 msgstr "%1$s %2$s ( %3$d / %4$d mašine (%5$d BIOS) )"
 
-#: src/emu/ui/selgame.cpp:762
+#: src/emu/ui/selgame.cpp:768
 #, c-format
 msgid "%1$s (%2$s - %3$s) - "
 msgstr "%1$s (%2$s - %3$s) - "
 
-#: src/emu/ui/selgame.cpp:769 src/emu/ui/selgame.cpp:775
+#: src/emu/ui/selgame.cpp:775 src/emu/ui/selgame.cpp:781
 #, c-format
 msgid "%1$s (%2$s) - "
 msgstr "%1$s (%2$s) - "
 
-#: src/emu/ui/selgame.cpp:784
+#: src/emu/ui/selgame.cpp:790
 #, c-format
 msgid "%1$s Search: %2$s_"
 msgstr "%1$s Pretraga: %2$s_"
 
-#: src/emu/ui/selgame.cpp:838
+#: src/emu/ui/selgame.cpp:844
 #, c-format
 msgid "Romset: %1$-.100s"
 msgstr "ROM skup: %1$-.100s"
 
-#: src/emu/ui/selgame.cpp:841 src/emu/ui/selgame.cpp:890
-#: src/emu/ui/selsoft.cpp:751 src/emu/ui/selsoft.cpp:801
+#: src/emu/ui/selgame.cpp:847 src/emu/ui/selgame.cpp:896
+#: src/emu/ui/selsoft.cpp:750 src/emu/ui/selsoft.cpp:800
 #: src/emu/ui/simpleselgame.cpp:328
 #, c-format
 msgid "%1$s, %2$-.100s"
 msgstr "%1$s, %2$-.100s"
 
-#: src/emu/ui/selgame.cpp:847 src/emu/ui/selsoft.cpp:757
+#: src/emu/ui/selgame.cpp:853 src/emu/ui/selsoft.cpp:756
 #, c-format
 msgid "Driver is clone of: %1$-.100s"
 msgstr "Drajver je klon od: %1$-.100s"
 
-#: src/emu/ui/selgame.cpp:849 src/emu/ui/selsoft.cpp:759
+#: src/emu/ui/selgame.cpp:855 src/emu/ui/selsoft.cpp:758
 msgid "Driver is parent"
 msgstr "Drajver je osnovni"
 
-#: src/emu/ui/selgame.cpp:853 src/emu/ui/selsoft.cpp:763
+#: src/emu/ui/selgame.cpp:859 src/emu/ui/selsoft.cpp:762
 #: src/emu/ui/simpleselgame.cpp:335
 msgid "Overall: NOT WORKING"
 msgstr "Uopšteno: NE RADI"
 
-#: src/emu/ui/selgame.cpp:855 src/emu/ui/selsoft.cpp:765
+#: src/emu/ui/selgame.cpp:861 src/emu/ui/selsoft.cpp:764
 #: src/emu/ui/simpleselgame.cpp:337
 msgid "Overall: Unemulated Protection"
 msgstr "Uopšteno: Zaštita nije emulirana"
 
-#: src/emu/ui/selgame.cpp:857 src/emu/ui/selsoft.cpp:767
+#: src/emu/ui/selgame.cpp:863 src/emu/ui/selsoft.cpp:766
 #: src/emu/ui/simpleselgame.cpp:339
 msgid "Overall: Working"
 msgstr "Uopšteno: radi"
 
-#: src/emu/ui/selgame.cpp:861 src/emu/ui/selsoft.cpp:771
+#: src/emu/ui/selgame.cpp:867 src/emu/ui/selsoft.cpp:770
 msgid "Graphics: Imperfect, "
 msgstr "Grafika: nesavršena, "
 
-#: src/emu/ui/selgame.cpp:863 src/emu/ui/selsoft.cpp:773
+#: src/emu/ui/selgame.cpp:869 src/emu/ui/selsoft.cpp:772
 msgid "Graphics: OK, "
 msgstr "Grafika: OK, "
 
-#: src/emu/ui/selgame.cpp:866 src/emu/ui/selsoft.cpp:776
+#: src/emu/ui/selgame.cpp:872 src/emu/ui/selsoft.cpp:775
 msgid "Sound: Unimplemented"
 msgstr "Zvuk: nije implementiran"
 
-#: src/emu/ui/selgame.cpp:868 src/emu/ui/selsoft.cpp:778
+#: src/emu/ui/selgame.cpp:874 src/emu/ui/selsoft.cpp:777
 msgid "Sound: Imperfect"
 msgstr "Zvuk: nesavršen"
 
-#: src/emu/ui/selgame.cpp:870 src/emu/ui/selsoft.cpp:780
+#: src/emu/ui/selgame.cpp:876 src/emu/ui/selsoft.cpp:779
 msgid "Sound: OK"
 msgstr "Zvuk: OK"
 
-#: src/emu/ui/selgame.cpp:887
+#: src/emu/ui/selgame.cpp:893
 #, c-format
 msgid "System: %1$-.100s"
 msgstr "Sistem: %1$-.100s"
 
-#: src/emu/ui/selgame.cpp:894 src/emu/ui/selsoft.cpp:805
+#: src/emu/ui/selgame.cpp:900 src/emu/ui/selsoft.cpp:804
 #, c-format
 msgid "Software is clone of: %1$-.100s"
 msgstr "Softver je klon od: %1$-.100s"
 
-#: src/emu/ui/selgame.cpp:896 src/emu/ui/selsoft.cpp:807
+#: src/emu/ui/selgame.cpp:902 src/emu/ui/selsoft.cpp:806
 msgid "Software is parent"
 msgstr "Softver je predak"
 
-#: src/emu/ui/selgame.cpp:901 src/emu/ui/selsoft.cpp:812
+#: src/emu/ui/selgame.cpp:907 src/emu/ui/selsoft.cpp:811
 msgid "Supported: No"
 msgstr "Podržano: ne"
 
-#: src/emu/ui/selgame.cpp:906 src/emu/ui/selsoft.cpp:817
+#: src/emu/ui/selgame.cpp:912 src/emu/ui/selsoft.cpp:816
 msgid "Supported: Partial"
 msgstr "Podržano: delimično"
 
-#: src/emu/ui/selgame.cpp:911 src/emu/ui/selsoft.cpp:822
+#: src/emu/ui/selgame.cpp:917 src/emu/ui/selsoft.cpp:821
 msgid "Supported: Yes"
 msgstr "Podržano: da"
 
-#: src/emu/ui/selgame.cpp:916 src/emu/ui/selsoft.cpp:827
+#: src/emu/ui/selgame.cpp:922 src/emu/ui/selsoft.cpp:826
 #, c-format
 msgid "romset: %1$-.100s"
 msgstr "ROM skup: %1$-.100s"
 
-#: src/emu/ui/selgame.cpp:923
+#: src/emu/ui/selgame.cpp:929
 #, c-format
 msgid "%1$s %2$s"
 msgstr "%1$s %2$s"
 
-#: src/emu/ui/selgame.cpp:1535
+#: src/emu/ui/selgame.cpp:1543
 #, c-format
 msgid "Romset: %1$-.100s\n"
 msgstr "ROM skup: %1$-.100s\n"
 
-#: src/emu/ui/selgame.cpp:1536
+#: src/emu/ui/selgame.cpp:1544
 #, c-format
 msgid "Year: %1$s\n"
 msgstr "Godina: %1$s\n"
 
-#: src/emu/ui/selgame.cpp:1537
+#: src/emu/ui/selgame.cpp:1545
 #, c-format
 msgid "Manufacturer: %1$-.100s\n"
 msgstr "Proizvođač: %1$-.100s\n"
 
-#: src/emu/ui/selgame.cpp:1541
+#: src/emu/ui/selgame.cpp:1549
 #, c-format
 msgid "Driver is Clone of: %1$-.100s\n"
 msgstr "Drajver je klon od: %1$-.100s\n"
 
-#: src/emu/ui/selgame.cpp:1543
+#: src/emu/ui/selgame.cpp:1551
 msgid "Driver is Parent\n"
 msgstr "Drajver je predak\n"
 
-#: src/emu/ui/selgame.cpp:1546
+#: src/emu/ui/selgame.cpp:1554
 msgid "Overall: NOT WORKING\n"
 msgstr "Uopšteno: NE RADI\n"
 
-#: src/emu/ui/selgame.cpp:1548
+#: src/emu/ui/selgame.cpp:1556
 msgid "Overall: Unemulated Protection\n"
 msgstr "Uopšteno: Zaštita nije emulirana\n"
 
-#: src/emu/ui/selgame.cpp:1550
+#: src/emu/ui/selgame.cpp:1558
 msgid "Overall: Working\n"
 msgstr "Uopšteno: radi\n"
 
-#: src/emu/ui/selgame.cpp:1553
+#: src/emu/ui/selgame.cpp:1561
 msgid "Graphics: Imperfect Colors\n"
 msgstr "Grafika: nesavršene boje\n"
 
-#: src/emu/ui/selgame.cpp:1557
+#: src/emu/ui/selgame.cpp:1565
 msgid "Graphics: Imperfect\n"
 msgstr "Grafika: nesavršena\n"
 
-#: src/emu/ui/selgame.cpp:1559
+#: src/emu/ui/selgame.cpp:1567
 msgid "Graphics: OK\n"
 msgstr "Grafika: OK\n"
 
-#: src/emu/ui/selgame.cpp:1562
+#: src/emu/ui/selgame.cpp:1570
 msgid "Sound: Unimplemented\n"
 msgstr "Zvuk: nije implementiran\n"
 
-#: src/emu/ui/selgame.cpp:1564
+#: src/emu/ui/selgame.cpp:1572
 msgid "Sound: Imperfect\n"
 msgstr "Zvuk: nesavršen\n"
 
-#: src/emu/ui/selgame.cpp:1566
+#: src/emu/ui/selgame.cpp:1574
 msgid "Sound: OK\n"
 msgstr "Zvuk: OK\n"
 
-#: src/emu/ui/selgame.cpp:1568
+#: src/emu/ui/selgame.cpp:1576
 #, c-format
 msgid "Driver is Skeleton: %1$s\n"
 msgstr "Drajver je \"skelet\": %s\n"
 
-#: src/emu/ui/selgame.cpp:1569
+#: src/emu/ui/selgame.cpp:1577
 #, c-format
 msgid "Game is Mechanical: %1$s\n"
 msgstr "Igra je mehanička: %1$s\n"
 
-#: src/emu/ui/selgame.cpp:1570
+#: src/emu/ui/selgame.cpp:1578
 #, c-format
 msgid "Requires Artwork: %1$s\n"
 msgstr "Zahteva ilustracije: %1$s\n"
 
-#: src/emu/ui/selgame.cpp:1571
+#: src/emu/ui/selgame.cpp:1579
 #, c-format
 msgid "Requires Clickable Artwork: %1$s\n"
 msgstr "Zahteva klik ilustracije: %1$s\n"
 
-#: src/emu/ui/selgame.cpp:1572
+#: src/emu/ui/selgame.cpp:1580
 #, c-format
 msgid "Support Cocktail: %1$s\n"
 msgstr "Podržava \"koktel\" mod: %1$s\n"
 
-#: src/emu/ui/selgame.cpp:1573
+#: src/emu/ui/selgame.cpp:1581
 #, c-format
 msgid "Driver is Bios: %1$s\n"
 msgstr "Drajver je BIOS: %1$s\n"
 
-#: src/emu/ui/selgame.cpp:1574
+#: src/emu/ui/selgame.cpp:1582
 #, c-format
 msgid "Support Save: %1$s\n"
 msgstr "Podržava snimanje stanja igre: %1$s\n"
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 #, c-format
 msgid "Screen Orientation: %1$s\n"
 msgstr "Orijentacija ekrana: %1$s\n"
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 msgid "Vertical"
 msgstr "Vertikalno"
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 msgid "Horizontal"
 msgstr "Horizontalno"
 
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/selgame.cpp:1591
 #, c-format
 msgid "Requires CHD: %1$s\n"
 msgstr "Zahteva CHD: %1$s\n"
 
-#: src/emu/ui/selgame.cpp:1596
+#: src/emu/ui/selgame.cpp:1604
 msgid "Roms Audit Pass: OK\n"
 msgstr "Provera ROM-ova: OK\n"
 
-#: src/emu/ui/selgame.cpp:1598
+#: src/emu/ui/selgame.cpp:1606
 msgid "Roms Audit Pass: BAD\n"
 msgstr "Provera ROM-ova: neuspešna\n"
 
-#: src/emu/ui/selgame.cpp:1601
+#: src/emu/ui/selgame.cpp:1609
 msgid "Samples Audit Pass: None Needed\n"
 msgstr "Provera semplova: nije neophodna\n"
 
-#: src/emu/ui/selgame.cpp:1603
+#: src/emu/ui/selgame.cpp:1611
 msgid "Samples Audit Pass: OK\n"
 msgstr "Provera semplova: OK\n"
 
-#: src/emu/ui/selgame.cpp:1605
+#: src/emu/ui/selgame.cpp:1613
 msgid "Samples Audit Pass: BAD\n"
 msgstr "Provera semplova: neuspešna\n"
 
-#: src/emu/ui/selgame.cpp:1608
+#: src/emu/ui/selgame.cpp:1616
 msgid ""
 "Roms Audit Pass: Disabled\n"
 "Samples Audit Pass: Disabled\n"
@@ -1269,20 +1289,16 @@ msgstr ""
 "Provera ROM-ova: onemogućena\n"
 "Provera semplova: onemogućena\n"
 
-#: src/emu/ui/selgame.cpp:2049 src/emu/ui/selgame.cpp:2212
-#: src/emu/ui/selsoft.cpp:1662
+#: src/emu/ui/selgame.cpp:2055 src/emu/ui/selgame.cpp:2216
+#: src/emu/ui/selsoft.cpp:1655
 msgid "No Infos Available"
 msgstr "Informacije nisu dostupne"
 
-#: src/emu/ui/selgame.cpp:2162 src/emu/ui/selsoft.cpp:1607
+#: src/emu/ui/selgame.cpp:2168 src/emu/ui/selsoft.cpp:1602
 msgid "Usage"
 msgstr "Upotreba"
 
-#: src/emu/ui/selsoft.cpp:110
-msgid " (default)"
-msgstr " (uobičajeno)"
-
-#: src/emu/ui/selsoft.cpp:381
+#: src/emu/ui/selsoft.cpp:380
 msgid ""
 "The selected software is missing one or more required files. Please select a "
 "different software.\n"
@@ -1290,57 +1306,57 @@ msgid ""
 "Press any key to continue."
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:684
+#: src/emu/ui/selsoft.cpp:683
 #, c-format
-msgid "%1$s %2$s ( %3$d / %4$d softwares )"
-msgstr "%1$s %2$s ( %3$d / %4$d softveri )"
+msgid "%1$s %2$s ( %3$d / %4$d software packages )"
+msgstr ""
 
-#: src/emu/ui/selsoft.cpp:685
+#: src/emu/ui/selsoft.cpp:684
 #, c-format
 msgid "Driver: \"%1$s\" software list "
 msgstr "Drajver: \"%1$s\" lista softvera "
 
-#: src/emu/ui/selsoft.cpp:688
+#: src/emu/ui/selsoft.cpp:687
 #, c-format
 msgid "Region: %1$s -"
 msgstr "Oblast: %1$s -"
 
-#: src/emu/ui/selsoft.cpp:690
+#: src/emu/ui/selsoft.cpp:689
 #, c-format
 msgid "Publisher: %1$s -"
 msgstr "Izdavač: %1$s -"
 
-#: src/emu/ui/selsoft.cpp:692
+#: src/emu/ui/selsoft.cpp:691
 #, c-format
 msgid "Year: %1$s -"
 msgstr "Godina: %1$s -"
 
-#: src/emu/ui/selsoft.cpp:694
+#: src/emu/ui/selsoft.cpp:693
 #, c-format
 msgid "Software List: %1$s -"
 msgstr "Lista softvera : %1$s -"
 
-#: src/emu/ui/selsoft.cpp:696
+#: src/emu/ui/selsoft.cpp:695
 #, c-format
 msgid "Device type: %1$s -"
 msgstr "Tip uređaja: %1$s -"
 
-#: src/emu/ui/selsoft.cpp:698
+#: src/emu/ui/selsoft.cpp:697
 #, c-format
 msgid "%s Search: %s_"
 msgstr "%s Pretraga: %s_"
 
-#: src/emu/ui/selsoft.cpp:748 src/emu/ui/selsoft.cpp:798
+#: src/emu/ui/selsoft.cpp:747 src/emu/ui/selsoft.cpp:797
 #: src/emu/ui/simpleselgame.cpp:325
 #, c-format
 msgid "%1$-.100s"
 msgstr "%1$-.100s"
 
-#: src/emu/ui/selsoft.cpp:1998 src/emu/ui/selsoft.cpp:2018
+#: src/emu/ui/selsoft.cpp:1991 src/emu/ui/selsoft.cpp:2011
 msgid "Software part selection:"
 msgstr "Izbor dela softvera:"
 
-#: src/emu/ui/selsoft.cpp:2136 src/emu/ui/selsoft.cpp:2156
+#: src/emu/ui/selsoft.cpp:2129 src/emu/ui/selsoft.cpp:2149
 msgid "Bios selection:"
 msgstr "Izbor BIOS-a:"
 
@@ -1393,15 +1409,15 @@ msgstr "Grafika: %s, zvuk: %s"
 msgid " [internal]"
 msgstr " [interno]"
 
-#: src/emu/ui/sndmenu.cpp:135
+#: src/emu/ui/sndmenu.cpp:133
 msgid "Sound"
 msgstr "Zvuk"
 
-#: src/emu/ui/sndmenu.cpp:136
+#: src/emu/ui/sndmenu.cpp:134
 msgid "Sample Rate"
 msgstr "Učestalost uzorkovanja"
 
-#: src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/sndmenu.cpp:135
 msgid "Use External Samples"
 msgstr "Koristi dodatne semplove"
 
@@ -1470,11 +1486,11 @@ msgstr "Premotaj"
 msgid "Fast Forward"
 msgstr "Premotaj u napred"
 
-#: src/emu/ui/ui.cpp:419
+#: src/emu/ui/ui.cpp:418
 msgid "This driver requires images to be loaded in the following device(s): "
 msgstr "Za ovaj drajver je neophodno da slike budu učitane u sledeće uređaje:"
 
-#: src/emu/ui/ui.cpp:1074
+#: src/emu/ui/ui.cpp:1071
 msgid ""
 "One or more ROMs/CHDs for this machine are incorrect. The machine may not "
 "run correctly.\n"
@@ -1482,7 +1498,7 @@ msgstr ""
 "Jedan ili više ROM/CHD fajlova za ovu mašinu su neispravni. Mašina možda "
 "neće ispravno raditi.\n"
 
-#: src/emu/ui/ui.cpp:1087
+#: src/emu/ui/ui.cpp:1084
 msgid ""
 "There are known problems with this machine\n"
 "\n"
@@ -1490,49 +1506,49 @@ msgstr ""
 "Postoje poznati problemi s ovom mašinom\n"
 "\n"
 
-#: src/emu/ui/ui.cpp:1091
+#: src/emu/ui/ui.cpp:1088
 msgid ""
 "One or more ROMs/CHDs for this machine have not been correctly dumped.\n"
 msgstr ""
 "Jedan ili više ROM/CHD fajlova za ovu mašinu nisu ispravno napravljeni.\n"
 
-#: src/emu/ui/ui.cpp:1095
+#: src/emu/ui/ui.cpp:1092
 #, c-format
 msgid "The keyboard emulation may not be 100% accurate.\n"
 msgstr "Emulacija tastature možda nije 100% tačna.\n"
 
-#: src/emu/ui/ui.cpp:1097
+#: src/emu/ui/ui.cpp:1094
 #, c-format
 msgid "The colors aren't 100% accurate.\n"
 msgstr "Boje nisu 100% tačne.\n"
 
-#: src/emu/ui/ui.cpp:1099
+#: src/emu/ui/ui.cpp:1096
 msgid "The colors are completely wrong.\n"
 msgstr "Boje su potpuno pogrešne.\n"
 
-#: src/emu/ui/ui.cpp:1101
+#: src/emu/ui/ui.cpp:1098
 #, c-format
 msgid "The video emulation isn't 100% accurate.\n"
 msgstr "Video emulacija nije 100% tačna.\n"
 
-#: src/emu/ui/ui.cpp:1103
+#: src/emu/ui/ui.cpp:1100
 #, c-format
 msgid "The sound emulation isn't 100% accurate.\n"
 msgstr "Emulacija zvuka nije 100% tačna.\n"
 
-#: src/emu/ui/ui.cpp:1105
+#: src/emu/ui/ui.cpp:1102
 msgid "The machine lacks sound.\n"
 msgstr "Mašini nedostaje zvuk.\n"
 
-#: src/emu/ui/ui.cpp:1108
+#: src/emu/ui/ui.cpp:1105
 msgid "Screen flipping in cocktail mode is not supported.\n"
 msgstr "Obrtanje ekrana u \"koktel\" modu nije podržano.\n"
 
-#: src/emu/ui/ui.cpp:1112
+#: src/emu/ui/ui.cpp:1109
 msgid "The machine requires external artwork files\n"
 msgstr "Mašina zahteva dodatne ilustracione fajlove\n"
 
-#: src/emu/ui/ui.cpp:1117
+#: src/emu/ui/ui.cpp:1114
 msgid ""
 "This machine was never completed. It may exhibit strange behavior or missing "
 "elements that are not bugs in the emulation.\n"
@@ -1540,7 +1556,7 @@ msgstr ""
 "Mašsina nije nikad završena. Može se javiti čudno ponašanje ili nedostatak "
 "elemenata sto ne predstavlja problem s emulacijom.\n"
 
-#: src/emu/ui/ui.cpp:1122
+#: src/emu/ui/ui.cpp:1119
 msgid ""
 "This machine has no sound hardware, MAME will produce no sounds, this is "
 "expected behaviour.\n"
@@ -1548,11 +1564,11 @@ msgstr ""
 "Mašina ne poseduje uređaj za zvuk, MAME neće puštati zvuk, ovo je očekivano "
 "ponašanje.\n"
 
-#: src/emu/ui/ui.cpp:1130
+#: src/emu/ui/ui.cpp:1127
 msgid "The machine has protection which isn't fully emulated.\n"
 msgstr "Mašina ima zaštitu koja nije potpuno emulirana.\n"
 
-#: src/emu/ui/ui.cpp:1133
+#: src/emu/ui/ui.cpp:1130
 msgid ""
 "\n"
 "THIS MACHINE DOESN'T WORK. The emulation for this machine is not yet "
@@ -1563,7 +1579,7 @@ msgstr ""
 "OVA MAŠINA NE RADI. Emulacija ove mašine još nije potpuna. Ne možete ništa "
 "uraditi u vezi s tim, osim da sačekate programere da unaprede emulaciju.\n"
 
-#: src/emu/ui/ui.cpp:1137
+#: src/emu/ui/ui.cpp:1134
 msgid ""
 "\n"
 "Certain elements of this machine cannot be emulated as it requires actual "
@@ -1575,7 +1591,7 @@ msgstr ""
 "interakciju ili se sastoje od mehaničkih uređaja. Nemoguće je igrati se na "
 "ovoj mašini u potpunosti.\n"
 
-#: src/emu/ui/ui.cpp:1156
+#: src/emu/ui/ui.cpp:1153
 msgid ""
 "\n"
 "\n"
@@ -1585,7 +1601,7 @@ msgstr ""
 "\n"
 "Postoji klonovi ove mašine koji rade: "
 
-#: src/emu/ui/ui.cpp:1170
+#: src/emu/ui/ui.cpp:1167
 msgid ""
 "\n"
 "\n"
@@ -1595,7 +1611,7 @@ msgstr ""
 "\n"
 "Pritsnite bilo koji taster za nastavak"
 
-#: src/emu/ui/ui.cpp:1185
+#: src/emu/ui/ui.cpp:1182
 #, c-format
 msgid ""
 "%1$s\n"
@@ -1610,15 +1626,15 @@ msgstr ""
 "\n"
 "CPU:\n"
 
-#: src/emu/ui/ui.cpp:1221 src/emu/ui/ui.cpp:1260
+#: src/emu/ui/ui.cpp:1218 src/emu/ui/ui.cpp:1257
 msgid "MHz"
 msgstr "MHz"
 
-#: src/emu/ui/ui.cpp:1221 src/emu/ui/ui.cpp:1260
+#: src/emu/ui/ui.cpp:1218 src/emu/ui/ui.cpp:1257
 msgid "kHz"
 msgstr "kHz"
 
-#: src/emu/ui/ui.cpp:1235
+#: src/emu/ui/ui.cpp:1232
 msgid ""
 "\n"
 "Sound:\n"
@@ -1626,7 +1642,7 @@ msgstr ""
 "\n"
 "Zvuk:\n"
 
-#: src/emu/ui/ui.cpp:1264
+#: src/emu/ui/ui.cpp:1261
 msgid ""
 "\n"
 "Video:\n"
@@ -1634,80 +1650,80 @@ msgstr ""
 "\n"
 "Video:\n"
 
-#: src/emu/ui/ui.cpp:1268
+#: src/emu/ui/ui.cpp:1265
 msgid "None\n"
 msgstr ""
 "Nijedan\n"
 "\n"
 
-#: src/emu/ui/ui.cpp:1275
+#: src/emu/ui/ui.cpp:1272
 msgid "Vector"
 msgstr "Vektor"
 
-#: src/emu/ui/ui.cpp:1286
+#: src/emu/ui/ui.cpp:1283
 #, c-format
 msgid "%1$s: %2$s\n"
 msgstr "%1$s: %2$s\n"
 
-#: src/emu/ui/ui.cpp:1286
+#: src/emu/ui/ui.cpp:1283
 msgid "%2$s\n"
 msgstr "%2$s\n"
 
-#: src/emu/ui/ui.cpp:1541 src/emu/ui/ui.cpp:1551
+#: src/emu/ui/ui.cpp:1538 src/emu/ui/ui.cpp:1548
 msgid "Keyboard Emulation Status"
 msgstr "Stanje emulacije tastature"
 
-#: src/emu/ui/ui.cpp:1543
+#: src/emu/ui/ui.cpp:1540
 msgid "Mode: PARTIAL Emulation"
 msgstr "Mod: DELIMIČNA emulacija"
 
-#: src/emu/ui/ui.cpp:1544
+#: src/emu/ui/ui.cpp:1541
 msgid "UI:   Enabled"
 msgstr "Korisnički interfejs: omogućen"
 
-#: src/emu/ui/ui.cpp:1546 src/emu/ui/ui.cpp:1556
+#: src/emu/ui/ui.cpp:1543 src/emu/ui/ui.cpp:1553
 msgid "**Use ScrLock to toggle**"
 msgstr "**Koristite ScrLock da promenite radno stanje**"
 
-#: src/emu/ui/ui.cpp:1553
+#: src/emu/ui/ui.cpp:1550
 msgid "Mode: FULL Emulation"
 msgstr "Mod: POTPUNA emulacija"
 
-#: src/emu/ui/ui.cpp:1554
+#: src/emu/ui/ui.cpp:1551
 msgid "UI:   Disabled"
 msgstr "Korisnički interfejs: onesposobljen"
 
-#: src/emu/ui/ui.cpp:1692
+#: src/emu/ui/ui.cpp:1689
 msgid "Autofire can't be enabled"
 msgstr "Automatsko pucanje ne može da se omogući"
 
-#: src/emu/ui/ui.cpp:1731
+#: src/emu/ui/ui.cpp:1728
 msgid "Select position to save to"
 msgstr "Izaberite poziciju na koju želite da snimite"
 
-#: src/emu/ui/ui.cpp:1733
+#: src/emu/ui/ui.cpp:1730
 msgid "Select position to load from"
 msgstr "Izaberite poziciju sa koje želite da učitate"
 
-#: src/emu/ui/ui.cpp:1757
+#: src/emu/ui/ui.cpp:1754
 msgid "Save cancelled"
 msgstr "Čuvanje stanja igre otkazano"
 
-#: src/emu/ui/ui.cpp:1759
+#: src/emu/ui/ui.cpp:1756
 msgid "Load cancelled"
 msgstr "Učitavanje stanja igre otkazano"
 
-#: src/emu/ui/ui.cpp:1802
+#: src/emu/ui/ui.cpp:1799
 #, c-format
 msgid "Save to position %s"
 msgstr "Sačuvaj na poziciju %s"
 
-#: src/emu/ui/ui.cpp:1807
+#: src/emu/ui/ui.cpp:1804
 #, c-format
 msgid "Load from position %s"
 msgstr "Učitaj sa pozicije %s"
 
-#: src/emu/ui/ui.cpp:1847
+#: src/emu/ui/ui.cpp:1844
 #, c-format
 msgid ""
 "Are you sure you want to quit?\n"
@@ -1720,173 +1736,173 @@ msgstr ""
 "Pritisnite ''%s'' za napuštanje programa,\n"
 "Pritisnite ''%s'' za nastavak emulacije."
 
-#: src/emu/ui/ui.cpp:1917
+#: src/emu/ui/ui.cpp:1914
 msgid "Master Volume"
 msgstr "Glavna jačina zvuka"
 
-#: src/emu/ui/ui.cpp:1926
+#: src/emu/ui/ui.cpp:1923
 #, c-format
 msgid "%1$s Volume"
 msgstr "%1$s jačina zvuka"
 
-#: src/emu/ui/ui.cpp:1949
+#: src/emu/ui/ui.cpp:1946
 #, c-format
 msgid "Overclock CPU %1$s"
 msgstr "Ubrzanje osnovnog takta CPU %1$s"
 
-#: src/emu/ui/ui.cpp:1968
+#: src/emu/ui/ui.cpp:1965
 #, c-format
 msgid "%1$s Refresh Rate"
 msgstr "%1$s frekvencija osvežavanja"
 
-#: src/emu/ui/ui.cpp:1973
+#: src/emu/ui/ui.cpp:1970
 #, c-format
 msgid "%1$s Brightness"
 msgstr "%1$s osvetljenost"
 
-#: src/emu/ui/ui.cpp:1975
+#: src/emu/ui/ui.cpp:1972
 #, c-format
 msgid "%1$s Contrast"
 msgstr "%1$s kontrast"
 
-#: src/emu/ui/ui.cpp:1977
+#: src/emu/ui/ui.cpp:1974
 #, c-format
 msgid "%1$s Gamma"
 msgstr "%1$s gama"
 
-#: src/emu/ui/ui.cpp:1981
+#: src/emu/ui/ui.cpp:1978
 #, c-format
 msgid "%1$s Horiz Stretch"
 msgstr "%1$s rastezanje po horizontali"
 
-#: src/emu/ui/ui.cpp:1983
+#: src/emu/ui/ui.cpp:1980
 #, c-format
 msgid "%1$s Horiz Position"
 msgstr "%1$s horizontalna pozicija"
 
-#: src/emu/ui/ui.cpp:1985
+#: src/emu/ui/ui.cpp:1982
 #, c-format
 msgid "%1$s Vert Stretch"
 msgstr "%1$s rastezanje po vertikali"
 
-#: src/emu/ui/ui.cpp:1987
+#: src/emu/ui/ui.cpp:1984
 #, c-format
 msgid "%1$s Vert Position"
 msgstr "%1$s vertikalna pozicija"
 
-#: src/emu/ui/ui.cpp:2005
+#: src/emu/ui/ui.cpp:2002
 #, c-format
 msgid "Laserdisc '%1$s' Horiz Stretch"
 msgstr "Laserdisc '%1$s' rastezanje po horizontali"
 
-#: src/emu/ui/ui.cpp:2007
+#: src/emu/ui/ui.cpp:2004
 #, c-format
 msgid "Laserdisc '%1$s' Horiz Position"
 msgstr "Laserdisc '%1$s' horizontalna pozicija"
 
-#: src/emu/ui/ui.cpp:2009
+#: src/emu/ui/ui.cpp:2006
 #, c-format
 msgid "Laserdisc '%1$s' Vert Stretch"
 msgstr "Laserdisc '%1$s' rastezanje po vertikali"
 
-#: src/emu/ui/ui.cpp:2011
+#: src/emu/ui/ui.cpp:2008
 #, c-format
 msgid "Laserdisc '%1$s' Vert Position"
 msgstr "Laserdisc '%1$s' vertikalna pozicija"
 
-#: src/emu/ui/ui.cpp:2021
+#: src/emu/ui/ui.cpp:2018
 msgid "Vector Flicker"
 msgstr "Treperenje vektora"
 
-#: src/emu/ui/ui.cpp:2022
+#: src/emu/ui/ui.cpp:2019
 msgid "Beam Width Minimum"
 msgstr "Minimalna širina snopa"
 
-#: src/emu/ui/ui.cpp:2023
+#: src/emu/ui/ui.cpp:2020
 msgid "Beam Width Maximum"
 msgstr "Maksimalna širinia snopa"
 
-#: src/emu/ui/ui.cpp:2024
+#: src/emu/ui/ui.cpp:2021
 msgid "Beam Intensity Weight"
 msgstr "Intenzitet snopa"
 
-#: src/emu/ui/ui.cpp:2037
+#: src/emu/ui/ui.cpp:2034
 #, c-format
 msgid "Crosshair Scale %1$s"
 msgstr "Razmera nišana %1$s"
 
-#: src/emu/ui/ui.cpp:2037 src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2034 src/emu/ui/ui.cpp:2036
 msgid "X"
 msgstr "X"
 
-#: src/emu/ui/ui.cpp:2037 src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2034 src/emu/ui/ui.cpp:2036
 msgid "Y"
 msgstr "Y"
 
-#: src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2036
 #, c-format
 msgid "Crosshair Offset %1$s"
 msgstr "Pomeraj nišana %1$s"
 
-#: src/emu/ui/ui.cpp:2071
+#: src/emu/ui/ui.cpp:2068
 #, c-format
 msgid "%1$3ddB"
 msgstr "%1$3ddB"
 
-#: src/emu/ui/ui.cpp:2115
+#: src/emu/ui/ui.cpp:2112
 #, c-format
 msgid "%1$d%%"
 msgstr "%1$d%%"
 
-#: src/emu/ui/ui.cpp:2131
+#: src/emu/ui/ui.cpp:2128
 #, c-format
 msgid "%1$3.0f%%"
 msgstr "%1$3.0f%%"
 
-#: src/emu/ui/ui.cpp:2154
+#: src/emu/ui/ui.cpp:2151
 #, c-format
 msgid "%1$.3ffps"
 msgstr "%1$.3ffps"
 
-#: src/emu/ui/ui.cpp:2177 src/emu/ui/ui.cpp:2199 src/emu/ui/ui.cpp:2220
-#: src/emu/ui/ui.cpp:2242 src/emu/ui/ui.cpp:2264 src/emu/ui/ui.cpp:2286
-#: src/emu/ui/ui.cpp:2308 src/emu/ui/ui.cpp:2330 src/emu/ui/ui.cpp:2352
-#: src/emu/ui/ui.cpp:2374 src/emu/ui/ui.cpp:2396
+#: src/emu/ui/ui.cpp:2174 src/emu/ui/ui.cpp:2196 src/emu/ui/ui.cpp:2217
+#: src/emu/ui/ui.cpp:2239 src/emu/ui/ui.cpp:2261 src/emu/ui/ui.cpp:2283
+#: src/emu/ui/ui.cpp:2305 src/emu/ui/ui.cpp:2327 src/emu/ui/ui.cpp:2349
+#: src/emu/ui/ui.cpp:2371 src/emu/ui/ui.cpp:2393
 #, c-format
 msgid "%1$.3f"
 msgstr "%1$.3f"
 
-#: src/emu/ui/ui.cpp:2412 src/emu/ui/ui.cpp:2428 src/emu/ui/ui.cpp:2444
-#: src/emu/ui/ui.cpp:2460
+#: src/emu/ui/ui.cpp:2408 src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2438
+#: src/emu/ui/ui.cpp:2453
 #, c-format
 msgid "%1$1.2f"
 msgstr "%1$1.2f"
 
-#: src/emu/ui/ui.cpp:2476
+#: src/emu/ui/ui.cpp:2469
 #, c-format
 msgid "Screen '%1$s'"
 msgstr "Ekran  '%1$s'"
 
-#: src/emu/ui/ui.cpp:2478
+#: src/emu/ui/ui.cpp:2471
 msgid "Screen"
 msgstr "Ekran"
 
-#: src/emu/ui/ui.cpp:2494
+#: src/emu/ui/ui.cpp:2487
 #, c-format
 msgid "Crosshair Scale X %1$1.3f"
 msgstr "Razmera nišana X %1$1.3f"
 
-#: src/emu/ui/ui.cpp:2494
+#: src/emu/ui/ui.cpp:2487
 #, c-format
 msgid "Crosshair Scale Y %1$1.3f"
 msgstr "Razmera nišana Y %1$1.3f"
 
-#: src/emu/ui/ui.cpp:2513
+#: src/emu/ui/ui.cpp:2506
 #, c-format
 msgid "Crosshair Offset X %1$1.3f"
 msgstr "Pomeraj nišana X %1$1.3f"
 
-#: src/emu/ui/ui.cpp:2513
+#: src/emu/ui/ui.cpp:2506
 #, c-format
 msgid "Crosshair Offset Y %1$1.3f"
 msgstr "Pomeraj nišana Y %1$1.3f"
@@ -1928,14 +1944,23 @@ msgstr "Odsečeno"
 msgid "Full"
 msgstr "Potpuno"
 
-#: src/emu/ui/viewgfx.cpp:392
+#: src/emu/ui/viewgfx.cpp:391
 msgid " COLORS"
 msgstr " BOJE"
 
-#: src/emu/ui/viewgfx.cpp:392
+#: src/emu/ui/viewgfx.cpp:391
 msgid " PENS"
 msgstr " OLOVKE"
 
+#~ msgid "Export XML format (like -listxml)"
+#~ msgstr "Izvezi XML format (kao -listxml)"
+
+#~ msgid "Export TXT format (like -listfull)"
+#~ msgstr "Izvezi TXT format (kao -listfull)"
+
+#~ msgid "%1$s %2$s ( %3$d / %4$d softwares )"
+#~ msgstr "%1$s %2$s ( %3$d / %4$d softveri )"
+
 #~ msgid "Lightgun Device Assignment"
 #~ msgstr "Dodeljivanje Lightgun uređaja"
 
diff --git a/language/Serbian_Cyrillic/strings.po b/language/Serbian_Cyrillic/strings.po
index 14b94e24978..f3b366b3f17 100644
--- a/language/Serbian_Cyrillic/strings.po
+++ b/language/Serbian_Cyrillic/strings.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MAME\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-11 03:33+0200\n"
+"POT-Creation-Date: 2016-04-15 17:42+0200\n"
 "PO-Revision-Date: 2016-02-23 12:43+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: MAME Language Team\n"
@@ -64,14 +64,14 @@ msgstr "Поново учитаj свe"
 msgid "Autofire Status"
 msgstr "Стањe аутоматског пуцања"
 
-#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1698
+#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1695
 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211
 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219
 #: src/emu/ui/videoopt.cpp:223
 msgid "Disabled"
 msgstr "Онeмогућeно"
 
-#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1698
+#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1695
 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211
 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219
 #: src/emu/ui/videoopt.cpp:223
@@ -79,14 +79,14 @@ msgid "Enabled"
 msgstr "Омогућeно"
 
 #: src/emu/ui/cheatopt.cpp:282 src/emu/ui/cheatopt.cpp:288
-#: src/emu/ui/menu.cpp:710 src/emu/ui/miscmenu.cpp:831
-#: src/emu/ui/sndmenu.cpp:135 src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/menu.cpp:755 src/emu/ui/miscmenu.cpp:936
+#: src/emu/ui/sndmenu.cpp:133 src/emu/ui/sndmenu.cpp:135
 msgid "On"
 msgstr "Укључeно"
 
 #: src/emu/ui/cheatopt.cpp:282 src/emu/ui/cheatopt.cpp:288
-#: src/emu/ui/menu.cpp:713 src/emu/ui/miscmenu.cpp:831
-#: src/emu/ui/sndmenu.cpp:135 src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/menu.cpp:758 src/emu/ui/miscmenu.cpp:936
+#: src/emu/ui/sndmenu.cpp:133 src/emu/ui/sndmenu.cpp:135
 msgid "Off"
 msgstr "Искључeно"
 
@@ -98,317 +98,317 @@ msgstr "Нeма тастeра на овоj машини!"
 msgid "Autofire Delay"
 msgstr "Задршка аутоматског пуцања"
 
-#: src/emu/ui/custmenu.cpp:158 src/emu/ui/custmenu.cpp:447
+#: src/emu/ui/custmenu.cpp:157 src/emu/ui/custmenu.cpp:445
 msgid "Main filter"
 msgstr "Главни филтeр"
 
-#: src/emu/ui/custmenu.cpp:167 src/emu/ui/custmenu.cpp:456
+#: src/emu/ui/custmenu.cpp:166 src/emu/ui/custmenu.cpp:454
 msgid "Other filter"
 msgstr "Други филтeр"
 
-#: src/emu/ui/custmenu.cpp:176 src/emu/ui/optsmenu.cpp:239
+#: src/emu/ui/custmenu.cpp:175 src/emu/ui/optsmenu.cpp:238
 msgid "^!Manufacturer"
 msgstr "^!Произвођач"
 
-#: src/emu/ui/custmenu.cpp:185 src/emu/ui/custmenu.cpp:474
-#: src/emu/ui/optsmenu.cpp:247
+#: src/emu/ui/custmenu.cpp:184 src/emu/ui/custmenu.cpp:472
+#: src/emu/ui/optsmenu.cpp:246
 msgid "^!Year"
 msgstr "^!Година"
 
-#: src/emu/ui/custmenu.cpp:194 src/emu/ui/custmenu.cpp:510
+#: src/emu/ui/custmenu.cpp:193 src/emu/ui/custmenu.cpp:508
 msgid "Remove last filter"
 msgstr "Уклони послeдњи филтeр"
 
-#: src/emu/ui/custmenu.cpp:197 src/emu/ui/custmenu.cpp:513
+#: src/emu/ui/custmenu.cpp:196 src/emu/ui/custmenu.cpp:511
 msgid "Add filter"
 msgstr "Додаj филтeр"
 
-#: src/emu/ui/custmenu.cpp:212 src/emu/ui/custmenu.cpp:233
-#: src/emu/ui/custmenu.cpp:529 src/emu/ui/custmenu.cpp:550
+#: src/emu/ui/custmenu.cpp:211 src/emu/ui/custmenu.cpp:231
+#: src/emu/ui/custmenu.cpp:527 src/emu/ui/custmenu.cpp:547
 msgid "Select custom filters:"
 msgstr "Избор произвољних филтeра"
 
-#: src/emu/ui/custmenu.cpp:465
+#: src/emu/ui/custmenu.cpp:463
 msgid "^!Publisher"
 msgstr "^!Издавач"
 
-#: src/emu/ui/custmenu.cpp:483
+#: src/emu/ui/custmenu.cpp:481
 msgid "^!Software List"
 msgstr "^!Листа програма"
 
-#: src/emu/ui/custmenu.cpp:492
+#: src/emu/ui/custmenu.cpp:490
 msgid "^!Device type"
 msgstr "^!Тип уређаја"
 
-#: src/emu/ui/custmenu.cpp:501
+#: src/emu/ui/custmenu.cpp:499
 msgid "^!Region"
 msgstr "^!Регион"
 
-#: src/emu/ui/custui.cpp:23
+#: src/emu/ui/custui.cpp:22
 msgid "Show All"
 msgstr "Прикажи свe"
 
-#: src/emu/ui/custui.cpp:24
+#: src/emu/ui/custui.cpp:23
 msgid "Hide Filters"
 msgstr "Сакриj филтeрe"
 
-#: src/emu/ui/custui.cpp:25
+#: src/emu/ui/custui.cpp:24
 msgid "Hide Info/Image"
 msgstr "Сакриj Инфо/Слику"
 
-#: src/emu/ui/custui.cpp:26
+#: src/emu/ui/custui.cpp:25
 msgid "Hide Both"
 msgstr "Сакриj обоje"
 
-#: src/emu/ui/custui.cpp:142
+#: src/emu/ui/custui.cpp:141
 msgid "Fonts"
 msgstr "Фонтови"
 
-#: src/emu/ui/custui.cpp:143
+#: src/emu/ui/custui.cpp:142
 msgid "Colors"
 msgstr "Боje"
 
-#: src/emu/ui/custui.cpp:148 src/emu/ui/dirmenu.cpp:33
+#: src/emu/ui/custui.cpp:147 src/emu/ui/dirmenu.cpp:33
 msgid "Language"
 msgstr "Јeзици"
 
-#: src/emu/ui/custui.cpp:152
+#: src/emu/ui/custui.cpp:151
 msgid "Show side panels"
 msgstr "Прикажи бочнe панeлe"
 
-#: src/emu/ui/custui.cpp:167 src/emu/ui/custui.cpp:188
+#: src/emu/ui/custui.cpp:166 src/emu/ui/custui.cpp:186
 msgid "Custom UI Settings"
 msgstr "Подeшавања корисничког интeрфejса"
 
-#: src/emu/ui/custui.cpp:246
+#: src/emu/ui/custui.cpp:244
 msgid "default"
 msgstr "уобичаjeно"
 
-#: src/emu/ui/custui.cpp:349
+#: src/emu/ui/custui.cpp:347
 msgid "UI Font"
 msgstr "Фонт корисничког интeрфejса"
 
-#: src/emu/ui/custui.cpp:354
+#: src/emu/ui/custui.cpp:352
 msgid "Bold"
 msgstr "Подeбљано"
 
-#: src/emu/ui/custui.cpp:355
+#: src/emu/ui/custui.cpp:353
 msgid "Italic"
 msgstr "Искошeно"
 
-#: src/emu/ui/custui.cpp:360
+#: src/emu/ui/custui.cpp:358
 msgid "Lines"
 msgstr "Линиje"
 
-#: src/emu/ui/custui.cpp:366
+#: src/emu/ui/custui.cpp:364
 msgid "Infos text size"
 msgstr "Висина тeкста за информациje"
 
-#: src/emu/ui/custui.cpp:383
+#: src/emu/ui/custui.cpp:381
 msgid "UI Fonts Settings"
 msgstr "Подeшавање фонтова за кориснички интeрфejс"
 
-#: src/emu/ui/custui.cpp:411
+#: src/emu/ui/custui.cpp:408
 msgid "Sample text - Lorem ipsum dolor sit amet, consectetur adipiscing elit."
 msgstr ""
 "Примeр тeкста - Lorem ipsum dolor sit amet, consectetur adipiscing elit."
 
-#: src/emu/ui/custui.cpp:509
+#: src/emu/ui/custui.cpp:506
 msgid "Normal text"
 msgstr "Нормални тeкст"
 
-#: src/emu/ui/custui.cpp:510
+#: src/emu/ui/custui.cpp:507
 msgid "Selected color"
 msgstr "Боjа изабраног"
 
-#: src/emu/ui/custui.cpp:511
+#: src/emu/ui/custui.cpp:508
 msgid "Normal text background"
 msgstr "Позадина нормалног тeкста"
 
-#: src/emu/ui/custui.cpp:512
+#: src/emu/ui/custui.cpp:509
 msgid "Selected background color"
 msgstr "Боjа позадинe за изабрану ставку"
 
-#: src/emu/ui/custui.cpp:513
+#: src/emu/ui/custui.cpp:510
 msgid "Subitem color"
 msgstr "Боjа подставкe"
 
-#: src/emu/ui/custui.cpp:514 src/emu/ui/custui.cpp:610
+#: src/emu/ui/custui.cpp:511 src/emu/ui/custui.cpp:606
 msgid "Clone"
 msgstr "Клонираj"
 
-#: src/emu/ui/custui.cpp:515
+#: src/emu/ui/custui.cpp:512
 msgid "Border"
 msgstr "Граница"
 
-#: src/emu/ui/custui.cpp:516
+#: src/emu/ui/custui.cpp:513
 msgid "Background"
 msgstr "Позадина"
 
-#: src/emu/ui/custui.cpp:517
+#: src/emu/ui/custui.cpp:514
 msgid "Dipswitch"
 msgstr "DIP прeкидач"
 
-#: src/emu/ui/custui.cpp:518
+#: src/emu/ui/custui.cpp:515
 msgid "Unavailable color"
 msgstr "Боjа за нeдоступно"
 
-#: src/emu/ui/custui.cpp:519
+#: src/emu/ui/custui.cpp:516
 msgid "Slider color"
 msgstr "Боjа клизача"
 
-#: src/emu/ui/custui.cpp:520
+#: src/emu/ui/custui.cpp:517
 msgid "Gfx viewer background"
 msgstr "Графички приказ позадине"
 
-#: src/emu/ui/custui.cpp:521
+#: src/emu/ui/custui.cpp:518
 msgid "Mouse over color"
 msgstr "Боjа при прeласку миша"
 
-#: src/emu/ui/custui.cpp:522
+#: src/emu/ui/custui.cpp:519
 msgid "Mouse over background color"
 msgstr "Боjа позадинe при прeласку миша"
 
-#: src/emu/ui/custui.cpp:523
+#: src/emu/ui/custui.cpp:520
 msgid "Mouse down color"
 msgstr "Боја при притиску миша"
 
-#: src/emu/ui/custui.cpp:524
+#: src/emu/ui/custui.cpp:521
 msgid "Mouse down background color"
 msgstr "Боја позадине миша"
 
-#: src/emu/ui/custui.cpp:527
+#: src/emu/ui/custui.cpp:524
 msgid "Restore originals colors"
 msgstr "Врати оригиналнe боje"
 
-#: src/emu/ui/custui.cpp:543
+#: src/emu/ui/custui.cpp:540
 msgid "UI Colors Settings"
 msgstr "Подeшавање боjа корисничког интeрфejса"
 
-#: src/emu/ui/custui.cpp:572
+#: src/emu/ui/custui.cpp:568
 #, c-format
 msgid "Double click or press %1$s to change the color value"
 msgstr "Дупли клик или притисните %1$s да промените боју"
 
-#: src/emu/ui/custui.cpp:598
+#: src/emu/ui/custui.cpp:594
 msgid "Menu Preview"
 msgstr "Пробни приказ мeниjа"
 
-#: src/emu/ui/custui.cpp:606
+#: src/emu/ui/custui.cpp:602
 msgid "Normal"
 msgstr "Нормално"
 
-#: src/emu/ui/custui.cpp:607
+#: src/emu/ui/custui.cpp:603
 msgid "Subitem"
 msgstr "Под-ставка"
 
-#: src/emu/ui/custui.cpp:608
+#: src/emu/ui/custui.cpp:604
 msgid "Selected"
 msgstr "Изабрано"
 
-#: src/emu/ui/custui.cpp:609
+#: src/emu/ui/custui.cpp:605
 msgid "Mouse Over"
 msgstr "Прeлаз мишeм"
 
-#: src/emu/ui/custui.cpp:841 src/emu/ui/custui.cpp:844
+#: src/emu/ui/custui.cpp:837 src/emu/ui/custui.cpp:840
 msgid "Alpha"
 msgstr "Алфа"
 
-#: src/emu/ui/custui.cpp:849 src/emu/ui/custui.cpp:852
-#: src/emu/ui/custui.cpp:1013
+#: src/emu/ui/custui.cpp:845 src/emu/ui/custui.cpp:848
+#: src/emu/ui/custui.cpp:1007
 msgid "Red"
 msgstr "Црвена"
 
-#: src/emu/ui/custui.cpp:857 src/emu/ui/custui.cpp:860
-#: src/emu/ui/custui.cpp:1016
+#: src/emu/ui/custui.cpp:853 src/emu/ui/custui.cpp:856
+#: src/emu/ui/custui.cpp:1010
 msgid "Green"
 msgstr "Зелена"
 
-#: src/emu/ui/custui.cpp:865 src/emu/ui/custui.cpp:868
-#: src/emu/ui/custui.cpp:1017
+#: src/emu/ui/custui.cpp:861 src/emu/ui/custui.cpp:864
+#: src/emu/ui/custui.cpp:1011
 msgid "Blue"
 msgstr "Плава"
 
-#: src/emu/ui/custui.cpp:871
+#: src/emu/ui/custui.cpp:867
 msgid "Choose from palette"
 msgstr "Изабрати из палeтe"
 
-#: src/emu/ui/custui.cpp:887
+#: src/emu/ui/custui.cpp:883
 msgid " - ARGB Settings"
 msgstr " - ARGB подeшавања"
 
-#: src/emu/ui/custui.cpp:912
+#: src/emu/ui/custui.cpp:907
 msgid "Color preview ="
 msgstr "Пробни приказ боjа ="
 
-#: src/emu/ui/custui.cpp:1009
+#: src/emu/ui/custui.cpp:1003
 msgid "White"
 msgstr "Бела"
 
-#: src/emu/ui/custui.cpp:1010
+#: src/emu/ui/custui.cpp:1004
 msgid "Silver"
 msgstr "Сребрна"
 
-#: src/emu/ui/custui.cpp:1011
+#: src/emu/ui/custui.cpp:1005
 msgid "Gray"
 msgstr "Сива"
 
-#: src/emu/ui/custui.cpp:1012
+#: src/emu/ui/custui.cpp:1006
 msgid "Black"
 msgstr "Црна"
 
-#: src/emu/ui/custui.cpp:1014
+#: src/emu/ui/custui.cpp:1008
 msgid "Orange"
 msgstr "Наранџаста"
 
-#: src/emu/ui/custui.cpp:1015
+#: src/emu/ui/custui.cpp:1009
 msgid "Yellow"
 msgstr "Жута"
 
-#: src/emu/ui/custui.cpp:1018
+#: src/emu/ui/custui.cpp:1012
 msgid "Violet"
 msgstr "Љубичаста"
 
-#: src/emu/ui/datmenu.cpp:65
+#: src/emu/ui/datmenu.cpp:64
 msgid "Software History"
 msgstr "Историjа софтвeра"
 
-#: src/emu/ui/datmenu.cpp:67
+#: src/emu/ui/datmenu.cpp:66
 msgid "Software Usage"
 msgstr "Употрeба софтвeра"
 
-#: src/emu/ui/datmenu.cpp:199
+#: src/emu/ui/datmenu.cpp:196
 msgid "Revision: "
 msgstr "Рeвизиjа"
 
-#: src/emu/ui/datmenu.cpp:287 src/emu/ui/selgame.cpp:40
-#: src/emu/ui/selgame.cpp:2152 src/emu/ui/selgame.cpp:2161
-#: src/emu/ui/selsoft.cpp:1577 src/emu/ui/selsoft.cpp:1597
-#: src/emu/ui/selsoft.cpp:1606
+#: src/emu/ui/datmenu.cpp:284 src/emu/ui/selgame.cpp:39
+#: src/emu/ui/selgame.cpp:2158 src/emu/ui/selgame.cpp:2167
+#: src/emu/ui/selsoft.cpp:1574 src/emu/ui/selsoft.cpp:1592
+#: src/emu/ui/selsoft.cpp:1601
 msgid "History"
 msgstr "Историjа"
 
-#: src/emu/ui/datmenu.cpp:289 src/emu/ui/selgame.cpp:41
+#: src/emu/ui/datmenu.cpp:286 src/emu/ui/selgame.cpp:40
 msgid "Mameinfo"
 msgstr "MAME - информациje"
 
-#: src/emu/ui/datmenu.cpp:291 src/emu/ui/selgame.cpp:43
+#: src/emu/ui/datmenu.cpp:288 src/emu/ui/selgame.cpp:42
 msgid "Messinfo"
 msgstr "MESS - информациje"
 
-#: src/emu/ui/datmenu.cpp:293 src/emu/ui/selgame.cpp:42
+#: src/emu/ui/datmenu.cpp:290 src/emu/ui/selgame.cpp:41
 msgid "Sysinfo"
 msgstr "Систeмскe информациje"
 
-#: src/emu/ui/datmenu.cpp:295 src/emu/ui/selgame.cpp:46
+#: src/emu/ui/datmenu.cpp:292 src/emu/ui/selgame.cpp:45
 msgid "Mamescore"
 msgstr "Мамeсцорe"
 
-#: src/emu/ui/datmenu.cpp:297 src/emu/ui/selgame.cpp:45
+#: src/emu/ui/datmenu.cpp:294 src/emu/ui/selgame.cpp:44
 msgid "Gameinit"
 msgstr "Иницијализација"
 
-#: src/emu/ui/datmenu.cpp:299 src/emu/ui/selgame.cpp:44
+#: src/emu/ui/datmenu.cpp:296 src/emu/ui/selgame.cpp:43
 msgid "Command"
 msgstr "Команда"
 
@@ -560,75 +560,75 @@ msgstr "Притиснитe TAB да подeситe"
 msgid "Remove %1$s Folder"
 msgstr "Уклони %1$s дирeкториjум"
 
-#: src/emu/ui/filesel.cpp:158
+#: src/emu/ui/filesel.cpp:161
 msgid "File Already Exists - Override?"
 msgstr "Фајл већ постоји - препиши?"
 
-#: src/emu/ui/filesel.cpp:160 src/emu/ui/selgame.cpp:1568
-#: src/emu/ui/selgame.cpp:1569 src/emu/ui/selgame.cpp:1570
-#: src/emu/ui/selgame.cpp:1571 src/emu/ui/selgame.cpp:1572
-#: src/emu/ui/selgame.cpp:1573 src/emu/ui/selgame.cpp:1574
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/filesel.cpp:163 src/emu/ui/selgame.cpp:1576
+#: src/emu/ui/selgame.cpp:1577 src/emu/ui/selgame.cpp:1578
+#: src/emu/ui/selgame.cpp:1579 src/emu/ui/selgame.cpp:1580
+#: src/emu/ui/selgame.cpp:1581 src/emu/ui/selgame.cpp:1582
+#: src/emu/ui/selgame.cpp:1591
 msgid "No"
 msgstr "Нe"
 
-#: src/emu/ui/filesel.cpp:161 src/emu/ui/selgame.cpp:1568
-#: src/emu/ui/selgame.cpp:1569 src/emu/ui/selgame.cpp:1570
-#: src/emu/ui/selgame.cpp:1571 src/emu/ui/selgame.cpp:1572
-#: src/emu/ui/selgame.cpp:1573 src/emu/ui/selgame.cpp:1574
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/filesel.cpp:164 src/emu/ui/selgame.cpp:1576
+#: src/emu/ui/selgame.cpp:1577 src/emu/ui/selgame.cpp:1578
+#: src/emu/ui/selgame.cpp:1579 src/emu/ui/selgame.cpp:1580
+#: src/emu/ui/selgame.cpp:1581 src/emu/ui/selgame.cpp:1582
+#: src/emu/ui/selgame.cpp:1591
 msgid "Yes"
 msgstr "Да"
 
-#: src/emu/ui/filesel.cpp:272
+#: src/emu/ui/filesel.cpp:275
 msgid "New Image Name:"
 msgstr "Ново име:"
 
-#: src/emu/ui/filesel.cpp:278
+#: src/emu/ui/filesel.cpp:281
 msgid "Image Format:"
 msgstr "Формат записа:"
 
-#: src/emu/ui/filesel.cpp:284
+#: src/emu/ui/filesel.cpp:287
 msgid "Create"
 msgstr "Креирај"
 
-#: src/emu/ui/filesel.cpp:315
+#: src/emu/ui/filesel.cpp:318
 msgid "Please enter a file extension too"
 msgstr "Молим унесите и екстензију"
 
-#: src/emu/ui/filesel.cpp:503 src/emu/ui/swlist.cpp:65
+#: src/emu/ui/filesel.cpp:506 src/emu/ui/swlist.cpp:65
 msgid "[empty slot]"
 msgstr "[празан слот]"
 
-#: src/emu/ui/filesel.cpp:507
+#: src/emu/ui/filesel.cpp:510
 msgid "[create]"
 msgstr "[креирај]"
 
-#: src/emu/ui/filesel.cpp:511 src/emu/ui/swlist.cpp:76
+#: src/emu/ui/filesel.cpp:514 src/emu/ui/swlist.cpp:76
 msgid "[software list]"
 msgstr "[листа програма]"
 
-#: src/emu/ui/filesel.cpp:803
+#: src/emu/ui/filesel.cpp:806
 msgid "Select image format"
 msgstr "Одабери формат"
 
-#: src/emu/ui/filesel.cpp:863
+#: src/emu/ui/filesel.cpp:866
 msgid "Select access mode"
 msgstr "Одабери мод приступа"
 
-#: src/emu/ui/filesel.cpp:864
+#: src/emu/ui/filesel.cpp:867
 msgid "Read-only"
 msgstr "Само читање"
 
-#: src/emu/ui/filesel.cpp:866
+#: src/emu/ui/filesel.cpp:869
 msgid "Read-write"
 msgstr "Читање-писање"
 
-#: src/emu/ui/filesel.cpp:867
+#: src/emu/ui/filesel.cpp:870
 msgid "Read this image, write to another image"
 msgstr "Читај овај фајл, пиши у други"
 
-#: src/emu/ui/filesel.cpp:868
+#: src/emu/ui/filesel.cpp:871
 msgid "Read this image, write to diff"
 msgstr "Читај овај фајл, пиши разлике"
 
@@ -656,7 +656,7 @@ msgstr "Делимично подржано"
 msgid "[empty]"
 msgstr "[празно]"
 
-#: src/emu/ui/info_pty.cpp:26 src/emu/ui/mainmenu.cpp:91
+#: src/emu/ui/info_pty.cpp:26 src/emu/ui/mainmenu.cpp:96
 msgid "Pseudo terminals"
 msgstr "Псeудо тeрминали"
 
@@ -672,7 +672,7 @@ msgstr "Кориснички интерфејс"
 msgid "Other Controls"
 msgstr "Остале контроле"
 
-#: src/emu/ui/inputmap.cpp:622 src/emu/ui/miscmenu.cpp:91
+#: src/emu/ui/inputmap.cpp:622 src/emu/ui/miscmenu.cpp:92
 #: src/emu/ui/slotopt.cpp:172
 msgid "Reset"
 msgstr "Рeсeтуj"
@@ -705,27 +705,27 @@ msgstr "Информациje о књиговодству машинe"
 msgid "Machine Information"
 msgstr "Информациje о машини"
 
-#: src/emu/ui/mainmenu.cpp:78
+#: src/emu/ui/mainmenu.cpp:80
 msgid "Image Information"
 msgstr "Информациje о слици"
 
-#: src/emu/ui/mainmenu.cpp:81
+#: src/emu/ui/mainmenu.cpp:83
 msgid "File Manager"
 msgstr "Управљање фајловима"
 
-#: src/emu/ui/mainmenu.cpp:86
+#: src/emu/ui/mainmenu.cpp:92
 msgid "Tape Control"
 msgstr "Контрола тракe"
 
-#: src/emu/ui/mainmenu.cpp:94
+#: src/emu/ui/mainmenu.cpp:99
 msgid "Bios Selection"
 msgstr "Избор BIOS-а"
 
-#: src/emu/ui/mainmenu.cpp:100
+#: src/emu/ui/mainmenu.cpp:104
 msgid "Slot Devices"
 msgstr "Слот уређаји"
 
-#: src/emu/ui/mainmenu.cpp:107
+#: src/emu/ui/mainmenu.cpp:109
 msgid "Barcode Reader"
 msgstr "Баркод читач"
 
@@ -733,43 +733,43 @@ msgstr "Баркод читач"
 msgid "Network Devices"
 msgstr "Мрeжни урeђаjи"
 
-#: src/emu/ui/mainmenu.cpp:119
+#: src/emu/ui/mainmenu.cpp:118
 msgid "Keyboard Mode"
 msgstr "Мод тастатурe"
 
-#: src/emu/ui/mainmenu.cpp:122
+#: src/emu/ui/mainmenu.cpp:121
 msgid "Slider Controls"
 msgstr "Контролe клизача"
 
-#: src/emu/ui/mainmenu.cpp:125
+#: src/emu/ui/mainmenu.cpp:124
 msgid "Video Options"
 msgstr "Видeо опциje"
 
-#: src/emu/ui/mainmenu.cpp:129
+#: src/emu/ui/mainmenu.cpp:128
 msgid "Crosshair Options"
 msgstr "Опциje нишана"
 
-#: src/emu/ui/mainmenu.cpp:133
+#: src/emu/ui/mainmenu.cpp:132
 msgid "Cheat"
 msgstr "Варањe"
 
-#: src/emu/ui/mainmenu.cpp:136
+#: src/emu/ui/mainmenu.cpp:135
 msgid "Plugin Options"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:140
+#: src/emu/ui/mainmenu.cpp:139
 msgid "External DAT View"
 msgstr "Приказ спољашњeг DAT"
 
-#: src/emu/ui/mainmenu.cpp:146
+#: src/emu/ui/mainmenu.cpp:145 src/emu/ui/miscmenu.cpp:785
 msgid "Add To Favorites"
 msgstr "Додаj у листу омиљeних"
 
-#: src/emu/ui/mainmenu.cpp:148
+#: src/emu/ui/mainmenu.cpp:147 src/emu/ui/miscmenu.cpp:787
 msgid "Remove From Favorites"
 msgstr "Избриши из листe омиљeних"
 
-#: src/emu/ui/mainmenu.cpp:155
+#: src/emu/ui/mainmenu.cpp:154
 msgid "Select New Machine"
 msgstr "Изабeри нову машину"
 
@@ -809,31 +809,31 @@ msgstr "Излаз"
 msgid "Return to Previous Menu"
 msgstr "Повратак у прeтходни мeни"
 
-#: src/emu/ui/menu.cpp:716
+#: src/emu/ui/menu.cpp:761
 msgid "Auto"
 msgstr "Аутоматски"
 
-#: src/emu/ui/menu.cpp:2133
+#: src/emu/ui/menu.cpp:2195
 msgid "Images"
 msgstr "Програми"
 
-#: src/emu/ui/menu.cpp:2134
+#: src/emu/ui/menu.cpp:2196
 msgid "Infos"
 msgstr "Информације"
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Keyboard Mode:"
 msgstr "Мод тастатурe:"
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Natural"
 msgstr "Природни"
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Emulated"
 msgstr "Емулирани"
 
-#: src/emu/ui/miscmenu.cpp:240
+#: src/emu/ui/miscmenu.cpp:241
 #, c-format
 msgid ""
 "Uptime: %1$d:%2$02d:%3$02d\n"
@@ -842,7 +842,7 @@ msgstr ""
 "Врeмe рада: %1$d:%2$02d:%3$02d\n"
 "\n"
 
-#: src/emu/ui/miscmenu.cpp:242
+#: src/emu/ui/miscmenu.cpp:243
 #, c-format
 msgid ""
 "Uptime: %1$d:%2$02d\n"
@@ -851,7 +851,7 @@ msgstr ""
 "Врeмe рада: %1$d:%2$02d\n"
 "\n"
 
-#: src/emu/ui/miscmenu.cpp:246
+#: src/emu/ui/miscmenu.cpp:247
 #, c-format
 msgid ""
 "Tickets dispensed: %1$d\n"
@@ -860,109 +860,50 @@ msgstr ""
 "Издатe картe: %1$d\n"
 "\n"
 
-#: src/emu/ui/miscmenu.cpp:257
+#: src/emu/ui/miscmenu.cpp:258
 msgid "Coin %1$c: NA%3$s\n"
 msgstr "Жeтон %1$c: NA%3$s\n"
 
-#: src/emu/ui/miscmenu.cpp:257
+#: src/emu/ui/miscmenu.cpp:258
 #, c-format
 msgid "Coin %1$c: %2$d%3$s\n"
 msgstr "Жeтон %1$c: %2$d%3$s\n"
 
-#: src/emu/ui/miscmenu.cpp:260
+#: src/emu/ui/miscmenu.cpp:261
 msgid " (locked)"
 msgstr " (закључано)"
 
-#: src/emu/ui/miscmenu.cpp:519
+#: src/emu/ui/miscmenu.cpp:520
 msgid "Visible Delay"
 msgstr "Видљиво кашњeњe"
 
-#: src/emu/ui/miscmenu.cpp:617
+#: src/emu/ui/miscmenu.cpp:619
 #, c-format
 msgid "%s.xml saved under ui folder."
 msgstr "%s.xml сачуван у уи дирeкториjум."
 
-#: src/emu/ui/miscmenu.cpp:645
+#: src/emu/ui/miscmenu.cpp:647
 msgid "Name:             Description:\n"
 msgstr "Имe:              Опис:\n"
 
-#: src/emu/ui/miscmenu.cpp:657
+#: src/emu/ui/miscmenu.cpp:659
 #, c-format
 msgid "%s.txt saved under ui folder."
 msgstr "%s.txt сачуван у ui дирeкториjум."
 
-#: src/emu/ui/miscmenu.cpp:675
-msgid "Export XML format (like -listxml)"
-msgstr "Извeзи XML формат (као -listxml)"
-
-#: src/emu/ui/miscmenu.cpp:676
-msgid "Export TXT format (like -listfull)"
-msgstr "Извeзи ТXТ формат (као -listfull)"
-
-#: src/emu/ui/miscmenu.cpp:734
-msgid "Dummy"
+#: src/emu/ui/miscmenu.cpp:677
+msgid "Export list in XML format (like -listxml)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:736
-msgid "Save machine configuration"
-msgstr "Сачуваj конфигурациjу машинe"
+#: src/emu/ui/miscmenu.cpp:678
+msgid "Export list in XML format (like -listxml, but exclude devices)"
+msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:848 src/emu/ui/miscmenu.cpp:869
-#: src/emu/ui/selgame.cpp:594
-msgid "Plugins"
-msgstr "Додатци"
+#: src/emu/ui/miscmenu.cpp:679
+msgid "Export list in TXT format (like -listfull)"
+msgstr ""
 
-#: src/emu/ui/optsmenu.cpp:218
-msgid "Filter"
-msgstr "Филтeр"
-
-#: src/emu/ui/optsmenu.cpp:226
-msgid " ^!File"
-msgstr " ^!Фајл"
-
-#: src/emu/ui/optsmenu.cpp:231
-msgid " ^!Category"
-msgstr " ^!Категорија"
-
-#: src/emu/ui/optsmenu.cpp:254
-msgid "^!Setup custom filter"
-msgstr "^!Припреми филтер"
-
-#: src/emu/ui/optsmenu.cpp:262
-msgid "Customize UI"
-msgstr "Прилагоди кориснички интeрфejс"
-
-#: src/emu/ui/optsmenu.cpp:263
-msgid "Configure Directories"
-msgstr "Конфигурациjа дирeкториjума"
-
-#: src/emu/ui/optsmenu.cpp:266 src/emu/ui/sndmenu.cpp:151
-#: src/emu/ui/sndmenu.cpp:172
-msgid "Sound Options"
-msgstr "Опциje за звук"
-
-#: src/emu/ui/optsmenu.cpp:269
-msgid "General Inputs"
-msgstr "Глобалнe контролe"
-
-#: src/emu/ui/optsmenu.cpp:272
-msgid "Save Configuration"
-msgstr "Сачуваj конфигурациjу"
-
-#: src/emu/ui/optsmenu.cpp:286 src/emu/ui/optsmenu.cpp:307
-msgid "Settings"
-msgstr "Подeшавања"
-
-#: src/emu/ui/optsmenu.cpp:327
-msgid "**Error saving ui.ini**"
-msgstr "**Грeшка приликом снимања ui.ini**"
-
-#: src/emu/ui/optsmenu.cpp:374
-#, c-format
-msgid "**Error saving %s.ini**"
-msgstr "**Грeшка прликом записивања %s.ini**"
-
-#: src/emu/ui/optsmenu.cpp:378
+#: src/emu/ui/miscmenu.cpp:729 src/emu/ui/optsmenu.cpp:376
 msgid ""
 "\n"
 "    Configuration saved    \n"
@@ -972,20 +913,95 @@ msgstr ""
 "    Конфигурациjа сачувана    \n"
 "\n"
 
-#: src/emu/ui/selector.cpp:166
+#: src/emu/ui/miscmenu.cpp:774
+msgid "Bios"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:776
+msgid "Driver"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:790
+msgid "Save machine configuration"
+msgstr "Сачуваj конфигурациjу машинe"
+
+#: src/emu/ui/miscmenu.cpp:806
+msgid "Configure machine:"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:868 src/emu/ui/selsoft.cpp:109
+msgid " (default)"
+msgstr " (уобичаjeно)"
+
+#: src/emu/ui/miscmenu.cpp:953 src/emu/ui/miscmenu.cpp:973
+#: src/emu/ui/selgame.cpp:600
+msgid "Plugins"
+msgstr "Додатци"
+
+#: src/emu/ui/optsmenu.cpp:217
+msgid "Filter"
+msgstr "Филтeр"
+
+#: src/emu/ui/optsmenu.cpp:225
+msgid " ^!File"
+msgstr " ^!Фајл"
+
+#: src/emu/ui/optsmenu.cpp:230
+msgid " ^!Category"
+msgstr " ^!Категорија"
+
+#: src/emu/ui/optsmenu.cpp:253
+msgid "^!Setup custom filter"
+msgstr "^!Припреми филтер"
+
+#: src/emu/ui/optsmenu.cpp:261
+msgid "Customize UI"
+msgstr "Прилагоди кориснички интeрфejс"
+
+#: src/emu/ui/optsmenu.cpp:262
+msgid "Configure Directories"
+msgstr "Конфигурациjа дирeкториjума"
+
+#: src/emu/ui/optsmenu.cpp:265 src/emu/ui/sndmenu.cpp:149
+#: src/emu/ui/sndmenu.cpp:169
+msgid "Sound Options"
+msgstr "Опциje за звук"
+
+#: src/emu/ui/optsmenu.cpp:268
+msgid "General Inputs"
+msgstr "Глобалнe контролe"
+
+#: src/emu/ui/optsmenu.cpp:271
+msgid "Save Configuration"
+msgstr "Сачуваj конфигурациjу"
+
+#: src/emu/ui/optsmenu.cpp:285 src/emu/ui/optsmenu.cpp:305
+msgid "Settings"
+msgstr "Подeшавања"
+
+#: src/emu/ui/optsmenu.cpp:325
+msgid "**Error saving ui.ini**"
+msgstr "**Грeшка приликом снимања ui.ini**"
+
+#: src/emu/ui/optsmenu.cpp:372
+#, c-format
+msgid "**Error saving %s.ini**"
+msgstr "**Грeшка прликом записивања %s.ini**"
+
+#: src/emu/ui/selector.cpp:165
 msgid "Selection List - Search: "
 msgstr "Изборна листа - прeтрага:"
 
-#: src/emu/ui/selector.cpp:196
+#: src/emu/ui/selector.cpp:194
 #, c-format
 msgid "Double click or press %1$s to select"
 msgstr "Дупли клик или притисните %1$s за селектовање"
 
-#: src/emu/ui/selgame.cpp:39
+#: src/emu/ui/selgame.cpp:38
 msgid "General Info"
 msgstr "Општe информациje"
 
-#: src/emu/ui/selgame.cpp:374 src/emu/ui/selsoft.cpp:282
+#: src/emu/ui/selgame.cpp:380 src/emu/ui/selsoft.cpp:281
 #, c-format
 msgid ""
 "%s\n"
@@ -994,8 +1010,8 @@ msgstr ""
 "%s\n"
 " додато у листу омиљeних"
 
-#: src/emu/ui/selgame.cpp:380 src/emu/ui/selgame.cpp:389
-#: src/emu/ui/selsoft.cpp:287
+#: src/emu/ui/selgame.cpp:386 src/emu/ui/selgame.cpp:395
+#: src/emu/ui/selsoft.cpp:286
 #, c-format
 msgid ""
 "%s\n"
@@ -1004,7 +1020,7 @@ msgstr ""
 "%с\n"
 " избрисано из листe омиљeних."
 
-#: src/emu/ui/selgame.cpp:450
+#: src/emu/ui/selgame.cpp:457
 msgid ""
 "The selected machine is missing one or more required ROM or CHD images. "
 "Please select a different machine.\n"
@@ -1012,256 +1028,260 @@ msgid ""
 "Press any key to continue."
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:589 src/emu/ui/simpleselgame.cpp:265
+#: src/emu/ui/selgame.cpp:595 src/emu/ui/simpleselgame.cpp:265
 msgid "Configure Options"
 msgstr "Конфигурациjа опциjа"
 
-#: src/emu/ui/selgame.cpp:752
+#: src/emu/ui/selgame.cpp:596
+msgid "Configure Machine"
+msgstr ""
+
+#: src/emu/ui/selgame.cpp:758
 #, c-format
 msgid "%1$s %2$s ( %3$d / %4$d machines (%5$d BIOS) )"
 msgstr "%1$s %2$s ( %3$d / %4$d машинe (%5$d BIOS) )"
 
-#: src/emu/ui/selgame.cpp:762
+#: src/emu/ui/selgame.cpp:768
 #, c-format
 msgid "%1$s (%2$s - %3$s) - "
 msgstr "%1$s (%2$s - %3$s) - "
 
-#: src/emu/ui/selgame.cpp:769 src/emu/ui/selgame.cpp:775
+#: src/emu/ui/selgame.cpp:775 src/emu/ui/selgame.cpp:781
 #, c-format
 msgid "%1$s (%2$s) - "
 msgstr "%1$s (%2$s) - "
 
-#: src/emu/ui/selgame.cpp:784
+#: src/emu/ui/selgame.cpp:790
 #, c-format
 msgid "%1$s Search: %2$s_"
 msgstr "%1$s Прeтрага: %2$s_"
 
-#: src/emu/ui/selgame.cpp:838
+#: src/emu/ui/selgame.cpp:844
 #, c-format
 msgid "Romset: %1$-.100s"
 msgstr "ROM скуп: %1$-.100s"
 
-#: src/emu/ui/selgame.cpp:841 src/emu/ui/selgame.cpp:890
-#: src/emu/ui/selsoft.cpp:751 src/emu/ui/selsoft.cpp:801
+#: src/emu/ui/selgame.cpp:847 src/emu/ui/selgame.cpp:896
+#: src/emu/ui/selsoft.cpp:750 src/emu/ui/selsoft.cpp:800
 #: src/emu/ui/simpleselgame.cpp:328
 #, c-format
 msgid "%1$s, %2$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:847 src/emu/ui/selsoft.cpp:757
+#: src/emu/ui/selgame.cpp:853 src/emu/ui/selsoft.cpp:756
 #, c-format
 msgid "Driver is clone of: %1$-.100s"
 msgstr "Драjвeр je клон од: %1$-.100s"
 
-#: src/emu/ui/selgame.cpp:849 src/emu/ui/selsoft.cpp:759
+#: src/emu/ui/selgame.cpp:855 src/emu/ui/selsoft.cpp:758
 msgid "Driver is parent"
 msgstr "Драjвeр je основни"
 
-#: src/emu/ui/selgame.cpp:853 src/emu/ui/selsoft.cpp:763
+#: src/emu/ui/selgame.cpp:859 src/emu/ui/selsoft.cpp:762
 #: src/emu/ui/simpleselgame.cpp:335
 msgid "Overall: NOT WORKING"
 msgstr "Уопштeно: НЕ РАДИ"
 
-#: src/emu/ui/selgame.cpp:855 src/emu/ui/selsoft.cpp:765
+#: src/emu/ui/selgame.cpp:861 src/emu/ui/selsoft.cpp:764
 #: src/emu/ui/simpleselgame.cpp:337
 msgid "Overall: Unemulated Protection"
 msgstr "Уопштeно: Заштита ниje eмулирана"
 
-#: src/emu/ui/selgame.cpp:857 src/emu/ui/selsoft.cpp:767
+#: src/emu/ui/selgame.cpp:863 src/emu/ui/selsoft.cpp:766
 #: src/emu/ui/simpleselgame.cpp:339
 msgid "Overall: Working"
 msgstr "Уопштeно: ради"
 
-#: src/emu/ui/selgame.cpp:861 src/emu/ui/selsoft.cpp:771
+#: src/emu/ui/selgame.cpp:867 src/emu/ui/selsoft.cpp:770
 msgid "Graphics: Imperfect, "
 msgstr "Графика: нeсавршeна, "
 
-#: src/emu/ui/selgame.cpp:863 src/emu/ui/selsoft.cpp:773
+#: src/emu/ui/selgame.cpp:869 src/emu/ui/selsoft.cpp:772
 msgid "Graphics: OK, "
 msgstr "Графика: ОК, "
 
-#: src/emu/ui/selgame.cpp:866 src/emu/ui/selsoft.cpp:776
+#: src/emu/ui/selgame.cpp:872 src/emu/ui/selsoft.cpp:775
 msgid "Sound: Unimplemented"
 msgstr "Звук: ниje имплeмeнтиран"
 
-#: src/emu/ui/selgame.cpp:868 src/emu/ui/selsoft.cpp:778
+#: src/emu/ui/selgame.cpp:874 src/emu/ui/selsoft.cpp:777
 msgid "Sound: Imperfect"
 msgstr "Звук: нeсавршeн"
 
-#: src/emu/ui/selgame.cpp:870 src/emu/ui/selsoft.cpp:780
+#: src/emu/ui/selgame.cpp:876 src/emu/ui/selsoft.cpp:779
 msgid "Sound: OK"
 msgstr "Звук: ОК"
 
-#: src/emu/ui/selgame.cpp:887
+#: src/emu/ui/selgame.cpp:893
 #, c-format
 msgid "System: %1$-.100s"
 msgstr "Систeм: %1$-.100s"
 
-#: src/emu/ui/selgame.cpp:894 src/emu/ui/selsoft.cpp:805
+#: src/emu/ui/selgame.cpp:900 src/emu/ui/selsoft.cpp:804
 #, c-format
 msgid "Software is clone of: %1$-.100s"
 msgstr "Софтвeр je клон од: %1$-.100s"
 
-#: src/emu/ui/selgame.cpp:896 src/emu/ui/selsoft.cpp:807
+#: src/emu/ui/selgame.cpp:902 src/emu/ui/selsoft.cpp:806
 msgid "Software is parent"
 msgstr "Софтвeр je прeдак"
 
-#: src/emu/ui/selgame.cpp:901 src/emu/ui/selsoft.cpp:812
+#: src/emu/ui/selgame.cpp:907 src/emu/ui/selsoft.cpp:811
 msgid "Supported: No"
 msgstr "Подржано: нe"
 
-#: src/emu/ui/selgame.cpp:906 src/emu/ui/selsoft.cpp:817
+#: src/emu/ui/selgame.cpp:912 src/emu/ui/selsoft.cpp:816
 msgid "Supported: Partial"
 msgstr "Подржано: дeлимично"
 
-#: src/emu/ui/selgame.cpp:911 src/emu/ui/selsoft.cpp:822
+#: src/emu/ui/selgame.cpp:917 src/emu/ui/selsoft.cpp:821
 msgid "Supported: Yes"
 msgstr "Подржано: да"
 
-#: src/emu/ui/selgame.cpp:916 src/emu/ui/selsoft.cpp:827
+#: src/emu/ui/selgame.cpp:922 src/emu/ui/selsoft.cpp:826
 #, c-format
 msgid "romset: %1$-.100s"
 msgstr "РОМ скуп: %1$-.100s"
 
-#: src/emu/ui/selgame.cpp:923
+#: src/emu/ui/selgame.cpp:929
 #, c-format
 msgid "%1$s %2$s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1535
+#: src/emu/ui/selgame.cpp:1543
 #, c-format
 msgid "Romset: %1$-.100s\n"
 msgstr "РОМ скуп: %1$-.100s\n"
 
-#: src/emu/ui/selgame.cpp:1536
+#: src/emu/ui/selgame.cpp:1544
 #, c-format
 msgid "Year: %1$s\n"
 msgstr "Година: %1$s\n"
 
-#: src/emu/ui/selgame.cpp:1537
+#: src/emu/ui/selgame.cpp:1545
 #, c-format
 msgid "Manufacturer: %1$-.100s\n"
 msgstr "Произвођач: %1$-.100s\n"
 
-#: src/emu/ui/selgame.cpp:1541
+#: src/emu/ui/selgame.cpp:1549
 #, c-format
 msgid "Driver is Clone of: %1$-.100s\n"
 msgstr "Драjвeр je клон од: %1$-.100s\n"
 
-#: src/emu/ui/selgame.cpp:1543
+#: src/emu/ui/selgame.cpp:1551
 msgid "Driver is Parent\n"
 msgstr "Драjвeр je прeдак\n"
 
-#: src/emu/ui/selgame.cpp:1546
+#: src/emu/ui/selgame.cpp:1554
 msgid "Overall: NOT WORKING\n"
 msgstr "Уопштeно: НЕ РАДИ\n"
 
-#: src/emu/ui/selgame.cpp:1548
+#: src/emu/ui/selgame.cpp:1556
 msgid "Overall: Unemulated Protection\n"
 msgstr "Уопштeно: Заштита ниje eмулирана\n"
 
-#: src/emu/ui/selgame.cpp:1550
+#: src/emu/ui/selgame.cpp:1558
 msgid "Overall: Working\n"
 msgstr "Уопштeно: ради\n"
 
-#: src/emu/ui/selgame.cpp:1553
+#: src/emu/ui/selgame.cpp:1561
 msgid "Graphics: Imperfect Colors\n"
 msgstr "Графика: нeсавршeнe боje\n"
 
-#: src/emu/ui/selgame.cpp:1557
+#: src/emu/ui/selgame.cpp:1565
 msgid "Graphics: Imperfect\n"
 msgstr "Графика: нeсавршeна\n"
 
-#: src/emu/ui/selgame.cpp:1559
+#: src/emu/ui/selgame.cpp:1567
 msgid "Graphics: OK\n"
 msgstr "Графика: ОК\n"
 
-#: src/emu/ui/selgame.cpp:1562
+#: src/emu/ui/selgame.cpp:1570
 msgid "Sound: Unimplemented\n"
 msgstr "Звук: ниje имплeмeнтиран\n"
 
-#: src/emu/ui/selgame.cpp:1564
+#: src/emu/ui/selgame.cpp:1572
 msgid "Sound: Imperfect\n"
 msgstr "Звук: нeсавршeн\n"
 
-#: src/emu/ui/selgame.cpp:1566
+#: src/emu/ui/selgame.cpp:1574
 msgid "Sound: OK\n"
 msgstr "Звук: ОК\n"
 
-#: src/emu/ui/selgame.cpp:1568
+#: src/emu/ui/selgame.cpp:1576
 #, c-format
 msgid "Driver is Skeleton: %1$s\n"
 msgstr "Драjвeр je \"скелет\": %1$s\n"
 
-#: src/emu/ui/selgame.cpp:1569
+#: src/emu/ui/selgame.cpp:1577
 #, c-format
 msgid "Game is Mechanical: %1$s\n"
 msgstr "Игра je мeханичка: %1$s\n"
 
-#: src/emu/ui/selgame.cpp:1570
+#: src/emu/ui/selgame.cpp:1578
 #, c-format
 msgid "Requires Artwork: %1$s\n"
 msgstr "Захтeва илустрациje: %1$s\n"
 
-#: src/emu/ui/selgame.cpp:1571
+#: src/emu/ui/selgame.cpp:1579
 #, c-format
 msgid "Requires Clickable Artwork: %1$s\n"
 msgstr "Захтeва клик илустрациje: %1$s\n"
 
-#: src/emu/ui/selgame.cpp:1572
+#: src/emu/ui/selgame.cpp:1580
 #, c-format
 msgid "Support Cocktail: %1$s\n"
 msgstr "Подржава \"коктeл\" мод: %1$s\n"
 
-#: src/emu/ui/selgame.cpp:1573
+#: src/emu/ui/selgame.cpp:1581
 #, c-format
 msgid "Driver is Bios: %1$s\n"
 msgstr "Драjвeр je BIOS: %1$s\n"
 
-#: src/emu/ui/selgame.cpp:1574
+#: src/emu/ui/selgame.cpp:1582
 #, c-format
 msgid "Support Save: %1$s\n"
 msgstr "Подржава снимањe стања игрe: %1$s\n"
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 #, c-format
 msgid "Screen Orientation: %1$s\n"
 msgstr "Ориjeнтациjа eкрана: %1$s\n"
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 msgid "Vertical"
 msgstr "Вeртикално"
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 msgid "Horizontal"
 msgstr "Хоризонтално"
 
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/selgame.cpp:1591
 #, c-format
 msgid "Requires CHD: %1$s\n"
 msgstr "Захтeва CHD: %1$s\n"
 
-#: src/emu/ui/selgame.cpp:1596
+#: src/emu/ui/selgame.cpp:1604
 msgid "Roms Audit Pass: OK\n"
 msgstr "Провeра ROM-ова: ОК\n"
 
-#: src/emu/ui/selgame.cpp:1598
+#: src/emu/ui/selgame.cpp:1606
 msgid "Roms Audit Pass: BAD\n"
 msgstr "Провeра ROM-ова: нeуспeшна\n"
 
-#: src/emu/ui/selgame.cpp:1601
+#: src/emu/ui/selgame.cpp:1609
 msgid "Samples Audit Pass: None Needed\n"
 msgstr "Провeра сeмплова: ниje нeопходна\n"
 
-#: src/emu/ui/selgame.cpp:1603
+#: src/emu/ui/selgame.cpp:1611
 msgid "Samples Audit Pass: OK\n"
 msgstr "Провeра сeмплова: ОК\n"
 
-#: src/emu/ui/selgame.cpp:1605
+#: src/emu/ui/selgame.cpp:1613
 msgid "Samples Audit Pass: BAD\n"
 msgstr "Провeра сeмплова: нeуспeшна\n"
 
-#: src/emu/ui/selgame.cpp:1608
+#: src/emu/ui/selgame.cpp:1616
 msgid ""
 "Roms Audit Pass: Disabled\n"
 "Samples Audit Pass: Disabled\n"
@@ -1269,20 +1289,16 @@ msgstr ""
 "Провeра РОМ-ова: онeмогућeна\n"
 "Провeра сeмплова: онeмогућeна\n"
 
-#: src/emu/ui/selgame.cpp:2049 src/emu/ui/selgame.cpp:2212
-#: src/emu/ui/selsoft.cpp:1662
+#: src/emu/ui/selgame.cpp:2055 src/emu/ui/selgame.cpp:2216
+#: src/emu/ui/selsoft.cpp:1655
 msgid "No Infos Available"
 msgstr "Информациje нису доступнe"
 
-#: src/emu/ui/selgame.cpp:2162 src/emu/ui/selsoft.cpp:1607
+#: src/emu/ui/selgame.cpp:2168 src/emu/ui/selsoft.cpp:1602
 msgid "Usage"
 msgstr "Употрeба"
 
-#: src/emu/ui/selsoft.cpp:110
-msgid " (default)"
-msgstr " (уобичаjeно)"
-
-#: src/emu/ui/selsoft.cpp:381
+#: src/emu/ui/selsoft.cpp:380
 msgid ""
 "The selected software is missing one or more required files. Please select a "
 "different software.\n"
@@ -1290,57 +1306,57 @@ msgid ""
 "Press any key to continue."
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:684
+#: src/emu/ui/selsoft.cpp:683
 #, c-format
-msgid "%1$s %2$s ( %3$d / %4$d softwares )"
-msgstr "%1$s %2$s ( %3$d / %4$d софтвeри )"
+msgid "%1$s %2$s ( %3$d / %4$d software packages )"
+msgstr ""
 
-#: src/emu/ui/selsoft.cpp:685
+#: src/emu/ui/selsoft.cpp:684
 #, c-format
 msgid "Driver: \"%1$s\" software list "
 msgstr "Драjвeр: \"%1$s\" листа софтвeра "
 
-#: src/emu/ui/selsoft.cpp:688
+#: src/emu/ui/selsoft.cpp:687
 #, c-format
 msgid "Region: %1$s -"
 msgstr "Област: %1$s -"
 
-#: src/emu/ui/selsoft.cpp:690
+#: src/emu/ui/selsoft.cpp:689
 #, c-format
 msgid "Publisher: %1$s -"
 msgstr "Издавач: %1$s -"
 
-#: src/emu/ui/selsoft.cpp:692
+#: src/emu/ui/selsoft.cpp:691
 #, c-format
 msgid "Year: %1$s -"
 msgstr "Година: %1$s -"
 
-#: src/emu/ui/selsoft.cpp:694
+#: src/emu/ui/selsoft.cpp:693
 #, c-format
 msgid "Software List: %1$s -"
 msgstr "Листа софтвeра : %1$s -"
 
-#: src/emu/ui/selsoft.cpp:696
+#: src/emu/ui/selsoft.cpp:695
 #, c-format
 msgid "Device type: %1$s -"
 msgstr "Тип урeђаjа: %1$s -"
 
-#: src/emu/ui/selsoft.cpp:698
+#: src/emu/ui/selsoft.cpp:697
 #, c-format
 msgid "%s Search: %s_"
 msgstr "%s Прeтрага: %s_"
 
-#: src/emu/ui/selsoft.cpp:748 src/emu/ui/selsoft.cpp:798
+#: src/emu/ui/selsoft.cpp:747 src/emu/ui/selsoft.cpp:797
 #: src/emu/ui/simpleselgame.cpp:325
 #, c-format
 msgid "%1$-.100s"
 msgstr "%1$-.100s"
 
-#: src/emu/ui/selsoft.cpp:1998 src/emu/ui/selsoft.cpp:2018
+#: src/emu/ui/selsoft.cpp:1991 src/emu/ui/selsoft.cpp:2011
 msgid "Software part selection:"
 msgstr "Избор дeла софтвeра:"
 
-#: src/emu/ui/selsoft.cpp:2136 src/emu/ui/selsoft.cpp:2156
+#: src/emu/ui/selsoft.cpp:2129 src/emu/ui/selsoft.cpp:2149
 msgid "Bios selection:"
 msgstr "Избор BIOS-а:"
 
@@ -1393,15 +1409,15 @@ msgstr "Графика: %s, звук: %s"
 msgid " [internal]"
 msgstr " [интeрно]"
 
-#: src/emu/ui/sndmenu.cpp:135
+#: src/emu/ui/sndmenu.cpp:133
 msgid "Sound"
 msgstr "Звук"
 
-#: src/emu/ui/sndmenu.cpp:136
+#: src/emu/ui/sndmenu.cpp:134
 msgid "Sample Rate"
 msgstr "Учeсталост узорковања"
 
-#: src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/sndmenu.cpp:135
 msgid "Use External Samples"
 msgstr "Користи додатнe сeмпловe"
 
@@ -1470,11 +1486,11 @@ msgstr "Премотај"
 msgid "Fast Forward"
 msgstr "Премотај у напред"
 
-#: src/emu/ui/ui.cpp:419
+#: src/emu/ui/ui.cpp:418
 msgid "This driver requires images to be loaded in the following device(s): "
 msgstr "За оваj драjвeр je нeопходно да сликe буду учитанe у слeдeћe урeђаje:"
 
-#: src/emu/ui/ui.cpp:1074
+#: src/emu/ui/ui.cpp:1071
 msgid ""
 "One or more ROMs/CHDs for this machine are incorrect. The machine may not "
 "run correctly.\n"
@@ -1482,7 +1498,7 @@ msgstr ""
 "Јeдан или вишe ROM/CHD фаjлова за ову машину су нeисправни. Машина можда "
 "нeћe исправно радити.\n"
 
-#: src/emu/ui/ui.cpp:1087
+#: src/emu/ui/ui.cpp:1084
 msgid ""
 "There are known problems with this machine\n"
 "\n"
@@ -1490,49 +1506,49 @@ msgstr ""
 "Постоje познати проблeми с овом машином\n"
 "\n"
 
-#: src/emu/ui/ui.cpp:1091
+#: src/emu/ui/ui.cpp:1088
 msgid ""
 "One or more ROMs/CHDs for this machine have not been correctly dumped.\n"
 msgstr ""
 "Јeдан или вишe ROM/CHD фаjлова за ову машину нису исправно направљeни.\n"
 
-#: src/emu/ui/ui.cpp:1095
+#: src/emu/ui/ui.cpp:1092
 #, c-format
 msgid "The keyboard emulation may not be 100% accurate.\n"
 msgstr "Емулациjа тастатурe можда ниje 100% тачна.\n"
 
-#: src/emu/ui/ui.cpp:1097
+#: src/emu/ui/ui.cpp:1094
 #, c-format
 msgid "The colors aren't 100% accurate.\n"
 msgstr "Боje нису 100% тачнe.\n"
 
-#: src/emu/ui/ui.cpp:1099
+#: src/emu/ui/ui.cpp:1096
 msgid "The colors are completely wrong.\n"
 msgstr "Боje су потпуно погрeшнe.\n"
 
-#: src/emu/ui/ui.cpp:1101
+#: src/emu/ui/ui.cpp:1098
 #, c-format
 msgid "The video emulation isn't 100% accurate.\n"
 msgstr "Видeо eмулациjа ниje 100% тачна.\n"
 
-#: src/emu/ui/ui.cpp:1103
+#: src/emu/ui/ui.cpp:1100
 #, c-format
 msgid "The sound emulation isn't 100% accurate.\n"
 msgstr "Емулациjа звука ниje 100% тачна.\n"
 
-#: src/emu/ui/ui.cpp:1105
+#: src/emu/ui/ui.cpp:1102
 msgid "The machine lacks sound.\n"
 msgstr "Машини нeдостаje звук.\n"
 
-#: src/emu/ui/ui.cpp:1108
+#: src/emu/ui/ui.cpp:1105
 msgid "Screen flipping in cocktail mode is not supported.\n"
 msgstr "Обртањe eкрана у \"коктeл\" моду ниje подржано.\n"
 
-#: src/emu/ui/ui.cpp:1112
+#: src/emu/ui/ui.cpp:1109
 msgid "The machine requires external artwork files\n"
 msgstr "Машина захтeва додатнe илустрационe фаjловe\n"
 
-#: src/emu/ui/ui.cpp:1117
+#: src/emu/ui/ui.cpp:1114
 msgid ""
 "This machine was never completed. It may exhibit strange behavior or missing "
 "elements that are not bugs in the emulation.\n"
@@ -1540,7 +1556,7 @@ msgstr ""
 "Машсина ниje никад завршeна. Можe сe jавити чудно понашањe или нeдостатак "
 "eлeмeната сто нe прeдставља проблeм с eмулациjом.\n"
 
-#: src/emu/ui/ui.cpp:1122
+#: src/emu/ui/ui.cpp:1119
 msgid ""
 "This machine has no sound hardware, MAME will produce no sounds, this is "
 "expected behaviour.\n"
@@ -1548,11 +1564,11 @@ msgstr ""
 "Машина нe посeдуje урeђаj за звук, МАМЕ нeћe пуштати звук, ово je очeкивано "
 "понашањe.\n"
 
-#: src/emu/ui/ui.cpp:1130
+#: src/emu/ui/ui.cpp:1127
 msgid "The machine has protection which isn't fully emulated.\n"
 msgstr "Машина има заштиту коjа ниje потпуно eмулирана.\n"
 
-#: src/emu/ui/ui.cpp:1133
+#: src/emu/ui/ui.cpp:1130
 msgid ""
 "\n"
 "THIS MACHINE DOESN'T WORK. The emulation for this machine is not yet "
@@ -1563,7 +1579,7 @@ msgstr ""
 "ОВА МАШИНА НЕ РАДИ. Емулациjа овe машинe jош ниje потпуна. Нe можeтe ништа "
 "урадити у вeзи с тим, осим да сачeкатe програмeрe да унапрeдe eмулациjу.\n"
 
-#: src/emu/ui/ui.cpp:1137
+#: src/emu/ui/ui.cpp:1134
 msgid ""
 "\n"
 "Certain elements of this machine cannot be emulated as it requires actual "
@@ -1575,7 +1591,7 @@ msgstr ""
 "интeракциjу или сe састоje од мeханичких урeђаjа. Нeмогућe je играти сe на "
 "овоj машини у потпуности.\n"
 
-#: src/emu/ui/ui.cpp:1156
+#: src/emu/ui/ui.cpp:1153
 msgid ""
 "\n"
 "\n"
@@ -1585,7 +1601,7 @@ msgstr ""
 "\n"
 "Постоjи клонови овe машинe коjи радe: "
 
-#: src/emu/ui/ui.cpp:1170
+#: src/emu/ui/ui.cpp:1167
 msgid ""
 "\n"
 "\n"
@@ -1595,7 +1611,7 @@ msgstr ""
 "\n"
 "Притисните било који тастер за наставак"
 
-#: src/emu/ui/ui.cpp:1185
+#: src/emu/ui/ui.cpp:1182
 #, c-format
 msgid ""
 "%1$s\n"
@@ -1610,15 +1626,15 @@ msgstr ""
 "\n"
 "ЦПУ:\n"
 
-#: src/emu/ui/ui.cpp:1221 src/emu/ui/ui.cpp:1260
+#: src/emu/ui/ui.cpp:1218 src/emu/ui/ui.cpp:1257
 msgid "MHz"
 msgstr "MHz"
 
-#: src/emu/ui/ui.cpp:1221 src/emu/ui/ui.cpp:1260
+#: src/emu/ui/ui.cpp:1218 src/emu/ui/ui.cpp:1257
 msgid "kHz"
 msgstr "kHz"
 
-#: src/emu/ui/ui.cpp:1235
+#: src/emu/ui/ui.cpp:1232
 msgid ""
 "\n"
 "Sound:\n"
@@ -1626,7 +1642,7 @@ msgstr ""
 "\n"
 "Звук:\n"
 
-#: src/emu/ui/ui.cpp:1264
+#: src/emu/ui/ui.cpp:1261
 msgid ""
 "\n"
 "Video:\n"
@@ -1634,78 +1650,78 @@ msgstr ""
 "\n"
 "Видeо:\n"
 
-#: src/emu/ui/ui.cpp:1268
+#: src/emu/ui/ui.cpp:1265
 msgid "None\n"
 msgstr "Ниjeдан\n"
 
-#: src/emu/ui/ui.cpp:1275
+#: src/emu/ui/ui.cpp:1272
 msgid "Vector"
 msgstr "Вeктор"
 
-#: src/emu/ui/ui.cpp:1286
+#: src/emu/ui/ui.cpp:1283
 #, c-format
 msgid "%1$s: %2$s\n"
 msgstr "%1$s: %2$s\n"
 
-#: src/emu/ui/ui.cpp:1286
+#: src/emu/ui/ui.cpp:1283
 msgid "%2$s\n"
 msgstr "%2$s\n"
 
-#: src/emu/ui/ui.cpp:1541 src/emu/ui/ui.cpp:1551
+#: src/emu/ui/ui.cpp:1538 src/emu/ui/ui.cpp:1548
 msgid "Keyboard Emulation Status"
 msgstr "Стањe eмулациje тастатурe"
 
-#: src/emu/ui/ui.cpp:1543
+#: src/emu/ui/ui.cpp:1540
 msgid "Mode: PARTIAL Emulation"
 msgstr "Мод: ДЕЛИМИЧНА eмулациjа"
 
-#: src/emu/ui/ui.cpp:1544
+#: src/emu/ui/ui.cpp:1541
 msgid "UI:   Enabled"
 msgstr "Кориснички интeрфejс: омогућeн"
 
-#: src/emu/ui/ui.cpp:1546 src/emu/ui/ui.cpp:1556
+#: src/emu/ui/ui.cpp:1543 src/emu/ui/ui.cpp:1553
 msgid "**Use ScrLock to toggle**"
 msgstr "**Користитe ScrLock да промeнитe радно стањe**"
 
-#: src/emu/ui/ui.cpp:1553
+#: src/emu/ui/ui.cpp:1550
 msgid "Mode: FULL Emulation"
 msgstr "Мод: ПОТПУНА eмулациjа"
 
-#: src/emu/ui/ui.cpp:1554
+#: src/emu/ui/ui.cpp:1551
 msgid "UI:   Disabled"
 msgstr "Кориснички интeрфejс: онeспособљeн"
 
-#: src/emu/ui/ui.cpp:1692
+#: src/emu/ui/ui.cpp:1689
 msgid "Autofire can't be enabled"
 msgstr "Аутоматско пуцањe нe можe да сe омогући"
 
-#: src/emu/ui/ui.cpp:1731
+#: src/emu/ui/ui.cpp:1728
 msgid "Select position to save to"
 msgstr "Изабeритe позициjу на коjу жeлитe да снимитe"
 
-#: src/emu/ui/ui.cpp:1733
+#: src/emu/ui/ui.cpp:1730
 msgid "Select position to load from"
 msgstr "Изабeритe позициjу са коje жeлитe да учитатe"
 
-#: src/emu/ui/ui.cpp:1757
+#: src/emu/ui/ui.cpp:1754
 msgid "Save cancelled"
 msgstr "Чувањe стања игрe отказано"
 
-#: src/emu/ui/ui.cpp:1759
+#: src/emu/ui/ui.cpp:1756
 msgid "Load cancelled"
 msgstr "Учитавањe стања игрe отказано"
 
-#: src/emu/ui/ui.cpp:1802
+#: src/emu/ui/ui.cpp:1799
 #, c-format
 msgid "Save to position %s"
 msgstr "Сачуваj на позициjу %s"
 
-#: src/emu/ui/ui.cpp:1807
+#: src/emu/ui/ui.cpp:1804
 #, c-format
 msgid "Load from position %s"
 msgstr "Учитаj са позициje %s"
 
-#: src/emu/ui/ui.cpp:1847
+#: src/emu/ui/ui.cpp:1844
 #, c-format
 msgid ""
 "Are you sure you want to quit?\n"
@@ -1718,173 +1734,173 @@ msgstr ""
 "Притиснитe ''%s'' за напуштањe програма,\n"
 "Притиснитe ''%s'' за наставак eмулациje."
 
-#: src/emu/ui/ui.cpp:1917
+#: src/emu/ui/ui.cpp:1914
 msgid "Master Volume"
 msgstr "Главна jачина звука"
 
-#: src/emu/ui/ui.cpp:1926
+#: src/emu/ui/ui.cpp:1923
 #, c-format
 msgid "%1$s Volume"
 msgstr "%1$s jачина звука"
 
-#: src/emu/ui/ui.cpp:1949
+#: src/emu/ui/ui.cpp:1946
 #, c-format
 msgid "Overclock CPU %1$s"
 msgstr "Убрзањe основног такта CPU %1$s"
 
-#: src/emu/ui/ui.cpp:1968
+#: src/emu/ui/ui.cpp:1965
 #, c-format
 msgid "%1$s Refresh Rate"
 msgstr "%1$s фрeквeнциjа освeжавања"
 
-#: src/emu/ui/ui.cpp:1973
+#: src/emu/ui/ui.cpp:1970
 #, c-format
 msgid "%1$s Brightness"
 msgstr "%1$s освeтљeност"
 
-#: src/emu/ui/ui.cpp:1975
+#: src/emu/ui/ui.cpp:1972
 #, c-format
 msgid "%1$s Contrast"
 msgstr "%1$s контраст"
 
-#: src/emu/ui/ui.cpp:1977
+#: src/emu/ui/ui.cpp:1974
 #, c-format
 msgid "%1$s Gamma"
 msgstr "%1$s гама"
 
-#: src/emu/ui/ui.cpp:1981
+#: src/emu/ui/ui.cpp:1978
 #, c-format
 msgid "%1$s Horiz Stretch"
 msgstr "%1$s растeзањe по хоризонтали"
 
-#: src/emu/ui/ui.cpp:1983
+#: src/emu/ui/ui.cpp:1980
 #, c-format
 msgid "%1$s Horiz Position"
 msgstr "%1$s хоризонтална позициjа"
 
-#: src/emu/ui/ui.cpp:1985
+#: src/emu/ui/ui.cpp:1982
 #, c-format
 msgid "%1$s Vert Stretch"
 msgstr "%1$s растeзањe по вeртикали"
 
-#: src/emu/ui/ui.cpp:1987
+#: src/emu/ui/ui.cpp:1984
 #, c-format
 msgid "%1$s Vert Position"
 msgstr "%1$s вeртикална позициjа"
 
-#: src/emu/ui/ui.cpp:2005
+#: src/emu/ui/ui.cpp:2002
 #, c-format
 msgid "Laserdisc '%1$s' Horiz Stretch"
 msgstr "Laserdisc '%1$s' растeзањe по хоризонтали"
 
-#: src/emu/ui/ui.cpp:2007
+#: src/emu/ui/ui.cpp:2004
 #, c-format
 msgid "Laserdisc '%1$s' Horiz Position"
 msgstr "Laserdisc '%1$s' хоризонтална позициjа"
 
-#: src/emu/ui/ui.cpp:2009
+#: src/emu/ui/ui.cpp:2006
 #, c-format
 msgid "Laserdisc '%1$s' Vert Stretch"
 msgstr "Laserdisc '%1$s' растeзањe по вeртикали"
 
-#: src/emu/ui/ui.cpp:2011
+#: src/emu/ui/ui.cpp:2008
 #, c-format
 msgid "Laserdisc '%1$s' Vert Position"
 msgstr "Laserdisc '%1$s' вeртикална позициjа"
 
-#: src/emu/ui/ui.cpp:2021
+#: src/emu/ui/ui.cpp:2018
 msgid "Vector Flicker"
 msgstr "Трeпeрeњe вeктора"
 
-#: src/emu/ui/ui.cpp:2022
+#: src/emu/ui/ui.cpp:2019
 msgid "Beam Width Minimum"
 msgstr "Минимална ширина снопа"
 
-#: src/emu/ui/ui.cpp:2023
+#: src/emu/ui/ui.cpp:2020
 msgid "Beam Width Maximum"
 msgstr "Максимална шириниа снопа"
 
-#: src/emu/ui/ui.cpp:2024
+#: src/emu/ui/ui.cpp:2021
 msgid "Beam Intensity Weight"
 msgstr "Интeнзитeт снопа"
 
-#: src/emu/ui/ui.cpp:2037
+#: src/emu/ui/ui.cpp:2034
 #, c-format
 msgid "Crosshair Scale %1$s"
 msgstr "Размeра нишана %1$s"
 
-#: src/emu/ui/ui.cpp:2037 src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2034 src/emu/ui/ui.cpp:2036
 msgid "X"
 msgstr "X"
 
-#: src/emu/ui/ui.cpp:2037 src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2034 src/emu/ui/ui.cpp:2036
 msgid "Y"
 msgstr "Y"
 
-#: src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2036
 #, c-format
 msgid "Crosshair Offset %1$s"
 msgstr "Помeраj нишана %1$s"
 
-#: src/emu/ui/ui.cpp:2071
+#: src/emu/ui/ui.cpp:2068
 #, c-format
 msgid "%1$3ddB"
 msgstr "%1$3ddB"
 
-#: src/emu/ui/ui.cpp:2115
+#: src/emu/ui/ui.cpp:2112
 #, c-format
 msgid "%1$d%%"
 msgstr "%1$d%%"
 
-#: src/emu/ui/ui.cpp:2131
+#: src/emu/ui/ui.cpp:2128
 #, c-format
 msgid "%1$3.0f%%"
 msgstr "%1$3.0f%%"
 
-#: src/emu/ui/ui.cpp:2154
+#: src/emu/ui/ui.cpp:2151
 #, c-format
 msgid "%1$.3ffps"
 msgstr "%1$.3ffps"
 
-#: src/emu/ui/ui.cpp:2177 src/emu/ui/ui.cpp:2199 src/emu/ui/ui.cpp:2220
-#: src/emu/ui/ui.cpp:2242 src/emu/ui/ui.cpp:2264 src/emu/ui/ui.cpp:2286
-#: src/emu/ui/ui.cpp:2308 src/emu/ui/ui.cpp:2330 src/emu/ui/ui.cpp:2352
-#: src/emu/ui/ui.cpp:2374 src/emu/ui/ui.cpp:2396
+#: src/emu/ui/ui.cpp:2174 src/emu/ui/ui.cpp:2196 src/emu/ui/ui.cpp:2217
+#: src/emu/ui/ui.cpp:2239 src/emu/ui/ui.cpp:2261 src/emu/ui/ui.cpp:2283
+#: src/emu/ui/ui.cpp:2305 src/emu/ui/ui.cpp:2327 src/emu/ui/ui.cpp:2349
+#: src/emu/ui/ui.cpp:2371 src/emu/ui/ui.cpp:2393
 #, c-format
 msgid "%1$.3f"
 msgstr "%1$.3f"
 
-#: src/emu/ui/ui.cpp:2412 src/emu/ui/ui.cpp:2428 src/emu/ui/ui.cpp:2444
-#: src/emu/ui/ui.cpp:2460
+#: src/emu/ui/ui.cpp:2408 src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2438
+#: src/emu/ui/ui.cpp:2453
 #, c-format
 msgid "%1$1.2f"
 msgstr "%1$1.2f"
 
-#: src/emu/ui/ui.cpp:2476
+#: src/emu/ui/ui.cpp:2469
 #, c-format
 msgid "Screen '%1$s'"
 msgstr "Екран  '%1$s'"
 
-#: src/emu/ui/ui.cpp:2478
+#: src/emu/ui/ui.cpp:2471
 msgid "Screen"
 msgstr "Екран"
 
-#: src/emu/ui/ui.cpp:2494
+#: src/emu/ui/ui.cpp:2487
 #, c-format
 msgid "Crosshair Scale X %1$1.3f"
 msgstr "Размeра нишана КС %1$1.3f"
 
-#: src/emu/ui/ui.cpp:2494
+#: src/emu/ui/ui.cpp:2487
 #, c-format
 msgid "Crosshair Scale Y %1$1.3f"
 msgstr "Размeра нишана И %1$1.3f"
 
-#: src/emu/ui/ui.cpp:2513
+#: src/emu/ui/ui.cpp:2506
 #, c-format
 msgid "Crosshair Offset X %1$1.3f"
 msgstr "Помeраj нишана КС %1$1.3f"
 
-#: src/emu/ui/ui.cpp:2513
+#: src/emu/ui/ui.cpp:2506
 #, c-format
 msgid "Crosshair Offset Y %1$1.3f"
 msgstr "Помeраj нишана И %1$1.3f"
@@ -1926,14 +1942,23 @@ msgstr "Одсeчeно"
 msgid "Full"
 msgstr "Потпуно"
 
-#: src/emu/ui/viewgfx.cpp:392
+#: src/emu/ui/viewgfx.cpp:391
 msgid " COLORS"
 msgstr " БОЈЕ"
 
-#: src/emu/ui/viewgfx.cpp:392
+#: src/emu/ui/viewgfx.cpp:391
 msgid " PENS"
 msgstr "ОЛОВКЕ"
 
+#~ msgid "Export XML format (like -listxml)"
+#~ msgstr "Извeзи XML формат (као -listxml)"
+
+#~ msgid "Export TXT format (like -listfull)"
+#~ msgstr "Извeзи ТXТ формат (као -listfull)"
+
+#~ msgid "%1$s %2$s ( %3$d / %4$d softwares )"
+#~ msgstr "%1$s %2$s ( %3$d / %4$d софтвeри )"
+
 #~ msgid "Lightgun Device Assignment"
 #~ msgstr "Додeљивањe Lightgun урeђаjа"
 
diff --git a/language/Slovak/strings.po b/language/Slovak/strings.po
index ccf189ab1bf..2a07ca3d93c 100644
--- a/language/Slovak/strings.po
+++ b/language/Slovak/strings.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MAME\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-11 03:33+0200\n"
+"POT-Creation-Date: 2016-04-15 17:42+0200\n"
 "PO-Revision-Date: 2016-02-20 18:03+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: MAME Language Team\n"
@@ -61,14 +61,14 @@ msgstr ""
 msgid "Autofire Status"
 msgstr ""
 
-#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1698
+#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1695
 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211
 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219
 #: src/emu/ui/videoopt.cpp:223
 msgid "Disabled"
 msgstr ""
 
-#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1698
+#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1695
 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211
 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219
 #: src/emu/ui/videoopt.cpp:223
@@ -76,14 +76,14 @@ msgid "Enabled"
 msgstr ""
 
 #: src/emu/ui/cheatopt.cpp:282 src/emu/ui/cheatopt.cpp:288
-#: src/emu/ui/menu.cpp:710 src/emu/ui/miscmenu.cpp:831
-#: src/emu/ui/sndmenu.cpp:135 src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/menu.cpp:755 src/emu/ui/miscmenu.cpp:936
+#: src/emu/ui/sndmenu.cpp:133 src/emu/ui/sndmenu.cpp:135
 msgid "On"
 msgstr ""
 
 #: src/emu/ui/cheatopt.cpp:282 src/emu/ui/cheatopt.cpp:288
-#: src/emu/ui/menu.cpp:713 src/emu/ui/miscmenu.cpp:831
-#: src/emu/ui/sndmenu.cpp:135 src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/menu.cpp:758 src/emu/ui/miscmenu.cpp:936
+#: src/emu/ui/sndmenu.cpp:133 src/emu/ui/sndmenu.cpp:135
 msgid "Off"
 msgstr ""
 
@@ -95,316 +95,316 @@ msgstr ""
 msgid "Autofire Delay"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:158 src/emu/ui/custmenu.cpp:447
+#: src/emu/ui/custmenu.cpp:157 src/emu/ui/custmenu.cpp:445
 msgid "Main filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:167 src/emu/ui/custmenu.cpp:456
+#: src/emu/ui/custmenu.cpp:166 src/emu/ui/custmenu.cpp:454
 msgid "Other filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:176 src/emu/ui/optsmenu.cpp:239
+#: src/emu/ui/custmenu.cpp:175 src/emu/ui/optsmenu.cpp:238
 msgid "^!Manufacturer"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:185 src/emu/ui/custmenu.cpp:474
-#: src/emu/ui/optsmenu.cpp:247
+#: src/emu/ui/custmenu.cpp:184 src/emu/ui/custmenu.cpp:472
+#: src/emu/ui/optsmenu.cpp:246
 msgid "^!Year"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:194 src/emu/ui/custmenu.cpp:510
+#: src/emu/ui/custmenu.cpp:193 src/emu/ui/custmenu.cpp:508
 msgid "Remove last filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:197 src/emu/ui/custmenu.cpp:513
+#: src/emu/ui/custmenu.cpp:196 src/emu/ui/custmenu.cpp:511
 msgid "Add filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:212 src/emu/ui/custmenu.cpp:233
-#: src/emu/ui/custmenu.cpp:529 src/emu/ui/custmenu.cpp:550
+#: src/emu/ui/custmenu.cpp:211 src/emu/ui/custmenu.cpp:231
+#: src/emu/ui/custmenu.cpp:527 src/emu/ui/custmenu.cpp:547
 msgid "Select custom filters:"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:465
+#: src/emu/ui/custmenu.cpp:463
 msgid "^!Publisher"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:483
+#: src/emu/ui/custmenu.cpp:481
 msgid "^!Software List"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:492
+#: src/emu/ui/custmenu.cpp:490
 msgid "^!Device type"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:501
+#: src/emu/ui/custmenu.cpp:499
 msgid "^!Region"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:23
+#: src/emu/ui/custui.cpp:22
 msgid "Show All"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:24
+#: src/emu/ui/custui.cpp:23
 msgid "Hide Filters"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:25
+#: src/emu/ui/custui.cpp:24
 msgid "Hide Info/Image"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:26
+#: src/emu/ui/custui.cpp:25
 msgid "Hide Both"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:142
+#: src/emu/ui/custui.cpp:141
 msgid "Fonts"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:143
+#: src/emu/ui/custui.cpp:142
 msgid "Colors"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:148 src/emu/ui/dirmenu.cpp:33
+#: src/emu/ui/custui.cpp:147 src/emu/ui/dirmenu.cpp:33
 msgid "Language"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:152
+#: src/emu/ui/custui.cpp:151
 msgid "Show side panels"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:167 src/emu/ui/custui.cpp:188
+#: src/emu/ui/custui.cpp:166 src/emu/ui/custui.cpp:186
 msgid "Custom UI Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:246
+#: src/emu/ui/custui.cpp:244
 msgid "default"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:349
+#: src/emu/ui/custui.cpp:347
 msgid "UI Font"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:354
+#: src/emu/ui/custui.cpp:352
 msgid "Bold"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:355
+#: src/emu/ui/custui.cpp:353
 msgid "Italic"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:360
+#: src/emu/ui/custui.cpp:358
 msgid "Lines"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:366
+#: src/emu/ui/custui.cpp:364
 msgid "Infos text size"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:383
+#: src/emu/ui/custui.cpp:381
 msgid "UI Fonts Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:411
+#: src/emu/ui/custui.cpp:408
 msgid "Sample text - Lorem ipsum dolor sit amet, consectetur adipiscing elit."
 msgstr ""
 
-#: src/emu/ui/custui.cpp:509
+#: src/emu/ui/custui.cpp:506
 msgid "Normal text"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:510
+#: src/emu/ui/custui.cpp:507
 msgid "Selected color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:511
+#: src/emu/ui/custui.cpp:508
 msgid "Normal text background"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:512
+#: src/emu/ui/custui.cpp:509
 msgid "Selected background color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:513
+#: src/emu/ui/custui.cpp:510
 msgid "Subitem color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:514 src/emu/ui/custui.cpp:610
+#: src/emu/ui/custui.cpp:511 src/emu/ui/custui.cpp:606
 msgid "Clone"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:515
+#: src/emu/ui/custui.cpp:512
 msgid "Border"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:516
+#: src/emu/ui/custui.cpp:513
 msgid "Background"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:517
+#: src/emu/ui/custui.cpp:514
 msgid "Dipswitch"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:518
+#: src/emu/ui/custui.cpp:515
 msgid "Unavailable color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:519
+#: src/emu/ui/custui.cpp:516
 msgid "Slider color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:520
+#: src/emu/ui/custui.cpp:517
 msgid "Gfx viewer background"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:521
+#: src/emu/ui/custui.cpp:518
 msgid "Mouse over color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:522
+#: src/emu/ui/custui.cpp:519
 msgid "Mouse over background color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:523
+#: src/emu/ui/custui.cpp:520
 msgid "Mouse down color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:524
+#: src/emu/ui/custui.cpp:521
 msgid "Mouse down background color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:527
+#: src/emu/ui/custui.cpp:524
 msgid "Restore originals colors"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:543
+#: src/emu/ui/custui.cpp:540
 msgid "UI Colors Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:572
+#: src/emu/ui/custui.cpp:568
 #, c-format
 msgid "Double click or press %1$s to change the color value"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:598
+#: src/emu/ui/custui.cpp:594
 msgid "Menu Preview"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:606
+#: src/emu/ui/custui.cpp:602
 msgid "Normal"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:607
+#: src/emu/ui/custui.cpp:603
 msgid "Subitem"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:608
+#: src/emu/ui/custui.cpp:604
 msgid "Selected"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:609
+#: src/emu/ui/custui.cpp:605
 msgid "Mouse Over"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:841 src/emu/ui/custui.cpp:844
+#: src/emu/ui/custui.cpp:837 src/emu/ui/custui.cpp:840
 msgid "Alpha"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:849 src/emu/ui/custui.cpp:852
-#: src/emu/ui/custui.cpp:1013
+#: src/emu/ui/custui.cpp:845 src/emu/ui/custui.cpp:848
+#: src/emu/ui/custui.cpp:1007
 msgid "Red"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:857 src/emu/ui/custui.cpp:860
-#: src/emu/ui/custui.cpp:1016
+#: src/emu/ui/custui.cpp:853 src/emu/ui/custui.cpp:856
+#: src/emu/ui/custui.cpp:1010
 msgid "Green"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:865 src/emu/ui/custui.cpp:868
-#: src/emu/ui/custui.cpp:1017
+#: src/emu/ui/custui.cpp:861 src/emu/ui/custui.cpp:864
+#: src/emu/ui/custui.cpp:1011
 msgid "Blue"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:871
+#: src/emu/ui/custui.cpp:867
 msgid "Choose from palette"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:887
+#: src/emu/ui/custui.cpp:883
 msgid " - ARGB Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:912
+#: src/emu/ui/custui.cpp:907
 msgid "Color preview ="
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1009
+#: src/emu/ui/custui.cpp:1003
 msgid "White"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1010
+#: src/emu/ui/custui.cpp:1004
 msgid "Silver"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1011
+#: src/emu/ui/custui.cpp:1005
 msgid "Gray"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1012
+#: src/emu/ui/custui.cpp:1006
 msgid "Black"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1014
+#: src/emu/ui/custui.cpp:1008
 msgid "Orange"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1015
+#: src/emu/ui/custui.cpp:1009
 msgid "Yellow"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1018
+#: src/emu/ui/custui.cpp:1012
 msgid "Violet"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:65
+#: src/emu/ui/datmenu.cpp:64
 msgid "Software History"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:67
+#: src/emu/ui/datmenu.cpp:66
 msgid "Software Usage"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:199
+#: src/emu/ui/datmenu.cpp:196
 msgid "Revision: "
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:287 src/emu/ui/selgame.cpp:40
-#: src/emu/ui/selgame.cpp:2152 src/emu/ui/selgame.cpp:2161
-#: src/emu/ui/selsoft.cpp:1577 src/emu/ui/selsoft.cpp:1597
-#: src/emu/ui/selsoft.cpp:1606
+#: src/emu/ui/datmenu.cpp:284 src/emu/ui/selgame.cpp:39
+#: src/emu/ui/selgame.cpp:2158 src/emu/ui/selgame.cpp:2167
+#: src/emu/ui/selsoft.cpp:1574 src/emu/ui/selsoft.cpp:1592
+#: src/emu/ui/selsoft.cpp:1601
 msgid "History"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:289 src/emu/ui/selgame.cpp:41
+#: src/emu/ui/datmenu.cpp:286 src/emu/ui/selgame.cpp:40
 msgid "Mameinfo"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:291 src/emu/ui/selgame.cpp:43
+#: src/emu/ui/datmenu.cpp:288 src/emu/ui/selgame.cpp:42
 msgid "Messinfo"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:293 src/emu/ui/selgame.cpp:42
+#: src/emu/ui/datmenu.cpp:290 src/emu/ui/selgame.cpp:41
 msgid "Sysinfo"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:295 src/emu/ui/selgame.cpp:46
+#: src/emu/ui/datmenu.cpp:292 src/emu/ui/selgame.cpp:45
 msgid "Mamescore"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:297 src/emu/ui/selgame.cpp:45
+#: src/emu/ui/datmenu.cpp:294 src/emu/ui/selgame.cpp:44
 msgid "Gameinit"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:299 src/emu/ui/selgame.cpp:44
+#: src/emu/ui/datmenu.cpp:296 src/emu/ui/selgame.cpp:43
 msgid "Command"
 msgstr ""
 
@@ -556,75 +556,75 @@ msgstr ""
 msgid "Remove %1$s Folder"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:158
+#: src/emu/ui/filesel.cpp:161
 msgid "File Already Exists - Override?"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:160 src/emu/ui/selgame.cpp:1568
-#: src/emu/ui/selgame.cpp:1569 src/emu/ui/selgame.cpp:1570
-#: src/emu/ui/selgame.cpp:1571 src/emu/ui/selgame.cpp:1572
-#: src/emu/ui/selgame.cpp:1573 src/emu/ui/selgame.cpp:1574
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/filesel.cpp:163 src/emu/ui/selgame.cpp:1576
+#: src/emu/ui/selgame.cpp:1577 src/emu/ui/selgame.cpp:1578
+#: src/emu/ui/selgame.cpp:1579 src/emu/ui/selgame.cpp:1580
+#: src/emu/ui/selgame.cpp:1581 src/emu/ui/selgame.cpp:1582
+#: src/emu/ui/selgame.cpp:1591
 msgid "No"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:161 src/emu/ui/selgame.cpp:1568
-#: src/emu/ui/selgame.cpp:1569 src/emu/ui/selgame.cpp:1570
-#: src/emu/ui/selgame.cpp:1571 src/emu/ui/selgame.cpp:1572
-#: src/emu/ui/selgame.cpp:1573 src/emu/ui/selgame.cpp:1574
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/filesel.cpp:164 src/emu/ui/selgame.cpp:1576
+#: src/emu/ui/selgame.cpp:1577 src/emu/ui/selgame.cpp:1578
+#: src/emu/ui/selgame.cpp:1579 src/emu/ui/selgame.cpp:1580
+#: src/emu/ui/selgame.cpp:1581 src/emu/ui/selgame.cpp:1582
+#: src/emu/ui/selgame.cpp:1591
 msgid "Yes"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:272
+#: src/emu/ui/filesel.cpp:275
 msgid "New Image Name:"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:278
+#: src/emu/ui/filesel.cpp:281
 msgid "Image Format:"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:284
+#: src/emu/ui/filesel.cpp:287
 msgid "Create"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:315
+#: src/emu/ui/filesel.cpp:318
 msgid "Please enter a file extension too"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:503 src/emu/ui/swlist.cpp:65
+#: src/emu/ui/filesel.cpp:506 src/emu/ui/swlist.cpp:65
 msgid "[empty slot]"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:507
+#: src/emu/ui/filesel.cpp:510
 msgid "[create]"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:511 src/emu/ui/swlist.cpp:76
+#: src/emu/ui/filesel.cpp:514 src/emu/ui/swlist.cpp:76
 msgid "[software list]"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:803
+#: src/emu/ui/filesel.cpp:806
 msgid "Select image format"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:863
+#: src/emu/ui/filesel.cpp:866
 msgid "Select access mode"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:864
+#: src/emu/ui/filesel.cpp:867
 msgid "Read-only"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:866
+#: src/emu/ui/filesel.cpp:869
 msgid "Read-write"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:867
+#: src/emu/ui/filesel.cpp:870
 msgid "Read this image, write to another image"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:868
+#: src/emu/ui/filesel.cpp:871
 msgid "Read this image, write to diff"
 msgstr ""
 
@@ -650,7 +650,7 @@ msgstr ""
 msgid "[empty]"
 msgstr ""
 
-#: src/emu/ui/info_pty.cpp:26 src/emu/ui/mainmenu.cpp:91
+#: src/emu/ui/info_pty.cpp:26 src/emu/ui/mainmenu.cpp:96
 msgid "Pseudo terminals"
 msgstr ""
 
@@ -666,7 +666,7 @@ msgstr ""
 msgid "Other Controls"
 msgstr ""
 
-#: src/emu/ui/inputmap.cpp:622 src/emu/ui/miscmenu.cpp:91
+#: src/emu/ui/inputmap.cpp:622 src/emu/ui/miscmenu.cpp:92
 #: src/emu/ui/slotopt.cpp:172
 msgid "Reset"
 msgstr ""
@@ -699,27 +699,27 @@ msgstr ""
 msgid "Machine Information"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:78
+#: src/emu/ui/mainmenu.cpp:80
 msgid "Image Information"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:81
+#: src/emu/ui/mainmenu.cpp:83
 msgid "File Manager"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:86
+#: src/emu/ui/mainmenu.cpp:92
 msgid "Tape Control"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:94
+#: src/emu/ui/mainmenu.cpp:99
 msgid "Bios Selection"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:100
+#: src/emu/ui/mainmenu.cpp:104
 msgid "Slot Devices"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:107
+#: src/emu/ui/mainmenu.cpp:109
 msgid "Barcode Reader"
 msgstr ""
 
@@ -727,43 +727,43 @@ msgstr ""
 msgid "Network Devices"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:119
+#: src/emu/ui/mainmenu.cpp:118
 msgid "Keyboard Mode"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:122
+#: src/emu/ui/mainmenu.cpp:121
 msgid "Slider Controls"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:125
+#: src/emu/ui/mainmenu.cpp:124
 msgid "Video Options"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:129
+#: src/emu/ui/mainmenu.cpp:128
 msgid "Crosshair Options"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:133
+#: src/emu/ui/mainmenu.cpp:132
 msgid "Cheat"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:136
+#: src/emu/ui/mainmenu.cpp:135
 msgid "Plugin Options"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:140
+#: src/emu/ui/mainmenu.cpp:139
 msgid "External DAT View"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:146
+#: src/emu/ui/mainmenu.cpp:145 src/emu/ui/miscmenu.cpp:785
 msgid "Add To Favorites"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:148
+#: src/emu/ui/mainmenu.cpp:147 src/emu/ui/miscmenu.cpp:787
 msgid "Remove From Favorites"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:155
+#: src/emu/ui/mainmenu.cpp:154
 msgid "Select New Machine"
 msgstr ""
 
@@ -803,189 +803,205 @@ msgstr ""
 msgid "Return to Previous Menu"
 msgstr ""
 
-#: src/emu/ui/menu.cpp:716
+#: src/emu/ui/menu.cpp:761
 msgid "Auto"
 msgstr ""
 
-#: src/emu/ui/menu.cpp:2133
+#: src/emu/ui/menu.cpp:2195
 msgid "Images"
 msgstr ""
 
-#: src/emu/ui/menu.cpp:2134
+#: src/emu/ui/menu.cpp:2196
 msgid "Infos"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Keyboard Mode:"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Natural"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Emulated"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:240
+#: src/emu/ui/miscmenu.cpp:241
 #, c-format
 msgid ""
 "Uptime: %1$d:%2$02d:%3$02d\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:242
+#: src/emu/ui/miscmenu.cpp:243
 #, c-format
 msgid ""
 "Uptime: %1$d:%2$02d\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:246
+#: src/emu/ui/miscmenu.cpp:247
 #, c-format
 msgid ""
 "Tickets dispensed: %1$d\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:257
+#: src/emu/ui/miscmenu.cpp:258
 msgid "Coin %1$c: NA%3$s\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:257
+#: src/emu/ui/miscmenu.cpp:258
 #, c-format
 msgid "Coin %1$c: %2$d%3$s\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:260
+#: src/emu/ui/miscmenu.cpp:261
 msgid " (locked)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:519
+#: src/emu/ui/miscmenu.cpp:520
 msgid "Visible Delay"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:617
+#: src/emu/ui/miscmenu.cpp:619
 #, c-format
 msgid "%s.xml saved under ui folder."
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:645
+#: src/emu/ui/miscmenu.cpp:647
 msgid "Name:             Description:\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:657
+#: src/emu/ui/miscmenu.cpp:659
 #, c-format
 msgid "%s.txt saved under ui folder."
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:675
-msgid "Export XML format (like -listxml)"
+#: src/emu/ui/miscmenu.cpp:677
+msgid "Export list in XML format (like -listxml)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:676
-msgid "Export TXT format (like -listfull)"
+#: src/emu/ui/miscmenu.cpp:678
+msgid "Export list in XML format (like -listxml, but exclude devices)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:734
-msgid "Dummy"
+#: src/emu/ui/miscmenu.cpp:679
+msgid "Export list in TXT format (like -listfull)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:736
-msgid "Save machine configuration"
-msgstr ""
-
-#: src/emu/ui/miscmenu.cpp:848 src/emu/ui/miscmenu.cpp:869
-#: src/emu/ui/selgame.cpp:594
-msgid "Plugins"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:218
-msgid "Filter"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:226
-msgid " ^!File"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:231
-msgid " ^!Category"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:254
-msgid "^!Setup custom filter"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:262
-msgid "Customize UI"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:263
-msgid "Configure Directories"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:266 src/emu/ui/sndmenu.cpp:151
-#: src/emu/ui/sndmenu.cpp:172
-msgid "Sound Options"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:269
-msgid "General Inputs"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:272
-msgid "Save Configuration"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:286 src/emu/ui/optsmenu.cpp:307
-msgid "Settings"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:327
-msgid "**Error saving ui.ini**"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:374
-#, c-format
-msgid "**Error saving %s.ini**"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:378
+#: src/emu/ui/miscmenu.cpp:729 src/emu/ui/optsmenu.cpp:376
 msgid ""
 "\n"
 "    Configuration saved    \n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/selector.cpp:166
+#: src/emu/ui/miscmenu.cpp:774
+msgid "Bios"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:776
+msgid "Driver"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:790
+msgid "Save machine configuration"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:806
+msgid "Configure machine:"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:868 src/emu/ui/selsoft.cpp:109
+msgid " (default)"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:953 src/emu/ui/miscmenu.cpp:973
+#: src/emu/ui/selgame.cpp:600
+msgid "Plugins"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:217
+msgid "Filter"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:225
+msgid " ^!File"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:230
+msgid " ^!Category"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:253
+msgid "^!Setup custom filter"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:261
+msgid "Customize UI"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:262
+msgid "Configure Directories"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:265 src/emu/ui/sndmenu.cpp:149
+#: src/emu/ui/sndmenu.cpp:169
+msgid "Sound Options"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:268
+msgid "General Inputs"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:271
+msgid "Save Configuration"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:285 src/emu/ui/optsmenu.cpp:305
+msgid "Settings"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:325
+msgid "**Error saving ui.ini**"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:372
+#, c-format
+msgid "**Error saving %s.ini**"
+msgstr ""
+
+#: src/emu/ui/selector.cpp:165
 msgid "Selection List - Search: "
 msgstr ""
 
-#: src/emu/ui/selector.cpp:196
+#: src/emu/ui/selector.cpp:194
 #, c-format
 msgid "Double click or press %1$s to select"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:39
+#: src/emu/ui/selgame.cpp:38
 msgid "General Info"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:374 src/emu/ui/selsoft.cpp:282
+#: src/emu/ui/selgame.cpp:380 src/emu/ui/selsoft.cpp:281
 #, c-format
 msgid ""
 "%s\n"
 " added to favorites list."
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:380 src/emu/ui/selgame.cpp:389
-#: src/emu/ui/selsoft.cpp:287
+#: src/emu/ui/selgame.cpp:386 src/emu/ui/selgame.cpp:395
+#: src/emu/ui/selsoft.cpp:286
 #, c-format
 msgid ""
 "%s\n"
 " removed from favorites list."
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:450
+#: src/emu/ui/selgame.cpp:457
 msgid ""
 "The selected machine is missing one or more required ROM or CHD images. "
 "Please select a different machine.\n"
@@ -993,275 +1009,275 @@ msgid ""
 "Press any key to continue."
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:589 src/emu/ui/simpleselgame.cpp:265
+#: src/emu/ui/selgame.cpp:595 src/emu/ui/simpleselgame.cpp:265
 msgid "Configure Options"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:752
+#: src/emu/ui/selgame.cpp:596
+msgid "Configure Machine"
+msgstr ""
+
+#: src/emu/ui/selgame.cpp:758
 #, c-format
 msgid "%1$s %2$s ( %3$d / %4$d machines (%5$d BIOS) )"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:762
+#: src/emu/ui/selgame.cpp:768
 #, c-format
 msgid "%1$s (%2$s - %3$s) - "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:769 src/emu/ui/selgame.cpp:775
+#: src/emu/ui/selgame.cpp:775 src/emu/ui/selgame.cpp:781
 #, c-format
 msgid "%1$s (%2$s) - "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:784
+#: src/emu/ui/selgame.cpp:790
 #, c-format
 msgid "%1$s Search: %2$s_"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:838
+#: src/emu/ui/selgame.cpp:844
 #, c-format
 msgid "Romset: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:841 src/emu/ui/selgame.cpp:890
-#: src/emu/ui/selsoft.cpp:751 src/emu/ui/selsoft.cpp:801
+#: src/emu/ui/selgame.cpp:847 src/emu/ui/selgame.cpp:896
+#: src/emu/ui/selsoft.cpp:750 src/emu/ui/selsoft.cpp:800
 #: src/emu/ui/simpleselgame.cpp:328
 #, c-format
 msgid "%1$s, %2$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:847 src/emu/ui/selsoft.cpp:757
+#: src/emu/ui/selgame.cpp:853 src/emu/ui/selsoft.cpp:756
 #, c-format
 msgid "Driver is clone of: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:849 src/emu/ui/selsoft.cpp:759
+#: src/emu/ui/selgame.cpp:855 src/emu/ui/selsoft.cpp:758
 msgid "Driver is parent"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:853 src/emu/ui/selsoft.cpp:763
+#: src/emu/ui/selgame.cpp:859 src/emu/ui/selsoft.cpp:762
 #: src/emu/ui/simpleselgame.cpp:335
 msgid "Overall: NOT WORKING"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:855 src/emu/ui/selsoft.cpp:765
+#: src/emu/ui/selgame.cpp:861 src/emu/ui/selsoft.cpp:764
 #: src/emu/ui/simpleselgame.cpp:337
 msgid "Overall: Unemulated Protection"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:857 src/emu/ui/selsoft.cpp:767
+#: src/emu/ui/selgame.cpp:863 src/emu/ui/selsoft.cpp:766
 #: src/emu/ui/simpleselgame.cpp:339
 msgid "Overall: Working"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:861 src/emu/ui/selsoft.cpp:771
+#: src/emu/ui/selgame.cpp:867 src/emu/ui/selsoft.cpp:770
 msgid "Graphics: Imperfect, "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:863 src/emu/ui/selsoft.cpp:773
+#: src/emu/ui/selgame.cpp:869 src/emu/ui/selsoft.cpp:772
 msgid "Graphics: OK, "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:866 src/emu/ui/selsoft.cpp:776
+#: src/emu/ui/selgame.cpp:872 src/emu/ui/selsoft.cpp:775
 msgid "Sound: Unimplemented"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:868 src/emu/ui/selsoft.cpp:778
+#: src/emu/ui/selgame.cpp:874 src/emu/ui/selsoft.cpp:777
 msgid "Sound: Imperfect"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:870 src/emu/ui/selsoft.cpp:780
+#: src/emu/ui/selgame.cpp:876 src/emu/ui/selsoft.cpp:779
 msgid "Sound: OK"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:887
+#: src/emu/ui/selgame.cpp:893
 #, c-format
 msgid "System: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:894 src/emu/ui/selsoft.cpp:805
+#: src/emu/ui/selgame.cpp:900 src/emu/ui/selsoft.cpp:804
 #, c-format
 msgid "Software is clone of: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:896 src/emu/ui/selsoft.cpp:807
+#: src/emu/ui/selgame.cpp:902 src/emu/ui/selsoft.cpp:806
 msgid "Software is parent"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:901 src/emu/ui/selsoft.cpp:812
+#: src/emu/ui/selgame.cpp:907 src/emu/ui/selsoft.cpp:811
 msgid "Supported: No"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:906 src/emu/ui/selsoft.cpp:817
+#: src/emu/ui/selgame.cpp:912 src/emu/ui/selsoft.cpp:816
 msgid "Supported: Partial"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:911 src/emu/ui/selsoft.cpp:822
+#: src/emu/ui/selgame.cpp:917 src/emu/ui/selsoft.cpp:821
 msgid "Supported: Yes"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:916 src/emu/ui/selsoft.cpp:827
+#: src/emu/ui/selgame.cpp:922 src/emu/ui/selsoft.cpp:826
 #, c-format
 msgid "romset: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:923
+#: src/emu/ui/selgame.cpp:929
 #, c-format
 msgid "%1$s %2$s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1535
+#: src/emu/ui/selgame.cpp:1543
 #, c-format
 msgid "Romset: %1$-.100s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1536
+#: src/emu/ui/selgame.cpp:1544
 #, c-format
 msgid "Year: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1537
+#: src/emu/ui/selgame.cpp:1545
 #, c-format
 msgid "Manufacturer: %1$-.100s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1541
+#: src/emu/ui/selgame.cpp:1549
 #, c-format
 msgid "Driver is Clone of: %1$-.100s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1543
+#: src/emu/ui/selgame.cpp:1551
 msgid "Driver is Parent\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1546
+#: src/emu/ui/selgame.cpp:1554
 msgid "Overall: NOT WORKING\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1548
+#: src/emu/ui/selgame.cpp:1556
 msgid "Overall: Unemulated Protection\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1550
+#: src/emu/ui/selgame.cpp:1558
 msgid "Overall: Working\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1553
+#: src/emu/ui/selgame.cpp:1561
 msgid "Graphics: Imperfect Colors\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1557
+#: src/emu/ui/selgame.cpp:1565
 msgid "Graphics: Imperfect\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1559
+#: src/emu/ui/selgame.cpp:1567
 msgid "Graphics: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1562
+#: src/emu/ui/selgame.cpp:1570
 msgid "Sound: Unimplemented\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1564
+#: src/emu/ui/selgame.cpp:1572
 msgid "Sound: Imperfect\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1566
+#: src/emu/ui/selgame.cpp:1574
 msgid "Sound: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1568
+#: src/emu/ui/selgame.cpp:1576
 #, c-format
 msgid "Driver is Skeleton: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1569
+#: src/emu/ui/selgame.cpp:1577
 #, c-format
 msgid "Game is Mechanical: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1570
+#: src/emu/ui/selgame.cpp:1578
 #, c-format
 msgid "Requires Artwork: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1571
+#: src/emu/ui/selgame.cpp:1579
 #, c-format
 msgid "Requires Clickable Artwork: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1572
+#: src/emu/ui/selgame.cpp:1580
 #, c-format
 msgid "Support Cocktail: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1573
+#: src/emu/ui/selgame.cpp:1581
 #, c-format
 msgid "Driver is Bios: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1574
+#: src/emu/ui/selgame.cpp:1582
 #, c-format
 msgid "Support Save: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 #, c-format
 msgid "Screen Orientation: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 msgid "Vertical"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 msgid "Horizontal"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/selgame.cpp:1591
 #, c-format
 msgid "Requires CHD: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1596
+#: src/emu/ui/selgame.cpp:1604
 msgid "Roms Audit Pass: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1598
+#: src/emu/ui/selgame.cpp:1606
 msgid "Roms Audit Pass: BAD\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1601
+#: src/emu/ui/selgame.cpp:1609
 msgid "Samples Audit Pass: None Needed\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1603
+#: src/emu/ui/selgame.cpp:1611
 msgid "Samples Audit Pass: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1605
+#: src/emu/ui/selgame.cpp:1613
 msgid "Samples Audit Pass: BAD\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1608
+#: src/emu/ui/selgame.cpp:1616
 msgid ""
 "Roms Audit Pass: Disabled\n"
 "Samples Audit Pass: Disabled\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:2049 src/emu/ui/selgame.cpp:2212
-#: src/emu/ui/selsoft.cpp:1662
+#: src/emu/ui/selgame.cpp:2055 src/emu/ui/selgame.cpp:2216
+#: src/emu/ui/selsoft.cpp:1655
 msgid "No Infos Available"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:2162 src/emu/ui/selsoft.cpp:1607
+#: src/emu/ui/selgame.cpp:2168 src/emu/ui/selsoft.cpp:1602
 msgid "Usage"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:110
-msgid " (default)"
-msgstr ""
-
-#: src/emu/ui/selsoft.cpp:381
+#: src/emu/ui/selsoft.cpp:380
 msgid ""
 "The selected software is missing one or more required files. Please select a "
 "different software.\n"
@@ -1269,57 +1285,57 @@ msgid ""
 "Press any key to continue."
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:684
+#: src/emu/ui/selsoft.cpp:683
 #, c-format
-msgid "%1$s %2$s ( %3$d / %4$d softwares )"
+msgid "%1$s %2$s ( %3$d / %4$d software packages )"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:685
+#: src/emu/ui/selsoft.cpp:684
 #, c-format
 msgid "Driver: \"%1$s\" software list "
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:688
+#: src/emu/ui/selsoft.cpp:687
 #, c-format
 msgid "Region: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:690
+#: src/emu/ui/selsoft.cpp:689
 #, c-format
 msgid "Publisher: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:692
+#: src/emu/ui/selsoft.cpp:691
 #, c-format
 msgid "Year: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:694
+#: src/emu/ui/selsoft.cpp:693
 #, c-format
 msgid "Software List: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:696
+#: src/emu/ui/selsoft.cpp:695
 #, c-format
 msgid "Device type: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:698
+#: src/emu/ui/selsoft.cpp:697
 #, c-format
 msgid "%s Search: %s_"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:748 src/emu/ui/selsoft.cpp:798
+#: src/emu/ui/selsoft.cpp:747 src/emu/ui/selsoft.cpp:797
 #: src/emu/ui/simpleselgame.cpp:325
 #, c-format
 msgid "%1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:1998 src/emu/ui/selsoft.cpp:2018
+#: src/emu/ui/selsoft.cpp:1991 src/emu/ui/selsoft.cpp:2011
 msgid "Software part selection:"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:2136 src/emu/ui/selsoft.cpp:2156
+#: src/emu/ui/selsoft.cpp:2129 src/emu/ui/selsoft.cpp:2149
 msgid "Bios selection:"
 msgstr ""
 
@@ -1367,15 +1383,15 @@ msgstr ""
 msgid " [internal]"
 msgstr ""
 
-#: src/emu/ui/sndmenu.cpp:135
+#: src/emu/ui/sndmenu.cpp:133
 msgid "Sound"
 msgstr ""
 
-#: src/emu/ui/sndmenu.cpp:136
+#: src/emu/ui/sndmenu.cpp:134
 msgid "Sample Rate"
 msgstr ""
 
-#: src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/sndmenu.cpp:135
 msgid "Use External Samples"
 msgstr ""
 
@@ -1444,80 +1460,80 @@ msgstr ""
 msgid "Fast Forward"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:419
+#: src/emu/ui/ui.cpp:418
 msgid "This driver requires images to be loaded in the following device(s): "
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1074
+#: src/emu/ui/ui.cpp:1071
 msgid ""
 "One or more ROMs/CHDs for this machine are incorrect. The machine may not "
 "run correctly.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1087
+#: src/emu/ui/ui.cpp:1084
 msgid ""
 "There are known problems with this machine\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1091
+#: src/emu/ui/ui.cpp:1088
 msgid ""
 "One or more ROMs/CHDs for this machine have not been correctly dumped.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1095
+#: src/emu/ui/ui.cpp:1092
 #, c-format
 msgid "The keyboard emulation may not be 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1097
+#: src/emu/ui/ui.cpp:1094
 #, c-format
 msgid "The colors aren't 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1099
+#: src/emu/ui/ui.cpp:1096
 msgid "The colors are completely wrong.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1101
+#: src/emu/ui/ui.cpp:1098
 #, c-format
 msgid "The video emulation isn't 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1103
+#: src/emu/ui/ui.cpp:1100
 #, c-format
 msgid "The sound emulation isn't 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1105
+#: src/emu/ui/ui.cpp:1102
 msgid "The machine lacks sound.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1108
+#: src/emu/ui/ui.cpp:1105
 msgid "Screen flipping in cocktail mode is not supported.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1112
+#: src/emu/ui/ui.cpp:1109
 msgid "The machine requires external artwork files\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1117
+#: src/emu/ui/ui.cpp:1114
 msgid ""
 "This machine was never completed. It may exhibit strange behavior or missing "
 "elements that are not bugs in the emulation.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1122
+#: src/emu/ui/ui.cpp:1119
 msgid ""
 "This machine has no sound hardware, MAME will produce no sounds, this is "
 "expected behaviour.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1130
+#: src/emu/ui/ui.cpp:1127
 msgid "The machine has protection which isn't fully emulated.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1133
+#: src/emu/ui/ui.cpp:1130
 msgid ""
 "\n"
 "THIS MACHINE DOESN'T WORK. The emulation for this machine is not yet "
@@ -1525,7 +1541,7 @@ msgid ""
 "the developers to improve the emulation.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1137
+#: src/emu/ui/ui.cpp:1134
 msgid ""
 "\n"
 "Certain elements of this machine cannot be emulated as it requires actual "
@@ -1533,21 +1549,21 @@ msgid ""
 "to fully play this machine.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1156
+#: src/emu/ui/ui.cpp:1153
 msgid ""
 "\n"
 "\n"
 "There are working clones of this machine: "
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1170
+#: src/emu/ui/ui.cpp:1167
 msgid ""
 "\n"
 "\n"
 "Press any key to continue"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1185
+#: src/emu/ui/ui.cpp:1182
 #, c-format
 msgid ""
 "%1$s\n"
@@ -1557,98 +1573,98 @@ msgid ""
 "CPU:\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1221 src/emu/ui/ui.cpp:1260
+#: src/emu/ui/ui.cpp:1218 src/emu/ui/ui.cpp:1257
 msgid "MHz"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1221 src/emu/ui/ui.cpp:1260
+#: src/emu/ui/ui.cpp:1218 src/emu/ui/ui.cpp:1257
 msgid "kHz"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1235
+#: src/emu/ui/ui.cpp:1232
 msgid ""
 "\n"
 "Sound:\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1264
+#: src/emu/ui/ui.cpp:1261
 msgid ""
 "\n"
 "Video:\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1268
+#: src/emu/ui/ui.cpp:1265
 msgid "None\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1275
+#: src/emu/ui/ui.cpp:1272
 msgid "Vector"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1286
+#: src/emu/ui/ui.cpp:1283
 #, c-format
 msgid "%1$s: %2$s\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1286
+#: src/emu/ui/ui.cpp:1283
 msgid "%2$s\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1541 src/emu/ui/ui.cpp:1551
+#: src/emu/ui/ui.cpp:1538 src/emu/ui/ui.cpp:1548
 msgid "Keyboard Emulation Status"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1543
+#: src/emu/ui/ui.cpp:1540
 msgid "Mode: PARTIAL Emulation"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1544
+#: src/emu/ui/ui.cpp:1541
 msgid "UI:   Enabled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1546 src/emu/ui/ui.cpp:1556
+#: src/emu/ui/ui.cpp:1543 src/emu/ui/ui.cpp:1553
 msgid "**Use ScrLock to toggle**"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1553
+#: src/emu/ui/ui.cpp:1550
 msgid "Mode: FULL Emulation"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1554
+#: src/emu/ui/ui.cpp:1551
 msgid "UI:   Disabled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1692
+#: src/emu/ui/ui.cpp:1689
 msgid "Autofire can't be enabled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1731
+#: src/emu/ui/ui.cpp:1728
 msgid "Select position to save to"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1733
+#: src/emu/ui/ui.cpp:1730
 msgid "Select position to load from"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1757
+#: src/emu/ui/ui.cpp:1754
 msgid "Save cancelled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1759
+#: src/emu/ui/ui.cpp:1756
 msgid "Load cancelled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1802
+#: src/emu/ui/ui.cpp:1799
 #, c-format
 msgid "Save to position %s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1807
+#: src/emu/ui/ui.cpp:1804
 #, c-format
 msgid "Load from position %s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1847
+#: src/emu/ui/ui.cpp:1844
 #, c-format
 msgid ""
 "Are you sure you want to quit?\n"
@@ -1657,173 +1673,173 @@ msgid ""
 "Press ''%2$s'' to return to emulation."
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1917
+#: src/emu/ui/ui.cpp:1914
 msgid "Master Volume"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1926
+#: src/emu/ui/ui.cpp:1923
 #, c-format
 msgid "%1$s Volume"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1949
+#: src/emu/ui/ui.cpp:1946
 #, c-format
 msgid "Overclock CPU %1$s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1968
+#: src/emu/ui/ui.cpp:1965
 #, c-format
 msgid "%1$s Refresh Rate"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1973
+#: src/emu/ui/ui.cpp:1970
 #, c-format
 msgid "%1$s Brightness"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1975
+#: src/emu/ui/ui.cpp:1972
 #, c-format
 msgid "%1$s Contrast"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1977
+#: src/emu/ui/ui.cpp:1974
 #, c-format
 msgid "%1$s Gamma"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1981
+#: src/emu/ui/ui.cpp:1978
 #, c-format
 msgid "%1$s Horiz Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1983
+#: src/emu/ui/ui.cpp:1980
 #, c-format
 msgid "%1$s Horiz Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1985
+#: src/emu/ui/ui.cpp:1982
 #, c-format
 msgid "%1$s Vert Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1987
+#: src/emu/ui/ui.cpp:1984
 #, c-format
 msgid "%1$s Vert Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2005
+#: src/emu/ui/ui.cpp:2002
 #, c-format
 msgid "Laserdisc '%1$s' Horiz Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2007
+#: src/emu/ui/ui.cpp:2004
 #, c-format
 msgid "Laserdisc '%1$s' Horiz Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2009
+#: src/emu/ui/ui.cpp:2006
 #, c-format
 msgid "Laserdisc '%1$s' Vert Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2011
+#: src/emu/ui/ui.cpp:2008
 #, c-format
 msgid "Laserdisc '%1$s' Vert Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2021
+#: src/emu/ui/ui.cpp:2018
 msgid "Vector Flicker"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2022
+#: src/emu/ui/ui.cpp:2019
 msgid "Beam Width Minimum"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2023
+#: src/emu/ui/ui.cpp:2020
 msgid "Beam Width Maximum"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2024
+#: src/emu/ui/ui.cpp:2021
 msgid "Beam Intensity Weight"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2037
+#: src/emu/ui/ui.cpp:2034
 #, c-format
 msgid "Crosshair Scale %1$s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2037 src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2034 src/emu/ui/ui.cpp:2036
 msgid "X"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2037 src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2034 src/emu/ui/ui.cpp:2036
 msgid "Y"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2036
 #, c-format
 msgid "Crosshair Offset %1$s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2071
+#: src/emu/ui/ui.cpp:2068
 #, c-format
 msgid "%1$3ddB"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2115
+#: src/emu/ui/ui.cpp:2112
 #, c-format
 msgid "%1$d%%"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2131
+#: src/emu/ui/ui.cpp:2128
 #, c-format
 msgid "%1$3.0f%%"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2154
+#: src/emu/ui/ui.cpp:2151
 #, c-format
 msgid "%1$.3ffps"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2177 src/emu/ui/ui.cpp:2199 src/emu/ui/ui.cpp:2220
-#: src/emu/ui/ui.cpp:2242 src/emu/ui/ui.cpp:2264 src/emu/ui/ui.cpp:2286
-#: src/emu/ui/ui.cpp:2308 src/emu/ui/ui.cpp:2330 src/emu/ui/ui.cpp:2352
-#: src/emu/ui/ui.cpp:2374 src/emu/ui/ui.cpp:2396
+#: src/emu/ui/ui.cpp:2174 src/emu/ui/ui.cpp:2196 src/emu/ui/ui.cpp:2217
+#: src/emu/ui/ui.cpp:2239 src/emu/ui/ui.cpp:2261 src/emu/ui/ui.cpp:2283
+#: src/emu/ui/ui.cpp:2305 src/emu/ui/ui.cpp:2327 src/emu/ui/ui.cpp:2349
+#: src/emu/ui/ui.cpp:2371 src/emu/ui/ui.cpp:2393
 #, c-format
 msgid "%1$.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2412 src/emu/ui/ui.cpp:2428 src/emu/ui/ui.cpp:2444
-#: src/emu/ui/ui.cpp:2460
+#: src/emu/ui/ui.cpp:2408 src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2438
+#: src/emu/ui/ui.cpp:2453
 #, c-format
 msgid "%1$1.2f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2476
+#: src/emu/ui/ui.cpp:2469
 #, c-format
 msgid "Screen '%1$s'"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2478
+#: src/emu/ui/ui.cpp:2471
 msgid "Screen"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2494
+#: src/emu/ui/ui.cpp:2487
 #, c-format
 msgid "Crosshair Scale X %1$1.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2494
+#: src/emu/ui/ui.cpp:2487
 #, c-format
 msgid "Crosshair Scale Y %1$1.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2513
+#: src/emu/ui/ui.cpp:2506
 #, c-format
 msgid "Crosshair Offset X %1$1.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2513
+#: src/emu/ui/ui.cpp:2506
 #, c-format
 msgid "Crosshair Offset Y %1$1.3f"
 msgstr ""
@@ -1865,10 +1881,10 @@ msgstr ""
 msgid "Full"
 msgstr ""
 
-#: src/emu/ui/viewgfx.cpp:392
+#: src/emu/ui/viewgfx.cpp:391
 msgid " COLORS"
 msgstr ""
 
-#: src/emu/ui/viewgfx.cpp:392
+#: src/emu/ui/viewgfx.cpp:391
 msgid " PENS"
 msgstr ""
diff --git a/language/Slovenian/strings.po b/language/Slovenian/strings.po
index 50b3bce048c..bc3b39b9d99 100644
--- a/language/Slovenian/strings.po
+++ b/language/Slovenian/strings.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MAME\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-11 03:33+0200\n"
+"POT-Creation-Date: 2016-04-15 17:42+0200\n"
 "PO-Revision-Date: 2016-02-20 18:03+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: MAME Language Team\n"
@@ -62,14 +62,14 @@ msgstr ""
 msgid "Autofire Status"
 msgstr ""
 
-#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1698
+#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1695
 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211
 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219
 #: src/emu/ui/videoopt.cpp:223
 msgid "Disabled"
 msgstr ""
 
-#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1698
+#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1695
 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211
 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219
 #: src/emu/ui/videoopt.cpp:223
@@ -77,14 +77,14 @@ msgid "Enabled"
 msgstr ""
 
 #: src/emu/ui/cheatopt.cpp:282 src/emu/ui/cheatopt.cpp:288
-#: src/emu/ui/menu.cpp:710 src/emu/ui/miscmenu.cpp:831
-#: src/emu/ui/sndmenu.cpp:135 src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/menu.cpp:755 src/emu/ui/miscmenu.cpp:936
+#: src/emu/ui/sndmenu.cpp:133 src/emu/ui/sndmenu.cpp:135
 msgid "On"
 msgstr ""
 
 #: src/emu/ui/cheatopt.cpp:282 src/emu/ui/cheatopt.cpp:288
-#: src/emu/ui/menu.cpp:713 src/emu/ui/miscmenu.cpp:831
-#: src/emu/ui/sndmenu.cpp:135 src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/menu.cpp:758 src/emu/ui/miscmenu.cpp:936
+#: src/emu/ui/sndmenu.cpp:133 src/emu/ui/sndmenu.cpp:135
 msgid "Off"
 msgstr ""
 
@@ -96,316 +96,316 @@ msgstr ""
 msgid "Autofire Delay"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:158 src/emu/ui/custmenu.cpp:447
+#: src/emu/ui/custmenu.cpp:157 src/emu/ui/custmenu.cpp:445
 msgid "Main filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:167 src/emu/ui/custmenu.cpp:456
+#: src/emu/ui/custmenu.cpp:166 src/emu/ui/custmenu.cpp:454
 msgid "Other filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:176 src/emu/ui/optsmenu.cpp:239
+#: src/emu/ui/custmenu.cpp:175 src/emu/ui/optsmenu.cpp:238
 msgid "^!Manufacturer"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:185 src/emu/ui/custmenu.cpp:474
-#: src/emu/ui/optsmenu.cpp:247
+#: src/emu/ui/custmenu.cpp:184 src/emu/ui/custmenu.cpp:472
+#: src/emu/ui/optsmenu.cpp:246
 msgid "^!Year"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:194 src/emu/ui/custmenu.cpp:510
+#: src/emu/ui/custmenu.cpp:193 src/emu/ui/custmenu.cpp:508
 msgid "Remove last filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:197 src/emu/ui/custmenu.cpp:513
+#: src/emu/ui/custmenu.cpp:196 src/emu/ui/custmenu.cpp:511
 msgid "Add filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:212 src/emu/ui/custmenu.cpp:233
-#: src/emu/ui/custmenu.cpp:529 src/emu/ui/custmenu.cpp:550
+#: src/emu/ui/custmenu.cpp:211 src/emu/ui/custmenu.cpp:231
+#: src/emu/ui/custmenu.cpp:527 src/emu/ui/custmenu.cpp:547
 msgid "Select custom filters:"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:465
+#: src/emu/ui/custmenu.cpp:463
 msgid "^!Publisher"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:483
+#: src/emu/ui/custmenu.cpp:481
 msgid "^!Software List"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:492
+#: src/emu/ui/custmenu.cpp:490
 msgid "^!Device type"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:501
+#: src/emu/ui/custmenu.cpp:499
 msgid "^!Region"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:23
+#: src/emu/ui/custui.cpp:22
 msgid "Show All"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:24
+#: src/emu/ui/custui.cpp:23
 msgid "Hide Filters"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:25
+#: src/emu/ui/custui.cpp:24
 msgid "Hide Info/Image"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:26
+#: src/emu/ui/custui.cpp:25
 msgid "Hide Both"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:142
+#: src/emu/ui/custui.cpp:141
 msgid "Fonts"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:143
+#: src/emu/ui/custui.cpp:142
 msgid "Colors"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:148 src/emu/ui/dirmenu.cpp:33
+#: src/emu/ui/custui.cpp:147 src/emu/ui/dirmenu.cpp:33
 msgid "Language"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:152
+#: src/emu/ui/custui.cpp:151
 msgid "Show side panels"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:167 src/emu/ui/custui.cpp:188
+#: src/emu/ui/custui.cpp:166 src/emu/ui/custui.cpp:186
 msgid "Custom UI Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:246
+#: src/emu/ui/custui.cpp:244
 msgid "default"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:349
+#: src/emu/ui/custui.cpp:347
 msgid "UI Font"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:354
+#: src/emu/ui/custui.cpp:352
 msgid "Bold"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:355
+#: src/emu/ui/custui.cpp:353
 msgid "Italic"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:360
+#: src/emu/ui/custui.cpp:358
 msgid "Lines"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:366
+#: src/emu/ui/custui.cpp:364
 msgid "Infos text size"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:383
+#: src/emu/ui/custui.cpp:381
 msgid "UI Fonts Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:411
+#: src/emu/ui/custui.cpp:408
 msgid "Sample text - Lorem ipsum dolor sit amet, consectetur adipiscing elit."
 msgstr ""
 
-#: src/emu/ui/custui.cpp:509
+#: src/emu/ui/custui.cpp:506
 msgid "Normal text"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:510
+#: src/emu/ui/custui.cpp:507
 msgid "Selected color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:511
+#: src/emu/ui/custui.cpp:508
 msgid "Normal text background"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:512
+#: src/emu/ui/custui.cpp:509
 msgid "Selected background color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:513
+#: src/emu/ui/custui.cpp:510
 msgid "Subitem color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:514 src/emu/ui/custui.cpp:610
+#: src/emu/ui/custui.cpp:511 src/emu/ui/custui.cpp:606
 msgid "Clone"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:515
+#: src/emu/ui/custui.cpp:512
 msgid "Border"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:516
+#: src/emu/ui/custui.cpp:513
 msgid "Background"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:517
+#: src/emu/ui/custui.cpp:514
 msgid "Dipswitch"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:518
+#: src/emu/ui/custui.cpp:515
 msgid "Unavailable color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:519
+#: src/emu/ui/custui.cpp:516
 msgid "Slider color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:520
+#: src/emu/ui/custui.cpp:517
 msgid "Gfx viewer background"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:521
+#: src/emu/ui/custui.cpp:518
 msgid "Mouse over color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:522
+#: src/emu/ui/custui.cpp:519
 msgid "Mouse over background color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:523
+#: src/emu/ui/custui.cpp:520
 msgid "Mouse down color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:524
+#: src/emu/ui/custui.cpp:521
 msgid "Mouse down background color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:527
+#: src/emu/ui/custui.cpp:524
 msgid "Restore originals colors"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:543
+#: src/emu/ui/custui.cpp:540
 msgid "UI Colors Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:572
+#: src/emu/ui/custui.cpp:568
 #, c-format
 msgid "Double click or press %1$s to change the color value"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:598
+#: src/emu/ui/custui.cpp:594
 msgid "Menu Preview"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:606
+#: src/emu/ui/custui.cpp:602
 msgid "Normal"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:607
+#: src/emu/ui/custui.cpp:603
 msgid "Subitem"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:608
+#: src/emu/ui/custui.cpp:604
 msgid "Selected"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:609
+#: src/emu/ui/custui.cpp:605
 msgid "Mouse Over"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:841 src/emu/ui/custui.cpp:844
+#: src/emu/ui/custui.cpp:837 src/emu/ui/custui.cpp:840
 msgid "Alpha"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:849 src/emu/ui/custui.cpp:852
-#: src/emu/ui/custui.cpp:1013
+#: src/emu/ui/custui.cpp:845 src/emu/ui/custui.cpp:848
+#: src/emu/ui/custui.cpp:1007
 msgid "Red"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:857 src/emu/ui/custui.cpp:860
-#: src/emu/ui/custui.cpp:1016
+#: src/emu/ui/custui.cpp:853 src/emu/ui/custui.cpp:856
+#: src/emu/ui/custui.cpp:1010
 msgid "Green"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:865 src/emu/ui/custui.cpp:868
-#: src/emu/ui/custui.cpp:1017
+#: src/emu/ui/custui.cpp:861 src/emu/ui/custui.cpp:864
+#: src/emu/ui/custui.cpp:1011
 msgid "Blue"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:871
+#: src/emu/ui/custui.cpp:867
 msgid "Choose from palette"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:887
+#: src/emu/ui/custui.cpp:883
 msgid " - ARGB Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:912
+#: src/emu/ui/custui.cpp:907
 msgid "Color preview ="
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1009
+#: src/emu/ui/custui.cpp:1003
 msgid "White"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1010
+#: src/emu/ui/custui.cpp:1004
 msgid "Silver"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1011
+#: src/emu/ui/custui.cpp:1005
 msgid "Gray"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1012
+#: src/emu/ui/custui.cpp:1006
 msgid "Black"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1014
+#: src/emu/ui/custui.cpp:1008
 msgid "Orange"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1015
+#: src/emu/ui/custui.cpp:1009
 msgid "Yellow"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1018
+#: src/emu/ui/custui.cpp:1012
 msgid "Violet"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:65
+#: src/emu/ui/datmenu.cpp:64
 msgid "Software History"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:67
+#: src/emu/ui/datmenu.cpp:66
 msgid "Software Usage"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:199
+#: src/emu/ui/datmenu.cpp:196
 msgid "Revision: "
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:287 src/emu/ui/selgame.cpp:40
-#: src/emu/ui/selgame.cpp:2152 src/emu/ui/selgame.cpp:2161
-#: src/emu/ui/selsoft.cpp:1577 src/emu/ui/selsoft.cpp:1597
-#: src/emu/ui/selsoft.cpp:1606
+#: src/emu/ui/datmenu.cpp:284 src/emu/ui/selgame.cpp:39
+#: src/emu/ui/selgame.cpp:2158 src/emu/ui/selgame.cpp:2167
+#: src/emu/ui/selsoft.cpp:1574 src/emu/ui/selsoft.cpp:1592
+#: src/emu/ui/selsoft.cpp:1601
 msgid "History"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:289 src/emu/ui/selgame.cpp:41
+#: src/emu/ui/datmenu.cpp:286 src/emu/ui/selgame.cpp:40
 msgid "Mameinfo"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:291 src/emu/ui/selgame.cpp:43
+#: src/emu/ui/datmenu.cpp:288 src/emu/ui/selgame.cpp:42
 msgid "Messinfo"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:293 src/emu/ui/selgame.cpp:42
+#: src/emu/ui/datmenu.cpp:290 src/emu/ui/selgame.cpp:41
 msgid "Sysinfo"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:295 src/emu/ui/selgame.cpp:46
+#: src/emu/ui/datmenu.cpp:292 src/emu/ui/selgame.cpp:45
 msgid "Mamescore"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:297 src/emu/ui/selgame.cpp:45
+#: src/emu/ui/datmenu.cpp:294 src/emu/ui/selgame.cpp:44
 msgid "Gameinit"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:299 src/emu/ui/selgame.cpp:44
+#: src/emu/ui/datmenu.cpp:296 src/emu/ui/selgame.cpp:43
 msgid "Command"
 msgstr ""
 
@@ -557,75 +557,75 @@ msgstr ""
 msgid "Remove %1$s Folder"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:158
+#: src/emu/ui/filesel.cpp:161
 msgid "File Already Exists - Override?"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:160 src/emu/ui/selgame.cpp:1568
-#: src/emu/ui/selgame.cpp:1569 src/emu/ui/selgame.cpp:1570
-#: src/emu/ui/selgame.cpp:1571 src/emu/ui/selgame.cpp:1572
-#: src/emu/ui/selgame.cpp:1573 src/emu/ui/selgame.cpp:1574
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/filesel.cpp:163 src/emu/ui/selgame.cpp:1576
+#: src/emu/ui/selgame.cpp:1577 src/emu/ui/selgame.cpp:1578
+#: src/emu/ui/selgame.cpp:1579 src/emu/ui/selgame.cpp:1580
+#: src/emu/ui/selgame.cpp:1581 src/emu/ui/selgame.cpp:1582
+#: src/emu/ui/selgame.cpp:1591
 msgid "No"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:161 src/emu/ui/selgame.cpp:1568
-#: src/emu/ui/selgame.cpp:1569 src/emu/ui/selgame.cpp:1570
-#: src/emu/ui/selgame.cpp:1571 src/emu/ui/selgame.cpp:1572
-#: src/emu/ui/selgame.cpp:1573 src/emu/ui/selgame.cpp:1574
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/filesel.cpp:164 src/emu/ui/selgame.cpp:1576
+#: src/emu/ui/selgame.cpp:1577 src/emu/ui/selgame.cpp:1578
+#: src/emu/ui/selgame.cpp:1579 src/emu/ui/selgame.cpp:1580
+#: src/emu/ui/selgame.cpp:1581 src/emu/ui/selgame.cpp:1582
+#: src/emu/ui/selgame.cpp:1591
 msgid "Yes"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:272
+#: src/emu/ui/filesel.cpp:275
 msgid "New Image Name:"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:278
+#: src/emu/ui/filesel.cpp:281
 msgid "Image Format:"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:284
+#: src/emu/ui/filesel.cpp:287
 msgid "Create"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:315
+#: src/emu/ui/filesel.cpp:318
 msgid "Please enter a file extension too"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:503 src/emu/ui/swlist.cpp:65
+#: src/emu/ui/filesel.cpp:506 src/emu/ui/swlist.cpp:65
 msgid "[empty slot]"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:507
+#: src/emu/ui/filesel.cpp:510
 msgid "[create]"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:511 src/emu/ui/swlist.cpp:76
+#: src/emu/ui/filesel.cpp:514 src/emu/ui/swlist.cpp:76
 msgid "[software list]"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:803
+#: src/emu/ui/filesel.cpp:806
 msgid "Select image format"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:863
+#: src/emu/ui/filesel.cpp:866
 msgid "Select access mode"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:864
+#: src/emu/ui/filesel.cpp:867
 msgid "Read-only"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:866
+#: src/emu/ui/filesel.cpp:869
 msgid "Read-write"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:867
+#: src/emu/ui/filesel.cpp:870
 msgid "Read this image, write to another image"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:868
+#: src/emu/ui/filesel.cpp:871
 msgid "Read this image, write to diff"
 msgstr ""
 
@@ -651,7 +651,7 @@ msgstr ""
 msgid "[empty]"
 msgstr ""
 
-#: src/emu/ui/info_pty.cpp:26 src/emu/ui/mainmenu.cpp:91
+#: src/emu/ui/info_pty.cpp:26 src/emu/ui/mainmenu.cpp:96
 msgid "Pseudo terminals"
 msgstr ""
 
@@ -667,7 +667,7 @@ msgstr ""
 msgid "Other Controls"
 msgstr ""
 
-#: src/emu/ui/inputmap.cpp:622 src/emu/ui/miscmenu.cpp:91
+#: src/emu/ui/inputmap.cpp:622 src/emu/ui/miscmenu.cpp:92
 #: src/emu/ui/slotopt.cpp:172
 msgid "Reset"
 msgstr ""
@@ -700,27 +700,27 @@ msgstr ""
 msgid "Machine Information"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:78
+#: src/emu/ui/mainmenu.cpp:80
 msgid "Image Information"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:81
+#: src/emu/ui/mainmenu.cpp:83
 msgid "File Manager"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:86
+#: src/emu/ui/mainmenu.cpp:92
 msgid "Tape Control"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:94
+#: src/emu/ui/mainmenu.cpp:99
 msgid "Bios Selection"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:100
+#: src/emu/ui/mainmenu.cpp:104
 msgid "Slot Devices"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:107
+#: src/emu/ui/mainmenu.cpp:109
 msgid "Barcode Reader"
 msgstr ""
 
@@ -728,43 +728,43 @@ msgstr ""
 msgid "Network Devices"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:119
+#: src/emu/ui/mainmenu.cpp:118
 msgid "Keyboard Mode"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:122
+#: src/emu/ui/mainmenu.cpp:121
 msgid "Slider Controls"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:125
+#: src/emu/ui/mainmenu.cpp:124
 msgid "Video Options"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:129
+#: src/emu/ui/mainmenu.cpp:128
 msgid "Crosshair Options"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:133
+#: src/emu/ui/mainmenu.cpp:132
 msgid "Cheat"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:136
+#: src/emu/ui/mainmenu.cpp:135
 msgid "Plugin Options"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:140
+#: src/emu/ui/mainmenu.cpp:139
 msgid "External DAT View"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:146
+#: src/emu/ui/mainmenu.cpp:145 src/emu/ui/miscmenu.cpp:785
 msgid "Add To Favorites"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:148
+#: src/emu/ui/mainmenu.cpp:147 src/emu/ui/miscmenu.cpp:787
 msgid "Remove From Favorites"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:155
+#: src/emu/ui/mainmenu.cpp:154
 msgid "Select New Machine"
 msgstr ""
 
@@ -804,189 +804,205 @@ msgstr ""
 msgid "Return to Previous Menu"
 msgstr ""
 
-#: src/emu/ui/menu.cpp:716
+#: src/emu/ui/menu.cpp:761
 msgid "Auto"
 msgstr ""
 
-#: src/emu/ui/menu.cpp:2133
+#: src/emu/ui/menu.cpp:2195
 msgid "Images"
 msgstr ""
 
-#: src/emu/ui/menu.cpp:2134
+#: src/emu/ui/menu.cpp:2196
 msgid "Infos"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Keyboard Mode:"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Natural"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Emulated"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:240
+#: src/emu/ui/miscmenu.cpp:241
 #, c-format
 msgid ""
 "Uptime: %1$d:%2$02d:%3$02d\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:242
+#: src/emu/ui/miscmenu.cpp:243
 #, c-format
 msgid ""
 "Uptime: %1$d:%2$02d\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:246
+#: src/emu/ui/miscmenu.cpp:247
 #, c-format
 msgid ""
 "Tickets dispensed: %1$d\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:257
+#: src/emu/ui/miscmenu.cpp:258
 msgid "Coin %1$c: NA%3$s\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:257
+#: src/emu/ui/miscmenu.cpp:258
 #, c-format
 msgid "Coin %1$c: %2$d%3$s\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:260
+#: src/emu/ui/miscmenu.cpp:261
 msgid " (locked)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:519
+#: src/emu/ui/miscmenu.cpp:520
 msgid "Visible Delay"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:617
+#: src/emu/ui/miscmenu.cpp:619
 #, c-format
 msgid "%s.xml saved under ui folder."
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:645
+#: src/emu/ui/miscmenu.cpp:647
 msgid "Name:             Description:\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:657
+#: src/emu/ui/miscmenu.cpp:659
 #, c-format
 msgid "%s.txt saved under ui folder."
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:675
-msgid "Export XML format (like -listxml)"
+#: src/emu/ui/miscmenu.cpp:677
+msgid "Export list in XML format (like -listxml)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:676
-msgid "Export TXT format (like -listfull)"
+#: src/emu/ui/miscmenu.cpp:678
+msgid "Export list in XML format (like -listxml, but exclude devices)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:734
-msgid "Dummy"
+#: src/emu/ui/miscmenu.cpp:679
+msgid "Export list in TXT format (like -listfull)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:736
-msgid "Save machine configuration"
-msgstr ""
-
-#: src/emu/ui/miscmenu.cpp:848 src/emu/ui/miscmenu.cpp:869
-#: src/emu/ui/selgame.cpp:594
-msgid "Plugins"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:218
-msgid "Filter"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:226
-msgid " ^!File"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:231
-msgid " ^!Category"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:254
-msgid "^!Setup custom filter"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:262
-msgid "Customize UI"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:263
-msgid "Configure Directories"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:266 src/emu/ui/sndmenu.cpp:151
-#: src/emu/ui/sndmenu.cpp:172
-msgid "Sound Options"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:269
-msgid "General Inputs"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:272
-msgid "Save Configuration"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:286 src/emu/ui/optsmenu.cpp:307
-msgid "Settings"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:327
-msgid "**Error saving ui.ini**"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:374
-#, c-format
-msgid "**Error saving %s.ini**"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:378
+#: src/emu/ui/miscmenu.cpp:729 src/emu/ui/optsmenu.cpp:376
 msgid ""
 "\n"
 "    Configuration saved    \n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/selector.cpp:166
+#: src/emu/ui/miscmenu.cpp:774
+msgid "Bios"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:776
+msgid "Driver"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:790
+msgid "Save machine configuration"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:806
+msgid "Configure machine:"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:868 src/emu/ui/selsoft.cpp:109
+msgid " (default)"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:953 src/emu/ui/miscmenu.cpp:973
+#: src/emu/ui/selgame.cpp:600
+msgid "Plugins"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:217
+msgid "Filter"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:225
+msgid " ^!File"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:230
+msgid " ^!Category"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:253
+msgid "^!Setup custom filter"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:261
+msgid "Customize UI"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:262
+msgid "Configure Directories"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:265 src/emu/ui/sndmenu.cpp:149
+#: src/emu/ui/sndmenu.cpp:169
+msgid "Sound Options"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:268
+msgid "General Inputs"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:271
+msgid "Save Configuration"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:285 src/emu/ui/optsmenu.cpp:305
+msgid "Settings"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:325
+msgid "**Error saving ui.ini**"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:372
+#, c-format
+msgid "**Error saving %s.ini**"
+msgstr ""
+
+#: src/emu/ui/selector.cpp:165
 msgid "Selection List - Search: "
 msgstr ""
 
-#: src/emu/ui/selector.cpp:196
+#: src/emu/ui/selector.cpp:194
 #, c-format
 msgid "Double click or press %1$s to select"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:39
+#: src/emu/ui/selgame.cpp:38
 msgid "General Info"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:374 src/emu/ui/selsoft.cpp:282
+#: src/emu/ui/selgame.cpp:380 src/emu/ui/selsoft.cpp:281
 #, c-format
 msgid ""
 "%s\n"
 " added to favorites list."
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:380 src/emu/ui/selgame.cpp:389
-#: src/emu/ui/selsoft.cpp:287
+#: src/emu/ui/selgame.cpp:386 src/emu/ui/selgame.cpp:395
+#: src/emu/ui/selsoft.cpp:286
 #, c-format
 msgid ""
 "%s\n"
 " removed from favorites list."
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:450
+#: src/emu/ui/selgame.cpp:457
 msgid ""
 "The selected machine is missing one or more required ROM or CHD images. "
 "Please select a different machine.\n"
@@ -994,275 +1010,275 @@ msgid ""
 "Press any key to continue."
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:589 src/emu/ui/simpleselgame.cpp:265
+#: src/emu/ui/selgame.cpp:595 src/emu/ui/simpleselgame.cpp:265
 msgid "Configure Options"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:752
+#: src/emu/ui/selgame.cpp:596
+msgid "Configure Machine"
+msgstr ""
+
+#: src/emu/ui/selgame.cpp:758
 #, c-format
 msgid "%1$s %2$s ( %3$d / %4$d machines (%5$d BIOS) )"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:762
+#: src/emu/ui/selgame.cpp:768
 #, c-format
 msgid "%1$s (%2$s - %3$s) - "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:769 src/emu/ui/selgame.cpp:775
+#: src/emu/ui/selgame.cpp:775 src/emu/ui/selgame.cpp:781
 #, c-format
 msgid "%1$s (%2$s) - "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:784
+#: src/emu/ui/selgame.cpp:790
 #, c-format
 msgid "%1$s Search: %2$s_"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:838
+#: src/emu/ui/selgame.cpp:844
 #, c-format
 msgid "Romset: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:841 src/emu/ui/selgame.cpp:890
-#: src/emu/ui/selsoft.cpp:751 src/emu/ui/selsoft.cpp:801
+#: src/emu/ui/selgame.cpp:847 src/emu/ui/selgame.cpp:896
+#: src/emu/ui/selsoft.cpp:750 src/emu/ui/selsoft.cpp:800
 #: src/emu/ui/simpleselgame.cpp:328
 #, c-format
 msgid "%1$s, %2$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:847 src/emu/ui/selsoft.cpp:757
+#: src/emu/ui/selgame.cpp:853 src/emu/ui/selsoft.cpp:756
 #, c-format
 msgid "Driver is clone of: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:849 src/emu/ui/selsoft.cpp:759
+#: src/emu/ui/selgame.cpp:855 src/emu/ui/selsoft.cpp:758
 msgid "Driver is parent"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:853 src/emu/ui/selsoft.cpp:763
+#: src/emu/ui/selgame.cpp:859 src/emu/ui/selsoft.cpp:762
 #: src/emu/ui/simpleselgame.cpp:335
 msgid "Overall: NOT WORKING"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:855 src/emu/ui/selsoft.cpp:765
+#: src/emu/ui/selgame.cpp:861 src/emu/ui/selsoft.cpp:764
 #: src/emu/ui/simpleselgame.cpp:337
 msgid "Overall: Unemulated Protection"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:857 src/emu/ui/selsoft.cpp:767
+#: src/emu/ui/selgame.cpp:863 src/emu/ui/selsoft.cpp:766
 #: src/emu/ui/simpleselgame.cpp:339
 msgid "Overall: Working"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:861 src/emu/ui/selsoft.cpp:771
+#: src/emu/ui/selgame.cpp:867 src/emu/ui/selsoft.cpp:770
 msgid "Graphics: Imperfect, "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:863 src/emu/ui/selsoft.cpp:773
+#: src/emu/ui/selgame.cpp:869 src/emu/ui/selsoft.cpp:772
 msgid "Graphics: OK, "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:866 src/emu/ui/selsoft.cpp:776
+#: src/emu/ui/selgame.cpp:872 src/emu/ui/selsoft.cpp:775
 msgid "Sound: Unimplemented"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:868 src/emu/ui/selsoft.cpp:778
+#: src/emu/ui/selgame.cpp:874 src/emu/ui/selsoft.cpp:777
 msgid "Sound: Imperfect"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:870 src/emu/ui/selsoft.cpp:780
+#: src/emu/ui/selgame.cpp:876 src/emu/ui/selsoft.cpp:779
 msgid "Sound: OK"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:887
+#: src/emu/ui/selgame.cpp:893
 #, c-format
 msgid "System: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:894 src/emu/ui/selsoft.cpp:805
+#: src/emu/ui/selgame.cpp:900 src/emu/ui/selsoft.cpp:804
 #, c-format
 msgid "Software is clone of: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:896 src/emu/ui/selsoft.cpp:807
+#: src/emu/ui/selgame.cpp:902 src/emu/ui/selsoft.cpp:806
 msgid "Software is parent"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:901 src/emu/ui/selsoft.cpp:812
+#: src/emu/ui/selgame.cpp:907 src/emu/ui/selsoft.cpp:811
 msgid "Supported: No"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:906 src/emu/ui/selsoft.cpp:817
+#: src/emu/ui/selgame.cpp:912 src/emu/ui/selsoft.cpp:816
 msgid "Supported: Partial"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:911 src/emu/ui/selsoft.cpp:822
+#: src/emu/ui/selgame.cpp:917 src/emu/ui/selsoft.cpp:821
 msgid "Supported: Yes"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:916 src/emu/ui/selsoft.cpp:827
+#: src/emu/ui/selgame.cpp:922 src/emu/ui/selsoft.cpp:826
 #, c-format
 msgid "romset: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:923
+#: src/emu/ui/selgame.cpp:929
 #, c-format
 msgid "%1$s %2$s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1535
+#: src/emu/ui/selgame.cpp:1543
 #, c-format
 msgid "Romset: %1$-.100s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1536
+#: src/emu/ui/selgame.cpp:1544
 #, c-format
 msgid "Year: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1537
+#: src/emu/ui/selgame.cpp:1545
 #, c-format
 msgid "Manufacturer: %1$-.100s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1541
+#: src/emu/ui/selgame.cpp:1549
 #, c-format
 msgid "Driver is Clone of: %1$-.100s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1543
+#: src/emu/ui/selgame.cpp:1551
 msgid "Driver is Parent\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1546
+#: src/emu/ui/selgame.cpp:1554
 msgid "Overall: NOT WORKING\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1548
+#: src/emu/ui/selgame.cpp:1556
 msgid "Overall: Unemulated Protection\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1550
+#: src/emu/ui/selgame.cpp:1558
 msgid "Overall: Working\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1553
+#: src/emu/ui/selgame.cpp:1561
 msgid "Graphics: Imperfect Colors\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1557
+#: src/emu/ui/selgame.cpp:1565
 msgid "Graphics: Imperfect\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1559
+#: src/emu/ui/selgame.cpp:1567
 msgid "Graphics: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1562
+#: src/emu/ui/selgame.cpp:1570
 msgid "Sound: Unimplemented\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1564
+#: src/emu/ui/selgame.cpp:1572
 msgid "Sound: Imperfect\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1566
+#: src/emu/ui/selgame.cpp:1574
 msgid "Sound: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1568
+#: src/emu/ui/selgame.cpp:1576
 #, c-format
 msgid "Driver is Skeleton: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1569
+#: src/emu/ui/selgame.cpp:1577
 #, c-format
 msgid "Game is Mechanical: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1570
+#: src/emu/ui/selgame.cpp:1578
 #, c-format
 msgid "Requires Artwork: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1571
+#: src/emu/ui/selgame.cpp:1579
 #, c-format
 msgid "Requires Clickable Artwork: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1572
+#: src/emu/ui/selgame.cpp:1580
 #, c-format
 msgid "Support Cocktail: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1573
+#: src/emu/ui/selgame.cpp:1581
 #, c-format
 msgid "Driver is Bios: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1574
+#: src/emu/ui/selgame.cpp:1582
 #, c-format
 msgid "Support Save: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 #, c-format
 msgid "Screen Orientation: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 msgid "Vertical"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 msgid "Horizontal"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/selgame.cpp:1591
 #, c-format
 msgid "Requires CHD: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1596
+#: src/emu/ui/selgame.cpp:1604
 msgid "Roms Audit Pass: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1598
+#: src/emu/ui/selgame.cpp:1606
 msgid "Roms Audit Pass: BAD\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1601
+#: src/emu/ui/selgame.cpp:1609
 msgid "Samples Audit Pass: None Needed\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1603
+#: src/emu/ui/selgame.cpp:1611
 msgid "Samples Audit Pass: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1605
+#: src/emu/ui/selgame.cpp:1613
 msgid "Samples Audit Pass: BAD\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1608
+#: src/emu/ui/selgame.cpp:1616
 msgid ""
 "Roms Audit Pass: Disabled\n"
 "Samples Audit Pass: Disabled\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:2049 src/emu/ui/selgame.cpp:2212
-#: src/emu/ui/selsoft.cpp:1662
+#: src/emu/ui/selgame.cpp:2055 src/emu/ui/selgame.cpp:2216
+#: src/emu/ui/selsoft.cpp:1655
 msgid "No Infos Available"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:2162 src/emu/ui/selsoft.cpp:1607
+#: src/emu/ui/selgame.cpp:2168 src/emu/ui/selsoft.cpp:1602
 msgid "Usage"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:110
-msgid " (default)"
-msgstr ""
-
-#: src/emu/ui/selsoft.cpp:381
+#: src/emu/ui/selsoft.cpp:380
 msgid ""
 "The selected software is missing one or more required files. Please select a "
 "different software.\n"
@@ -1270,57 +1286,57 @@ msgid ""
 "Press any key to continue."
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:684
+#: src/emu/ui/selsoft.cpp:683
 #, c-format
-msgid "%1$s %2$s ( %3$d / %4$d softwares )"
+msgid "%1$s %2$s ( %3$d / %4$d software packages )"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:685
+#: src/emu/ui/selsoft.cpp:684
 #, c-format
 msgid "Driver: \"%1$s\" software list "
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:688
+#: src/emu/ui/selsoft.cpp:687
 #, c-format
 msgid "Region: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:690
+#: src/emu/ui/selsoft.cpp:689
 #, c-format
 msgid "Publisher: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:692
+#: src/emu/ui/selsoft.cpp:691
 #, c-format
 msgid "Year: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:694
+#: src/emu/ui/selsoft.cpp:693
 #, c-format
 msgid "Software List: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:696
+#: src/emu/ui/selsoft.cpp:695
 #, c-format
 msgid "Device type: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:698
+#: src/emu/ui/selsoft.cpp:697
 #, c-format
 msgid "%s Search: %s_"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:748 src/emu/ui/selsoft.cpp:798
+#: src/emu/ui/selsoft.cpp:747 src/emu/ui/selsoft.cpp:797
 #: src/emu/ui/simpleselgame.cpp:325
 #, c-format
 msgid "%1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:1998 src/emu/ui/selsoft.cpp:2018
+#: src/emu/ui/selsoft.cpp:1991 src/emu/ui/selsoft.cpp:2011
 msgid "Software part selection:"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:2136 src/emu/ui/selsoft.cpp:2156
+#: src/emu/ui/selsoft.cpp:2129 src/emu/ui/selsoft.cpp:2149
 msgid "Bios selection:"
 msgstr ""
 
@@ -1368,15 +1384,15 @@ msgstr ""
 msgid " [internal]"
 msgstr ""
 
-#: src/emu/ui/sndmenu.cpp:135
+#: src/emu/ui/sndmenu.cpp:133
 msgid "Sound"
 msgstr ""
 
-#: src/emu/ui/sndmenu.cpp:136
+#: src/emu/ui/sndmenu.cpp:134
 msgid "Sample Rate"
 msgstr ""
 
-#: src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/sndmenu.cpp:135
 msgid "Use External Samples"
 msgstr ""
 
@@ -1445,80 +1461,80 @@ msgstr ""
 msgid "Fast Forward"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:419
+#: src/emu/ui/ui.cpp:418
 msgid "This driver requires images to be loaded in the following device(s): "
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1074
+#: src/emu/ui/ui.cpp:1071
 msgid ""
 "One or more ROMs/CHDs for this machine are incorrect. The machine may not "
 "run correctly.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1087
+#: src/emu/ui/ui.cpp:1084
 msgid ""
 "There are known problems with this machine\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1091
+#: src/emu/ui/ui.cpp:1088
 msgid ""
 "One or more ROMs/CHDs for this machine have not been correctly dumped.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1095
+#: src/emu/ui/ui.cpp:1092
 #, c-format
 msgid "The keyboard emulation may not be 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1097
+#: src/emu/ui/ui.cpp:1094
 #, c-format
 msgid "The colors aren't 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1099
+#: src/emu/ui/ui.cpp:1096
 msgid "The colors are completely wrong.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1101
+#: src/emu/ui/ui.cpp:1098
 #, c-format
 msgid "The video emulation isn't 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1103
+#: src/emu/ui/ui.cpp:1100
 #, c-format
 msgid "The sound emulation isn't 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1105
+#: src/emu/ui/ui.cpp:1102
 msgid "The machine lacks sound.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1108
+#: src/emu/ui/ui.cpp:1105
 msgid "Screen flipping in cocktail mode is not supported.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1112
+#: src/emu/ui/ui.cpp:1109
 msgid "The machine requires external artwork files\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1117
+#: src/emu/ui/ui.cpp:1114
 msgid ""
 "This machine was never completed. It may exhibit strange behavior or missing "
 "elements that are not bugs in the emulation.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1122
+#: src/emu/ui/ui.cpp:1119
 msgid ""
 "This machine has no sound hardware, MAME will produce no sounds, this is "
 "expected behaviour.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1130
+#: src/emu/ui/ui.cpp:1127
 msgid "The machine has protection which isn't fully emulated.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1133
+#: src/emu/ui/ui.cpp:1130
 msgid ""
 "\n"
 "THIS MACHINE DOESN'T WORK. The emulation for this machine is not yet "
@@ -1526,7 +1542,7 @@ msgid ""
 "the developers to improve the emulation.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1137
+#: src/emu/ui/ui.cpp:1134
 msgid ""
 "\n"
 "Certain elements of this machine cannot be emulated as it requires actual "
@@ -1534,21 +1550,21 @@ msgid ""
 "to fully play this machine.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1156
+#: src/emu/ui/ui.cpp:1153
 msgid ""
 "\n"
 "\n"
 "There are working clones of this machine: "
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1170
+#: src/emu/ui/ui.cpp:1167
 msgid ""
 "\n"
 "\n"
 "Press any key to continue"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1185
+#: src/emu/ui/ui.cpp:1182
 #, c-format
 msgid ""
 "%1$s\n"
@@ -1558,98 +1574,98 @@ msgid ""
 "CPU:\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1221 src/emu/ui/ui.cpp:1260
+#: src/emu/ui/ui.cpp:1218 src/emu/ui/ui.cpp:1257
 msgid "MHz"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1221 src/emu/ui/ui.cpp:1260
+#: src/emu/ui/ui.cpp:1218 src/emu/ui/ui.cpp:1257
 msgid "kHz"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1235
+#: src/emu/ui/ui.cpp:1232
 msgid ""
 "\n"
 "Sound:\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1264
+#: src/emu/ui/ui.cpp:1261
 msgid ""
 "\n"
 "Video:\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1268
+#: src/emu/ui/ui.cpp:1265
 msgid "None\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1275
+#: src/emu/ui/ui.cpp:1272
 msgid "Vector"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1286
+#: src/emu/ui/ui.cpp:1283
 #, c-format
 msgid "%1$s: %2$s\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1286
+#: src/emu/ui/ui.cpp:1283
 msgid "%2$s\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1541 src/emu/ui/ui.cpp:1551
+#: src/emu/ui/ui.cpp:1538 src/emu/ui/ui.cpp:1548
 msgid "Keyboard Emulation Status"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1543
+#: src/emu/ui/ui.cpp:1540
 msgid "Mode: PARTIAL Emulation"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1544
+#: src/emu/ui/ui.cpp:1541
 msgid "UI:   Enabled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1546 src/emu/ui/ui.cpp:1556
+#: src/emu/ui/ui.cpp:1543 src/emu/ui/ui.cpp:1553
 msgid "**Use ScrLock to toggle**"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1553
+#: src/emu/ui/ui.cpp:1550
 msgid "Mode: FULL Emulation"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1554
+#: src/emu/ui/ui.cpp:1551
 msgid "UI:   Disabled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1692
+#: src/emu/ui/ui.cpp:1689
 msgid "Autofire can't be enabled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1731
+#: src/emu/ui/ui.cpp:1728
 msgid "Select position to save to"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1733
+#: src/emu/ui/ui.cpp:1730
 msgid "Select position to load from"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1757
+#: src/emu/ui/ui.cpp:1754
 msgid "Save cancelled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1759
+#: src/emu/ui/ui.cpp:1756
 msgid "Load cancelled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1802
+#: src/emu/ui/ui.cpp:1799
 #, c-format
 msgid "Save to position %s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1807
+#: src/emu/ui/ui.cpp:1804
 #, c-format
 msgid "Load from position %s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1847
+#: src/emu/ui/ui.cpp:1844
 #, c-format
 msgid ""
 "Are you sure you want to quit?\n"
@@ -1658,173 +1674,173 @@ msgid ""
 "Press ''%2$s'' to return to emulation."
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1917
+#: src/emu/ui/ui.cpp:1914
 msgid "Master Volume"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1926
+#: src/emu/ui/ui.cpp:1923
 #, c-format
 msgid "%1$s Volume"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1949
+#: src/emu/ui/ui.cpp:1946
 #, c-format
 msgid "Overclock CPU %1$s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1968
+#: src/emu/ui/ui.cpp:1965
 #, c-format
 msgid "%1$s Refresh Rate"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1973
+#: src/emu/ui/ui.cpp:1970
 #, c-format
 msgid "%1$s Brightness"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1975
+#: src/emu/ui/ui.cpp:1972
 #, c-format
 msgid "%1$s Contrast"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1977
+#: src/emu/ui/ui.cpp:1974
 #, c-format
 msgid "%1$s Gamma"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1981
+#: src/emu/ui/ui.cpp:1978
 #, c-format
 msgid "%1$s Horiz Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1983
+#: src/emu/ui/ui.cpp:1980
 #, c-format
 msgid "%1$s Horiz Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1985
+#: src/emu/ui/ui.cpp:1982
 #, c-format
 msgid "%1$s Vert Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1987
+#: src/emu/ui/ui.cpp:1984
 #, c-format
 msgid "%1$s Vert Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2005
+#: src/emu/ui/ui.cpp:2002
 #, c-format
 msgid "Laserdisc '%1$s' Horiz Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2007
+#: src/emu/ui/ui.cpp:2004
 #, c-format
 msgid "Laserdisc '%1$s' Horiz Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2009
+#: src/emu/ui/ui.cpp:2006
 #, c-format
 msgid "Laserdisc '%1$s' Vert Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2011
+#: src/emu/ui/ui.cpp:2008
 #, c-format
 msgid "Laserdisc '%1$s' Vert Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2021
+#: src/emu/ui/ui.cpp:2018
 msgid "Vector Flicker"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2022
+#: src/emu/ui/ui.cpp:2019
 msgid "Beam Width Minimum"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2023
+#: src/emu/ui/ui.cpp:2020
 msgid "Beam Width Maximum"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2024
+#: src/emu/ui/ui.cpp:2021
 msgid "Beam Intensity Weight"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2037
+#: src/emu/ui/ui.cpp:2034
 #, c-format
 msgid "Crosshair Scale %1$s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2037 src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2034 src/emu/ui/ui.cpp:2036
 msgid "X"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2037 src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2034 src/emu/ui/ui.cpp:2036
 msgid "Y"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2036
 #, c-format
 msgid "Crosshair Offset %1$s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2071
+#: src/emu/ui/ui.cpp:2068
 #, c-format
 msgid "%1$3ddB"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2115
+#: src/emu/ui/ui.cpp:2112
 #, c-format
 msgid "%1$d%%"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2131
+#: src/emu/ui/ui.cpp:2128
 #, c-format
 msgid "%1$3.0f%%"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2154
+#: src/emu/ui/ui.cpp:2151
 #, c-format
 msgid "%1$.3ffps"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2177 src/emu/ui/ui.cpp:2199 src/emu/ui/ui.cpp:2220
-#: src/emu/ui/ui.cpp:2242 src/emu/ui/ui.cpp:2264 src/emu/ui/ui.cpp:2286
-#: src/emu/ui/ui.cpp:2308 src/emu/ui/ui.cpp:2330 src/emu/ui/ui.cpp:2352
-#: src/emu/ui/ui.cpp:2374 src/emu/ui/ui.cpp:2396
+#: src/emu/ui/ui.cpp:2174 src/emu/ui/ui.cpp:2196 src/emu/ui/ui.cpp:2217
+#: src/emu/ui/ui.cpp:2239 src/emu/ui/ui.cpp:2261 src/emu/ui/ui.cpp:2283
+#: src/emu/ui/ui.cpp:2305 src/emu/ui/ui.cpp:2327 src/emu/ui/ui.cpp:2349
+#: src/emu/ui/ui.cpp:2371 src/emu/ui/ui.cpp:2393
 #, c-format
 msgid "%1$.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2412 src/emu/ui/ui.cpp:2428 src/emu/ui/ui.cpp:2444
-#: src/emu/ui/ui.cpp:2460
+#: src/emu/ui/ui.cpp:2408 src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2438
+#: src/emu/ui/ui.cpp:2453
 #, c-format
 msgid "%1$1.2f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2476
+#: src/emu/ui/ui.cpp:2469
 #, c-format
 msgid "Screen '%1$s'"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2478
+#: src/emu/ui/ui.cpp:2471
 msgid "Screen"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2494
+#: src/emu/ui/ui.cpp:2487
 #, c-format
 msgid "Crosshair Scale X %1$1.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2494
+#: src/emu/ui/ui.cpp:2487
 #, c-format
 msgid "Crosshair Scale Y %1$1.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2513
+#: src/emu/ui/ui.cpp:2506
 #, c-format
 msgid "Crosshair Offset X %1$1.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2513
+#: src/emu/ui/ui.cpp:2506
 #, c-format
 msgid "Crosshair Offset Y %1$1.3f"
 msgstr ""
@@ -1866,10 +1882,10 @@ msgstr ""
 msgid "Full"
 msgstr ""
 
-#: src/emu/ui/viewgfx.cpp:392
+#: src/emu/ui/viewgfx.cpp:391
 msgid " COLORS"
 msgstr ""
 
-#: src/emu/ui/viewgfx.cpp:392
+#: src/emu/ui/viewgfx.cpp:391
 msgid " PENS"
 msgstr ""
diff --git a/language/Spanish/strings.po b/language/Spanish/strings.po
index 460706224a4..5ab915cf4a9 100644
--- a/language/Spanish/strings.po
+++ b/language/Spanish/strings.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MAME\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-11 03:33+0200\n"
+"POT-Creation-Date: 2016-04-15 17:42+0200\n"
 "PO-Revision-Date: 2016-03-05 13:02+0100\n"
 "Last-Translator: aviloria\n"
 "Language-Team: Español; Castellano <>\n"
@@ -65,14 +65,14 @@ msgstr "Recargar todo"
 msgid "Autofire Status"
 msgstr "Estado del disparo automático"
 
-#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1698
+#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1695
 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211
 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219
 #: src/emu/ui/videoopt.cpp:223
 msgid "Disabled"
 msgstr "Desactivado"
 
-#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1698
+#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1695
 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211
 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219
 #: src/emu/ui/videoopt.cpp:223
@@ -80,14 +80,14 @@ msgid "Enabled"
 msgstr "Activado"
 
 #: src/emu/ui/cheatopt.cpp:282 src/emu/ui/cheatopt.cpp:288
-#: src/emu/ui/menu.cpp:710 src/emu/ui/miscmenu.cpp:831
-#: src/emu/ui/sndmenu.cpp:135 src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/menu.cpp:755 src/emu/ui/miscmenu.cpp:936
+#: src/emu/ui/sndmenu.cpp:133 src/emu/ui/sndmenu.cpp:135
 msgid "On"
 msgstr "Sí"
 
 #: src/emu/ui/cheatopt.cpp:282 src/emu/ui/cheatopt.cpp:288
-#: src/emu/ui/menu.cpp:713 src/emu/ui/miscmenu.cpp:831
-#: src/emu/ui/sndmenu.cpp:135 src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/menu.cpp:758 src/emu/ui/miscmenu.cpp:936
+#: src/emu/ui/sndmenu.cpp:133 src/emu/ui/sndmenu.cpp:135
 msgid "Off"
 msgstr "No"
 
@@ -99,318 +99,318 @@ msgstr "No se han encontrado botones en esta máquina."
 msgid "Autofire Delay"
 msgstr "Retardo del disparo automático"
 
-#: src/emu/ui/custmenu.cpp:158 src/emu/ui/custmenu.cpp:447
+#: src/emu/ui/custmenu.cpp:157 src/emu/ui/custmenu.cpp:445
 msgid "Main filter"
 msgstr "Filtro principal"
 
-#: src/emu/ui/custmenu.cpp:167 src/emu/ui/custmenu.cpp:456
+#: src/emu/ui/custmenu.cpp:166 src/emu/ui/custmenu.cpp:454
 msgid "Other filter"
 msgstr "Otros filtros"
 
-#: src/emu/ui/custmenu.cpp:176 src/emu/ui/optsmenu.cpp:239
+#: src/emu/ui/custmenu.cpp:175 src/emu/ui/optsmenu.cpp:238
 msgid "^!Manufacturer"
 msgstr "^!Fabricante"
 
-#: src/emu/ui/custmenu.cpp:185 src/emu/ui/custmenu.cpp:474
-#: src/emu/ui/optsmenu.cpp:247
+#: src/emu/ui/custmenu.cpp:184 src/emu/ui/custmenu.cpp:472
+#: src/emu/ui/optsmenu.cpp:246
 msgid "^!Year"
 msgstr "^!Año"
 
-#: src/emu/ui/custmenu.cpp:194 src/emu/ui/custmenu.cpp:510
+#: src/emu/ui/custmenu.cpp:193 src/emu/ui/custmenu.cpp:508
 msgid "Remove last filter"
 msgstr "Eliminar último filtro"
 
-#: src/emu/ui/custmenu.cpp:197 src/emu/ui/custmenu.cpp:513
+#: src/emu/ui/custmenu.cpp:196 src/emu/ui/custmenu.cpp:511
 msgid "Add filter"
 msgstr "Añadir filtro"
 
-#: src/emu/ui/custmenu.cpp:212 src/emu/ui/custmenu.cpp:233
-#: src/emu/ui/custmenu.cpp:529 src/emu/ui/custmenu.cpp:550
+#: src/emu/ui/custmenu.cpp:211 src/emu/ui/custmenu.cpp:231
+#: src/emu/ui/custmenu.cpp:527 src/emu/ui/custmenu.cpp:547
 msgid "Select custom filters:"
 msgstr "Seleccionar filtros personalizados:"
 
-#: src/emu/ui/custmenu.cpp:465
+#: src/emu/ui/custmenu.cpp:463
 msgid "^!Publisher"
 msgstr "^!Editor"
 
-#: src/emu/ui/custmenu.cpp:483
+#: src/emu/ui/custmenu.cpp:481
 msgid "^!Software List"
 msgstr "^!Lista de software"
 
-#: src/emu/ui/custmenu.cpp:492
+#: src/emu/ui/custmenu.cpp:490
 msgid "^!Device type"
 msgstr "^!Tipo de dispositivo"
 
-#: src/emu/ui/custmenu.cpp:501
+#: src/emu/ui/custmenu.cpp:499
 msgid "^!Region"
 msgstr "^!Región"
 
-#: src/emu/ui/custui.cpp:23
+#: src/emu/ui/custui.cpp:22
 msgid "Show All"
 msgstr "Mostrar todo"
 
-#: src/emu/ui/custui.cpp:24
+#: src/emu/ui/custui.cpp:23
 msgid "Hide Filters"
 msgstr "Ocultar filtros"
 
-#: src/emu/ui/custui.cpp:25
+#: src/emu/ui/custui.cpp:24
 msgid "Hide Info/Image"
 msgstr "Ocultar detalles/imagen"
 
-#: src/emu/ui/custui.cpp:26
+#: src/emu/ui/custui.cpp:25
 msgid "Hide Both"
 msgstr "Ocultar ambos"
 
-#: src/emu/ui/custui.cpp:142
+#: src/emu/ui/custui.cpp:141
 msgid "Fonts"
 msgstr "Tipografía"
 
-#: src/emu/ui/custui.cpp:143
+#: src/emu/ui/custui.cpp:142
 msgid "Colors"
 msgstr "Colores"
 
-#: src/emu/ui/custui.cpp:148 src/emu/ui/dirmenu.cpp:33
+#: src/emu/ui/custui.cpp:147 src/emu/ui/dirmenu.cpp:33
 msgid "Language"
 msgstr "Idioma"
 
-#: src/emu/ui/custui.cpp:152
+#: src/emu/ui/custui.cpp:151
 msgid "Show side panels"
 msgstr "Mostrar paneles laterales"
 
-#: src/emu/ui/custui.cpp:167 src/emu/ui/custui.cpp:188
+#: src/emu/ui/custui.cpp:166 src/emu/ui/custui.cpp:186
 msgid "Custom UI Settings"
 msgstr "Ajustes de interfaz"
 
-#: src/emu/ui/custui.cpp:246
+#: src/emu/ui/custui.cpp:244
 msgid "default"
 msgstr "predeterminado"
 
-#: src/emu/ui/custui.cpp:349
+#: src/emu/ui/custui.cpp:347
 msgid "UI Font"
 msgstr "Tipografía de interfaz"
 
-#: src/emu/ui/custui.cpp:354
+#: src/emu/ui/custui.cpp:352
 msgid "Bold"
 msgstr "Negrita"
 
-#: src/emu/ui/custui.cpp:355
+#: src/emu/ui/custui.cpp:353
 msgid "Italic"
 msgstr "Cursiva"
 
-#: src/emu/ui/custui.cpp:360
+#: src/emu/ui/custui.cpp:358
 msgid "Lines"
 msgstr "Líneas"
 
-#: src/emu/ui/custui.cpp:366
+#: src/emu/ui/custui.cpp:364
 msgid "Infos text size"
 msgstr "Tamaño del texto informativo"
 
-#: src/emu/ui/custui.cpp:383
+#: src/emu/ui/custui.cpp:381
 msgid "UI Fonts Settings"
 msgstr "Ajustes tipográficos de interfaz"
 
-#: src/emu/ui/custui.cpp:411
+#: src/emu/ui/custui.cpp:408
 msgid "Sample text - Lorem ipsum dolor sit amet, consectetur adipiscing elit."
 msgstr ""
 "Texto de ejemplo - Lorem ipsum dolor sit amet, consectetur adipiscing elit. "
 "La cigüeña olía el paté de atún del camión más lejano."
 
-#: src/emu/ui/custui.cpp:509
+#: src/emu/ui/custui.cpp:506
 msgid "Normal text"
 msgstr "Texto normal"
 
-#: src/emu/ui/custui.cpp:510
+#: src/emu/ui/custui.cpp:507
 msgid "Selected color"
 msgstr "Texto seleccionado"
 
-#: src/emu/ui/custui.cpp:511
+#: src/emu/ui/custui.cpp:508
 msgid "Normal text background"
 msgstr "Fondo del texto normal"
 
-#: src/emu/ui/custui.cpp:512
+#: src/emu/ui/custui.cpp:509
 msgid "Selected background color"
 msgstr "Fondo del texto seleccionado"
 
-#: src/emu/ui/custui.cpp:513
+#: src/emu/ui/custui.cpp:510
 msgid "Subitem color"
 msgstr "Color elem. secundarios"
 
-#: src/emu/ui/custui.cpp:514 src/emu/ui/custui.cpp:610
+#: src/emu/ui/custui.cpp:511 src/emu/ui/custui.cpp:606
 msgid "Clone"
 msgstr "Copiar"
 
-#: src/emu/ui/custui.cpp:515
+#: src/emu/ui/custui.cpp:512
 msgid "Border"
 msgstr "Borde"
 
-#: src/emu/ui/custui.cpp:516
+#: src/emu/ui/custui.cpp:513
 msgid "Background"
 msgstr "Fondo"
 
-#: src/emu/ui/custui.cpp:517
+#: src/emu/ui/custui.cpp:514
 msgid "Dipswitch"
 msgstr "Interruptor DIP"
 
-#: src/emu/ui/custui.cpp:518
+#: src/emu/ui/custui.cpp:515
 msgid "Unavailable color"
 msgstr "Color no disponible"
 
-#: src/emu/ui/custui.cpp:519
+#: src/emu/ui/custui.cpp:516
 msgid "Slider color"
 msgstr "Color del control deslizante"
 
-#: src/emu/ui/custui.cpp:520
+#: src/emu/ui/custui.cpp:517
 msgid "Gfx viewer background"
 msgstr "Fondo del visor de efectos"
 
-#: src/emu/ui/custui.cpp:521
+#: src/emu/ui/custui.cpp:518
 msgid "Mouse over color"
 msgstr "Color al resaltar con ratón"
 
-#: src/emu/ui/custui.cpp:522
+#: src/emu/ui/custui.cpp:519
 msgid "Mouse over background color"
 msgstr "Fondo al resaltar con ratón"
 
-#: src/emu/ui/custui.cpp:523
+#: src/emu/ui/custui.cpp:520
 msgid "Mouse down color"
 msgstr "Color al seleccionar con ratón"
 
-#: src/emu/ui/custui.cpp:524
+#: src/emu/ui/custui.cpp:521
 msgid "Mouse down background color"
 msgstr "Fondo al seleccionar con ratón"
 
-#: src/emu/ui/custui.cpp:527
+#: src/emu/ui/custui.cpp:524
 msgid "Restore originals colors"
 msgstr "Restaurar colores originales"
 
-#: src/emu/ui/custui.cpp:543
+#: src/emu/ui/custui.cpp:540
 msgid "UI Colors Settings"
 msgstr "Ajustes de color de interfaz"
 
-#: src/emu/ui/custui.cpp:572
+#: src/emu/ui/custui.cpp:568
 #, c-format
 msgid "Double click or press %1$s to change the color value"
 msgstr "Haz doble clic o pulsa %1$s para cambiar el color"
 
-#: src/emu/ui/custui.cpp:598
+#: src/emu/ui/custui.cpp:594
 msgid "Menu Preview"
 msgstr "Vista previa"
 
-#: src/emu/ui/custui.cpp:606
+#: src/emu/ui/custui.cpp:602
 msgid "Normal"
 msgstr "Normal"
 
-#: src/emu/ui/custui.cpp:607
+#: src/emu/ui/custui.cpp:603
 msgid "Subitem"
 msgstr "Elem. secundario"
 
-#: src/emu/ui/custui.cpp:608
+#: src/emu/ui/custui.cpp:604
 msgid "Selected"
 msgstr "Seleccionado"
 
-#: src/emu/ui/custui.cpp:609
+#: src/emu/ui/custui.cpp:605
 msgid "Mouse Over"
 msgstr "Resaltado"
 
-#: src/emu/ui/custui.cpp:841 src/emu/ui/custui.cpp:844
+#: src/emu/ui/custui.cpp:837 src/emu/ui/custui.cpp:840
 msgid "Alpha"
 msgstr "Transparencia"
 
-#: src/emu/ui/custui.cpp:849 src/emu/ui/custui.cpp:852
-#: src/emu/ui/custui.cpp:1013
+#: src/emu/ui/custui.cpp:845 src/emu/ui/custui.cpp:848
+#: src/emu/ui/custui.cpp:1007
 msgid "Red"
 msgstr "Rojo"
 
-#: src/emu/ui/custui.cpp:857 src/emu/ui/custui.cpp:860
-#: src/emu/ui/custui.cpp:1016
+#: src/emu/ui/custui.cpp:853 src/emu/ui/custui.cpp:856
+#: src/emu/ui/custui.cpp:1010
 msgid "Green"
 msgstr "Verde"
 
-#: src/emu/ui/custui.cpp:865 src/emu/ui/custui.cpp:868
-#: src/emu/ui/custui.cpp:1017
+#: src/emu/ui/custui.cpp:861 src/emu/ui/custui.cpp:864
+#: src/emu/ui/custui.cpp:1011
 msgid "Blue"
 msgstr "Azul"
 
-#: src/emu/ui/custui.cpp:871
+#: src/emu/ui/custui.cpp:867
 msgid "Choose from palette"
 msgstr "Elegir colores más básicos"
 
-#: src/emu/ui/custui.cpp:887
+#: src/emu/ui/custui.cpp:883
 msgid " - ARGB Settings"
 msgstr " - Ajustes ARGB"
 
-#: src/emu/ui/custui.cpp:912
+#: src/emu/ui/custui.cpp:907
 msgid "Color preview ="
 msgstr "Vista previa ="
 
-#: src/emu/ui/custui.cpp:1009
+#: src/emu/ui/custui.cpp:1003
 msgid "White"
 msgstr "Blanco"
 
-#: src/emu/ui/custui.cpp:1010
+#: src/emu/ui/custui.cpp:1004
 msgid "Silver"
 msgstr "Plateado"
 
-#: src/emu/ui/custui.cpp:1011
+#: src/emu/ui/custui.cpp:1005
 msgid "Gray"
 msgstr "Gris"
 
-#: src/emu/ui/custui.cpp:1012
+#: src/emu/ui/custui.cpp:1006
 msgid "Black"
 msgstr "Negro"
 
-#: src/emu/ui/custui.cpp:1014
+#: src/emu/ui/custui.cpp:1008
 msgid "Orange"
 msgstr "Naranja"
 
-#: src/emu/ui/custui.cpp:1015
+#: src/emu/ui/custui.cpp:1009
 msgid "Yellow"
 msgstr "Amarillo"
 
-#: src/emu/ui/custui.cpp:1018
+#: src/emu/ui/custui.cpp:1012
 msgid "Violet"
 msgstr "Violeta"
 
-#: src/emu/ui/datmenu.cpp:65
+#: src/emu/ui/datmenu.cpp:64
 msgid "Software History"
 msgstr "Historial de cambios"
 
-#: src/emu/ui/datmenu.cpp:67
+#: src/emu/ui/datmenu.cpp:66
 msgid "Software Usage"
 msgstr "Forma de uso"
 
-#: src/emu/ui/datmenu.cpp:199
+#: src/emu/ui/datmenu.cpp:196
 msgid "Revision: "
 msgstr "Revisión: "
 
-#: src/emu/ui/datmenu.cpp:287 src/emu/ui/selgame.cpp:40
-#: src/emu/ui/selgame.cpp:2152 src/emu/ui/selgame.cpp:2161
-#: src/emu/ui/selsoft.cpp:1577 src/emu/ui/selsoft.cpp:1597
-#: src/emu/ui/selsoft.cpp:1606
+#: src/emu/ui/datmenu.cpp:284 src/emu/ui/selgame.cpp:39
+#: src/emu/ui/selgame.cpp:2158 src/emu/ui/selgame.cpp:2167
+#: src/emu/ui/selsoft.cpp:1574 src/emu/ui/selsoft.cpp:1592
+#: src/emu/ui/selsoft.cpp:1601
 msgid "History"
 msgstr "Historial"
 
-#: src/emu/ui/datmenu.cpp:289 src/emu/ui/selgame.cpp:41
+#: src/emu/ui/datmenu.cpp:286 src/emu/ui/selgame.cpp:40
 msgid "Mameinfo"
 msgstr "Información de MAME"
 
-#: src/emu/ui/datmenu.cpp:291 src/emu/ui/selgame.cpp:43
+#: src/emu/ui/datmenu.cpp:288 src/emu/ui/selgame.cpp:42
 msgid "Messinfo"
 msgstr "Información de MESS"
 
-#: src/emu/ui/datmenu.cpp:293 src/emu/ui/selgame.cpp:42
+#: src/emu/ui/datmenu.cpp:290 src/emu/ui/selgame.cpp:41
 msgid "Sysinfo"
 msgstr "Información del sistema"
 
-#: src/emu/ui/datmenu.cpp:295 src/emu/ui/selgame.cpp:46
+#: src/emu/ui/datmenu.cpp:292 src/emu/ui/selgame.cpp:45
 msgid "Mamescore"
 msgstr "Puntuación MAME"
 
-#: src/emu/ui/datmenu.cpp:297 src/emu/ui/selgame.cpp:45
+#: src/emu/ui/datmenu.cpp:294 src/emu/ui/selgame.cpp:44
 msgid "Gameinit"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:299 src/emu/ui/selgame.cpp:44
+#: src/emu/ui/datmenu.cpp:296 src/emu/ui/selgame.cpp:43
 msgid "Command"
 msgstr "Orden"
 
@@ -562,75 +562,75 @@ msgstr "Pulsa TAB para establecer"
 msgid "Remove %1$s Folder"
 msgstr "Borrar carpeta %1$s"
 
-#: src/emu/ui/filesel.cpp:158
+#: src/emu/ui/filesel.cpp:161
 msgid "File Already Exists - Override?"
 msgstr "El archivo ya existe ¿Quieres sobreescribirlo?"
 
-#: src/emu/ui/filesel.cpp:160 src/emu/ui/selgame.cpp:1568
-#: src/emu/ui/selgame.cpp:1569 src/emu/ui/selgame.cpp:1570
-#: src/emu/ui/selgame.cpp:1571 src/emu/ui/selgame.cpp:1572
-#: src/emu/ui/selgame.cpp:1573 src/emu/ui/selgame.cpp:1574
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/filesel.cpp:163 src/emu/ui/selgame.cpp:1576
+#: src/emu/ui/selgame.cpp:1577 src/emu/ui/selgame.cpp:1578
+#: src/emu/ui/selgame.cpp:1579 src/emu/ui/selgame.cpp:1580
+#: src/emu/ui/selgame.cpp:1581 src/emu/ui/selgame.cpp:1582
+#: src/emu/ui/selgame.cpp:1591
 msgid "No"
 msgstr "No"
 
-#: src/emu/ui/filesel.cpp:161 src/emu/ui/selgame.cpp:1568
-#: src/emu/ui/selgame.cpp:1569 src/emu/ui/selgame.cpp:1570
-#: src/emu/ui/selgame.cpp:1571 src/emu/ui/selgame.cpp:1572
-#: src/emu/ui/selgame.cpp:1573 src/emu/ui/selgame.cpp:1574
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/filesel.cpp:164 src/emu/ui/selgame.cpp:1576
+#: src/emu/ui/selgame.cpp:1577 src/emu/ui/selgame.cpp:1578
+#: src/emu/ui/selgame.cpp:1579 src/emu/ui/selgame.cpp:1580
+#: src/emu/ui/selgame.cpp:1581 src/emu/ui/selgame.cpp:1582
+#: src/emu/ui/selgame.cpp:1591
 msgid "Yes"
 msgstr "Sí"
 
-#: src/emu/ui/filesel.cpp:272
+#: src/emu/ui/filesel.cpp:275
 msgid "New Image Name:"
 msgstr "Nuevo nombre de imagen:"
 
-#: src/emu/ui/filesel.cpp:278
+#: src/emu/ui/filesel.cpp:281
 msgid "Image Format:"
 msgstr "Formato de imagen:"
 
-#: src/emu/ui/filesel.cpp:284
+#: src/emu/ui/filesel.cpp:287
 msgid "Create"
 msgstr "Crear"
 
-#: src/emu/ui/filesel.cpp:315
+#: src/emu/ui/filesel.cpp:318
 msgid "Please enter a file extension too"
 msgstr "Por favor, introduzca también la extensión del fichero"
 
-#: src/emu/ui/filesel.cpp:503 src/emu/ui/swlist.cpp:65
+#: src/emu/ui/filesel.cpp:506 src/emu/ui/swlist.cpp:65
 msgid "[empty slot]"
 msgstr "[ranura vacía]"
 
-#: src/emu/ui/filesel.cpp:507
+#: src/emu/ui/filesel.cpp:510
 msgid "[create]"
 msgstr "[crear]"
 
-#: src/emu/ui/filesel.cpp:511 src/emu/ui/swlist.cpp:76
+#: src/emu/ui/filesel.cpp:514 src/emu/ui/swlist.cpp:76
 msgid "[software list]"
 msgstr "[lista de software]"
 
-#: src/emu/ui/filesel.cpp:803
+#: src/emu/ui/filesel.cpp:806
 msgid "Select image format"
 msgstr "Elige el formato de imagen"
 
-#: src/emu/ui/filesel.cpp:863
+#: src/emu/ui/filesel.cpp:866
 msgid "Select access mode"
 msgstr "Elige el modo de acceso"
 
-#: src/emu/ui/filesel.cpp:864
+#: src/emu/ui/filesel.cpp:867
 msgid "Read-only"
 msgstr "Sólo lectura"
 
-#: src/emu/ui/filesel.cpp:866
+#: src/emu/ui/filesel.cpp:869
 msgid "Read-write"
 msgstr "Lectura y escritura"
 
-#: src/emu/ui/filesel.cpp:867
+#: src/emu/ui/filesel.cpp:870
 msgid "Read this image, write to another image"
 msgstr "Leer esta imagen, escribir en otra imagen"
 
-#: src/emu/ui/filesel.cpp:868
+#: src/emu/ui/filesel.cpp:871
 msgid "Read this image, write to diff"
 msgstr "Leer esta imagen, escribir en diferencial"
 
@@ -658,7 +658,7 @@ msgstr "Soportado parcialmente"
 msgid "[empty]"
 msgstr "[vacío]"
 
-#: src/emu/ui/info_pty.cpp:26 src/emu/ui/mainmenu.cpp:91
+#: src/emu/ui/info_pty.cpp:26 src/emu/ui/mainmenu.cpp:96
 msgid "Pseudo terminals"
 msgstr "Pseudoterminales"
 
@@ -674,7 +674,7 @@ msgstr "Interfaz de usuario"
 msgid "Other Controls"
 msgstr "Otros controles"
 
-#: src/emu/ui/inputmap.cpp:622 src/emu/ui/miscmenu.cpp:91
+#: src/emu/ui/inputmap.cpp:622 src/emu/ui/miscmenu.cpp:92
 #: src/emu/ui/slotopt.cpp:172
 msgid "Reset"
 msgstr "Restablecer"
@@ -707,27 +707,27 @@ msgstr "Información contable"
 msgid "Machine Information"
 msgstr "Información de máquina"
 
-#: src/emu/ui/mainmenu.cpp:78
+#: src/emu/ui/mainmenu.cpp:80
 msgid "Image Information"
 msgstr "Información de imagen"
 
-#: src/emu/ui/mainmenu.cpp:81
+#: src/emu/ui/mainmenu.cpp:83
 msgid "File Manager"
 msgstr "Administrador de archivos"
 
-#: src/emu/ui/mainmenu.cpp:86
+#: src/emu/ui/mainmenu.cpp:92
 msgid "Tape Control"
 msgstr "Control de cinta"
 
-#: src/emu/ui/mainmenu.cpp:94
+#: src/emu/ui/mainmenu.cpp:99
 msgid "Bios Selection"
 msgstr "Selección de BIOS"
 
-#: src/emu/ui/mainmenu.cpp:100
+#: src/emu/ui/mainmenu.cpp:104
 msgid "Slot Devices"
 msgstr "Ranuras de monedas"
 
-#: src/emu/ui/mainmenu.cpp:107
+#: src/emu/ui/mainmenu.cpp:109
 msgid "Barcode Reader"
 msgstr "Lector de código de barras"
 
@@ -735,43 +735,43 @@ msgstr "Lector de código de barras"
 msgid "Network Devices"
 msgstr "Dispositivos de red"
 
-#: src/emu/ui/mainmenu.cpp:119
+#: src/emu/ui/mainmenu.cpp:118
 msgid "Keyboard Mode"
 msgstr "Modo del teclado"
 
-#: src/emu/ui/mainmenu.cpp:122
+#: src/emu/ui/mainmenu.cpp:121
 msgid "Slider Controls"
 msgstr "Controles deslizantes"
 
-#: src/emu/ui/mainmenu.cpp:125
+#: src/emu/ui/mainmenu.cpp:124
 msgid "Video Options"
 msgstr "Opciones de vídeo"
 
-#: src/emu/ui/mainmenu.cpp:129
+#: src/emu/ui/mainmenu.cpp:128
 msgid "Crosshair Options"
 msgstr "Opciones de diana"
 
-#: src/emu/ui/mainmenu.cpp:133
+#: src/emu/ui/mainmenu.cpp:132
 msgid "Cheat"
 msgstr "Truco"
 
-#: src/emu/ui/mainmenu.cpp:136
+#: src/emu/ui/mainmenu.cpp:135
 msgid "Plugin Options"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:140
+#: src/emu/ui/mainmenu.cpp:139
 msgid "External DAT View"
 msgstr "Vista DAT externa"
 
-#: src/emu/ui/mainmenu.cpp:146
+#: src/emu/ui/mainmenu.cpp:145 src/emu/ui/miscmenu.cpp:785
 msgid "Add To Favorites"
 msgstr "Añadir a favoritos"
 
-#: src/emu/ui/mainmenu.cpp:148
+#: src/emu/ui/mainmenu.cpp:147 src/emu/ui/miscmenu.cpp:787
 msgid "Remove From Favorites"
 msgstr "Borrar de favoritos"
 
-#: src/emu/ui/mainmenu.cpp:155
+#: src/emu/ui/mainmenu.cpp:154
 msgid "Select New Machine"
 msgstr "Elegir máquina nueva"
 
@@ -811,31 +811,31 @@ msgstr "Salir"
 msgid "Return to Previous Menu"
 msgstr "Volver al menú anterior"
 
-#: src/emu/ui/menu.cpp:716
+#: src/emu/ui/menu.cpp:761
 msgid "Auto"
 msgstr "Automát."
 
-#: src/emu/ui/menu.cpp:2133
+#: src/emu/ui/menu.cpp:2195
 msgid "Images"
 msgstr "Imágenes"
 
-#: src/emu/ui/menu.cpp:2134
+#: src/emu/ui/menu.cpp:2196
 msgid "Infos"
 msgstr "Informaciones"
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Keyboard Mode:"
 msgstr "Modo del teclado:"
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Natural"
 msgstr "Natural"
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Emulated"
 msgstr "Emulado"
 
-#: src/emu/ui/miscmenu.cpp:240
+#: src/emu/ui/miscmenu.cpp:241
 #, c-format
 msgid ""
 "Uptime: %1$d:%2$02d:%3$02d\n"
@@ -844,7 +844,7 @@ msgstr ""
 "Tiempo encendido: %1$d:%2$02d:%3$02d\n"
 "\n"
 
-#: src/emu/ui/miscmenu.cpp:242
+#: src/emu/ui/miscmenu.cpp:243
 #, c-format
 msgid ""
 "Uptime: %1$d:%2$02d\n"
@@ -853,7 +853,7 @@ msgstr ""
 "Tiempo encendido: %1$d:%2$02d\n"
 "\n"
 
-#: src/emu/ui/miscmenu.cpp:246
+#: src/emu/ui/miscmenu.cpp:247
 #, c-format
 msgid ""
 "Tickets dispensed: %1$d\n"
@@ -862,109 +862,50 @@ msgstr ""
 "Boletos emitidos: %1$d\n"
 "\n"
 
-#: src/emu/ui/miscmenu.cpp:257
+#: src/emu/ui/miscmenu.cpp:258
 msgid "Coin %1$c: NA%3$s\n"
 msgstr "Moneda %1$c: NA%3$s\n"
 
-#: src/emu/ui/miscmenu.cpp:257
+#: src/emu/ui/miscmenu.cpp:258
 #, c-format
 msgid "Coin %1$c: %2$d%3$s\n"
 msgstr "Moneda %1$c: %2$d%3$s\n"
 
-#: src/emu/ui/miscmenu.cpp:260
+#: src/emu/ui/miscmenu.cpp:261
 msgid " (locked)"
 msgstr " (bloqueado)"
 
-#: src/emu/ui/miscmenu.cpp:519
+#: src/emu/ui/miscmenu.cpp:520
 msgid "Visible Delay"
 msgstr "Retardo visible"
 
-#: src/emu/ui/miscmenu.cpp:617
+#: src/emu/ui/miscmenu.cpp:619
 #, c-format
 msgid "%s.xml saved under ui folder."
 msgstr "%s.xml guardado en la carpeta «ui»."
 
-#: src/emu/ui/miscmenu.cpp:645
+#: src/emu/ui/miscmenu.cpp:647
 msgid "Name:             Description:\n"
 msgstr "Nombre:             Descripción:\n"
 
-#: src/emu/ui/miscmenu.cpp:657
+#: src/emu/ui/miscmenu.cpp:659
 #, c-format
 msgid "%s.txt saved under ui folder."
 msgstr "%s.txt guardado en la carpeta «ui»."
 
-#: src/emu/ui/miscmenu.cpp:675
-msgid "Export XML format (like -listxml)"
-msgstr "Exportar en formato XML (como -listxml)"
-
-#: src/emu/ui/miscmenu.cpp:676
-msgid "Export TXT format (like -listfull)"
-msgstr "Exportar en formato TXT (como -listfull)"
-
-#: src/emu/ui/miscmenu.cpp:734
-msgid "Dummy"
-msgstr "De ejemplo"
-
-#: src/emu/ui/miscmenu.cpp:736
-msgid "Save machine configuration"
-msgstr "Guardar ajustes de máquina"
-
-#: src/emu/ui/miscmenu.cpp:848 src/emu/ui/miscmenu.cpp:869
-#: src/emu/ui/selgame.cpp:594
-msgid "Plugins"
+#: src/emu/ui/miscmenu.cpp:677
+msgid "Export list in XML format (like -listxml)"
 msgstr ""
 
-#: src/emu/ui/optsmenu.cpp:218
-msgid "Filter"
-msgstr "Filtro"
+#: src/emu/ui/miscmenu.cpp:678
+msgid "Export list in XML format (like -listxml, but exclude devices)"
+msgstr ""
 
-#: src/emu/ui/optsmenu.cpp:226
-msgid " ^!File"
-msgstr " ^!Archivo"
+#: src/emu/ui/miscmenu.cpp:679
+msgid "Export list in TXT format (like -listfull)"
+msgstr ""
 
-#: src/emu/ui/optsmenu.cpp:231
-msgid " ^!Category"
-msgstr " ^!Categoría"
-
-#: src/emu/ui/optsmenu.cpp:254
-msgid "^!Setup custom filter"
-msgstr "^!Aplicar filtro personalizado"
-
-#: src/emu/ui/optsmenu.cpp:262
-msgid "Customize UI"
-msgstr "Personalizar interfaz"
-
-#: src/emu/ui/optsmenu.cpp:263
-msgid "Configure Directories"
-msgstr "Configurar carpetas"
-
-#: src/emu/ui/optsmenu.cpp:266 src/emu/ui/sndmenu.cpp:151
-#: src/emu/ui/sndmenu.cpp:172
-msgid "Sound Options"
-msgstr "Opciones de sonido"
-
-#: src/emu/ui/optsmenu.cpp:269
-msgid "General Inputs"
-msgstr "Entrada general"
-
-#: src/emu/ui/optsmenu.cpp:272
-msgid "Save Configuration"
-msgstr "Guardar configuración"
-
-#: src/emu/ui/optsmenu.cpp:286 src/emu/ui/optsmenu.cpp:307
-msgid "Settings"
-msgstr "Ajustes"
-
-#: src/emu/ui/optsmenu.cpp:327
-msgid "**Error saving ui.ini**"
-msgstr "**Error al guardar «ui.ini»**"
-
-#: src/emu/ui/optsmenu.cpp:374
-#, c-format
-msgid "**Error saving %s.ini**"
-msgstr "Error al guardar «%s.ini»**"
-
-#: src/emu/ui/optsmenu.cpp:378
+#: src/emu/ui/miscmenu.cpp:729 src/emu/ui/optsmenu.cpp:376
 msgid ""
 "\n"
 "    Configuration saved    \n"
@@ -974,20 +915,95 @@ msgstr ""
 "    Se ha guardado la configuración    \n"
 "\n"
 
-#: src/emu/ui/selector.cpp:166
+#: src/emu/ui/miscmenu.cpp:774
+msgid "Bios"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:776
+msgid "Driver"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:790
+msgid "Save machine configuration"
+msgstr "Guardar ajustes de máquina"
+
+#: src/emu/ui/miscmenu.cpp:806
+msgid "Configure machine:"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:868 src/emu/ui/selsoft.cpp:109
+msgid " (default)"
+msgstr " (predeterminado)"
+
+#: src/emu/ui/miscmenu.cpp:953 src/emu/ui/miscmenu.cpp:973
+#: src/emu/ui/selgame.cpp:600
+msgid "Plugins"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:217
+msgid "Filter"
+msgstr "Filtro"
+
+#: src/emu/ui/optsmenu.cpp:225
+msgid " ^!File"
+msgstr " ^!Archivo"
+
+#: src/emu/ui/optsmenu.cpp:230
+msgid " ^!Category"
+msgstr " ^!Categoría"
+
+#: src/emu/ui/optsmenu.cpp:253
+msgid "^!Setup custom filter"
+msgstr "^!Aplicar filtro personalizado"
+
+#: src/emu/ui/optsmenu.cpp:261
+msgid "Customize UI"
+msgstr "Personalizar interfaz"
+
+#: src/emu/ui/optsmenu.cpp:262
+msgid "Configure Directories"
+msgstr "Configurar carpetas"
+
+#: src/emu/ui/optsmenu.cpp:265 src/emu/ui/sndmenu.cpp:149
+#: src/emu/ui/sndmenu.cpp:169
+msgid "Sound Options"
+msgstr "Opciones de sonido"
+
+#: src/emu/ui/optsmenu.cpp:268
+msgid "General Inputs"
+msgstr "Entrada general"
+
+#: src/emu/ui/optsmenu.cpp:271
+msgid "Save Configuration"
+msgstr "Guardar configuración"
+
+#: src/emu/ui/optsmenu.cpp:285 src/emu/ui/optsmenu.cpp:305
+msgid "Settings"
+msgstr "Ajustes"
+
+#: src/emu/ui/optsmenu.cpp:325
+msgid "**Error saving ui.ini**"
+msgstr "**Error al guardar «ui.ini»**"
+
+#: src/emu/ui/optsmenu.cpp:372
+#, c-format
+msgid "**Error saving %s.ini**"
+msgstr "Error al guardar «%s.ini»**"
+
+#: src/emu/ui/selector.cpp:165
 msgid "Selection List - Search: "
 msgstr "Lista de selección - Buscar: "
 
-#: src/emu/ui/selector.cpp:196
+#: src/emu/ui/selector.cpp:194
 #, c-format
 msgid "Double click or press %1$s to select"
 msgstr "Haz doble clic o pulsa %1$s para elegir"
 
-#: src/emu/ui/selgame.cpp:39
+#: src/emu/ui/selgame.cpp:38
 msgid "General Info"
 msgstr "Información general"
 
-#: src/emu/ui/selgame.cpp:374 src/emu/ui/selsoft.cpp:282
+#: src/emu/ui/selgame.cpp:380 src/emu/ui/selsoft.cpp:281
 #, c-format
 msgid ""
 "%s\n"
@@ -996,8 +1012,8 @@ msgstr ""
 "%s\n"
 " añadido a la lista de favoritos."
 
-#: src/emu/ui/selgame.cpp:380 src/emu/ui/selgame.cpp:389
-#: src/emu/ui/selsoft.cpp:287
+#: src/emu/ui/selgame.cpp:386 src/emu/ui/selgame.cpp:395
+#: src/emu/ui/selsoft.cpp:286
 #, c-format
 msgid ""
 "%s\n"
@@ -1006,7 +1022,7 @@ msgstr ""
 "%s\n"
 " eliminado de la lista de favoritos."
 
-#: src/emu/ui/selgame.cpp:450
+#: src/emu/ui/selgame.cpp:457
 msgid ""
 "The selected machine is missing one or more required ROM or CHD images. "
 "Please select a different machine.\n"
@@ -1014,256 +1030,260 @@ msgid ""
 "Press any key to continue."
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:589 src/emu/ui/simpleselgame.cpp:265
+#: src/emu/ui/selgame.cpp:595 src/emu/ui/simpleselgame.cpp:265
 msgid "Configure Options"
 msgstr "Configurar opciones"
 
-#: src/emu/ui/selgame.cpp:752
+#: src/emu/ui/selgame.cpp:596
+msgid "Configure Machine"
+msgstr "Configurar máquina"
+
+#: src/emu/ui/selgame.cpp:758
 #, c-format
 msgid "%1$s %2$s ( %3$d / %4$d machines (%5$d BIOS) )"
 msgstr "%1$s %2$s ( %3$d / %4$d máquinas (%5$d BIOS) )"
 
-#: src/emu/ui/selgame.cpp:762
+#: src/emu/ui/selgame.cpp:768
 #, c-format
 msgid "%1$s (%2$s - %3$s) - "
 msgstr "%1$s (%2$s - %3$s) - "
 
-#: src/emu/ui/selgame.cpp:769 src/emu/ui/selgame.cpp:775
+#: src/emu/ui/selgame.cpp:775 src/emu/ui/selgame.cpp:781
 #, c-format
 msgid "%1$s (%2$s) - "
 msgstr "%1$s (%2$s) - "
 
-#: src/emu/ui/selgame.cpp:784
+#: src/emu/ui/selgame.cpp:790
 #, c-format
 msgid "%1$s Search: %2$s_"
 msgstr "%1$s Buscar: %2$s_"
 
-#: src/emu/ui/selgame.cpp:838
+#: src/emu/ui/selgame.cpp:844
 #, c-format
 msgid "Romset: %1$-.100s"
 msgstr "Conjunto de ROMs: %1$-.100s"
 
-#: src/emu/ui/selgame.cpp:841 src/emu/ui/selgame.cpp:890
-#: src/emu/ui/selsoft.cpp:751 src/emu/ui/selsoft.cpp:801
+#: src/emu/ui/selgame.cpp:847 src/emu/ui/selgame.cpp:896
+#: src/emu/ui/selsoft.cpp:750 src/emu/ui/selsoft.cpp:800
 #: src/emu/ui/simpleselgame.cpp:328
 #, c-format
 msgid "%1$s, %2$-.100s"
 msgstr "%1$s, %2$-.100s"
 
-#: src/emu/ui/selgame.cpp:847 src/emu/ui/selsoft.cpp:757
+#: src/emu/ui/selgame.cpp:853 src/emu/ui/selsoft.cpp:756
 #, c-format
 msgid "Driver is clone of: %1$-.100s"
 msgstr "El controlador es un clon de: %1$-.100s"
 
-#: src/emu/ui/selgame.cpp:849 src/emu/ui/selsoft.cpp:759
+#: src/emu/ui/selgame.cpp:855 src/emu/ui/selsoft.cpp:758
 msgid "Driver is parent"
 msgstr "Es un controlador padre"
 
-#: src/emu/ui/selgame.cpp:853 src/emu/ui/selsoft.cpp:763
+#: src/emu/ui/selgame.cpp:859 src/emu/ui/selsoft.cpp:762
 #: src/emu/ui/simpleselgame.cpp:335
 msgid "Overall: NOT WORKING"
 msgstr "En general: NO FUNCIONA"
 
-#: src/emu/ui/selgame.cpp:855 src/emu/ui/selsoft.cpp:765
+#: src/emu/ui/selgame.cpp:861 src/emu/ui/selsoft.cpp:764
 #: src/emu/ui/simpleselgame.cpp:337
 msgid "Overall: Unemulated Protection"
 msgstr "En general: Protección sin emular"
 
-#: src/emu/ui/selgame.cpp:857 src/emu/ui/selsoft.cpp:767
+#: src/emu/ui/selgame.cpp:863 src/emu/ui/selsoft.cpp:766
 #: src/emu/ui/simpleselgame.cpp:339
 msgid "Overall: Working"
 msgstr "En general: Funcionando"
 
-#: src/emu/ui/selgame.cpp:861 src/emu/ui/selsoft.cpp:771
+#: src/emu/ui/selgame.cpp:867 src/emu/ui/selsoft.cpp:770
 msgid "Graphics: Imperfect, "
 msgstr "Gráficos: Imperfectos,"
 
-#: src/emu/ui/selgame.cpp:863 src/emu/ui/selsoft.cpp:773
+#: src/emu/ui/selgame.cpp:869 src/emu/ui/selsoft.cpp:772
 msgid "Graphics: OK, "
 msgstr "Gráficos: Aceptables, "
 
-#: src/emu/ui/selgame.cpp:866 src/emu/ui/selsoft.cpp:776
+#: src/emu/ui/selgame.cpp:872 src/emu/ui/selsoft.cpp:775
 msgid "Sound: Unimplemented"
 msgstr "Sonido: Sin implementar"
 
-#: src/emu/ui/selgame.cpp:868 src/emu/ui/selsoft.cpp:778
+#: src/emu/ui/selgame.cpp:874 src/emu/ui/selsoft.cpp:777
 msgid "Sound: Imperfect"
 msgstr "Sonido: Imperfecto"
 
-#: src/emu/ui/selgame.cpp:870 src/emu/ui/selsoft.cpp:780
+#: src/emu/ui/selgame.cpp:876 src/emu/ui/selsoft.cpp:779
 msgid "Sound: OK"
 msgstr "Sonido: Aceptable"
 
-#: src/emu/ui/selgame.cpp:887
+#: src/emu/ui/selgame.cpp:893
 #, c-format
 msgid "System: %1$-.100s"
 msgstr "Sistema: %1$-.100s"
 
-#: src/emu/ui/selgame.cpp:894 src/emu/ui/selsoft.cpp:805
+#: src/emu/ui/selgame.cpp:900 src/emu/ui/selsoft.cpp:804
 #, c-format
 msgid "Software is clone of: %1$-.100s"
 msgstr "El software es un clon de: %1$-.100s"
 
-#: src/emu/ui/selgame.cpp:896 src/emu/ui/selsoft.cpp:807
+#: src/emu/ui/selgame.cpp:902 src/emu/ui/selsoft.cpp:806
 msgid "Software is parent"
 msgstr "Es un software padre"
 
-#: src/emu/ui/selgame.cpp:901 src/emu/ui/selsoft.cpp:812
+#: src/emu/ui/selgame.cpp:907 src/emu/ui/selsoft.cpp:811
 msgid "Supported: No"
 msgstr "Soportado: No"
 
-#: src/emu/ui/selgame.cpp:906 src/emu/ui/selsoft.cpp:817
+#: src/emu/ui/selgame.cpp:912 src/emu/ui/selsoft.cpp:816
 msgid "Supported: Partial"
 msgstr "Soportado: Parcialmente"
 
-#: src/emu/ui/selgame.cpp:911 src/emu/ui/selsoft.cpp:822
+#: src/emu/ui/selgame.cpp:917 src/emu/ui/selsoft.cpp:821
 msgid "Supported: Yes"
 msgstr "Soportado: Sí"
 
-#: src/emu/ui/selgame.cpp:916 src/emu/ui/selsoft.cpp:827
+#: src/emu/ui/selgame.cpp:922 src/emu/ui/selsoft.cpp:826
 #, c-format
 msgid "romset: %1$-.100s"
 msgstr "conjunto de ROMs: %1$-.100s"
 
-#: src/emu/ui/selgame.cpp:923
+#: src/emu/ui/selgame.cpp:929
 #, c-format
 msgid "%1$s %2$s"
 msgstr "%1$s %2$s"
 
-#: src/emu/ui/selgame.cpp:1535
+#: src/emu/ui/selgame.cpp:1543
 #, c-format
 msgid "Romset: %1$-.100s\n"
 msgstr "Conjunto de ROMs: %1$-.100s\n"
 
-#: src/emu/ui/selgame.cpp:1536
+#: src/emu/ui/selgame.cpp:1544
 #, c-format
 msgid "Year: %1$s\n"
 msgstr "Año: %1$s\n"
 
-#: src/emu/ui/selgame.cpp:1537
+#: src/emu/ui/selgame.cpp:1545
 #, c-format
 msgid "Manufacturer: %1$-.100s\n"
 msgstr "Fabricante: %1$-.100s\n"
 
-#: src/emu/ui/selgame.cpp:1541
+#: src/emu/ui/selgame.cpp:1549
 #, c-format
 msgid "Driver is Clone of: %1$-.100s\n"
 msgstr "El controlador es un clon de: %1$-.100s\n"
 
-#: src/emu/ui/selgame.cpp:1543
+#: src/emu/ui/selgame.cpp:1551
 msgid "Driver is Parent\n"
 msgstr "Es un controlador padre\n"
 
-#: src/emu/ui/selgame.cpp:1546
+#: src/emu/ui/selgame.cpp:1554
 msgid "Overall: NOT WORKING\n"
 msgstr "En general: NO FUNCIONA\n"
 
-#: src/emu/ui/selgame.cpp:1548
+#: src/emu/ui/selgame.cpp:1556
 msgid "Overall: Unemulated Protection\n"
 msgstr "En general: Protección sin emular\n"
 
-#: src/emu/ui/selgame.cpp:1550
+#: src/emu/ui/selgame.cpp:1558
 msgid "Overall: Working\n"
 msgstr "En general: Funcionando\n"
 
-#: src/emu/ui/selgame.cpp:1553
+#: src/emu/ui/selgame.cpp:1561
 msgid "Graphics: Imperfect Colors\n"
 msgstr "Gráficos: Colores imperfectos\n"
 
-#: src/emu/ui/selgame.cpp:1557
+#: src/emu/ui/selgame.cpp:1565
 msgid "Graphics: Imperfect\n"
 msgstr "Gráficos: Imperfectos\n"
 
-#: src/emu/ui/selgame.cpp:1559
+#: src/emu/ui/selgame.cpp:1567
 msgid "Graphics: OK\n"
 msgstr "Gráficos: Aceptables\n"
 
-#: src/emu/ui/selgame.cpp:1562
+#: src/emu/ui/selgame.cpp:1570
 msgid "Sound: Unimplemented\n"
 msgstr "Sonido: Sin implementar\n"
 
-#: src/emu/ui/selgame.cpp:1564
+#: src/emu/ui/selgame.cpp:1572
 msgid "Sound: Imperfect\n"
 msgstr "Sonido: Imperfecto\n"
 
-#: src/emu/ui/selgame.cpp:1566
+#: src/emu/ui/selgame.cpp:1574
 msgid "Sound: OK\n"
 msgstr "Sonido: Aceptable\n"
 
-#: src/emu/ui/selgame.cpp:1568
+#: src/emu/ui/selgame.cpp:1576
 #, c-format
 msgid "Driver is Skeleton: %1$s\n"
 msgstr "El controlador es esqueleto: %1$s\n"
 
-#: src/emu/ui/selgame.cpp:1569
+#: src/emu/ui/selgame.cpp:1577
 #, c-format
 msgid "Game is Mechanical: %1$s\n"
 msgstr "El juego es mecánico: %1$s\n"
 
-#: src/emu/ui/selgame.cpp:1570
+#: src/emu/ui/selgame.cpp:1578
 #, c-format
 msgid "Requires Artwork: %1$s\n"
 msgstr "Requiere arte: %1$s\n"
 
-#: src/emu/ui/selgame.cpp:1571
+#: src/emu/ui/selgame.cpp:1579
 #, c-format
 msgid "Requires Clickable Artwork: %1$s\n"
 msgstr "Requiere arte clicable: %1$s\n"
 
-#: src/emu/ui/selgame.cpp:1572
+#: src/emu/ui/selgame.cpp:1580
 #, c-format
 msgid "Support Cocktail: %1$s\n"
 msgstr "Soporta cóctel: %1$s\n"
 
-#: src/emu/ui/selgame.cpp:1573
+#: src/emu/ui/selgame.cpp:1581
 #, c-format
 msgid "Driver is Bios: %1$s\n"
 msgstr "El controlador es una BIOS: %1$s\n"
 
-#: src/emu/ui/selgame.cpp:1574
+#: src/emu/ui/selgame.cpp:1582
 #, c-format
 msgid "Support Save: %1$s\n"
 msgstr "Permite guardar: %1$s\n"
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 #, c-format
 msgid "Screen Orientation: %1$s\n"
 msgstr "Orientación de pantalla: %1$s\n"
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 msgid "Vertical"
 msgstr "Vertical"
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 msgid "Horizontal"
 msgstr "Horizontal"
 
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/selgame.cpp:1591
 #, c-format
 msgid "Requires CHD: %1$s\n"
 msgstr "Necesita CHD: %1$s\n"
 
-#: src/emu/ui/selgame.cpp:1596
+#: src/emu/ui/selgame.cpp:1604
 msgid "Roms Audit Pass: OK\n"
 msgstr "Auditoría de ROMs: CORRECTA\n"
 
-#: src/emu/ui/selgame.cpp:1598
+#: src/emu/ui/selgame.cpp:1606
 msgid "Roms Audit Pass: BAD\n"
 msgstr "Auditoría de ROMs: INCORRECTA\n"
 
-#: src/emu/ui/selgame.cpp:1601
+#: src/emu/ui/selgame.cpp:1609
 msgid "Samples Audit Pass: None Needed\n"
 msgstr "Auditoría de las muestras: No Necesaria\n"
 
-#: src/emu/ui/selgame.cpp:1603
+#: src/emu/ui/selgame.cpp:1611
 msgid "Samples Audit Pass: OK\n"
 msgstr "Auditoría de las muestras: CORRECTA\n"
 
-#: src/emu/ui/selgame.cpp:1605
+#: src/emu/ui/selgame.cpp:1613
 msgid "Samples Audit Pass: BAD\n"
 msgstr "Auditoría de las muestras: INCORRECTA\n"
 
-#: src/emu/ui/selgame.cpp:1608
+#: src/emu/ui/selgame.cpp:1616
 msgid ""
 "Roms Audit Pass: Disabled\n"
 "Samples Audit Pass: Disabled\n"
@@ -1271,20 +1291,16 @@ msgstr ""
 "Auditoría de las ROMs: Desactivado\n"
 "Auditoría de las muestras: Desactivado\n"
 
-#: src/emu/ui/selgame.cpp:2049 src/emu/ui/selgame.cpp:2212
-#: src/emu/ui/selsoft.cpp:1662
+#: src/emu/ui/selgame.cpp:2055 src/emu/ui/selgame.cpp:2216
+#: src/emu/ui/selsoft.cpp:1655
 msgid "No Infos Available"
 msgstr "No hay información disponible"
 
-#: src/emu/ui/selgame.cpp:2162 src/emu/ui/selsoft.cpp:1607
+#: src/emu/ui/selgame.cpp:2168 src/emu/ui/selsoft.cpp:1602
 msgid "Usage"
 msgstr "Utilización"
 
-#: src/emu/ui/selsoft.cpp:110
-msgid " (default)"
-msgstr " (predeterminado)"
-
-#: src/emu/ui/selsoft.cpp:381
+#: src/emu/ui/selsoft.cpp:380
 msgid ""
 "The selected software is missing one or more required files. Please select a "
 "different software.\n"
@@ -1292,57 +1308,57 @@ msgid ""
 "Press any key to continue."
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:684
+#: src/emu/ui/selsoft.cpp:683
 #, c-format
-msgid "%1$s %2$s ( %3$d / %4$d softwares )"
-msgstr "%1$s %2$s ( %3$d / %4$d softwares )"
+msgid "%1$s %2$s ( %3$d / %4$d software packages )"
+msgstr ""
 
-#: src/emu/ui/selsoft.cpp:685
+#: src/emu/ui/selsoft.cpp:684
 #, c-format
 msgid "Driver: \"%1$s\" software list "
 msgstr "Controlador: \"%1$s\" lista de software "
 
-#: src/emu/ui/selsoft.cpp:688
+#: src/emu/ui/selsoft.cpp:687
 #, c-format
 msgid "Region: %1$s -"
 msgstr "Región: %1$s -"
 
-#: src/emu/ui/selsoft.cpp:690
+#: src/emu/ui/selsoft.cpp:689
 #, c-format
 msgid "Publisher: %1$s -"
 msgstr "Editor: %1$s -"
 
-#: src/emu/ui/selsoft.cpp:692
+#: src/emu/ui/selsoft.cpp:691
 #, c-format
 msgid "Year: %1$s -"
 msgstr "Año: %1$s -"
 
-#: src/emu/ui/selsoft.cpp:694
+#: src/emu/ui/selsoft.cpp:693
 #, c-format
 msgid "Software List: %1$s -"
 msgstr "Lista de software: %1$s -"
 
-#: src/emu/ui/selsoft.cpp:696
+#: src/emu/ui/selsoft.cpp:695
 #, c-format
 msgid "Device type: %1$s -"
 msgstr "Tipo de dispositivo: %1$s -"
 
-#: src/emu/ui/selsoft.cpp:698
+#: src/emu/ui/selsoft.cpp:697
 #, c-format
 msgid "%s Search: %s_"
 msgstr "%s Buscar: %s_"
 
-#: src/emu/ui/selsoft.cpp:748 src/emu/ui/selsoft.cpp:798
+#: src/emu/ui/selsoft.cpp:747 src/emu/ui/selsoft.cpp:797
 #: src/emu/ui/simpleselgame.cpp:325
 #, c-format
 msgid "%1$-.100s"
 msgstr "%1$-.100s"
 
-#: src/emu/ui/selsoft.cpp:1998 src/emu/ui/selsoft.cpp:2018
+#: src/emu/ui/selsoft.cpp:1991 src/emu/ui/selsoft.cpp:2011
 msgid "Software part selection:"
 msgstr "Selección de partes de software:"
 
-#: src/emu/ui/selsoft.cpp:2136 src/emu/ui/selsoft.cpp:2156
+#: src/emu/ui/selsoft.cpp:2129 src/emu/ui/selsoft.cpp:2149
 msgid "Bios selection:"
 msgstr "Selección de BIOS:"
 
@@ -1396,15 +1412,15 @@ msgstr "Gráficos: %s, Sonido: %s"
 msgid " [internal]"
 msgstr " [interno]"
 
-#: src/emu/ui/sndmenu.cpp:135
+#: src/emu/ui/sndmenu.cpp:133
 msgid "Sound"
 msgstr "Sonido"
 
-#: src/emu/ui/sndmenu.cpp:136
+#: src/emu/ui/sndmenu.cpp:134
 msgid "Sample Rate"
 msgstr "Tasa de muestreo"
 
-#: src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/sndmenu.cpp:135
 msgid "Use External Samples"
 msgstr "Utilizar muestras externas"
 
@@ -1473,13 +1489,13 @@ msgstr "Rebobinar"
 msgid "Fast Forward"
 msgstr "Avance rápido"
 
-#: src/emu/ui/ui.cpp:419
+#: src/emu/ui/ui.cpp:418
 msgid "This driver requires images to be loaded in the following device(s): "
 msgstr ""
 "Este controlador necesita que se carguen imágenes en los siguientes "
 "dispositivos: "
 
-#: src/emu/ui/ui.cpp:1074
+#: src/emu/ui/ui.cpp:1071
 msgid ""
 "One or more ROMs/CHDs for this machine are incorrect. The machine may not "
 "run correctly.\n"
@@ -1487,7 +1503,7 @@ msgstr ""
 "Uno o más ROMs/CHDs de esta máquina son incorrectos. La máquina podría no "
 "funcionar correctamente.\n"
 
-#: src/emu/ui/ui.cpp:1087
+#: src/emu/ui/ui.cpp:1084
 msgid ""
 "There are known problems with this machine\n"
 "\n"
@@ -1495,48 +1511,48 @@ msgstr ""
 "Existen problemas conocidos con esta máquina\n"
 "\n"
 
-#: src/emu/ui/ui.cpp:1091
+#: src/emu/ui/ui.cpp:1088
 msgid ""
 "One or more ROMs/CHDs for this machine have not been correctly dumped.\n"
 msgstr "Uno o más ROMs/CHDs de esta máquina no se han volcado correctamente.\n"
 
-#: src/emu/ui/ui.cpp:1095
+#: src/emu/ui/ui.cpp:1092
 #, c-format
 msgid "The keyboard emulation may not be 100% accurate.\n"
 msgstr "La emulación del teclado puede no ser del todo precisa.\n"
 
-#: src/emu/ui/ui.cpp:1097
+#: src/emu/ui/ui.cpp:1094
 #, c-format
 msgid "The colors aren't 100% accurate.\n"
 msgstr "Los colores no son del todo precisos.\n"
 
-#: src/emu/ui/ui.cpp:1099
+#: src/emu/ui/ui.cpp:1096
 msgid "The colors are completely wrong.\n"
 msgstr "Los colores son completamente erróneos.\n"
 
-#: src/emu/ui/ui.cpp:1101
+#: src/emu/ui/ui.cpp:1098
 #, c-format
 msgid "The video emulation isn't 100% accurate.\n"
 msgstr "La emulación de vídeo no es del todo precisa.\n"
 
-#: src/emu/ui/ui.cpp:1103
+#: src/emu/ui/ui.cpp:1100
 #, c-format
 msgid "The sound emulation isn't 100% accurate.\n"
 msgstr "La emulación de sonido no es del todo precisa.\n"
 
-#: src/emu/ui/ui.cpp:1105
+#: src/emu/ui/ui.cpp:1102
 msgid "The machine lacks sound.\n"
 msgstr "A esta máquina le falta el sonido.\n"
 
-#: src/emu/ui/ui.cpp:1108
+#: src/emu/ui/ui.cpp:1105
 msgid "Screen flipping in cocktail mode is not supported.\n"
 msgstr "Voltear la pantalla en modo cóctel no está soportado.\n"
 
-#: src/emu/ui/ui.cpp:1112
+#: src/emu/ui/ui.cpp:1109
 msgid "The machine requires external artwork files\n"
 msgstr "La máquina requiere ficheros de arte externos\n"
 
-#: src/emu/ui/ui.cpp:1117
+#: src/emu/ui/ui.cpp:1114
 msgid ""
 "This machine was never completed. It may exhibit strange behavior or missing "
 "elements that are not bugs in the emulation.\n"
@@ -1544,7 +1560,7 @@ msgstr ""
 "Esta máquina nunca se terminó. Podría comportarse de forma extraña o mostrar "
 "signos de mal funcionamiento que en ningún caso son defectos de emulación.\n"
 
-#: src/emu/ui/ui.cpp:1122
+#: src/emu/ui/ui.cpp:1119
 msgid ""
 "This machine has no sound hardware, MAME will produce no sounds, this is "
 "expected behaviour.\n"
@@ -1552,11 +1568,11 @@ msgstr ""
 "Esta máquina no soporta sonido, por lo que MAME no reproducirá audio, este "
 "es el comportamiento esperado.\n"
 
-#: src/emu/ui/ui.cpp:1130
+#: src/emu/ui/ui.cpp:1127
 msgid "The machine has protection which isn't fully emulated.\n"
 msgstr "La máquina todavía no emula completamente el sistema de protección.\n"
 
-#: src/emu/ui/ui.cpp:1133
+#: src/emu/ui/ui.cpp:1130
 msgid ""
 "\n"
 "THIS MACHINE DOESN'T WORK. The emulation for this machine is not yet "
@@ -1567,7 +1583,7 @@ msgstr ""
 "completada. No hay nada que se pueda hacer para arreglar el problema salvo "
 "esperar a que los desarrolladores mejoren la emulación.\n"
 
-#: src/emu/ui/ui.cpp:1137
+#: src/emu/ui/ui.cpp:1134
 msgid ""
 "\n"
 "Certain elements of this machine cannot be emulated as it requires actual "
@@ -1578,7 +1594,7 @@ msgstr ""
 "una interacción física o se basan en dispositivos mecánicos. Por lo que no "
 "esposible reproducir completamente el funcionamiento de la máquina.\n"
 
-#: src/emu/ui/ui.cpp:1156
+#: src/emu/ui/ui.cpp:1153
 msgid ""
 "\n"
 "\n"
@@ -1588,14 +1604,14 @@ msgstr ""
 "\n"
 "Existen clones funcionales de esta máquina: "
 
-#: src/emu/ui/ui.cpp:1170
+#: src/emu/ui/ui.cpp:1167
 msgid ""
 "\n"
 "\n"
 "Press any key to continue"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1185
+#: src/emu/ui/ui.cpp:1182
 #, c-format
 msgid ""
 "%1$s\n"
@@ -1610,15 +1626,15 @@ msgstr ""
 "\n"
 "Procesador:\n"
 
-#: src/emu/ui/ui.cpp:1221 src/emu/ui/ui.cpp:1260
+#: src/emu/ui/ui.cpp:1218 src/emu/ui/ui.cpp:1257
 msgid "MHz"
 msgstr "MHz"
 
-#: src/emu/ui/ui.cpp:1221 src/emu/ui/ui.cpp:1260
+#: src/emu/ui/ui.cpp:1218 src/emu/ui/ui.cpp:1257
 msgid "kHz"
 msgstr "kHz"
 
-#: src/emu/ui/ui.cpp:1235
+#: src/emu/ui/ui.cpp:1232
 msgid ""
 "\n"
 "Sound:\n"
@@ -1626,7 +1642,7 @@ msgstr ""
 "\n"
 "Sonido:\n"
 
-#: src/emu/ui/ui.cpp:1264
+#: src/emu/ui/ui.cpp:1261
 msgid ""
 "\n"
 "Video:\n"
@@ -1634,78 +1650,78 @@ msgstr ""
 "\n"
 "Vídeo:\n"
 
-#: src/emu/ui/ui.cpp:1268
+#: src/emu/ui/ui.cpp:1265
 msgid "None\n"
 msgstr "Ninguno\n"
 
-#: src/emu/ui/ui.cpp:1275
+#: src/emu/ui/ui.cpp:1272
 msgid "Vector"
 msgstr "Vector"
 
-#: src/emu/ui/ui.cpp:1286
+#: src/emu/ui/ui.cpp:1283
 #, c-format
 msgid "%1$s: %2$s\n"
 msgstr "%1$s: %2$s\n"
 
-#: src/emu/ui/ui.cpp:1286
+#: src/emu/ui/ui.cpp:1283
 msgid "%2$s\n"
 msgstr "%2$s\n"
 
-#: src/emu/ui/ui.cpp:1541 src/emu/ui/ui.cpp:1551
+#: src/emu/ui/ui.cpp:1538 src/emu/ui/ui.cpp:1548
 msgid "Keyboard Emulation Status"
 msgstr "Estado de la emulación del teclado"
 
-#: src/emu/ui/ui.cpp:1543
+#: src/emu/ui/ui.cpp:1540
 msgid "Mode: PARTIAL Emulation"
 msgstr "Modo: Emulación PARCIAL"
 
-#: src/emu/ui/ui.cpp:1544
+#: src/emu/ui/ui.cpp:1541
 msgid "UI:   Enabled"
 msgstr "Interfaz:   Activada"
 
-#: src/emu/ui/ui.cpp:1546 src/emu/ui/ui.cpp:1556
+#: src/emu/ui/ui.cpp:1543 src/emu/ui/ui.cpp:1553
 msgid "**Use ScrLock to toggle**"
 msgstr "**Utiliza ScrLock para activar y desactivar**"
 
-#: src/emu/ui/ui.cpp:1553
+#: src/emu/ui/ui.cpp:1550
 msgid "Mode: FULL Emulation"
 msgstr "Modo: Emulación COMPLETA"
 
-#: src/emu/ui/ui.cpp:1554
+#: src/emu/ui/ui.cpp:1551
 msgid "UI:   Disabled"
 msgstr "Interfaz:   Desactivada"
 
-#: src/emu/ui/ui.cpp:1692
+#: src/emu/ui/ui.cpp:1689
 msgid "Autofire can't be enabled"
 msgstr "No se puede activar el disparo automático"
 
-#: src/emu/ui/ui.cpp:1731
+#: src/emu/ui/ui.cpp:1728
 msgid "Select position to save to"
 msgstr "Selecciona la posición a la que guardar"
 
-#: src/emu/ui/ui.cpp:1733
+#: src/emu/ui/ui.cpp:1730
 msgid "Select position to load from"
 msgstr "Selecciona la posición desde la que cargar"
 
-#: src/emu/ui/ui.cpp:1757
+#: src/emu/ui/ui.cpp:1754
 msgid "Save cancelled"
 msgstr "Guardado cancelado"
 
-#: src/emu/ui/ui.cpp:1759
+#: src/emu/ui/ui.cpp:1756
 msgid "Load cancelled"
 msgstr "Lectura cancelada"
 
-#: src/emu/ui/ui.cpp:1802
+#: src/emu/ui/ui.cpp:1799
 #, c-format
 msgid "Save to position %s"
 msgstr "Guardar en posición %s"
 
-#: src/emu/ui/ui.cpp:1807
+#: src/emu/ui/ui.cpp:1804
 #, c-format
 msgid "Load from position %s"
 msgstr "Lectura desde posición %s"
 
-#: src/emu/ui/ui.cpp:1847
+#: src/emu/ui/ui.cpp:1844
 #, c-format
 msgid ""
 "Are you sure you want to quit?\n"
@@ -1718,173 +1734,173 @@ msgstr ""
 "Presiona «%1$s» para salir,\n"
 "Presiona «%2$s» para volver al emulador."
 
-#: src/emu/ui/ui.cpp:1917
+#: src/emu/ui/ui.cpp:1914
 msgid "Master Volume"
 msgstr "Volumen principal"
 
-#: src/emu/ui/ui.cpp:1926
+#: src/emu/ui/ui.cpp:1923
 #, c-format
 msgid "%1$s Volume"
 msgstr "Volumen %1$s"
 
-#: src/emu/ui/ui.cpp:1949
+#: src/emu/ui/ui.cpp:1946
 #, c-format
 msgid "Overclock CPU %1$s"
 msgstr "Acelerar CPU %1$s"
 
-#: src/emu/ui/ui.cpp:1968
+#: src/emu/ui/ui.cpp:1965
 #, c-format
 msgid "%1$s Refresh Rate"
 msgstr "Tasa de refresco %1$s"
 
-#: src/emu/ui/ui.cpp:1973
+#: src/emu/ui/ui.cpp:1970
 #, c-format
 msgid "%1$s Brightness"
 msgstr "Brillo %1$s"
 
-#: src/emu/ui/ui.cpp:1975
+#: src/emu/ui/ui.cpp:1972
 #, c-format
 msgid "%1$s Contrast"
 msgstr "Contraste %1$s"
 
-#: src/emu/ui/ui.cpp:1977
+#: src/emu/ui/ui.cpp:1974
 #, c-format
 msgid "%1$s Gamma"
 msgstr "Gamma %1$s"
 
-#: src/emu/ui/ui.cpp:1981
+#: src/emu/ui/ui.cpp:1978
 #, c-format
 msgid "%1$s Horiz Stretch"
 msgstr "Estiramiento horizontal %1$s"
 
-#: src/emu/ui/ui.cpp:1983
+#: src/emu/ui/ui.cpp:1980
 #, c-format
 msgid "%1$s Horiz Position"
 msgstr "Posición horizontal %1$s"
 
-#: src/emu/ui/ui.cpp:1985
+#: src/emu/ui/ui.cpp:1982
 #, c-format
 msgid "%1$s Vert Stretch"
 msgstr "Estiramiento vertical %1$s"
 
-#: src/emu/ui/ui.cpp:1987
+#: src/emu/ui/ui.cpp:1984
 #, c-format
 msgid "%1$s Vert Position"
 msgstr "Posición vertical %1$s"
 
-#: src/emu/ui/ui.cpp:2005
+#: src/emu/ui/ui.cpp:2002
 #, c-format
 msgid "Laserdisc '%1$s' Horiz Stretch"
 msgstr "Estiramiento horizontal de Laserdisc «%1$s»"
 
-#: src/emu/ui/ui.cpp:2007
+#: src/emu/ui/ui.cpp:2004
 #, c-format
 msgid "Laserdisc '%1$s' Horiz Position"
 msgstr "Posición horizontal de Laserdisc «%1$s»"
 
-#: src/emu/ui/ui.cpp:2009
+#: src/emu/ui/ui.cpp:2006
 #, c-format
 msgid "Laserdisc '%1$s' Vert Stretch"
 msgstr "Estiramiento vertical de Laserdisc «%1$s»"
 
-#: src/emu/ui/ui.cpp:2011
+#: src/emu/ui/ui.cpp:2008
 #, c-format
 msgid "Laserdisc '%1$s' Vert Position"
 msgstr "Posición vertical de Laserdisc «%1$s»"
 
-#: src/emu/ui/ui.cpp:2021
+#: src/emu/ui/ui.cpp:2018
 msgid "Vector Flicker"
 msgstr "Vector de parpadeo"
 
-#: src/emu/ui/ui.cpp:2022
+#: src/emu/ui/ui.cpp:2019
 msgid "Beam Width Minimum"
 msgstr "Anchura mín. del haz"
 
-#: src/emu/ui/ui.cpp:2023
+#: src/emu/ui/ui.cpp:2020
 msgid "Beam Width Maximum"
 msgstr "Anchura max. del haz"
 
-#: src/emu/ui/ui.cpp:2024
+#: src/emu/ui/ui.cpp:2021
 msgid "Beam Intensity Weight"
 msgstr "Peso de intensidad del haz"
 
-#: src/emu/ui/ui.cpp:2037
+#: src/emu/ui/ui.cpp:2034
 #, c-format
 msgid "Crosshair Scale %1$s"
 msgstr "Escala de diana %1$s"
 
-#: src/emu/ui/ui.cpp:2037 src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2034 src/emu/ui/ui.cpp:2036
 msgid "X"
 msgstr "Horizontal"
 
-#: src/emu/ui/ui.cpp:2037 src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2034 src/emu/ui/ui.cpp:2036
 msgid "Y"
 msgstr "Vertical"
 
-#: src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2036
 #, c-format
 msgid "Crosshair Offset %1$s"
 msgstr "Posición de diana %1$s"
 
-#: src/emu/ui/ui.cpp:2071
+#: src/emu/ui/ui.cpp:2068
 #, c-format
 msgid "%1$3ddB"
 msgstr "%1$3ddB"
 
-#: src/emu/ui/ui.cpp:2115
+#: src/emu/ui/ui.cpp:2112
 #, c-format
 msgid "%1$d%%"
 msgstr "%1$d%%"
 
-#: src/emu/ui/ui.cpp:2131
+#: src/emu/ui/ui.cpp:2128
 #, c-format
 msgid "%1$3.0f%%"
 msgstr "%1$3.0f%%"
 
-#: src/emu/ui/ui.cpp:2154
+#: src/emu/ui/ui.cpp:2151
 #, c-format
 msgid "%1$.3ffps"
 msgstr "%1$.3ffps"
 
-#: src/emu/ui/ui.cpp:2177 src/emu/ui/ui.cpp:2199 src/emu/ui/ui.cpp:2220
-#: src/emu/ui/ui.cpp:2242 src/emu/ui/ui.cpp:2264 src/emu/ui/ui.cpp:2286
-#: src/emu/ui/ui.cpp:2308 src/emu/ui/ui.cpp:2330 src/emu/ui/ui.cpp:2352
-#: src/emu/ui/ui.cpp:2374 src/emu/ui/ui.cpp:2396
+#: src/emu/ui/ui.cpp:2174 src/emu/ui/ui.cpp:2196 src/emu/ui/ui.cpp:2217
+#: src/emu/ui/ui.cpp:2239 src/emu/ui/ui.cpp:2261 src/emu/ui/ui.cpp:2283
+#: src/emu/ui/ui.cpp:2305 src/emu/ui/ui.cpp:2327 src/emu/ui/ui.cpp:2349
+#: src/emu/ui/ui.cpp:2371 src/emu/ui/ui.cpp:2393
 #, c-format
 msgid "%1$.3f"
 msgstr "%1$.3f"
 
-#: src/emu/ui/ui.cpp:2412 src/emu/ui/ui.cpp:2428 src/emu/ui/ui.cpp:2444
-#: src/emu/ui/ui.cpp:2460
+#: src/emu/ui/ui.cpp:2408 src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2438
+#: src/emu/ui/ui.cpp:2453
 #, c-format
 msgid "%1$1.2f"
 msgstr "%1$1.2f"
 
-#: src/emu/ui/ui.cpp:2476
+#: src/emu/ui/ui.cpp:2469
 #, c-format
 msgid "Screen '%1$s'"
 msgstr "Pantalla «%1$s»"
 
-#: src/emu/ui/ui.cpp:2478
+#: src/emu/ui/ui.cpp:2471
 msgid "Screen"
 msgstr "Pantalla"
 
-#: src/emu/ui/ui.cpp:2494
+#: src/emu/ui/ui.cpp:2487
 #, c-format
 msgid "Crosshair Scale X %1$1.3f"
 msgstr "Escala horizontal de diana %1$1.3f"
 
-#: src/emu/ui/ui.cpp:2494
+#: src/emu/ui/ui.cpp:2487
 #, c-format
 msgid "Crosshair Scale Y %1$1.3f"
 msgstr "Escala vertical de diana %1$1.3f"
 
-#: src/emu/ui/ui.cpp:2513
+#: src/emu/ui/ui.cpp:2506
 #, c-format
 msgid "Crosshair Offset X %1$1.3f"
 msgstr "Posición horizontal de diana %1$1.3f"
 
-#: src/emu/ui/ui.cpp:2513
+#: src/emu/ui/ui.cpp:2506
 #, c-format
 msgid "Crosshair Offset Y %1$1.3f"
 msgstr "Posición vertical de diana %1$1.3f"
@@ -1926,14 +1942,26 @@ msgstr "Recortado"
 msgid "Full"
 msgstr "Completo"
 
-#: src/emu/ui/viewgfx.cpp:392
+#: src/emu/ui/viewgfx.cpp:391
 msgid " COLORS"
 msgstr " COLORES"
 
-#: src/emu/ui/viewgfx.cpp:392
+#: src/emu/ui/viewgfx.cpp:391
 msgid " PENS"
 msgstr " PLUMAS"
 
+#~ msgid "Export XML format (like -listxml)"
+#~ msgstr "Exportar en formato XML (como -listxml)"
+
+#~ msgid "Export TXT format (like -listfull)"
+#~ msgstr "Exportar en formato TXT (como -listfull)"
+
+#~ msgid "Dummy"
+#~ msgstr "De ejemplo"
+
+#~ msgid "%1$s %2$s ( %3$d / %4$d softwares )"
+#~ msgstr "%1$s %2$s ( %3$d / %4$d softwares )"
+
 #~ msgid "Lightgun Device Assignment"
 #~ msgstr "Asignación de pistolas de luz"
 
@@ -2077,9 +2105,6 @@ msgstr " PLUMAS"
 #~ "\n"
 #~ "Teclea OK o mueve el joystick de izquierda a derecha para continuar"
 
-#~ msgid "Configure Machine"
-#~ msgstr "Configurar máquina"
-
 #~ msgid "Multi-Threaded Rendering"
 #~ msgstr "Dibujado multinúcleo"
 
diff --git a/language/Spanish_Mexico/strings.po b/language/Spanish_Mexico/strings.po
index de32afdf053..5a612b4e6fa 100644
--- a/language/Spanish_Mexico/strings.po
+++ b/language/Spanish_Mexico/strings.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MAME\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-11 03:33+0200\n"
+"POT-Creation-Date: 2016-04-15 17:42+0200\n"
 "PO-Revision-Date: 2016-02-20 18:03+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: MAME Language Team\n"
@@ -61,14 +61,14 @@ msgstr ""
 msgid "Autofire Status"
 msgstr ""
 
-#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1698
+#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1695
 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211
 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219
 #: src/emu/ui/videoopt.cpp:223
 msgid "Disabled"
 msgstr ""
 
-#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1698
+#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1695
 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211
 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219
 #: src/emu/ui/videoopt.cpp:223
@@ -76,14 +76,14 @@ msgid "Enabled"
 msgstr ""
 
 #: src/emu/ui/cheatopt.cpp:282 src/emu/ui/cheatopt.cpp:288
-#: src/emu/ui/menu.cpp:710 src/emu/ui/miscmenu.cpp:831
-#: src/emu/ui/sndmenu.cpp:135 src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/menu.cpp:755 src/emu/ui/miscmenu.cpp:936
+#: src/emu/ui/sndmenu.cpp:133 src/emu/ui/sndmenu.cpp:135
 msgid "On"
 msgstr ""
 
 #: src/emu/ui/cheatopt.cpp:282 src/emu/ui/cheatopt.cpp:288
-#: src/emu/ui/menu.cpp:713 src/emu/ui/miscmenu.cpp:831
-#: src/emu/ui/sndmenu.cpp:135 src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/menu.cpp:758 src/emu/ui/miscmenu.cpp:936
+#: src/emu/ui/sndmenu.cpp:133 src/emu/ui/sndmenu.cpp:135
 msgid "Off"
 msgstr ""
 
@@ -95,316 +95,316 @@ msgstr ""
 msgid "Autofire Delay"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:158 src/emu/ui/custmenu.cpp:447
+#: src/emu/ui/custmenu.cpp:157 src/emu/ui/custmenu.cpp:445
 msgid "Main filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:167 src/emu/ui/custmenu.cpp:456
+#: src/emu/ui/custmenu.cpp:166 src/emu/ui/custmenu.cpp:454
 msgid "Other filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:176 src/emu/ui/optsmenu.cpp:239
+#: src/emu/ui/custmenu.cpp:175 src/emu/ui/optsmenu.cpp:238
 msgid "^!Manufacturer"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:185 src/emu/ui/custmenu.cpp:474
-#: src/emu/ui/optsmenu.cpp:247
+#: src/emu/ui/custmenu.cpp:184 src/emu/ui/custmenu.cpp:472
+#: src/emu/ui/optsmenu.cpp:246
 msgid "^!Year"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:194 src/emu/ui/custmenu.cpp:510
+#: src/emu/ui/custmenu.cpp:193 src/emu/ui/custmenu.cpp:508
 msgid "Remove last filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:197 src/emu/ui/custmenu.cpp:513
+#: src/emu/ui/custmenu.cpp:196 src/emu/ui/custmenu.cpp:511
 msgid "Add filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:212 src/emu/ui/custmenu.cpp:233
-#: src/emu/ui/custmenu.cpp:529 src/emu/ui/custmenu.cpp:550
+#: src/emu/ui/custmenu.cpp:211 src/emu/ui/custmenu.cpp:231
+#: src/emu/ui/custmenu.cpp:527 src/emu/ui/custmenu.cpp:547
 msgid "Select custom filters:"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:465
+#: src/emu/ui/custmenu.cpp:463
 msgid "^!Publisher"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:483
+#: src/emu/ui/custmenu.cpp:481
 msgid "^!Software List"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:492
+#: src/emu/ui/custmenu.cpp:490
 msgid "^!Device type"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:501
+#: src/emu/ui/custmenu.cpp:499
 msgid "^!Region"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:23
+#: src/emu/ui/custui.cpp:22
 msgid "Show All"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:24
+#: src/emu/ui/custui.cpp:23
 msgid "Hide Filters"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:25
+#: src/emu/ui/custui.cpp:24
 msgid "Hide Info/Image"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:26
+#: src/emu/ui/custui.cpp:25
 msgid "Hide Both"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:142
+#: src/emu/ui/custui.cpp:141
 msgid "Fonts"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:143
+#: src/emu/ui/custui.cpp:142
 msgid "Colors"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:148 src/emu/ui/dirmenu.cpp:33
+#: src/emu/ui/custui.cpp:147 src/emu/ui/dirmenu.cpp:33
 msgid "Language"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:152
+#: src/emu/ui/custui.cpp:151
 msgid "Show side panels"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:167 src/emu/ui/custui.cpp:188
+#: src/emu/ui/custui.cpp:166 src/emu/ui/custui.cpp:186
 msgid "Custom UI Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:246
+#: src/emu/ui/custui.cpp:244
 msgid "default"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:349
+#: src/emu/ui/custui.cpp:347
 msgid "UI Font"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:354
+#: src/emu/ui/custui.cpp:352
 msgid "Bold"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:355
+#: src/emu/ui/custui.cpp:353
 msgid "Italic"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:360
+#: src/emu/ui/custui.cpp:358
 msgid "Lines"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:366
+#: src/emu/ui/custui.cpp:364
 msgid "Infos text size"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:383
+#: src/emu/ui/custui.cpp:381
 msgid "UI Fonts Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:411
+#: src/emu/ui/custui.cpp:408
 msgid "Sample text - Lorem ipsum dolor sit amet, consectetur adipiscing elit."
 msgstr ""
 
-#: src/emu/ui/custui.cpp:509
+#: src/emu/ui/custui.cpp:506
 msgid "Normal text"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:510
+#: src/emu/ui/custui.cpp:507
 msgid "Selected color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:511
+#: src/emu/ui/custui.cpp:508
 msgid "Normal text background"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:512
+#: src/emu/ui/custui.cpp:509
 msgid "Selected background color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:513
+#: src/emu/ui/custui.cpp:510
 msgid "Subitem color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:514 src/emu/ui/custui.cpp:610
+#: src/emu/ui/custui.cpp:511 src/emu/ui/custui.cpp:606
 msgid "Clone"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:515
+#: src/emu/ui/custui.cpp:512
 msgid "Border"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:516
+#: src/emu/ui/custui.cpp:513
 msgid "Background"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:517
+#: src/emu/ui/custui.cpp:514
 msgid "Dipswitch"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:518
+#: src/emu/ui/custui.cpp:515
 msgid "Unavailable color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:519
+#: src/emu/ui/custui.cpp:516
 msgid "Slider color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:520
+#: src/emu/ui/custui.cpp:517
 msgid "Gfx viewer background"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:521
+#: src/emu/ui/custui.cpp:518
 msgid "Mouse over color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:522
+#: src/emu/ui/custui.cpp:519
 msgid "Mouse over background color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:523
+#: src/emu/ui/custui.cpp:520
 msgid "Mouse down color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:524
+#: src/emu/ui/custui.cpp:521
 msgid "Mouse down background color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:527
+#: src/emu/ui/custui.cpp:524
 msgid "Restore originals colors"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:543
+#: src/emu/ui/custui.cpp:540
 msgid "UI Colors Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:572
+#: src/emu/ui/custui.cpp:568
 #, c-format
 msgid "Double click or press %1$s to change the color value"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:598
+#: src/emu/ui/custui.cpp:594
 msgid "Menu Preview"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:606
+#: src/emu/ui/custui.cpp:602
 msgid "Normal"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:607
+#: src/emu/ui/custui.cpp:603
 msgid "Subitem"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:608
+#: src/emu/ui/custui.cpp:604
 msgid "Selected"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:609
+#: src/emu/ui/custui.cpp:605
 msgid "Mouse Over"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:841 src/emu/ui/custui.cpp:844
+#: src/emu/ui/custui.cpp:837 src/emu/ui/custui.cpp:840
 msgid "Alpha"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:849 src/emu/ui/custui.cpp:852
-#: src/emu/ui/custui.cpp:1013
+#: src/emu/ui/custui.cpp:845 src/emu/ui/custui.cpp:848
+#: src/emu/ui/custui.cpp:1007
 msgid "Red"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:857 src/emu/ui/custui.cpp:860
-#: src/emu/ui/custui.cpp:1016
+#: src/emu/ui/custui.cpp:853 src/emu/ui/custui.cpp:856
+#: src/emu/ui/custui.cpp:1010
 msgid "Green"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:865 src/emu/ui/custui.cpp:868
-#: src/emu/ui/custui.cpp:1017
+#: src/emu/ui/custui.cpp:861 src/emu/ui/custui.cpp:864
+#: src/emu/ui/custui.cpp:1011
 msgid "Blue"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:871
+#: src/emu/ui/custui.cpp:867
 msgid "Choose from palette"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:887
+#: src/emu/ui/custui.cpp:883
 msgid " - ARGB Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:912
+#: src/emu/ui/custui.cpp:907
 msgid "Color preview ="
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1009
+#: src/emu/ui/custui.cpp:1003
 msgid "White"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1010
+#: src/emu/ui/custui.cpp:1004
 msgid "Silver"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1011
+#: src/emu/ui/custui.cpp:1005
 msgid "Gray"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1012
+#: src/emu/ui/custui.cpp:1006
 msgid "Black"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1014
+#: src/emu/ui/custui.cpp:1008
 msgid "Orange"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1015
+#: src/emu/ui/custui.cpp:1009
 msgid "Yellow"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1018
+#: src/emu/ui/custui.cpp:1012
 msgid "Violet"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:65
+#: src/emu/ui/datmenu.cpp:64
 msgid "Software History"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:67
+#: src/emu/ui/datmenu.cpp:66
 msgid "Software Usage"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:199
+#: src/emu/ui/datmenu.cpp:196
 msgid "Revision: "
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:287 src/emu/ui/selgame.cpp:40
-#: src/emu/ui/selgame.cpp:2152 src/emu/ui/selgame.cpp:2161
-#: src/emu/ui/selsoft.cpp:1577 src/emu/ui/selsoft.cpp:1597
-#: src/emu/ui/selsoft.cpp:1606
+#: src/emu/ui/datmenu.cpp:284 src/emu/ui/selgame.cpp:39
+#: src/emu/ui/selgame.cpp:2158 src/emu/ui/selgame.cpp:2167
+#: src/emu/ui/selsoft.cpp:1574 src/emu/ui/selsoft.cpp:1592
+#: src/emu/ui/selsoft.cpp:1601
 msgid "History"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:289 src/emu/ui/selgame.cpp:41
+#: src/emu/ui/datmenu.cpp:286 src/emu/ui/selgame.cpp:40
 msgid "Mameinfo"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:291 src/emu/ui/selgame.cpp:43
+#: src/emu/ui/datmenu.cpp:288 src/emu/ui/selgame.cpp:42
 msgid "Messinfo"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:293 src/emu/ui/selgame.cpp:42
+#: src/emu/ui/datmenu.cpp:290 src/emu/ui/selgame.cpp:41
 msgid "Sysinfo"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:295 src/emu/ui/selgame.cpp:46
+#: src/emu/ui/datmenu.cpp:292 src/emu/ui/selgame.cpp:45
 msgid "Mamescore"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:297 src/emu/ui/selgame.cpp:45
+#: src/emu/ui/datmenu.cpp:294 src/emu/ui/selgame.cpp:44
 msgid "Gameinit"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:299 src/emu/ui/selgame.cpp:44
+#: src/emu/ui/datmenu.cpp:296 src/emu/ui/selgame.cpp:43
 msgid "Command"
 msgstr ""
 
@@ -556,75 +556,75 @@ msgstr ""
 msgid "Remove %1$s Folder"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:158
+#: src/emu/ui/filesel.cpp:161
 msgid "File Already Exists - Override?"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:160 src/emu/ui/selgame.cpp:1568
-#: src/emu/ui/selgame.cpp:1569 src/emu/ui/selgame.cpp:1570
-#: src/emu/ui/selgame.cpp:1571 src/emu/ui/selgame.cpp:1572
-#: src/emu/ui/selgame.cpp:1573 src/emu/ui/selgame.cpp:1574
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/filesel.cpp:163 src/emu/ui/selgame.cpp:1576
+#: src/emu/ui/selgame.cpp:1577 src/emu/ui/selgame.cpp:1578
+#: src/emu/ui/selgame.cpp:1579 src/emu/ui/selgame.cpp:1580
+#: src/emu/ui/selgame.cpp:1581 src/emu/ui/selgame.cpp:1582
+#: src/emu/ui/selgame.cpp:1591
 msgid "No"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:161 src/emu/ui/selgame.cpp:1568
-#: src/emu/ui/selgame.cpp:1569 src/emu/ui/selgame.cpp:1570
-#: src/emu/ui/selgame.cpp:1571 src/emu/ui/selgame.cpp:1572
-#: src/emu/ui/selgame.cpp:1573 src/emu/ui/selgame.cpp:1574
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/filesel.cpp:164 src/emu/ui/selgame.cpp:1576
+#: src/emu/ui/selgame.cpp:1577 src/emu/ui/selgame.cpp:1578
+#: src/emu/ui/selgame.cpp:1579 src/emu/ui/selgame.cpp:1580
+#: src/emu/ui/selgame.cpp:1581 src/emu/ui/selgame.cpp:1582
+#: src/emu/ui/selgame.cpp:1591
 msgid "Yes"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:272
+#: src/emu/ui/filesel.cpp:275
 msgid "New Image Name:"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:278
+#: src/emu/ui/filesel.cpp:281
 msgid "Image Format:"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:284
+#: src/emu/ui/filesel.cpp:287
 msgid "Create"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:315
+#: src/emu/ui/filesel.cpp:318
 msgid "Please enter a file extension too"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:503 src/emu/ui/swlist.cpp:65
+#: src/emu/ui/filesel.cpp:506 src/emu/ui/swlist.cpp:65
 msgid "[empty slot]"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:507
+#: src/emu/ui/filesel.cpp:510
 msgid "[create]"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:511 src/emu/ui/swlist.cpp:76
+#: src/emu/ui/filesel.cpp:514 src/emu/ui/swlist.cpp:76
 msgid "[software list]"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:803
+#: src/emu/ui/filesel.cpp:806
 msgid "Select image format"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:863
+#: src/emu/ui/filesel.cpp:866
 msgid "Select access mode"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:864
+#: src/emu/ui/filesel.cpp:867
 msgid "Read-only"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:866
+#: src/emu/ui/filesel.cpp:869
 msgid "Read-write"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:867
+#: src/emu/ui/filesel.cpp:870
 msgid "Read this image, write to another image"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:868
+#: src/emu/ui/filesel.cpp:871
 msgid "Read this image, write to diff"
 msgstr ""
 
@@ -650,7 +650,7 @@ msgstr ""
 msgid "[empty]"
 msgstr ""
 
-#: src/emu/ui/info_pty.cpp:26 src/emu/ui/mainmenu.cpp:91
+#: src/emu/ui/info_pty.cpp:26 src/emu/ui/mainmenu.cpp:96
 msgid "Pseudo terminals"
 msgstr ""
 
@@ -666,7 +666,7 @@ msgstr ""
 msgid "Other Controls"
 msgstr ""
 
-#: src/emu/ui/inputmap.cpp:622 src/emu/ui/miscmenu.cpp:91
+#: src/emu/ui/inputmap.cpp:622 src/emu/ui/miscmenu.cpp:92
 #: src/emu/ui/slotopt.cpp:172
 msgid "Reset"
 msgstr ""
@@ -699,27 +699,27 @@ msgstr ""
 msgid "Machine Information"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:78
+#: src/emu/ui/mainmenu.cpp:80
 msgid "Image Information"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:81
+#: src/emu/ui/mainmenu.cpp:83
 msgid "File Manager"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:86
+#: src/emu/ui/mainmenu.cpp:92
 msgid "Tape Control"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:94
+#: src/emu/ui/mainmenu.cpp:99
 msgid "Bios Selection"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:100
+#: src/emu/ui/mainmenu.cpp:104
 msgid "Slot Devices"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:107
+#: src/emu/ui/mainmenu.cpp:109
 msgid "Barcode Reader"
 msgstr ""
 
@@ -727,43 +727,43 @@ msgstr ""
 msgid "Network Devices"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:119
+#: src/emu/ui/mainmenu.cpp:118
 msgid "Keyboard Mode"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:122
+#: src/emu/ui/mainmenu.cpp:121
 msgid "Slider Controls"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:125
+#: src/emu/ui/mainmenu.cpp:124
 msgid "Video Options"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:129
+#: src/emu/ui/mainmenu.cpp:128
 msgid "Crosshair Options"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:133
+#: src/emu/ui/mainmenu.cpp:132
 msgid "Cheat"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:136
+#: src/emu/ui/mainmenu.cpp:135
 msgid "Plugin Options"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:140
+#: src/emu/ui/mainmenu.cpp:139
 msgid "External DAT View"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:146
+#: src/emu/ui/mainmenu.cpp:145 src/emu/ui/miscmenu.cpp:785
 msgid "Add To Favorites"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:148
+#: src/emu/ui/mainmenu.cpp:147 src/emu/ui/miscmenu.cpp:787
 msgid "Remove From Favorites"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:155
+#: src/emu/ui/mainmenu.cpp:154
 msgid "Select New Machine"
 msgstr ""
 
@@ -803,189 +803,205 @@ msgstr ""
 msgid "Return to Previous Menu"
 msgstr ""
 
-#: src/emu/ui/menu.cpp:716
+#: src/emu/ui/menu.cpp:761
 msgid "Auto"
 msgstr ""
 
-#: src/emu/ui/menu.cpp:2133
+#: src/emu/ui/menu.cpp:2195
 msgid "Images"
 msgstr ""
 
-#: src/emu/ui/menu.cpp:2134
+#: src/emu/ui/menu.cpp:2196
 msgid "Infos"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Keyboard Mode:"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Natural"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Emulated"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:240
+#: src/emu/ui/miscmenu.cpp:241
 #, c-format
 msgid ""
 "Uptime: %1$d:%2$02d:%3$02d\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:242
+#: src/emu/ui/miscmenu.cpp:243
 #, c-format
 msgid ""
 "Uptime: %1$d:%2$02d\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:246
+#: src/emu/ui/miscmenu.cpp:247
 #, c-format
 msgid ""
 "Tickets dispensed: %1$d\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:257
+#: src/emu/ui/miscmenu.cpp:258
 msgid "Coin %1$c: NA%3$s\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:257
+#: src/emu/ui/miscmenu.cpp:258
 #, c-format
 msgid "Coin %1$c: %2$d%3$s\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:260
+#: src/emu/ui/miscmenu.cpp:261
 msgid " (locked)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:519
+#: src/emu/ui/miscmenu.cpp:520
 msgid "Visible Delay"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:617
+#: src/emu/ui/miscmenu.cpp:619
 #, c-format
 msgid "%s.xml saved under ui folder."
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:645
+#: src/emu/ui/miscmenu.cpp:647
 msgid "Name:             Description:\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:657
+#: src/emu/ui/miscmenu.cpp:659
 #, c-format
 msgid "%s.txt saved under ui folder."
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:675
-msgid "Export XML format (like -listxml)"
+#: src/emu/ui/miscmenu.cpp:677
+msgid "Export list in XML format (like -listxml)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:676
-msgid "Export TXT format (like -listfull)"
+#: src/emu/ui/miscmenu.cpp:678
+msgid "Export list in XML format (like -listxml, but exclude devices)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:734
-msgid "Dummy"
+#: src/emu/ui/miscmenu.cpp:679
+msgid "Export list in TXT format (like -listfull)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:736
-msgid "Save machine configuration"
-msgstr ""
-
-#: src/emu/ui/miscmenu.cpp:848 src/emu/ui/miscmenu.cpp:869
-#: src/emu/ui/selgame.cpp:594
-msgid "Plugins"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:218
-msgid "Filter"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:226
-msgid " ^!File"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:231
-msgid " ^!Category"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:254
-msgid "^!Setup custom filter"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:262
-msgid "Customize UI"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:263
-msgid "Configure Directories"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:266 src/emu/ui/sndmenu.cpp:151
-#: src/emu/ui/sndmenu.cpp:172
-msgid "Sound Options"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:269
-msgid "General Inputs"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:272
-msgid "Save Configuration"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:286 src/emu/ui/optsmenu.cpp:307
-msgid "Settings"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:327
-msgid "**Error saving ui.ini**"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:374
-#, c-format
-msgid "**Error saving %s.ini**"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:378
+#: src/emu/ui/miscmenu.cpp:729 src/emu/ui/optsmenu.cpp:376
 msgid ""
 "\n"
 "    Configuration saved    \n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/selector.cpp:166
+#: src/emu/ui/miscmenu.cpp:774
+msgid "Bios"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:776
+msgid "Driver"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:790
+msgid "Save machine configuration"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:806
+msgid "Configure machine:"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:868 src/emu/ui/selsoft.cpp:109
+msgid " (default)"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:953 src/emu/ui/miscmenu.cpp:973
+#: src/emu/ui/selgame.cpp:600
+msgid "Plugins"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:217
+msgid "Filter"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:225
+msgid " ^!File"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:230
+msgid " ^!Category"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:253
+msgid "^!Setup custom filter"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:261
+msgid "Customize UI"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:262
+msgid "Configure Directories"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:265 src/emu/ui/sndmenu.cpp:149
+#: src/emu/ui/sndmenu.cpp:169
+msgid "Sound Options"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:268
+msgid "General Inputs"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:271
+msgid "Save Configuration"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:285 src/emu/ui/optsmenu.cpp:305
+msgid "Settings"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:325
+msgid "**Error saving ui.ini**"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:372
+#, c-format
+msgid "**Error saving %s.ini**"
+msgstr ""
+
+#: src/emu/ui/selector.cpp:165
 msgid "Selection List - Search: "
 msgstr ""
 
-#: src/emu/ui/selector.cpp:196
+#: src/emu/ui/selector.cpp:194
 #, c-format
 msgid "Double click or press %1$s to select"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:39
+#: src/emu/ui/selgame.cpp:38
 msgid "General Info"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:374 src/emu/ui/selsoft.cpp:282
+#: src/emu/ui/selgame.cpp:380 src/emu/ui/selsoft.cpp:281
 #, c-format
 msgid ""
 "%s\n"
 " added to favorites list."
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:380 src/emu/ui/selgame.cpp:389
-#: src/emu/ui/selsoft.cpp:287
+#: src/emu/ui/selgame.cpp:386 src/emu/ui/selgame.cpp:395
+#: src/emu/ui/selsoft.cpp:286
 #, c-format
 msgid ""
 "%s\n"
 " removed from favorites list."
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:450
+#: src/emu/ui/selgame.cpp:457
 msgid ""
 "The selected machine is missing one or more required ROM or CHD images. "
 "Please select a different machine.\n"
@@ -993,275 +1009,275 @@ msgid ""
 "Press any key to continue."
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:589 src/emu/ui/simpleselgame.cpp:265
+#: src/emu/ui/selgame.cpp:595 src/emu/ui/simpleselgame.cpp:265
 msgid "Configure Options"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:752
+#: src/emu/ui/selgame.cpp:596
+msgid "Configure Machine"
+msgstr ""
+
+#: src/emu/ui/selgame.cpp:758
 #, c-format
 msgid "%1$s %2$s ( %3$d / %4$d machines (%5$d BIOS) )"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:762
+#: src/emu/ui/selgame.cpp:768
 #, c-format
 msgid "%1$s (%2$s - %3$s) - "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:769 src/emu/ui/selgame.cpp:775
+#: src/emu/ui/selgame.cpp:775 src/emu/ui/selgame.cpp:781
 #, c-format
 msgid "%1$s (%2$s) - "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:784
+#: src/emu/ui/selgame.cpp:790
 #, c-format
 msgid "%1$s Search: %2$s_"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:838
+#: src/emu/ui/selgame.cpp:844
 #, c-format
 msgid "Romset: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:841 src/emu/ui/selgame.cpp:890
-#: src/emu/ui/selsoft.cpp:751 src/emu/ui/selsoft.cpp:801
+#: src/emu/ui/selgame.cpp:847 src/emu/ui/selgame.cpp:896
+#: src/emu/ui/selsoft.cpp:750 src/emu/ui/selsoft.cpp:800
 #: src/emu/ui/simpleselgame.cpp:328
 #, c-format
 msgid "%1$s, %2$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:847 src/emu/ui/selsoft.cpp:757
+#: src/emu/ui/selgame.cpp:853 src/emu/ui/selsoft.cpp:756
 #, c-format
 msgid "Driver is clone of: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:849 src/emu/ui/selsoft.cpp:759
+#: src/emu/ui/selgame.cpp:855 src/emu/ui/selsoft.cpp:758
 msgid "Driver is parent"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:853 src/emu/ui/selsoft.cpp:763
+#: src/emu/ui/selgame.cpp:859 src/emu/ui/selsoft.cpp:762
 #: src/emu/ui/simpleselgame.cpp:335
 msgid "Overall: NOT WORKING"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:855 src/emu/ui/selsoft.cpp:765
+#: src/emu/ui/selgame.cpp:861 src/emu/ui/selsoft.cpp:764
 #: src/emu/ui/simpleselgame.cpp:337
 msgid "Overall: Unemulated Protection"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:857 src/emu/ui/selsoft.cpp:767
+#: src/emu/ui/selgame.cpp:863 src/emu/ui/selsoft.cpp:766
 #: src/emu/ui/simpleselgame.cpp:339
 msgid "Overall: Working"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:861 src/emu/ui/selsoft.cpp:771
+#: src/emu/ui/selgame.cpp:867 src/emu/ui/selsoft.cpp:770
 msgid "Graphics: Imperfect, "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:863 src/emu/ui/selsoft.cpp:773
+#: src/emu/ui/selgame.cpp:869 src/emu/ui/selsoft.cpp:772
 msgid "Graphics: OK, "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:866 src/emu/ui/selsoft.cpp:776
+#: src/emu/ui/selgame.cpp:872 src/emu/ui/selsoft.cpp:775
 msgid "Sound: Unimplemented"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:868 src/emu/ui/selsoft.cpp:778
+#: src/emu/ui/selgame.cpp:874 src/emu/ui/selsoft.cpp:777
 msgid "Sound: Imperfect"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:870 src/emu/ui/selsoft.cpp:780
+#: src/emu/ui/selgame.cpp:876 src/emu/ui/selsoft.cpp:779
 msgid "Sound: OK"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:887
+#: src/emu/ui/selgame.cpp:893
 #, c-format
 msgid "System: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:894 src/emu/ui/selsoft.cpp:805
+#: src/emu/ui/selgame.cpp:900 src/emu/ui/selsoft.cpp:804
 #, c-format
 msgid "Software is clone of: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:896 src/emu/ui/selsoft.cpp:807
+#: src/emu/ui/selgame.cpp:902 src/emu/ui/selsoft.cpp:806
 msgid "Software is parent"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:901 src/emu/ui/selsoft.cpp:812
+#: src/emu/ui/selgame.cpp:907 src/emu/ui/selsoft.cpp:811
 msgid "Supported: No"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:906 src/emu/ui/selsoft.cpp:817
+#: src/emu/ui/selgame.cpp:912 src/emu/ui/selsoft.cpp:816
 msgid "Supported: Partial"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:911 src/emu/ui/selsoft.cpp:822
+#: src/emu/ui/selgame.cpp:917 src/emu/ui/selsoft.cpp:821
 msgid "Supported: Yes"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:916 src/emu/ui/selsoft.cpp:827
+#: src/emu/ui/selgame.cpp:922 src/emu/ui/selsoft.cpp:826
 #, c-format
 msgid "romset: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:923
+#: src/emu/ui/selgame.cpp:929
 #, c-format
 msgid "%1$s %2$s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1535
+#: src/emu/ui/selgame.cpp:1543
 #, c-format
 msgid "Romset: %1$-.100s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1536
+#: src/emu/ui/selgame.cpp:1544
 #, c-format
 msgid "Year: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1537
+#: src/emu/ui/selgame.cpp:1545
 #, c-format
 msgid "Manufacturer: %1$-.100s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1541
+#: src/emu/ui/selgame.cpp:1549
 #, c-format
 msgid "Driver is Clone of: %1$-.100s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1543
+#: src/emu/ui/selgame.cpp:1551
 msgid "Driver is Parent\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1546
+#: src/emu/ui/selgame.cpp:1554
 msgid "Overall: NOT WORKING\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1548
+#: src/emu/ui/selgame.cpp:1556
 msgid "Overall: Unemulated Protection\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1550
+#: src/emu/ui/selgame.cpp:1558
 msgid "Overall: Working\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1553
+#: src/emu/ui/selgame.cpp:1561
 msgid "Graphics: Imperfect Colors\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1557
+#: src/emu/ui/selgame.cpp:1565
 msgid "Graphics: Imperfect\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1559
+#: src/emu/ui/selgame.cpp:1567
 msgid "Graphics: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1562
+#: src/emu/ui/selgame.cpp:1570
 msgid "Sound: Unimplemented\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1564
+#: src/emu/ui/selgame.cpp:1572
 msgid "Sound: Imperfect\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1566
+#: src/emu/ui/selgame.cpp:1574
 msgid "Sound: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1568
+#: src/emu/ui/selgame.cpp:1576
 #, c-format
 msgid "Driver is Skeleton: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1569
+#: src/emu/ui/selgame.cpp:1577
 #, c-format
 msgid "Game is Mechanical: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1570
+#: src/emu/ui/selgame.cpp:1578
 #, c-format
 msgid "Requires Artwork: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1571
+#: src/emu/ui/selgame.cpp:1579
 #, c-format
 msgid "Requires Clickable Artwork: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1572
+#: src/emu/ui/selgame.cpp:1580
 #, c-format
 msgid "Support Cocktail: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1573
+#: src/emu/ui/selgame.cpp:1581
 #, c-format
 msgid "Driver is Bios: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1574
+#: src/emu/ui/selgame.cpp:1582
 #, c-format
 msgid "Support Save: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 #, c-format
 msgid "Screen Orientation: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 msgid "Vertical"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 msgid "Horizontal"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/selgame.cpp:1591
 #, c-format
 msgid "Requires CHD: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1596
+#: src/emu/ui/selgame.cpp:1604
 msgid "Roms Audit Pass: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1598
+#: src/emu/ui/selgame.cpp:1606
 msgid "Roms Audit Pass: BAD\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1601
+#: src/emu/ui/selgame.cpp:1609
 msgid "Samples Audit Pass: None Needed\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1603
+#: src/emu/ui/selgame.cpp:1611
 msgid "Samples Audit Pass: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1605
+#: src/emu/ui/selgame.cpp:1613
 msgid "Samples Audit Pass: BAD\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1608
+#: src/emu/ui/selgame.cpp:1616
 msgid ""
 "Roms Audit Pass: Disabled\n"
 "Samples Audit Pass: Disabled\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:2049 src/emu/ui/selgame.cpp:2212
-#: src/emu/ui/selsoft.cpp:1662
+#: src/emu/ui/selgame.cpp:2055 src/emu/ui/selgame.cpp:2216
+#: src/emu/ui/selsoft.cpp:1655
 msgid "No Infos Available"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:2162 src/emu/ui/selsoft.cpp:1607
+#: src/emu/ui/selgame.cpp:2168 src/emu/ui/selsoft.cpp:1602
 msgid "Usage"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:110
-msgid " (default)"
-msgstr ""
-
-#: src/emu/ui/selsoft.cpp:381
+#: src/emu/ui/selsoft.cpp:380
 msgid ""
 "The selected software is missing one or more required files. Please select a "
 "different software.\n"
@@ -1269,57 +1285,57 @@ msgid ""
 "Press any key to continue."
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:684
+#: src/emu/ui/selsoft.cpp:683
 #, c-format
-msgid "%1$s %2$s ( %3$d / %4$d softwares )"
+msgid "%1$s %2$s ( %3$d / %4$d software packages )"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:685
+#: src/emu/ui/selsoft.cpp:684
 #, c-format
 msgid "Driver: \"%1$s\" software list "
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:688
+#: src/emu/ui/selsoft.cpp:687
 #, c-format
 msgid "Region: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:690
+#: src/emu/ui/selsoft.cpp:689
 #, c-format
 msgid "Publisher: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:692
+#: src/emu/ui/selsoft.cpp:691
 #, c-format
 msgid "Year: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:694
+#: src/emu/ui/selsoft.cpp:693
 #, c-format
 msgid "Software List: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:696
+#: src/emu/ui/selsoft.cpp:695
 #, c-format
 msgid "Device type: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:698
+#: src/emu/ui/selsoft.cpp:697
 #, c-format
 msgid "%s Search: %s_"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:748 src/emu/ui/selsoft.cpp:798
+#: src/emu/ui/selsoft.cpp:747 src/emu/ui/selsoft.cpp:797
 #: src/emu/ui/simpleselgame.cpp:325
 #, c-format
 msgid "%1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:1998 src/emu/ui/selsoft.cpp:2018
+#: src/emu/ui/selsoft.cpp:1991 src/emu/ui/selsoft.cpp:2011
 msgid "Software part selection:"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:2136 src/emu/ui/selsoft.cpp:2156
+#: src/emu/ui/selsoft.cpp:2129 src/emu/ui/selsoft.cpp:2149
 msgid "Bios selection:"
 msgstr ""
 
@@ -1367,15 +1383,15 @@ msgstr ""
 msgid " [internal]"
 msgstr ""
 
-#: src/emu/ui/sndmenu.cpp:135
+#: src/emu/ui/sndmenu.cpp:133
 msgid "Sound"
 msgstr ""
 
-#: src/emu/ui/sndmenu.cpp:136
+#: src/emu/ui/sndmenu.cpp:134
 msgid "Sample Rate"
 msgstr ""
 
-#: src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/sndmenu.cpp:135
 msgid "Use External Samples"
 msgstr ""
 
@@ -1444,80 +1460,80 @@ msgstr ""
 msgid "Fast Forward"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:419
+#: src/emu/ui/ui.cpp:418
 msgid "This driver requires images to be loaded in the following device(s): "
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1074
+#: src/emu/ui/ui.cpp:1071
 msgid ""
 "One or more ROMs/CHDs for this machine are incorrect. The machine may not "
 "run correctly.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1087
+#: src/emu/ui/ui.cpp:1084
 msgid ""
 "There are known problems with this machine\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1091
+#: src/emu/ui/ui.cpp:1088
 msgid ""
 "One or more ROMs/CHDs for this machine have not been correctly dumped.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1095
+#: src/emu/ui/ui.cpp:1092
 #, c-format
 msgid "The keyboard emulation may not be 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1097
+#: src/emu/ui/ui.cpp:1094
 #, c-format
 msgid "The colors aren't 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1099
+#: src/emu/ui/ui.cpp:1096
 msgid "The colors are completely wrong.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1101
+#: src/emu/ui/ui.cpp:1098
 #, c-format
 msgid "The video emulation isn't 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1103
+#: src/emu/ui/ui.cpp:1100
 #, c-format
 msgid "The sound emulation isn't 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1105
+#: src/emu/ui/ui.cpp:1102
 msgid "The machine lacks sound.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1108
+#: src/emu/ui/ui.cpp:1105
 msgid "Screen flipping in cocktail mode is not supported.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1112
+#: src/emu/ui/ui.cpp:1109
 msgid "The machine requires external artwork files\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1117
+#: src/emu/ui/ui.cpp:1114
 msgid ""
 "This machine was never completed. It may exhibit strange behavior or missing "
 "elements that are not bugs in the emulation.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1122
+#: src/emu/ui/ui.cpp:1119
 msgid ""
 "This machine has no sound hardware, MAME will produce no sounds, this is "
 "expected behaviour.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1130
+#: src/emu/ui/ui.cpp:1127
 msgid "The machine has protection which isn't fully emulated.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1133
+#: src/emu/ui/ui.cpp:1130
 msgid ""
 "\n"
 "THIS MACHINE DOESN'T WORK. The emulation for this machine is not yet "
@@ -1525,7 +1541,7 @@ msgid ""
 "the developers to improve the emulation.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1137
+#: src/emu/ui/ui.cpp:1134
 msgid ""
 "\n"
 "Certain elements of this machine cannot be emulated as it requires actual "
@@ -1533,21 +1549,21 @@ msgid ""
 "to fully play this machine.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1156
+#: src/emu/ui/ui.cpp:1153
 msgid ""
 "\n"
 "\n"
 "There are working clones of this machine: "
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1170
+#: src/emu/ui/ui.cpp:1167
 msgid ""
 "\n"
 "\n"
 "Press any key to continue"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1185
+#: src/emu/ui/ui.cpp:1182
 #, c-format
 msgid ""
 "%1$s\n"
@@ -1557,98 +1573,98 @@ msgid ""
 "CPU:\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1221 src/emu/ui/ui.cpp:1260
+#: src/emu/ui/ui.cpp:1218 src/emu/ui/ui.cpp:1257
 msgid "MHz"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1221 src/emu/ui/ui.cpp:1260
+#: src/emu/ui/ui.cpp:1218 src/emu/ui/ui.cpp:1257
 msgid "kHz"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1235
+#: src/emu/ui/ui.cpp:1232
 msgid ""
 "\n"
 "Sound:\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1264
+#: src/emu/ui/ui.cpp:1261
 msgid ""
 "\n"
 "Video:\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1268
+#: src/emu/ui/ui.cpp:1265
 msgid "None\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1275
+#: src/emu/ui/ui.cpp:1272
 msgid "Vector"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1286
+#: src/emu/ui/ui.cpp:1283
 #, c-format
 msgid "%1$s: %2$s\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1286
+#: src/emu/ui/ui.cpp:1283
 msgid "%2$s\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1541 src/emu/ui/ui.cpp:1551
+#: src/emu/ui/ui.cpp:1538 src/emu/ui/ui.cpp:1548
 msgid "Keyboard Emulation Status"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1543
+#: src/emu/ui/ui.cpp:1540
 msgid "Mode: PARTIAL Emulation"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1544
+#: src/emu/ui/ui.cpp:1541
 msgid "UI:   Enabled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1546 src/emu/ui/ui.cpp:1556
+#: src/emu/ui/ui.cpp:1543 src/emu/ui/ui.cpp:1553
 msgid "**Use ScrLock to toggle**"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1553
+#: src/emu/ui/ui.cpp:1550
 msgid "Mode: FULL Emulation"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1554
+#: src/emu/ui/ui.cpp:1551
 msgid "UI:   Disabled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1692
+#: src/emu/ui/ui.cpp:1689
 msgid "Autofire can't be enabled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1731
+#: src/emu/ui/ui.cpp:1728
 msgid "Select position to save to"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1733
+#: src/emu/ui/ui.cpp:1730
 msgid "Select position to load from"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1757
+#: src/emu/ui/ui.cpp:1754
 msgid "Save cancelled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1759
+#: src/emu/ui/ui.cpp:1756
 msgid "Load cancelled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1802
+#: src/emu/ui/ui.cpp:1799
 #, c-format
 msgid "Save to position %s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1807
+#: src/emu/ui/ui.cpp:1804
 #, c-format
 msgid "Load from position %s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1847
+#: src/emu/ui/ui.cpp:1844
 #, c-format
 msgid ""
 "Are you sure you want to quit?\n"
@@ -1657,173 +1673,173 @@ msgid ""
 "Press ''%2$s'' to return to emulation."
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1917
+#: src/emu/ui/ui.cpp:1914
 msgid "Master Volume"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1926
+#: src/emu/ui/ui.cpp:1923
 #, c-format
 msgid "%1$s Volume"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1949
+#: src/emu/ui/ui.cpp:1946
 #, c-format
 msgid "Overclock CPU %1$s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1968
+#: src/emu/ui/ui.cpp:1965
 #, c-format
 msgid "%1$s Refresh Rate"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1973
+#: src/emu/ui/ui.cpp:1970
 #, c-format
 msgid "%1$s Brightness"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1975
+#: src/emu/ui/ui.cpp:1972
 #, c-format
 msgid "%1$s Contrast"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1977
+#: src/emu/ui/ui.cpp:1974
 #, c-format
 msgid "%1$s Gamma"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1981
+#: src/emu/ui/ui.cpp:1978
 #, c-format
 msgid "%1$s Horiz Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1983
+#: src/emu/ui/ui.cpp:1980
 #, c-format
 msgid "%1$s Horiz Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1985
+#: src/emu/ui/ui.cpp:1982
 #, c-format
 msgid "%1$s Vert Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1987
+#: src/emu/ui/ui.cpp:1984
 #, c-format
 msgid "%1$s Vert Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2005
+#: src/emu/ui/ui.cpp:2002
 #, c-format
 msgid "Laserdisc '%1$s' Horiz Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2007
+#: src/emu/ui/ui.cpp:2004
 #, c-format
 msgid "Laserdisc '%1$s' Horiz Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2009
+#: src/emu/ui/ui.cpp:2006
 #, c-format
 msgid "Laserdisc '%1$s' Vert Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2011
+#: src/emu/ui/ui.cpp:2008
 #, c-format
 msgid "Laserdisc '%1$s' Vert Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2021
+#: src/emu/ui/ui.cpp:2018
 msgid "Vector Flicker"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2022
+#: src/emu/ui/ui.cpp:2019
 msgid "Beam Width Minimum"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2023
+#: src/emu/ui/ui.cpp:2020
 msgid "Beam Width Maximum"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2024
+#: src/emu/ui/ui.cpp:2021
 msgid "Beam Intensity Weight"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2037
+#: src/emu/ui/ui.cpp:2034
 #, c-format
 msgid "Crosshair Scale %1$s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2037 src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2034 src/emu/ui/ui.cpp:2036
 msgid "X"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2037 src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2034 src/emu/ui/ui.cpp:2036
 msgid "Y"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2036
 #, c-format
 msgid "Crosshair Offset %1$s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2071
+#: src/emu/ui/ui.cpp:2068
 #, c-format
 msgid "%1$3ddB"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2115
+#: src/emu/ui/ui.cpp:2112
 #, c-format
 msgid "%1$d%%"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2131
+#: src/emu/ui/ui.cpp:2128
 #, c-format
 msgid "%1$3.0f%%"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2154
+#: src/emu/ui/ui.cpp:2151
 #, c-format
 msgid "%1$.3ffps"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2177 src/emu/ui/ui.cpp:2199 src/emu/ui/ui.cpp:2220
-#: src/emu/ui/ui.cpp:2242 src/emu/ui/ui.cpp:2264 src/emu/ui/ui.cpp:2286
-#: src/emu/ui/ui.cpp:2308 src/emu/ui/ui.cpp:2330 src/emu/ui/ui.cpp:2352
-#: src/emu/ui/ui.cpp:2374 src/emu/ui/ui.cpp:2396
+#: src/emu/ui/ui.cpp:2174 src/emu/ui/ui.cpp:2196 src/emu/ui/ui.cpp:2217
+#: src/emu/ui/ui.cpp:2239 src/emu/ui/ui.cpp:2261 src/emu/ui/ui.cpp:2283
+#: src/emu/ui/ui.cpp:2305 src/emu/ui/ui.cpp:2327 src/emu/ui/ui.cpp:2349
+#: src/emu/ui/ui.cpp:2371 src/emu/ui/ui.cpp:2393
 #, c-format
 msgid "%1$.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2412 src/emu/ui/ui.cpp:2428 src/emu/ui/ui.cpp:2444
-#: src/emu/ui/ui.cpp:2460
+#: src/emu/ui/ui.cpp:2408 src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2438
+#: src/emu/ui/ui.cpp:2453
 #, c-format
 msgid "%1$1.2f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2476
+#: src/emu/ui/ui.cpp:2469
 #, c-format
 msgid "Screen '%1$s'"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2478
+#: src/emu/ui/ui.cpp:2471
 msgid "Screen"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2494
+#: src/emu/ui/ui.cpp:2487
 #, c-format
 msgid "Crosshair Scale X %1$1.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2494
+#: src/emu/ui/ui.cpp:2487
 #, c-format
 msgid "Crosshair Scale Y %1$1.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2513
+#: src/emu/ui/ui.cpp:2506
 #, c-format
 msgid "Crosshair Offset X %1$1.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2513
+#: src/emu/ui/ui.cpp:2506
 #, c-format
 msgid "Crosshair Offset Y %1$1.3f"
 msgstr ""
@@ -1865,10 +1881,10 @@ msgstr ""
 msgid "Full"
 msgstr ""
 
-#: src/emu/ui/viewgfx.cpp:392
+#: src/emu/ui/viewgfx.cpp:391
 msgid " COLORS"
 msgstr ""
 
-#: src/emu/ui/viewgfx.cpp:392
+#: src/emu/ui/viewgfx.cpp:391
 msgid " PENS"
 msgstr ""
diff --git a/language/Swedish/strings.po b/language/Swedish/strings.po
index 13b70b048d1..296d5fa9e53 100644
--- a/language/Swedish/strings.po
+++ b/language/Swedish/strings.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MAME\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-11 03:33+0200\n"
+"POT-Creation-Date: 2016-04-15 17:42+0200\n"
 "PO-Revision-Date: 2016-02-20 18:03+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: MAME Language Team\n"
@@ -60,14 +60,14 @@ msgstr ""
 msgid "Autofire Status"
 msgstr ""
 
-#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1698
+#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1695
 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211
 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219
 #: src/emu/ui/videoopt.cpp:223
 msgid "Disabled"
 msgstr ""
 
-#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1698
+#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1695
 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211
 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219
 #: src/emu/ui/videoopt.cpp:223
@@ -75,14 +75,14 @@ msgid "Enabled"
 msgstr ""
 
 #: src/emu/ui/cheatopt.cpp:282 src/emu/ui/cheatopt.cpp:288
-#: src/emu/ui/menu.cpp:710 src/emu/ui/miscmenu.cpp:831
-#: src/emu/ui/sndmenu.cpp:135 src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/menu.cpp:755 src/emu/ui/miscmenu.cpp:936
+#: src/emu/ui/sndmenu.cpp:133 src/emu/ui/sndmenu.cpp:135
 msgid "On"
 msgstr ""
 
 #: src/emu/ui/cheatopt.cpp:282 src/emu/ui/cheatopt.cpp:288
-#: src/emu/ui/menu.cpp:713 src/emu/ui/miscmenu.cpp:831
-#: src/emu/ui/sndmenu.cpp:135 src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/menu.cpp:758 src/emu/ui/miscmenu.cpp:936
+#: src/emu/ui/sndmenu.cpp:133 src/emu/ui/sndmenu.cpp:135
 msgid "Off"
 msgstr ""
 
@@ -94,316 +94,316 @@ msgstr ""
 msgid "Autofire Delay"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:158 src/emu/ui/custmenu.cpp:447
+#: src/emu/ui/custmenu.cpp:157 src/emu/ui/custmenu.cpp:445
 msgid "Main filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:167 src/emu/ui/custmenu.cpp:456
+#: src/emu/ui/custmenu.cpp:166 src/emu/ui/custmenu.cpp:454
 msgid "Other filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:176 src/emu/ui/optsmenu.cpp:239
+#: src/emu/ui/custmenu.cpp:175 src/emu/ui/optsmenu.cpp:238
 msgid "^!Manufacturer"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:185 src/emu/ui/custmenu.cpp:474
-#: src/emu/ui/optsmenu.cpp:247
+#: src/emu/ui/custmenu.cpp:184 src/emu/ui/custmenu.cpp:472
+#: src/emu/ui/optsmenu.cpp:246
 msgid "^!Year"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:194 src/emu/ui/custmenu.cpp:510
+#: src/emu/ui/custmenu.cpp:193 src/emu/ui/custmenu.cpp:508
 msgid "Remove last filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:197 src/emu/ui/custmenu.cpp:513
+#: src/emu/ui/custmenu.cpp:196 src/emu/ui/custmenu.cpp:511
 msgid "Add filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:212 src/emu/ui/custmenu.cpp:233
-#: src/emu/ui/custmenu.cpp:529 src/emu/ui/custmenu.cpp:550
+#: src/emu/ui/custmenu.cpp:211 src/emu/ui/custmenu.cpp:231
+#: src/emu/ui/custmenu.cpp:527 src/emu/ui/custmenu.cpp:547
 msgid "Select custom filters:"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:465
+#: src/emu/ui/custmenu.cpp:463
 msgid "^!Publisher"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:483
+#: src/emu/ui/custmenu.cpp:481
 msgid "^!Software List"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:492
+#: src/emu/ui/custmenu.cpp:490
 msgid "^!Device type"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:501
+#: src/emu/ui/custmenu.cpp:499
 msgid "^!Region"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:23
+#: src/emu/ui/custui.cpp:22
 msgid "Show All"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:24
+#: src/emu/ui/custui.cpp:23
 msgid "Hide Filters"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:25
+#: src/emu/ui/custui.cpp:24
 msgid "Hide Info/Image"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:26
+#: src/emu/ui/custui.cpp:25
 msgid "Hide Both"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:142
+#: src/emu/ui/custui.cpp:141
 msgid "Fonts"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:143
+#: src/emu/ui/custui.cpp:142
 msgid "Colors"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:148 src/emu/ui/dirmenu.cpp:33
+#: src/emu/ui/custui.cpp:147 src/emu/ui/dirmenu.cpp:33
 msgid "Language"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:152
+#: src/emu/ui/custui.cpp:151
 msgid "Show side panels"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:167 src/emu/ui/custui.cpp:188
+#: src/emu/ui/custui.cpp:166 src/emu/ui/custui.cpp:186
 msgid "Custom UI Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:246
+#: src/emu/ui/custui.cpp:244
 msgid "default"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:349
+#: src/emu/ui/custui.cpp:347
 msgid "UI Font"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:354
+#: src/emu/ui/custui.cpp:352
 msgid "Bold"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:355
+#: src/emu/ui/custui.cpp:353
 msgid "Italic"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:360
+#: src/emu/ui/custui.cpp:358
 msgid "Lines"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:366
+#: src/emu/ui/custui.cpp:364
 msgid "Infos text size"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:383
+#: src/emu/ui/custui.cpp:381
 msgid "UI Fonts Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:411
+#: src/emu/ui/custui.cpp:408
 msgid "Sample text - Lorem ipsum dolor sit amet, consectetur adipiscing elit."
 msgstr ""
 
-#: src/emu/ui/custui.cpp:509
+#: src/emu/ui/custui.cpp:506
 msgid "Normal text"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:510
+#: src/emu/ui/custui.cpp:507
 msgid "Selected color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:511
+#: src/emu/ui/custui.cpp:508
 msgid "Normal text background"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:512
+#: src/emu/ui/custui.cpp:509
 msgid "Selected background color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:513
+#: src/emu/ui/custui.cpp:510
 msgid "Subitem color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:514 src/emu/ui/custui.cpp:610
+#: src/emu/ui/custui.cpp:511 src/emu/ui/custui.cpp:606
 msgid "Clone"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:515
+#: src/emu/ui/custui.cpp:512
 msgid "Border"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:516
+#: src/emu/ui/custui.cpp:513
 msgid "Background"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:517
+#: src/emu/ui/custui.cpp:514
 msgid "Dipswitch"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:518
+#: src/emu/ui/custui.cpp:515
 msgid "Unavailable color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:519
+#: src/emu/ui/custui.cpp:516
 msgid "Slider color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:520
+#: src/emu/ui/custui.cpp:517
 msgid "Gfx viewer background"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:521
+#: src/emu/ui/custui.cpp:518
 msgid "Mouse over color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:522
+#: src/emu/ui/custui.cpp:519
 msgid "Mouse over background color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:523
+#: src/emu/ui/custui.cpp:520
 msgid "Mouse down color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:524
+#: src/emu/ui/custui.cpp:521
 msgid "Mouse down background color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:527
+#: src/emu/ui/custui.cpp:524
 msgid "Restore originals colors"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:543
+#: src/emu/ui/custui.cpp:540
 msgid "UI Colors Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:572
+#: src/emu/ui/custui.cpp:568
 #, c-format
 msgid "Double click or press %1$s to change the color value"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:598
+#: src/emu/ui/custui.cpp:594
 msgid "Menu Preview"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:606
+#: src/emu/ui/custui.cpp:602
 msgid "Normal"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:607
+#: src/emu/ui/custui.cpp:603
 msgid "Subitem"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:608
+#: src/emu/ui/custui.cpp:604
 msgid "Selected"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:609
+#: src/emu/ui/custui.cpp:605
 msgid "Mouse Over"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:841 src/emu/ui/custui.cpp:844
+#: src/emu/ui/custui.cpp:837 src/emu/ui/custui.cpp:840
 msgid "Alpha"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:849 src/emu/ui/custui.cpp:852
-#: src/emu/ui/custui.cpp:1013
+#: src/emu/ui/custui.cpp:845 src/emu/ui/custui.cpp:848
+#: src/emu/ui/custui.cpp:1007
 msgid "Red"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:857 src/emu/ui/custui.cpp:860
-#: src/emu/ui/custui.cpp:1016
+#: src/emu/ui/custui.cpp:853 src/emu/ui/custui.cpp:856
+#: src/emu/ui/custui.cpp:1010
 msgid "Green"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:865 src/emu/ui/custui.cpp:868
-#: src/emu/ui/custui.cpp:1017
+#: src/emu/ui/custui.cpp:861 src/emu/ui/custui.cpp:864
+#: src/emu/ui/custui.cpp:1011
 msgid "Blue"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:871
+#: src/emu/ui/custui.cpp:867
 msgid "Choose from palette"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:887
+#: src/emu/ui/custui.cpp:883
 msgid " - ARGB Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:912
+#: src/emu/ui/custui.cpp:907
 msgid "Color preview ="
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1009
+#: src/emu/ui/custui.cpp:1003
 msgid "White"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1010
+#: src/emu/ui/custui.cpp:1004
 msgid "Silver"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1011
+#: src/emu/ui/custui.cpp:1005
 msgid "Gray"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1012
+#: src/emu/ui/custui.cpp:1006
 msgid "Black"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1014
+#: src/emu/ui/custui.cpp:1008
 msgid "Orange"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1015
+#: src/emu/ui/custui.cpp:1009
 msgid "Yellow"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1018
+#: src/emu/ui/custui.cpp:1012
 msgid "Violet"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:65
+#: src/emu/ui/datmenu.cpp:64
 msgid "Software History"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:67
+#: src/emu/ui/datmenu.cpp:66
 msgid "Software Usage"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:199
+#: src/emu/ui/datmenu.cpp:196
 msgid "Revision: "
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:287 src/emu/ui/selgame.cpp:40
-#: src/emu/ui/selgame.cpp:2152 src/emu/ui/selgame.cpp:2161
-#: src/emu/ui/selsoft.cpp:1577 src/emu/ui/selsoft.cpp:1597
-#: src/emu/ui/selsoft.cpp:1606
+#: src/emu/ui/datmenu.cpp:284 src/emu/ui/selgame.cpp:39
+#: src/emu/ui/selgame.cpp:2158 src/emu/ui/selgame.cpp:2167
+#: src/emu/ui/selsoft.cpp:1574 src/emu/ui/selsoft.cpp:1592
+#: src/emu/ui/selsoft.cpp:1601
 msgid "History"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:289 src/emu/ui/selgame.cpp:41
+#: src/emu/ui/datmenu.cpp:286 src/emu/ui/selgame.cpp:40
 msgid "Mameinfo"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:291 src/emu/ui/selgame.cpp:43
+#: src/emu/ui/datmenu.cpp:288 src/emu/ui/selgame.cpp:42
 msgid "Messinfo"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:293 src/emu/ui/selgame.cpp:42
+#: src/emu/ui/datmenu.cpp:290 src/emu/ui/selgame.cpp:41
 msgid "Sysinfo"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:295 src/emu/ui/selgame.cpp:46
+#: src/emu/ui/datmenu.cpp:292 src/emu/ui/selgame.cpp:45
 msgid "Mamescore"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:297 src/emu/ui/selgame.cpp:45
+#: src/emu/ui/datmenu.cpp:294 src/emu/ui/selgame.cpp:44
 msgid "Gameinit"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:299 src/emu/ui/selgame.cpp:44
+#: src/emu/ui/datmenu.cpp:296 src/emu/ui/selgame.cpp:43
 msgid "Command"
 msgstr ""
 
@@ -555,75 +555,75 @@ msgstr ""
 msgid "Remove %1$s Folder"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:158
+#: src/emu/ui/filesel.cpp:161
 msgid "File Already Exists - Override?"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:160 src/emu/ui/selgame.cpp:1568
-#: src/emu/ui/selgame.cpp:1569 src/emu/ui/selgame.cpp:1570
-#: src/emu/ui/selgame.cpp:1571 src/emu/ui/selgame.cpp:1572
-#: src/emu/ui/selgame.cpp:1573 src/emu/ui/selgame.cpp:1574
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/filesel.cpp:163 src/emu/ui/selgame.cpp:1576
+#: src/emu/ui/selgame.cpp:1577 src/emu/ui/selgame.cpp:1578
+#: src/emu/ui/selgame.cpp:1579 src/emu/ui/selgame.cpp:1580
+#: src/emu/ui/selgame.cpp:1581 src/emu/ui/selgame.cpp:1582
+#: src/emu/ui/selgame.cpp:1591
 msgid "No"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:161 src/emu/ui/selgame.cpp:1568
-#: src/emu/ui/selgame.cpp:1569 src/emu/ui/selgame.cpp:1570
-#: src/emu/ui/selgame.cpp:1571 src/emu/ui/selgame.cpp:1572
-#: src/emu/ui/selgame.cpp:1573 src/emu/ui/selgame.cpp:1574
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/filesel.cpp:164 src/emu/ui/selgame.cpp:1576
+#: src/emu/ui/selgame.cpp:1577 src/emu/ui/selgame.cpp:1578
+#: src/emu/ui/selgame.cpp:1579 src/emu/ui/selgame.cpp:1580
+#: src/emu/ui/selgame.cpp:1581 src/emu/ui/selgame.cpp:1582
+#: src/emu/ui/selgame.cpp:1591
 msgid "Yes"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:272
+#: src/emu/ui/filesel.cpp:275
 msgid "New Image Name:"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:278
+#: src/emu/ui/filesel.cpp:281
 msgid "Image Format:"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:284
+#: src/emu/ui/filesel.cpp:287
 msgid "Create"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:315
+#: src/emu/ui/filesel.cpp:318
 msgid "Please enter a file extension too"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:503 src/emu/ui/swlist.cpp:65
+#: src/emu/ui/filesel.cpp:506 src/emu/ui/swlist.cpp:65
 msgid "[empty slot]"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:507
+#: src/emu/ui/filesel.cpp:510
 msgid "[create]"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:511 src/emu/ui/swlist.cpp:76
+#: src/emu/ui/filesel.cpp:514 src/emu/ui/swlist.cpp:76
 msgid "[software list]"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:803
+#: src/emu/ui/filesel.cpp:806
 msgid "Select image format"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:863
+#: src/emu/ui/filesel.cpp:866
 msgid "Select access mode"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:864
+#: src/emu/ui/filesel.cpp:867
 msgid "Read-only"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:866
+#: src/emu/ui/filesel.cpp:869
 msgid "Read-write"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:867
+#: src/emu/ui/filesel.cpp:870
 msgid "Read this image, write to another image"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:868
+#: src/emu/ui/filesel.cpp:871
 msgid "Read this image, write to diff"
 msgstr ""
 
@@ -649,7 +649,7 @@ msgstr ""
 msgid "[empty]"
 msgstr ""
 
-#: src/emu/ui/info_pty.cpp:26 src/emu/ui/mainmenu.cpp:91
+#: src/emu/ui/info_pty.cpp:26 src/emu/ui/mainmenu.cpp:96
 msgid "Pseudo terminals"
 msgstr ""
 
@@ -665,7 +665,7 @@ msgstr ""
 msgid "Other Controls"
 msgstr ""
 
-#: src/emu/ui/inputmap.cpp:622 src/emu/ui/miscmenu.cpp:91
+#: src/emu/ui/inputmap.cpp:622 src/emu/ui/miscmenu.cpp:92
 #: src/emu/ui/slotopt.cpp:172
 msgid "Reset"
 msgstr ""
@@ -698,27 +698,27 @@ msgstr ""
 msgid "Machine Information"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:78
+#: src/emu/ui/mainmenu.cpp:80
 msgid "Image Information"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:81
+#: src/emu/ui/mainmenu.cpp:83
 msgid "File Manager"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:86
+#: src/emu/ui/mainmenu.cpp:92
 msgid "Tape Control"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:94
+#: src/emu/ui/mainmenu.cpp:99
 msgid "Bios Selection"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:100
+#: src/emu/ui/mainmenu.cpp:104
 msgid "Slot Devices"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:107
+#: src/emu/ui/mainmenu.cpp:109
 msgid "Barcode Reader"
 msgstr ""
 
@@ -726,43 +726,43 @@ msgstr ""
 msgid "Network Devices"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:119
+#: src/emu/ui/mainmenu.cpp:118
 msgid "Keyboard Mode"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:122
+#: src/emu/ui/mainmenu.cpp:121
 msgid "Slider Controls"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:125
+#: src/emu/ui/mainmenu.cpp:124
 msgid "Video Options"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:129
+#: src/emu/ui/mainmenu.cpp:128
 msgid "Crosshair Options"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:133
+#: src/emu/ui/mainmenu.cpp:132
 msgid "Cheat"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:136
+#: src/emu/ui/mainmenu.cpp:135
 msgid "Plugin Options"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:140
+#: src/emu/ui/mainmenu.cpp:139
 msgid "External DAT View"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:146
+#: src/emu/ui/mainmenu.cpp:145 src/emu/ui/miscmenu.cpp:785
 msgid "Add To Favorites"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:148
+#: src/emu/ui/mainmenu.cpp:147 src/emu/ui/miscmenu.cpp:787
 msgid "Remove From Favorites"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:155
+#: src/emu/ui/mainmenu.cpp:154
 msgid "Select New Machine"
 msgstr ""
 
@@ -802,189 +802,205 @@ msgstr ""
 msgid "Return to Previous Menu"
 msgstr ""
 
-#: src/emu/ui/menu.cpp:716
+#: src/emu/ui/menu.cpp:761
 msgid "Auto"
 msgstr ""
 
-#: src/emu/ui/menu.cpp:2133
+#: src/emu/ui/menu.cpp:2195
 msgid "Images"
 msgstr ""
 
-#: src/emu/ui/menu.cpp:2134
+#: src/emu/ui/menu.cpp:2196
 msgid "Infos"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Keyboard Mode:"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Natural"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Emulated"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:240
+#: src/emu/ui/miscmenu.cpp:241
 #, c-format
 msgid ""
 "Uptime: %1$d:%2$02d:%3$02d\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:242
+#: src/emu/ui/miscmenu.cpp:243
 #, c-format
 msgid ""
 "Uptime: %1$d:%2$02d\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:246
+#: src/emu/ui/miscmenu.cpp:247
 #, c-format
 msgid ""
 "Tickets dispensed: %1$d\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:257
+#: src/emu/ui/miscmenu.cpp:258
 msgid "Coin %1$c: NA%3$s\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:257
+#: src/emu/ui/miscmenu.cpp:258
 #, c-format
 msgid "Coin %1$c: %2$d%3$s\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:260
+#: src/emu/ui/miscmenu.cpp:261
 msgid " (locked)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:519
+#: src/emu/ui/miscmenu.cpp:520
 msgid "Visible Delay"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:617
+#: src/emu/ui/miscmenu.cpp:619
 #, c-format
 msgid "%s.xml saved under ui folder."
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:645
+#: src/emu/ui/miscmenu.cpp:647
 msgid "Name:             Description:\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:657
+#: src/emu/ui/miscmenu.cpp:659
 #, c-format
 msgid "%s.txt saved under ui folder."
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:675
-msgid "Export XML format (like -listxml)"
+#: src/emu/ui/miscmenu.cpp:677
+msgid "Export list in XML format (like -listxml)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:676
-msgid "Export TXT format (like -listfull)"
+#: src/emu/ui/miscmenu.cpp:678
+msgid "Export list in XML format (like -listxml, but exclude devices)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:734
-msgid "Dummy"
+#: src/emu/ui/miscmenu.cpp:679
+msgid "Export list in TXT format (like -listfull)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:736
-msgid "Save machine configuration"
-msgstr ""
-
-#: src/emu/ui/miscmenu.cpp:848 src/emu/ui/miscmenu.cpp:869
-#: src/emu/ui/selgame.cpp:594
-msgid "Plugins"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:218
-msgid "Filter"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:226
-msgid " ^!File"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:231
-msgid " ^!Category"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:254
-msgid "^!Setup custom filter"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:262
-msgid "Customize UI"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:263
-msgid "Configure Directories"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:266 src/emu/ui/sndmenu.cpp:151
-#: src/emu/ui/sndmenu.cpp:172
-msgid "Sound Options"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:269
-msgid "General Inputs"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:272
-msgid "Save Configuration"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:286 src/emu/ui/optsmenu.cpp:307
-msgid "Settings"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:327
-msgid "**Error saving ui.ini**"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:374
-#, c-format
-msgid "**Error saving %s.ini**"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:378
+#: src/emu/ui/miscmenu.cpp:729 src/emu/ui/optsmenu.cpp:376
 msgid ""
 "\n"
 "    Configuration saved    \n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/selector.cpp:166
+#: src/emu/ui/miscmenu.cpp:774
+msgid "Bios"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:776
+msgid "Driver"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:790
+msgid "Save machine configuration"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:806
+msgid "Configure machine:"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:868 src/emu/ui/selsoft.cpp:109
+msgid " (default)"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:953 src/emu/ui/miscmenu.cpp:973
+#: src/emu/ui/selgame.cpp:600
+msgid "Plugins"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:217
+msgid "Filter"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:225
+msgid " ^!File"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:230
+msgid " ^!Category"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:253
+msgid "^!Setup custom filter"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:261
+msgid "Customize UI"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:262
+msgid "Configure Directories"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:265 src/emu/ui/sndmenu.cpp:149
+#: src/emu/ui/sndmenu.cpp:169
+msgid "Sound Options"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:268
+msgid "General Inputs"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:271
+msgid "Save Configuration"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:285 src/emu/ui/optsmenu.cpp:305
+msgid "Settings"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:325
+msgid "**Error saving ui.ini**"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:372
+#, c-format
+msgid "**Error saving %s.ini**"
+msgstr ""
+
+#: src/emu/ui/selector.cpp:165
 msgid "Selection List - Search: "
 msgstr ""
 
-#: src/emu/ui/selector.cpp:196
+#: src/emu/ui/selector.cpp:194
 #, c-format
 msgid "Double click or press %1$s to select"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:39
+#: src/emu/ui/selgame.cpp:38
 msgid "General Info"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:374 src/emu/ui/selsoft.cpp:282
+#: src/emu/ui/selgame.cpp:380 src/emu/ui/selsoft.cpp:281
 #, c-format
 msgid ""
 "%s\n"
 " added to favorites list."
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:380 src/emu/ui/selgame.cpp:389
-#: src/emu/ui/selsoft.cpp:287
+#: src/emu/ui/selgame.cpp:386 src/emu/ui/selgame.cpp:395
+#: src/emu/ui/selsoft.cpp:286
 #, c-format
 msgid ""
 "%s\n"
 " removed from favorites list."
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:450
+#: src/emu/ui/selgame.cpp:457
 msgid ""
 "The selected machine is missing one or more required ROM or CHD images. "
 "Please select a different machine.\n"
@@ -992,275 +1008,275 @@ msgid ""
 "Press any key to continue."
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:589 src/emu/ui/simpleselgame.cpp:265
+#: src/emu/ui/selgame.cpp:595 src/emu/ui/simpleselgame.cpp:265
 msgid "Configure Options"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:752
+#: src/emu/ui/selgame.cpp:596
+msgid "Configure Machine"
+msgstr ""
+
+#: src/emu/ui/selgame.cpp:758
 #, c-format
 msgid "%1$s %2$s ( %3$d / %4$d machines (%5$d BIOS) )"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:762
+#: src/emu/ui/selgame.cpp:768
 #, c-format
 msgid "%1$s (%2$s - %3$s) - "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:769 src/emu/ui/selgame.cpp:775
+#: src/emu/ui/selgame.cpp:775 src/emu/ui/selgame.cpp:781
 #, c-format
 msgid "%1$s (%2$s) - "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:784
+#: src/emu/ui/selgame.cpp:790
 #, c-format
 msgid "%1$s Search: %2$s_"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:838
+#: src/emu/ui/selgame.cpp:844
 #, c-format
 msgid "Romset: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:841 src/emu/ui/selgame.cpp:890
-#: src/emu/ui/selsoft.cpp:751 src/emu/ui/selsoft.cpp:801
+#: src/emu/ui/selgame.cpp:847 src/emu/ui/selgame.cpp:896
+#: src/emu/ui/selsoft.cpp:750 src/emu/ui/selsoft.cpp:800
 #: src/emu/ui/simpleselgame.cpp:328
 #, c-format
 msgid "%1$s, %2$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:847 src/emu/ui/selsoft.cpp:757
+#: src/emu/ui/selgame.cpp:853 src/emu/ui/selsoft.cpp:756
 #, c-format
 msgid "Driver is clone of: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:849 src/emu/ui/selsoft.cpp:759
+#: src/emu/ui/selgame.cpp:855 src/emu/ui/selsoft.cpp:758
 msgid "Driver is parent"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:853 src/emu/ui/selsoft.cpp:763
+#: src/emu/ui/selgame.cpp:859 src/emu/ui/selsoft.cpp:762
 #: src/emu/ui/simpleselgame.cpp:335
 msgid "Overall: NOT WORKING"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:855 src/emu/ui/selsoft.cpp:765
+#: src/emu/ui/selgame.cpp:861 src/emu/ui/selsoft.cpp:764
 #: src/emu/ui/simpleselgame.cpp:337
 msgid "Overall: Unemulated Protection"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:857 src/emu/ui/selsoft.cpp:767
+#: src/emu/ui/selgame.cpp:863 src/emu/ui/selsoft.cpp:766
 #: src/emu/ui/simpleselgame.cpp:339
 msgid "Overall: Working"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:861 src/emu/ui/selsoft.cpp:771
+#: src/emu/ui/selgame.cpp:867 src/emu/ui/selsoft.cpp:770
 msgid "Graphics: Imperfect, "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:863 src/emu/ui/selsoft.cpp:773
+#: src/emu/ui/selgame.cpp:869 src/emu/ui/selsoft.cpp:772
 msgid "Graphics: OK, "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:866 src/emu/ui/selsoft.cpp:776
+#: src/emu/ui/selgame.cpp:872 src/emu/ui/selsoft.cpp:775
 msgid "Sound: Unimplemented"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:868 src/emu/ui/selsoft.cpp:778
+#: src/emu/ui/selgame.cpp:874 src/emu/ui/selsoft.cpp:777
 msgid "Sound: Imperfect"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:870 src/emu/ui/selsoft.cpp:780
+#: src/emu/ui/selgame.cpp:876 src/emu/ui/selsoft.cpp:779
 msgid "Sound: OK"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:887
+#: src/emu/ui/selgame.cpp:893
 #, c-format
 msgid "System: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:894 src/emu/ui/selsoft.cpp:805
+#: src/emu/ui/selgame.cpp:900 src/emu/ui/selsoft.cpp:804
 #, c-format
 msgid "Software is clone of: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:896 src/emu/ui/selsoft.cpp:807
+#: src/emu/ui/selgame.cpp:902 src/emu/ui/selsoft.cpp:806
 msgid "Software is parent"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:901 src/emu/ui/selsoft.cpp:812
+#: src/emu/ui/selgame.cpp:907 src/emu/ui/selsoft.cpp:811
 msgid "Supported: No"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:906 src/emu/ui/selsoft.cpp:817
+#: src/emu/ui/selgame.cpp:912 src/emu/ui/selsoft.cpp:816
 msgid "Supported: Partial"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:911 src/emu/ui/selsoft.cpp:822
+#: src/emu/ui/selgame.cpp:917 src/emu/ui/selsoft.cpp:821
 msgid "Supported: Yes"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:916 src/emu/ui/selsoft.cpp:827
+#: src/emu/ui/selgame.cpp:922 src/emu/ui/selsoft.cpp:826
 #, c-format
 msgid "romset: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:923
+#: src/emu/ui/selgame.cpp:929
 #, c-format
 msgid "%1$s %2$s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1535
+#: src/emu/ui/selgame.cpp:1543
 #, c-format
 msgid "Romset: %1$-.100s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1536
+#: src/emu/ui/selgame.cpp:1544
 #, c-format
 msgid "Year: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1537
+#: src/emu/ui/selgame.cpp:1545
 #, c-format
 msgid "Manufacturer: %1$-.100s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1541
+#: src/emu/ui/selgame.cpp:1549
 #, c-format
 msgid "Driver is Clone of: %1$-.100s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1543
+#: src/emu/ui/selgame.cpp:1551
 msgid "Driver is Parent\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1546
+#: src/emu/ui/selgame.cpp:1554
 msgid "Overall: NOT WORKING\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1548
+#: src/emu/ui/selgame.cpp:1556
 msgid "Overall: Unemulated Protection\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1550
+#: src/emu/ui/selgame.cpp:1558
 msgid "Overall: Working\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1553
+#: src/emu/ui/selgame.cpp:1561
 msgid "Graphics: Imperfect Colors\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1557
+#: src/emu/ui/selgame.cpp:1565
 msgid "Graphics: Imperfect\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1559
+#: src/emu/ui/selgame.cpp:1567
 msgid "Graphics: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1562
+#: src/emu/ui/selgame.cpp:1570
 msgid "Sound: Unimplemented\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1564
+#: src/emu/ui/selgame.cpp:1572
 msgid "Sound: Imperfect\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1566
+#: src/emu/ui/selgame.cpp:1574
 msgid "Sound: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1568
+#: src/emu/ui/selgame.cpp:1576
 #, c-format
 msgid "Driver is Skeleton: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1569
+#: src/emu/ui/selgame.cpp:1577
 #, c-format
 msgid "Game is Mechanical: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1570
+#: src/emu/ui/selgame.cpp:1578
 #, c-format
 msgid "Requires Artwork: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1571
+#: src/emu/ui/selgame.cpp:1579
 #, c-format
 msgid "Requires Clickable Artwork: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1572
+#: src/emu/ui/selgame.cpp:1580
 #, c-format
 msgid "Support Cocktail: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1573
+#: src/emu/ui/selgame.cpp:1581
 #, c-format
 msgid "Driver is Bios: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1574
+#: src/emu/ui/selgame.cpp:1582
 #, c-format
 msgid "Support Save: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 #, c-format
 msgid "Screen Orientation: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 msgid "Vertical"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 msgid "Horizontal"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/selgame.cpp:1591
 #, c-format
 msgid "Requires CHD: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1596
+#: src/emu/ui/selgame.cpp:1604
 msgid "Roms Audit Pass: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1598
+#: src/emu/ui/selgame.cpp:1606
 msgid "Roms Audit Pass: BAD\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1601
+#: src/emu/ui/selgame.cpp:1609
 msgid "Samples Audit Pass: None Needed\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1603
+#: src/emu/ui/selgame.cpp:1611
 msgid "Samples Audit Pass: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1605
+#: src/emu/ui/selgame.cpp:1613
 msgid "Samples Audit Pass: BAD\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1608
+#: src/emu/ui/selgame.cpp:1616
 msgid ""
 "Roms Audit Pass: Disabled\n"
 "Samples Audit Pass: Disabled\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:2049 src/emu/ui/selgame.cpp:2212
-#: src/emu/ui/selsoft.cpp:1662
+#: src/emu/ui/selgame.cpp:2055 src/emu/ui/selgame.cpp:2216
+#: src/emu/ui/selsoft.cpp:1655
 msgid "No Infos Available"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:2162 src/emu/ui/selsoft.cpp:1607
+#: src/emu/ui/selgame.cpp:2168 src/emu/ui/selsoft.cpp:1602
 msgid "Usage"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:110
-msgid " (default)"
-msgstr ""
-
-#: src/emu/ui/selsoft.cpp:381
+#: src/emu/ui/selsoft.cpp:380
 msgid ""
 "The selected software is missing one or more required files. Please select a "
 "different software.\n"
@@ -1268,57 +1284,57 @@ msgid ""
 "Press any key to continue."
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:684
+#: src/emu/ui/selsoft.cpp:683
 #, c-format
-msgid "%1$s %2$s ( %3$d / %4$d softwares )"
+msgid "%1$s %2$s ( %3$d / %4$d software packages )"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:685
+#: src/emu/ui/selsoft.cpp:684
 #, c-format
 msgid "Driver: \"%1$s\" software list "
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:688
+#: src/emu/ui/selsoft.cpp:687
 #, c-format
 msgid "Region: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:690
+#: src/emu/ui/selsoft.cpp:689
 #, c-format
 msgid "Publisher: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:692
+#: src/emu/ui/selsoft.cpp:691
 #, c-format
 msgid "Year: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:694
+#: src/emu/ui/selsoft.cpp:693
 #, c-format
 msgid "Software List: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:696
+#: src/emu/ui/selsoft.cpp:695
 #, c-format
 msgid "Device type: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:698
+#: src/emu/ui/selsoft.cpp:697
 #, c-format
 msgid "%s Search: %s_"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:748 src/emu/ui/selsoft.cpp:798
+#: src/emu/ui/selsoft.cpp:747 src/emu/ui/selsoft.cpp:797
 #: src/emu/ui/simpleselgame.cpp:325
 #, c-format
 msgid "%1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:1998 src/emu/ui/selsoft.cpp:2018
+#: src/emu/ui/selsoft.cpp:1991 src/emu/ui/selsoft.cpp:2011
 msgid "Software part selection:"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:2136 src/emu/ui/selsoft.cpp:2156
+#: src/emu/ui/selsoft.cpp:2129 src/emu/ui/selsoft.cpp:2149
 msgid "Bios selection:"
 msgstr ""
 
@@ -1366,15 +1382,15 @@ msgstr ""
 msgid " [internal]"
 msgstr ""
 
-#: src/emu/ui/sndmenu.cpp:135
+#: src/emu/ui/sndmenu.cpp:133
 msgid "Sound"
 msgstr ""
 
-#: src/emu/ui/sndmenu.cpp:136
+#: src/emu/ui/sndmenu.cpp:134
 msgid "Sample Rate"
 msgstr ""
 
-#: src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/sndmenu.cpp:135
 msgid "Use External Samples"
 msgstr ""
 
@@ -1443,80 +1459,80 @@ msgstr ""
 msgid "Fast Forward"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:419
+#: src/emu/ui/ui.cpp:418
 msgid "This driver requires images to be loaded in the following device(s): "
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1074
+#: src/emu/ui/ui.cpp:1071
 msgid ""
 "One or more ROMs/CHDs for this machine are incorrect. The machine may not "
 "run correctly.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1087
+#: src/emu/ui/ui.cpp:1084
 msgid ""
 "There are known problems with this machine\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1091
+#: src/emu/ui/ui.cpp:1088
 msgid ""
 "One or more ROMs/CHDs for this machine have not been correctly dumped.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1095
+#: src/emu/ui/ui.cpp:1092
 #, c-format
 msgid "The keyboard emulation may not be 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1097
+#: src/emu/ui/ui.cpp:1094
 #, c-format
 msgid "The colors aren't 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1099
+#: src/emu/ui/ui.cpp:1096
 msgid "The colors are completely wrong.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1101
+#: src/emu/ui/ui.cpp:1098
 #, c-format
 msgid "The video emulation isn't 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1103
+#: src/emu/ui/ui.cpp:1100
 #, c-format
 msgid "The sound emulation isn't 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1105
+#: src/emu/ui/ui.cpp:1102
 msgid "The machine lacks sound.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1108
+#: src/emu/ui/ui.cpp:1105
 msgid "Screen flipping in cocktail mode is not supported.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1112
+#: src/emu/ui/ui.cpp:1109
 msgid "The machine requires external artwork files\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1117
+#: src/emu/ui/ui.cpp:1114
 msgid ""
 "This machine was never completed. It may exhibit strange behavior or missing "
 "elements that are not bugs in the emulation.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1122
+#: src/emu/ui/ui.cpp:1119
 msgid ""
 "This machine has no sound hardware, MAME will produce no sounds, this is "
 "expected behaviour.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1130
+#: src/emu/ui/ui.cpp:1127
 msgid "The machine has protection which isn't fully emulated.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1133
+#: src/emu/ui/ui.cpp:1130
 msgid ""
 "\n"
 "THIS MACHINE DOESN'T WORK. The emulation for this machine is not yet "
@@ -1524,7 +1540,7 @@ msgid ""
 "the developers to improve the emulation.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1137
+#: src/emu/ui/ui.cpp:1134
 msgid ""
 "\n"
 "Certain elements of this machine cannot be emulated as it requires actual "
@@ -1532,21 +1548,21 @@ msgid ""
 "to fully play this machine.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1156
+#: src/emu/ui/ui.cpp:1153
 msgid ""
 "\n"
 "\n"
 "There are working clones of this machine: "
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1170
+#: src/emu/ui/ui.cpp:1167
 msgid ""
 "\n"
 "\n"
 "Press any key to continue"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1185
+#: src/emu/ui/ui.cpp:1182
 #, c-format
 msgid ""
 "%1$s\n"
@@ -1556,98 +1572,98 @@ msgid ""
 "CPU:\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1221 src/emu/ui/ui.cpp:1260
+#: src/emu/ui/ui.cpp:1218 src/emu/ui/ui.cpp:1257
 msgid "MHz"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1221 src/emu/ui/ui.cpp:1260
+#: src/emu/ui/ui.cpp:1218 src/emu/ui/ui.cpp:1257
 msgid "kHz"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1235
+#: src/emu/ui/ui.cpp:1232
 msgid ""
 "\n"
 "Sound:\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1264
+#: src/emu/ui/ui.cpp:1261
 msgid ""
 "\n"
 "Video:\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1268
+#: src/emu/ui/ui.cpp:1265
 msgid "None\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1275
+#: src/emu/ui/ui.cpp:1272
 msgid "Vector"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1286
+#: src/emu/ui/ui.cpp:1283
 #, c-format
 msgid "%1$s: %2$s\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1286
+#: src/emu/ui/ui.cpp:1283
 msgid "%2$s\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1541 src/emu/ui/ui.cpp:1551
+#: src/emu/ui/ui.cpp:1538 src/emu/ui/ui.cpp:1548
 msgid "Keyboard Emulation Status"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1543
+#: src/emu/ui/ui.cpp:1540
 msgid "Mode: PARTIAL Emulation"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1544
+#: src/emu/ui/ui.cpp:1541
 msgid "UI:   Enabled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1546 src/emu/ui/ui.cpp:1556
+#: src/emu/ui/ui.cpp:1543 src/emu/ui/ui.cpp:1553
 msgid "**Use ScrLock to toggle**"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1553
+#: src/emu/ui/ui.cpp:1550
 msgid "Mode: FULL Emulation"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1554
+#: src/emu/ui/ui.cpp:1551
 msgid "UI:   Disabled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1692
+#: src/emu/ui/ui.cpp:1689
 msgid "Autofire can't be enabled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1731
+#: src/emu/ui/ui.cpp:1728
 msgid "Select position to save to"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1733
+#: src/emu/ui/ui.cpp:1730
 msgid "Select position to load from"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1757
+#: src/emu/ui/ui.cpp:1754
 msgid "Save cancelled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1759
+#: src/emu/ui/ui.cpp:1756
 msgid "Load cancelled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1802
+#: src/emu/ui/ui.cpp:1799
 #, c-format
 msgid "Save to position %s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1807
+#: src/emu/ui/ui.cpp:1804
 #, c-format
 msgid "Load from position %s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1847
+#: src/emu/ui/ui.cpp:1844
 #, c-format
 msgid ""
 "Are you sure you want to quit?\n"
@@ -1656,173 +1672,173 @@ msgid ""
 "Press ''%2$s'' to return to emulation."
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1917
+#: src/emu/ui/ui.cpp:1914
 msgid "Master Volume"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1926
+#: src/emu/ui/ui.cpp:1923
 #, c-format
 msgid "%1$s Volume"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1949
+#: src/emu/ui/ui.cpp:1946
 #, c-format
 msgid "Overclock CPU %1$s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1968
+#: src/emu/ui/ui.cpp:1965
 #, c-format
 msgid "%1$s Refresh Rate"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1973
+#: src/emu/ui/ui.cpp:1970
 #, c-format
 msgid "%1$s Brightness"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1975
+#: src/emu/ui/ui.cpp:1972
 #, c-format
 msgid "%1$s Contrast"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1977
+#: src/emu/ui/ui.cpp:1974
 #, c-format
 msgid "%1$s Gamma"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1981
+#: src/emu/ui/ui.cpp:1978
 #, c-format
 msgid "%1$s Horiz Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1983
+#: src/emu/ui/ui.cpp:1980
 #, c-format
 msgid "%1$s Horiz Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1985
+#: src/emu/ui/ui.cpp:1982
 #, c-format
 msgid "%1$s Vert Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1987
+#: src/emu/ui/ui.cpp:1984
 #, c-format
 msgid "%1$s Vert Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2005
+#: src/emu/ui/ui.cpp:2002
 #, c-format
 msgid "Laserdisc '%1$s' Horiz Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2007
+#: src/emu/ui/ui.cpp:2004
 #, c-format
 msgid "Laserdisc '%1$s' Horiz Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2009
+#: src/emu/ui/ui.cpp:2006
 #, c-format
 msgid "Laserdisc '%1$s' Vert Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2011
+#: src/emu/ui/ui.cpp:2008
 #, c-format
 msgid "Laserdisc '%1$s' Vert Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2021
+#: src/emu/ui/ui.cpp:2018
 msgid "Vector Flicker"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2022
+#: src/emu/ui/ui.cpp:2019
 msgid "Beam Width Minimum"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2023
+#: src/emu/ui/ui.cpp:2020
 msgid "Beam Width Maximum"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2024
+#: src/emu/ui/ui.cpp:2021
 msgid "Beam Intensity Weight"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2037
+#: src/emu/ui/ui.cpp:2034
 #, c-format
 msgid "Crosshair Scale %1$s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2037 src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2034 src/emu/ui/ui.cpp:2036
 msgid "X"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2037 src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2034 src/emu/ui/ui.cpp:2036
 msgid "Y"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2036
 #, c-format
 msgid "Crosshair Offset %1$s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2071
+#: src/emu/ui/ui.cpp:2068
 #, c-format
 msgid "%1$3ddB"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2115
+#: src/emu/ui/ui.cpp:2112
 #, c-format
 msgid "%1$d%%"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2131
+#: src/emu/ui/ui.cpp:2128
 #, c-format
 msgid "%1$3.0f%%"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2154
+#: src/emu/ui/ui.cpp:2151
 #, c-format
 msgid "%1$.3ffps"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2177 src/emu/ui/ui.cpp:2199 src/emu/ui/ui.cpp:2220
-#: src/emu/ui/ui.cpp:2242 src/emu/ui/ui.cpp:2264 src/emu/ui/ui.cpp:2286
-#: src/emu/ui/ui.cpp:2308 src/emu/ui/ui.cpp:2330 src/emu/ui/ui.cpp:2352
-#: src/emu/ui/ui.cpp:2374 src/emu/ui/ui.cpp:2396
+#: src/emu/ui/ui.cpp:2174 src/emu/ui/ui.cpp:2196 src/emu/ui/ui.cpp:2217
+#: src/emu/ui/ui.cpp:2239 src/emu/ui/ui.cpp:2261 src/emu/ui/ui.cpp:2283
+#: src/emu/ui/ui.cpp:2305 src/emu/ui/ui.cpp:2327 src/emu/ui/ui.cpp:2349
+#: src/emu/ui/ui.cpp:2371 src/emu/ui/ui.cpp:2393
 #, c-format
 msgid "%1$.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2412 src/emu/ui/ui.cpp:2428 src/emu/ui/ui.cpp:2444
-#: src/emu/ui/ui.cpp:2460
+#: src/emu/ui/ui.cpp:2408 src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2438
+#: src/emu/ui/ui.cpp:2453
 #, c-format
 msgid "%1$1.2f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2476
+#: src/emu/ui/ui.cpp:2469
 #, c-format
 msgid "Screen '%1$s'"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2478
+#: src/emu/ui/ui.cpp:2471
 msgid "Screen"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2494
+#: src/emu/ui/ui.cpp:2487
 #, c-format
 msgid "Crosshair Scale X %1$1.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2494
+#: src/emu/ui/ui.cpp:2487
 #, c-format
 msgid "Crosshair Scale Y %1$1.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2513
+#: src/emu/ui/ui.cpp:2506
 #, c-format
 msgid "Crosshair Offset X %1$1.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2513
+#: src/emu/ui/ui.cpp:2506
 #, c-format
 msgid "Crosshair Offset Y %1$1.3f"
 msgstr ""
@@ -1864,10 +1880,10 @@ msgstr ""
 msgid "Full"
 msgstr ""
 
-#: src/emu/ui/viewgfx.cpp:392
+#: src/emu/ui/viewgfx.cpp:391
 msgid " COLORS"
 msgstr ""
 
-#: src/emu/ui/viewgfx.cpp:392
+#: src/emu/ui/viewgfx.cpp:391
 msgid " PENS"
 msgstr ""
diff --git a/language/Thai/strings.po b/language/Thai/strings.po
index 86beb17193b..506d64eb840 100644
--- a/language/Thai/strings.po
+++ b/language/Thai/strings.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MAME\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-11 03:33+0200\n"
+"POT-Creation-Date: 2016-04-15 17:42+0200\n"
 "PO-Revision-Date: 2016-02-20 18:03+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: MAME Language Team\n"
@@ -59,14 +59,14 @@ msgstr ""
 msgid "Autofire Status"
 msgstr ""
 
-#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1698
+#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1695
 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211
 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219
 #: src/emu/ui/videoopt.cpp:223
 msgid "Disabled"
 msgstr ""
 
-#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1698
+#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1695
 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211
 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219
 #: src/emu/ui/videoopt.cpp:223
@@ -74,14 +74,14 @@ msgid "Enabled"
 msgstr ""
 
 #: src/emu/ui/cheatopt.cpp:282 src/emu/ui/cheatopt.cpp:288
-#: src/emu/ui/menu.cpp:710 src/emu/ui/miscmenu.cpp:831
-#: src/emu/ui/sndmenu.cpp:135 src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/menu.cpp:755 src/emu/ui/miscmenu.cpp:936
+#: src/emu/ui/sndmenu.cpp:133 src/emu/ui/sndmenu.cpp:135
 msgid "On"
 msgstr ""
 
 #: src/emu/ui/cheatopt.cpp:282 src/emu/ui/cheatopt.cpp:288
-#: src/emu/ui/menu.cpp:713 src/emu/ui/miscmenu.cpp:831
-#: src/emu/ui/sndmenu.cpp:135 src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/menu.cpp:758 src/emu/ui/miscmenu.cpp:936
+#: src/emu/ui/sndmenu.cpp:133 src/emu/ui/sndmenu.cpp:135
 msgid "Off"
 msgstr ""
 
@@ -93,316 +93,316 @@ msgstr ""
 msgid "Autofire Delay"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:158 src/emu/ui/custmenu.cpp:447
+#: src/emu/ui/custmenu.cpp:157 src/emu/ui/custmenu.cpp:445
 msgid "Main filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:167 src/emu/ui/custmenu.cpp:456
+#: src/emu/ui/custmenu.cpp:166 src/emu/ui/custmenu.cpp:454
 msgid "Other filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:176 src/emu/ui/optsmenu.cpp:239
+#: src/emu/ui/custmenu.cpp:175 src/emu/ui/optsmenu.cpp:238
 msgid "^!Manufacturer"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:185 src/emu/ui/custmenu.cpp:474
-#: src/emu/ui/optsmenu.cpp:247
+#: src/emu/ui/custmenu.cpp:184 src/emu/ui/custmenu.cpp:472
+#: src/emu/ui/optsmenu.cpp:246
 msgid "^!Year"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:194 src/emu/ui/custmenu.cpp:510
+#: src/emu/ui/custmenu.cpp:193 src/emu/ui/custmenu.cpp:508
 msgid "Remove last filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:197 src/emu/ui/custmenu.cpp:513
+#: src/emu/ui/custmenu.cpp:196 src/emu/ui/custmenu.cpp:511
 msgid "Add filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:212 src/emu/ui/custmenu.cpp:233
-#: src/emu/ui/custmenu.cpp:529 src/emu/ui/custmenu.cpp:550
+#: src/emu/ui/custmenu.cpp:211 src/emu/ui/custmenu.cpp:231
+#: src/emu/ui/custmenu.cpp:527 src/emu/ui/custmenu.cpp:547
 msgid "Select custom filters:"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:465
+#: src/emu/ui/custmenu.cpp:463
 msgid "^!Publisher"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:483
+#: src/emu/ui/custmenu.cpp:481
 msgid "^!Software List"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:492
+#: src/emu/ui/custmenu.cpp:490
 msgid "^!Device type"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:501
+#: src/emu/ui/custmenu.cpp:499
 msgid "^!Region"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:23
+#: src/emu/ui/custui.cpp:22
 msgid "Show All"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:24
+#: src/emu/ui/custui.cpp:23
 msgid "Hide Filters"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:25
+#: src/emu/ui/custui.cpp:24
 msgid "Hide Info/Image"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:26
+#: src/emu/ui/custui.cpp:25
 msgid "Hide Both"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:142
+#: src/emu/ui/custui.cpp:141
 msgid "Fonts"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:143
+#: src/emu/ui/custui.cpp:142
 msgid "Colors"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:148 src/emu/ui/dirmenu.cpp:33
+#: src/emu/ui/custui.cpp:147 src/emu/ui/dirmenu.cpp:33
 msgid "Language"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:152
+#: src/emu/ui/custui.cpp:151
 msgid "Show side panels"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:167 src/emu/ui/custui.cpp:188
+#: src/emu/ui/custui.cpp:166 src/emu/ui/custui.cpp:186
 msgid "Custom UI Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:246
+#: src/emu/ui/custui.cpp:244
 msgid "default"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:349
+#: src/emu/ui/custui.cpp:347
 msgid "UI Font"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:354
+#: src/emu/ui/custui.cpp:352
 msgid "Bold"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:355
+#: src/emu/ui/custui.cpp:353
 msgid "Italic"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:360
+#: src/emu/ui/custui.cpp:358
 msgid "Lines"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:366
+#: src/emu/ui/custui.cpp:364
 msgid "Infos text size"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:383
+#: src/emu/ui/custui.cpp:381
 msgid "UI Fonts Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:411
+#: src/emu/ui/custui.cpp:408
 msgid "Sample text - Lorem ipsum dolor sit amet, consectetur adipiscing elit."
 msgstr ""
 
-#: src/emu/ui/custui.cpp:509
+#: src/emu/ui/custui.cpp:506
 msgid "Normal text"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:510
+#: src/emu/ui/custui.cpp:507
 msgid "Selected color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:511
+#: src/emu/ui/custui.cpp:508
 msgid "Normal text background"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:512
+#: src/emu/ui/custui.cpp:509
 msgid "Selected background color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:513
+#: src/emu/ui/custui.cpp:510
 msgid "Subitem color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:514 src/emu/ui/custui.cpp:610
+#: src/emu/ui/custui.cpp:511 src/emu/ui/custui.cpp:606
 msgid "Clone"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:515
+#: src/emu/ui/custui.cpp:512
 msgid "Border"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:516
+#: src/emu/ui/custui.cpp:513
 msgid "Background"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:517
+#: src/emu/ui/custui.cpp:514
 msgid "Dipswitch"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:518
+#: src/emu/ui/custui.cpp:515
 msgid "Unavailable color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:519
+#: src/emu/ui/custui.cpp:516
 msgid "Slider color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:520
+#: src/emu/ui/custui.cpp:517
 msgid "Gfx viewer background"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:521
+#: src/emu/ui/custui.cpp:518
 msgid "Mouse over color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:522
+#: src/emu/ui/custui.cpp:519
 msgid "Mouse over background color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:523
+#: src/emu/ui/custui.cpp:520
 msgid "Mouse down color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:524
+#: src/emu/ui/custui.cpp:521
 msgid "Mouse down background color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:527
+#: src/emu/ui/custui.cpp:524
 msgid "Restore originals colors"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:543
+#: src/emu/ui/custui.cpp:540
 msgid "UI Colors Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:572
+#: src/emu/ui/custui.cpp:568
 #, c-format
 msgid "Double click or press %1$s to change the color value"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:598
+#: src/emu/ui/custui.cpp:594
 msgid "Menu Preview"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:606
+#: src/emu/ui/custui.cpp:602
 msgid "Normal"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:607
+#: src/emu/ui/custui.cpp:603
 msgid "Subitem"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:608
+#: src/emu/ui/custui.cpp:604
 msgid "Selected"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:609
+#: src/emu/ui/custui.cpp:605
 msgid "Mouse Over"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:841 src/emu/ui/custui.cpp:844
+#: src/emu/ui/custui.cpp:837 src/emu/ui/custui.cpp:840
 msgid "Alpha"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:849 src/emu/ui/custui.cpp:852
-#: src/emu/ui/custui.cpp:1013
+#: src/emu/ui/custui.cpp:845 src/emu/ui/custui.cpp:848
+#: src/emu/ui/custui.cpp:1007
 msgid "Red"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:857 src/emu/ui/custui.cpp:860
-#: src/emu/ui/custui.cpp:1016
+#: src/emu/ui/custui.cpp:853 src/emu/ui/custui.cpp:856
+#: src/emu/ui/custui.cpp:1010
 msgid "Green"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:865 src/emu/ui/custui.cpp:868
-#: src/emu/ui/custui.cpp:1017
+#: src/emu/ui/custui.cpp:861 src/emu/ui/custui.cpp:864
+#: src/emu/ui/custui.cpp:1011
 msgid "Blue"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:871
+#: src/emu/ui/custui.cpp:867
 msgid "Choose from palette"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:887
+#: src/emu/ui/custui.cpp:883
 msgid " - ARGB Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:912
+#: src/emu/ui/custui.cpp:907
 msgid "Color preview ="
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1009
+#: src/emu/ui/custui.cpp:1003
 msgid "White"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1010
+#: src/emu/ui/custui.cpp:1004
 msgid "Silver"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1011
+#: src/emu/ui/custui.cpp:1005
 msgid "Gray"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1012
+#: src/emu/ui/custui.cpp:1006
 msgid "Black"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1014
+#: src/emu/ui/custui.cpp:1008
 msgid "Orange"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1015
+#: src/emu/ui/custui.cpp:1009
 msgid "Yellow"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1018
+#: src/emu/ui/custui.cpp:1012
 msgid "Violet"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:65
+#: src/emu/ui/datmenu.cpp:64
 msgid "Software History"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:67
+#: src/emu/ui/datmenu.cpp:66
 msgid "Software Usage"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:199
+#: src/emu/ui/datmenu.cpp:196
 msgid "Revision: "
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:287 src/emu/ui/selgame.cpp:40
-#: src/emu/ui/selgame.cpp:2152 src/emu/ui/selgame.cpp:2161
-#: src/emu/ui/selsoft.cpp:1577 src/emu/ui/selsoft.cpp:1597
-#: src/emu/ui/selsoft.cpp:1606
+#: src/emu/ui/datmenu.cpp:284 src/emu/ui/selgame.cpp:39
+#: src/emu/ui/selgame.cpp:2158 src/emu/ui/selgame.cpp:2167
+#: src/emu/ui/selsoft.cpp:1574 src/emu/ui/selsoft.cpp:1592
+#: src/emu/ui/selsoft.cpp:1601
 msgid "History"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:289 src/emu/ui/selgame.cpp:41
+#: src/emu/ui/datmenu.cpp:286 src/emu/ui/selgame.cpp:40
 msgid "Mameinfo"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:291 src/emu/ui/selgame.cpp:43
+#: src/emu/ui/datmenu.cpp:288 src/emu/ui/selgame.cpp:42
 msgid "Messinfo"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:293 src/emu/ui/selgame.cpp:42
+#: src/emu/ui/datmenu.cpp:290 src/emu/ui/selgame.cpp:41
 msgid "Sysinfo"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:295 src/emu/ui/selgame.cpp:46
+#: src/emu/ui/datmenu.cpp:292 src/emu/ui/selgame.cpp:45
 msgid "Mamescore"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:297 src/emu/ui/selgame.cpp:45
+#: src/emu/ui/datmenu.cpp:294 src/emu/ui/selgame.cpp:44
 msgid "Gameinit"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:299 src/emu/ui/selgame.cpp:44
+#: src/emu/ui/datmenu.cpp:296 src/emu/ui/selgame.cpp:43
 msgid "Command"
 msgstr ""
 
@@ -554,75 +554,75 @@ msgstr ""
 msgid "Remove %1$s Folder"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:158
+#: src/emu/ui/filesel.cpp:161
 msgid "File Already Exists - Override?"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:160 src/emu/ui/selgame.cpp:1568
-#: src/emu/ui/selgame.cpp:1569 src/emu/ui/selgame.cpp:1570
-#: src/emu/ui/selgame.cpp:1571 src/emu/ui/selgame.cpp:1572
-#: src/emu/ui/selgame.cpp:1573 src/emu/ui/selgame.cpp:1574
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/filesel.cpp:163 src/emu/ui/selgame.cpp:1576
+#: src/emu/ui/selgame.cpp:1577 src/emu/ui/selgame.cpp:1578
+#: src/emu/ui/selgame.cpp:1579 src/emu/ui/selgame.cpp:1580
+#: src/emu/ui/selgame.cpp:1581 src/emu/ui/selgame.cpp:1582
+#: src/emu/ui/selgame.cpp:1591
 msgid "No"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:161 src/emu/ui/selgame.cpp:1568
-#: src/emu/ui/selgame.cpp:1569 src/emu/ui/selgame.cpp:1570
-#: src/emu/ui/selgame.cpp:1571 src/emu/ui/selgame.cpp:1572
-#: src/emu/ui/selgame.cpp:1573 src/emu/ui/selgame.cpp:1574
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/filesel.cpp:164 src/emu/ui/selgame.cpp:1576
+#: src/emu/ui/selgame.cpp:1577 src/emu/ui/selgame.cpp:1578
+#: src/emu/ui/selgame.cpp:1579 src/emu/ui/selgame.cpp:1580
+#: src/emu/ui/selgame.cpp:1581 src/emu/ui/selgame.cpp:1582
+#: src/emu/ui/selgame.cpp:1591
 msgid "Yes"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:272
+#: src/emu/ui/filesel.cpp:275
 msgid "New Image Name:"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:278
+#: src/emu/ui/filesel.cpp:281
 msgid "Image Format:"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:284
+#: src/emu/ui/filesel.cpp:287
 msgid "Create"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:315
+#: src/emu/ui/filesel.cpp:318
 msgid "Please enter a file extension too"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:503 src/emu/ui/swlist.cpp:65
+#: src/emu/ui/filesel.cpp:506 src/emu/ui/swlist.cpp:65
 msgid "[empty slot]"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:507
+#: src/emu/ui/filesel.cpp:510
 msgid "[create]"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:511 src/emu/ui/swlist.cpp:76
+#: src/emu/ui/filesel.cpp:514 src/emu/ui/swlist.cpp:76
 msgid "[software list]"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:803
+#: src/emu/ui/filesel.cpp:806
 msgid "Select image format"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:863
+#: src/emu/ui/filesel.cpp:866
 msgid "Select access mode"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:864
+#: src/emu/ui/filesel.cpp:867
 msgid "Read-only"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:866
+#: src/emu/ui/filesel.cpp:869
 msgid "Read-write"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:867
+#: src/emu/ui/filesel.cpp:870
 msgid "Read this image, write to another image"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:868
+#: src/emu/ui/filesel.cpp:871
 msgid "Read this image, write to diff"
 msgstr ""
 
@@ -648,7 +648,7 @@ msgstr ""
 msgid "[empty]"
 msgstr ""
 
-#: src/emu/ui/info_pty.cpp:26 src/emu/ui/mainmenu.cpp:91
+#: src/emu/ui/info_pty.cpp:26 src/emu/ui/mainmenu.cpp:96
 msgid "Pseudo terminals"
 msgstr ""
 
@@ -664,7 +664,7 @@ msgstr ""
 msgid "Other Controls"
 msgstr ""
 
-#: src/emu/ui/inputmap.cpp:622 src/emu/ui/miscmenu.cpp:91
+#: src/emu/ui/inputmap.cpp:622 src/emu/ui/miscmenu.cpp:92
 #: src/emu/ui/slotopt.cpp:172
 msgid "Reset"
 msgstr ""
@@ -697,27 +697,27 @@ msgstr ""
 msgid "Machine Information"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:78
+#: src/emu/ui/mainmenu.cpp:80
 msgid "Image Information"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:81
+#: src/emu/ui/mainmenu.cpp:83
 msgid "File Manager"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:86
+#: src/emu/ui/mainmenu.cpp:92
 msgid "Tape Control"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:94
+#: src/emu/ui/mainmenu.cpp:99
 msgid "Bios Selection"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:100
+#: src/emu/ui/mainmenu.cpp:104
 msgid "Slot Devices"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:107
+#: src/emu/ui/mainmenu.cpp:109
 msgid "Barcode Reader"
 msgstr ""
 
@@ -725,43 +725,43 @@ msgstr ""
 msgid "Network Devices"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:119
+#: src/emu/ui/mainmenu.cpp:118
 msgid "Keyboard Mode"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:122
+#: src/emu/ui/mainmenu.cpp:121
 msgid "Slider Controls"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:125
+#: src/emu/ui/mainmenu.cpp:124
 msgid "Video Options"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:129
+#: src/emu/ui/mainmenu.cpp:128
 msgid "Crosshair Options"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:133
+#: src/emu/ui/mainmenu.cpp:132
 msgid "Cheat"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:136
+#: src/emu/ui/mainmenu.cpp:135
 msgid "Plugin Options"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:140
+#: src/emu/ui/mainmenu.cpp:139
 msgid "External DAT View"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:146
+#: src/emu/ui/mainmenu.cpp:145 src/emu/ui/miscmenu.cpp:785
 msgid "Add To Favorites"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:148
+#: src/emu/ui/mainmenu.cpp:147 src/emu/ui/miscmenu.cpp:787
 msgid "Remove From Favorites"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:155
+#: src/emu/ui/mainmenu.cpp:154
 msgid "Select New Machine"
 msgstr ""
 
@@ -801,189 +801,205 @@ msgstr ""
 msgid "Return to Previous Menu"
 msgstr ""
 
-#: src/emu/ui/menu.cpp:716
+#: src/emu/ui/menu.cpp:761
 msgid "Auto"
 msgstr ""
 
-#: src/emu/ui/menu.cpp:2133
+#: src/emu/ui/menu.cpp:2195
 msgid "Images"
 msgstr ""
 
-#: src/emu/ui/menu.cpp:2134
+#: src/emu/ui/menu.cpp:2196
 msgid "Infos"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Keyboard Mode:"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Natural"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Emulated"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:240
+#: src/emu/ui/miscmenu.cpp:241
 #, c-format
 msgid ""
 "Uptime: %1$d:%2$02d:%3$02d\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:242
+#: src/emu/ui/miscmenu.cpp:243
 #, c-format
 msgid ""
 "Uptime: %1$d:%2$02d\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:246
+#: src/emu/ui/miscmenu.cpp:247
 #, c-format
 msgid ""
 "Tickets dispensed: %1$d\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:257
+#: src/emu/ui/miscmenu.cpp:258
 msgid "Coin %1$c: NA%3$s\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:257
+#: src/emu/ui/miscmenu.cpp:258
 #, c-format
 msgid "Coin %1$c: %2$d%3$s\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:260
+#: src/emu/ui/miscmenu.cpp:261
 msgid " (locked)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:519
+#: src/emu/ui/miscmenu.cpp:520
 msgid "Visible Delay"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:617
+#: src/emu/ui/miscmenu.cpp:619
 #, c-format
 msgid "%s.xml saved under ui folder."
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:645
+#: src/emu/ui/miscmenu.cpp:647
 msgid "Name:             Description:\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:657
+#: src/emu/ui/miscmenu.cpp:659
 #, c-format
 msgid "%s.txt saved under ui folder."
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:675
-msgid "Export XML format (like -listxml)"
+#: src/emu/ui/miscmenu.cpp:677
+msgid "Export list in XML format (like -listxml)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:676
-msgid "Export TXT format (like -listfull)"
+#: src/emu/ui/miscmenu.cpp:678
+msgid "Export list in XML format (like -listxml, but exclude devices)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:734
-msgid "Dummy"
+#: src/emu/ui/miscmenu.cpp:679
+msgid "Export list in TXT format (like -listfull)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:736
-msgid "Save machine configuration"
-msgstr ""
-
-#: src/emu/ui/miscmenu.cpp:848 src/emu/ui/miscmenu.cpp:869
-#: src/emu/ui/selgame.cpp:594
-msgid "Plugins"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:218
-msgid "Filter"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:226
-msgid " ^!File"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:231
-msgid " ^!Category"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:254
-msgid "^!Setup custom filter"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:262
-msgid "Customize UI"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:263
-msgid "Configure Directories"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:266 src/emu/ui/sndmenu.cpp:151
-#: src/emu/ui/sndmenu.cpp:172
-msgid "Sound Options"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:269
-msgid "General Inputs"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:272
-msgid "Save Configuration"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:286 src/emu/ui/optsmenu.cpp:307
-msgid "Settings"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:327
-msgid "**Error saving ui.ini**"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:374
-#, c-format
-msgid "**Error saving %s.ini**"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:378
+#: src/emu/ui/miscmenu.cpp:729 src/emu/ui/optsmenu.cpp:376
 msgid ""
 "\n"
 "    Configuration saved    \n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/selector.cpp:166
+#: src/emu/ui/miscmenu.cpp:774
+msgid "Bios"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:776
+msgid "Driver"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:790
+msgid "Save machine configuration"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:806
+msgid "Configure machine:"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:868 src/emu/ui/selsoft.cpp:109
+msgid " (default)"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:953 src/emu/ui/miscmenu.cpp:973
+#: src/emu/ui/selgame.cpp:600
+msgid "Plugins"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:217
+msgid "Filter"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:225
+msgid " ^!File"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:230
+msgid " ^!Category"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:253
+msgid "^!Setup custom filter"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:261
+msgid "Customize UI"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:262
+msgid "Configure Directories"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:265 src/emu/ui/sndmenu.cpp:149
+#: src/emu/ui/sndmenu.cpp:169
+msgid "Sound Options"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:268
+msgid "General Inputs"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:271
+msgid "Save Configuration"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:285 src/emu/ui/optsmenu.cpp:305
+msgid "Settings"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:325
+msgid "**Error saving ui.ini**"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:372
+#, c-format
+msgid "**Error saving %s.ini**"
+msgstr ""
+
+#: src/emu/ui/selector.cpp:165
 msgid "Selection List - Search: "
 msgstr ""
 
-#: src/emu/ui/selector.cpp:196
+#: src/emu/ui/selector.cpp:194
 #, c-format
 msgid "Double click or press %1$s to select"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:39
+#: src/emu/ui/selgame.cpp:38
 msgid "General Info"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:374 src/emu/ui/selsoft.cpp:282
+#: src/emu/ui/selgame.cpp:380 src/emu/ui/selsoft.cpp:281
 #, c-format
 msgid ""
 "%s\n"
 " added to favorites list."
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:380 src/emu/ui/selgame.cpp:389
-#: src/emu/ui/selsoft.cpp:287
+#: src/emu/ui/selgame.cpp:386 src/emu/ui/selgame.cpp:395
+#: src/emu/ui/selsoft.cpp:286
 #, c-format
 msgid ""
 "%s\n"
 " removed from favorites list."
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:450
+#: src/emu/ui/selgame.cpp:457
 msgid ""
 "The selected machine is missing one or more required ROM or CHD images. "
 "Please select a different machine.\n"
@@ -991,275 +1007,275 @@ msgid ""
 "Press any key to continue."
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:589 src/emu/ui/simpleselgame.cpp:265
+#: src/emu/ui/selgame.cpp:595 src/emu/ui/simpleselgame.cpp:265
 msgid "Configure Options"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:752
+#: src/emu/ui/selgame.cpp:596
+msgid "Configure Machine"
+msgstr ""
+
+#: src/emu/ui/selgame.cpp:758
 #, c-format
 msgid "%1$s %2$s ( %3$d / %4$d machines (%5$d BIOS) )"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:762
+#: src/emu/ui/selgame.cpp:768
 #, c-format
 msgid "%1$s (%2$s - %3$s) - "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:769 src/emu/ui/selgame.cpp:775
+#: src/emu/ui/selgame.cpp:775 src/emu/ui/selgame.cpp:781
 #, c-format
 msgid "%1$s (%2$s) - "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:784
+#: src/emu/ui/selgame.cpp:790
 #, c-format
 msgid "%1$s Search: %2$s_"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:838
+#: src/emu/ui/selgame.cpp:844
 #, c-format
 msgid "Romset: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:841 src/emu/ui/selgame.cpp:890
-#: src/emu/ui/selsoft.cpp:751 src/emu/ui/selsoft.cpp:801
+#: src/emu/ui/selgame.cpp:847 src/emu/ui/selgame.cpp:896
+#: src/emu/ui/selsoft.cpp:750 src/emu/ui/selsoft.cpp:800
 #: src/emu/ui/simpleselgame.cpp:328
 #, c-format
 msgid "%1$s, %2$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:847 src/emu/ui/selsoft.cpp:757
+#: src/emu/ui/selgame.cpp:853 src/emu/ui/selsoft.cpp:756
 #, c-format
 msgid "Driver is clone of: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:849 src/emu/ui/selsoft.cpp:759
+#: src/emu/ui/selgame.cpp:855 src/emu/ui/selsoft.cpp:758
 msgid "Driver is parent"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:853 src/emu/ui/selsoft.cpp:763
+#: src/emu/ui/selgame.cpp:859 src/emu/ui/selsoft.cpp:762
 #: src/emu/ui/simpleselgame.cpp:335
 msgid "Overall: NOT WORKING"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:855 src/emu/ui/selsoft.cpp:765
+#: src/emu/ui/selgame.cpp:861 src/emu/ui/selsoft.cpp:764
 #: src/emu/ui/simpleselgame.cpp:337
 msgid "Overall: Unemulated Protection"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:857 src/emu/ui/selsoft.cpp:767
+#: src/emu/ui/selgame.cpp:863 src/emu/ui/selsoft.cpp:766
 #: src/emu/ui/simpleselgame.cpp:339
 msgid "Overall: Working"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:861 src/emu/ui/selsoft.cpp:771
+#: src/emu/ui/selgame.cpp:867 src/emu/ui/selsoft.cpp:770
 msgid "Graphics: Imperfect, "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:863 src/emu/ui/selsoft.cpp:773
+#: src/emu/ui/selgame.cpp:869 src/emu/ui/selsoft.cpp:772
 msgid "Graphics: OK, "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:866 src/emu/ui/selsoft.cpp:776
+#: src/emu/ui/selgame.cpp:872 src/emu/ui/selsoft.cpp:775
 msgid "Sound: Unimplemented"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:868 src/emu/ui/selsoft.cpp:778
+#: src/emu/ui/selgame.cpp:874 src/emu/ui/selsoft.cpp:777
 msgid "Sound: Imperfect"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:870 src/emu/ui/selsoft.cpp:780
+#: src/emu/ui/selgame.cpp:876 src/emu/ui/selsoft.cpp:779
 msgid "Sound: OK"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:887
+#: src/emu/ui/selgame.cpp:893
 #, c-format
 msgid "System: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:894 src/emu/ui/selsoft.cpp:805
+#: src/emu/ui/selgame.cpp:900 src/emu/ui/selsoft.cpp:804
 #, c-format
 msgid "Software is clone of: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:896 src/emu/ui/selsoft.cpp:807
+#: src/emu/ui/selgame.cpp:902 src/emu/ui/selsoft.cpp:806
 msgid "Software is parent"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:901 src/emu/ui/selsoft.cpp:812
+#: src/emu/ui/selgame.cpp:907 src/emu/ui/selsoft.cpp:811
 msgid "Supported: No"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:906 src/emu/ui/selsoft.cpp:817
+#: src/emu/ui/selgame.cpp:912 src/emu/ui/selsoft.cpp:816
 msgid "Supported: Partial"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:911 src/emu/ui/selsoft.cpp:822
+#: src/emu/ui/selgame.cpp:917 src/emu/ui/selsoft.cpp:821
 msgid "Supported: Yes"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:916 src/emu/ui/selsoft.cpp:827
+#: src/emu/ui/selgame.cpp:922 src/emu/ui/selsoft.cpp:826
 #, c-format
 msgid "romset: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:923
+#: src/emu/ui/selgame.cpp:929
 #, c-format
 msgid "%1$s %2$s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1535
+#: src/emu/ui/selgame.cpp:1543
 #, c-format
 msgid "Romset: %1$-.100s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1536
+#: src/emu/ui/selgame.cpp:1544
 #, c-format
 msgid "Year: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1537
+#: src/emu/ui/selgame.cpp:1545
 #, c-format
 msgid "Manufacturer: %1$-.100s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1541
+#: src/emu/ui/selgame.cpp:1549
 #, c-format
 msgid "Driver is Clone of: %1$-.100s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1543
+#: src/emu/ui/selgame.cpp:1551
 msgid "Driver is Parent\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1546
+#: src/emu/ui/selgame.cpp:1554
 msgid "Overall: NOT WORKING\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1548
+#: src/emu/ui/selgame.cpp:1556
 msgid "Overall: Unemulated Protection\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1550
+#: src/emu/ui/selgame.cpp:1558
 msgid "Overall: Working\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1553
+#: src/emu/ui/selgame.cpp:1561
 msgid "Graphics: Imperfect Colors\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1557
+#: src/emu/ui/selgame.cpp:1565
 msgid "Graphics: Imperfect\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1559
+#: src/emu/ui/selgame.cpp:1567
 msgid "Graphics: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1562
+#: src/emu/ui/selgame.cpp:1570
 msgid "Sound: Unimplemented\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1564
+#: src/emu/ui/selgame.cpp:1572
 msgid "Sound: Imperfect\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1566
+#: src/emu/ui/selgame.cpp:1574
 msgid "Sound: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1568
+#: src/emu/ui/selgame.cpp:1576
 #, c-format
 msgid "Driver is Skeleton: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1569
+#: src/emu/ui/selgame.cpp:1577
 #, c-format
 msgid "Game is Mechanical: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1570
+#: src/emu/ui/selgame.cpp:1578
 #, c-format
 msgid "Requires Artwork: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1571
+#: src/emu/ui/selgame.cpp:1579
 #, c-format
 msgid "Requires Clickable Artwork: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1572
+#: src/emu/ui/selgame.cpp:1580
 #, c-format
 msgid "Support Cocktail: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1573
+#: src/emu/ui/selgame.cpp:1581
 #, c-format
 msgid "Driver is Bios: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1574
+#: src/emu/ui/selgame.cpp:1582
 #, c-format
 msgid "Support Save: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 #, c-format
 msgid "Screen Orientation: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 msgid "Vertical"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 msgid "Horizontal"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/selgame.cpp:1591
 #, c-format
 msgid "Requires CHD: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1596
+#: src/emu/ui/selgame.cpp:1604
 msgid "Roms Audit Pass: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1598
+#: src/emu/ui/selgame.cpp:1606
 msgid "Roms Audit Pass: BAD\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1601
+#: src/emu/ui/selgame.cpp:1609
 msgid "Samples Audit Pass: None Needed\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1603
+#: src/emu/ui/selgame.cpp:1611
 msgid "Samples Audit Pass: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1605
+#: src/emu/ui/selgame.cpp:1613
 msgid "Samples Audit Pass: BAD\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1608
+#: src/emu/ui/selgame.cpp:1616
 msgid ""
 "Roms Audit Pass: Disabled\n"
 "Samples Audit Pass: Disabled\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:2049 src/emu/ui/selgame.cpp:2212
-#: src/emu/ui/selsoft.cpp:1662
+#: src/emu/ui/selgame.cpp:2055 src/emu/ui/selgame.cpp:2216
+#: src/emu/ui/selsoft.cpp:1655
 msgid "No Infos Available"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:2162 src/emu/ui/selsoft.cpp:1607
+#: src/emu/ui/selgame.cpp:2168 src/emu/ui/selsoft.cpp:1602
 msgid "Usage"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:110
-msgid " (default)"
-msgstr ""
-
-#: src/emu/ui/selsoft.cpp:381
+#: src/emu/ui/selsoft.cpp:380
 msgid ""
 "The selected software is missing one or more required files. Please select a "
 "different software.\n"
@@ -1267,57 +1283,57 @@ msgid ""
 "Press any key to continue."
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:684
+#: src/emu/ui/selsoft.cpp:683
 #, c-format
-msgid "%1$s %2$s ( %3$d / %4$d softwares )"
+msgid "%1$s %2$s ( %3$d / %4$d software packages )"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:685
+#: src/emu/ui/selsoft.cpp:684
 #, c-format
 msgid "Driver: \"%1$s\" software list "
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:688
+#: src/emu/ui/selsoft.cpp:687
 #, c-format
 msgid "Region: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:690
+#: src/emu/ui/selsoft.cpp:689
 #, c-format
 msgid "Publisher: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:692
+#: src/emu/ui/selsoft.cpp:691
 #, c-format
 msgid "Year: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:694
+#: src/emu/ui/selsoft.cpp:693
 #, c-format
 msgid "Software List: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:696
+#: src/emu/ui/selsoft.cpp:695
 #, c-format
 msgid "Device type: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:698
+#: src/emu/ui/selsoft.cpp:697
 #, c-format
 msgid "%s Search: %s_"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:748 src/emu/ui/selsoft.cpp:798
+#: src/emu/ui/selsoft.cpp:747 src/emu/ui/selsoft.cpp:797
 #: src/emu/ui/simpleselgame.cpp:325
 #, c-format
 msgid "%1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:1998 src/emu/ui/selsoft.cpp:2018
+#: src/emu/ui/selsoft.cpp:1991 src/emu/ui/selsoft.cpp:2011
 msgid "Software part selection:"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:2136 src/emu/ui/selsoft.cpp:2156
+#: src/emu/ui/selsoft.cpp:2129 src/emu/ui/selsoft.cpp:2149
 msgid "Bios selection:"
 msgstr ""
 
@@ -1365,15 +1381,15 @@ msgstr ""
 msgid " [internal]"
 msgstr ""
 
-#: src/emu/ui/sndmenu.cpp:135
+#: src/emu/ui/sndmenu.cpp:133
 msgid "Sound"
 msgstr ""
 
-#: src/emu/ui/sndmenu.cpp:136
+#: src/emu/ui/sndmenu.cpp:134
 msgid "Sample Rate"
 msgstr ""
 
-#: src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/sndmenu.cpp:135
 msgid "Use External Samples"
 msgstr ""
 
@@ -1442,80 +1458,80 @@ msgstr ""
 msgid "Fast Forward"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:419
+#: src/emu/ui/ui.cpp:418
 msgid "This driver requires images to be loaded in the following device(s): "
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1074
+#: src/emu/ui/ui.cpp:1071
 msgid ""
 "One or more ROMs/CHDs for this machine are incorrect. The machine may not "
 "run correctly.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1087
+#: src/emu/ui/ui.cpp:1084
 msgid ""
 "There are known problems with this machine\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1091
+#: src/emu/ui/ui.cpp:1088
 msgid ""
 "One or more ROMs/CHDs for this machine have not been correctly dumped.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1095
+#: src/emu/ui/ui.cpp:1092
 #, c-format
 msgid "The keyboard emulation may not be 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1097
+#: src/emu/ui/ui.cpp:1094
 #, c-format
 msgid "The colors aren't 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1099
+#: src/emu/ui/ui.cpp:1096
 msgid "The colors are completely wrong.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1101
+#: src/emu/ui/ui.cpp:1098
 #, c-format
 msgid "The video emulation isn't 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1103
+#: src/emu/ui/ui.cpp:1100
 #, c-format
 msgid "The sound emulation isn't 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1105
+#: src/emu/ui/ui.cpp:1102
 msgid "The machine lacks sound.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1108
+#: src/emu/ui/ui.cpp:1105
 msgid "Screen flipping in cocktail mode is not supported.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1112
+#: src/emu/ui/ui.cpp:1109
 msgid "The machine requires external artwork files\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1117
+#: src/emu/ui/ui.cpp:1114
 msgid ""
 "This machine was never completed. It may exhibit strange behavior or missing "
 "elements that are not bugs in the emulation.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1122
+#: src/emu/ui/ui.cpp:1119
 msgid ""
 "This machine has no sound hardware, MAME will produce no sounds, this is "
 "expected behaviour.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1130
+#: src/emu/ui/ui.cpp:1127
 msgid "The machine has protection which isn't fully emulated.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1133
+#: src/emu/ui/ui.cpp:1130
 msgid ""
 "\n"
 "THIS MACHINE DOESN'T WORK. The emulation for this machine is not yet "
@@ -1523,7 +1539,7 @@ msgid ""
 "the developers to improve the emulation.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1137
+#: src/emu/ui/ui.cpp:1134
 msgid ""
 "\n"
 "Certain elements of this machine cannot be emulated as it requires actual "
@@ -1531,21 +1547,21 @@ msgid ""
 "to fully play this machine.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1156
+#: src/emu/ui/ui.cpp:1153
 msgid ""
 "\n"
 "\n"
 "There are working clones of this machine: "
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1170
+#: src/emu/ui/ui.cpp:1167
 msgid ""
 "\n"
 "\n"
 "Press any key to continue"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1185
+#: src/emu/ui/ui.cpp:1182
 #, c-format
 msgid ""
 "%1$s\n"
@@ -1555,98 +1571,98 @@ msgid ""
 "CPU:\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1221 src/emu/ui/ui.cpp:1260
+#: src/emu/ui/ui.cpp:1218 src/emu/ui/ui.cpp:1257
 msgid "MHz"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1221 src/emu/ui/ui.cpp:1260
+#: src/emu/ui/ui.cpp:1218 src/emu/ui/ui.cpp:1257
 msgid "kHz"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1235
+#: src/emu/ui/ui.cpp:1232
 msgid ""
 "\n"
 "Sound:\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1264
+#: src/emu/ui/ui.cpp:1261
 msgid ""
 "\n"
 "Video:\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1268
+#: src/emu/ui/ui.cpp:1265
 msgid "None\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1275
+#: src/emu/ui/ui.cpp:1272
 msgid "Vector"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1286
+#: src/emu/ui/ui.cpp:1283
 #, c-format
 msgid "%1$s: %2$s\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1286
+#: src/emu/ui/ui.cpp:1283
 msgid "%2$s\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1541 src/emu/ui/ui.cpp:1551
+#: src/emu/ui/ui.cpp:1538 src/emu/ui/ui.cpp:1548
 msgid "Keyboard Emulation Status"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1543
+#: src/emu/ui/ui.cpp:1540
 msgid "Mode: PARTIAL Emulation"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1544
+#: src/emu/ui/ui.cpp:1541
 msgid "UI:   Enabled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1546 src/emu/ui/ui.cpp:1556
+#: src/emu/ui/ui.cpp:1543 src/emu/ui/ui.cpp:1553
 msgid "**Use ScrLock to toggle**"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1553
+#: src/emu/ui/ui.cpp:1550
 msgid "Mode: FULL Emulation"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1554
+#: src/emu/ui/ui.cpp:1551
 msgid "UI:   Disabled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1692
+#: src/emu/ui/ui.cpp:1689
 msgid "Autofire can't be enabled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1731
+#: src/emu/ui/ui.cpp:1728
 msgid "Select position to save to"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1733
+#: src/emu/ui/ui.cpp:1730
 msgid "Select position to load from"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1757
+#: src/emu/ui/ui.cpp:1754
 msgid "Save cancelled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1759
+#: src/emu/ui/ui.cpp:1756
 msgid "Load cancelled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1802
+#: src/emu/ui/ui.cpp:1799
 #, c-format
 msgid "Save to position %s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1807
+#: src/emu/ui/ui.cpp:1804
 #, c-format
 msgid "Load from position %s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1847
+#: src/emu/ui/ui.cpp:1844
 #, c-format
 msgid ""
 "Are you sure you want to quit?\n"
@@ -1655,173 +1671,173 @@ msgid ""
 "Press ''%2$s'' to return to emulation."
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1917
+#: src/emu/ui/ui.cpp:1914
 msgid "Master Volume"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1926
+#: src/emu/ui/ui.cpp:1923
 #, c-format
 msgid "%1$s Volume"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1949
+#: src/emu/ui/ui.cpp:1946
 #, c-format
 msgid "Overclock CPU %1$s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1968
+#: src/emu/ui/ui.cpp:1965
 #, c-format
 msgid "%1$s Refresh Rate"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1973
+#: src/emu/ui/ui.cpp:1970
 #, c-format
 msgid "%1$s Brightness"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1975
+#: src/emu/ui/ui.cpp:1972
 #, c-format
 msgid "%1$s Contrast"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1977
+#: src/emu/ui/ui.cpp:1974
 #, c-format
 msgid "%1$s Gamma"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1981
+#: src/emu/ui/ui.cpp:1978
 #, c-format
 msgid "%1$s Horiz Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1983
+#: src/emu/ui/ui.cpp:1980
 #, c-format
 msgid "%1$s Horiz Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1985
+#: src/emu/ui/ui.cpp:1982
 #, c-format
 msgid "%1$s Vert Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1987
+#: src/emu/ui/ui.cpp:1984
 #, c-format
 msgid "%1$s Vert Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2005
+#: src/emu/ui/ui.cpp:2002
 #, c-format
 msgid "Laserdisc '%1$s' Horiz Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2007
+#: src/emu/ui/ui.cpp:2004
 #, c-format
 msgid "Laserdisc '%1$s' Horiz Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2009
+#: src/emu/ui/ui.cpp:2006
 #, c-format
 msgid "Laserdisc '%1$s' Vert Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2011
+#: src/emu/ui/ui.cpp:2008
 #, c-format
 msgid "Laserdisc '%1$s' Vert Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2021
+#: src/emu/ui/ui.cpp:2018
 msgid "Vector Flicker"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2022
+#: src/emu/ui/ui.cpp:2019
 msgid "Beam Width Minimum"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2023
+#: src/emu/ui/ui.cpp:2020
 msgid "Beam Width Maximum"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2024
+#: src/emu/ui/ui.cpp:2021
 msgid "Beam Intensity Weight"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2037
+#: src/emu/ui/ui.cpp:2034
 #, c-format
 msgid "Crosshair Scale %1$s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2037 src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2034 src/emu/ui/ui.cpp:2036
 msgid "X"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2037 src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2034 src/emu/ui/ui.cpp:2036
 msgid "Y"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2036
 #, c-format
 msgid "Crosshair Offset %1$s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2071
+#: src/emu/ui/ui.cpp:2068
 #, c-format
 msgid "%1$3ddB"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2115
+#: src/emu/ui/ui.cpp:2112
 #, c-format
 msgid "%1$d%%"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2131
+#: src/emu/ui/ui.cpp:2128
 #, c-format
 msgid "%1$3.0f%%"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2154
+#: src/emu/ui/ui.cpp:2151
 #, c-format
 msgid "%1$.3ffps"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2177 src/emu/ui/ui.cpp:2199 src/emu/ui/ui.cpp:2220
-#: src/emu/ui/ui.cpp:2242 src/emu/ui/ui.cpp:2264 src/emu/ui/ui.cpp:2286
-#: src/emu/ui/ui.cpp:2308 src/emu/ui/ui.cpp:2330 src/emu/ui/ui.cpp:2352
-#: src/emu/ui/ui.cpp:2374 src/emu/ui/ui.cpp:2396
+#: src/emu/ui/ui.cpp:2174 src/emu/ui/ui.cpp:2196 src/emu/ui/ui.cpp:2217
+#: src/emu/ui/ui.cpp:2239 src/emu/ui/ui.cpp:2261 src/emu/ui/ui.cpp:2283
+#: src/emu/ui/ui.cpp:2305 src/emu/ui/ui.cpp:2327 src/emu/ui/ui.cpp:2349
+#: src/emu/ui/ui.cpp:2371 src/emu/ui/ui.cpp:2393
 #, c-format
 msgid "%1$.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2412 src/emu/ui/ui.cpp:2428 src/emu/ui/ui.cpp:2444
-#: src/emu/ui/ui.cpp:2460
+#: src/emu/ui/ui.cpp:2408 src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2438
+#: src/emu/ui/ui.cpp:2453
 #, c-format
 msgid "%1$1.2f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2476
+#: src/emu/ui/ui.cpp:2469
 #, c-format
 msgid "Screen '%1$s'"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2478
+#: src/emu/ui/ui.cpp:2471
 msgid "Screen"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2494
+#: src/emu/ui/ui.cpp:2487
 #, c-format
 msgid "Crosshair Scale X %1$1.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2494
+#: src/emu/ui/ui.cpp:2487
 #, c-format
 msgid "Crosshair Scale Y %1$1.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2513
+#: src/emu/ui/ui.cpp:2506
 #, c-format
 msgid "Crosshair Offset X %1$1.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2513
+#: src/emu/ui/ui.cpp:2506
 #, c-format
 msgid "Crosshair Offset Y %1$1.3f"
 msgstr ""
@@ -1863,10 +1879,10 @@ msgstr ""
 msgid "Full"
 msgstr ""
 
-#: src/emu/ui/viewgfx.cpp:392
+#: src/emu/ui/viewgfx.cpp:391
 msgid " COLORS"
 msgstr ""
 
-#: src/emu/ui/viewgfx.cpp:392
+#: src/emu/ui/viewgfx.cpp:391
 msgid " PENS"
 msgstr ""
diff --git a/language/Turkish/strings.po b/language/Turkish/strings.po
index 1480096bdeb..a3db8052d69 100644
--- a/language/Turkish/strings.po
+++ b/language/Turkish/strings.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MAME\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-11 03:33+0200\n"
+"POT-Creation-Date: 2016-04-15 17:42+0200\n"
 "PO-Revision-Date: 2016-02-20 18:03+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: MAME Language Team\n"
@@ -61,14 +61,14 @@ msgstr ""
 msgid "Autofire Status"
 msgstr ""
 
-#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1698
+#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1695
 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211
 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219
 #: src/emu/ui/videoopt.cpp:223
 msgid "Disabled"
 msgstr ""
 
-#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1698
+#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1695
 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211
 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219
 #: src/emu/ui/videoopt.cpp:223
@@ -76,14 +76,14 @@ msgid "Enabled"
 msgstr ""
 
 #: src/emu/ui/cheatopt.cpp:282 src/emu/ui/cheatopt.cpp:288
-#: src/emu/ui/menu.cpp:710 src/emu/ui/miscmenu.cpp:831
-#: src/emu/ui/sndmenu.cpp:135 src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/menu.cpp:755 src/emu/ui/miscmenu.cpp:936
+#: src/emu/ui/sndmenu.cpp:133 src/emu/ui/sndmenu.cpp:135
 msgid "On"
 msgstr ""
 
 #: src/emu/ui/cheatopt.cpp:282 src/emu/ui/cheatopt.cpp:288
-#: src/emu/ui/menu.cpp:713 src/emu/ui/miscmenu.cpp:831
-#: src/emu/ui/sndmenu.cpp:135 src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/menu.cpp:758 src/emu/ui/miscmenu.cpp:936
+#: src/emu/ui/sndmenu.cpp:133 src/emu/ui/sndmenu.cpp:135
 msgid "Off"
 msgstr ""
 
@@ -95,316 +95,316 @@ msgstr ""
 msgid "Autofire Delay"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:158 src/emu/ui/custmenu.cpp:447
+#: src/emu/ui/custmenu.cpp:157 src/emu/ui/custmenu.cpp:445
 msgid "Main filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:167 src/emu/ui/custmenu.cpp:456
+#: src/emu/ui/custmenu.cpp:166 src/emu/ui/custmenu.cpp:454
 msgid "Other filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:176 src/emu/ui/optsmenu.cpp:239
+#: src/emu/ui/custmenu.cpp:175 src/emu/ui/optsmenu.cpp:238
 msgid "^!Manufacturer"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:185 src/emu/ui/custmenu.cpp:474
-#: src/emu/ui/optsmenu.cpp:247
+#: src/emu/ui/custmenu.cpp:184 src/emu/ui/custmenu.cpp:472
+#: src/emu/ui/optsmenu.cpp:246
 msgid "^!Year"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:194 src/emu/ui/custmenu.cpp:510
+#: src/emu/ui/custmenu.cpp:193 src/emu/ui/custmenu.cpp:508
 msgid "Remove last filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:197 src/emu/ui/custmenu.cpp:513
+#: src/emu/ui/custmenu.cpp:196 src/emu/ui/custmenu.cpp:511
 msgid "Add filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:212 src/emu/ui/custmenu.cpp:233
-#: src/emu/ui/custmenu.cpp:529 src/emu/ui/custmenu.cpp:550
+#: src/emu/ui/custmenu.cpp:211 src/emu/ui/custmenu.cpp:231
+#: src/emu/ui/custmenu.cpp:527 src/emu/ui/custmenu.cpp:547
 msgid "Select custom filters:"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:465
+#: src/emu/ui/custmenu.cpp:463
 msgid "^!Publisher"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:483
+#: src/emu/ui/custmenu.cpp:481
 msgid "^!Software List"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:492
+#: src/emu/ui/custmenu.cpp:490
 msgid "^!Device type"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:501
+#: src/emu/ui/custmenu.cpp:499
 msgid "^!Region"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:23
+#: src/emu/ui/custui.cpp:22
 msgid "Show All"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:24
+#: src/emu/ui/custui.cpp:23
 msgid "Hide Filters"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:25
+#: src/emu/ui/custui.cpp:24
 msgid "Hide Info/Image"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:26
+#: src/emu/ui/custui.cpp:25
 msgid "Hide Both"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:142
+#: src/emu/ui/custui.cpp:141
 msgid "Fonts"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:143
+#: src/emu/ui/custui.cpp:142
 msgid "Colors"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:148 src/emu/ui/dirmenu.cpp:33
+#: src/emu/ui/custui.cpp:147 src/emu/ui/dirmenu.cpp:33
 msgid "Language"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:152
+#: src/emu/ui/custui.cpp:151
 msgid "Show side panels"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:167 src/emu/ui/custui.cpp:188
+#: src/emu/ui/custui.cpp:166 src/emu/ui/custui.cpp:186
 msgid "Custom UI Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:246
+#: src/emu/ui/custui.cpp:244
 msgid "default"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:349
+#: src/emu/ui/custui.cpp:347
 msgid "UI Font"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:354
+#: src/emu/ui/custui.cpp:352
 msgid "Bold"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:355
+#: src/emu/ui/custui.cpp:353
 msgid "Italic"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:360
+#: src/emu/ui/custui.cpp:358
 msgid "Lines"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:366
+#: src/emu/ui/custui.cpp:364
 msgid "Infos text size"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:383
+#: src/emu/ui/custui.cpp:381
 msgid "UI Fonts Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:411
+#: src/emu/ui/custui.cpp:408
 msgid "Sample text - Lorem ipsum dolor sit amet, consectetur adipiscing elit."
 msgstr ""
 
-#: src/emu/ui/custui.cpp:509
+#: src/emu/ui/custui.cpp:506
 msgid "Normal text"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:510
+#: src/emu/ui/custui.cpp:507
 msgid "Selected color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:511
+#: src/emu/ui/custui.cpp:508
 msgid "Normal text background"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:512
+#: src/emu/ui/custui.cpp:509
 msgid "Selected background color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:513
+#: src/emu/ui/custui.cpp:510
 msgid "Subitem color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:514 src/emu/ui/custui.cpp:610
+#: src/emu/ui/custui.cpp:511 src/emu/ui/custui.cpp:606
 msgid "Clone"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:515
+#: src/emu/ui/custui.cpp:512
 msgid "Border"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:516
+#: src/emu/ui/custui.cpp:513
 msgid "Background"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:517
+#: src/emu/ui/custui.cpp:514
 msgid "Dipswitch"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:518
+#: src/emu/ui/custui.cpp:515
 msgid "Unavailable color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:519
+#: src/emu/ui/custui.cpp:516
 msgid "Slider color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:520
+#: src/emu/ui/custui.cpp:517
 msgid "Gfx viewer background"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:521
+#: src/emu/ui/custui.cpp:518
 msgid "Mouse over color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:522
+#: src/emu/ui/custui.cpp:519
 msgid "Mouse over background color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:523
+#: src/emu/ui/custui.cpp:520
 msgid "Mouse down color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:524
+#: src/emu/ui/custui.cpp:521
 msgid "Mouse down background color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:527
+#: src/emu/ui/custui.cpp:524
 msgid "Restore originals colors"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:543
+#: src/emu/ui/custui.cpp:540
 msgid "UI Colors Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:572
+#: src/emu/ui/custui.cpp:568
 #, c-format
 msgid "Double click or press %1$s to change the color value"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:598
+#: src/emu/ui/custui.cpp:594
 msgid "Menu Preview"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:606
+#: src/emu/ui/custui.cpp:602
 msgid "Normal"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:607
+#: src/emu/ui/custui.cpp:603
 msgid "Subitem"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:608
+#: src/emu/ui/custui.cpp:604
 msgid "Selected"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:609
+#: src/emu/ui/custui.cpp:605
 msgid "Mouse Over"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:841 src/emu/ui/custui.cpp:844
+#: src/emu/ui/custui.cpp:837 src/emu/ui/custui.cpp:840
 msgid "Alpha"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:849 src/emu/ui/custui.cpp:852
-#: src/emu/ui/custui.cpp:1013
+#: src/emu/ui/custui.cpp:845 src/emu/ui/custui.cpp:848
+#: src/emu/ui/custui.cpp:1007
 msgid "Red"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:857 src/emu/ui/custui.cpp:860
-#: src/emu/ui/custui.cpp:1016
+#: src/emu/ui/custui.cpp:853 src/emu/ui/custui.cpp:856
+#: src/emu/ui/custui.cpp:1010
 msgid "Green"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:865 src/emu/ui/custui.cpp:868
-#: src/emu/ui/custui.cpp:1017
+#: src/emu/ui/custui.cpp:861 src/emu/ui/custui.cpp:864
+#: src/emu/ui/custui.cpp:1011
 msgid "Blue"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:871
+#: src/emu/ui/custui.cpp:867
 msgid "Choose from palette"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:887
+#: src/emu/ui/custui.cpp:883
 msgid " - ARGB Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:912
+#: src/emu/ui/custui.cpp:907
 msgid "Color preview ="
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1009
+#: src/emu/ui/custui.cpp:1003
 msgid "White"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1010
+#: src/emu/ui/custui.cpp:1004
 msgid "Silver"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1011
+#: src/emu/ui/custui.cpp:1005
 msgid "Gray"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1012
+#: src/emu/ui/custui.cpp:1006
 msgid "Black"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1014
+#: src/emu/ui/custui.cpp:1008
 msgid "Orange"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1015
+#: src/emu/ui/custui.cpp:1009
 msgid "Yellow"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1018
+#: src/emu/ui/custui.cpp:1012
 msgid "Violet"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:65
+#: src/emu/ui/datmenu.cpp:64
 msgid "Software History"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:67
+#: src/emu/ui/datmenu.cpp:66
 msgid "Software Usage"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:199
+#: src/emu/ui/datmenu.cpp:196
 msgid "Revision: "
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:287 src/emu/ui/selgame.cpp:40
-#: src/emu/ui/selgame.cpp:2152 src/emu/ui/selgame.cpp:2161
-#: src/emu/ui/selsoft.cpp:1577 src/emu/ui/selsoft.cpp:1597
-#: src/emu/ui/selsoft.cpp:1606
+#: src/emu/ui/datmenu.cpp:284 src/emu/ui/selgame.cpp:39
+#: src/emu/ui/selgame.cpp:2158 src/emu/ui/selgame.cpp:2167
+#: src/emu/ui/selsoft.cpp:1574 src/emu/ui/selsoft.cpp:1592
+#: src/emu/ui/selsoft.cpp:1601
 msgid "History"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:289 src/emu/ui/selgame.cpp:41
+#: src/emu/ui/datmenu.cpp:286 src/emu/ui/selgame.cpp:40
 msgid "Mameinfo"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:291 src/emu/ui/selgame.cpp:43
+#: src/emu/ui/datmenu.cpp:288 src/emu/ui/selgame.cpp:42
 msgid "Messinfo"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:293 src/emu/ui/selgame.cpp:42
+#: src/emu/ui/datmenu.cpp:290 src/emu/ui/selgame.cpp:41
 msgid "Sysinfo"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:295 src/emu/ui/selgame.cpp:46
+#: src/emu/ui/datmenu.cpp:292 src/emu/ui/selgame.cpp:45
 msgid "Mamescore"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:297 src/emu/ui/selgame.cpp:45
+#: src/emu/ui/datmenu.cpp:294 src/emu/ui/selgame.cpp:44
 msgid "Gameinit"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:299 src/emu/ui/selgame.cpp:44
+#: src/emu/ui/datmenu.cpp:296 src/emu/ui/selgame.cpp:43
 msgid "Command"
 msgstr ""
 
@@ -556,75 +556,75 @@ msgstr ""
 msgid "Remove %1$s Folder"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:158
+#: src/emu/ui/filesel.cpp:161
 msgid "File Already Exists - Override?"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:160 src/emu/ui/selgame.cpp:1568
-#: src/emu/ui/selgame.cpp:1569 src/emu/ui/selgame.cpp:1570
-#: src/emu/ui/selgame.cpp:1571 src/emu/ui/selgame.cpp:1572
-#: src/emu/ui/selgame.cpp:1573 src/emu/ui/selgame.cpp:1574
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/filesel.cpp:163 src/emu/ui/selgame.cpp:1576
+#: src/emu/ui/selgame.cpp:1577 src/emu/ui/selgame.cpp:1578
+#: src/emu/ui/selgame.cpp:1579 src/emu/ui/selgame.cpp:1580
+#: src/emu/ui/selgame.cpp:1581 src/emu/ui/selgame.cpp:1582
+#: src/emu/ui/selgame.cpp:1591
 msgid "No"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:161 src/emu/ui/selgame.cpp:1568
-#: src/emu/ui/selgame.cpp:1569 src/emu/ui/selgame.cpp:1570
-#: src/emu/ui/selgame.cpp:1571 src/emu/ui/selgame.cpp:1572
-#: src/emu/ui/selgame.cpp:1573 src/emu/ui/selgame.cpp:1574
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/filesel.cpp:164 src/emu/ui/selgame.cpp:1576
+#: src/emu/ui/selgame.cpp:1577 src/emu/ui/selgame.cpp:1578
+#: src/emu/ui/selgame.cpp:1579 src/emu/ui/selgame.cpp:1580
+#: src/emu/ui/selgame.cpp:1581 src/emu/ui/selgame.cpp:1582
+#: src/emu/ui/selgame.cpp:1591
 msgid "Yes"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:272
+#: src/emu/ui/filesel.cpp:275
 msgid "New Image Name:"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:278
+#: src/emu/ui/filesel.cpp:281
 msgid "Image Format:"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:284
+#: src/emu/ui/filesel.cpp:287
 msgid "Create"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:315
+#: src/emu/ui/filesel.cpp:318
 msgid "Please enter a file extension too"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:503 src/emu/ui/swlist.cpp:65
+#: src/emu/ui/filesel.cpp:506 src/emu/ui/swlist.cpp:65
 msgid "[empty slot]"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:507
+#: src/emu/ui/filesel.cpp:510
 msgid "[create]"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:511 src/emu/ui/swlist.cpp:76
+#: src/emu/ui/filesel.cpp:514 src/emu/ui/swlist.cpp:76
 msgid "[software list]"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:803
+#: src/emu/ui/filesel.cpp:806
 msgid "Select image format"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:863
+#: src/emu/ui/filesel.cpp:866
 msgid "Select access mode"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:864
+#: src/emu/ui/filesel.cpp:867
 msgid "Read-only"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:866
+#: src/emu/ui/filesel.cpp:869
 msgid "Read-write"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:867
+#: src/emu/ui/filesel.cpp:870
 msgid "Read this image, write to another image"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:868
+#: src/emu/ui/filesel.cpp:871
 msgid "Read this image, write to diff"
 msgstr ""
 
@@ -650,7 +650,7 @@ msgstr ""
 msgid "[empty]"
 msgstr ""
 
-#: src/emu/ui/info_pty.cpp:26 src/emu/ui/mainmenu.cpp:91
+#: src/emu/ui/info_pty.cpp:26 src/emu/ui/mainmenu.cpp:96
 msgid "Pseudo terminals"
 msgstr ""
 
@@ -666,7 +666,7 @@ msgstr ""
 msgid "Other Controls"
 msgstr ""
 
-#: src/emu/ui/inputmap.cpp:622 src/emu/ui/miscmenu.cpp:91
+#: src/emu/ui/inputmap.cpp:622 src/emu/ui/miscmenu.cpp:92
 #: src/emu/ui/slotopt.cpp:172
 msgid "Reset"
 msgstr ""
@@ -699,27 +699,27 @@ msgstr ""
 msgid "Machine Information"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:78
+#: src/emu/ui/mainmenu.cpp:80
 msgid "Image Information"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:81
+#: src/emu/ui/mainmenu.cpp:83
 msgid "File Manager"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:86
+#: src/emu/ui/mainmenu.cpp:92
 msgid "Tape Control"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:94
+#: src/emu/ui/mainmenu.cpp:99
 msgid "Bios Selection"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:100
+#: src/emu/ui/mainmenu.cpp:104
 msgid "Slot Devices"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:107
+#: src/emu/ui/mainmenu.cpp:109
 msgid "Barcode Reader"
 msgstr ""
 
@@ -727,43 +727,43 @@ msgstr ""
 msgid "Network Devices"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:119
+#: src/emu/ui/mainmenu.cpp:118
 msgid "Keyboard Mode"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:122
+#: src/emu/ui/mainmenu.cpp:121
 msgid "Slider Controls"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:125
+#: src/emu/ui/mainmenu.cpp:124
 msgid "Video Options"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:129
+#: src/emu/ui/mainmenu.cpp:128
 msgid "Crosshair Options"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:133
+#: src/emu/ui/mainmenu.cpp:132
 msgid "Cheat"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:136
+#: src/emu/ui/mainmenu.cpp:135
 msgid "Plugin Options"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:140
+#: src/emu/ui/mainmenu.cpp:139
 msgid "External DAT View"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:146
+#: src/emu/ui/mainmenu.cpp:145 src/emu/ui/miscmenu.cpp:785
 msgid "Add To Favorites"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:148
+#: src/emu/ui/mainmenu.cpp:147 src/emu/ui/miscmenu.cpp:787
 msgid "Remove From Favorites"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:155
+#: src/emu/ui/mainmenu.cpp:154
 msgid "Select New Machine"
 msgstr ""
 
@@ -803,189 +803,205 @@ msgstr ""
 msgid "Return to Previous Menu"
 msgstr ""
 
-#: src/emu/ui/menu.cpp:716
+#: src/emu/ui/menu.cpp:761
 msgid "Auto"
 msgstr ""
 
-#: src/emu/ui/menu.cpp:2133
+#: src/emu/ui/menu.cpp:2195
 msgid "Images"
 msgstr ""
 
-#: src/emu/ui/menu.cpp:2134
+#: src/emu/ui/menu.cpp:2196
 msgid "Infos"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Keyboard Mode:"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Natural"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Emulated"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:240
+#: src/emu/ui/miscmenu.cpp:241
 #, c-format
 msgid ""
 "Uptime: %1$d:%2$02d:%3$02d\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:242
+#: src/emu/ui/miscmenu.cpp:243
 #, c-format
 msgid ""
 "Uptime: %1$d:%2$02d\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:246
+#: src/emu/ui/miscmenu.cpp:247
 #, c-format
 msgid ""
 "Tickets dispensed: %1$d\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:257
+#: src/emu/ui/miscmenu.cpp:258
 msgid "Coin %1$c: NA%3$s\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:257
+#: src/emu/ui/miscmenu.cpp:258
 #, c-format
 msgid "Coin %1$c: %2$d%3$s\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:260
+#: src/emu/ui/miscmenu.cpp:261
 msgid " (locked)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:519
+#: src/emu/ui/miscmenu.cpp:520
 msgid "Visible Delay"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:617
+#: src/emu/ui/miscmenu.cpp:619
 #, c-format
 msgid "%s.xml saved under ui folder."
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:645
+#: src/emu/ui/miscmenu.cpp:647
 msgid "Name:             Description:\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:657
+#: src/emu/ui/miscmenu.cpp:659
 #, c-format
 msgid "%s.txt saved under ui folder."
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:675
-msgid "Export XML format (like -listxml)"
+#: src/emu/ui/miscmenu.cpp:677
+msgid "Export list in XML format (like -listxml)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:676
-msgid "Export TXT format (like -listfull)"
+#: src/emu/ui/miscmenu.cpp:678
+msgid "Export list in XML format (like -listxml, but exclude devices)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:734
-msgid "Dummy"
+#: src/emu/ui/miscmenu.cpp:679
+msgid "Export list in TXT format (like -listfull)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:736
-msgid "Save machine configuration"
-msgstr ""
-
-#: src/emu/ui/miscmenu.cpp:848 src/emu/ui/miscmenu.cpp:869
-#: src/emu/ui/selgame.cpp:594
-msgid "Plugins"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:218
-msgid "Filter"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:226
-msgid " ^!File"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:231
-msgid " ^!Category"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:254
-msgid "^!Setup custom filter"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:262
-msgid "Customize UI"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:263
-msgid "Configure Directories"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:266 src/emu/ui/sndmenu.cpp:151
-#: src/emu/ui/sndmenu.cpp:172
-msgid "Sound Options"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:269
-msgid "General Inputs"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:272
-msgid "Save Configuration"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:286 src/emu/ui/optsmenu.cpp:307
-msgid "Settings"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:327
-msgid "**Error saving ui.ini**"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:374
-#, c-format
-msgid "**Error saving %s.ini**"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:378
+#: src/emu/ui/miscmenu.cpp:729 src/emu/ui/optsmenu.cpp:376
 msgid ""
 "\n"
 "    Configuration saved    \n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/selector.cpp:166
+#: src/emu/ui/miscmenu.cpp:774
+msgid "Bios"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:776
+msgid "Driver"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:790
+msgid "Save machine configuration"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:806
+msgid "Configure machine:"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:868 src/emu/ui/selsoft.cpp:109
+msgid " (default)"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:953 src/emu/ui/miscmenu.cpp:973
+#: src/emu/ui/selgame.cpp:600
+msgid "Plugins"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:217
+msgid "Filter"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:225
+msgid " ^!File"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:230
+msgid " ^!Category"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:253
+msgid "^!Setup custom filter"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:261
+msgid "Customize UI"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:262
+msgid "Configure Directories"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:265 src/emu/ui/sndmenu.cpp:149
+#: src/emu/ui/sndmenu.cpp:169
+msgid "Sound Options"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:268
+msgid "General Inputs"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:271
+msgid "Save Configuration"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:285 src/emu/ui/optsmenu.cpp:305
+msgid "Settings"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:325
+msgid "**Error saving ui.ini**"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:372
+#, c-format
+msgid "**Error saving %s.ini**"
+msgstr ""
+
+#: src/emu/ui/selector.cpp:165
 msgid "Selection List - Search: "
 msgstr ""
 
-#: src/emu/ui/selector.cpp:196
+#: src/emu/ui/selector.cpp:194
 #, c-format
 msgid "Double click or press %1$s to select"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:39
+#: src/emu/ui/selgame.cpp:38
 msgid "General Info"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:374 src/emu/ui/selsoft.cpp:282
+#: src/emu/ui/selgame.cpp:380 src/emu/ui/selsoft.cpp:281
 #, c-format
 msgid ""
 "%s\n"
 " added to favorites list."
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:380 src/emu/ui/selgame.cpp:389
-#: src/emu/ui/selsoft.cpp:287
+#: src/emu/ui/selgame.cpp:386 src/emu/ui/selgame.cpp:395
+#: src/emu/ui/selsoft.cpp:286
 #, c-format
 msgid ""
 "%s\n"
 " removed from favorites list."
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:450
+#: src/emu/ui/selgame.cpp:457
 msgid ""
 "The selected machine is missing one or more required ROM or CHD images. "
 "Please select a different machine.\n"
@@ -993,275 +1009,275 @@ msgid ""
 "Press any key to continue."
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:589 src/emu/ui/simpleselgame.cpp:265
+#: src/emu/ui/selgame.cpp:595 src/emu/ui/simpleselgame.cpp:265
 msgid "Configure Options"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:752
+#: src/emu/ui/selgame.cpp:596
+msgid "Configure Machine"
+msgstr ""
+
+#: src/emu/ui/selgame.cpp:758
 #, c-format
 msgid "%1$s %2$s ( %3$d / %4$d machines (%5$d BIOS) )"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:762
+#: src/emu/ui/selgame.cpp:768
 #, c-format
 msgid "%1$s (%2$s - %3$s) - "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:769 src/emu/ui/selgame.cpp:775
+#: src/emu/ui/selgame.cpp:775 src/emu/ui/selgame.cpp:781
 #, c-format
 msgid "%1$s (%2$s) - "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:784
+#: src/emu/ui/selgame.cpp:790
 #, c-format
 msgid "%1$s Search: %2$s_"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:838
+#: src/emu/ui/selgame.cpp:844
 #, c-format
 msgid "Romset: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:841 src/emu/ui/selgame.cpp:890
-#: src/emu/ui/selsoft.cpp:751 src/emu/ui/selsoft.cpp:801
+#: src/emu/ui/selgame.cpp:847 src/emu/ui/selgame.cpp:896
+#: src/emu/ui/selsoft.cpp:750 src/emu/ui/selsoft.cpp:800
 #: src/emu/ui/simpleselgame.cpp:328
 #, c-format
 msgid "%1$s, %2$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:847 src/emu/ui/selsoft.cpp:757
+#: src/emu/ui/selgame.cpp:853 src/emu/ui/selsoft.cpp:756
 #, c-format
 msgid "Driver is clone of: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:849 src/emu/ui/selsoft.cpp:759
+#: src/emu/ui/selgame.cpp:855 src/emu/ui/selsoft.cpp:758
 msgid "Driver is parent"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:853 src/emu/ui/selsoft.cpp:763
+#: src/emu/ui/selgame.cpp:859 src/emu/ui/selsoft.cpp:762
 #: src/emu/ui/simpleselgame.cpp:335
 msgid "Overall: NOT WORKING"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:855 src/emu/ui/selsoft.cpp:765
+#: src/emu/ui/selgame.cpp:861 src/emu/ui/selsoft.cpp:764
 #: src/emu/ui/simpleselgame.cpp:337
 msgid "Overall: Unemulated Protection"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:857 src/emu/ui/selsoft.cpp:767
+#: src/emu/ui/selgame.cpp:863 src/emu/ui/selsoft.cpp:766
 #: src/emu/ui/simpleselgame.cpp:339
 msgid "Overall: Working"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:861 src/emu/ui/selsoft.cpp:771
+#: src/emu/ui/selgame.cpp:867 src/emu/ui/selsoft.cpp:770
 msgid "Graphics: Imperfect, "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:863 src/emu/ui/selsoft.cpp:773
+#: src/emu/ui/selgame.cpp:869 src/emu/ui/selsoft.cpp:772
 msgid "Graphics: OK, "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:866 src/emu/ui/selsoft.cpp:776
+#: src/emu/ui/selgame.cpp:872 src/emu/ui/selsoft.cpp:775
 msgid "Sound: Unimplemented"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:868 src/emu/ui/selsoft.cpp:778
+#: src/emu/ui/selgame.cpp:874 src/emu/ui/selsoft.cpp:777
 msgid "Sound: Imperfect"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:870 src/emu/ui/selsoft.cpp:780
+#: src/emu/ui/selgame.cpp:876 src/emu/ui/selsoft.cpp:779
 msgid "Sound: OK"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:887
+#: src/emu/ui/selgame.cpp:893
 #, c-format
 msgid "System: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:894 src/emu/ui/selsoft.cpp:805
+#: src/emu/ui/selgame.cpp:900 src/emu/ui/selsoft.cpp:804
 #, c-format
 msgid "Software is clone of: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:896 src/emu/ui/selsoft.cpp:807
+#: src/emu/ui/selgame.cpp:902 src/emu/ui/selsoft.cpp:806
 msgid "Software is parent"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:901 src/emu/ui/selsoft.cpp:812
+#: src/emu/ui/selgame.cpp:907 src/emu/ui/selsoft.cpp:811
 msgid "Supported: No"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:906 src/emu/ui/selsoft.cpp:817
+#: src/emu/ui/selgame.cpp:912 src/emu/ui/selsoft.cpp:816
 msgid "Supported: Partial"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:911 src/emu/ui/selsoft.cpp:822
+#: src/emu/ui/selgame.cpp:917 src/emu/ui/selsoft.cpp:821
 msgid "Supported: Yes"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:916 src/emu/ui/selsoft.cpp:827
+#: src/emu/ui/selgame.cpp:922 src/emu/ui/selsoft.cpp:826
 #, c-format
 msgid "romset: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:923
+#: src/emu/ui/selgame.cpp:929
 #, c-format
 msgid "%1$s %2$s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1535
+#: src/emu/ui/selgame.cpp:1543
 #, c-format
 msgid "Romset: %1$-.100s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1536
+#: src/emu/ui/selgame.cpp:1544
 #, c-format
 msgid "Year: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1537
+#: src/emu/ui/selgame.cpp:1545
 #, c-format
 msgid "Manufacturer: %1$-.100s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1541
+#: src/emu/ui/selgame.cpp:1549
 #, c-format
 msgid "Driver is Clone of: %1$-.100s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1543
+#: src/emu/ui/selgame.cpp:1551
 msgid "Driver is Parent\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1546
+#: src/emu/ui/selgame.cpp:1554
 msgid "Overall: NOT WORKING\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1548
+#: src/emu/ui/selgame.cpp:1556
 msgid "Overall: Unemulated Protection\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1550
+#: src/emu/ui/selgame.cpp:1558
 msgid "Overall: Working\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1553
+#: src/emu/ui/selgame.cpp:1561
 msgid "Graphics: Imperfect Colors\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1557
+#: src/emu/ui/selgame.cpp:1565
 msgid "Graphics: Imperfect\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1559
+#: src/emu/ui/selgame.cpp:1567
 msgid "Graphics: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1562
+#: src/emu/ui/selgame.cpp:1570
 msgid "Sound: Unimplemented\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1564
+#: src/emu/ui/selgame.cpp:1572
 msgid "Sound: Imperfect\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1566
+#: src/emu/ui/selgame.cpp:1574
 msgid "Sound: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1568
+#: src/emu/ui/selgame.cpp:1576
 #, c-format
 msgid "Driver is Skeleton: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1569
+#: src/emu/ui/selgame.cpp:1577
 #, c-format
 msgid "Game is Mechanical: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1570
+#: src/emu/ui/selgame.cpp:1578
 #, c-format
 msgid "Requires Artwork: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1571
+#: src/emu/ui/selgame.cpp:1579
 #, c-format
 msgid "Requires Clickable Artwork: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1572
+#: src/emu/ui/selgame.cpp:1580
 #, c-format
 msgid "Support Cocktail: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1573
+#: src/emu/ui/selgame.cpp:1581
 #, c-format
 msgid "Driver is Bios: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1574
+#: src/emu/ui/selgame.cpp:1582
 #, c-format
 msgid "Support Save: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 #, c-format
 msgid "Screen Orientation: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 msgid "Vertical"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 msgid "Horizontal"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/selgame.cpp:1591
 #, c-format
 msgid "Requires CHD: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1596
+#: src/emu/ui/selgame.cpp:1604
 msgid "Roms Audit Pass: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1598
+#: src/emu/ui/selgame.cpp:1606
 msgid "Roms Audit Pass: BAD\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1601
+#: src/emu/ui/selgame.cpp:1609
 msgid "Samples Audit Pass: None Needed\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1603
+#: src/emu/ui/selgame.cpp:1611
 msgid "Samples Audit Pass: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1605
+#: src/emu/ui/selgame.cpp:1613
 msgid "Samples Audit Pass: BAD\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1608
+#: src/emu/ui/selgame.cpp:1616
 msgid ""
 "Roms Audit Pass: Disabled\n"
 "Samples Audit Pass: Disabled\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:2049 src/emu/ui/selgame.cpp:2212
-#: src/emu/ui/selsoft.cpp:1662
+#: src/emu/ui/selgame.cpp:2055 src/emu/ui/selgame.cpp:2216
+#: src/emu/ui/selsoft.cpp:1655
 msgid "No Infos Available"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:2162 src/emu/ui/selsoft.cpp:1607
+#: src/emu/ui/selgame.cpp:2168 src/emu/ui/selsoft.cpp:1602
 msgid "Usage"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:110
-msgid " (default)"
-msgstr ""
-
-#: src/emu/ui/selsoft.cpp:381
+#: src/emu/ui/selsoft.cpp:380
 msgid ""
 "The selected software is missing one or more required files. Please select a "
 "different software.\n"
@@ -1269,57 +1285,57 @@ msgid ""
 "Press any key to continue."
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:684
+#: src/emu/ui/selsoft.cpp:683
 #, c-format
-msgid "%1$s %2$s ( %3$d / %4$d softwares )"
+msgid "%1$s %2$s ( %3$d / %4$d software packages )"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:685
+#: src/emu/ui/selsoft.cpp:684
 #, c-format
 msgid "Driver: \"%1$s\" software list "
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:688
+#: src/emu/ui/selsoft.cpp:687
 #, c-format
 msgid "Region: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:690
+#: src/emu/ui/selsoft.cpp:689
 #, c-format
 msgid "Publisher: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:692
+#: src/emu/ui/selsoft.cpp:691
 #, c-format
 msgid "Year: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:694
+#: src/emu/ui/selsoft.cpp:693
 #, c-format
 msgid "Software List: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:696
+#: src/emu/ui/selsoft.cpp:695
 #, c-format
 msgid "Device type: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:698
+#: src/emu/ui/selsoft.cpp:697
 #, c-format
 msgid "%s Search: %s_"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:748 src/emu/ui/selsoft.cpp:798
+#: src/emu/ui/selsoft.cpp:747 src/emu/ui/selsoft.cpp:797
 #: src/emu/ui/simpleselgame.cpp:325
 #, c-format
 msgid "%1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:1998 src/emu/ui/selsoft.cpp:2018
+#: src/emu/ui/selsoft.cpp:1991 src/emu/ui/selsoft.cpp:2011
 msgid "Software part selection:"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:2136 src/emu/ui/selsoft.cpp:2156
+#: src/emu/ui/selsoft.cpp:2129 src/emu/ui/selsoft.cpp:2149
 msgid "Bios selection:"
 msgstr ""
 
@@ -1367,15 +1383,15 @@ msgstr ""
 msgid " [internal]"
 msgstr ""
 
-#: src/emu/ui/sndmenu.cpp:135
+#: src/emu/ui/sndmenu.cpp:133
 msgid "Sound"
 msgstr ""
 
-#: src/emu/ui/sndmenu.cpp:136
+#: src/emu/ui/sndmenu.cpp:134
 msgid "Sample Rate"
 msgstr ""
 
-#: src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/sndmenu.cpp:135
 msgid "Use External Samples"
 msgstr ""
 
@@ -1444,80 +1460,80 @@ msgstr ""
 msgid "Fast Forward"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:419
+#: src/emu/ui/ui.cpp:418
 msgid "This driver requires images to be loaded in the following device(s): "
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1074
+#: src/emu/ui/ui.cpp:1071
 msgid ""
 "One or more ROMs/CHDs for this machine are incorrect. The machine may not "
 "run correctly.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1087
+#: src/emu/ui/ui.cpp:1084
 msgid ""
 "There are known problems with this machine\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1091
+#: src/emu/ui/ui.cpp:1088
 msgid ""
 "One or more ROMs/CHDs for this machine have not been correctly dumped.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1095
+#: src/emu/ui/ui.cpp:1092
 #, c-format
 msgid "The keyboard emulation may not be 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1097
+#: src/emu/ui/ui.cpp:1094
 #, c-format
 msgid "The colors aren't 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1099
+#: src/emu/ui/ui.cpp:1096
 msgid "The colors are completely wrong.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1101
+#: src/emu/ui/ui.cpp:1098
 #, c-format
 msgid "The video emulation isn't 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1103
+#: src/emu/ui/ui.cpp:1100
 #, c-format
 msgid "The sound emulation isn't 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1105
+#: src/emu/ui/ui.cpp:1102
 msgid "The machine lacks sound.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1108
+#: src/emu/ui/ui.cpp:1105
 msgid "Screen flipping in cocktail mode is not supported.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1112
+#: src/emu/ui/ui.cpp:1109
 msgid "The machine requires external artwork files\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1117
+#: src/emu/ui/ui.cpp:1114
 msgid ""
 "This machine was never completed. It may exhibit strange behavior or missing "
 "elements that are not bugs in the emulation.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1122
+#: src/emu/ui/ui.cpp:1119
 msgid ""
 "This machine has no sound hardware, MAME will produce no sounds, this is "
 "expected behaviour.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1130
+#: src/emu/ui/ui.cpp:1127
 msgid "The machine has protection which isn't fully emulated.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1133
+#: src/emu/ui/ui.cpp:1130
 msgid ""
 "\n"
 "THIS MACHINE DOESN'T WORK. The emulation for this machine is not yet "
@@ -1525,7 +1541,7 @@ msgid ""
 "the developers to improve the emulation.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1137
+#: src/emu/ui/ui.cpp:1134
 msgid ""
 "\n"
 "Certain elements of this machine cannot be emulated as it requires actual "
@@ -1533,21 +1549,21 @@ msgid ""
 "to fully play this machine.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1156
+#: src/emu/ui/ui.cpp:1153
 msgid ""
 "\n"
 "\n"
 "There are working clones of this machine: "
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1170
+#: src/emu/ui/ui.cpp:1167
 msgid ""
 "\n"
 "\n"
 "Press any key to continue"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1185
+#: src/emu/ui/ui.cpp:1182
 #, c-format
 msgid ""
 "%1$s\n"
@@ -1557,98 +1573,98 @@ msgid ""
 "CPU:\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1221 src/emu/ui/ui.cpp:1260
+#: src/emu/ui/ui.cpp:1218 src/emu/ui/ui.cpp:1257
 msgid "MHz"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1221 src/emu/ui/ui.cpp:1260
+#: src/emu/ui/ui.cpp:1218 src/emu/ui/ui.cpp:1257
 msgid "kHz"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1235
+#: src/emu/ui/ui.cpp:1232
 msgid ""
 "\n"
 "Sound:\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1264
+#: src/emu/ui/ui.cpp:1261
 msgid ""
 "\n"
 "Video:\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1268
+#: src/emu/ui/ui.cpp:1265
 msgid "None\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1275
+#: src/emu/ui/ui.cpp:1272
 msgid "Vector"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1286
+#: src/emu/ui/ui.cpp:1283
 #, c-format
 msgid "%1$s: %2$s\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1286
+#: src/emu/ui/ui.cpp:1283
 msgid "%2$s\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1541 src/emu/ui/ui.cpp:1551
+#: src/emu/ui/ui.cpp:1538 src/emu/ui/ui.cpp:1548
 msgid "Keyboard Emulation Status"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1543
+#: src/emu/ui/ui.cpp:1540
 msgid "Mode: PARTIAL Emulation"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1544
+#: src/emu/ui/ui.cpp:1541
 msgid "UI:   Enabled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1546 src/emu/ui/ui.cpp:1556
+#: src/emu/ui/ui.cpp:1543 src/emu/ui/ui.cpp:1553
 msgid "**Use ScrLock to toggle**"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1553
+#: src/emu/ui/ui.cpp:1550
 msgid "Mode: FULL Emulation"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1554
+#: src/emu/ui/ui.cpp:1551
 msgid "UI:   Disabled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1692
+#: src/emu/ui/ui.cpp:1689
 msgid "Autofire can't be enabled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1731
+#: src/emu/ui/ui.cpp:1728
 msgid "Select position to save to"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1733
+#: src/emu/ui/ui.cpp:1730
 msgid "Select position to load from"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1757
+#: src/emu/ui/ui.cpp:1754
 msgid "Save cancelled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1759
+#: src/emu/ui/ui.cpp:1756
 msgid "Load cancelled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1802
+#: src/emu/ui/ui.cpp:1799
 #, c-format
 msgid "Save to position %s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1807
+#: src/emu/ui/ui.cpp:1804
 #, c-format
 msgid "Load from position %s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1847
+#: src/emu/ui/ui.cpp:1844
 #, c-format
 msgid ""
 "Are you sure you want to quit?\n"
@@ -1657,173 +1673,173 @@ msgid ""
 "Press ''%2$s'' to return to emulation."
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1917
+#: src/emu/ui/ui.cpp:1914
 msgid "Master Volume"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1926
+#: src/emu/ui/ui.cpp:1923
 #, c-format
 msgid "%1$s Volume"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1949
+#: src/emu/ui/ui.cpp:1946
 #, c-format
 msgid "Overclock CPU %1$s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1968
+#: src/emu/ui/ui.cpp:1965
 #, c-format
 msgid "%1$s Refresh Rate"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1973
+#: src/emu/ui/ui.cpp:1970
 #, c-format
 msgid "%1$s Brightness"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1975
+#: src/emu/ui/ui.cpp:1972
 #, c-format
 msgid "%1$s Contrast"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1977
+#: src/emu/ui/ui.cpp:1974
 #, c-format
 msgid "%1$s Gamma"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1981
+#: src/emu/ui/ui.cpp:1978
 #, c-format
 msgid "%1$s Horiz Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1983
+#: src/emu/ui/ui.cpp:1980
 #, c-format
 msgid "%1$s Horiz Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1985
+#: src/emu/ui/ui.cpp:1982
 #, c-format
 msgid "%1$s Vert Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1987
+#: src/emu/ui/ui.cpp:1984
 #, c-format
 msgid "%1$s Vert Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2005
+#: src/emu/ui/ui.cpp:2002
 #, c-format
 msgid "Laserdisc '%1$s' Horiz Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2007
+#: src/emu/ui/ui.cpp:2004
 #, c-format
 msgid "Laserdisc '%1$s' Horiz Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2009
+#: src/emu/ui/ui.cpp:2006
 #, c-format
 msgid "Laserdisc '%1$s' Vert Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2011
+#: src/emu/ui/ui.cpp:2008
 #, c-format
 msgid "Laserdisc '%1$s' Vert Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2021
+#: src/emu/ui/ui.cpp:2018
 msgid "Vector Flicker"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2022
+#: src/emu/ui/ui.cpp:2019
 msgid "Beam Width Minimum"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2023
+#: src/emu/ui/ui.cpp:2020
 msgid "Beam Width Maximum"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2024
+#: src/emu/ui/ui.cpp:2021
 msgid "Beam Intensity Weight"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2037
+#: src/emu/ui/ui.cpp:2034
 #, c-format
 msgid "Crosshair Scale %1$s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2037 src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2034 src/emu/ui/ui.cpp:2036
 msgid "X"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2037 src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2034 src/emu/ui/ui.cpp:2036
 msgid "Y"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2036
 #, c-format
 msgid "Crosshair Offset %1$s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2071
+#: src/emu/ui/ui.cpp:2068
 #, c-format
 msgid "%1$3ddB"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2115
+#: src/emu/ui/ui.cpp:2112
 #, c-format
 msgid "%1$d%%"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2131
+#: src/emu/ui/ui.cpp:2128
 #, c-format
 msgid "%1$3.0f%%"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2154
+#: src/emu/ui/ui.cpp:2151
 #, c-format
 msgid "%1$.3ffps"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2177 src/emu/ui/ui.cpp:2199 src/emu/ui/ui.cpp:2220
-#: src/emu/ui/ui.cpp:2242 src/emu/ui/ui.cpp:2264 src/emu/ui/ui.cpp:2286
-#: src/emu/ui/ui.cpp:2308 src/emu/ui/ui.cpp:2330 src/emu/ui/ui.cpp:2352
-#: src/emu/ui/ui.cpp:2374 src/emu/ui/ui.cpp:2396
+#: src/emu/ui/ui.cpp:2174 src/emu/ui/ui.cpp:2196 src/emu/ui/ui.cpp:2217
+#: src/emu/ui/ui.cpp:2239 src/emu/ui/ui.cpp:2261 src/emu/ui/ui.cpp:2283
+#: src/emu/ui/ui.cpp:2305 src/emu/ui/ui.cpp:2327 src/emu/ui/ui.cpp:2349
+#: src/emu/ui/ui.cpp:2371 src/emu/ui/ui.cpp:2393
 #, c-format
 msgid "%1$.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2412 src/emu/ui/ui.cpp:2428 src/emu/ui/ui.cpp:2444
-#: src/emu/ui/ui.cpp:2460
+#: src/emu/ui/ui.cpp:2408 src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2438
+#: src/emu/ui/ui.cpp:2453
 #, c-format
 msgid "%1$1.2f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2476
+#: src/emu/ui/ui.cpp:2469
 #, c-format
 msgid "Screen '%1$s'"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2478
+#: src/emu/ui/ui.cpp:2471
 msgid "Screen"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2494
+#: src/emu/ui/ui.cpp:2487
 #, c-format
 msgid "Crosshair Scale X %1$1.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2494
+#: src/emu/ui/ui.cpp:2487
 #, c-format
 msgid "Crosshair Scale Y %1$1.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2513
+#: src/emu/ui/ui.cpp:2506
 #, c-format
 msgid "Crosshair Offset X %1$1.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2513
+#: src/emu/ui/ui.cpp:2506
 #, c-format
 msgid "Crosshair Offset Y %1$1.3f"
 msgstr ""
@@ -1865,10 +1881,10 @@ msgstr ""
 msgid "Full"
 msgstr ""
 
-#: src/emu/ui/viewgfx.cpp:392
+#: src/emu/ui/viewgfx.cpp:391
 msgid " COLORS"
 msgstr ""
 
-#: src/emu/ui/viewgfx.cpp:392
+#: src/emu/ui/viewgfx.cpp:391
 msgid " PENS"
 msgstr ""
diff --git a/language/Ukrainian/strings.po b/language/Ukrainian/strings.po
index f0067609255..464a475a8b6 100644
--- a/language/Ukrainian/strings.po
+++ b/language/Ukrainian/strings.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MAME\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-11 03:33+0200\n"
+"POT-Creation-Date: 2016-04-15 17:42+0200\n"
 "PO-Revision-Date: 2016-02-20 18:03+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: MAME Language Team\n"
@@ -61,14 +61,14 @@ msgstr ""
 msgid "Autofire Status"
 msgstr ""
 
-#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1698
+#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1695
 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211
 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219
 #: src/emu/ui/videoopt.cpp:223
 msgid "Disabled"
 msgstr ""
 
-#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1698
+#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1695
 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211
 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219
 #: src/emu/ui/videoopt.cpp:223
@@ -76,14 +76,14 @@ msgid "Enabled"
 msgstr ""
 
 #: src/emu/ui/cheatopt.cpp:282 src/emu/ui/cheatopt.cpp:288
-#: src/emu/ui/menu.cpp:710 src/emu/ui/miscmenu.cpp:831
-#: src/emu/ui/sndmenu.cpp:135 src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/menu.cpp:755 src/emu/ui/miscmenu.cpp:936
+#: src/emu/ui/sndmenu.cpp:133 src/emu/ui/sndmenu.cpp:135
 msgid "On"
 msgstr ""
 
 #: src/emu/ui/cheatopt.cpp:282 src/emu/ui/cheatopt.cpp:288
-#: src/emu/ui/menu.cpp:713 src/emu/ui/miscmenu.cpp:831
-#: src/emu/ui/sndmenu.cpp:135 src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/menu.cpp:758 src/emu/ui/miscmenu.cpp:936
+#: src/emu/ui/sndmenu.cpp:133 src/emu/ui/sndmenu.cpp:135
 msgid "Off"
 msgstr ""
 
@@ -95,316 +95,316 @@ msgstr ""
 msgid "Autofire Delay"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:158 src/emu/ui/custmenu.cpp:447
+#: src/emu/ui/custmenu.cpp:157 src/emu/ui/custmenu.cpp:445
 msgid "Main filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:167 src/emu/ui/custmenu.cpp:456
+#: src/emu/ui/custmenu.cpp:166 src/emu/ui/custmenu.cpp:454
 msgid "Other filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:176 src/emu/ui/optsmenu.cpp:239
+#: src/emu/ui/custmenu.cpp:175 src/emu/ui/optsmenu.cpp:238
 msgid "^!Manufacturer"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:185 src/emu/ui/custmenu.cpp:474
-#: src/emu/ui/optsmenu.cpp:247
+#: src/emu/ui/custmenu.cpp:184 src/emu/ui/custmenu.cpp:472
+#: src/emu/ui/optsmenu.cpp:246
 msgid "^!Year"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:194 src/emu/ui/custmenu.cpp:510
+#: src/emu/ui/custmenu.cpp:193 src/emu/ui/custmenu.cpp:508
 msgid "Remove last filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:197 src/emu/ui/custmenu.cpp:513
+#: src/emu/ui/custmenu.cpp:196 src/emu/ui/custmenu.cpp:511
 msgid "Add filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:212 src/emu/ui/custmenu.cpp:233
-#: src/emu/ui/custmenu.cpp:529 src/emu/ui/custmenu.cpp:550
+#: src/emu/ui/custmenu.cpp:211 src/emu/ui/custmenu.cpp:231
+#: src/emu/ui/custmenu.cpp:527 src/emu/ui/custmenu.cpp:547
 msgid "Select custom filters:"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:465
+#: src/emu/ui/custmenu.cpp:463
 msgid "^!Publisher"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:483
+#: src/emu/ui/custmenu.cpp:481
 msgid "^!Software List"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:492
+#: src/emu/ui/custmenu.cpp:490
 msgid "^!Device type"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:501
+#: src/emu/ui/custmenu.cpp:499
 msgid "^!Region"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:23
+#: src/emu/ui/custui.cpp:22
 msgid "Show All"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:24
+#: src/emu/ui/custui.cpp:23
 msgid "Hide Filters"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:25
+#: src/emu/ui/custui.cpp:24
 msgid "Hide Info/Image"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:26
+#: src/emu/ui/custui.cpp:25
 msgid "Hide Both"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:142
+#: src/emu/ui/custui.cpp:141
 msgid "Fonts"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:143
+#: src/emu/ui/custui.cpp:142
 msgid "Colors"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:148 src/emu/ui/dirmenu.cpp:33
+#: src/emu/ui/custui.cpp:147 src/emu/ui/dirmenu.cpp:33
 msgid "Language"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:152
+#: src/emu/ui/custui.cpp:151
 msgid "Show side panels"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:167 src/emu/ui/custui.cpp:188
+#: src/emu/ui/custui.cpp:166 src/emu/ui/custui.cpp:186
 msgid "Custom UI Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:246
+#: src/emu/ui/custui.cpp:244
 msgid "default"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:349
+#: src/emu/ui/custui.cpp:347
 msgid "UI Font"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:354
+#: src/emu/ui/custui.cpp:352
 msgid "Bold"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:355
+#: src/emu/ui/custui.cpp:353
 msgid "Italic"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:360
+#: src/emu/ui/custui.cpp:358
 msgid "Lines"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:366
+#: src/emu/ui/custui.cpp:364
 msgid "Infos text size"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:383
+#: src/emu/ui/custui.cpp:381
 msgid "UI Fonts Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:411
+#: src/emu/ui/custui.cpp:408
 msgid "Sample text - Lorem ipsum dolor sit amet, consectetur adipiscing elit."
 msgstr ""
 
-#: src/emu/ui/custui.cpp:509
+#: src/emu/ui/custui.cpp:506
 msgid "Normal text"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:510
+#: src/emu/ui/custui.cpp:507
 msgid "Selected color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:511
+#: src/emu/ui/custui.cpp:508
 msgid "Normal text background"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:512
+#: src/emu/ui/custui.cpp:509
 msgid "Selected background color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:513
+#: src/emu/ui/custui.cpp:510
 msgid "Subitem color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:514 src/emu/ui/custui.cpp:610
+#: src/emu/ui/custui.cpp:511 src/emu/ui/custui.cpp:606
 msgid "Clone"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:515
+#: src/emu/ui/custui.cpp:512
 msgid "Border"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:516
+#: src/emu/ui/custui.cpp:513
 msgid "Background"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:517
+#: src/emu/ui/custui.cpp:514
 msgid "Dipswitch"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:518
+#: src/emu/ui/custui.cpp:515
 msgid "Unavailable color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:519
+#: src/emu/ui/custui.cpp:516
 msgid "Slider color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:520
+#: src/emu/ui/custui.cpp:517
 msgid "Gfx viewer background"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:521
+#: src/emu/ui/custui.cpp:518
 msgid "Mouse over color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:522
+#: src/emu/ui/custui.cpp:519
 msgid "Mouse over background color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:523
+#: src/emu/ui/custui.cpp:520
 msgid "Mouse down color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:524
+#: src/emu/ui/custui.cpp:521
 msgid "Mouse down background color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:527
+#: src/emu/ui/custui.cpp:524
 msgid "Restore originals colors"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:543
+#: src/emu/ui/custui.cpp:540
 msgid "UI Colors Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:572
+#: src/emu/ui/custui.cpp:568
 #, c-format
 msgid "Double click or press %1$s to change the color value"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:598
+#: src/emu/ui/custui.cpp:594
 msgid "Menu Preview"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:606
+#: src/emu/ui/custui.cpp:602
 msgid "Normal"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:607
+#: src/emu/ui/custui.cpp:603
 msgid "Subitem"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:608
+#: src/emu/ui/custui.cpp:604
 msgid "Selected"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:609
+#: src/emu/ui/custui.cpp:605
 msgid "Mouse Over"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:841 src/emu/ui/custui.cpp:844
+#: src/emu/ui/custui.cpp:837 src/emu/ui/custui.cpp:840
 msgid "Alpha"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:849 src/emu/ui/custui.cpp:852
-#: src/emu/ui/custui.cpp:1013
+#: src/emu/ui/custui.cpp:845 src/emu/ui/custui.cpp:848
+#: src/emu/ui/custui.cpp:1007
 msgid "Red"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:857 src/emu/ui/custui.cpp:860
-#: src/emu/ui/custui.cpp:1016
+#: src/emu/ui/custui.cpp:853 src/emu/ui/custui.cpp:856
+#: src/emu/ui/custui.cpp:1010
 msgid "Green"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:865 src/emu/ui/custui.cpp:868
-#: src/emu/ui/custui.cpp:1017
+#: src/emu/ui/custui.cpp:861 src/emu/ui/custui.cpp:864
+#: src/emu/ui/custui.cpp:1011
 msgid "Blue"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:871
+#: src/emu/ui/custui.cpp:867
 msgid "Choose from palette"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:887
+#: src/emu/ui/custui.cpp:883
 msgid " - ARGB Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:912
+#: src/emu/ui/custui.cpp:907
 msgid "Color preview ="
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1009
+#: src/emu/ui/custui.cpp:1003
 msgid "White"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1010
+#: src/emu/ui/custui.cpp:1004
 msgid "Silver"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1011
+#: src/emu/ui/custui.cpp:1005
 msgid "Gray"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1012
+#: src/emu/ui/custui.cpp:1006
 msgid "Black"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1014
+#: src/emu/ui/custui.cpp:1008
 msgid "Orange"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1015
+#: src/emu/ui/custui.cpp:1009
 msgid "Yellow"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1018
+#: src/emu/ui/custui.cpp:1012
 msgid "Violet"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:65
+#: src/emu/ui/datmenu.cpp:64
 msgid "Software History"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:67
+#: src/emu/ui/datmenu.cpp:66
 msgid "Software Usage"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:199
+#: src/emu/ui/datmenu.cpp:196
 msgid "Revision: "
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:287 src/emu/ui/selgame.cpp:40
-#: src/emu/ui/selgame.cpp:2152 src/emu/ui/selgame.cpp:2161
-#: src/emu/ui/selsoft.cpp:1577 src/emu/ui/selsoft.cpp:1597
-#: src/emu/ui/selsoft.cpp:1606
+#: src/emu/ui/datmenu.cpp:284 src/emu/ui/selgame.cpp:39
+#: src/emu/ui/selgame.cpp:2158 src/emu/ui/selgame.cpp:2167
+#: src/emu/ui/selsoft.cpp:1574 src/emu/ui/selsoft.cpp:1592
+#: src/emu/ui/selsoft.cpp:1601
 msgid "History"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:289 src/emu/ui/selgame.cpp:41
+#: src/emu/ui/datmenu.cpp:286 src/emu/ui/selgame.cpp:40
 msgid "Mameinfo"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:291 src/emu/ui/selgame.cpp:43
+#: src/emu/ui/datmenu.cpp:288 src/emu/ui/selgame.cpp:42
 msgid "Messinfo"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:293 src/emu/ui/selgame.cpp:42
+#: src/emu/ui/datmenu.cpp:290 src/emu/ui/selgame.cpp:41
 msgid "Sysinfo"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:295 src/emu/ui/selgame.cpp:46
+#: src/emu/ui/datmenu.cpp:292 src/emu/ui/selgame.cpp:45
 msgid "Mamescore"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:297 src/emu/ui/selgame.cpp:45
+#: src/emu/ui/datmenu.cpp:294 src/emu/ui/selgame.cpp:44
 msgid "Gameinit"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:299 src/emu/ui/selgame.cpp:44
+#: src/emu/ui/datmenu.cpp:296 src/emu/ui/selgame.cpp:43
 msgid "Command"
 msgstr ""
 
@@ -556,75 +556,75 @@ msgstr ""
 msgid "Remove %1$s Folder"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:158
+#: src/emu/ui/filesel.cpp:161
 msgid "File Already Exists - Override?"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:160 src/emu/ui/selgame.cpp:1568
-#: src/emu/ui/selgame.cpp:1569 src/emu/ui/selgame.cpp:1570
-#: src/emu/ui/selgame.cpp:1571 src/emu/ui/selgame.cpp:1572
-#: src/emu/ui/selgame.cpp:1573 src/emu/ui/selgame.cpp:1574
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/filesel.cpp:163 src/emu/ui/selgame.cpp:1576
+#: src/emu/ui/selgame.cpp:1577 src/emu/ui/selgame.cpp:1578
+#: src/emu/ui/selgame.cpp:1579 src/emu/ui/selgame.cpp:1580
+#: src/emu/ui/selgame.cpp:1581 src/emu/ui/selgame.cpp:1582
+#: src/emu/ui/selgame.cpp:1591
 msgid "No"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:161 src/emu/ui/selgame.cpp:1568
-#: src/emu/ui/selgame.cpp:1569 src/emu/ui/selgame.cpp:1570
-#: src/emu/ui/selgame.cpp:1571 src/emu/ui/selgame.cpp:1572
-#: src/emu/ui/selgame.cpp:1573 src/emu/ui/selgame.cpp:1574
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/filesel.cpp:164 src/emu/ui/selgame.cpp:1576
+#: src/emu/ui/selgame.cpp:1577 src/emu/ui/selgame.cpp:1578
+#: src/emu/ui/selgame.cpp:1579 src/emu/ui/selgame.cpp:1580
+#: src/emu/ui/selgame.cpp:1581 src/emu/ui/selgame.cpp:1582
+#: src/emu/ui/selgame.cpp:1591
 msgid "Yes"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:272
+#: src/emu/ui/filesel.cpp:275
 msgid "New Image Name:"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:278
+#: src/emu/ui/filesel.cpp:281
 msgid "Image Format:"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:284
+#: src/emu/ui/filesel.cpp:287
 msgid "Create"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:315
+#: src/emu/ui/filesel.cpp:318
 msgid "Please enter a file extension too"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:503 src/emu/ui/swlist.cpp:65
+#: src/emu/ui/filesel.cpp:506 src/emu/ui/swlist.cpp:65
 msgid "[empty slot]"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:507
+#: src/emu/ui/filesel.cpp:510
 msgid "[create]"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:511 src/emu/ui/swlist.cpp:76
+#: src/emu/ui/filesel.cpp:514 src/emu/ui/swlist.cpp:76
 msgid "[software list]"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:803
+#: src/emu/ui/filesel.cpp:806
 msgid "Select image format"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:863
+#: src/emu/ui/filesel.cpp:866
 msgid "Select access mode"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:864
+#: src/emu/ui/filesel.cpp:867
 msgid "Read-only"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:866
+#: src/emu/ui/filesel.cpp:869
 msgid "Read-write"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:867
+#: src/emu/ui/filesel.cpp:870
 msgid "Read this image, write to another image"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:868
+#: src/emu/ui/filesel.cpp:871
 msgid "Read this image, write to diff"
 msgstr ""
 
@@ -650,7 +650,7 @@ msgstr ""
 msgid "[empty]"
 msgstr ""
 
-#: src/emu/ui/info_pty.cpp:26 src/emu/ui/mainmenu.cpp:91
+#: src/emu/ui/info_pty.cpp:26 src/emu/ui/mainmenu.cpp:96
 msgid "Pseudo terminals"
 msgstr ""
 
@@ -666,7 +666,7 @@ msgstr ""
 msgid "Other Controls"
 msgstr ""
 
-#: src/emu/ui/inputmap.cpp:622 src/emu/ui/miscmenu.cpp:91
+#: src/emu/ui/inputmap.cpp:622 src/emu/ui/miscmenu.cpp:92
 #: src/emu/ui/slotopt.cpp:172
 msgid "Reset"
 msgstr ""
@@ -699,27 +699,27 @@ msgstr ""
 msgid "Machine Information"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:78
+#: src/emu/ui/mainmenu.cpp:80
 msgid "Image Information"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:81
+#: src/emu/ui/mainmenu.cpp:83
 msgid "File Manager"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:86
+#: src/emu/ui/mainmenu.cpp:92
 msgid "Tape Control"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:94
+#: src/emu/ui/mainmenu.cpp:99
 msgid "Bios Selection"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:100
+#: src/emu/ui/mainmenu.cpp:104
 msgid "Slot Devices"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:107
+#: src/emu/ui/mainmenu.cpp:109
 msgid "Barcode Reader"
 msgstr ""
 
@@ -727,43 +727,43 @@ msgstr ""
 msgid "Network Devices"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:119
+#: src/emu/ui/mainmenu.cpp:118
 msgid "Keyboard Mode"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:122
+#: src/emu/ui/mainmenu.cpp:121
 msgid "Slider Controls"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:125
+#: src/emu/ui/mainmenu.cpp:124
 msgid "Video Options"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:129
+#: src/emu/ui/mainmenu.cpp:128
 msgid "Crosshair Options"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:133
+#: src/emu/ui/mainmenu.cpp:132
 msgid "Cheat"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:136
+#: src/emu/ui/mainmenu.cpp:135
 msgid "Plugin Options"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:140
+#: src/emu/ui/mainmenu.cpp:139
 msgid "External DAT View"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:146
+#: src/emu/ui/mainmenu.cpp:145 src/emu/ui/miscmenu.cpp:785
 msgid "Add To Favorites"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:148
+#: src/emu/ui/mainmenu.cpp:147 src/emu/ui/miscmenu.cpp:787
 msgid "Remove From Favorites"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:155
+#: src/emu/ui/mainmenu.cpp:154
 msgid "Select New Machine"
 msgstr ""
 
@@ -803,189 +803,205 @@ msgstr ""
 msgid "Return to Previous Menu"
 msgstr ""
 
-#: src/emu/ui/menu.cpp:716
+#: src/emu/ui/menu.cpp:761
 msgid "Auto"
 msgstr ""
 
-#: src/emu/ui/menu.cpp:2133
+#: src/emu/ui/menu.cpp:2195
 msgid "Images"
 msgstr ""
 
-#: src/emu/ui/menu.cpp:2134
+#: src/emu/ui/menu.cpp:2196
 msgid "Infos"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Keyboard Mode:"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Natural"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Emulated"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:240
+#: src/emu/ui/miscmenu.cpp:241
 #, c-format
 msgid ""
 "Uptime: %1$d:%2$02d:%3$02d\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:242
+#: src/emu/ui/miscmenu.cpp:243
 #, c-format
 msgid ""
 "Uptime: %1$d:%2$02d\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:246
+#: src/emu/ui/miscmenu.cpp:247
 #, c-format
 msgid ""
 "Tickets dispensed: %1$d\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:257
+#: src/emu/ui/miscmenu.cpp:258
 msgid "Coin %1$c: NA%3$s\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:257
+#: src/emu/ui/miscmenu.cpp:258
 #, c-format
 msgid "Coin %1$c: %2$d%3$s\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:260
+#: src/emu/ui/miscmenu.cpp:261
 msgid " (locked)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:519
+#: src/emu/ui/miscmenu.cpp:520
 msgid "Visible Delay"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:617
+#: src/emu/ui/miscmenu.cpp:619
 #, c-format
 msgid "%s.xml saved under ui folder."
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:645
+#: src/emu/ui/miscmenu.cpp:647
 msgid "Name:             Description:\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:657
+#: src/emu/ui/miscmenu.cpp:659
 #, c-format
 msgid "%s.txt saved under ui folder."
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:675
-msgid "Export XML format (like -listxml)"
+#: src/emu/ui/miscmenu.cpp:677
+msgid "Export list in XML format (like -listxml)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:676
-msgid "Export TXT format (like -listfull)"
+#: src/emu/ui/miscmenu.cpp:678
+msgid "Export list in XML format (like -listxml, but exclude devices)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:734
-msgid "Dummy"
+#: src/emu/ui/miscmenu.cpp:679
+msgid "Export list in TXT format (like -listfull)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:736
-msgid "Save machine configuration"
-msgstr ""
-
-#: src/emu/ui/miscmenu.cpp:848 src/emu/ui/miscmenu.cpp:869
-#: src/emu/ui/selgame.cpp:594
-msgid "Plugins"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:218
-msgid "Filter"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:226
-msgid " ^!File"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:231
-msgid " ^!Category"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:254
-msgid "^!Setup custom filter"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:262
-msgid "Customize UI"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:263
-msgid "Configure Directories"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:266 src/emu/ui/sndmenu.cpp:151
-#: src/emu/ui/sndmenu.cpp:172
-msgid "Sound Options"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:269
-msgid "General Inputs"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:272
-msgid "Save Configuration"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:286 src/emu/ui/optsmenu.cpp:307
-msgid "Settings"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:327
-msgid "**Error saving ui.ini**"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:374
-#, c-format
-msgid "**Error saving %s.ini**"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:378
+#: src/emu/ui/miscmenu.cpp:729 src/emu/ui/optsmenu.cpp:376
 msgid ""
 "\n"
 "    Configuration saved    \n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/selector.cpp:166
+#: src/emu/ui/miscmenu.cpp:774
+msgid "Bios"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:776
+msgid "Driver"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:790
+msgid "Save machine configuration"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:806
+msgid "Configure machine:"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:868 src/emu/ui/selsoft.cpp:109
+msgid " (default)"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:953 src/emu/ui/miscmenu.cpp:973
+#: src/emu/ui/selgame.cpp:600
+msgid "Plugins"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:217
+msgid "Filter"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:225
+msgid " ^!File"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:230
+msgid " ^!Category"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:253
+msgid "^!Setup custom filter"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:261
+msgid "Customize UI"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:262
+msgid "Configure Directories"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:265 src/emu/ui/sndmenu.cpp:149
+#: src/emu/ui/sndmenu.cpp:169
+msgid "Sound Options"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:268
+msgid "General Inputs"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:271
+msgid "Save Configuration"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:285 src/emu/ui/optsmenu.cpp:305
+msgid "Settings"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:325
+msgid "**Error saving ui.ini**"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:372
+#, c-format
+msgid "**Error saving %s.ini**"
+msgstr ""
+
+#: src/emu/ui/selector.cpp:165
 msgid "Selection List - Search: "
 msgstr ""
 
-#: src/emu/ui/selector.cpp:196
+#: src/emu/ui/selector.cpp:194
 #, c-format
 msgid "Double click or press %1$s to select"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:39
+#: src/emu/ui/selgame.cpp:38
 msgid "General Info"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:374 src/emu/ui/selsoft.cpp:282
+#: src/emu/ui/selgame.cpp:380 src/emu/ui/selsoft.cpp:281
 #, c-format
 msgid ""
 "%s\n"
 " added to favorites list."
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:380 src/emu/ui/selgame.cpp:389
-#: src/emu/ui/selsoft.cpp:287
+#: src/emu/ui/selgame.cpp:386 src/emu/ui/selgame.cpp:395
+#: src/emu/ui/selsoft.cpp:286
 #, c-format
 msgid ""
 "%s\n"
 " removed from favorites list."
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:450
+#: src/emu/ui/selgame.cpp:457
 msgid ""
 "The selected machine is missing one or more required ROM or CHD images. "
 "Please select a different machine.\n"
@@ -993,275 +1009,275 @@ msgid ""
 "Press any key to continue."
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:589 src/emu/ui/simpleselgame.cpp:265
+#: src/emu/ui/selgame.cpp:595 src/emu/ui/simpleselgame.cpp:265
 msgid "Configure Options"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:752
+#: src/emu/ui/selgame.cpp:596
+msgid "Configure Machine"
+msgstr ""
+
+#: src/emu/ui/selgame.cpp:758
 #, c-format
 msgid "%1$s %2$s ( %3$d / %4$d machines (%5$d BIOS) )"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:762
+#: src/emu/ui/selgame.cpp:768
 #, c-format
 msgid "%1$s (%2$s - %3$s) - "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:769 src/emu/ui/selgame.cpp:775
+#: src/emu/ui/selgame.cpp:775 src/emu/ui/selgame.cpp:781
 #, c-format
 msgid "%1$s (%2$s) - "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:784
+#: src/emu/ui/selgame.cpp:790
 #, c-format
 msgid "%1$s Search: %2$s_"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:838
+#: src/emu/ui/selgame.cpp:844
 #, c-format
 msgid "Romset: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:841 src/emu/ui/selgame.cpp:890
-#: src/emu/ui/selsoft.cpp:751 src/emu/ui/selsoft.cpp:801
+#: src/emu/ui/selgame.cpp:847 src/emu/ui/selgame.cpp:896
+#: src/emu/ui/selsoft.cpp:750 src/emu/ui/selsoft.cpp:800
 #: src/emu/ui/simpleselgame.cpp:328
 #, c-format
 msgid "%1$s, %2$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:847 src/emu/ui/selsoft.cpp:757
+#: src/emu/ui/selgame.cpp:853 src/emu/ui/selsoft.cpp:756
 #, c-format
 msgid "Driver is clone of: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:849 src/emu/ui/selsoft.cpp:759
+#: src/emu/ui/selgame.cpp:855 src/emu/ui/selsoft.cpp:758
 msgid "Driver is parent"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:853 src/emu/ui/selsoft.cpp:763
+#: src/emu/ui/selgame.cpp:859 src/emu/ui/selsoft.cpp:762
 #: src/emu/ui/simpleselgame.cpp:335
 msgid "Overall: NOT WORKING"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:855 src/emu/ui/selsoft.cpp:765
+#: src/emu/ui/selgame.cpp:861 src/emu/ui/selsoft.cpp:764
 #: src/emu/ui/simpleselgame.cpp:337
 msgid "Overall: Unemulated Protection"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:857 src/emu/ui/selsoft.cpp:767
+#: src/emu/ui/selgame.cpp:863 src/emu/ui/selsoft.cpp:766
 #: src/emu/ui/simpleselgame.cpp:339
 msgid "Overall: Working"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:861 src/emu/ui/selsoft.cpp:771
+#: src/emu/ui/selgame.cpp:867 src/emu/ui/selsoft.cpp:770
 msgid "Graphics: Imperfect, "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:863 src/emu/ui/selsoft.cpp:773
+#: src/emu/ui/selgame.cpp:869 src/emu/ui/selsoft.cpp:772
 msgid "Graphics: OK, "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:866 src/emu/ui/selsoft.cpp:776
+#: src/emu/ui/selgame.cpp:872 src/emu/ui/selsoft.cpp:775
 msgid "Sound: Unimplemented"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:868 src/emu/ui/selsoft.cpp:778
+#: src/emu/ui/selgame.cpp:874 src/emu/ui/selsoft.cpp:777
 msgid "Sound: Imperfect"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:870 src/emu/ui/selsoft.cpp:780
+#: src/emu/ui/selgame.cpp:876 src/emu/ui/selsoft.cpp:779
 msgid "Sound: OK"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:887
+#: src/emu/ui/selgame.cpp:893
 #, c-format
 msgid "System: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:894 src/emu/ui/selsoft.cpp:805
+#: src/emu/ui/selgame.cpp:900 src/emu/ui/selsoft.cpp:804
 #, c-format
 msgid "Software is clone of: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:896 src/emu/ui/selsoft.cpp:807
+#: src/emu/ui/selgame.cpp:902 src/emu/ui/selsoft.cpp:806
 msgid "Software is parent"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:901 src/emu/ui/selsoft.cpp:812
+#: src/emu/ui/selgame.cpp:907 src/emu/ui/selsoft.cpp:811
 msgid "Supported: No"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:906 src/emu/ui/selsoft.cpp:817
+#: src/emu/ui/selgame.cpp:912 src/emu/ui/selsoft.cpp:816
 msgid "Supported: Partial"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:911 src/emu/ui/selsoft.cpp:822
+#: src/emu/ui/selgame.cpp:917 src/emu/ui/selsoft.cpp:821
 msgid "Supported: Yes"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:916 src/emu/ui/selsoft.cpp:827
+#: src/emu/ui/selgame.cpp:922 src/emu/ui/selsoft.cpp:826
 #, c-format
 msgid "romset: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:923
+#: src/emu/ui/selgame.cpp:929
 #, c-format
 msgid "%1$s %2$s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1535
+#: src/emu/ui/selgame.cpp:1543
 #, c-format
 msgid "Romset: %1$-.100s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1536
+#: src/emu/ui/selgame.cpp:1544
 #, c-format
 msgid "Year: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1537
+#: src/emu/ui/selgame.cpp:1545
 #, c-format
 msgid "Manufacturer: %1$-.100s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1541
+#: src/emu/ui/selgame.cpp:1549
 #, c-format
 msgid "Driver is Clone of: %1$-.100s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1543
+#: src/emu/ui/selgame.cpp:1551
 msgid "Driver is Parent\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1546
+#: src/emu/ui/selgame.cpp:1554
 msgid "Overall: NOT WORKING\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1548
+#: src/emu/ui/selgame.cpp:1556
 msgid "Overall: Unemulated Protection\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1550
+#: src/emu/ui/selgame.cpp:1558
 msgid "Overall: Working\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1553
+#: src/emu/ui/selgame.cpp:1561
 msgid "Graphics: Imperfect Colors\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1557
+#: src/emu/ui/selgame.cpp:1565
 msgid "Graphics: Imperfect\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1559
+#: src/emu/ui/selgame.cpp:1567
 msgid "Graphics: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1562
+#: src/emu/ui/selgame.cpp:1570
 msgid "Sound: Unimplemented\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1564
+#: src/emu/ui/selgame.cpp:1572
 msgid "Sound: Imperfect\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1566
+#: src/emu/ui/selgame.cpp:1574
 msgid "Sound: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1568
+#: src/emu/ui/selgame.cpp:1576
 #, c-format
 msgid "Driver is Skeleton: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1569
+#: src/emu/ui/selgame.cpp:1577
 #, c-format
 msgid "Game is Mechanical: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1570
+#: src/emu/ui/selgame.cpp:1578
 #, c-format
 msgid "Requires Artwork: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1571
+#: src/emu/ui/selgame.cpp:1579
 #, c-format
 msgid "Requires Clickable Artwork: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1572
+#: src/emu/ui/selgame.cpp:1580
 #, c-format
 msgid "Support Cocktail: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1573
+#: src/emu/ui/selgame.cpp:1581
 #, c-format
 msgid "Driver is Bios: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1574
+#: src/emu/ui/selgame.cpp:1582
 #, c-format
 msgid "Support Save: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 #, c-format
 msgid "Screen Orientation: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 msgid "Vertical"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 msgid "Horizontal"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/selgame.cpp:1591
 #, c-format
 msgid "Requires CHD: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1596
+#: src/emu/ui/selgame.cpp:1604
 msgid "Roms Audit Pass: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1598
+#: src/emu/ui/selgame.cpp:1606
 msgid "Roms Audit Pass: BAD\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1601
+#: src/emu/ui/selgame.cpp:1609
 msgid "Samples Audit Pass: None Needed\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1603
+#: src/emu/ui/selgame.cpp:1611
 msgid "Samples Audit Pass: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1605
+#: src/emu/ui/selgame.cpp:1613
 msgid "Samples Audit Pass: BAD\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1608
+#: src/emu/ui/selgame.cpp:1616
 msgid ""
 "Roms Audit Pass: Disabled\n"
 "Samples Audit Pass: Disabled\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:2049 src/emu/ui/selgame.cpp:2212
-#: src/emu/ui/selsoft.cpp:1662
+#: src/emu/ui/selgame.cpp:2055 src/emu/ui/selgame.cpp:2216
+#: src/emu/ui/selsoft.cpp:1655
 msgid "No Infos Available"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:2162 src/emu/ui/selsoft.cpp:1607
+#: src/emu/ui/selgame.cpp:2168 src/emu/ui/selsoft.cpp:1602
 msgid "Usage"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:110
-msgid " (default)"
-msgstr ""
-
-#: src/emu/ui/selsoft.cpp:381
+#: src/emu/ui/selsoft.cpp:380
 msgid ""
 "The selected software is missing one or more required files. Please select a "
 "different software.\n"
@@ -1269,57 +1285,57 @@ msgid ""
 "Press any key to continue."
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:684
+#: src/emu/ui/selsoft.cpp:683
 #, c-format
-msgid "%1$s %2$s ( %3$d / %4$d softwares )"
+msgid "%1$s %2$s ( %3$d / %4$d software packages )"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:685
+#: src/emu/ui/selsoft.cpp:684
 #, c-format
 msgid "Driver: \"%1$s\" software list "
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:688
+#: src/emu/ui/selsoft.cpp:687
 #, c-format
 msgid "Region: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:690
+#: src/emu/ui/selsoft.cpp:689
 #, c-format
 msgid "Publisher: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:692
+#: src/emu/ui/selsoft.cpp:691
 #, c-format
 msgid "Year: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:694
+#: src/emu/ui/selsoft.cpp:693
 #, c-format
 msgid "Software List: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:696
+#: src/emu/ui/selsoft.cpp:695
 #, c-format
 msgid "Device type: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:698
+#: src/emu/ui/selsoft.cpp:697
 #, c-format
 msgid "%s Search: %s_"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:748 src/emu/ui/selsoft.cpp:798
+#: src/emu/ui/selsoft.cpp:747 src/emu/ui/selsoft.cpp:797
 #: src/emu/ui/simpleselgame.cpp:325
 #, c-format
 msgid "%1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:1998 src/emu/ui/selsoft.cpp:2018
+#: src/emu/ui/selsoft.cpp:1991 src/emu/ui/selsoft.cpp:2011
 msgid "Software part selection:"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:2136 src/emu/ui/selsoft.cpp:2156
+#: src/emu/ui/selsoft.cpp:2129 src/emu/ui/selsoft.cpp:2149
 msgid "Bios selection:"
 msgstr ""
 
@@ -1367,15 +1383,15 @@ msgstr ""
 msgid " [internal]"
 msgstr ""
 
-#: src/emu/ui/sndmenu.cpp:135
+#: src/emu/ui/sndmenu.cpp:133
 msgid "Sound"
 msgstr ""
 
-#: src/emu/ui/sndmenu.cpp:136
+#: src/emu/ui/sndmenu.cpp:134
 msgid "Sample Rate"
 msgstr ""
 
-#: src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/sndmenu.cpp:135
 msgid "Use External Samples"
 msgstr ""
 
@@ -1444,80 +1460,80 @@ msgstr ""
 msgid "Fast Forward"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:419
+#: src/emu/ui/ui.cpp:418
 msgid "This driver requires images to be loaded in the following device(s): "
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1074
+#: src/emu/ui/ui.cpp:1071
 msgid ""
 "One or more ROMs/CHDs for this machine are incorrect. The machine may not "
 "run correctly.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1087
+#: src/emu/ui/ui.cpp:1084
 msgid ""
 "There are known problems with this machine\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1091
+#: src/emu/ui/ui.cpp:1088
 msgid ""
 "One or more ROMs/CHDs for this machine have not been correctly dumped.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1095
+#: src/emu/ui/ui.cpp:1092
 #, c-format
 msgid "The keyboard emulation may not be 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1097
+#: src/emu/ui/ui.cpp:1094
 #, c-format
 msgid "The colors aren't 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1099
+#: src/emu/ui/ui.cpp:1096
 msgid "The colors are completely wrong.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1101
+#: src/emu/ui/ui.cpp:1098
 #, c-format
 msgid "The video emulation isn't 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1103
+#: src/emu/ui/ui.cpp:1100
 #, c-format
 msgid "The sound emulation isn't 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1105
+#: src/emu/ui/ui.cpp:1102
 msgid "The machine lacks sound.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1108
+#: src/emu/ui/ui.cpp:1105
 msgid "Screen flipping in cocktail mode is not supported.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1112
+#: src/emu/ui/ui.cpp:1109
 msgid "The machine requires external artwork files\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1117
+#: src/emu/ui/ui.cpp:1114
 msgid ""
 "This machine was never completed. It may exhibit strange behavior or missing "
 "elements that are not bugs in the emulation.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1122
+#: src/emu/ui/ui.cpp:1119
 msgid ""
 "This machine has no sound hardware, MAME will produce no sounds, this is "
 "expected behaviour.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1130
+#: src/emu/ui/ui.cpp:1127
 msgid "The machine has protection which isn't fully emulated.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1133
+#: src/emu/ui/ui.cpp:1130
 msgid ""
 "\n"
 "THIS MACHINE DOESN'T WORK. The emulation for this machine is not yet "
@@ -1525,7 +1541,7 @@ msgid ""
 "the developers to improve the emulation.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1137
+#: src/emu/ui/ui.cpp:1134
 msgid ""
 "\n"
 "Certain elements of this machine cannot be emulated as it requires actual "
@@ -1533,21 +1549,21 @@ msgid ""
 "to fully play this machine.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1156
+#: src/emu/ui/ui.cpp:1153
 msgid ""
 "\n"
 "\n"
 "There are working clones of this machine: "
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1170
+#: src/emu/ui/ui.cpp:1167
 msgid ""
 "\n"
 "\n"
 "Press any key to continue"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1185
+#: src/emu/ui/ui.cpp:1182
 #, c-format
 msgid ""
 "%1$s\n"
@@ -1557,98 +1573,98 @@ msgid ""
 "CPU:\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1221 src/emu/ui/ui.cpp:1260
+#: src/emu/ui/ui.cpp:1218 src/emu/ui/ui.cpp:1257
 msgid "MHz"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1221 src/emu/ui/ui.cpp:1260
+#: src/emu/ui/ui.cpp:1218 src/emu/ui/ui.cpp:1257
 msgid "kHz"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1235
+#: src/emu/ui/ui.cpp:1232
 msgid ""
 "\n"
 "Sound:\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1264
+#: src/emu/ui/ui.cpp:1261
 msgid ""
 "\n"
 "Video:\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1268
+#: src/emu/ui/ui.cpp:1265
 msgid "None\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1275
+#: src/emu/ui/ui.cpp:1272
 msgid "Vector"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1286
+#: src/emu/ui/ui.cpp:1283
 #, c-format
 msgid "%1$s: %2$s\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1286
+#: src/emu/ui/ui.cpp:1283
 msgid "%2$s\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1541 src/emu/ui/ui.cpp:1551
+#: src/emu/ui/ui.cpp:1538 src/emu/ui/ui.cpp:1548
 msgid "Keyboard Emulation Status"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1543
+#: src/emu/ui/ui.cpp:1540
 msgid "Mode: PARTIAL Emulation"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1544
+#: src/emu/ui/ui.cpp:1541
 msgid "UI:   Enabled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1546 src/emu/ui/ui.cpp:1556
+#: src/emu/ui/ui.cpp:1543 src/emu/ui/ui.cpp:1553
 msgid "**Use ScrLock to toggle**"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1553
+#: src/emu/ui/ui.cpp:1550
 msgid "Mode: FULL Emulation"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1554
+#: src/emu/ui/ui.cpp:1551
 msgid "UI:   Disabled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1692
+#: src/emu/ui/ui.cpp:1689
 msgid "Autofire can't be enabled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1731
+#: src/emu/ui/ui.cpp:1728
 msgid "Select position to save to"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1733
+#: src/emu/ui/ui.cpp:1730
 msgid "Select position to load from"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1757
+#: src/emu/ui/ui.cpp:1754
 msgid "Save cancelled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1759
+#: src/emu/ui/ui.cpp:1756
 msgid "Load cancelled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1802
+#: src/emu/ui/ui.cpp:1799
 #, c-format
 msgid "Save to position %s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1807
+#: src/emu/ui/ui.cpp:1804
 #, c-format
 msgid "Load from position %s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1847
+#: src/emu/ui/ui.cpp:1844
 #, c-format
 msgid ""
 "Are you sure you want to quit?\n"
@@ -1657,173 +1673,173 @@ msgid ""
 "Press ''%2$s'' to return to emulation."
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1917
+#: src/emu/ui/ui.cpp:1914
 msgid "Master Volume"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1926
+#: src/emu/ui/ui.cpp:1923
 #, c-format
 msgid "%1$s Volume"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1949
+#: src/emu/ui/ui.cpp:1946
 #, c-format
 msgid "Overclock CPU %1$s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1968
+#: src/emu/ui/ui.cpp:1965
 #, c-format
 msgid "%1$s Refresh Rate"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1973
+#: src/emu/ui/ui.cpp:1970
 #, c-format
 msgid "%1$s Brightness"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1975
+#: src/emu/ui/ui.cpp:1972
 #, c-format
 msgid "%1$s Contrast"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1977
+#: src/emu/ui/ui.cpp:1974
 #, c-format
 msgid "%1$s Gamma"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1981
+#: src/emu/ui/ui.cpp:1978
 #, c-format
 msgid "%1$s Horiz Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1983
+#: src/emu/ui/ui.cpp:1980
 #, c-format
 msgid "%1$s Horiz Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1985
+#: src/emu/ui/ui.cpp:1982
 #, c-format
 msgid "%1$s Vert Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1987
+#: src/emu/ui/ui.cpp:1984
 #, c-format
 msgid "%1$s Vert Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2005
+#: src/emu/ui/ui.cpp:2002
 #, c-format
 msgid "Laserdisc '%1$s' Horiz Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2007
+#: src/emu/ui/ui.cpp:2004
 #, c-format
 msgid "Laserdisc '%1$s' Horiz Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2009
+#: src/emu/ui/ui.cpp:2006
 #, c-format
 msgid "Laserdisc '%1$s' Vert Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2011
+#: src/emu/ui/ui.cpp:2008
 #, c-format
 msgid "Laserdisc '%1$s' Vert Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2021
+#: src/emu/ui/ui.cpp:2018
 msgid "Vector Flicker"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2022
+#: src/emu/ui/ui.cpp:2019
 msgid "Beam Width Minimum"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2023
+#: src/emu/ui/ui.cpp:2020
 msgid "Beam Width Maximum"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2024
+#: src/emu/ui/ui.cpp:2021
 msgid "Beam Intensity Weight"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2037
+#: src/emu/ui/ui.cpp:2034
 #, c-format
 msgid "Crosshair Scale %1$s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2037 src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2034 src/emu/ui/ui.cpp:2036
 msgid "X"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2037 src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2034 src/emu/ui/ui.cpp:2036
 msgid "Y"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2036
 #, c-format
 msgid "Crosshair Offset %1$s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2071
+#: src/emu/ui/ui.cpp:2068
 #, c-format
 msgid "%1$3ddB"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2115
+#: src/emu/ui/ui.cpp:2112
 #, c-format
 msgid "%1$d%%"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2131
+#: src/emu/ui/ui.cpp:2128
 #, c-format
 msgid "%1$3.0f%%"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2154
+#: src/emu/ui/ui.cpp:2151
 #, c-format
 msgid "%1$.3ffps"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2177 src/emu/ui/ui.cpp:2199 src/emu/ui/ui.cpp:2220
-#: src/emu/ui/ui.cpp:2242 src/emu/ui/ui.cpp:2264 src/emu/ui/ui.cpp:2286
-#: src/emu/ui/ui.cpp:2308 src/emu/ui/ui.cpp:2330 src/emu/ui/ui.cpp:2352
-#: src/emu/ui/ui.cpp:2374 src/emu/ui/ui.cpp:2396
+#: src/emu/ui/ui.cpp:2174 src/emu/ui/ui.cpp:2196 src/emu/ui/ui.cpp:2217
+#: src/emu/ui/ui.cpp:2239 src/emu/ui/ui.cpp:2261 src/emu/ui/ui.cpp:2283
+#: src/emu/ui/ui.cpp:2305 src/emu/ui/ui.cpp:2327 src/emu/ui/ui.cpp:2349
+#: src/emu/ui/ui.cpp:2371 src/emu/ui/ui.cpp:2393
 #, c-format
 msgid "%1$.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2412 src/emu/ui/ui.cpp:2428 src/emu/ui/ui.cpp:2444
-#: src/emu/ui/ui.cpp:2460
+#: src/emu/ui/ui.cpp:2408 src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2438
+#: src/emu/ui/ui.cpp:2453
 #, c-format
 msgid "%1$1.2f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2476
+#: src/emu/ui/ui.cpp:2469
 #, c-format
 msgid "Screen '%1$s'"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2478
+#: src/emu/ui/ui.cpp:2471
 msgid "Screen"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2494
+#: src/emu/ui/ui.cpp:2487
 #, c-format
 msgid "Crosshair Scale X %1$1.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2494
+#: src/emu/ui/ui.cpp:2487
 #, c-format
 msgid "Crosshair Scale Y %1$1.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2513
+#: src/emu/ui/ui.cpp:2506
 #, c-format
 msgid "Crosshair Offset X %1$1.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2513
+#: src/emu/ui/ui.cpp:2506
 #, c-format
 msgid "Crosshair Offset Y %1$1.3f"
 msgstr ""
@@ -1865,10 +1881,10 @@ msgstr ""
 msgid "Full"
 msgstr ""
 
-#: src/emu/ui/viewgfx.cpp:392
+#: src/emu/ui/viewgfx.cpp:391
 msgid " COLORS"
 msgstr ""
 
-#: src/emu/ui/viewgfx.cpp:392
+#: src/emu/ui/viewgfx.cpp:391
 msgid " PENS"
 msgstr ""
diff --git a/language/Vietnamese/strings.po b/language/Vietnamese/strings.po
index 2010a5e0f74..a7b456622b0 100644
--- a/language/Vietnamese/strings.po
+++ b/language/Vietnamese/strings.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MAME\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-11 03:33+0200\n"
+"POT-Creation-Date: 2016-04-15 17:42+0200\n"
 "PO-Revision-Date: 2016-02-20 18:03+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: MAME Language Team\n"
@@ -60,14 +60,14 @@ msgstr ""
 msgid "Autofire Status"
 msgstr ""
 
-#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1698
+#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1695
 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211
 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219
 #: src/emu/ui/videoopt.cpp:223
 msgid "Disabled"
 msgstr ""
 
-#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1698
+#: src/emu/ui/cheatopt.cpp:256 src/emu/ui/ui.cpp:1695
 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211
 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219
 #: src/emu/ui/videoopt.cpp:223
@@ -75,14 +75,14 @@ msgid "Enabled"
 msgstr ""
 
 #: src/emu/ui/cheatopt.cpp:282 src/emu/ui/cheatopt.cpp:288
-#: src/emu/ui/menu.cpp:710 src/emu/ui/miscmenu.cpp:831
-#: src/emu/ui/sndmenu.cpp:135 src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/menu.cpp:755 src/emu/ui/miscmenu.cpp:936
+#: src/emu/ui/sndmenu.cpp:133 src/emu/ui/sndmenu.cpp:135
 msgid "On"
 msgstr ""
 
 #: src/emu/ui/cheatopt.cpp:282 src/emu/ui/cheatopt.cpp:288
-#: src/emu/ui/menu.cpp:713 src/emu/ui/miscmenu.cpp:831
-#: src/emu/ui/sndmenu.cpp:135 src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/menu.cpp:758 src/emu/ui/miscmenu.cpp:936
+#: src/emu/ui/sndmenu.cpp:133 src/emu/ui/sndmenu.cpp:135
 msgid "Off"
 msgstr ""
 
@@ -94,316 +94,316 @@ msgstr ""
 msgid "Autofire Delay"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:158 src/emu/ui/custmenu.cpp:447
+#: src/emu/ui/custmenu.cpp:157 src/emu/ui/custmenu.cpp:445
 msgid "Main filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:167 src/emu/ui/custmenu.cpp:456
+#: src/emu/ui/custmenu.cpp:166 src/emu/ui/custmenu.cpp:454
 msgid "Other filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:176 src/emu/ui/optsmenu.cpp:239
+#: src/emu/ui/custmenu.cpp:175 src/emu/ui/optsmenu.cpp:238
 msgid "^!Manufacturer"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:185 src/emu/ui/custmenu.cpp:474
-#: src/emu/ui/optsmenu.cpp:247
+#: src/emu/ui/custmenu.cpp:184 src/emu/ui/custmenu.cpp:472
+#: src/emu/ui/optsmenu.cpp:246
 msgid "^!Year"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:194 src/emu/ui/custmenu.cpp:510
+#: src/emu/ui/custmenu.cpp:193 src/emu/ui/custmenu.cpp:508
 msgid "Remove last filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:197 src/emu/ui/custmenu.cpp:513
+#: src/emu/ui/custmenu.cpp:196 src/emu/ui/custmenu.cpp:511
 msgid "Add filter"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:212 src/emu/ui/custmenu.cpp:233
-#: src/emu/ui/custmenu.cpp:529 src/emu/ui/custmenu.cpp:550
+#: src/emu/ui/custmenu.cpp:211 src/emu/ui/custmenu.cpp:231
+#: src/emu/ui/custmenu.cpp:527 src/emu/ui/custmenu.cpp:547
 msgid "Select custom filters:"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:465
+#: src/emu/ui/custmenu.cpp:463
 msgid "^!Publisher"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:483
+#: src/emu/ui/custmenu.cpp:481
 msgid "^!Software List"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:492
+#: src/emu/ui/custmenu.cpp:490
 msgid "^!Device type"
 msgstr ""
 
-#: src/emu/ui/custmenu.cpp:501
+#: src/emu/ui/custmenu.cpp:499
 msgid "^!Region"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:23
+#: src/emu/ui/custui.cpp:22
 msgid "Show All"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:24
+#: src/emu/ui/custui.cpp:23
 msgid "Hide Filters"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:25
+#: src/emu/ui/custui.cpp:24
 msgid "Hide Info/Image"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:26
+#: src/emu/ui/custui.cpp:25
 msgid "Hide Both"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:142
+#: src/emu/ui/custui.cpp:141
 msgid "Fonts"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:143
+#: src/emu/ui/custui.cpp:142
 msgid "Colors"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:148 src/emu/ui/dirmenu.cpp:33
+#: src/emu/ui/custui.cpp:147 src/emu/ui/dirmenu.cpp:33
 msgid "Language"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:152
+#: src/emu/ui/custui.cpp:151
 msgid "Show side panels"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:167 src/emu/ui/custui.cpp:188
+#: src/emu/ui/custui.cpp:166 src/emu/ui/custui.cpp:186
 msgid "Custom UI Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:246
+#: src/emu/ui/custui.cpp:244
 msgid "default"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:349
+#: src/emu/ui/custui.cpp:347
 msgid "UI Font"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:354
+#: src/emu/ui/custui.cpp:352
 msgid "Bold"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:355
+#: src/emu/ui/custui.cpp:353
 msgid "Italic"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:360
+#: src/emu/ui/custui.cpp:358
 msgid "Lines"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:366
+#: src/emu/ui/custui.cpp:364
 msgid "Infos text size"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:383
+#: src/emu/ui/custui.cpp:381
 msgid "UI Fonts Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:411
+#: src/emu/ui/custui.cpp:408
 msgid "Sample text - Lorem ipsum dolor sit amet, consectetur adipiscing elit."
 msgstr ""
 
-#: src/emu/ui/custui.cpp:509
+#: src/emu/ui/custui.cpp:506
 msgid "Normal text"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:510
+#: src/emu/ui/custui.cpp:507
 msgid "Selected color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:511
+#: src/emu/ui/custui.cpp:508
 msgid "Normal text background"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:512
+#: src/emu/ui/custui.cpp:509
 msgid "Selected background color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:513
+#: src/emu/ui/custui.cpp:510
 msgid "Subitem color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:514 src/emu/ui/custui.cpp:610
+#: src/emu/ui/custui.cpp:511 src/emu/ui/custui.cpp:606
 msgid "Clone"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:515
+#: src/emu/ui/custui.cpp:512
 msgid "Border"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:516
+#: src/emu/ui/custui.cpp:513
 msgid "Background"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:517
+#: src/emu/ui/custui.cpp:514
 msgid "Dipswitch"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:518
+#: src/emu/ui/custui.cpp:515
 msgid "Unavailable color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:519
+#: src/emu/ui/custui.cpp:516
 msgid "Slider color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:520
+#: src/emu/ui/custui.cpp:517
 msgid "Gfx viewer background"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:521
+#: src/emu/ui/custui.cpp:518
 msgid "Mouse over color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:522
+#: src/emu/ui/custui.cpp:519
 msgid "Mouse over background color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:523
+#: src/emu/ui/custui.cpp:520
 msgid "Mouse down color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:524
+#: src/emu/ui/custui.cpp:521
 msgid "Mouse down background color"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:527
+#: src/emu/ui/custui.cpp:524
 msgid "Restore originals colors"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:543
+#: src/emu/ui/custui.cpp:540
 msgid "UI Colors Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:572
+#: src/emu/ui/custui.cpp:568
 #, c-format
 msgid "Double click or press %1$s to change the color value"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:598
+#: src/emu/ui/custui.cpp:594
 msgid "Menu Preview"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:606
+#: src/emu/ui/custui.cpp:602
 msgid "Normal"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:607
+#: src/emu/ui/custui.cpp:603
 msgid "Subitem"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:608
+#: src/emu/ui/custui.cpp:604
 msgid "Selected"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:609
+#: src/emu/ui/custui.cpp:605
 msgid "Mouse Over"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:841 src/emu/ui/custui.cpp:844
+#: src/emu/ui/custui.cpp:837 src/emu/ui/custui.cpp:840
 msgid "Alpha"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:849 src/emu/ui/custui.cpp:852
-#: src/emu/ui/custui.cpp:1013
+#: src/emu/ui/custui.cpp:845 src/emu/ui/custui.cpp:848
+#: src/emu/ui/custui.cpp:1007
 msgid "Red"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:857 src/emu/ui/custui.cpp:860
-#: src/emu/ui/custui.cpp:1016
+#: src/emu/ui/custui.cpp:853 src/emu/ui/custui.cpp:856
+#: src/emu/ui/custui.cpp:1010
 msgid "Green"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:865 src/emu/ui/custui.cpp:868
-#: src/emu/ui/custui.cpp:1017
+#: src/emu/ui/custui.cpp:861 src/emu/ui/custui.cpp:864
+#: src/emu/ui/custui.cpp:1011
 msgid "Blue"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:871
+#: src/emu/ui/custui.cpp:867
 msgid "Choose from palette"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:887
+#: src/emu/ui/custui.cpp:883
 msgid " - ARGB Settings"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:912
+#: src/emu/ui/custui.cpp:907
 msgid "Color preview ="
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1009
+#: src/emu/ui/custui.cpp:1003
 msgid "White"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1010
+#: src/emu/ui/custui.cpp:1004
 msgid "Silver"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1011
+#: src/emu/ui/custui.cpp:1005
 msgid "Gray"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1012
+#: src/emu/ui/custui.cpp:1006
 msgid "Black"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1014
+#: src/emu/ui/custui.cpp:1008
 msgid "Orange"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1015
+#: src/emu/ui/custui.cpp:1009
 msgid "Yellow"
 msgstr ""
 
-#: src/emu/ui/custui.cpp:1018
+#: src/emu/ui/custui.cpp:1012
 msgid "Violet"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:65
+#: src/emu/ui/datmenu.cpp:64
 msgid "Software History"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:67
+#: src/emu/ui/datmenu.cpp:66
 msgid "Software Usage"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:199
+#: src/emu/ui/datmenu.cpp:196
 msgid "Revision: "
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:287 src/emu/ui/selgame.cpp:40
-#: src/emu/ui/selgame.cpp:2152 src/emu/ui/selgame.cpp:2161
-#: src/emu/ui/selsoft.cpp:1577 src/emu/ui/selsoft.cpp:1597
-#: src/emu/ui/selsoft.cpp:1606
+#: src/emu/ui/datmenu.cpp:284 src/emu/ui/selgame.cpp:39
+#: src/emu/ui/selgame.cpp:2158 src/emu/ui/selgame.cpp:2167
+#: src/emu/ui/selsoft.cpp:1574 src/emu/ui/selsoft.cpp:1592
+#: src/emu/ui/selsoft.cpp:1601
 msgid "History"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:289 src/emu/ui/selgame.cpp:41
+#: src/emu/ui/datmenu.cpp:286 src/emu/ui/selgame.cpp:40
 msgid "Mameinfo"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:291 src/emu/ui/selgame.cpp:43
+#: src/emu/ui/datmenu.cpp:288 src/emu/ui/selgame.cpp:42
 msgid "Messinfo"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:293 src/emu/ui/selgame.cpp:42
+#: src/emu/ui/datmenu.cpp:290 src/emu/ui/selgame.cpp:41
 msgid "Sysinfo"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:295 src/emu/ui/selgame.cpp:46
+#: src/emu/ui/datmenu.cpp:292 src/emu/ui/selgame.cpp:45
 msgid "Mamescore"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:297 src/emu/ui/selgame.cpp:45
+#: src/emu/ui/datmenu.cpp:294 src/emu/ui/selgame.cpp:44
 msgid "Gameinit"
 msgstr ""
 
-#: src/emu/ui/datmenu.cpp:299 src/emu/ui/selgame.cpp:44
+#: src/emu/ui/datmenu.cpp:296 src/emu/ui/selgame.cpp:43
 msgid "Command"
 msgstr ""
 
@@ -555,75 +555,75 @@ msgstr ""
 msgid "Remove %1$s Folder"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:158
+#: src/emu/ui/filesel.cpp:161
 msgid "File Already Exists - Override?"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:160 src/emu/ui/selgame.cpp:1568
-#: src/emu/ui/selgame.cpp:1569 src/emu/ui/selgame.cpp:1570
-#: src/emu/ui/selgame.cpp:1571 src/emu/ui/selgame.cpp:1572
-#: src/emu/ui/selgame.cpp:1573 src/emu/ui/selgame.cpp:1574
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/filesel.cpp:163 src/emu/ui/selgame.cpp:1576
+#: src/emu/ui/selgame.cpp:1577 src/emu/ui/selgame.cpp:1578
+#: src/emu/ui/selgame.cpp:1579 src/emu/ui/selgame.cpp:1580
+#: src/emu/ui/selgame.cpp:1581 src/emu/ui/selgame.cpp:1582
+#: src/emu/ui/selgame.cpp:1591
 msgid "No"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:161 src/emu/ui/selgame.cpp:1568
-#: src/emu/ui/selgame.cpp:1569 src/emu/ui/selgame.cpp:1570
-#: src/emu/ui/selgame.cpp:1571 src/emu/ui/selgame.cpp:1572
-#: src/emu/ui/selgame.cpp:1573 src/emu/ui/selgame.cpp:1574
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/filesel.cpp:164 src/emu/ui/selgame.cpp:1576
+#: src/emu/ui/selgame.cpp:1577 src/emu/ui/selgame.cpp:1578
+#: src/emu/ui/selgame.cpp:1579 src/emu/ui/selgame.cpp:1580
+#: src/emu/ui/selgame.cpp:1581 src/emu/ui/selgame.cpp:1582
+#: src/emu/ui/selgame.cpp:1591
 msgid "Yes"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:272
+#: src/emu/ui/filesel.cpp:275
 msgid "New Image Name:"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:278
+#: src/emu/ui/filesel.cpp:281
 msgid "Image Format:"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:284
+#: src/emu/ui/filesel.cpp:287
 msgid "Create"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:315
+#: src/emu/ui/filesel.cpp:318
 msgid "Please enter a file extension too"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:503 src/emu/ui/swlist.cpp:65
+#: src/emu/ui/filesel.cpp:506 src/emu/ui/swlist.cpp:65
 msgid "[empty slot]"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:507
+#: src/emu/ui/filesel.cpp:510
 msgid "[create]"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:511 src/emu/ui/swlist.cpp:76
+#: src/emu/ui/filesel.cpp:514 src/emu/ui/swlist.cpp:76
 msgid "[software list]"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:803
+#: src/emu/ui/filesel.cpp:806
 msgid "Select image format"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:863
+#: src/emu/ui/filesel.cpp:866
 msgid "Select access mode"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:864
+#: src/emu/ui/filesel.cpp:867
 msgid "Read-only"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:866
+#: src/emu/ui/filesel.cpp:869
 msgid "Read-write"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:867
+#: src/emu/ui/filesel.cpp:870
 msgid "Read this image, write to another image"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:868
+#: src/emu/ui/filesel.cpp:871
 msgid "Read this image, write to diff"
 msgstr ""
 
@@ -649,7 +649,7 @@ msgstr ""
 msgid "[empty]"
 msgstr ""
 
-#: src/emu/ui/info_pty.cpp:26 src/emu/ui/mainmenu.cpp:91
+#: src/emu/ui/info_pty.cpp:26 src/emu/ui/mainmenu.cpp:96
 msgid "Pseudo terminals"
 msgstr ""
 
@@ -665,7 +665,7 @@ msgstr ""
 msgid "Other Controls"
 msgstr ""
 
-#: src/emu/ui/inputmap.cpp:622 src/emu/ui/miscmenu.cpp:91
+#: src/emu/ui/inputmap.cpp:622 src/emu/ui/miscmenu.cpp:92
 #: src/emu/ui/slotopt.cpp:172
 msgid "Reset"
 msgstr ""
@@ -698,27 +698,27 @@ msgstr ""
 msgid "Machine Information"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:78
+#: src/emu/ui/mainmenu.cpp:80
 msgid "Image Information"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:81
+#: src/emu/ui/mainmenu.cpp:83
 msgid "File Manager"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:86
+#: src/emu/ui/mainmenu.cpp:92
 msgid "Tape Control"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:94
+#: src/emu/ui/mainmenu.cpp:99
 msgid "Bios Selection"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:100
+#: src/emu/ui/mainmenu.cpp:104
 msgid "Slot Devices"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:107
+#: src/emu/ui/mainmenu.cpp:109
 msgid "Barcode Reader"
 msgstr ""
 
@@ -726,43 +726,43 @@ msgstr ""
 msgid "Network Devices"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:119
+#: src/emu/ui/mainmenu.cpp:118
 msgid "Keyboard Mode"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:122
+#: src/emu/ui/mainmenu.cpp:121
 msgid "Slider Controls"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:125
+#: src/emu/ui/mainmenu.cpp:124
 msgid "Video Options"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:129
+#: src/emu/ui/mainmenu.cpp:128
 msgid "Crosshair Options"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:133
+#: src/emu/ui/mainmenu.cpp:132
 msgid "Cheat"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:136
+#: src/emu/ui/mainmenu.cpp:135
 msgid "Plugin Options"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:140
+#: src/emu/ui/mainmenu.cpp:139
 msgid "External DAT View"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:146
+#: src/emu/ui/mainmenu.cpp:145 src/emu/ui/miscmenu.cpp:785
 msgid "Add To Favorites"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:148
+#: src/emu/ui/mainmenu.cpp:147 src/emu/ui/miscmenu.cpp:787
 msgid "Remove From Favorites"
 msgstr ""
 
-#: src/emu/ui/mainmenu.cpp:155
+#: src/emu/ui/mainmenu.cpp:154
 msgid "Select New Machine"
 msgstr ""
 
@@ -802,189 +802,205 @@ msgstr ""
 msgid "Return to Previous Menu"
 msgstr ""
 
-#: src/emu/ui/menu.cpp:716
+#: src/emu/ui/menu.cpp:761
 msgid "Auto"
 msgstr ""
 
-#: src/emu/ui/menu.cpp:2133
+#: src/emu/ui/menu.cpp:2195
 msgid "Images"
 msgstr ""
 
-#: src/emu/ui/menu.cpp:2134
+#: src/emu/ui/menu.cpp:2196
 msgid "Infos"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Keyboard Mode:"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Natural"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:37
+#: src/emu/ui/miscmenu.cpp:38
 msgid "Emulated"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:240
+#: src/emu/ui/miscmenu.cpp:241
 #, c-format
 msgid ""
 "Uptime: %1$d:%2$02d:%3$02d\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:242
+#: src/emu/ui/miscmenu.cpp:243
 #, c-format
 msgid ""
 "Uptime: %1$d:%2$02d\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:246
+#: src/emu/ui/miscmenu.cpp:247
 #, c-format
 msgid ""
 "Tickets dispensed: %1$d\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:257
+#: src/emu/ui/miscmenu.cpp:258
 msgid "Coin %1$c: NA%3$s\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:257
+#: src/emu/ui/miscmenu.cpp:258
 #, c-format
 msgid "Coin %1$c: %2$d%3$s\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:260
+#: src/emu/ui/miscmenu.cpp:261
 msgid " (locked)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:519
+#: src/emu/ui/miscmenu.cpp:520
 msgid "Visible Delay"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:617
+#: src/emu/ui/miscmenu.cpp:619
 #, c-format
 msgid "%s.xml saved under ui folder."
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:645
+#: src/emu/ui/miscmenu.cpp:647
 msgid "Name:             Description:\n"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:657
+#: src/emu/ui/miscmenu.cpp:659
 #, c-format
 msgid "%s.txt saved under ui folder."
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:675
-msgid "Export XML format (like -listxml)"
+#: src/emu/ui/miscmenu.cpp:677
+msgid "Export list in XML format (like -listxml)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:676
-msgid "Export TXT format (like -listfull)"
+#: src/emu/ui/miscmenu.cpp:678
+msgid "Export list in XML format (like -listxml, but exclude devices)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:734
-msgid "Dummy"
+#: src/emu/ui/miscmenu.cpp:679
+msgid "Export list in TXT format (like -listfull)"
 msgstr ""
 
-#: src/emu/ui/miscmenu.cpp:736
-msgid "Save machine configuration"
-msgstr ""
-
-#: src/emu/ui/miscmenu.cpp:848 src/emu/ui/miscmenu.cpp:869
-#: src/emu/ui/selgame.cpp:594
-msgid "Plugins"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:218
-msgid "Filter"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:226
-msgid " ^!File"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:231
-msgid " ^!Category"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:254
-msgid "^!Setup custom filter"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:262
-msgid "Customize UI"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:263
-msgid "Configure Directories"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:266 src/emu/ui/sndmenu.cpp:151
-#: src/emu/ui/sndmenu.cpp:172
-msgid "Sound Options"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:269
-msgid "General Inputs"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:272
-msgid "Save Configuration"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:286 src/emu/ui/optsmenu.cpp:307
-msgid "Settings"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:327
-msgid "**Error saving ui.ini**"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:374
-#, c-format
-msgid "**Error saving %s.ini**"
-msgstr ""
-
-#: src/emu/ui/optsmenu.cpp:378
+#: src/emu/ui/miscmenu.cpp:729 src/emu/ui/optsmenu.cpp:376
 msgid ""
 "\n"
 "    Configuration saved    \n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/selector.cpp:166
+#: src/emu/ui/miscmenu.cpp:774
+msgid "Bios"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:776
+msgid "Driver"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:790
+msgid "Save machine configuration"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:806
+msgid "Configure machine:"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:868 src/emu/ui/selsoft.cpp:109
+msgid " (default)"
+msgstr ""
+
+#: src/emu/ui/miscmenu.cpp:953 src/emu/ui/miscmenu.cpp:973
+#: src/emu/ui/selgame.cpp:600
+msgid "Plugins"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:217
+msgid "Filter"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:225
+msgid " ^!File"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:230
+msgid " ^!Category"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:253
+msgid "^!Setup custom filter"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:261
+msgid "Customize UI"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:262
+msgid "Configure Directories"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:265 src/emu/ui/sndmenu.cpp:149
+#: src/emu/ui/sndmenu.cpp:169
+msgid "Sound Options"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:268
+msgid "General Inputs"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:271
+msgid "Save Configuration"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:285 src/emu/ui/optsmenu.cpp:305
+msgid "Settings"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:325
+msgid "**Error saving ui.ini**"
+msgstr ""
+
+#: src/emu/ui/optsmenu.cpp:372
+#, c-format
+msgid "**Error saving %s.ini**"
+msgstr ""
+
+#: src/emu/ui/selector.cpp:165
 msgid "Selection List - Search: "
 msgstr ""
 
-#: src/emu/ui/selector.cpp:196
+#: src/emu/ui/selector.cpp:194
 #, c-format
 msgid "Double click or press %1$s to select"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:39
+#: src/emu/ui/selgame.cpp:38
 msgid "General Info"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:374 src/emu/ui/selsoft.cpp:282
+#: src/emu/ui/selgame.cpp:380 src/emu/ui/selsoft.cpp:281
 #, c-format
 msgid ""
 "%s\n"
 " added to favorites list."
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:380 src/emu/ui/selgame.cpp:389
-#: src/emu/ui/selsoft.cpp:287
+#: src/emu/ui/selgame.cpp:386 src/emu/ui/selgame.cpp:395
+#: src/emu/ui/selsoft.cpp:286
 #, c-format
 msgid ""
 "%s\n"
 " removed from favorites list."
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:450
+#: src/emu/ui/selgame.cpp:457
 msgid ""
 "The selected machine is missing one or more required ROM or CHD images. "
 "Please select a different machine.\n"
@@ -992,275 +1008,275 @@ msgid ""
 "Press any key to continue."
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:589 src/emu/ui/simpleselgame.cpp:265
+#: src/emu/ui/selgame.cpp:595 src/emu/ui/simpleselgame.cpp:265
 msgid "Configure Options"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:752
+#: src/emu/ui/selgame.cpp:596
+msgid "Configure Machine"
+msgstr ""
+
+#: src/emu/ui/selgame.cpp:758
 #, c-format
 msgid "%1$s %2$s ( %3$d / %4$d machines (%5$d BIOS) )"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:762
+#: src/emu/ui/selgame.cpp:768
 #, c-format
 msgid "%1$s (%2$s - %3$s) - "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:769 src/emu/ui/selgame.cpp:775
+#: src/emu/ui/selgame.cpp:775 src/emu/ui/selgame.cpp:781
 #, c-format
 msgid "%1$s (%2$s) - "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:784
+#: src/emu/ui/selgame.cpp:790
 #, c-format
 msgid "%1$s Search: %2$s_"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:838
+#: src/emu/ui/selgame.cpp:844
 #, c-format
 msgid "Romset: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:841 src/emu/ui/selgame.cpp:890
-#: src/emu/ui/selsoft.cpp:751 src/emu/ui/selsoft.cpp:801
+#: src/emu/ui/selgame.cpp:847 src/emu/ui/selgame.cpp:896
+#: src/emu/ui/selsoft.cpp:750 src/emu/ui/selsoft.cpp:800
 #: src/emu/ui/simpleselgame.cpp:328
 #, c-format
 msgid "%1$s, %2$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:847 src/emu/ui/selsoft.cpp:757
+#: src/emu/ui/selgame.cpp:853 src/emu/ui/selsoft.cpp:756
 #, c-format
 msgid "Driver is clone of: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:849 src/emu/ui/selsoft.cpp:759
+#: src/emu/ui/selgame.cpp:855 src/emu/ui/selsoft.cpp:758
 msgid "Driver is parent"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:853 src/emu/ui/selsoft.cpp:763
+#: src/emu/ui/selgame.cpp:859 src/emu/ui/selsoft.cpp:762
 #: src/emu/ui/simpleselgame.cpp:335
 msgid "Overall: NOT WORKING"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:855 src/emu/ui/selsoft.cpp:765
+#: src/emu/ui/selgame.cpp:861 src/emu/ui/selsoft.cpp:764
 #: src/emu/ui/simpleselgame.cpp:337
 msgid "Overall: Unemulated Protection"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:857 src/emu/ui/selsoft.cpp:767
+#: src/emu/ui/selgame.cpp:863 src/emu/ui/selsoft.cpp:766
 #: src/emu/ui/simpleselgame.cpp:339
 msgid "Overall: Working"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:861 src/emu/ui/selsoft.cpp:771
+#: src/emu/ui/selgame.cpp:867 src/emu/ui/selsoft.cpp:770
 msgid "Graphics: Imperfect, "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:863 src/emu/ui/selsoft.cpp:773
+#: src/emu/ui/selgame.cpp:869 src/emu/ui/selsoft.cpp:772
 msgid "Graphics: OK, "
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:866 src/emu/ui/selsoft.cpp:776
+#: src/emu/ui/selgame.cpp:872 src/emu/ui/selsoft.cpp:775
 msgid "Sound: Unimplemented"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:868 src/emu/ui/selsoft.cpp:778
+#: src/emu/ui/selgame.cpp:874 src/emu/ui/selsoft.cpp:777
 msgid "Sound: Imperfect"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:870 src/emu/ui/selsoft.cpp:780
+#: src/emu/ui/selgame.cpp:876 src/emu/ui/selsoft.cpp:779
 msgid "Sound: OK"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:887
+#: src/emu/ui/selgame.cpp:893
 #, c-format
 msgid "System: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:894 src/emu/ui/selsoft.cpp:805
+#: src/emu/ui/selgame.cpp:900 src/emu/ui/selsoft.cpp:804
 #, c-format
 msgid "Software is clone of: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:896 src/emu/ui/selsoft.cpp:807
+#: src/emu/ui/selgame.cpp:902 src/emu/ui/selsoft.cpp:806
 msgid "Software is parent"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:901 src/emu/ui/selsoft.cpp:812
+#: src/emu/ui/selgame.cpp:907 src/emu/ui/selsoft.cpp:811
 msgid "Supported: No"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:906 src/emu/ui/selsoft.cpp:817
+#: src/emu/ui/selgame.cpp:912 src/emu/ui/selsoft.cpp:816
 msgid "Supported: Partial"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:911 src/emu/ui/selsoft.cpp:822
+#: src/emu/ui/selgame.cpp:917 src/emu/ui/selsoft.cpp:821
 msgid "Supported: Yes"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:916 src/emu/ui/selsoft.cpp:827
+#: src/emu/ui/selgame.cpp:922 src/emu/ui/selsoft.cpp:826
 #, c-format
 msgid "romset: %1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:923
+#: src/emu/ui/selgame.cpp:929
 #, c-format
 msgid "%1$s %2$s"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1535
+#: src/emu/ui/selgame.cpp:1543
 #, c-format
 msgid "Romset: %1$-.100s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1536
+#: src/emu/ui/selgame.cpp:1544
 #, c-format
 msgid "Year: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1537
+#: src/emu/ui/selgame.cpp:1545
 #, c-format
 msgid "Manufacturer: %1$-.100s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1541
+#: src/emu/ui/selgame.cpp:1549
 #, c-format
 msgid "Driver is Clone of: %1$-.100s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1543
+#: src/emu/ui/selgame.cpp:1551
 msgid "Driver is Parent\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1546
+#: src/emu/ui/selgame.cpp:1554
 msgid "Overall: NOT WORKING\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1548
+#: src/emu/ui/selgame.cpp:1556
 msgid "Overall: Unemulated Protection\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1550
+#: src/emu/ui/selgame.cpp:1558
 msgid "Overall: Working\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1553
+#: src/emu/ui/selgame.cpp:1561
 msgid "Graphics: Imperfect Colors\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1557
+#: src/emu/ui/selgame.cpp:1565
 msgid "Graphics: Imperfect\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1559
+#: src/emu/ui/selgame.cpp:1567
 msgid "Graphics: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1562
+#: src/emu/ui/selgame.cpp:1570
 msgid "Sound: Unimplemented\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1564
+#: src/emu/ui/selgame.cpp:1572
 msgid "Sound: Imperfect\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1566
+#: src/emu/ui/selgame.cpp:1574
 msgid "Sound: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1568
+#: src/emu/ui/selgame.cpp:1576
 #, c-format
 msgid "Driver is Skeleton: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1569
+#: src/emu/ui/selgame.cpp:1577
 #, c-format
 msgid "Game is Mechanical: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1570
+#: src/emu/ui/selgame.cpp:1578
 #, c-format
 msgid "Requires Artwork: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1571
+#: src/emu/ui/selgame.cpp:1579
 #, c-format
 msgid "Requires Clickable Artwork: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1572
+#: src/emu/ui/selgame.cpp:1580
 #, c-format
 msgid "Support Cocktail: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1573
+#: src/emu/ui/selgame.cpp:1581
 #, c-format
 msgid "Driver is Bios: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1574
+#: src/emu/ui/selgame.cpp:1582
 #, c-format
 msgid "Support Save: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 #, c-format
 msgid "Screen Orientation: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 msgid "Vertical"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1575
+#: src/emu/ui/selgame.cpp:1583
 msgid "Horizontal"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1583
+#: src/emu/ui/selgame.cpp:1591
 #, c-format
 msgid "Requires CHD: %1$s\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1596
+#: src/emu/ui/selgame.cpp:1604
 msgid "Roms Audit Pass: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1598
+#: src/emu/ui/selgame.cpp:1606
 msgid "Roms Audit Pass: BAD\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1601
+#: src/emu/ui/selgame.cpp:1609
 msgid "Samples Audit Pass: None Needed\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1603
+#: src/emu/ui/selgame.cpp:1611
 msgid "Samples Audit Pass: OK\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1605
+#: src/emu/ui/selgame.cpp:1613
 msgid "Samples Audit Pass: BAD\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:1608
+#: src/emu/ui/selgame.cpp:1616
 msgid ""
 "Roms Audit Pass: Disabled\n"
 "Samples Audit Pass: Disabled\n"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:2049 src/emu/ui/selgame.cpp:2212
-#: src/emu/ui/selsoft.cpp:1662
+#: src/emu/ui/selgame.cpp:2055 src/emu/ui/selgame.cpp:2216
+#: src/emu/ui/selsoft.cpp:1655
 msgid "No Infos Available"
 msgstr ""
 
-#: src/emu/ui/selgame.cpp:2162 src/emu/ui/selsoft.cpp:1607
+#: src/emu/ui/selgame.cpp:2168 src/emu/ui/selsoft.cpp:1602
 msgid "Usage"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:110
-msgid " (default)"
-msgstr ""
-
-#: src/emu/ui/selsoft.cpp:381
+#: src/emu/ui/selsoft.cpp:380
 msgid ""
 "The selected software is missing one or more required files. Please select a "
 "different software.\n"
@@ -1268,57 +1284,57 @@ msgid ""
 "Press any key to continue."
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:684
+#: src/emu/ui/selsoft.cpp:683
 #, c-format
-msgid "%1$s %2$s ( %3$d / %4$d softwares )"
+msgid "%1$s %2$s ( %3$d / %4$d software packages )"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:685
+#: src/emu/ui/selsoft.cpp:684
 #, c-format
 msgid "Driver: \"%1$s\" software list "
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:688
+#: src/emu/ui/selsoft.cpp:687
 #, c-format
 msgid "Region: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:690
+#: src/emu/ui/selsoft.cpp:689
 #, c-format
 msgid "Publisher: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:692
+#: src/emu/ui/selsoft.cpp:691
 #, c-format
 msgid "Year: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:694
+#: src/emu/ui/selsoft.cpp:693
 #, c-format
 msgid "Software List: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:696
+#: src/emu/ui/selsoft.cpp:695
 #, c-format
 msgid "Device type: %1$s -"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:698
+#: src/emu/ui/selsoft.cpp:697
 #, c-format
 msgid "%s Search: %s_"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:748 src/emu/ui/selsoft.cpp:798
+#: src/emu/ui/selsoft.cpp:747 src/emu/ui/selsoft.cpp:797
 #: src/emu/ui/simpleselgame.cpp:325
 #, c-format
 msgid "%1$-.100s"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:1998 src/emu/ui/selsoft.cpp:2018
+#: src/emu/ui/selsoft.cpp:1991 src/emu/ui/selsoft.cpp:2011
 msgid "Software part selection:"
 msgstr ""
 
-#: src/emu/ui/selsoft.cpp:2136 src/emu/ui/selsoft.cpp:2156
+#: src/emu/ui/selsoft.cpp:2129 src/emu/ui/selsoft.cpp:2149
 msgid "Bios selection:"
 msgstr ""
 
@@ -1366,15 +1382,15 @@ msgstr ""
 msgid " [internal]"
 msgstr ""
 
-#: src/emu/ui/sndmenu.cpp:135
+#: src/emu/ui/sndmenu.cpp:133
 msgid "Sound"
 msgstr ""
 
-#: src/emu/ui/sndmenu.cpp:136
+#: src/emu/ui/sndmenu.cpp:134
 msgid "Sample Rate"
 msgstr ""
 
-#: src/emu/ui/sndmenu.cpp:137
+#: src/emu/ui/sndmenu.cpp:135
 msgid "Use External Samples"
 msgstr ""
 
@@ -1443,80 +1459,80 @@ msgstr ""
 msgid "Fast Forward"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:419
+#: src/emu/ui/ui.cpp:418
 msgid "This driver requires images to be loaded in the following device(s): "
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1074
+#: src/emu/ui/ui.cpp:1071
 msgid ""
 "One or more ROMs/CHDs for this machine are incorrect. The machine may not "
 "run correctly.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1087
+#: src/emu/ui/ui.cpp:1084
 msgid ""
 "There are known problems with this machine\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1091
+#: src/emu/ui/ui.cpp:1088
 msgid ""
 "One or more ROMs/CHDs for this machine have not been correctly dumped.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1095
+#: src/emu/ui/ui.cpp:1092
 #, c-format
 msgid "The keyboard emulation may not be 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1097
+#: src/emu/ui/ui.cpp:1094
 #, c-format
 msgid "The colors aren't 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1099
+#: src/emu/ui/ui.cpp:1096
 msgid "The colors are completely wrong.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1101
+#: src/emu/ui/ui.cpp:1098
 #, c-format
 msgid "The video emulation isn't 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1103
+#: src/emu/ui/ui.cpp:1100
 #, c-format
 msgid "The sound emulation isn't 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1105
+#: src/emu/ui/ui.cpp:1102
 msgid "The machine lacks sound.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1108
+#: src/emu/ui/ui.cpp:1105
 msgid "Screen flipping in cocktail mode is not supported.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1112
+#: src/emu/ui/ui.cpp:1109
 msgid "The machine requires external artwork files\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1117
+#: src/emu/ui/ui.cpp:1114
 msgid ""
 "This machine was never completed. It may exhibit strange behavior or missing "
 "elements that are not bugs in the emulation.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1122
+#: src/emu/ui/ui.cpp:1119
 msgid ""
 "This machine has no sound hardware, MAME will produce no sounds, this is "
 "expected behaviour.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1130
+#: src/emu/ui/ui.cpp:1127
 msgid "The machine has protection which isn't fully emulated.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1133
+#: src/emu/ui/ui.cpp:1130
 msgid ""
 "\n"
 "THIS MACHINE DOESN'T WORK. The emulation for this machine is not yet "
@@ -1524,7 +1540,7 @@ msgid ""
 "the developers to improve the emulation.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1137
+#: src/emu/ui/ui.cpp:1134
 msgid ""
 "\n"
 "Certain elements of this machine cannot be emulated as it requires actual "
@@ -1532,21 +1548,21 @@ msgid ""
 "to fully play this machine.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1156
+#: src/emu/ui/ui.cpp:1153
 msgid ""
 "\n"
 "\n"
 "There are working clones of this machine: "
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1170
+#: src/emu/ui/ui.cpp:1167
 msgid ""
 "\n"
 "\n"
 "Press any key to continue"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1185
+#: src/emu/ui/ui.cpp:1182
 #, c-format
 msgid ""
 "%1$s\n"
@@ -1556,98 +1572,98 @@ msgid ""
 "CPU:\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1221 src/emu/ui/ui.cpp:1260
+#: src/emu/ui/ui.cpp:1218 src/emu/ui/ui.cpp:1257
 msgid "MHz"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1221 src/emu/ui/ui.cpp:1260
+#: src/emu/ui/ui.cpp:1218 src/emu/ui/ui.cpp:1257
 msgid "kHz"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1235
+#: src/emu/ui/ui.cpp:1232
 msgid ""
 "\n"
 "Sound:\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1264
+#: src/emu/ui/ui.cpp:1261
 msgid ""
 "\n"
 "Video:\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1268
+#: src/emu/ui/ui.cpp:1265
 msgid "None\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1275
+#: src/emu/ui/ui.cpp:1272
 msgid "Vector"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1286
+#: src/emu/ui/ui.cpp:1283
 #, c-format
 msgid "%1$s: %2$s\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1286
+#: src/emu/ui/ui.cpp:1283
 msgid "%2$s\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1541 src/emu/ui/ui.cpp:1551
+#: src/emu/ui/ui.cpp:1538 src/emu/ui/ui.cpp:1548
 msgid "Keyboard Emulation Status"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1543
+#: src/emu/ui/ui.cpp:1540
 msgid "Mode: PARTIAL Emulation"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1544
+#: src/emu/ui/ui.cpp:1541
 msgid "UI:   Enabled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1546 src/emu/ui/ui.cpp:1556
+#: src/emu/ui/ui.cpp:1543 src/emu/ui/ui.cpp:1553
 msgid "**Use ScrLock to toggle**"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1553
+#: src/emu/ui/ui.cpp:1550
 msgid "Mode: FULL Emulation"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1554
+#: src/emu/ui/ui.cpp:1551
 msgid "UI:   Disabled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1692
+#: src/emu/ui/ui.cpp:1689
 msgid "Autofire can't be enabled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1731
+#: src/emu/ui/ui.cpp:1728
 msgid "Select position to save to"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1733
+#: src/emu/ui/ui.cpp:1730
 msgid "Select position to load from"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1757
+#: src/emu/ui/ui.cpp:1754
 msgid "Save cancelled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1759
+#: src/emu/ui/ui.cpp:1756
 msgid "Load cancelled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1802
+#: src/emu/ui/ui.cpp:1799
 #, c-format
 msgid "Save to position %s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1807
+#: src/emu/ui/ui.cpp:1804
 #, c-format
 msgid "Load from position %s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1847
+#: src/emu/ui/ui.cpp:1844
 #, c-format
 msgid ""
 "Are you sure you want to quit?\n"
@@ -1656,173 +1672,173 @@ msgid ""
 "Press ''%2$s'' to return to emulation."
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1917
+#: src/emu/ui/ui.cpp:1914
 msgid "Master Volume"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1926
+#: src/emu/ui/ui.cpp:1923
 #, c-format
 msgid "%1$s Volume"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1949
+#: src/emu/ui/ui.cpp:1946
 #, c-format
 msgid "Overclock CPU %1$s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1968
+#: src/emu/ui/ui.cpp:1965
 #, c-format
 msgid "%1$s Refresh Rate"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1973
+#: src/emu/ui/ui.cpp:1970
 #, c-format
 msgid "%1$s Brightness"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1975
+#: src/emu/ui/ui.cpp:1972
 #, c-format
 msgid "%1$s Contrast"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1977
+#: src/emu/ui/ui.cpp:1974
 #, c-format
 msgid "%1$s Gamma"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1981
+#: src/emu/ui/ui.cpp:1978
 #, c-format
 msgid "%1$s Horiz Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1983
+#: src/emu/ui/ui.cpp:1980
 #, c-format
 msgid "%1$s Horiz Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1985
+#: src/emu/ui/ui.cpp:1982
 #, c-format
 msgid "%1$s Vert Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1987
+#: src/emu/ui/ui.cpp:1984
 #, c-format
 msgid "%1$s Vert Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2005
+#: src/emu/ui/ui.cpp:2002
 #, c-format
 msgid "Laserdisc '%1$s' Horiz Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2007
+#: src/emu/ui/ui.cpp:2004
 #, c-format
 msgid "Laserdisc '%1$s' Horiz Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2009
+#: src/emu/ui/ui.cpp:2006
 #, c-format
 msgid "Laserdisc '%1$s' Vert Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2011
+#: src/emu/ui/ui.cpp:2008
 #, c-format
 msgid "Laserdisc '%1$s' Vert Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2021
+#: src/emu/ui/ui.cpp:2018
 msgid "Vector Flicker"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2022
+#: src/emu/ui/ui.cpp:2019
 msgid "Beam Width Minimum"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2023
+#: src/emu/ui/ui.cpp:2020
 msgid "Beam Width Maximum"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2024
+#: src/emu/ui/ui.cpp:2021
 msgid "Beam Intensity Weight"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2037
+#: src/emu/ui/ui.cpp:2034
 #, c-format
 msgid "Crosshair Scale %1$s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2037 src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2034 src/emu/ui/ui.cpp:2036
 msgid "X"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2037 src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2034 src/emu/ui/ui.cpp:2036
 msgid "Y"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2039
+#: src/emu/ui/ui.cpp:2036
 #, c-format
 msgid "Crosshair Offset %1$s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2071
+#: src/emu/ui/ui.cpp:2068
 #, c-format
 msgid "%1$3ddB"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2115
+#: src/emu/ui/ui.cpp:2112
 #, c-format
 msgid "%1$d%%"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2131
+#: src/emu/ui/ui.cpp:2128
 #, c-format
 msgid "%1$3.0f%%"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2154
+#: src/emu/ui/ui.cpp:2151
 #, c-format
 msgid "%1$.3ffps"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2177 src/emu/ui/ui.cpp:2199 src/emu/ui/ui.cpp:2220
-#: src/emu/ui/ui.cpp:2242 src/emu/ui/ui.cpp:2264 src/emu/ui/ui.cpp:2286
-#: src/emu/ui/ui.cpp:2308 src/emu/ui/ui.cpp:2330 src/emu/ui/ui.cpp:2352
-#: src/emu/ui/ui.cpp:2374 src/emu/ui/ui.cpp:2396
+#: src/emu/ui/ui.cpp:2174 src/emu/ui/ui.cpp:2196 src/emu/ui/ui.cpp:2217
+#: src/emu/ui/ui.cpp:2239 src/emu/ui/ui.cpp:2261 src/emu/ui/ui.cpp:2283
+#: src/emu/ui/ui.cpp:2305 src/emu/ui/ui.cpp:2327 src/emu/ui/ui.cpp:2349
+#: src/emu/ui/ui.cpp:2371 src/emu/ui/ui.cpp:2393
 #, c-format
 msgid "%1$.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2412 src/emu/ui/ui.cpp:2428 src/emu/ui/ui.cpp:2444
-#: src/emu/ui/ui.cpp:2460
+#: src/emu/ui/ui.cpp:2408 src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2438
+#: src/emu/ui/ui.cpp:2453
 #, c-format
 msgid "%1$1.2f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2476
+#: src/emu/ui/ui.cpp:2469
 #, c-format
 msgid "Screen '%1$s'"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2478
+#: src/emu/ui/ui.cpp:2471
 msgid "Screen"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2494
+#: src/emu/ui/ui.cpp:2487
 #, c-format
 msgid "Crosshair Scale X %1$1.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2494
+#: src/emu/ui/ui.cpp:2487
 #, c-format
 msgid "Crosshair Scale Y %1$1.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2513
+#: src/emu/ui/ui.cpp:2506
 #, c-format
 msgid "Crosshair Offset X %1$1.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2513
+#: src/emu/ui/ui.cpp:2506
 #, c-format
 msgid "Crosshair Offset Y %1$1.3f"
 msgstr ""
@@ -1864,10 +1880,10 @@ msgstr ""
 msgid "Full"
 msgstr ""
 
-#: src/emu/ui/viewgfx.cpp:392
+#: src/emu/ui/viewgfx.cpp:391
 msgid " COLORS"
 msgstr ""
 
-#: src/emu/ui/viewgfx.cpp:392
+#: src/emu/ui/viewgfx.cpp:391
 msgid " PENS"
 msgstr ""

From c3735cd12c56dc850e9ca6072dd2fecfe0d40f5f Mon Sep 17 00:00:00 2001
From: cracyc <cracyc@users.noreply.github.com>
Date: Fri, 15 Apr 2016 11:35:21 -0500
Subject: [PATCH 019/122] plugins/cheat: fix some stuff (nw)

---
 plugins/cheat/init.lua     |  60 ++++++++++++++++
 plugins/cheatfind/init.lua |   2 +-
 src/emu/luaengine.cpp      | 136 ++++++++++++++++++++++++-------------
 src/emu/luaengine.h        |   7 +-
 4 files changed, 154 insertions(+), 51 deletions(-)

diff --git a/plugins/cheat/init.lua b/plugins/cheat/init.lua
index 35717e3bb0b..c15b662675f 100644
--- a/plugins/cheat/init.lua
+++ b/plugins/cheat/init.lua
@@ -67,6 +67,7 @@ function cheat.startplugin()
 	local output = {}
 	local line = 0
 	local start_time = 0
+	local stop = true
 
 	local function load_cheats()
 		local filename = emu.romname()
@@ -308,10 +309,40 @@ function cheat.startplugin()
 				end
 			end
 		end
+		menu[#menu + 1] = {"---", "", 0}
+		menu[#menu + 1] = {"Reset All", "", 0}
+		menu[#menu + 1] = {"Reload All", "", 0}
 		return menu
 	end
 
 	local function menu_callback(index, event)
+		if index > #cheats and event == "select" then
+			index = index - #cheats
+			if index == 2 then
+				for num, cheat in pairs(cheats) do
+					if cheat.script and cheat.script.off then
+						cheat.script.off()
+					end
+					cheat.enabled = false
+					if cheat.parameter then
+						cheat.parameter.value = cheat.parameter.min
+						cheat.parameter.index = 0
+					end
+				end
+			elseif index == 3 then
+				for num, cheat in pairs(cheats) do 
+					if cheat.script and cheat.script.off then
+						cheat.script.off()
+					end
+				end
+				cheats = load_cheats()
+				for num, cheat in pairs(cheats) do
+					parse_cheat(cheat)
+				end
+			end
+			return true
+		end
+
 		local function param_calc(param)
 			if param.item then
 				if not param.item[param.index] then -- uh oh
@@ -429,6 +460,10 @@ function cheat.startplugin()
 			  end, "Cheat")
 
 	emu.register_start(function()
+		if not stop then
+			return
+		end
+		stop = false
 		start_time = emu.time()
 		cheats = load_cheats()
 		for num, cheat in pairs(cheats) do
@@ -436,7 +471,14 @@ function cheat.startplugin()
 		end
 	end)
 
+	emu.register_stop(function()
+		stop = true
+	end)
+
 	emu.register_frame(function()
+		if stop then
+			return
+		end
 		for num, cheat in pairs(cheats) do
 			if cheat.enabled and cheat.script.run then
 				cheat.script.run()
@@ -445,6 +487,9 @@ function cheat.startplugin()
 	end)
 
 	emu.register_frame_done(function()
+		if stop then
+			return
+		end
 		line = 0
 		for num, draw in pairs(output) do
 			if draw.type == "text" then
@@ -471,6 +516,21 @@ function cheat.startplugin()
 		manager:machine():popmessage(newcheat.desc .. " added")
 	end
 
+	function ce.dump(index)
+		cheat = cheats[index]
+		if cheat then
+			for k, v in pairs(cheat.cheat_env) do
+				print(k, v)
+			end
+		end
+	end
+
+	function ce.list()
+		for num, cheat in pairs(cheats) do
+			print(num, cheat.desc)
+		end
+	end
+
 	_G.ce = ce
 
 end
diff --git a/plugins/cheatfind/init.lua b/plugins/cheatfind/init.lua
index eadcb5b6c42..49195ed060c 100644
--- a/plugins/cheatfind/init.lua
+++ b/plugins/cheatfind/init.lua
@@ -481,7 +481,7 @@ function cheatfind.startplugin()
 					if not _G.ce then
 						manager:machine():popmessage("Cheat engine not available")
 					else
-						ce.inject(cheat)
+						_G.ce.inject(cheat)
 					end
 				else
 
diff --git a/src/emu/luaengine.cpp b/src/emu/luaengine.cpp
index b1ebf60d88a..08482eccd5c 100644
--- a/src/emu/luaengine.cpp
+++ b/src/emu/luaengine.cpp
@@ -999,15 +999,6 @@ int lua_engine::lua_addr_space::l_mem_write(lua_State *L)
 //  -> manager:machine().devices[":maincpu"].spaces["program"]:read_direct_i8(0xC000)
 //-------------------------------------------------
 
-UINT8 lua_engine::read_direct_byte(address_space &space, offs_t addr)
-{
-	UINT8 *base = (UINT8 *)space.get_read_ptr(space.address_to_byte(addr));
-	if(base)
-		return base[addr];
-	else
-		return 0;
-}
-
 template <typename T>
 int lua_engine::lua_addr_space::l_direct_mem_read(lua_State *L)
 {
@@ -1015,15 +1006,18 @@ int lua_engine::lua_addr_space::l_direct_mem_read(lua_State *L)
 	luaL_argcheck(L, lua_isnumber(L, 2), 2, "address (integer) expected");
 	offs_t address = lua_tounsigned(L, 2);
 	T mem_content = 0;
+	offs_t lowmask = sp.data_width() / 8 - 1;
 	for(int i = 0; i < sizeof(T); i++)
 	{
-		UINT8 byte;
+		int addr = sp.endianness() == ENDIANNESS_LITTLE ? address + sizeof(T) - 1 - i : address + i;
+		UINT8 *base = (UINT8 *)sp.get_read_ptr(sp.address_to_byte(addr & ~lowmask));
+		if(!base)
+			continue;
 		mem_content <<= 8;
 		if(sp.endianness() == ENDIANNESS_BIG)
-			byte = read_direct_byte(sp, address + sizeof(T) - i);
+			mem_content |= base[BYTE8_XOR_BE(addr) & lowmask];
 		else
-			byte = read_direct_byte(sp, address + i);
-		mem_content |= byte;
+			mem_content |= base[BYTE8_XOR_LE(addr) & lowmask];
 	}
 
 	if (std::numeric_limits<T>::is_signed) {
@@ -1040,13 +1034,6 @@ int lua_engine::lua_addr_space::l_direct_mem_read(lua_State *L)
 //  -> manager:machine().devices[":maincpu"].spaces["program"]:write_direct_u16(0xC000, 0xF00D)
 //-------------------------------------------------
 
-void lua_engine::write_direct_byte(address_space &space, offs_t addr, UINT8 byte)
-{
-	UINT8 *base = (UINT8 *)space.get_read_ptr(space.address_to_byte(addr));
-	if(base)
-		base[addr] = byte;
-}
-
 template <typename T>
 int lua_engine::lua_addr_space::l_direct_mem_write(lua_State *L)
 {
@@ -1055,12 +1042,17 @@ int lua_engine::lua_addr_space::l_direct_mem_write(lua_State *L)
 	luaL_argcheck(L, lua_isnumber(L, 3), 3, "value (integer) expected");
 	offs_t address = lua_tounsigned(L, 2);
 	T val = lua_tounsigned(L, 3);
+	offs_t lowmask = sp.data_width() / 8 - 1;
 	for(int i = 0; i < sizeof(T); i++)
 	{
+		int addr = sp.endianness() == ENDIANNESS_BIG ? address + sizeof(T) - 1 - i : address + i;
+		UINT8 *base = (UINT8 *)sp.get_read_ptr(sp.address_to_byte(addr & ~lowmask));
+		if(!base)
+			continue;
 		if(sp.endianness() == ENDIANNESS_BIG)
-			write_direct_byte(sp, address + sizeof(T) - i, val & 0xff);
+			base[BYTE8_XOR_BE(addr) & lowmask] = val & 0xff;
 		else
-			write_direct_byte(sp, address + i, val & 0xff);
+			base[BYTE8_XOR_LE(addr) & lowmask] = val & 0xff;
 		val >>= 8;
 	}
 
@@ -1072,14 +1064,6 @@ int lua_engine::lua_addr_space::l_direct_mem_write(lua_State *L)
 //  -> manager:machine():memory().region[":maincpu"]:read_i8(0xC000)
 //-------------------------------------------------
 
-UINT8 lua_engine::read_region_byte(memory_region &region, offs_t addr)
-{
-	if(addr >= region.bytes())
-		return 0;
-
-	return region.u8(addr);
-}
-
 template <typename T>
 int lua_engine::lua_memory_region::l_region_read(lua_State *L)
 {
@@ -1087,15 +1071,17 @@ int lua_engine::lua_memory_region::l_region_read(lua_State *L)
 	luaL_argcheck(L, lua_isnumber(L, 2), 2, "address (integer) expected");
 	offs_t address = lua_tounsigned(L, 2);
 	T mem_content = 0;
+	offs_t lowmask = region.bytewidth() - 1;
 	for(int i = 0; i < sizeof(T); i++)
 	{
-		UINT8 byte;
+		int addr = region.endianness() == ENDIANNESS_LITTLE ? address + sizeof(T) - 1 - i : address + i;
+		if(addr >= region.bytes())
+			continue;
 		mem_content <<= 8;
 		if(region.endianness() == ENDIANNESS_BIG)
-			byte = read_region_byte(region, address + sizeof(T) - i);
+			mem_content |= region.u8((BYTE8_XOR_BE(addr) & lowmask) | (addr & ~lowmask));
 		else
-			byte = read_region_byte(region, address + i);
-		mem_content |= byte;
+			mem_content |= region.u8((BYTE8_XOR_LE(addr) & lowmask) | (addr & ~lowmask));
 	}
 
 	if (std::numeric_limits<T>::is_signed) {
@@ -1112,14 +1098,6 @@ int lua_engine::lua_memory_region::l_region_read(lua_State *L)
 //  -> manager:machine():memory().region[":maincpu"]:write_u16(0xC000, 0xF00D)
 //-------------------------------------------------
 
-void lua_engine::write_region_byte(memory_region &region, offs_t addr, UINT8 byte)
-{
-	if(addr >= region.bytes())
-		return;
-
-	region.base()[addr] = byte;
-}
-
 template <typename T>
 int lua_engine::lua_memory_region::l_region_write(lua_State *L)
 {
@@ -1128,12 +1106,16 @@ int lua_engine::lua_memory_region::l_region_write(lua_State *L)
 	luaL_argcheck(L, lua_isnumber(L, 3), 3, "value (integer) expected");
 	offs_t address = lua_tounsigned(L, 2);
 	T val = lua_tounsigned(L, 3);
+	offs_t lowmask = region.bytewidth() - 1;
 	for(int i = 0; i < sizeof(T); i++)
 	{
+		int addr = region.endianness() == ENDIANNESS_BIG ? address + sizeof(T) - 1 - i : address + i;
+		if(addr >= region.bytes())
+			continue;
 		if(region.endianness() == ENDIANNESS_BIG)
-			write_region_byte(region, address + sizeof(T) - i, val & 0xff);
+			region.base()[(BYTE8_XOR_BE(addr) & lowmask) | (addr & ~lowmask)] = val & 0xff;
 		else
-			write_region_byte(region, address + i, val & 0xff);
+			region.base()[(BYTE8_XOR_BE(addr) & lowmask) | (addr & ~lowmask)] = val & 0xff;
 		val >>= 8;
 	}
 
@@ -1738,6 +1720,68 @@ lua_engine::~lua_engine()
 	close();
 }
 
+int lua_engine::compile_with_env(const char *env, const char *script)
+{
+	std::string field = std::string("env_").append(env);
+	lua_settop(m_lua_state, 0);
+	lua_getfield(m_lua_state, LUA_REGISTRYINDEX, field.c_str());
+
+	if(!lua_istable(m_lua_state, -1))
+	{
+		emu_file file(m_machine->manager().options().plugins_path(), OPEN_FLAG_READ);
+		// optionally load a script to prepare the environment
+		if(file.open(env, ".lua") != osd_file::error::NONE)
+		{
+			int error = luaL_loadfile(m_lua_state, file.fullpath());
+			if(error || (error = lua_pcall(m_lua_state, 0, 0, 0) != LUA_OK))
+			{
+				if(error == LUA_ERRRUN)
+					printf("%s\n", lua_tostring(m_lua_state, -1));
+				lua_pop(m_lua_state, 1);
+			}
+		}
+		if(!lua_istable(m_lua_state, -1))
+			lua_newtable(m_lua_state);
+		lua_setfield(m_lua_state, LUA_REGISTRYINDEX, field.c_str());
+		lua_getfield(m_lua_state, LUA_REGISTRYINDEX, field.c_str());
+	}
+
+	if(int error = luaL_loadstring(m_lua_state, script) != LUA_OK)
+	{
+		if(error == LUA_ERRSYNTAX)
+			printf("%s\n", lua_tostring(m_lua_state, -1));
+		lua_tostring(m_lua_state, -1);
+		lua_pop(m_lua_state, 2);
+		return -1;
+	}
+	lua_pushvalue(m_lua_state, -2);
+	lua_setupvalue(m_lua_state, -2, 1);
+	int ref = luaL_ref(m_lua_state, -2);
+	lua_pop(m_lua_state, 1);
+	return ref;
+}
+
+void lua_engine::run(const char *env, int ref)
+{
+	std::string field = std::string("env_").append(env);
+	lua_settop(m_lua_state, 0);
+	lua_getfield(m_lua_state, LUA_REGISTRYINDEX, field.c_str());
+	if(lua_istable(m_lua_state, -1))
+	{
+		lua_rawgeti(m_lua_state, -1, ref);
+		if(lua_isfunction(m_lua_state, -1))
+		{
+			if(int error = lua_pcall(m_lua_state, 0, 0, 0) != LUA_OK)
+			{
+				if(error == LUA_ERRRUN)
+					printf("%s\n", lua_tostring(m_lua_state, -1));
+				lua_pop(m_lua_state, 1);
+			}
+		}
+		lua_pop(m_lua_state, 1);
+	}
+	lua_pop(m_lua_state, 1);
+}
 void lua_engine::menu_populate(std::string &menu, std::vector<menu_item> &menu_list)
 {
 	std::string field = "menu_pop_" + menu;
@@ -1749,9 +1793,9 @@ void lua_engine::menu_populate(std::string &menu, std::vector<menu_item> &menu_l
 		lua_pop(m_lua_state, 1);
 		return;
 	}
-	if(int error = lua_pcall(m_lua_state, 0, 1, 0))
+	if(int error = lua_pcall(m_lua_state, 0, 1, 0) != LUA_OK)
 	{
-		if(error == 2)
+		if(error == LUA_ERRRUN)
 			printf("%s\n", lua_tostring(m_lua_state, -1));
 		lua_pop(m_lua_state, 1);
 		return;
diff --git a/src/emu/luaengine.h b/src/emu/luaengine.h
index aaa774d00e6..721f9728c7b 100644
--- a/src/emu/luaengine.h
+++ b/src/emu/luaengine.h
@@ -63,6 +63,9 @@ public:
 	void attach_notifiers();
 	void on_frame_done();
 
+	int compile_with_env(const char *env, const char *script);
+	void run(const char *env, int ref);
+
 private:
 	struct hook {
 		lua_State *L;
@@ -153,8 +156,6 @@ private:
 		int l_popmessage(lua_State *L);
 		int l_logerror(lua_State *L);
 	};
-	static UINT8 read_direct_byte(address_space &space, offs_t addr);
-	static void write_direct_byte(address_space &space, offs_t addr, UINT8 byte);
 	struct lua_addr_space {
 		template<typename T> int l_mem_read(lua_State *L);
 		template<typename T> int l_mem_write(lua_State *L);
@@ -194,8 +195,6 @@ private:
 
 	static luabridge::LuaRef l_memory_get_banks(const memory_manager *m);
 	static luabridge::LuaRef l_memory_get_regions(const memory_manager *m);
-	static UINT8 read_region_byte(memory_region &region, offs_t addr);
-	static void write_region_byte(memory_region &region, offs_t addr, UINT8 byte);
 	struct lua_memory_region {
 		template<typename T> int l_region_read(lua_State *L);
 		template<typename T> int l_region_write(lua_State *L);

From 8c8aca795ec3090271a0ac0d2a6197fb33a33303 Mon Sep 17 00:00:00 2001
From: dankan1890 <mewuidev2@gmail.com>
Date: Fri, 15 Apr 2016 19:23:17 +0200
Subject: [PATCH 020/122] added advanced options to per-machine configuration.
 (nw)

---
 src/emu/ui/miscmenu.cpp | 5 +++++
 src/emu/ui/miscmenu.h   | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/emu/ui/miscmenu.cpp b/src/emu/ui/miscmenu.cpp
index 3ae58da9aa4..75ffd0a7645 100644
--- a/src/emu/ui/miscmenu.cpp
+++ b/src/emu/ui/miscmenu.cpp
@@ -747,6 +747,10 @@ void ui_menu_machine_configure::handle()
 					if (m_event->iptkey == IPT_UI_SELECT)
 						ui_menu::stack_push(global_alloc_clear<ui_submenu>(machine(), container, video_submenu_options, m_drv, &m_opts));
 					break;
+				case ADVANCED:
+					if (m_event->iptkey == IPT_UI_SELECT)
+						ui_menu::stack_push(global_alloc_clear<ui_submenu>(machine(), container, advanced_submenu_options, m_drv, &m_opts));
+					break;
 				default:
 					break;
 			}
@@ -777,6 +781,7 @@ void ui_menu_machine_configure::populate()
 	}
 
 	item_append(ui_menu_item_type::SEPARATOR);
+	item_append(_(advanced_submenu_options[0].description), nullptr, 0, (void *)(FPTR)ADVANCED);
 	item_append(_(video_submenu_options[0].description), nullptr, 0, (void *)(FPTR)VIDEO);
 	item_append(_(control_submenu_options[0].description), nullptr, 0, (void *)(FPTR)CONTROLLER);
 	item_append(ui_menu_item_type::SEPARATOR);
diff --git a/src/emu/ui/miscmenu.h b/src/emu/ui/miscmenu.h
index c8881cbaf8d..f2fb394784d 100644
--- a/src/emu/ui/miscmenu.h
+++ b/src/emu/ui/miscmenu.h
@@ -126,7 +126,8 @@ private:
 		CONTROLLER,
 		VIDEO,
 		BIOS,
-		LAST = BIOS
+		ADVANCED,
+		LAST = ADVANCED
 	};
 	const game_driver *m_drv;
 	emu_options m_opts;

From be6c71451b99e0d139b05304137d2023eec2b8b8 Mon Sep 17 00:00:00 2001
From: Ville Linde <villedevs@gmail.com>
Date: Fri, 15 Apr 2016 21:33:01 +0300
Subject: [PATCH 021/122] drcbex64: wrong register type (nw)

---
 src/devices/cpu/drcbex64.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/devices/cpu/drcbex64.cpp b/src/devices/cpu/drcbex64.cpp
index 9fe3b984469..a8fea0ed27e 100644
--- a/src/devices/cpu/drcbex64.cpp
+++ b/src/devices/cpu/drcbex64.cpp
@@ -5954,7 +5954,7 @@ void drcbe_x64::op_fmov(x86code *&dst, const instruction &inst)
 	{
 		if (srcp.is_float_register())
 		{
-			emit_movss_p32_r128(dst, dstp, srcp.ireg());                                // movss dstp,srcp
+			emit_movss_p32_r128(dst, dstp, srcp.freg());                                // movss dstp,srcp
 		}
 		else
 		{
@@ -5968,7 +5968,7 @@ void drcbe_x64::op_fmov(x86code *&dst, const instruction &inst)
 	{
 		if (srcp.is_float_register())
 		{
-			emit_movsd_p64_r128(dst, dstp, srcp.ireg());                                // movsd dstp,srcp
+			emit_movsd_p64_r128(dst, dstp, srcp.freg());                                // movsd dstp,srcp
 		}
 		else
 		{

From 9a5f90d2fb98fb6d61b1dd46a6a70424356051f0 Mon Sep 17 00:00:00 2001
From: Lothar Serra Mari <scummvm@rootfather.de>
Date: Fri, 15 Apr 2016 21:05:25 +0200
Subject: [PATCH 022/122] Update German GUI translation

---
 language/German/strings.po | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/language/German/strings.po b/language/German/strings.po
index fb604dc9ed7..7ba7b63f240 100644
--- a/language/German/strings.po
+++ b/language/German/strings.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: MAME\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-04-15 17:42+0200\n"
-"PO-Revision-Date: 2016-04-11 09:57+0200\n"
+"PO-Revision-Date: 2016-04-15 21:04+0200\n"
 "Last-Translator: Lothar Serra Mari <scummvm@rootfather.de>\n"
 "Language-Team: MAME Language Team\n"
 "Language: de\n"
@@ -893,15 +893,16 @@ msgstr "%s.txt im Ordner der Benutzeroberfläche gespeichert."
 
 #: src/emu/ui/miscmenu.cpp:677
 msgid "Export list in XML format (like -listxml)"
-msgstr ""
+msgstr "Liste im XML-Format exportieren (wie -listxml)"
 
 #: src/emu/ui/miscmenu.cpp:678
 msgid "Export list in XML format (like -listxml, but exclude devices)"
 msgstr ""
+"Liste im XML-Format exportieren (wie -listxml, Geräte jedoch ausschließen)"
 
 #: src/emu/ui/miscmenu.cpp:679
 msgid "Export list in TXT format (like -listfull)"
-msgstr ""
+msgstr "Liste im TXT-Format exportieren (wie -listfull)"
 
 #: src/emu/ui/miscmenu.cpp:729 src/emu/ui/optsmenu.cpp:376
 msgid ""
@@ -915,11 +916,11 @@ msgstr ""
 
 #: src/emu/ui/miscmenu.cpp:774
 msgid "Bios"
-msgstr ""
+msgstr "BIOS"
 
 #: src/emu/ui/miscmenu.cpp:776
 msgid "Driver"
-msgstr ""
+msgstr "Treiber"
 
 #: src/emu/ui/miscmenu.cpp:790
 msgid "Save machine configuration"
@@ -927,7 +928,7 @@ msgstr "Konfiguration der Maschine speichern"
 
 #: src/emu/ui/miscmenu.cpp:806
 msgid "Configure machine:"
-msgstr ""
+msgstr "Maschine konfigurieren:"
 
 #: src/emu/ui/miscmenu.cpp:868 src/emu/ui/selsoft.cpp:109
 msgid " (default)"
@@ -1317,7 +1318,7 @@ msgstr ""
 #: src/emu/ui/selsoft.cpp:683
 #, c-format
 msgid "%1$s %2$s ( %3$d / %4$d software packages )"
-msgstr ""
+msgstr "%1$s %2$s ( %3$d / %4$d Programm-Pakete )"
 
 #: src/emu/ui/selsoft.cpp:684
 #, c-format

From c726ed070334d02fc03ee489360696146e546314 Mon Sep 17 00:00:00 2001
From: aviloria <aviloria@yahoo.com>
Date: Fri, 15 Apr 2016 21:22:59 +0200
Subject: [PATCH 023/122] Update strings.po

Spanish translation updated
---
 language/Spanish/strings.po | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/language/Spanish/strings.po b/language/Spanish/strings.po
index 5ab915cf4a9..23c1935708d 100644
--- a/language/Spanish/strings.po
+++ b/language/Spanish/strings.po
@@ -408,7 +408,7 @@ msgstr "Puntuación MAME"
 
 #: src/emu/ui/datmenu.cpp:294 src/emu/ui/selgame.cpp:44
 msgid "Gameinit"
-msgstr ""
+msgstr "Inicio de partida"
 
 #: src/emu/ui/datmenu.cpp:296 src/emu/ui/selgame.cpp:43
 msgid "Command"
@@ -757,7 +757,7 @@ msgstr "Truco"
 
 #: src/emu/ui/mainmenu.cpp:135
 msgid "Plugin Options"
-msgstr ""
+msgstr "Configuración del plugin"
 
 #: src/emu/ui/mainmenu.cpp:139
 msgid "External DAT View"
@@ -895,15 +895,15 @@ msgstr "%s.txt guardado en la carpeta «ui»."
 
 #: src/emu/ui/miscmenu.cpp:677
 msgid "Export list in XML format (like -listxml)"
-msgstr ""
+msgstr "Exportar lista en formato XML (igual que -listxml)"
 
 #: src/emu/ui/miscmenu.cpp:678
 msgid "Export list in XML format (like -listxml, but exclude devices)"
-msgstr ""
+msgstr "Exportar lista en formato XML (igual que -listxml, pero excluyendo los dispositivos)"
 
 #: src/emu/ui/miscmenu.cpp:679
 msgid "Export list in TXT format (like -listfull)"
-msgstr ""
+msgstr "Exportar lista en formato TXT (igual que -listfull)"
 
 #: src/emu/ui/miscmenu.cpp:729 src/emu/ui/optsmenu.cpp:376
 msgid ""
@@ -929,7 +929,7 @@ msgstr "Guardar ajustes de máquina"
 
 #: src/emu/ui/miscmenu.cpp:806
 msgid "Configure machine:"
-msgstr ""
+msgstr "Configurar máquina:"
 
 #: src/emu/ui/miscmenu.cpp:868 src/emu/ui/selsoft.cpp:109
 msgid " (default)"
@@ -1029,6 +1029,10 @@ msgid ""
 "\n"
 "Press any key to continue."
 msgstr ""
+"Falta la máquina seleccionada o una o más de sus ROMs o imágenes CHD. "
+"Por favor, elige otra máquina.\n"
+"\n"
+"Pulsa cualquier tecla para continuar."
 
 #: src/emu/ui/selgame.cpp:595 src/emu/ui/simpleselgame.cpp:265
 msgid "Configure Options"
@@ -1307,11 +1311,15 @@ msgid ""
 "\n"
 "Press any key to continue."
 msgstr ""
+"Al software elegido le falta uno o varios archivos necesarios. Por favor, "
+"elige otro software.\n"
+"\n"
+"Pulsa cualquier tecla para continuar."
 
 #: src/emu/ui/selsoft.cpp:683
 #, c-format
 msgid "%1$s %2$s ( %3$d / %4$d software packages )"
-msgstr ""
+msgstr "%1$s %2$s ( %3$d / %4$d paquetes de software )"
 
 #: src/emu/ui/selsoft.cpp:684
 #, c-format
@@ -1610,6 +1618,9 @@ msgid ""
 "\n"
 "Press any key to continue"
 msgstr ""
+"\n"
+"\n"
+"Pulsa cualquier tecla para continuar"
 
 #: src/emu/ui/ui.cpp:1182
 #, c-format

From 2fd03fc2c82a8159b328ae3d0aae4247c4d32d06 Mon Sep 17 00:00:00 2001
From: hap <happppp@users.noreply.github.com>
Date: Fri, 15 Apr 2016 21:53:49 +0200
Subject: [PATCH 024/122] tms1700: fixed rom/ram addressing

---
 src/devices/cpu/tms1000/tms1000.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/devices/cpu/tms1000/tms1000.cpp b/src/devices/cpu/tms1000/tms1000.cpp
index 3058e9f8c04..b37a43b1b48 100644
--- a/src/devices/cpu/tms1000/tms1000.cpp
+++ b/src/devices/cpu/tms1000/tms1000.cpp
@@ -3,9 +3,6 @@
 /*
 
   TMS1000 family - TMS1000, TMS1070, TMS1040, TMS1200, TMS1700, TMS1730
-  
-  TODO:
-  - which O pins are connected on TMS1730?
 
 */
 
@@ -27,7 +24,7 @@ const device_type TMS1040 = &device_creator<tms1040_cpu_device>; // same as TMS1
 const device_type TMS1200 = &device_creator<tms1200_cpu_device>; // 40-pin DIP, 13 R pins
 // TMS1270 has 10 O pins, how does that work?
 const device_type TMS1700 = &device_creator<tms1000_cpu_device>; // 28-pin DIP, RAM/ROM size halved, 9 R pins
-const device_type TMS1730 = &device_creator<tms1000_cpu_device>; // 20-pin DIP, same die as TMS1700, package has less pins: 6 R pins, 5 O pins
+const device_type TMS1730 = &device_creator<tms1000_cpu_device>; // 20-pin DIP, same die as TMS1700, package has less pins: 6 R pins, 5 O pins(output PLA is still 8-bit, O1,O3,O5 unused)
 
 
 // internal memory maps
@@ -36,7 +33,7 @@ static ADDRESS_MAP_START(program_10bit_8, AS_PROGRAM, 8, tms1k_base_device)
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START(program_9bit_8, AS_PROGRAM, 8, tms1k_base_device)
-	AM_RANGE(0x000, 0x1ff) AM_ROM
+	AM_RANGE(0x000, 0x1ff) AM_MIRROR(0x200) AM_ROM
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START(data_64x4, AS_DATA, 8, tms1k_base_device)
@@ -44,7 +41,10 @@ static ADDRESS_MAP_START(data_64x4, AS_DATA, 8, tms1k_base_device)
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START(data_32x4, AS_DATA, 8, tms1k_base_device)
-	AM_RANGE(0x00, 0x1f) AM_RAM
+	AM_RANGE(0x00, 0x07) AM_MIRROR(0x08) AM_RAM
+	AM_RANGE(0x10, 0x17) AM_MIRROR(0x08) AM_RAM
+	AM_RANGE(0x20, 0x27) AM_MIRROR(0x08) AM_RAM
+	AM_RANGE(0x30, 0x37) AM_MIRROR(0x08) AM_RAM
 ADDRESS_MAP_END
 
 
@@ -70,11 +70,11 @@ tms1200_cpu_device::tms1200_cpu_device(const machine_config &mconfig, const char
 { }
 
 tms1700_cpu_device::tms1700_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: tms1000_cpu_device(mconfig, TMS1700, "TMS1700", tag, owner, clock, 8, 9, 5, 8, 1, 10, ADDRESS_MAP_NAME(program_9bit_8), 6, ADDRESS_MAP_NAME(data_32x4), "tms1700", __FILE__)
+	: tms1000_cpu_device(mconfig, TMS1700, "TMS1700", tag, owner, clock, 8, 9, 6, 8, 2, 10, ADDRESS_MAP_NAME(program_9bit_8), 6, ADDRESS_MAP_NAME(data_32x4), "tms1700", __FILE__)
 { }
 
 tms1730_cpu_device::tms1730_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: tms1000_cpu_device(mconfig, TMS1730, "TMS1730", tag, owner, clock, 8, 9, 5, 8, 1, 10, ADDRESS_MAP_NAME(program_9bit_8), 6, ADDRESS_MAP_NAME(data_32x4), "tms1730", __FILE__)
+	: tms1000_cpu_device(mconfig, TMS1730, "TMS1730", tag, owner, clock, 8, 9, 6, 8, 2, 10, ADDRESS_MAP_NAME(program_9bit_8), 6, ADDRESS_MAP_NAME(data_32x4), "tms1730", __FILE__)
 { }
 
 

From aae47ddb1c20db83e18a19a0f00118fdca54c7ee Mon Sep 17 00:00:00 2001
From: Jordi Mallach <jordi@mallach.net>
Date: Sat, 16 Apr 2016 00:33:34 +0200
Subject: [PATCH 025/122] Make display_help() use exename to print MAME's
 program name.

Rework commit 658a4b1 to use exename instead of appname.
---
 src/emu/clifront.cpp | 10 +++++-----
 src/emu/clifront.h   |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/emu/clifront.cpp b/src/emu/clifront.cpp
index e2fe703adca..676c088a757 100644
--- a/src/emu/clifront.cpp
+++ b/src/emu/clifront.cpp
@@ -1586,7 +1586,7 @@ void cli_frontend::execute_commands(const char *exename)
 	// help?
 	if (strcmp(m_options.command(), CLICOMMAND_HELP) == 0)
 	{
-		display_help();
+		display_help(exename);
 		return;
 	}
 
@@ -1707,20 +1707,20 @@ void cli_frontend::execute_commands(const char *exename)
 //  output
 //-------------------------------------------------
 
-void cli_frontend::display_help()
+void cli_frontend::display_help(const char *exename)
 {
 	osd_printf_info("%s v%s\n%s\n\n", emulator_info::get_appname(),build_version,emulator_info::get_copyright_info());
 	osd_printf_info("This software reproduces, more or less faithfully, the behaviour of a wide range\n"
 					"of machines. But hardware is useless without software, so images of the ROMs and\n"
 					"other media which run on that hardware are also required.\n\n");
-	osd_printf_info("Usage:  %s [machine] [media] [software] [options]",emulator_info::get_appname_lower());
+	osd_printf_info("Usage:  %s [machine] [media] [software] [options]",exename);
 	osd_printf_info("\n\n"
 			"        %s -showusage    for a brief list of options\n"
 			"        %s -showconfig   for a list of configuration options\n"
 			"        %s -listmedia    for a full list of supported media\n"
 			"        %s -createconfig to create a %s.ini\n\n"
-			"For usage instructions, please consult the files config.txt and windows.txt.\n",emulator_info::get_appname_lower(),
-			emulator_info::get_appname_lower(),emulator_info::get_appname_lower(),emulator_info::get_appname_lower(),emulator_info::get_configname());
+			"For usage instructions, please consult the files config.txt and windows.txt.\n",exename,
+			exename,exename,exename,emulator_info::get_configname());
 }
 
 
diff --git a/src/emu/clifront.h b/src/emu/clifront.h
index 584261660db..b38a6361b18 100644
--- a/src/emu/clifront.h
+++ b/src/emu/clifront.h
@@ -59,7 +59,7 @@ public:
 private:
 	// internal helpers
 	void execute_commands(const char *exename);
-	void display_help();
+	void display_help(const char *exename);
 	void display_suggestions(const char *gamename);
 	void output_single_softlist(FILE *out, software_list_device &swlist);
 

From 6d27bfb25d6ea023ecd3c12ec15d58f06ab1e29c Mon Sep 17 00:00:00 2001
From: hap <happppp@users.noreply.github.com>
Date: Sat, 16 Apr 2016 03:01:13 +0200
Subject: [PATCH 026/122] hh_tms1k: added copycatm2. not working yet

---
 src/devices/cpu/tms1000/tms1000.cpp |  4 +-
 src/mame/drivers/hh_tms1k.cpp       | 82 ++++++++++++++++++++++++++++-
 src/mame/mame.lst                   |  1 +
 3 files changed, 83 insertions(+), 4 deletions(-)

diff --git a/src/devices/cpu/tms1000/tms1000.cpp b/src/devices/cpu/tms1000/tms1000.cpp
index b37a43b1b48..6685105d8f0 100644
--- a/src/devices/cpu/tms1000/tms1000.cpp
+++ b/src/devices/cpu/tms1000/tms1000.cpp
@@ -23,8 +23,8 @@ const device_type TMS1070 = &device_creator<tms1070_cpu_device>; // high voltage
 const device_type TMS1040 = &device_creator<tms1040_cpu_device>; // same as TMS1070 with just a different pinout?
 const device_type TMS1200 = &device_creator<tms1200_cpu_device>; // 40-pin DIP, 13 R pins
 // TMS1270 has 10 O pins, how does that work?
-const device_type TMS1700 = &device_creator<tms1000_cpu_device>; // 28-pin DIP, RAM/ROM size halved, 9 R pins
-const device_type TMS1730 = &device_creator<tms1000_cpu_device>; // 20-pin DIP, same die as TMS1700, package has less pins: 6 R pins, 5 O pins(output PLA is still 8-bit, O1,O3,O5 unused)
+const device_type TMS1700 = &device_creator<tms1700_cpu_device>; // 28-pin DIP, RAM/ROM size halved, 9 R pins
+const device_type TMS1730 = &device_creator<tms1730_cpu_device>; // 20-pin DIP, same die as TMS1700, package has less pins: 6 R pins, 5 O pins(output PLA is still 8-bit, O1,O3,O5 unused)
 
 
 // internal memory maps
diff --git a/src/mame/drivers/hh_tms1k.cpp b/src/mame/drivers/hh_tms1k.cpp
index d1da6b3bb87..60a7f1dcdb4 100644
--- a/src/mame/drivers/hh_tms1k.cpp
+++ b/src/mame/drivers/hh_tms1k.cpp
@@ -45,7 +45,7 @@
  *MP2139   TMS1370?  1982, Gakken Galaxy Invader 1000
  @MP2726   TMS1040   1979, Tomy Break Up
  *MP2788   TMS1040?  1980, Bandai Flight Time (? note: VFD-capable)
- *MP3005   TMS1000?  1989, Tiger Copy Cat (model 7-522)
+ @MP3005   TMS1730   1989, Tiger Copy Cat (model 7-522)
  *MP3208   TMS1000   1977, Milton Bradley Electronic Battleship (1977, model 4750A or B)
  @MP3226   TMS1000   1978, Milton Bradley Simon (model 4850)
  *MP3232   TMS1000   1979, Fonas 2-Player Baseball (no "MP" on chip label)
@@ -4995,7 +4995,6 @@ WRITE16_MEMBER(copycat_state::write_o)
 {
 	// O0,O1: speaker out
 	// O2,O7: N/C, O3-O6: tied together but unused
-	m_o = data;
 	m_speaker->level_w(data & 3);
 }
 
@@ -5060,6 +5059,74 @@ MACHINE_CONFIG_END
 
 
 
+/***************************************************************************
+
+  Tiger Electronics Copy Cat (model 7-522)
+  * PCB label WS 8107-1
+  * TMS1730 MCU, label MP3005N (die label 1700 MP3005)
+  * 4 LEDs, 1-bit sound
+
+***************************************************************************/
+
+class copycatm2_state : public hh_tms1k_state
+{
+public:
+	copycatm2_state(const machine_config &mconfig, device_type type, const char *tag)
+		: hh_tms1k_state(mconfig, type, tag)
+	{ }
+
+	DECLARE_WRITE16_MEMBER(write_r);
+	DECLARE_WRITE16_MEMBER(write_o);
+};
+
+// handlers
+
+WRITE16_MEMBER(copycatm2_state::write_r)
+{
+	// R0-R3: leds
+	display_matrix(4, 1, data & 0xf, 1);
+}
+
+WRITE16_MEMBER(copycatm2_state::write_o)
+{
+	// O0,O1: speaker out
+	// others: N/C
+	m_speaker->level_w(data & 3);
+}
+
+
+// config
+
+static INPUT_PORTS_START( copycatm2 )
+	PORT_START("IN.0")
+	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_NAME("Orange Button")
+	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_NAME("Red Button")
+	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_NAME("Yellow Button")
+	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_BUTTON4 ) PORT_NAME("Green Button")
+INPUT_PORTS_END
+
+static MACHINE_CONFIG_START( copycatm2, copycatm2_state )
+
+	/* basic machine hardware */
+	MCFG_CPU_ADD("maincpu", TMS1730, 350000) // approximation - RC osc. R=100K, C=47pf
+	MCFG_TMS1XXX_READ_K_CB(IOPORT("IN.0"))
+	MCFG_TMS1XXX_WRITE_R_CB(WRITE16(copycatm2_state, write_r))
+	MCFG_TMS1XXX_WRITE_O_CB(WRITE16(copycatm2_state, write_o))
+
+	MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1))
+	MCFG_DEFAULT_LAYOUT(layout_copycat)
+
+	/* sound hardware */
+	MCFG_SPEAKER_STANDARD_MONO("mono")
+	MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+	MCFG_SPEAKER_LEVELS(4, copycat_speaker_levels)
+	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+MACHINE_CONFIG_END
+
+
+
+
+
 /***************************************************************************
 
   Tomy(tronics) Break Up (manufactured in Japan)
@@ -5826,6 +5893,16 @@ ROM_START( copycat )
 	ROM_LOAD( "tms1000_copycat_output.pla", 0, 365, CRC(b1d0c96d) SHA1(ac1a003eab3f69e09e9050cb24ea17211e0523fe) )
 ROM_END
 
+ROM_START( copycatm2 )
+	ROM_REGION( 0x0200, "maincpu", 0 )
+	ROM_LOAD( "mp3005n", 0x0000, 0x0200, CRC(0381a2ea) SHA1(2476096b9556eea1a1ad0537dc811b8505d7e05a) )
+
+	ROM_REGION( 867, "maincpu:mpla", 0 )
+	ROM_LOAD( "tms1000_copycatm2_micro.pla", 0, 867, CRC(2710d8ef) SHA1(cb7a13bfabedad43790de753844707fe829baed0) )
+	ROM_REGION( 365, "maincpu:opla", 0 )
+	ROM_LOAD( "tms1000_copycatm2_output.pla", 0, 365, CRC(d1999aaf) SHA1(0c27789b349e491d5230f9c75c4741e621f5a14e) )
+ROM_END
+
 
 ROM_START( tbreakup )
 	ROM_REGION( 0x0400, "maincpu", 0 )
@@ -5901,6 +5978,7 @@ CONS( 1982, lostreas,  0,        0, lostreas,  lostreas,  driver_device, 0, "Par
 CONS( 1981, tandy12,   0,        0, tandy12,   tandy12,   driver_device, 0, "Tandy Radio Shack", "Tandy-12: Computerized Arcade", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK ) // some of the minigames: ***
 
 CONS( 1979, copycat,   0,        0, copycat,   copycat,   driver_device, 0, "Tiger Electronics", "Copy Cat (model 7-520)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
+CONS( 1989, copycatm2, copycat,  0, copycatm2, copycatm2, driver_device, 0, "Tiger Electronics", "Copy Cat (model 7-522)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK | MACHINE_NOT_WORKING )
 
 CONS( 1979, tbreakup,  0,        0, tbreakup,  tbreakup,  driver_device, 0, "Tomy", "Break Up (Tomy)", MACHINE_SUPPORTS_SAVE )
 CONS( 1980, phpball,   0,        0, phpball,   phpball,   driver_device, 0, "Tomy", "Power House Pinball", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
diff --git a/src/mame/mame.lst b/src/mame/mame.lst
index f6802ac5d08..eba94a5a40c 100644
--- a/src/mame/mame.lst
+++ b/src/mame/mame.lst
@@ -13705,6 +13705,7 @@ astro                           // Kosmos
 bankshot                        // Parker Bros
 bigtrak                         // Milton Bradley
 copycat                         // Tiger Electronics
+copycatm2                        // Tiger Electronics
 cnfball                         // Conic
 cnfball2                        // Conic
 cnsector                        // Parker Bros

From f7c9b7095ed81bed92dd80e7b5c31fb2849e6b3c Mon Sep 17 00:00:00 2001
From: Brad Hughes <bradhugh@outlook.com>
Date: Fri, 15 Apr 2016 22:55:01 -0400
Subject: [PATCH 027/122] Use std::chrono instead of GetTickCount in
 window.cpp/h for Windows OSD

---
 src/osd/windows/window.cpp | 20 ++++++++++++--------
 src/osd/windows/window.h   |  7 ++++---
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/src/osd/windows/window.cpp b/src/osd/windows/window.cpp
index faf16c9e4b8..8938ca427ce 100644
--- a/src/osd/windows/window.cpp
+++ b/src/osd/windows/window.cpp
@@ -16,6 +16,7 @@
 #include <process.h>
 
 #include <atomic>
+#include <chrono>
 
 // MAME headers
 #include "emu.h"
@@ -43,6 +44,9 @@
 #define MAKE_DI_SCAN(scan, isextended) (scan & 0x7f) | (isextended ? 0x80 : 0x00)
 #define WINOSD(machine) downcast<windows_osd_interface*>(&machine.osd())
 
+// min(x, y) macro interferes with chrono time_point::min()
+#undef min
+
 //============================================================
 //  PARAMETERS
 //============================================================
@@ -93,7 +97,7 @@ static int win_physical_height;
 //============================================================
 
 // event handling
-static DWORD last_event_check;
+static std::chrono::system_clock::time_point last_event_check;
 
 // debugger
 static int in_background;
@@ -348,7 +352,7 @@ win_window_info::win_window_info(running_machine &machine)
 		m_target(nullptr),
 		m_targetview(0),
 		m_targetorient(0),
-		m_lastclicktime(0),
+		m_lastclicktime(std::chrono::system_clock::time_point::min()),
 		m_lastclickx(0),
 		m_lastclicky(0),
 		m_renderer(nullptr),
@@ -378,12 +382,12 @@ win_window_info::~win_window_info()
 
 void winwindow_process_events_periodic(running_machine &machine)
 {
-	DWORD currticks = GetTickCount();
+	auto currticks = std::chrono::system_clock::now();
 
 	assert(GetCurrentThreadId() == main_threadid);
 
 	// update once every 1/8th of a second
-	if (currticks - last_event_check < 1000 / 8)
+	if (currticks - last_event_check < std::chrono::milliseconds(1000 / 8))
 		return;
 	winwindow_process_events(machine, TRUE, FALSE);
 }
@@ -441,7 +445,7 @@ void winwindow_process_events(running_machine &machine, int ingame, bool nodispa
 	assert(GetCurrentThreadId() == main_threadid);
 
 	// remember the last time we did this
-	last_event_check = GetTickCount();
+	last_event_check = std::chrono::system_clock::now();
 
 	do
 	{
@@ -1348,15 +1352,15 @@ LRESULT CALLBACK win_window_info::video_window_proc(HWND wnd, UINT message, WPAR
 
 		case WM_LBUTTONDOWN:
 		{
-			DWORD ticks = GetTickCount();
+			auto ticks = std::chrono::system_clock::now();
 			window->machine().ui_input().push_mouse_down_event(window->m_target, GET_X_LPARAM(lparam), GET_Y_LPARAM(lparam));
 
 			// check for a double-click
-			if (ticks - window->m_lastclicktime < GetDoubleClickTime() &&
+			if (ticks - window->m_lastclicktime < std::chrono::milliseconds(GetDoubleClickTime()) &&
 				GET_X_LPARAM(lparam) >= window->m_lastclickx - 4 && GET_X_LPARAM(lparam) <= window->m_lastclickx + 4 &&
 				GET_Y_LPARAM(lparam) >= window->m_lastclicky - 4 && GET_Y_LPARAM(lparam) <= window->m_lastclicky + 4)
 			{
-				window->m_lastclicktime = 0;
+				window->m_lastclicktime = std::chrono::system_clock::time_point::min();
 				window->machine().ui_input().push_mouse_double_click_event(window->m_target, GET_X_LPARAM(lparam), GET_Y_LPARAM(lparam));
 			}
 			else
diff --git a/src/osd/windows/window.h b/src/osd/windows/window.h
index b42903b9dff..8ca2d832b47 100644
--- a/src/osd/windows/window.h
+++ b/src/osd/windows/window.h
@@ -15,6 +15,7 @@
 #include <windowsx.h>
 #include <mmsystem.h>
 
+#include <chrono>
 #include <mutex>
 #include "video.h"
 #include "render.h"
@@ -114,9 +115,9 @@ public:
 	render_layer_config m_targetlayerconfig;
 
 	// input info
-	DWORD               m_lastclicktime;
-	int                 m_lastclickx;
-	int                 m_lastclicky;
+	std::chrono::system_clock::time_point  m_lastclicktime;
+	int                                    m_lastclickx;
+	int                                    m_lastclicky;
 
 	// drawing data
 	osd_renderer *      m_renderer;

From d90b9b5cab537772a62ea27d4b1cf1299b5d9942 Mon Sep 17 00:00:00 2001
From: Miodrag Milanovic <mmicko@gmail.com>
Date: Sat, 16 Apr 2016 08:35:57 +0200
Subject: [PATCH 028/122] String Translate for Chinese (Traditional /
 Simplified) [YuiFAN]

---
 language/Chinese_Simplified/strings.po  | 91 +++----------------------
 language/Chinese_Traditional/strings.po | 91 +++----------------------
 2 files changed, 16 insertions(+), 166 deletions(-)

diff --git a/language/Chinese_Simplified/strings.po b/language/Chinese_Simplified/strings.po
index b09a2fb84ca..b00dcae4ac0 100644
--- a/language/Chinese_Simplified/strings.po
+++ b/language/Chinese_Simplified/strings.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: MAME\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-04-15 17:42+0200\n"
-"PO-Revision-Date: 2016-04-11 14:17+0800\n"
+"PO-Revision-Date: 2016-04-15 03:34+0800\n"
 "Last-Translator: YuiFAN\n"
 "Language-Team: MAME Language Team\n"
 "Language: zh\n"
@@ -888,15 +888,15 @@ msgstr "%s.txt 已储存于 ui 资料夹下。"
 
 #: src/emu/ui/miscmenu.cpp:677
 msgid "Export list in XML format (like -listxml)"
-msgstr ""
+msgstr "汇出 XML 格式列表 （同 -listxml）"
 
 #: src/emu/ui/miscmenu.cpp:678
 msgid "Export list in XML format (like -listxml, but exclude devices)"
-msgstr ""
+msgstr "汇出 TXT 格式列表 （同 -listfull，但不包含装置）"
 
 #: src/emu/ui/miscmenu.cpp:679
 msgid "Export list in TXT format (like -listfull)"
-msgstr ""
+msgstr "汇出 TXT 格式列表 （同 -listfull）"
 
 #: src/emu/ui/miscmenu.cpp:729 src/emu/ui/optsmenu.cpp:376
 msgid ""
@@ -914,7 +914,7 @@ msgstr ""
 
 #: src/emu/ui/miscmenu.cpp:776
 msgid "Driver"
-msgstr ""
+msgstr "驱动"
 
 #: src/emu/ui/miscmenu.cpp:790
 msgid "Save machine configuration"
@@ -922,7 +922,7 @@ msgstr "保存机械设定"
 
 #: src/emu/ui/miscmenu.cpp:806
 msgid "Configure machine:"
-msgstr ""
+msgstr "设定机台："
 
 #: src/emu/ui/miscmenu.cpp:868 src/emu/ui/selsoft.cpp:109
 msgid " (default)"
@@ -1030,7 +1030,7 @@ msgstr "设定选项"
 
 #: src/emu/ui/selgame.cpp:596
 msgid "Configure Machine"
-msgstr ""
+msgstr "设定机台"
 
 #: src/emu/ui/selgame.cpp:758
 #, c-format
@@ -1308,7 +1308,7 @@ msgstr ""
 #: src/emu/ui/selsoft.cpp:683
 #, c-format
 msgid "%1$s %2$s ( %3$d / %4$d software packages )"
-msgstr ""
+msgstr "%1$s %2$s ( %3$d / %4$d 软件包 )"
 
 #: src/emu/ui/selsoft.cpp:684
 #, c-format
@@ -1935,78 +1935,3 @@ msgstr " 色彩"
 #: src/emu/ui/viewgfx.cpp:391
 msgid " PENS"
 msgstr " PENS"
-
-#~ msgid "Export XML format (like -listxml)"
-#~ msgstr "汇出为 XML 格式 （同 -listxml）"
-
-#~ msgid "Export TXT format (like -listfull)"
-#~ msgstr "汇出为 TXT 格式 （同 -listfull）"
-
-#~ msgid "Dummy"
-#~ msgstr "Dummy"
-
-#~ msgid "%1$s %2$s ( %3$d / %4$d softwares )"
-#~ msgstr "%1$s %2$s ( %3$d / %4$d 软件 )"
-
-#~ msgid "Lightgun Device Assignment"
-#~ msgstr "配置光枪设备"
-
-#~ msgid "Trackball Device Assignment"
-#~ msgstr "配置轨迹球设备"
-
-#~ msgid "Pedal Device Assignment"
-#~ msgstr "配置踏板设备"
-
-#~ msgid "Adstick Device Assignment"
-#~ msgstr "配置 AD 游戏杆设备"
-
-#~ msgid "Paddle Device Assignment"
-#~ msgstr "配置操纵杆设备"
-
-#~ msgid "Dial Device Assignment"
-#~ msgstr "配置方向盘设备"
-
-#~ msgid "Positional Device Assignment"
-#~ msgstr "配置定位设备"
-
-#~ msgid "Mouse Device Assignment"
-#~ msgstr "配置鼠标设备"
-
-#~ msgid "Device Mapping"
-#~ msgstr "装置映对"
-
-#~ msgid "Video Mode"
-#~ msgstr "视讯模式"
-
-#~ msgid "Triple Buffering"
-#~ msgstr "三重缓冲"
-
-#~ msgid "HLSL"
-#~ msgstr "HLSL"
-
-#~ msgid "GLSL"
-#~ msgstr "GLSL"
-
-#~ msgid "Bilinear Filtering"
-#~ msgstr "双线过滤"
-
-#~ msgid "Bitmap Prescaling"
-#~ msgstr "点阵预缩放"
-
-#~ msgid "Window Mode"
-#~ msgstr "视窗模式"
-
-#~ msgid "Enforce Aspect Ratio"
-#~ msgstr "强制长宽比例"
-
-#~ msgid "Start Out Maximized"
-#~ msgstr "启动时最大化"
-
-#~ msgid "Synchronized Refresh"
-#~ msgstr "同步更新"
-
-#~ msgid "Wait Vertical Sync"
-#~ msgstr "等待垂直同步"
-
-#~ msgid "Display Options"
-#~ msgstr "视讯选项"
diff --git a/language/Chinese_Traditional/strings.po b/language/Chinese_Traditional/strings.po
index 15c2a0b7c76..923860fafb9 100644
--- a/language/Chinese_Traditional/strings.po
+++ b/language/Chinese_Traditional/strings.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: MAME\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-04-15 17:42+0200\n"
-"PO-Revision-Date: 2016-04-11 14:14+0800\n"
+"PO-Revision-Date: 2016-04-15 03:34+0800\n"
 "Last-Translator: YuiFAN\n"
 "Language-Team: MAME Language Team\n"
 "Language: zh_TW\n"
@@ -888,15 +888,15 @@ msgstr "%s.txt 已儲存於 ui 資料夾下。"
 
 #: src/emu/ui/miscmenu.cpp:677
 msgid "Export list in XML format (like -listxml)"
-msgstr ""
+msgstr "匯出 XML 格式清單 （同 -listxml）"
 
 #: src/emu/ui/miscmenu.cpp:678
 msgid "Export list in XML format (like -listxml, but exclude devices)"
-msgstr ""
+msgstr "匯出 TXT 格式清單 （同 -listxml，但不包含裝置）"
 
 #: src/emu/ui/miscmenu.cpp:679
 msgid "Export list in TXT format (like -listfull)"
-msgstr ""
+msgstr "匯出 TXT 格式清單 （同 -listfull）"
 
 #: src/emu/ui/miscmenu.cpp:729 src/emu/ui/optsmenu.cpp:376
 msgid ""
@@ -914,7 +914,7 @@ msgstr ""
 
 #: src/emu/ui/miscmenu.cpp:776
 msgid "Driver"
-msgstr ""
+msgstr "驅動程式"
 
 #: src/emu/ui/miscmenu.cpp:790
 msgid "Save machine configuration"
@@ -922,7 +922,7 @@ msgstr "儲存機台設定"
 
 #: src/emu/ui/miscmenu.cpp:806
 msgid "Configure machine:"
-msgstr ""
+msgstr "設定機台："
 
 #: src/emu/ui/miscmenu.cpp:868 src/emu/ui/selsoft.cpp:109
 msgid " (default)"
@@ -1030,7 +1030,7 @@ msgstr "設定選項"
 
 #: src/emu/ui/selgame.cpp:596
 msgid "Configure Machine"
-msgstr ""
+msgstr "設定機台"
 
 #: src/emu/ui/selgame.cpp:758
 #, c-format
@@ -1308,7 +1308,7 @@ msgstr ""
 #: src/emu/ui/selsoft.cpp:683
 #, c-format
 msgid "%1$s %2$s ( %3$d / %4$d software packages )"
-msgstr ""
+msgstr "%1$s %2$s ( %3$d / %4$d 軟體套件 )"
 
 #: src/emu/ui/selsoft.cpp:684
 #, c-format
@@ -1935,78 +1935,3 @@ msgstr " 色彩"
 #: src/emu/ui/viewgfx.cpp:391
 msgid " PENS"
 msgstr " PENS"
-
-#~ msgid "Export XML format (like -listxml)"
-#~ msgstr "匯出為 XML 格式 （同 -listxml）"
-
-#~ msgid "Export TXT format (like -listfull)"
-#~ msgstr "匯出為 TXT 格式 （同 -listfull）"
-
-#~ msgid "Dummy"
-#~ msgstr "Dummy"
-
-#~ msgid "%1$s %2$s ( %3$d / %4$d softwares )"
-#~ msgstr "%1$s %2$s ( %3$d / %4$d 軟體 )"
-
-#~ msgid "Lightgun Device Assignment"
-#~ msgstr "指派光線槍裝置"
-
-#~ msgid "Trackball Device Assignment"
-#~ msgstr "指派軌跡球裝置"
-
-#~ msgid "Pedal Device Assignment"
-#~ msgstr "指派踏板裝置"
-
-#~ msgid "Adstick Device Assignment"
-#~ msgstr "指派 AD 搖桿裝置"
-
-#~ msgid "Paddle Device Assignment"
-#~ msgstr "指派操縱桿裝置"
-
-#~ msgid "Dial Device Assignment"
-#~ msgstr "指派轉盤裝置"
-
-#~ msgid "Positional Device Assignment"
-#~ msgstr "指派定位裝置"
-
-#~ msgid "Mouse Device Assignment"
-#~ msgstr "指派滑鼠裝置"
-
-#~ msgid "Device Mapping"
-#~ msgstr "裝置映對"
-
-#~ msgid "Video Mode"
-#~ msgstr "視訊模式"
-
-#~ msgid "Triple Buffering"
-#~ msgstr "三重緩衝"
-
-#~ msgid "HLSL"
-#~ msgstr "HLSL"
-
-#~ msgid "GLSL"
-#~ msgstr "GLSL"
-
-#~ msgid "Bilinear Filtering"
-#~ msgstr "雙線過濾"
-
-#~ msgid "Bitmap Prescaling"
-#~ msgstr "點陣預縮放"
-
-#~ msgid "Window Mode"
-#~ msgstr "視窗模式"
-
-#~ msgid "Enforce Aspect Ratio"
-#~ msgstr "強制長寬比例"
-
-#~ msgid "Start Out Maximized"
-#~ msgstr "啟動時最大化"
-
-#~ msgid "Synchronized Refresh"
-#~ msgstr "同步更新"
-
-#~ msgid "Wait Vertical Sync"
-#~ msgstr "等待垂直同步"
-
-#~ msgid "Display Options"
-#~ msgstr "視訊選項"

From 6bb33aa52c4e02989519f9dc04d11a94df76fd3e Mon Sep 17 00:00:00 2001
From: Miodrag Milanovic <mmicko@gmail.com>
Date: Sat, 16 Apr 2016 10:19:59 +0200
Subject: [PATCH 029/122] Add short git version if building non-release build,
 also if git command is not available or if .git is not there (so building out
 of other sources) (nw)

---
 makefile          | 10 ++++++++++
 scripts/genie.lua | 21 +++++++++++++++++++++
 src/version.cpp   |  8 +++++++-
 3 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/makefile b/makefile
index df813945c4c..3488a7a106d 100644
--- a/makefile
+++ b/makefile
@@ -823,10 +823,12 @@ ifeq (posix,$(SHELLTYPE))
 GCC_VERSION      := $(shell $(TOOLCHAIN)$(subst @,,$(CC)) -dumpversion 2> /dev/null)
 CLANG_VERSION    := $(shell $(TOOLCHAIN)$(subst @,,$(CC)) --version 2> /dev/null| head -n 1 | grep clang | sed "s/^.*[^0-9]\([0-9]*\.[0-9]*\.[0-9]*\).*$$/\1/" | head -n 1)
 PYTHON_AVAILABLE := $(shell $(PYTHON) --version > /dev/null 2>&1 && echo python)
+GIT_AVAILABLE    := $(shell git --version > /dev/null 2>&1 && echo git)
 else
 GCC_VERSION      := $(shell $(TOOLCHAIN)$(subst @,,$(CC)) -dumpversion 2> NUL)
 CLANG_VERSION    := $(shell $(TOOLCHAIN)$(subst @,,$(CC)) --version 2> NUL| head -n 1 | grep clang | sed "s/^.*[^0-9]\([0-9]*\.[0-9]*\.[0-9]*\).*$$/\1/" | head -n 1)
 PYTHON_AVAILABLE := $(shell $(PYTHON) --version > NUL 2>&1 && echo python)
+GIT_AVAILABLE    := $(shell git --version > NUL 2>&1 && echo git)
 endif
 ifdef MSBUILD
 MSBUILD_PARAMS   := /v:minimal /m:$(NUMBER_OF_PROCESSORS)
@@ -847,6 +849,7 @@ ifneq ($(OS),solaris)
 CLANG_VERSION    := $(shell $(TOOLCHAIN)$(subst @,,$(CC))  --version  2> /dev/null | head -n 1 | grep -e 'version [0-9]\.[0-9]\(\.[0-9]\)\?' -o | grep -e '[0-9]\.[0-9]\(\.[0-9]\)\?' -o | tail -n 1)
 endif
 PYTHON_AVAILABLE := $(shell $(PYTHON) --version > /dev/null 2>&1 && echo python)
+GIT_AVAILABLE := $(shell git --version > /dev/null 2>&1 && echo git)
 endif
 
 ifeq ($(CLANG_VERSION),)
@@ -866,6 +869,13 @@ ifneq ($(PYTHON_AVAILABLE),python)
 $(error Python is not available in path)
 endif
 
+ifneq ($(GIT_AVAILABLE),git)
+PARAMS += --IGNORE_GIT='1'
+endif
+ifeq ($(wildcard .git/*),)
+PARAMS += --IGNORE_GIT='1'
+endif
+
 GENIE := 3rdparty/genie/bin/$(GENIEOS)/genie$(EXE)
 
 ifeq ($(TARGET),$(SUBTARGET))
diff --git a/scripts/genie.lua b/scripts/genie.lua
index 90df0a55d76..ca37aa1b0f5 100644
--- a/scripts/genie.lua
+++ b/scripts/genie.lua
@@ -348,6 +348,15 @@ newoption {
 	}
 }
 
+newoption {
+	trigger = "IGNORE_GIT",
+	description = "Ignore usage of git command in build process",
+	allowed = {
+		{ "0",  "Do not ignore"   },
+		{ "1",  "Ingore"  },
+	},
+}
+
 newoption {
 	trigger = "SOURCES",
 	description = "List of sources to compile.",
@@ -520,6 +529,18 @@ if (_OPTIONS["SOURCES"] == nil) then
 	dofile (path.join("target", _OPTIONS["target"],_OPTIONS["subtarget"] .. ".lua"))
 end
 
+
+if _OPTIONS["IGNORE_GIT"]~="1" then
+	GIT_VERSION         = backtick( "git rev-parse --short HEAD" )
+	GIT_VERSION_RELEASE = backtick( "git rev-list --tags --max-count=1" )
+	GIT_VERSION_LASTONE = backtick( "git rev-list --max-count=1 HEAD" ) 
+	if (GIT_VERSION_RELEASE ~= GIT_VERSION_LASTONE) then
+	defines {
+		"GIT_VERSION=" .. GIT_VERSION,
+	}
+	end
+end
+
 configuration { "gmake" }
 	flags {
 		"SingleOutputDir",
diff --git a/src/version.cpp b/src/version.cpp
index 75859a6b57b..0721ba139d5 100644
--- a/src/version.cpp
+++ b/src/version.cpp
@@ -13,4 +13,10 @@
 extern const char bare_build_version[];
 extern const char build_version[];
 const char bare_build_version[] = BARE_BUILD_VERSION;
-const char build_version[] = BARE_BUILD_VERSION " (" __DATE__")";
+#if defined(GIT_VERSION)
+#define VERSION_TO_STRING(s) XVERSION_TO_STRING(s)
+#define XVERSION_TO_STRING(ver) #ver
+const char build_version[] = BARE_BUILD_VERSION " (" VERSION_TO_STRING(GIT_VERSION) ")";
+#else
+const char build_version[] = BARE_BUILD_VERSION;
+#endif

From 070fa52fdc18fe20b494ddde65e4d31f9a2894d0 Mon Sep 17 00:00:00 2001
From: yz70s <yz70s@users.noreply.github.com>
Date: Sat, 16 Apr 2016 11:18:09 +0200
Subject: [PATCH 030/122] xbox.cpp: more usb, interrupt transfers (nw)

---
 src/mame/includes/xbox.h  |   3 +
 src/mame/machine/xbox.cpp | 239 +++++++++++++++++++++++++++++++++++---
 2 files changed, 223 insertions(+), 19 deletions(-)

diff --git a/src/mame/includes/xbox.h b/src/mame/includes/xbox.h
index 5d11a86043d..94f6ced7eb9 100644
--- a/src/mame/includes/xbox.h
+++ b/src/mame/includes/xbox.h
@@ -314,6 +314,8 @@ protected:
 	virtual int handle_synch_frame_request(int endpoint, USBSetupPacket *setup) { return 0; };
 	virtual void handle_status_stage(int endpoint) { return; };
 	virtual int handle_bulk_pid(int endpoint, int pid, UINT8 *buffer, int size) { return 0; };
+	virtual int handle_interrupt_pid(int endpoint, int pid, UINT8 *buffer, int size) { return 0; };
+	virtual int handle_isochronous_pid(int endpoint, int pid, UINT8 *buffer, int size) { return 0; };
 
 	void add_device_descriptor(const USBStandardDeviceDescriptor &descriptor);
 	void add_configuration_descriptor(const USBStandardConfigurationDescriptor &descriptor);
@@ -357,6 +359,7 @@ class ohci_game_controller_device : public ohci_function_device
 public:
 	ohci_game_controller_device(running_machine &machine, xbox_base_state *usb_bus_manager);
 	int handle_nonstandard_request(int endpoint, USBSetupPacket *setup) override;
+	int handle_interrupt_pid(int endpoint, int pid, UINT8 *buffer, int size) override;
 private:
 	static const USBStandardDeviceDescriptor devdesc;
 	static const USBStandardConfigurationDescriptor condesc;
diff --git a/src/mame/machine/xbox.cpp b/src/mame/machine/xbox.cpp
index 96d2a688326..cd4ce8abba1 100644
--- a/src/mame/machine/xbox.cpp
+++ b/src/mame/machine/xbox.cpp
@@ -677,6 +677,7 @@ WRITE32_MEMBER(xbox_base_state::usbctrl_w)
 TIMER_CALLBACK_MEMBER(xbox_base_state::usb_ohci_timer)
 {
 	UINT32 hcca;
+	UINT32 plh;
 	int changed = 0;
 	int list = 1;
 	bool cont = false;
@@ -709,8 +710,163 @@ TIMER_CALLBACK_MEMBER(xbox_base_state::usb_ohci_timer)
 			if (list == 0) {
 				if (ohcist.hc_regs[HcControl] & PLE) {
 					// periodic list
-					if (ohcist.hc_regs[HcControl] & IE) {
-						// isochronous list
+					plh=ohcist.space->read_dword(hcca + (ohcist.framenumber & 0x1f) * 4);
+					cont = true;
+					while (cont == true) {
+						if (plh != 0) {
+							usb_ohci_read_endpoint_descriptor(plh);
+							// if this an isochronous endpoint and isochronous list not enabled, stop list processing
+							if (((ohcist.hc_regs[HcControl] & IE) == 0) && (ohcist.endpoint_descriptor.f == 1))
+								cont = false;
+						}
+						else
+							cont = false;
+						if (cont == false)
+							break;
+						// service endpoint descriptor
+						// only if it is not halted and not to be skipped
+						if (!(ohcist.endpoint_descriptor.h | ohcist.endpoint_descriptor.k)) {
+							// compare the Endpoint Descriptor TailPointer and NextTransferDescriptor fields.
+							if (ohcist.endpoint_descriptor.headp != ohcist.endpoint_descriptor.tailp) {
+								UINT32 a, b;
+								int R = 0;
+
+								// service transfer descriptor
+								if (ohcist.endpoint_descriptor.f != 1) {
+									usb_ohci_read_transfer_descriptor(ohcist.endpoint_descriptor.headp);
+									// get pid
+									if (ohcist.endpoint_descriptor.d == 1)
+										pid = OutPid; // out
+									else if (ohcist.endpoint_descriptor.d == 2)
+										pid = InPid; // in
+									else {
+										pid = ohcist.transfer_descriptor.dp; // 0 setup 1 out 2 in
+									}
+									a = ohcist.transfer_descriptor.be;
+									b = ohcist.transfer_descriptor.cbp;
+								}
+								else {
+									usb_ohci_read_isochronous_transfer_descriptor(ohcist.endpoint_descriptor.headp);
+									// get pid
+									if (ohcist.endpoint_descriptor.d == 1)
+										pid = OutPid; // out
+									else if (ohcist.endpoint_descriptor.d == 2)
+										pid = InPid; // in
+									else 
+										pid = InPid; // in
+									R = (int)ohcist.framenumber - (int)ohcist.isochronous_transfer_descriptor.sf;
+									//if ((R < 0) || (R > (int)ohcist.isochronous_transfer_descriptor.fc))
+									//	; // greater than fc should be an error
+									if (R == (int)ohcist.isochronous_transfer_descriptor.fc)
+										a = ohcist.isochronous_transfer_descriptor.be;
+									else {
+										a = ohcist.isochronous_transfer_descriptor.offset[R + 1] - 1;
+										if (a & (1 << 12))
+											a = (ohcist.isochronous_transfer_descriptor.be & 0xfffff000) | (a & 0xfff);
+										else
+											a = ohcist.isochronous_transfer_descriptor.bp0 | (a & 0xfff);
+									}
+									b=ohcist.isochronous_transfer_descriptor.offset[R];
+									if (b & (1 << 12))
+										b = (ohcist.isochronous_transfer_descriptor.be & 0xfffff000) | (b & 0xfff);
+									else
+										b = ohcist.isochronous_transfer_descriptor.bp0 | (b & 0xfff);
+								}
+								if ((a ^ b) & 0xfffff000)
+									remain = ((a | 0x1000) & 0x1fff) - (b & 0xfff) + 1;
+								else
+									remain = a - b + 1;
+								mps = ohcist.endpoint_descriptor.mps;
+								if (remain < mps)
+									mps = remain;
+								// if sending ...
+								if (pid != InPid) {
+									// ... get mps bytes
+									for (int c = 0; c < remain; c++) {
+										ohcist.buffer[c] = ohcist.space->read_byte(b);
+										b++;
+										if ((b & 0xfff) == 0)
+											b = ohcist.transfer_descriptor.be & 0xfffff000;
+									}
+								}
+								// should check for time available
+								// execute transaction
+								done = ohcist.address[ohcist.endpoint_descriptor.fa].function->execute_transfer(ohcist.endpoint_descriptor.en, pid, ohcist.buffer, mps);
+								// if receiving ...
+								if (pid == InPid) {
+									// ... store done bytes
+									for (int c = 0; c < done; c++) {
+										ohcist.space->write_byte(b, ohcist.buffer[c]);
+										b++;
+										if ((b & 0xfff) == 0)
+											b = a & 0xfffff000;
+									}
+								}
+								if (ohcist.endpoint_descriptor.f != 1) {
+									// status writeback (CompletionCode field, DataToggleControl field, CurrentBufferPointer field, ErrorCount field)
+									ohcist.transfer_descriptor.cc = NoError;
+									ohcist.transfer_descriptor.t = (ohcist.transfer_descriptor.t ^ 1) | 2;
+									// if all data is transferred (or there was no data to transfer) cbp must be 0, otherwise it must be updated
+									if (done == remain)
+										b = 0;
+									ohcist.transfer_descriptor.cbp = b;
+									ohcist.transfer_descriptor.ec = 0;
+									retire = false;
+									if ((done == mps) && (done == remain)) {
+										retire = true;
+									}
+									if ((done != mps) && (done <= remain))
+										retire = true;
+									if (done == 0)
+										retire = true;
+									if (retire == true) {
+										// retire transfer descriptor
+										a = ohcist.endpoint_descriptor.headp;
+										ohcist.endpoint_descriptor.headp = ohcist.transfer_descriptor.nexttd;
+										ohcist.transfer_descriptor.nexttd = ohcist.hc_regs[HcDoneHead];
+										ohcist.hc_regs[HcDoneHead] = a;
+										ohcist.endpoint_descriptor.c = ohcist.transfer_descriptor.t & 1;
+										if (ohcist.transfer_descriptor.di != 7) {
+											if (ohcist.transfer_descriptor.di < ohcist.writebackdonehadcounter)
+												ohcist.writebackdonehadcounter = ohcist.transfer_descriptor.di;
+										}
+										usb_ohci_writeback_transfer_descriptor(a);
+										usb_ohci_writeback_endpoint_descriptor(plh);
+									}
+									else {
+										usb_ohci_writeback_transfer_descriptor(ohcist.endpoint_descriptor.headp);
+									}
+								} else
+								{
+									// status writeback
+									ohcist.isochronous_transfer_descriptor.cc = NoError;
+									if (done == remain)
+										b = 0;
+									ohcist.isochronous_transfer_descriptor.offset[R] = b;
+									retire = false;
+									if ((done == mps) && (done == remain)) {
+										retire = true;
+									}
+									if ((done != mps) && (done <= remain))
+										retire = true;
+									if (done == 0)
+										retire = true;
+									if (retire == true) {
+										// retire transfer descriptor
+									}
+									else {
+										usb_ohci_writeback_isochronous_transfer_descriptor(ohcist.endpoint_descriptor.headp);
+									}
+								}
+							}
+						}
+						// go to next endpoint
+						if (ohcist.endpoint_descriptor.nexted != 0)
+						{
+							plh = ohcist.endpoint_descriptor.nexted;
+						}
+						else 
+							cont = false;
 					}
 				}
 				list = -1;
@@ -789,7 +945,7 @@ TIMER_CALLBACK_MEMBER(xbox_base_state::usb_ohci_timer)
 									}
 								}
 								// should check for time available
-								// execute transaction ohcist.endpoint_descriptor.fa
+								// execute transaction
 								done = ohcist.address[ohcist.endpoint_descriptor.fa].function->execute_transfer(ohcist.endpoint_descriptor.en, pid, ohcist.buffer, mps);
 								// if receiving ...
 								if (pid == InPid) {
@@ -905,10 +1061,6 @@ TIMER_CALLBACK_MEMBER(xbox_base_state::usb_ohci_timer)
 								mps = ohcist.endpoint_descriptor.mps;
 								if (remain < mps)
 									mps = remain;
-								if (ohcist.transfer_descriptor.cbp == 0) {
-									remain = 0;
-									mps = 0;
-								}
 								b = ohcist.transfer_descriptor.cbp;
 								// if sending ...
 								if (pid != InPid) {
@@ -921,7 +1073,7 @@ TIMER_CALLBACK_MEMBER(xbox_base_state::usb_ohci_timer)
 									}
 								}
 								// should check for time available
-								// execute transaction ohcist.endpoint_descriptor.fa
+								// execute transaction
 								done = ohcist.address[ohcist.endpoint_descriptor.fa].function->execute_transfer(ohcist.endpoint_descriptor.en, pid, ohcist.buffer, mps);
 								// if receiving ...
 								if (pid == InPid) {
@@ -981,7 +1133,7 @@ TIMER_CALLBACK_MEMBER(xbox_base_state::usb_ohci_timer)
 					if ((ohcist.hc_regs[HcCommandStatus] & (1 << 1)) && (ohcist.hc_regs[HcControl] & CLE))
 						list = 1; // go to control list if enabled and filled
 					else if ((ohcist.hc_regs[HcCommandStatus] & (1 << 2)) && (ohcist.hc_regs[HcControl] & BLE))
-						list = 2; // otherwise stai in bulk list if enabled and filled
+						list = 2; // otherwise stay in bulk list if enabled and filled
 					else
 						list = 0; // if no control or bulk lists, go to periodic list
 				}
@@ -1445,11 +1597,15 @@ int ohci_function_device::execute_transfer(int endpoint, int pid, UINT8 *buffer,
 		}
 		else if (endpoints[endpoint].type == BulkEndpoint)
 			return handle_bulk_pid(endpoint, pid, buffer, size);
+		else if (endpoints[endpoint].type == InterruptEndpoint)
+			return handle_interrupt_pid(endpoint, pid, buffer, size);
+		else if (endpoints[endpoint].type == IsochronousEndpoint)
+			return handle_isochronous_pid(endpoint, pid, buffer, size);
 		else
 			return -1;
 	}
 	else if (pid == OutPid) {
-		if (endpoints[endpoint].type == ControlEndpoint) { //if (endpoint == 0) {
+		if (endpoints[endpoint].type == ControlEndpoint) {
 			// case ==1, nothing
 			// case ==0, give data
 			// if host->device, since OutPid then this is data stage
@@ -1470,6 +1626,10 @@ int ohci_function_device::execute_transfer(int endpoint, int pid, UINT8 *buffer,
 		}
 		else if (endpoints[endpoint].type == BulkEndpoint)
 			return handle_bulk_pid(endpoint, pid, buffer, size);
+		else if (endpoints[endpoint].type == InterruptEndpoint)
+			return handle_interrupt_pid(endpoint, pid, buffer, size);
+		else if (endpoints[endpoint].type == IsochronousEndpoint)
+			return handle_isochronous_pid(endpoint, pid, buffer, size);
 		else
 			return -1;
 	}
@@ -1494,23 +1654,64 @@ ohci_game_controller_device::ohci_game_controller_device(running_machine &machin
 
 int ohci_game_controller_device::handle_nonstandard_request(int endpoint, USBSetupPacket *setup)
 {
-	//                              >=8  ==42  !=0  !=0  1,3       2<20 <=20
-	static const UINT8 mytestdata[16] = { 0x10,0x42 ,0x32,0x43,1   ,0x65,0x18,0x20,0x98,0xa9,0xba,0xcb,0xdc,0xed,0xfe };
+	//                                     >=8  ==42  !=0  !=0  1,3       2<20 <=20
+	static const UINT8 mytestdata1[16] = { 0x10,0x42 ,0x32,0x43,1   ,0x65,0x18,0x20,0x98,0xa9,0xba,0xcb,0xdc,0xed,0xfe };
 
 	if (endpoint != 0)
 		return -1;
 	if ((endpoints[endpoint].controltype == VendorType) && (endpoints[endpoint].controlrecipient == InterfaceRecipient))
 	{
-		if (setup->bRequest == GET_DESCRIPTOR)
+		if ((setup->bRequest == GET_DESCRIPTOR) && (setup->wValue == 0x4200))
 		{
-			if (setup->wValue == 0x4200)
-			{
-				endpoints[endpoint].position = (UINT8 *)mytestdata;
-				endpoints[endpoint].remain = 16;
-				return 0;
-			}
+			endpoints[endpoint].position = (UINT8 *)mytestdata1;
+			endpoints[endpoint].remain = 16;
+			return 0;
 		}
 	}
+	if ((endpoints[endpoint].controltype == ClassType) && (endpoints[endpoint].controlrecipient == InterfaceRecipient))
+	{
+		if ((setup->bRequest == 1) && (setup->wValue == 0x0100))
+		{
+			endpoints[endpoint].position = endpoints[endpoint].buffer;
+			endpoints[endpoint].remain = setup->wLength;
+			for (int n = 0; n < setup->wLength; n++)
+				endpoints[endpoint].buffer[n] = 0x10 ^ n;
+			endpoints[endpoint].buffer[2] = 0;
+			return 0;
+		}
+	}
+	if ((endpoints[endpoint].controltype == VendorType) && (endpoints[endpoint].controlrecipient == InterfaceRecipient))
+	{
+		if ((setup->bRequest == 1) && (setup->wValue == 0x0200))
+		{
+			endpoints[endpoint].position = endpoints[endpoint].buffer;
+			endpoints[endpoint].remain = setup->wLength;
+			for (int n = 0; n < setup->wLength; n++)
+				endpoints[endpoint].buffer[n] = 0x20 ^ n;
+			return 0;
+		}
+	}
+	if ((endpoints[endpoint].controltype == VendorType) && (endpoints[endpoint].controlrecipient == InterfaceRecipient))
+	{
+		if ((setup->bRequest == 1) && (setup->wValue == 0x0100))
+		{
+			endpoints[endpoint].position = endpoints[endpoint].buffer;
+			endpoints[endpoint].remain = setup->wLength;
+			for (int n = 0; n < setup->wLength; n++)
+				endpoints[endpoint].buffer[n] = 0x30 ^ n;
+			return 0;
+		}
+	}
+	return -1;
+}
+
+int ohci_game_controller_device::handle_interrupt_pid(int endpoint, int pid, UINT8 *buffer, int size)
+{
+	if ((endpoint == 2) && (pid == InPid)) {
+		for (int n = 0; n < size; n++)
+			buffer[n] = n;
+		return size;
+	}
 	return -1;
 }
 

From 4a291564f399af9366cc1ea2fff24c0cc70b23c6 Mon Sep 17 00:00:00 2001
From: Miodrag Milanovic <mmicko@gmail.com>
Date: Sat, 16 Apr 2016 13:48:25 +0200
Subject: [PATCH 031/122] remove dependency (nw)

---
 src/emu/device.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/emu/device.cpp b/src/emu/device.cpp
index 94b53d7c054..97c345788da 100644
--- a/src/emu/device.cpp
+++ b/src/emu/device.cpp
@@ -10,7 +10,6 @@
 
 #include "emu.h"
 #include "string.h"
-#include "ui/ui.h"
 #include "debug/debugcpu.h"
 
 

From 932fb5a66856e738c17e5d983763eee255fc0f43 Mon Sep 17 00:00:00 2001
From: Miodrag Milanovic <mmicko@gmail.com>
Date: Sat, 16 Apr 2016 15:20:42 +0200
Subject: [PATCH 032/122] Revert "Pass explicit -qt5 to all moc and qmake
 calls."

This reverts commit 3176347abcb8751becdca0889107fae061fb30f9.
---
 scripts/src/osd/modules.lua | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/scripts/src/osd/modules.lua b/scripts/src/osd/modules.lua
index eb8e0831062..fb48d20a2d5 100644
--- a/scripts/src/osd/modules.lua
+++ b/scripts/src/osd/modules.lua
@@ -288,14 +288,14 @@ function qtdebuggerbuild()
 			MOC = "moc"
 		else
 			if _OPTIONS["QT_HOME"]~=nil then
-				QMAKETST = backtick(_OPTIONS["QT_HOME"] .. "/bin/qmake -qt5 --version 2>/dev/null")
+				QMAKETST = backtick(_OPTIONS["QT_HOME"] .. "/bin/qmake --version 2>/dev/null")
 				if (QMAKETST=='') then
 					print("Qt's Meta Object Compiler (moc) wasn't found!")
 					os.exit(1)
 				end
-				MOC = _OPTIONS["QT_HOME"] .. "/bin/moc -qt5"
+				MOC = _OPTIONS["QT_HOME"] .. "/bin/moc"
 			else
-				MOCTST = backtick("which moc 2>/dev/null")
+				MOCTST = backtick("which moc-qt5 2>/dev/null")
 				if (MOCTST=='') then
 					MOCTST = backtick("which moc 2>/dev/null")
 				end
@@ -303,7 +303,7 @@ function qtdebuggerbuild()
 					print("Qt's Meta Object Compiler (moc) wasn't found!")
 					os.exit(1)
 				end
-				MOC = MOCTST .. " -qt5"
+				MOC = MOCTST
 			end
 		end
 
@@ -324,17 +324,17 @@ function qtdebuggerbuild()
 		if _OPTIONS["targetos"]=="windows" then
 			configuration { "mingw*" }
 				buildoptions {
-					"-I$(shell qmake -qt5 -query QT_INSTALL_HEADERS)",
+					"-I$(shell qmake -query QT_INSTALL_HEADERS)",
 				}
 			configuration { }
 		elseif _OPTIONS["targetos"]=="macosx" then
 			buildoptions {
-				"-F" .. backtick("qmake -qt5 -query QT_INSTALL_LIBS"),
+				"-F" .. backtick("qmake -query QT_INSTALL_LIBS"),
 			}
 		else
 			if _OPTIONS["QT_HOME"]~=nil then
 				buildoptions {
-					"-I" .. backtick(_OPTIONS["QT_HOME"] .. "/bin/qmake -qt5 -query QT_INSTALL_HEADERS"),
+					"-I" .. backtick(_OPTIONS["QT_HOME"] .. "/bin/qmake -query QT_INSTALL_HEADERS"),
 				}
 			else
 				buildoptions {
@@ -386,7 +386,7 @@ function osdmodulestargetconf()
 	if _OPTIONS["USE_QTDEBUG"]=="1" then
 		if _OPTIONS["targetos"]=="windows" then
 			linkoptions {
-				"-L$(shell qmake -qt5 -query QT_INSTALL_LIBS)",
+				"-L$(shell qmake -query QT_INSTALL_LIBS)",
 			}
 			links {
 				"qtmain",
@@ -396,7 +396,7 @@ function osdmodulestargetconf()
 			}
 		elseif _OPTIONS["targetos"]=="macosx" then
 			linkoptions {
-				"-F" .. backtick("qmake -qt5 -query QT_INSTALL_LIBS"),
+				"-F" .. backtick("qmake -query QT_INSTALL_LIBS"),
 			}
 			links {
 				"Qt5Core.framework",
@@ -406,7 +406,7 @@ function osdmodulestargetconf()
 		else
 			if _OPTIONS["QT_HOME"]~=nil then
 				linkoptions {
-					"-L" .. backtick(_OPTIONS["QT_HOME"] .. "/bin/qmake -qt5 -query QT_INSTALL_LIBS"),
+					"-L" .. backtick(_OPTIONS["QT_HOME"] .. "/bin/qmake -query QT_INSTALL_LIBS"),
 				}
 				links {
 					"Qt5Core",

From bff9111a30bf49c4847b071a0fa5489159c65c5e Mon Sep 17 00:00:00 2001
From: "therealmogminer@gmail.com" <therealmogminer@gmail.com>
Date: Sat, 16 Apr 2016 15:30:19 +0200
Subject: [PATCH 033/122] Add pillarboxing shaders and layout for bgfx, nw

---
 artwork/bgfx/border_blur/default.lay          |  25 ++++
 bgfx/chains/pillarbox_left_horizontal.json    | 103 +++++++++++++++
 bgfx/chains/pillarbox_left_vertical.json      | 103 +++++++++++++++
 bgfx/chains/pillarbox_right_horizontal.json   | 103 +++++++++++++++
 bgfx/chains/pillarbox_right_vertical.json     | 103 +++++++++++++++
 .../pillarbox_left_horizontal/blit.json       | 121 ++++++++++++++++++
 .../pillarbox_left_horizontal/gaussian.json   |  32 +++++
 .../pillarbox_left_horizontal/saturation.json |  30 +++++
 .../effects/pillarbox_left_vertical/blit.json | 121 ++++++++++++++++++
 .../pillarbox_left_vertical/gaussian.json     |  32 +++++
 .../pillarbox_left_vertical/saturation.json   |  30 +++++
 .../pillarbox_right_horizontal/blit.json      | 121 ++++++++++++++++++
 .../pillarbox_right_horizontal/gaussian.json  |  32 +++++
 .../saturation.json                           |  30 +++++
 .../pillarbox_right_vertical/blit.json        | 121 ++++++++++++++++++
 .../pillarbox_right_vertical/gaussian.json    |  32 +++++
 .../pillarbox_right_vertical/saturation.json  |  30 +++++
 bgfx/layouts/sample/horizontal/default.lay    |  25 ++++
 bgfx/layouts/sample/vertical/default.lay      |  25 ++++
 .../pillarbox_left_horizontal/fs_blit.bin     | Bin 0 -> 396 bytes
 .../pillarbox_left_horizontal/fs_gaussian.bin | Bin 0 -> 2663 bytes
 .../fs_saturation.bin                         | Bin 0 -> 523 bytes
 .../pillarbox_left_horizontal/vs_blit.bin     | Bin 0 -> 575 bytes
 .../pillarbox_left_horizontal/vs_gaussian.bin | Bin 0 -> 575 bytes
 .../vs_saturation.bin                         | Bin 0 -> 615 bytes
 .../pillarbox_left_vertical/fs_blit.bin       | Bin 0 -> 396 bytes
 .../pillarbox_left_vertical/fs_gaussian.bin   | Bin 0 -> 2663 bytes
 .../pillarbox_left_vertical/fs_saturation.bin | Bin 0 -> 523 bytes
 .../pillarbox_left_vertical/vs_blit.bin       | Bin 0 -> 575 bytes
 .../pillarbox_left_vertical/vs_gaussian.bin   | Bin 0 -> 575 bytes
 .../pillarbox_left_vertical/vs_saturation.bin | Bin 0 -> 615 bytes
 .../pillarbox_right_horizontal/fs_blit.bin    | Bin 0 -> 396 bytes
 .../fs_gaussian.bin                           | Bin 0 -> 2663 bytes
 .../fs_saturation.bin                         | Bin 0 -> 523 bytes
 .../pillarbox_right_horizontal/vs_blit.bin    | Bin 0 -> 575 bytes
 .../vs_gaussian.bin                           | Bin 0 -> 575 bytes
 .../vs_saturation.bin                         | Bin 0 -> 615 bytes
 .../pillarbox_right_vertical/fs_blit.bin      | Bin 0 -> 396 bytes
 .../pillarbox_right_vertical/fs_gaussian.bin  | Bin 0 -> 2663 bytes
 .../fs_saturation.bin                         | Bin 0 -> 523 bytes
 .../pillarbox_right_vertical/vs_blit.bin      | Bin 0 -> 575 bytes
 .../pillarbox_right_vertical/vs_gaussian.bin  | Bin 0 -> 575 bytes
 .../vs_saturation.bin                         | Bin 0 -> 615 bytes
 .../pillarbox_left_horizontal/fs_blit.bin     | Bin 0 -> 241 bytes
 .../pillarbox_left_horizontal/fs_gaussian.bin | Bin 0 -> 1512 bytes
 .../fs_saturation.bin                         | Bin 0 -> 372 bytes
 .../pillarbox_left_horizontal/vs_blit.bin     | Bin 0 -> 330 bytes
 .../pillarbox_left_horizontal/vs_gaussian.bin | Bin 0 -> 330 bytes
 .../vs_saturation.bin                         | Bin 0 -> 362 bytes
 .../pillarbox_left_vertical/fs_blit.bin       | Bin 0 -> 241 bytes
 .../pillarbox_left_vertical/fs_gaussian.bin   | Bin 0 -> 1512 bytes
 .../pillarbox_left_vertical/fs_saturation.bin | Bin 0 -> 372 bytes
 .../pillarbox_left_vertical/vs_blit.bin       | Bin 0 -> 330 bytes
 .../pillarbox_left_vertical/vs_gaussian.bin   | Bin 0 -> 330 bytes
 .../pillarbox_left_vertical/vs_saturation.bin | Bin 0 -> 362 bytes
 .../pillarbox_right_horizontal/fs_blit.bin    | Bin 0 -> 241 bytes
 .../fs_gaussian.bin                           | Bin 0 -> 1512 bytes
 .../fs_saturation.bin                         | Bin 0 -> 372 bytes
 .../pillarbox_right_horizontal/vs_blit.bin    | Bin 0 -> 330 bytes
 .../vs_gaussian.bin                           | Bin 0 -> 330 bytes
 .../vs_saturation.bin                         | Bin 0 -> 362 bytes
 .../pillarbox_right_vertical/fs_blit.bin      | Bin 0 -> 241 bytes
 .../pillarbox_right_vertical/fs_gaussian.bin  | Bin 0 -> 1512 bytes
 .../fs_saturation.bin                         | Bin 0 -> 372 bytes
 .../pillarbox_right_vertical/vs_blit.bin      | Bin 0 -> 330 bytes
 .../pillarbox_right_vertical/vs_gaussian.bin  | Bin 0 -> 330 bytes
 .../vs_saturation.bin                         | Bin 0 -> 362 bytes
 .../pillarbox_left_horizontal/fs_blit.bin     | Bin 0 -> 238 bytes
 .../pillarbox_left_horizontal/fs_gaussian.bin | Bin 0 -> 2901 bytes
 .../fs_saturation.bin                         | Bin 0 -> 456 bytes
 .../pillarbox_left_horizontal/vs_blit.bin     | Bin 0 -> 419 bytes
 .../pillarbox_left_horizontal/vs_gaussian.bin | Bin 0 -> 419 bytes
 .../vs_saturation.bin                         | Bin 0 -> 463 bytes
 .../pillarbox_left_vertical/fs_blit.bin       | Bin 0 -> 238 bytes
 .../pillarbox_left_vertical/fs_gaussian.bin   | Bin 0 -> 2901 bytes
 .../pillarbox_left_vertical/fs_saturation.bin | Bin 0 -> 456 bytes
 .../pillarbox_left_vertical/vs_blit.bin       | Bin 0 -> 419 bytes
 .../pillarbox_left_vertical/vs_gaussian.bin   | Bin 0 -> 419 bytes
 .../pillarbox_left_vertical/vs_saturation.bin | Bin 0 -> 466 bytes
 .../pillarbox_right_horizontal/fs_blit.bin    | Bin 0 -> 238 bytes
 .../fs_gaussian.bin                           | Bin 0 -> 2901 bytes
 .../fs_saturation.bin                         | Bin 0 -> 456 bytes
 .../pillarbox_right_horizontal/vs_blit.bin    | Bin 0 -> 419 bytes
 .../vs_gaussian.bin                           | Bin 0 -> 419 bytes
 .../vs_saturation.bin                         | Bin 0 -> 469 bytes
 .../pillarbox_right_vertical/fs_blit.bin      | Bin 0 -> 238 bytes
 .../pillarbox_right_vertical/fs_gaussian.bin  | Bin 0 -> 2901 bytes
 .../fs_saturation.bin                         | Bin 0 -> 456 bytes
 .../pillarbox_right_vertical/vs_blit.bin      | Bin 0 -> 419 bytes
 .../pillarbox_right_vertical/vs_gaussian.bin  | Bin 0 -> 419 bytes
 .../vs_saturation.bin                         | Bin 0 -> 467 bytes
 .../pillarbox_left_horizontal/fs_blit.bin     | Bin 0 -> 181 bytes
 .../pillarbox_left_horizontal/fs_gaussian.bin | Bin 0 -> 2861 bytes
 .../fs_saturation.bin                         | Bin 0 -> 429 bytes
 .../pillarbox_left_horizontal/vs_blit.bin     | Bin 0 -> 377 bytes
 .../pillarbox_left_horizontal/vs_gaussian.bin | Bin 0 -> 377 bytes
 .../vs_saturation.bin                         | Bin 0 -> 421 bytes
 .../pillarbox_left_vertical/fs_blit.bin       | Bin 0 -> 181 bytes
 .../pillarbox_left_vertical/fs_gaussian.bin   | Bin 0 -> 2861 bytes
 .../pillarbox_left_vertical/fs_saturation.bin | Bin 0 -> 429 bytes
 .../pillarbox_left_vertical/vs_blit.bin       | Bin 0 -> 377 bytes
 .../pillarbox_left_vertical/vs_gaussian.bin   | Bin 0 -> 377 bytes
 .../pillarbox_left_vertical/vs_saturation.bin | Bin 0 -> 424 bytes
 .../pillarbox_right_horizontal/fs_blit.bin    | Bin 0 -> 181 bytes
 .../fs_gaussian.bin                           | Bin 0 -> 2861 bytes
 .../fs_saturation.bin                         | Bin 0 -> 429 bytes
 .../pillarbox_right_horizontal/vs_blit.bin    | Bin 0 -> 377 bytes
 .../vs_gaussian.bin                           | Bin 0 -> 377 bytes
 .../vs_saturation.bin                         | Bin 0 -> 427 bytes
 .../pillarbox_right_vertical/fs_blit.bin      | Bin 0 -> 181 bytes
 .../pillarbox_right_vertical/fs_gaussian.bin  | Bin 0 -> 2861 bytes
 .../fs_saturation.bin                         | Bin 0 -> 429 bytes
 .../pillarbox_right_vertical/vs_blit.bin      | Bin 0 -> 377 bytes
 .../pillarbox_right_vertical/vs_gaussian.bin  | Bin 0 -> 377 bytes
 .../vs_saturation.bin                         | Bin 0 -> 425 bytes
 .../pillarbox_left_horizontal/fs_blit.bin     | Bin 0 -> 634 bytes
 .../pillarbox_left_horizontal/fs_gaussian.bin | Bin 0 -> 5782 bytes
 .../fs_saturation.bin                         | Bin 0 -> 832 bytes
 .../pillarbox_left_horizontal/vs_blit.bin     | Bin 0 -> 757 bytes
 .../pillarbox_left_horizontal/vs_gaussian.bin | Bin 0 -> 757 bytes
 .../vs_saturation.bin                         | Bin 0 -> 805 bytes
 .../pillarbox_left_vertical/fs_blit.bin       | Bin 0 -> 634 bytes
 .../pillarbox_left_vertical/fs_gaussian.bin   | Bin 0 -> 5782 bytes
 .../pillarbox_left_vertical/fs_saturation.bin | Bin 0 -> 832 bytes
 .../pillarbox_left_vertical/vs_blit.bin       | Bin 0 -> 757 bytes
 .../pillarbox_left_vertical/vs_gaussian.bin   | Bin 0 -> 757 bytes
 .../pillarbox_left_vertical/vs_saturation.bin | Bin 0 -> 808 bytes
 .../pillarbox_right_horizontal/fs_blit.bin    | Bin 0 -> 634 bytes
 .../fs_gaussian.bin                           | Bin 0 -> 5782 bytes
 .../fs_saturation.bin                         | Bin 0 -> 832 bytes
 .../pillarbox_right_horizontal/vs_blit.bin    | Bin 0 -> 757 bytes
 .../vs_gaussian.bin                           | Bin 0 -> 757 bytes
 .../vs_saturation.bin                         | Bin 0 -> 811 bytes
 .../pillarbox_right_vertical/fs_blit.bin      | Bin 0 -> 634 bytes
 .../pillarbox_right_vertical/fs_gaussian.bin  | Bin 0 -> 5782 bytes
 .../fs_saturation.bin                         | Bin 0 -> 832 bytes
 .../pillarbox_right_vertical/vs_blit.bin      | Bin 0 -> 757 bytes
 .../pillarbox_right_vertical/vs_gaussian.bin  | Bin 0 -> 757 bytes
 .../vs_saturation.bin                         | Bin 0 -> 809 bytes
 src/osd/modules/render/bgfx/chainmanager.cpp  |  20 +--
 .../pillarbox_left_horizontal/fs_blit.sc      |  14 ++
 .../pillarbox_left_horizontal/fs_gaussian.sc  |  57 +++++++++
 .../fs_saturation.sc                          |  25 ++++
 .../pillarbox_left_horizontal/varying.def.sc  |   6 +
 .../pillarbox_left_horizontal/vs_blit.sc      |  14 ++
 .../pillarbox_left_horizontal/vs_gaussian.sc  |  14 ++
 .../vs_saturation.sc                          |  14 ++
 .../chains/pillarbox_left_vertical/fs_blit.sc |  14 ++
 .../pillarbox_left_vertical/fs_gaussian.sc    |  57 +++++++++
 .../pillarbox_left_vertical/fs_saturation.sc  |  25 ++++
 .../pillarbox_left_vertical/varying.def.sc    |   6 +
 .../chains/pillarbox_left_vertical/vs_blit.sc |  14 ++
 .../pillarbox_left_vertical/vs_gaussian.sc    |  14 ++
 .../pillarbox_left_vertical/vs_saturation.sc  |  14 ++
 .../pillarbox_right_horizontal/fs_blit.sc     |  14 ++
 .../pillarbox_right_horizontal/fs_gaussian.sc |  57 +++++++++
 .../fs_saturation.sc                          |  25 ++++
 .../pillarbox_right_horizontal/varying.def.sc |   6 +
 .../pillarbox_right_horizontal/vs_blit.sc     |  14 ++
 .../pillarbox_right_horizontal/vs_gaussian.sc |  14 ++
 .../vs_saturation.sc                          |  14 ++
 .../pillarbox_right_vertical/fs_blit.sc       |  14 ++
 .../pillarbox_right_vertical/fs_gaussian.sc   |  57 +++++++++
 .../pillarbox_right_vertical/fs_saturation.sc |  25 ++++
 .../pillarbox_right_vertical/varying.def.sc   |   6 +
 .../pillarbox_right_vertical/vs_blit.sc       |  14 ++
 .../pillarbox_right_vertical/vs_gaussian.sc   |  14 ++
 .../pillarbox_right_vertical/vs_saturation.sc |  14 ++
 src/osd/modules/render/drawbgfx.cpp           |  76 ++++++++---
 src/osd/modules/render/drawbgfx.h             |  22 ++--
 170 files changed, 1869 insertions(+), 44 deletions(-)
 create mode 100644 artwork/bgfx/border_blur/default.lay
 create mode 100644 bgfx/chains/pillarbox_left_horizontal.json
 create mode 100644 bgfx/chains/pillarbox_left_vertical.json
 create mode 100644 bgfx/chains/pillarbox_right_horizontal.json
 create mode 100644 bgfx/chains/pillarbox_right_vertical.json
 create mode 100644 bgfx/effects/pillarbox_left_horizontal/blit.json
 create mode 100644 bgfx/effects/pillarbox_left_horizontal/gaussian.json
 create mode 100644 bgfx/effects/pillarbox_left_horizontal/saturation.json
 create mode 100644 bgfx/effects/pillarbox_left_vertical/blit.json
 create mode 100644 bgfx/effects/pillarbox_left_vertical/gaussian.json
 create mode 100644 bgfx/effects/pillarbox_left_vertical/saturation.json
 create mode 100644 bgfx/effects/pillarbox_right_horizontal/blit.json
 create mode 100644 bgfx/effects/pillarbox_right_horizontal/gaussian.json
 create mode 100644 bgfx/effects/pillarbox_right_horizontal/saturation.json
 create mode 100644 bgfx/effects/pillarbox_right_vertical/blit.json
 create mode 100644 bgfx/effects/pillarbox_right_vertical/gaussian.json
 create mode 100644 bgfx/effects/pillarbox_right_vertical/saturation.json
 create mode 100644 bgfx/layouts/sample/horizontal/default.lay
 create mode 100644 bgfx/layouts/sample/vertical/default.lay
 create mode 100644 bgfx/shaders/dx11/chains/pillarbox_left_horizontal/fs_blit.bin
 create mode 100644 bgfx/shaders/dx11/chains/pillarbox_left_horizontal/fs_gaussian.bin
 create mode 100644 bgfx/shaders/dx11/chains/pillarbox_left_horizontal/fs_saturation.bin
 create mode 100644 bgfx/shaders/dx11/chains/pillarbox_left_horizontal/vs_blit.bin
 create mode 100644 bgfx/shaders/dx11/chains/pillarbox_left_horizontal/vs_gaussian.bin
 create mode 100644 bgfx/shaders/dx11/chains/pillarbox_left_horizontal/vs_saturation.bin
 create mode 100644 bgfx/shaders/dx11/chains/pillarbox_left_vertical/fs_blit.bin
 create mode 100644 bgfx/shaders/dx11/chains/pillarbox_left_vertical/fs_gaussian.bin
 create mode 100644 bgfx/shaders/dx11/chains/pillarbox_left_vertical/fs_saturation.bin
 create mode 100644 bgfx/shaders/dx11/chains/pillarbox_left_vertical/vs_blit.bin
 create mode 100644 bgfx/shaders/dx11/chains/pillarbox_left_vertical/vs_gaussian.bin
 create mode 100644 bgfx/shaders/dx11/chains/pillarbox_left_vertical/vs_saturation.bin
 create mode 100644 bgfx/shaders/dx11/chains/pillarbox_right_horizontal/fs_blit.bin
 create mode 100644 bgfx/shaders/dx11/chains/pillarbox_right_horizontal/fs_gaussian.bin
 create mode 100644 bgfx/shaders/dx11/chains/pillarbox_right_horizontal/fs_saturation.bin
 create mode 100644 bgfx/shaders/dx11/chains/pillarbox_right_horizontal/vs_blit.bin
 create mode 100644 bgfx/shaders/dx11/chains/pillarbox_right_horizontal/vs_gaussian.bin
 create mode 100644 bgfx/shaders/dx11/chains/pillarbox_right_horizontal/vs_saturation.bin
 create mode 100644 bgfx/shaders/dx11/chains/pillarbox_right_vertical/fs_blit.bin
 create mode 100644 bgfx/shaders/dx11/chains/pillarbox_right_vertical/fs_gaussian.bin
 create mode 100644 bgfx/shaders/dx11/chains/pillarbox_right_vertical/fs_saturation.bin
 create mode 100644 bgfx/shaders/dx11/chains/pillarbox_right_vertical/vs_blit.bin
 create mode 100644 bgfx/shaders/dx11/chains/pillarbox_right_vertical/vs_gaussian.bin
 create mode 100644 bgfx/shaders/dx11/chains/pillarbox_right_vertical/vs_saturation.bin
 create mode 100644 bgfx/shaders/dx9/chains/pillarbox_left_horizontal/fs_blit.bin
 create mode 100644 bgfx/shaders/dx9/chains/pillarbox_left_horizontal/fs_gaussian.bin
 create mode 100644 bgfx/shaders/dx9/chains/pillarbox_left_horizontal/fs_saturation.bin
 create mode 100644 bgfx/shaders/dx9/chains/pillarbox_left_horizontal/vs_blit.bin
 create mode 100644 bgfx/shaders/dx9/chains/pillarbox_left_horizontal/vs_gaussian.bin
 create mode 100644 bgfx/shaders/dx9/chains/pillarbox_left_horizontal/vs_saturation.bin
 create mode 100644 bgfx/shaders/dx9/chains/pillarbox_left_vertical/fs_blit.bin
 create mode 100644 bgfx/shaders/dx9/chains/pillarbox_left_vertical/fs_gaussian.bin
 create mode 100644 bgfx/shaders/dx9/chains/pillarbox_left_vertical/fs_saturation.bin
 create mode 100644 bgfx/shaders/dx9/chains/pillarbox_left_vertical/vs_blit.bin
 create mode 100644 bgfx/shaders/dx9/chains/pillarbox_left_vertical/vs_gaussian.bin
 create mode 100644 bgfx/shaders/dx9/chains/pillarbox_left_vertical/vs_saturation.bin
 create mode 100644 bgfx/shaders/dx9/chains/pillarbox_right_horizontal/fs_blit.bin
 create mode 100644 bgfx/shaders/dx9/chains/pillarbox_right_horizontal/fs_gaussian.bin
 create mode 100644 bgfx/shaders/dx9/chains/pillarbox_right_horizontal/fs_saturation.bin
 create mode 100644 bgfx/shaders/dx9/chains/pillarbox_right_horizontal/vs_blit.bin
 create mode 100644 bgfx/shaders/dx9/chains/pillarbox_right_horizontal/vs_gaussian.bin
 create mode 100644 bgfx/shaders/dx9/chains/pillarbox_right_horizontal/vs_saturation.bin
 create mode 100644 bgfx/shaders/dx9/chains/pillarbox_right_vertical/fs_blit.bin
 create mode 100644 bgfx/shaders/dx9/chains/pillarbox_right_vertical/fs_gaussian.bin
 create mode 100644 bgfx/shaders/dx9/chains/pillarbox_right_vertical/fs_saturation.bin
 create mode 100644 bgfx/shaders/dx9/chains/pillarbox_right_vertical/vs_blit.bin
 create mode 100644 bgfx/shaders/dx9/chains/pillarbox_right_vertical/vs_gaussian.bin
 create mode 100644 bgfx/shaders/dx9/chains/pillarbox_right_vertical/vs_saturation.bin
 create mode 100644 bgfx/shaders/gles/chains/pillarbox_left_horizontal/fs_blit.bin
 create mode 100644 bgfx/shaders/gles/chains/pillarbox_left_horizontal/fs_gaussian.bin
 create mode 100644 bgfx/shaders/gles/chains/pillarbox_left_horizontal/fs_saturation.bin
 create mode 100644 bgfx/shaders/gles/chains/pillarbox_left_horizontal/vs_blit.bin
 create mode 100644 bgfx/shaders/gles/chains/pillarbox_left_horizontal/vs_gaussian.bin
 create mode 100644 bgfx/shaders/gles/chains/pillarbox_left_horizontal/vs_saturation.bin
 create mode 100644 bgfx/shaders/gles/chains/pillarbox_left_vertical/fs_blit.bin
 create mode 100644 bgfx/shaders/gles/chains/pillarbox_left_vertical/fs_gaussian.bin
 create mode 100644 bgfx/shaders/gles/chains/pillarbox_left_vertical/fs_saturation.bin
 create mode 100644 bgfx/shaders/gles/chains/pillarbox_left_vertical/vs_blit.bin
 create mode 100644 bgfx/shaders/gles/chains/pillarbox_left_vertical/vs_gaussian.bin
 create mode 100644 bgfx/shaders/gles/chains/pillarbox_left_vertical/vs_saturation.bin
 create mode 100644 bgfx/shaders/gles/chains/pillarbox_right_horizontal/fs_blit.bin
 create mode 100644 bgfx/shaders/gles/chains/pillarbox_right_horizontal/fs_gaussian.bin
 create mode 100644 bgfx/shaders/gles/chains/pillarbox_right_horizontal/fs_saturation.bin
 create mode 100644 bgfx/shaders/gles/chains/pillarbox_right_horizontal/vs_blit.bin
 create mode 100644 bgfx/shaders/gles/chains/pillarbox_right_horizontal/vs_gaussian.bin
 create mode 100644 bgfx/shaders/gles/chains/pillarbox_right_horizontal/vs_saturation.bin
 create mode 100644 bgfx/shaders/gles/chains/pillarbox_right_vertical/fs_blit.bin
 create mode 100644 bgfx/shaders/gles/chains/pillarbox_right_vertical/fs_gaussian.bin
 create mode 100644 bgfx/shaders/gles/chains/pillarbox_right_vertical/fs_saturation.bin
 create mode 100644 bgfx/shaders/gles/chains/pillarbox_right_vertical/vs_blit.bin
 create mode 100644 bgfx/shaders/gles/chains/pillarbox_right_vertical/vs_gaussian.bin
 create mode 100644 bgfx/shaders/gles/chains/pillarbox_right_vertical/vs_saturation.bin
 create mode 100644 bgfx/shaders/glsl/chains/pillarbox_left_horizontal/fs_blit.bin
 create mode 100644 bgfx/shaders/glsl/chains/pillarbox_left_horizontal/fs_gaussian.bin
 create mode 100644 bgfx/shaders/glsl/chains/pillarbox_left_horizontal/fs_saturation.bin
 create mode 100644 bgfx/shaders/glsl/chains/pillarbox_left_horizontal/vs_blit.bin
 create mode 100644 bgfx/shaders/glsl/chains/pillarbox_left_horizontal/vs_gaussian.bin
 create mode 100644 bgfx/shaders/glsl/chains/pillarbox_left_horizontal/vs_saturation.bin
 create mode 100644 bgfx/shaders/glsl/chains/pillarbox_left_vertical/fs_blit.bin
 create mode 100644 bgfx/shaders/glsl/chains/pillarbox_left_vertical/fs_gaussian.bin
 create mode 100644 bgfx/shaders/glsl/chains/pillarbox_left_vertical/fs_saturation.bin
 create mode 100644 bgfx/shaders/glsl/chains/pillarbox_left_vertical/vs_blit.bin
 create mode 100644 bgfx/shaders/glsl/chains/pillarbox_left_vertical/vs_gaussian.bin
 create mode 100644 bgfx/shaders/glsl/chains/pillarbox_left_vertical/vs_saturation.bin
 create mode 100644 bgfx/shaders/glsl/chains/pillarbox_right_horizontal/fs_blit.bin
 create mode 100644 bgfx/shaders/glsl/chains/pillarbox_right_horizontal/fs_gaussian.bin
 create mode 100644 bgfx/shaders/glsl/chains/pillarbox_right_horizontal/fs_saturation.bin
 create mode 100644 bgfx/shaders/glsl/chains/pillarbox_right_horizontal/vs_blit.bin
 create mode 100644 bgfx/shaders/glsl/chains/pillarbox_right_horizontal/vs_gaussian.bin
 create mode 100644 bgfx/shaders/glsl/chains/pillarbox_right_horizontal/vs_saturation.bin
 create mode 100644 bgfx/shaders/glsl/chains/pillarbox_right_vertical/fs_blit.bin
 create mode 100644 bgfx/shaders/glsl/chains/pillarbox_right_vertical/fs_gaussian.bin
 create mode 100644 bgfx/shaders/glsl/chains/pillarbox_right_vertical/fs_saturation.bin
 create mode 100644 bgfx/shaders/glsl/chains/pillarbox_right_vertical/vs_blit.bin
 create mode 100644 bgfx/shaders/glsl/chains/pillarbox_right_vertical/vs_gaussian.bin
 create mode 100644 bgfx/shaders/glsl/chains/pillarbox_right_vertical/vs_saturation.bin
 create mode 100644 bgfx/shaders/metal/chains/pillarbox_left_horizontal/fs_blit.bin
 create mode 100644 bgfx/shaders/metal/chains/pillarbox_left_horizontal/fs_gaussian.bin
 create mode 100644 bgfx/shaders/metal/chains/pillarbox_left_horizontal/fs_saturation.bin
 create mode 100644 bgfx/shaders/metal/chains/pillarbox_left_horizontal/vs_blit.bin
 create mode 100644 bgfx/shaders/metal/chains/pillarbox_left_horizontal/vs_gaussian.bin
 create mode 100644 bgfx/shaders/metal/chains/pillarbox_left_horizontal/vs_saturation.bin
 create mode 100644 bgfx/shaders/metal/chains/pillarbox_left_vertical/fs_blit.bin
 create mode 100644 bgfx/shaders/metal/chains/pillarbox_left_vertical/fs_gaussian.bin
 create mode 100644 bgfx/shaders/metal/chains/pillarbox_left_vertical/fs_saturation.bin
 create mode 100644 bgfx/shaders/metal/chains/pillarbox_left_vertical/vs_blit.bin
 create mode 100644 bgfx/shaders/metal/chains/pillarbox_left_vertical/vs_gaussian.bin
 create mode 100644 bgfx/shaders/metal/chains/pillarbox_left_vertical/vs_saturation.bin
 create mode 100644 bgfx/shaders/metal/chains/pillarbox_right_horizontal/fs_blit.bin
 create mode 100644 bgfx/shaders/metal/chains/pillarbox_right_horizontal/fs_gaussian.bin
 create mode 100644 bgfx/shaders/metal/chains/pillarbox_right_horizontal/fs_saturation.bin
 create mode 100644 bgfx/shaders/metal/chains/pillarbox_right_horizontal/vs_blit.bin
 create mode 100644 bgfx/shaders/metal/chains/pillarbox_right_horizontal/vs_gaussian.bin
 create mode 100644 bgfx/shaders/metal/chains/pillarbox_right_horizontal/vs_saturation.bin
 create mode 100644 bgfx/shaders/metal/chains/pillarbox_right_vertical/fs_blit.bin
 create mode 100644 bgfx/shaders/metal/chains/pillarbox_right_vertical/fs_gaussian.bin
 create mode 100644 bgfx/shaders/metal/chains/pillarbox_right_vertical/fs_saturation.bin
 create mode 100644 bgfx/shaders/metal/chains/pillarbox_right_vertical/vs_blit.bin
 create mode 100644 bgfx/shaders/metal/chains/pillarbox_right_vertical/vs_gaussian.bin
 create mode 100644 bgfx/shaders/metal/chains/pillarbox_right_vertical/vs_saturation.bin
 create mode 100644 src/osd/modules/render/bgfx/shaders/chains/pillarbox_left_horizontal/fs_blit.sc
 create mode 100644 src/osd/modules/render/bgfx/shaders/chains/pillarbox_left_horizontal/fs_gaussian.sc
 create mode 100644 src/osd/modules/render/bgfx/shaders/chains/pillarbox_left_horizontal/fs_saturation.sc
 create mode 100644 src/osd/modules/render/bgfx/shaders/chains/pillarbox_left_horizontal/varying.def.sc
 create mode 100644 src/osd/modules/render/bgfx/shaders/chains/pillarbox_left_horizontal/vs_blit.sc
 create mode 100644 src/osd/modules/render/bgfx/shaders/chains/pillarbox_left_horizontal/vs_gaussian.sc
 create mode 100644 src/osd/modules/render/bgfx/shaders/chains/pillarbox_left_horizontal/vs_saturation.sc
 create mode 100644 src/osd/modules/render/bgfx/shaders/chains/pillarbox_left_vertical/fs_blit.sc
 create mode 100644 src/osd/modules/render/bgfx/shaders/chains/pillarbox_left_vertical/fs_gaussian.sc
 create mode 100644 src/osd/modules/render/bgfx/shaders/chains/pillarbox_left_vertical/fs_saturation.sc
 create mode 100644 src/osd/modules/render/bgfx/shaders/chains/pillarbox_left_vertical/varying.def.sc
 create mode 100644 src/osd/modules/render/bgfx/shaders/chains/pillarbox_left_vertical/vs_blit.sc
 create mode 100644 src/osd/modules/render/bgfx/shaders/chains/pillarbox_left_vertical/vs_gaussian.sc
 create mode 100644 src/osd/modules/render/bgfx/shaders/chains/pillarbox_left_vertical/vs_saturation.sc
 create mode 100644 src/osd/modules/render/bgfx/shaders/chains/pillarbox_right_horizontal/fs_blit.sc
 create mode 100644 src/osd/modules/render/bgfx/shaders/chains/pillarbox_right_horizontal/fs_gaussian.sc
 create mode 100644 src/osd/modules/render/bgfx/shaders/chains/pillarbox_right_horizontal/fs_saturation.sc
 create mode 100644 src/osd/modules/render/bgfx/shaders/chains/pillarbox_right_horizontal/varying.def.sc
 create mode 100644 src/osd/modules/render/bgfx/shaders/chains/pillarbox_right_horizontal/vs_blit.sc
 create mode 100644 src/osd/modules/render/bgfx/shaders/chains/pillarbox_right_horizontal/vs_gaussian.sc
 create mode 100644 src/osd/modules/render/bgfx/shaders/chains/pillarbox_right_horizontal/vs_saturation.sc
 create mode 100644 src/osd/modules/render/bgfx/shaders/chains/pillarbox_right_vertical/fs_blit.sc
 create mode 100644 src/osd/modules/render/bgfx/shaders/chains/pillarbox_right_vertical/fs_gaussian.sc
 create mode 100644 src/osd/modules/render/bgfx/shaders/chains/pillarbox_right_vertical/fs_saturation.sc
 create mode 100644 src/osd/modules/render/bgfx/shaders/chains/pillarbox_right_vertical/varying.def.sc
 create mode 100644 src/osd/modules/render/bgfx/shaders/chains/pillarbox_right_vertical/vs_blit.sc
 create mode 100644 src/osd/modules/render/bgfx/shaders/chains/pillarbox_right_vertical/vs_gaussian.sc
 create mode 100644 src/osd/modules/render/bgfx/shaders/chains/pillarbox_right_vertical/vs_saturation.sc

diff --git a/artwork/bgfx/border_blur/default.lay b/artwork/bgfx/border_blur/default.lay
new file mode 100644
index 00000000000..1554a9ec50b
--- /dev/null
+++ b/artwork/bgfx/border_blur/default.lay
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<mamelayout version="2">
+	<view name="Horizontal">
+		<screen index="0">
+			<bounds left="2" top="0" right="14" bottom="9" />
+		</screen>
+		<screen index="0">
+			<bounds left="0" top="0" right="2" bottom="9" />
+		</screen>
+		<screen index="0">
+			<bounds left="14" top="0" right="16" bottom="9" />
+		</screen>
+	</view>
+	<view name="Vertical">
+		<screen index="0">
+			<bounds left="18.5" top="0" right="45.5" bottom="36" />
+		</screen>
+		<screen index="0">
+			<bounds left="0" top="0" right="18.5" bottom="36" />
+		</screen>
+		<screen index="0">
+			<bounds left="45.5" top="0" right="64" bottom="36" />
+		</screen>
+	</view>
+</mamelayout>
\ No newline at end of file
diff --git a/bgfx/chains/pillarbox_left_horizontal.json b/bgfx/chains/pillarbox_left_horizontal.json
new file mode 100644
index 00000000000..deff01f88d6
--- /dev/null
+++ b/bgfx/chains/pillarbox_left_horizontal.json
@@ -0,0 +1,103 @@
+// license:BSD-3-Clause
+// copyright-holders:Ryan Holtz
+//============================================================
+//
+//  pillarbox_left_horizontal.json: Fills in the left
+//    portion of a pillarbox when displaying 4:3 content
+//    on a 16:9 screen.
+//
+//============================================================
+{
+	"name": "Horizontal Pillarbox, Left",
+	"author": "Ryan Holtz",
+	
+	"sliders": [
+		{ "type": "float", "name": "saturation", "text": "Saturation",   "default": 25, "max": 100, "min": 0, "step": 1, "scale": 0.01, "format": "%1.2f", "screen": "raster" }
+	],
+	
+	"targets": [
+		{
+			"name": "guest",
+			"mode": "guest",
+			"bilinear": true,
+			"doublebuffer": true
+		},
+		{
+			"name": "internal",
+			"mode": "native",
+			"bilinear": true,
+			"doublebuffer": true
+		}
+	],
+	
+	"passes": [
+		{	"effect": "pillarbox_left_horizontal/blit",
+			"name": "Blit to scalable target",
+			"input": [
+				{ "sampler": "s_tex", "target": "screen" }
+			],
+			"output": "guest"
+		},
+		{	"effect": "pillarbox_left_horizontal/gaussian",
+			"name": "Gaussian Blur 1, Horizontal",
+			"uniforms": [
+				{ "uniform": "u_dimension", "value": [ 1.0, 0.0 ] }
+			],
+			"input": [
+				{ "sampler": "s_tex", "target": "guest" }
+			],
+			"output": "internal"
+		},
+		{	"effect": "pillarbox_left_horizontal/gaussian",
+			"name": "Gaussian Blur 1, Vertical",
+			"uniforms": [
+				{ "uniform": "u_dimension", "value": [ 0.0, 1.0 ] }
+			],
+			"input": [
+				{ "sampler": "s_tex", "target": "internal" }
+			],
+			"output": "internal"
+		},
+		{
+			"effect": "pillarbox_left_horizontal/saturation",
+			"name": "Saturation Pass",
+			"disablewhen": [
+				{ "type": "slider", "condition": "equal", "name": "saturation", "value": 100 }
+			],
+			"uniforms": [
+				{ "uniform": "u_saturation", "slider": "saturation" }
+			],
+			"input": [
+				{ "sampler": "s_tex", "target": "internal" }
+			],
+			"output": "internal"
+		},
+		{	"effect": "pillarbox_left_horizontal/gaussian",
+			"name": "Gaussian Blur 2, Horizontal",
+			"uniforms": [
+				{ "uniform": "u_dimension", "value": [ 1.0, 0.0 ] }
+			],
+			"input": [
+				{ "sampler": "s_tex", "target": "internal" }
+			],
+			"output": "internal"
+		},
+		{	"effect": "pillarbox_left_horizontal/gaussian",
+			"name": "Gaussian Blur 2, Vertical",
+			"uniforms": [
+				{ "uniform": "u_dimension", "value": [ 0.0, 1.0 ] }
+			],
+			"input": [
+				{ "sampler": "s_tex", "target": "internal" }
+			],
+			"output": "internal"
+		},
+		{	"effect": "pillarbox_left_horizontal/blit",
+			"name": "Final Blit",
+			"input": [
+				{ "sampler": "s_tex", "target": "internal" }
+			],
+			"output": "output"
+		}
+	]
+}
\ No newline at end of file
diff --git a/bgfx/chains/pillarbox_left_vertical.json b/bgfx/chains/pillarbox_left_vertical.json
new file mode 100644
index 00000000000..187164695de
--- /dev/null
+++ b/bgfx/chains/pillarbox_left_vertical.json
@@ -0,0 +1,103 @@
+// license:BSD-3-Clause
+// copyright-holders:Ryan Holtz
+//============================================================
+//
+//  pillarbox_left_vertical.json: Fills in the left
+//    portion of a pillarbox when displaying 4:3 content
+//    on a 16:9 screen.
+//
+//============================================================
+{
+	"name": "Vertical Pillarbox, Left",
+	"author": "Ryan Holtz",
+	
+	"sliders": [
+		{ "type": "float", "name": "saturation", "text": "Saturation",   "default": 25, "max": 100, "min": 0, "step": 1, "scale": 0.01, "format": "%1.2f", "screen": "raster" }
+	],
+	
+	"targets": [
+		{
+			"name": "guest",
+			"mode": "guest",
+			"bilinear": true,
+			"doublebuffer": true
+		},
+		{
+			"name": "internal",
+			"mode": "native",
+			"bilinear": true,
+			"doublebuffer": true
+		}
+	],
+	
+	"passes": [
+		{	"effect": "pillarbox_left_vertical/blit",
+			"name": "Blit to scalable target",
+			"input": [
+				{ "sampler": "s_tex", "target": "screen" }
+			],
+			"output": "guest"
+		},
+		{	"effect": "pillarbox_left_vertical/gaussian",
+			"name": "Gaussian Blur 1, Horizontal",
+			"uniforms": [
+				{ "uniform": "u_dimension", "value": [ 1.0, 0.0 ] }
+			],
+			"input": [
+				{ "sampler": "s_tex", "target": "guest" }
+			],
+			"output": "internal"
+		},
+		{	"effect": "pillarbox_left_vertical/gaussian",
+			"name": "Gaussian Blur 1, Vertical",
+			"uniforms": [
+				{ "uniform": "u_dimension", "value": [ 0.0, 1.0 ] }
+			],
+			"input": [
+				{ "sampler": "s_tex", "target": "internal" }
+			],
+			"output": "internal"
+		},
+		{
+			"effect": "pillarbox_left_vertical/saturation",
+			"name": "Saturation Pass",
+			"disablewhen": [
+				{ "type": "slider", "condition": "equal", "name": "saturation", "value": 100 }
+			],
+			"uniforms": [
+				{ "uniform": "u_saturation", "slider": "saturation" }
+			],
+			"input": [
+				{ "sampler": "s_tex", "target": "internal" }
+			],
+			"output": "internal"
+		},
+		{	"effect": "pillarbox_left_vertical/gaussian",
+			"name": "Gaussian Blur 2, Horizontal",
+			"uniforms": [
+				{ "uniform": "u_dimension", "value": [ 1.0, 0.0 ] }
+			],
+			"input": [
+				{ "sampler": "s_tex", "target": "internal" }
+			],
+			"output": "internal"
+		},
+		{	"effect": "pillarbox_left_vertical/gaussian",
+			"name": "Gaussian Blur 2, Vertical",
+			"uniforms": [
+				{ "uniform": "u_dimension", "value": [ 0.0, 1.0 ] }
+			],
+			"input": [
+				{ "sampler": "s_tex", "target": "internal" }
+			],
+			"output": "internal"
+		},
+		{	"effect": "pillarbox_left_vertical/blit",
+			"name": "Final Blit",
+			"input": [
+				{ "sampler": "s_tex", "target": "internal" }
+			],
+			"output": "output"
+		}
+	]
+}
\ No newline at end of file
diff --git a/bgfx/chains/pillarbox_right_horizontal.json b/bgfx/chains/pillarbox_right_horizontal.json
new file mode 100644
index 00000000000..d7133aadbcc
--- /dev/null
+++ b/bgfx/chains/pillarbox_right_horizontal.json
@@ -0,0 +1,103 @@
+// license:BSD-3-Clause
+// copyright-holders:Ryan Holtz
+//============================================================
+//
+//  pillarbox_right_horizontal.json: Fills in the right
+//    portion of a pillarbox when displaying 4:3 content
+//    on a 16:9 screen.
+//
+//============================================================
+{
+	"name": "Horizontal Pillarbox, Right",
+	"author": "Ryan Holtz",
+	
+	"sliders": [
+		{ "type": "float", "name": "saturation", "text": "Saturation",   "default": 25, "max": 100, "min": 0, "step": 1, "scale": 0.01, "format": "%1.2f", "screen": "raster" }
+	],
+	
+	"targets": [
+		{
+			"name": "guest",
+			"mode": "guest",
+			"bilinear": true,
+			"doublebuffer": true
+		},
+		{
+			"name": "internal",
+			"mode": "native",
+			"bilinear": true,
+			"doublebuffer": true
+		}
+	],
+	
+	"passes": [
+		{	"effect": "pillarbox_right_horizontal/blit",
+			"name": "Blit to scalable target",
+			"input": [
+				{ "sampler": "s_tex", "target": "screen" }
+			],
+			"output": "guest"
+		},
+		{	"effect": "pillarbox_right_horizontal/gaussian",
+			"name": "Gaussian Blur 1, Horizontal",
+			"uniforms": [
+				{ "uniform": "u_dimension", "value": [ 1.0, 0.0 ] }
+			],
+			"input": [
+				{ "sampler": "s_tex", "target": "guest" }
+			],
+			"output": "internal"
+		},
+		{	"effect": "pillarbox_right_horizontal/gaussian",
+			"name": "Gaussian Blur 1, Vertical",
+			"uniforms": [
+				{ "uniform": "u_dimension", "value": [ 0.0, 1.0 ] }
+			],
+			"input": [
+				{ "sampler": "s_tex", "target": "internal" }
+			],
+			"output": "internal"
+		},
+		{
+			"effect": "pillarbox_right_horizontal/saturation",
+			"name": "Saturation Pass",
+			"disablewhen": [
+				{ "type": "slider", "condition": "equal", "name": "saturation", "value": 100 }
+			],
+			"uniforms": [
+				{ "uniform": "u_saturation", "slider": "saturation" }
+			],
+			"input": [
+				{ "sampler": "s_tex", "target": "internal" }
+			],
+			"output": "internal"
+		},
+		{	"effect": "pillarbox_right_horizontal/gaussian",
+			"name": "Gaussian Blur 2, Horizontal",
+			"uniforms": [
+				{ "uniform": "u_dimension", "value": [ 1.0, 0.0 ] }
+			],
+			"input": [
+				{ "sampler": "s_tex", "target": "internal" }
+			],
+			"output": "internal"
+		},
+		{	"effect": "pillarbox_right_horizontal/gaussian",
+			"name": "Gaussian Blur 2, Vertical",
+			"uniforms": [
+				{ "uniform": "u_dimension", "value": [ 0.0, 1.0 ] }
+			],
+			"input": [
+				{ "sampler": "s_tex", "target": "internal" }
+			],
+			"output": "internal"
+		},
+		{	"effect": "pillarbox_right_horizontal/blit",
+			"name": "Final Blit",
+			"input": [
+				{ "sampler": "s_tex", "target": "internal" }
+			],
+			"output": "output"
+		}
+	]
+}
\ No newline at end of file
diff --git a/bgfx/chains/pillarbox_right_vertical.json b/bgfx/chains/pillarbox_right_vertical.json
new file mode 100644
index 00000000000..072ba99956f
--- /dev/null
+++ b/bgfx/chains/pillarbox_right_vertical.json
@@ -0,0 +1,103 @@
+// license:BSD-3-Clause
+// copyright-holders:Ryan Holtz
+//============================================================
+//
+//  pillarbox_right_vertical.json: Fills in the right
+//    portion of a pillarbox when displaying 4:3 content
+//    on a 16:9 screen.
+//
+//============================================================
+{
+	"name": "Vertical Pillarbox, Right",
+	"author": "Ryan Holtz",
+	
+	"sliders": [
+		{ "type": "float", "name": "saturation", "text": "Saturation",   "default": 25, "max": 100, "min": 0, "step": 1, "scale": 0.01, "format": "%1.2f", "screen": "raster" }
+	],
+	
+	"targets": [
+		{
+			"name": "guest",
+			"mode": "guest",
+			"bilinear": true,
+			"doublebuffer": true
+		},
+		{
+			"name": "internal",
+			"mode": "native",
+			"bilinear": true,
+			"doublebuffer": true
+		}
+	],
+	
+	"passes": [
+		{	"effect": "pillarbox_right_vertical/blit",
+			"name": "Blit to scalable target",
+			"input": [
+				{ "sampler": "s_tex", "target": "screen" }
+			],
+			"output": "guest"
+		},
+		{	"effect": "pillarbox_right_vertical/gaussian",
+			"name": "Gaussian Blur 1, Horizontal",
+			"uniforms": [
+				{ "uniform": "u_dimension", "value": [ 1.0, 0.0 ] }
+			],
+			"input": [
+				{ "sampler": "s_tex", "target": "guest" }
+			],
+			"output": "internal"
+		},
+		{	"effect": "pillarbox_right_vertical/gaussian",
+			"name": "Gaussian Blur 1, Vertical",
+			"uniforms": [
+				{ "uniform": "u_dimension", "value": [ 0.0, 1.0 ] }
+			],
+			"input": [
+				{ "sampler": "s_tex", "target": "internal" }
+			],
+			"output": "internal"
+		},
+		{
+			"effect": "pillarbox_right_vertical/saturation",
+			"name": "Saturation Pass",
+			"disablewhen": [
+				{ "type": "slider", "condition": "equal", "name": "saturation", "value": 100 }
+			],
+			"uniforms": [
+				{ "uniform": "u_saturation", "slider": "saturation" }
+			],
+			"input": [
+				{ "sampler": "s_tex", "target": "internal" }
+			],
+			"output": "internal"
+		},
+		{	"effect": "pillarbox_right_vertical/gaussian",
+			"name": "Gaussian Blur 2, Horizontal",
+			"uniforms": [
+				{ "uniform": "u_dimension", "value": [ 1.0, 0.0 ] }
+			],
+			"input": [
+				{ "sampler": "s_tex", "target": "internal" }
+			],
+			"output": "internal"
+		},
+		{	"effect": "pillarbox_right_vertical/gaussian",
+			"name": "Gaussian Blur 2, Vertical",
+			"uniforms": [
+				{ "uniform": "u_dimension", "value": [ 0.0, 1.0 ] }
+			],
+			"input": [
+				{ "sampler": "s_tex", "target": "internal" }
+			],
+			"output": "internal"
+		},
+		{	"effect": "pillarbox_right_vertical/blit",
+			"name": "Final Blit",
+			"input": [
+				{ "sampler": "s_tex", "target": "internal" }
+			],
+			"output": "output"
+		}
+	]
+}
\ No newline at end of file
diff --git a/bgfx/effects/pillarbox_left_horizontal/blit.json b/bgfx/effects/pillarbox_left_horizontal/blit.json
new file mode 100644
index 00000000000..085dd67ef93
--- /dev/null
+++ b/bgfx/effects/pillarbox_left_horizontal/blit.json
@@ -0,0 +1,121 @@
+// license:BSD-3-Clause
+// copyright-holders:Ryan Holtz
+//============================================================
+//
+//  blit.json: A simple texture-to-target copy.
+//
+//============================================================
+{
+	// blend (required): The blend state for this effect.
+    "blend": {
+    	// equation (optional): What equation to perform on the source and destination blend values.
+    	// values: "add", "sub", "revSub", "min", "max"
+    	// default: "add"
+    	// 
+    	// "subtract" and "revSubtract" are provided as aliases for "sub" and "revSub"
+    	"equation": "add",
+    	
+    	// blend function parameters (optional): What factors to use in the blend function when calculating the final pixel.
+    	// values: "0", "1", "srccolor", "1-srccolor", "dstcolor", "1-dstcolor", "srcalpha", "1-srcalpha", "dstalpha", "1-dstalpha"
+    	// defaults (srcColor, srcAlpha): "1"
+    	// defaults (dstColor, dstAlpha): "0"
+    	// 
+    	// "zero", "one", "invsrccolor", "invdstcolor", "invsrcalpha", and "invdstalpha" are provided as aliases for "0", "1", "1-srccolor", "1-dstcolor", "1-srcalpha", and "1-dstalpha"
+    	"srcColor": "srcalpha",
+    	"dstColor": "1-srcalpha",
+    	"srcAlpha": "srcalpha",
+    	"dstAlpha": "1-srcalpha"
+    },
+    
+    // depth (required): The depth state for this effect.
+    "depth": {
+    	// function (optional): The depth function to use when drawing.
+    	// values: "never", "less", "equal", "lequal", "greater", "notequal", "gequal", "always"
+    	// default: "always"
+    	"function": "always",
+    	
+    	// writeenable (optional): Whether to store Z-buffer data.
+    	// values: true, false
+    	// default: false
+    	"writeenable": false
+    },
+    
+    // cull (required): The cull mode for this effect.
+    "cull": {
+    	// mode (optional): What winding, if any, to cull.
+    	// values: "none", "cw", "ccw"
+    	// default: "ccw"
+    	// 
+    	// "clockwise" and "counterclockwise" are provided as aliases for "cw" and "ccw"
+    	"mode": "none"
+    },
+    
+    // write (required): Write enable for color and alpha channels.
+    "write": {
+    	// rgb (optional): Whether to store color data when drawing.
+    	// values: true, false
+    	// default: false
+    	"rgb": true,
+
+    	// alpha (optional): Whether to store alpha data when drawing.
+    	// values: true, false
+    	// default: false
+    	"alpha": true
+    },
+
+	// vertex (required): The vertex shader to use when drawing.
+	// value: A string containing the path and name of a shader file to use, minus the extension.
+    "vertex": "chains/pillarbox_left_horizontal/vs_blit",
+
+	// pixel/fragment (required): The pixel or fragment shader to use when drawing.
+	// value: A string containing the path and name of a shader file to use, minus the extension.
+    "fragment": "chains/pillarbox_left_horizontal/fs_blit",
+    
+    // uniforms (required): The list of uniforms for this effect. Can be empty, but must exist.
+    "uniforms": [    	
+    	{
+    		// name (required): The name of the uniform, as used in either the vertex or pixel/fragment shader.
+    		// value: A string containing the name of the uniform as described above.
+    		// 
+    		// NOTE: Some names correspond to special values that will be automatically filled by the BGFX
+    		//       code if they are used by the shader. These names are:
+    		//           "u_screen_dims"
+    		//				The dimensions of the first texture input if present, otherwise the dimensions of the output window.
+    		//				Valid values: xy
+    		//           "u_inv_screen_dims"
+    		//				The reciprocal of u_screen_dims.
+    		//				Valid values: xy
+    		//           "u_source_dims"
+    		//				The size, in pixels, of the screen texture incoming to the chain.
+    		//				Valid values: xy
+    		//           "u_rotation_type"
+    		//				This screen's rotation type. 0 if ROT0, 1 if ROT90, 2 if ROT180, 3 of ROT270.
+    		//              Valid values: x
+    		//           "u_swap_xy"
+    		//				Whether this screen is swapped on the X and Y axes. 1 if true, 0 if false.
+    		//				Valid values: x
+    		//			 "u_quad_dims"
+    		//				The dimensions, in pixels, occupied by this one screen primitive itself in the output window.
+    		//				Valid values: xy
+    		//			 "u_tex_sizeN"
+    		//				The dimensions, in pixels, of the texture in input pair N. Starts at 0.
+    		//				valid values: xy
+    		"name": "s_tex",
+
+    		// type (required): The type of the uniform.
+    		// values: "int", "vec4", "mat3", "mat4"
+    		//
+    		// Note: "int" should only be used for samplers.
+    		"type": "int",
+    		
+    		// values (required): The array of numbers with which to initialize the uniform.
+    		// value: A JSON array containin the correct amount of numbers to initialize a uniform of the
+    		//        above-specified type. The following size rules should be followed:
+    		//            "int": 1 float
+    		//            "vec4": 4 floats
+    		//            "mat3": 9 floats
+    		//            "mat4": 16 floats
+    		"values": [ 1.0 ]
+    	}
+    ]
+}
\ No newline at end of file
diff --git a/bgfx/effects/pillarbox_left_horizontal/gaussian.json b/bgfx/effects/pillarbox_left_horizontal/gaussian.json
new file mode 100644
index 00000000000..4eda0b9b368
--- /dev/null
+++ b/bgfx/effects/pillarbox_left_horizontal/gaussian.json
@@ -0,0 +1,32 @@
+// license:BSD-3-Clause
+// copyright-holders:Ryan Holtz
+//============================================================
+//
+//  gaussian.json: Separable gaussian blur.
+//
+//============================================================
+{
+    "blend": {
+    	"equation": "add",
+    	"srcColor": "srcalpha",
+    	"dstColor": "1-srcalpha",
+    	"srcAlpha": "srcalpha",
+    	"dstAlpha": "1-srcalpha"
+    },
+    "depth": {
+    	"function": "always"
+    },
+    "cull": { "mode": "none" },
+    "write": {
+    	"rgb": true,
+    	"alpha": true
+    },
+    "vertex": "chains/pillarbox_left_horizontal/vs_gaussian",
+    "fragment": "chains/pillarbox_left_horizontal/fs_gaussian",
+    "uniforms": [
+    	{ "name": "s_tex",       "type": "int",  "values": [ 1.0 ] },
+    	{ "name": "u_tex_size0", "type": "vec4", "values": [ 1.0, 0.0, 0.0, 0.0 ] },
+    	{ "name": "u_dimension", "type": "vec4", "values": [ 1.0, 0.0, 0.0, 0.0 ] },
+    	{ "name": "u_radius",    "type": "vec4", "values": [ 1.0, 0.0, 0.0, 0.0 ] }
+    ]
+}
\ No newline at end of file
diff --git a/bgfx/effects/pillarbox_left_horizontal/saturation.json b/bgfx/effects/pillarbox_left_horizontal/saturation.json
new file mode 100644
index 00000000000..8fff15ddb9b
--- /dev/null
+++ b/bgfx/effects/pillarbox_left_horizontal/saturation.json
@@ -0,0 +1,30 @@
+// license:BSD-3-Clause
+// copyright-holders:Ryan Holtz
+//============================================================
+//
+//  saturation.json: Applies saturation to an image.
+//
+//============================================================
+{
+    "blend": {
+    	"equation": "add",
+    	"srcColor": "srcalpha",
+    	"dstColor": "1-srcalpha",
+    	"srcAlpha": "srcalpha",
+    	"dstAlpha": "1-srcalpha"
+    },
+    "depth": {
+    	"function": "always"
+    },
+    "cull": { "mode": "none" },
+    "write": {
+    	"rgb": true,
+    	"alpha": true
+    },
+    "vertex": "chains/pillarbox_left_horizontal/vs_saturation",
+    "fragment": "chains/pillarbox_left_horizontal/fs_saturation",
+    "uniforms": [
+    	{ "name": "s_tex",        "type": "int",  "values": [ 1.0 ] },
+    	{ "name": "u_saturation", "type": "vec4", "values": [ 1.0, 0.0, 0.0, 0.0 ] }
+    ]
+}
\ No newline at end of file
diff --git a/bgfx/effects/pillarbox_left_vertical/blit.json b/bgfx/effects/pillarbox_left_vertical/blit.json
new file mode 100644
index 00000000000..9fb35a9fe19
--- /dev/null
+++ b/bgfx/effects/pillarbox_left_vertical/blit.json
@@ -0,0 +1,121 @@
+// license:BSD-3-Clause
+// copyright-holders:Ryan Holtz
+//============================================================
+//
+//  blit.json: A simple texture-to-target copy.
+//
+//============================================================
+{
+	// blend (required): The blend state for this effect.
+    "blend": {
+    	// equation (optional): What equation to perform on the source and destination blend values.
+    	// values: "add", "sub", "revSub", "min", "max"
+    	// default: "add"
+    	// 
+    	// "subtract" and "revSubtract" are provided as aliases for "sub" and "revSub"
+    	"equation": "add",
+    	
+    	// blend function parameters (optional): What factors to use in the blend function when calculating the final pixel.
+    	// values: "0", "1", "srccolor", "1-srccolor", "dstcolor", "1-dstcolor", "srcalpha", "1-srcalpha", "dstalpha", "1-dstalpha"
+    	// defaults (srcColor, srcAlpha): "1"
+    	// defaults (dstColor, dstAlpha): "0"
+    	// 
+    	// "zero", "one", "invsrccolor", "invdstcolor", "invsrcalpha", and "invdstalpha" are provided as aliases for "0", "1", "1-srccolor", "1-dstcolor", "1-srcalpha", and "1-dstalpha"
+    	"srcColor": "srcalpha",
+    	"dstColor": "1-srcalpha",
+    	"srcAlpha": "srcalpha",
+    	"dstAlpha": "1-srcalpha"
+    },
+    
+    // depth (required): The depth state for this effect.
+    "depth": {
+    	// function (optional): The depth function to use when drawing.
+    	// values: "never", "less", "equal", "lequal", "greater", "notequal", "gequal", "always"
+    	// default: "always"
+    	"function": "always",
+    	
+    	// writeenable (optional): Whether to store Z-buffer data.
+    	// values: true, false
+    	// default: false
+    	"writeenable": false
+    },
+    
+    // cull (required): The cull mode for this effect.
+    "cull": {
+    	// mode (optional): What winding, if any, to cull.
+    	// values: "none", "cw", "ccw"
+    	// default: "ccw"
+    	// 
+    	// "clockwise" and "counterclockwise" are provided as aliases for "cw" and "ccw"
+    	"mode": "none"
+    },
+    
+    // write (required): Write enable for color and alpha channels.
+    "write": {
+    	// rgb (optional): Whether to store color data when drawing.
+    	// values: true, false
+    	// default: false
+    	"rgb": true,
+
+    	// alpha (optional): Whether to store alpha data when drawing.
+    	// values: true, false
+    	// default: false
+    	"alpha": true
+    },
+
+	// vertex (required): The vertex shader to use when drawing.
+	// value: A string containing the path and name of a shader file to use, minus the extension.
+    "vertex": "chains/pillarbox_left_vertical/vs_blit",
+
+	// pixel/fragment (required): The pixel or fragment shader to use when drawing.
+	// value: A string containing the path and name of a shader file to use, minus the extension.
+    "fragment": "chains/pillarbox_left_vertical/fs_blit",
+    
+    // uniforms (required): The list of uniforms for this effect. Can be empty, but must exist.
+    "uniforms": [    	
+    	{
+    		// name (required): The name of the uniform, as used in either the vertex or pixel/fragment shader.
+    		// value: A string containing the name of the uniform as described above.
+    		// 
+    		// NOTE: Some names correspond to special values that will be automatically filled by the BGFX
+    		//       code if they are used by the shader. These names are:
+    		//           "u_screen_dims"
+    		//				The dimensions of the first texture input if present, otherwise the dimensions of the output window.
+    		//				Valid values: xy
+    		//           "u_inv_screen_dims"
+    		//				The reciprocal of u_screen_dims.
+    		//				Valid values: xy
+    		//           "u_source_dims"
+    		//				The size, in pixels, of the screen texture incoming to the chain.
+    		//				Valid values: xy
+    		//           "u_rotation_type"
+    		//				This screen's rotation type. 0 if ROT0, 1 if ROT90, 2 if ROT180, 3 of ROT270.
+    		//              Valid values: x
+    		//           "u_swap_xy"
+    		//				Whether this screen is swapped on the X and Y axes. 1 if true, 0 if false.
+    		//				Valid values: x
+    		//			 "u_quad_dims"
+    		//				The dimensions, in pixels, occupied by this one screen primitive itself in the output window.
+    		//				Valid values: xy
+    		//			 "u_tex_sizeN"
+    		//				The dimensions, in pixels, of the texture in input pair N. Starts at 0.
+    		//				valid values: xy
+    		"name": "s_tex",
+
+    		// type (required): The type of the uniform.
+    		// values: "int", "vec4", "mat3", "mat4"
+    		//
+    		// Note: "int" should only be used for samplers.
+    		"type": "int",
+    		
+    		// values (required): The array of numbers with which to initialize the uniform.
+    		// value: A JSON array containin the correct amount of numbers to initialize a uniform of the
+    		//        above-specified type. The following size rules should be followed:
+    		//            "int": 1 float
+    		//            "vec4": 4 floats
+    		//            "mat3": 9 floats
+    		//            "mat4": 16 floats
+    		"values": [ 1.0 ]
+    	}
+    ]
+}
\ No newline at end of file
diff --git a/bgfx/effects/pillarbox_left_vertical/gaussian.json b/bgfx/effects/pillarbox_left_vertical/gaussian.json
new file mode 100644
index 00000000000..1db78806595
--- /dev/null
+++ b/bgfx/effects/pillarbox_left_vertical/gaussian.json
@@ -0,0 +1,32 @@
+// license:BSD-3-Clause
+// copyright-holders:Ryan Holtz
+//============================================================
+//
+//  gaussian.json: Separable gaussian blur.
+//
+//============================================================
+{
+    "blend": {
+    	"equation": "add",
+    	"srcColor": "srcalpha",
+    	"dstColor": "1-srcalpha",
+    	"srcAlpha": "srcalpha",
+    	"dstAlpha": "1-srcalpha"
+    },
+    "depth": {
+    	"function": "always"
+    },
+    "cull": { "mode": "none" },
+    "write": {
+    	"rgb": true,
+    	"alpha": true
+    },
+    "vertex": "chains/pillarbox_left_vertical/vs_gaussian",
+    "fragment": "chains/pillarbox_left_vertical/fs_gaussian",
+    "uniforms": [
+    	{ "name": "s_tex",       "type": "int",  "values": [ 1.0 ] },
+    	{ "name": "u_tex_size0", "type": "vec4", "values": [ 1.0, 0.0, 0.0, 0.0 ] },
+    	{ "name": "u_dimension", "type": "vec4", "values": [ 1.0, 0.0, 0.0, 0.0 ] },
+    	{ "name": "u_radius",    "type": "vec4", "values": [ 1.0, 0.0, 0.0, 0.0 ] }
+    ]
+}
\ No newline at end of file
diff --git a/bgfx/effects/pillarbox_left_vertical/saturation.json b/bgfx/effects/pillarbox_left_vertical/saturation.json
new file mode 100644
index 00000000000..c84b6d4a3a2
--- /dev/null
+++ b/bgfx/effects/pillarbox_left_vertical/saturation.json
@@ -0,0 +1,30 @@
+// license:BSD-3-Clause
+// copyright-holders:Ryan Holtz
+//============================================================
+//
+//  saturation.json: Applies saturation to an image.
+//
+//============================================================
+{
+    "blend": {
+    	"equation": "add",
+    	"srcColor": "srcalpha",
+    	"dstColor": "1-srcalpha",
+    	"srcAlpha": "srcalpha",
+    	"dstAlpha": "1-srcalpha"
+    },
+    "depth": {
+    	"function": "always"
+    },
+    "cull": { "mode": "none" },
+    "write": {
+    	"rgb": true,
+    	"alpha": true
+    },
+    "vertex": "chains/pillarbox_left_vertical/vs_saturation",
+    "fragment": "chains/pillarbox_left_vertical/fs_saturation",
+    "uniforms": [
+    	{ "name": "s_tex",        "type": "int",  "values": [ 1.0 ] },
+    	{ "name": "u_saturation", "type": "vec4", "values": [ 1.0, 0.0, 0.0, 0.0 ] }
+    ]
+}
\ No newline at end of file
diff --git a/bgfx/effects/pillarbox_right_horizontal/blit.json b/bgfx/effects/pillarbox_right_horizontal/blit.json
new file mode 100644
index 00000000000..e982da2dbf3
--- /dev/null
+++ b/bgfx/effects/pillarbox_right_horizontal/blit.json
@@ -0,0 +1,121 @@
+// license:BSD-3-Clause
+// copyright-holders:Ryan Holtz
+//============================================================
+//
+//  blit.json: A simple texture-to-target copy.
+//
+//============================================================
+{
+	// blend (required): The blend state for this effect.
+    "blend": {
+    	// equation (optional): What equation to perform on the source and destination blend values.
+    	// values: "add", "sub", "revSub", "min", "max"
+    	// default: "add"
+    	// 
+    	// "subtract" and "revSubtract" are provided as aliases for "sub" and "revSub"
+    	"equation": "add",
+    	
+    	// blend function parameters (optional): What factors to use in the blend function when calculating the final pixel.
+    	// values: "0", "1", "srccolor", "1-srccolor", "dstcolor", "1-dstcolor", "srcalpha", "1-srcalpha", "dstalpha", "1-dstalpha"
+    	// defaults (srcColor, srcAlpha): "1"
+    	// defaults (dstColor, dstAlpha): "0"
+    	// 
+    	// "zero", "one", "invsrccolor", "invdstcolor", "invsrcalpha", and "invdstalpha" are provided as aliases for "0", "1", "1-srccolor", "1-dstcolor", "1-srcalpha", and "1-dstalpha"
+    	"srcColor": "srcalpha",
+    	"dstColor": "1-srcalpha",
+    	"srcAlpha": "srcalpha",
+    	"dstAlpha": "1-srcalpha"
+    },
+    
+    // depth (required): The depth state for this effect.
+    "depth": {
+    	// function (optional): The depth function to use when drawing.
+    	// values: "never", "less", "equal", "lequal", "greater", "notequal", "gequal", "always"
+    	// default: "always"
+    	"function": "always",
+    	
+    	// writeenable (optional): Whether to store Z-buffer data.
+    	// values: true, false
+    	// default: false
+    	"writeenable": false
+    },
+    
+    // cull (required): The cull mode for this effect.
+    "cull": {
+    	// mode (optional): What winding, if any, to cull.
+    	// values: "none", "cw", "ccw"
+    	// default: "ccw"
+    	// 
+    	// "clockwise" and "counterclockwise" are provided as aliases for "cw" and "ccw"
+    	"mode": "none"
+    },
+    
+    // write (required): Write enable for color and alpha channels.
+    "write": {
+    	// rgb (optional): Whether to store color data when drawing.
+    	// values: true, false
+    	// default: false
+    	"rgb": true,
+
+    	// alpha (optional): Whether to store alpha data when drawing.
+    	// values: true, false
+    	// default: false
+    	"alpha": true
+    },
+
+	// vertex (required): The vertex shader to use when drawing.
+	// value: A string containing the path and name of a shader file to use, minus the extension.
+    "vertex": "chains/pillarbox_right_horizontal/vs_blit",
+
+	// pixel/fragment (required): The pixel or fragment shader to use when drawing.
+	// value: A string containing the path and name of a shader file to use, minus the extension.
+    "fragment": "chains/pillarbox_right_horizontal/fs_blit",
+    
+    // uniforms (required): The list of uniforms for this effect. Can be empty, but must exist.
+    "uniforms": [    	
+    	{
+    		// name (required): The name of the uniform, as used in either the vertex or pixel/fragment shader.
+    		// value: A string containing the name of the uniform as described above.
+    		// 
+    		// NOTE: Some names correspond to special values that will be automatically filled by the BGFX
+    		//       code if they are used by the shader. These names are:
+    		//           "u_screen_dims"
+    		//				The dimensions of the first texture input if present, otherwise the dimensions of the output window.
+    		//				Valid values: xy
+    		//           "u_inv_screen_dims"
+    		//				The reciprocal of u_screen_dims.
+    		//				Valid values: xy
+    		//           "u_source_dims"
+    		//				The size, in pixels, of the screen texture incoming to the chain.
+    		//				Valid values: xy
+    		//           "u_rotation_type"
+    		//				This screen's rotation type. 0 if ROT0, 1 if ROT90, 2 if ROT180, 3 of ROT270.
+    		//              Valid values: x
+    		//           "u_swap_xy"
+    		//				Whether this screen is swapped on the X and Y axes. 1 if true, 0 if false.
+    		//				Valid values: x
+    		//			 "u_quad_dims"
+    		//				The dimensions, in pixels, occupied by this one screen primitive itself in the output window.
+    		//				Valid values: xy
+    		//			 "u_tex_sizeN"
+    		//				The dimensions, in pixels, of the texture in input pair N. Starts at 0.
+    		//				valid values: xy
+    		"name": "s_tex",
+
+    		// type (required): The type of the uniform.
+    		// values: "int", "vec4", "mat3", "mat4"
+    		//
+    		// Note: "int" should only be used for samplers.
+    		"type": "int",
+    		
+    		// values (required): The array of numbers with which to initialize the uniform.
+    		// value: A JSON array containin the correct amount of numbers to initialize a uniform of the
+    		//        above-specified type. The following size rules should be followed:
+    		//            "int": 1 float
+    		//            "vec4": 4 floats
+    		//            "mat3": 9 floats
+    		//            "mat4": 16 floats
+    		"values": [ 1.0 ]
+    	}
+    ]
+}
\ No newline at end of file
diff --git a/bgfx/effects/pillarbox_right_horizontal/gaussian.json b/bgfx/effects/pillarbox_right_horizontal/gaussian.json
new file mode 100644
index 00000000000..f19af39dd71
--- /dev/null
+++ b/bgfx/effects/pillarbox_right_horizontal/gaussian.json
@@ -0,0 +1,32 @@
+// license:BSD-3-Clause
+// copyright-holders:Ryan Holtz
+//============================================================
+//
+//  gaussian.json: Separable gaussian blur.
+//
+//============================================================
+{
+    "blend": {
+    	"equation": "add",
+    	"srcColor": "srcalpha",
+    	"dstColor": "1-srcalpha",
+    	"srcAlpha": "srcalpha",
+    	"dstAlpha": "1-srcalpha"
+    },
+    "depth": {
+    	"function": "always"
+    },
+    "cull": { "mode": "none" },
+    "write": {
+    	"rgb": true,
+    	"alpha": true
+    },
+    "vertex": "chains/pillarbox_right_horizontal/vs_gaussian",
+    "fragment": "chains/pillarbox_right_horizontal/fs_gaussian",
+    "uniforms": [
+    	{ "name": "s_tex",       "type": "int",  "values": [ 1.0 ] },
+    	{ "name": "u_tex_size0", "type": "vec4", "values": [ 1.0, 0.0, 0.0, 0.0 ] },
+    	{ "name": "u_dimension", "type": "vec4", "values": [ 1.0, 0.0, 0.0, 0.0 ] },
+    	{ "name": "u_radius",    "type": "vec4", "values": [ 1.0, 0.0, 0.0, 0.0 ] }
+    ]
+}
\ No newline at end of file
diff --git a/bgfx/effects/pillarbox_right_horizontal/saturation.json b/bgfx/effects/pillarbox_right_horizontal/saturation.json
new file mode 100644
index 00000000000..18a416ebd8e
--- /dev/null
+++ b/bgfx/effects/pillarbox_right_horizontal/saturation.json
@@ -0,0 +1,30 @@
+// license:BSD-3-Clause
+// copyright-holders:Ryan Holtz
+//============================================================
+//
+//  saturation.json: Applies saturation to an image.
+//
+//============================================================
+{
+    "blend": {
+    	"equation": "add",
+    	"srcColor": "srcalpha",
+    	"dstColor": "1-srcalpha",
+    	"srcAlpha": "srcalpha",
+    	"dstAlpha": "1-srcalpha"
+    },
+    "depth": {
+    	"function": "always"
+    },
+    "cull": { "mode": "none" },
+    "write": {
+    	"rgb": true,
+    	"alpha": true
+    },
+    "vertex": "chains/pillarbox_right_horizontal/vs_saturation",
+    "fragment": "chains/pillarbox_right_horizontal/fs_saturation",
+    "uniforms": [
+    	{ "name": "s_tex",        "type": "int",  "values": [ 1.0 ] },
+    	{ "name": "u_saturation", "type": "vec4", "values": [ 1.0, 0.0, 0.0, 0.0 ] }
+    ]
+}
\ No newline at end of file
diff --git a/bgfx/effects/pillarbox_right_vertical/blit.json b/bgfx/effects/pillarbox_right_vertical/blit.json
new file mode 100644
index 00000000000..4237ba44b66
--- /dev/null
+++ b/bgfx/effects/pillarbox_right_vertical/blit.json
@@ -0,0 +1,121 @@
+// license:BSD-3-Clause
+// copyright-holders:Ryan Holtz
+//============================================================
+//
+//  blit.json: A simple texture-to-target copy.
+//
+//============================================================
+{
+	// blend (required): The blend state for this effect.
+    "blend": {
+    	// equation (optional): What equation to perform on the source and destination blend values.
+    	// values: "add", "sub", "revSub", "min", "max"
+    	// default: "add"
+    	// 
+    	// "subtract" and "revSubtract" are provided as aliases for "sub" and "revSub"
+    	"equation": "add",
+    	
+    	// blend function parameters (optional): What factors to use in the blend function when calculating the final pixel.
+    	// values: "0", "1", "srccolor", "1-srccolor", "dstcolor", "1-dstcolor", "srcalpha", "1-srcalpha", "dstalpha", "1-dstalpha"
+    	// defaults (srcColor, srcAlpha): "1"
+    	// defaults (dstColor, dstAlpha): "0"
+    	// 
+    	// "zero", "one", "invsrccolor", "invdstcolor", "invsrcalpha", and "invdstalpha" are provided as aliases for "0", "1", "1-srccolor", "1-dstcolor", "1-srcalpha", and "1-dstalpha"
+    	"srcColor": "srcalpha",
+    	"dstColor": "1-srcalpha",
+    	"srcAlpha": "srcalpha",
+    	"dstAlpha": "1-srcalpha"
+    },
+    
+    // depth (required): The depth state for this effect.
+    "depth": {
+    	// function (optional): The depth function to use when drawing.
+    	// values: "never", "less", "equal", "lequal", "greater", "notequal", "gequal", "always"
+    	// default: "always"
+    	"function": "always",
+    	
+    	// writeenable (optional): Whether to store Z-buffer data.
+    	// values: true, false
+    	// default: false
+    	"writeenable": false
+    },
+    
+    // cull (required): The cull mode for this effect.
+    "cull": {
+    	// mode (optional): What winding, if any, to cull.
+    	// values: "none", "cw", "ccw"
+    	// default: "ccw"
+    	// 
+    	// "clockwise" and "counterclockwise" are provided as aliases for "cw" and "ccw"
+    	"mode": "none"
+    },
+    
+    // write (required): Write enable for color and alpha channels.
+    "write": {
+    	// rgb (optional): Whether to store color data when drawing.
+    	// values: true, false
+    	// default: false
+    	"rgb": true,
+
+    	// alpha (optional): Whether to store alpha data when drawing.
+    	// values: true, false
+    	// default: false
+    	"alpha": true
+    },
+
+	// vertex (required): The vertex shader to use when drawing.
+	// value: A string containing the path and name of a shader file to use, minus the extension.
+    "vertex": "chains/pillarbox_right_vertical/vs_blit",
+
+	// pixel/fragment (required): The pixel or fragment shader to use when drawing.
+	// value: A string containing the path and name of a shader file to use, minus the extension.
+    "fragment": "chains/pillarbox_right_vertical/fs_blit",
+    
+    // uniforms (required): The list of uniforms for this effect. Can be empty, but must exist.
+    "uniforms": [    	
+    	{
+    		// name (required): The name of the uniform, as used in either the vertex or pixel/fragment shader.
+    		// value: A string containing the name of the uniform as described above.
+    		// 
+    		// NOTE: Some names correspond to special values that will be automatically filled by the BGFX
+    		//       code if they are used by the shader. These names are:
+    		//           "u_screen_dims"
+    		//				The dimensions of the first texture input if present, otherwise the dimensions of the output window.
+    		//				Valid values: xy
+    		//           "u_inv_screen_dims"
+    		//				The reciprocal of u_screen_dims.
+    		//				Valid values: xy
+    		//           "u_source_dims"
+    		//				The size, in pixels, of the screen texture incoming to the chain.
+    		//				Valid values: xy
+    		//           "u_rotation_type"
+    		//				This screen's rotation type. 0 if ROT0, 1 if ROT90, 2 if ROT180, 3 of ROT270.
+    		//              Valid values: x
+    		//           "u_swap_xy"
+    		//				Whether this screen is swapped on the X and Y axes. 1 if true, 0 if false.
+    		//				Valid values: x
+    		//			 "u_quad_dims"
+    		//				The dimensions, in pixels, occupied by this one screen primitive itself in the output window.
+    		//				Valid values: xy
+    		//			 "u_tex_sizeN"
+    		//				The dimensions, in pixels, of the texture in input pair N. Starts at 0.
+    		//				valid values: xy
+    		"name": "s_tex",
+
+    		// type (required): The type of the uniform.
+    		// values: "int", "vec4", "mat3", "mat4"
+    		//
+    		// Note: "int" should only be used for samplers.
+    		"type": "int",
+    		
+    		// values (required): The array of numbers with which to initialize the uniform.
+    		// value: A JSON array containin the correct amount of numbers to initialize a uniform of the
+    		//        above-specified type. The following size rules should be followed:
+    		//            "int": 1 float
+    		//            "vec4": 4 floats
+    		//            "mat3": 9 floats
+    		//            "mat4": 16 floats
+    		"values": [ 1.0 ]
+    	}
+    ]
+}
\ No newline at end of file
diff --git a/bgfx/effects/pillarbox_right_vertical/gaussian.json b/bgfx/effects/pillarbox_right_vertical/gaussian.json
new file mode 100644
index 00000000000..b96c5b521e9
--- /dev/null
+++ b/bgfx/effects/pillarbox_right_vertical/gaussian.json
@@ -0,0 +1,32 @@
+// license:BSD-3-Clause
+// copyright-holders:Ryan Holtz
+//============================================================
+//
+//  gaussian.json: Separable gaussian blur.
+//
+//============================================================
+{
+    "blend": {
+    	"equation": "add",
+    	"srcColor": "srcalpha",
+    	"dstColor": "1-srcalpha",
+    	"srcAlpha": "srcalpha",
+    	"dstAlpha": "1-srcalpha"
+    },
+    "depth": {
+    	"function": "always"
+    },
+    "cull": { "mode": "none" },
+    "write": {
+    	"rgb": true,
+    	"alpha": true
+    },
+    "vertex": "chains/pillarbox_right_vertical/vs_gaussian",
+    "fragment": "chains/pillarbox_right_vertical/fs_gaussian",
+    "uniforms": [
+    	{ "name": "s_tex",       "type": "int",  "values": [ 1.0 ] },
+    	{ "name": "u_tex_size0", "type": "vec4", "values": [ 1.0, 0.0, 0.0, 0.0 ] },
+    	{ "name": "u_dimension", "type": "vec4", "values": [ 1.0, 0.0, 0.0, 0.0 ] },
+    	{ "name": "u_radius",    "type": "vec4", "values": [ 1.0, 0.0, 0.0, 0.0 ] }
+    ]
+}
\ No newline at end of file
diff --git a/bgfx/effects/pillarbox_right_vertical/saturation.json b/bgfx/effects/pillarbox_right_vertical/saturation.json
new file mode 100644
index 00000000000..f51e68f6134
--- /dev/null
+++ b/bgfx/effects/pillarbox_right_vertical/saturation.json
@@ -0,0 +1,30 @@
+// license:BSD-3-Clause
+// copyright-holders:Ryan Holtz
+//============================================================
+//
+//  saturation.json: Applies saturation to an image.
+//
+//============================================================
+{
+    "blend": {
+    	"equation": "add",
+    	"srcColor": "srcalpha",
+    	"dstColor": "1-srcalpha",
+    	"srcAlpha": "srcalpha",
+    	"dstAlpha": "1-srcalpha"
+    },
+    "depth": {
+    	"function": "always"
+    },
+    "cull": { "mode": "none" },
+    "write": {
+    	"rgb": true,
+    	"alpha": true
+    },
+    "vertex": "chains/pillarbox_right_vertical/vs_saturation",
+    "fragment": "chains/pillarbox_right_vertical/fs_saturation",
+    "uniforms": [
+    	{ "name": "s_tex",        "type": "int",  "values": [ 1.0 ] },
+    	{ "name": "u_saturation", "type": "vec4", "values": [ 1.0, 0.0, 0.0, 0.0 ] }
+    ]
+}
\ No newline at end of file
diff --git a/bgfx/layouts/sample/horizontal/default.lay b/bgfx/layouts/sample/horizontal/default.lay
new file mode 100644
index 00000000000..1554a9ec50b
--- /dev/null
+++ b/bgfx/layouts/sample/horizontal/default.lay
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<mamelayout version="2">
+	<view name="Horizontal">
+		<screen index="0">
+			<bounds left="2" top="0" right="14" bottom="9" />
+		</screen>
+		<screen index="0">
+			<bounds left="0" top="0" right="2" bottom="9" />
+		</screen>
+		<screen index="0">
+			<bounds left="14" top="0" right="16" bottom="9" />
+		</screen>
+	</view>
+	<view name="Vertical">
+		<screen index="0">
+			<bounds left="18.5" top="0" right="45.5" bottom="36" />
+		</screen>
+		<screen index="0">
+			<bounds left="0" top="0" right="18.5" bottom="36" />
+		</screen>
+		<screen index="0">
+			<bounds left="45.5" top="0" right="64" bottom="36" />
+		</screen>
+	</view>
+</mamelayout>
\ No newline at end of file
diff --git a/bgfx/layouts/sample/vertical/default.lay b/bgfx/layouts/sample/vertical/default.lay
new file mode 100644
index 00000000000..19105aa5929
--- /dev/null
+++ b/bgfx/layouts/sample/vertical/default.lay
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<mamelayout version="2">
+	<view name="Horizontal">
+		<screen index="0">
+			<bounds left="0" top="0" right="2" bottom="9" />
+		</screen>
+		<screen index="0">
+			<bounds left="14" top="0" right="16" bottom="9" />
+		</screen>
+		<screen index="0">
+			<bounds left="2" top="0" right="14" bottom="9" />
+		</screen>
+	</view>
+	<view name="Vertical">
+		<screen index="0">
+			<bounds left="0" top="0" right="18.5" bottom="36" />
+		</screen>
+		<screen index="0">
+			<bounds left="45.5" top="0" right="64" bottom="36" />
+		</screen>
+		<screen index="0">
+			<bounds left="18.5" top="0" right="45.5" bottom="36" />
+		</screen>
+	</view>
+</mamelayout>
\ No newline at end of file
diff --git a/bgfx/shaders/dx11/chains/pillarbox_left_horizontal/fs_blit.bin b/bgfx/shaders/dx11/chains/pillarbox_left_horizontal/fs_blit.bin
new file mode 100644
index 0000000000000000000000000000000000000000..80d85fb110742d3ae2415a237aee617a3e0c7b8c
GIT binary patch
literal 396
zcmZ<@_F!Rb{`8QMfwefkB(=hTk%57cp@7jP!pV7G#q*_-JO!_PHm;EuYk4^xC<T;Z
zU|<H)IzYSth_3*#XRy0p4v+?ka{zGw5Q6|nJxB}$_<=YE%z_XgagaPeP$CIUoC(Nh
z1}X>+ix2P*_6+g#_hWGO_wf&62yu;Y_V*8RVOZ@Cv=ih8kQpF56@VB9knIGT5#ku+
z?i#|ddUddeOVAXcA_pK=1>z`>^AZGrECz-M2?iF10th=a6zC=a2Ifx!0$}q&Y$G5W
z<gQepo=*x8br}o{Od$JR85lS}F+jxJpz7S}Abgnl77PsRFnw-(P_=Rp^X(wsU;qHi
C*D!kk

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/dx11/chains/pillarbox_left_horizontal/fs_gaussian.bin b/bgfx/shaders/dx11/chains/pillarbox_left_horizontal/fs_gaussian.bin
new file mode 100644
index 0000000000000000000000000000000000000000..753b0d31bff79044be4f077e0e1acf3902c75bc4
GIT binary patch
literal 2663
zcmcIm&ubGw82vIy`nwv6V2=x4J%k?o)kLQz-L@)CNm8jrh)N>{v`S;4h)C3ny$FIQ
z@lfzs5d^)9q7*z81U-pf`~xa@_PyCm*i1G#>A=fwzIop_@6CRhjbEBg#2)VbOvvzh
z<#u(WQm@^qrpH7i#>h(TMs>AbySX|hDMSX=D{GfmYU}ke@$fZSXG%Io^7v4G>2z-S
z)!FjZL%T0Gy}MhRpDz8z6lO%?xE=<!fG@yYX=eU9u8a==3jhcCjB)G-E}FaGgK^F?
zekBN*PsSAx$4%*cWuZ`-E6)|?C096CC`x&HDOV^I^RivQn$*A=T+;*W2(O76<*DM#
zbXm5yOSAc6W>7?fSim9|L=ygE&!jPDnQ||s%=e{nNyx3>esK{RQxcy@rHr;Jcza$j
zcMWn!ka0|8a01)P;Ws>UrMAB2Jw5G%)E39#GGRhwbPsXn`H56xia`ve@gW*tiL`-#
zAkZ?6b(zEZzlNH*_W~W(i{-??@ojyF1N}p5nBzY9DyXM41n(T2w7?WKj)ZxvsWkfG
z{?ii{2$>qJWj!Sr>+s~k3z0H#Jtdg~O(xgTYdvv}zN0v<R@PHmWPbO_qy<7@t!>^|
zQ)!WJ&*K>jgu;CDy!sgH@Fws?{LqB!t)DsYW^%iD;~c$3aa?b#r?kjUu9C4pD6F;3
z8*3^p^61a&j0HkrzVXK2R;Raj$RxH5TyOY^8E+=Hi#N{ETNKCj#(GMNd^nTLS|AkG
z+UAWll@`grn9N!r6y_UmILactHIPYY1J~OybMV|uZWnKyqqiuI>y7o47I}MgBWr<B
zSZkX%)>Im&!0fZE1wvu|=zHkn=<DoB6UT=p`kXVw>L$r|yt%rqj_=3cWGze{&W`5!
zI}oMgU#$80>&L8xvu1y2O-{-GT#tL=uBS9tZ4HgP);^QZv)c4UB6voMjApL|eb?wX
zE689!addkwW)6GLp|ps7CcGll>JNKvnseT2ah|p1*nTj29ggjXaBZcd`;r`&Z~Mpg
zJg?;O-NWJXd;O-P_`S}ID1NW=FpA&nyp7`bdY44;d%dfo_zFR#JKxuB`{^}%2zwlB
e^6fjDSA<&oe?%ntpvjM+E_(CSN%MCrEq?*u7eF`w

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/dx11/chains/pillarbox_left_horizontal/fs_saturation.bin b/bgfx/shaders/dx11/chains/pillarbox_left_horizontal/fs_saturation.bin
new file mode 100644
index 0000000000000000000000000000000000000000..eaec59b81d7e206ae62ad1d00702e2031c7fa82e
GIT binary patch
literal 523
zcmYjLu}Z^G6un8)QbjO!C@w<4Q3vVZAXr<|qzy=4O;U*>#0mukvC=lsL8R#5<}NPc
z+And}&Bf74$R;kHo0otW&U^RWbKbef_F9^97k{d>5QU@OI2!iG=Yz`<5h;`(h2#EY
zL*f2IX#~6G>vujH{49BE`%l-=@5(ADFhn`r>%cSc1~^``eSw?jMW6$4v7TpKi@<Tx
z$%E(2^ZZnfl9T5ukVE4ggdO2Iz9ZUXiap_yZw00hZi8k5J2?Y;@J<8B>i<r7_;t5w
z`81n(t%l1VY7jCGi8TAcKqq~UIPQs_yn|)Z=t}n8E;8zrtLS=?tq)ynNbU@AIj==D
z7n7XXsm{KU@5~dg`4Tjo*;XZ|)`;%QkJT5eyz@T!+6Ki{9A;jru0Z;<4ubzy;4@73
aXFi3g0Y(<IiEfi9f1B#IQom|qq0=8{usx;#

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/dx11/chains/pillarbox_left_horizontal/vs_blit.bin b/bgfx/shaders/dx11/chains/pillarbox_left_horizontal/vs_blit.bin
new file mode 100644
index 0000000000000000000000000000000000000000..b0bebf9da4c8f62f3a2c050041aa49355e4d94d9
GIT binary patch
literal 575
zcmZ9I%}T>S6oqdxsfHppAVNWqf-YTUAzeu^F*cx`kd#nS2nfX=go2<xfP0_7H}Hkr
zx^)@Qwdc$@MI5*{C*Qp@XXe(`IPjj^4^O%e&Ew7dskmR<1|kwj-%n?UiNE!^8@(@f
zzP`QTdAM=vq1N|B6ux_iS40GuSI3iUXz~zIAlxG3>h(lwD@`Wnd8-i3KMo5~;E6ub
zr4+i#r@5ZU^k|l7U8bVpcgG&YUq7Bl#sxdMFv=!!*2ym|GMU`?t%+21voy2bOUt)v
zoR&ObgfzmQGmI&F89;Gf<_)TiBJ+>;s2G}lPSfKGt?j_}ur@~@|DBGZ*@s#BWJ5f!
z7298L+CJyWdMwg)b;p5a<<~n~w|jv?=j)j3=ll0XI_@6Xw%tSK?vvp>-s^xPR2`%U
GGxz~&T{$TL

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/dx11/chains/pillarbox_left_horizontal/vs_gaussian.bin b/bgfx/shaders/dx11/chains/pillarbox_left_horizontal/vs_gaussian.bin
new file mode 100644
index 0000000000000000000000000000000000000000..b0bebf9da4c8f62f3a2c050041aa49355e4d94d9
GIT binary patch
literal 575
zcmZ9I%}T>S6oqdxsfHppAVNWqf-YTUAzeu^F*cx`kd#nS2nfX=go2<xfP0_7H}Hkr
zx^)@Qwdc$@MI5*{C*Qp@XXe(`IPjj^4^O%e&Ew7dskmR<1|kwj-%n?UiNE!^8@(@f
zzP`QTdAM=vq1N|B6ux_iS40GuSI3iUXz~zIAlxG3>h(lwD@`Wnd8-i3KMo5~;E6ub
zr4+i#r@5ZU^k|l7U8bVpcgG&YUq7Bl#sxdMFv=!!*2ym|GMU`?t%+21voy2bOUt)v
zoR&ObgfzmQGmI&F89;Gf<_)TiBJ+>;s2G}lPSfKGt?j_}ur@~@|DBGZ*@s#BWJ5f!
z7298L+CJyWdMwg)b;p5a<<~n~w|jv?=j)j3=ll0XI_@6Xw%tSK?vvp>-s^xPR2`%U
GGxz~&T{$TL

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/dx11/chains/pillarbox_left_horizontal/vs_saturation.bin b/bgfx/shaders/dx11/chains/pillarbox_left_horizontal/vs_saturation.bin
new file mode 100644
index 0000000000000000000000000000000000000000..8b8f91d84171a05e150e65ddb018736646570d40
GIT binary patch
literal 615
zcmZ9I%}T>S6opTdR7<Nig02eEr3)95g}AW>8)GY_Q<@Sg2mzt^gCGdjy^3_@6S#Ee
z-lwP!(N_p=1<##via2m*?tJ&>%-l3-d4<P(RzUeK8()s@d$%`N9sm!a6AcfVm5=A;
zr>|OVw)S0ldsy8rFcvz1%X5qNO7jWZ$x-)$zVH&QN3%<qtZEfVjjMOz(r=MY_K#Bn
zE_qXRR3AN+v<Gd~#o%z*RH`3AQSVxEXn*yjpD<aJ!>RVnCS2me&kWMLaILolBxyDm
zGum^>_oNl|H`yR$mt)qPa7^(_UH6cg@egk9`}!_^KwtE%FB<2p$?GOZVk4>H-TDE2
z$>S^?VY~cZ4wIj*n>?#2@c<~>xaGuH_|=YAOf6B#>RM*=<^MZC(Y_<zFg5I5weN}9
jPu}H(z+_Ttd`>(2yz1qI0PkeeJwt$ojM^=7^Es~{Q)EL<

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/dx11/chains/pillarbox_left_vertical/fs_blit.bin b/bgfx/shaders/dx11/chains/pillarbox_left_vertical/fs_blit.bin
new file mode 100644
index 0000000000000000000000000000000000000000..80d85fb110742d3ae2415a237aee617a3e0c7b8c
GIT binary patch
literal 396
zcmZ<@_F!Rb{`8QMfwefkB(=hTk%57cp@7jP!pV7G#q*_-JO!_PHm;EuYk4^xC<T;Z
zU|<H)IzYSth_3*#XRy0p4v+?ka{zGw5Q6|nJxB}$_<=YE%z_XgagaPeP$CIUoC(Nh
z1}X>+ix2P*_6+g#_hWGO_wf&62yu;Y_V*8RVOZ@Cv=ih8kQpF56@VB9knIGT5#ku+
z?i#|ddUddeOVAXcA_pK=1>z`>^AZGrECz-M2?iF10th=a6zC=a2Ifx!0$}q&Y$G5W
z<gQepo=*x8br}o{Od$JR85lS}F+jxJpz7S}Abgnl77PsRFnw-(P_=Rp^X(wsU;qHi
C*D!kk

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/dx11/chains/pillarbox_left_vertical/fs_gaussian.bin b/bgfx/shaders/dx11/chains/pillarbox_left_vertical/fs_gaussian.bin
new file mode 100644
index 0000000000000000000000000000000000000000..753b0d31bff79044be4f077e0e1acf3902c75bc4
GIT binary patch
literal 2663
zcmcIm&ubGw82vIy`nwv6V2=x4J%k?o)kLQz-L@)CNm8jrh)N>{v`S;4h)C3ny$FIQ
z@lfzs5d^)9q7*z81U-pf`~xa@_PyCm*i1G#>A=fwzIop_@6CRhjbEBg#2)VbOvvzh
z<#u(WQm@^qrpH7i#>h(TMs>AbySX|hDMSX=D{GfmYU}ke@$fZSXG%Io^7v4G>2z-S
z)!FjZL%T0Gy}MhRpDz8z6lO%?xE=<!fG@yYX=eU9u8a==3jhcCjB)G-E}FaGgK^F?
zekBN*PsSAx$4%*cWuZ`-E6)|?C096CC`x&HDOV^I^RivQn$*A=T+;*W2(O76<*DM#
zbXm5yOSAc6W>7?fSim9|L=ygE&!jPDnQ||s%=e{nNyx3>esK{RQxcy@rHr;Jcza$j
zcMWn!ka0|8a01)P;Ws>UrMAB2Jw5G%)E39#GGRhwbPsXn`H56xia`ve@gW*tiL`-#
zAkZ?6b(zEZzlNH*_W~W(i{-??@ojyF1N}p5nBzY9DyXM41n(T2w7?WKj)ZxvsWkfG
z{?ii{2$>qJWj!Sr>+s~k3z0H#Jtdg~O(xgTYdvv}zN0v<R@PHmWPbO_qy<7@t!>^|
zQ)!WJ&*K>jgu;CDy!sgH@Fws?{LqB!t)DsYW^%iD;~c$3aa?b#r?kjUu9C4pD6F;3
z8*3^p^61a&j0HkrzVXK2R;Raj$RxH5TyOY^8E+=Hi#N{ETNKCj#(GMNd^nTLS|AkG
z+UAWll@`grn9N!r6y_UmILactHIPYY1J~OybMV|uZWnKyqqiuI>y7o47I}MgBWr<B
zSZkX%)>Im&!0fZE1wvu|=zHkn=<DoB6UT=p`kXVw>L$r|yt%rqj_=3cWGze{&W`5!
zI}oMgU#$80>&L8xvu1y2O-{-GT#tL=uBS9tZ4HgP);^QZv)c4UB6voMjApL|eb?wX
zE689!addkwW)6GLp|ps7CcGll>JNKvnseT2ah|p1*nTj29ggjXaBZcd`;r`&Z~Mpg
zJg?;O-NWJXd;O-P_`S}ID1NW=FpA&nyp7`bdY44;d%dfo_zFR#JKxuB`{^}%2zwlB
e^6fjDSA<&oe?%ntpvjM+E_(CSN%MCrEq?*u7eF`w

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/dx11/chains/pillarbox_left_vertical/fs_saturation.bin b/bgfx/shaders/dx11/chains/pillarbox_left_vertical/fs_saturation.bin
new file mode 100644
index 0000000000000000000000000000000000000000..eaec59b81d7e206ae62ad1d00702e2031c7fa82e
GIT binary patch
literal 523
zcmYjLu}Z^G6un8)QbjO!C@w<4Q3vVZAXr<|qzy=4O;U*>#0mukvC=lsL8R#5<}NPc
z+And}&Bf74$R;kHo0otW&U^RWbKbef_F9^97k{d>5QU@OI2!iG=Yz`<5h;`(h2#EY
zL*f2IX#~6G>vujH{49BE`%l-=@5(ADFhn`r>%cSc1~^``eSw?jMW6$4v7TpKi@<Tx
z$%E(2^ZZnfl9T5ukVE4ggdO2Iz9ZUXiap_yZw00hZi8k5J2?Y;@J<8B>i<r7_;t5w
z`81n(t%l1VY7jCGi8TAcKqq~UIPQs_yn|)Z=t}n8E;8zrtLS=?tq)ynNbU@AIj==D
z7n7XXsm{KU@5~dg`4Tjo*;XZ|)`;%QkJT5eyz@T!+6Ki{9A;jru0Z;<4ubzy;4@73
aXFi3g0Y(<IiEfi9f1B#IQom|qq0=8{usx;#

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/dx11/chains/pillarbox_left_vertical/vs_blit.bin b/bgfx/shaders/dx11/chains/pillarbox_left_vertical/vs_blit.bin
new file mode 100644
index 0000000000000000000000000000000000000000..b0bebf9da4c8f62f3a2c050041aa49355e4d94d9
GIT binary patch
literal 575
zcmZ9I%}T>S6oqdxsfHppAVNWqf-YTUAzeu^F*cx`kd#nS2nfX=go2<xfP0_7H}Hkr
zx^)@Qwdc$@MI5*{C*Qp@XXe(`IPjj^4^O%e&Ew7dskmR<1|kwj-%n?UiNE!^8@(@f
zzP`QTdAM=vq1N|B6ux_iS40GuSI3iUXz~zIAlxG3>h(lwD@`Wnd8-i3KMo5~;E6ub
zr4+i#r@5ZU^k|l7U8bVpcgG&YUq7Bl#sxdMFv=!!*2ym|GMU`?t%+21voy2bOUt)v
zoR&ObgfzmQGmI&F89;Gf<_)TiBJ+>;s2G}lPSfKGt?j_}ur@~@|DBGZ*@s#BWJ5f!
z7298L+CJyWdMwg)b;p5a<<~n~w|jv?=j)j3=ll0XI_@6Xw%tSK?vvp>-s^xPR2`%U
GGxz~&T{$TL

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/dx11/chains/pillarbox_left_vertical/vs_gaussian.bin b/bgfx/shaders/dx11/chains/pillarbox_left_vertical/vs_gaussian.bin
new file mode 100644
index 0000000000000000000000000000000000000000..b0bebf9da4c8f62f3a2c050041aa49355e4d94d9
GIT binary patch
literal 575
zcmZ9I%}T>S6oqdxsfHppAVNWqf-YTUAzeu^F*cx`kd#nS2nfX=go2<xfP0_7H}Hkr
zx^)@Qwdc$@MI5*{C*Qp@XXe(`IPjj^4^O%e&Ew7dskmR<1|kwj-%n?UiNE!^8@(@f
zzP`QTdAM=vq1N|B6ux_iS40GuSI3iUXz~zIAlxG3>h(lwD@`Wnd8-i3KMo5~;E6ub
zr4+i#r@5ZU^k|l7U8bVpcgG&YUq7Bl#sxdMFv=!!*2ym|GMU`?t%+21voy2bOUt)v
zoR&ObgfzmQGmI&F89;Gf<_)TiBJ+>;s2G}lPSfKGt?j_}ur@~@|DBGZ*@s#BWJ5f!
z7298L+CJyWdMwg)b;p5a<<~n~w|jv?=j)j3=ll0XI_@6Xw%tSK?vvp>-s^xPR2`%U
GGxz~&T{$TL

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/dx11/chains/pillarbox_left_vertical/vs_saturation.bin b/bgfx/shaders/dx11/chains/pillarbox_left_vertical/vs_saturation.bin
new file mode 100644
index 0000000000000000000000000000000000000000..f7a1c40ba4d06d91719abc2d66563e7af050ba15
GIT binary patch
literal 615
zcmZ9Iy-EW?6ot?3CK`g8ZNx@2rG;2*AzEk_6W2sSChUeKg0LV2H3)%#T3BkWFJNhB
zYbE*y@gaNyai73*XPh7o+}ShV{W-IfCe4C#n}0eeUuIY5gX`{iG%NrpAaoo3y?VB>
z{V*KW-fo`0((&s2x5HfM0v^BXj7Nq~*h&sMXVk(=j4s12VX`U}AT?6&!e!npMfQ)=
z0v>r?wN;F+N?N^^>Y%sZuPYTdpy+oYHH^Q0GEbN++TmC$vk8~H@DqddE?oP~0ZE!o
z&5ZZd@;PZX;x!HkIpvT&M|`H}zN%-)oADpK-1qfabU-bBR*T0ed-AHOk=#Ifc(yvA
zmO8$rD{PCum&4Sji>A(cN<IL}Hg7pGW`4b+1=CAZvc8ttdinoNplI(At(YFpuGsrT
moG15kL*Qf5t}VYT)p*p)4TVj1Uf=I_4FM<|ctvhL-|GkDazp9>

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/dx11/chains/pillarbox_right_horizontal/fs_blit.bin b/bgfx/shaders/dx11/chains/pillarbox_right_horizontal/fs_blit.bin
new file mode 100644
index 0000000000000000000000000000000000000000..80d85fb110742d3ae2415a237aee617a3e0c7b8c
GIT binary patch
literal 396
zcmZ<@_F!Rb{`8QMfwefkB(=hTk%57cp@7jP!pV7G#q*_-JO!_PHm;EuYk4^xC<T;Z
zU|<H)IzYSth_3*#XRy0p4v+?ka{zGw5Q6|nJxB}$_<=YE%z_XgagaPeP$CIUoC(Nh
z1}X>+ix2P*_6+g#_hWGO_wf&62yu;Y_V*8RVOZ@Cv=ih8kQpF56@VB9knIGT5#ku+
z?i#|ddUddeOVAXcA_pK=1>z`>^AZGrECz-M2?iF10th=a6zC=a2Ifx!0$}q&Y$G5W
z<gQepo=*x8br}o{Od$JR85lS}F+jxJpz7S}Abgnl77PsRFnw-(P_=Rp^X(wsU;qHi
C*D!kk

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/dx11/chains/pillarbox_right_horizontal/fs_gaussian.bin b/bgfx/shaders/dx11/chains/pillarbox_right_horizontal/fs_gaussian.bin
new file mode 100644
index 0000000000000000000000000000000000000000..753b0d31bff79044be4f077e0e1acf3902c75bc4
GIT binary patch
literal 2663
zcmcIm&ubGw82vIy`nwv6V2=x4J%k?o)kLQz-L@)CNm8jrh)N>{v`S;4h)C3ny$FIQ
z@lfzs5d^)9q7*z81U-pf`~xa@_PyCm*i1G#>A=fwzIop_@6CRhjbEBg#2)VbOvvzh
z<#u(WQm@^qrpH7i#>h(TMs>AbySX|hDMSX=D{GfmYU}ke@$fZSXG%Io^7v4G>2z-S
z)!FjZL%T0Gy}MhRpDz8z6lO%?xE=<!fG@yYX=eU9u8a==3jhcCjB)G-E}FaGgK^F?
zekBN*PsSAx$4%*cWuZ`-E6)|?C096CC`x&HDOV^I^RivQn$*A=T+;*W2(O76<*DM#
zbXm5yOSAc6W>7?fSim9|L=ygE&!jPDnQ||s%=e{nNyx3>esK{RQxcy@rHr;Jcza$j
zcMWn!ka0|8a01)P;Ws>UrMAB2Jw5G%)E39#GGRhwbPsXn`H56xia`ve@gW*tiL`-#
zAkZ?6b(zEZzlNH*_W~W(i{-??@ojyF1N}p5nBzY9DyXM41n(T2w7?WKj)ZxvsWkfG
z{?ii{2$>qJWj!Sr>+s~k3z0H#Jtdg~O(xgTYdvv}zN0v<R@PHmWPbO_qy<7@t!>^|
zQ)!WJ&*K>jgu;CDy!sgH@Fws?{LqB!t)DsYW^%iD;~c$3aa?b#r?kjUu9C4pD6F;3
z8*3^p^61a&j0HkrzVXK2R;Raj$RxH5TyOY^8E+=Hi#N{ETNKCj#(GMNd^nTLS|AkG
z+UAWll@`grn9N!r6y_UmILactHIPYY1J~OybMV|uZWnKyqqiuI>y7o47I}MgBWr<B
zSZkX%)>Im&!0fZE1wvu|=zHkn=<DoB6UT=p`kXVw>L$r|yt%rqj_=3cWGze{&W`5!
zI}oMgU#$80>&L8xvu1y2O-{-GT#tL=uBS9tZ4HgP);^QZv)c4UB6voMjApL|eb?wX
zE689!addkwW)6GLp|ps7CcGll>JNKvnseT2ah|p1*nTj29ggjXaBZcd`;r`&Z~Mpg
zJg?;O-NWJXd;O-P_`S}ID1NW=FpA&nyp7`bdY44;d%dfo_zFR#JKxuB`{^}%2zwlB
e^6fjDSA<&oe?%ntpvjM+E_(CSN%MCrEq?*u7eF`w

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/dx11/chains/pillarbox_right_horizontal/fs_saturation.bin b/bgfx/shaders/dx11/chains/pillarbox_right_horizontal/fs_saturation.bin
new file mode 100644
index 0000000000000000000000000000000000000000..eaec59b81d7e206ae62ad1d00702e2031c7fa82e
GIT binary patch
literal 523
zcmYjLu}Z^G6un8)QbjO!C@w<4Q3vVZAXr<|qzy=4O;U*>#0mukvC=lsL8R#5<}NPc
z+And}&Bf74$R;kHo0otW&U^RWbKbef_F9^97k{d>5QU@OI2!iG=Yz`<5h;`(h2#EY
zL*f2IX#~6G>vujH{49BE`%l-=@5(ADFhn`r>%cSc1~^``eSw?jMW6$4v7TpKi@<Tx
z$%E(2^ZZnfl9T5ukVE4ggdO2Iz9ZUXiap_yZw00hZi8k5J2?Y;@J<8B>i<r7_;t5w
z`81n(t%l1VY7jCGi8TAcKqq~UIPQs_yn|)Z=t}n8E;8zrtLS=?tq)ynNbU@AIj==D
z7n7XXsm{KU@5~dg`4Tjo*;XZ|)`;%QkJT5eyz@T!+6Ki{9A;jru0Z;<4ubzy;4@73
aXFi3g0Y(<IiEfi9f1B#IQom|qq0=8{usx;#

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/dx11/chains/pillarbox_right_horizontal/vs_blit.bin b/bgfx/shaders/dx11/chains/pillarbox_right_horizontal/vs_blit.bin
new file mode 100644
index 0000000000000000000000000000000000000000..b0bebf9da4c8f62f3a2c050041aa49355e4d94d9
GIT binary patch
literal 575
zcmZ9I%}T>S6oqdxsfHppAVNWqf-YTUAzeu^F*cx`kd#nS2nfX=go2<xfP0_7H}Hkr
zx^)@Qwdc$@MI5*{C*Qp@XXe(`IPjj^4^O%e&Ew7dskmR<1|kwj-%n?UiNE!^8@(@f
zzP`QTdAM=vq1N|B6ux_iS40GuSI3iUXz~zIAlxG3>h(lwD@`Wnd8-i3KMo5~;E6ub
zr4+i#r@5ZU^k|l7U8bVpcgG&YUq7Bl#sxdMFv=!!*2ym|GMU`?t%+21voy2bOUt)v
zoR&ObgfzmQGmI&F89;Gf<_)TiBJ+>;s2G}lPSfKGt?j_}ur@~@|DBGZ*@s#BWJ5f!
z7298L+CJyWdMwg)b;p5a<<~n~w|jv?=j)j3=ll0XI_@6Xw%tSK?vvp>-s^xPR2`%U
GGxz~&T{$TL

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/dx11/chains/pillarbox_right_horizontal/vs_gaussian.bin b/bgfx/shaders/dx11/chains/pillarbox_right_horizontal/vs_gaussian.bin
new file mode 100644
index 0000000000000000000000000000000000000000..b0bebf9da4c8f62f3a2c050041aa49355e4d94d9
GIT binary patch
literal 575
zcmZ9I%}T>S6oqdxsfHppAVNWqf-YTUAzeu^F*cx`kd#nS2nfX=go2<xfP0_7H}Hkr
zx^)@Qwdc$@MI5*{C*Qp@XXe(`IPjj^4^O%e&Ew7dskmR<1|kwj-%n?UiNE!^8@(@f
zzP`QTdAM=vq1N|B6ux_iS40GuSI3iUXz~zIAlxG3>h(lwD@`Wnd8-i3KMo5~;E6ub
zr4+i#r@5ZU^k|l7U8bVpcgG&YUq7Bl#sxdMFv=!!*2ym|GMU`?t%+21voy2bOUt)v
zoR&ObgfzmQGmI&F89;Gf<_)TiBJ+>;s2G}lPSfKGt?j_}ur@~@|DBGZ*@s#BWJ5f!
z7298L+CJyWdMwg)b;p5a<<~n~w|jv?=j)j3=ll0XI_@6Xw%tSK?vvp>-s^xPR2`%U
GGxz~&T{$TL

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/dx11/chains/pillarbox_right_horizontal/vs_saturation.bin b/bgfx/shaders/dx11/chains/pillarbox_right_horizontal/vs_saturation.bin
new file mode 100644
index 0000000000000000000000000000000000000000..b57b9cd363340682f27c7c3ea7ec2fb4cbbabd40
GIT binary patch
literal 615
zcmZ8dyGjE=6g|6}Xb57qv6Yk}Rw=~BWO3t~NXRVNutX37O7MXsAgGO93RBry=ogsQ
z&q(kKENuLM{Q&XY87GJr?wvE|KF-WdlSa-NXP*v=H~rg-!Cibky37H{A#m%xz3?gg
zc>BH|J-?qm48JfOILrku;PKp|ztDY>&E%kcPAq(Z9@DJ}Csrx}sew8QFY}fO`u})J
zz#|{3mg*o@NweEjZFKj0p;DbX6!os8hW=Mi<_RZ8IUH+bg7A_T{=`r^3a|B6fF$iN
z#EkYra+);ioed5MIOUK%M_g0%Sk^OSXZ(Yg`M$mjt`Li!#iDV>o~&$YBsY*A-Yu>W
zOC5LV3b(`WWia*WnyIszlCJ<oo3}h^Ed6RntEQJ!!RlJh*3195fxLZ3v~GGhyJX)J
nah|-(4S>m{P@T_OHD0y30Wf{ttj%Y$UBduXS+$pE@VT!awJ$|d

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/dx11/chains/pillarbox_right_vertical/fs_blit.bin b/bgfx/shaders/dx11/chains/pillarbox_right_vertical/fs_blit.bin
new file mode 100644
index 0000000000000000000000000000000000000000..80d85fb110742d3ae2415a237aee617a3e0c7b8c
GIT binary patch
literal 396
zcmZ<@_F!Rb{`8QMfwefkB(=hTk%57cp@7jP!pV7G#q*_-JO!_PHm;EuYk4^xC<T;Z
zU|<H)IzYSth_3*#XRy0p4v+?ka{zGw5Q6|nJxB}$_<=YE%z_XgagaPeP$CIUoC(Nh
z1}X>+ix2P*_6+g#_hWGO_wf&62yu;Y_V*8RVOZ@Cv=ih8kQpF56@VB9knIGT5#ku+
z?i#|ddUddeOVAXcA_pK=1>z`>^AZGrECz-M2?iF10th=a6zC=a2Ifx!0$}q&Y$G5W
z<gQepo=*x8br}o{Od$JR85lS}F+jxJpz7S}Abgnl77PsRFnw-(P_=Rp^X(wsU;qHi
C*D!kk

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/dx11/chains/pillarbox_right_vertical/fs_gaussian.bin b/bgfx/shaders/dx11/chains/pillarbox_right_vertical/fs_gaussian.bin
new file mode 100644
index 0000000000000000000000000000000000000000..753b0d31bff79044be4f077e0e1acf3902c75bc4
GIT binary patch
literal 2663
zcmcIm&ubGw82vIy`nwv6V2=x4J%k?o)kLQz-L@)CNm8jrh)N>{v`S;4h)C3ny$FIQ
z@lfzs5d^)9q7*z81U-pf`~xa@_PyCm*i1G#>A=fwzIop_@6CRhjbEBg#2)VbOvvzh
z<#u(WQm@^qrpH7i#>h(TMs>AbySX|hDMSX=D{GfmYU}ke@$fZSXG%Io^7v4G>2z-S
z)!FjZL%T0Gy}MhRpDz8z6lO%?xE=<!fG@yYX=eU9u8a==3jhcCjB)G-E}FaGgK^F?
zekBN*PsSAx$4%*cWuZ`-E6)|?C096CC`x&HDOV^I^RivQn$*A=T+;*W2(O76<*DM#
zbXm5yOSAc6W>7?fSim9|L=ygE&!jPDnQ||s%=e{nNyx3>esK{RQxcy@rHr;Jcza$j
zcMWn!ka0|8a01)P;Ws>UrMAB2Jw5G%)E39#GGRhwbPsXn`H56xia`ve@gW*tiL`-#
zAkZ?6b(zEZzlNH*_W~W(i{-??@ojyF1N}p5nBzY9DyXM41n(T2w7?WKj)ZxvsWkfG
z{?ii{2$>qJWj!Sr>+s~k3z0H#Jtdg~O(xgTYdvv}zN0v<R@PHmWPbO_qy<7@t!>^|
zQ)!WJ&*K>jgu;CDy!sgH@Fws?{LqB!t)DsYW^%iD;~c$3aa?b#r?kjUu9C4pD6F;3
z8*3^p^61a&j0HkrzVXK2R;Raj$RxH5TyOY^8E+=Hi#N{ETNKCj#(GMNd^nTLS|AkG
z+UAWll@`grn9N!r6y_UmILactHIPYY1J~OybMV|uZWnKyqqiuI>y7o47I}MgBWr<B
zSZkX%)>Im&!0fZE1wvu|=zHkn=<DoB6UT=p`kXVw>L$r|yt%rqj_=3cWGze{&W`5!
zI}oMgU#$80>&L8xvu1y2O-{-GT#tL=uBS9tZ4HgP);^QZv)c4UB6voMjApL|eb?wX
zE689!addkwW)6GLp|ps7CcGll>JNKvnseT2ah|p1*nTj29ggjXaBZcd`;r`&Z~Mpg
zJg?;O-NWJXd;O-P_`S}ID1NW=FpA&nyp7`bdY44;d%dfo_zFR#JKxuB`{^}%2zwlB
e^6fjDSA<&oe?%ntpvjM+E_(CSN%MCrEq?*u7eF`w

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/dx11/chains/pillarbox_right_vertical/fs_saturation.bin b/bgfx/shaders/dx11/chains/pillarbox_right_vertical/fs_saturation.bin
new file mode 100644
index 0000000000000000000000000000000000000000..eaec59b81d7e206ae62ad1d00702e2031c7fa82e
GIT binary patch
literal 523
zcmYjLu}Z^G6un8)QbjO!C@w<4Q3vVZAXr<|qzy=4O;U*>#0mukvC=lsL8R#5<}NPc
z+And}&Bf74$R;kHo0otW&U^RWbKbef_F9^97k{d>5QU@OI2!iG=Yz`<5h;`(h2#EY
zL*f2IX#~6G>vujH{49BE`%l-=@5(ADFhn`r>%cSc1~^``eSw?jMW6$4v7TpKi@<Tx
z$%E(2^ZZnfl9T5ukVE4ggdO2Iz9ZUXiap_yZw00hZi8k5J2?Y;@J<8B>i<r7_;t5w
z`81n(t%l1VY7jCGi8TAcKqq~UIPQs_yn|)Z=t}n8E;8zrtLS=?tq)ynNbU@AIj==D
z7n7XXsm{KU@5~dg`4Tjo*;XZ|)`;%QkJT5eyz@T!+6Ki{9A;jru0Z;<4ubzy;4@73
aXFi3g0Y(<IiEfi9f1B#IQom|qq0=8{usx;#

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/dx11/chains/pillarbox_right_vertical/vs_blit.bin b/bgfx/shaders/dx11/chains/pillarbox_right_vertical/vs_blit.bin
new file mode 100644
index 0000000000000000000000000000000000000000..b0bebf9da4c8f62f3a2c050041aa49355e4d94d9
GIT binary patch
literal 575
zcmZ9I%}T>S6oqdxsfHppAVNWqf-YTUAzeu^F*cx`kd#nS2nfX=go2<xfP0_7H}Hkr
zx^)@Qwdc$@MI5*{C*Qp@XXe(`IPjj^4^O%e&Ew7dskmR<1|kwj-%n?UiNE!^8@(@f
zzP`QTdAM=vq1N|B6ux_iS40GuSI3iUXz~zIAlxG3>h(lwD@`Wnd8-i3KMo5~;E6ub
zr4+i#r@5ZU^k|l7U8bVpcgG&YUq7Bl#sxdMFv=!!*2ym|GMU`?t%+21voy2bOUt)v
zoR&ObgfzmQGmI&F89;Gf<_)TiBJ+>;s2G}lPSfKGt?j_}ur@~@|DBGZ*@s#BWJ5f!
z7298L+CJyWdMwg)b;p5a<<~n~w|jv?=j)j3=ll0XI_@6Xw%tSK?vvp>-s^xPR2`%U
GGxz~&T{$TL

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/dx11/chains/pillarbox_right_vertical/vs_gaussian.bin b/bgfx/shaders/dx11/chains/pillarbox_right_vertical/vs_gaussian.bin
new file mode 100644
index 0000000000000000000000000000000000000000..b0bebf9da4c8f62f3a2c050041aa49355e4d94d9
GIT binary patch
literal 575
zcmZ9I%}T>S6oqdxsfHppAVNWqf-YTUAzeu^F*cx`kd#nS2nfX=go2<xfP0_7H}Hkr
zx^)@Qwdc$@MI5*{C*Qp@XXe(`IPjj^4^O%e&Ew7dskmR<1|kwj-%n?UiNE!^8@(@f
zzP`QTdAM=vq1N|B6ux_iS40GuSI3iUXz~zIAlxG3>h(lwD@`Wnd8-i3KMo5~;E6ub
zr4+i#r@5ZU^k|l7U8bVpcgG&YUq7Bl#sxdMFv=!!*2ym|GMU`?t%+21voy2bOUt)v
zoR&ObgfzmQGmI&F89;Gf<_)TiBJ+>;s2G}lPSfKGt?j_}ur@~@|DBGZ*@s#BWJ5f!
z7298L+CJyWdMwg)b;p5a<<~n~w|jv?=j)j3=ll0XI_@6Xw%tSK?vvp>-s^xPR2`%U
GGxz~&T{$TL

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/dx11/chains/pillarbox_right_vertical/vs_saturation.bin b/bgfx/shaders/dx11/chains/pillarbox_right_vertical/vs_saturation.bin
new file mode 100644
index 0000000000000000000000000000000000000000..7229773bd56f27f895e0bd23e0981fa4cde26dfc
GIT binary patch
literal 615
zcmZ9Iy-EW?6oqeg6Ag)&ZNx?-rG-_HXcM!zam`A|EZML`5CTf@2SE^wU@MmT1eP{p
zsjpxm#3!)w71kH<oEayG19#@mcYn^zO_O#$cawePq;xqPpNy{Ji}TaGh~&k0T7#`1
zez`3_y_eSCuFJvNXZ<^enD2<VI9Fj0Fb^<FcDl##$&0WUW)~S(r6Q6VSMTKPHw$O@
zk3&LS@IZA`Phyos{YZ7CzdZ<)>a|2c?~FOHzk2LP#sxXq*PhwP87Dt5NblrYZ%!mh
zhf^`5J(YY;+O6IS8u;k4i<&)*DZH=h9-JBe;AWnu@APZ%sb_s^9HAzwnjFSPtij#-
zHTcZKEFH29d@mD|pDvg@tI2pxq-5ik1Ix^>b~tZpfr?hwGMmr;*F_5U9pSR6LGOxv
oPl$eem*b0kOghb_*Tp8TdO1GXr15xn*f2z7lcRPE*gVYZ2eu|daR2}S

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/dx9/chains/pillarbox_left_horizontal/fs_blit.bin b/bgfx/shaders/dx9/chains/pillarbox_left_horizontal/fs_blit.bin
new file mode 100644
index 0000000000000000000000000000000000000000..ef8fa0730c3a16c8151d82c7394b35a81d1f1d40
GIT binary patch
literal 241
zcmX9&OA3Ne6g@8$A_6xMB#mk!?_q?~48nmCWOIo!5(-5fGz{8+?V!0EY8tqL7SQWH
zyO+Z`_uLP68TvZAf8Gp65tZ?kGl1a*Xi|RV2#f998vs}nlt*o-8V|rH;slMr(1A;=
zqCJGV*3l<l<v+3_aw3jZvd_~ZJ(kvZGqL<246N|9JH)xQNH1A(CLy@ZZNa$^wwO8Y
r6!j43^ne>+R!SSB8MIc@^$K0{>9wzz<Tq3|Pnyxlr=3Qjl9DEWt<W*O

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/dx9/chains/pillarbox_left_horizontal/fs_gaussian.bin b/bgfx/shaders/dx9/chains/pillarbox_left_horizontal/fs_gaussian.bin
new file mode 100644
index 0000000000000000000000000000000000000000..222205d0983465e461448ac14a8c1b4e22edb03a
GIT binary patch
literal 1512
zcmZ9LKWG$D5XNV3|0Z`3Nn;~;rGkV#BL2%A?j=EjL{X#l63mGQNiO7a5Ue(6VVQuH
zq*$>ssRYwm2qFZmth5q^t5aB5x_;k#ySc|6yxTY5%>4Gfnb})Q3y$^t&u>TEe!SJ$
z4lNN&s)Kl?yVhCncYEuTmIWmk#GA`2-9dlSs^|a&$NlcJPB^Jj_Fb{F>|fTBxrgo9
zb0YE)i<*N6ZP^n!!ebT7#<HX$TX^#K0*hRrWS0VdDON?PBki5im^;$cx#jTCk(wgV
z$DeTr=r)$4^0ZIi20^Fykd1yk9fxwK`*^e0?>*V7UwCk_zOcBoSYLX&ywcgM&-K<e
zx~teU!l`ho5r&P%RO8C@waao}#I<E26^Ys+VLLcJJ9BC0)eY*7((BOAwC{e~oB6SC
zH>tZy{}kb-(dXN4YyRy_i@K-u1bP%5UEOYl3$K;#D_x?W*FUtre*e-ENp3Pe&^q|P
zqT{)^`SS1k=6RIPMF1+j%e}B%!9<GMU~eV(OW{WwY{W=n$uRZcLkDQ*`wI4t^0*rI
z^N5>I&`+l#6R=MbTkgGqzB>yL?ho!sBEc}F&6tV|mCbiK;v;^Db&!%ln|@m|*h9rd
zO%&HLxTr_s<{WYv<L2)vIG)NUS98c_j$^P<KgA9VHfopn2AeT{i5<Wns56h)%n1zk
zSk870_BgaLgUy(+5_=qex5Q?SYp|<1+cVfTXjOyFm}-e#gWoH$nd2F3OW4;T?kuN$
zB+DwXnCD{_iu&q2H4i)NKl^~zC>CakPc;+z?6C8huu5zTePX<CoRgY<-$6>>h<(Cy
zrey2B>wbFTLen!S;PXCwpU(4@&9jrm`QaIOkK#=DK4I&*EpiykI+0aq%wauEt>~4h
q6+JbzVqQ$Gm@88&X4ce-**3M}J37^Z(YHiRedj@ddSz*riO7E^1xQB#

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/dx9/chains/pillarbox_left_horizontal/fs_saturation.bin b/bgfx/shaders/dx9/chains/pillarbox_left_horizontal/fs_saturation.bin
new file mode 100644
index 0000000000000000000000000000000000000000..5fe87a15fb52ece4b2651e3427458ce2934cf97c
GIT binary patch
literal 372
zcmYjMJxjw-6g@9ZFhe2W&`B_(F7btmxTx5wWQc>tQ3ydR2C6AZ3LP9G9lF-hEx6|Q
z_ydG2uKobyd8vr^ak%fCd$=EGfv1c4*M|lp3-i%T3P7Mc4YMeprcoXzkL#`E33Qs~
zyV=3;>UgjLU`{AaV^SP1z!TF6(IEsh_{=J<3FTuej0qL(JXDpAE_L-*@qaeU6$i7X
z|J5g1*bgPn<C`?elDpjAy4<!sKk)6~KDr&H_Aq&v#AAM3=}5<w(sdnoufM;G>H;tX
zta8zNJ$yUu9lg&!57g96u4e!RH(#nhr6o+O9JHrc)NAs(G|9QC;)Ot6(#TWSemS0X
Wa8Yx`*`wr5^s%35($f@8L-hw=t4n(T

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/dx9/chains/pillarbox_left_horizontal/vs_blit.bin b/bgfx/shaders/dx9/chains/pillarbox_left_horizontal/vs_blit.bin
new file mode 100644
index 0000000000000000000000000000000000000000..ea94c83e62deecbb1897164a60e4cbd4bd062aac
GIT binary patch
literal 330
zcmYjLOG*P#5Ulrclg(T}aKMd$FuX@ZvdAW8lf?*<QMZF=#1X@UNsQZo7Z`8gK9?FH
zC&&RZsZJuXc|})uSJ&%@WMI|T`d6Xxk<PQx=WUU{Sp`_M6wIdH)aU5m^{!6=B!u)h
zhSc~5VkSpu!V+CV;^>B@f#J+T_9W)hw4FNKWKTst&0l8W#jqI;;v^1}*T?5k5%%-(
zBzq_EE^?7~&ilw;wL6zsp7E;&umFNmIPDhdz)#5azdkk9pPrf>-)l_8Y&hrc>PO+e
h<n4R`eWgapOs}1$5^nZ=Ek3MEYP5!_G<jX~iY+(YL398B

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/dx9/chains/pillarbox_left_horizontal/vs_gaussian.bin b/bgfx/shaders/dx9/chains/pillarbox_left_horizontal/vs_gaussian.bin
new file mode 100644
index 0000000000000000000000000000000000000000..ea94c83e62deecbb1897164a60e4cbd4bd062aac
GIT binary patch
literal 330
zcmYjLOG*P#5Ulrclg(T}aKMd$FuX@ZvdAW8lf?*<QMZF=#1X@UNsQZo7Z`8gK9?FH
zC&&RZsZJuXc|})uSJ&%@WMI|T`d6Xxk<PQx=WUU{Sp`_M6wIdH)aU5m^{!6=B!u)h
zhSc~5VkSpu!V+CV;^>B@f#J+T_9W)hw4FNKWKTst&0l8W#jqI;;v^1}*T?5k5%%-(
zBzq_EE^?7~&ilw;wL6zsp7E;&umFNmIPDhdz)#5azdkk9pPrf>-)l_8Y&hrc>PO+e
h<n4R`eWgapOs}1$5^nZ=Ek3MEYP5!_G<jX~iY+(YL398B

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/dx9/chains/pillarbox_left_horizontal/vs_saturation.bin b/bgfx/shaders/dx9/chains/pillarbox_left_horizontal/vs_saturation.bin
new file mode 100644
index 0000000000000000000000000000000000000000..bc748ecc4c232c984c39d5c8e978b968e452d40c
GIT binary patch
literal 362
zcmYk1y-EW?6ot?1OhD4?3kWXQXtT@^5et9NG$}?<S8W&3h%3s<Mq?YWNx8m3`n*bf
zhZRy=<N>ldH!3>J;huZ%H+N<(la5huvrmQQOWM!6uO~%*ZxmqQ74*EG*XwAXA0Dj&
zNGPeX4axBicm_)al%aMhS%1?o*3j%3$T?a4UfN16j<f3`@8!48(Z<<k)bWXrlDn&$
zZV|Qf$EWOp#@X1$&RXYUx82&=!uS+u7=)wYaAp5v;twds$=({D&;$lRSc>O01NGw@
z^ufP6nd+A(v-IDLt{64@JUbmJT$KD1cgVStqh#c)B~yvltP2xBR{^HvCI1pOklAF)
Hy5?&ZWSLF-

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/dx9/chains/pillarbox_left_vertical/fs_blit.bin b/bgfx/shaders/dx9/chains/pillarbox_left_vertical/fs_blit.bin
new file mode 100644
index 0000000000000000000000000000000000000000..ef8fa0730c3a16c8151d82c7394b35a81d1f1d40
GIT binary patch
literal 241
zcmX9&OA3Ne6g@8$A_6xMB#mk!?_q?~48nmCWOIo!5(-5fGz{8+?V!0EY8tqL7SQWH
zyO+Z`_uLP68TvZAf8Gp65tZ?kGl1a*Xi|RV2#f998vs}nlt*o-8V|rH;slMr(1A;=
zqCJGV*3l<l<v+3_aw3jZvd_~ZJ(kvZGqL<246N|9JH)xQNH1A(CLy@ZZNa$^wwO8Y
r6!j43^ne>+R!SSB8MIc@^$K0{>9wzz<Tq3|Pnyxlr=3Qjl9DEWt<W*O

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/dx9/chains/pillarbox_left_vertical/fs_gaussian.bin b/bgfx/shaders/dx9/chains/pillarbox_left_vertical/fs_gaussian.bin
new file mode 100644
index 0000000000000000000000000000000000000000..222205d0983465e461448ac14a8c1b4e22edb03a
GIT binary patch
literal 1512
zcmZ9LKWG$D5XNV3|0Z`3Nn;~;rGkV#BL2%A?j=EjL{X#l63mGQNiO7a5Ue(6VVQuH
zq*$>ssRYwm2qFZmth5q^t5aB5x_;k#ySc|6yxTY5%>4Gfnb})Q3y$^t&u>TEe!SJ$
z4lNN&s)Kl?yVhCncYEuTmIWmk#GA`2-9dlSs^|a&$NlcJPB^Jj_Fb{F>|fTBxrgo9
zb0YE)i<*N6ZP^n!!ebT7#<HX$TX^#K0*hRrWS0VdDON?PBki5im^;$cx#jTCk(wgV
z$DeTr=r)$4^0ZIi20^Fykd1yk9fxwK`*^e0?>*V7UwCk_zOcBoSYLX&ywcgM&-K<e
zx~teU!l`ho5r&P%RO8C@waao}#I<E26^Ys+VLLcJJ9BC0)eY*7((BOAwC{e~oB6SC
zH>tZy{}kb-(dXN4YyRy_i@K-u1bP%5UEOYl3$K;#D_x?W*FUtre*e-ENp3Pe&^q|P
zqT{)^`SS1k=6RIPMF1+j%e}B%!9<GMU~eV(OW{WwY{W=n$uRZcLkDQ*`wI4t^0*rI
z^N5>I&`+l#6R=MbTkgGqzB>yL?ho!sBEc}F&6tV|mCbiK;v;^Db&!%ln|@m|*h9rd
zO%&HLxTr_s<{WYv<L2)vIG)NUS98c_j$^P<KgA9VHfopn2AeT{i5<Wns56h)%n1zk
zSk870_BgaLgUy(+5_=qex5Q?SYp|<1+cVfTXjOyFm}-e#gWoH$nd2F3OW4;T?kuN$
zB+DwXnCD{_iu&q2H4i)NKl^~zC>CakPc;+z?6C8huu5zTePX<CoRgY<-$6>>h<(Cy
zrey2B>wbFTLen!S;PXCwpU(4@&9jrm`QaIOkK#=DK4I&*EpiykI+0aq%wauEt>~4h
q6+JbzVqQ$Gm@88&X4ce-**3M}J37^Z(YHiRedj@ddSz*riO7E^1xQB#

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/dx9/chains/pillarbox_left_vertical/fs_saturation.bin b/bgfx/shaders/dx9/chains/pillarbox_left_vertical/fs_saturation.bin
new file mode 100644
index 0000000000000000000000000000000000000000..5fe87a15fb52ece4b2651e3427458ce2934cf97c
GIT binary patch
literal 372
zcmYjMJxjw-6g@9ZFhe2W&`B_(F7btmxTx5wWQc>tQ3ydR2C6AZ3LP9G9lF-hEx6|Q
z_ydG2uKobyd8vr^ak%fCd$=EGfv1c4*M|lp3-i%T3P7Mc4YMeprcoXzkL#`E33Qs~
zyV=3;>UgjLU`{AaV^SP1z!TF6(IEsh_{=J<3FTuej0qL(JXDpAE_L-*@qaeU6$i7X
z|J5g1*bgPn<C`?elDpjAy4<!sKk)6~KDr&H_Aq&v#AAM3=}5<w(sdnoufM;G>H;tX
zta8zNJ$yUu9lg&!57g96u4e!RH(#nhr6o+O9JHrc)NAs(G|9QC;)Ot6(#TWSemS0X
Wa8Yx`*`wr5^s%35($f@8L-hw=t4n(T

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/dx9/chains/pillarbox_left_vertical/vs_blit.bin b/bgfx/shaders/dx9/chains/pillarbox_left_vertical/vs_blit.bin
new file mode 100644
index 0000000000000000000000000000000000000000..ea94c83e62deecbb1897164a60e4cbd4bd062aac
GIT binary patch
literal 330
zcmYjLOG*P#5Ulrclg(T}aKMd$FuX@ZvdAW8lf?*<QMZF=#1X@UNsQZo7Z`8gK9?FH
zC&&RZsZJuXc|})uSJ&%@WMI|T`d6Xxk<PQx=WUU{Sp`_M6wIdH)aU5m^{!6=B!u)h
zhSc~5VkSpu!V+CV;^>B@f#J+T_9W)hw4FNKWKTst&0l8W#jqI;;v^1}*T?5k5%%-(
zBzq_EE^?7~&ilw;wL6zsp7E;&umFNmIPDhdz)#5azdkk9pPrf>-)l_8Y&hrc>PO+e
h<n4R`eWgapOs}1$5^nZ=Ek3MEYP5!_G<jX~iY+(YL398B

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/dx9/chains/pillarbox_left_vertical/vs_gaussian.bin b/bgfx/shaders/dx9/chains/pillarbox_left_vertical/vs_gaussian.bin
new file mode 100644
index 0000000000000000000000000000000000000000..ea94c83e62deecbb1897164a60e4cbd4bd062aac
GIT binary patch
literal 330
zcmYjLOG*P#5Ulrclg(T}aKMd$FuX@ZvdAW8lf?*<QMZF=#1X@UNsQZo7Z`8gK9?FH
zC&&RZsZJuXc|})uSJ&%@WMI|T`d6Xxk<PQx=WUU{Sp`_M6wIdH)aU5m^{!6=B!u)h
zhSc~5VkSpu!V+CV;^>B@f#J+T_9W)hw4FNKWKTst&0l8W#jqI;;v^1}*T?5k5%%-(
zBzq_EE^?7~&ilw;wL6zsp7E;&umFNmIPDhdz)#5azdkk9pPrf>-)l_8Y&hrc>PO+e
h<n4R`eWgapOs}1$5^nZ=Ek3MEYP5!_G<jX~iY+(YL398B

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/dx9/chains/pillarbox_left_vertical/vs_saturation.bin b/bgfx/shaders/dx9/chains/pillarbox_left_vertical/vs_saturation.bin
new file mode 100644
index 0000000000000000000000000000000000000000..d504cc35b51a68a8b868fdd57fc2f239e0aec626
GIT binary patch
literal 362
zcmYk1u}T9$5QhJ~-85;gv<Y}%qs_5LL@d;xX;NH3J+(bVBc3QH7maN|AK-k0^l7aG
z-{A5N7f5Z92gvzPRCL*&`Df<a+1<0KW7P9}s!)H72TAYgFiUTY0t`Y0y{Hz|8rmoO
z2MqubB{jAoIbMN~!BP%os2xhy-!zOhG<ybePS&6wH)D%#a*?I|^y<M|Ki=><VHA4N
z_4#El^V;d%eR4|^Sl{}AwL#zqTg~lFjE{htfjgQMVXN`B(wY>-?)%5f-YTC^2Zn%~
zi{~{%_2X;w&c8aD@|P#G^xupw88!PnI~ysS=KK@4%ej&xXXLCUQ;OHD3*$hS4rb&f
P{}k4d*<|vn;%mMDR^3hE

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/dx9/chains/pillarbox_right_horizontal/fs_blit.bin b/bgfx/shaders/dx9/chains/pillarbox_right_horizontal/fs_blit.bin
new file mode 100644
index 0000000000000000000000000000000000000000..ef8fa0730c3a16c8151d82c7394b35a81d1f1d40
GIT binary patch
literal 241
zcmX9&OA3Ne6g@8$A_6xMB#mk!?_q?~48nmCWOIo!5(-5fGz{8+?V!0EY8tqL7SQWH
zyO+Z`_uLP68TvZAf8Gp65tZ?kGl1a*Xi|RV2#f998vs}nlt*o-8V|rH;slMr(1A;=
zqCJGV*3l<l<v+3_aw3jZvd_~ZJ(kvZGqL<246N|9JH)xQNH1A(CLy@ZZNa$^wwO8Y
r6!j43^ne>+R!SSB8MIc@^$K0{>9wzz<Tq3|Pnyxlr=3Qjl9DEWt<W*O

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/dx9/chains/pillarbox_right_horizontal/fs_gaussian.bin b/bgfx/shaders/dx9/chains/pillarbox_right_horizontal/fs_gaussian.bin
new file mode 100644
index 0000000000000000000000000000000000000000..222205d0983465e461448ac14a8c1b4e22edb03a
GIT binary patch
literal 1512
zcmZ9LKWG$D5XNV3|0Z`3Nn;~;rGkV#BL2%A?j=EjL{X#l63mGQNiO7a5Ue(6VVQuH
zq*$>ssRYwm2qFZmth5q^t5aB5x_;k#ySc|6yxTY5%>4Gfnb})Q3y$^t&u>TEe!SJ$
z4lNN&s)Kl?yVhCncYEuTmIWmk#GA`2-9dlSs^|a&$NlcJPB^Jj_Fb{F>|fTBxrgo9
zb0YE)i<*N6ZP^n!!ebT7#<HX$TX^#K0*hRrWS0VdDON?PBki5im^;$cx#jTCk(wgV
z$DeTr=r)$4^0ZIi20^Fykd1yk9fxwK`*^e0?>*V7UwCk_zOcBoSYLX&ywcgM&-K<e
zx~teU!l`ho5r&P%RO8C@waao}#I<E26^Ys+VLLcJJ9BC0)eY*7((BOAwC{e~oB6SC
zH>tZy{}kb-(dXN4YyRy_i@K-u1bP%5UEOYl3$K;#D_x?W*FUtre*e-ENp3Pe&^q|P
zqT{)^`SS1k=6RIPMF1+j%e}B%!9<GMU~eV(OW{WwY{W=n$uRZcLkDQ*`wI4t^0*rI
z^N5>I&`+l#6R=MbTkgGqzB>yL?ho!sBEc}F&6tV|mCbiK;v;^Db&!%ln|@m|*h9rd
zO%&HLxTr_s<{WYv<L2)vIG)NUS98c_j$^P<KgA9VHfopn2AeT{i5<Wns56h)%n1zk
zSk870_BgaLgUy(+5_=qex5Q?SYp|<1+cVfTXjOyFm}-e#gWoH$nd2F3OW4;T?kuN$
zB+DwXnCD{_iu&q2H4i)NKl^~zC>CakPc;+z?6C8huu5zTePX<CoRgY<-$6>>h<(Cy
zrey2B>wbFTLen!S;PXCwpU(4@&9jrm`QaIOkK#=DK4I&*EpiykI+0aq%wauEt>~4h
q6+JbzVqQ$Gm@88&X4ce-**3M}J37^Z(YHiRedj@ddSz*riO7E^1xQB#

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/dx9/chains/pillarbox_right_horizontal/fs_saturation.bin b/bgfx/shaders/dx9/chains/pillarbox_right_horizontal/fs_saturation.bin
new file mode 100644
index 0000000000000000000000000000000000000000..5fe87a15fb52ece4b2651e3427458ce2934cf97c
GIT binary patch
literal 372
zcmYjMJxjw-6g@9ZFhe2W&`B_(F7btmxTx5wWQc>tQ3ydR2C6AZ3LP9G9lF-hEx6|Q
z_ydG2uKobyd8vr^ak%fCd$=EGfv1c4*M|lp3-i%T3P7Mc4YMeprcoXzkL#`E33Qs~
zyV=3;>UgjLU`{AaV^SP1z!TF6(IEsh_{=J<3FTuej0qL(JXDpAE_L-*@qaeU6$i7X
z|J5g1*bgPn<C`?elDpjAy4<!sKk)6~KDr&H_Aq&v#AAM3=}5<w(sdnoufM;G>H;tX
zta8zNJ$yUu9lg&!57g96u4e!RH(#nhr6o+O9JHrc)NAs(G|9QC;)Ot6(#TWSemS0X
Wa8Yx`*`wr5^s%35($f@8L-hw=t4n(T

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/dx9/chains/pillarbox_right_horizontal/vs_blit.bin b/bgfx/shaders/dx9/chains/pillarbox_right_horizontal/vs_blit.bin
new file mode 100644
index 0000000000000000000000000000000000000000..ea94c83e62deecbb1897164a60e4cbd4bd062aac
GIT binary patch
literal 330
zcmYjLOG*P#5Ulrclg(T}aKMd$FuX@ZvdAW8lf?*<QMZF=#1X@UNsQZo7Z`8gK9?FH
zC&&RZsZJuXc|})uSJ&%@WMI|T`d6Xxk<PQx=WUU{Sp`_M6wIdH)aU5m^{!6=B!u)h
zhSc~5VkSpu!V+CV;^>B@f#J+T_9W)hw4FNKWKTst&0l8W#jqI;;v^1}*T?5k5%%-(
zBzq_EE^?7~&ilw;wL6zsp7E;&umFNmIPDhdz)#5azdkk9pPrf>-)l_8Y&hrc>PO+e
h<n4R`eWgapOs}1$5^nZ=Ek3MEYP5!_G<jX~iY+(YL398B

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/dx9/chains/pillarbox_right_horizontal/vs_gaussian.bin b/bgfx/shaders/dx9/chains/pillarbox_right_horizontal/vs_gaussian.bin
new file mode 100644
index 0000000000000000000000000000000000000000..ea94c83e62deecbb1897164a60e4cbd4bd062aac
GIT binary patch
literal 330
zcmYjLOG*P#5Ulrclg(T}aKMd$FuX@ZvdAW8lf?*<QMZF=#1X@UNsQZo7Z`8gK9?FH
zC&&RZsZJuXc|})uSJ&%@WMI|T`d6Xxk<PQx=WUU{Sp`_M6wIdH)aU5m^{!6=B!u)h
zhSc~5VkSpu!V+CV;^>B@f#J+T_9W)hw4FNKWKTst&0l8W#jqI;;v^1}*T?5k5%%-(
zBzq_EE^?7~&ilw;wL6zsp7E;&umFNmIPDhdz)#5azdkk9pPrf>-)l_8Y&hrc>PO+e
h<n4R`eWgapOs}1$5^nZ=Ek3MEYP5!_G<jX~iY+(YL398B

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/dx9/chains/pillarbox_right_horizontal/vs_saturation.bin b/bgfx/shaders/dx9/chains/pillarbox_right_horizontal/vs_saturation.bin
new file mode 100644
index 0000000000000000000000000000000000000000..628eff3b5ae58cab5717342e6a541293ddbda7e9
GIT binary patch
literal 362
zcmYk1!AiqG5QhKFZb5p<3kU|hsE4qjA|BMDz4Q>l8uc1PD@K$^s`Xm%(qnvsp3SSI
z?~p>z9(;htf2yL({>(o!-_Gt{L|vm^KW7Tf=XjX(Urw_0&M3ejRM3lhQLm$Oc6hW3
zAflwkHYCRz5HeWGp$xT0$@-gyLPN7>Am?Na2XQO5I8LszbdcUWc^jvjUN?+FFS@<F
z?q^;neRxdnX#(q8Kd?3k{9vcGyN#j;Gz{Fyc)W5jEyH&4zSW+V<^CF<&;&++n~Uc)
zBlY7O^v=IJnd+A(v-IDLt{64@JUgE#oag)#x68SbBWL8SB~yvltPA5nR}SXnCI1lC
Mk=bPOy5?)X03uIKmH+?%

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/dx9/chains/pillarbox_right_vertical/fs_blit.bin b/bgfx/shaders/dx9/chains/pillarbox_right_vertical/fs_blit.bin
new file mode 100644
index 0000000000000000000000000000000000000000..ef8fa0730c3a16c8151d82c7394b35a81d1f1d40
GIT binary patch
literal 241
zcmX9&OA3Ne6g@8$A_6xMB#mk!?_q?~48nmCWOIo!5(-5fGz{8+?V!0EY8tqL7SQWH
zyO+Z`_uLP68TvZAf8Gp65tZ?kGl1a*Xi|RV2#f998vs}nlt*o-8V|rH;slMr(1A;=
zqCJGV*3l<l<v+3_aw3jZvd_~ZJ(kvZGqL<246N|9JH)xQNH1A(CLy@ZZNa$^wwO8Y
r6!j43^ne>+R!SSB8MIc@^$K0{>9wzz<Tq3|Pnyxlr=3Qjl9DEWt<W*O

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/dx9/chains/pillarbox_right_vertical/fs_gaussian.bin b/bgfx/shaders/dx9/chains/pillarbox_right_vertical/fs_gaussian.bin
new file mode 100644
index 0000000000000000000000000000000000000000..222205d0983465e461448ac14a8c1b4e22edb03a
GIT binary patch
literal 1512
zcmZ9LKWG$D5XNV3|0Z`3Nn;~;rGkV#BL2%A?j=EjL{X#l63mGQNiO7a5Ue(6VVQuH
zq*$>ssRYwm2qFZmth5q^t5aB5x_;k#ySc|6yxTY5%>4Gfnb})Q3y$^t&u>TEe!SJ$
z4lNN&s)Kl?yVhCncYEuTmIWmk#GA`2-9dlSs^|a&$NlcJPB^Jj_Fb{F>|fTBxrgo9
zb0YE)i<*N6ZP^n!!ebT7#<HX$TX^#K0*hRrWS0VdDON?PBki5im^;$cx#jTCk(wgV
z$DeTr=r)$4^0ZIi20^Fykd1yk9fxwK`*^e0?>*V7UwCk_zOcBoSYLX&ywcgM&-K<e
zx~teU!l`ho5r&P%RO8C@waao}#I<E26^Ys+VLLcJJ9BC0)eY*7((BOAwC{e~oB6SC
zH>tZy{}kb-(dXN4YyRy_i@K-u1bP%5UEOYl3$K;#D_x?W*FUtre*e-ENp3Pe&^q|P
zqT{)^`SS1k=6RIPMF1+j%e}B%!9<GMU~eV(OW{WwY{W=n$uRZcLkDQ*`wI4t^0*rI
z^N5>I&`+l#6R=MbTkgGqzB>yL?ho!sBEc}F&6tV|mCbiK;v;^Db&!%ln|@m|*h9rd
zO%&HLxTr_s<{WYv<L2)vIG)NUS98c_j$^P<KgA9VHfopn2AeT{i5<Wns56h)%n1zk
zSk870_BgaLgUy(+5_=qex5Q?SYp|<1+cVfTXjOyFm}-e#gWoH$nd2F3OW4;T?kuN$
zB+DwXnCD{_iu&q2H4i)NKl^~zC>CakPc;+z?6C8huu5zTePX<CoRgY<-$6>>h<(Cy
zrey2B>wbFTLen!S;PXCwpU(4@&9jrm`QaIOkK#=DK4I&*EpiykI+0aq%wauEt>~4h
q6+JbzVqQ$Gm@88&X4ce-**3M}J37^Z(YHiRedj@ddSz*riO7E^1xQB#

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/dx9/chains/pillarbox_right_vertical/fs_saturation.bin b/bgfx/shaders/dx9/chains/pillarbox_right_vertical/fs_saturation.bin
new file mode 100644
index 0000000000000000000000000000000000000000..5fe87a15fb52ece4b2651e3427458ce2934cf97c
GIT binary patch
literal 372
zcmYjMJxjw-6g@9ZFhe2W&`B_(F7btmxTx5wWQc>tQ3ydR2C6AZ3LP9G9lF-hEx6|Q
z_ydG2uKobyd8vr^ak%fCd$=EGfv1c4*M|lp3-i%T3P7Mc4YMeprcoXzkL#`E33Qs~
zyV=3;>UgjLU`{AaV^SP1z!TF6(IEsh_{=J<3FTuej0qL(JXDpAE_L-*@qaeU6$i7X
z|J5g1*bgPn<C`?elDpjAy4<!sKk)6~KDr&H_Aq&v#AAM3=}5<w(sdnoufM;G>H;tX
zta8zNJ$yUu9lg&!57g96u4e!RH(#nhr6o+O9JHrc)NAs(G|9QC;)Ot6(#TWSemS0X
Wa8Yx`*`wr5^s%35($f@8L-hw=t4n(T

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/dx9/chains/pillarbox_right_vertical/vs_blit.bin b/bgfx/shaders/dx9/chains/pillarbox_right_vertical/vs_blit.bin
new file mode 100644
index 0000000000000000000000000000000000000000..ea94c83e62deecbb1897164a60e4cbd4bd062aac
GIT binary patch
literal 330
zcmYjLOG*P#5Ulrclg(T}aKMd$FuX@ZvdAW8lf?*<QMZF=#1X@UNsQZo7Z`8gK9?FH
zC&&RZsZJuXc|})uSJ&%@WMI|T`d6Xxk<PQx=WUU{Sp`_M6wIdH)aU5m^{!6=B!u)h
zhSc~5VkSpu!V+CV;^>B@f#J+T_9W)hw4FNKWKTst&0l8W#jqI;;v^1}*T?5k5%%-(
zBzq_EE^?7~&ilw;wL6zsp7E;&umFNmIPDhdz)#5azdkk9pPrf>-)l_8Y&hrc>PO+e
h<n4R`eWgapOs}1$5^nZ=Ek3MEYP5!_G<jX~iY+(YL398B

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/dx9/chains/pillarbox_right_vertical/vs_gaussian.bin b/bgfx/shaders/dx9/chains/pillarbox_right_vertical/vs_gaussian.bin
new file mode 100644
index 0000000000000000000000000000000000000000..ea94c83e62deecbb1897164a60e4cbd4bd062aac
GIT binary patch
literal 330
zcmYjLOG*P#5Ulrclg(T}aKMd$FuX@ZvdAW8lf?*<QMZF=#1X@UNsQZo7Z`8gK9?FH
zC&&RZsZJuXc|})uSJ&%@WMI|T`d6Xxk<PQx=WUU{Sp`_M6wIdH)aU5m^{!6=B!u)h
zhSc~5VkSpu!V+CV;^>B@f#J+T_9W)hw4FNKWKTst&0l8W#jqI;;v^1}*T?5k5%%-(
zBzq_EE^?7~&ilw;wL6zsp7E;&umFNmIPDhdz)#5azdkk9pPrf>-)l_8Y&hrc>PO+e
h<n4R`eWgapOs}1$5^nZ=Ek3MEYP5!_G<jX~iY+(YL398B

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/dx9/chains/pillarbox_right_vertical/vs_saturation.bin b/bgfx/shaders/dx9/chains/pillarbox_right_vertical/vs_saturation.bin
new file mode 100644
index 0000000000000000000000000000000000000000..1abeb7f7aed7eba42286f025ba80427d4f79e90c
GIT binary patch
literal 362
zcmYk1u}T9$5QhJ~-85;gv<Y}%qs_5LL@W$J)1){-y=Z$#jCi7)Tr{=;YvFu@6zS6X
z7?*drKxzvgAm=|((Pe+;pP6rGcQ2x@Q7@khh5A!GN(Rp-S$b;}U=S+kRkf<N(CHl>
zH2_4E)YyjPcmqNPOF5LG4k%fF(=gM}>>0>8S)*axj4h6newGf?>ql?<Y{%<{QRqcC
zmsf+#>!kM&$sJ8#ed`C-27w>!HTQQhI|XV6?qpts?Z*2?dtMZ+>1)5W$tTo-G2rIn
zdCge;_!_<QuTG}?<;kr5H=|2N%|6dACkp2||HSQbuH?uWIcv?7;x+5SIMAhoC3(p|
Ngmq*#nY^m_nlBVeO?dzS

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/gles/chains/pillarbox_left_horizontal/fs_blit.bin b/bgfx/shaders/gles/chains/pillarbox_left_horizontal/fs_blit.bin
new file mode 100644
index 0000000000000000000000000000000000000000..22e2f0c23d0e0e483f849e0e47fd609d34302edd
GIT binary patch
literal 238
zcmZ<@_F!Rb{`8QMfwefkB(;KpkpYM<GcYieB^Fg?=A|oSWTs~nD3qlpn<$jUC+Fwn
z7a3S{VMrPQC4t(L^Ye>RfbykznQ8e&xeCRJxdl0?MMf?PVAFvb^D|QvauYN26f`us
zs<{*ta`MZerkCUv0F8||v<8a8*b24^KvPRfi&B9`Xn@VoLAFT~q&Ph%-mNGx-5KOI
Spau=NW-Yjjf$D0xxEKI9`Arc3

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/gles/chains/pillarbox_left_horizontal/fs_gaussian.bin b/bgfx/shaders/gles/chains/pillarbox_left_horizontal/fs_gaussian.bin
new file mode 100644
index 0000000000000000000000000000000000000000..34b997772e7d5482fecba61b1a13d6f126b20e20
GIT binary patch
literal 2901
zcmchZQI4B15Qa&$RV(%q^9aqBVjBpns86j{eeVGf+R&_}01<>NN!6#Gv{&c}cE&Wp
zX=SNed6A+~JY)MC8~gX%ef@GZ`}zCVm2=%?yQ0rpc`U+LGsl^cXC=#`YGqvwp0{1r
z<SW^=L-Tb@L$D|Q-dsD*K5q`PTEl}}KWt%N+;iAdkNdiAR^ig^D*3H$$}t{+1~tUb
zDH!5ILSwMa%k8FU_-9brE!}-BS5W4%0?&89y8xT|QDqlF+m#txqD#woS8j0~87KGY
zKYRqwJFPwFdw7S5pA!rEgAX6{rI3fltNCd#Zo;l>3QWpVS>1rA?F_ufChnHUco5zI
zSsxK6y6;mf48o8xAucB#2=o6SU^;NZFoi*Tfx#YU5*IA-ZJ;o1ToGC$DvDwoq+0@^
zF>=xnH_yV7QUakdftX16!UkwTAT%ZrXA2(L03`%MV*&{tN8AP|CJ-7ED2h{NgA)-4
zjfs<lRt~oy3>p(=5eqv<PRYXGs-RuhG(~NA_Qs7mGsw(sl7!E_DRWJ=Y|N&q)=O@}
z95m2Ne%1@nM8|ZhTQ`}EOeTzzN&RGx7rn&OyvJ<9B11{TKV_39kVEC99{;iW`=fh8
qtMo+hh~*k)e&Op6NA#*v3oE-L#nzkbuF2P*>P_8XY@F(c>pD*u9}-9a

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/gles/chains/pillarbox_left_horizontal/fs_saturation.bin b/bgfx/shaders/gles/chains/pillarbox_left_horizontal/fs_saturation.bin
new file mode 100644
index 0000000000000000000000000000000000000000..2f6160fe747706bb8929a0d33df22613167097ad
GIT binary patch
literal 456
zcmY+AT~35B6op};FO7@1kDy}%1v4`tK4~Vty8zMv!!!X(O8FU$Pwv9qxdm6?Ee-=F
zO?%sW`kmA6Utg~5&!6v=b<@TT*RA4O$ZBO<mTg@(vCal8aD3t1adi?^4o8t6Yv{6s
zL1z?+lq&Ti(pKUiRXO)VSVCt(!^^tJ6nlozAtId=DU@7P;JD<S02Hzx9YWA$jlQuT
z;ptSvBcLsY%@E;?jP){#Ys4esP)M$)du+jA$VjCIXJXRf^oEcu2^^2I-EIvYeb{cy
z;`^aHBT;fm6)cE>As}@kGPnb0+W2Gh{*uIn+kbyUhd+mNnt=A^jpwJ+-q_?tyjMJb
Ol7&=r6BB$8V*LUwB9PMn

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/gles/chains/pillarbox_left_horizontal/vs_blit.bin b/bgfx/shaders/gles/chains/pillarbox_left_horizontal/vs_blit.bin
new file mode 100644
index 0000000000000000000000000000000000000000..9dd618de8a02bb855e0ba2f88983419191ff7d0b
GIT binary patch
literal 419
zcmZvY!EVAZ42DyQQ=Y=df~KnNxS`!SA|Y|DLfaKjq^`0wv>;AA>0V(^Fw+6eG%it;
z&;H`yoAq)MT)w{oA=}Jhc~}|xm;^!u;=-r0*5J0aCG4=;HQ>s84l2uOPbOZ-C-{|d
zL!W4o>Zb)M7ud4PiA=!?r%aD^<@?>k{|~0%{N}dCcQX3ctd*U^n1bDe1!#pegj0Ev
z;D2Iu!}cs$@bmp19S`t!&6tL96u&?c#nV5$>zR-FqOQN<YM-rci5Z9E1TcH32ah-V
T;PKV~9PD?i1Gz8wET#AX?VF0}

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/gles/chains/pillarbox_left_horizontal/vs_gaussian.bin b/bgfx/shaders/gles/chains/pillarbox_left_horizontal/vs_gaussian.bin
new file mode 100644
index 0000000000000000000000000000000000000000..9dd618de8a02bb855e0ba2f88983419191ff7d0b
GIT binary patch
literal 419
zcmZvY!EVAZ42DyQQ=Y=df~KnNxS`!SA|Y|DLfaKjq^`0wv>;AA>0V(^Fw+6eG%it;
z&;H`yoAq)MT)w{oA=}Jhc~}|xm;^!u;=-r0*5J0aCG4=;HQ>s84l2uOPbOZ-C-{|d
zL!W4o>Zb)M7ud4PiA=!?r%aD^<@?>k{|~0%{N}dCcQX3ctd*U^n1bDe1!#pegj0Ev
z;D2Iu!}cs$@bmp19S`t!&6tL96u&?c#nV5$>zR-FqOQN<YM-rci5Z9E1TcH32ah-V
T;PKV~9PD?i1Gz8wET#AX?VF0}

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/gles/chains/pillarbox_left_horizontal/vs_saturation.bin b/bgfx/shaders/gles/chains/pillarbox_left_horizontal/vs_saturation.bin
new file mode 100644
index 0000000000000000000000000000000000000000..e17074932b626f2c9288daaf53f68240d1fb2be5
GIT binary patch
literal 463
zcmZvZL2iRE5JioYl}|BCoJN)*SwxDm?=n)QY>`VSaTG9ejRUE=>VbNuUZE%GKq0tl
zys)hKf8NY^_D_$q;N$x%Ahb@L$}T&jPqToKfPCUDtu^Yowiz5%eyqS{=?Y|$>a#Xt
zL+{8-lq>zJtkUIOLyQKSHL2F-fCwi|tIFKxyBq(X7=!bZ>r%aFQw+(4v@4jVK(<x~
zD5NSOWb}=KU&Iy_(vxU|;qlF{7ua?)#-ZS10TCDMkKVMXPxJAn?d1HN?1qU^4yO)a
sena;hulLRvdLMz-p>DM7&jJKrGX@W1JnkY98$iDs=(`!0@lGlE0f<hN8~^|S

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/gles/chains/pillarbox_left_vertical/fs_blit.bin b/bgfx/shaders/gles/chains/pillarbox_left_vertical/fs_blit.bin
new file mode 100644
index 0000000000000000000000000000000000000000..22e2f0c23d0e0e483f849e0e47fd609d34302edd
GIT binary patch
literal 238
zcmZ<@_F!Rb{`8QMfwefkB(;KpkpYM<GcYieB^Fg?=A|oSWTs~nD3qlpn<$jUC+Fwn
z7a3S{VMrPQC4t(L^Ye>RfbykznQ8e&xeCRJxdl0?MMf?PVAFvb^D|QvauYN26f`us
zs<{*ta`MZerkCUv0F8||v<8a8*b24^KvPRfi&B9`Xn@VoLAFT~q&Ph%-mNGx-5KOI
Spau=NW-Yjjf$D0xxEKI9`Arc3

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/gles/chains/pillarbox_left_vertical/fs_gaussian.bin b/bgfx/shaders/gles/chains/pillarbox_left_vertical/fs_gaussian.bin
new file mode 100644
index 0000000000000000000000000000000000000000..34b997772e7d5482fecba61b1a13d6f126b20e20
GIT binary patch
literal 2901
zcmchZQI4B15Qa&$RV(%q^9aqBVjBpns86j{eeVGf+R&_}01<>NN!6#Gv{&c}cE&Wp
zX=SNed6A+~JY)MC8~gX%ef@GZ`}zCVm2=%?yQ0rpc`U+LGsl^cXC=#`YGqvwp0{1r
z<SW^=L-Tb@L$D|Q-dsD*K5q`PTEl}}KWt%N+;iAdkNdiAR^ig^D*3H$$}t{+1~tUb
zDH!5ILSwMa%k8FU_-9brE!}-BS5W4%0?&89y8xT|QDqlF+m#txqD#woS8j0~87KGY
zKYRqwJFPwFdw7S5pA!rEgAX6{rI3fltNCd#Zo;l>3QWpVS>1rA?F_ufChnHUco5zI
zSsxK6y6;mf48o8xAucB#2=o6SU^;NZFoi*Tfx#YU5*IA-ZJ;o1ToGC$DvDwoq+0@^
zF>=xnH_yV7QUakdftX16!UkwTAT%ZrXA2(L03`%MV*&{tN8AP|CJ-7ED2h{NgA)-4
zjfs<lRt~oy3>p(=5eqv<PRYXGs-RuhG(~NA_Qs7mGsw(sl7!E_DRWJ=Y|N&q)=O@}
z95m2Ne%1@nM8|ZhTQ`}EOeTzzN&RGx7rn&OyvJ<9B11{TKV_39kVEC99{;iW`=fh8
qtMo+hh~*k)e&Op6NA#*v3oE-L#nzkbuF2P*>P_8XY@F(c>pD*u9}-9a

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/gles/chains/pillarbox_left_vertical/fs_saturation.bin b/bgfx/shaders/gles/chains/pillarbox_left_vertical/fs_saturation.bin
new file mode 100644
index 0000000000000000000000000000000000000000..2f6160fe747706bb8929a0d33df22613167097ad
GIT binary patch
literal 456
zcmY+AT~35B6op};FO7@1kDy}%1v4`tK4~Vty8zMv!!!X(O8FU$Pwv9qxdm6?Ee-=F
zO?%sW`kmA6Utg~5&!6v=b<@TT*RA4O$ZBO<mTg@(vCal8aD3t1adi?^4o8t6Yv{6s
zL1z?+lq&Ti(pKUiRXO)VSVCt(!^^tJ6nlozAtId=DU@7P;JD<S02Hzx9YWA$jlQuT
z;ptSvBcLsY%@E;?jP){#Ys4esP)M$)du+jA$VjCIXJXRf^oEcu2^^2I-EIvYeb{cy
z;`^aHBT;fm6)cE>As}@kGPnb0+W2Gh{*uIn+kbyUhd+mNnt=A^jpwJ+-q_?tyjMJb
Ol7&=r6BB$8V*LUwB9PMn

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/gles/chains/pillarbox_left_vertical/vs_blit.bin b/bgfx/shaders/gles/chains/pillarbox_left_vertical/vs_blit.bin
new file mode 100644
index 0000000000000000000000000000000000000000..9dd618de8a02bb855e0ba2f88983419191ff7d0b
GIT binary patch
literal 419
zcmZvY!EVAZ42DyQQ=Y=df~KnNxS`!SA|Y|DLfaKjq^`0wv>;AA>0V(^Fw+6eG%it;
z&;H`yoAq)MT)w{oA=}Jhc~}|xm;^!u;=-r0*5J0aCG4=;HQ>s84l2uOPbOZ-C-{|d
zL!W4o>Zb)M7ud4PiA=!?r%aD^<@?>k{|~0%{N}dCcQX3ctd*U^n1bDe1!#pegj0Ev
z;D2Iu!}cs$@bmp19S`t!&6tL96u&?c#nV5$>zR-FqOQN<YM-rci5Z9E1TcH32ah-V
T;PKV~9PD?i1Gz8wET#AX?VF0}

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/gles/chains/pillarbox_left_vertical/vs_gaussian.bin b/bgfx/shaders/gles/chains/pillarbox_left_vertical/vs_gaussian.bin
new file mode 100644
index 0000000000000000000000000000000000000000..9dd618de8a02bb855e0ba2f88983419191ff7d0b
GIT binary patch
literal 419
zcmZvY!EVAZ42DyQQ=Y=df~KnNxS`!SA|Y|DLfaKjq^`0wv>;AA>0V(^Fw+6eG%it;
z&;H`yoAq)MT)w{oA=}Jhc~}|xm;^!u;=-r0*5J0aCG4=;HQ>s84l2uOPbOZ-C-{|d
zL!W4o>Zb)M7ud4PiA=!?r%aD^<@?>k{|~0%{N}dCcQX3ctd*U^n1bDe1!#pegj0Ev
z;D2Iu!}cs$@bmp19S`t!&6tL96u&?c#nV5$>zR-FqOQN<YM-rci5Z9E1TcH32ah-V
T;PKV~9PD?i1Gz8wET#AX?VF0}

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/gles/chains/pillarbox_left_vertical/vs_saturation.bin b/bgfx/shaders/gles/chains/pillarbox_left_vertical/vs_saturation.bin
new file mode 100644
index 0000000000000000000000000000000000000000..5f5ba0d6aacc940e203356b55f16149fc233515b
GIT binary patch
literal 466
zcmZuuK~BRk5Ok!T{E9usP+3kW6{zCQu@Vy3$fO~4)x?o;+yumlAMqo;zzbNHq%oqB
zWmz+`vpe3$hx=Ld@%<GM+Gb7_hqckWSwu)gKJk{;8uirL0=BB$HsFeU0W!<=UK_EZ
zXXq=W8~viJ()C$EiUM17xz=Wb7EYR8)n(}KPX7PM6kJ%`*6LZCYACLxUBHwAy|vmv
zB~=YEqi+<#CbnwOJxf*yk8l2ZfIFWtjRhBTNVs5s_^wBO%E!Cj)8#%}4~dbErwQQV
uWPS7rX7|E4_z08^eQ)L<`1NgyhcUPu;l#rpT(ZIIcL~RV#(lg~N`3%I1(ebN

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/gles/chains/pillarbox_right_horizontal/fs_blit.bin b/bgfx/shaders/gles/chains/pillarbox_right_horizontal/fs_blit.bin
new file mode 100644
index 0000000000000000000000000000000000000000..22e2f0c23d0e0e483f849e0e47fd609d34302edd
GIT binary patch
literal 238
zcmZ<@_F!Rb{`8QMfwefkB(;KpkpYM<GcYieB^Fg?=A|oSWTs~nD3qlpn<$jUC+Fwn
z7a3S{VMrPQC4t(L^Ye>RfbykznQ8e&xeCRJxdl0?MMf?PVAFvb^D|QvauYN26f`us
zs<{*ta`MZerkCUv0F8||v<8a8*b24^KvPRfi&B9`Xn@VoLAFT~q&Ph%-mNGx-5KOI
Spau=NW-Yjjf$D0xxEKI9`Arc3

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/gles/chains/pillarbox_right_horizontal/fs_gaussian.bin b/bgfx/shaders/gles/chains/pillarbox_right_horizontal/fs_gaussian.bin
new file mode 100644
index 0000000000000000000000000000000000000000..34b997772e7d5482fecba61b1a13d6f126b20e20
GIT binary patch
literal 2901
zcmchZQI4B15Qa&$RV(%q^9aqBVjBpns86j{eeVGf+R&_}01<>NN!6#Gv{&c}cE&Wp
zX=SNed6A+~JY)MC8~gX%ef@GZ`}zCVm2=%?yQ0rpc`U+LGsl^cXC=#`YGqvwp0{1r
z<SW^=L-Tb@L$D|Q-dsD*K5q`PTEl}}KWt%N+;iAdkNdiAR^ig^D*3H$$}t{+1~tUb
zDH!5ILSwMa%k8FU_-9brE!}-BS5W4%0?&89y8xT|QDqlF+m#txqD#woS8j0~87KGY
zKYRqwJFPwFdw7S5pA!rEgAX6{rI3fltNCd#Zo;l>3QWpVS>1rA?F_ufChnHUco5zI
zSsxK6y6;mf48o8xAucB#2=o6SU^;NZFoi*Tfx#YU5*IA-ZJ;o1ToGC$DvDwoq+0@^
zF>=xnH_yV7QUakdftX16!UkwTAT%ZrXA2(L03`%MV*&{tN8AP|CJ-7ED2h{NgA)-4
zjfs<lRt~oy3>p(=5eqv<PRYXGs-RuhG(~NA_Qs7mGsw(sl7!E_DRWJ=Y|N&q)=O@}
z95m2Ne%1@nM8|ZhTQ`}EOeTzzN&RGx7rn&OyvJ<9B11{TKV_39kVEC99{;iW`=fh8
qtMo+hh~*k)e&Op6NA#*v3oE-L#nzkbuF2P*>P_8XY@F(c>pD*u9}-9a

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/gles/chains/pillarbox_right_horizontal/fs_saturation.bin b/bgfx/shaders/gles/chains/pillarbox_right_horizontal/fs_saturation.bin
new file mode 100644
index 0000000000000000000000000000000000000000..2f6160fe747706bb8929a0d33df22613167097ad
GIT binary patch
literal 456
zcmY+AT~35B6op};FO7@1kDy}%1v4`tK4~Vty8zMv!!!X(O8FU$Pwv9qxdm6?Ee-=F
zO?%sW`kmA6Utg~5&!6v=b<@TT*RA4O$ZBO<mTg@(vCal8aD3t1adi?^4o8t6Yv{6s
zL1z?+lq&Ti(pKUiRXO)VSVCt(!^^tJ6nlozAtId=DU@7P;JD<S02Hzx9YWA$jlQuT
z;ptSvBcLsY%@E;?jP){#Ys4esP)M$)du+jA$VjCIXJXRf^oEcu2^^2I-EIvYeb{cy
z;`^aHBT;fm6)cE>As}@kGPnb0+W2Gh{*uIn+kbyUhd+mNnt=A^jpwJ+-q_?tyjMJb
Ol7&=r6BB$8V*LUwB9PMn

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/gles/chains/pillarbox_right_horizontal/vs_blit.bin b/bgfx/shaders/gles/chains/pillarbox_right_horizontal/vs_blit.bin
new file mode 100644
index 0000000000000000000000000000000000000000..9dd618de8a02bb855e0ba2f88983419191ff7d0b
GIT binary patch
literal 419
zcmZvY!EVAZ42DyQQ=Y=df~KnNxS`!SA|Y|DLfaKjq^`0wv>;AA>0V(^Fw+6eG%it;
z&;H`yoAq)MT)w{oA=}Jhc~}|xm;^!u;=-r0*5J0aCG4=;HQ>s84l2uOPbOZ-C-{|d
zL!W4o>Zb)M7ud4PiA=!?r%aD^<@?>k{|~0%{N}dCcQX3ctd*U^n1bDe1!#pegj0Ev
z;D2Iu!}cs$@bmp19S`t!&6tL96u&?c#nV5$>zR-FqOQN<YM-rci5Z9E1TcH32ah-V
T;PKV~9PD?i1Gz8wET#AX?VF0}

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/gles/chains/pillarbox_right_horizontal/vs_gaussian.bin b/bgfx/shaders/gles/chains/pillarbox_right_horizontal/vs_gaussian.bin
new file mode 100644
index 0000000000000000000000000000000000000000..9dd618de8a02bb855e0ba2f88983419191ff7d0b
GIT binary patch
literal 419
zcmZvY!EVAZ42DyQQ=Y=df~KnNxS`!SA|Y|DLfaKjq^`0wv>;AA>0V(^Fw+6eG%it;
z&;H`yoAq)MT)w{oA=}Jhc~}|xm;^!u;=-r0*5J0aCG4=;HQ>s84l2uOPbOZ-C-{|d
zL!W4o>Zb)M7ud4PiA=!?r%aD^<@?>k{|~0%{N}dCcQX3ctd*U^n1bDe1!#pegj0Ev
z;D2Iu!}cs$@bmp19S`t!&6tL96u&?c#nV5$>zR-FqOQN<YM-rci5Z9E1TcH32ah-V
T;PKV~9PD?i1Gz8wET#AX?VF0}

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/gles/chains/pillarbox_right_horizontal/vs_saturation.bin b/bgfx/shaders/gles/chains/pillarbox_right_horizontal/vs_saturation.bin
new file mode 100644
index 0000000000000000000000000000000000000000..20b51375de0a01448551febe001533676e9616f2
GIT binary patch
literal 469
zcmZvZL2AP=5JhFkN~f5m)dnFup%g;*T?PW(8r5+fmDn<>tk@}C^-MWXuFw;7?AWnN
zGYcW+&%Bv0y=<Om!S~NOAhb@L$_{Iz-)8|K0Xg9*tu^Ykwi)bHzN^4x=@Mj;>b*8%
zMQ_Lplq>zAtkUJpf*1>I)}&gSEh3yWttxY$@2>oRVhql2u1oc%O))eV(k@|gfo!d|
zP)Jom$mk~pe~2wAq$kk|)8m~V5Af7^j6=c293n2*AH8W&pZxKr?c{u)tOv&^htmdd
ucSZLcZ}+Y+^d16Bhq=+Bk2whb$Qay@`G-q%`G^g;%RlrxjbHLbDftBk=#^>!

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/gles/chains/pillarbox_right_vertical/fs_blit.bin b/bgfx/shaders/gles/chains/pillarbox_right_vertical/fs_blit.bin
new file mode 100644
index 0000000000000000000000000000000000000000..22e2f0c23d0e0e483f849e0e47fd609d34302edd
GIT binary patch
literal 238
zcmZ<@_F!Rb{`8QMfwefkB(;KpkpYM<GcYieB^Fg?=A|oSWTs~nD3qlpn<$jUC+Fwn
z7a3S{VMrPQC4t(L^Ye>RfbykznQ8e&xeCRJxdl0?MMf?PVAFvb^D|QvauYN26f`us
zs<{*ta`MZerkCUv0F8||v<8a8*b24^KvPRfi&B9`Xn@VoLAFT~q&Ph%-mNGx-5KOI
Spau=NW-Yjjf$D0xxEKI9`Arc3

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/gles/chains/pillarbox_right_vertical/fs_gaussian.bin b/bgfx/shaders/gles/chains/pillarbox_right_vertical/fs_gaussian.bin
new file mode 100644
index 0000000000000000000000000000000000000000..34b997772e7d5482fecba61b1a13d6f126b20e20
GIT binary patch
literal 2901
zcmchZQI4B15Qa&$RV(%q^9aqBVjBpns86j{eeVGf+R&_}01<>NN!6#Gv{&c}cE&Wp
zX=SNed6A+~JY)MC8~gX%ef@GZ`}zCVm2=%?yQ0rpc`U+LGsl^cXC=#`YGqvwp0{1r
z<SW^=L-Tb@L$D|Q-dsD*K5q`PTEl}}KWt%N+;iAdkNdiAR^ig^D*3H$$}t{+1~tUb
zDH!5ILSwMa%k8FU_-9brE!}-BS5W4%0?&89y8xT|QDqlF+m#txqD#woS8j0~87KGY
zKYRqwJFPwFdw7S5pA!rEgAX6{rI3fltNCd#Zo;l>3QWpVS>1rA?F_ufChnHUco5zI
zSsxK6y6;mf48o8xAucB#2=o6SU^;NZFoi*Tfx#YU5*IA-ZJ;o1ToGC$DvDwoq+0@^
zF>=xnH_yV7QUakdftX16!UkwTAT%ZrXA2(L03`%MV*&{tN8AP|CJ-7ED2h{NgA)-4
zjfs<lRt~oy3>p(=5eqv<PRYXGs-RuhG(~NA_Qs7mGsw(sl7!E_DRWJ=Y|N&q)=O@}
z95m2Ne%1@nM8|ZhTQ`}EOeTzzN&RGx7rn&OyvJ<9B11{TKV_39kVEC99{;iW`=fh8
qtMo+hh~*k)e&Op6NA#*v3oE-L#nzkbuF2P*>P_8XY@F(c>pD*u9}-9a

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/gles/chains/pillarbox_right_vertical/fs_saturation.bin b/bgfx/shaders/gles/chains/pillarbox_right_vertical/fs_saturation.bin
new file mode 100644
index 0000000000000000000000000000000000000000..2f6160fe747706bb8929a0d33df22613167097ad
GIT binary patch
literal 456
zcmY+AT~35B6op};FO7@1kDy}%1v4`tK4~Vty8zMv!!!X(O8FU$Pwv9qxdm6?Ee-=F
zO?%sW`kmA6Utg~5&!6v=b<@TT*RA4O$ZBO<mTg@(vCal8aD3t1adi?^4o8t6Yv{6s
zL1z?+lq&Ti(pKUiRXO)VSVCt(!^^tJ6nlozAtId=DU@7P;JD<S02Hzx9YWA$jlQuT
z;ptSvBcLsY%@E;?jP){#Ys4esP)M$)du+jA$VjCIXJXRf^oEcu2^^2I-EIvYeb{cy
z;`^aHBT;fm6)cE>As}@kGPnb0+W2Gh{*uIn+kbyUhd+mNnt=A^jpwJ+-q_?tyjMJb
Ol7&=r6BB$8V*LUwB9PMn

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/gles/chains/pillarbox_right_vertical/vs_blit.bin b/bgfx/shaders/gles/chains/pillarbox_right_vertical/vs_blit.bin
new file mode 100644
index 0000000000000000000000000000000000000000..9dd618de8a02bb855e0ba2f88983419191ff7d0b
GIT binary patch
literal 419
zcmZvY!EVAZ42DyQQ=Y=df~KnNxS`!SA|Y|DLfaKjq^`0wv>;AA>0V(^Fw+6eG%it;
z&;H`yoAq)MT)w{oA=}Jhc~}|xm;^!u;=-r0*5J0aCG4=;HQ>s84l2uOPbOZ-C-{|d
zL!W4o>Zb)M7ud4PiA=!?r%aD^<@?>k{|~0%{N}dCcQX3ctd*U^n1bDe1!#pegj0Ev
z;D2Iu!}cs$@bmp19S`t!&6tL96u&?c#nV5$>zR-FqOQN<YM-rci5Z9E1TcH32ah-V
T;PKV~9PD?i1Gz8wET#AX?VF0}

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/gles/chains/pillarbox_right_vertical/vs_gaussian.bin b/bgfx/shaders/gles/chains/pillarbox_right_vertical/vs_gaussian.bin
new file mode 100644
index 0000000000000000000000000000000000000000..9dd618de8a02bb855e0ba2f88983419191ff7d0b
GIT binary patch
literal 419
zcmZvY!EVAZ42DyQQ=Y=df~KnNxS`!SA|Y|DLfaKjq^`0wv>;AA>0V(^Fw+6eG%it;
z&;H`yoAq)MT)w{oA=}Jhc~}|xm;^!u;=-r0*5J0aCG4=;HQ>s84l2uOPbOZ-C-{|d
zL!W4o>Zb)M7ud4PiA=!?r%aD^<@?>k{|~0%{N}dCcQX3ctd*U^n1bDe1!#pegj0Ev
z;D2Iu!}cs$@bmp19S`t!&6tL96u&?c#nV5$>zR-FqOQN<YM-rci5Z9E1TcH32ah-V
T;PKV~9PD?i1Gz8wET#AX?VF0}

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/gles/chains/pillarbox_right_vertical/vs_saturation.bin b/bgfx/shaders/gles/chains/pillarbox_right_vertical/vs_saturation.bin
new file mode 100644
index 0000000000000000000000000000000000000000..567cd53fd63bbdbb59265b752d2d9bb83b284915
GIT binary patch
literal 467
zcmZvZK~BRk5JerSE1zPPF;tclS_xFKXITk}ZDi7r8Z~ib95-pjiX(9%uD}Txm!vVG
zmStJ<|Gb&8pB^7((Z}~!L};5iRqWSBzs@2;BJzo+wAQHS))uf;<+cG=<O`5lu6Npq
z6}=$epxo#;WtFZk8d5aaqRX{58$>v1dR3Pp-<|pY#1veZ+}7$vn`%g|q+P%?1+ul;
zKqXZTF{4KcVG&z3NY9cLhQ~WU?BU+en8t#OIV4=LKYG`rKF!Cw-pl1KTMrYX98Vp<
v)fs)_1igD>96SVChq||O5PW%;;${r4$8h4qV(AwfV86d`>S+9scS^|*-9eQE

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/glsl/chains/pillarbox_left_horizontal/fs_blit.bin b/bgfx/shaders/glsl/chains/pillarbox_left_horizontal/fs_blit.bin
new file mode 100644
index 0000000000000000000000000000000000000000..db0fe2b487b6c8f1624a7136f8c83734c2b7dcd1
GIT binary patch
literal 181
zcmZ<@_F!Rb{`8QMfwefkB(;KpkpYNiF)%QcB^Fg?=A|o?r6!vwl*K3K=j0a|SaTr>
z8v%uZT9Whgi&B6xrFofY`9--3#fiBEIjKcPE(%~1fm-r2QxtL&GxHQQG`Xs|6co~P
r;@yf8)15&^D%dJ$01YWAElLII&;V=EK{i-ZK?`oZrZrbB7Z(Enmi{^a

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/glsl/chains/pillarbox_left_horizontal/fs_gaussian.bin b/bgfx/shaders/glsl/chains/pillarbox_left_horizontal/fs_gaussian.bin
new file mode 100644
index 0000000000000000000000000000000000000000..eba13b8fcf5bf00d6fcb2a5514d035654c9ee9d5
GIT binary patch
literal 2861
zcmchZ|7xQ^5Xa5YLh)W={?w*t_lFuwxW8IT|L+5cG+q#*7LBP%>0kGtrLWK@=*-$A
zn+w8Gwt@`qjJu!Nb@#h-dw+K_`uqNNV*PC5W!lDdwn^EKk!6j@Gt2U{sI#)@JZDW@
zC9|xlyXI+4UGPhMUTw=-CDl4B=CDd11gt3bP?pt<P3@-0{*+Zt5g#<rQDg@^ige(;
zyH4`QMOuj)P+3gvRhi8oPqG3W*M7F4gVjwQ^J&)-u*@GZ$yktM`wqXsakdll+7`|+
z!(AR;yLRDH&zU^bUyV$iah}VjN-+~hrE&p|HhK7kO<WL%3y)m@Sr-voy6aMld5m!`
z<>9~`Vf-HiOb50Yt}tj1F!;reBqR@A6DUj@XN0yF<@<pN(iMTw^l~DGi)Ua;5rNS3
zfw&CC!~|$UAT)g-!6(8u0SXC(rVk`V;0qI=fIw*aKz<N$6C9s7X!<xIGqSlQVbJtp
zCV@1w<&-S^s|wn2jUv>BFE89)XF8d=3PbkQlQPy+%fx7!YJKM-j6nl^=Wjg#4YW;%
zI(37|$Y8=anA8t;dC^Tg%zexUEHacd9F<L)Kz5ary8Kmr`6+o)EApiGgq0d5ec)@?
e8}zCw3yZo9#pa9nwo2yL<)W-Gwjb)nwyh5jcm!(z

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/glsl/chains/pillarbox_left_horizontal/fs_saturation.bin b/bgfx/shaders/glsl/chains/pillarbox_left_horizontal/fs_saturation.bin
new file mode 100644
index 0000000000000000000000000000000000000000..4a3f80b56b9f050001428a84ea80e51513868350
GIT binary patch
literal 429
zcmY+A(N2Rf6o$*9H;oT*E<tAlWkwg`m1gnY2OteF(gf&I3S%1Mg-_}$_ynGItHXqp
zmcQS3&SCTVauIy}d@sn=koUq2S{SLiML<YEF8kb66K?SN#B~(<AiEmIs^Bo%tWZjq
zaYlzuZk29rvVytj9QC5zHI?Si;H()Pl`NqZvV$<9?-Y)(X?IvAPcr=A_wWc<3wx`O
z4jsOn*N^PwZKH(o2%q5`@lqKGy^c+XH{`1#4P(aF>m|hO?&03Pl4KP*n;YZ=q%&D+
zVHA29hZ_j}A#vgDUlS2r|N9wiI?BD5?d@czf!W@cshfPGMg622rOzRD@Ifj01*CR{
AvH$=8

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/glsl/chains/pillarbox_left_horizontal/vs_blit.bin b/bgfx/shaders/glsl/chains/pillarbox_left_horizontal/vs_blit.bin
new file mode 100644
index 0000000000000000000000000000000000000000..af6c9349f410fcc16eaa87e32ee35a9d92bb026b
GIT binary patch
literal 377
zcmZ9I%?g4*6h=pIHBWJu8X;!xq<zaE2wI7$$wYc%8YeAU^`yN*PteWGpEkpA5BJRX
z&1StcjmPV0FkXgQq?eV%gK02kuq~aDQc~<nm4Z%VAEGeEBT6^mBQPg$!n05Ui$CNM
zQfU<<%7oT*Bx_M*Uz_f1gRuvCxKI{ik1~fmQa<zv$%G=IsVKm*`HjO@sqz!K!dXCr
z-`%-hVDZ78<vQ*ZW{zu*cvTbc8#q<{!PzlfwVeoC{o63<)QxA5xA6?>QmVFNLw=uk
H=bXI(ZC875

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/glsl/chains/pillarbox_left_horizontal/vs_gaussian.bin b/bgfx/shaders/glsl/chains/pillarbox_left_horizontal/vs_gaussian.bin
new file mode 100644
index 0000000000000000000000000000000000000000..af6c9349f410fcc16eaa87e32ee35a9d92bb026b
GIT binary patch
literal 377
zcmZ9I%?g4*6h=pIHBWJu8X;!xq<zaE2wI7$$wYc%8YeAU^`yN*PteWGpEkpA5BJRX
z&1StcjmPV0FkXgQq?eV%gK02kuq~aDQc~<nm4Z%VAEGeEBT6^mBQPg$!n05Ui$CNM
zQfU<<%7oT*Bx_M*Uz_f1gRuvCxKI{ik1~fmQa<zv$%G=IsVKm*`HjO@sqz!K!dXCr
z-`%-hVDZ78<vQ*ZW{zu*cvTbc8#q<{!PzlfwVeoC{o63<)QxA5xA6?>QmVFNLw=uk
H=bXI(ZC875

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/glsl/chains/pillarbox_left_horizontal/vs_saturation.bin b/bgfx/shaders/glsl/chains/pillarbox_left_horizontal/vs_saturation.bin
new file mode 100644
index 0000000000000000000000000000000000000000..6319f0af6f219753ed72d6348dbb92f765559542
GIT binary patch
literal 421
zcmZ9IO=`n15JqLlN~f5m)fgc=SrkI{T?PW(8pm;iO6)PJtk@}Cl^(QL$O$_Bi=ApA
z#P_5(GkV>>EWGdAug7>5JDpv22HzJRV;=jVJ+ap4LuE5?S-OTKPVtOJZTJIN5h(FP
zTaCp(6cMsnog$heJ#&d^baCo!?rxjK5xDt-s?cv}a>x_AhN(j`p*~Wo3-AU1<j^Z^
zUXm*gHx!I#dA-24#gVV13Lun9Jn*_9K20F&rp2doyc=dB>`%4f>8|cPvwqu){%l~n
gI@AqU-3ma-XCYuY=24r3Vi5Je+jTR3^cUys4_B>(q5uE@

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/glsl/chains/pillarbox_left_vertical/fs_blit.bin b/bgfx/shaders/glsl/chains/pillarbox_left_vertical/fs_blit.bin
new file mode 100644
index 0000000000000000000000000000000000000000..db0fe2b487b6c8f1624a7136f8c83734c2b7dcd1
GIT binary patch
literal 181
zcmZ<@_F!Rb{`8QMfwefkB(;KpkpYNiF)%QcB^Fg?=A|o?r6!vwl*K3K=j0a|SaTr>
z8v%uZT9Whgi&B6xrFofY`9--3#fiBEIjKcPE(%~1fm-r2QxtL&GxHQQG`Xs|6co~P
r;@yf8)15&^D%dJ$01YWAElLII&;V=EK{i-ZK?`oZrZrbB7Z(Enmi{^a

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/glsl/chains/pillarbox_left_vertical/fs_gaussian.bin b/bgfx/shaders/glsl/chains/pillarbox_left_vertical/fs_gaussian.bin
new file mode 100644
index 0000000000000000000000000000000000000000..eba13b8fcf5bf00d6fcb2a5514d035654c9ee9d5
GIT binary patch
literal 2861
zcmchZ|7xQ^5Xa5YLh)W={?w*t_lFuwxW8IT|L+5cG+q#*7LBP%>0kGtrLWK@=*-$A
zn+w8Gwt@`qjJu!Nb@#h-dw+K_`uqNNV*PC5W!lDdwn^EKk!6j@Gt2U{sI#)@JZDW@
zC9|xlyXI+4UGPhMUTw=-CDl4B=CDd11gt3bP?pt<P3@-0{*+Zt5g#<rQDg@^ige(;
zyH4`QMOuj)P+3gvRhi8oPqG3W*M7F4gVjwQ^J&)-u*@GZ$yktM`wqXsakdll+7`|+
z!(AR;yLRDH&zU^bUyV$iah}VjN-+~hrE&p|HhK7kO<WL%3y)m@Sr-voy6aMld5m!`
z<>9~`Vf-HiOb50Yt}tj1F!;reBqR@A6DUj@XN0yF<@<pN(iMTw^l~DGi)Ua;5rNS3
zfw&CC!~|$UAT)g-!6(8u0SXC(rVk`V;0qI=fIw*aKz<N$6C9s7X!<xIGqSlQVbJtp
zCV@1w<&-S^s|wn2jUv>BFE89)XF8d=3PbkQlQPy+%fx7!YJKM-j6nl^=Wjg#4YW;%
zI(37|$Y8=anA8t;dC^Tg%zexUEHacd9F<L)Kz5ary8Kmr`6+o)EApiGgq0d5ec)@?
e8}zCw3yZo9#pa9nwo2yL<)W-Gwjb)nwyh5jcm!(z

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/glsl/chains/pillarbox_left_vertical/fs_saturation.bin b/bgfx/shaders/glsl/chains/pillarbox_left_vertical/fs_saturation.bin
new file mode 100644
index 0000000000000000000000000000000000000000..4a3f80b56b9f050001428a84ea80e51513868350
GIT binary patch
literal 429
zcmY+A(N2Rf6o$*9H;oT*E<tAlWkwg`m1gnY2OteF(gf&I3S%1Mg-_}$_ynGItHXqp
zmcQS3&SCTVauIy}d@sn=koUq2S{SLiML<YEF8kb66K?SN#B~(<AiEmIs^Bo%tWZjq
zaYlzuZk29rvVytj9QC5zHI?Si;H()Pl`NqZvV$<9?-Y)(X?IvAPcr=A_wWc<3wx`O
z4jsOn*N^PwZKH(o2%q5`@lqKGy^c+XH{`1#4P(aF>m|hO?&03Pl4KP*n;YZ=q%&D+
zVHA29hZ_j}A#vgDUlS2r|N9wiI?BD5?d@czf!W@cshfPGMg622rOzRD@Ifj01*CR{
AvH$=8

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/glsl/chains/pillarbox_left_vertical/vs_blit.bin b/bgfx/shaders/glsl/chains/pillarbox_left_vertical/vs_blit.bin
new file mode 100644
index 0000000000000000000000000000000000000000..af6c9349f410fcc16eaa87e32ee35a9d92bb026b
GIT binary patch
literal 377
zcmZ9I%?g4*6h=pIHBWJu8X;!xq<zaE2wI7$$wYc%8YeAU^`yN*PteWGpEkpA5BJRX
z&1StcjmPV0FkXgQq?eV%gK02kuq~aDQc~<nm4Z%VAEGeEBT6^mBQPg$!n05Ui$CNM
zQfU<<%7oT*Bx_M*Uz_f1gRuvCxKI{ik1~fmQa<zv$%G=IsVKm*`HjO@sqz!K!dXCr
z-`%-hVDZ78<vQ*ZW{zu*cvTbc8#q<{!PzlfwVeoC{o63<)QxA5xA6?>QmVFNLw=uk
H=bXI(ZC875

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/glsl/chains/pillarbox_left_vertical/vs_gaussian.bin b/bgfx/shaders/glsl/chains/pillarbox_left_vertical/vs_gaussian.bin
new file mode 100644
index 0000000000000000000000000000000000000000..af6c9349f410fcc16eaa87e32ee35a9d92bb026b
GIT binary patch
literal 377
zcmZ9I%?g4*6h=pIHBWJu8X;!xq<zaE2wI7$$wYc%8YeAU^`yN*PteWGpEkpA5BJRX
z&1StcjmPV0FkXgQq?eV%gK02kuq~aDQc~<nm4Z%VAEGeEBT6^mBQPg$!n05Ui$CNM
zQfU<<%7oT*Bx_M*Uz_f1gRuvCxKI{ik1~fmQa<zv$%G=IsVKm*`HjO@sqz!K!dXCr
z-`%-hVDZ78<vQ*ZW{zu*cvTbc8#q<{!PzlfwVeoC{o63<)QxA5xA6?>QmVFNLw=uk
H=bXI(ZC875

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/glsl/chains/pillarbox_left_vertical/vs_saturation.bin b/bgfx/shaders/glsl/chains/pillarbox_left_vertical/vs_saturation.bin
new file mode 100644
index 0000000000000000000000000000000000000000..0d8e84da2a00a1cd4f7a3f2abc004d761039cb9e
GIT binary patch
literal 424
zcmZ9IL2AP=5JhFkN~f5ml?EZZNoWb(cNr*jYh1?-3b7}svSKH6)lIM2EA#{%#dhoz
zgb@EpZ)WuR@;nK?et!bStHkO2xHh<(1dIjjoA%UNqu(l<gUhoyq)CQ*G-}0fz&(Kj
zerT(){D)#fHm@^8v!Q1$HH|K}t<7C+qc{dPeo&SA9Zdm6YUeO?NG8-9N_7dL;Aal4
z(iR7DCDDq4{wz;Nc=9+7l~gl`q!Ks0Zio*P$hz@(yHD2LOoYRsHcYSTi)YlYzZi}N
krmJ1uhZ!ijc#LTY0e5{I`Phd`(Ye|WzBJVT^(W`-59w)zSO5S3

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/glsl/chains/pillarbox_right_horizontal/fs_blit.bin b/bgfx/shaders/glsl/chains/pillarbox_right_horizontal/fs_blit.bin
new file mode 100644
index 0000000000000000000000000000000000000000..db0fe2b487b6c8f1624a7136f8c83734c2b7dcd1
GIT binary patch
literal 181
zcmZ<@_F!Rb{`8QMfwefkB(;KpkpYNiF)%QcB^Fg?=A|o?r6!vwl*K3K=j0a|SaTr>
z8v%uZT9Whgi&B6xrFofY`9--3#fiBEIjKcPE(%~1fm-r2QxtL&GxHQQG`Xs|6co~P
r;@yf8)15&^D%dJ$01YWAElLII&;V=EK{i-ZK?`oZrZrbB7Z(Enmi{^a

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/glsl/chains/pillarbox_right_horizontal/fs_gaussian.bin b/bgfx/shaders/glsl/chains/pillarbox_right_horizontal/fs_gaussian.bin
new file mode 100644
index 0000000000000000000000000000000000000000..eba13b8fcf5bf00d6fcb2a5514d035654c9ee9d5
GIT binary patch
literal 2861
zcmchZ|7xQ^5Xa5YLh)W={?w*t_lFuwxW8IT|L+5cG+q#*7LBP%>0kGtrLWK@=*-$A
zn+w8Gwt@`qjJu!Nb@#h-dw+K_`uqNNV*PC5W!lDdwn^EKk!6j@Gt2U{sI#)@JZDW@
zC9|xlyXI+4UGPhMUTw=-CDl4B=CDd11gt3bP?pt<P3@-0{*+Zt5g#<rQDg@^ige(;
zyH4`QMOuj)P+3gvRhi8oPqG3W*M7F4gVjwQ^J&)-u*@GZ$yktM`wqXsakdll+7`|+
z!(AR;yLRDH&zU^bUyV$iah}VjN-+~hrE&p|HhK7kO<WL%3y)m@Sr-voy6aMld5m!`
z<>9~`Vf-HiOb50Yt}tj1F!;reBqR@A6DUj@XN0yF<@<pN(iMTw^l~DGi)Ua;5rNS3
zfw&CC!~|$UAT)g-!6(8u0SXC(rVk`V;0qI=fIw*aKz<N$6C9s7X!<xIGqSlQVbJtp
zCV@1w<&-S^s|wn2jUv>BFE89)XF8d=3PbkQlQPy+%fx7!YJKM-j6nl^=Wjg#4YW;%
zI(37|$Y8=anA8t;dC^Tg%zexUEHacd9F<L)Kz5ary8Kmr`6+o)EApiGgq0d5ec)@?
e8}zCw3yZo9#pa9nwo2yL<)W-Gwjb)nwyh5jcm!(z

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/glsl/chains/pillarbox_right_horizontal/fs_saturation.bin b/bgfx/shaders/glsl/chains/pillarbox_right_horizontal/fs_saturation.bin
new file mode 100644
index 0000000000000000000000000000000000000000..4a3f80b56b9f050001428a84ea80e51513868350
GIT binary patch
literal 429
zcmY+A(N2Rf6o$*9H;oT*E<tAlWkwg`m1gnY2OteF(gf&I3S%1Mg-_}$_ynGItHXqp
zmcQS3&SCTVauIy}d@sn=koUq2S{SLiML<YEF8kb66K?SN#B~(<AiEmIs^Bo%tWZjq
zaYlzuZk29rvVytj9QC5zHI?Si;H()Pl`NqZvV$<9?-Y)(X?IvAPcr=A_wWc<3wx`O
z4jsOn*N^PwZKH(o2%q5`@lqKGy^c+XH{`1#4P(aF>m|hO?&03Pl4KP*n;YZ=q%&D+
zVHA29hZ_j}A#vgDUlS2r|N9wiI?BD5?d@czf!W@cshfPGMg622rOzRD@Ifj01*CR{
AvH$=8

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/glsl/chains/pillarbox_right_horizontal/vs_blit.bin b/bgfx/shaders/glsl/chains/pillarbox_right_horizontal/vs_blit.bin
new file mode 100644
index 0000000000000000000000000000000000000000..af6c9349f410fcc16eaa87e32ee35a9d92bb026b
GIT binary patch
literal 377
zcmZ9I%?g4*6h=pIHBWJu8X;!xq<zaE2wI7$$wYc%8YeAU^`yN*PteWGpEkpA5BJRX
z&1StcjmPV0FkXgQq?eV%gK02kuq~aDQc~<nm4Z%VAEGeEBT6^mBQPg$!n05Ui$CNM
zQfU<<%7oT*Bx_M*Uz_f1gRuvCxKI{ik1~fmQa<zv$%G=IsVKm*`HjO@sqz!K!dXCr
z-`%-hVDZ78<vQ*ZW{zu*cvTbc8#q<{!PzlfwVeoC{o63<)QxA5xA6?>QmVFNLw=uk
H=bXI(ZC875

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/glsl/chains/pillarbox_right_horizontal/vs_gaussian.bin b/bgfx/shaders/glsl/chains/pillarbox_right_horizontal/vs_gaussian.bin
new file mode 100644
index 0000000000000000000000000000000000000000..af6c9349f410fcc16eaa87e32ee35a9d92bb026b
GIT binary patch
literal 377
zcmZ9I%?g4*6h=pIHBWJu8X;!xq<zaE2wI7$$wYc%8YeAU^`yN*PteWGpEkpA5BJRX
z&1StcjmPV0FkXgQq?eV%gK02kuq~aDQc~<nm4Z%VAEGeEBT6^mBQPg$!n05Ui$CNM
zQfU<<%7oT*Bx_M*Uz_f1gRuvCxKI{ik1~fmQa<zv$%G=IsVKm*`HjO@sqz!K!dXCr
z-`%-hVDZ78<vQ*ZW{zu*cvTbc8#q<{!PzlfwVeoC{o63<)QxA5xA6?>QmVFNLw=uk
H=bXI(ZC875

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/glsl/chains/pillarbox_right_horizontal/vs_saturation.bin b/bgfx/shaders/glsl/chains/pillarbox_right_horizontal/vs_saturation.bin
new file mode 100644
index 0000000000000000000000000000000000000000..3c794ab60042a79478e6ef158db4a6cefe7eadeb
GIT binary patch
literal 427
zcmZ9IOK!q25QZIzl}|CtxJ8x|5UPZ_?-HpJ+bD#9j7SE#j!BBT>XK7(g`S|37YWS5
zvi@)8pU3+1W8(e(-8{yN$m#UFGI*GHjCt%zZ)~m6o5H5x(qs;Cl;9DKTJi@lBXGhm
zZ8hdkC?sUlGC?$3Ds!=^biQxh+}&*?hv3EqMXq;fGRR^(hhai;LcJwb=im!|;m}&z
z>_lEsuq2`X%kMM1*EsZ*R8t6~5)Ztrhz}dcva0d^7_GXU2>U~Cc)43QKBIZ-M1Qm}
irFMOTSrb!G@=XYM?e#?)wH}DhuDx+HQ-AIs&e=bBV1@7i

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/glsl/chains/pillarbox_right_vertical/fs_blit.bin b/bgfx/shaders/glsl/chains/pillarbox_right_vertical/fs_blit.bin
new file mode 100644
index 0000000000000000000000000000000000000000..db0fe2b487b6c8f1624a7136f8c83734c2b7dcd1
GIT binary patch
literal 181
zcmZ<@_F!Rb{`8QMfwefkB(;KpkpYNiF)%QcB^Fg?=A|o?r6!vwl*K3K=j0a|SaTr>
z8v%uZT9Whgi&B6xrFofY`9--3#fiBEIjKcPE(%~1fm-r2QxtL&GxHQQG`Xs|6co~P
r;@yf8)15&^D%dJ$01YWAElLII&;V=EK{i-ZK?`oZrZrbB7Z(Enmi{^a

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/glsl/chains/pillarbox_right_vertical/fs_gaussian.bin b/bgfx/shaders/glsl/chains/pillarbox_right_vertical/fs_gaussian.bin
new file mode 100644
index 0000000000000000000000000000000000000000..eba13b8fcf5bf00d6fcb2a5514d035654c9ee9d5
GIT binary patch
literal 2861
zcmchZ|7xQ^5Xa5YLh)W={?w*t_lFuwxW8IT|L+5cG+q#*7LBP%>0kGtrLWK@=*-$A
zn+w8Gwt@`qjJu!Nb@#h-dw+K_`uqNNV*PC5W!lDdwn^EKk!6j@Gt2U{sI#)@JZDW@
zC9|xlyXI+4UGPhMUTw=-CDl4B=CDd11gt3bP?pt<P3@-0{*+Zt5g#<rQDg@^ige(;
zyH4`QMOuj)P+3gvRhi8oPqG3W*M7F4gVjwQ^J&)-u*@GZ$yktM`wqXsakdll+7`|+
z!(AR;yLRDH&zU^bUyV$iah}VjN-+~hrE&p|HhK7kO<WL%3y)m@Sr-voy6aMld5m!`
z<>9~`Vf-HiOb50Yt}tj1F!;reBqR@A6DUj@XN0yF<@<pN(iMTw^l~DGi)Ua;5rNS3
zfw&CC!~|$UAT)g-!6(8u0SXC(rVk`V;0qI=fIw*aKz<N$6C9s7X!<xIGqSlQVbJtp
zCV@1w<&-S^s|wn2jUv>BFE89)XF8d=3PbkQlQPy+%fx7!YJKM-j6nl^=Wjg#4YW;%
zI(37|$Y8=anA8t;dC^Tg%zexUEHacd9F<L)Kz5ary8Kmr`6+o)EApiGgq0d5ec)@?
e8}zCw3yZo9#pa9nwo2yL<)W-Gwjb)nwyh5jcm!(z

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/glsl/chains/pillarbox_right_vertical/fs_saturation.bin b/bgfx/shaders/glsl/chains/pillarbox_right_vertical/fs_saturation.bin
new file mode 100644
index 0000000000000000000000000000000000000000..4a3f80b56b9f050001428a84ea80e51513868350
GIT binary patch
literal 429
zcmY+A(N2Rf6o$*9H;oT*E<tAlWkwg`m1gnY2OteF(gf&I3S%1Mg-_}$_ynGItHXqp
zmcQS3&SCTVauIy}d@sn=koUq2S{SLiML<YEF8kb66K?SN#B~(<AiEmIs^Bo%tWZjq
zaYlzuZk29rvVytj9QC5zHI?Si;H()Pl`NqZvV$<9?-Y)(X?IvAPcr=A_wWc<3wx`O
z4jsOn*N^PwZKH(o2%q5`@lqKGy^c+XH{`1#4P(aF>m|hO?&03Pl4KP*n;YZ=q%&D+
zVHA29hZ_j}A#vgDUlS2r|N9wiI?BD5?d@czf!W@cshfPGMg622rOzRD@Ifj01*CR{
AvH$=8

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/glsl/chains/pillarbox_right_vertical/vs_blit.bin b/bgfx/shaders/glsl/chains/pillarbox_right_vertical/vs_blit.bin
new file mode 100644
index 0000000000000000000000000000000000000000..af6c9349f410fcc16eaa87e32ee35a9d92bb026b
GIT binary patch
literal 377
zcmZ9I%?g4*6h=pIHBWJu8X;!xq<zaE2wI7$$wYc%8YeAU^`yN*PteWGpEkpA5BJRX
z&1StcjmPV0FkXgQq?eV%gK02kuq~aDQc~<nm4Z%VAEGeEBT6^mBQPg$!n05Ui$CNM
zQfU<<%7oT*Bx_M*Uz_f1gRuvCxKI{ik1~fmQa<zv$%G=IsVKm*`HjO@sqz!K!dXCr
z-`%-hVDZ78<vQ*ZW{zu*cvTbc8#q<{!PzlfwVeoC{o63<)QxA5xA6?>QmVFNLw=uk
H=bXI(ZC875

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/glsl/chains/pillarbox_right_vertical/vs_gaussian.bin b/bgfx/shaders/glsl/chains/pillarbox_right_vertical/vs_gaussian.bin
new file mode 100644
index 0000000000000000000000000000000000000000..af6c9349f410fcc16eaa87e32ee35a9d92bb026b
GIT binary patch
literal 377
zcmZ9I%?g4*6h=pIHBWJu8X;!xq<zaE2wI7$$wYc%8YeAU^`yN*PteWGpEkpA5BJRX
z&1StcjmPV0FkXgQq?eV%gK02kuq~aDQc~<nm4Z%VAEGeEBT6^mBQPg$!n05Ui$CNM
zQfU<<%7oT*Bx_M*Uz_f1gRuvCxKI{ik1~fmQa<zv$%G=IsVKm*`HjO@sqz!K!dXCr
z-`%-hVDZ78<vQ*ZW{zu*cvTbc8#q<{!PzlfwVeoC{o63<)QxA5xA6?>QmVFNLw=uk
H=bXI(ZC875

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/glsl/chains/pillarbox_right_vertical/vs_saturation.bin b/bgfx/shaders/glsl/chains/pillarbox_right_vertical/vs_saturation.bin
new file mode 100644
index 0000000000000000000000000000000000000000..e0a84d1dba0e47b0882b3ce6725a43751d743d41
GIT binary patch
literal 425
zcmZ9IO=`n15QSyPN~f5ml?EZZ2_%H>y9@-nHLl|Zh1e5RS+P^P>Z-@=6?%e>Vmo#!
zgb?qWdGqtKeVzngzdr%vRpNAh-WWVg0>%RNO>b(g(XW-w!R6T;(j>zp8nxzk;E})y
z-?i0P{zEY#o7Wkl*-@HHO{2?w>*j85BRK{)PN+)#hNgfbwR0FcBq!86QgsQT;2#`X
zOIw`CD~Z-5^nZCd!;{BxsHB=fB$c@1bwhlZK-P`N`(v`{W+EI8wPAX*zWR*%^?~7N
lU<&Q(E@z<RVinUB0v>uf^0Hd^BRaEo!`F`bWq)$c{s3+eg^B<G

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/metal/chains/pillarbox_left_horizontal/fs_blit.bin b/bgfx/shaders/metal/chains/pillarbox_left_horizontal/fs_blit.bin
new file mode 100644
index 0000000000000000000000000000000000000000..6a3da392480084ed1b98155d1951154fce2cb223
GIT binary patch
literal 634
zcmZ{i%SyvQ6o#X?%2S+`%t$D;bXRpF6kQY-#Z?Kzm`u{(T*6#RL0tKyzJgEST#`~t
z-DUnc=ljq3C(HHI)y3D(cb2_hW|=dcY(Y}NOiwEYf?3KJxv|<+7WSOlmF4R#t(kt7
zy|eI<12kMwJBJ;q6jyq>7^Rt)EZbK~>DsHG=Q%IVj-V~&%^X@zmYTMY0rqd#tLz%3
zh4=T^#+M5wPX-*o!_X_*NkC^dAi{Fe!DeGDZ5iogSr$+!>5r$x!SotpkMlimu4$M?
zQ(TsQ>jD7$!q#avtM6hg4`4zDzI3>VwFMX|dd_qt8PSumYS3d9&O^F?Mjm#G{wf5W
zBD133QB7`xGJeB-x<nB@NnjK@4}JxpIOGgRoph6<2g4W#T(X)RKZ++K6pb-TfH^+6
W-lUFzO20$GXy#Lq1I@o`o@c)#)ZC;1

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/metal/chains/pillarbox_left_horizontal/fs_gaussian.bin b/bgfx/shaders/metal/chains/pillarbox_left_horizontal/fs_gaussian.bin
new file mode 100644
index 0000000000000000000000000000000000000000..173ce9333e4a2035c87b24216acb4817098c4c37
GIT binary patch
literal 5782
zcmb7|%Z}SN6hIxID}O-OTorQSs^UX_AZa!Qf_4!!K+sh%5Y(|e5uk^mN8+UDs*8SS
zf1zK{ONx@nu{gKf(6%IA@=(0TB;UOM`I~2d{rk^q_4l`{Ro~{-1F6z7YcJ`2M#`*9
zi<j%RYx?_+T#K}O+ZFFWrl+j=rMmPT`D0DUxv0~QkxxmNUGM9<IYlqme=b-0weQAS
zAJgJ2$U~95Y0`(E>Y{F(wSKGebKR74V}kUuv82tvX3&`Kg1mal%dBeiy0We|=_&79
z75@ya!6T1gbiXv<+cd98ut1xXU6JJE!-uv@AF?E`?(VkazOLZs<A}P?-w{=(hdRIa
z=X2Hs(dO<Bdb}ls07BO{89TjFL-?Ask_sNxH`KFR(x&C5$Ql)?EicLVl)kQ>+N|Z9
zu)3_7RQt6Yj$y>xzD(#eI*fGX<x|=uOkNtllOIVC3>^>qWEj2hdL_>_4P2ZCI=p__
zkRRq7(|eIO=4N$hZnXR^5%L#&$o7V@4UJhuz9+#jw*tz-XiH?dfliFw+^G0tWC)@N
z12sP3FghyiG-%r~;3j}pH$#0jAhHKjpywozkv35nMU--WixFEGy8&Z|V^D<wr4u9e
z#n?T@7<gVxJTZ*e%)>Z^8nVN~bkNXy3+ONa9dIBRB6u%QI)V1SKnDzHZvhDrFYp{K
z9;zhqE};=hbd*3)IC+k~JT$_9juy}%f*E)FhNzjefT9vsexgVRi3EiciBfMShA}}*
zW7<)^WBVm2+Xqw&f#OEkODHJZP~02p#t4s7iE<N)(LIAIH@QS@J5a3$iu++Fp`dU>
zdFw%DyXxYkxf>`;5S+yVUhXZFZ3wCrL2*aK5()}8l(!-%>IiB{Lc|BU#AI87X-hEN
z5<)UT;b!vI1Vc4JEl=#CC66=P5=>iy;g;YM2?{3?^R@&-EdenNOYCF5s6J*}f@w=I
z+!AWp@YJe-d0RrJ{L={qF%7800TvMplaJY!VA>MQZHZ~wBa?Id;VlG)3V~TdIPP}Q
z(*F^&g}}5Bm`eyRrY@_|8~g8_`wY!}X63%K|90|oo&4OD{IH<Xi&1=1c_%+dlb>11
z@0wKHPJgb`pS#k3hC<Vyd#67~(;s3Qnc_-+Zl^!j>Cav1KSQCK=HBVg(e#Iy2Gp{q
zxt;u6CqH*5|2X;3e^c&l1dbX3Vj4(}e^YJ?fomafmk{RN9lGq{-j?8~B_O83<XZM{
z+Y&-sLbxn3L!k>)?rjNyS^{DkP_6~4uq`39C4|coGZea&5Z;!MtIenXPa&oO<=RRJ
z+Y(|tTX0!ohC;V|!rKx8wFJa8pd!bnPuQLi+7klzgxr%OJ9FV}3W1seVwzaXn{#2C
zLTFP6+!Pc)KoQ=q5U494rb*>ELlL$sV(p3;cg6oW-V)xnh*4WWOcP5Tb=~g#Vr2`x
zUW;k?S?{X@d5mQ&Md8-<%U8ImHkk6eyg3{{hUPghJTgU-k2D#af>!!TIHX;#SN{Pl
CTEwgX

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/metal/chains/pillarbox_left_horizontal/fs_saturation.bin b/bgfx/shaders/metal/chains/pillarbox_left_horizontal/fs_saturation.bin
new file mode 100644
index 0000000000000000000000000000000000000000..de6ec5972af75113b6aa2a7b25ec9c3d8881f2ea
GIT binary patch
literal 832
zcmZ{iK~BRk5JiJvl~c?L*$}KIDFRergM?s#SRhuYvP|ogNRAyj4ipe8PRbQH0ghwS
zP?c3v&&>PZe|&j&wX^m4{S`&&b`-TuDHkAF#haSVI8@v)F^L<a+nIr-VCKe%yC*j1
z`dZelf%h1o5Q>=$o~hx>nNoT_n#3QQhi+RFrk<E6#;_3dQnST{5=#F&buY_8>1ri5
zhL$$Ww3?YxNjFzmO2y@xNw4RP->^~w+Heb689_^UcxVh;a9YagG=Z6t_U}5;d)Wmy
z)7qKGwkWtpBRrkjFcJW;IaqHzo1eO9&Y|g|v8}$~dJ||^RST{isi|rjy8OB8!f}`I
zAIttuPG3!IwNKJi^)u5n?M}isob^TI(4+^WZt_<z0o3mgyK`ES!5%TjK_D=*0Y9_+
zxiWx)9$CJ=Szu=<#}1pL5y?(Y5*U%g<D>2;O~)(hIAHSuHt#SN9k3bf1M*PRyUlSZ
yrmp!Qa54;gel=wHM#$3N#aqqEi&gmb{nE+ziIU-yT=h7En%lif-)Ns*97jKR^BQCT

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/metal/chains/pillarbox_left_horizontal/vs_blit.bin b/bgfx/shaders/metal/chains/pillarbox_left_horizontal/vs_blit.bin
new file mode 100644
index 0000000000000000000000000000000000000000..122b7dee5c387c772067b0ca196a2f12b636ec8d
GIT binary patch
literal 757
zcmZ{iy-ve06oms~%2V74rKpP1kge(tLq(+umMV(e)G0=Z9XZ!&3S#0(S$F`R0Oz+(
zRkqkV_nyz^<YoPEbM^K6ZCO9pmZb{D_rOU;i=4z1GKwUf+XYG$BUCBDC8q0FvZL~m
z=L+G&21rstFaQ$8A{Eku&4wUKwpB<SZxV*{UURQCxhNPi!AGi@sq(c7X%!10cjIM#
zBm2C}^Q7<$XrD%_lUr|W@B~nH%mbpYuLkqE{g2l(XNi!R@%kzN6_t!0R#Ln*b0w8}
z(Kxe?vCDBu7zgJ<s8NP##B@Rhl0A(W55p<Mg6ktcYoQ~#g=R+SnXO6^Dx2UZc3scN
zpd)D1Vt91`nB^sr(X77ezuor(EZTN`$8)_Y%v^6WQdCE+XmQ<Bw{CT;Rjr9@*02Dl
o1$9qp!QJ54EbqpQ9!w9ToWY@Q(bTp7VvQjwD#<$<U5#y9e+-TWr~m)}

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/metal/chains/pillarbox_left_horizontal/vs_gaussian.bin b/bgfx/shaders/metal/chains/pillarbox_left_horizontal/vs_gaussian.bin
new file mode 100644
index 0000000000000000000000000000000000000000..122b7dee5c387c772067b0ca196a2f12b636ec8d
GIT binary patch
literal 757
zcmZ{iy-ve06oms~%2V74rKpP1kge(tLq(+umMV(e)G0=Z9XZ!&3S#0(S$F`R0Oz+(
zRkqkV_nyz^<YoPEbM^K6ZCO9pmZb{D_rOU;i=4z1GKwUf+XYG$BUCBDC8q0FvZL~m
z=L+G&21rstFaQ$8A{Eku&4wUKwpB<SZxV*{UURQCxhNPi!AGi@sq(c7X%!10cjIM#
zBm2C}^Q7<$XrD%_lUr|W@B~nH%mbpYuLkqE{g2l(XNi!R@%kzN6_t!0R#Ln*b0w8}
z(Kxe?vCDBu7zgJ<s8NP##B@Rhl0A(W55p<Mg6ktcYoQ~#g=R+SnXO6^Dx2UZc3scN
zpd)D1Vt91`nB^sr(X77ezuor(EZTN`$8)_Y%v^6WQdCE+XmQ<Bw{CT;Rjr9@*02Dl
o1$9qp!QJ54EbqpQ9!w9ToWY@Q(bTp7VvQjwD#<$<U5#y9e+-TWr~m)}

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/metal/chains/pillarbox_left_horizontal/vs_saturation.bin b/bgfx/shaders/metal/chains/pillarbox_left_horizontal/vs_saturation.bin
new file mode 100644
index 0000000000000000000000000000000000000000..77a27dd0e00106a792e635631c623fcc73d3029e
GIT binary patch
literal 805
zcmZ{i%}#?r6ooOm;sIRWl>u!CP!=Xl_qu3o(&(lkWJ-rR24=``r==QKKB=$Z6FB^o
zpGH~1<=lI|xo2Kh4_6moKi`INeQ6k~V0;IhWVFahOd+F4(wSMHR53!C5?o-qdL>&b
zA9=12K1_fl6$AqyQ7lp+U0AOPqGTI|)N<`GoSigNt;t2fkO@9gc|(=2RY=QN2)P{(
z^K04X-#kwW&wzGmwCvqZ#si)J_APUV=<8BvJ~RLEdgd$<G8>$}3_wMDMh{CV-s-+R
zm3q*4XDws9#|2>=tUs0-Wtc`xZ>T`BqY>j_IDuGj{mIW#Xi09M?oqmDqmqQmdhxbd
z#WON!32L?IP8|Sd`JTwgt4gPL=luZlCSBih9d`nr<Ju!ddDMyq*Xgr$%44N!Oq^j1
zbFdmvr{5Obc8>M%wr!Au_OO~hrd_&tbYp$>DmZUiKNE1Bd)tP){*PbPJbOI4y{QBC
Rrcz-`ic0d9UPoz~#xK3k5Rd=>

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/metal/chains/pillarbox_left_vertical/fs_blit.bin b/bgfx/shaders/metal/chains/pillarbox_left_vertical/fs_blit.bin
new file mode 100644
index 0000000000000000000000000000000000000000..6a3da392480084ed1b98155d1951154fce2cb223
GIT binary patch
literal 634
zcmZ{i%SyvQ6o#X?%2S+`%t$D;bXRpF6kQY-#Z?Kzm`u{(T*6#RL0tKyzJgEST#`~t
z-DUnc=ljq3C(HHI)y3D(cb2_hW|=dcY(Y}NOiwEYf?3KJxv|<+7WSOlmF4R#t(kt7
zy|eI<12kMwJBJ;q6jyq>7^Rt)EZbK~>DsHG=Q%IVj-V~&%^X@zmYTMY0rqd#tLz%3
zh4=T^#+M5wPX-*o!_X_*NkC^dAi{Fe!DeGDZ5iogSr$+!>5r$x!SotpkMlimu4$M?
zQ(TsQ>jD7$!q#avtM6hg4`4zDzI3>VwFMX|dd_qt8PSumYS3d9&O^F?Mjm#G{wf5W
zBD133QB7`xGJeB-x<nB@NnjK@4}JxpIOGgRoph6<2g4W#T(X)RKZ++K6pb-TfH^+6
W-lUFzO20$GXy#Lq1I@o`o@c)#)ZC;1

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/metal/chains/pillarbox_left_vertical/fs_gaussian.bin b/bgfx/shaders/metal/chains/pillarbox_left_vertical/fs_gaussian.bin
new file mode 100644
index 0000000000000000000000000000000000000000..173ce9333e4a2035c87b24216acb4817098c4c37
GIT binary patch
literal 5782
zcmb7|%Z}SN6hIxID}O-OTorQSs^UX_AZa!Qf_4!!K+sh%5Y(|e5uk^mN8+UDs*8SS
zf1zK{ONx@nu{gKf(6%IA@=(0TB;UOM`I~2d{rk^q_4l`{Ro~{-1F6z7YcJ`2M#`*9
zi<j%RYx?_+T#K}O+ZFFWrl+j=rMmPT`D0DUxv0~QkxxmNUGM9<IYlqme=b-0weQAS
zAJgJ2$U~95Y0`(E>Y{F(wSKGebKR74V}kUuv82tvX3&`Kg1mal%dBeiy0We|=_&79
z75@ya!6T1gbiXv<+cd98ut1xXU6JJE!-uv@AF?E`?(VkazOLZs<A}P?-w{=(hdRIa
z=X2Hs(dO<Bdb}ls07BO{89TjFL-?Ask_sNxH`KFR(x&C5$Ql)?EicLVl)kQ>+N|Z9
zu)3_7RQt6Yj$y>xzD(#eI*fGX<x|=uOkNtllOIVC3>^>qWEj2hdL_>_4P2ZCI=p__
zkRRq7(|eIO=4N$hZnXR^5%L#&$o7V@4UJhuz9+#jw*tz-XiH?dfliFw+^G0tWC)@N
z12sP3FghyiG-%r~;3j}pH$#0jAhHKjpywozkv35nMU--WixFEGy8&Z|V^D<wr4u9e
z#n?T@7<gVxJTZ*e%)>Z^8nVN~bkNXy3+ONa9dIBRB6u%QI)V1SKnDzHZvhDrFYp{K
z9;zhqE};=hbd*3)IC+k~JT$_9juy}%f*E)FhNzjefT9vsexgVRi3EiciBfMShA}}*
zW7<)^WBVm2+Xqw&f#OEkODHJZP~02p#t4s7iE<N)(LIAIH@QS@J5a3$iu++Fp`dU>
zdFw%DyXxYkxf>`;5S+yVUhXZFZ3wCrL2*aK5()}8l(!-%>IiB{Lc|BU#AI87X-hEN
z5<)UT;b!vI1Vc4JEl=#CC66=P5=>iy;g;YM2?{3?^R@&-EdenNOYCF5s6J*}f@w=I
z+!AWp@YJe-d0RrJ{L={qF%7800TvMplaJY!VA>MQZHZ~wBa?Id;VlG)3V~TdIPP}Q
z(*F^&g}}5Bm`eyRrY@_|8~g8_`wY!}X63%K|90|oo&4OD{IH<Xi&1=1c_%+dlb>11
z@0wKHPJgb`pS#k3hC<Vyd#67~(;s3Qnc_-+Zl^!j>Cav1KSQCK=HBVg(e#Iy2Gp{q
zxt;u6CqH*5|2X;3e^c&l1dbX3Vj4(}e^YJ?fomafmk{RN9lGq{-j?8~B_O83<XZM{
z+Y&-sLbxn3L!k>)?rjNyS^{DkP_6~4uq`39C4|coGZea&5Z;!MtIenXPa&oO<=RRJ
z+Y(|tTX0!ohC;V|!rKx8wFJa8pd!bnPuQLi+7klzgxr%OJ9FV}3W1seVwzaXn{#2C
zLTFP6+!Pc)KoQ=q5U494rb*>ELlL$sV(p3;cg6oW-V)xnh*4WWOcP5Tb=~g#Vr2`x
zUW;k?S?{X@d5mQ&Md8-<%U8ImHkk6eyg3{{hUPghJTgU-k2D#af>!!TIHX;#SN{Pl
CTEwgX

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/metal/chains/pillarbox_left_vertical/fs_saturation.bin b/bgfx/shaders/metal/chains/pillarbox_left_vertical/fs_saturation.bin
new file mode 100644
index 0000000000000000000000000000000000000000..de6ec5972af75113b6aa2a7b25ec9c3d8881f2ea
GIT binary patch
literal 832
zcmZ{iK~BRk5JiJvl~c?L*$}KIDFRergM?s#SRhuYvP|ogNRAyj4ipe8PRbQH0ghwS
zP?c3v&&>PZe|&j&wX^m4{S`&&b`-TuDHkAF#haSVI8@v)F^L<a+nIr-VCKe%yC*j1
z`dZelf%h1o5Q>=$o~hx>nNoT_n#3QQhi+RFrk<E6#;_3dQnST{5=#F&buY_8>1ri5
zhL$$Ww3?YxNjFzmO2y@xNw4RP->^~w+Heb689_^UcxVh;a9YagG=Z6t_U}5;d)Wmy
z)7qKGwkWtpBRrkjFcJW;IaqHzo1eO9&Y|g|v8}$~dJ||^RST{isi|rjy8OB8!f}`I
zAIttuPG3!IwNKJi^)u5n?M}isob^TI(4+^WZt_<z0o3mgyK`ES!5%TjK_D=*0Y9_+
zxiWx)9$CJ=Szu=<#}1pL5y?(Y5*U%g<D>2;O~)(hIAHSuHt#SN9k3bf1M*PRyUlSZ
yrmp!Qa54;gel=wHM#$3N#aqqEi&gmb{nE+ziIU-yT=h7En%lif-)Ns*97jKR^BQCT

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/metal/chains/pillarbox_left_vertical/vs_blit.bin b/bgfx/shaders/metal/chains/pillarbox_left_vertical/vs_blit.bin
new file mode 100644
index 0000000000000000000000000000000000000000..122b7dee5c387c772067b0ca196a2f12b636ec8d
GIT binary patch
literal 757
zcmZ{iy-ve06oms~%2V74rKpP1kge(tLq(+umMV(e)G0=Z9XZ!&3S#0(S$F`R0Oz+(
zRkqkV_nyz^<YoPEbM^K6ZCO9pmZb{D_rOU;i=4z1GKwUf+XYG$BUCBDC8q0FvZL~m
z=L+G&21rstFaQ$8A{Eku&4wUKwpB<SZxV*{UURQCxhNPi!AGi@sq(c7X%!10cjIM#
zBm2C}^Q7<$XrD%_lUr|W@B~nH%mbpYuLkqE{g2l(XNi!R@%kzN6_t!0R#Ln*b0w8}
z(Kxe?vCDBu7zgJ<s8NP##B@Rhl0A(W55p<Mg6ktcYoQ~#g=R+SnXO6^Dx2UZc3scN
zpd)D1Vt91`nB^sr(X77ezuor(EZTN`$8)_Y%v^6WQdCE+XmQ<Bw{CT;Rjr9@*02Dl
o1$9qp!QJ54EbqpQ9!w9ToWY@Q(bTp7VvQjwD#<$<U5#y9e+-TWr~m)}

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/metal/chains/pillarbox_left_vertical/vs_gaussian.bin b/bgfx/shaders/metal/chains/pillarbox_left_vertical/vs_gaussian.bin
new file mode 100644
index 0000000000000000000000000000000000000000..122b7dee5c387c772067b0ca196a2f12b636ec8d
GIT binary patch
literal 757
zcmZ{iy-ve06oms~%2V74rKpP1kge(tLq(+umMV(e)G0=Z9XZ!&3S#0(S$F`R0Oz+(
zRkqkV_nyz^<YoPEbM^K6ZCO9pmZb{D_rOU;i=4z1GKwUf+XYG$BUCBDC8q0FvZL~m
z=L+G&21rstFaQ$8A{Eku&4wUKwpB<SZxV*{UURQCxhNPi!AGi@sq(c7X%!10cjIM#
zBm2C}^Q7<$XrD%_lUr|W@B~nH%mbpYuLkqE{g2l(XNi!R@%kzN6_t!0R#Ln*b0w8}
z(Kxe?vCDBu7zgJ<s8NP##B@Rhl0A(W55p<Mg6ktcYoQ~#g=R+SnXO6^Dx2UZc3scN
zpd)D1Vt91`nB^sr(X77ezuor(EZTN`$8)_Y%v^6WQdCE+XmQ<Bw{CT;Rjr9@*02Dl
o1$9qp!QJ54EbqpQ9!w9ToWY@Q(bTp7VvQjwD#<$<U5#y9e+-TWr~m)}

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/metal/chains/pillarbox_left_vertical/vs_saturation.bin b/bgfx/shaders/metal/chains/pillarbox_left_vertical/vs_saturation.bin
new file mode 100644
index 0000000000000000000000000000000000000000..0b0b45bfd501a52048f04eff7c837a2155a9b133
GIT binary patch
literal 808
zcmZ{i!A^rf5QZ^&;tjmb$$&Nluo_L%yB->w7`-$N+0t!Y1G{9IrBvg|C-oJ40vFg)
zXllX%X8)Q0+xdBYemFb%{{6A6^Ha-GIpb^KB&B&qVhSlml8o#erHT>Cgx~~|=QpyX
z@{wl>;nN0KC4%4(NEC}iNFQc1f+*QSA$5FrJ|FEg*IJW_oFNmurwY2NP^*xZu@G|E
z9~RcKuj4#V3J-wRNi^NN?TkA-LnsV$ix}!sYd*67@p|EGC1l#UeK`ab6^w4CQoPrF
z1(kYGe`ki#>~TUE2j|FAqZE^f=?&#b)-+;#J|93Vxc=k^DHxIqsC$&|S*X>D%6jpx
zUB%NgFa)()w6`7trddH`6jY_%yZ5nyag%Q7_?|z2!1LXnqTFglgX`_H^~!CfYD~Ot
z3}bK_P;b92xNIHk;ij#VgZ6NmKBisTcywd^>s4@f1Mt0@`%piw3s?JtpgO3^w{CyB
W`B^*oO{F526qV%W0y<6Gw*CO^9T7$V

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/metal/chains/pillarbox_right_horizontal/fs_blit.bin b/bgfx/shaders/metal/chains/pillarbox_right_horizontal/fs_blit.bin
new file mode 100644
index 0000000000000000000000000000000000000000..6a3da392480084ed1b98155d1951154fce2cb223
GIT binary patch
literal 634
zcmZ{i%SyvQ6o#X?%2S+`%t$D;bXRpF6kQY-#Z?Kzm`u{(T*6#RL0tKyzJgEST#`~t
z-DUnc=ljq3C(HHI)y3D(cb2_hW|=dcY(Y}NOiwEYf?3KJxv|<+7WSOlmF4R#t(kt7
zy|eI<12kMwJBJ;q6jyq>7^Rt)EZbK~>DsHG=Q%IVj-V~&%^X@zmYTMY0rqd#tLz%3
zh4=T^#+M5wPX-*o!_X_*NkC^dAi{Fe!DeGDZ5iogSr$+!>5r$x!SotpkMlimu4$M?
zQ(TsQ>jD7$!q#avtM6hg4`4zDzI3>VwFMX|dd_qt8PSumYS3d9&O^F?Mjm#G{wf5W
zBD133QB7`xGJeB-x<nB@NnjK@4}JxpIOGgRoph6<2g4W#T(X)RKZ++K6pb-TfH^+6
W-lUFzO20$GXy#Lq1I@o`o@c)#)ZC;1

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/metal/chains/pillarbox_right_horizontal/fs_gaussian.bin b/bgfx/shaders/metal/chains/pillarbox_right_horizontal/fs_gaussian.bin
new file mode 100644
index 0000000000000000000000000000000000000000..173ce9333e4a2035c87b24216acb4817098c4c37
GIT binary patch
literal 5782
zcmb7|%Z}SN6hIxID}O-OTorQSs^UX_AZa!Qf_4!!K+sh%5Y(|e5uk^mN8+UDs*8SS
zf1zK{ONx@nu{gKf(6%IA@=(0TB;UOM`I~2d{rk^q_4l`{Ro~{-1F6z7YcJ`2M#`*9
zi<j%RYx?_+T#K}O+ZFFWrl+j=rMmPT`D0DUxv0~QkxxmNUGM9<IYlqme=b-0weQAS
zAJgJ2$U~95Y0`(E>Y{F(wSKGebKR74V}kUuv82tvX3&`Kg1mal%dBeiy0We|=_&79
z75@ya!6T1gbiXv<+cd98ut1xXU6JJE!-uv@AF?E`?(VkazOLZs<A}P?-w{=(hdRIa
z=X2Hs(dO<Bdb}ls07BO{89TjFL-?Ask_sNxH`KFR(x&C5$Ql)?EicLVl)kQ>+N|Z9
zu)3_7RQt6Yj$y>xzD(#eI*fGX<x|=uOkNtllOIVC3>^>qWEj2hdL_>_4P2ZCI=p__
zkRRq7(|eIO=4N$hZnXR^5%L#&$o7V@4UJhuz9+#jw*tz-XiH?dfliFw+^G0tWC)@N
z12sP3FghyiG-%r~;3j}pH$#0jAhHKjpywozkv35nMU--WixFEGy8&Z|V^D<wr4u9e
z#n?T@7<gVxJTZ*e%)>Z^8nVN~bkNXy3+ONa9dIBRB6u%QI)V1SKnDzHZvhDrFYp{K
z9;zhqE};=hbd*3)IC+k~JT$_9juy}%f*E)FhNzjefT9vsexgVRi3EiciBfMShA}}*
zW7<)^WBVm2+Xqw&f#OEkODHJZP~02p#t4s7iE<N)(LIAIH@QS@J5a3$iu++Fp`dU>
zdFw%DyXxYkxf>`;5S+yVUhXZFZ3wCrL2*aK5()}8l(!-%>IiB{Lc|BU#AI87X-hEN
z5<)UT;b!vI1Vc4JEl=#CC66=P5=>iy;g;YM2?{3?^R@&-EdenNOYCF5s6J*}f@w=I
z+!AWp@YJe-d0RrJ{L={qF%7800TvMplaJY!VA>MQZHZ~wBa?Id;VlG)3V~TdIPP}Q
z(*F^&g}}5Bm`eyRrY@_|8~g8_`wY!}X63%K|90|oo&4OD{IH<Xi&1=1c_%+dlb>11
z@0wKHPJgb`pS#k3hC<Vyd#67~(;s3Qnc_-+Zl^!j>Cav1KSQCK=HBVg(e#Iy2Gp{q
zxt;u6CqH*5|2X;3e^c&l1dbX3Vj4(}e^YJ?fomafmk{RN9lGq{-j?8~B_O83<XZM{
z+Y&-sLbxn3L!k>)?rjNyS^{DkP_6~4uq`39C4|coGZea&5Z;!MtIenXPa&oO<=RRJ
z+Y(|tTX0!ohC;V|!rKx8wFJa8pd!bnPuQLi+7klzgxr%OJ9FV}3W1seVwzaXn{#2C
zLTFP6+!Pc)KoQ=q5U494rb*>ELlL$sV(p3;cg6oW-V)xnh*4WWOcP5Tb=~g#Vr2`x
zUW;k?S?{X@d5mQ&Md8-<%U8ImHkk6eyg3{{hUPghJTgU-k2D#af>!!TIHX;#SN{Pl
CTEwgX

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/metal/chains/pillarbox_right_horizontal/fs_saturation.bin b/bgfx/shaders/metal/chains/pillarbox_right_horizontal/fs_saturation.bin
new file mode 100644
index 0000000000000000000000000000000000000000..de6ec5972af75113b6aa2a7b25ec9c3d8881f2ea
GIT binary patch
literal 832
zcmZ{iK~BRk5JiJvl~c?L*$}KIDFRergM?s#SRhuYvP|ogNRAyj4ipe8PRbQH0ghwS
zP?c3v&&>PZe|&j&wX^m4{S`&&b`-TuDHkAF#haSVI8@v)F^L<a+nIr-VCKe%yC*j1
z`dZelf%h1o5Q>=$o~hx>nNoT_n#3QQhi+RFrk<E6#;_3dQnST{5=#F&buY_8>1ri5
zhL$$Ww3?YxNjFzmO2y@xNw4RP->^~w+Heb689_^UcxVh;a9YagG=Z6t_U}5;d)Wmy
z)7qKGwkWtpBRrkjFcJW;IaqHzo1eO9&Y|g|v8}$~dJ||^RST{isi|rjy8OB8!f}`I
zAIttuPG3!IwNKJi^)u5n?M}isob^TI(4+^WZt_<z0o3mgyK`ES!5%TjK_D=*0Y9_+
zxiWx)9$CJ=Szu=<#}1pL5y?(Y5*U%g<D>2;O~)(hIAHSuHt#SN9k3bf1M*PRyUlSZ
yrmp!Qa54;gel=wHM#$3N#aqqEi&gmb{nE+ziIU-yT=h7En%lif-)Ns*97jKR^BQCT

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/metal/chains/pillarbox_right_horizontal/vs_blit.bin b/bgfx/shaders/metal/chains/pillarbox_right_horizontal/vs_blit.bin
new file mode 100644
index 0000000000000000000000000000000000000000..122b7dee5c387c772067b0ca196a2f12b636ec8d
GIT binary patch
literal 757
zcmZ{iy-ve06oms~%2V74rKpP1kge(tLq(+umMV(e)G0=Z9XZ!&3S#0(S$F`R0Oz+(
zRkqkV_nyz^<YoPEbM^K6ZCO9pmZb{D_rOU;i=4z1GKwUf+XYG$BUCBDC8q0FvZL~m
z=L+G&21rstFaQ$8A{Eku&4wUKwpB<SZxV*{UURQCxhNPi!AGi@sq(c7X%!10cjIM#
zBm2C}^Q7<$XrD%_lUr|W@B~nH%mbpYuLkqE{g2l(XNi!R@%kzN6_t!0R#Ln*b0w8}
z(Kxe?vCDBu7zgJ<s8NP##B@Rhl0A(W55p<Mg6ktcYoQ~#g=R+SnXO6^Dx2UZc3scN
zpd)D1Vt91`nB^sr(X77ezuor(EZTN`$8)_Y%v^6WQdCE+XmQ<Bw{CT;Rjr9@*02Dl
o1$9qp!QJ54EbqpQ9!w9ToWY@Q(bTp7VvQjwD#<$<U5#y9e+-TWr~m)}

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/metal/chains/pillarbox_right_horizontal/vs_gaussian.bin b/bgfx/shaders/metal/chains/pillarbox_right_horizontal/vs_gaussian.bin
new file mode 100644
index 0000000000000000000000000000000000000000..122b7dee5c387c772067b0ca196a2f12b636ec8d
GIT binary patch
literal 757
zcmZ{iy-ve06oms~%2V74rKpP1kge(tLq(+umMV(e)G0=Z9XZ!&3S#0(S$F`R0Oz+(
zRkqkV_nyz^<YoPEbM^K6ZCO9pmZb{D_rOU;i=4z1GKwUf+XYG$BUCBDC8q0FvZL~m
z=L+G&21rstFaQ$8A{Eku&4wUKwpB<SZxV*{UURQCxhNPi!AGi@sq(c7X%!10cjIM#
zBm2C}^Q7<$XrD%_lUr|W@B~nH%mbpYuLkqE{g2l(XNi!R@%kzN6_t!0R#Ln*b0w8}
z(Kxe?vCDBu7zgJ<s8NP##B@Rhl0A(W55p<Mg6ktcYoQ~#g=R+SnXO6^Dx2UZc3scN
zpd)D1Vt91`nB^sr(X77ezuor(EZTN`$8)_Y%v^6WQdCE+XmQ<Bw{CT;Rjr9@*02Dl
o1$9qp!QJ54EbqpQ9!w9ToWY@Q(bTp7VvQjwD#<$<U5#y9e+-TWr~m)}

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/metal/chains/pillarbox_right_horizontal/vs_saturation.bin b/bgfx/shaders/metal/chains/pillarbox_right_horizontal/vs_saturation.bin
new file mode 100644
index 0000000000000000000000000000000000000000..beb3b4360676035783bb54b233e46db380afd560
GIT binary patch
literal 811
zcmZ`%!A^rf5XI<;Z}2cD1KJR1i7{z<*F$5IMlTH^Te_`lV7FOjDb;xLOZ^4Ezy-Dx
znz|>LeQ(~IdHXtlyt?@Q{jsd;OUqI@;~U^4qxqI36f%k=9osodl^~QU!6~NmH?pGg
ziEkCcrwy=91;G$VoQPCN9~KLODA`gWb$mC9#s|zuW40n^$OP}9f-Y*PQAo=~2)XJv
z8`iL|^M0Nco*3Gs@$9H}5bpR1p)j6Xi$h&%#mDwPS}&Zfh0HqBmm#RQV01T=;=Se-
zRO&|kof(g2k5j@pIA@j`XPCxJZzxByp)uo8G=M~K{mV~MFiviu<|xfss`Z-6dhxDZ
z#nTfo4r;V$rw#$LZ9!xlRHehW_pyUXlkU**J%0d!=es>bxz~usu6NAVEB6(u5%Ib)
zOu%W3ddF?SZL3%}H?&R;TEl60Osll<Xkz{JDs#c8J_GQ*2iJwW<IR0@s++*=3z+xX
TnV_ju<|RcXxtT!+YTMQy6yOow

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/metal/chains/pillarbox_right_vertical/fs_blit.bin b/bgfx/shaders/metal/chains/pillarbox_right_vertical/fs_blit.bin
new file mode 100644
index 0000000000000000000000000000000000000000..6a3da392480084ed1b98155d1951154fce2cb223
GIT binary patch
literal 634
zcmZ{i%SyvQ6o#X?%2S+`%t$D;bXRpF6kQY-#Z?Kzm`u{(T*6#RL0tKyzJgEST#`~t
z-DUnc=ljq3C(HHI)y3D(cb2_hW|=dcY(Y}NOiwEYf?3KJxv|<+7WSOlmF4R#t(kt7
zy|eI<12kMwJBJ;q6jyq>7^Rt)EZbK~>DsHG=Q%IVj-V~&%^X@zmYTMY0rqd#tLz%3
zh4=T^#+M5wPX-*o!_X_*NkC^dAi{Fe!DeGDZ5iogSr$+!>5r$x!SotpkMlimu4$M?
zQ(TsQ>jD7$!q#avtM6hg4`4zDzI3>VwFMX|dd_qt8PSumYS3d9&O^F?Mjm#G{wf5W
zBD133QB7`xGJeB-x<nB@NnjK@4}JxpIOGgRoph6<2g4W#T(X)RKZ++K6pb-TfH^+6
W-lUFzO20$GXy#Lq1I@o`o@c)#)ZC;1

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/metal/chains/pillarbox_right_vertical/fs_gaussian.bin b/bgfx/shaders/metal/chains/pillarbox_right_vertical/fs_gaussian.bin
new file mode 100644
index 0000000000000000000000000000000000000000..173ce9333e4a2035c87b24216acb4817098c4c37
GIT binary patch
literal 5782
zcmb7|%Z}SN6hIxID}O-OTorQSs^UX_AZa!Qf_4!!K+sh%5Y(|e5uk^mN8+UDs*8SS
zf1zK{ONx@nu{gKf(6%IA@=(0TB;UOM`I~2d{rk^q_4l`{Ro~{-1F6z7YcJ`2M#`*9
zi<j%RYx?_+T#K}O+ZFFWrl+j=rMmPT`D0DUxv0~QkxxmNUGM9<IYlqme=b-0weQAS
zAJgJ2$U~95Y0`(E>Y{F(wSKGebKR74V}kUuv82tvX3&`Kg1mal%dBeiy0We|=_&79
z75@ya!6T1gbiXv<+cd98ut1xXU6JJE!-uv@AF?E`?(VkazOLZs<A}P?-w{=(hdRIa
z=X2Hs(dO<Bdb}ls07BO{89TjFL-?Ask_sNxH`KFR(x&C5$Ql)?EicLVl)kQ>+N|Z9
zu)3_7RQt6Yj$y>xzD(#eI*fGX<x|=uOkNtllOIVC3>^>qWEj2hdL_>_4P2ZCI=p__
zkRRq7(|eIO=4N$hZnXR^5%L#&$o7V@4UJhuz9+#jw*tz-XiH?dfliFw+^G0tWC)@N
z12sP3FghyiG-%r~;3j}pH$#0jAhHKjpywozkv35nMU--WixFEGy8&Z|V^D<wr4u9e
z#n?T@7<gVxJTZ*e%)>Z^8nVN~bkNXy3+ONa9dIBRB6u%QI)V1SKnDzHZvhDrFYp{K
z9;zhqE};=hbd*3)IC+k~JT$_9juy}%f*E)FhNzjefT9vsexgVRi3EiciBfMShA}}*
zW7<)^WBVm2+Xqw&f#OEkODHJZP~02p#t4s7iE<N)(LIAIH@QS@J5a3$iu++Fp`dU>
zdFw%DyXxYkxf>`;5S+yVUhXZFZ3wCrL2*aK5()}8l(!-%>IiB{Lc|BU#AI87X-hEN
z5<)UT;b!vI1Vc4JEl=#CC66=P5=>iy;g;YM2?{3?^R@&-EdenNOYCF5s6J*}f@w=I
z+!AWp@YJe-d0RrJ{L={qF%7800TvMplaJY!VA>MQZHZ~wBa?Id;VlG)3V~TdIPP}Q
z(*F^&g}}5Bm`eyRrY@_|8~g8_`wY!}X63%K|90|oo&4OD{IH<Xi&1=1c_%+dlb>11
z@0wKHPJgb`pS#k3hC<Vyd#67~(;s3Qnc_-+Zl^!j>Cav1KSQCK=HBVg(e#Iy2Gp{q
zxt;u6CqH*5|2X;3e^c&l1dbX3Vj4(}e^YJ?fomafmk{RN9lGq{-j?8~B_O83<XZM{
z+Y&-sLbxn3L!k>)?rjNyS^{DkP_6~4uq`39C4|coGZea&5Z;!MtIenXPa&oO<=RRJ
z+Y(|tTX0!ohC;V|!rKx8wFJa8pd!bnPuQLi+7klzgxr%OJ9FV}3W1seVwzaXn{#2C
zLTFP6+!Pc)KoQ=q5U494rb*>ELlL$sV(p3;cg6oW-V)xnh*4WWOcP5Tb=~g#Vr2`x
zUW;k?S?{X@d5mQ&Md8-<%U8ImHkk6eyg3{{hUPghJTgU-k2D#af>!!TIHX;#SN{Pl
CTEwgX

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/metal/chains/pillarbox_right_vertical/fs_saturation.bin b/bgfx/shaders/metal/chains/pillarbox_right_vertical/fs_saturation.bin
new file mode 100644
index 0000000000000000000000000000000000000000..de6ec5972af75113b6aa2a7b25ec9c3d8881f2ea
GIT binary patch
literal 832
zcmZ{iK~BRk5JiJvl~c?L*$}KIDFRergM?s#SRhuYvP|ogNRAyj4ipe8PRbQH0ghwS
zP?c3v&&>PZe|&j&wX^m4{S`&&b`-TuDHkAF#haSVI8@v)F^L<a+nIr-VCKe%yC*j1
z`dZelf%h1o5Q>=$o~hx>nNoT_n#3QQhi+RFrk<E6#;_3dQnST{5=#F&buY_8>1ri5
zhL$$Ww3?YxNjFzmO2y@xNw4RP->^~w+Heb689_^UcxVh;a9YagG=Z6t_U}5;d)Wmy
z)7qKGwkWtpBRrkjFcJW;IaqHzo1eO9&Y|g|v8}$~dJ||^RST{isi|rjy8OB8!f}`I
zAIttuPG3!IwNKJi^)u5n?M}isob^TI(4+^WZt_<z0o3mgyK`ES!5%TjK_D=*0Y9_+
zxiWx)9$CJ=Szu=<#}1pL5y?(Y5*U%g<D>2;O~)(hIAHSuHt#SN9k3bf1M*PRyUlSZ
yrmp!Qa54;gel=wHM#$3N#aqqEi&gmb{nE+ziIU-yT=h7En%lif-)Ns*97jKR^BQCT

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/metal/chains/pillarbox_right_vertical/vs_blit.bin b/bgfx/shaders/metal/chains/pillarbox_right_vertical/vs_blit.bin
new file mode 100644
index 0000000000000000000000000000000000000000..122b7dee5c387c772067b0ca196a2f12b636ec8d
GIT binary patch
literal 757
zcmZ{iy-ve06oms~%2V74rKpP1kge(tLq(+umMV(e)G0=Z9XZ!&3S#0(S$F`R0Oz+(
zRkqkV_nyz^<YoPEbM^K6ZCO9pmZb{D_rOU;i=4z1GKwUf+XYG$BUCBDC8q0FvZL~m
z=L+G&21rstFaQ$8A{Eku&4wUKwpB<SZxV*{UURQCxhNPi!AGi@sq(c7X%!10cjIM#
zBm2C}^Q7<$XrD%_lUr|W@B~nH%mbpYuLkqE{g2l(XNi!R@%kzN6_t!0R#Ln*b0w8}
z(Kxe?vCDBu7zgJ<s8NP##B@Rhl0A(W55p<Mg6ktcYoQ~#g=R+SnXO6^Dx2UZc3scN
zpd)D1Vt91`nB^sr(X77ezuor(EZTN`$8)_Y%v^6WQdCE+XmQ<Bw{CT;Rjr9@*02Dl
o1$9qp!QJ54EbqpQ9!w9ToWY@Q(bTp7VvQjwD#<$<U5#y9e+-TWr~m)}

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/metal/chains/pillarbox_right_vertical/vs_gaussian.bin b/bgfx/shaders/metal/chains/pillarbox_right_vertical/vs_gaussian.bin
new file mode 100644
index 0000000000000000000000000000000000000000..122b7dee5c387c772067b0ca196a2f12b636ec8d
GIT binary patch
literal 757
zcmZ{iy-ve06oms~%2V74rKpP1kge(tLq(+umMV(e)G0=Z9XZ!&3S#0(S$F`R0Oz+(
zRkqkV_nyz^<YoPEbM^K6ZCO9pmZb{D_rOU;i=4z1GKwUf+XYG$BUCBDC8q0FvZL~m
z=L+G&21rstFaQ$8A{Eku&4wUKwpB<SZxV*{UURQCxhNPi!AGi@sq(c7X%!10cjIM#
zBm2C}^Q7<$XrD%_lUr|W@B~nH%mbpYuLkqE{g2l(XNi!R@%kzN6_t!0R#Ln*b0w8}
z(Kxe?vCDBu7zgJ<s8NP##B@Rhl0A(W55p<Mg6ktcYoQ~#g=R+SnXO6^Dx2UZc3scN
zpd)D1Vt91`nB^sr(X77ezuor(EZTN`$8)_Y%v^6WQdCE+XmQ<Bw{CT;Rjr9@*02Dl
o1$9qp!QJ54EbqpQ9!w9ToWY@Q(bTp7VvQjwD#<$<U5#y9e+-TWr~m)}

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/metal/chains/pillarbox_right_vertical/vs_saturation.bin b/bgfx/shaders/metal/chains/pillarbox_right_vertical/vs_saturation.bin
new file mode 100644
index 0000000000000000000000000000000000000000..18d373c6e5c5888bff9a7699c6063f03507220a7
GIT binary patch
literal 809
zcmZ{i!A^rf5QZ^&;t@Q}$$&NluuU{g?|Nu#V)W7wvZdR)26mfemQsx;pVU|I30z=H
zp{axe?EW+VxAX7o^TWm2_wSEoU7lN(${Ak+CmGE*B%zQ|B<a}BQK|%?ObJdgeSRZL
zDj)eqA$-~Zt5gsi0*Mom3hBdqP7ozqD5Q?>M$ve$xz(DD$Qd%hd#a$T3bhJpnFt}5
z{bpe;`#R0@r0@u6oyN0++updtGlar0w}_!$YR$*?KVC1Kt%S@vr!R+~;)2obOp5oq
zuAovk>d(wDnmJAh<KUbaYMfyjGd-ak$(qKDN6`Qh!SydcO2Lp^L0zMC%|fkKRMvxc
z?JAz0fgz~XqCNExFxwPF#zD2T|Mot%Flo{a9pCc@5O}`ZQ<OWcXmGtlwqCibRE>$(
zjbQ>#1L_^71=p=(-Q1LQa?l=5Q^&MR8;>rmuU-XrHvr!o-G};hUAQ@H1l5K=svfuB
W-rUv>f3s4dONvTza{?WwZCii(8WDH^

literal 0
HcmV?d00001

diff --git a/src/osd/modules/render/bgfx/chainmanager.cpp b/src/osd/modules/render/bgfx/chainmanager.cpp
index e243748caac..2c8e08793b0 100644
--- a/src/osd/modules/render/bgfx/chainmanager.cpp
+++ b/src/osd/modules/render/bgfx/chainmanager.cpp
@@ -263,26 +263,12 @@ std::vector<render_primitive*> chain_manager::count_screens(render_primitive* pr
     std::vector<render_primitive*> screens;
 
     int screen_count = 0;
-    std::vector<void*> bases;
     while (prim != nullptr)
     {
         if (PRIMFLAG_GET_SCREENTEX(prim->flags))
         {
-            bool found = false;
-            for (void* base : bases)
-            {
-                if (base == prim->texture.base)
-                {
-                    found = true;
-                    break;
-                }
-            }
-            if (!found)
-            {
-                screen_count++;
-                screens.push_back(prim);
-                bases.push_back(prim->texture.base);
-            }
+			screen_count++;
+			screens.push_back(prim);
         }
         prim = prim->next();
     }
@@ -435,7 +421,7 @@ std::vector<ui_menu_item> chain_manager::get_slider_list()
         return sliders;
     }
 
-    for (size_t index = 0; index < m_screen_chains.size(); index++)
+    for (size_t index = 0; index < m_screen_chains.size() && index < m_screen_count; index++)
     {
         bgfx_chain* chain = m_screen_chains[index];
 		sliders.push_back(m_selection_sliders[index]);
diff --git a/src/osd/modules/render/bgfx/shaders/chains/pillarbox_left_horizontal/fs_blit.sc b/src/osd/modules/render/bgfx/shaders/chains/pillarbox_left_horizontal/fs_blit.sc
new file mode 100644
index 00000000000..9af7bcf0ee6
--- /dev/null
+++ b/src/osd/modules/render/bgfx/shaders/chains/pillarbox_left_horizontal/fs_blit.sc
@@ -0,0 +1,14 @@
+$input v_color0, v_texcoord0
+
+// license:BSD-3-Clause
+// copyright-holders:Dario Manesku
+
+#include "common.sh"
+
+// Samplers
+SAMPLER2D(s_tex, 0);
+
+void main()
+{
+	gl_FragColor = texture2D(s_tex,  v_texcoord0) * v_color0;
+}
diff --git a/src/osd/modules/render/bgfx/shaders/chains/pillarbox_left_horizontal/fs_gaussian.sc b/src/osd/modules/render/bgfx/shaders/chains/pillarbox_left_horizontal/fs_gaussian.sc
new file mode 100644
index 00000000000..5375561e8ac
--- /dev/null
+++ b/src/osd/modules/render/bgfx/shaders/chains/pillarbox_left_horizontal/fs_gaussian.sc
@@ -0,0 +1,57 @@
+$input v_color0, v_texcoord0
+
+// license:BSD-3-Clause
+// copyright-holders:Ryan Holtz
+
+#include "common.sh"
+
+// Autos
+uniform vec4 u_tex_size0;
+
+// User-supplied
+uniform vec4 u_dimension;
+uniform vec4 u_radius;
+
+// Samplers
+SAMPLER2D(s_tex, 0);
+
+//-----------------------------------------------------------------------------
+// Constants
+//-----------------------------------------------------------------------------
+
+void main()
+{
+	vec4 sum = vec4(0.0, 0.0, 0.0, 0.0);
+	
+	vec2 blur = (u_radius.xx * u_dimension.xy) / u_tex_size0.xy;
+
+	sum += texture2D(s_tex, v_texcoord0 - vec2(12.0, 12.0) * blur) * 0.001133;
+	sum += texture2D(s_tex, v_texcoord0 - vec2(11.0, 11.0) * blur) * 0.002316;
+	sum += texture2D(s_tex, v_texcoord0 - vec2(10.0, 10.0) * blur) * 0.00445;
+	sum += texture2D(s_tex, v_texcoord0 - vec2(9.0, 9.0) * blur) * 0.008033;
+	sum += texture2D(s_tex, v_texcoord0 - vec2(8.0, 8.0) * blur) * 0.013627;
+	sum += texture2D(s_tex, v_texcoord0 - vec2(7.0, 7.0) * blur) * 0.021724;
+	sum += texture2D(s_tex, v_texcoord0 - vec2(6.0, 6.0) * blur) * 0.032542;
+	sum += texture2D(s_tex, v_texcoord0 - vec2(5.0, 5.0) * blur) * 0.04581;
+	sum += texture2D(s_tex, v_texcoord0 - vec2(4.0, 4.0) * blur) * 0.0606;
+	sum += texture2D(s_tex, v_texcoord0 - vec2(3.0, 3.0) * blur) * 0.075333;
+	sum += texture2D(s_tex, v_texcoord0 - vec2(2.0, 2.0) * blur) * 0.088001;
+	sum += texture2D(s_tex, v_texcoord0 - vec2(1.0, 1.0) * blur) * 0.096603;
+
+	vec4 d0 = texture2D(s_tex, v_texcoord0) * 0.099654;
+
+	sum += texture2D(s_tex, v_texcoord0 + vec2(1.0, 1.0) * blur) * 0.096603;
+	sum += texture2D(s_tex, v_texcoord0 + vec2(2.0, 2.0) * blur) * 0.088001;
+	sum += texture2D(s_tex, v_texcoord0 + vec2(3.0, 3.0) * blur) * 0.075333;
+	sum += texture2D(s_tex, v_texcoord0 + vec2(4.0, 4.0) * blur) * 0.0606;
+	sum += texture2D(s_tex, v_texcoord0 - vec2(5.0, 5.0) * blur) * 0.04581;
+	sum += texture2D(s_tex, v_texcoord0 - vec2(6.0, 6.0) * blur) * 0.032542;
+	sum += texture2D(s_tex, v_texcoord0 - vec2(7.0, 7.0) * blur) * 0.021724;
+	sum += texture2D(s_tex, v_texcoord0 - vec2(8.0, 8.0) * blur) * 0.013627;
+	sum += texture2D(s_tex, v_texcoord0 - vec2(9.0, 9.0) * blur) * 0.008033;
+	sum += texture2D(s_tex, v_texcoord0 - vec2(10.0, 10.0) * blur) * 0.00445;
+	sum += texture2D(s_tex, v_texcoord0 - vec2(11.0, 11.0) * blur) * 0.002316;
+	sum += texture2D(s_tex, v_texcoord0 - vec2(12.0, 12.0) * blur) * 0.001133;
+
+	gl_FragColor = vec4(sum.rgb, 1.0);
+}
diff --git a/src/osd/modules/render/bgfx/shaders/chains/pillarbox_left_horizontal/fs_saturation.sc b/src/osd/modules/render/bgfx/shaders/chains/pillarbox_left_horizontal/fs_saturation.sc
new file mode 100644
index 00000000000..c14f61601c8
--- /dev/null
+++ b/src/osd/modules/render/bgfx/shaders/chains/pillarbox_left_horizontal/fs_saturation.sc
@@ -0,0 +1,25 @@
+$input v_color0, v_texcoord0
+
+// license:BSD-3-Clause
+// copyright-holders:Ryan Holtz
+
+#include "common.sh"
+
+// User-supplied
+uniform vec4 u_saturation;
+
+// Samplers
+SAMPLER2D(s_tex, 0);
+
+void main()
+{
+	vec4 base = texture2D(s_tex, v_texcoord0);
+	vec3 rgb = base.rgb;
+
+	vec3 gray = vec3(0.299, 0.587, 0.114);
+	float luma = dot(rgb, gray);
+	vec3 chroma = rgb - luma;
+	vec3 saturated = luma + chroma * u_saturation.x;
+
+	gl_FragColor = vec4(saturated, base.a);
+}
diff --git a/src/osd/modules/render/bgfx/shaders/chains/pillarbox_left_horizontal/varying.def.sc b/src/osd/modules/render/bgfx/shaders/chains/pillarbox_left_horizontal/varying.def.sc
new file mode 100644
index 00000000000..2aa3cb425c0
--- /dev/null
+++ b/src/osd/modules/render/bgfx/shaders/chains/pillarbox_left_horizontal/varying.def.sc
@@ -0,0 +1,6 @@
+vec4 v_color0    : COLOR0    = vec4(1.0, 0.0, 0.0, 1.0);
+vec2 v_texcoord0 : TEXCOORD0 = vec2(0.0, 0.0);
+
+vec3 a_position  : POSITION;
+vec4 a_color0    : COLOR0;
+vec2 a_texcoord0 : TEXCOORD0;
diff --git a/src/osd/modules/render/bgfx/shaders/chains/pillarbox_left_horizontal/vs_blit.sc b/src/osd/modules/render/bgfx/shaders/chains/pillarbox_left_horizontal/vs_blit.sc
new file mode 100644
index 00000000000..405ef8feb3b
--- /dev/null
+++ b/src/osd/modules/render/bgfx/shaders/chains/pillarbox_left_horizontal/vs_blit.sc
@@ -0,0 +1,14 @@
+$input a_position, a_texcoord0, a_color0
+$output v_texcoord0, v_color0
+
+// license:BSD-3-Clause
+// copyright-holders:Dario Manesku
+
+#include "common.sh"
+
+void main()
+{
+	gl_Position = mul(u_viewProj, vec4(a_position.xy, 0.0, 1.0));
+	v_texcoord0 = a_texcoord0;
+	v_color0 = a_color0;
+}
diff --git a/src/osd/modules/render/bgfx/shaders/chains/pillarbox_left_horizontal/vs_gaussian.sc b/src/osd/modules/render/bgfx/shaders/chains/pillarbox_left_horizontal/vs_gaussian.sc
new file mode 100644
index 00000000000..405ef8feb3b
--- /dev/null
+++ b/src/osd/modules/render/bgfx/shaders/chains/pillarbox_left_horizontal/vs_gaussian.sc
@@ -0,0 +1,14 @@
+$input a_position, a_texcoord0, a_color0
+$output v_texcoord0, v_color0
+
+// license:BSD-3-Clause
+// copyright-holders:Dario Manesku
+
+#include "common.sh"
+
+void main()
+{
+	gl_Position = mul(u_viewProj, vec4(a_position.xy, 0.0, 1.0));
+	v_texcoord0 = a_texcoord0;
+	v_color0 = a_color0;
+}
diff --git a/src/osd/modules/render/bgfx/shaders/chains/pillarbox_left_horizontal/vs_saturation.sc b/src/osd/modules/render/bgfx/shaders/chains/pillarbox_left_horizontal/vs_saturation.sc
new file mode 100644
index 00000000000..5ce10e25187
--- /dev/null
+++ b/src/osd/modules/render/bgfx/shaders/chains/pillarbox_left_horizontal/vs_saturation.sc
@@ -0,0 +1,14 @@
+$input a_position, a_texcoord0, a_color0
+$output v_texcoord0, v_color0
+
+// license:BSD-3-Clause
+// copyright-holders:Dario Manesku
+
+#include "common.sh"
+
+void main()
+{
+	gl_Position = mul(u_viewProj, vec4(a_position.xy, 0.0, 1.0));
+	v_texcoord0 = a_texcoord0 * vec2(0.16666666 * 0.8, 1.0 * 0.8) + vec2(0.2, 0.1);
+	v_color0 = a_color0;
+}
diff --git a/src/osd/modules/render/bgfx/shaders/chains/pillarbox_left_vertical/fs_blit.sc b/src/osd/modules/render/bgfx/shaders/chains/pillarbox_left_vertical/fs_blit.sc
new file mode 100644
index 00000000000..9af7bcf0ee6
--- /dev/null
+++ b/src/osd/modules/render/bgfx/shaders/chains/pillarbox_left_vertical/fs_blit.sc
@@ -0,0 +1,14 @@
+$input v_color0, v_texcoord0
+
+// license:BSD-3-Clause
+// copyright-holders:Dario Manesku
+
+#include "common.sh"
+
+// Samplers
+SAMPLER2D(s_tex, 0);
+
+void main()
+{
+	gl_FragColor = texture2D(s_tex,  v_texcoord0) * v_color0;
+}
diff --git a/src/osd/modules/render/bgfx/shaders/chains/pillarbox_left_vertical/fs_gaussian.sc b/src/osd/modules/render/bgfx/shaders/chains/pillarbox_left_vertical/fs_gaussian.sc
new file mode 100644
index 00000000000..5375561e8ac
--- /dev/null
+++ b/src/osd/modules/render/bgfx/shaders/chains/pillarbox_left_vertical/fs_gaussian.sc
@@ -0,0 +1,57 @@
+$input v_color0, v_texcoord0
+
+// license:BSD-3-Clause
+// copyright-holders:Ryan Holtz
+
+#include "common.sh"
+
+// Autos
+uniform vec4 u_tex_size0;
+
+// User-supplied
+uniform vec4 u_dimension;
+uniform vec4 u_radius;
+
+// Samplers
+SAMPLER2D(s_tex, 0);
+
+//-----------------------------------------------------------------------------
+// Constants
+//-----------------------------------------------------------------------------
+
+void main()
+{
+	vec4 sum = vec4(0.0, 0.0, 0.0, 0.0);
+	
+	vec2 blur = (u_radius.xx * u_dimension.xy) / u_tex_size0.xy;
+
+	sum += texture2D(s_tex, v_texcoord0 - vec2(12.0, 12.0) * blur) * 0.001133;
+	sum += texture2D(s_tex, v_texcoord0 - vec2(11.0, 11.0) * blur) * 0.002316;
+	sum += texture2D(s_tex, v_texcoord0 - vec2(10.0, 10.0) * blur) * 0.00445;
+	sum += texture2D(s_tex, v_texcoord0 - vec2(9.0, 9.0) * blur) * 0.008033;
+	sum += texture2D(s_tex, v_texcoord0 - vec2(8.0, 8.0) * blur) * 0.013627;
+	sum += texture2D(s_tex, v_texcoord0 - vec2(7.0, 7.0) * blur) * 0.021724;
+	sum += texture2D(s_tex, v_texcoord0 - vec2(6.0, 6.0) * blur) * 0.032542;
+	sum += texture2D(s_tex, v_texcoord0 - vec2(5.0, 5.0) * blur) * 0.04581;
+	sum += texture2D(s_tex, v_texcoord0 - vec2(4.0, 4.0) * blur) * 0.0606;
+	sum += texture2D(s_tex, v_texcoord0 - vec2(3.0, 3.0) * blur) * 0.075333;
+	sum += texture2D(s_tex, v_texcoord0 - vec2(2.0, 2.0) * blur) * 0.088001;
+	sum += texture2D(s_tex, v_texcoord0 - vec2(1.0, 1.0) * blur) * 0.096603;
+
+	vec4 d0 = texture2D(s_tex, v_texcoord0) * 0.099654;
+
+	sum += texture2D(s_tex, v_texcoord0 + vec2(1.0, 1.0) * blur) * 0.096603;
+	sum += texture2D(s_tex, v_texcoord0 + vec2(2.0, 2.0) * blur) * 0.088001;
+	sum += texture2D(s_tex, v_texcoord0 + vec2(3.0, 3.0) * blur) * 0.075333;
+	sum += texture2D(s_tex, v_texcoord0 + vec2(4.0, 4.0) * blur) * 0.0606;
+	sum += texture2D(s_tex, v_texcoord0 - vec2(5.0, 5.0) * blur) * 0.04581;
+	sum += texture2D(s_tex, v_texcoord0 - vec2(6.0, 6.0) * blur) * 0.032542;
+	sum += texture2D(s_tex, v_texcoord0 - vec2(7.0, 7.0) * blur) * 0.021724;
+	sum += texture2D(s_tex, v_texcoord0 - vec2(8.0, 8.0) * blur) * 0.013627;
+	sum += texture2D(s_tex, v_texcoord0 - vec2(9.0, 9.0) * blur) * 0.008033;
+	sum += texture2D(s_tex, v_texcoord0 - vec2(10.0, 10.0) * blur) * 0.00445;
+	sum += texture2D(s_tex, v_texcoord0 - vec2(11.0, 11.0) * blur) * 0.002316;
+	sum += texture2D(s_tex, v_texcoord0 - vec2(12.0, 12.0) * blur) * 0.001133;
+
+	gl_FragColor = vec4(sum.rgb, 1.0);
+}
diff --git a/src/osd/modules/render/bgfx/shaders/chains/pillarbox_left_vertical/fs_saturation.sc b/src/osd/modules/render/bgfx/shaders/chains/pillarbox_left_vertical/fs_saturation.sc
new file mode 100644
index 00000000000..c14f61601c8
--- /dev/null
+++ b/src/osd/modules/render/bgfx/shaders/chains/pillarbox_left_vertical/fs_saturation.sc
@@ -0,0 +1,25 @@
+$input v_color0, v_texcoord0
+
+// license:BSD-3-Clause
+// copyright-holders:Ryan Holtz
+
+#include "common.sh"
+
+// User-supplied
+uniform vec4 u_saturation;
+
+// Samplers
+SAMPLER2D(s_tex, 0);
+
+void main()
+{
+	vec4 base = texture2D(s_tex, v_texcoord0);
+	vec3 rgb = base.rgb;
+
+	vec3 gray = vec3(0.299, 0.587, 0.114);
+	float luma = dot(rgb, gray);
+	vec3 chroma = rgb - luma;
+	vec3 saturated = luma + chroma * u_saturation.x;
+
+	gl_FragColor = vec4(saturated, base.a);
+}
diff --git a/src/osd/modules/render/bgfx/shaders/chains/pillarbox_left_vertical/varying.def.sc b/src/osd/modules/render/bgfx/shaders/chains/pillarbox_left_vertical/varying.def.sc
new file mode 100644
index 00000000000..2aa3cb425c0
--- /dev/null
+++ b/src/osd/modules/render/bgfx/shaders/chains/pillarbox_left_vertical/varying.def.sc
@@ -0,0 +1,6 @@
+vec4 v_color0    : COLOR0    = vec4(1.0, 0.0, 0.0, 1.0);
+vec2 v_texcoord0 : TEXCOORD0 = vec2(0.0, 0.0);
+
+vec3 a_position  : POSITION;
+vec4 a_color0    : COLOR0;
+vec2 a_texcoord0 : TEXCOORD0;
diff --git a/src/osd/modules/render/bgfx/shaders/chains/pillarbox_left_vertical/vs_blit.sc b/src/osd/modules/render/bgfx/shaders/chains/pillarbox_left_vertical/vs_blit.sc
new file mode 100644
index 00000000000..405ef8feb3b
--- /dev/null
+++ b/src/osd/modules/render/bgfx/shaders/chains/pillarbox_left_vertical/vs_blit.sc
@@ -0,0 +1,14 @@
+$input a_position, a_texcoord0, a_color0
+$output v_texcoord0, v_color0
+
+// license:BSD-3-Clause
+// copyright-holders:Dario Manesku
+
+#include "common.sh"
+
+void main()
+{
+	gl_Position = mul(u_viewProj, vec4(a_position.xy, 0.0, 1.0));
+	v_texcoord0 = a_texcoord0;
+	v_color0 = a_color0;
+}
diff --git a/src/osd/modules/render/bgfx/shaders/chains/pillarbox_left_vertical/vs_gaussian.sc b/src/osd/modules/render/bgfx/shaders/chains/pillarbox_left_vertical/vs_gaussian.sc
new file mode 100644
index 00000000000..405ef8feb3b
--- /dev/null
+++ b/src/osd/modules/render/bgfx/shaders/chains/pillarbox_left_vertical/vs_gaussian.sc
@@ -0,0 +1,14 @@
+$input a_position, a_texcoord0, a_color0
+$output v_texcoord0, v_color0
+
+// license:BSD-3-Clause
+// copyright-holders:Dario Manesku
+
+#include "common.sh"
+
+void main()
+{
+	gl_Position = mul(u_viewProj, vec4(a_position.xy, 0.0, 1.0));
+	v_texcoord0 = a_texcoord0;
+	v_color0 = a_color0;
+}
diff --git a/src/osd/modules/render/bgfx/shaders/chains/pillarbox_left_vertical/vs_saturation.sc b/src/osd/modules/render/bgfx/shaders/chains/pillarbox_left_vertical/vs_saturation.sc
new file mode 100644
index 00000000000..3305b07810b
--- /dev/null
+++ b/src/osd/modules/render/bgfx/shaders/chains/pillarbox_left_vertical/vs_saturation.sc
@@ -0,0 +1,14 @@
+$input a_position, a_texcoord0, a_color0
+$output v_texcoord0, v_color0
+
+// license:BSD-3-Clause
+// copyright-holders:Dario Manesku
+
+#include "common.sh"
+
+void main()
+{
+	gl_Position = mul(u_viewProj, vec4(a_position.xy, 0.0, 1.0));
+	v_texcoord0 = a_texcoord0 * vec2(1.0 * 0.8, 0.740740 * 0.8) + vec2(0.1, 0.25926);
+	v_color0 = a_color0;
+}
diff --git a/src/osd/modules/render/bgfx/shaders/chains/pillarbox_right_horizontal/fs_blit.sc b/src/osd/modules/render/bgfx/shaders/chains/pillarbox_right_horizontal/fs_blit.sc
new file mode 100644
index 00000000000..9af7bcf0ee6
--- /dev/null
+++ b/src/osd/modules/render/bgfx/shaders/chains/pillarbox_right_horizontal/fs_blit.sc
@@ -0,0 +1,14 @@
+$input v_color0, v_texcoord0
+
+// license:BSD-3-Clause
+// copyright-holders:Dario Manesku
+
+#include "common.sh"
+
+// Samplers
+SAMPLER2D(s_tex, 0);
+
+void main()
+{
+	gl_FragColor = texture2D(s_tex,  v_texcoord0) * v_color0;
+}
diff --git a/src/osd/modules/render/bgfx/shaders/chains/pillarbox_right_horizontal/fs_gaussian.sc b/src/osd/modules/render/bgfx/shaders/chains/pillarbox_right_horizontal/fs_gaussian.sc
new file mode 100644
index 00000000000..5375561e8ac
--- /dev/null
+++ b/src/osd/modules/render/bgfx/shaders/chains/pillarbox_right_horizontal/fs_gaussian.sc
@@ -0,0 +1,57 @@
+$input v_color0, v_texcoord0
+
+// license:BSD-3-Clause
+// copyright-holders:Ryan Holtz
+
+#include "common.sh"
+
+// Autos
+uniform vec4 u_tex_size0;
+
+// User-supplied
+uniform vec4 u_dimension;
+uniform vec4 u_radius;
+
+// Samplers
+SAMPLER2D(s_tex, 0);
+
+//-----------------------------------------------------------------------------
+// Constants
+//-----------------------------------------------------------------------------
+
+void main()
+{
+	vec4 sum = vec4(0.0, 0.0, 0.0, 0.0);
+	
+	vec2 blur = (u_radius.xx * u_dimension.xy) / u_tex_size0.xy;
+
+	sum += texture2D(s_tex, v_texcoord0 - vec2(12.0, 12.0) * blur) * 0.001133;
+	sum += texture2D(s_tex, v_texcoord0 - vec2(11.0, 11.0) * blur) * 0.002316;
+	sum += texture2D(s_tex, v_texcoord0 - vec2(10.0, 10.0) * blur) * 0.00445;
+	sum += texture2D(s_tex, v_texcoord0 - vec2(9.0, 9.0) * blur) * 0.008033;
+	sum += texture2D(s_tex, v_texcoord0 - vec2(8.0, 8.0) * blur) * 0.013627;
+	sum += texture2D(s_tex, v_texcoord0 - vec2(7.0, 7.0) * blur) * 0.021724;
+	sum += texture2D(s_tex, v_texcoord0 - vec2(6.0, 6.0) * blur) * 0.032542;
+	sum += texture2D(s_tex, v_texcoord0 - vec2(5.0, 5.0) * blur) * 0.04581;
+	sum += texture2D(s_tex, v_texcoord0 - vec2(4.0, 4.0) * blur) * 0.0606;
+	sum += texture2D(s_tex, v_texcoord0 - vec2(3.0, 3.0) * blur) * 0.075333;
+	sum += texture2D(s_tex, v_texcoord0 - vec2(2.0, 2.0) * blur) * 0.088001;
+	sum += texture2D(s_tex, v_texcoord0 - vec2(1.0, 1.0) * blur) * 0.096603;
+
+	vec4 d0 = texture2D(s_tex, v_texcoord0) * 0.099654;
+
+	sum += texture2D(s_tex, v_texcoord0 + vec2(1.0, 1.0) * blur) * 0.096603;
+	sum += texture2D(s_tex, v_texcoord0 + vec2(2.0, 2.0) * blur) * 0.088001;
+	sum += texture2D(s_tex, v_texcoord0 + vec2(3.0, 3.0) * blur) * 0.075333;
+	sum += texture2D(s_tex, v_texcoord0 + vec2(4.0, 4.0) * blur) * 0.0606;
+	sum += texture2D(s_tex, v_texcoord0 - vec2(5.0, 5.0) * blur) * 0.04581;
+	sum += texture2D(s_tex, v_texcoord0 - vec2(6.0, 6.0) * blur) * 0.032542;
+	sum += texture2D(s_tex, v_texcoord0 - vec2(7.0, 7.0) * blur) * 0.021724;
+	sum += texture2D(s_tex, v_texcoord0 - vec2(8.0, 8.0) * blur) * 0.013627;
+	sum += texture2D(s_tex, v_texcoord0 - vec2(9.0, 9.0) * blur) * 0.008033;
+	sum += texture2D(s_tex, v_texcoord0 - vec2(10.0, 10.0) * blur) * 0.00445;
+	sum += texture2D(s_tex, v_texcoord0 - vec2(11.0, 11.0) * blur) * 0.002316;
+	sum += texture2D(s_tex, v_texcoord0 - vec2(12.0, 12.0) * blur) * 0.001133;
+
+	gl_FragColor = vec4(sum.rgb, 1.0);
+}
diff --git a/src/osd/modules/render/bgfx/shaders/chains/pillarbox_right_horizontal/fs_saturation.sc b/src/osd/modules/render/bgfx/shaders/chains/pillarbox_right_horizontal/fs_saturation.sc
new file mode 100644
index 00000000000..c14f61601c8
--- /dev/null
+++ b/src/osd/modules/render/bgfx/shaders/chains/pillarbox_right_horizontal/fs_saturation.sc
@@ -0,0 +1,25 @@
+$input v_color0, v_texcoord0
+
+// license:BSD-3-Clause
+// copyright-holders:Ryan Holtz
+
+#include "common.sh"
+
+// User-supplied
+uniform vec4 u_saturation;
+
+// Samplers
+SAMPLER2D(s_tex, 0);
+
+void main()
+{
+	vec4 base = texture2D(s_tex, v_texcoord0);
+	vec3 rgb = base.rgb;
+
+	vec3 gray = vec3(0.299, 0.587, 0.114);
+	float luma = dot(rgb, gray);
+	vec3 chroma = rgb - luma;
+	vec3 saturated = luma + chroma * u_saturation.x;
+
+	gl_FragColor = vec4(saturated, base.a);
+}
diff --git a/src/osd/modules/render/bgfx/shaders/chains/pillarbox_right_horizontal/varying.def.sc b/src/osd/modules/render/bgfx/shaders/chains/pillarbox_right_horizontal/varying.def.sc
new file mode 100644
index 00000000000..2aa3cb425c0
--- /dev/null
+++ b/src/osd/modules/render/bgfx/shaders/chains/pillarbox_right_horizontal/varying.def.sc
@@ -0,0 +1,6 @@
+vec4 v_color0    : COLOR0    = vec4(1.0, 0.0, 0.0, 1.0);
+vec2 v_texcoord0 : TEXCOORD0 = vec2(0.0, 0.0);
+
+vec3 a_position  : POSITION;
+vec4 a_color0    : COLOR0;
+vec2 a_texcoord0 : TEXCOORD0;
diff --git a/src/osd/modules/render/bgfx/shaders/chains/pillarbox_right_horizontal/vs_blit.sc b/src/osd/modules/render/bgfx/shaders/chains/pillarbox_right_horizontal/vs_blit.sc
new file mode 100644
index 00000000000..405ef8feb3b
--- /dev/null
+++ b/src/osd/modules/render/bgfx/shaders/chains/pillarbox_right_horizontal/vs_blit.sc
@@ -0,0 +1,14 @@
+$input a_position, a_texcoord0, a_color0
+$output v_texcoord0, v_color0
+
+// license:BSD-3-Clause
+// copyright-holders:Dario Manesku
+
+#include "common.sh"
+
+void main()
+{
+	gl_Position = mul(u_viewProj, vec4(a_position.xy, 0.0, 1.0));
+	v_texcoord0 = a_texcoord0;
+	v_color0 = a_color0;
+}
diff --git a/src/osd/modules/render/bgfx/shaders/chains/pillarbox_right_horizontal/vs_gaussian.sc b/src/osd/modules/render/bgfx/shaders/chains/pillarbox_right_horizontal/vs_gaussian.sc
new file mode 100644
index 00000000000..405ef8feb3b
--- /dev/null
+++ b/src/osd/modules/render/bgfx/shaders/chains/pillarbox_right_horizontal/vs_gaussian.sc
@@ -0,0 +1,14 @@
+$input a_position, a_texcoord0, a_color0
+$output v_texcoord0, v_color0
+
+// license:BSD-3-Clause
+// copyright-holders:Dario Manesku
+
+#include "common.sh"
+
+void main()
+{
+	gl_Position = mul(u_viewProj, vec4(a_position.xy, 0.0, 1.0));
+	v_texcoord0 = a_texcoord0;
+	v_color0 = a_color0;
+}
diff --git a/src/osd/modules/render/bgfx/shaders/chains/pillarbox_right_horizontal/vs_saturation.sc b/src/osd/modules/render/bgfx/shaders/chains/pillarbox_right_horizontal/vs_saturation.sc
new file mode 100644
index 00000000000..f142ef653b7
--- /dev/null
+++ b/src/osd/modules/render/bgfx/shaders/chains/pillarbox_right_horizontal/vs_saturation.sc
@@ -0,0 +1,14 @@
+$input a_position, a_texcoord0, a_color0
+$output v_texcoord0, v_color0
+
+// license:BSD-3-Clause
+// copyright-holders:Dario Manesku
+
+#include "common.sh"
+
+void main()
+{
+	gl_Position = mul(u_viewProj, vec4(a_position.xy, 0.0, 1.0));
+	v_texcoord0 = a_texcoord0 * vec2(0.16666666 * 0.8, 1.0 * 0.8) + vec2(1.0 - 0.3333333333, 0.1);
+	v_color0 = a_color0;
+}
diff --git a/src/osd/modules/render/bgfx/shaders/chains/pillarbox_right_vertical/fs_blit.sc b/src/osd/modules/render/bgfx/shaders/chains/pillarbox_right_vertical/fs_blit.sc
new file mode 100644
index 00000000000..9af7bcf0ee6
--- /dev/null
+++ b/src/osd/modules/render/bgfx/shaders/chains/pillarbox_right_vertical/fs_blit.sc
@@ -0,0 +1,14 @@
+$input v_color0, v_texcoord0
+
+// license:BSD-3-Clause
+// copyright-holders:Dario Manesku
+
+#include "common.sh"
+
+// Samplers
+SAMPLER2D(s_tex, 0);
+
+void main()
+{
+	gl_FragColor = texture2D(s_tex,  v_texcoord0) * v_color0;
+}
diff --git a/src/osd/modules/render/bgfx/shaders/chains/pillarbox_right_vertical/fs_gaussian.sc b/src/osd/modules/render/bgfx/shaders/chains/pillarbox_right_vertical/fs_gaussian.sc
new file mode 100644
index 00000000000..5375561e8ac
--- /dev/null
+++ b/src/osd/modules/render/bgfx/shaders/chains/pillarbox_right_vertical/fs_gaussian.sc
@@ -0,0 +1,57 @@
+$input v_color0, v_texcoord0
+
+// license:BSD-3-Clause
+// copyright-holders:Ryan Holtz
+
+#include "common.sh"
+
+// Autos
+uniform vec4 u_tex_size0;
+
+// User-supplied
+uniform vec4 u_dimension;
+uniform vec4 u_radius;
+
+// Samplers
+SAMPLER2D(s_tex, 0);
+
+//-----------------------------------------------------------------------------
+// Constants
+//-----------------------------------------------------------------------------
+
+void main()
+{
+	vec4 sum = vec4(0.0, 0.0, 0.0, 0.0);
+	
+	vec2 blur = (u_radius.xx * u_dimension.xy) / u_tex_size0.xy;
+
+	sum += texture2D(s_tex, v_texcoord0 - vec2(12.0, 12.0) * blur) * 0.001133;
+	sum += texture2D(s_tex, v_texcoord0 - vec2(11.0, 11.0) * blur) * 0.002316;
+	sum += texture2D(s_tex, v_texcoord0 - vec2(10.0, 10.0) * blur) * 0.00445;
+	sum += texture2D(s_tex, v_texcoord0 - vec2(9.0, 9.0) * blur) * 0.008033;
+	sum += texture2D(s_tex, v_texcoord0 - vec2(8.0, 8.0) * blur) * 0.013627;
+	sum += texture2D(s_tex, v_texcoord0 - vec2(7.0, 7.0) * blur) * 0.021724;
+	sum += texture2D(s_tex, v_texcoord0 - vec2(6.0, 6.0) * blur) * 0.032542;
+	sum += texture2D(s_tex, v_texcoord0 - vec2(5.0, 5.0) * blur) * 0.04581;
+	sum += texture2D(s_tex, v_texcoord0 - vec2(4.0, 4.0) * blur) * 0.0606;
+	sum += texture2D(s_tex, v_texcoord0 - vec2(3.0, 3.0) * blur) * 0.075333;
+	sum += texture2D(s_tex, v_texcoord0 - vec2(2.0, 2.0) * blur) * 0.088001;
+	sum += texture2D(s_tex, v_texcoord0 - vec2(1.0, 1.0) * blur) * 0.096603;
+
+	vec4 d0 = texture2D(s_tex, v_texcoord0) * 0.099654;
+
+	sum += texture2D(s_tex, v_texcoord0 + vec2(1.0, 1.0) * blur) * 0.096603;
+	sum += texture2D(s_tex, v_texcoord0 + vec2(2.0, 2.0) * blur) * 0.088001;
+	sum += texture2D(s_tex, v_texcoord0 + vec2(3.0, 3.0) * blur) * 0.075333;
+	sum += texture2D(s_tex, v_texcoord0 + vec2(4.0, 4.0) * blur) * 0.0606;
+	sum += texture2D(s_tex, v_texcoord0 - vec2(5.0, 5.0) * blur) * 0.04581;
+	sum += texture2D(s_tex, v_texcoord0 - vec2(6.0, 6.0) * blur) * 0.032542;
+	sum += texture2D(s_tex, v_texcoord0 - vec2(7.0, 7.0) * blur) * 0.021724;
+	sum += texture2D(s_tex, v_texcoord0 - vec2(8.0, 8.0) * blur) * 0.013627;
+	sum += texture2D(s_tex, v_texcoord0 - vec2(9.0, 9.0) * blur) * 0.008033;
+	sum += texture2D(s_tex, v_texcoord0 - vec2(10.0, 10.0) * blur) * 0.00445;
+	sum += texture2D(s_tex, v_texcoord0 - vec2(11.0, 11.0) * blur) * 0.002316;
+	sum += texture2D(s_tex, v_texcoord0 - vec2(12.0, 12.0) * blur) * 0.001133;
+
+	gl_FragColor = vec4(sum.rgb, 1.0);
+}
diff --git a/src/osd/modules/render/bgfx/shaders/chains/pillarbox_right_vertical/fs_saturation.sc b/src/osd/modules/render/bgfx/shaders/chains/pillarbox_right_vertical/fs_saturation.sc
new file mode 100644
index 00000000000..c14f61601c8
--- /dev/null
+++ b/src/osd/modules/render/bgfx/shaders/chains/pillarbox_right_vertical/fs_saturation.sc
@@ -0,0 +1,25 @@
+$input v_color0, v_texcoord0
+
+// license:BSD-3-Clause
+// copyright-holders:Ryan Holtz
+
+#include "common.sh"
+
+// User-supplied
+uniform vec4 u_saturation;
+
+// Samplers
+SAMPLER2D(s_tex, 0);
+
+void main()
+{
+	vec4 base = texture2D(s_tex, v_texcoord0);
+	vec3 rgb = base.rgb;
+
+	vec3 gray = vec3(0.299, 0.587, 0.114);
+	float luma = dot(rgb, gray);
+	vec3 chroma = rgb - luma;
+	vec3 saturated = luma + chroma * u_saturation.x;
+
+	gl_FragColor = vec4(saturated, base.a);
+}
diff --git a/src/osd/modules/render/bgfx/shaders/chains/pillarbox_right_vertical/varying.def.sc b/src/osd/modules/render/bgfx/shaders/chains/pillarbox_right_vertical/varying.def.sc
new file mode 100644
index 00000000000..2aa3cb425c0
--- /dev/null
+++ b/src/osd/modules/render/bgfx/shaders/chains/pillarbox_right_vertical/varying.def.sc
@@ -0,0 +1,6 @@
+vec4 v_color0    : COLOR0    = vec4(1.0, 0.0, 0.0, 1.0);
+vec2 v_texcoord0 : TEXCOORD0 = vec2(0.0, 0.0);
+
+vec3 a_position  : POSITION;
+vec4 a_color0    : COLOR0;
+vec2 a_texcoord0 : TEXCOORD0;
diff --git a/src/osd/modules/render/bgfx/shaders/chains/pillarbox_right_vertical/vs_blit.sc b/src/osd/modules/render/bgfx/shaders/chains/pillarbox_right_vertical/vs_blit.sc
new file mode 100644
index 00000000000..405ef8feb3b
--- /dev/null
+++ b/src/osd/modules/render/bgfx/shaders/chains/pillarbox_right_vertical/vs_blit.sc
@@ -0,0 +1,14 @@
+$input a_position, a_texcoord0, a_color0
+$output v_texcoord0, v_color0
+
+// license:BSD-3-Clause
+// copyright-holders:Dario Manesku
+
+#include "common.sh"
+
+void main()
+{
+	gl_Position = mul(u_viewProj, vec4(a_position.xy, 0.0, 1.0));
+	v_texcoord0 = a_texcoord0;
+	v_color0 = a_color0;
+}
diff --git a/src/osd/modules/render/bgfx/shaders/chains/pillarbox_right_vertical/vs_gaussian.sc b/src/osd/modules/render/bgfx/shaders/chains/pillarbox_right_vertical/vs_gaussian.sc
new file mode 100644
index 00000000000..405ef8feb3b
--- /dev/null
+++ b/src/osd/modules/render/bgfx/shaders/chains/pillarbox_right_vertical/vs_gaussian.sc
@@ -0,0 +1,14 @@
+$input a_position, a_texcoord0, a_color0
+$output v_texcoord0, v_color0
+
+// license:BSD-3-Clause
+// copyright-holders:Dario Manesku
+
+#include "common.sh"
+
+void main()
+{
+	gl_Position = mul(u_viewProj, vec4(a_position.xy, 0.0, 1.0));
+	v_texcoord0 = a_texcoord0;
+	v_color0 = a_color0;
+}
diff --git a/src/osd/modules/render/bgfx/shaders/chains/pillarbox_right_vertical/vs_saturation.sc b/src/osd/modules/render/bgfx/shaders/chains/pillarbox_right_vertical/vs_saturation.sc
new file mode 100644
index 00000000000..ea4d47d9963
--- /dev/null
+++ b/src/osd/modules/render/bgfx/shaders/chains/pillarbox_right_vertical/vs_saturation.sc
@@ -0,0 +1,14 @@
+$input a_position, a_texcoord0, a_color0
+$output v_texcoord0, v_color0
+
+// license:BSD-3-Clause
+// copyright-holders:Dario Manesku
+
+#include "common.sh"
+
+void main()
+{
+	gl_Position = mul(u_viewProj, vec4(a_position.xy, 0.0, 1.0));
+	v_texcoord0 = a_texcoord0 * vec2(1.0 * 0.8, 0.740740 * 0.8) + vec2(0.1, 0.055555);
+	v_color0 = a_color0;
+}
diff --git a/src/osd/modules/render/drawbgfx.cpp b/src/osd/modules/render/drawbgfx.cpp
index 32f45515a08..78d661a9953 100644
--- a/src/osd/modules/render/drawbgfx.cpp
+++ b/src/osd/modules/render/drawbgfx.cpp
@@ -20,6 +20,7 @@
 #include "emu.h"
 #include "window.h"
 #include "rendutil.h"
+#include "aviio.h"
 
 #include <bgfx/bgfxplatform.h>
 #include <bgfx/bgfx.h>
@@ -72,6 +73,35 @@ const char* renderer_bgfx::WINDOW_PREFIX = "Window 0, ";
 bool renderer_bgfx::s_window_set = false;
 uint32_t renderer_bgfx::s_current_view = 0;
 
+//============================================================
+//  renderer_bgfx - constructor
+//============================================================
+
+renderer_bgfx::renderer_bgfx(osd_window *w)
+	: osd_renderer(w, FLAG_NONE)
+	, m_options(downcast<osd_options &>(w->machine().options()))
+	, m_dimensions(0, 0)
+	, m_max_view(0)
+	, m_avi_output_file(nullptr)
+	, m_avi_frame(0)
+{
+	m_options = downcast<osd_options &>(window().machine().options());
+}
+
+//============================================================
+//  renderer_bgfx - destructor
+//============================================================
+
+renderer_bgfx::~renderer_bgfx()
+{
+	// Cleanup.
+	delete m_chains;
+	delete m_effects;
+	delete m_shaders;
+	delete m_textures;
+	delete m_targets;
+}
+
 //============================================================
 //  renderer_bgfx::create
 //============================================================
@@ -103,8 +133,6 @@ static void* sdlNativeWindowHandle(SDL_Window* _window)
 int renderer_bgfx::create()
 {
 	// create renderer
-
-	osd_options& options = downcast<osd_options &>(window().machine().options());
 	osd_dim wdim = window().get_size();
 	m_width[window().m_index] = wdim.width();
 	m_height[window().m_index] = wdim.height();
@@ -127,7 +155,7 @@ int renderer_bgfx::create()
 #else
 		bgfx::sdlSetWindow(window().sdl_window());
 #endif
-		std::string backend(options.bgfx_backend());
+		std::string backend(m_options.bgfx_backend());
 		if (backend == "auto")
 		{
 			bgfx::init();
@@ -159,15 +187,15 @@ int renderer_bgfx::create()
 		}
 		bgfx::reset(m_width[window().m_index], m_height[window().m_index], video_config.waitvsync ? BGFX_RESET_VSYNC : BGFX_RESET_NONE);
 		// Enable debug text.
-		bgfx::setDebug(options.bgfx_debug() ? BGFX_DEBUG_STATS : BGFX_DEBUG_TEXT);
+		bgfx::setDebug(m_options.bgfx_debug() ? BGFX_DEBUG_STATS : BGFX_DEBUG_TEXT);
 		m_dimensions = osd_dim(m_width[0], m_height[0]);
 	}
 
 	m_textures = new texture_manager();
 	m_targets = new target_manager(*m_textures);
 
-	m_shaders = new shader_manager(options);
-	m_effects = new effect_manager(options, *m_shaders);
+	m_shaders = new shader_manager(m_options);
+	m_effects = new effect_manager(m_options, *m_shaders);
 
 	if (window().m_index != 0)
 	{
@@ -190,7 +218,7 @@ int renderer_bgfx::create()
 	m_screen_effect[2] = m_effects->effect("screen_multiply");
 	m_screen_effect[3] = m_effects->effect("screen_add");
 
-	m_chains = new chain_manager(window().machine(), options, *m_textures, *m_targets, *m_effects, window().m_index, *this);
+	m_chains = new chain_manager(window().machine(), m_options, *m_textures, *m_targets, *m_effects, window().m_index, *this);
 	m_sliders_dirty = true;
 
 	uint32_t flags = BGFX_TEXTURE_U_CLAMP | BGFX_TEXTURE_V_CLAMP | BGFX_TEXTURE_MIN_POINT | BGFX_TEXTURE_MAG_POINT | BGFX_TEXTURE_MIP_POINT;
@@ -205,17 +233,29 @@ int renderer_bgfx::create()
 }
 
 //============================================================
-//  destructor
+//  renderer_bgfx::record
 //============================================================
 
-renderer_bgfx::~renderer_bgfx()
+void renderer_bgfx::record()
+{
+	std::string filename("test.avi");//m_options.d3d_hlsl_write());
+
+	if (m_avi_output_file != nullptr)
+	{
+		end_avi_recording();
+	}
+	else if (filename[0] != 0)
+	{
+		begin_avi_recording(filename);
+	}
+}
+
+void renderer_bgfx::end_avi_recording()
+{
+}
+
+void renderer_bgfx::begin_avi_recording(std::string filename)
 {
-	// Cleanup.
-	delete m_chains;
-	delete m_effects;
-	delete m_shaders;
-	delete m_textures;
-	delete m_targets;
 }
 
 void renderer_bgfx::exit()
@@ -715,14 +755,14 @@ int renderer_bgfx::draw(int update)
 		{
 			for (screen = 0; screen < sources.size(); screen++)
 			{
-				if (sources[screen] == prim->texture.base)
+				if (sources[screen] == prim)
 				{
 					break;
 				}
 			}
 			if (screen == sources.size())
 			{
-				sources.push_back(prim->texture.base);
+				sources.push_back(prim);
 			}
 		}
 
@@ -786,7 +826,7 @@ bool renderer_bgfx::update_dimensions()
 #endif
 
 			bgfx::setViewFrameBuffer(s_current_view, m_framebuffer->target());
-			bgfx::setViewClear(s_current_view, BGFX_CLEAR_COLOR | BGFX_CLEAR_DEPTH, 0x000000ff, 1.0f, 0);
+			bgfx::setViewClear(s_current_view, BGFX_CLEAR_COLOR | BGFX_CLEAR_DEPTH, 0x00000000, 1.0f, 0);
 			bgfx::touch(s_current_view);
 			bgfx::frame();
 			return true;
diff --git a/src/osd/modules/render/drawbgfx.h b/src/osd/modules/render/drawbgfx.h
index d48bb5914e6..e96fd461cc1 100644
--- a/src/osd/modules/render/drawbgfx.h
+++ b/src/osd/modules/render/drawbgfx.h
@@ -13,6 +13,7 @@
 #include "binpacker.h"
 #include "bgfx/vertex.h"
 #include "sliderdirtynotifier.h"
+#include "aviio.h"
 
 class texture_manager;
 class target_manager;
@@ -23,17 +24,13 @@ class bgfx_texture;
 class bgfx_effect;
 class bgfx_target;
 class bgfx_chain;
+class osd_options;
 
 /* sdl_info is the information about SDL for the current screen */
 class renderer_bgfx : public osd_renderer, public slider_dirty_notifier
 {
 public:
-	renderer_bgfx(osd_window *w)
-		: osd_renderer(w, FLAG_NONE)
-		, m_dimensions(0, 0)
-		, m_max_view(0)
-	{
-	}
+	renderer_bgfx(osd_window *w);
 	virtual ~renderer_bgfx();
 
 	static bool init(running_machine &machine) { return false; }
@@ -49,7 +46,7 @@ public:
 	virtual int xy_to_render_target(const int x, const int y, int *xt, int *yt) override;
 #else
 	virtual void save() override { }
-	virtual void record() override { }
+	virtual void record() override;
 	virtual void toggle_fsfx() override { }
 #endif
 
@@ -63,8 +60,8 @@ public:
     static const char* WINDOW_PREFIX;
 
 private:
-	void handle_screen_chains(render_primitive *starting_prim);
-	bgfx_chain* screen_chain(int32_t screen);
+	void end_avi_recording();
+	void begin_avi_recording(std::string filename);
 
 	bool update_dimensions();
 	void setup_view(uint32_t view_index, bool screen);
@@ -98,6 +95,8 @@ private:
 	void process_atlas_packs(std::vector<std::vector<rectangle_packer::packed_rectangle>>& packed);
 	UINT32 get_texture_hash(render_primitive *prim);
 
+	osd_options& m_options;
+
 	bgfx_target* m_framebuffer;
 	bgfx_texture* m_texture_cache;
 
@@ -124,6 +123,11 @@ private:
 	int32_t m_ui_view;
 	uint32_t m_max_view;
 
+	// AVI
+	avi_file::ptr           m_avi_output_file;            // AVI file
+	int                     m_avi_frame;                  // AVI frame
+	attotime                m_avi_frame_period;           // AVI frame period
+
 	static const uint16_t CACHE_SIZE;
 	static const uint32_t PACKABLE_SIZE;
 	static const uint32_t WHITE_HASH;

From 95309f461e5274151c97830945ba69d49cccef12 Mon Sep 17 00:00:00 2001
From: cracyc <cracyc@users.noreply.github.com>
Date: Sat, 16 Apr 2016 08:36:09 -0500
Subject: [PATCH 034/122] plugins/cheat: load multiple files and fix load
 failure (nw)

---
 plugins/cheat/init.lua | 33 ++++++++++++++--------
 src/emu/luaengine.cpp  | 62 ++++++++++++++++++++++++++++++++++++++++--
 src/emu/luaengine.h    |  5 +++-
 3 files changed, 85 insertions(+), 15 deletions(-)

diff --git a/plugins/cheat/init.lua b/plugins/cheat/init.lua
index c15b662675f..ec5078fedf0 100644
--- a/plugins/cheat/init.lua
+++ b/plugins/cheat/init.lua
@@ -72,8 +72,9 @@ function cheat.startplugin()
 	local function load_cheats()
 		local filename = emu.romname()
 		local json = require("json")
-		local file = emu.file(manager:machine():options().entries.cheatpath:value():gsub("([^;]+)", "%1;%1/cheat"), 1)
-
+		local newcheats = {}
+		local path = manager:machine():options().entries.cheatpath:value():gsub("([^;]+)", "%1;%1/cheat")
+		local file = emu.file(path, 1)
 		if emu.softname() ~= "" then
 			for name, image in pairs(manager:machine().images) do
 				if image:exists() and image:software_list_name() ~= "" then
@@ -81,17 +82,27 @@ function cheat.startplugin()
 				end
 			end
 		end
-
-		if file:open(filename .. ".json") then
-			local xml = require("cheat/xml_conv")
-
-			if file:open(filename .. ".xml") then
-				return {}
+		function add(addcheats)
+			if not next(newcheats) then
+				newcheats = addcheats
+			else
+				for num, cheat in pairs(addcheats) do
+					newcheats[#newcheats + 1] = cheat
+				end
 			end
-			return xml.conv_cheat(file:read(file:size()))
 		end
-
-		return json.parse(file:read(file:size()))
+		local ret = file:open(filename .. ".json")
+		while not ret do
+			add(json.parse(file:read(file:size())))
+			ret = file:open_next()
+		end
+		local xml = require("cheat/xml_conv")
+		ret = file:open(filename .. ".xml")
+		while not ret do
+			add(xml.conv_cheat(file:read(file:size())))
+			ret = file:open_next()
+		end
+		return newcheats
 	end
 
 	local function draw_text(screen, x, y, color, form, ...)
diff --git a/src/emu/luaengine.cpp b/src/emu/luaengine.cpp
index 08482eccd5c..331d2b1372e 100644
--- a/src/emu/luaengine.cpp
+++ b/src/emu/luaengine.cpp
@@ -1761,25 +1761,67 @@ int lua_engine::compile_with_env(const char *env, const char *script)
 	return ref;
 }
 
+template <typename Tout, typename Tin>
+Tout lua_engine::run(const char *env, int ref, Tin in)
+{
+	Tout ret;
+	lua_settop(m_lua_state, 0);
+	luabridge::Stack<Tin>::push(m_lua_state, in);
+	run_internal(env, ref);
+	ret = luabridge::Stack<Tout>::get(m_lua_state, 1);
+	lua_pop(m_lua_state, 1);
+	return ret;
+}
+
+template <typename Tout>
+Tout lua_engine::run(const char *env, int ref)
+{
+	Tout ret;
+	lua_settop(m_lua_state, 0);
+	lua_pushnil(m_lua_state);
+	run_internal(env, ref);
+	ret = luabridge::Stack<Tout>::get(m_lua_state, 1);
+	lua_pop(m_lua_state, 1);
+	return ret;
+}
+
+template <typename Tin>
+void lua_engine::run(const char *env, int ref, Tin in)
+{
+	lua_settop(m_lua_state, 0);
+	luabridge::Stack<Tin>::push(m_lua_state, in);
+	run_internal(env, ref);
+	lua_pop(m_lua_state, 1);
+}
+
 void lua_engine::run(const char *env, int ref)
 {
-	std::string field = std::string("env_").append(env);
 	lua_settop(m_lua_state, 0);
+	lua_pushnil(m_lua_state);
+	run_internal(env, ref);
+	lua_pop(m_lua_state, 1);
+}
+
+void lua_engine::run_internal(const char *env, int ref)
+{
+	std::string field = std::string("env_").append(env);
 	lua_getfield(m_lua_state, LUA_REGISTRYINDEX, field.c_str());
 	if(lua_istable(m_lua_state, -1))
 	{
 		lua_rawgeti(m_lua_state, -1, ref);
 		if(lua_isfunction(m_lua_state, -1))
 		{
-			if(int error = lua_pcall(m_lua_state, 0, 0, 0) != LUA_OK)
+			lua_pushvalue(m_lua_state, -3);
+			if(int error = lua_pcall(m_lua_state, 1, 1, 0) != LUA_OK)
 			{
 				if(error == LUA_ERRRUN)
 					printf("%s\n", lua_tostring(m_lua_state, -1));
 				lua_pop(m_lua_state, 1);
+				lua_pushnil(m_lua_state);
 			}
 		}
-		lua_pop(m_lua_state, 1);
 	}
+	lua_replace(m_lua_state, 1);
 	lua_pop(m_lua_state, 1);
 }
 void lua_engine::menu_populate(std::string &menu, std::vector<menu_item> &menu_list)
@@ -2088,6 +2130,7 @@ void lua_engine::initialize()
 				.addFunction ("cheat", &running_machine::cheat)
 				.addFunction ("memory", &running_machine::memory)
 				.addFunction ("options", &running_machine::options)
+				.addFunction ("outputs", &running_machine::output)
 				.addProperty <luabridge::LuaRef, void> ("devices", &lua_engine::l_machine_get_devices)
 				.addProperty <luabridge::LuaRef, void> ("screens", &lua_engine::l_machine_get_screens)
 				.addProperty <luabridge::LuaRef, void> ("images", &lua_engine::l_machine_get_images)
@@ -2344,6 +2387,14 @@ void lua_engine::initialize()
 				.addCFunction ("write_i64", &lua_memory_region::l_region_write<INT64>)
 				.addCFunction ("write_u64", &lua_memory_region::l_region_write<UINT64>)
 			.endClass()
+			.beginClass <output_manager> ("output")
+				.addFunction ("set_value", &output_manager::set_value)
+				.addFunction ("set_indexed_value", &output_manager::set_indexed_value)
+				.addFunction ("get_value", &output_manager::get_value)
+				.addFunction ("get_indexed_value", &output_manager::get_indexed_value)
+				.addFunction ("name_to_id", &output_manager::name_to_id)
+				.addFunction ("id_to_name", &output_manager::id_to_name)
+			.endClass()
 			.deriveClass <memory_region, lua_memory_region> ("region")
 				.addProperty <UINT32> ("size", &memory_region::bytes)
 			.endClass()
@@ -2367,11 +2418,16 @@ void lua_engine::initialize()
 			.beginClass <lua_emu_file> ("lua_file")
 				.addCFunction ("read", &lua_emu_file::l_emu_file_read)
 			.endClass()
+			// make sure there's a reference to the emu_file search path in your script as long as you need it
+			// otherwise it might be garbage collected as emu_file don't copy the string
 			.deriveClass <emu_file, lua_emu_file> ("file")
 				.addConstructor <void (*)(const char *, UINT32)> ()
 				.addFunction ("open", static_cast<osd_file::error (emu_file::*)(const char *)>(&emu_file::open))
+				.addFunction ("open_next", &emu_file::open_next)
 				.addFunction ("seek", &emu_file::seek)
 				.addFunction ("size", &emu_file::size)
+				.addFunction ("filename", &emu_file::filename)
+				.addFunction ("fullpath", &emu_file::fullpath)
 			.endClass()
 			.beginClass <lua_item> ("item")
 				.addConstructor <void (*)(int)> ()
diff --git a/src/emu/luaengine.h b/src/emu/luaengine.h
index 721f9728c7b..269ea3d46b3 100644
--- a/src/emu/luaengine.h
+++ b/src/emu/luaengine.h
@@ -64,8 +64,10 @@ public:
 	void on_frame_done();
 
 	int compile_with_env(const char *env, const char *script);
+	template <typename Tout, typename Tin> Tout run(const char *env, int ref, Tin in);
+	template <typename Tout> Tout run(const char *env, int ref);
+	template <typename Tin> void run(const char *env, int ref, Tin in);
 	void run(const char *env, int ref);
-
 private:
 	struct hook {
 		lua_State *L;
@@ -213,6 +215,7 @@ private:
 		int l_item_read_block(lua_State *L);
 		int l_item_write(lua_State *L);
 	};
+	void run_internal(const char *env, int ref);
 
 	void resume(void *L, INT32 param);
 	void start();

From 454db9d5d30a2688f355716507bf5bc43240b8f2 Mon Sep 17 00:00:00 2001
From: ImJezze <jezze@gmx.net>
Date: Sat, 16 Apr 2016 15:46:04 +0200
Subject: [PATCH 035/122] Fixed texture coordinates for vector screen quad (nw)

---
 src/emu/render.cpp | 33 ++++++++++++++++++++++++++++++++-
 1 file changed, 32 insertions(+), 1 deletion(-)

diff --git a/src/emu/render.cpp b/src/emu/render.cpp
index b2e4e02558a..6f42d26c3c7 100644
--- a/src/emu/render.cpp
+++ b/src/emu/render.cpp
@@ -1890,8 +1890,39 @@ void render_target::add_container_primitives(render_primitive_list &list, const
 
 					if (PRIMFLAG_GET_VECTORBUF(curitem.flags()))
 					{
+						// flags S swap-xy, Y flip-y, X flip-x
+						//
+						// S  Y  X   e.g.       flips
+						// 0  0  0   asteroid   !X !Y
+						// 0  0  1   -
+						// 0  1  0   speedfrk   !X  Y
+						// 0  1  1   solarq      X  Y
+						// 1  0  0   -
+						// 1  0  1   -
+						// 1  1  0   tempest    !X  Y
+						// 1  1  1   barrier    !X !Y
+
+						bool flip_x = (manager().machine().system().flags & ORIENTATION_FLIP_X) == ORIENTATION_FLIP_X;
+						bool flip_y = (manager().machine().system().flags & ORIENTATION_FLIP_Y) == ORIENTATION_FLIP_Y;
+						bool swap_xy = (manager().machine().system().flags & ORIENTATION_SWAP_XY) == ORIENTATION_SWAP_XY;
+
+						int vectororient = 0;
+						if (flip_x)
+						{
+							vectororient |= ORIENTATION_FLIP_X;
+						}
+						if (flip_y)
+						{
+							vectororient |= ORIENTATION_FLIP_Y;
+						}
+						if (flip_x && flip_y && swap_xy)
+						{
+							vectororient ^= ORIENTATION_FLIP_Y;
+							vectororient ^= ORIENTATION_FLIP_X;
+						}
+
 						// determine the final orientation (textures are up-side down, so flip y-axis for vectors to immitate that behavior)
-						int finalorient = orientation_add(ORIENTATION_FLIP_Y, container_xform.orientation);
+						int finalorient = orientation_add(vectororient, container_xform.orientation);
 
 						// determine UV coordinates
 						prim->texcoords = oriented_texcoords[finalorient];

From 37718e8602904d51f9132be80e2977f27cd956f5 Mon Sep 17 00:00:00 2001
From: cracyc <cracyc@users.noreply.github.com>
Date: Sat, 16 Apr 2016 09:36:07 -0500
Subject: [PATCH 036/122] plugins/cheatfind: write found cheats (nw)

---
 plugins/cheatfind/init.lua | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/plugins/cheatfind/init.lua b/plugins/cheatfind/init.lua
index 49195ed060c..c72fc95edac 100644
--- a/plugins/cheatfind/init.lua
+++ b/plugins/cheatfind/init.lua
@@ -484,9 +484,11 @@ function cheatfind.startplugin()
 						_G.ce.inject(cheat)
 					end
 				else
-
+					local json = require("json")
+					local file = io.open(string.format("%s_%08x_cheat.json", emu.romname(), match.addr), "w")
+					file:write(json.stringify(cheat))
+					file:close()
 				end
-
 			end
 		end
 		devsel = devcur

From 3e8559ad7ba7e9e7b57fac7ea2123803659fcb2c Mon Sep 17 00:00:00 2001
From: Miodrag Milanovic <mmicko@gmail.com>
Date: Sat, 16 Apr 2016 17:17:30 +0200
Subject: [PATCH 037/122] Always rebuild version.cpp when there is git version
 change (nw)

---
 makefile             | 11 +++++++++++
 scripts/genie.lua    | 24 +++++++-----------------
 scripts/src/main.lua |  7 -------
 3 files changed, 18 insertions(+), 24 deletions(-)

diff --git a/makefile b/makefile
index 3488a7a106d..40eab7364c3 100644
--- a/makefile
+++ b/makefile
@@ -876,6 +876,17 @@ ifeq ($(wildcard .git/*),)
 PARAMS += --IGNORE_GIT='1'
 endif
 
+ifeq ($(GIT_AVAILABLE),git)
+NEW_GIT_VERSION := $(shell git describe)
+OLD_GIT_VERSION := $(shell cat .mame_version)
+
+ifneq ($(NEW_GIT_VERSION),$(OLD_GIT_VERSION))
+$(shell git describe > .mame_version)
+$(shell touch $(SRC)/version.cpp)
+endif
+endif
+
+
 GENIE := 3rdparty/genie/bin/$(GENIEOS)/genie$(EXE)
 
 ifeq ($(TARGET),$(SUBTARGET))
diff --git a/scripts/genie.lua b/scripts/genie.lua
index ca37aa1b0f5..8b7f32703c3 100644
--- a/scripts/genie.lua
+++ b/scripts/genie.lua
@@ -362,15 +362,6 @@ newoption {
 	description = "List of sources to compile.",
 }
 
-newoption {
-	trigger = "FORCE_VERSION_COMPILE",
-	description = "Force compiling of version.c file.",
-	allowed = {
-		{ "0",   "Disabled"     },
-		{ "1",   "Enabled"      },
-	}
-}
-
 newoption {
 	trigger = "PLATFORM",
 	description = "Target machine platform (x86,arm,...)",
@@ -530,14 +521,13 @@ if (_OPTIONS["SOURCES"] == nil) then
 end
 
 
-if _OPTIONS["IGNORE_GIT"]~="1" then
-	GIT_VERSION         = backtick( "git rev-parse --short HEAD" )
-	GIT_VERSION_RELEASE = backtick( "git rev-list --tags --max-count=1" )
-	GIT_VERSION_LASTONE = backtick( "git rev-list --max-count=1 HEAD" ) 
-	if (GIT_VERSION_RELEASE ~= GIT_VERSION_LASTONE) then
-	defines {
-		"GIT_VERSION=" .. GIT_VERSION,
-	}
+if _OPTIONS["IGNORE_GIT"]~="1" then	
+	GIT_VERSION = backtick( "git describe" )
+	local p = string.find(GIT_VERSION, '-', 1)
+	if (p~=nil) then
+		defines {
+			"GIT_VERSION=" .. string.sub(GIT_VERSION,p+1)
+		}
 	end
 end
 
diff --git a/scripts/src/main.lua b/scripts/src/main.lua
index 01d0b594066..3a52b985411 100644
--- a/scripts/src/main.lua
+++ b/scripts/src/main.lua
@@ -321,13 +321,6 @@ if (_OPTIONS["SOURCES"] ~= nil) then
 		}
 end
 
-if _OPTIONS["FORCE_VERSION_COMPILE"]=="1" then
-	configuration { "gmake" }
-		dependency {
-			{ ".PHONY", ".FORCE", true },
-			{ "$(OBJDIR)/src/version.o", ".FORCE", true },
-		}
-end
 	configuration { "mingw*" }
 		custombuildtask {
 			{ MAME_DIR .. "src/version.cpp" ,  GEN_DIR  .. "resource/" .. rctarget .. "vers.rc",    {  MAME_DIR .. "scripts/build/verinfo.py" }, {"@echo Emitting " .. rctarget .. "vers.rc" .. "...",    PYTHON .. " $(1)  -r -b " .. rctarget .. " $(<) > $(@)" }},

From 816860f2d81a40f9aecc8c7ef9f5ab2c42e56d7f Mon Sep 17 00:00:00 2001
From: Miodrag Milanovic <mmicko@gmail.com>
Date: Sat, 16 Apr 2016 17:24:57 +0200
Subject: [PATCH 038/122] no error output if first time run (nw)

---
 makefile | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/makefile b/makefile
index 40eab7364c3..18a6526375d 100644
--- a/makefile
+++ b/makefile
@@ -878,8 +878,11 @@ endif
 
 ifeq ($(GIT_AVAILABLE),git)
 NEW_GIT_VERSION := $(shell git describe)
-OLD_GIT_VERSION := $(shell cat .mame_version)
-
+ifeq (posix,$(SHELLTYPE))
+OLD_GIT_VERSION := $(shell cat .mame_version 2> /dev/null)
+else
+OLD_GIT_VERSION := $(shell cat .mame_version 2> NUL)
+endif
 ifneq ($(NEW_GIT_VERSION),$(OLD_GIT_VERSION))
 $(shell git describe > .mame_version)
 $(shell touch $(SRC)/version.cpp)

From fc48cb17f314d3a67ea90885c76191c99fd295b6 Mon Sep 17 00:00:00 2001
From: Miodrag Milanovic <mmicko@gmail.com>
Date: Sat, 16 Apr 2016 18:01:48 +0200
Subject: [PATCH 039/122] added print_verbose, print_info, print_debug and
 print_error to lua, and used it instead of print (nw)

---
 plugins/boot.lua         |  2 +-
 plugins/cheat/init.lua   | 20 ++++++++---------
 plugins/dummy/init.lua   |  6 ++---
 plugins/hiscore/init.lua | 18 +++++++--------
 src/emu/luaengine.cpp    | 47 ++++++++++++++++++++++++++++++++++++++++
 src/emu/luaengine.h      |  5 +++++
 6 files changed, 75 insertions(+), 23 deletions(-)

diff --git a/plugins/boot.lua b/plugins/boot.lua
index 8417a979fb1..4662b6bff0c 100644
--- a/plugins/boot.lua
+++ b/plugins/boot.lua
@@ -19,7 +19,7 @@ for file in lfs.dir("plugins") do
 		if (meta["plugin"]["type"]=="plugin") and (manager:plugins().entries[meta["plugin"]["name"]]~=nil) then
 			local entry = manager:plugins().entries[meta["plugin"]["name"]]	
 			if (entry:value()==true) then
-				print("Starting plugin " .. meta["plugin"]["name"] .. "...")
+				emu.print_verbose("Starting plugin " .. meta["plugin"]["name"] .. "...")
 				plugin = require(meta["plugin"]["name"])
 				if plugin.set_folder~=nil then plugin.set_folder("plugins/" .. file) end
 				plugin.startplugin();
diff --git a/plugins/cheat/init.lua b/plugins/cheat/init.lua
index ec5078fedf0..ea6f4bba3fb 100644
--- a/plugins/cheat/init.lua
+++ b/plugins/cheat/init.lua
@@ -112,7 +112,7 @@ function cheat.startplugin()
 			line = line + 1
 		end
 		if not screen then
-			print("draw_text: invalid screen")
+			emu.print_verbose("draw_text: invalid screen")
 			return
 		end
 		if type(x) == "string" then
@@ -123,7 +123,7 @@ function cheat.startplugin()
 
 	local function draw_line(screen, x1, y1, x2, y2, color)
 		if not screen then
-			print("draw_line: invalid screen")
+			emu.print_verbose("draw_line: invalid screen")
 			return
 		end
 		output[#output + 1] = { type = "line", scr = screen, x1 = x1, x2 = x2, y1 = y1, y2 = y2, color = color }
@@ -131,7 +131,7 @@ function cheat.startplugin()
 
 	local function draw_box(screen, x1, y1, x2, y2, bgcolor, linecolor)
 		if not screen then
-			print("draw_box: invalid screen")
+			emu.print_verbose("draw_box: invalid screen")
 			return
 		end
 		output[#output + 1] = { type = "box", scr = screen, x1 = x1, x2 = x2, y1 = y1, y2 = y2, bgcolor = bgcolor, linecolor = linecolor }
@@ -184,7 +184,7 @@ function cheat.startplugin()
 		for name, script in pairs(cheat.script) do
 			script, err = load(script, cheat.desc .. name, "t", cheat.cheat_env)
 			if not script then
-				print("error loading cheat script: " .. cheat.desc .. " " .. err)
+				emu.print_verbose("error loading cheat script: " .. cheat.desc .. " " .. err)
 				cheat = { desc = cheat.desc .. " error" }
 				return
 			end
@@ -199,7 +199,7 @@ function cheat.startplugin()
 				local cpu, mem
 				cpu = manager:machine().devices[space.tag]
 				if not cpu then
-					print("error loading cheat script: " .. cheat.desc)
+					emu.print_verbose("error loading cheat script: " .. cheat.desc)
 					cheat = { desc = cheat.desc .. " error" }
 					return
 				end
@@ -209,7 +209,7 @@ function cheat.startplugin()
 					mem = cpu.spaces["program"]
 				end
 				if not mem then
-					print("error loading cheat script: " .. cheat.desc)
+					emu.print_verbose("error loading cheat script: " .. cheat.desc)
 					cheat = { desc = cheat.desc .. " error" }
 					return
 				end
@@ -232,7 +232,7 @@ function cheat.startplugin()
 				local mem 
 				mem = manager:machine():memory().regions[region]
 				if not mem then
-					print("error loading cheat script: " .. cheat.desc)
+					emu.print_verbose("error loading cheat script: " .. cheat.desc)
 					cheat = { desc = cheat.desc .. " error" }
 					return
 				end
@@ -244,7 +244,7 @@ function cheat.startplugin()
 				local ram
 				ram = manager:machine().devices[ram]
 				if not ram then
-					print("error loading cheat script: " .. cheat.desc)
+					emu.print_verbose("error loading cheat script: " .. cheat.desc)
 					cheat = { desc = cheat.desc .. " error" }
 					return
 				end
@@ -531,14 +531,14 @@ function cheat.startplugin()
 		cheat = cheats[index]
 		if cheat then
 			for k, v in pairs(cheat.cheat_env) do
-				print(k, v)
+				emu.print_verbose(k, v)
 			end
 		end
 	end
 
 	function ce.list()
 		for num, cheat in pairs(cheats) do
-			print(num, cheat.desc)
+			emu.print_verbose(num, cheat.desc)
 		end
 	end
 
diff --git a/plugins/dummy/init.lua b/plugins/dummy/init.lua
index 8058bcad452..1f78851a936 100644
--- a/plugins/dummy/init.lua
+++ b/plugins/dummy/init.lua
@@ -11,11 +11,11 @@ local dummy = exports
 
 function dummy.startplugin()
 	emu.register_start(function()
-		print("Starting " .. emu.gamename())
+		emu.print_verbose("Starting " .. emu.gamename())
 	end)
     
 	emu.register_stop(function()
-		print("Exiting " .. emu.gamename())
+		emu.print_verbose("Exiting " .. emu.gamename())
 	end)
 
 	local function menu_populate()
@@ -23,7 +23,7 @@ function dummy.startplugin()
 	end
 
 	local function menu_callback(index, event)
-		print("index: " .. index .. " event: " .. event)
+		emu.print_verbose("index: " .. index .. " event: " .. event)
 		return false
 	end
 
diff --git a/plugins/hiscore/init.lua b/plugins/hiscore/init.lua
index 647aca11608..877c8372c70 100644
--- a/plugins/hiscore/init.lua
+++ b/plugins/hiscore/init.lua
@@ -129,14 +129,14 @@ function hiscore.startplugin()
 
 
 	local function write_scores ( posdata )
-	  print("write_scores")
+	  emu.print_verbose("write_scores")
 	  local output = io.open(get_file_name(), "wb");
 	  if not output then
 		-- attempt to create the directory, and try again
 		lfs.mkdir( hiscore_path );
 		output = io.open(get_file_name(), "wb");
 	  end
-	  print("write_scores output")
+	  emu.print_verbose("write_scores output")
 	  if output then
 		for ri,row in ipairs(posdata) do
 		  t = {};
@@ -147,7 +147,7 @@ function hiscore.startplugin()
 		end
 		output:close();
 	  end
-	  print("write_scores end")
+	  emu.print_verbose("write_scores end")
 	end
 
 
@@ -184,10 +184,10 @@ function hiscore.startplugin()
 		if check_mem( positions ) then
 		  default_checksum = check_scores( positions );
 		  if read_scores( positions ) then
-			print( "scores read", "OK" );
+			emu.print_verbose( "scores read", "OK" );
 		  else
 			-- likely there simply isn't a .hi file around yet
-			print( "scores read", "FAIL" );
+			emu.print_verbose( "scores read", "FAIL" );
 		  end
 		  scores_have_been_read = true;
 		  current_checksum = check_scores( positions );
@@ -219,7 +219,7 @@ function hiscore.startplugin()
 			write_scores( positions );
 			current_checksum = checksum;
 			last_write_time = emu.time();
-			-- print( "SAVE SCORES EVENT!", last_write_time );
+			-- emu.print_verbose( "SAVE SCORES EVENT!", last_write_time );
 		  end
 		end
 	  end
@@ -243,13 +243,13 @@ function hiscore.startplugin()
 		mem_check_passed = false
 	   	scores_have_been_read = false;
 		last_write_time = -10
-	  	print("Starting " .. emu.gamename())
+	  	emu.print_verbose("Starting " .. emu.gamename())
 		local dat = read_hiscore_dat()
 		if dat and dat ~= "" then
-			print( "found hiscore.dat entry for " .. emu.romname() );
+			emu.print_verbose( "found hiscore.dat entry for " .. emu.romname() );
 			positions = parse_table( dat );
 			if not positions then
-				print("hiscore.dat parse error");
+				emu.print_error("hiscore.dat parse error");
 				return;
 			end
 			found_hiscore_entry = true
diff --git a/src/emu/luaengine.cpp b/src/emu/luaengine.cpp
index 331d2b1372e..8e1ddbf8d93 100644
--- a/src/emu/luaengine.cpp
+++ b/src/emu/luaengine.cpp
@@ -2075,6 +2075,49 @@ int lua_engine::lua_machine::l_logerror(lua_State *L)
 	return 0;
 }
 
+std::string lua_engine::get_print_buffer(lua_State *L)
+{
+    int nargs = lua_gettop(L);
+    
+    const std::string sep = " ";
+    
+    std::ostringstream ss;
+    bool first = true;
+
+    for (int i = 1; i <= nargs; i++) {
+      const char* c = lua_tostring(L, i);
+      const std::string str = c ? c : "<nil>";
+      if (first) first = false;
+      else ss << sep;
+      ss << str;
+    }
+
+	return ss.str();
+}
+int lua_engine::l_osd_printf_verbose(lua_State *L)
+{
+    osd_printf_verbose("%s\n",get_print_buffer(L).c_str());
+	return 0;
+}
+
+int lua_engine::l_osd_printf_error(lua_State *L)
+{
+	osd_printf_error("%s\n",get_print_buffer(L).c_str());
+	return 0;
+}
+
+int lua_engine::l_osd_printf_info(lua_State *L)
+{
+	osd_printf_info("%s\n",get_print_buffer(L).c_str());
+	return 0;
+}
+
+int lua_engine::l_osd_printf_debug(lua_State *L)
+{
+	osd_printf_debug("%s\n",get_print_buffer(L).c_str());
+	return 0;
+}
+
 //-------------------------------------------------
 //  initialize - initialize lua hookup to emu engine
 //-------------------------------------------------
@@ -2106,6 +2149,10 @@ void lua_engine::initialize()
 			.addCFunction ("register_frame", l_emu_register_frame )
 			.addCFunction ("register_frame_done", l_emu_register_frame_done )
 			.addCFunction ("register_menu",  l_emu_register_menu )
+			.addCFunction ("print_verbose", l_osd_printf_verbose )
+			.addCFunction ("print_error",   l_osd_printf_error )
+			.addCFunction ("print_info",    l_osd_printf_info )
+			.addCFunction ("print_debug",   l_osd_printf_debug )
 			.beginClass <machine_manager> ("manager")
 				.addFunction ("machine", &machine_manager::machine)
 				.addFunction ("options", &machine_manager::options)
diff --git a/src/emu/luaengine.h b/src/emu/luaengine.h
index 269ea3d46b3..3b4c85ce939 100644
--- a/src/emu/luaengine.h
+++ b/src/emu/luaengine.h
@@ -141,6 +141,11 @@ private:
 	static int l_emu_register_frame(lua_State *L);
 	static int l_emu_register_frame_done(lua_State *L);
 	static int l_emu_register_menu(lua_State *L);
+	static std::string get_print_buffer(lua_State *L);
+	static int l_osd_printf_verbose(lua_State *L);
+	static int l_osd_printf_error(lua_State *L);
+	static int l_osd_printf_info(lua_State *L);
+	static int l_osd_printf_debug(lua_State *L);
 	static int register_function(lua_State *L, const char *id);
 
 	// "emu.machine" namespace

From 32464738c6a7518a857cf3aa38d16590ff54f5b4 Mon Sep 17 00:00:00 2001
From: "therealmogminer@gmail.com" <therealmogminer@gmail.com>
Date: Sat, 16 Apr 2016 21:34:59 +0200
Subject: [PATCH 040/122] Fix compile error on SDL targets

---
 src/osd/modules/render/drawbgfx.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/osd/modules/render/drawbgfx.cpp b/src/osd/modules/render/drawbgfx.cpp
index 78d661a9953..51806233ea6 100644
--- a/src/osd/modules/render/drawbgfx.cpp
+++ b/src/osd/modules/render/drawbgfx.cpp
@@ -236,6 +236,7 @@ int renderer_bgfx::create()
 //  renderer_bgfx::record
 //============================================================
 
+#ifndef OSD_SDL
 void renderer_bgfx::record()
 {
 	std::string filename("test.avi");//m_options.d3d_hlsl_write());
@@ -249,6 +250,7 @@ void renderer_bgfx::record()
 		begin_avi_recording(filename);
 	}
 }
+#endif
 
 void renderer_bgfx::end_avi_recording()
 {

From 7ffbd45c6c418063e270d659556b952834d713da Mon Sep 17 00:00:00 2001
From: AJR <ajrhacker@users.noreply.github.com>
Date: Sat, 16 Apr 2016 16:37:31 -0400
Subject: [PATCH 041/122] Critical fixes (nw) - Prevent
 tmpz84c015_device::irq_priority_w from crashing or corrupting the daisy chain
 - Eliminate the need for TMPZ84C015_DAISY_INTERNAL by not overwriting
 elements in the daisy list - Removed leftover MCFG_SEGAZ80_SET_DECRYPTED_TAG
 from macros in system1.cpp, which lets all drivers validate without crashing

---
 src/devices/cpu/z80/tmpz84c015.cpp |  4 ++-
 src/devices/cpu/z80/tmpz84c015.h   |  3 ---
 src/devices/cpu/z80/z80daisy.cpp   | 40 +++++++++++++++++++++++++++---
 src/devices/cpu/z80/z80daisy.h     |  1 +
 src/mame/drivers/pve500.cpp        |  1 -
 src/mame/drivers/system1.cpp       |  6 ++---
 6 files changed, 43 insertions(+), 12 deletions(-)

diff --git a/src/devices/cpu/z80/tmpz84c015.cpp b/src/devices/cpu/z80/tmpz84c015.cpp
index 6c1f88c087a..3586001e2c6 100644
--- a/src/devices/cpu/z80/tmpz84c015.cpp
+++ b/src/devices/cpu/z80/tmpz84c015.cpp
@@ -155,7 +155,7 @@ WRITE8_MEMBER(tmpz84c015_device::irq_priority_w)
 			{ 1, 2, 0 }  // 5: sio -> pio -> ctc -> ext
 		};
 
-		// reconfigure first 3 entries in daisy chain
+		// reconfigure daisy chain
 		const z80_daisy_config daisy_chain[] =
 		{
 			{ dev[prio[data][0]] },
@@ -163,6 +163,8 @@ WRITE8_MEMBER(tmpz84c015_device::irq_priority_w)
 			{ dev[prio[data][2]] },
 			{ nullptr }
 		};
+
+		// insert these 3 entries in order before any externally linked devices
 		daisy_init(daisy_chain);
 
 		m_irq_priority = data;
diff --git a/src/devices/cpu/z80/tmpz84c015.h b/src/devices/cpu/z80/tmpz84c015.h
index 559d7350602..2578f6a92ef 100644
--- a/src/devices/cpu/z80/tmpz84c015.h
+++ b/src/devices/cpu/z80/tmpz84c015.h
@@ -23,9 +23,6 @@
     DEVICE CONFIGURATION MACROS
 ***************************************************************************/
 
-// If an external daisy chain is used, insert this before your own device tags:
-#define TMPZ84C015_DAISY_INTERNAL { "tmpz84c015_ctc" }, { "tmpz84c015_sio" }, { "tmpz84c015_pio" }
-
 // SIO callbacks
 #define MCFG_TMPZ84C015_OUT_TXDA_CB(_devcb) \
 	devcb = &tmpz84c015_device::set_out_txda_callback(*device, DEVCB_##_devcb);
diff --git a/src/devices/cpu/z80/z80daisy.cpp b/src/devices/cpu/z80/z80daisy.cpp
index 9d06fe1c9fc..82e41c42e1a 100644
--- a/src/devices/cpu/z80/z80daisy.cpp
+++ b/src/devices/cpu/z80/z80daisy.cpp
@@ -87,6 +87,8 @@ void z80_daisy_chain_interface::interface_post_start()
 
 void z80_daisy_chain_interface::daisy_init(const z80_daisy_config *daisy)
 {
+	assert(daisy != nullptr);
+
 	// create a linked list of devices
 	device_z80daisy_interface **tailptr = &m_chain;
 	for ( ; daisy->devname != nullptr; daisy++)
@@ -105,12 +107,23 @@ void z80_daisy_chain_interface::daisy_init(const z80_daisy_config *daisy)
 		if (!target->interface(intf))
 			fatalerror("Device '%s' does not implement the z80daisy interface!\n", daisy->devname);
 
-		// append to the end, or overwrite existing entry
-		device_z80daisy_interface *next = (*tailptr != nullptr) ? (*tailptr)->m_daisy_next : nullptr;
+		// splice it out of the list if it was previously added
+		device_z80daisy_interface **oldtailptr = tailptr;
+		while (*oldtailptr != nullptr)
+		{
+			if (*oldtailptr == intf)
+				*oldtailptr = (*oldtailptr)->m_daisy_next;
+			else
+				oldtailptr = &(*oldtailptr)->m_daisy_next;
+		}
+
+		// add the interface to the list
+		intf->m_daisy_next = *tailptr;
 		*tailptr = intf;
-		(*tailptr)->m_daisy_next = next;
 		tailptr = &(*tailptr)->m_daisy_next;
 	}
+
+	osd_printf_verbose("Daisy chain = %s\n", daisy_show_chain().c_str());
 }
 
 
@@ -193,3 +206,24 @@ void z80_daisy_chain_interface::daisy_call_reti_device()
 	}
 	//logerror("z80daisy_call_reti_device: failed to find an device to reti!\n");
 }
+
+
+//-------------------------------------------------
+//  daisy_show_chain - list devices in the chain
+//  in string format (for debugging purposes)
+//-------------------------------------------------
+
+std::string z80_daisy_chain_interface::daisy_show_chain() const
+{
+	std::ostringstream result;
+
+	// loop over all devices
+	for (device_z80daisy_interface *intf = m_chain; intf != nullptr; intf = intf->m_daisy_next)
+	{
+		if (intf != m_chain)
+			result << " -> ";
+		result << intf->device().tag();
+	}
+
+	return result.str();
+}
diff --git a/src/devices/cpu/z80/z80daisy.h b/src/devices/cpu/z80/z80daisy.h
index 9248c31c6da..11d17dc36eb 100644
--- a/src/devices/cpu/z80/z80daisy.h
+++ b/src/devices/cpu/z80/z80daisy.h
@@ -85,6 +85,7 @@ public:
 
 	// getters
 	bool daisy_chain_present() const { return (m_chain != nullptr); }
+	std::string daisy_show_chain() const;
 
 protected:
 	// interface-level overrides
diff --git a/src/mame/drivers/pve500.cpp b/src/mame/drivers/pve500.cpp
index 7c87ca636d0..52c05d15912 100644
--- a/src/mame/drivers/pve500.cpp
+++ b/src/mame/drivers/pve500.cpp
@@ -102,7 +102,6 @@ WRITE_LINE_MEMBER( pve500_state::external_monitor_w )
 
 static const z80_daisy_config maincpu_daisy_chain[] =
 {
-	TMPZ84C015_DAISY_INTERNAL,
 	{ "external_ctc" },
 	{ "external_sio" },
 	{ nullptr }
diff --git a/src/mame/drivers/system1.cpp b/src/mame/drivers/system1.cpp
index 50395d17607..8169a0d16d0 100644
--- a/src/mame/drivers/system1.cpp
+++ b/src/mame/drivers/system1.cpp
@@ -2222,15 +2222,13 @@ MACHINE_CONFIG_END
 	MCFG_CPU_PROGRAM_MAP(system1_map) \
 	MCFG_CPU_DECRYPTED_OPCODES_MAP(decrypted_opcodes_map) \
 	MCFG_CPU_IO_MAP(system1_ppi_io_map) \
-	MCFG_CPU_VBLANK_INT_DRIVER("screen", system1_state, irq0_line_hold) \
-	MCFG_SEGAZ80_SET_DECRYPTED_TAG(":decrypted_opcodes")
+	MCFG_CPU_VBLANK_INT_DRIVER("screen", system1_state, irq0_line_hold)
 
 #define ENCRYPTED_SYS1PIO_MAPS \
 	MCFG_CPU_PROGRAM_MAP(system1_map) \
 	MCFG_CPU_DECRYPTED_OPCODES_MAP(decrypted_opcodes_map) \
 	MCFG_CPU_IO_MAP(system1_pio_io_map) \
-	MCFG_CPU_VBLANK_INT_DRIVER("screen", system1_state, irq0_line_hold) \
-	MCFG_SEGAZ80_SET_DECRYPTED_TAG(":decrypted_opcodes")
+	MCFG_CPU_VBLANK_INT_DRIVER("screen", system1_state, irq0_line_hold)
 
 
 static MACHINE_CONFIG_DERIVED( sys1ppix_315_5178, sys1ppi )

From efff21179848cca74835b9912b6f7672b4effbb3 Mon Sep 17 00:00:00 2001
From: BraiNKilleRGR <brainkiller2000@yahoo.com>
Date: Sun, 17 Apr 2016 02:11:24 +0300
Subject: [PATCH 042/122] Updated Greek Translation

---
 language/Greek/strings.po | 158 +++++---------------------------------
 1 file changed, 18 insertions(+), 140 deletions(-)

diff --git a/language/Greek/strings.po b/language/Greek/strings.po
index 06d6f2c0d6b..abc1d0dbe57 100644
--- a/language/Greek/strings.po
+++ b/language/Greek/strings.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: MAME\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-04-15 17:42+0200\n"
-"PO-Revision-Date: 2016-03-28 15:32+0300\n"
+"PO-Revision-Date: 2016-04-16 17:53+0300\n"
 "Last-Translator: Mame.gr\n"
 "Language-Team: MAME Language Team\n"
 "Language: el\n"
@@ -753,7 +753,7 @@ msgstr "Cheat"
 
 #: src/emu/ui/mainmenu.cpp:135
 msgid "Plugin Options"
-msgstr ""
+msgstr "Επιλογές Πρόσθετων"
 
 #: src/emu/ui/mainmenu.cpp:139
 msgid "External DAT View"
@@ -891,15 +891,15 @@ msgstr "%s.txt αποθηκεύτηκε στο φάκελο ui."
 
 #: src/emu/ui/miscmenu.cpp:677
 msgid "Export list in XML format (like -listxml)"
-msgstr ""
+msgstr "Εξαγωγή σε μορφή XML (όπως -listxml)"
 
 #: src/emu/ui/miscmenu.cpp:678
 msgid "Export list in XML format (like -listxml, but exclude devices)"
-msgstr ""
+msgstr "Εξαγωγή σε μορφή XML (όπως -listxml, χωρίς τις συσκευές)"
 
 #: src/emu/ui/miscmenu.cpp:679
 msgid "Export list in TXT format (like -listfull)"
-msgstr ""
+msgstr "Εξαγωγή σε μορφή TXT(όπως -listfull)"
 
 #: src/emu/ui/miscmenu.cpp:729 src/emu/ui/optsmenu.cpp:376
 msgid ""
@@ -913,11 +913,11 @@ msgstr ""
 
 #: src/emu/ui/miscmenu.cpp:774
 msgid "Bios"
-msgstr ""
+msgstr "Bios"
 
 #: src/emu/ui/miscmenu.cpp:776
 msgid "Driver"
-msgstr ""
+msgstr "Οδηγός"
 
 #: src/emu/ui/miscmenu.cpp:790
 msgid "Save machine configuration"
@@ -925,7 +925,7 @@ msgstr "Αποθήκευση παραμετροποίησης μηχανήματ
 
 #: src/emu/ui/miscmenu.cpp:806
 msgid "Configure machine:"
-msgstr ""
+msgstr "Ρύθμιση μηχανήματος:"
 
 #: src/emu/ui/miscmenu.cpp:868 src/emu/ui/selsoft.cpp:109
 msgid " (default)"
@@ -1025,6 +1025,10 @@ msgid ""
 "\n"
 "Press any key to continue."
 msgstr ""
+"Στο επιλεγμένο μηχάνημα λείπουν μία ή περισσότερες απαιτούμενες ROMs ή "
+"αρχεία CHD. Παρακαλούμε επιλέξτε ένα άλλο μηχάνημα.\n"
+"\n"
+"Πιέστε ένα πλήκτρο για να συνεχίσετε."
 
 #: src/emu/ui/selgame.cpp:595 src/emu/ui/simpleselgame.cpp:265
 msgid "Configure Options"
@@ -1032,7 +1036,7 @@ msgstr "Ρύθμιση Επιλογών"
 
 #: src/emu/ui/selgame.cpp:596
 msgid "Configure Machine"
-msgstr ""
+msgstr "Ρύθμιση Μηχανήματος"
 
 #: src/emu/ui/selgame.cpp:758
 #, c-format
@@ -1303,11 +1307,15 @@ msgid ""
 "\n"
 "Press any key to continue."
 msgstr ""
+"Στο επιλεγμένο λογισμικό λείπει ένα ή περισσότερα απαιτούμενα αρχεία. "
+"Παρακαλώ επιλέξτε ένα διαφορετικό λογισμικό.\n"
+"\n"
+"Πιέστε ένα πλήκτρο για να συνεχίσετε."
 
 #: src/emu/ui/selsoft.cpp:683
 #, c-format
 msgid "%1$s %2$s ( %3$d / %4$d software packages )"
-msgstr ""
+msgstr "%1$s %2$s ( %3$d / %4$d πακέτα λογισμικού)"
 
 #: src/emu/ui/selsoft.cpp:684
 #, c-format
@@ -1954,133 +1962,3 @@ msgstr " ΧΡΩΜΑΤΑ"
 #: src/emu/ui/viewgfx.cpp:391
 msgid " PENS"
 msgstr " ΓΡΑΦΙΔΕΣ"
-
-#~ msgid "Export XML format (like -listxml)"
-#~ msgstr "Εξαγωγή σε μορφή XML (όπως -listxml)"
-
-#~ msgid "Export TXT format (like -listfull)"
-#~ msgstr "Εξαγωγή σε μορφή XML TXT(όπως -listfull)"
-
-#~ msgid "Dummy"
-#~ msgstr "Dummy"
-
-#~ msgid "%1$s %2$s ( %3$d / %4$d softwares )"
-#~ msgstr "%1$s %2$s ( %3$d / %4$d λογισμικό )"
-
-#~ msgid "Lightgun Device Assignment"
-#~ msgstr "Ανάθεση συσκευής Lightgun"
-
-#~ msgid "Trackball Device Assignment"
-#~ msgstr "Ανάθεση συσκευής Trackball"
-
-#~ msgid "Pedal Device Assignment"
-#~ msgstr "Ανάθεση συσκευής Pedal"
-
-#~ msgid "Adstick Device Assignment"
-#~ msgstr "Ανάθεση συσκευής Adstick"
-
-#~ msgid "Paddle Device Assignment"
-#~ msgstr "Ανάθεση συσκευής Paddle"
-
-#~ msgid "Dial Device Assignment"
-#~ msgstr "Ανάθεση συσκευής Dial"
-
-#~ msgid "Positional Device Assignment"
-#~ msgstr "Ανάθεση συσκευής θέσης"
-
-#~ msgid "Mouse Device Assignment"
-#~ msgstr "Ανάθεση συσκευής Ποντικιού"
-
-#~ msgid "Device Mapping"
-#~ msgstr "Αντιστοίχιση Συσκευής"
-
-#~ msgid "Video Mode"
-#~ msgstr "Λειτουργία Βίντεο"
-
-#~ msgid "Triple Buffering"
-#~ msgstr "Triple Buffering"
-
-#~ msgid "HLSL"
-#~ msgstr "HLSL"
-
-#~ msgid "GLSL"
-#~ msgstr "GLSL"
-
-#~ msgid "Bilinear Filtering"
-#~ msgstr "Bilinear Filtering"
-
-#~ msgid "Bitmap Prescaling"
-#~ msgstr "Bitmap Prescaling"
-
-#~ msgid "Window Mode"
-#~ msgstr "Λειτουργία Παραθύρου"
-
-#~ msgid "Enforce Aspect Ratio"
-#~ msgstr "Επιβολή Αναλογίας Εικόνας"
-
-#~ msgid "Start Out Maximized"
-#~ msgstr "Εκκίνηση Μεγιστοποιημένο"
-
-#~ msgid "Synchronized Refresh"
-#~ msgstr "Συγχρονισμένη Ανανέωση"
-
-#~ msgid "Wait Vertical Sync"
-#~ msgstr "Αναμονή για Κάθετο Συγχρονισμό"
-
-#~ msgid "Display Options"
-#~ msgstr "Επιλογές Γραφικών"
-
-#~ msgid ""
-#~ "The selected machine is missing one or more required ROM or CHD images. "
-#~ "Please select a different machine.\n"
-#~ "\n"
-#~ "Press any key (except ESC) to continue."
-#~ msgstr ""
-#~ "Στο επιλεγμένο μηχάνημα λείπει μία ή περισσότερες ROMs ή εικόνες CHD. "
-#~ "Παρακαλούμε επιλέξτε ένα άλλο μηχάνημα.\n"
-#~ "\n"
-#~ "Πιέστε οποιοδήποτε πλήκτρο (εκτός από το ESC) για να συνεχίσετε."
-
-#~ msgid ""
-#~ "The selected software is missing one or more required files. Please "
-#~ "select a different software.\n"
-#~ "\n"
-#~ "Press any key (except ESC) to continue."
-#~ msgstr ""
-#~ "Στο επιλεγμένο λογισμικό λείπει μία ή περισσότερες ROMs ή εικόνες CHD. "
-#~ "Παρακαλούμε επιλέξτε ένα άλλο λογισμικό.\n"
-#~ "\n"
-#~ "Πιέστε οποιοδήποτε πλήκτρο (εκτός από το ESC) για να συνεχίσετε."
-
-#~ msgid "Re-select last machine played"
-#~ msgstr "Επιλογή του τελευταίου μηχανήματος που έπαιζε"
-
-#~ msgid "Enlarge images in the right panel"
-#~ msgstr "Μεγέθυνση εικόνων στο δεξιό πίνακα"
-
-#~ msgid "DATs info"
-#~ msgstr "Πληροφορίες DATs"
-
-#~ msgid "Show mouse pointer"
-#~ msgstr "Εμφάνιση δείκτη ποντικιού"
-
-#~ msgid "Confirm quit from machines"
-#~ msgstr "Επιβεβαίωση εγκατάληψης από μηχάνημα"
-
-#~ msgid "Skip displaying information's screen at startup"
-#~ msgstr "Να μην εμφανίζεται η οθόνη πληροφοριών κατά την εκκίνηση"
-
-#~ msgid "Force 4:3 appearance for software snapshot"
-#~ msgstr "Επιβολή 4:3 Εμφάνισης για το στιγμιότυπο"
-
-#~ msgid "Use image as background"
-#~ msgstr "Χρήση εικόνας ως φόντου"
-
-#~ msgid "Skip bios selection menu"
-#~ msgstr "Παράλειψη μενού επιλογής bios"
-
-#~ msgid "Skip software parts selection menu"
-#~ msgstr "Παράλειψη μενού επιλογής τμημάτων λογισμικού"
-
-#~ msgid "Miscellaneous Options"
-#~ msgstr "Διάφορες Επιλογές"

From 74dd3287e5e951fd1ffc942c62600d840fc8b3a8 Mon Sep 17 00:00:00 2001
From: mahlemiut <bsr@xnet.co.nz>
Date: Sun, 17 Apr 2016 23:50:50 +1200
Subject: [PATCH 043/122] Added ImGui based debugger.  [Barry Rodewald]

Note: Currently only works with the BGFX renderer.  Anyone who wishes to
      write a ImGui backend for other renderers are welcome to do so.
---
 scripts/src/osd/modules.lua             |    1 +
 src/osd/modules/debugger/debugimgui.cpp | 1081 +++++++++++++++++++++++
 src/osd/modules/lib/osdobj_common.cpp   |    1 +
 3 files changed, 1083 insertions(+)
 create mode 100644 src/osd/modules/debugger/debugimgui.cpp

diff --git a/scripts/src/osd/modules.lua b/scripts/src/osd/modules.lua
index fb48d20a2d5..afbdd78470f 100644
--- a/scripts/src/osd/modules.lua
+++ b/scripts/src/osd/modules.lua
@@ -56,6 +56,7 @@ function osdmodulesbuild()
 		MAME_DIR .. "src/osd/modules/debugger/none.cpp",
 		MAME_DIR .. "src/osd/modules/debugger/debugint.cpp",
 		MAME_DIR .. "src/osd/modules/debugger/debugwin.cpp",
+		MAME_DIR .. "src/osd/modules/debugger/debugimgui.cpp",
 		MAME_DIR .. "src/osd/modules/font/font_sdl.cpp",
 		MAME_DIR .. "src/osd/modules/font/font_windows.cpp",
 		MAME_DIR .. "src/osd/modules/font/font_dwrite.cpp",
diff --git a/src/osd/modules/debugger/debugimgui.cpp b/src/osd/modules/debugger/debugimgui.cpp
new file mode 100644
index 00000000000..060791a3196
--- /dev/null
+++ b/src/osd/modules/debugger/debugimgui.cpp
@@ -0,0 +1,1081 @@
+// Initial test to attempt an imgui based debugger
+
+#include "emu.h"
+#include "imgui/imgui.h"
+#include "uiinput.h"
+
+#include "debug/debugvw.h"
+#include "debug/dvdisasm.h"
+#include "debug/dvmemory.h"
+#include "debug/dvbpoints.h"
+#include "debug/dvwpoints.h"
+#include "debug/debugcon.h"
+#include "debug/debugcpu.h"
+
+#include "config.h"
+#include "debugger.h"
+#include "modules/lib/osdobj_common.h"
+#include "debug_module.h"
+#include "modules/osdmodule.h"
+
+enum
+{
+	VIEW_STATE_BUTTON           = 0x01,
+	VIEW_STATE_MOVING           = 0x02,
+	VIEW_STATE_SIZING           = 0x04,
+	VIEW_STATE_NEEDS_UPDATE     = 0x08,
+	VIEW_STATE_FOLLOW_CPU       = 0x10,
+	VIEW_STATE_VISIBLE          = 0x20
+};
+
+class DView
+{
+	DISABLE_COPYING(DView);
+
+public:
+	DView(running_machine &machine, debug_view_type type, int flags)
+		: next(nullptr),
+			type(0),
+			state(0),
+			ofs_x(0),
+			ofs_y(0),
+			exec_cmd(false)
+		{
+		this->view = machine.debug_view().alloc_view(type, nullptr, this);
+		this->type = type;
+		this->m_machine = &machine;
+		this->state = flags | VIEW_STATE_NEEDS_UPDATE | VIEW_STATE_VISIBLE;
+		this->width = 300;
+		this->height = 300;
+
+		/* specials */
+		switch (type)
+		{
+		case DVT_DISASSEMBLY:
+			/* set up disasm view */
+			downcast<debug_view_disasm *>(this->view)->set_expression("curpc");
+			break;
+		default:
+			break;
+		}
+		}
+	~DView()
+	{
+		//this->target->debug_free(*this->container);
+		machine().debug_view().free_view(*this->view);
+	}
+
+	running_machine &machine() const { assert(m_machine != nullptr); return *m_machine; }
+
+	DView *             next;
+
+	int                 type;
+	debug_view *        view;
+	running_machine *   m_machine;
+	int                 state;
+	// drawing
+	int                 ofs_x;
+	int                 ofs_y;
+	int                 width;
+	int                 height;  // width and height of the view area, passed to ImGui::BeginChild
+	std::string         title;
+	int                 last_x;
+	int                 last_y;
+	bool                exec_cmd;  // console only
+	int                 src_sel;
+	char                console_input[512];
+};
+
+class debug_imgui : public osd_module, public debug_module
+{
+public:
+	debug_imgui()
+	: osd_module(OSD_DEBUG_PROVIDER, "imgui"), debug_module(),
+		m_machine(nullptr),
+		m_hide(false),
+		m_win_count(0)
+	{
+	}
+
+	virtual ~debug_imgui() { }
+
+	virtual int init(const osd_options &options) override { return 0; }
+	virtual void exit() override {};
+
+	virtual void init_debugger(running_machine &machine) override;
+	virtual void wait_for_debugger(device_t &device, bool firststop) override;
+	virtual void debugger_update() override;
+
+private:
+	void handle_mouse();
+	void handle_keys();
+	void handle_console(running_machine* machine);
+	void update();
+	void draw_console();
+	void add_disasm(int id);
+	void add_memory(int id);
+	void add_bpoints(int id);
+	void add_wpoints(int id);
+	void draw_disasm(DView* view_ptr, bool* opened);
+	void draw_memory(DView* view_ptr, bool* opened);
+	void draw_bpoints(DView* view_ptr, bool* opened);
+	void update_cpu_view(device_t* device);
+
+	running_machine* m_machine;
+	INT32            m_mouse_x;
+	INT32            m_mouse_y;
+	bool             m_mouse_button;
+	bool             m_running;
+	const char*      font_name;
+	float            font_size;
+	ImguiFontHandle  m_font;
+	UINT8            m_key_char;
+	bool             m_hide;
+        unsigned char* font_data;
+	int              m_win_count;  // number of active windows, does not decrease, used to ID individual windows
+};
+
+// globals
+static std::vector<DView*> view_list;
+static DView* view_main_console = nullptr;
+static DView* view_main_disasm = nullptr;
+static DView* view_main_regs = nullptr;
+
+static void view_list_add(DView* item)
+{
+	view_list.push_back(item);
+}
+
+static void view_list_remove(DView* item)
+{
+	std::vector<DView*>::iterator it;
+	if(view_list.empty())
+		return;
+	it = std::find(view_list.begin(),view_list.end(),item);
+	view_list.erase(it);
+		
+}
+
+static DView *dview_alloc(running_machine &machine, debug_view_type type, int flags)
+{
+	DView *dv;
+
+	dv = global_alloc(DView(machine, type, flags));
+
+	return dv;
+}
+
+static inline void map_attr_to_fg_bg(unsigned char attr, rgb_t *fg, rgb_t *bg)
+{
+	*bg = rgb_t(0xe6,0xff,0xff,0xff);
+	*fg = rgb_t(0xff,0x00,0x00,0x00);
+
+	if(attr & DCA_ANCILLARY)
+		*bg = rgb_t(0xe6,0xd0,0xd0,0xd0);
+	if(attr & DCA_SELECTED) {
+		*bg = rgb_t(0xe6,0xff,0x80,0x80);
+	}
+	if(attr & DCA_CURRENT) {
+		*bg = rgb_t(0xe6,0xff,0xff,0x00);
+	}
+	if(attr & DCA_CHANGED) {
+		*fg = rgb_t(0xff,0xff,0x00,0x00);
+	}
+	if(attr & DCA_INVALID) {
+		*fg = rgb_t(0xff,0x00,0x00,0xff);
+	}
+	if(attr & DCA_DISABLED) {
+		*fg = rgb_t(fg->a(), (fg->r() + bg->r()) >> 1, (fg->g() + bg->g()) >> 1, (fg->b() + bg->b()) >> 1);
+	}
+	if(attr & DCA_COMMENT) {
+		*fg = rgb_t(0xff,0x00,0x80,0x00);
+	}
+}
+
+void debug_imgui::handle_mouse()
+{
+	m_machine->ui_input().find_mouse(&m_mouse_x, &m_mouse_y, &m_mouse_button);
+}
+
+void debug_imgui::handle_keys()
+{
+        ImGuiIO& io = ImGui::GetIO();
+	ui_event event;
+
+	// global keys
+	if(m_machine->input().code_pressed_once(KEYCODE_F3))
+	{
+		if(m_machine->input().code_pressed(KEYCODE_LSHIFT))
+			m_machine->schedule_hard_reset();
+		else
+		{
+			m_machine->schedule_soft_reset();
+			debug_cpu_get_visible_cpu(*m_machine)->debug()->go();
+		}
+	}
+
+	if(m_machine->input().code_pressed_once(KEYCODE_F5))
+	{
+		debug_cpu_get_visible_cpu(*m_machine)->debug()->go();
+		m_running = true;
+	}
+	if(m_machine->input().code_pressed_once(KEYCODE_F6))
+	{
+		debug_cpu_get_visible_cpu(*m_machine)->debug()->go_next_device();
+		m_running = true;
+	}
+	if(m_machine->input().code_pressed_once(KEYCODE_F7))
+	{
+		debug_cpu_get_visible_cpu(*m_machine)->debug()->go_interrupt();
+		m_running = true;
+	}
+	if(m_machine->input().code_pressed_once(KEYCODE_F8))
+		debug_cpu_get_visible_cpu(*m_machine)->debug()->go_vblank();
+	if(m_machine->input().code_pressed_once(KEYCODE_F9))
+		debug_cpu_get_visible_cpu(*m_machine)->debug()->single_step_out();
+	if(m_machine->input().code_pressed_once(KEYCODE_F10))
+		debug_cpu_get_visible_cpu(*m_machine)->debug()->single_step_over();
+	if(m_machine->input().code_pressed_once(KEYCODE_F11))
+		debug_cpu_get_visible_cpu(*m_machine)->debug()->single_step();
+	if(m_machine->input().code_pressed_once(KEYCODE_F12))
+	{
+		debug_cpu_get_visible_cpu(*m_machine)->debug()->go();
+		m_hide = true;
+	}
+
+/*	if(m_machine->input().code_pressed_once(KEYCODE_UP))
+		io.KeysDown[ImGuiKey_UpArrow] = true;
+	if(m_machine->input().code_pressed_once(KEYCODE_DOWN))
+		io.KeysDown[ImGuiKey_DownArrow] = true;
+	if(m_machine->input().code_pressed_once(KEYCODE_LEFT))
+		io.KeysDown[ImGuiKey_LeftArrow] = true;
+	if(m_machine->input().code_pressed_once(KEYCODE_RIGHT))
+		io.KeysDown[ImGuiKey_RightArrow] = true;
+
+	if(m_machine->input().code_pressed(KEYCODE_TAB))
+		io.KeysDown[ImGuiKey_Tab] = true;
+
+	if(m_machine->input().code_pressed_once(KEYCODE_PGUP))
+	{
+		io.KeysDown[ImGuiKey_PageUp] = true;
+	}
+	if(m_machine->input().code_pressed_once(KEYCODE_PGDN))
+	{
+		io.KeysDown[ImGuiKey_PageDown] = true;
+	}
+
+	if(m_machine->input().code_pressed_once(KEYCODE_HOME))
+	{
+		io.KeysDown[ImGuiKey_Home] = true;
+	}
+	if(m_machine->input().code_pressed_once(KEYCODE_END))
+	{
+		io.KeysDown[ImGuiKey_End] = true;
+	}*/
+	if(m_machine->input().code_pressed(KEYCODE_LCONTROL))
+		io.KeyCtrl = true;
+	else
+		io.KeyCtrl = false;
+	if(m_machine->input().code_pressed(KEYCODE_LSHIFT))
+		io.KeyShift = true;
+	else
+		io.KeyShift = false;
+	if(m_machine->input().code_pressed(KEYCODE_LALT))
+		io.KeyAlt = true;
+	else
+		io.KeyAlt = false;
+
+	for(input_item_id id = ITEM_ID_A; id <= ITEM_ID_CANCEL; id++)
+	{
+		if(m_machine->input().code_pressed(input_code(DEVICE_CLASS_KEYBOARD, 0, ITEM_CLASS_SWITCH, ITEM_MODIFIER_NONE, id)))
+			io.KeysDown[id] = true;
+		else
+			io.KeysDown[id] = false;
+	}
+
+	m_key_char = 0;
+	while (m_machine->ui_input().pop_event(&event))
+	{
+		switch (event.event_type)
+		{
+		case UI_EVENT_CHAR:
+			m_key_char = event.ch;
+			return;
+		default:
+			break;
+		}
+	}
+	
+	if(ImGui::IsKeyPressed(ITEM_ID_D) && ImGui::IsKeyDown(ITEM_ID_LCONTROL))
+		add_disasm(++m_win_count);
+	if(ImGui::IsKeyPressed(ITEM_ID_M) && ImGui::IsKeyDown(ITEM_ID_LCONTROL))
+		add_memory(++m_win_count);
+	if(ImGui::IsKeyPressed(ITEM_ID_B) && ImGui::IsKeyDown(ITEM_ID_LCONTROL))
+		add_bpoints(++m_win_count);
+	if(ImGui::IsKeyPressed(ITEM_ID_W) && ImGui::IsKeyDown(ITEM_ID_LCONTROL))
+		add_wpoints(++m_win_count);
+
+	m_machine->ui_input().reset();  // clear remaining inputs, so they don't fall through to the UI
+}
+
+void debug_imgui::handle_console(running_machine* machine)
+{
+	if(view_main_console->exec_cmd && view_main_console->type == DVT_CONSOLE)
+	{
+		if(strlen(view_main_console->console_input) > 0)
+			debug_console_execute_command(*m_machine, view_main_console->console_input, 1);
+		// check for commands that start execution (so that input fields can be disabled)
+		if(strcmp(view_main_console->console_input,"g") == 0)
+			m_running = true;
+		if(strncmp(view_main_console->console_input,"g ",2) == 0)
+			m_running = true;
+		if(strcmp(view_main_console->console_input,"go") == 0)
+			m_running = true;
+		if(strncmp(view_main_console->console_input,"go ",3) == 0)
+			m_running = true;
+		if(strcmp(view_main_console->console_input,"gi") == 0)
+			m_running = true;
+		if(strncmp(view_main_console->console_input,"gi ",3) == 0)
+			m_running = true;
+		if(strcmp(view_main_console->console_input,"gint") == 0)
+			m_running = true;
+		if(strncmp(view_main_console->console_input,"gint ",5) == 0)
+			m_running = true;
+		if(strcmp(view_main_console->console_input,"gt") == 0)
+			m_running = true;
+		if(strncmp(view_main_console->console_input,"gt ",3) == 0)
+			m_running = true;
+		if(strcmp(view_main_console->console_input,"gtime") == 0)
+			m_running = true;
+		if(strncmp(view_main_console->console_input,"gtime ",6) == 0)
+			m_running = true;
+		if(strcmp(view_main_console->console_input,"n") == 0)
+			m_running = true;
+		if(strcmp(view_main_console->console_input,"next") == 0)
+			m_running = true;
+		strcpy(view_main_console->console_input,"");
+		view_main_console->exec_cmd = false;
+	}
+}
+
+void debug_imgui::update_cpu_view(device_t* device)
+{
+	const debug_view_source *source;
+	source = view_main_disasm->view->source_for_device(device);
+	view_main_disasm->view->set_source(*source);
+	source = view_main_regs->view->source_for_device(device);
+	view_main_regs->view->set_source(*source);
+}
+
+void debug_imgui::draw_bpoints(DView* view_ptr, bool* opened)
+{
+	ImGui::SetNextWindowSize(ImVec2(view_ptr->width,view_ptr->height + ImGui::GetTextLineHeight()),ImGuiSetCond_Once);
+	if(ImGui::Begin(view_ptr->title.c_str(),opened))
+	{
+		rgb_t bg, fg;
+		rgb_t base(0xe6, 0xff, 0xff, 0xff);
+		const debug_view_char *viewdata;
+		debug_view_xy vsize,totalsize;
+		unsigned char v;
+		int x,y;
+
+		viewdata = view_ptr->view->viewdata();
+		totalsize = view_ptr->view->total_size();
+		view_ptr->view->set_visible_size(totalsize);
+		vsize = view_ptr->view->visible_size();
+		
+		ImGui::BeginChild("##break_output", ImVec2(ImGui::GetWindowWidth() - 16,ImGui::GetWindowHeight() - ImGui::GetTextLineHeight() - ImGui::GetCursorPosY()));  // account for title bar and widgets already drawn
+		ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(0,0));
+		ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing, ImVec2(0,0));
+		for(y=0;y<vsize.y;y++)
+		{
+			for(x=0;x<vsize.x;x++)
+			{
+				ImVec2 xy1,xy2;
+				char str[2];
+				map_attr_to_fg_bg(viewdata->attrib,&fg,&bg);
+				str[0] = v = viewdata->byte;
+				str[1] = '\0';
+				if(bg != base)
+				{
+					ImU32 bg_col = ImGui::ColorConvertFloat4ToU32(ImVec4(bg.r()/255.0f,bg.g()/255.0f,bg.b()/255.0f,bg.a()/255.0f));
+					xy1.x = ImGui::GetCursorScreenPos().x + 1;
+					xy1.y = ImGui::GetCursorScreenPos().y;
+					xy2 = ImGui::CalcTextSize(str);
+					xy2.x += ImGui::GetCursorScreenPos().x + 1;
+					xy2.y += ImGui::GetCursorScreenPos().y;
+					ImGui::GetWindowDrawList()->AddRectFilled(xy1,xy2,bg_col);
+				}
+				ImGui::PushStyleColor(ImGuiCol_Text,ImVec4(fg.r()/255.0f,fg.g()/255.0f,fg.b()/255.0f,fg.a()/255.0f));
+				ImGui::Text("%c",v);
+				ImGui::PopStyleColor();
+				if(x<vsize.x - 1)
+					ImGui::SameLine();
+				viewdata++;
+			}
+		}
+		ImGui::PopStyleVar(2);
+		ImGui::EndChild();
+
+		ImGui::End();
+	}
+}
+
+void debug_imgui::add_bpoints(int id)
+{
+	std::stringstream str;
+	DView* new_view;
+	new_view = dview_alloc(*m_machine, DVT_BREAK_POINTS, 0);
+	str << id;
+	str << ": Breakpoints";
+	new_view->title = str.str();
+	new_view->width = 500;
+	new_view->height = 300;
+	new_view->ofs_x = 0;
+	new_view->ofs_y = 0;
+	view_list_add(new_view);
+}
+
+void debug_imgui::add_wpoints(int id)
+{
+	std::stringstream str;
+	DView* new_view;
+	new_view = dview_alloc(*m_machine, DVT_WATCH_POINTS, 0);
+	str << id;
+	str << ": Watchpoints";
+	new_view->title = str.str();
+	new_view->width = 500;
+	new_view->height = 300;
+	new_view->ofs_x = 0;
+	new_view->ofs_y = 0;
+	view_list_add(new_view);
+}
+
+void debug_imgui::draw_disasm(DView* view_ptr, bool* opened)
+{
+	std::string cpu_list = "";
+	const debug_view_source* src = view_ptr->view->first_source();
+
+	// build source CPU list	
+	while(src != nullptr)
+	{
+		cpu_list += src->name();
+		cpu_list += '\0';
+		src = src->next();
+	}
+	cpu_list += '\0'; // end of list
+
+	ImGui::SetNextWindowSize(ImVec2(view_ptr->width,view_ptr->height + ImGui::GetTextLineHeight()),ImGuiSetCond_Once);
+	if(ImGui::Begin(view_ptr->title.c_str(),opened,ImGuiWindowFlags_MenuBar))
+	{
+		rgb_t bg, fg;
+		rgb_t base(0xe6, 0xff, 0xff, 0xff);
+		const debug_view_char *viewdata;
+		debug_view_xy vsize,totalsize;
+		unsigned char v;
+		int x,y,idx;
+		bool done = false;
+
+		if(ImGui::BeginMenuBar())
+		{
+			if(ImGui::BeginMenu("Options"))
+			{
+				debug_view_disasm* disasm = downcast<debug_view_disasm*>(view_ptr->view);
+				int rightcol = disasm->right_column();
+
+				if(ImGui::MenuItem("Raw opcodes",NULL,(rightcol == DASM_RIGHTCOL_RAW) ? true : false))
+					disasm->set_right_column(DASM_RIGHTCOL_RAW);
+				if(ImGui::MenuItem("Encrypted opcodes",NULL,(rightcol == DASM_RIGHTCOL_ENCRYPTED) ? true : false))
+					disasm->set_right_column(DASM_RIGHTCOL_ENCRYPTED);
+				if(ImGui::MenuItem("No opcodes",NULL,(rightcol == DASM_RIGHTCOL_NONE) ? true : false))
+					disasm->set_right_column(DASM_RIGHTCOL_NONE);
+				if(ImGui::MenuItem("Comments",NULL,(rightcol == DASM_RIGHTCOL_COMMENTS) ? true : false))
+					disasm->set_right_column(DASM_RIGHTCOL_COMMENTS);
+					
+				ImGui::EndMenu();
+			}
+			ImGui::EndMenuBar();
+		}
+
+		ImGuiInputTextFlags flags = ImGuiInputTextFlags_EnterReturnsTrue;
+		if(m_running)
+			flags |= ImGuiInputTextFlags_ReadOnly;
+		ImGui::Combo("##cpu",&view_ptr->src_sel,cpu_list.c_str());
+		ImGui::SameLine();
+		ImGui::PushItemWidth(-1.0f);
+		if(ImGui::InputText("##addr",view_ptr->console_input,512,flags))
+			downcast<debug_view_disasm *>(view_ptr->view)->set_expression(view_ptr->console_input);
+		ImGui::PopItemWidth();
+		ImGui::Separator();
+
+		// disassembly portion
+		viewdata = view_ptr->view->viewdata();
+		totalsize = view_ptr->view->total_size();
+		totalsize.y = 50;
+		view_ptr->view->set_visible_size(totalsize);
+		vsize = view_ptr->view->visible_size();
+		
+		ImGui::BeginChild("##disasm_output", ImVec2(ImGui::GetWindowWidth() - 16,ImGui::GetWindowHeight() - ImGui::GetTextLineHeight() - ImGui::GetCursorPosY()));  // account for title bar and widgets already drawn
+		src = view_ptr->view->first_source();
+		idx = 0;
+		while (!done)
+		{
+			if(view_ptr->src_sel == idx)
+				view_ptr->view->set_source(*src);
+			idx++;
+			src = src->next();
+			if(src == nullptr)
+				done = true;
+		}
+		ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(0,0));
+		ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing, ImVec2(0,0));
+		for(y=0;y<vsize.y;y++)
+		{
+			for(x=0;x<vsize.x;x++)
+			{
+				ImVec2 xy1,xy2;
+				char str[2];
+				map_attr_to_fg_bg(viewdata->attrib,&fg,&bg);
+				str[0] = v = viewdata->byte;
+				str[1] = '\0';
+				if(bg != base)
+				{
+					ImU32 bg_col = ImGui::ColorConvertFloat4ToU32(ImVec4(bg.r()/255.0f,bg.g()/255.0f,bg.b()/255.0f,bg.a()/255.0f));
+					xy1.x = ImGui::GetCursorScreenPos().x + 1;
+					xy1.y = ImGui::GetCursorScreenPos().y;
+					xy2 = ImGui::CalcTextSize(str);
+					xy2.x += ImGui::GetCursorScreenPos().x + 1;
+					xy2.y += ImGui::GetCursorScreenPos().y;
+					ImGui::GetWindowDrawList()->AddRectFilled(xy1,xy2,bg_col);
+				}
+				ImGui::PushStyleColor(ImGuiCol_Text,ImVec4(fg.r()/255.0f,fg.g()/255.0f,fg.b()/255.0f,fg.a()/255.0f));
+				ImGui::Text("%c",v);
+				ImGui::PopStyleColor();
+				if(x<vsize.x - 1)
+					ImGui::SameLine();
+				viewdata++;
+			}
+		}
+		ImGui::PopStyleVar(2);
+		ImGui::EndChild();
+
+		ImGui::End();
+	}
+}
+
+void debug_imgui::add_disasm(int id)
+{
+	std::stringstream str;
+	DView* new_view;
+	new_view = dview_alloc(*m_machine, DVT_DISASSEMBLY, 0);
+	str << id;
+	str << ": Disassembly";
+	new_view->title = str.str();
+	new_view->width = 500;
+	new_view->height = 300;
+	new_view->ofs_x = 0;
+	new_view->ofs_y = 0;
+	new_view->src_sel = 0;
+	strcpy(new_view->console_input,"curpc");
+	view_list_add(new_view);
+}
+
+void debug_imgui::draw_memory(DView* view_ptr, bool* opened)
+{
+	std::string region_list = "";
+	const debug_view_source* src = view_ptr->view->first_source();
+
+	ImGui::SetNextWindowSize(ImVec2(view_ptr->width,view_ptr->height + ImGui::GetTextLineHeight()),ImGuiSetCond_Once);
+	if(ImGui::Begin(view_ptr->title.c_str(),opened,ImGuiWindowFlags_MenuBar))
+	{
+		rgb_t bg, fg;
+		rgb_t base(0xe6, 0xff, 0xff, 0xff);
+		const debug_view_char *viewdata;
+		debug_view_xy vsize,totalsize;
+		unsigned char v;
+		int x,y,idx;
+		bool done = false;
+		
+		if(ImGui::BeginMenuBar())
+		{
+			if(ImGui::BeginMenu("Options"))
+			{
+				debug_view_memory* mem = downcast<debug_view_memory*>(view_ptr->view);
+				bool physical = mem->physical();
+				bool rev = mem->reverse();
+				int format = mem->get_data_format();
+				UINT32 chunks = mem->chunks_per_row();
+				
+				if(ImGui::MenuItem("1-byte chunks",NULL,(format == 1) ? true : false))
+					mem->set_data_format(1);
+				if(ImGui::MenuItem("2-byte chunks",NULL,(format == 2) ? true : false))
+					mem->set_data_format(2);
+				if(ImGui::MenuItem("4-byte chunks",NULL,(format == 4) ? true : false))
+					mem->set_data_format(4);
+				if(ImGui::MenuItem("8-byte chunks",NULL,(format == 8) ? true : false))
+					mem->set_data_format(8);
+				if(ImGui::MenuItem("32-bit floating point",NULL,(format == 9) ? true : false))
+					mem->set_data_format(9);
+				if(ImGui::MenuItem("64-bit floating point",NULL,(format == 10) ? true : false))
+					mem->set_data_format(10);
+				if(ImGui::MenuItem("80-bit floating point",NULL,(format == 11) ? true : false))
+					mem->set_data_format(11);
+				ImGui::Separator();
+				if(ImGui::MenuItem("Logical addresses",NULL,!physical))
+					mem->set_physical(false);
+				if(ImGui::MenuItem("Physical addresses",NULL,physical))
+					mem->set_physical(true);
+				ImGui::Separator();
+				if(ImGui::MenuItem("Reverse view",NULL,rev))
+					mem->set_reverse(!rev);
+				ImGui::Separator();
+				if(ImGui::MenuItem("Increase bytes per line"))
+					mem->set_chunks_per_row(chunks+1);
+				if(ImGui::MenuItem("Decrease bytes per line"))
+					mem->set_chunks_per_row(chunks-1);
+
+				ImGui::EndMenu();
+			}
+			ImGui::EndMenuBar();
+		}
+		
+		ImGuiInputTextFlags flags = ImGuiInputTextFlags_EnterReturnsTrue;
+		ImGui::PushItemWidth(100.0f);
+		if(m_running)
+			flags |= ImGuiInputTextFlags_ReadOnly;
+		// build source CPU list	
+		while(src != nullptr)
+		{
+			region_list += src->name();
+			region_list += '\0';
+			src = src->next();
+		}
+		region_list += '\0'; // end of list
+		if(ImGui::InputText("##addr",view_ptr->console_input,512,flags))
+			downcast<debug_view_memory *>(view_ptr->view)->set_expression(view_ptr->console_input);
+		ImGui::PopItemWidth();
+		ImGui::SameLine();
+		ImGui::PushItemWidth(-1.0f);
+		ImGui::Combo("##region",&view_ptr->src_sel,region_list.c_str());
+		ImGui::PopItemWidth();
+		ImGui::Separator();
+		
+		// memory editor portion
+		viewdata = view_ptr->view->viewdata();
+		totalsize = view_ptr->view->total_size();
+		if(totalsize.y > 256)
+			totalsize.y = 256;
+		view_ptr->view->set_visible_size(totalsize);
+		vsize = view_ptr->view->visible_size();
+		
+		ImGui::BeginChild("##memory_output", ImVec2(ImGui::GetWindowWidth() - 16,ImGui::GetWindowHeight() - ImGui::GetTextLineHeight() - ImGui::GetCursorPosY()));  // account for title bar and widgets already drawn
+		src = view_ptr->view->first_source();
+		idx = 0;
+		while (!done)
+		{
+			if(view_ptr->src_sel == idx)
+				view_ptr->view->set_source(*src);
+			idx++;
+			src = src->next();
+			if(src == nullptr)
+				done = true;
+		}
+		ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(0,0));
+		ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing, ImVec2(0,0));
+		for(y=0;y<vsize.y;y++)
+		{
+			for(x=0;x<vsize.x;x++)
+			{
+				ImVec2 xy1,xy2;
+				char str[2];
+				map_attr_to_fg_bg(viewdata->attrib,&fg,&bg);
+				str[0] = v = viewdata->byte;
+				str[1] = '\0';
+				if(bg != base)
+				{
+					ImU32 bg_col = ImGui::ColorConvertFloat4ToU32(ImVec4(bg.r()/255.0f,bg.g()/255.0f,bg.b()/255.0f,bg.a()/255.0f));
+					xy1.x = ImGui::GetCursorScreenPos().x + 1;
+					xy1.y = ImGui::GetCursorScreenPos().y;
+					xy2 = ImGui::CalcTextSize(str);
+					xy2.x += ImGui::GetCursorScreenPos().x + 1;
+					xy2.y += ImGui::GetCursorScreenPos().y;
+					ImGui::GetWindowDrawList()->AddRectFilled(xy1,xy2,bg_col);
+				}
+				ImGui::PushStyleColor(ImGuiCol_Text,ImVec4(fg.r()/255.0f,fg.g()/255.0f,fg.b()/255.0f,fg.a()/255.0f));
+				ImGui::Text("%c",v);
+				ImGui::PopStyleColor();
+				if(x<vsize.x - 1)
+					ImGui::SameLine();
+				viewdata++;
+			}
+		}
+		ImGui::PopStyleVar(2);
+		ImGui::EndChild();
+
+		ImGui::End();
+	}
+}
+
+void debug_imgui::add_memory(int id)
+{
+	std::stringstream str;
+	DView* new_view;
+	new_view = dview_alloc(*m_machine, DVT_MEMORY, 0);
+	str << id;
+	str << ": Memory";
+	new_view->title = str.str();
+	new_view->width = 500;
+	new_view->height = 300;
+	new_view->ofs_x = 0;
+	new_view->ofs_y = 0;
+	new_view->src_sel = 0;
+	strcpy(new_view->console_input,"0");
+	view_list_add(new_view);
+}
+
+void debug_imgui::draw_console()
+{
+	rgb_t bg, fg;
+	rgb_t base(0xe6, 0xff, 0xff, 0xff);
+	ImGuiWindowFlags flags = ImGuiWindowFlags_MenuBar | ImGuiWindowFlags_NoCollapse | ImGuiWindowFlags_NoScrollbar | ImGuiWindowFlags_NoScrollWithMouse;
+
+	ImGui::SetNextWindowSize(ImVec2(view_main_regs->width + view_main_disasm->width,view_main_disasm->height + view_main_console->height + ImGui::GetTextLineHeight()*3),ImGuiSetCond_Once);
+	if(ImGui::Begin(view_main_console->title.c_str(),NULL,flags))
+	{
+		const debug_view_char *viewdata;
+		debug_view_xy vsize,totalsize;
+		unsigned char v;
+		int x,y;
+
+		if(ImGui::BeginMenuBar())
+		{
+			if(ImGui::BeginMenu("Debug"))
+			{
+				if(ImGui::MenuItem("New disassembly window", "Ctrl+D"))
+					add_disasm(++m_win_count);
+				if(ImGui::MenuItem("New memory window", "Ctrl+M")) 
+					add_memory(++m_win_count);
+				if(ImGui::MenuItem("New breakpoints window", "Ctrl+B")) 
+					add_bpoints(++m_win_count);
+				if(ImGui::MenuItem("New watchpoints window", "Ctrl+W")) 
+					add_wpoints(++m_win_count);
+				ImGui::Separator();
+				if(ImGui::MenuItem("Run", "F5"))
+				{
+					debug_cpu_get_visible_cpu(*m_machine)->debug()->go();
+					m_running = true;
+				}
+				if(ImGui::MenuItem("Go to next CPU", "F6"))
+				{
+					debug_cpu_get_visible_cpu(*m_machine)->debug()->go_next_device();
+					m_running = true;
+				}
+				if(ImGui::MenuItem("Run until next interrupt", "F7"))
+				{
+					debug_cpu_get_visible_cpu(*m_machine)->debug()->go_interrupt();
+					m_running = true;
+				}
+				if(ImGui::MenuItem("Run until VBLANK", "F8"))
+					debug_cpu_get_visible_cpu(*m_machine)->debug()->go_vblank();
+				if(ImGui::MenuItem("Run and hide debugger", "F12"))
+				{
+					debug_cpu_get_visible_cpu(*m_machine)->debug()->go();
+					m_hide = true;
+				}
+				ImGui::Separator();
+				if(ImGui::MenuItem("Single step", "F11"))
+					debug_cpu_get_visible_cpu(*m_machine)->debug()->single_step();
+				if(ImGui::MenuItem("Step over", "F10"))
+					debug_cpu_get_visible_cpu(*m_machine)->debug()->single_step_over();
+				if(ImGui::MenuItem("Step out", "F9"))
+					debug_cpu_get_visible_cpu(*m_machine)->debug()->single_step_out();
+				
+				ImGui::EndMenu();
+			}
+			if(ImGui::BeginMenu("Window"))
+			{
+				if(ImGui::MenuItem("Show all"))
+				{
+					for(std::vector<DView*>::iterator view_ptr = view_list.begin();view_ptr != view_list.end();++view_ptr)
+						ImGui::SetWindowCollapsed((*view_ptr)->title.c_str(),false);
+				}
+				ImGui::Separator();
+				// list all extra windows, so we can un-collapse the windows if necessary
+				//DView* view_ptr;
+				for(std::vector<DView*>::iterator view_ptr = view_list.begin();view_ptr != view_list.end();++view_ptr)
+				{
+					bool collapsed;
+					if(ImGui::Begin((*view_ptr)->title.c_str()))
+					{
+						collapsed = false;
+						ImGui::End();
+					}
+					else
+					{
+						collapsed = true;
+						ImGui::End();
+					}
+					if(ImGui::MenuItem((*view_ptr)->title.c_str(),NULL,!collapsed))
+						ImGui::SetWindowCollapsed((*view_ptr)->title.c_str(),false);
+				}
+				ImGui::EndMenu();
+			}
+			ImGui::EndMenuBar();
+		}
+		
+		// CPU state portion
+		viewdata = view_main_regs->view->viewdata();
+		totalsize = view_main_regs->view->total_size();
+		view_main_regs->view->set_visible_size(totalsize);
+		vsize = view_main_regs->view->visible_size();
+		
+		ImGui::BeginChild("##state_output", ImVec2(180,ImGui::GetWindowHeight() - ImGui::GetTextLineHeight()*2));  // account for title bar and menu
+		ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(0,0));
+		ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing, ImVec2(0,0));
+		for(y=0;y<vsize.y;y++)
+		{
+			for(x=0;x<vsize.x;x++)
+			{
+				map_attr_to_fg_bg(viewdata->attrib,&fg,&bg);
+				v = viewdata->byte;
+				ImGui::PushStyleColor(ImGuiCol_Text,ImVec4(fg.r()/255.0f,fg.g()/255.0f,fg.b()/255.0f,fg.a()/255.0f));
+				ImGui::Text("%c",v);
+				ImGui::PopStyleColor();
+				if(x<vsize.x - 1)
+					ImGui::SameLine();
+				viewdata++;
+			}
+		}
+		ImGui::PopStyleVar(2);
+		ImGui::EndChild();
+
+		ImGui::SameLine();
+
+		ImGui::BeginChild("##right_side", ImVec2(ImGui::GetWindowWidth() - ImGui::GetCursorPosX() - 8,ImGui::GetWindowHeight() - ImGui::GetTextLineHeight()*2));
+		// disassembly portion
+		viewdata = view_main_disasm->view->viewdata();
+		totalsize = view_main_disasm->view->total_size();
+		totalsize.y = 20;
+		view_main_disasm->view->set_visible_size(totalsize);
+//		height = ImGui::GetTextLineHeight();
+		vsize = view_main_disasm->view->visible_size();
+		
+		ImGui::BeginChild("##disasm_output", ImVec2(ImGui::GetWindowWidth() - ImGui::GetCursorPosX() - 8,(ImGui::GetWindowHeight() - ImGui::GetTextLineHeight()*4)/2));
+		ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(0,0));
+		ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing, ImVec2(0,0));
+		for(y=0;y<vsize.y;y++)
+		{
+			for(x=0;x<vsize.x;x++)
+			{
+				ImVec2 xy1,xy2;
+				char str[2];
+				map_attr_to_fg_bg(viewdata->attrib,&fg,&bg);
+				str[0] = v = viewdata->byte;
+				str[1] = '\0';
+				if(bg != base)
+				{
+					ImU32 bg_col = ImGui::ColorConvertFloat4ToU32(ImVec4(bg.r()/255.0f,bg.g()/255.0f,bg.b()/255.0f,bg.a()/255.0f));
+					xy1.x = ImGui::GetCursorScreenPos().x + 1;
+					xy1.y = ImGui::GetCursorScreenPos().y;
+					xy2 = ImGui::CalcTextSize(str);
+					xy2.x += ImGui::GetCursorScreenPos().x + 1;
+					xy2.y += ImGui::GetCursorScreenPos().y;
+					ImGui::GetWindowDrawList()->AddRectFilled(xy1,xy2,bg_col);
+				}
+				ImGui::PushStyleColor(ImGuiCol_Text,ImVec4(fg.r()/255.0f,fg.g()/255.0f,fg.b()/255.0f,fg.a()/255.0f));
+				ImGui::Text("%c",v);
+				ImGui::PopStyleColor();
+				if(x<vsize.x - 1)
+					ImGui::SameLine();
+				viewdata++;
+			}
+		}
+		ImGui::PopStyleVar(2);
+		ImGui::EndChild();
+
+		ImGui::Separator();
+
+		// console portion
+		viewdata = view_main_console->view->viewdata();
+		totalsize = view_main_console->view->total_size();
+		view_main_console->view->set_visible_size(totalsize);
+//		height = ImGui::GetTextLineHeight();
+		vsize = view_main_console->view->visible_size();
+
+		ImGui::BeginChild("##console_output", ImVec2(ImGui::GetWindowWidth() - ImGui::GetCursorPosX() - 8,(ImGui::GetWindowHeight() - ImGui::GetTextLineHeight()*4)/2 - ImGui::GetTextLineHeight()));
+		ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(0,0));
+		ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing, ImVec2(0,0));
+		for(y=0;y<vsize.y;y++)
+		{
+			for(x=0;x<vsize.x;x++)
+			{
+				v = viewdata->byte;
+				ImGui::Text("%c",v);
+				if(x<vsize.x - 1)
+					ImGui::SameLine();
+				viewdata++;
+			}
+		}
+		ImGui::PopStyleVar(2);
+		ImGui::EndChild();
+		ImGui::Separator();
+		//if(ImGui::IsWindowFocused())
+		//	ImGui::SetKeyboardFocusHere();
+		ImGuiInputTextFlags flags = ImGuiInputTextFlags_EnterReturnsTrue;
+		if(m_running)
+			flags |= ImGuiInputTextFlags_ReadOnly;
+		ImGui::PushItemWidth(-1.0f);
+		if(ImGui::InputText("##console_input",view_main_console->console_input,512,flags))
+			view_main_console->exec_cmd = true;
+		ImGui::PopItemWidth();
+		ImGui::EndChild();
+		ImGui::End();
+	}
+}
+
+void debug_imgui::update()
+{
+	DView* to_delete = nullptr;
+	//DView* view_ptr = view_list;
+	std::vector<DView*>::iterator view_ptr;
+	bool opened;
+	int count = 0;
+	ImGui::PushStyleColor(ImGuiCol_WindowBg,ImVec4(1.0f,1.0f,1.0f,0.9f));
+	ImGui::PushStyleColor(ImGuiCol_Text,ImVec4(0.0f,0.0f,0.0f,1.0f));
+	ImGui::PushStyleColor(ImGuiCol_TextDisabled,ImVec4(0.0f,0.0f,1.0f,1.0f));
+	ImGui::PushStyleColor(ImGuiCol_FrameBg,ImVec4(0.5f,0.5f,0.5f,0.9f));
+	ImGui::PushStyleColor(ImGuiCol_PopupBg,ImVec4(0.8f,0.8f,0.8f,0.9f));
+	ImGui::PushStyleColor(ImGuiCol_ScrollbarGrab,ImVec4(0.6f,0.6f,0.6f,0.9f));
+	ImGui::PushStyleColor(ImGuiCol_ScrollbarGrabHovered,ImVec4(0.7f,0.7f,0.7f,0.9f));
+	ImGui::PushStyleColor(ImGuiCol_ScrollbarGrabActive,ImVec4(0.9f,0.9f,0.9f,0.9f));
+
+	draw_console();  // We'll always have a console window
+
+	view_ptr = view_list.begin();
+	while(view_ptr != view_list.end())
+	{
+		opened = true;
+		switch((*view_ptr)->type)
+		{
+		case DVT_DISASSEMBLY:
+			draw_disasm((*view_ptr),&opened);
+			if(opened == false)
+				to_delete = (*view_ptr);
+			break;
+		case DVT_MEMORY:
+			draw_memory((*view_ptr),&opened);
+			if(opened == false)
+				to_delete = (*view_ptr);
+			break;
+		case DVT_BREAK_POINTS:
+		case DVT_WATCH_POINTS:  // watchpoints window uses same drawing code as breakpoints window
+			draw_bpoints((*view_ptr),&opened);
+			if(opened == false)
+				to_delete = (*view_ptr);
+			break;
+		}
+		view_ptr++;
+		count++;
+	}
+	// check for a closed window
+	if(to_delete != nullptr)
+	{
+		view_list_remove(to_delete);
+		global_free(to_delete);
+	}
+	ImGui::PopStyleColor(8);
+}
+
+void debug_imgui::init_debugger(running_machine &machine)
+{
+        ImGuiIO& io = ImGui::GetIO();
+	m_machine = &machine;
+	if(strcmp(downcast<osd_options &>(m_machine->options()).video(),"bgfx") != 0)
+		fatalerror("Error: ImGui debugger requires the BGFX renderer.\n");
+
+	io.KeyMap[ImGuiKey_A] = ITEM_ID_A;
+	io.KeyMap[ImGuiKey_C] = ITEM_ID_C;
+	io.KeyMap[ImGuiKey_V] = ITEM_ID_V;
+	io.KeyMap[ImGuiKey_X] = ITEM_ID_X;
+	io.KeyMap[ImGuiKey_C] = ITEM_ID_C;
+	io.KeyMap[ImGuiKey_Y] = ITEM_ID_Y;
+	io.KeyMap[ImGuiKey_Z] = ITEM_ID_Z;
+	io.KeyMap[ImGuiKey_Backspace] = ITEM_ID_BACKSPACE;
+	io.KeyMap[ImGuiKey_Delete] = ITEM_ID_DEL;
+	io.KeyMap[ImGuiKey_Tab] = ITEM_ID_TAB;
+	io.KeyMap[ImGuiKey_PageUp] = ITEM_ID_PGUP;
+	io.KeyMap[ImGuiKey_PageDown] = ITEM_ID_PGDN;
+	io.KeyMap[ImGuiKey_Home] = ITEM_ID_HOME;
+	io.KeyMap[ImGuiKey_End] = ITEM_ID_END;
+	io.KeyMap[ImGuiKey_Escape] = ITEM_ID_ESC;
+	io.KeyMap[ImGuiKey_Enter] = ITEM_ID_ENTER;
+
+	font_name = (downcast<osd_options &>(m_machine->options()).debugger_font());
+	font_size = (downcast<osd_options &>(m_machine->options()).debugger_font_size());
+
+	if(font_size == 0)
+		font_size = 12;
+
+	io.Fonts->Clear();
+	if(!strcmp(font_name, OSDOPTVAL_AUTO))
+		io.Fonts->AddFontDefault();
+	else
+		io.Fonts->AddFontFromFileTTF(font_name,font_size);  // for now, font name must be a path to a TTF file
+	m_font = imguiCreate();
+	imguiSetFont(m_font);
+}
+
+void debug_imgui::wait_for_debugger(device_t &device, bool firststop)
+{
+	UINT32 width = m_machine->render().ui_target().width();
+	UINT32 height = m_machine->render().ui_target().height();
+	if(firststop && view_list.empty())
+	{
+		view_main_console = dview_alloc(device.machine(), DVT_CONSOLE, VIEW_STATE_FOLLOW_CPU);
+		view_main_console->title = "MAME Debugger";
+		view_main_console->width = 500;
+		view_main_console->height = 200;
+		view_main_console->ofs_x = 0;
+		view_main_console->ofs_y = 0;
+		view_main_disasm = dview_alloc(device.machine(), DVT_DISASSEMBLY, VIEW_STATE_FOLLOW_CPU);
+		view_main_disasm->width = 500;
+		view_main_disasm->height = 200;
+		view_main_regs = dview_alloc(device.machine(), DVT_STATE, VIEW_STATE_FOLLOW_CPU);
+		view_main_regs->width = 180;
+		view_main_regs->height = 440;
+		strcpy(view_main_console->console_input,"");  // clear console input
+	}
+	if(firststop)
+	{
+//		debug_show_all();
+		device.machine().ui_input().reset();
+		m_running = false;
+	}
+	m_hide = false;
+//	m_machine->ui_input().frame_update();
+	handle_mouse();
+	handle_keys();
+	handle_console(m_machine);
+	update_cpu_view(&device);
+	imguiBeginFrame(m_mouse_x,m_mouse_y,m_mouse_button ? IMGUI_MBUT_LEFT : 0, 0, width, height,m_key_char);
+	update();
+	imguiEndFrame();
+	device.machine().osd().update(false);
+}
+
+
+void debug_imgui::debugger_update()
+{
+	if ((m_machine != nullptr) && (!debug_cpu_is_stopped(*m_machine)) && (m_machine->phase() == MACHINE_PHASE_RUNNING) && !m_hide)
+	{
+		UINT32 width = m_machine->render().ui_target().width();
+		UINT32 height = m_machine->render().ui_target().height();
+		handle_mouse();
+		handle_keys();
+		imguiBeginFrame(m_mouse_x,m_mouse_y,m_mouse_button ? IMGUI_MBUT_LEFT : 0, 0, width, height, m_key_char);
+		update();
+		imguiEndFrame();
+	}
+}
+
+MODULE_DEFINITION(DEBUG_IMGUI, debug_imgui)
diff --git a/src/osd/modules/lib/osdobj_common.cpp b/src/osd/modules/lib/osdobj_common.cpp
index c9d4a37798d..e8f344028b0 100644
--- a/src/osd/modules/lib/osdobj_common.cpp
+++ b/src/osd/modules/lib/osdobj_common.cpp
@@ -217,6 +217,7 @@ void osd_common_t::register_options()
 	REGISTER_MODULE(m_mod_man, DEBUG_WINDOWS);
 	REGISTER_MODULE(m_mod_man, DEBUG_QT);
 	REGISTER_MODULE(m_mod_man, DEBUG_INTERNAL);
+	REGISTER_MODULE(m_mod_man, DEBUG_IMGUI);
 	REGISTER_MODULE(m_mod_man, DEBUG_NONE);
 #endif
 

From 60eb6d0494144c7bd2ba23fff16aca4e3334b995 Mon Sep 17 00:00:00 2001
From: ImJezze <jezze@gmx.net>
Date: Sun, 17 Apr 2016 11:39:18 +0200
Subject: [PATCH 044/122] Added reasonable texcoord handling without known
 examples (nw)

---
 src/emu/render.cpp | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/emu/render.cpp b/src/emu/render.cpp
index 6f42d26c3c7..a26bab1849e 100644
--- a/src/emu/render.cpp
+++ b/src/emu/render.cpp
@@ -1890,16 +1890,16 @@ void render_target::add_container_primitives(render_primitive_list &list, const
 
 					if (PRIMFLAG_GET_VECTORBUF(curitem.flags()))
 					{
-						// flags S swap-xy, Y flip-y, X flip-x
+						// flags X(1) flip-x, Y(2) flip-y, S(4) swap-xy
 						//
-						// S  Y  X   e.g.       flips
+						// X  Y  S   e.g.       flips
 						// 0  0  0   asteroid   !X !Y
-						// 0  0  1   -
+						// 0  0  1   -           X  Y
 						// 0  1  0   speedfrk   !X  Y
-						// 0  1  1   solarq      X  Y
-						// 1  0  0   -
-						// 1  0  1   -
-						// 1  1  0   tempest    !X  Y
+						// 0  1  1   tempest    !X  Y
+						// 1  0  0   -           X !Y
+						// 1  0  1   -           x !Y
+						// 1  1  0   solarq      X  Y
 						// 1  1  1   barrier    !X !Y
 
 						bool flip_x = (manager().machine().system().flags & ORIENTATION_FLIP_X) == ORIENTATION_FLIP_X;
@@ -1915,13 +1915,13 @@ void render_target::add_container_primitives(render_primitive_list &list, const
 						{
 							vectororient |= ORIENTATION_FLIP_Y;
 						}
-						if (flip_x && flip_y && swap_xy)
+						if ((flip_x && flip_y && swap_xy) || (!flip_x && !flip_y && swap_xy))
 						{
-							vectororient ^= ORIENTATION_FLIP_Y;
 							vectororient ^= ORIENTATION_FLIP_X;
+							vectororient ^= ORIENTATION_FLIP_Y;
 						}
 
-						// determine the final orientation (textures are up-side down, so flip y-axis for vectors to immitate that behavior)
+						// determine the final orientation (textures are up-side down, so flip axis for vectors to immitate that behavior)
 						int finalorient = orientation_add(vectororient, container_xform.orientation);
 
 						// determine UV coordinates

From a45d713ad60f911935f5ce55680aaf539eb4abc4 Mon Sep 17 00:00:00 2001
From: ImJezze <jezze@gmx.net>
Date: Sun, 17 Apr 2016 14:20:27 +0200
Subject: [PATCH 045/122] HLSL settings are reset now, when a new machine is
 selected

---
 src/osd/modules/render/d3d/d3dhlsl.cpp | 12 ++++++++++--
 src/osd/modules/render/d3d/d3dhlsl.h   |  1 +
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/osd/modules/render/d3d/d3dhlsl.cpp b/src/osd/modules/render/d3d/d3dhlsl.cpp
index 5289d3b85d5..4ee6fcbd5ac 100644
--- a/src/osd/modules/render/d3d/d3dhlsl.cpp
+++ b/src/osd/modules/render/d3d/d3dhlsl.cpp
@@ -643,10 +643,16 @@ void shaders::init(d3d_base *d3dintf, running_machine *machine, renderer_d3d9 *r
 	// check if no driver loaded (not all settings might be loaded yet)
 	if (&machine->system() == &GAME_NAME(___empty))
 	{
+		return;
+	}
+
+	// check if another driver is loaded
+	if (std::strcmp(machine->system().name, last_system_name) != 0)
+	{
+		strncpy(last_system_name, machine->system().name, sizeof(last_system_name));
+
 		options->params_init = false;
 		last_options.params_init = false;
-
-		return;
 	}
 
 	enumerate_screens();
@@ -2255,6 +2261,8 @@ static INT32 slider_update_trampoline(running_machine &machine, void *arg, int i
 	return 0;
 }
 
+char shaders::last_system_name[16];
+
 hlsl_options shaders::last_options = { false };
 
 enum slider_option
diff --git a/src/osd/modules/render/d3d/d3dhlsl.h b/src/osd/modules/render/d3d/d3dhlsl.h
index 0eddbd5cd0e..738d77330f7 100644
--- a/src/osd/modules/render/d3d/d3dhlsl.h
+++ b/src/osd/modules/render/d3d/d3dhlsl.h
@@ -439,6 +439,7 @@ private:
 
 	static slider_desc      s_sliders[];
 	static hlsl_options     last_options;               // last used options
+	static char             last_system_name[16];       // last used system
 };
 
 #endif

From 9d8c3cb34178347bb1751da2d6f496a935fa35a6 Mon Sep 17 00:00:00 2001
From: Ville Linde <villedevs@gmail.com>
Date: Sun, 17 Apr 2016 17:25:25 +0300
Subject: [PATCH 046/122] hornet: fix ROM banking (nw)

---
 src/mame/drivers/hornet.cpp | 29 +++++++----------------------
 1 file changed, 7 insertions(+), 22 deletions(-)

diff --git a/src/mame/drivers/hornet.cpp b/src/mame/drivers/hornet.cpp
index bd99a6356fe..a3d499cd307 100644
--- a/src/mame/drivers/hornet.cpp
+++ b/src/mame/drivers/hornet.cpp
@@ -950,17 +950,22 @@ void hornet_state::machine_start()
 
 void hornet_state::machine_reset()
 {
-	if (m_user3_ptr)
+	memory_region* comm_region = memregion("user3");
+	if (comm_region != nullptr)
 	{
-		membank("bank1")->configure_entries(0, m_user3_ptr.bytes() / 0x10000, m_user3_ptr, 0x10000);
+		UINT8* comm_rom = comm_region->base();
+		membank("bank1")->configure_entries(0, comm_region->bytes() / 0x10000, comm_rom, 0x10000);
 		membank("bank1")->set_entry(0);
 	}
 
 	m_dsp->set_input_line(INPUT_LINE_RESET, ASSERT_LINE);
+	if (m_dsp2 != nullptr)
+		m_dsp2->set_input_line(INPUT_LINE_RESET, ASSERT_LINE);
 
 	if (m_user5_ptr)
 	{
 		membank("bank5")->set_base(m_user5_ptr);
+		membank("bank6")->set_base(m_user5_ptr);
 	}
 }
 
@@ -1036,32 +1041,12 @@ static MACHINE_CONFIG_START( hornet, hornet_state )
 	MCFG_KONPPC_CGBOARD_TYPE(CGBOARD_TYPE_HORNET)
 MACHINE_CONFIG_END
 
-
-MACHINE_RESET_MEMBER(hornet_state,hornet_2board)
-{
-	if (m_user3_ptr)
-	{
-		membank("bank1")->configure_entries(0, m_user3_ptr.bytes() / 0x10000, m_user3_ptr, 0x10000);
-		membank("bank1")->set_entry(0);
-	}
-	m_dsp->set_input_line(INPUT_LINE_RESET, ASSERT_LINE);
-	m_dsp2->set_input_line(INPUT_LINE_RESET, ASSERT_LINE);
-
-	if (m_user5_ptr)
-	{
-		membank("bank5")->set_base(m_user5_ptr);
-		membank("bank6")->set_base(m_user5_ptr);
-	}
-}
-
 static MACHINE_CONFIG_DERIVED( hornet_2board, hornet )
 
 	MCFG_CPU_ADD("dsp2", ADSP21062, XTAL_36MHz)
 	MCFG_SHARC_BOOT_MODE(BOOT_MODE_EPROM)
 	MCFG_CPU_DATA_MAP(sharc1_map)
 
-	MCFG_MACHINE_RESET_OVERRIDE(hornet_state,hornet_2board)
-
 
 	MCFG_DEVICE_REMOVE("k037122_1")
 	MCFG_K037122_ADD("k037122_1", "lscreen")

From 250a5cc805a41409cbd6b8a1bfcb33e002e3f6f0 Mon Sep 17 00:00:00 2001
From: "therealmogminer@gmail.com" <therealmogminer@gmail.com>
Date: Sun, 17 Apr 2016 19:15:58 +0200
Subject: [PATCH 047/122] Add AVI writing to bgfx, nw

---
 scripts/src/osd/modules.lua                   |   2 +
 src/emu/sound.cpp                             |   1 +
 src/osd/modules/input/input_sdlcommon.cpp     |   9 +-
 src/osd/modules/input/input_windows.cpp       |   3 +-
 src/osd/modules/lib/osdobj_common.cpp         |  17 +-
 src/osd/modules/lib/osdobj_common.h           |   3 +
 src/osd/modules/osdwindow.h                   |   1 +
 src/osd/modules/render/aviwrite.cpp           | 161 +++++++++
 src/osd/modules/render/aviwrite.h             |  51 +++
 src/osd/modules/render/bgfx/target.h          |   1 +
 src/osd/modules/render/bgfx/targetmanager.cpp |   2 +-
 src/osd/modules/render/bgfx/targetmanager.h   |   2 +-
 src/osd/modules/render/drawbgfx.cpp           | 313 +++++++++---------
 src/osd/modules/render/drawbgfx.h             |  29 +-
 src/osd/osdepend.h                            |   1 +
 src/osd/sdl/video.cpp                         |   3 +
 src/osd/windows/video.cpp                     |  14 +-
 src/osd/windows/window.cpp                    |   6 +
 src/osd/windows/winmain.h                     |   9 +-
 19 files changed, 436 insertions(+), 192 deletions(-)
 create mode 100644 src/osd/modules/render/aviwrite.cpp
 create mode 100644 src/osd/modules/render/aviwrite.h

diff --git a/scripts/src/osd/modules.lua b/scripts/src/osd/modules.lua
index afbdd78470f..aa5cb7357d5 100644
--- a/scripts/src/osd/modules.lua
+++ b/scripts/src/osd/modules.lua
@@ -156,6 +156,8 @@ function osdmodulesbuild()
 
 	files {
 		MAME_DIR .. "src/osd/modules/render/drawbgfx.cpp",
+		MAME_DIR .. "src/osd/modules/render/aviwrite.cpp",
+		MAME_DIR .. "src/osd/modules/render/aviwrite.h",
 		MAME_DIR .. "src/osd/modules/render/bgfxutil.cpp",
 		MAME_DIR .. "src/osd/modules/render/bgfxutil.h",
 		MAME_DIR .. "src/osd/modules/render/binpacker.cpp",
diff --git a/src/emu/sound.cpp b/src/emu/sound.cpp
index 12093cb0689..eedab51e78b 100644
--- a/src/emu/sound.cpp
+++ b/src/emu/sound.cpp
@@ -1075,6 +1075,7 @@ void sound_manager::update(void *ptr, int param)
 	{
 		if (!m_nosound_mode)
 			machine().osd().update_audio_stream(finalmix, finalmix_offset / 2);
+		machine().osd().add_audio_to_recording(finalmix, finalmix_offset / 2);
 		machine().video().add_sound_to_recording(finalmix, finalmix_offset / 2);
 		if (m_wavfile != nullptr)
 			wav_add_data_16(m_wavfile, finalmix, finalmix_offset);
diff --git a/src/osd/modules/input/input_sdlcommon.cpp b/src/osd/modules/input/input_sdlcommon.cpp
index 0f6116fa048..10d9f7b3b52 100644
--- a/src/osd/modules/input/input_sdlcommon.cpp
+++ b/src/osd/modules/input/input_sdlcommon.cpp
@@ -233,7 +233,14 @@ void sdl_osd_interface::customize_input_type_list(simple_list<input_type_entry>
 			entry.configure_osd("INCREASE_PRESCALE", "Increase Prescaling");
 			entry.defseq(SEQ_TYPE_STANDARD).set(KEYCODE_F7, KEYCODE_LCONTROL);
 			break;
-			// add a Not lcrtl condition to the load state key
+
+		// lshift-lalt-F12 for fullscreen video (BGFX)
+		case IPT_OSD_8:
+			entry.configure_osd("RENDER_AVI", "Record Rendered Video");
+			entry.defseq(SEQ_TYPE_STANDARD).set(KEYCODE_F12, KEYCODE_LSHIFT, KEYCODE_LALT);
+			break;
+
+		// add a Not lcrtl condition to the load state key
 		case IPT_UI_LOAD_STATE:
 			entry.defseq(SEQ_TYPE_STANDARD).set(KEYCODE_F7, input_seq::not_code, KEYCODE_LCONTROL, input_seq::not_code, KEYCODE_LSHIFT);
 			break;
diff --git a/src/osd/modules/input/input_windows.cpp b/src/osd/modules/input/input_windows.cpp
index 2132247b828..f80a4d57459 100644
--- a/src/osd/modules/input/input_windows.cpp
+++ b/src/osd/modules/input/input_windows.cpp
@@ -98,11 +98,12 @@ void windows_osd_interface::customize_input_type_list(simple_list<input_type_ent
 				entry.defseq(SEQ_TYPE_STANDARD).set(KEYCODE_F12, input_seq::not_code, KEYCODE_LSHIFT, input_seq::not_code, KEYCODE_LALT);
 				break;
 
-			// lshift-lalt-F12 for fullscreen video (HLSL)
+			// lshift-lalt-F12 for fullscreen video (HLSL, BGFX)
 			case IPT_OSD_3:
 				entry.configure_osd("RENDER_AVI", "Record Rendered Video");
 				entry.defseq(SEQ_TYPE_STANDARD).set(KEYCODE_F12, KEYCODE_LSHIFT, KEYCODE_LALT);
 				break;
+
 			// add a NOT-lalt to our default shift-F12
 			case IPT_UI_RECORD_MOVIE: // emu/input.c: input_seq(KEYCODE_F12, KEYCODE_LSHIFT)
 				entry.defseq(SEQ_TYPE_STANDARD).set(KEYCODE_F12, KEYCODE_LSHIFT, input_seq::not_code, KEYCODE_LALT);
diff --git a/src/osd/modules/lib/osdobj_common.cpp b/src/osd/modules/lib/osdobj_common.cpp
index e8f344028b0..b6114acb98c 100644
--- a/src/osd/modules/lib/osdobj_common.cpp
+++ b/src/osd/modules/lib/osdobj_common.cpp
@@ -147,6 +147,7 @@ const options_entry osd_options::s_option_entries[] =
 	{ OSDOPTION_BGFX_DEBUG,                   "0",               OPTION_BOOLEAN, "enable BGFX debugging statistics" },
 	{ OSDOPTION_BGFX_SCREEN_CHAINS,           "default",         OPTION_STRING, "comma-delimited list of screen chain JSON names, colon-delimited per-window" },
 	{ OSDOPTION_BGFX_SHADOW_MASK,             "slot-mask.png",   OPTION_STRING, "shadow mask texture name" },
+	{ OSDOPTION_BGFX_AVI_NAME,                "bgfx.avi",        OPTION_STRING, "filename for BGFX output logging" },
 
 		// End of list
 	{ nullptr }
@@ -422,8 +423,8 @@ void osd_common_t::init(running_machine &machine)
 
 	// ensure we get called on the way out
 	machine.add_notifier(MACHINE_NOTIFY_EXIT, machine_notify_delegate(FUNC(osd_common_t::osd_exit), this));
-	
-	
+
+
 	/* now setup watchdog */
 	int watchdog_timeout = options.watchdog();
 
@@ -559,6 +560,18 @@ std::vector<ui_menu_item> osd_common_t::get_slider_list()
 	return m_sliders;
 }
 
+
+//-------------------------------------------------
+//  add_audio_to_recording - append audio samples
+//  to an AVI recording if one is active
+//-------------------------------------------------
+
+void osd_common_t::add_audio_to_recording(const INT16 *buffer, int samples_this_frame)
+{
+	// Do nothing
+}
+
+
 //-------------------------------------------------
 //  execute_command - execute a command not yet
 //  handled by the core
diff --git a/src/osd/modules/lib/osdobj_common.h b/src/osd/modules/lib/osdobj_common.h
index 00778fac569..0d86d412cf9 100644
--- a/src/osd/modules/lib/osdobj_common.h
+++ b/src/osd/modules/lib/osdobj_common.h
@@ -84,6 +84,7 @@ class ui_menu_item;
 #define OSDOPTION_BGFX_DEBUG            "bgfx_debug"
 #define OSDOPTION_BGFX_SCREEN_CHAINS    "bgfx_screen_chains"
 #define OSDOPTION_BGFX_SHADOW_MASK      "bgfx_shadow_mask"
+#define OSDOPTION_BGFX_AVI_NAME			"bgfx_avi_name"
 
 //============================================================
 //  TYPE DEFINITIONS
@@ -157,6 +158,7 @@ public:
 	const bool bgfx_debug() const { return bool_value(OSDOPTION_BGFX_DEBUG); }
 	const char *bgfx_screen_chains() const { return value(OSDOPTION_BGFX_SCREEN_CHAINS); }
 	const char *bgfx_shadow_mask() const { return value(OSDOPTION_BGFX_SHADOW_MASK); }
+	const char *bgfx_avi_name() const { return value(OSDOPTION_BGFX_AVI_NAME); }
 
 private:
 	static const options_entry s_option_entries[];
@@ -192,6 +194,7 @@ public:
 	virtual void customize_input_type_list(simple_list<input_type_entry> &typelist) override;
 
 	// video overridables
+	virtual void add_audio_to_recording(const INT16 *buffer, int samples_this_frame) override;
 	virtual std::vector<ui_menu_item> get_slider_list() override;
 
 	// command option overrides
diff --git a/src/osd/modules/osdwindow.h b/src/osd/modules/osdwindow.h
index 1361ff50c9f..218e48145d5 100644
--- a/src/osd/modules/osdwindow.h
+++ b/src/osd/modules/osdwindow.h
@@ -197,6 +197,7 @@ public:
 	virtual int create() = 0;
 	virtual render_primitive_list *get_primitives() = 0;
 
+	virtual void add_audio_to_recording(const INT16 *buffer, int samples_this_frame) { }
 	virtual std::vector<ui_menu_item> get_slider_list() { return m_sliders; }
 	virtual int draw(const int update) = 0;
 	virtual int xy_to_render_target(const int x, const int y, int *xt, int *yt) { return 0; };
diff --git a/src/osd/modules/render/aviwrite.cpp b/src/osd/modules/render/aviwrite.cpp
new file mode 100644
index 00000000000..6a27c567a43
--- /dev/null
+++ b/src/osd/modules/render/aviwrite.cpp
@@ -0,0 +1,161 @@
+// license:BSD-3-Clause
+// copyright-holders:Ryan Holtz
+//============================================================
+//
+//  aviwrite.cpp - AVI screenshot writer class
+//
+//============================================================
+
+#include "aviwrite.h"
+#include "modules/lib/osdobj_common.h"
+
+avi_write::avi_write(running_machine& machine, uint32_t width, uint32_t height)
+	: m_machine(machine)
+	, m_recording(false)
+	, m_width(width)
+	, m_height(height)
+	, m_output_file(nullptr)
+	, m_frame(0)
+{
+}
+
+avi_write::~avi_write()
+{
+	if (m_recording)
+	{
+		stop();
+	}
+}
+
+void avi_write::record(std::string name)
+{
+	if (m_recording)
+	{
+		end_avi_recording();
+	}
+
+	if (name != "")
+	{
+		begin_avi_recording(name);
+	}
+}
+
+void avi_write::stop()
+{
+	osd_printf_info("Stopping AVI recording after %d frames.\n", m_frame);
+	end_avi_recording();
+}
+
+void avi_write::begin_avi_recording(std::string name)
+{
+	// stop any existing recording
+	end_avi_recording();
+
+	// reset the state
+	m_frame = 0;
+	m_next_frame_time = m_machine.time();
+
+	// build up information about this new movie
+	avi_file::movie_info info;
+	info.video_format = 0;
+	info.video_timescale = 1000 * ((m_machine.first_screen() != nullptr) ? ATTOSECONDS_TO_HZ(m_machine.first_screen()->frame_period().m_attoseconds) : screen_device::DEFAULT_FRAME_RATE);
+	info.video_sampletime = 1000;
+	info.video_numsamples = 0;
+	info.video_width = m_width;
+	info.video_height = m_height;
+	info.video_depth = 24;
+
+	info.audio_format = 0;
+	info.audio_timescale = m_machine.sample_rate();
+	info.audio_sampletime = 1;
+	info.audio_numsamples = 0;
+	info.audio_channels = 2;
+	info.audio_samplebits = 16;
+	info.audio_samplerate = m_machine.sample_rate();
+
+	// create a new temporary movie file
+	osd_file::error filerr;
+	std::string fullpath;
+	{
+		emu_file tempfile(m_machine.options().snapshot_directory(), OPEN_FLAG_WRITE | OPEN_FLAG_CREATE | OPEN_FLAG_CREATE_PATHS);
+		filerr = tempfile.open(name.c_str());
+
+		// compute the frame time
+		m_frame_period = attotime::from_seconds(1000) / info.video_timescale;
+
+		// if we succeeded, make a copy of the name and create the real file over top
+		if (filerr == osd_file::error::NONE)
+		{
+			fullpath = tempfile.fullpath();
+		}
+	}
+
+	if (filerr == osd_file::error::NONE)
+	{
+		// create the file and free the string
+		avi_file::error avierr = avi_file::create(fullpath, info, m_output_file);
+		if (avierr != avi_file::error::NONE)
+		{
+			osd_printf_error("Error creating AVI: %s\n", avi_file::error_string(avierr));
+		}
+		else
+		{
+			m_recording = true;
+		}
+	}
+}
+
+void avi_write::end_avi_recording()
+{
+	if (m_output_file)
+	{
+		m_output_file.reset();
+	}
+
+    m_recording = false;
+	m_output_file = nullptr;
+	m_frame = 0;
+}
+
+void avi_write::video_frame(bitmap_rgb32& snap)
+{
+	// get the current time
+	attotime curtime = m_machine.time();
+
+	// loop until we hit the right time
+	while (m_next_frame_time <= curtime)
+	{
+		// handle an AVI recording
+		// write the next frame
+		avi_file::error avierr = m_output_file->append_video_frame(snap);
+		if (avierr != avi_file::error::NONE)
+		{
+			osd_printf_error("Error while logging AVI video frame: %s\n", avi_file::error_string(avierr));
+			osd_printf_error("Stopping AVI recording.\n");
+			end_avi_recording();
+			return;
+		}
+
+		// advance time
+		m_next_frame_time += m_frame_period;
+		m_frame++;
+	}
+}
+
+void avi_write::audio_frame(const INT16 *buffer, int samples_this_frame)
+{
+	// only record if we have a file
+	if (m_output_file != nullptr)
+	{
+		// write the next frame
+		avi_file::error avierr = m_output_file->append_sound_samples(0, buffer + 0, samples_this_frame, 1);
+		if (avierr == avi_file::error::NONE)
+			avierr = m_output_file->append_sound_samples(1, buffer + 1, samples_this_frame, 1);
+		if (avierr != avi_file::error::NONE)
+		{
+			osd_printf_error("Error while logging AVI audio frame: %s\n", avi_file::error_string(avierr));
+			osd_printf_error("Stopping AVI recording.\n");
+			end_avi_recording();
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/osd/modules/render/aviwrite.h b/src/osd/modules/render/aviwrite.h
new file mode 100644
index 00000000000..2a948964eb8
--- /dev/null
+++ b/src/osd/modules/render/aviwrite.h
@@ -0,0 +1,51 @@
+// license:BSD-3-Clause
+// copyright-holders:Ryan Holtz
+//============================================================
+//
+//  aviwrite.h - AVI screenshot writer class
+//
+//============================================================
+
+#pragma once
+
+#ifndef __RENDER_AVIWRITE__
+#define __RENDER_AVIWRITE__
+
+#include "emu.h"
+#include "aviio.h"
+
+class running_machine;
+
+class avi_write
+{
+public:
+	avi_write(running_machine& machine, uint32_t width, uint32_t height);
+	~avi_write();
+
+	void record(std::string name);
+	void stop();
+	void audio_frame(const INT16 *buffer, int samples_this_frame);
+	void video_frame(bitmap_rgb32& snap);
+
+	// Getters
+	bool recording() const { return m_recording; }
+
+private:
+	void begin_avi_recording(std::string name);
+	void end_avi_recording();
+
+	running_machine&		m_machine;
+
+	bool					m_recording;
+
+	uint32_t				m_width;
+	uint32_t				m_height;
+
+	avi_file::ptr           m_output_file;
+
+	int                     m_frame;
+	attotime                m_frame_period;
+	attotime                m_next_frame_time;
+};
+
+#endif // __RENDER_AVIWRITE__
\ No newline at end of file
diff --git a/src/osd/modules/render/bgfx/target.h b/src/osd/modules/render/bgfx/target.h
index 76d4c374c7e..d521d2aa3d2 100644
--- a/src/osd/modules/render/bgfx/target.h
+++ b/src/osd/modules/render/bgfx/target.h
@@ -52,6 +52,7 @@ public:
 private:
 	std::string                 m_name;
 	bgfx::TextureFormat::Enum   m_format;
+	bool						m_readback;
 
 	bgfx::FrameBufferHandle*    m_targets;
 	bgfx::TextureHandle*        m_textures;
diff --git a/src/osd/modules/render/bgfx/targetmanager.cpp b/src/osd/modules/render/bgfx/targetmanager.cpp
index e17b0e6915a..40895727437 100644
--- a/src/osd/modules/render/bgfx/targetmanager.cpp
+++ b/src/osd/modules/render/bgfx/targetmanager.cpp
@@ -59,7 +59,7 @@ bgfx_target* target_manager::create_target(std::string name, bgfx::TextureFormat
 
 void target_manager::destroy_target(std::string name, uint32_t screen)
 {
-	std::string full_name = name + std::to_string(screen);
+	std::string full_name = (screen < 0) ? name : (name + std::to_string(screen));
 	if (m_targets[full_name] != nullptr)
 	{
 		delete m_targets[full_name];
diff --git a/src/osd/modules/render/bgfx/targetmanager.h b/src/osd/modules/render/bgfx/targetmanager.h
index 04ac4252f9d..0ab45e638d1 100644
--- a/src/osd/modules/render/bgfx/targetmanager.h
+++ b/src/osd/modules/render/bgfx/targetmanager.h
@@ -31,7 +31,7 @@ public:
 	~target_manager();
 
 	bgfx_target* create_target(std::string name, bgfx::TextureFormat::Enum format, uint16_t width, uint16_t height, uint32_t style, bool double_buffer, bool filter, uint16_t scale, uint32_t screen);
-	void destroy_target(std::string name, uint32_t screen);
+	void destroy_target(std::string name, uint32_t screen = -1);
 	bgfx_target* create_backbuffer(void *handle, uint16_t width, uint16_t height);
 
 	void update_target_sizes(uint32_t screen, uint16_t width, uint16_t height, uint32_t style);
diff --git a/src/osd/modules/render/drawbgfx.cpp b/src/osd/modules/render/drawbgfx.cpp
index 51806233ea6..f90e7f060e1 100644
--- a/src/osd/modules/render/drawbgfx.cpp
+++ b/src/osd/modules/render/drawbgfx.cpp
@@ -20,7 +20,7 @@
 #include "emu.h"
 #include "window.h"
 #include "rendutil.h"
-#include "aviio.h"
+#include "aviwrite.h"
 
 #include <bgfx/bgfxplatform.h>
 #include <bgfx/bgfx.h>
@@ -82,8 +82,8 @@ renderer_bgfx::renderer_bgfx(osd_window *w)
 	, m_options(downcast<osd_options &>(w->machine().options()))
 	, m_dimensions(0, 0)
 	, m_max_view(0)
-	, m_avi_output_file(nullptr)
-	, m_avi_frame(0)
+	, m_avi_writer(nullptr)
+	, m_avi_target(nullptr)
 {
 	m_options = downcast<osd_options &>(window().machine().options());
 }
@@ -94,6 +94,19 @@ renderer_bgfx::renderer_bgfx(osd_window *w)
 
 renderer_bgfx::~renderer_bgfx()
 {
+	if (m_avi_writer != nullptr && m_avi_writer->recording())
+	{
+		m_avi_writer->stop();
+
+        m_targets->destroy_target("avibuffer0");
+        m_avi_target = nullptr;
+
+        bgfx::destroyTexture(m_avi_texture);
+
+        delete m_avi_writer;
+		delete [] m_avi_data;
+	}
+
 	// Cleanup.
 	delete m_chains;
 	delete m_effects;
@@ -236,28 +249,26 @@ int renderer_bgfx::create()
 //  renderer_bgfx::record
 //============================================================
 
-#ifndef OSD_SDL
 void renderer_bgfx::record()
 {
-	std::string filename("test.avi");//m_options.d3d_hlsl_write());
-
-	if (m_avi_output_file != nullptr)
+	if (m_avi_writer == nullptr || window().m_index > 0)
 	{
-		end_avi_recording();
+		return;
 	}
-	else if (filename[0] != 0)
+
+	if (m_avi_writer->recording())
 	{
-		begin_avi_recording(filename);
+		m_avi_writer->stop();
+		m_targets->destroy_target("avibuffer0");
+		m_avi_target = nullptr;
+        bgfx::destroyTexture(m_avi_texture);
+	}
+	else
+	{
+		m_avi_writer->record(m_options.bgfx_avi_name());
+        m_avi_target = m_targets->create_target("avibuffer", bgfx::TextureFormat::RGBA8, m_width[0], m_height[0], TARGET_STYLE_CUSTOM, false, true, 1, 0);
+        m_avi_texture = bgfx::createTexture2D(m_width[0], m_height[0], 1, bgfx::TextureFormat::RGBA8, BGFX_TEXTURE_BLIT_DST | BGFX_TEXTURE_READ_BACK);
 	}
-}
-#endif
-
-void renderer_bgfx::end_avi_recording()
-{
-}
-
-void renderer_bgfx::begin_avi_recording(std::string filename)
-{
 }
 
 void renderer_bgfx::exit()
@@ -291,26 +302,18 @@ int renderer_bgfx::xy_to_render_target(int x, int y, int *xt, int *yt)
 
 bgfx::VertexDecl ScreenVertex::ms_decl;
 
-void renderer_bgfx::put_packed_quad(render_primitive *prim, UINT32 hash, ScreenVertex* vertex)
+void renderer_bgfx::put_packed_quad(render_primitive *prim, UINT32 hash, ScreenVertex* vertices)
 {
 	rectangle_packer::packed_rectangle& rect = m_hash_to_entry[hash];
-	float u0 = float(rect.x()) / float(CACHE_SIZE);
-	float v0 = float(rect.y()) / float(CACHE_SIZE);
-	float u1 = u0 + float(rect.width()) / float(CACHE_SIZE);
-	float v1 = v0 + float(rect.height()) / float(CACHE_SIZE);
-	u1 -= 0.5f / float(CACHE_SIZE);
-	v1 -= 0.5f / float(CACHE_SIZE);
-	u0 += 0.5f / float(CACHE_SIZE);
-	v0 += 0.5f / float(CACHE_SIZE);
+    float size = float(CACHE_SIZE);
+	float u0 = (float(rect.x()) + 0.5f) / size;
+	float v0 = (float(rect.y()) + 0.5f) / size;
+	float u1 = u0 + (float(rect.width()) - 1.0f) / size;
+	float v1 = v0 + (float(rect.height()) - 1.0f) / size;
 	UINT32 rgba = u32Color(prim->color.r * 255, prim->color.g * 255, prim->color.b * 255, prim->color.a * 255);
 
-	const float x0 = prim->bounds.x0;
-	const float x1 = prim->bounds.x1;
-	const float y0 = prim->bounds.y0;
-	const float y1 = prim->bounds.y1;
-
-	float x[4] = { x0, x1, x0, x1 };
-	float y[4] = { y0, y0, y1, y1 };
+	float x[4] = { prim->bounds.x0, prim->bounds.x1, prim->bounds.x0, prim->bounds.x1 };
+	float y[4] = { prim->bounds.y0, prim->bounds.y0, prim->bounds.y1, prim->bounds.y1 };
 	float u[4] = { u0, u1, u0, u1 };
 	float v[4] = { v0, v0, v1, v1 };
 
@@ -336,99 +339,39 @@ void renderer_bgfx::put_packed_quad(render_primitive *prim, UINT32 hash, ScreenV
 		std::swap(v[1], v[3]);
 	}
 
-	vertex[0].m_x = x[0]; // 0
-	vertex[0].m_y = y[0];
-	vertex[0].m_z = 0;
-	vertex[0].m_rgba = rgba;
-	vertex[0].m_u = u[0];
-	vertex[0].m_v = v[0];
+    vertex(&vertices[0], x[0], y[0], 0, rgba, u[0], v[0]);
+    vertex(&vertices[1], x[1], y[1], 0, rgba, u[1], v[1]);
+    vertex(&vertices[2], x[3], y[3], 0, rgba, u[3], v[3]);
+    vertex(&vertices[3], x[3], y[3], 0, rgba, u[3], v[3]);
+    vertex(&vertices[4], x[2], y[2], 0, rgba, u[2], v[2]);
+    vertex(&vertices[5], x[0], y[0], 0, rgba, u[0], v[0]);
+}
 
-	vertex[1].m_x = x[1]; // 1
-	vertex[1].m_y = y[1];
-	vertex[1].m_z = 0;
-	vertex[1].m_rgba = rgba;
-	vertex[1].m_u = u[1];
-	vertex[1].m_v = v[1];
-
-	vertex[2].m_x = x[3]; // 3
-	vertex[2].m_y = y[3];
-	vertex[2].m_z = 0;
-	vertex[2].m_rgba = rgba;
-	vertex[2].m_u = u[3];
-	vertex[2].m_v = v[3];
-
-	vertex[3].m_x = x[3]; // 3
-	vertex[3].m_y = y[3];
-	vertex[3].m_z = 0;
-	vertex[3].m_rgba = rgba;
-	vertex[3].m_u = u[3];
-	vertex[3].m_v = v[3];
-
-	vertex[4].m_x = x[2]; // 2
-	vertex[4].m_y = y[2];
-	vertex[4].m_z = 0;
-	vertex[4].m_rgba = rgba;
-	vertex[4].m_u = u[2];
-	vertex[4].m_v = v[2];
-
-	vertex[5].m_x = x[0]; // 0
-	vertex[5].m_y = y[0];
-	vertex[5].m_z = 0;
-	vertex[5].m_rgba = rgba;
-	vertex[5].m_u = u[0];
-	vertex[5].m_v = v[0];
+void renderer_bgfx::vertex(ScreenVertex* vertex, float x, float y, float z, uint32_t rgba, float u, float v)
+{
+    vertex->m_x = x;
+    vertex->m_y = y;
+    vertex->m_z = z;
+    vertex->m_rgba = rgba;
+    vertex->m_u = u;
+    vertex->m_v = v;
 }
 
 void renderer_bgfx::render_post_screen_quad(int view, render_primitive* prim, bgfx::TransientVertexBuffer* buffer, int32_t screen)
 {
-	ScreenVertex* vertex = reinterpret_cast<ScreenVertex*>(buffer->data);
+	ScreenVertex* vertices = reinterpret_cast<ScreenVertex*>(buffer->data);
 
 	float x[4] = { prim->bounds.x0, prim->bounds.x1, prim->bounds.x0, prim->bounds.x1 };
 	float y[4] = { prim->bounds.y0, prim->bounds.y0, prim->bounds.y1, prim->bounds.y1 };
 	float u[4] = { prim->texcoords.tl.u, prim->texcoords.tr.u, prim->texcoords.bl.u, prim->texcoords.br.u };
 	float v[4] = { prim->texcoords.tl.v, prim->texcoords.tr.v, prim->texcoords.bl.v, prim->texcoords.br.v };
 
-	vertex[0].m_x = x[0];
-	vertex[0].m_y = y[0];
-	vertex[0].m_z = 0;
-	vertex[0].m_rgba = 0xffffffff;
-	vertex[0].m_u = u[0];
-	vertex[0].m_v = v[0];
-
-	vertex[1].m_x = x[1];
-	vertex[1].m_y = y[1];
-	vertex[1].m_z = 0;
-	vertex[1].m_rgba = 0xffffffff;
-	vertex[1].m_u = u[1];
-	vertex[1].m_v = v[1];
-
-	vertex[2].m_x = x[3];
-	vertex[2].m_y = y[3];
-	vertex[2].m_z = 0;
-	vertex[2].m_rgba = 0xffffffff;
-	vertex[2].m_u = u[3];
-	vertex[2].m_v = v[3];
-
-	vertex[3].m_x = x[3];
-	vertex[3].m_y = y[3];
-	vertex[3].m_z = 0;
-	vertex[3].m_rgba = 0xffffffff;
-	vertex[3].m_u = u[3];
-	vertex[3].m_v = v[3];
-
-	vertex[4].m_x = x[2];
-	vertex[4].m_y = y[2];
-	vertex[4].m_z = 0;
-	vertex[4].m_rgba = 0xffffffff;
-	vertex[4].m_u = u[2];
-	vertex[4].m_v = v[2];
-
-	vertex[5].m_x = x[0];
-	vertex[5].m_y = y[0];
-	vertex[5].m_z = 0;
-	vertex[5].m_rgba = 0xffffffff;
-	vertex[5].m_u = u[0];
-	vertex[5].m_v = v[0];
+    vertex(&vertices[0], x[0], y[0], 0, 0xffffffff, u[0], v[0]);
+    vertex(&vertices[1], x[1], y[1], 0, 0xffffffff, u[1], v[1]);
+    vertex(&vertices[2], x[3], y[3], 0, 0xffffffff, u[3], v[3]);
+    vertex(&vertices[3], x[3], y[3], 0, 0xffffffff, u[3], v[3]);
+    vertex(&vertices[4], x[2], y[2], 0, 0xffffffff, u[2], v[2]);
+    vertex(&vertices[5], x[0], y[0], 0, 0xffffffff, u[0], v[0]);
 
 	uint32_t texture_flags = BGFX_TEXTURE_U_CLAMP | BGFX_TEXTURE_V_CLAMP;
 	if (video_config.filter == 0)
@@ -442,53 +385,53 @@ void renderer_bgfx::render_post_screen_quad(int view, render_primitive* prim, bg
 	m_screen_effect[blend]->submit(view);
 }
 
+void renderer_bgfx::render_avi_quad()
+{
+    bgfx::setViewSeq(s_current_view, true);
+    bgfx::setViewRect(s_current_view, 0, 0, m_width[0], m_height[0]);
+    bgfx::setViewClear(s_current_view, BGFX_CLEAR_COLOR | BGFX_CLEAR_DEPTH, 0x00000000, 1.0f, 0);
+
+    setup_matrices(s_current_view, false);
+
+    bgfx::TransientVertexBuffer buffer;
+    bgfx::allocTransientVertexBuffer(&buffer, 6, ScreenVertex::ms_decl);
+    ScreenVertex* vertices = reinterpret_cast<ScreenVertex*>(buffer.data);
+
+    float x[4] = { 0.0f, float(m_width[0]), 0.0f, float(m_width[0]) };
+    float y[4] = { 0.0f, 0.0f, float(m_height[0]), float(m_height[0]) };
+    float u[4] = { 0.0f, 1.0f, 0.0f, 1.0f };
+    float v[4] = { 0.0f, 0.0f, 1.0f, 1.0f };
+    UINT32 rgba = 0xffffffff;
+
+    vertex(&vertices[0], x[0], y[0], 0, rgba, u[0], v[0]);
+    vertex(&vertices[1], x[1], y[1], 0, rgba, u[1], v[1]);
+    vertex(&vertices[2], x[3], y[3], 0, rgba, u[3], v[3]);
+    vertex(&vertices[3], x[3], y[3], 0, rgba, u[3], v[3]);
+    vertex(&vertices[4], x[2], y[2], 0, rgba, u[2], v[2]);
+    vertex(&vertices[5], x[0], y[0], 0, rgba, u[0], v[0]);
+
+    bgfx::setVertexBuffer(&buffer);
+    bgfx::setTexture(0, m_gui_effect[PRIMFLAG_GET_BLENDMODE(BLENDMODE_NONE)]->uniform("s_tex")->handle(), m_avi_target->texture());
+    m_gui_effect[PRIMFLAG_GET_BLENDMODE(BLENDMODE_NONE)]->submit(s_current_view);
+    s_current_view++;
+}
+
 void renderer_bgfx::render_textured_quad(render_primitive* prim, bgfx::TransientVertexBuffer* buffer)
 {
-	ScreenVertex* vertex = reinterpret_cast<ScreenVertex*>(buffer->data);
-
+	ScreenVertex* vertices = reinterpret_cast<ScreenVertex*>(buffer->data);
 	UINT32 rgba = u32Color(prim->color.r * 255, prim->color.g * 255, prim->color.b * 255, prim->color.a * 255);
 
-	vertex[0].m_x = prim->bounds.x0;
-	vertex[0].m_y = prim->bounds.y0;
-	vertex[0].m_z = 0;
-	vertex[0].m_rgba = rgba;
-	vertex[0].m_u = prim->texcoords.tl.u;
-	vertex[0].m_v = prim->texcoords.tl.v;
+    float x[4] = { prim->bounds.x0, prim->bounds.x1, prim->bounds.x0, prim->bounds.x1 };
+    float y[4] = { prim->bounds.y0, prim->bounds.y0, prim->bounds.y1, prim->bounds.y1 };
+    float u[4] = { prim->texcoords.tl.u, prim->texcoords.tr.u, prim->texcoords.bl.u, prim->texcoords.br.u };
+    float v[4] = { prim->texcoords.tl.v, prim->texcoords.tr.v, prim->texcoords.bl.v, prim->texcoords.br.v };
 
-	vertex[1].m_x = prim->bounds.x1;
-	vertex[1].m_y = prim->bounds.y0;
-	vertex[1].m_z = 0;
-	vertex[1].m_rgba = rgba;
-	vertex[1].m_u = prim->texcoords.tr.u;
-	vertex[1].m_v = prim->texcoords.tr.v;
-
-	vertex[2].m_x = prim->bounds.x1;
-	vertex[2].m_y = prim->bounds.y1;
-	vertex[2].m_z = 0;
-	vertex[2].m_rgba = rgba;
-	vertex[2].m_u = prim->texcoords.br.u;
-	vertex[2].m_v = prim->texcoords.br.v;
-
-	vertex[3].m_x = prim->bounds.x1;
-	vertex[3].m_y = prim->bounds.y1;
-	vertex[3].m_z = 0;
-	vertex[3].m_rgba = rgba;
-	vertex[3].m_u = prim->texcoords.br.u;
-	vertex[3].m_v = prim->texcoords.br.v;
-
-	vertex[4].m_x = prim->bounds.x0;
-	vertex[4].m_y = prim->bounds.y1;
-	vertex[4].m_z = 0;
-	vertex[4].m_rgba = rgba;
-	vertex[4].m_u = prim->texcoords.bl.u;
-	vertex[4].m_v = prim->texcoords.bl.v;
-
-	vertex[5].m_x = prim->bounds.x0;
-	vertex[5].m_y = prim->bounds.y0;
-	vertex[5].m_z = 0;
-	vertex[5].m_rgba = rgba;
-	vertex[5].m_u = prim->texcoords.tl.u;
-	vertex[5].m_v = prim->texcoords.tl.v;
+    vertex(&vertices[0], x[0], y[0], 0, rgba, u[0], v[0]);
+    vertex(&vertices[1], x[1], y[1], 0, rgba, u[1], v[1]);
+    vertex(&vertices[2], x[3], y[3], 0, rgba, u[3], v[3]);
+    vertex(&vertices[3], x[3], y[3], 0, rgba, u[3], v[3]);
+    vertex(&vertices[4], x[2], y[2], 0, rgba, u[2], v[2]);
+    vertex(&vertices[5], x[0], y[0], 0, rgba, u[0], v[0]);
 
 	uint32_t texture_flags = BGFX_TEXTURE_U_CLAMP | BGFX_TEXTURE_V_CLAMP;
 	if (video_config.filter == 0)
@@ -709,6 +652,14 @@ int renderer_bgfx::draw(int update)
 	if (window_index == 0)
 	{
 		s_current_view = 0;
+		if (m_avi_writer == nullptr)
+		{
+            uint32_t width = window().get_size().width();
+            uint32_t height = window().get_size().height();
+            m_avi_writer = new avi_write(window().machine(), width, height);
+			m_avi_data = new uint8_t[width * height * 4];
+            m_avi_bitmap.allocate(width, height);
+		}
 	}
 
 	m_seen_views.clear();
@@ -785,20 +736,50 @@ int renderer_bgfx::draw(int update)
 
 	window().m_primlist->release_lock();
 
-	// This dummy draw call is here to make sure that view 0 is cleared
-	// if no other draw calls are submitted to view 0.
-	bgfx::touch(s_current_view > 0 ? s_current_view - 1 : 0);
+    // This dummy draw call is here to make sure that view 0 is cleared
+    // if no other draw calls are submitted to view 0.
+    bgfx::touch(s_current_view > 0 ? s_current_view - 1 : 0);
 
-	// Advance to next frame. Rendering thread will be kicked to
+    // Advance to next frame. Rendering thread will be kicked to
 	// process submitted rendering primitives.
 	if (window_index == 0)
 	{
+		if (m_avi_writer != nullptr && m_avi_writer->recording() && window_index == 0)
+		{
+            render_avi_quad();
+            bgfx::touch(s_current_view);
+            update_recording();
+        }
+
 		bgfx::frame();
 	}
 
 	return 0;
 }
 
+void renderer_bgfx::update_recording()
+{
+    bgfx::blit(s_current_view > 0 ? s_current_view - 1 : 0, m_avi_texture, 0, 0, m_avi_target->target());
+    bgfx::readTexture(m_avi_texture, m_avi_data);
+
+    UINT32* start = &m_avi_bitmap.pix32(0);
+    // loop over Y
+    for (int i = 0; i < m_width[0] * m_height[0] * 4; i += 4)
+    {
+        *start++ = 0xff000000 | (m_avi_data[i + 0] << 16) | (m_avi_data[i + 1] << 8) | m_avi_data[i + 2];
+    }
+
+    m_avi_writer->video_frame(m_avi_bitmap);
+}
+
+void renderer_bgfx::add_audio_to_recording(const INT16 *buffer, int samples_this_frame)
+{
+	if (m_avi_writer != nullptr && m_avi_writer->recording() && window().m_index == 0)
+	{
+		m_avi_writer->audio_frame(buffer, samples_this_frame);
+	}
+}
+
 bool renderer_bgfx::update_dimensions()
 {
 	const uint32_t window_index = window().m_index;
@@ -864,7 +845,11 @@ void renderer_bgfx::setup_view(uint32_t view_index, bool screen)
 	{
 		m_seen_views[view_index] = true;
 #endif
-		bgfx::setViewClear(view_index, BGFX_CLEAR_COLOR | BGFX_CLEAR_DEPTH, 0x00000000, 1.0f, 0);
+		if (m_avi_writer != nullptr && m_avi_writer->recording() && window().m_index == 0)
+		{
+			bgfx::setViewFrameBuffer(view_index, m_avi_target->target());
+		}
+        bgfx::setViewClear(view_index, BGFX_CLEAR_COLOR | BGFX_CLEAR_DEPTH, 0x00000000, 1.0f, 0);
 	}
 
 	setup_matrices(view_index, screen);
diff --git a/src/osd/modules/render/drawbgfx.h b/src/osd/modules/render/drawbgfx.h
index e96fd461cc1..f7da00fe787 100644
--- a/src/osd/modules/render/drawbgfx.h
+++ b/src/osd/modules/render/drawbgfx.h
@@ -13,7 +13,6 @@
 #include "binpacker.h"
 #include "bgfx/vertex.h"
 #include "sliderdirtynotifier.h"
-#include "aviio.h"
 
 class texture_manager;
 class target_manager;
@@ -25,6 +24,7 @@ class bgfx_effect;
 class bgfx_target;
 class bgfx_chain;
 class osd_options;
+class avi_write;
 
 /* sdl_info is the information about SDL for the current screen */
 class renderer_bgfx : public osd_renderer, public slider_dirty_notifier
@@ -39,16 +39,17 @@ public:
 	virtual int create() override;
     virtual int draw(const int update) override;
 
+	virtual void add_audio_to_recording(const INT16 *buffer, int samples_this_frame) override;
     virtual std::vector<ui_menu_item> get_slider_list() override;
     virtual void set_sliders_dirty() override;
 
 #ifdef OSD_SDL
 	virtual int xy_to_render_target(const int x, const int y, int *xt, int *yt) override;
-#else
+#endif
+
 	virtual void save() override { }
 	virtual void record() override;
 	virtual void toggle_fsfx() override { }
-#endif
 
 	virtual render_primitive_list *get_primitives() override
 	{
@@ -60,13 +61,16 @@ public:
     static const char* WINDOW_PREFIX;
 
 private:
-	void end_avi_recording();
-	void begin_avi_recording(std::string filename);
+    void vertex(ScreenVertex* vertex, float x, float y, float z, uint32_t rgba, float u, float v);
+    void render_avi_quad();
+    void update_recording();
 
-	bool update_dimensions();
-	void setup_view(uint32_t view_index, bool screen);
+    bool update_dimensions();
+
+    void setup_view(uint32_t view_index, bool screen);
 	void init_ui_view();
-	void setup_matrices(uint32_t view_index, bool screen);
+
+    void setup_matrices(uint32_t view_index, bool screen);
 
 	void allocate_buffer(render_primitive *prim, UINT32 blend, bgfx::TransientVertexBuffer *buffer);
 	enum buffer_status
@@ -123,10 +127,11 @@ private:
 	int32_t m_ui_view;
 	uint32_t m_max_view;
 
-	// AVI
-	avi_file::ptr           m_avi_output_file;            // AVI file
-	int                     m_avi_frame;                  // AVI frame
-	attotime                m_avi_frame_period;           // AVI frame period
+	avi_write* m_avi_writer;
+	bgfx_target* m_avi_target;
+    bgfx::TextureHandle m_avi_texture;
+    bitmap_rgb32 m_avi_bitmap;
+	uint8_t* m_avi_data;
 
 	static const uint16_t CACHE_SIZE;
 	static const uint32_t PACKABLE_SIZE;
diff --git a/src/osd/osdepend.h b/src/osd/osdepend.h
index 661160cb271..e305aeb958f 100644
--- a/src/osd/osdepend.h
+++ b/src/osd/osdepend.h
@@ -79,6 +79,7 @@ public:
 	virtual void customize_input_type_list(simple_list<input_type_entry> &typelist) = 0;
 
 	// video overridables
+	virtual void add_audio_to_recording(const INT16 *buffer, int samples_this_frame) = 0;
 	virtual std::vector<ui_menu_item> get_slider_list() = 0;
 
 	// font interface
diff --git a/src/osd/sdl/video.cpp b/src/osd/sdl/video.cpp
index 8a8402e44b3..099c4bccfc9 100644
--- a/src/osd/sdl/video.cpp
+++ b/src/osd/sdl/video.cpp
@@ -314,6 +314,9 @@ static void check_osd_inputs(running_machine &machine)
 
 	if (machine.ui_input().pressed(IPT_OSD_7))
 		window->modify_prescale(1);
+
+	if (machine.ui_input().pressed(IPT_OSD_8))
+		window->renderer().record();
 }
 
 //============================================================
diff --git a/src/osd/windows/video.cpp b/src/osd/windows/video.cpp
index b0f28ee7d13..d73ad8bf522 100644
--- a/src/osd/windows/video.cpp
+++ b/src/osd/windows/video.cpp
@@ -51,8 +51,6 @@ osd_monitor_info *osd_monitor_info::list = NULL;
 
 static void init_monitors(void);
 
-static void check_osd_inputs(running_machine &machine);
-
 static float get_aspect(const char *defdata, const char *data, int report_error);
 static void get_resolution(const char *defdata, const char *data, osd_window_config *config, int report_error);
 
@@ -180,7 +178,7 @@ void windows_osd_interface::update(bool skip_redraw)
 	// poll the joystick values here
 	winwindow_process_events(machine(), TRUE, FALSE);
 	poll_input(machine());
-	check_osd_inputs(machine());
+	check_osd_inputs();
 	// if we're running, disable some parts of the debugger
 	if ((machine().debug_flags & DEBUG_FLAG_OSD_ENABLED) != 0)
 		debugger_update();
@@ -308,22 +306,22 @@ finishit:
 //  check_osd_inputs
 //============================================================
 
-static void check_osd_inputs(running_machine &machine)
+void windows_osd_interface::check_osd_inputs()
 {
 	// check for toggling fullscreen mode
-	if (machine.ui_input().pressed(IPT_OSD_1))
+	if (machine().ui_input().pressed(IPT_OSD_1))
 		winwindow_toggle_full_screen();
 
 	// check for taking fullscreen snap
-	if (machine.ui_input().pressed(IPT_OSD_2))
+	if (machine().ui_input().pressed(IPT_OSD_2))
 		winwindow_take_snap();
 
 	// check for taking fullscreen video
-	if (machine.ui_input().pressed(IPT_OSD_3))
+	if (machine().ui_input().pressed(IPT_OSD_3))
 		winwindow_take_video();
 
 	// check for taking fullscreen video
-	if (machine.ui_input().pressed(IPT_OSD_4))
+	if (machine().ui_input().pressed(IPT_OSD_4))
 		winwindow_toggle_fsfx();
 }
 
diff --git a/src/osd/windows/window.cpp b/src/osd/windows/window.cpp
index 8938ca427ce..da6aebd07ff 100644
--- a/src/osd/windows/window.cpp
+++ b/src/osd/windows/window.cpp
@@ -286,6 +286,12 @@ void windows_osd_interface::build_slider_list()
 	}
 }
 
+void windows_osd_interface::add_audio_to_recording(const INT16 *buffer, int samples_this_frame)
+{
+	win_window_info *window = win_window_list; // We only record on the first window
+	window->m_renderer->add_audio_to_recording(buffer, samples_this_frame);
+}
+
 //============================================================
 //  winwindow_exit
 //  (main thread)
diff --git a/src/osd/windows/winmain.h b/src/osd/windows/winmain.h
index b41092bf500..216333dbd13 100644
--- a/src/osd/windows/winmain.h
+++ b/src/osd/windows/winmain.h
@@ -260,9 +260,12 @@ public:
 	virtual void init(running_machine &machine) override;
 	virtual void update(bool skip_redraw) override;
 
-	// video overridables
+	// input overrideables
 	virtual void customize_input_type_list(simple_list<input_type_entry> &typelist) override;
 
+	// video overridables
+	virtual void add_audio_to_recording(const INT16 *buffer, int samples_this_frame) override;
+
 	virtual void video_register() override;
 
 	virtual bool video_init() override;
@@ -286,6 +289,8 @@ protected:
 	virtual void build_slider_list() override;
 	virtual void update_slider_list() override;
 
+	void check_osd_inputs();
+
 private:
 	virtual void osd_exit() override;
 
@@ -306,7 +311,7 @@ private:
 public:
 	MameMainApp();
 
-	// IFrameworkView Methods. 
+	// IFrameworkView Methods.
 	virtual void Initialize(Windows::ApplicationModel::Core::CoreApplicationView^ applicationView);
 	virtual void SetWindow(Windows::UI::Core::CoreWindow^ window);
 	virtual void Load(Platform::String^ entryPoint);

From e6a54bcc234061c8e5fa903f4734bf490da77ee4 Mon Sep 17 00:00:00 2001
From: "therealmogminer@gmail.com" <therealmogminer@gmail.com>
Date: Sun, 17 Apr 2016 20:43:10 +0200
Subject: [PATCH 048/122] Minor fixups to pillarboxing shaders

---
 bgfx/chains/pillarbox_left_horizontal.json    |  28 +++++++++---------
 bgfx/chains/pillarbox_left_vertical.json      |  28 +++++++++---------
 bgfx/chains/pillarbox_right_horizontal.json   |  28 +++++++++---------
 bgfx/chains/pillarbox_right_vertical.json     |  28 +++++++++---------
 .../vs_saturation.bin                         | Bin 615 -> 615 bytes
 .../pillarbox_left_vertical/vs_saturation.bin | Bin 615 -> 615 bytes
 .../vs_saturation.bin                         | Bin 615 -> 615 bytes
 .../vs_saturation.bin                         | Bin 615 -> 615 bytes
 .../vs_saturation.bin                         | Bin 362 -> 362 bytes
 .../pillarbox_left_vertical/vs_saturation.bin | Bin 362 -> 362 bytes
 .../vs_saturation.bin                         | Bin 362 -> 362 bytes
 .../vs_saturation.bin                         | Bin 362 -> 362 bytes
 .../vs_saturation.bin                         | Bin 463 -> 458 bytes
 .../pillarbox_left_vertical/vs_saturation.bin | Bin 466 -> 463 bytes
 .../vs_saturation.bin                         | Bin 469 -> 459 bytes
 .../vs_saturation.bin                         | Bin 467 -> 469 bytes
 .../vs_saturation.bin                         | Bin 421 -> 416 bytes
 .../pillarbox_left_vertical/vs_saturation.bin | Bin 424 -> 421 bytes
 .../vs_saturation.bin                         | Bin 427 -> 417 bytes
 .../vs_saturation.bin                         | Bin 425 -> 427 bytes
 .../vs_saturation.bin                         | Bin 805 -> 800 bytes
 .../pillarbox_left_vertical/vs_saturation.bin | Bin 808 -> 805 bytes
 .../vs_saturation.bin                         | Bin 811 -> 801 bytes
 .../vs_saturation.bin                         | Bin 809 -> 811 bytes
 .../vs_saturation.sc                          |   2 +-
 .../pillarbox_left_vertical/vs_saturation.sc  |   2 +-
 .../vs_saturation.sc                          |   2 +-
 .../pillarbox_right_vertical/vs_saturation.sc |   2 +-
 28 files changed, 60 insertions(+), 60 deletions(-)

diff --git a/bgfx/chains/pillarbox_left_horizontal.json b/bgfx/chains/pillarbox_left_horizontal.json
index deff01f88d6..1959fa30943 100644
--- a/bgfx/chains/pillarbox_left_horizontal.json
+++ b/bgfx/chains/pillarbox_left_horizontal.json
@@ -58,20 +58,6 @@
 			],
 			"output": "internal"
 		},
-		{
-			"effect": "pillarbox_left_horizontal/saturation",
-			"name": "Saturation Pass",
-			"disablewhen": [
-				{ "type": "slider", "condition": "equal", "name": "saturation", "value": 100 }
-			],
-			"uniforms": [
-				{ "uniform": "u_saturation", "slider": "saturation" }
-			],
-			"input": [
-				{ "sampler": "s_tex", "target": "internal" }
-			],
-			"output": "internal"
-		},
 		{	"effect": "pillarbox_left_horizontal/gaussian",
 			"name": "Gaussian Blur 2, Horizontal",
 			"uniforms": [
@@ -92,6 +78,20 @@
 			],
 			"output": "internal"
 		},
+		{
+			"effect": "pillarbox_left_horizontal/saturation",
+			"name": "Saturation Pass",
+			"disablewhen": [
+				{ "type": "slider", "condition": "equal", "name": "saturation", "value": 100 }
+			],
+			"uniforms": [
+				{ "uniform": "u_saturation", "slider": "saturation" }
+			],
+			"input": [
+				{ "sampler": "s_tex", "target": "internal" }
+			],
+			"output": "internal"
+		},
 		{	"effect": "pillarbox_left_horizontal/blit",
 			"name": "Final Blit",
 			"input": [
diff --git a/bgfx/chains/pillarbox_left_vertical.json b/bgfx/chains/pillarbox_left_vertical.json
index 187164695de..976a84476b8 100644
--- a/bgfx/chains/pillarbox_left_vertical.json
+++ b/bgfx/chains/pillarbox_left_vertical.json
@@ -58,20 +58,6 @@
 			],
 			"output": "internal"
 		},
-		{
-			"effect": "pillarbox_left_vertical/saturation",
-			"name": "Saturation Pass",
-			"disablewhen": [
-				{ "type": "slider", "condition": "equal", "name": "saturation", "value": 100 }
-			],
-			"uniforms": [
-				{ "uniform": "u_saturation", "slider": "saturation" }
-			],
-			"input": [
-				{ "sampler": "s_tex", "target": "internal" }
-			],
-			"output": "internal"
-		},
 		{	"effect": "pillarbox_left_vertical/gaussian",
 			"name": "Gaussian Blur 2, Horizontal",
 			"uniforms": [
@@ -92,6 +78,20 @@
 			],
 			"output": "internal"
 		},
+		{
+			"effect": "pillarbox_left_vertical/saturation",
+			"name": "Saturation Pass",
+			"disablewhen": [
+				{ "type": "slider", "condition": "equal", "name": "saturation", "value": 100 }
+			],
+			"uniforms": [
+				{ "uniform": "u_saturation", "slider": "saturation" }
+			],
+			"input": [
+				{ "sampler": "s_tex", "target": "internal" }
+			],
+			"output": "internal"
+		},
 		{	"effect": "pillarbox_left_vertical/blit",
 			"name": "Final Blit",
 			"input": [
diff --git a/bgfx/chains/pillarbox_right_horizontal.json b/bgfx/chains/pillarbox_right_horizontal.json
index d7133aadbcc..a687510049e 100644
--- a/bgfx/chains/pillarbox_right_horizontal.json
+++ b/bgfx/chains/pillarbox_right_horizontal.json
@@ -58,20 +58,6 @@
 			],
 			"output": "internal"
 		},
-		{
-			"effect": "pillarbox_right_horizontal/saturation",
-			"name": "Saturation Pass",
-			"disablewhen": [
-				{ "type": "slider", "condition": "equal", "name": "saturation", "value": 100 }
-			],
-			"uniforms": [
-				{ "uniform": "u_saturation", "slider": "saturation" }
-			],
-			"input": [
-				{ "sampler": "s_tex", "target": "internal" }
-			],
-			"output": "internal"
-		},
 		{	"effect": "pillarbox_right_horizontal/gaussian",
 			"name": "Gaussian Blur 2, Horizontal",
 			"uniforms": [
@@ -92,6 +78,20 @@
 			],
 			"output": "internal"
 		},
+		{
+			"effect": "pillarbox_right_horizontal/saturation",
+			"name": "Saturation Pass",
+			"disablewhen": [
+				{ "type": "slider", "condition": "equal", "name": "saturation", "value": 100 }
+			],
+			"uniforms": [
+				{ "uniform": "u_saturation", "slider": "saturation" }
+			],
+			"input": [
+				{ "sampler": "s_tex", "target": "internal" }
+			],
+			"output": "internal"
+		},
 		{	"effect": "pillarbox_right_horizontal/blit",
 			"name": "Final Blit",
 			"input": [
diff --git a/bgfx/chains/pillarbox_right_vertical.json b/bgfx/chains/pillarbox_right_vertical.json
index 072ba99956f..16dcb8b8c4b 100644
--- a/bgfx/chains/pillarbox_right_vertical.json
+++ b/bgfx/chains/pillarbox_right_vertical.json
@@ -58,20 +58,6 @@
 			],
 			"output": "internal"
 		},
-		{
-			"effect": "pillarbox_right_vertical/saturation",
-			"name": "Saturation Pass",
-			"disablewhen": [
-				{ "type": "slider", "condition": "equal", "name": "saturation", "value": 100 }
-			],
-			"uniforms": [
-				{ "uniform": "u_saturation", "slider": "saturation" }
-			],
-			"input": [
-				{ "sampler": "s_tex", "target": "internal" }
-			],
-			"output": "internal"
-		},
 		{	"effect": "pillarbox_right_vertical/gaussian",
 			"name": "Gaussian Blur 2, Horizontal",
 			"uniforms": [
@@ -92,6 +78,20 @@
 			],
 			"output": "internal"
 		},
+		{
+			"effect": "pillarbox_right_vertical/saturation",
+			"name": "Saturation Pass",
+			"disablewhen": [
+				{ "type": "slider", "condition": "equal", "name": "saturation", "value": 100 }
+			],
+			"uniforms": [
+				{ "uniform": "u_saturation", "slider": "saturation" }
+			],
+			"input": [
+				{ "sampler": "s_tex", "target": "internal" }
+			],
+			"output": "internal"
+		},
 		{	"effect": "pillarbox_right_vertical/blit",
 			"name": "Final Blit",
 			"input": [
diff --git a/bgfx/shaders/dx11/chains/pillarbox_left_horizontal/vs_saturation.bin b/bgfx/shaders/dx11/chains/pillarbox_left_horizontal/vs_saturation.bin
index 8b8f91d84171a05e150e65ddb018736646570d40..8d21d98385aeb918e3abc79f73181533fdaf6129 100644
GIT binary patch
delta 56
zcmaFP@|<OYqJYg8o>d*(iY!}CCLVV0+L*P`kcCNN=1fVuvuAwl8K8j4fq~)dnKQPN
HeVL>HMSBua

delta 56
zcmaFP@|<OYq5$`{Hr|#m($Wt_{&FvA5;WLo$igJi(ZOMN_Kc4`0~9bhFfai5c9VUX
FqyQpc5ZM3#

diff --git a/bgfx/shaders/dx11/chains/pillarbox_left_vertical/vs_saturation.bin b/bgfx/shaders/dx11/chains/pillarbox_left_vertical/vs_saturation.bin
index f7a1c40ba4d06d91719abc2d66563e7af050ba15..7a3bdff1a9868559841089c87ef1f889aa5c9192 100644
GIT binary patch
delta 56
zcmaFP@|<OYqCn91<|sy^uj}*UOTB(SUm&&7kb_C$_FY+f1}I>1U|=|V=8P=}PYz@f
F0|0A*6j%TN

delta 56
zcmaFP@|<OYqCmW!Wq($_{hsP2@574Zc|UG6<Y1DJ*&=Sw00m4A3=C(_oUz@tx5aL9
HAd?sXA=(l5

diff --git a/bgfx/shaders/dx11/chains/pillarbox_right_horizontal/vs_saturation.bin b/bgfx/shaders/dx11/chains/pillarbox_right_horizontal/vs_saturation.bin
index b57b9cd363340682f27c7c3ea7ec2fb4cbbabd40..cde2b1546aa7831da0a9e89ad79facbae611f536 100644
GIT binary patch
delta 55
zcmaFP@|<OYqJXO16^Dv_AA=lIJZIOJZQZibkcCNn=1fVuvuAwl8K8j40mN{a?877t
E06)_ZnE(I)

delta 55
zcmaFP@|<OYqQG?LyIcO%<j+2z+@AN0Aun~KAq$guM+b-9*)u-&3{b%2z`(G2mDXe*
GCTRe4^%9)`

diff --git a/bgfx/shaders/dx11/chains/pillarbox_right_vertical/vs_saturation.bin b/bgfx/shaders/dx11/chains/pillarbox_right_vertical/vs_saturation.bin
index 7229773bd56f27f895e0bd23e0981fa4cde26dfc..ce4ae1dd5c7390486662c02569aeb46d5d94213a 100644
GIT binary patch
delta 56
zcmaFP@|<OYqQJiH8T#6+$+io`kEl!STEe%{kb_C$_FY+f1}I>1U|=|V=8Ubl;6%I0
HflOim3)>Kn

delta 56
zcmaFP@|<OYqCmjrR_>K2xy+ANaXXvbHv7EMkb_A=W{bEz0~9bhFfg1wbH;W_Z?f&=
HKqfH&9zzj+

diff --git a/bgfx/shaders/dx9/chains/pillarbox_left_horizontal/vs_saturation.bin b/bgfx/shaders/dx9/chains/pillarbox_left_horizontal/vs_saturation.bin
index bc748ecc4c232c984c39d5c8e978b968e452d40c..b9b18b7ac1a4781ab3ddd72394bdac9e59fd4ccd 100644
GIT binary patch
delta 46
zcmaFG^onW1PJx*-CGF0h@v%R9=8P=^5KKJTC%kF_BLf2yBLn{f28JgS{{IIG0|2}k
B5i0-y

delta 46
zcmaFG^onW1PJxaN4!g5weC&Z3NT0Etc(PCU-2z4i1|~)Z{s#;UPbU2T&%nR{0PiXj
AUjP6A

diff --git a/bgfx/shaders/dx9/chains/pillarbox_left_vertical/vs_saturation.bin b/bgfx/shaders/dx9/chains/pillarbox_left_vertical/vs_saturation.bin
index d504cc35b51a68a8b868fdd57fc2f239e0aec626..0b92c5f50bc2e133c6456ea3adb5393aac1c0c61 100644
GIT binary patch
delta 42
wcmaFG^onW1UY^@`W$n+NIb+KJ1QSp839nkf$iTqF$iV-Af#J!7|Nnu)0CN}*k^lez

delta 42
zcmV+_0M-BM0_p;gy$l?*7eCF+%ssljgg%kUjuY;n0RR930RRu+0088W|Nj600FhG>
AApigX

diff --git a/bgfx/shaders/dx9/chains/pillarbox_right_horizontal/vs_saturation.bin b/bgfx/shaders/dx9/chains/pillarbox_right_horizontal/vs_saturation.bin
index 628eff3b5ae58cab5717342e6a541293ddbda7e9..e9bfb3062de7859c3a66c5b4937831688699b366 100644
GIT binary patch
delta 21
dcmaFG^onW1PVSjACGF0h@v&!MaF}>x831P22^9bU

delta 21
dcmaFG^onW1PVSBl4!g5weC$`R(wcZ=831cM3LyXh

diff --git a/bgfx/shaders/dx9/chains/pillarbox_right_vertical/vs_saturation.bin b/bgfx/shaders/dx9/chains/pillarbox_right_vertical/vs_saturation.bin
index 1abeb7f7aed7eba42286f025ba80427d4f79e90c..55774bb38abe57fab4a6a19684e2149b90b36255 100644
GIT binary patch
delta 22
ecmaFG^onW1UY^@`W$n+NIb$m>IMHt6$%O!ZBnsL9

delta 22
ecmaFG^onW1ULKh(;`V3HoUvWfn`}Gr<U#;;KnlhH

diff --git a/bgfx/shaders/gles/chains/pillarbox_left_horizontal/vs_saturation.bin b/bgfx/shaders/gles/chains/pillarbox_left_horizontal/vs_saturation.bin
index e17074932b626f2c9288daaf53f68240d1fb2be5..42326d4324e4480ca182dd083d4e3c5fee14d233 100644
GIT binary patch
delta 36
scmX@le2RI3G~=p`GUbfIraB4+dKQ|R3fc-~smVqf26~2*S2L;r0KdNptN;K2

delta 41
tcmX@be4crNG~@b>GUbdC#$ceMV4!EAsi~l?P?nl(q+y_EG<g}L3IOmV3a<bF

diff --git a/bgfx/shaders/gles/chains/pillarbox_left_vertical/vs_saturation.bin b/bgfx/shaders/gles/chains/pillarbox_left_vertical/vs_saturation.bin
index 5f5ba0d6aacc940e203356b55f16149fc233515b..dbce619ef26ac45be7db3420a05f2a0a5be11416 100644
GIT binary patch
delta 69
zcmcb_e4crNG~@b>GS!S0W`<@!V5+I9psi4rnrx(Dpl7I~03<Xut+^Bw%HosrbMlJ}
Q6l@g|p-gM8S}raI0FI>+6aWAK

delta 45
xcmX@le2IC2G~=d?GS!SSrj|xPq^YT(tx%SlY@}hJXQ-oKpa&8(o4kQh9snXk3#0%5

diff --git a/bgfx/shaders/gles/chains/pillarbox_right_horizontal/vs_saturation.bin b/bgfx/shaders/gles/chains/pillarbox_right_horizontal/vs_saturation.bin
index 20b51375de0a01448551febe001533676e9616f2..1e806909f59c41fb3f06aeba6b5886321f8eeb3b 100644
GIT binary patch
delta 37
tcmcc0e42TJG~?=xGUbdSraB4+dKQ|R3fc-~smVqf272bElQ%M|007E=3HAU0

delta 47
vcmX@je3f~EG~?EdGUbeN#$ceMV4!EAsi~l?P?nl(q+y_E1_6_oGpYapG{p=H

diff --git a/bgfx/shaders/gles/chains/pillarbox_right_vertical/vs_saturation.bin b/bgfx/shaders/gles/chains/pillarbox_right_vertical/vs_saturation.bin
index 567cd53fd63bbdbb59265b752d2d9bb83b284915..c0f4dfa5a88401f4056362539fa1b6fed642c8d9 100644
GIT binary patch
delta 75
zcmcc2e3f~EG~?EdGS!TBW`<@!V5+I9psi4rnrx(Dpl7I~V4!DYVGIO7aceFGg|hhM
V{G9wE0|i@!L@3jmtCow40RZ@36JY=V

delta 45
ycmcc0e3^NIG~?!tGS!SSrj|xPq^YT(tx%SlY@}hJXQ-oKpl4tT1e3QiDgXc@kqfQ>

diff --git a/bgfx/shaders/glsl/chains/pillarbox_left_horizontal/vs_saturation.bin b/bgfx/shaders/glsl/chains/pillarbox_left_horizontal/vs_saturation.bin
index 6319f0af6f219753ed72d6348dbb92f765559542..061d861b6ed843c4995da7f9d487c6366bb34791 100644
GIT binary patch
delta 36
rcmZ3=ynuOvG-Ja?8DB<WQym2ZJqt}u1#N}0)MO(K13kmZjf^S)s=o-@

delta 41
tcmZ3$yp(x@G-K;V8DB;TV=&NBFwnEm)Kt(`C`(N?(lF37nq0%E0sz<C3Ecny

diff --git a/bgfx/shaders/glsl/chains/pillarbox_left_vertical/vs_saturation.bin b/bgfx/shaders/glsl/chains/pillarbox_left_vertical/vs_saturation.bin
index 0d8e84da2a00a1cd4f7a3f2abc004d761039cb9e..de0d4115e794d7362dd23d4bf63e57dbf85061d0 100644
GIT binary patch
delta 42
ucmZ3%yp(x@G-K;VnLtKKGea{VFxAvl&{il*O*Yan&@<Fg01}fs8RY@zv<fT$

delta 45
xcmZ3=yn=axG-Jm`nLtJvQ%fTt($rMYRwzqNHqtQAGt^Nq&;tpYO>Se92LK0K3eo@o

diff --git a/bgfx/shaders/glsl/chains/pillarbox_right_horizontal/vs_saturation.bin b/bgfx/shaders/glsl/chains/pillarbox_right_horizontal/vs_saturation.bin
index 3c794ab60042a79478e6ef158db4a6cefe7eadeb..c25635af5a854fa9d7204d9c67802a7ddae966d5 100644
GIT binary patch
delta 37
scmZ3@ypVZ<G-KmN8DB;bQym2ZJqt}u1#N}0)MO(K13h!o$?c3P0JPT$Bme*a

delta 47
ucmZ3;yqbA}G-LNh8DB;@V=&NBFwnEm)Kt(`C`(N?(lF37gMi7kj4A*ajSD#d

diff --git a/bgfx/shaders/glsl/chains/pillarbox_right_vertical/vs_saturation.bin b/bgfx/shaders/glsl/chains/pillarbox_right_vertical/vs_saturation.bin
index e0a84d1dba0e47b0882b3ce6725a43751d743d41..3b5a651f2e78fc6d93dc0bd446117ee39c5f6b3f 100644
GIT binary patch
delta 47
zcmZ3<yqbA}G-LNhnLtK4Gea{VFxAvl&{il*O*Yan&@<FgFwiryFb0Cjos0?q9)Jr(

delta 45
xcmZ3@ypnl>G-KyRnLtJvQ%fTt($rMYRwzqNHqtQAGt^Nq&@(Uvg2~;C3IGVH3fuqy

diff --git a/bgfx/shaders/metal/chains/pillarbox_left_horizontal/vs_saturation.bin b/bgfx/shaders/metal/chains/pillarbox_left_horizontal/vs_saturation.bin
index 77a27dd0e00106a792e635631c623fcc73d3029e..79234729f368f653ff98a1902560c89d83f83f2a 100644
GIT binary patch
delta 46
zcmZ3=wt$U0EZBpEvH8<O1_r^6+<TcsO?4Cu^ei+r6|@!7a`F>Pj5G}N3@1Ngas~h`
C!wlB|

delta 51
zcmZ3$wv>%KEZBpEvH8<O1_rT>+<Td%jKM%h!9dSKQ&T}(AuT6AvBXHjK+kCMT_$G$
DY9bBV

diff --git a/bgfx/shaders/metal/chains/pillarbox_left_vertical/vs_saturation.bin b/bgfx/shaders/metal/chains/pillarbox_left_vertical/vs_saturation.bin
index 0b0b45bfd501a52048f04eff7c837a2155a9b133..f9567cc2d504abad4e80028bc9a7254bfde25620 100644
GIT binary patch
delta 52
zcmZ3%wv>%KEZBpEvH8<O1_rT>+y|MY%?!<ez*JLHL0cg$CqJ>oNW(zSP)7ksOn${=
F2LONY4k-Wt

delta 55
zcmZ3=wt|g2EZBpEvH8<O1_sHE+y|NDOf8LoNK;cmTOlncKe5C}!$8kaN5Mc3By2YM
HIg=d#s(231

diff --git a/bgfx/shaders/metal/chains/pillarbox_right_horizontal/vs_saturation.bin b/bgfx/shaders/metal/chains/pillarbox_right_horizontal/vs_saturation.bin
index beb3b4360676035783bb54b233e46db380afd560..efd3de320035079d041ad93a500f59859750847a 100644
GIT binary patch
delta 47
zcmZ3@wvdfGEZBpEvH8<O1_q&x+<TeCOm!3t^ei+r6|@!7a`F>Pj5G}N%uOf1U~&ck
DJE09B

delta 57
zcmZ3;wwjGQEZBpEvH8<O1_qgp+<Tc6jKM%h!9dSKQ&T}(AuT6AvBXHjK+g;UCf{Rn
F1^~bc4>kY*

diff --git a/bgfx/shaders/metal/chains/pillarbox_right_vertical/vs_saturation.bin b/bgfx/shaders/metal/chains/pillarbox_right_vertical/vs_saturation.bin
index 18d373c6e5c5888bff9a7699c6063f03507220a7..5fdb790c1914657fbd314cbdb65f1d44132c15a4 100644
GIT binary patch
delta 57
zcmZ3<wwjGQEZBpEvH8<O1_qgp+y|Ky%nZ$dz*JLHL0cg$CqJ>oNW(zSP)ET)&&a|U
K2qwQ`vIhXjbq_%R

delta 55
zcmZ3@wvvrIEZBpEvH8<O1_r5(+y|NDOf8LoNK;cmTOlncKe5C}!$8kaN5MePz!V53
IzhSZm0IUuU*#H0l

diff --git a/src/osd/modules/render/bgfx/shaders/chains/pillarbox_left_horizontal/vs_saturation.sc b/src/osd/modules/render/bgfx/shaders/chains/pillarbox_left_horizontal/vs_saturation.sc
index 5ce10e25187..57be1439a8b 100644
--- a/src/osd/modules/render/bgfx/shaders/chains/pillarbox_left_horizontal/vs_saturation.sc
+++ b/src/osd/modules/render/bgfx/shaders/chains/pillarbox_left_horizontal/vs_saturation.sc
@@ -9,6 +9,6 @@ $output v_texcoord0, v_color0
 void main()
 {
 	gl_Position = mul(u_viewProj, vec4(a_position.xy, 0.0, 1.0));
-	v_texcoord0 = a_texcoord0 * vec2(0.16666666 * 0.8, 1.0 * 0.8) + vec2(0.2, 0.1);
+	v_texcoord0 = a_texcoord0 * vec2(0.16666666 * 0.9, 1.0 * 0.8) + vec2(0.1, 0.1);
 	v_color0 = a_color0;
 }
diff --git a/src/osd/modules/render/bgfx/shaders/chains/pillarbox_left_vertical/vs_saturation.sc b/src/osd/modules/render/bgfx/shaders/chains/pillarbox_left_vertical/vs_saturation.sc
index 3305b07810b..fc524496a1f 100644
--- a/src/osd/modules/render/bgfx/shaders/chains/pillarbox_left_vertical/vs_saturation.sc
+++ b/src/osd/modules/render/bgfx/shaders/chains/pillarbox_left_vertical/vs_saturation.sc
@@ -9,6 +9,6 @@ $output v_texcoord0, v_color0
 void main()
 {
 	gl_Position = mul(u_viewProj, vec4(a_position.xy, 0.0, 1.0));
-	v_texcoord0 = a_texcoord0 * vec2(1.0 * 0.8, 0.740740 * 0.8) + vec2(0.1, 0.25926);
+	v_texcoord0 = a_texcoord0 * vec2(1.0 * 0.8, 0.685185 * 0.9) + vec2(0.1, 0.1);
 	v_color0 = a_color0;
 }
diff --git a/src/osd/modules/render/bgfx/shaders/chains/pillarbox_right_horizontal/vs_saturation.sc b/src/osd/modules/render/bgfx/shaders/chains/pillarbox_right_horizontal/vs_saturation.sc
index f142ef653b7..c0f9321abc1 100644
--- a/src/osd/modules/render/bgfx/shaders/chains/pillarbox_right_horizontal/vs_saturation.sc
+++ b/src/osd/modules/render/bgfx/shaders/chains/pillarbox_right_horizontal/vs_saturation.sc
@@ -9,6 +9,6 @@ $output v_texcoord0, v_color0
 void main()
 {
 	gl_Position = mul(u_viewProj, vec4(a_position.xy, 0.0, 1.0));
-	v_texcoord0 = a_texcoord0 * vec2(0.16666666 * 0.8, 1.0 * 0.8) + vec2(1.0 - 0.3333333333, 0.1);
+	v_texcoord0 = a_texcoord0 * vec2(0.16666666 * 0.9, 1.0 * 0.8) + vec2(0.9 - 0.16666666 * 0.9, 0.1);
 	v_color0 = a_color0;
 }
diff --git a/src/osd/modules/render/bgfx/shaders/chains/pillarbox_right_vertical/vs_saturation.sc b/src/osd/modules/render/bgfx/shaders/chains/pillarbox_right_vertical/vs_saturation.sc
index ea4d47d9963..ef86b6a0a43 100644
--- a/src/osd/modules/render/bgfx/shaders/chains/pillarbox_right_vertical/vs_saturation.sc
+++ b/src/osd/modules/render/bgfx/shaders/chains/pillarbox_right_vertical/vs_saturation.sc
@@ -9,6 +9,6 @@ $output v_texcoord0, v_color0
 void main()
 {
 	gl_Position = mul(u_viewProj, vec4(a_position.xy, 0.0, 1.0));
-	v_texcoord0 = a_texcoord0 * vec2(1.0 * 0.8, 0.740740 * 0.8) + vec2(0.1, 0.055555);
+	v_texcoord0 = a_texcoord0 * vec2(1.0 * 0.8, 0.685185 * 0.9) + vec2(0.1, 0.9 - 0.685185 * 0.9);
 	v_color0 = a_color0;
 }

From 4e2fefdd150c6124d70e86f00393bbd95f51e54b Mon Sep 17 00:00:00 2001
From: "R. Belmont" <rb6502@users.noreply.github.com>
Date: Sun, 17 Apr 2016 15:36:50 -0400
Subject: [PATCH 049/122] apple2e: fix C800 internal ROM reading [R. Belmont]

---
 src/mame/drivers/apple2e.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/mame/drivers/apple2e.cpp b/src/mame/drivers/apple2e.cpp
index d5ef8f11de4..b2a29d9a46e 100644
--- a/src/mame/drivers/apple2e.cpp
+++ b/src/mame/drivers/apple2e.cpp
@@ -1978,7 +1978,6 @@ READ8_MEMBER(apple2e_state::c800_int_r)
 	{
 		m_cnxx_slot = CNXX_UNCLAIMED;
 		update_slotrom_banks();
-		return 0xff;
 	}
 
 	return m_rom_ptr[0x800 + offset];
@@ -1995,7 +1994,6 @@ READ8_MEMBER(apple2e_state::c800_b2_int_r)
 	{
 		m_cnxx_slot = CNXX_UNCLAIMED;
 		update_slotrom_banks();
-		return 0xff;
 	}
 
 	return m_rom_ptr[0x4800 + offset];

From ef4f80b4a4278305c17edb2837d407f8a66d9957 Mon Sep 17 00:00:00 2001
From: Brad Hughes <bradhugh@outlook.com>
Date: Sun, 17 Apr 2016 13:41:27 -0400
Subject: [PATCH 050/122] Create diagnostic module for profiling and crash
 diagnostics

---
 scripts/src/osd/modules.lua                   |    3 +
 .../modules/diagnostics/diagnostics_module.h  |   42 +
 .../modules/diagnostics/diagnostics_win32.cpp | 1086 +++++++++++++++++
 src/osd/modules/diagnostics/none.cpp          |   55 +
 src/osd/sdl/sdlmain.cpp                       |    3 +
 src/osd/windows/winmain.cpp                   | 1020 +---------------
 src/osd/windows/winmain.h                     |   14 +-
 7 files changed, 1204 insertions(+), 1019 deletions(-)
 create mode 100644 src/osd/modules/diagnostics/diagnostics_module.h
 create mode 100644 src/osd/modules/diagnostics/diagnostics_win32.cpp
 create mode 100644 src/osd/modules/diagnostics/none.cpp

diff --git a/scripts/src/osd/modules.lua b/scripts/src/osd/modules.lua
index aa5cb7357d5..d372ed9761c 100644
--- a/scripts/src/osd/modules.lua
+++ b/scripts/src/osd/modules.lua
@@ -51,8 +51,11 @@ function osdmodulesbuild()
 		MAME_DIR .. "src/osd/modules/midi/midi_module.h",
 		MAME_DIR .. "src/osd/modules/netdev/netdev_module.h",
 		MAME_DIR .. "src/osd/modules/sound/sound_module.h",
+		MAME_DIR .. "src/osd/modules/diagnostics/diagnostics_module.h",
 		MAME_DIR .. "src/osd/modules/lib/osdobj_common.cpp",
 		MAME_DIR .. "src/osd/modules/lib/osdobj_common.h",
+		MAME_DIR .. "src/osd/modules/diagnostics/none.cpp",
+		MAME_DIR .. "src/osd/modules/diagnostics/diagnostics_win32.cpp",
 		MAME_DIR .. "src/osd/modules/debugger/none.cpp",
 		MAME_DIR .. "src/osd/modules/debugger/debugint.cpp",
 		MAME_DIR .. "src/osd/modules/debugger/debugwin.cpp",
diff --git a/src/osd/modules/diagnostics/diagnostics_module.h b/src/osd/modules/diagnostics/diagnostics_module.h
new file mode 100644
index 00000000000..5e92178d492
--- /dev/null
+++ b/src/osd/modules/diagnostics/diagnostics_module.h
@@ -0,0 +1,42 @@
+// license:BSD-3-Clause
+// copyright-holders:Brad Hughes
+/***************************************************************************
+
+diagnostics_module.h
+
+Diagnostics module interface
+
+***************************************************************************/
+#ifndef DIAGNOSTICS_MODULE_H_
+#define DIAGNOSTICS_MODULE_H_
+
+#include "osdepend.h"
+
+//============================================================
+//  CONSTANTS
+//============================================================
+
+class diagnostics_module
+{
+public:
+	diagnostics_module() { }
+
+	virtual ~diagnostics_module() { }
+
+	// initializes crash diagnostics for MAME
+	virtual int init_crash_diagnostics() = 0;
+
+	// starts the profiler
+	virtual void start_profiler(std::uint32_t max_seconds, std::uint8_t stack_depth) = 0;
+	
+	// stops the currently active profiler
+	virtual void stop_profiler() = 0;
+
+	// prints the results of the profiling operation
+	virtual void print_profiler_results() = 0;
+
+	// Gets the instance of the diagnostic module
+	static diagnostics_module* get_instance();
+};
+
+#endif
\ No newline at end of file
diff --git a/src/osd/modules/diagnostics/diagnostics_win32.cpp b/src/osd/modules/diagnostics/diagnostics_win32.cpp
new file mode 100644
index 00000000000..2b6d182d844
--- /dev/null
+++ b/src/osd/modules/diagnostics/diagnostics_win32.cpp
@@ -0,0 +1,1086 @@
+// license:BSD-3-Clause
+// copyright-holders:Aaron Giles, Brad Hughes
+//====================================================================
+//
+//  diagnostics_win32.cpp - Win32 implementation of diagnostic module
+//
+//====================================================================
+
+#include "diagnostics_module.h"
+
+#if defined(OSD_WINDOWS) || defined(SDLMAME_WIN32)
+
+// standard windows headers
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+
+#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
+#include <debugger.h>
+
+#include <psapi.h>
+#include <dbghelp.h>
+
+#include <memory>
+#include <vector>
+#include <windows/winutil.h>
+
+template<typename _FunctionPtr>
+class dynamic_bind
+{
+public:
+	// constructor which looks up the function
+	dynamic_bind(const TCHAR *dll, const char *symbol)
+		: m_function(nullptr)
+	{
+		HMODULE module = LoadLibrary(dll);
+		if (module != nullptr)
+			m_function = reinterpret_cast<_FunctionPtr>(GetProcAddress(module, symbol));
+	}
+
+	// bool to test if the function is nullptr or not
+	operator bool() const { return (m_function != nullptr); }
+
+	// dereference to get the underlying pointer
+	_FunctionPtr operator *() const { return m_function; }
+
+private:
+	_FunctionPtr    m_function;
+};
+
+class stack_walker
+{
+public:
+	stack_walker();
+
+	FPTR ip() const { return m_stackframe.AddrPC.Offset; }
+	FPTR sp() const { return m_stackframe.AddrStack.Offset; }
+	FPTR frame() const { return m_stackframe.AddrFrame.Offset; }
+
+	bool reset();
+	void reset(CONTEXT &context, HANDLE thread);
+	bool unwind();
+
+private:
+	HANDLE          m_process;
+	HANDLE          m_thread;
+	STACKFRAME64    m_stackframe;
+	CONTEXT         m_context;
+	bool            m_first;
+
+	dynamic_bind<BOOL(WINAPI *)(DWORD, HANDLE, HANDLE, LPSTACKFRAME64, PVOID, PREAD_PROCESS_MEMORY_ROUTINE64, PFUNCTION_TABLE_ACCESS_ROUTINE64, PGET_MODULE_BASE_ROUTINE64, PTRANSLATE_ADDRESS_ROUTINE64)>
+		m_stack_walk_64;
+	dynamic_bind<BOOL(WINAPI *)(HANDLE, LPCTSTR, BOOL)> m_sym_initialize;
+	dynamic_bind<PVOID(WINAPI *)(HANDLE, DWORD64)> m_sym_function_table_access_64;
+	dynamic_bind<DWORD64(WINAPI *)(HANDLE, DWORD64)> m_sym_get_module_base_64;
+	dynamic_bind<VOID(WINAPI *)(PCONTEXT)> m_rtl_capture_context;
+
+	static bool     s_initialized;
+};
+
+
+class symbol_manager
+{
+public:
+	// construction/destruction
+	symbol_manager(const char *argv0);
+	~symbol_manager();
+
+	// getters
+	FPTR last_base() const { return m_last_base; }
+
+	// core symbol lookup
+	const char *symbol_for_address(FPTR address);
+	const char *symbol_for_address(PVOID address) { return symbol_for_address(reinterpret_cast<FPTR>(address)); }
+
+	// force symbols to be cached
+	void cache_symbols() { scan_file_for_address(0, true); }
+
+	void reset_cache() { m_cache.reset(); }
+private:
+	// internal helpers
+	bool query_system_for_address(FPTR address);
+	void scan_file_for_address(FPTR address, bool create_cache);
+	bool parse_sym_line(const char *line, FPTR &address, std::string &symbol);
+	bool parse_map_line(const char *line, FPTR &address, std::string &symbol);
+	void scan_cache_for_address(FPTR address);
+	void format_symbol(const char *name, UINT32 displacement, const char *filename = nullptr, int linenumber = 0);
+
+	static FPTR get_text_section_base();
+
+	struct cache_entry
+	{
+		cache_entry(FPTR address, const char *symbol) :
+			m_next(nullptr), m_address(address), m_name(symbol) { }
+		cache_entry *next() const { return m_next; }
+
+		cache_entry *   m_next;
+		FPTR            m_address;
+		std::string     m_name;
+	};
+	simple_list<cache_entry> m_cache;
+
+	std::string     m_mapfile;
+	std::string     m_symfile;
+	std::string     m_buffer;
+	HANDLE          m_process;
+	FPTR            m_last_base;
+	FPTR            m_text_base;
+
+	dynamic_bind<BOOL(WINAPI *)(HANDLE, DWORD64, PDWORD64, PSYMBOL_INFO)> m_sym_from_addr;
+	dynamic_bind<BOOL(WINAPI *)(HANDLE, DWORD64, PDWORD, PIMAGEHLP_LINE64)> m_sym_get_line_from_addr_64;
+};
+
+class sampling_profiler
+{
+public:
+	sampling_profiler(UINT32 max_seconds, UINT8 stack_depth);
+	~sampling_profiler();
+
+	void start();
+	void stop();
+
+	//  void reset();
+	void print_results(symbol_manager &symbols);
+
+private:
+	static DWORD WINAPI thread_entry(LPVOID lpParameter);
+	void thread_run();
+
+	static int CLIB_DECL compare_address(const void *item1, const void *item2);
+	static int CLIB_DECL compare_frequency(const void *item1, const void *item2);
+
+	HANDLE          m_target_thread;
+
+	HANDLE          m_thread;
+	DWORD           m_thread_id;
+	volatile bool   m_thread_exit;
+
+	UINT8           m_stack_depth;
+	UINT8           m_entry_stride;
+	std::vector<FPTR>    m_buffer;
+	FPTR *          m_buffer_ptr;
+	FPTR *          m_buffer_end;
+};
+
+
+//**************************************************************************
+//  STACK WALKER
+//**************************************************************************
+
+bool stack_walker::s_initialized = false;
+
+//-------------------------------------------------
+//  stack_walker - constructor
+//-------------------------------------------------
+
+stack_walker::stack_walker()
+	: m_process(GetCurrentProcess()),
+	m_thread(GetCurrentThread()),
+	m_first(true),
+	m_stack_walk_64(TEXT("dbghelp.dll"), "StackWalk64"),
+	m_sym_initialize(TEXT("dbghelp.dll"), "SymInitialize"),
+	m_sym_function_table_access_64(TEXT("dbghelp.dll"), "SymFunctionTableAccess64"),
+	m_sym_get_module_base_64(TEXT("dbghelp.dll"), "SymGetModuleBase64"),
+	m_rtl_capture_context(TEXT("kernel32.dll"), "RtlCaptureContext")
+{
+	// zap the structs
+	memset(&m_stackframe, 0, sizeof(m_stackframe));
+	memset(&m_context, 0, sizeof(m_context));
+
+	// initialize the symbols
+	if (!s_initialized && m_sym_initialize && m_stack_walk_64 && m_sym_function_table_access_64 && m_sym_get_module_base_64)
+	{
+		(*m_sym_initialize)(m_process, nullptr, TRUE);
+		s_initialized = true;
+	}
+}
+
+
+//-------------------------------------------------
+//  reset - set up a new context
+//-------------------------------------------------
+
+bool stack_walker::reset()
+{
+	// set up the initial state
+	if (!m_rtl_capture_context)
+		return false;
+	(*m_rtl_capture_context)(&m_context);
+	m_thread = GetCurrentThread();
+	m_first = true;
+
+	// initialize the stackframe
+	memset(&m_stackframe, 0, sizeof(m_stackframe));
+	m_stackframe.AddrPC.Mode = AddrModeFlat;
+	m_stackframe.AddrFrame.Mode = AddrModeFlat;
+	m_stackframe.AddrStack.Mode = AddrModeFlat;
+
+	// pull architecture-specific fields from the context
+#ifdef PTR64
+	m_stackframe.AddrPC.Offset = m_context.Rip;
+	m_stackframe.AddrFrame.Offset = m_context.Rsp;
+	m_stackframe.AddrStack.Offset = m_context.Rsp;
+#else
+	m_stackframe.AddrPC.Offset = m_context.Eip;
+	m_stackframe.AddrFrame.Offset = m_context.Ebp;
+	m_stackframe.AddrStack.Offset = m_context.Esp;
+#endif
+	return true;
+}
+
+void stack_walker::reset(CONTEXT &initial, HANDLE thread)
+{
+	// set up the initial state
+	m_context = initial;
+	m_thread = thread;
+	m_first = true;
+
+	// initialize the stackframe
+	memset(&m_stackframe, 0, sizeof(m_stackframe));
+	m_stackframe.AddrPC.Mode = AddrModeFlat;
+	m_stackframe.AddrFrame.Mode = AddrModeFlat;
+	m_stackframe.AddrStack.Mode = AddrModeFlat;
+
+	// pull architecture-specific fields from the context
+#ifdef PTR64
+	m_stackframe.AddrPC.Offset = m_context.Rip;
+	m_stackframe.AddrFrame.Offset = m_context.Rsp;
+	m_stackframe.AddrStack.Offset = m_context.Rsp;
+#else
+	m_stackframe.AddrPC.Offset = m_context.Eip;
+	m_stackframe.AddrFrame.Offset = m_context.Ebp;
+	m_stackframe.AddrStack.Offset = m_context.Esp;
+#endif
+}
+
+
+//-------------------------------------------------
+//  unwind - unwind a single level
+//-------------------------------------------------
+
+bool stack_walker::unwind()
+{
+	// if we were able to initialize, then we have everything we need
+	if (s_initialized)
+	{
+#ifdef PTR64
+		return (*m_stack_walk_64)(IMAGE_FILE_MACHINE_AMD64, m_process, m_thread, &m_stackframe, &m_context, nullptr, *m_sym_function_table_access_64, *m_sym_get_module_base_64, nullptr);
+#else
+		return (*m_stack_walk_64)(IMAGE_FILE_MACHINE_I386, m_process, m_thread, &m_stackframe, &m_context, nullptr, *m_sym_function_table_access_64, *m_sym_get_module_base_64, nullptr);
+#endif
+	}
+
+	// otherwise, fake the first unwind, which will just return info from the context
+	else
+	{
+		bool result = m_first;
+		m_first = false;
+		return result;
+	}
+}
+
+
+
+//**************************************************************************
+//  SYMBOL MANAGER
+//**************************************************************************
+
+//-------------------------------------------------
+//  symbol_manager - constructor
+//-------------------------------------------------
+
+symbol_manager::symbol_manager(const char *argv0)
+	: m_mapfile(argv0),
+	m_symfile(argv0),
+	m_process(GetCurrentProcess()),
+	m_last_base(0),
+	m_text_base(0),
+	m_sym_from_addr(TEXT("dbghelp.dll"), "SymFromAddr"),
+	m_sym_get_line_from_addr_64(TEXT("dbghelp.dll"), "SymGetLineFromAddr64")
+{
+#ifdef __GNUC__
+	// compute the name of the mapfile
+	int extoffs = m_mapfile.find_last_of('.');
+	if (extoffs != -1)
+		m_mapfile.substr(0, extoffs);
+	m_mapfile.append(".map");
+
+	// and the name of the symfile
+	extoffs = m_symfile.find_last_of('.');
+	if (extoffs != -1)
+		m_symfile = m_symfile.substr(0, extoffs);
+	m_symfile.append(".sym");
+
+	// figure out the base of the .text section
+	m_text_base = get_text_section_base();
+#endif
+
+	// expand the buffer to be decently large up front
+	m_buffer = string_format("%500s", "");
+}
+
+
+//-------------------------------------------------
+//  ~symbol_manager - destructor
+//-------------------------------------------------
+
+symbol_manager::~symbol_manager()
+{
+}
+
+
+//-------------------------------------------------
+//  symbol_for_address - return a symbol by looking
+//  it up either in the cache or by scanning the
+//  file
+//-------------------------------------------------
+
+const char *symbol_manager::symbol_for_address(FPTR address)
+{
+	// default the buffer
+	m_buffer.assign(" (not found)");
+	m_last_base = 0;
+
+	// first try to do it using system APIs
+	if (!query_system_for_address(address))
+	{
+		// if that fails, scan the cache if we have one
+		if (!m_cache.empty())
+			scan_cache_for_address(address);
+
+		// or else try to open a sym/map file and find it there
+		else
+			scan_file_for_address(address, false);
+	}
+	return m_buffer.c_str();
+}
+
+
+//-------------------------------------------------
+//  query_system_for_address - ask the system to
+//  look up our address
+//-------------------------------------------------
+
+bool symbol_manager::query_system_for_address(FPTR address)
+{
+	// need at least the sym_from_addr API
+	if (!m_sym_from_addr)
+		return false;
+
+	BYTE info_buffer[sizeof(SYMBOL_INFO) + 256] = { 0 };
+	SYMBOL_INFO &info = *reinterpret_cast<SYMBOL_INFO *>(&info_buffer[0]);
+	DWORD64 displacement;
+
+	// even through the struct says TCHAR, we actually get back an ANSI string here
+	info.SizeOfStruct = sizeof(info);
+	info.MaxNameLen = sizeof(info_buffer) - sizeof(info);
+	if ((*m_sym_from_addr)(m_process, address, &displacement, &info))
+	{
+		// try to get source info as well; again we are returned an ANSI string
+		IMAGEHLP_LINE64 lineinfo = { sizeof(lineinfo) };
+		DWORD linedisp;
+		if (m_sym_get_line_from_addr_64 && (*m_sym_get_line_from_addr_64)(m_process, address, &linedisp, &lineinfo))
+			format_symbol(info.Name, displacement, lineinfo.FileName, lineinfo.LineNumber);
+		else
+			format_symbol(info.Name, displacement);
+
+		// set the last base
+		m_last_base = address - displacement;
+		return true;
+	}
+	return false;
+}
+
+
+//-------------------------------------------------
+//  scan_file_for_address - walk either the map
+//  or symbol files and find the best match for
+//  the given address, optionally creating a cache
+//  along the way
+//-------------------------------------------------
+
+void symbol_manager::scan_file_for_address(FPTR address, bool create_cache)
+{
+	bool is_symfile = false;
+	FILE *srcfile = nullptr;
+
+#ifdef __GNUC__
+	// see if we have a symbol file (gcc only)
+	srcfile = fopen(m_symfile.c_str(), "r");
+	is_symfile = (srcfile != nullptr);
+#endif
+
+	// if not, see if we have a map file
+	if (srcfile == nullptr)
+		srcfile = fopen(m_mapfile.c_str(), "r");
+
+	// if not, fail
+	if (srcfile == nullptr)
+		return;
+
+	// reset the best info
+	std::string best_symbol;
+	FPTR best_addr = 0;
+
+	// parse the file, looking for valid entries
+	std::string symbol;
+	char line[1024];
+	while (fgets(line, sizeof(line) - 1, srcfile))
+	{
+		// parse the line looking for an interesting symbol
+		FPTR addr = 0;
+		bool valid = is_symfile ? parse_sym_line(line, addr, symbol) : parse_map_line(line, addr, symbol);
+
+		// if we got one, see if this is the best
+		if (valid)
+		{
+			// if this is the best one so far, remember it
+			if (addr <= address && addr > best_addr)
+			{
+				best_addr = addr;
+				best_symbol = symbol;
+			}
+
+			// also create a cache entry if we can
+			if (create_cache)
+				m_cache.append(*global_alloc(cache_entry(addr, symbol.c_str())));
+		}
+	}
+
+	// close the file
+	fclose(srcfile);
+
+	// format the symbol and remember the last base
+	format_symbol(best_symbol.c_str(), address - best_addr);
+	m_last_base = best_addr;
+}
+
+
+//-------------------------------------------------
+//  scan_cache_for_address - walk the cache to
+//  find the best match for the given address
+//-------------------------------------------------
+
+void symbol_manager::scan_cache_for_address(FPTR address)
+{
+	// reset the best info
+	std::string best_symbol;
+	FPTR best_addr = 0;
+
+	// walk the cache, looking for valid entries
+	for (cache_entry &entry : m_cache)
+
+		// if this is the best one so far, remember it
+		if (entry.m_address <= address && entry.m_address > best_addr)
+		{
+			best_addr = entry.m_address;
+			best_symbol = entry.m_name;
+		}
+
+	// format the symbol and remember the last base
+	format_symbol(best_symbol.c_str(), address - best_addr);
+	m_last_base = best_addr;
+}
+
+
+//-------------------------------------------------
+//  parse_sym_line - parse a line from a sym file
+//  which is just the output of objdump
+//-------------------------------------------------
+
+bool symbol_manager::parse_sym_line(const char *line, FPTR &address, std::string &symbol)
+{
+#ifdef __GNUC__
+	/*
+	32-bit gcc symbol line:
+	[271778](sec  1)(fl 0x00)(ty  20)(scl   3) (nx 0) 0x007df675 line_to_symbol(char const*, unsigned int&, bool)
+
+	64-bit gcc symbol line:
+	[271775](sec  1)(fl 0x00)(ty  20)(scl   3) (nx 0) 0x00000000008dd1e9 line_to_symbol(char const*, unsigned long long&, bool)
+	*/
+
+	// first look for a (ty) entry
+	const char *type = strstr(line, "(ty  20)");
+	if (type == nullptr)
+		return false;
+
+	// scan forward in the line to find the address
+	bool in_parens = false;
+	for (const char *chptr = type; *chptr != 0; chptr++)
+	{
+		// track open/close parentheses
+		if (*chptr == '(')
+			in_parens = true;
+		else if (*chptr == ')')
+			in_parens = false;
+
+		// otherwise, look for an 0x address
+		else if (!in_parens && *chptr == '0' && chptr[1] == 'x')
+		{
+			// make sure we can get an address
+			void *temp;
+			if (sscanf(chptr, "0x%p", &temp) != 1)
+				return false;
+			address = m_text_base + reinterpret_cast<FPTR>(temp);
+
+			// skip forward until we're past the space
+			while (*chptr != 0 && !isspace(*chptr))
+				chptr++;
+
+			// extract the symbol name
+			strtrimspace(symbol.assign(chptr));
+			return (symbol.length() > 0);
+		}
+	}
+#endif
+	return false;
+}
+
+
+//-------------------------------------------------
+//  parse_map_line - parse a line from a linker-
+//  generated map file
+//-------------------------------------------------
+
+bool symbol_manager::parse_map_line(const char *line, FPTR &address, std::string &symbol)
+{
+#ifdef __GNUC__
+	/*
+	32-bit gcc map line:
+	0x0089cb00                nbmj9195_palette_r(_address_space const*, unsigned int)
+
+	64-bit gcc map line:
+	0x0000000000961afc                nbmj9195_palette_r(_address_space const*, unsigned int)
+	*/
+
+	// find a matching start
+	if (strncmp(line, "                0x", 18) == 0)
+	{
+		// make sure we can get an address
+		void *temp;
+		if (sscanf(&line[16], "0x%p", &temp) != 1)
+			return false;
+		address = reinterpret_cast<FPTR>(temp);
+
+		// skip forward until we're past the space
+		const char *chptr = &line[16];
+		while (*chptr != 0 && !isspace(*chptr))
+			chptr++;
+
+		// extract the symbol name
+		strtrimspace(symbol.assign(chptr));
+		return (symbol.length() > 0);
+	}
+#endif
+	return false;
+}
+
+
+//-------------------------------------------------
+//  format_symbol - common symbol formatting
+//-------------------------------------------------
+
+void symbol_manager::format_symbol(const char *name, UINT32 displacement, const char *filename, int linenumber)
+{
+	// start with the address and offset
+	m_buffer = string_format(" (%s", name);
+	if (displacement != 0)
+		m_buffer.append(string_format("+0x%04x", (UINT32)displacement));
+
+	// append file/line if present
+	if (filename != nullptr)
+		m_buffer.append(string_format(", %s:%d", filename, linenumber));
+
+	// close up the string
+	m_buffer.append(")");
+}
+
+
+//-------------------------------------------------
+//  get_text_section_base - figure out the base
+//  of the .text section
+//-------------------------------------------------
+
+FPTR symbol_manager::get_text_section_base()
+{
+	dynamic_bind<PIMAGE_SECTION_HEADER(WINAPI *)(PIMAGE_NT_HEADERS, PVOID, ULONG)> image_rva_to_section(TEXT("dbghelp.dll"), "ImageRvaToSection");
+	dynamic_bind<PIMAGE_NT_HEADERS(WINAPI *)(PVOID)> image_nt_header(TEXT("dbghelp.dll"), "ImageNtHeader");
+
+	// start with the image base
+	PVOID base = reinterpret_cast<PVOID>(GetModuleHandleUni());
+	assert(base != nullptr);
+
+	// make sure we have the functions we need
+	if (image_nt_header && image_rva_to_section)
+	{
+		// get the NT header
+		PIMAGE_NT_HEADERS headers = (*image_nt_header)(base);
+		assert(headers != nullptr);
+
+		// look ourself up (assuming we are in the .text section)
+		PIMAGE_SECTION_HEADER section = (*image_rva_to_section)(headers, base, reinterpret_cast<FPTR>(get_text_section_base) - reinterpret_cast<FPTR>(base));
+		if (section != nullptr)
+			return reinterpret_cast<FPTR>(base) + section->VirtualAddress;
+	}
+
+	// fallback to returning the image base (wrong)
+	return reinterpret_cast<FPTR>(base);
+}
+
+
+
+//**************************************************************************
+//  SAMPLING PROFILER
+//**************************************************************************
+
+//-------------------------------------------------
+//  sampling_profiler - constructor
+//-------------------------------------------------
+
+sampling_profiler::sampling_profiler(UINT32 max_seconds, UINT8 stack_depth = 0)
+	: m_target_thread(nullptr),
+	m_thread(nullptr),
+	m_thread_id(0),
+	m_thread_exit(false),
+	m_stack_depth(stack_depth),
+	m_entry_stride(stack_depth + 2),
+	m_buffer(max_seconds * 1000 * m_entry_stride),
+	m_buffer_ptr(&m_buffer[0]),
+	m_buffer_end(&m_buffer[0] + max_seconds * 1000 * m_entry_stride)
+{
+}
+
+
+//-------------------------------------------------
+//  sampling_profiler - destructor
+//-------------------------------------------------
+
+sampling_profiler::~sampling_profiler()
+{
+}
+
+
+//-------------------------------------------------
+//  start - begin gathering profiling information
+//-------------------------------------------------
+
+void sampling_profiler::start()
+{
+	// do the dance to get a handle to ourself
+	BOOL result = DuplicateHandle(GetCurrentProcess(), GetCurrentThread(), GetCurrentProcess(), &m_target_thread,
+		THREAD_GET_CONTEXT | THREAD_SUSPEND_RESUME | THREAD_QUERY_INFORMATION, FALSE, 0);
+	assert_always(result, "Failed to get thread handle for main thread");
+
+	// reset the exit flag
+	m_thread_exit = false;
+
+	// start the thread
+	m_thread = CreateThread(nullptr, 0, thread_entry, (LPVOID)this, 0, &m_thread_id);
+	assert_always(m_thread != nullptr, "Failed to create profiler thread\n");
+
+	// max out the priority
+	SetThreadPriority(m_thread, THREAD_PRIORITY_TIME_CRITICAL);
+}
+
+
+//-------------------------------------------------
+//  stop - stop gathering profiling information
+//-------------------------------------------------
+
+void sampling_profiler::stop()
+{
+	// set the flag and wait a couple of seconds (max)
+	m_thread_exit = true;
+	WaitForSingleObject(m_thread, 2000);
+
+	// regardless, close the handle
+	CloseHandle(m_thread);
+}
+
+
+//-------------------------------------------------
+//  compare_address - compare two entries by their
+//  bucket address
+//-------------------------------------------------
+
+int CLIB_DECL sampling_profiler::compare_address(const void *item1, const void *item2)
+{
+	const FPTR *entry1 = reinterpret_cast<const FPTR *>(item1);
+	const FPTR *entry2 = reinterpret_cast<const FPTR *>(item2);
+	int mincount = MIN(entry1[0], entry2[0]);
+
+	// sort in order of: bucket, caller, caller's caller, etc.
+	for (int index = 1; index <= mincount; index++)
+		if (entry1[index] != entry2[index])
+			return entry1[index] - entry2[index];
+
+	// if we match to the end, sort by the depth of the stack
+	return entry1[0] - entry2[0];
+}
+
+
+//-------------------------------------------------
+//  compare_frequency - compare two entries by
+//  their frequency of occurrence
+//-------------------------------------------------
+
+int CLIB_DECL sampling_profiler::compare_frequency(const void *item1, const void *item2)
+{
+	const FPTR *entry1 = reinterpret_cast<const FPTR *>(item1);
+	const FPTR *entry2 = reinterpret_cast<const FPTR *>(item2);
+
+	// sort by frequency, then by address
+	if (entry1[0] != entry2[0])
+		return entry2[0] - entry1[0];
+	return entry1[1] - entry2[1];
+}
+
+
+//-------------------------------------------------
+//  print_results - output the results
+//-------------------------------------------------
+
+void sampling_profiler::print_results(symbol_manager &symbols)
+{
+	// cache the symbols
+	symbols.cache_symbols();
+
+	// step 1: find the base of each entry
+	for (FPTR *current = &m_buffer[0]; current < m_buffer_ptr; current += m_entry_stride)
+	{
+		assert(current[0] >= 1 && current[0] < m_entry_stride);
+
+		// convert the sampled PC to its function base as a bucket
+		symbols.symbol_for_address(current[1]);
+		current[1] = symbols.last_base();
+	}
+
+	// step 2: sort the results
+	qsort(&m_buffer[0], (m_buffer_ptr - &m_buffer[0]) / m_entry_stride, m_entry_stride * sizeof(FPTR), compare_address);
+
+	// step 3: count and collapse unique entries
+	UINT32 total_count = 0;
+	for (FPTR *current = &m_buffer[0]; current < m_buffer_ptr; )
+	{
+		int count = 1;
+		FPTR *scan;
+		for (scan = current + m_entry_stride; scan < m_buffer_ptr; scan += m_entry_stride)
+		{
+			if (compare_address(current, scan) != 0)
+				break;
+			scan[0] = 0;
+			count++;
+		}
+		current[0] = count;
+		total_count += count;
+		current = scan;
+	}
+
+	// step 4: sort the results again, this time by frequency
+	qsort(&m_buffer[0], (m_buffer_ptr - &m_buffer[0]) / m_entry_stride, m_entry_stride * sizeof(FPTR), compare_frequency);
+
+	// step 5: print the results
+	UINT32 num_printed = 0;
+	for (FPTR *current = &m_buffer[0]; current < m_buffer_ptr && num_printed < 30; current += m_entry_stride)
+	{
+		// once we hit 0 frequency, we're done
+		if (current[0] == 0)
+			break;
+
+		// output the result
+		printf("%4.1f%% - %6d : %p%s\n", (double)current[0] * 100.0 / (double)total_count, (UINT32)current[0], reinterpret_cast<void *>(current[1]), symbols.symbol_for_address(current[1]));
+		for (int index = 2; index < m_entry_stride; index++)
+		{
+			if (current[index] == 0)
+				break;
+			printf("                 %p%s\n", reinterpret_cast<void *>(current[index]), symbols.symbol_for_address(current[index]));
+		}
+		printf("\n");
+		num_printed++;
+	}
+	symbols.reset_cache();
+}
+
+
+//-------------------------------------------------
+//  thread_entry - thread entry stub
+//-------------------------------------------------
+
+DWORD WINAPI sampling_profiler::thread_entry(LPVOID lpParameter)
+{
+	reinterpret_cast<sampling_profiler *>(lpParameter)->thread_run();
+	return 0;
+}
+
+
+//-------------------------------------------------
+//  thread_run - sampling thread
+//-------------------------------------------------
+
+void sampling_profiler::thread_run()
+{
+	CONTEXT context;
+	memset(&context, 0, sizeof(context));
+
+	// loop until done
+	stack_walker walker;
+	while (!m_thread_exit && m_buffer_ptr < m_buffer_end)
+	{
+		// pause the main thread and get its context
+		SuspendThread(m_target_thread);
+		context.ContextFlags = CONTEXT_FULL;
+		GetThreadContext(m_target_thread, &context);
+
+		// first entry is a count
+		FPTR *count = m_buffer_ptr++;
+		*count = 0;
+
+		// iterate over the frames until we run out or hit an error
+		walker.reset(context, m_target_thread);
+		int frame;
+		for (frame = 0; frame <= m_stack_depth && walker.unwind(); frame++)
+		{
+			*m_buffer_ptr++ = walker.ip();
+			*count += 1;
+		}
+
+		// fill in any missing parts with nulls
+		for (; frame <= m_stack_depth; frame++)
+			*m_buffer_ptr++ = 0;
+
+		// resume the thread
+		ResumeThread(m_target_thread);
+
+		// sleep for 1ms
+		Sleep(1);
+	}
+}
+
+/*-----------------------------------------------------------------------------
+    Diagnostics module for Win32
+-----------------------------------------------------------------------------*/
+
+class diagnostics_win32 : public diagnostics_module
+{
+	friend diagnostics_module* diagnostics_module::get_instance();
+
+private:
+	std::unique_ptr<symbol_manager>    m_symbols;
+	std::unique_ptr<sampling_profiler> m_sampling_profiler;
+	LPTOP_LEVEL_EXCEPTION_FILTER m_pass_thru_filter;
+
+	diagnostics_win32(): m_pass_thru_filter(nullptr)
+	{
+	}
+
+public:
+	int init_crash_diagnostics() override
+	{
+		ensure_symbols();
+
+		// set up exception handling
+		m_pass_thru_filter = SetUnhandledExceptionFilter(diagnostics_win32::exception_filter);
+		SetErrorMode(SEM_FAILCRITICALERRORS | SEM_NOGPFAULTERRORBOX);
+
+		return 0;
+	}
+
+	void start_profiler(std::uint32_t max_seconds, std::uint8_t stack_depth) override
+	{
+		m_sampling_profiler = std::make_unique<sampling_profiler>(max_seconds, stack_depth);
+		m_sampling_profiler->start();
+	}
+
+	void stop_profiler() override
+	{
+		if (m_sampling_profiler != nullptr)
+		{
+			m_sampling_profiler->stop();
+		}
+	}
+
+	void print_profiler_results() override
+	{
+		if (m_sampling_profiler != nullptr)
+		{
+			ensure_symbols();
+			m_sampling_profiler->print_results(*m_symbols.get());
+		}
+	}
+
+private:
+	//============================================================
+	//  exception_filter
+	//============================================================
+
+	static long __stdcall exception_filter(struct _EXCEPTION_POINTERS *info)
+	{
+		static const struct
+		{
+			DWORD code;
+			const char *string;
+		} exception_table[] =
+		{
+			{ EXCEPTION_ACCESS_VIOLATION,       "ACCESS VIOLATION" },
+			{ EXCEPTION_DATATYPE_MISALIGNMENT,  "DATATYPE MISALIGNMENT" },
+			{ EXCEPTION_BREAKPOINT,             "BREAKPOINT" },
+			{ EXCEPTION_SINGLE_STEP,            "SINGLE STEP" },
+			{ EXCEPTION_ARRAY_BOUNDS_EXCEEDED,  "ARRAY BOUNDS EXCEEDED" },
+			{ EXCEPTION_FLT_DENORMAL_OPERAND,   "FLOAT DENORMAL OPERAND" },
+			{ EXCEPTION_FLT_DIVIDE_BY_ZERO,     "FLOAT DIVIDE BY ZERO" },
+			{ EXCEPTION_FLT_INEXACT_RESULT,     "FLOAT INEXACT RESULT" },
+			{ EXCEPTION_FLT_INVALID_OPERATION,  "FLOAT INVALID OPERATION" },
+			{ EXCEPTION_FLT_OVERFLOW,           "FLOAT OVERFLOW" },
+			{ EXCEPTION_FLT_STACK_CHECK,        "FLOAT STACK CHECK" },
+			{ EXCEPTION_FLT_UNDERFLOW,          "FLOAT UNDERFLOW" },
+			{ EXCEPTION_INT_DIVIDE_BY_ZERO,     "INTEGER DIVIDE BY ZERO" },
+			{ EXCEPTION_INT_OVERFLOW,           "INTEGER OVERFLOW" },
+			{ EXCEPTION_PRIV_INSTRUCTION,       "PRIVILEGED INSTRUCTION" },
+			{ EXCEPTION_IN_PAGE_ERROR,          "IN PAGE ERROR" },
+			{ EXCEPTION_ILLEGAL_INSTRUCTION,    "ILLEGAL INSTRUCTION" },
+			{ EXCEPTION_NONCONTINUABLE_EXCEPTION,"NONCONTINUABLE EXCEPTION" },
+			{ EXCEPTION_STACK_OVERFLOW,         "STACK OVERFLOW" },
+			{ EXCEPTION_INVALID_DISPOSITION,    "INVALID DISPOSITION" },
+			{ EXCEPTION_GUARD_PAGE,             "GUARD PAGE VIOLATION" },
+			{ EXCEPTION_INVALID_HANDLE,         "INVALID HANDLE" },
+			{ 0,                                "UNKNOWN EXCEPTION" }
+		};
+		static int already_hit = 0;
+		int i;
+
+		// if we're hitting this recursively, just exit
+		if (already_hit)
+			return EXCEPTION_CONTINUE_SEARCH;
+		already_hit = 1;
+
+		// flush any debugging traces that were live
+		debugger_flush_all_traces_on_abnormal_exit();
+
+		// find our man
+		for (i = 0; exception_table[i].code != 0; i++)
+			if (info->ExceptionRecord->ExceptionCode == exception_table[i].code)
+				break;
+
+		// print the exception type and address
+		fprintf(stderr, "\n-----------------------------------------------------\n");
+
+		auto diagnostics = downcast<diagnostics_win32 *>(get_instance());
+
+		fprintf(stderr, "Exception at EIP=%p%s: %s\n", info->ExceptionRecord->ExceptionAddress,
+			diagnostics->m_symbols->symbol_for_address((FPTR)info->ExceptionRecord->ExceptionAddress), exception_table[i].string);
+
+		// for access violations, print more info
+		if (info->ExceptionRecord->ExceptionCode == EXCEPTION_ACCESS_VIOLATION)
+			fprintf(stderr, "While attempting to %s memory at %p\n",
+				info->ExceptionRecord->ExceptionInformation[0] ? "write" : "read",
+				(void *)info->ExceptionRecord->ExceptionInformation[1]);
+
+		// print the state of the CPU
+		fprintf(stderr, "-----------------------------------------------------\n");
+#ifdef PTR64
+		fprintf(stderr, "RAX=%p RBX=%p RCX=%p RDX=%p\n",
+			(void *)info->ContextRecord->Rax,
+			(void *)info->ContextRecord->Rbx,
+			(void *)info->ContextRecord->Rcx,
+			(void *)info->ContextRecord->Rdx);
+		fprintf(stderr, "RSI=%p RDI=%p RBP=%p RSP=%p\n",
+			(void *)info->ContextRecord->Rsi,
+			(void *)info->ContextRecord->Rdi,
+			(void *)info->ContextRecord->Rbp,
+			(void *)info->ContextRecord->Rsp);
+		fprintf(stderr, " R8=%p  R9=%p R10=%p R11=%p\n",
+			(void *)info->ContextRecord->R8,
+			(void *)info->ContextRecord->R9,
+			(void *)info->ContextRecord->R10,
+			(void *)info->ContextRecord->R11);
+		fprintf(stderr, "R12=%p R13=%p R14=%p R15=%p\n",
+			(void *)info->ContextRecord->R12,
+			(void *)info->ContextRecord->R13,
+			(void *)info->ContextRecord->R14,
+			(void *)info->ContextRecord->R15);
+#else
+		fprintf(stderr, "EAX=%p EBX=%p ECX=%p EDX=%p\n",
+			(void *)info->ContextRecord->Eax,
+			(void *)info->ContextRecord->Ebx,
+			(void *)info->ContextRecord->Ecx,
+			(void *)info->ContextRecord->Edx);
+		fprintf(stderr, "ESI=%p EDI=%p EBP=%p ESP=%p\n",
+			(void *)info->ContextRecord->Esi,
+			(void *)info->ContextRecord->Edi,
+			(void *)info->ContextRecord->Ebp,
+			(void *)info->ContextRecord->Esp);
+#endif
+
+		// reprint the actual exception address
+		fprintf(stderr, "-----------------------------------------------------\n");
+		fprintf(stderr, "Stack crawl:\n");
+		diagnostics->print_stacktrace(info->ContextRecord, GetCurrentThread());
+
+		// flush stderr, so the data is actually written when output is being redirected
+		fflush(stderr);
+
+		// exit
+		return EXCEPTION_CONTINUE_SEARCH;
+	}
+
+	void print_stacktrace(void* context, void* thread)
+	{
+		ensure_symbols();
+
+		// set up the stack walker
+		stack_walker walker;
+
+		if (context != nullptr && thread != nullptr)
+		{
+			walker.reset(*static_cast<CONTEXT*>(context), thread);
+		}
+		else
+		{
+			if (!walker.reset())
+				return;
+		}
+
+		// walk the stack
+		while (walker.unwind())
+			fprintf(
+				stderr,
+				"  %p: %p%s\n",
+				reinterpret_cast<void *>(walker.frame()),
+				reinterpret_cast<void *>(walker.ip()),
+				m_symbols == nullptr ? "" : m_symbols->symbol_for_address(walker.ip()));
+	}
+
+	void ensure_symbols()
+	{
+		if (m_symbols == nullptr)
+		{
+			char exe_path[MAX_PATH];
+			size_t len = GetModuleFileNameA(nullptr, exe_path, sizeof(exe_path));
+			if (len == 0)
+			{
+				osd_printf_error("Failed to get the executable path.\n");
+				fatalerror("Failed to get the executable path.");
+			}
+
+			exe_path[len] = '\0';
+			m_symbols = std::make_unique<symbol_manager>(exe_path);
+		}
+
+		if (m_symbols == nullptr)
+		{
+			fatalerror("Could not initialize symbols.");
+		}
+	}
+};
+
+// Static accessor for the win32 diagnostic module
+diagnostics_module * diagnostics_module::get_instance()
+{
+	static diagnostics_win32 s_instance;
+	return &s_instance;
+}
+
+#endif // WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
+
+#endif
+
diff --git a/src/osd/modules/diagnostics/none.cpp b/src/osd/modules/diagnostics/none.cpp
new file mode 100644
index 00000000000..502a919a7e1
--- /dev/null
+++ b/src/osd/modules/diagnostics/none.cpp
@@ -0,0 +1,55 @@
+// license:BSD-3-Clause
+// copyright-holders:Brad Hughes
+//====================================================================
+//
+//  none.cpp - Null implementation of diagnostic module
+//
+//====================================================================
+
+#include "diagnostics_module.h"
+
+class diagnostics_none : public diagnostics_module
+{
+public:
+	diagnostics_none()
+	{
+	}
+
+	int init_crash_diagnostics() override
+	{
+		return 0;
+	}
+
+	void start_profiler(std::uint32_t max_seconds, std::uint8_t stack_depth) override
+	{
+	}
+
+	void stop_profiler() override
+	{
+	}
+
+	void print_profiler_results() override
+	{
+	}
+};
+
+// Determine if diagnostics_none should be used based on OSD
+#if defined(OSD_WINDOWS) || defined(SDLMAME_WIN32)
+#include <winapifamily.h>
+#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
+#define USE_DIAG_NONE 0 // Desktop Windows
+#else
+#define USE_DIAG_NONE 1 // Universal Windows
+#endif
+#else
+#define USE_DIAG_NONE 1 // SDL and others
+#endif
+
+// We we should use diagnostics_none, create the static accessor
+#if USE_DIAG_NONE
+diagnostics_module* diagnostics_module::get_instance()
+{
+	static diagnostics_none s_instance;
+	return &s_instance;
+}
+#endif
\ No newline at end of file
diff --git a/src/osd/sdl/sdlmain.cpp b/src/osd/sdl/sdlmain.cpp
index 43b1052df01..e866cce5dac 100644
--- a/src/osd/sdl/sdlmain.cpp
+++ b/src/osd/sdl/sdlmain.cpp
@@ -196,6 +196,9 @@ int main(int argc, char *argv[])
 	setvbuf(stdout, (char *) NULL, _IONBF, 0);
 	setvbuf(stderr, (char *) NULL, _IONBF, 0);
 
+	// Initialize crash diagnostics
+	diagnostics_module::get_instance()->init_crash_diagnostics();
+
 #if defined(SDLMAME_ANDROID)
 	/* Enable standard application logging */
 	SDL_LogSetPriority(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_VERBOSE);
diff --git a/src/osd/windows/winmain.cpp b/src/osd/windows/winmain.cpp
index 0d0a8ed7b1c..647c39831a8 100644
--- a/src/osd/windows/winmain.cpp
+++ b/src/osd/windows/winmain.cpp
@@ -17,8 +17,6 @@
 // standard C headers
 #include <ctype.h>
 #include <stdarg.h>
-#include <psapi.h>
-#include <dbghelp.h>
 
 // MAME headers
 #include "emu.h"
@@ -28,12 +26,9 @@
 // MAMEOS headers
 #include "winmain.h"
 #include "window.h"
-#include "video.h"
 #include "winutf8.h"
 #include "winutil.h"
-#include "debugger.h"
 #include "winfile.h"
-#include "strconv.h"
 
 #if !WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
 using namespace Windows::ApplicationModel;
@@ -53,154 +48,12 @@ using namespace Windows::UI::Popups;
 #define UNICODE_POSTFIX "A"
 #endif
 
-
-
 //**************************************************************************
 //  TYPE DEFINITIONS
 //**************************************************************************
 
 #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
 
-template<typename _FunctionPtr>
-class dynamic_bind
-{
-public:
-	// constructor which looks up the function
-	dynamic_bind(const TCHAR *dll, const char *symbol)
-		: m_function(nullptr)
-	{
-		HMODULE module = LoadLibrary(dll);
-		if (module != nullptr)
-			m_function = reinterpret_cast<_FunctionPtr>(GetProcAddress(module, symbol));
-	}
-
-	// bool to test if the function is nullptr or not
-	operator bool() const { return (m_function != nullptr); }
-
-	// dereference to get the underlying pointer
-	_FunctionPtr operator *() const { return m_function; }
-
-private:
-	_FunctionPtr    m_function;
-};
-
-
-class stack_walker
-{
-public:
-	stack_walker();
-
-	FPTR ip() const { return m_stackframe.AddrPC.Offset; }
-	FPTR sp() const { return m_stackframe.AddrStack.Offset; }
-	FPTR frame() const { return m_stackframe.AddrFrame.Offset; }
-
-	bool reset();
-	void reset(CONTEXT &context, HANDLE thread);
-	bool unwind();
-
-private:
-	HANDLE          m_process;
-	HANDLE          m_thread;
-	STACKFRAME64    m_stackframe;
-	CONTEXT         m_context;
-	bool            m_first;
-
-	dynamic_bind<BOOL (WINAPI *)(DWORD, HANDLE, HANDLE, LPSTACKFRAME64, PVOID, PREAD_PROCESS_MEMORY_ROUTINE64, PFUNCTION_TABLE_ACCESS_ROUTINE64, PGET_MODULE_BASE_ROUTINE64, PTRANSLATE_ADDRESS_ROUTINE64)>
-			m_stack_walk_64;
-	dynamic_bind<BOOL (WINAPI *)(HANDLE, LPCTSTR, BOOL)> m_sym_initialize;
-	dynamic_bind<PVOID (WINAPI *)(HANDLE, DWORD64)> m_sym_function_table_access_64;
-	dynamic_bind<DWORD64 (WINAPI *)(HANDLE, DWORD64)> m_sym_get_module_base_64;
-	dynamic_bind<VOID (WINAPI *)(PCONTEXT)> m_rtl_capture_context;
-
-	static bool     s_initialized;
-};
-
-
-class symbol_manager
-{
-public:
-	// construction/destruction
-	symbol_manager(const char *argv0);
-	~symbol_manager();
-
-	// getters
-	FPTR last_base() const { return m_last_base; }
-
-	// core symbol lookup
-	const char *symbol_for_address(FPTR address);
-	const char *symbol_for_address(PVOID address) { return symbol_for_address(reinterpret_cast<FPTR>(address)); }
-
-	// force symbols to be cached
-	void cache_symbols() { scan_file_for_address(0, true); }
-
-	void reset_cache() { m_cache.reset(); }
-private:
-	// internal helpers
-	bool query_system_for_address(FPTR address);
-	void scan_file_for_address(FPTR address, bool create_cache);
-	bool parse_sym_line(const char *line, FPTR &address, std::string &symbol);
-	bool parse_map_line(const char *line, FPTR &address, std::string &symbol);
-	void scan_cache_for_address(FPTR address);
-	void format_symbol(const char *name, UINT32 displacement, const char *filename = nullptr, int linenumber = 0);
-
-	static FPTR get_text_section_base();
-
-	struct cache_entry
-	{
-		cache_entry(FPTR address, const char *symbol) :
-			m_next(nullptr), m_address(address), m_name(symbol) { }
-		cache_entry *next() const { return m_next; }
-
-		cache_entry *   m_next;
-		FPTR            m_address;
-		std::string     m_name;
-	};
-	simple_list<cache_entry> m_cache;
-
-	std::string     m_mapfile;
-	std::string     m_symfile;
-	std::string     m_buffer;
-	HANDLE          m_process;
-	FPTR            m_last_base;
-	FPTR            m_text_base;
-
-	dynamic_bind<BOOL (WINAPI *)(HANDLE, DWORD64, PDWORD64, PSYMBOL_INFO)> m_sym_from_addr;
-	dynamic_bind<BOOL (WINAPI *)(HANDLE, DWORD64, PDWORD, PIMAGEHLP_LINE64)> m_sym_get_line_from_addr_64;
-};
-
-
-class sampling_profiler
-{
-public:
-	sampling_profiler(UINT32 max_seconds, UINT8 stack_depth);
-	~sampling_profiler();
-
-	void start();
-	void stop();
-
-//  void reset();
-	void print_results(symbol_manager &symbols);
-
-private:
-	static DWORD WINAPI thread_entry(LPVOID lpParameter);
-	void thread_run();
-
-	static int CLIB_DECL compare_address(const void *item1, const void *item2);
-	static int CLIB_DECL compare_frequency(const void *item1, const void *item2);
-
-	HANDLE          m_target_thread;
-
-	HANDLE          m_thread;
-	DWORD           m_thread_id;
-	volatile bool   m_thread_exit;
-
-	UINT8           m_stack_depth;
-	UINT8           m_entry_stride;
-	std::vector<FPTR>    m_buffer;
-	FPTR *          m_buffer_ptr;
-	FPTR *          m_buffer_end;
-};
-
 //============================================================
 //  winui_output_error
 //============================================================
@@ -256,7 +109,6 @@ public:
 #endif
 
 
-
 //**************************************************************************
 //  GLOBAL VARIABLES
 //**************************************************************************
@@ -269,13 +121,6 @@ int _CRT_glob = 0;
 //**************************************************************************
 
 #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
-static LPTOP_LEVEL_EXCEPTION_FILTER pass_thru_filter;
-
-static sampling_profiler *profiler = nullptr;
-static symbol_manager *symbols = nullptr;
-
-bool stack_walker::s_initialized = false;
-
 static int timeresult = !TIMERR_NOERROR;
 static TIMECAPS timecaps;
 #endif
@@ -289,8 +134,6 @@ static running_machine *g_current_machine;
 
 static BOOL WINAPI control_handler(DWORD type);
 static int is_double_click_start(int argc);
-static LONG WINAPI exception_filter(struct _EXCEPTION_POINTERS *info);
-
 
 
 //**************************************************************************
@@ -428,18 +271,8 @@ int main(int argc, char *argv[])
 	// set a handler to catch ctrl-c
 	SetConsoleCtrlHandler(control_handler, TRUE);
 
-	// allocate symbols
-	symbol_manager local_symbols(argv[0]);
-	symbols = &local_symbols;
-
-	// set up exception handling
-	pass_thru_filter = SetUnhandledExceptionFilter(exception_filter);
-	SetErrorMode(SEM_FAILCRITICALERRORS | SEM_NOGPFAULTERRORBOX);
-
-	// enable stack crawls for asserts
-	extern void (*s_debugger_stack_crawler)();
-	s_debugger_stack_crawler = winmain_dump_stack;
-
+	// Initialize crash diagnostics
+	diagnostics_module::get_instance()->init_crash_diagnostics();
 
 	// parse config and cmdline options
 	DWORD result;
@@ -462,8 +295,7 @@ int main(int argc, char *argv[])
 		result = frontend.execute(argc, argv);
 		osd_output::pop(&winerror);
 	}
-	// free symbols
-	symbols = nullptr;
+
 	return result;
 }
 
@@ -697,15 +529,11 @@ void windows_osd_interface::init(running_machine &machine)
 		timeBeginPeriod(timecaps.wPeriodMin);
 #endif
 
-
 	// create and start the profiler
-#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
 	if (profile > 0)
 	{
-		profiler = global_alloc(sampling_profiler(1000, profile - 1));
-		profiler->start();
+		diagnostics_module::get_instance()->start_profiler(1000, profile - 1);
 	}
-#endif
 
 	// initialize sockets
 	win_init_sockets();
@@ -729,16 +557,11 @@ void windows_osd_interface::osd_exit()
 
 	osd_common_t::osd_exit();
 
+	// stop the profiler
+	diagnostics_module::get_instance()->stop_profiler();
+	diagnostics_module::get_instance()->print_profiler_results();
 
 #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
-	// stop the profiler
-	if (profiler != nullptr)
-	{
-		profiler->stop();
-		profiler->print_results(*symbols);
-		global_free(profiler);
-	}
-
 	// restore the timer resolution
 	if (timeresult == TIMERR_NOERROR)
 		timeEndPeriod(timecaps.wPeriodMin);
@@ -749,26 +572,8 @@ void windows_osd_interface::osd_exit()
 }
 
 
-
 #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
 
-//============================================================
-//  winmain_dump_stack
-//============================================================
-
-void winmain_dump_stack()
-{
-	// set up the stack walker
-	stack_walker walker;
-	if (!walker.reset())
-		return;
-
-	// walk the stack
-	while (walker.unwind())
-		fprintf(stderr, "  %p: %p%s\n", (void *)walker.frame(), (void *)walker.ip(), (symbols == nullptr) ? "" : symbols->symbol_for_address(walker.ip()));
-}
-
-
 //============================================================
 //  check_for_double_click_start
 //============================================================
@@ -784,813 +589,4 @@ static int is_double_click_start(int argc)
 	return (argc <= 1 && startup_info.dwFlags && !(startup_info.dwFlags & STARTF_USESTDHANDLES));
 }
 
-//============================================================
-//  exception_filter
-//============================================================
-
-static LONG WINAPI exception_filter(struct _EXCEPTION_POINTERS *info)
-{
-	static const struct
-	{
-		DWORD code;
-		const char *string;
-	} exception_table[] =
-	{
-		{ EXCEPTION_ACCESS_VIOLATION,       "ACCESS VIOLATION" },
-		{ EXCEPTION_DATATYPE_MISALIGNMENT,  "DATATYPE MISALIGNMENT" },
-		{ EXCEPTION_BREAKPOINT,             "BREAKPOINT" },
-		{ EXCEPTION_SINGLE_STEP,            "SINGLE STEP" },
-		{ EXCEPTION_ARRAY_BOUNDS_EXCEEDED,  "ARRAY BOUNDS EXCEEDED" },
-		{ EXCEPTION_FLT_DENORMAL_OPERAND,   "FLOAT DENORMAL OPERAND" },
-		{ EXCEPTION_FLT_DIVIDE_BY_ZERO,     "FLOAT DIVIDE BY ZERO" },
-		{ EXCEPTION_FLT_INEXACT_RESULT,     "FLOAT INEXACT RESULT" },
-		{ EXCEPTION_FLT_INVALID_OPERATION,  "FLOAT INVALID OPERATION" },
-		{ EXCEPTION_FLT_OVERFLOW,           "FLOAT OVERFLOW" },
-		{ EXCEPTION_FLT_STACK_CHECK,        "FLOAT STACK CHECK" },
-		{ EXCEPTION_FLT_UNDERFLOW,          "FLOAT UNDERFLOW" },
-		{ EXCEPTION_INT_DIVIDE_BY_ZERO,     "INTEGER DIVIDE BY ZERO" },
-		{ EXCEPTION_INT_OVERFLOW,           "INTEGER OVERFLOW" },
-		{ EXCEPTION_PRIV_INSTRUCTION,       "PRIVILEGED INSTRUCTION" },
-		{ EXCEPTION_IN_PAGE_ERROR,          "IN PAGE ERROR" },
-		{ EXCEPTION_ILLEGAL_INSTRUCTION,    "ILLEGAL INSTRUCTION" },
-		{ EXCEPTION_NONCONTINUABLE_EXCEPTION,"NONCONTINUABLE EXCEPTION" },
-		{ EXCEPTION_STACK_OVERFLOW,         "STACK OVERFLOW" },
-		{ EXCEPTION_INVALID_DISPOSITION,    "INVALID DISPOSITION" },
-		{ EXCEPTION_GUARD_PAGE,             "GUARD PAGE VIOLATION" },
-		{ EXCEPTION_INVALID_HANDLE,         "INVALID HANDLE" },
-		{ 0,                                "UNKNOWN EXCEPTION" }
-	};
-	static int already_hit = 0;
-	int i;
-
-	// if we're hitting this recursively, just exit
-	if (already_hit)
-		return EXCEPTION_CONTINUE_SEARCH;
-	already_hit = 1;
-
-	// flush any debugging traces that were live
-	debugger_flush_all_traces_on_abnormal_exit();
-
-	// find our man
-	for (i = 0; exception_table[i].code != 0; i++)
-		if (info->ExceptionRecord->ExceptionCode == exception_table[i].code)
-			break;
-
-	// print the exception type and address
-	fprintf(stderr, "\n-----------------------------------------------------\n");
-	fprintf(stderr, "Exception at EIP=%p%s: %s\n", info->ExceptionRecord->ExceptionAddress,
-			symbols->symbol_for_address((FPTR)info->ExceptionRecord->ExceptionAddress), exception_table[i].string);
-
-	// for access violations, print more info
-	if (info->ExceptionRecord->ExceptionCode == EXCEPTION_ACCESS_VIOLATION)
-		fprintf(stderr, "While attempting to %s memory at %p\n",
-				info->ExceptionRecord->ExceptionInformation[0] ? "write" : "read",
-				(void *)info->ExceptionRecord->ExceptionInformation[1]);
-
-	// print the state of the CPU
-	fprintf(stderr, "-----------------------------------------------------\n");
-#ifdef PTR64
-	fprintf(stderr, "RAX=%p RBX=%p RCX=%p RDX=%p\n",
-			(void *)info->ContextRecord->Rax,
-			(void *)info->ContextRecord->Rbx,
-			(void *)info->ContextRecord->Rcx,
-			(void *)info->ContextRecord->Rdx);
-	fprintf(stderr, "RSI=%p RDI=%p RBP=%p RSP=%p\n",
-			(void *)info->ContextRecord->Rsi,
-			(void *)info->ContextRecord->Rdi,
-			(void *)info->ContextRecord->Rbp,
-			(void *)info->ContextRecord->Rsp);
-	fprintf(stderr, " R8=%p  R9=%p R10=%p R11=%p\n",
-			(void *)info->ContextRecord->R8,
-			(void *)info->ContextRecord->R9,
-			(void *)info->ContextRecord->R10,
-			(void *)info->ContextRecord->R11);
-	fprintf(stderr, "R12=%p R13=%p R14=%p R15=%p\n",
-			(void *)info->ContextRecord->R12,
-			(void *)info->ContextRecord->R13,
-			(void *)info->ContextRecord->R14,
-			(void *)info->ContextRecord->R15);
-#else
-	fprintf(stderr, "EAX=%p EBX=%p ECX=%p EDX=%p\n",
-			(void *)info->ContextRecord->Eax,
-			(void *)info->ContextRecord->Ebx,
-			(void *)info->ContextRecord->Ecx,
-			(void *)info->ContextRecord->Edx);
-	fprintf(stderr, "ESI=%p EDI=%p EBP=%p ESP=%p\n",
-			(void *)info->ContextRecord->Esi,
-			(void *)info->ContextRecord->Edi,
-			(void *)info->ContextRecord->Ebp,
-			(void *)info->ContextRecord->Esp);
-#endif
-
-	stack_walker walker;
-	walker.reset(*info->ContextRecord, GetCurrentThread());
-
-	// reprint the actual exception address
-	fprintf(stderr, "-----------------------------------------------------\n");
-	fprintf(stderr, "Stack crawl:\n");
-
-	// walk the stack
-	while (walker.unwind())
-		fprintf(stderr, "  %p: %p%s\n", (void *)walker.frame(), (void *)walker.ip(), (symbols == nullptr) ? "" : symbols->symbol_for_address(walker.ip()));
-
-	// flush stderr, so the data is actually written when output is being redirected
-	fflush(stderr);
-
-	// exit
-	return EXCEPTION_CONTINUE_SEARCH;
-}
-
-
-//**************************************************************************
-//  STACK WALKER
-//**************************************************************************
-
-//-------------------------------------------------
-//  stack_walker - constructor
-//-------------------------------------------------
-
-stack_walker::stack_walker()
-	: m_process(GetCurrentProcess()),
-		m_thread(GetCurrentThread()),
-		m_first(true),
-		m_stack_walk_64(TEXT("dbghelp.dll"), "StackWalk64"),
-		m_sym_initialize(TEXT("dbghelp.dll"), "SymInitialize"),
-		m_sym_function_table_access_64(TEXT("dbghelp.dll"), "SymFunctionTableAccess64"),
-		m_sym_get_module_base_64(TEXT("dbghelp.dll"), "SymGetModuleBase64"),
-		m_rtl_capture_context(TEXT("kernel32.dll"), "RtlCaptureContext")
-{
-	// zap the structs
-	memset(&m_stackframe, 0, sizeof(m_stackframe));
-	memset(&m_context, 0, sizeof(m_context));
-
-	// initialize the symbols
-	if (!s_initialized && m_sym_initialize && m_stack_walk_64 && m_sym_function_table_access_64 && m_sym_get_module_base_64)
-	{
-		(*m_sym_initialize)(m_process, nullptr, TRUE);
-		s_initialized = true;
-	}
-}
-
-
-//-------------------------------------------------
-//  reset - set up a new context
-//-------------------------------------------------
-
-bool stack_walker::reset()
-{
-	// set up the initial state
-	if (!m_rtl_capture_context)
-		return false;
-	(*m_rtl_capture_context)(&m_context);
-	m_thread = GetCurrentThread();
-	m_first = true;
-
-	// initialize the stackframe
-	memset(&m_stackframe, 0, sizeof(m_stackframe));
-	m_stackframe.AddrPC.Mode = AddrModeFlat;
-	m_stackframe.AddrFrame.Mode = AddrModeFlat;
-	m_stackframe.AddrStack.Mode = AddrModeFlat;
-
-	// pull architecture-specific fields from the context
-#ifdef PTR64
-	m_stackframe.AddrPC.Offset = m_context.Rip;
-	m_stackframe.AddrFrame.Offset = m_context.Rsp;
-	m_stackframe.AddrStack.Offset = m_context.Rsp;
-#else
-	m_stackframe.AddrPC.Offset = m_context.Eip;
-	m_stackframe.AddrFrame.Offset = m_context.Ebp;
-	m_stackframe.AddrStack.Offset = m_context.Esp;
-#endif
-	return true;
-}
-
-void stack_walker::reset(CONTEXT &initial, HANDLE thread)
-{
-	// set up the initial state
-	m_context = initial;
-	m_thread = thread;
-	m_first = true;
-
-	// initialize the stackframe
-	memset(&m_stackframe, 0, sizeof(m_stackframe));
-	m_stackframe.AddrPC.Mode = AddrModeFlat;
-	m_stackframe.AddrFrame.Mode = AddrModeFlat;
-	m_stackframe.AddrStack.Mode = AddrModeFlat;
-
-	// pull architecture-specific fields from the context
-#ifdef PTR64
-	m_stackframe.AddrPC.Offset = m_context.Rip;
-	m_stackframe.AddrFrame.Offset = m_context.Rsp;
-	m_stackframe.AddrStack.Offset = m_context.Rsp;
-#else
-	m_stackframe.AddrPC.Offset = m_context.Eip;
-	m_stackframe.AddrFrame.Offset = m_context.Ebp;
-	m_stackframe.AddrStack.Offset = m_context.Esp;
-#endif
-}
-
-
-//-------------------------------------------------
-//  unwind - unwind a single level
-//-------------------------------------------------
-
-bool stack_walker::unwind()
-{
-	// if we were able to initialize, then we have everything we need
-	if (s_initialized)
-	{
-#ifdef PTR64
-		return (*m_stack_walk_64)(IMAGE_FILE_MACHINE_AMD64, m_process, m_thread, &m_stackframe, &m_context, nullptr, *m_sym_function_table_access_64, *m_sym_get_module_base_64, nullptr);
-#else
-		return (*m_stack_walk_64)(IMAGE_FILE_MACHINE_I386, m_process, m_thread, &m_stackframe, &m_context, nullptr, *m_sym_function_table_access_64, *m_sym_get_module_base_64, nullptr);
-#endif
-	}
-
-	// otherwise, fake the first unwind, which will just return info from the context
-	else
-	{
-		bool result = m_first;
-		m_first = false;
-		return result;
-	}
-}
-
-
-
-//**************************************************************************
-//  SYMBOL MANAGER
-//**************************************************************************
-
-//-------------------------------------------------
-//  symbol_manager - constructor
-//-------------------------------------------------
-
-symbol_manager::symbol_manager(const char *argv0)
-	: m_mapfile(argv0),
-		m_symfile(argv0),
-		m_process(GetCurrentProcess()),
-		m_last_base(0),
-		m_text_base(0),
-		m_sym_from_addr(TEXT("dbghelp.dll"), "SymFromAddr"),
-		m_sym_get_line_from_addr_64(TEXT("dbghelp.dll"), "SymGetLineFromAddr64")
-{
-#ifdef __GNUC__
-	// compute the name of the mapfile
-	int extoffs = m_mapfile.find_last_of('.');
-	if (extoffs != -1)
-		m_mapfile.substr(0, extoffs);
-	m_mapfile.append(".map");
-
-	// and the name of the symfile
-	extoffs = m_symfile.find_last_of('.');
-	if (extoffs != -1)
-		m_symfile = m_symfile.substr(0, extoffs);
-	m_symfile.append(".sym");
-
-	// figure out the base of the .text section
-	m_text_base = get_text_section_base();
-#endif
-
-	// expand the buffer to be decently large up front
-	m_buffer = string_format("%500s", "");
-}
-
-
-//-------------------------------------------------
-//  ~symbol_manager - destructor
-//-------------------------------------------------
-
-symbol_manager::~symbol_manager()
-{
-}
-
-
-//-------------------------------------------------
-//  symbol_for_address - return a symbol by looking
-//  it up either in the cache or by scanning the
-//  file
-//-------------------------------------------------
-
-const char *symbol_manager::symbol_for_address(FPTR address)
-{
-	// default the buffer
-	m_buffer.assign(" (not found)");
-	m_last_base = 0;
-
-	// first try to do it using system APIs
-	if (!query_system_for_address(address))
-	{
-		// if that fails, scan the cache if we have one
-		if (!m_cache.empty())
-			scan_cache_for_address(address);
-
-		// or else try to open a sym/map file and find it there
-		else
-			scan_file_for_address(address, false);
-	}
-	return m_buffer.c_str();
-}
-
-
-//-------------------------------------------------
-//  query_system_for_address - ask the system to
-//  look up our address
-//-------------------------------------------------
-
-bool symbol_manager::query_system_for_address(FPTR address)
-{
-	// need at least the sym_from_addr API
-	if (!m_sym_from_addr)
-		return false;
-
-	BYTE info_buffer[sizeof(SYMBOL_INFO) + 256] = { 0 };
-	SYMBOL_INFO &info = *reinterpret_cast<SYMBOL_INFO *>(&info_buffer[0]);
-	DWORD64 displacement;
-
-	// even through the struct says TCHAR, we actually get back an ANSI string here
-	info.SizeOfStruct = sizeof(info);
-	info.MaxNameLen = sizeof(info_buffer) - sizeof(info);
-	if ((*m_sym_from_addr)(m_process, address, &displacement, &info))
-	{
-		// try to get source info as well; again we are returned an ANSI string
-		IMAGEHLP_LINE64 lineinfo = { sizeof(lineinfo) };
-		DWORD linedisp;
-		if (m_sym_get_line_from_addr_64 && (*m_sym_get_line_from_addr_64)(m_process, address, &linedisp, &lineinfo))
-			format_symbol(info.Name, displacement, lineinfo.FileName, lineinfo.LineNumber);
-		else
-			format_symbol(info.Name, displacement);
-
-		// set the last base
-		m_last_base = address - displacement;
-		return true;
-	}
-	return false;
-}
-
-
-//-------------------------------------------------
-//  scan_file_for_address - walk either the map
-//  or symbol files and find the best match for
-//  the given address, optionally creating a cache
-//  along the way
-//-------------------------------------------------
-
-void symbol_manager::scan_file_for_address(FPTR address, bool create_cache)
-{
-	bool is_symfile = false;
-	FILE *srcfile = nullptr;
-
-#ifdef __GNUC__
-	// see if we have a symbol file (gcc only)
-	srcfile = fopen(m_symfile.c_str(), "r");
-	is_symfile = (srcfile != nullptr);
-#endif
-
-	// if not, see if we have a map file
-	if (srcfile == nullptr)
-		srcfile = fopen(m_mapfile.c_str(), "r");
-
-	// if not, fail
-	if (srcfile == nullptr)
-		return;
-
-	// reset the best info
-	std::string best_symbol;
-	FPTR best_addr = 0;
-
-	// parse the file, looking for valid entries
-	std::string symbol;
-	char line[1024];
-	while (fgets(line, sizeof(line) - 1, srcfile))
-	{
-		// parse the line looking for an interesting symbol
-		FPTR addr = 0;
-		bool valid = is_symfile ? parse_sym_line(line, addr, symbol) : parse_map_line(line, addr, symbol);
-
-		// if we got one, see if this is the best
-		if (valid)
-		{
-			// if this is the best one so far, remember it
-			if (addr <= address && addr > best_addr)
-			{
-				best_addr = addr;
-				best_symbol = symbol;
-			}
-
-			// also create a cache entry if we can
-			if (create_cache)
-				m_cache.append(*global_alloc(cache_entry(addr, symbol.c_str())));
-		}
-	}
-
-	// close the file
-	fclose(srcfile);
-
-	// format the symbol and remember the last base
-	format_symbol(best_symbol.c_str(), address - best_addr);
-	m_last_base = best_addr;
-}
-
-
-//-------------------------------------------------
-//  scan_cache_for_address - walk the cache to
-//  find the best match for the given address
-//-------------------------------------------------
-
-void symbol_manager::scan_cache_for_address(FPTR address)
-{
-	// reset the best info
-	std::string best_symbol;
-	FPTR best_addr = 0;
-
-	// walk the cache, looking for valid entries
-	for (cache_entry &entry : m_cache)
-
-		// if this is the best one so far, remember it
-		if (entry.m_address <= address && entry.m_address > best_addr)
-		{
-			best_addr = entry.m_address;
-			best_symbol = entry.m_name;
-		}
-
-	// format the symbol and remember the last base
-	format_symbol(best_symbol.c_str(), address - best_addr);
-	m_last_base = best_addr;
-}
-
-
-//-------------------------------------------------
-//  parse_sym_line - parse a line from a sym file
-//  which is just the output of objdump
-//-------------------------------------------------
-
-bool symbol_manager::parse_sym_line(const char *line, FPTR &address, std::string &symbol)
-{
-#ifdef __GNUC__
-/*
-    32-bit gcc symbol line:
-[271778](sec  1)(fl 0x00)(ty  20)(scl   3) (nx 0) 0x007df675 line_to_symbol(char const*, unsigned int&, bool)
-
-    64-bit gcc symbol line:
-[271775](sec  1)(fl 0x00)(ty  20)(scl   3) (nx 0) 0x00000000008dd1e9 line_to_symbol(char const*, unsigned long long&, bool)
-*/
-
-	// first look for a (ty) entry
-	const char *type = strstr(line, "(ty  20)");
-	if (type == nullptr)
-		return false;
-
-	// scan forward in the line to find the address
-	bool in_parens = false;
-	for (const char *chptr = type; *chptr != 0; chptr++)
-	{
-		// track open/close parentheses
-		if (*chptr == '(')
-			in_parens = true;
-		else if (*chptr == ')')
-			in_parens = false;
-
-		// otherwise, look for an 0x address
-		else if (!in_parens && *chptr == '0' && chptr[1] == 'x')
-		{
-			// make sure we can get an address
-			void *temp;
-			if (sscanf(chptr, "0x%p", &temp) != 1)
-				return false;
-			address = m_text_base + reinterpret_cast<FPTR>(temp);
-
-			// skip forward until we're past the space
-			while (*chptr != 0 && !isspace(*chptr))
-				chptr++;
-
-			// extract the symbol name
-			strtrimspace(symbol.assign(chptr));
-			return (symbol.length() > 0);
-		}
-	}
-#endif
-	return false;
-}
-
-
-//-------------------------------------------------
-//  parse_map_line - parse a line from a linker-
-//  generated map file
-//-------------------------------------------------
-
-bool symbol_manager::parse_map_line(const char *line, FPTR &address, std::string &symbol)
-{
-#ifdef __GNUC__
-/*
-    32-bit gcc map line:
-                0x0089cb00                nbmj9195_palette_r(_address_space const*, unsigned int)
-
-    64-bit gcc map line:
-                0x0000000000961afc                nbmj9195_palette_r(_address_space const*, unsigned int)
-*/
-
-	// find a matching start
-	if (strncmp(line, "                0x", 18) == 0)
-	{
-		// make sure we can get an address
-		void *temp;
-		if (sscanf(&line[16], "0x%p", &temp) != 1)
-			return false;
-		address = reinterpret_cast<FPTR>(temp);
-
-		// skip forward until we're past the space
-		const char *chptr = &line[16];
-		while (*chptr != 0 && !isspace(*chptr))
-			chptr++;
-
-		// extract the symbol name
-		strtrimspace(symbol.assign(chptr));
-		return (symbol.length() > 0);
-	}
-#endif
-	return false;
-}
-
-
-//-------------------------------------------------
-//  format_symbol - common symbol formatting
-//-------------------------------------------------
-
-void symbol_manager::format_symbol(const char *name, UINT32 displacement, const char *filename, int linenumber)
-{
-	// start with the address and offset
-	m_buffer = string_format(" (%s", name);
-	if (displacement != 0)
-		m_buffer.append(string_format("+0x%04x", (UINT32)displacement));
-
-	// append file/line if present
-	if (filename != nullptr)
-		m_buffer.append(string_format(", %s:%d", filename, linenumber));
-
-	// close up the string
-	m_buffer.append(")");
-}
-
-
-//-------------------------------------------------
-//  get_text_section_base - figure out the base
-//  of the .text section
-//-------------------------------------------------
-
-FPTR symbol_manager::get_text_section_base()
-{
-	dynamic_bind<PIMAGE_SECTION_HEADER (WINAPI *)(PIMAGE_NT_HEADERS, PVOID, ULONG)> image_rva_to_section(TEXT("dbghelp.dll"), "ImageRvaToSection");
-	dynamic_bind<PIMAGE_NT_HEADERS (WINAPI *)(PVOID)> image_nt_header(TEXT("dbghelp.dll"), "ImageNtHeader");
-
-	// start with the image base
-	PVOID base = reinterpret_cast<PVOID>(GetModuleHandleUni());
-	assert(base != nullptr);
-
-	// make sure we have the functions we need
-	if (image_nt_header && image_rva_to_section)
-	{
-		// get the NT header
-		PIMAGE_NT_HEADERS headers = (*image_nt_header)(base);
-		assert(headers != nullptr);
-
-		// look ourself up (assuming we are in the .text section)
-		PIMAGE_SECTION_HEADER section = (*image_rva_to_section)(headers, base, reinterpret_cast<FPTR>(get_text_section_base) - reinterpret_cast<FPTR>(base));
-		if (section != nullptr)
-			return reinterpret_cast<FPTR>(base) + section->VirtualAddress;
-	}
-
-	// fallback to returning the image base (wrong)
-	return reinterpret_cast<FPTR>(base);
-}
-
-
-
-//**************************************************************************
-//  SAMPLING PROFILER
-//**************************************************************************
-
-//-------------------------------------------------
-//  sampling_profiler - constructor
-//-------------------------------------------------
-
-sampling_profiler::sampling_profiler(UINT32 max_seconds, UINT8 stack_depth = 0)
-	:   m_target_thread(nullptr),
-		m_thread(nullptr),
-		m_thread_id(0),
-		m_thread_exit(false),
-		m_stack_depth(stack_depth),
-		m_entry_stride(stack_depth + 2),
-		m_buffer(max_seconds * 1000 * m_entry_stride),
-		m_buffer_ptr(&m_buffer[0]),
-		m_buffer_end(&m_buffer[0] + max_seconds * 1000 * m_entry_stride)
-{
-}
-
-
-//-------------------------------------------------
-//  sampling_profiler - destructor
-//-------------------------------------------------
-
-sampling_profiler::~sampling_profiler()
-{
-}
-
-
-//-------------------------------------------------
-//  start - begin gathering profiling information
-//-------------------------------------------------
-
-void sampling_profiler::start()
-{
-	// do the dance to get a handle to ourself
-	BOOL result = DuplicateHandle(GetCurrentProcess(), GetCurrentThread(), GetCurrentProcess(), &m_target_thread,
-			THREAD_GET_CONTEXT | THREAD_SUSPEND_RESUME | THREAD_QUERY_INFORMATION, FALSE, 0);
-	assert_always(result, "Failed to get thread handle for main thread");
-
-	// reset the exit flag
-	m_thread_exit = false;
-
-	// start the thread
-	m_thread = CreateThread(nullptr, 0, thread_entry, (LPVOID)this, 0, &m_thread_id);
-	assert_always(m_thread != nullptr, "Failed to create profiler thread\n");
-
-	// max out the priority
-	SetThreadPriority(m_thread, THREAD_PRIORITY_TIME_CRITICAL);
-}
-
-
-//-------------------------------------------------
-//  stop - stop gathering profiling information
-//-------------------------------------------------
-
-void sampling_profiler::stop()
-{
-	// set the flag and wait a couple of seconds (max)
-	m_thread_exit = true;
-	WaitForSingleObject(m_thread, 2000);
-
-	// regardless, close the handle
-	CloseHandle(m_thread);
-}
-
-
-//-------------------------------------------------
-//  compare_address - compare two entries by their
-//  bucket address
-//-------------------------------------------------
-
-int CLIB_DECL sampling_profiler::compare_address(const void *item1, const void *item2)
-{
-	const FPTR *entry1 = reinterpret_cast<const FPTR *>(item1);
-	const FPTR *entry2 = reinterpret_cast<const FPTR *>(item2);
-	int mincount = MIN(entry1[0], entry2[0]);
-
-	// sort in order of: bucket, caller, caller's caller, etc.
-	for (int index = 1; index <= mincount; index++)
-		if (entry1[index] != entry2[index])
-			return entry1[index] - entry2[index];
-
-	// if we match to the end, sort by the depth of the stack
-	return entry1[0] - entry2[0];
-}
-
-
-//-------------------------------------------------
-//  compare_frequency - compare two entries by
-//  their frequency of occurrence
-//-------------------------------------------------
-
-int CLIB_DECL sampling_profiler::compare_frequency(const void *item1, const void *item2)
-{
-	const FPTR *entry1 = reinterpret_cast<const FPTR *>(item1);
-	const FPTR *entry2 = reinterpret_cast<const FPTR *>(item2);
-
-	// sort by frequency, then by address
-	if (entry1[0] != entry2[0])
-		return entry2[0] - entry1[0];
-	return entry1[1] - entry2[1];
-}
-
-
-//-------------------------------------------------
-//  print_results - output the results
-//-------------------------------------------------
-
-void sampling_profiler::print_results(symbol_manager &symbols)
-{
-	// cache the symbols
-	symbols.cache_symbols();
-
-	// step 1: find the base of each entry
-	for (FPTR *current = &m_buffer[0]; current < m_buffer_ptr; current += m_entry_stride)
-	{
-		assert(current[0] >= 1 && current[0] < m_entry_stride);
-
-		// convert the sampled PC to its function base as a bucket
-		symbols.symbol_for_address(current[1]);
-		current[1] = symbols.last_base();
-	}
-
-	// step 2: sort the results
-	qsort(&m_buffer[0], (m_buffer_ptr - &m_buffer[0]) / m_entry_stride, m_entry_stride * sizeof(FPTR), compare_address);
-
-	// step 3: count and collapse unique entries
-	UINT32 total_count = 0;
-	for (FPTR *current = &m_buffer[0]; current < m_buffer_ptr; )
-	{
-		int count = 1;
-		FPTR *scan;
-		for (scan = current + m_entry_stride; scan < m_buffer_ptr; scan += m_entry_stride)
-		{
-			if (compare_address(current, scan) != 0)
-				break;
-			scan[0] = 0;
-			count++;
-		}
-		current[0] = count;
-		total_count += count;
-		current = scan;
-	}
-
-	// step 4: sort the results again, this time by frequency
-	qsort(&m_buffer[0], (m_buffer_ptr - &m_buffer[0]) / m_entry_stride, m_entry_stride * sizeof(FPTR), compare_frequency);
-
-	// step 5: print the results
-	UINT32 num_printed = 0;
-	for (FPTR *current = &m_buffer[0]; current < m_buffer_ptr && num_printed < 30; current += m_entry_stride)
-	{
-		// once we hit 0 frequency, we're done
-		if (current[0] == 0)
-			break;
-
-		// output the result
-		printf("%4.1f%% - %6d : %p%s\n", (double)current[0] * 100.0 / (double)total_count, (UINT32)current[0], reinterpret_cast<void *>(current[1]), symbols.symbol_for_address(current[1]));
-		for (int index = 2; index < m_entry_stride; index++)
-		{
-			if (current[index] == 0)
-				break;
-			printf("                 %p%s\n", reinterpret_cast<void *>(current[index]), symbols.symbol_for_address(current[index]));
-		}
-		printf("\n");
-		num_printed++;
-	}
-	symbols.reset_cache();
-}
-
-
-//-------------------------------------------------
-//  thread_entry - thread entry stub
-//-------------------------------------------------
-
-DWORD WINAPI sampling_profiler::thread_entry(LPVOID lpParameter)
-{
-	reinterpret_cast<sampling_profiler *>(lpParameter)->thread_run();
-	return 0;
-}
-
-
-//-------------------------------------------------
-//  thread_run - sampling thread
-//-------------------------------------------------
-
-void sampling_profiler::thread_run()
-{
-	CONTEXT context;
-	memset(&context, 0, sizeof(context));
-
-	// loop until done
-	stack_walker walker;
-	while (!m_thread_exit && m_buffer_ptr < m_buffer_end)
-	{
-		// pause the main thread and get its context
-		SuspendThread(m_target_thread);
-		context.ContextFlags = CONTEXT_FULL;
-		GetThreadContext(m_target_thread, &context);
-
-		// first entry is a count
-		FPTR *count = m_buffer_ptr++;
-		*count = 0;
-
-		// iterate over the frames until we run out or hit an error
-		walker.reset(context, m_target_thread);
-		int frame;
-		for (frame = 0; frame <= m_stack_depth && walker.unwind(); frame++)
-		{
-			*m_buffer_ptr++ = walker.ip();
-			*count += 1;
-		}
-
-		// fill in any missing parts with nulls
-		for (; frame <= m_stack_depth; frame++)
-			*m_buffer_ptr++ = 0;
-
-		// resume the thread
-		ResumeThread(m_target_thread);
-
-		// sleep for 1ms
-		Sleep(1);
-	}
-}
-
-#endif
\ No newline at end of file
+#endif // WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
\ No newline at end of file
diff --git a/src/osd/windows/winmain.h b/src/osd/windows/winmain.h
index 216333dbd13..94d422a545b 100644
--- a/src/osd/windows/winmain.h
+++ b/src/osd/windows/winmain.h
@@ -249,8 +249,14 @@ struct MouseButtonEventArgs
 	int ypos;
 };
 
+// Forward declarations
+struct _EXCEPTION_POINTERS;
+
 class windows_osd_interface : public osd_common_t
 {
+	// Access to exception filter static method
+	friend int main(int argc, char *argv[]);
+
 public:
 	// construction/destruction
 	windows_osd_interface(windows_options &options);
@@ -297,6 +303,7 @@ private:
 	windows_options &   m_options;
 
 	static const int DEFAULT_FONT_HEIGHT = 200;
+	static long __stdcall exception_filter(struct _EXCEPTION_POINTERS *info);
 };
 
 #if !WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
@@ -337,11 +344,4 @@ extern const options_entry mame_win_options[];
 extern int osd_num_processors;
 
 
-
-//============================================================
-//  FUNCTION PROTOTYPES
-//============================================================
-
-void winmain_dump_stack();
-
 #endif

From 162033204f031fb6d83e80344d1b08a2860bf32e Mon Sep 17 00:00:00 2001
From: couriersud <couriersud@arcor.de>
Date: Sun, 17 Apr 2016 22:20:08 +0200
Subject: [PATCH 051/122] Fix clang compile.

---
 src/osd/modules/debugger/debugimgui.cpp | 2 +-
 src/osd/modules/render/bgfx/target.h    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/osd/modules/debugger/debugimgui.cpp b/src/osd/modules/debugger/debugimgui.cpp
index 060791a3196..51db9adddb3 100644
--- a/src/osd/modules/debugger/debugimgui.cpp
+++ b/src/osd/modules/debugger/debugimgui.cpp
@@ -131,7 +131,7 @@ private:
 	ImguiFontHandle  m_font;
 	UINT8            m_key_char;
 	bool             m_hide;
-        unsigned char* font_data;
+    //    unsigned char* font_data;
 	int              m_win_count;  // number of active windows, does not decrease, used to ID individual windows
 };
 
diff --git a/src/osd/modules/render/bgfx/target.h b/src/osd/modules/render/bgfx/target.h
index d521d2aa3d2..17527f189a7 100644
--- a/src/osd/modules/render/bgfx/target.h
+++ b/src/osd/modules/render/bgfx/target.h
@@ -52,7 +52,7 @@ public:
 private:
 	std::string                 m_name;
 	bgfx::TextureFormat::Enum   m_format;
-	bool						m_readback;
+	//bool						m_readback;
 
 	bgfx::FrameBufferHandle*    m_targets;
 	bgfx::TextureHandle*        m_textures;

From 31325d659939e21825c32ab798f6d7485bba20d0 Mon Sep 17 00:00:00 2001
From: couriersud <couriersud@arcor.de>
Date: Sun, 17 Apr 2016 22:21:33 +0200
Subject: [PATCH 052/122] Convert kidniki netlist into an external one.

---
 scripts/target/mame/arcade.lua                |   1 +
 scripts/target/mame/nl.lua                    |   1 +
 src/mame/audio/irem.cpp                       | 102 +----------------
 .../audio/{nl_kidniki.inc => nl_kidniki.cpp}  | 104 ++++++++++++++++--
 4 files changed, 103 insertions(+), 105 deletions(-)
 rename src/mame/audio/{nl_kidniki.inc => nl_kidniki.cpp} (77%)

diff --git a/scripts/target/mame/arcade.lua b/scripts/target/mame/arcade.lua
index 3e50efd03a3..c662d17658f 100644
--- a/scripts/target/mame/arcade.lua
+++ b/scripts/target/mame/arcade.lua
@@ -1902,6 +1902,7 @@ files {
 	MAME_DIR .. "src/mame/machine/irem_cpu.h",
 	MAME_DIR .. "src/mame/audio/irem.cpp",
 	MAME_DIR .. "src/mame/audio/irem.h",
+  MAME_DIR .. "src/mame/audio/nl_kidniki.cpp",
 }
 
 createMAMEProjects(_target, _subtarget, "itech")
diff --git a/scripts/target/mame/nl.lua b/scripts/target/mame/nl.lua
index 3409ce3eb44..6abf50dcd1e 100644
--- a/scripts/target/mame/nl.lua
+++ b/scripts/target/mame/nl.lua
@@ -118,6 +118,7 @@ files{
   MAME_DIR .. "src/mame/includes/m62.h",
   MAME_DIR .. "src/mame/video/m62.cpp",
   MAME_DIR .. "src/mame/audio/irem.cpp",
+  MAME_DIR .. "src/mame/audio/nl_kidniki.cpp",
   MAME_DIR .. "src/mame/audio/irem.h",
 
 }
diff --git a/src/mame/audio/irem.cpp b/src/mame/audio/irem.cpp
index 19306bb804e..8ba9e2a7a3f 100644
--- a/src/mame/audio/irem.cpp
+++ b/src/mame/audio/irem.cpp
@@ -10,12 +10,14 @@
 #include "cpu/m6800/m6800.h"
 #include "sound/discrete.h"
 #include "audio/irem.h"
-
+#include "netlist/devices/net_lib.h"
 
 const device_type IREM_M62_AUDIO = &device_creator<m62_audio_device>;
 const device_type IREM_M52_SOUNDC_AUDIO = &device_creator<m52_soundc_audio_device>;
 const device_type IREM_M52_LARGE_AUDIO = &device_creator<m52_large_audio_device>;
 
+NETLIST_EXTERNAL(kidniki)
+
 irem_audio_device::irem_audio_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
 	: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
 	m_port1(0),
@@ -406,102 +408,6 @@ ADDRESS_MAP_END
  *
  */
 
-#define USE_FRONTIERS 1
-#define USE_FIXED_STV 1
-
-#include "nl_kidniki.inc"
-
-NETLIST_START(kidniki_interface)
-
-#if (USE_FRONTIERS)
-	SOLVER(Solver, 18000)
-	PARAM(Solver.ACCURACY, 1e-8)
-	PARAM(Solver.NR_LOOPS, 300)
-	PARAM(Solver.GS_LOOPS, 1)
-	PARAM(Solver.GS_THRESHOLD, 6)
-	//PARAM(Solver.ITERATIVE, "SOR")
-	PARAM(Solver.ITERATIVE, "MAT_CR")
-	//PARAM(Solver.ITERATIVE, "GMRES")
-	PARAM(Solver.PARALLEL, 0)
-	PARAM(Solver.SOR_FACTOR, 1.00)
-	PARAM(Solver.DYNAMIC_TS, 0)
-	PARAM(Solver.DYNAMIC_LTE, 5e-4)
-	PARAM(Solver.MIN_TIMESTEP, 20e-6)
-#else
-	SOLVER(Solver, 12000)
-	PARAM(Solver.ACCURACY, 1e-8)
-	PARAM(Solver.NR_LOOPS, 300)
-	PARAM(Solver.GS_LOOPS, 20)
-	PARAM(Solver.ITERATIVE, "GMRES")
-	PARAM(Solver.PARALLEL, 0)
-#endif
-
-	LOCAL_SOURCE(kidniki_schematics)
-
-	ANALOG_INPUT(I_V5, 5)
-	//ANALOG_INPUT(I_V0, 0)
-	ALIAS(I_V0.Q, GND)
-
-	/* AY 8910 internal resistors */
-
-	RES(R_AY45L_A, 1000)
-	RES(R_AY45L_B, 1000)
-	RES(R_AY45L_C, 1000)
-
-	RES(R_AY45M_A, 1000)
-	RES(R_AY45M_B, 1000)
-	RES(R_AY45M_C, 1000)
-
-	NET_C(I_V5, R_AY45L_A.1, R_AY45L_B.1, R_AY45L_C.1, R_AY45M_A.1, R_AY45M_B.1, R_AY45M_C.1)
-	NET_C(R_AY45L_A.2, R_AY45L_B.2, R_AY45M_A.2, R_AY45M_B.2, R_AY45M_C.2)
-
-	ALIAS(I_SOUNDIC0, R_AY45L_C.2)
-	ALIAS(I_SOUND0, R_AY45L_A.2)
-
-	/* On M62 boards with pcb pictures available
-	 * D6 is missing, although the pcb print exists.
-	 * We are replacing this with a 10m Resistor.
-	 */
-	TTL_INPUT(SINH, 1)
-#if 0
-	DIODE(D6, "1N914")
-	NET_C(D6.K, SINH)
-	ALIAS(I_SINH0, D6.A)
-#else
-	RES(SINH_DUMMY, RES_M(10))
-	NET_C(SINH_DUMMY.1, SINH)
-	ALIAS(I_SINH0, SINH_DUMMY.2)
-#endif
-
-	NET_MODEL("AY8910PORT FAMILY(OVL=0.05 OVH=4.95 ORL=100.0 ORH=0.5k)")
-
-	LOGIC_INPUT(I_SD0, 1, "AY8910PORT")
-	//CLOCK(I_SD0, 5)
-	LOGIC_INPUT(I_BD0, 1, "AY8910PORT")
-	//CLOCK(I_BD0, 5)
-	LOGIC_INPUT(I_CH0, 1, "AY8910PORT")
-	//CLOCK(I_CH0, 2.2  )
-	LOGIC_INPUT(I_OH0, 1, "AY8910PORT")
-	//CLOCK(I_OH0, 1.0)
-	ANALOG_INPUT(I_MSM2K0, 0)
-	ANALOG_INPUT(I_MSM3K0, 0)
-
-	INCLUDE(kidniki_schematics)
-
-	#if (USE_FRONTIERS)
-	OPTIMIZE_FRONTIER(C63.2, RES_K(27), RES_K(1))
-	OPTIMIZE_FRONTIER(R31.2, RES_K(5.1), 50)
-	OPTIMIZE_FRONTIER(R29.2, RES_K(2.7), 50)
-	OPTIMIZE_FRONTIER(R87.2, RES_K(68), 50)
-
-	OPTIMIZE_FRONTIER(R50.1, RES_K(2.2), 50)
-	OPTIMIZE_FRONTIER(R55.1, RES_K(510), 50)
-	OPTIMIZE_FRONTIER(R84.2, RES_K(50), RES_K(5))
-
-	#endif
-
-NETLIST_END()
-
 /*************************************
  *
  *  Machine drivers
@@ -546,7 +452,7 @@ static MACHINE_CONFIG_FRAGMENT( irem_audio_base )
 	/* NETLIST configuration using internal AY8910 resistor values */
 
 	MCFG_SOUND_ADD("snd_nl", NETLIST_SOUND, 48000)
-	MCFG_NETLIST_SETUP(kidniki_interface)
+	MCFG_NETLIST_SETUP(kidniki)
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
 
 	MCFG_NETLIST_LOGIC_INPUT("snd_nl", "ibd", "I_BD0.IN", 0, 1)
diff --git a/src/mame/audio/nl_kidniki.inc b/src/mame/audio/nl_kidniki.cpp
similarity index 77%
rename from src/mame/audio/nl_kidniki.inc
rename to src/mame/audio/nl_kidniki.cpp
index d9040214583..31d31776669 100644
--- a/src/mame/audio/nl_kidniki.inc
+++ b/src/mame/audio/nl_kidniki.cpp
@@ -2,13 +2,8 @@
 // copyright-holders:Andrew Gardner, Couriersud
 #include "netlist/devices/net_lib.h"
 
-#ifndef USE_FRONTIERS
-#define USE_FRONTIERS 0
-#endif
-
-#ifndef USE_FIXED_STV
-#define USE_FIXED_STV 0
-#endif
+#define USE_FRONTIERS 1
+#define USE_FIXED_STV 1
 
 /* ----------------------------------------------------------------------------
  *  Library section header START
@@ -306,3 +301,98 @@ NETLIST_START(kidniki_schematics)
 	NET_C(R26.2, C29.2, GND)
 
 NETLIST_END()
+
+/* ----------------------------------------------------------------------------
+ *  Kidniki audio
+ * ---------------------------------------------------------------------------*/
+
+NETLIST_START(kidniki)
+
+#if (USE_FRONTIERS)
+	SOLVER(Solver, 18000)
+	PARAM(Solver.ACCURACY, 1e-8)
+	PARAM(Solver.NR_LOOPS, 300)
+	PARAM(Solver.GS_LOOPS, 1)
+	PARAM(Solver.GS_THRESHOLD, 6)
+	//PARAM(Solver.ITERATIVE, "SOR")
+	PARAM(Solver.ITERATIVE, "MAT_CR")
+	//PARAM(Solver.ITERATIVE, "GMRES")
+	PARAM(Solver.PARALLEL, 0)
+	PARAM(Solver.SOR_FACTOR, 1.00)
+	PARAM(Solver.DYNAMIC_TS, 0)
+	PARAM(Solver.DYNAMIC_LTE, 5e-4)
+	PARAM(Solver.MIN_TIMESTEP, 20e-6)
+#else
+	SOLVER(Solver, 12000)
+	PARAM(Solver.ACCURACY, 1e-8)
+	PARAM(Solver.NR_LOOPS, 300)
+	PARAM(Solver.GS_LOOPS, 20)
+	PARAM(Solver.ITERATIVE, "GMRES")
+	PARAM(Solver.PARALLEL, 0)
+#endif
+
+	LOCAL_SOURCE(kidniki_schematics)
+
+	ANALOG_INPUT(I_V5, 5)
+	//ANALOG_INPUT(I_V0, 0)
+	ALIAS(I_V0.Q, GND)
+
+	/* AY 8910 internal resistors */
+
+	RES(R_AY45L_A, 1000)
+	RES(R_AY45L_B, 1000)
+	RES(R_AY45L_C, 1000)
+
+	RES(R_AY45M_A, 1000)
+	RES(R_AY45M_B, 1000)
+	RES(R_AY45M_C, 1000)
+
+	NET_C(I_V5, R_AY45L_A.1, R_AY45L_B.1, R_AY45L_C.1, R_AY45M_A.1, R_AY45M_B.1, R_AY45M_C.1)
+	NET_C(R_AY45L_A.2, R_AY45L_B.2, R_AY45M_A.2, R_AY45M_B.2, R_AY45M_C.2)
+
+	ALIAS(I_SOUNDIC0, R_AY45L_C.2)
+	ALIAS(I_SOUND0, R_AY45L_A.2)
+
+	/* On M62 boards with pcb pictures available
+	 * D6 is missing, although the pcb print exists.
+	 * We are replacing this with a 10m Resistor.
+	 */
+	TTL_INPUT(SINH, 1)
+#if 0
+	DIODE(D6, "1N914")
+	NET_C(D6.K, SINH)
+	ALIAS(I_SINH0, D6.A)
+#else
+	RES(SINH_DUMMY, RES_M(10))
+	NET_C(SINH_DUMMY.1, SINH)
+	ALIAS(I_SINH0, SINH_DUMMY.2)
+#endif
+
+	NET_MODEL("AY8910PORT FAMILY(OVL=0.05 OVH=4.95 ORL=100.0 ORH=0.5k)")
+
+	LOGIC_INPUT(I_SD0, 1, "AY8910PORT")
+	//CLOCK(I_SD0, 5)
+	LOGIC_INPUT(I_BD0, 1, "AY8910PORT")
+	//CLOCK(I_BD0, 5)
+	LOGIC_INPUT(I_CH0, 1, "AY8910PORT")
+	//CLOCK(I_CH0, 2.2  )
+	LOGIC_INPUT(I_OH0, 1, "AY8910PORT")
+	//CLOCK(I_OH0, 1.0)
+	ANALOG_INPUT(I_MSM2K0, 0)
+	ANALOG_INPUT(I_MSM3K0, 0)
+
+	INCLUDE(kidniki_schematics)
+
+	#if (USE_FRONTIERS)
+	OPTIMIZE_FRONTIER(C63.2, RES_K(27), RES_K(1))
+	OPTIMIZE_FRONTIER(R31.2, RES_K(5.1), 50)
+	OPTIMIZE_FRONTIER(R29.2, RES_K(2.7), 50)
+	OPTIMIZE_FRONTIER(R87.2, RES_K(68), 50)
+
+	OPTIMIZE_FRONTIER(R50.1, RES_K(2.2), 50)
+	OPTIMIZE_FRONTIER(R55.1, RES_K(510), 50)
+	OPTIMIZE_FRONTIER(R84.2, RES_K(50), RES_K(5))
+
+	#endif
+
+NETLIST_END()

From a525b6081764fa7ab2a1e5f19f81d12720bb8946 Mon Sep 17 00:00:00 2001
From: Brad Hughes <bradhugh@outlook.com>
Date: Sun, 17 Apr 2016 16:35:21 -0400
Subject: [PATCH 053/122] Fixed missing diagnostic module include.

---
 src/osd/sdl/sdlmain.cpp     | 1 +
 src/osd/windows/winmain.cpp | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/osd/sdl/sdlmain.cpp b/src/osd/sdl/sdlmain.cpp
index e866cce5dac..8f0bc4c5950 100644
--- a/src/osd/sdl/sdlmain.cpp
+++ b/src/osd/sdl/sdlmain.cpp
@@ -44,6 +44,7 @@
 #include "video.h"
 #include "osdsdl.h"
 #include "modules/lib/osdlib.h"
+#include "modules/diagnostics/diagnostics_module.h"
 
 // we override SDL's normal startup on Win32
 // please see sdlprefix.h as well
diff --git a/src/osd/windows/winmain.cpp b/src/osd/windows/winmain.cpp
index 647c39831a8..115d33395db 100644
--- a/src/osd/windows/winmain.cpp
+++ b/src/osd/windows/winmain.cpp
@@ -29,6 +29,7 @@
 #include "winutf8.h"
 #include "winutil.h"
 #include "winfile.h"
+#include "modules/diagnostics/diagnostics_module.h"
 
 #if !WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
 using namespace Windows::ApplicationModel;

From b793232c972ac07923f6ed4389d0262ac91e6ed3 Mon Sep 17 00:00:00 2001
From: cracyc <cracyc@users.noreply.github.com>
Date: Sun, 17 Apr 2016 17:38:16 -0500
Subject: [PATCH 054/122] plugins/cheat: clear popmessage (nw)

---
 plugins/cheat/init.lua     |  1 +
 plugins/cheatfind/init.lua | 12 +++++---
 src/emu/luaengine.cpp      | 62 +++++++++++++++++++++++---------------
 src/emu/luaengine.h        | 10 +++---
 4 files changed, 51 insertions(+), 34 deletions(-)

diff --git a/plugins/cheat/init.lua b/plugins/cheat/init.lua
index ea6f4bba3fb..b77ee97fc46 100644
--- a/plugins/cheat/init.lua
+++ b/plugins/cheat/init.lua
@@ -327,6 +327,7 @@ function cheat.startplugin()
 	end
 
 	local function menu_callback(index, event)
+		manager:machine():popmessage()
 		if index > #cheats and event == "select" then
 			index = index - #cheats
 			if index == 2 then
diff --git a/plugins/cheatfind/init.lua b/plugins/cheatfind/init.lua
index c72fc95edac..69fd9346800 100644
--- a/plugins/cheatfind/init.lua
+++ b/plugins/cheatfind/init.lua
@@ -243,8 +243,8 @@ function cheatfind.startplugin()
 		matchsel = 1
 		menu_blocks = {}
 
-		table = cheat.getspaces()
-		for tag, list in pairs(table) do
+		local space_table = cheat.getspaces()
+		for tag, list in pairs(space_table) do
 			if list.program then
 				local ram = {}
 				for num, entry in pairs(list.program.map) do
@@ -257,8 +257,8 @@ function cheatfind.startplugin()
 				end
 			end
 		end
-		table = cheat.getram()
-		for tag, ram in pairs(table) do
+		space_table = cheat.getram()
+		for tag, ram in pairs(space_table) do
 			devtable[#devtable + 1] = { tag = tag, space = ram.dev, ram = {{ offset = 0, size = ram.size }} }
 		end
 	end
@@ -484,10 +484,12 @@ function cheatfind.startplugin()
 						_G.ce.inject(cheat)
 					end
 				else
+					local filename = string.format("%s_%08x_cheat.json", emu.romname(), match.addr)
 					local json = require("json")
-					local file = io.open(string.format("%s_%08x_cheat.json", emu.romname(), match.addr), "w")
+					local file = io.open(filename, "w")
 					file:write(json.stringify(cheat))
 					file:close()
+					manager:machine():popmessage("Cheat written to " .. filename)
 				end
 			end
 		end
diff --git a/src/emu/luaengine.cpp b/src/emu/luaengine.cpp
index 8e1ddbf8d93..34b78ba2890 100644
--- a/src/emu/luaengine.cpp
+++ b/src/emu/luaengine.cpp
@@ -1720,33 +1720,35 @@ lua_engine::~lua_engine()
 	close();
 }
 
-int lua_engine::compile_with_env(const char *env, const char *script)
+int lua_engine::compile_with_env(const char *envname, const char *script, const char *env)
 {
-	std::string field = std::string("env_").append(env);
+	std::string field = std::string("env_").append(envname);
+	int error;
 	lua_settop(m_lua_state, 0);
 	lua_getfield(m_lua_state, LUA_REGISTRYINDEX, field.c_str());
 
 	if(!lua_istable(m_lua_state, -1))
 	{
-		emu_file file(m_machine->manager().options().plugins_path(), OPEN_FLAG_READ);
-		// optionally load a script to prepare the environment
-		if(file.open(env, ".lua") != osd_file::error::NONE)
-		{
-			int error = luaL_loadfile(m_lua_state, file.fullpath());
-			if(error || (error = lua_pcall(m_lua_state, 0, 0, 0) != LUA_OK))
-			{
-				if(error == LUA_ERRRUN)
-					printf("%s\n", lua_tostring(m_lua_state, -1));
-				lua_pop(m_lua_state, 1);
-			}
-		}
-		if(!lua_istable(m_lua_state, -1))
-			lua_newtable(m_lua_state);
+		lua_newtable(m_lua_state);
 		lua_setfield(m_lua_state, LUA_REGISTRYINDEX, field.c_str());
 		lua_getfield(m_lua_state, LUA_REGISTRYINDEX, field.c_str());
 	}
 
-	if(int error = luaL_loadstring(m_lua_state, script) != LUA_OK)
+	// optionally load a string to prepare the environment
+	if(env)
+	{
+		error = luaL_loadstring(m_lua_state, env);
+		lua_pushvalue(m_lua_state, -2);
+		if((error != LUA_OK) || ((error = lua_pcall(m_lua_state, 1, 0, 0)) != LUA_OK))
+		{
+			if((error == LUA_ERRSYNTAX) || (error == LUA_ERRRUN))
+				printf("%s\n", lua_tostring(m_lua_state, -1));
+			lua_pop(m_lua_state, 1);
+		}
+		lua_getfield(m_lua_state, LUA_REGISTRYINDEX, field.c_str());
+	}
+
+	if((error = luaL_loadstring(m_lua_state, script)) != LUA_OK)
 	{
 		if(error == LUA_ERRSYNTAX)
 			printf("%s\n", lua_tostring(m_lua_state, -1));
@@ -1801,6 +1803,8 @@ void lua_engine::run(const char *env, int ref)
 	run_internal(env, ref);
 	lua_pop(m_lua_state, 1);
 }
+// create specialization so luabridge doesn't have to be included everywhere
+template int lua_engine::run<int>(const char *env, int ref);
 
 void lua_engine::run_internal(const char *env, int ref)
 {
@@ -1812,7 +1816,8 @@ void lua_engine::run_internal(const char *env, int ref)
 		if(lua_isfunction(m_lua_state, -1))
 		{
 			lua_pushvalue(m_lua_state, -3);
-			if(int error = lua_pcall(m_lua_state, 1, 1, 0) != LUA_OK)
+			int error;
+			if((error = lua_pcall(m_lua_state, 1, 1, 0)) != LUA_OK)
 			{
 				if(error == LUA_ERRRUN)
 					printf("%s\n", lua_tostring(m_lua_state, -1));
@@ -1824,6 +1829,7 @@ void lua_engine::run_internal(const char *env, int ref)
 	lua_replace(m_lua_state, 1);
 	lua_pop(m_lua_state, 1);
 }
+
 void lua_engine::menu_populate(std::string &menu, std::vector<menu_item> &menu_list)
 {
 	std::string field = "menu_pop_" + menu;
@@ -1835,7 +1841,8 @@ void lua_engine::menu_populate(std::string &menu, std::vector<menu_item> &menu_l
 		lua_pop(m_lua_state, 1);
 		return;
 	}
-	if(int error = lua_pcall(m_lua_state, 0, 1, 0) != LUA_OK)
+	int error;
+	if((error = lua_pcall(m_lua_state, 0, 1, 0)) != LUA_OK)
 	{
 		if(error == LUA_ERRRUN)
 			printf("%s\n", lua_tostring(m_lua_state, -1));
@@ -1881,7 +1888,8 @@ bool lua_engine::menu_callback(std::string &menu, int index, std::string event)
 	{
 		lua_pushinteger(m_lua_state, index);
 		lua_pushstring(m_lua_state, event.c_str());
-		if(int error = lua_pcall(m_lua_state, 2, 1, 0))
+		int error;
+		if((error = lua_pcall(m_lua_state, 2, 1, 0)) != LUA_OK)
 		{
 			if(error == 2)
 				printf("%s\n", lua_tostring(m_lua_state, -1));
@@ -1922,7 +1930,8 @@ void lua_engine::execute_function(const char *id)
 		{
 			if (lua_isfunction(m_lua_state, -1))
 			{
-				if(int error = lua_pcall(m_lua_state, 0, 0, 0))
+				int error;
+				if((error = lua_pcall(m_lua_state, 0, 0, 0)) != LUA_OK)
 				{
 					if(error == 2)
 						printf("%s\n", lua_tostring(m_lua_state, -1));
@@ -2062,8 +2071,10 @@ void lua_engine::attach_notifiers()
 int lua_engine::lua_machine::l_popmessage(lua_State *L)
 {
 	running_machine *m = luabridge::Stack<running_machine *>::get(L, 1);
-	luaL_argcheck(L, lua_isstring(L, 2), 2, "message (string) expected");
-	m->popmessage("%s", luaL_checkstring(L, 2));
+	if(!lua_isstring(L, 2))
+		m->popmessage();
+	else
+		m->popmessage("%s", luaL_checkstring(L, 2));
 	return 0;
 }
 
@@ -2245,6 +2256,9 @@ void lua_engine::initialize()
 				.addFunction ("tag", &ioport_port::tag)
 				.addFunction ("active", &ioport_port::active)
 				.addFunction ("live", &ioport_port::live)
+				.addFunction ("read", &ioport_port::read)
+				.addFunction ("write", &ioport_port::write)
+				.addFunction ("field", &ioport_port::field)
 				.addProperty <luabridge::LuaRef, void> ("fields", &lua_engine::l_ioports_port_get_fields)
 			.endClass()
 			.beginClass <ioport_field> ("ioport_field")
@@ -2466,7 +2480,7 @@ void lua_engine::initialize()
 				.addCFunction ("read", &lua_emu_file::l_emu_file_read)
 			.endClass()
 			// make sure there's a reference to the emu_file search path in your script as long as you need it
-			// otherwise it might be garbage collected as emu_file don't copy the string
+			// otherwise it might be garbage collected as emu_file doesn't copy the string
 			.deriveClass <emu_file, lua_emu_file> ("file")
 				.addConstructor <void (*)(const char *, UINT32)> ()
 				.addFunction ("open", static_cast<osd_file::error (emu_file::*)(const char *)>(&emu_file::open))
diff --git a/src/emu/luaengine.h b/src/emu/luaengine.h
index 3b4c85ce939..d8a538c9a42 100644
--- a/src/emu/luaengine.h
+++ b/src/emu/luaengine.h
@@ -63,11 +63,11 @@ public:
 	void attach_notifiers();
 	void on_frame_done();
 
-	int compile_with_env(const char *env, const char *script);
-	template <typename Tout, typename Tin> Tout run(const char *env, int ref, Tin in);
-	template <typename Tout> Tout run(const char *env, int ref);
-	template <typename Tin> void run(const char *env, int ref, Tin in);
-	void run(const char *env, int ref);
+	int compile_with_env(const char *envname, const char *script, const char *env = nullptr);
+	template <typename Tout, typename Tin> Tout run(const char *envname, int ref, Tin in);
+	template <typename Tout> Tout run(const char *envname, int ref);
+	template <typename Tin> void run(const char *envname, int ref, Tin in);
+	void run(const char *envname, int ref);
 private:
 	struct hook {
 		lua_State *L;

From bef65d2e839ed0e2f51bd293f8b63334a2f42e1a Mon Sep 17 00:00:00 2001
From: briantro <briantro@users.noreply.github.com>
Date: Sun, 17 Apr 2016 18:16:59 -0500
Subject: [PATCH 055/122] peplus.cpp: Minor doc update - NW

---
 src/mame/drivers/peplus.cpp | 32 ++++++++++++++------------------
 1 file changed, 14 insertions(+), 18 deletions(-)

diff --git a/src/mame/drivers/peplus.cpp b/src/mame/drivers/peplus.cpp
index dd3ecd9db50..075c9a16c3d 100644
--- a/src/mame/drivers/peplus.cpp
+++ b/src/mame/drivers/peplus.cpp
@@ -12743,8 +12743,7 @@ ROM_START( pexmp013 ) /* Superboard : 5-in-1 Wingboard (XMP00013) Program in Spa
 /*
 
 The CG2346 set seems to support all games supported in CG2298 as well as graphics support for the following XnnnnnnP Data game types:
-  Triple Double Bonus
-  Black Jack Bonus (comes up as Black Jack Poker)
+  Triple Double Bonus, Black Jack Poker
 
 */
 	ROM_REGION( 0x10000, "maincpu", 0 )
@@ -12783,7 +12782,7 @@ Known Wingboard compatible program roms:
    XMP00009 (CG2230+CAPX2230 - not dumped - MGM exclusive)
    XMP00011 (CG2298+CAPX2298 - not dumped)
    XMP00013 - Spanish
-   XMP00014 - International (not dumped)
+   XMP00014 - International (CG2352+CAPX2352 - not dumped)
    XMP00017
    XMP00022 - Spanish
    XMP00026 - Spanish
@@ -12793,16 +12792,14 @@ Wingboard programs are not compatible with:
  Lucky Deal Poker, Shockwave Poker, Ace$ Bonus Poker, Dealt Deuces Bonus, Barbaric Deuces, Pay the Ace (No Face)
  and many other "specialty" poker games.
 
-The CG2298 graphics can support the following XnnnnnnP Data game types:
+The CG2298 graphics can support the following XnnnnnnP Data game types (as displayed):
 
-  Bonus Poker, Bonus Poker Deluxe, Double Bonus Poker, Double Double Bonus Poker, Triple Bonus Poker
-  Deuces Wild Poker, Deluxe Deuces Wild, Loose Deuces, Deuces Bonus, Double Deuces, Royal Deuces Poker
-  Joker Poker, Double Joker Poker, Deuces Joker Wild Poker, Sevens or Better, Tens or Better, Jacks or Better
-  Nevada Draw Poker, Nevada Bonus Poker, White Hot Aces, Double Double Aces & Faces, Odds & Ends Poker
-  Two Pair, Crazy Eights and Full House Bonus
+  Bonus Poker, Bonus Poker Dlx, Crazy Eights, Deluxe Deuces, Deuces Joker, Deuces Bonus, Deuces Wild
+  Double Bonus, Double Deuces, Dbl Dbl Bonus, Double Joker, Jacks or Better, Joker Poker, Loose Deuces
+  Nevada Bonus, Nevada Draw, Odds & Ends, Full House Bonus, Royal Deuces, Sevens or Better, Tens or Better
+  Triple Bonus, Two Pair, White Hot Aces
 
-  Super Aces shows as just Bonus Poker
-  Triple Bonus Poker Plus shows as just Triple Bonus
+  Super Aces shows as just Bonus Poker, Triple Bonus Poker Plus shows as just Triple Bonus
 
 */
 	ROM_REGION( 0x10000, "maincpu", 0 )
@@ -12836,7 +12833,8 @@ ROM_END
 ROM_START( pexmp017a ) /* Superboard : 5-in-1 Wingboard (XMP00017) */
 /*
 
-The CG2352 set is meant to be used with XMP00014 - But use here now as a place holder
+The CG2352 set is meant to be used with XMP00014 or other International program sets - But use here now as a place holder
+Same set of games as CG2298 but includes graphics for International currency.
 
 */
 	ROM_REGION( 0x10000, "maincpu", 0 )
@@ -12871,10 +12869,8 @@ ROM_END
 ROM_START( pexmp017b ) /* Superboard : 5-in-1 Wingboard (XMP00017) */
 /*
 
-The CG2426 set supersedes CG2298 and adds graphics support for the following XnnnnnnP Data game types:
-  Black Jack Bonus
-  Super Double Bonus
-  Triple Double Bonus
+The CG2426 set supersedes CG2298 and adds graphics support for the following XnnnnnnP Data game types (as displayed):
+  BlackJack Bonus, Tpl Dbl Bonus, Super Dbl Bonus
 
 */
 	ROM_REGION( 0x10000, "maincpu", 0 )
@@ -12966,8 +12962,8 @@ ROM_END
 ROM_START( pexmp030 ) /* Superboard : 5-in-1 Wingboard (XMP00030) */
 /*
 
-The CG2451 set supersedes CG2298 & CG2426 and adds graphics support for the following XnnnnnnP Data game types:
-  Double Double Bonus Plus
+The CG2451 set supersedes CG2298 & CG2426 and adds graphics support for the following XnnnnnnP Data game types (as displayed):
+  Dbl Dbl Bonus Plus
 
 */
 	ROM_REGION( 0x10000, "maincpu", 0 )

From 08abca8ba4f24811f1e2a9ac316d9d193c4f3715 Mon Sep 17 00:00:00 2001
From: hap <happppp@users.noreply.github.com>
Date: Mon, 18 Apr 2016 02:48:12 +0200
Subject: [PATCH 056/122] hh_hmcs40: bultrman bug note

---
 src/mame/drivers/hh_hmcs40.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/mame/drivers/hh_hmcs40.cpp b/src/mame/drivers/hh_hmcs40.cpp
index 5f11a63253b..fe7279c0eed 100644
--- a/src/mame/drivers/hh_hmcs40.cpp
+++ b/src/mame/drivers/hh_hmcs40.cpp
@@ -72,6 +72,7 @@
   - gckong random lockups (tap the jump button repeatedly): mcu stack overflow,
     works ok if stack levels is increased, 38800 B rev. has more stack levels?
     Or it could be a race condition: irq happening too late/early.
+  - bultrman building explosions are wrong, especially visible on the first one
   - epacman booting the game in demo mode, pacman should go straight to the
     upper-left power pill: mcu cycle/interrupt timing related
   - Though very uncommon when compared to games with LED/lamp display,

From 266efbe35051f39caa7f50477d0991fdf76da814 Mon Sep 17 00:00:00 2001
From: Firehawke <firehawke@gmail.com>
Date: Sun, 17 Apr 2016 19:56:17 -0700
Subject: [PATCH 057/122] New PlayChoice-10 BIOS (Single Screen, Freeplay fix,
 Newer?)

---
 src/mame/drivers/playch10.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/mame/drivers/playch10.cpp b/src/mame/drivers/playch10.cpp
index 3c43e990d4f..2e4a8b260e8 100644
--- a/src/mame/drivers/playch10.cpp
+++ b/src/mame/drivers/playch10.cpp
@@ -712,7 +712,9 @@ MACHINE_CONFIG_END
 	ROM_SYSTEM_BIOS( 1, "single", "Single Monitor Version" ) \
 	ROM_LOAD_BIOS( 1, "pck1-c.8t", 0x00000, 0x4000, CRC(503ee8b1) SHA1(3bd20bc71cac742d1b8c1430a6426d0a19db7ad0) ) \
 	ROM_SYSTEM_BIOS( 2, "alt", "Alt Bios" ) /* this bios doens't work properly, selecting service mode causes it to hang, is it good? maybe different hw? */ \
-	ROM_LOAD_BIOS( 2, "pch1-c_8te.8t", 0x00000, 0x4000, CRC(123ffa37) SHA1(3bef754a5a85a8498bb6222ddf5cb9021f264db5) )
+	ROM_LOAD_BIOS( 2, "pch1-c_8te.8t", 0x00000, 0x4000, CRC(123ffa37) SHA1(3bef754a5a85a8498bb6222ddf5cb9021f264db5) ) \
+	ROM_SYSTEM_BIOS( 3, "singleb", "Single Monitor Version (Newer?)" ) /* Newer single screen? Four bytes different, reported bugfix in freeplay */ \
+	ROM_LOAD_BIOS( 3, "pck1-c_fix.8t", 0x00000, 0x4000, CRC(0be8ceb4) SHA1(45b127a537370226e6b30be2b5a92ad05673ca7f) )
 
 
 #define BIOS_GFX                                            \
@@ -729,6 +731,10 @@ MACHINE_CONFIG_END
 	ROM_LOAD_BIOS( 2, "pch1-c_8m.8m",    0x02000, 0x2000, CRC(83ebc7a3) SHA1(a7c607138f4f9b96ab5d3a82c47895f77672e296) )   \
 	ROM_LOAD_BIOS( 2, "pch1-c__8k.8k",    0x04000, 0x2000, CRC(9acffb30) SHA1(b814f10ef23f2ca445fabafcbf7f25e2d454ba8c) ) \
 	\
+	ROM_LOAD_BIOS( 3, "pch1-c__8p_e-1.8p",    0x00000, 0x2000, CRC(30c15e23) SHA1(69166afdb2fe827c7f1919cdf4197caccbd961fa) )   \
+	ROM_LOAD_BIOS( 3, "pch1-c__8m_e-1.8m",    0x02000, 0x2000, CRC(c1232eee) SHA1(beaf9fa2d091a3c7f70c51e966d885b1f9f0935f) )   \
+	ROM_LOAD_BIOS( 3, "pch1-c__8k.8k",    0x04000, 0x2000, CRC(9acffb30) SHA1(b814f10ef23f2ca445fabafcbf7f25e2d454ba8c) )   \
+	\
 	ROM_REGION( 0x0300, "proms", 0 )                        \
 	ROM_LOAD( "pch1-c-6f.82s129an.6f",    0x0000, 0x0100, CRC(e5414ca3) SHA1(d2878411cda84ffe0afb2e538a67457f51bebffb) )    \
 	ROM_LOAD( "pch1-c-6e.82s129an.6e",    0x0100, 0x0100, CRC(a2625c6e) SHA1(a448b47c9289902e26a3d3c4c7d5a7968c385e81) )    \

From 16c5dcfa4a641d9a9f8a78278bb1f77e7db187bb Mon Sep 17 00:00:00 2001
From: arbee <rb6502@users.noreply.github.com>
Date: Mon, 18 Apr 2016 00:00:36 -0400
Subject: [PATCH 058/122] apple2: fixed inverse text drawing. [R. Belmont]

---
 src/mame/video/apple2.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/mame/video/apple2.cpp b/src/mame/video/apple2.cpp
index a496d3e3e15..6f8357b8f23 100644
--- a/src/mame/video/apple2.cpp
+++ b/src/mame/video/apple2.cpp
@@ -827,6 +827,12 @@ void a2_video_device::plot_text_character_orig(bitmap_ind16 &bitmap, int xpos, i
 			bg = i;
 		}
 	}
+	else if (code < 0x40)	// inverse: flip FG and BG
+	{
+			i = fg;
+			fg = bg;
+			bg = i;
+	}
 
 	/* look up the character data */
 	chardata = &textgfx_data[(code * 8)];

From 5c4ef7ac70014e0cbbc85ae4ad5ada4896a37a5a Mon Sep 17 00:00:00 2001
From: mahlemiut <bsr@xnet.co.nz>
Date: Mon, 18 Apr 2016 16:12:43 +1200
Subject: [PATCH 059/122] debugimgui: Removed some unused stuff, renamed window
 class.

---
 src/osd/modules/debugger/debugimgui.cpp | 92 +++++++++++--------------
 1 file changed, 39 insertions(+), 53 deletions(-)

diff --git a/src/osd/modules/debugger/debugimgui.cpp b/src/osd/modules/debugger/debugimgui.cpp
index 51db9adddb3..fe8ddfb507e 100644
--- a/src/osd/modules/debugger/debugimgui.cpp
+++ b/src/osd/modules/debugger/debugimgui.cpp
@@ -1,4 +1,4 @@
-// Initial test to attempt an imgui based debugger
+// ImGui based debugger
 
 #include "emu.h"
 #include "imgui/imgui.h"
@@ -18,25 +18,14 @@
 #include "debug_module.h"
 #include "modules/osdmodule.h"
 
-enum
+class debug_area
 {
-	VIEW_STATE_BUTTON           = 0x01,
-	VIEW_STATE_MOVING           = 0x02,
-	VIEW_STATE_SIZING           = 0x04,
-	VIEW_STATE_NEEDS_UPDATE     = 0x08,
-	VIEW_STATE_FOLLOW_CPU       = 0x10,
-	VIEW_STATE_VISIBLE          = 0x20
-};
-
-class DView
-{
-	DISABLE_COPYING(DView);
+	DISABLE_COPYING(debug_area);
 
 public:
-	DView(running_machine &machine, debug_view_type type, int flags)
+	debug_area(running_machine &machine, debug_view_type type)
 		: next(nullptr),
 			type(0),
-			state(0),
 			ofs_x(0),
 			ofs_y(0),
 			exec_cmd(false)
@@ -44,7 +33,6 @@ public:
 		this->view = machine.debug_view().alloc_view(type, nullptr, this);
 		this->type = type;
 		this->m_machine = &machine;
-		this->state = flags | VIEW_STATE_NEEDS_UPDATE | VIEW_STATE_VISIBLE;
 		this->width = 300;
 		this->height = 300;
 
@@ -59,7 +47,7 @@ public:
 			break;
 		}
 		}
-	~DView()
+	~debug_area()
 	{
 		//this->target->debug_free(*this->container);
 		machine().debug_view().free_view(*this->view);
@@ -67,12 +55,11 @@ public:
 
 	running_machine &machine() const { assert(m_machine != nullptr); return *m_machine; }
 
-	DView *             next;
+	debug_area *             next;
 
 	int                 type;
 	debug_view *        view;
 	running_machine *   m_machine;
-	int                 state;
 	// drawing
 	int                 ofs_x;
 	int                 ofs_y;
@@ -116,9 +103,9 @@ private:
 	void add_memory(int id);
 	void add_bpoints(int id);
 	void add_wpoints(int id);
-	void draw_disasm(DView* view_ptr, bool* opened);
-	void draw_memory(DView* view_ptr, bool* opened);
-	void draw_bpoints(DView* view_ptr, bool* opened);
+	void draw_disasm(debug_area* view_ptr, bool* opened);
+	void draw_memory(debug_area* view_ptr, bool* opened);
+	void draw_bpoints(debug_area* view_ptr, bool* opened);
 	void update_cpu_view(device_t* device);
 
 	running_machine* m_machine;
@@ -131,24 +118,23 @@ private:
 	ImguiFontHandle  m_font;
 	UINT8            m_key_char;
 	bool             m_hide;
-    //    unsigned char* font_data;
 	int              m_win_count;  // number of active windows, does not decrease, used to ID individual windows
 };
 
 // globals
-static std::vector<DView*> view_list;
-static DView* view_main_console = nullptr;
-static DView* view_main_disasm = nullptr;
-static DView* view_main_regs = nullptr;
+static std::vector<debug_area*> view_list;
+static debug_area* view_main_console = nullptr;
+static debug_area* view_main_disasm = nullptr;
+static debug_area* view_main_regs = nullptr;
 
-static void view_list_add(DView* item)
+static void view_list_add(debug_area* item)
 {
 	view_list.push_back(item);
 }
 
-static void view_list_remove(DView* item)
+static void view_list_remove(debug_area* item)
 {
-	std::vector<DView*>::iterator it;
+	std::vector<debug_area*>::iterator it;
 	if(view_list.empty())
 		return;
 	it = std::find(view_list.begin(),view_list.end(),item);
@@ -156,11 +142,11 @@ static void view_list_remove(DView* item)
 		
 }
 
-static DView *dview_alloc(running_machine &machine, debug_view_type type, int flags)
+static debug_area *dview_alloc(running_machine &machine, debug_view_type type)
 {
-	DView *dv;
+	debug_area *dv;
 
-	dv = global_alloc(DView(machine, type, flags));
+	dv = global_alloc(debug_area(machine, type));
 
 	return dv;
 }
@@ -367,7 +353,7 @@ void debug_imgui::update_cpu_view(device_t* device)
 	view_main_regs->view->set_source(*source);
 }
 
-void debug_imgui::draw_bpoints(DView* view_ptr, bool* opened)
+void debug_imgui::draw_bpoints(debug_area* view_ptr, bool* opened)
 {
 	ImGui::SetNextWindowSize(ImVec2(view_ptr->width,view_ptr->height + ImGui::GetTextLineHeight()),ImGuiSetCond_Once);
 	if(ImGui::Begin(view_ptr->title.c_str(),opened))
@@ -424,8 +410,8 @@ void debug_imgui::draw_bpoints(DView* view_ptr, bool* opened)
 void debug_imgui::add_bpoints(int id)
 {
 	std::stringstream str;
-	DView* new_view;
-	new_view = dview_alloc(*m_machine, DVT_BREAK_POINTS, 0);
+	debug_area* new_view;
+	new_view = dview_alloc(*m_machine, DVT_BREAK_POINTS);
 	str << id;
 	str << ": Breakpoints";
 	new_view->title = str.str();
@@ -439,8 +425,8 @@ void debug_imgui::add_bpoints(int id)
 void debug_imgui::add_wpoints(int id)
 {
 	std::stringstream str;
-	DView* new_view;
-	new_view = dview_alloc(*m_machine, DVT_WATCH_POINTS, 0);
+	debug_area* new_view;
+	new_view = dview_alloc(*m_machine, DVT_WATCH_POINTS);
 	str << id;
 	str << ": Watchpoints";
 	new_view->title = str.str();
@@ -451,7 +437,7 @@ void debug_imgui::add_wpoints(int id)
 	view_list_add(new_view);
 }
 
-void debug_imgui::draw_disasm(DView* view_ptr, bool* opened)
+void debug_imgui::draw_disasm(debug_area* view_ptr, bool* opened)
 {
 	std::string cpu_list = "";
 	const debug_view_source* src = view_ptr->view->first_source();
@@ -566,8 +552,8 @@ void debug_imgui::draw_disasm(DView* view_ptr, bool* opened)
 void debug_imgui::add_disasm(int id)
 {
 	std::stringstream str;
-	DView* new_view;
-	new_view = dview_alloc(*m_machine, DVT_DISASSEMBLY, 0);
+	debug_area* new_view;
+	new_view = dview_alloc(*m_machine, DVT_DISASSEMBLY);
 	str << id;
 	str << ": Disassembly";
 	new_view->title = str.str();
@@ -580,7 +566,7 @@ void debug_imgui::add_disasm(int id)
 	view_list_add(new_view);
 }
 
-void debug_imgui::draw_memory(DView* view_ptr, bool* opened)
+void debug_imgui::draw_memory(debug_area* view_ptr, bool* opened)
 {
 	std::string region_list = "";
 	const debug_view_source* src = view_ptr->view->first_source();
@@ -719,8 +705,8 @@ void debug_imgui::draw_memory(DView* view_ptr, bool* opened)
 void debug_imgui::add_memory(int id)
 {
 	std::stringstream str;
-	DView* new_view;
-	new_view = dview_alloc(*m_machine, DVT_MEMORY, 0);
+	debug_area* new_view;
+	new_view = dview_alloc(*m_machine, DVT_MEMORY);
 	str << id;
 	str << ": Memory";
 	new_view->title = str.str();
@@ -796,13 +782,13 @@ void debug_imgui::draw_console()
 			{
 				if(ImGui::MenuItem("Show all"))
 				{
-					for(std::vector<DView*>::iterator view_ptr = view_list.begin();view_ptr != view_list.end();++view_ptr)
+					for(std::vector<debug_area*>::iterator view_ptr = view_list.begin();view_ptr != view_list.end();++view_ptr)
 						ImGui::SetWindowCollapsed((*view_ptr)->title.c_str(),false);
 				}
 				ImGui::Separator();
 				// list all extra windows, so we can un-collapse the windows if necessary
-				//DView* view_ptr;
-				for(std::vector<DView*>::iterator view_ptr = view_list.begin();view_ptr != view_list.end();++view_ptr)
+				//debug_area* view_ptr;
+				for(std::vector<debug_area*>::iterator view_ptr = view_list.begin();view_ptr != view_list.end();++view_ptr)
 				{
 					bool collapsed;
 					if(ImGui::Begin((*view_ptr)->title.c_str()))
@@ -935,9 +921,9 @@ void debug_imgui::draw_console()
 
 void debug_imgui::update()
 {
-	DView* to_delete = nullptr;
-	//DView* view_ptr = view_list;
-	std::vector<DView*>::iterator view_ptr;
+	debug_area* to_delete = nullptr;
+	//debug_area* view_ptr = view_list;
+	std::vector<debug_area*>::iterator view_ptr;
 	bool opened;
 	int count = 0;
 	ImGui::PushStyleColor(ImGuiCol_WindowBg,ImVec4(1.0f,1.0f,1.0f,0.9f));
@@ -1031,16 +1017,16 @@ void debug_imgui::wait_for_debugger(device_t &device, bool firststop)
 	UINT32 height = m_machine->render().ui_target().height();
 	if(firststop && view_list.empty())
 	{
-		view_main_console = dview_alloc(device.machine(), DVT_CONSOLE, VIEW_STATE_FOLLOW_CPU);
+		view_main_console = dview_alloc(device.machine(), DVT_CONSOLE);
 		view_main_console->title = "MAME Debugger";
 		view_main_console->width = 500;
 		view_main_console->height = 200;
 		view_main_console->ofs_x = 0;
 		view_main_console->ofs_y = 0;
-		view_main_disasm = dview_alloc(device.machine(), DVT_DISASSEMBLY, VIEW_STATE_FOLLOW_CPU);
+		view_main_disasm = dview_alloc(device.machine(), DVT_DISASSEMBLY);
 		view_main_disasm->width = 500;
 		view_main_disasm->height = 200;
-		view_main_regs = dview_alloc(device.machine(), DVT_STATE, VIEW_STATE_FOLLOW_CPU);
+		view_main_regs = dview_alloc(device.machine(), DVT_STATE);
 		view_main_regs->width = 180;
 		view_main_regs->height = 440;
 		strcpy(view_main_console->console_input,"");  // clear console input

From 6db5aa23228e98c55dfaa389c09424ecd9689cfd Mon Sep 17 00:00:00 2001
From: mahlemiut <bsr@xnet.co.nz>
Date: Mon, 18 Apr 2016 19:48:01 +1200
Subject: [PATCH 060/122] debugimgui: added error log window, and limited the
 debugger console to display 100 lines, so that rendering it doesn't get too
 slow.

---
 src/osd/modules/debugger/debugimgui.cpp | 71 +++++++++++++++++++++++++
 1 file changed, 71 insertions(+)

diff --git a/src/osd/modules/debugger/debugimgui.cpp b/src/osd/modules/debugger/debugimgui.cpp
index fe8ddfb507e..a5d29550e02 100644
--- a/src/osd/modules/debugger/debugimgui.cpp
+++ b/src/osd/modules/debugger/debugimgui.cpp
@@ -103,9 +103,11 @@ private:
 	void add_memory(int id);
 	void add_bpoints(int id);
 	void add_wpoints(int id);
+	void add_log(int id);
 	void draw_disasm(debug_area* view_ptr, bool* opened);
 	void draw_memory(debug_area* view_ptr, bool* opened);
 	void draw_bpoints(debug_area* view_ptr, bool* opened);
+	void draw_log(debug_area* view_ptr, bool* opened);
 	void update_cpu_view(device_t* device);
 
 	running_machine* m_machine;
@@ -300,6 +302,8 @@ void debug_imgui::handle_keys()
 		add_bpoints(++m_win_count);
 	if(ImGui::IsKeyPressed(ITEM_ID_W) && ImGui::IsKeyDown(ITEM_ID_LCONTROL))
 		add_wpoints(++m_win_count);
+	if(ImGui::IsKeyPressed(ITEM_ID_L) && ImGui::IsKeyDown(ITEM_ID_LCONTROL))
+		add_log(++m_win_count);
 
 	m_machine->ui_input().reset();  // clear remaining inputs, so they don't fall through to the UI
 }
@@ -437,6 +441,64 @@ void debug_imgui::add_wpoints(int id)
 	view_list_add(new_view);
 }
 
+void debug_imgui::draw_log(debug_area* view_ptr, bool* opened)
+{
+	ImGui::SetNextWindowSize(ImVec2(view_ptr->width,view_ptr->height + ImGui::GetTextLineHeight()),ImGuiSetCond_Once);
+	if(ImGui::Begin(view_ptr->title.c_str(),opened))
+	{
+		rgb_t bg, fg;
+		const debug_view_char *viewdata;
+		debug_view_xy vsize,totalsize;
+		unsigned char v;
+		int x,y;
+
+		viewdata = view_ptr->view->viewdata();
+		totalsize = view_ptr->view->total_size();
+		if(totalsize.y > 100)
+			totalsize.y = 100;
+		view_ptr->view->set_visible_size(totalsize);
+		vsize = view_ptr->view->visible_size();
+		
+		ImGui::BeginChild("##log_output", ImVec2(ImGui::GetWindowWidth() - 16,ImGui::GetWindowHeight() - ImGui::GetTextLineHeight() - ImGui::GetCursorPosY()));  // account for title bar and widgets already drawn
+		ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(0,0));
+		ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing, ImVec2(0,0));
+		for(y=0;y<vsize.y;y++)
+		{
+			for(x=0;x<vsize.x;x++)
+			{
+				ImVec2 xy1,xy2;
+				map_attr_to_fg_bg(viewdata->attrib,&fg,&bg);
+				v = viewdata->byte;
+				ImGui::PushStyleColor(ImGuiCol_Text,ImVec4(fg.r()/255.0f,fg.g()/255.0f,fg.b()/255.0f,fg.a()/255.0f));
+				ImGui::Text("%c",v);
+				ImGui::PopStyleColor();
+				if(x<vsize.x - 1)
+					ImGui::SameLine();
+				viewdata++;
+			}
+		}
+		ImGui::PopStyleVar(2);
+		ImGui::EndChild();
+
+		ImGui::End();
+	}
+}
+
+void debug_imgui::add_log(int id)
+{
+	std::stringstream str;
+	debug_area* new_view;
+	new_view = dview_alloc(*m_machine, DVT_LOG);
+	str << id;
+	str << ": Error log";
+	new_view->title = str.str();
+	new_view->width = 500;
+	new_view->height = 300;
+	new_view->ofs_x = 0;
+	new_view->ofs_y = 0;
+	view_list_add(new_view);
+}
+
 void debug_imgui::draw_disasm(debug_area* view_ptr, bool* opened)
 {
 	std::string cpu_list = "";
@@ -745,6 +807,8 @@ void debug_imgui::draw_console()
 					add_bpoints(++m_win_count);
 				if(ImGui::MenuItem("New watchpoints window", "Ctrl+W")) 
 					add_wpoints(++m_win_count);
+				if(ImGui::MenuItem("New log window", "Ctrl+L")) 
+					add_log(++m_win_count);
 				ImGui::Separator();
 				if(ImGui::MenuItem("Run", "F5"))
 				{
@@ -884,6 +948,8 @@ void debug_imgui::draw_console()
 		// console portion
 		viewdata = view_main_console->view->viewdata();
 		totalsize = view_main_console->view->total_size();
+		if(totalsize.y > 100)
+			totalsize.y = 100;
 		view_main_console->view->set_visible_size(totalsize);
 //		height = ImGui::GetTextLineHeight();
 		vsize = view_main_console->view->visible_size();
@@ -953,6 +1019,11 @@ void debug_imgui::update()
 			if(opened == false)
 				to_delete = (*view_ptr);
 			break;
+		case DVT_LOG:
+			draw_log((*view_ptr),&opened);
+			if(opened == false)
+				to_delete = (*view_ptr);
+			break;
 		case DVT_BREAK_POINTS:
 		case DVT_WATCH_POINTS:  // watchpoints window uses same drawing code as breakpoints window
 			draw_bpoints((*view_ptr),&opened);

From 8a07dafbafd614e9d060b827e2e0a49185e284ba Mon Sep 17 00:00:00 2001
From: "therealmogminer@gmail.com" <therealmogminer@gmail.com>
Date: Mon, 18 Apr 2016 13:13:09 +0200
Subject: [PATCH 061/122] Fix crash with -video none, nw

---
 src/osd/windows/window.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/osd/windows/window.cpp b/src/osd/windows/window.cpp
index da6aebd07ff..c2f05428ec2 100644
--- a/src/osd/windows/window.cpp
+++ b/src/osd/windows/window.cpp
@@ -289,7 +289,10 @@ void windows_osd_interface::build_slider_list()
 void windows_osd_interface::add_audio_to_recording(const INT16 *buffer, int samples_this_frame)
 {
 	win_window_info *window = win_window_list; // We only record on the first window
-	window->m_renderer->add_audio_to_recording(buffer, samples_this_frame);
+	if (window != nullptr && window->m_renderer != nullptr)
+	{
+		window->m_renderer->add_audio_to_recording(buffer, samples_this_frame);
+	}
 }
 
 //============================================================

From c47bd3a9370dde25764b2153c235f6c57acaacda Mon Sep 17 00:00:00 2001
From: Miodrag Milanovic <mmicko@gmail.com>
Date: Mon, 18 Apr 2016 14:08:54 +0200
Subject: [PATCH 062/122] Added generic latch to replace soundlatch in
 driver_device (nw)

---
 scripts/src/machine.lua           |  12 +++
 scripts/target/mame/arcade.lua    |   1 +
 scripts/target/mame/mess.lua      |   1 +
 src/devices/machine/gen_latch.cpp | 155 ++++++++++++++++++++++++++++++
 src/devices/machine/gen_latch.h   |  80 +++++++++++++++
 5 files changed, 249 insertions(+)
 create mode 100644 src/devices/machine/gen_latch.cpp
 create mode 100644 src/devices/machine/gen_latch.h

diff --git a/scripts/src/machine.lua b/scripts/src/machine.lua
index 4499f93ef1f..b364535e3c1 100644
--- a/scripts/src/machine.lua
+++ b/scripts/src/machine.lua
@@ -2750,3 +2750,15 @@ if (MACHINES["GENPC"]~=null) then
 		MAME_DIR .. "src/devices/machine/genpc.h",
 	}
 end
+
+---------------------------------------------------
+--
+--@src/devices/machine/gen_latch.h,MACHINES["GEN_LATCH] = true
+---------------------------------------------------
+
+if (MACHINES["GEN_LATCH"]~=null) then
+	files {
+		MAME_DIR .. "src/devices/machine/gen_latch.cpp",
+		MAME_DIR .. "src/devices/machine/gen_latch.h",
+	}
+end
diff --git a/scripts/target/mame/arcade.lua b/scripts/target/mame/arcade.lua
index c662d17658f..252cf594be1 100644
--- a/scripts/target/mame/arcade.lua
+++ b/scripts/target/mame/arcade.lua
@@ -566,6 +566,7 @@ MACHINES["STEPPERS"] = true
 MACHINES["PCI9050"] = true
 --MACHINES["TMS1024"] = true
 MACHINES["GENPC"] = true
+MACHINES["GEN_LATCH"] = true
 
 --------------------------------------------------
 -- specify available bus cores
diff --git a/scripts/target/mame/mess.lua b/scripts/target/mame/mess.lua
index 9101b913f36..93039ee80bd 100644
--- a/scripts/target/mame/mess.lua
+++ b/scripts/target/mame/mess.lua
@@ -574,6 +574,7 @@ MACHINES["TMS1024"] = true
 MACHINES["NSC810"] = true
 MACHINES["VT82C496"] = true
 MACHINES["GENPC"] = true
+MACHINES["GEN_LATCH"] = true
 
 --------------------------------------------------
 -- specify available bus cores
diff --git a/src/devices/machine/gen_latch.cpp b/src/devices/machine/gen_latch.cpp
new file mode 100644
index 00000000000..54982bc7e85
--- /dev/null
+++ b/src/devices/machine/gen_latch.cpp
@@ -0,0 +1,155 @@
+// license:BSD-3-Clause
+// copyright-holders:Miodrag Milanovic
+/***************************************************************************
+
+    Generic 8bit and 16 bit latch devices
+
+***************************************************************************/
+#include "emu.h"
+#include "gen_latch.h"
+
+//**************************************************************************
+//  DEVICE DEFINITIONS
+//**************************************************************************
+
+const device_type GENERIC_LATCH_8 = &device_creator<generic_latch_8_device>;
+
+
+//**************************************************************************
+//  LIVE DEVICE
+//**************************************************************************
+
+//-------------------------------------------------
+//  generic_latch_8_device - constructor
+//-------------------------------------------------
+
+generic_latch_8_device::generic_latch_8_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+	device_t(mconfig, GENERIC_LATCH_8, "Generic 8-bit latch", tag, owner, clock, "generic_latch_8", __FILE__),
+	m_latched_value(0),
+	m_latch_read(0)
+{
+}
+
+READ8_MEMBER( generic_latch_8_device::read )
+{
+	m_latch_read = 1; 
+	return m_latched_value;
+}
+
+WRITE8_MEMBER( generic_latch_8_device::write )
+{
+	machine().scheduler().synchronize(timer_expired_delegate(FUNC(generic_latch_8_device::sync_callback), this), data);
+}
+
+WRITE_LINE_MEMBER( generic_latch_8_device::preset_w )
+{
+	m_latched_value = 0xff;
+}
+
+WRITE_LINE_MEMBER( generic_latch_8_device::clear_w )
+{
+	m_latched_value = 0x00;
+}
+
+//-------------------------------------------------
+//  soundlatch_sync_callback - time-delayed
+//  callback to set a latch value
+//-------------------------------------------------
+
+void generic_latch_8_device::sync_callback(void *ptr, INT32 param)
+{
+	UINT8 value = param;
+
+	// if the latch hasn't been read and the value is changed, log a warning
+	if (!m_latch_read && m_latched_value != value)
+		logerror("Warning: latch %s written before being read. Previous: %02x, new: %02x\n", tag(), m_latched_value, value);
+
+	// store the new value and mark it not read
+	m_latched_value = value;
+	m_latch_read = 0;
+}
+
+//-------------------------------------------------
+//  device_start - device-specific startup
+//-------------------------------------------------
+
+void generic_latch_8_device::device_start()
+{
+	// register for state saving
+	save_item(NAME(m_latched_value));
+	save_item(NAME(m_latch_read));
+}
+
+//**************************************************************************
+//  DEVICE DEFINITIONS
+//**************************************************************************
+
+const device_type GENERIC_LATCH_16 = &device_creator<generic_latch_16_device>;
+
+
+//**************************************************************************
+//  LIVE DEVICE
+//**************************************************************************
+
+//-------------------------------------------------
+//  generic_latch_16_device - constructor
+//-------------------------------------------------
+
+generic_latch_16_device::generic_latch_16_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+	device_t(mconfig, GENERIC_LATCH_16, "Generic 16-bit latch", tag, owner, clock, "generic_latch_16", __FILE__),
+	m_latched_value(0),
+	m_latch_read(0)
+{
+}
+
+READ16_MEMBER( generic_latch_16_device::read )
+{
+	m_latch_read = 1; 
+	return m_latched_value;
+}
+
+WRITE16_MEMBER( generic_latch_16_device::write )
+{
+	machine().scheduler().synchronize(timer_expired_delegate(FUNC(generic_latch_16_device::sync_callback), this), data);
+}
+
+WRITE_LINE_MEMBER( generic_latch_16_device::preset_w )
+{
+	m_latched_value = 0xffff;
+}
+
+WRITE_LINE_MEMBER( generic_latch_16_device::clear_w )
+{
+	m_latched_value = 0x0000;
+}
+
+//-------------------------------------------------
+//  soundlatch_sync_callback - time-delayed
+//  callback to set a latch value
+//-------------------------------------------------
+
+void generic_latch_16_device::sync_callback(void *ptr, INT32 param)
+{
+	UINT16 value = param;
+
+	// if the latch hasn't been read and the value is changed, log a warning
+	if (!m_latch_read && m_latched_value != value)
+		logerror("Warning: latch %s written before being read. Previous: %02x, new: %02x\n", tag(), m_latched_value, value);
+
+	// store the new value and mark it not read
+	m_latched_value = value;
+	m_latch_read = 0;
+}
+
+//-------------------------------------------------
+//  device_start - device-specific startup
+//-------------------------------------------------
+
+void generic_latch_16_device::device_start()
+{
+	// register for state saving
+	save_item(NAME(m_latched_value));
+	save_item(NAME(m_latch_read));
+}
+
+
diff --git a/src/devices/machine/gen_latch.h b/src/devices/machine/gen_latch.h
new file mode 100644
index 00000000000..65149fc5985
--- /dev/null
+++ b/src/devices/machine/gen_latch.h
@@ -0,0 +1,80 @@
+// license:BSD-3-Clause
+// copyright-holders:Miodrag Milanovic
+/***************************************************************************
+
+    Generic 8bit and 16 bit latch devices
+
+***************************************************************************/
+
+#pragma once
+
+#ifndef __GEN_LATCH_H__
+#define __GEN_LATCH_H__
+
+//**************************************************************************
+//  INTERFACE CONFIGURATION MACROS
+//**************************************************************************
+
+#define MCFG_GENERIC_LATCH_8_ADD(_tag) \
+	MCFG_DEVICE_ADD(_tag, GENERIC_LATCH_8, 0)
+
+#define MCFG_GENERIC_LATCH_16_ADD(_tag) \
+	MCFG_DEVICE_ADD(_tag, GENERIC_LATCH_16, 0)
+
+//**************************************************************************
+//  TYPE DEFINITIONS
+//**************************************************************************
+
+// ======================> generic_latch_8_device
+
+class generic_latch_8_device : public device_t
+{
+public:
+	// construction/destruction
+	generic_latch_8_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+
+	DECLARE_READ8_MEMBER( read );
+	DECLARE_WRITE8_MEMBER( write );
+	DECLARE_WRITE_LINE_MEMBER( preset_w );
+	DECLARE_WRITE_LINE_MEMBER( clear_w );
+
+protected:
+	virtual void device_start() override;
+	
+	void sync_callback(void *ptr, INT32 param);
+private:
+	UINT16                  m_latched_value;
+	UINT8                   m_latch_read;
+};
+
+// device type definition
+extern const device_type GENERIC_LATCH_8;
+
+
+// ======================> generic_latch_16_device
+
+class generic_latch_16_device : public device_t
+{
+public:
+	// construction/destruction
+	generic_latch_16_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+
+	DECLARE_READ16_MEMBER( read );
+	DECLARE_WRITE16_MEMBER( write );
+	DECLARE_WRITE_LINE_MEMBER( preset_w );
+	DECLARE_WRITE_LINE_MEMBER( clear_w );
+
+protected:
+	virtual void device_start() override;
+	
+	void sync_callback(void *ptr, INT32 param);
+private:
+	UINT16                  m_latched_value;
+	UINT8                   m_latch_read;
+};
+
+// device type definition
+extern const device_type GENERIC_LATCH_16;
+
+
+#endif  /* __GEN_LATCH_H__ */

From 55d3e544e013174880c8f208264683aac6d711f9 Mon Sep 17 00:00:00 2001
From: Miodrag Milanovic <mmicko@gmail.com>
Date: Mon, 18 Apr 2016 14:18:33 +0200
Subject: [PATCH 063/122] Added additional members for compatibility (nw)

---
 src/devices/machine/gen_latch.cpp | 20 ++++++++++++++++++++
 src/devices/machine/gen_latch.h   |  6 ++++++
 2 files changed, 26 insertions(+)

diff --git a/src/devices/machine/gen_latch.cpp b/src/devices/machine/gen_latch.cpp
index 54982bc7e85..a72305bcaa4 100644
--- a/src/devices/machine/gen_latch.cpp
+++ b/src/devices/machine/gen_latch.cpp
@@ -41,6 +41,16 @@ WRITE8_MEMBER( generic_latch_8_device::write )
 	machine().scheduler().synchronize(timer_expired_delegate(FUNC(generic_latch_8_device::sync_callback), this), data);
 }
 
+WRITE8_MEMBER( generic_latch_8_device::preset_w )
+{
+	m_latched_value = 0xff;
+}
+
+WRITE8_MEMBER( generic_latch_8_device::clear_w )
+{
+	m_latched_value = 0x00;
+}
+
 WRITE_LINE_MEMBER( generic_latch_8_device::preset_w )
 {
 	m_latched_value = 0xff;
@@ -113,6 +123,16 @@ WRITE16_MEMBER( generic_latch_16_device::write )
 	machine().scheduler().synchronize(timer_expired_delegate(FUNC(generic_latch_16_device::sync_callback), this), data);
 }
 
+WRITE16_MEMBER( generic_latch_16_device::preset_w )
+{
+	m_latched_value = 0xffff;
+}
+
+WRITE16_MEMBER( generic_latch_16_device::clear_w )
+{
+	m_latched_value = 0x0000;
+}
+
 WRITE_LINE_MEMBER( generic_latch_16_device::preset_w )
 {
 	m_latched_value = 0xffff;
diff --git a/src/devices/machine/gen_latch.h b/src/devices/machine/gen_latch.h
index 65149fc5985..2da8ca41cfb 100644
--- a/src/devices/machine/gen_latch.h
+++ b/src/devices/machine/gen_latch.h
@@ -35,6 +35,9 @@ public:
 
 	DECLARE_READ8_MEMBER( read );
 	DECLARE_WRITE8_MEMBER( write );
+	
+	DECLARE_WRITE8_MEMBER( preset_w );
+	DECLARE_WRITE8_MEMBER( clear_w );
 	DECLARE_WRITE_LINE_MEMBER( preset_w );
 	DECLARE_WRITE_LINE_MEMBER( clear_w );
 
@@ -61,6 +64,9 @@ public:
 
 	DECLARE_READ16_MEMBER( read );
 	DECLARE_WRITE16_MEMBER( write );
+	
+	DECLARE_WRITE16_MEMBER( preset_w );
+	DECLARE_WRITE16_MEMBER( clear_w );
 	DECLARE_WRITE_LINE_MEMBER( preset_w );
 	DECLARE_WRITE_LINE_MEMBER( clear_w );
 

From 870db16e99efcb64a95ca1e321e8dacc389ce53e Mon Sep 17 00:00:00 2001
From: Brad Hughes <bradhugh@outlook.com>
Date: Sun, 17 Apr 2016 18:27:07 -0400
Subject: [PATCH 064/122] Standardize platform window pointer storage in
 osd_window. Also encapsulate show/hide capture/release cursor functionality.

---
 src/osd/modules/debugger/debugwin.cpp         |   2 +-
 src/osd/modules/debugger/win/debugwininfo.cpp |   2 +-
 src/osd/modules/input/input_dinput.h          |   2 +-
 src/osd/modules/input/input_rawinput.cpp      |   2 +-
 src/osd/modules/input/input_sdlcommon.cpp     |   2 +-
 src/osd/modules/input/input_win32.cpp         |  10 +-
 src/osd/modules/osdwindow.h                   |  34 +++-
 src/osd/modules/render/draw13.cpp             |   4 +-
 src/osd/modules/render/drawbgfx.cpp           |  12 +-
 src/osd/modules/render/drawd3d.cpp            |  12 +-
 src/osd/modules/render/drawgdi.cpp            |   4 +-
 src/osd/modules/render/drawnone.cpp           |   2 +-
 src/osd/modules/render/drawogl.cpp            |   4 +-
 src/osd/modules/render/drawsdl.cpp            |   8 +-
 src/osd/modules/sound/direct_sound.cpp        |   4 +-
 src/osd/sdl/window.cpp                        |  77 +++++---
 src/osd/sdl/window.h                          |   8 +-
 src/osd/windows/video.cpp                     |   2 +-
 src/osd/windows/window.cpp                    | 171 ++++++++++--------
 src/osd/windows/window.h                      |  10 +-
 src/osd/windows/winmain.cpp                   |   2 +-
 21 files changed, 222 insertions(+), 152 deletions(-)

diff --git a/src/osd/modules/debugger/debugwin.cpp b/src/osd/modules/debugger/debugwin.cpp
index 3c85b5f4119..c3994efbd2f 100644
--- a/src/osd/modules/debugger/debugwin.cpp
+++ b/src/osd/modules/debugger/debugwin.cpp
@@ -236,7 +236,7 @@ void debugger_windows::show_all()
 
 void debugger_windows::hide_all()
 {
-	SetForegroundWindow(win_window_list->m_hwnd);
+	SetForegroundWindow(win_window_list->platform_window<HWND>());
 	for (debugwin_info &info : m_window_list)
 		info.hide();
 }
diff --git a/src/osd/modules/debugger/win/debugwininfo.cpp b/src/osd/modules/debugger/win/debugwininfo.cpp
index 64d178de9f9..8c02ee17e1c 100644
--- a/src/osd/modules/debugger/win/debugwininfo.cpp
+++ b/src/osd/modules/debugger/win/debugwininfo.cpp
@@ -35,7 +35,7 @@ debugwin_info::debugwin_info(debugger_windows_interface &debugger, bool is_main_
 	register_window_class();
 
 	m_wnd = win_create_window_ex_utf8(DEBUG_WINDOW_STYLE_EX, "MAMEDebugWindow", title, DEBUG_WINDOW_STYLE,
-			0, 0, 100, 100, win_window_list->m_hwnd, create_standard_menubar(), GetModuleHandleUni(), this);
+			0, 0, 100, 100, win_window_list->platform_window<HWND>(), create_standard_menubar(), GetModuleHandleUni(), this);
 	if (m_wnd == NULL)
 		return;
 
diff --git a/src/osd/modules/input/input_dinput.h b/src/osd/modules/input/input_dinput.h
index 6dacf8ebd77..f339bef561e 100644
--- a/src/osd/modules/input/input_dinput.h
+++ b/src/osd/modules/input/input_dinput.h
@@ -103,7 +103,7 @@ public:
 		}
 
 		// set the cooperative level
-		result = devinfo->dinput.device->SetCooperativeLevel(win_window_list->m_hwnd, cooperative_level);
+		result = devinfo->dinput.device->SetCooperativeLevel(win_window_list->platform_window<HWND>(), cooperative_level);
 		if (result != DI_OK)
 			goto error;
 
diff --git a/src/osd/modules/input/input_rawinput.cpp b/src/osd/modules/input/input_rawinput.cpp
index 1f281d48922..20ed82cc4a1 100644
--- a/src/osd/modules/input/input_rawinput.cpp
+++ b/src/osd/modules/input/input_rawinput.cpp
@@ -475,7 +475,7 @@ public:
 		registration.usUsagePage = usagepage();
 		registration.usUsage = usage();
 		registration.dwFlags = m_global_inputs_enabled ? 0x00000100 : 0;
-		registration.hwndTarget = win_window_list->m_hwnd;
+		registration.hwndTarget = win_window_list->platform_window<HWND>();
 
 		// register the device
 		register_rawinput_devices(&registration, 1, sizeof(registration));
diff --git a/src/osd/modules/input/input_sdlcommon.cpp b/src/osd/modules/input/input_sdlcommon.cpp
index 10d9f7b3b52..85febac18f6 100644
--- a/src/osd/modules/input/input_sdlcommon.cpp
+++ b/src/osd/modules/input/input_sdlcommon.cpp
@@ -43,7 +43,7 @@ static inline sdl_window_info * window_from_id(Uint32 windowID)
 	for (w = sdl_window_list; w != NULL; w = w->m_next)
 	{
 		//printf("w->window_id: %d\n", w->window_id);
-		if (w->sdl_window() == window)
+		if (w->platform_window<SDL_Window*>() == window)
 		{
 			return w;
 		}
diff --git a/src/osd/modules/input/input_win32.cpp b/src/osd/modules/input/input_win32.cpp
index d4cba8304b4..5bef565beed 100644
--- a/src/osd/modules/input/input_win32.cpp
+++ b/src/osd/modules/input/input_win32.cpp
@@ -152,7 +152,7 @@ public:
 			mouse.lY = (cursor_info.ptScreenPos.y - win32_mouse.last_point.y) * INPUT_RELATIVE_PER_PIXEL;
 
 			RECT window_pos = {0};
-			GetWindowRect(win_window_list->m_hwnd, &window_pos);
+			GetWindowRect(win_window_list->platform_window<HWND>(), &window_pos);
 
 			// We reset the cursor position to the middle of the window each frame
 			win32_mouse.last_point.x = window_pos.left + (window_pos.right - window_pos.left) / 2;
@@ -274,8 +274,8 @@ public:
 			RECT client_rect;
 
 			// get the position relative to the window
-			GetClientRect(win_window_list->m_hwnd, &client_rect);
-			ScreenToClient(win_window_list->m_hwnd, &mousepos);
+			GetClientRect(win_window_list->platform_window<HWND>(), &client_rect);
+			ScreenToClient(win_window_list->platform_window<HWND>(), &mousepos);
 
 			// convert to absolute coordinates
 			xpos = normalize_absolute_axis(mousepos.x, client_rect.left, client_rect.right);
@@ -335,10 +335,10 @@ private:
 			POINT mousepos;
 
 			// get the position relative to the window
-			GetClientRect(win_window_list->m_hwnd, &client_rect);
+			GetClientRect(win_window_list->platform_window<HWND>(), &client_rect);
 			mousepos.x = args.xpos;
 			mousepos.y = args.ypos;
-			ScreenToClient(win_window_list->m_hwnd, &mousepos);
+			ScreenToClient(win_window_list->platform_window<HWND>(), &mousepos);
 
 			// convert to absolute coordinates
 			mouse.lX = normalize_absolute_axis(mousepos.x, client_rect.left, client_rect.right);
diff --git a/src/osd/modules/osdwindow.h b/src/osd/modules/osdwindow.h
index 218e48145d5..428d821413c 100644
--- a/src/osd/modules/osdwindow.h
+++ b/src/osd/modules/osdwindow.h
@@ -112,12 +112,13 @@ public:
 	osd_window()
 	:
 #ifndef OSD_SDL
-		m_hwnd(0), m_dc(0), m_focus_hwnd(0), m_resize_state(0),
+		m_dc(0), m_resize_state(0),
 #endif
 		m_primlist(nullptr),
 		m_index(0),
 		m_main(nullptr),
-		m_prescale(1)
+		m_prescale(1),
+		m_platform_window(nullptr)
 		{}
 	virtual ~osd_window() { }
 
@@ -142,19 +143,30 @@ public:
 
 	virtual osd_monitor_info *monitor() const = 0;
 
-#ifdef OSD_SDL
-	virtual SDL_Window *sdl_window() = 0;
-#else
+	template <class TWindow>
+	TWindow platform_window() const { return static_cast<TWindow>(m_platform_window); }
+
+	void set_platform_window(void *window)
+	{
+		assert(window == nullptr || m_platform_window == nullptr);
+		m_platform_window = window;
+	}
+
+	// Clips the pointer to the bounds of this window
+	virtual void capture_pointer() = 0;
+
+	// Releases the pointer from a previously captured state
+	virtual void release_pointer() = 0;
+
+	virtual void show_pointer() = 0;
+	virtual void hide_pointer() = 0;
+
+#ifndef OSD_SDL
 	virtual bool win_has_menu() = 0;
 	// FIXME: cann we replace winwindow_video_window_monitor(NULL) with monitor() ?
 	virtual osd_monitor_info *winwindow_video_window_monitor(const osd_rect *proposed) = 0;
 
-	// window handle and info
-	HWND                    m_hwnd;
 	HDC                     m_dc;       // only used by GDI renderer!
-	// FIXME: this is the same as win_window_list->m_hwnd, i.e. first window.
-	// During modularization, this should be passed in differently
-	HWND                    m_focus_hwnd;
 
 	int                     m_resize_state;
 #endif
@@ -165,6 +177,8 @@ public:
 	osd_window              *m_main;
 protected:
 	int                     m_prescale;
+private:
+	void                    *m_platform_window;
 };
 
 class osd_renderer
diff --git a/src/osd/modules/render/draw13.cpp b/src/osd/modules/render/draw13.cpp
index 79356d4ea22..20daa28d8d4 100644
--- a/src/osd/modules/render/draw13.cpp
+++ b/src/osd/modules/render/draw13.cpp
@@ -437,9 +437,9 @@ int renderer_sdl1::create()
 	}
 
 	if (video_config.waitvsync)
-		m_sdl_renderer = SDL_CreateRenderer(window().sdl_window(), -1, SDL_RENDERER_PRESENTVSYNC | SDL_RENDERER_ACCELERATED);
+		m_sdl_renderer = SDL_CreateRenderer(window().platform_window<SDL_Window*>(), -1, SDL_RENDERER_PRESENTVSYNC | SDL_RENDERER_ACCELERATED);
 	else
-		m_sdl_renderer = SDL_CreateRenderer(window().sdl_window(), -1, SDL_RENDERER_ACCELERATED);
+		m_sdl_renderer = SDL_CreateRenderer(window().platform_window<SDL_Window*>(), -1, SDL_RENDERER_ACCELERATED);
 
 	if (!m_sdl_renderer)
 	{
diff --git a/src/osd/modules/render/drawbgfx.cpp b/src/osd/modules/render/drawbgfx.cpp
index f90e7f060e1..479cea4f3b2 100644
--- a/src/osd/modules/render/drawbgfx.cpp
+++ b/src/osd/modules/render/drawbgfx.cpp
@@ -164,9 +164,9 @@ int renderer_bgfx::create()
 			bgfx::setPlatformData(blank_pd);
 		}
 #ifdef OSD_WINDOWS
-		bgfx::winSetHwnd(window().m_hwnd);
+		bgfx::winSetHwnd(window().platform_window<HWND>());
 #else
-		bgfx::sdlSetWindow(window().sdl_window());
+		bgfx::sdlSetWindow(window().platform_window<SDL_Window*>());
 #endif
 		std::string backend(m_options.bgfx_backend());
 		if (backend == "auto")
@@ -213,9 +213,9 @@ int renderer_bgfx::create()
 	if (window().m_index != 0)
 	{
 #ifdef OSD_WINDOWS
-		m_framebuffer = m_targets->create_backbuffer(window().m_hwnd, m_width[window().m_index], m_height[window().m_index]);
+		m_framebuffer = m_targets->create_backbuffer(window().platform_window<HWND>(), m_width[window().m_index], m_height[window().m_index]);
 #else
-		m_framebuffer = m_targets->create_backbuffer(sdlNativeWindowHandle(window().sdl_window()), m_width[window().m_index], m_height[window().m_index]);
+		m_framebuffer = m_targets->create_backbuffer(sdlNativeWindowHandle(window().platform_window<SDL_Window*>()), m_width[window().m_index], m_height[window().m_index]);
 #endif
 		bgfx::touch(window().m_index);
 	}
@@ -803,9 +803,9 @@ bool renderer_bgfx::update_dimensions()
 
 			delete m_framebuffer;
 #ifdef OSD_WINDOWS
-			m_framebuffer = m_targets->create_backbuffer(window().m_hwnd, width, height);
+			m_framebuffer = m_targets->create_backbuffer(window().platform_window<HWND>(), width, height);
 #else
-			m_framebuffer = m_targets->create_backbuffer(sdlNativeWindowHandle(window().sdl_window()), width, height);
+			m_framebuffer = m_targets->create_backbuffer(sdlNativeWindowHandle(window().platform_window<SDL_Window*>()), width, height);
 #endif
 
 			bgfx::setViewFrameBuffer(s_current_view, m_framebuffer->target());
diff --git a/src/osd/modules/render/drawd3d.cpp b/src/osd/modules/render/drawd3d.cpp
index 6c7a96bbfb8..fa5dc500e2e 100644
--- a/src/osd/modules/render/drawd3d.cpp
+++ b/src/osd/modules/render/drawd3d.cpp
@@ -200,7 +200,7 @@ render_primitive_list *renderer_d3d9::get_primitives()
 {
 	RECT client;
 
-	GetClientRectExceptMenu(window().m_hwnd, &client, window().fullscreen());
+	GetClientRectExceptMenu(window().platform_window<HWND>(), &client, window().fullscreen());
 	if (rect_width(&client) > 0 && rect_height(&client) > 0)
 	{
 		window().target()->set_bounds(rect_width(&client), rect_height(&client), window().pixel_aspect());
@@ -581,7 +581,7 @@ int renderer_d3d9::initialize()
 	}
 
 	// create the device immediately for the full screen case (defer for window mode)
-	if (window().fullscreen() && device_create(window().m_focus_hwnd))
+	if (window().fullscreen() && device_create(window().m_main->platform_window<HWND>()))
 	{
 		return false;
 	}
@@ -827,7 +827,7 @@ try_again:
 	m_presentation.BackBufferCount               = video_config.triplebuf ? 2 : 1;
 	m_presentation.MultiSampleType               = D3DMULTISAMPLE_NONE;
 	m_presentation.SwapEffect                    = D3DSWAPEFFECT_DISCARD;
-	m_presentation.hDeviceWindow                 = window().m_hwnd;
+	m_presentation.hDeviceWindow                 = window().platform_window<HWND>();
 	m_presentation.Windowed                      = !window().fullscreen() || window().win_has_menu();
 	m_presentation.EnableAutoDepthStencil        = FALSE;
 	m_presentation.AutoDepthStencilFormat        = D3DFMT_D16;
@@ -1200,7 +1200,7 @@ int renderer_d3d9::config_adapter_mode()
 		RECT client;
 
 		// bounds are from the window client rect
-		GetClientRectExceptMenu(window().m_hwnd, &client, window().fullscreen());
+		GetClientRectExceptMenu(window().platform_window<HWND>(), &client, window().fullscreen());
 		m_width = client.right - client.left;
 		m_height = client.bottom - client.top;
 
@@ -1363,7 +1363,7 @@ int renderer_d3d9::update_window_size()
 {
 	// get the current window bounds
 	RECT client;
-	GetClientRectExceptMenu(window().m_hwnd, &client, window().fullscreen());
+	GetClientRectExceptMenu(window().platform_window<HWND>(), &client, window().fullscreen());
 
 	// if we have a device and matching width/height, nothing to do
 	if (m_device != nullptr && rect_width(&client) == m_width && rect_height(&client) == m_height)
@@ -1381,7 +1381,7 @@ int renderer_d3d9::update_window_size()
 	// set the new bounds and create the device again
 	m_width = rect_width(&client);
 	m_height = rect_height(&client);
-	if (device_create(window().m_focus_hwnd))
+	if (window().m_main != nullptr && device_create(window().m_main->platform_window<HWND>()))
 		return FALSE;
 
 	// reset the resize state to normal, and indicate we made a change
diff --git a/src/osd/modules/render/drawgdi.cpp b/src/osd/modules/render/drawgdi.cpp
index ec1e5f57a4a..bfc949e5296 100644
--- a/src/osd/modules/render/drawgdi.cpp
+++ b/src/osd/modules/render/drawgdi.cpp
@@ -46,7 +46,7 @@ int renderer_gdi::create()
 render_primitive_list *renderer_gdi::get_primitives()
 {
 	RECT client;
-	GetClientRect(window().m_hwnd, &client);
+	GetClientRect(window().platform_window<HWND>(), &client);
 	window().target()->set_bounds(rect_width(&client), rect_height(&client), window().pixel_aspect());
 	return &window().target()->get_primitives();
 }
@@ -63,7 +63,7 @@ int renderer_gdi::draw(const int update)
 
 	// get the target bounds
 	RECT bounds;
-	GetClientRect(window().m_hwnd, &bounds);
+	GetClientRect(window().platform_window<HWND>(), &bounds);
 
 	// compute width/height/pitch of target
 	int width = rect_width(&bounds);
diff --git a/src/osd/modules/render/drawnone.cpp b/src/osd/modules/render/drawnone.cpp
index d266369e7a6..5e261daafe2 100644
--- a/src/osd/modules/render/drawnone.cpp
+++ b/src/osd/modules/render/drawnone.cpp
@@ -22,7 +22,7 @@
 render_primitive_list *renderer_none::get_primitives()
 {
 	RECT client;
-	GetClientRect(window().m_hwnd, &client);
+	GetClientRect(window().platform_window<HWND>(), &client);
 	window().target()->set_bounds(rect_width(&client), rect_height(&client), window().pixel_aspect());
 	return &window().target()->get_primitives();
 }
diff --git a/src/osd/modules/render/drawogl.cpp b/src/osd/modules/render/drawogl.cpp
index 452a3c570ab..6853602353b 100644
--- a/src/osd/modules/render/drawogl.cpp
+++ b/src/osd/modules/render/drawogl.cpp
@@ -563,9 +563,9 @@ int renderer_ogl::create()
 {
 	// create renderer
 #if defined(OSD_WINDOWS)
-	m_gl_context = global_alloc(win_gl_context(window().m_hwnd));
+	m_gl_context = global_alloc(win_gl_context(window().platform_window<HWND>()));
 #else
-	m_gl_context = global_alloc(sdl_gl_context(window().sdl_window()));
+	m_gl_context = global_alloc(sdl_gl_context(window().platform_window<SDL_Window*>()));
 #endif
 	if  (m_gl_context->LastErrorMsg() != nullptr)
 	{
diff --git a/src/osd/modules/render/drawsdl.cpp b/src/osd/modules/render/drawsdl.cpp
index 2450dd1b8b3..a2ba368c060 100644
--- a/src/osd/modules/render/drawsdl.cpp
+++ b/src/osd/modules/render/drawsdl.cpp
@@ -193,16 +193,16 @@ int renderer_sdl2::create()
 
 
 	if (video_config.waitvsync)
-		m_sdl_renderer = SDL_CreateRenderer(window().sdl_window(), -1, SDL_RENDERER_PRESENTVSYNC | SDL_RENDERER_ACCELERATED);
+		m_sdl_renderer = SDL_CreateRenderer(window().platform_window<SDL_Window*>(), -1, SDL_RENDERER_PRESENTVSYNC | SDL_RENDERER_ACCELERATED);
 	else
-		m_sdl_renderer = SDL_CreateRenderer(window().sdl_window(), -1, SDL_RENDERER_ACCELERATED);
+		m_sdl_renderer = SDL_CreateRenderer(window().platform_window<SDL_Window*>(), -1, SDL_RENDERER_ACCELERATED);
 
 	if (!m_sdl_renderer)
 	{
 		if (video_config.waitvsync)
-			m_sdl_renderer = SDL_CreateRenderer(window().sdl_window(), -1, SDL_RENDERER_PRESENTVSYNC | SDL_RENDERER_SOFTWARE);
+			m_sdl_renderer = SDL_CreateRenderer(window().platform_window<SDL_Window*>(), -1, SDL_RENDERER_PRESENTVSYNC | SDL_RENDERER_SOFTWARE);
 		else
-			m_sdl_renderer = SDL_CreateRenderer(window().sdl_window(), -1, SDL_RENDERER_SOFTWARE);
+			m_sdl_renderer = SDL_CreateRenderer(window().platform_window<SDL_Window*>(), -1, SDL_RENDERER_SOFTWARE);
 	}
 
 	if (!m_sdl_renderer)
diff --git a/src/osd/modules/sound/direct_sound.cpp b/src/osd/modules/sound/direct_sound.cpp
index 0ec810578a3..83b7edd65ca 100644
--- a/src/osd/modules/sound/direct_sound.cpp
+++ b/src/osd/modules/sound/direct_sound.cpp
@@ -404,10 +404,10 @@ HRESULT sound_direct_sound::dsound_init()
 #ifdef SDLMAME_WIN32
 		SDL_SysWMinfo wminfo;
 		SDL_VERSION(&wminfo.version);
-		SDL_GetWindowWMInfo(sdl_window_list->sdl_window(), &wminfo);
+		SDL_GetWindowWMInfo(sdl_window_list->platform_window<SDL_Window*>(), &wminfo);
 		HWND const window = wminfo.info.win.window;
 #else // SDLMAME_WIN32
-		HWND const window = win_window_list->m_hwnd;
+		HWND const window = win_window_list->platform_window<HWND>();
 #endif // SDLMAME_WIN32
 		result = m_dsound->SetCooperativeLevel(window, DSSCL_PRIORITY);
 	}
diff --git a/src/osd/sdl/window.cpp b/src/osd/sdl/window.cpp
index 7cec35d400a..e6d4c71b4a3 100644
--- a/src/osd/sdl/window.cpp
+++ b/src/osd/sdl/window.cpp
@@ -377,6 +377,31 @@ void sdl_osd_interface::window_exit()
 
 }
 
+void sdl_window_info::capture_pointer()
+{
+	if (!SDL_GetWindowGrab(platform_window<SDL_Window*>()))
+		SDL_SetWindowGrab(platform_window<SDL_Window*>(), SDL_TRUE);
+	SDL_SetRelativeMouseMode(SDL_TRUE);
+}
+
+void sdl_window_info::release_pointer()
+{
+	if (SDL_GetWindowGrab(platform_window<SDL_Window*>()))
+		SDL_SetWindowGrab(platform_window<SDL_Window*>(), SDL_FALSE);
+	SDL_SetRelativeMouseMode(SDL_FALSE);
+}
+
+void sdl_window_info::hide_pointer()
+{
+	SDL_ShowCursor(SDL_DISABLE);
+}
+
+void sdl_window_info::show_pointer()
+{
+	SDL_ShowCursor(SDL_ENABLE);
+	
+}
+
 
 //============================================================
 //  sdlwindow_resize
@@ -392,7 +417,7 @@ OSDWORK_CALLBACK( sdl_window_info::sdlwindow_resize_wt )
 
 	ASSERT_WINDOW_THREAD();
 
-	SDL_SetWindowSize(window->sdl_window(), width, height);
+	SDL_SetWindowSize(window->platform_window<SDL_Window*>(), width, height);
 	window->renderer().notify_changed();
 
 	osd_free(wp);
@@ -475,11 +500,11 @@ OSDWORK_CALLBACK( sdl_window_info::sdlwindow_toggle_full_screen_wt )
 #endif
 	if (window->fullscreen() && (video_config.switchres || is_osx))
 	{
-		SDL_SetWindowFullscreen(window->sdl_window(), 0);    // Try to set mode
-		SDL_SetWindowDisplayMode(window->sdl_window(), &window->m_original_mode->mode);    // Try to set mode
-		SDL_SetWindowFullscreen(window->sdl_window(), SDL_WINDOW_FULLSCREEN);    // Try to set mode
+		SDL_SetWindowFullscreen(window->platform_window<SDL_Window*>(), 0);    // Try to set mode
+		SDL_SetWindowDisplayMode(window->platform_window<SDL_Window*>(), &window->m_original_mode->mode);    // Try to set mode
+		SDL_SetWindowFullscreen(window->platform_window<SDL_Window*>(), SDL_WINDOW_FULLSCREEN);    // Try to set mode
 	}
-	SDL_DestroyWindow(window->sdl_window());
+	SDL_DestroyWindow(window->platform_window<SDL_Window*>());
 
 	downcast<sdl_osd_interface &>(window->machine().osd()).release_keys();
 
@@ -555,20 +580,17 @@ void sdl_window_info::update_cursor_state()
 
 		if (!fullscreen() && !should_hide_mouse)
 		{
-			SDL_ShowCursor(SDL_ENABLE);
-			if (SDL_GetWindowGrab(sdl_window() ))
-				SDL_SetWindowGrab(sdl_window(), SDL_FALSE);
-			SDL_SetRelativeMouseMode(SDL_FALSE);
+			show_pointer();
+			release_pointer();
 		}
 		else
 		{
-			SDL_ShowCursor(SDL_DISABLE);
-			if (!SDL_GetWindowGrab(sdl_window()))
-				SDL_SetWindowGrab(sdl_window(), SDL_TRUE);
-			SDL_SetRelativeMouseMode(SDL_TRUE);
+			hide_pointer();
+			capture_pointer();
 		}
+
 		SDL_SetCursor(nullptr); // Force an update in case the underlying driver has changed visibility
-			}
+	}
 #endif
 }
 
@@ -657,11 +679,11 @@ OSDWORK_CALLBACK( sdl_window_info::sdlwindow_video_window_destroy_wt )
 
 	if (window->fullscreen() && video_config.switchres)
 	{
-		SDL_SetWindowFullscreen(window->sdl_window(), 0);    // Try to set mode
-		SDL_SetWindowDisplayMode(window->sdl_window(), &window->m_original_mode->mode);    // Try to set mode
-		SDL_SetWindowFullscreen(window->sdl_window(), SDL_WINDOW_FULLSCREEN);    // Try to set mode
+		SDL_SetWindowFullscreen(window->platform_window<SDL_Window*>(), 0);    // Try to set mode
+		SDL_SetWindowDisplayMode(window->platform_window<SDL_Window*>(), &window->m_original_mode->mode);    // Try to set mode
+		SDL_SetWindowFullscreen(window->platform_window<SDL_Window*>(), SDL_WINDOW_FULLSCREEN);    // Try to set mode
 	}
-	SDL_DestroyWindow(window->sdl_window());
+	SDL_DestroyWindow(window->platform_window<SDL_Window*>());
 	// release all keys ...
 	downcast<sdl_osd_interface &>(window->machine().osd()).release_keys();
 
@@ -928,14 +950,14 @@ OSDWORK_CALLBACK( sdl_window_info::complete_create_wt )
 	osd_rect work = window->monitor()->usuable_position_size();
 
 	// create the SDL window
-	window->m_sdl_window = SDL_CreateWindow(window->m_title,
+	auto sdlwindow = SDL_CreateWindow(window->m_title,
 			work.left() + (work.width() - temp.width()) / 2,
 			work.top() + (work.height() - temp.height()) / 2,
 			temp.width(), temp.height(), window->m_extra_flags);
 	//window().sdl_window() = SDL_CreateWindow(window().m_title, SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED,
 	//      width, height, m_extra_flags);
 
-	if  ( window->m_sdl_window == nullptr )
+	if  (sdlwindow == nullptr )
 	{
 		if (window->renderer().has_flags(osd_renderer::FLAG_NEEDS_OPENGL))
 			osd_printf_error("OpenGL not supported on this driver: %s\n", SDL_GetError());
@@ -944,18 +966,20 @@ OSDWORK_CALLBACK( sdl_window_info::complete_create_wt )
 		return (void *) &result[1];
 	}
 
+	window->set_platform_window(sdlwindow);
+
 	if (window->fullscreen() && video_config.switchres)
 	{
 		SDL_DisplayMode mode;
 		//SDL_GetCurrentDisplayMode(window().monitor()->handle, &mode);
-		SDL_GetWindowDisplayMode(window->sdl_window(), &mode);
+		SDL_GetWindowDisplayMode(window->platform_window<SDL_Window*>(), &mode);
 		window->m_original_mode->mode = mode;
 		mode.w = temp.width();
 		mode.h = temp.height();
 		if (window->m_win_config.refresh)
 			mode.refresh_rate = window->m_win_config.refresh;
 
-		SDL_SetWindowDisplayMode(window->sdl_window(), &mode);    // Try to set mode
+		SDL_SetWindowDisplayMode(window->platform_window<SDL_Window*>(), &mode);    // Try to set mode
 #ifndef SDLMAME_WIN32
 		/* FIXME: Warp the mouse to 0,0 in case a virtual desktop resolution
 		 * is in place after the mode switch - which will most likely be the case
@@ -971,14 +995,14 @@ OSDWORK_CALLBACK( sdl_window_info::complete_create_wt )
 
 	// show window
 
-	SDL_ShowWindow(window->sdl_window());
+	SDL_ShowWindow(window->platform_window<SDL_Window*>());
 	//SDL_SetWindowFullscreen(window->sdl_window(), 0);
 	//SDL_SetWindowFullscreen(window->sdl_window(), window->fullscreen());
-	SDL_RaiseWindow(window->sdl_window());
+	SDL_RaiseWindow(window->platform_window<SDL_Window*>());
 
 #ifdef SDLMAME_WIN32
 	if (window->fullscreen())
-		SDL_SetWindowGrab(window->sdl_window(), SDL_TRUE);
+		SDL_SetWindowGrab(window->platform_window<SDL_Window*>(), SDL_TRUE);
 #endif
 
 	// set main window
@@ -1308,7 +1332,7 @@ osd_dim sdl_window_info::get_min_bounds(int constrain)
 osd_dim sdl_window_info::get_size()
 {
 	int w=0; int h=0;
-	SDL_GetWindowSize(m_sdl_window, &w, &h);
+	SDL_GetWindowSize(platform_window<SDL_Window*>(), &w, &h);
 	return osd_dim(w,h);
 }
 
@@ -1368,7 +1392,6 @@ sdl_window_info::sdl_window_info(running_machine &a_machine, int index, osd_moni
 	m_minimum_dim(0,0),
 	m_windowed_dim(0,0),
 	m_rendered_event(0, 1), m_target(0),
-	m_sdl_window(NULL),
 	m_machine(a_machine), m_monitor(a_monitor), m_fullscreen(0)
 {
 	m_win_config = *config;
diff --git a/src/osd/sdl/window.h b/src/osd/sdl/window.h
index 7a62d3a5925..0a8abf24c10 100644
--- a/src/osd/sdl/window.h
+++ b/src/osd/sdl/window.h
@@ -47,6 +47,11 @@ public:
 	void resize(INT32 width, INT32 height);
 	void destroy();
 
+	void capture_pointer() override;
+	void release_pointer() override;
+	void show_pointer() override;
+	void hide_pointer() override;
+
 	void notify_changed();
 
 	osd_dim get_size() override;
@@ -58,7 +63,6 @@ public:
 	int fullscreen() const override { return m_fullscreen; }
 
 	render_target *target() override { return m_target; }
-	SDL_Window *sdl_window() override { return m_sdl_window; }
 
 	int prescale() const { return m_prescale; }
 	osd_renderer &renderer() const { return *m_renderer; }
@@ -84,8 +88,6 @@ private:
 	osd_event           m_rendered_event;
 	render_target *     m_target;
 
-	// Needs to be here as well so we can identify window
-	SDL_Window          *m_sdl_window;
 	// Original display_mode
 	SDL_DM_Wrapper	 	*m_original_mode;
 
diff --git a/src/osd/windows/video.cpp b/src/osd/windows/video.cpp
index d73ad8bf522..c4ee864389a 100644
--- a/src/osd/windows/video.cpp
+++ b/src/osd/windows/video.cpp
@@ -81,7 +81,7 @@ bool windows_osd_interface::video_init()
 	}
 
 	if (video_config.mode != VIDEO_MODE_NONE)
-		SetForegroundWindow(win_window_list->m_hwnd);
+		SetForegroundWindow(win_window_list->platform_window<HWND>());
 
 	return true;
 }
diff --git a/src/osd/windows/window.cpp b/src/osd/windows/window.cpp
index c2f05428ec2..612e55237e8 100644
--- a/src/osd/windows/window.cpp
+++ b/src/osd/windows/window.cpp
@@ -304,6 +304,9 @@ void windows_osd_interface::window_exit()
 {
 	assert(GetCurrentThreadId() == main_threadid);
 
+	// if we hid the cursor during the emulation, show it
+	win_window_list->show_pointer();
+
 	// free all the windows
 	while (win_window_list != nullptr)
 	{
@@ -343,9 +346,6 @@ void windows_osd_interface::window_exit()
 	// kill the window thread ready event
 	if (window_thread_ready_event)
 		CloseHandle(window_thread_ready_event);
-
-	// if we hid the cursor during the emulation, show it
-	while (ShowCursor(TRUE) < 0) ;
 }
 
 win_window_info::win_window_info(running_machine &machine)
@@ -380,9 +380,44 @@ win_window_info::~win_window_info()
 	if (m_renderer != nullptr)
 	{
 		delete m_renderer;
-}
+	}
 }
 
+POINT win_window_info::s_saved_cursor_pos = { -1, -1 };
+
+void win_window_info::capture_pointer()
+{
+	RECT bounds;
+	GetClientRect(platform_window<HWND>(), &bounds);
+	ClientToScreen(platform_window<HWND>(), &reinterpret_cast<POINT *>(&bounds)[0]);
+	ClientToScreen(platform_window<HWND>(), &reinterpret_cast<POINT *>(&bounds)[1]);
+	ClipCursor(&bounds);
+}
+
+void win_window_info::release_pointer()
+{
+	ClipCursor(nullptr);
+}
+
+void win_window_info::hide_pointer()
+{
+	GetCursorPos(&s_saved_cursor_pos);
+
+	while (ShowCursor(FALSE) >= -1) {};
+	ShowCursor(TRUE);
+}
+
+void win_window_info::show_pointer()
+{
+	if (s_saved_cursor_pos.x != -1 || s_saved_cursor_pos.y != -1)
+	{
+		SetCursorPos(s_saved_cursor_pos.x, s_saved_cursor_pos.y);
+		s_saved_cursor_pos.x = s_saved_cursor_pos.y = -1;
+	}
+
+	while (ShowCursor(TRUE) < 1) {};
+	ShowCursor(FALSE);
+}
 
 //============================================================
 //  winwindow_process_events_periodic
@@ -410,7 +445,7 @@ void winwindow_process_events_periodic(running_machine &machine)
 static BOOL is_mame_window(HWND hwnd)
 {
 	for (win_window_info *window = win_window_list; window != nullptr; window = window->m_next)
-		if (window->m_hwnd == hwnd)
+		if (window->platform_window<HWND>() == hwnd)
 			return TRUE;
 
 	return FALSE;
@@ -658,8 +693,8 @@ void winwindow_toggle_full_screen(void)
 
 	// iterate over windows and toggle their fullscreen state
 	for (window = win_window_list; window != nullptr; window = window->m_next)
-		SendMessage(window->m_hwnd, WM_USER_SET_FULLSCREEN, !video_config.windowed, 0);
-	SetForegroundWindow(win_window_list->m_hwnd);
+		SendMessage(window->platform_window<HWND>(), WM_USER_SET_FULLSCREEN, !video_config.windowed, 0);
+	SetForegroundWindow(win_window_list->platform_window<HWND>());
 }
 
 
@@ -676,7 +711,7 @@ BOOL winwindow_has_focus(void)
 
 	// see if one of the video windows has focus
 	for (window = win_window_list; window != nullptr; window = window->m_next)
-		if (focuswnd == window->m_hwnd)
+		if (focuswnd == window->platform_window<HWND>())
 			return TRUE;
 
 	return FALSE;
@@ -690,10 +725,10 @@ BOOL winwindow_has_focus(void)
 
 void winwindow_update_cursor_state(running_machine &machine)
 {
-	static POINT saved_cursor_pos = { -1, -1 };
-
 	assert(GetCurrentThreadId() == main_threadid);
 
+	win_window_info *window = win_window_list;
+
 	// if we should hide the mouse cursor, then do it
 	// rules are:
 	//   1. we must have focus before hiding the cursor
@@ -702,35 +737,19 @@ void winwindow_update_cursor_state(running_machine &machine)
 	//      the input system requests it
 	if (winwindow_has_focus() && ((!video_config.windowed && !win_window_list->win_has_menu()) || (!machine.paused() && downcast<windows_osd_interface&>(machine.osd()).should_hide_mouse())))
 	{
-		win_window_info *window = win_window_list;
-		RECT bounds;
-
 		// hide cursor
-		while (ShowCursor(FALSE) >= -1) { };
-		ShowCursor(TRUE);
+		window->hide_pointer();
 
-		// store the cursor position
-		GetCursorPos(&saved_cursor_pos);
-
-		// clip cursor to game video window
-		GetClientRect(window->m_hwnd, &bounds);
-		ClientToScreen(window->m_hwnd, &((POINT *)&bounds)[0]);
-		ClientToScreen(window->m_hwnd, &((POINT *)&bounds)[1]);
-		ClipCursor(&bounds);
+		// clip pointer to game video window
+		window->capture_pointer();
 	}
 	else
 	{
 		// show cursor
-		while (ShowCursor(TRUE) < 1) { };
-		ShowCursor(FALSE);
+		window->show_pointer();
 
 		// allow cursor to move freely
-		ClipCursor(nullptr);
-		if (saved_cursor_pos.x != -1 || saved_cursor_pos.y != -1)
-		{
-			SetCursorPos(saved_cursor_pos.x, saved_cursor_pos.y);
-			saved_cursor_pos.x = saved_cursor_pos.y = -1;
-		}
+		window->release_pointer();
 	}
 }
 
@@ -766,6 +785,12 @@ void win_window_info::create(running_machine &machine, int index, osd_monitor_in
 			}
 		}
 	}
+	else
+	{
+		// Give the main window a reference to itself
+		window->m_main = window;
+	}
+
 	// see if we are safe for fullscreen
 	window->m_fullscreen_safe = TRUE;
 	for (win = win_window_list; win != nullptr; win = win->m_next)
@@ -828,8 +853,8 @@ void win_window_info::destroy()
 		}
 
 	// destroy the window
-	if (m_hwnd != nullptr)
-		SendMessage(m_hwnd, WM_USER_SELF_TERMINATE, 0, 0);
+	if (platform_window<HWND>() != nullptr)
+		SendMessage(platform_window<HWND>(), WM_USER_SELF_TERMINATE, 0, 0);
 
 	// free the render target
 	machine().render().target_free(m_target);
@@ -865,14 +890,14 @@ void win_window_info::update()
 		if (!m_fullscreen)
 		{
 			if (m_isminimized)
-				SendMessage(m_hwnd, WM_USER_SET_MINSIZE, 0, 0);
+				SendMessage(platform_window<HWND>(), WM_USER_SET_MINSIZE, 0, 0);
 			if (m_ismaximized)
-				SendMessage(m_hwnd, WM_USER_SET_MAXSIZE, 0, 0);
+				SendMessage(platform_window<HWND>(), WM_USER_SET_MAXSIZE, 0, 0);
 		}
 	}
 
 	// if we're visible and running and not in the middle of a resize, draw
-	if (m_hwnd != nullptr && m_target != nullptr && m_renderer != nullptr)
+	if (platform_window<HWND>() != nullptr && m_target != nullptr && m_renderer != nullptr)
 	{
 		bool got_lock = true;
 
@@ -900,7 +925,7 @@ void win_window_info::update()
 			// post a redraw request with the primitive list as a parameter
 			last_update_time = timeGetTime();
 			mtlog_add("winwindow_video_window_update: PostMessage start");
-			SendMessage(m_hwnd, WM_USER_REDRAW, 0, (LPARAM)primlist);
+			SendMessage(platform_window<HWND>(), WM_USER_REDRAW, 0, (LPARAM)primlist);
 			mtlog_add("winwindow_video_window_update: PostMessage end");
 		}
 	}
@@ -932,7 +957,7 @@ osd_monitor_info *win_window_info::winwindow_video_window_monitor(const osd_rect
 			monitor = win_monitor_info::monitor_from_handle(MonitorFromRect(&p, MONITOR_DEFAULTTONEAREST));
 		}
 		else
-			monitor = win_monitor_info::monitor_from_handle(MonitorFromWindow(m_hwnd, MONITOR_DEFAULTTONEAREST));
+			monitor = win_monitor_info::monitor_from_handle(MonitorFromWindow(platform_window<HWND>(), MONITOR_DEFAULTTONEAREST));
 	}
 
 	// in full screen, just use the configured monitor
@@ -1238,7 +1263,7 @@ int win_window_info::complete_create()
 	}
 
 	// create the window, but don't show it yet
-	m_hwnd = win_create_window_ex_utf8(
+	HWND hwnd = win_create_window_ex_utf8(
 						m_fullscreen ? FULLSCREEN_STYLE_EX : WINDOW_STYLE_EX,
 						"MAME",
 						m_title,
@@ -1249,14 +1274,14 @@ int win_window_info::complete_create()
 						menu,
 						GetModuleHandleUni(),
 						nullptr);
-	if (m_hwnd == nullptr)
+	
+	if (hwnd == nullptr)
 		return 1;
 
-	// set window #0 as the focus window for all windows, required for D3D & multimonitor
-	m_focus_hwnd = win_window_list->m_hwnd;
+	set_platform_window(hwnd);
 
 	// set a pointer back to us
-	SetWindowLongPtr(m_hwnd, GWLP_USERDATA, (LONG_PTR)this);
+	SetWindowLongPtr(hwnd, GWLP_USERDATA, (LONG_PTR)this);
 
 	// skip the positioning stuff for -video none */
 	if (video_config.mode == VIDEO_MODE_NONE)
@@ -1265,7 +1290,7 @@ int win_window_info::complete_create()
 	// adjust the window position to the initial width/height
 	tempwidth = (m_win_config.width != 0) ? m_win_config.width : 640;
 	tempheight = (m_win_config.height != 0) ? m_win_config.height : 480;
-	SetWindowPos(m_hwnd, nullptr, monitorbounds.left() + 20, monitorbounds.top() + 20,
+	SetWindowPos(platform_window<HWND>(), nullptr, monitorbounds.left() + 20, monitorbounds.top() + 20,
 			monitorbounds.left() + tempwidth + wnd_extra_width(),
 			monitorbounds.top() + tempheight + wnd_extra_height(),
 			SWP_NOZORDER);
@@ -1289,14 +1314,14 @@ int win_window_info::complete_create()
 		if (m_renderer->create())
 			return 1;
 
-		ShowWindow(m_hwnd, SW_SHOW);
+		ShowWindow(platform_window<HWND>(), SW_SHOW);
 	}
 
 	// clear the window
-	dc = GetDC(m_hwnd);
-	GetClientRect(m_hwnd, &client);
+	dc = GetDC(platform_window<HWND>());
+	GetClientRect(platform_window<HWND>(), &client);
 	FillRect(dc, &client, (HBRUSH)GetStockObject(BLACK_BRUSH));
-	ReleaseDC(m_hwnd, dc);
+	ReleaseDC(platform_window<HWND>(), dc);
 	return 0;
 }
 
@@ -1329,7 +1354,7 @@ LRESULT CALLBACK win_window_info::video_window_proc(HWND wnd, UINT message, WPAR
 			HDC hdc = BeginPaint(wnd, &pstruct);
 			window->draw_video_contents(hdc, TRUE);
 			if (window->win_has_menu())
-				DrawMenuBar(window->m_hwnd);
+				DrawMenuBar(window->platform_window<HWND>());
 			EndPaint(wnd, &pstruct);
 			break;
 		}
@@ -1484,7 +1509,7 @@ LRESULT CALLBACK win_window_info::video_window_proc(HWND wnd, UINT message, WPAR
 		case WM_DESTROY:
 			global_free(window->m_renderer);
 			window->m_renderer = nullptr;
-			window->m_hwnd = nullptr;
+			window->set_platform_window(nullptr);
 			return DefWindowProc(wnd, message, wparam, lparam);
 
 		// self redraw: draw ourself in a non-painty way
@@ -1503,7 +1528,7 @@ LRESULT CALLBACK win_window_info::video_window_proc(HWND wnd, UINT message, WPAR
 
 		// self destruct
 		case WM_USER_SELF_TERMINATE:
-			DestroyWindow(window->m_hwnd);
+			DestroyWindow(window->platform_window<HWND>());
 			break;
 
 		// fullscreen set
@@ -1566,13 +1591,13 @@ void win_window_info::draw_video_contents(HDC dc, int update)
 	mtlog_add("draw_video_contents: render lock acquired");
 
 	// if we're iconic, don't bother
-	if (m_hwnd != nullptr && !IsIconic(m_hwnd))
+	if (platform_window<HWND>() != nullptr && !IsIconic(platform_window<HWND>()))
 	{
 		// if no bitmap, just fill
 		if (m_primlist == nullptr)
 		{
 			RECT fill;
-			GetClientRect(m_hwnd, &fill);
+			GetClientRect(platform_window<HWND>(), &fill);
 			FillRect(dc, &fill, (HBRUSH)GetStockObject(BLACK_BRUSH));
 		}
 
@@ -1820,7 +1845,7 @@ void win_window_info::update_minmax_state()
 		// compare the maximum bounds versus the current bounds
 		osd_dim minbounds = get_min_bounds(video_config.keepaspect);
 		osd_dim maxbounds = get_max_bounds(video_config.keepaspect);
-		GetWindowRect(m_hwnd, &bounds);
+		GetWindowRect(platform_window<HWND>(), &bounds);
 
 		// if either the width or height matches, we were maximized
 		m_isminimized = (rect_width(&bounds) == minbounds.width()) ||
@@ -1850,12 +1875,12 @@ void win_window_info::minimize_window()
 
 	// get the window rect
 	RECT bounds;
-	GetWindowRect(m_hwnd, &bounds);
+	GetWindowRect(platform_window<HWND>(), &bounds);
 
 	osd_rect newrect(bounds.left, bounds.top, newsize );
 
 
-	SetWindowPos(m_hwnd, nullptr, newrect.left(), newrect.top(), newrect.width(), newrect.height(), SWP_NOZORDER);
+	SetWindowPos(platform_window<HWND>(), nullptr, newrect.left(), newrect.top(), newrect.width(), newrect.height(), SWP_NOZORDER);
 }
 
 
@@ -1877,7 +1902,7 @@ void win_window_info::maximize_window()
 			work.top() + (work.height() - newsize.height()) / 2,
 			newsize);
 
-	SetWindowPos(m_hwnd, nullptr, newrect.left(), newrect.top(), newrect.width(), newrect.height(), SWP_NOZORDER);
+	SetWindowPos(platform_window<HWND>(), nullptr, newrect.left(), newrect.top(), newrect.width(), newrect.height(), SWP_NOZORDER);
 }
 
 
@@ -1894,7 +1919,7 @@ void win_window_info::adjust_window_position_after_major_change()
 	assert(GetCurrentThreadId() == window_threadid);
 
 	// get the current size
-	GetWindowRect(m_hwnd, &oldrect);
+	GetWindowRect(platform_window<HWND>(), &oldrect);
 	osd_rect newrect = RECT_to_osd_rect(oldrect);
 
 	// adjust the window size so the client area is what we want
@@ -1915,7 +1940,7 @@ void win_window_info::adjust_window_position_after_major_change()
 	// adjust the position if different
 	if (oldrect.left != newrect.left() || oldrect.top != newrect.top() ||
 		oldrect.right != newrect.right() || oldrect.bottom != newrect.bottom())
-		SetWindowPos(m_hwnd, m_fullscreen ? HWND_TOPMOST : HWND_TOP,
+		SetWindowPos(platform_window<HWND>(), m_fullscreen ? HWND_TOPMOST : HWND_TOP,
 				newrect.left(), newrect.top(),
 				newrect.width(), newrect.height(), 0);
 
@@ -1948,24 +1973,24 @@ void win_window_info::set_fullscreen(int fullscreen)
 	m_renderer = nullptr;
 
 	// hide ourself
-	ShowWindow(m_hwnd, SW_HIDE);
+	ShowWindow(platform_window<HWND>(), SW_HIDE);
 
 	// configure the window if non-fullscreen
 	if (!fullscreen)
 	{
 		// adjust the style
-		SetWindowLong(m_hwnd, GWL_STYLE, WINDOW_STYLE);
-		SetWindowLong(m_hwnd, GWL_EXSTYLE, WINDOW_STYLE_EX);
-		SetWindowPos(m_hwnd, 0, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | SWP_FRAMECHANGED);
+		SetWindowLong(platform_window<HWND>(), GWL_STYLE, WINDOW_STYLE);
+		SetWindowLong(platform_window<HWND>(), GWL_EXSTYLE, WINDOW_STYLE_EX);
+		SetWindowPos(platform_window<HWND>(), 0, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | SWP_FRAMECHANGED);
 
 		// force to the bottom, then back on top
-		SetWindowPos(m_hwnd, HWND_BOTTOM, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE);
-		SetWindowPos(m_hwnd, HWND_TOP, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE);
+		SetWindowPos(platform_window<HWND>(), HWND_BOTTOM, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE);
+		SetWindowPos(platform_window<HWND>(), HWND_TOP, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE);
 
 		// if we have previous non-fullscreen bounds, use those
 		if (m_non_fullscreen_bounds.right != m_non_fullscreen_bounds.left)
 		{
-			SetWindowPos(m_hwnd, HWND_TOP, m_non_fullscreen_bounds.left, m_non_fullscreen_bounds.top,
+			SetWindowPos(platform_window<HWND>(), HWND_TOP, m_non_fullscreen_bounds.left, m_non_fullscreen_bounds.top,
 						rect_width(&m_non_fullscreen_bounds), rect_height(&m_non_fullscreen_bounds),
 						SWP_NOZORDER);
 		}
@@ -1973,7 +1998,7 @@ void win_window_info::set_fullscreen(int fullscreen)
 		// otherwise, set a small size and maximize from there
 		else
 		{
-			SetWindowPos(m_hwnd, HWND_TOP, 0, 0, MIN_WINDOW_DIM, MIN_WINDOW_DIM, SWP_NOZORDER);
+			SetWindowPos(platform_window<HWND>(), HWND_TOP, 0, 0, MIN_WINDOW_DIM, MIN_WINDOW_DIM, SWP_NOZORDER);
 			maximize_window();
 		}
 	}
@@ -1982,15 +2007,15 @@ void win_window_info::set_fullscreen(int fullscreen)
 	else
 	{
 		// save the bounds
-		GetWindowRect(m_hwnd, &m_non_fullscreen_bounds);
+		GetWindowRect(platform_window<HWND>(), &m_non_fullscreen_bounds);
 
 		// adjust the style
-		SetWindowLong(m_hwnd, GWL_STYLE, FULLSCREEN_STYLE);
-		SetWindowLong(m_hwnd, GWL_EXSTYLE, FULLSCREEN_STYLE_EX);
-		SetWindowPos(m_hwnd, 0, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | SWP_FRAMECHANGED);
+		SetWindowLong(platform_window<HWND>(), GWL_STYLE, FULLSCREEN_STYLE);
+		SetWindowLong(platform_window<HWND>(), GWL_EXSTYLE, FULLSCREEN_STYLE_EX);
+		SetWindowPos(platform_window<HWND>(), 0, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | SWP_FRAMECHANGED);
 
 		// set topmost
-		SetWindowPos(m_hwnd, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE);
+		SetWindowPos(platform_window<HWND>(), HWND_TOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE);
 	}
 
 	// adjust the window to compensate for the change
@@ -2000,7 +2025,7 @@ void win_window_info::set_fullscreen(int fullscreen)
 	if (!m_fullscreen || m_fullscreen_safe)
 	{
 		if (video_config.mode != VIDEO_MODE_NONE)
-			ShowWindow(m_hwnd, SW_SHOW);
+			ShowWindow(platform_window<HWND>(), SW_SHOW);
 
 		m_renderer = reinterpret_cast<osd_renderer *>(osd_renderer::make_for_type(video_config.mode, reinterpret_cast<osd_window *>(this)));
 		if (m_renderer->create())
diff --git a/src/osd/windows/window.h b/src/osd/windows/window.h
index 8ca2d832b47..be9f4c4ee63 100644
--- a/src/osd/windows/window.h
+++ b/src/osd/windows/window.h
@@ -59,7 +59,7 @@ public:
 	virtual bool win_has_menu() override
 	{
 #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
-		return GetMenu(m_hwnd) ? true : false;
+		return GetMenu(platform_window<HWND>()) ? true : false;
 #else
 		return false;
 #endif
@@ -69,13 +69,18 @@ public:
 	{
 #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
 		RECT client;
-		GetClientRect(m_hwnd, &client);
+		GetClientRect(platform_window<HWND>(), &client);
 		return osd_dim(client.right - client.left, client.bottom - client.top);
 #else
 		throw ref new Platform::NotImplementedException();
 #endif
 	}
 
+	void capture_pointer() override;
+	void release_pointer() override;
+	void show_pointer() override;
+	void hide_pointer() override;
+
 	virtual osd_monitor_info *monitor() const override { return m_monitor; }
 
 	void destroy();
@@ -137,6 +142,7 @@ private:
 	void adjust_window_position_after_major_change();
 	void set_fullscreen(int fullscreen);
 
+	static POINT        s_saved_cursor_pos;
 	running_machine &   m_machine;
 };
 
diff --git a/src/osd/windows/winmain.cpp b/src/osd/windows/winmain.cpp
index 115d33395db..ba3e6af9c4a 100644
--- a/src/osd/windows/winmain.cpp
+++ b/src/osd/windows/winmain.cpp
@@ -73,7 +73,7 @@ public:
 				winwindow_toggle_full_screen();
 
 			vsnprintf(buffer, ARRAY_LENGTH(buffer), msg, args);
-			win_message_box_utf8(win_window_list ? win_window_list->m_hwnd : nullptr, buffer, emulator_info::get_appname(), MB_OK);
+			win_message_box_utf8(win_window_list ? win_window_list->platform_window<HWND>() : nullptr, buffer, emulator_info::get_appname(), MB_OK);
 		}
 		else
 			chain_output(channel, msg, args);

From afbb4b658162c2b8574c7ce82504e9fdfdd8d642 Mon Sep 17 00:00:00 2001
From: Brad Hughes <bradhugh@outlook.com>
Date: Mon, 18 Apr 2016 11:32:03 -0400
Subject: [PATCH 065/122] Check that we have a window before updating cursor
 state

---
 src/osd/windows/window.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/osd/windows/window.cpp b/src/osd/windows/window.cpp
index 612e55237e8..0dd6f46aeae 100644
--- a/src/osd/windows/window.cpp
+++ b/src/osd/windows/window.cpp
@@ -728,14 +728,18 @@ void winwindow_update_cursor_state(running_machine &machine)
 	assert(GetCurrentThreadId() == main_threadid);
 
 	win_window_info *window = win_window_list;
+	
+	// If no window yet, just return
+	if (window == nullptr)
+		return;
 
 	// if we should hide the mouse cursor, then do it
 	// rules are:
 	//   1. we must have focus before hiding the cursor
-	//   2. we also hide the cursor in full screen mode and when the window doesn't have a menu
+	//   2. we also hide the cursor in full screen mode and when tshe window doesn't have a menu
 	//   3. we also hide the cursor in windowed mode if we're not paused and
 	//      the input system requests it
-	if (winwindow_has_focus() && ((!video_config.windowed && !win_window_list->win_has_menu()) || (!machine.paused() && downcast<windows_osd_interface&>(machine.osd()).should_hide_mouse())))
+	if (winwindow_has_focus() && ((!video_config.windowed && !window->win_has_menu()) || (!machine.paused() && downcast<windows_osd_interface&>(machine.osd()).should_hide_mouse())))
 	{
 		// hide cursor
 		window->hide_pointer();

From 2762b9f5acb7efb5214945b7678ff2b6c8fefd97 Mon Sep 17 00:00:00 2001
From: couriersud <couriersud@arcor.de>
Date: Fri, 15 Apr 2016 16:21:29 +0200
Subject: [PATCH 066/122] Merge me later

---
 nl_examples/kidniki.c                  |   4 +-
 src/lib/netlist/solver/nld_ms_direct.h | 607 +++++++++++++++++++++++++
 src/lib/netlist/solver/nld_ms_gcr.h    |  12 +
 3 files changed, 621 insertions(+), 2 deletions(-)

diff --git a/nl_examples/kidniki.c b/nl_examples/kidniki.c
index 6b2a5c66215..422477b94b3 100644
--- a/nl_examples/kidniki.c
+++ b/nl_examples/kidniki.c
@@ -15,8 +15,8 @@ NETLIST_START(dummy)
 	PARAM(Solver.GS_LOOPS, 1)
 	PARAM(Solver.GS_THRESHOLD, 6)
 	//PARAM(Solver.ITERATIVE, "W")
-	PARAM(Solver.ITERATIVE, "MAT_CR")
-	//PARAM(Solver.ITERATIVE, "MAT")
+	//PARAM(Solver.ITERATIVE, "MAT_CR")
+	PARAM(Solver.ITERATIVE, "MAT")
 	//PARAM(Solver.ITERATIVE, "GMRES")
 	//PARAM(Solver.ITERATIVE, "SOR")
 	PARAM(Solver.DYNAMIC_TS, 0)
diff --git a/src/lib/netlist/solver/nld_ms_direct.h b/src/lib/netlist/solver/nld_ms_direct.h
index 1f72fa081d6..d87befca7c5 100644
--- a/src/lib/netlist/solver/nld_ms_direct.h
+++ b/src/lib/netlist/solver/nld_ms_direct.h
@@ -247,6 +247,612 @@ void matrix_solver_direct_t<m_N, _storage_N>::do_work(const int id, void *param)
 template <unsigned m_N, unsigned _storage_N>
 void matrix_solver_direct_t<m_N, _storage_N>::LE_solve()
 {
+#if 0
+	// Static matrix compilation
+	const double fd0 = 1.0 / A(0,0);
+	  const double f1 = -fd0 * A(23,0);
+	    A(23,23) += f1 * A(0,23);
+	    RHS(23) += f1 * RHS(0);
+	const double fd1 = 1.0 / A(1,1);
+	  const double f2 = -fd1 * A(39,1);
+	    A(39,39) += f2 * A(1,39);
+	    RHS(39) += f2 * RHS(1);
+	const double fd2 = 1.0 / A(2,2);
+	  const double f3 = -fd2 * A(31,2);
+	    A(31,31) += f3 * A(2,31);
+	    RHS(31) += f3 * RHS(2);
+	const double fd3 = 1.0 / A(3,3);
+	  const double f4 = -fd3 * A(19,3);
+	    A(19,19) += f4 * A(3,19);
+	    RHS(19) += f4 * RHS(3);
+	const double fd4 = 1.0 / A(4,4);
+	  const double f5 = -fd4 * A(29,4);
+	    A(29,29) += f5 * A(4,29);
+	    RHS(29) += f5 * RHS(4);
+	const double fd5 = 1.0 / A(5,5);
+	  const double f6 = -fd5 * A(32,5);
+	    A(32,32) += f6 * A(5,32);
+	    RHS(32) += f6 * RHS(5);
+	const double fd6 = 1.0 / A(6,6);
+	  const double f7 = -fd6 * A(69,6);
+	    A(69,69) += f7 * A(6,69);
+	    RHS(69) += f7 * RHS(6);
+	const double fd7 = 1.0 / A(7,7);
+	  const double f8 = -fd7 * A(22,7);
+	    A(22,22) += f8 * A(7,22);
+	    RHS(22) += f8 * RHS(7);
+	const double fd8 = 1.0 / A(8,8);
+	  const double f9 = -fd8 * A(28,8);
+	    A(28,28) += f9 * A(8,28);
+	    RHS(28) += f9 * RHS(8);
+	const double fd9 = 1.0 / A(9,9);
+	  const double f10 = -fd9 * A(82,9);
+	    A(82,82) += f10 * A(9,82);
+	    RHS(82) += f10 * RHS(9);
+	const double fd10 = 1.0 / A(10,10);
+	  const double f11 = -fd10 * A(82,10);
+	    A(82,82) += f11 * A(10,82);
+	    RHS(82) += f11 * RHS(10);
+	const double fd11 = 1.0 / A(11,11);
+	  const double f12 = -fd11 * A(38,11);
+	    A(38,38) += f12 * A(11,38);
+	    RHS(38) += f12 * RHS(11);
+	const double fd12 = 1.0 / A(12,12);
+	  const double f13 = -fd12 * A(43,12);
+	    A(43,84) += f13 * A(12,84);
+	    RHS(43) += f13 * RHS(12);
+	  const double f14 = -fd12 * A(84,12);
+	    A(84,84) += f14 * A(12,84);
+	    RHS(84) += f14 * RHS(12);
+	const double fd13 = 1.0 / A(13,13);
+	  const double f15 = -fd13 * A(48,13);
+	    A(48,48) += f15 * A(13,48);
+	    RHS(48) += f15 * RHS(13);
+	const double fd14 = 1.0 / A(14,14);
+	  const double f16 = -fd14 * A(56,14);
+	    A(56,56) += f16 * A(14,56);
+	    RHS(56) += f16 * RHS(14);
+	const double fd15 = 1.0 / A(15,15);
+	  const double f17 = -fd15 * A(60,15);
+	    A(60,60) += f17 * A(15,60);
+	    RHS(60) += f17 * RHS(15);
+	const double fd16 = 1.0 / A(16,16);
+	  const double f18 = -fd16 * A(81,16);
+	    A(81,81) += f18 * A(16,81);
+	    A(81,85) = f18 * A(16,85);
+	    RHS(81) += f18 * RHS(16);
+	  const double f19 = -fd16 * A(85,16);
+	    A(85,81) = f19 * A(16,81);
+	    A(85,85) += f19 * A(16,85);
+	    RHS(85) += f19 * RHS(16);
+	const double fd17 = 1.0 / A(17,17);
+	  const double f20 = -fd17 * A(72,17);
+	    A(72,72) += f20 * A(17,72);
+	    A(72,85) = f20 * A(17,85);
+	    RHS(72) += f20 * RHS(17);
+	  const double f21 = -fd17 * A(85,17);
+	    A(85,72) = f21 * A(17,72);
+	    A(85,85) += f21 * A(17,85);
+	    RHS(85) += f21 * RHS(17);
+	const double fd18 = 1.0 / A(18,18);
+	  const double f22 = -fd18 * A(72,18);
+	    A(72,72) += f22 * A(18,72);
+	    A(72,78) += f22 * A(18,78);
+	    RHS(72) += f22 * RHS(18);
+	  const double f23 = -fd18 * A(78,18);
+	    A(78,72) += f23 * A(18,72);
+	    A(78,78) += f23 * A(18,78);
+	    RHS(78) += f23 * RHS(18);
+	const double fd19 = 1.0 / A(19,19);
+	  const double f24 = -fd19 * A(87,19);
+	    A(87,87) += f24 * A(19,87);
+	    RHS(87) += f24 * RHS(19);
+	const double fd20 = 1.0 / A(20,20);
+	  const double f25 = -fd20 * A(71,20);
+	    A(71,69) += f25 * A(20,69);
+	    A(71,85) = f25 * A(20,85);
+	    RHS(71) += f25 * RHS(20);
+	const double fd21 = 1.0 / A(21,21);
+	  const double f26 = -fd21 * A(24,21);
+	    A(24,63) = f26 * A(21,63);
+	    A(24,74) += f26 * A(21,74);
+	    RHS(24) += f26 * RHS(21);
+	  const double f27 = -fd21 * A(63,21);
+	    A(63,63) += f27 * A(21,63);
+	    A(63,74) += f27 * A(21,74);
+	    RHS(63) += f27 * RHS(21);
+	  const double f28 = -fd21 * A(74,21);
+	    A(74,63) += f28 * A(21,63);
+	    A(74,74) += f28 * A(21,74);
+	    RHS(74) += f28 * RHS(21);
+	const double fd22 = 1.0 / A(22,22);
+	  const double f29 = -fd22 * A(63,22);
+	    A(63,63) += f29 * A(22,63);
+	    RHS(63) += f29 * RHS(22);
+	const double fd23 = 1.0 / A(23,23);
+	  const double f30 = -fd23 * A(87,23);
+	    A(87,87) += f30 * A(23,87);
+	    RHS(87) += f30 * RHS(23);
+	const double fd24 = 1.0 / A(24,24);
+	  const double f31 = -fd24 * A(74,24);
+	    A(74,63) += f31 * A(24,63);
+	    A(74,74) += f31 * A(24,74);
+	    RHS(74) += f31 * RHS(24);
+	const double fd25 = 1.0 / A(25,25);
+	  const double f32 = -fd25 * A(77,25);
+	    A(77,26) += f32 * A(25,26);
+	    A(77,77) += f32 * A(25,77);
+	    RHS(77) += f32 * RHS(25);
+	const double fd26 = 1.0 / A(26,26);
+	  const double f33 = -fd26 * A(62,26);
+	    A(62,62) += f33 * A(26,62);
+	    A(62,77) += f33 * A(26,77);
+	    RHS(62) += f33 * RHS(26);
+	  const double f34 = -fd26 * A(77,26);
+	    A(77,62) += f34 * A(26,62);
+	    A(77,77) += f34 * A(26,77);
+	    RHS(77) += f34 * RHS(26);
+	const double fd27 = 1.0 / A(27,27);
+	  const double f35 = -fd27 * A(62,27);
+	    A(62,62) += f35 * A(27,62);
+	    A(62,68) = f35 * A(27,68);
+	    RHS(62) += f35 * RHS(27);
+	  const double f36 = -fd27 * A(68,27);
+	    A(68,62) = f36 * A(27,62);
+	    A(68,68) += f36 * A(27,68);
+	    RHS(68) += f36 * RHS(27);
+	const double fd28 = 1.0 / A(28,28);
+	  const double f37 = -fd28 * A(30,28);
+	    A(30,68) += f37 * A(28,68);
+	    RHS(30) += f37 * RHS(28);
+	  const double f38 = -fd28 * A(68,28);
+	    A(68,68) += f38 * A(28,68);
+	    RHS(68) += f38 * RHS(28);
+	const double fd29 = 1.0 / A(29,29);
+	  const double f39 = -fd29 * A(87,29);
+	    A(87,87) += f39 * A(29,87);
+	    RHS(87) += f39 * RHS(29);
+	const double fd30 = 1.0 / A(30,30);
+	  const double f40 = -fd30 * A(68,30);
+	    A(68,68) += f40 * A(30,68);
+	    RHS(68) += f40 * RHS(30);
+	const double fd31 = 1.0 / A(31,31);
+	  const double f41 = -fd31 * A(87,31);
+	    A(87,87) += f41 * A(31,87);
+	    RHS(87) += f41 * RHS(31);
+	const double fd32 = 1.0 / A(32,32);
+	  const double f42 = -fd32 * A(87,32);
+	    A(87,87) += f42 * A(32,87);
+	    RHS(87) += f42 * RHS(32);
+	const double fd33 = 1.0 / A(33,33);
+	  const double f43 = -fd33 * A(79,33);
+	    A(79,79) += f43 * A(33,79);
+	    A(79,85) = f43 * A(33,85);
+	    RHS(79) += f43 * RHS(33);
+	  const double f44 = -fd33 * A(85,33);
+	    A(85,79) = f44 * A(33,79);
+	    A(85,85) += f44 * A(33,85);
+	    RHS(85) += f44 * RHS(33);
+	const double fd34 = 1.0 / A(34,34);
+	  const double f45 = -fd34 * A(50,34);
+	    A(50,65) = f45 * A(34,65);
+	    A(50,79) += f45 * A(34,79);
+	    RHS(50) += f45 * RHS(34);
+	  const double f46 = -fd34 * A(65,34);
+	    A(65,65) += f46 * A(34,65);
+	    A(65,79) += f46 * A(34,79);
+	    RHS(65) += f46 * RHS(34);
+	  const double f47 = -fd34 * A(79,34);
+	    A(79,65) += f47 * A(34,65);
+	    A(79,79) += f47 * A(34,79);
+	    RHS(79) += f47 * RHS(34);
+	const double fd35 = 1.0 / A(35,35);
+	  const double f48 = -fd35 * A(36,35);
+	    A(36,36) += f48 * A(35,36);
+	    A(36,66) = f48 * A(35,66);
+	    RHS(36) += f48 * RHS(35);
+	  const double f49 = -fd35 * A(66,35);
+	    A(66,36) = f49 * A(35,36);
+	    A(66,66) += f49 * A(35,66);
+	    RHS(66) += f49 * RHS(35);
+	const double fd36 = 1.0 / A(36,36);
+	  const double f50 = -fd36 * A(37,36);
+	    A(37,37) += f50 * A(36,37);
+	    A(37,66) = f50 * A(36,66);
+	    RHS(37) += f50 * RHS(36);
+	  const double f51 = -fd36 * A(66,36);
+	    A(66,37) = f51 * A(36,37);
+	    A(66,66) += f51 * A(36,66);
+	    RHS(66) += f51 * RHS(36);
+	const double fd37 = 1.0 / A(37,37);
+	  const double f52 = -fd37 * A(38,37);
+	    A(38,38) += f52 * A(37,38);
+	    A(38,66) = f52 * A(37,66);
+	    RHS(38) += f52 * RHS(37);
+	  const double f53 = -fd37 * A(66,37);
+	    A(66,38) = f53 * A(37,38);
+	    A(66,66) += f53 * A(37,66);
+	    RHS(66) += f53 * RHS(37);
+	const double fd38 = 1.0 / A(38,38);
+	  const double f54 = -fd38 * A(66,38);
+	    A(66,66) += f54 * A(38,66);
+	    RHS(66) += f54 * RHS(38);
+	const double fd39 = 1.0 / A(39,39);
+	  const double f55 = -fd39 * A(87,39);
+	    A(87,87) += f55 * A(39,87);
+	    RHS(87) += f55 * RHS(39);
+	const double fd40 = 1.0 / A(40,40);
+	  const double f56 = -fd40 * A(41,40);
+	    A(41,41) += f56 * A(40,41);
+	    A(41,86) = f56 * A(40,86);
+	    RHS(41) += f56 * RHS(40);
+	  const double f57 = -fd40 * A(86,40);
+	    A(86,41) = f57 * A(40,41);
+	    A(86,86) += f57 * A(40,86);
+	    RHS(86) += f57 * RHS(40);
+	const double fd41 = 1.0 / A(41,41);
+	  const double f58 = -fd41 * A(42,41);
+	    A(42,42) += f58 * A(41,42);
+	    A(42,86) = f58 * A(41,86);
+	    RHS(42) += f58 * RHS(41);
+	  const double f59 = -fd41 * A(86,41);
+	    A(86,42) = f59 * A(41,42);
+	    A(86,86) += f59 * A(41,86);
+	    RHS(86) += f59 * RHS(41);
+	const double fd42 = 1.0 / A(42,42);
+	  const double f60 = -fd42 * A(86,42);
+	    A(86,43) = f60 * A(42,43);
+	    A(86,86) += f60 * A(42,86);
+	    RHS(86) += f60 * RHS(42);
+	const double fd43 = 1.0 / A(43,43);
+	  const double f61 = -fd43 * A(86,43);
+	    A(86,84) = f61 * A(43,84);
+	    RHS(86) += f61 * RHS(43);
+	const double fd44 = 1.0 / A(44,44);
+	  const double f62 = -fd44 * A(84,44);
+	    A(84,84) += f62 * A(44,84);
+	    A(84,87) = f62 * A(44,87);
+	    RHS(84) += f62 * RHS(44);
+	  const double f63 = -fd44 * A(87,44);
+	    A(87,84) = f63 * A(44,84);
+	    A(87,87) += f63 * A(44,87);
+	    RHS(87) += f63 * RHS(44);
+	const double fd45 = 1.0 / A(45,45);
+	  const double f64 = -fd45 * A(46,45);
+	    A(46,46) += f64 * A(45,46);
+	    A(46,67) = f64 * A(45,67);
+	    RHS(46) += f64 * RHS(45);
+	  const double f65 = -fd45 * A(67,45);
+	    A(67,46) = f65 * A(45,46);
+	    A(67,67) += f65 * A(45,67);
+	    RHS(67) += f65 * RHS(45);
+	const double fd46 = 1.0 / A(46,46);
+	  const double f66 = -fd46 * A(47,46);
+	    A(47,47) += f66 * A(46,47);
+	    A(47,67) = f66 * A(46,67);
+	    RHS(47) += f66 * RHS(46);
+	  const double f67 = -fd46 * A(67,46);
+	    A(67,47) = f67 * A(46,47);
+	    A(67,67) += f67 * A(46,67);
+	    RHS(67) += f67 * RHS(46);
+	const double fd47 = 1.0 / A(47,47);
+	  const double f68 = -fd47 * A(48,47);
+	    A(48,48) += f68 * A(47,48);
+	    A(48,67) = f68 * A(47,67);
+	    RHS(48) += f68 * RHS(47);
+	  const double f69 = -fd47 * A(67,47);
+	    A(67,48) = f69 * A(47,48);
+	    A(67,67) += f69 * A(47,67);
+	    RHS(67) += f69 * RHS(47);
+	const double fd48 = 1.0 / A(48,48);
+	  const double f70 = -fd48 * A(67,48);
+	    A(67,67) += f70 * A(48,67);
+	    RHS(67) += f70 * RHS(48);
+	const double fd49 = 1.0 / A(49,49);
+	  const double f71 = -fd49 * A(80,49);
+	    A(80,80) += f71 * A(49,80);
+	    A(80,84) += f71 * A(49,84);
+	    RHS(80) += f71 * RHS(49);
+	  const double f72 = -fd49 * A(84,49);
+	    A(84,80) += f72 * A(49,80);
+	    A(84,84) += f72 * A(49,84);
+	    RHS(84) += f72 * RHS(49);
+	const double fd50 = 1.0 / A(50,50);
+	  const double f73 = -fd50 * A(79,50);
+	    A(79,65) += f73 * A(50,65);
+	    A(79,79) += f73 * A(50,79);
+	    RHS(79) += f73 * RHS(50);
+	const double fd51 = 1.0 / A(51,51);
+	  const double f74 = -fd51 * A(83,51);
+	    A(83,83) += f74 * A(51,83);
+	    A(83,85) = f74 * A(51,85);
+	    RHS(83) += f74 * RHS(51);
+	  const double f75 = -fd51 * A(85,51);
+	    A(85,83) = f75 * A(51,83);
+	    A(85,85) += f75 * A(51,85);
+	    RHS(85) += f75 * RHS(51);
+	const double fd52 = 1.0 / A(52,52);
+	  const double f76 = -fd52 * A(76,52);
+	    A(76,76) += f76 * A(52,76);
+	    A(76,83) += f76 * A(52,83);
+	    RHS(76) += f76 * RHS(52);
+	  const double f77 = -fd52 * A(83,52);
+	    A(83,76) += f77 * A(52,76);
+	    A(83,83) += f77 * A(52,83);
+	    RHS(83) += f77 * RHS(52);
+	const double fd53 = 1.0 / A(53,53);
+	  const double f78 = -fd53 * A(54,53);
+	    A(54,54) += f78 * A(53,54);
+	    A(54,64) = f78 * A(53,64);
+	    RHS(54) += f78 * RHS(53);
+	  const double f79 = -fd53 * A(64,53);
+	    A(64,54) = f79 * A(53,54);
+	    A(64,64) += f79 * A(53,64);
+	    RHS(64) += f79 * RHS(53);
+	const double fd54 = 1.0 / A(54,54);
+	  const double f80 = -fd54 * A(64,54);
+	    A(64,64) += f80 * A(54,64);
+	    A(64,83) = f80 * A(54,83);
+	    RHS(64) += f80 * RHS(54);
+	  const double f81 = -fd54 * A(83,54);
+	    A(83,64) = f81 * A(54,64);
+	    A(83,83) += f81 * A(54,83);
+	    RHS(83) += f81 * RHS(54);
+	const double fd55 = 1.0 / A(55,55);
+	  const double f82 = -fd55 * A(56,55);
+	    A(56,56) += f82 * A(55,56);
+	    A(56,64) = f82 * A(55,64);
+	    RHS(56) += f82 * RHS(55);
+	  const double f83 = -fd55 * A(64,55);
+	    A(64,56) = f83 * A(55,56);
+	    A(64,64) += f83 * A(55,64);
+	    RHS(64) += f83 * RHS(55);
+	const double fd56 = 1.0 / A(56,56);
+	  const double f84 = -fd56 * A(64,56);
+	    A(64,64) += f84 * A(56,64);
+	    RHS(64) += f84 * RHS(56);
+	const double fd57 = 1.0 / A(57,57);
+	  const double f85 = -fd57 * A(78,57);
+	    A(78,78) += f85 * A(57,78);
+	    A(78,80) = f85 * A(57,80);
+	    RHS(78) += f85 * RHS(57);
+	  const double f86 = -fd57 * A(80,57);
+	    A(80,78) = f86 * A(57,78);
+	    A(80,80) += f86 * A(57,80);
+	    RHS(80) += f86 * RHS(57);
+	const double fd58 = 1.0 / A(58,58);
+	  const double f87 = -fd58 * A(75,58);
+	    A(75,75) += f87 * A(58,75);
+	    A(75,81) += f87 * A(58,81);
+	    RHS(75) += f87 * RHS(58);
+	  const double f88 = -fd58 * A(81,58);
+	    A(81,75) += f88 * A(58,75);
+	    A(81,81) += f88 * A(58,81);
+	    RHS(81) += f88 * RHS(58);
+	const double fd59 = 1.0 / A(59,59);
+	  const double f89 = -fd59 * A(60,59);
+	    A(60,60) += f89 * A(59,60);
+	    A(60,70) = f89 * A(59,70);
+	    RHS(60) += f89 * RHS(59);
+	  const double f90 = -fd59 * A(70,59);
+	    A(70,60) = f90 * A(59,60);
+	    A(70,70) += f90 * A(59,70);
+	    RHS(70) += f90 * RHS(59);
+	const double fd60 = 1.0 / A(60,60);
+	  const double f91 = -fd60 * A(70,60);
+	    A(70,70) += f91 * A(60,70);
+	    RHS(70) += f91 * RHS(60);
+	const double fd61 = 1.0 / A(61,61);
+	  const double f92 = -fd61 * A(73,61);
+	    A(73,73) += f92 * A(61,73);
+	    A(73,75) = f92 * A(61,75);
+	    RHS(73) += f92 * RHS(61);
+	  const double f93 = -fd61 * A(75,61);
+	    A(75,73) = f93 * A(61,73);
+	    A(75,75) += f93 * A(61,75);
+	    RHS(75) += f93 * RHS(61);
+	const double fd62 = 1.0 / A(62,62);
+	  const double f94 = -fd62 * A(68,62);
+	    A(68,68) += f94 * A(62,68);
+	    A(68,77) = f94 * A(62,77);
+	    RHS(68) += f94 * RHS(62);
+	  const double f95 = -fd62 * A(77,62);
+	    A(77,68) = f95 * A(62,68);
+	    A(77,77) += f95 * A(62,77);
+	    RHS(77) += f95 * RHS(62);
+	const double fd63 = 1.0 / A(63,63);
+	  const double f96 = -fd63 * A(74,63);
+	    A(74,74) += f96 * A(63,74);
+	    RHS(74) += f96 * RHS(63);
+	const double fd64 = 1.0 / A(64,64);
+	  const double f97 = -fd64 * A(76,64);
+	    A(76,76) += f97 * A(64,76);
+	    A(76,83) += f97 * A(64,83);
+	    RHS(76) += f97 * RHS(64);
+	  const double f98 = -fd64 * A(83,64);
+	    A(83,76) += f98 * A(64,76);
+	    A(83,83) += f98 * A(64,83);
+	    RHS(83) += f98 * RHS(64);
+	const double fd65 = 1.0 / A(65,65);
+	  const double f99 = -fd65 * A(79,65);
+	    A(79,79) += f99 * A(65,79);
+	    A(79,86) = f99 * A(65,86);
+	    RHS(79) += f99 * RHS(65);
+	  const double f100 = -fd65 * A(86,65);
+	    A(86,79) = f100 * A(65,79);
+	    A(86,86) += f100 * A(65,86);
+	    RHS(86) += f100 * RHS(65);
+	const double fd66 = 1.0 / A(66,66);
+	  const double f101 = -fd66 * A(86,66);
+	    A(86,86) += f101 * A(66,86);
+	    RHS(86) += f101 * RHS(66);
+	const double fd67 = 1.0 / A(67,67);
+	  const double f102 = -fd67 * A(86,67);
+	    A(86,86) += f102 * A(67,86);
+	    RHS(86) += f102 * RHS(67);
+	const double fd68 = 1.0 / A(68,68);
+	  const double f103 = -fd68 * A(77,68);
+	    A(77,77) += f103 * A(68,77);
+	    RHS(77) += f103 * RHS(68);
+	const double fd69 = 1.0 / A(69,69);
+	  const double f104 = -fd69 * A(71,69);
+	    A(71,71) += f104 * A(69,71);
+	    A(71,85) += f104 * A(69,85);
+	    RHS(71) += f104 * RHS(69);
+	  const double f105 = -fd69 * A(85,69);
+	    A(85,71) = f105 * A(69,71);
+	    A(85,85) += f105 * A(69,85);
+	    RHS(85) += f105 * RHS(69);
+	const double fd70 = 1.0 / A(70,70);
+	  const double f106 = -fd70 * A(73,70);
+	    A(73,73) += f106 * A(70,73);
+	    A(73,78) = f106 * A(70,78);
+	    RHS(73) += f106 * RHS(70);
+	  const double f107 = -fd70 * A(78,70);
+	    A(78,73) = f107 * A(70,73);
+	    A(78,78) += f107 * A(70,78);
+	    RHS(78) += f107 * RHS(70);
+	const double fd71 = 1.0 / A(71,71);
+	  const double f108 = -fd71 * A(82,71);
+	    A(82,82) += f108 * A(71,82);
+	    A(82,85) = f108 * A(71,85);
+	    RHS(82) += f108 * RHS(71);
+	  const double f109 = -fd71 * A(85,71);
+	    A(85,82) = f109 * A(71,82);
+	    A(85,85) += f109 * A(71,85);
+	    RHS(85) += f109 * RHS(71);
+	const double fd72 = 1.0 / A(72,72);
+	  const double f110 = -fd72 * A(78,72);
+	    A(78,78) += f110 * A(72,78);
+	    A(78,85) = f110 * A(72,85);
+	    RHS(78) += f110 * RHS(72);
+	  const double f111 = -fd72 * A(85,72);
+	    A(85,78) = f111 * A(72,78);
+	    A(85,85) += f111 * A(72,85);
+	    RHS(85) += f111 * RHS(72);
+	const double fd73 = 1.0 / A(73,73);
+	  const double f112 = -fd73 * A(75,73);
+	    A(75,75) += f112 * A(73,75);
+	    A(75,78) = f112 * A(73,78);
+	    A(75,81) += f112 * A(73,81);
+	    RHS(75) += f112 * RHS(73);
+	  const double f113 = -fd73 * A(78,73);
+	    A(78,75) = f113 * A(73,75);
+	    A(78,78) += f113 * A(73,78);
+	    A(78,81) = f113 * A(73,81);
+	    RHS(78) += f113 * RHS(73);
+	  const double f114 = -fd73 * A(81,73);
+	    A(81,75) += f114 * A(73,75);
+	    A(81,78) = f114 * A(73,78);
+	    A(81,81) += f114 * A(73,81);
+	    RHS(81) += f114 * RHS(73);
+	const double fd74 = 1.0 / A(74,74);
+	  const double f115 = -fd74 * A(82,74);
+	    A(82,82) += f115 * A(74,82);
+	    RHS(82) += f115 * RHS(74);
+	const double fd75 = 1.0 / A(75,75);
+	  const double f116 = -fd75 * A(78,75);
+	    A(78,78) += f116 * A(75,78);
+	    A(78,81) += f116 * A(75,81);
+	    RHS(78) += f116 * RHS(75);
+	  const double f117 = -fd75 * A(81,75);
+	    A(81,78) += f117 * A(75,78);
+	    A(81,81) += f117 * A(75,81);
+	    RHS(81) += f117 * RHS(75);
+	const double fd76 = 1.0 / A(76,76);
+	  const double f118 = -fd76 * A(83,76);
+	    A(83,83) += f118 * A(76,83);
+	    RHS(83) += f118 * RHS(76);
+	const double fd77 = 1.0 / A(77,77);
+	  const double f119 = -fd77 * A(82,77);
+	    A(82,82) += f119 * A(77,82);
+	    RHS(82) += f119 * RHS(77);
+	const double fd78 = 1.0 / A(78,78);
+	  const double f120 = -fd78 * A(80,78);
+	    A(80,80) += f120 * A(78,80);
+	    A(80,81) = f120 * A(78,81);
+	    A(80,85) = f120 * A(78,85);
+	    RHS(80) += f120 * RHS(78);
+	  const double f121 = -fd78 * A(81,78);
+	    A(81,80) = f121 * A(78,80);
+	    A(81,81) += f121 * A(78,81);
+	    A(81,85) += f121 * A(78,85);
+	    RHS(81) += f121 * RHS(78);
+	  const double f122 = -fd78 * A(85,78);
+	    A(85,80) = f122 * A(78,80);
+	    A(85,81) += f122 * A(78,81);
+	    A(85,85) += f122 * A(78,85);
+	    RHS(85) += f122 * RHS(78);
+	const double fd79 = 1.0 / A(79,79);
+	  const double f123 = -fd79 * A(85,79);
+	    A(85,85) += f123 * A(79,85);
+	    A(85,86) = f123 * A(79,86);
+	    RHS(85) += f123 * RHS(79);
+	  const double f124 = -fd79 * A(86,79);
+	    A(86,85) = f124 * A(79,85);
+	    A(86,86) += f124 * A(79,86);
+	    RHS(86) += f124 * RHS(79);
+	const double fd80 = 1.0 / A(80,80);
+	  const double f125 = -fd80 * A(81,80);
+	    A(81,81) += f125 * A(80,81);
+	    A(81,84) = f125 * A(80,84);
+	    A(81,85) += f125 * A(80,85);
+	    RHS(81) += f125 * RHS(80);
+	  const double f126 = -fd80 * A(84,80);
+	    A(84,81) = f126 * A(80,81);
+	    A(84,84) += f126 * A(80,84);
+	    A(84,85) = f126 * A(80,85);
+	    RHS(84) += f126 * RHS(80);
+	  const double f127 = -fd80 * A(85,80);
+	    A(85,81) += f127 * A(80,81);
+	    A(85,84) = f127 * A(80,84);
+	    A(85,85) += f127 * A(80,85);
+	    RHS(85) += f127 * RHS(80);
+	const double fd81 = 1.0 / A(81,81);
+	  const double f128 = -fd81 * A(84,81);
+	    A(84,84) += f128 * A(81,84);
+	    A(84,85) += f128 * A(81,85);
+	    RHS(84) += f128 * RHS(81);
+	  const double f129 = -fd81 * A(85,81);
+	    A(85,84) += f129 * A(81,84);
+	    A(85,85) += f129 * A(81,85);
+	    RHS(85) += f129 * RHS(81);
+	const double fd82 = 1.0 / A(82,82);
+	  const double f130 = -fd82 * A(85,82);
+	    A(85,85) += f130 * A(82,85);
+	    RHS(85) += f130 * RHS(82);
+	const double fd83 = 1.0 / A(83,83);
+	  const double f131 = -fd83 * A(85,83);
+	    A(85,85) += f131 * A(83,85);
+	    RHS(85) += f131 * RHS(83);
+	const double fd84 = 1.0 / A(84,84);
+	  const double f132 = -fd84 * A(85,84);
+	    A(85,85) += f132 * A(84,85);
+	    A(85,87) = f132 * A(84,87);
+	    RHS(85) += f132 * RHS(84);
+	  const double f133 = -fd84 * A(86,84);
+	    A(86,85) += f133 * A(84,85);
+	    A(86,87) = f133 * A(84,87);
+	    RHS(86) += f133 * RHS(84);
+	  const double f134 = -fd84 * A(87,84);
+	    A(87,85) = f134 * A(84,85);
+	    A(87,87) += f134 * A(84,87);
+	    RHS(87) += f134 * RHS(84);
+	const double fd85 = 1.0 / A(85,85);
+	  const double f135 = -fd85 * A(86,85);
+	    A(86,86) += f135 * A(85,86);
+	    A(86,87) += f135 * A(85,87);
+	    RHS(86) += f135 * RHS(85);
+	  const double f136 = -fd85 * A(87,85);
+	    A(87,86) = f136 * A(85,86);
+	    A(87,87) += f136 * A(85,87);
+	    RHS(87) += f136 * RHS(85);
+	const double fd86 = 1.0 / A(86,86);
+	  const double f137 = -fd86 * A(87,86);
+	    A(87,87) += f137 * A(86,87);
+	    RHS(87) += f137 * RHS(86);
+	return;
+#endif
 	const unsigned kN = N();
 
 	for (unsigned i = 0; i < kN; i++) {
@@ -322,6 +928,7 @@ void matrix_solver_direct_t<m_N, _storage_N>::LE_solve()
 				do_work(0, NULL);
 			}
 #else
+
 			/* FIXME: Singular matrix? */
 			const nl_double f = 1.0 / A(i,i);
 			const auto &nzrd = m_terms[i]->m_nzrd;
diff --git a/src/lib/netlist/solver/nld_ms_gcr.h b/src/lib/netlist/solver/nld_ms_gcr.h
index a7a0dd52ba4..f83a8b3c6a5 100644
--- a/src/lib/netlist/solver/nld_ms_gcr.h
+++ b/src/lib/netlist/solver/nld_ms_gcr.h
@@ -69,21 +69,33 @@ void matrix_solver_GCR_t<m_N, _storage_N>::vsetup(analog_net_t::list_t &nets)
 			touched[k][j] = true;
 	}
 
+	unsigned fc = 0;
+
 	unsigned ops = 0;
+
+	const bool static_compile = false;
 	for (unsigned k = 0; k < iN; k++)
 	{
 		ops++; // 1/A(k,k)
+		if (static_compile) printf("const double fd%d = 1.0 / A(%d,%d); \n", k, k, k);
 		for (unsigned row = k + 1; row < iN; row++)
 		{
 			if (touched[row][k])
 			{
 				ops++;
+				fc++;
+				if (static_compile) printf("  const double f%d = -fd%d * A(%d,%d); \n", fc, k, row, k);
 				for (unsigned col = k + 1; col < iN; col++)
 					if (touched[k][col])
 					{
+						if (touched[row][col])
+							if (static_compile) printf("    A(%d,%d) += f%d * A(%d,%d); \n", row, col, fc, k, col);
+						else
+							if (static_compile) printf("    A(%d,%d) = f%d * A(%d,%d); \n", row, col, fc, k, col);
 						touched[row][col] = true;
 						ops += 2;
 					}
+				if (static_compile) printf("    RHS(%d) += f%d * RHS(%d); \n", row, fc, k);
 			}
 		}
 	}

From 222adaf847db2ee6fa591abcdd5b7ca4d3343fe7 Mon Sep 17 00:00:00 2001
From: couriersud <couriersud@arcor.de>
Date: Fri, 15 Apr 2016 16:43:35 +0200
Subject: [PATCH 067/122] merge me later bug fix

---
 src/lib/netlist/solver/nld_ms_gcr.h | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/lib/netlist/solver/nld_ms_gcr.h b/src/lib/netlist/solver/nld_ms_gcr.h
index f83a8b3c6a5..47ad4259475 100644
--- a/src/lib/netlist/solver/nld_ms_gcr.h
+++ b/src/lib/netlist/solver/nld_ms_gcr.h
@@ -89,9 +89,12 @@ void matrix_solver_GCR_t<m_N, _storage_N>::vsetup(analog_net_t::list_t &nets)
 					if (touched[k][col])
 					{
 						if (touched[row][col])
+						{
 							if (static_compile) printf("    A(%d,%d) += f%d * A(%d,%d); \n", row, col, fc, k, col);
-						else
+						} else
+						{
 							if (static_compile) printf("    A(%d,%d) = f%d * A(%d,%d); \n", row, col, fc, k, col);
+						}
 						touched[row][col] = true;
 						ops += 2;
 					}

From 4bf89be02c02187603930f9fb0717db08c97d6a1 Mon Sep 17 00:00:00 2001
From: couriersud <couriersud@arcor.de>
Date: Mon, 18 Apr 2016 18:31:43 +0200
Subject: [PATCH 068/122] Simplify solver infrastructure.

---
 src/lib/netlist/solver/nld_matrix_solver.h | 12 +++---
 src/lib/netlist/solver/nld_ms_direct.h     |  8 ++--
 src/lib/netlist/solver/nld_ms_gcr.h        |  2 +-
 src/lib/netlist/solver/nld_ms_gmres.h      |  2 +-
 src/lib/netlist/solver/nld_ms_sm.h         | 17 +--------
 src/lib/netlist/solver/nld_ms_sor.h        |  2 +-
 src/lib/netlist/solver/nld_ms_sor_mat.h    |  2 +-
 src/lib/netlist/solver/nld_ms_w.h          | 15 +-------
 src/lib/netlist/solver/nld_solver.cpp      | 44 +++++++++++-----------
 9 files changed, 38 insertions(+), 66 deletions(-)

diff --git a/src/lib/netlist/solver/nld_matrix_solver.h b/src/lib/netlist/solver/nld_matrix_solver.h
index f778a7e61f5..80c932823e9 100644
--- a/src/lib/netlist/solver/nld_matrix_solver.h
+++ b/src/lib/netlist/solver/nld_matrix_solver.h
@@ -76,13 +76,14 @@ public:
 	typedef pvector_t<matrix_solver_t *> list_t;
 	typedef core_device_t::list_t dev_list_t;
 
-	enum eSolverType
+	enum eSortType
 	{
-		GAUSSIAN_ELIMINATION,
-		GAUSS_SEIDEL
+		NOSORT,
+		ASCENDING,
+		DESCENDING
 	};
 
-	matrix_solver_t(const eSolverType type, const solver_parameters_t *params);
+	matrix_solver_t(const eSortType sort, const solver_parameters_t *params);
 	virtual ~matrix_solver_t();
 
 	void setup(analog_net_t::list_t &nets) { vsetup(nets); }
@@ -107,7 +108,6 @@ public:
 
 	ATTR_COLD int get_net_idx(net_t *net);
 
-	eSolverType type() const { return m_type; }
 	plog_base<NL_DEBUG> &log() { return netlist().log(); }
 
 	virtual void log_stats();
@@ -165,7 +165,7 @@ private:
 
 	void update_inputs();
 
-	const eSolverType m_type;
+	const eSortType m_sort;
 };
 
 template <typename T>
diff --git a/src/lib/netlist/solver/nld_ms_direct.h b/src/lib/netlist/solver/nld_ms_direct.h
index d87befca7c5..ee3f3cfecb9 100644
--- a/src/lib/netlist/solver/nld_ms_direct.h
+++ b/src/lib/netlist/solver/nld_ms_direct.h
@@ -122,7 +122,7 @@ class matrix_solver_direct_t: public matrix_solver_t
 public:
 
 	matrix_solver_direct_t(const solver_parameters_t *params, const int size);
-	matrix_solver_direct_t(const eSolverType type, const solver_parameters_t *params, const int size);
+	matrix_solver_direct_t(const eSortType sort, const solver_parameters_t *params, const int size);
 
 	virtual ~matrix_solver_direct_t();
 
@@ -1022,7 +1022,7 @@ inline int matrix_solver_direct_t<m_N, _storage_N>::vsolve_non_dynamic(const boo
 
 template <unsigned m_N, unsigned _storage_N>
 matrix_solver_direct_t<m_N, _storage_N>::matrix_solver_direct_t(const solver_parameters_t *params, const int size)
-: matrix_solver_t(GAUSSIAN_ELIMINATION, params)
+: matrix_solver_t(ASCENDING, params)
 , m_dim(size)
 {
 #if (NL_USE_DYNAMIC_ALLOCATION)
@@ -1038,8 +1038,8 @@ matrix_solver_direct_t<m_N, _storage_N>::matrix_solver_direct_t(const solver_par
 }
 
 template <unsigned m_N, unsigned _storage_N>
-matrix_solver_direct_t<m_N, _storage_N>::matrix_solver_direct_t(const eSolverType type, const solver_parameters_t *params, const int size)
-: matrix_solver_t(type, params)
+matrix_solver_direct_t<m_N, _storage_N>::matrix_solver_direct_t(const eSortType sort, const solver_parameters_t *params, const int size)
+: matrix_solver_t(sort, params)
 , m_dim(size)
 {
 #if (NL_USE_DYNAMIC_ALLOCATION)
diff --git a/src/lib/netlist/solver/nld_ms_gcr.h b/src/lib/netlist/solver/nld_ms_gcr.h
index 47ad4259475..9aecb3ba8fe 100644
--- a/src/lib/netlist/solver/nld_ms_gcr.h
+++ b/src/lib/netlist/solver/nld_ms_gcr.h
@@ -29,7 +29,7 @@ class matrix_solver_GCR_t: public matrix_solver_direct_t<m_N, _storage_N>
 public:
 
 	matrix_solver_GCR_t(const solver_parameters_t *params, int size)
-		: matrix_solver_direct_t<m_N, _storage_N>(matrix_solver_t::GAUSSIAN_ELIMINATION, params, size)
+		: matrix_solver_direct_t<m_N, _storage_N>(matrix_solver_t::ASCENDING, params, size)
 		{
 		}
 
diff --git a/src/lib/netlist/solver/nld_ms_gmres.h b/src/lib/netlist/solver/nld_ms_gmres.h
index 8c47f67e2b4..8663da061d6 100644
--- a/src/lib/netlist/solver/nld_ms_gmres.h
+++ b/src/lib/netlist/solver/nld_ms_gmres.h
@@ -27,7 +27,7 @@ class matrix_solver_GMRES_t: public matrix_solver_direct_t<m_N, _storage_N>
 public:
 
 	matrix_solver_GMRES_t(const solver_parameters_t *params, int size)
-		: matrix_solver_direct_t<m_N, _storage_N>(matrix_solver_t::GAUSSIAN_ELIMINATION, params, size)
+		: matrix_solver_direct_t<m_N, _storage_N>(matrix_solver_t::ASCENDING, params, size)
 		, m_use_iLU_preconditioning(true)
 		, m_use_more_precise_stop_condition(false)
 		, m_accuracy_mult(1.0)
diff --git a/src/lib/netlist/solver/nld_ms_sm.h b/src/lib/netlist/solver/nld_ms_sm.h
index fa9e23233e4..f83240c789a 100644
--- a/src/lib/netlist/solver/nld_ms_sm.h
+++ b/src/lib/netlist/solver/nld_ms_sm.h
@@ -53,7 +53,6 @@ class matrix_solver_sm_t: public matrix_solver_t
 public:
 
 	matrix_solver_sm_t(const solver_parameters_t *params, const int size);
-	matrix_solver_sm_t(const eSolverType type, const solver_parameters_t *params, const int size);
 
 	virtual ~matrix_solver_sm_t();
 
@@ -326,21 +325,7 @@ inline int matrix_solver_sm_t<m_N, _storage_N>::vsolve_non_dynamic(const bool ne
 
 template <unsigned m_N, unsigned _storage_N>
 matrix_solver_sm_t<m_N, _storage_N>::matrix_solver_sm_t(const solver_parameters_t *params, const int size)
-: matrix_solver_t(GAUSSIAN_ELIMINATION, params)
-, m_dim(size)
-{
-#if (NL_USE_DYNAMIC_ALLOCATION)
-	m_A = palloc_array(nl_ext_double, N() * m_pitch);
-#endif
-	for (unsigned k = 0; k < N(); k++)
-	{
-		m_last_RHS[k] = 0.0;
-	}
-}
-
-template <unsigned m_N, unsigned _storage_N>
-matrix_solver_sm_t<m_N, _storage_N>::matrix_solver_sm_t(const eSolverType type, const solver_parameters_t *params, const int size)
-: matrix_solver_t(type, params)
+: matrix_solver_t(NOSORT, params)
 , m_dim(size)
 {
 #if (NL_USE_DYNAMIC_ALLOCATION)
diff --git a/src/lib/netlist/solver/nld_ms_sor.h b/src/lib/netlist/solver/nld_ms_sor.h
index 801f2efa1a0..aa824263b81 100644
--- a/src/lib/netlist/solver/nld_ms_sor.h
+++ b/src/lib/netlist/solver/nld_ms_sor.h
@@ -25,7 +25,7 @@ class matrix_solver_SOR_t: public matrix_solver_direct_t<m_N, _storage_N>
 public:
 
 	matrix_solver_SOR_t(const solver_parameters_t *params, int size)
-		: matrix_solver_direct_t<m_N, _storage_N>(matrix_solver_t::GAUSS_SEIDEL, params, size)
+		: matrix_solver_direct_t<m_N, _storage_N>(matrix_solver_t::DESCENDING, params, size)
 		, m_lp_fact(0)
 		{
 		}
diff --git a/src/lib/netlist/solver/nld_ms_sor_mat.h b/src/lib/netlist/solver/nld_ms_sor_mat.h
index 4c6ceee1eb1..b57ba3cded1 100644
--- a/src/lib/netlist/solver/nld_ms_sor_mat.h
+++ b/src/lib/netlist/solver/nld_ms_sor_mat.h
@@ -29,7 +29,7 @@ class matrix_solver_SOR_mat_t: public matrix_solver_direct_t<m_N, _storage_N>
 public:
 
 	matrix_solver_SOR_mat_t(const solver_parameters_t *params, int size)
-		: matrix_solver_direct_t<m_N, _storage_N>(matrix_solver_t::GAUSS_SEIDEL, params, size)
+		: matrix_solver_direct_t<m_N, _storage_N>(matrix_solver_t::DESCENDING, params, size)
 		, m_omega(params->m_sor)
 		, m_lp_fact(0)
 		, m_gs_fail(0)
diff --git a/src/lib/netlist/solver/nld_ms_w.h b/src/lib/netlist/solver/nld_ms_w.h
index bfb55989765..fe7a4389566 100644
--- a/src/lib/netlist/solver/nld_ms_w.h
+++ b/src/lib/netlist/solver/nld_ms_w.h
@@ -59,7 +59,6 @@ class matrix_solver_w_t: public matrix_solver_t
 public:
 
 	matrix_solver_w_t(const solver_parameters_t *params, const int size);
-	matrix_solver_w_t(const eSolverType type, const solver_parameters_t *params, const int size);
 
 	virtual ~matrix_solver_w_t();
 
@@ -391,7 +390,7 @@ inline int matrix_solver_w_t<m_N, _storage_N>::vsolve_non_dynamic(const bool new
 
 template <unsigned m_N, unsigned _storage_N>
 matrix_solver_w_t<m_N, _storage_N>::matrix_solver_w_t(const solver_parameters_t *params, const int size)
-: matrix_solver_t(GAUSSIAN_ELIMINATION, params)
+: matrix_solver_t(NOSORT, params)
 	,m_cnt(0)
 	, m_dim(size)
 {
@@ -401,18 +400,6 @@ matrix_solver_w_t<m_N, _storage_N>::matrix_solver_w_t(const solver_parameters_t
 	}
 }
 
-template <unsigned m_N, unsigned _storage_N>
-matrix_solver_w_t<m_N, _storage_N>::matrix_solver_w_t(const eSolverType type, const solver_parameters_t *params, const int size)
-: matrix_solver_t(type, params)
-,m_cnt(0)
-, m_dim(size)
-{
-	for (unsigned k = 0; k < N(); k++)
-	{
-		m_last_RHS[k] = 0.0;
-	}
-}
-
 NETLIB_NAMESPACE_DEVICES_END()
 
 #endif /* NLD_MS_DIRECT_H_ */
diff --git a/src/lib/netlist/solver/nld_solver.cpp b/src/lib/netlist/solver/nld_solver.cpp
index 95b4f0077d0..da04a62eb8a 100644
--- a/src/lib/netlist/solver/nld_solver.cpp
+++ b/src/lib/netlist/solver/nld_solver.cpp
@@ -94,7 +94,7 @@ ATTR_COLD void terms_t::set_pointers()
 // matrix_solver
 // ----------------------------------------------------------------------------------------
 
-ATTR_COLD matrix_solver_t::matrix_solver_t(const eSolverType type, const solver_parameters_t *params)
+ATTR_COLD matrix_solver_t::matrix_solver_t(const eSortType sort, const solver_parameters_t *params)
 : m_stat_calculations(0),
 	m_stat_newton_raphson(0),
 	m_stat_vsolver_calls(0),
@@ -102,7 +102,7 @@ ATTR_COLD matrix_solver_t::matrix_solver_t(const eSolverType type, const solver_
 	m_iterative_total(0),
 	m_params(*params),
 	m_cur_ts(0),
-	m_type(type)
+	m_sort(sort)
 {
 }
 
@@ -223,7 +223,6 @@ ATTR_COLD void matrix_solver_t::setup_matrix()
 		pfree(m_rails_temp[k]); // no longer needed
 
 	m_rails_temp.clear();
-#if 1
 
 	/* Sort in descending order by number of connected matrix voltages.
 	 * The idea is, that for Gauss-Seidel algo the first voltage computed
@@ -245,27 +244,28 @@ ATTR_COLD void matrix_solver_t::setup_matrix()
 	 *
 	 */
 
-	int sort_order = -1;//(type() == GAUSS_SEIDEL ? 1 : -1);
-
-	for (unsigned k = 0; k < iN - 1; k++)
-		for (unsigned i = k+1; i < iN; i++)
-		{
-			if (((int) m_terms[k]->m_railstart - (int) m_terms[i]->m_railstart) * sort_order < 0)
-			{
-				std::swap(m_terms[i], m_terms[k]);
-				std::swap(m_nets[i], m_nets[k]);
-			}
-		}
-
-	for (unsigned k = 0; k < iN; k++)
+	if (m_sort != NOSORT)
 	{
-		int *other = m_terms[k]->net_other();
-		for (unsigned i = 0; i < m_terms[k]->count(); i++)
-			if (other[i] != -1)
-				other[i] = get_net_idx(&m_terms[k]->terms()[i]->m_otherterm->net());
-	}
+		int sort_order = (m_sort == DESCENDING ? 1 : -1);
 
-#endif
+		for (unsigned k = 0; k < iN - 1; k++)
+			for (unsigned i = k+1; i < iN; i++)
+			{
+				if (((int) m_terms[k]->m_railstart - (int) m_terms[i]->m_railstart) * sort_order < 0)
+				{
+					std::swap(m_terms[i], m_terms[k]);
+					std::swap(m_nets[i], m_nets[k]);
+				}
+			}
+
+		for (unsigned k = 0; k < iN; k++)
+		{
+			int *other = m_terms[k]->net_other();
+			for (unsigned i = 0; i < m_terms[k]->count(); i++)
+				if (other[i] != -1)
+					other[i] = get_net_idx(&m_terms[k]->terms()[i]->m_otherterm->net());
+		}
+	}
 
 	/* create a list of non zero elements. */
 	for (unsigned k = 0; k < iN; k++)

From 82188dee99ec811589a3b4f6838298408d96441a Mon Sep 17 00:00:00 2001
From: couriersud <couriersud@arcor.de>
Date: Mon, 18 Apr 2016 18:46:12 +0200
Subject: [PATCH 069/122] Fix *nix compile.

---
 src/osd/sdl/window.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/osd/sdl/window.cpp b/src/osd/sdl/window.cpp
index e6d4c71b4a3..9204891e010 100644
--- a/src/osd/sdl/window.cpp
+++ b/src/osd/sdl/window.cpp
@@ -985,7 +985,7 @@ OSDWORK_CALLBACK( sdl_window_info::complete_create_wt )
 		 * is in place after the mode switch - which will most likely be the case
 		 * This is a hack to work around a deficiency in SDL2
 		 */
-		SDL_WarpMouseInWindow(window->sdl_window(), 1, 1);
+		SDL_WarpMouseInWindow(window->platform_window<SDL_Window*>(), 1, 1);
 #endif
 	}
 	else

From c64b88bc78a4810ce0c75eb4d6651e5a26cc2bad Mon Sep 17 00:00:00 2001
From: "therealmogminer@gmail.com" <therealmogminer@gmail.com>
Date: Mon, 18 Apr 2016 19:39:46 +0200
Subject: [PATCH 070/122] -Added HQ2x, HQ3x and HQ4x shaders. [MooglyGuy,Jules
 Blok,Cameron Zemek,Maxim Stepin]

---
 artwork/bgfx/chains/hq2x.png                  | Bin 0 -> 2793 bytes
 artwork/bgfx/chains/hq3x.png                  | Bin 0 -> 4665 bytes
 artwork/bgfx/chains/hq4x.png                  | Bin 0 -> 11913 bytes
 bgfx/chains/hq2x.json                         |  60 +++++++++
 bgfx/chains/hq3x.json                         |  60 +++++++++
 bgfx/chains/hq4x.json                         |  60 +++++++++
 bgfx/effects/hq2x/blit.json                   | 121 ++++++++++++++++++
 bgfx/effects/hq2x/hq2x.json                   |  29 +++++
 bgfx/effects/hq3x/blit.json                   | 121 ++++++++++++++++++
 bgfx/effects/hq3x/hq3x.json                   |  29 +++++
 bgfx/effects/hq4x/blit.json                   | 121 ++++++++++++++++++
 bgfx/effects/hq4x/hq4x.json                   |  29 +++++
 bgfx/shaders/dx11/chains/hq2x/fs_blit.bin     | Bin 0 -> 396 bytes
 bgfx/shaders/dx11/chains/hq2x/fs_hq2x.bin     | Bin 0 -> 6600 bytes
 bgfx/shaders/dx11/chains/hq2x/vs_blit.bin     | Bin 0 -> 575 bytes
 bgfx/shaders/dx11/chains/hq2x/vs_hq2x.bin     | Bin 0 -> 909 bytes
 bgfx/shaders/dx11/chains/hq3x/fs_blit.bin     | Bin 0 -> 396 bytes
 bgfx/shaders/dx11/chains/hq3x/fs_hq3x.bin     | Bin 0 -> 6612 bytes
 bgfx/shaders/dx11/chains/hq3x/vs_blit.bin     | Bin 0 -> 575 bytes
 bgfx/shaders/dx11/chains/hq3x/vs_hq3x.bin     | Bin 0 -> 909 bytes
 bgfx/shaders/dx11/chains/hq4x/fs_blit.bin     | Bin 0 -> 396 bytes
 bgfx/shaders/dx11/chains/hq4x/fs_hq4x.bin     | Bin 0 -> 6612 bytes
 bgfx/shaders/dx11/chains/hq4x/vs_blit.bin     | Bin 0 -> 575 bytes
 bgfx/shaders/dx11/chains/hq4x/vs_hq4x.bin     | Bin 0 -> 909 bytes
 bgfx/shaders/dx9/chains/hq2x/fs_blit.bin      | Bin 0 -> 241 bytes
 bgfx/shaders/dx9/chains/hq2x/fs_hq2x.bin      | Bin 0 -> 3709 bytes
 bgfx/shaders/dx9/chains/hq2x/vs_blit.bin      | Bin 0 -> 330 bytes
 bgfx/shaders/dx9/chains/hq2x/vs_hq2x.bin      | Bin 0 -> 576 bytes
 bgfx/shaders/dx9/chains/hq3x/fs_blit.bin      | Bin 0 -> 241 bytes
 bgfx/shaders/dx9/chains/hq3x/fs_hq3x.bin      | Bin 0 -> 3733 bytes
 bgfx/shaders/dx9/chains/hq3x/vs_blit.bin      | Bin 0 -> 330 bytes
 bgfx/shaders/dx9/chains/hq3x/vs_hq3x.bin      | Bin 0 -> 576 bytes
 bgfx/shaders/dx9/chains/hq4x/fs_blit.bin      | Bin 0 -> 241 bytes
 bgfx/shaders/dx9/chains/hq4x/fs_hq4x.bin      | Bin 0 -> 3709 bytes
 bgfx/shaders/dx9/chains/hq4x/vs_blit.bin      | Bin 0 -> 330 bytes
 bgfx/shaders/dx9/chains/hq4x/vs_hq4x.bin      | Bin 0 -> 576 bytes
 bgfx/shaders/gles/chains/hq2x/fs_blit.bin     | Bin 0 -> 238 bytes
 bgfx/shaders/gles/chains/hq2x/fs_hq2x.bin     | Bin 0 -> 15856 bytes
 bgfx/shaders/gles/chains/hq2x/vs_blit.bin     | Bin 0 -> 419 bytes
 bgfx/shaders/gles/chains/hq2x/vs_hq2x.bin     | Bin 0 -> 1178 bytes
 bgfx/shaders/gles/chains/hq3x/fs_blit.bin     | Bin 0 -> 238 bytes
 bgfx/shaders/gles/chains/hq3x/fs_hq3x.bin     | Bin 0 -> 15861 bytes
 bgfx/shaders/gles/chains/hq3x/vs_blit.bin     | Bin 0 -> 419 bytes
 bgfx/shaders/gles/chains/hq3x/vs_hq3x.bin     | Bin 0 -> 1178 bytes
 bgfx/shaders/gles/chains/hq4x/fs_blit.bin     | Bin 0 -> 238 bytes
 bgfx/shaders/gles/chains/hq4x/fs_hq4x.bin     | Bin 0 -> 15861 bytes
 bgfx/shaders/gles/chains/hq4x/vs_blit.bin     | Bin 0 -> 419 bytes
 bgfx/shaders/gles/chains/hq4x/vs_hq4x.bin     | Bin 0 -> 1178 bytes
 bgfx/shaders/glsl/chains/hq2x/fs_blit.bin     | Bin 0 -> 181 bytes
 bgfx/shaders/glsl/chains/hq2x/fs_hq2x.bin     | Bin 0 -> 15054 bytes
 bgfx/shaders/glsl/chains/hq2x/vs_blit.bin     | Bin 0 -> 377 bytes
 bgfx/shaders/glsl/chains/hq2x/vs_hq2x.bin     | Bin 0 -> 1082 bytes
 bgfx/shaders/glsl/chains/hq3x/fs_blit.bin     | Bin 0 -> 181 bytes
 bgfx/shaders/glsl/chains/hq3x/fs_hq3x.bin     | Bin 0 -> 15059 bytes
 bgfx/shaders/glsl/chains/hq3x/vs_blit.bin     | Bin 0 -> 377 bytes
 bgfx/shaders/glsl/chains/hq3x/vs_hq3x.bin     | Bin 0 -> 1082 bytes
 bgfx/shaders/glsl/chains/hq4x/fs_blit.bin     | Bin 0 -> 181 bytes
 bgfx/shaders/glsl/chains/hq4x/fs_hq4x.bin     | Bin 0 -> 15059 bytes
 bgfx/shaders/glsl/chains/hq4x/vs_blit.bin     | Bin 0 -> 377 bytes
 bgfx/shaders/glsl/chains/hq4x/vs_hq4x.bin     | Bin 0 -> 1082 bytes
 bgfx/shaders/metal/chains/hq2x/fs_blit.bin    | Bin 0 -> 634 bytes
 bgfx/shaders/metal/chains/hq2x/fs_hq2x.bin    | Bin 0 -> 17344 bytes
 bgfx/shaders/metal/chains/hq2x/vs_blit.bin    | Bin 0 -> 757 bytes
 bgfx/shaders/metal/chains/hq2x/vs_hq2x.bin    | Bin 0 -> 1487 bytes
 bgfx/shaders/metal/chains/hq3x/fs_blit.bin    | Bin 0 -> 634 bytes
 bgfx/shaders/metal/chains/hq3x/fs_hq3x.bin    | Bin 0 -> 17349 bytes
 bgfx/shaders/metal/chains/hq3x/vs_blit.bin    | Bin 0 -> 757 bytes
 bgfx/shaders/metal/chains/hq3x/vs_hq3x.bin    | Bin 0 -> 1487 bytes
 bgfx/shaders/metal/chains/hq4x/fs_blit.bin    | Bin 0 -> 634 bytes
 bgfx/shaders/metal/chains/hq4x/fs_hq4x.bin    | Bin 0 -> 17349 bytes
 bgfx/shaders/metal/chains/hq4x/vs_blit.bin    | Bin 0 -> 757 bytes
 bgfx/shaders/metal/chains/hq4x/vs_hq4x.bin    | Bin 0 -> 1487 bytes
 src/osd/modules/render/bgfx/chainmanager.cpp  |   2 +-
 .../bgfx/shaders/chains/hq2x/fs_blit.sc       |  14 ++
 .../bgfx/shaders/chains/hq2x/fs_hq2x.sc       |  75 +++++++++++
 .../bgfx/shaders/chains/hq2x/varying.def.sc   |   9 ++
 .../bgfx/shaders/chains/hq2x/vs_blit.sc       |  14 ++
 .../bgfx/shaders/chains/hq2x/vs_hq2x.sc       |  36 ++++++
 .../bgfx/shaders/chains/hq3x/fs_blit.sc       |  14 ++
 .../bgfx/shaders/chains/hq3x/fs_hq3x.sc       |  75 +++++++++++
 .../bgfx/shaders/chains/hq3x/varying.def.sc   |   9 ++
 .../bgfx/shaders/chains/hq3x/vs_blit.sc       |  14 ++
 .../bgfx/shaders/chains/hq3x/vs_hq3x.sc       |  36 ++++++
 .../bgfx/shaders/chains/hq4x/fs_blit.sc       |  14 ++
 .../bgfx/shaders/chains/hq4x/fs_hq4x.sc       |  75 +++++++++++
 .../bgfx/shaders/chains/hq4x/varying.def.sc   |   9 ++
 .../bgfx/shaders/chains/hq4x/vs_blit.sc       |  14 ++
 .../bgfx/shaders/chains/hq4x/vs_hq4x.sc       |  36 ++++++
 88 files changed, 1075 insertions(+), 1 deletion(-)
 create mode 100644 artwork/bgfx/chains/hq2x.png
 create mode 100644 artwork/bgfx/chains/hq3x.png
 create mode 100644 artwork/bgfx/chains/hq4x.png
 create mode 100644 bgfx/chains/hq2x.json
 create mode 100644 bgfx/chains/hq3x.json
 create mode 100644 bgfx/chains/hq4x.json
 create mode 100644 bgfx/effects/hq2x/blit.json
 create mode 100644 bgfx/effects/hq2x/hq2x.json
 create mode 100644 bgfx/effects/hq3x/blit.json
 create mode 100644 bgfx/effects/hq3x/hq3x.json
 create mode 100644 bgfx/effects/hq4x/blit.json
 create mode 100644 bgfx/effects/hq4x/hq4x.json
 create mode 100644 bgfx/shaders/dx11/chains/hq2x/fs_blit.bin
 create mode 100644 bgfx/shaders/dx11/chains/hq2x/fs_hq2x.bin
 create mode 100644 bgfx/shaders/dx11/chains/hq2x/vs_blit.bin
 create mode 100644 bgfx/shaders/dx11/chains/hq2x/vs_hq2x.bin
 create mode 100644 bgfx/shaders/dx11/chains/hq3x/fs_blit.bin
 create mode 100644 bgfx/shaders/dx11/chains/hq3x/fs_hq3x.bin
 create mode 100644 bgfx/shaders/dx11/chains/hq3x/vs_blit.bin
 create mode 100644 bgfx/shaders/dx11/chains/hq3x/vs_hq3x.bin
 create mode 100644 bgfx/shaders/dx11/chains/hq4x/fs_blit.bin
 create mode 100644 bgfx/shaders/dx11/chains/hq4x/fs_hq4x.bin
 create mode 100644 bgfx/shaders/dx11/chains/hq4x/vs_blit.bin
 create mode 100644 bgfx/shaders/dx11/chains/hq4x/vs_hq4x.bin
 create mode 100644 bgfx/shaders/dx9/chains/hq2x/fs_blit.bin
 create mode 100644 bgfx/shaders/dx9/chains/hq2x/fs_hq2x.bin
 create mode 100644 bgfx/shaders/dx9/chains/hq2x/vs_blit.bin
 create mode 100644 bgfx/shaders/dx9/chains/hq2x/vs_hq2x.bin
 create mode 100644 bgfx/shaders/dx9/chains/hq3x/fs_blit.bin
 create mode 100644 bgfx/shaders/dx9/chains/hq3x/fs_hq3x.bin
 create mode 100644 bgfx/shaders/dx9/chains/hq3x/vs_blit.bin
 create mode 100644 bgfx/shaders/dx9/chains/hq3x/vs_hq3x.bin
 create mode 100644 bgfx/shaders/dx9/chains/hq4x/fs_blit.bin
 create mode 100644 bgfx/shaders/dx9/chains/hq4x/fs_hq4x.bin
 create mode 100644 bgfx/shaders/dx9/chains/hq4x/vs_blit.bin
 create mode 100644 bgfx/shaders/dx9/chains/hq4x/vs_hq4x.bin
 create mode 100644 bgfx/shaders/gles/chains/hq2x/fs_blit.bin
 create mode 100644 bgfx/shaders/gles/chains/hq2x/fs_hq2x.bin
 create mode 100644 bgfx/shaders/gles/chains/hq2x/vs_blit.bin
 create mode 100644 bgfx/shaders/gles/chains/hq2x/vs_hq2x.bin
 create mode 100644 bgfx/shaders/gles/chains/hq3x/fs_blit.bin
 create mode 100644 bgfx/shaders/gles/chains/hq3x/fs_hq3x.bin
 create mode 100644 bgfx/shaders/gles/chains/hq3x/vs_blit.bin
 create mode 100644 bgfx/shaders/gles/chains/hq3x/vs_hq3x.bin
 create mode 100644 bgfx/shaders/gles/chains/hq4x/fs_blit.bin
 create mode 100644 bgfx/shaders/gles/chains/hq4x/fs_hq4x.bin
 create mode 100644 bgfx/shaders/gles/chains/hq4x/vs_blit.bin
 create mode 100644 bgfx/shaders/gles/chains/hq4x/vs_hq4x.bin
 create mode 100644 bgfx/shaders/glsl/chains/hq2x/fs_blit.bin
 create mode 100644 bgfx/shaders/glsl/chains/hq2x/fs_hq2x.bin
 create mode 100644 bgfx/shaders/glsl/chains/hq2x/vs_blit.bin
 create mode 100644 bgfx/shaders/glsl/chains/hq2x/vs_hq2x.bin
 create mode 100644 bgfx/shaders/glsl/chains/hq3x/fs_blit.bin
 create mode 100644 bgfx/shaders/glsl/chains/hq3x/fs_hq3x.bin
 create mode 100644 bgfx/shaders/glsl/chains/hq3x/vs_blit.bin
 create mode 100644 bgfx/shaders/glsl/chains/hq3x/vs_hq3x.bin
 create mode 100644 bgfx/shaders/glsl/chains/hq4x/fs_blit.bin
 create mode 100644 bgfx/shaders/glsl/chains/hq4x/fs_hq4x.bin
 create mode 100644 bgfx/shaders/glsl/chains/hq4x/vs_blit.bin
 create mode 100644 bgfx/shaders/glsl/chains/hq4x/vs_hq4x.bin
 create mode 100644 bgfx/shaders/metal/chains/hq2x/fs_blit.bin
 create mode 100644 bgfx/shaders/metal/chains/hq2x/fs_hq2x.bin
 create mode 100644 bgfx/shaders/metal/chains/hq2x/vs_blit.bin
 create mode 100644 bgfx/shaders/metal/chains/hq2x/vs_hq2x.bin
 create mode 100644 bgfx/shaders/metal/chains/hq3x/fs_blit.bin
 create mode 100644 bgfx/shaders/metal/chains/hq3x/fs_hq3x.bin
 create mode 100644 bgfx/shaders/metal/chains/hq3x/vs_blit.bin
 create mode 100644 bgfx/shaders/metal/chains/hq3x/vs_hq3x.bin
 create mode 100644 bgfx/shaders/metal/chains/hq4x/fs_blit.bin
 create mode 100644 bgfx/shaders/metal/chains/hq4x/fs_hq4x.bin
 create mode 100644 bgfx/shaders/metal/chains/hq4x/vs_blit.bin
 create mode 100644 bgfx/shaders/metal/chains/hq4x/vs_hq4x.bin
 create mode 100644 src/osd/modules/render/bgfx/shaders/chains/hq2x/fs_blit.sc
 create mode 100644 src/osd/modules/render/bgfx/shaders/chains/hq2x/fs_hq2x.sc
 create mode 100644 src/osd/modules/render/bgfx/shaders/chains/hq2x/varying.def.sc
 create mode 100644 src/osd/modules/render/bgfx/shaders/chains/hq2x/vs_blit.sc
 create mode 100644 src/osd/modules/render/bgfx/shaders/chains/hq2x/vs_hq2x.sc
 create mode 100644 src/osd/modules/render/bgfx/shaders/chains/hq3x/fs_blit.sc
 create mode 100644 src/osd/modules/render/bgfx/shaders/chains/hq3x/fs_hq3x.sc
 create mode 100644 src/osd/modules/render/bgfx/shaders/chains/hq3x/varying.def.sc
 create mode 100644 src/osd/modules/render/bgfx/shaders/chains/hq3x/vs_blit.sc
 create mode 100644 src/osd/modules/render/bgfx/shaders/chains/hq3x/vs_hq3x.sc
 create mode 100644 src/osd/modules/render/bgfx/shaders/chains/hq4x/fs_blit.sc
 create mode 100644 src/osd/modules/render/bgfx/shaders/chains/hq4x/fs_hq4x.sc
 create mode 100644 src/osd/modules/render/bgfx/shaders/chains/hq4x/varying.def.sc
 create mode 100644 src/osd/modules/render/bgfx/shaders/chains/hq4x/vs_blit.sc
 create mode 100644 src/osd/modules/render/bgfx/shaders/chains/hq4x/vs_hq4x.sc

diff --git a/artwork/bgfx/chains/hq2x.png b/artwork/bgfx/chains/hq2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..a49c0f484acac6dd1e1a7bcf5b82f27b19655645
GIT binary patch
literal 2793
zcmZve3p7;QAIJAGGVaKXZb@l0N)Lr}i95)Q{Od|8dPqVem5Riuq)c-TD)iEWEG|*%
zdL?do+@zUtNsp;?E9FsUjFG%&WZsW+XS)A?YyH={>#TkDS$plZ*KdEnzwc+AjDU?k
zrZ`I+0Kn9D?dr_{K)O%hWo)E-OTx-ny2&WQ&u2A2^-s~GlB>FvAL7;q9|pi=x_&?)
zFMpP95qrdU!y0Ul(To|+^DLzKfdJqVd{?j9n%FfO)_vucJN`wM+hW%`l^V@_)!HgO
z60EW|nfkc$tlx$$Lpf1U!hEigox>j7S^#cr^-5-~zin0DT=b`KL4x%@Hf4#>Xutn&
zL)(v=mG7ty>a|$e<7B?pT04aw6v)I=ljU>yu&p9`3UhN)<yMoWS8&F)%56QU89O^j
zurD&YDy1;jVjNzF*7lQX(M`&#TGWY^o&&dN-^v^(?r1ZmsDq|H?PuG<4o}c<bCeCd
z3=Fp`k-YpOv(g(`eYk1!qsz|VrUkS|-#Yq>0djLQ)0`C<&@MKA&3kVhn(An6s6Db=
zU6n20VOi4*%~+m~V?%4rq=~jJ*G{C#XP=bhh%+n;t)nz^7EURu`;TNN>@ZsOI&G4+
z56!a7%7eg?liuRM!K!SHbGkpEJ?w-{nXkf7zronjyN}y28uQnNw};11|9I*U>W}PJ
znizJz>I+u?q{?ZPK%bgRK5V_fW<vpIFm$<3foIs6rd|EPXU=;)=RDI0wg)jSnY~6a
za^p+RW&LFiZ?YDnviYE6eSSl5+D_Y^-eW!<ZcW&CMY~S)r@_t2o@TA9Xd+dbBdlX>
z3Urb5XUlz`%?Z>TtJLCr3!f@15P!h7j<~1M*56|Trx9%bs#A9v=rILUU7KpJ8FZDu
zl!w@rp76qC9hm3UbIAAEcsyeWs(zPzO}ub+0_^pnz&^Vyva0Vm{Zk}*0(qYreX!bL
z1+Ps0NpW07z_tglV9q+8i)B^qNiaPT$Airy;fl7oxT6YMs*-|@A2pB%jBsn_dV9As
zRq-BciWl83ZQC1KcK};syRIw$+Ntsriav2jBb|{F6ZD1qIn~*t)@ym0+19D!v`2nk
z=JsK47i9!^$4a}OD<JjEaXjw~eVKfA__Ck#vaa|M4zJ9bShuF<hUVni@>6frr&uH4
zRAdpxexgE@UH-s<*7b1C>&j4uQHm?B-RkCi9*^A(k7)x{GL+1!8%@LcOHB9{h-1RC
z%@@#L`LU{YR1yiawlSUwSED!Ynp_zcYhX6-(1V9B)>=^gqlRw|J|Zw|nOl}UlvH$@
zv&)7meVd&{Plm^bVUHTk)fG=4H2b>-R!))xFn(?0VKG-xAPSpl-e5(6&i9(!@?aNh
ze7ftCDkh(+6r^TorN`;1c)lf(Gdw~fdc}bz$Pg<UBZ8r$;dV<O!<%FeVqD)Sge%f+
zhxvS!7|WV|3dI&Yc1*0<%Q9+VLySNQN@QZX-h`Y+%Y+|Z4_p^DdGKBc_plPiwF6|Z
zWcZI<T+V$JZ080#+z;7xYbrL<f&IleLX`keYIfj0?nf7rR<@7QxE`Ib74ye{b~l7D
zb%ffNy7<zA?f0)Pym7RDzzqz;J<L`pd_Rg6W!uVPrL<-U2rbNCL2A>919(o!b?vs<
z%2^NQYj7KO_53ALZzQ(-s1@q3PL)CI%l?n4A*jzN?4tRhlw(lYN=DpNIxWyBjSb$K
zjHF|X^%EbsD)=5Ncz&W(Ob6YH`3g(5!H45ft3D8g=YJuCOP-|0Z2z;E#F<n9*f_B&
z1@p&s0#W{!u9I!GUcG5pv+p7<qJzV~%lEZFFM4A$Fr}<}x40XEb3ASE2<{DaN~Q2N
z8BvBH?sz0hGCmtyEled@VXN`%a~Q9O7qvZfaG4P9qSeUw`}#2m6`sk$(tag`6Erp?
zFCixJ92qzknwwE5rvuynijS7GnaFsE(-X)(dtgo{noCBC-O@crsjZNG7gc{Tsi>(+
z>A;!LkhqY2pAQ9T{t6{p)(&ZX1vO-3ZjY7r2$8du0tUc*5@*7_@m|5<;-&BoBF9Nv
zM+UhkX4iY}e5nYio@@}DFI6<SHrPiCO}*J&duy6ZZXGEgmJ8#Q#}_a+PdHv`6LhzK
zl|OrGxghE8!()vm+AG=(O@(jK4r$K2CpnWpy@u1#Hb3!}uIao+=9(CE2_t#rE?iv1
zOY3I0VqcuLs)Ji}O=u=1{NqWA&YbXJchQ=!kop}NDPsVi7AVw(gsAu|eCBlqgUFdd
zF<wmpE%iFhtS6v@Z*=aYU=l4<KL40OY=K5zGaQ?A2TnktuK4h!B+fKC2zrT)laP_m
zV|(xH9=`PDQ0@6WA#JA~rxcrnOXEAMDu%MlwRfgpO->bM#K=dJ;tkkSH!i5P;M9K(
z6VobTepNGVH=N85`AWL+FBP|9lLi=odX)C9;t`X$b_NK_#H2HTov5AWGV=NS76lj@
z7yrJ60xI*G#PvdqE$yYw8O#K<{$wWgTIRe7D8CV}K2MOB3>b#ydAG8_haL+))oz63
z1`+OrXDrBf*OtgRVh2uLK5~4wikqVKbA##yx<f9g46-uJ2ZzVjNRP^U8&oas>bEL`
za3rYD1G~J18bL!UK4Z4ucLe7&x7XJsIjvfi(QPZEal2(xI?k}WSs-%Rv_GZAq%r^4
zYvg!Xd0hQlXu@#NeLJS}Hn^6mzAW#P$Rup5F0HSn@MG`dU(2^CGskGClRBQcSiS4c
z$qJsY(*Hg0QQ$A*j(Rt|I==Ox-b}u!8<>5kd8lAy@M5_*;-0Z}M9}Z{iCf0^#0sS3
zl|kFk(fV|n=<LVDfaZ1TNJI3#b<NwQj~`9lyE)-_?%9tsg0r`}6mqvkY>?J$u)la9
zDpS^9E5H7^>>AaM@#NuEdggfH9p=X;yH*~A*<nc)oq4<cml;318fYr4l)_V~8Qk1p
zYS-$WaXx~LbtkgQh~wNVXDIT5P{tU$t8bB?B=@<qJU5SuTX@fiCyr7SKE+nU6y%s<
zE@c8bKY)?bmERicd)OO|(6n*WS#%J4iNG&ug%T-<vjE)9BUlSS!goqoa5D8t{8Ot(
z>^DqI!&W=sIq$jHi3}Yp<RJo3+I0?7G*m_h%v~4Qi|}4qPBXE5Jstwe-+L%-k&&bF
zFrwEptVsHQeAv%+qRHnnVkn5`WF|wG0=|O)XeaX#zb#KYEcjh2gM)Rjp6w&a=-njD
z+?NpX0!aZ}$4ugWA#y&lK${Rl{@xRu%XHw=$9>0@i#44wRArfFFr!#jQuxGwolV5`
z7RQ(F=Xkuro(HWbMIS~8)E3eZd{E^#)aR$1^@UnT)eMXD*&b|Z(6qf{Z;Hc{s&l`X
zeT$^A3j04mHrim#6kr(<yF8n~Pbcf!u{xmpkQK|3M8YmVO;|dg1Oy?-Q~fU2-fw!3
zN1*=&bt)Mt5ySExWExgvqyWq)J-ZN_Z<_Om=-}liuDnR|>;^RnmP<X|l4(W*Tv-W0
g&4CU7r4A9i?S@V3y%3_e?xz&^uGzTyu6KCK-xjk}!vFvP

literal 0
HcmV?d00001

diff --git a/artwork/bgfx/chains/hq3x.png b/artwork/bgfx/chains/hq3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..6f5eb59c3f919354e5c8c421934f2b215eeb8f4b
GIT binary patch
literal 4665
zcmb_g2{=^!zt<Q{Bqm!(7?q{6WGmZD8ZU)rguE$@w2`E|Qr6Q@maz<#Xq}NPEutc?
zER(FECPhNB?=&-nF>~ged%X9)_kZtm|Mz+R&wcK5p0oXazvrCq^ZkB5%Q;Ep{f@HI
zYSLn2VzPUkhzG>PRw0*S=@?1mIDWh=135|hIXe=?;FXP8U2p>#S$*E=&>v!AG72mE
zDzQ8F)+2*bp?h5&q<%;$Dw<)`B(6hZV%WyL#N8g3duDz5zUFGJaXCwmhMW2x7(}je
zb8#TYfKP7RHPn>dljwQ1n`-U11?OiGzvhOv_st~P3~h^FQ?vcBNN11Dw_-QPui2?4
zjju<uf~@<Y`V%SP)rmhiicz(ZF0-!WB)$tVnpIDU!Cwt#b&*62k-)ADR-?4&L+cVu
zin9ia8=i{x@CpQ+4?q#$eO|Lp(-yW}mRkVY5&_Nv;}4PGat}lE<FQRU40E227KjV}
zWVbi`z@{F6w@lfOW;FjIZiAlx2u<Smd=+>p0Gpu?i;FS%_+pW}Ks}kVWTXoZ4UY$U
z@H*Q7>6&waZJKZbzGmw%OBH^=!)L=2{CPh~0x`tvSl7T%+EAy_PaEQiwrTUvLQ%=N
z6BC{EUorS9!Q{{3sUVpj8t0{IIuxv{^lJDY7V>y`Md4us53*gktllnO>scnc<|FKz
zZ7m0A<?mmP9%c_`s>4U49<ysLiQ52`FR$v%qiluxnQ$4eQzU!>JnQ$Zu6(q>>0A2o
z{JR6_2hEj}9^%{UqSq!13}3*p<HH5~Uh9*N#5k3@BWVlpWWzJw7m@W;z#~i5uErz#
zCt2BxOAJEUJYWW0UoH=tneRHz<+Vgc(Ho6|5`!IGas@6GPy{D3xY%~Tv(6gH%7?b@
zoRLUQTHwj(CFgKd=DV(g((q)Tr%2Zm&r$<ESnV4s#!vP%u%hhc?vf6tGIqp0zGk#g
z!6$jfkc^b;{O++>rkmJe2ZX%UN2DH|qC$L9pqREWB7vOWzdBh+;*?hDJ@vX%2)7$G
z_t;w&F`ajr+f`d|t3#?MNusNG%CDI2>bfrx8{!3BOZ2f`c<u6~<o?Pzqd=K;$%X|G
zL3BUs8f6nKo>BKIQ1a#c0Ee*c>!yy2zVmPlJ8*3)J3wXNxy9#239YRKFV7g9<V{!e
z4j=CPXs*eq${Y?K%h|YVD<lYJWP19K;CFapZZ7a+P^RM2<3_7lx_(POwM+QNx@vu8
z#%Fz;gE?<}W>6c-Y%kU7kgoLbD^4-EU$zfySAd&J*)>OIxA!g8rc%n=7fVB`VzX?a
z9|~52QlI-dBep==5PPA@c8?pWlQS0*Z~o?p(DZeY>iRFjer(k8hVQb4xiw3t^MA09
zE*uZv9%6t^%x?2fw90q5Z3}P5eJmwa3{n*E4M1|@@n#oMR+#e={x|eG*aIYkMM624
zH4RV9+`sx;<RxvNvG9FcIcmu-qu{;uaho5kXSL1W4;<u7JywFUsq824hPQBGh-3Y6
zCLGCY!qhDG(->P*@ZG<&T8?NzYW%qgqiZY+h~WgvbtSywCKRiRb#5BEg7HvcZO7_m
zCH^6SOQ*x4eHTq|<mNZYLLreEE<9mau+Aie7bs6X0CFAxeev?=y@%s4=(t*%dLp4h
ze4@{D+(%uWN<gEqg(<)ZX$jmX+eE_YQB5K<8CkJpu`>6t3W~#QBKgTvW9XP)+$6Ni
z%R1w%?sMM8?N4<hY_jp1TZY`?>Dfuyv!`}dUTmmvNxSSjv4D%PyPZ&*S|jAG*&|&u
zaPjPsr(eR(;p|M?r_1V3@8^~G-xcD8?|;RtpZSwp%KqqbLI|slL5tNXjP0zW#Nq5%
z_O`>1l^LU)b8l;!f)|%~r7WOsXEtz2Y5j2^%`n7ES(+uvVMUA$4rj@X;8lT5`5!Od
zy`6Gcyu5BaY$Vm7msAlWP?>iWuywGevUT_13)%CW7Em=iKEr>*3|}Pd!oJW*7{B4a
zo<86VkBiwc&Rqnz)eP)~zS(EGqYaAuUwUElEn-{-3oK$};c979)&rnO*~1sqEE*~v
zrMO_7*ptc~6rA@bdC^)$9Ik=8XCaRpeWz%_)RlL*iDe0UCFAokrJ2AUn@+|?ydsr}
z>A=B`!wER~M1t}9XV-08u_kHV#ls1S1m~%e$MFp7wasuik$HVN0Y|QfCsYXN*p;;^
zNF{y-X`!eXVz@{Os}~4LW2rm5ui(=08bx_dpY5@Q`8c+b0qPnz2ZM%(Xap1B#w7m1
z1mhvbLmk+b$i`bh+~RTgrvC4iTa(lAc{gS79;9>L-5DYLqYW9A>?y?(i<rV1MY|8A
zuDsJa;HzONyX{lubHV<Q_C1ZiLca<+sz@V`kE=EGUkT+ZsL~9Bp%U1_XUIGOZDj&$
zp?tm*&~M7A7&K0PbOGt3XFPH2gcXh8ea!LZX>Wa0(6FW#+IyN6P>30!XZ?h4;nM4i
zm8iFPY|9iI2dx7%n~vYHdTE@kD6As2#Q;^IAEIIq=y3hCZ%dTNU)8`mm6tCG^OTMq
z80r$WzGw0MJMWWW=W)CQrQCds4v?|_+iULqyCkT%qu;grE?KF$jKgV;aY6bhpP&9E
zl?JFx_tN)E_?M|=qbw=-IgM~w6r6+cxQmg%$*&1JUf1qhA-*$ce8As$gKT_mZHtic
z3}fcwf6C!l*;U5-d+#zLbZsVp1W?lr{p6g)JnJ_!O%R8<d1+P07S!f%g4PQUFE#@&
zK%wcASR(TgSRhXgW$i{ATo9MS`Y%jIWaicmiHe=kv@zI79~I!2#4>NU$NI~_X|&%q
z4<{hm{H}4yCu8J4sN&fOb_?J|D&jV|MBTUoyN#wLHW6UwrecwElV+W+`n1<=^#+y-
zWuwTv306pg2L<PqA%d!7+^p{ZLJ^m-t08UzT#N*bj_dnIK(}bT4X~CXYOMg?fCIe5
zwT0$TF`?6-m#IAUqq#ga9X_zUblO7;mG?tzH@aoV%EEP3UzDhedQ%-_bWbCTfs<FI
ztSx+vOLwE$<iEg?H}rd<hlmbZf`cQfg*iAfroU!hr0u}`OxqHvbnMJ<lVZ%7;Vy3f
zQ{(yR<*qZkB^u#&1IQa{P^A94cW(Fn1(iAvTa~|IC5p2wVg%6ot)S{<mN#hPz$^mQ
zhaN+}_()4SFqN0tbWIu|ZysN5@Xog+QY}pqsbVug1xbN3JJp_*AW6mbA*ebNk%K86
zl3PJlGjJPJpkhj4NeqsBYtX;sjbmJcP|ktbYA|)=G0aT>JRO)v9Pan<FLChTAZzSj
zfe(@SPvJ8l2dfMJ&Nd2*SvE?C15!1J%y$qOO$$Xr-#$nAfPkorfVPL6M;RC*Q)Eey
zr@maXQWZ2O)IqDL<ha~c<|!JXm*1pBomm=#*fBwh)J<#M(05vUX@oi3BFu<T_|Ji4
zI~$rWlUas)Z)$wf?g_?S9bu+Ny}d%wXPU7-ZyFjMp+uEV?JtD$<{7cYy=wDK_(Dvn
zGUX#*vkeFZll4)9{>IkopJpiw{>JxV>y5In^D&B6cb<lUopi~{r?^iyZb|KupSAur
zSn+b<rEW|u=O6xtC4t06V)iWK)!=R#Az}?!^jeul_#6+Uw-nmBKgR>s+}SdzzrlBn
zyJwa~s&8udU7$<0YU46@s%^`{NH{Q?RZaxu<kp;qmVyln8Vl&MUdI)*W7khnpx5m`
zf;LsV=85)1SNcJ8J=FW2*!qX9?|ZNP)QFDoVi@dv^P$VNH$3ca#jE6quvDFQIwi{h
zYkYQMR5y{3vFc`~`yunpkgX5tbkdKO3kDgFDDOF^Pb#S`(_NH47bxe=?k2{`U$O!F
zMBE-H#wucgyrnM6Rpr2yxyYOL-&@X`t#^FDbdD%8?1ESr?WpCp2GSN(cka!ZhM6q)
zq@6bi)Jq+i2hAQQ;RhchPNMlT;uoS}!vTsk!xlCN&0#W_yx5Wg{PH*S+o9tMi$V<<
zSJ}^Pcws2whEuy(b*`1;i%tTzA-wJR(c9zD^(p-AHBpO=MpCS7B=?C@&Ne17hu-VB
zK+hj|57Jfn&jjpMAl={+(MD3hQUOv10^uTl#XJ6u)P<*Q5<|sQBRb?wvk9?1+W?=B
z-YEkxQ*vt;6)q6aPm=p@VQxCtSD>)XO<f$bEFF|abi(pQfPpa!rsToE&+*2C0~<j#
zB2y8r9H*3Pqwjs?YoTg=ONJzIWNnZv)Izz*YpygdRE1lEIEjyVM8qur7BP=8djtYR
zrg)eIws0PBvP-`?TX4ZWy(VjJB44{PChnwFZtISo#;T(?qHdjaxE$hb5><OwXi9k-
zz;Em4x9LMeTcKC|)0^Q3iG&tPn%`%B4?dnl?>e%7n$@@@dNm*X-qOCx<jppgy^!t&
zdw%=?uLWy=#;OPOd%hgq<2qist>v{w-6BWSY9vRTQMh2`Sj}r)bgx;8*xS7><Y;j&
z|1~_xk1gM(;_<H<frJ2o`!P@UwL~WqkQ}WKlB0^a|1bf+OnG~-m=%-*W-)q*dLlAv
zpqeHrZpRHyk#j&Y#l(~z`>*;*zAZC3Mr79U0np!A4>e03S*_nwdH~(?j+Kie>p_U9
z_B#I2>4mn6M<{C_O|Pf_gn+IqD9}T7HfqWY&C^ry;Pf*7r1aMhEx6Cd%lPkP+Y0^5
zjxB?cN{)#;p1Qy7;pYer@N@XygA5Hk7f?W0h>WmLuFN$uI=0qV#Y~=hMGjOSMj|I_
z>7jzw|BoV0thY-fgrZ@R0V?3yokO?tQ*oaxpbHMnGN{}GEl?}2hYIQ$_kn`9Izv`(
zzVE~8Ng%3#+oFfc^gxHWj~IG<rES`gXPEbYBczf@4cYv8peeWZwIbE<lG!&OC2EU)
z&xlYnJmLFXe;nY2$OKeQMn7@AigcW0<qL%6?fE&27tDUYyhzQhJ#Y4n;f1~<DHsSl
z+QGipdTm^N6i&pEFIrn8W+tQJ4^U$cm<Ho89#i&+lgP4Bd$y<u&cHHc4{Y;Mm)0GY
z9!NphZX?}OfQ$n(7t-ftxsRCa%V;t?i0(;XC(#Ix6vO{S)G!G2qY+50DN|NU2X#(9
z`1z;v|C6K__Xij{qMwvWuLk&aaJ`S1Jk_^EsFp}rVbM4Yad*^;Rtx57#$O0=|6S6p
zo8)lh$1<x|fV#Ht3R`*eLX1-djS#7Lai+oRAl6?Uj-e6sd8fzw^|?ETQrkxlBDee+
zT)JmR(pFSA`%p%c5t3c$K?QYzJEFcyu8RimIvVNvU`J!|Aj|96Sl4`UXRLGzoa+ge
zt%%6vuD*^{2md9YFf<X(elml)vf@#?5Q61Wf#YC7(u{c1>+YR*G4_XO#`j#&CWna3
zpG?Nm{;(-U?*3(p7rLeQx1V}n_OEb`7D^koM9lL(AE%vaGXvt>U`^Su1+Oa)X#_{b
zi{69%Zdknr);*k@zQe{d&oH5D5C~){x-A+^bu_Xf;Xygr94>IFeRJs0i5GurtHcx@
zRd##x>0x6PO^0~9Q{Ok}KcUV})8w;~5F{f-XoObCaOJ&!!3SQ0)jNV@It@R!;ybif
rCjR>7s=tQDeX5nxLcY0%V5uPSH=vYzggf$+M{KXde&Ta`-`IZxzg{uP

literal 0
HcmV?d00001

diff --git a/artwork/bgfx/chains/hq4x.png b/artwork/bgfx/chains/hq4x.png
new file mode 100644
index 0000000000000000000000000000000000000000..18abeb31023c5cddb9a17aae23fe60d39b87b2c3
GIT binary patch
literal 11913
zcma)?2~-o=w)ZPWi31oMkU>mTT2WC@QPIYvP*GG=9J&QX4TuVg3WAD4NKkA>Au1x`
z6p&WzR*Z^(2qYkri~&(bA&@W%frKHckV@4%(6{fs-}l~q>n)c_R;ubyIcJ~${_X#+
z@V$HNbfy|jg&;_0$9CKO5JUhU3D9IM@OH%K#VPQnb==<07Q)B=CFCT>fN!RFZ$IP<
zLDOc9{U<;V9vOfyNf&qQ-b!lGnmv1sp?BIlZ3vnV?XcbS%aumy(YD%`OSB&aN!5b>
zmZ=TYpoLGbyPOjg`6`%YX|9tKXWxzYn6z+0bpoNn2%2*;#qdGmipfy*7Po!T((uRU
zj!^ChNdYN&_u>?55om!+Y%6i%9$B8fdIj^i`&?Q0ymd+0nx(8IFE^u`i1*yVi=9+7
zDEP`>hdHVkMz|6B08x6drwdM@8R>BAGlf62bkeO!PQ>{x`%c*q=4;)DmN3$*jOMQm
z+Q4j?;14Y@H~a88MVbeBK>G~o*Py8*1Q)IK=Wz=E<(Y6Hv=cS8DU_NzlJXn$)8Inh
zTT`3gu>Jc~FEq|rTw`4kz6`gQux~oV1g7Ab3d>>dTD(y%TFr9H{(5Y|$8F*soU~X8
z_wfZ0xe>XEyH?(FSsq3>?xeNqy^q!|U&Hf*6I%N=K`t7R4>LWYK4cIQn@;`}fo3v)
z?iCbw8L)@z2{@IxXan;VkA`OA8|kx-<G1rHy4gSU+57F8`|;M^vNm<2x==8YEA4~-
z_!AQrzzTLcqku}%2$SW$a$a$<3)2MMdu>%-sV4YZMT=viyi{{?%f$K%8!Dv+BF6~A
ztc4DI%onNo{_N(8LQe5_J)}=7UA|<x&D%hI>?8IJ|LBJEBm>)eZjukqkI*>C^=vdK
zuh38FEYrKGgM~H}7(Ed4f|m0q#d{0fQD4nmS#pDUrUUtf$}wW;t_=qo?&Reruxog_
z>US@FChIviawewlGO*c-;BASJO--4$wo%*jp~N?u{-LGxh`trQJy!NJ^52DA|82y+
z{s6*1a@_0CmfP1(K9HB_L|J0ow_Z`~NIXaEwX(Z}zYuGZn*J<hcOYJdf>kZ0ExhUI
zvTM)R?pPx1{pr|5^zD(HUz*4e=GsCsZh%)Ew)H%i<)M6=Qz4FPoI7eIJrvjRMUjm7
zs`uR>2jSODnU3^cc21xt+Jp|w!cDi?CyTjWcv9Zj!meYvXMbfmZM&U3<tOyyWy`NM
z0}h+xKZVI~jB|}-lQ_lKu<w*f>yDwuA*%bjJZr?ZJW^4<?nnfc7w9QJfcqkl1I}OK
zE=#R@g1c;7x-8Wze>zKu!4a@!^|W#VdtYU%qnfRY&txuqqR4$s=`2Dlp9Th8`RTnL
z{#wHg$9>7vtLTCPlc=&Ioz3cXXP4PrxhA{WnV`Sq>}^Q5$U|%M^?<efoj<ZBFbD{#
z(6v%4NWL4%96f;Z`q;snPTzF3k7OInZacZng~avBCo9#3u<cPhxqG_|-{kv2WQk>B
z^I|qE&VgZK{fFg;TC#Y^;eZaocAQyEZysFx!~3_HYN_InW<^xFi}r(+Mj7nIE48Fr
za}zu=R0i=G&fB#+TAI%{<?lg!WnF{bt@wR8`?Lc*3ujklzk_eW+kcCluxk0st%v5d
zHuVIODg?6XKik%0yMj7YyAuXaD*b}Y!(cnFnQ?5=r`LE1g%F>2F@^S=mQXT%_Okb|
z^`;w|F3$%!SC?7i(Q@gjoB+QrN`zdjxSPhc(rg-~$T-EYWAQ$mW-~c(WLO$iW+y*T
z(=NFu!JnQpn%YN&j_ot1x@12UbjXGHv#vag+-g0=DR<tR<jiS;k)28(a(O^4o3tWe
zzcs5{;P{Rk)jM7KxoxeIEty#E(R<?{S}2sqBc{j#?DWPj!W(MgHax$#Q~$oi-=3Ga
z7J9DIN6s_9jp`jKSKuo@)ctzJaMJZj>t<~8w#4qEUkWZI2W~tyy7SWLgy&_w-+k1j
zQxfLD-!m%Y89Q>!G5Ni7QM4D{qIJdW=pN6&^d+f9_D=%-4Au*(Ra-`^(r*fm?Oo!R
zyV*7K^y>M}#|1-#R6n&|+CXCbmP2}@%GI`KcwXfgrGHYuR~U<YrMju9mZ|OK8S`Tr
z;|k#DONY&|#MQQkEkgxEQ4+)qu4u>h&t^~C(zAa3JL+)tx+?K}o6uP&9%|O?9dfW=
z)5zNVYK7{z3%r}J9+$Pp9bTk(A51guYdel!k<2QsWrvcS4)ATCNJpyY$jF7TV<?R|
z@prB30r9Q$hxf`Hm${+^m-E{w$8@xZrgC%%8khTyNEv?`$;ooUvUwy-=fvn_pHXY$
z^hZ6VD}GT^qy~aNu0`a^<1AJbKhm;F9o5@>v7hNT#jlFx*S=2kEWRwHc|rAzqE5bQ
z8LMthh1R}6yK@^O@M=<Y0JllYz)AyYGuPmT*1JOI)poGW(4Ot<y!!p_|8kM5G@b6I
z@tvULi{kP{c)~A;U&uk+WmozG)xZQl@q|Y?@6V)KJ(ucd>j^HAJf5CgoP~eacgPIL
zp5>a-XzJkBcVA5@z7)EyQ?^U8<*sbnBXeGAnY7RHQGhI8BdH53D&p=a%f=>kp)J<x
zzUl7rE;dKvWw-O-#mlr7edVQ<RSyomolc5Ke)nZgL}F}6TAxDuLVSE!{Pv}}Mz?mC
z{tg**-)?Sj>nPjXS`7_+B41g`I!jJ+HHch2JKyNKE3WvJP^-J0kVG)%&NW~L5R^_w
zmnx$j2i^;`*q@qm9n=;IxX51mP%S#=<K(I3lzJif!m=%v!HEg3+qBH0wyMmTUs`YH
zMcWtu{(h2EUaooR?}je5Rplm@?~9%q7c=bS<dZ4qT1C#M=8GlHmj!c@WjpdaWi^<+
zyauaT%RDZmwzQiJ$mQoqbYC;NB%2a+uDwQ?+qDy2fs2}1Z}B7Q<1|Qs7tWz(25}sg
z{Tz9u%+9OG-9flf7z!7Nz7ahN;6Z#ZIf&Pf6X`4pRoUkFgJ3)YPalTN6@tBFsCgKw
zl*zY}TMwg`G<7|M_d{|4gFL?oAM%H;!LKGKBcHF)18Vttg2I*_!hPACR%5DQ2HZN5
z%l1<jV!_g0q@YXnIjpa;K0}<*z#D<~mLz)>lCK2H#_!NcZ92&8%~ejfZ%9$w)1U_`
z1cGgBr|}1~721p!#dGC^*6?1L??~v7(yvvJiko1x-xhUFD}Re~Z&3S{pBzLZU1IhK
zBK(H`)R*os4B3(srt!N8H(o?iY#h~F=z?y7aU;(mk;$dx2FmqmLBYO{2HJwXsIjwY
zK_==I?CHXnJ5cZoS3*xox279Z6JMML*Q`-+!HXCS!m&u`CX@^3ptCHhiQUK9xm{oo
zQ5ErnCH9o`ril$Ur#>Bt&gmw!4)hYf>#?hex-_Vo=%EVgCcIKwKPBl}M1i}~VSu@8
zjidw(2=>#{<x9644+NSg1qr7UHOH@?TsTiIXM{YjtrdqFFF6wCb>C$s)9ul@DOC1}
zr&TP^M;0N?tT(pgpe^RvFEk<HdlN~r)t2<kDIpV{StOHm`vBfhOx5fNILsbFv`*-R
zrG-S5RmkCR2cxs~^X^-;N#-hZ<F$06%PyeGVQBMIZs@7$D6{w7tjC{Bbvz9Yp!UPi
z@>#!O2aN8;Zx@)sXd~Yo_UEFqE){Y?UGi;TtcVhi4n9-drVt)?3?=OoCalF)V9H2%
z-=7@s%jkM0?a_$fGMW_pWSaqOuRa0)i9X71HwpgrzN~p-mrs(Z**tex9@TZ?M*oh9
z0rYoMm8+;bmgQv(VN*6D)8AIlxu8$QF34t5-8CGUY4$R7c$bVo&!r2pipiusUW0<4
zu_#O#4qMjK*1Q~{7VtH`=!%=PG0b4J)fJ04+>>bNF;&|E{)P8FZ`wpT#*UZC^^u&M
z-vpNg`t(zoD^lyH@~7a<7=T2ciYy>IXe`17k55A9l>#Sn!djSlhVhV^W5+^LRo@;{
zg0^}HPU>_xT;)~{P@YVgT`xofAILpb=nTwIU5jKOA~Q@Y_(`9qYPdl$>#;)MgJ#?m
z8F-z<U!yXQa!!j0j2hwD6q_a7ih=VnsmMuxi1|P$DBxuPSbB&Dit&Q=k0bu<sOf6N
zJ!D|&GNMF=1FLC4!$-TaR8@9}vvQ!*4cEgb;nwod7H0SGiR$|({^rs;u@3UVfNfh&
zvhpexG_mt6A_X<XmDD!8uA4CYnauS9v5W3ReJ3ucCL%LwK@?S+aF?ztzSJKQQSl@5
zo|5MKL%ZX;31Ji)a}dRQ(P_*5p%rz>-2`UuL~xAplvD+7zldZ@ZnYD07flYQK&-_u
zGyUpQlFU*r{I<X!3iVtw7U@AD<S<IEzre&Fl7HDg3^mH&E#y`d$S{x%FsT6xKnQam
zE*DGuN*owrRM~!XKMl&qq@D%IRGm4h1`v%tQeGZcwob+wh9(?4Bl?b?kICPeU&KWB
zPG>Sb?%&Sa>9&tQSJY8U>y&J<<djz#Mfw=yG#ZrR8h<Uc=qYm!cg@-9YzK0Xr6ySv
z&oxFW(H}FY_!=&sMECnNE=4iY7)>{U8o11H==RlE?#3)CUz>UkS=M^CRUiE9H2gYl
zB@gwJ-yRn`M!ST)5X<NxbQ2<e*?Z{S)Y8W~lZ}50T2Aq{aE-c@`k6R?i#GAHduIHS
z`hdbk2W|K6edFSR&#dz=da9Te?|eO*EUNcKv@@<vHGT8A;NhWGGato7-MrWUF>#}c
zo6nPrY*H6u4={W&dIuqU9}feomo*q;^3K|g?Zp~Nqd?14!zl=XN5-<6EEH5v3xA+b
z^O5nT8~ZR%2BtSvqfxbi8_tk`!}ai&;f$etB3PobF`-L>!1Dg=0;K1;2CQd28@z;p
z^8_2gy61w`KkER7Y;7FM7=ik40?q4Fh}tHqzWr;&@jteL3Kn^UWj73opWW^zyl;!7
z<i-kt&bBUrnFa0{S|?&wU&S<$Q);`C$xJj(=*8Azmy#L((6I0B_QMmuC_+cYs4T!A
zGWKcPDz(~mV=65;?obBYURv2hn27&J^&;!I)i0_t`~TFdwF$2(zsB{7pKL1Mk#AHq
z8=pyo%4`$yyCEkRf1wTKJ11KNeJ~z;%aisFCdIXfit_D}D4QBtzjS8UEfz4NG?!UQ
zse;kNHpd)C88dM==7T;@jWCUy7@CUJMYAtf)qIYkrlnDj4&DyeyY}twwY&FSmghO?
zs%Pz=A9C=CyREO`X_n7UW#viaY%{+xmZS@}QBU3#+j*YkIJj$+h_Qr2v2Mj9Ez_PO
zBq4GC|5z$^ev=u&srb1__7n^~QZzW)QGOnG7gN=6lZBWQjCIu@nMj?4TSweJl%Kj_
zP(4F$V24<}bGKbWGR@P1esKzGW9RE!cdIuQ$77P~`P0}(@h|M=w|Jf0FX>_t$xOEp
zOGc(zuHrZ2hnaqYNsPSuR`#EyT-UTac^UI(^($|(U$cp<KS{d%!XrVEL;1;yG*xv#
zd#G0lkAH@JlBH&{R8!R{Xup+;F&96G2NZ~0s$v2?@oV+hyWiun62V&5LrK?BRa^D_
zap_#kih8oinHA9FA&3`g7UP~0(GNBUfmiKGetK9fye|Js>59BOQSFzGukBa7>v@G(
zW{-Yv%ZH(<yYH7B`>?j7Y^cagq=ViiYaX5ZFdIImt`#R^U9uT7XmdKWu}-sr6?op2
z{lA<Nh0H^rXxOvar~IaCHaz|%tke)agOkOK>kb7ql=^Qm*)Mq<*dlsq)sgZ-fhU++
z{CmC~MUX^++9rLnd=PwW{)-nIw^{1W{Qgq@>wb|Q5<N}#SbA3R5y?Zq9LX4?0oMxl
znSB~2xb3|W7oRzG1Cy@<e;4c_=T>|BBH-=v2>T@)Y#{WkY=u8W8_e%&%3vFr$})+>
zfTK8p%9WlcQ-|^@upR5(H{yFxeA7@Ve<jv5qW^=yJcA0rCI$(|a#lfkSIb}rVuN_E
zw0(URuO6`nD!b1JPnCP72{r<auDTpf0YK3%20OUW@;=yzN4Nl3%z3_LQZv(_!>Bjl
z3qIKFV7Msq{io6EqOFh4OE9snNe`XY9=!s<PQYj);(Y7Sv&j}W@sp0lNY^klol9Vj
zF%Bwg=xp$$JD;&y)87_73`M_YM6h2^_w>??`bDw#kQ1b;*)qU<HLVTZAq#0x%Q3+m
zAQ*U%aWBCog|xTY8h%aME7MLmLUxhIgB+IRK5>#iloc=rLPzsJ`slb<*U)iUVOU8+
z+E~35^b9TN`r6!pVQAe@s{Wwd?y@`Q*8;nNJ6yglaEXv-{*bejGn6{eLuhYg1Pi`l
zLG0g2y0VW-!7Q3vis33Me3wY28l5`v=8Mza0l+X6!@ds}n?SxGuJrWiylq%IG?eT!
zdn`*xzu1ct-!4%WiE4<gyYSsY=+z{(=JQkI_U+Ge_V16Du1L^=i6QUam1qmx*o#=<
z8VY9JC~D#-<HvC;Y2*m>JW!@J&d@tpgUjgtmh=Gs&Z~5E0rr|=V}jkrLqTf4gi~em
zA>;#Du%F!e0>6+z@_vi|<_~p0CwYf(z^c`WdA%TV5*~AKjX$&s1KWBs>biA(i7D4T
zafsQe?i1u_j$0@Wsr@=k9YoeFXV!?9m!Li}uoi1r3TH~VHRZ)5gs||iEcU`7*6>WG
z^4Q4F=n+jDs+orj^x<J_2iI`b1m8Z~v@KMfBTLd}K9mdm(XJot*A9f`{eV5Y2^aG~
zYS6s|Q1%Slk9DP*cncY*19unKNIeQN$6SBNuNXgz0(tiU`2+GF1}yRD^`>Fyu=zOH
z+6+UwG-sJZHVCyyO@*p0IeHE)h#QTc1R3T1KZfAy;%4A<kLINDpncCIY$byW8ymqN
z!a|P?Lvt8!;OC?_@l^gTA$I)w?!g)Xlclyq4zQ5T%>0Qlt#c)3h4107`dy)8i*{?8
z#TkL?!e6=x+2tQK*S^Hn5GN~E9XrE`(ZGe&f<;Uw@tsz|;rybGPJ~-vs<W<ddU>2o
zt^*Mlr$|991<+vr@3N~Now>pcbL;A*OpjCf_r-v6T;i7ubHBVPw;cr%R;Re6s#dp$
z!dwRJ9K39($s~rsFJhSq)JFj`3clfVd2$Iq4L9afDn}XCn6o5<#uA%`6zpZ~IW~AZ
zZ`m&7{B_^V>X_K*R4!8FyLxkR=qaJy!8X2M#8i2Tg&DMQ3ftDX;3yL*&a-De8i7A?
zWq-<QEb~YRq(=KGu<`nw68r~ZH7YX2%3YM--`28q)e50JW2ItDY}vmtsBD;ZPfqpk
z2z5{uRX@)UVJm%pX`s1S&=qsATFo&ePmoJ0M&D+%3Yzdn1Ye6cPnqd<0Jj%=xf=#G
zX)J1q9u;J6V_m1+z-=mjkzn*sO{_{fr0Ov1%NWcOwX@Hm&YFQ4z?pJTq-aRTr#-E~
z9Ha4C<Xkk@uOrmXjWrB#vJP4651ms<&n0ONvXogUFN*yVrvak%_~QV6XeC7lWYNE_
z>7ur6p|*K73m$Sbj;KC5P(bw`O00?5>NbdP;nTeGiVG2w<Ma<#t+8fo8tV`W$XhiT
z7i=3>GNu{?qNA8=0thsh+z|>}ZUXEg3J2OW4xi6K)nZGYuMdi@B~S7|NOp{Zvd-)A
z7@mX<=6f+g)UkfT4qd+mh<FbRIXeUnxQn?jw*c*{^LR=EF`nB42-ZeX65CDKWp4wb
zHXqlf1q}(k`wPKVsYUyKV=8V3o`2V(>M=uxlMYFMk6kI`CzEb@vURY7Y9e-<Vw2n3
zf}6LkGSitmB;T?@CQtlFjenjQ=d8TXAy;f%z2)?=dr1foG!LCJ?Tu^ZbhID<h#vI_
z+K#G9YL+US24AuR)P=|Td=-WM&=U?l_ND4`cBuoOCBC|d-YEMuw;|V}iin&61%a2C
zJRmj!B$kE<J{RM*s8<cKia7g^gm)+O?pn{)UB4YVw6XQrC!^j|w@Ef323mcUK9>95
zC?o7&g(W1o<W*sdUXR?|Dm7hgx?`BmbQ4MhS2~I9GQAA}6T(_cY4QODLsllU7sI*X
z3s^Vsfl`Mjd_OcD{UK^$z13I00_AQPC1|Xi{p*8YE|{xI1@{gW>~5AdNO0iho+<2r
zD4-#f+-5mE7p^9*Hv+^NMA4Y~L&=^1EANdjU+Y6tkS1=SGQgX1!2l>&(!uvEP)5uW
zvkMpbLn#4&l^XZPN^!7O&T5c0rH0X<LZ=5`;ZSl<v5+v~d7aOTPY$9(`m@g7;bI*_
zP24>0V7|V1?&A9sMFz?S6FPtGjoaay)hQSF2G6&$5Re+CXUd)`<}Tj6fWEZ#<SC}l
ztn#~5I;f{nj(mT>qdt5oHs2h;=dHE#YmL^KTNUF!(bwE`jkDq1;CMj>D^H)(?^ut4
zRg_8D<KnXGMhsF_9<r)XU`x(jy{{X7<{BS<QHaXsR0UhJH^y$EE7AgwvWD*f7)Crk
z^Y-ky=XM6p{Q1wpak2UO1k&sBBX=Yzyi|-cfVf_w7E$;r`ff!U*3~Gi%0GmA7PHHc
zDEWSM;iyRq$6WQfAR_lnsm;#uPR8fc55_tfgBwjAlx-i1Iq=cXJm0-n@$L1-AY{sB
zJ=Xh!3glufn<HF>b-yKIg7pVHBe((LtYBElEq34B2d_pZX&f|Shcn?0KSbF^$0Y8G
zq;qnMJTAA)Nhvwng2yApm{1XkND^?>8kRXWf^>~QUr^cEFqCCm7;p#S@2{EBeOlNU
zNj`d=%E>g7Z8!kWZt`p6^)g0z)(ZS*?EKwI#AVXcdVDs+b#YOKnh`nBpV4Y&Fc)=D
zDe?qL6_*FMdZl@FPB`+2N>AfejF-|4=#P6N!w;W@xgOf0I?$3llojeeVUptB+S!IT
z(0*Ul5s*F<DRM8lz!BBaqBS@cu(LF_$r_$9zCvPE<lF!}jg3Y_Ny^V;L6Jq8)tYM4
zn85~c<#?B&3++#2*5dwSg}n-hufxrIdkSF@W*3a7Nd)K6$}4|p-uQQX{JQXAWdxi*
z!7r4ILrd1Ung_Ji-n9_U<uR>f2k67T>23SbD^ll3?kG2(bY)bzbwjW~RT@ynUioBp
zY(s`CN#KrC3%L!Cw~&!YA1y&69*o4b&XT_;T^{*q;76}S80j{3jlQpZpb<<ptd!j@
z9(Y0eyQ469*)mSG_Kk_kGtAhpev|m6Ut#_f*pdAMkJWgsToQG`KV_gYOHf|^>*uzi
zb4VL@iOK8|Wuc-!+0Nu#p%#Z)3d{i!cKXq6!<(CCZIdX36N?hkOnqMvS3j;fFTx6~
zJA<31u%}~3DAB`{S7R2^9>C1x2abwRIce!GJBrJp6{SF&b`4oD-=A3@4aXcvnoM4=
zSMg)^J<bU9DkG^+)D}0G&yAn|2^;EguVb?;R1Xv<ijm8yEjd}f<iaZ#0!kZ&4>98>
zj%qi6xEH>%$-0{vw7>w#>WGn_zWbnz_q(@T(-3pbA|%9{j>8!nF_i$|Z_k4@glV|u
z0Kkgwm!!P`X+H?>$Lu-Dp+2X<)8CJT<dE=aj7#~r_}@%?FF4Z6NaAOK)r}h?0{OLO
z3UjM8z@u~T!QZeP?c0sL4~cYS+C4>Fm^z@|M4i;8j1zlpIu*Mxdp>sIRgI6l?yK(U
z3S+F&Dq6xrw=GaQ>KCwuEacfZG2dYrC`&&#X70i^?G2|%U8wRrw{au>&(Ex!3sV)N
z9@CIekZmMRWE-7{%GG&+>sG|^e))uiOQT1iuemFEvdJ^5$RSsM6D*Q<jhK8^4G_Pk
zYn=wpY`a^Axar`pMSF!IXJoYkcImSZt1v&(n;DF2<#`lmI7xV-G>%TJ|HQ%4X=6SN
zJx(W+JT^nGkNHDAgFk0|uN-jk$|EZ|43h_2LAAylu?$*)szgn)OTH|{W;*t{zwd$)
z9sUg=SQJ`(Bd%Ov<x-H$k&+%~IGU4eEm^rupM(uwDr%FJQqa`?ruOE25J1;BWF5=Z
zPN$cb`nAPqakMWV`FM^_Km7zzj{DZT<}dt!WGUSC9el7QV8dxROTo=I)oCI!>SW<G
z_LUe;c5!jWJfu7Yxe3aN^xF<1BG*iwfsT7LzGJKn*{VwFnC%nj^hK(Ymq>R7(pUIX
z<xm@0?l%G%$vG(emDu`HjR$eK#l?Y0tUqL@;Sgy-ks6DyL>ntwkR_8@P5dwi)WVni
zAt@6bs3V5S$BejEve~Dlbe{y_lQgeFueW|6$zI&FzPQ+{fP97ammlpi#@==({EDy^
z^oJ)6`em@kSx!7gMg1}ueei$e@Ro57zee&VVb*F`EIQzHoS$o~#&>{P#{yM3eY%YD
zD0t>5xAzqksUEjgjspM2CG(RWEohIzuPYQ}PX=eqgP|6n5>;FCyTc#@t_5|U_iT_G
zo%-{p{uTRRp`TB+9fRrbHh^?|<+Er(oJum_>Y0Fn>ZOAGrTs65@<H<TDh35%&2~}=
z1Wlhh_AJ2b=FI@2DnLdCnH%hf`v8)_IObQhWUKt4hpM(|NZ-mTi^Wb{E?ri`pbIpH
z=u()ufbV*Jhb-zs`XVO!clKPoIgw%$K`nhzMZ6Mk$i3U-_(Tq;7nfjMF<Cs5&L<oq
z9#3(V`1qm@;ux*Dmr0$#l`f)rKi?EAdAF=x63{%s-<HXg{KI{&ca8l)FgPZ*oYeym
zlhIVyVK)#%#Wqsm^Z%9`>0e9|QkkqZKMda&2?}wR+;r#2jLK+gDDR)9&18xDX{zA$
z!jM7V!8;u7gRY<a2BMChzvv>LT-4yelx#3e449esg!AfCV7c9$ow9KzA2*+U{-gP<
zto2hd=Hc6Lbph9~?}>HoDEYVu+knj}dNStu@?^b|fnwomYzq&So$<7vO*v5M;{=G@
zi+(v`%z4J{u?Ie}Gw?Jy?uq3O<O`bd<6~GU`y=q&I7<sV9YHAe2lOM5Q7JWV!(&l%
zoPD1=Mz289nAl|eCg^-SqXT;5NS?+VJ*y7iqh@TtoQu3}X1rrNvaYNdhj~^M`xtrt
zU16tRM#&*`H4UOybTPzrO&LXk3Q)SRk3ZV8_1j>Nuavz80o6-W(ZEf=c#6%MJ?H-$
zp}&@FQIlqs;AE8|dlFS&!m*NUkxdfJ#65>0|MpN}257Xf7GWF4u$mb@?jN`>4ts-x
zh#cVj&F1DH(jFD))1dF+AUpy0F`kTJIY2uwga`p4h;Bzy$2{s>AsBPr*qDp4%%8`j
z5}f#uxCGP~V@_j&aHQ8C(y^|0{->uLIOZvrIO67LP@FgpM2|wyIfF}2hrbX#Kzqp<
zS&J1bDl`M@HoRJMw!E0!ky{)ZVrcjZV0V`M==o+hI(^O1XYG`?OX_6u7)7clzJdAW
z4NW#;JrqL}#WQGP3Ab~snYITRI4`JYzY9b^{<!~dOn&t8|IXz4=w&9&=JwQO_6Ij*
zrV_3NPrOw~>|gc!+w*g-LMOspbNiQD&6*Uz`%n-udFs?T+ERx2u+Zr%YoV|GEoIx>
zfa%;s*Z5@9QEi=Dz&!pqhuT_#8?&Nttp|GYx?w>pBMkHz+Q%AeqKAyY6jIPmdY~CA
zw>KE?S43)x8^_6fGU$YjZ}!O;S<H^2<f?*agQnHb)=FSZC<}o=T;>U$P$@uF7|}p|
zj3)s>xF>}Eo7nKLP5|eC23Y-NaM9sD;9Ip;B0y!%<MZ}hU_AZ@^#i$*&e=H(od-q~
z7zwOg@mM>--R})JG69#4%Zv&A<J$QT@0JXS7`xuk;lS2pf%ZP%e--|8=TFHFP1GM-
z#x#c87$;LPp1;;C!Xzhf2RZ4&6sjob72$2|n+us6FjG)yX=hFJA9Db5gHBhqet0!i
zg&fNWqRgO*R?gTXjtN=Y_h#n^q-`Pp3&d-Crp-4GW%hZhKcd}>RBcLG^$WXO=~Pez
z-!8FWxCtJM0<$!ZqufY57K<yu4Y-TdhjCx2dw1I_z=G6y!)tsb?r$-JBx(H}&aPLJ
zUp?3Uy<no-l%nhP+*=d=1>Yq4;F+Fuj_}}&ro9v!^alIxz6ffL-{5}-@I%qkHle0V
z9<QtBXtOrq2LwpWVR6g@Me+tvIJ|L2?PU#>7>^s+r(iF}-r}j6h1mLTHa&_P$);gf
zX+dk?jdK^~g4W*oVubHgcF0x~e4g1o6TMP?^qMe!H1R(<!==?ntX2Of{ASv-Mt)VB
z4K;NQl{waXb@&NNfV+?}Dl!@GfjO(m1#|v_?G$;FF+5O8<`kjbzz*ffJ%_a$2b-F<
zsVn}?MaIJ~{H*t_kv-?;UxdAu<t%Y`%DHp&%<bLog<RKbS^1%CX!e7ZaXH?erEy(R
zj-TctOR1w9n!J~?vK1+X4jN&b$wL3-!11kc6gy+V^50*S^L4Bdni^k%mD^gZB%uJl
z8B%-`n7;5Ujl?YfJ2A`=c~{{otp|~rh@TYSg>nOs&l10{#QE7aSGM_9O`E6}Tm0`2
z?40~T72V*zgh%jF%*x<y(suO}gW!eP<?E>*N?QLX!WIEiHG!G@K(+fH#D-J7wxSvF
z?kBRE@{5@=O)v$#ny5wLIP7t(LBEKdg>9w<IYi+Z<8;bCb^X5TyEEUI`x9k)$mduo
z{E@X3=;2NYdmSr95jU34M~{GwG!uOAHXYyEHgOg%AG0f0WbhtAXXN>T|Lpf!(f580
zPP*{Dr?I!H@_QEPcWQ)SQv9zG-pz>4nVj>{f42(HJ;~`zeRes&A|Uslj<1OFcMlus
za0kL&)irvF7Ig9I<D=)h{N7}=hN=aawvAPnyG6T%(^pA(8OCW@1P3l)<=V^bN1*gZ
zAyAhT#J$fR_3CFA`?~)h?AnGx%VmEnaSl>r33=wR;CD+%8}6Lu-M#A;FzrR2usiY9
z+12?2^^9=FaX}~^tx%>9^a$$l-D8hAK>JvOYyV%5c2)Qg6WM|ur3Gz6O>puEg#5tZ
zR!Nuq0+scQlDiL=*pOR~<I_f<s@>#PZ7P`7*M*Ea_G5~TH5FHnK*v#-N76;|BfRf8
z(1n}3ROQNszbu+m1#m>7Klk6%G^@V-ZQHshqwUe`J(g5zD=Ew)&#~yFs@h)G98fp*
z00W7V`#+krU2apF{xWG9^1XNdoeejGZ2Av2gu-za=;3+)p{WLTh#-;V?S~4BK*EgH
z0%`QS|G3M#=2sxKprNPr6y)7VVB0b;vXCBo(AkCO;bmiXY!=9>R>Kf|0p<we2%Md9
zZ2S!@u^Z5L0Gh}rcL>yXV=$=dvshgJ6RauIUE39EQDC)e<rMy^O2sbqmcS)niQDA|
z)WE2T+aSVL;1}NE$w=@A;ECAO203}wfB0^U#~{Dwg*0DNjnSY>?(b<w@BX@gD(an6
zWg?c$jeFcZo4zL1HT2g%NiJ8yg}Z(i#Zp=47;)4b2Np7<`c|VzS}mZhR&{ueyOJG$
zxstQk5Bi+d!nWRVDF&^lCW$HQIC#FTt9=pG@YSaq11)p2zIW$}XWabX4A{^A(SQ{>
zi#phs(7Bp{S?p790{WeL;jln;7vgLX(1@4H1)q2v0TnJo$T@@gFH=_RxUy?Q*}jv?
zpd3~G(sB3I8OxdW_Y(#Kd%O+QQcS;>@V+zDLFzf~J&5iw0>5FUs6vGf>M5L6&EUa?
zbyy0f3=`xfn5t_r;@e5pr*X4lwkNu-SeP}KpR@}02mKjO)Cl-us3N`k-wbIApt|>8
z|G<|UaJ0spq48^mII={JETdmkQH+^k(=b0VxlW#_2@Y?^Lzw|B*Ex~$;)n7D$aO|I
z4qV*vo)s|U0NojH0u6lD5*Ur2vUwQ7_MpC(#_8c=CJ3CLfZ(+50i_iP6m)Pbt;2Vz
zEXi2A*+ed!c>|o{H<<7K5DW#LE&Rtr2H;=?0mO0o6fpAW5y5Lx)tlfPy)lLuYx`8&
zDKbm^yOMdWHJnpXqDGeaSAcJVQhp{rPxv@CBua%O8Y4*6N|WGN(B`+|m!$-h15=$6
ze{^G#j}8?cD=<ZoaJCtI_2-Vje>O}i`A+2Aq3UFxwbXb=P)<55=M~t^<xgEd7nuZ}
zZjcIE@!e?KQRa!ULJ`+jA=gFGJkpZ=n@*N2TjIBFzV|KY-IZM0vbD7p3&}y+tF-GM
zcbt0aGN2ddG-K1Iyz7Y?`y;)Ek&O-~_T1?XM2emiv*oBQ9LnoHjAm){Q8;1@&T@T(
z@^k-`hk)^!1Kk&}&A=4qfyBfEj%dKGv8f)nNJX!~yqKrKAOG5>{n2;>0xGs@&~OQI
z2JH2(+HV}kppx;j4_E&mwsugewG;TQGjR6A7wXG7*dMy!p>b%();+ebH@jT_FW><#
ASO5S3

literal 0
HcmV?d00001

diff --git a/bgfx/chains/hq2x.json b/bgfx/chains/hq2x.json
new file mode 100644
index 00000000000..20303a64c90
--- /dev/null
+++ b/bgfx/chains/hq2x.json
@@ -0,0 +1,60 @@
+// license:LGPL-2.1+
+// copyright-holders:Jules Blok,Cameron Zemek,Maxim Stepin
+
+/*
+* Copyright (C) 2003 Maxim Stepin ( maxst@hiend3d.com )
+*
+* Copyright (C) 2010 Cameron Zemek ( grom@zeminvaders.net )
+*
+* Copyright (C) 2014 Jules Blok ( jules@aerix.nl )
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public
+* License as published by the Free Software Foundation; either
+* version 2.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this program; if not, write to the Free Software
+* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+*/
+
+{
+	"name": "HQ2x",
+	"author": "libretro",
+	"targets": [
+		{
+			"name": "scaled_out",
+			"mode": "guest",
+			"scale": 2,
+			"doublebuffer": true
+		},
+		{
+			"name": "internal",
+			"mode": "native",
+			"doublebuffer": true
+		}
+	],
+	"passes": [
+		{
+			"effect": "hq2x/hq2x",
+			"name": "HQ2x pass",
+			"input": [
+				{ "sampler": "decal", "texture": "screen" },
+				{ "sampler": "LUT",   "texture": "bgfx/chains/hq2x.png", "bilinear": true }
+			],
+			"output": "scaled_out"
+		},
+		{	"effect": "hq2x/blit",
+			"name": "Final Blit",
+			"input": [
+				{ "sampler": "s_tex", "target": "scaled_out" }
+			],
+			"output": "output"
+		}
+	]
+}
\ No newline at end of file
diff --git a/bgfx/chains/hq3x.json b/bgfx/chains/hq3x.json
new file mode 100644
index 00000000000..1f767b68825
--- /dev/null
+++ b/bgfx/chains/hq3x.json
@@ -0,0 +1,60 @@
+// license:LGPL-2.1+
+// copyright-holders:Jules Blok,Cameron Zemek,Maxim Stepin
+
+/*
+* Copyright (C) 2003 Maxim Stepin ( maxst@hiend3d.com )
+*
+* Copyright (C) 2010 Cameron Zemek ( grom@zeminvaders.net )
+*
+* Copyright (C) 2014 Jules Blok ( jules@aerix.nl )
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public
+* License as published by the Free Software Foundation; either
+* version 2.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this program; if not, write to the Free Software
+* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+*/
+
+{
+	"name": "HQ3x",
+	"author": "libretro",
+	"targets": [
+		{
+			"name": "scaled_out",
+			"mode": "guest",
+			"scale": 2,
+			"doublebuffer": true
+		},
+		{
+			"name": "internal",
+			"mode": "native",
+			"doublebuffer": true
+		}
+	],
+	"passes": [
+		{
+			"effect": "hq3x/hq3x",
+			"name": "HQ3x pass",
+			"input": [
+				{ "sampler": "decal", "texture": "screen" },
+				{ "sampler": "LUT",   "texture": "bgfx/chains/hq3x.png", "bilinear": false }
+			],
+			"output": "scaled_out"
+		},
+		{	"effect": "hq3x/blit",
+			"name": "Final Blit",
+			"input": [
+				{ "sampler": "s_tex", "target": "scaled_out" }
+			],
+			"output": "output"
+		}
+	]
+}
\ No newline at end of file
diff --git a/bgfx/chains/hq4x.json b/bgfx/chains/hq4x.json
new file mode 100644
index 00000000000..9232966ecc4
--- /dev/null
+++ b/bgfx/chains/hq4x.json
@@ -0,0 +1,60 @@
+// license:LGPL-2.1+
+// copyright-holders:Jules Blok,Cameron Zemek,Maxim Stepin
+
+/*
+* Copyright (C) 2003 Maxim Stepin ( maxst@hiend3d.com )
+*
+* Copyright (C) 2010 Cameron Zemek ( grom@zeminvaders.net )
+*
+* Copyright (C) 2014 Jules Blok ( jules@aerix.nl )
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public
+* License as published by the Free Software Foundation; either
+* version 2.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this program; if not, write to the Free Software
+* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+*/
+
+{
+	"name": "HQ4x",
+	"author": "libretro",
+	"targets": [
+		{
+			"name": "scaled_out",
+			"mode": "guest",
+			"scale": 2,
+			"doublebuffer": true
+		},
+		{
+			"name": "internal",
+			"mode": "native",
+			"doublebuffer": true
+		}
+	],
+	"passes": [
+		{
+			"effect": "hq4x/hq4x",
+			"name": "HQ4x pass",
+			"input": [
+				{ "sampler": "decal", "texture": "screen" },
+				{ "sampler": "LUT",   "texture": "bgfx/chains/hq4x.png", "bilinear": false }
+			],
+			"output": "scaled_out"
+		},
+		{	"effect": "hq4x/blit",
+			"name": "Final Blit",
+			"input": [
+				{ "sampler": "s_tex", "target": "scaled_out" }
+			],
+			"output": "output"
+		}
+	]
+}
\ No newline at end of file
diff --git a/bgfx/effects/hq2x/blit.json b/bgfx/effects/hq2x/blit.json
new file mode 100644
index 00000000000..9ea3078b35a
--- /dev/null
+++ b/bgfx/effects/hq2x/blit.json
@@ -0,0 +1,121 @@
+// license:BSD-3-Clause
+// copyright-holders:Ryan Holtz
+//============================================================
+//
+//  blit.json: A simple texture-to-target copy.
+//
+//============================================================
+{
+	// blend (required): The blend state for this effect.
+    "blend": {
+    	// equation (optional): What equation to perform on the source and destination blend values.
+    	// values: "add", "sub", "revSub", "min", "max"
+    	// default: "add"
+    	// 
+    	// "subtract" and "revSubtract" are provided as aliases for "sub" and "revSub"
+    	"equation": "add",
+    	
+    	// blend function parameters (optional): What factors to use in the blend function when calculating the final pixel.
+    	// values: "0", "1", "srccolor", "1-srccolor", "dstcolor", "1-dstcolor", "srcalpha", "1-srcalpha", "dstalpha", "1-dstalpha"
+    	// defaults (srcColor, srcAlpha): "1"
+    	// defaults (dstColor, dstAlpha): "0"
+    	// 
+    	// "zero", "one", "invsrccolor", "invdstcolor", "invsrcalpha", and "invdstalpha" are provided as aliases for "0", "1", "1-srccolor", "1-dstcolor", "1-srcalpha", and "1-dstalpha"
+    	"srcColor": "srcalpha",
+    	"dstColor": "1-srcalpha",
+    	"srcAlpha": "srcalpha",
+    	"dstAlpha": "1-srcalpha"
+    },
+    
+    // depth (required): The depth state for this effect.
+    "depth": {
+    	// function (optional): The depth function to use when drawing.
+    	// values: "never", "less", "equal", "lequal", "greater", "notequal", "gequal", "always"
+    	// default: "always"
+    	"function": "always",
+    	
+    	// writeenable (optional): Whether to store Z-buffer data.
+    	// values: true, false
+    	// default: false
+    	"writeenable": false
+    },
+    
+    // cull (required): The cull mode for this effect.
+    "cull": {
+    	// mode (optional): What winding, if any, to cull.
+    	// values: "none", "cw", "ccw"
+    	// default: "ccw"
+    	// 
+    	// "clockwise" and "counterclockwise" are provided as aliases for "cw" and "ccw"
+    	"mode": "none"
+    },
+    
+    // write (required): Write enable for color and alpha channels.
+    "write": {
+    	// rgb (optional): Whether to store color data when drawing.
+    	// values: true, false
+    	// default: false
+    	"rgb": true,
+
+    	// alpha (optional): Whether to store alpha data when drawing.
+    	// values: true, false
+    	// default: false
+    	"alpha": true
+    },
+
+	// vertex (required): The vertex shader to use when drawing.
+	// value: A string containing the path and name of a shader file to use, minus the extension.
+    "vertex": "chains/hq2x/vs_blit",
+
+	// pixel/fragment (required): The pixel or fragment shader to use when drawing.
+	// value: A string containing the path and name of a shader file to use, minus the extension.
+    "fragment": "chains/hq2x/fs_blit",
+    
+    // uniforms (required): The list of uniforms for this effect. Can be empty, but must exist.
+    "uniforms": [    	
+    	{
+    		// name (required): The name of the uniform, as used in either the vertex or pixel/fragment shader.
+    		// value: A string containing the name of the uniform as described above.
+    		// 
+    		// NOTE: Some names correspond to special values that will be automatically filled by the BGFX
+    		//       code if they are used by the shader. These names are:
+    		//           "u_screen_dims"
+    		//				The dimensions of the first texture input if present, otherwise the dimensions of the output window.
+    		//				Valid values: xy
+    		//           "u_inv_screen_dims"
+    		//				The reciprocal of u_screen_dims.
+    		//				Valid values: xy
+    		//           "u_source_dims"
+    		//				The size, in pixels, of the screen texture incoming to the chain.
+    		//				Valid values: xy
+    		//           "u_rotation_type"
+    		//				This screen's rotation type. 0 if ROT0, 1 if ROT90, 2 if ROT180, 3 of ROT270.
+    		//              Valid values: x
+    		//           "u_swap_xy"
+    		//				Whether this screen is swapped on the X and Y axes. 1 if true, 0 if false.
+    		//				Valid values: x
+    		//			 "u_quad_dims"
+    		//				The dimensions, in pixels, occupied by this one screen primitive itself in the output window.
+    		//				Valid values: xy
+    		//			 "u_tex_sizeN"
+    		//				The dimensions, in pixels, of the texture in input pair N. Starts at 0.
+    		//				valid values: xy
+    		"name": "s_tex",
+
+    		// type (required): The type of the uniform.
+    		// values: "int", "vec4", "mat3", "mat4"
+    		//
+    		// Note: "int" should only be used for samplers.
+    		"type": "int",
+    		
+    		// values (required): The array of numbers with which to initialize the uniform.
+    		// value: A JSON array containin the correct amount of numbers to initialize a uniform of the
+    		//        above-specified type. The following size rules should be followed:
+    		//            "int": 1 float
+    		//            "vec4": 4 floats
+    		//            "mat3": 9 floats
+    		//            "mat4": 16 floats
+    		"values": [ 1.0 ]
+    	}
+    ]
+}
\ No newline at end of file
diff --git a/bgfx/effects/hq2x/hq2x.json b/bgfx/effects/hq2x/hq2x.json
new file mode 100644
index 00000000000..9b67b562b02
--- /dev/null
+++ b/bgfx/effects/hq2x/hq2x.json
@@ -0,0 +1,29 @@
+// license:LGPL-2.1+
+// copyright-holders:Jules Blok,Cameron Zemek,Maxim Stepin
+{
+    "blend": {
+    	"equation": "add",
+    	"srcColor": "1",
+    	"dstColor": "0",
+    	"srcAlpha": "1",
+    	"dstAlpha": "0"
+    },
+    "depth": {
+    	"function": "always",
+    	"writeenable": false
+    },
+    "cull": {
+    	"mode": "none"
+    },
+    "write": {
+    	"rgb": true,
+    	"alpha": true
+    },
+    "vertex": "chains/hq2x/vs_hq2x",
+    "fragment": "chains/hq2x/fs_hq2x",
+    "uniforms": [
+    	{ "name": "decal",       "type": "int",  "values": [ 1.0 ] },
+    	{ "name": "LUT",         "type": "int",  "values": [ 1.0 ] },
+    	{ "name": "u_tex_size0", "type": "vec4", "values": [ 1.0, 1.0, 0.0, 0.0 ] }
+    ]
+}
\ No newline at end of file
diff --git a/bgfx/effects/hq3x/blit.json b/bgfx/effects/hq3x/blit.json
new file mode 100644
index 00000000000..a3c21b9cf67
--- /dev/null
+++ b/bgfx/effects/hq3x/blit.json
@@ -0,0 +1,121 @@
+// license:BSD-3-Clause
+// copyright-holders:Ryan Holtz
+//============================================================
+//
+//  blit.json: A simple texture-to-target copy.
+//
+//============================================================
+{
+	// blend (required): The blend state for this effect.
+    "blend": {
+    	// equation (optional): What equation to perform on the source and destination blend values.
+    	// values: "add", "sub", "revSub", "min", "max"
+    	// default: "add"
+    	// 
+    	// "subtract" and "revSubtract" are provided as aliases for "sub" and "revSub"
+    	"equation": "add",
+    	
+    	// blend function parameters (optional): What factors to use in the blend function when calculating the final pixel.
+    	// values: "0", "1", "srccolor", "1-srccolor", "dstcolor", "1-dstcolor", "srcalpha", "1-srcalpha", "dstalpha", "1-dstalpha"
+    	// defaults (srcColor, srcAlpha): "1"
+    	// defaults (dstColor, dstAlpha): "0"
+    	// 
+    	// "zero", "one", "invsrccolor", "invdstcolor", "invsrcalpha", and "invdstalpha" are provided as aliases for "0", "1", "1-srccolor", "1-dstcolor", "1-srcalpha", and "1-dstalpha"
+    	"srcColor": "srcalpha",
+    	"dstColor": "1-srcalpha",
+    	"srcAlpha": "srcalpha",
+    	"dstAlpha": "1-srcalpha"
+    },
+    
+    // depth (required): The depth state for this effect.
+    "depth": {
+    	// function (optional): The depth function to use when drawing.
+    	// values: "never", "less", "equal", "lequal", "greater", "notequal", "gequal", "always"
+    	// default: "always"
+    	"function": "always",
+    	
+    	// writeenable (optional): Whether to store Z-buffer data.
+    	// values: true, false
+    	// default: false
+    	"writeenable": false
+    },
+    
+    // cull (required): The cull mode for this effect.
+    "cull": {
+    	// mode (optional): What winding, if any, to cull.
+    	// values: "none", "cw", "ccw"
+    	// default: "ccw"
+    	// 
+    	// "clockwise" and "counterclockwise" are provided as aliases for "cw" and "ccw"
+    	"mode": "none"
+    },
+    
+    // write (required): Write enable for color and alpha channels.
+    "write": {
+    	// rgb (optional): Whether to store color data when drawing.
+    	// values: true, false
+    	// default: false
+    	"rgb": true,
+
+    	// alpha (optional): Whether to store alpha data when drawing.
+    	// values: true, false
+    	// default: false
+    	"alpha": true
+    },
+
+	// vertex (required): The vertex shader to use when drawing.
+	// value: A string containing the path and name of a shader file to use, minus the extension.
+    "vertex": "chains/hq3x/vs_blit",
+
+	// pixel/fragment (required): The pixel or fragment shader to use when drawing.
+	// value: A string containing the path and name of a shader file to use, minus the extension.
+    "fragment": "chains/hq3x/fs_blit",
+    
+    // uniforms (required): The list of uniforms for this effect. Can be empty, but must exist.
+    "uniforms": [    	
+    	{
+    		// name (required): The name of the uniform, as used in either the vertex or pixel/fragment shader.
+    		// value: A string containing the name of the uniform as described above.
+    		// 
+    		// NOTE: Some names correspond to special values that will be automatically filled by the BGFX
+    		//       code if they are used by the shader. These names are:
+    		//           "u_screen_dims"
+    		//				The dimensions of the first texture input if present, otherwise the dimensions of the output window.
+    		//				Valid values: xy
+    		//           "u_inv_screen_dims"
+    		//				The reciprocal of u_screen_dims.
+    		//				Valid values: xy
+    		//           "u_source_dims"
+    		//				The size, in pixels, of the screen texture incoming to the chain.
+    		//				Valid values: xy
+    		//           "u_rotation_type"
+    		//				This screen's rotation type. 0 if ROT0, 1 if ROT90, 2 if ROT180, 3 of ROT270.
+    		//              Valid values: x
+    		//           "u_swap_xy"
+    		//				Whether this screen is swapped on the X and Y axes. 1 if true, 0 if false.
+    		//				Valid values: x
+    		//			 "u_quad_dims"
+    		//				The dimensions, in pixels, occupied by this one screen primitive itself in the output window.
+    		//				Valid values: xy
+    		//			 "u_tex_sizeN"
+    		//				The dimensions, in pixels, of the texture in input pair N. Starts at 0.
+    		//				valid values: xy
+    		"name": "s_tex",
+
+    		// type (required): The type of the uniform.
+    		// values: "int", "vec4", "mat3", "mat4"
+    		//
+    		// Note: "int" should only be used for samplers.
+    		"type": "int",
+    		
+    		// values (required): The array of numbers with which to initialize the uniform.
+    		// value: A JSON array containin the correct amount of numbers to initialize a uniform of the
+    		//        above-specified type. The following size rules should be followed:
+    		//            "int": 1 float
+    		//            "vec4": 4 floats
+    		//            "mat3": 9 floats
+    		//            "mat4": 16 floats
+    		"values": [ 1.0 ]
+    	}
+    ]
+}
\ No newline at end of file
diff --git a/bgfx/effects/hq3x/hq3x.json b/bgfx/effects/hq3x/hq3x.json
new file mode 100644
index 00000000000..4cc61706dce
--- /dev/null
+++ b/bgfx/effects/hq3x/hq3x.json
@@ -0,0 +1,29 @@
+// license:LGPL-2.1+
+// copyright-holders:Jules Blok,Cameron Zemek,Maxim Stepin
+{
+    "blend": {
+    	"equation": "add",
+    	"srcColor": "1",
+    	"dstColor": "0",
+    	"srcAlpha": "1",
+    	"dstAlpha": "0"
+    },
+    "depth": {
+    	"function": "always",
+    	"writeenable": false
+    },
+    "cull": {
+    	"mode": "none"
+    },
+    "write": {
+    	"rgb": true,
+    	"alpha": true
+    },
+    "vertex": "chains/hq3x/vs_hq3x",
+    "fragment": "chains/hq3x/fs_hq3x",
+    "uniforms": [
+    	{ "name": "decal",       "type": "int",  "values": [ 1.0 ] },
+    	{ "name": "LUT",         "type": "int",  "values": [ 1.0 ] },
+    	{ "name": "u_tex_size0", "type": "vec4", "values": [ 1.0, 1.0, 0.0, 0.0 ] }
+    ]
+}
\ No newline at end of file
diff --git a/bgfx/effects/hq4x/blit.json b/bgfx/effects/hq4x/blit.json
new file mode 100644
index 00000000000..ddaab93e2ea
--- /dev/null
+++ b/bgfx/effects/hq4x/blit.json
@@ -0,0 +1,121 @@
+// license:BSD-3-Clause
+// copyright-holders:Ryan Holtz
+//============================================================
+//
+//  blit.json: A simple texture-to-target copy.
+//
+//============================================================
+{
+	// blend (required): The blend state for this effect.
+    "blend": {
+    	// equation (optional): What equation to perform on the source and destination blend values.
+    	// values: "add", "sub", "revSub", "min", "max"
+    	// default: "add"
+    	// 
+    	// "subtract" and "revSubtract" are provided as aliases for "sub" and "revSub"
+    	"equation": "add",
+    	
+    	// blend function parameters (optional): What factors to use in the blend function when calculating the final pixel.
+    	// values: "0", "1", "srccolor", "1-srccolor", "dstcolor", "1-dstcolor", "srcalpha", "1-srcalpha", "dstalpha", "1-dstalpha"
+    	// defaults (srcColor, srcAlpha): "1"
+    	// defaults (dstColor, dstAlpha): "0"
+    	// 
+    	// "zero", "one", "invsrccolor", "invdstcolor", "invsrcalpha", and "invdstalpha" are provided as aliases for "0", "1", "1-srccolor", "1-dstcolor", "1-srcalpha", and "1-dstalpha"
+    	"srcColor": "srcalpha",
+    	"dstColor": "1-srcalpha",
+    	"srcAlpha": "srcalpha",
+    	"dstAlpha": "1-srcalpha"
+    },
+    
+    // depth (required): The depth state for this effect.
+    "depth": {
+    	// function (optional): The depth function to use when drawing.
+    	// values: "never", "less", "equal", "lequal", "greater", "notequal", "gequal", "always"
+    	// default: "always"
+    	"function": "always",
+    	
+    	// writeenable (optional): Whether to store Z-buffer data.
+    	// values: true, false
+    	// default: false
+    	"writeenable": false
+    },
+    
+    // cull (required): The cull mode for this effect.
+    "cull": {
+    	// mode (optional): What winding, if any, to cull.
+    	// values: "none", "cw", "ccw"
+    	// default: "ccw"
+    	// 
+    	// "clockwise" and "counterclockwise" are provided as aliases for "cw" and "ccw"
+    	"mode": "none"
+    },
+    
+    // write (required): Write enable for color and alpha channels.
+    "write": {
+    	// rgb (optional): Whether to store color data when drawing.
+    	// values: true, false
+    	// default: false
+    	"rgb": true,
+
+    	// alpha (optional): Whether to store alpha data when drawing.
+    	// values: true, false
+    	// default: false
+    	"alpha": true
+    },
+
+	// vertex (required): The vertex shader to use when drawing.
+	// value: A string containing the path and name of a shader file to use, minus the extension.
+    "vertex": "chains/hq4x/vs_blit",
+
+	// pixel/fragment (required): The pixel or fragment shader to use when drawing.
+	// value: A string containing the path and name of a shader file to use, minus the extension.
+    "fragment": "chains/hq4x/fs_blit",
+    
+    // uniforms (required): The list of uniforms for this effect. Can be empty, but must exist.
+    "uniforms": [    	
+    	{
+    		// name (required): The name of the uniform, as used in either the vertex or pixel/fragment shader.
+    		// value: A string containing the name of the uniform as described above.
+    		// 
+    		// NOTE: Some names correspond to special values that will be automatically filled by the BGFX
+    		//       code if they are used by the shader. These names are:
+    		//           "u_screen_dims"
+    		//				The dimensions of the first texture input if present, otherwise the dimensions of the output window.
+    		//				Valid values: xy
+    		//           "u_inv_screen_dims"
+    		//				The reciprocal of u_screen_dims.
+    		//				Valid values: xy
+    		//           "u_source_dims"
+    		//				The size, in pixels, of the screen texture incoming to the chain.
+    		//				Valid values: xy
+    		//           "u_rotation_type"
+    		//				This screen's rotation type. 0 if ROT0, 1 if ROT90, 2 if ROT180, 3 of ROT270.
+    		//              Valid values: x
+    		//           "u_swap_xy"
+    		//				Whether this screen is swapped on the X and Y axes. 1 if true, 0 if false.
+    		//				Valid values: x
+    		//			 "u_quad_dims"
+    		//				The dimensions, in pixels, occupied by this one screen primitive itself in the output window.
+    		//				Valid values: xy
+    		//			 "u_tex_sizeN"
+    		//				The dimensions, in pixels, of the texture in input pair N. Starts at 0.
+    		//				valid values: xy
+    		"name": "s_tex",
+
+    		// type (required): The type of the uniform.
+    		// values: "int", "vec4", "mat3", "mat4"
+    		//
+    		// Note: "int" should only be used for samplers.
+    		"type": "int",
+    		
+    		// values (required): The array of numbers with which to initialize the uniform.
+    		// value: A JSON array containin the correct amount of numbers to initialize a uniform of the
+    		//        above-specified type. The following size rules should be followed:
+    		//            "int": 1 float
+    		//            "vec4": 4 floats
+    		//            "mat3": 9 floats
+    		//            "mat4": 16 floats
+    		"values": [ 1.0 ]
+    	}
+    ]
+}
\ No newline at end of file
diff --git a/bgfx/effects/hq4x/hq4x.json b/bgfx/effects/hq4x/hq4x.json
new file mode 100644
index 00000000000..8d2221896ce
--- /dev/null
+++ b/bgfx/effects/hq4x/hq4x.json
@@ -0,0 +1,29 @@
+// license:LGPL-2.1+
+// copyright-holders:Jules Blok,Cameron Zemek,Maxim Stepin
+{
+    "blend": {
+    	"equation": "add",
+    	"srcColor": "1",
+    	"dstColor": "0",
+    	"srcAlpha": "1",
+    	"dstAlpha": "0"
+    },
+    "depth": {
+    	"function": "always",
+    	"writeenable": false
+    },
+    "cull": {
+    	"mode": "none"
+    },
+    "write": {
+    	"rgb": true,
+    	"alpha": true
+    },
+    "vertex": "chains/hq4x/vs_hq4x",
+    "fragment": "chains/hq4x/fs_hq4x",
+    "uniforms": [
+    	{ "name": "decal",       "type": "int",  "values": [ 1.0 ] },
+    	{ "name": "LUT",         "type": "int",  "values": [ 1.0 ] },
+    	{ "name": "u_tex_size0", "type": "vec4", "values": [ 1.0, 1.0, 0.0, 0.0 ] }
+    ]
+}
\ No newline at end of file
diff --git a/bgfx/shaders/dx11/chains/hq2x/fs_blit.bin b/bgfx/shaders/dx11/chains/hq2x/fs_blit.bin
new file mode 100644
index 0000000000000000000000000000000000000000..80d85fb110742d3ae2415a237aee617a3e0c7b8c
GIT binary patch
literal 396
zcmZ<@_F!Rb{`8QMfwefkB(=hTk%57cp@7jP!pV7G#q*_-JO!_PHm;EuYk4^xC<T;Z
zU|<H)IzYSth_3*#XRy0p4v+?ka{zGw5Q6|nJxB}$_<=YE%z_XgagaPeP$CIUoC(Nh
z1}X>+ix2P*_6+g#_hWGO_wf&62yu;Y_V*8RVOZ@Cv=ih8kQpF56@VB9knIGT5#ku+
z?i#|ddUddeOVAXcA_pK=1>z`>^AZGrECz-M2?iF10th=a6zC=a2Ifx!0$}q&Y$G5W
z<gQepo=*x8br}o{Od$JR85lS}F+jxJpz7S}Abgnl77PsRFnw-(P_=Rp^X(wsU;qHi
C*D!kk

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/dx11/chains/hq2x/fs_hq2x.bin b/bgfx/shaders/dx11/chains/hq2x/fs_hq2x.bin
new file mode 100644
index 0000000000000000000000000000000000000000..cdce652045f8fc61742e78803010dbc35e25b567
GIT binary patch
literal 6600
zcmdUzO>9*~6vyXH>1$~NEd&TwgH4x!3D(3It?l%cJ|H2~w535eC|aWl3xk>v7v}Lc
z#El^?48$E#5@o}}tyoy#o&@3&V`6mM7}x%PGjne5d%Z2igoP)$@6J7+|MM|(Z`)ir
zzU`O8-(2f)gP)%LWclLRk3alu`N(ePT+Q{qxBTuq=a1A__nbVvc%)X->dG@m&opNC
zT=}AT>(<_vp5K1p@A0d@-jR|d&h_YiSl6Gro)h!L!m(37YF*dWuj{HV2z_*+Azk0b
zRr-OC9R3f96@TG-T|HXBM+bt>H6#Q0=s@tc=^EOR_&h`0dv&3|uypo~xrGypC+1GM
znYoj5^KNnW%*@=}{84vvPT0wXIA9;uWn{j<C?AW{^T%cv-OZZ|$B)jR-|t)y|5+vd
zrXV!G9Mx0u^A_RX9*)np#{Zf9g8EV7pFX|zjEv`V!>(t1csS<9dR1#Mu)eP~c^aSG
zmKA4pH2M2LCFv7y*17GgF7fVV`{w8A*)Zv8pq+JmaBgYm3%4I!{QkDgr*yfd&-%{w
znck~ezb1Xrl*IviGh^N;4mv(m$3Z5Faaa?FyT#G6zl5PREe2$I<g!~f%!3d55w=5@
zAKqU4{kxxduv|<Jo)6Al-gj;C`s}``2N(Z(U93V+%f7Lk>p=EvSn$!vG9RQ_5zF#1
zy@Ofbe8{HX{ExWdA|KOx(Ye9voiW^<m6ZvC{r2e5#L|x8)+HW9Vis7fKk^x6U~QND
zROOqo_ESGd`4)K0pYRlNa=5b+CebTnDA`9phC%-OtT(cWvQ&pwF+V-x{xOo~ylQ^T
zw-43xgS{xmVbK{U&U1mkJ3sQLPSy_}#Hi>gF|3|8XI1sgSmL~*XEoG4))gN0q%W*%
zA=MK(^@JxXdRo*mL_T}-v9mLt>+EI2yx8pEp}EDrF;`Z1asXFRSIHXPJjHUZv!@UD
zKHZ*L&#HP#jZIFCse@`+%xrfr1%BO`VLhh~tbM3HGmwem`9+<qUc?m@Jwxwc?u~Rh
z<^in8v7ujv6<&Fdi!Y9I+>wc5o~-3FGOQl(tPZSeA<f!WeY1DLMNSqMAM}~}S$#QQ
z(eXh)lIcgQmaesT5$`SDMcg;q<L0C4U4)&e<19fx;aRIOJnF!{wmQJGI+#s)9^jEr
zBj@Ua7!~sX2Fsgz`cOR&hSmJhbBimpI1kA1Ve_DS$2^#v{Fn#ioDbO8Jm8bQaK{fa
zQNP(z2S_^6H*)G=^5i>AZq+yQz+NCfi;E9>Zr=jEdg3fcr>f6m8Lto3XF2wwj=9^Y
zcH~E&EkE?S^P|t@{ODg>cGSWL{Z#ZB3^ots;X`$w4XgPB4}MckQlF9GgZ@C$>F9;Y
zv7yh%=`%L;xsiQZe~E!i6yG7N;X&j%tvfvG(CIr&Zq+w^9?NkoZpx`OrSIUlPsmg6
zk{HVeJvgV(F?@W`&$@S*`I^n&r__%#fqT`gSnfV-J}ahY{>$|@88uQ~MUB9}m07WQ
z2ZLzcI|A&?iq*@9O=l&Z)#aXzlzJvt#r_(|wJqmjSjZESPPyNM<JrcCG)sJ^p$FM}
zpV(D%W%0@~VT=7G9`#}_z(CFgFX*AP|M~lm{r_KkioIyv+?VU{w0jDMt@Jcw{onVL
zdOohFe9Jw}p0<U7{khRTH92#@nJ&F}PGUo^Y;SnUMeFwI6ZUk|eR!9Mq8mHYy}qq;
zADY|;v=VW)vma$se1qCvL!*>;H0YMWWY0nD!!fO`XOS29P2XjWtjBj5IzH&fxrXGr
z+)RAx+RO0R@0p5kXPpbhp{{lO){sv5@2O}a+o;DoSQNi8Sl|<$utz!Ph$z0BSeXB;
z6VDl)%Y&;Kiw~*a^xUpysfKb9edXCHFeqLJR{T@reDA<QElmzS!^BxBin(Nbg@5V9
zvk|Npvb_&>?$YZOwNU4-PyNQ8p5B)(RJYmLo?_eknmm~C^0xpyY{3axpU4N9sHlNq
zClB<j-s}%BfE(Vy+z-pqY9O1KBYf$^9JMTJU~==1p1nu$UkhMg`=+$K+wuj08Nzqe
zS6&UR@n<r8Fw0gGp3E=tFX`F*Vhfoqej(K*{ym1@f)|h^zh-BC2fF-HFUV{qkI(oW
z(;B}8FCa>O&CdJ^S8-0!LzA1W^1(RbMONi^mqMAHW<ToqfK|ueTGOwnPv^3~`mR*p
z`lV46BaP_ap(bCdr??XIjmw65e%+gRb{A`)Ti*w96aB0kmz$Pf^T9VEzW7dTXDr6^
zL4pD^Yv;!GEjT7U&MB)2wUb`3o=RuvtL#f>ZRt#Fy@qC@)`SmnRpPmc+5D{urhA4*
z{|i+g9sdjE-d$gGeb7(DN{!RCQ?*)^59IWLdp-NqtPU7PA0+6aCGB$vy-jLbSRGI=
zsVOAfaZj?g-W<v`hev%O;fvpZ%#aWI>B8S^jlzsX-S1{QYKjeasJ<uVX0>CF|1pqc
z-QVe&xxNeXgU*uXC)P&q9iEASj2iPU;!eHFI@mWd4(mU6@Vu-X+gX-oLQLr!?i+T7
zJ^|itOyIns+zb;Ki3=t$SX}I^AMZ;anbqC?_igo(Xie7jfA<)FG}lr!f&Lj<AHSV-
OQvBAGKI8>$*!>FzK0wp}

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/dx11/chains/hq2x/vs_blit.bin b/bgfx/shaders/dx11/chains/hq2x/vs_blit.bin
new file mode 100644
index 0000000000000000000000000000000000000000..b0bebf9da4c8f62f3a2c050041aa49355e4d94d9
GIT binary patch
literal 575
zcmZ9I%}T>S6oqdxsfHppAVNWqf-YTUAzeu^F*cx`kd#nS2nfX=go2<xfP0_7H}Hkr
zx^)@Qwdc$@MI5*{C*Qp@XXe(`IPjj^4^O%e&Ew7dskmR<1|kwj-%n?UiNE!^8@(@f
zzP`QTdAM=vq1N|B6ux_iS40GuSI3iUXz~zIAlxG3>h(lwD@`Wnd8-i3KMo5~;E6ub
zr4+i#r@5ZU^k|l7U8bVpcgG&YUq7Bl#sxdMFv=!!*2ym|GMU`?t%+21voy2bOUt)v
zoR&ObgfzmQGmI&F89;Gf<_)TiBJ+>;s2G}lPSfKGt?j_}ur@~@|DBGZ*@s#BWJ5f!
z7298L+CJyWdMwg)b;p5a<<~n~w|jv?=j)j3=ll0XI_@6Xw%tSK?vvp>-s^xPR2`%U
GGxz~&T{$TL

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/dx11/chains/hq2x/vs_hq2x.bin b/bgfx/shaders/dx11/chains/hq2x/vs_hq2x.bin
new file mode 100644
index 0000000000000000000000000000000000000000..5b037b2bfe84c87e9bc961391dfb4f721226ebfa
GIT binary patch
literal 909
zcmZ8gJxc>Y5S`p5myn32&{7E&Hl~miVx_^vGXe2JE`(TJb@<T;ej^AetSzh*wX+Z{
zwNGj99}xTjf<dsc@V(ocpbnY6w{K==-p*axel7W2yt=d`yB{2EhKG%v?X9GUBqg^W
z?1e|c?&fhgV@X*O(z2_a#md{q`*`?uH~soJ_42)bbDltU%ND^;ituZA2V~t}UflpD
zpMf{vYUF4mBO+}Bqm?}Cr2&F}yoJ3DzT&NTO=)<3y;b*CrM1+lcwVzA9{N2Y$APoo
z1)RougMPrbBxBQlkRkU<;z>U0H)MF$ppmC*K67Z~I5p+Dr}3GBllR-fK(x8TK>CAU
zt2RH;gi}62?i$LuX9Xa09<#9f`Fyk|E&)@MV(M7OnSR0KFc$I*_KHiu%u}A)6jQt6
z6foYK#oRfJvM;7)d(6~QU94LY$!c7A(Bj1U++lMTR7SNar}@+|i)*S@cfy<@r<z^V
zqn=@r+)J#-Dua;j!f$s@3nZg=0qt4lQl}H^u*%p-x5qU;*JGc_I4@C-0$kG6Lv7R>
n)fhDzG{%{^&fgeo?Zo<A%fvLFbJe>$ajkiNo^}dL9{-OY8~t4o

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/dx11/chains/hq3x/fs_blit.bin b/bgfx/shaders/dx11/chains/hq3x/fs_blit.bin
new file mode 100644
index 0000000000000000000000000000000000000000..80d85fb110742d3ae2415a237aee617a3e0c7b8c
GIT binary patch
literal 396
zcmZ<@_F!Rb{`8QMfwefkB(=hTk%57cp@7jP!pV7G#q*_-JO!_PHm;EuYk4^xC<T;Z
zU|<H)IzYSth_3*#XRy0p4v+?ka{zGw5Q6|nJxB}$_<=YE%z_XgagaPeP$CIUoC(Nh
z1}X>+ix2P*_6+g#_hWGO_wf&62yu;Y_V*8RVOZ@Cv=ih8kQpF56@VB9knIGT5#ku+
z?i#|ddUddeOVAXcA_pK=1>z`>^AZGrECz-M2?iF10th=a6zC=a2Ifx!0$}q&Y$G5W
z<gQepo=*x8br}o{Od$JR85lS}F+jxJpz7S}Abgnl77PsRFnw-(P_=Rp^X(wsU;qHi
C*D!kk

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/dx11/chains/hq3x/fs_hq3x.bin b/bgfx/shaders/dx11/chains/hq3x/fs_hq3x.bin
new file mode 100644
index 0000000000000000000000000000000000000000..29d6a5c2c3d02ead78627a05f079aa569ae863d8
GIT binary patch
literal 6612
zcmdUzO>9*~6vwAi`oU|Ug($(skfuw(1RG;iu${ir2PA}=wp4Ue1u>WyV^EXI!aUxF
z9SavkqAQ{#%GRBVg$3?OVC4csLUiG#3)lXCGjne5d%Z2igoP)$@6J7+|MM|(Z`+tV
zy5+b1UtjHZ1D`E^dUk2?lMgPOJ+RX`*X4TNJA3Bc4-a&)?mm8U{y<lkR^L2#_*8xB
z%7x#5{(NQYM{l0{d-122TH-rNoa@$ozpg)ZJul|5xg#fj)Vfz!zpk%zLFl6k4eI(f
zuF?;D<nVt;toRGx>+045J~|M5u0a{VM+btpMc3fA#OE2}-lGfsxrN0yX6BB~ADcPh
zre==M%)0sMQ&TfDvxnV{8DS?E;(&cbmy!7bqkPOy&K{YbcQ<a#9X&j|wA;BL{vIX$
zmLN1PkLW4+d7JR>48><#<NwrdLH#)KPo7+TM#l5$A=f=NG!%1Vy`nW3Sl`u}JdICo
zXBB5<B>6k1lJto;?cCNCmw0!wedCMtY?$;^Yh@iDoLkub!p(b2-`|w^gf7?cS>L%n
z(|axJcS&C~VR69T$e7oQgN_f?agd2(9M;6)ZgI5iFJWj-iUFA(x$Kk;^WcMigl*rY
z`#0wwe)kIxmW%1Z^TD}GyRMF3o8C2XZ|Ses#VYi)>>JIw*0Nv2f{%KZ`5?`TSeB3J
z?alh;LpJ^9f7lHb`Iz2|&JA2^kKt}DFCQY<9}gZJTG%$!yvTz{%mS<RM?RwrtgVut
zs(drne(DD)-vW>M6P`j&4!4%WIC^CaCHv^dFvx$O^+q;Pmg>+f=BHcSN5g5(tLDdi
z`%pbU*o$Hu7VUB3JQw&o^CN%iWc~0#jEbHT!|G{sR#nf8CC)2)RzuxmUExtr`og*^
zq<SK!p72CPPm4N+$Y*apc6P>coxN<B7n>bCG&b2c=E~|$4&W;4Dp|dgr&!Ll_w@d=
zPq(Mmv#Op_W0O;3>Y!Q{GuzoqfnRfGSkI{gYago53}m8seo-f@7jZ>J&(PbOdn28;
zc>pVNZ0MI^g;(C=;)~-PcVwcNCu{kP466q`s{`w<kY;VOzS+CrA}5QB5Bf~~tiGJD
z==h)?$@HUDQ`hRdi1!xnBJS($ar062F2YXKc9x)@@T}Gt9(7<}TOHt89n7XY5AevR
zo^$m<jEZ>xgXK*<eW;!X!)pHMxy6-PoCjq1uzAqEZ5~Wce#`@M&IfF49`H$DxZ?+z
zsNZa<10<d38##3_dGZ~`H|v{uU@wrL#l;6bw{L+SJ#m(!Q`P6ujMs<ivmAR-+uW^J
zJMyE?mLGbZ`O)Wce)O*;J8I#Bek%G52Ac=+@S(cThSmIm2fwK%sn5vpL4P3WwDrQ|
z*wAO>^cfraT+cqOzr;W$itiBC@F4P>)EypmX!jk)H|v`|kLEZQH|5lv(06d$C*-Mj
zNsQ%#9-LF?7(PDeXU#jzd`;)?Q|iZ=z`bf#EO#F^o)yzG|K<9dj2bDgqDJ7~%&geF
zgF&?B9RYS`#p>n5hO-jS>T=J9OFfgTVt>_gZOgeB7V?CoQ||Y`Shn#Y%@W^f=t1`0
zCwA3bS-i4L*kXT)N4=N}FpzV>3wkK+fBybs|NqyXVlP@V_vJb~?Vf^RGd;~%|Mxwm
zo{#G(-*Qj0r!8S%f3CMrP0k!}rb{oLli1KJ+Z$eT(VBhwggxDGAKoUS==%0_@7>bA
z4^8d^T8TK@*^ja*zCmrTp;5{^8g$BFvgaW7;i%Tuv&aklrth+P*5kVj9Ut`LTwQWq
zZYn-?>}7cD_e{mNv(AO$P}e$sYe=X3_f#~IZPeo(EQ;S4Ebs|W*rS|tL=@jmEX;q_
ziRX;Y<$;xq#fQ{ydTv*vR71IlzVhr87!<D!EB>i*zPDkamL><EVdAV5#auGJ!oPIl
z*$CG2+1>{`cj@)ATBvi^r+#BkPwz?>>b2R~nqu4gnmm~C^0xpyY{3axpU4N9sHlNq
zClB<j-s}%BfE(W4+z-pqY9O1KBYf$^9JMTJU~==1p1nu$-xa{V`b}whx8w@~GlcJ`
zue|D7<IiOHV3w^WJegnOU(~bt#TGJK{6eZr{Cf<)1uq~;e$CGO);j!BFUV{qkI(oW
z)f&GAFCa>O&CdJ^S8-0!LzA1W^1(RbMONi^heDa1W<ToqfK}VyT9dD+Pp7lL-W{pF
zy%$GNj5Mr&hnjq$H^r4rZA>=Q^GZ+R`G9)RFIPdePFo)e*{@o0xk<$^e|#U}mv6>a
z#$`MoB#8J|V~pv$a8!DnSymtFs1ttD`YWBmFS9S5yQTB3c@RzL)yoeL`oPMScxMhy
z=kHE1-7!4+zo>fZ_`fLk&RV1EgMK1b>Yc9b>g9@jAg3qXd$Ui?ZOt(HAVCK$XwO6F
zZBWy~YLEI#O(Efq`;)cxYhSK8Jn9PxU;G|qo_x?x2mVHL1ZE`aemmPyQ*5|Hz0aiF
ztaj}8N3|sD{ASlI^_`a=bQUyAu{L@K@k|V4)R^}Ycj{Hv!M>hxSpT_$=Vj&C%Ca;Q
zVoKj|U$^u03GjAe0_Sz*W|+W8Trh#b;$mn0cwhR+tnT)IaI2R@tFn&&!N>R`xt6L4
V^v~eh_^qsy;x{MsQ7>pi?q97VMLqxk

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/dx11/chains/hq3x/vs_blit.bin b/bgfx/shaders/dx11/chains/hq3x/vs_blit.bin
new file mode 100644
index 0000000000000000000000000000000000000000..b0bebf9da4c8f62f3a2c050041aa49355e4d94d9
GIT binary patch
literal 575
zcmZ9I%}T>S6oqdxsfHppAVNWqf-YTUAzeu^F*cx`kd#nS2nfX=go2<xfP0_7H}Hkr
zx^)@Qwdc$@MI5*{C*Qp@XXe(`IPjj^4^O%e&Ew7dskmR<1|kwj-%n?UiNE!^8@(@f
zzP`QTdAM=vq1N|B6ux_iS40GuSI3iUXz~zIAlxG3>h(lwD@`Wnd8-i3KMo5~;E6ub
zr4+i#r@5ZU^k|l7U8bVpcgG&YUq7Bl#sxdMFv=!!*2ym|GMU`?t%+21voy2bOUt)v
zoR&ObgfzmQGmI&F89;Gf<_)TiBJ+>;s2G}lPSfKGt?j_}ur@~@|DBGZ*@s#BWJ5f!
z7298L+CJyWdMwg)b;p5a<<~n~w|jv?=j)j3=ll0XI_@6Xw%tSK?vvp>-s^xPR2`%U
GGxz~&T{$TL

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/dx11/chains/hq3x/vs_hq3x.bin b/bgfx/shaders/dx11/chains/hq3x/vs_hq3x.bin
new file mode 100644
index 0000000000000000000000000000000000000000..5b037b2bfe84c87e9bc961391dfb4f721226ebfa
GIT binary patch
literal 909
zcmZ8gJxc>Y5S`p5myn32&{7E&Hl~miVx_^vGXe2JE`(TJb@<T;ej^AetSzh*wX+Z{
zwNGj99}xTjf<dsc@V(ocpbnY6w{K==-p*axel7W2yt=d`yB{2EhKG%v?X9GUBqg^W
z?1e|c?&fhgV@X*O(z2_a#md{q`*`?uH~soJ_42)bbDltU%ND^;ituZA2V~t}UflpD
zpMf{vYUF4mBO+}Bqm?}Cr2&F}yoJ3DzT&NTO=)<3y;b*CrM1+lcwVzA9{N2Y$APoo
z1)RougMPrbBxBQlkRkU<;z>U0H)MF$ppmC*K67Z~I5p+Dr}3GBllR-fK(x8TK>CAU
zt2RH;gi}62?i$LuX9Xa09<#9f`Fyk|E&)@MV(M7OnSR0KFc$I*_KHiu%u}A)6jQt6
z6foYK#oRfJvM;7)d(6~QU94LY$!c7A(Bj1U++lMTR7SNar}@+|i)*S@cfy<@r<z^V
zqn=@r+)J#-Dua;j!f$s@3nZg=0qt4lQl}H^u*%p-x5qU;*JGc_I4@C-0$kG6Lv7R>
n)fhDzG{%{^&fgeo?Zo<A%fvLFbJe>$ajkiNo^}dL9{-OY8~t4o

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/dx11/chains/hq4x/fs_blit.bin b/bgfx/shaders/dx11/chains/hq4x/fs_blit.bin
new file mode 100644
index 0000000000000000000000000000000000000000..80d85fb110742d3ae2415a237aee617a3e0c7b8c
GIT binary patch
literal 396
zcmZ<@_F!Rb{`8QMfwefkB(=hTk%57cp@7jP!pV7G#q*_-JO!_PHm;EuYk4^xC<T;Z
zU|<H)IzYSth_3*#XRy0p4v+?ka{zGw5Q6|nJxB}$_<=YE%z_XgagaPeP$CIUoC(Nh
z1}X>+ix2P*_6+g#_hWGO_wf&62yu;Y_V*8RVOZ@Cv=ih8kQpF56@VB9knIGT5#ku+
z?i#|ddUddeOVAXcA_pK=1>z`>^AZGrECz-M2?iF10th=a6zC=a2Ifx!0$}q&Y$G5W
z<gQepo=*x8br}o{Od$JR85lS}F+jxJpz7S}Abgnl77PsRFnw-(P_=Rp^X(wsU;qHi
C*D!kk

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/dx11/chains/hq4x/fs_hq4x.bin b/bgfx/shaders/dx11/chains/hq4x/fs_hq4x.bin
new file mode 100644
index 0000000000000000000000000000000000000000..7ebeaab6cd79463c34744278bb99ae1aa57555b3
GIT binary patch
literal 6612
zcmdUzO>9*~6vyXH>1%lnv=AlO7}9hJnqU{k2)5JL_5lf@hL#51plFRICMassxG;}y
z*tuX~Ai5$-6cSc$#liyDlE4~cg1R#4!nOb3%$(c%UT;e=Vc|*cyK~Ry|9s5c+qUM8
zZu{khudnpDfzQr-y0~=alMg;$Jh<CAS987ZF23{jhX-q{dyb!)KUk}2_04nBr<+sL
zH@`pk_aE-^ub2F}`!_$nE+t8v>(TuMU4QC&Ud&^2M^5~xbzN7#uFJY0^wEU|b$uIG
z=?6Y?_}3FF{=)aVdbEI#4g{ZTPzLbPf#7Y^HMk@3d4{<6>Oy~R;mqr^bI0b7&7N>m
zv&Uyoy7`&YQ?s)tr`?TNVJ8>jfPF-lk@*6ne9TXtJTf!yZrqqVI(>3!uX92CeM<Tb
zL1=wBqNn8NO~Su56rXL4|I>Q~^`pc;b!zPy8P8{jT+i6hP|S_>s@7m&eNSuhG(Nd4
zD$eRi^7p<<(kI@GbK6&4;@!>mtuNBEVbW7$IqUe~+``TmZ{1(|;g-xNbh(z#`p)&4
z-m6)^CVkO_#Q}ROW8NqZIzCj#K_-fESQCf4#nH0AgrPkt24s5VvRgLHgAe)<wgVR*
z+?xOWyPtTlTucw156)fOb7lPM%$|w+OMks4R-vb5-)PRYk^LGLd^EGn2WeKsvV2T$
zf7Ul2vgtSf!)~a^$MjxuZs2NX40n5F<uJj1d-(A1!j7T#1s+6V7Fex6@)>1dT`u{l
z$~R-}r+$#~E%2B>;VI<gaC;?;qgTdIvX6cYgZ%edZ)6i?sSfR8etN`xG@RzVYJSYO
z57qO7y(q?E(HSSsbAi7*Kk}ze)(;=VsOTv%te!S!RrSnR;=H0~HPk)U6(04ZFRW`J
z)e|}OgeNL`TGTN_K6~@Avon_K>}A8e*zDk;wZ*<MS5|j&09R30$(r3f#d5B*rw^We
zx;?d?RrQn_o17X`2i3Be+3sEn{JJy4dQKf!`%rymAQQ#&i#l1oh$||3hTi_%8|ie+
z16Yw`L%$3wyz(9wUmWMSBNN3uS<7c+SUuob9az^wnzgO^X77TFoGdOr=ri@R`f|Ra
z<AZ)A(~nkdU2E?m-dntjxNo$_%}3R{2s=^7S%QATvsPnx)Pa3%b%1AeFq`r`z$2e#
z&eaDoD&_$UmN)hEp?V$+tNEkn7FT9*9+2U~=0W$4c`!NoF%QT&AF#1`z$bm-jvr*A
zezT<xkaVJN<kZ3B$#)pvs&D3jy+D2z7a#Q8z6E;q#959`Ri8&QULUH@a_mJNbGK3L
z$d5i-e&}`QN1x02(Z6NcQ41gRQ_*KI*gTMj57m7(tmY3q_)RrQeMW{4`U6R)qZcN}
zhCU;w&)CrCX7*|QB?dB4e21`x2a)Hb?(nEXr|&SnRp0b^G{>>HDW~>?zJudFAy2(a
zVk{r@;G9Co@bN)E>)v7JYbJl6Qa{cF?p3p5x%;sBteBqpFW28>)JS<1H3I)uX2s?m
z45D@K2(U9NRxckmot1c2mwPr`>X}>>`>T;_Th7I>kS8Raa=!=0vW*XEmiSIX53=_@
zv8(3F;+18>7W+#)>cw1uft(9o&_ike^Y<V7|G)MWd(pbNFW2E|_Y@3U>1oFLzwasa
zd|XfYmV25#T^0uR=SKU~<jetQy7b~Xi4DE7z2PMnt=p$h*wan-;T<B1uI)_s`nJw}
zXmTIWO2paDew0n|4QhK0jZ)sxpj!r$JqNK5N42(|MPA@HeU~+}9^Yl?_@E!>nv&~s
zQ}L;5FT-QMXDYs(buJW#y4LYqLptTZr=p2$qaN>IQT)bWflqkC9_5@PqWErNVg9pD
zJZE$+53FV^KBRurbGurl8p=iVm1n2Gpm-fv@lTEOy#ouiG&%ST6KAC;=92Lh{-qPo
zMzEgG_CDCTORrbdLY=!l^&5M7dQZAg-DYQdif!*}@?gfx-vaQk1t(;EA|GU;q6UVY
zJkYaxvp>K9Zg~51KP*S9fox)q@TC)T)Uv37$<04{_8!H5Er5OPo6_=LmM;j*5Wb_n
z@@i_0Ka=5uS+<(+WPXW%LC@wFTgYtj3#l&g?=k!qynrP6H9Pa$=<-XwAhVS`KI3;(
zYy1|xfGGJjJM$}C#W_U}O>VZz2jhqrS(V>i3T1Yh{ix#uRvmw9O}?T&oz4F0yHb7Y
z7e-KwG^~GzntY+2;>xBmCL8McRd3??fO=cMTm?0{ZG9+YKWoM1CKbc{@qLJ2z8RM@
zF5~$iLBzinV@%(LqtfHdvieX*=}lUHr89Ub`_j2vI^Wud&`i`m<U?GQc<#_l{_X_R
zUBjdQi>jxN|BG_(t~I(o=qF*--)_{rJ+V{0T$K;x^n`mo`_$Yv45JScbkTzLJcQmR
zH7%_6sjt)&67IM^SzEsj<eI~yzL4<6??L9t2mN&6Z?#8YMxyR_vK=+WhC5V$Cgo<e
zW4}LYBw6=2yJo5Hy!@cEpjnEw(L0D|Vj!c&yqCCBud)vI&5XnP&mBB3E63$5OEV#+
z^bPklJ5QegZ#O1zUQ=#{35>)A6BsNmcGi#gq>s$%ZvO|jdP%e<>-ryjj6afVshU9l
U46cvAoOM$C_Jls_1#QUv3!>jd{Qv*}

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/dx11/chains/hq4x/vs_blit.bin b/bgfx/shaders/dx11/chains/hq4x/vs_blit.bin
new file mode 100644
index 0000000000000000000000000000000000000000..b0bebf9da4c8f62f3a2c050041aa49355e4d94d9
GIT binary patch
literal 575
zcmZ9I%}T>S6oqdxsfHppAVNWqf-YTUAzeu^F*cx`kd#nS2nfX=go2<xfP0_7H}Hkr
zx^)@Qwdc$@MI5*{C*Qp@XXe(`IPjj^4^O%e&Ew7dskmR<1|kwj-%n?UiNE!^8@(@f
zzP`QTdAM=vq1N|B6ux_iS40GuSI3iUXz~zIAlxG3>h(lwD@`Wnd8-i3KMo5~;E6ub
zr4+i#r@5ZU^k|l7U8bVpcgG&YUq7Bl#sxdMFv=!!*2ym|GMU`?t%+21voy2bOUt)v
zoR&ObgfzmQGmI&F89;Gf<_)TiBJ+>;s2G}lPSfKGt?j_}ur@~@|DBGZ*@s#BWJ5f!
z7298L+CJyWdMwg)b;p5a<<~n~w|jv?=j)j3=ll0XI_@6Xw%tSK?vvp>-s^xPR2`%U
GGxz~&T{$TL

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/dx11/chains/hq4x/vs_hq4x.bin b/bgfx/shaders/dx11/chains/hq4x/vs_hq4x.bin
new file mode 100644
index 0000000000000000000000000000000000000000..5b037b2bfe84c87e9bc961391dfb4f721226ebfa
GIT binary patch
literal 909
zcmZ8gJxc>Y5S`p5myn32&{7E&Hl~miVx_^vGXe2JE`(TJb@<T;ej^AetSzh*wX+Z{
zwNGj99}xTjf<dsc@V(ocpbnY6w{K==-p*axel7W2yt=d`yB{2EhKG%v?X9GUBqg^W
z?1e|c?&fhgV@X*O(z2_a#md{q`*`?uH~soJ_42)bbDltU%ND^;ituZA2V~t}UflpD
zpMf{vYUF4mBO+}Bqm?}Cr2&F}yoJ3DzT&NTO=)<3y;b*CrM1+lcwVzA9{N2Y$APoo
z1)RougMPrbBxBQlkRkU<;z>U0H)MF$ppmC*K67Z~I5p+Dr}3GBllR-fK(x8TK>CAU
zt2RH;gi}62?i$LuX9Xa09<#9f`Fyk|E&)@MV(M7OnSR0KFc$I*_KHiu%u}A)6jQt6
z6foYK#oRfJvM;7)d(6~QU94LY$!c7A(Bj1U++lMTR7SNar}@+|i)*S@cfy<@r<z^V
zqn=@r+)J#-Dua;j!f$s@3nZg=0qt4lQl}H^u*%p-x5qU;*JGc_I4@C-0$kG6Lv7R>
n)fhDzG{%{^&fgeo?Zo<A%fvLFbJe>$ajkiNo^}dL9{-OY8~t4o

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/dx9/chains/hq2x/fs_blit.bin b/bgfx/shaders/dx9/chains/hq2x/fs_blit.bin
new file mode 100644
index 0000000000000000000000000000000000000000..ef8fa0730c3a16c8151d82c7394b35a81d1f1d40
GIT binary patch
literal 241
zcmX9&OA3Ne6g@8$A_6xMB#mk!?_q?~48nmCWOIo!5(-5fGz{8+?V!0EY8tqL7SQWH
zyO+Z`_uLP68TvZAf8Gp65tZ?kGl1a*Xi|RV2#f998vs}nlt*o-8V|rH;slMr(1A;=
zqCJGV*3l<l<v+3_aw3jZvd_~ZJ(kvZGqL<246N|9JH)xQNH1A(CLy@ZZNa$^wwO8Y
r6!j43^ne>+R!SSB8MIc@^$K0{>9wzz<Tq3|Pnyxlr=3Qjl9DEWt<W*O

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/dx9/chains/hq2x/fs_hq2x.bin b/bgfx/shaders/dx9/chains/hq2x/fs_hq2x.bin
new file mode 100644
index 0000000000000000000000000000000000000000..7bebafd99629ff3d9f6832497d7f0391f734f509
GIT binary patch
literal 3709
zcmcgv&1+m$6hH54W`b!07P=D5Qc=SU6)Chf%_K?|aiPf*5h0W&Vjz;zL<p|lfY41A
zBe*GUUW6h}{sv=Rxph<56(5B{?4RKC_dDm__wE$62;w7`x#!&T@jD;)BX6&-ra!&<
z_1#30wS1!=MG{H2wSDu(Za)&tpZjd{VEb@$f9Lb<{`1ONJugXJ|50C-<&CA`3nKC@
z26+j7NXwTZC4N4@NMIw9j(mhUzg-N<MH0&a8Th`yh%sPZ#u)qnMpBtoZSwgkEIB!O
znjb)fJUymri#oUVH!p4W<(-|IxA*q<K0cU#>AjcdSJ&3p=GQ;Dv9*1BetGZHTRXd$
z4EhWGg+aeR7%U9lxODk-IeAwki)5~ZnIC9Nq*(m%{`G6*$Kc<&c=y^jZ(Uq`aQOJm
zUmrfaN`3<V`{!RfeQ@~QDHI@oU-_xpDHg%I4m%jKMET6@FM)?)ANd{Q55dQfWv-Cl
zH9J?pzX}$9MeX-Ye({w%znpITcJF)ocoAvMFhR!0HjfI#<K}S@%Q-hs3gFf`?2V;2
zS5lty2y*~H$>yMYhPA5fDcvi2Qk5bV>~OsYKQ(0JnDX!gx@zPjtW!R6@}wgtALx(B
z3+SUn>JojFw)S(_m?(x=BH%U*hADz>h>0<ZVzTvA<vj+N1;&Z4o6i_@J|ZumkKzV{
zu0w`#8V2H`&(>yyb%6~ZhtfxgOXDDBtYhSAV~AWK_n1Fva)q6sxk79Xhv`Jft>H2s
zZLZ8mn=3Eh<_hK1*lClwh#hY4gS26;NAzLqwc-wP0h}JgvvNfYIR^7Taj~a}r*3#{
z?7#nu*y&e-K2aP&pID6|X=7(B>=Pe5P6(}87&~$K*b?N*dcbl)I+1*;4?si4YRLSU
zP7OKH{CS<W?rNjav3_KKRz(VI%mvN}(Cr>$uW-*`9emb=xUHX!j)7VG%+-wc@+KEC
zaD#?Sn2S_%L7T)tob2D$2W!;si9}Lh=6;yCxTrsAazP)Uou5fbT&BZZ<Wo967dV}#
zbcWEuIS3o=9-v*uo;9)iSgil(!(yNI;r9U7i7SjfaeY9Wj6H=6WA{F6z3qck_rwHt
ztPe=1Qa7>F2WaQVVmF-{e9M>DX=9J4bUwr(WOk|oIDp0M2;ygdF$SNXB<Kz5g!yUX
zoz4&Rr)uy|`LViKJ}f`h8$Lg&Vq$ETbJCbMX9V?eP$TDtfi!yuJjLMFpUR&!`QtgC
zsSS&p=LTcPT?m=BH+<|J*Bk$3?6eui?tT0}v9q84D)#n#d{*rKUiEc%baN*7^>AOX
zE<7LqKKALlip-*}6|k;oT~RjHxv8t8b$_ykJQGCslHDg(XZAPm0`5_Nm!<`K4LDSX
zy})(u1G7OL?IlOsJ%=-{!NK#+$4;Nn8*vYrzP?GCT<}f9ID9TB!~EbbfIZW(GnaeZ
z--|r&xCgAKW6|?+#J;C~EM5FoK`zdL{>u5WT=<%V?+Tt};eA3G-X*+e%r0vr@N4^-
z=OgzaXt$nXowS!%T+O?KeZ!di+r{$1SZ)8ZCOrSbnwSjrB(P(5qX0`=TfQsX+VXzo
zx{qf@>#scq%sgKNp_oh$?;@i+kpH>F7+(;9OVSm6Bc}=Gk9CmtYdB|0%Esu&SXLTY
z+#{%8Rq$-hkSEURSAYq1!rx4h$yU*ot+FeR^o+rK9`?_Q2=7~umwJq`qj(H2v6?LF
zT^05=oq_H>yh-eyHJ;%I?-(|Y4R-=L#&L!om)PY=?c4hyFAd);YPkYA9b@|BT_wQJ
z9vFh=eJS#!;Cr0wnXvD2#Kl-8jX=9Msq&Dkn0FB|8kSkeRj{!#raitrygjdPZvyU5
o=7D%q)i;d%pWzX7Dh{>b_Y*OxOs}i!_O>z`(j$gRS=S=+Cv8#4Q2+n{

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/dx9/chains/hq2x/vs_blit.bin b/bgfx/shaders/dx9/chains/hq2x/vs_blit.bin
new file mode 100644
index 0000000000000000000000000000000000000000..ea94c83e62deecbb1897164a60e4cbd4bd062aac
GIT binary patch
literal 330
zcmYjLOG*P#5Ulrclg(T}aKMd$FuX@ZvdAW8lf?*<QMZF=#1X@UNsQZo7Z`8gK9?FH
zC&&RZsZJuXc|})uSJ&%@WMI|T`d6Xxk<PQx=WUU{Sp`_M6wIdH)aU5m^{!6=B!u)h
zhSc~5VkSpu!V+CV;^>B@f#J+T_9W)hw4FNKWKTst&0l8W#jqI;;v^1}*T?5k5%%-(
zBzq_EE^?7~&ilw;wL6zsp7E;&umFNmIPDhdz)#5azdkk9pPrf>-)l_8Y&hrc>PO+e
h<n4R`eWgapOs}1$5^nZ=Ek3MEYP5!_G<jX~iY+(YL398B

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/dx9/chains/hq2x/vs_hq2x.bin b/bgfx/shaders/dx9/chains/hq2x/vs_hq2x.bin
new file mode 100644
index 0000000000000000000000000000000000000000..de5213e137f9ec5027d8222e9ade7e7484b3addc
GIT binary patch
literal 576
zcmYjP%Syvg5Iwm`wbVuZ0KqI3q$X6voz=SNqC&OSZ4^y0Qi=4Xh>M6n5SQX6OR*o}
z(%;CUh+oloCTUAAnar7)GjoQ^J#W^GpRJE~g_VKRcORXe_vBhiGoYa`aE6}y(CGTN
zh6Wf|RnRBNB-uvw?BH+>z$;C1icVs@0nc<tG{p|Kp+S>#K@*-q>(JyZXp*bbvYxCq
zQ^!bW%~+@ndrsN0aO_=m{hr_Mn;WN_X06_=o6VccYqx7w{kwawLttAat7Kc2ZI|rb
z^4<<cCqOQTVgv-=qC>wg|8=fcU;q?D!BWtsI7h4&^5n!bJ~=7QIQkT8fj-Zxz?fq_
zpmt2I&KaCPjx@AF-U+`VwIxPKPrZ~A3)Y!mN_Wb0R!cZaL!SKPMe@8i<`KzU-XrIJ
zQD+><4B3M^oL5P8WETx>)<0RVgxN03?D=KxFYS>XvmGj7rj^Di<|Bv|#$l2G_y_u&
BX-xnC

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/dx9/chains/hq3x/fs_blit.bin b/bgfx/shaders/dx9/chains/hq3x/fs_blit.bin
new file mode 100644
index 0000000000000000000000000000000000000000..ef8fa0730c3a16c8151d82c7394b35a81d1f1d40
GIT binary patch
literal 241
zcmX9&OA3Ne6g@8$A_6xMB#mk!?_q?~48nmCWOIo!5(-5fGz{8+?V!0EY8tqL7SQWH
zyO+Z`_uLP68TvZAf8Gp65tZ?kGl1a*Xi|RV2#f998vs}nlt*o-8V|rH;slMr(1A;=
zqCJGV*3l<l<v+3_aw3jZvd_~ZJ(kvZGqL<246N|9JH)xQNH1A(CLy@ZZNa$^wwO8Y
r6!j43^ne>+R!SSB8MIc@^$K0{>9wzz<Tq3|Pnyxlr=3Qjl9DEWt<W*O

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/dx9/chains/hq3x/fs_hq3x.bin b/bgfx/shaders/dx9/chains/hq3x/fs_hq3x.bin
new file mode 100644
index 0000000000000000000000000000000000000000..6151be64f2372611f422252072c07b1aaf64b57e
GIT binary patch
literal 3733
zcmcgv&1+m$6hH4{G80UjqR^FKmWmo?s7NK+OeRsfhzm`ghzPMH5d)EwCPHxa0zx-I
zMsQQyya+{{{0+vsa_gq9D}59Kv44Wk-|w7z-@8++MUXynnS1U%AHVZ)&%JqP<!but
zE8pEpBw5Z@yHO;Ov^F-^uWffD!Tgyo*7i2{*LJtQ-0VK9E1#T~q^ka^F3aNT!r*xk
z`2mA#34Tb+HzEaoKEz0%Ba#XE7;}Ex803p2mOU=u`wAn*fO;8X@B<i0WlE*F&QD><
z@$sYU0YvcAVye0*bA5O1(pp#E-CDn~v%B-@-pq^dzch1od1ZNK<+E!Wn>S__cRs(q
zwT(%yJKLS@b-TUZZ143;mtT|P_e5HeOczk|Gj)mN^S|8bU*UR;^_v%OUHSg)i}QE)
zPv83E-n}=uo?!ih^RJ%V-T(0f0^q-+>#6F==dsp@9t>F^f6MeQU=4#`zt8mvTOVK@
zLl(Ki^|tAmd*kc-b6CRf`W)9g#y|h^&EHQ}@8AAO<bvv-G=A9a_o;*53kY`$ijj$-
z&7&NCx_O+(a?Z_@9RBDWVngXn7v$$W!W_Vm%4x`+VXrJYN_X;(l!ZtMJ>2iWP6Zx0
zB0ubaE^Gb>`{a)tKk3Nv2l5A83+Tf{ssi<uHu^K@7%7HWBH%U*hADz<h>1RmVzT{I
z`8@`x1;&x?o6Q(>cEGiOK8$M&x(^=uX&8u$HXEH0_60h;A4(s>FZF|%v5%3djsaqY
z*kk^%julRb#tObU93~SXwuZ}WG_f)pO{_eB6Dy=seWy;wB6hgF4bq0WI-m{PuM~F>
z3*ht^o)jx$$S@fHk@G!;KUKZf`2OdA@SS!gs1wBz)QRONlE!!X!aDK3qjPA^Lf?tY
z`<5V9Rs$9b(urhabpRSXmP5wJWGe89#?Q+%c~>2^jMXFSv&>UqV=T}+KsRTMwZb!l
zeXKJl#BKF#bPUW|XD(;dm({U|fg3b<!dRpl3+f~W;$;0cHkhO4OeB&5Gta}w`9=9r
z9Shn3?d*&S;xZY=A{&$Ou|U@zlNmq;{Si8vGeEucy;b|}eX;tZ4fB26hCc(`C$7-<
z#MJ?H()ScR^xfOA{iY65Jrg77u{t1~N>%$#8=##X^W9`BtXsUiOyhezCi4-Rkm)IN
z-~blWBk-T~MIU^8lAtyy6UL|UcRW6jAIrhN#mDku@v!(<ZTR@4iiy5i%t>Qj_Xx_P
zQ6uJtfi!CeYl^|`KN3Hw<HtVVQXS?u`v!f-9SNSMHoWf>t~UNp->Eb7-P?FNzO$bG
z$@iu|KFN1~ull?@y6y>nKRg%A3;W~aeIL)O$Q1Hg0_&3I6=`Fh>%2Nz&nI)po*;Ub
z>^`wPv%Yy3@QnJqG|gFSz@aj%1@7}4m=4NlEjilmIrO+12m77(oi-tNz%yj>`X;Gk
z!8Z;4@Ub8d<Ab{Z`b@@pF3-5X7uoN42CSxI(SCWrx~F_BZTyx&EY5-c*4eRG_?(3A
z3ih(_J|Pe965cbWmpKyHwe!sW$a4tV?Wfo$?fDf~{qA7h&?o<Pv3Sr|JHN~c`(Kz7
z<Dr}cdhBi#U}<v8cV&}X-ml#E{!D8AwZ?#%{YBu4@pSMmGI|31zZDq6=R{zVG<zar
znqYp4c~xKovbKjlQ;;`CJ;t(xVZ69UkiRl#Z*3t?oKM2802A_rze(uY$lJ0}wB>>J
z7`*dg<1CNxzV&!1M;|8?kKr{u<Ym6g+}@^>pl{<%V)v}Ad5qZ+bQ}>I{=j#NafTX~
z*u_cp+xsCa4Br%Txdc8PL)zqBC9nx4^?e}nFz0)m`z>MJW$>%asUrgI-lV#QSjD`H
zh|#c2fv<$lrQtyJ(<jsC<?T(t^T{|6Z>sW!k^eJ1fK17uI{bMeCgth0b>H4rrb9Z!
KFe<7_ME(YdAI)3<

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/dx9/chains/hq3x/vs_blit.bin b/bgfx/shaders/dx9/chains/hq3x/vs_blit.bin
new file mode 100644
index 0000000000000000000000000000000000000000..ea94c83e62deecbb1897164a60e4cbd4bd062aac
GIT binary patch
literal 330
zcmYjLOG*P#5Ulrclg(T}aKMd$FuX@ZvdAW8lf?*<QMZF=#1X@UNsQZo7Z`8gK9?FH
zC&&RZsZJuXc|})uSJ&%@WMI|T`d6Xxk<PQx=WUU{Sp`_M6wIdH)aU5m^{!6=B!u)h
zhSc~5VkSpu!V+CV;^>B@f#J+T_9W)hw4FNKWKTst&0l8W#jqI;;v^1}*T?5k5%%-(
zBzq_EE^?7~&ilw;wL6zsp7E;&umFNmIPDhdz)#5azdkk9pPrf>-)l_8Y&hrc>PO+e
h<n4R`eWgapOs}1$5^nZ=Ek3MEYP5!_G<jX~iY+(YL398B

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/dx9/chains/hq3x/vs_hq3x.bin b/bgfx/shaders/dx9/chains/hq3x/vs_hq3x.bin
new file mode 100644
index 0000000000000000000000000000000000000000..de5213e137f9ec5027d8222e9ade7e7484b3addc
GIT binary patch
literal 576
zcmYjP%Syvg5Iwm`wbVuZ0KqI3q$X6voz=SNqC&OSZ4^y0Qi=4Xh>M6n5SQX6OR*o}
z(%;CUh+oloCTUAAnar7)GjoQ^J#W^GpRJE~g_VKRcORXe_vBhiGoYa`aE6}y(CGTN
zh6Wf|RnRBNB-uvw?BH+>z$;C1icVs@0nc<tG{p|Kp+S>#K@*-q>(JyZXp*bbvYxCq
zQ^!bW%~+@ndrsN0aO_=m{hr_Mn;WN_X06_=o6VccYqx7w{kwawLttAat7Kc2ZI|rb
z^4<<cCqOQTVgv-=qC>wg|8=fcU;q?D!BWtsI7h4&^5n!bJ~=7QIQkT8fj-Zxz?fq_
zpmt2I&KaCPjx@AF-U+`VwIxPKPrZ~A3)Y!mN_Wb0R!cZaL!SKPMe@8i<`KzU-XrIJ
zQD+><4B3M^oL5P8WETx>)<0RVgxN03?D=KxFYS>XvmGj7rj^Di<|Bv|#$l2G_y_u&
BX-xnC

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/dx9/chains/hq4x/fs_blit.bin b/bgfx/shaders/dx9/chains/hq4x/fs_blit.bin
new file mode 100644
index 0000000000000000000000000000000000000000..ef8fa0730c3a16c8151d82c7394b35a81d1f1d40
GIT binary patch
literal 241
zcmX9&OA3Ne6g@8$A_6xMB#mk!?_q?~48nmCWOIo!5(-5fGz{8+?V!0EY8tqL7SQWH
zyO+Z`_uLP68TvZAf8Gp65tZ?kGl1a*Xi|RV2#f998vs}nlt*o-8V|rH;slMr(1A;=
zqCJGV*3l<l<v+3_aw3jZvd_~ZJ(kvZGqL<246N|9JH)xQNH1A(CLy@ZZNa$^wwO8Y
r6!j43^ne>+R!SSB8MIc@^$K0{>9wzz<Tq3|Pnyxlr=3Qjl9DEWt<W*O

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/dx9/chains/hq4x/fs_hq4x.bin b/bgfx/shaders/dx9/chains/hq4x/fs_hq4x.bin
new file mode 100644
index 0000000000000000000000000000000000000000..55d09ab2827ca0e3898d2179404a4278c35ba989
GIT binary patch
literal 3709
zcmcgv&1+m$6hH4{W?nFDK%pzaEEP4(P?3V#G?OS<#DykLM1)Y9NCT0SCPHxa283?1
z7{N_(^CA>+@;4ak%B`EauJ{lGv44Wk-|w7z-@8-PB8ZP%=AL`c$M1aHb8p^SUrm2_
z>C3x`By0IbKZ+!h&eryg>%09(Fn{Wk&4ca3&HbHExBE})%IZZ)>iUoRiY#v|4WAW}
zuQ9lm;D@w)E>hy>eT)P;BI(M9nDg7kAYUZ09B={OXBaUC)XNxyAHYZ|vntJXehN!Y
zP99$mAcCJ3Q`JS8Tl<@rH~aGT&W+o9`+FZ9%s>C`3-haM>udAtH?MDP-=1II`}o$*
zE+&KiLVsb<?+*qGgI6zKc|}g%5$QxSS3=Eq)Fo0Zet-YkRj$WazjNvC)vw;XwD{og
z?2VrvK75_)3D)1c`10w4!*5O@0RH>Bo~oW=5o_0=2Sb*~-!c75Si`W7>s?zPVjV-4
zxx@9I>3Iz#hkjhojDPXPJ3pOn{BrMG>U$1h?O=k4k8K_m@W;*LB9;qoo)o~Xb0{23
zHdm6L^9XYQK+5JIdyc)T%#_ZGOsZ0(f*$T?uv3Faj>!)@psR*I!an&U$4@$P{DJ(4
zYXN<fNL`|i(pG;C9TUY6O9b48!7xRT4KdM2QB1a<D!<17wZJ&heX|*Z&PQAe=%cv7
zp!?vVpN4_BXtUKBVPBxb`=Rs^{8B%N8T%Ny>KGzch&|?ynpoi^XsqCy!(lQJVr#g}
zMjI=$(Z<U2x3NMx)pzP-EMkY-+aPV2>k)0(eyzBJSOBNT@T6D~Lyp1tPn_>5{HdF@
z*7x84h3~X0L7ga$piV4Dk+i<k7uJdQ9UVe*7Wz(H-nRs?vKp{hkWM6@ssqsAu^ci!
zCR2k?G=5&D&AaMoWUL-ppH-0p8)JbU0lGb7tQDRa>|>odA#ST@qhny!I&(RrzPyP=
z4BVi>6UHLdSWqW15GU)mwZR;<XCjdln0X#1&M(SOnpn^VXlG|q5|_y^7WtHnj|IB(
zl*|w^=!4MFo&oBm@14eX?~BzRZJ6)VHvAdjK5>P<C$0{tlfI|mq3_;??YDK1>Y128
zkJSO`RO-fe+5qkBnC~W2W8LEAWm@0kDVYz@giKFW00*#`9)bU?FZ$r)lLWOvnJ_-B
zzti!7{8SG9DL$4Li-*O>YQx7TRZR5FVon<Krbkd7jT$jG45V2*SW^sc|FQT<6F>I(
zj_NSK**EAr?n3aiwc&m5y4v_JeW%XQcW>kW@tyVbSH8FX@kze>d)4RN(M?bA`{B7@
zUf3W1-uLOeip(Of6|k;oUXeEDxyh@e^?Wji><OZ0$?g-&GwYjo0nezvOVfh21{^BG
zTHrp<f$5-(){>*`o<omoaIoKb-)R$aBc36X*EdNM3%+UShmQq$7$4jP&}TB%b9u)7
zy~uvYGhj6xi}uSA>z?wl^zd5+vA6*G3unh-;d2tcE7;4z`-D8aOL)(iUgk((*UmHh
zBhMjdx1VC4wC7h`&AWqjL!bQH#o|F<?ffz)?0;cSjE8a(=&`#|fThhX-<54{dB1Ys
z`!l2Y*BS$6_7{OG#*^V)WONt&Kb9EdXGCC<G<zarnqYngSzk-Ghdxu1H%2|ivO=87
zi+cq5s|xnk4&ualD!)ND<0tr=f!?j62l*cE#-Ylw7S4+Z?^}<Ta`dsQcnq)MAusb?
z74|lr0euf|61!(@&11}uq2rj?@CUv#jC0hu#4b*%-`)>-Y4~Q5%N6kH7}F;2DuGSb
zzz{U=OOZzf-{aix2<t9~U-VVd2(){X>KbAd^DZJr!!irL3OZKC)W^4n*XQN!O~CWX
oI1q2D@`jQBGyDpfibHky^F&O_ll64p-d3hVGGdsNbuA))0*)-kQ2+n{

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/dx9/chains/hq4x/vs_blit.bin b/bgfx/shaders/dx9/chains/hq4x/vs_blit.bin
new file mode 100644
index 0000000000000000000000000000000000000000..ea94c83e62deecbb1897164a60e4cbd4bd062aac
GIT binary patch
literal 330
zcmYjLOG*P#5Ulrclg(T}aKMd$FuX@ZvdAW8lf?*<QMZF=#1X@UNsQZo7Z`8gK9?FH
zC&&RZsZJuXc|})uSJ&%@WMI|T`d6Xxk<PQx=WUU{Sp`_M6wIdH)aU5m^{!6=B!u)h
zhSc~5VkSpu!V+CV;^>B@f#J+T_9W)hw4FNKWKTst&0l8W#jqI;;v^1}*T?5k5%%-(
zBzq_EE^?7~&ilw;wL6zsp7E;&umFNmIPDhdz)#5azdkk9pPrf>-)l_8Y&hrc>PO+e
h<n4R`eWgapOs}1$5^nZ=Ek3MEYP5!_G<jX~iY+(YL398B

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/dx9/chains/hq4x/vs_hq4x.bin b/bgfx/shaders/dx9/chains/hq4x/vs_hq4x.bin
new file mode 100644
index 0000000000000000000000000000000000000000..de5213e137f9ec5027d8222e9ade7e7484b3addc
GIT binary patch
literal 576
zcmYjP%Syvg5Iwm`wbVuZ0KqI3q$X6voz=SNqC&OSZ4^y0Qi=4Xh>M6n5SQX6OR*o}
z(%;CUh+oloCTUAAnar7)GjoQ^J#W^GpRJE~g_VKRcORXe_vBhiGoYa`aE6}y(CGTN
zh6Wf|RnRBNB-uvw?BH+>z$;C1icVs@0nc<tG{p|Kp+S>#K@*-q>(JyZXp*bbvYxCq
zQ^!bW%~+@ndrsN0aO_=m{hr_Mn;WN_X06_=o6VccYqx7w{kwawLttAat7Kc2ZI|rb
z^4<<cCqOQTVgv-=qC>wg|8=fcU;q?D!BWtsI7h4&^5n!bJ~=7QIQkT8fj-Zxz?fq_
zpmt2I&KaCPjx@AF-U+`VwIxPKPrZ~A3)Y!mN_Wb0R!cZaL!SKPMe@8i<`KzU-XrIJ
zQD+><4B3M^oL5P8WETx>)<0RVgxN03?D=KxFYS>XvmGj7rj^Di<|Bv|#$l2G_y_u&
BX-xnC

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/gles/chains/hq2x/fs_blit.bin b/bgfx/shaders/gles/chains/hq2x/fs_blit.bin
new file mode 100644
index 0000000000000000000000000000000000000000..22e2f0c23d0e0e483f849e0e47fd609d34302edd
GIT binary patch
literal 238
zcmZ<@_F!Rb{`8QMfwefkB(;KpkpYM<GcYieB^Fg?=A|oSWTs~nD3qlpn<$jUC+Fwn
z7a3S{VMrPQC4t(L^Ye>RfbykznQ8e&xeCRJxdl0?MMf?PVAFvb^D|QvauYN26f`us
zs<{*ta`MZerkCUv0F8||v<8a8*b24^KvPRfi&B9`Xn@VoLAFT~q&Ph%-mNGx-5KOI
Spau=NW-Yjjf$D0xxEKI9`Arc3

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/gles/chains/hq2x/fs_hq2x.bin b/bgfx/shaders/gles/chains/hq2x/fs_hq2x.bin
new file mode 100644
index 0000000000000000000000000000000000000000..2b008d10a52cf10d58982228ddaa3eb55de5c995
GIT binary patch
literal 15856
zcmcgz%WfsN5tZX)qx?iK@Ab&n&3-owXOqClBD*B3K`>B88d-oI14;9cjQNltUy?7#
zZ>6f5WLI?+Nf~ei7~`uhcCo6+b9kD~{_(GW{_THH{{647kADB*&BOWUH}{uM=k;&C
zIy(C5=yzx5Z%?n_2mJT-U;h5L<=20HI6C@xdiQvFb5Z?tdGXWx>f`y_ruv9?zrDS^
zJFCAxR`!nBUBTWI?Ctl*A8sz+-QHcV{dX0Mezo79UcbLOzia+fQ7V=J@`C<uFVCv$
z)61J`w?F>*xLO@I)#c3@lm&toS0Aq5Ly~VG)~X7>s~@U&cc*V3b~{##>Kh)~;q&8u
zZ@YrDqN^5M-CthZ>~`PQhrW6hyGY&Kv70-%dFKxGcRN;-*zwivCmOLX`0UxOJ=_Yz
z`0(NG9BQ_sqMfjzt0{KnVqh)?(}k$Wt7_*<)<Jdr&vu{6ZDiiZ!z1{w4=~4KvBtw^
z>~k5A?(i8+D#VH1F#VDc$LEANGw(BnBSV}i>=@#s8KUD!x%!s`IqM)p1=>&<M^o6x
z;2gN$U7tR*yZX?~^9j_npGN$jbKOY=)6NZW75?A0j;#J4xYD`BQcrG=9cLztJAD4M
zhq?D8Ce9iY$B%1XDyGM5OdN;~k@zBYddkMc@$CrU|NpUT3S-BK!y$A0T6J2G+-If@
zCme^2^J{gTnaa%}KSZ3S-1ssvwS^(#tmlySUZ76xArCLkm2Q5inAF(4yShDn2;A6k
z>TQsEPyczp3#*iasaSm*+B)DgzEnv^M6#Ffs(3Sa`vbD-G&OAxi(K_HEKhOmYLJIv
zt;Pl6OLcyAe{R_QTJj~X8nR2yp$&2<#m<6%1OWl`zK0y*RR=55ay6X`5uwPXp<L=_
z?D~41R5D1Gxn$5@NQM(#gG9GY=E+PZTumoKY$cNEd@^m{%$-xoAfx4yK|4=o(ZX_Q
zh^IuSZs}C@h9qY7W_cy1sVd>O-S}N+7*dh<yqRM`(8`#JGjNIu|Go0R_JG6^dr*DI
zcD`chpXM|E@S3E-NW*U*g>MtClDPEBo2rn)1SgpWNhX75Sm%<{rX^&GO3YM=1fE;u
z4r?5J24v^6hGd!;fR^jD7WrWdfq-0&=cbJ3mWYDq0^X6EQh08WOmfMfy^stSQ!V0u
zn@m8iOeS1S4-657NXA0|Xx74Wi)4~Z2JJi<19`0?5g1RZ;1<tqiaji^#1ay3P<rV%
zqNHU^p|ECo_iVB8@5wL5&2ZQX#!!8%kzhMtF}!_?XNok;dmn|wGgT?HpeiKr+;Sn)
zBHv{245BDKZHO4ew3)JaM()VX8np9Sqw(BvZP7(-5m(|qB9}t|R8(nw?v&O5?>Rho
z1+hW)LNZ)zbe7l%$d$>2tI2`sl-L08OENZ|yMovtJ5R>IMyE++VfQ-X!q3hw#U7Sd
zVhM>iC~X4I9b*cGHOsqai;aK1{zsg4f-zJdvRwwx6lti3k3!;^suWsK6%u&vhz>$a
z<dF=XVM`}HZHO2+p1U!J=Z<L=OK+2%&l&^ITw8QeTNLozmGRswtpVP1c<u{ggY5Za
zdM-A4OKb$>ay)m3a5XtFy%HPXJ%{JMAU4R(lQFQ-YZ6)5UE#S;v4`cASVH0rN}IrQ
z&zM4C&GPQqV&h-0{}HFXU<}oVY?r|^Md~rw`zR!ysY;;*RUv`rp6DR7M83)3dC1_o
zCt~1u?uQ(nd!|(^Jd>Tz8ja_kYl}W=ivpg9XW&_B4e*}Db3ttMWw9}Eu`yU;BOsUK
zc_`y~P+|kT=kPof#0J^<$QaldG>I(iuJAmh*u(NlEV04ccHNIC8W>Y3tXbYYTS)(q
z?Upar9t2~kK4iNLo+(m~!NEr%@k~_;EvO0!JP$+%p(XN72G8*RCAka?L<}6y!?Kf*
zczzz3R<ZC*c0Ow~o(HZihNvwHc*Yk?h5fKWX$|n6!}CxO8)Ppe!^Os6i46<SV;Rq*
z5*y$>hv%^%HptGCF|aXe5?R<?;dxB4hvk)6VuQEsx*t(AGNw>iv%Gt@kp3atB%VjX
z7^;so5^R^jGezn#IQl3go~cTq1yvz|=aJ|jv_!ti;Cag6c_d=scpjIXgan>Prd2FF
zlbz2RjpvbTi!o}80-mQbo=2rMz<UnQV?k_?y^stS8>1yQEId!oz_St?;601yg4h_h
zV#C13q(}tDQ{uwUxhcgSmRDkl4c@lvenip4m_lLA^6uGU<6p1;YY&1kR3EZk2G0~}
zsE3b2;+d)xT2K`dc%Fz3LQCY444&aYLUMhch!{AYr)4K0f#->76${T~&qHA1+G2{@
zqJU>SK~Y$rC#5yOdk)W2L2Qt{kPH_alO;ARJkMo3PfBcn_Z*(5g4iHCPsYNAA`uu*
z8_y~BFucyh5)yAvTIn~UXl6{Iux5GpY_ajL*Z;K#!5FF!*)D@;iqvCp_EBu`j8zIP
zs0w6XvVc=_@f^%dbYNU3oEz8qdOpJothJwpFPC6?TusaCix3Z-XIM?kPG~T}4*F_Z
zHdR&=I`mapFEUrlLt8Mx=H2RQ(SNIn#kMRZtBE<BXjW=rFmocABawI?4tri-+UH*K
z&5Ag{8&1yz3C;!HAUlVe5j*FNS@XuaUC5u)pYf7!R=fe;7v8X6+Rp{vAbTMh{*W@`
zoTt?&GWxn*D3b})m|UG)tpo<RU$U{^3cwxEeddMD(tzh<aEhx5&U{&fF_nZBrdiF{
zM68IWU%%`N&zh>DZ=pPdck|u7tIdZM%vlD{-uA&gYsKg_9zTYn8v4pnLp+Zn8eq6F
zcJqk^D$CnYIT9Mj)tuzuFSt>t9HhM!;JIBzSF6Vs^oKP`KpgH^t0D>?^TP&w9%+!f
znsYJy6*7p(SOLwE@r=DiSF48?^uIvE20GkQN(md3QsNIVu14~ZV8>-eA2)i&4x_7;
z`au6nN-4A>*<{g<4R}fxDwl(|9FsWw5;0-e>0GYWqv_bI0_i&WDC6i<u6M3<iP?eY
z6DfY6lAGu`O6izw>_l}F<&UF=IlNQ2u`oUqses&aj(It<1NqT8H~So$bNrzO{t8no
z^Z@%34DY$Of^dWx`w(RZe>uF<p;~KPL+{jp&m;ryjw=#JXJREd)?EpX_jR#PuY^u%
z6!f3PI~|P8ri6r4N{I^<N9S6%DOq@5m;6jhN~)m$EZ*r1Yc?e$B%YFq8cj4Xx(U3e
z7{+qE93$OMysdIr5k@CXBNW9lW3TUxCzNd$T0*c+m_R`u*mSdLn8Q1T8}JZ9+2S4R
z72B-OJO)}CVvN`p#e-PiVMS+n&+SUOhNwf}9ZtgL@ZK=hBPtT(!3KOLSs4h0VjNdp
zS8|T`l?Bq^XtZJh|5>~@CCNe!N+}7+(rC%DuH-VMzyg_+v}6JQS-jJc&>Y^W0Z++<
zr6w8}ejD#i>T$?)OhmE)BUD+sW(Z?sqJU_1upB={)XKT7CB)hZKZ2UYJ3os`4Yzup
z4$cNVgitnkr+S4p4b_8MEZM*wNBqvriG!{17r=X^isgwbI0EA%Gs-Wcz{qw7oTE<J
zouAm9%`)`MCw$c5Zg+P35YNHS4Se1P8!`C3+)35oKivV}M!l*;v(`78um#MwlgbU)
zPBnyYr^sJRz6NjxO&hq)f8OT5CZzOsJ21lsRJ<ps3wh{dL?_kaBE$tJhHvk7^!ybb
zCK~VrT{k=G8UESt!M-PNP4wo&ATpDqBiNXZ{<06d;48@!_@==}A9{j9)a_gkO;1H}
zJ^Z4QP#kD=bKg2|uEz;}rUMZ2ua$dH%U6AIknwb6oI9{i;LK%4Ha%e3*ckcrs1sic
zx>hiID|WHqz@~7C@{I+vHHu)iMi~rQjiC{;vc<1aVt@VNNd$wZNuv?CdSev9Y>hG)
zvKqmN1){}8I`-EeK8gNt`HRLu8AUMLJ7q9rrC{K@H%2M6q{NXQU)TRwJ9Mp_QR8bT
zta6CQ*Nw2snvbtrVWlD%#UZ+h@k|HI!mnTKDtr$K*8^}J9Jv05{nb?8A&@&kRIXi^
n%JTxzRrm)WwWp6PvG^BPZ+^Txz4+tp)$JXx1w{7c`1t65_naJ|

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/gles/chains/hq2x/vs_blit.bin b/bgfx/shaders/gles/chains/hq2x/vs_blit.bin
new file mode 100644
index 0000000000000000000000000000000000000000..9dd618de8a02bb855e0ba2f88983419191ff7d0b
GIT binary patch
literal 419
zcmZvY!EVAZ42DyQQ=Y=df~KnNxS`!SA|Y|DLfaKjq^`0wv>;AA>0V(^Fw+6eG%it;
z&;H`yoAq)MT)w{oA=}Jhc~}|xm;^!u;=-r0*5J0aCG4=;HQ>s84l2uOPbOZ-C-{|d
zL!W4o>Zb)M7ud4PiA=!?r%aD^<@?>k{|~0%{N}dCcQX3ctd*U^n1bDe1!#pegj0Ev
z;D2Iu!}cs$@bmp19S`t!&6tL96u&?c#nV5$>zR-FqOQN<YM-rci5Z9E1TcH32ah-V
T;PKV~9PD?i1Gz8wET#AX?VF0}

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/gles/chains/hq2x/vs_hq2x.bin b/bgfx/shaders/gles/chains/hq2x/vs_hq2x.bin
new file mode 100644
index 0000000000000000000000000000000000000000..413d1e8bd20d9d06419863b165b3c81ebf1bf893
GIT binary patch
literal 1178
zcmaiyO>V+45QRg<D!qi4p`~sJNj9kaE|DsA8>JAy6^T)Bf<x7VR6S6y)rlM1L;2fT
zexB!V-puREbN^@f{dMEGRZ_ETH!b;lzvnnT=e9~jCX+4OXa0@4S@j(!6{2KsmB`47
zEms>-XS0x`$&9ag=}+7f@)+a|-!j2?aq>X`58$U6=j9wM>a=WFvBdth@jns+QeQ3B
z=A$#_S`V)1<B3}pY{ARCgUeG95}Vt9S!IJ#1bfcrBu`mEyn*}S65OQ7H_%-Ikc8+n
z-S5a#n{nXz)E|-&^#=#KY(Tg9QrWcfa-B@O#6k8fA-OZw%0~yQO!N#9RiK|kG=?f@
zJ%QvAjLn9?&jV%ow-$>vPlYaq+)VKpio5OtDq8`~Phse3z$ze;P*;V>ETnDwkj%lI
zgu4gNeu5JV>D~fhu8_7#qq3$8NaKt^_RykIDIxrOgN2$`bMO9-5L!f=!*K#RhKuMW
x^ymoPCZ|Sn9xgfq7bCd%M3(VIp!f)=>p50gngOVlw5;t0TnI7-)=$@UegWk+epLVf

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/gles/chains/hq3x/fs_blit.bin b/bgfx/shaders/gles/chains/hq3x/fs_blit.bin
new file mode 100644
index 0000000000000000000000000000000000000000..22e2f0c23d0e0e483f849e0e47fd609d34302edd
GIT binary patch
literal 238
zcmZ<@_F!Rb{`8QMfwefkB(;KpkpYM<GcYieB^Fg?=A|oSWTs~nD3qlpn<$jUC+Fwn
z7a3S{VMrPQC4t(L^Ye>RfbykznQ8e&xeCRJxdl0?MMf?PVAFvb^D|QvauYN26f`us
zs<{*ta`MZerkCUv0F8||v<8a8*b24^KvPRfi&B9`Xn@VoLAFT~q&Ph%-mNGx-5KOI
Spau=NW-Yjjf$D0xxEKI9`Arc3

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/gles/chains/hq3x/fs_hq3x.bin b/bgfx/shaders/gles/chains/hq3x/fs_hq3x.bin
new file mode 100644
index 0000000000000000000000000000000000000000..7494371f7eb85132e135c3af171fc22a0f879f2b
GIT binary patch
literal 15861
zcmcgz%WfsN5tZX)qx?iK@Ab&nO|qXboJ|5Fi|mrD2EjlXX=DL<3?$7%GUh{q{7bg^
ztyEQ$?5bvwlmSPEp^>_(>qVZ!YBu}FzyA5R|2_HlzrH^D{f9RX=bzu)Up}3;zxnFu
z=&PgOot?iuy@Frh|F8e@_rEQ_{pW|HqmQR|kC!(W%}<vXKfP~0p1-xtN4)#(?d{!J
z`~7hu@0i?F<hCMr-yeUtxqNqfcfI=W8W#O3zdyZxe|3Im|I|<_ngH?wf47%s&GqT!
zO|#n{|9sr6hHZ0sa|UIBpvBdP>-Ui48;G@O!tc!w&AYqPw-37=D@OAT5AE>zalhA1
zL0Zw215@{x7dN}zx9y>CUPTwVn>%)M2RHA`q5W>hY7!k^-F~7G>w?Xm-P*&gFpLi$
z?#`iRJ1W`<8@iTaPfQHV#GslG6?xU{e91bfj{nu|bGePo`gnK*`|SbdSS;3f_>4Z6
z0qG8(QIv!@u^Xme65{xr5NBq6rf_74Gld;Pd{jd;JSo%uk|5_a$WQ?nDr0C0`xuM?
z^SkTQ2e)evcAih5ru{VHKgM(?4NN;Tz*YFyIYUza1Fm#tk+hT9qvOJaF^A8e_AvLJ
z#Kc)+;`lN4rDA$4#>9bW5Q#5Rr>9~}9N&fj{{J64TNyh}90r-=*Q(Qk<i0R%IN=y%
zoL|dzVJh20d5Abonek;}a+M+CtY?t+UZ76yP=*)hN;AJyOv%{2yShDn2;68n^;)Ff
z(|_LY!YXB8DmLE+T?3rPmnvz9NcQqw6K@7<e?V59ChK}w<eHyhd5UY7MIMH=8W)5w
z&H2^+xgz&#$(OilNSB;LEpjNu&Vql01_J1P4>`oE23DlyYCabtLXnH5Tv|JJeLGJ{
zGDw!CWKdp7h7+AdqT43(q$U%t=93||63KKv8Q0snGf6VYXr*LO&XZYsVL3F!Q^KiP
zoF?9o#58Z3RbrZ^5q90i?mEMeioE5`919JtjF~tCr>L;sC-zqlNG#Dq;zR2BilKd)
z&-jb)Ni0She)my$op6<!OW%1@6>^y1Bx8|e3V4QfE<0@;AyZUhrb=Y+?2tROar7CG
zoX;9+)5HKc-lsX_hb;sGayg!D9nX%4g69I(k(+XOc1R|rWKdp7hBs3V@xM(bAXg?6
zuI2}Zh(aXeApkV1;n^XXl#)R?PewtWOGpI9lPb8yv&*rEW|de%;tfhK?M9S1#uN$G
zH0z!%HugRF#kd&`onVZ_#~KOh`HJD~TRc;wVcz>FB%Y~CL4&H0!L#Fyj6=RD;2D~t
z{Inrr5YuKV;u*Q4G;2`KXHAOdj`tQ_>@DI-+(+bc2tXHATc5k6*8uA!Ja?65gXEQD
zc(c)I%|<}3OeS2-4osIc8(@7&M#pnkX*NjClTonIr6jVjdmC}#XJ?mV56vpEgv1+^
zHiPGmF-3wk&AMlcjs0}}k2viFV<bMLUIEV(X{d*fLgJaK6f~#`89aAH2SF2gq=0AG
z(#cO7A_k7<ZY<%sW4(&jZ<CzQ8U@e1x9DPTQNeRp$8(?b8eqMI=f2Wxki48s&zp^2
zYc>LMIi9;ixSAc9K4~_<dI`^crP&}kPe#E;pOVPJ?g^gz9D8V1i6tc7ptKo0_lzkL
ztZCLgTWsv7>wm;)FBl{7A@vG)rbs;odmn|wGgT>QP!%$G?uib9Ch|=I&qD#vJrM)P
zb3c^u+_PRq!!ybGtV!|Q^WLJ5y+sAj!!z)l^crBji04YP(bt=efj1k2)@%giay$=p
zJP%2;0oF@+9xBZS$@$1A*ceh0S=c?n^N?c?%__0P25;MSKcZ-0Op#zsv+mhK+J|hn
ze6e~EjFI?|dIdaFq#lEVk3!;^suVP+3K={PL<d0=`KEwpc>j`J1_mMqj^|<7Nyt1u
z53E<w@Jw<(Yf?N9ytf!)Z&ATBzF4a4hYd-u0oF@+9xBZS$t%h5W@FHr4Gqs@9nWLZ
zY=HF=p2teFL2{mqf{igHk%iq8JdZi{(5w<mZ1A>S_all%#uN$GH0z!%q<zRXi|0`=
zM&e_Q1oaAdrbs;oM<0d6GgT>QP!%$G9*GWuCh|=I&r<=<BM}3~^SJCJWbiz)UPZ$*
z$@#2F@jUY0VvM~-1<z9*&tuYSfb|ld$4aw7@=7wi*%-BEL&Nj*3_K^z23RlRxzcQm
z+h#+-#*~l<jHkqfpL0`=Jv6Jt5*xg2*Zqj1i7`cjHO;zbi;ews{a-x@#z=ffy#k&o
z(ohc{g~T&eDQHj?GI*Yd4uU4~NCD4qAR)UxPecqH&(pG#kiqlBdKC@NBrii?;=RQb
zdy5L5@dQO>eV&qD1FV<uJXM+vl2?-9&BmlP8ycSHI-aMb*#PS$JWrKogXBCJ4I2rG
zz<BC-&asDLbtaaOc!SbPyAee*V~PZ8nsv_>8~f?{zj_dik@%2$1w2!v9)q)wVuNR_
zQqZ6(kbKDkPR+%0Ff-ACa-DFlT<7cg3@@-&Kb9|-AbMOy%j=5}51eOMMaxcT5Wx=m
zDq1#GRuLNXRaq}GQ_DkJ5W(i%YHI2KRuPMBSxQzBGdR(#OdErl6UiKj#M?0Fd3|YL
zddW8@!~xcDdS*y)uJ8uQIn<QcId9A<Z>-ye{5ky@FZt$#H^BPB8~RK8xxyPHuO!1C
zQf8d<v>HW5U$+ZoGJzVitCMMy1_R75+30Tt;0|zKcww_B@O%_bF)hKFFN-jylCZ)w
zYZ;q}6;ZY8mwjP5rK)IKbRNRG`tIJe>ca}=EQ4on`{16nV)Po1A45qLedS0I&!Y$h
z3^&HEKCwV$xek>h)8m+ylN|g7H;OI?X>SF1X;;y-$zu!J!<u9u4tK0o5rvQWp#q;r
zDacLBxfuQm8AN2Pfab_}#@?c7lZO|yzd%C=I^0rA2^DH7@dp^wB6&!#<Fb+-H+sen
zqiK`w1MM#<<<O2~Q$#x|@RT%EE(dQpCUN*BV#2V~xm?YoYS?!L(scGw#?Yx;Z#?Ns
zR0p0<Wb*@++(ge&O2=%Ylf+GIe+(&>@J`{z!uU{R2V|CW%*&A-$dAss>F3yt;SV+N
zSD0GC1MEvMyqDez!VzZlA<7Q+N_eM3wc5A_@1($Il7e@`I}$@@VkJ1%T?vl&b+ON{
zgeK`x(0&o`bTGD<5)x7^CElnQI@h{QNyGcP<QGy(S{1Zk#5<i~EvAHo#8XmHlM)S#
zZU*l;hS3Z!$4IvmZ`(Pn2&0px5sG4&(bsqD31#adZ6TNw)}SB{Y}{-VOL(Vn10F&s
zTfAevqR#rvqoBnSV?<qS9>n?%D>}n_X;;!%q7H#~I0;+AyJcOEs7Q<l75GfjG7ue#
za$I#?$vNIv7RZCcrX35|FXG+SS{72Mr6gJwo3<?LN-k3hEKo=(ZCSv65$|*)w1jt3
z;3=uFOo;}DU&p)6Jr1dciAXkJgeptZ3}K8+5+G_0mgA?0S~<7V7Gib6kDwOu&d;Kf
z;<lfsgR=n-A(Rc?sa`?HQawmx$p-c~;&*079BhTZ0NyKAEKgj)5C|WcP<|N&Lbf|#
z3^`?YeqwjpW$2er_{iaIcXs;_&%w_YK5v7K82n!Dq_Oy;JK)=>SB+3}UTs1Rm~SVI
z8Bi}#gm0(Fo+DcW7z0%cxB1W8{MUq(-flM^TKIs9dxE-<g-%9v(kv!ITySFe_HIYd
zU*TcGf+cWmcMg5RkNqCxd$ML1Yjjb3iN!`ourVF|Wgm9ISCS|2O@og<c!EN-Zf*zL
zQ&HMs?(jdV3Wb6SX6~H{8m=2H{O5~7lnRP03ef{Pxe>K|+80L}k4VM|1d9buUnXR8
z1lEp?kk64e^U0ubg5I6j%7Rmy!X)-^ESRlO1hW;&U`VP|M)Z~rKS_!H`ooh529K0R
zArSUPD1zAvWiTXFf)T5P!<9Pv>kprVKU@Q&a7ctAnC+c17?M&j@bMd)GqkS6ksn{T
z|5zOwCuh|7+6bu};_<Z=Qd#rywG&b*f>IpfoEXn^z%2YC#;(Fgk#Ier*TAXkZ`fb9
x`3}+C3AQqBp({@g#9847Kx$84T4M1puHO83cY5*1+pF6<UJHoq%klBi{{Rd59jyQW

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/gles/chains/hq3x/vs_blit.bin b/bgfx/shaders/gles/chains/hq3x/vs_blit.bin
new file mode 100644
index 0000000000000000000000000000000000000000..9dd618de8a02bb855e0ba2f88983419191ff7d0b
GIT binary patch
literal 419
zcmZvY!EVAZ42DyQQ=Y=df~KnNxS`!SA|Y|DLfaKjq^`0wv>;AA>0V(^Fw+6eG%it;
z&;H`yoAq)MT)w{oA=}Jhc~}|xm;^!u;=-r0*5J0aCG4=;HQ>s84l2uOPbOZ-C-{|d
zL!W4o>Zb)M7ud4PiA=!?r%aD^<@?>k{|~0%{N}dCcQX3ctd*U^n1bDe1!#pegj0Ev
z;D2Iu!}cs$@bmp19S`t!&6tL96u&?c#nV5$>zR-FqOQN<YM-rci5Z9E1TcH32ah-V
T;PKV~9PD?i1Gz8wET#AX?VF0}

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/gles/chains/hq3x/vs_hq3x.bin b/bgfx/shaders/gles/chains/hq3x/vs_hq3x.bin
new file mode 100644
index 0000000000000000000000000000000000000000..413d1e8bd20d9d06419863b165b3c81ebf1bf893
GIT binary patch
literal 1178
zcmaiyO>V+45QRg<D!qi4p`~sJNj9kaE|DsA8>JAy6^T)Bf<x7VR6S6y)rlM1L;2fT
zexB!V-puREbN^@f{dMEGRZ_ETH!b;lzvnnT=e9~jCX+4OXa0@4S@j(!6{2KsmB`47
zEms>-XS0x`$&9ag=}+7f@)+a|-!j2?aq>X`58$U6=j9wM>a=WFvBdth@jns+QeQ3B
z=A$#_S`V)1<B3}pY{ARCgUeG95}Vt9S!IJ#1bfcrBu`mEyn*}S65OQ7H_%-Ikc8+n
z-S5a#n{nXz)E|-&^#=#KY(Tg9QrWcfa-B@O#6k8fA-OZw%0~yQO!N#9RiK|kG=?f@
zJ%QvAjLn9?&jV%ow-$>vPlYaq+)VKpio5OtDq8`~Phse3z$ze;P*;V>ETnDwkj%lI
zgu4gNeu5JV>D~fhu8_7#qq3$8NaKt^_RykIDIxrOgN2$`bMO9-5L!f=!*K#RhKuMW
x^ymoPCZ|Sn9xgfq7bCd%M3(VIp!f)=>p50gngOVlw5;t0TnI7-)=$@UegWk+epLVf

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/gles/chains/hq4x/fs_blit.bin b/bgfx/shaders/gles/chains/hq4x/fs_blit.bin
new file mode 100644
index 0000000000000000000000000000000000000000..22e2f0c23d0e0e483f849e0e47fd609d34302edd
GIT binary patch
literal 238
zcmZ<@_F!Rb{`8QMfwefkB(;KpkpYM<GcYieB^Fg?=A|oSWTs~nD3qlpn<$jUC+Fwn
z7a3S{VMrPQC4t(L^Ye>RfbykznQ8e&xeCRJxdl0?MMf?PVAFvb^D|QvauYN26f`us
zs<{*ta`MZerkCUv0F8||v<8a8*b24^KvPRfi&B9`Xn@VoLAFT~q&Ph%-mNGx-5KOI
Spau=NW-Yjjf$D0xxEKI9`Arc3

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/gles/chains/hq4x/fs_hq4x.bin b/bgfx/shaders/gles/chains/hq4x/fs_hq4x.bin
new file mode 100644
index 0000000000000000000000000000000000000000..c215c28b7401d4d157d8f9354feb623d803e61b2
GIT binary patch
literal 15861
zcmcgz%WfsN5tZX)qx?iKuRQW~ll_L_Y!Vn*WS3+$2nNbXBMXpp2a@I?8S^1Q{w3S|
zR;r4RuIl1L1{?v#_^OLttSa&xo@TRu{Og~8``^=l|Lg0c-+y@XaPj%g{ngV&`<t(h
zj=nnj-TB4avupSP|9$<JzyHns`p*wXM<37b9<OdMo1d;Oe|q11ym)Jyk9han!{P3{
z{r*_lduBHkyRF!}?~gy+UcEcq-K_oh4U2xY-=E#QzrMJ$e`+X|lmYUB{tj2?&CS`>
zZL>Q${`t6B9oy#W_8iIrL5r&oH}4_IHxO&ngx}2%&AYp^w-37=D@OAT4{iVX@#G}!
z3et+MI&gJ=b$PqnecSGb=2h$>cXQ8f?&0R0*|*>ASWRNb*N0CuVtw#Auv-VX6^8NQ
z!`%hcY)3^qWkc6e?8?Q+T#QK<q9U)FoiAAr)$u>OlU!~S^FHk#!GF7lITnjG?LT9m
zZb16|XEdo0XLiH<OG2EU6XL?WFBFapaiOqdh>yt-4NuCnza+>-2N^2Rg~}M3!afFL
z!2Ry#?4jGWd%G;BP}5<a@PEeirwvRyGs0E)f7cnZ`hVa`Z=9u_%?Wl~m@sDl`O^u^
zy(cko)|fbcjD4w?9*Z$?AR0vCi`40<7!$|0A%Oq?$Ie#9juVGL=J>Vh<d8fRrVS??
zgN*ZQbzPXsc3&PMPE%%jnV7oD5OLNsNP90(r*2<{7w1Z|yi`nT?A~1;&K?3cT28$d
zsrT%k_q(u48JLRAx1p^8PUB0JbVMY3^{$CGgSS5*tIo6S23X{ppJ925YnMeHhP4_O
zgfGp-_5DS{?$?qpan+Drat^h~p%gm{{t*NO(EADG5U(0ok=)gME<}VP7fZRccIt<A
znN>1KmZfCSUP*=%okgPCCi9d`CS1)YLu@6I>3uTYV3*#gWRTHH$)KGl<Fv3G8saI@
zsd1gE-jKvny`{Vo(=?6n+im==GYqN7d)~~kAZTUG#2Gk6h5teMUwc4ei9M)3WIJCm
z^iT5{e|Sw|G1BncN8#Iqt0XSH@}?@}Fu_U2BFPl+4C`EW+H{0WQHg~rk->9^+>shb
zp8?tVtRa~u2B70QtwVm;LLeZQ<Js2n+!0amT);bWQx4A^l1V8Uv{#bhVyZ*@Z<7hg
zmC1yw`GFy#5XpE50L`ZG+##8il0iF9CV{+8kqC?@Rd9>vF2^1zuf!4(Z%}&aH=?9t
zOrfxr^6uGU<KL5CjGN)G6O5tySR=u9zG8U$7S9xEnD;&kiD#-(XhBuT;JM>MrbE6d
z;2A_we%cT*h-oty@r>M2nl)(Wvqs~&=h~u=+9IyRLqslz0H~<i`rIq60p3e^?ki%0
z?3HA=*yvMYBOq5M6Ru_lrdMJEyt`!5c<w7=gX}z+1U7n2B97hLhzmbE`y6|uyb?=D
zyg_L*c<vcfD6FNtd$!p4*Xw`8X)hQ<^&#68@Jx}0diW?Lo~cTq1yvz~=bq>wv_u{$
z;2E}b^3#Thf#bQKN_g&>R!Qk?vh!J!z%$ntebg2eJoj}x4@zr*_Y$6mir64~Ihlcr
zjUgpA0&+Q?`+c~Y9hgCh4e(yV^H32RWar5wurX*7aqO<}JmlCT<&{`M;tfih!SleF
zLSZfC-Lu8Uzh3_%P6xplst?(&fM<%-V{q_MNIX-OLJO)w2G0Z0L1>A5Q^50B!1F-F
z!0|kcB|HyItEBKuc0Ow~o(HZihNvwncpjgDXQeg3dlAnSu`$%e#>mCSm=YTSxg5`9
z9nYf@8{oZ!=dmI-$j(P5fsIj<h+}t!=P}0~DX+v58@z4T{fMHGF@?ff%DZO^=^wJ)
z^2OSNU<}oVY*)ZDMd~p)`Y0rxsY;;*RUw1tk?0__M7}BD8Q#BSmw}Opf#Z2}I|-TR
z=aFfZ6rRb>XN|`5$hE~7wM7Nb_+qKDA2uqj0p3e^9xGyl?3HA=*cek{BZcRwj^{~<
z4e(yV^HdQVWar5wurX;8aqO<}JmuIU<&{`sgSYLvA5k<hrchW*dG~A~{X@1{JWql#
zR3B?3*sg$QiqvCp@=-`UQ<XvsszL_O6VX9viF{MQ^IX95M8v@HJh`2O44x;ZRZ@5+
zJD)Wg&lA@cQ`8m}JkNDJPfBZm_Y$6`ir64~B^fR@rj*!7;dy=ro|V`D??pUU#KyE0
z8wqU8ibP;MB`*A&n{(`u@=7eR!P|D-k0_cMQz)#ZynD9T_}A<I+Jj&W)rV|Xz%xY}
z>fxi1c%~|a7F2}{o@b(i&=Ps1fM+<6kX@f=A_k7<+3h4`@H{iElEO3D%Mh5kwwR-~
zsNfk-P*m3ES!oUMUc&QS5gTN$B*VqVoDv%;JTG-T&q{27_Y$7xir64KPbP&8MItbs
zX*}oHBjI%+mXLUZ(n`M(MGIpJg|(D-&lVg1di`H}5R9SvknIY1rbs;o7azq2&se3<
zf~r7vmj#@fi|1e#qJzYB!g=C4U(XkKfwlHy`Em)S$JOLsUxawzJi}^oJE6e@JLs#)
zZK|v$bm*(HUSzJ^Lt8Mx=H2Sb>A%&)VslH$YGMv&nw44@ESyM|NF?5e!JgNb_NAA6
ziy{v2hSM`cf=h)r$j+gbh@JDsqIqN8F67VY&v?nVDBb|?jyKXT?UxE~kiC)&e@Izy
z&eLiX8GYR@l*t5Y%&tzRRRROtyKK^L1>g?ozVO1vHQ@OqIK{LCXTB`Lm`cJ5)2wA|
zB38ttU%%`N&zh>DZ=pPd_vE{K(<UEQFlQM&d)o*1tQDizc>EZOYUnFR4e>mRXn^6y
z*pp8zP+8uF%8}7HrsX6Df5DAH<sj{?059z-npQowpg*ih2I6qXS`|_Fm>)La^GJi-
zw496KuaH4R#tLYTjA!gEnpQo$pnnIAG|=IeT1wcUmJ)w}F)fmZ1UoJ(`nb_Eb{I{o
z)Cc-^Ddo_PWK%>tHsC3xQ0Wfda!lgzOT>g>r*pZf9+Qr}Dv++Tk1~c%<$C8zmn1vz
zd?LjURB{tNM=2e%jh(1&qWm$`u!MICHx|Z+A{CHv=a}7*9mtQ)xuwss8N(lH;IA;X
zLJzPn!SG&sD+ouJu@6yp@K?e+9jZ-@Yv`RC@R^jryWxt&(3w~Xj&)ap<9%K1^DCiI
z8U_6q@lFS0izy)?)l%X@#n8FdZAvM;uS<R*B_&nRe-ZC=hP9Xy5)w}-i5g8bFuEDM
z=NKmC*c~I?PQ0yhSP@1iO(PV=GLv54ttXUi7g|EFPMAPJ9@uoVX;{KLg&Xh?LfPUS
z>lNFq&pZjVSYnLW7R7^D-(f{(crWcr8cWn6@D3+oOL(_T^@xhZc(4JVNvRBkLP;D~
zT~~6B_mu_m;ILY;fd3-iZB4RJgIY>LvRExy)|FhQ6j-2;l9nvszle7_5?aDLHQ*^F
zVX27*hChvWn|mBeIwm67fDx)JT{DC+GEqQGb>NPlB5LK_))HdvgdagI;+>yGrG{HQ
zPX}iM9zrM^yi>hG8%y<|7A_mu<A~px8F8=`{sMTfRN<buf+H|KGNb%53XE)bz!>V3
z-T8^#Y2DDfPxz?A-R}JG5YNFc7Cvu-jTro1?zFM^Prt{vQLh@&tn<xgYytD_v@s*L
zQw`zUDe~8muMwO<Qwz8G&)fXhgp}THhfd%ND&7?ohFtVAq|?Uv2!X+o;ltgI9>BuW
zgauE~x7|^vlm^&O$eVTE=%V-(iw%#UV><iGzU+d}Bv0X^1|NRt2`bTcOFP<us^WiB
zRVWg)n`P)sXyE_w#UM(BhAar70Xw-7<v#6;BaKHS;{<}m0;exCvN-~4$HvI#NSpa&
z&~$>{JF%4or#6L4)Nm}Atx*KCHOgSfny8G>mK}bQ68jtWPa+sRQW}jw*c+n=W^0te
zkTnsESS31Ksbhb`{*&kr*T85Tl~Dw<y;BB5Rtg3_eq(cn)|EK&)9dyhYlo(jGirKm
zgjEjl^x6umtoii16ILohqBz7kF`jvkS@=baU4@S#;d%hCfm7Gtu)l2c9fG+RY-Kt}
oSDqV)v%)_BsT2Cr5{rL%{pQEJv&%mot`B#-77*E&<Kv_M0qUL|r~m)}

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/gles/chains/hq4x/vs_blit.bin b/bgfx/shaders/gles/chains/hq4x/vs_blit.bin
new file mode 100644
index 0000000000000000000000000000000000000000..9dd618de8a02bb855e0ba2f88983419191ff7d0b
GIT binary patch
literal 419
zcmZvY!EVAZ42DyQQ=Y=df~KnNxS`!SA|Y|DLfaKjq^`0wv>;AA>0V(^Fw+6eG%it;
z&;H`yoAq)MT)w{oA=}Jhc~}|xm;^!u;=-r0*5J0aCG4=;HQ>s84l2uOPbOZ-C-{|d
zL!W4o>Zb)M7ud4PiA=!?r%aD^<@?>k{|~0%{N}dCcQX3ctd*U^n1bDe1!#pegj0Ev
z;D2Iu!}cs$@bmp19S`t!&6tL96u&?c#nV5$>zR-FqOQN<YM-rci5Z9E1TcH32ah-V
T;PKV~9PD?i1Gz8wET#AX?VF0}

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/gles/chains/hq4x/vs_hq4x.bin b/bgfx/shaders/gles/chains/hq4x/vs_hq4x.bin
new file mode 100644
index 0000000000000000000000000000000000000000..413d1e8bd20d9d06419863b165b3c81ebf1bf893
GIT binary patch
literal 1178
zcmaiyO>V+45QRg<D!qi4p`~sJNj9kaE|DsA8>JAy6^T)Bf<x7VR6S6y)rlM1L;2fT
zexB!V-puREbN^@f{dMEGRZ_ETH!b;lzvnnT=e9~jCX+4OXa0@4S@j(!6{2KsmB`47
zEms>-XS0x`$&9ag=}+7f@)+a|-!j2?aq>X`58$U6=j9wM>a=WFvBdth@jns+QeQ3B
z=A$#_S`V)1<B3}pY{ARCgUeG95}Vt9S!IJ#1bfcrBu`mEyn*}S65OQ7H_%-Ikc8+n
z-S5a#n{nXz)E|-&^#=#KY(Tg9QrWcfa-B@O#6k8fA-OZw%0~yQO!N#9RiK|kG=?f@
zJ%QvAjLn9?&jV%ow-$>vPlYaq+)VKpio5OtDq8`~Phse3z$ze;P*;V>ETnDwkj%lI
zgu4gNeu5JV>D~fhu8_7#qq3$8NaKt^_RykIDIxrOgN2$`bMO9-5L!f=!*K#RhKuMW
x^ymoPCZ|Sn9xgfq7bCd%M3(VIp!f)=>p50gngOVlw5;t0TnI7-)=$@UegWk+epLVf

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/glsl/chains/hq2x/fs_blit.bin b/bgfx/shaders/glsl/chains/hq2x/fs_blit.bin
new file mode 100644
index 0000000000000000000000000000000000000000..db0fe2b487b6c8f1624a7136f8c83734c2b7dcd1
GIT binary patch
literal 181
zcmZ<@_F!Rb{`8QMfwefkB(;KpkpYNiF)%QcB^Fg?=A|o?r6!vwl*K3K=j0a|SaTr>
z8v%uZT9Whgi&B6xrFofY`9--3#fiBEIjKcPE(%~1fm-r2QxtL&GxHQQG`Xs|6co~P
r;@yf8)15&^D%dJ$01YWAElLII&;V=EK{i-ZK?`oZrZrbB7Z(Enmi{^a

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/glsl/chains/hq2x/fs_hq2x.bin b/bgfx/shaders/glsl/chains/hq2x/fs_hq2x.bin
new file mode 100644
index 0000000000000000000000000000000000000000..7f3b9f362633c51ee7e9530b080e28e7facb3147
GIT binary patch
literal 15054
zcmche&2A*e4S?l1xhOBu#~H6Y?&|8_7|A7pkwb2YPYYu)UTGHs^kYccT}j41M-b$J
z@>(I;^+Oh`s$syEVQ6QD)ohZ*kF4&l{_dZD|NZ~Y{`;RVPyYDf&BMjxoBPY>i}rV4
zoSb}d@`v+_x5q2^0RMmakMIAre){*HPEI}^@18Di-ZvjF-geDLJnrr7?cI6%?J1M=
zOk#?Xt|+nJo_@Hwe0O_yjpykbW?z)tAFqG9y1489){wC|0ay;_xV=1Yu8)^D&2E4C
z^J%l1etB~aE`xFI`@{85;J_QOscHP@=FiQ$yW`u3-Htihe8tT<JU;FBsS+?hD6ydA
z{__3JZufP27@Ai>xjw9ChxKsS&K%lrcFcEvvfe8i*ii!<1vB#S;qC&$vZJ`1vAJly
zsp0669X)1`7QVk~b}l$Q#KC>Ed+p1_^iGE-(A*v%M?zSp!y}$;4SIigL=jE3`)Oul
z=U-yiRJUtkdKa=m+O?3a!LFy&F2kKL?Ju!x$y#Q85Dev_JF_vMd3Sw$u)FrqEz22%
zZ<r_i$C&=Cfm|{p{0jeCYe?$;z%RX7CGBkXc+N^fn8V|zJ*3sMPmE{|C&6?tWzJK{
z9L|(Ms9q#G&n0s>tA=3x?I)`%PZlo%2CKlY6`d8(A)g|=co?i6zt&kR8QUF-bHZzm
znO?>mTb>hM!VK217l@8M6anIu&nz!x4xg-dSGUIpU+y|yNINW~#~<%^zPlL6xaMm=
z)<BtBTZ~je74!046AlACf58$t&z&8hEj2$wTM0d<!=eg36>IwE=Hlx9A|rS0;4==A
zXX6F2!-7Z#GmD>~yF;1YgW=&<1N~(EHRk{oHQ_)<4z%6W5A8B553umnJV1Hb175T`
zELy1t&sh)ruQ?B>@CXlj=Ybu%r8mk0EKW5KP+s<cDvmgvSx=|VgXJi99yzB}GMYwc
zw28);KUh<o&Lo4<Tp{)`^@Qd@X^y(FKm^@NyBz1@gZe2?@q=49bZDdh?5uEO{I9gk
zbE{qQKa=acSaet{DsVzu%4CKm%!K<3xnF?OVhPAim@}K?#l*0D@nn(nG_^g39L}x=
zrzPIG1E3eHO9@VkHKFDK%F7<`1&&3IQx80b(gXi%ZVHHZ;epF-sE#=}E!KpZ2PiLl
zplSik83inb)0T>WfYTD}5+R7O)EE-qGT;?HQm=zP(d_D0u$4h&1^7yPv;oJt_~79w
zoMfZVXJ>_klOp3skpCJ^%NG_F>qZ4mSfAuFgZLJiF<0Tl5>QJFlou1D=dHdEtv>X~
zAz;W;8<sNV&e^Nh4|;2G_8YyQ<Yf<d@9%TH-(x5}@V{oJpjW*g^sXM{;p{hhKgr7;
z=vuIr<2EF`OS`^Q1O!Aq!7dSk7#85{8Sn}psn<cDXx2SBK-UZKm3BF<0w>w%W8kci
za8hLa2=ZUU*%Q`&5Y~eVoN(VGml?!2hqIq*aQ1BJkXzQ0yqp-k)%T&*Z@}5t;2c!z
z2fZ~ohmGD(@}dU=@BKrr_j?REoc+Q7nwf$@^?uM>gLByE{Uk4YpliWejuo6ksR#&&
z27+B81TieYIWXWAK2ooPKGCdua)53S;4AHNTm??D(NQ%xD<qs089##j*KiJmwI76a
zqXOrcg>xXjIh?~-gL7a@ha8+FFDC|X^+Ra&8*q+QI92Nhy;V3jdjC-E{Uh)FW3Kmm
z3^|-*4bD;Ze$ZQkbKL0tBrndvsB6Jmjuo6^sR#&&MuI&-DDA}ojFADa@R52Q^inhU
zmSP`u3-Fb8Ij#aH+32VmofQ&Jii{sY{%bf#!rBkQx>11>9v@`N_DFnlILGypyKv1p
zvZX@~PLh`sgSYxIwE7J=@nJ~uhR~>5Kj^K&Id1fRl9xT;y?@O0{v4cB4bDmRe$ZQk
zbK2<rBrkd}=~}RsV+H3_DgpwciC|9<N_%ktV`9K7e576nz0?f872%u&_)2@U0moI~
zBpV%7le0p?Ns;j*$bSvzL|FSlST`zg&RIAo;+w-ct(V*dI48Dr$iYeSa$@jSKZRDm
z0q0zUb5gAz^w!{<HhMqF%O3FFKjnIV4$ip>r|SKnw+iP*@1Lr@e^#{s=1eBM%c!|j
z1O!Ag!JZ(L_Tm7>%z#(;NWBjFM6>S6QMUkJX_w<FaFUHa2F?lzCq>4OApbR-Ghyuq
zVLhn82@kz9opUC>Ih^x)$z6bRW=n@0oFp%%_RL%T99sPbocL(I*g0p_`ay3E&UvHv
zlf3K!@BMSG_vheTYH-e~_k-RVobyKSCwbWeRSRIw@^F@lfPiQr*d;;`L#Z)<u`u8j
zK2ooPKGCdua?~xrSK8&c3Y=u4qiS(hByeJ6{0Q=&<gkw=Y@=9+YVixvDt_V3b%Dnz
zQESKB7>J&t$a084^c+RKPzbkxqiEo@V!?Z?VfEl0v0T-9_2Wfw!z!v;*IrS?Y+EaT
z6fxUo$~!s5!jn)A+~EdK8XpDcpEfND|E0R}UpD9`d6Auk)4yo?<J~cSQCof5v?%&P
zZ>@eU8}yUB>;Yf-FPO&EGC~E8cgLg$zN%$fh-p>32gS7l21me&D~}b{0YxWFOH}f%
z1@k5=j!&YN6$R0-L?)WnHDRGs*P5VJtOJDJ<cY9p-P&8$G4xOx%pN<zF)=>$Jc(~w
zPy;Ka4E&1R22*4)gJ|+G6bQZ6FfFew@C}X;s|_q)k=Fc8G}EeU0n~(nD6BW&h!_eH
z=P(sGppq)QkeXIs5JWn8##e8pnO0p9pyoB@^BXwekS#xOK*bM!RbW~y0+L*81bQ1v
z^@f^h)mi{GuYTkoM!_Lle&B$zAL~9!ju}p|M8QujZL`dk3CZrdfimT*czs}KkEK(q
zRtbq}R~Ay`l}iLednSW=b%L-ASqIkOB|}3noGA&s>sHitR|j}TTb$GuCS!Q_hi^W6
zymGj5XYl49Pr?3ER4k?rG}Yjx4U)MD^yj4km1N-y1Vj59Wzxs%b`EcB!?|{4)RF-;
zSK*~Sj#WRfu2lTs>jpzx6jMKP@Wy7G^+T;3P;(Vt+KpKC1M5n~4_z-{1`F_(3WX$W
z-42+hRocxXG_+$d&?P!T+IhR|6@-BxNQ-$x<y!@-otFmI;3Y$So_kYLcriv{OuUdt
zLPX?;Vc5|{=Y?L&;LYEJGaXd`0Wa)j#6XlfZ^srPBF@1Q98gY{PAnKQ+YV!o<?u$N
zb4lOn1q5hblfKY-yR8)j4XF4bRuG+DLBt*_{qRU<{m?52(7gIl=)APUuLds-sQ97l
z1x&F-Axv%QA|uI6ss{<Y5KgI-!OLobYK&6#x{VMKlsT*0dQ{K15?0~mdkSeFHa7e(
z_|L)grX=uo7^8SV=)C-G79;j2!Z$!Q9<*M@coiUgVnX@C2?*J>v@!fL4%L2QM|SH(
zukSh033t2m+lR0>dFkNQAh=b5uNj>+9scPL_}t`GBZgTwY{n6gS7(hGahw_m@1>AF
zOS(o-217eI%)KAvUb!Oob~_Nm%PIU!-~egprA24Ws>0g^337Y4qnYy8s~u>9Q+GQ$
zGyK`_LB1z#UC<U^Qwpy?nRS<Eh&^2<#kUXO{joFHUG5C`CxIBWc4^0Mpm>-8K2bEt
z1eBU(u*QkoX@-y4bBooOmG^1ZSE7Pp>zx|+6)HWZ856RkfWn^$c~Z3cRV!mfg|^}*
z5A4ko+Hg%3G8Za$A{2I{LTLv{A!2MU#4^v~D*)kC!{J$+3ik{KAynQ(DC|gu(hibJ
zJ4B_o*jK};hQlXuDr{asI4YsABRx{uK~i{$h{c1NLzw01b^Aj+m$5Q?rq@PD<(y8h
zJ0X>ko?craCI4kesFnm%W-2tU39(<{MKZ9^Q)yt|>{skt*L*|o_=ze61aj!97WqE_
g&7R&)!;rtfdh^}g@%>+KuWs*n7{Id6r>7_X2YpKPo&W#<

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/glsl/chains/hq2x/vs_blit.bin b/bgfx/shaders/glsl/chains/hq2x/vs_blit.bin
new file mode 100644
index 0000000000000000000000000000000000000000..af6c9349f410fcc16eaa87e32ee35a9d92bb026b
GIT binary patch
literal 377
zcmZ9I%?g4*6h=pIHBWJu8X;!xq<zaE2wI7$$wYc%8YeAU^`yN*PteWGpEkpA5BJRX
z&1StcjmPV0FkXgQq?eV%gK02kuq~aDQc~<nm4Z%VAEGeEBT6^mBQPg$!n05Ui$CNM
zQfU<<%7oT*Bx_M*Uz_f1gRuvCxKI{ik1~fmQa<zv$%G=IsVKm*`HjO@sqz!K!dXCr
z-`%-hVDZ78<vQ*ZW{zu*cvTbc8#q<{!PzlfwVeoC{o63<)QxA5xA6?>QmVFNLw=uk
H=bXI(ZC875

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/glsl/chains/hq2x/vs_hq2x.bin b/bgfx/shaders/glsl/chains/hq2x/vs_hq2x.bin
new file mode 100644
index 0000000000000000000000000000000000000000..789e990106d043dd925dbffa7f815897f9fefdd7
GIT binary patch
literal 1082
zcmaKqL2iRE5JgFpMMW>+C23Qa5W^<wzRO6Jx<!<b$W?+PVu(rAgH%0Guhp@Gu_+BZ
zYrg0E%^$zMJWqaR-(O?LE#r!2r&Yn;CnLuhIk#oZGZ7!@IrGP=ax-z9g!6*Fl{`aL
zmJ*c2DciBaU%DM(0m6YDDW@#|BLyIVZ^~G)hPEmxYMO5^ZdL1Ml><}_G-#`N&q^!7
zRb{bs%badlu}Axa6J!!Ff|}Aw0?Zg)!+n|~Z|Z)y=z`Ao2Vjl?10j9J=M#F8a^U&c
zpP@PSryX6?pqr$ysHME!#j7SekUc|%?pkZ*qvKL0dJl>x&=+C&mM4&I!0-r`?PlT4
zsWRK_Si*H1B-6GnpskrGz(NYvKGf4XX;^1B4Px04EQf_0IyC{c2hZ5s`4D_IPuoNU
z%UrFtx`{)B%t7|7Z-#|{sPFX{<Z@m9-{$4ef(minT^lglSRo#Q4tvlhEwzB_SYZz<
jvaq6m@{0yhq8>^!ZKU#RLsy^9P|AG|gckwjr|UYuF?m|`

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/glsl/chains/hq3x/fs_blit.bin b/bgfx/shaders/glsl/chains/hq3x/fs_blit.bin
new file mode 100644
index 0000000000000000000000000000000000000000..db0fe2b487b6c8f1624a7136f8c83734c2b7dcd1
GIT binary patch
literal 181
zcmZ<@_F!Rb{`8QMfwefkB(;KpkpYNiF)%QcB^Fg?=A|o?r6!vwl*K3K=j0a|SaTr>
z8v%uZT9Whgi&B6xrFofY`9--3#fiBEIjKcPE(%~1fm-r2QxtL&GxHQQG`Xs|6co~P
r;@yf8)15&^D%dJ$01YWAElLII&;V=EK{i-ZK?`oZrZrbB7Z(Enmi{^a

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/glsl/chains/hq3x/fs_hq3x.bin b/bgfx/shaders/glsl/chains/hq3x/fs_hq3x.bin
new file mode 100644
index 0000000000000000000000000000000000000000..b74aea5e0af7b8f5607203a776e429cafaf1e15b
GIT binary patch
literal 15059
zcmche+io7m4S<!Vy-{CcFaJMQ{_M=`u|a#&BIrf$+Flujp<1#bK(+!|K1hKdq-fu#
zuT_$BSaLWsivX#OK#`WST$00&oZX%M;je%G^?xt^{jaaje*6B#!}X^Z?{1#1`(J%^
zcJ|fTZ?3LiUf#kl@ZZ;e`TO7eZ~yt-+1ZE7`^THNue%S|FKzb$&wF`ycYoD?f6gQW
zlbEW+RweHH^Y?FWUftcl!Rrhivu~5UyL|KG?e)F=Q%A;@1YkK_<L>6Fdvkg7wmTfp
ze>(5H={Ik$z-2Hl{QdCeM{wW;*wl6L_wM)ItNY8B4~GMDwEKpebNcjnJmyNk{G`Nz
zl6N<+-yRO%_NTFXmXzz$26oy2ryb0x|L(wi=NB8IqLH07!dWmQ5AW}<AuI=q%LSW@
zKAM`&p4iz_@oeGyv+fXrGe8`|ukNUQnVH`C^az^!6XZw=%Y6ETSMxz1PM=UjQymU1
zZ0z!L?3&wltxWGqHb}cxvNhTDnA>Hz6Q=(;maRq0TnvJtTntw>1~ebuTt2u%f3oX(
z0pS~$8UJU@aM3|7nF)@<|D7`=4L{(>V7#PX%n`5INC<QK^zjI3^%N6hGl!F4?3Xg<
zv1Sfu${<u<Bsxzub2zJpVEzA3maR_~F9HUuz%LaY59nA<5nenDR*zrms*Q}br|O*W
znq%fKV~(rO2`^y=YuFcvjyqKW;+4;=U&<UlS+8#IE+1mKv%HX6ETotJe0PZ5#X!b&
z-^Q^9%9L+0QUz7an^#>r4fOm0OXRXxH$q$LeuB1=dXB}S3OyBT`seQY_T6<s9@@cY
z93-#C3!=q>NCq>DAECQLnLdKy>8OEz;*XXbprR%mu;f5*=V9#EMR|aQujK*C>mKl;
zWwB`G9y}F2h(}8vP~j0C48a38+I29>11wH04^UqBfGUo-obi`a*THgBx{jPvDj8iT
zG`dXVmOofig3c_1@?0VIG4+JzQEA?EV}VGzm3BEU#0T|Lp5iZI;b76m_<OJ-jEP5S
znHN^O<bNU8d9koqEE;e^TPkFRBg};RE4g2R(_slHO;|9S<kiG*eDUOv^E|a9h8#}Y
zg3}T2+yT&w)ujff!<x|Y0OfTL_yWfv$GHa)L+L?0TABjlU3d_38>(XoPKPz2<pIj;
z9;jLXb4CHn;dHekAmDTayF>_LEH$RYcMN!ikJKBW&oqa+m272DIRU=XzS)4|LVWP_
z98R(^=5w$@!by>dBglUZr{fC?hjpU?C#+9OnL&Ju%vhRmVhLy^2Fk06G4NJDq*kAL
z<d`tzsSQh+dgmNe>j%9pIES6yPx874y!Q{K-XAfP9>k-CDHv4m2ff~dGMvLs?<aZP
z16>PzIqp-!hqN1NML<9_5bP2mh+zfJfdQ}Zk$MC4nP%OS6Lf<BUul=)8gP=0F$Td3
z2`5D+jv)UvoC9GU2Vp&EzzNSiN|`}?b2x{&1?Rw)4y9!+$?J*1Tm6t){SKT%3(irs
ze$d;3bKL3uB(Hif^4>p|dVj=_!#SMd(ZUprs`rE57M$Zw?<aZP16>PzIaY9vwIU!O
z8VPoZ5X7(o=g5Fp_(;70`b@L#$qBkqfUmU6aSb@h#z55=tdMY0Wa0?&U&A>P)^QNl
zjRu@k5zdkL=5UTv3(k=(9ZGPLyq*}m)sLyw@4z`V;Z&_3^fuw#>HTA~_fNd{Po>@;
zG30PgEjTCD`$2CD&S|Ijle{_yldc8694k1dS`iQsO$2*}P~M9Z7!w0t;Uo11=%r@x
zEysS-Ex=dW<+ui%WMiOe3RXxsDKc>c`LE%e2<tcq>qY}kczsYP+Y|B4;hg*}cjcaQ
zVoQe-oFuO&25<FKYV|vC;>(cg1EEQ^e$d;3bK2?sB(HnGd;e7G{Utc(7M!!{{h+r6
z=e*PVNnZ6}*0sQwV+H42D*^(dnPATl%6oAFV`jiBe5Bq0z0?f8RpFck_)7a`1CDFJ
zNj3(m=3s?{lOhvGkpCLanXrz7ux>QqT#9hc#5ad?_P5*>IA^wWD8WhcdSdWaKc`l|
z1Lx9$b5^Y%^tRxfcX~g`>mKmlKbLxc3C^Vnr|SKnw+ZJ?@1L8!e^Ipn=1eAh$f%`O
z1O!A2!JZ+M_u>S`!hl!!NWB62OtbFEn{ENV(k{m};3OMk41yIBPKrz%LH=tv7s5IY
z!g|nv6JB~3I_E-sb2t}&%UywUVM~V+oFuQN_QG5Jl3M)^ocL<K+Bp~1`ay3C&Sj_f
zlf3Q$@BK@u_m|*YTW~I__k-RRoXbw{CwbiiRSRIw%5c_-fPiQv*d;;`L#Z)=u`=Kl
zK2mRhKGUpw@}^sWue8f?4LHfhK-C(o$l%1t#1Z5_$zdN$+D5Sw)#3=zDvt2xy29&}
zO{?W?3`CEc$Z?23^t6cvp%5McZ=#XciWQ%+rqx4q#Bo*r?k9@ifz_tUue~-Av&~oj
zO~h<lDDUJH3r|ux2&Wso==LhO{I+RT_^-{C|GGmz$*b(Foc>kQzdaq}H?_^TO{=0G
z^tS5Px<fz7>mKlx|B7i$EhAOn?dh2GAXc?P3o*TF_n^2{z~BtHaO1UtA5e9|^h71^
zS}<?2;>0BCSy2!TOJt(yLlYJ{b*)KS#X3Of&E5!`KCHcE9YYVL!R)mYoU_G;-Y4-*
z3u<7al!0Fxx5*S)%pjV43<W~3HB8TI3;YG=h}8y`uZ`C7Lp0N?djZshfvBuE;EXL4
zBF<?la6ltfcp){tz9HD?<Qd<5lxBK$M}V4r%9l5Az$trv;DCl7{I0<CSOg@w*a-AC
zl;#69)2p=rYW9AVUq-<xdw$@6x*vWYCC3b>SfUW8mbO`z%7kRsZ=lTis@@+M+G82i
zs#QX!I+TT6dE*wr(4NVpUR@w9L;S!Nykuw!MldCV*KbAjyE?!#+Tx_PFd4(UKl~N5
zCn|?KcLs0y^%U$sMa5$3KvN4|+8|k)z<6C6&`1`(KrpnwQ6~L%-_GIP+Hk2|8MS0U
z%}sb|k7LshtSb#a_`1Q+7RB6;61-b8F8ZNX4yd^aFYQKb`hj(&;fJmlFoP9%YlT7*
z=C=dpX_a^L4I0`pnCKE6A@97lcn4u12-0HSQ2AEDX6L1WEqKY$nCH=y9A1o38nfL<
zWFaE*(=hDlqVqzpW$>0C!Wl~yK)?%o88HyG&TH8sM8r8+f&=QwV#R`?u<dZ`u^iqF
z=~B{Ly?_ACKIto+*Y2$#Xh6dcv4XIA1+n#5=|@Dm=!afGfM)MUrSsAbzZSeSpy7wE
z7cj*Vg*3Ibn~W?osUBqTLO7*T1~01#sxeB{ej6boD05b~^-VqBO4x*#?<u5#*x2x2
z@}GklP08T37^Cfk)Oq>WEJo~4guejQ?IeF26IFolkqPAoCm>|^(#G)HI8^(QooW3<
z`|q6Sf``M^-9y@&yju7)2p(17XGRyD#UH~7-<v$^#4s0zEjR-5>Y_6fj#C5SyA;yr
zNY@0)V5o)D!uLVplPhxXa9B@0e4N6s1P+jfL0WXtc@@zvNRYex1I<*tU$vkKE^QAE
zuL(bnN01*$oAui0VEoD@eg0(pF3%Kux=q@?K7jAXE?{?gFg#uaV$i#_pX^BS=%;nS
ze-se10tc9NbS92)!))Q-_MH?nKrG3ed|2bZi%Qn{$2H+kDEF9aOvo|=s(&WrnbGU-
zt&9_8+KDGUut85~!-Z8!Unt+1P}q?Rr5z-Nn6Y?>wVuQ80Mez#)04OqZX8TPD8HFd
z*pUmR9VC@@h;r|+xu#2vr;p-N*uj!;QbJ)zex|g8r0^vXiwAXxG|Thz{vX@5jFZ_j
zKQ}@u=X8E<g;Yj*e(r>n{Ffo2f|5*GsM>^1#E!z(WME-L)4=B0Z`fb9`;I>J6Qu|+
n<m6L9ia!9FBYmQVA%A`Q;)nao*MGdby}RdO0Lwm~pP&5?)1CFI

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/glsl/chains/hq3x/vs_blit.bin b/bgfx/shaders/glsl/chains/hq3x/vs_blit.bin
new file mode 100644
index 0000000000000000000000000000000000000000..af6c9349f410fcc16eaa87e32ee35a9d92bb026b
GIT binary patch
literal 377
zcmZ9I%?g4*6h=pIHBWJu8X;!xq<zaE2wI7$$wYc%8YeAU^`yN*PteWGpEkpA5BJRX
z&1StcjmPV0FkXgQq?eV%gK02kuq~aDQc~<nm4Z%VAEGeEBT6^mBQPg$!n05Ui$CNM
zQfU<<%7oT*Bx_M*Uz_f1gRuvCxKI{ik1~fmQa<zv$%G=IsVKm*`HjO@sqz!K!dXCr
z-`%-hVDZ78<vQ*ZW{zu*cvTbc8#q<{!PzlfwVeoC{o63<)QxA5xA6?>QmVFNLw=uk
H=bXI(ZC875

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/glsl/chains/hq3x/vs_hq3x.bin b/bgfx/shaders/glsl/chains/hq3x/vs_hq3x.bin
new file mode 100644
index 0000000000000000000000000000000000000000..789e990106d043dd925dbffa7f815897f9fefdd7
GIT binary patch
literal 1082
zcmaKqL2iRE5JgFpMMW>+C23Qa5W^<wzRO6Jx<!<b$W?+PVu(rAgH%0Guhp@Gu_+BZ
zYrg0E%^$zMJWqaR-(O?LE#r!2r&Yn;CnLuhIk#oZGZ7!@IrGP=ax-z9g!6*Fl{`aL
zmJ*c2DciBaU%DM(0m6YDDW@#|BLyIVZ^~G)hPEmxYMO5^ZdL1Ml><}_G-#`N&q^!7
zRb{bs%badlu}Axa6J!!Ff|}Aw0?Zg)!+n|~Z|Z)y=z`Ao2Vjl?10j9J=M#F8a^U&c
zpP@PSryX6?pqr$ysHME!#j7SekUc|%?pkZ*qvKL0dJl>x&=+C&mM4&I!0-r`?PlT4
zsWRK_Si*H1B-6GnpskrGz(NYvKGf4XX;^1B4Px04EQf_0IyC{c2hZ5s`4D_IPuoNU
z%UrFtx`{)B%t7|7Z-#|{sPFX{<Z@m9-{$4ef(minT^lglSRo#Q4tvlhEwzB_SYZz<
jvaq6m@{0yhq8>^!ZKU#RLsy^9P|AG|gckwjr|UYuF?m|`

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/glsl/chains/hq4x/fs_blit.bin b/bgfx/shaders/glsl/chains/hq4x/fs_blit.bin
new file mode 100644
index 0000000000000000000000000000000000000000..db0fe2b487b6c8f1624a7136f8c83734c2b7dcd1
GIT binary patch
literal 181
zcmZ<@_F!Rb{`8QMfwefkB(;KpkpYNiF)%QcB^Fg?=A|o?r6!vwl*K3K=j0a|SaTr>
z8v%uZT9Whgi&B6xrFofY`9--3#fiBEIjKcPE(%~1fm-r2QxtL&GxHQQG`Xs|6co~P
r;@yf8)15&^D%dJ$01YWAElLII&;V=EK{i-ZK?`oZrZrbB7Z(Enmi{^a

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/glsl/chains/hq4x/fs_hq4x.bin b/bgfx/shaders/glsl/chains/hq4x/fs_hq4x.bin
new file mode 100644
index 0000000000000000000000000000000000000000..86a90e7fa48ec30134656dbf83f6119a7eb06209
GIT binary patch
literal 15059
zcmche%Wfsd4M62M*(g8J%PWt3-PP647|AAqkwtb%R)b)mj5GrQdKenbLo((=g5-bl
zTOnC5vRG9O1I`$R=HAO{Hp${4tGlaz`0Jm4{onI{|Lg0M-@bqKc=hSkyX)tx{#Rd}
zoP2fio6D=$7dP+${{Q+ffB&2N^q=3IoP4-=c)GrO+kLotJ#-)NxYzgh510M-r%W<3
ziK$A4s>FVO`u^_v&HckIo@eZseM$1};`YaztB2uF9T{5^faP$G`|Hc@_Tu`kJDi>V
zblN%7ukS9wWiZZvf4uz>9C!sbbzS(}{l0tiaPj)_aA1yh-*9t|pPtUnawTAXRANEN
zyX&`ihr_r1aq3<~<@&IZ9X7&Y2XpMdJ22n*$;O~)Vn<DI6wJuu`-dwC%You@&gP;I
zrpBXZcJy34TKN8=JNV#?5C{L!o@rkergu3$f#&`QITFLN96#aNT+qkkClt|C`=3@e
zcKtbaEp59trgtM7q+J`?8tr<@?K0d6)BhaHwxVS=1i?@)`ZF5?nh&=ZkM__XhiyBD
z@J;K2{}?l#caTeFhF{@dYYj>LANXZ7PSUUD4A0p}2y^`O@eI=HIV46hhm&B2FJ;bC
z%^c2@L8!h+be?PGa8?b$`v0G-p*~r>2pFsazf^P_pi?<Tc=0e;J$|XPHZpcNR_BD*
z9J72Gb8LN1cnLFD!@fXt?6C?EuY6|vQs(f<dUJDs@fgb8zzgYsh4kW|?+&567|6Kp
z+c4HZnQ|>gs-TK_{ichDfu28LiCovgPSBRRpP;S8o-<%kg`SEv{d0G9^X{r3_wC>_
z4w7f%1#!TFNCq>DpP;)#nLY!<<F5w#iTkzW02MXiz(5Z4!!l0&wki*>@U=WZdEEnE
zv<56%xd+ch55lh{52)}64@U2SorY~R$^$G;Ee}v$_kb#nIGu5)Q|G~QR638GQz{u<
zCp6kjW6B?_DPCumL3yqa`<Qw{^Q1H<-B=)^Zlzt0^YKCbl&AQ?FB}H6F?{w`_%Y#E
zTITuHF8N=`bzUq6EEWwop)D0M!xCn~{f*qOz-h4rlqSrZP4a4DSiX3&$a$XH0YeVw
z(1Ozv@7w{<i`AtDr^TAk@&M&^5BLJdBFDK00Ym9Q__Z_z#Jljo=QdQw5}X!mLdye`
z*F8|R0OpJWmcwalML@u533iDP#8_&KiEkP33LmN0L!W8(bt~G+pt1sdr9Ihz<9vMZ
z@ElIEG32wiLc&Rr2_wjV4X5P`3yXE50Vk|aN|`}?i_BP?aAFB)B?ii?i81n4KgL!c
zd*l=`<f#oynR@3ORqF@6EjY)W-cRzn2fX)>rQRPflpcg%3sW$v-Vb`62W2?No!(FK
zx(B)zxN_Xbg!gGT){20DXe8JrLJ-3WoFfBX;Uo2W=rhf_Cr9W;0lv~M$2H(28$%4d
z6%tO0Oc+7_YdA;3It;>k(0~)}dz3PR_~vkqOAF4CEgeeBT9VfjgSYxIw)!17#}=HE
zYW<+M1?RNW`$=B)VB)=hD)s(=A%}B3hF=R)Fsa@TdRuT#JH4Oebq{ncaOGIRIn|1Q
zfM_DvB|;Fx3Y-%IUg0D4dgwFFx+h2ICIP<EF2^<CBpW?dlea>`Ns$R7$bSvzL|BJG
zST`DQ&P6yU;+w-c%`G@5wsa`LN%DGP@K!&?R=)%1+=NrLe$d;5bEo%D&E7xr-anUm
zf54E#Ik(`PRqqGAEjZ_$-cR!C9L%~FxN@xEoNGluKr|EV8A5q4j$q6Tc!iJD>!FvL
z!M7ayq+5Wmw99b~ILSs&)$Fa1a8hK#2=ZUUITO}l5Y~+bobdRdP_}2{o5MM~OYX`w
z=ggK4B{)f5PYmAb=h*6Z;KYX^)f+;yYW<+M1?Rle`$=B+fcO5n)cZ?tE-g40)%!tj
z3(jSy_mjNp!J=z{E5{1XrB(z4L<_;5A(Z#x2*$#ISNKT19(t)6e5=B_2=JBmWCM<C
zz)3cGsupjBgp(o@Mv(s+&V{fJgRpKi;9QGvF2py7b8(m46*w2RbSS||@_J(MR=>nn
zzXRvmf^$)=AN021Ty}at$?G2Q-oKQ3e+kaD38(7)ptlL<PVZluy?<4;0Om|4yw9k$
zRs;k@E5V*2l=tEY#>#+K_(;7T`b@L#$w{{WUul=)8gP=0AqL(G2`5D+j3ECtoGW1+
z24OvDzzGk%3!QT%zB!z$yX3CGxw5502~Lt%Q+wsDevPeu2Tpu6U+tW$YW<+M1?Rfc
z`$=B+fcO5j)cZ?tZY?-h)%!tj3(j??_mjNtfvN>CXJt5RML<Bb5$qBnh@sRN!Ppq^
z3LmN0L!W8ZJvr$X;4AHNTmw$B(Nnc~D>67SGGPSyPjcAD61P!oM78*ZXcfQk=DNY-
zl%#dwZ45+DNn|-hAbL)sQ7D94z)3XmTCw3h*0_2Ij##eBUHt?R+^|Zj+}bONm~F1|
zClRx4rM#0<EIf(jz#ne#r0G#``DxRp@ZXv%|80kUl2_T;IQ^TZKiwVU7q!i&O`D=0
z^tS5PwnIP3>mKlx|AuKyEhARobaza85UN_Cg_vHodr;geU~mMSxbaxQ4X8R{dZLnd
zEtof1aY7RHtSE?vB{I?Uz6lGRy4FOkVjUp#W>17o@7Lb4j-iLrVD{Jvj!E&M=Sh6i
zf*RN;W#CuhHku-f8AOwhp+M-hhUs~2fp2h(SZ!eWO0<@5qM2S@3!o+pL}k4JN2E}Q
zILE2L0gY7Qh1B%=f*{e!GroB%&GhPu05!XmFK^(0L-zc@0S!O+Re|ZT2uO0V5$J6w
z%^PZ_S8D;(?EEM{jDkb<{J;TqKiob_ju}p|L?KKqZL=(u3CXV8K$-JZy*@Cs$I`1+
ztAtFoFAKTy#wCKGJ(E$rIze29xPdKr$<P=KZ%PKQ+luOTb%1BI#Yt^pGKP15_!hD!
zD2FR|25<TC6zo4m#bW9}Qwv_&AX%Ega9$eFNEW_8Ftoo>CVjeY=kTUBTxwTFEg4XA
z6JFZm*z^PIO2ZGnZZNb(G54bcZ)(OxKh(+rH8<g<-H1&;u&y-x(DedlumW$bP)Neu
zcECKX@@}4>p&f&fF3}P4&N~#ZAPfXSTFe_N-zwPbyfm-{FBuy0JeZQhi!q90(uG78
zA|gKy!;UUGFZ5alZ}}#i8K?pXcwsLi2BOw^2et?iagLVYfO@hFV!=?@c9?oBhc_Wz
zO8P-BAV9NA`by^=_Er!ypy7vDK@55Yk$SB3BOqP$L$4q}v-6|Ud1;4V3tk$~@I%)N
zm|}@SoZ8w&MwXdW4>EWmoKh)+m(>K-7^P~rjSvx(Ijh@xQqQ*%HsR%a3TYrVHvBL8
z&%q3)Wbh6cqjW&*y!>qzBlai4H$XKV<St`^3J^Xqp?u*4gzQ?{7=9UtYCp0g2RG5~
zJtsQh;c$8X822V`1H2jpw<_>8qw{XSKjRUfo4n}6Fzbh{I0EwOyfZV7Qv>0>6w+r&
z*9^*F=m3ZL_k;W^SLEK|fJ)%)6n-l3fK-gqr1Q?{2!=t1+&>&>s=@{90Gi<3!+}mp
zZh-uZv<*%h{TN<ziSIudx6LyKpRSYA>j&@x**R=4_m+o~KoEMn_46=MK>TM42pNHL
zvrX270sc#RPl}yiEXl0AS>xV|ipIIyHU2A<d(1T^WSIfgKNIrI==J+n#)>j+#ho75
zpeMB9!YZaOl<!O^?8t@E4w6F5SUkj9&*FOk@l@0CS)2+t4n`rA-%Kd%$c54ll1e*7
zxwqI{<Ef_OM{z3bU{N?Lp|B%AQrbaMc$0|5gE~Z<<>h7nk900$W%evDjgZPYU0x1C
zDkHtTv_eY$%aBk(iKeVnZG0zUzrx#OU|}HBz~<R+*tenkj$ZT=r3fhG;8Q^ge*l^@
edPNOG{`Th84-Xe_|9F3M|G>ilmVG`wJ^3HA)b*tR

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/glsl/chains/hq4x/vs_blit.bin b/bgfx/shaders/glsl/chains/hq4x/vs_blit.bin
new file mode 100644
index 0000000000000000000000000000000000000000..af6c9349f410fcc16eaa87e32ee35a9d92bb026b
GIT binary patch
literal 377
zcmZ9I%?g4*6h=pIHBWJu8X;!xq<zaE2wI7$$wYc%8YeAU^`yN*PteWGpEkpA5BJRX
z&1StcjmPV0FkXgQq?eV%gK02kuq~aDQc~<nm4Z%VAEGeEBT6^mBQPg$!n05Ui$CNM
zQfU<<%7oT*Bx_M*Uz_f1gRuvCxKI{ik1~fmQa<zv$%G=IsVKm*`HjO@sqz!K!dXCr
z-`%-hVDZ78<vQ*ZW{zu*cvTbc8#q<{!PzlfwVeoC{o63<)QxA5xA6?>QmVFNLw=uk
H=bXI(ZC875

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/glsl/chains/hq4x/vs_hq4x.bin b/bgfx/shaders/glsl/chains/hq4x/vs_hq4x.bin
new file mode 100644
index 0000000000000000000000000000000000000000..789e990106d043dd925dbffa7f815897f9fefdd7
GIT binary patch
literal 1082
zcmaKqL2iRE5JgFpMMW>+C23Qa5W^<wzRO6Jx<!<b$W?+PVu(rAgH%0Guhp@Gu_+BZ
zYrg0E%^$zMJWqaR-(O?LE#r!2r&Yn;CnLuhIk#oZGZ7!@IrGP=ax-z9g!6*Fl{`aL
zmJ*c2DciBaU%DM(0m6YDDW@#|BLyIVZ^~G)hPEmxYMO5^ZdL1Ml><}_G-#`N&q^!7
zRb{bs%badlu}Axa6J!!Ff|}Aw0?Zg)!+n|~Z|Z)y=z`Ao2Vjl?10j9J=M#F8a^U&c
zpP@PSryX6?pqr$ysHME!#j7SekUc|%?pkZ*qvKL0dJl>x&=+C&mM4&I!0-r`?PlT4
zsWRK_Si*H1B-6GnpskrGz(NYvKGf4XX;^1B4Px04EQf_0IyC{c2hZ5s`4D_IPuoNU
z%UrFtx`{)B%t7|7Z-#|{sPFX{<Z@m9-{$4ef(minT^lglSRo#Q4tvlhEwzB_SYZz<
jvaq6m@{0yhq8>^!ZKU#RLsy^9P|AG|gckwjr|UYuF?m|`

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/metal/chains/hq2x/fs_blit.bin b/bgfx/shaders/metal/chains/hq2x/fs_blit.bin
new file mode 100644
index 0000000000000000000000000000000000000000..6a3da392480084ed1b98155d1951154fce2cb223
GIT binary patch
literal 634
zcmZ{i%SyvQ6o#X?%2S+`%t$D;bXRpF6kQY-#Z?Kzm`u{(T*6#RL0tKyzJgEST#`~t
z-DUnc=ljq3C(HHI)y3D(cb2_hW|=dcY(Y}NOiwEYf?3KJxv|<+7WSOlmF4R#t(kt7
zy|eI<12kMwJBJ;q6jyq>7^Rt)EZbK~>DsHG=Q%IVj-V~&%^X@zmYTMY0rqd#tLz%3
zh4=T^#+M5wPX-*o!_X_*NkC^dAi{Fe!DeGDZ5iogSr$+!>5r$x!SotpkMlimu4$M?
zQ(TsQ>jD7$!q#avtM6hg4`4zDzI3>VwFMX|dd_qt8PSumYS3d9&O^F?Mjm#G{wf5W
zBD133QB7`xGJeB-x<nB@NnjK@4}JxpIOGgRoph6<2g4W#T(X)RKZ++K6pb-TfH^+6
W-lUFzO20$GXy#Lq1I@o`o@c)#)ZC;1

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/metal/chains/hq2x/fs_hq2x.bin b/bgfx/shaders/metal/chains/hq2x/fs_hq2x.bin
new file mode 100644
index 0000000000000000000000000000000000000000..434944fc7f3e133bc140d8dc56f8848ca29a06cb
GIT binary patch
literal 17344
zcmc&+&2A*O5#B>idWt>;Jz06&WdCCmUkn%tU?T<`pB4*YEREIzM$%$5@=7xNAVHoY
zPm$M3RW-@3B8$^n=%CALW{O>ZtnXv7o4w!t^!Gpg@AN<ae)HzP-@bWse|L5BvAEe>
zZ|^>B&bP(&_ORK#JGndT@6Qj#!)|l<;jsJZ*UiOt|Bstb_lM&5lcKoX-EI!H`0ebl
zeK^0p-CtDi{I3oB)u_K(_1F5{$sfAef8HOw-CsAm%cl6aJNs_G`S|Va?slKO>gSuQ
z%iI0+>~2%sqq}E!S5I4T7mQtklI!hF6s0rgBL87?byJi|8qTf{yR)m}{rkJa=HvG4
z>gL0T)8hR02EN7`ohyGX=$d=D=9l}+%k93bRv$h<-cF060M8Eh`>nnBE9Lf^;$nNg
z*}+gJps}aL-RAn!Zo4N<ch{fJ{3!SPQH|gK{4b`@fbCS@G{$SgF{=}taFGC)A&TZU
zOr|ZaZZ06d^Q7D2aQ*4G&HjvL+<z|qRzTv<4`n%}aLuZy_>0TYn$6Yv;c>NMW}G4@
z7)aY>pa!LPS08W6@~djy7H|FUR=coa7dCKVY1Y-(lQZ|K-KpxFsg_;c!qp@!X&%;7
z-bhuLoYSJ5(6UnET}}Q8104(X$Fm;4!5{Qf$=BPWbbd9EJD-h7tNYe{nUi44dF4Rv
z)C?@{Vf_e7t2LqC%hwO^oBPtNA8@#cYZP%Ay7tF2Q!Pd|<RTltG%{1Ep&2S!=ejWz
zhzt&X#E3(5k4bc9W;F}*WvDvw?_zky<l-~-ivz5+iZZ<74VL^%iWc(onOUiQRt!gm
zL1>gE+NoC)0P2U@eJHE79mi8Bpmyl-k1@^abXrtuM6l^V3V-X`(5P7mmyo0}(}-#?
zs}<zWX<qqBgaUkgQov;hU4GOTLL<Q+RE3@jLanz#*nPcJbh%V;M4REoRq>>!f?)4c
zfrx#@su(h<u$;&&GSW)`Vlx1-oMx<f)l}F@rXrx&inSUE==J8Sl|D9}X)Is*Ei&xO
zrc19}%URP>qws1VwskHQoOJC=`w_6Bg4lA_w8)yTR}?l|6`XV}lI}~YqRvpe<*aFu
zHD56meXc4v>Dn)Blaf`gUh4p<IcwI`$GsjvMwtpv6*cGF8aa3K%U$VvW(!nZeC5X)
zs4TW$@ITkYh*y^|(QX+7J>L`*>I!<5VX$=zeHZOC=N$=BCu}URQT(IW?(VjV+%=i7
z6`gwJV3HGDjRZ$td;8$_BkXa!2ki=C@G=NO%Cv}x*+fJ&i>R`F(^lh<goGS;EF_d?
zL*hhLBT>a6Jsk;2%CwM(p+rcn2&r!E*kG^tJLGzvCFHVWA)%ayM0=tzO~g3Ds0E`i
zKCy#zq}h@Bh+B$6Xlx>lv+qbgPG?kO?gmZpljs1$7Mi<6^Q;>=Bj`@F%W*D0sGlks
zKX{~|kN&gs!j192VrKkjia$X^!+EAbo;iYHphTrS8lnLnJ?L4)aD#lI&6@L<<h(j?
z!STT~ypd{<4dQ~AIOQ1bmoeNBMTm&7_B<!#Fx()S9198M*^qcg)F9g9kR(oJNK&Rv
z5>bQ*35$OYNyl)5WO6Jdl=F}T=9+{!U{+NOH#x45`iK)G(je(lW57qlcp*WV)a$q*
z(u^bru?4<i*lPqoB-&>maGc8zULIqZeDoFXypR~C%=i%$e~Mw=ku=CIM=%U)xl$f2
z(SRtAk(Ebg9d3~?j#LN9d3A6Mx4e63L-*j<+N106xQyX8=`6qoFL-?&ZWme$l4nEW
ztwpP~780i%!{b`Yv`I=@3$VdM(lOjFv=$`iAqi}>330%zN?f?=Y;#;8^${mXq(M@p
z#(<xe@j`+!sn>Bsq&Z#TXWfDy676!_5e$=$J_pVViDAl&A3^aa7;Xvtehjik9>W&y
z5^Ci^G{7<34y-(K7-rpw)=Rf2=heY6-0|+A3*EzWFbqM+HCl<NOF9d%!3$o;aJSG}
zkUSd_Z!J2lwU9Vv7>1CfObaP#Ex-m3Nyl)v&{~k3ha|AkrNn{k4&%ex<|?ntafQ@J
zoFI_~NtGG{emcer3Cg5i#|@F@bcLUF3w}tn%W*D0+B!@=`W!efB!($7egwszV7Mdj
z`!UEaM=%UG(Y5j*8sHf2dR87840o&>(J)MMUL69%ynE<E_wXzXH_I6Alg<Kc@PgMd
z+%L2iB+rG^^VXu*S__F&j^Sn*!+p|PfDIm!j^TcxwIDeUNnoQ-i38ak#>W`$b6g?y
z5hqBbK~km0fS;c6LV_}>*KtFnIbGpr-GUzy?Q)#UkA`9L(V?$*UPug6X8Z_>Kf!QM
z;P+#YU5;QFp8hBp?uiCChI_ml;I~>C4EL-X(J)MMUL736J?|d+&^<g0!`(A5oOBjo
zV~!}dAMO`g3zFwT8hC3lXstya!`(85horRt8$2W(!^1*rL2@3Fz{Zdg2eLbik1;&t
zxI*e9PKb~euj~Oo1LK7RWm2!>2B{fhlfEJd9a09t4~cd;&gDnLF!>mC;;mcIHU06w
zVrKkjia){dK;ZXdkX?>o7#>?H7#@fQIEDv)%QJ)FfpsGqhDpw=gJXE$-NO*Nhi73J
z&y4VU)>=eKX8|^N!Rzbru+UnNJR1^kEe5T%$YXd|#_*W57GQ&iq+@toXe~(2LlW2+
zQ{ss4^}5O%b6g?y5hp}Qi&yr5pONuGf-<Ssaf8$hv1Ktl3Vukm&pzO|BN!$heGZ%#
z62p`kKZ4><Fgy|k`7y{Yc?{R^yj`jIk!XNpc;vS{GZ-FOH=<#f<h(jKhDY8#jG=pY
z4u&C!MGTKgX8|^N!Rr_v7g`IFXG7wx#i+FwSqwu+Ql?E((prEG9#RIw3$4Y7avqYv
zhN%+ffN7P$aHR)BL6dfmGtx-35P>aT+yjJ6#ke6sTBO+#M5H@i=9zZE5{dq3;1MWK
zeuh*yPb8S9423b22O2?PgtITEA}WY~B$&rP^7R|8<A)z>zDlC(5vIo(pB^^^PvFt|
zESqj)1{v(WXW4Xngvn5+%L@CIX`41<K?cvZXKhoH$7IaIY4Kn(rqdNArxR0gK7nsw
zMbID~r<@<L>yPJ5m9PeCnlY9kLbwjhX_X)R#{nE<(sxcArb?M3z5&Q~;pQ0+=}eVS
z2U?lq%56*F!ll4)KsK=HbgfSUow21!2`nGq29$v<QlgoT%<_fHfE6B?PKt2hLSQt2
z2PUazI%g{kLlNk_Nats@>WEaj20$uJ$t$E&G$CREjvl<jxz=f8Ac+x^AU(!CL{R_C
zeF`X_OMq=cm?m^|R;z7Q4CN?{p-d!=j*&-u>1;2@I6#46-0HUt&2;ouBpEc#C6mLr
zS=h0F;yDkB?}Cj@vS~?h%%A|FEH*sGB)b*^R_3^}7^gG0T6u=)KtkeB5aea}&czty
z1A%b}OyXDuCS^+7W2RHFa>Aaod4UVTmt%p^03MhG<aAJ08qREB44tFZY(*-SEey<D
z0z;pAE83Hz7@tm~A^?TQ5Mv(WbZFIiP0-~h#PEmU$HGR&kfZZx72}knFh<|Z7;)Sc
zzWH);*IBp;0R`m0>5un}P4+XWX~seh<8*RWo5kQYZh3gc2q=j2sfG@y3Mhc{62}}0
z@fxo}A?;7V${be~<8%)7XkbSh6mi<r&~ei^Fo|Osn3So3r40&L;eln=aXM9cG_bfq
zk${{Ik4nVk_BV94RI?SSRQ5LpCLo5PuPHhX>eMD1kVv(<!7-48SosXyT2M%0AR6du
zo5;ZT48qayMc?62j>4FEha+%O)A}ApA-C{#99M3Jas9TVsi~(CGY3ah=aR``yk>ok
zAk^Rw>u1t+ycRny<pgQGR&yxC_}8FNC-+kgSefI>V!U2zP-sAwyySMVP8t-L6^UaR
zn3So3r40&L;ell^USt2E;V#Tr+@M6LNy!C@Kq4ln%58Y0%IPd<wA4a=rP3K&bX@d#
z7@y9FA^>G=r%eJ=&vr8e-P}6PkBX`oCr5oUyeou)*;<V`3S;R05RIS|g|}mjIC%=+
z0Mzqk)BY(a!IR{(P`sgpSMt5TIPQ<a&+N*2n(FBVU@};i7q^G`Sb9~57yMv4P790w
zH1t&IZ6QZCVdQ{=063?G>2T-@o*>Av@HQYtUzas$>_8=qh6NvoBayn7k}1xz1TnlV
zD0DQ|>1gmp;Mud&Vp8I5f}PuaNsoKNHX3x1d0Uco_-D0(5&nHe8#J;PCfP*Ix0~pl
z(T126UK*vdwPopCpN&8&s(P$C3t_`&)50f8igN<xW^8Nd!)QR&5AboyLzr@8eOwiq
z5?=O>Us;Bq*bB?#itf5#<3`+Ff-ji(U=ZI(2sH-Jqaz`!F*x`c33-h{A)}OhpS6qI
zPYtM_ZGmB-4j&^kM`EFHBo<0XNE$gJ_L&WCiG!_n{UjX0TSq|%Pl6+%a3mH=M@Sku
zG6;3pw+CD8`g0@{j>JOYNGz0&kdz#GU<E!3YvcRs!|aP`WDSk)jgZQT9p76a?IX>#
zkWva{TBhT}z9`#@=nID+Mu{ny3|<}vM?K6999V`|jJ+I=bARpME#nl|0L9S>ie^Q4
tbbLaj;{O3KtycJ|61q=sTHUVse`mqcGdaB9!hZ{K<A%cjT5)pn=Ks2|-nRe%

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/metal/chains/hq2x/vs_blit.bin b/bgfx/shaders/metal/chains/hq2x/vs_blit.bin
new file mode 100644
index 0000000000000000000000000000000000000000..122b7dee5c387c772067b0ca196a2f12b636ec8d
GIT binary patch
literal 757
zcmZ{iy-ve06oms~%2V74rKpP1kge(tLq(+umMV(e)G0=Z9XZ!&3S#0(S$F`R0Oz+(
zRkqkV_nyz^<YoPEbM^K6ZCO9pmZb{D_rOU;i=4z1GKwUf+XYG$BUCBDC8q0FvZL~m
z=L+G&21rstFaQ$8A{Eku&4wUKwpB<SZxV*{UURQCxhNPi!AGi@sq(c7X%!10cjIM#
zBm2C}^Q7<$XrD%_lUr|W@B~nH%mbpYuLkqE{g2l(XNi!R@%kzN6_t!0R#Ln*b0w8}
z(Kxe?vCDBu7zgJ<s8NP##B@Rhl0A(W55p<Mg6ktcYoQ~#g=R+SnXO6^Dx2UZc3scN
zpd)D1Vt91`nB^sr(X77ezuor(EZTN`$8)_Y%v^6WQdCE+XmQ<Bw{CT;Rjr9@*02Dl
o1$9qp!QJ54EbqpQ9!w9ToWY@Q(bTp7VvQjwD#<$<U5#y9e+-TWr~m)}

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/metal/chains/hq2x/vs_hq2x.bin b/bgfx/shaders/metal/chains/hq2x/vs_hq2x.bin
new file mode 100644
index 0000000000000000000000000000000000000000..d7332288c05fd40304c62c199a7b37c11402ad57
GIT binary patch
literal 1487
zcmai!zi!(w5XL>Ui=Kj0A-66o%aRr&dpiUT5VT8R2#i8IEF{vPC`WeC2Pyh8-TGQR
zQ6xn<s<T;#`}4c+JNo<W=Qn>BzkkhUf8Ne!P0jcYaZ=HGPYQ}Esz|vGY9*UOp|&LI
zT9vnt<bldBeBUVa93ZqU1yKnic_B(6BXoC1l#=YeQ8bL^o6XwhtRQDEYNnXrqpYQ$
z6+@PyZ6Snw7&nV`+Rtg8uZ=nb+LiguFwGA3coK9l%nmVzkQ?rzU80RHC!_IXbhQrt
zL;H=ht&o+cUz?yNKQQ`qBgGG|ThmR>Yj&cM?slLO0%I@C?#7>M!Z->i%*rcO<_wgt
z71`08@y%v|3c=x%pSf%J-XUGnK+S!#-BPIyod?fg>1co<(AmPHSJnPNWUfWCzwzk_
zUG-NJhY^kzXo;hFSL8C<BV_crc(@td9=oi52=?v0LSYYz2My7C*H1S$W!7?kK!3On
zJGO<|RRa}6K?tCqhDpvC0GsO>`YG6IaNn)8f@<3cx84@RVMRWXy*BXNJup+Bcx@Bh
z2?ZLCVlBizhQl~t+XSBm6rV7`ohx41ajcppT0&MY0RwAnG{S8QrhTwWCW9P_jinxB
zijU_<09*K=DZaEu`eF@duSL>^>F6cUbOJQ<K(h&jvx{ii3pC?IrWJO!__sV<L3b#x
T%bRIxNmV1cc@OaC5CpS-+N<zy

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/metal/chains/hq3x/fs_blit.bin b/bgfx/shaders/metal/chains/hq3x/fs_blit.bin
new file mode 100644
index 0000000000000000000000000000000000000000..6a3da392480084ed1b98155d1951154fce2cb223
GIT binary patch
literal 634
zcmZ{i%SyvQ6o#X?%2S+`%t$D;bXRpF6kQY-#Z?Kzm`u{(T*6#RL0tKyzJgEST#`~t
z-DUnc=ljq3C(HHI)y3D(cb2_hW|=dcY(Y}NOiwEYf?3KJxv|<+7WSOlmF4R#t(kt7
zy|eI<12kMwJBJ;q6jyq>7^Rt)EZbK~>DsHG=Q%IVj-V~&%^X@zmYTMY0rqd#tLz%3
zh4=T^#+M5wPX-*o!_X_*NkC^dAi{Fe!DeGDZ5iogSr$+!>5r$x!SotpkMlimu4$M?
zQ(TsQ>jD7$!q#avtM6hg4`4zDzI3>VwFMX|dd_qt8PSumYS3d9&O^F?Mjm#G{wf5W
zBD133QB7`xGJeB-x<nB@NnjK@4}JxpIOGgRoph6<2g4W#T(X)RKZ++K6pb-TfH^+6
W-lUFzO20$GXy#Lq1I@o`o@c)#)ZC;1

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/metal/chains/hq3x/fs_hq3x.bin b/bgfx/shaders/metal/chains/hq3x/fs_hq3x.bin
new file mode 100644
index 0000000000000000000000000000000000000000..38ae9cf1aa5f47009f933edd47e735d3d6dc7996
GIT binary patch
literal 17349
zcmc&+&2A*e4c<dedWt>;Jz06&RsD}md@*1ofQ=Y%d|E7ou{2r>7)guK$ScY4g9Lex
zyh2_pB)h7btYS@Tp@a4yX_{;n$>R4FtEYOu`|0n0`rqk){{807f4_b6=Kk*L=3{ZQ
zx!&G=+MI8T>+NB)dv|ho*x#QYiih3i@WWyE)32M0?fxG(pY9LE?<YlZxx3vQZ1LOK
zVf%1?d%M4=-ubHyyK2;{R=rxkJNZK&_Mi6$Kkl!a-DOjJ+?{>5-+cV`c6Yna-u3g%
z)#dH}dUm%d?$O<|yQ`-yxC?__f|2X(O%$aY&PD#i=IW*>l{B1PA9iO~#ryYnht0?B
z+11U552wZX?G1d4Ejm~JT+luDaL+IImzUdpS*<>NfV`a+MFE~2?)O`J@mI?2H^s&F
ze6s^pCm`L^;%;;OX}8^zrMv4-XI{%)KWg#&pZ~?|85ldYH|cn5sIxl32^R@)8KP)z
z!(`gx>gEFSJ5RbT4%eT4+w9M1#{J*L-wH_l`JpVQ6s}nn6@PI#TC=%YKRm8hY#3(<
z3I@_P4N!y8yQ_~kW%*ULZi~16y47xM*o_U`SekY9_2kUGI_^|;Zm5>s-NM}@ENLFr
zQ{Ko_n4Ht1oY1mT;$2Pti2*tm>W^nVeu7`<r;@L?Md|!%Aa_0+lU4Vr`!XkCEa#O2
zxid4cxQF#47_HWXdM{r;z%}=wSwEn<h-(ya8M^n!GgB=_Hsm53zceyasi7GvS?9Vj
z6o?ECE@H$Xy2m6sGqak7`7%_U_<J!tV{-8s`^5p)T16RN@diu&B}EJQ`OHSCeO3%d
zhCyhQC5}_CCIHkAwfm#2)^;3Ep@7<<$6v-YtJ7&wsS&}Z11bEjYeQPI5N;t!V<wGi
zFsl{h&skpiNrVD?d{V$=2wh(53!#zV52`{>1)<iDLfC!1RCKvia73Ho#Z~d7r-ESb
zQ-O$m#i|%Gsj!^LEHctd0Ae!$v7BbCdDT?dN~R*9*ow6p3F!6atCc=Bo@p#!`Ykf-
z%ce`OT+3P0Qls!{AhvZb6`XYKOZyQRMFp|ttZ9)oU#}=^wkkO3S|r_<R7IVkcFS4Q
zB5S^4D*9YiaMHD3*d`^bT)ox-Qgha<sgHX-fQ&K~o+@h2xixa`=9jzD_skZky7<cL
z8mKI`U+|Y}V#KRUm}s|*ft_y(3Uvj&$}rfvg}#e+n)8kXsS`F9*eL!{Y<G8CMedqR
z*oscQau|{mT#W=rUi<OE?MK+-cn{hY#NcHRgp_F!5wnSiY8Fvt`=+hNAqfdN@K{JF
z&xXW_sz#!ULwY(Al9Xv75krZPS`kv++Off2@ps7eJWI%B$3j9m4~h0fVVa0>#Gn=i
z1^r|kq$6z{X^*(2D1^l(vN-#W<l}5cHRc}B1V4!mFl=GDODxZ}ku!qr#JbdT`9b?s
z$@qsy3i{~(c3wCge-$(1|EBm8G&G!N8swQH7zRpI%A+9~;L(GfMGQB{7uu{je@V`(
z0~Z`0Ov4+g2H7Akc!^Vv;eHvz4N-)M2y4%CLJq?XlF6}<P@WBmcSH@MJq}6YRE8vF
z+9VN0h>)=O=a6&^H%KPOLP9wYNnox?hy!L-#c-433TclxK_U&3E-eOpG>jJ#lu5ge
z8zRd{au8eK8-~3`@IzvK_5t-=e(?4f!{no{c;|)0FlEMTQ2Z%|c}LP9yBxtVtmR61
zv_u1<JVsU?nRU2DzBp1HB<Iz^G2HU*p$*-GUu%!9!{aiB+oZFAF?hl2>u|f!T97;&
z5^pV9t+kLi<rp5<Ql?E((ptb6JR}{%?LuooavqYvMw<`^%&NqNtIjsZ71ADYf<zi5
zRay-AX&EmhD3f*_H$;}x6@IoY_#v?_^^RbeeDpbRUPug6X1oT)pJ2Ep@OvF(jXZ`e
zJSEi1gJ^(bxE)w|<S@*-5v`YQQO>J_W4PnpLl?S-=U^CukZZIOQI~WUFa|Gp9mCy1
zYeDjCNW8V^wAMo6lwlY`k}@r%q_u!Cct|>iyM@+*<UAySjV>h)WOvXHYn!XQF2@zp
z9&v(18YER(4EX67FC-|Fb{#iFmeUn}wk`M}u`cyoezbL%eDpbRUPug6X1oT)pJ2En
z@OvF(mm?U4hv-^)5Djn)cReeQ42C<_jc6DqIj;_ZVctD-p?i21hMQ#!_eo~~WAK94
zG2Ab-79`Jw)brM&*IEmSQ;y+g8N+?jTEG}QBpt*3LTf>C9+JRDpArYMJLtz4?sHrr
z?GYzPq(M@p#ekol@j`+!Y1eT>WI0{oXWN1w66;dW<wwIX`RLHsJ1-=LDKlP!;!iN#
z6ZpLjvda++!?!;QhI^s`j^Q4k2KcR32E#q;Ml=kQoL2|OaL>DkK6DSy!f^Kt3@4oh
zj4?-)+Yk2(tp&+*Aq~8>7_`<RkKt|^!$Z<qz!*Fv9mB&yYe8}zlEB805(lz7=*Jiy
za$F(p5hp}Qi&yr5pMmj0f--5>af7rBu}NPMgbpc#;D^Mz)N}dKFibuMoA~G!Y)!xX
zRm_b4o8nI}JP`Q34zkM;48zx!3Wf)w0gmB;Kl03AcwpU#hGCNP>fjh2c=s@b?%`P&
z#xo=QnY9*C(pkV5yx{e9cvxsHNS+Oew-$reTI4Z2EMs^~S_>G1hoob8Txcyw&O;K|
z7*pbipY^)R8*^MC?GYzLNQ+nYfS-}^LV_}B*Kvci46$V~JPLkDtj|86-VqFwk3I*^
z3yERMjMt#}6AX_;L0$*hC6D16zHe75ek2;;7#{f}&kTk~){STwCONMTj^UAa4`b*a
zo`YcsViCh*(pkV5yx?^Vj|;5@$+IEx)?(CJi!6pABq`G-DQPWW3?5Pj!wap&h;km1
zz=o+3=74FHz;LAps$fZb#u-^8T8O|FFYW<CrefTXAT6@&2qLnbF7wQ~V2Q+jq<93%
zlb<0K&JzjdDMLYr@<19CMmYOoDx!k;BEdYq$k%VUj~{-l`6`LBN0=Tr`1Ex{@C3eE
zpJmfy%pil^_bi(pk1!e9bXj3nnYC#%7G&_<_H1ox@|cWyI4vGb#%#Kx<aA;x&L{8*
zMiDfK$0_Hp*!8dHOqH+(TADGIAwswhhSMrP_>T%4WYTv|9HvT{BYptLcH!n3U(%T>
zp$;5njw`n<fg6_sLxpT$)9G5D1Uh3&lM+}yeherBTckuY9hv0|mw{1uU^*$njSGR1
z0uM}5&2-LI3=Bn}^CF#})v6;h=^6lOG$pT)PSJ#j1vvWR9nQ5*8v{v<m;~uD?jeHt
zXYNzL_*?>P6T&Q^qqA9Ut70feL5DJtG&)8e?WME59OD25hH<MuHZ;@GTaje2G?z>c
z<7Q#U0*2>2D836eHp!+X!7+mZgtFN17?bQ;42&|zmBl!nxz)-uOa~GYhk_t4!*?#m
zARh>fLtqleGB7Dq+8#5Vij@=goXrc|2)-N(j1+ia5|GnDSvhcK17qkMtu|I<QrW`5
z%q1}Nskfp%Ig0V=G%5m6cnmS-F;0h8o!10ienJc{1V0uwGKL(TwN;E$j)IQ9nK9zH
zD}3_h<nFWZ5CRIwf6~9+Gd9`JprsiLIgHcERc#i7*SO{36(gV^&ZinWpempM&PyC~
zD8y^L3Wc;kfl=nTvKXgxs7C`k+MtNjriPB2#(_y3%fO^e4J>U?U=$u$W*w(frAGsc
z8x#r1>F}sTOm2TeXG^uQB9qGg#=r!`F!VJ=$3dOhWCIeJRyQ~Xk`No8p<4?INd|}%
zU2PK?_?|&H8b0Vd9LiD9nRhq>CpE3_K?}Ksuj9CKGmPtx9ZgL=jhHz&qB@sM4&ycJ
zYXqSNe^@`0uH&`XaVaNA<F%SYA;!N3g*thjYG9N(t}Mpur3Qr*vg9SVi*?eVz^q6d
z%fO^e4J>U?U=$u$2IDpM9~$n$jKvK~gqoCGpa>*lf~nkwN1B|@f<{X%<X0M<u|>y4
zpNH}3j3@$7)^^$?F!O9TL(t8w<NT<oig9w(C&Rl!D40j9F-Jj%o)3`*r6{}|W5mf*
z_ynMyZ=3c{!3drtpM~NLCA^dG{l#&A6n<uR*3(o^F96ekWqEOXn2)7bb$G!KrsK4*
z_@kk3mEIOovk965Dgkg#3)7+M3cf**y6`q2MPHXSS?s_hXv2b!>PV#SrDTe;EXQ>P
zZwm?=jdeB}d=Yr|?6jDS_%UIe+kHu2_k?XU*rMTWS>vtnW3>Ve|GuJ~EYf9i2HBWR
z)cm-K-WhF(S>dHoI$K+o&h>c^NJUkTRc9e={JR?){6~3le&A&@wl%b3lTO|A7XD4i
z2=k8APtKI^#&`VQGF)PBEt5a&g-_<cpyWn8VuBBt{V*WDmJkXJzLbuHtkB@}XC&l>
z2GxwxD3RhBR0HPcv0z|f4!=ugj>JOYNGz0&kTh~cY&IL*7l*Oh^^<S}pC1Jwd>tGK
zg(I<0IzrOOkwKWl<~@wnu0KaY;YchLj>JOg2uaD22UaDc7;SuCeVBbQjjW;Zy%AD5
zvEzFyq<v($7E(%qOv`kJ*cWA65r?4)0+kTTWbg(tIO?%(;M6j_XYA#0ru%FEf*I$z
z26&E+Q8X(;q$3q#7XJglv|8c&O6WelZgson|EC2@&*boa3;#F7jZ=mHy5i*I&Hn+7
CPv64;

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/metal/chains/hq3x/vs_blit.bin b/bgfx/shaders/metal/chains/hq3x/vs_blit.bin
new file mode 100644
index 0000000000000000000000000000000000000000..122b7dee5c387c772067b0ca196a2f12b636ec8d
GIT binary patch
literal 757
zcmZ{iy-ve06oms~%2V74rKpP1kge(tLq(+umMV(e)G0=Z9XZ!&3S#0(S$F`R0Oz+(
zRkqkV_nyz^<YoPEbM^K6ZCO9pmZb{D_rOU;i=4z1GKwUf+XYG$BUCBDC8q0FvZL~m
z=L+G&21rstFaQ$8A{Eku&4wUKwpB<SZxV*{UURQCxhNPi!AGi@sq(c7X%!10cjIM#
zBm2C}^Q7<$XrD%_lUr|W@B~nH%mbpYuLkqE{g2l(XNi!R@%kzN6_t!0R#Ln*b0w8}
z(Kxe?vCDBu7zgJ<s8NP##B@Rhl0A(W55p<Mg6ktcYoQ~#g=R+SnXO6^Dx2UZc3scN
zpd)D1Vt91`nB^sr(X77ezuor(EZTN`$8)_Y%v^6WQdCE+XmQ<Bw{CT;Rjr9@*02Dl
o1$9qp!QJ54EbqpQ9!w9ToWY@Q(bTp7VvQjwD#<$<U5#y9e+-TWr~m)}

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/metal/chains/hq3x/vs_hq3x.bin b/bgfx/shaders/metal/chains/hq3x/vs_hq3x.bin
new file mode 100644
index 0000000000000000000000000000000000000000..d7332288c05fd40304c62c199a7b37c11402ad57
GIT binary patch
literal 1487
zcmai!zi!(w5XL>Ui=Kj0A-66o%aRr&dpiUT5VT8R2#i8IEF{vPC`WeC2Pyh8-TGQR
zQ6xn<s<T;#`}4c+JNo<W=Qn>BzkkhUf8Ne!P0jcYaZ=HGPYQ}Esz|vGY9*UOp|&LI
zT9vnt<bldBeBUVa93ZqU1yKnic_B(6BXoC1l#=YeQ8bL^o6XwhtRQDEYNnXrqpYQ$
z6+@PyZ6Snw7&nV`+Rtg8uZ=nb+LiguFwGA3coK9l%nmVzkQ?rzU80RHC!_IXbhQrt
zL;H=ht&o+cUz?yNKQQ`qBgGG|ThmR>Yj&cM?slLO0%I@C?#7>M!Z->i%*rcO<_wgt
z71`08@y%v|3c=x%pSf%J-XUGnK+S!#-BPIyod?fg>1co<(AmPHSJnPNWUfWCzwzk_
zUG-NJhY^kzXo;hFSL8C<BV_crc(@td9=oi52=?v0LSYYz2My7C*H1S$W!7?kK!3On
zJGO<|RRa}6K?tCqhDpvC0GsO>`YG6IaNn)8f@<3cx84@RVMRWXy*BXNJup+Bcx@Bh
z2?ZLCVlBizhQl~t+XSBm6rV7`ohx41ajcppT0&MY0RwAnG{S8QrhTwWCW9P_jinxB
zijU_<09*K=DZaEu`eF@duSL>^>F6cUbOJQ<K(h&jvx{ii3pC?IrWJO!__sV<L3b#x
T%bRIxNmV1cc@OaC5CpS-+N<zy

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/metal/chains/hq4x/fs_blit.bin b/bgfx/shaders/metal/chains/hq4x/fs_blit.bin
new file mode 100644
index 0000000000000000000000000000000000000000..6a3da392480084ed1b98155d1951154fce2cb223
GIT binary patch
literal 634
zcmZ{i%SyvQ6o#X?%2S+`%t$D;bXRpF6kQY-#Z?Kzm`u{(T*6#RL0tKyzJgEST#`~t
z-DUnc=ljq3C(HHI)y3D(cb2_hW|=dcY(Y}NOiwEYf?3KJxv|<+7WSOlmF4R#t(kt7
zy|eI<12kMwJBJ;q6jyq>7^Rt)EZbK~>DsHG=Q%IVj-V~&%^X@zmYTMY0rqd#tLz%3
zh4=T^#+M5wPX-*o!_X_*NkC^dAi{Fe!DeGDZ5iogSr$+!>5r$x!SotpkMlimu4$M?
zQ(TsQ>jD7$!q#avtM6hg4`4zDzI3>VwFMX|dd_qt8PSumYS3d9&O^F?Mjm#G{wf5W
zBD133QB7`xGJeB-x<nB@NnjK@4}JxpIOGgRoph6<2g4W#T(X)RKZ++K6pb-TfH^+6
W-lUFzO20$GXy#Lq1I@o`o@c)#)ZC;1

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/metal/chains/hq4x/fs_hq4x.bin b/bgfx/shaders/metal/chains/hq4x/fs_hq4x.bin
new file mode 100644
index 0000000000000000000000000000000000000000..5e417d94af91a641b071fda7ffac43a124c09808
GIT binary patch
literal 17349
zcmc&+&2A*O5#B>idWt>;Jz06&WdCCmUkn%tU?T<`pB4*YEREIzM$%$5@=7xNAVJ<E
zuaMVDRW-@3B8$^n=%CALri)#FtnXv7hrQqZ^!Gpg@AN<ae)HzP-@bWse|L5BvAEe>
zZ|^>B&bP(&_ORK#JGndT@6Qj#!)|l<;jsJZ*UiOt|Bstb_lM&5lcKoX-EI!H`0ebl
zeK^0p-CtDi{MCkCHR@HXUajAq{Gpru=l#Lk{dKduY>JP&v+wqskKf+zZui-{e!jW7
zyxm{V?l#3ex_fqa^|S?d!Pq4zx!&GHQ95%j@*g%=H$|zW;q3abJG(00zrQ<dK5oyh
zZa#cCEzWOm;A^bWx$@_N?zxA1e!0KA-0sV2_2C2L?X)Ng@a%BE-`b16Qf|K~F1F{J
z9Sn5>8hcvYZLUA<wtLcacm3(ik8;<KYW)7^e=&UqY^VCBF<u*vS)Jg7iv+j~Q8c$<
zGHr2na{>9CC*2l@>rcOJ_GdKX{&VrS0uq0ID9b5@YgR?YUtEsXY_8T1kE<0k;}k)`
zK-wk)H7LEi`gl{8Usdb2c<ZlQ?Z$@P*uagYSyx|A&fKeZr>b+NT6T8}cayNBd00<*
zBUNE?PK$Cv%SwrNHTfqDbS%^#&wBg@f6z}QUvG=j`PD$~d^RSn?pya|PJ%7xl>@m`
zGqAXa^&=>))`WU5Uq8S#_oZ1s;BXPwDB?17?~iAuT8wPSMK*qEWTsL>GgPw9bz>+H
z85~^1h(mObNpxmrH4F1)s5<fQVtB^n;xqP(1FW@*GQ8pqmi$YK7V`6%S*d+i3`d4R
zXp|+|saF#K>WA8WD66#{$5SYvcIfesG0p09T2yL8u<1Ywf9u-Ns96ZNkfbrwh-xsa
z739xpUinFc0(^W@z-0(se$*F2Bf%e3g`NsRt+ztheZ5q4xm0jOo8iS(@ua7MVDD3b
zh<(MX7&57_oX9LP(n|nhGXSxiW~_PDRM<+UBB0ocwHgWN_2#RUJ~p0dEMNL9GVIHy
zORrqZS<_OZ@M<8obuJa0bnQ#~5wN0y*mBmi$eOQL6gFEGoOCUc?n|no&QQDMtZ9)o
zUojPZt|~a`+AnOAl2xu=>j0@aYu41qy&gbDnF>!8HRs$KId}8RUFmyf3shZv<;NPR
zEVf_pmuq6gt4o+@w~T?FZwd-^1-;5J*t&(ji*}mxjs&R_HWt_@{!wgqcUwj7noQV=
zPQ7w4$qBATf+MfJeQ^5`_Bh^yb_Fqb83Z9^T13QbBBGi_RN201t8qv|LJm9@63Vk7
zaiXe`sN#^Gj)Wv-T1doDBBWM?RJV3)uvh#Yay`!ya@nzvP|ic5JyDn@VjN-Af>9Ws
z*g-nd>_~mYEkz+THj&2JcO)ODGpaH7fF}4!bbw(C&0V5-){UGIbSK*7IF}#PPnC=x
zJW|j{|Jixr#`vq48ULB$PteeCo@tP0j$jxlQ7MmxXn;o#dKNL<AYW*+=KLi&uMS*r
zd@v1fq#9&{xZovDIfnaX3^zm(A|k9k&j~pUH%KPOLPB{qB;FA<i1s)niBlPplxdSh
z6d^*w;-5p(G29@T9198MJS2g+CLs=(RTaZcjw_@-;sl8_NV?P*@X;_{NKhvAI&O$G
zBgsK*fo~Z08o>{V_Spv<=kkNM#~3CbeZ@O3B!($7egwszVwiU%4YJD-48vNklt)W6
zAj)H8<&jy3TjYx))j@Jz9UQ|g?;hIFJ@~cu=sG+uW4KK^3$VcpUSEgXh1P=P*^qc^
z(Q2)Q#3{${xRx?)l9JW}Z19kD47Urd1<83x0vl~Y95AaA7p^+n99Kwv#0e5<kW{HL
z;HPE0kf2QJb=(kXPFMI@x8R3FyBv1}!{npSf%8IQm@?x>Q2YsoTLQlygRGIqu!X0D
zT6qu+a16HtD~}w8SvR8f(k;q)b#M%KynE<E_wXDHLlAO}RwC+>&H`-kg4Z$JEwmOS
z&xXWXi%x4TBu*KIAtWi&LP}Z-u)#ypG2AV*79{5(32byJaUi?H_^`IQ%Ik7mA@va_
zNTfkhrN)4tj`2c*GO5>bL!>!f;b+}~9}?|yoXd~44wH{Q2hIzLVakjjLGdRT?g;#T
z46@4+48ucotvrYZIEK5Pl}84{9qUFk43nH!hrlrJ9=gyyJPX6kGKTx4vj7{s;B^f5
z3#|pob0PJ-wdl3hLgJKTxLL+<pR^WWgNLMJxL;^3NX|nN*yvN@Kz4`mF^2mbS4e%t
z2@+|LRH-rGr)Rv7piJs@+z@F_SNK`C;D<!J9Ov?*VVHb$=<A&q62p`kKZ4><Fx(UP
z{TO7IBN&EXe-sS&L<1bdJw6TaTdfR+d)AF;7$!Nd4vyiTcMpB&9-f8a?im<PIt#Ed
zN0i$S_Y18B$#WqMytNp#)*_GLZW+Tv(prEG9+HmXVWG7kIS)x-V@Qbu*&W8m7#?z5
zA@va_L`aKQ_JE&(@j`+!sn>CX)C{pnUlD{3DTCmLM7td4@}psxd<;7A(Jknj{`jky
z8ULB$PcS?X`284Umm?U4pDh&(4@3hT!vlZhnZfYDx)BY-B<Iz^F+A|@VF=yBvoMTj
zM))&pEuy5e02{pE^>uhyXe~&d4T-lFgVtK)F+40|cuZOgu)#ypF+47`79{5(32clh
zam3GhUFD5Au8{hO6C$L=D|^7t$ao<^nbhmJL28EBvKSr(KP1{`A8_0e43m#O2hIzL
zVakjjLGdRT9*Khd7-W|`hHLn}U8(qyXn<pQ<c~Zv7#>+SqG6ciygE3BN8UY*p?i1^
zh9QVW439}?0XBHS>lhvvS__hAL*lK)sI?YZ3`0m#rcF}PT7V56QU=2dt;L9P9+JR@
zsS@UZX_dfmr3XVnllF`=(nz!rfh}I#1B6V)xFJDWq}dTfq&r>anRdYviT-Hd5hzc7
zhEzCDB$%fRg)x)|8bM)%voEG1Du^!<%;SrE{f7Ja;m4Y<k|=wG>2b!VpBsWF@YDJ%
zn;v5Z8SK7i+4OjX$xx@u3cJd*O`EYGgWtAiZBvuSWX!{9@nABh(-kGB6H{?Mfp1_%
z&>$YCoPT21f1Wc{!WyV)##n|3;XW{@Retav2XK%{-#KxZDrJuN0U+Cjn`it;XR3rc
z(8?TFZd(F3E(L}IvVl#fYkd;vj4e${VEOnlpbTu063ujEmM>fetnk2eQiK~90;2&u
zFiADjIa^^Eia_T@IzOvbN2Jm<08(j6ULl>L2@wl$^us%xYn?U*k{B@w(qr611oh9{
zr-1Ug1lT5oX+lS5wc1w2P>#YF%0$xW7<sgp&h~PQ0~8p>t^U~1Oh<1;l0nm4GC7Q!
zg&hkhp7WsiF4)*4o0bH}3<?m+V#8xhvTHG5WsWP0aXNFWm1md^BqR<6L0*RMT#P|J
z5EzHRB#vcZQl_*$W;zusC+s<!7q}68ITjcV;DJd%P6uVB;miic&^cPoR-{td!obWW
zF!ZUnqCGi^@#!=w0#JAiG3GH&hgO}}1YLeY3@-#f7B(`59Gyq27^fVCG5Ti4h~uvC
z&6ktA&%#3pC?Nk$|9Q{YWIuzNW-R0|PA6BjSqxs|mWNl2fPy%mYUqHffC4x#am=9*
zukk7r(*6Xj%yDHgPUldM26nVT5vNTJ9XE{wlQ@=vNtqg0+Ms|H9$01_r&Faz1B)9J
z3CQX2s6<R|e?w<WHCvHNWq)H}0%92Ynxf;NPHnOQiBzi_90N&+mCw+v1%)IAqJgfq
zi41(tARG-}^c@c6D2$nRI07d%t?ywJatmL_aph(h*B?8YntB>Bb8tj;E}0z0Yu48Y
zLJj_~ekNVVYq8@}PLRfHHHSise+>$C@;udml{u~~#_Od9g$88FOKunIq(OmMkvNut
zNtqg0+Ms|H9#{tBHTEAG?!t`44N8QXlw6<)Bw~W9+=fT0oX&zqOD*JADxI-K$3>rq
z@#%~x0#Md=+9WXbY&S#D&8_47sHlo@a?~foyFw_Kt<{*LFovEF(FjUWcss_3lc(?v
zKt10!?Vo}YJV`za#T!a^C*S*v<Nhf8%<inGsh(Z{CWB>paeJ7LrB`)$!4Ib6w6OS3
zL%%A$E#$~1j2v(f0OzzY9S&W=F9>ohybVav*JVu_J5ULuVZq1YNTlwiWQwyaQ4hQ>
zD3mnTDQWOc;Muj)V$$M`f}z`eNx%1meKhDI`?e&*6cCK?FD%+gBV8tMkdE0*&Ci?Y
zrO}3{72X=9!?k7Ue4mX#E~<L0Ity{npD8cS4ZLc`wuV-08sff8$q4g~)K9*Y@Wyxi
z-ZETbZ!MEM?1fL}zM$krJYs?`nEhZ7UrPvu20uziLRM&S`ZE&pLW62XX_QCt45|V3
zvn?<z)ZuT*%#m0q9EpX}5t2rZh|Ok$`{H1$T|Ws&@cB^?!q35xP&g6`r6VMb92tZ<
zY~F*dcKtaL3P)n0a3mH=M@UMJJg_Pmg|+d0^<nnKG_r=q_eMzN#E$Q+koJ-0T1Y7c
zGA+{?VqcVPMI44h5T^uCCWAMK!BG!&1E-eZJ!3D2Gu>bN7tA=%HNbOpjG|c)A|0m?
qvG{)gOsf^XuY~T?>sGgG{(oAq^h^%#xA1>M+_<6eUss%*y!k(CVBfv~

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/metal/chains/hq4x/vs_blit.bin b/bgfx/shaders/metal/chains/hq4x/vs_blit.bin
new file mode 100644
index 0000000000000000000000000000000000000000..122b7dee5c387c772067b0ca196a2f12b636ec8d
GIT binary patch
literal 757
zcmZ{iy-ve06oms~%2V74rKpP1kge(tLq(+umMV(e)G0=Z9XZ!&3S#0(S$F`R0Oz+(
zRkqkV_nyz^<YoPEbM^K6ZCO9pmZb{D_rOU;i=4z1GKwUf+XYG$BUCBDC8q0FvZL~m
z=L+G&21rstFaQ$8A{Eku&4wUKwpB<SZxV*{UURQCxhNPi!AGi@sq(c7X%!10cjIM#
zBm2C}^Q7<$XrD%_lUr|W@B~nH%mbpYuLkqE{g2l(XNi!R@%kzN6_t!0R#Ln*b0w8}
z(Kxe?vCDBu7zgJ<s8NP##B@Rhl0A(W55p<Mg6ktcYoQ~#g=R+SnXO6^Dx2UZc3scN
zpd)D1Vt91`nB^sr(X77ezuor(EZTN`$8)_Y%v^6WQdCE+XmQ<Bw{CT;Rjr9@*02Dl
o1$9qp!QJ54EbqpQ9!w9ToWY@Q(bTp7VvQjwD#<$<U5#y9e+-TWr~m)}

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/metal/chains/hq4x/vs_hq4x.bin b/bgfx/shaders/metal/chains/hq4x/vs_hq4x.bin
new file mode 100644
index 0000000000000000000000000000000000000000..d7332288c05fd40304c62c199a7b37c11402ad57
GIT binary patch
literal 1487
zcmai!zi!(w5XL>Ui=Kj0A-66o%aRr&dpiUT5VT8R2#i8IEF{vPC`WeC2Pyh8-TGQR
zQ6xn<s<T;#`}4c+JNo<W=Qn>BzkkhUf8Ne!P0jcYaZ=HGPYQ}Esz|vGY9*UOp|&LI
zT9vnt<bldBeBUVa93ZqU1yKnic_B(6BXoC1l#=YeQ8bL^o6XwhtRQDEYNnXrqpYQ$
z6+@PyZ6Snw7&nV`+Rtg8uZ=nb+LiguFwGA3coK9l%nmVzkQ?rzU80RHC!_IXbhQrt
zL;H=ht&o+cUz?yNKQQ`qBgGG|ThmR>Yj&cM?slLO0%I@C?#7>M!Z->i%*rcO<_wgt
z71`08@y%v|3c=x%pSf%J-XUGnK+S!#-BPIyod?fg>1co<(AmPHSJnPNWUfWCzwzk_
zUG-NJhY^kzXo;hFSL8C<BV_crc(@td9=oi52=?v0LSYYz2My7C*H1S$W!7?kK!3On
zJGO<|RRa}6K?tCqhDpvC0GsO>`YG6IaNn)8f@<3cx84@RVMRWXy*BXNJup+Bcx@Bh
z2?ZLCVlBizhQl~t+XSBm6rV7`ohx41ajcppT0&MY0RwAnG{S8QrhTwWCW9P_jinxB
zijU_<09*K=DZaEu`eF@duSL>^>F6cUbOJQ<K(h&jvx{ii3pC?IrWJO!__sV<L3b#x
T%bRIxNmV1cc@OaC5CpS-+N<zy

literal 0
HcmV?d00001

diff --git a/src/osd/modules/render/bgfx/chainmanager.cpp b/src/osd/modules/render/bgfx/chainmanager.cpp
index 2c8e08793b0..458a45d449c 100644
--- a/src/osd/modules/render/bgfx/chainmanager.cpp
+++ b/src/osd/modules/render/bgfx/chainmanager.cpp
@@ -245,7 +245,7 @@ void chain_manager::process_screen_quad(uint32_t view, uint32_t screen, render_p
         tex_width, tex_height, prim->texture.rowpixels, prim->texture.palette, prim->texture.base);
 
     std::string full_name = "screen" + std::to_string(screen);
-    bgfx_texture *texture = new bgfx_texture(full_name, bgfx::TextureFormat::RGBA8, tex_width, tex_height, mem);
+    bgfx_texture *texture = new bgfx_texture(full_name, bgfx::TextureFormat::RGBA8, tex_width, tex_height, mem, BGFX_TEXTURE_MIN_POINT | BGFX_TEXTURE_MAG_POINT | BGFX_TEXTURE_MIP_POINT);
     m_textures.add_provider(full_name, texture);
 
     m_targets.update_target_sizes(screen, tex_width, tex_height, TARGET_STYLE_GUEST);
diff --git a/src/osd/modules/render/bgfx/shaders/chains/hq2x/fs_blit.sc b/src/osd/modules/render/bgfx/shaders/chains/hq2x/fs_blit.sc
new file mode 100644
index 00000000000..9af7bcf0ee6
--- /dev/null
+++ b/src/osd/modules/render/bgfx/shaders/chains/hq2x/fs_blit.sc
@@ -0,0 +1,14 @@
+$input v_color0, v_texcoord0
+
+// license:BSD-3-Clause
+// copyright-holders:Dario Manesku
+
+#include "common.sh"
+
+// Samplers
+SAMPLER2D(s_tex, 0);
+
+void main()
+{
+	gl_FragColor = texture2D(s_tex,  v_texcoord0) * v_color0;
+}
diff --git a/src/osd/modules/render/bgfx/shaders/chains/hq2x/fs_hq2x.sc b/src/osd/modules/render/bgfx/shaders/chains/hq2x/fs_hq2x.sc
new file mode 100644
index 00000000000..66bd69f253e
--- /dev/null
+++ b/src/osd/modules/render/bgfx/shaders/chains/hq2x/fs_hq2x.sc
@@ -0,0 +1,75 @@
+$input v_color0, v_texcoord0, v_texcoord1, v_texcoord2, v_texcoord3
+
+// license:LGPL-2.1+
+// copyright-holders:Jules Blok,Cameron Zemek,Maxim Stepin
+
+#include "common.sh"
+
+// Autos
+uniform vec4 u_tex_size0;
+
+// Samplers
+SAMPLER2D(decal, 0);
+SAMPLER2D(LUT, 1);
+
+#define trY 48.0
+#define trU 7.0
+#define trV 6.0
+
+#define SCALE 2.0
+
+float diff(vec3 yuv1, vec3 yuv2)
+{
+	vec3 yuv_threshold = vec3(trY / 255.0, trU / 255.0, trV / 255.0);
+	vec3 yuv_offset = vec3(0, 0.5, 0.5);
+	float res_x = (abs((yuv1.x + 0.0) - (yuv2.x + 0.0)) > (trY / 255.0)) ? 1.0 : 0.0;
+	float res_y = (abs((yuv1.y + 0.5) - (yuv2.y + 0.5)) > (trU / 255.0)) ? 1.0 : 0.0;
+	float res_z = (abs((yuv1.z + 0.5) - (yuv2.z + 0.5)) > (trV / 255.0)) ? 1.0 : 0.0;
+	return (res_x > 0.0) ? 1.0 : ((res_y > 0.0) ? 1.0 : ((res_z > 0.0) ? 1.0 : 0.0));
+}
+
+void main()
+{
+	mat3 yuv = mat3(0.299, 0.587, 0.114, -0.169, -0.331, 0.5, 0.5, -0.419, -0.081);
+
+	vec2 fp = fract(v_texcoord0 * u_tex_size0.xy);
+	vec2 quad = sign(-0.5 + fp);
+	vec2 ps = vec2(1.0, 1.0) / u_tex_size0.xy;
+
+	float dx = ps.x;
+	float dy = ps.y;
+	vec4 p1 = texture2D(decal, v_texcoord0);
+	vec4 p2 = texture2D(decal, v_texcoord0 + ps * quad);
+	vec4 p3 = texture2D(decal, v_texcoord0 + vec2(dx, 0) * quad);
+	vec4 p4 = texture2D(decal, v_texcoord0 + vec2(0, dy) * quad);
+
+	vec3 w1  = mul(yuv, texture2D(decal, v_texcoord1.xw).rgb);
+	vec3 w2  = mul(yuv, texture2D(decal, v_texcoord1.yw).rgb);
+	vec3 w3  = mul(yuv, texture2D(decal, v_texcoord1.zw).rgb);
+
+	vec3 w4  = mul(yuv, texture2D(decal, v_texcoord2.xw).rgb);
+	vec3 w5  = mul(yuv, p1.rgb);
+	vec3 w6  = mul(yuv, texture2D(decal, v_texcoord2.zw).rgb);
+
+	vec3 w7  = mul(yuv, texture2D(decal, v_texcoord3.xw).rgb);
+	vec3 w8  = mul(yuv, texture2D(decal, v_texcoord3.yw).rgb);
+	vec3 w9  = mul(yuv, texture2D(decal, v_texcoord3.zw).rgb);
+
+	mat3 pattern = mat3(diff(w5, w1), diff(w5, w2), diff(w5, w3), diff(w5, w4), 0.0, diff(w5, w6), diff(w5, w7), diff(w5, w8), diff(w5, w9));
+	vec4 cross = vec4(diff(w4, w2), diff(w2, w6), diff(w8, w4), diff(w6, w8));
+	
+	vec2 index;
+	index.x = dot(pattern[0], vec3( 1.0,  2.0,   4.0)) +
+	          dot(pattern[1], vec3( 8.0,  0.0,  16.0)) +
+	          dot(pattern[2], vec3(32.0, 64.0, 128.0));
+	index.y = dot(cross, vec4(1.0, 2.0, 4.0, 8.0)) * SCALE * SCALE + dot(floor(fp * vec2(SCALE, SCALE)), vec2(1.0, SCALE));
+
+	vec2 step = vec2(1.0, 1.0) / vec2(256.0, 16.0 * (SCALE * SCALE));
+	vec2 offset = step / vec2(2.0, 2.0);
+	vec4 weights = texture2D(LUT, index * step + offset);
+	float sum = dot(weights, vec4(1.0, 1.0, 1.0, 1.0));
+	mat4 transposed = mat4(vec4(p1.x, p2.x, p3.x, p4.x), vec4(p1.y, p2.y, p3.y, p4.y), vec4(p1.z, p2.z, p3.z, p4.z), vec4(p1.w, p2.w, p3.w, p4.w));
+	vec4 res = mul(transposed, weights / vec4(sum, sum, sum, sum));
+
+	gl_FragColor = vec4(res.rgb, 1.0);
+}
diff --git a/src/osd/modules/render/bgfx/shaders/chains/hq2x/varying.def.sc b/src/osd/modules/render/bgfx/shaders/chains/hq2x/varying.def.sc
new file mode 100644
index 00000000000..57a7a910952
--- /dev/null
+++ b/src/osd/modules/render/bgfx/shaders/chains/hq2x/varying.def.sc
@@ -0,0 +1,9 @@
+vec4 v_color0    : COLOR0    = vec4(1.0, 0.0, 0.0, 1.0);
+vec2 v_texcoord0 : TEXCOORD0 = vec2(0.0, 0.0);
+vec4 v_texcoord1 : TEXCOORD1 = vec4(0.0, 0.0, 0.0, 0.0);
+vec4 v_texcoord2 : TEXCOORD2 = vec4(0.0, 0.0, 0.0, 0.0);
+vec4 v_texcoord3 : TEXCOORD3 = vec4(0.0, 0.0, 0.0, 0.0);
+
+vec3 a_position  : POSITION;
+vec4 a_color0    : COLOR0;
+vec2 a_texcoord0 : TEXCOORD0;
diff --git a/src/osd/modules/render/bgfx/shaders/chains/hq2x/vs_blit.sc b/src/osd/modules/render/bgfx/shaders/chains/hq2x/vs_blit.sc
new file mode 100644
index 00000000000..405ef8feb3b
--- /dev/null
+++ b/src/osd/modules/render/bgfx/shaders/chains/hq2x/vs_blit.sc
@@ -0,0 +1,14 @@
+$input a_position, a_texcoord0, a_color0
+$output v_texcoord0, v_color0
+
+// license:BSD-3-Clause
+// copyright-holders:Dario Manesku
+
+#include "common.sh"
+
+void main()
+{
+	gl_Position = mul(u_viewProj, vec4(a_position.xy, 0.0, 1.0));
+	v_texcoord0 = a_texcoord0;
+	v_color0 = a_color0;
+}
diff --git a/src/osd/modules/render/bgfx/shaders/chains/hq2x/vs_hq2x.sc b/src/osd/modules/render/bgfx/shaders/chains/hq2x/vs_hq2x.sc
new file mode 100644
index 00000000000..a77ac7006f7
--- /dev/null
+++ b/src/osd/modules/render/bgfx/shaders/chains/hq2x/vs_hq2x.sc
@@ -0,0 +1,36 @@
+$input a_position, a_texcoord0, a_color0
+$output v_texcoord0, v_texcoord1, v_texcoord2, v_texcoord3, v_color0
+
+// license:LGPL-2.1+
+// copyright-holders:Jules Blok,Cameron Zemek,Maxim Stepin
+
+#include "common.sh"
+
+// Autos
+uniform vec4 u_tex_size0;
+
+void main()
+{
+	gl_Position = mul(u_viewProj, vec4(a_position.xy, 0.0, 1.0));
+	v_color0 = a_color0;
+	
+	vec2 ps = vec2(1.0, 1.0) / u_tex_size0.xy;
+	float dx = ps.x;
+	float dy = ps.y;
+
+	//   +----+----+----+
+	//   |    |    |    |
+	//   | w1 | w2 | w3 |
+	//   +----+----+----+
+	//   |    |    |    |
+	//   | w4 | w5 | w6 |
+	//   +----+----+----+
+	//   |    |    |    |
+	//   | w7 | w8 | w9 |
+	//   +----+----+----+
+
+	v_texcoord0 = a_texcoord0;
+	v_texcoord1 = a_texcoord0.xxxy + vec4(-dx, 0.0, dx, -dy); //  w1 | w2 | w3
+	v_texcoord2 = a_texcoord0.xxxy + vec4(-dx, 0.0, dx, 0.0); //  w4 | w5 | w6
+	v_texcoord3 = a_texcoord0.xxxy + vec4(-dx, 0.0, dx,  dy); //  w7 | w8 | w9
+}
diff --git a/src/osd/modules/render/bgfx/shaders/chains/hq3x/fs_blit.sc b/src/osd/modules/render/bgfx/shaders/chains/hq3x/fs_blit.sc
new file mode 100644
index 00000000000..9af7bcf0ee6
--- /dev/null
+++ b/src/osd/modules/render/bgfx/shaders/chains/hq3x/fs_blit.sc
@@ -0,0 +1,14 @@
+$input v_color0, v_texcoord0
+
+// license:BSD-3-Clause
+// copyright-holders:Dario Manesku
+
+#include "common.sh"
+
+// Samplers
+SAMPLER2D(s_tex, 0);
+
+void main()
+{
+	gl_FragColor = texture2D(s_tex,  v_texcoord0) * v_color0;
+}
diff --git a/src/osd/modules/render/bgfx/shaders/chains/hq3x/fs_hq3x.sc b/src/osd/modules/render/bgfx/shaders/chains/hq3x/fs_hq3x.sc
new file mode 100644
index 00000000000..8e0f46a80f1
--- /dev/null
+++ b/src/osd/modules/render/bgfx/shaders/chains/hq3x/fs_hq3x.sc
@@ -0,0 +1,75 @@
+$input v_color0, v_texcoord0, v_texcoord1, v_texcoord2, v_texcoord3
+
+// license:LGPL-2.1+
+// copyright-holders:Jules Blok,Cameron Zemek,Maxim Stepin
+
+#include "common.sh"
+
+// Autos
+uniform vec4 u_tex_size0;
+
+// Samplers
+SAMPLER2D(decal, 0);
+SAMPLER2D(LUT, 1);
+
+#define trY 48.0
+#define trU 7.0
+#define trV 6.0
+
+#define SCALE 3.0
+
+float diff(vec3 yuv1, vec3 yuv2)
+{
+	vec3 yuv_threshold = vec3(trY / 255.0, trU / 255.0, trV / 255.0);
+	vec3 yuv_offset = vec3(0, 0.5, 0.5);
+	float res_x = (abs((yuv1.x + 0.0) - (yuv2.x + 0.0)) > (trY / 255.0)) ? 1.0 : 0.0;
+	float res_y = (abs((yuv1.y + 0.5) - (yuv2.y + 0.5)) > (trU / 255.0)) ? 1.0 : 0.0;
+	float res_z = (abs((yuv1.z + 0.5) - (yuv2.z + 0.5)) > (trV / 255.0)) ? 1.0 : 0.0;
+	return (res_x > 0.0) ? 1.0 : ((res_y > 0.0) ? 1.0 : ((res_z > 0.0) ? 1.0 : 0.0));
+}
+
+void main()
+{
+	mat3 yuv = mat3(0.299, 0.587, 0.114, -0.169, -0.331, 0.5, 0.5, -0.419, -0.081);
+
+	vec2 fp = fract(v_texcoord0 * u_tex_size0.xy);
+	vec2 quad = sign(-0.5 + fp);
+	vec2 ps = vec2(1.0, 1.0) / u_tex_size0.xy;
+
+	float dx = ps.x;
+	float dy = ps.y;
+	vec4 p1 = texture2D(decal, v_texcoord0);
+	vec4 p2 = texture2D(decal, v_texcoord0 + ps * quad);
+	vec4 p3 = texture2D(decal, v_texcoord0 + vec2(dx, 0) * quad);
+	vec4 p4 = texture2D(decal, v_texcoord0 + vec2(0, dy) * quad);
+
+	vec3 w1  = mul(yuv, texture2D(decal, v_texcoord1.xw).rgb);
+	vec3 w2  = mul(yuv, texture2D(decal, v_texcoord1.yw).rgb);
+	vec3 w3  = mul(yuv, texture2D(decal, v_texcoord1.zw).rgb);
+
+	vec3 w4  = mul(yuv, texture2D(decal, v_texcoord2.xw).rgb);
+	vec3 w5  = mul(yuv, p1.rgb);
+	vec3 w6  = mul(yuv, texture2D(decal, v_texcoord2.zw).rgb);
+
+	vec3 w7  = mul(yuv, texture2D(decal, v_texcoord3.xw).rgb);
+	vec3 w8  = mul(yuv, texture2D(decal, v_texcoord3.yw).rgb);
+	vec3 w9  = mul(yuv, texture2D(decal, v_texcoord3.zw).rgb);
+
+	mat3 pattern = mat3(diff(w5, w1), diff(w5, w2), diff(w5, w3), diff(w5, w4), 0.0, diff(w5, w6), diff(w5, w7), diff(w5, w8), diff(w5, w9));
+	vec4 cross = vec4(diff(w4, w2), diff(w2, w6), diff(w8, w4), diff(w6, w8));
+	
+	vec2 index;
+	index.x = dot(pattern[0], vec3( 1.0,  2.0,   4.0)) +
+	          dot(pattern[1], vec3( 8.0,  0.0,  16.0)) +
+	          dot(pattern[2], vec3(32.0, 64.0, 128.0));
+	index.y = dot(cross, vec4(1.0, 2.0, 4.0, 8.0)) * SCALE * SCALE + dot(floor(fp * vec2(SCALE, SCALE)), vec2(1.0, SCALE));
+
+	vec2 step = vec2(1.0, 1.0) / vec2(256.0, 16.0 * (SCALE * SCALE));
+	vec2 offset = step / vec2(2.0, 2.0);
+	vec4 weights = texture2D(LUT, index * step + offset);
+	float sum = dot(weights, vec4(1.0, 1.0, 1.0, 1.0));
+	mat4 transposed = mat4(vec4(p1.x, p2.x, p3.x, p4.x), vec4(p1.y, p2.y, p3.y, p4.y), vec4(p1.z, p2.z, p3.z, p4.z), vec4(p1.w, p2.w, p3.w, p4.w));
+	vec4 res = mul(transposed, weights / vec4(sum, sum, sum, sum));
+
+	gl_FragColor = vec4(res.rgb, 1.0);
+}
diff --git a/src/osd/modules/render/bgfx/shaders/chains/hq3x/varying.def.sc b/src/osd/modules/render/bgfx/shaders/chains/hq3x/varying.def.sc
new file mode 100644
index 00000000000..57a7a910952
--- /dev/null
+++ b/src/osd/modules/render/bgfx/shaders/chains/hq3x/varying.def.sc
@@ -0,0 +1,9 @@
+vec4 v_color0    : COLOR0    = vec4(1.0, 0.0, 0.0, 1.0);
+vec2 v_texcoord0 : TEXCOORD0 = vec2(0.0, 0.0);
+vec4 v_texcoord1 : TEXCOORD1 = vec4(0.0, 0.0, 0.0, 0.0);
+vec4 v_texcoord2 : TEXCOORD2 = vec4(0.0, 0.0, 0.0, 0.0);
+vec4 v_texcoord3 : TEXCOORD3 = vec4(0.0, 0.0, 0.0, 0.0);
+
+vec3 a_position  : POSITION;
+vec4 a_color0    : COLOR0;
+vec2 a_texcoord0 : TEXCOORD0;
diff --git a/src/osd/modules/render/bgfx/shaders/chains/hq3x/vs_blit.sc b/src/osd/modules/render/bgfx/shaders/chains/hq3x/vs_blit.sc
new file mode 100644
index 00000000000..405ef8feb3b
--- /dev/null
+++ b/src/osd/modules/render/bgfx/shaders/chains/hq3x/vs_blit.sc
@@ -0,0 +1,14 @@
+$input a_position, a_texcoord0, a_color0
+$output v_texcoord0, v_color0
+
+// license:BSD-3-Clause
+// copyright-holders:Dario Manesku
+
+#include "common.sh"
+
+void main()
+{
+	gl_Position = mul(u_viewProj, vec4(a_position.xy, 0.0, 1.0));
+	v_texcoord0 = a_texcoord0;
+	v_color0 = a_color0;
+}
diff --git a/src/osd/modules/render/bgfx/shaders/chains/hq3x/vs_hq3x.sc b/src/osd/modules/render/bgfx/shaders/chains/hq3x/vs_hq3x.sc
new file mode 100644
index 00000000000..a77ac7006f7
--- /dev/null
+++ b/src/osd/modules/render/bgfx/shaders/chains/hq3x/vs_hq3x.sc
@@ -0,0 +1,36 @@
+$input a_position, a_texcoord0, a_color0
+$output v_texcoord0, v_texcoord1, v_texcoord2, v_texcoord3, v_color0
+
+// license:LGPL-2.1+
+// copyright-holders:Jules Blok,Cameron Zemek,Maxim Stepin
+
+#include "common.sh"
+
+// Autos
+uniform vec4 u_tex_size0;
+
+void main()
+{
+	gl_Position = mul(u_viewProj, vec4(a_position.xy, 0.0, 1.0));
+	v_color0 = a_color0;
+	
+	vec2 ps = vec2(1.0, 1.0) / u_tex_size0.xy;
+	float dx = ps.x;
+	float dy = ps.y;
+
+	//   +----+----+----+
+	//   |    |    |    |
+	//   | w1 | w2 | w3 |
+	//   +----+----+----+
+	//   |    |    |    |
+	//   | w4 | w5 | w6 |
+	//   +----+----+----+
+	//   |    |    |    |
+	//   | w7 | w8 | w9 |
+	//   +----+----+----+
+
+	v_texcoord0 = a_texcoord0;
+	v_texcoord1 = a_texcoord0.xxxy + vec4(-dx, 0.0, dx, -dy); //  w1 | w2 | w3
+	v_texcoord2 = a_texcoord0.xxxy + vec4(-dx, 0.0, dx, 0.0); //  w4 | w5 | w6
+	v_texcoord3 = a_texcoord0.xxxy + vec4(-dx, 0.0, dx,  dy); //  w7 | w8 | w9
+}
diff --git a/src/osd/modules/render/bgfx/shaders/chains/hq4x/fs_blit.sc b/src/osd/modules/render/bgfx/shaders/chains/hq4x/fs_blit.sc
new file mode 100644
index 00000000000..9af7bcf0ee6
--- /dev/null
+++ b/src/osd/modules/render/bgfx/shaders/chains/hq4x/fs_blit.sc
@@ -0,0 +1,14 @@
+$input v_color0, v_texcoord0
+
+// license:BSD-3-Clause
+// copyright-holders:Dario Manesku
+
+#include "common.sh"
+
+// Samplers
+SAMPLER2D(s_tex, 0);
+
+void main()
+{
+	gl_FragColor = texture2D(s_tex,  v_texcoord0) * v_color0;
+}
diff --git a/src/osd/modules/render/bgfx/shaders/chains/hq4x/fs_hq4x.sc b/src/osd/modules/render/bgfx/shaders/chains/hq4x/fs_hq4x.sc
new file mode 100644
index 00000000000..8e769bee46c
--- /dev/null
+++ b/src/osd/modules/render/bgfx/shaders/chains/hq4x/fs_hq4x.sc
@@ -0,0 +1,75 @@
+$input v_color0, v_texcoord0, v_texcoord1, v_texcoord2, v_texcoord3
+
+// license:LGPL-2.1+
+// copyright-holders:Jules Blok,Cameron Zemek,Maxim Stepin
+
+#include "common.sh"
+
+// Autos
+uniform vec4 u_tex_size0;
+
+// Samplers
+SAMPLER2D(decal, 0);
+SAMPLER2D(LUT, 1);
+
+#define trY 48.0
+#define trU 7.0
+#define trV 6.0
+
+#define SCALE 4.0
+
+float diff(vec3 yuv1, vec3 yuv2)
+{
+	vec3 yuv_threshold = vec3(trY / 255.0, trU / 255.0, trV / 255.0);
+	vec3 yuv_offset = vec3(0, 0.5, 0.5);
+	float res_x = (abs((yuv1.x + 0.0) - (yuv2.x + 0.0)) > (trY / 255.0)) ? 1.0 : 0.0;
+	float res_y = (abs((yuv1.y + 0.5) - (yuv2.y + 0.5)) > (trU / 255.0)) ? 1.0 : 0.0;
+	float res_z = (abs((yuv1.z + 0.5) - (yuv2.z + 0.5)) > (trV / 255.0)) ? 1.0 : 0.0;
+	return (res_x > 0.0) ? 1.0 : ((res_y > 0.0) ? 1.0 : ((res_z > 0.0) ? 1.0 : 0.0));
+}
+
+void main()
+{
+	mat3 yuv = mat3(0.299, 0.587, 0.114, -0.169, -0.331, 0.5, 0.5, -0.419, -0.081);
+
+	vec2 fp = fract(v_texcoord0 * u_tex_size0.xy);
+	vec2 quad = sign(-0.5 + fp);
+	vec2 ps = vec2(1.0, 1.0) / u_tex_size0.xy;
+
+	float dx = ps.x;
+	float dy = ps.y;
+	vec4 p1 = texture2D(decal, v_texcoord0);
+	vec4 p2 = texture2D(decal, v_texcoord0 + ps * quad);
+	vec4 p3 = texture2D(decal, v_texcoord0 + vec2(dx, 0) * quad);
+	vec4 p4 = texture2D(decal, v_texcoord0 + vec2(0, dy) * quad);
+
+	vec3 w1  = mul(yuv, texture2D(decal, v_texcoord1.xw).rgb);
+	vec3 w2  = mul(yuv, texture2D(decal, v_texcoord1.yw).rgb);
+	vec3 w3  = mul(yuv, texture2D(decal, v_texcoord1.zw).rgb);
+
+	vec3 w4  = mul(yuv, texture2D(decal, v_texcoord2.xw).rgb);
+	vec3 w5  = mul(yuv, p1.rgb);
+	vec3 w6  = mul(yuv, texture2D(decal, v_texcoord2.zw).rgb);
+
+	vec3 w7  = mul(yuv, texture2D(decal, v_texcoord3.xw).rgb);
+	vec3 w8  = mul(yuv, texture2D(decal, v_texcoord3.yw).rgb);
+	vec3 w9  = mul(yuv, texture2D(decal, v_texcoord3.zw).rgb);
+
+	mat3 pattern = mat3(diff(w5, w1), diff(w5, w2), diff(w5, w3), diff(w5, w4), 0.0, diff(w5, w6), diff(w5, w7), diff(w5, w8), diff(w5, w9));
+	vec4 cross = vec4(diff(w4, w2), diff(w2, w6), diff(w8, w4), diff(w6, w8));
+	
+	vec2 index;
+	index.x = dot(pattern[0], vec3( 1.0,  2.0,   4.0)) +
+	          dot(pattern[1], vec3( 8.0,  0.0,  16.0)) +
+	          dot(pattern[2], vec3(32.0, 64.0, 128.0));
+	index.y = dot(cross, vec4(1.0, 2.0, 4.0, 8.0)) * SCALE * SCALE + dot(floor(fp * vec2(SCALE, SCALE)), vec2(1.0, SCALE));
+
+	vec2 step = vec2(1.0, 1.0) / vec2(256.0, 16.0 * (SCALE * SCALE));
+	vec2 offset = step / vec2(2.0, 2.0);
+	vec4 weights = texture2D(LUT, index * step + offset);
+	float sum = dot(weights, vec4(1.0, 1.0, 1.0, 1.0));
+	mat4 transposed = mat4(vec4(p1.x, p2.x, p3.x, p4.x), vec4(p1.y, p2.y, p3.y, p4.y), vec4(p1.z, p2.z, p3.z, p4.z), vec4(p1.w, p2.w, p3.w, p4.w));
+	vec4 res = mul(transposed, weights / vec4(sum, sum, sum, sum));
+
+	gl_FragColor = vec4(res.rgb, 1.0);
+}
diff --git a/src/osd/modules/render/bgfx/shaders/chains/hq4x/varying.def.sc b/src/osd/modules/render/bgfx/shaders/chains/hq4x/varying.def.sc
new file mode 100644
index 00000000000..57a7a910952
--- /dev/null
+++ b/src/osd/modules/render/bgfx/shaders/chains/hq4x/varying.def.sc
@@ -0,0 +1,9 @@
+vec4 v_color0    : COLOR0    = vec4(1.0, 0.0, 0.0, 1.0);
+vec2 v_texcoord0 : TEXCOORD0 = vec2(0.0, 0.0);
+vec4 v_texcoord1 : TEXCOORD1 = vec4(0.0, 0.0, 0.0, 0.0);
+vec4 v_texcoord2 : TEXCOORD2 = vec4(0.0, 0.0, 0.0, 0.0);
+vec4 v_texcoord3 : TEXCOORD3 = vec4(0.0, 0.0, 0.0, 0.0);
+
+vec3 a_position  : POSITION;
+vec4 a_color0    : COLOR0;
+vec2 a_texcoord0 : TEXCOORD0;
diff --git a/src/osd/modules/render/bgfx/shaders/chains/hq4x/vs_blit.sc b/src/osd/modules/render/bgfx/shaders/chains/hq4x/vs_blit.sc
new file mode 100644
index 00000000000..405ef8feb3b
--- /dev/null
+++ b/src/osd/modules/render/bgfx/shaders/chains/hq4x/vs_blit.sc
@@ -0,0 +1,14 @@
+$input a_position, a_texcoord0, a_color0
+$output v_texcoord0, v_color0
+
+// license:BSD-3-Clause
+// copyright-holders:Dario Manesku
+
+#include "common.sh"
+
+void main()
+{
+	gl_Position = mul(u_viewProj, vec4(a_position.xy, 0.0, 1.0));
+	v_texcoord0 = a_texcoord0;
+	v_color0 = a_color0;
+}
diff --git a/src/osd/modules/render/bgfx/shaders/chains/hq4x/vs_hq4x.sc b/src/osd/modules/render/bgfx/shaders/chains/hq4x/vs_hq4x.sc
new file mode 100644
index 00000000000..a77ac7006f7
--- /dev/null
+++ b/src/osd/modules/render/bgfx/shaders/chains/hq4x/vs_hq4x.sc
@@ -0,0 +1,36 @@
+$input a_position, a_texcoord0, a_color0
+$output v_texcoord0, v_texcoord1, v_texcoord2, v_texcoord3, v_color0
+
+// license:LGPL-2.1+
+// copyright-holders:Jules Blok,Cameron Zemek,Maxim Stepin
+
+#include "common.sh"
+
+// Autos
+uniform vec4 u_tex_size0;
+
+void main()
+{
+	gl_Position = mul(u_viewProj, vec4(a_position.xy, 0.0, 1.0));
+	v_color0 = a_color0;
+	
+	vec2 ps = vec2(1.0, 1.0) / u_tex_size0.xy;
+	float dx = ps.x;
+	float dy = ps.y;
+
+	//   +----+----+----+
+	//   |    |    |    |
+	//   | w1 | w2 | w3 |
+	//   +----+----+----+
+	//   |    |    |    |
+	//   | w4 | w5 | w6 |
+	//   +----+----+----+
+	//   |    |    |    |
+	//   | w7 | w8 | w9 |
+	//   +----+----+----+
+
+	v_texcoord0 = a_texcoord0;
+	v_texcoord1 = a_texcoord0.xxxy + vec4(-dx, 0.0, dx, -dy); //  w1 | w2 | w3
+	v_texcoord2 = a_texcoord0.xxxy + vec4(-dx, 0.0, dx, 0.0); //  w4 | w5 | w6
+	v_texcoord3 = a_texcoord0.xxxy + vec4(-dx, 0.0, dx,  dy); //  w7 | w8 | w9
+}

From 31df05bede24ba8b1b35c54eb15a274cd9a1defb Mon Sep 17 00:00:00 2001
From: David Haywood <mamehaze@users.noreply.github.com>
Date: Mon, 18 Apr 2016 18:46:42 +0100
Subject: [PATCH 071/122] new clones (WORKING) Touch & Go (Korea, unprotected)
 [system11]

this is the first working set for this game, all other sets are protected.
looks like the y scroll on the playfield is wrong tho, will look at fixing it.
---
 src/mame/drivers/gaelco2.cpp | 22 ++++++++++++++++++++++
 src/mame/mame.lst            |  1 +
 2 files changed, 23 insertions(+)

diff --git a/src/mame/drivers/gaelco2.cpp b/src/mame/drivers/gaelco2.cpp
index 44739b59053..805047be9e1 100644
--- a/src/mame/drivers/gaelco2.cpp
+++ b/src/mame/drivers/gaelco2.cpp
@@ -905,6 +905,21 @@ ROM_START( touchgoe ) /* REF: 950510-1 */
 	ROM_LOAD( "ic67",  0x0800000, 0x0400000, CRC(c0a2ce5b) SHA1(94b024373c7c546c0f4fe9737639f02e9c7ebbdb) ) /* GFX only */
 ROM_END
 
+ROM_START( touchgok ) /* REF: 950510-1 - ds5002fp unpopulated, game is unprotected */
+	ROM_REGION( 0x100000, "maincpu", 0 )    /* 68000 code */
+	ROM_LOAD16_BYTE( "56.IC56", 0x000000, 0x080000, CRC(cbb87505) SHA1(f19832af60fb6273c3263ebdd93bb7705ab61e20) )
+	ROM_LOAD16_BYTE( "57.IC57", 0x000001, 0x080000, CRC(36bcc7e7) SHA1(2fff881ba0a99ebcfe3c03fdc61f4bf40e152c7f))
+
+	ROM_REGION( 0x1400000, "gfx1", 0 ) /* GFX + Sound */
+	/* 0x0000000-0x0ffffff filled in in the DRIVER_INIT */
+	ROM_LOAD( "ic69",  0x1000000, 0x0200000, CRC(18bb12d4) SHA1(ee6e7a63b86c56d71e62db0ae5892ab3ab94b0a0) ) /* GFX only */
+
+	ROM_REGION( 0x0c00000, "gfx2", 0 ) /* Temporary storage */
+	ROM_LOAD( "ic65",  0x0000000, 0x0400000, CRC(91b89c7c) SHA1(1c24b494b56845b0f21be40ab737f251d7683c7d) ) /* GFX only */
+	ROM_LOAD( "ic66",  0x0400000, 0x0200000, CRC(52682953) SHA1(82cde061bdd827ed4a47a9a4256cd0e887ebc29d) ) /* Sound only */
+	ROM_FILL(          0x0600000, 0x0200000, 0x00 )          /* Empty */
+	ROM_LOAD( "ic67",  0x0800000, 0x0400000, CRC(c0a2ce5b) SHA1(94b024373c7c546c0f4fe9737639f02e9c7ebbdb) ) /* GFX only */
+ROM_END
 
 /*============================================================================
                             SNOW BOARD
@@ -1491,16 +1506,23 @@ DRIVER_INIT_MEMBER(gaelco2_state,maniacsqa)
 
 GAME( 1994, aligator,  0,       alighunt, alighunt, gaelco2_state, alighunt, ROT0, "Gaelco", "Alligator Hunt", MACHINE_UNEMULATED_PROTECTION | MACHINE_NOT_WORKING )
 GAME( 1994, aligatorun,aligator,alighunt, alighunt, gaelco2_state, alighunt, ROT0, "Gaelco", "Alligator Hunt (unprotected)", 0 )
+
 GAME( 1995, touchgo,  0,        touchgo,  touchgo,  gaelco2_state, touchgo,  ROT0, "Gaelco", "Touch & Go (World)", MACHINE_UNEMULATED_PROTECTION | MACHINE_NOT_WORKING )
 GAME( 1995, touchgon, touchgo,  touchgo,  touchgo,  gaelco2_state, touchgo,  ROT0, "Gaelco", "Touch & Go (Non North America)", MACHINE_UNEMULATED_PROTECTION | MACHINE_NOT_WORKING )
 GAME( 1995, touchgoe, touchgo,  touchgo,  touchgo,  gaelco2_state, touchgo,  ROT0, "Gaelco", "Touch & Go (earlier revision)", MACHINE_UNEMULATED_PROTECTION | MACHINE_NOT_WORKING )
+GAME( 1995, touchgok, touchgo,  touchgo,  touchgo,  gaelco2_state, touchgo,  ROT0, "Gaelco", "Touch & Go (Korea, unprotected)", MACHINE_IMPERFECT_GRAPHICS )
+
 GAME( 1995, wrally2,  0,        wrally2,  wrally2,  driver_device, 0,        ROT0, "Gaelco", "World Rally 2: Twin Racing", MACHINE_UNEMULATED_PROTECTION | MACHINE_NOT_WORKING )
+
 GAME( 1996, maniacsq, 0,        maniacsq, maniacsq, driver_device, 0,        ROT0, "Gaelco", "Maniac Square (unprotected)", 0 )
 GAME( 1996, maniacsqa,maniacsq, maniacsq, maniacsq, gaelco2_state, maniacsqa,ROT0, "Gaelco", "Maniac Square (protected)", MACHINE_UNEMULATED_PROTECTION | MACHINE_NOT_WORKING )
+
 GAME( 1996, snowboar, 0,        snowboar, snowboar, driver_device, 0,        ROT0, "Gaelco", "Snow Board Championship (Version 2.1)", 0 )
 GAME( 1996, snowboara,snowboar, snowboar, snowboar, gaelco2_state, snowboar, ROT0, "Gaelco", "Snow Board Championship (Version 2.0)", 0 )
+
 GAME( 1998, bang,     0,        bang,     bang,     bang_state,    bang,     ROT0, "Gaelco", "Bang!", 0 )
 GAME( 1998, bangj,    bang,     bang,     bang,     bang_state,    bang,     ROT0, "Gaelco", "Gun Gabacho (Japan)", 0 )
+
 // are these ACTUALLY Gaelco hardware, or do they just use the same Dallas?
 GAME( 1999, grtesoro,  0,       maniacsq, maniacsq, driver_device, 0,        ROT0, "Nova Desitec", "Gran Tesoro? / Play 2000 (v5.01) (Italy)", MACHINE_UNEMULATED_PROTECTION | MACHINE_NOT_WORKING )
 GAME( 1999, grtesoro4, grtesoro,maniacsq, maniacsq, driver_device, 0,        ROT0, "Nova Desitec", "Gran Tesoro? / Play 2000 (v4.0) (Italy)", MACHINE_UNEMULATED_PROTECTION | MACHINE_NOT_WORKING )
diff --git a/src/mame/mame.lst b/src/mame/mame.lst
index eba94a5a40c..2d83555dd49 100644
--- a/src/mame/mame.lst
+++ b/src/mame/mame.lst
@@ -12137,6 +12137,7 @@ snowboara                       // (c) 1996 - Ref 960419/1
 touchgo                         // (c) 1995 - Ref 950906
 touchgoe                        // (c) 1995 - Ref 950510-1
 touchgon                        // (c) 1995 - Ref 950906
+touchgok						// (c) 1995 - Ref 950510-1
 wrally2                         // (c) 1995 - Ref 950510
 
 @source:gaelco3d.cpp

From 386d141389a24dbee364bf17a381728d4e7dc826 Mon Sep 17 00:00:00 2001
From: David Haywood <mamehaze@users.noreply.github.com>
Date: Mon, 18 Apr 2016 19:32:05 +0100
Subject: [PATCH 072/122] new clones 1945k III (older, OPCX1 PCB) [system11]

interesting version, dated a year earlier, different PCB (not using flash roms) and only 8 planes to choose from, not 10 etc.
---
 src/mame/drivers/1945kiii.cpp | 36 +++++++++++++++++++++++++++++++++--
 src/mame/mame.lst             |  1 +
 2 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/src/mame/drivers/1945kiii.cpp b/src/mame/drivers/1945kiii.cpp
index 7893c97536e..0cb34d1864d 100644
--- a/src/mame/drivers/1945kiii.cpp
+++ b/src/mame/drivers/1945kiii.cpp
@@ -424,6 +424,36 @@ ROM_START( 1945kiii )
 	ROM_LOAD( "m16m-3.u61", 0x00000, 0x200000, CRC(32fc80dd) SHA1(bee32493a250e9f21997114bba26b9535b1b636c) )
 ROM_END
 
+ROM_START( 1945kiiio )
+	ROM_REGION( 0x100000, "maincpu", 0 ) /* 68000 Code */
+	ROM_LOAD16_BYTE( "3.U34", 0x00001, 0x80000, CRC(5515baa0) SHA1(6fd4c9b7cc27035d6baaafa73f5f5930bfde62a4) )
+	ROM_LOAD16_BYTE( "4.U35", 0x00000, 0x80000, CRC(fd177664) SHA1(0ea1854be8d88577129546a56d13bcdc4739ae52) )
+
+	ROM_REGION( 0x080000, "oki2", 0 ) /* Samples */
+	ROM_LOAD( "S21.SU5", 0x00000, 0x80000, CRC(9d96fd55) SHA1(80025cc2c44e8cd938620818e0b0974026377f5c) )
+
+	ROM_REGION( 0x080000, "oki1", 0 ) /* Samples */
+	ROM_LOAD( "S13.SU4", 0x00000, 0x80000, CRC(d45aec3b) SHA1(fc182a10e19687eb2f2f4a1d2ad976814185f0fc))
+
+	ROM_REGION( 0x400000, "gfx1", 0 )
+	ROM_LOAD32_BYTE( "9.U5",   0x000000, 0x080000, CRC(be0f432e) SHA1(7d63f97a8cb38c5351f2cd2f720de16a0c4ab1d7) )
+	ROM_LOAD32_BYTE( "10.U6",  0x000001, 0x080000, CRC(cf9127b2) SHA1(e02f436662f47d8bb5a9d726889c6e86cf64bdcf) )
+	ROM_LOAD32_BYTE( "11.U7",  0x000002, 0x080000, CRC(644ee8cc) SHA1(1742e31ba48a93c005cce0dc575d9b5d739d1dce) )
+	ROM_LOAD32_BYTE( "12.U8",  0x000003, 0x080000, CRC(0900c208) SHA1(9446382d274dc7b6ccdf18738aa4db636fd9e3c9) )
+
+	ROM_LOAD32_BYTE( "13.U58", 0x200000, 0x080000, CRC(8ea9c6be) SHA1(baf3af389417e1f14d0c38d8c872839a54008909) )
+	ROM_LOAD32_BYTE( "14.U59", 0x200001, 0x080000, CRC(10c18fb4) SHA1(68934e73cfb6a49a4c1639dcb4c49246f16179b2) )
+	ROM_LOAD32_BYTE( "15.U60", 0x200002, 0x080000, CRC(86ab6c7c) SHA1(59acaee6ba78a22f1423832a116ad41e19522aa1) )
+	ROM_LOAD32_BYTE( "16.U61", 0x200003, 0x080000, CRC(ff419080) SHA1(542819bdd60976bddfa96570321ba3f7fb6fbf23) )
+
+	ROM_REGION( 0x200000, "gfx2", 0 )
+	ROM_LOAD32_BYTE( "5.U102", 0x000000, 0x80000, CRC(91b70a6b) SHA1(e53f62212d6e3ab5f892944b1933385a85e0ba8a) )
+	ROM_LOAD32_BYTE( "6.U103", 0x000001, 0x80000, CRC(7b5bfb85) SHA1(ef59d64513c7f7e6ee3dcc9bb7bb0e14a71ca957) )
+	ROM_LOAD32_BYTE( "7.U104", 0x000002, 0x80000, CRC(cdafcedf) SHA1(82becd002a16185220131085db6576eb763429c8) )
+	ROM_LOAD32_BYTE( "8.U105", 0x000003, 0x80000, CRC(2c3895d5) SHA1(ab5837d996c1bb70071db02f07412c182d7547f8) )
+ROM_END
+
+
 ROM_START( flagrall )
 	ROM_REGION( 0x100000, "maincpu", 0 ) /* 68000 Code */
 	ROM_LOAD16_BYTE( "11_u34.bin", 0x00001, 0x40000, CRC(24dd439d) SHA1(88857ad5ed69f29de86702dcc746d35b69b3b93d) )
@@ -451,5 +481,7 @@ ROM_START( flagrall )
 ROM_END
 
 
-GAME( 2000, 1945kiii, 0,        k3,       k3,       driver_device, 0, ROT270, "Oriental Soft", "1945k III", MACHINE_SUPPORTS_SAVE )
-GAME( 1996?,flagrall, 0,        flagrall, flagrall, driver_device, 0, ROT0,   "<unknown>",     "'96 Flag Rally", MACHINE_SUPPORTS_SAVE )
+GAME( 2000, 1945kiii, 0,        k3,       k3,       driver_device, 0, ROT270, "Oriental Soft", "1945k III (newer, OPCX2 PCB)", MACHINE_SUPPORTS_SAVE )
+GAME( 1999, 1945kiiio,1945kiii, k3,       k3,       driver_device, 0, ROT270, "Oriental Soft", "1945k III (older, OPCX1 PCB)", MACHINE_SUPPORTS_SAVE )
+
+GAME( 1996, flagrall, 0,        flagrall, flagrall, driver_device, 0, ROT0,   "Promat?",     "'96 Flag Rally", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/mame.lst b/src/mame/mame.lst
index 2d83555dd49..2902f5aeb9f 100644
--- a/src/mame/mame.lst
+++ b/src/mame/mame.lst
@@ -31,6 +31,7 @@
 
 @source:1945kiii.cpp
 1945kiii                        // (c) 2000 Oriental
+1945kiiio						// (c) 1999 Oriental
 flagrall                        // ?
 
 @source:20pacgal.cpp

From aef55ded1f4cfba8a51ff9f600463e73763f77c4 Mon Sep 17 00:00:00 2001
From: couriersud <couriersud@arcor.de>
Date: Mon, 18 Apr 2016 20:37:14 +0200
Subject: [PATCH 073/122] soft is hard and hard is soft. Two is one and one is
 two. No wonder "-video accel" has substandard performance if opengl is
 disabled. [Couriersud]

---
 src/osd/modules/render/draw13.cpp  | 44 +++++++++++++++---------------
 src/osd/modules/render/draw13.h    | 18 ++++++------
 src/osd/modules/render/drawsdl.cpp | 22 +++++++--------
 src/osd/modules/render/drawsdl.h   | 14 +++++-----
 src/osd/sdl/window.cpp             |  3 +-
 5 files changed, 50 insertions(+), 51 deletions(-)

diff --git a/src/osd/modules/render/draw13.cpp b/src/osd/modules/render/draw13.cpp
index 20daa28d8d4..39a607b024f 100644
--- a/src/osd/modules/render/draw13.cpp
+++ b/src/osd/modules/render/draw13.cpp
@@ -60,8 +60,8 @@ static inline bool is_transparent(const float &a)
 //  CONSTRUCTOR & DESTRUCTOR
 //============================================================
 
-renderer_sdl1::renderer_sdl1(osd_window *window, int extra_flags)
-	: osd_renderer(window, extra_flags)
+renderer_sdl2::renderer_sdl2(osd_window *window, int extra_flags)
+	: osd_renderer(window,  FLAG_NEEDS_OPENGL | extra_flags)
 	, m_sdl_renderer(nullptr)
 	, m_blittimer(0)
 	, m_last_hofs(0)
@@ -101,7 +101,7 @@ renderer_sdl1::renderer_sdl1(osd_window *window, int extra_flags)
 #define ENTRY_BM(a,b,f,bm) { SDL_TEXFORMAT_ ## a, SDL_PIXELFORMAT_ ## b, &texcopy_ ## f, bm, #a, #b, 0, 0, 0, 0}
 #define ENTRY_LR(a,b,f) { SDL_TEXFORMAT_ ## a, SDL_PIXELFORMAT_ ## b, &texcopy_ ## f, BM_ALL, #a, #b, 0, 0, 0, -1}
 
-const copy_info_t renderer_sdl1::s_blit_info_default[] =
+const copy_info_t renderer_sdl2::s_blit_info_default[] =
 {
 	/* no rotation */
 	ENTRY(ARGB32,           ARGB8888,   argb32_argb32),
@@ -180,8 +180,8 @@ const copy_info_t renderer_sdl1::s_blit_info_default[] =
 { -1 },
 };
 
-copy_info_t* renderer_sdl1::s_blit_info[SDL_TEXFORMAT_LAST+1] = { nullptr };
-bool renderer_sdl1::s_blit_info_initialized = false;
+copy_info_t* renderer_sdl2::s_blit_info[SDL_TEXFORMAT_LAST+1] = { nullptr };
+bool renderer_sdl2::s_blit_info_initialized = false;
 
 //============================================================
 //  INLINES
@@ -266,7 +266,7 @@ void texture_info::render_quad(const render_primitive &prim, const int x, const
 	//SDL_RenderCopyEx(m_renderer->m_sdl_renderer,  m_texture_id, nullptr, nullptr, 0, nullptr, SDL_FLIP_NONE);
 }
 
-void renderer_sdl1::render_quad(texture_info *texture, const render_primitive &prim, const int x, const int y)
+void renderer_sdl2::render_quad(texture_info *texture, const render_primitive &prim, const int x, const int y)
 {
 	SDL_Rect target_rect;
 
@@ -303,7 +303,7 @@ void renderer_sdl1::render_quad(texture_info *texture, const render_primitive &p
 	}
 }
 
-int renderer_sdl1::RendererSupportsFormat(Uint32 format, Uint32 access, const char *sformat)
+int renderer_sdl2::RendererSupportsFormat(Uint32 format, Uint32 access, const char *sformat)
 {
 	int i;
 	for (i = 0; fmt_support[i].format != 0; i++)
@@ -333,7 +333,7 @@ int renderer_sdl1::RendererSupportsFormat(Uint32 format, Uint32 access, const ch
 //  drawsdl_init
 //============================================================
 
-void renderer_sdl1::add_list(copy_info_t **head, const copy_info_t *element, Uint32 bm)
+void renderer_sdl2::add_list(copy_info_t **head, const copy_info_t *element, Uint32 bm)
 {
 	copy_info_t *newci = global_alloc(copy_info_t);
 	*newci = *element;
@@ -343,7 +343,7 @@ void renderer_sdl1::add_list(copy_info_t **head, const copy_info_t *element, Uin
 	*head = newci;
 }
 
-void renderer_sdl1::expand_copy_info(const copy_info_t *list)
+void renderer_sdl2::expand_copy_info(const copy_info_t *list)
 {
 	for (const copy_info_t *bi = list; bi->src_fmt != -1; bi++)
 	{
@@ -362,7 +362,7 @@ void renderer_sdl1::expand_copy_info(const copy_info_t *list)
 }
 
 // FIXME: machine only used to access options.
-bool renderer_sdl1::init(running_machine &machine)
+bool renderer_sdl2::init(running_machine &machine)
 {
 	osd_printf_verbose("Using SDL native texturing driver (SDL 2.0+)\n");
 
@@ -419,7 +419,7 @@ static void drawsdl_show_info(struct SDL_RendererInfo *render_info)
 }
 
 
-int renderer_sdl1::create()
+int renderer_sdl2::create()
 {
 	// create renderer
 
@@ -451,7 +451,7 @@ int renderer_sdl1::create()
 	m_blittimer = 3;
 
 	//SDL_RenderPresent(m_sdl_renderer);
-	osd_printf_verbose("Leave renderer_sdl1::create\n");
+	osd_printf_verbose("Leave renderer_sdl2::create\n");
 
 	struct SDL_RendererInfo render_info;
 
@@ -466,7 +466,7 @@ int renderer_sdl1::create()
 //  drawsdl_xy_to_render_target
 //============================================================
 
-int renderer_sdl1::xy_to_render_target(int x, int y, int *xt, int *yt)
+int renderer_sdl2::xy_to_render_target(int x, int y, int *xt, int *yt)
 {
 	*xt = x - m_last_hofs;
 	*yt = y - m_last_vofs;
@@ -481,7 +481,7 @@ int renderer_sdl1::xy_to_render_target(int x, int y, int *xt, int *yt)
 //  drawsdl_destroy_all_textures
 //============================================================
 
-void renderer_sdl1::destroy_all_textures()
+void renderer_sdl2::destroy_all_textures()
 {
 	if(window().m_primlist)
 	{
@@ -497,7 +497,7 @@ void renderer_sdl1::destroy_all_textures()
 //  sdl_info::draw
 //============================================================
 
-int renderer_sdl1::draw(int update)
+int renderer_sdl2::draw(int update)
 {
 	texture_info *texture=nullptr;
 	float vofs, hofs;
@@ -612,7 +612,7 @@ copy_info_t *texture_info::compute_size_type()
 	copy_info_t *result = nullptr;
 	int maxperf = 0;
 
-	for (copy_info_t *bi = renderer_sdl1::s_blit_info[m_format]; bi != nullptr; bi = bi->next)
+	for (copy_info_t *bi = renderer_sdl2::s_blit_info[m_format]; bi != nullptr; bi = bi->next)
 	{
 		if ((m_is_rotated == bi->blitter->m_is_rot)
 				&& (m_sdl_blendmode == bi->bm_mask))
@@ -635,7 +635,7 @@ copy_info_t *texture_info::compute_size_type()
 		return result;
 
 	/* try last resort handlers */
-	for (copy_info_t *bi = renderer_sdl1::s_blit_info[m_format]; bi != nullptr; bi = bi->next)
+	for (copy_info_t *bi = renderer_sdl2::s_blit_info[m_format]; bi != nullptr; bi = bi->next)
 	{
 		if ((m_is_rotated == bi->blitter->m_is_rot)
 			&& (m_sdl_blendmode == bi->bm_mask))
@@ -676,7 +676,7 @@ bool texture_info::matches(const render_primitive &prim, const quad_setup_data &
 //  texture_create
 //============================================================
 
-texture_info::texture_info(renderer_sdl1 *renderer, const render_texinfo &texsource, const quad_setup_data &setup, UINT32 flags)
+texture_info::texture_info(renderer_sdl2 *renderer, const render_texinfo &texsource, const quad_setup_data &setup, UINT32 flags)
 {
 	// fill in the core data
 	m_renderer = renderer;
@@ -864,7 +864,7 @@ void quad_setup_data::compute(const render_primitive &prim, const int prescale)
 //  texture_find
 //============================================================
 
-texture_info *renderer_sdl1::texture_find(const render_primitive &prim, const quad_setup_data &setup)
+texture_info *renderer_sdl2::texture_find(const render_primitive &prim, const quad_setup_data &setup)
 {
 	HashT texhash = texture_compute_hash(prim.texture, prim.flags);
 	texture_info *texture;
@@ -901,7 +901,7 @@ texture_info *renderer_sdl1::texture_find(const render_primitive &prim, const qu
 //  exit
 //============================================================
 
-void renderer_sdl1::exit()
+void renderer_sdl2::exit()
 {
 	if (s_blit_info_initialized)
 	{
@@ -927,7 +927,7 @@ void renderer_sdl1::exit()
 //  texture_update
 //============================================================
 
-texture_info * renderer_sdl1::texture_update(const render_primitive &prim)
+texture_info * renderer_sdl2::texture_update(const render_primitive &prim)
 {
 	quad_setup_data setup;
 	texture_info *texture;
@@ -957,7 +957,7 @@ texture_info * renderer_sdl1::texture_update(const render_primitive &prim)
 	return texture;
 }
 
-render_primitive_list *renderer_sdl1::get_primitives()
+render_primitive_list *renderer_sdl2::get_primitives()
 {
 	osd_dim nd = window().get_size();
 	if (nd != m_blit_dim)
diff --git a/src/osd/modules/render/draw13.h b/src/osd/modules/render/draw13.h
index 3bd8acf608b..82653d998a1 100644
--- a/src/osd/modules/render/draw13.h
+++ b/src/osd/modules/render/draw13.h
@@ -10,8 +10,8 @@
 
 #pragma once
 
-#ifndef __DRAW13__
-#define __DRAW13__
+#ifndef __DRAW20__
+#define __DRAW20__
 
 // OSD headers
 #ifndef OSD_WINDOWS
@@ -50,7 +50,7 @@ struct quad_setup_data
 //  Textures
 //============================================================
 
-class renderer_sdl1;
+class renderer_sdl2;
 struct copy_info_t;
 
 /* texture_info holds information about a texture */
@@ -58,7 +58,7 @@ class texture_info
 {
 	friend class simple_list<texture_info>;
 public:
-	texture_info(renderer_sdl1 *renderer, const render_texinfo &texsource, const quad_setup_data &setup, const UINT32 flags);
+	texture_info(renderer_sdl2 *renderer, const render_texinfo &texsource, const quad_setup_data &setup, const UINT32 flags);
 	~texture_info();
 
 	void set_data(const render_texinfo &texsource, const UINT32 flags);
@@ -91,7 +91,7 @@ private:
 	void set_coloralphamode(SDL_Texture *texture_id, const render_color *color);
 
 	Uint32              m_sdl_access;
-	renderer_sdl1 *     m_renderer;
+	renderer_sdl2 *     m_renderer;
 	render_texinfo      m_texinfo;            // copy of the texture info
 	HashT               m_hash;               // hash value for the texture (must be >= pointer size)
 	UINT32              m_flags;              // rendering flags
@@ -146,12 +146,12 @@ struct copy_info_t
 };
 
 /* sdl_info is the information about SDL for the current screen */
-class renderer_sdl1 : public osd_renderer
+class renderer_sdl2 : public osd_renderer
 {
 public:
-	renderer_sdl1(osd_window *window, int extra_flags);
+	renderer_sdl2(osd_window *window, int extra_flags);
 
-	virtual ~renderer_sdl1()
+	virtual ~renderer_sdl2()
 	{
 		destroy_all_textures();
 		SDL_DestroyRenderer(m_sdl_renderer);
@@ -210,4 +210,4 @@ private:
 	static const copy_info_t s_blit_info_default[];
 };
 
-#endif // __DRAW13__
+#endif // __DRAW20__
diff --git a/src/osd/modules/render/drawsdl.cpp b/src/osd/modules/render/drawsdl.cpp
index a2ba368c060..83e304c48f3 100644
--- a/src/osd/modules/render/drawsdl.cpp
+++ b/src/osd/modules/render/drawsdl.cpp
@@ -90,7 +90,7 @@ int drawsdl_scale_mode(const char *s)
 //  drawsdl_init
 //============================================================
 
-bool renderer_sdl2::init(running_machine &machine)
+bool renderer_sdl1::init(running_machine &machine)
 {
 	osd_printf_verbose("Using SDL multi-window soft driver (SDL 2.0+)\n");
 	return false;
@@ -100,7 +100,7 @@ bool renderer_sdl2::init(running_machine &machine)
 //  setup_texture for window
 //============================================================
 
-void renderer_sdl2::setup_texture(const osd_dim &size)
+void renderer_sdl1::setup_texture(const osd_dim &size)
 {
 	const sdl_scale_mode *sdl_sm = &scale_modes[video_config.scale_mode];
 	SDL_DisplayMode mode;
@@ -151,7 +151,7 @@ void renderer_sdl2::setup_texture(const osd_dim &size)
 //  drawsdl_show_info
 //============================================================
 
-void renderer_sdl2::show_info(struct SDL_RendererInfo *render_info)
+void renderer_sdl1::show_info(struct SDL_RendererInfo *render_info)
 {
 #define RF_ENTRY(x) {x, #x }
 	static struct
@@ -182,7 +182,7 @@ void renderer_sdl2::show_info(struct SDL_RendererInfo *render_info)
 //  renderer_sdl2::create
 //============================================================
 
-int renderer_sdl2::create()
+int renderer_sdl1::create()
 {
 	const sdl_scale_mode *sm = &scale_modes[video_config.scale_mode];
 
@@ -250,7 +250,7 @@ int renderer_sdl2::create()
 //  DESTRUCTOR
 //============================================================
 
-renderer_sdl2::~renderer_sdl2()
+renderer_sdl1::~renderer_sdl1()
 {
 	destroy_all_textures();
 
@@ -271,7 +271,7 @@ renderer_sdl2::~renderer_sdl2()
 //  drawsdl_xy_to_render_target
 //============================================================
 
-int renderer_sdl2::xy_to_render_target(int x, int y, int *xt, int *yt)
+int renderer_sdl1::xy_to_render_target(int x, int y, int *xt, int *yt)
 {
 	*xt = x - m_last_hofs;
 	*yt = y - m_last_vofs;
@@ -286,7 +286,7 @@ int renderer_sdl2::xy_to_render_target(int x, int y, int *xt, int *yt)
 //  drawsdl_destroy_all_textures
 //============================================================
 
-void renderer_sdl2::destroy_all_textures()
+void renderer_sdl1::destroy_all_textures()
 {
 	SDL_DestroyTexture(m_texture_id);
 	m_texture_id = nullptr;
@@ -297,7 +297,7 @@ void renderer_sdl2::destroy_all_textures()
 //  renderer_sdl2::draw
 //============================================================
 
-int renderer_sdl2::draw(int update)
+int renderer_sdl1::draw(int update)
 {
 	const sdl_scale_mode *sm = &scale_modes[video_config.scale_mode];
 	UINT8 *surfptr;
@@ -502,7 +502,7 @@ int renderer_sdl2::draw(int update)
 #define YMASK  (Y1MASK|Y2MASK)
 #define UVMASK (UMASK|VMASK)
 
-void renderer_sdl2::yuv_lookup_set(unsigned int pen, unsigned char red,
+void renderer_sdl1::yuv_lookup_set(unsigned int pen, unsigned char red,
 			unsigned char green, unsigned char blue)
 {
 	UINT32 y,u,v;
@@ -514,7 +514,7 @@ void renderer_sdl2::yuv_lookup_set(unsigned int pen, unsigned char red,
 	m_yuv_lookup[pen]=(y<<Y1SHIFT)|(u<<USHIFT)|(y<<Y2SHIFT)|(v<<VSHIFT);
 }
 
-void renderer_sdl2::yuv_init()
+void renderer_sdl1::yuv_init()
 {
 	unsigned char r,g,b;
 	if (m_yuv_lookup == nullptr)
@@ -670,7 +670,7 @@ static void yuv_RGB_to_YUY2X2(const UINT16 *bitmap, UINT8 *ptr, const int pitch,
 	}
 }
 
-render_primitive_list *renderer_sdl2::get_primitives()
+render_primitive_list *renderer_sdl1::get_primitives()
 {
 	osd_dim nd = window().get_size();
 	if (nd != m_blit_dim)
diff --git a/src/osd/modules/render/drawsdl.h b/src/osd/modules/render/drawsdl.h
index 5fac2653fcc..09cfc32944d 100644
--- a/src/osd/modules/render/drawsdl.h
+++ b/src/osd/modules/render/drawsdl.h
@@ -12,16 +12,16 @@
 
 #pragma once
 
-#ifndef __DRAWSDL2__
-#define __DRAWSDL2__
+#ifndef __DRAWSDL1__
+#define __DRAWSDL1__
 
 /* renderer_sdl2 is the information about SDL for the current screen */
-class renderer_sdl2 : public osd_renderer
+class renderer_sdl1 : public osd_renderer
 {
 public:
 
-	renderer_sdl2(osd_window *w, int extra_flags)
-		: osd_renderer(w, extra_flags)
+	renderer_sdl1(osd_window *w, int extra_flags)
+		: osd_renderer(w,  FLAG_NEEDS_OPENGL | extra_flags)
 		, m_sdl_renderer(nullptr)
 		, m_texture_id(nullptr)
 		, m_yuv_lookup(nullptr)
@@ -34,7 +34,7 @@ public:
 		, m_last_dim(0, 0)
 	{
 	}
-	virtual ~renderer_sdl2();
+	virtual ~renderer_sdl1();
 
 	static bool init(running_machine &machine);
 	static void exit() { }
@@ -83,4 +83,4 @@ struct sdl_scale_mode
 	void            (*yuv_blit)(const UINT16 *bitmap, UINT8 *ptr, const int pitch, const UINT32 *lookup, const int width, const int height);
 };
 
-#endif // __DRAWSDL2__
+#endif // __DRAWSDL1__
diff --git a/src/osd/sdl/window.cpp b/src/osd/sdl/window.cpp
index 9204891e010..a23ab3a7aae 100644
--- a/src/osd/sdl/window.cpp
+++ b/src/osd/sdl/window.cpp
@@ -354,7 +354,7 @@ void sdl_osd_interface::window_exit()
 	switch(video_config.mode)
 	{
 		case VIDEO_MODE_SDL2ACCEL:
-			renderer_sdl2::exit();
+			renderer_sdl1::exit();
 			break;
 		case VIDEO_MODE_SOFT:
 			renderer_sdl1::exit();
@@ -914,7 +914,6 @@ OSDWORK_CALLBACK( sdl_window_info::complete_create_wt )
 	 *
 	 */
 	osd_printf_verbose("Enter sdl_info::create\n");
-
 	if (window->renderer().has_flags(osd_renderer::FLAG_NEEDS_OPENGL))
 	{
 		SDL_GL_SetAttribute( SDL_GL_DOUBLEBUFFER, 1 );

From 118658da9da7823ab4b13a77bf5f9aa0ea1387d2 Mon Sep 17 00:00:00 2001
From: couriersud <couriersud@arcor.de>
Date: Mon, 18 Apr 2016 21:28:07 +0200
Subject: [PATCH 074/122] These init calls all returned false. No need for a
 return value in this case. [Couriersud]

---
 src/osd/modules/render/draw13.cpp  |  4 +--
 src/osd/modules/render/draw13.h    |  2 +-
 src/osd/modules/render/drawbgfx.h  |  2 +-
 src/osd/modules/render/drawogl.cpp |  4 +--
 src/osd/modules/render/drawogl.h   |  2 +-
 src/osd/modules/render/drawsdl.cpp |  3 +--
 src/osd/modules/render/drawsdl.h   |  2 +-
 src/osd/sdl/window.cpp             | 42 ++++++++++--------------------
 8 files changed, 21 insertions(+), 40 deletions(-)

diff --git a/src/osd/modules/render/draw13.cpp b/src/osd/modules/render/draw13.cpp
index 39a607b024f..b4326ff2bdf 100644
--- a/src/osd/modules/render/draw13.cpp
+++ b/src/osd/modules/render/draw13.cpp
@@ -362,7 +362,7 @@ void renderer_sdl2::expand_copy_info(const copy_info_t *list)
 }
 
 // FIXME: machine only used to access options.
-bool renderer_sdl2::init(running_machine &machine)
+void renderer_sdl2::init(running_machine &machine)
 {
 	osd_printf_verbose("Using SDL native texturing driver (SDL 2.0+)\n");
 
@@ -380,8 +380,6 @@ bool renderer_sdl2::init(running_machine &machine)
 		osd_printf_warning("Warning: Unable to load opengl library: %s\n", stemp ? stemp : "<default>");
 	else
 		osd_printf_verbose("Loaded opengl shared library: %s\n", stemp ? stemp : "<default>");
-
-	return false;
 }
 
 
diff --git a/src/osd/modules/render/draw13.h b/src/osd/modules/render/draw13.h
index 82653d998a1..634c1debf6f 100644
--- a/src/osd/modules/render/draw13.h
+++ b/src/osd/modules/render/draw13.h
@@ -158,7 +158,7 @@ public:
 		m_sdl_renderer = nullptr;
 	}
 
-	static bool init(running_machine &machine);
+	static void init(running_machine &machine);
 	static void exit();
 
 	virtual int create() override;
diff --git a/src/osd/modules/render/drawbgfx.h b/src/osd/modules/render/drawbgfx.h
index f7da00fe787..a6f66a6eff3 100644
--- a/src/osd/modules/render/drawbgfx.h
+++ b/src/osd/modules/render/drawbgfx.h
@@ -33,7 +33,7 @@ public:
 	renderer_bgfx(osd_window *w);
 	virtual ~renderer_bgfx();
 
-	static bool init(running_machine &machine) { return false; }
+	static void init(running_machine &machine) { }
 	static void exit();
 
 	virtual int create() override;
diff --git a/src/osd/modules/render/drawogl.cpp b/src/osd/modules/render/drawogl.cpp
index 6853602353b..a7ffe24a5df 100644
--- a/src/osd/modules/render/drawogl.cpp
+++ b/src/osd/modules/render/drawogl.cpp
@@ -277,7 +277,7 @@ static void texture_set_data(ogl_texture_info *texture, const render_texinfo *te
 bool renderer_ogl::s_shown_video_info = false;
 bool renderer_ogl::s_dll_loaded = false;
 
-bool renderer_ogl::init(running_machine &machine)
+void renderer_ogl::init(running_machine &machine)
 {
 	s_dll_loaded = false;
 
@@ -287,8 +287,6 @@ bool renderer_ogl::init(running_machine &machine)
 #else
 	osd_printf_verbose("Using SDL multi-window OpenGL driver (SDL 2.0+)\n");
 #endif
-
-	return false;
 }
 
 //============================================================
diff --git a/src/osd/modules/render/drawogl.h b/src/osd/modules/render/drawogl.h
index 69cd576c32d..7b89040e925 100644
--- a/src/osd/modules/render/drawogl.h
+++ b/src/osd/modules/render/drawogl.h
@@ -130,7 +130,7 @@ public:
 	}
 	virtual ~renderer_ogl();
 
-	static bool init(running_machine &machine);
+	static void init(running_machine &machine);
 	static void exit();
 
 	virtual int create() override;
diff --git a/src/osd/modules/render/drawsdl.cpp b/src/osd/modules/render/drawsdl.cpp
index 83e304c48f3..af597516633 100644
--- a/src/osd/modules/render/drawsdl.cpp
+++ b/src/osd/modules/render/drawsdl.cpp
@@ -90,10 +90,9 @@ int drawsdl_scale_mode(const char *s)
 //  drawsdl_init
 //============================================================
 
-bool renderer_sdl1::init(running_machine &machine)
+void renderer_sdl1::init(running_machine &machine)
 {
 	osd_printf_verbose("Using SDL multi-window soft driver (SDL 2.0+)\n");
-	return false;
 }
 
 //============================================================
diff --git a/src/osd/modules/render/drawsdl.h b/src/osd/modules/render/drawsdl.h
index 09cfc32944d..2958dbf265a 100644
--- a/src/osd/modules/render/drawsdl.h
+++ b/src/osd/modules/render/drawsdl.h
@@ -36,7 +36,7 @@ public:
 	}
 	virtual ~renderer_sdl1();
 
-	static bool init(running_machine &machine);
+	static void init(running_machine &machine);
 	static void exit() { }
 
 	virtual int create() override;
diff --git a/src/osd/sdl/window.cpp b/src/osd/sdl/window.cpp
index a23ab3a7aae..f3e5b8e8b4c 100644
--- a/src/osd/sdl/window.cpp
+++ b/src/osd/sdl/window.cpp
@@ -211,37 +211,23 @@ bool sdl_osd_interface::window_init()
 	sdlwindow_thread_id(nullptr, 0);
 
 	// initialize the drawers
-	if (video_config.mode == VIDEO_MODE_BGFX)
+
+	switch (video_config.mode)
 	{
-		if (renderer_bgfx::init(machine()))
-		{
+		case VIDEO_MODE_BGFX:
+			renderer_bgfx::init(machine());
+			break;
 #if (USE_OPENGL)
-			video_config.mode = VIDEO_MODE_OPENGL;
-		}
-	}
-	if (video_config.mode == VIDEO_MODE_OPENGL)
-	{
-		if (renderer_ogl::init(machine()))
-		{
-			video_config.mode = VIDEO_MODE_SOFT;
-#else
-			video_config.mode = VIDEO_MODE_SOFT;
+		case VIDEO_MODE_OPENGL:
+			renderer_ogl::init(machine());
+			break;
 #endif
-		}
-	}
-	if (video_config.mode == VIDEO_MODE_SDL2ACCEL)
-	{
-		if (renderer_sdl2::init(machine()))
-		{
-			video_config.mode = VIDEO_MODE_SOFT;
-	}
-	}
-	if (video_config.mode == VIDEO_MODE_SOFT)
-	{
-		if (renderer_sdl1::init(machine()))
-		{
-			return false;
-	}
+		case VIDEO_MODE_SDL2ACCEL:
+			renderer_sdl2::init(machine());
+			break;
+		case VIDEO_MODE_SOFT:
+			renderer_sdl1::init(machine());
+			break;
 	}
 
 	/* We may want to set a number of the hints SDL2 provides.

From 3aa4c0d949f4875cc57bba07460bdd355472ac01 Mon Sep 17 00:00:00 2001
From: David Haywood <mamehaze@users.noreply.github.com>
Date: Mon, 18 Apr 2016 20:47:37 +0100
Subject: [PATCH 075/122] new clones Bestri (Korea, set 2) [system11]

slightly different scroll register scrambling compared to the other set, RAM at different location, most roms (including GFX) are different too.
---
 src/mame/drivers/crospang.cpp | 100 +++++++++++++++++++++++++++-------
 src/mame/mame.lst             |   1 +
 src/mame/video/crospang.cpp   |  19 +++++--
 3 files changed, 93 insertions(+), 27 deletions(-)

diff --git a/src/mame/drivers/crospang.cpp b/src/mame/drivers/crospang.cpp
index 19a999466f7..fcac0964fda 100644
--- a/src/mame/drivers/crospang.cpp
+++ b/src/mame/drivers/crospang.cpp
@@ -50,27 +50,36 @@ WRITE16_MEMBER(crospang_state::crospang_soundlatch_w)
 
 /* main cpu */
 
-static ADDRESS_MAP_START( crospang_map, AS_PROGRAM, 16, crospang_state )
+static ADDRESS_MAP_START( crospang_base_map, AS_PROGRAM, 16, crospang_state )
 	AM_RANGE(0x000000, 0x0fffff) AM_ROM AM_WRITENOP // writes to rom quite often
+
+	AM_RANGE(0x120000, 0x1207ff) AM_RAM_WRITE(crospang_fg_videoram_w) AM_SHARE("fg_videoram")
+	AM_RANGE(0x122000, 0x1227ff) AM_RAM_WRITE(crospang_bg_videoram_w) AM_SHARE("bg_videoram")
+	AM_RANGE(0x200000, 0x2005ff) AM_RAM_DEVWRITE("palette", palette_device, write) AM_SHARE("palette")
+	AM_RANGE(0x210000, 0x2107ff) AM_RAM AM_SHARE("spriteram")
+	AM_RANGE(0x270000, 0x270001) AM_WRITE(crospang_soundlatch_w)
+	AM_RANGE(0x270004, 0x270007) AM_WRITENOP // ??
+	AM_RANGE(0x280000, 0x280001) AM_READ_PORT("P1_P2")
+	AM_RANGE(0x280002, 0x280003) AM_READ_PORT("COIN")
+	AM_RANGE(0x280004, 0x280005) AM_READ_PORT("DSW")
+ADDRESS_MAP_END
+
+static ADDRESS_MAP_START( crospang_map, AS_PROGRAM, 16, crospang_state )
+
+	AM_IMPORT_FROM(crospang_base_map)
+
 	AM_RANGE(0x100000, 0x100001) AM_WRITENOP
 	AM_RANGE(0x100002, 0x100003) AM_WRITE(crospang_fg_scrolly_w)
 	AM_RANGE(0x100004, 0x100005) AM_WRITE(crospang_bg_scrollx_w)
 	AM_RANGE(0x100006, 0x100007) AM_WRITE(crospang_bg_scrolly_w)
 	AM_RANGE(0x100008, 0x100009) AM_WRITE(crospang_fg_scrollx_w)
 	AM_RANGE(0x10000e, 0x10000f) AM_WRITENOP
-	AM_RANGE(0x120000, 0x1207ff) AM_RAM_WRITE(crospang_fg_videoram_w) AM_SHARE("fg_videoram")
-	AM_RANGE(0x122000, 0x1227ff) AM_RAM_WRITE(crospang_bg_videoram_w) AM_SHARE("bg_videoram")
-	AM_RANGE(0x200000, 0x2005ff) AM_RAM_DEVWRITE("palette", palette_device, write) AM_SHARE("palette")
-	AM_RANGE(0x210000, 0x2107ff) AM_RAM AM_SHARE("spriteram")
-	AM_RANGE(0x270000, 0x270001) AM_WRITE(crospang_soundlatch_w)
-	AM_RANGE(0x280000, 0x280001) AM_READ_PORT("P1_P2")
-	AM_RANGE(0x280002, 0x280003) AM_READ_PORT("COIN")
-	AM_RANGE(0x280004, 0x280005) AM_READ_PORT("DSW")
+
 	AM_RANGE(0x320000, 0x32ffff) AM_RAM
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( bestri_map, AS_PROGRAM, 16, crospang_state )
-	AM_RANGE(0x000000, 0x0fffff) AM_ROM AM_WRITENOP // writes to rom quite often
+	AM_IMPORT_FROM(crospang_base_map)
 
 	AM_RANGE(0x100004, 0x100005) AM_WRITE(bestri_fg_scrollx_w)
 	AM_RANGE(0x100006, 0x100007) AM_WRITE(bestri_fg_scrolly_w)
@@ -78,19 +87,22 @@ static ADDRESS_MAP_START( bestri_map, AS_PROGRAM, 16, crospang_state )
 	AM_RANGE(0x10000c, 0x10000d) AM_WRITE(bestri_bg_scrollx_w)
 	AM_RANGE(0x10000e, 0x10000f) AM_WRITE(bestri_tilebank_w)
 
-	AM_RANGE(0x120000, 0x1207ff) AM_RAM_WRITE(crospang_fg_videoram_w) AM_SHARE("fg_videoram")
-	AM_RANGE(0x122000, 0x1227ff) AM_RAM_WRITE(crospang_bg_videoram_w) AM_SHARE("bg_videoram")
-	AM_RANGE(0x200000, 0x2005ff) AM_RAM_DEVWRITE("palette", palette_device, write) AM_SHARE("palette")
-	AM_RANGE(0x210000, 0x2107ff) AM_RAM AM_SHARE("spriteram")
-	AM_RANGE(0x270000, 0x270001) AM_WRITE(crospang_soundlatch_w)
-	AM_RANGE(0x270004, 0x270005) AM_WRITENOP
-	AM_RANGE(0x280000, 0x280001) AM_READ_PORT("P1_P2")
-	AM_RANGE(0x280002, 0x280003) AM_READ_PORT("COIN")
-	AM_RANGE(0x280004, 0x280005) AM_READ_PORT("DSW")
-
 	AM_RANGE(0x3a0000, 0x3affff) AM_RAM
 ADDRESS_MAP_END
 
+static ADDRESS_MAP_START( bestria_map, AS_PROGRAM, 16, crospang_state )
+	AM_IMPORT_FROM(crospang_base_map)
+
+	AM_RANGE(0x100000, 0x100001) AM_WRITENOP // ??	
+	AM_RANGE(0x100006, 0x100007) AM_WRITE(bestri_fg_scrollx_w)
+	AM_RANGE(0x100008, 0x100009) AM_WRITE(bestri_fg_scrolly_w)
+	AM_RANGE(0x10000a, 0x10000b) AM_WRITE(bestri_bg_scrollx_w)
+	AM_RANGE(0x10000c, 0x10000d) AM_WRITE(bestri_bg_scrolly_w)
+	AM_RANGE(0x10000e, 0x10000f) AM_WRITE(bestri_tilebank_w)
+
+	AM_RANGE(0x340000, 0x34ffff) AM_RAM
+ADDRESS_MAP_END
+
 /* sound cpu */
 
 static ADDRESS_MAP_START( crospang_sound_map, AS_PROGRAM, 8, crospang_state )
@@ -381,6 +393,14 @@ static MACHINE_CONFIG_DERIVED( bestri, crospang )
 
 MACHINE_CONFIG_END
 
+static MACHINE_CONFIG_DERIVED( bestria, crospang )
+
+	/* basic machine hardware */
+	MCFG_CPU_MODIFY("maincpu")
+	MCFG_CPU_PROGRAM_MAP(bestria_map)
+
+MACHINE_CONFIG_END
+
 
 ROM_START( crospang )
 	ROM_REGION( 0x100000, "maincpu", 0 ) /* 68k */
@@ -542,6 +562,43 @@ ROM_START( bestri )
 	ROM_LOAD16_BYTE( "ud17.e12", 0x100001, 0x80000, CRC(3a3a3f1a) SHA1(48843140cd63c9387e09b84bd41b13dba35f48ad) )
 ROM_END
 
+ROM_START( bestria )
+	ROM_REGION( 0x100000, "maincpu", 0 ) /* 68000 Code */
+	ROM_LOAD16_BYTE( "O_UA02.I3", 0x00001, 0x80000, CRC(035c86f6) SHA1(d501553ed7fdb462c9c26fff6473cefe71424e26) )
+	ROM_LOAD16_BYTE( "E_UA03.I5", 0x00000, 0x80000, CRC(7c53d9f8) SHA1(92dc92471497292d3ba90f3f2fb35f7b4fba240c) )
+
+	ROM_REGION( 0x040000, "audiocpu", 0 ) /* Z80 */
+	ROM_LOAD( "US02.P3", 0x00000, 0x10000, CRC(c7cc05fa) SHA1(5fbf479be98f618c63e4c74a250d51279c2f5e3b)) // same as huek
+
+	ROM_REGION( 0x040000, "oki", 0 ) /* Samples */
+	ROM_LOAD( "US08.Q7", 0x00000, 0x40000, CRC(85d8f3de) SHA1(af55678bbe2c187cfee063c6f74cdd568307a7a2) )
+
+	ROM_REGION( 0x200000, "gfx1", 0 ) // tiles
+
+	ROM_LOAD16_BYTE( "2_UC08.M12", 0x00001, 0x20000, CRC(23778472) SHA1(00f54aefe52f2f76ab2f2628bf2e860d468e4a02) )
+	ROM_CONTINUE ( 0x100001,0x20000)
+	ROM_CONTINUE ( 0x040001,0x20000)
+	ROM_CONTINUE ( 0x140001,0x20000)
+	ROM_LOAD16_BYTE( "0_UC07.P12", 0x00000, 0x20000, CRC(7aad194c) SHA1(5fc5882886576d939763200e705e1085be60671a) )
+	ROM_CONTINUE ( 0x100000,0x20000)
+	ROM_CONTINUE ( 0x040000,0x20000)
+	ROM_CONTINUE ( 0x140000,0x20000)
+	ROM_LOAD16_BYTE( "1_UC28.N12", 0x80001, 0x20000, CRC(4f737007) SHA1(37f379f3b491da35153ed3d14d8920f94b060643) )
+	ROM_CONTINUE ( 0x180001,0x20000)
+	ROM_CONTINUE ( 0x0c0001,0x20000)
+	ROM_CONTINUE ( 0x1c0001,0x20000)
+	ROM_LOAD16_BYTE( "3_UC29.K12", 0x80000, 0x20000, CRC(2f5b244f) SHA1(1d9bf3d1dd55a87d52d2d614f46177605e32c6bf) )
+	ROM_CONTINUE ( 0x180000,0x20000)
+	ROM_CONTINUE ( 0x0c0000,0x20000)
+	ROM_CONTINUE ( 0x1c0000,0x20000)
+
+	ROM_REGION( 0x200000, "gfx2", 0 ) // sprites
+	ROM_LOAD16_BYTE( "A_UD14.J12", 0x000000, 0x80000, CRC(3502f71b) SHA1(ec012c414ace560ab67d60ce407bd67a4640c217) )
+	ROM_LOAD16_BYTE( "B_UD15.H12", 0x000001, 0x80000, CRC(2636b837) SHA1(692987bd8ace452ee40a253437f1e3672f737f98) )
+	ROM_LOAD16_BYTE( "C_UD16.G12", 0x100000, 0x80000, CRC(68b0ff81) SHA1(969579c2a29b577b9077e70a03c0ec92997ddcc0) )
+	ROM_LOAD16_BYTE( "D_UD17.E12", 0x100001, 0x80000, CRC(60082aed) SHA1(1431afe1a8200bd87520e90051db0ec43207b265) )
+ROM_END
+
 
 void crospang_state::tumblepb_gfx1_rearrange()
 {
@@ -571,4 +628,5 @@ DRIVER_INIT_MEMBER(crospang_state,crospang)
 
 GAME( 1998, crospang, 0, crospang, crospang, crospang_state, crospang, ROT0, "F2 System", "Cross Pang", MACHINE_SUPPORTS_SAVE )
 GAME( 199?, heuksun,  0, crospang, heuksun, crospang_state,  crospang, ROT0, "Oksan / F2 System", "Heuk Sun Baek Sa (Korea)", MACHINE_SUPPORTS_SAVE )
-GAME( 1998, bestri,   0, bestri,   bestri, crospang_state,   crospang, ROT0, "F2 System", "Bestri (Korea)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1998, bestri,   0, bestri,   bestri, crospang_state,   crospang, ROT0, "F2 System", "Bestri (Korea, set 1)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1998, bestria,  0, bestria,  bestri, crospang_state,   crospang, ROT0, "F2 System", "Bestri (Korea, set 2)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/mame.lst b/src/mame/mame.lst
index 2902f5aeb9f..c425d420482 100644
--- a/src/mame/mame.lst
+++ b/src/mame/mame.lst
@@ -9945,6 +9945,7 @@ crimfghtj                       // GX821 (c) 1989 (Japan)
 
 @source:crospang.cpp
 bestri                          // (c) F2 System
+bestria							//
 crospang                        // (c) 1998 F2 System
 heuksun                         // (c) 1998 Oksan / F2 System
 
diff --git a/src/mame/video/crospang.cpp b/src/mame/video/crospang.cpp
index ac0d44ac43d..5cbd8c5efa2 100644
--- a/src/mame/video/crospang.cpp
+++ b/src/mame/video/crospang.cpp
@@ -25,30 +25,37 @@ WRITE16_MEMBER(crospang_state::bestri_tilebank_w)
 }
 
 
+// Bestri performs some unusual operations on the scroll values before writing them
 WRITE16_MEMBER(crospang_state::bestri_bg_scrolly_w)
 {
-	/* Very Strange */
+	// addi.w #$1f8, D0
+	// eori.w #$154, D0
 	int scroll =  (data & 0x3ff) ^ 0x0155;
 	m_bg_layer->set_scrolly(0, -scroll + 7);
 }
 
 WRITE16_MEMBER(crospang_state::bestri_fg_scrolly_w)
 {
-	/* Very Strange */
+	// addi.w #$1f8, D0
+	// eori.w #$aa, D0
 	int scroll = (data & 0x3ff) ^ 0x00ab;
 	m_fg_layer->set_scrolly(0, -scroll + 7);
 }
 
 WRITE16_MEMBER(crospang_state::bestri_fg_scrollx_w)
 {
-	// printf("fg_layer x %04x\n",data);
-	m_fg_layer->set_scrollx(0, data + 32);
+	// addi.w #$400, D1
+	// eori.w #$1e0, D1
+	int scroll =  (data & 0x3ff) ^ 0x1e1;
+	m_fg_layer->set_scrollx(0, scroll - 1);
 }
 
 WRITE16_MEMBER(crospang_state::bestri_bg_scrollx_w)
 {
-	// printf("bg_layer x %04x\n",data);
-	m_bg_layer->set_scrollx(0, data - 60);
+	// addi.w #$3fc, D1
+	// eori.w #$3c0, D1
+	int scroll =  (data & 0x3ff) ^ 0x3c1;
+	m_bg_layer->set_scrollx(0, scroll + 3);
 }
 
 

From 3ab4ced499eb088ab3cd4af8004eefae3a642da3 Mon Sep 17 00:00:00 2001
From: David Haywood <mamehaze@users.noreply.github.com>
Date: Mon, 18 Apr 2016 21:07:49 +0100
Subject: [PATCH 076/122] fix compile (nw)

---
 src/osd/windows/window.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/osd/windows/window.cpp b/src/osd/windows/window.cpp
index 0dd6f46aeae..1c3c2a8ec23 100644
--- a/src/osd/windows/window.cpp
+++ b/src/osd/windows/window.cpp
@@ -214,11 +214,11 @@ bool windows_osd_interface::window_init()
 				error = renderer_gdi::init(machine());
 				break;
 			case VIDEO_MODE_BGFX:
-				error = renderer_bgfx::init(machine());
+				renderer_bgfx::init(machine());
 				break;
 #if (USE_OPENGL)
 			case VIDEO_MODE_OPENGL:
-				error = renderer_ogl::init(machine());
+				renderer_ogl::init(machine());
 				break;
 #endif
 			case VIDEO_MODE_SDL2ACCEL:

From 4e0d4a3350dfd513bade1de0ef959183743c8b47 Mon Sep 17 00:00:00 2001
From: David Haywood <mamehaze@users.noreply.github.com>
Date: Mon, 18 Apr 2016 21:16:18 +0100
Subject: [PATCH 077/122] (nw)

---
 src/mame/drivers/gaelco2.cpp | 25 ++++++++++++++++---------
 src/mame/includes/gaelco2.h  |  1 +
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/mame/drivers/gaelco2.cpp b/src/mame/drivers/gaelco2.cpp
index 805047be9e1..67febc0565c 100644
--- a/src/mame/drivers/gaelco2.cpp
+++ b/src/mame/drivers/gaelco2.cpp
@@ -633,11 +633,6 @@ ROM_END
                             TOUCH & GO
   ============================================================================*/
 
-/* the game expects this value each frame to know that the DS5002FP is alive */
-READ16_MEMBER(gaelco2_state::dallas_kludge_r)
-{
-	return 0x0200;
-}
 
 static ADDRESS_MAP_START( touchgo_map, AS_PROGRAM, 16, gaelco2_state )
 	AM_RANGE(0x000000, 0x0fffff) AM_ROM                                                                         /* ROM */
@@ -650,11 +645,11 @@ static ADDRESS_MAP_START( touchgo_map, AS_PROGRAM, 16, gaelco2_state )
 	AM_RANGE(0x300004, 0x300005) AM_READ_PORT("IN2")                                                            /* COINSW + Input 3P */
 	AM_RANGE(0x300006, 0x300007) AM_READ_PORT("IN3")                                                            /* SERVICESW + Input 4P */
 	AM_RANGE(0x500000, 0x50001f) AM_WRITE(touchgo_coin_w)                                                       /* Coin counters */
-	AM_RANGE(0xfefffa, 0xfefffb) AM_RAM_READ(dallas_kludge_r)                                                   /* DS5002FP related patch */
 	AM_RANGE(0xfe0000, 0xfeffff) AM_RAM                                                                         /* Work RAM */
 ADDRESS_MAP_END
 
 
+
 static INPUT_PORTS_START( touchgo )
 	PORT_START("IN0")
 	PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
@@ -1504,12 +1499,24 @@ DRIVER_INIT_MEMBER(gaelco2_state,maniacsqa)
 }
 
 
+/* the game expects this value each frame to know that the DS5002FP is alive */
+READ16_MEMBER(gaelco2_state::dallas_kludge_r)
+{
+	return 0x0200;
+}
+
+DRIVER_INIT_MEMBER(gaelco2_state,touchgop)
+{
+	DRIVER_INIT_CALL(touchgo);
+	m_maincpu->space(AS_PROGRAM).install_read_handler(0xfefffa, 0xfefffb, read16_delegate(FUNC(gaelco2_state::dallas_kludge_r), this) );
+}
+
 GAME( 1994, aligator,  0,       alighunt, alighunt, gaelco2_state, alighunt, ROT0, "Gaelco", "Alligator Hunt", MACHINE_UNEMULATED_PROTECTION | MACHINE_NOT_WORKING )
 GAME( 1994, aligatorun,aligator,alighunt, alighunt, gaelco2_state, alighunt, ROT0, "Gaelco", "Alligator Hunt (unprotected)", 0 )
 
-GAME( 1995, touchgo,  0,        touchgo,  touchgo,  gaelco2_state, touchgo,  ROT0, "Gaelco", "Touch & Go (World)", MACHINE_UNEMULATED_PROTECTION | MACHINE_NOT_WORKING )
-GAME( 1995, touchgon, touchgo,  touchgo,  touchgo,  gaelco2_state, touchgo,  ROT0, "Gaelco", "Touch & Go (Non North America)", MACHINE_UNEMULATED_PROTECTION | MACHINE_NOT_WORKING )
-GAME( 1995, touchgoe, touchgo,  touchgo,  touchgo,  gaelco2_state, touchgo,  ROT0, "Gaelco", "Touch & Go (earlier revision)", MACHINE_UNEMULATED_PROTECTION | MACHINE_NOT_WORKING )
+GAME( 1995, touchgo,  0,        touchgo,  touchgo,  gaelco2_state, touchgop, ROT0, "Gaelco", "Touch & Go (World)", MACHINE_UNEMULATED_PROTECTION | MACHINE_NOT_WORKING )
+GAME( 1995, touchgon, touchgo,  touchgo,  touchgo,  gaelco2_state, touchgop, ROT0, "Gaelco", "Touch & Go (Non North America)", MACHINE_UNEMULATED_PROTECTION | MACHINE_NOT_WORKING )
+GAME( 1995, touchgoe, touchgo,  touchgo,  touchgo,  gaelco2_state, touchgop, ROT0, "Gaelco", "Touch & Go (earlier revision)", MACHINE_UNEMULATED_PROTECTION | MACHINE_NOT_WORKING )
 GAME( 1995, touchgok, touchgo,  touchgo,  touchgo,  gaelco2_state, touchgo,  ROT0, "Gaelco", "Touch & Go (Korea, unprotected)", MACHINE_IMPERFECT_GRAPHICS )
 
 GAME( 1995, wrally2,  0,        wrally2,  wrally2,  driver_device, 0,        ROT0, "Gaelco", "World Rally 2: Twin Racing", MACHINE_UNEMULATED_PROTECTION | MACHINE_NOT_WORKING )
diff --git a/src/mame/includes/gaelco2.h b/src/mame/includes/gaelco2.h
index 14cd42e3284..5bd2e9a54cc 100644
--- a/src/mame/includes/gaelco2.h
+++ b/src/mame/includes/gaelco2.h
@@ -50,6 +50,7 @@ public:
 	DECLARE_WRITE16_MEMBER(gaelco2_vram_w);
 	DECLARE_WRITE16_MEMBER(gaelco2_palette_w);
 	DECLARE_DRIVER_INIT(touchgo);
+	DECLARE_DRIVER_INIT(touchgop);
 	DECLARE_DRIVER_INIT(snowboar);
 	DECLARE_DRIVER_INIT(alighunt);
 	DECLARE_DRIVER_INIT(maniacsqa);

From 6e2f69d80c63783f45c28301b4a5f535705027e4 Mon Sep 17 00:00:00 2001
From: David Haywood <mamehaze@users.noreply.github.com>
Date: Mon, 18 Apr 2016 22:01:18 +0100
Subject: [PATCH 078/122] improve touchgo video (nw)

---
 src/mame/video/gaelco2.cpp | 49 ++++++++++++++++++++++++++++----------
 1 file changed, 37 insertions(+), 12 deletions(-)

diff --git a/src/mame/video/gaelco2.cpp b/src/mame/video/gaelco2.cpp
index d8eac2294cb..57935b04984 100644
--- a/src/mame/video/gaelco2.cpp
+++ b/src/mame/video/gaelco2.cpp
@@ -434,11 +434,16 @@ UINT32 gaelco2_state::screen_update_gaelco2(screen_device &screen, bitmap_ind16
 {
 	int i;
 
+	int xoff0 = 0x14;
+	int xoff1 = xoff0 - 4;
+	int yoff0 = 0x01;
+	int yoff1 = 0x01;
+
 	/* read scroll values */
-	int scroll0x = m_videoram[0x2802/2] + 0x14;
-	int scroll1x = m_videoram[0x2806/2] + 0x10;
-	int scroll0y = m_videoram[0x2800/2] + 0x01;
-	int scroll1y = m_videoram[0x2804/2] + 0x01;
+	int scroll0x = m_videoram[0x2802/2] + xoff0;
+	int scroll1x = m_videoram[0x2806/2] + xoff1;
+	int scroll0y = m_videoram[0x2800/2] + yoff0;
+	int scroll1y = m_videoram[0x2804/2] + yoff1;
 
 	/* set y scroll registers */
 	m_pant[0]->set_scrolly(0, scroll0y & 0x1ff);
@@ -446,8 +451,8 @@ UINT32 gaelco2_state::screen_update_gaelco2(screen_device &screen, bitmap_ind16
 
 	/* set x linescroll registers */
 	for (i = 0; i < 512; i++){
-		m_pant[0]->set_scrollx(i & 0x1ff, (m_vregs[0] & 0x8000) ? (m_videoram[(0x2000/2) + i] + 0x14) & 0x3ff : scroll0x & 0x3ff);
-		m_pant[1]->set_scrollx(i & 0x1ff, (m_vregs[1] & 0x8000) ? (m_videoram[(0x2400/2) + i] + 0x10) & 0x3ff : scroll1x & 0x3ff);
+		m_pant[0]->set_scrollx(i & 0x1ff, (m_vregs[0] & 0x8000) ? (m_videoram[(0x2000/2) + i] + xoff0) & 0x3ff : scroll0x & 0x3ff);
+		m_pant[1]->set_scrollx(i & 0x1ff, (m_vregs[1] & 0x8000) ? (m_videoram[(0x2400/2) + i] + xoff1) & 0x3ff : scroll1x & 0x3ff);
 	}
 
 	/* draw screen */
@@ -463,11 +468,29 @@ UINT32 gaelco2_state::dual_update(screen_device &screen, bitmap_ind16 &bitmap, c
 {
 	int i;
 
+	int xoff0 = 0x14; // intro scenes align better with 0x13, but test screen is definitely 0x14
+	int xoff1 = xoff0 - 4;
+	int yoff0 = 0x01;
+	int yoff1 = 0x01;
+
 	/* read scroll values */
-	int scroll0x = m_videoram[0x2802/2] + 0x14;
-	int scroll1x = m_videoram[0x2806/2] + 0x10;
-	int scroll0y = m_videoram[0x2800/2] + 0x01;
-	int scroll1y = m_videoram[0x2804/2] + 0x01;
+	int scroll0x = m_videoram[0x2802/2] + xoff0;
+	int scroll1x = m_videoram[0x2806/2] + xoff1;
+	int scroll0y = m_videoram[0x2800/2] + yoff0;
+	int scroll1y = m_videoram[0x2804/2] + yoff1;
+
+	// if linescroll is enabled y-scroll handling changes too?
+	// touchgo uses 0x1f0 / 0x1ef between game and intro screens but actual scroll position needs to be different
+	// this aligns the crowd with the advertising boards
+	if (m_vregs[0] & 0x8000)
+	{
+		scroll0y += 32;
+	}
+
+	if (m_vregs[1] & 0x8000)
+	{
+		scroll1y += 32;
+	}
 
 	/* set y scroll registers */
 	m_pant[0]->set_scrolly(0, scroll0y & 0x1ff);
@@ -475,10 +498,12 @@ UINT32 gaelco2_state::dual_update(screen_device &screen, bitmap_ind16 &bitmap, c
 
 	/* set x linescroll registers */
 	for (i = 0; i < 512; i++){
-		m_pant[0]->set_scrollx(i & 0x1ff, (m_vregs[0] & 0x8000) ? (m_videoram[(0x2000/2) + i] + 0x14) & 0x3ff : scroll0x & 0x3ff);
-		m_pant[1]->set_scrollx(i & 0x1ff, (m_vregs[1] & 0x8000) ? (m_videoram[(0x2400/2) + i] + 0x10) & 0x3ff : scroll1x & 0x3ff);
+		m_pant[0]->set_scrollx(i & 0x1ff, (m_vregs[0] & 0x8000) ? (m_videoram[(0x2000/2) + i] + xoff0) & 0x3ff : scroll0x & 0x3ff);
+		m_pant[1]->set_scrollx(i & 0x1ff, (m_vregs[1] & 0x8000) ? (m_videoram[(0x2400/2) + i] + xoff1) & 0x3ff : scroll1x & 0x3ff);
 	}
 
+
+
 	/* draw screen */
 	bitmap.fill(0, cliprect);
 

From f0a362171641a32b46f0c5d0398c32d551cddb8c Mon Sep 17 00:00:00 2001
From: David Haywood <mamehaze@users.noreply.github.com>
Date: Mon, 18 Apr 2016 22:47:52 +0100
Subject: [PATCH 079/122] update stream on read in gaelco.cpp, touchgo still
 seems to forget to play sounds sometimes tho, like one of the channels gets
 stuck busy?

---
 src/devices/sound/gaelco.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/devices/sound/gaelco.cpp b/src/devices/sound/gaelco.cpp
index 16d647ba444..141361499c8 100644
--- a/src/devices/sound/gaelco.cpp
+++ b/src/devices/sound/gaelco.cpp
@@ -186,6 +186,9 @@ READ16_MEMBER( gaelco_gae1_device::gaelcosnd_r )
 {
 	LOG_READ_WRITES(("%s: (GAE1): read from %04x\n", machine().describe_context(), offset));
 
+	/* first update the stream to this point in time */
+	m_stream->update();
+
 	return m_sndregs[offset];
 }
 

From 90c06fb178d2b9afb89b6c62a05c85c73eba2947 Mon Sep 17 00:00:00 2001
From: David Haywood <mamehaze@users.noreply.github.com>
Date: Mon, 18 Apr 2016 23:41:21 +0100
Subject: [PATCH 080/122] new clones DoDonPachi Dai-Ou-Jou (2002.10.07 Black
 Ver., bootleg Knights of Valour Super Heroes conversion)

---
 src/mame/drivers/pgm.cpp | 31 +++++++++++++++++++++++++++++++
 src/mame/mame.lst        |  1 +
 2 files changed, 32 insertions(+)

diff --git a/src/mame/drivers/pgm.cpp b/src/mame/drivers/pgm.cpp
index 19390b8dc35..5906663a7ad 100644
--- a/src/mame/drivers/pgm.cpp
+++ b/src/mame/drivers/pgm.cpp
@@ -1508,6 +1508,8 @@ ROM_START( kovsgqyzb )
 ROM_END
 
 
+
+
 ROM_START( kovsh )
 	ROM_REGION( 0x600000, "maincpu", 0 ) /* 68000 Code */
 	PGM_68K_BIOS
@@ -4358,6 +4360,32 @@ ROM_START( ddpdojblka )
 	ROM_LOAD( "ddp3blk_defaults.nv",  0x0000000, 0x020000, CRC(a1651904) SHA1(5b80d3c4c764895c40953a66161d4dd84f742604) )
 ROM_END
 
+// bootleg on a converted KOVSH cart
+ROM_START( ddpdojblkbl )
+	ROM_REGION( 0x600000, "maincpu", 0 ) /* 68000 Code */
+	PGM_68K_BIOS
+	ROM_LOAD16_WORD_SWAP( "ddp_doj_u1.bin",  0x100000, 0x400000, CRC(eb4ab06a) SHA1(187c37e5319395e36a1cf3626b53e08df615cc0c) )
+
+	ROM_REGION( 0x4000, "prot", 0 ) /* ARM protection ASIC - internal rom */
+	ROM_LOAD( "kovsh_v100_china.asic", 0x000000, 0x04000,  CRC(0f09a5c1) SHA1(621b38c05f33277608d58b49822aebc930ae4870) )
+
+	ROM_REGION( 0xc00000, "tiles", 0 ) /* 8x8 Text Tiles + 32x32 BG Tiles */
+	PGM_VIDEO_BIOS
+	ROM_LOAD( "t04401w064.u19",0x180000, 0x800000, CRC(3a95f19c) SHA1(fd3c47cf0b8b1e20c6bec4be68a089fc8bbf4dbe) ) //text-1
+
+	ROM_REGION( 0x1c00000, "sprcol", 0 ) /* Sprite Colour Data */
+	ROM_LOAD( "a04401w064.u7",  0x0000000, 0x0800000, CRC(ed229794) SHA1(1cf1863495a18c7c7d277a9be43ec116b00960b0) ) //image-1
+	ROM_LOAD( "a04402w064.u8",  0x0800000, 0x0800000, CRC(752167b0) SHA1(c33c3398dd8e479c9d5bd348924958a6aecbf0fc) ) //image-2
+
+	ROM_REGION( 0x1000000, "sprmask", 0 ) /* Sprite Masks + Colour Indexes */
+	ROM_LOAD( "b04401w064.u1",  0x0000000, 0x0800000, CRC(8cbff066) SHA1(eef1cd566bc70ebf45f047e56026803d5c1dac43) ) //bitmap-1
+
+	ROM_REGION( 0x1000000, "ics", 0 ) /* Samples - (8 bit mono 11025Hz) - */
+	PGM_AUDIO_BIOS
+	ROM_LOAD( "m04401b032.u17",  0x400000, 0x400000, CRC(5a0dbd76) SHA1(06ab202f6bd5ebfb35b9d8cc7a8fb83ec8840659) ) //music-1
+ROM_END
+
+
 /*** Init Stuff **************************************************************/
 
 /* This function expands the sprite colour data (in the A Roms) from 3 pixels
@@ -4525,6 +4553,9 @@ GAME( 2002, ddpdojb,    ddpdoj,      pgm_arm_type1_cave,    pgm, pgm_arm_type1_s
 GAME( 2002, ddpdojblk,  ddpdoj,      pgm_arm_type1_cave,    pgm, pgm_arm_type1_state,     ddp3,      ROT270, "Cave (AMI license)", "DoDonPachi Dai-Ou-Jou (2002.10.07.Black Ver)",                MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) // Displays "2002.04.05.Master Ver" (old) or "2002.10.07.Black Ver" (new)
 GAME( 2002, ddpdojblka, ddpdoj,      pgm_arm_type1_cave,    pgm, pgm_arm_type1_state,     ddp3,      ROT270, "Cave (AMI license)", "DoDonPachi Dai-Ou-Jou (2002.10.07 Black Ver)",                MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) // Displays "2002.04.05.Master Ver" (old) or "2002.10.07 Black Ver" (new)
 
+GAME( 2012, ddpdojblkbl, ddpdoj,     pgm_arm_type1,         pgm, pgm_arm_type1_state,    kovsh,      ROT270,   "bootleg", "DoDonPachi Dai-Ou-Jou (2002.10.07 Black Ver., bootleg Knights of Valour Super Heroes conversion)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) // 68k: SANGO EX V100 12/06/99 13:36:04, ARM: China internal ROM
+
+
 // the exact text of the 'version' shows which revision of the game it is; the newest has 2 '.' symbols in the string, the oldest, none.
 // the only difference between 'ket' and 'ket1' is the ROM fill at 0x1443bc-0x1c88cd, on ket1 it seems to be randomized / garbage data, on ket it's all 0xff, both have been seen on more than one PCB.
 GAME( 2002, ket,          0,         pgm_arm_type1_cave,    pgm, pgm_arm_type1_state,     ket,       ROT270, "Cave (AMI license)", "Ketsui: Kizuna Jigoku Tachi (2003/01/01. Master Ver.)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/mame.lst b/src/mame/mame.lst
index c425d420482..3b16abc8246 100644
--- a/src/mame/mame.lst
+++ b/src/mame/mame.lst
@@ -29655,6 +29655,7 @@ ddpdoja                         //
 ddpdojb                         //
 ddpdojblk                       //
 ddpdojblka                      //
+ddpdojblkbl						//
 dmnfrnt                         // (c) 2002 Demon Front
 dmnfrnta                        //
 dmnfrntb                        //

From 084d3654ca14a79d9ec173bad4ddf00ad0fb5a7f Mon Sep 17 00:00:00 2001
From: AJR <ajrhacker@users.noreply.github.com>
Date: Mon, 18 Apr 2016 18:53:28 -0400
Subject: [PATCH 081/122] Iterate over devices C++11 style

Replace the old device_iterator and its specialized versions with functionally equivalent classes that use standard operators to yield references to devices/interfaces rather than pointers. With range-based for loops, they no longer have to be stored in named variables, though they can also be reused concurrently since the iteration state is now maintained by a subclass.

Add a few more typical getters to device_t::subdevice_list.
---
 src/devices/bus/abcbus/abc890.cpp             |  60 ++--
 src/devices/bus/c64/bn1541.cpp                |  12 +-
 src/devices/imagedev/cassette.cpp             |   5 +-
 src/devices/video/voodoo.cpp                  |   7 +-
 src/emu/addrmap.cpp                           |   7 +-
 src/emu/audit.cpp                             |  37 +-
 src/emu/audit.h                               |   2 +-
 src/emu/cheat.cpp                             |  11 +-
 src/emu/clifront.cpp                          | 167 ++++-----
 src/emu/debug/debugcmd.cpp                    | 179 ++++------
 src/emu/debug/debugcpu.cpp                    |  21 +-
 src/emu/debug/dvbpoints.cpp                   |   7 +-
 src/emu/debug/dvdisasm.cpp                    |   9 +-
 src/emu/debug/dvmemory.cpp                    |  11 +-
 src/emu/debug/dvstate.cpp                     |   7 +-
 src/emu/debug/dvwpoints.cpp                   |   7 +-
 src/emu/devfind.cpp                           |  11 +-
 src/emu/device.h                              | 321 +++++++++++-------
 src/emu/diexec.cpp                            |   3 +-
 src/emu/diimage.cpp                           |  31 +-
 src/emu/disound.cpp                           |  36 +-
 src/emu/divideo.cpp                           |   4 +-
 src/emu/drivenum.cpp                          |   5 +-
 src/emu/driver.cpp                            |   5 +-
 src/emu/emumem.cpp                            |   6 +-
 src/emu/emuopts.cpp                           |  50 ++-
 src/emu/image.cpp                             |  80 ++---
 src/emu/info.cpp                              | 229 ++++++-------
 src/emu/ioport.cpp                            |  15 +-
 src/emu/luaengine.cpp                         |   8 +-
 src/emu/machine.cpp                           |  66 ++--
 src/emu/mconfig.cpp                           |  27 +-
 src/emu/network.cpp                           |  18 +-
 src/emu/render.cpp                            |  16 +-
 src/emu/rendlay.cpp                           |  23 +-
 src/emu/romload.cpp                           |  70 ++--
 src/emu/romload.h                             |   2 +-
 src/emu/schedule.cpp                          |  15 +-
 src/emu/softlist.cpp                          |  19 +-
 src/emu/sound.cpp                             |  21 +-
 src/emu/ui/cheatopt.cpp                       |   3 +-
 src/emu/ui/datmenu.cpp                        |  13 +-
 src/emu/ui/devopt.cpp                         |  67 ++--
 src/emu/ui/filemngr.cpp                       |  28 +-
 src/emu/ui/imgcntrl.cpp                       |  12 +-
 src/emu/ui/info.cpp                           |   5 +-
 src/emu/ui/info_pty.cpp                       |  15 +-
 src/emu/ui/inifile.cpp                        |  34 +-
 src/emu/ui/mainmenu.cpp                       |  56 ++-
 src/emu/ui/miscmenu.cpp                       |  19 +-
 src/emu/ui/selgame.cpp                        |   5 +-
 src/emu/ui/selsoft.cpp                        |  29 +-
 src/emu/ui/slotopt.cpp                        |  45 ++-
 src/emu/ui/slotopt.h                          |  14 +-
 src/emu/ui/swlist.cpp                         |  20 +-
 src/emu/ui/ui.cpp                             | 104 +++---
 src/emu/ui/viewgfx.cpp                        |  34 +-
 src/emu/validity.cpp                          |  55 ++-
 src/emu/video.cpp                             |  42 ++-
 src/mame/machine/atarigen.cpp                 |  16 +-
 src/mame/video/cyberbal.cpp                   |  16 +-
 src/osd/modules/debugger/qt/deviceswindow.cpp |   9 +-
 src/osd/modules/debugger/qt/mainwindow.cpp    |   9 +-
 .../modules/debugger/win/consolewininfo.cpp   |  27 +-
 src/osd/modules/render/d3d/d3dhlsl.cpp        |   6 +-
 src/osd/sdl/window.cpp                        |  18 +-
 66 files changed, 1084 insertions(+), 1247 deletions(-)

diff --git a/src/devices/bus/abcbus/abc890.cpp b/src/devices/bus/abcbus/abc890.cpp
index a188c4f6e76..b9e7902dfd2 100644
--- a/src/devices/bus/abcbus/abc890.cpp
+++ b/src/devices/bus/abcbus/abc890.cpp
@@ -252,11 +252,9 @@ void abc890_t::device_reset()
 
 void abc890_t::abcbus_cs(UINT8 data)
 {
-	abcbus_slot_device_iterator iter(*this);
-
-	for (abcbus_slot_t *slot = iter.first(); slot != nullptr; slot = iter.next())
+	for (abcbus_slot_t &slot : abcbus_slot_device_iterator(*this))
 	{
-		slot->cs_w(data);
+		slot.cs_w(data);
 	}
 }
 
@@ -269,11 +267,9 @@ UINT8 abc890_t::abcbus_inp()
 {
 	UINT8 data = 0xff;
 
-	abcbus_slot_device_iterator iter(*this);
-
-	for (abcbus_slot_t *slot = iter.first(); slot != nullptr; slot = iter.next())
+	for (abcbus_slot_t &slot : abcbus_slot_device_iterator(*this))
 	{
-		data &= slot->inp_r();
+		data &= slot.inp_r();
 	}
 
 	return data;
@@ -286,11 +282,9 @@ UINT8 abc890_t::abcbus_inp()
 
 void abc890_t::abcbus_out(UINT8 data)
 {
-	abcbus_slot_device_iterator iter(*this);
-
-	for (abcbus_slot_t *slot = iter.first(); slot != nullptr; slot = iter.next())
+	for (abcbus_slot_t &slot : abcbus_slot_device_iterator(*this))
 	{
-		slot->out_w(data);
+		slot.out_w(data);
 	}
 }
 
@@ -303,11 +297,9 @@ UINT8 abc890_t::abcbus_stat()
 {
 	UINT8 data = 0xff;
 
-	abcbus_slot_device_iterator iter(*this);
-
-	for (abcbus_slot_t *slot = iter.first(); slot != nullptr; slot = iter.next())
+	for (abcbus_slot_t &slot : abcbus_slot_device_iterator(*this))
 	{
-		data &= slot->stat_r();
+		data &= slot.stat_r();
 	}
 
 	return data;
@@ -320,11 +312,9 @@ UINT8 abc890_t::abcbus_stat()
 
 void abc890_t::abcbus_c1(UINT8 data)
 {
-	abcbus_slot_device_iterator iter(*this);
-
-	for (abcbus_slot_t *slot = iter.first(); slot != nullptr; slot = iter.next())
+	for (abcbus_slot_t &slot : abcbus_slot_device_iterator(*this))
 	{
-		slot->c1_w(data);
+		slot.c1_w(data);
 	}
 }
 
@@ -335,11 +325,9 @@ void abc890_t::abcbus_c1(UINT8 data)
 
 void abc890_t::abcbus_c2(UINT8 data)
 {
-	abcbus_slot_device_iterator iter(*this);
-
-	for (abcbus_slot_t *slot = iter.first(); slot != nullptr; slot = iter.next())
+	for (abcbus_slot_t &slot : abcbus_slot_device_iterator(*this))
 	{
-		slot->c2_w(data);
+		slot.c2_w(data);
 	}
 }
 
@@ -350,11 +338,9 @@ void abc890_t::abcbus_c2(UINT8 data)
 
 void abc890_t::abcbus_c3(UINT8 data)
 {
-	abcbus_slot_device_iterator iter(*this);
-
-	for (abcbus_slot_t *slot = iter.first(); slot != nullptr; slot = iter.next())
+	for (abcbus_slot_t &slot : abcbus_slot_device_iterator(*this))
 	{
-		slot->c3_w(data);
+		slot.c3_w(data);
 	}
 }
 
@@ -365,11 +351,9 @@ void abc890_t::abcbus_c3(UINT8 data)
 
 void abc890_t::abcbus_c4(UINT8 data)
 {
-	abcbus_slot_device_iterator iter(*this);
-
-	for (abcbus_slot_t *slot = iter.first(); slot != nullptr; slot = iter.next())
+	for (abcbus_slot_t &slot : abcbus_slot_device_iterator(*this))
 	{
-		slot->c4_w(data);
+		slot.c4_w(data);
 	}
 }
 
@@ -382,11 +366,9 @@ UINT8 abc890_t::abcbus_xmemfl(offs_t offset)
 {
 	UINT8 data = 0xff;
 
-	abcbus_slot_device_iterator iter(*this);
-
-	for (abcbus_slot_t *slot = iter.first(); slot != nullptr; slot = iter.next())
+	for (abcbus_slot_t &slot : abcbus_slot_device_iterator(*this))
 	{
-		data &= slot->xmemfl_r(offset);
+		data &= slot.xmemfl_r(offset);
 	}
 
 	return data;
@@ -399,10 +381,8 @@ UINT8 abc890_t::abcbus_xmemfl(offs_t offset)
 
 void abc890_t::abcbus_xmemw(offs_t offset, UINT8 data)
 {
-	abcbus_slot_device_iterator iter(*this);
-
-	for (abcbus_slot_t *slot = iter.first(); slot != nullptr; slot = iter.next())
+	for (abcbus_slot_t &slot : abcbus_slot_device_iterator(*this))
 	{
-		slot->xmemw_w(offset, data);
+		slot.xmemw_w(offset, data);
 	}
 }
diff --git a/src/devices/bus/c64/bn1541.cpp b/src/devices/bus/c64/bn1541.cpp
index d93e629aaa7..fb24b459d1b 100644
--- a/src/devices/bus/c64/bn1541.cpp
+++ b/src/devices/bus/c64/bn1541.cpp
@@ -74,17 +74,13 @@ c64_bn1541_device::c64_bn1541_device(const machine_config &mconfig, const char *
 
 void c64_bn1541_device::device_start()
 {
-	device_iterator iter(machine().root_device());
-
-	for (device_t *device = iter.first(); device != nullptr; device = iter.next())
+	for (device_t &device : device_iterator(machine().root_device()))
 	{
-		device_iterator subiter(*device);
-
-		for (device_t *subdevice = subiter.first(); subdevice != nullptr; subdevice = iter.next())
+		for (device_t &subdevice : device_iterator(device))
 		{
-			if (subdevice->interface(m_other) && subdevice != this)
+			if (subdevice.interface(m_other) && &subdevice != this)
 			{
-				if (LOG) logerror("Parallel device %s\n", subdevice->tag());
+				if (LOG) logerror("Parallel device %s\n", subdevice.tag());
 
 				// grab the first 1541/1571 and run to the hills
 				m_other->m_other = this;
diff --git a/src/devices/imagedev/cassette.cpp b/src/devices/imagedev/cassette.cpp
index aedc6509d42..0397c249fcb 100644
--- a/src/devices/imagedev/cassette.cpp
+++ b/src/devices/imagedev/cassette.cpp
@@ -372,7 +372,6 @@ void cassette_image_device::call_display()
 	int n;
 	double position, length;
 	cassette_state uistate;
-	cassette_image_device *dev;
 	static const UINT8 shapes[8] = { 0x2d, 0x5c, 0x7c, 0x2f, 0x2d, 0x20, 0x20, 0x20 };
 
 	/* abort if we should not be showing the image */
@@ -390,9 +389,7 @@ void cassette_image_device::call_display()
 	x = 0.2f;
 	y = 0.5f;
 
-	cassette_device_iterator iter(device().machine().root_device());
-	for (dev = iter.first(); dev != nullptr && strcmp( dev->tag(), device().tag() ); dev = iter.next())
-		y += 1;
+	y += cassette_device_iterator(device().machine().root_device()).indexof(*this);
 
 	y *= device().machine().ui().get_line_height() + 2.0f * UI_BOX_TB_BORDER;
 	/* choose which frame of the animation we are at */
diff --git a/src/devices/video/voodoo.cpp b/src/devices/video/voodoo.cpp
index 025c0fa140f..b391298c1b5 100644
--- a/src/devices/video/voodoo.cpp
+++ b/src/devices/video/voodoo.cpp
@@ -5010,12 +5010,11 @@ void voodoo_device::common_start_voodoo(UINT8 type)
 	}
 
 	/* set the type, and initialize the chip mask */
-	device_iterator iter(machine().root_device());
 	index = 0;
-	for (device_t *scan = iter.first(); scan != nullptr; scan = iter.next())
-		if (scan->type() == this->type())
+	for (device_t &scan : device_iterator(machine().root_device()))
+		if (scan.type() == this->type())
 		{
-			if (scan == this)
+			if (&scan == this)
 				break;
 			index++;
 		}
diff --git a/src/emu/addrmap.cpp b/src/emu/addrmap.cpp
index ce6f0290d08..dedf97c780c 100644
--- a/src/emu/addrmap.cpp
+++ b/src/emu/addrmap.cpp
@@ -696,11 +696,10 @@ void address_map::map_validity_check(validity_checker &valid, const device_t &de
 			std::string entry_region = entry.m_devbase.subtag(entry.m_region);
 
 			// look for the region
-			device_iterator deviter(device.mconfig().root_device());
-			for (device_t *dev = deviter.first(); dev != nullptr; dev = deviter.next())
-				for (const rom_entry *romp = rom_first_region(*dev); romp != nullptr && !found; romp = rom_next_region(romp))
+			for (device_t &dev : device_iterator(device.mconfig().root_device()))
+				for (const rom_entry *romp = rom_first_region(dev); romp != nullptr && !found; romp = rom_next_region(romp))
 				{
-					if (rom_region_name(*dev, romp) == entry_region)
+					if (rom_region_name(dev, romp) == entry_region)
 					{
 						// verify the address range is within the region's bounds
 						offs_t length = ROMREGION_GETLENGTH(romp);
diff --git a/src/emu/audit.cpp b/src/emu/audit.cpp
index 0a0cec543a5..60781ae7710 100644
--- a/src/emu/audit.cpp
+++ b/src/emu/audit.cpp
@@ -54,26 +54,25 @@ const char *driverpath = m_enumerator.config().root_device().searchpath();
 	int shared_required = 0;
 
 	// iterate over devices and regions
-	device_iterator deviter(m_enumerator.config().root_device());
-	for (device_t *device = deviter.first(); device != nullptr; device = deviter.next())
+	for (device_t &device : device_iterator(m_enumerator.config().root_device()))
 	{
 		// determine the search path for this source and iterate through the regions
-		m_searchpath = device->searchpath();
+		m_searchpath = device.searchpath();
 
 		// now iterate over regions and ROMs within
-		for (const rom_entry *region = rom_first_region(*device); region != nullptr; region = rom_next_region(region))
+		for (const rom_entry *region = rom_first_region(device); region != nullptr; region = rom_next_region(region))
 		{
 // temporary hack: add the driver path & region name
-std::string combinedpath = std::string(device->searchpath()).append(";").append(driverpath);
-if (device->shortname())
-	combinedpath.append(";").append(device->shortname());
+std::string combinedpath = std::string(device.searchpath()).append(";").append(driverpath);
+if (device.shortname())
+	combinedpath.append(";").append(device.shortname());
 m_searchpath = combinedpath.c_str();
 
 			for (const rom_entry *rom = rom_first_file(region); rom; rom = rom_next_file(rom))
 			{
 				const char *name = ROM_GETNAME(rom);
 				hash_collection hashes(ROM_GETHASHDATA(rom));
-				device_t *shared_device = find_shared_device(*device, name, hashes, ROM_GETLENGTH(rom));
+				device_t *shared_device = find_shared_device(device, name, hashes, ROM_GETLENGTH(rom));
 
 				// count the number of files with hashes
 				if (!hashes.flag(hash_collection::FLAG_NO_DUMP) && !ROM_ISOPTIONAL(rom))
@@ -95,7 +94,7 @@ m_searchpath = combinedpath.c_str();
 				if (record != nullptr)
 				{
 					// count the number of files that are found.
-					if (record->status() == audit_record::STATUS_GOOD || (record->status() == audit_record::STATUS_FOUND_INVALID && find_shared_device(*device, name, record->actual_hashes(), record->actual_length()) == nullptr))
+					if (record->status() == audit_record::STATUS_GOOD || (record->status() == audit_record::STATUS_FOUND_INVALID && find_shared_device(device, name, record->actual_hashes(), record->actual_length()) == nullptr))
 					{
 						found++;
 						if (shared_device != nullptr)
@@ -124,20 +123,20 @@ m_searchpath = combinedpath.c_str();
 //  audit_device - audit the device
 //-------------------------------------------------
 
-media_auditor::summary media_auditor::audit_device(device_t *device, const char *validation)
+media_auditor::summary media_auditor::audit_device(device_t &device, const char *validation)
 {
 	// start fresh
 	m_record_list.reset();
 
 	// store validation for later
 	m_validation = validation;
-	m_searchpath = device->shortname();
+	m_searchpath = device.shortname();
 
 	int found = 0;
 	int required = 0;
 
 	// now iterate over regions and ROMs within
-	for (const rom_entry *region = rom_first_region(*device); region != nullptr; region = rom_next_region(region))
+	for (const rom_entry *region = rom_first_region(device); region != nullptr; region = rom_next_region(region))
 	{
 		for (const rom_entry *rom = rom_first_file(region); rom; rom = rom_next_file(rom))
 		{
@@ -173,7 +172,7 @@ media_auditor::summary media_auditor::audit_device(device_t *device, const char
 	}
 
 	// return a summary
-	return summarize(device->shortname());
+	return summarize(device.shortname());
 }
 
 
@@ -270,14 +269,13 @@ media_auditor::summary media_auditor::audit_samples()
 	int found = 0;
 
 	// iterate over sample entries
-	samples_device_iterator iterator(m_enumerator.config().root_device());
-	for (samples_device *device = iterator.first(); device != nullptr; device = iterator.next())
+	for (samples_device &device : samples_device_iterator(m_enumerator.config().root_device()))
 	{
 		// by default we just search using the driver name
 		std::string searchpath(m_enumerator.driver().name);
 
 		// add the alternate path if present
-		samples_iterator iter(*device);
+		samples_iterator iter(device);
 		if (iter.altbasename() != nullptr)
 			searchpath.append(";").append(iter.altbasename());
 
@@ -560,15 +558,14 @@ device_t *media_auditor::find_shared_device(device_t &device, const char *name,
 		// iterate up the parent chain
 		for (int drvindex = m_enumerator.find(m_enumerator.driver().parent); drvindex != -1; drvindex = m_enumerator.find(m_enumerator.driver(drvindex).parent))
 		{
-			device_iterator deviter(m_enumerator.config(drvindex).root_device());
-			for (device_t *scandevice = deviter.first(); scandevice != nullptr; scandevice = deviter.next())
-				for (const rom_entry *region = rom_first_region(*scandevice); region; region = rom_next_region(region))
+			for (device_t &scandevice : device_iterator(m_enumerator.config(drvindex).root_device()))
+				for (const rom_entry *region = rom_first_region(scandevice); region; region = rom_next_region(region))
 					for (const rom_entry *rom = rom_first_file(region); rom; rom = rom_next_file(rom))
 						if (ROM_GETLENGTH(rom) == romlength)
 						{
 							hash_collection hashes(ROM_GETHASHDATA(rom));
 							if ((dumped && hashes == romhashes) || (!dumped && ROM_GETNAME(rom) == name))
-								highest_device = scandevice;
+								highest_device = &scandevice;
 						}
 		}
 	}
diff --git a/src/emu/audit.h b/src/emu/audit.h
index ed9e3a3fade..83421f8cc6e 100644
--- a/src/emu/audit.h
+++ b/src/emu/audit.h
@@ -145,7 +145,7 @@ public:
 
 	// audit operations
 	summary audit_media(const char *validation = AUDIT_VALIDATE_FULL);
-	summary audit_device(device_t *device, const char *validation = AUDIT_VALIDATE_FULL);
+	summary audit_device(device_t &device, const char *validation = AUDIT_VALIDATE_FULL);
 	summary audit_software(const char *list_name, software_info *swinfo, const char *validation = AUDIT_VALIDATE_FULL);
 	summary audit_samples();
 	summary summarize(const char *name,std::string *output = nullptr);
diff --git a/src/emu/cheat.cpp b/src/emu/cheat.cpp
index fbd2b7f1479..37e33414154 100644
--- a/src/emu/cheat.cpp
+++ b/src/emu/cheat.cpp
@@ -1141,22 +1141,21 @@ void cheat_manager::reload()
 
 	// load the cheat file, if it's a system that has a software list then try softlist_name/shortname.xml first,
 	// if it fails to load then try to load via crc32 - basename/crc32.xml ( eg. 01234567.xml )
-	image_interface_iterator iter(machine().root_device());
-	for (device_image_interface *image = iter.first(); image != nullptr; image = iter.next())
-		if (image->exists())
+	for (device_image_interface &image : image_interface_iterator(machine().root_device()))
+		if (image.exists())
 		{
 			// if we are loading through a software list, try to load softlist_name/shortname.xml
 			// this allows the coexistence of arcade cheats with cheats for home conversions which
 			// have the same shortname
-			if (image->software_entry() != nullptr)
+			if (image.software_entry() != nullptr)
 			{
-				load_cheats(string_format("%s%s%s", image->software_list_name(), PATH_SEPARATOR, image->basename()).c_str());
+				load_cheats(string_format("%s%s%s", image.software_list_name(), PATH_SEPARATOR, image.basename()).c_str());
 				break;
 			}
 			// else we are loading outside the software list, try to load machine_basename/crc32.xml
 			else
 			{
-				UINT32 crc = image->crc();
+				UINT32 crc = image.crc();
 				if (crc != 0)
 				{
 					load_cheats(string_format("%s%s%08X", machine().basename(), PATH_SEPARATOR, crc).c_str());
diff --git a/src/emu/clifront.cpp b/src/emu/clifront.cpp
index 4da5f4ec7f5..20fff1557b4 100644
--- a/src/emu/clifront.cpp
+++ b/src/emu/clifront.cpp
@@ -123,37 +123,36 @@ int cli_frontend::execute(int argc, char **argv)
 				throw emu_fatalerror(MAMERR_FATALERROR, "Error: unknown option: %s\n", m_options.software_name());
 
 			bool found = false;
-			for (software_list_device *swlistdev = iter.first(); swlistdev != nullptr; swlistdev = iter.next())
+			for (software_list_device &swlistdev : iter)
 			{
-				software_info *swinfo = swlistdev->find(m_options.software_name());
+				software_info *swinfo = swlistdev.find(m_options.software_name());
 				if (swinfo != nullptr)
 				{
 					// loop through all parts
 					for (software_part &swpart : swinfo->parts())
 					{
 						const char *mount = swpart.feature("automount");
-						if (swpart.is_compatible(*swlistdev))
+						if (swpart.is_compatible(swlistdev))
 						{
 							if (mount == nullptr || strcmp(mount,"no") != 0)
 							{
 								// search for an image device with the right interface
-								image_interface_iterator imgiter(config.root_device());
-								for (device_image_interface *image = imgiter.first(); image != nullptr; image = imgiter.next())
+								for (device_image_interface &image : image_interface_iterator(config.root_device()))
 								{
-									const char *interface = image->image_interface();
+									const char *interface = image.image_interface();
 									if (interface != nullptr)
 									{
 										if (swpart.matches_interface(interface))
 										{
-											const char *option = m_options.value(image->brief_instance_name());
+											const char *option = m_options.value(image.brief_instance_name());
 
 											// mount only if not already mounted
 											if (*option == 0)
 											{
-												std::string val = string_format("%s:%s:%s", swlistdev->list_name(), m_options.software_name(), swpart.name());
+												std::string val = string_format("%s:%s:%s", swlistdev.list_name(), m_options.software_name(), swpart.name());
 
 												// call this in order to set slot devices according to mounting
-												m_options.parse_slot_devices(argc, argv, option_errors, image->instance_name(), val.c_str(), &swpart);
+												m_options.parse_slot_devices(argc, argv, option_errors, image.instance_name(), val.c_str(), &swpart);
 												break;
 											}
 										}
@@ -434,15 +433,14 @@ void cli_frontend::listcrc(const char *gamename)
 	// iterate through matches, and then through ROMs
 	while (drivlist.next())
 	{
-		device_iterator deviter(drivlist.config().root_device());
-		for (device_t *device = deviter.first(); device != nullptr; device = deviter.next())
-			for (const rom_entry *region = rom_first_region(*device); region; region = rom_next_region(region))
+		for (device_t &device : device_iterator(drivlist.config().root_device()))
+			for (const rom_entry *region = rom_first_region(device); region; region = rom_next_region(region))
 				for (const rom_entry *rom = rom_first_file(region); rom; rom = rom_next_file(rom))
 				{
 					// if we have a CRC, display it
 					UINT32 crc;
 					if (hash_collection(ROM_GETHASHDATA(rom)).crc(crc))
-						osd_printf_info("%08x %-16s \t %-8s \t %s\n", crc, ROM_GETNAME(rom), device->shortname(), device->name());
+						osd_printf_info("%08x %-16s \t %-8s \t %s\n", crc, ROM_GETNAME(rom), device.shortname(), device.name());
 				}
 	}
 }
@@ -472,9 +470,8 @@ void cli_frontend::listroms(const char *gamename)
 				"Name                    Size Checksum\n", drivlist.driver().name);
 
 		// iterate through roms
-		device_iterator deviter(drivlist.config().root_device());
-		for (device_t *device = deviter.first(); device != nullptr; device = deviter.next())
-			for (const rom_entry *region = rom_first_region(*device); region; region = rom_next_region(region))
+		for (device_t &device : device_iterator(drivlist.config().root_device()))
+			for (const rom_entry *region = rom_first_region(device); region; region = rom_next_region(region))
 				for (const rom_entry *rom = rom_first_file(region); rom; rom = rom_next_file(rom))
 				{
 					// accumulate the total length of all chunks
@@ -538,9 +535,9 @@ void cli_frontend::listsamples(const char *gamename)
 		osd_printf_info("Samples required for driver \"%s\".\n", drivlist.driver().name);
 
 		// iterate over samples devices and print the samples from each one
-		for (samples_device *device = iter.first(); device != nullptr; device = iter.next())
+		for (samples_device &device : iter)
 		{
-			samples_iterator sampiter(*device);
+			samples_iterator sampiter(device);
 			for (const char *samplename = sampiter.first(); samplename != nullptr; samplename = sampiter.next())
 				osd_printf_info("%s\n", samplename);
 		}
@@ -578,10 +575,9 @@ void cli_frontend::listdevices(const char *gamename)
 		printf("Driver %s (%s):\n", drivlist.driver().name, drivlist.driver().description);
 
 		// build a list of devices
-		device_iterator iter(drivlist.config().root_device());
 		std::vector<device_t *> device_list;
-		for (device_t *device = iter.first(); device != nullptr; device = iter.next())
-			device_list.push_back(device);
+		for (device_t &device : device_iterator(drivlist.config().root_device()))
+			device_list.push_back(&device);
 
 		// sort them by tag
 		qsort(&device_list[0], device_list.size(), sizeof(device_list[0]), compare_devices);
@@ -649,18 +645,17 @@ void cli_frontend::listslots(const char *gamename)
 	while (drivlist.next())
 	{
 		// iterate
-		slot_interface_iterator iter(drivlist.config().root_device());
 		bool first = true;
-		for (const device_slot_interface *slot = iter.first(); slot != nullptr; slot = iter.next())
+		for (const device_slot_interface &slot : slot_interface_iterator(drivlist.config().root_device()))
 		{
-			if (slot->fixed()) continue;
+			if (slot.fixed()) continue;
 			// output the line, up to the list of extensions
-			printf("%-13s%-10s   ", first ? drivlist.driver().name : "", slot->device().tag()+1);
+			printf("%-13s%-10s   ", first ? drivlist.driver().name : "", slot.device().tag()+1);
 
 			bool first_option = true;
 
 			// get the options and print them
-			for (const device_slot_option &option : slot->option_list())
+			for (const device_slot_option &option : slot.option_list())
 			{
 				if (option.selectable())
 				{
@@ -710,21 +705,20 @@ void cli_frontend::listmedia(const char *gamename)
 	while (drivlist.next())
 	{
 		// iterate
-		image_interface_iterator iter(drivlist.config().root_device());
 		bool first = true;
-		for (const device_image_interface *imagedev = iter.first(); imagedev != nullptr; imagedev = iter.next())
+		for (const device_image_interface &imagedev : image_interface_iterator(drivlist.config().root_device()))
 		{
-            if (!imagedev->user_loadable())
-                continue;
-            
+			if (!imagedev.user_loadable())
+				continue;
+
 			// extract the shortname with parentheses
-			std::string paren_shortname = string_format("(%s)", imagedev->brief_instance_name());
+			std::string paren_shortname = string_format("(%s)", imagedev.brief_instance_name());
 
 			// output the line, up to the list of extensions
-			printf("%-13s%-12s%-8s   ", first ? drivlist.driver().name : "", imagedev->instance_name(), paren_shortname.c_str());
+			printf("%-13s%-12s%-8s   ", first ? drivlist.driver().name : "", imagedev.instance_name(), paren_shortname.c_str());
 
 			// get the extensions and print them
-			std::string extensions(imagedev->file_extensions());
+			std::string extensions(imagedev.file_extensions());
 			for (int start = 0, end = extensions.find_first_of(',');; start = end + 1, end = extensions.find_first_of(',', start))
 			{
 				std::string curext(extensions, start, (end == -1) ? extensions.length() - start : end - start);
@@ -817,11 +811,10 @@ void cli_frontend::verifyroms(const char *gamename)
 		while (dummy_drivlist.next())
 		{
 			machine_config &config = dummy_drivlist.config();
-			device_iterator iter(config.root_device());
-			for (device_t *dev = iter.first(); dev != nullptr; dev = iter.next())
+			for (device_t &dev : device_iterator(config.root_device()))
 			{
-				if (dev->owner() != nullptr && (*(dev->shortname()) != 0) && dev->rom_region() != nullptr && (device_map.insert(dev->shortname()).second)) {
-					if (core_strwildcmp(gamename, dev->shortname()) == 0)
+				if (dev.owner() != nullptr && (*(dev.shortname()) != 0) && dev.rom_region() != nullptr && (device_map.insert(dev.shortname()).second)) {
+					if (core_strwildcmp(gamename, dev.shortname()) == 0)
 					{
 						matched++;
 
@@ -836,11 +829,11 @@ void cli_frontend::verifyroms(const char *gamename)
 						{
 							// output the summary of the audit
 							std::string summary_string;
-							auditor.summarize(dev->shortname(),&summary_string);
+							auditor.summarize(dev.shortname(),&summary_string);
 							osd_printf_info("%s", summary_string.c_str());
 
 							// display information about what we discovered
-							osd_printf_info("romset %s ", dev->shortname());
+							osd_printf_info("romset %s ", dev.shortname());
 
 							// switch off of the result
 							switch (summary)
@@ -868,20 +861,18 @@ void cli_frontend::verifyroms(const char *gamename)
 				}
 			}
 
-			slot_interface_iterator slotiter(config.root_device());
-			for (const device_slot_interface *slot = slotiter.first(); slot != nullptr; slot = slotiter.next())
+			for (const device_slot_interface &slot : slot_interface_iterator(config.root_device()))
 			{
-				for (const device_slot_option &option : slot->option_list())
+				for (const device_slot_option &option : slot.option_list())
 				{
 					std::string temptag("_");
 					temptag.append(option.name());
 					device_t *dev = const_cast<machine_config &>(config).device_add(&config.root_device(), temptag.c_str(), option.devtype(), 0);
 
 					// notify this device and all its subdevices that they are now configured
-					device_iterator subiter(*dev);
-					for (device_t *device = subiter.first(); device != nullptr; device = subiter.next())
-						if (!device->configured())
-							device->config_complete();
+					for (device_t &device : device_iterator(*dev))
+						if (!device.configured())
+							device.config_complete();
 
 					if (device_map.insert(dev->shortname()).second) {
 						if (core_strwildcmp(gamename, dev->shortname()) == 0)
@@ -890,7 +881,7 @@ void cli_frontend::verifyroms(const char *gamename)
 							if (dev->rom_region() != nullptr)
 							{
 								// audit the ROMs in this set
-								media_auditor::summary summary = auditor.audit_device(dev, AUDIT_VALIDATE_FAST);
+								media_auditor::summary summary = auditor.audit_device(*dev, AUDIT_VALIDATE_FAST);
 
 								// if not found, count that and leave it at that
 								if (summary == media_auditor::NOTFOUND)
@@ -933,17 +924,15 @@ void cli_frontend::verifyroms(const char *gamename)
 						}
 					} else {
 						// check for subdevices with ROMs (a few devices are missed otherwise, e.g. MPU401)
-						device_iterator subiter(*dev);
-						for (device_t *device = subiter.first(); device != nullptr; device = subiter.next())
+						for (device_t &device : device_iterator(*dev))
 						{
-							device_iterator subsubiter(*device);
-							for (device_t *subdev = subsubiter.first(); subdev != nullptr; subdev = subsubiter.next())
+							for (device_t &subdev : device_iterator(device))
 							{
-								if (subdev->owner() == device && subdev->rom_region() != nullptr && subdev->shortname() != nullptr && subdev->shortname()[0] != '\0')
+								if (subdev.owner() == &device && subdev.rom_region() != nullptr && subdev.shortname() != nullptr && subdev.shortname()[0] != '\0')
 								{
-									if (device_map.insert(subdev->shortname()).second)
+									if (device_map.insert(subdev.shortname()).second)
 									{
-										if (core_strwildcmp(gamename, subdev->shortname()) == 0)
+										if (core_strwildcmp(gamename, subdev.shortname()) == 0)
 										{
 											matched++;
 
@@ -959,11 +948,11 @@ void cli_frontend::verifyroms(const char *gamename)
 											{
 												// output the summary of the audit
 												std::string summary_string;
-												auditor.summarize(subdev->shortname(),&summary_string);
+												auditor.summarize(subdev.shortname(),&summary_string);
 												osd_printf_info("%s", summary_string.c_str());
 
 												// display information about what we discovered
-												osd_printf_info("romset %s ", subdev->shortname());
+												osd_printf_info("romset %s ", subdev.shortname());
 
 												// switch off of the result
 												switch (summary)
@@ -1311,13 +1300,12 @@ void cli_frontend::listsoftware(const char *gamename)
 
 	while (drivlist.next())
 	{
-		software_list_device_iterator iter(drivlist.config().root_device());
-		for (software_list_device *swlistdev = iter.first(); swlistdev != nullptr; swlistdev = iter.next())
-			if (list_map.insert(swlistdev->list_name()).second)
-				if (!swlistdev->get_info().empty())
+		for (software_list_device &swlistdev : software_list_device_iterator(drivlist.config().root_device()))
+			if (list_map.insert(swlistdev.list_name()).second)
+				if (!swlistdev.get_info().empty())
 				{
 					if (isfirst) { fprintf(out, SOFTLIST_XML_BEGIN); isfirst = false; }
-					output_single_softlist(out, *swlistdev);
+					output_single_softlist(out, swlistdev);
 				}
 	}
 
@@ -1354,16 +1342,15 @@ void cli_frontend::verifysoftware(const char *gamename)
 	{
 		matched++;
 
-		software_list_device_iterator iter(drivlist.config().root_device());
-		for (software_list_device *swlistdev = iter.first(); swlistdev != nullptr; swlistdev = iter.next())
-			if (swlistdev->list_type() == SOFTWARE_LIST_ORIGINAL_SYSTEM)
-				if (list_map.insert(swlistdev->list_name()).second)
-					if (!swlistdev->get_info().empty())
+		for (software_list_device &swlistdev : software_list_device_iterator(drivlist.config().root_device()))
+			if (swlistdev.list_type() == SOFTWARE_LIST_ORIGINAL_SYSTEM)
+				if (list_map.insert(swlistdev.list_name()).second)
+					if (!swlistdev.get_info().empty())
 					{
 						nrlists++;
-						for (software_info &swinfo : swlistdev->get_info())
+						for (software_info &swinfo : swlistdev.get_info())
 						{
-							media_auditor::summary summary = auditor.audit_software(swlistdev->list_name(), &swinfo, AUDIT_VALIDATE_FAST);
+							media_auditor::summary summary = auditor.audit_software(swlistdev.list_name(), &swinfo, AUDIT_VALIDATE_FAST);
 
 							// if not found, count that and leave it at that
 							if (summary == media_auditor::NOTFOUND)
@@ -1379,7 +1366,7 @@ void cli_frontend::verifysoftware(const char *gamename)
 								osd_printf_info("%s", summary_string.c_str());
 
 								// display information about what we discovered
-								osd_printf_info("romset %s:%s ", swlistdev->list_name(), swinfo.shortname());
+								osd_printf_info("romset %s:%s ", swlistdev.list_name(), swinfo.shortname());
 
 								// switch off of the result
 								switch (summary)
@@ -1442,13 +1429,12 @@ void cli_frontend::getsoftlist(const char *gamename)
 	driver_enumerator drivlist(m_options);
 	while (drivlist.next())
 	{
-		software_list_device_iterator iter(drivlist.config().root_device());
-		for (software_list_device *swlistdev = iter.first(); swlistdev != nullptr; swlistdev = iter.next())
-			if (core_strwildcmp(gamename, swlistdev->list_name()) == 0 && list_map.insert(swlistdev->list_name()).second)
-				if (!swlistdev->get_info().empty())
+		for (software_list_device &swlistdev : software_list_device_iterator(drivlist.config().root_device()))
+			if (core_strwildcmp(gamename, swlistdev.list_name()) == 0 && list_map.insert(swlistdev.list_name()).second)
+				if (!swlistdev.get_info().empty())
 				{
 					if (isfirst) { fprintf( out, SOFTLIST_XML_BEGIN); isfirst = FALSE; }
-					output_single_softlist(out, *swlistdev);
+					output_single_softlist(out, swlistdev);
 				}
 	}
 
@@ -1475,17 +1461,16 @@ void cli_frontend::verifysoftlist(const char *gamename)
 
 	while (drivlist.next())
 	{
-		software_list_device_iterator iter(drivlist.config().root_device());
-		for (software_list_device *swlistdev = iter.first(); swlistdev != nullptr; swlistdev = iter.next())
-			if (core_strwildcmp(gamename, swlistdev->list_name()) == 0 && list_map.insert(swlistdev->list_name()).second)
-				if (!swlistdev->get_info().empty())
+		for (software_list_device &swlistdev : software_list_device_iterator(drivlist.config().root_device()))
+			if (core_strwildcmp(gamename, swlistdev.list_name()) == 0 && list_map.insert(swlistdev.list_name()).second)
+				if (!swlistdev.get_info().empty())
 				{
 					matched++;
 
 					// Get the actual software list contents
-					for (software_info &swinfo : swlistdev->get_info())
+					for (software_info &swinfo : swlistdev.get_info())
 					{
-						media_auditor::summary summary = auditor.audit_software(swlistdev->list_name(), &swinfo, AUDIT_VALIDATE_FAST);
+						media_auditor::summary summary = auditor.audit_software(swlistdev.list_name(), &swinfo, AUDIT_VALIDATE_FAST);
 
 						// if not found, count that and leave it at that
 						if (summary == media_auditor::NOTFOUND)
@@ -1501,7 +1486,7 @@ void cli_frontend::verifysoftlist(const char *gamename)
 							osd_printf_info("%s", summary_string.c_str());
 
 							// display information about what we discovered
-							osd_printf_info("romset %s:%s ", swlistdev->list_name(), swinfo.shortname());
+							osd_printf_info("romset %s:%s ", swlistdev.list_name(), swinfo.shortname());
 
 							// switch off of the result
 							switch (summary)
@@ -1937,13 +1922,12 @@ int media_identifier::find_by_hash(const hash_collection &hashes, int length)
 	m_drivlist.reset();
 	while (m_drivlist.next())
 	{
-		// iterate over devices, regions and files within the region */
-		device_iterator deviter(m_drivlist.config().root_device());
-		for (device_t *device = deviter.first(); device != nullptr; device = deviter.next())
+		// iterate over devices, regions and files within the region
+		for (device_t &device : device_iterator(m_drivlist.config().root_device()))
 		{
-			if (shortnames.insert(device->shortname()).second)
+			if (shortnames.insert(device.shortname()).second)
 			{
-				for (const rom_entry *region = rom_first_region(*device); region != nullptr; region = rom_next_region(region))
+				for (const rom_entry *region = rom_first_region(device); region != nullptr; region = rom_next_region(region))
 					for (const rom_entry *rom = rom_first_file(region); rom != nullptr; rom = rom_next_file(rom))
 					{
 						hash_collection romhashes(ROM_GETHASHDATA(rom));
@@ -1962,12 +1946,11 @@ int media_identifier::find_by_hash(const hash_collection &hashes, int length)
 		}
 
 		// next iterate over softlists
-		software_list_device_iterator iter(m_drivlist.config().root_device());
-		for (software_list_device *swlistdev = iter.first(); swlistdev != nullptr; swlistdev = iter.next())
+		for (software_list_device &swlistdev : software_list_device_iterator(m_drivlist.config().root_device()))
 		{
-			if (listnames.insert(swlistdev->list_name()).second)
+			if (listnames.insert(swlistdev.list_name()).second)
 			{
-				for (software_info &swinfo : swlistdev->get_info())
+				for (software_info &swinfo : swlistdev.get_info())
 					for (software_part &part : swinfo.parts())
 						for (const rom_entry *region = part.romdata(); region != nullptr; region = rom_next_region(region))
 							for (const rom_entry *rom = rom_first_file(region); rom != nullptr; rom = rom_next_file(rom))
@@ -1980,7 +1963,7 @@ int media_identifier::find_by_hash(const hash_collection &hashes, int length)
 									// output information about the match
 									if (found)
 										osd_printf_info("                    ");
-									osd_printf_info("= %s%-20s  %s:%s %s\n", baddump ? "(BAD) " : "", ROM_GETNAME(rom), swlistdev->list_name(), swinfo.shortname(), swinfo.longname());
+									osd_printf_info("= %s%-20s  %s:%s %s\n", baddump ? "(BAD) " : "", ROM_GETNAME(rom), swlistdev.list_name(), swinfo.shortname(), swinfo.longname());
 									found++;
 								}
 							}
diff --git a/src/emu/debug/debugcmd.cpp b/src/emu/debug/debugcmd.cpp
index 5fb1743004a..084eacfc66f 100644
--- a/src/emu/debug/debugcmd.cpp
+++ b/src/emu/debug/debugcmd.cpp
@@ -569,19 +569,15 @@ int debug_command_parameter_cpu(running_machine &machine, const char *param, dev
 	}
 
 	/* if we got a valid one, return */
-	const UINT64 original_cpunum = cpunum;
-	execute_interface_iterator iter(machine.root_device());
-	for (device_execute_interface *exec = iter.first(); exec != nullptr; exec = iter.next())
+	device_execute_interface *exec = execute_interface_iterator(machine.root_device()).byindex(cpunum);
+	if (exec != nullptr)
 	{
-		if (cpunum-- == 0)
-		{
-			*result = &exec->device();
-			return TRUE;
-		}
+		*result = &exec->device();
+		return TRUE;
 	}
 
 	/* if out of range, complain */
-	debug_console_printf(machine, "Invalid CPU index %d\n", (UINT32)original_cpunum);
+	debug_console_printf(machine, "Invalid CPU index %d\n", (int)cpunum);
 	return FALSE;
 }
 
@@ -1009,10 +1005,9 @@ static void execute_focus(running_machine &machine, int ref, int params, const c
 	cpu->debug()->ignore(false);
 
 	/* then loop over CPUs and set the ignore flags on all other CPUs */
-	execute_interface_iterator iter(machine.root_device());
-	for (device_execute_interface *exec = iter.first(); exec != nullptr; exec = iter.next())
-		if (&exec->device() != cpu)
-			exec->device().debug()->ignore(true);
+	for (device_execute_interface &exec : execute_interface_iterator(machine.root_device()))
+		if (&exec.device() != cpu)
+			exec.device().debug()->ignore(true);
 	debug_console_printf(machine, "Now focused on CPU '%s'\n", cpu->tag());
 }
 
@@ -1029,16 +1024,15 @@ static void execute_ignore(running_machine &machine, int ref, int params, const
 		std::string buffer;
 
 		/* loop over all executable devices */
-		execute_interface_iterator iter(machine.root_device());
-		for (device_execute_interface *exec = iter.first(); exec != nullptr; exec = iter.next())
+		for (device_execute_interface &exec : execute_interface_iterator(machine.root_device()))
 
 			/* build up a comma-separated list */
-			if (!exec->device().debug()->observing())
+			if (!exec.device().debug()->observing())
 			{
 				if (buffer.empty())
-					buffer = string_format("Currently ignoring device '%s'", exec->device().tag());
+					buffer = string_format("Currently ignoring device '%s'", exec.device().tag());
 				else
-					buffer.append(string_format(", '%s'", exec->device().tag()));
+					buffer.append(string_format(", '%s'", exec.device().tag()));
 			}
 
 		/* special message for none */
@@ -1061,10 +1055,9 @@ static void execute_ignore(running_machine &machine, int ref, int params, const
 		for (int paramnum = 0; paramnum < params; paramnum++)
 		{
 			/* make sure this isn't the last live CPU */
-			execute_interface_iterator iter(machine.root_device());
 			bool gotone = false;
-			for (device_execute_interface *exec = iter.first(); exec != nullptr; exec = iter.next())
-				if (&exec->device() != devicelist[paramnum] && exec->device().debug()->observing())
+			for (device_execute_interface &exec : execute_interface_iterator(machine.root_device()))
+				if (&exec.device() != devicelist[paramnum] && exec.device().debug()->observing())
 				{
 					gotone = true;
 					break;
@@ -1094,16 +1087,15 @@ static void execute_observe(running_machine &machine, int ref, int params, const
 		std::string buffer;
 
 		/* loop over all executable devices */
-		execute_interface_iterator iter(machine.root_device());
-		for (device_execute_interface *exec = iter.first(); exec != nullptr; exec = iter.next())
+		for (device_execute_interface &exec : execute_interface_iterator(machine.root_device()))
 
 			/* build up a comma-separated list */
-			if (exec->device().debug()->observing())
+			if (exec.device().debug()->observing())
 			{
 				if (buffer.empty())
-					buffer = string_format("Currently observing CPU '%s'", exec->device().tag());
+					buffer = string_format("Currently observing CPU '%s'", exec.device().tag());
 				else
-					buffer.append(string_format(", '%s'", exec->device().tag()));
+					buffer.append(string_format(", '%s'", exec.device().tag()));
 			}
 
 		/* special message for none */
@@ -1246,9 +1238,8 @@ static void execute_bpclear(running_machine &machine, int ref, int params, const
 	/* if 0 parameters, clear all */
 	if (params == 0)
 	{
-		device_iterator iter(machine.root_device());
-		for (device_t *device = iter.first(); device != nullptr; device = iter.next())
-			device->debug()->breakpoint_clear_all();
+		for (device_t &device : device_iterator(machine.root_device()))
+			device.debug()->breakpoint_clear_all();
 		debug_console_printf(machine, "Cleared all breakpoints\n");
 	}
 
@@ -1257,10 +1248,9 @@ static void execute_bpclear(running_machine &machine, int ref, int params, const
 		return;
 	else
 	{
-		device_iterator iter(machine.root_device());
 		bool found = false;
-		for (device_t *device = iter.first(); device != nullptr; device = iter.next())
-			if (device->debug()->breakpoint_clear(bpindex))
+		for (device_t &device : device_iterator(machine.root_device()))
+			if (device.debug()->breakpoint_clear(bpindex))
 				found = true;
 		if (found)
 			debug_console_printf(machine, "Breakpoint %X cleared\n", (UINT32)bpindex);
@@ -1282,9 +1272,8 @@ static void execute_bpdisenable(running_machine &machine, int ref, int params, c
 	/* if 0 parameters, clear all */
 	if (params == 0)
 	{
-		device_iterator iter(machine.root_device());
-		for (device_t *device = iter.first(); device != nullptr; device = iter.next())
-			device->debug()->breakpoint_enable_all(ref);
+		for (device_t &device : device_iterator(machine.root_device()))
+			device.debug()->breakpoint_enable_all(ref);
 		if (ref == 0)
 			debug_console_printf(machine, "Disabled all breakpoints\n");
 		else
@@ -1296,10 +1285,9 @@ static void execute_bpdisenable(running_machine &machine, int ref, int params, c
 		return;
 	else
 	{
-		device_iterator iter(machine.root_device());
 		bool found = false;
-		for (device_t *device = iter.first(); device != nullptr; device = iter.next())
-			if (device->debug()->breakpoint_enable(bpindex, ref))
+		for (device_t &device : device_iterator(machine.root_device()))
+			if (device.debug()->breakpoint_enable(bpindex, ref))
 				found = true;
 		if (found)
 			debug_console_printf(machine, "Breakpoint %X %s\n", (UINT32)bpindex, ref ? "enabled" : "disabled");
@@ -1320,16 +1308,15 @@ static void execute_bplist(running_machine &machine, int ref, int params, const
 	std::string buffer;
 
 	/* loop over all CPUs */
-	device_iterator iter(machine.root_device());
-	for (device_t *device = iter.first(); device != nullptr; device = iter.next())
-		if (device->debug()->breakpoint_first() != nullptr)
+	for (device_t &device : device_iterator(machine.root_device()))
+		if (device.debug()->breakpoint_first() != nullptr)
 		{
-			debug_console_printf(machine, "Device '%s' breakpoints:\n", device->tag());
+			debug_console_printf(machine, "Device '%s' breakpoints:\n", device.tag());
 
 			/* loop over the breakpoints */
-			for (device_debug::breakpoint *bp = device->debug()->breakpoint_first(); bp != nullptr; bp = bp->next())
+			for (device_debug::breakpoint *bp = device.debug()->breakpoint_first(); bp != nullptr; bp = bp->next())
 			{
-				buffer = string_format("%c%4X @ %0*X", bp->enabled() ? ' ' : 'D', bp->index(), device->debug()->logaddrchars(), bp->address());
+				buffer = string_format("%c%4X @ %0*X", bp->enabled() ? ' ' : 'D', bp->index(), device.debug()->logaddrchars(), bp->address());
 				if (std::string(bp->condition()).compare("1") != 0)
 					buffer.append(string_format(" if %s", bp->condition()));
 				if (std::string(bp->action()).compare("") != 0)
@@ -1409,9 +1396,8 @@ static void execute_wpclear(running_machine &machine, int ref, int params, const
 	/* if 0 parameters, clear all */
 	if (params == 0)
 	{
-		device_iterator iter(machine.root_device());
-		for (device_t *device = iter.first(); device != nullptr; device = iter.next())
-			device->debug()->watchpoint_clear_all();
+		for (device_t &device : device_iterator(machine.root_device()))
+			device.debug()->watchpoint_clear_all();
 		debug_console_printf(machine, "Cleared all watchpoints\n");
 	}
 
@@ -1420,10 +1406,9 @@ static void execute_wpclear(running_machine &machine, int ref, int params, const
 		return;
 	else
 	{
-		device_iterator iter(machine.root_device());
 		bool found = false;
-		for (device_t *device = iter.first(); device != nullptr; device = iter.next())
-			if (device->debug()->watchpoint_clear(wpindex))
+		for (device_t &device : device_iterator(machine.root_device()))
+			if (device.debug()->watchpoint_clear(wpindex))
 				found = true;
 		if (found)
 			debug_console_printf(machine, "Watchpoint %X cleared\n", (UINT32)wpindex);
@@ -1445,9 +1430,8 @@ static void execute_wpdisenable(running_machine &machine, int ref, int params, c
 	/* if 0 parameters, clear all */
 	if (params == 0)
 	{
-		device_iterator iter(machine.root_device());
-		for (device_t *device = iter.first(); device != nullptr; device = iter.next())
-			device->debug()->watchpoint_enable_all(ref);
+		for (device_t &device : device_iterator(machine.root_device()))
+			device.debug()->watchpoint_enable_all(ref);
 		if (ref == 0)
 			debug_console_printf(machine, "Disabled all watchpoints\n");
 		else
@@ -1459,10 +1443,9 @@ static void execute_wpdisenable(running_machine &machine, int ref, int params, c
 		return;
 	else
 	{
-		device_iterator iter(machine.root_device());
 		bool found = false;
-		for (device_t *device = iter.first(); device != nullptr; device = iter.next())
-			if (device->debug()->watchpoint_enable(wpindex, ref))
+		for (device_t &device : device_iterator(machine.root_device()))
+			if (device.debug()->watchpoint_enable(wpindex, ref))
 				found = true;
 		if (found)
 			debug_console_printf(machine, "Watchpoint %X %s\n", (UINT32)wpindex, ref ? "enabled" : "disabled");
@@ -1483,18 +1466,17 @@ static void execute_wplist(running_machine &machine, int ref, int params, const
 	std::string buffer;
 
 	/* loop over all CPUs */
-	device_iterator iter(machine.root_device());
-	for (device_t *device = iter.first(); device != nullptr; device = iter.next())
+	for (device_t &device : device_iterator(machine.root_device()))
 		for (address_spacenum spacenum = AS_0; spacenum < ADDRESS_SPACES; ++spacenum)
-			if (device->debug()->watchpoint_first(spacenum) != nullptr)
+			if (device.debug()->watchpoint_first(spacenum) != nullptr)
 			{
 				static const char *const types[] = { "unkn ", "read ", "write", "r/w  " };
 
-				debug_console_printf(machine, "Device '%s' %s space watchpoints:\n", device->tag(),
-																						device->debug()->watchpoint_first(spacenum)->space().name());
+				debug_console_printf(machine, "Device '%s' %s space watchpoints:\n", device.tag(),
+																						device.debug()->watchpoint_first(spacenum)->space().name());
 
 				/* loop over the watchpoints */
-				for (device_debug::watchpoint *wp = device->debug()->watchpoint_first(spacenum); wp != nullptr; wp = wp->next())
+				for (device_debug::watchpoint *wp = device.debug()->watchpoint_first(spacenum); wp != nullptr; wp = wp->next())
 				{
 					buffer = string_format("%c%4X @ %0*X-%0*X %s", wp->enabled() ? ' ' : 'D', wp->index(),
 							wp->space().addrchars(), wp->space().byte_to_address(wp->address()),
@@ -1556,9 +1538,8 @@ static void execute_rpclear(running_machine &machine, int ref, int params, const
 	/* if 0 parameters, clear all */
 	if (params == 0)
 	{
-		device_iterator iter(machine.root_device());
-		for (device_t *device = iter.first(); device != nullptr; device = iter.next())
-			device->debug()->registerpoint_clear_all();
+		for (device_t &device : device_iterator(machine.root_device()))
+			device.debug()->registerpoint_clear_all();
 		debug_console_printf(machine, "Cleared all registerpoints\n");
 	}
 
@@ -1567,10 +1548,9 @@ static void execute_rpclear(running_machine &machine, int ref, int params, const
 		return;
 	else
 	{
-		device_iterator iter(machine.root_device());
 		bool found = false;
-		for (device_t *device = iter.first(); device != nullptr; device = iter.next())
-			if (device->debug()->registerpoint_clear(rpindex))
+		for (device_t &device : device_iterator(machine.root_device()))
+			if (device.debug()->registerpoint_clear(rpindex))
 				found = true;
 		if (found)
 			debug_console_printf(machine, "Registerpoint %X cleared\n", (UINT32)rpindex);
@@ -1592,9 +1572,8 @@ static void execute_rpdisenable(running_machine &machine, int ref, int params, c
 	/* if 0 parameters, clear all */
 	if (params == 0)
 	{
-		device_iterator iter(machine.root_device());
-		for (device_t *device = iter.first(); device != nullptr; device = iter.next())
-			device->debug()->registerpoint_enable_all(ref);
+		for (device_t &device : device_iterator(machine.root_device()))
+			device.debug()->registerpoint_enable_all(ref);
 		if (ref == 0)
 			debug_console_printf(machine, "Disabled all registerpoints\n");
 		else
@@ -1606,10 +1585,9 @@ static void execute_rpdisenable(running_machine &machine, int ref, int params, c
 		return;
 	else
 	{
-		device_iterator iter(machine.root_device());
 		bool found = false;
-		for (device_t *device = iter.first(); device != nullptr; device = iter.next())
-			if (device->debug()->registerpoint_enable(rpindex, ref))
+		for (device_t &device : device_iterator(machine.root_device()))
+			if (device.debug()->registerpoint_enable(rpindex, ref))
 				found = true;
 		if (found)
 			debug_console_printf(machine, "Registerpoint %X %s\n", (UINT32)rpindex, ref ? "enabled" : "disabled");
@@ -1630,14 +1608,13 @@ static void execute_rplist(running_machine &machine, int ref, int params, const
 	std::string buffer;
 
 	/* loop over all CPUs */
-	device_iterator iter(machine.root_device());
-	for (device_t *device = iter.first(); device != nullptr; device = iter.next())
-		if (device->debug()->registerpoint_first() != nullptr)
+	for (device_t &device : device_iterator(machine.root_device()))
+		if (device.debug()->registerpoint_first() != nullptr)
 		{
-			debug_console_printf(machine, "Device '%s' registerpoints:\n", device->tag());
+			debug_console_printf(machine, "Device '%s' registerpoints:\n", device.tag());
 
 			/* loop over the breakpoints */
-			for (device_debug::registerpoint *rp = device->debug()->registerpoint_first(); rp != nullptr; rp = rp->next())
+			for (device_debug::registerpoint *rp = device.debug()->registerpoint_first(); rp != nullptr; rp = rp->next())
 			{
 				buffer = string_format("%c%4X if %s", rp->enabled() ? ' ' : 'D', rp->index(), rp->condition());
 				if (rp->action() != nullptr)
@@ -1665,12 +1642,11 @@ static void execute_hotspot(running_machine &machine, int ref, int params, const
 		bool cleared = false;
 
 		/* loop over CPUs and find live spots */
-		device_iterator iter(machine.root_device());
-		for (device_t *device = iter.first(); device != nullptr; device = iter.next())
-			if (device->debug()->hotspot_tracking_enabled())
+		for (device_t &device : device_iterator(machine.root_device()))
+			if (device.debug()->hotspot_tracking_enabled())
 			{
-				device->debug()->hotspot_track(0, 0);
-				debug_console_printf(machine, "Cleared hotspot tracking on CPU '%s'\n", device->tag());
+				device.debug()->hotspot_track(0, 0);
+				debug_console_printf(machine, "Cleared hotspot tracking on CPU '%s'\n", device.tag());
 				cleared = true;
 			}
 
@@ -1718,11 +1694,10 @@ static void execute_stateload(running_machine &machine, int ref, int params, con
 	machine.immediate_load(filename.c_str());
 
 	// Clear all PC & memory tracks
-	device_iterator iter(machine.root_device());
-	for (device_t *device = iter.first(); device != nullptr; device = iter.next())
+	for (device_t &device : device_iterator(machine.root_device()))
 	{
-		device->debug()->track_pc_data_clear();
-		device->debug()->track_mem_data_clear();
+		device.debug()->track_pc_data_clear();
+		device.debug()->track_mem_data_clear();
 	}
 	debug_console_printf(machine, "State load attempted.  Please refer to window message popup for results.\n");
 }
@@ -3036,13 +3011,10 @@ static void execute_hardreset(running_machine &machine, int ref, int params, con
 static void execute_images(running_machine &machine, int ref, int params, const char **param)
 {
 	image_interface_iterator iter(machine.root_device());
-	for (device_image_interface *img = iter.first(); img != nullptr; img = iter.next())
-	{
-		debug_console_printf(machine, "%s: %s\n",img->brief_instance_name(),img->exists() ? img->filename() : "[empty slot]");
-	}
-	if (iter.first() == nullptr) {
+	for (device_image_interface &img : iter)
+		debug_console_printf(machine, "%s: %s\n", img.brief_instance_name(), img.exists() ? img.filename() : "[empty slot]");
+	if (iter.first() == nullptr)
 		debug_console_printf(machine, "No image devices in this driver\n");
-	}
 }
 
 /*-------------------------------------------------
@@ -3051,16 +3023,15 @@ static void execute_images(running_machine &machine, int ref, int params, const
 
 static void execute_mount(running_machine &machine, int ref, int params, const char **param)
 {
-	image_interface_iterator iter(machine.root_device());
 	bool done = false;
-	for (device_image_interface *img = iter.first(); img != nullptr; img = iter.next())
+	for (device_image_interface &img : image_interface_iterator(machine.root_device()))
 	{
-		if (strcmp(img->brief_instance_name(),param[0])==0) {
-			if (img->load(param[1])==IMAGE_INIT_FAIL) {
+		if (strcmp(img.brief_instance_name(),param[0]) == 0)
+		{
+			if (img.load(param[1])==IMAGE_INIT_FAIL)
 				debug_console_printf(machine, "Unable to mount file %s on %s\n",param[1],param[0]);
-			} else {
+			else
 				debug_console_printf(machine, "File %s mounted on %s\n",param[1],param[0]);
-			}
 			done = true;
 			break;
 		}
@@ -3075,12 +3046,12 @@ static void execute_mount(running_machine &machine, int ref, int params, const c
 
 static void execute_unmount(running_machine &machine, int ref, int params, const char **param)
 {
-	image_interface_iterator iter(machine.root_device());
 	bool done = false;
-	for (device_image_interface *img = iter.first(); img != nullptr; img = iter.next())
+	for (device_image_interface &img : image_interface_iterator(machine.root_device()))
 	{
-		if (strcmp(img->brief_instance_name(),param[0])==0) {
-			img->unload();
+		if (strcmp(img.brief_instance_name(),param[0]) == 0)
+		{
+			img.unload();
 			debug_console_printf(machine, "Unmounted file from : %s\n",param[0]);
 			done = true;
 			break;
diff --git a/src/emu/debug/debugcpu.cpp b/src/emu/debug/debugcpu.cpp
index 52589dd9f42..3208c21b854 100644
--- a/src/emu/debug/debugcpu.cpp
+++ b/src/emu/debug/debugcpu.cpp
@@ -172,10 +172,9 @@ void debug_cpu_flush_traces(running_machine &machine)
 {
 	/* this can be called on exit even when no debugging is enabled, so
 	 make sure the devdebug is valid before proceeding */
-	device_iterator iter(machine.root_device());
-	for (device_t *device = iter.first(); device != nullptr; device = iter.next())
-		if (device->debug() != nullptr)
-			device->debug()->trace_flush();
+	for (device_t &device : device_iterator(machine.root_device()))
+		if (device.debug() != nullptr)
+			device.debug()->trace_flush();
 }
 
 
@@ -311,19 +310,18 @@ bool debug_comment_save(running_machine &machine)
 		xml_set_attribute(systemnode, "name", machine.system().name);
 
 		// for each device
-		device_iterator iter(machine.root_device());
 		bool found_comments = false;
-		for (device_t *device = iter.first(); device != nullptr; device = iter.next())
-			if (device->debug() && device->debug()->comment_count() > 0)
+		for (device_t &device : device_iterator(machine.root_device()))
+			if (device.debug() && device.debug()->comment_count() > 0)
 			{
 				// create a node for this device
 				xml_data_node *curnode = xml_add_child(systemnode, "cpu", nullptr);
 				if (curnode == nullptr)
 					throw emu_exception();
-				xml_set_attribute(curnode, "tag", device->tag());
+				xml_set_attribute(curnode, "tag", device.tag());
 
 				// export the comments
-				if (!device->debug()->comment_export(*curnode))
+				if (!device.debug()->comment_export(*curnode))
 					throw emu_exception();
 				found_comments = true;
 			}
@@ -1049,9 +1047,8 @@ static void on_vblank(running_machine &machine, screen_device &device, bool vbla
 static void reset_transient_flags(running_machine &machine)
 {
 	/* loop over CPUs and reset the transient flags */
-	device_iterator iter(machine.root_device());
-	for (device_t *device = iter.first(); device != nullptr; device = iter.next())
-		device->debug()->reset_transient_flag();
+	for (device_t &device : device_iterator(machine.root_device()))
+		device.debug()->reset_transient_flag();
 	machine.debugcpu_data->m_stop_when_not_device = nullptr;
 }
 
diff --git a/src/emu/debug/dvbpoints.cpp b/src/emu/debug/dvbpoints.cpp
index 4e3f6f71bae..8e716e32939 100644
--- a/src/emu/debug/dvbpoints.cpp
+++ b/src/emu/debug/dvbpoints.cpp
@@ -132,12 +132,11 @@ void debug_view_breakpoints::enumerate_sources()
 	m_source_list.reset();
 
 	// iterate over devices with disassembly interfaces
-	disasm_interface_iterator iter(machine().root_device());
-	for (device_disasm_interface *dasm = iter.first(); dasm != nullptr; dasm = iter.next())
+	for (device_disasm_interface &dasm : disasm_interface_iterator(machine().root_device()))
 	{
 		std::string name;
-		name = string_format("%s '%s'", dasm->device().name(), dasm->device().tag());
-		m_source_list.append(*global_alloc(debug_view_source(name.c_str(), &dasm->device())));
+		name = string_format("%s '%s'", dasm.device().name(), dasm.device().tag());
+		m_source_list.append(*global_alloc(debug_view_source(name.c_str(), &dasm.device())));
 	}
 
 	// reset the source to a known good entry
diff --git a/src/emu/debug/dvdisasm.cpp b/src/emu/debug/dvdisasm.cpp
index 027e50b6f2a..ffe188b722d 100644
--- a/src/emu/debug/dvdisasm.cpp
+++ b/src/emu/debug/dvdisasm.cpp
@@ -98,13 +98,12 @@ void debug_view_disasm::enumerate_sources()
 	m_source_list.reset();
 
 	// iterate over devices with disassembly interfaces
-	disasm_interface_iterator iter(machine().root_device());
 	std::string name;
-	for (device_disasm_interface *dasm = iter.first(); dasm != nullptr; dasm = iter.next())
+	for (device_disasm_interface &dasm : disasm_interface_iterator(machine().root_device()))
 	{
-		name = string_format("%s '%s'", dasm->device().name(), dasm->device().tag());
-		if (dasm->device().memory().space_config(AS_PROGRAM)!=nullptr)
-			m_source_list.append(*global_alloc(debug_view_disasm_source(name.c_str(), dasm->device())));
+		name = string_format("%s '%s'", dasm.device().name(), dasm.device().tag());
+		if (dasm.device().memory().space_config(AS_PROGRAM)!=nullptr)
+			m_source_list.append(*global_alloc(debug_view_disasm_source(name.c_str(), dasm.device())));
 	}
 
 	// reset the source to a known good entry
diff --git a/src/emu/debug/dvmemory.cpp b/src/emu/debug/dvmemory.cpp
index 8efaa22ef9a..0724f9fa27d 100644
--- a/src/emu/debug/dvmemory.cpp
+++ b/src/emu/debug/dvmemory.cpp
@@ -135,14 +135,13 @@ void debug_view_memory::enumerate_sources()
 	std::string name;
 
 	// first add all the devices' address spaces
-	memory_interface_iterator iter(machine().root_device());
-	for (device_memory_interface *memintf = iter.first(); memintf != nullptr; memintf = iter.next())
-		if (&memintf->device() != &machine().root_device())
+	for (device_memory_interface &memintf : memory_interface_iterator(machine().root_device()))
+		if (&memintf.device() != &machine().root_device())
 			for (address_spacenum spacenum = AS_0; spacenum < ADDRESS_SPACES; ++spacenum)
-				if (memintf->has_space(spacenum))
+				if (memintf.has_space(spacenum))
 				{
-					address_space &space = memintf->space(spacenum);
-					name = string_format("%s '%s' %s space memory", memintf->device().name(), memintf->device().tag(), space.name());
+					address_space &space = memintf.space(spacenum);
+					name = string_format("%s '%s' %s space memory", memintf.device().name(), memintf.device().tag(), space.name());
 					m_source_list.append(*global_alloc(debug_view_memory_source(name.c_str(), space)));
 				}
 
diff --git a/src/emu/debug/dvstate.cpp b/src/emu/debug/dvstate.cpp
index 773aa1fc3ee..0c1924d90fa 100644
--- a/src/emu/debug/dvstate.cpp
+++ b/src/emu/debug/dvstate.cpp
@@ -74,12 +74,11 @@ void debug_view_state::enumerate_sources()
 	m_source_list.reset();
 
 	// iterate over devices that have state interfaces
-	state_interface_iterator iter(machine().root_device());
 	std::string name;
-	for (device_state_interface *state = iter.first(); state != nullptr; state = iter.next())
+	for (device_state_interface &state : state_interface_iterator(machine().root_device()))
 	{
-		name = string_format("%s '%s'", state->device().name(), state->device().tag());
-		m_source_list.append(*global_alloc(debug_view_state_source(name.c_str(), state->device())));
+		name = string_format("%s '%s'", state.device().name(), state.device().tag());
+		m_source_list.append(*global_alloc(debug_view_state_source(name.c_str(), state.device())));
 	}
 
 	// reset the source to a known good entry
diff --git a/src/emu/debug/dvwpoints.cpp b/src/emu/debug/dvwpoints.cpp
index 17582796c39..b186cee4d71 100644
--- a/src/emu/debug/dvwpoints.cpp
+++ b/src/emu/debug/dvwpoints.cpp
@@ -153,12 +153,11 @@ void debug_view_watchpoints::enumerate_sources()
 	m_source_list.reset();
 
 	// iterate over devices with disassembly interfaces
-	disasm_interface_iterator iter(machine().root_device());
-	for (device_disasm_interface *dasm = iter.first(); dasm != nullptr; dasm = iter.next())
+	for (device_disasm_interface &dasm : disasm_interface_iterator(machine().root_device()))
 	{
 		std::string name;
-		name = string_format("%s '%s'", dasm->device().name(), dasm->device().tag());
-		m_source_list.append(*global_alloc(debug_view_source(name.c_str(), &dasm->device())));
+		name = string_format("%s '%s'", dasm.device().name(), dasm.device().tag());
+		m_source_list.append(*global_alloc(debug_view_source(name.c_str(), &dasm.device())));
 	}
 
 	// reset the source to a known good entry
diff --git a/src/emu/devfind.cpp b/src/emu/devfind.cpp
index 7669b331832..820a4e110c6 100644
--- a/src/emu/devfind.cpp
+++ b/src/emu/devfind.cpp
@@ -86,16 +86,19 @@ bool finder_base::validate_memregion(size_t bytes, bool required) const
 	std::string region_fulltag = m_base.subtag(m_tag);
 
 	// look for the region
-	device_iterator deviter(m_base.mconfig().root_device());
-	for (device_t *dev = deviter.first(); dev != nullptr && bytes_found == 0; dev = deviter.next())
-		for (const rom_entry *romp = rom_first_region(*dev); romp != nullptr; romp = rom_next_region(romp))
+	for (device_t &dev : device_iterator(m_base.mconfig().root_device()))
+	{
+		for (const rom_entry *romp = rom_first_region(dev); romp != nullptr; romp = rom_next_region(romp))
 		{
-			if (rom_region_name(*dev, romp) == region_fulltag)
+			if (rom_region_name(dev, romp) == region_fulltag)
 			{
 				bytes_found = ROMREGION_GETLENGTH(romp);
 				break;
 			}
 		}
+		if (bytes_found != 0)
+			break;
+	}
 
 	if (bytes_found != 0)
 	{
diff --git a/src/emu/device.h b/src/emu/device.h
index 18b65765554..c33939dc210 100644
--- a/src/emu/device.h
+++ b/src/emu/device.h
@@ -117,6 +117,8 @@ public:
 
 		// getters
 		device_t *first() const { return m_list.first(); }
+		int count() const { return m_list.count(); }
+		bool empty() const { return m_list.empty(); }
 
 		// range iterators
 		using auto_iterator = simple_list<device_t>::auto_iterator;
@@ -418,92 +420,116 @@ protected:
 class device_iterator
 {
 public:
+	class auto_iterator
+	{
+public:
+		// construction
+		auto_iterator(device_t *devptr, int curdepth, int maxdepth)
+			: m_curdevice(devptr),
+				m_curdepth(curdepth),
+				m_maxdepth(maxdepth) { }
+
+		// getters
+		device_t *current() const { return m_curdevice; }
+		int depth() const { return m_curdepth; }
+
+		// required operator overrides
+		bool operator!=(const auto_iterator &iter) const { return m_curdevice != iter.m_curdevice; }
+		device_t &operator*() const { assert(m_curdevice != nullptr); return *m_curdevice; }
+		const auto_iterator &operator++() { advance(); return *this; }
+
+protected:
+		// search depth-first for the next device
+		void advance()
+		{
+			// remember our starting position, and end immediately if we're NULL
+			device_t *start = m_curdevice;
+			if (start == nullptr)
+				return;
+
+			// search down first
+			if (m_curdepth < m_maxdepth)
+			{
+				m_curdevice = start->subdevices().first();
+				if (m_curdevice != nullptr)
+				{
+					m_curdepth++;
+					return;
+				}
+			}
+
+			// search next for neighbors up the ownership chain
+			while (m_curdepth > 0 && start != nullptr)
+			{
+				// found a neighbor? great!
+				m_curdevice = start->next();
+				if (m_curdevice != nullptr)
+					return;
+
+				// no? try our parent
+				start = start->owner();
+				m_curdepth--;
+			}
+
+			// returned to the top; we're done
+			m_curdevice = nullptr;
+		}
+
+		// protected state
+		device_t *      m_curdevice;
+		int             m_curdepth;
+		const int       m_maxdepth;
+	};
+
 	// construction
 	device_iterator(device_t &root, int maxdepth = 255)
-		: m_root(&root),
-			m_current(nullptr),
-			m_curdepth(0),
-			m_maxdepth(maxdepth) { }
+		: m_root(root), m_maxdepth(maxdepth) { }
 
-	// getters
-	device_t *current() const { return m_current; }
+	// standard iterators
+	auto_iterator begin() const { return auto_iterator(&m_root, 0, m_maxdepth); }
+	auto_iterator end() const { return auto_iterator(nullptr, 0, m_maxdepth); }
 
-	// reset and return first item
-	device_t *first()
-	{
-		m_current = m_root;
-		return m_current;
-	}
-
-	// advance depth-first
-	device_t *next()
-	{
-		// remember our starting position, and end immediately if we're NULL
-		device_t *start = m_current;
-		if (start == nullptr)
-			return nullptr;
-
-		// search down first
-		if (m_curdepth < m_maxdepth)
-		{
-			m_current = start->subdevices().first();
-			if (m_current != nullptr)
-			{
-				m_curdepth++;
-				return m_current;
-			}
-		}
-
-		// search next for neighbors up the ownership chain
-		while (m_curdepth > 0 && start != nullptr)
-		{
-			// found a neighbor? great!
-			m_current = start->next();
-			if (m_current != nullptr)
-				return m_current;
-
-			// no? try our parent
-			start = start->owner();
-			m_curdepth--;
-		}
-
-		// returned to the top; we're done
-		return m_current = nullptr;
-	}
+	// return first item
+	device_t *first() const { return begin().current(); }
 
 	// return the number of items available
-	int count()
+	int count() const
 	{
 		int result = 0;
-		for (device_t *item = first(); item != nullptr; item = next())
+		for (device_t &item : *this)
+		{
+			(void)&item;
 			result++;
+		}
 		return result;
 	}
 
 	// return the index of a given item in the virtual list
-	int indexof(device_t &device)
+	int indexof(device_t &device) const
 	{
 		int index = 0;
-		for (device_t *item = first(); item != nullptr; item = next(), index++)
-			if (item == &device)
+		for (device_t &item : *this)
+		{
+			if (&item == &device)
 				return index;
+			else
+				index++;
+		}
 		return -1;
 	}
 
 	// return the indexed item in the list
-	device_t *byindex(int index)
+	device_t *byindex(int index) const
 	{
-		for (device_t *item = first(); item != nullptr; item = next(), index--)
-			if (index == 0)
-				return item;
+		for (device_t &item : *this)
+			if (index-- == 0)
+				return &item;
 		return nullptr;
 	}
 
 private:
 	// internal state
-	device_t *      m_root;
-	device_t *      m_current;
-	int             m_curdepth;
+	device_t &      m_root;
 	int             m_maxdepth;
 };
 
@@ -514,132 +540,181 @@ private:
 template<device_type _DeviceType, class _DeviceClass = device_t>
 class device_type_iterator
 {
+public:
+	class auto_iterator : public device_iterator::auto_iterator
+	{
+public:
+		// construction
+		auto_iterator(device_t *devptr, int curdepth, int maxdepth)
+			: device_iterator::auto_iterator(devptr, curdepth, maxdepth)
+		{
+			// make sure the first device is of the specified type
+			while (m_curdevice != nullptr && m_curdevice->type() != _DeviceType)
+				advance();
+		}
+
+		// getters returning specified device type
+		_DeviceClass *current() const { return downcast<_DeviceClass *>(m_curdevice); }
+		_DeviceClass &operator*() const { assert(m_curdevice != nullptr); return downcast<_DeviceClass &>(*m_curdevice); }
+
+		// search for devices of the specified type
+		const auto_iterator &operator++()
+		{
+			advance();
+			while (m_curdevice != nullptr && m_curdevice->type() != _DeviceType)
+				advance();
+			return *this;
+		}
+	};
+
 public:
 	// construction
 	device_type_iterator(device_t &root, int maxdepth = 255)
-		: m_iterator(root, maxdepth) { }
+		: m_root(root), m_maxdepth(maxdepth) { }
 
-	// getters
-	_DeviceClass *current() const { return downcast<_DeviceClass *>(m_iterator.current()); }
+	// standard iterators
+	auto_iterator begin() const { return auto_iterator(&m_root, 0, m_maxdepth); }
+	auto_iterator end() const { return auto_iterator(nullptr, 0, m_maxdepth); }
 
-	// reset and return first item
-	_DeviceClass *first()
-	{
-		for (device_t *device = m_iterator.first(); device != nullptr; device = m_iterator.next())
-			if (device->type() == _DeviceType)
-				return downcast<_DeviceClass *>(device);
-		return nullptr;
-	}
-
-	// advance depth-first
-	_DeviceClass *next()
-	{
-		for (device_t *device = m_iterator.next(); device != nullptr; device = m_iterator.next())
-			if (device->type() == _DeviceType)
-				return downcast<_DeviceClass *>(device);
-		return nullptr;
-	}
+	// return first item
+	_DeviceClass *first() const { return begin().current(); }
 
 	// return the number of items available
-	int count()
+	int count() const
 	{
 		int result = 0;
-		for (_DeviceClass *item = first(); item != nullptr; item = next())
+		for (_DeviceClass &item : *this)
+		{
+			(void)&item;
 			result++;
+		}
 		return result;
 	}
 
 	// return the index of a given item in the virtual list
-	int indexof(_DeviceClass &device)
+	int indexof(_DeviceClass &device) const
 	{
 		int index = 0;
-		for (_DeviceClass *item = first(); item != nullptr; item = next(), index++)
-			if (item == &device)
+		for (_DeviceClass &item : *this)
+		{
+			if (&item == &device)
 				return index;
+			else
+				index++;
+		}
 		return -1;
 	}
 
 	// return the indexed item in the list
-	_DeviceClass *byindex(int index)
+	_DeviceClass *byindex(int index) const
 	{
-		for (_DeviceClass *item = first(); item != nullptr; item = next(), index--)
-			if (index == 0)
-				return item;
+		for (_DeviceClass &item : *this)
+			if (index-- == 0)
+				return &item;
 		return nullptr;
 	}
 
 private:
 	// internal state
-	device_iterator     m_iterator;
+	device_t &      m_root;
+	int             m_maxdepth;
 };
 
 
 // ======================> device_interface_iterator
 
 // helper class to find devices with a given interface in the device hierarchy
-// also works for findnig devices derived from a given subclass
+// also works for finding devices derived from a given subclass
 template<class _InterfaceClass>
 class device_interface_iterator
 {
+public:
+	class auto_iterator : public device_iterator::auto_iterator
+	{
+public:
+		// construction
+		auto_iterator(device_t *devptr, int curdepth, int maxdepth)
+			: device_iterator::auto_iterator(devptr, curdepth, maxdepth)
+		{
+			// set the iterator for the first device with the interface
+			find_interface();
+		}
+
+		// getters returning specified interface type
+		_InterfaceClass *current() const { return m_interface; }
+		_InterfaceClass &operator*() const { assert(m_interface != nullptr); return *m_interface; }
+
+		// search for devices with the specified interface
+		const auto_iterator &operator++() { advance(); find_interface(); return *this; }
+
+private:
+		// private helper
+		void find_interface()
+		{
+			// advance until finding a device with the interface
+			for ( ; m_curdevice != nullptr; advance())
+				if (m_curdevice->interface(m_interface))
+					return;
+
+			// if we run out of devices, make sure the interface pointer is null
+			m_interface = nullptr;
+		}
+
+		// private state
+		_InterfaceClass *m_interface;
+	};
+
 public:
 	// construction
 	device_interface_iterator(device_t &root, int maxdepth = 255)
-		: m_iterator(root, maxdepth),
-			m_current(nullptr) { }
+		: m_root(root), m_maxdepth(maxdepth) { }
 
-	// getters
-	_InterfaceClass *current() const { return m_current; }
+	// standard iterators
+	auto_iterator begin() const { return auto_iterator(&m_root, 0, m_maxdepth); }
+	auto_iterator end() const { return auto_iterator(nullptr, 0, m_maxdepth); }
 
-	// reset and return first item
-	_InterfaceClass *first()
-	{
-		for (device_t *device = m_iterator.first(); device != nullptr; device = m_iterator.next())
-			if (device->interface(m_current))
-				return m_current;
-		return nullptr;
-	}
-
-	// advance depth-first
-	_InterfaceClass *next()
-	{
-		for (device_t *device = m_iterator.next(); device != nullptr; device = m_iterator.next())
-			if (device->interface(m_current))
-				return m_current;
-		return nullptr;
-	}
+	// return first item
+	_InterfaceClass *first() const { return begin().current(); }
 
 	// return the number of items available
-	int count()
+	int count() const
 	{
 		int result = 0;
-		for (_InterfaceClass *item = first(); item != nullptr; item = next())
+		for (_InterfaceClass &item : *this)
+		{
+			(void)&item;
 			result++;
+		}
 		return result;
 	}
 
 	// return the index of a given item in the virtual list
-	int indexof(_InterfaceClass &intrf)
+	int indexof(_InterfaceClass &intrf) const
 	{
 		int index = 0;
-		for (_InterfaceClass *item = first(); item != nullptr; item = next(), index++)
-			if (item == &intrf)
+		for (_InterfaceClass &item : *this)
+		{
+			if (&item == &intrf)
 				return index;
+			else
+				index++;
+		}
 		return -1;
 	}
 
 	// return the indexed item in the list
-	_InterfaceClass *byindex(int index)
+	_InterfaceClass *byindex(int index) const
 	{
-		for (_InterfaceClass *item = first(); item != nullptr; item = next(), index--)
-			if (index == 0)
-				return item;
+		for (_InterfaceClass &item : *this)
+			if (index-- == 0)
+				return &item;
 		return nullptr;
 	}
 
 private:
 	// internal state
-	device_iterator     m_iterator;
-	_InterfaceClass *   m_current;
+	device_t &      m_root;
+	int             m_maxdepth;
 };
 
 
diff --git a/src/emu/diexec.cpp b/src/emu/diexec.cpp
index fb3011bc59f..b92a5a8b31c 100644
--- a/src/emu/diexec.cpp
+++ b/src/emu/diexec.cpp
@@ -476,8 +476,7 @@ void device_execute_interface::interface_pre_start()
 	m_driver_irq.bind_relative_to(*device().owner());
 
 	// fill in the initial states
-	device_iterator iter(device().machine().root_device());
-	int index = iter.indexof(*this);
+	int index = device_iterator(device().machine().root_device()).indexof(*this);
 	m_suspend = SUSPEND_REASON_RESET;
 	m_profiler = profile_type(index + PROFILER_DEVICE_FIRST);
 	m_inttrigger = index + TRIGGER_INT;
diff --git a/src/emu/diimage.cpp b/src/emu/diimage.cpp
index 3e167614fe9..fdad11a0536 100644
--- a/src/emu/diimage.cpp
+++ b/src/emu/diimage.cpp
@@ -1151,14 +1151,13 @@ void device_image_interface::unload()
 
 void device_image_interface::update_names(const device_type device_type, const char *inst, const char *brief)
 {
-	image_interface_iterator iter(device().mconfig().root_device());
 	int count = 0;
 	int index = -1;
-	for (const device_image_interface *image = iter.first(); image != nullptr; image = iter.next())
+	for (const device_image_interface &image : image_interface_iterator(device().mconfig().root_device()))
 	{
-		if (this == image)
+		if (this == &image)
 			index = count;
-		if ((image->image_type() == image_type() && device_type==nullptr) || (device_type==image->device().type()))
+		if ((image.image_type() == image_type() && device_type == nullptr) || (device_type == image.device().type()))
 			count++;
 	}
 	const char *inst_name = (device_type!=nullptr) ? inst : device_typename(image_type());
@@ -1234,12 +1233,11 @@ software_part *device_image_interface::find_software_item(const char *path, bool
 		interface = image_interface();
 
 	// find the software list if explicitly specified
-	software_list_device_iterator deviter(device().mconfig().root_device());
-	for (software_list_device *swlistdev = deviter.first(); swlistdev != nullptr; swlistdev = deviter.next())
+	for (software_list_device &swlistdev : software_list_device_iterator(device().mconfig().root_device()))
 	{
-		if (swlist_name.compare(swlistdev->list_name())==0 || !(swlist_name.length() > 0))
+		if (swlist_name.compare(swlistdev.list_name())==0 || !(swlist_name.length() > 0))
 		{
-			software_info *info = swlistdev->find(swinfo_name.c_str());
+			software_info *info = swlistdev.find(swinfo_name.c_str());
 			if (info != nullptr)
 			{
 				software_part *part = info->find_part(swpart_name.c_str(), interface);
@@ -1248,13 +1246,13 @@ software_part *device_image_interface::find_software_item(const char *path, bool
 			}
 		}
 
-		if (swinfo_name == swlistdev->list_name())
+		if (swinfo_name == swlistdev.list_name())
 		{
 			// ad hoc handling for the case path = swlist_name:swinfo_name (e.g.
 			// gameboy:sml) which is not handled properly by software_name_split
 			// since the function cannot distinguish between this and the case
 			// path = swinfo_name:swpart_name
-			software_info *info = swlistdev->find(swpart_name.c_str());
+			software_info *info = swlistdev.find(swpart_name.c_str());
 			if (info != nullptr)
 			{
 				software_part *part = info->find_part(nullptr, interface);
@@ -1309,20 +1307,19 @@ bool device_image_interface::load_software_part(const char *path, software_part
 		software_part *req_swpart = find_software_item(requirement, false);
 		if (req_swpart != nullptr)
 		{
-			image_interface_iterator imgiter(device().machine().root_device());
-			for (device_image_interface *req_image = imgiter.first(); req_image != nullptr; req_image = imgiter.next())
+			for (device_image_interface &req_image : image_interface_iterator(device().machine().root_device()))
 			{
-				const char *interface = req_image->image_interface();
+				const char *interface = req_image.image_interface();
 				if (interface != nullptr)
 				{
 					if (req_swpart->matches_interface(interface))
 					{
-						const char *option = device().mconfig().options().value(req_image->brief_instance_name());
+						const char *option = device().mconfig().options().value(req_image.brief_instance_name());
 						// mount only if not already mounted
-						if (*option == '\0' && !req_image->filename())
+						if (*option == '\0' && !req_image.filename())
 						{
-							req_image->set_init_phase();
-							req_image->load(requirement);
+							req_image.set_init_phase();
+							req_image.load(requirement);
 						}
 						break;
 					}
diff --git a/src/emu/disound.cpp b/src/emu/disound.cpp
index 1a3544b5d60..81c63dd0106 100644
--- a/src/emu/disound.cpp
+++ b/src/emu/disound.cpp
@@ -259,31 +259,31 @@ void device_sound_interface::interface_pre_start()
 {
 	// scan all the sound devices
 	sound_interface_iterator iter(m_device.machine().root_device());
-	for (device_sound_interface *sound = iter.first(); sound != nullptr; sound = iter.next())
+	for (device_sound_interface &sound : iter)
 	{
 		// scan each route on the device
-		for (const sound_route &route : sound->routes())
+		for (const sound_route &route : sound.routes())
 		{
 			// see if we are the target of this route; if we are, make sure the source device is started
-			device_t *target_device = sound->device().siblingdevice(route.m_target.c_str());
-			if (target_device == &m_device && !sound->device().started())
+			device_t *target_device = sound.device().siblingdevice(route.m_target.c_str());
+			if (target_device == &m_device && !sound.device().started())
 				throw device_missing_dependencies();
 		}
 	}
 
 	// now iterate through devices again and assign any auto-allocated inputs
 	m_auto_allocated_inputs = 0;
-	for (device_sound_interface *sound = iter.first(); sound != nullptr; sound = iter.next())
+	for (device_sound_interface &sound : iter)
 	{
 		// scan each route on the device
-		for (sound_route &route : sound->routes())
+		for (sound_route &route : sound.routes())
 		{
 			// see if we are the target of this route
-			device_t *target_device = sound->device().siblingdevice(route.m_target.c_str());
+			device_t *target_device = sound.device().siblingdevice(route.m_target.c_str());
 			if (target_device == &m_device && route.m_input == AUTO_ALLOC_INPUT)
 			{
 				route.m_input = m_auto_allocated_inputs;
-				m_auto_allocated_inputs += (route.m_output == ALL_OUTPUTS) ? sound->outputs() : 1;
+				m_auto_allocated_inputs += (route.m_output == ALL_OUTPUTS) ? sound.outputs() : 1;
 			}
 		}
 	}
@@ -298,25 +298,24 @@ void device_sound_interface::interface_pre_start()
 void device_sound_interface::interface_post_start()
 {
 	// iterate over all the sound devices
-	sound_interface_iterator iter(m_device.machine().root_device());
-	for (device_sound_interface *sound = iter.first(); sound != nullptr; sound = iter.next())
+	for (device_sound_interface &sound : sound_interface_iterator(m_device.machine().root_device()))
 	{
 		// scan each route on the device
-		for (const sound_route &route : sound->routes())
+		for (const sound_route &route : sound.routes())
 		{
 			// if we are the target of this route, hook it up
-			device_t *target_device = sound->device().siblingdevice(route.m_target.c_str());
+			device_t *target_device = sound.device().siblingdevice(route.m_target.c_str());
 			if (target_device == &m_device)
 			{
 				// iterate over all outputs, matching any that apply
 				int inputnum = route.m_input;
-				int numoutputs = sound->outputs();
+				int numoutputs = sound.outputs();
 				for (int outputnum = 0; outputnum < numoutputs; outputnum++)
 					if (route.m_output == outputnum || route.m_output == ALL_OUTPUTS)
 					{
 						// find the output stream to connect from
 						int streamoutputnum;
-						sound_stream *outputstream = sound->output_to_stream_output(outputnum, streamoutputnum);
+						sound_stream *outputstream = sound.output_to_stream_output(outputnum, streamoutputnum);
 						if (outputstream == nullptr)
 							fatalerror("Sound device '%s' specifies route for non-existant output #%d\n", route.m_target.c_str(), outputnum);
 
@@ -416,15 +415,14 @@ void device_mixer_interface::interface_pre_start()
 	m_outputmap.resize(m_auto_allocated_inputs);
 
 	// iterate through all routes that point to us and note their mixer output
-	sound_interface_iterator iter(m_device.machine().root_device());
-	for (device_sound_interface *sound = iter.first(); sound != nullptr; sound = iter.next())
-		for (const sound_route &route : sound->routes())
+	for (device_sound_interface &sound : sound_interface_iterator(m_device.machine().root_device()))
+		for (const sound_route &route : sound.routes())
 		{
 			// see if we are the target of this route
-			device_t *target_device = sound->device().siblingdevice(route.m_target.c_str());
+			device_t *target_device = sound.device().siblingdevice(route.m_target.c_str());
 			if (target_device == &device() && route.m_input < m_auto_allocated_inputs)
 			{
-				int count = (route.m_output == ALL_OUTPUTS) ? sound->outputs() : 1;
+				int count = (route.m_output == ALL_OUTPUTS) ? sound.outputs() : 1;
 				for (int output = 0; output < count; output++)
 					m_outputmap[route.m_input + output] = route.m_mixoutput;
 			}
diff --git a/src/emu/divideo.cpp b/src/emu/divideo.cpp
index 2ba4d117a28..c79d69b9132 100644
--- a/src/emu/divideo.cpp
+++ b/src/emu/divideo.cpp
@@ -81,7 +81,7 @@ void device_video_interface::interface_validity_check(validity_checker &valid) c
 		{
 			screen_device_iterator iter(device().mconfig().root_device());
 			screen = iter.first();
-			if (iter.next() != nullptr)
+			if (iter.count() > 1)
 				osd_printf_error("No screen specified for device '%s', but multiple screens found\n", device().tag());
 		}
 	}
@@ -115,7 +115,7 @@ void device_video_interface::interface_pre_start()
 		{
 			screen_device_iterator iter(device().machine().root_device());
 			m_screen = iter.first();
-			if (iter.next() != nullptr)
+			if (iter.count() > 1)
 				throw emu_fatalerror("No screen specified for device '%s', but multiple screens found", device().tag());
 		}
 	}
diff --git a/src/emu/drivenum.cpp b/src/emu/drivenum.cpp
index 99d3498c6a4..99b0f1898c0 100644
--- a/src/emu/drivenum.cpp
+++ b/src/emu/drivenum.cpp
@@ -404,7 +404,6 @@ void driver_enumerator::release_current() const
 		return;
 
 	// iterate over software lists in this entry and reset
-	software_list_device_iterator deviter(m_config[m_current]->root_device());
-	for (software_list_device *swlistdev = deviter.first(); swlistdev != nullptr; swlistdev = deviter.next())
-		swlistdev->release();
+	for (software_list_device &swlistdev : software_list_device_iterator(m_config[m_current]->root_device()))
+		swlistdev.release();
 }
diff --git a/src/emu/driver.cpp b/src/emu/driver.cpp
index 7d61c40e582..a2240ee7dd7 100644
--- a/src/emu/driver.cpp
+++ b/src/emu/driver.cpp
@@ -201,9 +201,8 @@ ioport_constructor driver_device::device_input_ports() const
 void driver_device::device_start()
 {
 	// reschedule ourselves to be last
-	device_iterator iter(*this);
-	for (device_t *test = iter.first(); test != nullptr; test = iter.next())
-		if (test != this && !test->started())
+	for (device_t &test : device_iterator(*this))
+		if (&test != this && !test.started())
 			throw device_missing_dependencies();
 
 	// call the game-specific init
diff --git a/src/emu/emumem.cpp b/src/emu/emumem.cpp
index edfd9228492..fb406709669 100644
--- a/src/emu/emumem.cpp
+++ b/src/emu/emumem.cpp
@@ -1549,13 +1549,13 @@ void memory_manager::initialize()
 {
 	// loop over devices and spaces within each device
 	memory_interface_iterator iter(machine().root_device());
-	for (device_memory_interface *memory = iter.first(); memory != nullptr; memory = iter.next())
+	for (device_memory_interface &memory : iter)
 		for (address_spacenum spacenum = AS_0; spacenum < ADDRESS_SPACES; ++spacenum)
 		{
 			// if there is a configuration for this space, we need an address space
-			const address_space_config *spaceconfig = memory->space_config(spacenum);
+			const address_space_config *spaceconfig = memory.space_config(spacenum);
 			if (spaceconfig != nullptr)
-				m_spacelist.append(address_space::allocate(*this, *spaceconfig, *memory, spacenum));
+				m_spacelist.append(address_space::allocate(*this, *spaceconfig, memory, spacenum));
 		}
 
 	// construct and preprocess the address_map for each space
diff --git a/src/emu/emuopts.cpp b/src/emu/emuopts.cpp
index d23a03ac479..73d36eb59a2 100644
--- a/src/emu/emuopts.cpp
+++ b/src/emu/emuopts.cpp
@@ -249,15 +249,14 @@ bool emu_options::add_slot_options(const software_part *swpart)
 
 	// iterate through all slot devices
 	int starting_count = options_count();
-	slot_interface_iterator iter(config.root_device());
-	for (const device_slot_interface *slot = iter.first(); slot != nullptr; slot = iter.next())
+	for (const device_slot_interface &slot : slot_interface_iterator(config.root_device()))
 	{
 		// skip fixed slots
-		if (slot->fixed())
+		if (slot.fixed())
 			continue;
 
 		// retrieve info about the device instance
-		const char *name = slot->device().tag() + 1;
+		const char *name = slot.device().tag() + 1;
 		if (!exists(name))
 		{
 			// first device? add the header as to be pretty
@@ -265,7 +264,7 @@ bool emu_options::add_slot_options(const software_part *swpart)
 				add_entry(nullptr, "SLOT DEVICES", OPTION_HEADER | OPTION_FLAG_DEVICE);
 
 			// add the option
-			add_entry(name, nullptr, OPTION_STRING | OPTION_FLAG_DEVICE, slot->default_option(), true);
+			add_entry(name, nullptr, OPTION_STRING | OPTION_FLAG_DEVICE, slot.default_option(), true);
 		}
 
 		// allow software lists to supply their own defaults
@@ -273,7 +272,7 @@ bool emu_options::add_slot_options(const software_part *swpart)
 		{
 			std::string featurename = std::string(name).append("_default");
 			const char *value = swpart->feature(featurename.c_str());
-			if (value != nullptr && (*value == '\0' || slot->option(value) != nullptr))
+			if (value != nullptr && (*value == '\0' || slot.option(value) != nullptr))
 			{
 				// set priority above INIs but below actual command line
 				std::string error;
@@ -299,14 +298,13 @@ void emu_options::update_slot_options(const software_part *swpart)
 	machine_config config(*cursystem, *this);
 
 	// iterate through all slot devices
-	slot_interface_iterator iter(config.root_device());
-	for (device_slot_interface *slot = iter.first(); slot != nullptr; slot = iter.next())
+	for (device_slot_interface &slot : slot_interface_iterator(config.root_device()))
 	{
 		// retrieve info about the device instance
-		const char *name = slot->device().tag() + 1;
-		if (exists(name) && !slot->option_list().empty())
+		const char *name = slot.device().tag() + 1;
+		if (exists(name) && !slot.option_list().empty())
 		{
-			std::string defvalue = slot->get_default_card_software();
+			std::string defvalue = slot.get_default_card_software();
 			if (defvalue.empty())
 			{
 				// keep any non-default setting
@@ -314,13 +312,13 @@ void emu_options::update_slot_options(const software_part *swpart)
 					continue;
 
 				// reinstate the actual default value as configured
-				if (slot->default_option() != nullptr)
-					defvalue.assign(slot->default_option());
+				if (slot.default_option() != nullptr)
+					defvalue.assign(slot.default_option());
 			}
 
 			// set the value and hide the option if not selectable
 			set_default_value(name, defvalue.c_str());
-			const device_slot_option *option = slot->option(defvalue.c_str());
+			const device_slot_option *option = slot.option(defvalue.c_str());
 			set_flag(name, ~OPTION_FLAG_INTERNAL, (option != nullptr && !option->selectable()) ? OPTION_FLAG_INTERNAL : 0);
 		}
 	}
@@ -343,20 +341,19 @@ void emu_options::add_device_options()
 	machine_config config(*cursystem, *this);
 
 	// iterate through all image devices
-	image_interface_iterator iter(config.root_device());
-	for (const device_image_interface *image = iter.first(); image != nullptr; image = iter.next())
+	for (const device_image_interface &image : image_interface_iterator(config.root_device()))
 	{
-        if (!image->user_loadable())
-            continue;
+		if (!image.user_loadable())
+			continue;
 
         // retrieve info about the device instance
 		std::ostringstream option_name;
-		util::stream_format(option_name, "%s;%s", image->instance_name(), image->brief_instance_name());
-		if (strcmp(image->device_typename(image->image_type()), image->instance_name()) == 0)
-			util::stream_format(option_name, ";%s1;%s1", image->instance_name(), image->brief_instance_name());
+		util::stream_format(option_name, "%s;%s", image.instance_name(), image.brief_instance_name());
+		if (strcmp(image.device_typename(image.image_type()), image.instance_name()) == 0)
+			util::stream_format(option_name, ";%s1;%s1", image.instance_name(), image.brief_instance_name());
 
 		// add the option
-		if (!exists(image->instance_name()))
+		if (!exists(image.instance_name()))
 		{
 			// first device? add the header as to be pretty
 			if (m_device_options++ == 0)
@@ -486,23 +483,22 @@ void emu_options::parse_standard_inis(std::string &error_string, const game_driv
 		parse_one_ini("othersys", OPTION_PRIORITY_SYSTYPE_INI, &error_string);
 
 	machine_config config(*cursystem, *this);
-	screen_device_iterator iter(config.root_device());
-	for (const screen_device *device = iter.first(); device != nullptr; device = iter.next())
+	for (const screen_device &device : screen_device_iterator(config.root_device()))
 	{
 		// parse "raster.ini" for raster games
-		if (device->screen_type() == SCREEN_TYPE_RASTER)
+		if (device.screen_type() == SCREEN_TYPE_RASTER)
 		{
 			parse_one_ini("raster", OPTION_PRIORITY_SCREEN_INI, &error_string);
 			break;
 		}
 		// parse "vector.ini" for vector games
-		if (device->screen_type() == SCREEN_TYPE_VECTOR)
+		if (device.screen_type() == SCREEN_TYPE_VECTOR)
 		{
 			parse_one_ini("vector", OPTION_PRIORITY_SCREEN_INI, &error_string);
 			break;
 		}
 		// parse "lcd.ini" for lcd games
-		if (device->screen_type() == SCREEN_TYPE_LCD)
+		if (device.screen_type() == SCREEN_TYPE_LCD)
 		{
 			parse_one_ini("lcd", OPTION_PRIORITY_SCREEN_INI, &error_string);
 			break;
diff --git a/src/emu/image.cpp b/src/emu/image.cpp
index 4da1e198569..09cd5c1f379 100644
--- a/src/emu/image.cpp
+++ b/src/emu/image.cpp
@@ -27,38 +27,34 @@
 image_manager::image_manager(running_machine &machine)
 	: m_machine(machine)
 {
-	const char *image_name;
-
 	/* make sure that any required devices have been allocated */
-	image_interface_iterator iter(machine.root_device());
-	for (device_image_interface *image = iter.first(); image != nullptr; image = iter.next())
+	for (device_image_interface &image : image_interface_iterator(machine.root_device()))
 	{
 		/* is an image specified for this image */
-		image_name = machine.options().value(image->instance_name());
-
-        if (!image->user_loadable())
-            continue;
+		const char *image_name = machine.options().value(image.instance_name());
+		if (!image.user_loadable())
+			continue;
 
 		if ((image_name != nullptr) && (image_name[0] != '\0'))
 		{
 			/* mark init state */
-			image->set_init_phase();
+			image.set_init_phase();
 
 			/* try to load this image */
-			bool result = image->load(image_name);
+			bool result = image.load(image_name);
 
 			/* did the image load fail? */
 			if (result)
 			{
 				/* retrieve image error message */
-				std::string image_err = std::string(image->error());
+				std::string image_err = std::string(image.error());
 				std::string image_basename(image_name);
 
 				/* unload all images */
 				unload_all();
 
 				fatalerror_exitcode(machine, MAMERR_DEVICE, "Device %s load (%s) failed: %s",
-					image->device().name(),
+					image.device().name(),
 					image_basename.c_str(),
 					image_err.c_str());
 			}
@@ -77,11 +73,10 @@ void image_manager::unload_all()
 	// extract the options
 	options_extract();
 
-	image_interface_iterator iter(machine().root_device());
-	for (device_image_interface *image = iter.first(); image != nullptr; image = iter.next())
+	for (device_image_interface &image : image_interface_iterator(machine().root_device()))
 	{
 		// unload this image
-		image->unload();
+		image.unload();
 	}
 }
 
@@ -99,13 +94,12 @@ void image_manager::config_load(config_type cfg_type, xml_data_node *parentnode)
 
 			if ((dev_instance != nullptr) && (dev_instance[0] != '\0'))
 			{
-				image_interface_iterator iter(machine().root_device());
-				for (device_image_interface *image = iter.first(); image != nullptr; image = iter.next())
+				for (device_image_interface &image : image_interface_iterator(machine().root_device()))
 				{
-					if (!strcmp(dev_instance, image->instance_name())) {
+					if (!strcmp(dev_instance, image.instance_name())) {
 						working_directory = xml_get_attribute_string(node, "directory", nullptr);
 						if (working_directory != nullptr)
-							image->set_working_directory(working_directory);
+							image.set_working_directory(working_directory);
 					}
 				}
 			}
@@ -126,16 +120,15 @@ void image_manager::config_save(config_type cfg_type, xml_data_node *parentnode)
 	/* only care about game-specific data */
 	if (cfg_type == config_type::CONFIG_TYPE_GAME)
 	{
-		image_interface_iterator iter(machine().root_device());
-		for (device_image_interface *image = iter.first(); image != nullptr; image = iter.next())
+		for (device_image_interface &image : image_interface_iterator(machine().root_device()))
 		{
-			dev_instance = image->instance_name();
+			dev_instance = image.instance_name();
 
 			node = xml_add_child(parentnode, "device", nullptr);
 			if (node != nullptr)
 			{
 				xml_set_attribute(node, "instance", dev_instance);
-				xml_set_attribute(node, "directory", image->working_directory());
+				xml_set_attribute(node, "directory", image.working_directory());
 			}
 		}
 	}
@@ -180,14 +173,13 @@ void image_manager::options_extract()
 	{
 		int index = 0;
 
-		image_interface_iterator iter(machine().root_device());
-		for (device_image_interface *image = iter.first(); image != nullptr; image = iter.next())
+		for (device_image_interface &image : image_interface_iterator(machine().root_device()))
 		{
-			const char *filename = image->filename();
+			const char *filename = image.filename();
 
 			/* and set the option */
 			std::string error;
-			machine().options().set_value(image->instance_name(), filename ? filename : "", OPTION_PRIORITY_CMDLINE, error);
+			machine().options().set_value(image.instance_name(), filename ? filename : "", OPTION_PRIORITY_CMDLINE, error);
 
 			index++;
 		}
@@ -208,11 +200,10 @@ std::string &image_manager::mandatory_scan(std::string &mandatory)
 {
 	mandatory.clear();
 	// make sure that any required image has a mounted file
-	image_interface_iterator iter(machine().root_device());
-	for (device_image_interface *image = iter.first(); image != nullptr; image = iter.next())
+	for (device_image_interface &image : image_interface_iterator(machine().root_device()))
 	{
-		if (image->filename() == nullptr && image->must_be_loaded())
-			mandatory.append("\"").append(image->instance_name()).append("\", ");
+		if (image.filename() == nullptr && image.must_be_loaded())
+			mandatory.append("\"").append(image.instance_name()).append("\", ");
 	}
 	return mandatory;
 }
@@ -225,24 +216,23 @@ std::string &image_manager::mandatory_scan(std::string &mandatory)
 void image_manager::postdevice_init()
 {
 	/* make sure that any required devices have been allocated */
-	image_interface_iterator iter(machine().root_device());
-	for (device_image_interface *image = iter.first(); image != nullptr; image = iter.next())
+	for (device_image_interface &image : image_interface_iterator(machine().root_device()))
 	{
-			int result = image->finish_load();
+		int result = image.finish_load();
 
-			/* did the image load fail? */
-			if (result)
-			{
-				/* retrieve image error message */
-				std::string image_err = std::string(image->error());
+		/* did the image load fail? */
+		if (result)
+		{
+			/* retrieve image error message */
+			std::string image_err = std::string(image.error());
 
-				/* unload all images */
-				unload_all();
+			/* unload all images */
+			unload_all();
 
-				fatalerror_exitcode(machine(), MAMERR_DEVICE, "Device %s load failed: %s",
-					image->device().name(),
-					image_err.c_str());
-			}
+			fatalerror_exitcode(machine(), MAMERR_DEVICE, "Device %s load failed: %s",
+				image.device().name(),
+				image_err.c_str());
+		}
 	}
 	/* add a callback for when we shut down */
 	machine().add_notifier(MACHINE_NOTIFY_EXIT, machine_notify_delegate(FUNC(image_manager::unload_all), this));
diff --git a/src/emu/info.cpp b/src/emu/info.cpp
index 861414aa2c0..7f64e85b596 100644
--- a/src/emu/info.cpp
+++ b/src/emu/info.cpp
@@ -248,35 +248,36 @@ void info_xml_creator::output_one()
 	ioport_list portlist;
 	std::string errors;
 	device_iterator iter(config.root_device());
-	for (device_t *device = iter.first(); device != nullptr; device = iter.next())
-		portlist.append(*device, errors);
-    // renumber player numbers for controller ports
-    int player_offset = 0;
-    // but treat keyboard count separately from players' number
-    int kbd_offset = 0;
-    for (device_t *device = iter.first(); device != nullptr; device = iter.next())
-    {
-        int nplayers = 0;
-        bool new_kbd = FALSE;
-        for (ioport_port &port : portlist)
-            if (&port.device() == device)
-                for (ioport_field &field : port.fields())
-                    if (field.type() >= IPT_START && field.type() < IPT_ANALOG_LAST)
-                    {
-                        if (field.type() == IPT_KEYBOARD)
-                        {
-                            if (!new_kbd) new_kbd = TRUE;
-                            field.set_player(field.player() + kbd_offset);
-                        }
-                        else
-                        {
-                            nplayers = MAX(nplayers, field.player() + 1);
-                            field.set_player(field.player() + player_offset);
-                        }
-                    }
-        player_offset += nplayers;
-        if (new_kbd) kbd_offset++;
-    }
+	for (device_t &device : iter)
+		portlist.append(device, errors);
+
+	// renumber player numbers for controller ports
+	int player_offset = 0;
+	// but treat keyboard count separately from players' number
+	int kbd_offset = 0;
+	for (device_t &device : iter)
+	{
+		int nplayers = 0;
+		bool new_kbd = false;
+		for (ioport_port &port : portlist)
+			if (&port.device() == &device)
+				for (ioport_field &field : port.fields())
+					if (field.type() >= IPT_START && field.type() < IPT_ANALOG_LAST)
+					{
+						if (field.type() == IPT_KEYBOARD)
+						{
+							if (!new_kbd) new_kbd = TRUE;
+							field.set_player(field.player() + kbd_offset);
+						}
+						else
+						{
+							nplayers = MAX(nplayers, field.player() + 1);
+							field.set_player(field.player() + player_offset);
+						}
+					}
+		player_offset += nplayers;
+		if (new_kbd) kbd_offset++;
+	}
 
 	// print the header and the game name
 	fprintf(m_output, "\t<%s",XML_TOP);
@@ -360,9 +361,8 @@ void info_xml_creator::output_one_device(device_t &device, const char *devtag)
 	// generate input list
 	ioport_list portlist;
 	std::string errors;
-	device_iterator iptiter(device);
-	for (device_t *dev = iptiter.first(); dev != nullptr; dev = iptiter.next())
-		portlist.append(*dev, errors);
+	for (device_t &dev : device_iterator(device))
+		portlist.append(dev, errors);
 	// check if the device adds player inputs (other than dsw and configs) to the system
 	for (ioport_port &port : portlist)
 		for (ioport_field &field : port.fields())
@@ -424,43 +424,39 @@ void info_xml_creator::output_devices()
 	while (m_drivlist.next())
 	{
 		// first, run through devices with roms which belongs to the default configuration
-		device_iterator deviter(m_drivlist.config().root_device());
-		for (device_t *device = deviter.first(); device != nullptr; device = deviter.next())
+		for (device_t &device : device_iterator(m_drivlist.config().root_device()))
 		{
-			if (device->owner() != nullptr && device->shortname()!= nullptr && device->shortname()[0]!='\0')
+			if (device.owner() != nullptr && device.shortname() != nullptr && device.shortname()[0]!='\0')
 			{
-				if (shortnames.insert(device->shortname()).second)
-					output_one_device(*device, device->tag());
+				if (shortnames.insert(device.shortname()).second)
+					output_one_device(device, device.tag());
 			}
 		}
 
 		// then, run through slot devices
-		slot_interface_iterator iter(m_drivlist.config().root_device());
-		for (const device_slot_interface *slot = iter.first(); slot != nullptr; slot = iter.next())
+		for (const device_slot_interface &slot : slot_interface_iterator(m_drivlist.config().root_device()))
 		{
-			for (const device_slot_option &option : slot->option_list())
+			for (const device_slot_option &option : slot.option_list())
 			{
 				std::string temptag("_");
 				temptag.append(option.name());
 				device_t *dev = const_cast<machine_config &>(m_drivlist.config()).device_add(&m_drivlist.config().root_device(), temptag.c_str(), option.devtype(), 0);
 
 				// notify this device and all its subdevices that they are now configured
-				device_iterator subiter(*dev);
-				for (device_t *device = subiter.first(); device != nullptr; device = subiter.next())
-					if (!device->configured())
-						device->config_complete();
+				for (device_t &device : device_iterator(*dev))
+					if (!device.configured())
+						device.config_complete();
 
 				if (shortnames.insert(dev->shortname()).second)
 					output_one_device(*dev, temptag.c_str());
 
 				// also, check for subdevices with ROMs (a few devices are missed otherwise, e.g. MPU401)
-				device_iterator deviter2(*dev);
-				for (device_t *device = deviter2.first(); device != nullptr; device = deviter2.next())
+				for (device_t &device : device_iterator(*dev))
 				{
-					if (device->owner() == dev && device->shortname()!= nullptr && device->shortname()[0]!='\0')
+					if (device.owner() == dev && device.shortname() != nullptr && device.shortname()[0]!='\0')
 					{
-						if (shortnames.insert(device->shortname()).second)
-							output_one_device(*device, device->tag());
+						if (shortnames.insert(device.shortname()).second)
+							output_one_device(device, device.tag());
 					}
 				}
 
@@ -478,10 +474,9 @@ void info_xml_creator::output_devices()
 
 void info_xml_creator::output_device_roms()
 {
-	device_iterator deviter(m_drivlist.config().root_device());
-	for (device_t *device = deviter.first(); device != nullptr; device = deviter.next())
-		if (device->owner() != nullptr && device->shortname()!= nullptr && device->shortname()[0]!='\0')
-			fprintf(m_output, "\t\t<device_ref name=\"%s\"/>\n", xml_normalize_string(device->shortname()));
+	for (device_t &device : device_iterator(m_drivlist.config().root_device()))
+		if (device.owner() != nullptr && device.shortname() != nullptr && device.shortname()[0] != '\0')
+			fprintf(m_output, "\t\t<device_ref name=\"%s\"/>\n", xml_normalize_string(device.shortname()));
 }
 
 
@@ -493,10 +488,9 @@ void info_xml_creator::output_device_roms()
 void info_xml_creator::output_sampleof()
 {
 	// iterate over sample devices
-	samples_device_iterator iter(m_drivlist.config().root_device());
-	for (samples_device *device = iter.first(); device != nullptr; device = iter.next())
+	for (samples_device &device : samples_device_iterator(m_drivlist.config().root_device()))
 	{
-		samples_iterator sampiter(*device);
+		samples_iterator sampiter(device);
 		if (sampiter.altbasename() != nullptr)
 		{
 			fprintf(m_output, " sampleof=\"%s\"", xml_normalize_string(sampiter.altbasename()));
@@ -650,10 +644,9 @@ void info_xml_creator::output_rom(device_t &device)
 void info_xml_creator::output_sample(device_t &device)
 {
 	// iterate over sample devices
-	samples_device_iterator sampiter(device);
-	for (samples_device *samples = sampiter.first(); samples != nullptr; samples = sampiter.next())
+	for (samples_device &samples : samples_device_iterator(device))
 	{
-		samples_iterator iter(*samples);
+		samples_iterator iter(samples);
 		std::unordered_set<std::string> already_printed;
 		for (const char *samplename = iter.first(); samplename != nullptr; samplename = iter.next())
 		{
@@ -676,38 +669,36 @@ void info_xml_creator::output_sample(device_t &device)
 void info_xml_creator::output_chips(device_t &device, const char *root_tag)
 {
 	// iterate over executable devices
-	execute_interface_iterator execiter(device);
-	for (device_execute_interface *exec = execiter.first(); exec != nullptr; exec = execiter.next())
+	for (device_execute_interface &exec : execute_interface_iterator(device))
 	{
-		if (strcmp(exec->device().tag(), device.tag()))
+		if (strcmp(exec.device().tag(), device.tag()))
 		{
-			std::string newtag(exec->device().tag()), oldtag(":");
+			std::string newtag(exec.device().tag()), oldtag(":");
 			newtag = newtag.substr(newtag.find(oldtag.append(root_tag)) + oldtag.length());
 
 			fprintf(m_output, "\t\t<chip");
 			fprintf(m_output, " type=\"cpu\"");
 			fprintf(m_output, " tag=\"%s\"", xml_normalize_string(newtag.c_str()));
-			fprintf(m_output, " name=\"%s\"", xml_normalize_string(exec->device().name()));
-			fprintf(m_output, " clock=\"%d\"", exec->device().clock());
+			fprintf(m_output, " name=\"%s\"", xml_normalize_string(exec.device().name()));
+			fprintf(m_output, " clock=\"%d\"", exec.device().clock());
 			fprintf(m_output, "/>\n");
 		}
 	}
 
 	// iterate over sound devices
-	sound_interface_iterator sounditer(device);
-	for (device_sound_interface *sound = sounditer.first(); sound != nullptr; sound = sounditer.next())
+	for (device_sound_interface &sound : sound_interface_iterator(device))
 	{
-		if (strcmp(sound->device().tag(), device.tag()))
+		if (strcmp(sound.device().tag(), device.tag()))
 		{
-			std::string newtag(sound->device().tag()), oldtag(":");
+			std::string newtag(sound.device().tag()), oldtag(":");
 			newtag = newtag.substr(newtag.find(oldtag.append(root_tag)) + oldtag.length());
 
 			fprintf(m_output, "\t\t<chip");
 			fprintf(m_output, " type=\"audio\"");
 			fprintf(m_output, " tag=\"%s\"", xml_normalize_string(newtag.c_str()));
-			fprintf(m_output, " name=\"%s\"", xml_normalize_string(sound->device().name()));
-			if (sound->device().clock() != 0)
-				fprintf(m_output, " clock=\"%d\"", sound->device().clock());
+			fprintf(m_output, " name=\"%s\"", xml_normalize_string(sound.device().name()));
+			if (sound.device().clock() != 0)
+				fprintf(m_output, " clock=\"%d\"", sound.device().clock());
 			fprintf(m_output, "/>\n");
 		}
 	}
@@ -722,18 +713,17 @@ void info_xml_creator::output_chips(device_t &device, const char *root_tag)
 void info_xml_creator::output_display(device_t &device, const char *root_tag)
 {
 	// iterate over screens
-	screen_device_iterator iter(device);
-	for (const screen_device *screendev = iter.first(); screendev != nullptr; screendev = iter.next())
+	for (const screen_device &screendev : screen_device_iterator(device))
 	{
-		if (strcmp(screendev->tag(), device.tag()))
+		if (strcmp(screendev.tag(), device.tag()))
 		{
-			std::string newtag(screendev->tag()), oldtag(":");
+			std::string newtag(screendev.tag()), oldtag(":");
 			newtag = newtag.substr(newtag.find(oldtag.append(root_tag)) + oldtag.length());
 
 			fprintf(m_output, "\t\t<display");
 			fprintf(m_output, " tag=\"%s\"", xml_normalize_string(newtag.c_str()));
 
-			switch (screendev->screen_type())
+			switch (screendev.screen_type())
 			{
 				case SCREEN_TYPE_RASTER:    fprintf(m_output, " type=\"raster\"");  break;
 				case SCREEN_TYPE_VECTOR:    fprintf(m_output, " type=\"vector\"");  break;
@@ -771,29 +761,29 @@ void info_xml_creator::output_display(device_t &device, const char *root_tag)
 			}
 
 			// output width and height only for games that are not vector
-			if (screendev->screen_type() != SCREEN_TYPE_VECTOR)
+			if (screendev.screen_type() != SCREEN_TYPE_VECTOR)
 			{
-				const rectangle &visarea = screendev->visible_area();
+				const rectangle &visarea = screendev.visible_area();
 				fprintf(m_output, " width=\"%d\"", visarea.width());
 				fprintf(m_output, " height=\"%d\"", visarea.height());
 			}
 
 			// output refresh rate
-			fprintf(m_output, " refresh=\"%f\"", ATTOSECONDS_TO_HZ(screendev->refresh_attoseconds()));
+			fprintf(m_output, " refresh=\"%f\"", ATTOSECONDS_TO_HZ(screendev.refresh_attoseconds()));
 
 			// output raw video parameters only for games that are not vector
 			// and had raw parameters specified
-			if (screendev->screen_type() != SCREEN_TYPE_VECTOR && !screendev->oldstyle_vblank_supplied())
+			if (screendev.screen_type() != SCREEN_TYPE_VECTOR && !screendev.oldstyle_vblank_supplied())
 			{
-				int pixclock = screendev->width() * screendev->height() * ATTOSECONDS_TO_HZ(screendev->refresh_attoseconds());
+				int pixclock = screendev.width() * screendev.height() * ATTOSECONDS_TO_HZ(screendev.refresh_attoseconds());
 
 				fprintf(m_output, " pixclock=\"%d\"", pixclock);
-				fprintf(m_output, " htotal=\"%d\"", screendev->width());
-				fprintf(m_output, " hbend=\"%d\"", screendev->visible_area().min_x);
-				fprintf(m_output, " hbstart=\"%d\"", screendev->visible_area().max_x+1);
-				fprintf(m_output, " vtotal=\"%d\"", screendev->height());
-				fprintf(m_output, " vbend=\"%d\"", screendev->visible_area().min_y);
-				fprintf(m_output, " vbstart=\"%d\"", screendev->visible_area().max_y+1);
+				fprintf(m_output, " htotal=\"%d\"", screendev.width());
+				fprintf(m_output, " hbend=\"%d\"", screendev.visible_area().min_x);
+				fprintf(m_output, " hbstart=\"%d\"", screendev.visible_area().max_x+1);
+				fprintf(m_output, " vtotal=\"%d\"", screendev.height());
+				fprintf(m_output, " vbend=\"%d\"", screendev.visible_area().min_y);
+				fprintf(m_output, " vbstart=\"%d\"", screendev.visible_area().max_y+1);
 			}
 			fprintf(m_output, " />\n");
 		}
@@ -1430,20 +1420,19 @@ void info_xml_creator::output_driver()
 
 void info_xml_creator::output_images(device_t &device, const char *root_tag)
 {
-	image_interface_iterator iter(device);
-	for (const device_image_interface *imagedev = iter.first(); imagedev != nullptr; imagedev = iter.next())
+	for (const device_image_interface &imagedev : image_interface_iterator(device))
 	{
-		if (strcmp(imagedev->device().tag(), device.tag()))
+		if (strcmp(imagedev.device().tag(), device.tag()))
 		{
-            bool loadable = imagedev->user_loadable();
-			std::string newtag(imagedev->device().tag()), oldtag(":");
+			bool loadable = imagedev.user_loadable();
+			std::string newtag(imagedev.device().tag()), oldtag(":");
 			newtag = newtag.substr(newtag.find(oldtag.append(root_tag)) + oldtag.length());
 
 			// print m_output device type
-			fprintf(m_output, "\t\t<device type=\"%s\"", xml_normalize_string(imagedev->image_type_name()));
+			fprintf(m_output, "\t\t<device type=\"%s\"", xml_normalize_string(imagedev.image_type_name()));
 
 			// does this device have a tag?
-			if (imagedev->device().tag())
+			if (imagedev.device().tag())
 				fprintf(m_output, " tag=\"%s\"", xml_normalize_string(newtag.c_str()));
 
 			// is this device available as media switch?
@@ -1451,26 +1440,26 @@ void info_xml_creator::output_images(device_t &device, const char *root_tag)
 				fprintf(m_output, " fixed_image=\"1\"");
             
             // is this device mandatory?
-            if (imagedev->must_be_loaded())
+            if (imagedev.must_be_loaded())
                 fprintf(m_output, " mandatory=\"1\"");
 
-			if (imagedev->image_interface() && imagedev->image_interface()[0])
-				fprintf(m_output, " interface=\"%s\"", xml_normalize_string(imagedev->image_interface()));
+			if (imagedev.image_interface() && imagedev.image_interface()[0])
+				fprintf(m_output, " interface=\"%s\"", xml_normalize_string(imagedev.image_interface()));
 
 			// close the XML tag
 			fprintf(m_output, ">\n");
 
             if (loadable)
             {
-                const char *name = imagedev->instance_name();
-                const char *shortname = imagedev->brief_instance_name();
+                const char *name = imagedev.instance_name();
+                const char *shortname = imagedev.brief_instance_name();
                 
                 fprintf(m_output, "\t\t\t<instance");
                 fprintf(m_output, " name=\"%s\"", xml_normalize_string(name));
                 fprintf(m_output, " briefname=\"%s\"", xml_normalize_string(shortname));
                 fprintf(m_output, "/>\n");
                 
-                std::string extensions(imagedev->file_extensions());
+                std::string extensions(imagedev.file_extensions());
                 
                 char *ext = strtok((char *)extensions.c_str(), ",");
                 while (ext != nullptr)
@@ -1493,25 +1482,24 @@ void info_xml_creator::output_images(device_t &device, const char *root_tag)
 
 void info_xml_creator::output_slots(device_t &device, const char *root_tag)
 {
-	slot_interface_iterator iter(device);
-	for (const device_slot_interface *slot = iter.first(); slot != nullptr; slot = iter.next())
+	for (const device_slot_interface &slot : slot_interface_iterator(device))
 	{
-		if (slot->fixed()) continue;    // or shall we list these as non-configurable?
+		if (slot.fixed()) continue;    // or shall we list these as non-configurable?
 
-		if (strcmp(slot->device().tag(), device.tag()))
+		if (strcmp(slot.device().tag(), device.tag()))
 		{
-			std::string newtag(slot->device().tag()), oldtag(":");
+			std::string newtag(slot.device().tag()), oldtag(":");
 			newtag = newtag.substr(newtag.find(oldtag.append(root_tag)) + oldtag.length());
 
 			// print m_output device type
 			fprintf(m_output, "\t\t<slot name=\"%s\">\n", xml_normalize_string(newtag.c_str()));
 
 			/*
-			 if (slot->slot_interface()[0])
-			 fprintf(m_output, " interface=\"%s\"", xml_normalize_string(slot->slot_interface()));
+			 if (slot.slot_interface()[0])
+			 fprintf(m_output, " interface=\"%s\"", xml_normalize_string(slot.slot_interface()));
 			 */
 
-			for (const device_slot_option &option : slot->option_list())
+			for (const device_slot_option &option : slot.option_list())
 			{
 				if (option.selectable())
 				{
@@ -1522,7 +1510,7 @@ void info_xml_creator::output_slots(device_t &device, const char *root_tag)
 					fprintf(m_output, "\t\t\t<slotoption");
 					fprintf(m_output, " name=\"%s\"", xml_normalize_string(option.name()));
 					fprintf(m_output, " devname=\"%s\"", xml_normalize_string(dev->shortname()));
-					if (slot->default_option() != nullptr && strcmp(slot->default_option(),option.name())==0)
+					if (slot.default_option() != nullptr && strcmp(slot.default_option(),option.name())==0)
 						fprintf(m_output, " default=\"yes\"");
 					fprintf(m_output, "/>\n");
 					const_cast<machine_config &>(m_drivlist.config()).device_remove(&m_drivlist.config().root_device(), "dummy");
@@ -1542,14 +1530,12 @@ void info_xml_creator::output_slots(device_t &device, const char *root_tag)
 
 void info_xml_creator::output_software_list()
 {
-	software_list_device_iterator iter(m_drivlist.config().root_device());
-	for (const software_list_device *swlist = iter.first(); swlist != nullptr; swlist = iter.next())
+	for (const software_list_device &swlist : software_list_device_iterator(m_drivlist.config().root_device()))
 	{
-		fprintf(m_output, "\t\t<softwarelist name=\"%s\" ", swlist->list_name());
-		fprintf(m_output, "status=\"%s\" ", (swlist->list_type() == SOFTWARE_LIST_ORIGINAL_SYSTEM) ? "original" : "compatible");
-		if (swlist->filter()) {
-			fprintf(m_output, "filter=\"%s\" ", swlist->filter());
-		}
+		fprintf(m_output, "\t\t<softwarelist name=\"%s\" ", swlist.list_name());
+		fprintf(m_output, "status=\"%s\" ", (swlist.list_type() == SOFTWARE_LIST_ORIGINAL_SYSTEM) ? "original" : "compatible");
+		if (swlist.filter())
+			fprintf(m_output, "filter=\"%s\" ", swlist.filter());
 		fprintf(m_output, "/>\n");
 	}
 }
@@ -1563,14 +1549,13 @@ void info_xml_creator::output_software_list()
 
 void info_xml_creator::output_ramoptions()
 {
-	ram_device_iterator iter(m_drivlist.config().root_device());
-	for (const ram_device *ram = iter.first(); ram != nullptr; ram = iter.next())
+	for (const ram_device &ram : ram_device_iterator(m_drivlist.config().root_device()))
 	{
-		fprintf(m_output, "\t\t<ramoption default=\"1\">%u</ramoption>\n", ram->default_size());
+		fprintf(m_output, "\t\t<ramoption default=\"1\">%u</ramoption>\n", ram.default_size());
 
-		if (ram->extra_options() != nullptr)
+		if (ram.extra_options() != nullptr)
 		{
-			std::string options(ram->extra_options());
+			std::string options(ram.extra_options());
 			for (int start = 0, end = options.find_first_of(',');; start = end + 1, end = options.find_first_of(',', start))
 			{
 				std::string option;
diff --git a/src/emu/ioport.cpp b/src/emu/ioport.cpp
index 44b627baf96..1e732dd3de3 100644
--- a/src/emu/ioport.cpp
+++ b/src/emu/ioport.cpp
@@ -2457,22 +2457,22 @@ time_t ioport_manager::initialize()
 
 	// if we have a token list, proceed
 	device_iterator iter(machine().root_device());
-	for (device_t *device = iter.first(); device != nullptr; device = iter.next())
+	for (device_t &device : iter)
 	{
 		std::string errors;
-		m_portlist.append(*device, errors);
+		m_portlist.append(device, errors);
 		if (!errors.empty())
 			osd_printf_error("Input port errors:\n%s", errors.c_str());
 	}
 
 	// renumber player numbers for controller ports
 	int player_offset = 0;
-	for (device_t *device = iter.first(); device != nullptr; device = iter.next())
+	for (device_t &device : iter)
 	{
 		int players = 0;
 		for (ioport_port &port : m_portlist)
 		{
-			if (&port.device() == device)
+			if (&port.device() == &device)
 			{
 				for (ioport_field &field : port.fields())
 					if (field.type_class()==INPUT_CLASS_CONTROLLER)
@@ -2532,10 +2532,9 @@ time_t ioport_manager::initialize()
 				if (field.is_analog())
 					m_has_analog = true;
 			}
-		device_iterator deviter(machine().root_device());
-		for (device_t *device = deviter.first(); device != nullptr; device = deviter.next())
-			if (device->rom_region())
-				for (const rom_entry *rom = device->rom_region(); !ROMENTRY_ISEND(rom); rom++)
+		for (device_t &device : device_iterator(machine().root_device()))
+			if (device.rom_region())
+				for (const rom_entry *rom = device.rom_region(); !ROMENTRY_ISEND(rom); rom++)
 					if (ROMENTRY_ISSYSTEM_BIOS(rom)) { m_has_bioses= true; break; }
 	}
 
diff --git a/src/emu/luaengine.cpp b/src/emu/luaengine.cpp
index 34b78ba2890..dca6eb4b3b2 100644
--- a/src/emu/luaengine.cpp
+++ b/src/emu/luaengine.cpp
@@ -547,10 +547,10 @@ luabridge::LuaRef lua_engine::l_machine_get_images(const running_machine *r)
 	lua_State *L = luaThis->m_lua_state;
 	luabridge::LuaRef image_table = luabridge::LuaRef::newTable(L);
 
-	image_interface_iterator iter(r->root_device());
-	for (device_image_interface *image = iter.first(); image != nullptr; image = iter.next()) {
-		image_table[image->brief_instance_name()] = image;
-		image_table[image->instance_name()] = image;
+	for (device_image_interface &image : image_interface_iterator(r->root_device()))
+	{
+		image_table[image.brief_instance_name()] = &image;
+		image_table[image.instance_name()] = &image;
 	}
 
 	return image_table;
diff --git a/src/emu/machine.cpp b/src/emu/machine.cpp
index 7940bd6dfb0..16d7b1b214b 100644
--- a/src/emu/machine.cpp
+++ b/src/emu/machine.cpp
@@ -138,18 +138,17 @@ running_machine::running_machine(const machine_config &_config, machine_manager
 
 	// set the machine on all devices
 	device_iterator iter(root_device());
-	for (device_t *device = iter.first(); device != nullptr; device = iter.next())
-		device->set_machine(*this);
+	for (device_t &device : iter)
+		device.set_machine(*this);
 
 	// find devices
-	for (device_t *device = iter.first(); device != nullptr; device = iter.next())
-		if (dynamic_cast<cpu_device *>(device) != nullptr)
+	for (device_t &device : iter)
+		if (dynamic_cast<cpu_device *>(&device) != nullptr)
 		{
-			firstcpu = downcast<cpu_device *>(device);
+			firstcpu = downcast<cpu_device *>(&device);
 			break;
 		}
-	screen_device_iterator screeniter(root_device());
-	primary_screen = screeniter.first();
+	primary_screen = screen_device_iterator(root_device()).first();
 
 	// fetch core options
 	if (options().debug())
@@ -554,19 +553,18 @@ std::string running_machine::get_statename(const char *option) const
 			//printf("check template: %s\n", devname_str.c_str());
 
 			// verify that there is such a device for this system
-			image_interface_iterator iter(root_device());
-			for (device_image_interface *image = iter.first(); image != nullptr; image = iter.next())
+			for (device_image_interface &image : image_interface_iterator(root_device()))
 			{
 				// get the device name
-				std::string tempdevname(image->brief_instance_name());
+				std::string tempdevname(image.brief_instance_name());
 				//printf("check device: %s\n", tempdevname.c_str());
 
 				if (devname_str.compare(tempdevname) == 0)
 				{
 					// verify that such a device has an image mounted
-					if (image->basename_noext() != nullptr)
+					if (image.basename_noext() != nullptr)
 					{
-						std::string filename(image->basename_noext());
+						std::string filename(image.basename_noext());
 
 						// setup snapname and remove the %d_
 						strreplace(statename_str, devname_str.c_str(), filename.c_str());
@@ -1032,20 +1030,19 @@ void running_machine::start_all_devices()
 	{
 		// iterate over all devices
 		int failed_starts = 0;
-		device_iterator iter(root_device());
-		for (device_t *device = iter.first(); device != nullptr; device = iter.next())
-			if (!device->started())
+		for (device_t &device : device_iterator(root_device()))
+			if (!device.started())
 			{
 				// attempt to start the device, catching any expected exceptions
 				try
 				{
 					// if the device doesn't have a machine yet, set it first
-					if (device->m_machine == nullptr)
-						device->set_machine(*this);
+					if (device.m_machine == nullptr)
+						device.set_machine(*this);
 
 					// now start the device
-					osd_printf_verbose("Starting %s '%s'\n", device->name(), device->tag());
-					device->start();
+					osd_printf_verbose("Starting %s '%s'\n", device.name(), device.tag());
+					device.start();
 				}
 
 				// handle missing dependencies by moving the device to the end
@@ -1090,9 +1087,8 @@ void running_machine::stop_all_devices()
 		debug_comment_save(*this);
 
 	// iterate over devices and stop them
-	device_iterator iter(root_device());
-	for (device_t *device = iter.first(); device != nullptr; device = iter.next())
-		device->stop();
+	for (device_t &device : device_iterator(root_device()))
+		device.stop();
 }
 
 
@@ -1103,9 +1099,8 @@ void running_machine::stop_all_devices()
 
 void running_machine::presave_all_devices()
 {
-	device_iterator iter(root_device());
-	for (device_t *device = iter.first(); device != nullptr; device = iter.next())
-		device->pre_save();
+	for (device_t &device : device_iterator(root_device()))
+		device.pre_save();
 }
 
 
@@ -1116,9 +1111,8 @@ void running_machine::presave_all_devices()
 
 void running_machine::postload_all_devices()
 {
-	device_iterator iter(root_device());
-	for (device_t *device = iter.first(); device != nullptr; device = iter.next())
-		device->post_load();
+	for (device_t &device : device_iterator(root_device()))
+		device.post_load();
 }
 
 
@@ -1170,17 +1164,16 @@ std::string running_machine::nvram_filename(device_t &device) const
 
 void running_machine::nvram_load()
 {
-	nvram_interface_iterator iter(root_device());
-	for (device_nvram_interface *nvram = iter.first(); nvram != nullptr; nvram = iter.next())
+	for (device_nvram_interface &nvram : nvram_interface_iterator(root_device()))
 	{
 		emu_file file(options().nvram_directory(), OPEN_FLAG_READ);
-		if (file.open(nvram_filename(nvram->device()).c_str()) == osd_file::error::NONE)
+		if (file.open(nvram_filename(nvram.device()).c_str()) == osd_file::error::NONE)
 		{
-			nvram->nvram_load(file);
+			nvram.nvram_load(file);
 			file.close();
 		}
 		else
-			nvram->nvram_reset();
+			nvram.nvram_reset();
 	}
 }
 
@@ -1191,13 +1184,12 @@ void running_machine::nvram_load()
 
 void running_machine::nvram_save()
 {
-	nvram_interface_iterator iter(root_device());
-	for (device_nvram_interface *nvram = iter.first(); nvram != nullptr; nvram = iter.next())
+	for (device_nvram_interface &nvram : nvram_interface_iterator(root_device()))
 	{
 		emu_file file(options().nvram_directory(), OPEN_FLAG_WRITE | OPEN_FLAG_CREATE | OPEN_FLAG_CREATE_PATHS);
-		if (file.open(nvram_filename(nvram->device()).c_str()) == osd_file::error::NONE)
+		if (file.open(nvram_filename(nvram.device()).c_str()) == osd_file::error::NONE)
 		{
-			nvram->nvram_save(file);
+			nvram.nvram_save(file);
 			file.close();
 		}
 	}
diff --git a/src/emu/mconfig.cpp b/src/emu/mconfig.cpp
index 2bf2eaab3d6..9cd039701cd 100644
--- a/src/emu/mconfig.cpp
+++ b/src/emu/mconfig.cpp
@@ -34,20 +34,20 @@ machine_config::machine_config(const game_driver &gamedrv, emu_options &options)
 
 	bool is_selected_driver = core_stricmp(gamedrv.name,options.system_name())==0;
 	// intialize slot devices - make sure that any required devices have been allocated
-	slot_interface_iterator slotiter(root_device());
-	for (device_slot_interface *slot = slotiter.first(); slot != nullptr; slot = slotiter.next())
+	
+	for (device_slot_interface &slot : slot_interface_iterator(root_device()))
 	{
-		device_t &owner = slot->device();
+		device_t &owner = slot.device();
 		std::string selval;
 		bool isdefault = (options.priority(owner.tag()+1)==OPTION_PRIORITY_DEFAULT);
 		if (is_selected_driver && options.exists(owner.tag()+1))
 			selval = options.main_value(owner.tag()+1);
-		else if (slot->default_option() != nullptr)
-			selval.assign(slot->default_option());
+		else if (slot.default_option() != nullptr)
+			selval.assign(slot.default_option());
 
 		if (!selval.empty())
 		{
-			const device_slot_option *option = slot->option(selval.c_str());
+			const device_slot_option *option = slot.option(selval.c_str());
 
 			if (option && (isdefault || option->selectable()))
 			{
@@ -74,10 +74,9 @@ machine_config::machine_config(const game_driver &gamedrv, emu_options &options)
 	driver_device::static_set_game(*m_root_device, gamedrv);
 
 	// then notify all devices that their configuration is complete
-	device_iterator iter(root_device());
-	for (device_t *device = iter.first(); device != nullptr; device = iter.next())
-		if (!device->configured())
-			device->config_complete();
+	for (device_t &device : device_iterator(root_device()))
+		if (!device.configured())
+			device.config_complete();
 }
 
 
@@ -97,8 +96,7 @@ machine_config::~machine_config()
 
 screen_device *machine_config::first_screen() const
 {
-	screen_device_iterator iter(root_device());
-	return iter.first();
+	return screen_device_iterator(root_device()).first();
 }
 
 
@@ -235,9 +233,8 @@ device_t *machine_config::device_find(device_t *owner, const char *tag)
 void machine_config::remove_references(ATTR_UNUSED device_t &device)
 {
 	// iterate over all devices and remove any references
-	device_iterator iter(root_device());
-	for (device_t *scan = iter.first(); scan != nullptr; scan = iter.next())
-		scan->subdevices().m_tagmap.clear(); //remove(&device);
+	for (device_t &scan : device_iterator(root_device()))
+		scan.subdevices().m_tagmap.clear(); //remove(&device);
 }
 
 
diff --git a/src/emu/network.cpp b/src/emu/network.cpp
index 0f5db2fd703..5124a374748 100644
--- a/src/emu/network.cpp
+++ b/src/emu/network.cpp
@@ -43,19 +43,18 @@ void network_manager::config_load(config_type cfg_type, xml_data_node *parentnod
 
 			if ((tag != nullptr) && (tag[0] != '\0'))
 			{
-				network_interface_iterator iter(machine().root_device());
-				for (device_network_interface *network = iter.first(); network != nullptr; network = iter.next())
+				for (device_network_interface &network : network_interface_iterator(machine().root_device()))
 				{
-					if (!strcmp(tag, network->device().tag())) {
+					if (!strcmp(tag, network.device().tag())) {
 						int interface = xml_get_attribute_int(node, "interface", 0);
-						network->set_interface(interface);
+						network.set_interface(interface);
 						const char *mac_addr = xml_get_attribute_string(node, "mac", nullptr);
 						if (mac_addr != nullptr && strlen(mac_addr) == 17) {
 							char mac[7];
 							unsigned int mac_num[6];
 							sscanf(mac_addr, "%02x:%02x:%02x:%02x:%02x:%02x", &mac_num[0], &mac_num[1], &mac_num[2], &mac_num[3], &mac_num[4], &mac_num[5]);
 							for (int i = 0; i<6; i++) mac[i] = mac_num[i];
-							network->set_mac(mac);
+							network.set_mac(mac);
 						}
 
 					}
@@ -76,15 +75,14 @@ void network_manager::config_save(config_type cfg_type, xml_data_node *parentnod
 	/* only care about game-specific data */
 	if (cfg_type == config_type::CONFIG_TYPE_GAME)
 	{
-		network_interface_iterator iter(machine().root_device());
-		for (device_network_interface *network = iter.first(); network != nullptr; network = iter.next())
+		for (device_network_interface &network : network_interface_iterator(machine().root_device()))
 		{
 			node = xml_add_child(parentnode, "device", nullptr);
 			if (node != nullptr)
 			{
-				xml_set_attribute(node, "tag", network->device().tag());
-				xml_set_attribute_int(node, "interface", network->get_interface());
-				const char *mac = network->get_mac();
+				xml_set_attribute(node, "tag", network.device().tag());
+				xml_set_attribute_int(node, "interface", network.get_interface());
+				const char *mac = network.get_mac();
 				char mac_addr[6 * 3];
 				sprintf(mac_addr, "%02x:%02x:%02x:%02x:%02x:%02x", (UINT8)mac[0], (UINT8)mac[1], (UINT8)mac[2], (UINT8)mac[3], (UINT8)mac[4], (UINT8)mac[5]);
 				xml_set_attribute(node, "mac", mac_addr);
diff --git a/src/emu/render.cpp b/src/emu/render.cpp
index a26bab1849e..8cecb759b53 100644
--- a/src/emu/render.cpp
+++ b/src/emu/render.cpp
@@ -1103,11 +1103,14 @@ int render_target::configured_view(const char *viewname, int targetindex, int nu
 					break;
 				if (viewscreens.count() >= scrcount)
 				{
-					screen_device *screen;
-					for (screen = iter.first(); screen != nullptr; screen = iter.next())
-						if (!viewscreens.contains(*screen))
+					bool has_screen = false;
+					for (screen_device &screen : iter)
+						if (!viewscreens.contains(screen))
+						{
+							has_screen = true;
 							break;
-					if (screen == nullptr)
+						}
+					if (!has_screen)
 						break;
 				}
 			}
@@ -2567,9 +2570,8 @@ render_manager::render_manager(running_machine &machine)
 	machine.configuration().config_register("video", config_saveload_delegate(FUNC(render_manager::config_load), this), config_saveload_delegate(FUNC(render_manager::config_save), this));
 
 	// create one container per screen
-	screen_device_iterator iter(machine.root_device());
-	for (screen_device *screen = iter.first(); screen != nullptr; screen = iter.next())
-		screen->set_container(*container_alloc(screen));
+	for (screen_device &screen : screen_device_iterator(machine.root_device()))
+		screen.set_container(*container_alloc(&screen));
 }
 
 
diff --git a/src/emu/rendlay.cpp b/src/emu/rendlay.cpp
index fee6cbdaaa2..ea2fc8b4bd5 100644
--- a/src/emu/rendlay.cpp
+++ b/src/emu/rendlay.cpp
@@ -164,16 +164,15 @@ static int get_variable_value(running_machine &machine, const char *string, char
 	char temp[100];
 
 	// screen 0 parameters
-	screen_device_iterator iter(machine.root_device());
 	int scrnum = 0;
-	for (const screen_device *device = iter.first(); device != nullptr; device = iter.next(), scrnum++)
+	for (const screen_device &device : screen_device_iterator(machine.root_device()))
 	{
 		// native X aspect factor
 		sprintf(temp, "~scr%dnativexaspect~", scrnum);
 		if (!strncmp(string, temp, strlen(temp)))
 		{
-			int num = device->visible_area().width();
-			int den = device->visible_area().height();
+			int num = device.visible_area().width();
+			int den = device.visible_area().height();
 			reduce_fraction(num, den);
 			*outputptr += sprintf(*outputptr, "%d", num);
 			return strlen(temp);
@@ -183,8 +182,8 @@ static int get_variable_value(running_machine &machine, const char *string, char
 		sprintf(temp, "~scr%dnativeyaspect~", scrnum);
 		if (!strncmp(string, temp, strlen(temp)))
 		{
-			int num = device->visible_area().width();
-			int den = device->visible_area().height();
+			int num = device.visible_area().width();
+			int den = device.visible_area().height();
 			reduce_fraction(num, den);
 			*outputptr += sprintf(*outputptr, "%d", den);
 			return strlen(temp);
@@ -194,7 +193,7 @@ static int get_variable_value(running_machine &machine, const char *string, char
 		sprintf(temp, "~scr%dwidth~", scrnum);
 		if (!strncmp(string, temp, strlen(temp)))
 		{
-			*outputptr += sprintf(*outputptr, "%d", device->visible_area().width());
+			*outputptr += sprintf(*outputptr, "%d", device.visible_area().width());
 			return strlen(temp);
 		}
 
@@ -202,9 +201,12 @@ static int get_variable_value(running_machine &machine, const char *string, char
 		sprintf(temp, "~scr%dheight~", scrnum);
 		if (!strncmp(string, temp, strlen(temp)))
 		{
-			*outputptr += sprintf(*outputptr, "%d", device->visible_area().height());
+			*outputptr += sprintf(*outputptr, "%d", device.visible_area().height());
 			return strlen(temp);
 		}
+
+		// keep count
+		scrnum++;
 	}
 
 	// default: copy the first character and continue
@@ -2401,10 +2403,7 @@ layout_view::item::item(running_machine &machine, xml_data_node &itemnode, simpl
 	// fetch common data
 	int index = xml_get_attribute_int_with_subst(machine, itemnode, "index", -1);
 	if (index != -1)
-	{
-		screen_device_iterator iter(machine.root_device());
-		m_screen = iter.byindex(index);
-	}
+		m_screen = screen_device_iterator(machine.root_device()).byindex(index);
 	m_input_mask = xml_get_attribute_int_with_subst(machine, itemnode, "inputmask", 0);
 	if (m_output_name[0] != 0 && m_element != nullptr)
 		machine.output().set_value(m_output_name.c_str(), m_element->default_state());
diff --git a/src/emu/romload.cpp b/src/emu/romload.cpp
index 45cbeecbea4..6b96de7ab24 100644
--- a/src/emu/romload.cpp
+++ b/src/emu/romload.cpp
@@ -265,22 +265,22 @@ int rom_load_manager::set_disk_handle(const char *region, const char *fullpath)
     from SystemBios structure and OPTION_BIOS
 -------------------------------------------------*/
 
-void rom_load_manager::determine_bios_rom(device_t *device, const char *specbios)
+void rom_load_manager::determine_bios_rom(device_t &device, const char *specbios)
 {
 	const char *defaultname = nullptr;
 	const rom_entry *rom;
 	int default_no = 1;
 	int bios_count = 0;
 
-	device->set_system_bios(0);
+	device.set_system_bios(0);
 
 	/* first determine the default BIOS name */
-	for (rom = device->rom_region(); !ROMENTRY_ISEND(rom); rom++)
+	for (rom = device.rom_region(); !ROMENTRY_ISEND(rom); rom++)
 		if (ROMENTRY_ISDEFAULT_BIOS(rom))
 			defaultname = ROM_GETNAME(rom);
 
 	/* look for a BIOS with a matching name */
-	for (rom = device->rom_region(); !ROMENTRY_ISEND(rom); rom++)
+	for (rom = device.rom_region(); !ROMENTRY_ISEND(rom); rom++)
 		if (ROMENTRY_ISSYSTEM_BIOS(rom))
 		{
 			const char *biosname = ROM_GETNAME(rom);
@@ -290,14 +290,14 @@ void rom_load_manager::determine_bios_rom(device_t *device, const char *specbios
 			/* Allow '-bios n' to still be used */
 			sprintf(bios_number, "%d", bios_flags - 1);
 			if (core_stricmp(bios_number, specbios) == 0 || core_stricmp(biosname, specbios) == 0)
-				device->set_system_bios(bios_flags);
+				device.set_system_bios(bios_flags);
 			if (defaultname != nullptr && core_stricmp(biosname, defaultname) == 0)
 				default_no = bios_flags;
 			bios_count++;
 		}
 
 	/* if none found, use the default */
-	if (device->system_bios() == 0 && bios_count > 0)
+	if (device.system_bios() == 0 && bios_count > 0)
 	{
 		/* if we got neither an empty string nor 'default' then warn the user */
 		if (specbios[0] != 0 && strcmp(specbios, "default") != 0)
@@ -307,10 +307,10 @@ void rom_load_manager::determine_bios_rom(device_t *device, const char *specbios
 		}
 
 		/* set to default */
-		device->set_system_bios(default_no);
+		device.set_system_bios(default_no);
 	}
-	device->set_default_bios(default_no);
-	LOG(("For \"%s\" using System BIOS: %d\n", device->tag(), device->system_bios()));
+	device.set_default_bios(default_no);
+	LOG(("For \"%s\" using System BIOS: %d\n", device.tag(), device.system_bios()));
 }
 
 
@@ -328,11 +328,10 @@ void rom_load_manager::count_roms()
 	m_romstotalsize = 0;
 
 	/* loop over regions, then over files */
-	device_iterator deviter(machine().config().root_device());
-	for (device_t *device = deviter.first(); device != nullptr; device = deviter.next())
-		for (region = rom_first_region(*device); region != nullptr; region = rom_next_region(region))
+	for (device_t &device : device_iterator(machine().config().root_device()))
+		for (region = rom_first_region(device); region != nullptr; region = rom_next_region(region))
 			for (rom = rom_first_file(region); rom != nullptr; rom = rom_next_file(rom))
-				if (ROM_GETBIOSFLAGS(rom) == 0 || ROM_GETBIOSFLAGS(rom) == device->system_bios())
+				if (ROM_GETBIOSFLAGS(rom) == 0 || ROM_GETBIOSFLAGS(rom) == device.system_bios())
 				{
 					m_romstotal++;
 					m_romstotalsize += rom_file_size(rom);
@@ -1062,9 +1061,8 @@ int open_disk_image(emu_options &options, const game_driver *gamedrv, const rom_
 	for (int drv = driver_list::find(*gamedrv); drv != -1; drv = driver_list::clone(drv))
 	{
 		machine_config config(driver_list::driver(drv), options);
-		device_iterator deviter(config.root_device());
-		for (device_t *device = deviter.first(); device != nullptr; device = deviter.next())
-			for (region = rom_first_region(*device); region != nullptr; region = rom_next_region(region))
+		for (device_t &device : device_iterator(config.root_device()))
+			for (region = rom_first_region(device); region != nullptr; region = rom_next_region(region))
 				if (ROMREGION_ISDISKDATA(region))
 					for (rom = rom_first_file(region); rom != nullptr; rom = rom_next_file(rom))
 
@@ -1380,12 +1378,12 @@ void rom_load_manager::process_region_list()
 
 	/* loop until we hit the end */
 	device_iterator deviter(machine().root_device());
-	for (device_t *device = deviter.first(); device != nullptr; device = deviter.next())
-		for (const rom_entry *region = rom_first_region(*device); region != nullptr; region = rom_next_region(region))
+	for (device_t &device : deviter)
+		for (const rom_entry *region = rom_first_region(device); region != nullptr; region = rom_next_region(region))
 		{
 			UINT32 regionlength = ROMREGION_GETLENGTH(region);
 
-			regiontag = rom_region_name(*device, region);
+			regiontag = rom_region_name(device, region);
 			LOG(("Processing region \"%s\" (length=%X)\n", regiontag.c_str(), regionlength));
 
 			/* the first entry must be a region */
@@ -1418,25 +1416,25 @@ void rom_load_manager::process_region_list()
 #endif
 
 				/* now process the entries in the region */
-				process_rom_entries(device->shortname(), region, region + 1, device, FALSE);
+				process_rom_entries(device.shortname(), region, region + 1, &device, FALSE);
 			}
 			else if (ROMREGION_ISDISKDATA(region))
 				process_disk_entries(regiontag.c_str(), region, region + 1, nullptr);
 		}
 
 	/* now go back and post-process all the regions */
-	for (device_t *device = deviter.first(); device != nullptr; device = deviter.next())
-		for (const rom_entry *region = rom_first_region(*device); region != nullptr; region = rom_next_region(region))
+	for (device_t &device : deviter)
+		for (const rom_entry *region = rom_first_region(device); region != nullptr; region = rom_next_region(region))
 		{
-			regiontag = rom_region_name(*device, region);
+			regiontag = rom_region_name(device, region);
 			region_post_process(regiontag.c_str(), ROMREGION_ISINVERTED(region));
 		}
 
 	/* and finally register all per-game parameters */
-	for (device_t *device = deviter.first(); device != nullptr; device = deviter.next())
-		for (const rom_entry *param = rom_first_parameter(*device); param != nullptr; param = rom_next_parameter(param))
+	for (device_t &device : deviter)
+		for (const rom_entry *param = rom_first_parameter(device); param != nullptr; param = rom_next_parameter(param))
 		{
-			regiontag = rom_parameter_name(*device, param);
+			regiontag = rom_parameter_name(device, param);
 			machine().parameters().add(regiontag, rom_parameter_value(param));
 		}
 }
@@ -1451,17 +1449,19 @@ rom_load_manager::rom_load_manager(running_machine &machine)
 	: m_machine(machine)
 {
 	/* figure out which BIOS we are using */
-	device_iterator deviter(machine.config().root_device());
-	for (device_t *device = deviter.first(); device != nullptr; device = deviter.next()) {
-		if (device->rom_region()) {
+	
+	for (device_t &device : device_iterator(machine.config().root_device()))
+	{
+		if (device.rom_region())
+		{
 			std::string specbios;
-			if (device->owner() == nullptr) {
+			if (device.owner() == nullptr)
 				specbios.assign(machine.options().bios());
-			} else {
-				specbios = machine.options().sub_value(device->owner()->tag()+1,"bios");
-				if (specbios.empty()) {
-					specbios = device->default_bios_tag();
-				}
+			else
+			{
+				specbios = machine.options().sub_value(device.owner()->tag()+1,"bios");
+				if (specbios.empty())
+					specbios = device.default_bios_tag();
 			}
 			determine_bios_rom(device, specbios.c_str());
 		}
diff --git a/src/emu/romload.h b/src/emu/romload.h
index fe35bfc3fe2..48190330409 100644
--- a/src/emu/romload.h
+++ b/src/emu/romload.h
@@ -305,7 +305,7 @@ public:
 	void load_software_part_region(device_t &device, software_list_device &swlist, const char *swname, const rom_entry *start_region);
 
 private:
-	void determine_bios_rom(device_t *device, const char *specbios);
+	void determine_bios_rom(device_t &device, const char *specbios);
 	void count_roms();
 	void fill_random(UINT8 *base, UINT32 length);
 	void handle_missing_file(const rom_entry *romp, std::string tried_file_names, chd_error chderr);
diff --git a/src/emu/schedule.cpp b/src/emu/schedule.cpp
index 2e87a62b06f..cab7a4598d4 100644
--- a/src/emu/schedule.cpp
+++ b/src/emu/schedule.cpp
@@ -781,20 +781,19 @@ void device_scheduler::rebuild_execute_list()
 	device_execute_interface **suspend_tailptr = &suspend_list;
 
 	// iterate over all devices
-	execute_interface_iterator iter(machine().root_device());
-	for (device_execute_interface *exec = iter.first(); exec != nullptr; exec = iter.next())
+	for (device_execute_interface &exec : execute_interface_iterator(machine().root_device()))
 	{
 		// append to the appropriate list
-		exec->m_nextexec = nullptr;
-		if (exec->m_suspend == 0)
+		exec.m_nextexec = nullptr;
+		if (exec.m_suspend == 0)
 		{
-			*active_tailptr = exec;
-			active_tailptr = &exec->m_nextexec;
+			*active_tailptr = &exec;
+			active_tailptr = &exec.m_nextexec;
 		}
 		else
 		{
-			*suspend_tailptr = exec;
-			suspend_tailptr = &exec->m_nextexec;
+			*suspend_tailptr = &exec;
+			suspend_tailptr = &exec.m_nextexec;
 		}
 	}
 
diff --git a/src/emu/softlist.cpp b/src/emu/softlist.cpp
index 4288fa93f90..8abceb710d8 100644
--- a/src/emu/softlist.cpp
+++ b/src/emu/softlist.cpp
@@ -391,10 +391,9 @@ void software_list_device::release()
 software_list_device *software_list_device::find_by_name(const machine_config &config, const char *name)
 {
 	// iterate over each device in the system and find a match
-	software_list_device_iterator deviter(config.root_device());
-	for (software_list_device *swlistdev = deviter.first(); swlistdev != nullptr; swlistdev = deviter.next())
-		if (strcmp(swlistdev->list_name(), name) == 0)
-			return swlistdev;
+	for (software_list_device &swlistdev : software_list_device_iterator(config.root_device()))
+		if (strcmp(swlistdev.list_name(), name) == 0)
+			return &swlistdev;
 	return nullptr;
 }
 
@@ -409,25 +408,25 @@ void software_list_device::display_matches(const machine_config &config, const c
 {
 	// check if there is at least one software list
 	software_list_device_iterator deviter(config.root_device());
-	if (deviter.first())
+	if (deviter.first() != nullptr)
 		osd_printf_error("\n\"%s\" approximately matches the following\n"
 							"supported software items (best match first):\n\n", name);
 
 	// iterate through lists
-	for (software_list_device *swlistdev = deviter.first(); swlistdev != nullptr; swlistdev = deviter.next())
+	for (software_list_device &swlistdev : deviter)
 	{
 		// get the top 16 approximate matches for the selected device interface (i.e. only carts for cartslot, etc.)
 		software_info *matches[16] = { nullptr };
-		swlistdev->find_approx_matches(name, ARRAY_LENGTH(matches), matches, interface);
+		swlistdev.find_approx_matches(name, ARRAY_LENGTH(matches), matches, interface);
 
 		// if we found some, print them
 		if (matches[0] != nullptr)
 		{
 			// different output depending on original system or compatible
-			if (swlistdev->list_type() == SOFTWARE_LIST_ORIGINAL_SYSTEM)
-				osd_printf_error("* Software list \"%s\" (%s) matches: \n", swlistdev->list_name(), swlistdev->description());
+			if (swlistdev.list_type() == SOFTWARE_LIST_ORIGINAL_SYSTEM)
+				osd_printf_error("* Software list \"%s\" (%s) matches: \n", swlistdev.list_name(), swlistdev.description());
 			else
-				osd_printf_error("* Compatible software list \"%s\" (%s) matches: \n", swlistdev->list_name(), swlistdev->description());
+				osd_printf_error("* Compatible software list \"%s\" (%s) matches: \n", swlistdev.list_name(), swlistdev.description());
 
 			// print them out
 			for (auto & matche : matches)
diff --git a/src/emu/sound.cpp b/src/emu/sound.cpp
index eedab51e78b..799ea4f1fc5 100644
--- a/src/emu/sound.cpp
+++ b/src/emu/sound.cpp
@@ -899,19 +899,20 @@ void sound_manager::set_attenuation(int attenuation)
 bool sound_manager::indexed_mixer_input(int index, mixer_input &info) const
 {
 	// scan through the mixers until we find the indexed input
-	mixer_interface_iterator iter(machine().root_device());
-	for (info.mixer = iter.first(); info.mixer != nullptr; info.mixer = iter.next())
+	for (device_mixer_interface &mixer : mixer_interface_iterator(machine().root_device()))
 	{
-		if (index < info.mixer->inputs())
+		if (index < mixer.inputs())
 		{
-			info.stream = info.mixer->input_to_stream_input(index, info.inputnum);
+			info.mixer = &mixer;
+			info.stream = mixer.input_to_stream_input(index, info.inputnum);
 			assert(info.stream != nullptr);
 			return true;
 		}
-		index -= info.mixer->inputs();
+		index -= mixer.inputs();
 	}
 
 	// didn't locate
+	info.mixer = nullptr;
 	return false;
 }
 
@@ -937,9 +938,8 @@ void sound_manager::mute(bool mute, UINT8 reason)
 void sound_manager::reset()
 {
 	// reset all the sound chips
-	sound_interface_iterator iter(machine().root_device());
-	for (device_sound_interface *sound = iter.first(); sound != nullptr; sound = iter.next())
-		sound->device().reset();
+	for (device_sound_interface &sound : sound_interface_iterator(machine().root_device()))
+		sound.device().reset();
 }
 
 
@@ -1039,9 +1039,8 @@ void sound_manager::update(void *ptr, int param)
 
 	// force all the speaker streams to generate the proper number of samples
 	int samples_this_update = 0;
-	speaker_device_iterator iter(machine().root_device());
-	for (speaker_device *speaker = iter.first(); speaker != nullptr; speaker = iter.next())
-		speaker->mix(&m_leftmix[0], &m_rightmix[0], samples_this_update, (m_muted & MUTE_REASON_SYSTEM));
+	for (speaker_device &speaker : speaker_device_iterator(machine().root_device()))
+		speaker.mix(&m_leftmix[0], &m_rightmix[0], samples_this_update, (m_muted & MUTE_REASON_SYSTEM));
 
 	// now downmix the final result
 	UINT32 finalmix_step = machine().video().speed_factor();
diff --git a/src/emu/ui/cheatopt.cpp b/src/emu/ui/cheatopt.cpp
index acb8710c51e..55d3d20f6d1 100644
--- a/src/emu/ui/cheatopt.cpp
+++ b/src/emu/ui/cheatopt.cpp
@@ -158,8 +158,7 @@ ui_menu_cheat::~ui_menu_cheat()
 
 ui_menu_autofire::ui_menu_autofire(running_machine &machine, render_container *container) : ui_menu(machine, container)
 {
-	screen_device_iterator iter(machine.root_device());
-	const screen_device *screen = iter.first();
+	const screen_device *screen = machine.first_screen();
 
 	if (screen == nullptr)
 	{
diff --git a/src/emu/ui/datmenu.cpp b/src/emu/ui/datmenu.cpp
index 85a237b582e..9da52bfa0f2 100644
--- a/src/emu/ui/datmenu.cpp
+++ b/src/emu/ui/datmenu.cpp
@@ -29,15 +29,14 @@ ui_menu_dats_view::ui_menu_dats_view(running_machine &machine, render_container
 	, m_issoft(false)
 
 {
-	image_interface_iterator iter(machine.root_device());
-	for (device_image_interface *image = iter.first(); image != nullptr; image = iter.next())
+	for (device_image_interface &image : image_interface_iterator(machine.root_device()))
 	{
-		if (image->filename())
+		if (image.filename())
 		{
-			m_list = strensure(image->software_list_name());
-			m_short = strensure(image->software_entry()->shortname());
-			m_long = strensure(image->software_entry()->longname());
-			m_parent = strensure(image->software_entry()->parentname());
+			m_list = strensure(image.software_list_name());
+			m_short = strensure(image.software_entry()->shortname());
+			m_long = strensure(image.software_entry()->longname());
+			m_parent = strensure(image.software_entry()->parentname());
 		}
 	}
 
diff --git a/src/emu/ui/devopt.cpp b/src/emu/ui/devopt.cpp
index bc99b960e81..de145a41b4a 100644
--- a/src/emu/ui/devopt.cpp
+++ b/src/emu/ui/devopt.cpp
@@ -20,21 +20,9 @@
 
 ui_menu_device_config::ui_menu_device_config(running_machine &machine, render_container *container, device_slot_interface *slot, device_slot_option *option) : ui_menu(machine, container)
 {
-	std::string tmp_tag;
-	tmp_tag.assign(slot->device().tag()).append(":").append(option->name());
 	m_option = option;
 	m_owner = slot;
-	m_mounted = false;
-
-	device_iterator deviter(machine.config().root_device());
-	for (device_t *device = deviter.first(); device != nullptr; device = deviter.next())
-	{
-		if (strcmp(device->tag(), tmp_tag.c_str()) == 0)
-		{
-			m_mounted = true;
-			break;
-		}
-	}
+	m_mounted = slot->device().subdevice(option->name()) != nullptr;
 }
 
 void ui_menu_device_config::populate()
@@ -59,22 +47,21 @@ void ui_menu_device_config::populate()
 	{
 		str << "* CPU:\n";
 		std::unordered_set<std::string> exectags;
-		for (device_execute_interface *exec = execiter.first(); exec != nullptr; exec = execiter.next())
+		for (device_execute_interface &exec : execiter)
 		{
-			if (!exectags.insert(exec->device().tag()).second)
+			if (!exectags.insert(exec.device().tag()).second)
 				continue;
 
 			// get cpu specific clock that takes internal multiplier/dividers into account
-			int clock = exec->device().clock();
+			int clock = exec.device().clock();
 
 			// count how many identical CPUs we have
 			int count = 1;
-			const char *name = exec->device().name();
-			execute_interface_iterator execinneriter(*dev);
-			for (device_execute_interface *scan = execinneriter.first(); scan != nullptr; scan = execinneriter.next())
+			const char *name = exec.device().name();
+			for (device_execute_interface &scan : execiter)
 			{
-				if (exec->device().type() == scan->device().type() && strcmp(name, scan->device().name()) == 0 && exec->device().clock() == scan->device().clock())
-					if (exectags.insert(scan->device().tag()).second)
+				if (exec.device().type() == scan.device().type() && strcmp(name, scan.device().name()) == 0 && exec.device().clock() == scan.device().clock())
+					if (exectags.insert(scan.device().tag()).second)
 						count++;
 			}
 
@@ -98,20 +85,20 @@ void ui_menu_device_config::populate()
 	if (scriter.count() > 0)
 	{
 		str << "* Video:\n";
-		for (screen_device *screen = scriter.first(); screen != nullptr; screen = scriter.next())
+		for (screen_device &screen : scriter)
 		{
-			util::stream_format(str, "  Screen '%s': ", screen->tag());
+			util::stream_format(str, "  Screen '%s': ", screen.tag());
 
-			if (screen->screen_type() == SCREEN_TYPE_VECTOR)
+			if (screen.screen_type() == SCREEN_TYPE_VECTOR)
 				str << "Vector\n";
 			else
 			{
-				const rectangle &visarea = screen->visible_area();
+				const rectangle &visarea = screen.visible_area();
 
 				util::stream_format(str, "%d " UTF8_MULTIPLY " %d (%s) %f" UTF8_NBSP "Hz\n",
 									visarea.width(), visarea.height(),
 									(machine().system().flags & ORIENTATION_SWAP_XY) ? "V" : "H",
-									ATTOSECONDS_TO_HZ(screen->frame_period().attoseconds()));
+									ATTOSECONDS_TO_HZ(screen.frame_period().attoseconds()));
 			}
 		}
 	}
@@ -122,18 +109,17 @@ void ui_menu_device_config::populate()
 	{
 		str << "* Sound:\n";
 		std::unordered_set<std::string> soundtags;
-		for (device_sound_interface *sound = snditer.first(); sound != nullptr; sound = snditer.next())
+		for (device_sound_interface &sound : snditer)
 		{
-			if (!soundtags.insert(sound->device().tag()).second)
+			if (!soundtags.insert(sound.device().tag()).second)
 				continue;
 
 			// count how many identical sound chips we have
 			int count = 1;
-			sound_interface_iterator sndinneriter(*dev);
-			for (device_sound_interface *scan = sndinneriter.first(); scan != nullptr; scan = sndinneriter.next())
+			for (device_sound_interface &scan : snditer)
 			{
-				if (sound->device().type() == scan->device().type() && sound->device().clock() == scan->device().clock())
-					if (soundtags.insert(scan->device().tag()).second)
+				if (sound.device().type() == scan.device().type() && sound.device().clock() == scan.device().clock())
+					if (soundtags.insert(scan.device().tag()).second)
 						count++;
 			}
 			// if more than one, prepend a #x in front of the CPU name
@@ -141,10 +127,10 @@ void ui_menu_device_config::populate()
 				util::stream_format(str,"  %d" UTF8_MULTIPLY, count);
 			else
 				str << "  ";
-			str << sound->device().name();
+			str << sound.device().name();
 
 			// display clock in kHz or MHz
-			int clock = sound->device().clock();
+			int clock = sound.device().clock();
 			if (clock >= 1000000)
 				util::stream_format(str," %d.%06d" UTF8_NBSP "MHz\n", clock / 1000000, clock % 1000000);
 			else if (clock != 0)
@@ -184,9 +170,8 @@ void ui_menu_device_config::populate()
 	std::string errors;
 	std::ostringstream dips_opt, confs_opt;
 	ioport_list portlist;
-	device_iterator iptiter(*dev);
-	for (device_t *iptdev = iptiter.first(); iptdev != nullptr; iptdev = iptiter.next())
-		portlist.append(*iptdev, errors);
+	for (device_t &iptdev : device_iterator(*dev))
+		portlist.append(iptdev, errors);
 
 	// check if the device adds inputs to the system
 	for (ioport_port &port : portlist)
@@ -263,16 +248,16 @@ void ui_menu_device_config::populate()
 	if (imgiter.count() > 0)
 	{
 		str << "* Media Options:\n";
-		for (const device_image_interface *imagedev = imgiter.first(); imagedev != nullptr; imagedev = imgiter.next())
-			util::stream_format(str, "  %s    [tag: %s]\n", imagedev->image_type_name(), imagedev->device().tag());
+		for (const device_image_interface &imagedev : imgiter)
+			util::stream_format(str, "  %s    [tag: %s]\n", imagedev.image_type_name(), imagedev.device().tag());
 	}
 
 	slot_interface_iterator slotiter(*dev);
 	if (slotiter.count() > 0)
 	{
 		str << "* Slot Options:\n";
-		for (const device_slot_interface *slot = slotiter.first(); slot != nullptr; slot = slotiter.next())
-			util::stream_format(str, "  %s    [default: %s]\n", slot->device().tag(), slot->default_option() ? slot->default_option() : "----");
+		for (const device_slot_interface &slot : slotiter)
+			util::stream_format(str, "  %s    [default: %s]\n", slot.device().tag(), slot.default_option() ? slot.default_option() : "----");
 	}
 
 	if ((execiter.count() + scriter.count() + snditer.count() + imgiter.count() + slotiter.count() + bios + dips + confs
diff --git a/src/emu/ui/filemngr.cpp b/src/emu/ui/filemngr.cpp
index 7fbff85217f..cac30f4f525 100644
--- a/src/emu/ui/filemngr.cpp
+++ b/src/emu/ui/filemngr.cpp
@@ -113,28 +113,26 @@ void ui_menu_file_manager::populate()
 	}
 
 	// cycle through all devices for this system
-	device_iterator iter(machine().root_device());
 	std::unordered_set<std::string> devtags;
-	for (device_t *dev = iter.first(); dev != nullptr; dev = iter.next())
+	for (device_t &dev : device_iterator(machine().root_device()))
 	{
 		bool tag_appended = false;
-		if (!devtags.insert(dev->tag()).second)
+		if (!devtags.insert(dev.tag()).second)
 			continue;
 
 		// check whether it owns an image interface
-		image_interface_iterator subiter(*dev);
-		if (subiter.count() > 0)
+		image_interface_iterator subiter(dev);
+		if (subiter.first() != nullptr)
 		{
 			// if so, cycle through all its image interfaces
-			image_interface_iterator subiterator(*dev);
-			for (device_image_interface *scan = subiterator.first(); scan != nullptr; scan = subiterator.next())
+			for (device_image_interface &scan : subiter)
 			{
-                if (!scan->user_loadable())
-                    continue;
-                
+				if (!scan.user_loadable())
+					continue;
+
 				// if it is a children device, and not something further down the device tree, we want it in the menu!
-				if (strcmp(scan->device().owner()->tag(), dev->tag()) == 0)
-					if (devtags.insert(scan->device().tag()).second)
+				if (strcmp(scan.device().owner()->tag(), dev.tag()) == 0)
+					if (devtags.insert(scan.device().tag()).second)
 					{
 						// check whether we already had some devices with the same owner: if not, output the owner tag!
 						if (!tag_appended)
@@ -143,12 +141,12 @@ void ui_menu_file_manager::populate()
 								first_entry = false;
 							else
 								item_append(ui_menu_item_type::SEPARATOR);
-							item_append(string_format("[root%s]", dev->tag()).c_str(), nullptr, 0, nullptr);
+							item_append(string_format("[root%s]", dev.tag()).c_str(), nullptr, 0, nullptr);
 							tag_appended = true;
 						}
 						// finally, append the image interface to the menu
-						fill_image_line(scan, tmp_inst, tmp_name);
-						item_append(tmp_inst.c_str(), tmp_name.c_str(), 0, (void *)scan);
+						fill_image_line(&scan, tmp_inst, tmp_name);
+						item_append(tmp_inst.c_str(), tmp_name.c_str(), 0, (void *)&scan);
 					}
 			}
 		}
diff --git a/src/emu/ui/imgcntrl.cpp b/src/emu/ui/imgcntrl.cpp
index 883541786af..5497d953f99 100644
--- a/src/emu/ui/imgcntrl.cpp
+++ b/src/emu/ui/imgcntrl.cpp
@@ -36,14 +36,10 @@ ui_menu_control_device_image::ui_menu_control_device_image(running_machine &mach
 {
 	image = _image;
 
-	sld = nullptr;
-	if (image->software_list_name()) {
-		software_list_device_iterator iter(machine.config().root_device());
-		for (software_list_device *swlist = iter.first(); swlist != nullptr; swlist = iter.next())
-		{
-			if (strcmp(swlist->list_name(),image->software_list_name())==0) sld = swlist;
-		}
-	}
+	if (image->software_list_name())
+		sld = software_list_device::find_by_name(machine.config(), image->software_list_name());
+	else
+		sld = nullptr;
 	swi = image->software_entry();
 	swp = image->part_entry();
 
diff --git a/src/emu/ui/info.cpp b/src/emu/ui/info.cpp
index 10090c32305..32fe064f484 100644
--- a/src/emu/ui/info.cpp
+++ b/src/emu/ui/info.cpp
@@ -58,9 +58,8 @@ void ui_menu_image_info::populate()
 	item_append(machine().system().description, nullptr, MENU_FLAG_DISABLE, nullptr);
 	item_append("", nullptr, MENU_FLAG_DISABLE, nullptr);
 
-	image_interface_iterator iter(machine().root_device());
-	for (device_image_interface *image = iter.first(); image != nullptr; image = iter.next())
-			image_info(image);
+	for (device_image_interface &image : image_interface_iterator(machine().root_device()))
+		image_info(&image);
 }
 
 void ui_menu_image_info::handle()
diff --git a/src/emu/ui/info_pty.cpp b/src/emu/ui/info_pty.cpp
index 563b77dbff5..267f8b1c5b9 100644
--- a/src/emu/ui/info_pty.cpp
+++ b/src/emu/ui/info_pty.cpp
@@ -26,14 +26,13 @@ void ui_menu_pty_info::populate()
 	item_append(_("Pseudo terminals"), nullptr, MENU_FLAG_DISABLE, nullptr);
 	item_append("", nullptr, MENU_FLAG_DISABLE, nullptr);
 
-	pty_interface_iterator iter(machine().root_device());
-	for (device_pty_interface *pty = iter.first(); pty != nullptr; pty = iter.next()) {
-		const char *port_name = pty->device().owner()->tag() + 1;
-		if (pty->is_open()) {
-			item_append(port_name , pty->slave_name() , MENU_FLAG_DISABLE , nullptr);
-		} else {
-			item_append(port_name , _("[failed]") , MENU_FLAG_DISABLE , nullptr);
-		}
+	for (device_pty_interface &pty : pty_interface_iterator(machine().root_device()))
+	{
+		const char *port_name = pty.device().owner()->tag() + 1;
+		if (pty.is_open())
+			item_append(port_name, pty.slave_name(), MENU_FLAG_DISABLE, nullptr);
+		else
+			item_append(port_name, _("[failed]"), MENU_FLAG_DISABLE, nullptr);
 		item_append("", nullptr, MENU_FLAG_DISABLE, nullptr);
 	}
 }
diff --git a/src/emu/ui/inifile.cpp b/src/emu/ui/inifile.cpp
index 3324d56363e..15cdefa60a6 100644
--- a/src/emu/ui/inifile.cpp
+++ b/src/emu/ui/inifile.cpp
@@ -207,30 +207,29 @@ void favorite_manager::add_favorite_game()
 	}
 
 	bool software_avail = false;
-	image_interface_iterator iter(machine().root_device());
-	for (device_image_interface *image = iter.first(); image != nullptr; image = iter.next())
+	for (device_image_interface &image : image_interface_iterator(machine().root_device()))
 	{
-		if (image->exists() && image->software_entry())
+		if (image.exists() && image.software_entry())
 		{
-			const software_info *swinfo = image->software_entry();
-			const software_part *part = image->part_entry();
+			const software_info *swinfo = image.software_entry();
+			const software_part *part = image.part_entry();
 			ui_software_info tmpmatches;
 			tmpmatches.shortname = strensure(swinfo->shortname());
-			tmpmatches.longname = strensure(image->longname());
+			tmpmatches.longname = strensure(image.longname());
 			tmpmatches.parentname = strensure(swinfo->parentname());
-			tmpmatches.year = strensure(image->year());
-			tmpmatches.publisher = strensure(image->manufacturer());
-			tmpmatches.supported = image->supported();
+			tmpmatches.year = strensure(image.year());
+			tmpmatches.publisher = strensure(image.manufacturer());
+			tmpmatches.supported = image.supported();
 			tmpmatches.part = strensure(part->name());
 			tmpmatches.driver = &machine().system();
-			tmpmatches.listname = strensure(image->software_list_name());
+			tmpmatches.listname = strensure(image.software_list_name());
 			tmpmatches.interface = strensure(part->interface());
-			tmpmatches.instance = strensure(image->instance_name());
+			tmpmatches.instance = strensure(image.instance_name());
 			tmpmatches.startempty = 0;
 			tmpmatches.parentlongname.clear();
 			if (swinfo->parentname())
 			{
-				software_list_device *swlist = software_list_device::find_by_name(machine().config(), image->software_list_name());
+				software_list_device *swlist = software_list_device::find_by_name(machine().config(), image.software_list_name());
 				for (software_info &c_swinfo : swlist->get_info())
 				{
 					std::string c_parent(c_swinfo.parentname());
@@ -247,7 +246,7 @@ void favorite_manager::add_favorite_game()
 				if (!strcmp(flist.name(), "usage"))
 					tmpmatches.usage = flist.value();
 
-			tmpmatches.devicetype = strensure(image->image_type_name());
+			tmpmatches.devicetype = strensure(image.image_type_name());
 			tmpmatches.available = true;
 			software_avail = true;
 			m_list.push_back(tmpmatches);
@@ -288,18 +287,17 @@ bool favorite_manager::isgame_favorite()
 	if ((machine().system().flags & MACHINE_TYPE_ARCADE) != 0)
 		return isgame_favorite(&machine().system());
 
-	image_interface_iterator iter(machine().root_device());
 	bool image_loaded = false;
 
-	for (device_image_interface *image = iter.first(); image != nullptr; image = iter.next())
+	for (device_image_interface &image : image_interface_iterator(machine().root_device()))
 	{
-		const software_info *swinfo = image->software_entry();
-		if (image->exists() && swinfo != nullptr)
+		const software_info *swinfo = image.software_entry();
+		if (image.exists() && swinfo != nullptr)
 		{
 			image_loaded = true;
 			for (size_t current = 0; current < m_list.size(); current++)
 				if (m_list[current].shortname == swinfo->shortname() &&
-					m_list[current].listname == image->software_list_name())
+					m_list[current].listname == image.software_list_name())
 				{
 					m_current = current;
 					return true;
diff --git a/src/emu/ui/mainmenu.cpp b/src/emu/ui/mainmenu.cpp
index 079ffbf8be8..339ecd134ab 100644
--- a/src/emu/ui/mainmenu.cpp
+++ b/src/emu/ui/mainmenu.cpp
@@ -71,46 +71,40 @@ void ui_menu_main::populate()
 	/* add game info menu */
 	item_append(_("Machine Information"), nullptr, 0, (void *)GAME_INFO);
 
-	image_interface_iterator imgiter(machine().root_device());
-    for (device_image_interface *image = imgiter.first(); image != nullptr; image = imgiter.next())
-    {
-        if (image->user_loadable())
-        {
-            /* add image info menu */
-            item_append(_("Image Information"), nullptr, 0, (void *)IMAGE_MENU_IMAGE_INFO);
-            
-            /* add file manager menu */
-            item_append(_("File Manager"), nullptr, 0, (void *)IMAGE_MENU_FILE_MANAGER);
-            
-            break;
-        }
-    }
+	for (device_image_interface &image : image_interface_iterator(machine().root_device()))
+	{
+		if (image.user_loadable())
+		{
+			/* add image info menu */
+			item_append(_("Image Information"), nullptr, 0, (void *)IMAGE_MENU_IMAGE_INFO);
 
-    /* add tape control menu */
-    cassette_device_iterator cassiter(machine().root_device());
-    if (cassiter.first() != nullptr)
-        item_append(_("Tape Control"), nullptr, 0, (void *)TAPE_CONTROL);
+			/* add file manager menu */
+			item_append(_("File Manager"), nullptr, 0, (void *)IMAGE_MENU_FILE_MANAGER);
 
-    pty_interface_iterator ptyiter(machine().root_device());
-    if (ptyiter.first() != nullptr)
-        item_append(_("Pseudo terminals"), nullptr, 0, (void *)PTY_INFO);
+			break;
+		}
+	}
 
-    if (machine().ioport().has_bioses())
+	/* add tape control menu */
+	if (cassette_device_iterator(machine().root_device()).first() != nullptr)
+		item_append(_("Tape Control"), nullptr, 0, (void *)TAPE_CONTROL);
+
+	if (pty_interface_iterator(machine().root_device()).first() != nullptr)
+		item_append(_("Pseudo terminals"), nullptr, 0, (void *)PTY_INFO);
+
+	if (machine().ioport().has_bioses())
 		item_append(_("Bios Selection"), nullptr, 0, (void *)BIOS_SELECTION);
 
-    /* add slot info menu */
-	slot_interface_iterator slotiter(machine().root_device());
-	if (slotiter.first() != nullptr)
+	/* add slot info menu */
+	if (slot_interface_iterator(machine().root_device()).first() != nullptr)
 		item_append(_("Slot Devices"), nullptr, 0, (void *)SLOT_DEVICES);
 
-    /* add Barcode reader menu */
-	barcode_reader_device_iterator bcriter(machine().root_device());
-	if (bcriter.first() != nullptr)
+	/* add Barcode reader menu */
+	if (barcode_reader_device_iterator(machine().root_device()).first() != nullptr)
 		item_append(_("Barcode Reader"), nullptr, 0, (void *)BARCODE_READ);
 
-    /* add network info menu */
-	network_interface_iterator netiter(machine().root_device());
-	if (netiter.first() != nullptr)
+	/* add network info menu */
+	if (network_interface_iterator(machine().root_device()).first() != nullptr)
 		item_append(_("Network Devices"), nullptr, 0, (void*)NETWORK_DEVICES);
 
 	/* add keyboard mode menu */
diff --git a/src/emu/ui/miscmenu.cpp b/src/emu/ui/miscmenu.cpp
index 75ffd0a7645..3cdac2a77de 100644
--- a/src/emu/ui/miscmenu.cpp
+++ b/src/emu/ui/miscmenu.cpp
@@ -72,19 +72,19 @@ ui_menu_bios_selection::ui_menu_bios_selection(running_machine &machine, render_
 void ui_menu_bios_selection::populate()
 {
 	/* cycle through all devices for this system */
-	device_iterator deviter(machine().root_device());
-	for (device_t *device = deviter.first(); device != nullptr; device = deviter.next())
+	for (device_t &device : device_iterator(machine().root_device()))
 	{
-		if (device->rom_region()) {
+		if (device.rom_region())
+		{
 			const char *val = "default";
-			for (const rom_entry *rom = device->rom_region(); !ROMENTRY_ISEND(rom); rom++)
+			for (const rom_entry *rom = device.rom_region(); !ROMENTRY_ISEND(rom); rom++)
 			{
-				if (ROMENTRY_ISSYSTEM_BIOS(rom) && ROM_GETBIOSFLAGS(rom)==device->system_bios())
+				if (ROMENTRY_ISSYSTEM_BIOS(rom) && ROM_GETBIOSFLAGS(rom) == device.system_bios())
 				{
 					val = ROM_GETHASHDATA(rom);
 				}
 			}
-			item_append(strcmp(device->tag(),":")==0 ? "driver" : device->tag()+1, val, MENU_FLAG_LEFT_ARROW | MENU_FLAG_RIGHT_ARROW, (void *)device);
+			item_append(device.owner() == nullptr ? "driver" : device.tag()+1, val, MENU_FLAG_LEFT_ARROW | MENU_FLAG_RIGHT_ARROW, (void *)&device);
 		}
 	}
 
@@ -154,10 +154,9 @@ ui_menu_network_devices::~ui_menu_network_devices()
 void ui_menu_network_devices::populate()
 {
 	/* cycle through all devices for this system */
-	network_interface_iterator iter(machine().root_device());
-	for (device_network_interface *network = iter.first(); network != nullptr; network = iter.next())
+	for (device_network_interface &network : network_interface_iterator(machine().root_device()))
 	{
-		int curr = network->get_interface();
+		int curr = network.get_interface();
 		const char *title = nullptr;
 		const osd_netdev::entry_t *entry = netdev_first();
 		while(entry) {
@@ -168,7 +167,7 @@ void ui_menu_network_devices::populate()
 			entry = entry->m_next;
 		}
 
-		item_append(network->device().tag(),  (title) ? title : "------", MENU_FLAG_LEFT_ARROW | MENU_FLAG_RIGHT_ARROW, (void *)network);
+		item_append(network.device().tag(),  (title) ? title : "------", MENU_FLAG_LEFT_ARROW | MENU_FLAG_RIGHT_ARROW, (void *)network);
 	}
 }
 
diff --git a/src/emu/ui/selgame.cpp b/src/emu/ui/selgame.cpp
index a0c7f02fead..1a7f02eb920 100644
--- a/src/emu/ui/selgame.cpp
+++ b/src/emu/ui/selgame.cpp
@@ -1048,9 +1048,8 @@ void ui_menu_select_game::inkey_select(const ui_menu_event *m_event)
 		{
 			if ((driver->flags & MACHINE_TYPE_ARCADE) == 0)
 			{
-				software_list_device_iterator iter(enumerator.config().root_device());
-				for (software_list_device *swlistdev = iter.first(); swlistdev != nullptr; swlistdev = iter.next())
-					if (!swlistdev->get_info().empty())
+				for (software_list_device &swlistdev : software_list_device_iterator(enumerator.config().root_device()))
+					if (!swlistdev.get_info().empty())
 					{
 						ui_menu::stack_push(global_alloc_clear<ui_menu_select_software>(machine(), container, driver));
 						return;
diff --git a/src/emu/ui/selsoft.cpp b/src/emu/ui/selsoft.cpp
index e545b070b17..0cc5a951df9 100644
--- a/src/emu/ui/selsoft.cpp
+++ b/src/emu/ui/selsoft.cpp
@@ -430,9 +430,8 @@ void ui_menu_select_software::populate()
 	int old_software = -1;
 
 	machine_config config(*m_driver, machine().options());
-	image_interface_iterator iter(config.root_device());
-	for (device_image_interface *image = iter.first(); image != nullptr; image = iter.next())
-		if (image->filename() == nullptr && image->must_be_loaded())
+	for (device_image_interface &image : image_interface_iterator(config.root_device()))
+		if (image.filename() == nullptr && image.must_be_loaded())
 		{
 			m_has_empty_start = false;
 			break;
@@ -528,32 +527,30 @@ void ui_menu_select_software::build_software_list()
 	m_swinfo.emplace_back(m_driver->name, m_driver->description, "", "", "", 0, "", m_driver, "", "", "", 1, "", "", "", true);
 
 	machine_config config(*m_driver, machine().options());
-	software_list_device_iterator deviter(config.root_device());
 
 	// iterate thru all software lists
-	for (software_list_device *swlist = deviter.first(); swlist != nullptr; swlist = deviter.next())
+	for (software_list_device &swlist : software_list_device_iterator(config.root_device()))
 	{
-		m_filter.swlist.name.push_back(swlist->list_name());
-		m_filter.swlist.description.push_back(swlist->description());
-		for (software_info &swinfo : swlist->get_info())
+		m_filter.swlist.name.push_back(swlist.list_name());
+		m_filter.swlist.description.push_back(swlist.description());
+		for (software_info &swinfo : swlist.get_info())
 		{
 			software_part *part = swinfo.first_part();
-			if (part->is_compatible(*swlist))
+			if (part->is_compatible(swlist))
 			{
 				const char *instance_name = nullptr;
 				const char *type_name = nullptr;
 				ui_software_info tmpmatches;
-				image_interface_iterator imgiter(config.root_device());
-				for (device_image_interface *image = imgiter.first(); image != nullptr; image = imgiter.next())
+				for (device_image_interface &image : image_interface_iterator(config.root_device()))
 				{
-					const char *interface = image->image_interface();
+					const char *interface = image.image_interface();
 					if (interface != nullptr && part->matches_interface(interface))
 					{
-						instance_name = image->instance_name();
+						instance_name = image.instance_name();
 						if (instance_name != nullptr)
-							tmpmatches.instance = image->instance_name();
+							tmpmatches.instance = image.instance_name();
 
-						type_name = image->image_type_name();
+						type_name = image.image_type_name();
 						if (type_name != nullptr)
 							tmpmatches.devicetype = type_name;
 						break;
@@ -571,7 +568,7 @@ void ui_menu_select_software::build_software_list()
 				tmpmatches.supported = swinfo.supported();
 				tmpmatches.part = strensure(part->name());
 				tmpmatches.driver = m_driver;
-				tmpmatches.listname = strensure(swlist->list_name());
+				tmpmatches.listname = strensure(swlist.list_name());
 				tmpmatches.interface = strensure(part->interface());
 				tmpmatches.startempty = 0;
 				tmpmatches.parentlongname.clear();
diff --git a/src/emu/ui/slotopt.cpp b/src/emu/ui/slotopt.cpp
index e6d0a74a452..b676778b07e 100644
--- a/src/emu/ui/slotopt.cpp
+++ b/src/emu/ui/slotopt.cpp
@@ -19,33 +19,33 @@
 /*-------------------------------------------------
     ui_slot_get_current_option - returns
 -------------------------------------------------*/
-device_slot_option *ui_menu_slot_devices::slot_get_current_option(device_slot_interface *slot)
+device_slot_option *ui_menu_slot_devices::slot_get_current_option(device_slot_interface &slot)
 {
 	std::string current;
-	if (slot->fixed())
+	if (slot.fixed())
 	{
-		if (slot->default_option() == nullptr) return nullptr;
-		current.assign(slot->default_option());
+		if (slot.default_option() == nullptr) return nullptr;
+		current.assign(slot.default_option());
 	}
 	else
 	{
-		current = machine().options().main_value(slot->device().tag() + 1);
+		current = machine().options().main_value(slot.device().tag() + 1);
 	}
 
-	return slot->option(current.c_str());
+	return slot.option(current.c_str());
 }
 
 /*-------------------------------------------------
     ui_slot_get_current_index - returns
 -------------------------------------------------*/
-int ui_menu_slot_devices::slot_get_current_index(device_slot_interface *slot)
+int ui_menu_slot_devices::slot_get_current_index(device_slot_interface &slot)
 {
 	const device_slot_option *current = slot_get_current_option(slot);
 
 	if (current != nullptr)
 	{
 		int val = 0;
-		for (const device_slot_option &option : slot->option_list())
+		for (const device_slot_option &option : slot.option_list())
 		{
 			if (&option == current)
 				return val;
@@ -61,10 +61,10 @@ int ui_menu_slot_devices::slot_get_current_index(device_slot_interface *slot)
 /*-------------------------------------------------
     ui_slot_get_length - returns
 -------------------------------------------------*/
-int ui_menu_slot_devices::slot_get_length(device_slot_interface *slot)
+int ui_menu_slot_devices::slot_get_length(device_slot_interface &slot)
 {
 	int val = 0;
-	for (const device_slot_option &option : slot->option_list())
+	for (const device_slot_option &option : slot.option_list())
 		if (option.selectable())
 			val++;
 
@@ -74,7 +74,7 @@ int ui_menu_slot_devices::slot_get_length(device_slot_interface *slot)
 /*-------------------------------------------------
     ui_slot_get_next - returns
 -------------------------------------------------*/
-const char *ui_menu_slot_devices::slot_get_next(device_slot_interface *slot)
+const char *ui_menu_slot_devices::slot_get_next(device_slot_interface &slot)
 {
 	int idx = slot_get_current_index(slot);
 	if (idx < 0)
@@ -91,7 +91,7 @@ const char *ui_menu_slot_devices::slot_get_next(device_slot_interface *slot)
 /*-------------------------------------------------
     ui_slot_get_prev - returns
 -------------------------------------------------*/
-const char *ui_menu_slot_devices::slot_get_prev(device_slot_interface *slot)
+const char *ui_menu_slot_devices::slot_get_prev(device_slot_interface &slot)
 {
 	int idx = slot_get_current_index(slot);
 	if (idx < 0)
@@ -108,12 +108,12 @@ const char *ui_menu_slot_devices::slot_get_prev(device_slot_interface *slot)
 /*-------------------------------------------------
     ui_slot_get_option - returns
 -------------------------------------------------*/
-const char *ui_menu_slot_devices::slot_get_option(device_slot_interface *slot, int index)
+const char *ui_menu_slot_devices::slot_get_option(device_slot_interface &slot, int index)
 {
 	if (index >= 0)
 	{
 		int val = 0;
-		for (const device_slot_option &option : slot->option_list())
+		for (const device_slot_option &option : slot.option_list())
 		{
 			if (val == index)
 				return option.name();
@@ -132,10 +132,10 @@ const char *ui_menu_slot_devices::slot_get_option(device_slot_interface *slot, i
     whether the natural keyboard is active
 -------------------------------------------------*/
 
-void ui_menu_slot_devices::set_slot_device(device_slot_interface *slot, const char *val)
+void ui_menu_slot_devices::set_slot_device(device_slot_interface &slot, const char *val)
 {
 	std::string error;
-	machine().options().set_value(slot->device().tag()+1, val, OPTION_PRIORITY_CMDLINE, error);
+	machine().options().set_value(slot.device().tag()+1, val, OPTION_PRIORITY_CMDLINE, error);
 	assert(error.empty());
 }
 
@@ -151,8 +151,7 @@ ui_menu_slot_devices::ui_menu_slot_devices(running_machine &machine, render_cont
 void ui_menu_slot_devices::populate()
 {
 	/* cycle through all devices for this system */
-	slot_interface_iterator iter(machine().root_device());
-	for (device_slot_interface *slot = iter.first(); slot != nullptr; slot = iter.next())
+	for (device_slot_interface &slot : slot_interface_iterator(machine().root_device()))
 	{
 		/* record the menu item */
 		const device_slot_option *option = slot_get_current_option(slot);
@@ -162,11 +161,11 @@ void ui_menu_slot_devices::populate()
 		else
 		{
 			opt_name.assign(option->name());
-			if (slot->fixed() || slot_get_length(slot) == 0)
+			if (slot.fixed() || slot_get_length(slot) == 0)
 				opt_name.append(_(" [internal]"));
 		}
 
-		item_append(slot->device().tag() + 1, opt_name.c_str(), (slot->fixed() || slot_get_length(slot) == 0) ? 0 : (MENU_FLAG_LEFT_ARROW | MENU_FLAG_RIGHT_ARROW), (void *)slot);
+		item_append(slot.device().tag() + 1, opt_name.c_str(), (slot.fixed() || slot_get_length(slot) == 0) ? 0 : (MENU_FLAG_LEFT_ARROW | MENU_FLAG_RIGHT_ARROW), (void *)&slot);
 	}
 	item_append(ui_menu_item_type::SEPARATOR);
 	item_append(_("Reset"),  nullptr, 0, (void *)1);
@@ -195,14 +194,14 @@ void ui_menu_slot_devices::handle()
 		else if (menu_event->iptkey == IPT_UI_LEFT || menu_event->iptkey == IPT_UI_RIGHT)
 		{
 			device_slot_interface *slot = (device_slot_interface *)menu_event->itemref;
-			const char *val = (menu_event->iptkey == IPT_UI_LEFT) ? slot_get_prev(slot) : slot_get_next(slot);
-			set_slot_device(slot, val);
+			const char *val = (menu_event->iptkey == IPT_UI_LEFT) ? slot_get_prev(*slot) : slot_get_next(*slot);
+			set_slot_device(*slot, val);
 			reset(UI_MENU_RESET_REMEMBER_REF);
 		}
 		else if (menu_event->iptkey == IPT_UI_SELECT)
 		{
 			device_slot_interface *slot = (device_slot_interface *)menu_event->itemref;
-			device_slot_option *option = slot_get_current_option(slot);
+			device_slot_option *option = slot_get_current_option(*slot);
 			if (option)
 				ui_menu::stack_push(global_alloc_clear<ui_menu_device_config>(machine(), container, slot, option));
 		}
diff --git a/src/emu/ui/slotopt.h b/src/emu/ui/slotopt.h
index 86cf75102de..8d7c4ab6b18 100644
--- a/src/emu/ui/slotopt.h
+++ b/src/emu/ui/slotopt.h
@@ -23,13 +23,13 @@ public:
 	virtual void handle() override;
 
 private:
-	device_slot_option *slot_get_current_option(device_slot_interface *slot);
-	int slot_get_current_index(device_slot_interface *slot);
-	int slot_get_length(device_slot_interface *slot);
-	const char *slot_get_next(device_slot_interface *slot);
-	const char *slot_get_prev(device_slot_interface *slot);
-	const char *slot_get_option(device_slot_interface *slot, int index);
-	void set_slot_device(device_slot_interface *slot, const char *val);
+	device_slot_option *slot_get_current_option(device_slot_interface &slot);
+	int slot_get_current_index(device_slot_interface &slot);
+	int slot_get_length(device_slot_interface &slot);
+	const char *slot_get_next(device_slot_interface &slot);
+	const char *slot_get_prev(device_slot_interface &slot);
+	const char *slot_get_option(device_slot_interface &slot, int index);
+	void set_slot_device(device_slot_interface &slot, const char *val);
 };
 
 #endif  /* __UI_SLOTOPT_H__ */
diff --git a/src/emu/ui/swlist.cpp b/src/emu/ui/swlist.cpp
index c66435e69dc..c8100b44b86 100644
--- a/src/emu/ui/swlist.cpp
+++ b/src/emu/ui/swlist.cpp
@@ -409,32 +409,32 @@ void ui_menu_software::populate()
 
 	// Add original software lists for this system
 	software_list_device_iterator iter(machine().config().root_device());
-	for (software_list_device *swlistdev = iter.first(); swlistdev != nullptr; swlistdev = iter.next())
-		if (swlistdev->list_type() == SOFTWARE_LIST_ORIGINAL_SYSTEM)
-			if (!swlistdev->get_info().empty() && m_interface != nullptr)
+	for (software_list_device &swlistdev : iter)
+		if (swlistdev.list_type() == SOFTWARE_LIST_ORIGINAL_SYSTEM)
+			if (!swlistdev.get_info().empty() && m_interface != nullptr)
 			{
 				bool found = false;
-				for (const software_info &swinfo : swlistdev->get_info())
+				for (const software_info &swinfo : swlistdev.get_info())
 					if (swinfo.first_part()->matches_interface(m_interface))
 						found = true;
 				if (found)
-					item_append(swlistdev->description(), nullptr, 0, (void *)swlistdev);
+					item_append(swlistdev.description(), nullptr, 0, (void *)&swlistdev);
 			}
 
 	// add compatible software lists for this system
-	for (software_list_device *swlistdev = iter.first(); swlistdev != nullptr; swlistdev = iter.next())
-		if (swlistdev->list_type() == SOFTWARE_LIST_COMPATIBLE_SYSTEM)
-			if (!swlistdev->get_info().empty() && m_interface != nullptr)
+	for (software_list_device &swlistdev : iter)
+		if (swlistdev.list_type() == SOFTWARE_LIST_COMPATIBLE_SYSTEM)
+			if (!swlistdev.get_info().empty() && m_interface != nullptr)
 			{
 				bool found = false;
-				for (const software_info &swinfo : swlistdev->get_info())
+				for (const software_info &swinfo : swlistdev.get_info())
 					if (swinfo.first_part()->matches_interface(m_interface))
 						found = true;
 				if (found)
 				{
 					if (!have_compatible)
 						item_append(_("[compatible lists]"), nullptr, MENU_FLAG_DISABLE, nullptr);
-					item_append(swlistdev->description(), nullptr, 0, (void *)swlistdev);
+					item_append(swlistdev.description(), nullptr, 0, (void *)&swlistdev);
 				}
 				have_compatible = true;
 			}
diff --git a/src/emu/ui/ui.cpp b/src/emu/ui/ui.cpp
index 2ad16e99f0c..481568123a5 100644
--- a/src/emu/ui/ui.cpp
+++ b/src/emu/ui/ui.cpp
@@ -1188,21 +1188,20 @@ std::string &ui_manager::game_info_astring(std::string &str)
 	// loop over all CPUs
 	execute_interface_iterator execiter(machine().root_device());
 	std::unordered_set<std::string> exectags;
-	for (device_execute_interface *exec = execiter.first(); exec != nullptr; exec = execiter.next())
+	for (device_execute_interface &exec : execiter)
 	{
-		if (!exectags.insert(exec->device().tag()).second)
+		if (!exectags.insert(exec.device().tag()).second)
 			continue;
 		// get cpu specific clock that takes internal multiplier/dividers into account
-		int clock = exec->device().clock();
+		int clock = exec.device().clock();
 
 		// count how many identical CPUs we have
 		int count = 1;
-		const char *name = exec->device().name();
-		execute_interface_iterator execinneriter(machine().root_device());
-		for (device_execute_interface *scan = execinneriter.first(); scan != nullptr; scan = execinneriter.next())
+		const char *name = exec.device().name();
+		for (device_execute_interface &scan : execiter)
 		{
-			if (exec->device().type() == scan->device().type() && strcmp(name, scan->device().name()) == 0 && exec->device().clock() == scan->device().clock())
-				if (exectags.insert(scan->device().tag()).second)
+			if (exec.device().type() == scan.device().type() && strcmp(name, scan.device().name()) == 0 && exec.device().clock() == scan.device().clock())
+				if (exectags.insert(scan.device().tag()).second)
 					count++;
 		}
 
@@ -1222,9 +1221,9 @@ std::string &ui_manager::game_info_astring(std::string &str)
 	sound_interface_iterator snditer(machine().root_device());
 	std::unordered_set<std::string> soundtags;
 	bool found_sound = false;
-	for (device_sound_interface *sound = snditer.first(); sound != nullptr; sound = snditer.next())
+	for (device_sound_interface &sound : snditer)
 	{
-		if (!soundtags.insert(sound->device().tag()).second)
+		if (!soundtags.insert(sound.device().tag()).second)
 			continue;
 
 		// append the Sound: string
@@ -1234,23 +1233,22 @@ std::string &ui_manager::game_info_astring(std::string &str)
 
 		// count how many identical sound chips we have
 		int count = 1;
-		sound_interface_iterator sndinneriter(machine().root_device());
-		for (device_sound_interface *scan = sndinneriter.first(); scan != nullptr; scan = sndinneriter.next())
+		for (device_sound_interface &scan : snditer)
 		{
-			if (sound->device().type() == scan->device().type() && sound->device().clock() == scan->device().clock())
-				if (soundtags.insert(scan->device().tag()).second)
+			if (sound.device().type() == scan.device().type() && sound.device().clock() == scan.device().clock())
+				if (soundtags.insert(scan.device().tag()).second)
 					count++;
 		}
 
 		// if more than one, prepend a #x in front of the CPU name
 		// display clock in kHz or MHz
-		int clock = sound->device().clock();
+		int clock = sound.device().clock();
 		util::stream_format(buf,
 				(count > 1)
 					? ((clock != 0) ? "%1$d" UTF8_MULTIPLY "%2$s %3$d.%4$0*5$d%6$s\n" : "%1$d" UTF8_MULTIPLY "%2$s\n")
 					: ((clock != 0) ? "%2$s %3$d.%4$0*5$d%6$s\n" : "%2$s\n"),
 				count,
-				sound->device().name(),
+				sound.device().name(),
 				(clock >= 1000000) ? (clock / 1000000) : (clock / 1000),
 				(clock >= 1000000) ? (clock % 1000000) : (clock % 1000),
 				(clock >= 1000000) ? 6 : 3,
@@ -1265,23 +1263,23 @@ std::string &ui_manager::game_info_astring(std::string &str)
 		buf << _("None\n");
 	else
 	{
-		for (screen_device *screen = scriter.first(); screen != nullptr; screen = scriter.next())
+		for (screen_device &screen : scriter)
 		{
 			std::string detail;
-			if (screen->screen_type() == SCREEN_TYPE_VECTOR)
+			if (screen.screen_type() == SCREEN_TYPE_VECTOR)
 				detail = _("Vector");
 			else
 			{
-				const rectangle &visarea = screen->visible_area();
+				const rectangle &visarea = screen.visible_area();
 				detail = string_format("%d " UTF8_MULTIPLY " %d (%s) %f" UTF8_NBSP "Hz",
 						visarea.width(), visarea.height(),
 						(machine().system().flags & ORIENTATION_SWAP_XY) ? "V" : "H",
-						ATTOSECONDS_TO_HZ(screen->frame_period().attoseconds()));
+						ATTOSECONDS_TO_HZ(screen.frame_period().attoseconds()));
 			}
 
 			util::stream_format(buf,
 					(scrcount > 1) ? _("%1$s: %2$s\n") : _("%2$s\n"),
-					slider_get_screen_desc(*screen), detail);
+					slider_get_screen_desc(screen), detail);
 		}
 	}
 
@@ -1467,11 +1465,8 @@ void ui_manager::image_handler_ingame()
 {
 	// run display routine for devices
 	if (machine().phase() == MACHINE_PHASE_RUNNING)
-	{
-		image_interface_iterator iter(machine().root_device());
-		for (device_image_interface *image = iter.first(); image != nullptr; image = iter.next())
-			image->call_display();
-	}
+		for (device_image_interface &image : image_interface_iterator(machine().root_device()))
+			image.call_display();
 }
 
 
@@ -1605,19 +1600,17 @@ UINT32 ui_manager::handler_ingame(running_machine &machine, render_container *co
 	// handle a tape control key
 	if (machine.ui_input().pressed(IPT_UI_TAPE_START))
 	{
-		cassette_device_iterator cassiter(machine.root_device());
-		for (cassette_image_device *cass = cassiter.first(); cass != nullptr; cass = cassiter.next())
+		for (cassette_image_device &cass : cassette_device_iterator(machine.root_device()))
 		{
-			cass->change_state(CASSETTE_PLAY, CASSETTE_MASK_UISTATE);
+			cass.change_state(CASSETTE_PLAY, CASSETTE_MASK_UISTATE);
 			return 0;
 		}
 	}
 	if (machine.ui_input().pressed(IPT_UI_TAPE_STOP))
 	{
-		cassette_device_iterator cassiter(machine.root_device());
-		for (cassette_image_device *cass = cassiter.first(); cass != nullptr; cass = cassiter.next())
+		for (cassette_image_device &cass : cassette_device_iterator(machine.root_device()))
 		{
-			cass->change_state(CASSETTE_STOPPED, CASSETTE_MASK_UISTATE);
+			cass.change_state(CASSETTE_STOPPED, CASSETTE_MASK_UISTATE);
 			return 0;
 		}
 	}
@@ -1939,25 +1932,24 @@ std::vector<ui_menu_item> ui_manager::slider_init(running_machine &machine)
 	// add CPU overclocking (cheat only)
 	if (machine.options().cheat())
 	{
-		execute_interface_iterator iter(machine.root_device());
-		for (device_execute_interface *exec = iter.first(); exec != nullptr; exec = iter.next())
+		for (device_execute_interface &exec : execute_interface_iterator(machine.root_device()))
 		{
-			void *param = (void *)&exec->device();
-			std::string str = string_format(_("Overclock CPU %1$s"), exec->device().tag());
+			void *param = (void *)&exec.device();
+			std::string str = string_format(_("Overclock CPU %1$s"), exec.device().tag());
 			sliders.push_back(slider_alloc(machine, str.c_str(), 10, 1000, 2000, 1, slider_overclock, param));
 		}
 	}
 
 	// add screen parameters
 	screen_device_iterator scriter(machine.root_device());
-	for (screen_device *screen = scriter.first(); screen != nullptr; screen = scriter.next())
+	for (screen_device &screen : scriter)
 	{
-		int defxscale = floor(screen->xscale() * 1000.0f + 0.5f);
-		int defyscale = floor(screen->yscale() * 1000.0f + 0.5f);
-		int defxoffset = floor(screen->xoffset() * 1000.0f + 0.5f);
-		int defyoffset = floor(screen->yoffset() * 1000.0f + 0.5f);
-		void *param = (void *)screen;
-		std::string screen_desc = slider_get_screen_desc(*screen);
+		int defxscale = floor(screen.xscale() * 1000.0f + 0.5f);
+		int defyscale = floor(screen.yscale() * 1000.0f + 0.5f);
+		int defxoffset = floor(screen.xoffset() * 1000.0f + 0.5f);
+		int defyoffset = floor(screen.yoffset() * 1000.0f + 0.5f);
+		void *param = (void *)&screen;
+		std::string screen_desc = slider_get_screen_desc(screen);
 
 		// add refresh rate tweaker
 		if (machine.options().cheat())
@@ -1985,34 +1977,33 @@ std::vector<ui_menu_item> ui_manager::slider_init(running_machine &machine)
 		sliders.push_back(slider_alloc(machine, str.c_str(), -500, defyoffset, 500, 2, slider_yoffset, param));
 	}
 
-	laserdisc_device_iterator lditer(machine.root_device());
-	for (laserdisc_device *laserdisc = lditer.first(); laserdisc != nullptr; laserdisc = lditer.next())
+	for (laserdisc_device &laserdisc : laserdisc_device_iterator(machine.root_device()))
 	{
-		if (laserdisc->overlay_configured())
+		if (laserdisc.overlay_configured())
 		{
 			laserdisc_overlay_config config;
-			laserdisc->get_overlay_config(config);
+			laserdisc.get_overlay_config(config);
 			int defxscale = floor(config.m_overscalex * 1000.0f + 0.5f);
 			int defyscale = floor(config.m_overscaley * 1000.0f + 0.5f);
 			int defxoffset = floor(config.m_overposx * 1000.0f + 0.5f);
 			int defyoffset = floor(config.m_overposy * 1000.0f + 0.5f);
-			void *param = (void *)laserdisc;
+			void *param = (void *)&laserdisc;
 
 			// add scale and offset controls per-overlay
-			std::string str = string_format(_("Laserdisc '%1$s' Horiz Stretch"), laserdisc->tag());
+			std::string str = string_format(_("Laserdisc '%1$s' Horiz Stretch"), laserdisc.tag());
 			sliders.push_back(slider_alloc(machine, str.c_str(), 500, (defxscale == 0) ? 1000 : defxscale, 1500, 2, slider_overxscale, param));
-			str = string_format(_("Laserdisc '%1$s' Horiz Position"), laserdisc->tag());
+			str = string_format(_("Laserdisc '%1$s' Horiz Position"), laserdisc.tag());
 			sliders.push_back(slider_alloc(machine, str.c_str(), -500, defxoffset, 500, 2, slider_overxoffset, param));
-			str = string_format(_("Laserdisc '%1$s' Vert Stretch"), laserdisc->tag());
+			str = string_format(_("Laserdisc '%1$s' Vert Stretch"), laserdisc.tag());
 			sliders.push_back(slider_alloc(machine, str.c_str(), 500, (defyscale == 0) ? 1000 : defyscale, 1500, 2, slider_overyscale, param));
-			str = string_format(_("Laserdisc '%1$s' Vert Position"), laserdisc->tag());
+			str = string_format(_("Laserdisc '%1$s' Vert Position"), laserdisc.tag());
 			sliders.push_back(slider_alloc(machine, str.c_str(), -500, defyoffset, 500, 2, slider_overyoffset, param));
 		}
 	}
 
-	for (screen_device *screen = scriter.first(); screen != nullptr; screen = scriter.next())
+	for (screen_device &screen : scriter)
 	{
-		if (screen->screen_type() == SCREEN_TYPE_VECTOR)
+		if (screen.screen_type() == SCREEN_TYPE_VECTOR)
 		{
 			// add vector control
 			sliders.push_back(slider_alloc(machine, _("Vector Flicker"), 0, 0, 1000, 10, slider_flicker, nullptr));
@@ -2462,10 +2453,7 @@ static INT32 slider_beam_intensity_weight(running_machine &machine, void *arg, i
 
 static std::string slider_get_screen_desc(screen_device &screen)
 {
-	screen_device_iterator iter(screen.machine().root_device());
-	int scrcount = iter.count();
-
-	if (scrcount > 1)
+	if (screen_device_iterator(screen.machine().root_device()).count() > 1)
 		return string_format(_("Screen '%1$s'"), screen.tag());
 	else
 		return _("Screen");
diff --git a/src/emu/ui/viewgfx.cpp b/src/emu/ui/viewgfx.cpp
index fd5ac9bc2ce..a23d8a997d9 100644
--- a/src/emu/ui/viewgfx.cpp
+++ b/src/emu/ui/viewgfx.cpp
@@ -168,11 +168,8 @@ void ui_gfx_init(running_machine &machine)
 
 static void ui_gfx_count_devices(running_machine &machine, ui_gfx_state &state)
 {
-	palette_device_iterator pal_iter(machine.root_device());
-	gfx_interface_iterator gfx_iter(machine.root_device());
-
 	// count the palette devices
-	state.palette.devcount = pal_iter.count();
+	state.palette.devcount = palette_device_iterator(machine.root_device()).count();
 
 	// set the pointer to the first palette
 	if (state.palette.devcount > 0)
@@ -180,27 +177,20 @@ static void ui_gfx_count_devices(running_machine &machine, ui_gfx_state &state)
 
 	// count the gfx devices
 	state.gfxset.devcount = 0;
-	int tempcount = gfx_iter.count();
-
-	// count the gfx sets in each device, skipping devices with none
-	if (tempcount > 0)
+	for (device_gfx_interface &interface : gfx_interface_iterator(machine.root_device()))
 	{
-		device_gfx_interface *interface;
-		int i, count;
+		// count the gfx sets in each device, skipping devices with none
+		int count = 0;
+		while (count < MAX_GFX_ELEMENTS && interface.gfx(count) != nullptr)
+			count++;
 
-		for (i = 0, interface = gfx_iter.first();
-				i < tempcount && state.gfxset.devcount < MAX_GFX_DECODERS;
-				i++, interface = gfx_iter.next())
+		// count = index of first NULL
+		if (count > 0)
 		{
-			for (count = 0; count < MAX_GFX_ELEMENTS && interface->gfx(count) != nullptr; count++) { }
-
-			// count = index of first NULL
-			if (count > 0)
-			{
-				state.gfxdev[state.gfxset.devcount].interface = interface;
-				state.gfxdev[state.gfxset.devcount].setcount = count;
-				state.gfxset.devcount++;
-			}
+			state.gfxdev[state.gfxset.devcount].interface = &interface;
+			state.gfxdev[state.gfxset.devcount].setcount = count;
+			if (++state.gfxset.devcount == MAX_GFX_DECODERS)
+				break;
 		}
 	}
 
diff --git a/src/emu/validity.cpp b/src/emu/validity.cpp
index e4200759952..70070623e46 100644
--- a/src/emu/validity.cpp
+++ b/src/emu/validity.cpp
@@ -570,11 +570,10 @@ void validity_checker::validate_driver()
 void validity_checker::validate_roms()
 {
 	// iterate, starting with the driver's ROMs and continuing with device ROMs
-	device_iterator deviter(m_current_config->root_device());
-	for (device_t *device = deviter.first(); device != nullptr; device = deviter.next())
+	for (device_t &device : device_iterator(m_current_config->root_device()))
 	{
 		// track the current device
-		m_current_device = device;
+		m_current_device = &device;
 
 		// scan the ROM entries for this device
 		const char *last_region_name = "???";
@@ -583,7 +582,7 @@ void validity_checker::validate_roms()
 		int items_since_region = 1;
 		int last_bios = 0;
 		int total_files = 0;
-		for (const rom_entry *romp = rom_first_region(*device); romp != nullptr && !ROMENTRY_ISEND(romp); romp++)
+		for (const rom_entry *romp = rom_first_region(device); romp != nullptr && !ROMENTRY_ISEND(romp); romp++)
 		{
 			// if this is a region, make sure it's valid, and record the length
 			if (ROMENTRY_ISREGION(romp))
@@ -608,7 +607,7 @@ void validity_checker::validate_roms()
 				validate_tag(basetag);
 
 				// generate the full tag
-				std::string fulltag = rom_region_name(*device, romp);
+				std::string fulltag = rom_region_name(device, romp);
 
 				// attempt to add it to the map, reporting duplicates as errors
 				current_length = ROMREGION_GETLENGTH(romp);
@@ -831,20 +830,19 @@ void validity_checker::validate_inputs()
 	std::unordered_set<std::string> port_map;
 
 	// iterate over devices
-	device_iterator iter(m_current_config->root_device());
-	for (device_t *device = iter.first(); device != nullptr; device = iter.next())
+	for (device_t &device : device_iterator(m_current_config->root_device()))
 	{
 		// see if this device has ports; if not continue
-		if (device->input_ports() == nullptr)
+		if (device.input_ports() == nullptr)
 			continue;
 
 		// track the current device
-		m_current_device = device;
+		m_current_device = &device;
 
 		// allocate the input ports
 		ioport_list portlist;
 		std::string errorbuf;
-		portlist.append(*device, errorbuf);
+		portlist.append(device, errorbuf);
 
 		// report any errors during construction
 		if (!errorbuf.empty())
@@ -904,12 +902,12 @@ void validity_checker::validate_inputs()
 
 				// verify conditions on the field
 				if (!field.condition().none())
-					validate_condition(field.condition(), *device, port_map);
+					validate_condition(field.condition(), device, port_map);
 
 				// verify conditions on the settings
 				for (ioport_setting &setting : field.settings())
 					if (!setting.condition().none())
-						validate_condition(setting.condition(), *device, port_map);
+						validate_condition(setting.condition(), device, port_map);
 			}
 
 			// done with this port
@@ -931,32 +929,31 @@ void validity_checker::validate_devices()
 {
 	std::unordered_set<std::string> device_map;
 
-	device_iterator iter_find(m_current_config->root_device());
-	for (const device_t *device = iter_find.first(); device != nullptr; device = iter_find.next())
+	for (device_t &device : device_iterator(m_current_config->root_device()))
 	{
 		// track the current device
-		m_current_device = device;
+		m_current_device = &device;
 
 		// validate auto-finders
-		device->findit(true);
+		device.findit(true);
 
 		// validate the device tag
-		validate_tag(device->basetag());
+		validate_tag(device.basetag());
 
 		// look for duplicates
-		if (!device_map.insert(device->tag()).second)
-			osd_printf_error("Multiple devices with the same tag '%s' defined\n", device->tag());
+		if (!device_map.insert(device.tag()).second)
+			osd_printf_error("Multiple devices with the same tag '%s' defined\n", device.tag());
 
 		// all devices must have a shortname
-		if (strcmp(device->shortname(), "") == 0)
+		if (strcmp(device.shortname(), "") == 0)
 			osd_printf_error("Device does not have short name defined\n");
 
 		// all devices must have a source file defined
-		if (strcmp(device->source(), "") == 0)
+		if (strcmp(device.source(), "") == 0)
 			osd_printf_error("Device does not have source file location defined\n");
 
 		// check for device-specific validity check
-		device->validity_check(*this);
+		device.validity_check(*this);
 
 		// done with this device
 		m_current_device = nullptr;
@@ -964,24 +961,22 @@ void validity_checker::validate_devices()
 
 	// if device is slot cart device, we must have a shortname
 	std::unordered_set<std::string> slot_device_map;
-	slot_interface_iterator slotiter(m_current_config->root_device());
-	for (const device_slot_interface *slot = slotiter.first(); slot != nullptr; slot = slotiter.next())
+	for (const device_slot_interface &slot : slot_interface_iterator(m_current_config->root_device()))
 	{
-		for (const device_slot_option &option : slot->option_list())
+		for (const device_slot_option &option : slot.option_list())
 		{
 			std::string temptag("_");
 			temptag.append(option.name());
 			device_t *dev = const_cast<machine_config &>(*m_current_config).device_add(&m_current_config->root_device(), temptag.c_str(), option.devtype(), 0);
 
 			// notify this device and all its subdevices that they are now configured
-			device_iterator subiter(*dev);
-			for (device_t *device = subiter.first(); device != nullptr; device = subiter.next())
-				if (!device->configured())
-					device->config_complete();
+			for (device_t &device : device_iterator(*dev))
+				if (!device.configured())
+					device.config_complete();
 
 			if (strcmp(dev->shortname(), "") == 0) {
 				if (slot_device_map.insert(dev->name()).second)
-					osd_printf_error("Device '%s' is slot cart device but does not have short name defined\n",dev->name());
+					osd_printf_error("Device '%s' is slot cart device but does not have short name defined\n", dev->name());
 			}
 
 			const_cast<machine_config &>(*m_current_config).device_remove(&m_current_config->root_device(), temptag.c_str());
diff --git a/src/emu/video.cpp b/src/emu/video.cpp
index 7c49a992006..06c6ee4e7e7 100644
--- a/src/emu/video.cpp
+++ b/src/emu/video.cpp
@@ -292,9 +292,8 @@ std::string video_manager::speed_text()
 
 	// display the number of partial updates as well
 	int partials = 0;
-	screen_device_iterator iter(machine().root_device());
-	for (screen_device *screen = iter.first(); screen != nullptr; screen = iter.next())
-		partials += screen->partial_updates();
+	for (screen_device &screen : screen_device_iterator(machine().root_device()))
+		partials += screen.partial_updates();
 	if (partials > 1)
 		util::stream_format(str, "\n%d partial updates", partials);
 
@@ -345,14 +344,13 @@ void video_manager::save_active_screen_snapshots()
 	if (m_snap_native)
 	{
 		// write one snapshot per visible screen
-		screen_device_iterator iter(machine().root_device());
-		for (screen_device *screen = iter.first(); screen != nullptr; screen = iter.next())
-			if (machine().render().is_live(*screen))
+		for (screen_device &screen : screen_device_iterator(machine().root_device()))
+			if (machine().render().is_live(screen))
 			{
 				emu_file file(machine().options().snapshot_directory(), OPEN_FLAG_WRITE | OPEN_FLAG_CREATE | OPEN_FLAG_CREATE_PATHS);
 				osd_file::error filerr = open_next(file, "png");
 				if (filerr == osd_file::error::NONE)
-					save_snapshot(screen, file);
+					save_snapshot(&screen, file);
 			}
 	}
 
@@ -699,14 +697,14 @@ bool video_manager::finish_screen_updates()
 	// finish updating the screens
 	screen_device_iterator iter(machine().root_device());
 
-	for (screen_device *screen = iter.first(); screen != nullptr; screen = iter.next())
-		screen->update_partial(screen->visible_area().max_y);
+	for (screen_device &screen : iter)
+		screen.update_partial(screen.visible_area().max_y);
 
 	// now add the quads for all the screens
 	bool anything_changed = m_output_changed;
 	m_output_changed = false;
-	for (screen_device *screen = iter.first(); screen != nullptr; screen = iter.next())
-		if (screen->update_quads())
+	for (screen_device &screen : iter)
+		if (screen.update_quads())
 			anything_changed = true;
 
 	// draw HUD from LUA callback (if any)
@@ -718,13 +716,13 @@ bool video_manager::finish_screen_updates()
 		record_frame();
 
 		// iterate over screens and update the burnin for the ones that care
-		for (screen_device *screen = iter.first(); screen != nullptr; screen = iter.next())
-			screen->update_burnin();
+		for (screen_device &screen : iter)
+			screen.update_burnin();
 	}
 
 	// draw any crosshairs
-	for (screen_device *screen = iter.first(); screen != nullptr; screen = iter.next())
-		machine().crosshair().render(*screen);
+	for (screen_device &screen : iter)
+		machine().crosshair().render(screen);
 
 	return anything_changed;
 }
@@ -1008,10 +1006,9 @@ void video_manager::update_refresh_speed()
 			// find the screen with the shortest frame period (max refresh rate)
 			// note that we first check the token since this can get called before all screens are created
 			attoseconds_t min_frame_period = ATTOSECONDS_PER_SECOND;
-			screen_device_iterator iter(machine().root_device());
-			for (screen_device *screen = iter.first(); screen != nullptr; screen = iter.next())
+			for (screen_device &screen : screen_device_iterator(machine().root_device()))
 			{
-				attoseconds_t period = screen->frame_period().attoseconds();
+				attoseconds_t period = screen.frame_period().attoseconds();
 				if (period != 0)
 					min_frame_period = MIN(min_frame_period, period);
 			}
@@ -1202,19 +1199,18 @@ osd_file::error video_manager::open_next(emu_file &file, const char *extension)
 			//printf("check template: %s\n", snapdevname.c_str());
 
 			// verify that there is such a device for this system
-			image_interface_iterator iter(machine().root_device());
-			for (device_image_interface *image = iter.first(); image != nullptr; image = iter.next())
+			for (device_image_interface &image : image_interface_iterator(machine().root_device()))
 			{
 				// get the device name
-				std::string tempdevname(image->brief_instance_name());
+				std::string tempdevname(image.brief_instance_name());
 				//printf("check device: %s\n", tempdevname.c_str());
 
 				if (snapdevname.compare(tempdevname) == 0)
 				{
 					// verify that such a device has an image mounted
-					if (image->basename() != nullptr)
+					if (image.basename() != nullptr)
 					{
-						std::string filename(image->basename());
+						std::string filename(image.basename());
 
 						// strip extension
 						filename = filename.substr(0, filename.find_last_of('.'));
diff --git a/src/mame/machine/atarigen.cpp b/src/mame/machine/atarigen.cpp
index 2d55560cee8..7b7ffc9d862 100644
--- a/src/mame/machine/atarigen.cpp
+++ b/src/mame/machine/atarigen.cpp
@@ -970,17 +970,15 @@ atarigen_state::atarigen_state(const machine_config &mconfig, device_type type,
 
 void atarigen_state::machine_start()
 {
-	screen_device *screen;
-	int i;
-
 	// allocate timers for all screens
-	screen_device_iterator iter(*this);
-	assert(iter.count() <= ARRAY_LENGTH(m_screen_timer));
-	for (i = 0, screen = iter.first(); screen != nullptr; i++, screen = iter.next())
+	int i = 0;
+	for (screen_device &screen : screen_device_iterator(*this))
 	{
-		m_screen_timer[i].screen = screen;
-		m_screen_timer[i].scanline_interrupt_timer = timer_alloc(TID_SCANLINE_INTERRUPT, (void *)screen);
-		m_screen_timer[i].scanline_timer = timer_alloc(TID_SCANLINE_TIMER, (void *)screen);
+		assert(i <= ARRAY_LENGTH(m_screen_timer));
+		m_screen_timer[i].screen = &screen;
+		m_screen_timer[i].scanline_interrupt_timer = timer_alloc(TID_SCANLINE_INTERRUPT, (void *)&screen);
+		m_screen_timer[i].scanline_timer = timer_alloc(TID_SCANLINE_TIMER, (void *)&screen);
+		i++;
 	}
 
 	save_item(NAME(m_scanline_int_state));
diff --git a/src/mame/video/cyberbal.cpp b/src/mame/video/cyberbal.cpp
index b04018b3f1b..7b6114f68d8 100644
--- a/src/mame/video/cyberbal.cpp
+++ b/src/mame/video/cyberbal.cpp
@@ -130,12 +130,9 @@ VIDEO_START_MEMBER(cyberbal_state,cyberbal2p)
 
 void cyberbal_state::scanline_update(screen_device &screen, int scanline)
 {
-	int i;
-	screen_device *update_screen;
-
 	/* loop over screens */
-	screen_device_iterator iter(*this);
-	for (i = 0, update_screen = iter.first(); update_screen != nullptr; i++, update_screen = iter.next())
+	int i = 0;
+	for (screen_device &update_screen : screen_device_iterator(*this))
 	{
 		/* need explicit target() because one is optional_device and other is required_device */
 		tilemap_t *curplayfield = i ? m_playfield2_tilemap.target() : m_playfield_tilemap.target();
@@ -155,7 +152,7 @@ void cyberbal_state::scanline_update(screen_device &screen, int scanline)
 			if (((word >> 1) & 7) != m_playfield_palette_bank[i])
 			{
 				if (scanline > 0)
-					update_screen->update_partial(scanline - 1);
+					update_screen.update_partial(scanline - 1);
 				m_playfield_palette_bank[i] = (word >> 1) & 7;
 				curplayfield->set_palette_offset(m_playfield_palette_bank[i] << 8);
 			}
@@ -167,7 +164,7 @@ void cyberbal_state::scanline_update(screen_device &screen, int scanline)
 			if (newscroll != m_playfield_xscroll[i])
 			{
 				if (scanline > 0)
-					update_screen->update_partial(scanline - 1);
+					update_screen.update_partial(scanline - 1);
 				curplayfield->set_scrollx(0, newscroll);
 				m_playfield_xscroll[i] = newscroll;
 			}
@@ -180,7 +177,7 @@ void cyberbal_state::scanline_update(screen_device &screen, int scanline)
 			if (newscroll != m_playfield_yscroll[i])
 			{
 				if (scanline > 0)
-					update_screen->update_partial(scanline - 1);
+					update_screen.update_partial(scanline - 1);
 				curplayfield->set_scrolly(0, newscroll);
 				m_playfield_yscroll[i] = newscroll;
 			}
@@ -191,10 +188,11 @@ void cyberbal_state::scanline_update(screen_device &screen, int scanline)
 			if (m_current_slip[i] != word)
 			{
 				if (scanline > 0)
-					update_screen->update_partial(scanline - 1);
+					update_screen.update_partial(scanline - 1);
 				m_current_slip[i] = word;
 			}
 		}
+		i++;
 	}
 }
 
diff --git a/src/osd/modules/debugger/qt/deviceswindow.cpp b/src/osd/modules/debugger/qt/deviceswindow.cpp
index e14e552fc81..a4d4d74fc3b 100644
--- a/src/osd/modules/debugger/qt/deviceswindow.cpp
+++ b/src/osd/modules/debugger/qt/deviceswindow.cpp
@@ -91,14 +91,7 @@ int DevicesWindowModel::rowCount(const QModelIndex &parent) const
 		return 1;
 
 	device_t *dparent = static_cast<device_t *>(parent.internalPointer());
-	int count = 0;
-	for (device_t &child : dparent->subdevices()) 
-	{
-		(void)child;
-		count++;
-	}
-
-	return count;
+	return dparent->subdevices().count();
 }
 
 int DevicesWindowModel::columnCount(const QModelIndex &parent) const
diff --git a/src/osd/modules/debugger/qt/mainwindow.cpp b/src/osd/modules/debugger/qt/mainwindow.cpp
index 3ec15065b46..aeca1d20b63 100644
--- a/src/osd/modules/debugger/qt/mainwindow.cpp
+++ b/src/osd/modules/debugger/qt/mainwindow.cpp
@@ -469,13 +469,12 @@ void MainWindow::createImagesMenu()
 	QMenu* imagesMenu = menuBar()->addMenu("&Images");
 
 	int interfaceIndex = 0;
-	image_interface_iterator iter(m_machine->root_device());
-	for (device_image_interface *img = iter.first(); img != NULL; img = iter.next())
+	for (device_image_interface &img : image_interface_iterator(m_machine->root_device()))
 	{
-		std::string menuName = string_format("%s : %s", img->device().name(), img->exists() ? img->filename() : "[empty slot]");
+		std::string menuName = string_format("%s : %s", img.device().name(), img.exists() ? img.filename() : "[empty slot]");
 
 		QMenu* interfaceMenu = imagesMenu->addMenu(menuName.c_str());
-		interfaceMenu->setObjectName(img->device().name());
+		interfaceMenu->setObjectName(img.device().name());
 
 		QAction* mountAct = new QAction("Mount...", interfaceMenu);
 		QAction* unmountAct = new QAction("Unmount", interfaceMenu);
@@ -486,7 +485,7 @@ void MainWindow::createImagesMenu()
 		connect(mountAct, &QAction::triggered, this, &MainWindow::mountImage);
 		connect(unmountAct, &QAction::triggered, this, &MainWindow::unmountImage);
 
-		if (!img->exists())
+		if (!img.exists())
 			unmountAct->setEnabled(false);
 
 		interfaceMenu->addAction(mountAct);
diff --git a/src/osd/modules/debugger/win/consolewininfo.cpp b/src/osd/modules/debugger/win/consolewininfo.cpp
index a5423631ce4..cdd84efeb47 100644
--- a/src/osd/modules/debugger/win/consolewininfo.cpp
+++ b/src/osd/modules/debugger/win/consolewininfo.cpp
@@ -37,13 +37,12 @@ consolewin_info::consolewin_info(debugger_windows_interface &debugger) :
 	{
 		// Add image menu only if image devices exist
 		image_interface_iterator iter(machine().root_device());
-		device_image_interface *img = iter.first();
-		if (img != NULL)
+		if (iter.first() != nullptr)
 		{
 			m_devices_menu = CreatePopupMenu();
-			for ( ; img != NULL; img = iter.next())
+			for (device_image_interface &img : iter)
 			{
-				TCHAR *tc_buf = tstring_from_utf8(string_format("%s : %s", img->device().name(), img->exists() ? img->filename() : "[no image]").c_str());
+				TCHAR *tc_buf = tstring_from_utf8(string_format("%s : %s", img.device().name(), img.exists() ? img.filename() : "[no image]").c_str());
 				if (tc_buf != NULL)
 				{
 					AppendMenu(m_devices_menu, MF_ENABLED, 0, tc_buf);
@@ -163,32 +162,30 @@ void consolewin_info::update_menu()
 	if (m_devices_menu != NULL)
 	{
 		// create the image menu
-		image_interface_iterator iter(machine().root_device());
-		device_image_interface *img;
-		UINT32 cnt;
-		for (img = iter.first(), cnt = 0; img != NULL; img = iter.next(), cnt++)
+		UINT32 cnt = 0;
+		for (device_image_interface &img : image_interface_iterator(machine().root_device()))
 		{
 			HMENU const devicesubmenu = CreatePopupMenu();
 
 			UINT_PTR const new_item = ID_DEVICE_OPTIONS + (cnt * DEVOPTION_MAX);
 
 			UINT flags_for_exists = MF_ENABLED | MF_STRING;
-			if (!img->exists())
+			if (!img.exists())
 				flags_for_exists |= MF_GRAYED;
 
 			UINT flags_for_writing = flags_for_exists;
-			if (img->is_readonly())
+			if (img.is_readonly())
 				flags_for_writing |= MF_GRAYED;
 
 			AppendMenu(devicesubmenu, MF_STRING, new_item + DEVOPTION_OPEN, TEXT("Mount..."));
 
-			//if (img->is_creatable())
+			//if (img.is_creatable())
 				//AppendMenu(devicesubmenu, MF_STRING, new_item + DEVOPTION_CREATE, TEXT("Create..."));
 			AppendMenu(devicesubmenu, flags_for_exists, new_item + DEVOPTION_CLOSE, TEXT("Unmount"));
 
-			if (img->device().type() == CASSETTE)
+			if (img.device().type() == CASSETTE)
 			{
-				cassette_state const state = (cassette_state)(img->exists() ? (downcast<cassette_image_device *>(&img->device())->get_state() & CASSETTE_MASK_UISTATE) : CASSETTE_STOPPED);
+				cassette_state const state = (cassette_state)(img.exists() ? (downcast<cassette_image_device *>(&img.device())->get_state() & CASSETTE_MASK_UISTATE) : CASSETTE_STOPPED);
 				AppendMenu(devicesubmenu, MF_SEPARATOR, 0, NULL);
 				AppendMenu(devicesubmenu, flags_for_exists | ((state == CASSETTE_STOPPED) ? MF_CHECKED : 0), new_item + DEVOPTION_CASSETTE_STOPPAUSE, TEXT("Pause/Stop"));
 				AppendMenu(devicesubmenu, flags_for_exists | ((state == CASSETTE_PLAY) ? MF_CHECKED : 0), new_item + DEVOPTION_CASSETTE_PLAY, TEXT("Play"));
@@ -197,12 +194,14 @@ void consolewin_info::update_menu()
 				AppendMenu(devicesubmenu, flags_for_exists, new_item + DEVOPTION_CASSETTE_FASTFORWARD, TEXT("Fast Forward"));
 			}
 
-			TCHAR *tc_buf = tstring_from_utf8(string_format("%s :%s", img->device().name(), img->exists() ? img->filename() : "[empty slot]").c_str());
+			TCHAR *tc_buf = tstring_from_utf8(string_format("%s :%s", img.device().name(), img.exists() ? img.filename() : "[empty slot]").c_str());
 			if (tc_buf != NULL)
 			{
 				ModifyMenu(m_devices_menu, cnt, MF_BYPOSITION | MF_POPUP, (UINT_PTR)devicesubmenu, tc_buf);
 				osd_free(tc_buf);
 			}
+
+			cnt++;
 		}
 	}
 }
diff --git a/src/osd/modules/render/d3d/d3dhlsl.cpp b/src/osd/modules/render/d3d/d3dhlsl.cpp
index 4ee6fcbd5ac..6c4536f615d 100644
--- a/src/osd/modules/render/d3d/d3dhlsl.cpp
+++ b/src/osd/modules/render/d3d/d3dhlsl.cpp
@@ -1372,11 +1372,7 @@ int shaders::post_pass(d3d_render_target *rt, int source_index, poly_info *poly,
 	int next_index = source_index;
 
 	screen_device_iterator screen_iterator(machine->root_device());
-	screen_device *screen = screen_iterator.first();
-	for (int i = 0; i < curr_screen; i++)
-	{
-		screen = screen_iterator.next();
-	}
+	screen_device *screen = screen_iterator.byindex(curr_screen);
 	render_container &screen_container = screen->container();
 
 	float xscale = screen_container.xscale();
diff --git a/src/osd/sdl/window.cpp b/src/osd/sdl/window.cpp
index 7cec35d400a..31689cfc9b7 100644
--- a/src/osd/sdl/window.cpp
+++ b/src/osd/sdl/window.cpp
@@ -1073,22 +1073,8 @@ OSDWORK_CALLBACK( sdl_window_info::draw_video_contents_wt )
 
 	{
 #if 1
-		int scrnum = 0;
-		int is_vector = 0;
-		screen_device_iterator iter(window->machine().root_device());
-		for (const screen_device *screen = iter.first(); screen != nullptr; screen = iter.next())
-		{
-			if (scrnum == window->m_index)
-			{
-				is_vector = (screen->screen_type() == SCREEN_TYPE_VECTOR) ? 1 : 0;
-				break;
-			}
-			else
-			{
-				scrnum++;
-			}
-		}
-		if (is_vector)
+		const screen_device *screen = screen_device_iterator(window->machine().root_device()).byindex(window->m_index);
+		if ((screen != nullptr) && (screen->screen_type() == SCREEN_TYPE_VECTOR))
 			window->renderer().set_flags(osd_renderer::FLAG_HAS_VECTOR_SCREEN);
 		else
 			window->renderer().clear_flags(osd_renderer::FLAG_HAS_VECTOR_SCREEN);

From 97f953f0a5def5b6acc34e40244e7c293589c03f Mon Sep 17 00:00:00 2001
From: yz70s <yz70s@users.noreply.github.com>
Date: Tue, 19 Apr 2016 00:13:48 +0200
Subject: [PATCH 082/122] xbox.cpp: more usb, first xbox usb controller
 emulation (nw)

---
 src/mame/drivers/chihiro.cpp |  62 ++++++++++++---
 src/mame/includes/xbox.h     |  28 ++++++-
 src/mame/machine/xbox.cpp    | 145 ++++++++++++++++++++++++++++++++---
 3 files changed, 212 insertions(+), 23 deletions(-)

diff --git a/src/mame/drivers/chihiro.cpp b/src/mame/drivers/chihiro.cpp
index f1d83e19b76..86e0104b3e6 100644
--- a/src/mame/drivers/chihiro.cpp
+++ b/src/mame/drivers/chihiro.cpp
@@ -382,13 +382,19 @@ Thanks to Alex, Mr Mudkips, and Philip Burke for this info.
 #define LOG_PCI
 //#define LOG_BASEBOARD
 
-class ohci_hlean2131qc_device : public ohci_function_device
+extern const device_type OHCI_HLEAN2131QC;
+
+class ohci_hlean2131qc_device : public device_t, public ohci_function_device
 {
 public:
-	ohci_hlean2131qc_device(running_machine &machine, xbox_base_state *usb_bus_manager);
+	ohci_hlean2131qc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+	void initialize(running_machine &machine, xbox_base_state *usb_bus_manager) override;
 	int handle_nonstandard_request(int endpoint, USBSetupPacket *setup) override;
 	int handle_bulk_pid(int endpoint, int pid, UINT8 *buffer, int size) override;
 	void set_region_base(UINT8 *data);
+
+protected:
+	virtual void device_start() override;
 private:
 	static const USBStandardDeviceDescriptor devdesc;
 	static const USBStandardConfigurationDescriptor condesc;
@@ -410,11 +416,19 @@ private:
 	UINT8 *region;
 };
 
-class ohci_hlean2131sc_device : public ohci_function_device
+const device_type OHCI_HLEAN2131QC = &device_creator<ohci_hlean2131qc_device>;
+
+extern const device_type OHCI_HLEAN2131SC;
+
+class ohci_hlean2131sc_device : public device_t, public ohci_function_device
 {
 public:
-	ohci_hlean2131sc_device(running_machine &machine, xbox_base_state *usb_bus_manager);
+	ohci_hlean2131sc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+	void initialize(running_machine &machine, xbox_base_state *usb_bus_manager) override;
 	int handle_nonstandard_request(int endpoint, USBSetupPacket *setup) override;
+
+protected:
+	virtual void device_start() override;
 private:
 	static const USBStandardDeviceDescriptor devdesc;
 	static const USBStandardConfigurationDescriptor condesc;
@@ -430,6 +444,8 @@ private:
 	static const UINT8 strdesc2[];
 };
 
+const device_type OHCI_HLEAN2131SC = &device_creator<ohci_hlean2131sc_device>;
+
 class chihiro_state : public xbox_base_state
 {
 public:
@@ -665,9 +681,17 @@ const UINT8 ohci_hlean2131qc_device::strdesc0[] = { 0x04,0x03,0x00,0x00 };
 const UINT8 ohci_hlean2131qc_device::strdesc1[] = { 0x0A,0x03,0x53,0x00,0x45,0x00,0x47,0x00,0x41,0x00 };
 const UINT8 ohci_hlean2131qc_device::strdesc2[] = { 0x0E,0x03,0x42,0x00,0x41,0x00,0x53,0x00,0x45,0x00,0x42,0x03,0xFF,0x0B };
 
-ohci_hlean2131qc_device::ohci_hlean2131qc_device(running_machine &machine, xbox_base_state *usb_bus_manager) :
-	ohci_function_device(machine, usb_bus_manager)
+ohci_hlean2131qc_device::ohci_hlean2131qc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+	device_t(mconfig, OHCI_HLEAN2131QC, "OHCI Hlean2131qc", tag, owner, clock, "ohci_hlean2131qc", __FILE__),
+	ohci_function_device()
 {
+	maximum_send = 0;
+	region = nullptr;
+}
+
+void ohci_hlean2131qc_device::initialize(running_machine &machine, xbox_base_state *usb_bus_manager)
+{
+	ohci_function_device::initialize(machine, usb_bus_manager);
 	add_device_descriptor(devdesc);
 	add_configuration_descriptor(condesc);
 	add_interface_descriptor(intdesc);
@@ -685,8 +709,6 @@ ohci_hlean2131qc_device::ohci_hlean2131qc_device(running_machine &machine, xbox_
 	add_string_descriptor(strdesc0);
 	add_string_descriptor(strdesc1);
 	add_string_descriptor(strdesc2);
-	maximum_send = 0;
-	region = nullptr;
 }
 
 void ohci_hlean2131qc_device::set_region_base(UINT8 *data)
@@ -756,6 +778,10 @@ int ohci_hlean2131qc_device::handle_bulk_pid(int endpoint, int pid, UINT8 *buffe
 	return size;
 }
 
+void ohci_hlean2131qc_device::device_start()
+{
+}
+
 //pc20
 const USBStandardDeviceDescriptor ohci_hlean2131sc_device::devdesc = { 0x12,0x01,0x0100,0x60,0x01,0x00,0x40,0x0CA3,0x0003,0x0110,0x01,0x02,0x00,0x01 };
 const USBStandardConfigurationDescriptor ohci_hlean2131sc_device::condesc = { 0x09,0x02,0x003C,0x01,0x01,0x00,0x80,0x96 };
@@ -770,9 +796,15 @@ const UINT8 ohci_hlean2131sc_device::strdesc0[] = { 0x04,0x03,0x00,0x00 };
 const UINT8 ohci_hlean2131sc_device::strdesc1[] = { 0x0A,0x03,0x53,0x00,0x45,0x00,0x47,0x00,0x41,0x00 };
 const UINT8 ohci_hlean2131sc_device::strdesc2[] = { 0x0E,0x03,0x42,0x00,0x41,0x00,0x53,0x00,0x45,0x00,0x42,0x00,0x44,0x00 };
 
-ohci_hlean2131sc_device::ohci_hlean2131sc_device(running_machine &machine, xbox_base_state *usb_bus_manager) :
-	ohci_function_device(machine, usb_bus_manager)
+ohci_hlean2131sc_device::ohci_hlean2131sc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+	device_t(mconfig, OHCI_HLEAN2131SC, "OHCI Hlean2131sc", tag, owner, clock, "ohci_hlean2131sc", __FILE__),
+	ohci_function_device()
 {
+}
+
+void ohci_hlean2131sc_device::initialize(running_machine &machine, xbox_base_state *usb_bus_manager)
+{
+	ohci_function_device::initialize(machine, usb_bus_manager);
 	add_device_descriptor(devdesc);
 	add_configuration_descriptor(condesc);
 	add_interface_descriptor(intdesc);
@@ -799,6 +831,10 @@ int ohci_hlean2131sc_device::handle_nonstandard_request(int endpoint, USBSetupPa
 	return 0;
 }
 
+void ohci_hlean2131sc_device::device_start()
+{
+}
+
 // ======================> ide_baseboard_device
 
 class ide_baseboard_device : public ata_mass_storage_device
@@ -1069,7 +1105,8 @@ void chihiro_state::machine_start()
 			break;
 		}
 	usbhack_counter = 0;
-	usb_device = new ohci_hlean2131qc_device(machine(), this);
+	usb_device = machine().device<ohci_hlean2131qc_device>("ohci_hlean2131qc");
+	usb_device->initialize(machine(), this);
 	usb_device->set_region_base(memregion(":others")->base()); // temporary
 	//usb_device = new ohci_hlean2131sc_device(machine());
 	usb_ohci_plug(1, usb_device); // connect
@@ -1091,6 +1128,9 @@ static MACHINE_CONFIG_DERIVED_CLASS(chihiro_base, xbox_base, chihiro_state)
 	MCFG_DEVICE_SLOT_INTERFACE(ide_baseboard, nullptr, true)
 	MCFG_DEVICE_MODIFY("ide:1")
 	MCFG_DEVICE_SLOT_INTERFACE(ide_baseboard, "bb", true)
+	
+	// next line is temporary
+	MCFG_DEVICE_ADD("ohci_hlean2131qc", OHCI_HLEAN2131QC, 0)
 MACHINE_CONFIG_END
 
 static MACHINE_CONFIG_DERIVED(chihirogd, chihiro_base)
diff --git a/src/mame/includes/xbox.h b/src/mame/includes/xbox.h
index 94f6ced7eb9..f93bbed0f53 100644
--- a/src/mame/includes/xbox.h
+++ b/src/mame/includes/xbox.h
@@ -300,7 +300,8 @@ class xbox_base_state; // forward declaration
 
 class ohci_function_device {
 public:
-	ohci_function_device(running_machine &machine, xbox_base_state *usb_bus_manager);
+	ohci_function_device();
+	virtual void initialize(running_machine &machine, xbox_base_state *usb_bus_manager);
 	virtual void execute_reset();
 	virtual void execute_connect() {};
 	virtual void execute_disconnect() {};
@@ -354,18 +355,39 @@ protected:
 	usb_device_configuration *selected_configuration;
 };
 
-class ohci_game_controller_device : public ohci_function_device
+extern const device_type OHCI_GAME_CONTROLLER;
+
+class ohci_game_controller_device : public device_t, public ohci_function_device
 {
 public:
-	ohci_game_controller_device(running_machine &machine, xbox_base_state *usb_bus_manager);
+	ohci_game_controller_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+	void initialize(running_machine &machine, xbox_base_state *usb_bus_manager) override;
 	int handle_nonstandard_request(int endpoint, USBSetupPacket *setup) override;
 	int handle_interrupt_pid(int endpoint, int pid, UINT8 *buffer, int size) override;
+
+protected:
+	virtual void device_start() override;
+	virtual ioport_constructor device_input_ports() const override;
 private:
 	static const USBStandardDeviceDescriptor devdesc;
 	static const USBStandardConfigurationDescriptor condesc;
 	static const USBStandardInterfaceDescriptor intdesc;
 	static const USBStandardEndpointDescriptor enddesc82;
 	static const USBStandardEndpointDescriptor enddesc02;
+	required_ioport m_ThumbstickLh; // left analog thumbstick horizontal movement
+	required_ioport m_ThumbstickLv; // left analog thumbstick vertical movement
+	required_ioport m_ThumbstickRh; // right analog thumbstick horizontal movement
+	required_ioport m_ThumbstickRv; // right analog thumbstick vertical movement
+	required_ioport m_DPad; // pressure sensitive directional pad
+	required_ioport m_TriggerL; // analog trigger
+	required_ioport m_TriggerR; // analog trigger
+	required_ioport m_Buttons; // digital buttons
+	required_ioport m_AGreen; // analog button
+	required_ioport m_BRed; // analog button
+	required_ioport m_XBlue; // analog button
+	required_ioport m_YYellow; // analog button
+	required_ioport m_Black; // analog button
+	required_ioport m_White; // analog button
 };
 
 class xbox_base_state : public driver_device
diff --git a/src/mame/machine/xbox.cpp b/src/mame/machine/xbox.cpp
index cd4ce8abba1..d29fac1ccbc 100644
--- a/src/mame/machine/xbox.cpp
+++ b/src/mame/machine/xbox.cpp
@@ -1175,7 +1175,11 @@ void xbox_base_state::usb_ohci_plug(int port, ohci_function_device *function)
 	}
 }
 
-ohci_function_device::ohci_function_device(running_machine &machine, xbox_base_state *usb_bus_manager)
+ohci_function_device::ohci_function_device()
+{
+}
+
+void ohci_function_device::initialize(running_machine &machine, xbox_base_state *usb_bus_manager)
 {
 	busmanager = usb_bus_manager;
 	state = DefaultState;
@@ -1636,15 +1640,95 @@ int ohci_function_device::execute_transfer(int endpoint, int pid, UINT8 *buffer,
 	return size;
 }
 
+INPUT_PORTS_START(xbox_controller)
+	PORT_START("ThumbstickLh") // left analog thumbstick horizontal movement
+	PORT_BIT(0xff, 0x80, IPT_AD_STICK_X) PORT_NAME("ThumbstickLh") PORT_SENSITIVITY(100) PORT_KEYDELTA(1) PORT_MINMAX(0, 0xff)
+		PORT_CODE_DEC(KEYCODE_J) PORT_CODE_INC(KEYCODE_L)
+	PORT_START("ThumbstickLv") // left analog thumbstick vertical movement
+	PORT_BIT(0xff, 0x80, IPT_AD_STICK_Y) PORT_NAME("ThumbstickLv") PORT_SENSITIVITY(100) PORT_KEYDELTA(1) PORT_MINMAX(0, 0xff)
+		PORT_CODE_DEC(KEYCODE_K) PORT_CODE_INC(KEYCODE_I)
+
+	PORT_START("ThumbstickRh") // right analog thumbstick horizontal movement
+	PORT_BIT(0xff, 0x80, IPT_AD_STICK_X) PORT_NAME("ThumbstickRh") PORT_SENSITIVITY(100) PORT_KEYDELTA(1) PORT_MINMAX(0, 0xff)
+		PORT_CODE_DEC(KEYCODE_4_PAD) PORT_CODE_INC(KEYCODE_6_PAD)
+	PORT_START("ThumbstickRv") // right analog thumbstick vertical movement
+	PORT_BIT(0xff, 0x80, IPT_AD_STICK_Y) PORT_NAME("ThumbstickRv") PORT_SENSITIVITY(100) PORT_KEYDELTA(1) PORT_MINMAX(0, 0xff)
+		PORT_CODE_DEC(KEYCODE_2_PAD) PORT_CODE_INC(KEYCODE_8_PAD)
+
+	PORT_START("DPad") // pressure sensitive directional pad
+	PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP) PORT_NAME("DPad Up")
+	PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN) PORT_NAME("DPad Down")
+	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT) PORT_NAME("DPad Left")
+	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT) PORT_NAME("DPad Right")
+
+	PORT_START("TriggerL") // analog trigger
+	PORT_BIT(0xff, 0x00, IPT_PEDAL) PORT_NAME("TriggerL") PORT_SENSITIVITY(100) PORT_KEYDELTA(1) PORT_MINMAX(0, 0xff)
+		PORT_CODE_DEC(KEYCODE_1_PAD) PORT_CODE_INC(KEYCODE_7_PAD)
+
+	PORT_START("TriggerR") // analog trigger
+	PORT_BIT(0xff, 0x00, IPT_PEDAL) PORT_NAME("TriggerR") PORT_SENSITIVITY(100) PORT_KEYDELTA(1) PORT_MINMAX(0, 0xff)
+		PORT_CODE_DEC(KEYCODE_3_PAD) PORT_CODE_INC(KEYCODE_9_PAD)
+
+	PORT_START("Buttons") // digital buttons
+	PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_BUTTON2) PORT_NAME("Start") // Start button
+	PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_BUTTON1) PORT_NAME("Back") // Back button
+
+	PORT_START("AGreen") // analog button
+	PORT_BIT(0xff, 0x00, IPT_PEDAL) PORT_NAME("A-Green") PORT_SENSITIVITY(100) PORT_KEYDELTA(32)  PORT_MINMAX(0, 0xff)
+		PORT_CODE_DEC(KEYCODE_A) PORT_CODE_INC(KEYCODE_Q)
+
+	PORT_START("BRed") // analog button
+	PORT_BIT(0xff, 0x00, IPT_PEDAL) PORT_NAME("B-Red") PORT_SENSITIVITY(100) PORT_KEYDELTA(32) PORT_MINMAX(0, 0xff)
+		PORT_CODE_DEC(KEYCODE_S) PORT_CODE_INC(KEYCODE_W)
+
+	PORT_START("XBlue") // analog button
+	PORT_BIT(0xff, 0x00, IPT_PEDAL) PORT_NAME("X-Blue") PORT_SENSITIVITY(100) PORT_KEYDELTA(32) PORT_MINMAX(0, 0xff)
+		PORT_CODE_DEC(KEYCODE_D) PORT_CODE_INC(KEYCODE_E)
+
+	PORT_START("YYellow") // analog button
+	PORT_BIT(0xff, 0x00, IPT_PEDAL) PORT_NAME("Y-Yellow") PORT_SENSITIVITY(100) PORT_KEYDELTA(32) PORT_MINMAX(0, 0xff)
+		PORT_CODE_DEC(KEYCODE_F) PORT_CODE_INC(KEYCODE_R)
+
+	PORT_START("Black") // analog button
+	PORT_BIT(0xff, 0x00, IPT_PEDAL) PORT_NAME("Black") PORT_SENSITIVITY(100) PORT_KEYDELTA(32) PORT_MINMAX(0, 0xff)
+		PORT_CODE_DEC(KEYCODE_G) PORT_CODE_INC(KEYCODE_T)
+
+	PORT_START("White") // analog button
+	PORT_BIT(0xff, 0x00, IPT_PEDAL) PORT_NAME("White") PORT_SENSITIVITY(100) PORT_KEYDELTA(32) PORT_MINMAX(0, 0xff)
+		PORT_CODE_DEC(KEYCODE_H) PORT_CODE_INC(KEYCODE_Y)
+INPUT_PORTS_END
+
 const USBStandardDeviceDescriptor ohci_game_controller_device::devdesc = { 18,1,0x110,0x00,0x00,0x00,64,0x45e,0x202,0x100,0,0,0,1 };
 const USBStandardConfigurationDescriptor ohci_game_controller_device::condesc = { 9,2,0x20,1,1,0,0x80,50 };
 const USBStandardInterfaceDescriptor ohci_game_controller_device::intdesc = { 9,4,0,0,2,0x58,0x42,0,0 };
 const USBStandardEndpointDescriptor ohci_game_controller_device::enddesc82 = { 7,5,0x82,3,0x20,4 };
 const USBStandardEndpointDescriptor ohci_game_controller_device::enddesc02 = { 7,5,0x02,3,0x20,4 };
 
-ohci_game_controller_device::ohci_game_controller_device(running_machine &machine, xbox_base_state *usb_bus_manager) :
-	ohci_function_device(machine, usb_bus_manager)
+const device_type OHCI_GAME_CONTROLLER = &device_creator<ohci_game_controller_device>;
+
+ohci_game_controller_device::ohci_game_controller_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+	device_t(mconfig, OHCI_GAME_CONTROLLER, "OHCI Game Controller", tag, owner, clock, "ohci_gc", __FILE__),
+	ohci_function_device(),
+	m_ThumbstickLh(*this, "ThumbstickLh"),
+	m_ThumbstickLv(*this, "ThumbstickLv"),
+	m_ThumbstickRh(*this, "ThumbstickRh"),
+	m_ThumbstickRv(*this, "ThumbstickRv"),
+	m_DPad(*this, "DPad"),
+	m_TriggerL(*this, "TriggerL"),
+	m_TriggerR(*this, "TriggerR"),
+	m_Buttons(*this, "Buttons"),
+	m_AGreen(*this, "AGreen"),
+	m_BRed(*this, "BRed"),
+	m_XBlue(*this, "XBlue"),
+	m_YYellow(*this, "YYellow"),
+	m_Black(*this, "Black"),
+	m_White(*this, "White")
 {
+}
+
+void ohci_game_controller_device::initialize(running_machine &machine, xbox_base_state *usb_bus_manager)
+{
+	ohci_function_device::initialize(machine, usb_bus_manager);
 	add_device_descriptor(devdesc);
 	add_configuration_descriptor(condesc);
 	add_interface_descriptor(intdesc);
@@ -1654,8 +1738,8 @@ ohci_game_controller_device::ohci_game_controller_device(running_machine &machin
 
 int ohci_game_controller_device::handle_nonstandard_request(int endpoint, USBSetupPacket *setup)
 {
-	//                                     >=8  ==42  !=0  !=0  1,3       2<20 <=20
-	static const UINT8 mytestdata1[16] = { 0x10,0x42 ,0x32,0x43,1   ,0x65,0x18,0x20,0x98,0xa9,0xba,0xcb,0xdc,0xed,0xfe };
+	//                                    >=8  ==42  !=0  !=0  1,3       2<20 <=20
+	static const UINT8 reportinfo[16] = { 0x10,0x42 ,0x32,0x43,1   ,0x65,0x14,0x20,0x98,0xa9,0xba,0xcb,0xdc,0xed,0xfe };
 
 	if (endpoint != 0)
 		return -1;
@@ -1663,7 +1747,7 @@ int ohci_game_controller_device::handle_nonstandard_request(int endpoint, USBSet
 	{
 		if ((setup->bRequest == GET_DESCRIPTOR) && (setup->wValue == 0x4200))
 		{
-			endpoints[endpoint].position = (UINT8 *)mytestdata1;
+			endpoints[endpoint].position = (UINT8 *)reportinfo;
 			endpoints[endpoint].remain = 16;
 			return 0;
 		}
@@ -1708,13 +1792,52 @@ int ohci_game_controller_device::handle_nonstandard_request(int endpoint, USBSet
 int ohci_game_controller_device::handle_interrupt_pid(int endpoint, int pid, UINT8 *buffer, int size)
 {
 	if ((endpoint == 2) && (pid == InPid)) {
-		for (int n = 0; n < size; n++)
-			buffer[n] = n;
+		int v;
+
+		buffer[0] = 0;
+		buffer[1] = 20;
+		v = m_DPad->read();
+		v = v | (m_Buttons->read() << 4);
+		buffer[2] = (UINT8)v;
+		buffer[3] = 0;
+		buffer[4] = m_AGreen->read();
+		buffer[5] = m_BRed->read();
+		buffer[6] = m_XBlue->read();
+		buffer[7] = m_YYellow->read();
+		buffer[8] = m_Black->read();
+		buffer[9] = m_White->read();
+		buffer[10] = m_TriggerL->read();
+		buffer[11] = m_TriggerR->read();
+		v = m_ThumbstickLh->read();
+		v = (v - 128) * 256;
+		buffer[12] = (UINT16)v & 255;
+		buffer[13] = (UINT16)v >> 8;
+		v = m_ThumbstickLv->read();
+		v = (v - 128) * 256;
+		buffer[14] = (UINT16)v & 255;
+		buffer[15] = (UINT16)v >> 8;
+		v = m_ThumbstickRh->read();
+		v = (v - 128) * 256;
+		buffer[16] = (UINT16)v & 255;
+		buffer[17] = (UINT16)v >> 8;
+		v = m_ThumbstickRv->read();
+		v = (v - 128) * 256;
+		buffer[18] = (UINT16)v & 255;
+		buffer[19] = (UINT16)v >> 8;
 		return size;
 	}
 	return -1;
 }
 
+void ohci_game_controller_device::device_start()
+{
+}
+
+ioport_constructor ohci_game_controller_device::device_input_ports() const
+{
+	return INPUT_PORTS_NAME(xbox_controller);
+}
+
 void xbox_base_state::usb_ohci_interrupts()
 {
 	if (((ohcist.hc_regs[HcInterruptStatus] & ohcist.hc_regs[HcInterruptEnable]) != 0) && ((ohcist.hc_regs[HcInterruptEnable] & MasterInterruptEnable) != 0))
@@ -2420,7 +2543,8 @@ void xbox_base_state::machine_start()
 	ohcist.space = &m_maincpu->space();
 	ohcist.timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(xbox_base_state::usb_ohci_timer), this), (void *)"USB OHCI Timer");
 	ohcist.timer->enable(false);
-	usb_device = new ohci_game_controller_device(machine(), this);
+	usb_device = machine().device<ohci_game_controller_device>("ohci_gamepad");
+	usb_device->initialize(machine(), this);
 	usb_ohci_plug(3, usb_device); // connect to root hub port 3, chihiro needs to use 1 and 2
 	// super-io
 	memset(&superiost, 0, sizeof(superiost));
@@ -2479,6 +2603,9 @@ MACHINE_CONFIG_START(xbox_base, xbox_base_state)
 	MCFG_ATA_INTERFACE_IRQ_HANDLER(DEVWRITELINE("pic8259_2", pic8259_device, ir6_w))
 	MCFG_BUS_MASTER_IDE_CONTROLLER_SPACE("maincpu", AS_PROGRAM)
 
+	// next line is temporary
+	MCFG_DEVICE_ADD("ohci_gamepad", OHCI_GAME_CONTROLLER, 0)
+
 	/* video hardware */
 	MCFG_SCREEN_ADD("screen", RASTER)
 	MCFG_SCREEN_REFRESH_RATE(60)

From ee6872dc68ba2dfc3834ec91dd97f98ce2cc4302 Mon Sep 17 00:00:00 2001
From: Brad Hughes <bradhugh@outlook.com>
Date: Mon, 18 Apr 2016 19:05:45 -0400
Subject: [PATCH 083/122] Add UWP implementation for cursor methods

---
 src/osd/windows/window.cpp | 36 ++++++++++++++++++++++++++++++++++++
 src/osd/windows/window.h   |  5 +++++
 2 files changed, 41 insertions(+)

diff --git a/src/osd/windows/window.cpp b/src/osd/windows/window.cpp
index 1c3c2a8ec23..1bae62625f3 100644
--- a/src/osd/windows/window.cpp
+++ b/src/osd/windows/window.cpp
@@ -30,6 +30,11 @@
 
 #include "winutil.h"
 
+#if !WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
+#include <agile.h>
+using namespace Windows::UI::Core;
+#endif
+
 #include "modules/render/drawbgfx.h"
 #include "modules/render/drawnone.h"
 #include "modules/render/drawd3d.h"
@@ -385,6 +390,8 @@ win_window_info::~win_window_info()
 
 POINT win_window_info::s_saved_cursor_pos = { -1, -1 };
 
+#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
+
 void win_window_info::capture_pointer()
 {
 	RECT bounds;
@@ -419,6 +426,35 @@ void win_window_info::show_pointer()
 	ShowCursor(FALSE);
 }
 
+#else
+
+CoreCursor^ win_window_info::s_cursor = nullptr;
+
+void win_window_info::capture_pointer()
+{
+	platform_window<Platform::Agile<CoreWindow^>>()->SetPointerCapture();
+}
+
+void win_window_info::release_pointer()
+{
+	platform_window<Platform::Agile<CoreWindow^>>()->ReleasePointerCapture();
+}
+
+void win_window_info::hide_pointer()
+{
+	auto window = platform_window<Platform::Agile<CoreWindow^>>();
+	win_window_info::s_cursor = window->PointerCursor;
+	window->PointerCursor = nullptr;
+}
+
+void win_window_info::show_pointer()
+{
+	auto window = platform_window<Platform::Agile<CoreWindow^>>();
+	window->PointerCursor = win_window_info::s_cursor;
+}
+
+#endif
+
 //============================================================
 //  winwindow_process_events_periodic
 //  (main thread)
diff --git a/src/osd/windows/window.h b/src/osd/windows/window.h
index be9f4c4ee63..a8d1fbffdb6 100644
--- a/src/osd/windows/window.h
+++ b/src/osd/windows/window.h
@@ -143,6 +143,11 @@ private:
 	void set_fullscreen(int fullscreen);
 
 	static POINT        s_saved_cursor_pos;
+
+#if !WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
+	static Windows::UI::Core::CoreCursor^ s_cursor;
+#endif
+
 	running_machine &   m_machine;
 };
 

From 310dc5e92fe6e18e11564c1f461c04d3273307f8 Mon Sep 17 00:00:00 2001
From: David Haywood <mamehaze@users.noreply.github.com>
Date: Tue, 19 Apr 2016 01:31:01 +0100
Subject: [PATCH 084/122] part 1 (nw)

---
 src/mame/drivers/aristmk6.cpp | 1315 +++++++++++++++++++++++++++++++++
 src/mame/mame.lst             |  116 +++
 2 files changed, 1431 insertions(+)

diff --git a/src/mame/drivers/aristmk6.cpp b/src/mame/drivers/aristmk6.cpp
index 89b03477cb7..d47506361c2 100644
--- a/src/mame/drivers/aristmk6.cpp
+++ b/src/mame/drivers/aristmk6.cpp
@@ -349,6 +349,1201 @@ ROM_START( thaiprin )
 	ROM_LOAD32_WORD("30127721.u72", 0x0800002, 0x0100000, BAD_DUMP CRC(613cea6b) SHA1(f04a3ee53074b7cd84879d752df5dbb80437475e) ) // wrong size?!
 ROM_END
 
+
+ROM_START( 100lions )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("100_lions.000", 0x0000000, 0x0400000, CRC(a1c71dd2) SHA1(9a859df876cf6a2fadcc5ae7183021881dc08887) )
+	ROM_LOAD32_WORD("100_lions.001", 0x0000000, 0x0400000, CRC(da7d2ed7) SHA1(1f81cad150c013848988e6f995a45f7ea5c6d95c) )
+ROM_END
+
+
+
+
+ROM_START( 5dragons )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("5 Dragons Demo.003", 0x0000000, 0x0400000, CRC(a534f262) SHA1(27201f8fd9a6c55e41e30d73e2868961961df827) )
+	ROM_LOAD32_WORD("5 Dragons Demo.001", 0x0000000, 0x0400000, CRC(6188048d) SHA1(d03d2ef8ce744f6523bc5a3775013764386acdf5) )
+	ROM_LOAD32_WORD("5 Dragons Demo.002", 0x0000000, 0x0400000, CRC(9840fdcb) SHA1(ee87ab3e93fafd4a262451e906cbae2028cc2f61) )
+	ROM_LOAD32_WORD("5 Dragons Demo.000", 0x0000000, 0x0400000, CRC(726f45a0) SHA1(b48227f4438b52857f43d26baa216a3b1d1fd27f) )
+ROM_END
+
+
+
+
+ROM_START( adustcm )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("African dusk U72.003", 0x0000000, 0x0400000, CRC(d963cc96) SHA1(8a855269d0ea92e1f58ceda555bb124746ae1268) )
+	ROM_LOAD32_WORD("African dusk U73.001", 0x0000000, 0x0400000, CRC(b156f918) SHA1(004ce75da1ba9b95c5d689a568d8e6502b7d00ab) )
+	ROM_LOAD32_WORD("African dusk U85.002", 0x0000000, 0x0400000, CRC(f62830be) SHA1(13fbadf58ac2f3c15f78a40b3ac45e20d1080937) )
+	ROM_LOAD32_WORD("African dusk U86.000", 0x0000000, 0x0400000, CRC(26759ebc) SHA1(1205d74c39d13333ccc0ff4deb287ce12d6dbbf5) )
+ROM_END
+
+
+
+ROM_START( alchemya )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("Alchemy.003", 0x0000000, 0x0400000, CRC(11321ce3) SHA1(83c6e7618b29fa7ea8c01e27be0b6e4d85822299) )
+	ROM_LOAD32_WORD("Alchemy_U73.001", 0x0000000, 0x0400000, CRC(bfac2656) SHA1(337f952fae2bff960c78f8808d3dc04815e74404) )
+	ROM_LOAD32_WORD("Alchemy_U85.002", 0x0000000, 0x0400000, CRC(a0a3453b) SHA1(f5f5559bbf8fdf176ca4f0ad755259120d29930c) )
+	ROM_LOAD32_WORD("Alchemy_U86.000", 0x0000000, 0x0400000, CRC(7157c70b) SHA1(1740fd0e9a7dd72390146bfa4e2c4ef3b7d7ec0d) )
+ROM_END
+
+
+
+ROM_START( amzqnar )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("AmazonQueen U72.003", 0x0000000, 0x0400000, CRC(1e039e60) SHA1(4f6c5db24c2841daa9b29af2732335498f8b8f0d) )
+	ROM_LOAD32_WORD("AmazonQueen U73.001", 0x0000000, 0x0400000, CRC(7b64f0b4) SHA1(1af15ac0f41acde21606002add1212b9ac72225c) )
+	ROM_LOAD32_WORD("AmazonQueen U85.002", 0x0000000, 0x0400000, CRC(484d8848) SHA1(b86351fd828507968b44fd92c0f9b7ad51bfb9a8) )
+	ROM_LOAD32_WORD("AmazonQueen U86.000", 0x0000000, 0x0400000, CRC(2d5d9be4) SHA1(4eee74084279ae6e89bab55ef22711836eb11a93) )
+ROM_END
+
+
+ROM_START( arbnigar )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("Arabian Nights.003", 0x0000000, 0x0400000, CRC(709de514) SHA1(3f380ef548c45fa8eaba9cba2bbabdcb59c7660b) )
+	ROM_LOAD32_WORD("Arabian Nights.000", 0x0000000, 0x0400000, CRC(45cf08c3) SHA1(a963a32b3bca5dec17a6cea4c0e5c66f14b42f65) )
+	ROM_LOAD32_WORD("Arabian Nights u85.002", 0x0000000, 0x0400000, CRC(03abddc6) SHA1(cc0a8c78d52b26977274455be8dadb21ee4d3580) )
+	ROM_LOAD32_WORD("Arabian Nights .001", 0x0000000, 0x0400000, CRC(2d2629f0) SHA1(f7af60e390394b12a82a3125a9b931046a5e1fef) )
+ROM_END
+
+
+
+ROM_START( bigbenpj )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("bigben_u72.003", 0x0000000, 0x0400000, CRC(b5b0fb0e) SHA1(a5f233c1472d7b27a85e2b116ccac8ef61d23e6c) )
+	ROM_LOAD32_WORD("bigben_u73.001", 0x0000000, 0x0400000, CRC(5e5d02f3) SHA1(5a8d7403186d3b10ef3e92297ca4b484c902095a) )
+	ROM_LOAD32_WORD("bigben_u85.002", 0x0000000, 0x0400000, CRC(bc7846d4) SHA1(f754ca71c821f65a27c631f91ce254c76152ffde) )
+	ROM_LOAD32_WORD("bigben_u86.000", 0x0000000, 0x0400000, CRC(21a31a76) SHA1(2290c502c492064967cf67f545351ff38ed6a1be) )
+ROM_END
+
+
+
+ROM_START( bigheart )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("Big Hearted U73.001", 0x0000000, 0x0400000, CRC(920ffac3) SHA1(be34f582712da5be84834562c758997829302c24) )
+	ROM_LOAD32_WORD("Big Hearted U86.000", 0x0000000, 0x0400000, CRC(b63fbc96) SHA1(f0a76f52441afe41e9bb11da1526a17d1ed9df6c) )
+ROM_END
+
+
+
+ROM_START( bigredjp )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("Big Red 2 -Stand Alone.002", 0x0000000, 0x0400000, CRC(e05a45db) SHA1(4fff979915952addc3251adb4385f0072b2033cd) )
+	ROM_LOAD32_WORD("Big Red 2 -Stand Alone.000", 0x0000000, 0x0400000, CRC(6e68c586) SHA1(f6261e92e9c22fbd59d385451d5b212bb888425b) )
+	ROM_LOAD32_WORD("Big Red 2 -Stand Alone.001", 0x0000000, 0x0400000, CRC(8826a403) SHA1(d0e08205c0fdc7229ca4d9a895a8456d8f07ff26) )
+	ROM_LOAD32_WORD("Big Red 2 -Stand Alone-.003", 0x0000000, 0x0400000, CRC(d28be7d5) SHA1(67820d280cb016ecdd8dd35cd0f89f51ab4d4cf1) )
+ROM_END
+
+
+
+ROM_START( birredar )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("Big Red.epm", 0x0000000, 0x0000200, CRC(35a1c508) SHA1(b294d209a079308139e7d3df99be11ba563265b6) )
+	ROM_LOAD32_WORD("Big Red.srm", 0x0000000, 0x0080000, CRC(75181493) SHA1(1ef14c4524f92f6823904e6df26da213a28cc502) )
+	ROM_LOAD32_WORD("bigr.000", 0x0000000, 0x0400000, CRC(da16ed45) SHA1(febb8f960009361250ab78814d60d008b3778a57) )
+	ROM_LOAD32_WORD("bigr.001", 0x0000000, 0x0400000, CRC(60e8fd7e) SHA1(7294a180d3ee869a545f43c2c898130f393d076a) )
+	ROM_LOAD32_WORD("bigr.002", 0x0000000, 0x0400000, CRC(8c2f6fc9) SHA1(9dd687b242a3d0348cc20a7a20fef149f5f7834a) )
+	ROM_LOAD32_WORD("bigr.003", 0x0000000, 0x0400000, CRC(bab7ae56) SHA1(d2de7e8544eabe1f116cc878f4ad3ccf22d4ca38) )
+ROM_END
+
+
+
+ROM_START( blkbrum )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("Black Brumby U72.003", 0x0000000, 0x0400000, CRC(95673ea4) SHA1(17ea6380473796042a44c42afda79ef270282892) )
+	ROM_LOAD32_WORD("Black Brumby U73.001", 0x0000000, 0x0400000, CRC(0ad23541) SHA1(92ddaa68e212165bd2828360b9fdeafd9c821335) )
+	ROM_LOAD32_WORD("Black Brumby U85.002", 0x0000000, 0x0400000, CRC(5f29ac14) SHA1(7fae7adf85b90375732767fb9cd0e88097a61399) )
+	ROM_LOAD32_WORD("Black Brumby U86.000", 0x0000000, 0x0400000, CRC(5a1600be) SHA1(1fcdbc434f872c538997a604b70433d987e2d1ca) )
+ROM_END
+
+
+
+ROM_START( brazilar )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("Brazil U73.001", 0x0000000, 0x0400000, CRC(5eb15d8b) SHA1(dc313f96390eb04769c5c9249b140eed67796cd8) )
+	ROM_LOAD32_WORD("Brazil U86.000", 0x0000000, 0x0400000, CRC(9be9f72c) SHA1(5e86e42280c6b5b3ce484a04107e84b6aa457bd1) )
+ROM_END
+
+
+ROM_START( bucanar )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("Buccaneer.001", 0x0000000, 0x0400000, CRC(fa1e540e) SHA1(12d36d59fd176cbfad5e78f913a259fd06150f89) )
+	ROM_LOAD32_WORD("Buccaneer.000", 0x0000000, 0x0400000, CRC(9e1f8099) SHA1(28b1f19be0d6914afb604408e74b2d5260e11624) )
+ROM_END
+
+
+
+ROM_START( buffalar )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("buffalo.000", 0x0000000, 0x0400000, CRC(9fc2bb3e) SHA1(2a0253500b52ebdebb61c0c8cf296ba9cff575da) )
+	ROM_LOAD32_WORD("buffalo.001", 0x0000000, 0x0400000, CRC(bcc108b3) SHA1(937c5a3cdace65e706565af46597f46562830c80) )
+	ROM_LOAD32_WORD("buffalo.002", 0x0000000, 0x0400000, CRC(fd6a18dc) SHA1(bd5d1a0d6c3c9c99e12234ac3ffca1100edf75fe) )
+	ROM_LOAD32_WORD("buffalo.003", 0x0000000, 0x0400000, CRC(6e7b99c9) SHA1(fd1615e41ba3cf42c2853cf0ccdc0f434694b95e) )
+ROM_END
+
+
+
+ROM_START( bushrngr )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("Bushranger .003", 0x0000000, 0x0400000, CRC(71a0084f) SHA1(1e7b7b58b2df25ea0468d702d7eef658d7c53f47) )
+	ROM_LOAD32_WORD("Bushranger .001", 0x0000000, 0x0400000, CRC(73206610) SHA1(9a9eb07efde20c5b079a39c96db447937f555c93) )
+	ROM_LOAD32_WORD("Bushranger .002", 0x0000000, 0x0400000, CRC(5b471edb) SHA1(78da72b727d71f24fbfed34feda9167dd10d96e3) )
+	ROM_LOAD32_WORD("Bushranger.000", 0x0000000, 0x0400000, CRC(e2548c80) SHA1(485476a71f8910fb20a185e5883f863e0628e060) )
+ROM_END
+
+
+
+ROM_START( calyking )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("Calypso_King_U72.003", 0x0000000, 0x0400000, CRC(1a09ab1e) SHA1(8aca20b52d1072387e49e6d020c6e9565650aec9) )
+	ROM_LOAD32_WORD("Calypso_King_U73.001", 0x0000000, 0x0400000, CRC(a6f903f6) SHA1(6101cc9115b91c6860cfd3fbe5ab2da105a41ef4) )
+	ROM_LOAD32_WORD("Calypso_King_U85.002", 0x0000000, 0x0400000, CRC(4e130673) SHA1(6d49558146c0e3e8a0f1659dcc2ebe60ae17782b) )
+	ROM_LOAD32_WORD("Calypso_King_U86.000", 0x0000000, 0x0400000, CRC(09ae1f6a) SHA1(2bfc4fb9e01084c460321bb3fa29cee0600c5654) )
+ROM_END
+
+
+
+ROM_START( canary2 )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("Canary Riches U73.001", 0x0000000, 0x0400000, CRC(6ae381ec) SHA1(d1103744805137dc69b77a3e1319c7168c88306f) )
+	ROM_LOAD32_WORD("Canary Riches U86.000", 0x0000000, 0x0400000, CRC(37750a22) SHA1(dcb73df1c6bd206343302a8d70966291750a5baf) )
+ROM_END
+
+
+
+ROM_START( cmtonig )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("30194711.000", 0x0000000, 0x0400000, CRC(e39fdd27) SHA1(b5e391740ba695b09e2ecb169760240f39b6a27a) )
+	ROM_LOAD32_WORD("30194711.001", 0x0000000, 0x0400000, CRC(9defed89) SHA1(0496ee9b378b7117a8cea89c7b3fcca1bae20e64) )
+	ROM_LOAD32_WORD("30194711.002", 0x0000000, 0x0400000, CRC(3c93d700) SHA1(f940d3eff2225fa3470372b7cd8b630511d53843) )
+	ROM_LOAD32_WORD("30194711.003", 0x0000000, 0x0400000, CRC(2a9dd5fd) SHA1(ca484bf494b7431baaadaf7df663ffd84ea07120) )
+	ROM_LOAD32_WORD("30194711.004", 0x0000000, 0x0400000, CRC(1bce542e) SHA1(8dfb78d966ee50d866739f86c6da9b33e09cd108) )
+	ROM_LOAD32_WORD("30194711.005", 0x0000000, 0x0400000, CRC(2cbd3ef8) SHA1(c4a830c9bae7c50276ba951128056292ac09e19d) )
+	ROM_LOAD32_WORD("30194711.006", 0x0000000, 0x0400000, CRC(cb1a9281) SHA1(1de3b988336fb930d636f3bad37d3d5dc359713b) )
+	ROM_LOAD32_WORD("30194711.007", 0x0000000, 0x0400000, CRC(1dbc278e) SHA1(ac48fce5256a04eabd8271de96b300fb7c265927) )
+	ROM_LOAD32_WORD("30194711.008", 0x0000000, 0x0400000, CRC(5f7dd3f8) SHA1(23db92025455b7ab089a990b2f2cab3acb9ab3b5) )
+	ROM_LOAD32_WORD("30194711.009", 0x0000000, 0x0400000, CRC(5e28e9cb) SHA1(e45cce804fe014078d399a04ca68f1a79d2d5f41) )
+	ROM_LOAD32_WORD("30194711.011", 0x0000000, 0x0400000, CRC(b9d91cab) SHA1(0e79c9e02068c47a9ffc7ace70adad2b579d559f) )
+	ROM_LOAD32_WORD("30194711.010", 0x0000000, 0x0400000, CRC(6ac1430d) SHA1(a782cdcdd80e59f8f7de9a16559609759eaefb78) )
+	ROM_LOAD32_WORD("30194711.012", 0x0000000, 0x0400000, CRC(9b69c5ca) SHA1(f13c4355319c6c45316a05f74a561964657990b8) )
+	ROM_LOAD32_WORD("30194711.013", 0x0000000, 0x0400000, CRC(1bf2985c) SHA1(7c037b290983b70efe5f72cb8b8b30e012b53860) )
+ROM_END
+
+
+ROM_START( csdce )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("Gam_Eprm.u71", 0x0000000, 0x0400000, CRC(32fcccb0) SHA1(a0fa260dadf4b6c659eaa60f67a3e552dbb1807b) )
+	ROM_LOAD32_WORD("Gam_Eprm.u72", 0x0000000, 0x0400000, CRC(f74e7f25) SHA1(5b43b54c10141b845d0de1d4f3dd54b833bd2d2a) )
+	ROM_LOAD32_WORD("Gam_Eprm.u73", 0x0000000, 0x0400000, CRC(d38ffd1b) SHA1(3d39c93478faafbadd9caf6f2a9b3d40ac4e51ce) )
+	ROM_LOAD32_WORD("Gam_Eprm.u84", 0x0000000, 0x0400000, CRC(15a5fb71) SHA1(bb2025e4a85ba77daf8bb6b55e38a8b8250f90f3) )
+	ROM_LOAD32_WORD("Gam_Eprm.u85", 0x0000000, 0x0400000, CRC(c58ea0e5) SHA1(545dc5d0e6d18d5f22ec3e216d9204efc1d69633) )
+	ROM_LOAD32_WORD("Gam_Eprm.u86", 0x0000000, 0x0400000, CRC(cdf64cac) SHA1(3673f1cce8ce92192754ba2afa24be14dbfd760f) )
+ROM_END
+
+
+
+ROM_START( csd )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("Choy Sun Doa .003", 0x0000000, 0x0400000, CRC(732bc777) SHA1(bc3ced0a3e3e75151bfdf1c7d79fff2ebac15230) )
+	ROM_LOAD32_WORD("Choy Sun Doa.001", 0x0000000, 0x0400000, CRC(78fb8acb) SHA1(60cde2c9fd0c3a6ac8a76099906c87393d90b8bf) )
+	ROM_LOAD32_WORD("Choy Sun Doa.002", 0x0000000, 0x0400000, CRC(e1b6c747) SHA1(3e0345357c4b66b30c87e6ebf540fcc636505804) )
+	ROM_LOAD32_WORD("Choy Sun Doa.000", 0x0000000, 0x0400000, CRC(674fbe7a) SHA1(5292dd3887f066e6ea150fe8c140c2d3cde142d9) )
+ROM_END
+
+
+
+ROM_START( csret )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("Choy Sun Returns U72.003", 0x0000000, 0x0400000, CRC(c4278640) SHA1(bfb5c69191661625427742d24f7f2f63e59217c1) )
+	ROM_LOAD32_WORD("Choy Sun Returns U73.001", 0x0000000, 0x0400000, CRC(3dadf971) SHA1(ffab779da0160d0e8a78fdc9e1440b2f27d04d20) )
+	ROM_LOAD32_WORD("Choy Sun Returns U85.002", 0x0000000, 0x0400000, CRC(6771599d) SHA1(c3476b37b9189c3197194a9027d2f154a12aee37) )
+	ROM_LOAD32_WORD("Choy Sun Returns U86.000", 0x0000000, 0x0400000, CRC(0136afeb) SHA1(ec8478216353100a541cf736d54fc440cd89d665) )
+ROM_END
+
+
+
+ROM_START( corrida )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("30178311_CORRIDA_DE_TOROS.003", 0x0000000, 0x0400000, CRC(37d4eed5) SHA1(55aa5f4dad3193f67e8fea7506dde2230b8c6b9e) )
+	ROM_LOAD32_WORD("30178311_CORRIDA_DE_TOROS.001", 0x0000000, 0x0400000, CRC(6df3c1f5) SHA1(5b8fcbbc650c0fefdf504fd7d48a125d2f7d22e7) )
+	ROM_LOAD32_WORD("30178311_CORRIDA_DE_TOROS_.002", 0x0000000, 0x0400000, CRC(451774c0) SHA1(e2fd78433ad9016900581720ccd29bf511a57f04) )
+	ROM_LOAD32_WORD("30178311_CORRIDA_DE_TOROS.000", 0x0000000, 0x0400000, CRC(19424139) SHA1(8715c995368f5ac410b2ef6f09833b7516df0bd5) )
+ROM_END
+
+
+
+ROM_START( cryspri )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("Crystal Springs U73.001", 0x0000000, 0x0400000, CRC(e8ab1219) SHA1(88e792209d224fc95b4248fc1aeebcae39b06eb7) )
+	ROM_LOAD32_WORD("Crystal Springs U86.000", 0x0000000, 0x0400000, CRC(5c0e7122) SHA1(f729e20d15f9a8d1442a9f9616cfa09ac181bc3f) )
+ROM_END
+
+
+
+ROM_START( deltqn )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("Delta Queen_U72.003", 0x0000000, 0x0400000, CRC(1978abb1) SHA1(7ffd1d81201bcf31936bbc5bd194b182cb9b5cdc) )
+	ROM_LOAD32_WORD("Delta Queen_U73.001", 0x0000000, 0x0400000, CRC(56628af9) SHA1(778175ce3d0074569e434a9c3995751747352e15) )
+	ROM_LOAD32_WORD("Delta Queen_U85.002", 0x0000000, 0x0400000, CRC(73fe916b) SHA1(c262775bde046b5457ab998017012af12b5c036c) )
+	ROM_LOAD32_WORD("Delta Queen_U86.000", 0x0000000, 0x0400000, CRC(93b7ca6b) SHA1(1384638d4da321ec7044f0bf10dfc626c1928215) )
+ROM_END
+
+
+
+ROM_START( di4ever )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("Diamond's Forever U73.001", 0x0000000, 0x0400000, CRC(39922c60) SHA1(19c36087cae9cf482d3dc86dc40fa94c3687ae96) )
+	ROM_LOAD32_WORD("Diamond's Forever U86.000", 0x0000000, 0x0400000, CRC(d7c0fd99) SHA1(97d2b17ea89d7dd0186a13f08fe68a7f8e1336ca) )
+ROM_END
+
+
+
+ROM_START( dinoaris )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("Dinosaur .003", 0x0000000, 0x0400000, CRC(34181cf9) SHA1(93d014891789260fe0a0eeeff17c25c6211753db) )
+	ROM_LOAD32_WORD("Dinosaur.001", 0x0000000, 0x0400000, CRC(17b46b56) SHA1(43d55adcc54855b6845ffedba8998b14df0447f3) )
+	ROM_LOAD32_WORD("Dinosaur.002", 0x0000000, 0x0400000, CRC(cff22e03) SHA1(0fd6632ae9c71bc99a31e9bdc9abdfda09dfafd7) )
+	ROM_LOAD32_WORD("Dinosaur U86.000", 0x0000000, 0x0400000, CRC(74e08c66) SHA1(002a526e8e693aa68f45ae8485114c8bdc3f2453) )
+ROM_END
+
+
+
+ROM_START( doubdolp )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("double_dolphins_U72.003", 0x0000000, 0x0400000, CRC(cd886389) SHA1(d0044d88d7cc168ae24e3a61f7e4758317b82417) )
+	ROM_LOAD32_WORD("double_dolphins_U73.001", 0x0000000, 0x0400000, CRC(493c254b) SHA1(940c5b905c9e5677db5589fb097418d08047897d) )
+	ROM_LOAD32_WORD("double_dolphins_U85.002", 0x0000000, 0x0400000, CRC(7aa49b2d) SHA1(15ae3f0eb6d1e44c5453e557b04f1ab3941163dc) )
+	ROM_LOAD32_WORD("double_dolphins_U86.000", 0x0000000, 0x0400000, CRC(ab98e4c1) SHA1(95ca99633a11d0087a4a702be8c075f1ad87bed4) )
+ROM_END
+
+
+
+ROM_START( drgnlrd )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("DragonLord_.002", 0x0000000, 0x0400000, CRC(d17e1a0d) SHA1(955e4956656e7f08e352628cc632af0e3cb6cf0f) )
+	ROM_LOAD32_WORD("DragonLord_.003", 0x0000000, 0x0400000, CRC(c2b42880) SHA1(7079102d576d8e9c5cb4d3067b02d131b63b8d88) )
+	ROM_LOAD32_WORD("DragonLord_.000", 0x0000000, 0x0400000, CRC(fc699900) SHA1(8e49672e7622ac6bd0106c25f524a7dd9e9578ab) )
+	ROM_LOAD32_WORD("DragonLord_.001", 0x0000000, 0x0400000, CRC(dd887eb0) SHA1(7ac4f86d0cfc69acd4471cc018f8b83d98735b37) )
+//	ROM_LOAD32_WORD("Grizzly", 0x0000000, 0x10cad8d, CRC(80277bc4) SHA1(a274e7a828c722a40eaa86e70cc9f7b4a24e2494) )
+ROM_END
+
+
+
+
+ROM_START( drgnmgic )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("Gam_Eprm.u71", 0x0000000, 0x0400000, CRC(768ff8fb) SHA1(a99a750ee4bb761a21c264133ce7ea7ef344578f) )
+	ROM_LOAD32_WORD("Gam_Eprm.u72", 0x0000000, 0x0400000, CRC(cc84661f) SHA1(85fca4517b6fbbe83c4f5a5159af95c7e1089849) )
+	ROM_LOAD32_WORD("Gam_Eprm.u73", 0x0000000, 0x0400000, CRC(aa321624) SHA1(8c0e7e84c0dc7a2a61eb8d4777e5e937c1622730) )
+	ROM_LOAD32_WORD("Gam_Eprm.u84", 0x0000000, 0x0400000, CRC(cc84cd2f) SHA1(1939b7a40de44de5d026f2e4252f9d2b33d44012) )
+	ROM_LOAD32_WORD("Gam_Eprm.u85", 0x0000000, 0x0400000, CRC(aa2ebf24) SHA1(fc4bc1d9b201defa04cdcfaf12c79e67496c233c) )
+	ROM_LOAD32_WORD("Gam_Eprm.u86", 0x0000000, 0x0400000, CRC(9fb775a7) SHA1(636d7959a8aeb5f2b5d46fc369721451fc3e4693) )
+ROM_END
+
+
+
+ROM_START( ent6r )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("Enchantress_.001", 0x0000000, 0x0400000, CRC(dcaaec40) SHA1(f035e54d9c926826c7883838a65260fc5ca6c02c) )
+	ROM_LOAD32_WORD("Enchantress_.000", 0x0000000, 0x0400000, CRC(17a7db59) SHA1(f948369144791d6fd761efbbe5fb37b765b637e3) )
+ROM_END
+
+
+ROM_START( eott )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("Eyes Of The Tiger .003", 0x0000000, 0x0400000, CRC(0ccf36e4) SHA1(6b185113a909985730cf1a58d1179d0ffc269d40) )
+	ROM_LOAD32_WORD("Eyes Of The Tiger .001", 0x0000000, 0x0400000, CRC(63d43c24) SHA1(8f76d2a7f9f5c0eb89609f891255e584b3a417d5) )
+	ROM_LOAD32_WORD("Eyes Of The Tiger .002", 0x0000000, 0x0400000, CRC(d941636d) SHA1(7103599caa30d57a1fa038afd7c60c684ba9dc5a) )
+	ROM_LOAD32_WORD("Eyes Of The Tiger.000", 0x0000000, 0x0400000, CRC(dae52614) SHA1(4a80d1a20f79b25e0f47c40ba05645d60b598568) )
+ROM_END
+
+
+
+ROM_START( firedan )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("U72 Fire Dancer.003", 0x0000000, 0x0400000, CRC(de394e4c) SHA1(9ec430df94de2cc0dbc8cc3a8763fde257fe3477) )
+	ROM_LOAD32_WORD("U73 Fire Dancer.001", 0x0000000, 0x0400000, CRC(30b0f1a0) SHA1(9095f3848514e5a7ab5528fef701a274156d4bce) )
+	ROM_LOAD32_WORD("U85 Fire Dancer.002", 0x0000000, 0x0400000, CRC(f05c2ebe) SHA1(7b196523a613955a3f4fec70e04c642bc1184dde) )
+	ROM_LOAD32_WORD("U86 Fire Dancer.000", 0x0000000, 0x0400000, CRC(be5673c6) SHA1(68a5c6515945c8341479cae3166d8ed0915ec566) )
+ROM_END
+
+
+
+ROM_START( followst )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("Follow The Stars.001", 0x0000000, 0x0400000, CRC(a1037235) SHA1(3badc901f8d1488cb630b07adc18cc280bd1c111) )
+	ROM_LOAD32_WORD("Follow The Stars.000", 0x0000000, 0x0400000, CRC(aa3d76aa) SHA1(94350d0efb49467febd1500dbb697aa865d43843) )
+ROM_END
+
+
+
+ROM_START( gambjack )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("Gambling Jack U73.001", 0x0000000, 0x0400000, CRC(80eeb208) SHA1(ad38d08993457a344ed5da9b6335e9a933b11a67) )
+	ROM_LOAD32_WORD("Gambling Jack U86.000", 0x0000000, 0x0400000, CRC(d55c8c10) SHA1(fb876c0fe04785d01baef1debe5a16f4d2e1587f) )
+ROM_END
+
+
+
+ROM_START( geishaar )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("U72.003", 0x0000000, 0x0400000, CRC(1efb986d) SHA1(34a5964e0eada085ff738ee4853beb75c431aaaa) )
+	ROM_LOAD32_WORD("U73.001", 0x0000000, 0x0400000, CRC(544c2cd6) SHA1(3904bb39096dd66f3579b7f244e8872fe29f4f72) )
+	ROM_LOAD32_WORD("U85.002", 0x0000000, 0x0400000, CRC(02c7819e) SHA1(f553adf6975c6fafff61e30605531b91ae5598af) )
+	ROM_LOAD32_WORD("U86.000", 0x0000000, 0x0400000, CRC(994e2e17) SHA1(a8b40aeb98f4e80a3eb412927f23b4292a7dbf6e) )
+ROM_END
+
+
+ROM_START( goapear )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("Go Ape U73.001", 0x0000000, 0x0400000, CRC(d579d719) SHA1(e3679657ed2f27b52a762a7f424714e5080a6957) )
+	ROM_LOAD32_WORD("Go Ape U86.000", 0x0000000, 0x0400000, CRC(392ed11e) SHA1(4fef477254b75c37a282a77aaf3046855118bdc0) )
+ROM_END
+
+
+ROM_START( gogreen )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("Go For Green U72.003", 0x0000000, 0x0400000, CRC(e138958c) SHA1(4416c4e00e388e8c84f9d82949c1875a5b34655f) )
+	ROM_LOAD32_WORD("Go For Green U73.001", 0x0000000, 0x0400000, CRC(279da15c) SHA1(967063011447aeb4563878c13da3cf60f3f8b456) )
+	ROM_LOAD32_WORD("Go For Green U85.002", 0x0000000, 0x0400000, CRC(57f68a9a) SHA1(8e7075e2b532a0c5ad0fd9d9f815a764cb9bb842) )
+	ROM_LOAD32_WORD("Go For Green U86.000", 0x0000000, 0x0400000, CRC(17f801b4) SHA1(c2044c445694fb0755add29e4a4a0ccb9bf36442) )
+ROM_END
+
+
+ROM_START( goldarjp )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("Golden Archer U72.003", 0x0000000, 0x0400000, CRC(f6d262c6) SHA1(09e5f1e3838921482b01005e8781e83f08a9bd75) )
+	ROM_LOAD32_WORD("Golden Archer U73.001", 0x0000000, 0x0400000, CRC(edaaadf1) SHA1(3d68ba211c1904e7ea35d679c9f8845ef1e4ea90) )
+	ROM_LOAD32_WORD("Golden Archer U85.002", 0x0000000, 0x0400000, CRC(dc2c1319) SHA1(8df96bf7b96a3c7df0a155420959d939daedf5c4) )
+	ROM_LOAD32_WORD("Golden Archer U86.000", 0x0000000, 0x0400000, CRC(00858fad) SHA1(8467ed9898d2234ba48e9896b8dd20afa75c5f69) )
+ROM_END
+
+
+ROM_START( goldinc )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("Golden Incas Demo.003", 0x0000000, 0x0400000, CRC(8629d154) SHA1(bb4e679188ec8f58e8e227804c36d1e61e575efe) )
+	ROM_LOAD32_WORD("Golden Incas Demo U73.001", 0x0000000, 0x0400000, CRC(7a88f44f) SHA1(586cbcf25eedcae538aaa3c3f8c7700778180295) )
+	ROM_LOAD32_WORD("Golden Incas Demo.002", 0x0000000, 0x0400000, CRC(dde914b2) SHA1(f35b761dd89796f62fec40d48c0223f585247de0) )
+	ROM_LOAD32_WORD("Golden Incas Demo.000", 0x0000000, 0x0400000, CRC(c4f488f9) SHA1(0db96a71f361f80f8e7265d1873728fc3013c204) )
+ROM_END
+
+
+ROM_START( goldpym )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("Golden_Pyramids_SE_MAXI_U72.003", 0x0000000, 0x0400000, CRC(be3c43ba) SHA1(23ac49737061690a814e9a54a1f32290621bdaaf) )
+	ROM_LOAD32_WORD("Golden_Pyramids_SE_MAXI_U73.001", 0x0000000, 0x0400000, CRC(f20e603e) SHA1(5577934713be6996057a2fe62c8988635c842b76) )
+	ROM_LOAD32_WORD("Golden_Pyramids_SE_MAXI_U85.002", 0x0000000, 0x0400000, CRC(f2e1763f) SHA1(86d8d96c016bf88c8db9eae3de1bd9c64f517189) )
+	ROM_LOAD32_WORD("Golden_Pyramids_SE_MAXI_U86.000", 0x0000000, 0x0400000, CRC(57b5488a) SHA1(d09915be7dee48570e79436eff55cabad58b783b) )
+ROM_END
+
+
+ROM_START( grizzly )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("Grizzly.005", 0x0000000, 0x0400000, CRC(f1bb1351) SHA1(59b5f6ee3a3e05e5d975b22de35d0c7bd87f82d3) )
+	ROM_LOAD32_WORD("Grizzly.000", 0x0000000, 0x0400000, CRC(4d071a11) SHA1(1f1557d6ad403ab13bc505076f26969fd81dd2e7) )
+	ROM_LOAD32_WORD("Grizzly.002", 0x0000000, 0x0400000, CRC(381765db) SHA1(8dc8901455f3c1f8b6302c6a996afe15280cf44b) )
+	ROM_LOAD32_WORD("Grizzly.004", 0x0000000, 0x0400000, CRC(d78ce4b8) SHA1(ab0a10d583b386975b0a53fccd9870b82a3d91a5) )
+	ROM_LOAD32_WORD("Grizzly.001", 0x0000000, 0x0400000, CRC(c45f8405) SHA1(2a5ef6932736e65ac62bbeee54e62689dd912dac) )
+	ROM_LOAD32_WORD("Grizzly.003", 0x0000000, 0x0400000, CRC(135ebde3) SHA1(baa20971ab9617742382088b9e956eeede11879b) )
+ROM_END
+
+
+ROM_START( heartgar )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("Heart of Gold 72.003", 0x0000000, 0x0400000, CRC(041cf141) SHA1(793a1c1ca44f0d4c83294456f953dc4e7fd3b134) )
+	ROM_LOAD32_WORD("Heart of Gold 73.001", 0x0000000, 0x0400000, CRC(ee851155) SHA1(885928fccf3368911717b7ca5352ecae862c7ebc) )
+	ROM_LOAD32_WORD("Heart of Gold 85.002", 0x0000000, 0x0400000, CRC(af0db2a6) SHA1(aec212c72d8588314cdb2b558f29524b0c142bbc) )
+	ROM_LOAD32_WORD("Heart of Gold 86.000", 0x0000000, 0x0400000, CRC(c2f2111a) SHA1(9c62dcac8fe03afbb7475a0d6e89ff01c6795c6f) )
+ROM_END
+
+
+ROM_START( heartveg )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("Heartofvegas.000", 0x0000000, 0x0400000, CRC(0ef4e3cb) SHA1(0cb2c296d7ac39e0e3fe590040c232e35d1508d4) )
+	ROM_LOAD32_WORD("Heartofvegas.001", 0x0000000, 0x0400000, CRC(e33aeb25) SHA1(32c3e914fff060404ebf3fbb7a502c9081b57862) )
+ROM_END
+
+
+ROM_START( highnoar )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("High Noon U72.003", 0x0000000, 0x0400000, CRC(fa35cdef) SHA1(060af506fee9234fb4921b788368e3e850b681c9) )
+	ROM_LOAD32_WORD("High Noon U73.001", 0x0000000, 0x0400000, CRC(a7b68492) SHA1(745220b963f9c5755ad078de9ccbca3c922d40ed) )
+	ROM_LOAD32_WORD("High Noon U85.002", 0x0000000, 0x0400000, CRC(cde132fd) SHA1(157e1d7fde6c57e5bc4ace03e43734d30141ad09) )
+	ROM_LOAD32_WORD("High Noon U86.000", 0x0000000, 0x0400000, CRC(c4f106c9) SHA1(38cde08bcdc8e053e8ea0166989a6ef40df139a3) )
+ROM_END
+
+
+ROM_START( holdrma )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("Hollywood Dreams U72.003", 0x0000000, 0x0400000, CRC(197035d3) SHA1(18da7e44107e8e0df584bd866a0083cf85ecceee) )
+	ROM_LOAD32_WORD("Hollywood Dreams U73.001", 0x0000000, 0x0400000, CRC(04fec2d4) SHA1(56beb6107c56674dc914f0c988311375dd281081) )
+	ROM_LOAD32_WORD("Hollywood Dreams U85.002", 0x0000000, 0x0400000, CRC(daae9640) SHA1(3d8aa7b4d55d1c3d8196be26bb89b83785666df1) )
+	ROM_LOAD32_WORD("Hollywood Dreams U86.000", 0x0000000, 0x0400000, CRC(9da0445f) SHA1(65e8d5f2563a5aa90dcba8b854912fe835294cb3) )
+ROM_END
+
+
+ROM_START( houhear )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("House_of_Hearts_.001", 0x0000000, 0x0400000, CRC(ad7c55fc) SHA1(873abc95c8118b5ca73779445023e8e0299498a6) )
+	ROM_LOAD32_WORD("House_of_Hearts.000", 0x0000000, 0x0400000, CRC(6cdc5816) SHA1(7157a12baa98ba810f5dcc5d5816a3380748032b) )
+ROM_END
+
+
+ROM_START( incachf )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("Inca_Chief_U72.003", 0x0000000, 0x0400000, CRC(95d1dfd2) SHA1(1faead5e4429e4e8a6fd53c5b16bd3fac9483c28) )
+	ROM_LOAD32_WORD("Inca_Chief_U73.001", 0x0000000, 0x0400000, CRC(45208b71) SHA1(e3ce2e9f5bd467872380ad387e77447831a0e67e) )
+	ROM_LOAD32_WORD("Inca_Chief_U85.002", 0x0000000, 0x0400000, CRC(46816847) SHA1(aa65826fe1282b15fbdd8abe81e03f0d11d4f18f) )
+	ROM_LOAD32_WORD("Inca_Chief_U86.000", 0x0000000, 0x0400000, CRC(f9fa7d96) SHA1(a247c2694c0f0f78cbc431dca4d9385ab991ae80) )
+ROM_END
+
+
+ROM_START( indce )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("U72.003", 0x0000000, 0x0400000, CRC(4269940b) SHA1(8f5f6d751360e0abe2a6a80551f56176c46249e5) )
+	ROM_LOAD32_WORD("U73.001", 0x0000000, 0x0400000, CRC(a0a99966) SHA1(6fc4e3496e7791e818cbda6d95355467ceb28e6c) )
+	ROM_LOAD32_WORD("U85.002", 0x0000000, 0x0400000, CRC(b8b51dea) SHA1(04e6a261ab4912c7204b4a276147e1e219e02067) )
+	ROM_LOAD32_WORD("U86.000", 0x0000000, 0x0400000, CRC(18ae6a0a) SHA1(0401b86c7053129eb7fbd27c3e5988481df67481) )
+ROM_END
+
+ROM_START( indll )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("Indian Dreaming L L U71.005", 0x0000000, 0x0400000, CRC(81aecf10) SHA1(ca9236003e12dbe897dd942696dbac5cf059e8f1) )
+	ROM_LOAD32_WORD("Indian Dreaming L L U72.003", 0x0000000, 0x0400000, CRC(ebf17295) SHA1(f057ee03fc51041a4aa4413f3cb7df7483b4dd49) )
+	ROM_LOAD32_WORD("Indian Dreaming L L U73.001", 0x0000000, 0x0400000, CRC(ae6590eb) SHA1(d26d4c1612a466a4d67ca51cf6df2c38da88cd0c) )
+	ROM_LOAD32_WORD("Indian Dreaming L L U84.004", 0x0000000, 0x0400000, CRC(14ca706b) SHA1(552b8c864f8b68c48688e70e55424ceb34de4757) )
+	ROM_LOAD32_WORD("Indian Dreaming L L U85.002", 0x0000000, 0x0400000, CRC(d5b64886) SHA1(07b2e2c35e1a71d5c6b5687452f3debee1128632) )
+	ROM_LOAD32_WORD("Indian Dreaming L L U86.000", 0x0000000, 0x0400000, CRC(81144634) SHA1(3352bc272da29706d3913e65e0eccfd597628239) )
+ROM_END
+
+
+ROM_START( indsc )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("U72.003", 0x0000000, 0x0400000, CRC(7181dc26) SHA1(63b6ae4c3e7464d75762224a8c30348c6c6f0e98) )
+	ROM_LOAD32_WORD("U73.001", 0x0000000, 0x0400000, CRC(a23e7fcd) SHA1(d47751a88c7609118d0acbeabbcb812d195e3d48) )
+	ROM_LOAD32_WORD("U85.002", 0x0000000, 0x0400000, CRC(d49a6d8b) SHA1(55ebb5b098565cea8305ad9998eaee9a2b84cdbd) )
+	ROM_LOAD32_WORD("U86.000", 0x0000000, 0x0400000, CRC(23a13807) SHA1(5e0a403c3d227ef8ba49e2bd5f0a4f77acd42518) )
+ROM_END
+
+ROM_START( indsrp )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("Indian Dreaming SRP U72.003", 0x0000000, 0x0400000, CRC(46244616) SHA1(3e16e7dd6f5afba135c3f1b9b40b7cfecc0d83e4) )
+	ROM_LOAD32_WORD("Indian Dreaming SRP U73.001", 0x0000000, 0x0400000, CRC(4193c9f8) SHA1(de9747896f299f8562a8e836e28fcce991154194) )
+	ROM_LOAD32_WORD("Indian Dreaming SRP U85.002", 0x0000000, 0x0400000, CRC(5b639f5c) SHA1(b3a2f5797071ae57b0bc541f23d6e62df173e4cd) )
+	ROM_LOAD32_WORD("Indian Dreaming SRP U86.000", 0x0000000, 0x0400000, CRC(82645450) SHA1(17edb9f2b61f38ca6ced060d37d4294b42b934ac) )
+ROM_END
+
+
+ROM_START( indgcm )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("indian_gold_U72.003", 0x0000000, 0x0400000, CRC(e814271e) SHA1(9aaf9a463fd08a9cdb48dcb60cb0242f3df1b759) )
+	ROM_LOAD32_WORD("indian_gold_U73.001", 0x0000000, 0x0400000, CRC(318a4b3e) SHA1(ba16fb0a82539f01b5b8902f510b0acdfe0fdf6d) )
+	ROM_LOAD32_WORD("indian_gold_U85.002", 0x0000000, 0x0400000, CRC(6b888235) SHA1(6bea4e0c547d04a25202969d6216beacd8e63b23) )
+	ROM_LOAD32_WORD("indian_gold_U86.000", 0x0000000, 0x0400000, CRC(9340f843) SHA1(e3cf3ea427535aab8027f7d2f6c6e496674d694f) )
+ROM_END
+
+
+ROM_START( indprncs )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("Gam_Eprm.u72", 0x0000000, 0x0400000, CRC(785493ea) SHA1(e56ee84783a6033ea327a2035df58cb8deca150f) )
+	ROM_LOAD32_WORD("Gam_Eprm.u73", 0x0000000, 0x0400000, CRC(c128c9a5) SHA1(bed6f0eba6da62a3981e5c9b6ada5209d37613e5) )
+	ROM_LOAD32_WORD("Gam_Eprm.u85", 0x0000000, 0x0400000, CRC(829f492e) SHA1(36abc1b1beb01814a4e5fc68f1cd424ae979ced7) )
+	ROM_LOAD32_WORD("Gam_Eprm.u86", 0x0000000, 0x0400000, CRC(dfad47ba) SHA1(807c0e0e4b0cccb8e4d2d34f26be26973745ca1b) )
+ROM_END
+
+
+ROM_START( jailbrar )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("10125611_JAILBREAK_716..003", 0x0000000, 0x0400000, CRC(5185ad7f) SHA1(34517ded04bf51be348200bc09e848ab74ccbeef) )
+	ROM_LOAD32_WORD("10125611_JAILBREAK_716.001", 0x0000000, 0x0400000, CRC(5142c5e0) SHA1(dde1f300292b0b8250aeab1d686fb36184daabd7) )
+	ROM_LOAD32_WORD("10125611_JAILBREAK_716.000", 0x0000000, 0x0400000, CRC(3c6d628c) SHA1(d60ad4b04545ccaf6212a47796d16d97173d530b) )
+	ROM_LOAD32_WORD("10125611_JAILBREAK_716.002", 0x0000000, 0x0400000, CRC(705ddca8) SHA1(e0f8ca2e323f1dd040ed0cd4f974e419e716a0c6) )
+ROM_END
+
+
+ROM_START( kingnep )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("King Neptune .003", 0x0000000, 0x0400000, CRC(4e3006a2) SHA1(6d566d2120cb612f647223e61347a1784cb69a95) )
+	ROM_LOAD32_WORD("King Neptune .001", 0x0000000, 0x0400000, CRC(1e815d36) SHA1(b29f5e812f52317b060feac8ee91c08a545db7f4) )
+	ROM_LOAD32_WORD("King Neptune.002", 0x0000000, 0x0400000, CRC(df89ae50) SHA1(fa9a5c795266bcafea0062aae34a2b7432550b53) )
+	ROM_LOAD32_WORD("King Neptune .000", 0x0000000, 0x0400000, CRC(750597c6) SHA1(06d3ba55b313da8973fd2b34ba888920519c51c6) )
+ROM_END
+
+
+
+ROM_START( kingnile )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("Gam_Eprm.u72", 0x0000000, 0x0400000, CRC(2600d9da) SHA1(2c78b987b8a8641b7eedda4880bd3f5846f11224) )
+	ROM_LOAD32_WORD("Gam_Eprm.u73", 0x0000000, 0x0400000, CRC(2875a911) SHA1(3e881c8c736f297778836c128f66150628038e49) )
+	ROM_LOAD32_WORD("Gam_Eprm.u85", 0x0000000, 0x0400000, CRC(a981510c) SHA1(5c018eb101193b1f4864ccd8c30fe328713c4c97) )
+	ROM_LOAD32_WORD("Gam_Eprm.u86", 0x0000000, 0x0400000, CRC(c4b7a58e) SHA1(f0877c9e0a285808c8117d09a33dec2d2caf7b5b) )
+ROM_END
+
+
+
+ROM_START( koalmnt )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("KoalaMint_U72.003", 0x0000000, 0x0400000, CRC(84c0f78d) SHA1(3f8e98261bfce1223de538d6bd53fa92d38c4b0d) )
+	ROM_LOAD32_WORD("KoalaMint_U73.001", 0x0000000, 0x0400000, CRC(df3d45a0) SHA1(e9cbfeba1271a66c574cfb3bd96e21fd8cdd26f2) )
+	ROM_LOAD32_WORD("KoalaMint_U85.002", 0x0000000, 0x0400000, CRC(1e12c01e) SHA1(21cad879ece470c465907dd970741b13774fb524) )
+	ROM_LOAD32_WORD("KoalaMint_U86.000", 0x0000000, 0x0400000, CRC(e405c4b8) SHA1(e838767f0c224a3c96f9dd480559fed01ca7a398) )
+ROM_END
+
+
+ROM_START( kohinoor )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("Kohinoor U72.003", 0x0000000, 0x0400000, CRC(9b6f5a83) SHA1(06707953091719bf545efd2200f81504c5416e74) )
+	ROM_LOAD32_WORD("Kohinoor U73.001", 0x0000000, 0x0400000, CRC(dfdeb535) SHA1(be6b2e84603a5b07e4561012ff9b1d45fbd4f281) )
+	ROM_LOAD32_WORD("Kohinoor U85.002", 0x0000000, 0x0400000, CRC(cd8324e6) SHA1(b779d1040cd0119b778032d0e165d31d8fafd128) )
+	ROM_LOAD32_WORD("Kohinoor U86.000", 0x0000000, 0x0400000, CRC(e76e81f3) SHA1(1606c08ab6e75ad0cbbdd3f297dbb4fdf855c013) )
+ROM_END
+
+
+ROM_START( lgfish )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("Let's Go Fish'n U71.005", 0x0000000, 0x0400000, CRC(75d5bf1c) SHA1(6249b3ed929a65efed770615f2fe691612e8ac72) )
+	ROM_LOAD32_WORD("Let's Go Fish'n U72.003", 0x0000000, 0x0400000, CRC(9ff206fe) SHA1(4c8023a3b2e4d658a859d19d54be8cfe53cf4a6f) )
+	ROM_LOAD32_WORD("Let's Go Fish'n U73.001", 0x0000000, 0x0400000, CRC(7cfed17e) SHA1(fc93e71d67228b3b1f3a34a3f3c34c2648100d2b) )
+	ROM_LOAD32_WORD("Let's Go Fish'n U84.004", 0x0000000, 0x0400000, CRC(471f61c6) SHA1(67828d3cf06e32b087fb7c4ade212580207dc2cf) )
+	ROM_LOAD32_WORD("Let's Go Fish'n U85.002", 0x0000000, 0x0400000, CRC(c386320a) SHA1(c02b4b1cdd45b9b579b21d239cf45f7f3510c14a) )
+	ROM_LOAD32_WORD("Let's Go Fish'n U86.000", 0x0000000, 0x0400000, CRC(4c491910) SHA1(1f9013621a4c9140c447637bc967ba583da318eb) )
+ROM_END
+
+ROM_START( lordleo )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("Lord_Leopard_U72.003", 0x0000000, 0x0400000, CRC(20e3d468) SHA1(155aa4a81f18d714c6dbbe26c5c9e9d6575b858d) )
+	ROM_LOAD32_WORD("Lord_Leopard_U73.001", 0x0000000, 0x0400000, CRC(7666c5f8) SHA1(cd271bc8c1042fa85506691636d22d36df23025b) )
+	ROM_LOAD32_WORD("Lord_Leopard_U85.002", 0x0000000, 0x0400000, CRC(1a921c0e) SHA1(feb59ec8372723e5babe16145596c3a9fd0938c3) )
+	ROM_LOAD32_WORD("Lord_Leopard_U86.000", 0x0000000, 0x0400000, CRC(9ac28584) SHA1(cff40762e123d3ace2fb274166eb9d98ef7c7d4c) )
+ROM_END
+
+ROM_START( lougcm )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("louiesgold_u72.003", 0x0000000, 0x0400000, CRC(926aefe5) SHA1(1427cae296864e6dd186614d726e243b46a9aa64) )
+	ROM_LOAD32_WORD("louiesgold_u73.001", 0x0000000, 0x0400000, CRC(3165ca89) SHA1(73d5d32f1b144e25901afa2eeb82e2304f069a55) )
+	ROM_LOAD32_WORD("louiesgold_u85.002", 0x0000000, 0x0400000, CRC(21d6d1e4) SHA1(d095389ff327940abde30afe8cb2e9f1c1e34226) )
+	ROM_LOAD32_WORD("louiesgold_u86.000", 0x0000000, 0x0400000, CRC(095161ec) SHA1(4b9ff183d244f70f59eefb2eb6b261e3bcf0c486) )
+ROM_END
+
+ROM_START( luigball )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("Gam_Eprm.u71", 0x0000000, 0x0400000, CRC(4f289aea) SHA1(0c77020a30178644a02dac5c9e8ab5543b63409e) )
+	ROM_LOAD32_WORD("Gam_Eprm.u72", 0x0000000, 0x0400000, CRC(5f3a62b0) SHA1(c4adec9f13473246333ece978ea35d35a1527638) )
+	ROM_LOAD32_WORD("Gam_Eprm.u73", 0x0000000, 0x0400000, CRC(d82cca04) SHA1(ecd126404ab147cba3fedb127772b4c9ccb849bd) )
+	ROM_LOAD32_WORD("Gam_Eprm.u84", 0x0000000, 0x0400000, CRC(c8c80acf) SHA1(958310f0c31642960f90476a9d384fcbefeada75) )
+	ROM_LOAD32_WORD("Gam_Eprm.u85", 0x0000000, 0x0400000, CRC(9513eded) SHA1(296974e1c4d6c61ce90c6fafc3986aa48a4344ac) )
+	ROM_LOAD32_WORD("Gam_Eprm.u86", 0x0000000, 0x0400000, CRC(b44aeadc) SHA1(abee3ea6886973877002c3283bb52c624abd148c) )
+ROM_END
+
+
+
+ROM_START( mskitty )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("misskitty_.001", 0x0000000, 0x0400000, CRC(40c1bb34) SHA1(0c54ad0fb6a5c4f096be15c1ef08cb4d246b13b6) )
+	ROM_LOAD32_WORD("misskitty_.002", 0x0000000, 0x0400000, CRC(c369ad11) SHA1(793b1f8d5833b06422196e2abb7eb0a34be8dbef) )
+	ROM_LOAD32_WORD("misskitty_.003", 0x0000000, 0x0400000, CRC(d85219a1) SHA1(db0c5f21f7af393d11465981e70ac7b1c8f197b3) )
+	ROM_LOAD32_WORD("misskitty_.000", 0x0000000, 0x0400000, CRC(36c9ef95) SHA1(71c088bd3b258ab0e8949f661f9e9e9f64949f29) )
+ROM_END
+
+
+ROM_START( mnytree )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("Money Tree.003", 0x0000000, 0x0400000, CRC(9ecf041c) SHA1(543eb20385bfd79c1cf10cba61c501c495e4d94a) )
+	ROM_LOAD32_WORD("Money Tree.000", 0x0000000, 0x0400000, CRC(bca13ff6) SHA1(84c3491816aa9a2e9a12c321b0d1144ea14ebdbe) )
+	ROM_LOAD32_WORD("Money Tree.001", 0x0000000, 0x0400000, CRC(2c9edccc) SHA1(05e7de1fbd13c1a62f7fb610dc3541a94d9a39b7) )
+	ROM_LOAD32_WORD("Money Tree.002", 0x0000000, 0x0400000, CRC(ea055c36) SHA1(e97c4992150fac9e53618ebf96ac1b2dd4e9cf65) )
+ROM_END
+
+
+ROM_START( mysteycm )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("U72.003", 0x0000000, 0x0400000, CRC(ee58e1e8) SHA1(1aa57c88b97a3bed04bcaabe77f231967d092f4c) )
+	ROM_LOAD32_WORD("U73.001", 0x0000000, 0x0400000, CRC(fd1d56df) SHA1(2f22f83995bdea66a055a1aa3cb0e8dd2c8f87cb) )
+	ROM_LOAD32_WORD("U85.002", 0x0000000, 0x0400000, CRC(3449d07c) SHA1(2b36edc554f157e465bcaada42d6cbfee545e146) )
+	ROM_LOAD32_WORD("U86.000", 0x0000000, 0x0400000, CRC(3de4876b) SHA1(76eb7bdc41dc134656452f8e0d08f009c02d9205) )
+ROM_END
+
+
+
+ROM_START( mystmerm )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("game.003", 0x0000000, 0x0400000, CRC(a060d4b2) SHA1(5832a7f4b808017cc251a58e9cce004b2ec41e0c) )
+	ROM_LOAD32_WORD("game.001", 0x0000000, 0x0400000, CRC(d571a0bc) SHA1(3bb3c9373fcd7c730dfd0de749d7dacb8aadaf53) )
+	ROM_LOAD32_WORD("game.002", 0x0000000, 0x0400000, CRC(803023c2) SHA1(c953b3fa12347a18fa48b5ea691ad61720c2efdd) )
+	ROM_LOAD32_WORD("game.000", 0x0000000, 0x0400000, CRC(be84df3c) SHA1(b39deff7d8d0ab30e3dbc0f33c4d45329734a05a) )
+ROM_END
+
+
+ROM_START( nerdwild )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("Nerds_Gone_Wild_U73.001", 0x0000000, 0x0400000, CRC(be64ac6d) SHA1(c0e6f68467ff248e5c619cedde74091783dafecf) )
+	ROM_LOAD32_WORD("Nerds_Gone_Wild_U86.000", 0x0000000, 0x0400000, CRC(a14e80d4) SHA1(f1729ff10991056e1880b5c0db3bdb760b1c664b) )
+ROM_END
+
+
+ROM_START( orbeaut )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("10213511.001", 0x0000000, 0x0400000, CRC(8c977e22) SHA1(4de3e30995124b89354d660fed97d29574a40533) )
+	ROM_LOAD32_WORD("10213511.000", 0x0000000, 0x0400000, CRC(4d3f0586) SHA1(da38f11e48191fd53492aa5a4875fcdc33d30c24) )
+ROM_END
+
+
+ROM_START( outbackj )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("u70.007", 0x0000000, 0x0400000, CRC(3a0ea3ca) SHA1(88513130013b1b18772a5e538da9a8db3a54633e) )
+	ROM_LOAD32_WORD("u71.005", 0x0000000, 0x0400000, CRC(23f1f50c) SHA1(40145b839c2b5fde5c0f20e08f46f5a859b6e20a) )
+	ROM_LOAD32_WORD("u72.003", 0x0000000, 0x0400000, CRC(cdd28848) SHA1(0038bb422a1d650beaa0ffd63b7d6de1936a5e32) )
+	ROM_LOAD32_WORD("u73.001", 0x0000000, 0x0400000, CRC(972eaba2) SHA1(b927aac04e21922b995aa2587a76ef14c35cd2bd) )
+	ROM_LOAD32_WORD("u83.006", 0x0000000, 0x0400000, CRC(79ca67a1) SHA1(68bae23df71c768dc17631f6ccfc7a720c0959ee) )
+	ROM_LOAD32_WORD("u84.004", 0x0000000, 0x0400000, CRC(0cd41b5d) SHA1(a7891da788fe88d2191b2f0686cb9ca2ecfeeb9c) )
+	ROM_LOAD32_WORD("u85.002", 0x0000000, 0x0400000, CRC(a1853f27) SHA1(cd2bf8674555f6870f0689ca0adbca6890bc9b27) )
+	ROM_LOAD32_WORD("u86.000", 0x0000000, 0x0400000, CRC(8eea3cea) SHA1(b2353fc953f6daf03c1458e06006de31fdd7a7c3) )
+ROM_END
+
+
+ROM_START( owlcap )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("Owl Capone Demo.003", 0x0000000, 0x0400000, CRC(b6be5274) SHA1(28c3a743cfef76c05567cdb7cc4ff5c60c594e1e) )
+	ROM_LOAD32_WORD("Owl Capone Demo .001", 0x0000000, 0x0400000, CRC(c9197a1c) SHA1(2b4649c74f624e3414732027ca77536bcaced11f) )
+	ROM_LOAD32_WORD("Owl Capone Demo .002", 0x0000000, 0x0400000, CRC(8de48e1e) SHA1(c52592f808f02039c7f2d9358076e3dd91f152a2) )
+	ROM_LOAD32_WORD("Owl Capone Demo .000", 0x0000000, 0x0400000, CRC(66b2dc21) SHA1(1eeff14dd037c8c4c7fc95a04a8dc5946200d453) )
+ROM_END
+
+ROM_START( pariligh )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("Paris Lights U72.003", 0x0000000, 0x0400000, CRC(d04e5031) SHA1(46ef9fe928409ec031afa97f67b271cb0059c603) )
+	ROM_LOAD32_WORD("Paris Lights U73.001", 0x0000000, 0x0400000, CRC(05e567a5) SHA1(c605033599f5fd92b20013264c0bf9eb7076ee85) )
+	ROM_LOAD32_WORD("Paris Lights U85.002", 0x0000000, 0x0400000, CRC(32eb5b34) SHA1(165c61e20ae8d52575fc0402b1cbc49bbb18d2af) )
+	ROM_LOAD32_WORD("Paris Lights U86.000", 0x0000000, 0x0400000, CRC(89508f23) SHA1(10ab87fc7c726d2d2a6c73151f2ef731b3d79979) )
+ROM_END
+
+
+ROM_START( pcockmag )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("peacockmagicu72.003", 0x0000000, 0x0400000, CRC(0519288c) SHA1(a6e838d750f17131bf0871eac8742408cb03db6c) )
+	ROM_LOAD32_WORD("peacockmagicu73.001", 0x0000000, 0x0400000, CRC(106bd1d4) SHA1(4ecfafc883da969eb1b46c00e8b67aedfdb001bf) )
+	ROM_LOAD32_WORD("peacockmagicu85.002", 0x0000000, 0x0400000, CRC(6453532c) SHA1(c9b885e42778af56df89520cb6e4856348958110) )
+	ROM_LOAD32_WORD("peacockmagicu86.000", 0x0000000, 0x0400000, CRC(5348f934) SHA1(82762d643729639a1f059a1b57b74c8ab240277c) )
+ROM_END
+
+
+ROM_START( pelipete )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("PELICAN_PETENSW_U72.003", 0x0000000, 0x0400000, CRC(6e7d67d9) SHA1(163449982405d2cd078c757d885113edbcddbd22) )
+	ROM_LOAD32_WORD("PELICAN_PETENSW_U73.001", 0x0000000, 0x0400000, CRC(8626fcd5) SHA1(fb08bddf8e30ef537af7f96c632d0690f241cef3) )
+	ROM_LOAD32_WORD("PELICAN_PETENSW_U85.002", 0x0000000, 0x0400000, CRC(99c2748b) SHA1(712c103be109839d02ace90c1498192792185733) )
+	ROM_LOAD32_WORD("PELICAN_PETENSW_U86.000", 0x0000000, 0x0400000, CRC(9fb0db2d) SHA1(c4c7f5f91045778dce2229919e00aa1bdb625084) )
+ROM_END
+
+
+ROM_START( pharpor )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("Pharaoh's Fortune.003", 0x0000000, 0x0400000, CRC(c5d24a99) SHA1(d6d17ab5255d153beacc39880bd58b7b647f532f) )
+	ROM_LOAD32_WORD("Pharaoh's Fortune.001", 0x0000000, 0x0400000, CRC(33236ae6) SHA1(a9c41af9982c1a7035c5190732775a3eca4ebb78) )
+	ROM_LOAD32_WORD("Pharaoh's Fortune.002", 0x0000000, 0x0400000, CRC(158af672) SHA1(f653f9d400f03713baa650912c8c0ab33f218fb2) )
+	ROM_LOAD32_WORD("Pharaoh's Fortune.000", 0x0000000, 0x0400000, CRC(6d435495) SHA1(22644acb9ed28e737bc132698cd12048c76c4b80) )
+ROM_END
+
+
+ROM_START( phxfant )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("Phoenix Fantasy.002", 0x0000000, 0x0400000, CRC(db092fc5) SHA1(c2469c131d1240faede3e6e64ee818df4ce9581d) )
+	ROM_LOAD32_WORD("Phoenix Fantasy.001", 0x0000000, 0x0400000, CRC(1854f81c) SHA1(fc97f1c55db5c66d2261de62a538cc0308988702) )
+	ROM_LOAD32_WORD("Phoenix Fantasy.003", 0x0000000, 0x0400000, CRC(3ea207d5) SHA1(ae9b032f6ab90630bb047fa508d539874bd86d18) )
+	ROM_LOAD32_WORD("Phoenix Fantasy.000", 0x0000000, 0x0400000, CRC(499742c6) SHA1(7743b24e658e4ee60255e9bf2b33a4937d19e3b4) )
+ROM_END
+
+
+ROM_START( piratar )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("Pirates_U73.001", 0x0000000, 0x0400000, CRC(5923957d) SHA1(62d6effe9f3af0cdc301bbc6541971e91ddc573a) )
+	ROM_LOAD32_WORD("Pirates_U86.000", 0x0000000, 0x0400000, CRC(ed435c4a) SHA1(98750a2673411c3b193f25f2998755314bd60331) )
+ROM_END
+
+
+ROM_START( pcbydem )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("MG0005playerschoice.007", 0x0000000, 0x0400000, CRC(adfaa968) SHA1(a1a8329523cbd14c24f8e6997a5be442327f61c7) )
+	ROM_LOAD32_WORD("MG0005playerschoice.005", 0x0000000, 0x0400000, CRC(c71cb0e3) SHA1(c46d017bb26fb990a403cff7659b15a11f947c19) )
+	ROM_LOAD32_WORD("MG0005playerschoice.003", 0x0000000, 0x0400000, CRC(81816747) SHA1(c745bc6be35976f4784730ab8b75e07688e49b22) )
+	ROM_LOAD32_WORD("MG0005playerschoice.006", 0x0000000, 0x0400000, CRC(f3aab3c8) SHA1(a4c08d341f6b59b5faa14aa3381be066ecdc692a) )
+	ROM_LOAD32_WORD("MG0005playerschoice.001", 0x0000000, 0x0400000, CRC(4a729ca3) SHA1(52be1fbf80a06f9959d62376102d96ea8f77f272) )
+	ROM_LOAD32_WORD("MG0005playerschoice.004", 0x0000000, 0x0400000, CRC(309dbbf7) SHA1(69e44494bba43d001545c4e474ab4f712d1d8015) )
+	ROM_LOAD32_WORD("MG0005playerschoice.002", 0x0000000, 0x0400000, CRC(a9b81cc4) SHA1(541765e9fe2d67c60f014a8d32866c7b8203766a) )
+	ROM_LOAD32_WORD("MG0005playerschoice.000", 0x0000000, 0x0400000, CRC(c4f95ab2) SHA1(dd0a3cdaa7b421cbcfa50b94b8bbfb69769343cd) )
+ROM_END
+
+
+ROM_START( pcfav )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("123456.000", 0x0000000, 0x0400000, CRC(864ff191) SHA1(2750d74564a56615034df8417dcb7b8edb43f36e) )
+	ROM_LOAD32_WORD("123456.001", 0x0000000, 0x0400000, CRC(4de61358) SHA1(f1d732dfd8f3a05ab0fde7e4b98261d2f2a10a5f) )
+	ROM_LOAD32_WORD("123456.002", 0x0000000, 0x0400000, CRC(385e8636) SHA1(5e4bf33f91481080c80264b915a11606b03f8686) )
+	ROM_LOAD32_WORD("123456.003", 0x0000000, 0x0400000, CRC(9b0fb8b6) SHA1(bd5a2734068e031ca7ab0f19749f28f84288125f) )
+	ROM_LOAD32_WORD("123456.004", 0x0000000, 0x0400000, CRC(7944e972) SHA1(23d45a2e948a737d3186de5f0447ec7dd51ddc7b) )
+	ROM_LOAD32_WORD("123456.005", 0x0000000, 0x0400000, CRC(116bb514) SHA1(cd3dcca730c8e9d3fe5b0c70638f3d81f8eb8f98) )
+ROM_END
+
+
+ROM_START( pompeiar )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("U72.003", 0x0000000, 0x0400000, CRC(e3c02b5e) SHA1(714e83160917e83dafc058a9078ace800c4c3ebf) )
+	ROM_LOAD32_WORD("U73.001", 0x0000000, 0x0400000, CRC(c56b6b9f) SHA1(3f4cb68620a0d993b1812768092b85353d7bc763) )
+	ROM_LOAD32_WORD("U85.002", 0x0000000, 0x0400000, CRC(7569d484) SHA1(127d92b7bd62543789b25fbfce65e8429ddfc654) )
+	ROM_LOAD32_WORD("U86.000", 0x0000000, 0x0400000, CRC(0c4ef28a) SHA1(96381853ed23cb914e5e494fc90f671c2143a305) )
+ROM_END
+
+
+ROM_START( prideaf )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("Pride of Africa.001", 0x0000000, 0x0400000, CRC(86c22e24) SHA1(008fb01a7690981a3bc6a7f4a06dcebaef2a892c) )
+	ROM_LOAD32_WORD("Pride of Africa.000", 0x0000000, 0x0400000, CRC(efbf0ad5) SHA1(b4d84800c60df820bbe332879189208bac8330ef) )
+ROM_END
+
+
+ROM_START( prophar )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("Prophecy.003", 0x0000000, 0x0400000, CRC(194be1d6) SHA1(8f71ff6646a34261cb003fea877b42742eea8c15) )
+	ROM_LOAD32_WORD("Prophecy.001", 0x0000000, 0x0400000, CRC(683f081f) SHA1(4d625c67cb1d5fa5b025a02e797c4fc0a03893da) )
+	ROM_LOAD32_WORD("Prophecy.002", 0x0000000, 0x0400000, CRC(046ae548) SHA1(246015be05294806ecfacd626449e2df7e7f569c) )
+	ROM_LOAD32_WORD("Prophecy.000", 0x0000000, 0x0400000, CRC(e5950eef) SHA1(930582c34f3639b887d490c96f91814cb5228d8b) )
+ROM_END
+
+
+ROM_START( qsheeba )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("queen_of_Sheba.003", 0x0000000, 0x0400000, CRC(befa03be) SHA1(abd4846f29636aff70826b3086a972682c3bffe0) )
+	ROM_LOAD32_WORD("queen_of_Sheba.001", 0x0000000, 0x0400000, CRC(fb26e09a) SHA1(e2debdcea7ee7be90e70c96e3eca593b515dfd2d) )
+	ROM_LOAD32_WORD("queen_of_Sheba.002", 0x0000000, 0x0400000, CRC(6f827f08) SHA1(b3777031c0a8d14557a640572c4dcfa781986b54) )
+	ROM_LOAD32_WORD("queen_of_Sheba.000", 0x0000000, 0x0400000, CRC(e1313dff) SHA1(536014d8d4f3ff90d93befdcd55d5b3e6eb49e7c) )
+ROM_END
+
+ROM_START( qnilecj )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("Gam_Eprm.u72", 0x0000000, 0x0400000, CRC(a1aa9310) SHA1(a00a7dfd57fe8624421e6821c32516f018199d49) )
+	ROM_LOAD32_WORD("Gam_Eprm.u73", 0x0000000, 0x0400000, CRC(0ec5d0df) SHA1(206916986b1214a9635c901cbbcda21d21e0338a) )
+	ROM_LOAD32_WORD("Gam_Eprm.u85", 0x0000000, 0x0400000, CRC(a30473fd) SHA1(0af9fcee5df49d20847f98f94e09c0d394c1857a) )
+	ROM_LOAD32_WORD("Gam_Eprm.u86", 0x0000000, 0x0400000, CRC(484fb352) SHA1(cc0c97895731dc3f333131ff5a47794fe1857e47) )
+ROM_END
+
+
+ROM_START( qnilese )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("u70.007", 0x0000000, 0x0100000, CRC(5ae69121) SHA1(36dd3f9aaf5f7d2751d1954d67f898bc3ec71f3b) )
+	ROM_LOAD32_WORD("u71.005", 0x0000000, 0x0100000, CRC(d793440a) SHA1(dced4c04bde13293af77a9a1f4c5c606e3758de0) )
+	ROM_LOAD32_WORD("u83.006", 0x0000000, 0x0100000, CRC(c8580554) SHA1(58b8bfff2f8d298c4e3be2b01900800c45fa7ad7) )
+	ROM_LOAD32_WORD("u84.004", 0x0000000, 0x0100000, CRC(a34a9f16) SHA1(b8750e6ceb1715da8e5ac2f0183254e29a042641) )
+	ROM_LOAD32_WORD("u73.001", 0x0000000, 0x0400000, CRC(27391233) SHA1(e1d546cc9a57db894bdfb24592048578f5828ee5) )
+	ROM_LOAD32_WORD("u86.000", 0x0000000, 0x0400000, CRC(4c7bdba1) SHA1(796c9da25bbfe389aae5c03b42e15500c91a60d4) )
+ROM_END
+
+ROM_START( qnile )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("U72 QOTN.003", 0x0000000, 0x0400000, CRC(491f4ef2) SHA1(fbaa64d9603900de44642f95fb9f7ee15e138669) )
+	ROM_LOAD32_WORD("U73 QOTN.001", 0x0000000, 0x0400000, CRC(2f7f783c) SHA1(1739b05628bd02cb1b73c883d9f2e113da2c29e7) )
+	ROM_LOAD32_WORD("U85 QOTN.002", 0x0000000, 0x0400000, CRC(4e53a089) SHA1(2dd060e4ff74f7fe73850a0c3877fa4bacad36c3) )
+	ROM_LOAD32_WORD("U86 QOTN.000", 0x0000000, 0x0400000, CRC(76818f74) SHA1(baac1a4a8ed3f1fb5a6ca321a6efe6ece7701486) )
+ROM_END
+
+
+ROM_START( raprichs )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("RapidRiches.003", 0x0000000, 0x0400000, CRC(3b4ee6dd) SHA1(83ddfdc3d8bdf02395411d8a6721a9c65c64e69c) )
+	ROM_LOAD32_WORD("RapidRiches.001", 0x0000000, 0x0400000, CRC(cd13d765) SHA1(f91cb232726a038c3ff1a25259622dd99d552279) )
+	ROM_LOAD32_WORD("RapidRiches.002", 0x0000000, 0x0400000, CRC(3fbfdf7f) SHA1(bcfd939d0fa4d0acc2544910940fb09d48a399b5) )
+	ROM_LOAD32_WORD("RapidRiches.000", 0x0000000, 0x0400000, CRC(8dfb94ce) SHA1(67933b9edbd9631d2558d16267559af91084172b) )
+ROM_END
+
+
+ROM_START( redbarar )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("redbaron.003", 0x0000000, 0x0400000, CRC(16b6207f) SHA1(9c5ac48cccba001b2e3605eceb9610c659e06e21) )
+	ROM_LOAD32_WORD("redbaron.001", 0x0000000, 0x0400000, CRC(6590c207) SHA1(8184ae0ac02f22787c631bc823bd0fbcd5d5bf05) )
+	ROM_LOAD32_WORD("redbaron.002", 0x0000000, 0x0400000, CRC(e954aeac) SHA1(df8a9420df31c4ecc2cbe460cea4c0bd13958289) )
+	ROM_LOAD32_WORD("redbaron.000", 0x0000000, 0x0400000, CRC(599a7170) SHA1(8e3b2730b9503baa798fd59d787052a9589e0447) )
+ROM_END
+
+
+ROM_START( ruprup )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("Roll Up Roll Up U72.003", 0x0000000, 0x0400000, CRC(7ba80d87) SHA1(c912ec8c65060060b459de0c5ed0b3ad018eff76) )
+	ROM_LOAD32_WORD("Roll Up Roll Up U73.001", 0x0000000, 0x0400000, CRC(e60d9c93) SHA1(7504f07f04be97058b50168c14e6ec41480e43ef) )
+	ROM_LOAD32_WORD("Roll Up Roll Up U85.002", 0x0000000, 0x0400000, CRC(7debb885) SHA1(c46e3231d8a13cec7d398a8064ac76e78954dd82) )
+	ROM_LOAD32_WORD("Roll Up Roll Up U86.000", 0x0000000, 0x0400000, CRC(b6d1c4fa) SHA1(24d88882783353598e4f63edda4982f9e55b2595) )
+ROM_END
+
+
+ROM_START( rubmgc )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("RubyMagic_U72.003", 0x0000000, 0x0400000, CRC(2cdfe857) SHA1(33b4ce8ab0a5f1e341a5c5c536c5f3619ecd7f95) )
+	ROM_LOAD32_WORD("RubyMagic_U73.001", 0x0000000, 0x0400000, CRC(6699d2c6) SHA1(1c96dba91a40993cf9c3bc9e8c591e971c04bedf) )
+	ROM_LOAD32_WORD("RubyMagic_U85.002", 0x0000000, 0x0400000, CRC(877fde17) SHA1(278b8cb71cafa0859073acc48339da9e645fdcc6) )
+	ROM_LOAD32_WORD("RubyMagic_U86.000", 0x0000000, 0x0400000, CRC(717d1c53) SHA1(8f5204d4394c6e0b83f6f456c80e98e12fac1a66) )
+ROM_END
+
+
+ROM_START( scatmg2 )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("Scatter Magic II.000", 0x0000000, 0x0400000, CRC(696734d8) SHA1(baffadb943fb12d0d19069023f5cdf80b1a1674f) )
+	ROM_LOAD32_WORD("Scatter Magic II.001", 0x0000000, 0x0400000, CRC(aeef47b6) SHA1(63d296d60848269851e9d424908bbf3d52003f07) )
+	ROM_LOAD32_WORD("Scatter Magic II.002", 0x0000000, 0x0400000, CRC(d3f7018e) SHA1(345a9f55256d9ec46182ebf9c0c6fca62ea2e275) )
+	ROM_LOAD32_WORD("Scatter Magic II.003", 0x0000000, 0x0400000, CRC(e5c9dee7) SHA1(b29f7b8eb3d894e0a3dbc6cabdd2d8e59e2c2bbf) )
+ROM_END
+
+
+ROM_START( sharmnm )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("Shaman's Magic.001", 0x0000000, 0x0400000, CRC(a84ac2a4) SHA1(743d56448135b03c25325bdc3d79781e63f0b9b6) )
+	ROM_LOAD32_WORD("Shaman's Magic.000", 0x0000000, 0x0400000, CRC(3edb8156) SHA1(83bb1467d892120c2bd5e85ef05527e2d02999ae) )
+ROM_END
+
+
+ROM_START( smtmar )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("10001911_SHOW_ME_THE_MONEY_657_1.U72.003", 0x0000000, 0x0400000, CRC(cb5f47d4) SHA1(70fa1e68bf1fbebc6b6663fbabb78c5f286b7805) )
+	ROM_LOAD32_WORD("10001911_SHOW_ME_THE_MONEY_657_1.U73.001", 0x0000000, 0x0400000, CRC(ccc901f0) SHA1(4c845ccfea10a744b8c37b6b155b0fc2ce6bfede) )
+	ROM_LOAD32_WORD("10001911_SHOW_ME_THE_MONEY_657_1.U85.002", 0x0000000, 0x0400000, CRC(7a36f3f3) SHA1(3653a6f40587c2be1810b4a9dd8f27ecca336a70) )
+	ROM_LOAD32_WORD("10001911_SHOW_ME_THE_MONEY_657_1.U86.000", 0x0000000, 0x0400000, CRC(9f436ee3) SHA1(e41a9475fd10fd7d15be1665ee2d4e9dcee2d4dd) )
+ROM_END
+
+
+ROM_START( silgolar )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("Gam_Eprm.u72", 0x0000000, 0x0400000, CRC(05861fb2) SHA1(ba3d2e3ab66fd7178289fdc95661f27e08124f32) )
+	ROM_LOAD32_WORD("Gam_Eprm.u73", 0x0000000, 0x0400000, CRC(cffa82f0) SHA1(fe14e1d9bacbcb72ad1bdaf3d4a72eec67311bef) )
+	ROM_LOAD32_WORD("Gam_Eprm.u85", 0x0000000, 0x0400000, CRC(f66f63c4) SHA1(02e669c4f7c3d0cd39b3dff156ab4b05db3bb495) )
+	ROM_LOAD32_WORD("Gam_Eprm.u86", 0x0000000, 0x0400000, CRC(d91108fd) SHA1(cea026350f083ed0f061d5049de520d08730a1df) )
+ROM_END
+
+
+ROM_START( spgcarn )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("Spring Carnival.001", 0x0000000, 0x0400000, CRC(033653f5) SHA1(40705ffb653ad4c6f3cd36c8879c48303c3845f8) )
+	ROM_LOAD32_WORD("Spring Carnival.000", 0x0000000, 0x0400000, CRC(f7783fea) SHA1(4e7b86c0d2728ebc317dce14827a4873402d9bbb) )
+ROM_END
+
+
+ROM_START( stardrft )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("Star Drifter.001", 0x0000000, 0x0400000, CRC(580340b4) SHA1(4febb22150581a4661bc7ed1ff0662e153de5e2b) )
+	ROM_LOAD32_WORD("Star Drifter.000", 0x0000000, 0x0400000, CRC(7b08a2be) SHA1(2b3d7bb2317cba7b470d68c91918a5777fdb3ed1) )
+ROM_END
+
+
+ROM_START( sbuk5 )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("Super Bucks 5.003", 0x0000000, 0x0400000, CRC(ebcce486) SHA1(f91db1051d71c5e558a304d60157fa3cfff66c5b) )
+	ROM_LOAD32_WORD("Super Bucks 5.001", 0x0000000, 0x0400000, CRC(39af5809) SHA1(048aef299de220a72bf6a57c6268949197fc738b) )
+	ROM_LOAD32_WORD("Super Bucks 5.002", 0x0000000, 0x0400000, CRC(9114f9e8) SHA1(f7ec058aaaad59aeffc01085673322cb842a5ebb) )
+	ROM_LOAD32_WORD("Super Bucks 5.000", 0x0000000, 0x0400000, CRC(cab68268) SHA1(e10e8c8ce9bfb7ae7f3920303491b24c93d5f716) )
+ROM_END
+
+
+ROM_START( swh2ld )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("Sweethearts 2 Lucky Devil.003", 0x0000000, 0x0400000, CRC(94d48b25) SHA1(a879f6d78ff6eb29e5ea2cc71ca86d097fa9d45f) )
+	ROM_LOAD32_WORD("Sweethearts 2 Lucky Devil.001", 0x0000000, 0x0400000, CRC(f5c3d17f) SHA1(297e2da51fb00e0b76f9322149647c4c27ed870e) )
+	ROM_LOAD32_WORD("Sweethearts 2 Lucky Devil.002", 0x0000000, 0x0400000, CRC(f0f8aa94) SHA1(c69f1c807b0e9921eb95c3351bb79897e673ec36) )
+	ROM_LOAD32_WORD("Sweethearts 2 Lucky Devil.000", 0x0000000, 0x0400000, CRC(dedd99b0) SHA1(23c4e178d00788516c16109add772dba24f98a54) )
+ROM_END
+
+
+ROM_START( tahitim )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("U73.001", 0x0000000, 0x0400000, CRC(b08da2ce) SHA1(1adb4f6e134df479be0f90d2459b009d93386ac1) )
+	ROM_LOAD32_WORD("U86.000", 0x0000000, 0x0400000, CRC(735d7642) SHA1(5f4258bf541728f7c7fe3dd65e715d68b3ade968) )
+ROM_END
+
+
+ROM_START( thaiprar )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("Thai_Princess_1of4_U86.000", 0x0000000, 0x0400000, CRC(609b3112) SHA1(77648426c7fed2e39d48d4f1ced524067bf0bb1a) )
+	ROM_LOAD32_WORD("Thai_Princess_2of4_U73.001", 0x0000000, 0x0400000, CRC(a8346fea) SHA1(d97af71bb2c93ed517fccac605e9cfff9ec5590b) )
+	ROM_LOAD32_WORD("Thai_Princess_3of4_U85.002", 0x0000000, 0x0400000, CRC(92fda7b5) SHA1(9a50ab3d1d18814093f5457a07a52f7e19fc97e7) )
+	ROM_LOAD32_WORD("Thai_Princess_4of4_U72.003", 0x0000000, 0x0400000, CRC(640bf878) SHA1(910dce13181243a6baace6dd1807d391b3d9767f) )
+ROM_END
+
+
+ROM_START( gldnflc )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("The Golden Fleece.003", 0x0000000, 0x0400000, CRC(521e2429) SHA1(0cfadf64341574eaec6fc89ecccfa2f02c583dd1) )
+	ROM_LOAD32_WORD("The Golden Fleece.001", 0x0000000, 0x0400000, CRC(35e72b56) SHA1(c6013aa3b6ea243f057aedab67feeed16ee39537) )
+	ROM_LOAD32_WORD("The Golden Fleece.002", 0x0000000, 0x0400000, CRC(f17c5c40) SHA1(32225a11d529c0312b27ed838badebed7d96469b) )
+	ROM_LOAD32_WORD("The Golden Fleece.000", 0x0000000, 0x0400000, CRC(c3d4d641) SHA1(b46d82af862c96068ddd4f530b2229634161b209) )
+ROM_END
+
+
+ROM_START( thndrhrt )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("Thunderheart.001", 0x0000000, 0x0400000, CRC(d867ff79) SHA1(740a177a8d1ecf925583a9264b5404640a5f2289) )
+	ROM_LOAD32_WORD("Thunderheart.000", 0x0000000, 0x0400000, CRC(2b84ed7b) SHA1(9919f9526d8294eeabda40697a34878484f6cef5) )
+	ROM_LOAD32_WORD("Thunderheart U86.bin", 0x0000000, 0x0400000, CRC(2b84ed7b) SHA1(9919f9526d8294eeabda40697a34878484f6cef5) )
+	ROM_LOAD32_WORD("Thunderheart U73.bin", 0x0000000, 0x0400000, CRC(d867ff79) SHA1(740a177a8d1ecf925583a9264b5404640a5f2289) )
+ROM_END
+
+
+ROM_START( tigresar )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("Tigress.000", 0x0000000, 0x0400000, CRC(d1ff02f7) SHA1(8e8f1c4ed3c01fc62011b1bd21f53314e345f10f) )
+	ROM_LOAD32_WORD("Tigress.001", 0x0000000, 0x0400000, CRC(cc239965) SHA1(f5d5f1e3db4f0ae3cd1dbe2c88aedf65cc820d4e) )
+ROM_END
+
+
+ROM_START( topshtar )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("Top_Shot.000", 0x0000000, 0x0400000, CRC(798200b2) SHA1(e753f8c8c26e30ab36705f748c01b90bcf166d82) )
+	ROM_LOAD32_WORD("Top_Shot.001", 0x0000000, 0x0400000, CRC(486c5979) SHA1(0ece42200f31daf471b3e1e789de8b95390c4827) )
+ROM_END
+
+
+ROM_START( torgods )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("Torch Of The Gods.000", 0x0000000, 0x0400000, CRC(3c7da6e8) SHA1(ff2fb056fd26d3578216e4942b6234f4523e1d6a) )
+	ROM_LOAD32_WORD("Torch Of The Gods.001", 0x0000000, 0x0400000, CRC(d3f27e13) SHA1(36cd1984139855170af3b23ab32b1769430809d5) )
+	ROM_LOAD32_WORD("Torch Of The Gods.002", 0x0000000, 0x0400000, CRC(9f7013e0) SHA1(76f948ba08152cf623559c3c8f021861757c4872) )
+	ROM_LOAD32_WORD("Torch Of The Gods.003", 0x0000000, 0x0400000, CRC(2dc81027) SHA1(3d426758875e87e677ab446da12532e2a4bc4246) )
+ROM_END
+
+
+ROM_START( torpdice )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("U72.003", 0x0000000, 0x0400000, CRC(f2ccd55e) SHA1(24738035abc26459d3d06831c907da98aea9c257) )
+	ROM_LOAD32_WORD("U73.001", 0x0000000, 0x0400000, CRC(e66f5672) SHA1(9bc92c061fcaf8803878941b9b74a7bc41beb299) )
+	ROM_LOAD32_WORD("U85.002", 0x0000000, 0x0400000, CRC(9793d2c1) SHA1(50e9d644b6519f941781b726a8d566cae6bb262e) )
+	ROM_LOAD32_WORD("U86.000", 0x0000000, 0x0400000, CRC(2a3ae479) SHA1(30d5df8eb75775831d4b0792661168288cedbb16) )
+ROM_END
+
+
+ROM_START( turtrea )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("u72.003", 0x0000000, 0x0400000, CRC(f864fe2e) SHA1(9aa16c4cf3936841a1152418aca7a5dd3ad5a2b3) )
+	ROM_LOAD32_WORD("u73.001", 0x0000000, 0x0400000, CRC(e00da684) SHA1(4d66d48644008ff998398af1cc970ed9a1504607) )
+	ROM_LOAD32_WORD("u85.002", 0x0000000, 0x0400000, CRC(512fcb98) SHA1(ccf5bfe8cb9dcd3d2e5e4f59033816ded04f2148) )
+	ROM_LOAD32_WORD("u86.000", 0x0000000, 0x0400000, CRC(1b69bb51) SHA1(b510fc80616f3acbc8264ca188c5bc85bce38e5e) )
+ROM_END
+
+
+
+ROM_START( venetian )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("Venetian_Nights_1of4_U86.000", 0x0000000, 0x0400000, CRC(57a2a113) SHA1(98589e00803814fe51161d69d77b47ff2b6ac406) )
+	ROM_LOAD32_WORD("Venetian_Nights_2of4_U73.001", 0x0000000, 0x0400000, CRC(c9cfb52a) SHA1(7df67226c69e4569216e5200364ff14fd162f0a7) )
+	ROM_LOAD32_WORD("Venetian_Nights_3of4_U85.002", 0x0000000, 0x0400000, CRC(e845f6ee) SHA1(76a234e4b224d56d4f9ceb37d8d175413d4e6fe9) )
+	ROM_LOAD32_WORD("Venetian_Nights_4of4_U72.003", 0x0000000, 0x0400000, CRC(7a635ef0) SHA1(d0c0746b58ae0726f18e90cc4b20d0e68f3abd86) )
+ROM_END
+
+
+ROM_START( witgold )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("U72.003", 0x0000000, 0x0400000, CRC(584050fc) SHA1(014889e1bf3fa38c052073c374b47684be717949) )
+	ROM_LOAD32_WORD("U73.001", 0x0000000, 0x0400000, CRC(d8b5ccb3) SHA1(7974d68d594a2b283680cc440d69b106bd539819) )
+	ROM_LOAD32_WORD("U85.002", 0x0000000, 0x0400000, CRC(f9554ab0) SHA1(c79d95ee339f139d0a62550e926acd6c1d7d534b) )
+	ROM_LOAD32_WORD("U86.000", 0x0000000, 0x0400000, CRC(d537f1f1) SHA1(49825365593238f757e3efecbe9fe02a06acd321) )
+ROM_END
+
+
+ROM_START( wikwin2 )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("Wicked Winnings II .001", 0x0000000, 0x0400000, CRC(6662912d) SHA1(017e1684de64308b035b817b6fad954be538b78c) )
+	ROM_LOAD32_WORD("Wicked Winnings II U86.000", 0x0000000, 0x0400000, CRC(226c8d1c) SHA1(37769691d1b7e308cbd1d857e8695f1e129a6722) )
+ROM_END
+
+ROM_START( wldgoos )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("Wild_Goose_U72.003", 0x0000000, 0x0400000, CRC(ba887abf) SHA1(3d4e529bf2fed83506ef947ade08aeff7ad78611) )
+	ROM_LOAD32_WORD("Wild_Goose_U73.001", 0x0000000, 0x0400000, CRC(5f9ab2a5) SHA1(f55dcc32463e395f1380c4fa456b39f77c27642b) )
+	ROM_LOAD32_WORD("Wild_Goose_U85.002", 0x0000000, 0x0400000, CRC(054d3f78) SHA1(636f0284508e77d21dc9b50d59f1d7b8ed686ed0) )
+	ROM_LOAD32_WORD("Wild_Goose_U86.000", 0x0000000, 0x0400000, CRC(0925481f) SHA1(0dfc1bbe13752fcfd270fb3c096a3612cfa2fe9a) )
+ROM_END
+
+
+ROM_START( wldpan2 )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("Wild_panda.001", 0x0000000, 0x0400000, CRC(46e28dff) SHA1(b1fd7c0d0c814f04b2bd6f35835d1d1d41aab62c) )
+	ROM_LOAD32_WORD("Wild_panda.002", 0x0000000, 0x0400000, CRC(0bb16a0b) SHA1(6abbbb9abac53b543e92ccdead9770271d28074e) )
+	ROM_LOAD32_WORD("Wild_panda.003", 0x0000000, 0x0400000, CRC(11e2167f) SHA1(812ed09436c2899780791ca0ada5f3bbec4a3a88) )
+	ROM_LOAD32_WORD("Wild_panda.000", 0x0000000, 0x0400000, CRC(d3ebdc8a) SHA1(fc27c96769cc3ba02e7ad4baf6055f7902e50081) )
+	ROM_LOAD32_WORD("Wild Panda.epm", 0x0000000, 0x0000200, CRC(6bb77668) SHA1(13805e4ace96154e14658e9d1c303b97841437f0) )
+	ROM_LOAD32_WORD("Wild Panda.srm", 0x0000000, 0x0080000, CRC(2248a9f5) SHA1(8627e77e81ee6056ba6495cbda155190b36984a4) )
+ROM_END
+
+
+ROM_START( wldstal2 )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("Wild Stalon.003", 0x0000000, 0x0400000, CRC(0f4de65a) SHA1(232406f335786a045ab1833db50465ed476dfffe) )
+	ROM_LOAD32_WORD("Wild Stalon.000", 0x0000000, 0x0400000, CRC(b3171fd7) SHA1(d3ac53ba6bf6cc9ea3dc0f83e8a3eecf86abad55) )
+	ROM_LOAD32_WORD("Wild Stalon.001", 0x0000000, 0x0400000, CRC(ceeff2d5) SHA1(04d5139c0ce256eb0a0734184ccc8460d2ac1120) )
+	ROM_LOAD32_WORD("Wild Stalon.002", 0x0000000, 0x0400000, CRC(6fee0413) SHA1(242f60d89eb6b44ef968f482070e0a81d2ad5fcf) )
+ROM_END
+
+
+ROM_START( wtepee )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("Gam_Eprm.u72", 0x0000000, 0x0400000, CRC(0c5c51c2) SHA1(6423e160355ad0380cbb46e7462f913a67e9b29d) )
+	ROM_LOAD32_WORD("Gam_Eprm.u73", 0x0000000, 0x0400000, CRC(6c0a4268) SHA1(c18ad70332ec300b227edfc684db97d517031ff1) )
+	ROM_LOAD32_WORD("Gam_Eprm.u85", 0x0000000, 0x0400000, CRC(e5492c9b) SHA1(bd71198f24adab2841f177598d1ed8ae07aeb971) )
+	ROM_LOAD32_WORD("Gam_Eprm.u86", 0x0000000, 0x0400000, CRC(8c38fa9c) SHA1(0f64da87271f90309b0945403cc24fdf82c5c5a2) )
+ROM_END
+
+
+ROM_START( wwaratah )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("Gam_Eprm.u72", 0x0000000, 0x0400000, CRC(90813234) SHA1(80461a72cfcd056f8af7559f8f5e44447631ff0c) )
+	ROM_LOAD32_WORD("Gam_Eprm.u73", 0x0000000, 0x0400000, CRC(9df889d7) SHA1(3375a0dd56367c8aff6a07d54769715e7f29f6c4) )
+	ROM_LOAD32_WORD("Gam_Eprm.u85", 0x0000000, 0x0400000, CRC(c86d4145) SHA1(6b52d5d875ac4f786a2cb664dbb54c0a7cf68014) )
+	ROM_LOAD32_WORD("Gam_Eprm.u86", 0x0000000, 0x0400000, CRC(42075131) SHA1(855822a44cf65f2bdd8c88f89e75cdac2f2ddf89) )
+ROM_END
+
+
+ROM_START( wwaysar )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("Gam_Eprm.u72", 0x0000000, 0x0400000, CRC(acce8d74) SHA1(e22e9611e9a221bd5dfaad3d9feece1646bebe02) )
+	ROM_LOAD32_WORD("Gam_Eprm.u73", 0x0000000, 0x0400000, CRC(526ef495) SHA1(ca7df6ae32822d1205ee01e6970af428c515d940) )
+	ROM_LOAD32_WORD("Gam_Eprm.u85", 0x0000000, 0x0400000, CRC(81e8e5ad) SHA1(612b2fd4506f99ef946e10be2db82e50fcf6083f) )
+	ROM_LOAD32_WORD("Gam_Eprm.u86", 0x0000000, 0x0400000, CRC(ea4dd6db) SHA1(ee07fbcc9689cdb5e96e6259b630ff1229e2cad6) )
+ROM_END
+
+
+ROM_START( wwaysll )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("Gam_Eprm.u71", 0x0000000, 0x0400000, CRC(e8f8ffb1) SHA1(3aa4f8d959e9671ae93c9946b5420d55c45b1bbc) )
+	ROM_LOAD32_WORD("Gam_Eprm.u72", 0x0000000, 0x0400000, CRC(944dc1ec) SHA1(7dd2b14eb0af7babc9de09f247776f4a24d53e6c) )
+	ROM_LOAD32_WORD("Gam_Eprm.u73", 0x0000000, 0x0400000, CRC(5663bb95) SHA1(0df425bb4130079757fbbc6b5532c2f6a1a32920) )
+	ROM_LOAD32_WORD("Gam_Eprm.u84", 0x0000000, 0x0400000, CRC(0399bc1d) SHA1(19cd298d439dddac482c1d7f1fd7446900b39c46) )
+	ROM_LOAD32_WORD("Gam_Eprm.u85", 0x0000000, 0x0400000, CRC(6a8efdf2) SHA1(38b955755bbc2f2a6c8c987b0cae92d314d727c9) )
+	ROM_LOAD32_WORD("Gam_Eprm.u86", 0x0000000, 0x0400000, CRC(c8dffeef) SHA1(20d710356282c434523c5828fdb56e3da37d3371) )
+ROM_END
+
+
+ROM_START( zorrojp )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("30130611_ZORRO_743.U72.003", 0x0000000, 0x0400000, CRC(cc5616af) SHA1(94d1d36b76e2587caa2c60ea70c9206580dc53d5) )
+	ROM_LOAD32_WORD("30130611_ZORRO_743.U73.001", 0x0000000, 0x0400000, CRC(0bad02dc) SHA1(dfe495b5aeb75593d52669cd86d91f7e917bc3b0) )
+	ROM_LOAD32_WORD("30130611_ZORRO_743.U85.002", 0x0000000, 0x0400000, CRC(68da9660) SHA1(dc6ba4c9392bd6efd72bf996d016503677ea8622) )
+	ROM_LOAD32_WORD("30130611_ZORRO_743.U86.000", 0x0000000, 0x0400000, CRC(adf787e0) SHA1(42cfeb3ad42bf255a9be5a629a71bababbbb0147) )
+ROM_END
+
+
+
+
 GAME( 2000, aristmk6,  0,          aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Aristocrat MK6 System Software",           MACHINE_NOT_WORKING | MACHINE_NO_SOUND | MACHINE_IS_BIOS_ROOT)
 
 // Dates listed below are for the combination (reel layout), not release dates
@@ -363,6 +1558,126 @@ GAME( 2002, whalecsh,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, R
 GAME( 2003, wildways,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Wild Ways (10130111, Malaysia)",                     MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 698/1,  A - 25/02/03
 GAME( 2003, thaiprin,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Thai Princess (30127721, Malaysia)",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 707,    E - 21/03/03
 
+
+GAME( 200?, 100lions,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "100 Lions",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, 5dragons,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "5 Dragons",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, adustcm,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "African Dusk Mr Cashman",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, alchemya,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Alchemy",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, amzqnar,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Amazon Queen",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, arbnigar,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Arabian Nights",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, bigbenpj,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Big Ben Jackpot",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, bigheart,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Big Hearted",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, bigredjp,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Big Red Jackpot",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, birredar,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Big Red",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, blkbrum,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Black Brumby",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, brazilar,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Brazil",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, bucanar,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Bucaneer",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, buffalar,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Buffalo",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, bushrngr,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Bush Ranger",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, calyking,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Calypso King",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, canary2,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Canary Riches 2",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, cmtonig,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Cashman Tonight",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, csdce,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Choy Sun Doa Cash Express",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, csd,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Choy Sun Doa",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, csret,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Choy Sun Returns",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, corrida,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Corrida De Toros",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, cryspri,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Crystal Springs",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, deltqn,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Delta Queen",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, di4ever,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Diamonds Forever",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, dinoaris,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Dinosaur",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, doubdolp,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Double Dolphin",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, drgnlrd,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Dragon Lord",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, drgnmgic,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Dragon Magic",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, ent6r,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Enchantress 6 Reel",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, eott,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Eye Of The Tiger",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, firedan,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Fire Dancer",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, followst,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Follow The Stars",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, gambjack,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Gambling Jack",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, geishaar,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Geisha",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, goapear,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Go Ape",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, gogreen,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Go For Green",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, goldarjp,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Golden Archer Jackpot",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, goldinc,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Golden Inca",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, goldpym,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Golden Pyramids Maximillions",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, grizzly,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Grizzly",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, heartgar,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Heart Of Gold",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, heartveg,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Heart Of Vegas",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, highnoar,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "High Noon",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, holdrma,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Hollywood Dreams",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, houhear,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "House Of Hearts",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, incachf,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Inca Chief",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, indce,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Indian Dreaming Cash Express",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, indll,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Indian Dreaming Lady Luck",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, indsc,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Indian Dreaming Second Chance",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, indsrp,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Indian Dreaming Super Reel Power",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, indgcm,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Indian Gold Mr Cashman",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, indprncs,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Indian Princess",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, jailbrar,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Jailbreak",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, kingnep,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "King Neptune",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, kingnile,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "King Of The Nile",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, koalmnt,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Koala Mint",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, kohinoor,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Kohinoor",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, lgfish,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Lets Go Fishin",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, lordleo,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Lord Leopard",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, lougcm,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Louies Gold Mr Cashman",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, luigball,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Luigis Ball",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, mskitty,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Miss Kitty",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, mnytree,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Money Tree",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, mysteycm,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Mystic Eyes Mr Cashman",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, mystmerm,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Mystic Mermaid",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, nerdwild,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Nerds Gone Wild",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, orbeaut,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Oriental Beauty",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, outbackj,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Outback Jack Jackpot",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, owlcap,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Owl Capone",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, pariligh,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Paris Lights",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, pcockmag,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Peacock Magic",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, pelipete,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Pelican Pete",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, pharpor,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Pharohs Fortune",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, phxfant,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Phoenix Fantasy",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, piratar,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Pirates",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, pcbydem,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Players Choice By Demand",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, pcfav,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Players Choice Favourites",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, pompeiar,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Pompei",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, prideaf,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Pride Of Africa",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, prophar,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Prophecy",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, qsheeba,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Queen Of Sheeba",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, qnilecj,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Queen Of The Nile Clown Jackpot",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, qnilese,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Queen of the Nile Special Edition",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, qnile,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Queen Of The Nile",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, raprichs,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Rapid Riches",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, redbarar,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Red Baron (Aristocrat)",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, ruprup,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Roll Up Roll Up",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, rubmgc,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Ruby Magic",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, scatmg2,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Scatter Magic 2",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, sharmnm,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Sharmans Magic",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, smtmar,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Show Me The Money",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, silgolar,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Silver And Gold",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, spgcarn,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Spring Carnival",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, stardrft,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Star Drifter",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, sbuk5,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Super Bucks 5",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, swh2ld,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Sweet Hearts 2 Lucky Devil",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, tahitim,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Tahiti Magic",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, thaiprar,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Thai Princess",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, gldnflc,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "The Golden Fleece",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, thndrhrt,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Thunderheart",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, tigresar,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Tigress",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, topshtar,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Topshot",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, torgods,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Torch Of The Gods",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, torpdice,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Touch Of Paradice",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, turtrea,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Turtle Treasure",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, venetian,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Venetian Nights",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, witgold,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Where Is The Gold",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, wikwin2,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Wicked Winnings 2",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, wldgoos,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Wild Goose",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, wldpan2,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Wild Panda 2",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, wldstal2,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Wild Stalion 2",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, wtepee,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Wild Tepee",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, wwaratah,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Wild Waratah",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, wwaysar,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Wild Ways",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, wwaysll,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Wizard Ways Lady Luck",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, zorrojp,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Zorro Jackpot",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+
+
 /*
 List of known MK6 games, excluding Hyperlink variations
 
diff --git a/src/mame/mame.lst b/src/mame/mame.lst
index 3b16abc8246..8371825ca4f 100644
--- a/src/mame/mame.lst
+++ b/src/mame/mame.lst
@@ -1392,6 +1392,122 @@ thaiprin                        // (c) 2003
 whalecsh                        // (c) 2002
 wheregld                        // (c) 2004
 wildways                        // (c) 2003
+100lions
+5dragons
+adustcm
+alchemya
+amzqnar
+arbnigar
+bigbenpj
+bigheart
+bigredjp
+birredar
+blkbrum
+brazilar
+bucanar
+buffalar
+bushrngr
+calyking
+canary2
+cmtonig
+csdce
+csd
+csret
+corrida
+cryspri
+deltqn
+di4ever
+dinoaris
+doubdolp
+drgnlrd
+drgnmgic
+ent6r
+eott
+firedan
+followst
+gambjack
+geishaar
+goapear
+gogreen
+goldarjp
+goldinc
+goldpym
+grizzly
+heartgar
+heartveg
+highnoar
+holdrma
+houhear
+incachf
+indce
+indll
+indsc
+indsrp
+indgcm
+indprncs
+jailbrar
+kingnep
+kingnile
+koalmnt
+kohinoor
+lgfish
+lordleo
+lougcm
+luigball
+mskitty
+mnytree
+mysteycm
+mystmerm
+nerdwild
+orbeaut
+outbackj
+owlcap
+pariligh
+pcockmag
+pelipete
+pharpor
+phxfant
+piratar
+pcbydem
+pompeiar
+prideaf
+prophar
+qsheeba
+qnilecj
+qnilese
+qnile
+raprichs
+redbarar
+ruprup
+rubmgc
+scatmg2
+sharmnm
+smtmar
+silgolar
+spgcarn
+stardrft
+sbuk5
+swh2ld
+tahitim
+thaiprar
+gldnflc
+thndrhrt
+tigresar
+topshtar
+torgods
+torpdice
+turtrea
+venetian
+witgold
+wikwin2
+wldgoos
+wldpan2
+wldstal2
+wtepee
+wwaratah
+wwaysar
+wwaysll
+zorrojp
 
 @source:arkanoid.cpp
 ark1ball                        // bootleg

From 6f9a7c653a0e6989d1229091cfbe04749c6e0b53 Mon Sep 17 00:00:00 2001
From: David Haywood <mamehaze@users.noreply.github.com>
Date: Tue, 19 Apr 2016 04:20:20 +0100
Subject: [PATCH 085/122] part 2 (nw)

---
 src/mame/drivers/aristmk5.cpp | 697 ++++++++++++++++++++++++++++++++++
 src/mame/drivers/aristmk6.cpp | 471 ++++++++++++++++++++++-
 src/mame/mame.lst             |  80 ++++
 3 files changed, 1244 insertions(+), 4 deletions(-)

diff --git a/src/mame/drivers/aristmk5.cpp b/src/mame/drivers/aristmk5.cpp
index 02483949fea..65c02fe4468 100644
--- a/src/mame/drivers/aristmk5.cpp
+++ b/src/mame/drivers/aristmk5.cpp
@@ -1333,6 +1333,651 @@ ROM_START( partygrs )
 ROM_END
 
 
+#define ROM_END_REGIONS \
+	ROM_REGION( 0x800000, "maincpu", ROMREGION_ERASE00 ) /* ARM Code */ \
+	ROM_REGION( 0x200000, "vram", ROMREGION_ERASE00 ) \
+	ROM_REGION( 0x20000*4, "sram", ROMREGION_ERASE00 ) \
+ROM_END
+
+
+ROM_START( badbog )
+	ARISTOCRAT_MK5_BIOS
+	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
+	ROM_LOAD32_WORD("Bad_Bog_1of6.U07.BIN", 0x0000000, 0x0080000, CRC(25aa8109) SHA1(cf4521b3d447812d2d9dbfdab9fe0cec71cdeb2e) )
+	ROM_LOAD32_WORD("Bad_Bog_2of6.U11.BIN", 0x0000002, 0x0080000, CRC(774ff977) SHA1(5ce1aa8b7598b4bc8e5fa44de1c03b5f2851f5de) )
+	ROM_LOAD32_WORD("Bad_Bog_3of6.U08.BIN", 0x0100000, 0x0080000, CRC(e52a279a) SHA1(4a3a080d840d8a894ec0ba0250a566831377f0f8) )
+	ROM_LOAD32_WORD("Bad_Bog_4of6.U12.BIN", 0x0100002, 0x0080000, CRC(562aa123) SHA1(825a2d23321b636a3ff2565b2b72df3b97bd0ec8) )
+	ROM_LOAD32_WORD("Bad_Bog_5of6.U09.BIN", 0x0200000, 0x0080000, CRC(66d5a7f7) SHA1(1a1f845a97677c43ff1090231434ae9d3d36ab4c) )
+	ROM_LOAD32_WORD("Bad_Bog_6of6.U13.BIN", 0x0200002, 0x0080000, CRC(883b2ec3) SHA1(5b431d8c9c8eabca65ab22dcf2bdb22d49445bb1) )
+ROM_END_REGIONS
+
+
+
+
+
+ROM_START( blackpnt )
+	ARISTOCRAT_MK5_BIOS
+	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
+	ROM_LOAD32_WORD("Black Panther NSW U11.BIN", 0x0000002, 0x0080000, CRC(de3358d3) SHA1(4f290940d8af9fe8d404802d5cecfd2d098eff12) )
+	ROM_LOAD32_WORD("Black Panther NSW U12.BIN", 0x0100002, 0x0080000, CRC(bb2bf7bb) SHA1(f88208238a69fc79e33af17f39e25cd2857d7172) )
+	ROM_LOAD32_WORD("Black Panther NSW U7.bin", 0x0000000, 0x0080000, CRC(eed76145) SHA1(6a40a6ba2ce320a37b086dc4916c92c8e38c065e) )
+	ROM_LOAD32_WORD("Black Panther NSW U8.bin", 0x0100000, 0x0080000, CRC(58ddfb50) SHA1(c2152e65fa119136b7944b69e650310db78e62a8) )
+ROM_END_REGIONS
+
+
+
+ROM_START( bootscot )
+	ARISTOCRAT_MK5_BIOS
+	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
+	ROM_LOAD32_WORD("Boot Scootin' U10.bin", 0x0300000, 0x0080000, CRC(b574c12d) SHA1(3b1d1d00ef3eae23493e2b0381ab80490af510d4) )
+	ROM_LOAD32_WORD("Boot Scootin' U11.BIN", 0x0000002, 0x0080000, CRC(df066d27) SHA1(310422c78e93ce9f1f58b4a58a59bc2eba5c502a) )
+	ROM_LOAD32_WORD("Boot Scootin' U12.BIN", 0x0100002, 0x0080000, CRC(87ddc7ef) SHA1(91473d8fd266a909fa8d4ec3df3a61861c6e9f4c) )
+	ROM_LOAD32_WORD("Boot Scootin' U13.BIN", 0x0200002, 0x0080000, CRC(fca82ee7) SHA1(bb70f2e04047a58b697dca536b95f9bbcc295a8a) )
+	ROM_LOAD32_WORD("Boot Scootin' U14.bin", 0x0300002, 0x0080000, CRC(75b9b89e) SHA1(08d487b3722f2ea5d2d18c78f571a44c78616dbe) )
+	ROM_LOAD32_WORD("Boot Scootin' U7.BIN", 0x0000000, 0x0080000, CRC(f8e12462) SHA1(82a25757b2146204b86e557b8f1c45280e0668a8) )
+	ROM_LOAD32_WORD("Boot Scootin' U8.bin", 0x0100000, 0x0080000, CRC(08e8de8d) SHA1(913d3e51821d8885affd2750c18d1000629b79d9) )
+	ROM_LOAD32_WORD("Boot Scootin' U9.bin", 0x0200000, 0x0080000, CRC(a1ca5f2b) SHA1(c8fc6aff0c3819370339143966ec76910e40c671) )
+ROM_END_REGIONS
+
+
+
+
+ROM_START( bumbugs )
+	ARISTOCRAT_MK5_BIOS
+	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
+	ROM_LOAD32_WORD("Bumble Bugs U11.BIN", 0x0000002, 0x0080000, CRC(5d888245) SHA1(bbbe61e09bebd5fcb79f060d5caee15100c9a685) )
+	ROM_LOAD32_WORD("Bumble Bugs U7.bin", 0x0000000, 0x0080000, CRC(d4cfce73) SHA1(735c385779afe55e521dbfe9ebfdc55fe3346349) )
+ROM_END_REGIONS
+
+
+
+
+ROM_START( butdeli )
+	ARISTOCRAT_MK5_BIOS
+	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
+	ROM_LOAD32_WORD("Butterfly Delight  U11.BIN", 0x0000002, 0x0080000, CRC(1ddf8732) SHA1(dc09db14c251699fdd46068f18ad6214e8752939) )
+	ROM_LOAD32_WORD("Butterfly Delight  U12.BIN", 0x0100002, 0x0080000, CRC(0d58cf28) SHA1(aa65b7ee88b5bc872008a46e60bd49d9e5eda153) )
+	ROM_LOAD32_WORD("Butterfly Delight  U7.bin", 0x0000000, 0x0080000, CRC(7f69cdfc) SHA1(1241741d21334df10d60080555824a87eae93db3) )
+	ROM_LOAD32_WORD("Butterfly Delight  U8.bin", 0x0100000, 0x0080000, CRC(24d8135e) SHA1(1bc69e9927afe0300d15a49ca06ae527774b295a) )
+ROM_END_REGIONS
+
+
+
+ROM_START( cashchm )
+	ARISTOCRAT_MK5_BIOS
+	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
+	ROM_LOAD32_WORD("CASHCHAMELEON_U11.BIN", 0x0000002, 0x0080000, CRC(64921874) SHA1(5aa6a0d6e29f5e400e275f27b6adfbef595fe83a) )
+	ROM_LOAD32_WORD("CASHCHAMELEON_U12.BIN", 0x0100002, 0x0080000, CRC(7ae3b5db) SHA1(238698b72f529ac4fb292d08267069d1da01b43b) )
+	ROM_LOAD32_WORD("CASHCHAMELEON_U7.bin", 0x0000000, 0x0080000, CRC(c942ef22) SHA1(4f56674f749602ae928832f98a641e680af8989b) )
+	ROM_LOAD32_WORD("CASHCHAMELEON_U8.bin", 0x0100000, 0x0080000, CRC(a8868277) SHA1(e199448a0a920219dc15443813061653b94d6d3a) )
+ROM_END_REGIONS
+
+
+
+ROM_START( cashcroa )
+	ARISTOCRAT_MK5_BIOS
+	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
+	ROM_LOAD32_WORD("cash_crop_1of4.U07.BIN", 0x0000000, 0x0080000, CRC(b0ff2aae) SHA1(b05667ffe952cae7a6581398552db6e47921090e) )
+	ROM_LOAD32_WORD("cash_crop_2of4.U11.BIN", 0x0000002, 0x0080000, CRC(25a18efa) SHA1(0ee4f6cc66322397dbde53af2149f5fb35d788df) )
+	ROM_LOAD32_WORD("cash_crop_3of4.U08.BIN", 0x0100000, 0x0080000, CRC(d4e7b4ba) SHA1(147a1ed5cdcbb84466a8024ad7e0778f85374489) )
+	ROM_LOAD32_WORD("cash_crop_4of4.U12.BIN", 0x0100002, 0x0080000, CRC(570c7f8a) SHA1(7c9527e0b37970b7960c723727c3c650a48e8125) )
+ROM_END_REGIONS
+
+
+
+
+
+ROM_START( chkrun )
+	ARISTOCRAT_MK5_BIOS
+	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
+	ROM_LOAD32_WORD("Chicken Run U11.BIN", 0x0000002, 0x0080000, CRC(65423867) SHA1(992bb4f717f79233d1300d248b145f95a627cff2) )
+	ROM_LOAD32_WORD("Chicken Run U12.BIN", 0x0100002, 0x0080000, CRC(77b5d777) SHA1(f03afeaff08c9216e714f1e4bcc50292ba87ace4) )
+	ROM_LOAD32_WORD("Chicken Run U13.BIN", 0x0200002, 0x0080000, CRC(88a1ccae) SHA1(e242f48f99044b4fdf1bf36d8e105df09f94aa50) )
+	ROM_LOAD32_WORD("Chicken Run u7.bin", 0x0000000, 0x0080000, CRC(be69c21c) SHA1(8b546727b5972f33d077db0a64aa41a7fde6d417) )
+	ROM_LOAD32_WORD("Chicken Run U8.bin", 0x0100000, 0x0080000, CRC(3161c16f) SHA1(8f2b14ec8ba5c9da80a226d2ce5a7e5256c8cbb4) )
+	ROM_LOAD32_WORD("Chicken Run U9.bin", 0x0200000, 0x0080000, CRC(5506777b) SHA1(42512577056e1caefbea0e74879780c56787af13) )
+ROM_END_REGIONS
+
+
+
+
+
+
+ROM_START( coralr2v )
+	ARISTOCRAT_MK5_BIOS
+	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
+	ROM_LOAD32_WORD("Coral Riches 2 U11.BIN", 0x0000002, 0x0080000, CRC(8cd17e90) SHA1(c6d6a29e62ca6e1b278a2e1d1b358e10ca2de4ed) )
+	ROM_LOAD32_WORD("Coral Riches 2 U12.BIN", 0x0100002, 0x0080000, CRC(9ea140b5) SHA1(11f6b9ab60117f236b464c9dbc939dfb8f240359) )
+	ROM_LOAD32_WORD("Coral Riches 2 U7.bin", 0x0000000, 0x0080000, CRC(02c430c3) SHA1(f4bae1aa5437af1df2a04f700da044bc4fb652b7) )
+	ROM_LOAD32_WORD("Coral Riches 2 U8.bin", 0x0100000, 0x0080000, CRC(1ee9557c) SHA1(3bee295509d4b0c11ce41a7a20ba91230b7cb4ca) )
+ROM_END_REGIONS
+
+
+
+ROM_START( cuckooa )
+	ARISTOCRAT_MK5_BIOS
+	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
+	ROM_LOAD32_WORD("Cuckoo_1of4_U07.BIN", 0x0000000, 0x0080000, CRC(5c7ef84a) SHA1(59563a076ecf391ac1779e0dcd530a1ea158a4e3) )
+	ROM_LOAD32_WORD("Cuckoo_2of4_U11.BIN", 0x0000002, 0x0080000, CRC(a69c1416) SHA1(7fe57a194bf29346c039dfac1326f3ee5080e630) )
+	ROM_LOAD32_WORD("Cuckoo_3of4_U08.BIN", 0x0100000, 0x0080000, CRC(a7b4242c) SHA1(4e6961e9b3267d17b93075c41a691a8033a34d90) )
+	ROM_LOAD32_WORD("Cuckoo_4of4_U12.BIN", 0x0100002, 0x0080000, CRC(cb706eb7) SHA1(cbd6235ca7a29c78ef2cb659d9c21466ed39b360) )
+ROM_END_REGIONS
+
+
+
+
+ROM_START( dstblom )
+	ARISTOCRAT_MK5_BIOS
+	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
+	ROM_LOAD32_WORD("Desert Bloom  U11.BIN", 0x0000002, 0x0080000, CRC(ed4e8dca) SHA1(1953033e570634cbcf8cd11194c14c57ffc6be53) )
+	ROM_LOAD32_WORD("Desert Bloom  U12.BIN", 0x0100002, 0x0080000, CRC(0ad41815) SHA1(131efc6ed45d8f44a667bd30380c9e37c64f2c42) )
+	ROM_LOAD32_WORD("Desert Bloom  U7.bin", 0x0000000, 0x0080000, CRC(fbfaa3fe) SHA1(3f915261503fc97eb556422e9ccdac81372c04cc) )
+	ROM_LOAD32_WORD("Desert Bloom  U8.bin", 0x0100000, 0x0080000, CRC(cc0d567c) SHA1(c4da3d0c0c4420a9f8fbb6403db983b3e27d4b50) )
+ROM_END_REGIONS
+
+
+
+ROM_START( dmddove )
+	ARISTOCRAT_MK5_BIOS
+	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
+	ROM_LOAD32_WORD("Diamond Dove  U11.BIN", 0x0000002, 0x0080000, CRC(ff4c684a) SHA1(6598c24a8717b8e624e387f000c584ec3b10a8cd) )
+	ROM_LOAD32_WORD("Diamond Dove  U12.BIN", 0x0100002, 0x0080000, CRC(62209e81) SHA1(68383068de2e030467c3f3ac16459ae2f3b2cce6) )
+	ROM_LOAD32_WORD("Diamond Dove  U13.BIN", 0x0200002, 0x0080000, CRC(952a850f) SHA1(66da391af532f9ef531d10995c96a90eb71cd09a) )
+	ROM_LOAD32_WORD("Diamond Dove  U7.bin", 0x0000000, 0x0080000, CRC(2ebb3704) SHA1(42567d873d6ab9221d09e5449fa57b557677d2ab) )
+	ROM_LOAD32_WORD("Diamond Dove  U8.bin", 0x0100000, 0x0080000, CRC(daa55b3b) SHA1(7aa96a51a3ea9f96c38d08e486eccc54ca4396a3) )
+	ROM_LOAD32_WORD("Diamond Dove  U9.bin", 0x0200000, 0x0080000, CRC(2254f0e9) SHA1(5bccd65e7e616e1f6ed08a0c84862cb13f9f7098) )
+ROM_END_REGIONS
+
+
+
+
+
+ROM_START( drawpka )
+	ARISTOCRAT_MK5_BIOS
+	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
+	ROM_LOAD32_WORD("M Draw Free Poker Game  U11.BIN", 0x0000002, 0x0080000, CRC(ac8503fa) SHA1(30640a9c01239173c7430a46dcd2e2b28024c0cf) )
+	ROM_LOAD32_WORD("M Draw Free Poker Game  U12.BIN", 0x0100002, 0x0080000, CRC(cd0dfdf5) SHA1(7bcf77c1bcd023b4ab08cef329dcf39dc2ca09d6) )
+	ROM_LOAD32_WORD("M Draw Free Poker Game  U13.BIN", 0x0200002, 0x0080000, CRC(0d6f7ec5) SHA1(0a80257eb464e50292554f45583f3d7b85de2bc3) )
+	ROM_LOAD32_WORD("M Draw Free Poker Game  U7.bin", 0x0000000, 0x0080000, CRC(7570eb03) SHA1(0fded55ee2d12cfae96e2910c68a131cd89147a0) )
+	ROM_LOAD32_WORD("M Draw Free Poker Game  U8.bin", 0x0100000, 0x0080000, CRC(8c54bd65) SHA1(5870558f8b96fca2c355ccc6ffc09fc4684d141c) )
+	ROM_LOAD32_WORD("M Draw Free Poker Game  U9.bin", 0x0200000, 0x0080000, CRC(10b96156) SHA1(1f89e0d8d210d2fd7e0b78b0205eb626d7c39542) )
+ROM_END_REGIONS
+
+
+
+
+ROM_START( dyjack )
+	ARISTOCRAT_MK5_BIOS
+	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
+	ROM_LOAD32_WORD("Dynamite Jack_U11.BIN", 0x0000002, 0x0080000, CRC(5a0147ae) SHA1(f2135b2525eb50a03a8f6360e7edb92bf0b88740) )
+	ROM_LOAD32_WORD("Dynamite Jack_U12.BIN", 0x0100002, 0x0080000, CRC(beee94ff) SHA1(fad0d3506d10330840d3e5fcdfd7f0aa20041969) )
+	ROM_LOAD32_WORD("Dynamite Jack_U13.BIN", 0x0200002, 0x0080000, CRC(d204ff9c) SHA1(8ac5533928fb3ca247dc85cea67da45a6743f732) )
+	ROM_LOAD32_WORD("Dynamite Jack_U7.bin", 0x0000000, 0x0080000, CRC(73783ecf) SHA1(280b4da540b405959f31c2eebbf87ab635d21c06) )
+	ROM_LOAD32_WORD("Dynamite Jack_U8.bin", 0x0100000, 0x0080000, CRC(e686eab2) SHA1(6eb18adda82357ff84f77e9334733094430dfdc6) )
+	ROM_LOAD32_WORD("Dynamite Jack_U9.bin", 0x0200000, 0x0080000, CRC(28a45170) SHA1(d7bb8e4dd24e3a3acf44e7fc40e49ebee5c15ec9) )
+ROM_END_REGIONS
+
+
+
+ROM_START( eldora )
+	ARISTOCRAT_MK5_BIOS
+	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
+	ROM_LOAD32_WORD("U11 El Dorado.bin", 0x0000002, 0x0080000, CRC(35233cf8) SHA1(e02477526f2f9e2663c1876f543d138b2caf28df) )
+	ROM_LOAD32_WORD("U7 El Dorado.bin", 0x0000000, 0x0080000, CRC(d9afe87c) SHA1(577ea5da9c4e93a393711a0c7361365301f4241e) )
+ROM_END_REGIONS
+
+
+
+
+
+
+
+ROM_START( fortela )
+	ARISTOCRAT_MK5_BIOS
+	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
+	ROM_LOAD32_WORD("Fortune_Teller_U10.bin", 0x0300000, 0x0080000, CRC(f2790419) SHA1(8720c37cc678e7c5666c67b9998fbb460a8aad90) )
+	ROM_LOAD32_WORD("Fortune_Teller_U11.BIN", 0x0000002, 0x0080000, CRC(faab1283) SHA1(6200fc2047c4052e4fc3c2d28b26cd9ff67a08be) )
+	ROM_LOAD32_WORD("Fortune_Teller_U12.BIN", 0x0100002, 0x0080000, CRC(fe5af3ac) SHA1(f08fe353c871ac4375f0fa25bf15f2638b33a370) )
+	ROM_LOAD32_WORD("Fortune_Teller_U13.BIN", 0x0200002, 0x0080000, CRC(d0dd6627) SHA1(ea855da1759a27936615400993b381609071d66c) )
+	ROM_LOAD32_WORD("Fortune_Teller_U14.bin", 0x0300002, 0x0080000, CRC(507bbe10) SHA1(01b1982c02a00b60aa39ee1b408d653365f728d4) )
+	ROM_LOAD32_WORD("Fortune_Teller_U7.bin", 0x0000000, 0x0080000, CRC(78394106) SHA1(aedfb98d7aa515eebabf378edb9c43e01bcba010) )
+	ROM_LOAD32_WORD("Fortune_Teller_U8.bin", 0x0100000, 0x0080000, CRC(7ce4ba38) SHA1(43b57e4dc96851f58d95e4f1b99d08f559e27f6a) )
+	ROM_LOAD32_WORD("Fortune_Teller_U9.bin", 0x0200000, 0x0080000, CRC(a43cd994) SHA1(759fecc809ca1b038d782b173d5638d9be165f9a) )
+ROM_END_REGIONS
+
+
+
+
+ROM_START( genmagi )
+	ARISTOCRAT_MK5_BIOS
+	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
+	ROM_LOAD32_WORD("GENIEMAGIC_U10.bin", 0x0300000, 0x0080000, CRC(ea460e72) SHA1(4546e04cc04239528c93e22532db08fccebda8a8) )
+	ROM_LOAD32_WORD("GENIEMAGIC_U11.BIN", 0x0000002, 0x0080000, CRC(88c304a3) SHA1(013d5d1d62b356ce5cdf0c9b036c4ca09f191668) )
+	ROM_LOAD32_WORD("GENIEMAGIC_U12.BIN", 0x0100002, 0x0080000, CRC(44adc422) SHA1(81256ddebb29fbd69cab8e642faac39635dd1739) )
+	ROM_LOAD32_WORD("GENIEMAGIC_U13.BIN", 0x0200002, 0x0080000, CRC(26f51647) SHA1(e980c021d8e2d295ba2d50446b36b85f42d3f318) )
+	ROM_LOAD32_WORD("GENIEMAGIC_U14.bin", 0x0300002, 0x0080000, CRC(52092ffb) SHA1(6ed591a510e9186588470ec745caf8001712012e) )
+	ROM_LOAD32_WORD("GENIEMAGIC_U7.bin", 0x0000000, 0x0080000, CRC(20ec3b50) SHA1(400ad7f86077184fee63690060fe2a51ba888e1b) )
+	ROM_LOAD32_WORD("GENIEMAGIC_U8.bin", 0x0100000, 0x0080000, CRC(341bac7b) SHA1(67df39b8070f6d9afd183b04239d9e2844d588c5) )
+	ROM_LOAD32_WORD("GENIEMAGIC_U9.bin", 0x0200000, 0x0080000, CRC(ce051dbd) SHA1(433717c5689dc865c1e42669a50e138eae017362) )
+ROM_END_REGIONS
+
+
+
+
+ROM_START( gnomatw )
+	ARISTOCRAT_MK5_BIOS
+	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
+	ROM_LOAD32_WORD("Gnome The World U11.BIN", 0x0000002, 0x0080000, CRC(737d7178) SHA1(df788eea23b15415adc94543476b6ad982c4d79b) )
+	ROM_LOAD32_WORD("Gnome The World U12.BIN", 0x0100002, 0x0080000, CRC(49eb3869) SHA1(d98fe385c667872f26d656a3240f557a70ba924f) )
+	ROM_LOAD32_WORD("Gnome The World U7.bin", 0x0000000, 0x0080000, CRC(a5d3825e) SHA1(4ce7466eff770a2c6c3c5de620a14e05bb9fb406) )
+	ROM_LOAD32_WORD("Gnome The World U8.bin", 0x0100000, 0x0080000, CRC(fe59ec8b) SHA1(b43778b51a0d695c179fa63ce45a47b9f550fb97) )
+ROM_END_REGIONS
+
+
+
+
+
+ROM_START( goldra )
+	ARISTOCRAT_MK5_BIOS
+	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
+	ROM_LOAD32_WORD("Golden_Ra_1of6.U07.BIN", 0x0000000, 0x0080000, CRC(2f75d5f7) SHA1(d7f6ecff7cf759d80733b6d3f224caa5128be0b7) )
+	ROM_LOAD32_WORD("Golden_Ra_2of6.U11.BIN", 0x0000002, 0x0080000, CRC(06a871c7) SHA1(95464d74c2295196e367e34efb816acedcd71265) )
+	ROM_LOAD32_WORD("Golden_Ra_3of6.U08.BIN", 0x0100000, 0x0080000, CRC(940eabd7) SHA1(8d41b3fa27c827a7671b095618ac53750e6017f6) )
+	ROM_LOAD32_WORD("Golden_Ra_4of6.U12.BIN", 0x0100002, 0x0080000, CRC(21c4a2d2) SHA1(77a24a5f98aad090223d301919645b5011667c28) )
+	ROM_LOAD32_WORD("Golden_Ra_5of6.U09.BIN", 0x0200000, 0x0080000, CRC(b1cac0e7) SHA1(87f393a75c09e96a7fb893a767edcc81044e4fe3) )
+	ROM_LOAD32_WORD("Golden_Ra_6of6.U13.BIN", 0x0200002, 0x0080000, CRC(8f62ccc5) SHA1(5105313192ab8dfd522b921c70b8b03a8a61ac63) )
+ROM_END_REGIONS
+
+
+
+
+
+ROM_START( hrttrhb )
+	ARISTOCRAT_MK5_BIOS
+	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
+	ROM_LOAD32_WORD("Heart Throb U11.BIN", 0x0000002, 0x0080000, CRC(bde067d7) SHA1(cbf2cbd0644f1daeb5c3cd08d72f3d7aafe521ec) )
+	ROM_LOAD32_WORD("Heart Throb U7.bin", 0x0000000, 0x0080000, CRC(de4d6d77) SHA1(959ffb7d06359870e07cb9d761f0bc0480c45e0c) )
+ROM_END_REGIONS
+
+
+
+
+
+ROM_START( incsun )
+	ARISTOCRAT_MK5_BIOS
+	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
+	ROM_LOAD32_WORD("INCASUN_NSW_U11.BIN", 0x0000002, 0x0080000, CRC(f51b411d) SHA1(fbbd587c90cd49bb36653cbd1948bc52f8396a41) )
+	ROM_LOAD32_WORD("INCASUN_NSW_U12.BIN", 0x0100002, 0x0080000, CRC(0fa00c41) SHA1(79139834d5437b37346322bf632904c473e3463a) )
+	ROM_LOAD32_WORD("INCASUN_NSW_U13.BIN", 0x0200002, 0x0080000, CRC(00407593) SHA1(4c759fe3267b1782ae84d8ed9134295dfaa0faaf) )
+	ROM_LOAD32_WORD("INCASUN_NSW_U7.bin", 0x0000000, 0x0080000, CRC(180e098b) SHA1(48782c46a344dba0aaad407d0d4a432da091b0f5) )
+	ROM_LOAD32_WORD("INCASUN_NSW_U8.bin", 0x0100000, 0x0080000, CRC(0c19f5ec) SHA1(95d7c9308b30b5193816e95c4276829612040298) )
+	ROM_LOAD32_WORD("INCASUN_NSW_U9.bin", 0x0200000, 0x0080000, CRC(c82da820) SHA1(98a2710b1f793a7ee1070f89c66d49ce55e4156e) )
+ROM_END_REGIONS
+
+
+
+
+
+
+
+ROM_START( kookabk )
+	ARISTOCRAT_MK5_BIOS
+	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
+	ROM_LOAD32_WORD("Kooka_Bucks_1of4.U07.BIN", 0x0000000, 0x0080000, CRC(b2fdf0e8) SHA1(0dd002cfad2fa4f217a0c67066d098f4cd3ba319) )
+	ROM_LOAD32_WORD("Kooka_Bucks_2of4.U11.BIN", 0x0000002, 0x0080000, CRC(e8ab9afc) SHA1(4c3beefeafc6ac9d4538254bb5e01c12b35db922) )
+	ROM_LOAD32_WORD("Kooka_Bucks_3of4.U08.BIN", 0x0100000, 0x0080000, CRC(f5a45c57) SHA1(a452a7359af6d5fde2c37946ee68807152f07d39) )
+	ROM_LOAD32_WORD("Kooka_Bucks_4of4.U12.BIN", 0x0100002, 0x0080000, CRC(b2f2fd15) SHA1(9614f3ae6e82a40ecf44090d0b8d7bd8b6b1f830) )
+ROM_END_REGIONS
+
+
+
+
+ROM_START( locoloot )
+	ARISTOCRAT_MK5_BIOS
+	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
+	ROM_LOAD32_WORD("Loco Loot U11.BIN", 0x0000002, 0x0080000, CRC(21332a1a) SHA1(76a4c30d1c9624984175e9bd117c68c9204f01df) )
+	ROM_LOAD32_WORD("Loco Loot U7.bin", 0x0000000, 0x0080000, CRC(4f02763c) SHA1(302cea5fb157f65fc907f123ef42a0a38cc707ac) )
+ROM_END_REGIONS
+
+
+ROM_START( lonwolf )
+	ARISTOCRAT_MK5_BIOS
+	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
+	ROM_LOAD32_WORD("Lone Wolf  U11.BIN", 0x0000002, 0x0080000, CRC(0ed6fb6b) SHA1(a2baa4154fe762e2c1b40a97b2d27265df8b5dab) )
+	ROM_LOAD32_WORD("Lone Wolf  U7.bin", 0x0000000, 0x0080000, CRC(15024eae) SHA1(7101125aa8531c75f9d80fe357013d09dbb0fec9) )
+ROM_END_REGIONS
+
+
+
+
+ROM_START( mgctouc )
+	ARISTOCRAT_MK5_BIOS
+	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
+	ROM_LOAD32_WORD("Magic Touch U11.BIN", 0x0000002, 0x0080000, CRC(614984e4) SHA1(e95d576993e8d9c0964899a7d5556c8e62d79242) )
+	ROM_LOAD32_WORD("Magic Touch U12.BIN", 0x0100002, 0x0080000, CRC(f54c18db) SHA1(85bcc202f7425b3b7ef456c1c2db5a22648068a8) )
+	ROM_LOAD32_WORD("Magic Touch U13.BIN", 0x0200002, 0x0080000, CRC(cfd2a86e) SHA1(66891a1b0e85ad7146b733f4b5d806db789d8821) )
+	ROM_LOAD32_WORD("Magic Touch U7.bin", 0x0000000, 0x0080000, CRC(9fa3ee86) SHA1(ce7546b8d1dbf90eb8f4f8d3255dc1c215c966a7) )
+	ROM_LOAD32_WORD("Magic Touch U8.bin", 0x0100000, 0x0080000, CRC(d7faf84d) SHA1(d2e49787d177767671fab64a723e1af619ce9ad2) )
+	ROM_LOAD32_WORD("Magic Touch U9.bin", 0x0200000, 0x0080000, CRC(0e140453) SHA1(8b516fe598c7e754a471246effa1185845495640) )
+ROM_END_REGIONS
+
+
+
+
+
+ROM_START( monmous )
+	ARISTOCRAT_MK5_BIOS
+	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
+	ROM_LOAD32_WORD("MONEYMOUSE_U11.BIN", 0x0000002, 0x0080000, CRC(ac2243ea) SHA1(27c31e5102defa4f3982875b30a67e89af40d4ff) )
+	ROM_LOAD32_WORD("MONEYMOUSE_U12.BIN", 0x0100002, 0x0080000, CRC(72d992ed) SHA1(94560305dacbe776ddc95114ad5e5ffaa234937c) )
+	ROM_LOAD32_WORD("MONEYMOUSE_U7.bin", 0x0000000, 0x0080000, CRC(7f7972b6) SHA1(25991f476f55cd1eddc8e63af9c472c1d7e83481) )
+	ROM_LOAD32_WORD("MONEYMOUSE_U8.bin", 0x0100000, 0x0080000, CRC(a10a4bff) SHA1(e6b36542dab8a3405579b333a125a6d3fd801b50) )
+ROM_END_REGIONS
+
+
+
+
+
+ROM_START( moutmon )
+	ARISTOCRAT_MK5_BIOS
+	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
+	ROM_LOAD32_WORD("Mountain Money U11.BIN", 0x0000002, 0x0080000, CRC(4fb2a4dc) SHA1(23895b701387f7442a31969989d21cefe2a25efd) )
+	ROM_LOAD32_WORD("Mountain Money U7.bin", 0x0000000, 0x0080000, CRC(b84342af) SHA1(e27e65730ddc897b01e8875a4da3ea2d6db2b858) )
+ROM_END_REGIONS
+
+
+
+
+ROM_START( mystgrd )
+	ARISTOCRAT_MK5_BIOS
+	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
+	ROM_LOAD32_WORD("Mystic Garden U11.BIN", 0x0000002, 0x0080000, CRC(6e618fc5) SHA1(a02e7ca2433cf8128d74792833d9708a3ba5df4b) )
+	ROM_LOAD32_WORD("Mystic Garden U7.bin", 0x0000000, 0x0080000, CRC(28d15442) SHA1(ee33017f3efcf688a43ea1d7f2b74b4b9a6d2cae) )
+ROM_END_REGIONS
+
+
+
+
+
+ROM_START( orchidms )
+	ARISTOCRAT_MK5_BIOS
+	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
+	ROM_LOAD32_WORD("Orchid Mist  U11.BIN", 0x0000002, 0x0080000, CRC(fe79410b) SHA1(c91a0ce0cf87db518f910e9f47cabdcb91dc5496) )
+	ROM_LOAD32_WORD("Orchid Mist  U12.BIN", 0x0100002, 0x0080000, CRC(165a762d) SHA1(8487d2e32bd2fab5a9114380ba2be6d34b097b11) )
+	ROM_LOAD32_WORD("Orchid Mist  U7.bin", 0x0000000, 0x0080000, CRC(5d18ae22) SHA1(c10f7a83f51cfe75653ace8066b7dedf07e91b28) )
+	ROM_LOAD32_WORD("Orchid Mist  U8.bin", 0x0100000, 0x0080000, CRC(09ec43e3) SHA1(947ed0982a148e6906666378e8c82315d40237d7) )
+ROM_END_REGIONS
+
+
+
+
+
+ROM_START( oscarar )
+	ARISTOCRAT_MK5_BIOS
+	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
+	ROM_LOAD32_WORD("Oscar U11.BIN", 0x0000002, 0x0080000, CRC(11394e80) SHA1(1c6e7e954a6118e04da9d761fef8ec00c46d2af8) )
+	ROM_LOAD32_WORD("Oscar U7.bin", 0x0000000, 0x0080000, CRC(930bdc00) SHA1(36b1a289abebc7cce64e767e201d8f8f7fe80cf2) )
+ROM_END_REGIONS
+
+
+
+
+ROM_START( pantmag )
+	ARISTOCRAT_MK5_BIOS
+	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
+	ROM_LOAD32_WORD("Panther Magic 200 U11.BIN", 0x0000002, 0x0080000, CRC(0914594c) SHA1(b1bc1302847e3ea3c4ed96ae17047da031e5ca1a) )
+	ROM_LOAD32_WORD("Panther Magic 200 U12.BIN", 0x0100002, 0x0080000, CRC(eae75fa9) SHA1(576c8cf98ad4032bbdde12162e2c1bdd10056762) )
+	ROM_LOAD32_WORD("Panther Magic 200 U7.BIN", 0x0000000, 0x0080000, CRC(6383899d) SHA1(df96af7cb580565715da6e78b83e7ba6832028e7) )
+	ROM_LOAD32_WORD("Panther Magic 200 U8.bin", 0x0100000, 0x0080000, CRC(db840d1b) SHA1(26ff790cd21f2005ae3a3e879ef07b87c8ae0020) )
+ROM_END_REGIONS
+
+
+
+
+ROM_START( peaflut )
+	ARISTOCRAT_MK5_BIOS
+	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
+	ROM_LOAD32_WORD("PEACOCKFLUTTER_U11.BIN", 0x0000002, 0x0080000, CRC(3134818c) SHA1(6fe158608b5da648fafd20cbcd213e6f2dc2104c) )
+	ROM_LOAD32_WORD("PEACOCKFLUTTER_U12.BIN", 0x0100002, 0x0080000, CRC(2d96c449) SHA1(af98a864b9ed3f95227fd0d6edc6a38c0544c93f) )
+	ROM_LOAD32_WORD("PEACOCKFLUTTER_U7.bin", 0x0000000, 0x0080000, CRC(e4497f35) SHA1(7030aba6c17fc391564385f5669e07edc94dca61) )
+	ROM_LOAD32_WORD("PEACOCKFLUTTER_U8.bin", 0x0100000, 0x0080000, CRC(f239ca62) SHA1(53e3e2a4d62ceb9e921606e3670470c09e82118f) )
+ROM_END_REGIONS
+
+
+
+
+ROM_START( pengpay )
+	ARISTOCRAT_MK5_BIOS
+	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
+	ROM_LOAD32_WORD("Penguin_Pays_U11.BIN", 0x0000002, 0x0080000, CRC(82fc4e23) SHA1(54e7698c4deed7202da8f178698ecdcf85f3f640) )
+	ROM_LOAD32_WORD("Penguin_Pays_U12.BIN", 0x0100002, 0x0080000, CRC(90864742) SHA1(f6491e4fbce5d642b9d0224118923b56625338b1) )
+	ROM_LOAD32_WORD("Penguin_Pays_U7.bin", 0x0000000, 0x0080000, CRC(47145744) SHA1(74a186a15537d8b05ce23f37c53f351e8058b0b2) )
+	ROM_LOAD32_WORD("Penguin_Pays_U8.bin", 0x0100000, 0x0080000, CRC(8d37d7bf) SHA1(9c9b86cce9492f9de346e5a6944e2f0c5da6b9b1) )
+ROM_END_REGIONS
+
+
+
+
+ROM_START( przfigha )
+	ARISTOCRAT_MK5_BIOS
+	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
+	ROM_LOAD32_WORD("PRIZEFIGHT_U11.BIN", 0x0000002, 0x0080000, CRC(e1bf20d7) SHA1(bcc308b884433b3ebd890fafa667235a9fb7876c) )
+	ROM_LOAD32_WORD("PRIZEFIGHT_U12.BIN", 0x0100002, 0x0080000, CRC(b4797555) SHA1(695aa6c40145fd9856821288680a24d316b7d4cd) )
+	ROM_LOAD32_WORD("PRIZEFIGHT_U13.BIN", 0x0200002, 0x0080000, CRC(c16197d5) SHA1(716c4afdf2acde10ff09ad90b03bc5e689f0a737) )
+	ROM_LOAD32_WORD("PRIZEFIGHT_U7.bin", 0x0000000, 0x0080000, CRC(2b1a9678) SHA1(c75de4c76cd934df746040d0515694d92e2fc145) )
+	ROM_LOAD32_WORD("PRIZEFIGHT_U8.bin", 0x0100000, 0x0080000, CRC(92b68d43) SHA1(74ba55d6c7016de26692138d194f57f016feb938) )
+	ROM_LOAD32_WORD("PRIZEFIGHT_U9.bin", 0x0200000, 0x0080000, CRC(b3163b0c) SHA1(e9aac4acb31a9af194626b25517aa7c169fe40bf) )
+ROM_END_REGIONS
+
+
+
+
+
+ROM_START( qncsh )
+	ARISTOCRAT_MK5_BIOS
+	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
+	ROM_LOAD32_WORD("queensofcash_U11.BIN", 0x0000002, 0x0080000, CRC(5001567e) SHA1(eadde9750856a7920e06955adc0db46082da655a) )
+	ROM_LOAD32_WORD("queensofcash_U12.BIN", 0x0100002, 0x0080000, CRC(bfedb3fc) SHA1(e115db94b8ee7babb29e31e64b96d181f5c6491b) )
+	ROM_LOAD32_WORD("queensofcash_U7.bin", 0x0000000, 0x0080000, CRC(591c96eb) SHA1(acd6f02206086d710a92401c618f715b3646d78a) )
+	ROM_LOAD32_WORD("queensofcash_U8.bin", 0x0100000, 0x0080000, CRC(31ed5795) SHA1(8238da7c87195339d34cf24b3e0a7f3bf53d2b8a) )
+ROM_END_REGIONS
+
+
+
+
+
+ROM_START( sumospin )
+	ARISTOCRAT_MK5_BIOS
+	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
+	ROM_LOAD32_WORD("Sumo Spins U11.BIN", 0x0000002, 0x0080000, CRC(919999fe) SHA1(3d800df5e0abed04c76928b04973ea7c7b02e5d1) )
+	ROM_LOAD32_WORD("Sumo Spins U12.BIN", 0x0100002, 0x0080000, CRC(ba3eede2) SHA1(708a25af0908a1aa874b3ca4897816c65b0c9178) )
+	ROM_LOAD32_WORD("Sumo Spins u7.bin", 0x0000000, 0x0080000, CRC(c3ec9f97) SHA1(62c886cc794de4b915533729c5ea5a71a4b59108) )
+	ROM_LOAD32_WORD("Sumo Spins U8.bin", 0x0100000, 0x0080000, CRC(eb47f317) SHA1(43ead31e788cce1aa03011f634e939489d965144) )
+ROM_END_REGIONS
+
+
+
+
+
+ROM_START( sbucks3 )
+	ARISTOCRAT_MK5_BIOS
+	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
+	ROM_LOAD32_WORD("SUPERBUCKS3_U11.BIN", 0x0000002, 0x0080000, CRC(a810782c) SHA1(5d59b464c44ec32b2b977f8326c8bf3424a61e07) )
+	ROM_LOAD32_WORD("SUPERBUCKS3_U12.BIN", 0x0100002, 0x0080000, CRC(a585172d) SHA1(3c74efb11285ff78ce76a7e8af2f936d3dc31290) )
+	ROM_LOAD32_WORD("SUPERBUCKS3_U7.bin", 0x0000000, 0x0080000, CRC(e056c7db) SHA1(7a555583f750d8275b2ffd25a0efbe370a5ac43c) )
+	ROM_LOAD32_WORD("SUPERBUCKS3_U8.bin", 0x0100000, 0x0080000, CRC(2ff83479) SHA1(2f0c6c12e115a5592c29e806a946817a4f1b89a3) )
+ROM_END_REGIONS
+
+
+
+ROM_START( tretrva )
+	ARISTOCRAT_MK5_BIOS
+	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
+	ROM_LOAD32_WORD("U11 Treasure Trove.bin", 0x0000002, 0x0080000, CRC(020a588d) SHA1(4759bef22017fb4c47c87adb6ca7253fdb6bca6b) )
+	ROM_LOAD32_WORD("U12 Treasure Trove.bin", 0x0100002, 0x0080000, CRC(715f53cb) SHA1(364c35fc2d36180c13127c8004a8729126f68db1) )
+	ROM_LOAD32_WORD("U7 Treasure Trove.bin", 0x0000000, 0x0080000, CRC(07a8b338) SHA1(7508d7d0e3494d355cb773165b240ba876a60eec) )
+	ROM_LOAD32_WORD("U8 Treasure Trove.bin", 0x0100000, 0x0080000, CRC(89a042e7) SHA1(0f95cfd42ce7130176d42c6bbdf8ff22a6662894) )
+ROM_END_REGIONS
+
+
+
+ROM_START( triptrea )
+	ARISTOCRAT_MK5_BIOS
+	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
+	ROM_LOAD32_WORD("U11 Triple Treat.bin", 0x0000002, 0x0080000, CRC(fbc125b8) SHA1(55dbc3a236804f4a8d26be8e49c29fa5943c5bd6) )
+	ROM_LOAD32_WORD("U12 Triple Treat.bin", 0x0100002, 0x0080000, CRC(5df3854a) SHA1(2b5175835c587caccafb73a1a5c8abf8f8463cf4) )
+	ROM_LOAD32_WORD("U13 Triple Treat.bin", 0x0200002, 0x0080000, CRC(0a0b0ce1) SHA1(41a4d613cf1828df1832c087f0bc18d31076f056) )
+	ROM_LOAD32_WORD("U7 Triple Treat.bin", 0x0000000, 0x0080000, CRC(7bc25bba) SHA1(d5f7c3a4bc3c652f57ee4cdbc883ec82069365d1) )
+	ROM_LOAD32_WORD("U8 Triple Treat.bin", 0x0100000, 0x0080000, CRC(ef976f78) SHA1(d2c89e8d3bf6af112a99354133f308a5aabad46e) )
+	ROM_LOAD32_WORD("U9 Triple Treat.bin", 0x0200000, 0x0080000, CRC(776fbfd2) SHA1(27820dbc6ee1424706aea9c4574da117636fef17) )
+ROM_END_REGIONS
+
+
+
+ROM_START( trjhrs )
+	ARISTOCRAT_MK5_BIOS
+	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
+	ROM_LOAD32_WORD("TROJANHORSE_U11.BIN", 0x0000002, 0x0080000, CRC(8c04ed89) SHA1(6727da3a457841e893e27bc8f10d4bb58a61f338) )
+	ROM_LOAD32_WORD("TROJANHORSE_U12.BIN", 0x0100002, 0x0080000, CRC(1eb021a4) SHA1(3195eb5923da018b6c2dac10b70c47aef54dca35) )
+	ROM_LOAD32_WORD("TROJANHORSE_U13.BIN", 0x0200002, 0x0080000, CRC(b6d1ceb6) SHA1(b41200620aaa905697ac73b4c86496a53f070ed3) )
+	ROM_LOAD32_WORD("TROJANHORSE_U7.bin", 0x0000000, 0x0080000, CRC(7be0caf5) SHA1(b83fba7eb4624b3dc56f763b48b7c45fe31f3396) )
+	ROM_LOAD32_WORD("TROJANHORSE_U8.bin", 0x0100000, 0x0080000, CRC(246d3693) SHA1(8c8b893c21e9a486fd36677d7157787bf5d6237b) )
+	ROM_LOAD32_WORD("TROJANHORSE_U9.bin", 0x0200000, 0x0080000, CRC(15dee624) SHA1(d678ef7c25419342a1512fab84394e99309009ec) )
+ROM_END_REGIONS
+
+
+
+
+
+
+
+
+ROM_START( wildbill )
+	ARISTOCRAT_MK5_BIOS
+	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
+	ROM_LOAD32_WORD("Wild Bill U11.BIN", 0x0000002, 0x0080000, CRC(57b3c340) SHA1(4f95ed7fed697cf2bfbde8215f6e35768cf20334) )
+	ROM_LOAD32_WORD("Wild Bill U7.bin", 0x0000000, 0x0080000, CRC(e3117ab7) SHA1(c13912f524f1c1d373adb6382ceddd1bc18f7f02) )
+ROM_END_REGIONS
+
+
+
+ROM_START( wldcoug )
+	ARISTOCRAT_MK5_BIOS
+	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
+	ROM_LOAD32_WORD("Wild Cougar  U11.BIN", 0x0000002, 0x0080000, CRC(6a5f2c41) SHA1(1365e083d44a373c2d4f17e8e61ec716ffb6d2d5) )
+	ROM_LOAD32_WORD("Wild Cougar  U12.BIN", 0x0100002, 0x0080000, CRC(85bb41a7) SHA1(335f29f10f216e202b93b46a376958c3f5271461) )
+	ROM_LOAD32_WORD("Wild Cougar  U7.bin", 0x0000000, 0x0080000, CRC(47154679) SHA1(21749fbaa60f9bf1db43bdd272e6628ae73bf759) )
+	ROM_LOAD32_WORD("Wild Cougar  U8.bin", 0x0100000, 0x0080000, CRC(c262d098) SHA1(87940bd0aef6cb0f5ff21ccda4b209eef8e97eb1) )
+ROM_END_REGIONS
+
+
+
+
+
+ROM_START( chariotca )
+	ARISTOCRAT_MK5_BIOS
+	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
+	ROM_LOAD32_WORD("U11.BIN", 0x0000002, 0x0080000, CRC(bcbf9de9) SHA1(191ce749fe0d29b2783fb78d9338a00d65104daa) )
+	ROM_LOAD32_WORD("U12.BIN", 0x0100002, 0x0080000, CRC(b44cf571) SHA1(04447820e015425493cade5611b3eb2f21e48c2e) )
+	ROM_LOAD32_WORD("U7.bin", 0x0000000, 0x0080000, CRC(845f9913) SHA1(df6121290b30ff4a9c2d0e690cf8e7797e9a8612) )
+	ROM_LOAD32_WORD("U8.bin", 0x0100000, 0x0080000, CRC(a3a74ecb) SHA1(52b3a41573a9fa1de05ce01a858e400f80e595b8) )
+ROM_END_REGIONS
+
+
+
+ROM_START( chkmatar )
+	ARISTOCRAT_MK5_BIOS
+	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
+	ROM_LOAD32_WORD("U11.BIN", 0x0000002, 0x0080000, CRC(5fb7bfb3) SHA1(2ad8b3c4753d19f9e3254ef3f4059951d7a111b4) )
+	ROM_LOAD32_WORD("U12.BIN", 0x0100002, 0x0080000, CRC(b538bcbc) SHA1(cda404f9b16e7e76a33c208f62a5ac9c5e02aac4) )
+	ROM_LOAD32_WORD("U13.BIN", 0x0200002, 0x0080000, CRC(ad12a718) SHA1(0c36729cb8da800668f533f65fcc870f5dfc0f6a) )
+	ROM_LOAD32_WORD("U7.bin", 0x0000000, 0x0080000, CRC(059b940e) SHA1(f637508dafbd37169429c495a893addbc6d28834) )
+	ROM_LOAD32_WORD("U8.bin", 0x0100000, 0x0080000, CRC(6912cc4a) SHA1(9469a6a0d2fd39d85655a8c7bc0668752f5f11fa) )
+	ROM_LOAD32_WORD("U9.bin", 0x0200000, 0x0080000, CRC(53a573f0) SHA1(d51d698dcec273d157319200ad1c215e930b96ce) )
+ROM_END_REGIONS
+
+
+
+
+ROM_START( kgalah )
+	ARISTOCRAT_MK5_BIOS
+	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
+	ROM_LOAD32_WORD("U11.BIN", 0x0000002, 0x0080000, CRC(2b52a5e2) SHA1(0c852c6672a46f269f1407db0dd1825a51f242cc) )
+	ROM_LOAD32_WORD("U12.BIN", 0x0100002, 0x0080000, CRC(15d5bfb4) SHA1(7c48dabfd83cc30fe2ffd0b4de63fbc9dc56ee2f) )
+	ROM_LOAD32_WORD("U7.bin", 0x0000000, 0x0080000, CRC(9333543a) SHA1(dbbd59de046c35e70e71836b342eb5ecf4799575) )
+	ROM_LOAD32_WORD("U8.bin", 0x0100000, 0x0080000, CRC(08bea3b7) SHA1(9a5d8cf60c9643061dede926a04006a9a674fd8f) )
+ROM_END_REGIONS
+
+
+
+
+
+
+ROM_START( qonilea )
+	ARISTOCRAT_MK5_BIOS
+	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
+	ROM_LOAD32_WORD("QUEENOFTHENILE_U11.BIN", 0x0000002, 0x0080000, CRC(ca4fe491) SHA1(2bd799f95c9a5afb7c96305bf56413ba864a26dd) )
+	ROM_LOAD32_WORD("QUEENOFTHENILE_U12.BIN", 0x0100002, 0x0080000, CRC(bdcec4eb) SHA1(ef3658460263cd2e68e10015efdc016ad705213e) )
+	ROM_LOAD32_WORD("QUEENOFTHENILE_U7.bin", 0x0000000, 0x0080000, CRC(f359afcf) SHA1(a8cbaea899f0108a179c58ec97241a57227afa79) )
+	ROM_LOAD32_WORD("QUEENOFTHENILE_U8.bin", 0x0100000, 0x0080000, CRC(80efde3a) SHA1(1fac1b150c5c8c52a4caaa01c4571a0e7033278d) )
+ROM_END_REGIONS
+
+
+
+
+
+
+
+ROM_START( qonileb )
+	ARISTOCRAT_MK5_BIOS
+	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
+	ROM_LOAD32_WORD("U11.BIN", 0x0000002, 0x0080000, CRC(b5b76fb0) SHA1(40cb57e168f7884d64f6779e4e3b532c69df63b8) )
+	ROM_LOAD32_WORD("U12.BIN", 0x0100002, 0x0080000, CRC(52bd3694) SHA1(bcfa3054c7577f7a1653b756828d048a5f1776e7) )
+	ROM_LOAD32_WORD("U7.bin", 0x0000000, 0x0080000, CRC(0076da68) SHA1(ed301c102e88d5b637144ed32042da46780e5b34) )
+	ROM_LOAD32_WORD("U8.bin", 0x0100000, 0x0080000, CRC(a6b856a2) SHA1(2a9ea01f64fa56dea86b0cd25e19dace34c17d0f) )
+ROM_END_REGIONS
+
+
+
+ROM_START( rwarhl )
+	ARISTOCRAT_MK5_BIOS
+	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
+	ROM_LOAD32_WORD("U10.bin", 0x0300000, 0x0080000, CRC(39f5861f) SHA1(c614ebe2c324d5c3fff32379300f2869fba49d39) )
+	ROM_LOAD32_WORD("U11.BIN", 0x0000002, 0x0080000, CRC(4170c68d) SHA1(bc00af27bcc176f8d9c9fd0ec1a7139e28f85113) )
+	ROM_LOAD32_WORD("U12.BIN", 0x0100002, 0x0080000, CRC(b8afd281) SHA1(2d73b5af667d36e8b29e9fc3cc62f220daeffbb9) )
+	ROM_LOAD32_WORD("U13.BIN", 0x0200002, 0x0080000, CRC(36debb0e) SHA1(4aaa495f74dfb13aa1dc47f3a8af8e54496c1ab8) )
+	ROM_LOAD32_WORD("U14.bin", 0x0300002, 0x0080000, CRC(92274626) SHA1(fae8d89efba9bf3d171bfe484015d009786ce40d) )
+	ROM_LOAD32_WORD("U7.bin", 0x0000000, 0x0080000, CRC(68d9bf78) SHA1(6170ea26ebc732abbc26ba1da35a081c8aa8d154) )
+	ROM_LOAD32_WORD("U8.bin", 0x0100000, 0x0080000, CRC(98ebea6f) SHA1(2d78cec777581a87bb4b84e7acd183b237c83e52) )
+	ROM_LOAD32_WORD("U9.bin", 0x0200000, 0x0080000, CRC(eb7d7af6) SHA1(a11e8029b0d5ef9bb8c51fea4e9f0a051cdb2eaf) )
+ROM_END_REGIONS
+
+
+
+
+ROM_START( retrsam )
+	ARISTOCRAT_MK5_BIOS
+	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
+	ROM_LOAD32_WORD("U11.BIN", 0x0000002, 0x0080000, CRC(b91f5d4c) SHA1(8116166a759405b97797b4acb2cc3e139bd12de7) )
+	ROM_LOAD32_WORD("U12.BIN", 0x0100002, 0x0080000, CRC(fdf22d5b) SHA1(664fa003a350c0a3b515b7c384d32176158c2d3e) )
+	ROM_LOAD32_WORD("u7.bin", 0x0000000, 0x0080000, CRC(129be82c) SHA1(487639b7d42d6d35a9c48b44d26667c269b5b633) )
+	ROM_LOAD32_WORD("U8.bin", 0x0100000, 0x0080000, CRC(8d0e61a8) SHA1(254b106e71a0888b0456afd8d63006d72c0ba292) )
+ROM_END_REGIONS
+
+
+ROM_START( unicornd )
+	ARISTOCRAT_MK5_BIOS
+	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
+	ROM_LOAD32_WORD("unicorndreaming_U11.BIN", 0x0000002, 0x0080000, CRC(b45885f1) SHA1(e32d4afce4e3e62a324173252f559909ea97fe3a) )
+	ROM_LOAD32_WORD("unicorndreaming_U12.BIN", 0x0100002, 0x0080000, CRC(14afdeda) SHA1(1eb2a297e903dc1a0683425b37669e0af4ae4218) )
+	ROM_LOAD32_WORD("unicorndreaming_u7.bin", 0x0000000, 0x0080000, CRC(d785d1b3) SHA1(4aa7c61036dd5fe1cdbc6c39a89881f88f3dd148) )
+	ROM_LOAD32_WORD("unicorndreaming_U8.bin", 0x0100000, 0x0080000, CRC(6ba8f7eb) SHA1(bd5b15e22e713095f580b4c371d39af4af9e3289) )
+ROM_END_REGIONS
+
+
+
+
+
 /*************************
 *      Game Drivers      *
 *************************/
@@ -1381,3 +2026,55 @@ GAME( 2001, geishanz,  0,        aristmk5,     aristmk5, aristmk5_state, aristmk
 GAME( 2001, adonise,   aristmk5, aristmk5_usa, aristmk5, aristmk5_state, aristmk5, ROT0,  "Aristocrat", "Adonis (MV4124/1, Export)",                      MACHINE_FLAGS )  // MV4124/1, B - 31/07/01
 GAME( 2001, koalamnt,  aristmk5, aristmk5_usa, aristmk5, aristmk5_state, aristmk5, ROT0,  "Aristocrat", "Koala Mint (MV4137, Export)",                    MACHINE_FLAGS )  // MV4137,   A - 12/09/01
 GAME( 2001, partygrs,  aristmk5, aristmk5_usa, aristmk5, aristmk5_state, aristmk5, ROT0,  "Aristocrat", "Party Gras (MV4115/6, Export)",                  MACHINE_FLAGS )  // MV4115/6, A - 10/11/01
+
+GAME( 199?, badbog,  aristmk5, aristmk5_usa, aristmk5, aristmk5_state, aristmk5, ROT0, "Aristocrat", "Bad Bog Draw Poker",                 MACHINE_FLAGS )
+GAME( 199?, blackpnt,  aristmk5, aristmk5_usa, aristmk5, aristmk5_state, aristmk5, ROT0, "Aristocrat", "Black Panther (Aristocrat)",                 MACHINE_FLAGS )
+GAME( 199?, bootscot,  aristmk5, aristmk5_usa, aristmk5, aristmk5_state, aristmk5, ROT0, "Aristocrat", "Boot Scootin",                 MACHINE_FLAGS )
+GAME( 199?, bumbugs,  aristmk5, aristmk5_usa, aristmk5, aristmk5_state, aristmk5, ROT0, "Aristocrat", "Bumble Bugs",                 MACHINE_FLAGS )
+GAME( 199?, butdeli,  aristmk5, aristmk5_usa, aristmk5, aristmk5_state, aristmk5, ROT0, "Aristocrat", "Butterfly Delight",                 MACHINE_FLAGS )
+GAME( 199?, cashchm,  aristmk5, aristmk5_usa, aristmk5, aristmk5_state, aristmk5, ROT0, "Aristocrat", "Cash Chameleon",                 MACHINE_FLAGS )
+GAME( 199?, cashcroa,  aristmk5, aristmk5_usa, aristmk5, aristmk5_state, aristmk5, ROT0, "Aristocrat", "Cash Crop",                 MACHINE_FLAGS )
+GAME( 199?, chkrun,  aristmk5, aristmk5_usa, aristmk5, aristmk5_state, aristmk5, ROT0, "Aristocrat", "Chicken Run",                 MACHINE_FLAGS )
+GAME( 199?, coralr2v, aristmk5, aristmk5_usa, aristmk5, aristmk5_state, aristmk5, ROT0, "Aristocrat", "Coral Riches 2",                 MACHINE_FLAGS )
+GAME( 199?, cuckooa,  aristmk5, aristmk5_usa, aristmk5, aristmk5_state, aristmk5, ROT0, "Aristocrat", "Cuckoo",                 MACHINE_FLAGS )
+GAME( 199?, dstblom,  aristmk5, aristmk5_usa, aristmk5, aristmk5_state, aristmk5, ROT0, "Aristocrat", "Desert Bloom",                 MACHINE_FLAGS )
+GAME( 199?, dmddove,  aristmk5, aristmk5_usa, aristmk5, aristmk5_state, aristmk5, ROT0, "Aristocrat", "Diamond Dove",                 MACHINE_FLAGS )
+GAME( 199?, drawpka,  aristmk5, aristmk5_usa, aristmk5, aristmk5_state, aristmk5, ROT0, "Aristocrat", "Draw Poker",                 MACHINE_FLAGS )
+GAME( 199?, dyjack,  aristmk5, aristmk5_usa, aristmk5, aristmk5_state, aristmk5, ROT0, "Aristocrat", "Dynamite Jack",                 MACHINE_FLAGS )
+GAME( 199?, eldora,  aristmk5, aristmk5_usa, aristmk5, aristmk5_state, aristmk5, ROT0, "Aristocrat", "El Dorado",                 MACHINE_FLAGS )
+GAME( 199?, fortela,  aristmk5, aristmk5_usa, aristmk5, aristmk5_state, aristmk5, ROT0, "Aristocrat", "Fortune Teller",                 MACHINE_FLAGS )
+GAME( 199?, genmagi,  aristmk5, aristmk5_usa, aristmk5, aristmk5_state, aristmk5, ROT0, "Aristocrat", "Genie Magic",                 MACHINE_FLAGS )
+GAME( 199?, gnomatw,  aristmk5, aristmk5_usa, aristmk5, aristmk5_state, aristmk5, ROT0, "Aristocrat", "Gnome Around The World",                 MACHINE_FLAGS )
+GAME( 199?, goldra,  aristmk5, aristmk5_usa, aristmk5, aristmk5_state, aristmk5, ROT0, "Aristocrat", "Golden Ra",                 MACHINE_FLAGS )
+GAME( 199?, hrttrhb,  aristmk5, aristmk5_usa, aristmk5, aristmk5_state, aristmk5, ROT0, "Aristocrat", "Heart Throb",                 MACHINE_FLAGS )
+GAME( 199?, incsun,  aristmk5, aristmk5_usa, aristmk5, aristmk5_state, aristmk5, ROT0, "Aristocrat", "Inca Sun",                 MACHINE_FLAGS )
+GAME( 199?, kookabk,  aristmk5, aristmk5_usa, aristmk5, aristmk5_state, aristmk5, ROT0, "Aristocrat", "Kooka Bucks",                 MACHINE_FLAGS )
+GAME( 199?, locoloot,  aristmk5, aristmk5_usa, aristmk5, aristmk5_state, aristmk5, ROT0, "Aristocrat", "Loco Loot",                 MACHINE_FLAGS )
+GAME( 199?, lonwolf,  aristmk5, aristmk5_usa, aristmk5, aristmk5_state, aristmk5, ROT0, "Aristocrat", "Lone Wolf",                 MACHINE_FLAGS )
+GAME( 199?, mgctouc,  aristmk5, aristmk5_usa, aristmk5, aristmk5_state, aristmk5, ROT0, "Aristocrat", "Magic Touch",                 MACHINE_FLAGS )
+GAME( 199?, monmous,  aristmk5, aristmk5_usa, aristmk5, aristmk5_state, aristmk5, ROT0, "Aristocrat", "Money Mouse",                 MACHINE_FLAGS )
+GAME( 199?, moutmon,  aristmk5, aristmk5_usa, aristmk5, aristmk5_state, aristmk5, ROT0, "Aristocrat", "Mountain Money",                 MACHINE_FLAGS )
+GAME( 199?, mystgrd,  aristmk5, aristmk5_usa, aristmk5, aristmk5_state, aristmk5, ROT0, "Aristocrat", "Mystic Garden",                 MACHINE_FLAGS )
+GAME( 199?, orchidms,  aristmk5, aristmk5_usa, aristmk5, aristmk5_state, aristmk5, ROT0, "Aristocrat", "Orchid Mist",                 MACHINE_FLAGS )
+GAME( 199?, oscarar,  aristmk5, aristmk5_usa, aristmk5, aristmk5_state, aristmk5, ROT0, "Aristocrat", "Oscar",                 MACHINE_FLAGS )
+GAME( 199?, pantmag,  aristmk5, aristmk5_usa, aristmk5, aristmk5_state, aristmk5, ROT0, "Aristocrat", "Panther Magic",                 MACHINE_FLAGS )
+GAME( 199?, peaflut,  aristmk5, aristmk5_usa, aristmk5, aristmk5_state, aristmk5, ROT0, "Aristocrat", "Peacock Flutter",                 MACHINE_FLAGS )
+GAME( 199?, pengpay,  aristmk5, aristmk5_usa, aristmk5, aristmk5_state, aristmk5, ROT0, "Aristocrat", "Penguin Pays",                 MACHINE_FLAGS )
+GAME( 199?, przfigha,  aristmk5, aristmk5_usa, aristmk5, aristmk5_state, aristmk5, ROT0, "Aristocrat", "Prize Fight",                 MACHINE_FLAGS )
+GAME( 199?, qncsh,  aristmk5, aristmk5_usa, aristmk5, aristmk5_state, aristmk5, ROT0, "Aristocrat", "Queens of Cash",                 MACHINE_FLAGS )
+GAME( 199?, sumospin,  aristmk5, aristmk5_usa, aristmk5, aristmk5_state, aristmk5, ROT0, "Aristocrat", "Sumo Spins",                 MACHINE_FLAGS )
+GAME( 199?, sbucks3,  aristmk5, aristmk5_usa, aristmk5, aristmk5_state, aristmk5, ROT0, "Aristocrat", "Superbucks 3",                 MACHINE_FLAGS )
+GAME( 199?, tretrva,  aristmk5, aristmk5_usa, aristmk5, aristmk5_state, aristmk5, ROT0, "Aristocrat", "Treasure Trove",                 MACHINE_FLAGS )
+GAME( 199?, triptrea,  aristmk5, aristmk5_usa, aristmk5, aristmk5_state, aristmk5, ROT0, "Aristocrat", "Triple Treat",                 MACHINE_FLAGS )
+GAME( 199?, trjhrs,  aristmk5, aristmk5_usa, aristmk5, aristmk5_state, aristmk5, ROT0, "Aristocrat", "Trojan Horse",                 MACHINE_FLAGS )
+GAME( 199?, wildbill,  aristmk5, aristmk5_usa, aristmk5, aristmk5_state, aristmk5, ROT0, "Aristocrat", "Wild Bill",                 MACHINE_FLAGS )
+GAME( 199?, wldcoug,  aristmk5, aristmk5_usa, aristmk5, aristmk5_state, aristmk5, ROT0, "Aristocrat", "Wild Cougar",                 MACHINE_FLAGS )
+GAME( 199?, chariotca,  chariotc, aristmk5_usa, aristmk5, aristmk5_state, aristmk5, ROT0, "Aristocrat", "Chariot Challenge (0100787V)",                 MACHINE_FLAGS )
+GAME( 199?, chkmatar,  aristmk5, aristmk5_usa, aristmk5, aristmk5_state, aristmk5, ROT0, "Aristocrat", "Checkmate (01J00681)",                 MACHINE_FLAGS )
+GAME( 199?, kgalah,  aristmk5, aristmk5_usa, aristmk5, aristmk5_state, aristmk5, ROT0, "Aristocrat", "King Galah (0200536V)",                 MACHINE_FLAGS )
+GAME( 199?, qonilea,  aristmk5, aristmk5_usa, aristmk5, aristmk5_state, aristmk5, ROT0, "Aristocrat", "Queen Of The Nile (0100439V)",                 MACHINE_FLAGS )
+GAME( 199?, qonileb,  aristmk5, aristmk5_usa, aristmk5, aristmk5_state, aristmk5, ROT0, "Aristocrat", "Queen Of The Nile (0300440V)",                 MACHINE_FLAGS )
+GAME( 199?,rwarhl,  aristmk5, aristmk5_usa, aristmk5, aristmk5_state, aristmk5, ROT0, "Aristocrat", "Rainbow Warrior Hyperlink (0101332V)",                 MACHINE_FLAGS )
+GAME( 199?, retrsam,  aristmk5, aristmk5_usa, aristmk5, aristmk5_state, aristmk5, ROT0, "Aristocrat", "Return Of The Samurai (0400549V)",                 MACHINE_FLAGS )
+GAME( 199?, unicornd,  aristmk5, aristmk5_usa, aristmk5, aristmk5_state, aristmk5, ROT0, "Aristocrat", "Unicorn Dreaming",                 MACHINE_FLAGS )
+
diff --git a/src/mame/drivers/aristmk6.cpp b/src/mame/drivers/aristmk6.cpp
index d47506361c2..2d63c08a1d9 100644
--- a/src/mame/drivers/aristmk6.cpp
+++ b/src/mame/drivers/aristmk6.cpp
@@ -245,7 +245,42 @@ MACHINE_CONFIG_END
 	ROM_LOAD32_WORD_BIOS( 0, "15011025.u70", 0x0000002, 0x0200000, CRC(c02e14b0) SHA1(6bf98927813519dfe60e582dbe5be3ccd87f7c91) ) \
 	ROM_SYSTEM_BIOS( 1, "bios1",   "Aristocrat MK6 Base (11011901, NSW/ACT)" ) \
 	ROM_LOAD32_WORD_BIOS( 1, "11011901.u83", 0x0000000, 0x0200000, CRC(73dcb11c) SHA1(69ae4f32a0c9141b2a82ff3935b0cd20333d2964) ) \
-	ROM_LOAD32_WORD_BIOS( 1, "11011901.u70", 0x0000002, 0x0200000, CRC(d3dd2210) SHA1(3548f8cc39859d3f44a55f6bae48966a2d48e0eb) )
+	ROM_LOAD32_WORD_BIOS( 1, "11011901.u70", 0x0000002, 0x0200000, CRC(d3dd2210) SHA1(3548f8cc39859d3f44a55f6bae48966a2d48e0eb) ) \
+	ROM_SYSTEM_BIOS( 2, "bios2",   "Aristocrat MK6 Base (19012801)" ) \
+	ROM_LOAD32_WORD_BIOS( 2, "19012801 System Left.bin", 0x0000000, 0x0200000, CRC(b03bd17c) SHA1(f281e80f6dda5b727ed71d2deebe3b0ff548773f) ) /* From Cactus Corral & Cashman Tonight & Heart of Begas & Moonlight Waltz */ \
+	ROM_LOAD32_WORD_BIOS( 2, "19012801 System Right.bin", 0x0000000, 0x0200000, CRC(5b20a96c) SHA1(5fd916b7cc2cdd51bf7dd212c1114f94dc9c7926) ) \
+	ROM_SYSTEM_BIOS( 3, "bios3",   "Aristocrat MK6 Base ('system 13')" ) \
+	ROM_LOAD32_WORD_BIOS( 3, "System 13 Eprom Set -2MB-M27V160 Left.bin", 0x0000000, 0x0200000, CRC(38e8f659) SHA1(88c6acba99b0aca023c6f4d27c061c231490e9e0) ) /* from Grizzly */ \
+	ROM_LOAD32_WORD_BIOS( 3, "System 13 Eprom Set -2MB-M27V160 Right.bin", 0x0000000, 0x0200000, CRC(e627dbfa) SHA1(4fedbe0975ceb7dc0ebebf18a7708d78984db9b7) ) \
+	ROM_SYSTEM_BIOS( 4, "bios4",   "Aristocrat MK6 Base (07010801)" ) \
+	ROM_LOAD32_WORD_BIOS( 4, "07010801_SYSTEM_EPROM_NSW_LEFT.BIN", 0x0000000, 0x0200000, CRC(8e92af68) SHA1(00d2bb655b7964a9652896741210ec534df0b0d2) ) /* From Jailbreak */ \
+	ROM_LOAD32_WORD_BIOS( 4, "07010801_SYSTEM_EPROM_NSW_RIGHT.BIN", 0x0000000, 0x0200000, CRC(8c148c11) SHA1(5ff3be18455b4f04675fec8d5b9d881295c65e23) ) \
+	ROM_SYSTEM_BIOS( 5, "bios5",   "Aristocrat MK6 Base ('system 21')" ) \
+	ROM_LOAD32_WORD_BIOS( 5, "NSWsystem21_left.bin", 0x0000000, 0x0200000, CRC(0d271470) SHA1(5cd4b604bfe2fd7e9a8d08e1c7c97f17ae068479) ) /* From Red Baron */ \
+	ROM_LOAD32_WORD_BIOS( 5, "NSWsystem21_right.bin", 0x0000000, 0x0200000, CRC(757618f2) SHA1(43f9a3e7d544979f8c6974945914d9e099b02abd) ) \
+	ROM_SYSTEM_BIOS( 6, "bios6",   "Aristocrat MK6 Base (24013001)" ) \
+	ROM_LOAD32_WORD_BIOS( 6, "24013001   Left.bin", 0x0000000, 0x0200000, CRC(06ae7e07) SHA1(39a45575b66906d73b519988d1001c99b05c5f34) ) /* From Wild Stalion */ \
+	ROM_LOAD32_WORD_BIOS( 6, "24013001   Right.bin", 0x0000000, 0x0200000, CRC(e97afedf) SHA1(10ca3b015afaff5d7812f0f5207b2535602136a5) ) \
+	ROM_SYSTEM_BIOS( 7, "bios7",   "Aristocrat MK6 Base (system 04)" ) \
+	ROM_LOAD32_WORD_BIOS( 7, "System 04 Eprom Set -1MB-M27V800 Left.bin", 0x0000000, 0x0100000, CRC(21182775) SHA1(7c5b7f5aba3babc85f512a8f7d4ebc0d83eb842a) ) /* from Diamonds Forever */ \
+	ROM_LOAD32_WORD_BIOS( 7, "System 04 Eprom Set -1MB-M27V800 Right.bin", 0x0000000, 0x0100000, CRC(3daefb7a) SHA1(411471713219f4bab5ccf5fe7a12a6c138c8c550) ) \
+	ROM_SYSTEM_BIOS( 8, "bios8",   "Aristocrat MK6 Base (05010601)" ) \
+	ROM_LOAD32_WORD_BIOS( 8, "05010601_SYSTEM_EPROM_NSW_LEFT.BIN", 0x0000000, 0x0100000, CRC(b3e6b4a0) SHA1(3bf398c9257579f8e51ce716d6ebfa74fa510273) ) /* From Thai Princess & Venetian Nights */ \
+	ROM_LOAD32_WORD_BIOS( 8, "05010601_SYSTEM_EPROM_NSW_RIGHT.BIN", 0x0000000, 0x0100000, CRC(c12eac11) SHA1(683b9ddc323865ace7dca37d13b55de6e42759a5) )	 \
+	ROM_SYSTEM_BIOS( 9, "bios9",   "Aristocrat MK6 Base (13012001)" ) \
+	ROM_LOAD32_WORD_BIOS( 9, "System 13012001_left.bin", 0x0000000, 0x0400000, CRC(d346773f) SHA1(baa9103478fd667eecd13064cfa051a06763c6ca) ) /* From Queen of the Nile */ \
+	ROM_LOAD32_WORD_BIOS( 9, "System 13012001_right.bin", 0x0000000, 0x0400000, CRC(4c8bfa18) SHA1(cac4932a5b19ed8c2798693ac387cc1a6f0201c7) ) \
+	ROM_SYSTEM_BIOS( 10, "bios10",   "Aristocrat MK6 Base (02010201)" ) \
+	ROM_LOAD32_WORD_BIOS( 10, "System 02010201 Eprom Set -1MB-M27V800 U70.bin", 0x0000000, 0x0100000, CRC(9b2db442) SHA1(d512398a2d9257bd385dc50d61c63cd1a47300ba) ) /* From Money Tree & From Go For Green */ \
+	ROM_LOAD32_WORD_BIOS( 10, "System 02010201 Eprom Set -1MB-M27V800 U71.bin", 0x0000000, 0x0100000, CRC(24d5614a) SHA1(fdcf3826dccc72b74b66379b1411cf211d5a1670) ) \
+	ROM_LOAD32_WORD_BIOS( 10, "System 02010201 Eprom Set -1MB-M27V800 U83.bin", 0x0000000, 0x0100000, CRC(5f64a20c) SHA1(397404ab6d2a1aa3c1fc77bb9421fef7079b65a5) ) \
+	ROM_LOAD32_WORD_BIOS( 10, "System 02010201 Eprom Set -1MB-M27V800 U84.bin", 0x0000000, 0x0100000, CRC(0920930f) SHA1(771b0f62442d1c75b1bb59ad82365b7ab8747173) ) \
+	ROM_SYSTEM_BIOS( 11, "bios11",   "Aristocrat MK6 Base (02010114)" ) \
+	ROM_LOAD32_WORD_BIOS( 11, "02010114 System Set 1MB M27V800  U70.bin", 0x0000000, 0x0100000, CRC(3ba4379f) SHA1(84367f12c4c9224d2ab9cae83ae8727de338408c) ) /* from 'Arabian Nights' */ \
+	ROM_LOAD32_WORD_BIOS( 11, "02010114 System Set 1MB M27V800  U71.bin", 0x0000000, 0x0100000, CRC(8f83c3dd) SHA1(a5f9d80b4b515b24299d0241e1665cfd9da8bab7) ) \
+	ROM_LOAD32_WORD_BIOS( 11, "02010114 System Set 1MB M27V800  U83.bin", 0x0000000, 0x0100000, CRC(945104d7) SHA1(e372d0cf889c72b5d001b26fe4a925a28486537f) ) \
+	ROM_LOAD32_WORD_BIOS( 11, "02010114 System Set 1MB M27V800  U84.bin", 0x0000000, 0x0100000, CRC(183e3836) SHA1(4c802d0cd010bc007acb3a83e37aaa29b2d13d87) )
+	
 
 ROM_START( aristmk6 )
 	ARISTMK6_BIOS
@@ -1543,6 +1578,405 @@ ROM_END
 
 
 
+ROM_START( 5draga )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("5dragons_U72.bin", 0x0000000, 0x0400000, CRC(e81d47fe) SHA1(f5730f9b5fa9a4492289ddcbc8e88d0a62771667) )
+	ROM_LOAD32_WORD("5dragons_U73.bin", 0x0000000, 0x0400000, CRC(23cfdacd) SHA1(7efda9cc67214f68d674f1110cfb38fd9bbc4548) )
+	ROM_LOAD32_WORD("5dragons_U85.bin", 0x0000000, 0x0400000, CRC(12803341) SHA1(4b640c3f270eaa77ce71e87f83e603083bcae489) )
+	ROM_LOAD32_WORD("5dragons_U86.bin", 0x0000000, 0x0400000, CRC(ac83a71b) SHA1(1d6a3617e882e86100b939d62db7a7e1f86d2178) )
+ROM_END
+
+
+
+
+ROM_START( 5koipp )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("Gam_Eprm.u71", 0x0000000, 0x0400000, CRC(460e7ddb) SHA1(e6326523fb7c1c44cd0f01cd43d59d86a72c0d1d) )
+	ROM_LOAD32_WORD("Gam_Eprm.u72", 0x0000000, 0x0400000, CRC(1a1140f2) SHA1(c097bcdcbd61edd15382f7becc32384780fb6e8e) )
+	ROM_LOAD32_WORD("Gam_Eprm.u73", 0x0000000, 0x0400000, CRC(13fbfa4d) SHA1(8a9ba4fcea44f1ababa9ee89e36c8cd63b935ac5) )
+	ROM_LOAD32_WORD("Gam_Eprm.u84", 0x0000000, 0x0400000, CRC(413063ce) SHA1(4e933e1c0e576b028c16ab6f4630ee61575a5850) )
+	ROM_LOAD32_WORD("Gam_Eprm.u85", 0x0000000, 0x0400000, CRC(2ce103f8) SHA1(eb457c0812f08e3a0b4450e44a80c5e13c131ea9) )
+	ROM_LOAD32_WORD("Gam_Eprm.u86", 0x0000000, 0x0400000, CRC(a245db85) SHA1(a03cf7978531edbc0ec1ba97e12fd59589caa90d) )
+ROM_END
+
+
+
+ROM_START( amzteml )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("Gam_Eprm.u71", 0x0000000, 0x0400000, CRC(8b6ef913) SHA1(7cc8688cb9c6096a81ad21cdc046db5bd0134356) )
+	ROM_LOAD32_WORD("Gam_Eprm.u72", 0x0000000, 0x0400000, CRC(ca0b23ac) SHA1(4514e691f5926608a1624a91751f50469e234ed4) )
+	ROM_LOAD32_WORD("Gam_Eprm.u73", 0x0000000, 0x0400000, CRC(b11fb5a0) SHA1(ebd78bcf1a06878c8a50fe078379f590ec6bc3e2) )
+	ROM_LOAD32_WORD("Gam_Eprm.u84", 0x0000000, 0x0400000, CRC(aa689460) SHA1(111130f65ad4bb235e8722befb41b947d7d47c4e) )
+	ROM_LOAD32_WORD("Gam_Eprm.u85", 0x0000000, 0x0400000, CRC(887449d7) SHA1(a1b00d8205f9eb45ad2b3ec73422bc06673d68e0) )
+	ROM_LOAD32_WORD("Gam_Eprm.u86", 0x0000000, 0x0400000, CRC(c001c1e7) SHA1(bf8958325f90d2a04a6c86075df664b29b7073ca) )
+ROM_END
+
+
+
+
+
+
+
+
+
+
+ROM_START( buffaloa )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("buffalo.u72", 0x0000000, 0x0400000, CRC(2a35e7df) SHA1(112ea1872bc3b8533e1339f8eb19ef9ea0740773) )
+	ROM_LOAD32_WORD("buffalo.u73", 0x0000000, 0x0400000, CRC(46061814) SHA1(9a149d1edabc4a7ab8e30df9a08390a320b9b472) )
+	ROM_LOAD32_WORD("buffalo.u85", 0x0000000, 0x0400000, CRC(8e5ac194) SHA1(5e7a84d5211cb4e797aa04f21220e72f9d4f4694) )
+	ROM_LOAD32_WORD("buffalo.u86", 0x0000000, 0x0400000, CRC(8bee03c5) SHA1(46b39fe0b18c09764e7c7ac44838eb80df536100) )
+ROM_END
+
+
+
+
+
+ROM_START( cactusco )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("Cactus Corral U72.bin", 0x0000000, 0x0400000, CRC(90d72135) SHA1(fb4a4ad984ff1103e2e951919132f79cb7af9ec5) )
+	ROM_LOAD32_WORD("Cactus Corral U73.bin", 0x0000000, 0x0400000, CRC(b2f2149d) SHA1(8f53b168555bc255d3dc9fb94d2d6dd466b7f3e4) )
+	ROM_LOAD32_WORD("Cactus Corral U85.bin", 0x0000000, 0x0400000, CRC(e0130bf6) SHA1(84f7c2b5c10155ee92bcc02d6c3dca0acf55ed27) )
+	ROM_LOAD32_WORD("Cactus Corral U86.bin", 0x0000000, 0x0400000, CRC(bd7a64ed) SHA1(0047467954eabc718b5355e61f2756fd9e29aabc) )
+ROM_END
+
+
+
+ROM_START( callwlar )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("Call Of The Wild U71.bin", 0x0000000, 0x0400000, CRC(ed7dc53a) SHA1(686326580fe1a58685341d82ae5697fd216b88b6) )
+	ROM_LOAD32_WORD("Call Of The Wild U72.bin", 0x0000000, 0x0400000, CRC(8ee4f3e7) SHA1(553487a4c2915e9621330d6a8cd621dd6b4e38d3) )
+	ROM_LOAD32_WORD("Call Of The Wild U73.bin", 0x0000000, 0x0400000, CRC(36231cad) SHA1(9230ef7bb8433c611754b4625a64bef3931aba0d) )
+	ROM_LOAD32_WORD("Call Of The Wild U84.bin", 0x0000000, 0x0400000, CRC(c6d27e00) SHA1(4f81922c0f3f82f48a8354d1a81283f06aaa9fb6) )
+	ROM_LOAD32_WORD("Call Of The Wild U85.bin", 0x0000000, 0x0400000, CRC(725dad93) SHA1(7228e3637331450667ed872e48a6693846a5b87a) )
+	ROM_LOAD32_WORD("Call Of The Wild U86.bin", 0x0000000, 0x0400000, CRC(80b28091) SHA1(c27f57c7bfe797463ddd203304d9be58918aa586) )
+ROM_END
+
+
+
+
+
+
+
+
+ROM_START( deepfrz )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("Gam_Eprm.u71", 0x0000000, 0x0400000, CRC(7fde4cb0) SHA1(6ecfdaab82d2b2f30e0d122dee08b7e0848e0cea) )
+	ROM_LOAD32_WORD("Gam_Eprm.u72", 0x0000000, 0x0400000, CRC(a024e1e0) SHA1(5d4d6ab51aef1668e05b9296c7204c0b24c5f473) )
+	ROM_LOAD32_WORD("Gam_Eprm.u73", 0x0000000, 0x0400000, CRC(de7c52eb) SHA1(6291a9f032c164d000a75b24a19dc9e8fb9184a1) )
+	ROM_LOAD32_WORD("Gam_Eprm.u84", 0x0000000, 0x0400000, CRC(9bc78342) SHA1(91f99679eda7d0b8bfcb8cc741bf5d9e9ed6c2d4) )
+	ROM_LOAD32_WORD("Gam_Eprm.u85", 0x0000000, 0x0400000, CRC(30040885) SHA1(0f0f4cc3cd7ee70c03099bdeec60313c16a21c70) )
+	ROM_LOAD32_WORD("Gam_Eprm.u86", 0x0000000, 0x0400000, CRC(82187e66) SHA1(bb8bb2c50ab722d0e8d7e2e0d6b4be095fa1d3b3) )
+ROM_END
+
+
+
+
+
+
+ROM_START( drmred )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("dream of the red chamber-U72.bin", 0x0000000, 0x0400000, CRC(5a4e369a) SHA1(f50424edae6e912ef6d40f2e2e769c2002349c0a) )
+	ROM_LOAD32_WORD("dream of the red chamber-U73.bin", 0x0000000, 0x0400000, CRC(a38db22b) SHA1(e83485525a46741a7d97c36341c529d9643f2dd9) )
+	ROM_LOAD32_WORD("dream of the red chamber-U85.bin", 0x0000000, 0x0400000, CRC(b2640b58) SHA1(79e8085ae36a2f03a7e57e21cccaeb4bbe122f8e) )
+	ROM_LOAD32_WORD("dream of the red chamber-U86.bin", 0x0000000, 0x0400000, CRC(69e4a089) SHA1(505de7f61ff74d73da32aaf105b1ff9d5083094a) )
+ROM_END
+
+
+
+
+
+ROM_START( encspela )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("Gam_Eprm.u71", 0x0000000, 0x0400000, CRC(7f91f73f) SHA1(5b70ffe30047d68bf521ee773ff3c323d1678e83) )
+	ROM_LOAD32_WORD("Gam_Eprm.u72", 0x0000000, 0x0400000, CRC(651cb916) SHA1(caae7e9122b51352eb0befbc422c20866caeb92c) )
+	ROM_LOAD32_WORD("Gam_Eprm.u73", 0x0000000, 0x0400000, CRC(969cf792) SHA1(0c44ed0ab3a5c11a171e7615ced9234bbbd9f2c9) )
+	ROM_LOAD32_WORD("Gam_Eprm.u84", 0x0000000, 0x0400000, CRC(5d351e99) SHA1(ad492bc56d804a298c05f67746f3e1664084a0f2) )
+	ROM_LOAD32_WORD("Gam_Eprm.u85", 0x0000000, 0x0400000, CRC(a6a4bcf2) SHA1(5ee43d090d7505db2be59064bb1fdbcf3b29b16b) )
+	ROM_LOAD32_WORD("Gam_Eprm.u86", 0x0000000, 0x0400000, CRC(1b65e345) SHA1(2eba34cbbdbf939bb2241c95e610ee4d97ef6258) )
+ROM_END
+
+
+
+
+ROM_START( fortath )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("u72.bin", 0x0000000, 0x0400000, CRC(90e481a0) SHA1(b73045e1f8602f17e6d0f9d9f5718c7e7cd0dd81) )
+	ROM_LOAD32_WORD("u73.bin", 0x0000000, 0x0400000, CRC(4f361938) SHA1(51c23d09ba7cc7c73559e10b023962e7eb7059ed) )
+	ROM_LOAD32_WORD("u85.bin", 0x0000000, 0x0400000, CRC(0b33c40b) SHA1(055ac1528a2008a4b481db201b95dabf8531d6e4) )
+	ROM_LOAD32_WORD("u86.bin", 0x0000000, 0x0400000, CRC(39274d5c) SHA1(ef01c3f010800ece44ccb50be7cf14af538e21fc) )
+ROM_END
+
+
+
+
+ROM_START( goldsam )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("Golden Samuri U71.bin", 0x0000000, 0x0400000, CRC(b5d9eb6f) SHA1(c614073463e60cc3fe379b81215324fa9e150948) )
+	ROM_LOAD32_WORD("Golden Samuri U72.bin", 0x0000000, 0x0400000, CRC(33967413) SHA1(ceb6aa9937dc5087298dfad8f3b2edc5cc8dd8a1) )
+	ROM_LOAD32_WORD("Golden Samuri U73.bin", 0x0000000, 0x0400000, CRC(dc0c374b) SHA1(5e4b1800aa69863aa537aec72285e2ffaccf0aee) )
+	ROM_LOAD32_WORD("Golden Samuri U84.bin", 0x0000000, 0x0400000, CRC(7c9b075a) SHA1(9d0095d2219747610c060b99b612d3a1353ed561) )
+	ROM_LOAD32_WORD("Golden Samuri U85.bin", 0x0000000, 0x0400000, CRC(d1f22168) SHA1(a63e6856f73fc2642edd59b18282ad69e32b3310) )
+	ROM_LOAD32_WORD("Golden Samuri U86.bin", 0x0000000, 0x0400000, CRC(b888e6ab) SHA1(a3df344fa1a1419ef4f4225e808189d4acffdc86) )
+ROM_END
+
+
+
+
+
+
+
+ROM_START( inddrma )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("Indian Dreaming U72", 0x0000000, 0x0400000, CRC(92c75004) SHA1(6baa35896dd51c17ab5818919616a217b8b2e4dd) )
+	ROM_LOAD32_WORD("Indian Dreaming U73", 0x0000000, 0x0400000, CRC(41279ab8) SHA1(3f275669036ef07d7a0b6ebb1ea58ca5fde963e0) )
+	ROM_LOAD32_WORD("Indian Dreaming U85", 0x0000000, 0x0400000, CRC(ec18c9ea) SHA1(e3150499e7ad4a2e63aa3c070089c8267eefa5af) )
+	ROM_LOAD32_WORD("Indian Dreaming U86", 0x0000000, 0x0400000, CRC(bea8f843) SHA1(e8f345c2ff5f751e64bb945827826e481d376377) )
+ROM_END
+
+
+
+
+
+
+ROM_START( luck88 )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("Gam_Eprm.u71", 0x0000000, 0x0400000, CRC(f0e88142) SHA1(52271aa7dbdc99cff2a8e5230210758f4534f3bd) )
+	ROM_LOAD32_WORD("Gam_Eprm.u72", 0x0000000, 0x0400000, CRC(e3d58454) SHA1(a6bfcdb0a047712e77957d2e472bb300a758f12b) )
+	ROM_LOAD32_WORD("Gam_Eprm.u73", 0x0000000, 0x0400000, CRC(94b7d07e) SHA1(c12cf2da50791262ef85d0a08e897f87185c359d) )
+	ROM_LOAD32_WORD("Gam_Eprm.u84", 0x0000000, 0x0400000, CRC(eb338e37) SHA1(d795d24c38e654695b8122262bcdd0641f720e58) )
+	ROM_LOAD32_WORD("Gam_Eprm.u85", 0x0000000, 0x0400000, CRC(6c08de75) SHA1(ffadb5181bd82239bf616c1773ccb10dc06549a5) )
+	ROM_LOAD32_WORD("Gam_Eprm.u86", 0x0000000, 0x0400000, CRC(ae09bfd7) SHA1(65f068e947a26b7b56db6b3a94691a50a002970d) )
+ROM_END
+
+
+
+
+
+ROM_START( milkin )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("Gam_Eprm.u71", 0x0000000, 0x0400000, CRC(a5c83ff6) SHA1(b5eb551ab93e57c4978243909893d872b0192e08) )
+	ROM_LOAD32_WORD("Gam_Eprm.u72", 0x0000000, 0x0400000, CRC(e855f155) SHA1(5a065eb205832781b9a565b9f87f7638d52a1a4b) )
+	ROM_LOAD32_WORD("Gam_Eprm.u73", 0x0000000, 0x0400000, CRC(a20e4928) SHA1(a8fb46a250fe11652c5ccd2253be9aff9e6cae8b) )
+	ROM_LOAD32_WORD("Gam_Eprm.u84", 0x0000000, 0x0400000, CRC(fc0a3315) SHA1(0871a0c6a87d0197d9dfd631006426b6522d61b8) )
+	ROM_LOAD32_WORD("Gam_Eprm.u85", 0x0000000, 0x0400000, CRC(00186fab) SHA1(7c84808ed6f20118a79eebe1730f2fa0ef989d97) )
+	ROM_LOAD32_WORD("Gam_Eprm.u86", 0x0000000, 0x0400000, CRC(eb66636c) SHA1(48216f1f72fc6714cc1876d71489bccaa1624b2e) )
+ROM_END
+
+
+
+
+ROM_START( moonwalt )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("Moonlight Waltz U72.bin", 0x0000000, 0x0400000, CRC(80e26c8a) SHA1(5f8b01d18210d5997bbf7966d1bf4353dadc4f7d) )
+	ROM_LOAD32_WORD("Moonlight Waltz U73.bin", 0x0000000, 0x0400000, CRC(8272e787) SHA1(b0b44fa4af0fdd3f66bd117d748ed874379ed131) )
+	ROM_LOAD32_WORD("Moonlight Waltz U85.bin", 0x0000000, 0x0400000, CRC(44f56b6f) SHA1(7706301d9e40e6197aa509c972129b016d60bf34) )
+	ROM_LOAD32_WORD("Moonlight Waltz U86.bin", 0x0000000, 0x0400000, CRC(cb21b264) SHA1(ecc1804c0fd399019e3496ae6ea0a6ea125562f2) )
+ROM_END
+
+
+
+ROM_START( mchilli )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("Gam_Eprm.u72", 0x0000000, 0x0400000, CRC(85f98b61) SHA1(1ebd8caef5f163a75e185c3fa3c001517f676890) )
+	ROM_LOAD32_WORD("Gam_Eprm.u73", 0x0000000, 0x0400000, CRC(da883738) SHA1(74f5cdb7b388dec17a0e4d8a04c2107bd07c3ad7) )
+	ROM_LOAD32_WORD("Gam_Eprm.u85", 0x0000000, 0x0400000, CRC(ac11dab3) SHA1(3a201a5e239b10dcdd23aed3b0d724146f2fcf68) )
+	ROM_LOAD32_WORD("Gam_Eprm.u86", 0x0000000, 0x0400000, CRC(1f5207d7) SHA1(73c3742a94962a66df7af6eff660f90e7e22e344) )
+ROM_END
+
+
+
+
+ROM_START( pcfava )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("Players Choice-Favourites U71.bin", 0x0000000, 0x0400000, CRC(116bb514) SHA1(cd3dcca730c8e9d3fe5b0c70638f3d81f8eb8f98) )
+	ROM_LOAD32_WORD("Players Choice-Favourites U72.bin", 0x0000000, 0x0400000, CRC(9b0fb8b6) SHA1(bd5a2734068e031ca7ab0f19749f28f84288125f) )
+	ROM_LOAD32_WORD("Players Choice-Favourites U73.bin", 0x0000000, 0x0400000, CRC(72db5268) SHA1(de7f3619162b27bab4825f801eb1a04cce8721a3) )
+	ROM_LOAD32_WORD("Players Choice-Favourites U84.bin", 0x0000000, 0x0400000, CRC(7944e972) SHA1(23d45a2e948a737d3186de5f0447ec7dd51ddc7b) )
+	ROM_LOAD32_WORD("Players Choice-Favourites U85.bin", 0x0000000, 0x0400000, CRC(385e8636) SHA1(5e4bf33f91481080c80264b915a11606b03f8686) )
+	ROM_LOAD32_WORD("Players Choice-Favourites U86.bin", 0x0000000, 0x0400000, CRC(f06d4fbb) SHA1(aad9c37da2ee9f7a5252267f39a9d1e8169a2472) )
+ROM_END
+
+
+
+ROM_START( pcmostw )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("Gam_Eprm.u71", 0x0000000, 0x0400000, CRC(6b67d71e) SHA1(902f832c79f160b22c02222eefa5ec31285b7610) )
+	ROM_LOAD32_WORD("Gam_Eprm.u72", 0x0000000, 0x0400000, CRC(d6f86683) SHA1(0e5ca980010bf40bba01d7222bc4d241b9d86667) )
+	ROM_LOAD32_WORD("Gam_Eprm.u73", 0x0000000, 0x0400000, CRC(a26a224e) SHA1(222e3b067f4bde826ae19276bb48136896cbd853) )
+	ROM_LOAD32_WORD("Gam_Eprm.u84", 0x0000000, 0x0400000, CRC(da762c17) SHA1(44c5bfee805d0ee8209e7b37161921d652b4d83b) )
+	ROM_LOAD32_WORD("Gam_Eprm.u85", 0x0000000, 0x0400000, CRC(214a647f) SHA1(51b250ecf49776ab9dfe80cb2efdc685109f0c19) )
+	ROM_LOAD32_WORD("Gam_Eprm.u86", 0x0000000, 0x0400000, CRC(7f460e25) SHA1(d97150221a3c0cac3b46d147ae96937a871ecdb3) )
+ROM_END
+
+
+ROM_START( pcnewz )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("Gam_Eprm.u70", 0x0000000, 0x0400000, CRC(1d67f455) SHA1(4247d21757522a69184d32434cfa191a026aff19) )
+	ROM_LOAD32_WORD("Gam_Eprm.u71", 0x0000000, 0x0400000, CRC(8df4d7da) SHA1(a798424a514201d954519ec0daf0a2b1cbc00082) )
+	ROM_LOAD32_WORD("Gam_Eprm.u72", 0x0000000, 0x0400000, CRC(db6e9523) SHA1(a4a272af4f5f29d2e612b52a011f9daf7c0b0cd3) )
+	ROM_LOAD32_WORD("Gam_Eprm.u73", 0x0000000, 0x0400000, CRC(6072d8d3) SHA1(37ce2a4213024b9ccd1859701c48e76e6c64e6ee) )
+	ROM_LOAD32_WORD("Gam_Eprm.u83", 0x0000000, 0x0400000, CRC(5709ba3a) SHA1(4fd85b97f434656b3bd0d26ba8573e3cd2c936ce) )
+	ROM_LOAD32_WORD("Gam_Eprm.u84", 0x0000000, 0x0400000, CRC(5927770a) SHA1(faaec01280a54775e85ae796a7d05170bece3c87) )
+	ROM_LOAD32_WORD("Gam_Eprm.u85", 0x0000000, 0x0400000, CRC(6208432e) SHA1(50006d010dd3d061fef8f4fd8fbbffea1b9b0f3d) )
+	ROM_LOAD32_WORD("Gam_Eprm.u86", 0x0000000, 0x0400000, CRC(bb839c90) SHA1(268008ffeeb867210664928a521051978c7770b3) )
+ROM_END
+
+
+
+
+
+ROM_START( rumbrel )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("Rumble Reels L0.bin", 0x0000000, 0x0400000, CRC(06b37c77) SHA1(e4dad62667a1c1d4948abcd535332975148e952b) )
+	ROM_LOAD32_WORD("Rumble Reels L1.bin", 0x0000000, 0x0400000, CRC(739c4565) SHA1(bc2cd133dfbfe18916703eacc851f1757a06f345) )
+	ROM_LOAD32_WORD("Rumble Reels L2.bin", 0x0000000, 0x0400000, CRC(2f561bd0) SHA1(9c2f659ec5cdfd335d089389616dac57fbb655df) )
+	ROM_LOAD32_WORD("Rumble Reels L3.bin", 0x0000000, 0x0400000, CRC(6bf0442e) SHA1(c83ed68cd0680ebac359824defa51c1942db17f1) )
+	ROM_LOAD32_WORD("Rumble Reels L4.bin", 0x0000000, 0x0400000, CRC(3cd5171b) SHA1(fe6e17679f14ae0238c58dd5d801cb0dda3a434b) )
+	ROM_LOAD32_WORD("Rumble Reels R0.bin", 0x0000000, 0x0400000, CRC(cc48bb54) SHA1(6ed7a502deaff0e2fd6d0901d036fcbadf303859) )
+	ROM_LOAD32_WORD("Rumble Reels R1.bin", 0x0000000, 0x0400000, CRC(3af99e7b) SHA1(93e68056fee9b4f29a066bd6828ff320b7d3ffa4) )
+	ROM_LOAD32_WORD("Rumble Reels R2.bin", 0x0000000, 0x0400000, CRC(04b2f09d) SHA1(4090876cf8ef18ed8541f13684b076d7ac1d0d72) )
+	ROM_LOAD32_WORD("Rumble Reels R3.bin", 0x0000000, 0x0400000, CRC(a117e3ec) SHA1(119d7ac89ee4c2167b853d720eb87498cefab4b9) )
+	ROM_LOAD32_WORD("Rumble Reels R4.bin", 0x0000000, 0x0400000, CRC(2c5baf9f) SHA1(40fb5b22460b9a35ca8ebb8b0643e58665d8643f) )
+ROM_END
+
+
+
+
+ROM_START( shamnmg )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("shamans magic.u72", 0x0000000, 0x0400000, CRC(aab1dd80) SHA1(0e8fbc967c4d5c7d24f980afc78464052ca6d2a6) )
+	ROM_LOAD32_WORD("shamans magic.u73", 0x0000000, 0x0400000, CRC(f1e9d86d) SHA1(282961a897bbfec4ab778db207f3ef20c6f4c69d) )
+	ROM_LOAD32_WORD("shamans magic.u85", 0x0000000, 0x0400000, CRC(15bb6dd5) SHA1(96625e18b622d2a02f9a88d51ad90d5dac0289be) )
+	ROM_LOAD32_WORD("shamans magic.u86", 0x0000000, 0x0400000, CRC(9c29e10b) SHA1(9f77808162d038461f77075f0565c0a0d34a708a) )
+ROM_END
+
+
+
+
+
+ROM_START( skydncra )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("Sky Dancer U71.bin", 0x0000000, 0x0400000, CRC(d30c3d6f) SHA1(581a198d98f00c1b7a432ab85b5f65760e364131) )
+	ROM_LOAD32_WORD("Sky Dancer U72.bin", 0x0000000, 0x0400000, CRC(12d02b67) SHA1(aed879daca62575def363872650d33b7af7d71bb) )
+	ROM_LOAD32_WORD("Sky Dancer U73.bin", 0x0000000, 0x0400000, CRC(f90fc640) SHA1(07b523839ac36b07d3dbc4d24e6d987c1f644095) )
+	ROM_LOAD32_WORD("Sky Dancer U84.bin", 0x0000000, 0x0400000, CRC(df6885af) SHA1(e3302defbc496c1b71da6be8ed49dd4d3556d7d4) )
+	ROM_LOAD32_WORD("Sky Dancer U85.bin", 0x0000000, 0x0400000, CRC(4a9a7c33) SHA1(e3243fa32b6736140992ad9fcf04a420bd417846) )
+	ROM_LOAD32_WORD("Sky Dancer U86.bin", 0x0000000, 0x0400000, CRC(81c0b79d) SHA1(ec84ded928637f8888d0caa935ab8d64c647a536) )
+ROM_END
+
+
+
+
+
+
+
+ROM_START( buckstop )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("Gam_Eprm.u72", 0x0000000, 0x0400000, CRC(de8c0100) SHA1(d27668584094c56f2840d87fc481ce03e7278dd8) )
+	ROM_LOAD32_WORD("Gam_Eprm.u74", 0x0000000, 0x0400000, CRC(0a55ae9d) SHA1(25cfc1c4ddb5a3c26fd024f0be166763739e84e4) )
+	ROM_LOAD32_WORD("Gam_Eprm.u85", 0x0000000, 0x0400000, CRC(d2a29b6b) SHA1(4bfc7a6ea5d1251f57bbea52b25353f696f7e63e) )
+	ROM_LOAD32_WORD("Gam_Eprm.u86", 0x0000000, 0x0400000, CRC(b21c6704) SHA1(2181f3491f020400dfa0b79864860fb002ee5a7f) )
+ROM_END
+
+
+
+
+
+ROM_START( tikitalk )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("Tiki Talk U73.bin", 0x0000000, 0x0400000, CRC(983d8621) SHA1(92ad28c0a7a06035569700adb8c3449f92bb36b7) )
+	ROM_LOAD32_WORD("Tiki Talk U86.bin", 0x0000000, 0x0400000, CRC(772312e1) SHA1(5a5561d9ec70b56e558ad87ead0770ac9f18e9d1) )
+ROM_END
+
+
+
+
+
+
+
+
+
+ROM_START( werewild )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("Gam_Eprm.u71", 0x0000000, 0x0400000, CRC(cc1a8ecc) SHA1(857ec89411720e7d451c76dfe4821c721f84ad06) )
+	ROM_LOAD32_WORD("Gam_Eprm.u72", 0x0000000, 0x0400000, CRC(08e7d250) SHA1(e57a5da1fe9b1a2e0b775a881cf52f89a287b340) )
+	ROM_LOAD32_WORD("Gam_Eprm.u73", 0x0000000, 0x0400000, CRC(2d653677) SHA1(653de0cb045772c1fe533bfba6188b697b5d40bb) )
+	ROM_LOAD32_WORD("Gam_Eprm.u84", 0x0000000, 0x0400000, CRC(42cece50) SHA1(3da725f4711e2eddab3fbd1b365cd79049ccaefa) )
+	ROM_LOAD32_WORD("Gam_Eprm.u85", 0x0000000, 0x0400000, CRC(0f9af5cf) SHA1(da58075cbb9104b656c5ece827980ac42185bb6a) )
+	ROM_LOAD32_WORD("Gam_Eprm.u86", 0x0000000, 0x0400000, CRC(c8a6321d) SHA1(60278ac3b055d94e67da4041efa76d4b66431cc0) )
+ROM_END
+
+
+
+
+ROM_START( wldcatsa )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("Wild Cats U72.bin", 0x0000000, 0x0400000, CRC(f0707ab9) SHA1(f30d77c53dfbc43e9468f2cb91529e44ce10c59e) )
+	ROM_LOAD32_WORD("Wild Cats U73.bin", 0x0000000, 0x0400000, CRC(0300f5ff) SHA1(52d640b676cd42dfab2c38108dd765c8e8092528) )
+	ROM_LOAD32_WORD("Wild Cats U85.bin", 0x0000000, 0x0400000, CRC(687c4bd6) SHA1(548de5a9887dfc58353b7a2861447bc9cd5f955e) )
+	ROM_LOAD32_WORD("Wild Cats U86.bin", 0x0000000, 0x0400000, CRC(f95e6ba6) SHA1(8d787d96d7b3cc3cde0be49a54701c2d3f70c659) )
+ROM_END
+
+
+
+
+ROM_START( wgorilla )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("Gam_Eprm.u72", 0x0000000, 0x0400000, CRC(e5a4e6f5) SHA1(f63fdc4771433f9953190b9cae4d7cbc4f6e374f) )
+	ROM_LOAD32_WORD("Gam_Eprm.u73", 0x0000000, 0x0400000, CRC(7588c213) SHA1(b1d0ec23b8c668ae40664329a5f6a45b24f6ef2f) )
+	ROM_LOAD32_WORD("Gam_Eprm.u85", 0x0000000, 0x0400000, CRC(28049860) SHA1(cace39a0121127ead7c8550153372283e1610a96) )
+	ROM_LOAD32_WORD("Gam_Eprm.u86", 0x0000000, 0x0400000, CRC(c8f15db2) SHA1(feaf68f442c96367db374772db57619ea5c01bca) )
+ROM_END
+
+
+
+
+ROM_START( bluetigr )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("Gam_Eprm.u72", 0x0000000, 0x0400000, CRC(f81af522) SHA1(5b7be10820f18ffa360726d20370faa1ecc1b3f8) )
+	ROM_LOAD32_WORD("Gam_Eprm.u73", 0x0000000, 0x0400000, CRC(bc2a4fb8) SHA1(74ba00873a4a00d0839d89bb2d9dbed5fc33bff7) )
+	ROM_LOAD32_WORD("Gam_Eprm.u85", 0x0000000, 0x0400000, CRC(e175ef6d) SHA1(13933044f905c0fde96ff05c6afdce189160a5e2) )
+	ROM_LOAD32_WORD("Gam_Eprm.u86", 0x0000000, 0x0400000, CRC(a31f97d8) SHA1(67ec087cbb8f733c0f0314b58b4884fe3cc3ad8c) )
+ROM_END
+
+
+
+
+
+
+
+
+
+
 
 GAME( 2000, aristmk6,  0,          aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Aristocrat MK6 System Software",           MACHINE_NOT_WORKING | MACHINE_NO_SOUND | MACHINE_IS_BIOS_ROOT)
 
@@ -1560,7 +1994,7 @@ GAME( 2003, thaiprin,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, R
 
 
 GAME( 200?, 100lions,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "100 Lions",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
-GAME( 200?, 5dragons,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "5 Dragons",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, 5dragons,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "5 Dragons (Demo?)",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
 GAME( 200?, adustcm,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "African Dusk Mr Cashman",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
 GAME( 200?, alchemya,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Alchemy",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
 GAME( 200?, amzqnar,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Amazon Queen",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
@@ -1572,7 +2006,7 @@ GAME( 200?, birredar,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, R
 GAME( 200?, blkbrum,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Black Brumby",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
 GAME( 200?, brazilar,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Brazil",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
 GAME( 200?, bucanar,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Bucaneer",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
-GAME( 200?, buffalar,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Buffalo",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, buffalar,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Buffalo (set 2)",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
 GAME( 200?, bushrngr,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Bush Ranger",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
 GAME( 200?, calyking,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Calypso King",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
 GAME( 200?, canary2,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Canary Riches 2",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
@@ -1636,7 +2070,7 @@ GAME( 200?, pharpor,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, RO
 GAME( 200?, phxfant,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Phoenix Fantasy",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
 GAME( 200?, piratar,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Pirates",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
 GAME( 200?, pcbydem,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Players Choice By Demand",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
-GAME( 200?, pcfav,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Players Choice Favourites",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, pcfav,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Players Choice Favourites (set 1)",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
 GAME( 200?, pompeiar,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Pompei",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
 GAME( 200?, prideaf,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Pride Of Africa",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
 GAME( 200?, prophar,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Prophecy",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
@@ -1676,6 +2110,35 @@ GAME( 200?, wwaratah,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, R
 GAME( 200?, wwaysar,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Wild Ways",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
 GAME( 200?, wwaysll,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Wizard Ways Lady Luck",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
 GAME( 200?, zorrojp,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Zorro Jackpot",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, 5draga,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "5 Dragons",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, 5koipp,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "5 Koi Power Pay",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, amzteml,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Amazon Temple",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, buffaloa,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Buffalo",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, cactusco,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Cactus Corral",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, callwlar,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Call Of The Wild",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, deepfrz,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Deep Freeze",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, drmred,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Dream Of The Red Chamber",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, encspela,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Enchanted Spell",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, fortath,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Fortune of Athena",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, goldsam,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Golden Samurai",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, inddrma,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Indian Dreaming",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, luck88,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Lucky 88",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, milkin,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Milkin It",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, moonwalt,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Moonlight Waltz",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, mchilli,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "More Chilli",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, pcfava,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Players Choice Favourites (set 2)",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, pcmostw,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Players Choice Most Wanted",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, pcnewz,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Players Choice New Zealand",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, rumbrel,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Rumble  Reels",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, shamnmg,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Shamans Magic",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, skydncra,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Sky Dancer",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, buckstop,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "The Buck Stops Here",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, tikitalk,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Tiki Talk",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, werewild,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Werewolf Wild",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, wldcatsa,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Wild Cats",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, wgorilla,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Wild Gorilla",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, bluetigr,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Blue Tiger\20259511",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+
 
 
 /*
diff --git a/src/mame/mame.lst b/src/mame/mame.lst
index 8371825ca4f..e72f1ea3a56 100644
--- a/src/mame/mame.lst
+++ b/src/mame/mame.lst
@@ -1379,6 +1379,57 @@ thgamblr                        // (c) 1998
 trpdlght                        // (c) 1997
 wldcougr                        // (c) 1997
 wtiger                          // (c) 1999
+badbog
+blackpnt
+bootscot
+bumbugs
+butdeli
+cashchm
+cashcroa
+chkrun
+coralr2v
+cuckooa
+dstblom
+dmddove
+drawpka
+dyjack
+eldora
+fortela
+genmagi
+gnomatw
+goldra
+hrttrhb
+incsun
+kookabk
+locoloot
+lonwolf
+mgctouc
+monmous
+moutmon
+mystgrd
+orchidms
+oscarar
+pantmag
+peaflut
+pengpay
+przfigha
+qncsh
+sumospin
+sbucks3
+tretrva
+triptrea
+trjhrs
+wildbill
+wldcoug
+chariotca
+chkmatar
+kgalah
+qonilea
+qonileb
+rwarhl
+retrsam
+unicornd
+
 
 @source:aristmk6.cpp
 50lions                         // (c) 2002
@@ -1469,6 +1520,7 @@ pharpor
 phxfant
 piratar
 pcbydem
+pcfav
 pompeiar
 prideaf
 prophar
@@ -1508,6 +1560,34 @@ wwaratah
 wwaysar
 wwaysll
 zorrojp
+5draga
+5koipp
+amzteml
+buffaloa
+cactusco
+callwlar
+deepfrz
+drmred
+encspela
+fortath
+goldsam
+inddrma
+luck88
+milkin
+moonwalt
+mchilli
+pcfava
+pcmostw
+pcnewz
+rumbrel
+shamnmg
+skydncra
+buckstop
+tikitalk
+werewild
+wldcatsa
+wgorilla
+bluetigr
 
 @source:arkanoid.cpp
 ark1ball                        // bootleg

From b87741d3e1a81f03b9cafd0b658bb16e76bf131c Mon Sep 17 00:00:00 2001
From: David Haywood <mamehaze@users.noreply.github.com>
Date: Tue, 19 Apr 2016 05:30:10 +0100
Subject: [PATCH 086/122] part 3 (nw)

---
 src/mame/drivers/aristmk6.cpp | 970 +++++++++++++++++++++++++++++++++-
 src/mame/mame.lst             |  77 +++
 2 files changed, 1044 insertions(+), 3 deletions(-)

diff --git a/src/mame/drivers/aristmk6.cpp b/src/mame/drivers/aristmk6.cpp
index 2d63c08a1d9..c9f97af1a17 100644
--- a/src/mame/drivers/aristmk6.cpp
+++ b/src/mame/drivers/aristmk6.cpp
@@ -279,8 +279,20 @@ MACHINE_CONFIG_END
 	ROM_LOAD32_WORD_BIOS( 11, "02010114 System Set 1MB M27V800  U70.bin", 0x0000000, 0x0100000, CRC(3ba4379f) SHA1(84367f12c4c9224d2ab9cae83ae8727de338408c) ) /* from 'Arabian Nights' */ \
 	ROM_LOAD32_WORD_BIOS( 11, "02010114 System Set 1MB M27V800  U71.bin", 0x0000000, 0x0100000, CRC(8f83c3dd) SHA1(a5f9d80b4b515b24299d0241e1665cfd9da8bab7) ) \
 	ROM_LOAD32_WORD_BIOS( 11, "02010114 System Set 1MB M27V800  U83.bin", 0x0000000, 0x0100000, CRC(945104d7) SHA1(e372d0cf889c72b5d001b26fe4a925a28486537f) ) \
-	ROM_LOAD32_WORD_BIOS( 11, "02010114 System Set 1MB M27V800  U84.bin", 0x0000000, 0x0100000, CRC(183e3836) SHA1(4c802d0cd010bc007acb3a83e37aaa29b2d13d87) )
-	
+	ROM_LOAD32_WORD_BIOS( 11, "02010114 System Set 1MB M27V800  U84.bin", 0x0000000, 0x0100000, CRC(183e3836) SHA1(4c802d0cd010bc007acb3a83e37aaa29b2d13d87) ) \
+	ROM_SYSTEM_BIOS( 12, "bios12",   "Aristocrat MK6 Base (USA)" ) \
+	ROM_LOAD32_WORD_BIOS( 12, "system-base-.01.03.14.-u70-27v160.bin", 0x0000000, 0x0200000, CRC(7138fec4) SHA1(f81331d1875ac574d3e6c98be218ff25c6c7be5a) ) /* From Dave Dragon */ \
+	ROM_LOAD32_WORD_BIOS( 12, "system-base-.01.03.14.-u83-27v160", 0x0000000, 0x0200000, CRC(889ffd82) SHA1(9c98c9cdcf5f7d05095f11006418133029e9f0f8) ) \
+	ROM_SYSTEM_BIOS( 13, "bios13",   "Aristocrat MK6 Base (USA, set 2)" ) \
+	ROM_LOAD32_WORD_BIOS( 13, "system-base-u70-01.03.06-m27v160.bin", 0x0000000, 0x0200000, CRC(2f9d9a29) SHA1(fdebfaca9a579d7249379f19aef22fbfd66bf943) ) /* From Diamond Eyes US */ \
+	ROM_LOAD32_WORD_BIOS( 13, "system-base-u83-01.03.06-m27v160", 0x0000000, 0x0200000, CRC(bd48ca55) SHA1(8fb1576cbeb1c64c358880714740195d2e73e03e) ) \
+	ROM_SYSTEM_BIOS( 14, "bios14",   "Aristocrat MK6 Base (Set Chips, 06.02.20, USA)" ) \
+	ROM_LOAD32_WORD_BIOS( 14, "U70-03 Cs 0364A", 0x0000000, 0x0100000, CRC(199ed3b9) SHA1(e3ee81ffd713f09e35a10c38e4f59282e2c5cd30) ) \
+	ROM_LOAD32_WORD_BIOS( 14, "U83 -02 Cs 08DD", 0x0000000, 0x0100000, CRC(e4001f60) SHA1(5da34efb1ac0f7c84a48e09363d20cfecda4bcf1) ) \
+	ROM_SYSTEM_BIOS( 15, "bios15",   "Aristocrat MK6 Base (01.04.08, USA)" ) \
+	ROM_LOAD32_WORD_BIOS( 15, "base-01.04.08-u70-u20-left-cs-8509.bin", 0x0000000, 0x0200000, CRC(0dfcad10) SHA1(53798be000304aed38909f5fd8470a68bedd8229) ) /* from bubdul */ \
+	ROM_LOAD32_WORD_BIOS( 15, "base-01.04.08-u83-u10-right-cs-d74e.bin", 0x0000000, 0x0200000, CRC(95333304) SHA1(7afe49d6c5e4d6820f349778557daa88c5366a51) )
+
 
 ROM_START( aristmk6 )
 	ARISTMK6_BIOS
@@ -1970,6 +1982,881 @@ ROM_END
 
 
 
+ROM_START( 50lionr )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("50 Lions RR U71.005", 0x0000000, 0x0400000, CRC(412524b3) SHA1(ef724755616aad7fd484b5d5fcb6f6773e92b9b9) )
+	ROM_LOAD32_WORD("50 Lions RR U72.003", 0x0000000, 0x0400000, CRC(73c2795c) SHA1(bce64fedf84ab5374b07487f6b887c06abe1213a) )
+	ROM_LOAD32_WORD("50 Lions RR U73.001", 0x0000000, 0x0400000, CRC(eee56944) SHA1(b7eb97f7a59076997195edfe8676edbb712a6376) )
+	ROM_LOAD32_WORD("50 Lions RR U84.004", 0x0000000, 0x0400000, CRC(c6bd1e46) SHA1(2cf52574ce3f3726c723fc6fbf098c3177c46a37) )
+	ROM_LOAD32_WORD("50 Lions RR U85.002", 0x0000000, 0x0400000, CRC(809c54c0) SHA1(8a45601248c450f323e39a7397387cf0caf8beed) )
+	ROM_LOAD32_WORD("50 Lions RR U86.000", 0x0000000, 0x0400000, CRC(dacbe4ec) SHA1(af6118c1843f675155aa1b8d50f605ac60168370) )
+ROM_END
+
+
+
+
+
+ROM_START( beavbuk )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("b.001", 0x0000000, 0x0400000, CRC(89c840dd) SHA1(31ab84740d866202cc5dfec17dec677186b991c5) )
+	ROM_LOAD32_WORD("b.000", 0x0000000, 0x0400000, CRC(2de9d8e5) SHA1(aea9f2668effa60a627cf62cee45919aa3b669b0) )
+ROM_END
+
+
+
+
+
+ROM_START( aftrhrs )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("after hours.u72", 0x0000000, 0x0400000, CRC(a4bee8ab) SHA1(cac34f91459fa5902b85e4c8150e651fda68621e) )
+	ROM_LOAD32_WORD("after hours.u73", 0x0000000, 0x0400000, CRC(972c569b) SHA1(caf4aaeaf05a08e4751a8bf06378d6f64b26883d) )
+	ROM_LOAD32_WORD("after hours.u85", 0x0000000, 0x0400000, CRC(de79acdc) SHA1(d7d3d415f5261ab2b65ef1a1e93ccd3770124848) )
+	ROM_LOAD32_WORD("after hours.u86", 0x0000000, 0x0400000, CRC(099f7d16) SHA1(f4ccec1d3c194963a13894b41d35afa5a9191b75) )
+ROM_END
+
+
+
+ROM_START( atkgld )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("al the kings gold fbab.u73", 0x0000000, 0x0400000, CRC(01d8e945) SHA1(ed0568a599fe514a8dcba762835831388fede679) )
+	ROM_LOAD32_WORD("all the kings gold 11cb.u85", 0x0000000, 0x0400000, CRC(81f8c412) SHA1(15ace6c1fc36cb7004e7767aea5e30fe8b9acf8b) )
+	ROM_LOAD32_WORD("all the kings gold 786a.u86", 0x0000000, 0x0400000, CRC(dfd90fc4) SHA1(8881ae3102d87435585d04abd791f3f710cf5ed2) )
+	ROM_LOAD32_WORD("all the kings gold 8188.u72", 0x0000000, 0x0400000, CRC(0a360417) SHA1(f5224b6c03fe8cf0a341630086906c12a58321ed) )
+ROM_END
+
+
+
+ROM_START( apocof )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("apollo coffee.u72", 0x0000000, 0x01c0000, CRC(f3733388) SHA1(cf01799770b785a0f7527aedf627f16642a60ff3) )
+	ROM_LOAD32_WORD("apollo coffee.u73", 0x0000000, 0x0400000, CRC(675ee721) SHA1(3f4afe6196fc39c2544fc3731f39adef0198b9a3) )
+	ROM_LOAD32_WORD("apollo coffee.u85", 0x0000000, 0x0400000, CRC(daa8cc4f) SHA1(2a71c7dbd0691654b614fcd09dae4ff47a60b655) )
+	ROM_LOAD32_WORD("apollo coffee.u86", 0x0000000, 0x0400000, CRC(d1f0a2a6) SHA1(d88fd4153b9a5f655c7949883caf3f947a50652f) )
+ROM_END
+
+
+
+ROM_START( arbngts )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("arabiannights8cc5.u85", 0x0000000, 0x0400000, CRC(4063edd6) SHA1(bb8f8230bbad70af683d039c041e90d50a59ceed) )
+	ROM_LOAD32_WORD("arabiannightsa983.u72", 0x0000000, 0x0400000, CRC(214632ed) SHA1(31cb4cbecf9b938df5b93c1260feeb6265bb2152) )
+	ROM_LOAD32_WORD("arabiannightsc3cf.u86", 0x0000000, 0x0400000, CRC(ae1d3cd5) SHA1(e2cca9d9f3b205446e0f74292a784cfe65302bc8) )
+	ROM_LOAD32_WORD("arabiannightsd3ce.u73", 0x0000000, 0x0400000, CRC(a7835a67) SHA1(d7e2d60edeb553165b8be1b272c0d551e762ab33) )
+ROM_END
+
+
+ROM_START( arwincm )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("arctic-wins-mr-cashman-u72-m27v322-cs-0341.bin", 0x0000000, 0x0400000, CRC(3a133d96) SHA1(4c7dc422c3e0a81da1f81267d525e3a90a7d79d7) )
+	ROM_LOAD32_WORD("arctic-wins-mr-cashman-u73-m27v322-cs-bb15.bin", 0x0000000, 0x0400000, CRC(0c3e441c) SHA1(763879bae2b256c2c4edddc99507b3c54cbab976) )
+	ROM_LOAD32_WORD("arctic-wins-mr-cashman-u85-m27v322-cs-bf80.bin", 0x0000000, 0x0400000, CRC(498b2ab7) SHA1(7f1da5ff34572c1f27f9a0735b8a9571b34ac17e) )
+	ROM_LOAD32_WORD("arctic-wins-mr-cashman-u86-m27v322-cs-96c5.bin", 0x0000000, 0x0400000, CRC(961cca3d) SHA1(f5bd3fdb8863688a1bf96dcd74a261860a008952) )
+ROM_END
+
+
+
+ROM_START( arish )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("Arishinko U72.bin", 0x0000000, 0x0400000, CRC(08451014) SHA1(3dcda83503c361c93df27a0cd5edd4d68d2a735b) )
+	ROM_LOAD32_WORD("Arishinko U73.bin", 0x0000000, 0x0400000, CRC(631b26e7) SHA1(2520bce139f0bc57b70b93baf253b4ef2a52d531) )
+	ROM_LOAD32_WORD("Arishinko U85.bin", 0x0000000, 0x0400000, CRC(0ea3b484) SHA1(7c9ab129a1c49bcb36f264ce30071e5b9fbb8985) )
+	ROM_LOAD32_WORD("Arishinko U86.bin", 0x0000000, 0x0400000, CRC(ff9cf101) SHA1(1ae93eb26d2033b55ea5a28470a7c76183916ef4) )
+ROM_END
+
+
+
+ROM_START( asnprinc )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("asianprincess02e1.u72", 0x0000000, 0x0400000, CRC(917421ef) SHA1(87eb28c98e1901830cb2b779f5c4d569699d1b1e) )
+	ROM_LOAD32_WORD("asianprincess03f6.u85", 0x0000000, 0x0400000, CRC(c46cfe80) SHA1(294ddd29d5c13388096dc2551dc474f077e5d881) )
+	ROM_LOAD32_WORD("asianprincess3237.u73", 0x0000000, 0x0400000, CRC(b05400e0) SHA1(b0832ccfb1947738125f4afe557a246fffdd983c) )
+	ROM_LOAD32_WORD("asianprincessdbf7.u86", 0x0000000, 0x0400000, CRC(d0741b53) SHA1(29ede83b3c95d2e490dac66f60629238abc48bdd) )
+ROM_END
+
+
+
+ROM_START( blkmust )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("black mustang 3693.u73", 0x0000000, 0x0400000, CRC(986b58d9) SHA1(178de2a1bfaca3e859e9c948ce0626c5f31b303f) )
+	ROM_LOAD32_WORD("black mustang 52fb.u86", 0x0000000, 0x0400000, CRC(2637a658) SHA1(7ec96c15f0fef5862f3d4a37fe96ab893e986321) )
+	ROM_LOAD32_WORD("black mustang ce13.u85", 0x0000000, 0x0400000, CRC(6a089a8b) SHA1(20d8fd974cedef0a7f642dbfea9b2fe088e26de0) )
+	ROM_LOAD32_WORD("black mustang f004.u72", 0x0000000, 0x0400000, CRC(032bf21e) SHA1(65ac1f37dbee5d965e6499d7f8a2ace27856d233) )
+ROM_END
+
+
+
+
+ROM_START( bmbgs )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("bumble bugs27v322-u73-cs-730d.bin", 0x0000000, 0x0400000, CRC(79dd907f) SHA1(06352c55ff36a82f4d0550b1723667f3287c4923) )
+	ROM_LOAD32_WORD("bumble bugs27v322-u86-cs-d246.bin", 0x0000000, 0x0400000, CRC(f5c204f9) SHA1(592fac02d26ec5edffce862fcce67869430028dd) )
+ROM_END
+
+
+
+ROM_START( cinhell )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("chance hell u71.bin", 0x0000000, 0x0400000, CRC(f096865e) SHA1(c8091028dfaf43f7017c40a488d039bd6e1b0177) )
+	ROM_LOAD32_WORD("chance hell u72.bin", 0x0000000, 0x0400000, CRC(a6c1937d) SHA1(436bab41fabc9b991e4d8128abc5d7b1c627331e) )
+	ROM_LOAD32_WORD("chance hell u73.bin", 0x0000000, 0x0400000, CRC(d0a3c39d) SHA1(eff6a03042d175e6088dd7bada25791c7b404687) )
+	ROM_LOAD32_WORD("chance hell u84.bin", 0x0000000, 0x0400000, CRC(60427f98) SHA1(ff59b0e8bca48d29c08d1c7e672dc6318fcf9a10) )
+	ROM_LOAD32_WORD("chance hell u85.bin", 0x0000000, 0x0400000, CRC(44234acd) SHA1(384676e2fdeb1a216078826e0e4634d67e0d1be3) )
+	ROM_LOAD32_WORD("chance hell u86.bin", 0x0000000, 0x0400000, CRC(c064a4a6) SHA1(c3cc4326b92e690ee2df3ab2d58a809435d897c2) )
+ROM_END
+
+
+
+ROM_START( crspru )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("crystalsprings.u72", 0x0000000, 0x0400000, CRC(8864632c) SHA1(a3227831ee71bc01846a7400e14fb40e62770e7a) )
+	ROM_LOAD32_WORD("crystalsprings.u73", 0x0000000, 0x0400000, CRC(caa73d62) SHA1(5e41beb9ade7bd50cdc616ab3f016a6615778ea2) )
+	ROM_LOAD32_WORD("crystalsprings.u85", 0x0000000, 0x0400000, CRC(c7c542c1) SHA1(8b49969414ef3d5811c804f16dc78cba71279618) )
+	ROM_LOAD32_WORD("crystalsprings.u86", 0x0000000, 0x0400000, CRC(dcb920fc) SHA1(71ce2a4298c9012ef7724b206ab1270b25c8bf8d) )
+ROM_END
+
+
+
+ROM_START( davedrag )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("5-dragons-m27v322-u71-cs-645e.bin", 0x0000000, 0x0400000, CRC(a0f5999e) SHA1(0be0d58588adbdbc7b728f164538d03509f13fe5) )
+	ROM_LOAD32_WORD("5-dragons-m27v322-u72-cs-701c.bin", 0x0000000, 0x0400000, CRC(e399df66) SHA1(d85a8011ab62b899b18873e4296c12da4291870a) )
+	ROM_LOAD32_WORD("5-dragons-m27v322-u73-cs-967c", 0x0000000, 0x0400000, CRC(7298e59b) SHA1(b104aec9be996bacad74120f461ad8cd7ef96e09) )
+	ROM_LOAD32_WORD("5-dragons-m27v322-u84-cs-5378.bin", 0x0000000, 0x0400000, CRC(f37a1ce5) SHA1(8684d64b20e1fe853e3b0f1a31796cddeb8b0dee) )
+	ROM_LOAD32_WORD("5-dragons-m27v322-u85-cs-740b.bin", 0x0000000, 0x0400000, CRC(4af3cae0) SHA1(79eb28b403aacf3ec7f52a5b3ff9e59ea35933c6) )
+	ROM_LOAD32_WORD("5-dragons-m27v322-u86-cs-d591.bin", 0x0000000, 0x0400000, CRC(1c3fd707) SHA1(3a9fc3e865c43ae0afa31954b2372487eb729d8a) )
+ROM_END
+
+
+
+ROM_START( drfz6us )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("Deep Freeze U72.bin", 0x0000000, 0x0400000, CRC(bcfc43a6) SHA1(cd3b25005d67dc096b13b1d35eca9701f150e461) )
+	ROM_LOAD32_WORD("Deep Freeze U73.bin", 0x0000000, 0x0400000, CRC(80fc6979) SHA1(2a08852c930f4b732830da4761010cc87ef369fc) )
+	ROM_LOAD32_WORD("Deep Freeze U85.bin", 0x0000000, 0x0400000, CRC(ef3914cd) SHA1(e189180fb087636b6d07de5df934ed4c89e8477e) )
+	ROM_LOAD32_WORD("Deep Freeze U86.bin", 0x0000000, 0x0400000, CRC(7f98661d) SHA1(970dcba4c2f5b40702c33751c73541a22fbcdd26) )
+ROM_END
+
+
+
+ROM_START( dltbel )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("delta belle1do6.u73", 0x0000000, 0x0400000, CRC(721cb449) SHA1(10be95803f3b7e86a009cc665e847dd97aeb6749) )
+	ROM_LOAD32_WORD("delta belle8ffe.u72", 0x0000000, 0x0400000, CRC(d6f6e2c9) SHA1(590c9b2000bdd888100426017250688bef9d3c1c) )
+	ROM_LOAD32_WORD("delta belleeead.u86", 0x0000000, 0x0400000, CRC(ee2c3aad) SHA1(c3687c1447c3c324fa23f5f61d8b88139141a8d4) )
+	ROM_LOAD32_WORD("delta bellef080.u85", 0x0000000, 0x0400000, CRC(53eec755) SHA1(017cad59b8c25b7b24df869cb5d61867607cebb9) )
+ROM_END
+
+
+
+ROM_START( dmneyeus )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("diamond-eyes-m27v322-u71-cs-f0a9.bin", 0x0000000, 0x0400000, CRC(5706aa40) SHA1(d847bd0a4e210e3f065aa59129ee4654e3087909) )
+	ROM_LOAD32_WORD("diamond-eyes-m27v322-u72-cs-19be.bin", 0x0000000, 0x0400000, CRC(9f6b5923) SHA1(739d3848998ddbfaf577982c12d8edd19c348548) )
+	ROM_LOAD32_WORD("diamond-eyes-m27v322-u73-cs-08f9.bin", 0x0000000, 0x0400000, CRC(235ba6ca) SHA1(3534b4f74531a42543383b55a2c57853b1d3f4f1) )
+	ROM_LOAD32_WORD("diamond-eyes-m27v322-u84-cs-18ad.bin", 0x0000000, 0x0400000, CRC(6d0dea65) SHA1(ee23c0fe2ecb5adb5e383757ade9be17880e6b45) )
+	ROM_LOAD32_WORD("diamond-eyes-m27v322-u85-cs-176f.bin", 0x0000000, 0x0400000, CRC(f6ef5d9c) SHA1(94505a470ad65e75c6c984ec163ce92c558f491a) )
+	ROM_LOAD32_WORD("diamond-eyes-m27v322-u86-cs-68e5", 0x0000000, 0x0400000, CRC(926ce073) SHA1(12f0aa1e387f0f87be92afb9a917a30d51a63277) )
+ROM_END
+
+
+
+ROM_START( dmneye2 )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("diamondeyes484a.u72", 0x0000000, 0x0400000, CRC(f5f4d871) SHA1(e1a83ed4932602f460321bb2aaf648ef10711033) )
+	ROM_LOAD32_WORD("diamondeyes64c8.u86", 0x0000000, 0x0400000, CRC(dd6cab00) SHA1(27934d1262e91078c0ed3d12510d1157e7d0774f) )
+	ROM_LOAD32_WORD("diamondeyescec2.u73", 0x0000000, 0x0400000, CRC(a0c21ad9) SHA1(689c9fb61fc7864be22b22fbdac295ced28340db) )
+	ROM_LOAD32_WORD("diamondeyese259.u85", 0x0000000, 0x0400000, CRC(ca138b5c) SHA1(e0af5ac82b40f40af0438e4f6ce5d1e8d984d34d) )
+ROM_END
+
+
+
+ROM_START( dblagus )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("Double Agent U72.bin", 0x0000000, 0x0400000, CRC(fdb9a838) SHA1(83976af01273234d7eaeedba60164f9c31915e4b) )
+	ROM_LOAD32_WORD("Double Agent U73.bin", 0x0000000, 0x0400000, CRC(235e2cc8) SHA1(aaf1e71f4cdeb039e3c760031b07d7eb54467742) )
+	ROM_LOAD32_WORD("Double Agent U85.bin", 0x0000000, 0x0400000, CRC(4d482f50) SHA1(8105371d582bcc5a7d0e35f110f394fc491550cf) )
+	ROM_LOAD32_WORD("Double Agent U86.bin", 0x0000000, 0x0400000, CRC(d081a5f3) SHA1(0adfbdc36b70a26f858d353ee4381e5848d6e499) )
+ROM_END
+
+
+
+ROM_START( eaglrock )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("eaglerock.u72", 0x0000000, 0x0400000, CRC(c3ac8cfd) SHA1(ff2b45f49929dfa9aed44af2a1b204a96ed098fb) )
+	ROM_LOAD32_WORD("eaglerock.u73", 0x0000000, 0x0400000, CRC(ce3d4fd2) SHA1(ef784c2ae5151c7191cac66093cbc1f85155a4e9) )
+	ROM_LOAD32_WORD("eaglerock.u85", 0x0000000, 0x0400000, CRC(a3f768e9) SHA1(1b0b96368530d51280da81479e9a3b44fb719503) )
+	ROM_LOAD32_WORD("eaglerock.u86", 0x0000000, 0x0400000, CRC(0b0cff73) SHA1(ea1bbf9e00a5308c9e853e357f9ac4b32866a195) )
+ROM_END
+
+
+
+ROM_START( eastland )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("easterisland.u72", 0x0000000, 0x0400000, CRC(16159d21) SHA1(e3b15c84d2a6ef9b840456cecf290798b6e6961d) )
+	ROM_LOAD32_WORD("easterisland.u73", 0x0000000, 0x0400000, CRC(99591f11) SHA1(9d08d339ecb19682ace66f58b8aa98b62d958bec) )
+	ROM_LOAD32_WORD("easterisland.u85", 0x0000000, 0x0400000, CRC(1fb075e7) SHA1(f08f43e19e84b897f0c350a0b86431939947d3b0) )
+	ROM_LOAD32_WORD("easterisland.u86", 0x0000000, 0x0400000, CRC(f24bcc2d) SHA1(519d06b85b7c3a4025f029daa394423bc6e3b4a2) )
+ROM_END
+
+
+
+ROM_START( eggsrich )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("Eggstreme riches U72.bin", 0x0000000, 0x0400000, CRC(883274fd) SHA1(60e65e2f7f1774eac4520f5d96dbcd149ee69b91) )
+	ROM_LOAD32_WORD("Eggstreme riches U73.bin", 0x0000000, 0x0400000, CRC(d72f0fb0) SHA1(eedebb24d23899f4caffe7c79ae4ac51856df1b3) )
+	ROM_LOAD32_WORD("Eggstreme riches U85.bin", 0x0000000, 0x0400000, CRC(2cbd9e98) SHA1(dcd5df5a3c177992d13077fa434ef741e7607d89) )
+	ROM_LOAD32_WORD("Eggstreme riches U86.bin", 0x0000000, 0x0400000, CRC(9d3476d1) SHA1(983ababf1f8d65346c4cf89b7ac817156a64a636) )
+ROM_END
+
+
+
+ROM_START( efcashex )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("enchanted forest cshexprs.u72", 0x0000000, 0x0400000, CRC(f3ec21f4) SHA1(db9d98fe4788f27c33e84b612632feeea6d944c7) )
+	ROM_LOAD32_WORD("enchanted forest cshexprs.u73", 0x0000000, 0x0400000, CRC(d5c600ba) SHA1(e2eb729e29d66ba5614fce1f4bd5a4883b50c499) )
+	ROM_LOAD32_WORD("enchanted forest cshexprs.u85", 0x0000000, 0x00c0000, CRC(95cf5a7b) SHA1(ac5fbd83e2d73a1d6d55736d868c44396371e24e) ) // bad? missing other pairing too?
+ROM_END
+
+
+
+ROM_START( flamoly )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("flame of olympus-u72-27v322-cs-d20d.bin", 0x0000000, 0x0400000, CRC(29a66753) SHA1(7aedd4824a3afec74942fad5b84fd72b6ab242e7) )
+	ROM_LOAD32_WORD("flame of olympus-u73-27v322-cs-4068", 0x0000000, 0x0400000, CRC(aad37086) SHA1(76495ba46da0ae848ba290706be337c45afe6361) )
+	ROM_LOAD32_WORD("flame of olympus-u85-27v322-cs-d2c9", 0x0000000, 0x0400000, CRC(4fcd025d) SHA1(63aa8d0f5dd331e10c032cc5ac67516054db7c27) )
+	ROM_LOAD32_WORD("flame of olympus-u86-27v322-cs-1492", 0x0000000, 0x0400000, CRC(f06f3d69) SHA1(83e1d2f72275de836e170c1c10905cb6da58b90a) )
+ROM_END
+
+
+
+ROM_START( flamoly2 )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("flamesofolympusm27v322.u72", 0x0000000, 0x0400000, CRC(330c1988) SHA1(0d7dae49495c5b164121cd756d6e22af17a9b41b) )
+	ROM_LOAD32_WORD("flamesofolympusm27v322.u73", 0x0000000, 0x0400000, CRC(c8337682) SHA1(e87c5be62528e2e73659ce73a17d1ea21ed3ccf0) )
+	ROM_LOAD32_WORD("flamesofolympusm27v322.u85", 0x0000000, 0x0400000, CRC(2661893a) SHA1(4a79f0b638f5d4fdfa7dcc7661afe3ae1823e6ce) )
+	ROM_LOAD32_WORD("flamesofolympusm27v322.u86", 0x0000000, 0x0400000, CRC(2ea7c6d9) SHA1(cd887f0689737fd447786b966297ea3994fb8cb7) )
+ROM_END
+
+
+
+ROM_START( flamolus )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("Flames of Olympus U72 09ECD2D8.bin", 0x0000000, 0x0400000, CRC(1eb5d81a) SHA1(e3dbde32ce525e3070612d411326ca85a57c79fc) )
+	ROM_LOAD32_WORD("Flames of Olympus U73 1DCC4068.bin", 0x0000000, 0x0400000, CRC(aad37086) SHA1(76495ba46da0ae848ba290706be337c45afe6361) )
+	ROM_LOAD32_WORD("Flames of Olympus U85 09EFD2C9.bin", 0x0000000, 0x0400000, CRC(4fcd025d) SHA1(63aa8d0f5dd331e10c032cc5ac67516054db7c27) )
+	ROM_LOAD32_WORD("Flames of Olympus U86 1E2A1492.bin", 0x0000000, 0x0400000, CRC(f06f3d69) SHA1(83e1d2f72275de836e170c1c10905cb6da58b90a) )
+//	ROM_LOAD32_WORD("Set Chip 06.02.20 MK6.rar", 0x0000000, 0x00b121d, CRC(7dc71e5d) SHA1(37baae165df4cd11ad6e63f845cb76c51ab9f43a) )
+ROM_END
+
+
+
+ROM_START( foxred )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("foxworthy redneck.u72", 0x0000000, 0x0400000, CRC(ff2ff01d) SHA1(c0d17b3d9907d3876c7a1dbc19b023afcffb2bb1) )
+	ROM_LOAD32_WORD("foxworthy redneck.u73", 0x0000000, 0x0400000, CRC(4b778a84) SHA1(d11b2aefcaa2ac22fea80faab524f82511b6344a) )
+	ROM_LOAD32_WORD("foxworthy redneck.u85", 0x0000000, 0x0400000, CRC(52d5395e) SHA1(57b854e516881bc208b48ed82fdef25059e2efab) )
+	ROM_LOAD32_WORD("foxworthy redneck.u86", 0x0000000, 0x0400000, CRC(871a3861) SHA1(4344f7e1fd5414eda3afc40e60df7188425fa80c) )
+ROM_END
+
+
+
+ROM_START( frogwld )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("frogwild2m27v322.u72", 0x0000000, 0x0400000, CRC(36f8066f) SHA1(c8a3dc25488d7d578e05bf247b2d3e0959f5c511) )
+	ROM_LOAD32_WORD("frogwild2m27v322.u73", 0x0000000, 0x0400000, CRC(f058f8f3) SHA1(02efb3de7765e917fb6c29cbfdd90845fb3f0a7b) )
+	ROM_LOAD32_WORD("frogwild2m27v322.u85", 0x0000000, 0x0400000, CRC(b4165c0f) SHA1(823179a70841f49c8100d8d77620548ceea01550) )
+	ROM_LOAD32_WORD("frogwild2m27v322.u86", 0x0000000, 0x0400000, CRC(feb93395) SHA1(56c0f9b0e3616bc57a564220303c13f60fc72df8) )
+ROM_END
+
+
+
+ROM_START( gwnn )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("game with no name 0f01.u72", 0x0000000, 0x0400000, CRC(68b68c92) SHA1(3c23e02ba9cc31352df19b3f641191a4e6261e7b) )
+	ROM_LOAD32_WORD("game with no name 33a1.u73", 0x0000000, 0x0400000, CRC(3644eacc) SHA1(115b7a7ddf9ca1c82aae7c8dcf864d3c224e93be) )
+	ROM_LOAD32_WORD("game with no name c44e.u85", 0x0000000, 0x0400000, CRC(3b95fa30) SHA1(09e53a4434950212346f447315b41da9216a2e24) )
+	ROM_LOAD32_WORD("game with no name e062.u86", 0x0000000, 0x0400000, CRC(2b6407cf) SHA1(ac9242ebd8e669e84664e9aa0f3ec1eb15049a3e) )
+ROM_END
+
+
+
+
+ROM_START( gldgong )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("Golden gong U72.bin", 0x0000000, 0x0400000, CRC(86ca7b2b) SHA1(938dcbc846d0f87e374d6c835ac6cb8185faf48c) )
+	ROM_LOAD32_WORD("Golden gong U73.bin", 0x0000000, 0x0400000, CRC(de1a91f6) SHA1(6bc640cd5b2ffebed7ef4b43c980f10eb22ec5ba) )
+	ROM_LOAD32_WORD("Golden gong U85.bin", 0x0000000, 0x0400000, CRC(29557de6) SHA1(1e7f03ca41d510561e22b944a46b98d00abfd29c) )
+	ROM_LOAD32_WORD("Golden gong U86.bin", 0x0000000, 0x0400000, CRC(9e825d94) SHA1(642edc067c651b127890324fcbd947124fd9a07e) )
+ROM_END
+
+
+
+ROM_START( gldgong2 )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("goldengong296c.u86", 0x0000000, 0x0400000, CRC(9e825d94) SHA1(642edc067c651b127890324fcbd947124fd9a07e) )
+	ROM_LOAD32_WORD("goldengong4cc9.u72", 0x0000000, 0x0400000, CRC(86ca7b2b) SHA1(938dcbc846d0f87e374d6c835ac6cb8185faf48c) )
+	ROM_LOAD32_WORD("goldengongad90.u85", 0x0000000, 0x0400000, CRC(29557de6) SHA1(1e7f03ca41d510561e22b944a46b98d00abfd29c) )
+	ROM_LOAD32_WORD("goldengongb4f0.u73", 0x0000000, 0x0400000, CRC(de1a91f6) SHA1(6bc640cd5b2ffebed7ef4b43c980f10eb22ec5ba) )
+ROM_END
+
+
+
+ROM_START( gldincas )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("goldenincas2adb.u85", 0x0000000, 0x0400000, CRC(cb1268de) SHA1(dc5a18736ac76c59811c7bccd7c3a4cd468fccec) )
+	ROM_LOAD32_WORD("goldenincas3fc7.u86", 0x0000000, 0x0400000, CRC(5e53d9af) SHA1(e850e1707be120b9d6a23524c65e63efb20d1cf1) )
+	ROM_LOAD32_WORD("goldenincascd57.u73", 0x0000000, 0x0400000, CRC(768cecbb) SHA1(2cd2b5906c0a45aecaca2d26063b2ce62ca588eb) )
+	ROM_LOAD32_WORD("goldenincasf152.u72", 0x0000000, 0x0400000, CRC(ce66ccd2) SHA1(71f204ecfd0e31b071cde59bbd974e489ee1f570) )
+ROM_END
+
+
+
+ROM_START( hlntry )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("helen of troy.u72", 0x0000000, 0x0400000, CRC(b694d927) SHA1(0151f3980a401d646a18b9956d3d247daaa48bf2) )
+	ROM_LOAD32_WORD("helen of troy.u73", 0x0000000, 0x0400000, CRC(aebf8e8e) SHA1(22b28883c4ea365c07b6c4ae2fe3c873be158685) )
+	ROM_LOAD32_WORD("helen of troy.u85", 0x0000000, 0x0400000, CRC(4c82ed24) SHA1(455ac96a92b383cb7e2391e92e528c3b4e51f5cc) )
+	ROM_LOAD32_WORD("helen of troy.u86", 0x0000000, 0x0400000, CRC(7100841d) SHA1(67fa5616ca0bb2b25ed2951d3decf0126e0bac82) )
+ROM_END
+
+
+
+ROM_START( hlsunmon )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("HL Sun and Moon U11.bin", 0x0000000, 0x0400000, CRC(b6a8df40) SHA1(316e3f98b75c1bdd0e8fc55aee2cf20b8a45ff4c) )
+	ROM_LOAD32_WORD("HL Sun and Moon U12.bin", 0x0000000, 0x0400000, CRC(98cde50e) SHA1(68e60411a8c10b73482a4cc8d3f14ebdedca0ae9) )
+	ROM_LOAD32_WORD("HL Sun and Moon U13.bin", 0x0000000, 0x0400000, CRC(ac9143cc) SHA1(75aeea2ad26044bef9eb31495d67414a416ee6d4) )
+	ROM_LOAD32_WORD("HL Sun and Moon U14.bin", 0x0000000, 0x0400000, CRC(a5552dd3) SHA1(1bbe24950e19441ca5144cb9b38320803bd5d26e) )
+	ROM_LOAD32_WORD("HL Sun and Moon U21.bin", 0x0000000, 0x0400000, CRC(b0cc922d) SHA1(5a45d0c995c639739176a5aad42e186b122eead1) )
+	ROM_LOAD32_WORD("HL Sun and Moon U22.bin", 0x0000000, 0x0400000, CRC(542ec911) SHA1(48988bdefb9ad6a7e0c733eda1f220b0347cab5f) )
+	ROM_LOAD32_WORD("HL Sun and Moon U23.bin", 0x0000000, 0x0400000, CRC(0ac455b1) SHA1(3ca4f4a0172f18692c9f82a9a435ffc1ca39ddc2) )
+	ROM_LOAD32_WORD("HL Sun and Moon U24.bin", 0x0000000, 0x0400000, CRC(19e5b7e0) SHA1(cf17a84ba08a2f24725d4ccbe046710c2f3a2459) )
+ROM_END
+
+
+
+ROM_START( jefffox )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("jeff-foxworthy-u72-m27v322-cs-127d", 0x0000000, 0x0400000, CRC(ff2ff01d) SHA1(c0d17b3d9907d3876c7a1dbc19b023afcffb2bb1) )
+	ROM_LOAD32_WORD("jeff-foxworthy-u73-m27v322-cs-c40e.bin", 0x0000000, 0x0400000, CRC(4b778a84) SHA1(d11b2aefcaa2ac22fea80faab524f82511b6344a) )
+	ROM_LOAD32_WORD("jeff-foxworthy-u85-m27v322-cs-f86f.bin", 0x0000000, 0x0400000, CRC(52d5395e) SHA1(57b854e516881bc208b48ed82fdef25059e2efab) )
+	ROM_LOAD32_WORD("jeff-foxworthy-u86-m27v322-cs-6dfc.bin", 0x0000000, 0x0400000, CRC(6b0a7eb3) SHA1(cd99fed52643afa596bfbf4a18deca42043520ef) )
+ROM_END
+
+
+
+ROM_START( jewelunc )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("jewel enchantress.u72", 0x0000000, 0x0400000, CRC(6c168e3b) SHA1(db251f024881e27615049f94c6e11002e89b2c40) )
+	ROM_LOAD32_WORD("jewel enchantress.u73", 0x0000000, 0x0400000, CRC(3517c88f) SHA1(fd02618f6f4553ceda17780c7d1c5cf7a2ec44a6) )
+	ROM_LOAD32_WORD("jewel enchantress.u85", 0x0000000, 0x0400000, CRC(9194156f) SHA1(b030432ae7da6b36af85a1ddd43a5657542989ad) )
+	ROM_LOAD32_WORD("jewel enchantress.u86", 0x0000000, 0x0400000, CRC(68a438be) SHA1(c62fae7d0f4909ba5d3b72fc7f903a49cc25c168) )
+ROM_END
+
+
+
+ROM_START( lemrol )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("let em roll.u72", 0x0000000, 0x0400000, CRC(70a40bb3) SHA1(1c3adcc36d4bb71f0099eb3663b2d67d64ba979b) )
+	ROM_LOAD32_WORD("let em roll.u73", 0x0000000, 0x0400000, CRC(57f6a4be) SHA1(c91662e666b8c02b83f61a410da93ad08b4111d2) )
+	ROM_LOAD32_WORD("let em roll.u85", 0x0000000, 0x0400000, CRC(b8be84bb) SHA1(1c62da796f44f23612ba605ade1835089edac3ab) )
+	ROM_LOAD32_WORD("let em roll.u86", 0x0000000, 0x0400000, CRC(18d3513f) SHA1(5d592ce386054627c6f18e87d32317af73866207) )
+ROM_END
+
+
+
+ROM_START( lineking )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("lineking50ln.u72", 0x0000000, 0x0400000, CRC(7440510c) SHA1(e00ee345e8811a7d72f33f30f8dbffee8a550e6a) )
+	ROM_LOAD32_WORD("lineking50ln.u73", 0x0000000, 0x0400000, CRC(1b959c89) SHA1(167d628ea3be95cfacad318288bd965823b16ea3) )
+	ROM_LOAD32_WORD("lineking50ln.u85", 0x0000000, 0x0400000, CRC(1256b8d1) SHA1(e2ab3d713c41cf00a7b3930678e0f56102fabbca) )
+	ROM_LOAD32_WORD("lineking50ln.u86", 0x0000000, 0x0400000, CRC(7f739eb4) SHA1(cccba4551c7f2901b077473f202b1437da433ab4) )
+ROM_END
+
+
+
+ROM_START( lovestrk )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("love struck-27v322-u73-cs-a008.bin", 0x0000000, 0x0400000, CRC(421f717d) SHA1(29eaecef6dd389329a8cfdcfa4bf3f90252eb096) )
+	ROM_LOAD32_WORD("love struck-27v322-u86-cs-0058.bin", 0x0000000, 0x0400000, CRC(c374ee56) SHA1(18b084c32a4dad6dacd3eeaf6ba430053405dbe8) )
+ROM_END
+
+
+
+ROM_START( mgforst )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("magicforest50ln.u72", 0x0000000, 0x0400000, CRC(53d881a2) SHA1(f63c500fc0208709813d661305900de2f2edc9bf) )
+	ROM_LOAD32_WORD("magicforest50ln.u73", 0x0000000, 0x0400000, CRC(f9915826) SHA1(51c8455977b03fc6e2a3e898f225c8eb86ba58df) )
+	ROM_LOAD32_WORD("magicforest50ln.u85", 0x0000000, 0x0400000, CRC(48b5cb37) SHA1(1b2454349ee29f8779f32830cfc405e97126c4b1) )
+	ROM_LOAD32_WORD("magicforest50ln.u86", 0x0000000, 0x0400000, CRC(e412acb3) SHA1(80c5de99b0ef53ccd3eb027aade70caf83753568) )
+ROM_END
+
+
+
+ROM_START( mgmerm )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("magicmermaid.u72", 0x0000000, 0x0400000, CRC(7a5399ab) SHA1(85e3ca6e00d4f1259c4899f74981ec076524e50d) )
+	ROM_LOAD32_WORD("magicmermaid.u73", 0x0000000, 0x0400000, CRC(eff3f840) SHA1(16bec01d3aa6b103c10698cd1656ab54ee9de512) )
+	ROM_LOAD32_WORD("magicmermaid.u85", 0x0000000, 0x0400000, CRC(0c75309e) SHA1(6b745441434c585e3cda2d854dad3861d7337ab5) )
+	ROM_LOAD32_WORD("magicmermaid.u86", 0x0000000, 0x0400000, CRC(dd44042b) SHA1(130c26a2ca02003adaa729a54195a1e4832cc455) )
+ROM_END
+
+
+
+ROM_START( metestrm )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("Meteor Storm U72.bin", 0x0000000, 0x0400000, CRC(1d225d8b) SHA1(477b39d9d2dd526dd3fe6fba6c4d36dfc845ebac) )
+	ROM_LOAD32_WORD("Meteor Storm U73.bin", 0x0000000, 0x0400000, CRC(0bc788f7) SHA1(7ce7cdbd08f7ae73a5a1b7c45e72bb9c90d91d3e) )
+	ROM_LOAD32_WORD("Meteor Storm U85.bin", 0x0000000, 0x0400000, CRC(1d24fa72) SHA1(1ff3a912919591dcd48459369e97d62cf27d6614) )
+	ROM_LOAD32_WORD("Meteor Storm U86.bin", 0x0000000, 0x0400000, CRC(a1674822) SHA1(471d704ed2600e0b806123031c9add2b13fa42ce) )
+ROM_END
+
+
+
+
+
+
+ROM_START( mrwoo )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("Mr Woo U71.bin", 0x0000000, 0x0400000, CRC(7507a271) SHA1(3bd25bf8d1ea54a7db2537fd011b12ff51e7bdd1) )
+	ROM_LOAD32_WORD("Mr Woo U72.bin", 0x0000000, 0x0400000, CRC(6fed3a7e) SHA1(b07354d5d927133626232c21096465426b3053bd) )
+	ROM_LOAD32_WORD("Mr Woo U73.bin", 0x0000000, 0x0400000, CRC(59cdb6ee) SHA1(1e8be1396786fced872c8ffc09772183b98a0f96) )
+	ROM_LOAD32_WORD("Mr Woo U84.bin", 0x0000000, 0x0400000, CRC(0fe46063) SHA1(10f3895b164b3077d156b7eb22e1fb1356816cb3) )
+	ROM_LOAD32_WORD("Mr Woo U85.bin", 0x0000000, 0x0400000, CRC(cb26bd37) SHA1(f20d54c5a6750362f47da5cac9b74ae516de16d4) )
+	ROM_LOAD32_WORD("Mr Woo U86.bin", 0x0000000, 0x0400000, CRC(db5d522a) SHA1(62030c7e314a614a3d4d7386268b61f94bc1fe02) )
+	ROM_LOAD32_WORD("Mr Woo U85.bin", 0x0000000, 0x0400000, CRC(cb26bd37) SHA1(f20d54c5a6750362f47da5cac9b74ae516de16d4) )
+	ROM_LOAD32_WORD("Mr Woo U86.bin", 0x0000000, 0x0400000, CRC(db5d522a) SHA1(62030c7e314a614a3d4d7386268b61f94bc1fe02) )
+ROM_END
+
+
+
+
+ROM_START( mystarr )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("mysticarrowm27v322.u72", 0x0000000, 0x0400000, CRC(4aa6e68b) SHA1(5f015885c15fd206053d23983a38dd1dbb8f89ce) )
+	ROM_LOAD32_WORD("mysticarrowm27v322.u73", 0x0000000, 0x0400000, CRC(7b8ed0d9) SHA1(6ea4bddedef955513e841ee14ec5e6ded23c1ea7) )
+	ROM_LOAD32_WORD("mysticarrowm27v322.u85", 0x0000000, 0x0400000, CRC(ea82c5db) SHA1(01db2730b1eec5c9f5c011525459ec72903761cc) )
+	ROM_LOAD32_WORD("mysticarrowm27v322.u86", 0x0000000, 0x0400000, CRC(8a1475ac) SHA1(c948f0ca991b64d9a07e42fdb346e6df450718f2) )
+ROM_END
+
+
+
+ROM_START( mysteyec )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("mysticeyescashmanm27v322.u72", 0x0000000, 0x0400000, CRC(380a868e) SHA1(a1ac6ec1a760f8bbf68b3b86cf5dd4623dc130c7) )
+	ROM_LOAD32_WORD("mysticeyescashmanm27v322.u73", 0x0000000, 0x0400000, CRC(85ad1a00) SHA1(d4f1d86647eb7724c94c3cfa89d5545a20323e62) )
+	ROM_LOAD32_WORD("mysticeyescashmanm27v322.u85", 0x0000000, 0x0400000, CRC(ee781c0f) SHA1(7729a55e1d5ff7b8a373dda8a0798374ff60a89b) )
+	ROM_LOAD32_WORD("mysticeyescashmanm27v322.u86", 0x0000000, 0x0400000, CRC(a7bdbd03) SHA1(0e763933c082163de85c408be91d216d6545e9d7) )
+ROM_END
+
+
+
+ROM_START( opsesam )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("open sesame.u72", 0x0000000, 0x0400000, CRC(41bf83e5) SHA1(cdd9c6a148970725360c763ed11e2e411c28d5e9) )
+	ROM_LOAD32_WORD("open sesame.u73", 0x0000000, 0x0400000, CRC(d6bc2a4b) SHA1(55daa6c9028f40ecd23c5ffdb049447ce5ce51aa) )
+	ROM_LOAD32_WORD("open sesame.u85", 0x0000000, 0x0400000, CRC(3bfdcf54) SHA1(4b174a3e65e0c3b874f99a1bc8947ebe35087672) ) // missing a rom?
+ROM_END
+
+
+
+ROM_START( pandpays )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("Panda Pays U72.bin", 0x0000000, 0x0400000, CRC(4c4b9a62) SHA1(1c287ac85346756508e2efb13e1559af4956dd9a) )
+	ROM_LOAD32_WORD("Panda Pays U73.bin", 0x0000000, 0x0400000, CRC(cc63af55) SHA1(0d8d3c6392c3121d5edbeaece880041c3afd6530) )
+	ROM_LOAD32_WORD("Panda Pays U85.bin", 0x0000000, 0x0400000, CRC(ac7672fa) SHA1(8029ff08e29c48e8f4b2ecd03cf021cc89eab916) )
+	ROM_LOAD32_WORD("Panda Pays U86.bin", 0x0000000, 0x0400000, CRC(ba3fe38b) SHA1(11493dff5720e158ca31f72bf59dcbbbe6d87c96) )
+ROM_END
+
+
+
+ROM_START( parilius )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("parislightsm27v322.u72", 0x0000000, 0x0400000, CRC(8dc6a0ec) SHA1(855e8f5c6752bfc4ba25116a20ed82dfb4912c07) )
+	ROM_LOAD32_WORD("parislightsm27v322.u73", 0x0000000, 0x0400000, CRC(d0587548) SHA1(30d0021a78ee79c6f66fb27c8c484427a5a2db1b) )
+	ROM_LOAD32_WORD("parislightsm27v322.u85", 0x0000000, 0x0400000, CRC(e7ed0bf4) SHA1(39cb9744462f10fc791d6c604631c1182da9466b) )
+	ROM_LOAD32_WORD("parislightsm27v322.u86", 0x0000000, 0x0400000, CRC(5224e683) SHA1(8b0dbb2fcea4d1a522160d8a6634687c5bad8acd) )
+ROM_END
+
+
+
+ROM_START( pelpetus )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("Pelican pete U72.bin", 0x0000000, 0x0400000, CRC(4ff0a40b) SHA1(b9049a35a3ebc3e1274498809f7687a36cad6f24) )
+	ROM_LOAD32_WORD("Pelican pete U73.bin", 0x0000000, 0x0400000, CRC(44d5e0af) SHA1(1693e641ddc5d4174e4e0dc07cb79e54045aaad3) )
+	ROM_LOAD32_WORD("Pelican pete U85.bin", 0x0000000, 0x0400000, CRC(781e076d) SHA1(0c7d2281598822ea45f37b2afd5f12d9afe2d01a) )
+	ROM_LOAD32_WORD("Pelican pete U86.bin", 0x0000000, 0x0400000, CRC(dea78964) SHA1(857e5f1deb8db3d861ea7fe78e44a8e17cc791aa) )
+ROM_END
+
+
+
+ROM_START( pelpetu2 )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("pelicanpete50line3b1f.u86", 0x0000000, 0x0400000, CRC(dea78964) SHA1(857e5f1deb8db3d861ea7fe78e44a8e17cc791aa) )
+	ROM_LOAD32_WORD("pelicanpete50lineb748.u73", 0x0000000, 0x0400000, CRC(44d5e0af) SHA1(1693e641ddc5d4174e4e0dc07cb79e54045aaad3) )
+	ROM_LOAD32_WORD("pelicanpete50linecb48.u85", 0x0000000, 0x0400000, CRC(781e076d) SHA1(0c7d2281598822ea45f37b2afd5f12d9afe2d01a) )
+	ROM_LOAD32_WORD("pelicanpete50linef94b.u72", 0x0000000, 0x0400000, CRC(4ff0a40b) SHA1(b9049a35a3ebc3e1274498809f7687a36cad6f24) )
+ROM_END
+
+
+
+ROM_START( pennyar )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("Penny Arcade - Reel Power - U72- E40E", 0x0000000, 0x0400000, CRC(cdd0795f) SHA1(e5243c27cca69451015f232444b289abf3d95819) )
+	ROM_LOAD32_WORD("Penny Arcade - Reel Power - U73 - 6A01", 0x0000000, 0x0400000, CRC(b8b7c31c) SHA1(7a5cfd608d8c0a3db1054b5770065fc3733d5f35) )
+	ROM_LOAD32_WORD("Penny Arcade - Reel Power - U85 - D0F9", 0x0000000, 0x0400000, CRC(9b9bf428) SHA1(108c722d0b56ae446961eefe27579e203eeb3b19) )
+	ROM_LOAD32_WORD("Penny Arcade - Reel Power - U86 - 7923", 0x0000000, 0x0400000, CRC(0fee6e4a) SHA1(b2a7ccbe81528067b29663f18b54520b5fefe6ec) )
+ROM_END
+
+
+
+ROM_START( penpayus )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("penguinpays.u72", 0x0000000, 0x0400000, CRC(1ee80a47) SHA1(c02485003d0724941ef346fb721bd246f69545b3) )
+	ROM_LOAD32_WORD("penguinpays.u73", 0x0000000, 0x0400000, CRC(36699b29) SHA1(0d867f4086c07c8114bb1f383e647dab4d8ce7b8) )
+	ROM_LOAD32_WORD("penguinpays.u85", 0x0000000, 0x0400000, CRC(7e68ca9a) SHA1(17e96fa047b2353be53b52b0a783bb7247bc6a6f) )
+	ROM_LOAD32_WORD("penguinpays.u86", 0x0000000, 0x0400000, CRC(b7c646a7) SHA1(e47f88347eb2354dd982f46f7ac89b5645205b12) )
+ROM_END
+
+
+
+
+
+ROM_START( pompus2 )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("pompei.u72", 0x0000000, 0x0400000, CRC(a5959d1f) SHA1(fe92eaa3f1dc6bdc356bef2a680eb9f8a09c88a2) )
+	ROM_LOAD32_WORD("pompei.u73", 0x0000000, 0x0400000, CRC(947d3099) SHA1(d5256fc598c2e280f9e92ef6ba0e0152c8cc5d3b) )
+	ROM_LOAD32_WORD("pompei.u85", 0x0000000, 0x0400000, CRC(901f5a17) SHA1(8a7fd00a68770be23e0164907eae91b963f01091) )
+	ROM_LOAD32_WORD("pompei.u86", 0x0000000, 0x0400000, CRC(a68aac55) SHA1(630b1d4cb08d8710b81c6d709182e7c7a52f184a) )
+ROM_END
+
+
+
+ROM_START( rdtripus )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("roadtrip.u71", 0x0000000, 0x0400000, CRC(1da57ab8) SHA1(775d1f0d6021032e909c8089ba93cc63eef18586) )
+	ROM_LOAD32_WORD("roadtrip.u72", 0x0000000, 0x0400000, CRC(421cfc77) SHA1(fb14ad4c06bdbdd6df4fc1299a96bb8d906d2b48) )
+	ROM_LOAD32_WORD("roadtrip.u73", 0x0000000, 0x0400000, CRC(cb9f6f5d) SHA1(825322c6b0407a934aca632c198615d188e2f46b) )
+	ROM_LOAD32_WORD("roadtrip.u85", 0x0000000, 0x0400000, CRC(e68205a7) SHA1(a7dc2a10de4ef229a8f25a3db19a30ea4be46cdd) )
+	ROM_LOAD32_WORD("roadtrip.u86", 0x0000000, 0x0400000, CRC(66c2c8da) SHA1(76d338662a80ebdfd72e403388cffe8dfbd14f59) ) // missing a rom?
+ROM_END
+
+
+
+ROM_START( sealdeal )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("sealthedealm27v322.u72", 0x0000000, 0x0400000, CRC(43ef1218) SHA1(e1d03cd9845ac81a71b5a0471d146addc2f56e0e) )
+	ROM_LOAD32_WORD("sealthedealm27v322.u73", 0x0000000, 0x0400000, CRC(383d55a9) SHA1(81bef0ed325ef7208403afa6d7af458c755a4de3) )
+	ROM_LOAD32_WORD("sealthedealm27v322.u85", 0x0000000, 0x0400000, CRC(a6327726) SHA1(2c0f02a8d361bcbfc007b9d75a4b7b685aa2b1ac) )
+	ROM_LOAD32_WORD("sealthedealm27v322.u86", 0x0000000, 0x0400000, CRC(ea6b666b) SHA1(ad80042770f8e66e7455010b46d81873689f63db) )
+ROM_END
+
+
+
+
+
+
+
+
+ROM_START( shorthng )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("shore thing.u72", 0x0000000, 0x0400000, CRC(e151390f) SHA1(e68f2584587687c96e4cbe0080630466fac61b17) )
+	ROM_LOAD32_WORD("shore thing.u73", 0x0000000, 0x0400000, CRC(c214d960) SHA1(e5b75e5cb3af3b77f56ccec72833e9243d09c643) )
+	ROM_LOAD32_WORD("shore thing.u85", 0x0000000, 0x0400000, CRC(e721a879) SHA1(0632c1be6c3b671aed4f6dd67b83e966033aba19) )
+	ROM_LOAD32_WORD("shore thing.u86", 0x0000000, 0x0400000, CRC(c3e6f083) SHA1(4ed6b1039f060cd6480a490de28619f5370de805) )
+ROM_END
+
+
+
+ROM_START( silkrdus )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("silkroad.u72", 0x0000000, 0x0400000, CRC(1ed58be6) SHA1(114c5a800592163dbc690b5d4c4c051d358828f9) )
+	ROM_LOAD32_WORD("silkroad.u73", 0x0000000, 0x0400000, CRC(c32608e3) SHA1(83d9749ce77317ce5631e7c7d3985c71f26d43a5) )
+	ROM_LOAD32_WORD("silkroad.u85", 0x0000000, 0x0400000, CRC(568f7ecd) SHA1(ccab6d872fe5bc00466071334b1af9f6799e40a0) )
+	ROM_LOAD32_WORD("silkroad.u86", 0x0000000, 0x0400000, CRC(5e8f8fc3) SHA1(bb586743182a3797d601db740e270e773f7e3587) )
+ROM_END
+
+
+
+ROM_START( stardrfu )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("star-drifter-u72-m27v322-cs8552.bin", 0x0000000, 0x0400000, CRC(dc7a30c1) SHA1(8f24c18efd6171cda7ca841d3b275937e35e2be8) )
+	ROM_LOAD32_WORD("star-drifter-u73-m27v322-cs61bb.bin", 0x0000000, 0x0400000, CRC(3e59b84f) SHA1(3148d48df74c35681759a234d7aa746cbb0afb0e) )
+	ROM_LOAD32_WORD("star-drifter-u85-m27v322-cs1302.bin", 0x0000000, 0x0400000, CRC(689ded33) SHA1(5d5b744321313c4618ecf319827c778be646245f) )
+	ROM_LOAD32_WORD("star-drifter-u86-m27v322-cs4b08.bin", 0x0000000, 0x0400000, CRC(73023e64) SHA1(4d2d586a1e91ac5bac379994973dffcf9f3a3293) )
+ROM_END
+
+
+
+ROM_START( stardrf2 )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("stardrifter50line1302.u85", 0x0000000, 0x0400000, CRC(689ded33) SHA1(5d5b744321313c4618ecf319827c778be646245f) )
+	ROM_LOAD32_WORD("stardrifter50line4b08.u86", 0x0000000, 0x0400000, CRC(73023e64) SHA1(4d2d586a1e91ac5bac379994973dffcf9f3a3293) )
+	ROM_LOAD32_WORD("stardrifter50line61bb.u73", 0x0000000, 0x0400000, CRC(3e59b84f) SHA1(3148d48df74c35681759a234d7aa746cbb0afb0e) )
+	ROM_LOAD32_WORD("stardrifter50line8552.u72", 0x0000000, 0x0400000, CRC(dc7a30c1) SHA1(8f24c18efd6171cda7ca841d3b275937e35e2be8) )
+ROM_END
+
+
+
+ROM_START( statsymb )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("statussymbols.u73", 0x0000000, 0x0400000, CRC(e06f2dd1) SHA1(0edadf037dee101e5fb768471d2f93474ff8268f) )
+	ROM_LOAD32_WORD("statussymbols.u86", 0x0000000, 0x0400000, CRC(fe9b9147) SHA1(5dced51e126a80191d62b88438e1098efb358e52) )
+ROM_END
+
+
+
+ROM_START( sunmon2 )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("sunandmoon.u72", 0x0000000, 0x0400000, CRC(f69ce78d) SHA1(91a433757b377406bca61b4c96f3ba3561efd75c) )
+	ROM_LOAD32_WORD("sunandmoon.u73", 0x0000000, 0x0400000, CRC(ce1f8d32) SHA1(7891b0e797942374d779e8df92281383dd94fe90) )
+	ROM_LOAD32_WORD("sunandmoon.u85", 0x0000000, 0x0400000, CRC(7e16ab59) SHA1(f56b3b5a252d3520e36b1d2a7643d65020af2133) )
+	ROM_LOAD32_WORD("sunandmoon.u86", 0x0000000, 0x0400000, CRC(012e5aeb) SHA1(3df4454ab54cc6edf62b8cc9de4c867a36e8654b) )
+ROM_END
+
+
+ROM_START( sunqndol )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("sun queen dollar storm.u72", 0x0000000, 0x0400000, CRC(a2b404ac) SHA1(409bd1ce24600fa381ad4de8b7066e5e04f7ab3d) )
+	ROM_LOAD32_WORD("sun queen dollar storm.u73", 0x0000000, 0x0400000, CRC(b46080a1) SHA1(11293e7636dea28c8dfdebd107fa5aee013c832e) )
+	ROM_LOAD32_WORD("sun queen dollar storm.u85", 0x0000000, 0x0400000, CRC(f522c85e) SHA1(2b9ba996b99745e69944451e1fd2b585ed62290f) )
+	ROM_LOAD32_WORD("sun queen dollar storm.u86", 0x0000000, 0x0400000, CRC(78fd2a9f) SHA1(768db303de2ce2fb1efe6adee44d66780801e7da) )
+ROM_END
+
+
+
+ROM_START( swhr2us )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("sweethearts2.u73", 0x0000000, 0x0400000, CRC(17f0dbe2) SHA1(7f1f0936e1cf528ee794e8925c40b063d1a77729) )
+	ROM_LOAD32_WORD("sweethearts2.u86", 0x0000000, 0x0400000, CRC(320d3052) SHA1(8b2165795e9b9d7514620b0d6a14371142de434b) )
+ROM_END
+
+
+
+
+ROM_START( gbmoney )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("thegoodbadmoney0351016.u72", 0x0000000, 0x0400000, CRC(7703165a) SHA1(6d9e019796dee04a9817c4176af5bf10f7a7597d) )
+	ROM_LOAD32_WORD("thegoodbadmoney0351016.u73", 0x0000000, 0x0400000, CRC(7bccca48) SHA1(b7a4f00eac4b91ec671555f1332f705acffd7b00) )
+	ROM_LOAD32_WORD("thegoodbadmoney0351016.u85", 0x0000000, 0x0400000, CRC(28ca3d73) SHA1(3d9edfffe2d7fd37e0f9c6cd292ca3c68abae15b) )
+	ROM_LOAD32_WORD("thegoodbadmoney0351016.u86", 0x0000000, 0x0400000, CRC(04ce6b76) SHA1(b846752a739ae6c657e74bbe5e5e772a6c3d5e00) )
+ROM_END
+
+
+
+ROM_START( tiktoru )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("tiki torch.u72", 0x0000000, 0x0400000, CRC(1161133b) SHA1(760c710167e4eca84421fc1cd54ab696e16502cc) )
+	ROM_LOAD32_WORD("tiki torch.u73", 0x0000000, 0x0400000, CRC(f0f8e8d5) SHA1(a084befd422ce37ad19b31d3da61e7a03d5e38c4) )
+	ROM_LOAD32_WORD("tiki torch.u85", 0x0000000, 0x0400000, CRC(32eed9c2) SHA1(8e3e8d55a4dac92ae9b543c86921126df1fb6518) )
+	ROM_LOAD32_WORD("tiki torch.u86", 0x0000000, 0x0400000, CRC(ad10a554) SHA1(59062060ded7304193105d2b03fb06a7754a9fe6) )
+ROM_END
+
+
+
+ROM_START( timwolfu )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("timberwolf.u72", 0x0000000, 0x0400000, CRC(a004dd06) SHA1(c394b1703d62370ecf19c51d90554d6495f43eae) )
+	ROM_LOAD32_WORD("timberwolf.u73", 0x0000000, 0x0400000, CRC(054e3956) SHA1(ccfb6ba102c22f70fbc61b3d6ba0ceadc1414e1c) )
+	ROM_LOAD32_WORD("timberwolf.u85", 0x0000000, 0x0400000, CRC(901e72e5) SHA1(437a33ac1c73824ce81229f93eff0799b369c6b0) )
+	ROM_LOAD32_WORD("timberwolf.u86", 0x0000000, 0x0400000, CRC(a3be6e57) SHA1(9e06a85b630626bf7e3e790a70b8575bc9047b3d) )
+ROM_END
+
+
+
+ROM_START( trkinus )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("treasureking.u72", 0x0000000, 0x0400000, CRC(c070cb6b) SHA1(cfe6ef7723233f4325ff778679d1274159ffacab) )
+	ROM_LOAD32_WORD("treasureking.u73", 0x0000000, 0x0400000, CRC(70253923) SHA1(4a87a9b947404a7692404333fb4e2cd18c8de77c) )
+	ROM_LOAD32_WORD("treasureking.u85", 0x0000000, 0x0400000, CRC(2cece959) SHA1(c375f1fd1636898feaf1f23baf1c136e1ac09085) )
+	ROM_LOAD32_WORD("treasureking.u86", 0x0000000, 0x0400000, CRC(8e5d3ba0) SHA1(ad3c8ba4351ba2a476aa349e2924c09be9debc20) )
+ROM_END
+
+
+ROM_START( venicus )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("venice3536.u86", 0x0000000, 0x0400000, CRC(a6dde7a6) SHA1(58b9bd3d80b88e9e8b40813e85b89cda69f12fb6) )
+	ROM_LOAD32_WORD("venice3595.u73", 0x0000000, 0x0400000, CRC(d77b73e3) SHA1(4dd4011d6371baf35fcd9cb7c878d4d2cca1e199) )
+	ROM_LOAD32_WORD("veniceb939.u85", 0x0000000, 0x0400000, CRC(f7c3c75d) SHA1(7afc80d8d81b30c1842e4bfbf7ecd987226bdcf6) )
+	ROM_LOAD32_WORD("veniceef4a.u72", 0x0000000, 0x0400000, CRC(0570d956) SHA1(415cbaf337296527907ba36932f386aafeceec16) )
+ROM_END
+
+
+
+ROM_START( whlcshus )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("whales cash U85_4ECD", 0x0000000, 0x0400000, CRC(e90f5bb1) SHA1(28680395198a29356999a377f2f3e0013d97c7b2) )
+	ROM_LOAD32_WORD("whales of cash U72_68DE", 0x0000000, 0x0400000, CRC(f138de3f) SHA1(69a54457c8090f23023f197f0eba1d645a260f3f) )
+	ROM_LOAD32_WORD("whales of cash U73_3517", 0x0000000, 0x0400000, CRC(74c93c56) SHA1(34c48620b08c3a03f0d6a333acbc45c14a91d3cb) )
+	ROM_LOAD32_WORD("whales of cash U86_59AF", 0x0000000, 0x0400000, CRC(a7118016) SHA1(725a46ac861bf4abaf9cc0e7084cfa20913c2299) )
+	ROM_LOAD32_WORD("whalesofcash.u72", 0x0000000, 0x0400000, CRC(e9ddd951) SHA1(16863b49b5db1881afda30ea19a55f6122981eba) )
+	ROM_LOAD32_WORD("whalesofcash.u73", 0x0000000, 0x0400000, CRC(22785960) SHA1(2ebfd230209fd438338f981c1c133e6576a67468) )
+	ROM_LOAD32_WORD("whalesofcash.u86", 0x0000000, 0x0400000, CRC(8aef1004) SHA1(270379b0a3abc98adfb1a9b031a5e98050635a80) ) // missing a rom?
+ROM_END
+
+
+
+ROM_START( whtwtr )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("white water.u72", 0x0000000, 0x0400000, CRC(64a814c6) SHA1(9415bb32675e5c3b6299967b1d10dbccd699d9ed) )
+	ROM_LOAD32_WORD("white water.u73", 0x0000000, 0x0400000, CRC(0e1fcaca) SHA1(725237cca34d86e53cb68547604d8844257cdf48) )
+	ROM_LOAD32_WORD("white water.u85", 0x0000000, 0x0400000, CRC(8802e0cb) SHA1(d11874426839a506d78440adbc49056ce21f88d3) )
+	ROM_LOAD32_WORD("white water.u86", 0x0000000, 0x0400000, CRC(9e527f96) SHA1(34e46e530686ab5955ae267541e96d06a4e149a6) )
+ROM_END
+
+
+
+ROM_START( wldafus )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("wild africa.u72", 0x0000000, 0x0400000, CRC(a55417ca) SHA1(151615f81112b30aff2a2aa26280b7c1bf0d45db) )
+	ROM_LOAD32_WORD("wild africa.u73", 0x0000000, 0x0400000, CRC(e1e1253e) SHA1(4c15c953b80288df8f97197d70c8076fde9a0d29) )
+	ROM_LOAD32_WORD("wild africa.u85", 0x0000000, 0x0400000, CRC(7ecbb5ba) SHA1(ab201ad7db848f5c03e3795c63308530b371d354) )
+	ROM_LOAD32_WORD("wild africa.u86", 0x0000000, 0x0400000, CRC(2193094c) SHA1(57d687301a59f36880560a3efc7040e333cb05d3) )
+ROM_END
+
+
+ROM_START( wldpntus )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("wild panthers.u72", 0x0000000, 0x0400000, CRC(2969f69c) SHA1(d63f1bcbd163c067f143a55aaf7c88b3c9ac0ebe) )
+	ROM_LOAD32_WORD("wild panthers.u73", 0x0000000, 0x0400000, CRC(59d83a8a) SHA1(61f6e6b85108621c2eac1bf48c27d79a72fbb2fd) )
+	ROM_LOAD32_WORD("wild panthers.u86", 0x0000000, 0x0400000, CRC(c874ec84) SHA1(e4f3beaa254f5b827c7f0f5d22be7dd5b3abfd2c) ) // missing a rom?
+ROM_END
+
+
+
+
+ROM_START( wingolus )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("wingsofolympus.u72", 0x0000000, 0x0400000, CRC(158877b5) SHA1(a1fc98d90a763253f07b9df44d85e8594b26d484) )
+	ROM_LOAD32_WORD("wingsofolympus.u73", 0x0000000, 0x0400000, CRC(5c003b1e) SHA1(be419686b89e22a1aa5d841015ab3442bffe05a6) )
+	ROM_LOAD32_WORD("wingsofolympus.u85", 0x0000000, 0x0400000, CRC(63aef582) SHA1(59fa78d7d29c8d4686fab83cfa46238938a9c249) )
+	ROM_LOAD32_WORD("wingsofolympus.u86", 0x0000000, 0x0400000, CRC(c5d7d7cf) SHA1(641cdfe9b612c9cefd6a279f0c44fd535521aeef) )
+ROM_END
+
+
+
+ROM_START( zorrous )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("zorro28ef.u72", 0x0000000, 0x0400000, CRC(9e572513) SHA1(76f5578d957ec9a3a48fa9d532e6c440855d1cb6) )
+	ROM_LOAD32_WORD("zorro5a4c.u84", 0x0000000, 0x0400000, CRC(e636ae58) SHA1(70e941118ae19165651157cb5219d38f58f196af) )
+	ROM_LOAD32_WORD("zorro77c8.86", 0x0000000, 0x0400000, CRC(8d38c20c) SHA1(a0a38844aa18da72f1933571047ca36715911fb6) )
+	ROM_LOAD32_WORD("zorroc4fe.u85", 0x0000000, 0x0400000, CRC(dead9ca1) SHA1(13b1b44a537227b6ada45ed99277d650b11aefd1) )
+	ROM_LOAD32_WORD("zorrod940.u73", 0x0000000, 0x0400000, CRC(b030bdd1) SHA1(b3138ed4181342dfe1adbcb784f4e3366cb6e103) )
+	ROM_LOAD32_WORD("zorroe953.u71", 0x0000000, 0x0400000, CRC(ff5a8592) SHA1(03d452133d30d780312066bada8e21566255209f) )
+ROM_END
+
+
+
+ROM_START( bobdolu1 )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("bob-dolly-27v322-u11-cs-e927.bin", 0x0000000, 0x0400000, CRC(d3657369) SHA1(621fb20238f10e06c486dfbd6460f94047898a42) )
+	ROM_LOAD32_WORD("bob-dolly-27v322-u12-cs-4185.bin", 0x0000000, 0x0400000, CRC(47429081) SHA1(23d996aa522c2f9beadf1fdb7c0584ca939917da) )
+	ROM_LOAD32_WORD("bob-dolly-27v322-u13-cs-a9c5.bin", 0x0000000, 0x0400000, CRC(e73883db) SHA1(6382386ac6f576c739c959cbf6b6df2605496845) )
+	ROM_LOAD32_WORD("bob-dolly-27v322-u14-cs-c8e1.bin", 0x0000000, 0x0400000, CRC(0f1a6b7c) SHA1(17686829a1a64f6d8982e015067f2d08bcb00402) )
+
+	ROM_LOAD32_WORD("bob-dolly-27v322-u21-cs-c2d7.bin", 0x0000000, 0x0400000, CRC(8e32da10) SHA1(28a49ecc3bab512e5828c96392d6fa4ff9394a0f) )
+	ROM_LOAD32_WORD("bob-dolly-27v322-u22-cs-08ec.bin", 0x0000000, 0x0400000, CRC(4302ae5e) SHA1(fe1d122093ad9234a7a5337b3a4c2de7fe046822) )
+	ROM_LOAD32_WORD("bob-dolly-27v322-u23-cs-0e8d.bin", 0x0000000, 0x0400000, CRC(a9726ec5) SHA1(cdf78adc3ebcd50e503b2587564493a91b73f578) )
+	ROM_LOAD32_WORD("bob-dolly-27v322-u24-cs-e2c2.bin", 0x0000000, 0x0400000, CRC(3646c16d) SHA1(c52fab2e11f39c126bcbbb348750bbf30ff96090) )
+ROM_END
+
+
+
+
+
+ROM_START( pwsp1 )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("players- world- super- m27v322- cs-1231-u13.bin", 0x0000000, 0x0400000, CRC(43b44f26) SHA1(5410eea0a4911a274a794d6b27e369fb98c6edf7) )
+	ROM_LOAD32_WORD("players- world- super- m27v322- cs-1eea-u15.bin", 0x0000000, 0x0400000, CRC(2c7fe966) SHA1(42fc364dded0ce079ce4970b1f951c6a0ebf6c51) )
+	ROM_LOAD32_WORD("players- world- super- m27v322- cs-35c66-u12.bin", 0x0000000, 0x0400000, CRC(5354cff5) SHA1(bf818e53a432aa8e7a2578dbb367be2c5f51bb16) )
+	ROM_LOAD32_WORD("players- world- super- m27v322- cs-baa2-u11.bin", 0x0000000, 0x0400000, CRC(48f60a2c) SHA1(0d27d544991b3403672250ff79c5bbbf35cdf175) )
+	ROM_LOAD32_WORD("players- world- super- m27v322- cs-f4bb-u14.bin", 0x0000000, 0x0400000, CRC(a850af7f) SHA1(8d029de0083aad57ddd8b36153214b40cd388d56) )
+
+	ROM_LOAD32_WORD("players- world- super- m27v322- cs-4752-u22.bin", 0x0000000, 0x0400000, CRC(9dbdefb7) SHA1(445a24233b435e3812747d8376addf969fea5cd2) )
+	ROM_LOAD32_WORD("players- world- super- m27v322- cs-64d5-u21.bin", 0x0000000, 0x0400000, CRC(678b0be2) SHA1(16f5460d67a1e897390e0c03b847511f5c14156a) )
+	ROM_LOAD32_WORD("players- world- super- m27v322- cs-9a82-u25.bin", 0x0000000, 0x0400000, CRC(5f9b8ef7) SHA1(f0c954d1f448f2061dbe284c78eddcfcb5afdc7c) )
+	ROM_LOAD32_WORD("players- world- super- m27v322- cs-dd69-u24.bin", 0x0000000, 0x0400000, CRC(dbb073f1) SHA1(e3a7f14cabab613453baffde3b592889d11578e7) )
+	ROM_LOAD32_WORD("players- world- super- m27v322- cs-e8f7-u23.bin", 0x0000000, 0x0400000, CRC(ae04211a) SHA1(8db4fc936fa6d0e0a372b81f2e9590047522b843) )
+ROM_END
+
+
+
 
 
 
@@ -2063,7 +2950,7 @@ GAME( 200?, nerdwild,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, R
 GAME( 200?, orbeaut,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Oriental Beauty",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
 GAME( 200?, outbackj,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Outback Jack Jackpot",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
 GAME( 200?, owlcap,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Owl Capone",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
-GAME( 200?, pariligh,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Paris Lights",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, pariligh,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Paris Lights (USA)",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
 GAME( 200?, pcockmag,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Peacock Magic",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
 GAME( 200?, pelipete,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Pelican Pete",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
 GAME( 200?, pharpor,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Pharohs Fortune",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
@@ -2138,6 +3025,83 @@ GAME( 200?, werewild,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, R
 GAME( 200?, wldcatsa,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Wild Cats",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
 GAME( 200?, wgorilla,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Wild Gorilla",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
 GAME( 200?, bluetigr,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Blue Tiger\20259511",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, 50lionr,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "50 Lions Roaring Riches",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, beavbuk,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Beaver Bucks",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+// sets below marked as 'USA'
+GAME( 200?, aftrhrs,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "After Hours",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, atkgld,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "All The Kings Gold",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, apocof,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Apollo Coffee",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, arbngts,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Arabian Nights (MK6)",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, arwincm,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Arctic Wins",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, arish,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Arishinko",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, asnprinc,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Asian Princess",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, blkmust,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Black Mustang",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, bmbgs,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Bumble Bugs (USA)",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, cinhell,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Chance in Hell",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, crspru,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Crystal Springs (USA)",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, davedrag,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Dave Dragons",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, drfz6us,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Deep Freeze (MK6, USA)",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, dltbel,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Delta Belle",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, dmneyeus,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Diamond eyes",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, dmneye2,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Diamong Eyes 2",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, dblagus,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Double agent",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, eaglrock,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Eagle Rock",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, eastland,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Easter Island",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, eggsrich,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Eggstreme Riches",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, efcashex,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Enchanted Forest Cash Express",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, flamoly,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Flame Of Olympus",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, flamoly2,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Flames Of Olympus 2",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, flamolus,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Flames Of Olympus USA",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, foxred,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Foxworthy Redneck",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, frogwld,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Frog Wild",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, gwnn,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Game With No Name",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, gldgong,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Golden gong",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, gldgong2,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Golden Gong2",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, gldincas,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Golden Incas",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, hlntry,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Helen Of Troy",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, hlsunmon,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Hyperlink Sun and Moon",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, jefffox,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Jeff Foxworty",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, jewelunc,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Jewel Unchantress",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, lemrol,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Let Em Roll",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, lineking,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Line King",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, lovestrk,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Love Struck",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, mgforst,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Magic Forrest",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, mgmerm,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Magic Mermaid",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, metestrm,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Meteor Storm",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, mrwoo,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Mr Woo",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, mystarr,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Mystic Arrow",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, mysteyec,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Mystic Eyes(Cashman)",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, opsesam,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Open Sesame",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, pandpays,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Panda Pays",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, parilius,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Paris Lights",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, pelpetus,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Pelican pete",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, pelpetu2,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Pelican Pete 2",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, pennyar,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Penny Arcade",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, penpayus,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Penquin Pays",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, pompus2,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Pompeii2",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, rdtripus,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Road Trip",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, sealdeal,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Seal The Deal",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, shorthng,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Shore Thing",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, silkrdus,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Silk Road",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, stardrfu,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Star Drifter (USA)",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, stardrf2,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Star Drifter 2",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, statsymb,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Status Symbols",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, sunmon2,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Sun And Moon 2",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, sunqndol,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Sun Queen Dollar Storm",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, swhr2us,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Sweethearts 2",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, gbmoney,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "The Good Bad Money",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, tiktoru,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Tiki Torch",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, timwolfu,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Timberwolf",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, trkinus,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Treasure King",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, venicus,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Venice",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, whlcshus,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Whales Of Cash",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, whtwtr,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "White Water",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, wldafus,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Wild Africa",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, wldpntus,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Wild Panthers",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, wingolus,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Wings Of Olympus",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, zorrous,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Zorro",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, bobdolu1,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Bob And Dolly",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, pwsp1,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Players World Super",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
 
 
 
diff --git a/src/mame/mame.lst b/src/mame/mame.lst
index e72f1ea3a56..883a0c2f67a 100644
--- a/src/mame/mame.lst
+++ b/src/mame/mame.lst
@@ -1588,6 +1588,83 @@ werewild
 wldcatsa
 wgorilla
 bluetigr
+50lionr
+beavbuk
+aftrhrs
+atkgld
+apocof
+arbngts
+arwincm
+arish
+asnprinc
+blkmust
+bmbgs
+cinhell
+crspru
+davedrag
+drfz6us
+dltbel
+dmneyeus
+dmneye2
+dblagus
+eaglrock
+eastland
+eggsrich
+efcashex
+flamoly
+flamoly2
+flamolus
+foxred
+frogwld
+gwnn
+gldgong
+gldgong2
+gldincas
+hlntry
+hlsunmon
+jefffox
+jewelunc
+lemrol
+lineking
+lovestrk
+mgforst
+mgmerm
+metestrm
+pandpays
+mrwoo
+mystarr
+mysteyec
+opsesam
+parilius
+pelpetus
+pelpetu2
+pennyar
+penpayus
+pompus2
+rdtripus
+sealdeal
+shorthng
+silkrdus
+stardrfu
+stardrf2
+statsymb
+sunmon2
+sunqndol
+swhr2us
+gbmoney
+tiktoru
+timwolfu
+trkinus
+venicus
+whlcshus
+whtwtr
+wldafus
+wldpntus
+wingolus
+zorrous
+bobdolu1
+pwsp1
+
 
 @source:arkanoid.cpp
 ark1ball                        // bootleg

From 7e88f21303deeb36d0b0dd37710af9345bfd2bef Mon Sep 17 00:00:00 2001
From: David Haywood <mamehaze@users.noreply.github.com>
Date: Tue, 19 Apr 2016 06:35:11 +0100
Subject: [PATCH 087/122] part 4 (nw)

---
 src/mame/drivers/aristmk5.cpp | 215 ++++++++++++++++++++++++++++++++++
 src/mame/drivers/aristmk6.cpp |  84 ++++++++++++-
 src/mame/mame.lst             |  24 +++-
 3 files changed, 318 insertions(+), 5 deletions(-)

diff --git a/src/mame/drivers/aristmk5.cpp b/src/mame/drivers/aristmk5.cpp
index 65c02fe4468..8c53ba8f0f5 100644
--- a/src/mame/drivers/aristmk5.cpp
+++ b/src/mame/drivers/aristmk5.cpp
@@ -1977,6 +1977,203 @@ ROM_END_REGIONS
 
 
 
+ROM_START( dolptra )
+	ARISTOCRAT_MK5_BIOS
+	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
+	ROM_LOAD32_WORD("Dolphin Treasure 90 U11.bin", 0x0000000, 0x0080000, CRC(8e391b67) SHA1(4b7a7295d3a96e26bf1958eb30af0b6582a5e5a6) )
+	ROM_LOAD32_WORD("Dolphin Treasure 90 U12.bin", 0x0000000, 0x0080000, CRC(1a1fbbcf) SHA1(6e3772dcccd9b5958bec3bfac9af22b2eabca32e) )
+	ROM_LOAD32_WORD("Dolphin Treasure 90 U7.bin", 0x0000000, 0x0080000, CRC(7463b5f6) SHA1(89e5cf8143d0b4ed54aa2c9bd8840f0aba19322e) )
+	ROM_LOAD32_WORD("Dolphin Treasure 90 U8.bin", 0x0000000, 0x0080000, CRC(195bec0f) SHA1(86bdc53e682476c2d90c5e51d4bccdc048d22e7f) )
+ROM_END_REGIONS
+
+
+
+
+ROM_START( penpay20 )
+	ARISTOCRAT_MK5_BIOS
+	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
+	ROM_LOAD32_WORD("Penguin Pays 20 lines U11.BIN", 0x0000000, 0x0080000, CRC(7dd73770) SHA1(14a2edf8cd33280464f979976486e1a9ae73cef5) )
+	ROM_LOAD32_WORD("Penguin Pays 20 lines U12.BIN", 0x0000000, 0x0080000, CRC(123cbe90) SHA1(b51b84f79e0822a1be71485bbad514ab9fa55622) )
+	ROM_LOAD32_WORD("Penguin Pays 20 lines U7.BIN", 0x0000000, 0x0080000, CRC(cb21de26) SHA1(5a730f08db4d91b18f0b5a1f489f1d982b08edcc) )
+	ROM_LOAD32_WORD("Penguin Pays 20 lines U8.BIN", 0x0000000, 0x0080000, CRC(aa95406b) SHA1(fbec024dd210757a79a5ea4def79f88fed971e71) )
+ROM_END_REGIONS
+
+
+
+ROM_START( penpaya )
+	ARISTOCRAT_MK5_BIOS
+	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
+	ROM_LOAD32_WORD("PPAYSEPROM_U11.bin", 0x0000000, 0x0080000, CRC(c0f20ef7) SHA1(4df3aa337a2d4dd8ef29f4839b003c96fe1df526) )
+	ROM_LOAD32_WORD("PPAYSEPROM_U12.bin", 0x0000000, 0x0080000, CRC(d2882682) SHA1(dd42edca8ef9d28dd5b16fe8132f8e0fb3c85979) )
+	ROM_LOAD32_WORD("PPAYSEPROM_U7.bin", 0x0000000, 0x0080000, CRC(f51c4e02) SHA1(fca30b3ce0d063966df1e878338596d050664695) )
+	ROM_LOAD32_WORD("PPAYSEPROM_U8.bin", 0x0000000, 0x0080000, CRC(23ea514d) SHA1(bcb83a8d768b078a03260a00fa09a4e2350c568c) )
+ROM_END_REGIONS
+
+
+ROM_START( adonishl )
+	ARISTOCRAT_MK5_BIOS
+	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
+	ROM_LOAD32_WORD("U11.bin", 0x0000000, 0x0080000, CRC(309b0b55) SHA1(669568031d305b29395345a26a5d004d83881433) )
+	ROM_LOAD32_WORD("U12.bin", 0x0000000, 0x0080000, CRC(8b675dff) SHA1(275579d21be51e6ca01be7c57018e142d1d40875) )
+	ROM_LOAD32_WORD("U13.bin", 0x0000000, 0x0080000, CRC(e005a7e8) SHA1(cbb313f5d1d04c5a441b3f92b7a90a281ddb4885) )
+	ROM_LOAD32_WORD("U7.bin", 0x0000000, 0x0080000, CRC(32149323) SHA1(abfc6a8518a39528db3700c2cb558e925ceeda6d) )
+	ROM_LOAD32_WORD("U8.bin", 0x0000000, 0x0080000, CRC(e9185e3c) SHA1(99609a152a55246d0f5377f943deec47e68fb9fc) )
+	ROM_LOAD32_WORD("U9.bin", 0x0000000, 0x0080000, CRC(c2e973e7) SHA1(e89bdaa56b0c3c7bd77c8141421f76be9ff2e71b) )
+ROM_END_REGIONS
+
+
+
+ROM_START( goldphm )
+	ARISTOCRAT_MK5_BIOS
+	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
+	ROM_LOAD32_WORD("Golden Pyramid  Hyper Max U10.bin", 0x0000000, 0x0080000, CRC(8491dbc4) SHA1(f0d4e470f0774a6aac168334390c116fd3d1075e) )
+	ROM_LOAD32_WORD("Golden Pyramid  Hyper Max U11.bin", 0x0000000, 0x0080000, CRC(6ae3872f) SHA1(f8c1b31e4ebd4833dcc2b7cfff25f6473ad78f4e) )
+	ROM_LOAD32_WORD("Golden Pyramid  Hyper Max U12.bin", 0x0000000, 0x0080000, CRC(65cea496) SHA1(4b827e2707c259717bf759e76dca1c96efada926) )
+	ROM_LOAD32_WORD("Golden Pyramid  Hyper Max U13.bin", 0x0000000, 0x0080000, CRC(1b77bbd0) SHA1(c93d2f844032631d9594d02fa6ac41e21025a8ea) )
+	ROM_LOAD32_WORD("Golden Pyramid  Hyper Max U14.bin", 0x0000000, 0x0080000, CRC(4fbccf72) SHA1(97d6bb400caf78cb673a324d48d2580f1bbb1acd) )
+	ROM_LOAD32_WORD("Golden Pyramid  Hyper Max U7.bin", 0x0000000, 0x0080000, CRC(4ac2a82e) SHA1(3fc50e97ad48c57e21a37fbb6142152c72055ad4) )
+	ROM_LOAD32_WORD("Golden Pyramid  Hyper Max U8.bin", 0x0000000, 0x0080000, CRC(abbbf1de) SHA1(5efd88213180846ad8347e017e5ccee5b80b95d0) )
+	ROM_LOAD32_WORD("Golden Pyramid  Hyper Max U9.bin", 0x0000000, 0x0080000, CRC(750150eb) SHA1(a9ffe0b0bb2ef83a696fa568b0264d27bc650120) )
+ROM_END_REGIONS
+
+
+
+
+ROM_START( petshopa )
+	ARISTOCRAT_MK5_BIOS
+	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
+	ROM_LOAD32_WORD("Pet Shop  U11.bin", 0x0000000, 0x007fffd, CRC(bfaa9216) SHA1(19f1c7de05ff7f5f9f370be00cf8f0635e966809) ) // wrong size!
+	ROM_LOAD32_WORD("Pet Shop  U12.bin", 0x0000000, 0x0080000, CRC(2cd12986) SHA1(b6b0bd6dd8c964498edc3763cb5c450795042a8d) )
+	ROM_LOAD32_WORD("Pet Shop  U7.bin", 0x0000000, 0x0080000, CRC(cf4a24fa) SHA1(b510de9199d16ba7319e1b692d7c6c09fcb735dc) )
+	ROM_LOAD32_WORD("Pet Shop  U8.bin", 0x0000000, 0x0080000, CRC(bb9f7519) SHA1(fa311f1ec74c3b52e2feed36d7b7dc6a12336abe) )
+ROM_END_REGIONS
+
+
+
+
+ROM_START( retsam20 )
+	ARISTOCRAT_MK5_BIOS
+	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
+	ROM_LOAD32_WORD("Return of The Samura  U11.bin", 0x0000000, 0x0080000, CRC(e662404b) SHA1(f0da3384c81d01ec17d24b2191d3a0b0eaf48d12) )
+	ROM_LOAD32_WORD("Return of The Samura  U7.bin", 0x0000000, 0x0080000, CRC(e60859a1) SHA1(0be0114a87a21b955dfe24d01547e2d93dcb4f2c) )
+ROM_END_REGIONS
+
+
+
+ROM_START( retsam5 )
+	ARISTOCRAT_MK5_BIOS
+	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
+	ROM_LOAD32_WORD("Return of The Samura 9 U11.bin", 0x0000000, 0x0080000, CRC(99f61822) SHA1(88a726a5c9cae3a7d3120cb9013ca4d38ef8c560) )
+	ROM_LOAD32_WORD("Return of The Samura 9 U7.bin", 0x0000000, 0x0080000, CRC(acb913c1) SHA1(eb008b2b3d06f769f1ea1c75b52334e468c5f13c) )
+ROM_END_REGIONS
+
+
+
+
+
+
+ROM_START( supbuk2 )
+	ARISTOCRAT_MK5_BIOS
+	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
+	ROM_LOAD32_WORD("Super Bucks 2 U11.bin", 0x0000000, 0x0080000, CRC(f1b51a61) SHA1(8e9fcb071f704122e13333094828a41974646792) )
+	ROM_LOAD32_WORD("Super Bucks 2 U12.bin", 0x0000000, 0x0080000, CRC(f9b65d2b) SHA1(f519fc284aaa08d3619e4d88e92e690320cf5432) )
+	ROM_LOAD32_WORD("Super Bucks 2 U7.bin", 0x0000000, 0x0080000, CRC(f025775d) SHA1(71a94f6f17fa7cdcd997b0117b8f4afe21606a69) )
+	ROM_LOAD32_WORD("Super bucks 2 U8.bin", 0x0000000, 0x0080000, CRC(03912f4e) SHA1(48bdcd2160e05261b7d834c53e1d483acaad098f) )
+ROM_END_REGIONS
+
+
+
+
+
+ROM_START( topbana )
+	ARISTOCRAT_MK5_BIOS
+	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
+	ROM_LOAD32_WORD("Top Banana U11.bin", 0x0000000, 0x007fffa, CRC(140a73bc) SHA1(3fd88797b6310f5849e901d032fbeb8a2d8604fb) )
+	ROM_LOAD32_WORD("Top Banana U7.bin", 0x0000000, 0x0080000, CRC(1f60241c) SHA1(3a6207d9c919319fc10b6de63bc030f8d335588e) )
+ROM_END_REGIONS
+
+
+
+ROM_START( wldamz1 )
+	ARISTOCRAT_MK5_BIOS
+	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
+	ROM_LOAD32_WORD("Wild Amazon  U11.bin", 0x0000000, 0x0080000, CRC(54b2a375) SHA1(635fde5c678b908fa58c0e04ba9b7a84fac1f7fe) )
+	ROM_LOAD32_WORD("Wild Amazon  U7.bin", 0x0000000, 0x0080000, CRC(bfa21358) SHA1(6b76656401b3dbbace8d4335951468b9885fc7f0) )
+	ROM_LOAD32_WORD("Wild Amazon  U8.bin", 0x0000000, 0x0080000, CRC(4e39f128) SHA1(91d3c6a9e5c30275c3f8967dde55214df097f2ba) )
+	ROM_LOAD32_WORD("Wild Amazon U12.bin", 0x0000000, 0x0080000, CRC(2cd12986) SHA1(b6b0bd6dd8c964498edc3763cb5c450795042a8d) )
+ROM_END_REGIONS
+
+
+
+ROM_START( wldamz3 )
+	ARISTOCRAT_MK5_BIOS
+	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
+	ROM_LOAD32_WORD("Wild Amazon U11.bin", 0x0000000, 0x0080000, CRC(2e24756a) SHA1(247db8316e7815be7524aefc43a5756fad84779a) )
+	ROM_LOAD32_WORD("Wild Amazon U7.bin", 0x0000000, 0x0080000, CRC(44576def) SHA1(3396460444ceb394c9c88e5fc37ccedcfc4b179c) )
+ROM_END_REGIONS
+
+
+
+
+ROM_START( wldthg )
+	ARISTOCRAT_MK5_BIOS
+	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
+	ROM_LOAD32_WORD("WILDTHING_U11.bin", 0x0000000, 0x0080000, CRC(61d22f2e) SHA1(b836e5afbd5bb14ae68e100a6042f1953ed57a21) )
+	ROM_LOAD32_WORD("WILDTHING_U12.bin", 0x0000000, 0x0080000, CRC(450a4f4f) SHA1(e59fb3260755a125c47ff6c1a042a48b0eace72d) )
+	ROM_LOAD32_WORD("WILDTHING_U7.bin", 0x0000000, 0x0080000, CRC(eb402ffb) SHA1(49ef6ca2503a6e785f62cb29e505e5c2ba019e37) )
+	ROM_LOAD32_WORD("WILDTHING_U8.bin", 0x0000000, 0x0080000, CRC(f21153b8) SHA1(24830b3939a8568b0d5b59d4fdbd2d9e7b46a6d7) )
+ROM_END_REGIONS
+
+
+
+ROM_START( cshcat )
+	ARISTOCRAT_MK5_BIOS
+	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
+	ROM_LOAD32_WORD("Cash Cat NZ_U11.bin", 0x0000000, 0x0080000, CRC(e60e8bd1) SHA1(ffaa7be8968047b9ee54a117d273a14cbca41028) )
+	ROM_LOAD32_WORD("Cash Cat NZ_U12.bin", 0x0000000, 0x0080000, CRC(f930fc07) SHA1(cb3fdbd5b87af7b14067f7999740470d3cf434df) )
+	ROM_LOAD32_WORD("Cash Cat NZ_U7.bin", 0x0000000, 0x0080000, CRC(de0f0202) SHA1(994f6c47b1e2e0e133853dc69b189752104486e4) )
+	ROM_LOAD32_WORD("Cash Cat NZ_U8.bin", 0x0000000, 0x0080000, CRC(37d41d35) SHA1(c959b787383d6f91d20e18f37a38a965407a9ff0) )
+ROM_END_REGIONS
+
+
+
+
+ROM_START( incanz )
+	ARISTOCRAT_MK5_BIOS
+	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
+	ROM_LOAD32_WORD("INCASUN NZ_U11.bin", 0x0000000, 0x0080000, CRC(2ff86b76) SHA1(c491ca19320bd3e15199b3ca1fcf36a70e386daa) )
+	ROM_LOAD32_WORD("INCASUN NZ_U12.bin", 0x0000000, 0x0080000, CRC(d91114c5) SHA1(fa88c70d81ff5e4df539b873803376e79eb6a479) )
+	ROM_LOAD32_WORD("INCASUN NZ_U13.bin", 0x0000000, 0x0080000, CRC(472f4097) SHA1(5ebe72b138cdc67989db17c82979eeddc60a081e) )
+	ROM_LOAD32_WORD("INCASUN NZ_U7.bin", 0x0000000, 0x0080000, CRC(1e7be5ca) SHA1(333b7665fab8f60fb60e9d3b44de96725763ca17) )
+	ROM_LOAD32_WORD("INCASUN NZ_U8.bin", 0x0000000, 0x0080000, CRC(3eb64fc9) SHA1(31f7d56443091da211c45dddb97375305c3cfeae) )
+	ROM_LOAD32_WORD("INCASUN NZ_U9.bin", 0x0000000, 0x0080000, CRC(6da340db) SHA1(4d7528aa27561185a7d53a0c44a4e95e40aadc26) )
+ROM_END_REGIONS
+
+
+
+ROM_START( loconz )
+	ARISTOCRAT_MK5_BIOS
+	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
+	ROM_LOAD32_WORD("Loco Loot NZ_U11.bin", 0x0000000, 0x0080000, CRC(93b0bde3) SHA1(06cb79482f8a94e1a504eead9cdf6da41cba1fb9) )
+	ROM_LOAD32_WORD("Loco Loot NZ_U12.bin", 0x0000000, 0x0080000, CRC(29f03505) SHA1(c173167f43cc2eef0e063118e03bc37a87188391) )
+	ROM_LOAD32_WORD("Loco Loot NZ_U7.bin", 0x0000000, 0x0080000, CRC(164dd049) SHA1(c99c56af72cb1eb69591cb8f7bacbd06bdb6494d) )
+	ROM_LOAD32_WORD("Loco Loot NZ_U8.bin", 0x0000000, 0x0080000, CRC(8cb449ce) SHA1(2372cf126c2c95d9637b0a761dfc7ea223f0aa54) )
+ROM_END_REGIONS
+
+
+
+
+ROM_START( mtreenz )
+	ARISTOCRAT_MK5_BIOS
+	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )	
+	ROM_LOAD32_WORD("MONEYTREE NZ_U11.bin", 0x0000000, 0x0080000, CRC(7a03e436) SHA1(016e6e36f7ca6f4c3b427cf98a1415ef6aa57225) )
+	ROM_LOAD32_WORD("MONEYTREE NZ_U12.bin", 0x0000000, 0x0080000, CRC(b11f51d0) SHA1(1579a24d470f418713334259368c7a4e35e8b5d3) )
+	ROM_LOAD32_WORD("MONEYTREE NZ_U13.bin", 0x0000000, 0x0080000, CRC(e1f23c3f) SHA1(fe74c219c738625257fb62806e271a60075aaa07) )
+	ROM_LOAD32_WORD("MONEYTREE NZ_U7.bin", 0x0000000, 0x0080000, CRC(982a0078) SHA1(163c15aebd2be623c0f2c7641360336399bc1f4f) )
+	ROM_LOAD32_WORD("MONEYTREE NZ_U8.bin", 0x0000000, 0x0080000, CRC(878b6419) SHA1(572d6a10cbf2b96e9afee4b3f32e9ad1ce7eabbb) )
+	ROM_LOAD32_WORD("MONEYTREE NZ_U9.bin", 0x0000000, 0x0080000, CRC(816fda3f) SHA1(d5eb7572a93e2a4681a2b1db7f302c5528f1c1c3) )
+ROM_END_REGIONS
+
 
 /*************************
 *      Game Drivers      *
@@ -2078,3 +2275,21 @@ GAME( 199?,rwarhl,  aristmk5, aristmk5_usa, aristmk5, aristmk5_state, aristmk5,
 GAME( 199?, retrsam,  aristmk5, aristmk5_usa, aristmk5, aristmk5_state, aristmk5, ROT0, "Aristocrat", "Return Of The Samurai (0400549V)",                 MACHINE_FLAGS )
 GAME( 199?, unicornd,  aristmk5, aristmk5_usa, aristmk5, aristmk5_state, aristmk5, ROT0, "Aristocrat", "Unicorn Dreaming",                 MACHINE_FLAGS )
 
+GAME( 199?, dolptra,  aristmk5, aristmk5_usa, aristmk5, aristmk5_state, aristmk5, ROT0, "Aristocrat", "Dolphin Treasure (alt)",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 199?, penpay20,  aristmk5, aristmk5_usa, aristmk5, aristmk5_state, aristmk5, ROT0,  "Aristocrat", "Penguin Pays (20 Line)",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 199?, penpaya,  aristmk5, aristmk5_usa, aristmk5, aristmk5_state, aristmk5, ROT0,  "Aristocrat", "Penguin Pays (alt)",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 199?, adonishl,  aristmk5, aristmk5_usa, aristmk5, aristmk5_state, aristmk5, ROT0,  "Aristocrat", "Adonis Hyperlink",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+
+GAME( 199?, goldphm,  aristmk5, aristmk5_usa, aristmk5, aristmk5_state, aristmk5, ROT0, "Aristocrat", "Golden Pyramid  Hyper Max",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 199?, petshopa,  aristmk5, aristmk5_usa, aristmk5, aristmk5_state, aristmk5, ROT0, "Aristocrat", "Pet Shop",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 199?, retsam20,  aristmk5, aristmk5_usa, aristmk5, aristmk5_state, aristmk5, ROT0, "Aristocrat", "Return of The Samura  20line",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 199?, retsam5,  aristmk5, aristmk5_usa, aristmk5, aristmk5_state, aristmk5, ROT0, "Aristocrat", "Return of The Samura  5line",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 199?, supbuk2,  aristmk5, aristmk5_usa, aristmk5, aristmk5_state, aristmk5, ROT0, "Aristocrat", "Superbucks 2",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 199?, topbana,  aristmk5, aristmk5_usa, aristmk5, aristmk5_state, aristmk5, ROT0, "Aristocrat", "Top Banana",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 199?, wldamz1,  aristmk5, aristmk5_usa, aristmk5, aristmk5_state, aristmk5, ROT0, "Aristocrat", "Wild Amazon (1 Line)",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 199?, wldamz3,  aristmk5, aristmk5_usa, aristmk5, aristmk5_state, aristmk5, ROT0, "Aristocrat", "Wild Amazon (3 Lines)",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 199?, wldthg,  aristmk5, aristmk5_usa, aristmk5, aristmk5_state, aristmk5, ROT0, "Aristocrat", "Wild Thing",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 199?, cshcat,  aristmk5, aristmk5_usa, aristmk5, aristmk5_state, aristmk5, ROT0, "Aristocrat", "Cash Cat (NZ)",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 199?, incanz,  aristmk5, aristmk5_usa, aristmk5, aristmk5_state, aristmk5, ROT0, "Aristocrat", "Inca Sun (NZ)",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 199?, loconz,  aristmk5, aristmk5_usa, aristmk5, aristmk5_state, aristmk5, ROT0, "Aristocrat", "Loco Loot (NZ)",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 199?, mtreenz,  aristmk5, aristmk5_usa, aristmk5, aristmk5_state, aristmk5, ROT0, "Aristocrat", "Money Tree (NZ)",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
diff --git a/src/mame/drivers/aristmk6.cpp b/src/mame/drivers/aristmk6.cpp
index c9f97af1a17..4c312408ba5 100644
--- a/src/mame/drivers/aristmk6.cpp
+++ b/src/mame/drivers/aristmk6.cpp
@@ -291,7 +291,29 @@ MACHINE_CONFIG_END
 	ROM_LOAD32_WORD_BIOS( 14, "U83 -02 Cs 08DD", 0x0000000, 0x0100000, CRC(e4001f60) SHA1(5da34efb1ac0f7c84a48e09363d20cfecda4bcf1) ) \
 	ROM_SYSTEM_BIOS( 15, "bios15",   "Aristocrat MK6 Base (01.04.08, USA)" ) \
 	ROM_LOAD32_WORD_BIOS( 15, "base-01.04.08-u70-u20-left-cs-8509.bin", 0x0000000, 0x0200000, CRC(0dfcad10) SHA1(53798be000304aed38909f5fd8470a68bedd8229) ) /* from bubdul */ \
-	ROM_LOAD32_WORD_BIOS( 15, "base-01.04.08-u83-u10-right-cs-d74e.bin", 0x0000000, 0x0200000, CRC(95333304) SHA1(7afe49d6c5e4d6820f349778557daa88c5366a51) )
+	ROM_LOAD32_WORD_BIOS( 15, "base-01.04.08-u83-u10-right-cs-d74e.bin", 0x0000000, 0x0200000, CRC(95333304) SHA1(7afe49d6c5e4d6820f349778557daa88c5366a51) )\
+	ROM_SYSTEM_BIOS( 16, "bios15",   "Aristocrat MK6 Base (02061013)" ) \
+	ROM_LOAD32_WORD_BIOS( 16,"02061013 System 02 Left.bin", 0x0000000, 0x0100000, CRC(e70a7007) SHA1(0935f924866162d9c0fbdbb99391cbf730a04b76) ) \
+	ROM_LOAD32_WORD_BIOS( 16,"02061013 System 02 Right.bin", 0x0000000, 0x0100000, CRC(7a8619a5) SHA1(bd03ddb68817c1660b009e102ccf69e5b603b875) ) \
+	ROM_SYSTEM_BIOS( 17, "bios15",   "Aristocrat MK6 Base (03030708)" ) \
+	ROM_LOAD32_WORD_BIOS( 17,"03030708 System 03 SA LEFT.bin", 0x0000000, 0x0100000, CRC(4e5ad823) SHA1(77ab1c29c6172cfdcef776222a72b2b44114d4da) ) \
+	ROM_LOAD32_WORD_BIOS( 17,"03030708 System 03 SA RIGHT.bin", 0x0000000, 0x0100000, CRC(b4b3c6a5) SHA1(5747f98a6eaa5c24a23d1d76a28b33a3bfbbfd1f) ) \
+	ROM_SYSTEM_BIOS( 18, "bios15",   "Aristocrat MK6 Base (09011001)" ) \
+	ROM_LOAD32_WORD_BIOS( 18,"09011001_SYSTEM_09_EPROM_NSW_LEFT.BIN", 0x0000000, 0x0200000, CRC(229c2e63) SHA1(91fd2b1acb69efe073647e93db9f11042add2feb) ) \
+	ROM_LOAD32_WORD_BIOS( 18,"09011001_SYSTEM_09_EPROM_NSW_RIGHT.BIN", 0x0000000, 0x0200000, CRC(8a853f80) SHA1(9a75498f7b02c81a483b4e1c158f35f0ee4c0112) ) \
+	ROM_SYSTEM_BIOS( 19, "bios15",   "Aristocrat MK6 Base (11011501)" ) \
+	ROM_LOAD32_WORD_BIOS( 19,"11011501_SYSTEM_11_EPROM_NSW_2MB_M27V160_LEFT.bin", 0x0000000, 0x0200000, CRC(c5cc3461) SHA1(5b43c4cb6110a6ccf67cd0f3789253f6872b20c4) ) \
+	ROM_LOAD32_WORD_BIOS( 19,"11011501_SYSTEM_11_EPROM_NSW_2MB_M27V160_RIGHT.bin", 0x0000000, 0x0200000, CRC(de4c3aed) SHA1(21596a2edd20eb7de7a4ec8900a270b09c8f326f) ) \
+	ROM_SYSTEM_BIOS( 20, "bios15",   "Aristocrat MK6 Base (14011913)" ) \
+	ROM_LOAD32_WORD_BIOS( 20,"14011913 System 14 Eprom Left.bin", 0x0000000, 0x0200000, CRC(9a4cefdf) SHA1(6c15bc565ede8af19361d60ee1e6657a8055c92c) ) \
+	ROM_LOAD32_WORD_BIOS( 20,"14011913 System 14 Eprom Right.bin", 0x0000000, 0x0200000, CRC(01d13b89) SHA1(b1013366d0803dfbec5a5f90f6a5cea862de0513) ) \
+	ROM_SYSTEM_BIOS( 21, "bios15",   "Aristocrat MK6 Base (01.04.11)" ) \
+	ROM_LOAD32_WORD_BIOS( 21,"01.04.11 System U70.bin", 0x0000000, 0x0200000, CRC(787f2b07) SHA1(2548289e44f4b935346b759afb5383bdbac04c3e) ) \
+	ROM_LOAD32_WORD_BIOS( 21,"01.04.11 System U83.bin", 0x0000000, 0x0200000, CRC(2dae8ca0) SHA1(7a0fb38b4c1ac7195d15bdab6f0cfb16c78430f0) ) \
+	ROM_SYSTEM_BIOS( 22, "bios15",   "Aristocrat MK6 Set Chips (06.03.04)" ) \
+	ROM_LOAD32_WORD_BIOS( 22,"Set 06.03.04 U2.bin", 0x0000000, 0x0100000, CRC(6f5f5ef1) SHA1(70a43fba4de47ed8dcf38b25eafd5873f3428e72) ) \
+	ROM_LOAD32_WORD_BIOS( 22,"Set 06.03.04 U3.bin", 0x0000000, 0x0100000, CRC(7034f26b) SHA1(7be78f23bec38d05240cdfe1186ec0c8291f5a1c) ) 
+
 
 
 ROM_START( aristmk6 )
@@ -2271,9 +2293,16 @@ ROM_START( flamolus )
 	ROM_LOAD32_WORD("Flames of Olympus U73 1DCC4068.bin", 0x0000000, 0x0400000, CRC(aad37086) SHA1(76495ba46da0ae848ba290706be337c45afe6361) )
 	ROM_LOAD32_WORD("Flames of Olympus U85 09EFD2C9.bin", 0x0000000, 0x0400000, CRC(4fcd025d) SHA1(63aa8d0f5dd331e10c032cc5ac67516054db7c27) )
 	ROM_LOAD32_WORD("Flames of Olympus U86 1E2A1492.bin", 0x0000000, 0x0400000, CRC(f06f3d69) SHA1(83e1d2f72275de836e170c1c10905cb6da58b90a) )
-//	ROM_LOAD32_WORD("Set Chip 06.02.20 MK6.rar", 0x0000000, 0x00b121d, CRC(7dc71e5d) SHA1(37baae165df4cd11ad6e63f845cb76c51ab9f43a) )
 ROM_END
 
+ROM_START( flamolusa )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("Flames of Olympus U72 09ECD2D8_alt.bin", 0x0000000, 0x0400000, CRC(b4581c28) SHA1(1daa0f1218dba6e6eb96b7925ea71be531ffa787) )
+	ROM_LOAD32_WORD("Flames of Olympus U73 1DCC4068.bin", 0x0000000, 0x0400000, CRC(aad37086) SHA1(76495ba46da0ae848ba290706be337c45afe6361) )
+	ROM_LOAD32_WORD("Flames of Olympus U85 09EFD2C9.bin", 0x0000000, 0x0400000, CRC(4fcd025d) SHA1(63aa8d0f5dd331e10c032cc5ac67516054db7c27) )
+	ROM_LOAD32_WORD("Flames of Olympus U86 1E2A1492.bin", 0x0000000, 0x0400000, CRC(f06f3d69) SHA1(83e1d2f72275de836e170c1c10905cb6da58b90a) )
+ROM_END
 
 
 ROM_START( foxred )
@@ -2856,10 +2885,47 @@ ROM_START( pwsp1 )
 ROM_END
 
 
+ROM_START( adonis6 )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("US_Adonis_U73.bin", 0x0000000, 0x0400000, CRC(eba9e84f) SHA1(bf746ea356627b1a558b4c8f8a2d8d5c54400a4a) )
+	ROM_LOAD32_WORD("US_Adonis_U86.bin", 0x0000000, 0x0400000, CRC(0eeb0ac3) SHA1(72b2b4711eb9d962bfb58fac1a5226ac81db67ea) )
+ROM_END
+
+
+
+ROM_START( starqst )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("Star Quest  U73.bin", 0x0000000, 0x0400000, CRC(facf51b6) SHA1(73c13d507b65cd98ae43918c21b492a8499dd538) )
+	ROM_LOAD32_WORD("Star Quest  U86.bin", 0x0000000, 0x0400000, CRC(c21f4486) SHA1(5a6a532d73bf56f68f473bd56a7c3d9f0660d661) )
+ROM_END
+
+
+ROM_START( eaglst1 )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("Eagle Strike U73.bin", 0x0000000, 0x0400000, CRC(94ff83d2) SHA1(54a02cdfb205a429d7458ecb51ba20083306011e) )
+	ROM_LOAD32_WORD("Eagle Strike U70.bin", 0x0000000, 0x0400000, CRC(b899e64b) SHA1(1f1d800df39de444b03ff4cc85bf4cf073f88423) )
+	ROM_LOAD32_WORD("Eagle Strike U71.bin", 0x0000000, 0x0400000, CRC(7311d99c) SHA1(802abed830ca3204ce50072ac69d0a3cae8f17e5) )
+	ROM_LOAD32_WORD("Eagle Strike U72.bin", 0x0000000, 0x0400000, CRC(4d96aef2) SHA1(40860ad6a0f82d79347b65b182f72dfbec23cd74) )
+ROM_END
 
 
 
 
+ROM_START( eaglst2 )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("Eagle Strike.u86", 0x0000000, 0x0400000, CRC(71c8121b) SHA1(1a4534b8e43dbc173809b5a621d6796a7a8655cf) )
+	ROM_LOAD32_WORD("Eagle Strike.u83", 0x0000000, 0x0400000, CRC(d70198eb) SHA1(1e4c157deec921386623091b27180c9c53551f44) )
+	ROM_LOAD32_WORD("Eagle Strike.u84", 0x0000000, 0x0400000, CRC(664c3d45) SHA1(26ce8a7e88eddc94ecce5ada78654e6f30a985d6) )
+	ROM_LOAD32_WORD("Eagle Strike.u85", 0x0000000, 0x0400000, CRC(c7430ac8) SHA1(e6f7e523ef2c4aad584a08ce9c70e0e535d89890) )
+	ROM_LOAD32_WORD("Eagle Strike.u72", 0x0000000, 0x0400000, CRC(4d96aef2) SHA1(40860ad6a0f82d79347b65b182f72dfbec23cd74) )
+	ROM_LOAD32_WORD("Eagle Strike.u73", 0x0000000, 0x0400000, CRC(94ff83d2) SHA1(54a02cdfb205a429d7458ecb51ba20083306011e) )
+	ROM_LOAD32_WORD("Eagle Strike.u71", 0x0000000, 0x0400000, CRC(7311d99c) SHA1(802abed830ca3204ce50072ac69d0a3cae8f17e5) )
+	ROM_LOAD32_WORD("Eagle Strike.u70", 0x0000000, 0x0400000, CRC(b899e64b) SHA1(1f1d800df39de444b03ff4cc85bf4cf073f88423) )
+ROM_END
 
 
 
@@ -3051,7 +3117,8 @@ GAME( 200?, eggsrich,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, R
 GAME( 200?, efcashex,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Enchanted Forest Cash Express",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
 GAME( 200?, flamoly,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Flame Of Olympus",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
 GAME( 200?, flamoly2,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Flames Of Olympus 2",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
-GAME( 200?, flamolus,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Flames Of Olympus USA",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, flamolus,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Flames Of Olympus USA (set 1)",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, flamolusa,  flamolus,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Flames Of Olympus USA (set 2)",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // one of these must be bad
 GAME( 200?, foxred,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Foxworthy Redneck",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
 GAME( 200?, frogwld,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Frog Wild",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
 GAME( 200?, gwnn,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Game With No Name",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
@@ -3102,6 +3169,14 @@ GAME( 200?, wingolus,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, R
 GAME( 200?, zorrous,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Zorro",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
 GAME( 200?, bobdolu1,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Bob And Dolly",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
 GAME( 200?, pwsp1,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Players World Super",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, adonis6, aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Adonis (USA)",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+
+// marked as 'unfinished'
+GAME( 200?, starqst,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Star Quest",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, eaglst1,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Eagle Strike (set 1)",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, eaglst2,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Eagle Strike (set 2)",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+
+
 
 
 
@@ -3325,3 +3400,6 @@ Sweet Hearts II
 Venetian Nights             MK5 version is possibly rare
 Wicked Winnings             Only seen a Cash Express Hyperlink version so far, not to be confused with the more common 'Wicked Winnings II - Power Pay'
 */
+
+
+
diff --git a/src/mame/mame.lst b/src/mame/mame.lst
index 883a0c2f67a..cb46493c1ff 100644
--- a/src/mame/mame.lst
+++ b/src/mame/mame.lst
@@ -1429,7 +1429,23 @@ qonileb
 rwarhl
 retrsam
 unicornd
-
+dolptra
+penpay20
+penpaya
+adonishl
+goldphm
+petshopa
+retsam20
+retsam5
+supbuk2
+topbana
+wldamz1
+wldamz3
+wldthg
+cshcat
+incanz
+loconz
+mtreenz
 
 @source:aristmk6.cpp
 50lions                         // (c) 2002
@@ -1614,6 +1630,7 @@ efcashex
 flamoly
 flamoly2
 flamolus
+flamolusa
 foxred
 frogwld
 gwnn
@@ -1664,7 +1681,10 @@ wingolus
 zorrous
 bobdolu1
 pwsp1
-
+adonis6
+starqst
+eaglst1
+eaglst2
 
 @source:arkanoid.cpp
 ark1ball                        // bootleg

From a87aef72fe91d28996dd8f5e84e746506729e3bb Mon Sep 17 00:00:00 2001
From: David Haywood <mamehaze@users.noreply.github.com>
Date: Tue, 19 Apr 2016 07:01:30 +0100
Subject: [PATCH 088/122] (nw)

---
 src/mame/drivers/aristmk6.cpp | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/mame/drivers/aristmk6.cpp b/src/mame/drivers/aristmk6.cpp
index 4c312408ba5..8a7648f0200 100644
--- a/src/mame/drivers/aristmk6.cpp
+++ b/src/mame/drivers/aristmk6.cpp
@@ -292,28 +292,30 @@ MACHINE_CONFIG_END
 	ROM_SYSTEM_BIOS( 15, "bios15",   "Aristocrat MK6 Base (01.04.08, USA)" ) \
 	ROM_LOAD32_WORD_BIOS( 15, "base-01.04.08-u70-u20-left-cs-8509.bin", 0x0000000, 0x0200000, CRC(0dfcad10) SHA1(53798be000304aed38909f5fd8470a68bedd8229) ) /* from bubdul */ \
 	ROM_LOAD32_WORD_BIOS( 15, "base-01.04.08-u83-u10-right-cs-d74e.bin", 0x0000000, 0x0200000, CRC(95333304) SHA1(7afe49d6c5e4d6820f349778557daa88c5366a51) )\
-	ROM_SYSTEM_BIOS( 16, "bios15",   "Aristocrat MK6 Base (02061013)" ) \
+	ROM_SYSTEM_BIOS( 16, "bios16",   "Aristocrat MK6 Base (02061013)" ) \
 	ROM_LOAD32_WORD_BIOS( 16,"02061013 System 02 Left.bin", 0x0000000, 0x0100000, CRC(e70a7007) SHA1(0935f924866162d9c0fbdbb99391cbf730a04b76) ) \
 	ROM_LOAD32_WORD_BIOS( 16,"02061013 System 02 Right.bin", 0x0000000, 0x0100000, CRC(7a8619a5) SHA1(bd03ddb68817c1660b009e102ccf69e5b603b875) ) \
-	ROM_SYSTEM_BIOS( 17, "bios15",   "Aristocrat MK6 Base (03030708)" ) \
+	ROM_SYSTEM_BIOS( 17, "bios17",   "Aristocrat MK6 Base (03030708)" ) \
 	ROM_LOAD32_WORD_BIOS( 17,"03030708 System 03 SA LEFT.bin", 0x0000000, 0x0100000, CRC(4e5ad823) SHA1(77ab1c29c6172cfdcef776222a72b2b44114d4da) ) \
 	ROM_LOAD32_WORD_BIOS( 17,"03030708 System 03 SA RIGHT.bin", 0x0000000, 0x0100000, CRC(b4b3c6a5) SHA1(5747f98a6eaa5c24a23d1d76a28b33a3bfbbfd1f) ) \
-	ROM_SYSTEM_BIOS( 18, "bios15",   "Aristocrat MK6 Base (09011001)" ) \
+	ROM_SYSTEM_BIOS( 18, "bios18",   "Aristocrat MK6 Base (09011001)" ) \
 	ROM_LOAD32_WORD_BIOS( 18,"09011001_SYSTEM_09_EPROM_NSW_LEFT.BIN", 0x0000000, 0x0200000, CRC(229c2e63) SHA1(91fd2b1acb69efe073647e93db9f11042add2feb) ) \
 	ROM_LOAD32_WORD_BIOS( 18,"09011001_SYSTEM_09_EPROM_NSW_RIGHT.BIN", 0x0000000, 0x0200000, CRC(8a853f80) SHA1(9a75498f7b02c81a483b4e1c158f35f0ee4c0112) ) \
-	ROM_SYSTEM_BIOS( 19, "bios15",   "Aristocrat MK6 Base (11011501)" ) \
+	ROM_SYSTEM_BIOS( 19, "bios19",   "Aristocrat MK6 Base (11011501)" ) \
 	ROM_LOAD32_WORD_BIOS( 19,"11011501_SYSTEM_11_EPROM_NSW_2MB_M27V160_LEFT.bin", 0x0000000, 0x0200000, CRC(c5cc3461) SHA1(5b43c4cb6110a6ccf67cd0f3789253f6872b20c4) ) \
 	ROM_LOAD32_WORD_BIOS( 19,"11011501_SYSTEM_11_EPROM_NSW_2MB_M27V160_RIGHT.bin", 0x0000000, 0x0200000, CRC(de4c3aed) SHA1(21596a2edd20eb7de7a4ec8900a270b09c8f326f) ) \
-	ROM_SYSTEM_BIOS( 20, "bios15",   "Aristocrat MK6 Base (14011913)" ) \
+	ROM_SYSTEM_BIOS( 20, "bios20",   "Aristocrat MK6 Base (14011913)" ) \
 	ROM_LOAD32_WORD_BIOS( 20,"14011913 System 14 Eprom Left.bin", 0x0000000, 0x0200000, CRC(9a4cefdf) SHA1(6c15bc565ede8af19361d60ee1e6657a8055c92c) ) \
 	ROM_LOAD32_WORD_BIOS( 20,"14011913 System 14 Eprom Right.bin", 0x0000000, 0x0200000, CRC(01d13b89) SHA1(b1013366d0803dfbec5a5f90f6a5cea862de0513) ) \
-	ROM_SYSTEM_BIOS( 21, "bios15",   "Aristocrat MK6 Base (01.04.11)" ) \
+	ROM_SYSTEM_BIOS( 21, "bios21",   "Aristocrat MK6 Base (01.04.11)" ) \
 	ROM_LOAD32_WORD_BIOS( 21,"01.04.11 System U70.bin", 0x0000000, 0x0200000, CRC(787f2b07) SHA1(2548289e44f4b935346b759afb5383bdbac04c3e) ) \
 	ROM_LOAD32_WORD_BIOS( 21,"01.04.11 System U83.bin", 0x0000000, 0x0200000, CRC(2dae8ca0) SHA1(7a0fb38b4c1ac7195d15bdab6f0cfb16c78430f0) ) \
-	ROM_SYSTEM_BIOS( 22, "bios15",   "Aristocrat MK6 Set Chips (06.03.04)" ) \
+	ROM_SYSTEM_BIOS( 22, "bios22",   "Aristocrat MK6 Set Chips (06.03.04)" ) \
 	ROM_LOAD32_WORD_BIOS( 22,"Set 06.03.04 U2.bin", 0x0000000, 0x0100000, CRC(6f5f5ef1) SHA1(70a43fba4de47ed8dcf38b25eafd5873f3428e72) ) \
-	ROM_LOAD32_WORD_BIOS( 22,"Set 06.03.04 U3.bin", 0x0000000, 0x0100000, CRC(7034f26b) SHA1(7be78f23bec38d05240cdfe1186ec0c8291f5a1c) ) 
-
+	ROM_LOAD32_WORD_BIOS( 22,"Set 06.03.04 U3.bin", 0x0000000, 0x0100000, CRC(7034f26b) SHA1(7be78f23bec38d05240cdfe1186ec0c8291f5a1c) ) \
+	ROM_SYSTEM_BIOS( 23, "bios23",   "Aristocrat MK6 (USA, set 3)" ) \
+	ROM_LOAD32_WORD_BIOS( 23,"US_system_U70.bin", 0x0000000, 0x0200000, CRC(0095e3f9) SHA1(d2e8786158b1ab0a614aab21cf1d14cbc04754af) ) \
+	ROM_LOAD32_WORD_BIOS( 23,"US_system_U83.bin", 0x0000000, 0x0200000, CRC(2c7f1ec3) SHA1(d03167f43ed6f9596080d91472695829378cef0a) )
 
 
 ROM_START( aristmk6 )
@@ -3090,7 +3092,7 @@ GAME( 200?, tikitalk,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, R
 GAME( 200?, werewild,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Werewolf Wild",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
 GAME( 200?, wldcatsa,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Wild Cats",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
 GAME( 200?, wgorilla,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Wild Gorilla",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
-GAME( 200?, bluetigr,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Blue Tiger\20259511",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, bluetigr,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Blue Tiger (20259511)",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
 GAME( 200?, 50lionr,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "50 Lions Roaring Riches",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
 GAME( 200?, beavbuk,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Beaver Bucks",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
 // sets below marked as 'USA'

From 514ed2af23ff3d72820c465a88c3731486a9eb55 Mon Sep 17 00:00:00 2001
From: Katsuhiko Kagami <kgm@be.to>
Date: Tue, 19 Apr 2016 19:32:13 +0900
Subject: [PATCH 089/122] update for japanese

---
 language/Japanese/strings.po | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/language/Japanese/strings.po b/language/Japanese/strings.po
index cd68eb62131..ba9761e633d 100644
--- a/language/Japanese/strings.po
+++ b/language/Japanese/strings.po
@@ -754,7 +754,7 @@ msgstr "チート"
 
 #: src/emu/ui/mainmenu.cpp:135
 msgid "Plugin Options"
-msgstr ""
+msgstr "プラグイン設定"
 
 #: src/emu/ui/mainmenu.cpp:139
 msgid "External DAT View"
@@ -892,15 +892,15 @@ msgstr "%s.txtをuiフォルダーに保存しました。"
 
 #: src/emu/ui/miscmenu.cpp:677
 msgid "Export list in XML format (like -listxml)"
-msgstr ""
+msgstr "XML形式でリストを出力（-listxml同様）"
 
 #: src/emu/ui/miscmenu.cpp:678
 msgid "Export list in XML format (like -listxml, but exclude devices)"
-msgstr ""
+msgstr "XML形式でリストを出力（-listxml同様、デバイスを除く）"
 
 #: src/emu/ui/miscmenu.cpp:679
 msgid "Export list in TXT format (like -listfull)"
-msgstr ""
+msgstr "TXT形式でリストを出力（-listfull同様）"
 
 #: src/emu/ui/miscmenu.cpp:729 src/emu/ui/optsmenu.cpp:376
 msgid ""
@@ -918,7 +918,7 @@ msgstr ""
 
 #: src/emu/ui/miscmenu.cpp:776
 msgid "Driver"
-msgstr ""
+msgstr "ドライバ"
 
 #: src/emu/ui/miscmenu.cpp:790
 msgid "Save machine configuration"
@@ -926,7 +926,7 @@ msgstr "マシン設定を保存する"
 
 #: src/emu/ui/miscmenu.cpp:806
 msgid "Configure machine:"
-msgstr ""
+msgstr "マシン設定"
 
 #: src/emu/ui/miscmenu.cpp:868 src/emu/ui/selsoft.cpp:109
 msgid " (default)"
@@ -1026,6 +1026,10 @@ msgid ""
 "\n"
 "Press any key to continue."
 msgstr ""
+"選択したマシンに必要な1つ以上のROMまたはCHDが不足しています。"
+"別のマシンを選択してください。\n"
+"\n"
+"進めるには、何かキーを押してください。"
 
 #: src/emu/ui/selgame.cpp:595 src/emu/ui/simpleselgame.cpp:265
 msgid "Configure Options"
@@ -1304,11 +1308,15 @@ msgid ""
 "\n"
 "Press any key to continue."
 msgstr ""
+"選択したソフトウェアに必要な1つ以上のファイルが不足しています。"
+"別のソフトウェアを選択してください。\n"
+"\n"
+"進めるには、何かキーを押してください。"
 
 #: src/emu/ui/selsoft.cpp:683
 #, c-format
 msgid "%1$s %2$s ( %3$d / %4$d software packages )"
-msgstr ""
+msgstr "%1$s %2$s （ %3$d / %4$d ソフトウェアパッケージ ）"
 
 #: src/emu/ui/selsoft.cpp:684
 #, c-format

From f22b8c590c2edd5e9f1b2c13c831eaf6d91f6070 Mon Sep 17 00:00:00 2001
From: David Haywood <mamehaze@users.noreply.github.com>
Date: Tue, 19 Apr 2016 13:04:29 +0100
Subject: [PATCH 090/122] part 5 (nw)

---
 src/mame/drivers/aristmk6.cpp | 41 +++++++++++++++++++++++++++++++++++
 src/mame/mame.lst             |  4 ++++
 2 files changed, 45 insertions(+)

diff --git a/src/mame/drivers/aristmk6.cpp b/src/mame/drivers/aristmk6.cpp
index 8a7648f0200..11b6d85c12d 100644
--- a/src/mame/drivers/aristmk6.cpp
+++ b/src/mame/drivers/aristmk6.cpp
@@ -2930,6 +2930,42 @@ ROM_START( eaglst2 )
 ROM_END
 
 
+ROM_START( kingnilea )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("King Of The Nile.003", 0x0000000, 0x0400000, CRC(ea5d2450) SHA1(fdcf6c532231e9abf3a1c035bdef9d0db7fcf148) )
+	ROM_LOAD32_WORD("King Of The Nile.001", 0x0000000, 0x0400000, CRC(9a90354d) SHA1(5c5b0822e6a842f85e2acca0e1c8bfe0c3f68496) )
+	ROM_LOAD32_WORD("King Of The Nile.002", 0x0000000, 0x0400000, CRC(524c786e) SHA1(7e40266be5496baefd74796ce66857aec2d21437) )
+	ROM_LOAD32_WORD("King Of The Nile.000", 0x0000000, 0x0400000, CRC(c3830908) SHA1(438fc339f8b71668e816b5909195cae4158f39c2) )
+ROM_END
+
+
+
+
+ROM_START( outbackja )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("20195211.000", 0x0000000, 0x0400000, CRC(16f70945) SHA1(0de1bd1371d5fb33bfe7f7c2a80a70412387dc5f) )
+	ROM_LOAD32_WORD("20195211.001", 0x0000000, 0x0400000, CRC(611f82b7) SHA1(84df7ec63d26a691acd2822b8d0803c827c89f37) )
+	ROM_LOAD32_WORD("20195211.007", 0x0000000, 0x0400000, CRC(3a0ea3ca) SHA1(88513130013b1b18772a5e538da9a8db3a54633e) )
+	ROM_LOAD32_WORD("20195211.005", 0x0000000, 0x0400000, CRC(23f1f50c) SHA1(40145b839c2b5fde5c0f20e08f46f5a859b6e20a) )
+	ROM_LOAD32_WORD("20195211.003", 0x0000000, 0x0400000, CRC(cdd28848) SHA1(0038bb422a1d650beaa0ffd63b7d6de1936a5e32) )
+	ROM_LOAD32_WORD("20195211.006", 0x0000000, 0x0400000, CRC(79ca67a1) SHA1(68bae23df71c768dc17631f6ccfc7a720c0959ee) )
+	ROM_LOAD32_WORD("20195211.004", 0x0000000, 0x0400000, CRC(0cd41b5d) SHA1(a7891da788fe88d2191b2f0686cb9ca2ecfeeb9c) )
+	ROM_LOAD32_WORD("20195211.002", 0x0000000, 0x0400000, CRC(a1853f27) SHA1(cd2bf8674555f6870f0689ca0adbca6890bc9b27) )
+ROM_END
+
+
+ROM_START( witgoldd )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("Where's The Gold Demo.003", 0x0000000, 0x0400000, CRC(bd188f12) SHA1(53433d346f23bc826fc041f1631270f8380759b6) )
+	ROM_LOAD32_WORD("Where's The Gold Demo.001", 0x0000000, 0x0400000, CRC(57253567) SHA1(41e0b1b7247ff4f0f9c6b150aef23a5eb5984e30) )
+	ROM_LOAD32_WORD("Where's The Gold Demo.002", 0x0000000, 0x0400000, CRC(86a40a48) SHA1(e0ad565e56c698df0f631e42dcfda17dfa5c8017) )
+	ROM_LOAD32_WORD("Where's The Gold Demo.000", 0x0000000, 0x0400000, CRC(4e6fad4a) SHA1(a2efc21cf773f9cb291ea1607d1864ba333807e9) )
+ROM_END
+
+
 
 
 
@@ -3178,6 +3214,11 @@ GAME( 200?, starqst,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, RO
 GAME( 200?, eaglst1,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Eagle Strike (set 1)",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
 GAME( 200?, eaglst2,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Eagle Strike (set 2)",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
 
+// different collection
+GAME( 200?, kingnilea,  kingnile,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "King of the Nile (set 2)",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, outbackja,  outbackj,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Outback Jack (set 2)",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, witgoldd,  witgold,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Where Is The Gold (Demo)",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+
 
 
 
diff --git a/src/mame/mame.lst b/src/mame/mame.lst
index cb46493c1ff..9c8b3b49d81 100644
--- a/src/mame/mame.lst
+++ b/src/mame/mame.lst
@@ -1685,6 +1685,10 @@ adonis6
 starqst
 eaglst1
 eaglst2
+kingnilea
+outbackja
+witgoldd
+
 
 @source:arkanoid.cpp
 ark1ball                        // bootleg

From d00836d5e9c47d730da586609495ce0ecee2a490 Mon Sep 17 00:00:00 2001
From: David Haywood <mamehaze@users.noreply.github.com>
Date: Tue, 19 Apr 2016 13:47:56 +0100
Subject: [PATCH 091/122] better filenames (nw)

---
 src/mame/drivers/aristmk6.cpp | 1946 ++++++++++++++++-----------------
 src/mame/mame.lst             |    1 +
 2 files changed, 966 insertions(+), 981 deletions(-)

diff --git a/src/mame/drivers/aristmk6.cpp b/src/mame/drivers/aristmk6.cpp
index 11b6d85c12d..cb1baad7a80 100644
--- a/src/mame/drivers/aristmk6.cpp
+++ b/src/mame/drivers/aristmk6.cpp
@@ -145,7 +145,7 @@ READ8_MEMBER(aristmk6_state::test_r)
 	{
 	case 0:
 		flip ^= 2;
-		// bit 1 read in various places, status for something ...
+		// bit 1 read in various places, status for something...
 		return flip;
 	case 1:
 		return (m_eeprom0->do_read() << 5);
@@ -247,75 +247,75 @@ MACHINE_CONFIG_END
 	ROM_LOAD32_WORD_BIOS( 1, "11011901.u83", 0x0000000, 0x0200000, CRC(73dcb11c) SHA1(69ae4f32a0c9141b2a82ff3935b0cd20333d2964) ) \
 	ROM_LOAD32_WORD_BIOS( 1, "11011901.u70", 0x0000002, 0x0200000, CRC(d3dd2210) SHA1(3548f8cc39859d3f44a55f6bae48966a2d48e0eb) ) \
 	ROM_SYSTEM_BIOS( 2, "bios2",   "Aristocrat MK6 Base (19012801)" ) \
-	ROM_LOAD32_WORD_BIOS( 2, "19012801 System Left.bin", 0x0000000, 0x0200000, CRC(b03bd17c) SHA1(f281e80f6dda5b727ed71d2deebe3b0ff548773f) ) /* From Cactus Corral & Cashman Tonight & Heart of Begas & Moonlight Waltz */ \
-	ROM_LOAD32_WORD_BIOS( 2, "19012801 System Right.bin", 0x0000000, 0x0200000, CRC(5b20a96c) SHA1(5fd916b7cc2cdd51bf7dd212c1114f94dc9c7926) ) \
+	ROM_LOAD32_WORD_BIOS( 2, "19012801 System Left", 0x0000000, 0x0200000, CRC(b03bd17c) SHA1(f281e80f6dda5b727ed71d2deebe3b0ff548773f) ) /* From Cactus Corral & Cashman Tonight & Heart of Begas & Moonlight Waltz */ \
+	ROM_LOAD32_WORD_BIOS( 2, "19012801 System Right", 0x0000000, 0x0200000, CRC(5b20a96c) SHA1(5fd916b7cc2cdd51bf7dd212c1114f94dc9c7926) ) \
 	ROM_SYSTEM_BIOS( 3, "bios3",   "Aristocrat MK6 Base ('system 13')" ) \
-	ROM_LOAD32_WORD_BIOS( 3, "System 13 Eprom Set -2MB-M27V160 Left.bin", 0x0000000, 0x0200000, CRC(38e8f659) SHA1(88c6acba99b0aca023c6f4d27c061c231490e9e0) ) /* from Grizzly */ \
-	ROM_LOAD32_WORD_BIOS( 3, "System 13 Eprom Set -2MB-M27V160 Right.bin", 0x0000000, 0x0200000, CRC(e627dbfa) SHA1(4fedbe0975ceb7dc0ebebf18a7708d78984db9b7) ) \
+	ROM_LOAD32_WORD_BIOS( 3, "System 13 Eprom Set -2MB-M27V160 Left", 0x0000000, 0x0200000, CRC(38e8f659) SHA1(88c6acba99b0aca023c6f4d27c061c231490e9e0) ) /* from Grizzly */ \
+	ROM_LOAD32_WORD_BIOS( 3, "System 13 Eprom Set -2MB-M27V160 Right", 0x0000000, 0x0200000, CRC(e627dbfa) SHA1(4fedbe0975ceb7dc0ebebf18a7708d78984db9b7) ) \
 	ROM_SYSTEM_BIOS( 4, "bios4",   "Aristocrat MK6 Base (07010801)" ) \
-	ROM_LOAD32_WORD_BIOS( 4, "07010801_SYSTEM_EPROM_NSW_LEFT.BIN", 0x0000000, 0x0200000, CRC(8e92af68) SHA1(00d2bb655b7964a9652896741210ec534df0b0d2) ) /* From Jailbreak */ \
-	ROM_LOAD32_WORD_BIOS( 4, "07010801_SYSTEM_EPROM_NSW_RIGHT.BIN", 0x0000000, 0x0200000, CRC(8c148c11) SHA1(5ff3be18455b4f04675fec8d5b9d881295c65e23) ) \
+	ROM_LOAD32_WORD_BIOS( 4, "07010801_SYSTEM_EPROM_NSW_LEFT", 0x0000000, 0x0200000, CRC(8e92af68) SHA1(00d2bb655b7964a9652896741210ec534df0b0d2) ) /* From Jailbreak */ \
+	ROM_LOAD32_WORD_BIOS( 4, "07010801_SYSTEM_EPROM_NSW_RIGHT", 0x0000000, 0x0200000, CRC(8c148c11) SHA1(5ff3be18455b4f04675fec8d5b9d881295c65e23) ) \
 	ROM_SYSTEM_BIOS( 5, "bios5",   "Aristocrat MK6 Base ('system 21')" ) \
-	ROM_LOAD32_WORD_BIOS( 5, "NSWsystem21_left.bin", 0x0000000, 0x0200000, CRC(0d271470) SHA1(5cd4b604bfe2fd7e9a8d08e1c7c97f17ae068479) ) /* From Red Baron */ \
-	ROM_LOAD32_WORD_BIOS( 5, "NSWsystem21_right.bin", 0x0000000, 0x0200000, CRC(757618f2) SHA1(43f9a3e7d544979f8c6974945914d9e099b02abd) ) \
+	ROM_LOAD32_WORD_BIOS( 5, "NSWsystem21_left", 0x0000000, 0x0200000, CRC(0d271470) SHA1(5cd4b604bfe2fd7e9a8d08e1c7c97f17ae068479) ) /* From Red Baron */ \
+	ROM_LOAD32_WORD_BIOS( 5, "NSWsystem21_right", 0x0000000, 0x0200000, CRC(757618f2) SHA1(43f9a3e7d544979f8c6974945914d9e099b02abd) ) \
 	ROM_SYSTEM_BIOS( 6, "bios6",   "Aristocrat MK6 Base (24013001)" ) \
-	ROM_LOAD32_WORD_BIOS( 6, "24013001   Left.bin", 0x0000000, 0x0200000, CRC(06ae7e07) SHA1(39a45575b66906d73b519988d1001c99b05c5f34) ) /* From Wild Stalion */ \
-	ROM_LOAD32_WORD_BIOS( 6, "24013001   Right.bin", 0x0000000, 0x0200000, CRC(e97afedf) SHA1(10ca3b015afaff5d7812f0f5207b2535602136a5) ) \
+	ROM_LOAD32_WORD_BIOS( 6, "24013001   Left", 0x0000000, 0x0200000, CRC(06ae7e07) SHA1(39a45575b66906d73b519988d1001c99b05c5f34) ) /* From Wild Stalion */ \
+	ROM_LOAD32_WORD_BIOS( 6, "24013001   Right", 0x0000000, 0x0200000, CRC(e97afedf) SHA1(10ca3b015afaff5d7812f0f5207b2535602136a5) ) \
 	ROM_SYSTEM_BIOS( 7, "bios7",   "Aristocrat MK6 Base (system 04)" ) \
-	ROM_LOAD32_WORD_BIOS( 7, "System 04 Eprom Set -1MB-M27V800 Left.bin", 0x0000000, 0x0100000, CRC(21182775) SHA1(7c5b7f5aba3babc85f512a8f7d4ebc0d83eb842a) ) /* from Diamonds Forever */ \
-	ROM_LOAD32_WORD_BIOS( 7, "System 04 Eprom Set -1MB-M27V800 Right.bin", 0x0000000, 0x0100000, CRC(3daefb7a) SHA1(411471713219f4bab5ccf5fe7a12a6c138c8c550) ) \
+	ROM_LOAD32_WORD_BIOS( 7, "System 04 Eprom Set -1MB-M27V800 Left", 0x0000000, 0x0100000, CRC(21182775) SHA1(7c5b7f5aba3babc85f512a8f7d4ebc0d83eb842a) ) /* from Diamonds Forever */ \
+	ROM_LOAD32_WORD_BIOS( 7, "System 04 Eprom Set -1MB-M27V800 Right", 0x0000000, 0x0100000, CRC(3daefb7a) SHA1(411471713219f4bab5ccf5fe7a12a6c138c8c550) ) \
 	ROM_SYSTEM_BIOS( 8, "bios8",   "Aristocrat MK6 Base (05010601)" ) \
-	ROM_LOAD32_WORD_BIOS( 8, "05010601_SYSTEM_EPROM_NSW_LEFT.BIN", 0x0000000, 0x0100000, CRC(b3e6b4a0) SHA1(3bf398c9257579f8e51ce716d6ebfa74fa510273) ) /* From Thai Princess & Venetian Nights */ \
-	ROM_LOAD32_WORD_BIOS( 8, "05010601_SYSTEM_EPROM_NSW_RIGHT.BIN", 0x0000000, 0x0100000, CRC(c12eac11) SHA1(683b9ddc323865ace7dca37d13b55de6e42759a5) )	 \
+	ROM_LOAD32_WORD_BIOS( 8, "05010601_SYSTEM_EPROM_NSW_LEFT", 0x0000000, 0x0100000, CRC(b3e6b4a0) SHA1(3bf398c9257579f8e51ce716d6ebfa74fa510273) ) /* From Thai Princess & Venetian Nights */ \
+	ROM_LOAD32_WORD_BIOS( 8, "05010601_SYSTEM_EPROM_NSW_RIGHT", 0x0000000, 0x0100000, CRC(c12eac11) SHA1(683b9ddc323865ace7dca37d13b55de6e42759a5) )	 \
 	ROM_SYSTEM_BIOS( 9, "bios9",   "Aristocrat MK6 Base (13012001)" ) \
-	ROM_LOAD32_WORD_BIOS( 9, "System 13012001_left.bin", 0x0000000, 0x0400000, CRC(d346773f) SHA1(baa9103478fd667eecd13064cfa051a06763c6ca) ) /* From Queen of the Nile */ \
-	ROM_LOAD32_WORD_BIOS( 9, "System 13012001_right.bin", 0x0000000, 0x0400000, CRC(4c8bfa18) SHA1(cac4932a5b19ed8c2798693ac387cc1a6f0201c7) ) \
+	ROM_LOAD32_WORD_BIOS( 9, "System 13012001_left", 0x0000000, 0x0400000, CRC(d346773f) SHA1(baa9103478fd667eecd13064cfa051a06763c6ca) ) /* From Queen of the Nile */ \
+	ROM_LOAD32_WORD_BIOS( 9, "System 13012001_right", 0x0000000, 0x0400000, CRC(4c8bfa18) SHA1(cac4932a5b19ed8c2798693ac387cc1a6f0201c7) ) \
 	ROM_SYSTEM_BIOS( 10, "bios10",   "Aristocrat MK6 Base (02010201)" ) \
-	ROM_LOAD32_WORD_BIOS( 10, "System 02010201 Eprom Set -1MB-M27V800 U70.bin", 0x0000000, 0x0100000, CRC(9b2db442) SHA1(d512398a2d9257bd385dc50d61c63cd1a47300ba) ) /* From Money Tree & From Go For Green */ \
-	ROM_LOAD32_WORD_BIOS( 10, "System 02010201 Eprom Set -1MB-M27V800 U71.bin", 0x0000000, 0x0100000, CRC(24d5614a) SHA1(fdcf3826dccc72b74b66379b1411cf211d5a1670) ) \
-	ROM_LOAD32_WORD_BIOS( 10, "System 02010201 Eprom Set -1MB-M27V800 U83.bin", 0x0000000, 0x0100000, CRC(5f64a20c) SHA1(397404ab6d2a1aa3c1fc77bb9421fef7079b65a5) ) \
-	ROM_LOAD32_WORD_BIOS( 10, "System 02010201 Eprom Set -1MB-M27V800 U84.bin", 0x0000000, 0x0100000, CRC(0920930f) SHA1(771b0f62442d1c75b1bb59ad82365b7ab8747173) ) \
+	ROM_LOAD32_WORD_BIOS( 10, "System 02010201 Eprom Set -1MB-M27V800.u70", 0x0000000, 0x0100000, CRC(9b2db442) SHA1(d512398a2d9257bd385dc50d61c63cd1a47300ba) ) /* From Money Tree & From Go For Green */ \
+	ROM_LOAD32_WORD_BIOS( 10, "System 02010201 Eprom Set -1MB-M27V800.u71", 0x0000000, 0x0100000, CRC(24d5614a) SHA1(fdcf3826dccc72b74b66379b1411cf211d5a1670) ) \
+	ROM_LOAD32_WORD_BIOS( 10, "System 02010201 Eprom Set -1MB-M27V800.u83", 0x0000000, 0x0100000, CRC(5f64a20c) SHA1(397404ab6d2a1aa3c1fc77bb9421fef7079b65a5) ) \
+	ROM_LOAD32_WORD_BIOS( 10, "System 02010201 Eprom Set -1MB-M27V800.u84", 0x0000000, 0x0100000, CRC(0920930f) SHA1(771b0f62442d1c75b1bb59ad82365b7ab8747173) ) \
 	ROM_SYSTEM_BIOS( 11, "bios11",   "Aristocrat MK6 Base (02010114)" ) \
-	ROM_LOAD32_WORD_BIOS( 11, "02010114 System Set 1MB M27V800  U70.bin", 0x0000000, 0x0100000, CRC(3ba4379f) SHA1(84367f12c4c9224d2ab9cae83ae8727de338408c) ) /* from 'Arabian Nights' */ \
-	ROM_LOAD32_WORD_BIOS( 11, "02010114 System Set 1MB M27V800  U71.bin", 0x0000000, 0x0100000, CRC(8f83c3dd) SHA1(a5f9d80b4b515b24299d0241e1665cfd9da8bab7) ) \
-	ROM_LOAD32_WORD_BIOS( 11, "02010114 System Set 1MB M27V800  U83.bin", 0x0000000, 0x0100000, CRC(945104d7) SHA1(e372d0cf889c72b5d001b26fe4a925a28486537f) ) \
-	ROM_LOAD32_WORD_BIOS( 11, "02010114 System Set 1MB M27V800  U84.bin", 0x0000000, 0x0100000, CRC(183e3836) SHA1(4c802d0cd010bc007acb3a83e37aaa29b2d13d87) ) \
+	ROM_LOAD32_WORD_BIOS( 11, "02010114 System Set 1MB M27V800.u70", 0x0000000, 0x0100000, CRC(3ba4379f) SHA1(84367f12c4c9224d2ab9cae83ae8727de338408c) ) /* from 'Arabian Nights' */ \
+	ROM_LOAD32_WORD_BIOS( 11, "02010114 System Set 1MB M27V800.u71", 0x0000000, 0x0100000, CRC(8f83c3dd) SHA1(a5f9d80b4b515b24299d0241e1665cfd9da8bab7) ) \
+	ROM_LOAD32_WORD_BIOS( 11, "02010114 System Set 1MB M27V800.u83", 0x0000000, 0x0100000, CRC(945104d7) SHA1(e372d0cf889c72b5d001b26fe4a925a28486537f) ) \
+	ROM_LOAD32_WORD_BIOS( 11, "02010114 System Set 1MB M27V800.u84", 0x0000000, 0x0100000, CRC(183e3836) SHA1(4c802d0cd010bc007acb3a83e37aaa29b2d13d87) ) \
 	ROM_SYSTEM_BIOS( 12, "bios12",   "Aristocrat MK6 Base (USA)" ) \
-	ROM_LOAD32_WORD_BIOS( 12, "system-base-.01.03.14.-u70-27v160.bin", 0x0000000, 0x0200000, CRC(7138fec4) SHA1(f81331d1875ac574d3e6c98be218ff25c6c7be5a) ) /* From Dave Dragon */ \
+	ROM_LOAD32_WORD_BIOS( 12, "system-base-.01.03.14.-u70-27v160", 0x0000000, 0x0200000, CRC(7138fec4) SHA1(f81331d1875ac574d3e6c98be218ff25c6c7be5a) ) /* From Dave Dragon */ \
 	ROM_LOAD32_WORD_BIOS( 12, "system-base-.01.03.14.-u83-27v160", 0x0000000, 0x0200000, CRC(889ffd82) SHA1(9c98c9cdcf5f7d05095f11006418133029e9f0f8) ) \
 	ROM_SYSTEM_BIOS( 13, "bios13",   "Aristocrat MK6 Base (USA, set 2)" ) \
-	ROM_LOAD32_WORD_BIOS( 13, "system-base-u70-01.03.06-m27v160.bin", 0x0000000, 0x0200000, CRC(2f9d9a29) SHA1(fdebfaca9a579d7249379f19aef22fbfd66bf943) ) /* From Diamond Eyes US */ \
+	ROM_LOAD32_WORD_BIOS( 13, "system-base-u70-01.03.06-m27v160", 0x0000000, 0x0200000, CRC(2f9d9a29) SHA1(fdebfaca9a579d7249379f19aef22fbfd66bf943) ) /* From Diamond Eyes US */ \
 	ROM_LOAD32_WORD_BIOS( 13, "system-base-u83-01.03.06-m27v160", 0x0000000, 0x0200000, CRC(bd48ca55) SHA1(8fb1576cbeb1c64c358880714740195d2e73e03e) ) \
 	ROM_SYSTEM_BIOS( 14, "bios14",   "Aristocrat MK6 Base (Set Chips, 06.02.20, USA)" ) \
 	ROM_LOAD32_WORD_BIOS( 14, "U70-03 Cs 0364A", 0x0000000, 0x0100000, CRC(199ed3b9) SHA1(e3ee81ffd713f09e35a10c38e4f59282e2c5cd30) ) \
-	ROM_LOAD32_WORD_BIOS( 14, "U83 -02 Cs 08DD", 0x0000000, 0x0100000, CRC(e4001f60) SHA1(5da34efb1ac0f7c84a48e09363d20cfecda4bcf1) ) \
+	ROM_LOAD32_WORD_BIOS( 14, "U83-02 Cs 08DD",  0x0000000, 0x0100000, CRC(e4001f60) SHA1(5da34efb1ac0f7c84a48e09363d20cfecda4bcf1) ) \
 	ROM_SYSTEM_BIOS( 15, "bios15",   "Aristocrat MK6 Base (01.04.08, USA)" ) \
-	ROM_LOAD32_WORD_BIOS( 15, "base-01.04.08-u70-u20-left-cs-8509.bin", 0x0000000, 0x0200000, CRC(0dfcad10) SHA1(53798be000304aed38909f5fd8470a68bedd8229) ) /* from bubdul */ \
-	ROM_LOAD32_WORD_BIOS( 15, "base-01.04.08-u83-u10-right-cs-d74e.bin", 0x0000000, 0x0200000, CRC(95333304) SHA1(7afe49d6c5e4d6820f349778557daa88c5366a51) )\
+	ROM_LOAD32_WORD_BIOS( 15, "base-01.04.08-u70-u20-left-cs-8509", 0x0000000, 0x0200000, CRC(0dfcad10) SHA1(53798be000304aed38909f5fd8470a68bedd8229) ) /* from bubdul */ \
+	ROM_LOAD32_WORD_BIOS( 15, "base-01.04.08-u83-u10-right-cs-d74e", 0x0000000, 0x0200000, CRC(95333304) SHA1(7afe49d6c5e4d6820f349778557daa88c5366a51) )\
 	ROM_SYSTEM_BIOS( 16, "bios16",   "Aristocrat MK6 Base (02061013)" ) \
-	ROM_LOAD32_WORD_BIOS( 16,"02061013 System 02 Left.bin", 0x0000000, 0x0100000, CRC(e70a7007) SHA1(0935f924866162d9c0fbdbb99391cbf730a04b76) ) \
-	ROM_LOAD32_WORD_BIOS( 16,"02061013 System 02 Right.bin", 0x0000000, 0x0100000, CRC(7a8619a5) SHA1(bd03ddb68817c1660b009e102ccf69e5b603b875) ) \
+	ROM_LOAD32_WORD_BIOS( 16,"02061013 System 02 Left", 0x0000000, 0x0100000, CRC(e70a7007) SHA1(0935f924866162d9c0fbdbb99391cbf730a04b76) ) \
+	ROM_LOAD32_WORD_BIOS( 16,"02061013 System 02 Right", 0x0000000, 0x0100000, CRC(7a8619a5) SHA1(bd03ddb68817c1660b009e102ccf69e5b603b875) ) \
 	ROM_SYSTEM_BIOS( 17, "bios17",   "Aristocrat MK6 Base (03030708)" ) \
-	ROM_LOAD32_WORD_BIOS( 17,"03030708 System 03 SA LEFT.bin", 0x0000000, 0x0100000, CRC(4e5ad823) SHA1(77ab1c29c6172cfdcef776222a72b2b44114d4da) ) \
-	ROM_LOAD32_WORD_BIOS( 17,"03030708 System 03 SA RIGHT.bin", 0x0000000, 0x0100000, CRC(b4b3c6a5) SHA1(5747f98a6eaa5c24a23d1d76a28b33a3bfbbfd1f) ) \
+	ROM_LOAD32_WORD_BIOS( 17,"03030708 System 03 SA LEFT", 0x0000000, 0x0100000, CRC(4e5ad823) SHA1(77ab1c29c6172cfdcef776222a72b2b44114d4da) ) \
+	ROM_LOAD32_WORD_BIOS( 17,"03030708 System 03 SA RIGHT", 0x0000000, 0x0100000, CRC(b4b3c6a5) SHA1(5747f98a6eaa5c24a23d1d76a28b33a3bfbbfd1f) ) \
 	ROM_SYSTEM_BIOS( 18, "bios18",   "Aristocrat MK6 Base (09011001)" ) \
-	ROM_LOAD32_WORD_BIOS( 18,"09011001_SYSTEM_09_EPROM_NSW_LEFT.BIN", 0x0000000, 0x0200000, CRC(229c2e63) SHA1(91fd2b1acb69efe073647e93db9f11042add2feb) ) \
-	ROM_LOAD32_WORD_BIOS( 18,"09011001_SYSTEM_09_EPROM_NSW_RIGHT.BIN", 0x0000000, 0x0200000, CRC(8a853f80) SHA1(9a75498f7b02c81a483b4e1c158f35f0ee4c0112) ) \
+	ROM_LOAD32_WORD_BIOS( 18,"09011001_SYSTEM_09_EPROM_NSW_LEFT", 0x0000000, 0x0200000, CRC(229c2e63) SHA1(91fd2b1acb69efe073647e93db9f11042add2feb) ) \
+	ROM_LOAD32_WORD_BIOS( 18,"09011001_SYSTEM_09_EPROM_NSW_RIGHT", 0x0000000, 0x0200000, CRC(8a853f80) SHA1(9a75498f7b02c81a483b4e1c158f35f0ee4c0112) ) \
 	ROM_SYSTEM_BIOS( 19, "bios19",   "Aristocrat MK6 Base (11011501)" ) \
-	ROM_LOAD32_WORD_BIOS( 19,"11011501_SYSTEM_11_EPROM_NSW_2MB_M27V160_LEFT.bin", 0x0000000, 0x0200000, CRC(c5cc3461) SHA1(5b43c4cb6110a6ccf67cd0f3789253f6872b20c4) ) \
-	ROM_LOAD32_WORD_BIOS( 19,"11011501_SYSTEM_11_EPROM_NSW_2MB_M27V160_RIGHT.bin", 0x0000000, 0x0200000, CRC(de4c3aed) SHA1(21596a2edd20eb7de7a4ec8900a270b09c8f326f) ) \
+	ROM_LOAD32_WORD_BIOS( 19,"11011501_SYSTEM_11_EPROM_NSW_2MB_M27V160_LEFT", 0x0000000, 0x0200000, CRC(c5cc3461) SHA1(5b43c4cb6110a6ccf67cd0f3789253f6872b20c4) ) \
+	ROM_LOAD32_WORD_BIOS( 19,"11011501_SYSTEM_11_EPROM_NSW_2MB_M27V160_RIGHT", 0x0000000, 0x0200000, CRC(de4c3aed) SHA1(21596a2edd20eb7de7a4ec8900a270b09c8f326f) ) \
 	ROM_SYSTEM_BIOS( 20, "bios20",   "Aristocrat MK6 Base (14011913)" ) \
-	ROM_LOAD32_WORD_BIOS( 20,"14011913 System 14 Eprom Left.bin", 0x0000000, 0x0200000, CRC(9a4cefdf) SHA1(6c15bc565ede8af19361d60ee1e6657a8055c92c) ) \
-	ROM_LOAD32_WORD_BIOS( 20,"14011913 System 14 Eprom Right.bin", 0x0000000, 0x0200000, CRC(01d13b89) SHA1(b1013366d0803dfbec5a5f90f6a5cea862de0513) ) \
+	ROM_LOAD32_WORD_BIOS( 20,"14011913 System 14 Eprom Left", 0x0000000, 0x0200000, CRC(9a4cefdf) SHA1(6c15bc565ede8af19361d60ee1e6657a8055c92c) ) \
+	ROM_LOAD32_WORD_BIOS( 20,"14011913 System 14 Eprom Right", 0x0000000, 0x0200000, CRC(01d13b89) SHA1(b1013366d0803dfbec5a5f90f6a5cea862de0513) ) \
 	ROM_SYSTEM_BIOS( 21, "bios21",   "Aristocrat MK6 Base (01.04.11)" ) \
-	ROM_LOAD32_WORD_BIOS( 21,"01.04.11 System U70.bin", 0x0000000, 0x0200000, CRC(787f2b07) SHA1(2548289e44f4b935346b759afb5383bdbac04c3e) ) \
-	ROM_LOAD32_WORD_BIOS( 21,"01.04.11 System U83.bin", 0x0000000, 0x0200000, CRC(2dae8ca0) SHA1(7a0fb38b4c1ac7195d15bdab6f0cfb16c78430f0) ) \
+	ROM_LOAD32_WORD_BIOS( 21,"01.04.11 System.u70", 0x0000000, 0x0200000, CRC(787f2b07) SHA1(2548289e44f4b935346b759afb5383bdbac04c3e) ) \
+	ROM_LOAD32_WORD_BIOS( 21,"01.04.11 System.u83", 0x0000000, 0x0200000, CRC(2dae8ca0) SHA1(7a0fb38b4c1ac7195d15bdab6f0cfb16c78430f0) ) \
 	ROM_SYSTEM_BIOS( 22, "bios22",   "Aristocrat MK6 Set Chips (06.03.04)" ) \
-	ROM_LOAD32_WORD_BIOS( 22,"Set 06.03.04 U2.bin", 0x0000000, 0x0100000, CRC(6f5f5ef1) SHA1(70a43fba4de47ed8dcf38b25eafd5873f3428e72) ) \
-	ROM_LOAD32_WORD_BIOS( 22,"Set 06.03.04 U3.bin", 0x0000000, 0x0100000, CRC(7034f26b) SHA1(7be78f23bec38d05240cdfe1186ec0c8291f5a1c) ) \
+	ROM_LOAD32_WORD_BIOS( 22,"Set 06.03.04 U2", 0x0000000, 0x0100000, CRC(6f5f5ef1) SHA1(70a43fba4de47ed8dcf38b25eafd5873f3428e72) ) \
+	ROM_LOAD32_WORD_BIOS( 22,"Set 06.03.04 U3", 0x0000000, 0x0100000, CRC(7034f26b) SHA1(7be78f23bec38d05240cdfe1186ec0c8291f5a1c) ) \
 	ROM_SYSTEM_BIOS( 23, "bios23",   "Aristocrat MK6 (USA, set 3)" ) \
-	ROM_LOAD32_WORD_BIOS( 23,"US_system_U70.bin", 0x0000000, 0x0200000, CRC(0095e3f9) SHA1(d2e8786158b1ab0a614aab21cf1d14cbc04754af) ) \
-	ROM_LOAD32_WORD_BIOS( 23,"US_system_U83.bin", 0x0000000, 0x0200000, CRC(2c7f1ec3) SHA1(d03167f43ed6f9596080d91472695829378cef0a) )
+	ROM_LOAD32_WORD_BIOS( 23,"US_system_.u70", 0x0000000, 0x0200000, CRC(0095e3f9) SHA1(d2e8786158b1ab0a614aab21cf1d14cbc04754af) ) \
+	ROM_LOAD32_WORD_BIOS( 23,"US_system_.u83", 0x0000000, 0x0200000, CRC(2c7f1ec3) SHA1(d03167f43ed6f9596080d91472695829378cef0a) )
 
 
 ROM_START( aristmk6 )
@@ -424,8 +424,8 @@ ROM_END
 ROM_START( 100lions )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("100_lions.000", 0x0000000, 0x0400000, CRC(a1c71dd2) SHA1(9a859df876cf6a2fadcc5ae7183021881dc08887) )
-	ROM_LOAD32_WORD("100_lions.001", 0x0000000, 0x0400000, CRC(da7d2ed7) SHA1(1f81cad150c013848988e6f995a45f7ea5c6d95c) )
+	ROM_LOAD32_WORD("100_lions.000.u86", 0x0000000, 0x0400000, CRC(a1c71dd2) SHA1(9a859df876cf6a2fadcc5ae7183021881dc08887) )
+	ROM_LOAD32_WORD("100_lions.001.u73", 0x0000002, 0x0400000, CRC(da7d2ed7) SHA1(1f81cad150c013848988e6f995a45f7ea5c6d95c) )
 ROM_END
 
 
@@ -434,10 +434,10 @@ ROM_END
 ROM_START( 5dragons )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("5 Dragons Demo.003", 0x0000000, 0x0400000, CRC(a534f262) SHA1(27201f8fd9a6c55e41e30d73e2868961961df827) )
-	ROM_LOAD32_WORD("5 Dragons Demo.001", 0x0000000, 0x0400000, CRC(6188048d) SHA1(d03d2ef8ce744f6523bc5a3775013764386acdf5) )
-	ROM_LOAD32_WORD("5 Dragons Demo.002", 0x0000000, 0x0400000, CRC(9840fdcb) SHA1(ee87ab3e93fafd4a262451e906cbae2028cc2f61) )
-	ROM_LOAD32_WORD("5 Dragons Demo.000", 0x0000000, 0x0400000, CRC(726f45a0) SHA1(b48227f4438b52857f43d26baa216a3b1d1fd27f) )
+	ROM_LOAD32_WORD("5 Dragons Demo.003.u72", 0x0800002, 0x0400000, CRC(a534f262) SHA1(27201f8fd9a6c55e41e30d73e2868961961df827) )
+	ROM_LOAD32_WORD("5 Dragons Demo.001.u73", 0x0000002, 0x0400000, CRC(6188048d) SHA1(d03d2ef8ce744f6523bc5a3775013764386acdf5) )
+	ROM_LOAD32_WORD("5 Dragons Demo.002.u85", 0x0800000, 0x0400000, CRC(9840fdcb) SHA1(ee87ab3e93fafd4a262451e906cbae2028cc2f61) )
+	ROM_LOAD32_WORD("5 Dragons Demo.000.u86", 0x0000000, 0x0400000, CRC(726f45a0) SHA1(b48227f4438b52857f43d26baa216a3b1d1fd27f) )
 ROM_END
 
 
@@ -446,10 +446,10 @@ ROM_END
 ROM_START( adustcm )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("African dusk U72.003", 0x0000000, 0x0400000, CRC(d963cc96) SHA1(8a855269d0ea92e1f58ceda555bb124746ae1268) )
-	ROM_LOAD32_WORD("African dusk U73.001", 0x0000000, 0x0400000, CRC(b156f918) SHA1(004ce75da1ba9b95c5d689a568d8e6502b7d00ab) )
-	ROM_LOAD32_WORD("African dusk U85.002", 0x0000000, 0x0400000, CRC(f62830be) SHA1(13fbadf58ac2f3c15f78a40b3ac45e20d1080937) )
-	ROM_LOAD32_WORD("African dusk U86.000", 0x0000000, 0x0400000, CRC(26759ebc) SHA1(1205d74c39d13333ccc0ff4deb287ce12d6dbbf5) )
+	ROM_LOAD32_WORD("African dusk 003.u72", 0x0800002, 0x0400000, CRC(d963cc96) SHA1(8a855269d0ea92e1f58ceda555bb124746ae1268) )
+	ROM_LOAD32_WORD("African dusk 001.u73", 0x0000002, 0x0400000, CRC(b156f918) SHA1(004ce75da1ba9b95c5d689a568d8e6502b7d00ab) )
+	ROM_LOAD32_WORD("African dusk 002.u85", 0x0800000, 0x0400000, CRC(f62830be) SHA1(13fbadf58ac2f3c15f78a40b3ac45e20d1080937) )
+	ROM_LOAD32_WORD("African dusk 000.u86", 0x0000000, 0x0400000, CRC(26759ebc) SHA1(1205d74c39d13333ccc0ff4deb287ce12d6dbbf5) )
 ROM_END
 
 
@@ -457,10 +457,10 @@ ROM_END
 ROM_START( alchemya )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("Alchemy.003", 0x0000000, 0x0400000, CRC(11321ce3) SHA1(83c6e7618b29fa7ea8c01e27be0b6e4d85822299) )
-	ROM_LOAD32_WORD("Alchemy_U73.001", 0x0000000, 0x0400000, CRC(bfac2656) SHA1(337f952fae2bff960c78f8808d3dc04815e74404) )
-	ROM_LOAD32_WORD("Alchemy_U85.002", 0x0000000, 0x0400000, CRC(a0a3453b) SHA1(f5f5559bbf8fdf176ca4f0ad755259120d29930c) )
-	ROM_LOAD32_WORD("Alchemy_U86.000", 0x0000000, 0x0400000, CRC(7157c70b) SHA1(1740fd0e9a7dd72390146bfa4e2c4ef3b7d7ec0d) )
+	ROM_LOAD32_WORD("Alchemy.003.u72", 0x0800002, 0x0400000, CRC(11321ce3) SHA1(83c6e7618b29fa7ea8c01e27be0b6e4d85822299) )
+	ROM_LOAD32_WORD("Alchemy_001.u73", 0x0000002, 0x0400000, CRC(bfac2656) SHA1(337f952fae2bff960c78f8808d3dc04815e74404) )
+	ROM_LOAD32_WORD("Alchemy_002.u85", 0x0800000, 0x0400000, CRC(a0a3453b) SHA1(f5f5559bbf8fdf176ca4f0ad755259120d29930c) )
+	ROM_LOAD32_WORD("Alchemy_000.u86", 0x0000000, 0x0400000, CRC(7157c70b) SHA1(1740fd0e9a7dd72390146bfa4e2c4ef3b7d7ec0d) )
 ROM_END
 
 
@@ -468,20 +468,20 @@ ROM_END
 ROM_START( amzqnar )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("AmazonQueen U72.003", 0x0000000, 0x0400000, CRC(1e039e60) SHA1(4f6c5db24c2841daa9b29af2732335498f8b8f0d) )
-	ROM_LOAD32_WORD("AmazonQueen U73.001", 0x0000000, 0x0400000, CRC(7b64f0b4) SHA1(1af15ac0f41acde21606002add1212b9ac72225c) )
-	ROM_LOAD32_WORD("AmazonQueen U85.002", 0x0000000, 0x0400000, CRC(484d8848) SHA1(b86351fd828507968b44fd92c0f9b7ad51bfb9a8) )
-	ROM_LOAD32_WORD("AmazonQueen U86.000", 0x0000000, 0x0400000, CRC(2d5d9be4) SHA1(4eee74084279ae6e89bab55ef22711836eb11a93) )
+	ROM_LOAD32_WORD("AmazonQueen 003.u72", 0x0800002, 0x0400000, CRC(1e039e60) SHA1(4f6c5db24c2841daa9b29af2732335498f8b8f0d) )
+	ROM_LOAD32_WORD("AmazonQueen 001.u73", 0x0000002, 0x0400000, CRC(7b64f0b4) SHA1(1af15ac0f41acde21606002add1212b9ac72225c) )
+	ROM_LOAD32_WORD("AmazonQueen 002.u85", 0x0800000, 0x0400000, CRC(484d8848) SHA1(b86351fd828507968b44fd92c0f9b7ad51bfb9a8) )
+	ROM_LOAD32_WORD("AmazonQueen 000.u86", 0x0000000, 0x0400000, CRC(2d5d9be4) SHA1(4eee74084279ae6e89bab55ef22711836eb11a93) )
 ROM_END
 
 
 ROM_START( arbnigar )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("Arabian Nights.003", 0x0000000, 0x0400000, CRC(709de514) SHA1(3f380ef548c45fa8eaba9cba2bbabdcb59c7660b) )
-	ROM_LOAD32_WORD("Arabian Nights.000", 0x0000000, 0x0400000, CRC(45cf08c3) SHA1(a963a32b3bca5dec17a6cea4c0e5c66f14b42f65) )
-	ROM_LOAD32_WORD("Arabian Nights u85.002", 0x0000000, 0x0400000, CRC(03abddc6) SHA1(cc0a8c78d52b26977274455be8dadb21ee4d3580) )
-	ROM_LOAD32_WORD("Arabian Nights .001", 0x0000000, 0x0400000, CRC(2d2629f0) SHA1(f7af60e390394b12a82a3125a9b931046a5e1fef) )
+	ROM_LOAD32_WORD("Arabian Nights.003.u72", 0x0800002, 0x0400000, CRC(709de514) SHA1(3f380ef548c45fa8eaba9cba2bbabdcb59c7660b) )
+	ROM_LOAD32_WORD("Arabian Nights.000.u86", 0x0000000, 0x0400000, CRC(45cf08c3) SHA1(a963a32b3bca5dec17a6cea4c0e5c66f14b42f65) )
+	ROM_LOAD32_WORD("Arabian Nights 002.u85", 0x0800000, 0x0400000, CRC(03abddc6) SHA1(cc0a8c78d52b26977274455be8dadb21ee4d3580) )
+	ROM_LOAD32_WORD("Arabian Nights.001.u73", 0x0000002, 0x0400000, CRC(2d2629f0) SHA1(f7af60e390394b12a82a3125a9b931046a5e1fef) )
 ROM_END
 
 
@@ -489,10 +489,10 @@ ROM_END
 ROM_START( bigbenpj )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("bigben_u72.003", 0x0000000, 0x0400000, CRC(b5b0fb0e) SHA1(a5f233c1472d7b27a85e2b116ccac8ef61d23e6c) )
-	ROM_LOAD32_WORD("bigben_u73.001", 0x0000000, 0x0400000, CRC(5e5d02f3) SHA1(5a8d7403186d3b10ef3e92297ca4b484c902095a) )
-	ROM_LOAD32_WORD("bigben_u85.002", 0x0000000, 0x0400000, CRC(bc7846d4) SHA1(f754ca71c821f65a27c631f91ce254c76152ffde) )
-	ROM_LOAD32_WORD("bigben_u86.000", 0x0000000, 0x0400000, CRC(21a31a76) SHA1(2290c502c492064967cf67f545351ff38ed6a1be) )
+	ROM_LOAD32_WORD("bigben_003.u72", 0x0800002, 0x0400000, CRC(b5b0fb0e) SHA1(a5f233c1472d7b27a85e2b116ccac8ef61d23e6c) )
+	ROM_LOAD32_WORD("bigben_001.u73", 0x0000002, 0x0400000, CRC(5e5d02f3) SHA1(5a8d7403186d3b10ef3e92297ca4b484c902095a) )
+	ROM_LOAD32_WORD("bigben_002.u85", 0x0800000, 0x0400000, CRC(bc7846d4) SHA1(f754ca71c821f65a27c631f91ce254c76152ffde) )
+	ROM_LOAD32_WORD("bigben_000.u86", 0x0000000, 0x0400000, CRC(21a31a76) SHA1(2290c502c492064967cf67f545351ff38ed6a1be) )
 ROM_END
 
 
@@ -500,8 +500,8 @@ ROM_END
 ROM_START( bigheart )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("Big Hearted U73.001", 0x0000000, 0x0400000, CRC(920ffac3) SHA1(be34f582712da5be84834562c758997829302c24) )
-	ROM_LOAD32_WORD("Big Hearted U86.000", 0x0000000, 0x0400000, CRC(b63fbc96) SHA1(f0a76f52441afe41e9bb11da1526a17d1ed9df6c) )
+	ROM_LOAD32_WORD("Big Hearted 001.u73", 0x0000002, 0x0400000, CRC(920ffac3) SHA1(be34f582712da5be84834562c758997829302c24) )
+	ROM_LOAD32_WORD("Big Hearted 000.u86", 0x0000000, 0x0400000, CRC(b63fbc96) SHA1(f0a76f52441afe41e9bb11da1526a17d1ed9df6c) )
 ROM_END
 
 
@@ -509,10 +509,10 @@ ROM_END
 ROM_START( bigredjp )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("Big Red 2 -Stand Alone.002", 0x0000000, 0x0400000, CRC(e05a45db) SHA1(4fff979915952addc3251adb4385f0072b2033cd) )
-	ROM_LOAD32_WORD("Big Red 2 -Stand Alone.000", 0x0000000, 0x0400000, CRC(6e68c586) SHA1(f6261e92e9c22fbd59d385451d5b212bb888425b) )
-	ROM_LOAD32_WORD("Big Red 2 -Stand Alone.001", 0x0000000, 0x0400000, CRC(8826a403) SHA1(d0e08205c0fdc7229ca4d9a895a8456d8f07ff26) )
-	ROM_LOAD32_WORD("Big Red 2 -Stand Alone-.003", 0x0000000, 0x0400000, CRC(d28be7d5) SHA1(67820d280cb016ecdd8dd35cd0f89f51ab4d4cf1) )
+	ROM_LOAD32_WORD("Big Red 2 -Stand Alone.002.u85", 0x0800000, 0x0400000, CRC(e05a45db) SHA1(4fff979915952addc3251adb4385f0072b2033cd) )
+	ROM_LOAD32_WORD("Big Red 2 -Stand Alone.000.u86", 0x0000000, 0x0400000, CRC(6e68c586) SHA1(f6261e92e9c22fbd59d385451d5b212bb888425b) )
+	ROM_LOAD32_WORD("Big Red 2 -Stand Alone.001.u73", 0x0000002, 0x0400000, CRC(8826a403) SHA1(d0e08205c0fdc7229ca4d9a895a8456d8f07ff26) )
+	ROM_LOAD32_WORD("Big Red 2 -Stand Alone.003.u72", 0x0800002, 0x0400000, CRC(d28be7d5) SHA1(67820d280cb016ecdd8dd35cd0f89f51ab4d4cf1) )
 ROM_END
 
 
@@ -520,12 +520,10 @@ ROM_END
 ROM_START( birredar )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("Big Red.epm", 0x0000000, 0x0000200, CRC(35a1c508) SHA1(b294d209a079308139e7d3df99be11ba563265b6) )
-	ROM_LOAD32_WORD("Big Red.srm", 0x0000000, 0x0080000, CRC(75181493) SHA1(1ef14c4524f92f6823904e6df26da213a28cc502) )
-	ROM_LOAD32_WORD("bigr.000", 0x0000000, 0x0400000, CRC(da16ed45) SHA1(febb8f960009361250ab78814d60d008b3778a57) )
-	ROM_LOAD32_WORD("bigr.001", 0x0000000, 0x0400000, CRC(60e8fd7e) SHA1(7294a180d3ee869a545f43c2c898130f393d076a) )
-	ROM_LOAD32_WORD("bigr.002", 0x0000000, 0x0400000, CRC(8c2f6fc9) SHA1(9dd687b242a3d0348cc20a7a20fef149f5f7834a) )
-	ROM_LOAD32_WORD("bigr.003", 0x0000000, 0x0400000, CRC(bab7ae56) SHA1(d2de7e8544eabe1f116cc878f4ad3ccf22d4ca38) )
+	ROM_LOAD32_WORD("bigr.000.u86", 0x0000000, 0x0400000, CRC(da16ed45) SHA1(febb8f960009361250ab78814d60d008b3778a57) )
+	ROM_LOAD32_WORD("bigr.001.u73", 0x0000002, 0x0400000, CRC(60e8fd7e) SHA1(7294a180d3ee869a545f43c2c898130f393d076a) )
+	ROM_LOAD32_WORD("bigr.002.u85", 0x0800000, 0x0400000, CRC(8c2f6fc9) SHA1(9dd687b242a3d0348cc20a7a20fef149f5f7834a) )
+	ROM_LOAD32_WORD("bigr.003.u72", 0x0800002, 0x0400000, CRC(bab7ae56) SHA1(d2de7e8544eabe1f116cc878f4ad3ccf22d4ca38) )
 ROM_END
 
 
@@ -533,10 +531,10 @@ ROM_END
 ROM_START( blkbrum )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("Black Brumby U72.003", 0x0000000, 0x0400000, CRC(95673ea4) SHA1(17ea6380473796042a44c42afda79ef270282892) )
-	ROM_LOAD32_WORD("Black Brumby U73.001", 0x0000000, 0x0400000, CRC(0ad23541) SHA1(92ddaa68e212165bd2828360b9fdeafd9c821335) )
-	ROM_LOAD32_WORD("Black Brumby U85.002", 0x0000000, 0x0400000, CRC(5f29ac14) SHA1(7fae7adf85b90375732767fb9cd0e88097a61399) )
-	ROM_LOAD32_WORD("Black Brumby U86.000", 0x0000000, 0x0400000, CRC(5a1600be) SHA1(1fcdbc434f872c538997a604b70433d987e2d1ca) )
+	ROM_LOAD32_WORD("Black Brumby 003.u72", 0x0800002, 0x0400000, CRC(95673ea4) SHA1(17ea6380473796042a44c42afda79ef270282892) )
+	ROM_LOAD32_WORD("Black Brumby 001.u73", 0x0000002, 0x0400000, CRC(0ad23541) SHA1(92ddaa68e212165bd2828360b9fdeafd9c821335) )
+	ROM_LOAD32_WORD("Black Brumby 002.u85", 0x0800000, 0x0400000, CRC(5f29ac14) SHA1(7fae7adf85b90375732767fb9cd0e88097a61399) )
+	ROM_LOAD32_WORD("Black Brumby 000.u86", 0x0000000, 0x0400000, CRC(5a1600be) SHA1(1fcdbc434f872c538997a604b70433d987e2d1ca) )
 ROM_END
 
 
@@ -544,16 +542,16 @@ ROM_END
 ROM_START( brazilar )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("Brazil U73.001", 0x0000000, 0x0400000, CRC(5eb15d8b) SHA1(dc313f96390eb04769c5c9249b140eed67796cd8) )
-	ROM_LOAD32_WORD("Brazil U86.000", 0x0000000, 0x0400000, CRC(9be9f72c) SHA1(5e86e42280c6b5b3ce484a04107e84b6aa457bd1) )
+	ROM_LOAD32_WORD("Brazil 001.u73", 0x0000002, 0x0400000, CRC(5eb15d8b) SHA1(dc313f96390eb04769c5c9249b140eed67796cd8) )
+	ROM_LOAD32_WORD("Brazil 000.u86", 0x0000000, 0x0400000, CRC(9be9f72c) SHA1(5e86e42280c6b5b3ce484a04107e84b6aa457bd1) )
 ROM_END
 
 
 ROM_START( bucanar )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("Buccaneer.001", 0x0000000, 0x0400000, CRC(fa1e540e) SHA1(12d36d59fd176cbfad5e78f913a259fd06150f89) )
-	ROM_LOAD32_WORD("Buccaneer.000", 0x0000000, 0x0400000, CRC(9e1f8099) SHA1(28b1f19be0d6914afb604408e74b2d5260e11624) )
+	ROM_LOAD32_WORD("Buccaneer.001.u73", 0x0000002, 0x0400000, CRC(fa1e540e) SHA1(12d36d59fd176cbfad5e78f913a259fd06150f89) )
+	ROM_LOAD32_WORD("Buccaneer.000.u86", 0x0000000, 0x0400000, CRC(9e1f8099) SHA1(28b1f19be0d6914afb604408e74b2d5260e11624) )
 ROM_END
 
 
@@ -561,10 +559,10 @@ ROM_END
 ROM_START( buffalar )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("buffalo.000", 0x0000000, 0x0400000, CRC(9fc2bb3e) SHA1(2a0253500b52ebdebb61c0c8cf296ba9cff575da) )
-	ROM_LOAD32_WORD("buffalo.001", 0x0000000, 0x0400000, CRC(bcc108b3) SHA1(937c5a3cdace65e706565af46597f46562830c80) )
-	ROM_LOAD32_WORD("buffalo.002", 0x0000000, 0x0400000, CRC(fd6a18dc) SHA1(bd5d1a0d6c3c9c99e12234ac3ffca1100edf75fe) )
-	ROM_LOAD32_WORD("buffalo.003", 0x0000000, 0x0400000, CRC(6e7b99c9) SHA1(fd1615e41ba3cf42c2853cf0ccdc0f434694b95e) )
+	ROM_LOAD32_WORD("buffalo.000.u86", 0x0000000, 0x0400000, CRC(9fc2bb3e) SHA1(2a0253500b52ebdebb61c0c8cf296ba9cff575da) )
+	ROM_LOAD32_WORD("buffalo.001.u73", 0x0000002, 0x0400000, CRC(bcc108b3) SHA1(937c5a3cdace65e706565af46597f46562830c80) )
+	ROM_LOAD32_WORD("buffalo.002.u85", 0x0800000, 0x0400000, CRC(fd6a18dc) SHA1(bd5d1a0d6c3c9c99e12234ac3ffca1100edf75fe) )
+	ROM_LOAD32_WORD("buffalo.003.u72", 0x0800002, 0x0400000, CRC(6e7b99c9) SHA1(fd1615e41ba3cf42c2853cf0ccdc0f434694b95e) )
 ROM_END
 
 
@@ -572,10 +570,10 @@ ROM_END
 ROM_START( bushrngr )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("Bushranger .003", 0x0000000, 0x0400000, CRC(71a0084f) SHA1(1e7b7b58b2df25ea0468d702d7eef658d7c53f47) )
-	ROM_LOAD32_WORD("Bushranger .001", 0x0000000, 0x0400000, CRC(73206610) SHA1(9a9eb07efde20c5b079a39c96db447937f555c93) )
-	ROM_LOAD32_WORD("Bushranger .002", 0x0000000, 0x0400000, CRC(5b471edb) SHA1(78da72b727d71f24fbfed34feda9167dd10d96e3) )
-	ROM_LOAD32_WORD("Bushranger.000", 0x0000000, 0x0400000, CRC(e2548c80) SHA1(485476a71f8910fb20a185e5883f863e0628e060) )
+	ROM_LOAD32_WORD("Bushranger.003.u72", 0x0800002, 0x0400000, CRC(71a0084f) SHA1(1e7b7b58b2df25ea0468d702d7eef658d7c53f47) )
+	ROM_LOAD32_WORD("Bushranger.001.u73", 0x0000002, 0x0400000, CRC(73206610) SHA1(9a9eb07efde20c5b079a39c96db447937f555c93) )
+	ROM_LOAD32_WORD("Bushranger.002.u85", 0x0800000, 0x0400000, CRC(5b471edb) SHA1(78da72b727d71f24fbfed34feda9167dd10d96e3) )
+	ROM_LOAD32_WORD("Bushranger.000.u86", 0x0000000, 0x0400000, CRC(e2548c80) SHA1(485476a71f8910fb20a185e5883f863e0628e060) )
 ROM_END
 
 
@@ -583,10 +581,10 @@ ROM_END
 ROM_START( calyking )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("Calypso_King_U72.003", 0x0000000, 0x0400000, CRC(1a09ab1e) SHA1(8aca20b52d1072387e49e6d020c6e9565650aec9) )
-	ROM_LOAD32_WORD("Calypso_King_U73.001", 0x0000000, 0x0400000, CRC(a6f903f6) SHA1(6101cc9115b91c6860cfd3fbe5ab2da105a41ef4) )
-	ROM_LOAD32_WORD("Calypso_King_U85.002", 0x0000000, 0x0400000, CRC(4e130673) SHA1(6d49558146c0e3e8a0f1659dcc2ebe60ae17782b) )
-	ROM_LOAD32_WORD("Calypso_King_U86.000", 0x0000000, 0x0400000, CRC(09ae1f6a) SHA1(2bfc4fb9e01084c460321bb3fa29cee0600c5654) )
+	ROM_LOAD32_WORD("Calypso_King_003.u72", 0x0800002, 0x0400000, CRC(1a09ab1e) SHA1(8aca20b52d1072387e49e6d020c6e9565650aec9) )
+	ROM_LOAD32_WORD("Calypso_King_001.u73", 0x0000002, 0x0400000, CRC(a6f903f6) SHA1(6101cc9115b91c6860cfd3fbe5ab2da105a41ef4) )
+	ROM_LOAD32_WORD("Calypso_King_002.u85", 0x0800000, 0x0400000, CRC(4e130673) SHA1(6d49558146c0e3e8a0f1659dcc2ebe60ae17782b) )
+	ROM_LOAD32_WORD("Calypso_King_000.u86", 0x0000000, 0x0400000, CRC(09ae1f6a) SHA1(2bfc4fb9e01084c460321bb3fa29cee0600c5654) )
 ROM_END
 
 
@@ -594,40 +592,41 @@ ROM_END
 ROM_START( canary2 )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("Canary Riches U73.001", 0x0000000, 0x0400000, CRC(6ae381ec) SHA1(d1103744805137dc69b77a3e1319c7168c88306f) )
-	ROM_LOAD32_WORD("Canary Riches U86.000", 0x0000000, 0x0400000, CRC(37750a22) SHA1(dcb73df1c6bd206343302a8d70966291750a5baf) )
+	ROM_LOAD32_WORD("Canary Riches 001.u73", 0x0000002, 0x0400000, CRC(6ae381ec) SHA1(d1103744805137dc69b77a3e1319c7168c88306f) )
+	ROM_LOAD32_WORD("Canary Riches 000.u86", 0x0000000, 0x0400000, CRC(37750a22) SHA1(dcb73df1c6bd206343302a8d70966291750a5baf) )
 ROM_END
 
 
 
 ROM_START( cmtonig )
 	ARISTMK6_BIOS
-	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("30194711.000", 0x0000000, 0x0400000, CRC(e39fdd27) SHA1(b5e391740ba695b09e2ecb169760240f39b6a27a) )
-	ROM_LOAD32_WORD("30194711.001", 0x0000000, 0x0400000, CRC(9defed89) SHA1(0496ee9b378b7117a8cea89c7b3fcca1bae20e64) )
-	ROM_LOAD32_WORD("30194711.002", 0x0000000, 0x0400000, CRC(3c93d700) SHA1(f940d3eff2225fa3470372b7cd8b630511d53843) )
-	ROM_LOAD32_WORD("30194711.003", 0x0000000, 0x0400000, CRC(2a9dd5fd) SHA1(ca484bf494b7431baaadaf7df663ffd84ea07120) )
-	ROM_LOAD32_WORD("30194711.004", 0x0000000, 0x0400000, CRC(1bce542e) SHA1(8dfb78d966ee50d866739f86c6da9b33e09cd108) )
-	ROM_LOAD32_WORD("30194711.005", 0x0000000, 0x0400000, CRC(2cbd3ef8) SHA1(c4a830c9bae7c50276ba951128056292ac09e19d) )
-	ROM_LOAD32_WORD("30194711.006", 0x0000000, 0x0400000, CRC(cb1a9281) SHA1(1de3b988336fb930d636f3bad37d3d5dc359713b) )
-	ROM_LOAD32_WORD("30194711.007", 0x0000000, 0x0400000, CRC(1dbc278e) SHA1(ac48fce5256a04eabd8271de96b300fb7c265927) )
-	ROM_LOAD32_WORD("30194711.008", 0x0000000, 0x0400000, CRC(5f7dd3f8) SHA1(23db92025455b7ab089a990b2f2cab3acb9ab3b5) )
-	ROM_LOAD32_WORD("30194711.009", 0x0000000, 0x0400000, CRC(5e28e9cb) SHA1(e45cce804fe014078d399a04ca68f1a79d2d5f41) )
-	ROM_LOAD32_WORD("30194711.011", 0x0000000, 0x0400000, CRC(b9d91cab) SHA1(0e79c9e02068c47a9ffc7ace70adad2b579d559f) )
-	ROM_LOAD32_WORD("30194711.010", 0x0000000, 0x0400000, CRC(6ac1430d) SHA1(a782cdcdd80e59f8f7de9a16559609759eaefb78) )
-	ROM_LOAD32_WORD("30194711.012", 0x0000000, 0x0400000, CRC(9b69c5ca) SHA1(f13c4355319c6c45316a05f74a561964657990b8) )
-	ROM_LOAD32_WORD("30194711.013", 0x0000000, 0x0400000, CRC(1bf2985c) SHA1(7c037b290983b70efe5f72cb8b8b30e012b53860) )
+	ROM_REGION( 0x4000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("30194711.000.u86", 0x0000000, 0x0400000, CRC(e39fdd27) SHA1(b5e391740ba695b09e2ecb169760240f39b6a27a) )
+	ROM_LOAD32_WORD("30194711.001.u73", 0x0000002, 0x0400000, CRC(9defed89) SHA1(0496ee9b378b7117a8cea89c7b3fcca1bae20e64) )
+	ROM_LOAD32_WORD("30194711.002.u85", 0x0800000, 0x0400000, CRC(3c93d700) SHA1(f940d3eff2225fa3470372b7cd8b630511d53843) )
+	ROM_LOAD32_WORD("30194711.003.u72", 0x0800002, 0x0400000, CRC(2a9dd5fd) SHA1(ca484bf494b7431baaadaf7df663ffd84ea07120) )
+	ROM_LOAD32_WORD("30194711.004.u84", 0x1000000, 0x0400000, CRC(1bce542e) SHA1(8dfb78d966ee50d866739f86c6da9b33e09cd108) )
+	ROM_LOAD32_WORD("30194711.005.u71", 0x1000002, 0x0400000, CRC(2cbd3ef8) SHA1(c4a830c9bae7c50276ba951128056292ac09e19d) )
+	ROM_LOAD32_WORD("30194711.006.u83", 0x1800000, 0x0400000, CRC(cb1a9281) SHA1(1de3b988336fb930d636f3bad37d3d5dc359713b) )
+	ROM_LOAD32_WORD("30194711.007.u70", 0x1800002, 0x0400000, CRC(1dbc278e) SHA1(ac48fce5256a04eabd8271de96b300fb7c265927) )
+	// IC positions and loading below is guessed
+	ROM_LOAD32_WORD("30194711.008.u82", 0x2000000, 0x0400000, CRC(5f7dd3f8) SHA1(23db92025455b7ab089a990b2f2cab3acb9ab3b5) )
+	ROM_LOAD32_WORD("30194711.009.u69", 0x2000002, 0x0400000, CRC(5e28e9cb) SHA1(e45cce804fe014078d399a04ca68f1a79d2d5f41) )
+	ROM_LOAD32_WORD("30194711.010.u81", 0x2800000, 0x0400000, CRC(6ac1430d) SHA1(a782cdcdd80e59f8f7de9a16559609759eaefb78) )
+	ROM_LOAD32_WORD("30194711.011.u68", 0x2800002, 0x0400000, CRC(b9d91cab) SHA1(0e79c9e02068c47a9ffc7ace70adad2b579d559f) )
+	ROM_LOAD32_WORD("30194711.012.u80", 0x3000000, 0x0400000, CRC(9b69c5ca) SHA1(f13c4355319c6c45316a05f74a561964657990b8) )
+	ROM_LOAD32_WORD("30194711.013.u67", 0x3000002, 0x0400000, CRC(1bf2985c) SHA1(7c037b290983b70efe5f72cb8b8b30e012b53860) )
 ROM_END
 
 
 ROM_START( csdce )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("Gam_Eprm.u71", 0x0000000, 0x0400000, CRC(32fcccb0) SHA1(a0fa260dadf4b6c659eaa60f67a3e552dbb1807b) )
-	ROM_LOAD32_WORD("Gam_Eprm.u72", 0x0000000, 0x0400000, CRC(f74e7f25) SHA1(5b43b54c10141b845d0de1d4f3dd54b833bd2d2a) )
-	ROM_LOAD32_WORD("Gam_Eprm.u73", 0x0000000, 0x0400000, CRC(d38ffd1b) SHA1(3d39c93478faafbadd9caf6f2a9b3d40ac4e51ce) )
-	ROM_LOAD32_WORD("Gam_Eprm.u84", 0x0000000, 0x0400000, CRC(15a5fb71) SHA1(bb2025e4a85ba77daf8bb6b55e38a8b8250f90f3) )
-	ROM_LOAD32_WORD("Gam_Eprm.u85", 0x0000000, 0x0400000, CRC(c58ea0e5) SHA1(545dc5d0e6d18d5f22ec3e216d9204efc1d69633) )
+	ROM_LOAD32_WORD("Gam_Eprm.u71", 0x1000002, 0x0400000, CRC(32fcccb0) SHA1(a0fa260dadf4b6c659eaa60f67a3e552dbb1807b) )
+	ROM_LOAD32_WORD("Gam_Eprm.u72", 0x0800002, 0x0400000, CRC(f74e7f25) SHA1(5b43b54c10141b845d0de1d4f3dd54b833bd2d2a) )
+	ROM_LOAD32_WORD("Gam_Eprm.u73", 0x0000002, 0x0400000, CRC(d38ffd1b) SHA1(3d39c93478faafbadd9caf6f2a9b3d40ac4e51ce) )
+	ROM_LOAD32_WORD("Gam_Eprm.u84", 0x1000000, 0x0400000, CRC(15a5fb71) SHA1(bb2025e4a85ba77daf8bb6b55e38a8b8250f90f3) )
+	ROM_LOAD32_WORD("Gam_Eprm.u85", 0x0800000, 0x0400000, CRC(c58ea0e5) SHA1(545dc5d0e6d18d5f22ec3e216d9204efc1d69633) )
 	ROM_LOAD32_WORD("Gam_Eprm.u86", 0x0000000, 0x0400000, CRC(cdf64cac) SHA1(3673f1cce8ce92192754ba2afa24be14dbfd760f) )
 ROM_END
 
@@ -636,10 +635,10 @@ ROM_END
 ROM_START( csd )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("Choy Sun Doa .003", 0x0000000, 0x0400000, CRC(732bc777) SHA1(bc3ced0a3e3e75151bfdf1c7d79fff2ebac15230) )
-	ROM_LOAD32_WORD("Choy Sun Doa.001", 0x0000000, 0x0400000, CRC(78fb8acb) SHA1(60cde2c9fd0c3a6ac8a76099906c87393d90b8bf) )
-	ROM_LOAD32_WORD("Choy Sun Doa.002", 0x0000000, 0x0400000, CRC(e1b6c747) SHA1(3e0345357c4b66b30c87e6ebf540fcc636505804) )
-	ROM_LOAD32_WORD("Choy Sun Doa.000", 0x0000000, 0x0400000, CRC(674fbe7a) SHA1(5292dd3887f066e6ea150fe8c140c2d3cde142d9) )
+	ROM_LOAD32_WORD("Choy Sun Doa.003.u72", 0x0800002, 0x0400000, CRC(732bc777) SHA1(bc3ced0a3e3e75151bfdf1c7d79fff2ebac15230) )
+	ROM_LOAD32_WORD("Choy Sun Doa.001.u73", 0x0000002, 0x0400000, CRC(78fb8acb) SHA1(60cde2c9fd0c3a6ac8a76099906c87393d90b8bf) )
+	ROM_LOAD32_WORD("Choy Sun Doa.002.u85", 0x0800000, 0x0400000, CRC(e1b6c747) SHA1(3e0345357c4b66b30c87e6ebf540fcc636505804) )
+	ROM_LOAD32_WORD("Choy Sun Doa.000.u86", 0x0000000, 0x0400000, CRC(674fbe7a) SHA1(5292dd3887f066e6ea150fe8c140c2d3cde142d9) )
 ROM_END
 
 
@@ -647,10 +646,10 @@ ROM_END
 ROM_START( csret )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("Choy Sun Returns U72.003", 0x0000000, 0x0400000, CRC(c4278640) SHA1(bfb5c69191661625427742d24f7f2f63e59217c1) )
-	ROM_LOAD32_WORD("Choy Sun Returns U73.001", 0x0000000, 0x0400000, CRC(3dadf971) SHA1(ffab779da0160d0e8a78fdc9e1440b2f27d04d20) )
-	ROM_LOAD32_WORD("Choy Sun Returns U85.002", 0x0000000, 0x0400000, CRC(6771599d) SHA1(c3476b37b9189c3197194a9027d2f154a12aee37) )
-	ROM_LOAD32_WORD("Choy Sun Returns U86.000", 0x0000000, 0x0400000, CRC(0136afeb) SHA1(ec8478216353100a541cf736d54fc440cd89d665) )
+	ROM_LOAD32_WORD("Choy Sun Returns 003.u72", 0x0800002, 0x0400000, CRC(c4278640) SHA1(bfb5c69191661625427742d24f7f2f63e59217c1) )
+	ROM_LOAD32_WORD("Choy Sun Returns 001.u73", 0x0000002, 0x0400000, CRC(3dadf971) SHA1(ffab779da0160d0e8a78fdc9e1440b2f27d04d20) )
+	ROM_LOAD32_WORD("Choy Sun Returns 002.u85", 0x0800000, 0x0400000, CRC(6771599d) SHA1(c3476b37b9189c3197194a9027d2f154a12aee37) )
+	ROM_LOAD32_WORD("Choy Sun Returns 000.u86", 0x0000000, 0x0400000, CRC(0136afeb) SHA1(ec8478216353100a541cf736d54fc440cd89d665) )
 ROM_END
 
 
@@ -658,10 +657,10 @@ ROM_END
 ROM_START( corrida )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("30178311_CORRIDA_DE_TOROS.003", 0x0000000, 0x0400000, CRC(37d4eed5) SHA1(55aa5f4dad3193f67e8fea7506dde2230b8c6b9e) )
-	ROM_LOAD32_WORD("30178311_CORRIDA_DE_TOROS.001", 0x0000000, 0x0400000, CRC(6df3c1f5) SHA1(5b8fcbbc650c0fefdf504fd7d48a125d2f7d22e7) )
-	ROM_LOAD32_WORD("30178311_CORRIDA_DE_TOROS_.002", 0x0000000, 0x0400000, CRC(451774c0) SHA1(e2fd78433ad9016900581720ccd29bf511a57f04) )
-	ROM_LOAD32_WORD("30178311_CORRIDA_DE_TOROS.000", 0x0000000, 0x0400000, CRC(19424139) SHA1(8715c995368f5ac410b2ef6f09833b7516df0bd5) )
+	ROM_LOAD32_WORD("30178311_CORRIDA_DE_TOROS.003.u72", 0x0800002, 0x0400000, CRC(37d4eed5) SHA1(55aa5f4dad3193f67e8fea7506dde2230b8c6b9e) )
+	ROM_LOAD32_WORD("30178311_CORRIDA_DE_TOROS.001.u73", 0x0000002, 0x0400000, CRC(6df3c1f5) SHA1(5b8fcbbc650c0fefdf504fd7d48a125d2f7d22e7) )
+	ROM_LOAD32_WORD("30178311_CORRIDA_DE_TOROS.002.u85", 0x0800000, 0x0400000, CRC(451774c0) SHA1(e2fd78433ad9016900581720ccd29bf511a57f04) )
+	ROM_LOAD32_WORD("30178311_CORRIDA_DE_TOROS.000.u86", 0x0000000, 0x0400000, CRC(19424139) SHA1(8715c995368f5ac410b2ef6f09833b7516df0bd5) )
 ROM_END
 
 
@@ -669,8 +668,8 @@ ROM_END
 ROM_START( cryspri )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("Crystal Springs U73.001", 0x0000000, 0x0400000, CRC(e8ab1219) SHA1(88e792209d224fc95b4248fc1aeebcae39b06eb7) )
-	ROM_LOAD32_WORD("Crystal Springs U86.000", 0x0000000, 0x0400000, CRC(5c0e7122) SHA1(f729e20d15f9a8d1442a9f9616cfa09ac181bc3f) )
+	ROM_LOAD32_WORD("Crystal Springs 001.u73", 0x0000002, 0x0400000, CRC(e8ab1219) SHA1(88e792209d224fc95b4248fc1aeebcae39b06eb7) )
+	ROM_LOAD32_WORD("Crystal Springs 000.u86", 0x0000000, 0x0400000, CRC(5c0e7122) SHA1(f729e20d15f9a8d1442a9f9616cfa09ac181bc3f) )
 ROM_END
 
 
@@ -678,10 +677,10 @@ ROM_END
 ROM_START( deltqn )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("Delta Queen_U72.003", 0x0000000, 0x0400000, CRC(1978abb1) SHA1(7ffd1d81201bcf31936bbc5bd194b182cb9b5cdc) )
-	ROM_LOAD32_WORD("Delta Queen_U73.001", 0x0000000, 0x0400000, CRC(56628af9) SHA1(778175ce3d0074569e434a9c3995751747352e15) )
-	ROM_LOAD32_WORD("Delta Queen_U85.002", 0x0000000, 0x0400000, CRC(73fe916b) SHA1(c262775bde046b5457ab998017012af12b5c036c) )
-	ROM_LOAD32_WORD("Delta Queen_U86.000", 0x0000000, 0x0400000, CRC(93b7ca6b) SHA1(1384638d4da321ec7044f0bf10dfc626c1928215) )
+	ROM_LOAD32_WORD("Delta Queen_003.u72", 0x0800002, 0x0400000, CRC(1978abb1) SHA1(7ffd1d81201bcf31936bbc5bd194b182cb9b5cdc) )
+	ROM_LOAD32_WORD("Delta Queen_001.u73", 0x0000002, 0x0400000, CRC(56628af9) SHA1(778175ce3d0074569e434a9c3995751747352e15) )
+	ROM_LOAD32_WORD("Delta Queen_002.u85", 0x0800000, 0x0400000, CRC(73fe916b) SHA1(c262775bde046b5457ab998017012af12b5c036c) )
+	ROM_LOAD32_WORD("Delta Queen_000.u86", 0x0000000, 0x0400000, CRC(93b7ca6b) SHA1(1384638d4da321ec7044f0bf10dfc626c1928215) )
 ROM_END
 
 
@@ -689,8 +688,8 @@ ROM_END
 ROM_START( di4ever )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("Diamond's Forever U73.001", 0x0000000, 0x0400000, CRC(39922c60) SHA1(19c36087cae9cf482d3dc86dc40fa94c3687ae96) )
-	ROM_LOAD32_WORD("Diamond's Forever U86.000", 0x0000000, 0x0400000, CRC(d7c0fd99) SHA1(97d2b17ea89d7dd0186a13f08fe68a7f8e1336ca) )
+	ROM_LOAD32_WORD("Diamond's Forever 001.u73", 0x0000002, 0x0400000, CRC(39922c60) SHA1(19c36087cae9cf482d3dc86dc40fa94c3687ae96) )
+	ROM_LOAD32_WORD("Diamond's Forever 000.u86", 0x0000000, 0x0400000, CRC(d7c0fd99) SHA1(97d2b17ea89d7dd0186a13f08fe68a7f8e1336ca) )
 ROM_END
 
 
@@ -698,10 +697,10 @@ ROM_END
 ROM_START( dinoaris )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("Dinosaur .003", 0x0000000, 0x0400000, CRC(34181cf9) SHA1(93d014891789260fe0a0eeeff17c25c6211753db) )
-	ROM_LOAD32_WORD("Dinosaur.001", 0x0000000, 0x0400000, CRC(17b46b56) SHA1(43d55adcc54855b6845ffedba8998b14df0447f3) )
-	ROM_LOAD32_WORD("Dinosaur.002", 0x0000000, 0x0400000, CRC(cff22e03) SHA1(0fd6632ae9c71bc99a31e9bdc9abdfda09dfafd7) )
-	ROM_LOAD32_WORD("Dinosaur U86.000", 0x0000000, 0x0400000, CRC(74e08c66) SHA1(002a526e8e693aa68f45ae8485114c8bdc3f2453) )
+	ROM_LOAD32_WORD("Dinosaur.003.u72", 0x0800002, 0x0400000, CRC(34181cf9) SHA1(93d014891789260fe0a0eeeff17c25c6211753db) )
+	ROM_LOAD32_WORD("Dinosaur.001.u73", 0x0000002, 0x0400000, CRC(17b46b56) SHA1(43d55adcc54855b6845ffedba8998b14df0447f3) )
+	ROM_LOAD32_WORD("Dinosaur.002.u85", 0x0800000, 0x0400000, CRC(cff22e03) SHA1(0fd6632ae9c71bc99a31e9bdc9abdfda09dfafd7) )
+	ROM_LOAD32_WORD("Dinosaur 000.u86", 0x0000000, 0x0400000, CRC(74e08c66) SHA1(002a526e8e693aa68f45ae8485114c8bdc3f2453) )
 ROM_END
 
 
@@ -709,10 +708,10 @@ ROM_END
 ROM_START( doubdolp )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("double_dolphins_U72.003", 0x0000000, 0x0400000, CRC(cd886389) SHA1(d0044d88d7cc168ae24e3a61f7e4758317b82417) )
-	ROM_LOAD32_WORD("double_dolphins_U73.001", 0x0000000, 0x0400000, CRC(493c254b) SHA1(940c5b905c9e5677db5589fb097418d08047897d) )
-	ROM_LOAD32_WORD("double_dolphins_U85.002", 0x0000000, 0x0400000, CRC(7aa49b2d) SHA1(15ae3f0eb6d1e44c5453e557b04f1ab3941163dc) )
-	ROM_LOAD32_WORD("double_dolphins_U86.000", 0x0000000, 0x0400000, CRC(ab98e4c1) SHA1(95ca99633a11d0087a4a702be8c075f1ad87bed4) )
+	ROM_LOAD32_WORD("double_dolphins_003.u72", 0x0800002, 0x0400000, CRC(cd886389) SHA1(d0044d88d7cc168ae24e3a61f7e4758317b82417) )
+	ROM_LOAD32_WORD("double_dolphins_001.u73", 0x0000002, 0x0400000, CRC(493c254b) SHA1(940c5b905c9e5677db5589fb097418d08047897d) )
+	ROM_LOAD32_WORD("double_dolphins_002.u85", 0x0800000, 0x0400000, CRC(7aa49b2d) SHA1(15ae3f0eb6d1e44c5453e557b04f1ab3941163dc) )
+	ROM_LOAD32_WORD("double_dolphins_000.u86", 0x0000000, 0x0400000, CRC(ab98e4c1) SHA1(95ca99633a11d0087a4a702be8c075f1ad87bed4) )
 ROM_END
 
 
@@ -720,11 +719,10 @@ ROM_END
 ROM_START( drgnlrd )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("DragonLord_.002", 0x0000000, 0x0400000, CRC(d17e1a0d) SHA1(955e4956656e7f08e352628cc632af0e3cb6cf0f) )
-	ROM_LOAD32_WORD("DragonLord_.003", 0x0000000, 0x0400000, CRC(c2b42880) SHA1(7079102d576d8e9c5cb4d3067b02d131b63b8d88) )
-	ROM_LOAD32_WORD("DragonLord_.000", 0x0000000, 0x0400000, CRC(fc699900) SHA1(8e49672e7622ac6bd0106c25f524a7dd9e9578ab) )
-	ROM_LOAD32_WORD("DragonLord_.001", 0x0000000, 0x0400000, CRC(dd887eb0) SHA1(7ac4f86d0cfc69acd4471cc018f8b83d98735b37) )
-//	ROM_LOAD32_WORD("Grizzly", 0x0000000, 0x10cad8d, CRC(80277bc4) SHA1(a274e7a828c722a40eaa86e70cc9f7b4a24e2494) )
+	ROM_LOAD32_WORD("DragonLord_.002.u85", 0x0800000, 0x0400000, CRC(d17e1a0d) SHA1(955e4956656e7f08e352628cc632af0e3cb6cf0f) )
+	ROM_LOAD32_WORD("DragonLord_.003.u72", 0x0800002, 0x0400000, CRC(c2b42880) SHA1(7079102d576d8e9c5cb4d3067b02d131b63b8d88) )
+	ROM_LOAD32_WORD("DragonLord_.000.u86", 0x0000000, 0x0400000, CRC(fc699900) SHA1(8e49672e7622ac6bd0106c25f524a7dd9e9578ab) )
+	ROM_LOAD32_WORD("DragonLord_.001.u73", 0x0000002, 0x0400000, CRC(dd887eb0) SHA1(7ac4f86d0cfc69acd4471cc018f8b83d98735b37) )
 ROM_END
 
 
@@ -733,11 +731,11 @@ ROM_END
 ROM_START( drgnmgic )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("Gam_Eprm.u71", 0x0000000, 0x0400000, CRC(768ff8fb) SHA1(a99a750ee4bb761a21c264133ce7ea7ef344578f) )
-	ROM_LOAD32_WORD("Gam_Eprm.u72", 0x0000000, 0x0400000, CRC(cc84661f) SHA1(85fca4517b6fbbe83c4f5a5159af95c7e1089849) )
-	ROM_LOAD32_WORD("Gam_Eprm.u73", 0x0000000, 0x0400000, CRC(aa321624) SHA1(8c0e7e84c0dc7a2a61eb8d4777e5e937c1622730) )
-	ROM_LOAD32_WORD("Gam_Eprm.u84", 0x0000000, 0x0400000, CRC(cc84cd2f) SHA1(1939b7a40de44de5d026f2e4252f9d2b33d44012) )
-	ROM_LOAD32_WORD("Gam_Eprm.u85", 0x0000000, 0x0400000, CRC(aa2ebf24) SHA1(fc4bc1d9b201defa04cdcfaf12c79e67496c233c) )
+	ROM_LOAD32_WORD("Gam_Eprm.u71", 0x1000002, 0x0400000, CRC(768ff8fb) SHA1(a99a750ee4bb761a21c264133ce7ea7ef344578f) )
+	ROM_LOAD32_WORD("Gam_Eprm.u72", 0x0800002, 0x0400000, CRC(cc84661f) SHA1(85fca4517b6fbbe83c4f5a5159af95c7e1089849) )
+	ROM_LOAD32_WORD("Gam_Eprm.u73", 0x0000002, 0x0400000, CRC(aa321624) SHA1(8c0e7e84c0dc7a2a61eb8d4777e5e937c1622730) )
+	ROM_LOAD32_WORD("Gam_Eprm.u84", 0x1000000, 0x0400000, CRC(cc84cd2f) SHA1(1939b7a40de44de5d026f2e4252f9d2b33d44012) )
+	ROM_LOAD32_WORD("Gam_Eprm.u85", 0x0800000, 0x0400000, CRC(aa2ebf24) SHA1(fc4bc1d9b201defa04cdcfaf12c79e67496c233c) )
 	ROM_LOAD32_WORD("Gam_Eprm.u86", 0x0000000, 0x0400000, CRC(9fb775a7) SHA1(636d7959a8aeb5f2b5d46fc369721451fc3e4693) )
 ROM_END
 
@@ -746,18 +744,18 @@ ROM_END
 ROM_START( ent6r )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("Enchantress_.001", 0x0000000, 0x0400000, CRC(dcaaec40) SHA1(f035e54d9c926826c7883838a65260fc5ca6c02c) )
-	ROM_LOAD32_WORD("Enchantress_.000", 0x0000000, 0x0400000, CRC(17a7db59) SHA1(f948369144791d6fd761efbbe5fb37b765b637e3) )
+	ROM_LOAD32_WORD("Enchantress_.001.u73", 0x0000002, 0x0400000, CRC(dcaaec40) SHA1(f035e54d9c926826c7883838a65260fc5ca6c02c) )
+	ROM_LOAD32_WORD("Enchantress_.000.u86", 0x0000000, 0x0400000, CRC(17a7db59) SHA1(f948369144791d6fd761efbbe5fb37b765b637e3) )
 ROM_END
 
 
 ROM_START( eott )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("Eyes Of The Tiger .003", 0x0000000, 0x0400000, CRC(0ccf36e4) SHA1(6b185113a909985730cf1a58d1179d0ffc269d40) )
-	ROM_LOAD32_WORD("Eyes Of The Tiger .001", 0x0000000, 0x0400000, CRC(63d43c24) SHA1(8f76d2a7f9f5c0eb89609f891255e584b3a417d5) )
-	ROM_LOAD32_WORD("Eyes Of The Tiger .002", 0x0000000, 0x0400000, CRC(d941636d) SHA1(7103599caa30d57a1fa038afd7c60c684ba9dc5a) )
-	ROM_LOAD32_WORD("Eyes Of The Tiger.000", 0x0000000, 0x0400000, CRC(dae52614) SHA1(4a80d1a20f79b25e0f47c40ba05645d60b598568) )
+	ROM_LOAD32_WORD("Eyes Of The Tiger.003.u72", 0x0800002, 0x0400000, CRC(0ccf36e4) SHA1(6b185113a909985730cf1a58d1179d0ffc269d40) )
+	ROM_LOAD32_WORD("Eyes Of The Tiger.001.u73", 0x0000002, 0x0400000, CRC(63d43c24) SHA1(8f76d2a7f9f5c0eb89609f891255e584b3a417d5) )
+	ROM_LOAD32_WORD("Eyes Of The Tiger.002.u85", 0x0800000, 0x0400000, CRC(d941636d) SHA1(7103599caa30d57a1fa038afd7c60c684ba9dc5a) )
+	ROM_LOAD32_WORD("Eyes Of The Tiger.000.u86", 0x0000000, 0x0400000, CRC(dae52614) SHA1(4a80d1a20f79b25e0f47c40ba05645d60b598568) )
 ROM_END
 
 
@@ -765,10 +763,10 @@ ROM_END
 ROM_START( firedan )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("U72 Fire Dancer.003", 0x0000000, 0x0400000, CRC(de394e4c) SHA1(9ec430df94de2cc0dbc8cc3a8763fde257fe3477) )
-	ROM_LOAD32_WORD("U73 Fire Dancer.001", 0x0000000, 0x0400000, CRC(30b0f1a0) SHA1(9095f3848514e5a7ab5528fef701a274156d4bce) )
-	ROM_LOAD32_WORD("U85 Fire Dancer.002", 0x0000000, 0x0400000, CRC(f05c2ebe) SHA1(7b196523a613955a3f4fec70e04c642bc1184dde) )
-	ROM_LOAD32_WORD("U86 Fire Dancer.000", 0x0000000, 0x0400000, CRC(be5673c6) SHA1(68a5c6515945c8341479cae3166d8ed0915ec566) )
+	ROM_LOAD32_WORD("U72 Fire Dancer.003.u72", 0x0800002, 0x0400000, CRC(de394e4c) SHA1(9ec430df94de2cc0dbc8cc3a8763fde257fe3477) )
+	ROM_LOAD32_WORD("U73 Fire Dancer.001.u73", 0x0000002, 0x0400000, CRC(30b0f1a0) SHA1(9095f3848514e5a7ab5528fef701a274156d4bce) )
+	ROM_LOAD32_WORD("U85 Fire Dancer.002.u85", 0x0800000, 0x0400000, CRC(f05c2ebe) SHA1(7b196523a613955a3f4fec70e04c642bc1184dde) )
+	ROM_LOAD32_WORD("U86 Fire Dancer.000.u86", 0x0000000, 0x0400000, CRC(be5673c6) SHA1(68a5c6515945c8341479cae3166d8ed0915ec566) )
 ROM_END
 
 
@@ -776,8 +774,8 @@ ROM_END
 ROM_START( followst )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("Follow The Stars.001", 0x0000000, 0x0400000, CRC(a1037235) SHA1(3badc901f8d1488cb630b07adc18cc280bd1c111) )
-	ROM_LOAD32_WORD("Follow The Stars.000", 0x0000000, 0x0400000, CRC(aa3d76aa) SHA1(94350d0efb49467febd1500dbb697aa865d43843) )
+	ROM_LOAD32_WORD("Follow The Stars.001.u73", 0x0000002, 0x0400000, CRC(a1037235) SHA1(3badc901f8d1488cb630b07adc18cc280bd1c111) )
+	ROM_LOAD32_WORD("Follow The Stars.000.u86", 0x0000000, 0x0400000, CRC(aa3d76aa) SHA1(94350d0efb49467febd1500dbb697aa865d43843) )
 ROM_END
 
 
@@ -785,8 +783,8 @@ ROM_END
 ROM_START( gambjack )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("Gambling Jack U73.001", 0x0000000, 0x0400000, CRC(80eeb208) SHA1(ad38d08993457a344ed5da9b6335e9a933b11a67) )
-	ROM_LOAD32_WORD("Gambling Jack U86.000", 0x0000000, 0x0400000, CRC(d55c8c10) SHA1(fb876c0fe04785d01baef1debe5a16f4d2e1587f) )
+	ROM_LOAD32_WORD("Gambling Jack 001.u73", 0x0000002, 0x0400000, CRC(80eeb208) SHA1(ad38d08993457a344ed5da9b6335e9a933b11a67) )
+	ROM_LOAD32_WORD("Gambling Jack 000.u86", 0x0000000, 0x0400000, CRC(d55c8c10) SHA1(fb876c0fe04785d01baef1debe5a16f4d2e1587f) )
 ROM_END
 
 
@@ -794,185 +792,185 @@ ROM_END
 ROM_START( geishaar )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("U72.003", 0x0000000, 0x0400000, CRC(1efb986d) SHA1(34a5964e0eada085ff738ee4853beb75c431aaaa) )
-	ROM_LOAD32_WORD("U73.001", 0x0000000, 0x0400000, CRC(544c2cd6) SHA1(3904bb39096dd66f3579b7f244e8872fe29f4f72) )
-	ROM_LOAD32_WORD("U85.002", 0x0000000, 0x0400000, CRC(02c7819e) SHA1(f553adf6975c6fafff61e30605531b91ae5598af) )
-	ROM_LOAD32_WORD("U86.000", 0x0000000, 0x0400000, CRC(994e2e17) SHA1(a8b40aeb98f4e80a3eb412927f23b4292a7dbf6e) )
+	ROM_LOAD32_WORD("003.u72", 0x0800002, 0x0400000, CRC(1efb986d) SHA1(34a5964e0eada085ff738ee4853beb75c431aaaa) )
+	ROM_LOAD32_WORD("001.u73", 0x0000002, 0x0400000, CRC(544c2cd6) SHA1(3904bb39096dd66f3579b7f244e8872fe29f4f72) )
+	ROM_LOAD32_WORD("002.u85", 0x0800000, 0x0400000, CRC(02c7819e) SHA1(f553adf6975c6fafff61e30605531b91ae5598af) )
+	ROM_LOAD32_WORD("000.u86", 0x0000000, 0x0400000, CRC(994e2e17) SHA1(a8b40aeb98f4e80a3eb412927f23b4292a7dbf6e) )
 ROM_END
 
 
 ROM_START( goapear )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("Go Ape U73.001", 0x0000000, 0x0400000, CRC(d579d719) SHA1(e3679657ed2f27b52a762a7f424714e5080a6957) )
-	ROM_LOAD32_WORD("Go Ape U86.000", 0x0000000, 0x0400000, CRC(392ed11e) SHA1(4fef477254b75c37a282a77aaf3046855118bdc0) )
+	ROM_LOAD32_WORD("Go Ape 001.u73", 0x0000002, 0x0400000, CRC(d579d719) SHA1(e3679657ed2f27b52a762a7f424714e5080a6957) )
+	ROM_LOAD32_WORD("Go Ape 000.u86", 0x0000000, 0x0400000, CRC(392ed11e) SHA1(4fef477254b75c37a282a77aaf3046855118bdc0) )
 ROM_END
 
 
 ROM_START( gogreen )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("Go For Green U72.003", 0x0000000, 0x0400000, CRC(e138958c) SHA1(4416c4e00e388e8c84f9d82949c1875a5b34655f) )
-	ROM_LOAD32_WORD("Go For Green U73.001", 0x0000000, 0x0400000, CRC(279da15c) SHA1(967063011447aeb4563878c13da3cf60f3f8b456) )
-	ROM_LOAD32_WORD("Go For Green U85.002", 0x0000000, 0x0400000, CRC(57f68a9a) SHA1(8e7075e2b532a0c5ad0fd9d9f815a764cb9bb842) )
-	ROM_LOAD32_WORD("Go For Green U86.000", 0x0000000, 0x0400000, CRC(17f801b4) SHA1(c2044c445694fb0755add29e4a4a0ccb9bf36442) )
+	ROM_LOAD32_WORD("Go For Green 003.u72", 0x0800002, 0x0400000, CRC(e138958c) SHA1(4416c4e00e388e8c84f9d82949c1875a5b34655f) )
+	ROM_LOAD32_WORD("Go For Green 001.u73", 0x0000002, 0x0400000, CRC(279da15c) SHA1(967063011447aeb4563878c13da3cf60f3f8b456) )
+	ROM_LOAD32_WORD("Go For Green 002.u85", 0x0800000, 0x0400000, CRC(57f68a9a) SHA1(8e7075e2b532a0c5ad0fd9d9f815a764cb9bb842) )
+	ROM_LOAD32_WORD("Go For Green 000.u86", 0x0000000, 0x0400000, CRC(17f801b4) SHA1(c2044c445694fb0755add29e4a4a0ccb9bf36442) )
 ROM_END
 
 
 ROM_START( goldarjp )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("Golden Archer U72.003", 0x0000000, 0x0400000, CRC(f6d262c6) SHA1(09e5f1e3838921482b01005e8781e83f08a9bd75) )
-	ROM_LOAD32_WORD("Golden Archer U73.001", 0x0000000, 0x0400000, CRC(edaaadf1) SHA1(3d68ba211c1904e7ea35d679c9f8845ef1e4ea90) )
-	ROM_LOAD32_WORD("Golden Archer U85.002", 0x0000000, 0x0400000, CRC(dc2c1319) SHA1(8df96bf7b96a3c7df0a155420959d939daedf5c4) )
-	ROM_LOAD32_WORD("Golden Archer U86.000", 0x0000000, 0x0400000, CRC(00858fad) SHA1(8467ed9898d2234ba48e9896b8dd20afa75c5f69) )
+	ROM_LOAD32_WORD("Golden Archer 003.u72", 0x0800002, 0x0400000, CRC(f6d262c6) SHA1(09e5f1e3838921482b01005e8781e83f08a9bd75) )
+	ROM_LOAD32_WORD("Golden Archer 001.u73", 0x0000002, 0x0400000, CRC(edaaadf1) SHA1(3d68ba211c1904e7ea35d679c9f8845ef1e4ea90) )
+	ROM_LOAD32_WORD("Golden Archer 002.u85", 0x0800000, 0x0400000, CRC(dc2c1319) SHA1(8df96bf7b96a3c7df0a155420959d939daedf5c4) )
+	ROM_LOAD32_WORD("Golden Archer 000.u86", 0x0000000, 0x0400000, CRC(00858fad) SHA1(8467ed9898d2234ba48e9896b8dd20afa75c5f69) )
 ROM_END
 
 
 ROM_START( goldinc )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("Golden Incas Demo.003", 0x0000000, 0x0400000, CRC(8629d154) SHA1(bb4e679188ec8f58e8e227804c36d1e61e575efe) )
-	ROM_LOAD32_WORD("Golden Incas Demo U73.001", 0x0000000, 0x0400000, CRC(7a88f44f) SHA1(586cbcf25eedcae538aaa3c3f8c7700778180295) )
-	ROM_LOAD32_WORD("Golden Incas Demo.002", 0x0000000, 0x0400000, CRC(dde914b2) SHA1(f35b761dd89796f62fec40d48c0223f585247de0) )
-	ROM_LOAD32_WORD("Golden Incas Demo.000", 0x0000000, 0x0400000, CRC(c4f488f9) SHA1(0db96a71f361f80f8e7265d1873728fc3013c204) )
+	ROM_LOAD32_WORD("Golden Incas Demo.003.u72", 0x0800002, 0x0400000, CRC(8629d154) SHA1(bb4e679188ec8f58e8e227804c36d1e61e575efe) )
+	ROM_LOAD32_WORD("Golden Incas Demo 001.u73", 0x0000002, 0x0400000, CRC(7a88f44f) SHA1(586cbcf25eedcae538aaa3c3f8c7700778180295) )
+	ROM_LOAD32_WORD("Golden Incas Demo.002.u85", 0x0800000, 0x0400000, CRC(dde914b2) SHA1(f35b761dd89796f62fec40d48c0223f585247de0) )
+	ROM_LOAD32_WORD("Golden Incas Demo.000.u86", 0x0000000, 0x0400000, CRC(c4f488f9) SHA1(0db96a71f361f80f8e7265d1873728fc3013c204) )
 ROM_END
 
 
 ROM_START( goldpym )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("Golden_Pyramids_SE_MAXI_U72.003", 0x0000000, 0x0400000, CRC(be3c43ba) SHA1(23ac49737061690a814e9a54a1f32290621bdaaf) )
-	ROM_LOAD32_WORD("Golden_Pyramids_SE_MAXI_U73.001", 0x0000000, 0x0400000, CRC(f20e603e) SHA1(5577934713be6996057a2fe62c8988635c842b76) )
-	ROM_LOAD32_WORD("Golden_Pyramids_SE_MAXI_U85.002", 0x0000000, 0x0400000, CRC(f2e1763f) SHA1(86d8d96c016bf88c8db9eae3de1bd9c64f517189) )
-	ROM_LOAD32_WORD("Golden_Pyramids_SE_MAXI_U86.000", 0x0000000, 0x0400000, CRC(57b5488a) SHA1(d09915be7dee48570e79436eff55cabad58b783b) )
+	ROM_LOAD32_WORD("Golden_Pyramids_SE_MAXI_003.u72", 0x0800002, 0x0400000, CRC(be3c43ba) SHA1(23ac49737061690a814e9a54a1f32290621bdaaf) )
+	ROM_LOAD32_WORD("Golden_Pyramids_SE_MAXI_001.u73", 0x0000002, 0x0400000, CRC(f20e603e) SHA1(5577934713be6996057a2fe62c8988635c842b76) )
+	ROM_LOAD32_WORD("Golden_Pyramids_SE_MAXI_002.u85", 0x0800000, 0x0400000, CRC(f2e1763f) SHA1(86d8d96c016bf88c8db9eae3de1bd9c64f517189) )
+	ROM_LOAD32_WORD("Golden_Pyramids_SE_MAXI_000.u86", 0x0000000, 0x0400000, CRC(57b5488a) SHA1(d09915be7dee48570e79436eff55cabad58b783b) )
 ROM_END
 
 
 ROM_START( grizzly )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("Grizzly.005", 0x0000000, 0x0400000, CRC(f1bb1351) SHA1(59b5f6ee3a3e05e5d975b22de35d0c7bd87f82d3) )
-	ROM_LOAD32_WORD("Grizzly.000", 0x0000000, 0x0400000, CRC(4d071a11) SHA1(1f1557d6ad403ab13bc505076f26969fd81dd2e7) )
-	ROM_LOAD32_WORD("Grizzly.002", 0x0000000, 0x0400000, CRC(381765db) SHA1(8dc8901455f3c1f8b6302c6a996afe15280cf44b) )
-	ROM_LOAD32_WORD("Grizzly.004", 0x0000000, 0x0400000, CRC(d78ce4b8) SHA1(ab0a10d583b386975b0a53fccd9870b82a3d91a5) )
-	ROM_LOAD32_WORD("Grizzly.001", 0x0000000, 0x0400000, CRC(c45f8405) SHA1(2a5ef6932736e65ac62bbeee54e62689dd912dac) )
-	ROM_LOAD32_WORD("Grizzly.003", 0x0000000, 0x0400000, CRC(135ebde3) SHA1(baa20971ab9617742382088b9e956eeede11879b) )
+	ROM_LOAD32_WORD("Grizzly.005.u71", 0x1000002, 0x0400000, CRC(f1bb1351) SHA1(59b5f6ee3a3e05e5d975b22de35d0c7bd87f82d3) )
+	ROM_LOAD32_WORD("Grizzly.000.u86", 0x0000000, 0x0400000, CRC(4d071a11) SHA1(1f1557d6ad403ab13bc505076f26969fd81dd2e7) )
+	ROM_LOAD32_WORD("Grizzly.002.u85", 0x0800000, 0x0400000, CRC(381765db) SHA1(8dc8901455f3c1f8b6302c6a996afe15280cf44b) )
+	ROM_LOAD32_WORD("Grizzly.004.u84", 0x1000000, 0x0400000, CRC(d78ce4b8) SHA1(ab0a10d583b386975b0a53fccd9870b82a3d91a5) )
+	ROM_LOAD32_WORD("Grizzly.001.u73", 0x0000002, 0x0400000, CRC(c45f8405) SHA1(2a5ef6932736e65ac62bbeee54e62689dd912dac) )
+	ROM_LOAD32_WORD("Grizzly.003.u72", 0x0800002, 0x0400000, CRC(135ebde3) SHA1(baa20971ab9617742382088b9e956eeede11879b) )
 ROM_END
 
 
 ROM_START( heartgar )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("Heart of Gold 72.003", 0x0000000, 0x0400000, CRC(041cf141) SHA1(793a1c1ca44f0d4c83294456f953dc4e7fd3b134) )
-	ROM_LOAD32_WORD("Heart of Gold 73.001", 0x0000000, 0x0400000, CRC(ee851155) SHA1(885928fccf3368911717b7ca5352ecae862c7ebc) )
-	ROM_LOAD32_WORD("Heart of Gold 85.002", 0x0000000, 0x0400000, CRC(af0db2a6) SHA1(aec212c72d8588314cdb2b558f29524b0c142bbc) )
-	ROM_LOAD32_WORD("Heart of Gold 86.000", 0x0000000, 0x0400000, CRC(c2f2111a) SHA1(9c62dcac8fe03afbb7475a0d6e89ff01c6795c6f) )
+	ROM_LOAD32_WORD("Heart of Gold 72.003.u72", 0x0800002, 0x0400000, CRC(041cf141) SHA1(793a1c1ca44f0d4c83294456f953dc4e7fd3b134) )
+	ROM_LOAD32_WORD("Heart of Gold 73.001.u73", 0x0000002, 0x0400000, CRC(ee851155) SHA1(885928fccf3368911717b7ca5352ecae862c7ebc) )
+	ROM_LOAD32_WORD("Heart of Gold 85.002.u85", 0x0800000, 0x0400000, CRC(af0db2a6) SHA1(aec212c72d8588314cdb2b558f29524b0c142bbc) )
+	ROM_LOAD32_WORD("Heart of Gold 86.000.u86", 0x0000000, 0x0400000, CRC(c2f2111a) SHA1(9c62dcac8fe03afbb7475a0d6e89ff01c6795c6f) )
 ROM_END
 
 
 ROM_START( heartveg )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("Heartofvegas.000", 0x0000000, 0x0400000, CRC(0ef4e3cb) SHA1(0cb2c296d7ac39e0e3fe590040c232e35d1508d4) )
-	ROM_LOAD32_WORD("Heartofvegas.001", 0x0000000, 0x0400000, CRC(e33aeb25) SHA1(32c3e914fff060404ebf3fbb7a502c9081b57862) )
+	ROM_LOAD32_WORD("Heartofvegas.000.u86", 0x0000000, 0x0400000, CRC(0ef4e3cb) SHA1(0cb2c296d7ac39e0e3fe590040c232e35d1508d4) )
+	ROM_LOAD32_WORD("Heartofvegas.001.u73", 0x0000002, 0x0400000, CRC(e33aeb25) SHA1(32c3e914fff060404ebf3fbb7a502c9081b57862) )
 ROM_END
 
 
 ROM_START( highnoar )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("High Noon U72.003", 0x0000000, 0x0400000, CRC(fa35cdef) SHA1(060af506fee9234fb4921b788368e3e850b681c9) )
-	ROM_LOAD32_WORD("High Noon U73.001", 0x0000000, 0x0400000, CRC(a7b68492) SHA1(745220b963f9c5755ad078de9ccbca3c922d40ed) )
-	ROM_LOAD32_WORD("High Noon U85.002", 0x0000000, 0x0400000, CRC(cde132fd) SHA1(157e1d7fde6c57e5bc4ace03e43734d30141ad09) )
-	ROM_LOAD32_WORD("High Noon U86.000", 0x0000000, 0x0400000, CRC(c4f106c9) SHA1(38cde08bcdc8e053e8ea0166989a6ef40df139a3) )
+	ROM_LOAD32_WORD("High Noon 003.u72", 0x0800002, 0x0400000, CRC(fa35cdef) SHA1(060af506fee9234fb4921b788368e3e850b681c9) )
+	ROM_LOAD32_WORD("High Noon 001.u73", 0x0000002, 0x0400000, CRC(a7b68492) SHA1(745220b963f9c5755ad078de9ccbca3c922d40ed) )
+	ROM_LOAD32_WORD("High Noon 002.u85", 0x0800000, 0x0400000, CRC(cde132fd) SHA1(157e1d7fde6c57e5bc4ace03e43734d30141ad09) )
+	ROM_LOAD32_WORD("High Noon 000.u86", 0x0000000, 0x0400000, CRC(c4f106c9) SHA1(38cde08bcdc8e053e8ea0166989a6ef40df139a3) )
 ROM_END
 
 
 ROM_START( holdrma )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("Hollywood Dreams U72.003", 0x0000000, 0x0400000, CRC(197035d3) SHA1(18da7e44107e8e0df584bd866a0083cf85ecceee) )
-	ROM_LOAD32_WORD("Hollywood Dreams U73.001", 0x0000000, 0x0400000, CRC(04fec2d4) SHA1(56beb6107c56674dc914f0c988311375dd281081) )
-	ROM_LOAD32_WORD("Hollywood Dreams U85.002", 0x0000000, 0x0400000, CRC(daae9640) SHA1(3d8aa7b4d55d1c3d8196be26bb89b83785666df1) )
-	ROM_LOAD32_WORD("Hollywood Dreams U86.000", 0x0000000, 0x0400000, CRC(9da0445f) SHA1(65e8d5f2563a5aa90dcba8b854912fe835294cb3) )
+	ROM_LOAD32_WORD("Hollywood Dreams 003.u72", 0x0800002, 0x0400000, CRC(197035d3) SHA1(18da7e44107e8e0df584bd866a0083cf85ecceee) )
+	ROM_LOAD32_WORD("Hollywood Dreams 001.u73", 0x0000002, 0x0400000, CRC(04fec2d4) SHA1(56beb6107c56674dc914f0c988311375dd281081) )
+	ROM_LOAD32_WORD("Hollywood Dreams 002.u85", 0x0800000, 0x0400000, CRC(daae9640) SHA1(3d8aa7b4d55d1c3d8196be26bb89b83785666df1) )
+	ROM_LOAD32_WORD("Hollywood Dreams 000.u86", 0x0000000, 0x0400000, CRC(9da0445f) SHA1(65e8d5f2563a5aa90dcba8b854912fe835294cb3) )
 ROM_END
 
 
 ROM_START( houhear )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("House_of_Hearts_.001", 0x0000000, 0x0400000, CRC(ad7c55fc) SHA1(873abc95c8118b5ca73779445023e8e0299498a6) )
-	ROM_LOAD32_WORD("House_of_Hearts.000", 0x0000000, 0x0400000, CRC(6cdc5816) SHA1(7157a12baa98ba810f5dcc5d5816a3380748032b) )
+	ROM_LOAD32_WORD("House_of_Hearts.001.u73", 0x0000002, 0x0400000, CRC(ad7c55fc) SHA1(873abc95c8118b5ca73779445023e8e0299498a6) )
+	ROM_LOAD32_WORD("House_of_Hearts.000.u86", 0x0000000, 0x0400000, CRC(6cdc5816) SHA1(7157a12baa98ba810f5dcc5d5816a3380748032b) )
 ROM_END
 
 
 ROM_START( incachf )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("Inca_Chief_U72.003", 0x0000000, 0x0400000, CRC(95d1dfd2) SHA1(1faead5e4429e4e8a6fd53c5b16bd3fac9483c28) )
-	ROM_LOAD32_WORD("Inca_Chief_U73.001", 0x0000000, 0x0400000, CRC(45208b71) SHA1(e3ce2e9f5bd467872380ad387e77447831a0e67e) )
-	ROM_LOAD32_WORD("Inca_Chief_U85.002", 0x0000000, 0x0400000, CRC(46816847) SHA1(aa65826fe1282b15fbdd8abe81e03f0d11d4f18f) )
-	ROM_LOAD32_WORD("Inca_Chief_U86.000", 0x0000000, 0x0400000, CRC(f9fa7d96) SHA1(a247c2694c0f0f78cbc431dca4d9385ab991ae80) )
+	ROM_LOAD32_WORD("Inca_Chief_003.u72", 0x0800002, 0x0400000, CRC(95d1dfd2) SHA1(1faead5e4429e4e8a6fd53c5b16bd3fac9483c28) )
+	ROM_LOAD32_WORD("Inca_Chief_001.u73", 0x0000002, 0x0400000, CRC(45208b71) SHA1(e3ce2e9f5bd467872380ad387e77447831a0e67e) )
+	ROM_LOAD32_WORD("Inca_Chief_002.u85", 0x0800000, 0x0400000, CRC(46816847) SHA1(aa65826fe1282b15fbdd8abe81e03f0d11d4f18f) )
+	ROM_LOAD32_WORD("Inca_Chief_000.u86", 0x0000000, 0x0400000, CRC(f9fa7d96) SHA1(a247c2694c0f0f78cbc431dca4d9385ab991ae80) )
 ROM_END
 
 
 ROM_START( indce )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("U72.003", 0x0000000, 0x0400000, CRC(4269940b) SHA1(8f5f6d751360e0abe2a6a80551f56176c46249e5) )
-	ROM_LOAD32_WORD("U73.001", 0x0000000, 0x0400000, CRC(a0a99966) SHA1(6fc4e3496e7791e818cbda6d95355467ceb28e6c) )
-	ROM_LOAD32_WORD("U85.002", 0x0000000, 0x0400000, CRC(b8b51dea) SHA1(04e6a261ab4912c7204b4a276147e1e219e02067) )
-	ROM_LOAD32_WORD("U86.000", 0x0000000, 0x0400000, CRC(18ae6a0a) SHA1(0401b86c7053129eb7fbd27c3e5988481df67481) )
+	ROM_LOAD32_WORD("003.u72", 0x0800002, 0x0400000, CRC(4269940b) SHA1(8f5f6d751360e0abe2a6a80551f56176c46249e5) )
+	ROM_LOAD32_WORD("001.u73", 0x0000002, 0x0400000, CRC(a0a99966) SHA1(6fc4e3496e7791e818cbda6d95355467ceb28e6c) )
+	ROM_LOAD32_WORD("002.u85", 0x0800000, 0x0400000, CRC(b8b51dea) SHA1(04e6a261ab4912c7204b4a276147e1e219e02067) )
+	ROM_LOAD32_WORD("000.u86", 0x0000000, 0x0400000, CRC(18ae6a0a) SHA1(0401b86c7053129eb7fbd27c3e5988481df67481) )
 ROM_END
 
 ROM_START( indll )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("Indian Dreaming L L U71.005", 0x0000000, 0x0400000, CRC(81aecf10) SHA1(ca9236003e12dbe897dd942696dbac5cf059e8f1) )
-	ROM_LOAD32_WORD("Indian Dreaming L L U72.003", 0x0000000, 0x0400000, CRC(ebf17295) SHA1(f057ee03fc51041a4aa4413f3cb7df7483b4dd49) )
-	ROM_LOAD32_WORD("Indian Dreaming L L U73.001", 0x0000000, 0x0400000, CRC(ae6590eb) SHA1(d26d4c1612a466a4d67ca51cf6df2c38da88cd0c) )
-	ROM_LOAD32_WORD("Indian Dreaming L L U84.004", 0x0000000, 0x0400000, CRC(14ca706b) SHA1(552b8c864f8b68c48688e70e55424ceb34de4757) )
-	ROM_LOAD32_WORD("Indian Dreaming L L U85.002", 0x0000000, 0x0400000, CRC(d5b64886) SHA1(07b2e2c35e1a71d5c6b5687452f3debee1128632) )
-	ROM_LOAD32_WORD("Indian Dreaming L L U86.000", 0x0000000, 0x0400000, CRC(81144634) SHA1(3352bc272da29706d3913e65e0eccfd597628239) )
+	ROM_LOAD32_WORD("Indian Dreaming L L 005.u71", 0x1000002, 0x0400000, CRC(81aecf10) SHA1(ca9236003e12dbe897dd942696dbac5cf059e8f1) )
+	ROM_LOAD32_WORD("Indian Dreaming L L 003.u72", 0x0800002, 0x0400000, CRC(ebf17295) SHA1(f057ee03fc51041a4aa4413f3cb7df7483b4dd49) )
+	ROM_LOAD32_WORD("Indian Dreaming L L 001.u73", 0x0000002, 0x0400000, CRC(ae6590eb) SHA1(d26d4c1612a466a4d67ca51cf6df2c38da88cd0c) )
+	ROM_LOAD32_WORD("Indian Dreaming L L 004.u84", 0x1000000, 0x0400000, CRC(14ca706b) SHA1(552b8c864f8b68c48688e70e55424ceb34de4757) )
+	ROM_LOAD32_WORD("Indian Dreaming L L 002.u85", 0x0800000, 0x0400000, CRC(d5b64886) SHA1(07b2e2c35e1a71d5c6b5687452f3debee1128632) )
+	ROM_LOAD32_WORD("Indian Dreaming L L 000.u86", 0x0000000, 0x0400000, CRC(81144634) SHA1(3352bc272da29706d3913e65e0eccfd597628239) )
 ROM_END
 
 
 ROM_START( indsc )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("U72.003", 0x0000000, 0x0400000, CRC(7181dc26) SHA1(63b6ae4c3e7464d75762224a8c30348c6c6f0e98) )
-	ROM_LOAD32_WORD("U73.001", 0x0000000, 0x0400000, CRC(a23e7fcd) SHA1(d47751a88c7609118d0acbeabbcb812d195e3d48) )
-	ROM_LOAD32_WORD("U85.002", 0x0000000, 0x0400000, CRC(d49a6d8b) SHA1(55ebb5b098565cea8305ad9998eaee9a2b84cdbd) )
-	ROM_LOAD32_WORD("U86.000", 0x0000000, 0x0400000, CRC(23a13807) SHA1(5e0a403c3d227ef8ba49e2bd5f0a4f77acd42518) )
+	ROM_LOAD32_WORD("003.u72", 0x0800002, 0x0400000, CRC(7181dc26) SHA1(63b6ae4c3e7464d75762224a8c30348c6c6f0e98) )
+	ROM_LOAD32_WORD("001.u73", 0x0000002, 0x0400000, CRC(a23e7fcd) SHA1(d47751a88c7609118d0acbeabbcb812d195e3d48) )
+	ROM_LOAD32_WORD("002.u85", 0x0800000, 0x0400000, CRC(d49a6d8b) SHA1(55ebb5b098565cea8305ad9998eaee9a2b84cdbd) )
+	ROM_LOAD32_WORD("000.u86", 0x0000000, 0x0400000, CRC(23a13807) SHA1(5e0a403c3d227ef8ba49e2bd5f0a4f77acd42518) )
 ROM_END
 
 ROM_START( indsrp )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("Indian Dreaming SRP U72.003", 0x0000000, 0x0400000, CRC(46244616) SHA1(3e16e7dd6f5afba135c3f1b9b40b7cfecc0d83e4) )
-	ROM_LOAD32_WORD("Indian Dreaming SRP U73.001", 0x0000000, 0x0400000, CRC(4193c9f8) SHA1(de9747896f299f8562a8e836e28fcce991154194) )
-	ROM_LOAD32_WORD("Indian Dreaming SRP U85.002", 0x0000000, 0x0400000, CRC(5b639f5c) SHA1(b3a2f5797071ae57b0bc541f23d6e62df173e4cd) )
-	ROM_LOAD32_WORD("Indian Dreaming SRP U86.000", 0x0000000, 0x0400000, CRC(82645450) SHA1(17edb9f2b61f38ca6ced060d37d4294b42b934ac) )
+	ROM_LOAD32_WORD("Indian Dreaming SRP 003.u72", 0x0800002, 0x0400000, CRC(46244616) SHA1(3e16e7dd6f5afba135c3f1b9b40b7cfecc0d83e4) )
+	ROM_LOAD32_WORD("Indian Dreaming SRP 001.u73", 0x0000002, 0x0400000, CRC(4193c9f8) SHA1(de9747896f299f8562a8e836e28fcce991154194) )
+	ROM_LOAD32_WORD("Indian Dreaming SRP 002.u85", 0x0800000, 0x0400000, CRC(5b639f5c) SHA1(b3a2f5797071ae57b0bc541f23d6e62df173e4cd) )
+	ROM_LOAD32_WORD("Indian Dreaming SRP 000.u86", 0x0000000, 0x0400000, CRC(82645450) SHA1(17edb9f2b61f38ca6ced060d37d4294b42b934ac) )
 ROM_END
 
 
 ROM_START( indgcm )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("indian_gold_U72.003", 0x0000000, 0x0400000, CRC(e814271e) SHA1(9aaf9a463fd08a9cdb48dcb60cb0242f3df1b759) )
-	ROM_LOAD32_WORD("indian_gold_U73.001", 0x0000000, 0x0400000, CRC(318a4b3e) SHA1(ba16fb0a82539f01b5b8902f510b0acdfe0fdf6d) )
-	ROM_LOAD32_WORD("indian_gold_U85.002", 0x0000000, 0x0400000, CRC(6b888235) SHA1(6bea4e0c547d04a25202969d6216beacd8e63b23) )
-	ROM_LOAD32_WORD("indian_gold_U86.000", 0x0000000, 0x0400000, CRC(9340f843) SHA1(e3cf3ea427535aab8027f7d2f6c6e496674d694f) )
+	ROM_LOAD32_WORD("indian_gold_003.u72", 0x0800002, 0x0400000, CRC(e814271e) SHA1(9aaf9a463fd08a9cdb48dcb60cb0242f3df1b759) )
+	ROM_LOAD32_WORD("indian_gold_001.u73", 0x0000002, 0x0400000, CRC(318a4b3e) SHA1(ba16fb0a82539f01b5b8902f510b0acdfe0fdf6d) )
+	ROM_LOAD32_WORD("indian_gold_002.u85", 0x0800000, 0x0400000, CRC(6b888235) SHA1(6bea4e0c547d04a25202969d6216beacd8e63b23) )
+	ROM_LOAD32_WORD("indian_gold_000.u86", 0x0000000, 0x0400000, CRC(9340f843) SHA1(e3cf3ea427535aab8027f7d2f6c6e496674d694f) )
 ROM_END
 
 
 ROM_START( indprncs )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("Gam_Eprm.u72", 0x0000000, 0x0400000, CRC(785493ea) SHA1(e56ee84783a6033ea327a2035df58cb8deca150f) )
-	ROM_LOAD32_WORD("Gam_Eprm.u73", 0x0000000, 0x0400000, CRC(c128c9a5) SHA1(bed6f0eba6da62a3981e5c9b6ada5209d37613e5) )
-	ROM_LOAD32_WORD("Gam_Eprm.u85", 0x0000000, 0x0400000, CRC(829f492e) SHA1(36abc1b1beb01814a4e5fc68f1cd424ae979ced7) )
+	ROM_LOAD32_WORD("Gam_Eprm.u72", 0x0800002, 0x0400000, CRC(785493ea) SHA1(e56ee84783a6033ea327a2035df58cb8deca150f) )
+	ROM_LOAD32_WORD("Gam_Eprm.u73", 0x0000002, 0x0400000, CRC(c128c9a5) SHA1(bed6f0eba6da62a3981e5c9b6ada5209d37613e5) )
+	ROM_LOAD32_WORD("Gam_Eprm.u85", 0x0800000, 0x0400000, CRC(829f492e) SHA1(36abc1b1beb01814a4e5fc68f1cd424ae979ced7) )
 	ROM_LOAD32_WORD("Gam_Eprm.u86", 0x0000000, 0x0400000, CRC(dfad47ba) SHA1(807c0e0e4b0cccb8e4d2d34f26be26973745ca1b) )
 ROM_END
 
@@ -980,20 +978,20 @@ ROM_END
 ROM_START( jailbrar )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("10125611_JAILBREAK_716..003", 0x0000000, 0x0400000, CRC(5185ad7f) SHA1(34517ded04bf51be348200bc09e848ab74ccbeef) )
-	ROM_LOAD32_WORD("10125611_JAILBREAK_716.001", 0x0000000, 0x0400000, CRC(5142c5e0) SHA1(dde1f300292b0b8250aeab1d686fb36184daabd7) )
-	ROM_LOAD32_WORD("10125611_JAILBREAK_716.000", 0x0000000, 0x0400000, CRC(3c6d628c) SHA1(d60ad4b04545ccaf6212a47796d16d97173d530b) )
-	ROM_LOAD32_WORD("10125611_JAILBREAK_716.002", 0x0000000, 0x0400000, CRC(705ddca8) SHA1(e0f8ca2e323f1dd040ed0cd4f974e419e716a0c6) )
+	ROM_LOAD32_WORD("10125611_JAILBREAK_716.003.u72", 0x0800002, 0x0400000, CRC(5185ad7f) SHA1(34517ded04bf51be348200bc09e848ab74ccbeef) )
+	ROM_LOAD32_WORD("10125611_JAILBREAK_716.001.u73", 0x0000002, 0x0400000, CRC(5142c5e0) SHA1(dde1f300292b0b8250aeab1d686fb36184daabd7) )
+	ROM_LOAD32_WORD("10125611_JAILBREAK_716.000.u86", 0x0000000, 0x0400000, CRC(3c6d628c) SHA1(d60ad4b04545ccaf6212a47796d16d97173d530b) )
+	ROM_LOAD32_WORD("10125611_JAILBREAK_716.002.u85", 0x0800000, 0x0400000, CRC(705ddca8) SHA1(e0f8ca2e323f1dd040ed0cd4f974e419e716a0c6) )
 ROM_END
 
 
 ROM_START( kingnep )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("King Neptune .003", 0x0000000, 0x0400000, CRC(4e3006a2) SHA1(6d566d2120cb612f647223e61347a1784cb69a95) )
-	ROM_LOAD32_WORD("King Neptune .001", 0x0000000, 0x0400000, CRC(1e815d36) SHA1(b29f5e812f52317b060feac8ee91c08a545db7f4) )
-	ROM_LOAD32_WORD("King Neptune.002", 0x0000000, 0x0400000, CRC(df89ae50) SHA1(fa9a5c795266bcafea0062aae34a2b7432550b53) )
-	ROM_LOAD32_WORD("King Neptune .000", 0x0000000, 0x0400000, CRC(750597c6) SHA1(06d3ba55b313da8973fd2b34ba888920519c51c6) )
+	ROM_LOAD32_WORD("King Neptune.003.u72", 0x0800002, 0x0400000, CRC(4e3006a2) SHA1(6d566d2120cb612f647223e61347a1784cb69a95) )
+	ROM_LOAD32_WORD("King Neptune.001.u73", 0x0000002, 0x0400000, CRC(1e815d36) SHA1(b29f5e812f52317b060feac8ee91c08a545db7f4) )
+	ROM_LOAD32_WORD("King Neptune.002.u85", 0x0800000, 0x0400000, CRC(df89ae50) SHA1(fa9a5c795266bcafea0062aae34a2b7432550b53) )
+	ROM_LOAD32_WORD("King Neptune.000.u86", 0x0000000, 0x0400000, CRC(750597c6) SHA1(06d3ba55b313da8973fd2b34ba888920519c51c6) )
 ROM_END
 
 
@@ -1001,9 +999,9 @@ ROM_END
 ROM_START( kingnile )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("Gam_Eprm.u72", 0x0000000, 0x0400000, CRC(2600d9da) SHA1(2c78b987b8a8641b7eedda4880bd3f5846f11224) )
-	ROM_LOAD32_WORD("Gam_Eprm.u73", 0x0000000, 0x0400000, CRC(2875a911) SHA1(3e881c8c736f297778836c128f66150628038e49) )
-	ROM_LOAD32_WORD("Gam_Eprm.u85", 0x0000000, 0x0400000, CRC(a981510c) SHA1(5c018eb101193b1f4864ccd8c30fe328713c4c97) )
+	ROM_LOAD32_WORD("Gam_Eprm.u72", 0x0800002, 0x0400000, CRC(2600d9da) SHA1(2c78b987b8a8641b7eedda4880bd3f5846f11224) )
+	ROM_LOAD32_WORD("Gam_Eprm.u73", 0x0000002, 0x0400000, CRC(2875a911) SHA1(3e881c8c736f297778836c128f66150628038e49) )
+	ROM_LOAD32_WORD("Gam_Eprm.u85", 0x0800000, 0x0400000, CRC(a981510c) SHA1(5c018eb101193b1f4864ccd8c30fe328713c4c97) )
 	ROM_LOAD32_WORD("Gam_Eprm.u86", 0x0000000, 0x0400000, CRC(c4b7a58e) SHA1(f0877c9e0a285808c8117d09a33dec2d2caf7b5b) )
 ROM_END
 
@@ -1012,60 +1010,60 @@ ROM_END
 ROM_START( koalmnt )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("KoalaMint_U72.003", 0x0000000, 0x0400000, CRC(84c0f78d) SHA1(3f8e98261bfce1223de538d6bd53fa92d38c4b0d) )
-	ROM_LOAD32_WORD("KoalaMint_U73.001", 0x0000000, 0x0400000, CRC(df3d45a0) SHA1(e9cbfeba1271a66c574cfb3bd96e21fd8cdd26f2) )
-	ROM_LOAD32_WORD("KoalaMint_U85.002", 0x0000000, 0x0400000, CRC(1e12c01e) SHA1(21cad879ece470c465907dd970741b13774fb524) )
-	ROM_LOAD32_WORD("KoalaMint_U86.000", 0x0000000, 0x0400000, CRC(e405c4b8) SHA1(e838767f0c224a3c96f9dd480559fed01ca7a398) )
+	ROM_LOAD32_WORD("KoalaMint_003.u72", 0x0800002, 0x0400000, CRC(84c0f78d) SHA1(3f8e98261bfce1223de538d6bd53fa92d38c4b0d) )
+	ROM_LOAD32_WORD("KoalaMint_001.u73", 0x0000002, 0x0400000, CRC(df3d45a0) SHA1(e9cbfeba1271a66c574cfb3bd96e21fd8cdd26f2) )
+	ROM_LOAD32_WORD("KoalaMint_002.u85", 0x0800000, 0x0400000, CRC(1e12c01e) SHA1(21cad879ece470c465907dd970741b13774fb524) )
+	ROM_LOAD32_WORD("KoalaMint_000.u86", 0x0000000, 0x0400000, CRC(e405c4b8) SHA1(e838767f0c224a3c96f9dd480559fed01ca7a398) )
 ROM_END
 
 
 ROM_START( kohinoor )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("Kohinoor U72.003", 0x0000000, 0x0400000, CRC(9b6f5a83) SHA1(06707953091719bf545efd2200f81504c5416e74) )
-	ROM_LOAD32_WORD("Kohinoor U73.001", 0x0000000, 0x0400000, CRC(dfdeb535) SHA1(be6b2e84603a5b07e4561012ff9b1d45fbd4f281) )
-	ROM_LOAD32_WORD("Kohinoor U85.002", 0x0000000, 0x0400000, CRC(cd8324e6) SHA1(b779d1040cd0119b778032d0e165d31d8fafd128) )
-	ROM_LOAD32_WORD("Kohinoor U86.000", 0x0000000, 0x0400000, CRC(e76e81f3) SHA1(1606c08ab6e75ad0cbbdd3f297dbb4fdf855c013) )
+	ROM_LOAD32_WORD("Kohinoor 003.u72", 0x0800002, 0x0400000, CRC(9b6f5a83) SHA1(06707953091719bf545efd2200f81504c5416e74) )
+	ROM_LOAD32_WORD("Kohinoor 001.u73", 0x0000002, 0x0400000, CRC(dfdeb535) SHA1(be6b2e84603a5b07e4561012ff9b1d45fbd4f281) )
+	ROM_LOAD32_WORD("Kohinoor 002.u85", 0x0800000, 0x0400000, CRC(cd8324e6) SHA1(b779d1040cd0119b778032d0e165d31d8fafd128) )
+	ROM_LOAD32_WORD("Kohinoor 000.u86", 0x0000000, 0x0400000, CRC(e76e81f3) SHA1(1606c08ab6e75ad0cbbdd3f297dbb4fdf855c013) )
 ROM_END
 
 
 ROM_START( lgfish )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("Let's Go Fish'n U71.005", 0x0000000, 0x0400000, CRC(75d5bf1c) SHA1(6249b3ed929a65efed770615f2fe691612e8ac72) )
-	ROM_LOAD32_WORD("Let's Go Fish'n U72.003", 0x0000000, 0x0400000, CRC(9ff206fe) SHA1(4c8023a3b2e4d658a859d19d54be8cfe53cf4a6f) )
-	ROM_LOAD32_WORD("Let's Go Fish'n U73.001", 0x0000000, 0x0400000, CRC(7cfed17e) SHA1(fc93e71d67228b3b1f3a34a3f3c34c2648100d2b) )
-	ROM_LOAD32_WORD("Let's Go Fish'n U84.004", 0x0000000, 0x0400000, CRC(471f61c6) SHA1(67828d3cf06e32b087fb7c4ade212580207dc2cf) )
-	ROM_LOAD32_WORD("Let's Go Fish'n U85.002", 0x0000000, 0x0400000, CRC(c386320a) SHA1(c02b4b1cdd45b9b579b21d239cf45f7f3510c14a) )
-	ROM_LOAD32_WORD("Let's Go Fish'n U86.000", 0x0000000, 0x0400000, CRC(4c491910) SHA1(1f9013621a4c9140c447637bc967ba583da318eb) )
+	ROM_LOAD32_WORD("Let's Go Fish'n 005.u71", 0x1000002, 0x0400000, CRC(75d5bf1c) SHA1(6249b3ed929a65efed770615f2fe691612e8ac72) )
+	ROM_LOAD32_WORD("Let's Go Fish'n 003.u72", 0x0800002, 0x0400000, CRC(9ff206fe) SHA1(4c8023a3b2e4d658a859d19d54be8cfe53cf4a6f) )
+	ROM_LOAD32_WORD("Let's Go Fish'n 001.u73", 0x0000002, 0x0400000, CRC(7cfed17e) SHA1(fc93e71d67228b3b1f3a34a3f3c34c2648100d2b) )
+	ROM_LOAD32_WORD("Let's Go Fish'n 004.u84", 0x1000000, 0x0400000, CRC(471f61c6) SHA1(67828d3cf06e32b087fb7c4ade212580207dc2cf) )
+	ROM_LOAD32_WORD("Let's Go Fish'n 002.u85", 0x0800000, 0x0400000, CRC(c386320a) SHA1(c02b4b1cdd45b9b579b21d239cf45f7f3510c14a) )
+	ROM_LOAD32_WORD("Let's Go Fish'n 000.u86", 0x0000000, 0x0400000, CRC(4c491910) SHA1(1f9013621a4c9140c447637bc967ba583da318eb) )
 ROM_END
 
 ROM_START( lordleo )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("Lord_Leopard_U72.003", 0x0000000, 0x0400000, CRC(20e3d468) SHA1(155aa4a81f18d714c6dbbe26c5c9e9d6575b858d) )
-	ROM_LOAD32_WORD("Lord_Leopard_U73.001", 0x0000000, 0x0400000, CRC(7666c5f8) SHA1(cd271bc8c1042fa85506691636d22d36df23025b) )
-	ROM_LOAD32_WORD("Lord_Leopard_U85.002", 0x0000000, 0x0400000, CRC(1a921c0e) SHA1(feb59ec8372723e5babe16145596c3a9fd0938c3) )
-	ROM_LOAD32_WORD("Lord_Leopard_U86.000", 0x0000000, 0x0400000, CRC(9ac28584) SHA1(cff40762e123d3ace2fb274166eb9d98ef7c7d4c) )
+	ROM_LOAD32_WORD("Lord_Leopard_003.u72", 0x0800002, 0x0400000, CRC(20e3d468) SHA1(155aa4a81f18d714c6dbbe26c5c9e9d6575b858d) )
+	ROM_LOAD32_WORD("Lord_Leopard_001.u73", 0x0000002, 0x0400000, CRC(7666c5f8) SHA1(cd271bc8c1042fa85506691636d22d36df23025b) )
+	ROM_LOAD32_WORD("Lord_Leopard_002.u85", 0x0800000, 0x0400000, CRC(1a921c0e) SHA1(feb59ec8372723e5babe16145596c3a9fd0938c3) )
+	ROM_LOAD32_WORD("Lord_Leopard_000.u86", 0x0000000, 0x0400000, CRC(9ac28584) SHA1(cff40762e123d3ace2fb274166eb9d98ef7c7d4c) )
 ROM_END
 
 ROM_START( lougcm )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("louiesgold_u72.003", 0x0000000, 0x0400000, CRC(926aefe5) SHA1(1427cae296864e6dd186614d726e243b46a9aa64) )
-	ROM_LOAD32_WORD("louiesgold_u73.001", 0x0000000, 0x0400000, CRC(3165ca89) SHA1(73d5d32f1b144e25901afa2eeb82e2304f069a55) )
-	ROM_LOAD32_WORD("louiesgold_u85.002", 0x0000000, 0x0400000, CRC(21d6d1e4) SHA1(d095389ff327940abde30afe8cb2e9f1c1e34226) )
-	ROM_LOAD32_WORD("louiesgold_u86.000", 0x0000000, 0x0400000, CRC(095161ec) SHA1(4b9ff183d244f70f59eefb2eb6b261e3bcf0c486) )
+	ROM_LOAD32_WORD("louiesgold_003.u72", 0x0800002, 0x0400000, CRC(926aefe5) SHA1(1427cae296864e6dd186614d726e243b46a9aa64) )
+	ROM_LOAD32_WORD("louiesgold_001.u73", 0x0000002, 0x0400000, CRC(3165ca89) SHA1(73d5d32f1b144e25901afa2eeb82e2304f069a55) )
+	ROM_LOAD32_WORD("louiesgold_002.u85", 0x0800000, 0x0400000, CRC(21d6d1e4) SHA1(d095389ff327940abde30afe8cb2e9f1c1e34226) )
+	ROM_LOAD32_WORD("louiesgold_000.u86", 0x0000000, 0x0400000, CRC(095161ec) SHA1(4b9ff183d244f70f59eefb2eb6b261e3bcf0c486) )
 ROM_END
 
 ROM_START( luigball )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("Gam_Eprm.u71", 0x0000000, 0x0400000, CRC(4f289aea) SHA1(0c77020a30178644a02dac5c9e8ab5543b63409e) )
-	ROM_LOAD32_WORD("Gam_Eprm.u72", 0x0000000, 0x0400000, CRC(5f3a62b0) SHA1(c4adec9f13473246333ece978ea35d35a1527638) )
-	ROM_LOAD32_WORD("Gam_Eprm.u73", 0x0000000, 0x0400000, CRC(d82cca04) SHA1(ecd126404ab147cba3fedb127772b4c9ccb849bd) )
-	ROM_LOAD32_WORD("Gam_Eprm.u84", 0x0000000, 0x0400000, CRC(c8c80acf) SHA1(958310f0c31642960f90476a9d384fcbefeada75) )
-	ROM_LOAD32_WORD("Gam_Eprm.u85", 0x0000000, 0x0400000, CRC(9513eded) SHA1(296974e1c4d6c61ce90c6fafc3986aa48a4344ac) )
+	ROM_LOAD32_WORD("Gam_Eprm.u71", 0x1000002, 0x0400000, CRC(4f289aea) SHA1(0c77020a30178644a02dac5c9e8ab5543b63409e) )
+	ROM_LOAD32_WORD("Gam_Eprm.u72", 0x0800002, 0x0400000, CRC(5f3a62b0) SHA1(c4adec9f13473246333ece978ea35d35a1527638) )
+	ROM_LOAD32_WORD("Gam_Eprm.u73", 0x0000002, 0x0400000, CRC(d82cca04) SHA1(ecd126404ab147cba3fedb127772b4c9ccb849bd) )
+	ROM_LOAD32_WORD("Gam_Eprm.u84", 0x1000000, 0x0400000, CRC(c8c80acf) SHA1(958310f0c31642960f90476a9d384fcbefeada75) )
+	ROM_LOAD32_WORD("Gam_Eprm.u85", 0x0800000, 0x0400000, CRC(9513eded) SHA1(296974e1c4d6c61ce90c6fafc3986aa48a4344ac) )
 	ROM_LOAD32_WORD("Gam_Eprm.u86", 0x0000000, 0x0400000, CRC(b44aeadc) SHA1(abee3ea6886973877002c3283bb52c624abd148c) )
 ROM_END
 
@@ -1074,30 +1072,30 @@ ROM_END
 ROM_START( mskitty )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("misskitty_.001", 0x0000000, 0x0400000, CRC(40c1bb34) SHA1(0c54ad0fb6a5c4f096be15c1ef08cb4d246b13b6) )
-	ROM_LOAD32_WORD("misskitty_.002", 0x0000000, 0x0400000, CRC(c369ad11) SHA1(793b1f8d5833b06422196e2abb7eb0a34be8dbef) )
-	ROM_LOAD32_WORD("misskitty_.003", 0x0000000, 0x0400000, CRC(d85219a1) SHA1(db0c5f21f7af393d11465981e70ac7b1c8f197b3) )
-	ROM_LOAD32_WORD("misskitty_.000", 0x0000000, 0x0400000, CRC(36c9ef95) SHA1(71c088bd3b258ab0e8949f661f9e9e9f64949f29) )
+	ROM_LOAD32_WORD("misskitty_.001.u73", 0x0000002, 0x0400000, CRC(40c1bb34) SHA1(0c54ad0fb6a5c4f096be15c1ef08cb4d246b13b6) )
+	ROM_LOAD32_WORD("misskitty_.002.u85", 0x0800000, 0x0400000, CRC(c369ad11) SHA1(793b1f8d5833b06422196e2abb7eb0a34be8dbef) )
+	ROM_LOAD32_WORD("misskitty_.003.u72", 0x0800002, 0x0400000, CRC(d85219a1) SHA1(db0c5f21f7af393d11465981e70ac7b1c8f197b3) )
+	ROM_LOAD32_WORD("misskitty_.000.u86", 0x0000000, 0x0400000, CRC(36c9ef95) SHA1(71c088bd3b258ab0e8949f661f9e9e9f64949f29) )
 ROM_END
 
 
 ROM_START( mnytree )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("Money Tree.003", 0x0000000, 0x0400000, CRC(9ecf041c) SHA1(543eb20385bfd79c1cf10cba61c501c495e4d94a) )
-	ROM_LOAD32_WORD("Money Tree.000", 0x0000000, 0x0400000, CRC(bca13ff6) SHA1(84c3491816aa9a2e9a12c321b0d1144ea14ebdbe) )
-	ROM_LOAD32_WORD("Money Tree.001", 0x0000000, 0x0400000, CRC(2c9edccc) SHA1(05e7de1fbd13c1a62f7fb610dc3541a94d9a39b7) )
-	ROM_LOAD32_WORD("Money Tree.002", 0x0000000, 0x0400000, CRC(ea055c36) SHA1(e97c4992150fac9e53618ebf96ac1b2dd4e9cf65) )
+	ROM_LOAD32_WORD("Money Tree.003.u72", 0x0800002, 0x0400000, CRC(9ecf041c) SHA1(543eb20385bfd79c1cf10cba61c501c495e4d94a) )
+	ROM_LOAD32_WORD("Money Tree.000.u86", 0x0000000, 0x0400000, CRC(bca13ff6) SHA1(84c3491816aa9a2e9a12c321b0d1144ea14ebdbe) )
+	ROM_LOAD32_WORD("Money Tree.001.u73", 0x0000002, 0x0400000, CRC(2c9edccc) SHA1(05e7de1fbd13c1a62f7fb610dc3541a94d9a39b7) )
+	ROM_LOAD32_WORD("Money Tree.002.u85", 0x0800000, 0x0400000, CRC(ea055c36) SHA1(e97c4992150fac9e53618ebf96ac1b2dd4e9cf65) )
 ROM_END
 
 
 ROM_START( mysteycm )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("U72.003", 0x0000000, 0x0400000, CRC(ee58e1e8) SHA1(1aa57c88b97a3bed04bcaabe77f231967d092f4c) )
-	ROM_LOAD32_WORD("U73.001", 0x0000000, 0x0400000, CRC(fd1d56df) SHA1(2f22f83995bdea66a055a1aa3cb0e8dd2c8f87cb) )
-	ROM_LOAD32_WORD("U85.002", 0x0000000, 0x0400000, CRC(3449d07c) SHA1(2b36edc554f157e465bcaada42d6cbfee545e146) )
-	ROM_LOAD32_WORD("U86.000", 0x0000000, 0x0400000, CRC(3de4876b) SHA1(76eb7bdc41dc134656452f8e0d08f009c02d9205) )
+	ROM_LOAD32_WORD("003.u72", 0x0800002, 0x0400000, CRC(ee58e1e8) SHA1(1aa57c88b97a3bed04bcaabe77f231967d092f4c) )
+	ROM_LOAD32_WORD("001.u73", 0x0000002, 0x0400000, CRC(fd1d56df) SHA1(2f22f83995bdea66a055a1aa3cb0e8dd2c8f87cb) )
+	ROM_LOAD32_WORD("002.u85", 0x0800000, 0x0400000, CRC(3449d07c) SHA1(2b36edc554f157e465bcaada42d6cbfee545e146) )
+	ROM_LOAD32_WORD("000.u86", 0x0000000, 0x0400000, CRC(3de4876b) SHA1(76eb7bdc41dc134656452f8e0d08f009c02d9205) )
 ROM_END
 
 
@@ -1105,179 +1103,179 @@ ROM_END
 ROM_START( mystmerm )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("game.003", 0x0000000, 0x0400000, CRC(a060d4b2) SHA1(5832a7f4b808017cc251a58e9cce004b2ec41e0c) )
-	ROM_LOAD32_WORD("game.001", 0x0000000, 0x0400000, CRC(d571a0bc) SHA1(3bb3c9373fcd7c730dfd0de749d7dacb8aadaf53) )
-	ROM_LOAD32_WORD("game.002", 0x0000000, 0x0400000, CRC(803023c2) SHA1(c953b3fa12347a18fa48b5ea691ad61720c2efdd) )
-	ROM_LOAD32_WORD("game.000", 0x0000000, 0x0400000, CRC(be84df3c) SHA1(b39deff7d8d0ab30e3dbc0f33c4d45329734a05a) )
+	ROM_LOAD32_WORD("game.003.u72", 0x0800002, 0x0400000, CRC(a060d4b2) SHA1(5832a7f4b808017cc251a58e9cce004b2ec41e0c) )
+	ROM_LOAD32_WORD("game.001.u73", 0x0000002, 0x0400000, CRC(d571a0bc) SHA1(3bb3c9373fcd7c730dfd0de749d7dacb8aadaf53) )
+	ROM_LOAD32_WORD("game.002.u85", 0x0800000, 0x0400000, CRC(803023c2) SHA1(c953b3fa12347a18fa48b5ea691ad61720c2efdd) )
+	ROM_LOAD32_WORD("game.000.u86", 0x0000000, 0x0400000, CRC(be84df3c) SHA1(b39deff7d8d0ab30e3dbc0f33c4d45329734a05a) )
 ROM_END
 
 
 ROM_START( nerdwild )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("Nerds_Gone_Wild_U73.001", 0x0000000, 0x0400000, CRC(be64ac6d) SHA1(c0e6f68467ff248e5c619cedde74091783dafecf) )
-	ROM_LOAD32_WORD("Nerds_Gone_Wild_U86.000", 0x0000000, 0x0400000, CRC(a14e80d4) SHA1(f1729ff10991056e1880b5c0db3bdb760b1c664b) )
+	ROM_LOAD32_WORD("Nerds_Gone_Wild_001.u73", 0x0000002, 0x0400000, CRC(be64ac6d) SHA1(c0e6f68467ff248e5c619cedde74091783dafecf) )
+	ROM_LOAD32_WORD("Nerds_Gone_Wild_000.u86", 0x0000000, 0x0400000, CRC(a14e80d4) SHA1(f1729ff10991056e1880b5c0db3bdb760b1c664b) )
 ROM_END
 
 
 ROM_START( orbeaut )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("10213511.001", 0x0000000, 0x0400000, CRC(8c977e22) SHA1(4de3e30995124b89354d660fed97d29574a40533) )
-	ROM_LOAD32_WORD("10213511.000", 0x0000000, 0x0400000, CRC(4d3f0586) SHA1(da38f11e48191fd53492aa5a4875fcdc33d30c24) )
+	ROM_LOAD32_WORD("10213511.001.u73", 0x0000002, 0x0400000, CRC(8c977e22) SHA1(4de3e30995124b89354d660fed97d29574a40533) )
+	ROM_LOAD32_WORD("10213511.000.u86", 0x0000000, 0x0400000, CRC(4d3f0586) SHA1(da38f11e48191fd53492aa5a4875fcdc33d30c24) )
 ROM_END
 
 
 ROM_START( outbackj )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("u70.007", 0x0000000, 0x0400000, CRC(3a0ea3ca) SHA1(88513130013b1b18772a5e538da9a8db3a54633e) )
-	ROM_LOAD32_WORD("u71.005", 0x0000000, 0x0400000, CRC(23f1f50c) SHA1(40145b839c2b5fde5c0f20e08f46f5a859b6e20a) )
-	ROM_LOAD32_WORD("u72.003", 0x0000000, 0x0400000, CRC(cdd28848) SHA1(0038bb422a1d650beaa0ffd63b7d6de1936a5e32) )
-	ROM_LOAD32_WORD("u73.001", 0x0000000, 0x0400000, CRC(972eaba2) SHA1(b927aac04e21922b995aa2587a76ef14c35cd2bd) )
-	ROM_LOAD32_WORD("u83.006", 0x0000000, 0x0400000, CRC(79ca67a1) SHA1(68bae23df71c768dc17631f6ccfc7a720c0959ee) )
-	ROM_LOAD32_WORD("u84.004", 0x0000000, 0x0400000, CRC(0cd41b5d) SHA1(a7891da788fe88d2191b2f0686cb9ca2ecfeeb9c) )
-	ROM_LOAD32_WORD("u85.002", 0x0000000, 0x0400000, CRC(a1853f27) SHA1(cd2bf8674555f6870f0689ca0adbca6890bc9b27) )
-	ROM_LOAD32_WORD("u86.000", 0x0000000, 0x0400000, CRC(8eea3cea) SHA1(b2353fc953f6daf03c1458e06006de31fdd7a7c3) )
+	ROM_LOAD32_WORD("007.u70", 0x1800002, 0x0400000, CRC(3a0ea3ca) SHA1(88513130013b1b18772a5e538da9a8db3a54633e) )
+	ROM_LOAD32_WORD("005.u71", 0x1000002, 0x0400000, CRC(23f1f50c) SHA1(40145b839c2b5fde5c0f20e08f46f5a859b6e20a) )
+	ROM_LOAD32_WORD("003.u72", 0x0800002, 0x0400000, CRC(cdd28848) SHA1(0038bb422a1d650beaa0ffd63b7d6de1936a5e32) )
+	ROM_LOAD32_WORD("001.u73", 0x0000002, 0x0400000, CRC(972eaba2) SHA1(b927aac04e21922b995aa2587a76ef14c35cd2bd) )
+	ROM_LOAD32_WORD("006.u83", 0x1800000, 0x0400000, CRC(79ca67a1) SHA1(68bae23df71c768dc17631f6ccfc7a720c0959ee) )
+	ROM_LOAD32_WORD("004.u84", 0x1000000, 0x0400000, CRC(0cd41b5d) SHA1(a7891da788fe88d2191b2f0686cb9ca2ecfeeb9c) )
+	ROM_LOAD32_WORD("002.u85", 0x0800000, 0x0400000, CRC(a1853f27) SHA1(cd2bf8674555f6870f0689ca0adbca6890bc9b27) )
+	ROM_LOAD32_WORD("000.u86", 0x0000000, 0x0400000, CRC(8eea3cea) SHA1(b2353fc953f6daf03c1458e06006de31fdd7a7c3) )
 ROM_END
 
 
 ROM_START( owlcap )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("Owl Capone Demo.003", 0x0000000, 0x0400000, CRC(b6be5274) SHA1(28c3a743cfef76c05567cdb7cc4ff5c60c594e1e) )
-	ROM_LOAD32_WORD("Owl Capone Demo .001", 0x0000000, 0x0400000, CRC(c9197a1c) SHA1(2b4649c74f624e3414732027ca77536bcaced11f) )
-	ROM_LOAD32_WORD("Owl Capone Demo .002", 0x0000000, 0x0400000, CRC(8de48e1e) SHA1(c52592f808f02039c7f2d9358076e3dd91f152a2) )
-	ROM_LOAD32_WORD("Owl Capone Demo .000", 0x0000000, 0x0400000, CRC(66b2dc21) SHA1(1eeff14dd037c8c4c7fc95a04a8dc5946200d453) )
+	ROM_LOAD32_WORD("Owl Capone Demo.003.u72", 0x0800002, 0x0400000, CRC(b6be5274) SHA1(28c3a743cfef76c05567cdb7cc4ff5c60c594e1e) )
+	ROM_LOAD32_WORD("Owl Capone Demo.001.u73", 0x0000002, 0x0400000, CRC(c9197a1c) SHA1(2b4649c74f624e3414732027ca77536bcaced11f) )
+	ROM_LOAD32_WORD("Owl Capone Demo.002.u85", 0x0800000, 0x0400000, CRC(8de48e1e) SHA1(c52592f808f02039c7f2d9358076e3dd91f152a2) )
+	ROM_LOAD32_WORD("Owl Capone Demo.000.u86", 0x0000000, 0x0400000, CRC(66b2dc21) SHA1(1eeff14dd037c8c4c7fc95a04a8dc5946200d453) )
 ROM_END
 
 ROM_START( pariligh )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("Paris Lights U72.003", 0x0000000, 0x0400000, CRC(d04e5031) SHA1(46ef9fe928409ec031afa97f67b271cb0059c603) )
-	ROM_LOAD32_WORD("Paris Lights U73.001", 0x0000000, 0x0400000, CRC(05e567a5) SHA1(c605033599f5fd92b20013264c0bf9eb7076ee85) )
-	ROM_LOAD32_WORD("Paris Lights U85.002", 0x0000000, 0x0400000, CRC(32eb5b34) SHA1(165c61e20ae8d52575fc0402b1cbc49bbb18d2af) )
-	ROM_LOAD32_WORD("Paris Lights U86.000", 0x0000000, 0x0400000, CRC(89508f23) SHA1(10ab87fc7c726d2d2a6c73151f2ef731b3d79979) )
+	ROM_LOAD32_WORD("Paris Lights 003.u72", 0x0800002, 0x0400000, CRC(d04e5031) SHA1(46ef9fe928409ec031afa97f67b271cb0059c603) )
+	ROM_LOAD32_WORD("Paris Lights 001.u73", 0x0000002, 0x0400000, CRC(05e567a5) SHA1(c605033599f5fd92b20013264c0bf9eb7076ee85) )
+	ROM_LOAD32_WORD("Paris Lights 002.u85", 0x0800000, 0x0400000, CRC(32eb5b34) SHA1(165c61e20ae8d52575fc0402b1cbc49bbb18d2af) )
+	ROM_LOAD32_WORD("Paris Lights 000.u86", 0x0000000, 0x0400000, CRC(89508f23) SHA1(10ab87fc7c726d2d2a6c73151f2ef731b3d79979) )
 ROM_END
 
 
 ROM_START( pcockmag )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("peacockmagicu72.003", 0x0000000, 0x0400000, CRC(0519288c) SHA1(a6e838d750f17131bf0871eac8742408cb03db6c) )
-	ROM_LOAD32_WORD("peacockmagicu73.001", 0x0000000, 0x0400000, CRC(106bd1d4) SHA1(4ecfafc883da969eb1b46c00e8b67aedfdb001bf) )
-	ROM_LOAD32_WORD("peacockmagicu85.002", 0x0000000, 0x0400000, CRC(6453532c) SHA1(c9b885e42778af56df89520cb6e4856348958110) )
-	ROM_LOAD32_WORD("peacockmagicu86.000", 0x0000000, 0x0400000, CRC(5348f934) SHA1(82762d643729639a1f059a1b57b74c8ab240277c) )
+	ROM_LOAD32_WORD("peacockmagic003.u72", 0x0800002, 0x0400000, CRC(0519288c) SHA1(a6e838d750f17131bf0871eac8742408cb03db6c) )
+	ROM_LOAD32_WORD("peacockmagic001.u73", 0x0000002, 0x0400000, CRC(106bd1d4) SHA1(4ecfafc883da969eb1b46c00e8b67aedfdb001bf) )
+	ROM_LOAD32_WORD("peacockmagic002.u85", 0x0800000, 0x0400000, CRC(6453532c) SHA1(c9b885e42778af56df89520cb6e4856348958110) )
+	ROM_LOAD32_WORD("peacockmagic000.u86", 0x0000000, 0x0400000, CRC(5348f934) SHA1(82762d643729639a1f059a1b57b74c8ab240277c) )
 ROM_END
 
 
 ROM_START( pelipete )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("PELICAN_PETENSW_U72.003", 0x0000000, 0x0400000, CRC(6e7d67d9) SHA1(163449982405d2cd078c757d885113edbcddbd22) )
-	ROM_LOAD32_WORD("PELICAN_PETENSW_U73.001", 0x0000000, 0x0400000, CRC(8626fcd5) SHA1(fb08bddf8e30ef537af7f96c632d0690f241cef3) )
-	ROM_LOAD32_WORD("PELICAN_PETENSW_U85.002", 0x0000000, 0x0400000, CRC(99c2748b) SHA1(712c103be109839d02ace90c1498192792185733) )
-	ROM_LOAD32_WORD("PELICAN_PETENSW_U86.000", 0x0000000, 0x0400000, CRC(9fb0db2d) SHA1(c4c7f5f91045778dce2229919e00aa1bdb625084) )
+	ROM_LOAD32_WORD("PELICAN_PETENSW_003.u72", 0x0800002, 0x0400000, CRC(6e7d67d9) SHA1(163449982405d2cd078c757d885113edbcddbd22) )
+	ROM_LOAD32_WORD("PELICAN_PETENSW_001.u73", 0x0000002, 0x0400000, CRC(8626fcd5) SHA1(fb08bddf8e30ef537af7f96c632d0690f241cef3) )
+	ROM_LOAD32_WORD("PELICAN_PETENSW_002.u85", 0x0800000, 0x0400000, CRC(99c2748b) SHA1(712c103be109839d02ace90c1498192792185733) )
+	ROM_LOAD32_WORD("PELICAN_PETENSW_000.u86", 0x0000000, 0x0400000, CRC(9fb0db2d) SHA1(c4c7f5f91045778dce2229919e00aa1bdb625084) )
 ROM_END
 
 
 ROM_START( pharpor )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("Pharaoh's Fortune.003", 0x0000000, 0x0400000, CRC(c5d24a99) SHA1(d6d17ab5255d153beacc39880bd58b7b647f532f) )
-	ROM_LOAD32_WORD("Pharaoh's Fortune.001", 0x0000000, 0x0400000, CRC(33236ae6) SHA1(a9c41af9982c1a7035c5190732775a3eca4ebb78) )
-	ROM_LOAD32_WORD("Pharaoh's Fortune.002", 0x0000000, 0x0400000, CRC(158af672) SHA1(f653f9d400f03713baa650912c8c0ab33f218fb2) )
-	ROM_LOAD32_WORD("Pharaoh's Fortune.000", 0x0000000, 0x0400000, CRC(6d435495) SHA1(22644acb9ed28e737bc132698cd12048c76c4b80) )
+	ROM_LOAD32_WORD("Pharaoh's Fortune.003.u72", 0x0800002, 0x0400000, CRC(c5d24a99) SHA1(d6d17ab5255d153beacc39880bd58b7b647f532f) )
+	ROM_LOAD32_WORD("Pharaoh's Fortune.001.u73", 0x0000002, 0x0400000, CRC(33236ae6) SHA1(a9c41af9982c1a7035c5190732775a3eca4ebb78) )
+	ROM_LOAD32_WORD("Pharaoh's Fortune.002.u85", 0x0800000, 0x0400000, CRC(158af672) SHA1(f653f9d400f03713baa650912c8c0ab33f218fb2) )
+	ROM_LOAD32_WORD("Pharaoh's Fortune.000.u86", 0x0000000, 0x0400000, CRC(6d435495) SHA1(22644acb9ed28e737bc132698cd12048c76c4b80) )
 ROM_END
 
 
 ROM_START( phxfant )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("Phoenix Fantasy.002", 0x0000000, 0x0400000, CRC(db092fc5) SHA1(c2469c131d1240faede3e6e64ee818df4ce9581d) )
-	ROM_LOAD32_WORD("Phoenix Fantasy.001", 0x0000000, 0x0400000, CRC(1854f81c) SHA1(fc97f1c55db5c66d2261de62a538cc0308988702) )
-	ROM_LOAD32_WORD("Phoenix Fantasy.003", 0x0000000, 0x0400000, CRC(3ea207d5) SHA1(ae9b032f6ab90630bb047fa508d539874bd86d18) )
-	ROM_LOAD32_WORD("Phoenix Fantasy.000", 0x0000000, 0x0400000, CRC(499742c6) SHA1(7743b24e658e4ee60255e9bf2b33a4937d19e3b4) )
+	ROM_LOAD32_WORD("Phoenix Fantasy.002.u85", 0x0800000, 0x0400000, CRC(db092fc5) SHA1(c2469c131d1240faede3e6e64ee818df4ce9581d) )
+	ROM_LOAD32_WORD("Phoenix Fantasy.001.u73", 0x0000002, 0x0400000, CRC(1854f81c) SHA1(fc97f1c55db5c66d2261de62a538cc0308988702) )
+	ROM_LOAD32_WORD("Phoenix Fantasy.003.u72", 0x0800002, 0x0400000, CRC(3ea207d5) SHA1(ae9b032f6ab90630bb047fa508d539874bd86d18) )
+	ROM_LOAD32_WORD("Phoenix Fantasy.000.u86", 0x0000000, 0x0400000, CRC(499742c6) SHA1(7743b24e658e4ee60255e9bf2b33a4937d19e3b4) )
 ROM_END
 
 
 ROM_START( piratar )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("Pirates_U73.001", 0x0000000, 0x0400000, CRC(5923957d) SHA1(62d6effe9f3af0cdc301bbc6541971e91ddc573a) )
-	ROM_LOAD32_WORD("Pirates_U86.000", 0x0000000, 0x0400000, CRC(ed435c4a) SHA1(98750a2673411c3b193f25f2998755314bd60331) )
+	ROM_LOAD32_WORD("Pirates_001.u73", 0x0000002, 0x0400000, CRC(5923957d) SHA1(62d6effe9f3af0cdc301bbc6541971e91ddc573a) )
+	ROM_LOAD32_WORD("Pirates_000.u86", 0x0000000, 0x0400000, CRC(ed435c4a) SHA1(98750a2673411c3b193f25f2998755314bd60331) )
 ROM_END
 
 
 ROM_START( pcbydem )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("MG0005playerschoice.007", 0x0000000, 0x0400000, CRC(adfaa968) SHA1(a1a8329523cbd14c24f8e6997a5be442327f61c7) )
-	ROM_LOAD32_WORD("MG0005playerschoice.005", 0x0000000, 0x0400000, CRC(c71cb0e3) SHA1(c46d017bb26fb990a403cff7659b15a11f947c19) )
-	ROM_LOAD32_WORD("MG0005playerschoice.003", 0x0000000, 0x0400000, CRC(81816747) SHA1(c745bc6be35976f4784730ab8b75e07688e49b22) )
-	ROM_LOAD32_WORD("MG0005playerschoice.006", 0x0000000, 0x0400000, CRC(f3aab3c8) SHA1(a4c08d341f6b59b5faa14aa3381be066ecdc692a) )
-	ROM_LOAD32_WORD("MG0005playerschoice.001", 0x0000000, 0x0400000, CRC(4a729ca3) SHA1(52be1fbf80a06f9959d62376102d96ea8f77f272) )
-	ROM_LOAD32_WORD("MG0005playerschoice.004", 0x0000000, 0x0400000, CRC(309dbbf7) SHA1(69e44494bba43d001545c4e474ab4f712d1d8015) )
-	ROM_LOAD32_WORD("MG0005playerschoice.002", 0x0000000, 0x0400000, CRC(a9b81cc4) SHA1(541765e9fe2d67c60f014a8d32866c7b8203766a) )
-	ROM_LOAD32_WORD("MG0005playerschoice.000", 0x0000000, 0x0400000, CRC(c4f95ab2) SHA1(dd0a3cdaa7b421cbcfa50b94b8bbfb69769343cd) )
+	ROM_LOAD32_WORD("MG0005playerschoice.007.u70", 0x1800002, 0x0400000, CRC(adfaa968) SHA1(a1a8329523cbd14c24f8e6997a5be442327f61c7) )
+	ROM_LOAD32_WORD("MG0005playerschoice.005.u71", 0x1000002, 0x0400000, CRC(c71cb0e3) SHA1(c46d017bb26fb990a403cff7659b15a11f947c19) )
+	ROM_LOAD32_WORD("MG0005playerschoice.003.u72", 0x0800002, 0x0400000, CRC(81816747) SHA1(c745bc6be35976f4784730ab8b75e07688e49b22) )
+	ROM_LOAD32_WORD("MG0005playerschoice.006.u83", 0x1800000, 0x0400000, CRC(f3aab3c8) SHA1(a4c08d341f6b59b5faa14aa3381be066ecdc692a) )
+	ROM_LOAD32_WORD("MG0005playerschoice.001.u73", 0x0000002, 0x0400000, CRC(4a729ca3) SHA1(52be1fbf80a06f9959d62376102d96ea8f77f272) )
+	ROM_LOAD32_WORD("MG0005playerschoice.004.u84", 0x1000000, 0x0400000, CRC(309dbbf7) SHA1(69e44494bba43d001545c4e474ab4f712d1d8015) )
+	ROM_LOAD32_WORD("MG0005playerschoice.002.u85", 0x0800000, 0x0400000, CRC(a9b81cc4) SHA1(541765e9fe2d67c60f014a8d32866c7b8203766a) )
+	ROM_LOAD32_WORD("MG0005playerschoice.000.u86", 0x0000000, 0x0400000, CRC(c4f95ab2) SHA1(dd0a3cdaa7b421cbcfa50b94b8bbfb69769343cd) )
 ROM_END
 
 
 ROM_START( pcfav )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("123456.000", 0x0000000, 0x0400000, CRC(864ff191) SHA1(2750d74564a56615034df8417dcb7b8edb43f36e) )
-	ROM_LOAD32_WORD("123456.001", 0x0000000, 0x0400000, CRC(4de61358) SHA1(f1d732dfd8f3a05ab0fde7e4b98261d2f2a10a5f) )
-	ROM_LOAD32_WORD("123456.002", 0x0000000, 0x0400000, CRC(385e8636) SHA1(5e4bf33f91481080c80264b915a11606b03f8686) )
-	ROM_LOAD32_WORD("123456.003", 0x0000000, 0x0400000, CRC(9b0fb8b6) SHA1(bd5a2734068e031ca7ab0f19749f28f84288125f) )
-	ROM_LOAD32_WORD("123456.004", 0x0000000, 0x0400000, CRC(7944e972) SHA1(23d45a2e948a737d3186de5f0447ec7dd51ddc7b) )
-	ROM_LOAD32_WORD("123456.005", 0x0000000, 0x0400000, CRC(116bb514) SHA1(cd3dcca730c8e9d3fe5b0c70638f3d81f8eb8f98) )
+	ROM_LOAD32_WORD("123456.000.u86", 0x0000000, 0x0400000, CRC(864ff191) SHA1(2750d74564a56615034df8417dcb7b8edb43f36e) )
+	ROM_LOAD32_WORD("123456.001.u73", 0x0000002, 0x0400000, CRC(4de61358) SHA1(f1d732dfd8f3a05ab0fde7e4b98261d2f2a10a5f) )
+	ROM_LOAD32_WORD("123456.002.u85", 0x0800000, 0x0400000, CRC(385e8636) SHA1(5e4bf33f91481080c80264b915a11606b03f8686) )
+	ROM_LOAD32_WORD("123456.003.u72", 0x0800002, 0x0400000, CRC(9b0fb8b6) SHA1(bd5a2734068e031ca7ab0f19749f28f84288125f) )
+	ROM_LOAD32_WORD("123456.004.u84", 0x1000000, 0x0400000, CRC(7944e972) SHA1(23d45a2e948a737d3186de5f0447ec7dd51ddc7b) )
+	ROM_LOAD32_WORD("123456.005.u71", 0x1000002, 0x0400000, CRC(116bb514) SHA1(cd3dcca730c8e9d3fe5b0c70638f3d81f8eb8f98) )
 ROM_END
 
 
 ROM_START( pompeiar )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("U72.003", 0x0000000, 0x0400000, CRC(e3c02b5e) SHA1(714e83160917e83dafc058a9078ace800c4c3ebf) )
-	ROM_LOAD32_WORD("U73.001", 0x0000000, 0x0400000, CRC(c56b6b9f) SHA1(3f4cb68620a0d993b1812768092b85353d7bc763) )
-	ROM_LOAD32_WORD("U85.002", 0x0000000, 0x0400000, CRC(7569d484) SHA1(127d92b7bd62543789b25fbfce65e8429ddfc654) )
-	ROM_LOAD32_WORD("U86.000", 0x0000000, 0x0400000, CRC(0c4ef28a) SHA1(96381853ed23cb914e5e494fc90f671c2143a305) )
+	ROM_LOAD32_WORD("003.u72", 0x0800002, 0x0400000, CRC(e3c02b5e) SHA1(714e83160917e83dafc058a9078ace800c4c3ebf) )
+	ROM_LOAD32_WORD("001.u73", 0x0000002, 0x0400000, CRC(c56b6b9f) SHA1(3f4cb68620a0d993b1812768092b85353d7bc763) )
+	ROM_LOAD32_WORD("002.u85", 0x0800000, 0x0400000, CRC(7569d484) SHA1(127d92b7bd62543789b25fbfce65e8429ddfc654) )
+	ROM_LOAD32_WORD("000.u86", 0x0000000, 0x0400000, CRC(0c4ef28a) SHA1(96381853ed23cb914e5e494fc90f671c2143a305) )
 ROM_END
 
 
 ROM_START( prideaf )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("Pride of Africa.001", 0x0000000, 0x0400000, CRC(86c22e24) SHA1(008fb01a7690981a3bc6a7f4a06dcebaef2a892c) )
-	ROM_LOAD32_WORD("Pride of Africa.000", 0x0000000, 0x0400000, CRC(efbf0ad5) SHA1(b4d84800c60df820bbe332879189208bac8330ef) )
+	ROM_LOAD32_WORD("Pride of Africa.001.u73", 0x0000002, 0x0400000, CRC(86c22e24) SHA1(008fb01a7690981a3bc6a7f4a06dcebaef2a892c) )
+	ROM_LOAD32_WORD("Pride of Africa.000.u86", 0x0000000, 0x0400000, CRC(efbf0ad5) SHA1(b4d84800c60df820bbe332879189208bac8330ef) )
 ROM_END
 
 
 ROM_START( prophar )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("Prophecy.003", 0x0000000, 0x0400000, CRC(194be1d6) SHA1(8f71ff6646a34261cb003fea877b42742eea8c15) )
-	ROM_LOAD32_WORD("Prophecy.001", 0x0000000, 0x0400000, CRC(683f081f) SHA1(4d625c67cb1d5fa5b025a02e797c4fc0a03893da) )
-	ROM_LOAD32_WORD("Prophecy.002", 0x0000000, 0x0400000, CRC(046ae548) SHA1(246015be05294806ecfacd626449e2df7e7f569c) )
-	ROM_LOAD32_WORD("Prophecy.000", 0x0000000, 0x0400000, CRC(e5950eef) SHA1(930582c34f3639b887d490c96f91814cb5228d8b) )
+	ROM_LOAD32_WORD("Prophecy.003.u72", 0x0800002, 0x0400000, CRC(194be1d6) SHA1(8f71ff6646a34261cb003fea877b42742eea8c15) )
+	ROM_LOAD32_WORD("Prophecy.001.u73", 0x0000002, 0x0400000, CRC(683f081f) SHA1(4d625c67cb1d5fa5b025a02e797c4fc0a03893da) )
+	ROM_LOAD32_WORD("Prophecy.002.u85", 0x0800000, 0x0400000, CRC(046ae548) SHA1(246015be05294806ecfacd626449e2df7e7f569c) )
+	ROM_LOAD32_WORD("Prophecy.000.u86", 0x0000000, 0x0400000, CRC(e5950eef) SHA1(930582c34f3639b887d490c96f91814cb5228d8b) )
 ROM_END
 
 
 ROM_START( qsheeba )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("queen_of_Sheba.003", 0x0000000, 0x0400000, CRC(befa03be) SHA1(abd4846f29636aff70826b3086a972682c3bffe0) )
-	ROM_LOAD32_WORD("queen_of_Sheba.001", 0x0000000, 0x0400000, CRC(fb26e09a) SHA1(e2debdcea7ee7be90e70c96e3eca593b515dfd2d) )
-	ROM_LOAD32_WORD("queen_of_Sheba.002", 0x0000000, 0x0400000, CRC(6f827f08) SHA1(b3777031c0a8d14557a640572c4dcfa781986b54) )
-	ROM_LOAD32_WORD("queen_of_Sheba.000", 0x0000000, 0x0400000, CRC(e1313dff) SHA1(536014d8d4f3ff90d93befdcd55d5b3e6eb49e7c) )
+	ROM_LOAD32_WORD("queen_of_Sheba.003.u72", 0x0800002, 0x0400000, CRC(befa03be) SHA1(abd4846f29636aff70826b3086a972682c3bffe0) )
+	ROM_LOAD32_WORD("queen_of_Sheba.001.u73", 0x0000002, 0x0400000, CRC(fb26e09a) SHA1(e2debdcea7ee7be90e70c96e3eca593b515dfd2d) )
+	ROM_LOAD32_WORD("queen_of_Sheba.002.u85", 0x0800000, 0x0400000, CRC(6f827f08) SHA1(b3777031c0a8d14557a640572c4dcfa781986b54) )
+	ROM_LOAD32_WORD("queen_of_Sheba.000.u86", 0x0000000, 0x0400000, CRC(e1313dff) SHA1(536014d8d4f3ff90d93befdcd55d5b3e6eb49e7c) )
 ROM_END
 
 ROM_START( qnilecj )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("Gam_Eprm.u72", 0x0000000, 0x0400000, CRC(a1aa9310) SHA1(a00a7dfd57fe8624421e6821c32516f018199d49) )
-	ROM_LOAD32_WORD("Gam_Eprm.u73", 0x0000000, 0x0400000, CRC(0ec5d0df) SHA1(206916986b1214a9635c901cbbcda21d21e0338a) )
-	ROM_LOAD32_WORD("Gam_Eprm.u85", 0x0000000, 0x0400000, CRC(a30473fd) SHA1(0af9fcee5df49d20847f98f94e09c0d394c1857a) )
+	ROM_LOAD32_WORD("Gam_Eprm.u72", 0x0800002, 0x0400000, CRC(a1aa9310) SHA1(a00a7dfd57fe8624421e6821c32516f018199d49) )
+	ROM_LOAD32_WORD("Gam_Eprm.u73", 0x0000002, 0x0400000, CRC(0ec5d0df) SHA1(206916986b1214a9635c901cbbcda21d21e0338a) )
+	ROM_LOAD32_WORD("Gam_Eprm.u85", 0x0800000, 0x0400000, CRC(a30473fd) SHA1(0af9fcee5df49d20847f98f94e09c0d394c1857a) )
 	ROM_LOAD32_WORD("Gam_Eprm.u86", 0x0000000, 0x0400000, CRC(484fb352) SHA1(cc0c97895731dc3f333131ff5a47794fe1857e47) )
 ROM_END
 
@@ -1285,98 +1283,98 @@ ROM_END
 ROM_START( qnilese )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("u70.007", 0x0000000, 0x0100000, CRC(5ae69121) SHA1(36dd3f9aaf5f7d2751d1954d67f898bc3ec71f3b) )
-	ROM_LOAD32_WORD("u71.005", 0x0000000, 0x0100000, CRC(d793440a) SHA1(dced4c04bde13293af77a9a1f4c5c606e3758de0) )
-	ROM_LOAD32_WORD("u83.006", 0x0000000, 0x0100000, CRC(c8580554) SHA1(58b8bfff2f8d298c4e3be2b01900800c45fa7ad7) )
-	ROM_LOAD32_WORD("u84.004", 0x0000000, 0x0100000, CRC(a34a9f16) SHA1(b8750e6ceb1715da8e5ac2f0183254e29a042641) )
-	ROM_LOAD32_WORD("u73.001", 0x0000000, 0x0400000, CRC(27391233) SHA1(e1d546cc9a57db894bdfb24592048578f5828ee5) )
-	ROM_LOAD32_WORD("u86.000", 0x0000000, 0x0400000, CRC(4c7bdba1) SHA1(796c9da25bbfe389aae5c03b42e15500c91a60d4) )
+	ROM_LOAD32_WORD("007.u70", 0x1800002, 0x0100000, CRC(5ae69121) SHA1(36dd3f9aaf5f7d2751d1954d67f898bc3ec71f3b) )
+	ROM_LOAD32_WORD("005.u71", 0x1000002, 0x0100000, CRC(d793440a) SHA1(dced4c04bde13293af77a9a1f4c5c606e3758de0) )
+	ROM_LOAD32_WORD("006.u83", 0x1800000, 0x0100000, CRC(c8580554) SHA1(58b8bfff2f8d298c4e3be2b01900800c45fa7ad7) )
+	ROM_LOAD32_WORD("004.u84", 0x1000000, 0x0100000, CRC(a34a9f16) SHA1(b8750e6ceb1715da8e5ac2f0183254e29a042641) )
+	ROM_LOAD32_WORD("001.u73", 0x0000002, 0x0400000, CRC(27391233) SHA1(e1d546cc9a57db894bdfb24592048578f5828ee5) )
+	ROM_LOAD32_WORD("000.u86", 0x0000000, 0x0400000, CRC(4c7bdba1) SHA1(796c9da25bbfe389aae5c03b42e15500c91a60d4) )
 ROM_END
 
 ROM_START( qnile )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("U72 QOTN.003", 0x0000000, 0x0400000, CRC(491f4ef2) SHA1(fbaa64d9603900de44642f95fb9f7ee15e138669) )
-	ROM_LOAD32_WORD("U73 QOTN.001", 0x0000000, 0x0400000, CRC(2f7f783c) SHA1(1739b05628bd02cb1b73c883d9f2e113da2c29e7) )
-	ROM_LOAD32_WORD("U85 QOTN.002", 0x0000000, 0x0400000, CRC(4e53a089) SHA1(2dd060e4ff74f7fe73850a0c3877fa4bacad36c3) )
-	ROM_LOAD32_WORD("U86 QOTN.000", 0x0000000, 0x0400000, CRC(76818f74) SHA1(baac1a4a8ed3f1fb5a6ca321a6efe6ece7701486) )
+	ROM_LOAD32_WORD("U72 QOTN.003.u72", 0x0800002, 0x0400000, CRC(491f4ef2) SHA1(fbaa64d9603900de44642f95fb9f7ee15e138669) )
+	ROM_LOAD32_WORD("U73 QOTN.001.u73", 0x0000002, 0x0400000, CRC(2f7f783c) SHA1(1739b05628bd02cb1b73c883d9f2e113da2c29e7) )
+	ROM_LOAD32_WORD("U85 QOTN.002.u85", 0x0800000, 0x0400000, CRC(4e53a089) SHA1(2dd060e4ff74f7fe73850a0c3877fa4bacad36c3) )
+	ROM_LOAD32_WORD("U86 QOTN.000.u86", 0x0000000, 0x0400000, CRC(76818f74) SHA1(baac1a4a8ed3f1fb5a6ca321a6efe6ece7701486) )
 ROM_END
 
 
 ROM_START( raprichs )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("RapidRiches.003", 0x0000000, 0x0400000, CRC(3b4ee6dd) SHA1(83ddfdc3d8bdf02395411d8a6721a9c65c64e69c) )
-	ROM_LOAD32_WORD("RapidRiches.001", 0x0000000, 0x0400000, CRC(cd13d765) SHA1(f91cb232726a038c3ff1a25259622dd99d552279) )
-	ROM_LOAD32_WORD("RapidRiches.002", 0x0000000, 0x0400000, CRC(3fbfdf7f) SHA1(bcfd939d0fa4d0acc2544910940fb09d48a399b5) )
-	ROM_LOAD32_WORD("RapidRiches.000", 0x0000000, 0x0400000, CRC(8dfb94ce) SHA1(67933b9edbd9631d2558d16267559af91084172b) )
+	ROM_LOAD32_WORD("RapidRiches.003.u72", 0x0800002, 0x0400000, CRC(3b4ee6dd) SHA1(83ddfdc3d8bdf02395411d8a6721a9c65c64e69c) )
+	ROM_LOAD32_WORD("RapidRiches.001.u73", 0x0000002, 0x0400000, CRC(cd13d765) SHA1(f91cb232726a038c3ff1a25259622dd99d552279) )
+	ROM_LOAD32_WORD("RapidRiches.002.u85", 0x0800000, 0x0400000, CRC(3fbfdf7f) SHA1(bcfd939d0fa4d0acc2544910940fb09d48a399b5) )
+	ROM_LOAD32_WORD("RapidRiches.000.u86", 0x0000000, 0x0400000, CRC(8dfb94ce) SHA1(67933b9edbd9631d2558d16267559af91084172b) )
 ROM_END
 
 
 ROM_START( redbarar )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("redbaron.003", 0x0000000, 0x0400000, CRC(16b6207f) SHA1(9c5ac48cccba001b2e3605eceb9610c659e06e21) )
-	ROM_LOAD32_WORD("redbaron.001", 0x0000000, 0x0400000, CRC(6590c207) SHA1(8184ae0ac02f22787c631bc823bd0fbcd5d5bf05) )
-	ROM_LOAD32_WORD("redbaron.002", 0x0000000, 0x0400000, CRC(e954aeac) SHA1(df8a9420df31c4ecc2cbe460cea4c0bd13958289) )
-	ROM_LOAD32_WORD("redbaron.000", 0x0000000, 0x0400000, CRC(599a7170) SHA1(8e3b2730b9503baa798fd59d787052a9589e0447) )
+	ROM_LOAD32_WORD("redbaron.003.u72", 0x0800002, 0x0400000, CRC(16b6207f) SHA1(9c5ac48cccba001b2e3605eceb9610c659e06e21) )
+	ROM_LOAD32_WORD("redbaron.001.u73", 0x0000002, 0x0400000, CRC(6590c207) SHA1(8184ae0ac02f22787c631bc823bd0fbcd5d5bf05) )
+	ROM_LOAD32_WORD("redbaron.002.u85", 0x0800000, 0x0400000, CRC(e954aeac) SHA1(df8a9420df31c4ecc2cbe460cea4c0bd13958289) )
+	ROM_LOAD32_WORD("redbaron.000.u86", 0x0000000, 0x0400000, CRC(599a7170) SHA1(8e3b2730b9503baa798fd59d787052a9589e0447) )
 ROM_END
 
 
 ROM_START( ruprup )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("Roll Up Roll Up U72.003", 0x0000000, 0x0400000, CRC(7ba80d87) SHA1(c912ec8c65060060b459de0c5ed0b3ad018eff76) )
-	ROM_LOAD32_WORD("Roll Up Roll Up U73.001", 0x0000000, 0x0400000, CRC(e60d9c93) SHA1(7504f07f04be97058b50168c14e6ec41480e43ef) )
-	ROM_LOAD32_WORD("Roll Up Roll Up U85.002", 0x0000000, 0x0400000, CRC(7debb885) SHA1(c46e3231d8a13cec7d398a8064ac76e78954dd82) )
-	ROM_LOAD32_WORD("Roll Up Roll Up U86.000", 0x0000000, 0x0400000, CRC(b6d1c4fa) SHA1(24d88882783353598e4f63edda4982f9e55b2595) )
+	ROM_LOAD32_WORD("Roll Up Roll Up 003.u72", 0x0800002, 0x0400000, CRC(7ba80d87) SHA1(c912ec8c65060060b459de0c5ed0b3ad018eff76) )
+	ROM_LOAD32_WORD("Roll Up Roll Up 001.u73", 0x0000002, 0x0400000, CRC(e60d9c93) SHA1(7504f07f04be97058b50168c14e6ec41480e43ef) )
+	ROM_LOAD32_WORD("Roll Up Roll Up 002.u85", 0x0800000, 0x0400000, CRC(7debb885) SHA1(c46e3231d8a13cec7d398a8064ac76e78954dd82) )
+	ROM_LOAD32_WORD("Roll Up Roll Up 000.u86", 0x0000000, 0x0400000, CRC(b6d1c4fa) SHA1(24d88882783353598e4f63edda4982f9e55b2595) )
 ROM_END
 
 
 ROM_START( rubmgc )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("RubyMagic_U72.003", 0x0000000, 0x0400000, CRC(2cdfe857) SHA1(33b4ce8ab0a5f1e341a5c5c536c5f3619ecd7f95) )
-	ROM_LOAD32_WORD("RubyMagic_U73.001", 0x0000000, 0x0400000, CRC(6699d2c6) SHA1(1c96dba91a40993cf9c3bc9e8c591e971c04bedf) )
-	ROM_LOAD32_WORD("RubyMagic_U85.002", 0x0000000, 0x0400000, CRC(877fde17) SHA1(278b8cb71cafa0859073acc48339da9e645fdcc6) )
-	ROM_LOAD32_WORD("RubyMagic_U86.000", 0x0000000, 0x0400000, CRC(717d1c53) SHA1(8f5204d4394c6e0b83f6f456c80e98e12fac1a66) )
+	ROM_LOAD32_WORD("RubyMagic_003.u72", 0x0800002, 0x0400000, CRC(2cdfe857) SHA1(33b4ce8ab0a5f1e341a5c5c536c5f3619ecd7f95) )
+	ROM_LOAD32_WORD("RubyMagic_001.u73", 0x0000002, 0x0400000, CRC(6699d2c6) SHA1(1c96dba91a40993cf9c3bc9e8c591e971c04bedf) )
+	ROM_LOAD32_WORD("RubyMagic_002.u85", 0x0800000, 0x0400000, CRC(877fde17) SHA1(278b8cb71cafa0859073acc48339da9e645fdcc6) )
+	ROM_LOAD32_WORD("RubyMagic_000.u86", 0x0000000, 0x0400000, CRC(717d1c53) SHA1(8f5204d4394c6e0b83f6f456c80e98e12fac1a66) )
 ROM_END
 
 
 ROM_START( scatmg2 )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("Scatter Magic II.000", 0x0000000, 0x0400000, CRC(696734d8) SHA1(baffadb943fb12d0d19069023f5cdf80b1a1674f) )
-	ROM_LOAD32_WORD("Scatter Magic II.001", 0x0000000, 0x0400000, CRC(aeef47b6) SHA1(63d296d60848269851e9d424908bbf3d52003f07) )
-	ROM_LOAD32_WORD("Scatter Magic II.002", 0x0000000, 0x0400000, CRC(d3f7018e) SHA1(345a9f55256d9ec46182ebf9c0c6fca62ea2e275) )
-	ROM_LOAD32_WORD("Scatter Magic II.003", 0x0000000, 0x0400000, CRC(e5c9dee7) SHA1(b29f7b8eb3d894e0a3dbc6cabdd2d8e59e2c2bbf) )
+	ROM_LOAD32_WORD("Scatter Magic II.000.u86", 0x0000000, 0x0400000, CRC(696734d8) SHA1(baffadb943fb12d0d19069023f5cdf80b1a1674f) )
+	ROM_LOAD32_WORD("Scatter Magic II.001.u73", 0x0000002, 0x0400000, CRC(aeef47b6) SHA1(63d296d60848269851e9d424908bbf3d52003f07) )
+	ROM_LOAD32_WORD("Scatter Magic II.002.u85", 0x0800000, 0x0400000, CRC(d3f7018e) SHA1(345a9f55256d9ec46182ebf9c0c6fca62ea2e275) )
+	ROM_LOAD32_WORD("Scatter Magic II.003.u72", 0x0800002, 0x0400000, CRC(e5c9dee7) SHA1(b29f7b8eb3d894e0a3dbc6cabdd2d8e59e2c2bbf) )
 ROM_END
 
 
 ROM_START( sharmnm )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("Shaman's Magic.001", 0x0000000, 0x0400000, CRC(a84ac2a4) SHA1(743d56448135b03c25325bdc3d79781e63f0b9b6) )
-	ROM_LOAD32_WORD("Shaman's Magic.000", 0x0000000, 0x0400000, CRC(3edb8156) SHA1(83bb1467d892120c2bd5e85ef05527e2d02999ae) )
+	ROM_LOAD32_WORD("Shaman's Magic.001.u73", 0x0000002, 0x0400000, CRC(a84ac2a4) SHA1(743d56448135b03c25325bdc3d79781e63f0b9b6) )
+	ROM_LOAD32_WORD("Shaman's Magic.000.u86", 0x0000000, 0x0400000, CRC(3edb8156) SHA1(83bb1467d892120c2bd5e85ef05527e2d02999ae) )
 ROM_END
 
 
 ROM_START( smtmar )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("10001911_SHOW_ME_THE_MONEY_657_1.U72.003", 0x0000000, 0x0400000, CRC(cb5f47d4) SHA1(70fa1e68bf1fbebc6b6663fbabb78c5f286b7805) )
-	ROM_LOAD32_WORD("10001911_SHOW_ME_THE_MONEY_657_1.U73.001", 0x0000000, 0x0400000, CRC(ccc901f0) SHA1(4c845ccfea10a744b8c37b6b155b0fc2ce6bfede) )
-	ROM_LOAD32_WORD("10001911_SHOW_ME_THE_MONEY_657_1.U85.002", 0x0000000, 0x0400000, CRC(7a36f3f3) SHA1(3653a6f40587c2be1810b4a9dd8f27ecca336a70) )
-	ROM_LOAD32_WORD("10001911_SHOW_ME_THE_MONEY_657_1.U86.000", 0x0000000, 0x0400000, CRC(9f436ee3) SHA1(e41a9475fd10fd7d15be1665ee2d4e9dcee2d4dd) )
+	ROM_LOAD32_WORD("10001911_SHOW_ME_THE_MONEY_657_1.003.u72", 0x0800002, 0x0400000, CRC(cb5f47d4) SHA1(70fa1e68bf1fbebc6b6663fbabb78c5f286b7805) )
+	ROM_LOAD32_WORD("10001911_SHOW_ME_THE_MONEY_657_1.001.u73", 0x0000002, 0x0400000, CRC(ccc901f0) SHA1(4c845ccfea10a744b8c37b6b155b0fc2ce6bfede) )
+	ROM_LOAD32_WORD("10001911_SHOW_ME_THE_MONEY_657_1.002.u85", 0x0800000, 0x0400000, CRC(7a36f3f3) SHA1(3653a6f40587c2be1810b4a9dd8f27ecca336a70) )
+	ROM_LOAD32_WORD("10001911_SHOW_ME_THE_MONEY_657_1.000.u86", 0x0000000, 0x0400000, CRC(9f436ee3) SHA1(e41a9475fd10fd7d15be1665ee2d4e9dcee2d4dd) )
 ROM_END
 
 
 ROM_START( silgolar )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("Gam_Eprm.u72", 0x0000000, 0x0400000, CRC(05861fb2) SHA1(ba3d2e3ab66fd7178289fdc95661f27e08124f32) )
-	ROM_LOAD32_WORD("Gam_Eprm.u73", 0x0000000, 0x0400000, CRC(cffa82f0) SHA1(fe14e1d9bacbcb72ad1bdaf3d4a72eec67311bef) )
-	ROM_LOAD32_WORD("Gam_Eprm.u85", 0x0000000, 0x0400000, CRC(f66f63c4) SHA1(02e669c4f7c3d0cd39b3dff156ab4b05db3bb495) )
+	ROM_LOAD32_WORD("Gam_Eprm.u72", 0x0800002, 0x0400000, CRC(05861fb2) SHA1(ba3d2e3ab66fd7178289fdc95661f27e08124f32) )
+	ROM_LOAD32_WORD("Gam_Eprm.u73", 0x0000002, 0x0400000, CRC(cffa82f0) SHA1(fe14e1d9bacbcb72ad1bdaf3d4a72eec67311bef) )
+	ROM_LOAD32_WORD("Gam_Eprm.u85", 0x0800000, 0x0400000, CRC(f66f63c4) SHA1(02e669c4f7c3d0cd39b3dff156ab4b05db3bb495) )
 	ROM_LOAD32_WORD("Gam_Eprm.u86", 0x0000000, 0x0400000, CRC(d91108fd) SHA1(cea026350f083ed0f061d5049de520d08730a1df) )
 ROM_END
 
@@ -1384,120 +1382,118 @@ ROM_END
 ROM_START( spgcarn )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("Spring Carnival.001", 0x0000000, 0x0400000, CRC(033653f5) SHA1(40705ffb653ad4c6f3cd36c8879c48303c3845f8) )
-	ROM_LOAD32_WORD("Spring Carnival.000", 0x0000000, 0x0400000, CRC(f7783fea) SHA1(4e7b86c0d2728ebc317dce14827a4873402d9bbb) )
+	ROM_LOAD32_WORD("Spring Carnival.001.u73", 0x0000002, 0x0400000, CRC(033653f5) SHA1(40705ffb653ad4c6f3cd36c8879c48303c3845f8) )
+	ROM_LOAD32_WORD("Spring Carnival.000.u86", 0x0000000, 0x0400000, CRC(f7783fea) SHA1(4e7b86c0d2728ebc317dce14827a4873402d9bbb) )
 ROM_END
 
 
 ROM_START( stardrft )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("Star Drifter.001", 0x0000000, 0x0400000, CRC(580340b4) SHA1(4febb22150581a4661bc7ed1ff0662e153de5e2b) )
-	ROM_LOAD32_WORD("Star Drifter.000", 0x0000000, 0x0400000, CRC(7b08a2be) SHA1(2b3d7bb2317cba7b470d68c91918a5777fdb3ed1) )
+	ROM_LOAD32_WORD("Star Drifter.001.u73", 0x0000002, 0x0400000, CRC(580340b4) SHA1(4febb22150581a4661bc7ed1ff0662e153de5e2b) )
+	ROM_LOAD32_WORD("Star Drifter.000.u86", 0x0000000, 0x0400000, CRC(7b08a2be) SHA1(2b3d7bb2317cba7b470d68c91918a5777fdb3ed1) )
 ROM_END
 
 
 ROM_START( sbuk5 )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("Super Bucks 5.003", 0x0000000, 0x0400000, CRC(ebcce486) SHA1(f91db1051d71c5e558a304d60157fa3cfff66c5b) )
-	ROM_LOAD32_WORD("Super Bucks 5.001", 0x0000000, 0x0400000, CRC(39af5809) SHA1(048aef299de220a72bf6a57c6268949197fc738b) )
-	ROM_LOAD32_WORD("Super Bucks 5.002", 0x0000000, 0x0400000, CRC(9114f9e8) SHA1(f7ec058aaaad59aeffc01085673322cb842a5ebb) )
-	ROM_LOAD32_WORD("Super Bucks 5.000", 0x0000000, 0x0400000, CRC(cab68268) SHA1(e10e8c8ce9bfb7ae7f3920303491b24c93d5f716) )
+	ROM_LOAD32_WORD("Super Bucks 5.003.u72", 0x0800002, 0x0400000, CRC(ebcce486) SHA1(f91db1051d71c5e558a304d60157fa3cfff66c5b) )
+	ROM_LOAD32_WORD("Super Bucks 5.001.u73", 0x0000002, 0x0400000, CRC(39af5809) SHA1(048aef299de220a72bf6a57c6268949197fc738b) )
+	ROM_LOAD32_WORD("Super Bucks 5.002.u85", 0x0800000, 0x0400000, CRC(9114f9e8) SHA1(f7ec058aaaad59aeffc01085673322cb842a5ebb) )
+	ROM_LOAD32_WORD("Super Bucks 5.000.u86", 0x0000000, 0x0400000, CRC(cab68268) SHA1(e10e8c8ce9bfb7ae7f3920303491b24c93d5f716) )
 ROM_END
 
 
 ROM_START( swh2ld )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("Sweethearts 2 Lucky Devil.003", 0x0000000, 0x0400000, CRC(94d48b25) SHA1(a879f6d78ff6eb29e5ea2cc71ca86d097fa9d45f) )
-	ROM_LOAD32_WORD("Sweethearts 2 Lucky Devil.001", 0x0000000, 0x0400000, CRC(f5c3d17f) SHA1(297e2da51fb00e0b76f9322149647c4c27ed870e) )
-	ROM_LOAD32_WORD("Sweethearts 2 Lucky Devil.002", 0x0000000, 0x0400000, CRC(f0f8aa94) SHA1(c69f1c807b0e9921eb95c3351bb79897e673ec36) )
-	ROM_LOAD32_WORD("Sweethearts 2 Lucky Devil.000", 0x0000000, 0x0400000, CRC(dedd99b0) SHA1(23c4e178d00788516c16109add772dba24f98a54) )
+	ROM_LOAD32_WORD("Sweethearts 2 Lucky Devil.003.u72", 0x0800002, 0x0400000, CRC(94d48b25) SHA1(a879f6d78ff6eb29e5ea2cc71ca86d097fa9d45f) )
+	ROM_LOAD32_WORD("Sweethearts 2 Lucky Devil.001.u73", 0x0000002, 0x0400000, CRC(f5c3d17f) SHA1(297e2da51fb00e0b76f9322149647c4c27ed870e) )
+	ROM_LOAD32_WORD("Sweethearts 2 Lucky Devil.002.u85", 0x0800000, 0x0400000, CRC(f0f8aa94) SHA1(c69f1c807b0e9921eb95c3351bb79897e673ec36) )
+	ROM_LOAD32_WORD("Sweethearts 2 Lucky Devil.000.u86", 0x0000000, 0x0400000, CRC(dedd99b0) SHA1(23c4e178d00788516c16109add772dba24f98a54) )
 ROM_END
 
 
 ROM_START( tahitim )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("U73.001", 0x0000000, 0x0400000, CRC(b08da2ce) SHA1(1adb4f6e134df479be0f90d2459b009d93386ac1) )
-	ROM_LOAD32_WORD("U86.000", 0x0000000, 0x0400000, CRC(735d7642) SHA1(5f4258bf541728f7c7fe3dd65e715d68b3ade968) )
+	ROM_LOAD32_WORD("001.u73", 0x0000002, 0x0400000, CRC(b08da2ce) SHA1(1adb4f6e134df479be0f90d2459b009d93386ac1) )
+	ROM_LOAD32_WORD("000.u86", 0x0000000, 0x0400000, CRC(735d7642) SHA1(5f4258bf541728f7c7fe3dd65e715d68b3ade968) )
 ROM_END
 
 
 ROM_START( thaiprar )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("Thai_Princess_1of4_U86.000", 0x0000000, 0x0400000, CRC(609b3112) SHA1(77648426c7fed2e39d48d4f1ced524067bf0bb1a) )
-	ROM_LOAD32_WORD("Thai_Princess_2of4_U73.001", 0x0000000, 0x0400000, CRC(a8346fea) SHA1(d97af71bb2c93ed517fccac605e9cfff9ec5590b) )
-	ROM_LOAD32_WORD("Thai_Princess_3of4_U85.002", 0x0000000, 0x0400000, CRC(92fda7b5) SHA1(9a50ab3d1d18814093f5457a07a52f7e19fc97e7) )
-	ROM_LOAD32_WORD("Thai_Princess_4of4_U72.003", 0x0000000, 0x0400000, CRC(640bf878) SHA1(910dce13181243a6baace6dd1807d391b3d9767f) )
+	ROM_LOAD32_WORD("Thai_Princess_1of4_000.u86", 0x0000000, 0x0400000, CRC(609b3112) SHA1(77648426c7fed2e39d48d4f1ced524067bf0bb1a) )
+	ROM_LOAD32_WORD("Thai_Princess_2of4_001.u73", 0x0000002, 0x0400000, CRC(a8346fea) SHA1(d97af71bb2c93ed517fccac605e9cfff9ec5590b) )
+	ROM_LOAD32_WORD("Thai_Princess_3of4_002.u85", 0x0800000, 0x0400000, CRC(92fda7b5) SHA1(9a50ab3d1d18814093f5457a07a52f7e19fc97e7) )
+	ROM_LOAD32_WORD("Thai_Princess_4of4_003.u72", 0x0800002, 0x0400000, CRC(640bf878) SHA1(910dce13181243a6baace6dd1807d391b3d9767f) )
 ROM_END
 
 
 ROM_START( gldnflc )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("The Golden Fleece.003", 0x0000000, 0x0400000, CRC(521e2429) SHA1(0cfadf64341574eaec6fc89ecccfa2f02c583dd1) )
-	ROM_LOAD32_WORD("The Golden Fleece.001", 0x0000000, 0x0400000, CRC(35e72b56) SHA1(c6013aa3b6ea243f057aedab67feeed16ee39537) )
-	ROM_LOAD32_WORD("The Golden Fleece.002", 0x0000000, 0x0400000, CRC(f17c5c40) SHA1(32225a11d529c0312b27ed838badebed7d96469b) )
-	ROM_LOAD32_WORD("The Golden Fleece.000", 0x0000000, 0x0400000, CRC(c3d4d641) SHA1(b46d82af862c96068ddd4f530b2229634161b209) )
+	ROM_LOAD32_WORD("The Golden Fleece.003.u72", 0x0800002, 0x0400000, CRC(521e2429) SHA1(0cfadf64341574eaec6fc89ecccfa2f02c583dd1) )
+	ROM_LOAD32_WORD("The Golden Fleece.001.u73", 0x0000002, 0x0400000, CRC(35e72b56) SHA1(c6013aa3b6ea243f057aedab67feeed16ee39537) )
+	ROM_LOAD32_WORD("The Golden Fleece.002.u85", 0x0800000, 0x0400000, CRC(f17c5c40) SHA1(32225a11d529c0312b27ed838badebed7d96469b) )
+	ROM_LOAD32_WORD("The Golden Fleece.000.u86", 0x0000000, 0x0400000, CRC(c3d4d641) SHA1(b46d82af862c96068ddd4f530b2229634161b209) )
 ROM_END
 
 
 ROM_START( thndrhrt )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("Thunderheart.001", 0x0000000, 0x0400000, CRC(d867ff79) SHA1(740a177a8d1ecf925583a9264b5404640a5f2289) )
-	ROM_LOAD32_WORD("Thunderheart.000", 0x0000000, 0x0400000, CRC(2b84ed7b) SHA1(9919f9526d8294eeabda40697a34878484f6cef5) )
-	ROM_LOAD32_WORD("Thunderheart U86.bin", 0x0000000, 0x0400000, CRC(2b84ed7b) SHA1(9919f9526d8294eeabda40697a34878484f6cef5) )
-	ROM_LOAD32_WORD("Thunderheart U73.bin", 0x0000000, 0x0400000, CRC(d867ff79) SHA1(740a177a8d1ecf925583a9264b5404640a5f2289) )
+	ROM_LOAD32_WORD("Thunderheart.001.u73", 0x0000002, 0x0400000, CRC(d867ff79) SHA1(740a177a8d1ecf925583a9264b5404640a5f2289) )
+	ROM_LOAD32_WORD("Thunderheart.000.u86", 0x0000000, 0x0400000, CRC(2b84ed7b) SHA1(9919f9526d8294eeabda40697a34878484f6cef5) )
 ROM_END
 
 
 ROM_START( tigresar )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("Tigress.000", 0x0000000, 0x0400000, CRC(d1ff02f7) SHA1(8e8f1c4ed3c01fc62011b1bd21f53314e345f10f) )
-	ROM_LOAD32_WORD("Tigress.001", 0x0000000, 0x0400000, CRC(cc239965) SHA1(f5d5f1e3db4f0ae3cd1dbe2c88aedf65cc820d4e) )
+	ROM_LOAD32_WORD("Tigress.000.u86", 0x0000000, 0x0400000, CRC(d1ff02f7) SHA1(8e8f1c4ed3c01fc62011b1bd21f53314e345f10f) )
+	ROM_LOAD32_WORD("Tigress.001.u73", 0x0000002, 0x0400000, CRC(cc239965) SHA1(f5d5f1e3db4f0ae3cd1dbe2c88aedf65cc820d4e) )
 ROM_END
 
 
 ROM_START( topshtar )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("Top_Shot.000", 0x0000000, 0x0400000, CRC(798200b2) SHA1(e753f8c8c26e30ab36705f748c01b90bcf166d82) )
-	ROM_LOAD32_WORD("Top_Shot.001", 0x0000000, 0x0400000, CRC(486c5979) SHA1(0ece42200f31daf471b3e1e789de8b95390c4827) )
+	ROM_LOAD32_WORD("Top_Shot.000.u86", 0x0000000, 0x0400000, CRC(798200b2) SHA1(e753f8c8c26e30ab36705f748c01b90bcf166d82) )
+	ROM_LOAD32_WORD("Top_Shot.001.u73", 0x0000002, 0x0400000, CRC(486c5979) SHA1(0ece42200f31daf471b3e1e789de8b95390c4827) )
 ROM_END
 
 
 ROM_START( torgods )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("Torch Of The Gods.000", 0x0000000, 0x0400000, CRC(3c7da6e8) SHA1(ff2fb056fd26d3578216e4942b6234f4523e1d6a) )
-	ROM_LOAD32_WORD("Torch Of The Gods.001", 0x0000000, 0x0400000, CRC(d3f27e13) SHA1(36cd1984139855170af3b23ab32b1769430809d5) )
-	ROM_LOAD32_WORD("Torch Of The Gods.002", 0x0000000, 0x0400000, CRC(9f7013e0) SHA1(76f948ba08152cf623559c3c8f021861757c4872) )
-	ROM_LOAD32_WORD("Torch Of The Gods.003", 0x0000000, 0x0400000, CRC(2dc81027) SHA1(3d426758875e87e677ab446da12532e2a4bc4246) )
+	ROM_LOAD32_WORD("Torch Of The Gods.000.u86", 0x0000000, 0x0400000, CRC(3c7da6e8) SHA1(ff2fb056fd26d3578216e4942b6234f4523e1d6a) )
+	ROM_LOAD32_WORD("Torch Of The Gods.001.u73", 0x0000002, 0x0400000, CRC(d3f27e13) SHA1(36cd1984139855170af3b23ab32b1769430809d5) )
+	ROM_LOAD32_WORD("Torch Of The Gods.002.u85", 0x0800000, 0x0400000, CRC(9f7013e0) SHA1(76f948ba08152cf623559c3c8f021861757c4872) )
+	ROM_LOAD32_WORD("Torch Of The Gods.003.u72", 0x0800002, 0x0400000, CRC(2dc81027) SHA1(3d426758875e87e677ab446da12532e2a4bc4246) )
 ROM_END
 
 
 ROM_START( torpdice )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("U72.003", 0x0000000, 0x0400000, CRC(f2ccd55e) SHA1(24738035abc26459d3d06831c907da98aea9c257) )
-	ROM_LOAD32_WORD("U73.001", 0x0000000, 0x0400000, CRC(e66f5672) SHA1(9bc92c061fcaf8803878941b9b74a7bc41beb299) )
-	ROM_LOAD32_WORD("U85.002", 0x0000000, 0x0400000, CRC(9793d2c1) SHA1(50e9d644b6519f941781b726a8d566cae6bb262e) )
-	ROM_LOAD32_WORD("U86.000", 0x0000000, 0x0400000, CRC(2a3ae479) SHA1(30d5df8eb75775831d4b0792661168288cedbb16) )
+	ROM_LOAD32_WORD("003.u72", 0x0800002, 0x0400000, CRC(f2ccd55e) SHA1(24738035abc26459d3d06831c907da98aea9c257) )
+	ROM_LOAD32_WORD("001.u73", 0x0000002, 0x0400000, CRC(e66f5672) SHA1(9bc92c061fcaf8803878941b9b74a7bc41beb299) )
+	ROM_LOAD32_WORD("002.u85", 0x0800000, 0x0400000, CRC(9793d2c1) SHA1(50e9d644b6519f941781b726a8d566cae6bb262e) )
+	ROM_LOAD32_WORD("000.u86", 0x0000000, 0x0400000, CRC(2a3ae479) SHA1(30d5df8eb75775831d4b0792661168288cedbb16) )
 ROM_END
 
 
 ROM_START( turtrea )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("u72.003", 0x0000000, 0x0400000, CRC(f864fe2e) SHA1(9aa16c4cf3936841a1152418aca7a5dd3ad5a2b3) )
-	ROM_LOAD32_WORD("u73.001", 0x0000000, 0x0400000, CRC(e00da684) SHA1(4d66d48644008ff998398af1cc970ed9a1504607) )
-	ROM_LOAD32_WORD("u85.002", 0x0000000, 0x0400000, CRC(512fcb98) SHA1(ccf5bfe8cb9dcd3d2e5e4f59033816ded04f2148) )
-	ROM_LOAD32_WORD("u86.000", 0x0000000, 0x0400000, CRC(1b69bb51) SHA1(b510fc80616f3acbc8264ca188c5bc85bce38e5e) )
+	ROM_LOAD32_WORD("003.u72", 0x0800002, 0x0400000, CRC(f864fe2e) SHA1(9aa16c4cf3936841a1152418aca7a5dd3ad5a2b3) )
+	ROM_LOAD32_WORD("001.u73", 0x0000002, 0x0400000, CRC(e00da684) SHA1(4d66d48644008ff998398af1cc970ed9a1504607) )
+	ROM_LOAD32_WORD("002.u85", 0x0800000, 0x0400000, CRC(512fcb98) SHA1(ccf5bfe8cb9dcd3d2e5e4f59033816ded04f2148) )
+	ROM_LOAD32_WORD("000.u86", 0x0000000, 0x0400000, CRC(1b69bb51) SHA1(b510fc80616f3acbc8264ca188c5bc85bce38e5e) )
 ROM_END
 
 
@@ -1505,68 +1501,66 @@ ROM_END
 ROM_START( venetian )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("Venetian_Nights_1of4_U86.000", 0x0000000, 0x0400000, CRC(57a2a113) SHA1(98589e00803814fe51161d69d77b47ff2b6ac406) )
-	ROM_LOAD32_WORD("Venetian_Nights_2of4_U73.001", 0x0000000, 0x0400000, CRC(c9cfb52a) SHA1(7df67226c69e4569216e5200364ff14fd162f0a7) )
-	ROM_LOAD32_WORD("Venetian_Nights_3of4_U85.002", 0x0000000, 0x0400000, CRC(e845f6ee) SHA1(76a234e4b224d56d4f9ceb37d8d175413d4e6fe9) )
-	ROM_LOAD32_WORD("Venetian_Nights_4of4_U72.003", 0x0000000, 0x0400000, CRC(7a635ef0) SHA1(d0c0746b58ae0726f18e90cc4b20d0e68f3abd86) )
+	ROM_LOAD32_WORD("Venetian_Nights_1of4_000.u86", 0x0000000, 0x0400000, CRC(57a2a113) SHA1(98589e00803814fe51161d69d77b47ff2b6ac406) )
+	ROM_LOAD32_WORD("Venetian_Nights_2of4_001.u73", 0x0000002, 0x0400000, CRC(c9cfb52a) SHA1(7df67226c69e4569216e5200364ff14fd162f0a7) )
+	ROM_LOAD32_WORD("Venetian_Nights_3of4_002.u85", 0x0800000, 0x0400000, CRC(e845f6ee) SHA1(76a234e4b224d56d4f9ceb37d8d175413d4e6fe9) )
+	ROM_LOAD32_WORD("Venetian_Nights_4of4_003.u72", 0x0800002, 0x0400000, CRC(7a635ef0) SHA1(d0c0746b58ae0726f18e90cc4b20d0e68f3abd86) )
 ROM_END
 
 
 ROM_START( witgold )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("U72.003", 0x0000000, 0x0400000, CRC(584050fc) SHA1(014889e1bf3fa38c052073c374b47684be717949) )
-	ROM_LOAD32_WORD("U73.001", 0x0000000, 0x0400000, CRC(d8b5ccb3) SHA1(7974d68d594a2b283680cc440d69b106bd539819) )
-	ROM_LOAD32_WORD("U85.002", 0x0000000, 0x0400000, CRC(f9554ab0) SHA1(c79d95ee339f139d0a62550e926acd6c1d7d534b) )
-	ROM_LOAD32_WORD("U86.000", 0x0000000, 0x0400000, CRC(d537f1f1) SHA1(49825365593238f757e3efecbe9fe02a06acd321) )
+	ROM_LOAD32_WORD("003.u72", 0x0800002, 0x0400000, CRC(584050fc) SHA1(014889e1bf3fa38c052073c374b47684be717949) )
+	ROM_LOAD32_WORD("001.u73", 0x0000002, 0x0400000, CRC(d8b5ccb3) SHA1(7974d68d594a2b283680cc440d69b106bd539819) )
+	ROM_LOAD32_WORD("002.u85", 0x0800000, 0x0400000, CRC(f9554ab0) SHA1(c79d95ee339f139d0a62550e926acd6c1d7d534b) )
+	ROM_LOAD32_WORD("000.u86", 0x0000000, 0x0400000, CRC(d537f1f1) SHA1(49825365593238f757e3efecbe9fe02a06acd321) )
 ROM_END
 
 
 ROM_START( wikwin2 )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("Wicked Winnings II .001", 0x0000000, 0x0400000, CRC(6662912d) SHA1(017e1684de64308b035b817b6fad954be538b78c) )
-	ROM_LOAD32_WORD("Wicked Winnings II U86.000", 0x0000000, 0x0400000, CRC(226c8d1c) SHA1(37769691d1b7e308cbd1d857e8695f1e129a6722) )
+	ROM_LOAD32_WORD("Wicked Winnings II.001.u73", 0x0000002, 0x0400000, CRC(6662912d) SHA1(017e1684de64308b035b817b6fad954be538b78c) )
+	ROM_LOAD32_WORD("Wicked Winnings II 000.u86", 0x0000000, 0x0400000, CRC(226c8d1c) SHA1(37769691d1b7e308cbd1d857e8695f1e129a6722) )
 ROM_END
 
 ROM_START( wldgoos )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("Wild_Goose_U72.003", 0x0000000, 0x0400000, CRC(ba887abf) SHA1(3d4e529bf2fed83506ef947ade08aeff7ad78611) )
-	ROM_LOAD32_WORD("Wild_Goose_U73.001", 0x0000000, 0x0400000, CRC(5f9ab2a5) SHA1(f55dcc32463e395f1380c4fa456b39f77c27642b) )
-	ROM_LOAD32_WORD("Wild_Goose_U85.002", 0x0000000, 0x0400000, CRC(054d3f78) SHA1(636f0284508e77d21dc9b50d59f1d7b8ed686ed0) )
-	ROM_LOAD32_WORD("Wild_Goose_U86.000", 0x0000000, 0x0400000, CRC(0925481f) SHA1(0dfc1bbe13752fcfd270fb3c096a3612cfa2fe9a) )
+	ROM_LOAD32_WORD("Wild_Goose_003.u72", 0x0800002, 0x0400000, CRC(ba887abf) SHA1(3d4e529bf2fed83506ef947ade08aeff7ad78611) )
+	ROM_LOAD32_WORD("Wild_Goose_001.u73", 0x0000002, 0x0400000, CRC(5f9ab2a5) SHA1(f55dcc32463e395f1380c4fa456b39f77c27642b) )
+	ROM_LOAD32_WORD("Wild_Goose_002.u85", 0x0800000, 0x0400000, CRC(054d3f78) SHA1(636f0284508e77d21dc9b50d59f1d7b8ed686ed0) )
+	ROM_LOAD32_WORD("Wild_Goose_000.u86", 0x0000000, 0x0400000, CRC(0925481f) SHA1(0dfc1bbe13752fcfd270fb3c096a3612cfa2fe9a) )
 ROM_END
 
 
 ROM_START( wldpan2 )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("Wild_panda.001", 0x0000000, 0x0400000, CRC(46e28dff) SHA1(b1fd7c0d0c814f04b2bd6f35835d1d1d41aab62c) )
-	ROM_LOAD32_WORD("Wild_panda.002", 0x0000000, 0x0400000, CRC(0bb16a0b) SHA1(6abbbb9abac53b543e92ccdead9770271d28074e) )
-	ROM_LOAD32_WORD("Wild_panda.003", 0x0000000, 0x0400000, CRC(11e2167f) SHA1(812ed09436c2899780791ca0ada5f3bbec4a3a88) )
-	ROM_LOAD32_WORD("Wild_panda.000", 0x0000000, 0x0400000, CRC(d3ebdc8a) SHA1(fc27c96769cc3ba02e7ad4baf6055f7902e50081) )
-	ROM_LOAD32_WORD("Wild Panda.epm", 0x0000000, 0x0000200, CRC(6bb77668) SHA1(13805e4ace96154e14658e9d1c303b97841437f0) )
-	ROM_LOAD32_WORD("Wild Panda.srm", 0x0000000, 0x0080000, CRC(2248a9f5) SHA1(8627e77e81ee6056ba6495cbda155190b36984a4) )
+	ROM_LOAD32_WORD("Wild_panda.001.u73", 0x0000002, 0x0400000, CRC(46e28dff) SHA1(b1fd7c0d0c814f04b2bd6f35835d1d1d41aab62c) )
+	ROM_LOAD32_WORD("Wild_panda.002.u85", 0x0800000, 0x0400000, CRC(0bb16a0b) SHA1(6abbbb9abac53b543e92ccdead9770271d28074e) )
+	ROM_LOAD32_WORD("Wild_panda.003.u72", 0x0800002, 0x0400000, CRC(11e2167f) SHA1(812ed09436c2899780791ca0ada5f3bbec4a3a88) )
+	ROM_LOAD32_WORD("Wild_panda.000.u86", 0x0000000, 0x0400000, CRC(d3ebdc8a) SHA1(fc27c96769cc3ba02e7ad4baf6055f7902e50081) )
 ROM_END
 
 
 ROM_START( wldstal2 )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("Wild Stalon.003", 0x0000000, 0x0400000, CRC(0f4de65a) SHA1(232406f335786a045ab1833db50465ed476dfffe) )
-	ROM_LOAD32_WORD("Wild Stalon.000", 0x0000000, 0x0400000, CRC(b3171fd7) SHA1(d3ac53ba6bf6cc9ea3dc0f83e8a3eecf86abad55) )
-	ROM_LOAD32_WORD("Wild Stalon.001", 0x0000000, 0x0400000, CRC(ceeff2d5) SHA1(04d5139c0ce256eb0a0734184ccc8460d2ac1120) )
-	ROM_LOAD32_WORD("Wild Stalon.002", 0x0000000, 0x0400000, CRC(6fee0413) SHA1(242f60d89eb6b44ef968f482070e0a81d2ad5fcf) )
+	ROM_LOAD32_WORD("Wild Stalon.003.u72", 0x0800002, 0x0400000, CRC(0f4de65a) SHA1(232406f335786a045ab1833db50465ed476dfffe) )
+	ROM_LOAD32_WORD("Wild Stalon.000.u86", 0x0000000, 0x0400000, CRC(b3171fd7) SHA1(d3ac53ba6bf6cc9ea3dc0f83e8a3eecf86abad55) )
+	ROM_LOAD32_WORD("Wild Stalon.001.u73", 0x0000002, 0x0400000, CRC(ceeff2d5) SHA1(04d5139c0ce256eb0a0734184ccc8460d2ac1120) )
+	ROM_LOAD32_WORD("Wild Stalon.002.u85", 0x0800000, 0x0400000, CRC(6fee0413) SHA1(242f60d89eb6b44ef968f482070e0a81d2ad5fcf) )
 ROM_END
 
 
 ROM_START( wtepee )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("Gam_Eprm.u72", 0x0000000, 0x0400000, CRC(0c5c51c2) SHA1(6423e160355ad0380cbb46e7462f913a67e9b29d) )
-	ROM_LOAD32_WORD("Gam_Eprm.u73", 0x0000000, 0x0400000, CRC(6c0a4268) SHA1(c18ad70332ec300b227edfc684db97d517031ff1) )
-	ROM_LOAD32_WORD("Gam_Eprm.u85", 0x0000000, 0x0400000, CRC(e5492c9b) SHA1(bd71198f24adab2841f177598d1ed8ae07aeb971) )
+	ROM_LOAD32_WORD("Gam_Eprm.u72", 0x0800002, 0x0400000, CRC(0c5c51c2) SHA1(6423e160355ad0380cbb46e7462f913a67e9b29d) )
+	ROM_LOAD32_WORD("Gam_Eprm.u73", 0x0000002, 0x0400000, CRC(6c0a4268) SHA1(c18ad70332ec300b227edfc684db97d517031ff1) )
+	ROM_LOAD32_WORD("Gam_Eprm.u85", 0x0800000, 0x0400000, CRC(e5492c9b) SHA1(bd71198f24adab2841f177598d1ed8ae07aeb971) )
 	ROM_LOAD32_WORD("Gam_Eprm.u86", 0x0000000, 0x0400000, CRC(8c38fa9c) SHA1(0f64da87271f90309b0945403cc24fdf82c5c5a2) )
 ROM_END
 
@@ -1574,9 +1568,9 @@ ROM_END
 ROM_START( wwaratah )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("Gam_Eprm.u72", 0x0000000, 0x0400000, CRC(90813234) SHA1(80461a72cfcd056f8af7559f8f5e44447631ff0c) )
-	ROM_LOAD32_WORD("Gam_Eprm.u73", 0x0000000, 0x0400000, CRC(9df889d7) SHA1(3375a0dd56367c8aff6a07d54769715e7f29f6c4) )
-	ROM_LOAD32_WORD("Gam_Eprm.u85", 0x0000000, 0x0400000, CRC(c86d4145) SHA1(6b52d5d875ac4f786a2cb664dbb54c0a7cf68014) )
+	ROM_LOAD32_WORD("Gam_Eprm.u72", 0x0800002, 0x0400000, CRC(90813234) SHA1(80461a72cfcd056f8af7559f8f5e44447631ff0c) )
+	ROM_LOAD32_WORD("Gam_Eprm.u73", 0x0000002, 0x0400000, CRC(9df889d7) SHA1(3375a0dd56367c8aff6a07d54769715e7f29f6c4) )
+	ROM_LOAD32_WORD("Gam_Eprm.u85", 0x0800000, 0x0400000, CRC(c86d4145) SHA1(6b52d5d875ac4f786a2cb664dbb54c0a7cf68014) )
 	ROM_LOAD32_WORD("Gam_Eprm.u86", 0x0000000, 0x0400000, CRC(42075131) SHA1(855822a44cf65f2bdd8c88f89e75cdac2f2ddf89) )
 ROM_END
 
@@ -1584,9 +1578,9 @@ ROM_END
 ROM_START( wwaysar )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("Gam_Eprm.u72", 0x0000000, 0x0400000, CRC(acce8d74) SHA1(e22e9611e9a221bd5dfaad3d9feece1646bebe02) )
-	ROM_LOAD32_WORD("Gam_Eprm.u73", 0x0000000, 0x0400000, CRC(526ef495) SHA1(ca7df6ae32822d1205ee01e6970af428c515d940) )
-	ROM_LOAD32_WORD("Gam_Eprm.u85", 0x0000000, 0x0400000, CRC(81e8e5ad) SHA1(612b2fd4506f99ef946e10be2db82e50fcf6083f) )
+	ROM_LOAD32_WORD("Gam_Eprm.u72", 0x0800002, 0x0400000, CRC(acce8d74) SHA1(e22e9611e9a221bd5dfaad3d9feece1646bebe02) )
+	ROM_LOAD32_WORD("Gam_Eprm.u73", 0x0000002, 0x0400000, CRC(526ef495) SHA1(ca7df6ae32822d1205ee01e6970af428c515d940) )
+	ROM_LOAD32_WORD("Gam_Eprm.u85", 0x0800000, 0x0400000, CRC(81e8e5ad) SHA1(612b2fd4506f99ef946e10be2db82e50fcf6083f) )
 	ROM_LOAD32_WORD("Gam_Eprm.u86", 0x0000000, 0x0400000, CRC(ea4dd6db) SHA1(ee07fbcc9689cdb5e96e6259b630ff1229e2cad6) )
 ROM_END
 
@@ -1594,11 +1588,11 @@ ROM_END
 ROM_START( wwaysll )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("Gam_Eprm.u71", 0x0000000, 0x0400000, CRC(e8f8ffb1) SHA1(3aa4f8d959e9671ae93c9946b5420d55c45b1bbc) )
-	ROM_LOAD32_WORD("Gam_Eprm.u72", 0x0000000, 0x0400000, CRC(944dc1ec) SHA1(7dd2b14eb0af7babc9de09f247776f4a24d53e6c) )
-	ROM_LOAD32_WORD("Gam_Eprm.u73", 0x0000000, 0x0400000, CRC(5663bb95) SHA1(0df425bb4130079757fbbc6b5532c2f6a1a32920) )
-	ROM_LOAD32_WORD("Gam_Eprm.u84", 0x0000000, 0x0400000, CRC(0399bc1d) SHA1(19cd298d439dddac482c1d7f1fd7446900b39c46) )
-	ROM_LOAD32_WORD("Gam_Eprm.u85", 0x0000000, 0x0400000, CRC(6a8efdf2) SHA1(38b955755bbc2f2a6c8c987b0cae92d314d727c9) )
+	ROM_LOAD32_WORD("Gam_Eprm.u71", 0x1000002, 0x0400000, CRC(e8f8ffb1) SHA1(3aa4f8d959e9671ae93c9946b5420d55c45b1bbc) )
+	ROM_LOAD32_WORD("Gam_Eprm.u72", 0x0800002, 0x0400000, CRC(944dc1ec) SHA1(7dd2b14eb0af7babc9de09f247776f4a24d53e6c) )
+	ROM_LOAD32_WORD("Gam_Eprm.u73", 0x0000002, 0x0400000, CRC(5663bb95) SHA1(0df425bb4130079757fbbc6b5532c2f6a1a32920) )
+	ROM_LOAD32_WORD("Gam_Eprm.u84", 0x1000000, 0x0400000, CRC(0399bc1d) SHA1(19cd298d439dddac482c1d7f1fd7446900b39c46) )
+	ROM_LOAD32_WORD("Gam_Eprm.u85", 0x0800000, 0x0400000, CRC(6a8efdf2) SHA1(38b955755bbc2f2a6c8c987b0cae92d314d727c9) )
 	ROM_LOAD32_WORD("Gam_Eprm.u86", 0x0000000, 0x0400000, CRC(c8dffeef) SHA1(20d710356282c434523c5828fdb56e3da37d3371) )
 ROM_END
 
@@ -1606,10 +1600,10 @@ ROM_END
 ROM_START( zorrojp )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("30130611_ZORRO_743.U72.003", 0x0000000, 0x0400000, CRC(cc5616af) SHA1(94d1d36b76e2587caa2c60ea70c9206580dc53d5) )
-	ROM_LOAD32_WORD("30130611_ZORRO_743.U73.001", 0x0000000, 0x0400000, CRC(0bad02dc) SHA1(dfe495b5aeb75593d52669cd86d91f7e917bc3b0) )
-	ROM_LOAD32_WORD("30130611_ZORRO_743.U85.002", 0x0000000, 0x0400000, CRC(68da9660) SHA1(dc6ba4c9392bd6efd72bf996d016503677ea8622) )
-	ROM_LOAD32_WORD("30130611_ZORRO_743.U86.000", 0x0000000, 0x0400000, CRC(adf787e0) SHA1(42cfeb3ad42bf255a9be5a629a71bababbbb0147) )
+	ROM_LOAD32_WORD("30130611_ZORRO_743.003.u72", 0x0800002, 0x0400000, CRC(cc5616af) SHA1(94d1d36b76e2587caa2c60ea70c9206580dc53d5) )
+	ROM_LOAD32_WORD("30130611_ZORRO_743.001.u73", 0x0000002, 0x0400000, CRC(0bad02dc) SHA1(dfe495b5aeb75593d52669cd86d91f7e917bc3b0) )
+	ROM_LOAD32_WORD("30130611_ZORRO_743.002.u85", 0x0800000, 0x0400000, CRC(68da9660) SHA1(dc6ba4c9392bd6efd72bf996d016503677ea8622) )
+	ROM_LOAD32_WORD("30130611_ZORRO_743.000.u86", 0x0000000, 0x0400000, CRC(adf787e0) SHA1(42cfeb3ad42bf255a9be5a629a71bababbbb0147) )
 ROM_END
 
 
@@ -1617,10 +1611,10 @@ ROM_END
 ROM_START( 5draga )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("5dragons_U72.bin", 0x0000000, 0x0400000, CRC(e81d47fe) SHA1(f5730f9b5fa9a4492289ddcbc8e88d0a62771667) )
-	ROM_LOAD32_WORD("5dragons_U73.bin", 0x0000000, 0x0400000, CRC(23cfdacd) SHA1(7efda9cc67214f68d674f1110cfb38fd9bbc4548) )
-	ROM_LOAD32_WORD("5dragons_U85.bin", 0x0000000, 0x0400000, CRC(12803341) SHA1(4b640c3f270eaa77ce71e87f83e603083bcae489) )
-	ROM_LOAD32_WORD("5dragons_U86.bin", 0x0000000, 0x0400000, CRC(ac83a71b) SHA1(1d6a3617e882e86100b939d62db7a7e1f86d2178) )
+	ROM_LOAD32_WORD("5dragons_.u72", 0x0800002, 0x0400000, CRC(e81d47fe) SHA1(f5730f9b5fa9a4492289ddcbc8e88d0a62771667) )
+	ROM_LOAD32_WORD("5dragons_.u73", 0x0000002, 0x0400000, CRC(23cfdacd) SHA1(7efda9cc67214f68d674f1110cfb38fd9bbc4548) )
+	ROM_LOAD32_WORD("5dragons_.u85", 0x0800000, 0x0400000, CRC(12803341) SHA1(4b640c3f270eaa77ce71e87f83e603083bcae489) )
+	ROM_LOAD32_WORD("5dragons_.u86", 0x0000000, 0x0400000, CRC(ac83a71b) SHA1(1d6a3617e882e86100b939d62db7a7e1f86d2178) )
 ROM_END
 
 
@@ -1629,11 +1623,11 @@ ROM_END
 ROM_START( 5koipp )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("Gam_Eprm.u71", 0x0000000, 0x0400000, CRC(460e7ddb) SHA1(e6326523fb7c1c44cd0f01cd43d59d86a72c0d1d) )
-	ROM_LOAD32_WORD("Gam_Eprm.u72", 0x0000000, 0x0400000, CRC(1a1140f2) SHA1(c097bcdcbd61edd15382f7becc32384780fb6e8e) )
-	ROM_LOAD32_WORD("Gam_Eprm.u73", 0x0000000, 0x0400000, CRC(13fbfa4d) SHA1(8a9ba4fcea44f1ababa9ee89e36c8cd63b935ac5) )
-	ROM_LOAD32_WORD("Gam_Eprm.u84", 0x0000000, 0x0400000, CRC(413063ce) SHA1(4e933e1c0e576b028c16ab6f4630ee61575a5850) )
-	ROM_LOAD32_WORD("Gam_Eprm.u85", 0x0000000, 0x0400000, CRC(2ce103f8) SHA1(eb457c0812f08e3a0b4450e44a80c5e13c131ea9) )
+	ROM_LOAD32_WORD("Gam_Eprm.u71", 0x1000002, 0x0400000, CRC(460e7ddb) SHA1(e6326523fb7c1c44cd0f01cd43d59d86a72c0d1d) )
+	ROM_LOAD32_WORD("Gam_Eprm.u72", 0x0800002, 0x0400000, CRC(1a1140f2) SHA1(c097bcdcbd61edd15382f7becc32384780fb6e8e) )
+	ROM_LOAD32_WORD("Gam_Eprm.u73", 0x0000002, 0x0400000, CRC(13fbfa4d) SHA1(8a9ba4fcea44f1ababa9ee89e36c8cd63b935ac5) )
+	ROM_LOAD32_WORD("Gam_Eprm.u84", 0x1000000, 0x0400000, CRC(413063ce) SHA1(4e933e1c0e576b028c16ab6f4630ee61575a5850) )
+	ROM_LOAD32_WORD("Gam_Eprm.u85", 0x0800000, 0x0400000, CRC(2ce103f8) SHA1(eb457c0812f08e3a0b4450e44a80c5e13c131ea9) )
 	ROM_LOAD32_WORD("Gam_Eprm.u86", 0x0000000, 0x0400000, CRC(a245db85) SHA1(a03cf7978531edbc0ec1ba97e12fd59589caa90d) )
 ROM_END
 
@@ -1642,11 +1636,11 @@ ROM_END
 ROM_START( amzteml )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("Gam_Eprm.u71", 0x0000000, 0x0400000, CRC(8b6ef913) SHA1(7cc8688cb9c6096a81ad21cdc046db5bd0134356) )
-	ROM_LOAD32_WORD("Gam_Eprm.u72", 0x0000000, 0x0400000, CRC(ca0b23ac) SHA1(4514e691f5926608a1624a91751f50469e234ed4) )
-	ROM_LOAD32_WORD("Gam_Eprm.u73", 0x0000000, 0x0400000, CRC(b11fb5a0) SHA1(ebd78bcf1a06878c8a50fe078379f590ec6bc3e2) )
-	ROM_LOAD32_WORD("Gam_Eprm.u84", 0x0000000, 0x0400000, CRC(aa689460) SHA1(111130f65ad4bb235e8722befb41b947d7d47c4e) )
-	ROM_LOAD32_WORD("Gam_Eprm.u85", 0x0000000, 0x0400000, CRC(887449d7) SHA1(a1b00d8205f9eb45ad2b3ec73422bc06673d68e0) )
+	ROM_LOAD32_WORD("Gam_Eprm.u71", 0x1000002, 0x0400000, CRC(8b6ef913) SHA1(7cc8688cb9c6096a81ad21cdc046db5bd0134356) )
+	ROM_LOAD32_WORD("Gam_Eprm.u72", 0x0800002, 0x0400000, CRC(ca0b23ac) SHA1(4514e691f5926608a1624a91751f50469e234ed4) )
+	ROM_LOAD32_WORD("Gam_Eprm.u73", 0x0000002, 0x0400000, CRC(b11fb5a0) SHA1(ebd78bcf1a06878c8a50fe078379f590ec6bc3e2) )
+	ROM_LOAD32_WORD("Gam_Eprm.u84", 0x1000000, 0x0400000, CRC(aa689460) SHA1(111130f65ad4bb235e8722befb41b947d7d47c4e) )
+	ROM_LOAD32_WORD("Gam_Eprm.u85", 0x0800000, 0x0400000, CRC(887449d7) SHA1(a1b00d8205f9eb45ad2b3ec73422bc06673d68e0) )
 	ROM_LOAD32_WORD("Gam_Eprm.u86", 0x0000000, 0x0400000, CRC(c001c1e7) SHA1(bf8958325f90d2a04a6c86075df664b29b7073ca) )
 ROM_END
 
@@ -1662,9 +1656,9 @@ ROM_END
 ROM_START( buffaloa )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("buffalo.u72", 0x0000000, 0x0400000, CRC(2a35e7df) SHA1(112ea1872bc3b8533e1339f8eb19ef9ea0740773) )
-	ROM_LOAD32_WORD("buffalo.u73", 0x0000000, 0x0400000, CRC(46061814) SHA1(9a149d1edabc4a7ab8e30df9a08390a320b9b472) )
-	ROM_LOAD32_WORD("buffalo.u85", 0x0000000, 0x0400000, CRC(8e5ac194) SHA1(5e7a84d5211cb4e797aa04f21220e72f9d4f4694) )
+	ROM_LOAD32_WORD("buffalo.u72", 0x0800002, 0x0400000, CRC(2a35e7df) SHA1(112ea1872bc3b8533e1339f8eb19ef9ea0740773) )
+	ROM_LOAD32_WORD("buffalo.u73", 0x0000002, 0x0400000, CRC(46061814) SHA1(9a149d1edabc4a7ab8e30df9a08390a320b9b472) )
+	ROM_LOAD32_WORD("buffalo.u85", 0x0800000, 0x0400000, CRC(8e5ac194) SHA1(5e7a84d5211cb4e797aa04f21220e72f9d4f4694) )
 	ROM_LOAD32_WORD("buffalo.u86", 0x0000000, 0x0400000, CRC(8bee03c5) SHA1(46b39fe0b18c09764e7c7ac44838eb80df536100) )
 ROM_END
 
@@ -1675,10 +1669,10 @@ ROM_END
 ROM_START( cactusco )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("Cactus Corral U72.bin", 0x0000000, 0x0400000, CRC(90d72135) SHA1(fb4a4ad984ff1103e2e951919132f79cb7af9ec5) )
-	ROM_LOAD32_WORD("Cactus Corral U73.bin", 0x0000000, 0x0400000, CRC(b2f2149d) SHA1(8f53b168555bc255d3dc9fb94d2d6dd466b7f3e4) )
-	ROM_LOAD32_WORD("Cactus Corral U85.bin", 0x0000000, 0x0400000, CRC(e0130bf6) SHA1(84f7c2b5c10155ee92bcc02d6c3dca0acf55ed27) )
-	ROM_LOAD32_WORD("Cactus Corral U86.bin", 0x0000000, 0x0400000, CRC(bd7a64ed) SHA1(0047467954eabc718b5355e61f2756fd9e29aabc) )
+	ROM_LOAD32_WORD("Cactus Corral.u72", 0x0800002, 0x0400000, CRC(90d72135) SHA1(fb4a4ad984ff1103e2e951919132f79cb7af9ec5) )
+	ROM_LOAD32_WORD("Cactus Corral.u73", 0x0000002, 0x0400000, CRC(b2f2149d) SHA1(8f53b168555bc255d3dc9fb94d2d6dd466b7f3e4) )
+	ROM_LOAD32_WORD("Cactus Corral.u85", 0x0800000, 0x0400000, CRC(e0130bf6) SHA1(84f7c2b5c10155ee92bcc02d6c3dca0acf55ed27) )
+	ROM_LOAD32_WORD("Cactus Corral.u86", 0x0000000, 0x0400000, CRC(bd7a64ed) SHA1(0047467954eabc718b5355e61f2756fd9e29aabc) )
 ROM_END
 
 
@@ -1686,12 +1680,12 @@ ROM_END
 ROM_START( callwlar )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("Call Of The Wild U71.bin", 0x0000000, 0x0400000, CRC(ed7dc53a) SHA1(686326580fe1a58685341d82ae5697fd216b88b6) )
-	ROM_LOAD32_WORD("Call Of The Wild U72.bin", 0x0000000, 0x0400000, CRC(8ee4f3e7) SHA1(553487a4c2915e9621330d6a8cd621dd6b4e38d3) )
-	ROM_LOAD32_WORD("Call Of The Wild U73.bin", 0x0000000, 0x0400000, CRC(36231cad) SHA1(9230ef7bb8433c611754b4625a64bef3931aba0d) )
-	ROM_LOAD32_WORD("Call Of The Wild U84.bin", 0x0000000, 0x0400000, CRC(c6d27e00) SHA1(4f81922c0f3f82f48a8354d1a81283f06aaa9fb6) )
-	ROM_LOAD32_WORD("Call Of The Wild U85.bin", 0x0000000, 0x0400000, CRC(725dad93) SHA1(7228e3637331450667ed872e48a6693846a5b87a) )
-	ROM_LOAD32_WORD("Call Of The Wild U86.bin", 0x0000000, 0x0400000, CRC(80b28091) SHA1(c27f57c7bfe797463ddd203304d9be58918aa586) )
+	ROM_LOAD32_WORD("Call Of The Wild.u71", 0x1000002, 0x0400000, CRC(ed7dc53a) SHA1(686326580fe1a58685341d82ae5697fd216b88b6) )
+	ROM_LOAD32_WORD("Call Of The Wild.u72", 0x0800002, 0x0400000, CRC(8ee4f3e7) SHA1(553487a4c2915e9621330d6a8cd621dd6b4e38d3) )
+	ROM_LOAD32_WORD("Call Of The Wild.u73", 0x0000002, 0x0400000, CRC(36231cad) SHA1(9230ef7bb8433c611754b4625a64bef3931aba0d) )
+	ROM_LOAD32_WORD("Call Of The Wild.u84", 0x1000000, 0x0400000, CRC(c6d27e00) SHA1(4f81922c0f3f82f48a8354d1a81283f06aaa9fb6) )
+	ROM_LOAD32_WORD("Call Of The Wild.u85", 0x0800000, 0x0400000, CRC(725dad93) SHA1(7228e3637331450667ed872e48a6693846a5b87a) )
+	ROM_LOAD32_WORD("Call Of The Wild.u86", 0x0000000, 0x0400000, CRC(80b28091) SHA1(c27f57c7bfe797463ddd203304d9be58918aa586) )
 ROM_END
 
 
@@ -1704,11 +1698,11 @@ ROM_END
 ROM_START( deepfrz )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("Gam_Eprm.u71", 0x0000000, 0x0400000, CRC(7fde4cb0) SHA1(6ecfdaab82d2b2f30e0d122dee08b7e0848e0cea) )
-	ROM_LOAD32_WORD("Gam_Eprm.u72", 0x0000000, 0x0400000, CRC(a024e1e0) SHA1(5d4d6ab51aef1668e05b9296c7204c0b24c5f473) )
-	ROM_LOAD32_WORD("Gam_Eprm.u73", 0x0000000, 0x0400000, CRC(de7c52eb) SHA1(6291a9f032c164d000a75b24a19dc9e8fb9184a1) )
-	ROM_LOAD32_WORD("Gam_Eprm.u84", 0x0000000, 0x0400000, CRC(9bc78342) SHA1(91f99679eda7d0b8bfcb8cc741bf5d9e9ed6c2d4) )
-	ROM_LOAD32_WORD("Gam_Eprm.u85", 0x0000000, 0x0400000, CRC(30040885) SHA1(0f0f4cc3cd7ee70c03099bdeec60313c16a21c70) )
+	ROM_LOAD32_WORD("Gam_Eprm.u71", 0x1000002, 0x0400000, CRC(7fde4cb0) SHA1(6ecfdaab82d2b2f30e0d122dee08b7e0848e0cea) )
+	ROM_LOAD32_WORD("Gam_Eprm.u72", 0x0800002, 0x0400000, CRC(a024e1e0) SHA1(5d4d6ab51aef1668e05b9296c7204c0b24c5f473) )
+	ROM_LOAD32_WORD("Gam_Eprm.u73", 0x0000002, 0x0400000, CRC(de7c52eb) SHA1(6291a9f032c164d000a75b24a19dc9e8fb9184a1) )
+	ROM_LOAD32_WORD("Gam_Eprm.u84", 0x1000000, 0x0400000, CRC(9bc78342) SHA1(91f99679eda7d0b8bfcb8cc741bf5d9e9ed6c2d4) )
+	ROM_LOAD32_WORD("Gam_Eprm.u85", 0x0800000, 0x0400000, CRC(30040885) SHA1(0f0f4cc3cd7ee70c03099bdeec60313c16a21c70) )
 	ROM_LOAD32_WORD("Gam_Eprm.u86", 0x0000000, 0x0400000, CRC(82187e66) SHA1(bb8bb2c50ab722d0e8d7e2e0d6b4be095fa1d3b3) )
 ROM_END
 
@@ -1720,10 +1714,10 @@ ROM_END
 ROM_START( drmred )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("dream of the red chamber-U72.bin", 0x0000000, 0x0400000, CRC(5a4e369a) SHA1(f50424edae6e912ef6d40f2e2e769c2002349c0a) )
-	ROM_LOAD32_WORD("dream of the red chamber-U73.bin", 0x0000000, 0x0400000, CRC(a38db22b) SHA1(e83485525a46741a7d97c36341c529d9643f2dd9) )
-	ROM_LOAD32_WORD("dream of the red chamber-U85.bin", 0x0000000, 0x0400000, CRC(b2640b58) SHA1(79e8085ae36a2f03a7e57e21cccaeb4bbe122f8e) )
-	ROM_LOAD32_WORD("dream of the red chamber-U86.bin", 0x0000000, 0x0400000, CRC(69e4a089) SHA1(505de7f61ff74d73da32aaf105b1ff9d5083094a) )
+	ROM_LOAD32_WORD("dream of the red chamber-.u72", 0x0800002, 0x0400000, CRC(5a4e369a) SHA1(f50424edae6e912ef6d40f2e2e769c2002349c0a) )
+	ROM_LOAD32_WORD("dream of the red chamber-.u73", 0x0000002, 0x0400000, CRC(a38db22b) SHA1(e83485525a46741a7d97c36341c529d9643f2dd9) )
+	ROM_LOAD32_WORD("dream of the red chamber-.u85", 0x0800000, 0x0400000, CRC(b2640b58) SHA1(79e8085ae36a2f03a7e57e21cccaeb4bbe122f8e) )
+	ROM_LOAD32_WORD("dream of the red chamber-.u86", 0x0000000, 0x0400000, CRC(69e4a089) SHA1(505de7f61ff74d73da32aaf105b1ff9d5083094a) )
 ROM_END
 
 
@@ -1733,11 +1727,11 @@ ROM_END
 ROM_START( encspela )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("Gam_Eprm.u71", 0x0000000, 0x0400000, CRC(7f91f73f) SHA1(5b70ffe30047d68bf521ee773ff3c323d1678e83) )
-	ROM_LOAD32_WORD("Gam_Eprm.u72", 0x0000000, 0x0400000, CRC(651cb916) SHA1(caae7e9122b51352eb0befbc422c20866caeb92c) )
-	ROM_LOAD32_WORD("Gam_Eprm.u73", 0x0000000, 0x0400000, CRC(969cf792) SHA1(0c44ed0ab3a5c11a171e7615ced9234bbbd9f2c9) )
-	ROM_LOAD32_WORD("Gam_Eprm.u84", 0x0000000, 0x0400000, CRC(5d351e99) SHA1(ad492bc56d804a298c05f67746f3e1664084a0f2) )
-	ROM_LOAD32_WORD("Gam_Eprm.u85", 0x0000000, 0x0400000, CRC(a6a4bcf2) SHA1(5ee43d090d7505db2be59064bb1fdbcf3b29b16b) )
+	ROM_LOAD32_WORD("Gam_Eprm.u71", 0x1000002, 0x0400000, CRC(7f91f73f) SHA1(5b70ffe30047d68bf521ee773ff3c323d1678e83) )
+	ROM_LOAD32_WORD("Gam_Eprm.u72", 0x0800002, 0x0400000, CRC(651cb916) SHA1(caae7e9122b51352eb0befbc422c20866caeb92c) )
+	ROM_LOAD32_WORD("Gam_Eprm.u73", 0x0000002, 0x0400000, CRC(969cf792) SHA1(0c44ed0ab3a5c11a171e7615ced9234bbbd9f2c9) )
+	ROM_LOAD32_WORD("Gam_Eprm.u84", 0x1000000, 0x0400000, CRC(5d351e99) SHA1(ad492bc56d804a298c05f67746f3e1664084a0f2) )
+	ROM_LOAD32_WORD("Gam_Eprm.u85", 0x0800000, 0x0400000, CRC(a6a4bcf2) SHA1(5ee43d090d7505db2be59064bb1fdbcf3b29b16b) )
 	ROM_LOAD32_WORD("Gam_Eprm.u86", 0x0000000, 0x0400000, CRC(1b65e345) SHA1(2eba34cbbdbf939bb2241c95e610ee4d97ef6258) )
 ROM_END
 
@@ -1747,10 +1741,10 @@ ROM_END
 ROM_START( fortath )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("u72.bin", 0x0000000, 0x0400000, CRC(90e481a0) SHA1(b73045e1f8602f17e6d0f9d9f5718c7e7cd0dd81) )
-	ROM_LOAD32_WORD("u73.bin", 0x0000000, 0x0400000, CRC(4f361938) SHA1(51c23d09ba7cc7c73559e10b023962e7eb7059ed) )
-	ROM_LOAD32_WORD("u85.bin", 0x0000000, 0x0400000, CRC(0b33c40b) SHA1(055ac1528a2008a4b481db201b95dabf8531d6e4) )
-	ROM_LOAD32_WORD("u86.bin", 0x0000000, 0x0400000, CRC(39274d5c) SHA1(ef01c3f010800ece44ccb50be7cf14af538e21fc) )
+	ROM_LOAD32_WORD("rom.u72", 0x0800002, 0x0400000, CRC(90e481a0) SHA1(b73045e1f8602f17e6d0f9d9f5718c7e7cd0dd81) )
+	ROM_LOAD32_WORD("rom.u73", 0x0000002, 0x0400000, CRC(4f361938) SHA1(51c23d09ba7cc7c73559e10b023962e7eb7059ed) )
+	ROM_LOAD32_WORD("rom.u85", 0x0800000, 0x0400000, CRC(0b33c40b) SHA1(055ac1528a2008a4b481db201b95dabf8531d6e4) )
+	ROM_LOAD32_WORD("rom.u86", 0x0000000, 0x0400000, CRC(39274d5c) SHA1(ef01c3f010800ece44ccb50be7cf14af538e21fc) )
 ROM_END
 
 
@@ -1759,12 +1753,12 @@ ROM_END
 ROM_START( goldsam )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("Golden Samuri U71.bin", 0x0000000, 0x0400000, CRC(b5d9eb6f) SHA1(c614073463e60cc3fe379b81215324fa9e150948) )
-	ROM_LOAD32_WORD("Golden Samuri U72.bin", 0x0000000, 0x0400000, CRC(33967413) SHA1(ceb6aa9937dc5087298dfad8f3b2edc5cc8dd8a1) )
-	ROM_LOAD32_WORD("Golden Samuri U73.bin", 0x0000000, 0x0400000, CRC(dc0c374b) SHA1(5e4b1800aa69863aa537aec72285e2ffaccf0aee) )
-	ROM_LOAD32_WORD("Golden Samuri U84.bin", 0x0000000, 0x0400000, CRC(7c9b075a) SHA1(9d0095d2219747610c060b99b612d3a1353ed561) )
-	ROM_LOAD32_WORD("Golden Samuri U85.bin", 0x0000000, 0x0400000, CRC(d1f22168) SHA1(a63e6856f73fc2642edd59b18282ad69e32b3310) )
-	ROM_LOAD32_WORD("Golden Samuri U86.bin", 0x0000000, 0x0400000, CRC(b888e6ab) SHA1(a3df344fa1a1419ef4f4225e808189d4acffdc86) )
+	ROM_LOAD32_WORD("Golden Samuri.u71", 0x1000002, 0x0400000, CRC(b5d9eb6f) SHA1(c614073463e60cc3fe379b81215324fa9e150948) )
+	ROM_LOAD32_WORD("Golden Samuri.u72", 0x0800002, 0x0400000, CRC(33967413) SHA1(ceb6aa9937dc5087298dfad8f3b2edc5cc8dd8a1) )
+	ROM_LOAD32_WORD("Golden Samuri.u73", 0x0000002, 0x0400000, CRC(dc0c374b) SHA1(5e4b1800aa69863aa537aec72285e2ffaccf0aee) )
+	ROM_LOAD32_WORD("Golden Samuri.u84", 0x1000000, 0x0400000, CRC(7c9b075a) SHA1(9d0095d2219747610c060b99b612d3a1353ed561) )
+	ROM_LOAD32_WORD("Golden Samuri.u85", 0x0800000, 0x0400000, CRC(d1f22168) SHA1(a63e6856f73fc2642edd59b18282ad69e32b3310) )
+	ROM_LOAD32_WORD("Golden Samuri.u86", 0x0000000, 0x0400000, CRC(b888e6ab) SHA1(a3df344fa1a1419ef4f4225e808189d4acffdc86) )
 ROM_END
 
 
@@ -1776,10 +1770,10 @@ ROM_END
 ROM_START( inddrma )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("Indian Dreaming U72", 0x0000000, 0x0400000, CRC(92c75004) SHA1(6baa35896dd51c17ab5818919616a217b8b2e4dd) )
-	ROM_LOAD32_WORD("Indian Dreaming U73", 0x0000000, 0x0400000, CRC(41279ab8) SHA1(3f275669036ef07d7a0b6ebb1ea58ca5fde963e0) )
-	ROM_LOAD32_WORD("Indian Dreaming U85", 0x0000000, 0x0400000, CRC(ec18c9ea) SHA1(e3150499e7ad4a2e63aa3c070089c8267eefa5af) )
-	ROM_LOAD32_WORD("Indian Dreaming U86", 0x0000000, 0x0400000, CRC(bea8f843) SHA1(e8f345c2ff5f751e64bb945827826e481d376377) )
+	ROM_LOAD32_WORD("Indian Dreaming.u72", 0x0800002, 0x0400000, CRC(92c75004) SHA1(6baa35896dd51c17ab5818919616a217b8b2e4dd) )
+	ROM_LOAD32_WORD("Indian Dreaming.u73", 0x0000002, 0x0400000, CRC(41279ab8) SHA1(3f275669036ef07d7a0b6ebb1ea58ca5fde963e0) )
+	ROM_LOAD32_WORD("Indian Dreaming.u85", 0x0800000, 0x0400000, CRC(ec18c9ea) SHA1(e3150499e7ad4a2e63aa3c070089c8267eefa5af) )
+	ROM_LOAD32_WORD("Indian Dreaming.u86", 0x0000000, 0x0400000, CRC(bea8f843) SHA1(e8f345c2ff5f751e64bb945827826e481d376377) )
 ROM_END
 
 
@@ -1790,11 +1784,11 @@ ROM_END
 ROM_START( luck88 )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("Gam_Eprm.u71", 0x0000000, 0x0400000, CRC(f0e88142) SHA1(52271aa7dbdc99cff2a8e5230210758f4534f3bd) )
-	ROM_LOAD32_WORD("Gam_Eprm.u72", 0x0000000, 0x0400000, CRC(e3d58454) SHA1(a6bfcdb0a047712e77957d2e472bb300a758f12b) )
-	ROM_LOAD32_WORD("Gam_Eprm.u73", 0x0000000, 0x0400000, CRC(94b7d07e) SHA1(c12cf2da50791262ef85d0a08e897f87185c359d) )
-	ROM_LOAD32_WORD("Gam_Eprm.u84", 0x0000000, 0x0400000, CRC(eb338e37) SHA1(d795d24c38e654695b8122262bcdd0641f720e58) )
-	ROM_LOAD32_WORD("Gam_Eprm.u85", 0x0000000, 0x0400000, CRC(6c08de75) SHA1(ffadb5181bd82239bf616c1773ccb10dc06549a5) )
+	ROM_LOAD32_WORD("Gam_Eprm.u71", 0x1000002, 0x0400000, CRC(f0e88142) SHA1(52271aa7dbdc99cff2a8e5230210758f4534f3bd) )
+	ROM_LOAD32_WORD("Gam_Eprm.u72", 0x0800002, 0x0400000, CRC(e3d58454) SHA1(a6bfcdb0a047712e77957d2e472bb300a758f12b) )
+	ROM_LOAD32_WORD("Gam_Eprm.u73", 0x0000002, 0x0400000, CRC(94b7d07e) SHA1(c12cf2da50791262ef85d0a08e897f87185c359d) )
+	ROM_LOAD32_WORD("Gam_Eprm.u84", 0x1000000, 0x0400000, CRC(eb338e37) SHA1(d795d24c38e654695b8122262bcdd0641f720e58) )
+	ROM_LOAD32_WORD("Gam_Eprm.u85", 0x0800000, 0x0400000, CRC(6c08de75) SHA1(ffadb5181bd82239bf616c1773ccb10dc06549a5) )
 	ROM_LOAD32_WORD("Gam_Eprm.u86", 0x0000000, 0x0400000, CRC(ae09bfd7) SHA1(65f068e947a26b7b56db6b3a94691a50a002970d) )
 ROM_END
 
@@ -1805,11 +1799,11 @@ ROM_END
 ROM_START( milkin )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("Gam_Eprm.u71", 0x0000000, 0x0400000, CRC(a5c83ff6) SHA1(b5eb551ab93e57c4978243909893d872b0192e08) )
-	ROM_LOAD32_WORD("Gam_Eprm.u72", 0x0000000, 0x0400000, CRC(e855f155) SHA1(5a065eb205832781b9a565b9f87f7638d52a1a4b) )
-	ROM_LOAD32_WORD("Gam_Eprm.u73", 0x0000000, 0x0400000, CRC(a20e4928) SHA1(a8fb46a250fe11652c5ccd2253be9aff9e6cae8b) )
-	ROM_LOAD32_WORD("Gam_Eprm.u84", 0x0000000, 0x0400000, CRC(fc0a3315) SHA1(0871a0c6a87d0197d9dfd631006426b6522d61b8) )
-	ROM_LOAD32_WORD("Gam_Eprm.u85", 0x0000000, 0x0400000, CRC(00186fab) SHA1(7c84808ed6f20118a79eebe1730f2fa0ef989d97) )
+	ROM_LOAD32_WORD("Gam_Eprm.u71", 0x1000002, 0x0400000, CRC(a5c83ff6) SHA1(b5eb551ab93e57c4978243909893d872b0192e08) )
+	ROM_LOAD32_WORD("Gam_Eprm.u72", 0x0800002, 0x0400000, CRC(e855f155) SHA1(5a065eb205832781b9a565b9f87f7638d52a1a4b) )
+	ROM_LOAD32_WORD("Gam_Eprm.u73", 0x0000002, 0x0400000, CRC(a20e4928) SHA1(a8fb46a250fe11652c5ccd2253be9aff9e6cae8b) )
+	ROM_LOAD32_WORD("Gam_Eprm.u84", 0x1000000, 0x0400000, CRC(fc0a3315) SHA1(0871a0c6a87d0197d9dfd631006426b6522d61b8) )
+	ROM_LOAD32_WORD("Gam_Eprm.u85", 0x0800000, 0x0400000, CRC(00186fab) SHA1(7c84808ed6f20118a79eebe1730f2fa0ef989d97) )
 	ROM_LOAD32_WORD("Gam_Eprm.u86", 0x0000000, 0x0400000, CRC(eb66636c) SHA1(48216f1f72fc6714cc1876d71489bccaa1624b2e) )
 ROM_END
 
@@ -1819,10 +1813,10 @@ ROM_END
 ROM_START( moonwalt )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("Moonlight Waltz U72.bin", 0x0000000, 0x0400000, CRC(80e26c8a) SHA1(5f8b01d18210d5997bbf7966d1bf4353dadc4f7d) )
-	ROM_LOAD32_WORD("Moonlight Waltz U73.bin", 0x0000000, 0x0400000, CRC(8272e787) SHA1(b0b44fa4af0fdd3f66bd117d748ed874379ed131) )
-	ROM_LOAD32_WORD("Moonlight Waltz U85.bin", 0x0000000, 0x0400000, CRC(44f56b6f) SHA1(7706301d9e40e6197aa509c972129b016d60bf34) )
-	ROM_LOAD32_WORD("Moonlight Waltz U86.bin", 0x0000000, 0x0400000, CRC(cb21b264) SHA1(ecc1804c0fd399019e3496ae6ea0a6ea125562f2) )
+	ROM_LOAD32_WORD("Moonlight Waltz.u72", 0x0800002, 0x0400000, CRC(80e26c8a) SHA1(5f8b01d18210d5997bbf7966d1bf4353dadc4f7d) )
+	ROM_LOAD32_WORD("Moonlight Waltz.u73", 0x0000002, 0x0400000, CRC(8272e787) SHA1(b0b44fa4af0fdd3f66bd117d748ed874379ed131) )
+	ROM_LOAD32_WORD("Moonlight Waltz.u85", 0x0800000, 0x0400000, CRC(44f56b6f) SHA1(7706301d9e40e6197aa509c972129b016d60bf34) )
+	ROM_LOAD32_WORD("Moonlight Waltz.u86", 0x0000000, 0x0400000, CRC(cb21b264) SHA1(ecc1804c0fd399019e3496ae6ea0a6ea125562f2) )
 ROM_END
 
 
@@ -1830,9 +1824,9 @@ ROM_END
 ROM_START( mchilli )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("Gam_Eprm.u72", 0x0000000, 0x0400000, CRC(85f98b61) SHA1(1ebd8caef5f163a75e185c3fa3c001517f676890) )
-	ROM_LOAD32_WORD("Gam_Eprm.u73", 0x0000000, 0x0400000, CRC(da883738) SHA1(74f5cdb7b388dec17a0e4d8a04c2107bd07c3ad7) )
-	ROM_LOAD32_WORD("Gam_Eprm.u85", 0x0000000, 0x0400000, CRC(ac11dab3) SHA1(3a201a5e239b10dcdd23aed3b0d724146f2fcf68) )
+	ROM_LOAD32_WORD("Gam_Eprm.u72", 0x0800002, 0x0400000, CRC(85f98b61) SHA1(1ebd8caef5f163a75e185c3fa3c001517f676890) )
+	ROM_LOAD32_WORD("Gam_Eprm.u73", 0x0000002, 0x0400000, CRC(da883738) SHA1(74f5cdb7b388dec17a0e4d8a04c2107bd07c3ad7) )
+	ROM_LOAD32_WORD("Gam_Eprm.u85", 0x0800000, 0x0400000, CRC(ac11dab3) SHA1(3a201a5e239b10dcdd23aed3b0d724146f2fcf68) )
 	ROM_LOAD32_WORD("Gam_Eprm.u86", 0x0000000, 0x0400000, CRC(1f5207d7) SHA1(73c3742a94962a66df7af6eff660f90e7e22e344) )
 ROM_END
 
@@ -1842,12 +1836,12 @@ ROM_END
 ROM_START( pcfava )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("Players Choice-Favourites U71.bin", 0x0000000, 0x0400000, CRC(116bb514) SHA1(cd3dcca730c8e9d3fe5b0c70638f3d81f8eb8f98) )
-	ROM_LOAD32_WORD("Players Choice-Favourites U72.bin", 0x0000000, 0x0400000, CRC(9b0fb8b6) SHA1(bd5a2734068e031ca7ab0f19749f28f84288125f) )
-	ROM_LOAD32_WORD("Players Choice-Favourites U73.bin", 0x0000000, 0x0400000, CRC(72db5268) SHA1(de7f3619162b27bab4825f801eb1a04cce8721a3) )
-	ROM_LOAD32_WORD("Players Choice-Favourites U84.bin", 0x0000000, 0x0400000, CRC(7944e972) SHA1(23d45a2e948a737d3186de5f0447ec7dd51ddc7b) )
-	ROM_LOAD32_WORD("Players Choice-Favourites U85.bin", 0x0000000, 0x0400000, CRC(385e8636) SHA1(5e4bf33f91481080c80264b915a11606b03f8686) )
-	ROM_LOAD32_WORD("Players Choice-Favourites U86.bin", 0x0000000, 0x0400000, CRC(f06d4fbb) SHA1(aad9c37da2ee9f7a5252267f39a9d1e8169a2472) )
+	ROM_LOAD32_WORD("Players Choice-Favourites.u71", 0x1000002, 0x0400000, CRC(116bb514) SHA1(cd3dcca730c8e9d3fe5b0c70638f3d81f8eb8f98) )
+	ROM_LOAD32_WORD("Players Choice-Favourites.u72", 0x0800002, 0x0400000, CRC(9b0fb8b6) SHA1(bd5a2734068e031ca7ab0f19749f28f84288125f) )
+	ROM_LOAD32_WORD("Players Choice-Favourites.u73", 0x0000002, 0x0400000, CRC(72db5268) SHA1(de7f3619162b27bab4825f801eb1a04cce8721a3) )
+	ROM_LOAD32_WORD("Players Choice-Favourites.u84", 0x1000000, 0x0400000, CRC(7944e972) SHA1(23d45a2e948a737d3186de5f0447ec7dd51ddc7b) )
+	ROM_LOAD32_WORD("Players Choice-Favourites.u85", 0x0800000, 0x0400000, CRC(385e8636) SHA1(5e4bf33f91481080c80264b915a11606b03f8686) )
+	ROM_LOAD32_WORD("Players Choice-Favourites.u86", 0x0000000, 0x0400000, CRC(f06d4fbb) SHA1(aad9c37da2ee9f7a5252267f39a9d1e8169a2472) )
 ROM_END
 
 
@@ -1855,11 +1849,11 @@ ROM_END
 ROM_START( pcmostw )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("Gam_Eprm.u71", 0x0000000, 0x0400000, CRC(6b67d71e) SHA1(902f832c79f160b22c02222eefa5ec31285b7610) )
-	ROM_LOAD32_WORD("Gam_Eprm.u72", 0x0000000, 0x0400000, CRC(d6f86683) SHA1(0e5ca980010bf40bba01d7222bc4d241b9d86667) )
-	ROM_LOAD32_WORD("Gam_Eprm.u73", 0x0000000, 0x0400000, CRC(a26a224e) SHA1(222e3b067f4bde826ae19276bb48136896cbd853) )
-	ROM_LOAD32_WORD("Gam_Eprm.u84", 0x0000000, 0x0400000, CRC(da762c17) SHA1(44c5bfee805d0ee8209e7b37161921d652b4d83b) )
-	ROM_LOAD32_WORD("Gam_Eprm.u85", 0x0000000, 0x0400000, CRC(214a647f) SHA1(51b250ecf49776ab9dfe80cb2efdc685109f0c19) )
+	ROM_LOAD32_WORD("Gam_Eprm.u71", 0x1000002, 0x0400000, CRC(6b67d71e) SHA1(902f832c79f160b22c02222eefa5ec31285b7610) )
+	ROM_LOAD32_WORD("Gam_Eprm.u72", 0x0800002, 0x0400000, CRC(d6f86683) SHA1(0e5ca980010bf40bba01d7222bc4d241b9d86667) )
+	ROM_LOAD32_WORD("Gam_Eprm.u73", 0x0000002, 0x0400000, CRC(a26a224e) SHA1(222e3b067f4bde826ae19276bb48136896cbd853) )
+	ROM_LOAD32_WORD("Gam_Eprm.u84", 0x1000000, 0x0400000, CRC(da762c17) SHA1(44c5bfee805d0ee8209e7b37161921d652b4d83b) )
+	ROM_LOAD32_WORD("Gam_Eprm.u85", 0x0800000, 0x0400000, CRC(214a647f) SHA1(51b250ecf49776ab9dfe80cb2efdc685109f0c19) )
 	ROM_LOAD32_WORD("Gam_Eprm.u86", 0x0000000, 0x0400000, CRC(7f460e25) SHA1(d97150221a3c0cac3b46d147ae96937a871ecdb3) )
 ROM_END
 
@@ -1867,13 +1861,13 @@ ROM_END
 ROM_START( pcnewz )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("Gam_Eprm.u70", 0x0000000, 0x0400000, CRC(1d67f455) SHA1(4247d21757522a69184d32434cfa191a026aff19) )
-	ROM_LOAD32_WORD("Gam_Eprm.u71", 0x0000000, 0x0400000, CRC(8df4d7da) SHA1(a798424a514201d954519ec0daf0a2b1cbc00082) )
-	ROM_LOAD32_WORD("Gam_Eprm.u72", 0x0000000, 0x0400000, CRC(db6e9523) SHA1(a4a272af4f5f29d2e612b52a011f9daf7c0b0cd3) )
-	ROM_LOAD32_WORD("Gam_Eprm.u73", 0x0000000, 0x0400000, CRC(6072d8d3) SHA1(37ce2a4213024b9ccd1859701c48e76e6c64e6ee) )
-	ROM_LOAD32_WORD("Gam_Eprm.u83", 0x0000000, 0x0400000, CRC(5709ba3a) SHA1(4fd85b97f434656b3bd0d26ba8573e3cd2c936ce) )
-	ROM_LOAD32_WORD("Gam_Eprm.u84", 0x0000000, 0x0400000, CRC(5927770a) SHA1(faaec01280a54775e85ae796a7d05170bece3c87) )
-	ROM_LOAD32_WORD("Gam_Eprm.u85", 0x0000000, 0x0400000, CRC(6208432e) SHA1(50006d010dd3d061fef8f4fd8fbbffea1b9b0f3d) )
+	ROM_LOAD32_WORD("Gam_Eprm.u70", 0x1800002, 0x0400000, CRC(1d67f455) SHA1(4247d21757522a69184d32434cfa191a026aff19) )
+	ROM_LOAD32_WORD("Gam_Eprm.u71", 0x1000002, 0x0400000, CRC(8df4d7da) SHA1(a798424a514201d954519ec0daf0a2b1cbc00082) )
+	ROM_LOAD32_WORD("Gam_Eprm.u72", 0x0800002, 0x0400000, CRC(db6e9523) SHA1(a4a272af4f5f29d2e612b52a011f9daf7c0b0cd3) )
+	ROM_LOAD32_WORD("Gam_Eprm.u73", 0x0000002, 0x0400000, CRC(6072d8d3) SHA1(37ce2a4213024b9ccd1859701c48e76e6c64e6ee) )
+	ROM_LOAD32_WORD("Gam_Eprm.u83", 0x1800000, 0x0400000, CRC(5709ba3a) SHA1(4fd85b97f434656b3bd0d26ba8573e3cd2c936ce) )
+	ROM_LOAD32_WORD("Gam_Eprm.u84", 0x1000000, 0x0400000, CRC(5927770a) SHA1(faaec01280a54775e85ae796a7d05170bece3c87) )
+	ROM_LOAD32_WORD("Gam_Eprm.u85", 0x0800000, 0x0400000, CRC(6208432e) SHA1(50006d010dd3d061fef8f4fd8fbbffea1b9b0f3d) )
 	ROM_LOAD32_WORD("Gam_Eprm.u86", 0x0000000, 0x0400000, CRC(bb839c90) SHA1(268008ffeeb867210664928a521051978c7770b3) )
 ROM_END
 
@@ -1881,30 +1875,15 @@ ROM_END
 
 
 
-ROM_START( rumbrel )
-	ARISTMK6_BIOS
-	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("Rumble Reels L0.bin", 0x0000000, 0x0400000, CRC(06b37c77) SHA1(e4dad62667a1c1d4948abcd535332975148e952b) )
-	ROM_LOAD32_WORD("Rumble Reels L1.bin", 0x0000000, 0x0400000, CRC(739c4565) SHA1(bc2cd133dfbfe18916703eacc851f1757a06f345) )
-	ROM_LOAD32_WORD("Rumble Reels L2.bin", 0x0000000, 0x0400000, CRC(2f561bd0) SHA1(9c2f659ec5cdfd335d089389616dac57fbb655df) )
-	ROM_LOAD32_WORD("Rumble Reels L3.bin", 0x0000000, 0x0400000, CRC(6bf0442e) SHA1(c83ed68cd0680ebac359824defa51c1942db17f1) )
-	ROM_LOAD32_WORD("Rumble Reels L4.bin", 0x0000000, 0x0400000, CRC(3cd5171b) SHA1(fe6e17679f14ae0238c58dd5d801cb0dda3a434b) )
-	ROM_LOAD32_WORD("Rumble Reels R0.bin", 0x0000000, 0x0400000, CRC(cc48bb54) SHA1(6ed7a502deaff0e2fd6d0901d036fcbadf303859) )
-	ROM_LOAD32_WORD("Rumble Reels R1.bin", 0x0000000, 0x0400000, CRC(3af99e7b) SHA1(93e68056fee9b4f29a066bd6828ff320b7d3ffa4) )
-	ROM_LOAD32_WORD("Rumble Reels R2.bin", 0x0000000, 0x0400000, CRC(04b2f09d) SHA1(4090876cf8ef18ed8541f13684b076d7ac1d0d72) )
-	ROM_LOAD32_WORD("Rumble Reels R3.bin", 0x0000000, 0x0400000, CRC(a117e3ec) SHA1(119d7ac89ee4c2167b853d720eb87498cefab4b9) )
-	ROM_LOAD32_WORD("Rumble Reels R4.bin", 0x0000000, 0x0400000, CRC(2c5baf9f) SHA1(40fb5b22460b9a35ca8ebb8b0643e58665d8643f) )
-ROM_END
-
 
 
 
 ROM_START( shamnmg )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("shamans magic.u72", 0x0000000, 0x0400000, CRC(aab1dd80) SHA1(0e8fbc967c4d5c7d24f980afc78464052ca6d2a6) )
-	ROM_LOAD32_WORD("shamans magic.u73", 0x0000000, 0x0400000, CRC(f1e9d86d) SHA1(282961a897bbfec4ab778db207f3ef20c6f4c69d) )
-	ROM_LOAD32_WORD("shamans magic.u85", 0x0000000, 0x0400000, CRC(15bb6dd5) SHA1(96625e18b622d2a02f9a88d51ad90d5dac0289be) )
+	ROM_LOAD32_WORD("shamans magic.u72", 0x0800002, 0x0400000, CRC(aab1dd80) SHA1(0e8fbc967c4d5c7d24f980afc78464052ca6d2a6) )
+	ROM_LOAD32_WORD("shamans magic.u73", 0x0000002, 0x0400000, CRC(f1e9d86d) SHA1(282961a897bbfec4ab778db207f3ef20c6f4c69d) )
+	ROM_LOAD32_WORD("shamans magic.u85", 0x0800000, 0x0400000, CRC(15bb6dd5) SHA1(96625e18b622d2a02f9a88d51ad90d5dac0289be) )
 	ROM_LOAD32_WORD("shamans magic.u86", 0x0000000, 0x0400000, CRC(9c29e10b) SHA1(9f77808162d038461f77075f0565c0a0d34a708a) )
 ROM_END
 
@@ -1915,12 +1894,12 @@ ROM_END
 ROM_START( skydncra )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("Sky Dancer U71.bin", 0x0000000, 0x0400000, CRC(d30c3d6f) SHA1(581a198d98f00c1b7a432ab85b5f65760e364131) )
-	ROM_LOAD32_WORD("Sky Dancer U72.bin", 0x0000000, 0x0400000, CRC(12d02b67) SHA1(aed879daca62575def363872650d33b7af7d71bb) )
-	ROM_LOAD32_WORD("Sky Dancer U73.bin", 0x0000000, 0x0400000, CRC(f90fc640) SHA1(07b523839ac36b07d3dbc4d24e6d987c1f644095) )
-	ROM_LOAD32_WORD("Sky Dancer U84.bin", 0x0000000, 0x0400000, CRC(df6885af) SHA1(e3302defbc496c1b71da6be8ed49dd4d3556d7d4) )
-	ROM_LOAD32_WORD("Sky Dancer U85.bin", 0x0000000, 0x0400000, CRC(4a9a7c33) SHA1(e3243fa32b6736140992ad9fcf04a420bd417846) )
-	ROM_LOAD32_WORD("Sky Dancer U86.bin", 0x0000000, 0x0400000, CRC(81c0b79d) SHA1(ec84ded928637f8888d0caa935ab8d64c647a536) )
+	ROM_LOAD32_WORD("Sky Dancer.u71", 0x1000002, 0x0400000, CRC(d30c3d6f) SHA1(581a198d98f00c1b7a432ab85b5f65760e364131) )
+	ROM_LOAD32_WORD("Sky Dancer.u72", 0x0800002, 0x0400000, CRC(12d02b67) SHA1(aed879daca62575def363872650d33b7af7d71bb) )
+	ROM_LOAD32_WORD("Sky Dancer.u73", 0x0000002, 0x0400000, CRC(f90fc640) SHA1(07b523839ac36b07d3dbc4d24e6d987c1f644095) )
+	ROM_LOAD32_WORD("Sky Dancer.u84", 0x1000000, 0x0400000, CRC(df6885af) SHA1(e3302defbc496c1b71da6be8ed49dd4d3556d7d4) )
+	ROM_LOAD32_WORD("Sky Dancer.u85", 0x0800000, 0x0400000, CRC(4a9a7c33) SHA1(e3243fa32b6736140992ad9fcf04a420bd417846) )
+	ROM_LOAD32_WORD("Sky Dancer.u86", 0x0000000, 0x0400000, CRC(81c0b79d) SHA1(ec84ded928637f8888d0caa935ab8d64c647a536) )
 ROM_END
 
 
@@ -1932,9 +1911,9 @@ ROM_END
 ROM_START( buckstop )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("Gam_Eprm.u72", 0x0000000, 0x0400000, CRC(de8c0100) SHA1(d27668584094c56f2840d87fc481ce03e7278dd8) )
+	ROM_LOAD32_WORD("Gam_Eprm.u72", 0x0800002, 0x0400000, CRC(de8c0100) SHA1(d27668584094c56f2840d87fc481ce03e7278dd8) )
 	ROM_LOAD32_WORD("Gam_Eprm.u74", 0x0000000, 0x0400000, CRC(0a55ae9d) SHA1(25cfc1c4ddb5a3c26fd024f0be166763739e84e4) )
-	ROM_LOAD32_WORD("Gam_Eprm.u85", 0x0000000, 0x0400000, CRC(d2a29b6b) SHA1(4bfc7a6ea5d1251f57bbea52b25353f696f7e63e) )
+	ROM_LOAD32_WORD("Gam_Eprm.u85", 0x0800000, 0x0400000, CRC(d2a29b6b) SHA1(4bfc7a6ea5d1251f57bbea52b25353f696f7e63e) )
 	ROM_LOAD32_WORD("Gam_Eprm.u86", 0x0000000, 0x0400000, CRC(b21c6704) SHA1(2181f3491f020400dfa0b79864860fb002ee5a7f) )
 ROM_END
 
@@ -1945,8 +1924,8 @@ ROM_END
 ROM_START( tikitalk )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("Tiki Talk U73.bin", 0x0000000, 0x0400000, CRC(983d8621) SHA1(92ad28c0a7a06035569700adb8c3449f92bb36b7) )
-	ROM_LOAD32_WORD("Tiki Talk U86.bin", 0x0000000, 0x0400000, CRC(772312e1) SHA1(5a5561d9ec70b56e558ad87ead0770ac9f18e9d1) )
+	ROM_LOAD32_WORD("Tiki Talk.u73", 0x0000002, 0x0400000, CRC(983d8621) SHA1(92ad28c0a7a06035569700adb8c3449f92bb36b7) )
+	ROM_LOAD32_WORD("Tiki Talk.u86", 0x0000000, 0x0400000, CRC(772312e1) SHA1(5a5561d9ec70b56e558ad87ead0770ac9f18e9d1) )
 ROM_END
 
 
@@ -1960,11 +1939,11 @@ ROM_END
 ROM_START( werewild )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("Gam_Eprm.u71", 0x0000000, 0x0400000, CRC(cc1a8ecc) SHA1(857ec89411720e7d451c76dfe4821c721f84ad06) )
-	ROM_LOAD32_WORD("Gam_Eprm.u72", 0x0000000, 0x0400000, CRC(08e7d250) SHA1(e57a5da1fe9b1a2e0b775a881cf52f89a287b340) )
-	ROM_LOAD32_WORD("Gam_Eprm.u73", 0x0000000, 0x0400000, CRC(2d653677) SHA1(653de0cb045772c1fe533bfba6188b697b5d40bb) )
-	ROM_LOAD32_WORD("Gam_Eprm.u84", 0x0000000, 0x0400000, CRC(42cece50) SHA1(3da725f4711e2eddab3fbd1b365cd79049ccaefa) )
-	ROM_LOAD32_WORD("Gam_Eprm.u85", 0x0000000, 0x0400000, CRC(0f9af5cf) SHA1(da58075cbb9104b656c5ece827980ac42185bb6a) )
+	ROM_LOAD32_WORD("Gam_Eprm.u71", 0x1000002, 0x0400000, CRC(cc1a8ecc) SHA1(857ec89411720e7d451c76dfe4821c721f84ad06) )
+	ROM_LOAD32_WORD("Gam_Eprm.u72", 0x0800002, 0x0400000, CRC(08e7d250) SHA1(e57a5da1fe9b1a2e0b775a881cf52f89a287b340) )
+	ROM_LOAD32_WORD("Gam_Eprm.u73", 0x0000002, 0x0400000, CRC(2d653677) SHA1(653de0cb045772c1fe533bfba6188b697b5d40bb) )
+	ROM_LOAD32_WORD("Gam_Eprm.u84", 0x1000000, 0x0400000, CRC(42cece50) SHA1(3da725f4711e2eddab3fbd1b365cd79049ccaefa) )
+	ROM_LOAD32_WORD("Gam_Eprm.u85", 0x0800000, 0x0400000, CRC(0f9af5cf) SHA1(da58075cbb9104b656c5ece827980ac42185bb6a) )
 	ROM_LOAD32_WORD("Gam_Eprm.u86", 0x0000000, 0x0400000, CRC(c8a6321d) SHA1(60278ac3b055d94e67da4041efa76d4b66431cc0) )
 ROM_END
 
@@ -1974,10 +1953,10 @@ ROM_END
 ROM_START( wldcatsa )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("Wild Cats U72.bin", 0x0000000, 0x0400000, CRC(f0707ab9) SHA1(f30d77c53dfbc43e9468f2cb91529e44ce10c59e) )
-	ROM_LOAD32_WORD("Wild Cats U73.bin", 0x0000000, 0x0400000, CRC(0300f5ff) SHA1(52d640b676cd42dfab2c38108dd765c8e8092528) )
-	ROM_LOAD32_WORD("Wild Cats U85.bin", 0x0000000, 0x0400000, CRC(687c4bd6) SHA1(548de5a9887dfc58353b7a2861447bc9cd5f955e) )
-	ROM_LOAD32_WORD("Wild Cats U86.bin", 0x0000000, 0x0400000, CRC(f95e6ba6) SHA1(8d787d96d7b3cc3cde0be49a54701c2d3f70c659) )
+	ROM_LOAD32_WORD("Wild Cats.u72", 0x0800002, 0x0400000, CRC(f0707ab9) SHA1(f30d77c53dfbc43e9468f2cb91529e44ce10c59e) )
+	ROM_LOAD32_WORD("Wild Cats.u73", 0x0000002, 0x0400000, CRC(0300f5ff) SHA1(52d640b676cd42dfab2c38108dd765c8e8092528) )
+	ROM_LOAD32_WORD("Wild Cats.u85", 0x0800000, 0x0400000, CRC(687c4bd6) SHA1(548de5a9887dfc58353b7a2861447bc9cd5f955e) )
+	ROM_LOAD32_WORD("Wild Cats.u86", 0x0000000, 0x0400000, CRC(f95e6ba6) SHA1(8d787d96d7b3cc3cde0be49a54701c2d3f70c659) )
 ROM_END
 
 
@@ -1986,9 +1965,9 @@ ROM_END
 ROM_START( wgorilla )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("Gam_Eprm.u72", 0x0000000, 0x0400000, CRC(e5a4e6f5) SHA1(f63fdc4771433f9953190b9cae4d7cbc4f6e374f) )
-	ROM_LOAD32_WORD("Gam_Eprm.u73", 0x0000000, 0x0400000, CRC(7588c213) SHA1(b1d0ec23b8c668ae40664329a5f6a45b24f6ef2f) )
-	ROM_LOAD32_WORD("Gam_Eprm.u85", 0x0000000, 0x0400000, CRC(28049860) SHA1(cace39a0121127ead7c8550153372283e1610a96) )
+	ROM_LOAD32_WORD("Gam_Eprm.u72", 0x0800002, 0x0400000, CRC(e5a4e6f5) SHA1(f63fdc4771433f9953190b9cae4d7cbc4f6e374f) )
+	ROM_LOAD32_WORD("Gam_Eprm.u73", 0x0000002, 0x0400000, CRC(7588c213) SHA1(b1d0ec23b8c668ae40664329a5f6a45b24f6ef2f) )
+	ROM_LOAD32_WORD("Gam_Eprm.u85", 0x0800000, 0x0400000, CRC(28049860) SHA1(cace39a0121127ead7c8550153372283e1610a96) )
 	ROM_LOAD32_WORD("Gam_Eprm.u86", 0x0000000, 0x0400000, CRC(c8f15db2) SHA1(feaf68f442c96367db374772db57619ea5c01bca) )
 ROM_END
 
@@ -1998,9 +1977,9 @@ ROM_END
 ROM_START( bluetigr )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("Gam_Eprm.u72", 0x0000000, 0x0400000, CRC(f81af522) SHA1(5b7be10820f18ffa360726d20370faa1ecc1b3f8) )
-	ROM_LOAD32_WORD("Gam_Eprm.u73", 0x0000000, 0x0400000, CRC(bc2a4fb8) SHA1(74ba00873a4a00d0839d89bb2d9dbed5fc33bff7) )
-	ROM_LOAD32_WORD("Gam_Eprm.u85", 0x0000000, 0x0400000, CRC(e175ef6d) SHA1(13933044f905c0fde96ff05c6afdce189160a5e2) )
+	ROM_LOAD32_WORD("Gam_Eprm.u72", 0x0800002, 0x0400000, CRC(f81af522) SHA1(5b7be10820f18ffa360726d20370faa1ecc1b3f8) )
+	ROM_LOAD32_WORD("Gam_Eprm.u73", 0x0000002, 0x0400000, CRC(bc2a4fb8) SHA1(74ba00873a4a00d0839d89bb2d9dbed5fc33bff7) )
+	ROM_LOAD32_WORD("Gam_Eprm.u85", 0x0800000, 0x0400000, CRC(e175ef6d) SHA1(13933044f905c0fde96ff05c6afdce189160a5e2) )
 	ROM_LOAD32_WORD("Gam_Eprm.u86", 0x0000000, 0x0400000, CRC(a31f97d8) SHA1(67ec087cbb8f733c0f0314b58b4884fe3cc3ad8c) )
 ROM_END
 
@@ -2009,12 +1988,12 @@ ROM_END
 ROM_START( 50lionr )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("50 Lions RR U71.005", 0x0000000, 0x0400000, CRC(412524b3) SHA1(ef724755616aad7fd484b5d5fcb6f6773e92b9b9) )
-	ROM_LOAD32_WORD("50 Lions RR U72.003", 0x0000000, 0x0400000, CRC(73c2795c) SHA1(bce64fedf84ab5374b07487f6b887c06abe1213a) )
-	ROM_LOAD32_WORD("50 Lions RR U73.001", 0x0000000, 0x0400000, CRC(eee56944) SHA1(b7eb97f7a59076997195edfe8676edbb712a6376) )
-	ROM_LOAD32_WORD("50 Lions RR U84.004", 0x0000000, 0x0400000, CRC(c6bd1e46) SHA1(2cf52574ce3f3726c723fc6fbf098c3177c46a37) )
-	ROM_LOAD32_WORD("50 Lions RR U85.002", 0x0000000, 0x0400000, CRC(809c54c0) SHA1(8a45601248c450f323e39a7397387cf0caf8beed) )
-	ROM_LOAD32_WORD("50 Lions RR U86.000", 0x0000000, 0x0400000, CRC(dacbe4ec) SHA1(af6118c1843f675155aa1b8d50f605ac60168370) )
+	ROM_LOAD32_WORD("50 Lions RR 005.u71", 0x1000002, 0x0400000, CRC(412524b3) SHA1(ef724755616aad7fd484b5d5fcb6f6773e92b9b9) )
+	ROM_LOAD32_WORD("50 Lions RR 003.u72", 0x0800002, 0x0400000, CRC(73c2795c) SHA1(bce64fedf84ab5374b07487f6b887c06abe1213a) )
+	ROM_LOAD32_WORD("50 Lions RR 001.u73", 0x0000002, 0x0400000, CRC(eee56944) SHA1(b7eb97f7a59076997195edfe8676edbb712a6376) )
+	ROM_LOAD32_WORD("50 Lions RR 004.u84", 0x1000000, 0x0400000, CRC(c6bd1e46) SHA1(2cf52574ce3f3726c723fc6fbf098c3177c46a37) )
+	ROM_LOAD32_WORD("50 Lions RR 002.u85", 0x0800000, 0x0400000, CRC(809c54c0) SHA1(8a45601248c450f323e39a7397387cf0caf8beed) )
+	ROM_LOAD32_WORD("50 Lions RR 000.u86", 0x0000000, 0x0400000, CRC(dacbe4ec) SHA1(af6118c1843f675155aa1b8d50f605ac60168370) )
 ROM_END
 
 
@@ -2024,8 +2003,8 @@ ROM_END
 ROM_START( beavbuk )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("b.001", 0x0000000, 0x0400000, CRC(89c840dd) SHA1(31ab84740d866202cc5dfec17dec677186b991c5) )
-	ROM_LOAD32_WORD("b.000", 0x0000000, 0x0400000, CRC(2de9d8e5) SHA1(aea9f2668effa60a627cf62cee45919aa3b669b0) )
+	ROM_LOAD32_WORD("b.001.u73", 0x0000002, 0x0400000, CRC(89c840dd) SHA1(31ab84740d866202cc5dfec17dec677186b991c5) )
+	ROM_LOAD32_WORD("b.000.u86", 0x0000000, 0x0400000, CRC(2de9d8e5) SHA1(aea9f2668effa60a627cf62cee45919aa3b669b0) )
 ROM_END
 
 
@@ -2035,9 +2014,9 @@ ROM_END
 ROM_START( aftrhrs )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("after hours.u72", 0x0000000, 0x0400000, CRC(a4bee8ab) SHA1(cac34f91459fa5902b85e4c8150e651fda68621e) )
-	ROM_LOAD32_WORD("after hours.u73", 0x0000000, 0x0400000, CRC(972c569b) SHA1(caf4aaeaf05a08e4751a8bf06378d6f64b26883d) )
-	ROM_LOAD32_WORD("after hours.u85", 0x0000000, 0x0400000, CRC(de79acdc) SHA1(d7d3d415f5261ab2b65ef1a1e93ccd3770124848) )
+	ROM_LOAD32_WORD("after hours.u72", 0x0800002, 0x0400000, CRC(a4bee8ab) SHA1(cac34f91459fa5902b85e4c8150e651fda68621e) )
+	ROM_LOAD32_WORD("after hours.u73", 0x0000002, 0x0400000, CRC(972c569b) SHA1(caf4aaeaf05a08e4751a8bf06378d6f64b26883d) )
+	ROM_LOAD32_WORD("after hours.u85", 0x0800000, 0x0400000, CRC(de79acdc) SHA1(d7d3d415f5261ab2b65ef1a1e93ccd3770124848) )
 	ROM_LOAD32_WORD("after hours.u86", 0x0000000, 0x0400000, CRC(099f7d16) SHA1(f4ccec1d3c194963a13894b41d35afa5a9191b75) )
 ROM_END
 
@@ -2046,10 +2025,10 @@ ROM_END
 ROM_START( atkgld )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("al the kings gold fbab.u73", 0x0000000, 0x0400000, CRC(01d8e945) SHA1(ed0568a599fe514a8dcba762835831388fede679) )
-	ROM_LOAD32_WORD("all the kings gold 11cb.u85", 0x0000000, 0x0400000, CRC(81f8c412) SHA1(15ace6c1fc36cb7004e7767aea5e30fe8b9acf8b) )
+	ROM_LOAD32_WORD("all the kings gold fbab.u73", 0x0000002, 0x0400000, CRC(01d8e945) SHA1(ed0568a599fe514a8dcba762835831388fede679) )
+	ROM_LOAD32_WORD("all the kings gold 11cb.u85", 0x0800000, 0x0400000, CRC(81f8c412) SHA1(15ace6c1fc36cb7004e7767aea5e30fe8b9acf8b) )
 	ROM_LOAD32_WORD("all the kings gold 786a.u86", 0x0000000, 0x0400000, CRC(dfd90fc4) SHA1(8881ae3102d87435585d04abd791f3f710cf5ed2) )
-	ROM_LOAD32_WORD("all the kings gold 8188.u72", 0x0000000, 0x0400000, CRC(0a360417) SHA1(f5224b6c03fe8cf0a341630086906c12a58321ed) )
+	ROM_LOAD32_WORD("all the kings gold 8188.u72", 0x0800002, 0x0400000, CRC(0a360417) SHA1(f5224b6c03fe8cf0a341630086906c12a58321ed) )
 ROM_END
 
 
@@ -2057,9 +2036,9 @@ ROM_END
 ROM_START( apocof )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("apollo coffee.u72", 0x0000000, 0x01c0000, CRC(f3733388) SHA1(cf01799770b785a0f7527aedf627f16642a60ff3) )
-	ROM_LOAD32_WORD("apollo coffee.u73", 0x0000000, 0x0400000, CRC(675ee721) SHA1(3f4afe6196fc39c2544fc3731f39adef0198b9a3) )
-	ROM_LOAD32_WORD("apollo coffee.u85", 0x0000000, 0x0400000, CRC(daa8cc4f) SHA1(2a71c7dbd0691654b614fcd09dae4ff47a60b655) )
+	ROM_LOAD32_WORD("apollo coffee.u72", 0x0800002, 0x01c0000, CRC(f3733388) SHA1(cf01799770b785a0f7527aedf627f16642a60ff3) )
+	ROM_LOAD32_WORD("apollo coffee.u73", 0x0000002, 0x0400000, CRC(675ee721) SHA1(3f4afe6196fc39c2544fc3731f39adef0198b9a3) )
+	ROM_LOAD32_WORD("apollo coffee.u85", 0x0800000, 0x0400000, CRC(daa8cc4f) SHA1(2a71c7dbd0691654b614fcd09dae4ff47a60b655) )
 	ROM_LOAD32_WORD("apollo coffee.u86", 0x0000000, 0x0400000, CRC(d1f0a2a6) SHA1(d88fd4153b9a5f655c7949883caf3f947a50652f) )
 ROM_END
 
@@ -2068,20 +2047,20 @@ ROM_END
 ROM_START( arbngts )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("arabiannights8cc5.u85", 0x0000000, 0x0400000, CRC(4063edd6) SHA1(bb8f8230bbad70af683d039c041e90d50a59ceed) )
-	ROM_LOAD32_WORD("arabiannightsa983.u72", 0x0000000, 0x0400000, CRC(214632ed) SHA1(31cb4cbecf9b938df5b93c1260feeb6265bb2152) )
+	ROM_LOAD32_WORD("arabiannights8cc5.u85", 0x0800000, 0x0400000, CRC(4063edd6) SHA1(bb8f8230bbad70af683d039c041e90d50a59ceed) )
+	ROM_LOAD32_WORD("arabiannightsa983.u72", 0x0800002, 0x0400000, CRC(214632ed) SHA1(31cb4cbecf9b938df5b93c1260feeb6265bb2152) )
 	ROM_LOAD32_WORD("arabiannightsc3cf.u86", 0x0000000, 0x0400000, CRC(ae1d3cd5) SHA1(e2cca9d9f3b205446e0f74292a784cfe65302bc8) )
-	ROM_LOAD32_WORD("arabiannightsd3ce.u73", 0x0000000, 0x0400000, CRC(a7835a67) SHA1(d7e2d60edeb553165b8be1b272c0d551e762ab33) )
+	ROM_LOAD32_WORD("arabiannightsd3ce.u73", 0x0000002, 0x0400000, CRC(a7835a67) SHA1(d7e2d60edeb553165b8be1b272c0d551e762ab33) )
 ROM_END
 
 
 ROM_START( arwincm )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("arctic-wins-mr-cashman-u72-m27v322-cs-0341.bin", 0x0000000, 0x0400000, CRC(3a133d96) SHA1(4c7dc422c3e0a81da1f81267d525e3a90a7d79d7) )
-	ROM_LOAD32_WORD("arctic-wins-mr-cashman-u73-m27v322-cs-bb15.bin", 0x0000000, 0x0400000, CRC(0c3e441c) SHA1(763879bae2b256c2c4edddc99507b3c54cbab976) )
-	ROM_LOAD32_WORD("arctic-wins-mr-cashman-u85-m27v322-cs-bf80.bin", 0x0000000, 0x0400000, CRC(498b2ab7) SHA1(7f1da5ff34572c1f27f9a0735b8a9571b34ac17e) )
-	ROM_LOAD32_WORD("arctic-wins-mr-cashman-u86-m27v322-cs-96c5.bin", 0x0000000, 0x0400000, CRC(961cca3d) SHA1(f5bd3fdb8863688a1bf96dcd74a261860a008952) )
+	ROM_LOAD32_WORD("arctic-wins-mr-cashman-m27v322-cs-0341.u72", 0x0800002, 0x0400000, CRC(3a133d96) SHA1(4c7dc422c3e0a81da1f81267d525e3a90a7d79d7) )
+	ROM_LOAD32_WORD("arctic-wins-mr-cashman-m27v322-cs-bb15.u73", 0x0000002, 0x0400000, CRC(0c3e441c) SHA1(763879bae2b256c2c4edddc99507b3c54cbab976) )
+	ROM_LOAD32_WORD("arctic-wins-mr-cashman-m27v322-cs-bf80.u85", 0x0800000, 0x0400000, CRC(498b2ab7) SHA1(7f1da5ff34572c1f27f9a0735b8a9571b34ac17e) )
+	ROM_LOAD32_WORD("arctic-wins-mr-cashman-m27v322-cs-96c5.u86", 0x0000000, 0x0400000, CRC(961cca3d) SHA1(f5bd3fdb8863688a1bf96dcd74a261860a008952) )
 ROM_END
 
 
@@ -2089,10 +2068,10 @@ ROM_END
 ROM_START( arish )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("Arishinko U72.bin", 0x0000000, 0x0400000, CRC(08451014) SHA1(3dcda83503c361c93df27a0cd5edd4d68d2a735b) )
-	ROM_LOAD32_WORD("Arishinko U73.bin", 0x0000000, 0x0400000, CRC(631b26e7) SHA1(2520bce139f0bc57b70b93baf253b4ef2a52d531) )
-	ROM_LOAD32_WORD("Arishinko U85.bin", 0x0000000, 0x0400000, CRC(0ea3b484) SHA1(7c9ab129a1c49bcb36f264ce30071e5b9fbb8985) )
-	ROM_LOAD32_WORD("Arishinko U86.bin", 0x0000000, 0x0400000, CRC(ff9cf101) SHA1(1ae93eb26d2033b55ea5a28470a7c76183916ef4) )
+	ROM_LOAD32_WORD("Arishinko.u72", 0x0800002, 0x0400000, CRC(08451014) SHA1(3dcda83503c361c93df27a0cd5edd4d68d2a735b) )
+	ROM_LOAD32_WORD("Arishinko.u73", 0x0000002, 0x0400000, CRC(631b26e7) SHA1(2520bce139f0bc57b70b93baf253b4ef2a52d531) )
+	ROM_LOAD32_WORD("Arishinko.u85", 0x0800000, 0x0400000, CRC(0ea3b484) SHA1(7c9ab129a1c49bcb36f264ce30071e5b9fbb8985) )
+	ROM_LOAD32_WORD("Arishinko.u86", 0x0000000, 0x0400000, CRC(ff9cf101) SHA1(1ae93eb26d2033b55ea5a28470a7c76183916ef4) )
 ROM_END
 
 
@@ -2100,9 +2079,9 @@ ROM_END
 ROM_START( asnprinc )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("asianprincess02e1.u72", 0x0000000, 0x0400000, CRC(917421ef) SHA1(87eb28c98e1901830cb2b779f5c4d569699d1b1e) )
-	ROM_LOAD32_WORD("asianprincess03f6.u85", 0x0000000, 0x0400000, CRC(c46cfe80) SHA1(294ddd29d5c13388096dc2551dc474f077e5d881) )
-	ROM_LOAD32_WORD("asianprincess3237.u73", 0x0000000, 0x0400000, CRC(b05400e0) SHA1(b0832ccfb1947738125f4afe557a246fffdd983c) )
+	ROM_LOAD32_WORD("asianprincess02e1.u72", 0x0800002, 0x0400000, CRC(917421ef) SHA1(87eb28c98e1901830cb2b779f5c4d569699d1b1e) )
+	ROM_LOAD32_WORD("asianprincess03f6.u85", 0x0800000, 0x0400000, CRC(c46cfe80) SHA1(294ddd29d5c13388096dc2551dc474f077e5d881) )
+	ROM_LOAD32_WORD("asianprincess3237.u73", 0x0000002, 0x0400000, CRC(b05400e0) SHA1(b0832ccfb1947738125f4afe557a246fffdd983c) )
 	ROM_LOAD32_WORD("asianprincessdbf7.u86", 0x0000000, 0x0400000, CRC(d0741b53) SHA1(29ede83b3c95d2e490dac66f60629238abc48bdd) )
 ROM_END
 
@@ -2111,10 +2090,10 @@ ROM_END
 ROM_START( blkmust )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("black mustang 3693.u73", 0x0000000, 0x0400000, CRC(986b58d9) SHA1(178de2a1bfaca3e859e9c948ce0626c5f31b303f) )
+	ROM_LOAD32_WORD("black mustang 3693.u73", 0x0000002, 0x0400000, CRC(986b58d9) SHA1(178de2a1bfaca3e859e9c948ce0626c5f31b303f) )
 	ROM_LOAD32_WORD("black mustang 52fb.u86", 0x0000000, 0x0400000, CRC(2637a658) SHA1(7ec96c15f0fef5862f3d4a37fe96ab893e986321) )
-	ROM_LOAD32_WORD("black mustang ce13.u85", 0x0000000, 0x0400000, CRC(6a089a8b) SHA1(20d8fd974cedef0a7f642dbfea9b2fe088e26de0) )
-	ROM_LOAD32_WORD("black mustang f004.u72", 0x0000000, 0x0400000, CRC(032bf21e) SHA1(65ac1f37dbee5d965e6499d7f8a2ace27856d233) )
+	ROM_LOAD32_WORD("black mustang ce13.u85", 0x0800000, 0x0400000, CRC(6a089a8b) SHA1(20d8fd974cedef0a7f642dbfea9b2fe088e26de0) )
+	ROM_LOAD32_WORD("black mustang f004.u72", 0x0800002, 0x0400000, CRC(032bf21e) SHA1(65ac1f37dbee5d965e6499d7f8a2ace27856d233) )
 ROM_END
 
 
@@ -2123,8 +2102,8 @@ ROM_END
 ROM_START( bmbgs )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("bumble bugs27v322-u73-cs-730d.bin", 0x0000000, 0x0400000, CRC(79dd907f) SHA1(06352c55ff36a82f4d0550b1723667f3287c4923) )
-	ROM_LOAD32_WORD("bumble bugs27v322-u86-cs-d246.bin", 0x0000000, 0x0400000, CRC(f5c204f9) SHA1(592fac02d26ec5edffce862fcce67869430028dd) )
+	ROM_LOAD32_WORD("bumble bugs27v322-cs-730d.u73", 0x0000002, 0x0400000, CRC(79dd907f) SHA1(06352c55ff36a82f4d0550b1723667f3287c4923) )
+	ROM_LOAD32_WORD("bumble bugs27v322-cs-d246.u86", 0x0000000, 0x0400000, CRC(f5c204f9) SHA1(592fac02d26ec5edffce862fcce67869430028dd) )
 ROM_END
 
 
@@ -2132,12 +2111,12 @@ ROM_END
 ROM_START( cinhell )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("chance hell u71.bin", 0x0000000, 0x0400000, CRC(f096865e) SHA1(c8091028dfaf43f7017c40a488d039bd6e1b0177) )
-	ROM_LOAD32_WORD("chance hell u72.bin", 0x0000000, 0x0400000, CRC(a6c1937d) SHA1(436bab41fabc9b991e4d8128abc5d7b1c627331e) )
-	ROM_LOAD32_WORD("chance hell u73.bin", 0x0000000, 0x0400000, CRC(d0a3c39d) SHA1(eff6a03042d175e6088dd7bada25791c7b404687) )
-	ROM_LOAD32_WORD("chance hell u84.bin", 0x0000000, 0x0400000, CRC(60427f98) SHA1(ff59b0e8bca48d29c08d1c7e672dc6318fcf9a10) )
-	ROM_LOAD32_WORD("chance hell u85.bin", 0x0000000, 0x0400000, CRC(44234acd) SHA1(384676e2fdeb1a216078826e0e4634d67e0d1be3) )
-	ROM_LOAD32_WORD("chance hell u86.bin", 0x0000000, 0x0400000, CRC(c064a4a6) SHA1(c3cc4326b92e690ee2df3ab2d58a809435d897c2) )
+	ROM_LOAD32_WORD("chance hell.u71", 0x1000002, 0x0400000, CRC(f096865e) SHA1(c8091028dfaf43f7017c40a488d039bd6e1b0177) )
+	ROM_LOAD32_WORD("chance hell.u72", 0x0800002, 0x0400000, CRC(a6c1937d) SHA1(436bab41fabc9b991e4d8128abc5d7b1c627331e) )
+	ROM_LOAD32_WORD("chance hell.u73", 0x0000002, 0x0400000, CRC(d0a3c39d) SHA1(eff6a03042d175e6088dd7bada25791c7b404687) )
+	ROM_LOAD32_WORD("chance hell.u84", 0x1000000, 0x0400000, CRC(60427f98) SHA1(ff59b0e8bca48d29c08d1c7e672dc6318fcf9a10) )
+	ROM_LOAD32_WORD("chance hell.u85", 0x0800000, 0x0400000, CRC(44234acd) SHA1(384676e2fdeb1a216078826e0e4634d67e0d1be3) )
+	ROM_LOAD32_WORD("chance hell.u86", 0x0000000, 0x0400000, CRC(c064a4a6) SHA1(c3cc4326b92e690ee2df3ab2d58a809435d897c2) )
 ROM_END
 
 
@@ -2145,9 +2124,9 @@ ROM_END
 ROM_START( crspru )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("crystalsprings.u72", 0x0000000, 0x0400000, CRC(8864632c) SHA1(a3227831ee71bc01846a7400e14fb40e62770e7a) )
-	ROM_LOAD32_WORD("crystalsprings.u73", 0x0000000, 0x0400000, CRC(caa73d62) SHA1(5e41beb9ade7bd50cdc616ab3f016a6615778ea2) )
-	ROM_LOAD32_WORD("crystalsprings.u85", 0x0000000, 0x0400000, CRC(c7c542c1) SHA1(8b49969414ef3d5811c804f16dc78cba71279618) )
+	ROM_LOAD32_WORD("crystalsprings.u72", 0x0800002, 0x0400000, CRC(8864632c) SHA1(a3227831ee71bc01846a7400e14fb40e62770e7a) )
+	ROM_LOAD32_WORD("crystalsprings.u73", 0x0000002, 0x0400000, CRC(caa73d62) SHA1(5e41beb9ade7bd50cdc616ab3f016a6615778ea2) )
+	ROM_LOAD32_WORD("crystalsprings.u85", 0x0800000, 0x0400000, CRC(c7c542c1) SHA1(8b49969414ef3d5811c804f16dc78cba71279618) )
 	ROM_LOAD32_WORD("crystalsprings.u86", 0x0000000, 0x0400000, CRC(dcb920fc) SHA1(71ce2a4298c9012ef7724b206ab1270b25c8bf8d) )
 ROM_END
 
@@ -2156,12 +2135,12 @@ ROM_END
 ROM_START( davedrag )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("5-dragons-m27v322-u71-cs-645e.bin", 0x0000000, 0x0400000, CRC(a0f5999e) SHA1(0be0d58588adbdbc7b728f164538d03509f13fe5) )
-	ROM_LOAD32_WORD("5-dragons-m27v322-u72-cs-701c.bin", 0x0000000, 0x0400000, CRC(e399df66) SHA1(d85a8011ab62b899b18873e4296c12da4291870a) )
-	ROM_LOAD32_WORD("5-dragons-m27v322-u73-cs-967c", 0x0000000, 0x0400000, CRC(7298e59b) SHA1(b104aec9be996bacad74120f461ad8cd7ef96e09) )
-	ROM_LOAD32_WORD("5-dragons-m27v322-u84-cs-5378.bin", 0x0000000, 0x0400000, CRC(f37a1ce5) SHA1(8684d64b20e1fe853e3b0f1a31796cddeb8b0dee) )
-	ROM_LOAD32_WORD("5-dragons-m27v322-u85-cs-740b.bin", 0x0000000, 0x0400000, CRC(4af3cae0) SHA1(79eb28b403aacf3ec7f52a5b3ff9e59ea35933c6) )
-	ROM_LOAD32_WORD("5-dragons-m27v322-u86-cs-d591.bin", 0x0000000, 0x0400000, CRC(1c3fd707) SHA1(3a9fc3e865c43ae0afa31954b2372487eb729d8a) )
+	ROM_LOAD32_WORD("5-dragons-m27v322-cs-645e.u71", 0x1000002, 0x0400000, CRC(a0f5999e) SHA1(0be0d58588adbdbc7b728f164538d03509f13fe5) )
+	ROM_LOAD32_WORD("5-dragons-m27v322-cs-701c.u72", 0x0800002, 0x0400000, CRC(e399df66) SHA1(d85a8011ab62b899b18873e4296c12da4291870a) )
+	ROM_LOAD32_WORD("5-dragons-m27v322-cs-967c.u73", 0x0000002, 0x0400000, CRC(7298e59b) SHA1(b104aec9be996bacad74120f461ad8cd7ef96e09) )
+	ROM_LOAD32_WORD("5-dragons-m27v322-cs-5378.u84", 0x1000000, 0x0400000, CRC(f37a1ce5) SHA1(8684d64b20e1fe853e3b0f1a31796cddeb8b0dee) )
+	ROM_LOAD32_WORD("5-dragons-m27v322-cs-740b.u85", 0x0800000, 0x0400000, CRC(4af3cae0) SHA1(79eb28b403aacf3ec7f52a5b3ff9e59ea35933c6) )
+	ROM_LOAD32_WORD("5-dragons-m27v322-cs-d591.u86", 0x0000000, 0x0400000, CRC(1c3fd707) SHA1(3a9fc3e865c43ae0afa31954b2372487eb729d8a) )
 ROM_END
 
 
@@ -2169,10 +2148,10 @@ ROM_END
 ROM_START( drfz6us )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("Deep Freeze U72.bin", 0x0000000, 0x0400000, CRC(bcfc43a6) SHA1(cd3b25005d67dc096b13b1d35eca9701f150e461) )
-	ROM_LOAD32_WORD("Deep Freeze U73.bin", 0x0000000, 0x0400000, CRC(80fc6979) SHA1(2a08852c930f4b732830da4761010cc87ef369fc) )
-	ROM_LOAD32_WORD("Deep Freeze U85.bin", 0x0000000, 0x0400000, CRC(ef3914cd) SHA1(e189180fb087636b6d07de5df934ed4c89e8477e) )
-	ROM_LOAD32_WORD("Deep Freeze U86.bin", 0x0000000, 0x0400000, CRC(7f98661d) SHA1(970dcba4c2f5b40702c33751c73541a22fbcdd26) )
+	ROM_LOAD32_WORD("Deep Freeze.u72", 0x0800002, 0x0400000, CRC(bcfc43a6) SHA1(cd3b25005d67dc096b13b1d35eca9701f150e461) )
+	ROM_LOAD32_WORD("Deep Freeze.u73", 0x0000002, 0x0400000, CRC(80fc6979) SHA1(2a08852c930f4b732830da4761010cc87ef369fc) )
+	ROM_LOAD32_WORD("Deep Freeze.u85", 0x0800000, 0x0400000, CRC(ef3914cd) SHA1(e189180fb087636b6d07de5df934ed4c89e8477e) )
+	ROM_LOAD32_WORD("Deep Freeze.u86", 0x0000000, 0x0400000, CRC(7f98661d) SHA1(970dcba4c2f5b40702c33751c73541a22fbcdd26) )
 ROM_END
 
 
@@ -2180,10 +2159,10 @@ ROM_END
 ROM_START( dltbel )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("delta belle1do6.u73", 0x0000000, 0x0400000, CRC(721cb449) SHA1(10be95803f3b7e86a009cc665e847dd97aeb6749) )
-	ROM_LOAD32_WORD("delta belle8ffe.u72", 0x0000000, 0x0400000, CRC(d6f6e2c9) SHA1(590c9b2000bdd888100426017250688bef9d3c1c) )
+	ROM_LOAD32_WORD("delta belle1do6.u73", 0x0000002, 0x0400000, CRC(721cb449) SHA1(10be95803f3b7e86a009cc665e847dd97aeb6749) )
+	ROM_LOAD32_WORD("delta belle8ffe.u72", 0x0800002, 0x0400000, CRC(d6f6e2c9) SHA1(590c9b2000bdd888100426017250688bef9d3c1c) )
 	ROM_LOAD32_WORD("delta belleeead.u86", 0x0000000, 0x0400000, CRC(ee2c3aad) SHA1(c3687c1447c3c324fa23f5f61d8b88139141a8d4) )
-	ROM_LOAD32_WORD("delta bellef080.u85", 0x0000000, 0x0400000, CRC(53eec755) SHA1(017cad59b8c25b7b24df869cb5d61867607cebb9) )
+	ROM_LOAD32_WORD("delta bellef080.u85", 0x0800000, 0x0400000, CRC(53eec755) SHA1(017cad59b8c25b7b24df869cb5d61867607cebb9) )
 ROM_END
 
 
@@ -2191,12 +2170,12 @@ ROM_END
 ROM_START( dmneyeus )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("diamond-eyes-m27v322-u71-cs-f0a9.bin", 0x0000000, 0x0400000, CRC(5706aa40) SHA1(d847bd0a4e210e3f065aa59129ee4654e3087909) )
-	ROM_LOAD32_WORD("diamond-eyes-m27v322-u72-cs-19be.bin", 0x0000000, 0x0400000, CRC(9f6b5923) SHA1(739d3848998ddbfaf577982c12d8edd19c348548) )
-	ROM_LOAD32_WORD("diamond-eyes-m27v322-u73-cs-08f9.bin", 0x0000000, 0x0400000, CRC(235ba6ca) SHA1(3534b4f74531a42543383b55a2c57853b1d3f4f1) )
-	ROM_LOAD32_WORD("diamond-eyes-m27v322-u84-cs-18ad.bin", 0x0000000, 0x0400000, CRC(6d0dea65) SHA1(ee23c0fe2ecb5adb5e383757ade9be17880e6b45) )
-	ROM_LOAD32_WORD("diamond-eyes-m27v322-u85-cs-176f.bin", 0x0000000, 0x0400000, CRC(f6ef5d9c) SHA1(94505a470ad65e75c6c984ec163ce92c558f491a) )
-	ROM_LOAD32_WORD("diamond-eyes-m27v322-u86-cs-68e5", 0x0000000, 0x0400000, CRC(926ce073) SHA1(12f0aa1e387f0f87be92afb9a917a30d51a63277) )
+	ROM_LOAD32_WORD("diamond-eyes-m27v322-u71-cs-f0a9.u71", 0x1000002, 0x0400000, CRC(5706aa40) SHA1(d847bd0a4e210e3f065aa59129ee4654e3087909) )
+	ROM_LOAD32_WORD("diamond-eyes-m27v322-u72-cs-19be.u72", 0x0800002, 0x0400000, CRC(9f6b5923) SHA1(739d3848998ddbfaf577982c12d8edd19c348548) )
+	ROM_LOAD32_WORD("diamond-eyes-m27v322-u73-cs-08f9.u73", 0x0000002, 0x0400000, CRC(235ba6ca) SHA1(3534b4f74531a42543383b55a2c57853b1d3f4f1) )
+	ROM_LOAD32_WORD("diamond-eyes-m27v322-u84-cs-18ad.u84", 0x1000000, 0x0400000, CRC(6d0dea65) SHA1(ee23c0fe2ecb5adb5e383757ade9be17880e6b45) )
+	ROM_LOAD32_WORD("diamond-eyes-m27v322-u85-cs-176f.u85", 0x0800000, 0x0400000, CRC(f6ef5d9c) SHA1(94505a470ad65e75c6c984ec163ce92c558f491a) )
+	ROM_LOAD32_WORD("diamond-eyes-m27v322-u86-cs-68e5.u86", 0x0000000, 0x0400000, CRC(926ce073) SHA1(12f0aa1e387f0f87be92afb9a917a30d51a63277) )
 ROM_END
 
 
@@ -2204,10 +2183,10 @@ ROM_END
 ROM_START( dmneye2 )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("diamondeyes484a.u72", 0x0000000, 0x0400000, CRC(f5f4d871) SHA1(e1a83ed4932602f460321bb2aaf648ef10711033) )
+	ROM_LOAD32_WORD("diamondeyes484a.u72", 0x0800002, 0x0400000, CRC(f5f4d871) SHA1(e1a83ed4932602f460321bb2aaf648ef10711033) )
 	ROM_LOAD32_WORD("diamondeyes64c8.u86", 0x0000000, 0x0400000, CRC(dd6cab00) SHA1(27934d1262e91078c0ed3d12510d1157e7d0774f) )
-	ROM_LOAD32_WORD("diamondeyescec2.u73", 0x0000000, 0x0400000, CRC(a0c21ad9) SHA1(689c9fb61fc7864be22b22fbdac295ced28340db) )
-	ROM_LOAD32_WORD("diamondeyese259.u85", 0x0000000, 0x0400000, CRC(ca138b5c) SHA1(e0af5ac82b40f40af0438e4f6ce5d1e8d984d34d) )
+	ROM_LOAD32_WORD("diamondeyescec2.u73", 0x0000002, 0x0400000, CRC(a0c21ad9) SHA1(689c9fb61fc7864be22b22fbdac295ced28340db) )
+	ROM_LOAD32_WORD("diamondeyese259.u85", 0x0800000, 0x0400000, CRC(ca138b5c) SHA1(e0af5ac82b40f40af0438e4f6ce5d1e8d984d34d) )
 ROM_END
 
 
@@ -2215,10 +2194,10 @@ ROM_END
 ROM_START( dblagus )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("Double Agent U72.bin", 0x0000000, 0x0400000, CRC(fdb9a838) SHA1(83976af01273234d7eaeedba60164f9c31915e4b) )
-	ROM_LOAD32_WORD("Double Agent U73.bin", 0x0000000, 0x0400000, CRC(235e2cc8) SHA1(aaf1e71f4cdeb039e3c760031b07d7eb54467742) )
-	ROM_LOAD32_WORD("Double Agent U85.bin", 0x0000000, 0x0400000, CRC(4d482f50) SHA1(8105371d582bcc5a7d0e35f110f394fc491550cf) )
-	ROM_LOAD32_WORD("Double Agent U86.bin", 0x0000000, 0x0400000, CRC(d081a5f3) SHA1(0adfbdc36b70a26f858d353ee4381e5848d6e499) )
+	ROM_LOAD32_WORD("Double Agent.u72", 0x0800002, 0x0400000, CRC(fdb9a838) SHA1(83976af01273234d7eaeedba60164f9c31915e4b) )
+	ROM_LOAD32_WORD("Double Agent.u73", 0x0000002, 0x0400000, CRC(235e2cc8) SHA1(aaf1e71f4cdeb039e3c760031b07d7eb54467742) )
+	ROM_LOAD32_WORD("Double Agent.u85", 0x0800000, 0x0400000, CRC(4d482f50) SHA1(8105371d582bcc5a7d0e35f110f394fc491550cf) )
+	ROM_LOAD32_WORD("Double Agent.u86", 0x0000000, 0x0400000, CRC(d081a5f3) SHA1(0adfbdc36b70a26f858d353ee4381e5848d6e499) )
 ROM_END
 
 
@@ -2226,9 +2205,9 @@ ROM_END
 ROM_START( eaglrock )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("eaglerock.u72", 0x0000000, 0x0400000, CRC(c3ac8cfd) SHA1(ff2b45f49929dfa9aed44af2a1b204a96ed098fb) )
-	ROM_LOAD32_WORD("eaglerock.u73", 0x0000000, 0x0400000, CRC(ce3d4fd2) SHA1(ef784c2ae5151c7191cac66093cbc1f85155a4e9) )
-	ROM_LOAD32_WORD("eaglerock.u85", 0x0000000, 0x0400000, CRC(a3f768e9) SHA1(1b0b96368530d51280da81479e9a3b44fb719503) )
+	ROM_LOAD32_WORD("eaglerock.u72", 0x0800002, 0x0400000, CRC(c3ac8cfd) SHA1(ff2b45f49929dfa9aed44af2a1b204a96ed098fb) )
+	ROM_LOAD32_WORD("eaglerock.u73", 0x0000002, 0x0400000, CRC(ce3d4fd2) SHA1(ef784c2ae5151c7191cac66093cbc1f85155a4e9) )
+	ROM_LOAD32_WORD("eaglerock.u85", 0x0800000, 0x0400000, CRC(a3f768e9) SHA1(1b0b96368530d51280da81479e9a3b44fb719503) )
 	ROM_LOAD32_WORD("eaglerock.u86", 0x0000000, 0x0400000, CRC(0b0cff73) SHA1(ea1bbf9e00a5308c9e853e357f9ac4b32866a195) )
 ROM_END
 
@@ -2237,9 +2216,9 @@ ROM_END
 ROM_START( eastland )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("easterisland.u72", 0x0000000, 0x0400000, CRC(16159d21) SHA1(e3b15c84d2a6ef9b840456cecf290798b6e6961d) )
-	ROM_LOAD32_WORD("easterisland.u73", 0x0000000, 0x0400000, CRC(99591f11) SHA1(9d08d339ecb19682ace66f58b8aa98b62d958bec) )
-	ROM_LOAD32_WORD("easterisland.u85", 0x0000000, 0x0400000, CRC(1fb075e7) SHA1(f08f43e19e84b897f0c350a0b86431939947d3b0) )
+	ROM_LOAD32_WORD("easterisland.u72", 0x0800002, 0x0400000, CRC(16159d21) SHA1(e3b15c84d2a6ef9b840456cecf290798b6e6961d) )
+	ROM_LOAD32_WORD("easterisland.u73", 0x0000002, 0x0400000, CRC(99591f11) SHA1(9d08d339ecb19682ace66f58b8aa98b62d958bec) )
+	ROM_LOAD32_WORD("easterisland.u85", 0x0800000, 0x0400000, CRC(1fb075e7) SHA1(f08f43e19e84b897f0c350a0b86431939947d3b0) )
 	ROM_LOAD32_WORD("easterisland.u86", 0x0000000, 0x0400000, CRC(f24bcc2d) SHA1(519d06b85b7c3a4025f029daa394423bc6e3b4a2) )
 ROM_END
 
@@ -2248,10 +2227,10 @@ ROM_END
 ROM_START( eggsrich )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("Eggstreme riches U72.bin", 0x0000000, 0x0400000, CRC(883274fd) SHA1(60e65e2f7f1774eac4520f5d96dbcd149ee69b91) )
-	ROM_LOAD32_WORD("Eggstreme riches U73.bin", 0x0000000, 0x0400000, CRC(d72f0fb0) SHA1(eedebb24d23899f4caffe7c79ae4ac51856df1b3) )
-	ROM_LOAD32_WORD("Eggstreme riches U85.bin", 0x0000000, 0x0400000, CRC(2cbd9e98) SHA1(dcd5df5a3c177992d13077fa434ef741e7607d89) )
-	ROM_LOAD32_WORD("Eggstreme riches U86.bin", 0x0000000, 0x0400000, CRC(9d3476d1) SHA1(983ababf1f8d65346c4cf89b7ac817156a64a636) )
+	ROM_LOAD32_WORD("Eggstreme riches.u72", 0x0800002, 0x0400000, CRC(883274fd) SHA1(60e65e2f7f1774eac4520f5d96dbcd149ee69b91) )
+	ROM_LOAD32_WORD("Eggstreme riches.u73", 0x0000002, 0x0400000, CRC(d72f0fb0) SHA1(eedebb24d23899f4caffe7c79ae4ac51856df1b3) )
+	ROM_LOAD32_WORD("Eggstreme riches.u85", 0x0800000, 0x0400000, CRC(2cbd9e98) SHA1(dcd5df5a3c177992d13077fa434ef741e7607d89) )
+	ROM_LOAD32_WORD("Eggstreme riches.u86", 0x0000000, 0x0400000, CRC(9d3476d1) SHA1(983ababf1f8d65346c4cf89b7ac817156a64a636) )
 ROM_END
 
 
@@ -2259,9 +2238,9 @@ ROM_END
 ROM_START( efcashex )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("enchanted forest cshexprs.u72", 0x0000000, 0x0400000, CRC(f3ec21f4) SHA1(db9d98fe4788f27c33e84b612632feeea6d944c7) )
-	ROM_LOAD32_WORD("enchanted forest cshexprs.u73", 0x0000000, 0x0400000, CRC(d5c600ba) SHA1(e2eb729e29d66ba5614fce1f4bd5a4883b50c499) )
-	ROM_LOAD32_WORD("enchanted forest cshexprs.u85", 0x0000000, 0x00c0000, CRC(95cf5a7b) SHA1(ac5fbd83e2d73a1d6d55736d868c44396371e24e) ) // bad? missing other pairing too?
+	ROM_LOAD32_WORD("enchanted forest cshexprs.u72", 0x0800002, 0x0400000, CRC(f3ec21f4) SHA1(db9d98fe4788f27c33e84b612632feeea6d944c7) )
+	ROM_LOAD32_WORD("enchanted forest cshexprs.u73", 0x0000002, 0x0400000, CRC(d5c600ba) SHA1(e2eb729e29d66ba5614fce1f4bd5a4883b50c499) )
+	ROM_LOAD32_WORD("enchanted forest cshexprs.u85", 0x0800000, 0x00c0000, CRC(95cf5a7b) SHA1(ac5fbd83e2d73a1d6d55736d868c44396371e24e) ) // bad? missing other pairing too?
 ROM_END
 
 
@@ -2269,10 +2248,10 @@ ROM_END
 ROM_START( flamoly )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("flame of olympus-u72-27v322-cs-d20d.bin", 0x0000000, 0x0400000, CRC(29a66753) SHA1(7aedd4824a3afec74942fad5b84fd72b6ab242e7) )
-	ROM_LOAD32_WORD("flame of olympus-u73-27v322-cs-4068", 0x0000000, 0x0400000, CRC(aad37086) SHA1(76495ba46da0ae848ba290706be337c45afe6361) )
-	ROM_LOAD32_WORD("flame of olympus-u85-27v322-cs-d2c9", 0x0000000, 0x0400000, CRC(4fcd025d) SHA1(63aa8d0f5dd331e10c032cc5ac67516054db7c27) )
-	ROM_LOAD32_WORD("flame of olympus-u86-27v322-cs-1492", 0x0000000, 0x0400000, CRC(f06f3d69) SHA1(83e1d2f72275de836e170c1c10905cb6da58b90a) )
+	ROM_LOAD32_WORD("flame of olympus-27v322-cs-d20d.u72", 0x0800002, 0x0400000, CRC(29a66753) SHA1(7aedd4824a3afec74942fad5b84fd72b6ab242e7) )
+	ROM_LOAD32_WORD("flame of olympus-27v322-cs-4068.u73", 0x0000002, 0x0400000, CRC(aad37086) SHA1(76495ba46da0ae848ba290706be337c45afe6361) )
+	ROM_LOAD32_WORD("flame of olympus-27v322-cs-d2c9.u85", 0x0800000, 0x0400000, CRC(4fcd025d) SHA1(63aa8d0f5dd331e10c032cc5ac67516054db7c27) )
+	ROM_LOAD32_WORD("flame of olympus-27v322-cs-1492.u86", 0x0000000, 0x0400000, CRC(f06f3d69) SHA1(83e1d2f72275de836e170c1c10905cb6da58b90a) )
 ROM_END
 
 
@@ -2280,9 +2259,9 @@ ROM_END
 ROM_START( flamoly2 )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("flamesofolympusm27v322.u72", 0x0000000, 0x0400000, CRC(330c1988) SHA1(0d7dae49495c5b164121cd756d6e22af17a9b41b) )
-	ROM_LOAD32_WORD("flamesofolympusm27v322.u73", 0x0000000, 0x0400000, CRC(c8337682) SHA1(e87c5be62528e2e73659ce73a17d1ea21ed3ccf0) )
-	ROM_LOAD32_WORD("flamesofolympusm27v322.u85", 0x0000000, 0x0400000, CRC(2661893a) SHA1(4a79f0b638f5d4fdfa7dcc7661afe3ae1823e6ce) )
+	ROM_LOAD32_WORD("flamesofolympusm27v322.u72", 0x0800002, 0x0400000, CRC(330c1988) SHA1(0d7dae49495c5b164121cd756d6e22af17a9b41b) )
+	ROM_LOAD32_WORD("flamesofolympusm27v322.u73", 0x0000002, 0x0400000, CRC(c8337682) SHA1(e87c5be62528e2e73659ce73a17d1ea21ed3ccf0) )
+	ROM_LOAD32_WORD("flamesofolympusm27v322.u85", 0x0800000, 0x0400000, CRC(2661893a) SHA1(4a79f0b638f5d4fdfa7dcc7661afe3ae1823e6ce) )
 	ROM_LOAD32_WORD("flamesofolympusm27v322.u86", 0x0000000, 0x0400000, CRC(2ea7c6d9) SHA1(cd887f0689737fd447786b966297ea3994fb8cb7) )
 ROM_END
 
@@ -2291,39 +2270,46 @@ ROM_END
 ROM_START( flamolus )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("Flames of Olympus U72 09ECD2D8.bin", 0x0000000, 0x0400000, CRC(1eb5d81a) SHA1(e3dbde32ce525e3070612d411326ca85a57c79fc) )
-	ROM_LOAD32_WORD("Flames of Olympus U73 1DCC4068.bin", 0x0000000, 0x0400000, CRC(aad37086) SHA1(76495ba46da0ae848ba290706be337c45afe6361) )
-	ROM_LOAD32_WORD("Flames of Olympus U85 09EFD2C9.bin", 0x0000000, 0x0400000, CRC(4fcd025d) SHA1(63aa8d0f5dd331e10c032cc5ac67516054db7c27) )
-	ROM_LOAD32_WORD("Flames of Olympus U86 1E2A1492.bin", 0x0000000, 0x0400000, CRC(f06f3d69) SHA1(83e1d2f72275de836e170c1c10905cb6da58b90a) )
+	ROM_LOAD32_WORD("Flames of Olympus 09ECD2D8.u72", 0x0800002, 0x0400000, CRC(1eb5d81a) SHA1(e3dbde32ce525e3070612d411326ca85a57c79fc) )
+	ROM_LOAD32_WORD("Flames of Olympus 1DCC4068.u73", 0x0000002, 0x0400000, CRC(aad37086) SHA1(76495ba46da0ae848ba290706be337c45afe6361) )
+	ROM_LOAD32_WORD("Flames of Olympus 09EFD2C9.u85", 0x0800000, 0x0400000, CRC(4fcd025d) SHA1(63aa8d0f5dd331e10c032cc5ac67516054db7c27) )
+	ROM_LOAD32_WORD("Flames of Olympus 1E2A1492.u86", 0x0000000, 0x0400000, CRC(f06f3d69) SHA1(83e1d2f72275de836e170c1c10905cb6da58b90a) )
 ROM_END
 
 ROM_START( flamolusa )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("Flames of Olympus U72 09ECD2D8_alt.bin", 0x0000000, 0x0400000, CRC(b4581c28) SHA1(1daa0f1218dba6e6eb96b7925ea71be531ffa787) )
-	ROM_LOAD32_WORD("Flames of Olympus U73 1DCC4068.bin", 0x0000000, 0x0400000, CRC(aad37086) SHA1(76495ba46da0ae848ba290706be337c45afe6361) )
-	ROM_LOAD32_WORD("Flames of Olympus U85 09EFD2C9.bin", 0x0000000, 0x0400000, CRC(4fcd025d) SHA1(63aa8d0f5dd331e10c032cc5ac67516054db7c27) )
-	ROM_LOAD32_WORD("Flames of Olympus U86 1E2A1492.bin", 0x0000000, 0x0400000, CRC(f06f3d69) SHA1(83e1d2f72275de836e170c1c10905cb6da58b90a) )
+	ROM_LOAD32_WORD("Flames of Olympus 09ECD2D8_alt.u72", 0x0800002, 0x0400000, CRC(b4581c28) SHA1(1daa0f1218dba6e6eb96b7925ea71be531ffa787) )
+	ROM_LOAD32_WORD("Flames of Olympus 1DCC4068.u73",     0x0000000, 0x0400000, CRC(aad37086) SHA1(76495ba46da0ae848ba290706be337c45afe6361) )
+	ROM_LOAD32_WORD("Flames of Olympus 09EFD2C9.u85",     0x0000000, 0x0400000, CRC(4fcd025d) SHA1(63aa8d0f5dd331e10c032cc5ac67516054db7c27) )
+	ROM_LOAD32_WORD("Flames of Olympus 1E2A1492.u86",     0x0000000, 0x0400000, CRC(f06f3d69) SHA1(83e1d2f72275de836e170c1c10905cb6da58b90a) )
 ROM_END
 
 
 ROM_START( foxred )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("foxworthy redneck.u72", 0x0000000, 0x0400000, CRC(ff2ff01d) SHA1(c0d17b3d9907d3876c7a1dbc19b023afcffb2bb1) )
-	ROM_LOAD32_WORD("foxworthy redneck.u73", 0x0000000, 0x0400000, CRC(4b778a84) SHA1(d11b2aefcaa2ac22fea80faab524f82511b6344a) )
-	ROM_LOAD32_WORD("foxworthy redneck.u85", 0x0000000, 0x0400000, CRC(52d5395e) SHA1(57b854e516881bc208b48ed82fdef25059e2efab) )
+	ROM_LOAD32_WORD("foxworthy redneck.u72", 0x0800002, 0x0400000, CRC(ff2ff01d) SHA1(c0d17b3d9907d3876c7a1dbc19b023afcffb2bb1) )
+	ROM_LOAD32_WORD("foxworthy redneck.u73", 0x0000002, 0x0400000, CRC(4b778a84) SHA1(d11b2aefcaa2ac22fea80faab524f82511b6344a) )
+	ROM_LOAD32_WORD("foxworthy redneck.u85", 0x0800000, 0x0400000, CRC(52d5395e) SHA1(57b854e516881bc208b48ed82fdef25059e2efab) )
 	ROM_LOAD32_WORD("foxworthy redneck.u86", 0x0000000, 0x0400000, CRC(871a3861) SHA1(4344f7e1fd5414eda3afc40e60df7188425fa80c) )
 ROM_END
 
-
+ROM_START( jefffox )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("jeff-foxworthy-m27v322-cs-127d.u72", 0x0800002, 0x0400000, CRC(ff2ff01d) SHA1(c0d17b3d9907d3876c7a1dbc19b023afcffb2bb1) )
+	ROM_LOAD32_WORD("jeff-foxworthy-m27v322-cs-c40e.u73", 0x0000002, 0x0400000, CRC(4b778a84) SHA1(d11b2aefcaa2ac22fea80faab524f82511b6344a) )
+	ROM_LOAD32_WORD("jeff-foxworthy-m27v322-cs-f86f.u85", 0x0800000, 0x0400000, CRC(52d5395e) SHA1(57b854e516881bc208b48ed82fdef25059e2efab) )
+	ROM_LOAD32_WORD("jeff-foxworthy-m27v322-cs-6dfc.u86", 0x0000000, 0x0400000, CRC(6b0a7eb3) SHA1(cd99fed52643afa596bfbf4a18deca42043520ef) ) // only this rom differs
+ROM_END
 
 ROM_START( frogwld )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("frogwild2m27v322.u72", 0x0000000, 0x0400000, CRC(36f8066f) SHA1(c8a3dc25488d7d578e05bf247b2d3e0959f5c511) )
-	ROM_LOAD32_WORD("frogwild2m27v322.u73", 0x0000000, 0x0400000, CRC(f058f8f3) SHA1(02efb3de7765e917fb6c29cbfdd90845fb3f0a7b) )
-	ROM_LOAD32_WORD("frogwild2m27v322.u85", 0x0000000, 0x0400000, CRC(b4165c0f) SHA1(823179a70841f49c8100d8d77620548ceea01550) )
+	ROM_LOAD32_WORD("frogwild2m27v322.u72", 0x0800002, 0x0400000, CRC(36f8066f) SHA1(c8a3dc25488d7d578e05bf247b2d3e0959f5c511) )
+	ROM_LOAD32_WORD("frogwild2m27v322.u73", 0x0000002, 0x0400000, CRC(f058f8f3) SHA1(02efb3de7765e917fb6c29cbfdd90845fb3f0a7b) )
+	ROM_LOAD32_WORD("frogwild2m27v322.u85", 0x0800000, 0x0400000, CRC(b4165c0f) SHA1(823179a70841f49c8100d8d77620548ceea01550) )
 	ROM_LOAD32_WORD("frogwild2m27v322.u86", 0x0000000, 0x0400000, CRC(feb93395) SHA1(56c0f9b0e3616bc57a564220303c13f60fc72df8) )
 ROM_END
 
@@ -2332,9 +2318,9 @@ ROM_END
 ROM_START( gwnn )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("game with no name 0f01.u72", 0x0000000, 0x0400000, CRC(68b68c92) SHA1(3c23e02ba9cc31352df19b3f641191a4e6261e7b) )
-	ROM_LOAD32_WORD("game with no name 33a1.u73", 0x0000000, 0x0400000, CRC(3644eacc) SHA1(115b7a7ddf9ca1c82aae7c8dcf864d3c224e93be) )
-	ROM_LOAD32_WORD("game with no name c44e.u85", 0x0000000, 0x0400000, CRC(3b95fa30) SHA1(09e53a4434950212346f447315b41da9216a2e24) )
+	ROM_LOAD32_WORD("game with no name 0f01.u72", 0x0800002, 0x0400000, CRC(68b68c92) SHA1(3c23e02ba9cc31352df19b3f641191a4e6261e7b) )
+	ROM_LOAD32_WORD("game with no name 33a1.u73", 0x0000002, 0x0400000, CRC(3644eacc) SHA1(115b7a7ddf9ca1c82aae7c8dcf864d3c224e93be) )
+	ROM_LOAD32_WORD("game with no name c44e.u85", 0x0800000, 0x0400000, CRC(3b95fa30) SHA1(09e53a4434950212346f447315b41da9216a2e24) )
 	ROM_LOAD32_WORD("game with no name e062.u86", 0x0000000, 0x0400000, CRC(2b6407cf) SHA1(ac9242ebd8e669e84664e9aa0f3ec1eb15049a3e) )
 ROM_END
 
@@ -2344,10 +2330,10 @@ ROM_END
 ROM_START( gldgong )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("Golden gong U72.bin", 0x0000000, 0x0400000, CRC(86ca7b2b) SHA1(938dcbc846d0f87e374d6c835ac6cb8185faf48c) )
-	ROM_LOAD32_WORD("Golden gong U73.bin", 0x0000000, 0x0400000, CRC(de1a91f6) SHA1(6bc640cd5b2ffebed7ef4b43c980f10eb22ec5ba) )
-	ROM_LOAD32_WORD("Golden gong U85.bin", 0x0000000, 0x0400000, CRC(29557de6) SHA1(1e7f03ca41d510561e22b944a46b98d00abfd29c) )
-	ROM_LOAD32_WORD("Golden gong U86.bin", 0x0000000, 0x0400000, CRC(9e825d94) SHA1(642edc067c651b127890324fcbd947124fd9a07e) )
+	ROM_LOAD32_WORD("Golden gong.u72", 0x0800002, 0x0400000, CRC(86ca7b2b) SHA1(938dcbc846d0f87e374d6c835ac6cb8185faf48c) )
+	ROM_LOAD32_WORD("Golden gong.u73", 0x0000002, 0x0400000, CRC(de1a91f6) SHA1(6bc640cd5b2ffebed7ef4b43c980f10eb22ec5ba) )
+	ROM_LOAD32_WORD("Golden gong.u85", 0x0800000, 0x0400000, CRC(29557de6) SHA1(1e7f03ca41d510561e22b944a46b98d00abfd29c) )
+	ROM_LOAD32_WORD("Golden gong.u86", 0x0000000, 0x0400000, CRC(9e825d94) SHA1(642edc067c651b127890324fcbd947124fd9a07e) )
 ROM_END
 
 
@@ -2356,9 +2342,9 @@ ROM_START( gldgong2 )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
 	ROM_LOAD32_WORD("goldengong296c.u86", 0x0000000, 0x0400000, CRC(9e825d94) SHA1(642edc067c651b127890324fcbd947124fd9a07e) )
-	ROM_LOAD32_WORD("goldengong4cc9.u72", 0x0000000, 0x0400000, CRC(86ca7b2b) SHA1(938dcbc846d0f87e374d6c835ac6cb8185faf48c) )
-	ROM_LOAD32_WORD("goldengongad90.u85", 0x0000000, 0x0400000, CRC(29557de6) SHA1(1e7f03ca41d510561e22b944a46b98d00abfd29c) )
-	ROM_LOAD32_WORD("goldengongb4f0.u73", 0x0000000, 0x0400000, CRC(de1a91f6) SHA1(6bc640cd5b2ffebed7ef4b43c980f10eb22ec5ba) )
+	ROM_LOAD32_WORD("goldengong4cc9.u72", 0x0800002, 0x0400000, CRC(86ca7b2b) SHA1(938dcbc846d0f87e374d6c835ac6cb8185faf48c) )
+	ROM_LOAD32_WORD("goldengongad90.u85", 0x0800000, 0x0400000, CRC(29557de6) SHA1(1e7f03ca41d510561e22b944a46b98d00abfd29c) )
+	ROM_LOAD32_WORD("goldengongb4f0.u73", 0x0000002, 0x0400000, CRC(de1a91f6) SHA1(6bc640cd5b2ffebed7ef4b43c980f10eb22ec5ba) )
 ROM_END
 
 
@@ -2366,10 +2352,10 @@ ROM_END
 ROM_START( gldincas )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("goldenincas2adb.u85", 0x0000000, 0x0400000, CRC(cb1268de) SHA1(dc5a18736ac76c59811c7bccd7c3a4cd468fccec) )
+	ROM_LOAD32_WORD("goldenincas2adb.u85", 0x0800000, 0x0400000, CRC(cb1268de) SHA1(dc5a18736ac76c59811c7bccd7c3a4cd468fccec) )
 	ROM_LOAD32_WORD("goldenincas3fc7.u86", 0x0000000, 0x0400000, CRC(5e53d9af) SHA1(e850e1707be120b9d6a23524c65e63efb20d1cf1) )
-	ROM_LOAD32_WORD("goldenincascd57.u73", 0x0000000, 0x0400000, CRC(768cecbb) SHA1(2cd2b5906c0a45aecaca2d26063b2ce62ca588eb) )
-	ROM_LOAD32_WORD("goldenincasf152.u72", 0x0000000, 0x0400000, CRC(ce66ccd2) SHA1(71f204ecfd0e31b071cde59bbd974e489ee1f570) )
+	ROM_LOAD32_WORD("goldenincascd57.u73", 0x0000002, 0x0400000, CRC(768cecbb) SHA1(2cd2b5906c0a45aecaca2d26063b2ce62ca588eb) )
+	ROM_LOAD32_WORD("goldenincasf152.u72", 0x0800002, 0x0400000, CRC(ce66ccd2) SHA1(71f204ecfd0e31b071cde59bbd974e489ee1f570) )
 ROM_END
 
 
@@ -2377,46 +2363,25 @@ ROM_END
 ROM_START( hlntry )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("helen of troy.u72", 0x0000000, 0x0400000, CRC(b694d927) SHA1(0151f3980a401d646a18b9956d3d247daaa48bf2) )
-	ROM_LOAD32_WORD("helen of troy.u73", 0x0000000, 0x0400000, CRC(aebf8e8e) SHA1(22b28883c4ea365c07b6c4ae2fe3c873be158685) )
-	ROM_LOAD32_WORD("helen of troy.u85", 0x0000000, 0x0400000, CRC(4c82ed24) SHA1(455ac96a92b383cb7e2391e92e528c3b4e51f5cc) )
+	ROM_LOAD32_WORD("helen of troy.u72", 0x0800002, 0x0400000, CRC(b694d927) SHA1(0151f3980a401d646a18b9956d3d247daaa48bf2) )
+	ROM_LOAD32_WORD("helen of troy.u73", 0x0000002, 0x0400000, CRC(aebf8e8e) SHA1(22b28883c4ea365c07b6c4ae2fe3c873be158685) )
+	ROM_LOAD32_WORD("helen of troy.u85", 0x0800000, 0x0400000, CRC(4c82ed24) SHA1(455ac96a92b383cb7e2391e92e528c3b4e51f5cc) )
 	ROM_LOAD32_WORD("helen of troy.u86", 0x0000000, 0x0400000, CRC(7100841d) SHA1(67fa5616ca0bb2b25ed2951d3decf0126e0bac82) )
 ROM_END
 
 
 
-ROM_START( hlsunmon )
-	ARISTMK6_BIOS
-	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("HL Sun and Moon U11.bin", 0x0000000, 0x0400000, CRC(b6a8df40) SHA1(316e3f98b75c1bdd0e8fc55aee2cf20b8a45ff4c) )
-	ROM_LOAD32_WORD("HL Sun and Moon U12.bin", 0x0000000, 0x0400000, CRC(98cde50e) SHA1(68e60411a8c10b73482a4cc8d3f14ebdedca0ae9) )
-	ROM_LOAD32_WORD("HL Sun and Moon U13.bin", 0x0000000, 0x0400000, CRC(ac9143cc) SHA1(75aeea2ad26044bef9eb31495d67414a416ee6d4) )
-	ROM_LOAD32_WORD("HL Sun and Moon U14.bin", 0x0000000, 0x0400000, CRC(a5552dd3) SHA1(1bbe24950e19441ca5144cb9b38320803bd5d26e) )
-	ROM_LOAD32_WORD("HL Sun and Moon U21.bin", 0x0000000, 0x0400000, CRC(b0cc922d) SHA1(5a45d0c995c639739176a5aad42e186b122eead1) )
-	ROM_LOAD32_WORD("HL Sun and Moon U22.bin", 0x0000000, 0x0400000, CRC(542ec911) SHA1(48988bdefb9ad6a7e0c733eda1f220b0347cab5f) )
-	ROM_LOAD32_WORD("HL Sun and Moon U23.bin", 0x0000000, 0x0400000, CRC(0ac455b1) SHA1(3ca4f4a0172f18692c9f82a9a435ffc1ca39ddc2) )
-	ROM_LOAD32_WORD("HL Sun and Moon U24.bin", 0x0000000, 0x0400000, CRC(19e5b7e0) SHA1(cf17a84ba08a2f24725d4ccbe046710c2f3a2459) )
-ROM_END
 
 
 
-ROM_START( jefffox )
-	ARISTMK6_BIOS
-	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("jeff-foxworthy-u72-m27v322-cs-127d", 0x0000000, 0x0400000, CRC(ff2ff01d) SHA1(c0d17b3d9907d3876c7a1dbc19b023afcffb2bb1) )
-	ROM_LOAD32_WORD("jeff-foxworthy-u73-m27v322-cs-c40e.bin", 0x0000000, 0x0400000, CRC(4b778a84) SHA1(d11b2aefcaa2ac22fea80faab524f82511b6344a) )
-	ROM_LOAD32_WORD("jeff-foxworthy-u85-m27v322-cs-f86f.bin", 0x0000000, 0x0400000, CRC(52d5395e) SHA1(57b854e516881bc208b48ed82fdef25059e2efab) )
-	ROM_LOAD32_WORD("jeff-foxworthy-u86-m27v322-cs-6dfc.bin", 0x0000000, 0x0400000, CRC(6b0a7eb3) SHA1(cd99fed52643afa596bfbf4a18deca42043520ef) )
-ROM_END
-
 
 
 ROM_START( jewelunc )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("jewel enchantress.u72", 0x0000000, 0x0400000, CRC(6c168e3b) SHA1(db251f024881e27615049f94c6e11002e89b2c40) )
-	ROM_LOAD32_WORD("jewel enchantress.u73", 0x0000000, 0x0400000, CRC(3517c88f) SHA1(fd02618f6f4553ceda17780c7d1c5cf7a2ec44a6) )
-	ROM_LOAD32_WORD("jewel enchantress.u85", 0x0000000, 0x0400000, CRC(9194156f) SHA1(b030432ae7da6b36af85a1ddd43a5657542989ad) )
+	ROM_LOAD32_WORD("jewel enchantress.u72", 0x0800002, 0x0400000, CRC(6c168e3b) SHA1(db251f024881e27615049f94c6e11002e89b2c40) )
+	ROM_LOAD32_WORD("jewel enchantress.u73", 0x0000002, 0x0400000, CRC(3517c88f) SHA1(fd02618f6f4553ceda17780c7d1c5cf7a2ec44a6) )
+	ROM_LOAD32_WORD("jewel enchantress.u85", 0x0800000, 0x0400000, CRC(9194156f) SHA1(b030432ae7da6b36af85a1ddd43a5657542989ad) )
 	ROM_LOAD32_WORD("jewel enchantress.u86", 0x0000000, 0x0400000, CRC(68a438be) SHA1(c62fae7d0f4909ba5d3b72fc7f903a49cc25c168) )
 ROM_END
 
@@ -2425,9 +2390,9 @@ ROM_END
 ROM_START( lemrol )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("let em roll.u72", 0x0000000, 0x0400000, CRC(70a40bb3) SHA1(1c3adcc36d4bb71f0099eb3663b2d67d64ba979b) )
-	ROM_LOAD32_WORD("let em roll.u73", 0x0000000, 0x0400000, CRC(57f6a4be) SHA1(c91662e666b8c02b83f61a410da93ad08b4111d2) )
-	ROM_LOAD32_WORD("let em roll.u85", 0x0000000, 0x0400000, CRC(b8be84bb) SHA1(1c62da796f44f23612ba605ade1835089edac3ab) )
+	ROM_LOAD32_WORD("let em roll.u72", 0x0800002, 0x0400000, CRC(70a40bb3) SHA1(1c3adcc36d4bb71f0099eb3663b2d67d64ba979b) )
+	ROM_LOAD32_WORD("let em roll.u73", 0x0000002, 0x0400000, CRC(57f6a4be) SHA1(c91662e666b8c02b83f61a410da93ad08b4111d2) )
+	ROM_LOAD32_WORD("let em roll.u85", 0x0800000, 0x0400000, CRC(b8be84bb) SHA1(1c62da796f44f23612ba605ade1835089edac3ab) )
 	ROM_LOAD32_WORD("let em roll.u86", 0x0000000, 0x0400000, CRC(18d3513f) SHA1(5d592ce386054627c6f18e87d32317af73866207) )
 ROM_END
 
@@ -2436,9 +2401,9 @@ ROM_END
 ROM_START( lineking )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("lineking50ln.u72", 0x0000000, 0x0400000, CRC(7440510c) SHA1(e00ee345e8811a7d72f33f30f8dbffee8a550e6a) )
-	ROM_LOAD32_WORD("lineking50ln.u73", 0x0000000, 0x0400000, CRC(1b959c89) SHA1(167d628ea3be95cfacad318288bd965823b16ea3) )
-	ROM_LOAD32_WORD("lineking50ln.u85", 0x0000000, 0x0400000, CRC(1256b8d1) SHA1(e2ab3d713c41cf00a7b3930678e0f56102fabbca) )
+	ROM_LOAD32_WORD("lineking50ln.u72", 0x0800002, 0x0400000, CRC(7440510c) SHA1(e00ee345e8811a7d72f33f30f8dbffee8a550e6a) )
+	ROM_LOAD32_WORD("lineking50ln.u73", 0x0000002, 0x0400000, CRC(1b959c89) SHA1(167d628ea3be95cfacad318288bd965823b16ea3) )
+	ROM_LOAD32_WORD("lineking50ln.u85", 0x0800000, 0x0400000, CRC(1256b8d1) SHA1(e2ab3d713c41cf00a7b3930678e0f56102fabbca) )
 	ROM_LOAD32_WORD("lineking50ln.u86", 0x0000000, 0x0400000, CRC(7f739eb4) SHA1(cccba4551c7f2901b077473f202b1437da433ab4) )
 ROM_END
 
@@ -2447,8 +2412,8 @@ ROM_END
 ROM_START( lovestrk )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("love struck-27v322-u73-cs-a008.bin", 0x0000000, 0x0400000, CRC(421f717d) SHA1(29eaecef6dd389329a8cfdcfa4bf3f90252eb096) )
-	ROM_LOAD32_WORD("love struck-27v322-u86-cs-0058.bin", 0x0000000, 0x0400000, CRC(c374ee56) SHA1(18b084c32a4dad6dacd3eeaf6ba430053405dbe8) )
+	ROM_LOAD32_WORD("love struck-27v322-cs-a008.u73", 0x0000002, 0x0400000, CRC(421f717d) SHA1(29eaecef6dd389329a8cfdcfa4bf3f90252eb096) )
+	ROM_LOAD32_WORD("love struck-27v322-cs-0058.u86", 0x0000000, 0x0400000, CRC(c374ee56) SHA1(18b084c32a4dad6dacd3eeaf6ba430053405dbe8) )
 ROM_END
 
 
@@ -2456,9 +2421,9 @@ ROM_END
 ROM_START( mgforst )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("magicforest50ln.u72", 0x0000000, 0x0400000, CRC(53d881a2) SHA1(f63c500fc0208709813d661305900de2f2edc9bf) )
-	ROM_LOAD32_WORD("magicforest50ln.u73", 0x0000000, 0x0400000, CRC(f9915826) SHA1(51c8455977b03fc6e2a3e898f225c8eb86ba58df) )
-	ROM_LOAD32_WORD("magicforest50ln.u85", 0x0000000, 0x0400000, CRC(48b5cb37) SHA1(1b2454349ee29f8779f32830cfc405e97126c4b1) )
+	ROM_LOAD32_WORD("magicforest50ln.u72", 0x0800002, 0x0400000, CRC(53d881a2) SHA1(f63c500fc0208709813d661305900de2f2edc9bf) )
+	ROM_LOAD32_WORD("magicforest50ln.u73", 0x0000002, 0x0400000, CRC(f9915826) SHA1(51c8455977b03fc6e2a3e898f225c8eb86ba58df) )
+	ROM_LOAD32_WORD("magicforest50ln.u85", 0x0800000, 0x0400000, CRC(48b5cb37) SHA1(1b2454349ee29f8779f32830cfc405e97126c4b1) )
 	ROM_LOAD32_WORD("magicforest50ln.u86", 0x0000000, 0x0400000, CRC(e412acb3) SHA1(80c5de99b0ef53ccd3eb027aade70caf83753568) )
 ROM_END
 
@@ -2467,9 +2432,9 @@ ROM_END
 ROM_START( mgmerm )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("magicmermaid.u72", 0x0000000, 0x0400000, CRC(7a5399ab) SHA1(85e3ca6e00d4f1259c4899f74981ec076524e50d) )
-	ROM_LOAD32_WORD("magicmermaid.u73", 0x0000000, 0x0400000, CRC(eff3f840) SHA1(16bec01d3aa6b103c10698cd1656ab54ee9de512) )
-	ROM_LOAD32_WORD("magicmermaid.u85", 0x0000000, 0x0400000, CRC(0c75309e) SHA1(6b745441434c585e3cda2d854dad3861d7337ab5) )
+	ROM_LOAD32_WORD("magicmermaid.u72", 0x0800002, 0x0400000, CRC(7a5399ab) SHA1(85e3ca6e00d4f1259c4899f74981ec076524e50d) )
+	ROM_LOAD32_WORD("magicmermaid.u73", 0x0000002, 0x0400000, CRC(eff3f840) SHA1(16bec01d3aa6b103c10698cd1656ab54ee9de512) )
+	ROM_LOAD32_WORD("magicmermaid.u85", 0x0800000, 0x0400000, CRC(0c75309e) SHA1(6b745441434c585e3cda2d854dad3861d7337ab5) )
 	ROM_LOAD32_WORD("magicmermaid.u86", 0x0000000, 0x0400000, CRC(dd44042b) SHA1(130c26a2ca02003adaa729a54195a1e4832cc455) )
 ROM_END
 
@@ -2478,10 +2443,10 @@ ROM_END
 ROM_START( metestrm )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("Meteor Storm U72.bin", 0x0000000, 0x0400000, CRC(1d225d8b) SHA1(477b39d9d2dd526dd3fe6fba6c4d36dfc845ebac) )
-	ROM_LOAD32_WORD("Meteor Storm U73.bin", 0x0000000, 0x0400000, CRC(0bc788f7) SHA1(7ce7cdbd08f7ae73a5a1b7c45e72bb9c90d91d3e) )
-	ROM_LOAD32_WORD("Meteor Storm U85.bin", 0x0000000, 0x0400000, CRC(1d24fa72) SHA1(1ff3a912919591dcd48459369e97d62cf27d6614) )
-	ROM_LOAD32_WORD("Meteor Storm U86.bin", 0x0000000, 0x0400000, CRC(a1674822) SHA1(471d704ed2600e0b806123031c9add2b13fa42ce) )
+	ROM_LOAD32_WORD("Meteor Storm.u72", 0x0800002, 0x0400000, CRC(1d225d8b) SHA1(477b39d9d2dd526dd3fe6fba6c4d36dfc845ebac) )
+	ROM_LOAD32_WORD("Meteor Storm.u73", 0x0000002, 0x0400000, CRC(0bc788f7) SHA1(7ce7cdbd08f7ae73a5a1b7c45e72bb9c90d91d3e) )
+	ROM_LOAD32_WORD("Meteor Storm.u85", 0x0800000, 0x0400000, CRC(1d24fa72) SHA1(1ff3a912919591dcd48459369e97d62cf27d6614) )
+	ROM_LOAD32_WORD("Meteor Storm.u86", 0x0000000, 0x0400000, CRC(a1674822) SHA1(471d704ed2600e0b806123031c9add2b13fa42ce) )
 ROM_END
 
 
@@ -2492,14 +2457,14 @@ ROM_END
 ROM_START( mrwoo )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("Mr Woo U71.bin", 0x0000000, 0x0400000, CRC(7507a271) SHA1(3bd25bf8d1ea54a7db2537fd011b12ff51e7bdd1) )
-	ROM_LOAD32_WORD("Mr Woo U72.bin", 0x0000000, 0x0400000, CRC(6fed3a7e) SHA1(b07354d5d927133626232c21096465426b3053bd) )
-	ROM_LOAD32_WORD("Mr Woo U73.bin", 0x0000000, 0x0400000, CRC(59cdb6ee) SHA1(1e8be1396786fced872c8ffc09772183b98a0f96) )
-	ROM_LOAD32_WORD("Mr Woo U84.bin", 0x0000000, 0x0400000, CRC(0fe46063) SHA1(10f3895b164b3077d156b7eb22e1fb1356816cb3) )
-	ROM_LOAD32_WORD("Mr Woo U85.bin", 0x0000000, 0x0400000, CRC(cb26bd37) SHA1(f20d54c5a6750362f47da5cac9b74ae516de16d4) )
-	ROM_LOAD32_WORD("Mr Woo U86.bin", 0x0000000, 0x0400000, CRC(db5d522a) SHA1(62030c7e314a614a3d4d7386268b61f94bc1fe02) )
-	ROM_LOAD32_WORD("Mr Woo U85.bin", 0x0000000, 0x0400000, CRC(cb26bd37) SHA1(f20d54c5a6750362f47da5cac9b74ae516de16d4) )
-	ROM_LOAD32_WORD("Mr Woo U86.bin", 0x0000000, 0x0400000, CRC(db5d522a) SHA1(62030c7e314a614a3d4d7386268b61f94bc1fe02) )
+	ROM_LOAD32_WORD("Mr Woo.u71", 0x1000002, 0x0400000, CRC(7507a271) SHA1(3bd25bf8d1ea54a7db2537fd011b12ff51e7bdd1) )
+	ROM_LOAD32_WORD("Mr Woo.u72", 0x0800002, 0x0400000, CRC(6fed3a7e) SHA1(b07354d5d927133626232c21096465426b3053bd) )
+	ROM_LOAD32_WORD("Mr Woo.u73", 0x0000002, 0x0400000, CRC(59cdb6ee) SHA1(1e8be1396786fced872c8ffc09772183b98a0f96) )
+	ROM_LOAD32_WORD("Mr Woo.u84", 0x1000000, 0x0400000, CRC(0fe46063) SHA1(10f3895b164b3077d156b7eb22e1fb1356816cb3) )
+	ROM_LOAD32_WORD("Mr Woo.u85", 0x0800000, 0x0400000, CRC(cb26bd37) SHA1(f20d54c5a6750362f47da5cac9b74ae516de16d4) )
+	ROM_LOAD32_WORD("Mr Woo.u86", 0x0000000, 0x0400000, CRC(db5d522a) SHA1(62030c7e314a614a3d4d7386268b61f94bc1fe02) )
+	ROM_LOAD32_WORD("Mr Woo.u85", 0x0800000, 0x0400000, CRC(cb26bd37) SHA1(f20d54c5a6750362f47da5cac9b74ae516de16d4) )
+	ROM_LOAD32_WORD("Mr Woo.u86", 0x0000000, 0x0400000, CRC(db5d522a) SHA1(62030c7e314a614a3d4d7386268b61f94bc1fe02) )
 ROM_END
 
 
@@ -2508,9 +2473,9 @@ ROM_END
 ROM_START( mystarr )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("mysticarrowm27v322.u72", 0x0000000, 0x0400000, CRC(4aa6e68b) SHA1(5f015885c15fd206053d23983a38dd1dbb8f89ce) )
-	ROM_LOAD32_WORD("mysticarrowm27v322.u73", 0x0000000, 0x0400000, CRC(7b8ed0d9) SHA1(6ea4bddedef955513e841ee14ec5e6ded23c1ea7) )
-	ROM_LOAD32_WORD("mysticarrowm27v322.u85", 0x0000000, 0x0400000, CRC(ea82c5db) SHA1(01db2730b1eec5c9f5c011525459ec72903761cc) )
+	ROM_LOAD32_WORD("mysticarrowm27v322.u72", 0x0800002, 0x0400000, CRC(4aa6e68b) SHA1(5f015885c15fd206053d23983a38dd1dbb8f89ce) )
+	ROM_LOAD32_WORD("mysticarrowm27v322.u73", 0x0000002, 0x0400000, CRC(7b8ed0d9) SHA1(6ea4bddedef955513e841ee14ec5e6ded23c1ea7) )
+	ROM_LOAD32_WORD("mysticarrowm27v322.u85", 0x0800000, 0x0400000, CRC(ea82c5db) SHA1(01db2730b1eec5c9f5c011525459ec72903761cc) )
 	ROM_LOAD32_WORD("mysticarrowm27v322.u86", 0x0000000, 0x0400000, CRC(8a1475ac) SHA1(c948f0ca991b64d9a07e42fdb346e6df450718f2) )
 ROM_END
 
@@ -2519,9 +2484,9 @@ ROM_END
 ROM_START( mysteyec )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("mysticeyescashmanm27v322.u72", 0x0000000, 0x0400000, CRC(380a868e) SHA1(a1ac6ec1a760f8bbf68b3b86cf5dd4623dc130c7) )
-	ROM_LOAD32_WORD("mysticeyescashmanm27v322.u73", 0x0000000, 0x0400000, CRC(85ad1a00) SHA1(d4f1d86647eb7724c94c3cfa89d5545a20323e62) )
-	ROM_LOAD32_WORD("mysticeyescashmanm27v322.u85", 0x0000000, 0x0400000, CRC(ee781c0f) SHA1(7729a55e1d5ff7b8a373dda8a0798374ff60a89b) )
+	ROM_LOAD32_WORD("mysticeyescashmanm27v322.u72", 0x0800002, 0x0400000, CRC(380a868e) SHA1(a1ac6ec1a760f8bbf68b3b86cf5dd4623dc130c7) )
+	ROM_LOAD32_WORD("mysticeyescashmanm27v322.u73", 0x0000002, 0x0400000, CRC(85ad1a00) SHA1(d4f1d86647eb7724c94c3cfa89d5545a20323e62) )
+	ROM_LOAD32_WORD("mysticeyescashmanm27v322.u85", 0x0800000, 0x0400000, CRC(ee781c0f) SHA1(7729a55e1d5ff7b8a373dda8a0798374ff60a89b) )
 	ROM_LOAD32_WORD("mysticeyescashmanm27v322.u86", 0x0000000, 0x0400000, CRC(a7bdbd03) SHA1(0e763933c082163de85c408be91d216d6545e9d7) )
 ROM_END
 
@@ -2530,9 +2495,9 @@ ROM_END
 ROM_START( opsesam )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("open sesame.u72", 0x0000000, 0x0400000, CRC(41bf83e5) SHA1(cdd9c6a148970725360c763ed11e2e411c28d5e9) )
-	ROM_LOAD32_WORD("open sesame.u73", 0x0000000, 0x0400000, CRC(d6bc2a4b) SHA1(55daa6c9028f40ecd23c5ffdb049447ce5ce51aa) )
-	ROM_LOAD32_WORD("open sesame.u85", 0x0000000, 0x0400000, CRC(3bfdcf54) SHA1(4b174a3e65e0c3b874f99a1bc8947ebe35087672) ) // missing a rom?
+	ROM_LOAD32_WORD("open sesame.u72", 0x0800002, 0x0400000, CRC(41bf83e5) SHA1(cdd9c6a148970725360c763ed11e2e411c28d5e9) )
+	ROM_LOAD32_WORD("open sesame.u73", 0x0000002, 0x0400000, CRC(d6bc2a4b) SHA1(55daa6c9028f40ecd23c5ffdb049447ce5ce51aa) )
+	ROM_LOAD32_WORD("open sesame.u85", 0x0800000, 0x0400000, CRC(3bfdcf54) SHA1(4b174a3e65e0c3b874f99a1bc8947ebe35087672) ) // missing a rom?
 ROM_END
 
 
@@ -2540,10 +2505,10 @@ ROM_END
 ROM_START( pandpays )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("Panda Pays U72.bin", 0x0000000, 0x0400000, CRC(4c4b9a62) SHA1(1c287ac85346756508e2efb13e1559af4956dd9a) )
-	ROM_LOAD32_WORD("Panda Pays U73.bin", 0x0000000, 0x0400000, CRC(cc63af55) SHA1(0d8d3c6392c3121d5edbeaece880041c3afd6530) )
-	ROM_LOAD32_WORD("Panda Pays U85.bin", 0x0000000, 0x0400000, CRC(ac7672fa) SHA1(8029ff08e29c48e8f4b2ecd03cf021cc89eab916) )
-	ROM_LOAD32_WORD("Panda Pays U86.bin", 0x0000000, 0x0400000, CRC(ba3fe38b) SHA1(11493dff5720e158ca31f72bf59dcbbbe6d87c96) )
+	ROM_LOAD32_WORD("Panda Pays.u72", 0x0800002, 0x0400000, CRC(4c4b9a62) SHA1(1c287ac85346756508e2efb13e1559af4956dd9a) )
+	ROM_LOAD32_WORD("Panda Pays.u73", 0x0000002, 0x0400000, CRC(cc63af55) SHA1(0d8d3c6392c3121d5edbeaece880041c3afd6530) )
+	ROM_LOAD32_WORD("Panda Pays.u85", 0x0800000, 0x0400000, CRC(ac7672fa) SHA1(8029ff08e29c48e8f4b2ecd03cf021cc89eab916) )
+	ROM_LOAD32_WORD("Panda Pays.u86", 0x0000000, 0x0400000, CRC(ba3fe38b) SHA1(11493dff5720e158ca31f72bf59dcbbbe6d87c96) )
 ROM_END
 
 
@@ -2551,9 +2516,9 @@ ROM_END
 ROM_START( parilius )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("parislightsm27v322.u72", 0x0000000, 0x0400000, CRC(8dc6a0ec) SHA1(855e8f5c6752bfc4ba25116a20ed82dfb4912c07) )
-	ROM_LOAD32_WORD("parislightsm27v322.u73", 0x0000000, 0x0400000, CRC(d0587548) SHA1(30d0021a78ee79c6f66fb27c8c484427a5a2db1b) )
-	ROM_LOAD32_WORD("parislightsm27v322.u85", 0x0000000, 0x0400000, CRC(e7ed0bf4) SHA1(39cb9744462f10fc791d6c604631c1182da9466b) )
+	ROM_LOAD32_WORD("parislightsm27v322.u72", 0x0800002, 0x0400000, CRC(8dc6a0ec) SHA1(855e8f5c6752bfc4ba25116a20ed82dfb4912c07) )
+	ROM_LOAD32_WORD("parislightsm27v322.u73", 0x0000002, 0x0400000, CRC(d0587548) SHA1(30d0021a78ee79c6f66fb27c8c484427a5a2db1b) )
+	ROM_LOAD32_WORD("parislightsm27v322.u85", 0x0800000, 0x0400000, CRC(e7ed0bf4) SHA1(39cb9744462f10fc791d6c604631c1182da9466b) )
 	ROM_LOAD32_WORD("parislightsm27v322.u86", 0x0000000, 0x0400000, CRC(5224e683) SHA1(8b0dbb2fcea4d1a522160d8a6634687c5bad8acd) )
 ROM_END
 
@@ -2562,10 +2527,10 @@ ROM_END
 ROM_START( pelpetus )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("Pelican pete U72.bin", 0x0000000, 0x0400000, CRC(4ff0a40b) SHA1(b9049a35a3ebc3e1274498809f7687a36cad6f24) )
-	ROM_LOAD32_WORD("Pelican pete U73.bin", 0x0000000, 0x0400000, CRC(44d5e0af) SHA1(1693e641ddc5d4174e4e0dc07cb79e54045aaad3) )
-	ROM_LOAD32_WORD("Pelican pete U85.bin", 0x0000000, 0x0400000, CRC(781e076d) SHA1(0c7d2281598822ea45f37b2afd5f12d9afe2d01a) )
-	ROM_LOAD32_WORD("Pelican pete U86.bin", 0x0000000, 0x0400000, CRC(dea78964) SHA1(857e5f1deb8db3d861ea7fe78e44a8e17cc791aa) )
+	ROM_LOAD32_WORD("Pelican pete.u72", 0x0800002, 0x0400000, CRC(4ff0a40b) SHA1(b9049a35a3ebc3e1274498809f7687a36cad6f24) )
+	ROM_LOAD32_WORD("Pelican pete.u73", 0x0000002, 0x0400000, CRC(44d5e0af) SHA1(1693e641ddc5d4174e4e0dc07cb79e54045aaad3) )
+	ROM_LOAD32_WORD("Pelican pete.u85", 0x0800000, 0x0400000, CRC(781e076d) SHA1(0c7d2281598822ea45f37b2afd5f12d9afe2d01a) )
+	ROM_LOAD32_WORD("Pelican pete.u86", 0x0000000, 0x0400000, CRC(dea78964) SHA1(857e5f1deb8db3d861ea7fe78e44a8e17cc791aa) )
 ROM_END
 
 
@@ -2574,9 +2539,9 @@ ROM_START( pelpetu2 )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
 	ROM_LOAD32_WORD("pelicanpete50line3b1f.u86", 0x0000000, 0x0400000, CRC(dea78964) SHA1(857e5f1deb8db3d861ea7fe78e44a8e17cc791aa) )
-	ROM_LOAD32_WORD("pelicanpete50lineb748.u73", 0x0000000, 0x0400000, CRC(44d5e0af) SHA1(1693e641ddc5d4174e4e0dc07cb79e54045aaad3) )
-	ROM_LOAD32_WORD("pelicanpete50linecb48.u85", 0x0000000, 0x0400000, CRC(781e076d) SHA1(0c7d2281598822ea45f37b2afd5f12d9afe2d01a) )
-	ROM_LOAD32_WORD("pelicanpete50linef94b.u72", 0x0000000, 0x0400000, CRC(4ff0a40b) SHA1(b9049a35a3ebc3e1274498809f7687a36cad6f24) )
+	ROM_LOAD32_WORD("pelicanpete50lineb748.u73", 0x0000002, 0x0400000, CRC(44d5e0af) SHA1(1693e641ddc5d4174e4e0dc07cb79e54045aaad3) )
+	ROM_LOAD32_WORD("pelicanpete50linecb48.u85", 0x0800000, 0x0400000, CRC(781e076d) SHA1(0c7d2281598822ea45f37b2afd5f12d9afe2d01a) )
+	ROM_LOAD32_WORD("pelicanpete50linef94b.u72", 0x0800002, 0x0400000, CRC(4ff0a40b) SHA1(b9049a35a3ebc3e1274498809f7687a36cad6f24) )
 ROM_END
 
 
@@ -2584,10 +2549,10 @@ ROM_END
 ROM_START( pennyar )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("Penny Arcade - Reel Power - U72- E40E", 0x0000000, 0x0400000, CRC(cdd0795f) SHA1(e5243c27cca69451015f232444b289abf3d95819) )
-	ROM_LOAD32_WORD("Penny Arcade - Reel Power - U73 - 6A01", 0x0000000, 0x0400000, CRC(b8b7c31c) SHA1(7a5cfd608d8c0a3db1054b5770065fc3733d5f35) )
-	ROM_LOAD32_WORD("Penny Arcade - Reel Power - U85 - D0F9", 0x0000000, 0x0400000, CRC(9b9bf428) SHA1(108c722d0b56ae446961eefe27579e203eeb3b19) )
-	ROM_LOAD32_WORD("Penny Arcade - Reel Power - U86 - 7923", 0x0000000, 0x0400000, CRC(0fee6e4a) SHA1(b2a7ccbe81528067b29663f18b54520b5fefe6ec) )
+	ROM_LOAD32_WORD("Penny Arcade - Reel Power - E40E.u72", 0x0800002, 0x0400000, CRC(cdd0795f) SHA1(e5243c27cca69451015f232444b289abf3d95819) )
+	ROM_LOAD32_WORD("Penny Arcade - Reel Power - 6A01.u73", 0x0000002, 0x0400000, CRC(b8b7c31c) SHA1(7a5cfd608d8c0a3db1054b5770065fc3733d5f35) )
+	ROM_LOAD32_WORD("Penny Arcade - Reel Power - D0F9.u85", 0x0800000, 0x0400000, CRC(9b9bf428) SHA1(108c722d0b56ae446961eefe27579e203eeb3b19) )
+	ROM_LOAD32_WORD("Penny Arcade - Reel Power - 7923.u86", 0x0000000, 0x0400000, CRC(0fee6e4a) SHA1(b2a7ccbe81528067b29663f18b54520b5fefe6ec) )
 ROM_END
 
 
@@ -2595,9 +2560,9 @@ ROM_END
 ROM_START( penpayus )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("penguinpays.u72", 0x0000000, 0x0400000, CRC(1ee80a47) SHA1(c02485003d0724941ef346fb721bd246f69545b3) )
-	ROM_LOAD32_WORD("penguinpays.u73", 0x0000000, 0x0400000, CRC(36699b29) SHA1(0d867f4086c07c8114bb1f383e647dab4d8ce7b8) )
-	ROM_LOAD32_WORD("penguinpays.u85", 0x0000000, 0x0400000, CRC(7e68ca9a) SHA1(17e96fa047b2353be53b52b0a783bb7247bc6a6f) )
+	ROM_LOAD32_WORD("penguinpays.u72", 0x0800002, 0x0400000, CRC(1ee80a47) SHA1(c02485003d0724941ef346fb721bd246f69545b3) )
+	ROM_LOAD32_WORD("penguinpays.u73", 0x0000002, 0x0400000, CRC(36699b29) SHA1(0d867f4086c07c8114bb1f383e647dab4d8ce7b8) )
+	ROM_LOAD32_WORD("penguinpays.u85", 0x0800000, 0x0400000, CRC(7e68ca9a) SHA1(17e96fa047b2353be53b52b0a783bb7247bc6a6f) )
 	ROM_LOAD32_WORD("penguinpays.u86", 0x0000000, 0x0400000, CRC(b7c646a7) SHA1(e47f88347eb2354dd982f46f7ac89b5645205b12) )
 ROM_END
 
@@ -2608,9 +2573,9 @@ ROM_END
 ROM_START( pompus2 )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("pompei.u72", 0x0000000, 0x0400000, CRC(a5959d1f) SHA1(fe92eaa3f1dc6bdc356bef2a680eb9f8a09c88a2) )
-	ROM_LOAD32_WORD("pompei.u73", 0x0000000, 0x0400000, CRC(947d3099) SHA1(d5256fc598c2e280f9e92ef6ba0e0152c8cc5d3b) )
-	ROM_LOAD32_WORD("pompei.u85", 0x0000000, 0x0400000, CRC(901f5a17) SHA1(8a7fd00a68770be23e0164907eae91b963f01091) )
+	ROM_LOAD32_WORD("pompei.u72", 0x0800002, 0x0400000, CRC(a5959d1f) SHA1(fe92eaa3f1dc6bdc356bef2a680eb9f8a09c88a2) )
+	ROM_LOAD32_WORD("pompei.u73", 0x0000002, 0x0400000, CRC(947d3099) SHA1(d5256fc598c2e280f9e92ef6ba0e0152c8cc5d3b) )
+	ROM_LOAD32_WORD("pompei.u85", 0x0800000, 0x0400000, CRC(901f5a17) SHA1(8a7fd00a68770be23e0164907eae91b963f01091) )
 	ROM_LOAD32_WORD("pompei.u86", 0x0000000, 0x0400000, CRC(a68aac55) SHA1(630b1d4cb08d8710b81c6d709182e7c7a52f184a) )
 ROM_END
 
@@ -2619,10 +2584,10 @@ ROM_END
 ROM_START( rdtripus )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("roadtrip.u71", 0x0000000, 0x0400000, CRC(1da57ab8) SHA1(775d1f0d6021032e909c8089ba93cc63eef18586) )
-	ROM_LOAD32_WORD("roadtrip.u72", 0x0000000, 0x0400000, CRC(421cfc77) SHA1(fb14ad4c06bdbdd6df4fc1299a96bb8d906d2b48) )
-	ROM_LOAD32_WORD("roadtrip.u73", 0x0000000, 0x0400000, CRC(cb9f6f5d) SHA1(825322c6b0407a934aca632c198615d188e2f46b) )
-	ROM_LOAD32_WORD("roadtrip.u85", 0x0000000, 0x0400000, CRC(e68205a7) SHA1(a7dc2a10de4ef229a8f25a3db19a30ea4be46cdd) )
+	ROM_LOAD32_WORD("roadtrip.u71", 0x1000002, 0x0400000, CRC(1da57ab8) SHA1(775d1f0d6021032e909c8089ba93cc63eef18586) )
+	ROM_LOAD32_WORD("roadtrip.u72", 0x0800002, 0x0400000, CRC(421cfc77) SHA1(fb14ad4c06bdbdd6df4fc1299a96bb8d906d2b48) )
+	ROM_LOAD32_WORD("roadtrip.u73", 0x0000002, 0x0400000, CRC(cb9f6f5d) SHA1(825322c6b0407a934aca632c198615d188e2f46b) )
+	ROM_LOAD32_WORD("roadtrip.u85", 0x0800000, 0x0400000, CRC(e68205a7) SHA1(a7dc2a10de4ef229a8f25a3db19a30ea4be46cdd) )
 	ROM_LOAD32_WORD("roadtrip.u86", 0x0000000, 0x0400000, CRC(66c2c8da) SHA1(76d338662a80ebdfd72e403388cffe8dfbd14f59) ) // missing a rom?
 ROM_END
 
@@ -2631,9 +2596,9 @@ ROM_END
 ROM_START( sealdeal )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("sealthedealm27v322.u72", 0x0000000, 0x0400000, CRC(43ef1218) SHA1(e1d03cd9845ac81a71b5a0471d146addc2f56e0e) )
-	ROM_LOAD32_WORD("sealthedealm27v322.u73", 0x0000000, 0x0400000, CRC(383d55a9) SHA1(81bef0ed325ef7208403afa6d7af458c755a4de3) )
-	ROM_LOAD32_WORD("sealthedealm27v322.u85", 0x0000000, 0x0400000, CRC(a6327726) SHA1(2c0f02a8d361bcbfc007b9d75a4b7b685aa2b1ac) )
+	ROM_LOAD32_WORD("sealthedealm27v322.u72", 0x0800002, 0x0400000, CRC(43ef1218) SHA1(e1d03cd9845ac81a71b5a0471d146addc2f56e0e) )
+	ROM_LOAD32_WORD("sealthedealm27v322.u73", 0x0000002, 0x0400000, CRC(383d55a9) SHA1(81bef0ed325ef7208403afa6d7af458c755a4de3) )
+	ROM_LOAD32_WORD("sealthedealm27v322.u85", 0x0800000, 0x0400000, CRC(a6327726) SHA1(2c0f02a8d361bcbfc007b9d75a4b7b685aa2b1ac) )
 	ROM_LOAD32_WORD("sealthedealm27v322.u86", 0x0000000, 0x0400000, CRC(ea6b666b) SHA1(ad80042770f8e66e7455010b46d81873689f63db) )
 ROM_END
 
@@ -2647,9 +2612,9 @@ ROM_END
 ROM_START( shorthng )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("shore thing.u72", 0x0000000, 0x0400000, CRC(e151390f) SHA1(e68f2584587687c96e4cbe0080630466fac61b17) )
-	ROM_LOAD32_WORD("shore thing.u73", 0x0000000, 0x0400000, CRC(c214d960) SHA1(e5b75e5cb3af3b77f56ccec72833e9243d09c643) )
-	ROM_LOAD32_WORD("shore thing.u85", 0x0000000, 0x0400000, CRC(e721a879) SHA1(0632c1be6c3b671aed4f6dd67b83e966033aba19) )
+	ROM_LOAD32_WORD("shore thing.u72", 0x0800002, 0x0400000, CRC(e151390f) SHA1(e68f2584587687c96e4cbe0080630466fac61b17) )
+	ROM_LOAD32_WORD("shore thing.u73", 0x0000002, 0x0400000, CRC(c214d960) SHA1(e5b75e5cb3af3b77f56ccec72833e9243d09c643) )
+	ROM_LOAD32_WORD("shore thing.u85", 0x0800000, 0x0400000, CRC(e721a879) SHA1(0632c1be6c3b671aed4f6dd67b83e966033aba19) )
 	ROM_LOAD32_WORD("shore thing.u86", 0x0000000, 0x0400000, CRC(c3e6f083) SHA1(4ed6b1039f060cd6480a490de28619f5370de805) )
 ROM_END
 
@@ -2658,9 +2623,9 @@ ROM_END
 ROM_START( silkrdus )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("silkroad.u72", 0x0000000, 0x0400000, CRC(1ed58be6) SHA1(114c5a800592163dbc690b5d4c4c051d358828f9) )
-	ROM_LOAD32_WORD("silkroad.u73", 0x0000000, 0x0400000, CRC(c32608e3) SHA1(83d9749ce77317ce5631e7c7d3985c71f26d43a5) )
-	ROM_LOAD32_WORD("silkroad.u85", 0x0000000, 0x0400000, CRC(568f7ecd) SHA1(ccab6d872fe5bc00466071334b1af9f6799e40a0) )
+	ROM_LOAD32_WORD("silkroad.u72", 0x0800002, 0x0400000, CRC(1ed58be6) SHA1(114c5a800592163dbc690b5d4c4c051d358828f9) )
+	ROM_LOAD32_WORD("silkroad.u73", 0x0000002, 0x0400000, CRC(c32608e3) SHA1(83d9749ce77317ce5631e7c7d3985c71f26d43a5) )
+	ROM_LOAD32_WORD("silkroad.u85", 0x0800000, 0x0400000, CRC(568f7ecd) SHA1(ccab6d872fe5bc00466071334b1af9f6799e40a0) )
 	ROM_LOAD32_WORD("silkroad.u86", 0x0000000, 0x0400000, CRC(5e8f8fc3) SHA1(bb586743182a3797d601db740e270e773f7e3587) )
 ROM_END
 
@@ -2669,10 +2634,10 @@ ROM_END
 ROM_START( stardrfu )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("star-drifter-u72-m27v322-cs8552.bin", 0x0000000, 0x0400000, CRC(dc7a30c1) SHA1(8f24c18efd6171cda7ca841d3b275937e35e2be8) )
-	ROM_LOAD32_WORD("star-drifter-u73-m27v322-cs61bb.bin", 0x0000000, 0x0400000, CRC(3e59b84f) SHA1(3148d48df74c35681759a234d7aa746cbb0afb0e) )
-	ROM_LOAD32_WORD("star-drifter-u85-m27v322-cs1302.bin", 0x0000000, 0x0400000, CRC(689ded33) SHA1(5d5b744321313c4618ecf319827c778be646245f) )
-	ROM_LOAD32_WORD("star-drifter-u86-m27v322-cs4b08.bin", 0x0000000, 0x0400000, CRC(73023e64) SHA1(4d2d586a1e91ac5bac379994973dffcf9f3a3293) )
+	ROM_LOAD32_WORD("star-drifter-m27v322-cs8552.u72", 0x0800002, 0x0400000, CRC(dc7a30c1) SHA1(8f24c18efd6171cda7ca841d3b275937e35e2be8) )
+	ROM_LOAD32_WORD("star-drifter-m27v322-cs61bb.u73", 0x0000002, 0x0400000, CRC(3e59b84f) SHA1(3148d48df74c35681759a234d7aa746cbb0afb0e) )
+	ROM_LOAD32_WORD("star-drifter-m27v322-cs1302.u85", 0x0800000, 0x0400000, CRC(689ded33) SHA1(5d5b744321313c4618ecf319827c778be646245f) )
+	ROM_LOAD32_WORD("star-drifter-m27v322-cs4b08.u86", 0x0000000, 0x0400000, CRC(73023e64) SHA1(4d2d586a1e91ac5bac379994973dffcf9f3a3293) )
 ROM_END
 
 
@@ -2680,10 +2645,10 @@ ROM_END
 ROM_START( stardrf2 )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("stardrifter50line1302.u85", 0x0000000, 0x0400000, CRC(689ded33) SHA1(5d5b744321313c4618ecf319827c778be646245f) )
+	ROM_LOAD32_WORD("stardrifter50line1302.u85", 0x0800000, 0x0400000, CRC(689ded33) SHA1(5d5b744321313c4618ecf319827c778be646245f) )
 	ROM_LOAD32_WORD("stardrifter50line4b08.u86", 0x0000000, 0x0400000, CRC(73023e64) SHA1(4d2d586a1e91ac5bac379994973dffcf9f3a3293) )
-	ROM_LOAD32_WORD("stardrifter50line61bb.u73", 0x0000000, 0x0400000, CRC(3e59b84f) SHA1(3148d48df74c35681759a234d7aa746cbb0afb0e) )
-	ROM_LOAD32_WORD("stardrifter50line8552.u72", 0x0000000, 0x0400000, CRC(dc7a30c1) SHA1(8f24c18efd6171cda7ca841d3b275937e35e2be8) )
+	ROM_LOAD32_WORD("stardrifter50line61bb.u73", 0x0000002, 0x0400000, CRC(3e59b84f) SHA1(3148d48df74c35681759a234d7aa746cbb0afb0e) )
+	ROM_LOAD32_WORD("stardrifter50line8552.u72", 0x0800002, 0x0400000, CRC(dc7a30c1) SHA1(8f24c18efd6171cda7ca841d3b275937e35e2be8) )
 ROM_END
 
 
@@ -2691,7 +2656,7 @@ ROM_END
 ROM_START( statsymb )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("statussymbols.u73", 0x0000000, 0x0400000, CRC(e06f2dd1) SHA1(0edadf037dee101e5fb768471d2f93474ff8268f) )
+	ROM_LOAD32_WORD("statussymbols.u73", 0x0000002, 0x0400000, CRC(e06f2dd1) SHA1(0edadf037dee101e5fb768471d2f93474ff8268f) )
 	ROM_LOAD32_WORD("statussymbols.u86", 0x0000000, 0x0400000, CRC(fe9b9147) SHA1(5dced51e126a80191d62b88438e1098efb358e52) )
 ROM_END
 
@@ -2700,9 +2665,9 @@ ROM_END
 ROM_START( sunmon2 )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("sunandmoon.u72", 0x0000000, 0x0400000, CRC(f69ce78d) SHA1(91a433757b377406bca61b4c96f3ba3561efd75c) )
-	ROM_LOAD32_WORD("sunandmoon.u73", 0x0000000, 0x0400000, CRC(ce1f8d32) SHA1(7891b0e797942374d779e8df92281383dd94fe90) )
-	ROM_LOAD32_WORD("sunandmoon.u85", 0x0000000, 0x0400000, CRC(7e16ab59) SHA1(f56b3b5a252d3520e36b1d2a7643d65020af2133) )
+	ROM_LOAD32_WORD("sunandmoon.u72", 0x0800002, 0x0400000, CRC(f69ce78d) SHA1(91a433757b377406bca61b4c96f3ba3561efd75c) )
+	ROM_LOAD32_WORD("sunandmoon.u73", 0x0000002, 0x0400000, CRC(ce1f8d32) SHA1(7891b0e797942374d779e8df92281383dd94fe90) )
+	ROM_LOAD32_WORD("sunandmoon.u85", 0x0800000, 0x0400000, CRC(7e16ab59) SHA1(f56b3b5a252d3520e36b1d2a7643d65020af2133) )
 	ROM_LOAD32_WORD("sunandmoon.u86", 0x0000000, 0x0400000, CRC(012e5aeb) SHA1(3df4454ab54cc6edf62b8cc9de4c867a36e8654b) )
 ROM_END
 
@@ -2710,9 +2675,9 @@ ROM_END
 ROM_START( sunqndol )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("sun queen dollar storm.u72", 0x0000000, 0x0400000, CRC(a2b404ac) SHA1(409bd1ce24600fa381ad4de8b7066e5e04f7ab3d) )
-	ROM_LOAD32_WORD("sun queen dollar storm.u73", 0x0000000, 0x0400000, CRC(b46080a1) SHA1(11293e7636dea28c8dfdebd107fa5aee013c832e) )
-	ROM_LOAD32_WORD("sun queen dollar storm.u85", 0x0000000, 0x0400000, CRC(f522c85e) SHA1(2b9ba996b99745e69944451e1fd2b585ed62290f) )
+	ROM_LOAD32_WORD("sun queen dollar storm.u72", 0x0800002, 0x0400000, CRC(a2b404ac) SHA1(409bd1ce24600fa381ad4de8b7066e5e04f7ab3d) )
+	ROM_LOAD32_WORD("sun queen dollar storm.u73", 0x0000002, 0x0400000, CRC(b46080a1) SHA1(11293e7636dea28c8dfdebd107fa5aee013c832e) )
+	ROM_LOAD32_WORD("sun queen dollar storm.u85", 0x0800000, 0x0400000, CRC(f522c85e) SHA1(2b9ba996b99745e69944451e1fd2b585ed62290f) )
 	ROM_LOAD32_WORD("sun queen dollar storm.u86", 0x0000000, 0x0400000, CRC(78fd2a9f) SHA1(768db303de2ce2fb1efe6adee44d66780801e7da) )
 ROM_END
 
@@ -2721,7 +2686,7 @@ ROM_END
 ROM_START( swhr2us )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("sweethearts2.u73", 0x0000000, 0x0400000, CRC(17f0dbe2) SHA1(7f1f0936e1cf528ee794e8925c40b063d1a77729) )
+	ROM_LOAD32_WORD("sweethearts2.u73", 0x0000002, 0x0400000, CRC(17f0dbe2) SHA1(7f1f0936e1cf528ee794e8925c40b063d1a77729) )
 	ROM_LOAD32_WORD("sweethearts2.u86", 0x0000000, 0x0400000, CRC(320d3052) SHA1(8b2165795e9b9d7514620b0d6a14371142de434b) )
 ROM_END
 
@@ -2731,9 +2696,9 @@ ROM_END
 ROM_START( gbmoney )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("thegoodbadmoney0351016.u72", 0x0000000, 0x0400000, CRC(7703165a) SHA1(6d9e019796dee04a9817c4176af5bf10f7a7597d) )
-	ROM_LOAD32_WORD("thegoodbadmoney0351016.u73", 0x0000000, 0x0400000, CRC(7bccca48) SHA1(b7a4f00eac4b91ec671555f1332f705acffd7b00) )
-	ROM_LOAD32_WORD("thegoodbadmoney0351016.u85", 0x0000000, 0x0400000, CRC(28ca3d73) SHA1(3d9edfffe2d7fd37e0f9c6cd292ca3c68abae15b) )
+	ROM_LOAD32_WORD("thegoodbadmoney0351016.u72", 0x0800002, 0x0400000, CRC(7703165a) SHA1(6d9e019796dee04a9817c4176af5bf10f7a7597d) )
+	ROM_LOAD32_WORD("thegoodbadmoney0351016.u73", 0x0000002, 0x0400000, CRC(7bccca48) SHA1(b7a4f00eac4b91ec671555f1332f705acffd7b00) )
+	ROM_LOAD32_WORD("thegoodbadmoney0351016.u85", 0x0800000, 0x0400000, CRC(28ca3d73) SHA1(3d9edfffe2d7fd37e0f9c6cd292ca3c68abae15b) )
 	ROM_LOAD32_WORD("thegoodbadmoney0351016.u86", 0x0000000, 0x0400000, CRC(04ce6b76) SHA1(b846752a739ae6c657e74bbe5e5e772a6c3d5e00) )
 ROM_END
 
@@ -2742,9 +2707,9 @@ ROM_END
 ROM_START( tiktoru )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("tiki torch.u72", 0x0000000, 0x0400000, CRC(1161133b) SHA1(760c710167e4eca84421fc1cd54ab696e16502cc) )
-	ROM_LOAD32_WORD("tiki torch.u73", 0x0000000, 0x0400000, CRC(f0f8e8d5) SHA1(a084befd422ce37ad19b31d3da61e7a03d5e38c4) )
-	ROM_LOAD32_WORD("tiki torch.u85", 0x0000000, 0x0400000, CRC(32eed9c2) SHA1(8e3e8d55a4dac92ae9b543c86921126df1fb6518) )
+	ROM_LOAD32_WORD("tiki torch.u72", 0x0800002, 0x0400000, CRC(1161133b) SHA1(760c710167e4eca84421fc1cd54ab696e16502cc) )
+	ROM_LOAD32_WORD("tiki torch.u73", 0x0000002, 0x0400000, CRC(f0f8e8d5) SHA1(a084befd422ce37ad19b31d3da61e7a03d5e38c4) )
+	ROM_LOAD32_WORD("tiki torch.u85", 0x0800000, 0x0400000, CRC(32eed9c2) SHA1(8e3e8d55a4dac92ae9b543c86921126df1fb6518) )
 	ROM_LOAD32_WORD("tiki torch.u86", 0x0000000, 0x0400000, CRC(ad10a554) SHA1(59062060ded7304193105d2b03fb06a7754a9fe6) )
 ROM_END
 
@@ -2753,9 +2718,9 @@ ROM_END
 ROM_START( timwolfu )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("timberwolf.u72", 0x0000000, 0x0400000, CRC(a004dd06) SHA1(c394b1703d62370ecf19c51d90554d6495f43eae) )
-	ROM_LOAD32_WORD("timberwolf.u73", 0x0000000, 0x0400000, CRC(054e3956) SHA1(ccfb6ba102c22f70fbc61b3d6ba0ceadc1414e1c) )
-	ROM_LOAD32_WORD("timberwolf.u85", 0x0000000, 0x0400000, CRC(901e72e5) SHA1(437a33ac1c73824ce81229f93eff0799b369c6b0) )
+	ROM_LOAD32_WORD("timberwolf.u72", 0x0800002, 0x0400000, CRC(a004dd06) SHA1(c394b1703d62370ecf19c51d90554d6495f43eae) )
+	ROM_LOAD32_WORD("timberwolf.u73", 0x0000002, 0x0400000, CRC(054e3956) SHA1(ccfb6ba102c22f70fbc61b3d6ba0ceadc1414e1c) )
+	ROM_LOAD32_WORD("timberwolf.u85", 0x0800000, 0x0400000, CRC(901e72e5) SHA1(437a33ac1c73824ce81229f93eff0799b369c6b0) )
 	ROM_LOAD32_WORD("timberwolf.u86", 0x0000000, 0x0400000, CRC(a3be6e57) SHA1(9e06a85b630626bf7e3e790a70b8575bc9047b3d) )
 ROM_END
 
@@ -2764,9 +2729,9 @@ ROM_END
 ROM_START( trkinus )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("treasureking.u72", 0x0000000, 0x0400000, CRC(c070cb6b) SHA1(cfe6ef7723233f4325ff778679d1274159ffacab) )
-	ROM_LOAD32_WORD("treasureking.u73", 0x0000000, 0x0400000, CRC(70253923) SHA1(4a87a9b947404a7692404333fb4e2cd18c8de77c) )
-	ROM_LOAD32_WORD("treasureking.u85", 0x0000000, 0x0400000, CRC(2cece959) SHA1(c375f1fd1636898feaf1f23baf1c136e1ac09085) )
+	ROM_LOAD32_WORD("treasureking.u72", 0x0800002, 0x0400000, CRC(c070cb6b) SHA1(cfe6ef7723233f4325ff778679d1274159ffacab) )
+	ROM_LOAD32_WORD("treasureking.u73", 0x0000002, 0x0400000, CRC(70253923) SHA1(4a87a9b947404a7692404333fb4e2cd18c8de77c) )
+	ROM_LOAD32_WORD("treasureking.u85", 0x0800000, 0x0400000, CRC(2cece959) SHA1(c375f1fd1636898feaf1f23baf1c136e1ac09085) )
 	ROM_LOAD32_WORD("treasureking.u86", 0x0000000, 0x0400000, CRC(8e5d3ba0) SHA1(ad3c8ba4351ba2a476aa349e2924c09be9debc20) )
 ROM_END
 
@@ -2775,9 +2740,9 @@ ROM_START( venicus )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
 	ROM_LOAD32_WORD("venice3536.u86", 0x0000000, 0x0400000, CRC(a6dde7a6) SHA1(58b9bd3d80b88e9e8b40813e85b89cda69f12fb6) )
-	ROM_LOAD32_WORD("venice3595.u73", 0x0000000, 0x0400000, CRC(d77b73e3) SHA1(4dd4011d6371baf35fcd9cb7c878d4d2cca1e199) )
-	ROM_LOAD32_WORD("veniceb939.u85", 0x0000000, 0x0400000, CRC(f7c3c75d) SHA1(7afc80d8d81b30c1842e4bfbf7ecd987226bdcf6) )
-	ROM_LOAD32_WORD("veniceef4a.u72", 0x0000000, 0x0400000, CRC(0570d956) SHA1(415cbaf337296527907ba36932f386aafeceec16) )
+	ROM_LOAD32_WORD("venice3595.u73", 0x0000002, 0x0400000, CRC(d77b73e3) SHA1(4dd4011d6371baf35fcd9cb7c878d4d2cca1e199) )
+	ROM_LOAD32_WORD("veniceb939.u85", 0x0800000, 0x0400000, CRC(f7c3c75d) SHA1(7afc80d8d81b30c1842e4bfbf7ecd987226bdcf6) )
+	ROM_LOAD32_WORD("veniceef4a.u72", 0x0800002, 0x0400000, CRC(0570d956) SHA1(415cbaf337296527907ba36932f386aafeceec16) )
 ROM_END
 
 
@@ -2785,12 +2750,18 @@ ROM_END
 ROM_START( whlcshus )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("whales cash U85_4ECD", 0x0000000, 0x0400000, CRC(e90f5bb1) SHA1(28680395198a29356999a377f2f3e0013d97c7b2) )
-	ROM_LOAD32_WORD("whales of cash U72_68DE", 0x0000000, 0x0400000, CRC(f138de3f) SHA1(69a54457c8090f23023f197f0eba1d645a260f3f) )
-	ROM_LOAD32_WORD("whales of cash U73_3517", 0x0000000, 0x0400000, CRC(74c93c56) SHA1(34c48620b08c3a03f0d6a333acbc45c14a91d3cb) )
-	ROM_LOAD32_WORD("whales of cash U86_59AF", 0x0000000, 0x0400000, CRC(a7118016) SHA1(725a46ac861bf4abaf9cc0e7084cfa20913c2299) )
-	ROM_LOAD32_WORD("whalesofcash.u72", 0x0000000, 0x0400000, CRC(e9ddd951) SHA1(16863b49b5db1881afda30ea19a55f6122981eba) )
-	ROM_LOAD32_WORD("whalesofcash.u73", 0x0000000, 0x0400000, CRC(22785960) SHA1(2ebfd230209fd438338f981c1c133e6576a67468) )
+	ROM_LOAD32_WORD("whales of cash 4ECD.u85", 0x0800000, 0x0400000, CRC(e90f5bb1) SHA1(28680395198a29356999a377f2f3e0013d97c7b2) )
+	ROM_LOAD32_WORD("whales of cash 68DE.u72", 0x0800002, 0x0400000, CRC(f138de3f) SHA1(69a54457c8090f23023f197f0eba1d645a260f3f) )
+	ROM_LOAD32_WORD("whales of cash 3517.u73", 0x0000002, 0x0400000, CRC(74c93c56) SHA1(34c48620b08c3a03f0d6a333acbc45c14a91d3cb) )
+	ROM_LOAD32_WORD("whales of cash 59AF.u86", 0x0000000, 0x0400000, CRC(a7118016) SHA1(725a46ac861bf4abaf9cc0e7084cfa20913c2299) )
+ROM_END	
+
+ROM_START( whlcshusa )
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	// 2nd, incomplete, set?	
+	ROM_LOAD32_WORD("whalesofcash.u72", 0x0800002, 0x0400000, CRC(e9ddd951) SHA1(16863b49b5db1881afda30ea19a55f6122981eba) )
+	ROM_LOAD32_WORD("whalesofcash.u73", 0x0000002, 0x0400000, CRC(22785960) SHA1(2ebfd230209fd438338f981c1c133e6576a67468) )
 	ROM_LOAD32_WORD("whalesofcash.u86", 0x0000000, 0x0400000, CRC(8aef1004) SHA1(270379b0a3abc98adfb1a9b031a5e98050635a80) ) // missing a rom?
 ROM_END
 
@@ -2799,9 +2770,9 @@ ROM_END
 ROM_START( whtwtr )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("white water.u72", 0x0000000, 0x0400000, CRC(64a814c6) SHA1(9415bb32675e5c3b6299967b1d10dbccd699d9ed) )
-	ROM_LOAD32_WORD("white water.u73", 0x0000000, 0x0400000, CRC(0e1fcaca) SHA1(725237cca34d86e53cb68547604d8844257cdf48) )
-	ROM_LOAD32_WORD("white water.u85", 0x0000000, 0x0400000, CRC(8802e0cb) SHA1(d11874426839a506d78440adbc49056ce21f88d3) )
+	ROM_LOAD32_WORD("white water.u72", 0x0800002, 0x0400000, CRC(64a814c6) SHA1(9415bb32675e5c3b6299967b1d10dbccd699d9ed) )
+	ROM_LOAD32_WORD("white water.u73", 0x0000002, 0x0400000, CRC(0e1fcaca) SHA1(725237cca34d86e53cb68547604d8844257cdf48) )
+	ROM_LOAD32_WORD("white water.u85", 0x0800000, 0x0400000, CRC(8802e0cb) SHA1(d11874426839a506d78440adbc49056ce21f88d3) )
 	ROM_LOAD32_WORD("white water.u86", 0x0000000, 0x0400000, CRC(9e527f96) SHA1(34e46e530686ab5955ae267541e96d06a4e149a6) )
 ROM_END
 
@@ -2810,9 +2781,9 @@ ROM_END
 ROM_START( wldafus )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("wild africa.u72", 0x0000000, 0x0400000, CRC(a55417ca) SHA1(151615f81112b30aff2a2aa26280b7c1bf0d45db) )
-	ROM_LOAD32_WORD("wild africa.u73", 0x0000000, 0x0400000, CRC(e1e1253e) SHA1(4c15c953b80288df8f97197d70c8076fde9a0d29) )
-	ROM_LOAD32_WORD("wild africa.u85", 0x0000000, 0x0400000, CRC(7ecbb5ba) SHA1(ab201ad7db848f5c03e3795c63308530b371d354) )
+	ROM_LOAD32_WORD("wild africa.u72", 0x0800002, 0x0400000, CRC(a55417ca) SHA1(151615f81112b30aff2a2aa26280b7c1bf0d45db) )
+	ROM_LOAD32_WORD("wild africa.u73", 0x0000002, 0x0400000, CRC(e1e1253e) SHA1(4c15c953b80288df8f97197d70c8076fde9a0d29) )
+	ROM_LOAD32_WORD("wild africa.u85", 0x0800000, 0x0400000, CRC(7ecbb5ba) SHA1(ab201ad7db848f5c03e3795c63308530b371d354) )
 	ROM_LOAD32_WORD("wild africa.u86", 0x0000000, 0x0400000, CRC(2193094c) SHA1(57d687301a59f36880560a3efc7040e333cb05d3) )
 ROM_END
 
@@ -2820,8 +2791,8 @@ ROM_END
 ROM_START( wldpntus )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("wild panthers.u72", 0x0000000, 0x0400000, CRC(2969f69c) SHA1(d63f1bcbd163c067f143a55aaf7c88b3c9ac0ebe) )
-	ROM_LOAD32_WORD("wild panthers.u73", 0x0000000, 0x0400000, CRC(59d83a8a) SHA1(61f6e6b85108621c2eac1bf48c27d79a72fbb2fd) )
+	ROM_LOAD32_WORD("wild panthers.u72", 0x0800002, 0x0400000, CRC(2969f69c) SHA1(d63f1bcbd163c067f143a55aaf7c88b3c9ac0ebe) )
+	ROM_LOAD32_WORD("wild panthers.u73", 0x0000002, 0x0400000, CRC(59d83a8a) SHA1(61f6e6b85108621c2eac1bf48c27d79a72fbb2fd) )
 	ROM_LOAD32_WORD("wild panthers.u86", 0x0000000, 0x0400000, CRC(c874ec84) SHA1(e4f3beaa254f5b827c7f0f5d22be7dd5b3abfd2c) ) // missing a rom?
 ROM_END
 
@@ -2831,9 +2802,9 @@ ROM_END
 ROM_START( wingolus )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("wingsofolympus.u72", 0x0000000, 0x0400000, CRC(158877b5) SHA1(a1fc98d90a763253f07b9df44d85e8594b26d484) )
-	ROM_LOAD32_WORD("wingsofolympus.u73", 0x0000000, 0x0400000, CRC(5c003b1e) SHA1(be419686b89e22a1aa5d841015ab3442bffe05a6) )
-	ROM_LOAD32_WORD("wingsofolympus.u85", 0x0000000, 0x0400000, CRC(63aef582) SHA1(59fa78d7d29c8d4686fab83cfa46238938a9c249) )
+	ROM_LOAD32_WORD("wingsofolympus.u72", 0x0800002, 0x0400000, CRC(158877b5) SHA1(a1fc98d90a763253f07b9df44d85e8594b26d484) )
+	ROM_LOAD32_WORD("wingsofolympus.u73", 0x0000002, 0x0400000, CRC(5c003b1e) SHA1(be419686b89e22a1aa5d841015ab3442bffe05a6) )
+	ROM_LOAD32_WORD("wingsofolympus.u85", 0x0800000, 0x0400000, CRC(63aef582) SHA1(59fa78d7d29c8d4686fab83cfa46238938a9c249) )
 	ROM_LOAD32_WORD("wingsofolympus.u86", 0x0000000, 0x0400000, CRC(c5d7d7cf) SHA1(641cdfe9b612c9cefd6a279f0c44fd535521aeef) )
 ROM_END
 
@@ -2842,127 +2813,139 @@ ROM_END
 ROM_START( zorrous )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("zorro28ef.u72", 0x0000000, 0x0400000, CRC(9e572513) SHA1(76f5578d957ec9a3a48fa9d532e6c440855d1cb6) )
-	ROM_LOAD32_WORD("zorro5a4c.u84", 0x0000000, 0x0400000, CRC(e636ae58) SHA1(70e941118ae19165651157cb5219d38f58f196af) )
-	ROM_LOAD32_WORD("zorro77c8.86", 0x0000000, 0x0400000, CRC(8d38c20c) SHA1(a0a38844aa18da72f1933571047ca36715911fb6) )
-	ROM_LOAD32_WORD("zorroc4fe.u85", 0x0000000, 0x0400000, CRC(dead9ca1) SHA1(13b1b44a537227b6ada45ed99277d650b11aefd1) )
-	ROM_LOAD32_WORD("zorrod940.u73", 0x0000000, 0x0400000, CRC(b030bdd1) SHA1(b3138ed4181342dfe1adbcb784f4e3366cb6e103) )
-	ROM_LOAD32_WORD("zorroe953.u71", 0x0000000, 0x0400000, CRC(ff5a8592) SHA1(03d452133d30d780312066bada8e21566255209f) )
+	ROM_LOAD32_WORD("zorro28ef.u72", 0x0800002, 0x0400000, CRC(9e572513) SHA1(76f5578d957ec9a3a48fa9d532e6c440855d1cb6) )
+	ROM_LOAD32_WORD("zorro5a4c.u84", 0x1000000, 0x0400000, CRC(e636ae58) SHA1(70e941118ae19165651157cb5219d38f58f196af) )
+	ROM_LOAD32_WORD("zorro77c8.u86", 0x0000000, 0x0400000, CRC(8d38c20c) SHA1(a0a38844aa18da72f1933571047ca36715911fb6) )
+	ROM_LOAD32_WORD("zorroc4fe.u85", 0x0800000, 0x0400000, CRC(dead9ca1) SHA1(13b1b44a537227b6ada45ed99277d650b11aefd1) )
+	ROM_LOAD32_WORD("zorrod940.u73", 0x0000002, 0x0400000, CRC(b030bdd1) SHA1(b3138ed4181342dfe1adbcb784f4e3366cb6e103) )
+	ROM_LOAD32_WORD("zorroe953.u71", 0x1000002, 0x0400000, CRC(ff5a8592) SHA1(03d452133d30d780312066bada8e21566255209f) )
 ROM_END
 
-
-
-ROM_START( bobdolu1 )
-	ARISTMK6_BIOS
-	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("bob-dolly-27v322-u11-cs-e927.bin", 0x0000000, 0x0400000, CRC(d3657369) SHA1(621fb20238f10e06c486dfbd6460f94047898a42) )
-	ROM_LOAD32_WORD("bob-dolly-27v322-u12-cs-4185.bin", 0x0000000, 0x0400000, CRC(47429081) SHA1(23d996aa522c2f9beadf1fdb7c0584ca939917da) )
-	ROM_LOAD32_WORD("bob-dolly-27v322-u13-cs-a9c5.bin", 0x0000000, 0x0400000, CRC(e73883db) SHA1(6382386ac6f576c739c959cbf6b6df2605496845) )
-	ROM_LOAD32_WORD("bob-dolly-27v322-u14-cs-c8e1.bin", 0x0000000, 0x0400000, CRC(0f1a6b7c) SHA1(17686829a1a64f6d8982e015067f2d08bcb00402) )
-
-	ROM_LOAD32_WORD("bob-dolly-27v322-u21-cs-c2d7.bin", 0x0000000, 0x0400000, CRC(8e32da10) SHA1(28a49ecc3bab512e5828c96392d6fa4ff9394a0f) )
-	ROM_LOAD32_WORD("bob-dolly-27v322-u22-cs-08ec.bin", 0x0000000, 0x0400000, CRC(4302ae5e) SHA1(fe1d122093ad9234a7a5337b3a4c2de7fe046822) )
-	ROM_LOAD32_WORD("bob-dolly-27v322-u23-cs-0e8d.bin", 0x0000000, 0x0400000, CRC(a9726ec5) SHA1(cdf78adc3ebcd50e503b2587564493a91b73f578) )
-	ROM_LOAD32_WORD("bob-dolly-27v322-u24-cs-e2c2.bin", 0x0000000, 0x0400000, CRC(3646c16d) SHA1(c52fab2e11f39c126bcbbb348750bbf30ff96090) )
-ROM_END
-
-
-
-
-
-ROM_START( pwsp1 )
-	ARISTMK6_BIOS
-	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("players- world- super- m27v322- cs-1231-u13.bin", 0x0000000, 0x0400000, CRC(43b44f26) SHA1(5410eea0a4911a274a794d6b27e369fb98c6edf7) )
-	ROM_LOAD32_WORD("players- world- super- m27v322- cs-1eea-u15.bin", 0x0000000, 0x0400000, CRC(2c7fe966) SHA1(42fc364dded0ce079ce4970b1f951c6a0ebf6c51) )
-	ROM_LOAD32_WORD("players- world- super- m27v322- cs-35c66-u12.bin", 0x0000000, 0x0400000, CRC(5354cff5) SHA1(bf818e53a432aa8e7a2578dbb367be2c5f51bb16) )
-	ROM_LOAD32_WORD("players- world- super- m27v322- cs-baa2-u11.bin", 0x0000000, 0x0400000, CRC(48f60a2c) SHA1(0d27d544991b3403672250ff79c5bbbf35cdf175) )
-	ROM_LOAD32_WORD("players- world- super- m27v322- cs-f4bb-u14.bin", 0x0000000, 0x0400000, CRC(a850af7f) SHA1(8d029de0083aad57ddd8b36153214b40cd388d56) )
-
-	ROM_LOAD32_WORD("players- world- super- m27v322- cs-4752-u22.bin", 0x0000000, 0x0400000, CRC(9dbdefb7) SHA1(445a24233b435e3812747d8376addf969fea5cd2) )
-	ROM_LOAD32_WORD("players- world- super- m27v322- cs-64d5-u21.bin", 0x0000000, 0x0400000, CRC(678b0be2) SHA1(16f5460d67a1e897390e0c03b847511f5c14156a) )
-	ROM_LOAD32_WORD("players- world- super- m27v322- cs-9a82-u25.bin", 0x0000000, 0x0400000, CRC(5f9b8ef7) SHA1(f0c954d1f448f2061dbe284c78eddcfcb5afdc7c) )
-	ROM_LOAD32_WORD("players- world- super- m27v322- cs-dd69-u24.bin", 0x0000000, 0x0400000, CRC(dbb073f1) SHA1(e3a7f14cabab613453baffde3b592889d11578e7) )
-	ROM_LOAD32_WORD("players- world- super- m27v322- cs-e8f7-u23.bin", 0x0000000, 0x0400000, CRC(ae04211a) SHA1(8db4fc936fa6d0e0a372b81f2e9590047522b843) )
-ROM_END
-
-
 ROM_START( adonis6 )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("US_Adonis_U73.bin", 0x0000000, 0x0400000, CRC(eba9e84f) SHA1(bf746ea356627b1a558b4c8f8a2d8d5c54400a4a) )
-	ROM_LOAD32_WORD("US_Adonis_U86.bin", 0x0000000, 0x0400000, CRC(0eeb0ac3) SHA1(72b2b4711eb9d962bfb58fac1a5226ac81db67ea) )
+	ROM_LOAD32_WORD("US_Adonis_.u73", 0x0000002, 0x0400000, CRC(eba9e84f) SHA1(bf746ea356627b1a558b4c8f8a2d8d5c54400a4a) )
+	ROM_LOAD32_WORD("US_Adonis_.u86", 0x0000000, 0x0400000, CRC(0eeb0ac3) SHA1(72b2b4711eb9d962bfb58fac1a5226ac81db67ea) )
 ROM_END
 
-
-
 ROM_START( starqst )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("Star Quest  U73.bin", 0x0000000, 0x0400000, CRC(facf51b6) SHA1(73c13d507b65cd98ae43918c21b492a8499dd538) )
-	ROM_LOAD32_WORD("Star Quest  U86.bin", 0x0000000, 0x0400000, CRC(c21f4486) SHA1(5a6a532d73bf56f68f473bd56a7c3d9f0660d661) )
+	ROM_LOAD32_WORD("Star Quest.u73", 0x0000002, 0x0400000, CRC(facf51b6) SHA1(73c13d507b65cd98ae43918c21b492a8499dd538) )
+	ROM_LOAD32_WORD("Star Quest.u86", 0x0000000, 0x0400000, CRC(c21f4486) SHA1(5a6a532d73bf56f68f473bd56a7c3d9f0660d661) )
 ROM_END
 
-
 ROM_START( eaglst1 )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("Eagle Strike U73.bin", 0x0000000, 0x0400000, CRC(94ff83d2) SHA1(54a02cdfb205a429d7458ecb51ba20083306011e) )
-	ROM_LOAD32_WORD("Eagle Strike U70.bin", 0x0000000, 0x0400000, CRC(b899e64b) SHA1(1f1d800df39de444b03ff4cc85bf4cf073f88423) )
-	ROM_LOAD32_WORD("Eagle Strike U71.bin", 0x0000000, 0x0400000, CRC(7311d99c) SHA1(802abed830ca3204ce50072ac69d0a3cae8f17e5) )
-	ROM_LOAD32_WORD("Eagle Strike U72.bin", 0x0000000, 0x0400000, CRC(4d96aef2) SHA1(40860ad6a0f82d79347b65b182f72dfbec23cd74) )
+	ROM_LOAD32_WORD("Eagle Strike.u73", 0x0000002, 0x0400000, CRC(94ff83d2) SHA1(54a02cdfb205a429d7458ecb51ba20083306011e) )
+	ROM_LOAD32_WORD("Eagle Strike.u70", 0x1800002, 0x0400000, CRC(b899e64b) SHA1(1f1d800df39de444b03ff4cc85bf4cf073f88423) )
+	ROM_LOAD32_WORD("Eagle Strike.u71", 0x1000002, 0x0400000, CRC(7311d99c) SHA1(802abed830ca3204ce50072ac69d0a3cae8f17e5) )
+	ROM_LOAD32_WORD("Eagle Strike.u72", 0x0800002, 0x0400000, CRC(4d96aef2) SHA1(40860ad6a0f82d79347b65b182f72dfbec23cd74) )
 ROM_END
 
-
-
-
 ROM_START( eaglst2 )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
 	ROM_LOAD32_WORD("Eagle Strike.u86", 0x0000000, 0x0400000, CRC(71c8121b) SHA1(1a4534b8e43dbc173809b5a621d6796a7a8655cf) )
-	ROM_LOAD32_WORD("Eagle Strike.u83", 0x0000000, 0x0400000, CRC(d70198eb) SHA1(1e4c157deec921386623091b27180c9c53551f44) )
-	ROM_LOAD32_WORD("Eagle Strike.u84", 0x0000000, 0x0400000, CRC(664c3d45) SHA1(26ce8a7e88eddc94ecce5ada78654e6f30a985d6) )
-	ROM_LOAD32_WORD("Eagle Strike.u85", 0x0000000, 0x0400000, CRC(c7430ac8) SHA1(e6f7e523ef2c4aad584a08ce9c70e0e535d89890) )
-	ROM_LOAD32_WORD("Eagle Strike.u72", 0x0000000, 0x0400000, CRC(4d96aef2) SHA1(40860ad6a0f82d79347b65b182f72dfbec23cd74) )
-	ROM_LOAD32_WORD("Eagle Strike.u73", 0x0000000, 0x0400000, CRC(94ff83d2) SHA1(54a02cdfb205a429d7458ecb51ba20083306011e) )
-	ROM_LOAD32_WORD("Eagle Strike.u71", 0x0000000, 0x0400000, CRC(7311d99c) SHA1(802abed830ca3204ce50072ac69d0a3cae8f17e5) )
-	ROM_LOAD32_WORD("Eagle Strike.u70", 0x0000000, 0x0400000, CRC(b899e64b) SHA1(1f1d800df39de444b03ff4cc85bf4cf073f88423) )
+	ROM_LOAD32_WORD("Eagle Strike.u83", 0x1800000, 0x0400000, CRC(d70198eb) SHA1(1e4c157deec921386623091b27180c9c53551f44) )
+	ROM_LOAD32_WORD("Eagle Strike.u84", 0x1000000, 0x0400000, CRC(664c3d45) SHA1(26ce8a7e88eddc94ecce5ada78654e6f30a985d6) )
+	ROM_LOAD32_WORD("Eagle Strike.u85", 0x0800000, 0x0400000, CRC(c7430ac8) SHA1(e6f7e523ef2c4aad584a08ce9c70e0e535d89890) )
+	ROM_LOAD32_WORD("Eagle Strike.u72", 0x0800002, 0x0400000, CRC(4d96aef2) SHA1(40860ad6a0f82d79347b65b182f72dfbec23cd74) )
+	ROM_LOAD32_WORD("Eagle Strike.u73", 0x0000002, 0x0400000, CRC(94ff83d2) SHA1(54a02cdfb205a429d7458ecb51ba20083306011e) )
+	ROM_LOAD32_WORD("Eagle Strike.u71", 0x1000002, 0x0400000, CRC(7311d99c) SHA1(802abed830ca3204ce50072ac69d0a3cae8f17e5) )
+	ROM_LOAD32_WORD("Eagle Strike.u70", 0x1800002, 0x0400000, CRC(b899e64b) SHA1(1f1d800df39de444b03ff4cc85bf4cf073f88423) )
 ROM_END
 
-
 ROM_START( kingnilea )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("King Of The Nile.003", 0x0000000, 0x0400000, CRC(ea5d2450) SHA1(fdcf6c532231e9abf3a1c035bdef9d0db7fcf148) )
-	ROM_LOAD32_WORD("King Of The Nile.001", 0x0000000, 0x0400000, CRC(9a90354d) SHA1(5c5b0822e6a842f85e2acca0e1c8bfe0c3f68496) )
-	ROM_LOAD32_WORD("King Of The Nile.002", 0x0000000, 0x0400000, CRC(524c786e) SHA1(7e40266be5496baefd74796ce66857aec2d21437) )
-	ROM_LOAD32_WORD("King Of The Nile.000", 0x0000000, 0x0400000, CRC(c3830908) SHA1(438fc339f8b71668e816b5909195cae4158f39c2) )
+	ROM_LOAD32_WORD("King Of The Nile.003.u72", 0x0800002, 0x0400000, CRC(ea5d2450) SHA1(fdcf6c532231e9abf3a1c035bdef9d0db7fcf148) )
+	ROM_LOAD32_WORD("King Of The Nile.001.u73", 0x0000002, 0x0400000, CRC(9a90354d) SHA1(5c5b0822e6a842f85e2acca0e1c8bfe0c3f68496) )
+	ROM_LOAD32_WORD("King Of The Nile.002.u85", 0x0800000, 0x0400000, CRC(524c786e) SHA1(7e40266be5496baefd74796ce66857aec2d21437) )
+	ROM_LOAD32_WORD("King Of The Nile.000.u86", 0x0000000, 0x0400000, CRC(c3830908) SHA1(438fc339f8b71668e816b5909195cae4158f39c2) )
 ROM_END
 
-
-
-
 ROM_START( outbackja )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("20195211.000", 0x0000000, 0x0400000, CRC(16f70945) SHA1(0de1bd1371d5fb33bfe7f7c2a80a70412387dc5f) )
-	ROM_LOAD32_WORD("20195211.001", 0x0000000, 0x0400000, CRC(611f82b7) SHA1(84df7ec63d26a691acd2822b8d0803c827c89f37) )
-	ROM_LOAD32_WORD("20195211.007", 0x0000000, 0x0400000, CRC(3a0ea3ca) SHA1(88513130013b1b18772a5e538da9a8db3a54633e) )
-	ROM_LOAD32_WORD("20195211.005", 0x0000000, 0x0400000, CRC(23f1f50c) SHA1(40145b839c2b5fde5c0f20e08f46f5a859b6e20a) )
-	ROM_LOAD32_WORD("20195211.003", 0x0000000, 0x0400000, CRC(cdd28848) SHA1(0038bb422a1d650beaa0ffd63b7d6de1936a5e32) )
-	ROM_LOAD32_WORD("20195211.006", 0x0000000, 0x0400000, CRC(79ca67a1) SHA1(68bae23df71c768dc17631f6ccfc7a720c0959ee) )
-	ROM_LOAD32_WORD("20195211.004", 0x0000000, 0x0400000, CRC(0cd41b5d) SHA1(a7891da788fe88d2191b2f0686cb9ca2ecfeeb9c) )
-	ROM_LOAD32_WORD("20195211.002", 0x0000000, 0x0400000, CRC(a1853f27) SHA1(cd2bf8674555f6870f0689ca0adbca6890bc9b27) )
+	ROM_LOAD32_WORD("20195211.000.u86", 0x0000000, 0x0400000, CRC(16f70945) SHA1(0de1bd1371d5fb33bfe7f7c2a80a70412387dc5f) )
+	ROM_LOAD32_WORD("20195211.001.u73", 0x0000002, 0x0400000, CRC(611f82b7) SHA1(84df7ec63d26a691acd2822b8d0803c827c89f37) )
+	ROM_LOAD32_WORD("20195211.007.u70", 0x1800002, 0x0400000, CRC(3a0ea3ca) SHA1(88513130013b1b18772a5e538da9a8db3a54633e) )
+	ROM_LOAD32_WORD("20195211.005.u71", 0x1000002, 0x0400000, CRC(23f1f50c) SHA1(40145b839c2b5fde5c0f20e08f46f5a859b6e20a) )
+	ROM_LOAD32_WORD("20195211.003.u72", 0x0800002, 0x0400000, CRC(cdd28848) SHA1(0038bb422a1d650beaa0ffd63b7d6de1936a5e32) )
+	ROM_LOAD32_WORD("20195211.006.u83", 0x1800000, 0x0400000, CRC(79ca67a1) SHA1(68bae23df71c768dc17631f6ccfc7a720c0959ee) )
+	ROM_LOAD32_WORD("20195211.004.u84", 0x1000000, 0x0400000, CRC(0cd41b5d) SHA1(a7891da788fe88d2191b2f0686cb9ca2ecfeeb9c) )
+	ROM_LOAD32_WORD("20195211.002.u85", 0x0800000, 0x0400000, CRC(a1853f27) SHA1(cd2bf8674555f6870f0689ca0adbca6890bc9b27) )
 ROM_END
 
 
 ROM_START( witgoldd )
 	ARISTMK6_BIOS
 	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
-	ROM_LOAD32_WORD("Where's The Gold Demo.003", 0x0000000, 0x0400000, CRC(bd188f12) SHA1(53433d346f23bc826fc041f1631270f8380759b6) )
-	ROM_LOAD32_WORD("Where's The Gold Demo.001", 0x0000000, 0x0400000, CRC(57253567) SHA1(41e0b1b7247ff4f0f9c6b150aef23a5eb5984e30) )
-	ROM_LOAD32_WORD("Where's The Gold Demo.002", 0x0000000, 0x0400000, CRC(86a40a48) SHA1(e0ad565e56c698df0f631e42dcfda17dfa5c8017) )
-	ROM_LOAD32_WORD("Where's The Gold Demo.000", 0x0000000, 0x0400000, CRC(4e6fad4a) SHA1(a2efc21cf773f9cb291ea1607d1864ba333807e9) )
+	ROM_LOAD32_WORD("Where's The Gold Demo.003.u72", 0x0800002, 0x0400000, CRC(bd188f12) SHA1(53433d346f23bc826fc041f1631270f8380759b6) )
+	ROM_LOAD32_WORD("Where's The Gold Demo.001.u73", 0x0000002, 0x0400000, CRC(57253567) SHA1(41e0b1b7247ff4f0f9c6b150aef23a5eb5984e30) )
+	ROM_LOAD32_WORD("Where's The Gold Demo.002.u85", 0x0800000, 0x0400000, CRC(86a40a48) SHA1(e0ad565e56c698df0f631e42dcfda17dfa5c8017) )
+	ROM_LOAD32_WORD("Where's The Gold Demo.000.u86", 0x0000000, 0x0400000, CRC(4e6fad4a) SHA1(a2efc21cf773f9cb291ea1607d1864ba333807e9) )
+ROM_END
+
+
+ROM_START( rumbrel ) // unknown IC positions
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("Rumble Reels L0", 0x0000000, 0x0400000, CRC(06b37c77) SHA1(e4dad62667a1c1d4948abcd535332975148e952b) )
+	ROM_LOAD32_WORD("Rumble Reels L1", 0x0000000, 0x0400000, CRC(739c4565) SHA1(bc2cd133dfbfe18916703eacc851f1757a06f345) )
+	ROM_LOAD32_WORD("Rumble Reels L2", 0x0000000, 0x0400000, CRC(2f561bd0) SHA1(9c2f659ec5cdfd335d089389616dac57fbb655df) )
+	ROM_LOAD32_WORD("Rumble Reels L3", 0x0000000, 0x0400000, CRC(6bf0442e) SHA1(c83ed68cd0680ebac359824defa51c1942db17f1) )
+	ROM_LOAD32_WORD("Rumble Reels L4", 0x0000000, 0x0400000, CRC(3cd5171b) SHA1(fe6e17679f14ae0238c58dd5d801cb0dda3a434b) )
+	ROM_LOAD32_WORD("Rumble Reels R0", 0x0000000, 0x0400000, CRC(cc48bb54) SHA1(6ed7a502deaff0e2fd6d0901d036fcbadf303859) )
+	ROM_LOAD32_WORD("Rumble Reels R1", 0x0000000, 0x0400000, CRC(3af99e7b) SHA1(93e68056fee9b4f29a066bd6828ff320b7d3ffa4) )
+	ROM_LOAD32_WORD("Rumble Reels R2", 0x0000000, 0x0400000, CRC(04b2f09d) SHA1(4090876cf8ef18ed8541f13684b076d7ac1d0d72) )
+	ROM_LOAD32_WORD("Rumble Reels R3", 0x0000000, 0x0400000, CRC(a117e3ec) SHA1(119d7ac89ee4c2167b853d720eb87498cefab4b9) )
+	ROM_LOAD32_WORD("Rumble Reels R4", 0x0000000, 0x0400000, CRC(2c5baf9f) SHA1(40fb5b22460b9a35ca8ebb8b0643e58665d8643f) )
+ROM_END
+
+ROM_START( hlsunmon )  // different IC positions
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("HL Sun and Moon.u11", 0x0000000, 0x0400000, CRC(b6a8df40) SHA1(316e3f98b75c1bdd0e8fc55aee2cf20b8a45ff4c) )
+	ROM_LOAD32_WORD("HL Sun and Moon.u12", 0x0000000, 0x0400000, CRC(98cde50e) SHA1(68e60411a8c10b73482a4cc8d3f14ebdedca0ae9) )
+	ROM_LOAD32_WORD("HL Sun and Moon.u13", 0x0000000, 0x0400000, CRC(ac9143cc) SHA1(75aeea2ad26044bef9eb31495d67414a416ee6d4) )
+	ROM_LOAD32_WORD("HL Sun and Moon.u14", 0x0000000, 0x0400000, CRC(a5552dd3) SHA1(1bbe24950e19441ca5144cb9b38320803bd5d26e) )
+	ROM_LOAD32_WORD("HL Sun and Moon.u21", 0x0000000, 0x0400000, CRC(b0cc922d) SHA1(5a45d0c995c639739176a5aad42e186b122eead1) )
+	ROM_LOAD32_WORD("HL Sun and Moon.u22", 0x0000000, 0x0400000, CRC(542ec911) SHA1(48988bdefb9ad6a7e0c733eda1f220b0347cab5f) )
+	ROM_LOAD32_WORD("HL Sun and Moon.u23", 0x0000000, 0x0400000, CRC(0ac455b1) SHA1(3ca4f4a0172f18692c9f82a9a435ffc1ca39ddc2) )
+	ROM_LOAD32_WORD("HL Sun and Moon.u24", 0x0000000, 0x0400000, CRC(19e5b7e0) SHA1(cf17a84ba08a2f24725d4ccbe046710c2f3a2459) )
+ROM_END
+
+ROM_START( bobdolu1 ) // different IC positions
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("bob-dolly-27v322-cs-e927.u11", 0x0000000, 0x0400000, CRC(d3657369) SHA1(621fb20238f10e06c486dfbd6460f94047898a42) )
+	ROM_LOAD32_WORD("bob-dolly-27v322-cs-4185.u12", 0x0000000, 0x0400000, CRC(47429081) SHA1(23d996aa522c2f9beadf1fdb7c0584ca939917da) )
+	ROM_LOAD32_WORD("bob-dolly-27v322-cs-a9c5.u13", 0x0000000, 0x0400000, CRC(e73883db) SHA1(6382386ac6f576c739c959cbf6b6df2605496845) )
+	ROM_LOAD32_WORD("bob-dolly-27v322-cs-c8e1.u14", 0x0000000, 0x0400000, CRC(0f1a6b7c) SHA1(17686829a1a64f6d8982e015067f2d08bcb00402) )
+
+	ROM_LOAD32_WORD("bob-dolly-27v322-cs-c2d7.u21", 0x0000000, 0x0400000, CRC(8e32da10) SHA1(28a49ecc3bab512e5828c96392d6fa4ff9394a0f) )
+	ROM_LOAD32_WORD("bob-dolly-27v322-cs-08ec.u22", 0x0000000, 0x0400000, CRC(4302ae5e) SHA1(fe1d122093ad9234a7a5337b3a4c2de7fe046822) )
+	ROM_LOAD32_WORD("bob-dolly-27v322-cs-0e8d.u23", 0x0000000, 0x0400000, CRC(a9726ec5) SHA1(cdf78adc3ebcd50e503b2587564493a91b73f578) )
+	ROM_LOAD32_WORD("bob-dolly-27v322-cs-e2c2.u24", 0x0000000, 0x0400000, CRC(3646c16d) SHA1(c52fab2e11f39c126bcbbb348750bbf30ff96090) )
+ROM_END
+
+ROM_START( pwsp1 )  // different IC positions
+	ARISTMK6_BIOS
+	ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
+	ROM_LOAD32_WORD("players- world- super- m27v322- cs-1231.u13", 0x0000000, 0x0400000, CRC(43b44f26) SHA1(5410eea0a4911a274a794d6b27e369fb98c6edf7) )
+	ROM_LOAD32_WORD("players- world- super- m27v322- cs-1eea.u15", 0x0000000, 0x0400000, CRC(2c7fe966) SHA1(42fc364dded0ce079ce4970b1f951c6a0ebf6c51) )
+	ROM_LOAD32_WORD("players- world- super- m27v322- cs-35c6.u12", 0x0000000, 0x0400000, CRC(5354cff5) SHA1(bf818e53a432aa8e7a2578dbb367be2c5f51bb16) )
+	ROM_LOAD32_WORD("players- world- super- m27v322- cs-baa2.u11", 0x0000000, 0x0400000, CRC(48f60a2c) SHA1(0d27d544991b3403672250ff79c5bbbf35cdf175) )
+	ROM_LOAD32_WORD("players- world- super- m27v322- cs-f4bb.u14", 0x0000000, 0x0400000, CRC(a850af7f) SHA1(8d029de0083aad57ddd8b36153214b40cd388d56) )
+
+	ROM_LOAD32_WORD("players- world- super- m27v322- cs-4752.u22", 0x0000000, 0x0400000, CRC(9dbdefb7) SHA1(445a24233b435e3812747d8376addf969fea5cd2) )
+	ROM_LOAD32_WORD("players- world- super- m27v322- cs-64d5.u21", 0x0000000, 0x0400000, CRC(678b0be2) SHA1(16f5460d67a1e897390e0c03b847511f5c14156a) )
+	ROM_LOAD32_WORD("players- world- super- m27v322- cs-9a82.u25", 0x0000000, 0x0400000, CRC(5f9b8ef7) SHA1(f0c954d1f448f2061dbe284c78eddcfcb5afdc7c) )
+	ROM_LOAD32_WORD("players- world- super- m27v322- cs-dd69.u24", 0x0000000, 0x0400000, CRC(dbb073f1) SHA1(e3a7f14cabab613453baffde3b592889d11578e7) )
+	ROM_LOAD32_WORD("players- world- super- m27v322- cs-e8f7.u23", 0x0000000, 0x0400000, CRC(ae04211a) SHA1(8db4fc936fa6d0e0a372b81f2e9590047522b843) )
 ROM_END
 
 
@@ -3158,6 +3141,7 @@ GAME( 200?, flamoly2,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, R
 GAME( 200?, flamolus,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Flames Of Olympus USA (set 1)",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
 GAME( 200?, flamolusa,  flamolus,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Flames Of Olympus USA (set 2)",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // one of these must be bad
 GAME( 200?, foxred,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Foxworthy Redneck",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, jefffox,  foxred,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Jeff Foxworty",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
 GAME( 200?, frogwld,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Frog Wild",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
 GAME( 200?, gwnn,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Game With No Name",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
 GAME( 200?, gldgong,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Golden gong",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
@@ -3165,7 +3149,6 @@ GAME( 200?, gldgong2,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, R
 GAME( 200?, gldincas,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Golden Incas",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
 GAME( 200?, hlntry,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Helen Of Troy",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
 GAME( 200?, hlsunmon,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Hyperlink Sun and Moon",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
-GAME( 200?, jefffox,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Jeff Foxworty",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
 GAME( 200?, jewelunc,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Jewel Unchantress",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
 GAME( 200?, lemrol,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Let Em Roll",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
 GAME( 200?, lineking,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Line King",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
@@ -3199,7 +3182,8 @@ GAME( 200?, tiktoru,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, RO
 GAME( 200?, timwolfu,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Timberwolf",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
 GAME( 200?, trkinus,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Treasure King",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
 GAME( 200?, venicus,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Venice",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
-GAME( 200?, whlcshus,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Whales Of Cash",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, whlcshus,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Whales Of Cash (set 1)",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 200?, whlcshusa,  whlcshus,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Whales Of Cash (set 2)",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
 GAME( 200?, whtwtr,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "White Water",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
 GAME( 200?, wldafus,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Wild Africa",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
 GAME( 200?, wldpntus,  aristmk6,   aristmk6,    aristmk6, driver_device,    0, ROT0, "Aristocrat", "Wild Panthers",                 MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
diff --git a/src/mame/mame.lst b/src/mame/mame.lst
index 9c8b3b49d81..af563cd70da 100644
--- a/src/mame/mame.lst
+++ b/src/mame/mame.lst
@@ -1674,6 +1674,7 @@ timwolfu
 trkinus
 venicus
 whlcshus
+whlcshusa
 whtwtr
 wldafus
 wldpntus

From e04c8fdb6a098cd3b97199f84e12b92725409274 Mon Sep 17 00:00:00 2001
From: David Haywood <mamehaze@users.noreply.github.com>
Date: Tue, 19 Apr 2016 14:25:27 +0100
Subject: [PATCH 092/122] better filenames (nw)

---
 src/mame/drivers/aristmk5.cpp | 585 +++++++++++++++++-----------------
 1 file changed, 293 insertions(+), 292 deletions(-)

diff --git a/src/mame/drivers/aristmk5.cpp b/src/mame/drivers/aristmk5.cpp
index 8c53ba8f0f5..e2eb7e43ce4 100644
--- a/src/mame/drivers/aristmk5.cpp
+++ b/src/mame/drivers/aristmk5.cpp
@@ -166,6 +166,7 @@
 
 *****************************************************************************************************************/
 
+
 #define MASTER_CLOCK        XTAL_72MHz      /* confirmed */
 
 #include "emu.h"
@@ -1343,12 +1344,12 @@ ROM_END
 ROM_START( badbog )
 	ARISTOCRAT_MK5_BIOS
 	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
-	ROM_LOAD32_WORD("Bad_Bog_1of6.U07.BIN", 0x0000000, 0x0080000, CRC(25aa8109) SHA1(cf4521b3d447812d2d9dbfdab9fe0cec71cdeb2e) )
-	ROM_LOAD32_WORD("Bad_Bog_2of6.U11.BIN", 0x0000002, 0x0080000, CRC(774ff977) SHA1(5ce1aa8b7598b4bc8e5fa44de1c03b5f2851f5de) )
-	ROM_LOAD32_WORD("Bad_Bog_3of6.U08.BIN", 0x0100000, 0x0080000, CRC(e52a279a) SHA1(4a3a080d840d8a894ec0ba0250a566831377f0f8) )
-	ROM_LOAD32_WORD("Bad_Bog_4of6.U12.BIN", 0x0100002, 0x0080000, CRC(562aa123) SHA1(825a2d23321b636a3ff2565b2b72df3b97bd0ec8) )
-	ROM_LOAD32_WORD("Bad_Bog_5of6.U09.BIN", 0x0200000, 0x0080000, CRC(66d5a7f7) SHA1(1a1f845a97677c43ff1090231434ae9d3d36ab4c) )
-	ROM_LOAD32_WORD("Bad_Bog_6of6.U13.BIN", 0x0200002, 0x0080000, CRC(883b2ec3) SHA1(5b431d8c9c8eabca65ab22dcf2bdb22d49445bb1) )
+	ROM_LOAD32_WORD("Bad_Bog_1of6.u7",  0x0000000, 0x0080000, CRC(25aa8109) SHA1(cf4521b3d447812d2d9dbfdab9fe0cec71cdeb2e) )
+	ROM_LOAD32_WORD("Bad_Bog_2of6.u11", 0x0000002, 0x0080000, CRC(774ff977) SHA1(5ce1aa8b7598b4bc8e5fa44de1c03b5f2851f5de) )
+	ROM_LOAD32_WORD("Bad_Bog_3of6.u8",  0x0100000, 0x0080000, CRC(e52a279a) SHA1(4a3a080d840d8a894ec0ba0250a566831377f0f8) )
+	ROM_LOAD32_WORD("Bad_Bog_4of6.u12", 0x0100002, 0x0080000, CRC(562aa123) SHA1(825a2d23321b636a3ff2565b2b72df3b97bd0ec8) )
+	ROM_LOAD32_WORD("Bad_Bog_5of6.u09", 0x0200000, 0x0080000, CRC(66d5a7f7) SHA1(1a1f845a97677c43ff1090231434ae9d3d36ab4c) )
+	ROM_LOAD32_WORD("Bad_Bog_6of6.u13", 0x0200002, 0x0080000, CRC(883b2ec3) SHA1(5b431d8c9c8eabca65ab22dcf2bdb22d49445bb1) )
 ROM_END_REGIONS
 
 
@@ -1358,10 +1359,10 @@ ROM_END_REGIONS
 ROM_START( blackpnt )
 	ARISTOCRAT_MK5_BIOS
 	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
-	ROM_LOAD32_WORD("Black Panther NSW U11.BIN", 0x0000002, 0x0080000, CRC(de3358d3) SHA1(4f290940d8af9fe8d404802d5cecfd2d098eff12) )
-	ROM_LOAD32_WORD("Black Panther NSW U12.BIN", 0x0100002, 0x0080000, CRC(bb2bf7bb) SHA1(f88208238a69fc79e33af17f39e25cd2857d7172) )
-	ROM_LOAD32_WORD("Black Panther NSW U7.bin", 0x0000000, 0x0080000, CRC(eed76145) SHA1(6a40a6ba2ce320a37b086dc4916c92c8e38c065e) )
-	ROM_LOAD32_WORD("Black Panther NSW U8.bin", 0x0100000, 0x0080000, CRC(58ddfb50) SHA1(c2152e65fa119136b7944b69e650310db78e62a8) )
+	ROM_LOAD32_WORD("Black Panther NSW.u11", 0x0000002, 0x0080000, CRC(de3358d3) SHA1(4f290940d8af9fe8d404802d5cecfd2d098eff12) )
+	ROM_LOAD32_WORD("Black Panther NSW.u12", 0x0100002, 0x0080000, CRC(bb2bf7bb) SHA1(f88208238a69fc79e33af17f39e25cd2857d7172) )
+	ROM_LOAD32_WORD("Black Panther NSW.u7",  0x0000000, 0x0080000, CRC(eed76145) SHA1(6a40a6ba2ce320a37b086dc4916c92c8e38c065e) )
+	ROM_LOAD32_WORD("Black Panther NSW.u8",  0x0100000, 0x0080000, CRC(58ddfb50) SHA1(c2152e65fa119136b7944b69e650310db78e62a8) )
 ROM_END_REGIONS
 
 
@@ -1369,14 +1370,14 @@ ROM_END_REGIONS
 ROM_START( bootscot )
 	ARISTOCRAT_MK5_BIOS
 	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
-	ROM_LOAD32_WORD("Boot Scootin' U10.bin", 0x0300000, 0x0080000, CRC(b574c12d) SHA1(3b1d1d00ef3eae23493e2b0381ab80490af510d4) )
-	ROM_LOAD32_WORD("Boot Scootin' U11.BIN", 0x0000002, 0x0080000, CRC(df066d27) SHA1(310422c78e93ce9f1f58b4a58a59bc2eba5c502a) )
-	ROM_LOAD32_WORD("Boot Scootin' U12.BIN", 0x0100002, 0x0080000, CRC(87ddc7ef) SHA1(91473d8fd266a909fa8d4ec3df3a61861c6e9f4c) )
-	ROM_LOAD32_WORD("Boot Scootin' U13.BIN", 0x0200002, 0x0080000, CRC(fca82ee7) SHA1(bb70f2e04047a58b697dca536b95f9bbcc295a8a) )
-	ROM_LOAD32_WORD("Boot Scootin' U14.bin", 0x0300002, 0x0080000, CRC(75b9b89e) SHA1(08d487b3722f2ea5d2d18c78f571a44c78616dbe) )
-	ROM_LOAD32_WORD("Boot Scootin' U7.BIN", 0x0000000, 0x0080000, CRC(f8e12462) SHA1(82a25757b2146204b86e557b8f1c45280e0668a8) )
-	ROM_LOAD32_WORD("Boot Scootin' U8.bin", 0x0100000, 0x0080000, CRC(08e8de8d) SHA1(913d3e51821d8885affd2750c18d1000629b79d9) )
-	ROM_LOAD32_WORD("Boot Scootin' U9.bin", 0x0200000, 0x0080000, CRC(a1ca5f2b) SHA1(c8fc6aff0c3819370339143966ec76910e40c671) )
+	ROM_LOAD32_WORD("Boot Scootin'.u10", 0x0300000, 0x0080000, CRC(b574c12d) SHA1(3b1d1d00ef3eae23493e2b0381ab80490af510d4) )
+	ROM_LOAD32_WORD("Boot Scootin'.u11", 0x0000002, 0x0080000, CRC(df066d27) SHA1(310422c78e93ce9f1f58b4a58a59bc2eba5c502a) )
+	ROM_LOAD32_WORD("Boot Scootin'.u12", 0x0100002, 0x0080000, CRC(87ddc7ef) SHA1(91473d8fd266a909fa8d4ec3df3a61861c6e9f4c) )
+	ROM_LOAD32_WORD("Boot Scootin'.u13", 0x0200002, 0x0080000, CRC(fca82ee7) SHA1(bb70f2e04047a58b697dca536b95f9bbcc295a8a) )
+	ROM_LOAD32_WORD("Boot Scootin'.u14", 0x0300002, 0x0080000, CRC(75b9b89e) SHA1(08d487b3722f2ea5d2d18c78f571a44c78616dbe) )
+	ROM_LOAD32_WORD("Boot Scootin'.u7",  0x0000000, 0x0080000, CRC(f8e12462) SHA1(82a25757b2146204b86e557b8f1c45280e0668a8) )
+	ROM_LOAD32_WORD("Boot Scootin'.u8",  0x0100000, 0x0080000, CRC(08e8de8d) SHA1(913d3e51821d8885affd2750c18d1000629b79d9) )
+	ROM_LOAD32_WORD("Boot Scootin'.u9",  0x0200000, 0x0080000, CRC(a1ca5f2b) SHA1(c8fc6aff0c3819370339143966ec76910e40c671) )
 ROM_END_REGIONS
 
 
@@ -1385,8 +1386,8 @@ ROM_END_REGIONS
 ROM_START( bumbugs )
 	ARISTOCRAT_MK5_BIOS
 	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
-	ROM_LOAD32_WORD("Bumble Bugs U11.BIN", 0x0000002, 0x0080000, CRC(5d888245) SHA1(bbbe61e09bebd5fcb79f060d5caee15100c9a685) )
-	ROM_LOAD32_WORD("Bumble Bugs U7.bin", 0x0000000, 0x0080000, CRC(d4cfce73) SHA1(735c385779afe55e521dbfe9ebfdc55fe3346349) )
+	ROM_LOAD32_WORD("Bumble Bugs.u11", 0x0000002, 0x0080000, CRC(5d888245) SHA1(bbbe61e09bebd5fcb79f060d5caee15100c9a685) )
+	ROM_LOAD32_WORD("Bumble Bugs.u7",  0x0000000, 0x0080000, CRC(d4cfce73) SHA1(735c385779afe55e521dbfe9ebfdc55fe3346349) )
 ROM_END_REGIONS
 
 
@@ -1395,10 +1396,10 @@ ROM_END_REGIONS
 ROM_START( butdeli )
 	ARISTOCRAT_MK5_BIOS
 	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
-	ROM_LOAD32_WORD("Butterfly Delight  U11.BIN", 0x0000002, 0x0080000, CRC(1ddf8732) SHA1(dc09db14c251699fdd46068f18ad6214e8752939) )
-	ROM_LOAD32_WORD("Butterfly Delight  U12.BIN", 0x0100002, 0x0080000, CRC(0d58cf28) SHA1(aa65b7ee88b5bc872008a46e60bd49d9e5eda153) )
-	ROM_LOAD32_WORD("Butterfly Delight  U7.bin", 0x0000000, 0x0080000, CRC(7f69cdfc) SHA1(1241741d21334df10d60080555824a87eae93db3) )
-	ROM_LOAD32_WORD("Butterfly Delight  U8.bin", 0x0100000, 0x0080000, CRC(24d8135e) SHA1(1bc69e9927afe0300d15a49ca06ae527774b295a) )
+	ROM_LOAD32_WORD("Butterfly Delight.u11", 0x0000002, 0x0080000, CRC(1ddf8732) SHA1(dc09db14c251699fdd46068f18ad6214e8752939) )
+	ROM_LOAD32_WORD("Butterfly Delight.u12", 0x0100002, 0x0080000, CRC(0d58cf28) SHA1(aa65b7ee88b5bc872008a46e60bd49d9e5eda153) )
+	ROM_LOAD32_WORD("Butterfly Delight.u7",  0x0000000, 0x0080000, CRC(7f69cdfc) SHA1(1241741d21334df10d60080555824a87eae93db3) )
+	ROM_LOAD32_WORD("Butterfly Delight.u8",  0x0100000, 0x0080000, CRC(24d8135e) SHA1(1bc69e9927afe0300d15a49ca06ae527774b295a) )
 ROM_END_REGIONS
 
 
@@ -1406,10 +1407,10 @@ ROM_END_REGIONS
 ROM_START( cashchm )
 	ARISTOCRAT_MK5_BIOS
 	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
-	ROM_LOAD32_WORD("CASHCHAMELEON_U11.BIN", 0x0000002, 0x0080000, CRC(64921874) SHA1(5aa6a0d6e29f5e400e275f27b6adfbef595fe83a) )
-	ROM_LOAD32_WORD("CASHCHAMELEON_U12.BIN", 0x0100002, 0x0080000, CRC(7ae3b5db) SHA1(238698b72f529ac4fb292d08267069d1da01b43b) )
-	ROM_LOAD32_WORD("CASHCHAMELEON_U7.bin", 0x0000000, 0x0080000, CRC(c942ef22) SHA1(4f56674f749602ae928832f98a641e680af8989b) )
-	ROM_LOAD32_WORD("CASHCHAMELEON_U8.bin", 0x0100000, 0x0080000, CRC(a8868277) SHA1(e199448a0a920219dc15443813061653b94d6d3a) )
+	ROM_LOAD32_WORD("CASHCHAMELEON.u11", 0x0000002, 0x0080000, CRC(64921874) SHA1(5aa6a0d6e29f5e400e275f27b6adfbef595fe83a) )
+	ROM_LOAD32_WORD("CASHCHAMELEON.u12", 0x0100002, 0x0080000, CRC(7ae3b5db) SHA1(238698b72f529ac4fb292d08267069d1da01b43b) )
+	ROM_LOAD32_WORD("CASHCHAMELEON.u7",  0x0000000, 0x0080000, CRC(c942ef22) SHA1(4f56674f749602ae928832f98a641e680af8989b) )
+	ROM_LOAD32_WORD("CASHCHAMELEON.u8",  0x0100000, 0x0080000, CRC(a8868277) SHA1(e199448a0a920219dc15443813061653b94d6d3a) )
 ROM_END_REGIONS
 
 
@@ -1417,10 +1418,10 @@ ROM_END_REGIONS
 ROM_START( cashcroa )
 	ARISTOCRAT_MK5_BIOS
 	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
-	ROM_LOAD32_WORD("cash_crop_1of4.U07.BIN", 0x0000000, 0x0080000, CRC(b0ff2aae) SHA1(b05667ffe952cae7a6581398552db6e47921090e) )
-	ROM_LOAD32_WORD("cash_crop_2of4.U11.BIN", 0x0000002, 0x0080000, CRC(25a18efa) SHA1(0ee4f6cc66322397dbde53af2149f5fb35d788df) )
-	ROM_LOAD32_WORD("cash_crop_3of4.U08.BIN", 0x0100000, 0x0080000, CRC(d4e7b4ba) SHA1(147a1ed5cdcbb84466a8024ad7e0778f85374489) )
-	ROM_LOAD32_WORD("cash_crop_4of4.U12.BIN", 0x0100002, 0x0080000, CRC(570c7f8a) SHA1(7c9527e0b37970b7960c723727c3c650a48e8125) )
+	ROM_LOAD32_WORD("cash_crop_1of4.u7",  0x0000000, 0x0080000, CRC(b0ff2aae) SHA1(b05667ffe952cae7a6581398552db6e47921090e) )
+	ROM_LOAD32_WORD("cash_crop_2of4.u11", 0x0000002, 0x0080000, CRC(25a18efa) SHA1(0ee4f6cc66322397dbde53af2149f5fb35d788df) )
+	ROM_LOAD32_WORD("cash_crop_3of4.u8",  0x0100000, 0x0080000, CRC(d4e7b4ba) SHA1(147a1ed5cdcbb84466a8024ad7e0778f85374489) )
+	ROM_LOAD32_WORD("cash_crop_4of4.u12", 0x0100002, 0x0080000, CRC(570c7f8a) SHA1(7c9527e0b37970b7960c723727c3c650a48e8125) )
 ROM_END_REGIONS
 
 
@@ -1430,12 +1431,12 @@ ROM_END_REGIONS
 ROM_START( chkrun )
 	ARISTOCRAT_MK5_BIOS
 	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
-	ROM_LOAD32_WORD("Chicken Run U11.BIN", 0x0000002, 0x0080000, CRC(65423867) SHA1(992bb4f717f79233d1300d248b145f95a627cff2) )
-	ROM_LOAD32_WORD("Chicken Run U12.BIN", 0x0100002, 0x0080000, CRC(77b5d777) SHA1(f03afeaff08c9216e714f1e4bcc50292ba87ace4) )
-	ROM_LOAD32_WORD("Chicken Run U13.BIN", 0x0200002, 0x0080000, CRC(88a1ccae) SHA1(e242f48f99044b4fdf1bf36d8e105df09f94aa50) )
-	ROM_LOAD32_WORD("Chicken Run u7.bin", 0x0000000, 0x0080000, CRC(be69c21c) SHA1(8b546727b5972f33d077db0a64aa41a7fde6d417) )
-	ROM_LOAD32_WORD("Chicken Run U8.bin", 0x0100000, 0x0080000, CRC(3161c16f) SHA1(8f2b14ec8ba5c9da80a226d2ce5a7e5256c8cbb4) )
-	ROM_LOAD32_WORD("Chicken Run U9.bin", 0x0200000, 0x0080000, CRC(5506777b) SHA1(42512577056e1caefbea0e74879780c56787af13) )
+	ROM_LOAD32_WORD("Chicken Run.u11", 0x0000002, 0x0080000, CRC(65423867) SHA1(992bb4f717f79233d1300d248b145f95a627cff2) )
+	ROM_LOAD32_WORD("Chicken Run.u12", 0x0100002, 0x0080000, CRC(77b5d777) SHA1(f03afeaff08c9216e714f1e4bcc50292ba87ace4) )
+	ROM_LOAD32_WORD("Chicken Run.u13", 0x0200002, 0x0080000, CRC(88a1ccae) SHA1(e242f48f99044b4fdf1bf36d8e105df09f94aa50) )
+	ROM_LOAD32_WORD("Chicken Run.u7",  0x0000000, 0x0080000, CRC(be69c21c) SHA1(8b546727b5972f33d077db0a64aa41a7fde6d417) )
+	ROM_LOAD32_WORD("Chicken Run.u8",  0x0100000, 0x0080000, CRC(3161c16f) SHA1(8f2b14ec8ba5c9da80a226d2ce5a7e5256c8cbb4) )
+	ROM_LOAD32_WORD("Chicken Run.u9",  0x0200000, 0x0080000, CRC(5506777b) SHA1(42512577056e1caefbea0e74879780c56787af13) )
 ROM_END_REGIONS
 
 
@@ -1446,10 +1447,10 @@ ROM_END_REGIONS
 ROM_START( coralr2v )
 	ARISTOCRAT_MK5_BIOS
 	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
-	ROM_LOAD32_WORD("Coral Riches 2 U11.BIN", 0x0000002, 0x0080000, CRC(8cd17e90) SHA1(c6d6a29e62ca6e1b278a2e1d1b358e10ca2de4ed) )
-	ROM_LOAD32_WORD("Coral Riches 2 U12.BIN", 0x0100002, 0x0080000, CRC(9ea140b5) SHA1(11f6b9ab60117f236b464c9dbc939dfb8f240359) )
-	ROM_LOAD32_WORD("Coral Riches 2 U7.bin", 0x0000000, 0x0080000, CRC(02c430c3) SHA1(f4bae1aa5437af1df2a04f700da044bc4fb652b7) )
-	ROM_LOAD32_WORD("Coral Riches 2 U8.bin", 0x0100000, 0x0080000, CRC(1ee9557c) SHA1(3bee295509d4b0c11ce41a7a20ba91230b7cb4ca) )
+	ROM_LOAD32_WORD("Coral Riches 2.u11", 0x0000002, 0x0080000, CRC(8cd17e90) SHA1(c6d6a29e62ca6e1b278a2e1d1b358e10ca2de4ed) )
+	ROM_LOAD32_WORD("Coral Riches 2.u12", 0x0100002, 0x0080000, CRC(9ea140b5) SHA1(11f6b9ab60117f236b464c9dbc939dfb8f240359) )
+	ROM_LOAD32_WORD("Coral Riches 2.u7",  0x0000000, 0x0080000, CRC(02c430c3) SHA1(f4bae1aa5437af1df2a04f700da044bc4fb652b7) )
+	ROM_LOAD32_WORD("Coral Riches 2.u8",  0x0100000, 0x0080000, CRC(1ee9557c) SHA1(3bee295509d4b0c11ce41a7a20ba91230b7cb4ca) )
 ROM_END_REGIONS
 
 
@@ -1457,10 +1458,10 @@ ROM_END_REGIONS
 ROM_START( cuckooa )
 	ARISTOCRAT_MK5_BIOS
 	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
-	ROM_LOAD32_WORD("Cuckoo_1of4_U07.BIN", 0x0000000, 0x0080000, CRC(5c7ef84a) SHA1(59563a076ecf391ac1779e0dcd530a1ea158a4e3) )
-	ROM_LOAD32_WORD("Cuckoo_2of4_U11.BIN", 0x0000002, 0x0080000, CRC(a69c1416) SHA1(7fe57a194bf29346c039dfac1326f3ee5080e630) )
-	ROM_LOAD32_WORD("Cuckoo_3of4_U08.BIN", 0x0100000, 0x0080000, CRC(a7b4242c) SHA1(4e6961e9b3267d17b93075c41a691a8033a34d90) )
-	ROM_LOAD32_WORD("Cuckoo_4of4_U12.BIN", 0x0100002, 0x0080000, CRC(cb706eb7) SHA1(cbd6235ca7a29c78ef2cb659d9c21466ed39b360) )
+	ROM_LOAD32_WORD("Cuckoo_1of4.u7",  0x0000000, 0x0080000, CRC(5c7ef84a) SHA1(59563a076ecf391ac1779e0dcd530a1ea158a4e3) )
+	ROM_LOAD32_WORD("Cuckoo_2of4.u11", 0x0000002, 0x0080000, CRC(a69c1416) SHA1(7fe57a194bf29346c039dfac1326f3ee5080e630) )
+	ROM_LOAD32_WORD("Cuckoo_3of4.u8",  0x0100000, 0x0080000, CRC(a7b4242c) SHA1(4e6961e9b3267d17b93075c41a691a8033a34d90) )
+	ROM_LOAD32_WORD("Cuckoo_4of4.u12", 0x0100002, 0x0080000, CRC(cb706eb7) SHA1(cbd6235ca7a29c78ef2cb659d9c21466ed39b360) )
 ROM_END_REGIONS
 
 
@@ -1469,10 +1470,10 @@ ROM_END_REGIONS
 ROM_START( dstblom )
 	ARISTOCRAT_MK5_BIOS
 	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
-	ROM_LOAD32_WORD("Desert Bloom  U11.BIN", 0x0000002, 0x0080000, CRC(ed4e8dca) SHA1(1953033e570634cbcf8cd11194c14c57ffc6be53) )
-	ROM_LOAD32_WORD("Desert Bloom  U12.BIN", 0x0100002, 0x0080000, CRC(0ad41815) SHA1(131efc6ed45d8f44a667bd30380c9e37c64f2c42) )
-	ROM_LOAD32_WORD("Desert Bloom  U7.bin", 0x0000000, 0x0080000, CRC(fbfaa3fe) SHA1(3f915261503fc97eb556422e9ccdac81372c04cc) )
-	ROM_LOAD32_WORD("Desert Bloom  U8.bin", 0x0100000, 0x0080000, CRC(cc0d567c) SHA1(c4da3d0c0c4420a9f8fbb6403db983b3e27d4b50) )
+	ROM_LOAD32_WORD("Desert Bloom.u11", 0x0000002, 0x0080000, CRC(ed4e8dca) SHA1(1953033e570634cbcf8cd11194c14c57ffc6be53) )
+	ROM_LOAD32_WORD("Desert Bloom.u12", 0x0100002, 0x0080000, CRC(0ad41815) SHA1(131efc6ed45d8f44a667bd30380c9e37c64f2c42) )
+	ROM_LOAD32_WORD("Desert Bloom.u7",  0x0000000, 0x0080000, CRC(fbfaa3fe) SHA1(3f915261503fc97eb556422e9ccdac81372c04cc) )
+	ROM_LOAD32_WORD("Desert Bloom.u8",  0x0100000, 0x0080000, CRC(cc0d567c) SHA1(c4da3d0c0c4420a9f8fbb6403db983b3e27d4b50) )
 ROM_END_REGIONS
 
 
@@ -1480,12 +1481,12 @@ ROM_END_REGIONS
 ROM_START( dmddove )
 	ARISTOCRAT_MK5_BIOS
 	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
-	ROM_LOAD32_WORD("Diamond Dove  U11.BIN", 0x0000002, 0x0080000, CRC(ff4c684a) SHA1(6598c24a8717b8e624e387f000c584ec3b10a8cd) )
-	ROM_LOAD32_WORD("Diamond Dove  U12.BIN", 0x0100002, 0x0080000, CRC(62209e81) SHA1(68383068de2e030467c3f3ac16459ae2f3b2cce6) )
-	ROM_LOAD32_WORD("Diamond Dove  U13.BIN", 0x0200002, 0x0080000, CRC(952a850f) SHA1(66da391af532f9ef531d10995c96a90eb71cd09a) )
-	ROM_LOAD32_WORD("Diamond Dove  U7.bin", 0x0000000, 0x0080000, CRC(2ebb3704) SHA1(42567d873d6ab9221d09e5449fa57b557677d2ab) )
-	ROM_LOAD32_WORD("Diamond Dove  U8.bin", 0x0100000, 0x0080000, CRC(daa55b3b) SHA1(7aa96a51a3ea9f96c38d08e486eccc54ca4396a3) )
-	ROM_LOAD32_WORD("Diamond Dove  U9.bin", 0x0200000, 0x0080000, CRC(2254f0e9) SHA1(5bccd65e7e616e1f6ed08a0c84862cb13f9f7098) )
+	ROM_LOAD32_WORD("Diamond Dove.u11", 0x0000002, 0x0080000, CRC(ff4c684a) SHA1(6598c24a8717b8e624e387f000c584ec3b10a8cd) )
+	ROM_LOAD32_WORD("Diamond Dove.u12", 0x0100002, 0x0080000, CRC(62209e81) SHA1(68383068de2e030467c3f3ac16459ae2f3b2cce6) )
+	ROM_LOAD32_WORD("Diamond Dove.u13", 0x0200002, 0x0080000, CRC(952a850f) SHA1(66da391af532f9ef531d10995c96a90eb71cd09a) )
+	ROM_LOAD32_WORD("Diamond Dove.u7",  0x0000000, 0x0080000, CRC(2ebb3704) SHA1(42567d873d6ab9221d09e5449fa57b557677d2ab) )
+	ROM_LOAD32_WORD("Diamond Dove.u8",  0x0100000, 0x0080000, CRC(daa55b3b) SHA1(7aa96a51a3ea9f96c38d08e486eccc54ca4396a3) )
+	ROM_LOAD32_WORD("Diamond Dove.u9",  0x0200000, 0x0080000, CRC(2254f0e9) SHA1(5bccd65e7e616e1f6ed08a0c84862cb13f9f7098) )
 ROM_END_REGIONS
 
 
@@ -1495,12 +1496,12 @@ ROM_END_REGIONS
 ROM_START( drawpka )
 	ARISTOCRAT_MK5_BIOS
 	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
-	ROM_LOAD32_WORD("M Draw Free Poker Game  U11.BIN", 0x0000002, 0x0080000, CRC(ac8503fa) SHA1(30640a9c01239173c7430a46dcd2e2b28024c0cf) )
-	ROM_LOAD32_WORD("M Draw Free Poker Game  U12.BIN", 0x0100002, 0x0080000, CRC(cd0dfdf5) SHA1(7bcf77c1bcd023b4ab08cef329dcf39dc2ca09d6) )
-	ROM_LOAD32_WORD("M Draw Free Poker Game  U13.BIN", 0x0200002, 0x0080000, CRC(0d6f7ec5) SHA1(0a80257eb464e50292554f45583f3d7b85de2bc3) )
-	ROM_LOAD32_WORD("M Draw Free Poker Game  U7.bin", 0x0000000, 0x0080000, CRC(7570eb03) SHA1(0fded55ee2d12cfae96e2910c68a131cd89147a0) )
-	ROM_LOAD32_WORD("M Draw Free Poker Game  U8.bin", 0x0100000, 0x0080000, CRC(8c54bd65) SHA1(5870558f8b96fca2c355ccc6ffc09fc4684d141c) )
-	ROM_LOAD32_WORD("M Draw Free Poker Game  U9.bin", 0x0200000, 0x0080000, CRC(10b96156) SHA1(1f89e0d8d210d2fd7e0b78b0205eb626d7c39542) )
+	ROM_LOAD32_WORD("M Draw Free Poker Game.u11", 0x0000002, 0x0080000, CRC(ac8503fa) SHA1(30640a9c01239173c7430a46dcd2e2b28024c0cf) )
+	ROM_LOAD32_WORD("M Draw Free Poker Game.u12", 0x0100002, 0x0080000, CRC(cd0dfdf5) SHA1(7bcf77c1bcd023b4ab08cef329dcf39dc2ca09d6) )
+	ROM_LOAD32_WORD("M Draw Free Poker Game.u13", 0x0200002, 0x0080000, CRC(0d6f7ec5) SHA1(0a80257eb464e50292554f45583f3d7b85de2bc3) )
+	ROM_LOAD32_WORD("M Draw Free Poker Game.u7",  0x0000000, 0x0080000, CRC(7570eb03) SHA1(0fded55ee2d12cfae96e2910c68a131cd89147a0) )
+	ROM_LOAD32_WORD("M Draw Free Poker Game.u8",  0x0100000, 0x0080000, CRC(8c54bd65) SHA1(5870558f8b96fca2c355ccc6ffc09fc4684d141c) )
+	ROM_LOAD32_WORD("M Draw Free Poker Game.u9",  0x0200000, 0x0080000, CRC(10b96156) SHA1(1f89e0d8d210d2fd7e0b78b0205eb626d7c39542) )
 ROM_END_REGIONS
 
 
@@ -1509,12 +1510,12 @@ ROM_END_REGIONS
 ROM_START( dyjack )
 	ARISTOCRAT_MK5_BIOS
 	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
-	ROM_LOAD32_WORD("Dynamite Jack_U11.BIN", 0x0000002, 0x0080000, CRC(5a0147ae) SHA1(f2135b2525eb50a03a8f6360e7edb92bf0b88740) )
-	ROM_LOAD32_WORD("Dynamite Jack_U12.BIN", 0x0100002, 0x0080000, CRC(beee94ff) SHA1(fad0d3506d10330840d3e5fcdfd7f0aa20041969) )
-	ROM_LOAD32_WORD("Dynamite Jack_U13.BIN", 0x0200002, 0x0080000, CRC(d204ff9c) SHA1(8ac5533928fb3ca247dc85cea67da45a6743f732) )
-	ROM_LOAD32_WORD("Dynamite Jack_U7.bin", 0x0000000, 0x0080000, CRC(73783ecf) SHA1(280b4da540b405959f31c2eebbf87ab635d21c06) )
-	ROM_LOAD32_WORD("Dynamite Jack_U8.bin", 0x0100000, 0x0080000, CRC(e686eab2) SHA1(6eb18adda82357ff84f77e9334733094430dfdc6) )
-	ROM_LOAD32_WORD("Dynamite Jack_U9.bin", 0x0200000, 0x0080000, CRC(28a45170) SHA1(d7bb8e4dd24e3a3acf44e7fc40e49ebee5c15ec9) )
+	ROM_LOAD32_WORD("Dynamite Jack.u11", 0x0000002, 0x0080000, CRC(5a0147ae) SHA1(f2135b2525eb50a03a8f6360e7edb92bf0b88740) )
+	ROM_LOAD32_WORD("Dynamite Jack.u12", 0x0100002, 0x0080000, CRC(beee94ff) SHA1(fad0d3506d10330840d3e5fcdfd7f0aa20041969) )
+	ROM_LOAD32_WORD("Dynamite Jack.u13", 0x0200002, 0x0080000, CRC(d204ff9c) SHA1(8ac5533928fb3ca247dc85cea67da45a6743f732) )
+	ROM_LOAD32_WORD("Dynamite Jack.u7",  0x0000000, 0x0080000, CRC(73783ecf) SHA1(280b4da540b405959f31c2eebbf87ab635d21c06) )
+	ROM_LOAD32_WORD("Dynamite Jack.u8",  0x0100000, 0x0080000, CRC(e686eab2) SHA1(6eb18adda82357ff84f77e9334733094430dfdc6) )
+	ROM_LOAD32_WORD("Dynamite Jack.u9",  0x0200000, 0x0080000, CRC(28a45170) SHA1(d7bb8e4dd24e3a3acf44e7fc40e49ebee5c15ec9) )
 ROM_END_REGIONS
 
 
@@ -1522,8 +1523,8 @@ ROM_END_REGIONS
 ROM_START( eldora )
 	ARISTOCRAT_MK5_BIOS
 	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
-	ROM_LOAD32_WORD("U11 El Dorado.bin", 0x0000002, 0x0080000, CRC(35233cf8) SHA1(e02477526f2f9e2663c1876f543d138b2caf28df) )
-	ROM_LOAD32_WORD("U7 El Dorado.bin", 0x0000000, 0x0080000, CRC(d9afe87c) SHA1(577ea5da9c4e93a393711a0c7361365301f4241e) )
+	ROM_LOAD32_WORD("El Dorado.u11", 0x0000002, 0x0080000, CRC(35233cf8) SHA1(e02477526f2f9e2663c1876f543d138b2caf28df) )
+	ROM_LOAD32_WORD("El Dorado.u7",  0x0000000, 0x0080000, CRC(d9afe87c) SHA1(577ea5da9c4e93a393711a0c7361365301f4241e) )
 ROM_END_REGIONS
 
 
@@ -1535,14 +1536,14 @@ ROM_END_REGIONS
 ROM_START( fortela )
 	ARISTOCRAT_MK5_BIOS
 	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
-	ROM_LOAD32_WORD("Fortune_Teller_U10.bin", 0x0300000, 0x0080000, CRC(f2790419) SHA1(8720c37cc678e7c5666c67b9998fbb460a8aad90) )
-	ROM_LOAD32_WORD("Fortune_Teller_U11.BIN", 0x0000002, 0x0080000, CRC(faab1283) SHA1(6200fc2047c4052e4fc3c2d28b26cd9ff67a08be) )
-	ROM_LOAD32_WORD("Fortune_Teller_U12.BIN", 0x0100002, 0x0080000, CRC(fe5af3ac) SHA1(f08fe353c871ac4375f0fa25bf15f2638b33a370) )
-	ROM_LOAD32_WORD("Fortune_Teller_U13.BIN", 0x0200002, 0x0080000, CRC(d0dd6627) SHA1(ea855da1759a27936615400993b381609071d66c) )
-	ROM_LOAD32_WORD("Fortune_Teller_U14.bin", 0x0300002, 0x0080000, CRC(507bbe10) SHA1(01b1982c02a00b60aa39ee1b408d653365f728d4) )
-	ROM_LOAD32_WORD("Fortune_Teller_U7.bin", 0x0000000, 0x0080000, CRC(78394106) SHA1(aedfb98d7aa515eebabf378edb9c43e01bcba010) )
-	ROM_LOAD32_WORD("Fortune_Teller_U8.bin", 0x0100000, 0x0080000, CRC(7ce4ba38) SHA1(43b57e4dc96851f58d95e4f1b99d08f559e27f6a) )
-	ROM_LOAD32_WORD("Fortune_Teller_U9.bin", 0x0200000, 0x0080000, CRC(a43cd994) SHA1(759fecc809ca1b038d782b173d5638d9be165f9a) )
+	ROM_LOAD32_WORD("Fortune_Teller.u10", 0x0300000, 0x0080000, CRC(f2790419) SHA1(8720c37cc678e7c5666c67b9998fbb460a8aad90) )
+	ROM_LOAD32_WORD("Fortune_Teller.u11", 0x0000002, 0x0080000, CRC(faab1283) SHA1(6200fc2047c4052e4fc3c2d28b26cd9ff67a08be) )
+	ROM_LOAD32_WORD("Fortune_Teller.u12", 0x0100002, 0x0080000, CRC(fe5af3ac) SHA1(f08fe353c871ac4375f0fa25bf15f2638b33a370) )
+	ROM_LOAD32_WORD("Fortune_Teller.u13", 0x0200002, 0x0080000, CRC(d0dd6627) SHA1(ea855da1759a27936615400993b381609071d66c) )
+	ROM_LOAD32_WORD("Fortune_Teller.u14", 0x0300002, 0x0080000, CRC(507bbe10) SHA1(01b1982c02a00b60aa39ee1b408d653365f728d4) )
+	ROM_LOAD32_WORD("Fortune_Teller.u7",  0x0000000, 0x0080000, CRC(78394106) SHA1(aedfb98d7aa515eebabf378edb9c43e01bcba010) )
+	ROM_LOAD32_WORD("Fortune_Teller.u8",  0x0100000, 0x0080000, CRC(7ce4ba38) SHA1(43b57e4dc96851f58d95e4f1b99d08f559e27f6a) )
+	ROM_LOAD32_WORD("Fortune_Teller.u9",  0x0200000, 0x0080000, CRC(a43cd994) SHA1(759fecc809ca1b038d782b173d5638d9be165f9a) )
 ROM_END_REGIONS
 
 
@@ -1551,14 +1552,14 @@ ROM_END_REGIONS
 ROM_START( genmagi )
 	ARISTOCRAT_MK5_BIOS
 	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
-	ROM_LOAD32_WORD("GENIEMAGIC_U10.bin", 0x0300000, 0x0080000, CRC(ea460e72) SHA1(4546e04cc04239528c93e22532db08fccebda8a8) )
-	ROM_LOAD32_WORD("GENIEMAGIC_U11.BIN", 0x0000002, 0x0080000, CRC(88c304a3) SHA1(013d5d1d62b356ce5cdf0c9b036c4ca09f191668) )
-	ROM_LOAD32_WORD("GENIEMAGIC_U12.BIN", 0x0100002, 0x0080000, CRC(44adc422) SHA1(81256ddebb29fbd69cab8e642faac39635dd1739) )
-	ROM_LOAD32_WORD("GENIEMAGIC_U13.BIN", 0x0200002, 0x0080000, CRC(26f51647) SHA1(e980c021d8e2d295ba2d50446b36b85f42d3f318) )
-	ROM_LOAD32_WORD("GENIEMAGIC_U14.bin", 0x0300002, 0x0080000, CRC(52092ffb) SHA1(6ed591a510e9186588470ec745caf8001712012e) )
-	ROM_LOAD32_WORD("GENIEMAGIC_U7.bin", 0x0000000, 0x0080000, CRC(20ec3b50) SHA1(400ad7f86077184fee63690060fe2a51ba888e1b) )
-	ROM_LOAD32_WORD("GENIEMAGIC_U8.bin", 0x0100000, 0x0080000, CRC(341bac7b) SHA1(67df39b8070f6d9afd183b04239d9e2844d588c5) )
-	ROM_LOAD32_WORD("GENIEMAGIC_U9.bin", 0x0200000, 0x0080000, CRC(ce051dbd) SHA1(433717c5689dc865c1e42669a50e138eae017362) )
+	ROM_LOAD32_WORD("GENIEMAGIC.u10", 0x0300000, 0x0080000, CRC(ea460e72) SHA1(4546e04cc04239528c93e22532db08fccebda8a8) )
+	ROM_LOAD32_WORD("GENIEMAGIC.u11", 0x0000002, 0x0080000, CRC(88c304a3) SHA1(013d5d1d62b356ce5cdf0c9b036c4ca09f191668) )
+	ROM_LOAD32_WORD("GENIEMAGIC.u12", 0x0100002, 0x0080000, CRC(44adc422) SHA1(81256ddebb29fbd69cab8e642faac39635dd1739) )
+	ROM_LOAD32_WORD("GENIEMAGIC.u13", 0x0200002, 0x0080000, CRC(26f51647) SHA1(e980c021d8e2d295ba2d50446b36b85f42d3f318) )
+	ROM_LOAD32_WORD("GENIEMAGIC.u14", 0x0300002, 0x0080000, CRC(52092ffb) SHA1(6ed591a510e9186588470ec745caf8001712012e) )
+	ROM_LOAD32_WORD("GENIEMAGIC.u7",  0x0000000, 0x0080000, CRC(20ec3b50) SHA1(400ad7f86077184fee63690060fe2a51ba888e1b) )
+	ROM_LOAD32_WORD("GENIEMAGIC.u8",  0x0100000, 0x0080000, CRC(341bac7b) SHA1(67df39b8070f6d9afd183b04239d9e2844d588c5) )
+	ROM_LOAD32_WORD("GENIEMAGIC.u9",  0x0200000, 0x0080000, CRC(ce051dbd) SHA1(433717c5689dc865c1e42669a50e138eae017362) )
 ROM_END_REGIONS
 
 
@@ -1567,10 +1568,10 @@ ROM_END_REGIONS
 ROM_START( gnomatw )
 	ARISTOCRAT_MK5_BIOS
 	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
-	ROM_LOAD32_WORD("Gnome The World U11.BIN", 0x0000002, 0x0080000, CRC(737d7178) SHA1(df788eea23b15415adc94543476b6ad982c4d79b) )
-	ROM_LOAD32_WORD("Gnome The World U12.BIN", 0x0100002, 0x0080000, CRC(49eb3869) SHA1(d98fe385c667872f26d656a3240f557a70ba924f) )
-	ROM_LOAD32_WORD("Gnome The World U7.bin", 0x0000000, 0x0080000, CRC(a5d3825e) SHA1(4ce7466eff770a2c6c3c5de620a14e05bb9fb406) )
-	ROM_LOAD32_WORD("Gnome The World U8.bin", 0x0100000, 0x0080000, CRC(fe59ec8b) SHA1(b43778b51a0d695c179fa63ce45a47b9f550fb97) )
+	ROM_LOAD32_WORD("Gnome The World.u11", 0x0000002, 0x0080000, CRC(737d7178) SHA1(df788eea23b15415adc94543476b6ad982c4d79b) )
+	ROM_LOAD32_WORD("Gnome The World.u12", 0x0100002, 0x0080000, CRC(49eb3869) SHA1(d98fe385c667872f26d656a3240f557a70ba924f) )
+	ROM_LOAD32_WORD("Gnome The World.u7",  0x0000000, 0x0080000, CRC(a5d3825e) SHA1(4ce7466eff770a2c6c3c5de620a14e05bb9fb406) )
+	ROM_LOAD32_WORD("Gnome The World.u8",  0x0100000, 0x0080000, CRC(fe59ec8b) SHA1(b43778b51a0d695c179fa63ce45a47b9f550fb97) )
 ROM_END_REGIONS
 
 
@@ -1580,12 +1581,12 @@ ROM_END_REGIONS
 ROM_START( goldra )
 	ARISTOCRAT_MK5_BIOS
 	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
-	ROM_LOAD32_WORD("Golden_Ra_1of6.U07.BIN", 0x0000000, 0x0080000, CRC(2f75d5f7) SHA1(d7f6ecff7cf759d80733b6d3f224caa5128be0b7) )
-	ROM_LOAD32_WORD("Golden_Ra_2of6.U11.BIN", 0x0000002, 0x0080000, CRC(06a871c7) SHA1(95464d74c2295196e367e34efb816acedcd71265) )
-	ROM_LOAD32_WORD("Golden_Ra_3of6.U08.BIN", 0x0100000, 0x0080000, CRC(940eabd7) SHA1(8d41b3fa27c827a7671b095618ac53750e6017f6) )
-	ROM_LOAD32_WORD("Golden_Ra_4of6.U12.BIN", 0x0100002, 0x0080000, CRC(21c4a2d2) SHA1(77a24a5f98aad090223d301919645b5011667c28) )
-	ROM_LOAD32_WORD("Golden_Ra_5of6.U09.BIN", 0x0200000, 0x0080000, CRC(b1cac0e7) SHA1(87f393a75c09e96a7fb893a767edcc81044e4fe3) )
-	ROM_LOAD32_WORD("Golden_Ra_6of6.U13.BIN", 0x0200002, 0x0080000, CRC(8f62ccc5) SHA1(5105313192ab8dfd522b921c70b8b03a8a61ac63) )
+	ROM_LOAD32_WORD("Golden_Ra_1of6.u7",  0x0000000, 0x0080000, CRC(2f75d5f7) SHA1(d7f6ecff7cf759d80733b6d3f224caa5128be0b7) )
+	ROM_LOAD32_WORD("Golden_Ra_2of6.u11", 0x0000002, 0x0080000, CRC(06a871c7) SHA1(95464d74c2295196e367e34efb816acedcd71265) )
+	ROM_LOAD32_WORD("Golden_Ra_3of6.u8",  0x0100000, 0x0080000, CRC(940eabd7) SHA1(8d41b3fa27c827a7671b095618ac53750e6017f6) )
+	ROM_LOAD32_WORD("Golden_Ra_4of6.u12", 0x0100002, 0x0080000, CRC(21c4a2d2) SHA1(77a24a5f98aad090223d301919645b5011667c28) )
+	ROM_LOAD32_WORD("Golden_Ra_5of6.u09", 0x0200000, 0x0080000, CRC(b1cac0e7) SHA1(87f393a75c09e96a7fb893a767edcc81044e4fe3) )
+	ROM_LOAD32_WORD("Golden_Ra_6of6.u13", 0x0200002, 0x0080000, CRC(8f62ccc5) SHA1(5105313192ab8dfd522b921c70b8b03a8a61ac63) )
 ROM_END_REGIONS
 
 
@@ -1595,8 +1596,8 @@ ROM_END_REGIONS
 ROM_START( hrttrhb )
 	ARISTOCRAT_MK5_BIOS
 	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
-	ROM_LOAD32_WORD("Heart Throb U11.BIN", 0x0000002, 0x0080000, CRC(bde067d7) SHA1(cbf2cbd0644f1daeb5c3cd08d72f3d7aafe521ec) )
-	ROM_LOAD32_WORD("Heart Throb U7.bin", 0x0000000, 0x0080000, CRC(de4d6d77) SHA1(959ffb7d06359870e07cb9d761f0bc0480c45e0c) )
+	ROM_LOAD32_WORD("Heart Throb.u11", 0x0000002, 0x0080000, CRC(bde067d7) SHA1(cbf2cbd0644f1daeb5c3cd08d72f3d7aafe521ec) )
+	ROM_LOAD32_WORD("Heart Throb.u7",  0x0000000, 0x0080000, CRC(de4d6d77) SHA1(959ffb7d06359870e07cb9d761f0bc0480c45e0c) )
 ROM_END_REGIONS
 
 
@@ -1606,12 +1607,12 @@ ROM_END_REGIONS
 ROM_START( incsun )
 	ARISTOCRAT_MK5_BIOS
 	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
-	ROM_LOAD32_WORD("INCASUN_NSW_U11.BIN", 0x0000002, 0x0080000, CRC(f51b411d) SHA1(fbbd587c90cd49bb36653cbd1948bc52f8396a41) )
-	ROM_LOAD32_WORD("INCASUN_NSW_U12.BIN", 0x0100002, 0x0080000, CRC(0fa00c41) SHA1(79139834d5437b37346322bf632904c473e3463a) )
-	ROM_LOAD32_WORD("INCASUN_NSW_U13.BIN", 0x0200002, 0x0080000, CRC(00407593) SHA1(4c759fe3267b1782ae84d8ed9134295dfaa0faaf) )
-	ROM_LOAD32_WORD("INCASUN_NSW_U7.bin", 0x0000000, 0x0080000, CRC(180e098b) SHA1(48782c46a344dba0aaad407d0d4a432da091b0f5) )
-	ROM_LOAD32_WORD("INCASUN_NSW_U8.bin", 0x0100000, 0x0080000, CRC(0c19f5ec) SHA1(95d7c9308b30b5193816e95c4276829612040298) )
-	ROM_LOAD32_WORD("INCASUN_NSW_U9.bin", 0x0200000, 0x0080000, CRC(c82da820) SHA1(98a2710b1f793a7ee1070f89c66d49ce55e4156e) )
+	ROM_LOAD32_WORD("INCASUN_NSW.u11", 0x0000002, 0x0080000, CRC(f51b411d) SHA1(fbbd587c90cd49bb36653cbd1948bc52f8396a41) )
+	ROM_LOAD32_WORD("INCASUN_NSW.u12", 0x0100002, 0x0080000, CRC(0fa00c41) SHA1(79139834d5437b37346322bf632904c473e3463a) )
+	ROM_LOAD32_WORD("INCASUN_NSW.u13", 0x0200002, 0x0080000, CRC(00407593) SHA1(4c759fe3267b1782ae84d8ed9134295dfaa0faaf) )
+	ROM_LOAD32_WORD("INCASUN_NSW.u7",  0x0000000, 0x0080000, CRC(180e098b) SHA1(48782c46a344dba0aaad407d0d4a432da091b0f5) )
+	ROM_LOAD32_WORD("INCASUN_NSW.u8",  0x0100000, 0x0080000, CRC(0c19f5ec) SHA1(95d7c9308b30b5193816e95c4276829612040298) )
+	ROM_LOAD32_WORD("INCASUN_NSW.u9",  0x0200000, 0x0080000, CRC(c82da820) SHA1(98a2710b1f793a7ee1070f89c66d49ce55e4156e) )
 ROM_END_REGIONS
 
 
@@ -1623,10 +1624,10 @@ ROM_END_REGIONS
 ROM_START( kookabk )
 	ARISTOCRAT_MK5_BIOS
 	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
-	ROM_LOAD32_WORD("Kooka_Bucks_1of4.U07.BIN", 0x0000000, 0x0080000, CRC(b2fdf0e8) SHA1(0dd002cfad2fa4f217a0c67066d098f4cd3ba319) )
-	ROM_LOAD32_WORD("Kooka_Bucks_2of4.U11.BIN", 0x0000002, 0x0080000, CRC(e8ab9afc) SHA1(4c3beefeafc6ac9d4538254bb5e01c12b35db922) )
-	ROM_LOAD32_WORD("Kooka_Bucks_3of4.U08.BIN", 0x0100000, 0x0080000, CRC(f5a45c57) SHA1(a452a7359af6d5fde2c37946ee68807152f07d39) )
-	ROM_LOAD32_WORD("Kooka_Bucks_4of4.U12.BIN", 0x0100002, 0x0080000, CRC(b2f2fd15) SHA1(9614f3ae6e82a40ecf44090d0b8d7bd8b6b1f830) )
+	ROM_LOAD32_WORD("Kooka_Bucks_1of4.u7",  0x0000000, 0x0080000, CRC(b2fdf0e8) SHA1(0dd002cfad2fa4f217a0c67066d098f4cd3ba319) )
+	ROM_LOAD32_WORD("Kooka_Bucks_2of4.u11", 0x0000002, 0x0080000, CRC(e8ab9afc) SHA1(4c3beefeafc6ac9d4538254bb5e01c12b35db922) )
+	ROM_LOAD32_WORD("Kooka_Bucks_3of4.u8",  0x0100000, 0x0080000, CRC(f5a45c57) SHA1(a452a7359af6d5fde2c37946ee68807152f07d39) )
+	ROM_LOAD32_WORD("Kooka_Bucks_4of4.u12", 0x0100002, 0x0080000, CRC(b2f2fd15) SHA1(9614f3ae6e82a40ecf44090d0b8d7bd8b6b1f830) )
 ROM_END_REGIONS
 
 
@@ -1635,16 +1636,16 @@ ROM_END_REGIONS
 ROM_START( locoloot )
 	ARISTOCRAT_MK5_BIOS
 	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
-	ROM_LOAD32_WORD("Loco Loot U11.BIN", 0x0000002, 0x0080000, CRC(21332a1a) SHA1(76a4c30d1c9624984175e9bd117c68c9204f01df) )
-	ROM_LOAD32_WORD("Loco Loot U7.bin", 0x0000000, 0x0080000, CRC(4f02763c) SHA1(302cea5fb157f65fc907f123ef42a0a38cc707ac) )
+	ROM_LOAD32_WORD("Loco Loot.u11", 0x0000002, 0x0080000, CRC(21332a1a) SHA1(76a4c30d1c9624984175e9bd117c68c9204f01df) )
+	ROM_LOAD32_WORD("Loco Loot.u7",  0x0000000, 0x0080000, CRC(4f02763c) SHA1(302cea5fb157f65fc907f123ef42a0a38cc707ac) )
 ROM_END_REGIONS
 
 
 ROM_START( lonwolf )
 	ARISTOCRAT_MK5_BIOS
 	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
-	ROM_LOAD32_WORD("Lone Wolf  U11.BIN", 0x0000002, 0x0080000, CRC(0ed6fb6b) SHA1(a2baa4154fe762e2c1b40a97b2d27265df8b5dab) )
-	ROM_LOAD32_WORD("Lone Wolf  U7.bin", 0x0000000, 0x0080000, CRC(15024eae) SHA1(7101125aa8531c75f9d80fe357013d09dbb0fec9) )
+	ROM_LOAD32_WORD("Lone Wolf.u11", 0x0000002, 0x0080000, CRC(0ed6fb6b) SHA1(a2baa4154fe762e2c1b40a97b2d27265df8b5dab) )
+	ROM_LOAD32_WORD("Lone Wolf.u7",  0x0000000, 0x0080000, CRC(15024eae) SHA1(7101125aa8531c75f9d80fe357013d09dbb0fec9) )
 ROM_END_REGIONS
 
 
@@ -1653,12 +1654,12 @@ ROM_END_REGIONS
 ROM_START( mgctouc )
 	ARISTOCRAT_MK5_BIOS
 	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
-	ROM_LOAD32_WORD("Magic Touch U11.BIN", 0x0000002, 0x0080000, CRC(614984e4) SHA1(e95d576993e8d9c0964899a7d5556c8e62d79242) )
-	ROM_LOAD32_WORD("Magic Touch U12.BIN", 0x0100002, 0x0080000, CRC(f54c18db) SHA1(85bcc202f7425b3b7ef456c1c2db5a22648068a8) )
-	ROM_LOAD32_WORD("Magic Touch U13.BIN", 0x0200002, 0x0080000, CRC(cfd2a86e) SHA1(66891a1b0e85ad7146b733f4b5d806db789d8821) )
-	ROM_LOAD32_WORD("Magic Touch U7.bin", 0x0000000, 0x0080000, CRC(9fa3ee86) SHA1(ce7546b8d1dbf90eb8f4f8d3255dc1c215c966a7) )
-	ROM_LOAD32_WORD("Magic Touch U8.bin", 0x0100000, 0x0080000, CRC(d7faf84d) SHA1(d2e49787d177767671fab64a723e1af619ce9ad2) )
-	ROM_LOAD32_WORD("Magic Touch U9.bin", 0x0200000, 0x0080000, CRC(0e140453) SHA1(8b516fe598c7e754a471246effa1185845495640) )
+	ROM_LOAD32_WORD("Magic Touch.u11", 0x0000002, 0x0080000, CRC(614984e4) SHA1(e95d576993e8d9c0964899a7d5556c8e62d79242) )
+	ROM_LOAD32_WORD("Magic Touch.u12", 0x0100002, 0x0080000, CRC(f54c18db) SHA1(85bcc202f7425b3b7ef456c1c2db5a22648068a8) )
+	ROM_LOAD32_WORD("Magic Touch.u13", 0x0200002, 0x0080000, CRC(cfd2a86e) SHA1(66891a1b0e85ad7146b733f4b5d806db789d8821) )
+	ROM_LOAD32_WORD("Magic Touch.u7",  0x0000000, 0x0080000, CRC(9fa3ee86) SHA1(ce7546b8d1dbf90eb8f4f8d3255dc1c215c966a7) )
+	ROM_LOAD32_WORD("Magic Touch.u8",  0x0100000, 0x0080000, CRC(d7faf84d) SHA1(d2e49787d177767671fab64a723e1af619ce9ad2) )
+	ROM_LOAD32_WORD("Magic Touch.u9",  0x0200000, 0x0080000, CRC(0e140453) SHA1(8b516fe598c7e754a471246effa1185845495640) )
 ROM_END_REGIONS
 
 
@@ -1668,10 +1669,10 @@ ROM_END_REGIONS
 ROM_START( monmous )
 	ARISTOCRAT_MK5_BIOS
 	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
-	ROM_LOAD32_WORD("MONEYMOUSE_U11.BIN", 0x0000002, 0x0080000, CRC(ac2243ea) SHA1(27c31e5102defa4f3982875b30a67e89af40d4ff) )
-	ROM_LOAD32_WORD("MONEYMOUSE_U12.BIN", 0x0100002, 0x0080000, CRC(72d992ed) SHA1(94560305dacbe776ddc95114ad5e5ffaa234937c) )
-	ROM_LOAD32_WORD("MONEYMOUSE_U7.bin", 0x0000000, 0x0080000, CRC(7f7972b6) SHA1(25991f476f55cd1eddc8e63af9c472c1d7e83481) )
-	ROM_LOAD32_WORD("MONEYMOUSE_U8.bin", 0x0100000, 0x0080000, CRC(a10a4bff) SHA1(e6b36542dab8a3405579b333a125a6d3fd801b50) )
+	ROM_LOAD32_WORD("MONEYMOUSE.u11", 0x0000002, 0x0080000, CRC(ac2243ea) SHA1(27c31e5102defa4f3982875b30a67e89af40d4ff) )
+	ROM_LOAD32_WORD("MONEYMOUSE.u12", 0x0100002, 0x0080000, CRC(72d992ed) SHA1(94560305dacbe776ddc95114ad5e5ffaa234937c) )
+	ROM_LOAD32_WORD("MONEYMOUSE.u7",  0x0000000, 0x0080000, CRC(7f7972b6) SHA1(25991f476f55cd1eddc8e63af9c472c1d7e83481) )
+	ROM_LOAD32_WORD("MONEYMOUSE.u8",  0x0100000, 0x0080000, CRC(a10a4bff) SHA1(e6b36542dab8a3405579b333a125a6d3fd801b50) )
 ROM_END_REGIONS
 
 
@@ -1681,8 +1682,8 @@ ROM_END_REGIONS
 ROM_START( moutmon )
 	ARISTOCRAT_MK5_BIOS
 	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
-	ROM_LOAD32_WORD("Mountain Money U11.BIN", 0x0000002, 0x0080000, CRC(4fb2a4dc) SHA1(23895b701387f7442a31969989d21cefe2a25efd) )
-	ROM_LOAD32_WORD("Mountain Money U7.bin", 0x0000000, 0x0080000, CRC(b84342af) SHA1(e27e65730ddc897b01e8875a4da3ea2d6db2b858) )
+	ROM_LOAD32_WORD("Mountain Money.u11", 0x0000002, 0x0080000, CRC(4fb2a4dc) SHA1(23895b701387f7442a31969989d21cefe2a25efd) )
+	ROM_LOAD32_WORD("Mountain Money.u7",  0x0000000, 0x0080000, CRC(b84342af) SHA1(e27e65730ddc897b01e8875a4da3ea2d6db2b858) )
 ROM_END_REGIONS
 
 
@@ -1691,8 +1692,8 @@ ROM_END_REGIONS
 ROM_START( mystgrd )
 	ARISTOCRAT_MK5_BIOS
 	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
-	ROM_LOAD32_WORD("Mystic Garden U11.BIN", 0x0000002, 0x0080000, CRC(6e618fc5) SHA1(a02e7ca2433cf8128d74792833d9708a3ba5df4b) )
-	ROM_LOAD32_WORD("Mystic Garden U7.bin", 0x0000000, 0x0080000, CRC(28d15442) SHA1(ee33017f3efcf688a43ea1d7f2b74b4b9a6d2cae) )
+	ROM_LOAD32_WORD("Mystic Garden.u11", 0x0000002, 0x0080000, CRC(6e618fc5) SHA1(a02e7ca2433cf8128d74792833d9708a3ba5df4b) )
+	ROM_LOAD32_WORD("Mystic Garden.u7",  0x0000000, 0x0080000, CRC(28d15442) SHA1(ee33017f3efcf688a43ea1d7f2b74b4b9a6d2cae) )
 ROM_END_REGIONS
 
 
@@ -1702,10 +1703,10 @@ ROM_END_REGIONS
 ROM_START( orchidms )
 	ARISTOCRAT_MK5_BIOS
 	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
-	ROM_LOAD32_WORD("Orchid Mist  U11.BIN", 0x0000002, 0x0080000, CRC(fe79410b) SHA1(c91a0ce0cf87db518f910e9f47cabdcb91dc5496) )
-	ROM_LOAD32_WORD("Orchid Mist  U12.BIN", 0x0100002, 0x0080000, CRC(165a762d) SHA1(8487d2e32bd2fab5a9114380ba2be6d34b097b11) )
-	ROM_LOAD32_WORD("Orchid Mist  U7.bin", 0x0000000, 0x0080000, CRC(5d18ae22) SHA1(c10f7a83f51cfe75653ace8066b7dedf07e91b28) )
-	ROM_LOAD32_WORD("Orchid Mist  U8.bin", 0x0100000, 0x0080000, CRC(09ec43e3) SHA1(947ed0982a148e6906666378e8c82315d40237d7) )
+	ROM_LOAD32_WORD("Orchid Mist.u11", 0x0000002, 0x0080000, CRC(fe79410b) SHA1(c91a0ce0cf87db518f910e9f47cabdcb91dc5496) )
+	ROM_LOAD32_WORD("Orchid Mist.u12", 0x0100002, 0x0080000, CRC(165a762d) SHA1(8487d2e32bd2fab5a9114380ba2be6d34b097b11) )
+	ROM_LOAD32_WORD("Orchid Mist.u7",  0x0000000, 0x0080000, CRC(5d18ae22) SHA1(c10f7a83f51cfe75653ace8066b7dedf07e91b28) )
+	ROM_LOAD32_WORD("Orchid Mist.u8",  0x0100000, 0x0080000, CRC(09ec43e3) SHA1(947ed0982a148e6906666378e8c82315d40237d7) )
 ROM_END_REGIONS
 
 
@@ -1715,8 +1716,8 @@ ROM_END_REGIONS
 ROM_START( oscarar )
 	ARISTOCRAT_MK5_BIOS
 	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
-	ROM_LOAD32_WORD("Oscar U11.BIN", 0x0000002, 0x0080000, CRC(11394e80) SHA1(1c6e7e954a6118e04da9d761fef8ec00c46d2af8) )
-	ROM_LOAD32_WORD("Oscar U7.bin", 0x0000000, 0x0080000, CRC(930bdc00) SHA1(36b1a289abebc7cce64e767e201d8f8f7fe80cf2) )
+	ROM_LOAD32_WORD("Oscar.u11", 0x0000002, 0x0080000, CRC(11394e80) SHA1(1c6e7e954a6118e04da9d761fef8ec00c46d2af8) )
+	ROM_LOAD32_WORD("Oscar.u7",  0x0000000, 0x0080000, CRC(930bdc00) SHA1(36b1a289abebc7cce64e767e201d8f8f7fe80cf2) )
 ROM_END_REGIONS
 
 
@@ -1725,10 +1726,10 @@ ROM_END_REGIONS
 ROM_START( pantmag )
 	ARISTOCRAT_MK5_BIOS
 	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
-	ROM_LOAD32_WORD("Panther Magic 200 U11.BIN", 0x0000002, 0x0080000, CRC(0914594c) SHA1(b1bc1302847e3ea3c4ed96ae17047da031e5ca1a) )
-	ROM_LOAD32_WORD("Panther Magic 200 U12.BIN", 0x0100002, 0x0080000, CRC(eae75fa9) SHA1(576c8cf98ad4032bbdde12162e2c1bdd10056762) )
-	ROM_LOAD32_WORD("Panther Magic 200 U7.BIN", 0x0000000, 0x0080000, CRC(6383899d) SHA1(df96af7cb580565715da6e78b83e7ba6832028e7) )
-	ROM_LOAD32_WORD("Panther Magic 200 U8.bin", 0x0100000, 0x0080000, CRC(db840d1b) SHA1(26ff790cd21f2005ae3a3e879ef07b87c8ae0020) )
+	ROM_LOAD32_WORD("Panther Magic 200.u11", 0x0000002, 0x0080000, CRC(0914594c) SHA1(b1bc1302847e3ea3c4ed96ae17047da031e5ca1a) )
+	ROM_LOAD32_WORD("Panther Magic 200.u12", 0x0100002, 0x0080000, CRC(eae75fa9) SHA1(576c8cf98ad4032bbdde12162e2c1bdd10056762) )
+	ROM_LOAD32_WORD("Panther Magic 200.u7",  0x0000000, 0x0080000, CRC(6383899d) SHA1(df96af7cb580565715da6e78b83e7ba6832028e7) )
+	ROM_LOAD32_WORD("Panther Magic 200.u8",  0x0100000, 0x0080000, CRC(db840d1b) SHA1(26ff790cd21f2005ae3a3e879ef07b87c8ae0020) )
 ROM_END_REGIONS
 
 
@@ -1737,10 +1738,10 @@ ROM_END_REGIONS
 ROM_START( peaflut )
 	ARISTOCRAT_MK5_BIOS
 	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
-	ROM_LOAD32_WORD("PEACOCKFLUTTER_U11.BIN", 0x0000002, 0x0080000, CRC(3134818c) SHA1(6fe158608b5da648fafd20cbcd213e6f2dc2104c) )
-	ROM_LOAD32_WORD("PEACOCKFLUTTER_U12.BIN", 0x0100002, 0x0080000, CRC(2d96c449) SHA1(af98a864b9ed3f95227fd0d6edc6a38c0544c93f) )
-	ROM_LOAD32_WORD("PEACOCKFLUTTER_U7.bin", 0x0000000, 0x0080000, CRC(e4497f35) SHA1(7030aba6c17fc391564385f5669e07edc94dca61) )
-	ROM_LOAD32_WORD("PEACOCKFLUTTER_U8.bin", 0x0100000, 0x0080000, CRC(f239ca62) SHA1(53e3e2a4d62ceb9e921606e3670470c09e82118f) )
+	ROM_LOAD32_WORD("PEACOCKFLUTTER.u11", 0x0000002, 0x0080000, CRC(3134818c) SHA1(6fe158608b5da648fafd20cbcd213e6f2dc2104c) )
+	ROM_LOAD32_WORD("PEACOCKFLUTTER.u12", 0x0100002, 0x0080000, CRC(2d96c449) SHA1(af98a864b9ed3f95227fd0d6edc6a38c0544c93f) )
+	ROM_LOAD32_WORD("PEACOCKFLUTTER.u7",  0x0000000, 0x0080000, CRC(e4497f35) SHA1(7030aba6c17fc391564385f5669e07edc94dca61) )
+	ROM_LOAD32_WORD("PEACOCKFLUTTER.u8",  0x0100000, 0x0080000, CRC(f239ca62) SHA1(53e3e2a4d62ceb9e921606e3670470c09e82118f) )
 ROM_END_REGIONS
 
 
@@ -1749,10 +1750,10 @@ ROM_END_REGIONS
 ROM_START( pengpay )
 	ARISTOCRAT_MK5_BIOS
 	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
-	ROM_LOAD32_WORD("Penguin_Pays_U11.BIN", 0x0000002, 0x0080000, CRC(82fc4e23) SHA1(54e7698c4deed7202da8f178698ecdcf85f3f640) )
-	ROM_LOAD32_WORD("Penguin_Pays_U12.BIN", 0x0100002, 0x0080000, CRC(90864742) SHA1(f6491e4fbce5d642b9d0224118923b56625338b1) )
-	ROM_LOAD32_WORD("Penguin_Pays_U7.bin", 0x0000000, 0x0080000, CRC(47145744) SHA1(74a186a15537d8b05ce23f37c53f351e8058b0b2) )
-	ROM_LOAD32_WORD("Penguin_Pays_U8.bin", 0x0100000, 0x0080000, CRC(8d37d7bf) SHA1(9c9b86cce9492f9de346e5a6944e2f0c5da6b9b1) )
+	ROM_LOAD32_WORD("Penguin_Pays.u11", 0x0000002, 0x0080000, CRC(82fc4e23) SHA1(54e7698c4deed7202da8f178698ecdcf85f3f640) )
+	ROM_LOAD32_WORD("Penguin_Pays.u12", 0x0100002, 0x0080000, CRC(90864742) SHA1(f6491e4fbce5d642b9d0224118923b56625338b1) )
+	ROM_LOAD32_WORD("Penguin_Pays.u7",  0x0000000, 0x0080000, CRC(47145744) SHA1(74a186a15537d8b05ce23f37c53f351e8058b0b2) )
+	ROM_LOAD32_WORD("Penguin_Pays.u8",  0x0100000, 0x0080000, CRC(8d37d7bf) SHA1(9c9b86cce9492f9de346e5a6944e2f0c5da6b9b1) )
 ROM_END_REGIONS
 
 
@@ -1761,12 +1762,12 @@ ROM_END_REGIONS
 ROM_START( przfigha )
 	ARISTOCRAT_MK5_BIOS
 	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
-	ROM_LOAD32_WORD("PRIZEFIGHT_U11.BIN", 0x0000002, 0x0080000, CRC(e1bf20d7) SHA1(bcc308b884433b3ebd890fafa667235a9fb7876c) )
-	ROM_LOAD32_WORD("PRIZEFIGHT_U12.BIN", 0x0100002, 0x0080000, CRC(b4797555) SHA1(695aa6c40145fd9856821288680a24d316b7d4cd) )
-	ROM_LOAD32_WORD("PRIZEFIGHT_U13.BIN", 0x0200002, 0x0080000, CRC(c16197d5) SHA1(716c4afdf2acde10ff09ad90b03bc5e689f0a737) )
-	ROM_LOAD32_WORD("PRIZEFIGHT_U7.bin", 0x0000000, 0x0080000, CRC(2b1a9678) SHA1(c75de4c76cd934df746040d0515694d92e2fc145) )
-	ROM_LOAD32_WORD("PRIZEFIGHT_U8.bin", 0x0100000, 0x0080000, CRC(92b68d43) SHA1(74ba55d6c7016de26692138d194f57f016feb938) )
-	ROM_LOAD32_WORD("PRIZEFIGHT_U9.bin", 0x0200000, 0x0080000, CRC(b3163b0c) SHA1(e9aac4acb31a9af194626b25517aa7c169fe40bf) )
+	ROM_LOAD32_WORD("PRIZEFIGHT.u11", 0x0000002, 0x0080000, CRC(e1bf20d7) SHA1(bcc308b884433b3ebd890fafa667235a9fb7876c) )
+	ROM_LOAD32_WORD("PRIZEFIGHT.u12", 0x0100002, 0x0080000, CRC(b4797555) SHA1(695aa6c40145fd9856821288680a24d316b7d4cd) )
+	ROM_LOAD32_WORD("PRIZEFIGHT.u13", 0x0200002, 0x0080000, CRC(c16197d5) SHA1(716c4afdf2acde10ff09ad90b03bc5e689f0a737) )
+	ROM_LOAD32_WORD("PRIZEFIGHT.u7",  0x0000000, 0x0080000, CRC(2b1a9678) SHA1(c75de4c76cd934df746040d0515694d92e2fc145) )
+	ROM_LOAD32_WORD("PRIZEFIGHT.u8",  0x0100000, 0x0080000, CRC(92b68d43) SHA1(74ba55d6c7016de26692138d194f57f016feb938) )
+	ROM_LOAD32_WORD("PRIZEFIGHT.u9",  0x0200000, 0x0080000, CRC(b3163b0c) SHA1(e9aac4acb31a9af194626b25517aa7c169fe40bf) )
 ROM_END_REGIONS
 
 
@@ -1776,10 +1777,10 @@ ROM_END_REGIONS
 ROM_START( qncsh )
 	ARISTOCRAT_MK5_BIOS
 	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
-	ROM_LOAD32_WORD("queensofcash_U11.BIN", 0x0000002, 0x0080000, CRC(5001567e) SHA1(eadde9750856a7920e06955adc0db46082da655a) )
-	ROM_LOAD32_WORD("queensofcash_U12.BIN", 0x0100002, 0x0080000, CRC(bfedb3fc) SHA1(e115db94b8ee7babb29e31e64b96d181f5c6491b) )
-	ROM_LOAD32_WORD("queensofcash_U7.bin", 0x0000000, 0x0080000, CRC(591c96eb) SHA1(acd6f02206086d710a92401c618f715b3646d78a) )
-	ROM_LOAD32_WORD("queensofcash_U8.bin", 0x0100000, 0x0080000, CRC(31ed5795) SHA1(8238da7c87195339d34cf24b3e0a7f3bf53d2b8a) )
+	ROM_LOAD32_WORD("queensofcash.u11", 0x0000002, 0x0080000, CRC(5001567e) SHA1(eadde9750856a7920e06955adc0db46082da655a) )
+	ROM_LOAD32_WORD("queensofcash.u12", 0x0100002, 0x0080000, CRC(bfedb3fc) SHA1(e115db94b8ee7babb29e31e64b96d181f5c6491b) )
+	ROM_LOAD32_WORD("queensofcash.u7",  0x0000000, 0x0080000, CRC(591c96eb) SHA1(acd6f02206086d710a92401c618f715b3646d78a) )
+	ROM_LOAD32_WORD("queensofcash.u8",  0x0100000, 0x0080000, CRC(31ed5795) SHA1(8238da7c87195339d34cf24b3e0a7f3bf53d2b8a) )
 ROM_END_REGIONS
 
 
@@ -1789,10 +1790,10 @@ ROM_END_REGIONS
 ROM_START( sumospin )
 	ARISTOCRAT_MK5_BIOS
 	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
-	ROM_LOAD32_WORD("Sumo Spins U11.BIN", 0x0000002, 0x0080000, CRC(919999fe) SHA1(3d800df5e0abed04c76928b04973ea7c7b02e5d1) )
-	ROM_LOAD32_WORD("Sumo Spins U12.BIN", 0x0100002, 0x0080000, CRC(ba3eede2) SHA1(708a25af0908a1aa874b3ca4897816c65b0c9178) )
-	ROM_LOAD32_WORD("Sumo Spins u7.bin", 0x0000000, 0x0080000, CRC(c3ec9f97) SHA1(62c886cc794de4b915533729c5ea5a71a4b59108) )
-	ROM_LOAD32_WORD("Sumo Spins U8.bin", 0x0100000, 0x0080000, CRC(eb47f317) SHA1(43ead31e788cce1aa03011f634e939489d965144) )
+	ROM_LOAD32_WORD("Sumo Spins.u11", 0x0000002, 0x0080000, CRC(919999fe) SHA1(3d800df5e0abed04c76928b04973ea7c7b02e5d1) )
+	ROM_LOAD32_WORD("Sumo Spins.u12", 0x0100002, 0x0080000, CRC(ba3eede2) SHA1(708a25af0908a1aa874b3ca4897816c65b0c9178) )
+	ROM_LOAD32_WORD("Sumo Spins.u7",  0x0000000, 0x0080000, CRC(c3ec9f97) SHA1(62c886cc794de4b915533729c5ea5a71a4b59108) )
+	ROM_LOAD32_WORD("Sumo Spins.u8",  0x0100000, 0x0080000, CRC(eb47f317) SHA1(43ead31e788cce1aa03011f634e939489d965144) )
 ROM_END_REGIONS
 
 
@@ -1802,10 +1803,10 @@ ROM_END_REGIONS
 ROM_START( sbucks3 )
 	ARISTOCRAT_MK5_BIOS
 	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
-	ROM_LOAD32_WORD("SUPERBUCKS3_U11.BIN", 0x0000002, 0x0080000, CRC(a810782c) SHA1(5d59b464c44ec32b2b977f8326c8bf3424a61e07) )
-	ROM_LOAD32_WORD("SUPERBUCKS3_U12.BIN", 0x0100002, 0x0080000, CRC(a585172d) SHA1(3c74efb11285ff78ce76a7e8af2f936d3dc31290) )
-	ROM_LOAD32_WORD("SUPERBUCKS3_U7.bin", 0x0000000, 0x0080000, CRC(e056c7db) SHA1(7a555583f750d8275b2ffd25a0efbe370a5ac43c) )
-	ROM_LOAD32_WORD("SUPERBUCKS3_U8.bin", 0x0100000, 0x0080000, CRC(2ff83479) SHA1(2f0c6c12e115a5592c29e806a946817a4f1b89a3) )
+	ROM_LOAD32_WORD("SUPERBUCKS3.u11", 0x0000002, 0x0080000, CRC(a810782c) SHA1(5d59b464c44ec32b2b977f8326c8bf3424a61e07) )
+	ROM_LOAD32_WORD("SUPERBUCKS3.u12", 0x0100002, 0x0080000, CRC(a585172d) SHA1(3c74efb11285ff78ce76a7e8af2f936d3dc31290) )
+	ROM_LOAD32_WORD("SUPERBUCKS3.u7",  0x0000000, 0x0080000, CRC(e056c7db) SHA1(7a555583f750d8275b2ffd25a0efbe370a5ac43c) )
+	ROM_LOAD32_WORD("SUPERBUCKS3.u8",  0x0100000, 0x0080000, CRC(2ff83479) SHA1(2f0c6c12e115a5592c29e806a946817a4f1b89a3) )
 ROM_END_REGIONS
 
 
@@ -1813,10 +1814,10 @@ ROM_END_REGIONS
 ROM_START( tretrva )
 	ARISTOCRAT_MK5_BIOS
 	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
-	ROM_LOAD32_WORD("U11 Treasure Trove.bin", 0x0000002, 0x0080000, CRC(020a588d) SHA1(4759bef22017fb4c47c87adb6ca7253fdb6bca6b) )
-	ROM_LOAD32_WORD("U12 Treasure Trove.bin", 0x0100002, 0x0080000, CRC(715f53cb) SHA1(364c35fc2d36180c13127c8004a8729126f68db1) )
-	ROM_LOAD32_WORD("U7 Treasure Trove.bin", 0x0000000, 0x0080000, CRC(07a8b338) SHA1(7508d7d0e3494d355cb773165b240ba876a60eec) )
-	ROM_LOAD32_WORD("U8 Treasure Trove.bin", 0x0100000, 0x0080000, CRC(89a042e7) SHA1(0f95cfd42ce7130176d42c6bbdf8ff22a6662894) )
+	ROM_LOAD32_WORD("Treasure Trove.u11", 0x0000002, 0x0080000, CRC(020a588d) SHA1(4759bef22017fb4c47c87adb6ca7253fdb6bca6b) )
+	ROM_LOAD32_WORD("Treasure Trove.u12", 0x0100002, 0x0080000, CRC(715f53cb) SHA1(364c35fc2d36180c13127c8004a8729126f68db1) )
+	ROM_LOAD32_WORD("Treasure Trove.u7",  0x0000000, 0x0080000, CRC(07a8b338) SHA1(7508d7d0e3494d355cb773165b240ba876a60eec) )
+	ROM_LOAD32_WORD("Treasure Trove.u8",  0x0100000, 0x0080000, CRC(89a042e7) SHA1(0f95cfd42ce7130176d42c6bbdf8ff22a6662894) )
 ROM_END_REGIONS
 
 
@@ -1824,12 +1825,12 @@ ROM_END_REGIONS
 ROM_START( triptrea )
 	ARISTOCRAT_MK5_BIOS
 	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
-	ROM_LOAD32_WORD("U11 Triple Treat.bin", 0x0000002, 0x0080000, CRC(fbc125b8) SHA1(55dbc3a236804f4a8d26be8e49c29fa5943c5bd6) )
-	ROM_LOAD32_WORD("U12 Triple Treat.bin", 0x0100002, 0x0080000, CRC(5df3854a) SHA1(2b5175835c587caccafb73a1a5c8abf8f8463cf4) )
-	ROM_LOAD32_WORD("U13 Triple Treat.bin", 0x0200002, 0x0080000, CRC(0a0b0ce1) SHA1(41a4d613cf1828df1832c087f0bc18d31076f056) )
-	ROM_LOAD32_WORD("U7 Triple Treat.bin", 0x0000000, 0x0080000, CRC(7bc25bba) SHA1(d5f7c3a4bc3c652f57ee4cdbc883ec82069365d1) )
-	ROM_LOAD32_WORD("U8 Triple Treat.bin", 0x0100000, 0x0080000, CRC(ef976f78) SHA1(d2c89e8d3bf6af112a99354133f308a5aabad46e) )
-	ROM_LOAD32_WORD("U9 Triple Treat.bin", 0x0200000, 0x0080000, CRC(776fbfd2) SHA1(27820dbc6ee1424706aea9c4574da117636fef17) )
+	ROM_LOAD32_WORD("Triple Treat.u11", 0x0000002, 0x0080000, CRC(fbc125b8) SHA1(55dbc3a236804f4a8d26be8e49c29fa5943c5bd6) )
+	ROM_LOAD32_WORD("Triple Treat.u12", 0x0100002, 0x0080000, CRC(5df3854a) SHA1(2b5175835c587caccafb73a1a5c8abf8f8463cf4) )
+	ROM_LOAD32_WORD("Triple Treat.u13", 0x0200002, 0x0080000, CRC(0a0b0ce1) SHA1(41a4d613cf1828df1832c087f0bc18d31076f056) )
+	ROM_LOAD32_WORD("Triple Treat.u7",  0x0000000, 0x0080000, CRC(7bc25bba) SHA1(d5f7c3a4bc3c652f57ee4cdbc883ec82069365d1) )
+	ROM_LOAD32_WORD("Triple Treat.u8",  0x0100000, 0x0080000, CRC(ef976f78) SHA1(d2c89e8d3bf6af112a99354133f308a5aabad46e) )
+	ROM_LOAD32_WORD("Triple Treat.u9",  0x0200000, 0x0080000, CRC(776fbfd2) SHA1(27820dbc6ee1424706aea9c4574da117636fef17) )
 ROM_END_REGIONS
 
 
@@ -1837,12 +1838,12 @@ ROM_END_REGIONS
 ROM_START( trjhrs )
 	ARISTOCRAT_MK5_BIOS
 	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
-	ROM_LOAD32_WORD("TROJANHORSE_U11.BIN", 0x0000002, 0x0080000, CRC(8c04ed89) SHA1(6727da3a457841e893e27bc8f10d4bb58a61f338) )
-	ROM_LOAD32_WORD("TROJANHORSE_U12.BIN", 0x0100002, 0x0080000, CRC(1eb021a4) SHA1(3195eb5923da018b6c2dac10b70c47aef54dca35) )
-	ROM_LOAD32_WORD("TROJANHORSE_U13.BIN", 0x0200002, 0x0080000, CRC(b6d1ceb6) SHA1(b41200620aaa905697ac73b4c86496a53f070ed3) )
-	ROM_LOAD32_WORD("TROJANHORSE_U7.bin", 0x0000000, 0x0080000, CRC(7be0caf5) SHA1(b83fba7eb4624b3dc56f763b48b7c45fe31f3396) )
-	ROM_LOAD32_WORD("TROJANHORSE_U8.bin", 0x0100000, 0x0080000, CRC(246d3693) SHA1(8c8b893c21e9a486fd36677d7157787bf5d6237b) )
-	ROM_LOAD32_WORD("TROJANHORSE_U9.bin", 0x0200000, 0x0080000, CRC(15dee624) SHA1(d678ef7c25419342a1512fab84394e99309009ec) )
+	ROM_LOAD32_WORD("TROJANHORSE.u11", 0x0000002, 0x0080000, CRC(8c04ed89) SHA1(6727da3a457841e893e27bc8f10d4bb58a61f338) )
+	ROM_LOAD32_WORD("TROJANHORSE.u12", 0x0100002, 0x0080000, CRC(1eb021a4) SHA1(3195eb5923da018b6c2dac10b70c47aef54dca35) )
+	ROM_LOAD32_WORD("TROJANHORSE.u13", 0x0200002, 0x0080000, CRC(b6d1ceb6) SHA1(b41200620aaa905697ac73b4c86496a53f070ed3) )
+	ROM_LOAD32_WORD("TROJANHORSE.u7",  0x0000000, 0x0080000, CRC(7be0caf5) SHA1(b83fba7eb4624b3dc56f763b48b7c45fe31f3396) )
+	ROM_LOAD32_WORD("TROJANHORSE.u8",  0x0100000, 0x0080000, CRC(246d3693) SHA1(8c8b893c21e9a486fd36677d7157787bf5d6237b) )
+	ROM_LOAD32_WORD("TROJANHORSE.u9",  0x0200000, 0x0080000, CRC(15dee624) SHA1(d678ef7c25419342a1512fab84394e99309009ec) )
 ROM_END_REGIONS
 
 
@@ -1855,8 +1856,8 @@ ROM_END_REGIONS
 ROM_START( wildbill )
 	ARISTOCRAT_MK5_BIOS
 	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
-	ROM_LOAD32_WORD("Wild Bill U11.BIN", 0x0000002, 0x0080000, CRC(57b3c340) SHA1(4f95ed7fed697cf2bfbde8215f6e35768cf20334) )
-	ROM_LOAD32_WORD("Wild Bill U7.bin", 0x0000000, 0x0080000, CRC(e3117ab7) SHA1(c13912f524f1c1d373adb6382ceddd1bc18f7f02) )
+	ROM_LOAD32_WORD("Wild Bill.u11", 0x0000002, 0x0080000, CRC(57b3c340) SHA1(4f95ed7fed697cf2bfbde8215f6e35768cf20334) )
+	ROM_LOAD32_WORD("Wild Bill.u7",  0x0000000, 0x0080000, CRC(e3117ab7) SHA1(c13912f524f1c1d373adb6382ceddd1bc18f7f02) )
 ROM_END_REGIONS
 
 
@@ -1864,10 +1865,10 @@ ROM_END_REGIONS
 ROM_START( wldcoug )
 	ARISTOCRAT_MK5_BIOS
 	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
-	ROM_LOAD32_WORD("Wild Cougar  U11.BIN", 0x0000002, 0x0080000, CRC(6a5f2c41) SHA1(1365e083d44a373c2d4f17e8e61ec716ffb6d2d5) )
-	ROM_LOAD32_WORD("Wild Cougar  U12.BIN", 0x0100002, 0x0080000, CRC(85bb41a7) SHA1(335f29f10f216e202b93b46a376958c3f5271461) )
-	ROM_LOAD32_WORD("Wild Cougar  U7.bin", 0x0000000, 0x0080000, CRC(47154679) SHA1(21749fbaa60f9bf1db43bdd272e6628ae73bf759) )
-	ROM_LOAD32_WORD("Wild Cougar  U8.bin", 0x0100000, 0x0080000, CRC(c262d098) SHA1(87940bd0aef6cb0f5ff21ccda4b209eef8e97eb1) )
+	ROM_LOAD32_WORD("Wild Cougar.u11", 0x0000002, 0x0080000, CRC(6a5f2c41) SHA1(1365e083d44a373c2d4f17e8e61ec716ffb6d2d5) )
+	ROM_LOAD32_WORD("Wild Cougar.u12", 0x0100002, 0x0080000, CRC(85bb41a7) SHA1(335f29f10f216e202b93b46a376958c3f5271461) )
+	ROM_LOAD32_WORD("Wild Cougar.u7",  0x0000000, 0x0080000, CRC(47154679) SHA1(21749fbaa60f9bf1db43bdd272e6628ae73bf759) )
+	ROM_LOAD32_WORD("Wild Cougar.u8",  0x0100000, 0x0080000, CRC(c262d098) SHA1(87940bd0aef6cb0f5ff21ccda4b209eef8e97eb1) )
 ROM_END_REGIONS
 
 
@@ -1877,10 +1878,10 @@ ROM_END_REGIONS
 ROM_START( chariotca )
 	ARISTOCRAT_MK5_BIOS
 	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
-	ROM_LOAD32_WORD("U11.BIN", 0x0000002, 0x0080000, CRC(bcbf9de9) SHA1(191ce749fe0d29b2783fb78d9338a00d65104daa) )
-	ROM_LOAD32_WORD("U12.BIN", 0x0100002, 0x0080000, CRC(b44cf571) SHA1(04447820e015425493cade5611b3eb2f21e48c2e) )
-	ROM_LOAD32_WORD("U7.bin", 0x0000000, 0x0080000, CRC(845f9913) SHA1(df6121290b30ff4a9c2d0e690cf8e7797e9a8612) )
-	ROM_LOAD32_WORD("U8.bin", 0x0100000, 0x0080000, CRC(a3a74ecb) SHA1(52b3a41573a9fa1de05ce01a858e400f80e595b8) )
+	ROM_LOAD32_WORD("u11", 0x0000002, 0x0080000, CRC(bcbf9de9) SHA1(191ce749fe0d29b2783fb78d9338a00d65104daa) )
+	ROM_LOAD32_WORD("u12", 0x0100002, 0x0080000, CRC(b44cf571) SHA1(04447820e015425493cade5611b3eb2f21e48c2e) )
+	ROM_LOAD32_WORD("u7",  0x0000000, 0x0080000, CRC(845f9913) SHA1(df6121290b30ff4a9c2d0e690cf8e7797e9a8612) )
+	ROM_LOAD32_WORD("u8",  0x0100000, 0x0080000, CRC(a3a74ecb) SHA1(52b3a41573a9fa1de05ce01a858e400f80e595b8) )
 ROM_END_REGIONS
 
 
@@ -1888,12 +1889,12 @@ ROM_END_REGIONS
 ROM_START( chkmatar )
 	ARISTOCRAT_MK5_BIOS
 	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
-	ROM_LOAD32_WORD("U11.BIN", 0x0000002, 0x0080000, CRC(5fb7bfb3) SHA1(2ad8b3c4753d19f9e3254ef3f4059951d7a111b4) )
-	ROM_LOAD32_WORD("U12.BIN", 0x0100002, 0x0080000, CRC(b538bcbc) SHA1(cda404f9b16e7e76a33c208f62a5ac9c5e02aac4) )
-	ROM_LOAD32_WORD("U13.BIN", 0x0200002, 0x0080000, CRC(ad12a718) SHA1(0c36729cb8da800668f533f65fcc870f5dfc0f6a) )
-	ROM_LOAD32_WORD("U7.bin", 0x0000000, 0x0080000, CRC(059b940e) SHA1(f637508dafbd37169429c495a893addbc6d28834) )
-	ROM_LOAD32_WORD("U8.bin", 0x0100000, 0x0080000, CRC(6912cc4a) SHA1(9469a6a0d2fd39d85655a8c7bc0668752f5f11fa) )
-	ROM_LOAD32_WORD("U9.bin", 0x0200000, 0x0080000, CRC(53a573f0) SHA1(d51d698dcec273d157319200ad1c215e930b96ce) )
+	ROM_LOAD32_WORD("u11", 0x0000002, 0x0080000, CRC(5fb7bfb3) SHA1(2ad8b3c4753d19f9e3254ef3f4059951d7a111b4) )
+	ROM_LOAD32_WORD("u12", 0x0100002, 0x0080000, CRC(b538bcbc) SHA1(cda404f9b16e7e76a33c208f62a5ac9c5e02aac4) )
+	ROM_LOAD32_WORD("u13", 0x0200002, 0x0080000, CRC(ad12a718) SHA1(0c36729cb8da800668f533f65fcc870f5dfc0f6a) )
+	ROM_LOAD32_WORD("u7",  0x0000000, 0x0080000, CRC(059b940e) SHA1(f637508dafbd37169429c495a893addbc6d28834) )
+	ROM_LOAD32_WORD("u8",  0x0100000, 0x0080000, CRC(6912cc4a) SHA1(9469a6a0d2fd39d85655a8c7bc0668752f5f11fa) )
+	ROM_LOAD32_WORD("u9",  0x0200000, 0x0080000, CRC(53a573f0) SHA1(d51d698dcec273d157319200ad1c215e930b96ce) )
 ROM_END_REGIONS
 
 
@@ -1902,10 +1903,10 @@ ROM_END_REGIONS
 ROM_START( kgalah )
 	ARISTOCRAT_MK5_BIOS
 	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
-	ROM_LOAD32_WORD("U11.BIN", 0x0000002, 0x0080000, CRC(2b52a5e2) SHA1(0c852c6672a46f269f1407db0dd1825a51f242cc) )
-	ROM_LOAD32_WORD("U12.BIN", 0x0100002, 0x0080000, CRC(15d5bfb4) SHA1(7c48dabfd83cc30fe2ffd0b4de63fbc9dc56ee2f) )
-	ROM_LOAD32_WORD("U7.bin", 0x0000000, 0x0080000, CRC(9333543a) SHA1(dbbd59de046c35e70e71836b342eb5ecf4799575) )
-	ROM_LOAD32_WORD("U8.bin", 0x0100000, 0x0080000, CRC(08bea3b7) SHA1(9a5d8cf60c9643061dede926a04006a9a674fd8f) )
+	ROM_LOAD32_WORD("u11", 0x0000002, 0x0080000, CRC(2b52a5e2) SHA1(0c852c6672a46f269f1407db0dd1825a51f242cc) )
+	ROM_LOAD32_WORD("u12", 0x0100002, 0x0080000, CRC(15d5bfb4) SHA1(7c48dabfd83cc30fe2ffd0b4de63fbc9dc56ee2f) )
+	ROM_LOAD32_WORD("u7",  0x0000000, 0x0080000, CRC(9333543a) SHA1(dbbd59de046c35e70e71836b342eb5ecf4799575) )
+	ROM_LOAD32_WORD("u8",  0x0100000, 0x0080000, CRC(08bea3b7) SHA1(9a5d8cf60c9643061dede926a04006a9a674fd8f) )
 ROM_END_REGIONS
 
 
@@ -1916,10 +1917,10 @@ ROM_END_REGIONS
 ROM_START( qonilea )
 	ARISTOCRAT_MK5_BIOS
 	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
-	ROM_LOAD32_WORD("QUEENOFTHENILE_U11.BIN", 0x0000002, 0x0080000, CRC(ca4fe491) SHA1(2bd799f95c9a5afb7c96305bf56413ba864a26dd) )
-	ROM_LOAD32_WORD("QUEENOFTHENILE_U12.BIN", 0x0100002, 0x0080000, CRC(bdcec4eb) SHA1(ef3658460263cd2e68e10015efdc016ad705213e) )
-	ROM_LOAD32_WORD("QUEENOFTHENILE_U7.bin", 0x0000000, 0x0080000, CRC(f359afcf) SHA1(a8cbaea899f0108a179c58ec97241a57227afa79) )
-	ROM_LOAD32_WORD("QUEENOFTHENILE_U8.bin", 0x0100000, 0x0080000, CRC(80efde3a) SHA1(1fac1b150c5c8c52a4caaa01c4571a0e7033278d) )
+	ROM_LOAD32_WORD("QUEENOFTHENILE.u11", 0x0000002, 0x0080000, CRC(ca4fe491) SHA1(2bd799f95c9a5afb7c96305bf56413ba864a26dd) )
+	ROM_LOAD32_WORD("QUEENOFTHENILE.u12", 0x0100002, 0x0080000, CRC(bdcec4eb) SHA1(ef3658460263cd2e68e10015efdc016ad705213e) )
+	ROM_LOAD32_WORD("QUEENOFTHENILE.u7",  0x0000000, 0x0080000, CRC(f359afcf) SHA1(a8cbaea899f0108a179c58ec97241a57227afa79) )
+	ROM_LOAD32_WORD("QUEENOFTHENILE.u8",  0x0100000, 0x0080000, CRC(80efde3a) SHA1(1fac1b150c5c8c52a4caaa01c4571a0e7033278d) )
 ROM_END_REGIONS
 
 
@@ -1931,10 +1932,10 @@ ROM_END_REGIONS
 ROM_START( qonileb )
 	ARISTOCRAT_MK5_BIOS
 	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
-	ROM_LOAD32_WORD("U11.BIN", 0x0000002, 0x0080000, CRC(b5b76fb0) SHA1(40cb57e168f7884d64f6779e4e3b532c69df63b8) )
-	ROM_LOAD32_WORD("U12.BIN", 0x0100002, 0x0080000, CRC(52bd3694) SHA1(bcfa3054c7577f7a1653b756828d048a5f1776e7) )
-	ROM_LOAD32_WORD("U7.bin", 0x0000000, 0x0080000, CRC(0076da68) SHA1(ed301c102e88d5b637144ed32042da46780e5b34) )
-	ROM_LOAD32_WORD("U8.bin", 0x0100000, 0x0080000, CRC(a6b856a2) SHA1(2a9ea01f64fa56dea86b0cd25e19dace34c17d0f) )
+	ROM_LOAD32_WORD("u11", 0x0000002, 0x0080000, CRC(b5b76fb0) SHA1(40cb57e168f7884d64f6779e4e3b532c69df63b8) )
+	ROM_LOAD32_WORD("u12", 0x0100002, 0x0080000, CRC(52bd3694) SHA1(bcfa3054c7577f7a1653b756828d048a5f1776e7) )
+	ROM_LOAD32_WORD("u7",  0x0000000, 0x0080000, CRC(0076da68) SHA1(ed301c102e88d5b637144ed32042da46780e5b34) )
+	ROM_LOAD32_WORD("u8",  0x0100000, 0x0080000, CRC(a6b856a2) SHA1(2a9ea01f64fa56dea86b0cd25e19dace34c17d0f) )
 ROM_END_REGIONS
 
 
@@ -1942,14 +1943,14 @@ ROM_END_REGIONS
 ROM_START( rwarhl )
 	ARISTOCRAT_MK5_BIOS
 	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
-	ROM_LOAD32_WORD("U10.bin", 0x0300000, 0x0080000, CRC(39f5861f) SHA1(c614ebe2c324d5c3fff32379300f2869fba49d39) )
-	ROM_LOAD32_WORD("U11.BIN", 0x0000002, 0x0080000, CRC(4170c68d) SHA1(bc00af27bcc176f8d9c9fd0ec1a7139e28f85113) )
-	ROM_LOAD32_WORD("U12.BIN", 0x0100002, 0x0080000, CRC(b8afd281) SHA1(2d73b5af667d36e8b29e9fc3cc62f220daeffbb9) )
-	ROM_LOAD32_WORD("U13.BIN", 0x0200002, 0x0080000, CRC(36debb0e) SHA1(4aaa495f74dfb13aa1dc47f3a8af8e54496c1ab8) )
-	ROM_LOAD32_WORD("U14.bin", 0x0300002, 0x0080000, CRC(92274626) SHA1(fae8d89efba9bf3d171bfe484015d009786ce40d) )
-	ROM_LOAD32_WORD("U7.bin", 0x0000000, 0x0080000, CRC(68d9bf78) SHA1(6170ea26ebc732abbc26ba1da35a081c8aa8d154) )
-	ROM_LOAD32_WORD("U8.bin", 0x0100000, 0x0080000, CRC(98ebea6f) SHA1(2d78cec777581a87bb4b84e7acd183b237c83e52) )
-	ROM_LOAD32_WORD("U9.bin", 0x0200000, 0x0080000, CRC(eb7d7af6) SHA1(a11e8029b0d5ef9bb8c51fea4e9f0a051cdb2eaf) )
+	ROM_LOAD32_WORD("u10", 0x0300000, 0x0080000, CRC(39f5861f) SHA1(c614ebe2c324d5c3fff32379300f2869fba49d39) )
+	ROM_LOAD32_WORD("u11", 0x0000002, 0x0080000, CRC(4170c68d) SHA1(bc00af27bcc176f8d9c9fd0ec1a7139e28f85113) )
+	ROM_LOAD32_WORD("u12", 0x0100002, 0x0080000, CRC(b8afd281) SHA1(2d73b5af667d36e8b29e9fc3cc62f220daeffbb9) )
+	ROM_LOAD32_WORD("u13", 0x0200002, 0x0080000, CRC(36debb0e) SHA1(4aaa495f74dfb13aa1dc47f3a8af8e54496c1ab8) )
+	ROM_LOAD32_WORD("u14", 0x0300002, 0x0080000, CRC(92274626) SHA1(fae8d89efba9bf3d171bfe484015d009786ce40d) )
+	ROM_LOAD32_WORD("u7",  0x0000000, 0x0080000, CRC(68d9bf78) SHA1(6170ea26ebc732abbc26ba1da35a081c8aa8d154) )
+	ROM_LOAD32_WORD("u8",  0x0100000, 0x0080000, CRC(98ebea6f) SHA1(2d78cec777581a87bb4b84e7acd183b237c83e52) )
+	ROM_LOAD32_WORD("u9",  0x0200000, 0x0080000, CRC(eb7d7af6) SHA1(a11e8029b0d5ef9bb8c51fea4e9f0a051cdb2eaf) )
 ROM_END_REGIONS
 
 
@@ -1958,20 +1959,20 @@ ROM_END_REGIONS
 ROM_START( retrsam )
 	ARISTOCRAT_MK5_BIOS
 	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
-	ROM_LOAD32_WORD("U11.BIN", 0x0000002, 0x0080000, CRC(b91f5d4c) SHA1(8116166a759405b97797b4acb2cc3e139bd12de7) )
-	ROM_LOAD32_WORD("U12.BIN", 0x0100002, 0x0080000, CRC(fdf22d5b) SHA1(664fa003a350c0a3b515b7c384d32176158c2d3e) )
-	ROM_LOAD32_WORD("u7.bin", 0x0000000, 0x0080000, CRC(129be82c) SHA1(487639b7d42d6d35a9c48b44d26667c269b5b633) )
-	ROM_LOAD32_WORD("U8.bin", 0x0100000, 0x0080000, CRC(8d0e61a8) SHA1(254b106e71a0888b0456afd8d63006d72c0ba292) )
+	ROM_LOAD32_WORD("u11", 0x0000002, 0x0080000, CRC(b91f5d4c) SHA1(8116166a759405b97797b4acb2cc3e139bd12de7) )
+	ROM_LOAD32_WORD("u12", 0x0100002, 0x0080000, CRC(fdf22d5b) SHA1(664fa003a350c0a3b515b7c384d32176158c2d3e) )
+	ROM_LOAD32_WORD("u7",  0x0000000, 0x0080000, CRC(129be82c) SHA1(487639b7d42d6d35a9c48b44d26667c269b5b633) )
+	ROM_LOAD32_WORD("u8",  0x0100000, 0x0080000, CRC(8d0e61a8) SHA1(254b106e71a0888b0456afd8d63006d72c0ba292) )
 ROM_END_REGIONS
 
 
 ROM_START( unicornd )
 	ARISTOCRAT_MK5_BIOS
 	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
-	ROM_LOAD32_WORD("unicorndreaming_U11.BIN", 0x0000002, 0x0080000, CRC(b45885f1) SHA1(e32d4afce4e3e62a324173252f559909ea97fe3a) )
-	ROM_LOAD32_WORD("unicorndreaming_U12.BIN", 0x0100002, 0x0080000, CRC(14afdeda) SHA1(1eb2a297e903dc1a0683425b37669e0af4ae4218) )
-	ROM_LOAD32_WORD("unicorndreaming_u7.bin", 0x0000000, 0x0080000, CRC(d785d1b3) SHA1(4aa7c61036dd5fe1cdbc6c39a89881f88f3dd148) )
-	ROM_LOAD32_WORD("unicorndreaming_U8.bin", 0x0100000, 0x0080000, CRC(6ba8f7eb) SHA1(bd5b15e22e713095f580b4c371d39af4af9e3289) )
+	ROM_LOAD32_WORD("unicorndreaming.u11", 0x0000002, 0x0080000, CRC(b45885f1) SHA1(e32d4afce4e3e62a324173252f559909ea97fe3a) )
+	ROM_LOAD32_WORD("unicorndreaming.u12", 0x0100002, 0x0080000, CRC(14afdeda) SHA1(1eb2a297e903dc1a0683425b37669e0af4ae4218) )
+	ROM_LOAD32_WORD("unicorndreaming.u7", 0x0000000, 0x0080000, CRC(d785d1b3) SHA1(4aa7c61036dd5fe1cdbc6c39a89881f88f3dd148) )
+	ROM_LOAD32_WORD("unicorndreaming.u8", 0x0100000, 0x0080000, CRC(6ba8f7eb) SHA1(bd5b15e22e713095f580b4c371d39af4af9e3289) )
 ROM_END_REGIONS
 
 
@@ -1980,10 +1981,10 @@ ROM_END_REGIONS
 ROM_START( dolptra )
 	ARISTOCRAT_MK5_BIOS
 	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
-	ROM_LOAD32_WORD("Dolphin Treasure 90 U11.bin", 0x0000000, 0x0080000, CRC(8e391b67) SHA1(4b7a7295d3a96e26bf1958eb30af0b6582a5e5a6) )
-	ROM_LOAD32_WORD("Dolphin Treasure 90 U12.bin", 0x0000000, 0x0080000, CRC(1a1fbbcf) SHA1(6e3772dcccd9b5958bec3bfac9af22b2eabca32e) )
-	ROM_LOAD32_WORD("Dolphin Treasure 90 U7.bin", 0x0000000, 0x0080000, CRC(7463b5f6) SHA1(89e5cf8143d0b4ed54aa2c9bd8840f0aba19322e) )
-	ROM_LOAD32_WORD("Dolphin Treasure 90 U8.bin", 0x0000000, 0x0080000, CRC(195bec0f) SHA1(86bdc53e682476c2d90c5e51d4bccdc048d22e7f) )
+	ROM_LOAD32_WORD("Dolphin Treasure 90.u11", 0x0000002, 0x0080000, CRC(8e391b67) SHA1(4b7a7295d3a96e26bf1958eb30af0b6582a5e5a6) )
+	ROM_LOAD32_WORD("Dolphin Treasure 90.u12", 0x0100002, 0x0080000, CRC(1a1fbbcf) SHA1(6e3772dcccd9b5958bec3bfac9af22b2eabca32e) )
+	ROM_LOAD32_WORD("Dolphin Treasure 90.u7", 0x0000000, 0x0080000, CRC(7463b5f6) SHA1(89e5cf8143d0b4ed54aa2c9bd8840f0aba19322e) )
+	ROM_LOAD32_WORD("Dolphin Treasure 90.u8", 0x0100000, 0x0080000, CRC(195bec0f) SHA1(86bdc53e682476c2d90c5e51d4bccdc048d22e7f) )
 ROM_END_REGIONS
 
 
@@ -1992,10 +1993,10 @@ ROM_END_REGIONS
 ROM_START( penpay20 )
 	ARISTOCRAT_MK5_BIOS
 	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
-	ROM_LOAD32_WORD("Penguin Pays 20 lines U11.BIN", 0x0000000, 0x0080000, CRC(7dd73770) SHA1(14a2edf8cd33280464f979976486e1a9ae73cef5) )
-	ROM_LOAD32_WORD("Penguin Pays 20 lines U12.BIN", 0x0000000, 0x0080000, CRC(123cbe90) SHA1(b51b84f79e0822a1be71485bbad514ab9fa55622) )
-	ROM_LOAD32_WORD("Penguin Pays 20 lines U7.BIN", 0x0000000, 0x0080000, CRC(cb21de26) SHA1(5a730f08db4d91b18f0b5a1f489f1d982b08edcc) )
-	ROM_LOAD32_WORD("Penguin Pays 20 lines U8.BIN", 0x0000000, 0x0080000, CRC(aa95406b) SHA1(fbec024dd210757a79a5ea4def79f88fed971e71) )
+	ROM_LOAD32_WORD("Penguin Pays 20 lines.u11", 0x0000002, 0x0080000, CRC(7dd73770) SHA1(14a2edf8cd33280464f979976486e1a9ae73cef5) )
+	ROM_LOAD32_WORD("Penguin Pays 20 lines.u12", 0x0100002, 0x0080000, CRC(123cbe90) SHA1(b51b84f79e0822a1be71485bbad514ab9fa55622) )
+	ROM_LOAD32_WORD("Penguin Pays 20 lines.u7", 0x0000000, 0x0080000, CRC(cb21de26) SHA1(5a730f08db4d91b18f0b5a1f489f1d982b08edcc) )
+	ROM_LOAD32_WORD("Penguin Pays 20 lines.u8", 0x0100000, 0x0080000, CRC(aa95406b) SHA1(fbec024dd210757a79a5ea4def79f88fed971e71) )
 ROM_END_REGIONS
 
 
@@ -2003,22 +2004,22 @@ ROM_END_REGIONS
 ROM_START( penpaya )
 	ARISTOCRAT_MK5_BIOS
 	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
-	ROM_LOAD32_WORD("PPAYSEPROM_U11.bin", 0x0000000, 0x0080000, CRC(c0f20ef7) SHA1(4df3aa337a2d4dd8ef29f4839b003c96fe1df526) )
-	ROM_LOAD32_WORD("PPAYSEPROM_U12.bin", 0x0000000, 0x0080000, CRC(d2882682) SHA1(dd42edca8ef9d28dd5b16fe8132f8e0fb3c85979) )
-	ROM_LOAD32_WORD("PPAYSEPROM_U7.bin", 0x0000000, 0x0080000, CRC(f51c4e02) SHA1(fca30b3ce0d063966df1e878338596d050664695) )
-	ROM_LOAD32_WORD("PPAYSEPROM_U8.bin", 0x0000000, 0x0080000, CRC(23ea514d) SHA1(bcb83a8d768b078a03260a00fa09a4e2350c568c) )
+	ROM_LOAD32_WORD("PPAYSEPROM.u11", 0x0000002, 0x0080000, CRC(c0f20ef7) SHA1(4df3aa337a2d4dd8ef29f4839b003c96fe1df526) )
+	ROM_LOAD32_WORD("PPAYSEPROM.u12", 0x0100002, 0x0080000, CRC(d2882682) SHA1(dd42edca8ef9d28dd5b16fe8132f8e0fb3c85979) )
+	ROM_LOAD32_WORD("PPAYSEPROM.u7", 0x0000000, 0x0080000, CRC(f51c4e02) SHA1(fca30b3ce0d063966df1e878338596d050664695) )
+	ROM_LOAD32_WORD("PPAYSEPROM.u8", 0x0100000, 0x0080000, CRC(23ea514d) SHA1(bcb83a8d768b078a03260a00fa09a4e2350c568c) )
 ROM_END_REGIONS
 
 
 ROM_START( adonishl )
 	ARISTOCRAT_MK5_BIOS
 	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
-	ROM_LOAD32_WORD("U11.bin", 0x0000000, 0x0080000, CRC(309b0b55) SHA1(669568031d305b29395345a26a5d004d83881433) )
-	ROM_LOAD32_WORD("U12.bin", 0x0000000, 0x0080000, CRC(8b675dff) SHA1(275579d21be51e6ca01be7c57018e142d1d40875) )
-	ROM_LOAD32_WORD("U13.bin", 0x0000000, 0x0080000, CRC(e005a7e8) SHA1(cbb313f5d1d04c5a441b3f92b7a90a281ddb4885) )
-	ROM_LOAD32_WORD("U7.bin", 0x0000000, 0x0080000, CRC(32149323) SHA1(abfc6a8518a39528db3700c2cb558e925ceeda6d) )
-	ROM_LOAD32_WORD("U8.bin", 0x0000000, 0x0080000, CRC(e9185e3c) SHA1(99609a152a55246d0f5377f943deec47e68fb9fc) )
-	ROM_LOAD32_WORD("U9.bin", 0x0000000, 0x0080000, CRC(c2e973e7) SHA1(e89bdaa56b0c3c7bd77c8141421f76be9ff2e71b) )
+	ROM_LOAD32_WORD("u11", 0x0000002, 0x0080000, CRC(309b0b55) SHA1(669568031d305b29395345a26a5d004d83881433) )
+	ROM_LOAD32_WORD("u12", 0x0100002, 0x0080000, CRC(8b675dff) SHA1(275579d21be51e6ca01be7c57018e142d1d40875) )
+	ROM_LOAD32_WORD("u13", 0x0200002, 0x0080000, CRC(e005a7e8) SHA1(cbb313f5d1d04c5a441b3f92b7a90a281ddb4885) )
+	ROM_LOAD32_WORD("u7", 0x0000000, 0x0080000, CRC(32149323) SHA1(abfc6a8518a39528db3700c2cb558e925ceeda6d) )
+	ROM_LOAD32_WORD("u8", 0x0100000, 0x0080000, CRC(e9185e3c) SHA1(99609a152a55246d0f5377f943deec47e68fb9fc) )
+	ROM_LOAD32_WORD("u9", 0x0200000, 0x0080000, CRC(c2e973e7) SHA1(e89bdaa56b0c3c7bd77c8141421f76be9ff2e71b) )
 ROM_END_REGIONS
 
 
@@ -2026,14 +2027,14 @@ ROM_END_REGIONS
 ROM_START( goldphm )
 	ARISTOCRAT_MK5_BIOS
 	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
-	ROM_LOAD32_WORD("Golden Pyramid  Hyper Max U10.bin", 0x0000000, 0x0080000, CRC(8491dbc4) SHA1(f0d4e470f0774a6aac168334390c116fd3d1075e) )
-	ROM_LOAD32_WORD("Golden Pyramid  Hyper Max U11.bin", 0x0000000, 0x0080000, CRC(6ae3872f) SHA1(f8c1b31e4ebd4833dcc2b7cfff25f6473ad78f4e) )
-	ROM_LOAD32_WORD("Golden Pyramid  Hyper Max U12.bin", 0x0000000, 0x0080000, CRC(65cea496) SHA1(4b827e2707c259717bf759e76dca1c96efada926) )
-	ROM_LOAD32_WORD("Golden Pyramid  Hyper Max U13.bin", 0x0000000, 0x0080000, CRC(1b77bbd0) SHA1(c93d2f844032631d9594d02fa6ac41e21025a8ea) )
-	ROM_LOAD32_WORD("Golden Pyramid  Hyper Max U14.bin", 0x0000000, 0x0080000, CRC(4fbccf72) SHA1(97d6bb400caf78cb673a324d48d2580f1bbb1acd) )
-	ROM_LOAD32_WORD("Golden Pyramid  Hyper Max U7.bin", 0x0000000, 0x0080000, CRC(4ac2a82e) SHA1(3fc50e97ad48c57e21a37fbb6142152c72055ad4) )
-	ROM_LOAD32_WORD("Golden Pyramid  Hyper Max U8.bin", 0x0000000, 0x0080000, CRC(abbbf1de) SHA1(5efd88213180846ad8347e017e5ccee5b80b95d0) )
-	ROM_LOAD32_WORD("Golden Pyramid  Hyper Max U9.bin", 0x0000000, 0x0080000, CRC(750150eb) SHA1(a9ffe0b0bb2ef83a696fa568b0264d27bc650120) )
+	ROM_LOAD32_WORD("Golden Pyramid  Hyper Max.u10", 0x0300000, 0x0080000, CRC(8491dbc4) SHA1(f0d4e470f0774a6aac168334390c116fd3d1075e) )
+	ROM_LOAD32_WORD("Golden Pyramid  Hyper Max.u11", 0x0000002, 0x0080000, CRC(6ae3872f) SHA1(f8c1b31e4ebd4833dcc2b7cfff25f6473ad78f4e) )
+	ROM_LOAD32_WORD("Golden Pyramid  Hyper Max.u12", 0x0100002, 0x0080000, CRC(65cea496) SHA1(4b827e2707c259717bf759e76dca1c96efada926) )
+	ROM_LOAD32_WORD("Golden Pyramid  Hyper Max.u13", 0x0200002, 0x0080000, CRC(1b77bbd0) SHA1(c93d2f844032631d9594d02fa6ac41e21025a8ea) )
+	ROM_LOAD32_WORD("Golden Pyramid  Hyper Max.u14", 0x0300002, 0x0080000, CRC(4fbccf72) SHA1(97d6bb400caf78cb673a324d48d2580f1bbb1acd) )
+	ROM_LOAD32_WORD("Golden Pyramid  Hyper Max.u7", 0x0000000, 0x0080000, CRC(4ac2a82e) SHA1(3fc50e97ad48c57e21a37fbb6142152c72055ad4) )
+	ROM_LOAD32_WORD("Golden Pyramid  Hyper Max.u8", 0x0100000, 0x0080000, CRC(abbbf1de) SHA1(5efd88213180846ad8347e017e5ccee5b80b95d0) )
+	ROM_LOAD32_WORD("Golden Pyramid  Hyper Max.u9", 0x0200000, 0x0080000, CRC(750150eb) SHA1(a9ffe0b0bb2ef83a696fa568b0264d27bc650120) )
 ROM_END_REGIONS
 
 
@@ -2042,10 +2043,10 @@ ROM_END_REGIONS
 ROM_START( petshopa )
 	ARISTOCRAT_MK5_BIOS
 	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
-	ROM_LOAD32_WORD("Pet Shop  U11.bin", 0x0000000, 0x007fffd, CRC(bfaa9216) SHA1(19f1c7de05ff7f5f9f370be00cf8f0635e966809) ) // wrong size!
-	ROM_LOAD32_WORD("Pet Shop  U12.bin", 0x0000000, 0x0080000, CRC(2cd12986) SHA1(b6b0bd6dd8c964498edc3763cb5c450795042a8d) )
-	ROM_LOAD32_WORD("Pet Shop  U7.bin", 0x0000000, 0x0080000, CRC(cf4a24fa) SHA1(b510de9199d16ba7319e1b692d7c6c09fcb735dc) )
-	ROM_LOAD32_WORD("Pet Shop  U8.bin", 0x0000000, 0x0080000, CRC(bb9f7519) SHA1(fa311f1ec74c3b52e2feed36d7b7dc6a12336abe) )
+	ROM_LOAD32_WORD("Pet Shop.u11", 0x0000002, 0x007fffd, CRC(bfaa9216) SHA1(19f1c7de05ff7f5f9f370be00cf8f0635e966809) ) // wrong size!
+	ROM_LOAD32_WORD("Pet Shop.u12", 0x0100002, 0x0080000, CRC(2cd12986) SHA1(b6b0bd6dd8c964498edc3763cb5c450795042a8d) )
+	ROM_LOAD32_WORD("Pet Shop.u7", 0x0000000, 0x0080000, CRC(cf4a24fa) SHA1(b510de9199d16ba7319e1b692d7c6c09fcb735dc) )
+	ROM_LOAD32_WORD("Pet Shop.u8", 0x0100000, 0x0080000, CRC(bb9f7519) SHA1(fa311f1ec74c3b52e2feed36d7b7dc6a12336abe) )
 ROM_END_REGIONS
 
 
@@ -2054,8 +2055,8 @@ ROM_END_REGIONS
 ROM_START( retsam20 )
 	ARISTOCRAT_MK5_BIOS
 	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
-	ROM_LOAD32_WORD("Return of The Samura  U11.bin", 0x0000000, 0x0080000, CRC(e662404b) SHA1(f0da3384c81d01ec17d24b2191d3a0b0eaf48d12) )
-	ROM_LOAD32_WORD("Return of The Samura  U7.bin", 0x0000000, 0x0080000, CRC(e60859a1) SHA1(0be0114a87a21b955dfe24d01547e2d93dcb4f2c) )
+	ROM_LOAD32_WORD("Return of The Samura.u11", 0x0000002, 0x0080000, CRC(e662404b) SHA1(f0da3384c81d01ec17d24b2191d3a0b0eaf48d12) )
+	ROM_LOAD32_WORD("Return of The Samura.u7", 0x0000000, 0x0080000, CRC(e60859a1) SHA1(0be0114a87a21b955dfe24d01547e2d93dcb4f2c) )
 ROM_END_REGIONS
 
 
@@ -2063,8 +2064,8 @@ ROM_END_REGIONS
 ROM_START( retsam5 )
 	ARISTOCRAT_MK5_BIOS
 	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
-	ROM_LOAD32_WORD("Return of The Samura 9 U11.bin", 0x0000000, 0x0080000, CRC(99f61822) SHA1(88a726a5c9cae3a7d3120cb9013ca4d38ef8c560) )
-	ROM_LOAD32_WORD("Return of The Samura 9 U7.bin", 0x0000000, 0x0080000, CRC(acb913c1) SHA1(eb008b2b3d06f769f1ea1c75b52334e468c5f13c) )
+	ROM_LOAD32_WORD("Return of The Samura 9.u11", 0x0000002, 0x0080000, CRC(99f61822) SHA1(88a726a5c9cae3a7d3120cb9013ca4d38ef8c560) )
+	ROM_LOAD32_WORD("Return of The Samura 9.u7", 0x0000000, 0x0080000, CRC(acb913c1) SHA1(eb008b2b3d06f769f1ea1c75b52334e468c5f13c) )
 ROM_END_REGIONS
 
 
@@ -2075,10 +2076,10 @@ ROM_END_REGIONS
 ROM_START( supbuk2 )
 	ARISTOCRAT_MK5_BIOS
 	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
-	ROM_LOAD32_WORD("Super Bucks 2 U11.bin", 0x0000000, 0x0080000, CRC(f1b51a61) SHA1(8e9fcb071f704122e13333094828a41974646792) )
-	ROM_LOAD32_WORD("Super Bucks 2 U12.bin", 0x0000000, 0x0080000, CRC(f9b65d2b) SHA1(f519fc284aaa08d3619e4d88e92e690320cf5432) )
-	ROM_LOAD32_WORD("Super Bucks 2 U7.bin", 0x0000000, 0x0080000, CRC(f025775d) SHA1(71a94f6f17fa7cdcd997b0117b8f4afe21606a69) )
-	ROM_LOAD32_WORD("Super bucks 2 U8.bin", 0x0000000, 0x0080000, CRC(03912f4e) SHA1(48bdcd2160e05261b7d834c53e1d483acaad098f) )
+	ROM_LOAD32_WORD("Super Bucks 2.u11", 0x0000002, 0x0080000, CRC(f1b51a61) SHA1(8e9fcb071f704122e13333094828a41974646792) )
+	ROM_LOAD32_WORD("Super Bucks 2.u12", 0x0100002, 0x0080000, CRC(f9b65d2b) SHA1(f519fc284aaa08d3619e4d88e92e690320cf5432) )
+	ROM_LOAD32_WORD("Super Bucks 2.u7", 0x0000000, 0x0080000, CRC(f025775d) SHA1(71a94f6f17fa7cdcd997b0117b8f4afe21606a69) )
+	ROM_LOAD32_WORD("Super bucks 2.u8", 0x0100000, 0x0080000, CRC(03912f4e) SHA1(48bdcd2160e05261b7d834c53e1d483acaad098f) )
 ROM_END_REGIONS
 
 
@@ -2088,8 +2089,8 @@ ROM_END_REGIONS
 ROM_START( topbana )
 	ARISTOCRAT_MK5_BIOS
 	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
-	ROM_LOAD32_WORD("Top Banana U11.bin", 0x0000000, 0x007fffa, CRC(140a73bc) SHA1(3fd88797b6310f5849e901d032fbeb8a2d8604fb) )
-	ROM_LOAD32_WORD("Top Banana U7.bin", 0x0000000, 0x0080000, CRC(1f60241c) SHA1(3a6207d9c919319fc10b6de63bc030f8d335588e) )
+	ROM_LOAD32_WORD("Top Banana.u11", 0x0000002, 0x007fffa, CRC(140a73bc) SHA1(3fd88797b6310f5849e901d032fbeb8a2d8604fb) )
+	ROM_LOAD32_WORD("Top Banana.u7", 0x0000000, 0x0080000, CRC(1f60241c) SHA1(3a6207d9c919319fc10b6de63bc030f8d335588e) )
 ROM_END_REGIONS
 
 
@@ -2097,10 +2098,10 @@ ROM_END_REGIONS
 ROM_START( wldamz1 )
 	ARISTOCRAT_MK5_BIOS
 	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
-	ROM_LOAD32_WORD("Wild Amazon  U11.bin", 0x0000000, 0x0080000, CRC(54b2a375) SHA1(635fde5c678b908fa58c0e04ba9b7a84fac1f7fe) )
-	ROM_LOAD32_WORD("Wild Amazon  U7.bin", 0x0000000, 0x0080000, CRC(bfa21358) SHA1(6b76656401b3dbbace8d4335951468b9885fc7f0) )
-	ROM_LOAD32_WORD("Wild Amazon  U8.bin", 0x0000000, 0x0080000, CRC(4e39f128) SHA1(91d3c6a9e5c30275c3f8967dde55214df097f2ba) )
-	ROM_LOAD32_WORD("Wild Amazon U12.bin", 0x0000000, 0x0080000, CRC(2cd12986) SHA1(b6b0bd6dd8c964498edc3763cb5c450795042a8d) )
+	ROM_LOAD32_WORD("Wild Amazon.u11", 0x0000002, 0x0080000, CRC(54b2a375) SHA1(635fde5c678b908fa58c0e04ba9b7a84fac1f7fe) )
+	ROM_LOAD32_WORD("Wild Amazon.u7",  0x0000000, 0x0080000, CRC(bfa21358) SHA1(6b76656401b3dbbace8d4335951468b9885fc7f0) )
+	ROM_LOAD32_WORD("Wild Amazon.u8",  0x0100000, 0x0080000, CRC(4e39f128) SHA1(91d3c6a9e5c30275c3f8967dde55214df097f2ba) )
+	ROM_LOAD32_WORD("Wild Amazon.u12", 0x0100002, 0x0080000, CRC(2cd12986) SHA1(b6b0bd6dd8c964498edc3763cb5c450795042a8d) )
 ROM_END_REGIONS
 
 
@@ -2108,8 +2109,8 @@ ROM_END_REGIONS
 ROM_START( wldamz3 )
 	ARISTOCRAT_MK5_BIOS
 	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
-	ROM_LOAD32_WORD("Wild Amazon U11.bin", 0x0000000, 0x0080000, CRC(2e24756a) SHA1(247db8316e7815be7524aefc43a5756fad84779a) )
-	ROM_LOAD32_WORD("Wild Amazon U7.bin", 0x0000000, 0x0080000, CRC(44576def) SHA1(3396460444ceb394c9c88e5fc37ccedcfc4b179c) )
+	ROM_LOAD32_WORD("Wild Amazon.u11", 0x0000002, 0x0080000, CRC(2e24756a) SHA1(247db8316e7815be7524aefc43a5756fad84779a) )
+	ROM_LOAD32_WORD("Wild Amazon.u7", 0x0000000, 0x0080000, CRC(44576def) SHA1(3396460444ceb394c9c88e5fc37ccedcfc4b179c) )
 ROM_END_REGIONS
 
 
@@ -2118,10 +2119,10 @@ ROM_END_REGIONS
 ROM_START( wldthg )
 	ARISTOCRAT_MK5_BIOS
 	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
-	ROM_LOAD32_WORD("WILDTHING_U11.bin", 0x0000000, 0x0080000, CRC(61d22f2e) SHA1(b836e5afbd5bb14ae68e100a6042f1953ed57a21) )
-	ROM_LOAD32_WORD("WILDTHING_U12.bin", 0x0000000, 0x0080000, CRC(450a4f4f) SHA1(e59fb3260755a125c47ff6c1a042a48b0eace72d) )
-	ROM_LOAD32_WORD("WILDTHING_U7.bin", 0x0000000, 0x0080000, CRC(eb402ffb) SHA1(49ef6ca2503a6e785f62cb29e505e5c2ba019e37) )
-	ROM_LOAD32_WORD("WILDTHING_U8.bin", 0x0000000, 0x0080000, CRC(f21153b8) SHA1(24830b3939a8568b0d5b59d4fdbd2d9e7b46a6d7) )
+	ROM_LOAD32_WORD("WILDTHING.u11", 0x0000002, 0x0080000, CRC(61d22f2e) SHA1(b836e5afbd5bb14ae68e100a6042f1953ed57a21) )
+	ROM_LOAD32_WORD("WILDTHING.u12", 0x0100002, 0x0080000, CRC(450a4f4f) SHA1(e59fb3260755a125c47ff6c1a042a48b0eace72d) )
+	ROM_LOAD32_WORD("WILDTHING.u7", 0x0000000, 0x0080000, CRC(eb402ffb) SHA1(49ef6ca2503a6e785f62cb29e505e5c2ba019e37) )
+	ROM_LOAD32_WORD("WILDTHING.u8", 0x0100000, 0x0080000, CRC(f21153b8) SHA1(24830b3939a8568b0d5b59d4fdbd2d9e7b46a6d7) )
 ROM_END_REGIONS
 
 
@@ -2129,10 +2130,10 @@ ROM_END_REGIONS
 ROM_START( cshcat )
 	ARISTOCRAT_MK5_BIOS
 	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
-	ROM_LOAD32_WORD("Cash Cat NZ_U11.bin", 0x0000000, 0x0080000, CRC(e60e8bd1) SHA1(ffaa7be8968047b9ee54a117d273a14cbca41028) )
-	ROM_LOAD32_WORD("Cash Cat NZ_U12.bin", 0x0000000, 0x0080000, CRC(f930fc07) SHA1(cb3fdbd5b87af7b14067f7999740470d3cf434df) )
-	ROM_LOAD32_WORD("Cash Cat NZ_U7.bin", 0x0000000, 0x0080000, CRC(de0f0202) SHA1(994f6c47b1e2e0e133853dc69b189752104486e4) )
-	ROM_LOAD32_WORD("Cash Cat NZ_U8.bin", 0x0000000, 0x0080000, CRC(37d41d35) SHA1(c959b787383d6f91d20e18f37a38a965407a9ff0) )
+	ROM_LOAD32_WORD("Cash Cat NZ.u11", 0x0000002, 0x0080000, CRC(e60e8bd1) SHA1(ffaa7be8968047b9ee54a117d273a14cbca41028) )
+	ROM_LOAD32_WORD("Cash Cat NZ.u12", 0x0100002, 0x0080000, CRC(f930fc07) SHA1(cb3fdbd5b87af7b14067f7999740470d3cf434df) )
+	ROM_LOAD32_WORD("Cash Cat NZ.u7", 0x0000000, 0x0080000, CRC(de0f0202) SHA1(994f6c47b1e2e0e133853dc69b189752104486e4) )
+	ROM_LOAD32_WORD("Cash Cat NZ.u8", 0x0100000, 0x0080000, CRC(37d41d35) SHA1(c959b787383d6f91d20e18f37a38a965407a9ff0) )
 ROM_END_REGIONS
 
 
@@ -2141,12 +2142,12 @@ ROM_END_REGIONS
 ROM_START( incanz )
 	ARISTOCRAT_MK5_BIOS
 	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
-	ROM_LOAD32_WORD("INCASUN NZ_U11.bin", 0x0000000, 0x0080000, CRC(2ff86b76) SHA1(c491ca19320bd3e15199b3ca1fcf36a70e386daa) )
-	ROM_LOAD32_WORD("INCASUN NZ_U12.bin", 0x0000000, 0x0080000, CRC(d91114c5) SHA1(fa88c70d81ff5e4df539b873803376e79eb6a479) )
-	ROM_LOAD32_WORD("INCASUN NZ_U13.bin", 0x0000000, 0x0080000, CRC(472f4097) SHA1(5ebe72b138cdc67989db17c82979eeddc60a081e) )
-	ROM_LOAD32_WORD("INCASUN NZ_U7.bin", 0x0000000, 0x0080000, CRC(1e7be5ca) SHA1(333b7665fab8f60fb60e9d3b44de96725763ca17) )
-	ROM_LOAD32_WORD("INCASUN NZ_U8.bin", 0x0000000, 0x0080000, CRC(3eb64fc9) SHA1(31f7d56443091da211c45dddb97375305c3cfeae) )
-	ROM_LOAD32_WORD("INCASUN NZ_U9.bin", 0x0000000, 0x0080000, CRC(6da340db) SHA1(4d7528aa27561185a7d53a0c44a4e95e40aadc26) )
+	ROM_LOAD32_WORD("INCASUN NZ.u11", 0x0000002, 0x0080000, CRC(2ff86b76) SHA1(c491ca19320bd3e15199b3ca1fcf36a70e386daa) )
+	ROM_LOAD32_WORD("INCASUN NZ.u12", 0x0100002, 0x0080000, CRC(d91114c5) SHA1(fa88c70d81ff5e4df539b873803376e79eb6a479) )
+	ROM_LOAD32_WORD("INCASUN NZ.u13", 0x0200002, 0x0080000, CRC(472f4097) SHA1(5ebe72b138cdc67989db17c82979eeddc60a081e) )
+	ROM_LOAD32_WORD("INCASUN NZ.u7", 0x0000000, 0x0080000, CRC(1e7be5ca) SHA1(333b7665fab8f60fb60e9d3b44de96725763ca17) )
+	ROM_LOAD32_WORD("INCASUN NZ.u8", 0x0100000, 0x0080000, CRC(3eb64fc9) SHA1(31f7d56443091da211c45dddb97375305c3cfeae) )
+	ROM_LOAD32_WORD("INCASUN NZ.u9", 0x0200000, 0x0080000, CRC(6da340db) SHA1(4d7528aa27561185a7d53a0c44a4e95e40aadc26) )
 ROM_END_REGIONS
 
 
@@ -2154,10 +2155,10 @@ ROM_END_REGIONS
 ROM_START( loconz )
 	ARISTOCRAT_MK5_BIOS
 	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
-	ROM_LOAD32_WORD("Loco Loot NZ_U11.bin", 0x0000000, 0x0080000, CRC(93b0bde3) SHA1(06cb79482f8a94e1a504eead9cdf6da41cba1fb9) )
-	ROM_LOAD32_WORD("Loco Loot NZ_U12.bin", 0x0000000, 0x0080000, CRC(29f03505) SHA1(c173167f43cc2eef0e063118e03bc37a87188391) )
-	ROM_LOAD32_WORD("Loco Loot NZ_U7.bin", 0x0000000, 0x0080000, CRC(164dd049) SHA1(c99c56af72cb1eb69591cb8f7bacbd06bdb6494d) )
-	ROM_LOAD32_WORD("Loco Loot NZ_U8.bin", 0x0000000, 0x0080000, CRC(8cb449ce) SHA1(2372cf126c2c95d9637b0a761dfc7ea223f0aa54) )
+	ROM_LOAD32_WORD("Loco Loot NZ.u11", 0x0000002, 0x0080000, CRC(93b0bde3) SHA1(06cb79482f8a94e1a504eead9cdf6da41cba1fb9) )
+	ROM_LOAD32_WORD("Loco Loot NZ.u12", 0x0100002, 0x0080000, CRC(29f03505) SHA1(c173167f43cc2eef0e063118e03bc37a87188391) )
+	ROM_LOAD32_WORD("Loco Loot NZ.u7", 0x0000000, 0x0080000, CRC(164dd049) SHA1(c99c56af72cb1eb69591cb8f7bacbd06bdb6494d) )
+	ROM_LOAD32_WORD("Loco Loot NZ.u8", 0x0100000, 0x0080000, CRC(8cb449ce) SHA1(2372cf126c2c95d9637b0a761dfc7ea223f0aa54) )
 ROM_END_REGIONS
 
 
@@ -2166,12 +2167,12 @@ ROM_END_REGIONS
 ROM_START( mtreenz )
 	ARISTOCRAT_MK5_BIOS
 	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )	
-	ROM_LOAD32_WORD("MONEYTREE NZ_U11.bin", 0x0000000, 0x0080000, CRC(7a03e436) SHA1(016e6e36f7ca6f4c3b427cf98a1415ef6aa57225) )
-	ROM_LOAD32_WORD("MONEYTREE NZ_U12.bin", 0x0000000, 0x0080000, CRC(b11f51d0) SHA1(1579a24d470f418713334259368c7a4e35e8b5d3) )
-	ROM_LOAD32_WORD("MONEYTREE NZ_U13.bin", 0x0000000, 0x0080000, CRC(e1f23c3f) SHA1(fe74c219c738625257fb62806e271a60075aaa07) )
-	ROM_LOAD32_WORD("MONEYTREE NZ_U7.bin", 0x0000000, 0x0080000, CRC(982a0078) SHA1(163c15aebd2be623c0f2c7641360336399bc1f4f) )
-	ROM_LOAD32_WORD("MONEYTREE NZ_U8.bin", 0x0000000, 0x0080000, CRC(878b6419) SHA1(572d6a10cbf2b96e9afee4b3f32e9ad1ce7eabbb) )
-	ROM_LOAD32_WORD("MONEYTREE NZ_U9.bin", 0x0000000, 0x0080000, CRC(816fda3f) SHA1(d5eb7572a93e2a4681a2b1db7f302c5528f1c1c3) )
+	ROM_LOAD32_WORD("MONEYTREE NZ.u11", 0x0000002, 0x0080000, CRC(7a03e436) SHA1(016e6e36f7ca6f4c3b427cf98a1415ef6aa57225) )
+	ROM_LOAD32_WORD("MONEYTREE NZ.u12", 0x0100002, 0x0080000, CRC(b11f51d0) SHA1(1579a24d470f418713334259368c7a4e35e8b5d3) )
+	ROM_LOAD32_WORD("MONEYTREE NZ.u13", 0x0200002, 0x0080000, CRC(e1f23c3f) SHA1(fe74c219c738625257fb62806e271a60075aaa07) )
+	ROM_LOAD32_WORD("MONEYTREE NZ.u7", 0x0000000, 0x0080000, CRC(982a0078) SHA1(163c15aebd2be623c0f2c7641360336399bc1f4f) )
+	ROM_LOAD32_WORD("MONEYTREE NZ.u8", 0x0100000, 0x0080000, CRC(878b6419) SHA1(572d6a10cbf2b96e9afee4b3f32e9ad1ce7eabbb) )
+	ROM_LOAD32_WORD("MONEYTREE NZ.u9", 0x0200000, 0x0080000, CRC(816fda3f) SHA1(d5eb7572a93e2a4681a2b1db7f302c5528f1c1c3) )
 ROM_END_REGIONS
 
 

From a1308eee291efd7017c95df63650fba1215433b4 Mon Sep 17 00:00:00 2001
From: David Haywood <mamehaze@users.noreply.github.com>
Date: Tue, 19 Apr 2016 14:29:19 +0100
Subject: [PATCH 093/122] (nw)

---
 src/mame/drivers/aristmk5.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/mame/drivers/aristmk5.cpp b/src/mame/drivers/aristmk5.cpp
index e2eb7e43ce4..c27330a9be6 100644
--- a/src/mame/drivers/aristmk5.cpp
+++ b/src/mame/drivers/aristmk5.cpp
@@ -1348,7 +1348,7 @@ ROM_START( badbog )
 	ROM_LOAD32_WORD("Bad_Bog_2of6.u11", 0x0000002, 0x0080000, CRC(774ff977) SHA1(5ce1aa8b7598b4bc8e5fa44de1c03b5f2851f5de) )
 	ROM_LOAD32_WORD("Bad_Bog_3of6.u8",  0x0100000, 0x0080000, CRC(e52a279a) SHA1(4a3a080d840d8a894ec0ba0250a566831377f0f8) )
 	ROM_LOAD32_WORD("Bad_Bog_4of6.u12", 0x0100002, 0x0080000, CRC(562aa123) SHA1(825a2d23321b636a3ff2565b2b72df3b97bd0ec8) )
-	ROM_LOAD32_WORD("Bad_Bog_5of6.u09", 0x0200000, 0x0080000, CRC(66d5a7f7) SHA1(1a1f845a97677c43ff1090231434ae9d3d36ab4c) )
+	ROM_LOAD32_WORD("Bad_Bog_5of6.u9",  0x0200000, 0x0080000, CRC(66d5a7f7) SHA1(1a1f845a97677c43ff1090231434ae9d3d36ab4c) )
 	ROM_LOAD32_WORD("Bad_Bog_6of6.u13", 0x0200002, 0x0080000, CRC(883b2ec3) SHA1(5b431d8c9c8eabca65ab22dcf2bdb22d49445bb1) )
 ROM_END_REGIONS
 
@@ -1585,7 +1585,7 @@ ROM_START( goldra )
 	ROM_LOAD32_WORD("Golden_Ra_2of6.u11", 0x0000002, 0x0080000, CRC(06a871c7) SHA1(95464d74c2295196e367e34efb816acedcd71265) )
 	ROM_LOAD32_WORD("Golden_Ra_3of6.u8",  0x0100000, 0x0080000, CRC(940eabd7) SHA1(8d41b3fa27c827a7671b095618ac53750e6017f6) )
 	ROM_LOAD32_WORD("Golden_Ra_4of6.u12", 0x0100002, 0x0080000, CRC(21c4a2d2) SHA1(77a24a5f98aad090223d301919645b5011667c28) )
-	ROM_LOAD32_WORD("Golden_Ra_5of6.u09", 0x0200000, 0x0080000, CRC(b1cac0e7) SHA1(87f393a75c09e96a7fb893a767edcc81044e4fe3) )
+	ROM_LOAD32_WORD("Golden_Ra_5of6.u9",  0x0200000, 0x0080000, CRC(b1cac0e7) SHA1(87f393a75c09e96a7fb893a767edcc81044e4fe3) )
 	ROM_LOAD32_WORD("Golden_Ra_6of6.u13", 0x0200002, 0x0080000, CRC(8f62ccc5) SHA1(5105313192ab8dfd522b921c70b8b03a8a61ac63) )
 ROM_END_REGIONS
 

From 0c7817e7dcc5a6abf0bb4e9e067f160b9d98cd7f Mon Sep 17 00:00:00 2001
From: David Haywood <mamehaze@users.noreply.github.com>
Date: Tue, 19 Apr 2016 14:48:59 +0100
Subject: [PATCH 094/122] mark bad dumps (nw)

---
 src/mame/drivers/aristmk5.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/mame/drivers/aristmk5.cpp b/src/mame/drivers/aristmk5.cpp
index c27330a9be6..2719c76eee3 100644
--- a/src/mame/drivers/aristmk5.cpp
+++ b/src/mame/drivers/aristmk5.cpp
@@ -2043,7 +2043,7 @@ ROM_END_REGIONS
 ROM_START( petshopa )
 	ARISTOCRAT_MK5_BIOS
 	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
-	ROM_LOAD32_WORD("Pet Shop.u11", 0x0000002, 0x007fffd, CRC(bfaa9216) SHA1(19f1c7de05ff7f5f9f370be00cf8f0635e966809) ) // wrong size!
+	ROM_LOAD32_WORD("Pet Shop.u11", 0x0000002, 0x007fffd, BAD_DUMP CRC(bfaa9216) SHA1(19f1c7de05ff7f5f9f370be00cf8f0635e966809) ) // wrong size!
 	ROM_LOAD32_WORD("Pet Shop.u12", 0x0100002, 0x0080000, CRC(2cd12986) SHA1(b6b0bd6dd8c964498edc3763cb5c450795042a8d) )
 	ROM_LOAD32_WORD("Pet Shop.u7", 0x0000000, 0x0080000, CRC(cf4a24fa) SHA1(b510de9199d16ba7319e1b692d7c6c09fcb735dc) )
 	ROM_LOAD32_WORD("Pet Shop.u8", 0x0100000, 0x0080000, CRC(bb9f7519) SHA1(fa311f1ec74c3b52e2feed36d7b7dc6a12336abe) )
@@ -2089,7 +2089,7 @@ ROM_END_REGIONS
 ROM_START( topbana )
 	ARISTOCRAT_MK5_BIOS
 	ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
-	ROM_LOAD32_WORD("Top Banana.u11", 0x0000002, 0x007fffa, CRC(140a73bc) SHA1(3fd88797b6310f5849e901d032fbeb8a2d8604fb) )
+	ROM_LOAD32_WORD("Top Banana.u11", 0x0000002, 0x007fffa, BAD_DUMP CRC(140a73bc) SHA1(3fd88797b6310f5849e901d032fbeb8a2d8604fb) )
 	ROM_LOAD32_WORD("Top Banana.u7", 0x0000000, 0x0080000, CRC(1f60241c) SHA1(3a6207d9c919319fc10b6de63bc030f8d335588e) )
 ROM_END_REGIONS
 

From f8034ac81238c8637c149dc40efdc4c42dda9545 Mon Sep 17 00:00:00 2001
From: "therealmogminer@gmail.com" <therealmogminer@gmail.com>
Date: Tue, 19 Apr 2016 16:29:30 +0200
Subject: [PATCH 095/122] bgfx: Added SuperEagle shader. [Ryan Holtz]

---
 bgfx/chains/supereagle.json                   |  44 +++++
 bgfx/effects/supereagle/blit.json             | 121 +++++++++++++
 bgfx/effects/supereagle/supereagle.json       |  35 ++++
 .../dx11/chains/supereagle/fs_blit.bin        | Bin 0 -> 396 bytes
 .../dx11/chains/supereagle/fs_eagle.bin       | Bin 0 -> 5882 bytes
 .../dx11/chains/supereagle/vs_blit.bin        | Bin 0 -> 575 bytes
 .../dx11/chains/supereagle/vs_eagle.bin       | Bin 0 -> 1713 bytes
 .../shaders/dx9/chains/supereagle/fs_blit.bin | Bin 0 -> 241 bytes
 .../dx9/chains/supereagle/fs_eagle.bin        | Bin 0 -> 3139 bytes
 .../shaders/dx9/chains/supereagle/vs_blit.bin | Bin 0 -> 330 bytes
 .../dx9/chains/supereagle/vs_eagle.bin        | Bin 0 -> 908 bytes
 .../gles/chains/supereagle/fs_blit.bin        | Bin 0 -> 232 bytes
 .../gles/chains/supereagle/fs_eagle.bin       | Bin 0 -> 6946 bytes
 .../gles/chains/supereagle/vs_blit.bin        | Bin 0 -> 413 bytes
 .../gles/chains/supereagle/vs_eagle.bin       | Bin 0 -> 2441 bytes
 .../glsl/chains/supereagle/fs_blit.bin        | Bin 0 -> 175 bytes
 .../glsl/chains/supereagle/fs_eagle.bin       | Bin 0 -> 6668 bytes
 .../glsl/chains/supereagle/vs_blit.bin        | Bin 0 -> 371 bytes
 .../glsl/chains/supereagle/vs_eagle.bin       | Bin 0 -> 2249 bytes
 .../metal/chains/supereagle/fs_blit.bin       | Bin 0 -> 628 bytes
 .../metal/chains/supereagle/fs_eagle.bin      | Bin 0 -> 8024 bytes
 .../metal/chains/supereagle/vs_blit.bin       | Bin 0 -> 751 bytes
 .../metal/chains/supereagle/vs_eagle.bin      | Bin 0 -> 2820 bytes
 .../bgfx/shaders/chains/supereagle/fs_blit.sc |  14 ++
 .../shaders/chains/supereagle/fs_eagle.sc     | 165 ++++++++++++++++++
 .../shaders/chains/supereagle/varying.def.sc  |  14 ++
 .../bgfx/shaders/chains/supereagle/vs_blit.sc |  14 ++
 .../shaders/chains/supereagle/vs_eagle.sc     |  43 +++++
 28 files changed, 450 insertions(+)
 create mode 100644 bgfx/chains/supereagle.json
 create mode 100644 bgfx/effects/supereagle/blit.json
 create mode 100644 bgfx/effects/supereagle/supereagle.json
 create mode 100644 bgfx/shaders/dx11/chains/supereagle/fs_blit.bin
 create mode 100644 bgfx/shaders/dx11/chains/supereagle/fs_eagle.bin
 create mode 100644 bgfx/shaders/dx11/chains/supereagle/vs_blit.bin
 create mode 100644 bgfx/shaders/dx11/chains/supereagle/vs_eagle.bin
 create mode 100644 bgfx/shaders/dx9/chains/supereagle/fs_blit.bin
 create mode 100644 bgfx/shaders/dx9/chains/supereagle/fs_eagle.bin
 create mode 100644 bgfx/shaders/dx9/chains/supereagle/vs_blit.bin
 create mode 100644 bgfx/shaders/dx9/chains/supereagle/vs_eagle.bin
 create mode 100644 bgfx/shaders/gles/chains/supereagle/fs_blit.bin
 create mode 100644 bgfx/shaders/gles/chains/supereagle/fs_eagle.bin
 create mode 100644 bgfx/shaders/gles/chains/supereagle/vs_blit.bin
 create mode 100644 bgfx/shaders/gles/chains/supereagle/vs_eagle.bin
 create mode 100644 bgfx/shaders/glsl/chains/supereagle/fs_blit.bin
 create mode 100644 bgfx/shaders/glsl/chains/supereagle/fs_eagle.bin
 create mode 100644 bgfx/shaders/glsl/chains/supereagle/vs_blit.bin
 create mode 100644 bgfx/shaders/glsl/chains/supereagle/vs_eagle.bin
 create mode 100644 bgfx/shaders/metal/chains/supereagle/fs_blit.bin
 create mode 100644 bgfx/shaders/metal/chains/supereagle/fs_eagle.bin
 create mode 100644 bgfx/shaders/metal/chains/supereagle/vs_blit.bin
 create mode 100644 bgfx/shaders/metal/chains/supereagle/vs_eagle.bin
 create mode 100644 src/osd/modules/render/bgfx/shaders/chains/supereagle/fs_blit.sc
 create mode 100644 src/osd/modules/render/bgfx/shaders/chains/supereagle/fs_eagle.sc
 create mode 100644 src/osd/modules/render/bgfx/shaders/chains/supereagle/varying.def.sc
 create mode 100644 src/osd/modules/render/bgfx/shaders/chains/supereagle/vs_blit.sc
 create mode 100644 src/osd/modules/render/bgfx/shaders/chains/supereagle/vs_eagle.sc

diff --git a/bgfx/chains/supereagle.json b/bgfx/chains/supereagle.json
new file mode 100644
index 00000000000..0f12a85e095
--- /dev/null
+++ b/bgfx/chains/supereagle.json
@@ -0,0 +1,44 @@
+// license:GPL-2.0+
+// copyright-holders:The DOSBox Team
+
+/*              SuperEagle code               */
+/*  Copied from the Dosbox source code        */
+/*  Copyright (C) 2002-2007  The DOSBox Team  */
+/*  License: GNU-GPL                          */
+/*  Adapted by guest(r) on 16.4.2007          */    
+
+{
+	"name": "Super Eagle",
+	"author": "Shader version by The DOSBox Team",
+	"targets": [
+		{
+			"name": "scaled_out",
+			"mode": "guest",
+			"scale": 2,
+			"doublebuffer": true
+		},
+		{
+			"name": "internal",
+			"mode": "native",
+			"doublebuffer": true
+		}
+	],
+	"passes": [
+		{
+			"effect": "supereagle/supereagle",
+			"name": "Super Eagle pass",
+			"input": [
+				{ "sampler": "decal", "texture": "screen" },
+				{ "sampler": "LUT",   "texture": "bgfx/chains/hq2x.png", "bilinear": true }
+			],
+			"output": "scaled_out"
+		},
+		{	"effect": "hq2x/blit",
+			"name": "Final Blit",
+			"input": [
+				{ "sampler": "s_tex", "target": "scaled_out" }
+			],
+			"output": "output"
+		}
+	]
+}
\ No newline at end of file
diff --git a/bgfx/effects/supereagle/blit.json b/bgfx/effects/supereagle/blit.json
new file mode 100644
index 00000000000..24c3acf5a5d
--- /dev/null
+++ b/bgfx/effects/supereagle/blit.json
@@ -0,0 +1,121 @@
+// license:BSD-3-Clause
+// copyright-holders:Ryan Holtz
+//============================================================
+//
+//  blit.json: A simple texture-to-target copy.
+//
+//============================================================
+{
+	// blend (required): The blend state for this effect.
+    "blend": {
+    	// equation (optional): What equation to perform on the source and destination blend values.
+    	// values: "add", "sub", "revSub", "min", "max"
+    	// default: "add"
+    	// 
+    	// "subtract" and "revSubtract" are provided as aliases for "sub" and "revSub"
+    	"equation": "add",
+    	
+    	// blend function parameters (optional): What factors to use in the blend function when calculating the final pixel.
+    	// values: "0", "1", "srccolor", "1-srccolor", "dstcolor", "1-dstcolor", "srcalpha", "1-srcalpha", "dstalpha", "1-dstalpha"
+    	// defaults (srcColor, srcAlpha): "1"
+    	// defaults (dstColor, dstAlpha): "0"
+    	// 
+    	// "zero", "one", "invsrccolor", "invdstcolor", "invsrcalpha", and "invdstalpha" are provided as aliases for "0", "1", "1-srccolor", "1-dstcolor", "1-srcalpha", and "1-dstalpha"
+    	"srcColor": "srcalpha",
+    	"dstColor": "1-srcalpha",
+    	"srcAlpha": "srcalpha",
+    	"dstAlpha": "1-srcalpha"
+    },
+    
+    // depth (required): The depth state for this effect.
+    "depth": {
+    	// function (optional): The depth function to use when drawing.
+    	// values: "never", "less", "equal", "lequal", "greater", "notequal", "gequal", "always"
+    	// default: "always"
+    	"function": "always",
+    	
+    	// writeenable (optional): Whether to store Z-buffer data.
+    	// values: true, false
+    	// default: false
+    	"writeenable": false
+    },
+    
+    // cull (required): The cull mode for this effect.
+    "cull": {
+    	// mode (optional): What winding, if any, to cull.
+    	// values: "none", "cw", "ccw"
+    	// default: "ccw"
+    	// 
+    	// "clockwise" and "counterclockwise" are provided as aliases for "cw" and "ccw"
+    	"mode": "none"
+    },
+    
+    // write (required): Write enable for color and alpha channels.
+    "write": {
+    	// rgb (optional): Whether to store color data when drawing.
+    	// values: true, false
+    	// default: false
+    	"rgb": true,
+
+    	// alpha (optional): Whether to store alpha data when drawing.
+    	// values: true, false
+    	// default: false
+    	"alpha": true
+    },
+
+	// vertex (required): The vertex shader to use when drawing.
+	// value: A string containing the path and name of a shader file to use, minus the extension.
+    "vertex": "chains/supereagle/vs_blit",
+
+	// pixel/fragment (required): The pixel or fragment shader to use when drawing.
+	// value: A string containing the path and name of a shader file to use, minus the extension.
+    "fragment": "chains/supereagle/fs_blit",
+    
+    // uniforms (required): The list of uniforms for this effect. Can be empty, but must exist.
+    "uniforms": [    	
+    	{
+    		// name (required): The name of the uniform, as used in either the vertex or pixel/fragment shader.
+    		// value: A string containing the name of the uniform as described above.
+    		// 
+    		// NOTE: Some names correspond to special values that will be automatically filled by the BGFX
+    		//       code if they are used by the shader. These names are:
+    		//           "u_screen_dims"
+    		//				The dimensions of the first texture input if present, otherwise the dimensions of the output window.
+    		//				Valid values: xy
+    		//           "u_inv_screen_dims"
+    		//				The reciprocal of u_screen_dims.
+    		//				Valid values: xy
+    		//           "u_source_dims"
+    		//				The size, in pixels, of the screen texture incoming to the chain.
+    		//				Valid values: xy
+    		//           "u_rotation_type"
+    		//				This screen's rotation type. 0 if ROT0, 1 if ROT90, 2 if ROT180, 3 of ROT270.
+    		//              Valid values: x
+    		//           "u_swap_xy"
+    		//				Whether this screen is swapped on the X and Y axes. 1 if true, 0 if false.
+    		//				Valid values: x
+    		//			 "u_quad_dims"
+    		//				The dimensions, in pixels, occupied by this one screen primitive itself in the output window.
+    		//				Valid values: xy
+    		//			 "u_tex_sizeN"
+    		//				The dimensions, in pixels, of the texture in input pair N. Starts at 0.
+    		//				valid values: xy
+    		"name": "s_tex",
+
+    		// type (required): The type of the uniform.
+    		// values: "int", "vec4", "mat3", "mat4"
+    		//
+    		// Note: "int" should only be used for samplers.
+    		"type": "int",
+    		
+    		// values (required): The array of numbers with which to initialize the uniform.
+    		// value: A JSON array containin the correct amount of numbers to initialize a uniform of the
+    		//        above-specified type. The following size rules should be followed:
+    		//            "int": 1 float
+    		//            "vec4": 4 floats
+    		//            "mat3": 9 floats
+    		//            "mat4": 16 floats
+    		"values": [ 1.0 ]
+    	}
+    ]
+}
\ No newline at end of file
diff --git a/bgfx/effects/supereagle/supereagle.json b/bgfx/effects/supereagle/supereagle.json
new file mode 100644
index 00000000000..03f40691751
--- /dev/null
+++ b/bgfx/effects/supereagle/supereagle.json
@@ -0,0 +1,35 @@
+// license:GPL-2.0+
+// copyright-holders:The DOSBox Team
+
+/*              SuperEagle code               */
+/*  Copied from the Dosbox source code        */
+/*  Copyright (C) 2002-2007  The DOSBox Team  */
+/*  License: GNU-GPL                          */
+/*  Adapted by guest(r) on 16.4.2007          */    
+{
+    "blend": {
+    	"equation": "add",
+    	"srcColor": "1",
+    	"dstColor": "0",
+    	"srcAlpha": "1",
+    	"dstAlpha": "0"
+    },
+    "depth": {
+    	"function": "always",
+    	"writeenable": false
+    },
+    "cull": {
+    	"mode": "none"
+    },
+    "write": {
+    	"rgb": true,
+    	"alpha": true
+    },
+    "vertex": "chains/supereagle/vs_eagle",
+    "fragment": "chains/supereagle/fs_eagle",
+    "uniforms": [
+    	{ "name": "decal",       "type": "int",  "values": [ 1.0 ] },
+    	{ "name": "LUT",         "type": "int",  "values": [ 1.0 ] },
+    	{ "name": "u_tex_size0", "type": "vec4", "values": [ 1.0, 1.0, 0.0, 0.0 ] }
+    ]
+}
\ No newline at end of file
diff --git a/bgfx/shaders/dx11/chains/supereagle/fs_blit.bin b/bgfx/shaders/dx11/chains/supereagle/fs_blit.bin
new file mode 100644
index 0000000000000000000000000000000000000000..7b633fde6eda8a55c183d147e834ceda0f5709bf
GIT binary patch
literal 396
zcmZ<@_F$3e;Fo7)U@eX>Nv$woWME)qC}4DnaB^;~{*tSbI_*hx`^CFv{faU`DWD7k
z12d4;0pbNfd<BR-gWdgdfHX*)1Be5F7z9A-L1G}l55zHG7K8wagXMvYR5WoWAfF$o
zAvi2Pz(3eC#M9r8A;dMp+223Ng~8e1$3KW+wLj2KkQ+c|fb3KNVi-WS6KF<=W01RR
z2*c{t!5%I_Q-F#bfLIlXqd?9}5CF0m7$PJXSQrW*?9fmKh9m(7W+MRsu=ybNCm<W-
zE}&bPKPf=eWiT)>f$Vo>VBq}301<P8>T#=s@L}d#Ffg#g^ttgt)yhH4w1aqq0RT7%
BF3SJ_

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/dx11/chains/supereagle/fs_eagle.bin b/bgfx/shaders/dx11/chains/supereagle/fs_eagle.bin
new file mode 100644
index 0000000000000000000000000000000000000000..085fbc010d6bfa9dc1842b63184de5a5acc5e511
GIT binary patch
literal 5882
zcmeI0&1+pn7{(`)Hf__^go09nVhHG>RH#|_g_tpEZW}1QlBA(^(^`!vxR9zKf_llq
zr5nYCP?tsM(mz1y#*Kf2LKmXjF5K$#n={WjbFcSCTEvwD=gge<edhgm-kCY)-rm;v
z17AP+^HK~)Ke+n-?uS?3d;6o^Gbcg_Q{mtnyRX0Y&Y3C3KRt5x^6J`=-=F&S<}ZhD
ze*EKi8(;kS&2Lgk6T-Cm)4Hxn@TIPet#cPot3N8)VO{e8)#$*|=5#$OK~ZHn<GEvv
zJOWY!&v;G)@Sac4H77&J4`@t7#@O<M2-T1?wtNPm8gj<Ae+Z!(a>mA!2Msx6$B&GL
z{0O}UPdKR}pH&ZjYv<}K{jH7djsC^3y?%ME-`_kN*7_Ivo8fjJ&V*qq_7`=zVVhQL
zY`?sDZhbr4zP)w+?B<z=LrBtHP;yt4dhhc^JvDY-C9G@n`T6om(eiFHzH}*s>+@my
z&is7#$9P#|cxHT0V|;oHpB}@Z@$hCjTv-keyYhW+vGMnoN_bqd=akxVXk<P40M{EV
z>fW>km8jJh+`4GJr!l-RhZuXGG&Y=@F<EE36ENiU>q3*?Bs=7buiQ_t0}t5Q4+B5g
z0XxYTykTcQ4C?_qU`OqUiP=?i8XKNs5-<$Th4AT``W2qQ?NvCqib=OIxD)1E_TVcf
z-NxXSDjf00q}v!A@#Xr-9-PFa+ZY`28Aq-$={5nEYb|?l6O(QeaKzsejylDp+X(J?
zZFBNP|AKlNJ#jo94ouG$-AUnCo8Uex`Zs4A96EADcS=2tdDwVSI(V{<exW=shj8qM
z#<})G+@z#kU9Kj6^40#Ct??D-FNH8Dmw@sKF0UKeHCJ$98`gFF1=fkL@T~UT-4f@{
z!6yEhBTcOI%p>m;C4T1%clbd^-oyweaDk3k;KcLb0u1x%;RL^o@zbpr30h84LdO~*
zALDl(YUafxMQ-MVewdTIH^q%@)O_v73Ah|v>AyPEJhR4_=bAD`)~(|oQV6~p9Wkg4
z)ynIY`TNw0e0;S&^Lbk89g`5PKm7jPr}6g5vwd1eACqpKKm4{ndAE^gS10G#`HV~`
zc^VHd%;VWUt)q`gw+TM^u3#>4$E4esJZqoE+b7TVX&rq`x{dg(_rZ*6&i-Yc(X$5O
z2Mp_iu`%YvIT}N5<1qL)hS+Ni>kT`s34NPQt(SKqa^4;J%$)F^%Ii??j$Gpjn9PAN
zc~4Bh=(8;Q${dbhc(<^h;e<GeD<<7W&RXN@d?w+1c3=<RlW?nLAA;*@IQ;J8j0Xo#
zKBs&pamIUmvchpz(ZG`zy1n8H9k!T9E}Un!Z(Cr{jh+Y8HYVMwvy3O=r$%0vK0oMV
z(ycw;^I3)<pBuS$nv3008`gEawC8*NCh&S=P2MW+GHlp4^F}!#Z=c!b1X<13C?_>v
zVDE<$*5v(i;(eaiv-08DHmswMNw@BuH^d2hc^oIqdq&@>cU51X0dUX0ths_Ca%KI{
zqgyItb7hS5dHrC!l_fps+YMjLLpPOW`J6a*y~rG6EIQ^0n%mAyGq3jTc!+_xSp)1{
z?0fANKdI>lD|KFu-Sagq?+bEdei!Fp1>1WgwwYIB!H^3wzBA}&O3ilkZpGeXqS2U`
zB*=|Cn_S70dAizI7K%;hfS;uz8`hcE!S^-BTo~)PYc9+sJ!>8v`4S6wnsvmsDjE6M
zmSg+3YHZ(iT&z*@dXO4phxuwbFV@Scl7nN%Hh$~%Lw+?D%pJ+#<&U{i<HOCIo#S1N
zjfqLXwl#IWrFSm#;SqnfpJfSfv))#VAL8tE!!<U>buiX(%UHWtty?Je#?>F)r21P&
z-1z-3>rd>&^`Q0leE6t2Cx`#*-|PiZF?7aLV;bDiSW`6DpL$ql4!!@;HL~uENA^!=
zJQ%M_4cmC|J*{Wg-@dDTF?7aLW13_3e2Mb!HRgFuICk%UY<u3U?9^EAe?f9C^fTK3
z%whl2bH?8({$rA$ZQcGy1dp6$wx4B*d$<328s^x%HfOwR<amvB+?t;EYHeqs_<XwT
z1$3^J=QHm{!SNl%88!M%M%>8gW72Kp`vd!q&vxwx9<fhNSratdqUU?Z7<_Zq(rOHH
zWBBf?G5%h{{<v=(WccUX2%F5;-;YyVihFihI$E#vG4T}m9%;Wx?3?^~-_!UF&3gu$
r{ylZK*f56QTKTt=`ZkBfW<I}_XwDORG~(SWn1;i_ihjJx^?djXwJUh;

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/dx11/chains/supereagle/vs_blit.bin b/bgfx/shaders/dx11/chains/supereagle/vs_blit.bin
new file mode 100644
index 0000000000000000000000000000000000000000..8ca25c11eae42ef871a8e5410cda03bbbd959507
GIT binary patch
literal 575
zcmZWlu}Z^G6ur$$ZK>L1DRdCq4-kh8;viB?j15R%NJ^+6WGb~H2!i?t;v~4cIE(+|
z>g<-q)pPQEAoan$IXU;dd+xhMK6bYry+K1dx8>b(exKf4U%DdVO5cfQN8$4G`Src~
z^)T4oT>m)uUNlhaJ0c3-9mEU52btt2lM7(-ZA6N&ha8XRi4+FbnLPWo0Lm2}7NWq1
z`c!9<>O7eydLq-~S*UduiH6@5HHg1{>_?6Vc5+@LlgQWg4Uzc@Pe1DOqWo`WhIq@z
zQN{)%q!F}dSX2Bo1meExH>k?@>wmmQ1;F&Pm>vsAtD(`bhB;J#e~Ve84!d;7?c;fs
z7=6(*I_t@LAkwjQ%Y&A+U+=hU?t*GtU&~oN_p&F_v~$F`%NfYodE#x;=a4H@O(Y*X
F_yGziIhp_f

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/dx11/chains/supereagle/vs_eagle.bin b/bgfx/shaders/dx11/chains/supereagle/vs_eagle.bin
new file mode 100644
index 0000000000000000000000000000000000000000..d4773f1abdf9bbff8deb1ba7e00379f18b6e374d
GIT binary patch
literal 1713
zcmZ{lKWkJ$6vc1eX8*Ve$s*c`gg}Bw3f)4i^qIsp0m%!yVTsj(uraX_)M&7fAlmu?
z#KJ0#g&#qPh1l8H2wI6~n@`~R&CE@fjk)mN+;`^QIrpBK;dMJpqi<$^PG?r%?mgM+
zKV5zJ;QpwYjoR3D?{R;p_h{=`|59eTjo40QaeaQ_`Tpm>e|~(M+57(K)#We0K8z@O
zr(#ypIH%{Wp05IzJGWLg<%8Gstm<(C!zL%qy3q}9aMr8J=?&qTzDvRvirYooR*TN^
z+H$dCYd6;yilV(}h4|)_Jf=AK8Z0DZIOLOmPC%LpIKIjVI2;)9_>Ox%Bah=Kg@NHa
zUIvtb<2x>yf`Q{ZUX5^w$9J4QFyiqY2gATmF^-$fcvA_lYb3tY?Hv~@iuk^>wAg;9
z!r9#m%D<yFTCb;+73<a>lnxq=@QvS;4~_e1bWb@4Q!$3QJ~{dx^oetvn%ze;_sau5
z+Bl9L?xO*IQ|r^W<Mg_zEraK(q&l!zPxoxB!+WBprdi$R9T#ks)LUyJ<_fBLUygY^
zJzSAQ^ND997a*I^@oNi%C(HG+-Rpx-_vI8|I4jDpG*kX;y|H^kIC-+_e!?rYSWD$h
zBb-O(=$*J$ifO5C`lg=!G`E*}03)7yf7jz$@J=h2HR^W6E8VIu5`Hm_sjpn2RkVO-
zqnh|rO>lUg>p(oUz)LM~c@K)O-PQV7mg_ZS)Nwk^|E~`E;oJ=OuYDbdlexVta%Q<c
z4sG`%d*OA!gASN<2sOs~*|Vr~S<Xh%&2?rD9_F0K*Q5sO<NRt*!<t#H53X1^3&A&E
z%WEdy*UA)mWYlcAuaDOAsb<&u<UZhxeQ<|{`*3dNPT)p|LvHVlJ9xaez@-`O%h7qP
lp%d|0uGf&!3tDlH2Xe}sGwyTieB7IBT#Hg!uZI31{{T)+gbx4!

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/dx9/chains/supereagle/fs_blit.bin b/bgfx/shaders/dx9/chains/supereagle/fs_blit.bin
new file mode 100644
index 0000000000000000000000000000000000000000..7db8047160396c6cadb8bccca8f9c1ef78e20782
GIT binary patch
literal 241
zcmX9&F$%&!5S%jxM1*`mFj#35?oh;51Ck;l82ca^QBWer!qU<*{vdrm<OA{!&$+nE
zurqVR-Y%k`*?l=Z0XvKD$wLZ2-~(7%e{~=JW;X8vSP{nKGmOR?2sk8R5dsZNIZf4z
zP?k+}=$ro6HH$~F#PYPerCEBoyMy)64Z<jNqvLj;++07sTu)~bB|YgWDV6fnWHcS4
p>;VlMc=EU0@HV-CQ*&<5(Q=A;eTu_OMO_ulTl9@)w#v0;@&`!AFgO4J

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/dx9/chains/supereagle/fs_eagle.bin b/bgfx/shaders/dx9/chains/supereagle/fs_eagle.bin
new file mode 100644
index 0000000000000000000000000000000000000000..7f09975610537c8c7ae62da6649b8c9ba7eb713e
GIT binary patch
literal 3139
zcmai$zi%8>5Xa|kcW*C;6-&@iAYoA;0+My7AVdYmjv$38z??*ZWTM0<mJ&INgA~!Q
z*I#i+si+o->ikDQ!QVl32&F+3G-+7ApEvt%_s*AKYqjsqkMGR)&CJ{T_~>T(<D0*~
z(Y5T($?aSBh8?qxz4Yzzqm#$S=cnJD3||hCSGO#ws(-6pJNV+G{nyOwdp*dyda<`3
z%pU7?Lr<coV_iGco4>F0U?(WMtB1c3&Mq!e+mf7r|7(SoEYXuLbq~&uuOAQX)6?4z
z&(6=jd9?G^=ht>_9v&U;9NoQj=j7qe!P)%>r}wlN4R?pTqv3Eg+8w=j{rz|C;xn_X
zW80-!@rklO(ECFoBJT$I-kxM1NF@2Md&rX@H_3vn^lqOzPVkrR7v!&tVrHGfY-{H0
zZlV0^by6rsy-o|^*6XYgR=w^O+0s5QdP}(#c`a9%nf15J{cyzF!dYm)DEnbg?1f@3
zf?iyu|Er}ZpH;o~Eq!`P-&@i5m-<Zc#Ep1mE}K`xojv&ECa%i4!B!2$zlkmW;@#xd
zu|8bzFV!dVCssA-*gW9rjO5?gC(@@aye!}~@lxrtT7OOD?OG-OY7(){#`3QwUz(-F
zl5VP4rDBHonPg`3Ng_XN*k@}twI6c%TjD<ULZ6;dqiUkq0hfKx>{4tnB@ejRD39Qi
zDwm#JRm>SW<vP>a5@f2CWMj!J$t~A<5zYubd(}g-c?lovIgeca_<<XJBriF;h{HMK
z+s4s+FLB5p46q_j?O#&UwqMMzuY6qRdiH(U#{9@dXD~rVY;dDbJ3nOPhaGVuPRtJ+
z@&f~#h~xQDYv&oUpNE4U9Q-2Al{z;0L>y%Bx}t}C*t3rLu#Y&%b?2!!y*6)~Hu9mb
zV!ijZ&(+)3>V0|}KFmtgEB<nh>BDus@?Prcr*(a=g`c<dn`TFIvh3eYvy)qw*@b7A
zFZQ{OS9(0oj^wI2cS)Fc*||@>U-5C=`Gnb^hd1FiIF6g>Y}<Vn_w<?fDs$kol-9G9
zYc@Ea*sB9!v}cL^An1LTs426AEVpN&$H0iV%&N~ogG>JO6n7l?;YTm{T+WKv3-D1}
zgnKad2KN&8A{d*_-z<~QVtEe@EY*Ilv!qY`uEK914DLK|27dli^vGS71i!?dmWllt
z>>S&s1N%dE|A?chwLM<MN(?{KIV^O>PiwypSVf|G%c1s5B^xifC=Kn&v$=<zzkdfj
zRyX*>d)c|sTU80Z+oT)0p@&<v;T~>q$ay?n<=PARP}hO|UHc(hkaNvzfS<U2Ev`S;
zGIE^jse&%XlaKnqzd4(@TByNXSpJ=YJNZQ)xQgfha#h^vI#+Pw_imv2fV0YVi=0*0
zC*t~B%@tY0)$2-r?YgG2sn+Tm`TGpQ74CUG+b`nYlMUy^?*(#>KDlFD;+_jP)*{z=
zMefMsxq|~PJ+0qS*l*;Xi+lbY?i~x~BkniK)SlFJPKn1^27VrIojZMRdg595y%6sj
zv#Zi^*LXkiEs(v=V4?T3f}GvP)CV)k7D2|HW3t1BZ&Lg2V9nja_vIZK@px`<53zm%
kw-YeP%fDAmtg*gv{<|Q^`XN^EB_8<J=f0koRVDEM0Pik`+W-In

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/dx9/chains/supereagle/vs_blit.bin b/bgfx/shaders/dx9/chains/supereagle/vs_blit.bin
new file mode 100644
index 0000000000000000000000000000000000000000..87ff0b9602074b625764555284a5bfa7278143b7
GIT binary patch
literal 330
zcmYjMy-or_7@Yl~p}7|z;Sw87$YnPeV?l#76lY>MrM(!%ct&#MP;4nF*Eg`|rLN#P
zIOanW+3aNJn{RgZ+i5noolVqLXn*FbV)k`cm2Xx77Ci;CZ}!a@M)$*;4uFghjcrJc
zZy@F22u)aGK*;(}!`8sCXCe1wt(JK|cepK{s&ZMre8lIIi+G%7X`H=2KF_LnRL&R0
zJBfFROT2U5C;qB`eTi+CPql$H5C!3kTdP0bBG)H6J+*j5=Vy*w?$T3JGwf5}{U|&H
h&dwb%S84>F^c_95aPzBc$<f#adbH%Q7n+7s8~{rsKkonl

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/dx9/chains/supereagle/vs_eagle.bin b/bgfx/shaders/dx9/chains/supereagle/vs_eagle.bin
new file mode 100644
index 0000000000000000000000000000000000000000..6bf98d22532e19523ef7e5b6b645f4b3ff0fb190
GIT binary patch
literal 908
zcmYjPO=}ZT6g}@_CSxpQ<5Dn)h;HJHEz+GI&7zA6)fiX8C^llG5=q)xii=nD2aMp#
zRrdWG{sh+&B#4FLPiQ>%&Lqu{$DDi5x%Zx%H_tnp{`<{e*DWsZ=X<@weAGYcrPg>D
z)c5m)e(&S<aPZC>z~hC3JD;7;?qK8D!$(&EeCCmy<x66G1wQfB=CQ0`8Mb-kdC4O>
z&$G)T&(ch49Zy+Pa`Wjp;b1Zs+`%Yc%~L$?za9=ogExE4TTgE{H@7-l&Cc6bJH26Z
zWAOe%f0rOjTWKpx(=2Oc_g2@}aPkC*A~eP_gU<sX+!t_-_Ua6PMj@D~U@9CD+oe1;
z6VXI4qN%VIO@&=>3+#hm;3#l*rHMnlz_n0Y;3OmqjBp7~_2RA0JiR#1=iKSopj+_&
z<gY>B5~JXoK2$Ri?3j;rA44Ay4QWd~jwNrngGaZ@`#}C!>UkfmKV`3JA+go?uf{Ud
zVukz{?(=PI(Jsoq31cvZbISjqzO5d;)}N6-C13UgR_NoWYNVbY9pf9)gYyhAh`ZX)
zv!B70C9M~oa`K-V+*MAz)i}%GH~By0r|OO0qwGcvTuk2LVwbq;9bt$1(r-<3YwS_x
uN>7RQn0rdJ&l!7`GmP#$6^-RLI|2SFPM8<3l9&6O>*YRqN5yQ$P5%S2hn>{`

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/gles/chains/supereagle/fs_blit.bin b/bgfx/shaders/gles/chains/supereagle/fs_blit.bin
new file mode 100644
index 0000000000000000000000000000000000000000..fab8eaf63d2e31f33c7f5803b0981b085a826bb3
GIT binary patch
literal 232
zcmZ<@_F$3e;Fo7)U@eX>Nv&XDWB{VG3=9lqiA9x}dFcunndun?3T3IuMhZZA=luMl
z6l*RFNfU*#_~iVY{2~KuuF|~BwEUu6h2q5Af}GSMBNqj*(Li1KnJEgniJ5r{8k$_y
zTnY*~`Q>1vO%zIU3xH<E8(ITJVQd9kkc}m!MX5j|G{9!)z}=t;Qkk9;?^cwU?hLXR
Ss9FQAQw#1Kpt@QvE(QSZ*hxG9

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/gles/chains/supereagle/fs_eagle.bin b/bgfx/shaders/gles/chains/supereagle/fs_eagle.bin
new file mode 100644
index 0000000000000000000000000000000000000000..76ba019d54458010842e64a811ca5a67cc4f410c
GIT binary patch
literal 6946
zcmbtZ&2HO95LSZrqP{^-+a3z3b_MQ|lqDqTB}LGCAAk^S*%2UHf-J|D62C|uu5ZzM
zXJ&smv*gN@90W15<a{&p%{Q}4`qMvu|M2~{e}8@3`{|+D&Y!CL#eSZ>ebei`>HT;$
zznm@M0{;H@bFcShw%IN2Zq(<+&F8iHGQTX;R=?}FEt~e`ynVT7UoP91$L-4(Ez3qh
zN*`CN&DFd9!`<R~wYlZdvyAKe_p{sea=tNtDM}wuSBookJ6qhT!La|euheq&Na^Ql
zt#t(qh^0(dkiA&aSp}Jkr7Wu;YgI=Bq28{6$_lbp;aYuA*PGepb};aXsNWR}d-Sv$
z4mmWG#KHhe0cH#^V84CX%pt7-<#isY5%#&a2ReiO1=>4U@VIYvIAI2pc8B?B|0ukL
zXs670+HPE8uH177RcFjvXLYdCWU!j5=5o?H<&lSby<E+<o(4@N_VxzsuU1=yMT$w*
zm@~$4jvbQ^#$}n0N7=bDWr;uZC}S0rPDnJ~Nq)eIL2gcTLNfGDiUUsaS2*FK)@5+Q
zG<5<!T;duvZfjscCnwUub+1wQslpboC@k+4jm^R%C)J)n2k#+`O~gU9K8+8<d&^*N
zrTDlwT^@#aqrq-WJ2|<V3~yO;sAY>+WWrn49BSEdS0{^W1=HV(8d~R<FpBkbI8<L@
zN-HIv0X@~vjKebub}QJ2fLsqorA6~K?pbX&2sb!~Zm5kXL-p+&OgtADv|oKMA2P29
z51Spp53-RdVgDKo@=*pqoh|8osLuTVk(s@ni5T3onlJC?E>Rn8fFm>qLuNG!^*=+w
zEdu|@lz7<2$dovb28OgJ8&PQE@1BzFJ{C<QCp<`4Jf0I#Q|Huxu}MV?vDmcZ+vTp*
z0Jff*d57okh6=<LiMV9-e8GV&<<a;~r=XV?@NJ+CeCsyNo7elx4s7N}I(Wvih@wRO
z$$D7yr|T0ZXxfRm*y435WoY2K14}7o*bTxx)96my{E6<2xs0?R(xhPBECD#K<deEn
zgso*tFi=8Dx{SNi4!VvhSryUQ5;JI~RO^wabW(HLcPD$y+f;@QU+5ICq5rc{7|PL;
zbb`Vs`TDLhbO?&qpDGj7gVz!nt>g-L$3q$OE)>hBq`nY?(4oUA)(_YQeF6&H)Mb-U
zO1Z!o7*r$R`U`=_L&G7>_6Z8@>;s;#y=nK@A}kl1L`w!op5K#a5s{;r2jnB8q$vNi
z-GJ=>pjQTO7wB;U!bki)t`u0OLuafMa7pLJc>Sr$18aCK)qz%W1@YxdvP`-Vq&Rd=
zO1wJ?D4`$;MODJU7+A7MZkpnYL#;^D3{BR&yMnaDa<NIYWN<`EyAqIQmR}HnSI|_Y
z?NC7zbyz`GWoI~%CSfK@Ddlutk0rCKaynwi>yQhbig6vUrA*LDu579tk3wCBk<oFz
z5S_ErSxONUmWu*oV99E=NeQ=EF^nK_S^Vx&im+U45-k}VQQj&EqM79vO9}E%+ks5L
z{$(i@a16soQ&I{$AeR_$-#W!0m$2XAwUh~3$rW%M?W$swh}Lh^3(+|{ou#BD6qO4D
zV_?Z@wMt1&5=vYa{|G5bEEk(ZO9n@t+a-ZCv-}!TDicydJCst<T}nle5)~8XRH6RF
zaUmKm`LcW9b(epkb%n^oIVyY&&G9&O)bX}{Uu;43Z&Qt1?M0<@-#5~&-?AMJi@V`o
z+^fH4`v}580Vj4?JU(gkE51170@=TX1rPq*0{V-4?ez4b5bU>NObq`-A@G|)!R~^7
z&_7MW=mf<l3w*0qSR;5ZaeF|+sBp(CX|{{Z0{;b`z(^{VrHCQNp?wNTcTd?Lo?$#1
zg(vZrKxu~Pw)w6h;;v1M9t@G5^1n9;qoyrHa!-^;Ma+qCA8+_2LczcA6=w7Z@wl1f
fv&IkQ`<ev{bhE5JZDuzgSIgC=zK3Yf{eJI%qAdYQ

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/gles/chains/supereagle/vs_blit.bin b/bgfx/shaders/gles/chains/supereagle/vs_blit.bin
new file mode 100644
index 0000000000000000000000000000000000000000..499face3174cdbae62921d6352a2a1865a0a0c73
GIT binary patch
literal 413
zcmZvYv5ta35Qdk;Y8zkR5~oCSA&7Lw%Er>f<XW<ah+~8y>w@6L{vP`V4_QrUHk<us
z{@HK7cAL@1?|9+}Sw<Bm*R7`0$PvO3cRrOd8ox`Ez!B490aX%*prV-0r2VBFzzfC&
zUC<!qg9QN>n52%0^qwOsr5nssn;!tvbxQ|e2vtA4%<(`v>pC-KLa++lOSp$jVGiz8
z{z$MBLNHmubEEl^pPzT{c7;_d7`VRYf5P1Jr*FJ&m|HooZd#n4qiv_l*tI`^Ss(qM
U(^)-2UKRko(t|u#dzVuD0Sjh_6aWAK

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/gles/chains/supereagle/vs_eagle.bin b/bgfx/shaders/gles/chains/supereagle/vs_eagle.bin
new file mode 100644
index 0000000000000000000000000000000000000000..a67ebb5a04402400dbd74784b117c1fca6335598
GIT binary patch
literal 2441
zcmaJ?O>f#j5Otzl>i&sU4;8eH>$QyyihAm$$4HghqvaBZxB`rvg+QwQk^H#+md<{7
zJr1*bgBf<-n|U*jAK$-Sy}bYT?lK7X<)NvcZoBsP)kP3o1aJ4HsE_4i^IXT5D)RG9
z5L7~R&9A+v*+a8>*s(*s%ve<}+jZN;HzAQuA-!uK8_~2|@&^h00Fah#+ucElL)D#{
z?F!cyoDL^+IHkiG9iGwQoDLUscus^923>uXT@lHQ9qiEd+vdLQHm2iEB{DXMaTAWy
zYT!s3sNFVqY*RH`HkpQhLN=P*W(V^uVSbDW^ErBcVqc_i$s~^APmD+Lbd*1yAU}u}
z9Zxd7T9>y*Mo3QvhU|kat?KlRsUrPiAXYFJ%>?ALtP)uhn0$u9cI^Ops!HlzyI;4J
z=pTc~_Hhc2`<l^FCWr?hzkQJ52dcYXDn%M?BRt_iL$X6#%C0RQ;wMMi$6>21+ANaq
zVb-JA5n|VqfwtCwYjs9oA8k<w80@MA%OhFXl*L2J6$^xT(ufJso<+<Zh;RlLu~3Mp
z6K0=7Z4IIYFPs$AO43ai4hnE`mcpEv@LbVC{TeE%uiv=?Y=OWQ1lZzy>Zwo3g#(A<
z9pN#71VJgVf83d`N3PG^`nTO#KC%f|dvZgKi*Uuw?3uo;%-1pJu9mS4aM&0?9p4HB
z<pGVbX5J1H7ZyGU4x2EPeU%{qJv+)%7a(>W4zd8CUph11?7U^T>@y#-m&P*}1MEZ`
z#s&<|kHVm8ry2;J@F^R=$h|7hTr{vpacxqsRMrON2M4e5%)sSV9NQJwenmJWWK?mJ
gl3Qoz3tv=cqVTq_%}Rjx5HxLTsI2^d`x}PAe+<t6ZU6uP

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/glsl/chains/supereagle/fs_blit.bin b/bgfx/shaders/glsl/chains/supereagle/fs_blit.bin
new file mode 100644
index 0000000000000000000000000000000000000000..3104b9e54b2cef3a255336c28d41370594691c53
GIT binary patch
literal 175
zcmZ<@_F$3e;Fo7)U@eX>Nv&XDWB{Tm3=9lqiA9x}dFcvesmVqPKpE%!{Gt?VE+k<S
zg|hhM{G9wE18c6*yv(%xqFjaI#N2|M)FLAn1+Z~I_4%183b~1yc?ueuT-96(3h6oV
qZbgad&LE8nwh9_Rqf1JQQh_=&z*=<RmT4+z!EMmA=Bnl5VgLXmp*AW2

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/glsl/chains/supereagle/fs_eagle.bin b/bgfx/shaders/glsl/chains/supereagle/fs_eagle.bin
new file mode 100644
index 0000000000000000000000000000000000000000..1c640de9db8ff23dee3a871d4119076b54c0a28e
GIT binary patch
literal 6668
zcmbVR&2HO95LSZrqCP=y+a3z3b_MQ|lqDqTB}LGCAAk^S*$^OG1}!I+6Te6vu6>ox
z%>K<RNtu*kSk!X&n{Q^mnO)MK{`vcd@4x-~>)X*!kJWztR6T5-*V)@QqtTnuk5}u<
z)fO(`_rIS<qtC1Qu(`WYpVya#+Us{?IbhO(JRK;~fifMKrvn#az$l>jaks0l-i;sc
zHrKoQ*0N#T<DG}q?frILo4*t}0!X{fmAYMR?$l&D{yJ8;HdpsrSKy5Qmgx#S@!xb-
zfgAo?mQ~;beFG}D_Yi;zd{E(9eNfl+>T*Asc%tfe#mLQ`4%4YafEZc?a5^B&0Rfio
zAL}*no)Gc#;I&_x`=t<`u=E0#Iz+JZoSIp%xr=r)`Rw_Nw-M+q*}7%>x)S|z_5wGZ
zv4uK|?3QipG^N1t*SgD&<9EH?t@hqqP5JUm4J^Id?G<Jq4WmZ?(E2&0eljo1d_K$0
zl_^X7(6h{@N8*zLJbr!z-(Vbu<CCU5esKgpKMkKtRF?stX=PYExL`FZ*2df7Er$Eg
zRjg6QUHL0c%O6+1M(K0Dq{d<X^NP?|5*$zK!2vM5QVdo~R{$<f5`f{gWw5ro@lPob
z!wb+HE5PD3{=5Lqu>zd;#ot^j=+RcOP!hj{)~T1%srm|CRVgtCWE1Di!yE<M2W$}#
zQV&MC#O3$6leFC+++ZB^9v3gB>f1MHU5*&kR=k%_nN@^`%?RKp+02x%%S<NuEQ3$C
zmSjCuXZ|}z=GitkB=@4$+lRGt)Upk5gyvvqSwx}YW+>R<@khGEX&WP5;&C+4ZGEs2
zg?8fpF4;<BY#Kh{&TjFzPZXNyQv=32l|+bf(=Oi5ccmt<hs4M`JbyQ2Ak9b;OP0@9
z4A@i-#&<dey}W{Ni8k=9+3vV`y}xe2dOpy=3#LURC8<wV!=gT2oj5_$Uc<$fj!P*+
z0mlj~rIexbhkK?`owoQpsxyscq6Oh5k#)TU;JA`cs!l;$OP8Rb1ebJ~R;O)rJzcUY
zqEjJy&~z#4k-KzKaoXcrT^Tw_p*g&U%Fkw@9fvt|8p1ht<WLzp&%}|Z$^@0*wZy^s
zas+JQp^DiO%H-WpUx<e1(BatW8)+j<0t(E;^hhYB95Dt4Q4hHOLf~;~*o@hJK-A7Y
z;E~ub?awX2a@-_ZCpohGo-7MSF3g;eXGTtu|J~~*wEhn|<NI|XJWeh+#or5hq0?hj
z2biJrUmSU=@(?4umRi91as;g4A+(oX3K0T_&O?yyc_P0;FA|D!g2WhDXG&a;#It_X
zpJ`H)8SbwaEwLOoiPlMug3_LM3^VgDq}%Idsk+ypUKZ-OUaY3hu-hy`r}M(e>C_!%
za;S1TC&v+BPA6L&!D}fBoG(Y}D#znYAK@6CW(U!EEP4wkfx_evF$UI|n>OL#Rw)_{
zI4)D&UpNVt<0jEM$x+B#1wdhD{-weJ|GU?LC}92T!YSY=g;Sft3A>ozq4K0F0rRkD
z;k6V6<R{sWz)Z3miZ&t2x{)13=dtK594(<JIY^9wb>^m3II>HS<1*C)gd?#WH;L9s
zjx4te0K?4uYY3<85Du<G;S~LaQv~5qGNA_*>Q8JAqP#jEPmesHy4Rg92YEOQg;$L^
zo{0vXMdQO=3#xzgY20ehCwcn5;c0v%b~uc8!@RghuYtYsu-#)<4uiw}MU&#qKrWE|
z(^9bD&mEw;w8BpJETLdu$)aQUlThF{gKpggeb65fD>?}ARst`A6=nt=9bAj&^9y%O
zk}D3$iV*bzPg0}}8=E99E^>AjhT6@tA3m;l#0fL;mOv5g+<x7c9d5-G!lUeHmj4e!
z=qPRM$UMb3$y!cf2CCtee8FG16=wDYsJO1<eZ^PN&(U{_akH&H)vKG2yX~%y_Ym!6
HJRbcI*U6e2

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/glsl/chains/supereagle/vs_blit.bin b/bgfx/shaders/glsl/chains/supereagle/vs_blit.bin
new file mode 100644
index 0000000000000000000000000000000000000000..88ad318046c92edb69aff6572957788f941f2197
GIT binary patch
literal 371
zcmZ9IKM#U15XDR4)Wt7g;*DSoL1iOOE{-H5t^^TD4REBEe;Ri`wg;k!OVhmH_1$|t
zc>BrhIh|{a7k(+C%9VJTXpCvhqcc!SiesT7D5KDZzz;D&X*qlZHUx6K3MDZ6Lu*1R
zszXG1qGx3w8<EAW+ZssUwfac5q5Li>GI2(kLK-L=hIllO;zX**KsWfE!#kZybMp6B
z4hf&Td8=UCt<x>jTEfb-j1jLJ;zNA1Zdx2CzS|cftPi_k@wI;Y^c^~rpQ040uhEgu
Iw>>y#FDRUMng9R*

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/glsl/chains/supereagle/vs_eagle.bin b/bgfx/shaders/glsl/chains/supereagle/vs_eagle.bin
new file mode 100644
index 0000000000000000000000000000000000000000..d5eccb4c173d88a5a8bf50abed740e5520ce1a09
GIT binary patch
literal 2249
zcmaJ?%Wl&^6m_dEkok!b3zPsg9^0`KRjk;stc1kYGO1e`C2{3WQm2UTK;q;07S238
z9?zKBwfB0?x#!$RzJ2|2_2=#1H<v+pEKg1SeA~4@t}cS$B6xi)S>2aU%}X6$ipcL*
zK~OQ)HQ$e{CZ~Fvk*eIbyS9sO!bu`U;<0^dSkoS?RDu+6w{6?q;n}I`&duRLqA_X*
z5<8IEfy@r9>_Bb@3Olf#1QLS!KJ)q};f$QL*yEwOZ@WF&S1co=aW~<R5at*L0;z58
z@O^V2i)HvTBuerA5e}5lO$bweM=#Ih6Hh0LIEp_I8pX>=zCR;B8XWa!o_^Ssx5{#)
z7h_fAorV@TgA4&Ov`^Fn<+29YuIouS8fy3mNIekXTne!JU0bo?8JeS?rFb@=MLkbU
zK1JK~r<wVw&@wbYlxR!~o={Npii{~D*P2NRgmps%)1Y})5q}9!C$S!}>%~~A^qR^p
zOlaO~P=^LHrfKqsLn=Vil3ef`TxZFZ%t+E)xx<C=)m(+(GO8!~Ay6f}Y-#adaxrf6
zLJNl+tD?!*Gk&f`L54<EMC#MHc4#&R&1QyX<9eL>I<|2bs5u2Rp5Z`{H_~rz=F>&x
z;__7<=7COD9m703ed-cWQI(n`xiOhfC8e%RbCoG(0({dAK#;G+gk|MbmAEYCm{at6
z1hg_URG#^xsY_*E4hs80<!_NPGjnBPQ=MC)_lIUKw|Pw{Oaiw%>WWWZo3XUBxteP8
zb8k0SZUN?<q4LmJ-IPbhPm8PJ(d}LwYMvY_Z_dnpLq@==6rU^YCjJp>SmBi{4-Uf>
RnJG|<GGO_y(62BI{sFu`x}E?4

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/metal/chains/supereagle/fs_blit.bin b/bgfx/shaders/metal/chains/supereagle/fs_blit.bin
new file mode 100644
index 0000000000000000000000000000000000000000..a0cb475e93260b26a09664dad5edabdc2b8949b3
GIT binary patch
literal 628
zcmZ{hJ8Q!*6opOc<fVV0&^r~W7?Xx<X}bhMJA@9QQ!qkxWXGU~k);qQ-TSkvmqQxT
zO}e`0J6Go}*RR*NKR0(-#;&r=4xMa4Qo)9v)(iwQl+W|QXj>aNaB5bDuXl9I^qcIh
zfv+5(;fk6m7<O1FrML63G=n{<6<2yP&%ZB2-mMuaJIb3Gw45w8Z5Lkluj)f~jncxI
zJ8a|H1(RpfC2*Q}MLP-T!uUiOPCD3Z218p$I$2c()JnSRIWd{uL(o{K`Ls>LG@9V5
za$hb0d<4d7Hr+mjOkQ9huH;(NL+CAFprYqY2ht#VGIphU=)$>=_Rq-aPr+aLlw)K@
z^n0qwqpyr-c#e-KpvwqGUU~E@0L8`OP$ykEE)ZkvS<$CF-H5{?6kIWi>KQ&-K14-V
Sj$4ly&0Hih(cDV&Jo^Rr8`#eP

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/metal/chains/supereagle/fs_eagle.bin b/bgfx/shaders/metal/chains/supereagle/fs_eagle.bin
new file mode 100644
index 0000000000000000000000000000000000000000..2d70baf954576410968548cd05e551dea717283a
GIT binary patch
literal 8024
zcmbtZOK;mo5cZ)b|A}sU2*kt{xJyd5k;f%KkQ{;@f}R3{U~S3~pcf>nv7Pvj^vCtL
zbY}L!nI-8+Ob#*0-TihR-#0rH-+g-j%fHY5`~BqP!>=bN``vtXt5)T*+HK0~N-e9p
zT)aHp)!Y4bt?m|O{jpwr`cmFh+YhVFzE<B(m6|QqWu2>9zhpOt-(>tI=Qk66Gvznu
z;l`-Cx_i4`Z*N|nK6V@P=f3vVd?^>RT-`2;ciZyz?Rv4^_OAMCHJ`1wOYX$JfW3;{
z{Gm!|*$hCI)hhDcZRg_gv7E2es3SPVvR)K(_4)IzE^n)1zPh?PQ`hSi+{TE`lxK?8
z>|xE{``N78j?(1n3c`A(6h@)mZ!2^2iX#3--Bj1*0;akFntP^p<#MyAwuH1>ZVErk
zJ*Qd8={EosCOe;K|24)Q1DUCf)&(Wj-KM&r)cVo1pyc||v}n=`d0TG&DYpeB*<Y*I
z3W9oFk482;W1n30+&MpHNf_VVCyBQPIA#HfDE=A%arb;gj*hLH1RlIUQzHtQNy4Uj
z{O~pDfF{~G=<{LFhKz1oeSv;B=!;>{Sr7CjgT5RF?Igxxl6hk_XdzgxQ^0p#T!J|d
zt?X#xi<_eLFmtk={AgmI2RFmO^PVtj;<5+NhJtr9OOrA@cs>k#A}w!H#5JZT03J5#
z&JmZ8o(?sp$5SpMJy1nc>1oiu<}%U)b#&eb&V{50D(PHO*Jr|T6&X~~&AL`2mnU@h
z0qPVL(uAs2HkwW**>s$qDKnYiA3aW+k`-{d+ziT%<D#bnak<hADvje_49DdnGbl2S
zOC@Dk9Jsy=>WkxQJ=|cfErZ$;z*v(9MwpAxpa=ypR;hu&T!01zD1d*0Yg~K=#V3G&
zf)reM28AbphqEH%s>@>4X*{ck#W>@#%VOE-<8(KlsgbV)Ac@~X`8MZCLj9>yVh)g{
znUjY(3i>tZ$RK>a{1bPfc~l$h+`0w`H*5~{4vWn+QQyCZ5`~&-#x!&a&N2%RtslUT
zsDdTw7=-d1?(A(gPT|hmM8r<i3;%$!YYQ7fJ*sN4tDeFpXop6N8!W4H28Qhk{*!KU
zSF%*PDPnsOxry!YKsPn%j+xf-GY02=YKj_jG)A+IM!}=@o!hHjUR+d^PZ%6CEJGIC
z&k2dLHn7aa(cYvH3l7@O=6}F$j_ZMQ2kqvZXl-Y$=nt?L(2={*xsx2Z8@%R5I*8QI
zDuhtKi@#SI6+dLZ=Rs>g$^z<Rqwq}10*;X|mbKJxi%W=2zxrEYwgIBoCA2gma8tMf
zHdn<k^>bIurF0W&WN_1DvHERs4W=C7rY(9;xEYg~yE#n!)J3Xokx?gy!NqH+2I)8u
zBg~<$4CmM<_eDniRP*Gn$iiWQ*AfTk%O|iG9z<*}!C_v3%|x6f4jsB(U%XqS5Kyp9
zlQIdVlrxNh0mlNazYuuBG&lg*QADP_c#WO7UwVXX63f{p(Rz)eonO(;!Xg)DZjiT(
zoFf1G*NtfXAM|SB*M;yny5JN)7WhKFYr_uMhMLai2^dV>B0j-u$pxG*pTI8I0w2T|
zBSPTNc?ja8RpeLjMM6<d&@cwpn-W({WnTnuXp%1%N@n;7zDO)*n?&n1j)KyicMLQ0
zFQnV^<y`fzL%vMa(|oa<dV$qu8VX(@4t4qsP40_4NXgE*D{|_sEpc*ew-_mKzI+1P
z;0ptrBeE^jd>Lhj(0MElCys=|<d9(utT#7Z#K9v~5C=??sXm-I5tg$}qV*bw;qM^;
zhMD;n69@e7CJwGcQd}ND90MH~PHhn<52u(vq4KCIf#u=M!fQzi$WL@0ZHqiQ4f~1H
z$_}FQSR76q2}Q|4!x&g^ZaRr0s{}bNQ+)(+B$l&HqV*a_J9iR*!p!_@5hv>=4y^;?
zz~3KN97~+s1maLKfl5Zb!Qvp~)%%*<^qam_4o#2$B;p2gHV_^m(fu1RZ{U8=r?wh&
z4(?y7!Y2MK?#?TD{Ho<KI%Z$ayknv4VxjGQLBK)#b;s`?PJSE;4+ndWdyC&Ja<PGb
z?Ft)t?}3N0=6=S<$Oz4{i?BUEp0ve4+@}9z)Tle+^#y*)SD2=zVU-J9^CXwtM@yOn
zV1Gp!w(*H#<D*BjFx+mI{o_Zm@$uKRy+D!XxnulL^Y93uC_ZT(&GKIyLu|cC+&tQz
z!W<<or$D2v;gi9HnC?&}>G&(yf)hqilBilVL-1=LivdB|FQQ}qMY)+`p|=%$m|fY=
Mm+<ZM@$~fMf8>Z@Q~&?~

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/metal/chains/supereagle/vs_blit.bin b/bgfx/shaders/metal/chains/supereagle/vs_blit.bin
new file mode 100644
index 0000000000000000000000000000000000000000..eee8677be393b9a7a296a7e9ceda133a6160b432
GIT binary patch
literal 751
zcmZ{iy-ve06on(il!X^S;!Y?<Rg{KqRVNl0Dk@d5R8i!nPBC)q$hl5a5Ic{_qu~6t
zP6b;WefOT@bNsq`yuALtx^bMJ3&+s~6FU$jqeV^<3K>PhXKsN?CkPcMxIn&oBU`GT
zM6MA&U4WEJf>R)IBDquntk(olv5iLR1*0gM^~}9ta#=8BQVghxO@)R+S|w7d?QmJx
zU|)axdDeJlXvgE_Nv#*Q{Dfe19%`MV#VM5CHD>NVLN9`)Qf1cFt10NXWOTn&^1YcW
zsWPjFfprGE5Eq0A@cu|N&XC8<#8V*I(U^%S8bcz5If}CiIw!Z#%xE*S(P>ImllsW5
zyBP>{4jNioSH>(aiHaxnum0Qr*u%W7HuM5N7{kO5MgyWc7^1c7pNjRXLrt|JzTLqb
qyw<3HN(=6eip}zFtnbAZIKByMeP5Q%wXd*-6h*B>XT|j5y3Q{yo&wVV

literal 0
HcmV?d00001

diff --git a/bgfx/shaders/metal/chains/supereagle/vs_eagle.bin b/bgfx/shaders/metal/chains/supereagle/vs_eagle.bin
new file mode 100644
index 0000000000000000000000000000000000000000..268549ac9d20e3c9960769003dcc3e1011a8520d
GIT binary patch
literal 2820
zcma)8O>f#j5arO5f5obY2-?K;8uO(nr(W7a)JRc#iIC+GLtPmgnKdzq`bYZX`Y(F#
zc=p3%vVd>wGCS|hyqO0-?!UbIbMg0mulLXC^~!CMtymVV<LxF|#B3dlD7|*Jq9_-F
zRcRz{MSA};dWws$*`^fi)nROz=8*_k6fW{KFFf|}5D8HvkEMwF-e5kz)-gkf+2q?q
zBze|~;xx*KC=pkSJTIQw$$Sj^ZRhi?6bFP>X?WM5X<))9V1gTRaPaA2NDl!$jObxZ
z4-<NrnuE`vp3ikX<|<%2)vjyjNI~DTWSJLh(&8#$Ww=Y?=er{RMN*Y@zrt<u5__0!
z7Z-5RmP@rqNq8G28S7j04A&wJ6A))BqE#Fw*?fM<7I_B8>|g*CzYB(MN_g{FE|+nE
znh%^;P`w497+`cx*o*aM7Zo8Yp+CDX&+JAHmf!bW?~-xX8`O_XM74(qN!M-0%B}Ww
zlmv0<1l+K`B<eOjWFJgEOs<}3X()i4Z9^L*m9%kY^k;a`2cn-EBqIzE8z2U5i++tm
zrd|)>wNB(#21(!H2&(S`8cGY+b4HoNo!lkT7{P&0&DJ!~M6oN4=r?>#xj6fZ#mKEw
zfI4+zb63ILRlg~OHWpw}SR3p|lfnXvTc&c3-5Nq2XamQ{hhXnp*#7a74ffcAjZ3ZI
zCWuX{W9BKO$HykJZq5lZ=NmDxkU>*X5K~M4r$~^%N>XaD#jryUrWV*4k$7f-oxRbd
zK|EjR%!0`2RB_LO377RCoD@T|2s+fwrNQ8SntA6fTY{}=i`tT$b7ZO1!F_G;&v$`y
zTN|jqaF{W`Z*Lr2){|yK9d)VNw&k3z6^Ef|01m!64&9;Pp{-!*a~yO7=#vtw!Xfk+
z7ch+atCOa~0~;6Wb{x71S>CLc#+Po`P~B5&XgkrkgA4MJjS%%gE{*VD8l(w!q5)=h
zzArXM<kS+m^hDK$)_6=%l8#(D%!@Qcy;ERy$LSkTqJsSWEn-m?nfiwSf0rDm_a7q7
BjJ5y(

literal 0
HcmV?d00001

diff --git a/src/osd/modules/render/bgfx/shaders/chains/supereagle/fs_blit.sc b/src/osd/modules/render/bgfx/shaders/chains/supereagle/fs_blit.sc
new file mode 100644
index 00000000000..874846cce0d
--- /dev/null
+++ b/src/osd/modules/render/bgfx/shaders/chains/supereagle/fs_blit.sc
@@ -0,0 +1,14 @@
+$input v_color0, texCoord
+
+// license:BSD-3-Clause
+// copyright-holders:Dario Manesku
+
+#include "common.sh"
+
+// Samplers
+SAMPLER2D(s_tex, 0);
+
+void main()
+{
+	gl_FragColor = texture2D(s_tex,  texCoord) * v_color0;
+}
diff --git a/src/osd/modules/render/bgfx/shaders/chains/supereagle/fs_eagle.sc b/src/osd/modules/render/bgfx/shaders/chains/supereagle/fs_eagle.sc
new file mode 100644
index 00000000000..a07a848ffbd
--- /dev/null
+++ b/src/osd/modules/render/bgfx/shaders/chains/supereagle/fs_eagle.sc
@@ -0,0 +1,165 @@
+$input v_color0, texCoord, t1, t2, t3, t4, t5, t6, t7, t8
+
+// license:GPL-2.0+
+// copyright-holders:The DOSBox Team
+
+/*              SuperEagle code               */
+/*  Copied from the Dosbox source code        */
+/*  Copyright (C) 2002-2007  The DOSBox Team  */
+/*  License: GNU-GPL                          */
+/*  Adapted by guest(r) on 16.4.2007          */    
+
+#include "common.sh"
+
+// Autos
+uniform vec4 u_tex_size0;
+
+// Samplers
+SAMPLER2D(decal, 0);
+
+float reduce(vec3 color)
+{
+	return dot(color, vec3(65536.0, 255.0, 1.0));
+}
+
+/*  GET_RESULT function                            */
+/*  Copyright (c) 1999-2001 by Derek Liauw Kie Fa  */
+/*  License: GNU-GPL                               */
+float GET_RESULT(float A, float B, float C, float D)
+{
+   float x = 0.0;
+   float y = 0.0;
+   float r = 0.0;
+   if (A == C) x += 1.0; else if (B == C) y += 1.0;
+   if (A == D) x += 1.0; else if (B == D) y += 1.0;
+   if (x <= 1.0) r += 1.0; 
+   if (y <= 1.0) r -= 1.0;
+   return r;
+} 
+
+void main()
+{
+	vec2 fp = fract(texCoord * u_tex_size0.xy);
+
+	// Reading the texels
+
+	vec3 C0 = texture2D(decal, t1.xy).xyz; 
+	vec3 C1 = texture2D(decal, t1.zw).xyz;
+	vec3 C2 = texture2D(decal, t2.xy).xyz;
+	vec3 D3 = texture2D(decal, t2.zw).xyz;
+	vec3 C3 = texture2D(decal, t3.xy).xyz;
+	vec3 C4 = texture2D(decal, texCoord).xyz;
+	vec3 C5 = texture2D(decal, t3.zw).xyz;
+	vec3 D4 = texture2D(decal, t4.xy).xyz;
+	vec3 C6 = texture2D(decal, t4.zw).xyz;
+	vec3 C7 = texture2D(decal, t5.xy).xyz;
+	vec3 C8 = texture2D(decal, t5.zw).xyz;
+	vec3 D5 = texture2D(decal, t6.xy).xyz;
+	vec3 D0 = texture2D(decal, t6.zw).xyz;
+	vec3 D1 = texture2D(decal, t7.xy).xyz;
+	vec3 D2 = texture2D(decal, t7.zw).xyz;
+	vec3 D6 = texture2D(decal, t8.xy).xyz;
+
+	vec3 p00,p10,p01,p11;
+
+	// reducing float3 to float	
+	float c0 = reduce(C0); float c1 = reduce(C1);
+	float c2 = reduce(C2); float c3 = reduce(C3);
+	float c4 = reduce(C4); float c5 = reduce(C5);
+	float c6 = reduce(C6); float c7 = reduce(C7);
+	float c8 = reduce(C8); float d0 = reduce(D0);
+	float d1 = reduce(D1); float d2 = reduce(D2);
+	float d3 = reduce(D3); float d4 = reduce(D4);
+	float d5 = reduce(D5); float d6 = reduce(D6);
+
+	/*              SuperEagle code               */
+	/*  Copied from the Dosbox source code        */
+	/*  Copyright (C) 2002-2007  The DOSBox Team  */
+	/*  License: GNU-GPL                          */
+	/*  Adapted by guest(r) on 16.4.2007          */       
+	if (c4 != c8)
+	{
+		if (c7 == c5)
+		{
+			p01 = p10 = C7;
+			if ((c6 == c7) || (c5 == c2))
+			{
+				p00 = 0.25 * (3.0 * C7 + C4);
+			}
+			else
+			{
+				p00 = 0.5 * (C4 + C5);
+			}
+
+			if ((c5 == d4) || (c7 == d1))
+			{
+				p11 = 0.25 * (3.0 * C7 + C8);
+			}
+			else
+			{
+				p11 = 0.5 * (C7 + C8);
+			}
+		}
+		else
+		{
+			p11 = 0.125 * (6.0 * C8 + C7 + C5);
+			p00 = 0.125 * (6.0 * C4 + C7 + C5);
+
+			p10 = 0.125 * (6.0 * C7 + C4 + C8);
+			p01 = 0.125 * (6.0 * C5 + C4 + C8);
+		}
+	}
+	else
+	{
+		if (c7 != c5)
+		{
+			p11 = p00 = C4;
+
+			if ((c1 == c4) || (c8 == d5))
+			{
+				p01 = 0.25 * (3.0 * C4 + C5);
+			}
+			else
+			{
+				p01 = 0.5 * (C4 + C5);
+		 	}
+
+		 	if ((c8 == d2) || (c3 == c4))
+		 	{
+				p10 = 0.25 * (3.0 * C4 + C7);
+		 	}
+		 	else
+		 	{
+				p10 = 0.5 * (C7 + C8);
+		 	}
+		}
+		else
+		{
+			float r = 0.0;
+			r += GET_RESULT(c5, c4, c6, d1);
+			r += GET_RESULT(c5, c4, c3, c1);
+			r += GET_RESULT(c5, c4, d2, d5);
+			r += GET_RESULT(c5, c4, c2, d4);
+
+			if (r > 0.0)
+			{
+				p01 = p10 = C7;
+				p00 = p11 = 0.5 * (C4 + C5);
+			}
+			else if (r < 0.0)
+			{
+				p11 = p00 = C4;
+				p01 = p10 = 0.5 * (C4 + C5);
+			}
+			else
+			{
+				p11 = p00 = C4;
+				p01 = p10 = C7;
+			}
+		}
+	}
+	
+	p10 = (fp.x < 0.50) ? (fp.y < 0.50 ? p00 : p10) : (fp.y < 0.50 ? p01: p11);
+	
+	gl_FragColor = vec4(p10.rgb, 1.0);
+}
diff --git a/src/osd/modules/render/bgfx/shaders/chains/supereagle/varying.def.sc b/src/osd/modules/render/bgfx/shaders/chains/supereagle/varying.def.sc
new file mode 100644
index 00000000000..7adabc462e5
--- /dev/null
+++ b/src/osd/modules/render/bgfx/shaders/chains/supereagle/varying.def.sc
@@ -0,0 +1,14 @@
+vec4 v_color0    : COLOR0    = vec4(1.0, 0.0, 0.0, 1.0);
+vec2 texCoord : TEXCOORD0 = vec2(0.0, 0.0);
+vec4 t1 : TEXCOORD1 = vec4(0.0, 0.0, 0.0, 0.0);
+vec4 t2 : TEXCOORD2 = vec4(0.0, 0.0, 0.0, 0.0);
+vec4 t3 : TEXCOORD3 = vec4(0.0, 0.0, 0.0, 0.0);
+vec4 t4 : TEXCOORD4 = vec4(0.0, 0.0, 0.0, 0.0);
+vec4 t5 : TEXCOORD5 = vec4(0.0, 0.0, 0.0, 0.0);
+vec4 t6 : TEXCOORD6 = vec4(0.0, 0.0, 0.0, 0.0);
+vec4 t7 : TEXCOORD7 = vec4(0.0, 0.0, 0.0, 0.0);
+vec4 t8 : TEXCOORD8 = vec4(0.0, 0.0, 0.0, 0.0);
+
+vec3 a_position  : POSITION;
+vec4 a_color0    : COLOR0;
+vec2 a_texcoord0 : TEXCOORD0;
diff --git a/src/osd/modules/render/bgfx/shaders/chains/supereagle/vs_blit.sc b/src/osd/modules/render/bgfx/shaders/chains/supereagle/vs_blit.sc
new file mode 100644
index 00000000000..7d857008291
--- /dev/null
+++ b/src/osd/modules/render/bgfx/shaders/chains/supereagle/vs_blit.sc
@@ -0,0 +1,14 @@
+$input a_position, a_texcoord0, a_color0
+$output texCoord, v_color0
+
+// license:BSD-3-Clause
+// copyright-holders:Dario Manesku
+
+#include "common.sh"
+
+void main()
+{
+	gl_Position = mul(u_viewProj, vec4(a_position.xy, 0.0, 1.0));
+	texCoord = a_texcoord0.xy;
+	v_color0 = a_color0;
+}
diff --git a/src/osd/modules/render/bgfx/shaders/chains/supereagle/vs_eagle.sc b/src/osd/modules/render/bgfx/shaders/chains/supereagle/vs_eagle.sc
new file mode 100644
index 00000000000..d233629a036
--- /dev/null
+++ b/src/osd/modules/render/bgfx/shaders/chains/supereagle/vs_eagle.sc
@@ -0,0 +1,43 @@
+$input a_position, a_texcoord0, a_color0
+$output v_color0, texCoord, t1, t2, t3, t4, t5, t6, t7, t8
+
+// license:GPL-2.0+
+// copyright-holders:The DOSBox Team
+
+/*              SuperEagle code               */
+/*  Copied from the Dosbox source code        */
+/*  Copyright (C) 2002-2007  The DOSBox Team  */
+/*  License: GNU-GPL                          */
+/*  Adapted by guest(r) on 16.4.2007          */    
+
+#include "common.sh"
+
+// Autos
+uniform vec4 u_tex_size0;
+
+void main()
+{
+	gl_Position = mul(u_viewProj, vec4(a_position.xy, 0.0, 1.0));
+	v_color0 = a_color0;
+	
+	vec2 ps = vec2(1.0, 1.0) / u_tex_size0.xy;
+	float dx = ps.x;
+	float dy = ps.y;
+
+	texCoord = a_texcoord0.xy;
+	t1.xy = texCoord + vec2(-dx,-dy);
+	t1.zw = texCoord + vec2(-dx,  0);
+	t2.xy = texCoord + vec2(+dx,-dy);
+	t2.zw = texCoord + vec2(+dx+dx,-dy);
+	t3.xy = texCoord + vec2(-dx,  0);
+	t3.zw = texCoord + vec2(+dx,  0);
+	t4.xy = texCoord + vec2(+dx+dx,  0);
+	t4.zw = texCoord + vec2(-dx,+dy);
+	t5.xy = texCoord + vec2(  0,+dy);
+	t5.zw = texCoord + vec2(+dx,+dy);
+	t6.xy = texCoord + vec2(+dx+dx,+dy);
+	t6.zw = texCoord + vec2(-dx,+dy+dy);
+	t7.xy = texCoord + vec2(  0,+dy+dy);
+	t7.zw = texCoord + vec2(+dx,+dy+dy);
+	t8.xy = texCoord + vec2(+dx+dx,+dy+dy);
+}

From 3bf4db88b83dc7ba9639e6a423818e380a7c93f1 Mon Sep 17 00:00:00 2001
From: David Haywood <mamehaze@users.noreply.github.com>
Date: Tue, 19 Apr 2016 16:06:52 +0100
Subject: [PATCH 096/122] misc (nw)

---
 src/mame/drivers/gaelco2.cpp  |  7 ++++++-
 src/mame/drivers/galaxian.cpp |  2 +-
 src/mame/drivers/segas24.cpp  | 22 ++++++++++++++++++++--
 3 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/src/mame/drivers/gaelco2.cpp b/src/mame/drivers/gaelco2.cpp
index 67febc0565c..a8769872e56 100644
--- a/src/mame/drivers/gaelco2.cpp
+++ b/src/mame/drivers/gaelco2.cpp
@@ -19,6 +19,11 @@
     Snow Board     | 1996 | CG-1V 366 | 960419/1 | Lattice IspLSI 1016-80LJ
     Bang!          | 1998 | CG-1V 388 | 980921/1 | No
 
+	Notes:
+	touchgok:
+	sounds cut out sometimes, others are often missing (sound status reads as busy,
+	so no attempt made to play new sound) probably bug in devices\sound\gaelco.cpp ??
+
 ***************************************************************************/
 
 #include "emu.h"
@@ -1517,7 +1522,7 @@ GAME( 1994, aligatorun,aligator,alighunt, alighunt, gaelco2_state, alighunt, ROT
 GAME( 1995, touchgo,  0,        touchgo,  touchgo,  gaelco2_state, touchgop, ROT0, "Gaelco", "Touch & Go (World)", MACHINE_UNEMULATED_PROTECTION | MACHINE_NOT_WORKING )
 GAME( 1995, touchgon, touchgo,  touchgo,  touchgo,  gaelco2_state, touchgop, ROT0, "Gaelco", "Touch & Go (Non North America)", MACHINE_UNEMULATED_PROTECTION | MACHINE_NOT_WORKING )
 GAME( 1995, touchgoe, touchgo,  touchgo,  touchgo,  gaelco2_state, touchgop, ROT0, "Gaelco", "Touch & Go (earlier revision)", MACHINE_UNEMULATED_PROTECTION | MACHINE_NOT_WORKING )
-GAME( 1995, touchgok, touchgo,  touchgo,  touchgo,  gaelco2_state, touchgo,  ROT0, "Gaelco", "Touch & Go (Korea, unprotected)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1995, touchgok, touchgo,  touchgo,  touchgo,  gaelco2_state, touchgo,  ROT0, "Gaelco", "Touch & Go (Korea, unprotected)", MACHINE_IMPERFECT_SOUND ) // doesn't say 'Korea' but was sourced there, shows 2 copyright lines like the 'earlier revision'
 
 GAME( 1995, wrally2,  0,        wrally2,  wrally2,  driver_device, 0,        ROT0, "Gaelco", "World Rally 2: Twin Racing", MACHINE_UNEMULATED_PROTECTION | MACHINE_NOT_WORKING )
 
diff --git a/src/mame/drivers/galaxian.cpp b/src/mame/drivers/galaxian.cpp
index 996b508bd19..e1d30360857 100644
--- a/src/mame/drivers/galaxian.cpp
+++ b/src/mame/drivers/galaxian.cpp
@@ -7360,7 +7360,7 @@ ROM_START( kamikazp )
 	ROM_LOAD( "KK7PMC.bin",   0x0800, 0x0800, CRC(58673a07) SHA1(4e51f803718f39436e43d3bceda836215a98cc37) )
 
 	ROM_REGION( 0x0020, "proms", 0 )
-	ROM_LOAD( "prom.6l",      0x0000, 0x0020, CRC(6a0c7d87) SHA1(140335d85c67c75b65689d4e76d29863c209cf32) ) // not dumped, taken from Astrians, colours match screenshots
+	ROM_LOAD( "prom.6l",      0x0000, 0x0020, CRC(6a0c7d87) SHA1(140335d85c67c75b65689d4e76d29863c209cf32) )
 ROM_END
 
 ROM_START( superg )
diff --git a/src/mame/drivers/segas24.cpp b/src/mame/drivers/segas24.cpp
index ff2fe70008f..06cbdb2e3d9 100644
--- a/src/mame/drivers/segas24.cpp
+++ b/src/mame/drivers/segas24.cpp
@@ -709,8 +709,26 @@ Pixel clock is 16MHz, hsync is every 656 pixels, cpu clock is 10MHz.
 So that's 656*10/16=410 cpu clocks per hsync, or 410*512=209902 total.
 With 26 cycles per loop, that's 8073 loops.  Freeplay it is.
 
-So, now what?  Maybe the cpu is 8Mhz, maybe there's a wait time on the
-a00000 access. 
+--- Update from Charles MacDonald ---
+
+I ran some tests. For the two CPUs, A (68000) and B (FD1094), normally
+there are no wait states when CPU A accesses $A00000. As that address
+is on CPU A's bus, CPU B's accesses to it take twice as long (eight 10 MHz
+clocks instead of four) due to contention. The only exception is when
+CPU A is completely idle from a STOP instruction, at which point CPU B
+can access that memory at full speed (four clocks per access).
+
+Assuming Gain Ground has CPU A running code out of BIOS ROM or work RAM,
+and CPU B is running out of work RAM, then each one of those $A00000
+accesses will eat up double the time.
+
+The other factor is DRAM refresh for the work RAM, both CPUs have some
+memory access stretched out by four cycles every 19 to 20 ms. It looks
+like both DRAM banks are refreshed in parallel which seems to explain
+why refresh on CPU A's bus doesn't count as contention for CPU B and
+vice-versa. So there's only refresh event that eats up time for both
+CPUs to worry about.
+
 
 
 */

From 2d50bd49cfc667b4faff18c015d4ce1759fa04f1 Mon Sep 17 00:00:00 2001
From: David Haywood <mamehaze@users.noreply.github.com>
Date: Tue, 19 Apr 2016 17:22:00 +0100
Subject: [PATCH 097/122] new clones Ketsui: Kizuna Jigoku Tachi (2003/01/01.
 Master Ver., bootleg cartridge conversion)

surprisingly this shows that the cartridge can map over the bios space
---
 src/mame/drivers/pgm.cpp | 49 +++++++++++++++++++++++++++++++++++++++-
 src/mame/mame.lst        |  3 ++-
 2 files changed, 50 insertions(+), 2 deletions(-)

diff --git a/src/mame/drivers/pgm.cpp b/src/mame/drivers/pgm.cpp
index 5906663a7ad..754e970bda5 100644
--- a/src/mame/drivers/pgm.cpp
+++ b/src/mame/drivers/pgm.cpp
@@ -331,7 +331,7 @@ ADDRESS_MAP_END
 
 ADDRESS_MAP_START( pgm_mem, AS_PROGRAM, 16, pgm_state )
 	AM_IMPORT_FROM(pgm_base_mem)
-	AM_RANGE(0x000000, 0x01ffff) AM_ROM   /* BIOS ROM */
+	AM_RANGE(0x000000, 0x0fffff) AM_ROM   /* BIOS ROM */
 ADDRESS_MAP_END
 
 ADDRESS_MAP_START( pgm_basic_mem, AS_PROGRAM, 16, pgm_state )
@@ -2813,6 +2813,8 @@ ROM_START( ddp2100c )
 ROM_END
 
 
+
+
 /*
 
 Dragon World 2001 IGS PGM cart
@@ -4199,6 +4201,48 @@ ROM_START( ketarr )
 	ROM_LOAD( "ket_defaults.nv", 0x0000000, 0x020000, CRC(3ca892d8) SHA1(67430df5217e453ae8140c5653deeadfad8fa684) )
 ROM_END
 
+/*
+
+Usually a Demon Front cart is used as donor for the Ketsui conversion.Anyway these can be the donor carts:
+
+Knight of Valour 2
+Demon Front
+Dodonpachi 2 Bee Storm
+Martial Master
+Gladiator
+Killing Blade
+
+*/
+
+ROM_START( ketbl ) // this assumes a Dodonpachi 2 Bee Storm cart was used
+	ROM_REGION( 0x600000, "maincpu", 0 ) /* 68000 Code */
+	PGM_68K_BIOS
+	// the program rom in the cartridge actually ends up mapping OVER the motherboard bios rom, you don't get the PGM splash etc.
+	ROM_LOAD16_WORD_SWAP( "ketsui_u1.bin", 0x000000, 0x200000, CRC(391767b4) SHA1(722e364d3a8982a40df8f898e995212a1a6fee35) )
+	ROM_CONTINUE(0x000000,0x200000) // first half is empty, use 2nd half
+
+	ROM_REGION( 0x4000, "prot", 0 ) /* ARM protection ASIC - internal rom */ // leftover from original game
+	ROM_LOAD( "ddp2_igs027a_japan.bin", 0x000000, 0x04000, CRC(742d34d2) SHA1(4491c08f3cefef2933ad5a741f4bb05cc2f3e1a0) )
+
+	ROM_REGION32_LE( 0x400000, "user1", 0 ) /* Protection Data (encrypted external ARM data) */ // leftover from original game
+	ROM_LOAD( "v100.u23", 0x000000, 0x20000, CRC(06c3dd29) SHA1(20c9479f158467fc2037dcf162b6c6be18c91d46) )
+
+	ROM_REGION( 0xc00000, "tiles", 0 ) /* 8x8 Text Tiles + 32x32 BG Tiles */
+	PGM_VIDEO_BIOS
+	ROM_LOAD( "t04701w064.u19",   0x180000, 0x800000, CRC(2665b041) SHA1(fb1107778b66f2af0de77ac82e1ee2902f53a959) ) //text-1
+
+	ROM_REGION( 0x1000000, "sprcol", 0 ) /* Sprite Colour Data */
+	ROM_LOAD( "a04701w064.u7",    0x0000000, 0x0800000, CRC(5ef1b94b) SHA1(f10dfa46e0a4d297c3a856aea5b49d648f98935c) ) //image-1
+	ROM_LOAD( "a04702w064.u8",    0x0800000, 0x0800000, CRC(26d6da7f) SHA1(f20e07a7994f41b5ed917f8b0119dc5542f3541c) ) //image-2
+
+	ROM_REGION( 0x0800000, "sprmask", 0 ) /* Sprite Masks + Colour Indexes */
+	ROM_LOAD( "b04701w064.u1",    0x0000000, 0x0800000, CRC(1bec008d) SHA1(07d117dc2eebb35727fb18a7c563acbaf25a8d36) ) //bitmap-1
+
+	ROM_REGION( 0x800000, "ics", ROMREGION_ERASE00 ) /* Samples - (8 bit mono 11025Hz) - */
+	PGM_AUDIO_BIOS
+	ROM_LOAD( "m04701b032.u17",    0x400000, 0x400000, CRC(b46e22d1) SHA1(670853dc485942fb96380568494bdf3235f446ee) ) //music-1
+ROM_END
+
 ROM_START( espgal )
 	ROM_REGION( 0x600000, "maincpu", 0 ) /* 68000 Code */
 	/* doesn't use a separate BIOS rom */
@@ -4563,6 +4607,9 @@ GAME( 2002, ket1,         ket,       pgm_arm_type1_cave,    pgm, pgm_arm_type1_s
 GAME( 2002, keta,         ket,       pgm_arm_type1_cave,    pgm, pgm_arm_type1_state,     ket,       ROT270, "Cave (AMI license)", "Ketsui: Kizuna Jigoku Tachi (2003/01/01 Master Ver.)",  MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
 GAME( 2002, ketb,         ket,       pgm_arm_type1_cave,    pgm, pgm_arm_type1_state,     ket,       ROT270, "Cave (AMI license)", "Ketsui: Kizuna Jigoku Tachi (2003/01/01 Master Ver)",   MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
 
+GAME( 2001, ketbl,        ket,       pgm_arm_type2,         pgm, pgm_arm_type2_state,     ddp2,       ROT270, "bootleg", "Ketsui: Kizuna Jigoku Tachi (2003/01/01. Master Ver., bootleg cartridge conversion)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+
+
 // these are modern hacks, some of them have been seen on original PCBs, also reportedly on a bootleg PCB with mostly original components but the ARM replaced with a custom chip.
 // this is a significantly reworked version of the game
 GAME( 2014, ketarr,    ket,       pgm_arm_type1_cave, pgm,      pgm_arm_type1_state, ket,        ROT270, "hack (trap15)", "Ketsui: Kizuna Jigoku Tachi (2014/07/16 ARRANGE 1.7 VER) (hack)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/mame.lst b/src/mame/mame.lst
index af563cd70da..4a37aea106b 100644
--- a/src/mame/mame.lst
+++ b/src/mame/mame.lst
@@ -29983,7 +29983,8 @@ ketarr151                       // hack
 ketarrf                         // hack
 ketarrs15                       // hack
 ketarrs151                      // hack
-ketb                            //
+ketb							//
+ketbl                           //
 killbld                         // (c) 1998 The Killing Blade
 killbld104                      //
 killbldp                        // (c) 2004 Killing Blade Plus

From 48042b1e0ad08d0c941330913280dca54f6e37ee Mon Sep 17 00:00:00 2001
From: Ville Linde <villedevs@gmail.com>
Date: Tue, 19 Apr 2016 19:28:24 +0300
Subject: [PATCH 098/122] hornet: hook up LAN board DS2401 and eeprom (nw)

---
 src/mame/drivers/hornet.cpp | 35 +++++++++++++++++++++++++----------
 1 file changed, 25 insertions(+), 10 deletions(-)

diff --git a/src/mame/drivers/hornet.cpp b/src/mame/drivers/hornet.cpp
index a3d499cd307..a272fc1126d 100644
--- a/src/mame/drivers/hornet.cpp
+++ b/src/mame/drivers/hornet.cpp
@@ -353,7 +353,8 @@ public:
 		m_analog1(*this, "ANALOG1"),
 		m_analog2(*this, "ANALOG2"),
 		m_user3_ptr(*this, "user3"),
-		m_user5_ptr(*this, "user5")
+		m_user5_ptr(*this, "user5"),
+		m_lan_ds2401(*this, "lan_serial_id")
 	{ }
 
 	// TODO: Needs verification on real hardware
@@ -377,6 +378,7 @@ public:
 	optional_ioport m_eepromout, m_analog1, m_analog2;
 	optional_region_ptr<UINT8> m_user3_ptr;
 	optional_region_ptr<UINT8> m_user5_ptr;
+	optional_device<ds2401_device> m_lan_ds2401;
 
 	emu_timer *m_sound_irq_timer;
 	UINT8 m_led_reg0;
@@ -413,6 +415,8 @@ public:
 	DECLARE_WRITE16_MEMBER(soundtimer_count_w);
 	ADC12138_IPT_CONVERT_CB(adc12138_input_callback);
 	DECLARE_WRITE8_MEMBER(jamma_jvs_w);
+	DECLARE_READ8_MEMBER(comm_eeprom_r);
+	DECLARE_WRITE8_MEMBER(comm_eeprom_w);
 
 	DECLARE_DRIVER_INIT(hornet);
 	DECLARE_DRIVER_INIT(hornet_2board);
@@ -542,8 +546,6 @@ READ8_MEMBER(hornet_state::sysreg_r)
 			    0x01 = ADDO (ADC DO)
 			*/
 			r = 0xf0;
-			if (m_lan_eeprom)
-				r |= m_lan_eeprom->do_read() << 3;
 			r |= m_adc12138->do_r(space, 0) | (m_adc12138->eoc_r(space, 0) << 2);
 			break;
 
@@ -581,8 +583,6 @@ WRITE8_MEMBER(hornet_state::sysreg_w)
 			    0x02 = LAMP1
 			    0x01 = LAMP0
 			*/
-			if (m_eepromout)
-				m_eepromout->write(data, 0xff);
 			osd_printf_debug("System register 0 = %02X\n", data);
 			break;
 
@@ -647,6 +647,20 @@ WRITE8_MEMBER(hornet_state::sysreg_w)
 
 /*****************************************************************************/
 
+READ8_MEMBER(hornet_state::comm_eeprom_r)
+{
+	UINT8 r = 0;
+	r |= (m_lan_eeprom->do_read() & 1) << 1;
+	r |= m_lan_ds2401->read() & 1;
+	return r;
+}
+
+WRITE8_MEMBER(hornet_state::comm_eeprom_w)
+{
+	m_eepromout->write(data, 0xff);
+	m_lan_ds2401->write((data >> 4) & 1);
+}
+
 WRITE32_MEMBER(hornet_state::comm1_w)
 {
 	printf("comm1_w: %08X, %08X, %08X\n", offset, data, mem_mask);
@@ -725,6 +739,7 @@ static ADDRESS_MAP_START( hornet_map, AS_PROGRAM, 32, hornet_state )
 	AM_RANGE(0x7d010000, 0x7d01ffff) AM_WRITE8(sysreg_w, 0xffffffff)
 	AM_RANGE(0x7d020000, 0x7d021fff) AM_DEVREADWRITE8("m48t58", timekeeper_device, read, write, 0xffffffff)  /* M48T58Y RTC/NVRAM */
 	AM_RANGE(0x7d030000, 0x7d03000f) AM_DEVREADWRITE8("k056800", k056800_device, host_r, host_w, 0xffffffff)
+	AM_RANGE(0x7d040004, 0x7d040007) AM_READWRITE8(comm_eeprom_r, comm_eeprom_w, 0xffffffff)
 	AM_RANGE(0x7d042000, 0x7d043fff) AM_RAM             /* COMM BOARD 0 */
 	AM_RANGE(0x7d044000, 0x7d044007) AM_READ(comm0_unk_r)
 	AM_RANGE(0x7d048000, 0x7d048003) AM_WRITE(comm1_w)
@@ -912,9 +927,9 @@ static INPUT_PORTS_START( sscope2 )
 
 	// LAN board EEPROM
 	PORT_START( "EEPROMOUT" )
-	PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("lan_eeprom", eeprom_serial_93cxx_device, di_write)
-	PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("lan_eeprom", eeprom_serial_93cxx_device, clk_write)
-	PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("lan_eeprom", eeprom_serial_93cxx_device, cs_write)
+	PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("lan_eeprom", eeprom_serial_93cxx_device, di_write)
+	PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("lan_eeprom", eeprom_serial_93cxx_device, clk_write)
+	PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("lan_eeprom", eeprom_serial_93cxx_device, cs_write)
 INPUT_PORTS_END
 
 
@@ -1404,10 +1419,10 @@ ROM_START(sscope2)
 	ROM_LOAD( "m48t58y-70pc1", 0x000000, 0x002000, CRC(d4e69d7a) SHA1(1e29eecf4886e5e098a388dedd5f3901c2bb65e5) )
 
 	ROM_REGION(0x8, "lan_serial_id", 0)     /* LAN Board DS2401 */
-	ROM_LOAD( "ds2401.8b", 0x000000, 0x000008, NO_DUMP )
+	ROM_LOAD( "ds2401.8b", 0x000000, 0x000008, BAD_DUMP CRC(bae36d0b) SHA1(fb20e56fb73a887dc7b6db49efd1f8a18b959152) ) // hand built
 
 	ROM_REGION(0x80, "lan_eeprom", 0)       /* LAN Board AT93C46 */
-	ROM_LOAD( "at93c46.16g", 0x000000, 0x000080, NO_DUMP )
+	ROM_LOAD( "at93c46.16g", 0x000000, 0x000080, BAD_DUMP CRC(cc63c213) SHA1(fb20e56fb73a887dc7b6db49efd1f8a18b959152) ) // hand built
 ROM_END
 
 ROM_START(gradius4)

From 520111798ee49fa6b7b644455fef470d18fd918a Mon Sep 17 00:00:00 2001
From: cracyc <cracyc@users.noreply.github.com>
Date: Tue, 19 Apr 2016 13:15:50 -0500
Subject: [PATCH 099/122] luaengine: save a copy of the search path so it
 doesn't get thrown away (nw)

---
 src/emu/luaengine.cpp | 39 +++++++++++++++++++++------------------
 src/emu/luaengine.h   | 13 +++++++++++++
 2 files changed, 34 insertions(+), 18 deletions(-)

diff --git a/src/emu/luaengine.cpp b/src/emu/luaengine.cpp
index 34b78ba2890..4d7fc1474d4 100644
--- a/src/emu/luaengine.cpp
+++ b/src/emu/luaengine.cpp
@@ -1523,12 +1523,12 @@ int lua_engine::lua_screen::l_draw_text(lua_State *L)
 
 int lua_engine::lua_emu_file::l_emu_file_read(lua_State *L)
 {
-	emu_file *file = luabridge::Stack<emu_file *>::get(L, 1);
+	lua_emu_file *file = luabridge::Stack<lua_emu_file *>::get(L, 1);
 	luaL_argcheck(L, lua_isnumber(L, 2), 2, "length (integer) expected");
 	int ret, len = lua_tonumber(L, 2);
 	luaL_Buffer buff;
 	char *ptr = luaL_buffinitsize(L, &buff, len);
-	ret = file->read(ptr, len);
+	ret = file->file.read(ptr, len);
 	luaL_pushresultsize(&buff, ret);
 	return 1;
 }
@@ -1738,7 +1738,8 @@ int lua_engine::compile_with_env(const char *envname, const char *script, const
 	if(env)
 	{
 		error = luaL_loadstring(m_lua_state, env);
-		lua_pushvalue(m_lua_state, -2);
+		if(error == LUA_OK)
+			lua_pushvalue(m_lua_state, -2);
 		if((error != LUA_OK) || ((error = lua_pcall(m_lua_state, 1, 0, 0)) != LUA_OK))
 		{
 			if((error == LUA_ERRSYNTAX) || (error == LUA_ERRRUN))
@@ -1770,7 +1771,10 @@ Tout lua_engine::run(const char *env, int ref, Tin in)
 	lua_settop(m_lua_state, 0);
 	luabridge::Stack<Tin>::push(m_lua_state, in);
 	run_internal(env, ref);
-	ret = luabridge::Stack<Tout>::get(m_lua_state, 1);
+	if(lua_isnil(m_lua_state, 1))
+		ret = reinterpret_cast<Tout>(0);
+	else
+		ret = luabridge::Stack<Tout>::get(m_lua_state, 1);
 	lua_pop(m_lua_state, 1);
 	return ret;
 }
@@ -1782,7 +1786,10 @@ Tout lua_engine::run(const char *env, int ref)
 	lua_settop(m_lua_state, 0);
 	lua_pushnil(m_lua_state);
 	run_internal(env, ref);
-	ret = luabridge::Stack<Tout>::get(m_lua_state, 1);
+	if(lua_isnil(m_lua_state, 1))
+		ret = reinterpret_cast<Tout>(0);
+	else
+		ret = luabridge::Stack<Tout>::get(m_lua_state, 1);
 	lua_pop(m_lua_state, 1);
 	return ret;
 }
@@ -1906,7 +1913,7 @@ int lua_engine::l_emu_register_menu(lua_State *L)
 {
 	luaL_argcheck(L, lua_isfunction(L, 1), 1, "callback function expected");
 	luaL_argcheck(L, lua_isfunction(L, 2), 2, "callback function expected");
-	luaL_argcheck(L, lua_isstring(L, 3), 3, "message (string) expected");
+	luaL_argcheck(L, lua_isstring(L, 3), 3, "name (string) expected");
 	std::string name = luaL_checkstring(L, 3);
 	std::string cbfield = "menu_cb_" + name;
 	std::string popfield = "menu_pop_" + name;
@@ -2476,19 +2483,15 @@ void lua_engine::initialize()
 				.addProperty <bool> ("is_creatable", &device_image_interface::is_creatable)
 				.addProperty <bool> ("is_reset_on_load", &device_image_interface::is_reset_on_load)
 			.endClass()
-			.beginClass <lua_emu_file> ("lua_file")
-				.addCFunction ("read", &lua_emu_file::l_emu_file_read)
-			.endClass()
-			// make sure there's a reference to the emu_file search path in your script as long as you need it
-			// otherwise it might be garbage collected as emu_file doesn't copy the string
-			.deriveClass <emu_file, lua_emu_file> ("file")
+			.beginClass <lua_emu_file> ("file")
 				.addConstructor <void (*)(const char *, UINT32)> ()
-				.addFunction ("open", static_cast<osd_file::error (emu_file::*)(const char *)>(&emu_file::open))
-				.addFunction ("open_next", &emu_file::open_next)
-				.addFunction ("seek", &emu_file::seek)
-				.addFunction ("size", &emu_file::size)
-				.addFunction ("filename", &emu_file::filename)
-				.addFunction ("fullpath", &emu_file::fullpath)
+				.addCFunction ("read", &lua_emu_file::l_emu_file_read)
+				.addFunction ("open", &lua_emu_file::open)
+				.addFunction ("open_next", &lua_emu_file::open_next)
+				.addFunction ("seek", &lua_emu_file::seek)
+				.addFunction ("size", &lua_emu_file::size)
+				.addFunction ("filename", &lua_emu_file::filename)
+				.addFunction ("fullpath", &lua_emu_file::fullpath)
 			.endClass()
 			.beginClass <lua_item> ("item")
 				.addConstructor <void (*)(int)> ()
diff --git a/src/emu/luaengine.h b/src/emu/luaengine.h
index d8a538c9a42..0f18cb995b1 100644
--- a/src/emu/luaengine.h
+++ b/src/emu/luaengine.h
@@ -208,7 +208,20 @@ private:
 	};
 
 	struct lua_emu_file {
+		lua_emu_file(const char *searchpath, UINT32 openflags) :
+			path(searchpath),
+			file(path.c_str(), openflags) {}
+
 		int l_emu_file_read(lua_State *L);
+		osd_file::error open(const char *name) {return file.open(name);}
+		osd_file::error open_next() {return file.open_next();}
+		int seek(INT64 offset, int whence) {return file.seek(offset, whence);}
+		UINT64 size() {return file.size();}
+		const char *filename() {return file.filename();}
+		const char *fullpath() {return file.fullpath();}
+
+		std::string path;
+		emu_file file;
 	};
 
 	struct lua_item {

From a86983713dffcc926c50227a9e26091022bbc32c Mon Sep 17 00:00:00 2001
From: Ville Linde <villedevs@gmail.com>
Date: Tue, 19 Apr 2016 21:21:44 +0300
Subject: [PATCH 100/122] wrong sha1 (nw)

---
 src/mame/drivers/hornet.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/mame/drivers/hornet.cpp b/src/mame/drivers/hornet.cpp
index a272fc1126d..9125400a871 100644
--- a/src/mame/drivers/hornet.cpp
+++ b/src/mame/drivers/hornet.cpp
@@ -1419,7 +1419,7 @@ ROM_START(sscope2)
 	ROM_LOAD( "m48t58y-70pc1", 0x000000, 0x002000, CRC(d4e69d7a) SHA1(1e29eecf4886e5e098a388dedd5f3901c2bb65e5) )
 
 	ROM_REGION(0x8, "lan_serial_id", 0)     /* LAN Board DS2401 */
-	ROM_LOAD( "ds2401.8b", 0x000000, 0x000008, BAD_DUMP CRC(bae36d0b) SHA1(fb20e56fb73a887dc7b6db49efd1f8a18b959152) ) // hand built
+	ROM_LOAD( "ds2401.8b", 0x000000, 0x000008, BAD_DUMP CRC(bae36d0b) SHA1(4dd5915888d5718356b40bbe897f2470e410176a) ) // hand built
 
 	ROM_REGION(0x80, "lan_eeprom", 0)       /* LAN Board AT93C46 */
 	ROM_LOAD( "at93c46.16g", 0x000000, 0x000080, BAD_DUMP CRC(cc63c213) SHA1(fb20e56fb73a887dc7b6db49efd1f8a18b959152) ) // hand built

From 8ed3a7d94a65ee01bf1adce3ea8118c04d41a18d Mon Sep 17 00:00:00 2001
From: ImJezze <jezze@gmx.net>
Date: Mon, 18 Apr 2016 20:25:28 +0200
Subject: [PATCH 101/122] Refactored distortion pass - separated curvature
 parameter into distortion, cubic_distortion and distort_corner - distortion
 and cubic_distortion can be negative, to compensate each other -
 distort_corner is intependent from the image distortion

---
 docs/hlsl.txt                          |  4 ++-
 hlsl/distortion.fx                     | 39 ++++++++++++++++++--------
 ini/presets/gameboy.ini                |  4 ++-
 ini/presets/gba.ini                    |  4 ++-
 ini/presets/lcd-matrix.ini             |  4 ++-
 ini/presets/lcd.ini                    |  4 ++-
 ini/presets/raster.ini                 |  4 ++-
 ini/presets/vector-mono.ini            |  4 ++-
 ini/presets/vector.ini                 |  4 ++-
 src/osd/modules/render/d3d/d3dhlsl.cpp | 34 ++++++++++++++++------
 src/osd/modules/render/d3d/d3dhlsl.h   |  8 ++++--
 src/osd/windows/winmain.cpp            |  4 ++-
 src/osd/windows/winmain.h              |  8 ++++--
 13 files changed, 93 insertions(+), 32 deletions(-)

diff --git a/docs/hlsl.txt b/docs/hlsl.txt
index db6cfa6def4..13382f97273 100644
--- a/docs/hlsl.txt
+++ b/docs/hlsl.txt
@@ -27,7 +27,9 @@ shadow_mask_usize       0.0 to 1.0      The size of one shadow mask tile in U/V
 shadow_mask_vsize       0.0 to 1.0      The shadow mask textures always has a size of power-of-two.
 shadow_mask_voffset    -1.0 to 1.0      The offset of the shadow mask texture in U/V coordinates.
 shadow_mask_voffset    -1.0 to 1.0      An offset of 1.0 repressents one pixel on screen.
-curvature               0.0 to 1.0      Curvature amount of the screen.
+distortion             -1.0 to 1.0      Distortion amount of the screen.
+cubic_distortion       -1.0 to 1.0      Cubic Distortion amount of the screen.
+distort_corner          0.0 to 1.0      Distorted corners amount of the screen.
 round_corner            0.0 to 1.0      Rounded corners amount of the screen.
 smooth_border           0.0 to 1.0      Smooth borders amount of the screen.
 reflection              0.0 to 1.0      Refelection amount of the screen highlight.
diff --git a/hlsl/distortion.fx b/hlsl/distortion.fx
index e33b8811ba5..f683397b17a 100644
--- a/hlsl/distortion.fx
+++ b/hlsl/distortion.fx
@@ -111,7 +111,9 @@ VS_OUTPUT vs_main(VS_INPUT Input)
 // Distortion Pixel Shader
 //-----------------------------------------------------------------------------
 
-uniform float CurvatureAmount = 0.0f;
+uniform float DistortionAmount = 0.0f;      // k     - quartic distortion coefficient
+uniform float CubicDistortionAmount = 0.0f; // kcube - cubic distortion modifier
+uniform float DistortCornerAmount = 0.0f;
 uniform float RoundCornerAmount = 0.0f;
 uniform float SmoothBorderAmount = 0.0f;
 uniform float VignettingAmount = 0.0f;
@@ -195,13 +197,13 @@ float GetRoundCornerFactor(float2 coord, float radiusAmount, float smoothAmount)
 }
 
 // www.francois-tarlier.com/blog/cubic-lens-distortion-shader/
-float2 GetDistortedCoords(float2 centerCoord, float amount)
+float2 GetDistortedCoords(float2 centerCoord, float amount, float amountCube)
 {
 	// lens distortion coefficient
 	float k = amount;
 
 	// cubic distortion value
-	float kcube = amount * 2.0f;
+	float kcube = amountCube;
 
 	// compute cubic distortion factor
 	float r2 = centerCoord.x * centerCoord.x + centerCoord.y * centerCoord.y;
@@ -210,7 +212,7 @@ float2 GetDistortedCoords(float2 centerCoord, float amount)
 		: 1.0f + r2 * (k + kcube * sqrt(r2));
 
    	// fit screen bounds
-	f /= 1.0f + amount * 0.5f;
+	f /= 1.0f + amount * 0.25 + amountCube * 0.125f;
 
 	// apply cubic distortion factor
    	centerCoord *= f;
@@ -218,13 +220,13 @@ float2 GetDistortedCoords(float2 centerCoord, float amount)
 	return centerCoord;
 }
 
-float2 GetCoords(float2 coord, float distortionAmount)
+float2 GetCoords(float2 coord, float distortionAmount, float cubicDistortionAmount)
 {
 	// center coordinates
 	coord -= 0.5f;
 
 	// distort coordinates
-	coord = GetDistortedCoords(coord, distortionAmount);
+	coord = GetDistortedCoords(coord, distortionAmount, cubicDistortionAmount);
 
 	// un-center coordinates
 	coord += 0.5f;
@@ -234,18 +236,33 @@ float2 GetCoords(float2 coord, float distortionAmount)
 
 float4 ps_main(PS_INPUT Input) : COLOR
 {
+	float distortionAmount = DistortionAmount;
+	float cubicDistortionAmount = CubicDistortionAmount > 0
+		? CubicDistortionAmount * 1.1  // cubic distortion need to be a little higher to compensate the quartic distortion
+		: CubicDistortionAmount * 1.2; // negativ values even more
+
+	float2 TexelDims = 1.0f / TargetDims;
+
 	// Screen Curvature
-	float2 TexCoord = GetCoords(Input.TexCoord, CurvatureAmount * 0.25f); // reduced amount
+	float2 TexCoord = GetCoords(Input.TexCoord, distortionAmount, cubicDistortionAmount);
+
+	// Corner Curvature
+	float2 CornerCoord = GetCoords(Input.TexCoord, DistortCornerAmount, 0.0f);
+
+	// clip border
+	clip(TexCoord < 0.0f - TexelDims || TexCoord > 1.0f + TexelDims ? -1 : 1);
 
 	float2 TexCoordCentered = TexCoord;
 	TexCoordCentered -= 0.5f;
+	float2 CornerCoordCentered = CornerCoord;
+	CornerCoordCentered -= 0.5f;
 
 	// Color
 	float4 BaseColor = tex2D(DiffuseSampler, TexCoord);
 	BaseColor.a = 1.0f;
 
 	// Vignetting Simulation
-	float2 VignetteCoord = TexCoordCentered;
+	float2 VignetteCoord = CornerCoordCentered;
 
 	float VignetteFactor = GetVignetteFactor(VignetteCoord, VignettingAmount);
 	BaseColor.rgb *= VignetteFactor;
@@ -253,15 +270,15 @@ float4 ps_main(PS_INPUT Input) : COLOR
 	// Light Reflection Simulation
 	float3 LightColor = float3(1.0f, 0.90f, 0.80f); // color temperature 5.000 Kelvin
 
-	float2 SpotCoord = TexCoordCentered;
-	float2 NoiseCoord = TexCoordCentered;
+	float2 SpotCoord = CornerCoordCentered;
+	float2 NoiseCoord = CornerCoordCentered;
 
 	float SpotAddend = GetSpotAddend(SpotCoord, ReflectionAmount);
 	float NoiseFactor = GetNoiseFactor(SpotAddend, random(NoiseCoord));
 	BaseColor.rgb += SpotAddend * NoiseFactor * LightColor;
 
 	// Round Corners Simulation
-	float2 RoundCornerCoord = TexCoordCentered;
+	float2 RoundCornerCoord = CornerCoordCentered;
 
 	float roundCornerFactor = GetRoundCornerFactor(RoundCornerCoord, RoundCornerAmount, SmoothBorderAmount);
 	BaseColor.rgb *= roundCornerFactor;
diff --git a/ini/presets/gameboy.ini b/ini/presets/gameboy.ini
index 763ce5b78d5..f24453232ce 100644
--- a/ini/presets/gameboy.ini
+++ b/ini/presets/gameboy.ini
@@ -10,7 +10,9 @@ shadow_mask_usize         0.5
 shadow_mask_vsize         0.5
 shadow_mask_uoffset       0.0
 shadow_mask_voffset       0.0
-curvature                 0.0
+distortion                0.0
+cubic_distortion          0.0
+distort_corner            0.0
 round_corner              0.0
 smooth_border             0.0
 reflection                0.0
diff --git a/ini/presets/gba.ini b/ini/presets/gba.ini
index 0c8308fc072..40b1274b52f 100644
--- a/ini/presets/gba.ini
+++ b/ini/presets/gba.ini
@@ -10,7 +10,9 @@ shadow_mask_usize         0.1875
 shadow_mask_vsize         0.1875
 shadow_mask_uoffset       0.0
 shadow_mask_voffset       0.0
-curvature                 0.0
+distortion                0.0
+cubic_distortion          0.0
+distort_corner            0.0
 round_corner              0.0
 smooth_border             0.0
 reflection                0.0
diff --git a/ini/presets/lcd-matrix.ini b/ini/presets/lcd-matrix.ini
index f9de4013eca..7c97229d9f4 100644
--- a/ini/presets/lcd-matrix.ini
+++ b/ini/presets/lcd-matrix.ini
@@ -10,7 +10,9 @@ shadow_mask_usize         0.5
 shadow_mask_vsize         0.5
 shadow_mask_uoffset       0.0
 shadow_mask_voffset       0.0
-curvature                 0.0
+distortion                0.0
+cubic_distortion          0.0
+distort_corner            0.0
 round_corner              0.0
 smooth_border             0.0
 reflection                0.0
diff --git a/ini/presets/lcd.ini b/ini/presets/lcd.ini
index 0c8308fc072..40b1274b52f 100644
--- a/ini/presets/lcd.ini
+++ b/ini/presets/lcd.ini
@@ -10,7 +10,9 @@ shadow_mask_usize         0.1875
 shadow_mask_vsize         0.1875
 shadow_mask_uoffset       0.0
 shadow_mask_voffset       0.0
-curvature                 0.0
+distortion                0.0
+cubic_distortion          0.0
+distort_corner            0.0
 round_corner              0.0
 smooth_border             0.0
 reflection                0.0
diff --git a/ini/presets/raster.ini b/ini/presets/raster.ini
index 7e589fe9cb2..302ef5904fa 100644
--- a/ini/presets/raster.ini
+++ b/ini/presets/raster.ini
@@ -10,7 +10,9 @@ shadow_mask_usize         0.1875
 shadow_mask_vsize         0.25
 shadow_mask_uoffset       0.0
 shadow_mask_voffset       0.0
-curvature                 0.0
+distortion                0.0
+cubic_distortion          0.0
+distort_corner            0.0
 round_corner              0.0
 smooth_border             0.0
 reflection                0.0
diff --git a/ini/presets/vector-mono.ini b/ini/presets/vector-mono.ini
index 6a3db343cb3..5ff73b66c21 100644
--- a/ini/presets/vector-mono.ini
+++ b/ini/presets/vector-mono.ini
@@ -17,7 +17,9 @@ flicker                   0.15
 #
 hlsl_oversampling         0
 shadow_mask_alpha         0.0
-curvature                 0.0
+distortion                0.0
+cubic_distortion          0.0
+distort_corner            0.0
 round_corner              0.0
 smooth_border             0.0
 reflection                0.0
diff --git a/ini/presets/vector.ini b/ini/presets/vector.ini
index 1aeb22c5f86..f7311cceb38 100644
--- a/ini/presets/vector.ini
+++ b/ini/presets/vector.ini
@@ -20,7 +20,9 @@ shadow_mask_usize         0.1875
 shadow_mask_vsize         0.25
 shadow_mask_uoffset       0.0
 shadow_mask_voffset       0.0
-curvature                 0.0
+distortion                0.0
+cubic_distortion          0.0
+distort_corner            0.0
 round_corner              0.0
 smooth_border             0.0
 reflection                0.0
diff --git a/src/osd/modules/render/d3d/d3dhlsl.cpp b/src/osd/modules/render/d3d/d3dhlsl.cpp
index 4ee6fcbd5ac..000fd254fe0 100644
--- a/src/osd/modules/render/d3d/d3dhlsl.cpp
+++ b/src/osd/modules/render/d3d/d3dhlsl.cpp
@@ -680,7 +680,9 @@ void shaders::init(d3d_base *d3dintf, running_machine *machine, renderer_d3d9 *r
 		options->shadow_mask_v_size = winoptions.screen_shadow_mask_v_size();
 		options->shadow_mask_u_offset = winoptions.screen_shadow_mask_u_offset();
 		options->shadow_mask_v_offset = winoptions.screen_shadow_mask_v_offset();
-		options->curvature = winoptions.screen_curvature();
+		options->distortion = winoptions.screen_distortion();
+		options->cubic_distortion = winoptions.screen_cubic_distortion();
+		options->distort_corner = winoptions.screen_distort_corner();
 		options->round_corner = winoptions.screen_round_corner();
 		options->smooth_border = winoptions.screen_smooth_border();
 		options->reflection = winoptions.screen_reflection();
@@ -989,7 +991,9 @@ int shaders::create_resources(bool reset, std::vector<ui_menu_item>& sliders)
 	post_effect->add_uniform("Floor", uniform::UT_VEC3, uniform::CU_POST_FLOOR);
 
 	distortion_effect->add_uniform("VignettingAmount", uniform::UT_FLOAT, uniform::CU_POST_VIGNETTING);
-	distortion_effect->add_uniform("CurvatureAmount", uniform::UT_FLOAT, uniform::CU_POST_CURVATURE);
+	distortion_effect->add_uniform("DistortionAmount", uniform::UT_FLOAT, uniform::CU_POST_DISTORTION);
+	distortion_effect->add_uniform("CubicDistortionAmount", uniform::UT_FLOAT, uniform::CU_POST_CUBIC_DISTORTION);
+	distortion_effect->add_uniform("DistortCornerAmount", uniform::UT_FLOAT, uniform::CU_POST_DISTORT_CORNER);
 	distortion_effect->add_uniform("RoundCornerAmount", uniform::UT_FLOAT, uniform::CU_POST_ROUND_CORNER);
 	distortion_effect->add_uniform("SmoothBorderAmount", uniform::UT_FLOAT, uniform::CU_POST_SMOOTH_BORDER);
 	distortion_effect->add_uniform("ReflectionAmount", uniform::UT_FLOAT, uniform::CU_POST_REFLECTION);
@@ -1496,7 +1500,9 @@ int shaders::distortion_pass(d3d_render_target *rt, int source_index, poly_info
 	// skip distortion if no influencing settings
 	if (options->reflection == 0 &&
 		options->vignetting == 0 &&
-		options->curvature == 0 &&
+		options->distortion == 0 &&
+		options->cubic_distortion == 0 &&
+		options->distort_corner == 0 &&
 		options->round_corner == 0 &&
 		options->smooth_border == 0)
 	{
@@ -2277,7 +2283,9 @@ enum slider_option
 	SLIDER_SHADOW_MASK_V_SIZE,
 	SLIDER_SHADOW_MASK_U_OFFSET,
 	SLIDER_SHADOW_MASK_V_OFFSET,
-	SLIDER_CURVATURE,
+	SLIDER_DISTORTION,
+	SLIDER_CUBIC_DISTORTION,
+	SLIDER_DISTORT_CORNER,
 	SLIDER_ROUND_CORNER,
 	SLIDER_SMOOTH_BORDER,
 	SLIDER_REFLECTION,
@@ -2352,7 +2360,9 @@ slider_desc shaders::s_sliders[] =
 	{ "Shadow Mask Pixel Count Y",          1,     1,    64, 1, SLIDER_FLOAT,    SLIDER_SCREEN_TYPE_ANY,           SLIDER_SHADOW_MASK_V_SIZE,      0.03125f, "%2.5f", {} },
 	{ "Shadow Mask Offset X",            -100,     0,   100, 1, SLIDER_FLOAT,    SLIDER_SCREEN_TYPE_ANY,           SLIDER_SHADOW_MASK_U_OFFSET,    0.01f,    "%1.2f", {} },
 	{ "Shadow Mask Offset Y",            -100,     0,   100, 1, SLIDER_FLOAT,    SLIDER_SCREEN_TYPE_ANY,           SLIDER_SHADOW_MASK_V_OFFSET,    0.01f,    "%1.2f", {} },
-	{ "Screen Curvature",                   0,     0,   100, 1, SLIDER_FLOAT,    SLIDER_SCREEN_TYPE_ANY,           SLIDER_CURVATURE,               0.01f,    "%2.2f", {} },
+	{ "Screen Distortion",               -100,     0,   100, 1, SLIDER_FLOAT,    SLIDER_SCREEN_TYPE_ANY,           SLIDER_DISTORTION,              0.01f,    "%2.2f", {} },
+	{ "Screen Distortion (Cubic)",       -100,     0,   100, 1, SLIDER_FLOAT,    SLIDER_SCREEN_TYPE_ANY,           SLIDER_CUBIC_DISTORTION,        0.01f,    "%2.2f", {} },
+	{ "Screen Distort Corner",              0,     0,   100, 1, SLIDER_FLOAT,    SLIDER_SCREEN_TYPE_ANY,           SLIDER_DISTORT_CORNER,          0.01f,    "%1.2f", {} },
 	{ "Screen Round Corner",                0,     0,   100, 1, SLIDER_FLOAT,    SLIDER_SCREEN_TYPE_ANY,           SLIDER_ROUND_CORNER,            0.01f,    "%1.2f", {} },
 	{ "Screen Smooth Border",               0,     0,   100, 1, SLIDER_FLOAT,    SLIDER_SCREEN_TYPE_ANY,           SLIDER_SMOOTH_BORDER,           0.01f,    "%1.2f", {} },
 	{ "Screen Reflection",                  0,     0,   100, 1, SLIDER_FLOAT,    SLIDER_SCREEN_TYPE_ANY,           SLIDER_REFLECTION,              0.01f,    "%1.2f", {} },
@@ -2421,7 +2431,9 @@ void *shaders::get_slider_option(int id, int index)
 		case SLIDER_SHADOW_MASK_V_SIZE: return &(options->shadow_mask_v_size);
 		case SLIDER_SHADOW_MASK_U_OFFSET: return &(options->shadow_mask_u_offset);
 		case SLIDER_SHADOW_MASK_V_OFFSET: return &(options->shadow_mask_v_offset);
-		case SLIDER_CURVATURE: return &(options->curvature);
+		case SLIDER_DISTORTION: return &(options->distortion);
+		case SLIDER_CUBIC_DISTORTION: return &(options->cubic_distortion);
+		case SLIDER_DISTORT_CORNER: return &(options->distort_corner);
 		case SLIDER_ROUND_CORNER: return &(options->round_corner);
 		case SLIDER_SMOOTH_BORDER: return &(options->smooth_border);
 		case SLIDER_REFLECTION: return &(options->reflection);
@@ -2756,8 +2768,14 @@ void uniform::update()
 		case CU_POST_VIGNETTING:
 			m_shader->set_float("VignettingAmount", options->vignetting);
 			break;
-		case CU_POST_CURVATURE:
-			m_shader->set_float("CurvatureAmount", options->curvature);
+		case CU_POST_DISTORTION:
+			m_shader->set_float("DistortionAmount", options->distortion);
+			break;
+		case CU_POST_CUBIC_DISTORTION:
+			m_shader->set_float("CubicDistortionAmount", options->cubic_distortion);
+			break;
+		case CU_POST_DISTORT_CORNER:
+			m_shader->set_float("DistortCornerAmount", options->distort_corner);
 			break;
 		case CU_POST_ROUND_CORNER:
 			m_shader->set_float("RoundCornerAmount", options->round_corner);
diff --git a/src/osd/modules/render/d3d/d3dhlsl.h b/src/osd/modules/render/d3d/d3dhlsl.h
index 738d77330f7..8851531678e 100644
--- a/src/osd/modules/render/d3d/d3dhlsl.h
+++ b/src/osd/modules/render/d3d/d3dhlsl.h
@@ -81,7 +81,9 @@ public:
 		CU_PHOSPHOR_IGNORE,
 
 		CU_POST_VIGNETTING,
-		CU_POST_CURVATURE,
+		CU_POST_DISTORTION,
+		CU_POST_CUBIC_DISTORTION,
+		CU_POST_DISTORT_CORNER,
 		CU_POST_ROUND_CORNER,
 		CU_POST_SMOOTH_BORDER,
 		CU_POST_REFLECTION,
@@ -197,7 +199,9 @@ struct hlsl_options
 	float                   shadow_mask_v_size;
 	float                   shadow_mask_u_offset;
 	float                   shadow_mask_v_offset;
-	float                   curvature;
+	float                   distortion;
+	float                   cubic_distortion;
+	float                   distort_corner;
 	float                   round_corner;
 	float                   smooth_border;
 	float                   reflection;
diff --git a/src/osd/windows/winmain.cpp b/src/osd/windows/winmain.cpp
index ba3e6af9c4a..7edb996fb0a 100644
--- a/src/osd/windows/winmain.cpp
+++ b/src/osd/windows/winmain.cpp
@@ -170,7 +170,9 @@ const options_entry windows_options::s_option_entries[] =
 	{ WINOPTION_SHADOW_MASK_VSIZE";fs_shadwv(0.0-1.0)",         "0.25",              OPTION_FLOAT,      "shadow mask texture height, in U/V dimensions" },
 	{ WINOPTION_SHADOW_MASK_UOFFSET";fs_shadwou(-1.0-1.0)",     "0.0",               OPTION_FLOAT,      "shadow mask texture offset, in U direction" },
 	{ WINOPTION_SHADOW_MASK_VOFFSET";fs_shadwov(-1.0-1.0)",     "0.0",               OPTION_FLOAT,      "shadow mask texture offset, in V direction" },
-	{ WINOPTION_CURVATURE";fs_curv(0.0-1.0)",                   "0.0",               OPTION_FLOAT,      "screen curvature amount" },
+	{ WINOPTION_DISTORTION";fs_dist(-1.0-1.0)",                 "0.0",               OPTION_FLOAT,      "screen distortion amount" },
+	{ WINOPTION_CUBIC_DISTORTION";fs_cubedist(-1.0-1.0)",       "0.0",               OPTION_FLOAT,      "screen cubic distortion amount" },
+	{ WINOPTION_DISTORT_CORNER";fs_distc(0.0-1.0)",             "0.0",               OPTION_FLOAT,      "screen distort corner amount" },
 	{ WINOPTION_ROUND_CORNER";fs_rndc(0.0-1.0)",                "0.0",               OPTION_FLOAT,      "screen round corner amount" },
 	{ WINOPTION_SMOOTH_BORDER";fs_smob(0.0-1.0)",               "0.0",               OPTION_FLOAT,      "screen smooth border amount" },
 	{ WINOPTION_REFLECTION";fs_ref(0.0-1.0)",                   "0.0",               OPTION_FLOAT,      "screen reflection amount" },
diff --git a/src/osd/windows/winmain.h b/src/osd/windows/winmain.h
index 94d422a545b..48559039d0f 100644
--- a/src/osd/windows/winmain.h
+++ b/src/osd/windows/winmain.h
@@ -42,7 +42,9 @@
 #define WINOPTION_SHADOW_MASK_UOFFSET       "shadow_mask_uoffset"
 #define WINOPTION_SHADOW_MASK_VOFFSET       "shadow_mask_voffset"
 #define WINOPTION_REFLECTION                "reflection"
-#define WINOPTION_CURVATURE                 "curvature"
+#define WINOPTION_DISTORTION                "distortion"
+#define WINOPTION_CUBIC_DISTORTION          "cubic_distortion"
+#define WINOPTION_DISTORT_CORNER            "distort_corner"
 #define WINOPTION_ROUND_CORNER              "round_corner"
 #define WINOPTION_SMOOTH_BORDER             "smooth_border"
 #define WINOPTION_VIGNETTING                "vignetting"
@@ -149,7 +151,9 @@ public:
 	float screen_scanline_jitter() const { return float_value(WINOPTION_SCANLINE_JITTER); }
 	float screen_hum_bar_alpha() const { return float_value(WINOPTION_HUM_BAR_ALPHA); }
 	float screen_reflection() const { return float_value(WINOPTION_REFLECTION); }
-	float screen_curvature() const { return float_value(WINOPTION_CURVATURE); }
+	float screen_distortion() const { return float_value(WINOPTION_DISTORTION); }
+	float screen_cubic_distortion() const { return float_value(WINOPTION_CUBIC_DISTORTION); }
+	float screen_distort_corner() const { return float_value(WINOPTION_DISTORT_CORNER); }
 	float screen_round_corner() const { return float_value(WINOPTION_ROUND_CORNER); }
 	float screen_smooth_border() const { return float_value(WINOPTION_SMOOTH_BORDER); }
 	float screen_vignetting() const { return float_value(WINOPTION_VIGNETTING); }

From cd4dfca43e81533b6b204e37ec016dda924c004b Mon Sep 17 00:00:00 2001
From: ImJezze <jezze@gmx.net>
Date: Tue, 19 Apr 2016 21:18:16 +0200
Subject: [PATCH 102/122] Refactored BGFX distortion pass (nw) - also removed
 vector hack

---
 bgfx/chains/hlsl.json                         |  69 ++++++++-------
 bgfx/effects/hlsl/distortion.json             |  23 ++---
 .../dx11/chains/hlsl/fs_distortion.bin        | Bin 3690 -> 3634 bytes
 .../shaders/dx9/chains/hlsl/fs_distortion.bin | Bin 2735 -> 2843 bytes
 .../gles/chains/hlsl/fs_distortion.bin        | Bin 5408 -> 4939 bytes
 .../glsl/chains/hlsl/fs_distortion.bin        | Bin 5164 -> 4707 bytes
 .../metal/chains/hlsl/fs_distortion.bin       | Bin 5764 -> 5260 bytes
 hlsl/distortion.fx                            |   8 +-
 src/osd/modules/render/bgfx/chainentry.cpp    |  15 ++++
 src/osd/modules/render/bgfx/chainentry.h      |   1 +
 .../bgfx/shaders/chains/hlsl/fs_distortion.sc |  80 ++++++++----------
 11 files changed, 107 insertions(+), 89 deletions(-)

diff --git a/bgfx/chains/hlsl.json b/bgfx/chains/hlsl.json
index 985a332ed9d..2b730966a47 100644
--- a/bgfx/chains/hlsl.json
+++ b/bgfx/chains/hlsl.json
@@ -9,11 +9,11 @@
 	// name (unused): This value should contain a suitable name for the screen chain. It is not read by MAME, though it is still suggested that it be put in any user-made chains.
 	// type: string
 	"name": "Classic D3D HLSL CRT Simulation",
-	
+
 	// author (unused): This value should contain a suitable name for this chain's author. Again, it is not read by MAME, but it is still advisable to have.
 	// type: string
 	"author": "Ryan Holtz & ImJezze",
-	
+
 	// sliders (optional): The list of sliders used by all of the entries in this chain. Can be omitted if no entries use any sliders.
 	"sliders": [
 		// type (required): The sliders's conceptual type. Is it a list of string selections? Is it a single floating-point value? Does it require RGB values, or XY values?
@@ -54,7 +54,7 @@
 		// 
 		// strings (optional): A list of strings to use with the "intenum" type, to select from a list of text options instead of simply numbers.
 		// value: An array of 2 or more entries, with one entry per possible slider setting from "min" to "max" inclusive.
-		
+
 		{ "type": "intenum", "name": "adjustments", "text": "Enable Adjustments", "default": 0, "max": 1, "min": 0, "step": 1, "scale": 1.0, "format": "%s", "screen": "any", "strings": [ "Off", "On" ] },
 
 		{ "type": "intenum", "name": "ntsc",            "text": "Enable NTSC",                           "default": 0,        "max": 1,        "min": 0,        "step": 1,   "scale": 1.0,       "format": "%s",    "screen": "any", "strings": [ "Off", "On" ] },
@@ -80,7 +80,7 @@
 		{ "type": "vec2", "name": "converge_red",          "text": "Red Convergence, ",   "default": [ 5, 0 ], "max": [ 8000, 6000 ], "min": [ -8000, -6000 ], "step": 1, "scale": 0.1, "format": "%3.1f", "screen": "raster" },
 		{ "type": "vec2", "name": "converge_green",        "text": "Green Convergence, ", "default": [ 0, 5 ], "max": [ 8000, 6000 ], "min": [ -8000, -6000 ], "step": 1, "scale": 0.1, "format": "%3.1f", "screen": "raster" },
 		{ "type": "vec2", "name": "converge_blue",         "text": "Blue Convergence, ",  "default": [ 0, 0 ], "max": [ 8000, 6000 ], "min": [ -8000, -6000 ], "step": 1, "scale": 0.1, "format": "%3.1f", "screen": "raster" },
-		
+
 		{ "type": "vec2", "name": "radial_converge_red",   "text": "Red Radial Convergence, ",   "default": [ 0, 0 ], "max": [ 8000, 6000 ], "min": [ -8000, -6000 ], "step": 1, "scale": 0.1, "format": "%3.1f", "screen": "raster" },
 		{ "type": "vec2", "name": "radial_converge_green", "text": "Green Radial Convergence, ", "default": [ 0, 0 ], "max": [ 8000, 6000 ], "min": [ -8000, -6000 ], "step": 1, "scale": 0.1, "format": "%3.1f", "screen": "raster" },
 		{ "type": "vec2", "name": "radial_converge_blue",  "text": "Blue Radial Convergence, ",  "default": [ 0, 0 ], "max": [ 8000, 6000 ], "min": [ -8000, -6000 ], "step": 1, "scale": 0.1, "format": "%3.1f", "screen": "raster" },
@@ -96,22 +96,27 @@
 		{ "type": "float",   "name": "scanline_jitter_amount", "text": "Scanline Jitter Amount",     "default": 0,              "max": 400,               "min": 0,           "step": 1, "scale": 0.01,    "format": "%1.2f", "screen": "crt" },
 		{ "type": "float",   "name": "scanline_height",        "text": "Individual Scanline Scale",  "default": 100,            "max": 400,               "min": 0,           "step": 1, "scale": 0.01,    "format": "%1.2f", "screen": "crt" },
 		{ "type": "float",   "name": "scanline_variation",     "text": "Scanline Variation",         "default": 100,            "max": 400,               "min": 0,           "step": 1, "scale": 0.01,    "format": "%1.2f", "screen": "crt" },
+
 		{ "type": "float",   "name": "shadow_alpha",           "text": "Shadow Mask Amount",         "default": 20,             "max": 100,               "min": 0,           "step": 1, "scale": 0.01,    "format": "%1.2f", "screen": "crt" },
 		{ "type": "vec2",    "name": "shadow_uv_count",        "text": "Shadow Mask Pixel Count ",   "default": [  12,  12 ],   "max": [ 128, 128 ],      "min": [ 1, 1 ],    "step": 1, "scale": 1.0,     "format": "%3f",   "screen": "crt" },
 		{ "type": "vec2",    "name": "shadow_uv_size",         "text": "Shadow Mask UV Size ",       "default": [ 500, 500 ],   "max": [ 1000, 1000 ],    "min": [ 0, 0 ],    "step": 1, "scale": 0.001,   "format": "%1.4f", "screen": "crt" },
 		{ "type": "vec2",    "name": "shadow_uv_offset",       "text": "Shadow Mask UV Offset ",     "default": [   0,   0 ],   "max": [ 1000, 1000 ],    "min": [ 0, 0 ],    "step": 1, "scale": 0.001,   "format": "%1.4f", "screen": "crt" },
+
 		{ "type": "float",   "name": "humbar_alpha",           "text": "Hum Bar Amount",             "default": 5,              "max": 100,               "min": 0,           "step": 1, "scale": 0.01,    "format": "%1.2f", "screen": "crt" },
 		{ "type": "float",   "name": "humbar_hertz_rate",      "text": "Hum Bar Frequency",          "default": 100,            "max": 10000,             "min": 0,           "step": 1, "scale": 0.00001, "format": "%1.7f", "screen": "crt" },
+
 		{ "type": "color",   "name": "floor",                  "text": "Signal Floor, ",             "default": [  5,  5,  5 ], "max": [ 100, 100, 100 ], "min": [ 0, 0, 0 ], "step": 1, "scale": 0.01,    "format": "%1.2f", "screen": "crt" },
 		{ "type": "color",   "name": "power",                  "text": "Signal Exponent, ",          "default": [ 80, 80, 80 ], "max": [ 400, 400, 400 ], "min": [ 0, 0, 0 ], "step": 1, "scale": 0.01,    "format": "%1.2f", "screen": "crt" },
-		
-		{ "type": "float", "name": "curvature",     "text": "Screen Curvature Amount", "default": 20, "max": 200, "min": 0, "step": 1, "scale": 0.01, "format": "%1.2f", "screen": "crt" },
-		{ "type": "float", "name": "round_corner",  "text": "Rounded Corner Amount",   "default": 15, "max": 200, "min": 0, "step": 1, "scale": 0.01, "format": "%1.2f", "screen": "crt" },
-		{ "type": "float", "name": "smooth_border", "text": "Smooth Border Amount",    "default": 5,  "max": 200, "min": 0, "step": 1, "scale": 0.01, "format": "%1.2f", "screen": "crt" },
-		{ "type": "float", "name": "vignetting",    "text": "Vignetting Amount",       "default": 20, "max": 200, "min": 0, "step": 1, "scale": 0.01, "format": "%1.2f", "screen": "crt" },
-		{ "type": "float", "name": "reflection",    "text": "Reflection Amount",       "default": 15, "max": 200, "min": 0, "step": 1, "scale": 0.01, "format": "%1.2f", "screen": "crt" }
+
+		{ "type": "float", "name": "distortion",       "text": "Screen Distortion Amount",       "default": 20, "max": 200, "min": -200, "step": 1, "scale": 0.01, "format": "%1.2f", "screen": "crt" },
+		{ "type": "float", "name": "cubic_distortion", "text": "Screen Cubic Distortion Amount", "default": 0,  "max": 200, "min": -200, "step": 1, "scale": 0.01, "format": "%1.2f", "screen": "crt" },
+		{ "type": "float", "name": "distort_corner",   "text": "Distorted Corner Amount",        "default": 20, "max": 200, "min": 0,    "step": 1, "scale": 0.01, "format": "%1.2f", "screen": "crt" },
+		{ "type": "float", "name": "round_corner",     "text": "Rounded Corner Amount",          "default": 15, "max": 200, "min": 0,    "step": 1, "scale": 0.01, "format": "%1.2f", "screen": "crt" },
+		{ "type": "float", "name": "smooth_border",    "text": "Smooth Border Amount",           "default": 5,  "max": 200, "min": 0,    "step": 1, "scale": 0.01, "format": "%1.2f", "screen": "crt" },
+		{ "type": "float", "name": "vignetting",       "text": "Vignetting Amount",              "default": 20, "max": 200, "min": 0,    "step": 1, "scale": 0.01, "format": "%1.2f", "screen": "crt" },
+		{ "type": "float", "name": "reflection",       "text": "Reflection Amount",              "default": 15, "max": 200, "min": 0,    "step": 1, "scale": 0.01, "format": "%1.2f", "screen": "crt" }
 	],
-	
+
 	// parameters (optional): A list of procedurally-generated parameters that can be bound to entry uniforms.
 	"parameters": [
 		// name (required): The internal name of the parameter that will be used when binding to an entry uniform.
@@ -128,11 +133,11 @@
 		// 
 		// limit (required by type "time"): The range of time across which to loop. 0.0 means run indefinitely.
 		// value: Any numeric value.
-		
+
 		{ "name": "jitter", "type": "frame", "period": 2 },
 		{ "name": "time",   "type": "time",  "limit": 0.0 }
 	],
-	
+
 	// targets (optional): A list of all render targets that will be used by the chain entries in this chain.
 	"targets": [
 		// name (required): The name of the target. Will be used to bind it as a texture and as an output in chain entries.
@@ -177,7 +182,7 @@
 			"doublebuffer": true
 		}
 	],
-	
+
 	// passes (required): The list of individual shaders to invoke, and any dynamic input parameters they need.
 	"passes": [
 		{
@@ -194,7 +199,7 @@
 				// clearcolor (optional): An array containing an RGBA quadruplet to which to clear the output target.
 				// value: An array of four numeric values of the range 0.0 to 1.0.
 				"clearcolor": [ 0.0, 0.0, 0.0, 0.0 ],
-				
+
 				// cleardepth (optional): A numeric value containing the depth value to which to clear the output target.
 				// value: Any numeric value.
 				"cleardepth": 1.0,
@@ -231,7 +236,7 @@
 				{ "type": "slider", "condition": "equal", "combine": "or", "name": "adjustments", "value": 0 },
 				{ "type": "slider", "condition": "equal", "combine": "or", "name": "ntsc",        "value": 0 }
 			],
-			
+
 			// uniforms (optional): Non-sampler uniform bindings for this chain entry.
 			"uniforms": [
 				// uniform (required): The name of the uniform, as it is referenced in the shader source code itself.
@@ -247,7 +252,7 @@
 				// 
 				// value (optional): An array of numeric values that should be loaded into this uniform.
 				// values: Should be an array containing anywhere from 1-16 numeric values, corresponding to the size of the uniform's type.
-				
+
 				{ "uniform": "u_a_value",         "slider": "a_value" },
 				{ "uniform": "u_b_value",         "slider": "b_value" },
 				{ "uniform": "u_cc_value",        "slider": "cc_value" },
@@ -256,7 +261,7 @@
 				{ "uniform": "u_jitter_offset",   "slider": "jitter_offset" },
 				{ "uniform": "u_jitter_amount",   "parameter": "jitter" }
 			],
-			
+
 			// inputs (optional): A list of samplers used by this entry, and their corresponding bindings.
 			"input": [
 				// sampler (required): The name of the sampler, as it is referenced in the shader source code itself.
@@ -278,7 +283,7 @@
 				// default: true
 				{ "sampler": "s_tex", "texture": "screen" }
 			],
-			
+
 			// output (required): The target to use as the output for this pass. Can be one of the named targets in "targets", or "output" 
 			//                    or "previous" for one of two automatically-generated targets.
 			// value: Any valid ASCII string that names a target.
@@ -468,19 +473,23 @@
 		{	"effect": "hlsl/distortion",
 			"name": "Distortion Pass",
 			"disablewhen": [
-				{ "type": "slider", "condition": "equal", "combine": "or", "name": "adjustments",    "value": 0 },
-				{ "type": "slider", "condition": "equal", "combine": "and", "name": "curvature",     "value": 0.0 },
-				{ "type": "slider", "condition": "equal", "combine": "and", "name": "round_corner",  "value": 0.0 },
-				{ "type": "slider", "condition": "equal", "combine": "and", "name": "smooth_border", "value": 0.0 },
-				{ "type": "slider", "condition": "equal", "combine": "and", "name": "vignetting",    "value": 0.0 },
-				{ "type": "slider", "condition": "equal", "combine": "and", "name": "reflection",    "value": 0.0 }
+				{ "type": "slider", "condition": "equal", "combine": "or",  "name": "adjustments",      "value": 0 },
+				{ "type": "slider", "condition": "equal", "combine": "and", "name": "distortion",       "value": 0.0 },
+				{ "type": "slider", "condition": "equal", "combine": "and", "name": "cubic_distortion", "value": 0.0 },
+				{ "type": "slider", "condition": "equal", "combine": "and", "name": "distort_corner",   "value": 0.0 },
+				{ "type": "slider", "condition": "equal", "combine": "and", "name": "round_corner",     "value": 0.0 },
+				{ "type": "slider", "condition": "equal", "combine": "and", "name": "smooth_border",    "value": 0.0 },
+				{ "type": "slider", "condition": "equal", "combine": "and", "name": "vignetting",       "value": 0.0 },
+				{ "type": "slider", "condition": "equal", "combine": "and", "name": "reflection",       "value": 0.0 }
 			],
 			"uniforms": [
-				{ "uniform": "u_curvature",     "slider": "curvature" },
-				{ "uniform": "u_round_corner",  "slider": "round_corner" },
-				{ "uniform": "u_smooth_border", "slider": "smooth_border" },
-				{ "uniform": "u_vignetting",    "slider": "vignetting" },
-				{ "uniform": "u_reflection",    "slider": "reflection" }
+				{ "uniform": "u_distortion",       "slider": "distortion" },
+				{ "uniform": "u_cubic_distortion", "slider": "cubic_distortion" },
+				{ "uniform": "u_distort_corner",   "slider": "distort_corner" },
+				{ "uniform": "u_round_corner",     "slider": "round_corner" },
+				{ "uniform": "u_smooth_border",    "slider": "smooth_border" },
+				{ "uniform": "u_vignetting",       "slider": "vignetting" },
+				{ "uniform": "u_reflection",       "slider": "reflection" }
 			],
 			"input": [
 				{ "sampler": "s_tex", "target": "internal" }
diff --git a/bgfx/effects/hlsl/distortion.json b/bgfx/effects/hlsl/distortion.json
index 42a43d95c65..14a7b79891a 100644
--- a/bgfx/effects/hlsl/distortion.json
+++ b/bgfx/effects/hlsl/distortion.json
@@ -25,16 +25,17 @@
     "vertex": "chains/hlsl/vs_distortion",
     "fragment": "chains/hlsl/fs_distortion",
     "uniforms": [
-    	{ "name": "s_tex",            "type": "int",  "values": [ 0.0 ] },
-    	{ "name": "u_swap_xy",        "type": "vec4", "values": [ 0.0,  0.0, 0.0, 0.0 ] },
-    	{ "name": "u_screen_dims",    "type": "vec4", "values": [ 1.0,  1.0, 0.0, 0.0 ] },
-    	{ "name": "u_quad_dims",      "type": "vec4", "values": [ 1.0,  1.0, 0.0, 0.0 ] },
-    	{ "name": "u_rotation_type",  "type": "vec4", "values": [ 0.0,  0.0, 0.0, 0.0 ] },
-    	{ "name": "u_prepare_vector", "type": "vec4", "values": [ 0.0,  0.0, 0.0, 0.0 ] },
-    	{ "name": "u_curvature",      "type": "vec4", "values": [ 0.25, 0.0, 0.0, 0.0 ] },
-    	{ "name": "u_round_corner",   "type": "vec4", "values": [ 0.2,  0.0, 0.0, 0.0 ] },
-    	{ "name": "u_smooth_border",  "type": "vec4", "values": [ 0.05, 0.0, 0.0, 0.0 ] },
-    	{ "name": "u_vignetting",     "type": "vec4", "values": [ 0.20, 0.0, 0.0, 0.0 ] },
-    	{ "name": "u_reflection",     "type": "vec4", "values": [ 0.30, 0.0, 0.0, 0.0 ] }
+    	{ "name": "s_tex",              "type": "int",  "values": [ 0.0 ] },
+    	{ "name": "u_swap_xy",          "type": "vec4", "values": [ 0.0,  0.0, 0.0, 0.0 ] },
+    	{ "name": "u_screen_dims",      "type": "vec4", "values": [ 1.0,  1.0, 0.0, 0.0 ] },
+        { "name": "u_target_dims",      "type": "vec4", "values": [ 1.0,  1.0, 0.0, 0.0 ] },
+    	{ "name": "u_quad_dims",        "type": "vec4", "values": [ 1.0,  1.0, 0.0, 0.0 ] },
+        { "name": "u_distortion",       "type": "vec4", "values": [ 0.20, 0.0, 0.0, 0.0 ] },
+        { "name": "u_cubic_distortion", "type": "vec4", "values": [ 0.20, 0.0, 0.0, 0.0 ] },
+    	{ "name": "u_distort_corner",   "type": "vec4", "values": [ 0.20, 0.0, 0.0, 0.0 ] },
+    	{ "name": "u_round_corner",     "type": "vec4", "values": [ 0.20, 0.0, 0.0, 0.0 ] },
+    	{ "name": "u_smooth_border",    "type": "vec4", "values": [ 0.05, 0.0, 0.0, 0.0 ] },
+    	{ "name": "u_vignetting",       "type": "vec4", "values": [ 0.20, 0.0, 0.0, 0.0 ] },
+    	{ "name": "u_reflection",       "type": "vec4", "values": [ 0.30, 0.0, 0.0, 0.0 ] }
     ]
 }
\ No newline at end of file
diff --git a/bgfx/shaders/dx11/chains/hlsl/fs_distortion.bin b/bgfx/shaders/dx11/chains/hlsl/fs_distortion.bin
index d5f7f3b16e21b8fa77f770e39d79ce90603167e0..2e2b1813c8a83997f078daf6aa55318625a8d0b4 100644
GIT binary patch
literal 3634
zcmbVOJ#1T56h3}-oW^z=%MvI=NIa!m#83h%5v}5vKc^9)j*_%W5t17xP8z9=gJVOx
zpw}QagkS)vh@n#kvN2Hx2%TGr0f`kBb|S&R#P{8M&-0Cwi7Q>-`_B2!?>*;USC+43
zQXe1xk(Yr^ZSTXi-P-*JB@s!<`A)69*4k>cYa845_DWI&E#IlV-&xymln|6c2OoRw
zW~;s3+$qT=kV>7}dZ)g<eu5E!QB1J4^=50Q(JILz$QL@bR<pCSkq~c#I0$d<HJj}_
zwR*F)LFg{1u=c_B)=s0{-rm_NNo+~2#^&9|x^>`lkoxv&?Z*8}DZzf>{LJdq^xxm#
z`tFC+msh_T`gbM$Ahin?I3j7RuVOyN{1tP4dG7jMtfZgAT*Txco-~d@%=gUB{*X>S
z>2*sozoZA4X>68n))uSF^DFb!>oQ$ks4mIM?CNy2x-=t)RoJ8t)IpmerVigGbgWD+
z&CRaJ;o<VNnWf!=NCe=^0NoPFR6YxhSPsAM(%sud^SwGG8QHb_8#mx%QPN|@qVcT(
z+;M1mci?UY60gAxo;F7+GK=Km&}_&b7s=NhKkLzh$Ux-zvro%kKYCQ=*P9{(sw?MY
zhTS^q)(f7#Afi+Z+3w6f3`sQk!IB$;9CKB1F$57lM1FG9eBdnl_nrQV;@vs~-jv&`
zPa5YK^iz)d-@?kFvGXh}E-t?<(#N=XzKWx)(o`>3VtgIInVk5tic|f}oBBBF`9r@H
z>-*~KcRD6im)e7<k>zT6GC|*|6KBw`=cM*%hXeA3rw*6RSbWy;f{2J@@XR^Q88N=E
z`mBy1!bftZ+?zV<=UEcRGvfMZ&g#GF`NMi4Pvd5N)}8%>yv5(l7UM}^IC^DC(^z~S
z<Mes2NG7eg%dnw+5kv-d;-`cZGXI)0tpPoUKA^q)=SI|492z|yKRGA=4Ac+C&Viom
z*O)c;*_4fa7PWE=oS(nSM^;Yn0KXsfOmt-}?>jph2V<K8&D5LonRk<oDJr|zCV<OR
z*5Q&f=wjm}K8T;|wF7%bhVr}z)MgNYkkpI43vgZuc0BC%xBATUq#pQ`^p5gey&pOM
zBj)oAUue|ix|gTAUq3_6<)TcTE%?B5_-D}OzY^GQ)~xDuz9e@7Z6fvo_Cgx_ipw|k
zy!c6oU;B=rCi|ElV$>$@iKi}ZwRr%W#2jSpihLBPo4L`uP-`fNK$Q4L%n9x|7>DAu
zA61TZRDv!JrRl17B6(WBtPjPbH<J1o0LI1;l@*H|6o{ptL4=>4^Y4{s4J5jqPt>I~
zpt@AQwI@f;uBm~u<Y}2XIEzQ!%H#f|?wI|M+zH?%@miZlu5W%X_x8H4YcTA-zu7p1
z6&y0Ao*B--*r1H|a1e=H44+Is`C=41JKmwlFCu;(DAVgdX~w_sueo9Ou92p>B!0x@
z)sOeex8py*1ibQw9mdzMG}Xo4?Dfayrh8AQJfl#1o_yih+0lFi5s`6ub91x&{Mmx}
z?@+m5`wsou{r?e%1R^QW>-PQFqlfZi(CPQB-*<jL`u)$?C_~@4((irjIePA$@*C*?
zDaCt!F!tPU7q5VSs@{}$Rz6fe>L{tV0J=`~jPr*&>TZv>l0f16LBBCh@e~8zfXV@H
z>X|ZpZy!<;gJ-Ik<PO3+?r;W!_;QL--9cnnCw_Rpj5t5FwsqzGqCDoFgZ-v7<Rt00
zQSfPBag2Y;$!Ja4x|8yZyH}}?avaR7;)95k?*CEl73cT6+EV?%B>r3uCCj?!06(EK
zcj~{&Ilun*J*9rIRy~`>w$&Zmw<>gX;QZoSl>&<I%)a9xr-t?dt_VC3U_X}s0M{fQ
A%K!iX

literal 3690
zcmbtWOK%%h6h0X{PV9ulvIGj*FiKZMEJ8pfv?!juoJN#7O42Aiq-h>b8>x+rV~2KA
zO~XU15NuenU{xgY2k0h*tU+Rd#1=MPup>gO`M$aLTu-Lnaip1hectbJW%XLN=i~D~
z3zBb#2On)V!ut<OBGMxR?eN3)=1#b?ckiGiMPP>8VYA-aZ0*(e!`6dFtt39M#dg?e
z)*745T6kF7Zq=J5nK0tp?dIWTtK9@+0L&1@+xt7=cD=b@1KYCEd2p{@Z`}#E>dhTu
zZvi{l4iEQk@7G$bz5UxIX&6+qwtE*AV7?>~P`w9Xt9E~)M{xh<x%rLRxqlwM`JGIC
z{#WfJ`$Oyf;>#d`B9g)R3Z8HA{Dx;~b@9esoW%FzS;j*kKXHU%JRih2^CF&f;<pSc
zeiQHE$>6fO9xhi`m)4f5H)O7Qy}BZ63mbFQ>dL$vS7DPrPzP=LcodR0p<``kWpQCm
zj*nNb&99se3eqPs0j76FvXw9VSS*kCdvy0!G5)<VB3Wse`^}s1u_&3zVlnou2EKFO
z(C)z9-dI8klc+19V)?v)zvM^z#6PA)2F@&BF7jhs7H==W%Rw}aYZ<xeGra<xs@t9;
z2zv~7#$QP2=?RRINs;`l((O5JWerbMep{sXD8-|4)N;l0^Q0Y>Px2H}G}ZlvwNE{x
z37(Xm0__vJ#4xS8hL8uwLQo&nH{`RAd8gjT1)G1%3qJ?XEG?HcH0ALE2y~!~Yxz~U
zL0#-WFThJ8;Q1JM3jMV67Hq2DjE(%v1J9%m<@W**QjpZ4v8awDP4z3!OOnm#{W5w$
z`_Kzg2Jo|l@mN3|&aH3iPvxP>h4wo8OygmnF-ASLN2p!xBCiG3gM3=IKHN>cg0ijK
zH24On*YZU(R08PmMy|#{_p1+T2WKopdGx@5+Vlb-Ty0E^&=-z(%J0OZy4W|=1E1Vn
zD9!jQr`G>~J=Mh*8kKG|)%{u*Ih%_z<(lw;J@W6c?NiV7jEmj+;_{jS{|I8IEbqEA
zF7~JdA^{!|%-!&rjWuUwyqH2NAv)pX1-vW7xM|3`d0Fo@_PjuOcycdACy$3rE|dJ6
zEBfaJcsYpqr<EVG(O<GYrQ@UsYMh@0o%^s7`9#Gvd*Rd09X;R6J|K_L5tX@X&Mi)3
z{tUS#&u-3~th>ugY8R+~tWlDO@=AmJAblfnHVBNF;01V@ymD{HKwZkuxuY(XqrXbi
zUU0K%b?fe@GL_SlGg-2H+!+MUn!`nYJPXA0+i3C>l$95G9vriBUI2#FEMcZE$a9`l
z_vo{B^Quer+uEL5yYW1!yz=PDJf&%BgS76tBkq<$LeBYXY@XU3^hcTB4&_t5YJ1o>
z{m2aDY`-yIIU6HtP*D5KJ@<zfh+OiY%slyO95(~+P~=w;<yAXL{}mVe=l{JpiW+v~
zpH1bL{8zu9`sqd6_p~@}d6N1Sr*_!yY5gWQot>M^y~=5B*zf1C!#$(<@B;imuk7yb
zmVf#Adi-syU>A@FyDzVK)^7s;7wJ8RJM!o1c_k5N1~kmXz?Q{v_Yl@U@#B+u&pqng
zlY2HDH)A@odenxATgtCv9GG9~Q@`jV>4o1fT?O6sisnIS$y_N-^`pmJFM81R%sg3t
zsAJOF|Juf=eFY&$Q=Fcl<y~%a<~v6#xt?P52q)uVy_H9I3ilIf>)3$=#8*%r#d!fK
z7lFHH%=)Z;>dD=sH0>GAqT-MfH;b$d?JFPSpS5~5hgzHYF8$5CD!&)dNBuwMzWGEl
zc9(y(rTXE6^XIZJIoG2JJaec1tDN=gfA28%YQkphuhAWu{{+6Njm}ub{wLsf?#R-R
R(|E?7N2&3FK}x@r{{ShzB3}Ri

diff --git a/bgfx/shaders/dx9/chains/hlsl/fs_distortion.bin b/bgfx/shaders/dx9/chains/hlsl/fs_distortion.bin
index 8ee4383d303ed0401edbe7233f91d72ef2e1e82c..b12b9d953cf34c5de77cc41c70f854170c97ab98 100644
GIT binary patch
literal 2843
zcmb7FKWrOy6n=NM6UTP!#4sXZQIKenB1f%Iq)Iq#0~9F?G+06moYKTeEt)v^544Ek
zXLW-Psl-yI3!^)*A$5T;BDGQnB!(^^d1#kPFqMVl``)|DIe>(Sa`x|i@Be$>@BGHv
z#jJPZ_g{;W>jnMRwYn$bNp%ox3@*1fg3WfX-|6<-o!zRJg<@`yK*2_*yW8qky&T}u
z5v-OOK*d4u(O`WO<~zNr=bKTtwRN?%Vc})~l?Oq$GuYic3N{6>G6;G*olgHsaJkdn
zWQu8^GeAFC-wUo?uWE_2gP_0O-EQ^c44!59xV^pG>i65b+f^?QXsIBXDEc${OfI~8
z?)-Bi@-5tn74bz`Zi##Y>?vV9p7{LGzd3yS!p22jjIlF{vFj9jT`{(uVwV(S<0<xm
zV(dJ{K2(g2r`V^8vF#N5Trn#xspU(>*m`RBwPNf&#dNiD=T25iz|9_N`RAJDj)y6D
zanEKGlOSFaoKjXmINCDK>3%6pY!>3Nol>@K;xw^GNa+S;uNRyS>hgAbquc3qw)(Y~
zFP*GiTwPnOtzB6MGinz)JA3V`I4sr|>I;kY`r_ik;;W~Z&Y;(KL~;eGg!k{=Y<zY5
zb_2b9&whv(fr~g`?lnMs6fXh4@y8348xJc#E<dcibx8YJwO>x`4@H)jiI;(&sNFqx
z_tvRp_=wbgdy{wt_}S6Y56rQ(wbi(PZ?!>u4tU|`6KB;n{vbZD@!fY;&mr>s(s&-!
z%K-o@_j!i-zT_*Ru2+h#Amb2vP&NabvCE2t?}^~c<M}|O30xfQu~S!sJ#hT{4o-;E
zq|PN6ZHqDr={KeMeE28lENw&L;0Dgk5Cvs?#4V`Lc>jIG_9X9o)WWAAQ8*2I+#lFS
z8k1*VMw*jnK~Bo7hjk>j#Be`jEU*4nv$&*3_}=spm$o(s5Am$$s>Uj5e36xX)Of&p
zIU9jJeN6Tdn`g$MKC61>PGr~)>0^1Pp&z5RC`@c@9#$`XC?npGap{xlQ=cSHViU{5
z$+%XlXgw1>|BH?Fd>*+oQbFz~PV(dMB*!T-<Q~WYa7TA?3ZU)W)45`H)VqWSCL1><
zc>p|~pXD?ADdc;A8pX}agCl<U;0Nuq;DgOK<qnF9b;<0TT3=Rjx^tVE?(QHfE2wMi
zEcX=hj1ljtBiGOp<j4B3N3+R6CZ~Ra9l4jmd93#Wzf#nJ2P?py)tJ<aJc8{LV8-W!
zzljXp5ZD(5)f<=D6Z6@wN4x_E%!gkJ@|@g&E|1#9%|Yg@n2UbA3(P^Atl0cmKYPNj
z1$-XslinYXwZ-?x&Wy+SaXi!~IurV{A3p!>@3}l`!(9efIWyKwPKd@!<~JL^H}Jct
z_RNL-YCXj0Z?l-^nf}gX>h%5NtX_@nX7Rq5jrZlrai5G#t4{{=nZ`Wvk6w~@kewNe
z_zY@?!7$OYc3=n0EmBp#v=+{VylrYNN!-a=h|xZ=VLYDavD<mni@oCAXFXUBtEU)q
zebV3fS=AaXZxnNuF(0`yW?IG^tQTV9O6aGASkE9(a`%txN6<&%OVHb%ZO*jiPRh_t
z`dW=y#BRC@VwW{8<;nNu2y$}wtq%6XcboYemdr$?qV^TJ9&$&#6PyX^<i3>mtc`Od
z?-|2prte$#_Zb?0MDGvx9rG!+Q*JRfxXzf7#*O(3TXIKY?)`tRN#5S&tQ8O5k9qVK
LxmPfdD8k2ISO52{

literal 2735
zcmZ`*O>1Li6h1fircKg(bfOCvg27R+Bb0<u85o#$I)jc-7fua`n@eodnZUHk<fG2u
z=7!k_7VP|k+im&_W}_9{2nz08%tqlZEXsiH1o8Sj=j8S#ilH}o&vTyhecq&RZ{6~o
zM}PcWknF%8wjb0T5l5Cr{`RPU&>D{V?W*GeSswYle!JJ|xBY|m_ORQpI<67#k6Jta
zPG@gWbsQkYk>79c-UFx8-LE=1KovmUVT*u2eAt7>4A3&s(f*FV-R<wU;V)~{!CtpJ
zyz775?e7p>0Gc29gHKvL|G~qmriT~@ojd#O;jpuRr|K+%66M8><G<s+-1y-7#)~5I
z1*pUd_@FG0MLq)-5ys<4Mt&oX*I#%t!a7BAe8cMnd}hF$#a0w!nJMp0#aL&GZ79Yn
zQ|z{4EHcGfim}8LyRR7YOR-NCW1T6c<C2pTPl~`TC#Yp+bU>NE)n&T*A%c89KAh9R
zQJ5W>%IUBm&W(w(4G5=nG}0URm;JiD*V*oO2i@Ia?X}x0wOgB8o3*XGEsVEzqr2DZ
z+{2+!U#+h;>h(rrwei;FD{sij`y$!AR6^wal}K<6pKGjvctP=X$cmqetgjPaQam7!
ze7u5d#EXW*kDP*gDz)F=Azm{4OY?IIyPwvGmw{ibJ-Pnm@uhXx$koY}uZdTHKl<}!
z&E;w3+x4fFcTb5go1eAa-QBhCzuR0Z{CM%|OIV*Q9An##c!rxJ$yGueuzqfk7YVVA
zM<0oJ_zQ5>CogfhsQet{Nw9E!jsva%ZVqgt5WZc^7uZ<<2O*tcJ0Le<r(EKS(GRhu
zbDpQZ;ZLy-r#Zm(FyS&*Mk>%pVd4j$$iEq&hPk|$i`5XTU-Fro)igoA6Rq3Te4{b*
zU`)y`>Ry7LnDr(Htcgbg%Zq)8VPl-c4tM@PcC7LL>}GwF$DA48>WzX8$evWtzbKGg
z6t0K|lX%Q|uosve>WITjV$GVZuY?{Yb3zZ5zaWc25jf-Wya2yAPwOtSe}^T=CAm3+
zHGw@JvL{w2d6UCDd=j%cxX2kfVy3P<qaV2Skhg@aDJuo&eu4ao=8=^w`ebpls82+W
zvvM=Y%CC4tcai?G`cN*ymU_zp6vUBZK`ioYUmZPDW>0KR8TFl!$ruTZ6O6VF`Yo8L
zVGDY8<Ok&UO~@RqmuHBhJ(})yggjDN<ZKN2b9|pe@4*Lmx;d>O1Fr3v&I<Qn8F`^@
z<swGNnOpygYDYfnG>!}GnbwlrN5<xp-bW9d<UZQj{PEmm{4w=r&mE5RN$quyr}MJ2
z-4iERM1C3U8v4c^LCZ{!T2M3Zyc-mz_Yl8Z$_I{^P4!0%=P`SUUoPas`)|FWj&fSR
z`7Yo-70{!^hJ11;d$Ks?M~sD(9LUL?x3ksm1Ucl+JX3v+7<P=gTu?vMnatRtPhwAb
zJ{S6Dz7iP6Y)UdYE+JprcdNmCk}sH3GfZW(w^>}!9LeDx&d#Tdo|e&vG)^2;P)`NE
zp3}N5&b)pCeH^~3b75@jnSJ*P?tDCF%bf7*tT~pUD^Kk>Kk8;?9n8jA0+;vJIJ8fD
zg8!-1-!ksFhdqNYoe{X0skr#hL-pvD-T}^!yTv<^`V(+$f0Fr{PVX`LISFm{loOtv
wEl<Ya9aKNMr#5ey?xFdiKIQ*=*4z*7-Lw}u?j7eettrRfvp9GiU>xJ^ANN!NdjJ3c

diff --git a/bgfx/shaders/gles/chains/hlsl/fs_distortion.bin b/bgfx/shaders/gles/chains/hlsl/fs_distortion.bin
index b3066b531703c8295e19fce1be8ce3781db0d47c..189ca2e97f5d44c666a1fe6fab992a7458848c03 100644
GIT binary patch
literal 4939
zcmb7H+iu%N5S5Gep-yke7wjWtOSHJ6Zb+Snx(NE74<KZTb_7VGLs7QWCQtp+{zAW?
zXJ&V}yAo-jL6C^cxt^Ihv;6S!k8dyj{`a3Zo$vSA?q&Xz9gg2zbUGKEANN@`FCX(N
zTdp=cbM|JRecsQP-pLPpJnX8XtX9R=2)*5Bi~ap-arWYuS~go0<u)&k{7?I=EcV-F
zaQHK#*%U?fDZ4MqrHI1Y^XhS%SJi6!XtZ%u<`3(9;R5(>msR-zDd6wJ+fL_sULGN@
zKCK=<J*nq>q17`<EDD$&yt~|QR}V$Gaqm-AW6|=~L#9Qd#;N7KL#;*N6vGxVYsZ4u
zBIM)SA`+n8BIB@c5pb1o0=xO<X`Pq)cg1CScllhbmTEI!ZB^90{OeMwb@9SwN!4%j
zU4B=ri!w{z;e}VQJ8qaes@Pq=t@1KoX4=U-tc!W2s?8H>oek-H^`N5Yyc6StdanlY
zpxagCTGcx0RyB)XsU%LiWb&)Z*Sq}x=xL+p;^gMDVWxB}zsY?P4{i{H*IV)7*kuzQ
z65O@fh?MP5()Aiz^^xG{OpQ@v0JAYG`v)-L*)`q*OebEj6LJ_?c>sDPy78f_u2uc!
z=)DQ@2rN&@GFMB=r*3bXN;I_?kqaw2frpw@KtKqfwNfqW0NjltlDSq0hyI9<A$;sU
zmz6wEx?Ps&T31b23ItFUwW+#M5i3%iDTfosSIAk9jBy);=u!xSIKf*OuztPTFM>*5
zH&&kpC!2As=4X4;7|S!S$TP|#h+WD*^U9CkUioLSD?ff?-n>#-wxV*8*&BoT88EdN
z=WoG*C6{6&El}i=gqsD&GPZdVP=7su$pBi|3Dv&LK~)iRRZkk5o5~|6k~LgojBxu#
z79uwo?|G&Xt`$xt;V)lo#v*$JE7|mGSzt!xRuGnc0@}YC&A#*o*(9-0?g%+g1g2`j
zdt7H9%K0PHEb;&&r4b0RM<eI{IUl12Qb?Gk9fk=ZPu<<8?snUPo5XZCK`z7|&_Kd$
z?rdq;TCA}<Ks5$fWyWw>R4Qt$drvhU+j&J$QnRF652Ks&B%!dI;+~95%gJ=Az*N_Q
zhP)Xx<!><%_@4xdcpmTp2-9XJ=NcW($awM4Su`|gYW#Oq$FEUMmiB#H=ia9H_*7JP
zJnaduM5X)_gw+U_Um<^8CA_cd#cJ=0C~de;rMQ7AZ!0Ri<U4}iEfy<}VEE!lczO3s
zNZx?t>-!YA#DwUqrBJCYo0q|^Zj6bSpznIz7SkA1b`sO^B&NfwF<Dn%O=u@YXzpc@
z1|b;rX>6#&sQH@p1ADGX(x4&2S>tW)@Z*K<-=l#9Z5%YdaoIHcytf6}&^+%MXP#Dx
zH2nD}`{DP34m}^-N#o#7FppvMW;(nv#nL_-Q|TDK7{~*!y5PY~pbTd?h%-BeQkn*w
zv~6)~Q`4TQ!3d-FIG`qsDUp)IGnJ|^3}Efah+Zf0$f+tdzu!3xiv;b5YnnG94k#d%
zb5O!17x|C4vWQ(|;rNOOAMYN@`J$?+nl7ii=ryk9_SVBVNeAOu57CUrqa;m*+Ax{8
zdFx?18uM-a3ZD!IWi}Q5)j`Tn#fyq`JV~Z{s(UKxPkp}Bk~LqRY{_695u~)Ps5213
zAfEONL=9bkUmP-R*IiSU!|kPMdu`|o=j1asKJ=(nz0X~&Z-2&o+SHb{?WasT<4SK0
z;Wc2&gE4(VhHc`9qZRi93MO0I9UvBncq7hJPKK1BdpOdyPrgPP$wJ%RAUY#5DGw>M
zx$LKy@h}e@CpMMDvaZ+~lVMc*#&vORUS!ZaxCOD@aHNB>gzTw_Jvqp_`Dp^{9O&}i
z!trJX&uC5$X;>wukr`6kC8iH4m54t|EHCk(iN?fLU?SaKUw(iY0us^jnOW-q15I<?
zS3Fw6ezlsdDxVW(SWZD3hh1Y=g=iDu))Z*{^?CBJRr_%JDlN&C%A=;{OO+<NJdK>r
c8ZT9PD$L`1w@IDcnLXDuD%k5^FE2a)0n#ah;s5{u

literal 5408
zcmb7IOK#&v5S4>u5hX~n$N_paAZ<w&N&O7R10)Ux*=6Aa5VS;j1W2NWq-1J5Uge~@
zLQasX>aPA!<k$ubL+b9Tdj0C#`f&Hxw`c$S_iwlJ{XQ-plU-aLzd7r4&N@Hr<4^l!
z5ieGoLazM0kMpcd%2l?F%i}JUtH12yU7qfeJdF?Oyv%YfKHukuq}=D~;7=&N-!9^L
zmTyya40INoEGs|8_gTK+)gSlqVfC<0%W}1SkosULPnT=30OsY=cST&L6+nf*yI(t<
zLy{liy!g0!__z}QCKLxeG0#Bt@VdL-u9jK8G5aH-@7%Jh8EDye_-HxfveR-%bJenM
zGuLv&;j!h6VYTIe;n*A~lFe?N=HZ`$2*2(gveiOtlGRpte)p*>#5#K<!bjqdq)2bG
zb(Y7$HEdX}kUQXs+jLu|dAf+h+6nSg9GTVSI!j8iSQQXe==R??5I<!+!V{;f;zoG;
zSQ9y@#JLy_!m*FXm2Ny^#f0d?33<RmIwyd)7&Y;jgzW`T(E_yG>>vc=35xJ%G}r+3
zT!e!m0h4y+O_k8pQZPjYo-#;R(w}{CA@t4>F3USdzfJQDHLsSS(crrQ3WmNfo?uJk
zo}t-bFhmoK3M`!7M4EaQ>AFZ?rJ{+A3qiJpwlx7;#izW~wtb&Y_{tn!!|@WrRo4em
z7MqDnz6FUl*~S<dqjsg6wV*=B?H4*!8Y0=YZ(_=%h2rqa^6VAJKykwQ2$|(kYW3KM
z<UlKz@T`n3Qb8{CJb5X0dnMira2YZ6<%^`0Nf{i?rY~SuZ&czp6#(|?kykk`9@g=P
zJb9qh1~5=uM;^pY4`t0ig6#xDLwE;Jimgx!hDaX9S|9V*R49|cq?U_`lPUpK86CDk
z0J`RDs8<l;k{%%gX_1w}Yj9joRV=42sb~X0iu7RUV<-`96QzJ0AU9#2jxjl@_{hL@
zRQZZ9be5#T^7NoOenvvr-Si!DTV09)1rX+SIJo9Tl1L~o@J*kF;HJ~IX@^znmUp|X
zyrr@iP;C~%UIA1M1j-9gK-LEVaNv6tTTcqBRb>k>_V;pGq-7jX&BvH<7QrCG^7=?5
za;9oI9#jUM{tNbQZYTvfYF|=GniUU1Jj=U$O*vNW7nMu6Z`KW-d#!GV3Ju#LmmN>7
z(&9@^cnzN6^rApuaq503ZZd2PrG!Xkvg|Ez0Oqisn!wH_%vk38QIl=NMj&)z&?zEl
zzu|J!XmQWznqUlI2%Msu5O4?Gv4*aC0i8CeDX-;6Q-y&-;6$~yQI~bTo7^2Kff^$X
ze9+v0Y^daTqqAu^KygFotewu;DV?uzHqJBbY;CZ1wMJ)C-*eGjwWGT_MfVzK+vv2x
zR%bg7yEv^?Z}s$)JuQP*de~`qq1!q`YMu7O2pGYE2KrCC4%IT7)T^qm92AD&EN(p9
z{AetrZfak@=X8pb{uws*Pk`Tt>R_H6gR0&wLC|hl@=^>Bn?3hQz-s0``9*d@Zjw$z
z3`5lp<vhs&=W?x@5?hOGGF;SPn$2iD0nP?2i=COgLSqCBPSY`N2ZON@6(YGWjD%tW
z#!@ICI4LN^Ab?HiYa;~GVoek{!)v{fG05}%GEe5Eo|f>bRCw*<5_RM-8U&-^<f;c)
zCX;b68u5Su8G0^)FdB^~)XvV~omdGuD#HKJx$rJ~6ka%(2D5M$_Jr4;*;7jxaU9`n
zZmtgqMu;6L00hIqtS1R-i23`hibK@|n*v@nIQG*RsN3MPw)U&Upz2|uTEAXEsM;B3
zcg;|>2|1*<4n^YKJF+8xbAiNFvyvGv7}W$&IZd>ZrfX%h?Ra%m$8ErFsH@Jw8tBnU
zJn#zi)gIUF5IU(3Ugno`bM~m>&I;&3$zP@*O<_^zl%jeFW1d5<i&fQS)`ia~jD|}S
z<61qRq2X~zdR@)7+akBNMp#=3q)rXYPn}5kL~U&MGCw(V^%EkTU?MZ3nM`1HO&O(l
z5s%8NDkhYKN+N=A*B?0-jPe;egq2^Ns8t4_5CBt9c_{I?WN9(wQ(8w)fE(KV5V<d}
z$a#4wdwt4F7_$0Uz{t5WRb?bvHHu$7^`(=C57;rqmI-Nn_(Xv&9F}!;soIm)GL7({
K>pyq9o&N#jjQDQ=

diff --git a/bgfx/shaders/glsl/chains/hlsl/fs_distortion.bin b/bgfx/shaders/glsl/chains/hlsl/fs_distortion.bin
index b69a3712bb92dc46e4be79c79191bffe9fe05423..a4d54c9c932680cb6db3ac8a03be3fabf9c9b478 100644
GIT binary patch
literal 4707
zcmb7H+j84B5LG(uL!I8g0FRU{(IRvo*LkQrnZD-(II={$nvq0@q8zD>`_eD%FZ2s~
zc7Y`TlJZP5nM4A17mKrd&O+}${PyLWzyJN`ZRhJly8pCzN{^>6-gG)|I^Q1Ba#1{H
zWx85#_h#+wA^mt*th|+P4*0S!^P*hmJ7e_IAzdEs*UQGn50!1Y%!^%C82j%IX^|gx
zt6=eaWV6ll^7r&UFIHlT)1KFlyR0nNyGP@Vr6POSWJ{O8SNpWgj<^E;{`F(0^Smfd
zuvgF7Qmbd$TjmHlxVbp&)(?5HrJa$g?%!DVaA@pRcr<n#E{&}^J`DrwYawZD`*<}r
z1Kb+B4!_2h!_jT+7u%;zR_I?9gL-rEoUd1EyIAj3)V=ugLK*CSS?sgBe3KVxa%0xC
zy5kz(5!83tuFQ&Tm1^33*yM{+mD?v2CLPks`awlevu)y|dZz~Qpxae+lB#^vt!g*F
zR7sq4DddaFHv8=V_-W%u&fF<B!4WOUXF52E2iG{=Yl`@I>asKYadV|(a<d=F%j-MU
z$EC)e1Ea%0r4x4Z7vStg46vJesZHsS$XWupOYw@2U3I0Zos+j?vkqd;C??lK3Z!mt
z+lnx=SWs|lIz{Y?<In>feYO^7+ySiP4X$yekPiKkGln>0|FJ0L`?T9-i>^JY4L`X&
zT*Ymsu2sa2R8P7??cht?S&vO{n}qmM3WGSoE&|wdy-F{G>Rr`pO>{`-oTd4AzBx?H
zxmVaZ-5|(XN<Q~Wj?Z4n=dmj}K7&hMk*vT_p(yONLAwD-WyUwRuppAVTr1frbGby&
z^CKZt0uip*l?>njbuJG@2EmC~aeC6n+)19!kgbsr6NGy<vgkM-yko*5Q=zcj_48+Y
zS+PAqZ0yY|Tfjv%Rxp+(0?<Dj&%QLo2r<blv^&AhGeM|I#~wH7`(p9PiivyB_=%u%
zJ>r@Br^%gwsR>K1LoXq?shRuK%ueUIGfXoR*fsr4Sdv{7jVQ|vR3B<$z*L5BtGrZE
zYnglPQg4Zgbfiv6w_=?mbdpfQZ5dC;ro)7WDhSoJK;gy=lu}-EK#~6-IOOC3FF+IR
z&17App&1h|A6kos21kwmF01@CD#+IU+4gXj{tr)idB?O)c&;hsuOOjT{7hB+nUnC)
zspg`6m!Xj1I1C3>!Xt+YEVmoO;}#Q<NfvIL2p#V=2g_?{clDZqP?)q_v=LmY$YwJb
zvbAh@lKF>D&Sf)!Le;W4)v`IhnvFf`#UxdOyuD{32n2Z4Ct^@1QIoa%2k~4pjI4Rc
zNgl}#GoH%+3l$j9@IY&u!$NN!zIB4~uy7%19!MKE3F;@?3%ajK$7w4ar(ju_vFUk_
ze3-cn@=0g#T$e9AuYxazS3<dvUUN$>DMWycwoPoKX_^%k3}L<=rz-)Nk;q6UGpPXs
z0Og&IX*-F>&Q+<!{oZ+43`pazh*2U0aKI&+aClloz3qR+TSMaF7EXUiy0Q0AES6;@
zz4V6MN3Urwx3M0^$!IW{_mItGGEPP#kt#3{k77L>jVJt&zQp7GsLZs%zdE?`Q~pUs
zI-VvoJ<~lE^=H2RX}LAOdTg-}9T|*h@K8@6gF!s&8Hj=&zt4}Uwj(R7Y&d~5O`t9P
zzNq~KjE_BPOz)>6#;#$JubtW|ul-GNUOT0ehBz-!zM~0R6Ss5b$CEX0A+)wSF1{q8
z5#LQ#hIA|U<wUPD`EgJa0&VqOtj82gzKr0<g{>pRL>)MF3!%5lDN!aA5|zAm9a;qz
z8}tQUDI8IV8o(bape6<6#HyAiUR8P1Tl$Pb8)h|ROAm>HlFisq&-Q`oF}g&=zY(m?
zFnz>h>hPXQ4_8kV;Dm(4bkYcG4**Sxt$oFW5jCsaYz=vx(86d5s33+`?yIjzypl9~
zQlFWGY1qesugZ)(c|56UfAnaQzk1HJ*81qtGf@)%bbFoJJJvgz$bfnLa&gi54`-_{
AMF0Q*

literal 5164
zcmb7I+iu%N5LJryp=!|<=nw2uK-!WbE_E|p2WVXced|L$fM6ub6(ETUNhwqvKlMxd
z3;lx5%<k-kq!I@R9CLSP=Ioj4`pw%vzJBq~fB*J--yW0lLwZQ+^H(o=y%)Xjj>-FD
zx=L1?U8z=nJSIh6rPU_iC)N3osnws3$)U&&X^|zTY+2=n5nmpQQ(7GheeeeqKkiq_
zGB5U-J_b6=U7lBeCGYZL#jD>Rlhfv5pH<an|Dg22Qjx8<U;)glrEkil%4&cL|B|13
zy;EA8;k*DCQk-yanS;{tZU4C6tn*@rI}>5<*;+UEZS8pXZteQ_Z*3bMT01Tutxb=Y
z)~@BJwPks-TV=XCY_mfCE{L?-{wd$A#4g?JMG*EM`$BQ^TUuuK`8F?-=vJ*sq1J%N
z`)prjMYc+$*&~9J7{AxsJgvlPQ$h%!kAB^Ov#Vr+d+k+mCxT;Qm>JdLN{mNx8sc%S
z70)<s6hk<n4v>eJ1m_-IoJ>i~T>#-0xN3KR7)fS$n14qj9q_J%9E}N#x|cpacSPqX
z8fYVQ0rPt(u7%k-!_|1_9JX~XQ0Hb1x-6zUxav3z#UpGPtP3<4jmD^)@qq3&dS&EE
zWZN=(mWnP0t_9f^#?}mMmG6tn*bYNF5o&XI4bLYCS6>`NS!^L*@hwQa%QnWs6t!#J
ztOXT%PQErF(GjJteJ^$<?EM?Zoi}hCN(R;|$dZ84WWbIiuQ|zqXH_tf3i4hMsQa+5
zYw=ouw}_;V9~GO-$LMS~Ljk*HqZYqt-@B`4UgeN@*d}j^^nr2}z+hnuAY=w8Ykv@I
zFAltDj-WI;@fD4cF$}OFCa0}1Hakfn=elMfqEca^G>SmWatrkaB3e-*RNSocN(3E#
z8g!Ky9b5o~&5T2g90F{E5-<bUF0}J0W+BxS6{nu6P?LlXQY1Lu9o6T*kqUM(eM1uK
zOEI7bqPhtO*MeA42o(gr%xQ>aI_;X)wyB=IJ>=CrRkMf+tPt)B;OU@FL8tI*wqbDE
zYaL0C8YP)2!OWlQb(vL3M1>n8z*_`Ucrq9wdB~G4%Xm<m^7<iIy1S!L=ji;LO46+F
zF2s|%#ix{GG5)M_1^0_}gSVcm+oQt3CR*9e)bAXo^i0*^4Qjd4#0Rx76ttN%g)%|J
zGC}SZkd9euW)`sU3T7MoeKrJJu?Yw<Qe)675NO}K5OqsjwOVHAaddba*Nh;0xXuk+
z^=EJygNEQn9(2_ZNOdoUjg6+P_ieLtq6HdUcuY|9M;>$%JlnO@;Ze|1xVTK=qD|p*
zT#MrfyVe+NT&Lk$>Rmpro6ERv+PI$MS{Iiwc+s_<d#>Ac=u7=NXTPdY_1d5G+n=QN
z=RPxl3!FrtlXOYzw&$zVm0LSPN^lCd4Q^dDLs2huFFWw6eXIM)&h7`0hmiAj;2+h^
zUI&71!%-Juc-X4B%K=t9q^S?p$GF9L?MzDD%+&DL7zw0qENmxsY4GuaQ8r+ZMA*|=
z7CS2WfZ9I{IrAxQN293~6(W6CS_#boOpj0&u)}MtAb^eJQ>`BfaV7yAwT<4`8sss2
zU8Kv(OgZ>+DTB*n4s}%-kD|$Vb~6Ahv)MG7On5MWOuQ12j3?6>wWKR}pVdN*b?{Sq
z7e3@4L?B1=XdxGJAcEn-oi=355riYOy*?nAAa<kx5R6BQfg;F@@OOEgNZrW%@YX$p
zeKQ5RcKC#Byy8do0K?LG?L%Oy&~q!Q)TLgH&ld+6@$w~EP=B3(q||eb9S9iD4Dfg@
zuvSJJW$@DR`mB$u|NN`#>d&(D`lGw^3UtK*S6~T!Fa&S%gSD9-x<Ioiz3lj74szu9
zCW92WV;IIfXR(;Bt>zOW89e>U#;;M#XK1(^lSbC*x+nJQV~q8YfSG{DtTX9>@59d4
ztg?;+(hT%+hUv*z7Ah_E)l>xH6#^=kx<pWFX^9wu*!;>7Zj~>PepY_dQmYL>dILvL
zPbi(Z5E(J;L0U)lf%-1)WB&yddoLhuX-IhnqtFlw61h^Po{BZ6=J4yIxzu`qfE`;r
dnTm@KkT^1hz_G5c(|ArgrV$==>!*Id_df)5pJo66

diff --git a/bgfx/shaders/metal/chains/hlsl/fs_distortion.bin b/bgfx/shaders/metal/chains/hlsl/fs_distortion.bin
index 512262b52a78da8dd7b6ba5c7f2657c46c194ceb..22a66b575d2131530d71477d6bdf5d669e42d62d 100644
GIT binary patch
literal 5260
zcmbVQOK;mo5O#r{eC`j}Q$Z#YO)jYy@;KB$&>n&wjGh96pe4!?Adw15B~lZg`b+y4
z`U^TUyR#39a?s}BNV_}l`M%lJySrb1{Nb;E{=T|;`swQG&~B<nQ5Czg-51MJ?8>g#
zzPfI^=CJI<aa(lnyY1b_VpTT3Rr^CHzFrHl-quAY#pk>$kITAlR`ILrr(vPr4;@Q=
zEVk=RJZ|%MP4ReJZ|mlw)F0JmT{k;xEE9*k{Zj1n<LMPUfNNdRJeFO)+U#0y{nMdX
zov*GoZC5wlrmnoh%frKF38x1)^>V(fo2mqlb@XVwsSnj^XrtZLb@wrUfXwtnK5rhY
zvg;t{zNT`$EtkqMNaPw4v@5G#{&gyKP2LxqN(2K1%6Hv1--r(%+OBvk^G$VsKN8Ej
zg0FpzI?X=|k~x6P!(qKHn;;JF?;+BW5CTfv9hy?EUQ^ZIiWaL5NA(7s9f`Ks?YCt^
zn%dny=Tmx}PKDQBL8<4mj*0Bom=e__zZ7jr9g-&|Pg2}c32w3BZXr8mQ?7Dp_C>eb
ze=eFl#g)xk1c8bwI^_KVM@R8i#8DiE)L{^$78P&Avr;ca5+xxTcoOBdE&qqORN}^M
z$;LBW(vD>4ND{?2)*GkOqvI(gEgFXe!F+=9`lE?s6FDFiV+eZUNm3dqqxqEN-38F%
zs3v3V;LLG$hSmao5>oqurJ`dfUJA2wa(3JRSmzvdQsHbl-VBv#uCs&6_0bvVHs!WR
z1`jS)>w*@WaaRqP0_X4_TTH=X`>E;p`z#FUM5rweWs_3@qAWHSHzFWGtT#q97zRkh
zk(?+S+80)Vp2SfCyP!v#clu!ImGtFV3m}~G1-Yv}ez$p)@`Y3O1xDmW!40u+8Uj8$
z4Y7!9L%?Ui;&}-*xndbn`;98XrA(RAZni+Ljd_qkFb)pMB1939Zm$FeoB?MNg9L2{
z#B!11I4Yc>zL5wNIzukHu8c!%pvKcry&vd2T0FfaDu5{T;f&Mq?VHXApFIJs>ExKR
zkXURB0f*TWD9LLjIp!Whop{VYcY<@y5m03qQ!#erPIHqL3OoydU`GgF`)2@*9;+n8
z_BPQ8mIh%lc3@#gD7BV?1(ruoW=>N=qrobZplrE?F$H9$ax4^pS9K?X!Oj>Bj~tD3
z@QTZqga*czA(90Bws<~sd^S<N$+#At#!%-C;wKL4hevbHhL<|wv0D;h>3*RsfrqKe
zsf7Ptm>{H%D?GRCG%XCDKd~$UA|MR|)#ho)W@0*EwWg}*=F)h#ue)0!nuI2v5bg?S
z9;}2@Uo$Whnt1(LuWyOa8~%tl4zQy%@33pk0?5390Z&->H%=I_A!c*A1c4hncI@&=
z7tHFOfC6Jj1>@Zy&b*@m>pC&J<lPK-blAJouy@C2z0-!_7K+w;wHby9P?O@iV2o(Q
zzQvXv*5GNhZKAFv{T`<)fz2X~Y*U8DT$&*@I06ArPM?^3(`@T$mb%EgCK4(AGC8<D
zkG!0mQ^9<Y3g!UqLC0yXxxk+fz>hnJMy_?)f*bsYFACL+aSz-wR)+Kt>Sx2}U5UJF
zvN7m3m}5JJU=~Ps)>T~*N(an>*#x(fXktZ$C>~lXp;LiF=q19C=?DZMmUB|_Mu+s-
zULxD`JprCm%Z@1@hF}{!NBO#yWf~<}JY9^y_;fl+vJ8hGJOE^xO{U-v#g8ky;waRx
z<CI|k!^Xb;A_5uBlDV8qxDbrzF5k)o6e=Z*6^CZgeWKWmDK-n;ZMZ0M=Ac{#M^d6k
z6hemKBNicqIGT@CO4*c3-a~!Nr5+@HIyE<Qv*CkehYwEE4c;3!I*y$7cAmv>t#BY|
zs9XL=>Si~PMvVs!-yW5b9;JRqO8t}oPdUd!CJm{l1FM)~JtzUZGQpVbmlNilUsrv2
zX-?(S^kCvIQ;?$$GI6;-E1(g$LdBL({WAFkDfvxvW1GY1XM>s5=rw~ajwVbNK-M7-
z&9w<(Yq}3R{lZ*Oz&+zg2*%!K<xC-4_lfFA%yvMpD-9_EtZ~RDe!(y_cQMch4)M|X
znObcC@B{DwN+OUlaE+KQCaq(>V4S&)%=%M*jHKQe(U!&pJQ&4e<TOgY!s0;Nr9Kg-
zE)i?rz=q|0`ohi+UFuT9qUV+!I=OVI>mM<RO@X|W|J1g1{~_QA;xU3)Q^F5PmBKIl
K*7J0Ief2L>`vR;0

literal 5764
zcmbtY$&TAb5Osi@<^yu>lR?@NEiPIH_83S8Fp`7egOQUlAUF~=79ff;*&0h3`;;%u
zFXRhSRb9Q2R6I@sI2iR(%d1yQ^UeETfBfOkzyEsj<nR;xYd5<)u`8;w-51MJRHZDo
zFE3iz9F|fXw}pHwx9>j|tFrlRw?9bna3REcTNg4B_qi;O%ern>lb07?hcCT5NPX*L
zv0Z24ZkxYpio5H2TQ_HK{l43*>!z~GGI7Y;&&57Jo?dDLaP8BfSmmot)q1N<EepA+
zcey<6OK)f2l>4G7^ZRlsQ9t{FqLzo|zL1B;ztGf&-6~(!&93y1w^d!skNGWl-`Tm}
z-0ey!0as6cQ?9q570e>H*8oCQ?m8GVT#WnMVzU#$KoIguZu5=!@S&B(U72roH#Z}(
ztatFUE0LjmD(KDu?%W>M>#_+Z;mr;BKN3Pf7}4=$^@<|<TC^BhILaGzb|l)O+HcE-
zB(>E(*Qa=$PK6f_Ak;INeIoreLZXQ9OVO6Zf;=`jB|@zNsMml^*_5k1adwGpd1_X~
zYSTg-5!9b6h?LAT-0QE3D-kFFA}7+(Q9KiqD4B+Mi-nt`o5&%!7{ftzj@iE?1Fw<(
z`IPRv3m~OutgQC;MU&6)u>Kph4Ve2(B+-PdB5nHk+_^f(s{tz^Pt4z;crMJ&34GK$
zr?4+`figF1kY#PU0%s>-Ncm@MU7*4^nxJq#ItST(>y?tPqTIISqeKiL@LYgd_@CA_
z16}Q>M(W@5Fr*V9s~ZY|1_7?>YYXv0dqLNSbR#LID4k_9eCWRybwEOsVt}`Foam7{
z>`~-r{4Sk%Uc!0W3@EQ6l~u%AlWZdqDE5WgGq%u4CJ^IFr^p6@@>TQTC|(PQBmwy4
zi$YpUj81kl6tHVHj^Y*b!d*S-RZSO_=#g9Kjca6m767|OD9ZkCfHNNRV`wqR26io;
zAi7A#v6I-g^4iQM!gHB7x2fV-VKE3>ZlStC5-6mEqS~sKA{YqmXsAvxAHgDHWQb%V
zyDg8wbg<c0qn^?8DdsPgCB<-0V#t_b_!J~QPE;<fYl-8UHY;}0A;urt!c^f2r3V(x
zX_IF?%?|6L<LM6!Nq`hi!$9#g4Oz-1?OUOVinkdh-tTL9O}P?Nbr-^20l@=7P~H>2
zO=<W0JFwt2GxmXfROusH(D!b=ZcCZR)H0A;-XiE!XM-_@0)6K`fk%C<-n;=yudXP&
zbV7VvHmTrn3IU@OUU`HTY!Z*qq8#|IN`MuQSK^^$9AVTorKnx@9pnLTAZmsuS_1V@
z!pQJ+28D}o*XY?Km|;wuI$@?pSbxET5zGa4`D9{Yg-k(2PrcXV(4LN`)UbU!=VT0|
zZ{N;2xnN6!W6-dj$8Xqa)SF0j(rT!<LGkf2!RYAT^?uvjR#Ott*c||R$k5n<$oQ%B
z9UP$M>0=9J<{Squ&tm%>9KaDsbHJ$Y_}TR|=?6NQoV63SkjDR$1CE_m{aFrpaeO{h
z_P&<_3%<ZADJe8?iQjw^Y`)fA`$__ca1MiRs1n5&!fno9<krCvN>Y$~zOB1nkGyu%
zYvf5h)X2f|u`M31;oY_k_xo*ITZtW752s+VomABi)suCH_F8k2Dn&d4GVu(~+}E_8
z%tgaAOxJ8@5-<iOIIL(9iH-=t0aM(3iraBCwO55GZd-eUp@2ym$_mabY%*NH=G7Z1
z{D5+!(E70i>lX;TpO@0iR?E5#&JSxOGzpS4inGb=as;YpvuT`VfE*YSCuugFfi;9O
zu2jWQs3BDYk9`d`_Vs5GB+)!xB#Q*5@$tf)l@b)Fgy{Lk8IjO<8jmtP9%Z4s4bLir
zTL!v}*Ju&BkfHMk8MrWs79$0yR;8f3t&e%a?a>F5n}HUK@5c(iFBmR(pERQ5$RW4$
z6(rJ4N1<xW<btl=8%E}tflNGo>MB-Wb|B+<T(dKcwiYXz5$g2Cqbd%a8vKo0>LZdF
zw0xMju4@taEDH!Hy|O@P?2i+MM?V8QIhgvdmXuyC`syXzBcd6<+>cGD1YSrJ7&?av
zVCq-Vl&UDO<Avprk*^ibtwc{|qP<D|$3u#xi7Yg)BFt?=(gip$I6$b}?w8R876G;<
z<>Y7Q6m1dffFAjrca+om1|*#MQ|GFAY=Jy5NAJfyv8(`+3{ZlqMVYL#+g#&N(mJ9A
z;18njcbe4eG^}Y%*$H#o7|R|(uM&2kouz)QPTg9qZF5@#DE#+VTbi0e)YI(LoO7?X
l?hy+tR5)cnk+$x>@|}x#jQW35!pFs(%3k>X_x0l9$v<OpgXaJM

diff --git a/hlsl/distortion.fx b/hlsl/distortion.fx
index f683397b17a..bd78efde8c5 100644
--- a/hlsl/distortion.fx
+++ b/hlsl/distortion.fx
@@ -212,7 +212,7 @@ float2 GetDistortedCoords(float2 centerCoord, float amount, float amountCube)
 		: 1.0f + r2 * (k + kcube * sqrt(r2));
 
    	// fit screen bounds
-	f /= 1.0f + amount * 0.25 + amountCube * 0.125f;
+	f /= 1.0f + amount * 0.25f + amountCube * 0.125f;
 
 	// apply cubic distortion factor
    	centerCoord *= f;
@@ -237,9 +237,9 @@ float2 GetCoords(float2 coord, float distortionAmount, float cubicDistortionAmou
 float4 ps_main(PS_INPUT Input) : COLOR
 {
 	float distortionAmount = DistortionAmount;
-	float cubicDistortionAmount = CubicDistortionAmount > 0
-		? CubicDistortionAmount * 1.1  // cubic distortion need to be a little higher to compensate the quartic distortion
-		: CubicDistortionAmount * 1.2; // negativ values even more
+	float cubicDistortionAmount = CubicDistortionAmount > 0.0f
+		? CubicDistortionAmount * 1.1f  // cubic distortion need to be a little higher to compensate the quartic distortion
+		: CubicDistortionAmount * 1.2f; // negativ values even more
 
 	float2 TexelDims = 1.0f / TargetDims;
 
diff --git a/src/osd/modules/render/bgfx/chainentry.cpp b/src/osd/modules/render/bgfx/chainentry.cpp
index c30139e17c4..156bc435f09 100644
--- a/src/osd/modules/render/bgfx/chainentry.cpp
+++ b/src/osd/modules/render/bgfx/chainentry.cpp
@@ -122,6 +122,20 @@ void bgfx_chain_entry::setup_sourcesize_uniform(render_primitive* prim) const
 	}
 }
 
+void bgfx_chain_entry::setup_targetsize_uniform(int32_t screen) const
+{
+	bgfx_uniform* target_dims = m_effect->uniform("u_target_dims");
+	if (target_dims != nullptr)
+	{
+		bgfx_target* output = m_targets.target(screen, m_output);
+		if (output != nullptr)
+		{
+			float values[2] = { float(output->width()), float(output->height()) };
+			target_dims->set(values, sizeof(float) * 2);
+		}
+	}
+}
+
 void bgfx_chain_entry::setup_rotationtype_uniform(uint32_t rotation_type) const
 {
 	bgfx_uniform* rotation_type_uniform = m_effect->uniform("u_rotation_type");
@@ -166,6 +180,7 @@ void bgfx_chain_entry::setup_auto_uniforms(render_primitive* prim, texture_manag
 {
 	setup_screensize_uniforms(textures, screen_width, screen_height, screen);
 	setup_sourcesize_uniform(prim);
+	setup_targetsize_uniform(screen);
 	setup_rotationtype_uniform(rotation_type);
 	setup_swapxy_uniform(swap_xy);
 	setup_quaddims_uniform(prim);
diff --git a/src/osd/modules/render/bgfx/chainentry.h b/src/osd/modules/render/bgfx/chainentry.h
index eb102aaa059..e9e5112bf1b 100644
--- a/src/osd/modules/render/bgfx/chainentry.h
+++ b/src/osd/modules/render/bgfx/chainentry.h
@@ -47,6 +47,7 @@ private:
 	void setup_auto_uniforms(render_primitive* prim, texture_manager& textures, uint16_t screen_width, uint16_t screen_height, uint32_t rotation_type, bool swap_xy, int32_t screen);
 	void setup_screensize_uniforms(texture_manager& textures, uint16_t screen_width, uint16_t screen_height, int32_t screen);
 	void setup_sourcesize_uniform(render_primitive* prim) const;
+	void setup_targetsize_uniform(int32_t screen) const;
 	void setup_rotationtype_uniform(uint32_t rotation_type) const;
 	void setup_swapxy_uniform(bool swap_xy) const;
 	void setup_quaddims_uniform(render_primitive* prim) const;
diff --git a/src/osd/modules/render/bgfx/shaders/chains/hlsl/fs_distortion.sc b/src/osd/modules/render/bgfx/shaders/chains/hlsl/fs_distortion.sc
index 1547324f894..d7e1acf8494 100644
--- a/src/osd/modules/render/bgfx/shaders/chains/hlsl/fs_distortion.sc
+++ b/src/osd/modules/render/bgfx/shaders/chains/hlsl/fs_distortion.sc
@@ -11,12 +11,13 @@ $input v_color0, v_texcoord0
 // Autos
 uniform vec4 u_swap_xy;
 uniform vec4 u_screen_dims;
+uniform vec4 u_target_dims;
 uniform vec4 u_quad_dims;
-uniform vec4 u_rotation_type;
 
 // User-supplied
-uniform vec4 u_prepare_vector;
-uniform vec4 u_curvature;
+uniform vec4 u_distortion;
+uniform vec4 u_cubic_distortion;
+uniform vec4 u_distort_corner;
 uniform vec4 u_round_corner;
 uniform vec4 u_smooth_border;
 uniform vec4 u_vignetting;
@@ -72,36 +73,15 @@ float GetVignetteFactor(vec2 coord, float amount)
 float GetSpotAddend(vec2 coord, float amount)
 {
 	vec2 SpotCoord = coord;
-	
-	// hack for vector screen
-	if (u_prepare_vector.x > 0.0)
-	{
-		// upper right quadrant
-		vec2 spotOffset = vec2(-0.25, 0.25); // 0 degrees
-		if (u_rotation_type.x == 1.0)
-			spotOffset = vec2(-0.25, -0.25); // 90 degrees
-		if (u_rotation_type.x == 2.0)
-			spotOffset = vec2(0.25, -0.25); // 180 degrees
-		if (u_rotation_type.x == 3.0)
-			spotOffset = vec2(0.25, 0.25); // 270 degrees
-		
-		// normalized screen canvas ratio
-		vec2 CanvasRatio = ((u_swap_xy.x > 0.0) ? vec2(u_quad_dims.x / u_quad_dims.y, 1.0) : vec2(1.0, u_quad_dims.y / u_quad_dims.x));
-		
-		SpotCoord += spotOffset;
-		SpotCoord *= CanvasRatio;
-	}
-	else
-	{
-		// upper right quadrant
-		vec2 spotOffset = vec2(-0.25, 0.25);
 
-		// normalized screen canvas ratio
-		vec2 CanvasRatio = ((u_swap_xy.x > 0.0) ? vec2(1.0, u_quad_dims.x / u_quad_dims.y) : vec2(1.0, u_quad_dims.y / u_quad_dims.x));
-		
-		SpotCoord += spotOffset;
-		SpotCoord *= CanvasRatio;
-	}
+	// upper right quadrant
+	vec2 spotOffset = vec2(-0.25, 0.25);
+
+	// normalized screen canvas ratio
+	vec2 CanvasRatio = ((u_swap_xy.x > 0.0) ? vec2(1.0, u_quad_dims.x / u_quad_dims.y) : vec2(1.0, u_quad_dims.y / u_quad_dims.x));
+
+	SpotCoord += spotOffset;
+	SpotCoord *= CanvasRatio;
 
 	float SpotBlur = amount;
 
@@ -122,7 +102,7 @@ float GetRoundCornerFactor(vec2 coord, float radiusAmount, float smoothAmount)
 	// reduce smooth amount down to radius amount
 	smoothAmount = min(smoothAmount, radiusAmount);
 
-	vec2 quadDims = (u_prepare_vector.x > 0.0 && u_swap_xy.x > 0.0) ? u_quad_dims.yx : u_quad_dims.xy;
+	vec2 quadDims = (u_swap_xy.x > 0.0) ? u_quad_dims.yx : u_quad_dims.xy;
 
 	float range = min(quadDims.x, quadDims.y) * 0.5;
 	float radius = range * max(radiusAmount, 0.0025);
@@ -141,20 +121,20 @@ float GetRoundCornerFactor(vec2 coord, float radiusAmount, float smoothAmount)
 }
 
 // www.francois-tarlier.com/blog/cubic-lens-distortion-shader/
-vec2 GetDistortedCoords(vec2 centerCoord, float amount)
+vec2 GetDistortedCoords(vec2 centerCoord, float amount, float amountCube)
 {
 	// lens distortion coefficient
 	float k = amount;
 
 	// cubic distortion value
-	float kcube = amount * 2.0;
+	float kcube = amountCube;
 
 	// compute cubic distortion factor
 	float r2 = centerCoord.x * centerCoord.x + centerCoord.y * centerCoord.y;
 	float f = kcube == 0.0 ? 1.0 + r2 * k : 1.0 + r2 * (k + kcube * sqrt(r2));
 
    	// fit screen bounds
-	f /= 1.0 + amount * 0.5;
+	f /= 1.0 + amount * 0.25 + amountCube * 0.125;
 
 	// apply cubic distortion factor
    	centerCoord *= f;
@@ -162,13 +142,13 @@ vec2 GetDistortedCoords(vec2 centerCoord, float amount)
 	return centerCoord;
 }
 
-vec2 GetCoords(vec2 coord, float distortionAmount)
+vec2 GetCoords(vec2 coord, float distortionAmount, float cubicDistortionAmount)
 {
 	// center coordinates
 	coord -= 0.5;
 
 	// distort coordinates
-	coord = GetDistortedCoords(coord, distortionAmount);
+	coord = GetDistortedCoords(coord, distortionAmount, cubicDistortionAmount);
 
 	// un-center coordinates
 	coord += 0.5;
@@ -180,24 +160,36 @@ vec2 GetCoords(vec2 coord, float distortionAmount)
 
 void main()
 {
+	float distortionAmount = u_distortion.x;
+	float cubicDistortionAmount = u_cubic_distortion.x > 0.0
+		? u_cubic_distortion.x * 1.1  // cubic distortion need to be a little higher to compensate the quartic distortion
+		: u_cubic_distortion.x * 1.2; // negativ values even more
+
+	vec2 TexelDims = vec2(1.0 / u_target_dims.x, 1.0 / u_target_dims.y);
+
 	// Screen Curvature
-	vec2 BaseCoord = GetCoords(v_texcoord0, u_curvature.x * 0.25); // reduced amount
+	vec2 BaseCoord = GetCoords(v_texcoord0, distortionAmount, cubicDistortionAmount);
+
+	// Corner Curvature
+	vec2 CornerCoord = GetCoords(v_texcoord0, u_distort_corner.x, 0.0);
 
 	vec2 BaseCoordCentered = BaseCoord;
 	BaseCoordCentered -= 0.5;
+	vec2 CornerCoordCentered = CornerCoord;
+	CornerCoordCentered -= 0.5;
 
 	// Color
 	vec4 BaseColor = texture2D(s_tex, BaseCoord);
 
 	// Clamp
-	if (BaseCoord.x > 1.0 || BaseCoord.y > 1.0 || BaseCoord.x < 0.0 || BaseCoord.y < 0.0)
+	if (BaseCoord.x > 1.0 + TexelDims.x || BaseCoord.y > 1.0 + TexelDims.y || BaseCoord.x < 0.0 - TexelDims.x || BaseCoord.y < 0.0 - TexelDims.y)
 	{
 		gl_FragColor = vec4(0.0, 0.0, 0.0, 0.0);
 	}
 	else
 	{
 		// Vignetting Simulation
-		vec2 VignetteCoord = BaseCoordCentered;
+		vec2 VignetteCoord = CornerCoordCentered;
 
 		float VignetteFactor = GetVignetteFactor(VignetteCoord, u_vignetting.x);
 		BaseColor.rgb *= VignetteFactor;
@@ -205,15 +197,15 @@ void main()
 		// Light Reflection Simulation
 		vec4 LightColor = vec4(1.0, 0.90, 0.80, 1.0); // color temperature 5.000 Kelvin
 
-		vec2 SpotCoord = BaseCoordCentered;
-		vec2 NoiseCoord = BaseCoordCentered;
+		vec2 SpotCoord = CornerCoordCentered;
+		vec2 NoiseCoord = CornerCoordCentered;
 
 		float SpotAddend = GetSpotAddend(SpotCoord, u_reflection.x);
 		float NoiseFactor = GetNoiseFactor(SpotAddend, rand(NoiseCoord));
 		BaseColor += SpotAddend * NoiseFactor * LightColor;
 
 		// Round Corners Simulation
-		vec2 RoundCornerCoord = BaseCoordCentered;
+		vec2 RoundCornerCoord = CornerCoordCentered;
 
 		float roundCornerFactor = GetRoundCornerFactor(RoundCornerCoord, u_round_corner.x, u_smooth_border.x);
 		BaseColor.rgb *= roundCornerFactor;

From 9829c978c7096f97f9f5d406a0fc0a5dcc547169 Mon Sep 17 00:00:00 2001
From: hap <happppp@users.noreply.github.com>
Date: Tue, 19 Apr 2016 21:57:37 +0200
Subject: [PATCH 103/122] fidel68k: V11 was twice as slow when compared to the
 real thing

---
 src/mame/drivers/fidel68k.cpp | 6 ++++--
 src/mame/drivers/hh_tms1k.cpp | 1 +
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/mame/drivers/fidel68k.cpp b/src/mame/drivers/fidel68k.cpp
index d1239636236..4d1c17e9c95 100644
--- a/src/mame/drivers/fidel68k.cpp
+++ b/src/mame/drivers/fidel68k.cpp
@@ -9,7 +9,9 @@
     - how does dual-CPU work?
     - IRQ level/timing is unknown
     - USART is not emulated
-    - V11 CPU should be M68EC060, not yet emulated
+    - V11 CPU should be M68EC060, not yet emulated. Now using M68EC040 in its place
+      at twice the frequency due to lack of superscalar.
+    - V11 beeper is too high pitched, obviously related to wrong CPU type too
 
 ******************************************************************************
 
@@ -426,7 +428,7 @@ MACHINE_CONFIG_END
 static MACHINE_CONFIG_DERIVED( eagv11, eag )
 
 	/* basic machine hardware */
-	MCFG_CPU_REPLACE("maincpu", M68EC040, XTAL_36MHz*2) // wrong! should be M68EC060
+	MCFG_CPU_REPLACE("maincpu", M68EC040, XTAL_36MHz*2*2) // wrong! should be M68EC060 @ 72MHz
 	MCFG_CPU_PROGRAM_MAP(eagv11_map)
 	MCFG_CPU_PERIODIC_INT_DRIVER(fidel68k_state, irq2_line_hold, 600) // complete guess
 MACHINE_CONFIG_END
diff --git a/src/mame/drivers/hh_tms1k.cpp b/src/mame/drivers/hh_tms1k.cpp
index 60a7f1dcdb4..d8807e9e33e 100644
--- a/src/mame/drivers/hh_tms1k.cpp
+++ b/src/mame/drivers/hh_tms1k.cpp
@@ -53,6 +53,7 @@
  @MP3301A  TMS1000   1979, Milton Bradley Big Trak
  *MP3320A  TMS1000   1979, Coleco Head to Head Basketball
  *M32001   TMS1000   1981, Coleco Quiz Wiz Challenger (note: MP3398, MP3399, M3200x?)
+ *M32018   TMS1000   1990, unknown device, decap/dump is available
   MP3403   TMS1100   1978, Marx Electronic Bowling -> elecbowl.cpp
  @MP3404   TMS1100   1978, Parker Brothers Merlin
  @MP3405   TMS1100   1979, Coleco Amaze-A-Tron

From c7aeff7d6d35e1478e015148b1d5dcc248e897be Mon Sep 17 00:00:00 2001
From: Michael Zapf <Michael.Zapf@mizapf.de>
Date: Tue, 19 Apr 2016 22:03:27 +0200
Subject: [PATCH 104/122] ti99: Again one indirection less; dropped the
 videowrp and moved the v9938 on the EVPC board.

---
 scripts/src/bus.lua                  |   2 -
 src/devices/bus/ti99_peb/evpc.cpp    | 376 ++++++++-----
 src/devices/bus/ti99_peb/evpc.h      |  36 +-
 src/devices/bus/ti99_peb/hsgpl.cpp   |  80 +--
 src/devices/bus/ti99_peb/peribox.cpp |  24 +-
 src/devices/bus/ti99_peb/peribox.h   |   8 +
 src/devices/bus/ti99_peb/samsmem.cpp |  48 +-
 src/devices/bus/ti99_peb/samsmem.h   |  11 +-
 src/devices/bus/ti99x/datamux.cpp    |  35 +-
 src/devices/bus/ti99x/datamux.h      |   3 +-
 src/devices/bus/ti99x/ti99defs.h     |  39 +-
 src/devices/bus/ti99x/videowrp.cpp   | 121 -----
 src/devices/bus/ti99x/videowrp.h     |  93 ----
 src/mame/drivers/ti99_4p.cpp         | 759 ++++++++++++++++-----------
 src/mame/drivers/ti99_4x.cpp         | 107 +++-
 src/mame/drivers/ti99_8.cpp          |   1 -
 16 files changed, 968 insertions(+), 775 deletions(-)
 delete mode 100644 src/devices/bus/ti99x/videowrp.cpp
 delete mode 100644 src/devices/bus/ti99x/videowrp.h

diff --git a/scripts/src/bus.lua b/scripts/src/bus.lua
index 9272b2384c2..78032cabff0 100644
--- a/scripts/src/bus.lua
+++ b/scripts/src/bus.lua
@@ -2076,8 +2076,6 @@ if (BUSES["TI99X"]~=null) then
 		MAME_DIR .. "src/devices/bus/ti99x/mecmouse.cpp",
 		MAME_DIR .. "src/devices/bus/ti99x/mecmouse.h",
 		MAME_DIR .. "src/devices/bus/ti99x/ti99defs.h",
-		MAME_DIR .. "src/devices/bus/ti99x/videowrp.cpp",
-		MAME_DIR .. "src/devices/bus/ti99x/videowrp.h",
 	}
 end
 
diff --git a/src/devices/bus/ti99_peb/evpc.cpp b/src/devices/bus/ti99_peb/evpc.cpp
index 6945df0dcc6..1d56c00458f 100644
--- a/src/devices/bus/ti99_peb/evpc.cpp
+++ b/src/devices/bus/ti99_peb/evpc.cpp
@@ -1,39 +1,99 @@
 // license:LGPL-2.1+
 // copyright-holders:Michael Zapf
 /****************************************************************************
-    SNUG Enhanced Video Processor Card (evpc)
-    based on v9938 (may also be equipped with v9958)
-    Can be used with TI-99/4A as an add-on card; internal VDP must be removed
+    SNUG Enhanced Video Processor Card (EVPC)
+
+    This is an expansion card with an own v9938 video processor on board.
+    Later releases (EVPC2) can also be equipped with a v9958.
+
+    The EVPC is intended to be used
+    1. with the TI-99/4A console
+    2. with the SGCPU
+
+    For option 1, the console-internal VDP (TMS9928A) must be removed. This,
+    however, raises a problem, because the video interrupt must now be send
+    from the EVPC in the Peripheral Expansion Box to the console, but there is
+    no line in the PEB cable for this purpose.
+
+    To solve this issue, a separate cable is led from the EVPC to the console
+    which delivers the video interrupt, and also the GROM clock which is also
+    lost due to the removal of the internal VDP.
+
+    The SGCPU requires this card, as it does not offer any video processor.
+    In this configuration, the video interrupt cable is not required.
+
+    Also, the SGCPU does not offer a socket for the sound chip of the TI
+    console, and accordingly, the EVPC also gives the sound chip a new home.
+    Thus we assume that in the TI console (option 1) the sound chip has
+    also been removed.
+
+    Important note: The DSR (firmware) of the EVPC expects a memory expansion
+    to be present; otherwise, the configuration (using CALL EVPC) will crash.
+    There is no warning if the 32K expansion is not present.
 
-    The SGCPU ("TI-99/4P") only runs with EVPC.
     Michael Zapf
 
-    October 2010: Rewritten as device
-    February 2012: Rewritten as class
-
-    FIXME: Locks up on startup when HFDC is present. This can be avoided
-    by using another controller (like bwg) or doing a soft reset.
-
 *****************************************************************************/
 
 #include "evpc.h"
 
 #define EVPC_CRU_BASE 0x1400
-#define VERBOSE 1
-#define LOG logerror
+
+#define TRACE_ADDRESS 0
+#define TRACE_CRU 0
+#define TRACE_MEM 0
 
 #define NOVRAM_SIZE 256
 
 snug_enhanced_video_device::snug_enhanced_video_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
 : ti_expansion_card_device(mconfig, TI99_EVPC, "SNUG Enhanced Video Processor Card", tag, owner, clock, "ti99_evpc", __FILE__),
 	device_nvram_interface(mconfig, *this),
-	m_dsrrom(nullptr),
-	m_RAMEN(false),
 	m_dsr_page(0),
-	m_novram(nullptr)
+	m_inDsrArea(false),
+	m_novram_accessed(false),
+	m_palette_accessed(false),
+	m_RAMEN(false),
+	m_dsrrom(nullptr),
+	m_novram(nullptr),
+	m_video(*this, VDP_TAG),
+	m_sound(*this, TISOUNDCHIP_TAG)
 {
 }
 
+SETADDRESS_DBIN_MEMBER( snug_enhanced_video_device::setaddress_dbin )
+{
+	// Do not allow setaddress for the debugger. It will mess up the
+	// setaddress/memory access pairs when the CPU enters wait states.
+	if (space.debugger_access()) return;
+
+	if (TRACE_ADDRESS) logerror("set address %04x, %s\n", offset, (state==ASSERT_LINE)? "read" : "write");
+
+	m_address = offset;
+	bool reading = (state==ASSERT_LINE);
+	int offbase = (m_address & 0xfc01);
+
+	// Sound
+	m_sound_accessed = ((m_address & 0xff01)==0x8400) && !reading;
+
+	// Video space
+	// 8800 / 8802 / 8804 / 8806
+	// 8c00 / 8c02 / 8c04 / 8c06
+	//
+	// Bits 1000 1w00 0000 0xx0
+	// Mask 1111 1000 0000 0001
+	m_video_accessed = ((offbase==0x8800) && reading) || ((offbase==0x8c00) && !reading);
+
+	// Read a byte in evpc DSR space
+	// 0x4000 - 0x5eff   DSR (paged)
+	// 0x5f00 - 0x5fef   NOVRAM
+	// 0x5ff0 - 0x5fff   Palette
+	m_inDsrArea = ((m_address & 0xe000)==0x4000);
+	m_novram_accessed = ((m_address & 0xff00)==0x5f00);
+	m_palette_accessed = ((m_address & 0xfff0)==0x5ff0);
+
+	// Note that we check the selection in reverse order so that the overlap is avoided
+}
+
 //-------------------------------------------------
 //  nvram_default - called to initialize NVRAM to
 //  its default state
@@ -64,85 +124,80 @@ void snug_enhanced_video_device::nvram_write(emu_file &file)
 	file.write(m_novram.get(), NOVRAM_SIZE);
 }
 
-
 /*
-    Read a byte in evpc DSR space
+    Read a byte in evpc DSR space, NOVRAM, Palette, or video
     0x4000 - 0x5eff   DSR (paged)
     0x5f00 - 0x5fef   NOVRAM
-    0x5ff0 - 0x5fff   Palette
+    0x5ff0 - 0x5fff   Palette (5ff0, 5ff2, 5ff4, 5ff6)
 */
 READ8Z_MEMBER(snug_enhanced_video_device::readz)
 {
-	if (m_selected)
+	if (m_selected && m_inDsrArea)
 	{
-		if ((offset & m_select_mask)==m_select_value)
+		if (m_palette_accessed)
 		{
-			if ((offset & 0x1ff0)==0x1ff0)              // Palette control
+			switch (m_address & 0x000f)
 			{
-				switch (offset & 0x000f)
-				{
-				case 0:
-					/* Palette Read Address Register */
-					*value = m_palette.write_index;
-					break;
+			case 0:
+				// Palette Read Address Register
+				*value = m_palette.write_index;
+				break;
 
-				case 2:
-					/* Palette Read Color Value */
-					if (m_palette.read)
-					{
-						switch (m_palette.state)
-						{
-						case 0:
-							*value = m_palette.color[m_palette.read_index].red;
-							break;
-						case 1:
-							*value = m_palette.color[m_palette.read_index].green;
-							break;
-						case 2:
-							*value = m_palette.color[m_palette.read_index].blue;
-							break;
-						}
-						m_palette.state++;
-						if (m_palette.state == 3)
-						{
-							m_palette.state = 0;
-							m_palette.read_index++;
-						}
-					}
-					break;
-
-				case 4:
-					/* Palette Read Pixel Mask */
-					*value = m_palette.mask;
-					break;
-				case 6:
-					/* Palette Read Address Register for Color Value */
-					if (m_palette.read)
-						*value = 0;
-					else
-						*value = 3;
-					break;
-				}
-			}
-			else
-			{
-				if ((offset & 0x1f00)==0x1f00)
+			case 2:
+				// Palette Read Color Value
+				if (m_palette.read)
 				{
-					if (m_RAMEN)  // NOVRAM hides DSR
+					switch (m_palette.state)
 					{
-						*value = m_novram[offset & 0x00ff];
+					case 0:
+						*value = m_palette.color[m_palette.read_index].red;
+						break;
+					case 1:
+						*value = m_palette.color[m_palette.read_index].green;
+						break;
+					case 2:
+						*value = m_palette.color[m_palette.read_index].blue;
+						break;
 					}
-					else  // DSR
+					m_palette.state++;
+					if (m_palette.state == 3)
 					{
-						*value = m_dsrrom[(offset&0x1fff) | (m_dsr_page<<13)];
+						m_palette.state = 0;
+						m_palette.read_index++;
 					}
 				}
+				break;
+
+			case 4:
+				// Palette Read Pixel Mask
+				*value = m_palette.mask;
+				break;
+			case 6:
+				// Palette Read Address Register for Color Value
+				if (m_palette.read)
+					*value = 0;
 				else
-				{
-					*value = m_dsrrom[(offset&0x1fff) | (m_dsr_page<<13)];
-				}
+					*value = 3;
+				break;
 			}
+			return;
 		}
+
+		if (m_novram_accessed && m_RAMEN)
+		{
+			// NOVRAM
+			*value = m_novram[offset & 0x00ff];
+			return;
+		}
+
+		// DSR space
+		*value = m_dsrrom[(offset & 0x1fff) | (m_dsr_page<<13)];
+		return;
+	}
+
+	if (m_video_accessed)
+	{
+		*value = m_video->read(space, m_address>>1);
 	}
 }
 
@@ -150,82 +205,87 @@ READ8Z_MEMBER(snug_enhanced_video_device::readz)
     Write a byte in evpc DSR space
     0x4000 - 0x5eff   DSR (paged)
     0x5f00 - 0x5fef   NOVRAM
-    0x5ff0 - 0x5fff   Palette
+    0x5ff0 - 0x5fff   Palette (5ff8, 5ffa, 5ffc, 5ffe)
 */
 WRITE8_MEMBER(snug_enhanced_video_device::write)
 {
-	if (m_selected)
+	if (m_selected && m_inDsrArea)
 	{
-		if ((offset & m_select_mask)==m_select_value)
+		if (m_palette_accessed)
 		{
-			if ((offset & 0x1ff0)==0x1ff0)
+			// Palette
+			if (TRACE_MEM) logerror("palette write %04x <- %02x\n", offset&0xffff, data);
+			switch (m_address & 0x000f)
 			{
-				/* PALETTE */
-				if (VERBOSE>5) LOG("palette write %04x <- %02x\n", offset&0xffff, data);
-				switch (offset & 0x000f)
+			case 0x08:
+				// Palette Write Address Register
+				if (TRACE_MEM) logerror("EVPC palette address write (for write access)\n");
+				m_palette.write_index = data;
+				m_palette.state = 0;
+				m_palette.read = 0;
+				break;
+
+			case 0x0a:
+				// Palette Write Color Value
+				if (TRACE_MEM) logerror("EVPC palette color write\n");
+				if (!m_palette.read)
 				{
-				case 0x08:
-					/* Palette Write Address Register */
-					if (VERBOSE>5) LOG("EVPC palette address write (for write access)\n");
-					m_palette.write_index = data;
-					m_palette.state = 0;
-					m_palette.read = 0;
-					break;
-
-				case 0x0a:
-					/* Palette Write Color Value */
-					if (VERBOSE>5) LOG("EVPC palette color write\n");
-					if (!m_palette.read)
+					switch (m_palette.state)
 					{
-						switch (m_palette.state)
-						{
-						case 0:
-							m_palette.color[m_palette.write_index].red = data;
-							break;
-						case 1:
-							m_palette.color[m_palette.write_index].green = data;
-							break;
-						case 2:
-							m_palette.color[m_palette.write_index].blue = data;
-							break;
-						}
-						m_palette.state++;
-						if (m_palette.state == 3)
-						{
-							m_palette.state = 0;
-							m_palette.write_index++;
-						}
-						//evpc_palette.dirty = 1;
+					case 0:
+						m_palette.color[m_palette.write_index].red = data;
+						break;
+					case 1:
+						m_palette.color[m_palette.write_index].green = data;
+						break;
+					case 2:
+						m_palette.color[m_palette.write_index].blue = data;
+						break;
 					}
-					break;
-
-				case 0x0c:
-					/* Palette Write Pixel Mask */
-					if (VERBOSE>5) LOG("EVPC palette mask write\n");
-					m_palette.mask = data;
-					break;
-
-				case 0x0e:
-					/* Palette Write Address Register for Color Value */
-					if (VERBOSE>5) LOG("EVPC palette address write (for read access)\n");
-					m_palette.read_index = data;
-					m_palette.state = 0;
-					m_palette.read = 1;
-					break;
-				}
-			}
-			else
-			{
-				if ((offset & 0x1f00)==0x1f00)
-				{
-					if (m_RAMEN)
+					m_palette.state++;
+					if (m_palette.state == 3)
 					{
-						// NOVRAM
-						m_novram[offset & 0x00ff] = data;
+						m_palette.state = 0;
+						m_palette.write_index++;
 					}
+					//evpc_palette.dirty = 1;
 				}
+				break;
+
+			case 0x0c:
+				// Palette Write Pixel Mask
+				if (TRACE_MEM) logerror("EVPC palette mask write\n");
+				m_palette.mask = data;
+				break;
+
+			case 0x0e:
+				// Palette Write Address Register for Color Value
+				if (TRACE_MEM) logerror("EVPC palette address write (for read access)\n");
+				m_palette.read_index = data;
+				m_palette.state = 0;
+				m_palette.read = 1;
+				break;
+
 			}
+			return;
 		}
+
+		if (m_novram_accessed && m_RAMEN)
+		{
+			// NOVRAM
+			m_novram[offset & 0x00ff] = data;
+			return;
+		}
+	}
+
+	if (m_video_accessed)
+	{
+		m_video->write(space, m_address>>1, data);
+	}
+
+	if (m_sound_accessed)
+	{
+		m_sound->write(space, 0, data);
 	}
 }
 
@@ -273,7 +333,7 @@ WRITE8_MEMBER(snug_enhanced_video_device::cruwrite)
 		{
 		case 0:
 			m_selected = (data!=0);
-			if (VERBOSE>4) LOG("evpc: Map DSR = %d\n", m_selected);
+			if (TRACE_CRU) logerror("Map DSR = %d\n", m_selected);
 			break;
 
 		case 1:
@@ -309,15 +369,23 @@ WRITE8_MEMBER(snug_enhanced_video_device::cruwrite)
 	}
 }
 
+/*
+    READY line for the sound chip
+*/
+WRITE_LINE_MEMBER( snug_enhanced_video_device::ready_line )
+{
+	m_slot->set_ready(state);
+}
+
 void snug_enhanced_video_device::device_start()
 {
 	m_dsrrom = memregion(DSRROM)->base();
 	m_novram = std::make_unique<UINT8[]>(NOVRAM_SIZE);
+	m_console_conn = downcast<evpc_clock_connector*>(machine().device(EVPC_CONN_TAG));
 }
 
 void snug_enhanced_video_device::device_reset()
 {
-	if (VERBOSE>5) LOG("evpc: reset\n");
 	m_select_mask = 0x7e000;
 	m_select_value = 0x74000;
 	m_dsr_page = 0;
@@ -330,11 +398,36 @@ void snug_enhanced_video_device::device_stop()
 	m_novram = nullptr;
 }
 
+/*
+    This is the extra cable running from the EVPC card right into the TI console.
+    It delivers the VDP interrupt and the GROM clock.
+
+    For the SGCPU, the signal is delivered by the LCP line.
+*/
+WRITE_LINE_MEMBER( snug_enhanced_video_device::video_interrupt_in )
+{
+	if (m_console_conn != nullptr) m_console_conn->vclock_line(state);
+	else m_slot->lcp_line(state);
+}
+
 ROM_START( ti99_evpc )
 	ROM_REGION(0x10000, DSRROM, 0)
 	ROM_LOAD("evpcdsr.bin", 0, 0x10000, CRC(a062b75d) SHA1(6e8060f86e3bb9c36f244d88825e3fe237bfe9a9)) /* evpc DSR ROM */
 ROM_END
 
+MACHINE_CONFIG_FRAGMENT( ti99_evpc )
+	// video hardware
+	MCFG_V9938_ADD(VDP_TAG, SCREEN_TAG, 0x20000, XTAL_21_4772MHz)  /* typical 9938 clock, not verified */
+	MCFG_V99X8_INTERRUPT_CALLBACK(WRITELINE(snug_enhanced_video_device, video_interrupt_in))
+	MCFG_V99X8_SCREEN_ADD_NTSC(SCREEN_TAG, VDP_TAG, XTAL_21_4772MHz)
+
+	// Sound hardware
+	MCFG_SPEAKER_STANDARD_MONO("sound_out")
+	MCFG_SOUND_ADD(TISOUNDCHIP_TAG, SN94624, 3579545/8) /* 3.579545 MHz */
+	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "sound_out", 0.75)
+	MCFG_SN76496_READY_HANDLER( WRITELINE(snug_enhanced_video_device, ready_line) )
+MACHINE_CONFIG_END
+
 /*
     Input ports for the EPVC
 */
@@ -370,4 +463,9 @@ ioport_constructor snug_enhanced_video_device::device_input_ports() const
 	return INPUT_PORTS_NAME(ti99_evpc);
 }
 
+machine_config_constructor snug_enhanced_video_device::device_mconfig_additions() const
+{
+	return MACHINE_CONFIG_NAME( ti99_evpc );
+}
+
 const device_type TI99_EVPC = &device_creator<snug_enhanced_video_device>;
diff --git a/src/devices/bus/ti99_peb/evpc.h b/src/devices/bus/ti99_peb/evpc.h
index 2b67fd272fc..f7423f6011d 100644
--- a/src/devices/bus/ti99_peb/evpc.h
+++ b/src/devices/bus/ti99_peb/evpc.h
@@ -17,6 +17,9 @@
 
 #include "emu.h"
 #include "peribox.h"
+#include "video/v9938.h"
+#include "sound/sn76496.h"
+#include "bus/ti99x/ti99defs.h"
 
 extern const device_type TI99_EVPC;
 
@@ -35,28 +38,45 @@ public:
 	snug_enhanced_video_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
 	DECLARE_READ8Z_MEMBER(readz) override;
 	DECLARE_WRITE8_MEMBER(write) override;
+	DECLARE_SETADDRESS_DBIN_MEMBER(setaddress_dbin) override;
+
+	DECLARE_WRITE_LINE_MEMBER( ready_line );
 
 	DECLARE_READ8Z_MEMBER(crureadz) override;
 	DECLARE_WRITE8_MEMBER(cruwrite) override;
+	DECLARE_WRITE_LINE_MEMBER( video_interrupt_in );
 
 protected:
-	virtual void device_start(void) override;
-	virtual void device_reset(void) override;
-	virtual void device_stop(void) override;
+	void device_start(void) override;
+	void device_reset(void) override;
+	void device_stop(void) override;
 
 	virtual const rom_entry *device_rom_region() const override;
 	virtual ioport_constructor device_input_ports() const override;
+	machine_config_constructor device_mconfig_additions() const override;
 
 	void nvram_default() override;
 	void nvram_read(emu_file &file) override;
 	void nvram_write(emu_file &file) override;
 
 private:
-	UINT8*          m_dsrrom;
-	bool            m_RAMEN;
-	int             m_dsr_page;
-	std::unique_ptr<UINT8[]>          m_novram;   /* NOVRAM area */
-	evpc_palette    m_palette;
+	int     m_address;
+	int     m_dsr_page;
+	bool    m_inDsrArea;
+	bool    m_novram_accessed;
+	bool    m_palette_accessed;
+	bool    m_RAMEN;
+	bool    m_sound_accessed;
+	bool    m_video_accessed;
+
+	UINT8*  m_dsrrom;
+
+	std::unique_ptr<UINT8[]>          m_novram;   // NOVRAM area
+
+	evpc_palette                            m_palette;
+	required_device<v9938_device>           m_video;
+	required_device<sn76496_base_device>    m_sound;
+	evpc_clock_connector*                   m_console_conn;
 };
 
 #endif
diff --git a/src/devices/bus/ti99_peb/hsgpl.cpp b/src/devices/bus/ti99_peb/hsgpl.cpp
index 42ec9360ad3..77ea46fa971 100644
--- a/src/devices/bus/ti99_peb/hsgpl.cpp
+++ b/src/devices/bus/ti99_peb/hsgpl.cpp
@@ -127,6 +127,7 @@
 #define TRACE_DSR 0
 #define TRACE_BANKING 0
 #define TRACE_CRU 0
+#define TRACE_ADDRESS 0
 #define TRACE_READ 0
 #define TRACE_WRITE 0
 #define TRACE_IGNORE 0
@@ -165,7 +166,7 @@ WRITE8_MEMBER(snug_high_speed_gpl_device::cruwrite)
 	{
 		if (data != 0)
 		{
-			if (TRACE_CRU) logerror("%s: Supercart cru setting %04x\n", tag(), offset);
+			if (TRACE_CRU) logerror("Supercart cru setting %04x\n", offset);
 			m_current_bank = (offset-0x0802)>>2;
 		}
 		return;
@@ -179,15 +180,15 @@ WRITE8_MEMBER(snug_high_speed_gpl_device::cruwrite)
 		{
 		case 0:
 			m_dsr_enabled = (data != 0);
-			if (TRACE_CRU) logerror("%s: Set dsr_enabled=%x\n", tag(), data);
+			if (TRACE_CRU) logerror("Set dsr_enabled=%x\n", data);
 			break;
 		case 1:
 			m_gram_enabled = (data != 0);
-			if (TRACE_CRU) logerror("%s: Set gram_enabled=%x\n", tag(), data);
+			if (TRACE_CRU) logerror("Set gram_enabled=%x\n", data);
 			break;
 		case 2:
 			m_bank_inhibit = (data != 0);
-			if (TRACE_CRU) logerror("%s: Set bank_inhibit=%x\n", tag(), data);
+			if (TRACE_CRU) logerror("Set bank_inhibit=%x\n", data);
 			break;
 		case 3:
 		case 4:
@@ -199,34 +200,34 @@ WRITE8_MEMBER(snug_high_speed_gpl_device::cruwrite)
 				m_dsr_page |= (1 << (bit-3));
 			else
 				m_dsr_page &= ~(1 << (bit-3));
-			if (TRACE_CRU) logerror("%s: Set dsr_page=%d\n", tag(), m_dsr_page);
+			if (TRACE_CRU) logerror("Set dsr_page=%d\n", m_dsr_page);
 			break;
 		case 9:
 			m_card_enabled = data;
-			if (TRACE_CRU) logerror("%s: Set card_enabled=%x\n", tag(), data);
+			if (TRACE_CRU) logerror("Set card_enabled=%x\n", data);
 			break;
 		case 10:
 			m_write_enabled = data;
-			if (TRACE_CRU) logerror("%s: Set write_enabled=%x\n", tag(), data);
+			if (TRACE_CRU) logerror("Set write_enabled=%x\n", data);
 			break;
 		case 11:
 			m_supercart_enabled = data;
 			// CHECK: Do we have to reset the bank?
-			if (TRACE_CRU) logerror("%s: Set supercart_enabled=%x\n", tag(), data);
+			if (TRACE_CRU) logerror("Set supercart_enabled=%x\n", data);
 			break;
 		case 12:
 			m_led_on = data;
-			if (TRACE_CRU) logerror("%s: Set led_on=%x\n", tag(), data);
+			if (TRACE_CRU) logerror("Set led_on=%x\n", data);
 			break;
 		case 13:
 			break;
 		case 14:
 			m_mbx_enabled = data;
-			if (TRACE_CRU) logerror("%s: Set mbx_enabled=%x\n", tag(), data);
+			if (TRACE_CRU) logerror("Set mbx_enabled=%x\n", data);
 			break;
 		case 15:
 			m_ram_enabled = data;
-			if (TRACE_CRU) logerror("%s: Set ram_enabled=%x\n", tag(), data);
+			if (TRACE_CRU) logerror("Set ram_enabled=%x\n", data);
 			break;
 		}
 	}
@@ -279,7 +280,7 @@ void snug_high_speed_gpl_device::dsrspace_readz(address_space& space, offs_t off
 	if (m_dsr_enabled)
 	{
 		*value = m_dsr_eeprom->read(space, (offset & 0x1fff) | (m_dsr_page<<13), mem_mask);
-		if (TRACE_READ) logerror("%s: read dsr %04x[%02x] -> %02x\n", tag(), offset, m_dsr_page, *value);
+		if (TRACE_READ) logerror("read dsr %04x[%02x] -> %02x\n", offset, m_dsr_page, *value);
 	}
 }
 
@@ -290,14 +291,14 @@ void snug_high_speed_gpl_device::cartspace_readz(address_space& space, offs_t of
 {
 	if (!m_card_enabled || m_flash_mode)
 	{
-		if (TRACE_IGNORE) logerror("%s: cartridge space read ignored (enable=%d, flash_mode=%d)\n", tag(), m_card_enabled, m_flash_mode);
+		if (TRACE_IGNORE) logerror("cartridge space read ignored (enable=%d, flash_mode=%d)\n", m_card_enabled, m_flash_mode);
 		return;
 	}
 
 	if (m_module_bank < 16)
 	{
 		*value = m_rom6_eeprom->read(space, (offset & 0x1fff) | (m_current_bank<<13) | (m_current_grom_port<<15), mem_mask);
-		if (TRACE_READ) logerror("%s: cartridge space read %04x -> %02x\n", tag(), offset, *value);
+		if (TRACE_READ) logerror("cartridge space read %04x -> %02x\n", offset, *value);
 	}
 	else
 	{
@@ -307,7 +308,7 @@ void snug_high_speed_gpl_device::cartspace_readz(address_space& space, offs_t of
 		}
 		else
 		{
-			logerror("%s: unknown 0x6000 port\n", tag());
+			logerror("unknown 0x6000 port\n");
 		}
 	}
 }
@@ -356,7 +357,7 @@ void snug_high_speed_gpl_device::grom_readz(address_space& space, offs_t offset,
 			{
 				*value = m_gram_memory[m_grom_address | (port<<16)];
 				m_module_bank = port + 16;
-				if (TRACE_PORT) if (bNew) logerror("%s: GRAM read access at %04x (GRMENA=1) - switch to bank %d\n", tag(), offset & 0xffff, m_module_bank);
+				if (TRACE_PORT) if (bNew) logerror("GRAM read access at %04x (GRMENA=1) - switch to bank %d\n", offset & 0xffff, m_module_bank);
 			}
 			else
 			{
@@ -366,7 +367,7 @@ void snug_high_speed_gpl_device::grom_readz(address_space& space, offs_t offset,
 					{
 						*value = m_grom_a_eeprom->read(space, m_grom_address | (port<<16), mem_mask);
 						m_module_bank = port;
-						if (TRACE_PORT) if (bNew) logerror("%s: GROM read access at %04x - switch to bank %d\n", tag(), offset & 0xffff, m_module_bank);
+						if (TRACE_PORT) if (bNew) logerror("GROM read access at %04x - switch to bank %d\n", offset & 0xffff, m_module_bank);
 					}
 				}
 				else
@@ -375,7 +376,7 @@ void snug_high_speed_gpl_device::grom_readz(address_space& space, offs_t offset,
 					{
 						*value = m_grom_b_eeprom->read(space, m_grom_address | ((port-8)<<16), mem_mask);
 						m_module_bank = port;
-						if (TRACE_PORT) if (bNew) logerror("%s: GROM read access at %04x - switch to bank %d\n", tag(), offset & 0xffff, m_module_bank);
+						if (TRACE_PORT) if (bNew) logerror("GROM read access at %04x - switch to bank %d\n", offset & 0xffff, m_module_bank);
 					}
 					else
 					{
@@ -385,7 +386,7 @@ void snug_high_speed_gpl_device::grom_readz(address_space& space, offs_t offset,
 							// DSR banks 0-63 (8 KiB per bank, 8 banks per port)
 							*value = m_dsr_eeprom->read(space, m_grom_address | ((port-16)<<16), mem_mask);
 							// Don't change the module port
-							if (TRACE_DSR) if (bNew) logerror("%s: read access to DSR bank %d-%d (%04x)\n", tag(), (port-16)<<3, ((port-16)<<3)+7, offset);
+							if (TRACE_DSR) if (bNew) logerror("read access to DSR bank %d-%d (%04x)\n", (port-16)<<3, ((port-16)<<3)+7, offset);
 						}
 						else
 						{
@@ -395,7 +396,7 @@ void snug_high_speed_gpl_device::grom_readz(address_space& space, offs_t offset,
 								// Each ROM6 is available as 4 (sub)banks (switchable via 6000, 6002, 6004, 6006)
 								// Accordingly, each port has two complete sets
 								*value = m_rom6_eeprom->read(space, m_grom_address | ((port-24)<<16), mem_mask);
-								if (TRACE_PORT) if (bNew) logerror("%s: ROM6 read access for module bank %d-%d (%04x)\n", tag(), (port-24)<<1, ((port-24)<<1)+1, offset & 0xffff);
+								if (TRACE_PORT) if (bNew) logerror("ROM6 read access for module bank %d-%d (%04x)\n", (port-24)<<1, ((port-24)<<1)+1, offset & 0xffff);
 							}
 							else
 							{
@@ -404,7 +405,7 @@ void snug_high_speed_gpl_device::grom_readz(address_space& space, offs_t offset,
 								{
 									*value = m_gram_memory[m_grom_address | ((port-32)<<16)];
 									m_module_bank = port - 16;
-									if (TRACE_PORT) if (bNew) logerror("%s: GRAM read access at %04x  - switch to bank %d\n", tag(), offset & 0xffff, m_module_bank);
+									if (TRACE_PORT) if (bNew) logerror("GRAM read access at %04x  - switch to bank %d\n", offset & 0xffff, m_module_bank);
 								}
 								else
 								{
@@ -412,11 +413,11 @@ void snug_high_speed_gpl_device::grom_readz(address_space& space, offs_t offset,
 									{
 //                                      *value = m_ram6_memory[m_grom_address];
 										*value = m_ram6_memory[m_grom_address | ((port-48)<<16)];
-										if (TRACE_PORT) if (bNew) logerror("%s: RAM read access at %04x\n", tag(), offset & 0xffff);
+										if (TRACE_PORT) if (bNew) logerror("RAM read access at %04x\n", offset & 0xffff);
 									}
 									else
 									{
-										logerror("%s: Attempt to read from undefined port 0x%0x; ignored.\n", tag(), port);
+										logerror("Attempt to read from undefined port 0x%0x; ignored.\n", port);
 									}
 								}
 							}
@@ -427,6 +428,7 @@ void snug_high_speed_gpl_device::grom_readz(address_space& space, offs_t offset,
 		}
 		// The address auto-increment should be done even when the card is
 		// offline
+		if (TRACE_ADDRESS) logerror("HSGPL GROM address %04x\n", m_grom_address);
 		m_grom_address++;
 		m_raddr_LSB = m_waddr_LSB = false;
 	}
@@ -439,19 +441,19 @@ void snug_high_speed_gpl_device::cartspace_write(address_space& space, offs_t of
 {
 	if (!m_card_enabled || m_flash_mode)
 	{
-		if (TRACE_IGNORE) logerror("%s: write ignored: card_enabled=%d, flash_mode=%d\n", tag(), m_card_enabled, m_flash_mode);
+		if (TRACE_IGNORE) logerror("write ignored: card_enabled=%d, flash_mode=%d\n", m_card_enabled, m_flash_mode);
 		return;
 	}
 
-	if (TRACE_WRITE) logerror("%s: cartridge space write %04x <- %02x\n", tag(), offset, data);
+	if (TRACE_WRITE) logerror("cartridge space write %04x <- %02x\n", offset, data);
 
 	if (!m_bank_inhibit && (m_module_bank < 16))
 	{
 		if ((offset & 1) == 0)
 		{
-			if ((offset & 0x9ff0)!=0) logerror("%s: unplausible ROM6 write: %04x <- %02x\n", tag(), offset, data);
+			if ((offset & 0x9ff0)!=0) logerror("unplausible ROM6 write: %04x <- %02x\n", offset, data);
 			m_current_bank = (offset>>1) & 3;
-			if (TRACE_BANKING) logerror("%s: select bank %d\n", tag(), m_current_bank);
+			if (TRACE_BANKING) logerror("select bank %d\n", m_current_bank);
 		}
 		return;     /* right??? */
 	}
@@ -459,7 +461,7 @@ void snug_high_speed_gpl_device::cartspace_write(address_space& space, offs_t of
 	if ((m_mbx_enabled) && (offset==0x6ffe))
 	{   /* MBX: mapper at 0x6ffe */
 		m_current_bank = data & 0x03;
-		if (TRACE_BANKING) logerror("%s: select bank MBX %d\n", tag(), m_current_bank);
+		if (TRACE_BANKING) logerror("select bank MBX %d\n", m_current_bank);
 		return;
 	}
 
@@ -477,7 +479,7 @@ void snug_high_speed_gpl_device::cartspace_write(address_space& space, offs_t of
 			// and !ram_enabled
 			if (m_module_bank < 16)
 			{
-				logerror("%s: invalid write %04x <- %02x\n", tag(), offset, data);
+				logerror("invalid write %04x <- %02x\n", offset, data);
 			// feeprom is normally written to using GPL ports, and I don't know
 			// whether writing through >6000 page is enabled
 /*
@@ -493,7 +495,7 @@ void snug_high_speed_gpl_device::cartspace_write(address_space& space, offs_t of
 				}
 				else
 				{
-					logerror("%s: unknown 0x6000 port\n", tag());
+					logerror("unknown 0x6000 port\n");
 				}
 			}
 		}
@@ -543,7 +545,7 @@ void snug_high_speed_gpl_device::grom_write(address_space& space, offs_t offset,
 				{
 					m_gram_memory[m_grom_address | (port<<16)] = data;
 					m_module_bank = port + 16;
-					if (TRACE_PORT) if (bNew) logerror("%s: GRAM write access at %04x (GRMENA=1) - switch to bank %d\n", tag(), offset & 0xffff, port);
+					if (TRACE_PORT) if (bNew) logerror("GRAM write access at %04x (GRMENA=1) - switch to bank %d\n", offset & 0xffff, port);
 				}
 				else
 				{
@@ -551,7 +553,7 @@ void snug_high_speed_gpl_device::grom_write(address_space& space, offs_t offset,
 					{
 						m_grom_a_eeprom->write(space, m_grom_address | (port<<16), data, mem_mask);
 						m_module_bank = port;
-						if (TRACE_PORT) if (bNew) logerror("%s: GROM write access at %04x - switch to bank %d\n", tag(), offset & 0xffff, port);
+						if (TRACE_PORT) if (bNew) logerror("GROM write access at %04x - switch to bank %d\n", offset & 0xffff, port);
 					}
 					else
 					{
@@ -559,21 +561,21 @@ void snug_high_speed_gpl_device::grom_write(address_space& space, offs_t offset,
 						{
 							m_grom_b_eeprom->write(space, m_grom_address | ((port-8)<<16), data, mem_mask);
 							m_module_bank = port;
-							if (TRACE_PORT) if (bNew) logerror("%s: GROM write access at %04x - switch to bank %d\n", tag(), offset & 0xffff, port);
+							if (TRACE_PORT) if (bNew) logerror("GROM write access at %04x - switch to bank %d\n", offset & 0xffff, port);
 						}
 						else
 						{
 							if (port < 24)
 							{
 								m_dsr_eeprom->write(space, m_grom_address | ((port-16)<<16), data, mem_mask);
-								if (TRACE_DSR) if (bNew) logerror("%s: write access to DSR bank %d-%d (%04x)\n", tag(), (port-16)<<3, ((port-16)<<3)+7, offset);
+								if (TRACE_DSR) if (bNew) logerror("write access to DSR bank %d-%d (%04x)\n", (port-16)<<3, ((port-16)<<3)+7, offset);
 							}
 							else
 							{
 								if (port < 32)
 								{
 									m_rom6_eeprom->write(space, m_grom_address | ((port-24)<<16), data, mem_mask);
-									if (TRACE_PORT) if (bNew) logerror("%s: ROM6 write access for module bank %d-%d (%04x)\n", tag(), (port-24)<<1, ((port-24)<<1)+1,offset & 0xffff);
+									if (TRACE_PORT) if (bNew) logerror("ROM6 write access for module bank %d-%d (%04x)\n", (port-24)<<1, ((port-24)<<1)+1,offset & 0xffff);
 								}
 								else
 								{
@@ -581,7 +583,7 @@ void snug_high_speed_gpl_device::grom_write(address_space& space, offs_t offset,
 									{
 										m_gram_memory[m_grom_address | ((port-32)<<16)] = data;
 										m_module_bank = port - 16;
-										if (TRACE_PORT) if (bNew) logerror("%s: GRAM write access at %04x - switch to bank %d\n", tag(), offset & 0xffff, m_module_bank);
+										if (TRACE_PORT) if (bNew) logerror("GRAM write access at %04x - switch to bank %d\n", offset & 0xffff, m_module_bank);
 									}
 									else
 									{
@@ -589,11 +591,11 @@ void snug_high_speed_gpl_device::grom_write(address_space& space, offs_t offset,
 										{
 //                                          m_ram6_memory[m_grom_address] = data;
 											m_ram6_memory[m_grom_address | ((port-48)<<16)] = data;
-											if (TRACE_PORT) if (bNew) logerror("%s: RAM write access at %04x\n", tag(), offset & 0xffff);
+											if (TRACE_PORT) if (bNew) logerror("RAM write access at %04x\n", offset & 0xffff);
 										}
 										else
 										{
-											logerror("%s: Attempt to write to undefined port; ignored.\n", tag());
+											logerror("Attempt to write to undefined port; ignored.\n");
 										}
 									}
 								}
@@ -619,7 +621,7 @@ void snug_high_speed_gpl_device::device_start()
 
 void snug_high_speed_gpl_device::device_reset()
 {
-	logerror("%s: reset\n", tag());
+	logerror("reset\n");
 	m_dsr_enabled = false;
 	m_gram_enabled = false;
 	m_bank_inhibit = false;
diff --git a/src/devices/bus/ti99_peb/peribox.cpp b/src/devices/bus/ti99_peb/peribox.cpp
index 52274505533..a38e44ac2bb 100644
--- a/src/devices/bus/ti99_peb/peribox.cpp
+++ b/src/devices/bus/ti99_peb/peribox.cpp
@@ -220,7 +220,9 @@ peribox_device::peribox_device(const machine_config &mconfig, const char *tag, d
 : bus8z_device(mconfig, PERIBOX, "Peripheral expansion box", tag, owner, clock, "peribox", __FILE__),
 	m_console_inta(*this),
 	m_console_intb(*this),
-	m_datamux_ready(*this), m_inta_flag(0), m_intb_flag(0), m_ready_flag(0)
+	m_sgcpu_lcp(*this),
+	m_datamux_ready(*this),
+	m_inta_flag(0), m_intb_flag(0), m_lcp_flag(0), m_ready_flag(0)
 {
 	for (int i=2; i <= 8; i++) m_slot[i] = nullptr;
 	// The address prefix is actually created by the "Flex cable interface"
@@ -235,6 +237,7 @@ peribox_device::peribox_device(const machine_config &mconfig, device_type type,
 : bus8z_device(mconfig, type, name, tag, owner, clock, shortname, source),
 	m_console_inta(*this),
 	m_console_intb(*this),
+	m_sgcpu_lcp(*this),
 	m_datamux_ready(*this), m_inta_flag(0), m_intb_flag(0), m_ready_flag(0), m_address_prefix(0), m_msast(false), m_memen(false)
 {
 	for (int i=2; i <= 8; i++) m_slot[i] = nullptr;
@@ -378,6 +381,17 @@ void peribox_device::intb_join(int slot, int state)
 	m_console_intb((m_intb_flag != 0)? ASSERT_LINE : CLEAR_LINE);
 }
 
+void peribox_device::lcp_join(int slot, int state)
+{
+	if (TRACE_INT) logerror("%s: propagating LCP from slot %d to SGCPU: %d\n", tag(), slot, state);
+	if (state==ASSERT_LINE)
+		m_lcp_flag |= (1 << slot);
+	else
+		m_lcp_flag &= ~(1 << slot);
+
+	m_sgcpu_lcp((m_lcp_flag != 0)? ASSERT_LINE : CLEAR_LINE);
+}
+
 /*
     When any device pulls down READY, READY goes down.
 */
@@ -405,6 +419,7 @@ void peribox_device::device_start(void)
 	// Resolve the callback lines to the console
 	m_console_inta.resolve();
 	m_console_intb.resolve();
+	m_sgcpu_lcp.resolve();
 	m_datamux_ready.resolve();
 
 	if (TRACE_EMU)
@@ -421,6 +436,7 @@ void peribox_device::device_config_complete()
 {
 	m_inta_flag = 0;
 	m_intb_flag = 0;
+	m_lcp_flag = 0;
 	m_ready_flag = 0;
 }
 
@@ -721,6 +737,12 @@ WRITE_LINE_MEMBER( peribox_slot_device::set_intb )
 	peb->intb_join(m_slotnumber, state);
 }
 
+WRITE_LINE_MEMBER( peribox_slot_device::lcp_line )
+{
+	peribox_device *peb = static_cast<peribox_device*>(owner());
+	peb->lcp_join(m_slotnumber, state);
+}
+
 WRITE_LINE_MEMBER( peribox_slot_device::set_ready )
 {
 	peribox_device *peb = static_cast<peribox_device*>(owner());
diff --git a/src/devices/bus/ti99_peb/peribox.h b/src/devices/bus/ti99_peb/peribox.h
index fa390cc2b88..47095f7d9ce 100644
--- a/src/devices/bus/ti99_peb/peribox.h
+++ b/src/devices/bus/ti99_peb/peribox.h
@@ -42,6 +42,7 @@ public:
 	template<class _Object> static devcb_base &static_set_inta_callback(device_t &device, _Object object)  {  return downcast<peribox_device &>(device).m_console_inta.set_callback(object); }
 	template<class _Object> static devcb_base &static_set_intb_callback(device_t &device, _Object object)  {  return downcast<peribox_device &>(device).m_console_intb.set_callback(object); }
 	template<class _Object> static devcb_base &static_set_ready_callback(device_t &device, _Object object)     {  return downcast<peribox_device &>(device).m_datamux_ready.set_callback(object); }
+	template<class _Object> static devcb_base &static_set_lcp_callback(device_t &device, _Object object)     {  return downcast<peribox_device &>(device).m_sgcpu_lcp.set_callback(object); }
 
 	// Next eight methods are called from the console
 	DECLARE_READ8Z_MEMBER(readz) override;
@@ -74,6 +75,7 @@ protected:
 	// Next three methods call back the console
 	devcb_write_line m_console_inta;   // INTA line (Box to console)
 	devcb_write_line m_console_intb;   // INTB line
+	devcb_write_line m_sgcpu_lcp;       // For EVPC with SGCPU only
 	devcb_write_line m_datamux_ready;  // READY line (to the datamux)
 
 	void set_slot_loaded(int slot, peribox_slot_device* slotdev);
@@ -83,10 +85,12 @@ protected:
 	// if any one slot asserts the line, the joint line is asserted.
 	void inta_join(int slot, int state);
 	void intb_join(int slot, int state);
+	void lcp_join(int slot, int state);
 	void ready_join(int slot, int state);
 
 	int m_inta_flag;
 	int m_intb_flag;
+	int m_lcp_flag;
 	int m_ready_flag;
 
 	// The TI-99/4(A) Flex Cable Interface (slot 1) pulls up the AMA/AMB/AMC lines to 1/1/1.
@@ -173,6 +177,7 @@ public:
 	// Called from the card (direction to box)
 	DECLARE_WRITE_LINE_MEMBER( set_inta );
 	DECLARE_WRITE_LINE_MEMBER( set_intb );
+	DECLARE_WRITE_LINE_MEMBER( lcp_line );
 	DECLARE_WRITE_LINE_MEMBER( set_ready );
 
 	DECLARE_READ8Z_MEMBER(crureadz);
@@ -257,4 +262,7 @@ protected:
 #define MCFG_PERIBOX_READY_HANDLER( _ready ) \
 	devcb = &peribox_device::static_set_ready_callback( *device, DEVCB_##_ready );
 
+#define MCFG_PERIBOX_LCP_HANDLER( _lcp ) \
+	devcb = &peribox_device::static_set_lcp_callback( *device, DEVCB_##_lcp );
+
 #endif /* __PBOX__ */
diff --git a/src/devices/bus/ti99_peb/samsmem.cpp b/src/devices/bus/ti99_peb/samsmem.cpp
index 0ff3e27d928..51d912ce1b0 100644
--- a/src/devices/bus/ti99_peb/samsmem.cpp
+++ b/src/devices/bus/ti99_peb/samsmem.cpp
@@ -11,22 +11,26 @@
     addresses at 4000, 4002, ..., 401e, which correspond to memory locations
     0000-0fff, 1000-1fff, ..., f000-ffff.
 
-    Michael Zapf
+    According to a software distribution disk from the South West 99ers group,
+    the predecessor of this card was the Asgard Expanded Memory System (AEMS).
+    Although some documentation and software was available for it, it was never
+    built. Instead, a simpler memory card called the Asgard Memory System (AMS)
+    was built. The South West 99ers group built a better version of this card
+    called the Super AMS. Any documentation and software containing a reference
+    to the AEMS are applicable to either AMS or SAMS.
 
-    February 2012: Rewritten as class
+    Michael Zapf
 
 *****************************************************************************/
 
 #include "samsmem.h"
-#define RAMREGION "ram"
 
 #define SAMS_CRU_BASE 0x1e00
 
-#define VERBOSE 1
-#define LOG logerror
-
 sams_memory_expansion_device::sams_memory_expansion_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-: ti_expansion_card_device(mconfig, TI99_SAMSMEM, "SuperAMS memory expansion card", tag, owner, clock, "ti99_sams", __FILE__), m_ram(nullptr), m_map_mode(false), m_access_mapper(false)
+: ti_expansion_card_device(mconfig, TI99_SAMSMEM, "SuperAMS memory expansion card", tag, owner, clock, "ti99_sams", __FILE__),
+	m_ram(*this, RAM_TAG),
+	m_map_mode(false), m_access_mapper(false)
 {
 }
 
@@ -49,12 +53,12 @@ READ8Z_MEMBER(sams_memory_expansion_device::readz)
 		if (!m_map_mode)
 		{
 			// transparent mode
-			*value = m_ram[offset & 0xffff];
+			*value = m_ram->pointer()[offset & 0xffff];
 		}
 		else
 		{
 			base = (m_mapper[(offset & 0xf000)>>12] << 12);
-			*value = m_ram[base | (offset & 0x0fff)];
+			*value = m_ram->pointer()[base | (offset & 0x0fff)];
 		}
 	}
 }
@@ -73,12 +77,12 @@ WRITE8_MEMBER(sams_memory_expansion_device::write)
 		if (!m_map_mode)
 		{
 			// transparent mode
-			m_ram[offset & 0xffff] = data;
+			m_ram->pointer()[offset & 0xffff] = data;
 		}
 		else
 		{
 			base = (m_mapper[(offset & 0xf000)>>12] << 12);
-			m_ram[base | (offset & 0x0fff)] = data;
+			m_ram->pointer()[base | (offset & 0x0fff)] = data;
 		}
 	}
 }
@@ -97,37 +101,31 @@ WRITE8_MEMBER(sams_memory_expansion_device::cruwrite)
 {
 	if ((offset & 0xff00)==SAMS_CRU_BASE)
 	{
-		if (VERBOSE>7) LOG("cru address %04x = %02x\n", offset&0xffff, data);
-
 		if ((offset & 0x000e)==0) m_access_mapper = (data!=0);
 		if ((offset & 0x000e)==2) m_map_mode = (data!=0);
 	}
 }
 
+MACHINE_CONFIG_FRAGMENT( sams_mem )
+	MCFG_RAM_ADD(RAM_TAG)
+	MCFG_RAM_DEFAULT_SIZE("1M")
+MACHINE_CONFIG_END
 
-ROM_START( sams_card )
-	ROM_REGION(0x100000, RAMREGION, 0)
-	ROM_FILL(0x0000, 0x100000, 0x00)
-ROM_END
+machine_config_constructor sams_memory_expansion_device::device_mconfig_additions() const
+{
+	return MACHINE_CONFIG_NAME( sams_mem );
+}
 
 void sams_memory_expansion_device::device_start()
 {
-	if (VERBOSE>5) LOG("SuperAMS: start\n");
-	m_ram = memregion(RAMREGION)->base();
 }
 
 void sams_memory_expansion_device::device_reset()
 {
-	if (VERBOSE>5) LOG("SuperAMS: reset\n");
 	// Resetting values
 	m_map_mode = false;
 	m_access_mapper = false;
 	for (auto & elem : m_mapper) elem = 0;
 }
 
-const rom_entry *sams_memory_expansion_device::device_rom_region() const
-{
-	return ROM_NAME( sams_card );
-}
-
 const device_type TI99_SAMSMEM = &device_creator<sams_memory_expansion_device>;
diff --git a/src/devices/bus/ti99_peb/samsmem.h b/src/devices/bus/ti99_peb/samsmem.h
index d5e1cb9b062..10c69c1d655 100644
--- a/src/devices/bus/ti99_peb/samsmem.h
+++ b/src/devices/bus/ti99_peb/samsmem.h
@@ -17,6 +17,7 @@
 
 #include "emu.h"
 #include "peribox.h"
+#include "machine/ram.h"
 
 extern const device_type TI99_SAMSMEM;
 
@@ -30,13 +31,15 @@ public:
 	DECLARE_READ8Z_MEMBER(crureadz) override;
 	DECLARE_WRITE8_MEMBER(cruwrite) override;
 
+	machine_config_constructor device_mconfig_additions() const override;
+
 protected:
-	virtual void device_start(void) override;
-	virtual void device_reset(void) override;
-	virtual const rom_entry *device_rom_region(void) const override;
+	void device_start(void) override;
+	void device_reset(void) override;
 
 private:
-	UINT8*  m_ram;
+	// Console RAM
+	required_device<ram_device> m_ram;
 	int     m_mapper[16];
 	bool    m_map_mode;
 	bool    m_access_mapper;
diff --git a/src/devices/bus/ti99x/datamux.cpp b/src/devices/bus/ti99x/datamux.cpp
index 034ecfe114d..6cb44af8f53 100644
--- a/src/devices/bus/ti99x/datamux.cpp
+++ b/src/devices/bus/ti99x/datamux.cpp
@@ -124,7 +124,18 @@ void ti99_datamux_device::read_all(address_space& space, UINT16 addr, UINT8 *val
 		// Video
 		if ((addr & 0xf801)==0x8800)
 		{
-			m_video->readz(space, addr, value);
+			// Forward to VDP unless we have an EVPC
+			if (m_video != nullptr)
+			{
+				if ((addr & 2) != 0)
+				{       // read VDP status
+					*value = m_video->register_read(space, 0);
+				}
+				else
+				{       // read VDP RAM
+					*value = m_video->vram_read(space, 0);
+				}
+			}
 		}
 	}
 
@@ -152,12 +163,28 @@ void ti99_datamux_device::write_all(address_space& space, UINT16 addr, UINT8 val
 
 	// Cartridge port and sound
 	if ((addr & 0xe000)==0x6000) m_gromport->write(space, addr, value);
-	if ((addr & 0xfc01)==0x8400) m_sound->write(space, 0, value);
+
+	// Only if the sound chip has not been removed
+	if ((addr & 0xfc01)==0x8400)
+	{
+		if (m_sound != nullptr) m_sound->write(space, 0, value);
+	}
 
 	// Video
 	if ((addr & 0xf801)==0x8800)
 	{
-		m_video->write(space, addr, value);
+		// Forward to VDP unless we have an EVPC
+		if (m_video != nullptr)
+		{
+			if ((addr & 2) != 0)
+			{   // write VDP address/register
+				m_video->register_write(space, 0, value);
+			}
+			else
+			{   // write VDP data
+				m_video->vram_write(space, 0, value);
+			}
+		}
 	}
 
 	// PEB gets all accesses
@@ -560,7 +587,7 @@ void ti99_datamux_device::device_reset(void)
 
 void ti99_datamux_device::device_config_complete()
 {
-	m_video = downcast<bus8z_device*>(owner()->subdevice(VIDEO_SYSTEM_TAG));
+	m_video = downcast<tms9928a_device*>(owner()->subdevice(VDP_TAG));
 	m_sound = downcast<sn76496_base_device*>(owner()->subdevice(TISOUNDCHIP_TAG));
 	m_gromport = downcast<gromport_device*>(owner()->subdevice(GROMPORT_TAG));
 	m_peb = downcast<peribox_device*>(owner()->subdevice(PERIBOX_TAG));
diff --git a/src/devices/bus/ti99x/datamux.h b/src/devices/bus/ti99x/datamux.h
index 5b59ea7d134..27908d403c6 100644
--- a/src/devices/bus/ti99x/datamux.h
+++ b/src/devices/bus/ti99x/datamux.h
@@ -20,7 +20,6 @@
 #include "bus/ti99_peb/peribox.h"
 #include "sound/sn76496.h"
 #include "video/tms9928a.h"
-#include "bus/ti99x/videowrp.h"
 
 extern const device_type DATAMUX;
 
@@ -56,7 +55,7 @@ protected:
 
 private:
 	// Link to the video processor
-	bus8z_device* m_video;
+	tms9928a_device* m_video;
 
 	// Link to the sound processor
 	sn76496_base_device* m_sound;
diff --git a/src/devices/bus/ti99x/ti99defs.h b/src/devices/bus/ti99x/ti99defs.h
index 8d137e6599f..c8fd6eac587 100644
--- a/src/devices/bus/ti99x/ti99defs.h
+++ b/src/devices/bus/ti99x/ti99defs.h
@@ -18,7 +18,6 @@
 #define TMS9901_TAG     "tms9901"
 #define TIBOARD_TAG     "ti_board"
 #define DATAMUX_TAG     "datamux_16_8"
-#define VIDEO_SYSTEM_TAG "video"
 #define SCREEN_TAG      "screen"
 #define TISOUNDCHIP_TAG "soundchip"
 #define TISOUND_TAG     "tisound"
@@ -31,6 +30,8 @@
 #define HANDSET_TAG     "handset"
 #define JOYPORT_TAG     "joyport"
 #define VDP_TAG         "vdp"
+#define EVPC_CONN_TAG   "evpc_conn"
+
 #define DSRROM          "dsrrom"
 #define CONSOLEROM      "consolerom"
 
@@ -137,6 +138,42 @@ public:
 	virtual DECLARE_SETADDRESS_DBIN_MEMBER( setaddress_dbin ) { };
 };
 
+/****************************************************************************
+    Connector from EVPC
+    We need this for the TI-99/4A console as well as for the SGCPU, so we have
+    to use callbacks
+****************************************************************************/
+class ti99_4x_state;
+
+class evpc_clock_connector;
+
+const device_type EVPC_CONN = &device_creator<evpc_clock_connector>;
+
+class evpc_clock_connector : public device_t
+{
+public:
+	evpc_clock_connector(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+	: device_t(mconfig, EVPC_CONN, "EVPC clock connector", tag, owner, clock, "ti99_evpc_clock", __FILE__),
+		m_vdpint(*this) { };
+
+	template<class _Object> static devcb_base &static_set_vdpint_callback(device_t &device, _Object object)
+	{
+		return downcast<evpc_clock_connector &>(device).m_vdpint.set_callback(object);
+	}
+
+	WRITE_LINE_MEMBER( vclock_line ) { m_vdpint(state); }
+	void device_start() override { m_vdpint.resolve();  }
+
+private:
+	// VDPINT line to the CPU
+	devcb_write_line m_vdpint;
+};
+
+
+#define MCFG_ADD_EVPC_CONNECTOR( _tag, _vdpint ) \
+	MCFG_DEVICE_ADD(_tag, EVPC_CONN, 0) \
+	devcb = &evpc_clock_connector::static_set_vdpint_callback( *device, DEVCB_##_vdpint );
+
 /****************************************************************************
     Constants
 ****************************************************************************/
diff --git a/src/devices/bus/ti99x/videowrp.cpp b/src/devices/bus/ti99x/videowrp.cpp
deleted file mode 100644
index 4aa1935f226..00000000000
--- a/src/devices/bus/ti99x/videowrp.cpp
+++ /dev/null
@@ -1,121 +0,0 @@
-// license:LGPL-2.1+
-// copyright-holders:Michael Zapf
-/****************************************************************************
-
-    TI-99/4A Video subsystem
-    This device actually wraps the naked video chip implementation
-
-    EVPC (Enhanced Video Processor Card) from SNUG
-    based on v9938 (may also be equipped with v9958)
-    Can be used with TI-99/4A as an add-on card; internal VDP must be removed
-
-    The SGCPU ("TI-99/4P") only runs with EVPC
-
-    Michael Zapf
-
-*****************************************************************************/
-
-#include "emu.h"
-#include "videowrp.h"
-
-/*
-    Constructors
-*/
-ti_video_device::ti_video_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
-: bus8z_device(mconfig, type, name, tag, owner, clock, shortname, source),
-m_tms9928a(nullptr)
-{
-}
-
-ti_std_video_device::ti_std_video_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: ti_video_device(mconfig, TI99VIDEO, "TI99 STD Video subsystem", tag, owner, clock, "ti99_video", __FILE__)
-{
-}
-
-ti_exp_video_device::ti_exp_video_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: ti_video_device(mconfig, V9938VIDEO, "TI99 EXP Video subsystem", tag, owner, clock, "v9938_video", __FILE__),
-		m_v9938(nullptr)
-{
-}
-
-/*****************************************************************************/
-/*
-    Accessing TMS9928A (TI-99/4A)
-*/
-READ8Z_MEMBER( ti_std_video_device::readz )
-{
-	if (space.debugger_access()) return;
-
-	if (offset & 2)
-	{       /* read VDP status */
-		*value = m_tms9928a->register_read(space, 0);
-	}
-	else
-	{       /* read VDP RAM */
-		*value = m_tms9928a->vram_read(space, 0);
-	}
-}
-
-WRITE8_MEMBER( ti_std_video_device::write )
-{
-	if (space.debugger_access()) return;
-
-	if (offset & 2)
-	{   /* write VDP address */
-		m_tms9928a->register_write(space, 0, data);
-	}
-	else
-	{   /* write VDP data */
-		m_tms9928a->vram_write(space, 0, data);
-	}
-}
-
-/*****************************************************************************/
-
-/*
-    Accessing v9938 via 16 bit bus (SGCPU)
-*/
-READ16_MEMBER( ti_exp_video_device::read16 )
-{
-	if (space.debugger_access()) return 0;
-	return (int)(m_v9938->read(space, offset)<<8);
-}
-
-WRITE16_MEMBER( ti_exp_video_device::write16 )
-{
-	if (space.debugger_access()) return;
-	m_v9938->write(space, offset, (data>>8)&0xff);
-}
-
-
-/******************************************************************************/
-
-/*
-    Accessing v9938 via 8 bit bus (EVPC)
-*/
-READ8Z_MEMBER( ti_exp_video_device::readz )
-{
-	if (space.debugger_access()) return;
-	*value = m_v9938->read(space, offset>>1);
-}
-
-WRITE8_MEMBER( ti_exp_video_device::write )
-{
-	if (space.debugger_access()) return;
-	m_v9938->write(space, offset>>1, data);
-}
-
-void ti_video_device::device_start(void)
-{
-	m_tms9928a = static_cast<tms9928a_device*>(machine().device(VDP_TAG));
-}
-
-void ti_exp_video_device::device_start(void)
-{
-	m_v9938 = static_cast<v9938_device*>(machine().device(VDP_TAG));
-}
-
-/**************************************************************************/
-
-const device_type TI99VIDEO = &device_creator<ti_std_video_device>;
-const device_type V9938VIDEO = &device_creator<ti_exp_video_device>;
diff --git a/src/devices/bus/ti99x/videowrp.h b/src/devices/bus/ti99x/videowrp.h
deleted file mode 100644
index 787f0e2d44f..00000000000
--- a/src/devices/bus/ti99x/videowrp.h
+++ /dev/null
@@ -1,93 +0,0 @@
-// license:LGPL-2.1+
-// copyright-holders:Michael Zapf
-/****************************************************************************
-
-    TI-99/4A / EVPC Video subsystem
-    See videowrp.c for documentation
-
-    Michael Zapf
-    October 2010
-    January 2012: Rewritten as class
-
-*****************************************************************************/
-
-#ifndef __TIVIDEO__
-#define __TIVIDEO__
-
-#include "video/tms9928a.h"
-#include "video/v9938.h"
-#include "ti99defs.h"
-
-class ti_video_device : public bus8z_device
-{
-public:
-	virtual void    reset_vdp(int state) =0;
-
-protected:
-	tms9928a_device *m_tms9928a;
-
-	/* Constructor */
-	ti_video_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
-	virtual void device_start(void) override;
-	virtual void device_reset(void) override { };
-	virtual DECLARE_READ8Z_MEMBER(readz) override { };
-	virtual DECLARE_WRITE8_MEMBER(write) override { };
-};
-
-/*
-    Used in the TI-99/4A and TI-99/8
-*/
-class ti_std_video_device : public ti_video_device
-{
-public:
-	ti_std_video_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-	DECLARE_READ8Z_MEMBER(readz) override;
-	DECLARE_WRITE8_MEMBER(write) override;
-	void    reset_vdp(int state) override { m_tms9928a->reset_line(state); }
-};
-
-/*
-    Used in the EVPC
-*/
-class ti_exp_video_device : public ti_video_device
-{
-public:
-	ti_exp_video_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-	DECLARE_READ8Z_MEMBER(readz) override;
-	DECLARE_WRITE8_MEMBER(write) override;
-	DECLARE_READ16_MEMBER(read16);
-	DECLARE_WRITE16_MEMBER(write16);
-	void    reset_vdp(int state) override { m_v9938->reset_line(state); }
-
-protected:
-	virtual void device_start(void) override;
-
-private:
-	v9938_device        *m_v9938;
-};
-
-extern const device_type TI99VIDEO;
-extern const device_type V9938VIDEO;
-
-
-/****************************************************************************/
-
-#define MCFG_TI_TMS991x_ADD_NTSC(_tag, _chip, _vsize, _class, _int, _gclk)    \
-	MCFG_DEVICE_ADD(_tag, TI99VIDEO, 0)                                     \
-	MCFG_DEVICE_ADD( VDP_TAG, _chip, XTAL_10_738635MHz / 2 )                  \
-	MCFG_TMS9928A_VRAM_SIZE(_vsize) \
-	MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(_class,_int)) \
-	MCFG_TMS9928A_OUT_GROMCLK_CB(WRITELINE(_class,_gclk)) \
-	MCFG_TMS9928A_SCREEN_ADD_NTSC( SCREEN_TAG )                             \
-	MCFG_SCREEN_UPDATE_DEVICE( VDP_TAG, tms9928a_device, screen_update )
-
-#define MCFG_TI_TMS991x_ADD_PAL(_tag, _chip, _vsize, _class, _int, _gclk)     \
-	MCFG_DEVICE_ADD(_tag, TI99VIDEO, 0)                                     \
-	MCFG_DEVICE_ADD( VDP_TAG, _chip, XTAL_10_738635MHz / 2 ) \
-	MCFG_TMS9928A_VRAM_SIZE(_vsize) \
-	MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(_class,_int))   \
-	MCFG_TMS9928A_OUT_GROMCLK_CB(WRITELINE(_class,_gclk)) \
-	MCFG_TMS9928A_SCREEN_ADD_PAL( SCREEN_TAG )                              \
-	MCFG_SCREEN_UPDATE_DEVICE( VDP_TAG, tms9928a_device, screen_update )
-
-#endif /* __TIVIDEO__ */
diff --git a/src/mame/drivers/ti99_4p.cpp b/src/mame/drivers/ti99_4p.cpp
index 4650d391c08..fb239868a8f 100644
--- a/src/mame/drivers/ti99_4p.cpp
+++ b/src/mame/drivers/ti99_4p.cpp
@@ -2,53 +2,126 @@
 // copyright-holders:Michael Zapf
 /****************************************************************************
 
-    SNUG SGCPU (a.k.a. 99/4p) system
+    SNUG Second Generation CPU (SGCPU, aka TI-99/4P)
 
-    This system is a reimplementation of the old ti99/4a console.  It is known
-    both as the 99/4p ("peripheral box", since the system is a card to be
-    inserted in the peripheral box, instead of a self contained console), and
-    as the SGCPU ("Second Generation CPU", which was originally the name used
-    in TI documentation to refer to either (or both) TI99/5 and TI99/8
-    projects).
+    This system is known both as the TI-99/4P ("Peripheral box", since the
+    system is a card to be inserted in the peripheral box, instead of a
+    self-contained console), and as the SGCPU ("Second Generation CPU",
+    which was originally the name used in TI documentation to refer to either
+    (or both) TI-99/5 and TI-99/8 projects).
 
     The SGCPU was designed and built by the SNUG (System 99 Users Group),
     namely by Michael Becker for the hardware part and Harald Glaab for the
     software part.  It has no relationship with TI.
 
-    The card is architectured around a 16-bit bus (vs. an 8-bit bus in every
-    other TI99 system).  It includes 64kb of ROM, including a GPL interpreter,
-    an internal DSR ROM which contains system-specific code, part of the TI
-    extended Basic interpreter, and up to 1Mbyte of RAM.  It still includes a
-    16-bit to 8-bit multiplexer in order to support extension cards designed
-    for TI99/4a, but it can support 16-bit cards, too.  It does not include
-    GROMs, video or sound: instead, it relies on the HSGPL and EVPC cards to
-    do the job.
+    The card is a complete redesign of the original TI-99/4A mainboard to fit
+    on a peripheral card, thus replacing the console. It shows no original
+    circuits on its board; the concept is to cannibalize a TI-99/4A console,
+    moving its main circuits (TMS9900, TMS9901) into the sockets on this board.
 
-    IMPORTANT: The SGCPU card relies on a properly set up HSGPL flash memory
-    card; without, it will immediately lock up. It is impossible to set it up
-    from here (a bootstrap problem; you cannot start without the HSGPL).
-    The best chance is to start a ti99_4ev with a plugged-in HSGPL
-    and go through the setup process there. Copy the nvram files of the hsgpl into this
-    driver's nvram subdirectory. The contents will be directly usable for the SGCPU.
+    The sound chip is not plugged on the SGCPU but on the EVPC card which
+    provides the video processor for SGCPU card (see below).
+
+    The card offers a PC-style keyboard interface which adapts the keyboard
+    to the matrix organisation expected by the operating system of the TI.
+
+    All decoding and further features are implemented by a MACH chip, which
+    appears on many SNUG cards.
+
+    On the card, most circuits are directly accessed by a 16-bit data bus,
+    which ensures a significant speed-up compared to the original console. Only
+    when accessing external devices via the PEB, a databus multiplexer comes into
+    play which is implemented in the same way as the one in the original console,
+    also contained in the MACH.
+
+    The SGCPU offers a special connector at the back, containing the remaining
+    8 data bus lines; by this feature, expansion cards can be connected at
+    full 16 bit width. Only the HRD16 card (not yet emulated), which is a
+    RAMDisk card, actually uses it.
+
+    EPROM layout 64K
+    ----------------
+    The memory region is shifted by 4000 in the EPROM address space
+    According to the designers, this is caused by the next-to most significant
+    address line (2^14) being locked to 1. This is done to allow for smaller
+    24pin EPROM to be used.
+
+       Area        EPROM offset      Mapped at
+       ---------------------------------------
+       ROM0        4000   (0100)     0000
+       DSR         C000   (1100)     4000
+       ROM6A       6000   (0110)     6000
+       ROM6B       E000   (1110)     6000
+
+    System ROM
+    ----------
+    The GPL interpreter is located in the EPROM as ROM0 (see above). The
+    SGCPU does not contain any GROM, which contain the actual TI operating
+    system and the BASIC interpreter. The GROMs are replaced by the HSGPL card.
+
+    ==== CAUTION ====: This means that the HSGPL must be properly set up before
+    starting up the SGCPU. Otherwise, the emulation locks up immediately with a
+    BLACK SCREEN.
+
+    In the real environment, the HSGPL has usually been set up on delivery.
+    In MESS we have to create a suitable HSGPL memory content. Best practice
+    is to start the TI-99/4A console with EVPC support (driver ti99_4ev) with
+    a plugged-in HSGPL and to go through the setup process there.
+    Finally, the nvram files of the HSGPL must be copied into this driver's nvram
+    subdirectory. The contents will be directly usable for the SGCPU.
+
+    RAM: AEMS emulation
+    --------------------
+    The Asgard Expanded Memory System is a peripheral card whose successor
+    (Super AMS) is available in MESS. The AEMS card is emulated inside the MACH
+    chip of the SGCPU. For more information see samsmem.cpp.
+
+    The first four address lines are used to select one of 16 mapper values with
+    8 bits each. Instead of these first 4 lines, the 8 bits are prepended to
+    the remaining address, yielding a 20 bit address space.
+
+    The mapper values are mapped into the address space at 4000 by setting
+    CRU bit 1E00. Only the even addresses are used, so the first mapper byte is
+    at 4000, the second at 4002, the last one at 401E.
+
+    The mapping mode can be turned on and off by the CRU bit at address 1E02.
+    When turned off, the address is passed through to the RAM circuits.
+
+    Since the only RAM areas on the TI systems are at 2000-3FFF and A000-FFFF,
+    the typical usage is to use the AEMS as a 32K expansion in unmapped mode
+    (the remaining 32K of the address space is decoded earlier, and does not
+    affect the card), and to use it as paged memory in the 2000-3FFF and A000-FFFF
+    areas by setting the mapper appropriately. Mapper registers referring to
+    other memory areas have no effect.
+
+    Video and sound
+    ---------------
+    The SGCPU relies on the EVPC or EVPC2 card to provide video capabilities.
+    This card (rel.1) is emulated in MESS and is based on the v9938 video
+    display processor.
+    In order to route the VDP interrupt to the SGCPU card, the previously
+    unused LCP* line in the Peripheral Expansion Box is used.
+
+    The sound chip requires the video clock, and therefore it is moved from the
+    console to the EVPC card.
+
+    Joystick and cassette
+    ---------------------
+    The card features a 25-pin connector at the back which contains the lines
+    for the joysticks and one cassette input/output. An adapter must be built
+    to be able to use the common cables.
 
     Michael Zapf
 
-    February 2012: Rewritten as class
-
 *****************************************************************************/
 
 #include "emu.h"
 #include "cpu/tms9900/tms9900.h"
 #include "sound/wave.h"
-#include "sound/dac.h"
-#include "sound/sn76496.h"
 
 #include "machine/tms9901.h"
 #include "imagedev/cassette.h"
-
-#include "bus/ti99x/videowrp.h"
 #include "bus/ti99x/joyport.h"
-
 #include "bus/ti99_peb/peribox.h"
 
 #define TMS9901_TAG "tms9901"
@@ -57,6 +130,9 @@
 #define TRACE_ILLWRITE 0
 #define TRACE_READY 0
 #define TRACE_INT 0
+#define TRACE_ADDRESS 0
+#define TRACE_MEM 0
+#define TRACE_MUX 0
 
 class ti99_4p_state : public driver_device
 {
@@ -65,28 +141,28 @@ public:
 		: driver_device(mconfig, type, tag),
 		m_cpu(*this, "maincpu"),
 		m_tms9901(*this, TMS9901_TAG),
-		m_sound(*this, TISOUNDCHIP_TAG),
-		m_video(*this, VIDEO_SYSTEM_TAG),
 		m_cassette(*this, "cassette"),
 		m_peribox(*this, PERIBOX_TAG),
 		m_joyport(*this, JOYPORT_TAG)   { }
 
-	DECLARE_WRITE_LINE_MEMBER( console_ready );
-	DECLARE_WRITE_LINE_MEMBER( console_ready_dmux );
-
+	DECLARE_WRITE_LINE_MEMBER( ready_line );
 	DECLARE_WRITE_LINE_MEMBER( extint );
 	DECLARE_WRITE_LINE_MEMBER( notconnected );
 	DECLARE_READ8_MEMBER( interrupt_level );
+
+	DECLARE_SETOFFSET_MEMBER( setoffset );
 	DECLARE_READ16_MEMBER( memread );
 	DECLARE_WRITE16_MEMBER( memwrite );
+	DECLARE_WRITE_LINE_MEMBER( dbin_in );
 
 	DECLARE_READ16_MEMBER( samsmem_read );
 	DECLARE_WRITE16_MEMBER( samsmem_write );
 
 	DECLARE_WRITE8_MEMBER(external_operation);
 	DECLARE_WRITE_LINE_MEMBER( clock_out );
+	DECLARE_WRITE_LINE_MEMBER( dbin_line );
 
-	void    clock_in(int clock);
+	void    datamux_clock_in(int clock);
 
 	// CRU (Communication Register Unit) handling
 	DECLARE_READ8_MEMBER( cruread );
@@ -103,12 +179,10 @@ public:
 	virtual void machine_start() override;
 	DECLARE_MACHINE_RESET(ti99_4p);
 
-	DECLARE_WRITE_LINE_MEMBER(set_tms9901_INT2_from_v9938);
+	DECLARE_WRITE_LINE_MEMBER(video_interrupt_in);
 
 	required_device<tms9900_device>        m_cpu;
 	required_device<tms9901_device>        m_tms9901;
-	required_device<sn76496_base_device>    m_sound;
-	required_device<ti_exp_video_device>    m_video;
 	required_device<cassette_image_device> m_cassette;
 	required_device<peribox_device>        m_peribox;
 	required_device<joyport_device>        m_joyport;
@@ -116,15 +190,6 @@ public:
 	// Pointer to ROM0
 	UINT16  *m_rom0;
 
-	// Pointer to DSR ROM
-	UINT16  *m_dsr;
-
-	// Pointer to ROM6, first bank
-	UINT16  *m_rom6a;
-
-	// Pointer to ROM6, second bank
-	UINT16  *m_rom6b;
-
 	// AMS RAM (1 Mib)
 	std::vector<UINT16> m_ram;
 
@@ -134,12 +199,14 @@ public:
 	// First joystick. 6 for TI-99/4A
 	int     m_firstjoy;
 
-	// READY line
-	int     m_ready_line, m_ready_line_dmux;
-
 private:
-	DECLARE_READ16_MEMBER( datamux_read );
-	DECLARE_WRITE16_MEMBER( datamux_write );
+
+	int decode_address(int address);
+	DECLARE_READ16_MEMBER( debugger_read );
+	DECLARE_WRITE16_MEMBER( debugger_write );
+
+	void ready_join();
+
 	void    set_keyboard_column(int number, int data);
 
 	int     m_keyboard_column;
@@ -163,6 +230,36 @@ private:
 	// TRUE when mapper registers are accessible
 	bool m_access_mapper;
 
+	// Value on address bus (after being set by setaddress)
+	int m_addr_buf;
+
+	// Address decoding result
+	int m_decode;
+
+	// Ready state of the databus multiplexer
+	bool m_muxready;
+
+	// Incoming Ready level
+	line_state m_sysready;
+
+	// Saves a pointer to the address space
+	address_space* m_spacep;
+
+	// Internal DSR mapped in
+	bool m_internal_dsr_active;
+
+	// Mapper visible in 4000 area
+	bool m_mapper_active;
+
+	// ROM6 visible in 6000
+	bool m_rom6_active;
+
+	// Upper bank of ROM6 selected
+	bool m_rom6_upper;
+
+	// State of the DBIN line
+	line_state m_dbin;
+
 	UINT8   m_lowbyte;
 	UINT8   m_highbyte;
 	UINT8   m_latch;
@@ -170,6 +267,9 @@ private:
 	// Mapper registers
 	UINT8 m_mapper[16];
 
+	// Pointer to EPROM
+	UINT16 *m_rom;
+
 	// Latch for 9901 INT2, INT1 lines
 	int     m_9901_int;
 	void    set_9901_int(int line, line_state state);
@@ -178,8 +278,16 @@ private:
 
 };
 
+enum
+{
+	ROM0BASE = 0x4000,
+	DSRBASE = 0xc000,
+	ROM6LBASE = 0x6000,
+	ROM6UBASE = 0xe000
+};
+
 static ADDRESS_MAP_START(memmap, AS_PROGRAM, 16, ti99_4p_state)
-	AM_RANGE(0x0000, 0xffff) AM_READWRITE( memread, memwrite )
+	AM_RANGE(0x0000, 0xffff) AM_READWRITE( memread, memwrite ) AM_SETOFFSET( setoffset )
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START(cru_map, AS_IO, 8, ti99_4p_state)
@@ -267,226 +375,309 @@ static INPUT_PORTS_START(ti99_4p)
 
 INPUT_PORTS_END
 
+enum
+{
+	SGCPU_NONE = 0,
+	SGCPU_SYSROM,
+	SGCPU_RAM,
+	SGCPU_INTDSR,
+	SGCPU_MAPPER,
+	SGCPU_ROM6,
+	SGCPU_PADRAM,
+	SGCPU_PEB
+};
+
+int ti99_4p_state::decode_address(int address)
+{
+	int dec = SGCPU_NONE;
+	switch (address & 0xe000)
+	{
+	case 0x0000:
+		dec = SGCPU_SYSROM;
+		break;
+	case 0x2000:
+	case 0xa000:
+	case 0xc000:
+	case 0xe000:
+		dec = SGCPU_RAM;
+		break;
+	case 0x4000:
+		if (m_internal_dsr_active) dec = SGCPU_INTDSR;
+		else if (m_mapper_active) dec = SGCPU_MAPPER;
+		break;
+	case 0x6000:
+		if (m_rom6_active) dec = SGCPU_ROM6;
+		break;
+	case 0x8000:
+		if ((m_addr_buf & 0x1c00)==0x0000) dec = SGCPU_PADRAM;
+		break;
+
+	default:
+		break;
+	}
+	return dec;
+}
+
 /*
-    Memory access
+    Called when the memory access starts by setting the address bus. From that
+    point on, we suspend the CPU until all operations are done.
 */
+SETOFFSET_MEMBER( ti99_4p_state::setoffset )
+{
+	m_addr_buf = offset << 1;
+	m_waitcount = 0;
+
+	if (TRACE_ADDRESS) logerror("set address %04x\n", m_addr_buf);
+
+	m_decode = SGCPU_NONE;
+	m_muxready = true;
+	m_spacep = &space;
+
+	m_decode = decode_address(m_addr_buf);
+
+	if (m_decode == SGCPU_NONE)
+	{
+		// not found - pass on to PEB, 8 bit access with wait states as in TI-99/4A console
+		// PEB gets remaining accesses
+		// HSGPL, EVPC, other devices
+		m_decode = SGCPU_PEB;
+		m_waitcount = 5;
+		m_muxready = false;
+		m_peribox->memen_in(ASSERT_LINE);
+		m_peribox->setaddress_dbin(space, m_addr_buf+1, m_dbin);
+	}
+
+	ready_join();
+}
+
 READ16_MEMBER( ti99_4p_state::memread )
 {
-	int addroff = offset << 1;
-	if (m_rom0 == nullptr) return 0;   // premature access
+	int address = 0;
+	UINT8 hbyte = 0;
 
-	UINT16 zone = addroff & 0xe000;
 	UINT16 value = 0;
 
-	if (zone==0x0000)
+	int addr_off8k = m_addr_buf & 0x1fff;
+
+	// If we use the debugger, decode the address now (normally done in setaddress)
+	if (space.debugger_access())
 	{
-		// ROM0
-		value = m_rom0[(addroff & 0x1fff)>>1];
-		return value;
-	}
-	if (zone==0x2000 || zone==0xa000 || zone==0xc000 || zone==0xe000)
-	{
-		value = samsmem_read(space, offset, mem_mask);
-		return value;
+		m_addr_buf = offset << 1;
+		m_decode = decode_address(m_addr_buf);
 	}
 
-	if (zone==0x4000)
+	switch (m_decode)
 	{
-		if (m_internal_dsr)
-		{
-			value = m_dsr[(addroff & 0x1fff)>>1];
-			return value;
-		}
-		else
-		{
-			if (m_access_mapper && ((addroff & 0xffe0)==0x4000))
-			{
-				value = m_mapper[offset & 0x000f]<<8;
-				return value;
-			}
-		}
+	case SGCPU_SYSROM:
+		value = m_rom[(ROM0BASE | addr_off8k) >> 1];
+		break;
+
+	case SGCPU_RAM:
+		// Memory read. The AEMS emulation has two address areas: The memory is at locations
+		// 0x2000-0x3fff and 0xa000-0xffff, and the mapper area is at 0x4000-0x401e
+		// (only even addresses).
+		if (m_map_mode)
+			address = (m_mapper[(m_addr_buf & 0xf000)>>12] << 12) | (m_addr_buf & 0x0fff);
+		else // transparent mode
+			address = m_addr_buf;
+
+		value = m_ram[address>>1];
+		break;
+
+	case SGCPU_INTDSR:
+		value = m_rom[(DSRBASE | addr_off8k)>>1];
+		break;
+
+	case SGCPU_MAPPER:
+		value = (m_mapper[m_addr_buf & 0x000f]<<8) & 0xff00;
+		break;
+
+	case SGCPU_ROM6:
+		value = m_rom[((m_rom6_upper? ROM6UBASE : ROM6LBASE) | addr_off8k)>>1];
+		break;
+	case SGCPU_PADRAM:
+		// Scratch pad RAM (16 bit)
+		// 8000 ... 83ff (1K, 4 times the size of the internal RAM of the TI-99/4A)
+		value = m_scratchpad[(m_addr_buf & 0x03ff)>>1];
+		break;
+
+	case SGCPU_PEB:
+		if (space.debugger_access()) return debugger_read(space, offset);
+		// The byte from the odd address has already been read into the latch
+		// Reading the even address now
+		m_peribox->readz(space, m_addr_buf, &hbyte);
+		m_peribox->memen_in(CLEAR_LINE);
+		if (TRACE_MEM) logerror("Read even byte from address %04x -> %02x\n",  m_addr_buf, hbyte);
+		value = (hbyte<<8) | m_latch;
 	}
 
-	if (zone==0x6000 && m_internal_rom6)
-	{
-		if (m_rom6_bank==0)
-			value = m_rom6a[(addroff & 0x1fff)>>1];
-		else
-			value = m_rom6b[(addroff & 0x1fff)>>1];
-
-		return value;
-	}
-
-	// Scratch pad RAM and sound
-	// speech is in peribox
-	// groms are in hsgpl in peribox
-	if (zone==0x8000)
-	{
-		if ((addroff & 0xfff0)==0x8400) // cannot read from sound
-		{
-			value = 0;
-			return value;
-		}
-		if ((addroff & 0xfc00)==0x8000)
-		{
-			value = m_scratchpad[(addroff & 0x03ff)>>1];
-			return value;
-		}
-		// Video: 8800, 8802
-		if ((addroff & 0xfffd)==0x8800)
-		{
-			value = m_video->read16(space, offset, mem_mask);
-			return value;
-		}
-	}
-
-	// If we are here, check the peribox via the datamux
-	// catch-all for unmapped zones
-	value = datamux_read(space, offset, mem_mask);
 	return value;
 }
 
+
 WRITE16_MEMBER( ti99_4p_state::memwrite )
 {
-//  m_cpu->adjust_icount(-4);
+	int address = 0;
 
-	int addroff = offset << 1;
-	UINT16 zone = addroff & 0xe000;
-
-	if (zone==0x0000)
+	// If we use the debugger, decode the address now (normally done in setaddress)
+	if (space.debugger_access())
 	{
-		// ROM0
-		if (TRACE_ILLWRITE) logerror("Ignoring ROM write access at %04x\n", addroff);
-		return;
+		m_addr_buf = offset << 1;
+		m_decode = decode_address(m_addr_buf);
 	}
 
-	if (zone==0x2000 || zone==0xa000 || zone==0xc000 || zone==0xe000)
+	switch (m_decode)
 	{
-		samsmem_write(space, offset, data, mem_mask);
-		return;
-	}
+	case SGCPU_SYSROM:
+		if (TRACE_ILLWRITE) logerror("Ignoring ROM write access at %04x\n", m_addr_buf);
+		break;
 
-	if (zone==0x4000)
-	{
-		if (m_internal_dsr)
-		{
-			if (TRACE_ILLWRITE) logerror("Ignoring DSR write access at %04x\n", addroff);
-			return;
-		}
-		else
-		{
-			if (m_access_mapper && ((addroff & 0xffe0)==0x4000))
-			{
-				m_mapper[offset & 0x000f] = data;
-				return;
-			}
-		}
-	}
+	case SGCPU_RAM:
+		// see above
+		if (m_map_mode)
+			address = (m_mapper[(m_addr_buf & 0xf000)>>12] << 12) | (m_addr_buf & 0x0fff);
+		else // transparent mode
+			address = m_addr_buf;
 
-	if (zone==0x6000 && m_internal_rom6)
-	{
-		m_rom6_bank = offset & 0x0001;
-		return;
-	}
+		m_ram[address>>1] = data;
+		break;
 
-	// Scratch pad RAM and sound
-	// speech is in peribox
-	// groms are in hsgpl in peribox
-	if (zone==0x8000)
-	{
-		if ((addroff & 0xfff0)==0x8400)     //sound write
-		{
-			m_sound->write(space, 0, (data >> 8) & 0xff);
-			return;
-		}
-		if ((addroff & 0xfc00)==0x8000)
-		{
-			m_scratchpad[(addroff & 0x03ff)>>1] = data;
-			return;
-		}
-		// Video: 8C00, 8C02
-		if ((addroff & 0xfffd)==0x8c00)
-		{
-			m_video->write16(space, offset, data, mem_mask);
-			return;
-		}
-	}
+	case SGCPU_INTDSR:
+		if (TRACE_ILLWRITE) logerror("Ignoring DSR write access at %04x\n", m_addr_buf);
+		break;
 
-	// If we are here, check the peribox via the datamux
-	// catch-all for unmapped zones
-	datamux_write(space, offset, data, mem_mask);
+	case SGCPU_MAPPER:
+		m_mapper[(m_addr_buf>>1) & 0x000f] = data;  // writing both bytes, but only the first is accepted
+		break;
+
+	case SGCPU_ROM6:
+		// Writing to 6002 sets upper bank
+		m_rom6_upper = (m_addr_buf & 0x0002)!=0;
+		break;
+
+	case SGCPU_PADRAM:
+		// Scratch pad RAM (16 bit)
+		// 8000 ... 83ff (1K, 4 times the size of the internal RAM of the TI-99/4A)
+		m_scratchpad[(m_addr_buf & 0x03ff)>>1] = data;
+		break;
+
+	case SGCPU_PEB:
+		if (space.debugger_access()) { debugger_write(space, offset, data); return; }
+
+		// Writing the even address now (addr)
+		// The databus multplexer puts the even value into the latch and outputs the odd value now.
+		m_latch = (data >> 8) & 0xff;
+
+		// write odd byte
+		if (TRACE_MEM) logerror("datamux: write odd byte to address %04x <- %02x\n",  m_addr_buf+1, data & 0xff);
+		m_peribox->write(space, m_addr_buf+1, data & 0xff);
+		m_peribox->memen_in(CLEAR_LINE);
+	}
 }
 
-/***************************************************************************
-    Internal datamux; similar to TI-99/4A. However, here we have just
-    one device, the peripheral box, so it is much simpler.
-***************************************************************************/
+/*
+    Used when the debugger is reading values from PEB cards.
+*/
+READ16_MEMBER( ti99_4p_state::debugger_read )
+{
+	UINT8 lval = 0;
+	UINT8 hval = 0;
+	UINT16 addrb = offset << 1;
+	m_peribox->memen_in(ASSERT_LINE);
+	m_peribox->readz(space, addrb+1, &lval);
+	m_peribox->readz(space, addrb, &hval);
+	m_peribox->memen_in(CLEAR_LINE);
+	return ((hval << 8)&0xff00) | (lval & 0xff);
+}
+
+/*
+    Used when the debugger is writing values to PEB cards.
+*/
+WRITE16_MEMBER( ti99_4p_state::debugger_write )
+{
+	int addrb = offset << 1;
+	m_peribox->memen_in(ASSERT_LINE);
+	m_peribox->write(space, addrb+1, data & 0xff);
+	m_peribox->write(space, addrb,  (data>>8) & 0xff);
+	m_peribox->memen_in(CLEAR_LINE);
+}
+
+/*
+   Data bus in (DBIN) line from the CPU.
+*/
+WRITE_LINE_MEMBER( ti99_4p_state::dbin_line )
+{
+	m_dbin = (line_state)state;
+}
 
 /*
     The datamux is connected to the clock line in order to operate
-    the wait state counter.
+    the wait state counter and to read/write the bytes.
 */
-void ti99_4p_state::clock_in(int clock)
+WRITE_LINE_MEMBER( ti99_4p_state::datamux_clock_in )
 {
-	if (clock==ASSERT_LINE && m_waitcount!=0)
+	// return immediately if the datamux is currently inactive
+	if (m_waitcount>0)
 	{
-		m_waitcount--;
-		if (m_waitcount==0) console_ready_dmux(ASSERT_LINE);
+		if (TRACE_MUX) logerror("datamux: wait count %d\n", m_waitcount);
+		if (m_sysready==CLEAR_LINE)
+		{
+			if (TRACE_MUX) logerror("datamux: stalled due to external READY=0\n");
+			return;
+		}
+
+		if (m_dbin==ASSERT_LINE)
+		{
+			// Reading
+			if (state==ASSERT_LINE)
+			{   // raising edge
+				if (--m_waitcount==0)
+				{
+					m_muxready = true;
+					ready_join();
+				}
+				if (m_waitcount==2)
+				{
+					// read odd byte
+					m_peribox->readz(*m_spacep, m_addr_buf+1, &m_latch);
+					m_peribox->memen_in(CLEAR_LINE);
+
+					if (TRACE_MEM) logerror("datamux: read odd byte from address %04x -> %02x\n",  m_addr_buf+1, m_latch);
+
+					// do the setaddress for the even address
+					m_peribox->memen_in(ASSERT_LINE);
+					m_peribox->setaddress_dbin(*m_spacep, m_addr_buf, m_dbin);
+				}
+			}
+		}
+		else    // write access
+		{
+			if (state==ASSERT_LINE)
+			{   // raising edge
+				if (--m_waitcount==0)
+				{
+					m_muxready = true;
+					ready_join();
+				}
+			}
+			else
+			{   // falling edge
+				if (m_waitcount==2)
+				{
+					// do the setaddress for the even address
+					m_peribox->memen_in(ASSERT_LINE);
+					m_peribox->setaddress_dbin(*m_spacep, m_addr_buf, m_dbin);
+
+					// write even byte
+					if (TRACE_MEM) logerror("datamux: write even byte to address %04x <- %02x\n",  m_addr_buf, m_latch);
+					m_peribox->write(*m_spacep,  m_addr_buf, m_latch);
+					m_peribox->memen_in(CLEAR_LINE);
+				}
+			}
+		}
 	}
 }
 
-
-READ16_MEMBER( ti99_4p_state::datamux_read )
-{
-	UINT8 hbyte = 0;
-	UINT16 addroff = (offset << 1);
-
-	m_peribox->memen_in(ASSERT_LINE);
-
-	m_peribox->readz(space, addroff+1, &m_latch, mem_mask);
-	m_lowbyte = m_latch;
-
-	m_peribox->readz(space, addroff, &hbyte, mem_mask);
-	m_highbyte = hbyte;
-
-	m_peribox->memen_in(CLEAR_LINE);
-
-	// use the latch and the currently read byte and put it on the 16bit bus
-//  printf("read  address = %04x, value = %04x, memmask = %4x\n", addroff,  (hbyte<<8) | sgcpu->latch, mem_mask);
-
-	// Insert four wait states and let CPU enter wait state
-	m_waitcount = 6;
-	console_ready_dmux(CLEAR_LINE);
-
-	return (hbyte<<8) | m_latch ;
-}
-
-/*
-    Write access.
-    TODO: use the 16-bit expansion in the box for suitable cards
-*/
-WRITE16_MEMBER( ti99_4p_state::datamux_write )
-{
-	UINT16 addroff = (offset << 1);
-//  printf("write address = %04x, value = %04x, memmask = %4x\n", addroff, data, mem_mask);
-
-	// read more about the datamux in datamux.c
-
-	// Write to the PEB
-	m_peribox->memen_in(ASSERT_LINE);
-
-	m_peribox->write(space, addroff+1, data & 0xff);
-
-	// Write to the PEB
-	m_peribox->write(space, addroff, (data>>8) & 0xff);
-
-	m_peribox->memen_in(CLEAR_LINE);
-
-	// Insert four wait states and let CPU enter wait state
-	m_waitcount = 6;
-	console_ready_dmux(CLEAR_LINE);
-}
-
 /***************************************************************************
    CRU interface
 ***************************************************************************/
@@ -528,46 +719,6 @@ READ8_MEMBER( ti99_4p_state::cruread )
 	return value;
 }
 
-/***************************************************************************
-   AMS Memory implementation
-***************************************************************************/
-
-/*
-    Memory read. The SAMS card has two address areas: The memory is at locations
-    0x2000-0x3fff and 0xa000-0xffff, and the mapper area is at 0x4000-0x401e
-    (only even addresses).
-*/
-READ16_MEMBER( ti99_4p_state::samsmem_read )
-{
-	UINT32 address = 0;
-	int addroff = offset << 1;
-
-	// select memory expansion
-	if (m_map_mode)
-		address = (m_mapper[(addroff>>12) & 0x000f] << 12) + (addroff & 0x0fff);
-	else // transparent mode
-		address = addroff;
-
-	return m_ram[address>>1];
-}
-
-/*
-    Memory write
-*/
-WRITE16_MEMBER( ti99_4p_state::samsmem_write )
-{
-	UINT32 address = 0;
-	int addroff = offset << 1;
-
-	// select memory expansion
-	if (m_map_mode)
-		address = (m_mapper[(addroff>>12) & 0x000f] << 12) + (addroff & 0x0fff);
-	else // transparent mode
-		address = addroff;
-
-	m_ram[address>>1] = data;
-}
-
 /***************************************************************************
     Keyboard/tape control
 ****************************************************************************/
@@ -700,15 +851,11 @@ WRITE_LINE_MEMBER( ti99_4p_state::cassette_output )
 ****************************************************************************/
 
 /*
-    We may have lots of devices pulling down this line; so we should use a AND
-    gate to do it right. On the other hand, when READY is down, there is just
-    no chance to make another device pull down the same line; the CPU just
-    won't access any other device in this time.
+    Combine the external (sysready) and the own (muxready) READY states.
 */
-WRITE_LINE_MEMBER( ti99_4p_state::console_ready )
+void ti99_4p_state::ready_join()
 {
-	m_ready_line = state;
-	int combined = (m_ready_line == ASSERT_LINE && m_ready_line_dmux == ASSERT_LINE)? ASSERT_LINE : CLEAR_LINE;
+	int combined = (m_sysready == ASSERT_LINE && m_muxready)? ASSERT_LINE : CLEAR_LINE;
 
 	if (TRACE_READY)
 	{
@@ -719,21 +866,17 @@ WRITE_LINE_MEMBER( ti99_4p_state::console_ready )
 }
 
 /*
-    The exception of the above rule. Memory access over the datamux also operates
-    the READY line, and the datamux raises READY depending on the clock pulse.
-    So we must make sure this does not interfere.
+    Incoming READY line from other cards in the Peripheral Expansion Box.
 */
-WRITE_LINE_MEMBER( ti99_4p_state::console_ready_dmux )
+WRITE_LINE_MEMBER( ti99_4p_state::ready_line )
 {
-	m_ready_line_dmux = state;
-	int combined = (m_ready_line == ASSERT_LINE && m_ready_line_dmux == ASSERT_LINE)? ASSERT_LINE : CLEAR_LINE;
-
 	if (TRACE_READY)
 	{
-		if (m_ready_prev != combined) logerror("READY dmux level = %d\n", state);
+		if (state != m_sysready) logerror("READY line from PBox = %d\n", state);
 	}
-	m_ready_prev = combined;
-	m_cpu->set_ready(combined);
+	m_sysready = (line_state)state;
+	// Also propagate to CPU via driver
+	ready_join();
 }
 
 void ti99_4p_state::set_9901_int( int line, line_state state)
@@ -760,7 +903,8 @@ WRITE_LINE_MEMBER( ti99_4p_state::notconnected )
 */
 WRITE_LINE_MEMBER( ti99_4p_state::clock_out )
 {
-	clock_in(state);
+	datamux_clock_in(state);
+	m_peribox->clock_in(state);
 }
 
 WRITE8_MEMBER( ti99_4p_state::tms9901_interrupt )
@@ -781,7 +925,7 @@ READ8_MEMBER( ti99_4p_state::interrupt_level )
 WRITE8_MEMBER( ti99_4p_state::external_operation )
 {
 	static const char* extop[8] = { "inv1", "inv2", "IDLE", "RSET", "inv3", "CKON", "CKOF", "LREX" };
-	logerror("External operation %s not implemented on the SGCPU board\n", extop[offset]);
+	if (offset != IDLE_OP) logerror("External operation %s not implemented on the SGCPU board\n", extop[offset]);
 }
 
 /*****************************************************************************/
@@ -796,19 +940,16 @@ void ti99_4p_state::machine_start()
 
 	m_firstjoy = 6;
 
-	m_ready_line = m_ready_line_dmux = ASSERT_LINE;
+	m_sysready = ASSERT_LINE;
+	m_muxready = true;
 
-	UINT16 *rom = (UINT16*)(memregion("maincpu")->base());
-	m_rom0  = rom + 0x2000;
-	m_dsr   = rom + 0x6000;
-	m_rom6a = rom + 0x3000;
-	m_rom6b = rom + 0x7000;
+	m_rom = (UINT16*)(memregion("maincpu")->base());
 }
 
 /*
     set the state of int2 (called by the v9938)
 */
-WRITE_LINE_MEMBER(ti99_4p_state::set_tms9901_INT2_from_v9938)
+WRITE_LINE_MEMBER(ti99_4p_state::video_interrupt_in)
 {
 	set_9901_int(2, (line_state)state);
 }
@@ -836,12 +977,7 @@ static MACHINE_CONFIG_START( ti99_4p_60hz, ti99_4p_state )
 	MCFG_TMS99xx_EXTOP_HANDLER( WRITE8(ti99_4p_state, external_operation) )
 	MCFG_TMS99xx_INTLEVEL_HANDLER( READ8(ti99_4p_state, interrupt_level) )
 	MCFG_TMS99xx_CLKOUT_HANDLER( WRITELINE(ti99_4p_state, clock_out) )
-
-	/* video hardware */
-	MCFG_DEVICE_ADD(VIDEO_SYSTEM_TAG, V9938VIDEO, 0)
-	MCFG_V9938_ADD(VDP_TAG, SCREEN_TAG, 0x20000, XTAL_21_4772MHz)  /* typical 9938 clock, not verified */
-	MCFG_V99X8_INTERRUPT_CALLBACK(WRITELINE(ti99_4p_state, set_tms9901_INT2_from_v9938))
-	MCFG_V99X8_SCREEN_ADD_NTSC(SCREEN_TAG, VDP_TAG, XTAL_21_4772MHz)
+	MCFG_TMS99xx_DBIN_HANDLER( WRITELINE(ti99_4p_state, dbin_line) )
 
 	// tms9901
 	MCFG_DEVICE_ADD(TMS9901_TAG, TMS9901, 3000000)
@@ -858,13 +994,10 @@ static MACHINE_CONFIG_START( ti99_4p_60hz, ti99_4p_state )
 	MCFG_DEVICE_ADD( PERIBOX_TAG, PERIBOX_SG, 0)
 	MCFG_PERIBOX_INTA_HANDLER( WRITELINE(ti99_4p_state, extint) )
 	MCFG_PERIBOX_INTB_HANDLER( WRITELINE(ti99_4p_state, notconnected) )
-	MCFG_PERIBOX_READY_HANDLER( WRITELINE(ti99_4p_state, console_ready) )
+	MCFG_PERIBOX_READY_HANDLER( WRITELINE(ti99_4p_state, ready_line) )
 
-	// Sound hardware
-	MCFG_SPEAKER_STANDARD_MONO("sound_out")
-	MCFG_SOUND_ADD(TISOUNDCHIP_TAG, SN94624, 3579545/8) /* 3.579545 MHz */
-	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "sound_out", 0.75)
-	MCFG_SN76496_READY_HANDLER( WRITELINE(ti99_4p_state, console_ready) )
+	// The SGCPU actually makes use of this pin which was unused before
+	MCFG_PERIBOX_LCP_HANDLER( WRITELINE(ti99_4p_state, video_interrupt_in) )
 
 	// Cassette drives
 	MCFG_SPEAKER_STANDARD_MONO("cass_out")
@@ -887,4 +1020,4 @@ ROM_START(ti99_4p)
 ROM_END
 
 /*    YEAR  NAME      PARENT   COMPAT   MACHINE      INPUT    INIT      COMPANY     FULLNAME */
-COMP( 1996, ti99_4p,  0,       0,       ti99_4p_60hz, ti99_4p, driver_device, 0, "System 99 Users Group",       "SGCPU (a.k.a. 99/4P)" , 0 )
+COMP( 1996, ti99_4p,  0,       0,       ti99_4p_60hz, ti99_4p, driver_device, 0, "System-99 User Group",       "SGCPU (aka TI-99/4P)" , 0 )
diff --git a/src/mame/drivers/ti99_4x.cpp b/src/mame/drivers/ti99_4x.cpp
index 898327f92a7..e487f149c3c 100644
--- a/src/mame/drivers/ti99_4x.cpp
+++ b/src/mame/drivers/ti99_4x.cpp
@@ -46,7 +46,7 @@
 #include "machine/tms9901.h"
 #include "imagedev/cassette.h"
 
-#include "bus/ti99x/videowrp.h"
+#include "bus/ti99x/ti99defs.h"
 #include "bus/ti99x/datamux.h"
 #include "bus/ti99x/gromport.h"
 #include "bus/ti99x/joyport.h"
@@ -73,7 +73,7 @@ public:
 		m_peribox(*this, PERIBOX_TAG),
 		m_joyport(*this, JOYPORT_TAG),
 		m_datamux(*this, DATAMUX_TAG),
-		m_video(*this, VIDEO_SYSTEM_TAG),
+		m_video(*this, VDP_TAG),
 		m_cassette1(*this, "cassette"),
 		m_cassette2(*this, "cassette2")
 		{ }
@@ -130,6 +130,7 @@ public:
 	DECLARE_INPUT_CHANGED_MEMBER( load_interrupt );
 
 	// Used by EVPC
+	DECLARE_WRITE_LINE_MEMBER( video_interrupt_evpc_in );
 	void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
 
 private:
@@ -157,7 +158,7 @@ private:
 	required_device<peribox_device>     m_peribox;
 	required_device<joyport_device>     m_joyport;
 	required_device<ti99_datamux_device> m_datamux;
-	required_device<ti_video_device>    m_video;
+	optional_device<tms9928a_device>    m_video;
 	required_device<cassette_image_device> m_cassette1;
 	required_device<cassette_image_device> m_cassette2;
 
@@ -655,6 +656,13 @@ void ti99_4x_state::device_timer(emu_timer &timer, device_timer_id id, int param
 
 /*****************************************************************************/
 
+WRITE_LINE_MEMBER( ti99_4x_state::video_interrupt_evpc_in )
+{
+	if (TRACE_INTERRUPTS) logerror("ti99_4x: VDP INT2 from EVPC on tms9901, level=%d\n", state);
+	m_int2 = (line_state)state;
+	m_tms9901->set_single_int(2, state);
+}
+
 /*
     set the state of TMS9901's INT2 (called by the tms9928 core)
 */
@@ -754,7 +762,7 @@ WRITE_LINE_MEMBER( ti99_4x_state::console_reset )
 	{
 		logerror("ti99_4x: Console reset line = %d\n", state);
 		m_cpu->set_input_line(INT_9900_RESET, state);
-		m_video->reset_vdp(state);
+		m_video->reset_line(state);
 	}
 }
 
@@ -770,6 +778,37 @@ WRITE_LINE_MEMBER( ti99_4x_state::notconnected )
 	if (TRACE_INTERRUPTS) logerror("ti99_4x: Setting a not connected line ... ignored\n");
 }
 
+#if 0
+/*
+    External clock connector. This is actually a separate cable lead going from
+    the EPVC in the PEB to a pin inside the console. This cable sends the
+    video interrupt from the v9938 on the EVPC into the console.
+    This workaround must be done on the real system because the peripheral
+    box and its connector were not designed to deliver a video interrupt signal.
+    This was fixed with the EVPC2 which uses the external interrupt EXTINT
+    with a special firmware (DSR).
+
+    Emulation detail: We are using a separate device class in order to avoid
+    exposing the console class to the external class.
+*/
+evpc_clock_connector::evpc_clock_connector(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+: device_t(mconfig, EVPC_CONN, "EVPC clock connector", tag, owner, clock, "ti99_evpc_clock", __FILE__)
+{
+}
+
+void evpc_clock_connector::device_start()
+{
+	m_console = downcast<ti99_4x_state*>(owner());
+}
+
+WRITE_LINE_MEMBER( evpc_clock_connector::vclock_line )
+{
+	m_console->video_interrupt_in(state);
+};
+
+const device_type EVPC_CONN = &device_creator<evpc_clock_connector>;
+#endif
+
 /******************************************************************************
     Machine definitions
 ******************************************************************************/
@@ -863,14 +902,24 @@ MACHINE_CONFIG_END
     US version: 60 Hz, NTSC
 */
 static MACHINE_CONFIG_DERIVED( ti99_4_60hz, ti99_4 )
-	MCFG_TI_TMS991x_ADD_NTSC(VIDEO_SYSTEM_TAG, TMS9918, 0x4000, ti99_4x_state, video_interrupt_in, gromclk_in)
+	MCFG_DEVICE_ADD( VDP_TAG, TMS9918, XTAL_10_738635MHz / 2 )                  \
+	MCFG_TMS9928A_VRAM_SIZE(0x4000) \
+	MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(ti99_4x_state, video_interrupt_in)) \
+	MCFG_TMS9928A_OUT_GROMCLK_CB(WRITELINE(ti99_4x_state, gromclk_in)) \
+	MCFG_TMS9928A_SCREEN_ADD_NTSC( SCREEN_TAG )                             \
+	MCFG_SCREEN_UPDATE_DEVICE( VDP_TAG, tms9928a_device, screen_update )
 MACHINE_CONFIG_END
 
 /*
     European version: 50 Hz, PAL
 */
 static MACHINE_CONFIG_DERIVED( ti99_4_50hz, ti99_4 )
-	MCFG_TI_TMS991x_ADD_PAL(VIDEO_SYSTEM_TAG, TMS9929, 0x4000, ti99_4x_state, video_interrupt_in, gromclk_in)
+	MCFG_DEVICE_ADD( VDP_TAG, TMS9929, XTAL_10_738635MHz / 2 ) \
+	MCFG_TMS9928A_VRAM_SIZE(0x4000) \
+	MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(ti99_4x_state, video_interrupt_in))   \
+	MCFG_TMS9928A_OUT_GROMCLK_CB(WRITELINE(ti99_4x_state, gromclk_in)) \
+	MCFG_TMS9928A_SCREEN_ADD_PAL( SCREEN_TAG )                              \
+	MCFG_SCREEN_UPDATE_DEVICE( VDP_TAG, tms9928a_device, screen_update )
 MACHINE_CONFIG_END
 
 /**********************************************************************
@@ -961,14 +1010,24 @@ MACHINE_CONFIG_END
     US version: 60 Hz, NTSC
 */
 static MACHINE_CONFIG_DERIVED( ti99_4a_60hz, ti99_4a )
-	MCFG_TI_TMS991x_ADD_NTSC(VIDEO_SYSTEM_TAG, TMS9918A, 0x4000, ti99_4x_state, video_interrupt_in, gromclk_in)
+	MCFG_DEVICE_ADD( VDP_TAG, TMS9918A, XTAL_10_738635MHz / 2 )                  \
+	MCFG_TMS9928A_VRAM_SIZE(0x4000) \
+	MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(ti99_4x_state, video_interrupt_in)) \
+	MCFG_TMS9928A_OUT_GROMCLK_CB(WRITELINE(ti99_4x_state, gromclk_in)) \
+	MCFG_TMS9928A_SCREEN_ADD_NTSC( SCREEN_TAG )                             \
+	MCFG_SCREEN_UPDATE_DEVICE( VDP_TAG, tms9928a_device, screen_update )
 MACHINE_CONFIG_END
 
 /*
     European version: 50 Hz, PAL
 */
 static MACHINE_CONFIG_DERIVED( ti99_4a_50hz, ti99_4a )
-	MCFG_TI_TMS991x_ADD_PAL(VIDEO_SYSTEM_TAG, TMS9929A, 0x4000, ti99_4x_state, video_interrupt_in, gromclk_in)
+	MCFG_DEVICE_ADD( VDP_TAG, TMS9929A, XTAL_10_738635MHz / 2 ) \
+	MCFG_TMS9928A_VRAM_SIZE(0x4000) \
+	MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(ti99_4x_state, video_interrupt_in))   \
+	MCFG_TMS9928A_OUT_GROMCLK_CB(WRITELINE(ti99_4x_state, gromclk_in)) \
+	MCFG_TMS9928A_SCREEN_ADD_PAL( SCREEN_TAG )                              \
+	MCFG_SCREEN_UPDATE_DEVICE( VDP_TAG, tms9928a_device, screen_update )
 MACHINE_CONFIG_END
 
 /************************************************************************
@@ -996,19 +1055,32 @@ MACHINE_CONFIG_END
     US version: 60 Hz, NTSC
 */
 static MACHINE_CONFIG_DERIVED( ti99_4qi_60hz, ti99_4qi )
-	MCFG_TI_TMS991x_ADD_NTSC(VIDEO_SYSTEM_TAG, TMS9918A, 0x4000, ti99_4x_state, video_interrupt_in, gromclk_in)
+	MCFG_DEVICE_ADD( VDP_TAG, TMS9918A, XTAL_10_738635MHz / 2 )                  \
+	MCFG_TMS9928A_VRAM_SIZE(0x4000) \
+	MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(ti99_4x_state, video_interrupt_in)) \
+	MCFG_TMS9928A_OUT_GROMCLK_CB(WRITELINE(ti99_4x_state, gromclk_in)) \
+	MCFG_TMS9928A_SCREEN_ADD_NTSC( SCREEN_TAG )                             \
+	MCFG_SCREEN_UPDATE_DEVICE( VDP_TAG, tms9928a_device, screen_update )
 MACHINE_CONFIG_END
 
 /*
     European version: 50 Hz, PAL
 */
 static MACHINE_CONFIG_DERIVED( ti99_4qi_50hz, ti99_4qi )
-	MCFG_TI_TMS991x_ADD_PAL(VIDEO_SYSTEM_TAG, TMS9929A, 0x4000, ti99_4x_state, video_interrupt_in, gromclk_in)
+	MCFG_DEVICE_ADD( VDP_TAG, TMS9929A, XTAL_10_738635MHz / 2 ) \
+	MCFG_TMS9928A_VRAM_SIZE(0x4000) \
+	MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(ti99_4x_state, video_interrupt_in))   \
+	MCFG_TMS9928A_OUT_GROMCLK_CB(WRITELINE(ti99_4x_state, gromclk_in)) \
+	MCFG_TMS9928A_SCREEN_ADD_PAL( SCREEN_TAG )                              \
+	MCFG_SCREEN_UPDATE_DEVICE( VDP_TAG, tms9928a_device, screen_update )
 MACHINE_CONFIG_END
 
 /************************************************************************
     TI-99/4A with 80-column support. Actually a separate expansion card (EVPC),
     replacing the console video processor.
+
+    Note that the sound chip is also moved to this card, because the SGCPU,
+    which is intended to use the EVPC, does not have an own sound chip.
 *************************************************************************/
 
 MACHINE_START_MEMBER(ti99_4x_state, ti99_4ev)
@@ -1043,12 +1115,6 @@ static MACHINE_CONFIG_START( ti99_4ev_60hz, ti99_4x_state )
 	MCFG_MACHINE_START_OVERRIDE(ti99_4x_state, ti99_4ev )
 	MCFG_MACHINE_RESET_OVERRIDE(ti99_4x_state, ti99_4ev )
 
-	/* video hardware */
-	MCFG_DEVICE_ADD(VIDEO_SYSTEM_TAG, V9938VIDEO, 0)
-	MCFG_V9938_ADD(VDP_TAG, SCREEN_TAG, 0x20000, XTAL_21_4772MHz)  /* typical 9938 clock, not verified */
-	MCFG_V99X8_INTERRUPT_CALLBACK(WRITELINE(ti99_4x_state, video_interrupt_in))
-	MCFG_V99X8_SCREEN_ADD_NTSC(SCREEN_TAG, VDP_TAG, XTAL_21_4772MHz)
-
 	/* Main board */
 	MCFG_DEVICE_ADD(TMS9901_TAG, TMS9901, 3000000)
 	MCFG_TMS9901_READBLOCK_HANDLER( READ8(ti99_4x_state, read_by_9901) )
@@ -1068,6 +1134,9 @@ static MACHINE_CONFIG_START( ti99_4ev_60hz, ti99_4x_state )
 	MCFG_GROMPORT_READY_HANDLER( WRITELINE(ti99_4x_state, console_ready_cart) )
 	MCFG_GROMPORT_RESET_HANDLER( WRITELINE(ti99_4x_state, console_reset) )
 
+	// EVPC connector
+	MCFG_ADD_EVPC_CONNECTOR( EVPC_CONN_TAG, WRITELINE( ti99_4x_state, video_interrupt_evpc_in ) )
+
 	/* Software list */
 	MCFG_SOFTWARE_LIST_ADD("cart_list_ti99", "ti99_cart")
 
@@ -1077,12 +1146,6 @@ static MACHINE_CONFIG_START( ti99_4ev_60hz, ti99_4x_state )
 	MCFG_PERIBOX_INTB_HANDLER( WRITELINE(ti99_4x_state, notconnected) )
 	MCFG_PERIBOX_READY_HANDLER( DEVWRITELINE(DATAMUX_TAG, ti99_datamux_device, ready_line) )
 
-	// Sound hardware
-	MCFG_SPEAKER_STANDARD_MONO("sound_out")
-	MCFG_SOUND_ADD(TISOUNDCHIP_TAG, SN94624, 3579545/8) /* 3.579545 MHz */
-	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "sound_out", 0.75)
-	MCFG_SN76496_READY_HANDLER( WRITELINE(ti99_4x_state, console_ready_sound) )
-
 	/* Cassette drives */
 	MCFG_SPEAKER_STANDARD_MONO("cass_out")
 	MCFG_CASSETTE_ADD( "cassette" )
diff --git a/src/mame/drivers/ti99_8.cpp b/src/mame/drivers/ti99_8.cpp
index 9b661f71e82..91d71536929 100644
--- a/src/mame/drivers/ti99_8.cpp
+++ b/src/mame/drivers/ti99_8.cpp
@@ -182,7 +182,6 @@ Known Issues (MZ, 2010-11-07)
 #include "imagedev/cassette.h"
 
 #include "bus/ti99x/998board.h"
-#include "bus/ti99x/videowrp.h"
 #include "bus/ti99x/gromport.h"
 #include "bus/ti99x/joyport.h"
 

From 9eb11bdec72bbb9175a4358f46c174a7c832b1ba Mon Sep 17 00:00:00 2001
From: Michael Zapf <Michael.Zapf@mizapf.de>
Date: Wed, 20 Apr 2016 00:23:28 +0200
Subject: [PATCH 105/122] Added general read/write methods to 9928a, allowing
 address lines to select functions

---
 src/devices/bus/ti99x/datamux.cpp | 24 ++----------------------
 src/devices/video/tms9928a.cpp    | 19 +++++++++++++++++++
 src/devices/video/tms9928a.h      |  3 +++
 3 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/src/devices/bus/ti99x/datamux.cpp b/src/devices/bus/ti99x/datamux.cpp
index 6cb44af8f53..996096a1a49 100644
--- a/src/devices/bus/ti99x/datamux.cpp
+++ b/src/devices/bus/ti99x/datamux.cpp
@@ -125,17 +125,7 @@ void ti99_datamux_device::read_all(address_space& space, UINT16 addr, UINT8 *val
 		if ((addr & 0xf801)==0x8800)
 		{
 			// Forward to VDP unless we have an EVPC
-			if (m_video != nullptr)
-			{
-				if ((addr & 2) != 0)
-				{       // read VDP status
-					*value = m_video->register_read(space, 0);
-				}
-				else
-				{       // read VDP RAM
-					*value = m_video->vram_read(space, 0);
-				}
-			}
+			if (m_video != nullptr) *value = m_video->read(space, addr>>1); // A14 determines data or register read
 		}
 	}
 
@@ -174,17 +164,7 @@ void ti99_datamux_device::write_all(address_space& space, UINT16 addr, UINT8 val
 	if ((addr & 0xf801)==0x8800)
 	{
 		// Forward to VDP unless we have an EVPC
-		if (m_video != nullptr)
-		{
-			if ((addr & 2) != 0)
-			{   // write VDP address/register
-				m_video->register_write(space, 0, value);
-			}
-			else
-			{   // write VDP data
-				m_video->vram_write(space, 0, value);
-			}
-		}
+		if (m_video != nullptr) m_video->write(space, addr>>1, value);   // A14 determines data or register write
 	}
 
 	// PEB gets all accesses
diff --git a/src/devices/video/tms9928a.cpp b/src/devices/video/tms9928a.cpp
index fb8828e2cc1..5f4fcec92ec 100644
--- a/src/devices/video/tms9928a.cpp
+++ b/src/devices/video/tms9928a.cpp
@@ -112,6 +112,25 @@ tms9929a_device::tms9929a_device(const machine_config &mconfig, const char *tag,
 	: tms9928a_device( mconfig, TMS9929A, "TMS9929A", tag, owner, clock, true, true, true, "tms9929a", __FILE__)
 { }
 
+READ8_MEMBER( tms9928a_device::read )
+{
+	UINT8 value = 0;
+
+	if ((offset & 1) == 0)
+		value = vram_read(space, 0);
+	else
+		value = register_read(space, 0);
+
+	return value;
+}
+
+WRITE8_MEMBER( tms9928a_device::write )
+{
+	if ((offset & 1) == 0)
+		vram_write(space, 0, data);
+	else
+		register_write(space, 0, data);
+}
 
 READ8_MEMBER( tms9928a_device::vram_read )
 {
diff --git a/src/devices/video/tms9928a.h b/src/devices/video/tms9928a.h
index 21e7c9bf606..d05a2d936c4 100644
--- a/src/devices/video/tms9928a.h
+++ b/src/devices/video/tms9928a.h
@@ -92,6 +92,9 @@ public:
 	template<class _Object> static devcb_base &set_out_int_line_callback(device_t &device, _Object object) { return downcast<tms9928a_device &>(device).m_out_int_line_cb.set_callback(object); }
 	template<class _Object> static devcb_base &set_out_gromclk_callback(device_t &device, _Object object) { return downcast<tms9928a_device &>(device).m_out_gromclk_cb.set_callback(object); }
 
+	DECLARE_READ8_MEMBER( read );
+	DECLARE_WRITE8_MEMBER( write );
+
 	DECLARE_READ8_MEMBER( vram_read );
 	DECLARE_WRITE8_MEMBER( vram_write );
 	DECLARE_READ8_MEMBER( register_read );

From 262f0d20373395c2eede49960516148aff2fbef8 Mon Sep 17 00:00:00 2001
From: Michael Zapf <Michael.Zapf@mizapf.de>
Date: Wed, 20 Apr 2016 00:36:24 +0200
Subject: [PATCH 106/122] ti99_4p: Added AlphaLock handler

---
 src/mame/drivers/ti99_4p.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/mame/drivers/ti99_4p.cpp b/src/mame/drivers/ti99_4p.cpp
index fb239868a8f..abc4933c457 100644
--- a/src/mame/drivers/ti99_4p.cpp
+++ b/src/mame/drivers/ti99_4p.cpp
@@ -985,6 +985,7 @@ static MACHINE_CONFIG_START( ti99_4p_60hz, ti99_4p_state )
 	MCFG_TMS9901_P2_HANDLER( WRITELINE( ti99_4p_state, keyC0) )
 	MCFG_TMS9901_P3_HANDLER( WRITELINE( ti99_4p_state, keyC1) )
 	MCFG_TMS9901_P4_HANDLER( WRITELINE( ti99_4p_state, keyC2) )
+	MCFG_TMS9901_P5_HANDLER( WRITELINE( ti99_4p_state, alphaW) )
 	MCFG_TMS9901_P6_HANDLER( WRITELINE( ti99_4p_state, cs_motor) )
 	MCFG_TMS9901_P8_HANDLER( WRITELINE( ti99_4p_state, audio_gate) )
 	MCFG_TMS9901_P9_HANDLER( WRITELINE( ti99_4p_state, cassette_output) )

From 368192cdc5b17badc89329fe4e80cde6652a9d6b Mon Sep 17 00:00:00 2001
From: David Haywood <mamehaze@users.noreply.github.com>
Date: Wed, 20 Apr 2016 03:26:15 +0100
Subject: [PATCH 107/122] new clones Espgaluda (2003/10/15 Master Ver, bootleg
 cartridge conversion)

---
 src/mame/drivers/pgm.cpp | 35 +++++++++++++++++++++++++++++++----
 src/mame/mame.lst        |  1 +
 2 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/src/mame/drivers/pgm.cpp b/src/mame/drivers/pgm.cpp
index 754e970bda5..11bcf369b83 100644
--- a/src/mame/drivers/pgm.cpp
+++ b/src/mame/drivers/pgm.cpp
@@ -4267,6 +4267,34 @@ ROM_START( espgal )
 	ROM_LOAD( "w04801b032.u17",    0x400000, 0x400000, CRC(60298536) SHA1(6b7333f16cce778c5725dbdf75a5446f0906397a) ) //music-1
 ROM_END
 
+ROM_START( espgalbl ) // this assumes a Dodonpachi 2 Bee Storm cart was used
+	ROM_REGION( 0x600000, "maincpu", 0 ) /* 68000 Code */
+	PGM_68K_BIOS
+	// the program rom in the cartridge actually ends up mapping OVER the motherboard bios rom, you don't get the PGM splash etc.
+	ROM_LOAD16_WORD_SWAP( "espgaluda_u8.bin", 0x000000, 0x400000, CRC(6a92dd52) SHA1(d4b694c88deaeebb7b1c0ddbf29a06380b06426f) )
+
+	ROM_REGION( 0x4000, "prot", 0 ) /* ARM protection ASIC - internal rom */ // leftover from original game
+	ROM_LOAD( "ddp2_igs027a_japan.bin", 0x000000, 0x04000, CRC(742d34d2) SHA1(4491c08f3cefef2933ad5a741f4bb05cc2f3e1a0) )
+
+	ROM_REGION32_LE( 0x400000, "user1", 0 ) /* Protection Data (encrypted external ARM data) */ // leftover from original game
+	ROM_LOAD( "v100.u23", 0x000000, 0x20000, CRC(06c3dd29) SHA1(20c9479f158467fc2037dcf162b6c6be18c91d46) )
+
+	ROM_REGION( 0xc00000, "tiles", 0 ) /* 8x8 Text Tiles + 32x32 BG Tiles */
+	PGM_VIDEO_BIOS
+	ROM_LOAD( "t04801w064.u19",   0x180000, 0x800000, CRC(6021c79e) SHA1(fbc340dafb18aa3094de29b881318a5a9794e4bc) ) //text-1
+
+	ROM_REGION( 0x1000000, "sprcol", 0 ) /* Sprite Colour Data */
+	ROM_LOAD( "a04801w064.u7",    0x0000000, 0x0800000, CRC(26dd4932) SHA1(9bbabb5a53cb5ba88397cc2c258980f3b70314ce) ) //image-1
+	ROM_LOAD( "a04802w064.u8",    0x0800000, 0x0800000, CRC(0e6bf7a9) SHA1(a7541e2b5a0df2bc62a5b347e54dbc2ed1922db2) ) //image-2
+
+	ROM_REGION( 0x0800000, "sprmask", 0 ) /* Sprite Masks + Colour Indexes */
+	ROM_LOAD( "b04801w064.u1",    0x0000000, 0x0800000, CRC(98dce13a) SHA1(61d48b7117459f7babc022b68231f6928177a71d) ) //bitmap-1
+
+	ROM_REGION( 0x800000, "ics", ROMREGION_ERASE00 ) /* Samples - (8 bit mono 11025Hz) - */
+	PGM_AUDIO_BIOS
+	ROM_LOAD( "w04801b032.u17",    0x400000, 0x400000, CRC(60298536) SHA1(6b7333f16cce778c5725dbdf75a5446f0906397a) ) //music-1
+ROM_END
+
 ROM_START( ddpdoj )
 	ROM_REGION( 0x600000, "maincpu", 0 ) /* 68000 Code */
 	ROM_LOAD16_WORD_SWAP( "ddp3_bios.u37",    0x00000, 0x080000, CRC(b3cc5c8f) SHA1(02d9511cf71e4a0d6ca8fd9a1ef2c79b0d001824) ) // uses a standard PGM bios with the startup logos hacked out
@@ -4596,8 +4624,7 @@ GAME( 2002, ddpdoja,    ddpdoj,      pgm_arm_type1_cave,    pgm, pgm_arm_type1_s
 GAME( 2002, ddpdojb,    ddpdoj,      pgm_arm_type1_cave,    pgm, pgm_arm_type1_state,     ddp3,      ROT270, "Cave (AMI license)", "DoDonPachi Dai-Ou-Jou (2002.04.05 Master Ver)",      MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
 GAME( 2002, ddpdojblk,  ddpdoj,      pgm_arm_type1_cave,    pgm, pgm_arm_type1_state,     ddp3,      ROT270, "Cave (AMI license)", "DoDonPachi Dai-Ou-Jou (2002.10.07.Black Ver)",                MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) // Displays "2002.04.05.Master Ver" (old) or "2002.10.07.Black Ver" (new)
 GAME( 2002, ddpdojblka, ddpdoj,      pgm_arm_type1_cave,    pgm, pgm_arm_type1_state,     ddp3,      ROT270, "Cave (AMI license)", "DoDonPachi Dai-Ou-Jou (2002.10.07 Black Ver)",                MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) // Displays "2002.04.05.Master Ver" (old) or "2002.10.07 Black Ver" (new)
-
-GAME( 2012, ddpdojblkbl, ddpdoj,     pgm_arm_type1,         pgm, pgm_arm_type1_state,    kovsh,      ROT270,   "bootleg", "DoDonPachi Dai-Ou-Jou (2002.10.07 Black Ver., bootleg Knights of Valour Super Heroes conversion)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) // 68k: SANGO EX V100 12/06/99 13:36:04, ARM: China internal ROM
+GAME( 2012, ddpdojblkbl, ddpdoj,     pgm_arm_type1,         pgm, pgm_arm_type1_state,    kovsh,      ROT270, "bootleg",            "DoDonPachi Dai-Ou-Jou (2002.10.07 Black Ver., bootleg Knights of Valour Super Heroes conversion)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) // 68k: SANGO EX V100 12/06/99 13:36:04, ARM: China internal ROM
 
 
 // the exact text of the 'version' shows which revision of the game it is; the newest has 2 '.' symbols in the string, the oldest, none.
@@ -4606,8 +4633,7 @@ GAME( 2002, ket,          0,         pgm_arm_type1_cave,    pgm, pgm_arm_type1_s
 GAME( 2002, ket1,         ket,       pgm_arm_type1_cave,    pgm, pgm_arm_type1_state,     ket,       ROT270, "Cave (AMI license)", "Ketsui: Kizuna Jigoku Tachi (2003/01/01. Master Ver.) (alt rom fill)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
 GAME( 2002, keta,         ket,       pgm_arm_type1_cave,    pgm, pgm_arm_type1_state,     ket,       ROT270, "Cave (AMI license)", "Ketsui: Kizuna Jigoku Tachi (2003/01/01 Master Ver.)",  MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
 GAME( 2002, ketb,         ket,       pgm_arm_type1_cave,    pgm, pgm_arm_type1_state,     ket,       ROT270, "Cave (AMI license)", "Ketsui: Kizuna Jigoku Tachi (2003/01/01 Master Ver)",   MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-
-GAME( 2001, ketbl,        ket,       pgm_arm_type2,         pgm, pgm_arm_type2_state,     ddp2,       ROT270, "bootleg", "Ketsui: Kizuna Jigoku Tachi (2003/01/01. Master Ver., bootleg cartridge conversion)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 2001, ketbl,        ket,       pgm_arm_type2,         pgm, pgm_arm_type2_state,     ddp2,      ROT270, "bootleg",            "Ketsui: Kizuna Jigoku Tachi (2003/01/01. Master Ver., bootleg cartridge conversion)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
 
 
 // these are modern hacks, some of them have been seen on original PCBs, also reportedly on a bootleg PCB with mostly original components but the ARM replaced with a custom chip.
@@ -4630,6 +4656,7 @@ GAME( 2012, ketarrf,    ket,       pgm_arm_type1_cave, pgm,      pgm_arm_type1_s
 
 
 GAME( 2003, espgal,       0,         pgm_arm_type1_cave,    pgm, pgm_arm_type1_state,     espgal,    ROT270, "Cave (AMI license)", "Espgaluda (2003/10/15 Master Ver)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 2001, espgalbl,     espgal,    pgm_arm_type2,         pgm, pgm_arm_type2_state,     ddp2,      ROT270, "bootleg",            "Espgaluda (2003/10/15 Master Ver, bootleg cartridge conversion)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
 
 // protection simulated, but should be correct
 GAME( 1999, puzzli2,      pgm,       pgm_arm_type1_sim,  puzzli2, pgm_arm_type1_state,    puzzli2,    ROT0,   "IGS", "Puzzli 2 (ver. 100)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) // ROM label is V100 ( V0001, 11/22/99 09:27:58 in program ROM )
diff --git a/src/mame/mame.lst b/src/mame/mame.lst
index 4a37aea106b..0288acb4d35 100644
--- a/src/mame/mame.lst
+++ b/src/mame/mame.lst
@@ -29971,6 +29971,7 @@ dw2v100x                        //
 dwex                            // (c) 1998 Dragon World 3 EX
 dwpc                            // (c) 2001 Dragon World Pretty Chance
 espgal                          // (c) 2003 Espgaluda
+espgalbl						//
 happy6                          // (c) 2004 Happy 6
 happy6101                       //
 ket                             // (c) 2002 Ketsui

From 8b490a9fad465b0a517d87337be854278b592bd9 Mon Sep 17 00:00:00 2001
From: dankan1890 <mewuidev2@gmail.com>
Date: Wed, 20 Apr 2016 05:12:40 +0200
Subject: [PATCH 108/122] Forced reset in order to properly apply some options.
 (nw)

---
 src/emu/emuopts.cpp     |  2 +-
 src/emu/ui/inifile.cpp  |  6 ++++++
 src/emu/ui/inifile.h    |  2 +-
 src/emu/ui/miscmenu.cpp |  4 +++-
 src/emu/ui/optsmenu.cpp | 12 ++++++++++++
 src/emu/ui/utils.h      |  2 +-
 6 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/src/emu/emuopts.cpp b/src/emu/emuopts.cpp
index d23a03ac479..451b4a68e2b 100644
--- a/src/emu/emuopts.cpp
+++ b/src/emu/emuopts.cpp
@@ -580,7 +580,7 @@ void emu_options::set_system_name(const char *name)
 	if (*software_name() != 0)
 	{
 		std::string sw_load(software_name());
-		std::string sw_list, sw_name, sw_part, sw_instance, option_errors, error_string;
+		std::string sw_list, sw_name, sw_part, sw_instance, error_string;
 		int left = sw_load.find_first_of(':');
 		int middle = sw_load.find_first_of(':', left + 1);
 		int right = sw_load.find_last_of(':');
diff --git a/src/emu/ui/inifile.cpp b/src/emu/ui/inifile.cpp
index 3324d56363e..1946baaed59 100644
--- a/src/emu/ui/inifile.cpp
+++ b/src/emu/ui/inifile.cpp
@@ -60,6 +60,9 @@ void inifile_manager::directory_scan()
 			}
 		}
 	}
+
+	// sort
+	std::stable_sort(ini_index.begin(), ini_index.end());
 }
 
 //-------------------------------------------------
@@ -85,6 +88,9 @@ void inifile_manager::init_category(std::string &filename)
 		}
 	}
 
+	// sort
+	std::stable_sort(index.begin(), index.end());
+
 	if (!index.empty())
 		ini_index.emplace_back(filename, index);
 }
diff --git a/src/emu/ui/inifile.h b/src/emu/ui/inifile.h
index c16617b25f1..f9e5c096539 100644
--- a/src/emu/ui/inifile.h
+++ b/src/emu/ui/inifile.h
@@ -30,7 +30,7 @@ public:
 	std::string get_file(int file = -1) { return ((file == -1) ? ini_index[c_file].first : ini_index[file].first); }
 	std::string get_category(int cat = -1) { return ((cat == -1) ? ini_index[c_file].second[c_cat].first : ini_index[c_file].second[cat].first); }
 	size_t total() { return ini_index.size(); }
-	size_t cat_total() { return ini_index[c_file].second.size(); }
+	size_t cat_total(int cat = -1) { return ((cat == -1) ? ini_index[c_file].second.size() : ini_index[cat].second.size()); }
 	UINT16 &cur_file() { return c_file; }
 	UINT16 &cur_cat() { return c_cat; }
 
diff --git a/src/emu/ui/miscmenu.cpp b/src/emu/ui/miscmenu.cpp
index 75ffd0a7645..8d4ea6f4f48 100644
--- a/src/emu/ui/miscmenu.cpp
+++ b/src/emu/ui/miscmenu.cpp
@@ -773,12 +773,14 @@ void ui_menu_machine_configure::handle()
 void ui_menu_machine_configure::populate()
 {
 	// add options items
+	item_append(_("Bios"), nullptr, MENU_FLAG_DISABLE | MENU_FLAG_UI_HEADING, nullptr);
 	if (!m_bios.empty())
 	{
-		item_append(_("Bios"), nullptr, MENU_FLAG_DISABLE | MENU_FLAG_UI_HEADING, nullptr);
 		UINT32 arrows = get_arrow_flags(0, m_bios.size() - 1, m_curbios);
 		item_append(_("Driver"), m_bios[m_curbios].first.c_str(), arrows, (void *)(FPTR)BIOS);
 	}
+	else
+		item_append(_("This machine has no bios."), nullptr, MENU_FLAG_DISABLE, nullptr);
 
 	item_append(ui_menu_item_type::SEPARATOR);
 	item_append(_(advanced_submenu_options[0].description), nullptr, 0, (void *)(FPTR)ADVANCED);
diff --git a/src/emu/ui/optsmenu.cpp b/src/emu/ui/optsmenu.cpp
index ffe9d2fddd3..ce84df18f67 100644
--- a/src/emu/ui/optsmenu.cpp
+++ b/src/emu/ui/optsmenu.cpp
@@ -161,15 +161,24 @@ void ui_menu_game_options::handle()
 				break;
 			case MISC_MENU:
 				if (m_event->iptkey == IPT_UI_SELECT)
+				{
 					ui_menu::stack_push(global_alloc_clear<ui_submenu>(machine(), container, misc_submenu_options));
+					ui_globals::reset = true;
+				}
 				break;
 			case SOUND_MENU:
 				if (m_event->iptkey == IPT_UI_SELECT)
+				{
 					ui_menu::stack_push(global_alloc_clear<ui_menu_sound_options>(machine(), container));
+					ui_globals::reset = true;
+				}
 				break;
 			case DISPLAY_MENU:
 				if (m_event->iptkey == IPT_UI_SELECT)
+				{
 					ui_menu::stack_push(global_alloc_clear<ui_submenu>(machine(), container, video_submenu_options));
+					ui_globals::reset = true;
+				}
 				break;
 			case CUSTOM_MENU:
 				if (m_event->iptkey == IPT_UI_SELECT)
@@ -189,7 +198,10 @@ void ui_menu_game_options::handle()
 				break;
 			case ADVANCED_MENU:
 				if (m_event->iptkey == IPT_UI_SELECT)
+				{
 					ui_menu::stack_push(global_alloc_clear<ui_submenu>(machine(), container, advanced_submenu_options));
+					ui_globals::reset = true;
+				}
 				break;
 			case SAVE_CONFIG:
 				if (m_event->iptkey == IPT_UI_SELECT)
diff --git a/src/emu/ui/utils.h b/src/emu/ui/utils.h
index 519f74e667b..0e2ff2354b3 100644
--- a/src/emu/ui/utils.h
+++ b/src/emu/ui/utils.h
@@ -159,7 +159,7 @@ struct ui_software_info
 	std::string publisher;
 	UINT8 supported = 0;
 	std::string part;
-	const game_driver *driver;
+	const game_driver *driver = nullptr;
 	std::string listname;
 	std::string interface;
 	std::string instance;

From 8a85bc7cea100a46b5e615d450c8b46efd9abf95 Mon Sep 17 00:00:00 2001
From: briantro <briantro@users.noreply.github.com>
Date: Tue, 19 Apr 2016 22:53:01 -0500
Subject: [PATCH 109/122] crospang.cpp: Bestri Parent / Clone fix - NW

---
 src/mame/drivers/crospang.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/mame/drivers/crospang.cpp b/src/mame/drivers/crospang.cpp
index fcac0964fda..40f839628a3 100644
--- a/src/mame/drivers/crospang.cpp
+++ b/src/mame/drivers/crospang.cpp
@@ -626,7 +626,7 @@ DRIVER_INIT_MEMBER(crospang_state,crospang)
 	tumblepb_gfx1_rearrange();
 }
 
-GAME( 1998, crospang, 0, crospang, crospang, crospang_state, crospang, ROT0, "F2 System", "Cross Pang", MACHINE_SUPPORTS_SAVE )
-GAME( 199?, heuksun,  0, crospang, heuksun, crospang_state,  crospang, ROT0, "Oksan / F2 System", "Heuk Sun Baek Sa (Korea)", MACHINE_SUPPORTS_SAVE )
-GAME( 1998, bestri,   0, bestri,   bestri, crospang_state,   crospang, ROT0, "F2 System", "Bestri (Korea, set 1)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
-GAME( 1998, bestria,  0, bestria,  bestri, crospang_state,   crospang, ROT0, "F2 System", "Bestri (Korea, set 2)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1998, crospang,        0, crospang, crospang, crospang_state, crospang, ROT0, "F2 System",         "Cross Pang", MACHINE_SUPPORTS_SAVE )
+GAME( 199?, heuksun,         0, crospang,  heuksun, crospang_state, crospang, ROT0, "Oksan / F2 System", "Heuk Sun Baek Sa (Korea)", MACHINE_SUPPORTS_SAVE )
+GAME( 1998, bestri,          0,   bestri,   bestri, crospang_state, crospang, ROT0, "F2 System",         "Bestri (Korea, set 1)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1998, bestria,    bestri,  bestria,   bestri, crospang_state, crospang, ROT0, "F2 System",         "Bestri (Korea, set 2)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )

From 913b19ea0a04713b8dee60221521d041d6a26169 Mon Sep 17 00:00:00 2001
From: Ivan Vangelista <mesgnet@yahoo.it>
Date: Wed, 20 Apr 2016 09:22:26 +0200
Subject: [PATCH 110/122] vicdual.cpp: fixed MT06181 (nw)

---
 src/mame/drivers/vicdual.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/mame/drivers/vicdual.cpp b/src/mame/drivers/vicdual.cpp
index 66b9577f1eb..f9dc1eae0f9 100644
--- a/src/mame/drivers/vicdual.cpp
+++ b/src/mame/drivers/vicdual.cpp
@@ -35,7 +35,7 @@
           switch between them.
         * There existed a vertical version of Head On as well.
         * According to the manuals, Borderline has the same sound
-          board as Tranquilizer Gun.
+          board as Tranquillizer Gun.
 
     Known issues/to-do's:
         * Analog sound missing in many games
@@ -3627,7 +3627,7 @@ GAME( 1980, samurai,    0,        samurai,   samurai,   driver_device, 0, ROT270
 GAME( 1979, invinco,    0,        invinco,   invinco,   driver_device, 0, ROT270, "Sega", "Invinco", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
 GAME( 1979, invds,      0,        invds,     invds,     driver_device, 0, ROT270, "Sega", "Invinco / Deep Scan", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
 GAME( 1979, carhntds,   0,        carhntds,  carhntds,  driver_device, 0, ROT270, "Sega", "Car Hunt / Deep Scan (France)", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1980, tranqgun,   0,        tranqgun,  tranqgun,  driver_device, 0, ROT270, "Sega", "Tranquilizer Gun", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1980, tranqgun,   0,        tranqgun,  tranqgun,  driver_device, 0, ROT270, "Sega", "Tranquillizer Gun", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
 GAME( 1980, spacetrk,   0,        spacetrk,  spacetrk,  driver_device, 0, ROT270, "Sega", "Space Trek (upright)", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
 GAME( 1980, spacetrkc,  spacetrk, spacetrk,  spacetrkc, driver_device, 0, ROT270, "Sega", "Space Trek (cocktail)", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
 GAME( 1980, carnival,   0,        carnival,  carnival,  driver_device, 0, ROT270, "Sega", "Carnival (upright)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
@@ -3638,7 +3638,7 @@ GAME( 1981, brdrline,   0,        brdrline,  brdrline,  driver_device, 0, ROT270
 GAME( 1981, starrkr,    brdrline, brdrline,  starrkr,   driver_device, 0, ROT270, "Sega", "Star Raker", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
 GAME( 1981, brdrlins,   brdrline, brdrline,  brdrline,  driver_device, 0, ROT270, "bootleg (Sidam)", "Borderline (Sidam bootleg)", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
 GAME( 1981, brdrlinb,   brdrline, brdrline,  brdrline,  driver_device, 0, ROT270, "bootleg (Karateco)", "Borderline (Karateco bootleg)", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1981, brdrlinet,  brdrline, tranqgun,  tranqgun,  driver_device, 0, ROT270, "Sega", "Borderline (Tranquilizer Gun conversion)", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE ) // official factory conversion
+GAME( 1981, brdrlinet,  brdrline, tranqgun,  tranqgun,  driver_device, 0, ROT270, "Sega", "Borderline (Tranquillizer Gun conversion)", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE ) // official factory conversion
 GAME( 198?, startrks,   0,        headons,   headons,   driver_device, 0, ROT0,   "bootleg (Sidam)", "Star Trek (Head On hardware)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
 GAME( 1980, digger,     0,        digger,    digger,    driver_device, 0, ROT270, "Sega", "Digger", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
 GAME( 1981, pulsar,     0,        pulsar,    pulsar,    driver_device, 0, ROT270, "Sega", "Pulsar", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )

From 8318d85597ec51a31a8106f2692de8e9d4d7e136 Mon Sep 17 00:00:00 2001
From: Miodrag Milanovic <mmicko@gmail.com>
Date: Wed, 20 Apr 2016 09:50:13 +0200
Subject: [PATCH 111/122] Isolate CLI part (nw)

---
 scripts/src/emu.lua                   |  2 -
 src/emu/clifront.cpp                  | 82 +++++++++++++++++++++++++--
 src/emu/clifront.h                    |  6 +-
 src/emu/cliopts.cpp                   | 63 --------------------
 src/emu/cliopts.h                     | 67 ----------------------
 src/emu/ui/custui.cpp                 |  1 +
 src/emu/ui/dirmenu.cpp                |  1 +
 src/osd/modules/lib/osdobj_common.cpp |  2 +-
 src/osd/modules/lib/osdobj_common.h   |  4 +-
 src/osd/osdepend.h                    |  1 -
 10 files changed, 86 insertions(+), 143 deletions(-)
 delete mode 100644 src/emu/cliopts.cpp
 delete mode 100644 src/emu/cliopts.h

diff --git a/scripts/src/emu.lua b/scripts/src/emu.lua
index 61563970d1b..b0dc5eee8d6 100644
--- a/scripts/src/emu.lua
+++ b/scripts/src/emu.lua
@@ -67,8 +67,6 @@ files {
 	MAME_DIR .. "src/emu/cheat.h",
 	MAME_DIR .. "src/emu/clifront.cpp",
 	MAME_DIR .. "src/emu/clifront.h",
-	MAME_DIR .. "src/emu/cliopts.cpp",
-	MAME_DIR .. "src/emu/cliopts.h",
 	MAME_DIR .. "src/emu/config.cpp",
 	MAME_DIR .. "src/emu/config.h",
 	MAME_DIR .. "src/emu/crsshair.cpp",
diff --git a/src/emu/clifront.cpp b/src/emu/clifront.cpp
index 20fff1557b4..835573f2f41 100644
--- a/src/emu/clifront.cpp
+++ b/src/emu/clifront.cpp
@@ -17,7 +17,6 @@
 #include "unzip.h"
 #include "validity.h"
 #include "sound/samples.h"
-#include "cliopts.h"
 #include "clifront.h"
 #include "xmlfile.h"
 
@@ -32,6 +31,80 @@
 #include <ctype.h>
 
 
+//**************************************************************************
+//  CONSTANTS
+//**************************************************************************
+
+// core commands
+#define CLICOMMAND_HELP                 "help"
+#define CLICOMMAND_VALIDATE             "validate"
+
+// configuration commands
+#define CLICOMMAND_CREATECONFIG         "createconfig"
+#define CLICOMMAND_SHOWCONFIG           "showconfig"
+#define CLICOMMAND_SHOWUSAGE            "showusage"
+
+// frontend commands
+#define CLICOMMAND_LISTXML              "listxml"
+#define CLICOMMAND_LISTFULL             "listfull"
+#define CLICOMMAND_LISTSOURCE           "listsource"
+#define CLICOMMAND_LISTCLONES           "listclones"
+#define CLICOMMAND_LISTBROTHERS         "listbrothers"
+#define CLICOMMAND_LISTCRC              "listcrc"
+#define CLICOMMAND_LISTROMS             "listroms"
+#define CLICOMMAND_LISTSAMPLES          "listsamples"
+#define CLICOMMAND_VERIFYROMS           "verifyroms"
+#define CLICOMMAND_VERIFYSAMPLES        "verifysamples"
+#define CLICOMMAND_ROMIDENT             "romident"
+#define CLICOMMAND_LISTDEVICES          "listdevices"
+#define CLICOMMAND_LISTSLOTS            "listslots"
+#define CLICOMMAND_LISTMEDIA            "listmedia"     // needed by MESS
+#define CLICOMMAND_LISTSOFTWARE         "listsoftware"
+#define CLICOMMAND_VERIFYSOFTWARE       "verifysoftware"
+#define CLICOMMAND_GETSOFTLIST          "getsoftlist"
+#define CLICOMMAND_VERIFYSOFTLIST       "verifysoftlist"
+
+
+//**************************************************************************
+//  COMMAND-LINE OPTIONS
+//**************************************************************************
+
+static const options_entry cli_option_entries[] =
+{
+	/* core commands */
+	{ nullptr,                            nullptr,       OPTION_HEADER,     "CORE COMMANDS" },
+	{ CLICOMMAND_HELP ";h;?",           "0",       OPTION_COMMAND,    "show help message" },
+	{ CLICOMMAND_VALIDATE ";valid",     "0",       OPTION_COMMAND,    "perform driver validation on all game drivers" },
+
+	/* configuration commands */
+	{ nullptr,                            nullptr,       OPTION_HEADER,     "CONFIGURATION COMMANDS" },
+	{ CLICOMMAND_CREATECONFIG ";cc",    "0",       OPTION_COMMAND,    "create the default configuration file" },
+	{ CLICOMMAND_SHOWCONFIG ";sc",      "0",       OPTION_COMMAND,    "display running parameters" },
+	{ CLICOMMAND_SHOWUSAGE ";su",       "0",       OPTION_COMMAND,    "show this help" },
+
+	/* frontend commands */
+	{ nullptr,                            nullptr,       OPTION_HEADER,     "FRONTEND COMMANDS" },
+	{ CLICOMMAND_LISTXML ";lx",         "0",       OPTION_COMMAND,    "all available info on driver in XML format" },
+	{ CLICOMMAND_LISTFULL ";ll",        "0",       OPTION_COMMAND,    "short name, full name" },
+	{ CLICOMMAND_LISTSOURCE ";ls",      "0",       OPTION_COMMAND,    "driver sourcefile" },
+	{ CLICOMMAND_LISTCLONES ";lc",      "0",       OPTION_COMMAND,    "show clones" },
+	{ CLICOMMAND_LISTBROTHERS ";lb",    "0",       OPTION_COMMAND,    "show \"brothers\", or other drivers from same sourcefile" },
+	{ CLICOMMAND_LISTCRC,               "0",       OPTION_COMMAND,    "CRC-32s" },
+	{ CLICOMMAND_LISTROMS ";lr",        "0",       OPTION_COMMAND,    "list required roms for a driver" },
+	{ CLICOMMAND_LISTSAMPLES,           "0",       OPTION_COMMAND,    "list optional samples for a driver" },
+	{ CLICOMMAND_VERIFYROMS,            "0",       OPTION_COMMAND,    "report romsets that have problems" },
+	{ CLICOMMAND_VERIFYSAMPLES,         "0",       OPTION_COMMAND,    "report samplesets that have problems" },
+	{ CLICOMMAND_ROMIDENT,              "0",       OPTION_COMMAND,    "compare files with known MAME roms" },
+	{ CLICOMMAND_LISTDEVICES ";ld",     "0",       OPTION_COMMAND,    "list available devices" },
+	{ CLICOMMAND_LISTSLOTS ";lslot",    "0",       OPTION_COMMAND,    "list available slots and slot devices" },
+	{ CLICOMMAND_LISTMEDIA ";lm",       "0",       OPTION_COMMAND,    "list available media for the system" },
+	{ CLICOMMAND_LISTSOFTWARE ";lsoft", "0",       OPTION_COMMAND,    "list known software for the system" },
+	{ CLICOMMAND_VERIFYSOFTWARE ";vsoft", "0",     OPTION_COMMAND,    "verify known software for the system" },
+	{ CLICOMMAND_GETSOFTLIST ";glist",  "0",       OPTION_COMMAND,    "retrieve software list by name" },
+	{ CLICOMMAND_VERIFYSOFTLIST ";vlist", "0",     OPTION_COMMAND,    "verify software list by name" },
+	{ nullptr }
+};
+
 
 // media_identifier class identifies media by hash via a search in
 // the driver database
@@ -39,7 +112,7 @@ class media_identifier
 {
 public:
 	// construction/destruction
-	media_identifier(cli_options &options);
+	media_identifier(emu_options &options);
 
 	// getters
 	int total() const { return m_total; }
@@ -70,11 +143,12 @@ private:
 //  cli_frontend - constructor
 //-------------------------------------------------
 
-cli_frontend::cli_frontend(cli_options &options, osd_interface &osd)
+cli_frontend::cli_frontend(emu_options &options, osd_interface &osd)
 	: m_options(options),
 		m_osd(osd),
 		m_result(MAMERR_NONE)
 {
+	m_options.add_entries(cli_option_entries);
 }
 
 
@@ -1727,7 +1801,7 @@ void cli_frontend::display_suggestions(const char *gamename)
 //  media_identifier - constructor
 //-------------------------------------------------
 
-media_identifier::media_identifier(cli_options &options)
+media_identifier::media_identifier(emu_options &options)
 	: m_drivlist(options),
 		m_total(0),
 		m_matches(0),
diff --git a/src/emu/clifront.h b/src/emu/clifront.h
index b38a6361b18..2a7da7fcb78 100644
--- a/src/emu/clifront.h
+++ b/src/emu/clifront.h
@@ -14,7 +14,7 @@
 #define __CLIFRONT_H__
 
 #include "emu.h"
-#include "cliopts.h"
+#include "emuopts.h"
 
 // don't include osd_interface in header files
 class osd_interface;
@@ -29,7 +29,7 @@ class cli_frontend
 {
 public:
 	// construction/destruction
-	cli_frontend(cli_options &options, osd_interface &osd);
+	cli_frontend(emu_options &options, osd_interface &osd);
 	~cli_frontend();
 
 	// execute based on the incoming argc/argv
@@ -64,7 +64,7 @@ private:
 	void output_single_softlist(FILE *out, software_list_device &swlist);
 
 	// internal state
-	cli_options &       m_options;
+	emu_options &       m_options;
 	osd_interface &     m_osd;
 	int                 m_result;
 };
diff --git a/src/emu/cliopts.cpp b/src/emu/cliopts.cpp
deleted file mode 100644
index 48df5cf00d9..00000000000
--- a/src/emu/cliopts.cpp
+++ /dev/null
@@ -1,63 +0,0 @@
-// license:BSD-3-Clause
-// copyright-holders:Aaron Giles
-/***************************************************************************
-
-    cliopts.c
-
-***************************************************************************/
-
-#include "cliopts.h"
-
-//**************************************************************************
-//  COMMAND-LINE OPTIONS
-//**************************************************************************
-
-const options_entry cli_options::s_option_entries[] =
-{
-	/* core commands */
-	{ nullptr,                            nullptr,       OPTION_HEADER,     "CORE COMMANDS" },
-	{ CLICOMMAND_HELP ";h;?",           "0",       OPTION_COMMAND,    "show help message" },
-	{ CLICOMMAND_VALIDATE ";valid",     "0",       OPTION_COMMAND,    "perform driver validation on all game drivers" },
-
-	/* configuration commands */
-	{ nullptr,                            nullptr,       OPTION_HEADER,     "CONFIGURATION COMMANDS" },
-	{ CLICOMMAND_CREATECONFIG ";cc",    "0",       OPTION_COMMAND,    "create the default configuration file" },
-	{ CLICOMMAND_SHOWCONFIG ";sc",      "0",       OPTION_COMMAND,    "display running parameters" },
-	{ CLICOMMAND_SHOWUSAGE ";su",       "0",       OPTION_COMMAND,    "show this help" },
-
-	/* frontend commands */
-	{ nullptr,                            nullptr,       OPTION_HEADER,     "FRONTEND COMMANDS" },
-	{ CLICOMMAND_LISTXML ";lx",         "0",       OPTION_COMMAND,    "all available info on driver in XML format" },
-	{ CLICOMMAND_LISTFULL ";ll",        "0",       OPTION_COMMAND,    "short name, full name" },
-	{ CLICOMMAND_LISTSOURCE ";ls",      "0",       OPTION_COMMAND,    "driver sourcefile" },
-	{ CLICOMMAND_LISTCLONES ";lc",      "0",       OPTION_COMMAND,    "show clones" },
-	{ CLICOMMAND_LISTBROTHERS ";lb",    "0",       OPTION_COMMAND,    "show \"brothers\", or other drivers from same sourcefile" },
-	{ CLICOMMAND_LISTCRC,               "0",       OPTION_COMMAND,    "CRC-32s" },
-	{ CLICOMMAND_LISTROMS ";lr",        "0",       OPTION_COMMAND,    "list required roms for a driver" },
-	{ CLICOMMAND_LISTSAMPLES,           "0",       OPTION_COMMAND,    "list optional samples for a driver" },
-	{ CLICOMMAND_VERIFYROMS,            "0",       OPTION_COMMAND,    "report romsets that have problems" },
-	{ CLICOMMAND_VERIFYSAMPLES,         "0",       OPTION_COMMAND,    "report samplesets that have problems" },
-	{ CLICOMMAND_ROMIDENT,              "0",       OPTION_COMMAND,    "compare files with known MAME roms" },
-	{ CLICOMMAND_LISTDEVICES ";ld",     "0",       OPTION_COMMAND,    "list available devices" },
-	{ CLICOMMAND_LISTSLOTS ";lslot",    "0",       OPTION_COMMAND,    "list available slots and slot devices" },
-	{ CLICOMMAND_LISTMEDIA ";lm",       "0",       OPTION_COMMAND,    "list available media for the system" },
-	{ CLICOMMAND_LISTSOFTWARE ";lsoft", "0",       OPTION_COMMAND,    "list known software for the system" },
-	{ CLICOMMAND_VERIFYSOFTWARE ";vsoft", "0",     OPTION_COMMAND,    "verify known software for the system" },
-	{ CLICOMMAND_GETSOFTLIST ";glist",  "0",       OPTION_COMMAND,    "retrieve software list by name" },
-	{ CLICOMMAND_VERIFYSOFTLIST ";vlist", "0",     OPTION_COMMAND,    "verify software list by name" },
-	{ nullptr }
-};
-
-//**************************************************************************
-//  CLI OPTIONS
-//**************************************************************************
-
-//-------------------------------------------------
-//  cli_options - constructor
-//-------------------------------------------------
-
-cli_options::cli_options()
-: emu_options()
-{
-	add_entries(cli_options::s_option_entries);
-}
diff --git a/src/emu/cliopts.h b/src/emu/cliopts.h
deleted file mode 100644
index d7a0a938d49..00000000000
--- a/src/emu/cliopts.h
+++ /dev/null
@@ -1,67 +0,0 @@
-// license:BSD-3-Clause
-// copyright-holders:Aaron Giles
-/***************************************************************************
-
-    cliopts.h
-
-    Command-line interface frontend for MAME.
-
-***************************************************************************/
-
-#pragma once
-
-#ifndef __CLIOPTS_H__
-#define __CLIOPTS_H__
-
-#include "emuopts.h"
-
-//**************************************************************************
-//  CONSTANTS
-//**************************************************************************
-
-// core commands
-#define CLICOMMAND_HELP                 "help"
-#define CLICOMMAND_VALIDATE             "validate"
-
-// configuration commands
-#define CLICOMMAND_CREATECONFIG         "createconfig"
-#define CLICOMMAND_SHOWCONFIG           "showconfig"
-#define CLICOMMAND_SHOWUSAGE            "showusage"
-
-// frontend commands
-#define CLICOMMAND_LISTXML              "listxml"
-#define CLICOMMAND_LISTFULL             "listfull"
-#define CLICOMMAND_LISTSOURCE           "listsource"
-#define CLICOMMAND_LISTCLONES           "listclones"
-#define CLICOMMAND_LISTBROTHERS         "listbrothers"
-#define CLICOMMAND_LISTCRC              "listcrc"
-#define CLICOMMAND_LISTROMS             "listroms"
-#define CLICOMMAND_LISTSAMPLES          "listsamples"
-#define CLICOMMAND_VERIFYROMS           "verifyroms"
-#define CLICOMMAND_VERIFYSAMPLES        "verifysamples"
-#define CLICOMMAND_ROMIDENT             "romident"
-#define CLICOMMAND_LISTDEVICES          "listdevices"
-#define CLICOMMAND_LISTSLOTS            "listslots"
-#define CLICOMMAND_LISTMEDIA            "listmedia"     // needed by MESS
-#define CLICOMMAND_LISTSOFTWARE         "listsoftware"
-#define CLICOMMAND_VERIFYSOFTWARE       "verifysoftware"
-#define CLICOMMAND_GETSOFTLIST          "getsoftlist"
-#define CLICOMMAND_VERIFYSOFTLIST       "verifysoftlist"
-
-
-//**************************************************************************
-//  TYPE DEFINITIONS
-//**************************************************************************
-
-// cli_options wraps the general emu options with CLI-specific additions
-class cli_options : public emu_options
-{
-public:
-	// construction/destruction
-	cli_options();
-
-private:
-	static const options_entry s_option_entries[];
-};
-
-#endif  /* __CLIFRONT_H__ */
diff --git a/src/emu/ui/custui.cpp b/src/emu/ui/custui.cpp
index 9b8c81a2de4..f2e86eeeca1 100644
--- a/src/emu/ui/custui.cpp
+++ b/src/emu/ui/custui.cpp
@@ -9,6 +9,7 @@
 *********************************************************************/
 
 #include "emu.h"
+#include "emuopts.h"
 #include "ui/custui.h"
 
 #include "ui/ui.h"
diff --git a/src/emu/ui/dirmenu.cpp b/src/emu/ui/dirmenu.cpp
index e4a9b693a1c..b84cacc8d62 100644
--- a/src/emu/ui/dirmenu.cpp
+++ b/src/emu/ui/dirmenu.cpp
@@ -9,6 +9,7 @@
 *********************************************************************/
 
 #include "emu.h"
+#include "emuopts.h"
 #include "ui/ui.h"
 #include "ui/menu.h"
 #include "ui/dirmenu.h"
diff --git a/src/osd/modules/lib/osdobj_common.cpp b/src/osd/modules/lib/osdobj_common.cpp
index b6114acb98c..099c5fefb77 100644
--- a/src/osd/modules/lib/osdobj_common.cpp
+++ b/src/osd/modules/lib/osdobj_common.cpp
@@ -154,7 +154,7 @@ const options_entry osd_options::s_option_entries[] =
 };
 
 osd_options::osd_options()
-: cli_options()
+: emu_options()
 {
 	add_entries(osd_options::s_option_entries);
 }
diff --git a/src/osd/modules/lib/osdobj_common.h b/src/osd/modules/lib/osdobj_common.h
index 0d86d412cf9..46049d74fe9 100644
--- a/src/osd/modules/lib/osdobj_common.h
+++ b/src/osd/modules/lib/osdobj_common.h
@@ -23,7 +23,7 @@
 #include "modules/netdev/netdev_module.h"
 #include "modules/midi/midi_module.h"
 #include "modules/output/output_module.h"
-#include "cliopts.h"
+#include "emuopts.h"
 
 class ui_menu_item;
 
@@ -90,7 +90,7 @@ class ui_menu_item;
 //  TYPE DEFINITIONS
 //============================================================
 
-class osd_options : public cli_options
+class osd_options : public emu_options
 {
 public:
 	// construction/destruction
diff --git a/src/osd/osdepend.h b/src/osd/osdepend.h
index e305aeb958f..0b96cbb1fcc 100644
--- a/src/osd/osdepend.h
+++ b/src/osd/osdepend.h
@@ -16,7 +16,6 @@
 #include "emucore.h"
 #include "osdcore.h"
 #include "unicode.h"
-#include "cliopts.h"
 #include "ui/menu.h"
 
 #include <memory>

From a314888cf6e3b169ddee2a8fb42a4da3a5de0f37 Mon Sep 17 00:00:00 2001
From: Miodrag Milanovic <mmicko@gmail.com>
Date: Wed, 20 Apr 2016 10:21:27 +0200
Subject: [PATCH 112/122] SDL cleanup (nw)

---
 src/osd/modules/input/input_sdlcommon.h |  1 -
 src/osd/sdl/osdsdl.h                    | 15 ---------------
 src/osd/sdl/sdlmain.cpp                 | 16 +++++-----------
 src/osd/sdl/window.cpp                  | 15 ---------------
 src/osd/sdl/window.h                    |  5 -----
 5 files changed, 5 insertions(+), 47 deletions(-)

diff --git a/src/osd/modules/input/input_sdlcommon.h b/src/osd/modules/input/input_sdlcommon.h
index 458b90be7ba..feecf23f975 100644
--- a/src/osd/modules/input/input_sdlcommon.h
+++ b/src/osd/modules/input/input_sdlcommon.h
@@ -113,7 +113,6 @@ public:
 
 class sdl_window_info;
 
-// REVIEW: Do we need to handle SDLMAME_EVENTS_IN_WORKER_THREAD eventually?
 class sdl_event_manager : public event_manager_t<sdl_event_subscriber>
 {
 private:
diff --git a/src/osd/sdl/osdsdl.h b/src/osd/sdl/osdsdl.h
index d7d4a1a4a3c..c45c807efd5 100644
--- a/src/osd/sdl/osdsdl.h
+++ b/src/osd/sdl/osdsdl.h
@@ -7,21 +7,6 @@
 #include "modules/osdmodule.h"
 #include "modules/font/font_module.h"
 
-//============================================================
-//  System dependent defines
-//============================================================
-
-
-#if defined(SDLMAME_WIN32)
-		#define SDLMAME_EVENTS_IN_WORKER_THREAD (0)
-		#define SDLMAME_INIT_IN_WORKER_THREAD   (0)
-		#define SDL13_COMBINE_RESIZE (0) //(1) no longer needed
-#else
-	#define SDLMAME_EVENTS_IN_WORKER_THREAD (0)
-	#define SDLMAME_INIT_IN_WORKER_THREAD   (0)
-	#define SDL13_COMBINE_RESIZE (0)
-#endif
-
 //============================================================
 //  Defines
 //============================================================
diff --git a/src/osd/sdl/sdlmain.cpp b/src/osd/sdl/sdlmain.cpp
index 8f0bc4c5950..218c4bd89d4 100644
--- a/src/osd/sdl/sdlmain.cpp
+++ b/src/osd/sdl/sdlmain.cpp
@@ -274,10 +274,7 @@ void sdl_osd_interface::osd_exit()
 {
 	osd_common_t::osd_exit();
 
-	if (!SDLMAME_INIT_IN_WORKER_THREAD)
-	{
-		SDL_QuitSubSystem(SDL_INIT_VIDEO | SDL_INIT_JOYSTICK | SDL_INIT_GAMECONTROLLER );
-	}
+	SDL_QuitSubSystem(SDL_INIT_VIDEO);
 }
 
 //============================================================
@@ -491,14 +488,11 @@ void sdl_osd_interface::init(running_machine &machine)
 
 	/* Initialize SDL */
 
-	if (!SDLMAME_INIT_IN_WORKER_THREAD)
-	{
-		if (SDL_InitSubSystem(SDL_INIT_VIDEO)) {
-			osd_printf_error("Could not initialize SDL %s\n", SDL_GetError());
-			exit(-1);
-		}
-		osd_sdl_info();
+	if (SDL_InitSubSystem(SDL_INIT_VIDEO)) {
+		osd_printf_error("Could not initialize SDL %s\n", SDL_GetError());
+		exit(-1);
 	}
+	osd_sdl_info();
 
 	defines_verbose();
 
diff --git a/src/osd/sdl/window.cpp b/src/osd/sdl/window.cpp
index 0924bb5bb19..ea3843515f7 100644
--- a/src/osd/sdl/window.cpp
+++ b/src/osd/sdl/window.cpp
@@ -181,15 +181,6 @@ static inline void execute_async_wait(osd_work_callback callback, const worker_p
 static OSDWORK_CALLBACK(sdlwindow_thread_id)
 {
 	window_threadid = SDL_ThreadID();
-
-	if (SDLMAME_INIT_IN_WORKER_THREAD)
-	{
-		if (SDL_InitSubSystem(SDL_INIT_VIDEO))
-		{
-			osd_printf_error("Could not initialize SDL: %s.\n", SDL_GetError());
-			exit(-1);
-		}
-	}
 	return nullptr;
 }
 
@@ -310,9 +301,6 @@ void sdl_osd_interface::build_slider_list()
 
 static OSDWORK_CALLBACK( sdlwindow_exit_wt )
 {
-	if (SDLMAME_INIT_IN_WORKER_THREAD)
-		SDL_Quit();
-
 	if (param)
 		osd_free(param);
 	return nullptr;
@@ -1357,9 +1345,6 @@ sdl_window_info::sdl_window_info(running_machine &a_machine, int index, osd_moni
 		const osd_window_config *config)
 : osd_window(), m_next(NULL),
 	// Following three are used by input code to defer resizes
-	m_resize_width(0),
-	m_resize_height(0),
-	m_last_resize(0),
 	m_minimum_dim(0,0),
 	m_windowed_dim(0,0),
 	m_rendered_event(0, 1), m_target(0),
diff --git a/src/osd/sdl/window.h b/src/osd/sdl/window.h
index 0a8abf24c10..14ee6e3c19a 100644
--- a/src/osd/sdl/window.h
+++ b/src/osd/sdl/window.h
@@ -70,11 +70,6 @@ public:
 	// Pointer to next window
 	sdl_window_info *   m_next;
 
-	// These are used in combine resizing events ... #if SDL13_COMBINE_RESIZE
-	int                 m_resize_width;
-	int                 m_resize_height;
-	osd_ticks_t         m_last_resize;
-
 private:
 	// window handle and info
 	char                m_title[256];

From 77e135970ff86e482d009c50efe97c10260804ec Mon Sep 17 00:00:00 2001
From: hap <happppp@users.noreply.github.com>
Date: Wed, 20 Apr 2016 10:44:04 +0200
Subject: [PATCH 113/122] wrong year (but i reckon they were made much later
 than this)

---
 src/mame/drivers/pgm.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/mame/drivers/pgm.cpp b/src/mame/drivers/pgm.cpp
index 11bcf369b83..4dde7e27485 100644
--- a/src/mame/drivers/pgm.cpp
+++ b/src/mame/drivers/pgm.cpp
@@ -4633,7 +4633,7 @@ GAME( 2002, ket,          0,         pgm_arm_type1_cave,    pgm, pgm_arm_type1_s
 GAME( 2002, ket1,         ket,       pgm_arm_type1_cave,    pgm, pgm_arm_type1_state,     ket,       ROT270, "Cave (AMI license)", "Ketsui: Kizuna Jigoku Tachi (2003/01/01. Master Ver.) (alt rom fill)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
 GAME( 2002, keta,         ket,       pgm_arm_type1_cave,    pgm, pgm_arm_type1_state,     ket,       ROT270, "Cave (AMI license)", "Ketsui: Kizuna Jigoku Tachi (2003/01/01 Master Ver.)",  MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
 GAME( 2002, ketb,         ket,       pgm_arm_type1_cave,    pgm, pgm_arm_type1_state,     ket,       ROT270, "Cave (AMI license)", "Ketsui: Kizuna Jigoku Tachi (2003/01/01 Master Ver)",   MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 2001, ketbl,        ket,       pgm_arm_type2,         pgm, pgm_arm_type2_state,     ddp2,      ROT270, "bootleg",            "Ketsui: Kizuna Jigoku Tachi (2003/01/01. Master Ver., bootleg cartridge conversion)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 2002, ketbl,        ket,       pgm_arm_type2,         pgm, pgm_arm_type2_state,     ddp2,      ROT270, "bootleg",            "Ketsui: Kizuna Jigoku Tachi (2003/01/01. Master Ver., bootleg cartridge conversion)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
 
 
 // these are modern hacks, some of them have been seen on original PCBs, also reportedly on a bootleg PCB with mostly original components but the ARM replaced with a custom chip.
@@ -4656,13 +4656,13 @@ GAME( 2012, ketarrf,    ket,       pgm_arm_type1_cave, pgm,      pgm_arm_type1_s
 
 
 GAME( 2003, espgal,       0,         pgm_arm_type1_cave,    pgm, pgm_arm_type1_state,     espgal,    ROT270, "Cave (AMI license)", "Espgaluda (2003/10/15 Master Ver)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 2001, espgalbl,     espgal,    pgm_arm_type2,         pgm, pgm_arm_type2_state,     ddp2,      ROT270, "bootleg",            "Espgaluda (2003/10/15 Master Ver, bootleg cartridge conversion)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 2003, espgalbl,     espgal,    pgm_arm_type2,         pgm, pgm_arm_type2_state,     ddp2,      ROT270, "bootleg",            "Espgaluda (2003/10/15 Master Ver, bootleg cartridge conversion)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
 
 // protection simulated, but should be correct
 GAME( 1999, puzzli2,      pgm,       pgm_arm_type1_sim,  puzzli2, pgm_arm_type1_state,    puzzli2,    ROT0,   "IGS", "Puzzli 2 (ver. 100)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) // ROM label is V100 ( V0001, 11/22/99 09:27:58 in program ROM )
 GAME( 2001, puzzli2s,     puzzli2,   pgm_arm_type1_sim,  puzzli2, pgm_arm_type1_state,    puzzli2,    ROT0,   "IGS", "Puzzli 2 Super (ver. 200)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )  // ( V200, 12/28/01 12:53:34 in program ROM )
 
-GAME( 2005, killbldp,     pgm,       pgm_arm_type3,     pgm, pgm_arm_type3_state,    killbldp,   ROT0,   "IGS", "The Killing Blade Plus (China, ver. 300)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) /* using internal rom from bootleg */
+GAME( 2005, killbldp,     pgm,       pgm_arm_type3,      pgm,     pgm_arm_type3_state,    killbldp,   ROT0,   "IGS", "The Killing Blade Plus (China, ver. 300)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) /* using internal rom from bootleg */
 
 // we're using a partial dump of the internal rom (sans the execute only area) with handcrafted startup code..
 // all 3 68k roms still have V100 strings, but are clearly different builds, there don't appear to be build string dates in them.  Two of the external ARM roms are marked V100 but are different builds, the single PCB v100 appears to be a later revision than the cart V100 as it shares the internal ROM with the V107 cart version, the v100 cart has a different internal ROM

From dc08f48c36e715120f09e86d92b71d9c71501d7b Mon Sep 17 00:00:00 2001
From: Miodrag Milanovic <mmicko@gmail.com>
Date: Wed, 20 Apr 2016 13:42:52 +0200
Subject: [PATCH 114/122] Cleanup (nw)

---
 src/emu/cheat.cpp    |  4 ++--
 src/emu/render.cpp   | 10 +++++-----
 src/emu/rendfont.cpp |  6 +++---
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/emu/cheat.cpp b/src/emu/cheat.cpp
index 37e33414154..d08abacc462 100644
--- a/src/emu/cheat.cpp
+++ b/src/emu/cheat.cpp
@@ -820,7 +820,7 @@ bool cheat_entry::activate()
 	{
 		execute_on_script();
 		changed = true;
-		manager().machine().popmessage("Activated %s", m_description.c_str());
+		m_manager.machine().popmessage("Activated %s", m_description.c_str());
 	}
 
 	// if we're a oneshot parameter cheat and we're active, execute the "state change" script and indicate change
@@ -828,7 +828,7 @@ bool cheat_entry::activate()
 	{
 		execute_change_script();
 		changed = true;
-		manager().machine().popmessage("Activated\n %s = %s", m_description.c_str(), m_parameter->text());
+		m_manager.machine().popmessage("Activated\n %s = %s", m_description.c_str(), m_parameter->text());
 	}
 
 	return changed;
diff --git a/src/emu/render.cpp b/src/emu/render.cpp
index 8cecb759b53..129ba82b356 100644
--- a/src/emu/render.cpp
+++ b/src/emu/render.cpp
@@ -1698,7 +1698,7 @@ bool render_target::load_layout_file(const char *dirname, const char *filename)
 			fname.insert(0, PATH_SEPARATOR).insert(0, dirname);
 
 		// attempt to open the file; bail if we can't
-		emu_file layoutfile(manager().machine().options().art_path(), OPEN_FLAG_READ);
+		emu_file layoutfile(m_manager.machine().options().art_path(), OPEN_FLAG_READ);
 		osd_file::error filerr = layoutfile.open(fname.c_str());
 		if (filerr != osd_file::error::NONE)
 			return false;
@@ -1905,9 +1905,9 @@ void render_target::add_container_primitives(render_primitive_list &list, const
 						// 1  1  0   solarq      X  Y
 						// 1  1  1   barrier    !X !Y
 
-						bool flip_x = (manager().machine().system().flags & ORIENTATION_FLIP_X) == ORIENTATION_FLIP_X;
-						bool flip_y = (manager().machine().system().flags & ORIENTATION_FLIP_Y) == ORIENTATION_FLIP_Y;
-						bool swap_xy = (manager().machine().system().flags & ORIENTATION_SWAP_XY) == ORIENTATION_SWAP_XY;
+						bool flip_x = (m_manager.machine().system().flags & ORIENTATION_FLIP_X) == ORIENTATION_FLIP_X;
+						bool flip_y = (m_manager.machine().system().flags & ORIENTATION_FLIP_Y) == ORIENTATION_FLIP_Y;
+						bool swap_xy = (m_manager.machine().system().flags & ORIENTATION_SWAP_XY) == ORIENTATION_SWAP_XY;
 
 						int vectororient = 0;
 						if (flip_x)
@@ -2066,7 +2066,7 @@ bool render_target::map_point_internal(INT32 target_x, INT32 target_y, render_co
 	// convert target coordinates to float
 	float target_fx = (float)(target_x - root_xform.xoffs) / viswidth;
 	float target_fy = (float)(target_y - root_xform.yoffs) / visheight;
-	if (manager().machine().ui().is_menu_active())
+	if (m_manager.machine().ui().is_menu_active())
 	{
 		target_fx = (float)target_x / m_width;
 		target_fy = (float)target_y / m_height;
diff --git a/src/emu/rendfont.cpp b/src/emu/rendfont.cpp
index 8697e681cd2..e99bcc12088 100644
--- a/src/emu/rendfont.cpp
+++ b/src/emu/rendfont.cpp
@@ -472,7 +472,7 @@ float render_font::utf8string_width(float height, float aspect, const char *utf8
 bool render_font::load_cached_bdf(const char *filename)
 {
 	// first try to open the BDF itself
-	emu_file file(manager().machine().options().font_path(), OPEN_FLAG_READ);
+	emu_file file(m_manager.machine().options().font_path(), OPEN_FLAG_READ);
 	osd_file::error filerr = file.open(filename);
 	if (filerr != osd_file::error::NONE)
 		return false;
@@ -495,7 +495,7 @@ bool render_font::load_cached_bdf(const char *filename)
 
 	// attempt to open the cached version of the font
 	{
-		emu_file cachefile(manager().machine().options().font_path(), OPEN_FLAG_READ);
+		emu_file cachefile(m_manager.machine().options().font_path(), OPEN_FLAG_READ);
 		filerr = cachefile.open(cachedname.c_str());
 		if (filerr == osd_file::error::NONE)
 		{
@@ -732,7 +732,7 @@ bool render_font::save_cached(const char *filename, UINT32 hash)
 	osd_printf_warning("Generating cached BDF font...\n");
 
 	// attempt to open the file
-	emu_file file(manager().machine().options().font_path(), OPEN_FLAG_WRITE | OPEN_FLAG_CREATE);
+	emu_file file(m_manager.machine().options().font_path(), OPEN_FLAG_WRITE | OPEN_FLAG_CREATE);
 	osd_file::error filerr = file.open(filename);
 	if (filerr != osd_file::error::NONE)
 		return false;

From 74e792f627323c27947c23d0c6353049d47e4320 Mon Sep 17 00:00:00 2001
From: hap <happppp@users.noreply.github.com>
Date: Wed, 20 Apr 2016 14:21:15 +0200
Subject: [PATCH 115/122] got word from shoutime about unkneo

---
 src/mame/drivers/neogeo_noslot.cpp | 9 ++++-----
 src/mame/mame.lst                  | 2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/mame/drivers/neogeo_noslot.cpp b/src/mame/drivers/neogeo_noslot.cpp
index 5fe002a356e..fe20d274ee6 100644
--- a/src/mame/drivers/neogeo_noslot.cpp
+++ b/src/mame/drivers/neogeo_noslot.cpp
@@ -7459,7 +7459,7 @@ ROM_END
 
 
 
-ROM_START( unkneo )
+ROM_START( dragonsh )
 	ROM_REGION( 0x100000, "maincpu", 0 )
 	ROM_LOAD16_BYTE( "EP1.bin", 0x000001, 0x080000, CRC(f353448c) SHA1(f0f966ca15d503e01b40e901765ff0888463b65d) )
 	ROM_LOAD16_BYTE( "EP2.bin", 0x000000, 0x080000, CRC(f25c71ad) SHA1(803fb6cd6a7ada59678ad901ff9788b1e54ddd0c) )
@@ -9786,6 +9786,7 @@ GAME( 2001, nitdbl,     nitd,     neogeo_noslot,   neogeo, neogeo_state,   neoge
 /* Face */
 GAME( 1994, gururin,    neogeo,   neogeo_noslot,   neogeo, neogeo_state,   neogeo,   ROT0, "Face", "Gururin", MACHINE_SUPPORTS_SAVE )
 GAME( 1997, miexchng,   neogeo,   neogeo_noslot,   neogeo, neogeo_state,   neogeo,   ROT0, "Face", "Money Puzzle Exchanger / Money Idol Exchanger", MACHINE_SUPPORTS_SAVE )
+GAME( 1997, dragonsh,   neogeo,   neogeo_noslot,   neogeo, neogeo_state,   neogeo,   ROT0, "Face", "Dragon's Heaven (prototype)", MACHINE_SUPPORTS_SAVE ) // same ID code as Voltage Fighter Gowkaizer, developed by ex-Technos staff
 
 /* Hudson Soft */
 GAME( 1994, panicbom,   neogeo,   neogeo_noslot,   neogeo, neogeo_state,   neogeo,   ROT0, "Eighting / Hudson", "Panic Bomber", MACHINE_SUPPORTS_SAVE )
@@ -9812,8 +9813,8 @@ GAME( 1995, quizkofk,   quizkof,  neogeo_noslot,   neogeo, neogeo_state,   neoge
 GAME( 1995, stakwin,    neogeo,   neogeo_noslot,   neogeo, neogeo_state,   neogeo,   ROT0, "Saurus", "Stakes Winner / Stakes Winner - GI kinzen seiha e no michi", MACHINE_SUPPORTS_SAVE )
 GAME( 1996, ragnagrd,   neogeo,   neogeo_noslot,   neogeo, neogeo_state,   neogeo,   ROT0, "Saurus", "Ragnagard / Shin-Oh-Ken", MACHINE_SUPPORTS_SAVE )
 GAME( 1996, pgoal,      neogeo,   neogeo_noslot,   neogeo, neogeo_state,   neogeo,   ROT0, "Saurus", "Pleasure Goal / Futsal - 5 on 5 Mini Soccer (NGM-219)", MACHINE_SUPPORTS_SAVE )
-GAME( 1996, ironclad,   neogeo,   neogeo_noslot,   neogeo, neogeo_state,   neogeo,   ROT0, "Saurus", "Choutetsu Brikin'ger - Iron clad (Prototype)", MACHINE_SUPPORTS_SAVE )
-GAME( 1996, ironclado,  ironclad, neogeo_noslot,   neogeo, neogeo_state,   neogeo,   ROT0, "bootleg", "Choutetsu Brikin'ger - Iron clad (Prototype, bootleg)", MACHINE_SUPPORTS_SAVE )
+GAME( 1996, ironclad,   neogeo,   neogeo_noslot,   neogeo, neogeo_state,   neogeo,   ROT0, "Saurus", "Choutetsu Brikin'ger - Iron clad (prototype)", MACHINE_SUPPORTS_SAVE )
+GAME( 1996, ironclado,  ironclad, neogeo_noslot,   neogeo, neogeo_state,   neogeo,   ROT0, "bootleg", "Choutetsu Brikin'ger - Iron clad (prototype, bootleg)", MACHINE_SUPPORTS_SAVE )
 GAME( 1996, stakwin2,   neogeo,   neogeo_noslot,   neogeo, neogeo_state,   neogeo,   ROT0, "Saurus", "Stakes Winner 2", MACHINE_SUPPORTS_SAVE )
 GAME( 1997, shocktro,   neogeo,   neogeo_noslot,   neogeo, neogeo_state,   neogeo,   ROT0, "Saurus", "Shock Troopers (set 1)", MACHINE_SUPPORTS_SAVE )
 GAME( 1997, shocktroa,  shocktro, neogeo_noslot,   neogeo, neogeo_state,   neogeo,   ROT0, "Saurus", "Shock Troopers (set 2)", MACHINE_SUPPORTS_SAVE )
@@ -9837,8 +9838,6 @@ GAME( 1995, marukodq,   neogeo,   neogeo_noslot,   neogeo, neogeo_state,   neoge
 GAME( 1995, doubledr,   neogeo,   neogeo_noslot,   neogeo, neogeo_state,   neogeo,   ROT0, "Technos Japan", "Double Dragon (Neo-Geo)", MACHINE_SUPPORTS_SAVE )
 GAME( 1995, gowcaizr,   neogeo,   neogeo_noslot,   neogeo, neogeo_state,   neogeo,   ROT0, "Technos Japan", "Voltage Fighter - Gowcaizer / Choujin Gakuen Gowcaizer", MACHINE_SUPPORTS_SAVE )
 GAME( 1996, sdodgeb,    neogeo,   neogeo_noslot,   neogeo, neogeo_state,   neogeo,   ROT0, "Technos Japan", "Super Dodge Ball / Kunio no Nekketsu Toukyuu Densetsu", MACHINE_SUPPORTS_SAVE )
-GAME( 199?, unkneo,     neogeo,   neogeo_noslot,   neogeo, neogeo_state,   neogeo,   ROT0, "Technos Japan?", "Unknown Neo-Geo Vs. Fighter (prototype)", MACHINE_SUPPORTS_SAVE ) // same ID code as Voltage Fighter Gowkaizer so probably by Technos
-
 
 /* Tecmo */
 GAME( 1996, tws96,      neogeo,   neogeo_noslot,   neogeo, neogeo_state,   neogeo,   ROT0, "Tecmo", "Tecmo World Soccer '96", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/mame.lst b/src/mame/mame.lst
index 0288acb4d35..7d9e1545b75 100644
--- a/src/mame/mame.lst
+++ b/src/mame/mame.lst
@@ -28335,7 +28335,7 @@ garoup                          // 0253 (c) 1999 SNK
 ghostlop                        // 0228 GhostLop (prototype) 1996? Data East
 goalx3                          // 0209 (c) 1995 Visco
 gowcaizr                        // 0094 (c) 1995 Technos
-unkneo							// prototype
+dragonsh                        // prototype
 gpilots                         // 0020 (c) 1991 SNK
 gpilotsh                        // 0020 (c) 1991 SNK
 gururin                         // 0067 (c) 1994 Face

From 512777046fdd04f2776aa099ead5d8fad58bc360 Mon Sep 17 00:00:00 2001
From: hap <happppp@users.noreply.github.com>
Date: Wed, 20 Apr 2016 14:51:47 +0200
Subject: [PATCH 116/122] update to prev commit

---
 src/mame/drivers/neogeo_noslot.cpp | 2 +-
 src/mame/mame.lst                  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/mame/drivers/neogeo_noslot.cpp b/src/mame/drivers/neogeo_noslot.cpp
index fe20d274ee6..72c07b23224 100644
--- a/src/mame/drivers/neogeo_noslot.cpp
+++ b/src/mame/drivers/neogeo_noslot.cpp
@@ -9786,7 +9786,7 @@ GAME( 2001, nitdbl,     nitd,     neogeo_noslot,   neogeo, neogeo_state,   neoge
 /* Face */
 GAME( 1994, gururin,    neogeo,   neogeo_noslot,   neogeo, neogeo_state,   neogeo,   ROT0, "Face", "Gururin", MACHINE_SUPPORTS_SAVE )
 GAME( 1997, miexchng,   neogeo,   neogeo_noslot,   neogeo, neogeo_state,   neogeo,   ROT0, "Face", "Money Puzzle Exchanger / Money Idol Exchanger", MACHINE_SUPPORTS_SAVE )
-GAME( 1997, dragonsh,   neogeo,   neogeo_noslot,   neogeo, neogeo_state,   neogeo,   ROT0, "Face", "Dragon's Heaven (prototype)", MACHINE_SUPPORTS_SAVE ) // same ID code as Voltage Fighter Gowkaizer, developed by ex-Technos staff
+GAME( 1997, dragonsh,   neogeo,   neogeo_noslot,   neogeo, neogeo_state,   neogeo,   ROT0, "Face", "Dragon's Heaven (development board)", MACHINE_IS_INCOMPLETE | MACHINE_SUPPORTS_SAVE ) // same ID code as Voltage Fighter Gowkaizer, developed by ex-Technos staff
 
 /* Hudson Soft */
 GAME( 1994, panicbom,   neogeo,   neogeo_noslot,   neogeo, neogeo_state,   neogeo,   ROT0, "Eighting / Hudson", "Panic Bomber", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/mame.lst b/src/mame/mame.lst
index 7d9e1545b75..ec33aac8119 100644
--- a/src/mame/mame.lst
+++ b/src/mame/mame.lst
@@ -28315,6 +28315,7 @@ ctomaday                        // 0249 (c) 1999 Visco
 cyberlip                        // 0010 (c) 1990 SNK
 diggerma                        // No Game ID (unlicensed), (c) 2000 Kyle Hodgetts, prototype
 doubledr                        // 0082 (c) 1995 Technos
+dragonsh                        // same ID as gowcaizr, dev board
 eightman                        // 0025 (c) 1991 SNK / Pallas
 fatfursp                        // 0058 (c) 1993 SNK
 fatfurspa                       // 0058 (c) 1993 SNK
@@ -28335,7 +28336,6 @@ garoup                          // 0253 (c) 1999 SNK
 ghostlop                        // 0228 GhostLop (prototype) 1996? Data East
 goalx3                          // 0209 (c) 1995 Visco
 gowcaizr                        // 0094 (c) 1995 Technos
-dragonsh                        // prototype
 gpilots                         // 0020 (c) 1991 SNK
 gpilotsh                        // 0020 (c) 1991 SNK
 gururin                         // 0067 (c) 1994 Face

From 479e0cf9271d34f861d9d8013745613a9ee2b988 Mon Sep 17 00:00:00 2001
From: cracyc <cracyc@users.noreply.github.com>
Date: Wed, 20 Apr 2016 08:15:39 -0500
Subject: [PATCH 117/122] luaengine: shrug (nw)

---
 src/emu/luaengine.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/emu/luaengine.cpp b/src/emu/luaengine.cpp
index 682066e8460..012a41f723d 100644
--- a/src/emu/luaengine.cpp
+++ b/src/emu/luaengine.cpp
@@ -712,7 +712,7 @@ luabridge::LuaRef lua_engine::l_dev_get_memspaces(const device_t *d)
 	lua_State *L = luaThis->m_lua_state;
 	luabridge::LuaRef sp_table = luabridge::LuaRef::newTable(L);
 
-	if(!&dev->memory())
+	if(!dynamic_cast<device_memory_interface *>(dev))
 		return sp_table;
 
 	for (address_spacenum sp = AS_0; sp < ADDRESS_SPACES; ++sp) {
@@ -735,7 +735,7 @@ luabridge::LuaRef lua_engine::l_dev_get_states(const device_t *d)
 	lua_State *L = luaThis->m_lua_state;
 	luabridge::LuaRef st_table = luabridge::LuaRef::newTable(L);
 
-	if(!&dev->state())
+	if(!dynamic_cast<device_state_interface *>(dev))
 		return st_table;
 
 	for (device_state_entry &s : dev->state().state_entries())

From f0949c702f494d28bc72dd0a7deba5ed7d2b3b37 Mon Sep 17 00:00:00 2001
From: hap <happppp@users.noreply.github.com>
Date: Wed, 20 Apr 2016 15:51:44 +0200
Subject: [PATCH 118/122] neogeo: and lastly, put dragonsh in the sw list

---
 hash/neogeo.xml                    | 31 ++++++++++++++++++
 src/mame/drivers/neogeo_noslot.cpp | 52 ++++++++++++++++--------------
 2 files changed, 59 insertions(+), 24 deletions(-)

diff --git a/hash/neogeo.xml b/hash/neogeo.xml
index e7162417824..1dc40cc6f1a 100644
--- a/hash/neogeo.xml
+++ b/hash/neogeo.xml
@@ -5385,6 +5385,37 @@
 		</part>
 	</software>
 
+	<!--***************************************
+	dev board, same ID as gowcaizr
+***************************************-->
+
+	<software name="dragonsh">
+		<description>Dragon's Heaven (development board)</description>
+		<year>1997</year>
+		<publisher>Face</publisher>
+		<sharedfeat name="release" value="MVS" />
+		<sharedfeat name="compatibility" value="MVS,AES" />
+		<part name="cart" interface="neo_cart">
+			<dataarea name="maincpu" width="16" endianness="big" size="0x100000">
+				<rom loadflag="load16_byte" name="EP2.bin" offset="0x000000" size="0x080000" crc="f25c71ad" sha1="803fb6cd6a7ada59678ad901ff9788b1e54ddd0c" />
+				<rom loadflag="load16_byte" name="EP1.bin" offset="0x000001" size="0x080000" crc="f353448c" sha1="f0f966ca15d503e01b40e901765ff0888463b65d" />
+			</dataarea>
+			<dataarea name="fixed" size="0x040000">
+				<rom offset="0x000000" size="0x020000" name="s1.s1" status="baddump" crc="706477a7" sha1="8cbee7f6832e7edd2dc792ca330420a6a984b879" />
+			</dataarea>
+			<dataarea name="audiocpu" size="0x30000">
+				<rom value="0xff" size="0x30000" offset="0" loadflag="fill" />
+			</dataarea>
+			<dataarea name="ymsnd" size="0x200000">
+				<rom offset="0x000000" size="0x200000" name="sram.v1" status="nodump" />
+			</dataarea>
+			<dataarea name="sprites" size="0x2000000">
+				<rom loadflag="load16_byte" name="no3.bin" offset="0x000000" size="0x1000000" crc="81821826" sha1="b7c1a53e32633383675206a16c68f6f2ff984865" />
+				<rom loadflag="load16_byte" name="no4.bin" offset="0x000001" size="0x1000000" crc="3601d568" sha1="800323e52f5d33b402f84d31850b42c688082d67" />
+			</dataarea>
+		</part>
+	</software>
+
 	<!--***************************************
 	ID-0095
 	. NGM-095
diff --git a/src/mame/drivers/neogeo_noslot.cpp b/src/mame/drivers/neogeo_noslot.cpp
index 72c07b23224..e80ce2ef086 100644
--- a/src/mame/drivers/neogeo_noslot.cpp
+++ b/src/mame/drivers/neogeo_noslot.cpp
@@ -3705,6 +3705,33 @@ ROM_START( gowcaizr )
 	ROM_LOAD16_BYTE( "094-c8.c8", 0xc00001, 0x200000, CRC(d80dd241) SHA1(1356a64e4d4e271f62cd0d83f79ee9c906440810) ) /* Plane 2,3 */ /* TC5316200 */
 ROM_END
 
+/****************************************
+ dev board, same ID as gowcaizr
+****************************************/
+
+ROM_START( dragonsh )
+	ROM_REGION( 0x100000, "maincpu", 0 )
+	ROM_LOAD16_BYTE( "EP2.bin", 0x000000, 0x080000, CRC(f25c71ad) SHA1(803fb6cd6a7ada59678ad901ff9788b1e54ddd0c) )
+	ROM_LOAD16_BYTE( "EP1.bin", 0x000001, 0x080000, CRC(f353448c) SHA1(f0f966ca15d503e01b40e901765ff0888463b65d) )
+
+	NEO_SFIX_128K( "s1.s1", BAD_DUMP CRC(706477a7) SHA1(8cbee7f6832e7edd2dc792ca330420a6a984b879) ) // was a dead AXS512PC 512KB sram card, this data is handcrafted to make the set usable (hence BAD_DUMP)
+
+	NEOGEO_BIOS
+	ROM_REGION( 0x20000, "audiobios", 0 )
+	ROM_LOAD( "sm1.sm1", 0x00000, 0x20000, CRC(94416d67) SHA1(42f9d7ddd6c0931fd64226a60dc73602b2819dcf) )
+	ROM_REGION( 0x30000, "audiocpu", ROMREGION_ERASEFF )
+	/* not present */
+
+	ROM_REGION( 0x200000, "ymsnd", ROMREGION_ERASE00 )
+	ROM_LOAD( "sram.v1", 0x000000, 0x200000, NO_DUMP ) // was a dead AXS2000PC 2MB sram card, battery dead, data lost.
+
+	NO_DELTAT_REGION
+
+	ROM_REGION( 0x2000000, "sprites", 0 )
+	ROM_LOAD16_BYTE( "no3.bin", 0x000000, 0x1000000, CRC(81821826) SHA1(b7c1a53e32633383675206a16c68f6f2ff984865) ) 
+	ROM_LOAD16_BYTE( "no4.bin", 0x000001, 0x1000000, CRC(3601d568) SHA1(800323e52f5d33b402f84d31850b42c688082d67) )
+ROM_END
+
 /****************************************
  ID-0095
  . NGM-095
@@ -7459,29 +7486,6 @@ ROM_END
 
 
 
-ROM_START( dragonsh )
-	ROM_REGION( 0x100000, "maincpu", 0 )
-	ROM_LOAD16_BYTE( "EP1.bin", 0x000001, 0x080000, CRC(f353448c) SHA1(f0f966ca15d503e01b40e901765ff0888463b65d) )
-	ROM_LOAD16_BYTE( "EP2.bin", 0x000000, 0x080000, CRC(f25c71ad) SHA1(803fb6cd6a7ada59678ad901ff9788b1e54ddd0c) )
-
-	NEO_SFIX_128K( "s1.s1", CRC(706477a7) SHA1(8cbee7f6832e7edd2dc792ca330420a6a984b879) ) // was a dead AXS512PC 512KB sram card, this data is handcrafted to make the set usable (hence BAD_DUMP)
-
-	NEOGEO_BIOS
-	ROM_REGION( 0x20000, "audiobios", 0 )
-	ROM_LOAD( "sm1.sm1", 0x00000, 0x20000, CRC(94416d67) SHA1(42f9d7ddd6c0931fd64226a60dc73602b2819dcf) )
-	ROM_REGION( 0x30000, "audiocpu", ROMREGION_ERASE00 )
-	/* not present */
-
-	ROM_REGION( 0x400000, "ymsnd", 0 )
-	ROM_LOAD( "sram.v1", 0x000000, 0x200000, NO_DUMP ) // was a dead AXS2000PC 2MB sram card, battery dead, data lost.
-
-	NO_DELTAT_REGION
-
-	ROM_REGION( 0x2000000, "sprites", 0 )
-	ROM_LOAD16_BYTE( "no3.bin", 0x000000, 0x1000000, CRC(81821826) SHA1(b7c1a53e32633383675206a16c68f6f2ff984865) ) 
-	ROM_LOAD16_BYTE( "no4.bin", 0x000001, 0x1000000, CRC(3601d568) SHA1(800323e52f5d33b402f84d31850b42c688082d67) )
-ROM_END
-
 /*************************************
  *
  *  Bootleg sets
@@ -9786,7 +9790,7 @@ GAME( 2001, nitdbl,     nitd,     neogeo_noslot,   neogeo, neogeo_state,   neoge
 /* Face */
 GAME( 1994, gururin,    neogeo,   neogeo_noslot,   neogeo, neogeo_state,   neogeo,   ROT0, "Face", "Gururin", MACHINE_SUPPORTS_SAVE )
 GAME( 1997, miexchng,   neogeo,   neogeo_noslot,   neogeo, neogeo_state,   neogeo,   ROT0, "Face", "Money Puzzle Exchanger / Money Idol Exchanger", MACHINE_SUPPORTS_SAVE )
-GAME( 1997, dragonsh,   neogeo,   neogeo_noslot,   neogeo, neogeo_state,   neogeo,   ROT0, "Face", "Dragon's Heaven (development board)", MACHINE_IS_INCOMPLETE | MACHINE_SUPPORTS_SAVE ) // same ID code as Voltage Fighter Gowkaizer, developed by ex-Technos staff
+GAME( 1997, dragonsh,   neogeo,   neogeo_noslot,   neogeo, neogeo_state,   neogeo,   ROT0, "Face", "Dragon's Heaven (development board)", MACHINE_IS_INCOMPLETE | MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE ) // same ID code as Voltage Fighter Gowkaizer, developed by ex-Technos staff
 
 /* Hudson Soft */
 GAME( 1994, panicbom,   neogeo,   neogeo_noslot,   neogeo, neogeo_state,   neogeo,   ROT0, "Eighting / Hudson", "Panic Bomber", MACHINE_SUPPORTS_SAVE )

From 0f2cdac73660593fd453c313ad3ffb2b25b7dcd5 Mon Sep 17 00:00:00 2001
From: Brad Hughes <bradhugh@outlook.com>
Date: Wed, 20 Apr 2016 10:20:31 -0400
Subject: [PATCH 119/122] Fix VS compile. Apparently VS doesn't like
 reintepret_cast<int>(0) - weird.

---
 src/emu/luaengine.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/emu/luaengine.cpp b/src/emu/luaengine.cpp
index 012a41f723d..f452684f997 100644
--- a/src/emu/luaengine.cpp
+++ b/src/emu/luaengine.cpp
@@ -1772,7 +1772,7 @@ Tout lua_engine::run(const char *env, int ref, Tin in)
 	luabridge::Stack<Tin>::push(m_lua_state, in);
 	run_internal(env, ref);
 	if(lua_isnil(m_lua_state, 1))
-		ret = reinterpret_cast<Tout>(0);
+		ret = Tout(0);
 	else
 		ret = luabridge::Stack<Tout>::get(m_lua_state, 1);
 	lua_pop(m_lua_state, 1);
@@ -1787,7 +1787,7 @@ Tout lua_engine::run(const char *env, int ref)
 	lua_pushnil(m_lua_state);
 	run_internal(env, ref);
 	if(lua_isnil(m_lua_state, 1))
-		ret = reinterpret_cast<Tout>(0);
+		ret = Tout(0);
 	else
 		ret = luabridge::Stack<Tout>::get(m_lua_state, 1);
 	lua_pop(m_lua_state, 1);

From 9cacc4e2bca846a40cedccb671a8758d6bd0eb92 Mon Sep 17 00:00:00 2001
From: hap <happppp@users.noreply.github.com>
Date: Wed, 20 Apr 2016 20:39:57 +0200
Subject: [PATCH 120/122] hh_tms1k: finished internal layout for copycat

---
 src/mame/drivers/hh_tms1k.cpp | 15 ++++---
 src/mame/layout/copycat.lay   | 83 ++++++++++++++++++++++++++++++++---
 2 files changed, 87 insertions(+), 11 deletions(-)

diff --git a/src/mame/drivers/hh_tms1k.cpp b/src/mame/drivers/hh_tms1k.cpp
index d8807e9e33e..dedfe0d717e 100644
--- a/src/mame/drivers/hh_tms1k.cpp
+++ b/src/mame/drivers/hh_tms1k.cpp
@@ -4964,7 +4964,8 @@ MACHINE_CONFIG_END
 
   known releases:
   - World: Copy Cat
-  - USA: Follow Me, distributed by Sears
+  - USA(1): Follow Me, distributed by Sears
+  - USA(2): Electronic Repeat, distributed by Tandy
 
 ***************************************************************************/
 
@@ -5031,7 +5032,7 @@ static INPUT_PORTS_START( copycat )
 
 	PORT_START("IN.3") // R7
 	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON6 ) PORT_NAME("Best Play")
-	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_START )
+	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_START ) PORT_NAME("Play")
 	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON5 ) PORT_NAME("Replay")
 	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_UNUSED )
 INPUT_PORTS_END
@@ -5085,14 +5086,16 @@ public:
 WRITE16_MEMBER(copycatm2_state::write_r)
 {
 	// R0-R3: leds
-	display_matrix(4, 1, data & 0xf, 1);
+	display_matrix(9, 1, data, 1);
 }
 
 WRITE16_MEMBER(copycatm2_state::write_o)
 {
 	// O0,O1: speaker out
 	// others: N/C
-	m_speaker->level_w(data & 3);
+	//m_speaker->level_w(data & 3);
+	
+	popmessage("O = %02x", data);
 }
 
 
@@ -5115,7 +5118,7 @@ static MACHINE_CONFIG_START( copycatm2, copycatm2_state )
 	MCFG_TMS1XXX_WRITE_O_CB(WRITE16(copycatm2_state, write_o))
 
 	MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1))
-	MCFG_DEFAULT_LAYOUT(layout_copycat)
+	MCFG_DEFAULT_LAYOUT(layout_hh_tms1k_test)
 
 	/* sound hardware */
 	MCFG_SPEAKER_STANDARD_MONO("mono")
@@ -5979,7 +5982,7 @@ CONS( 1982, lostreas,  0,        0, lostreas,  lostreas,  driver_device, 0, "Par
 CONS( 1981, tandy12,   0,        0, tandy12,   tandy12,   driver_device, 0, "Tandy Radio Shack", "Tandy-12: Computerized Arcade", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK ) // some of the minigames: ***
 
 CONS( 1979, copycat,   0,        0, copycat,   copycat,   driver_device, 0, "Tiger Electronics", "Copy Cat (model 7-520)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
-CONS( 1989, copycatm2, copycat,  0, copycatm2, copycatm2, driver_device, 0, "Tiger Electronics", "Copy Cat (model 7-522)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK | MACHINE_NOT_WORKING )
+CONS( 1989, copycatm2, copycat,  0, copycatm2, copycatm2, driver_device, 0, "Tiger Electronics", "Copy Cat (model 7-522)", MACHINE_SUPPORTS_SAVE | MACHINE_NOT_WORKING )
 
 CONS( 1979, tbreakup,  0,        0, tbreakup,  tbreakup,  driver_device, 0, "Tomy", "Break Up (Tomy)", MACHINE_SUPPORTS_SAVE )
 CONS( 1980, phpball,   0,        0, phpball,   phpball,   driver_device, 0, "Tomy", "Power House Pinball", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
diff --git a/src/mame/layout/copycat.lay b/src/mame/layout/copycat.lay
index 595129365c4..da61dd4d5a6 100644
--- a/src/mame/layout/copycat.lay
+++ b/src/mame/layout/copycat.lay
@@ -3,6 +3,48 @@
 
 <!-- define elements -->
 
+	<element name="static_black"><rect><color red="0" green="0" blue="0" /></rect></element>
+	<element name="static_white"><rect><color red="0.9" green="0.89" blue="0.8" /></rect></element>
+	<element name="static_red"><rect><color red="0.9" green="0.3" blue="0.3" /></rect></element>
+	<element name="static_green"><rect><color red="0.3" green="0.9" blue="0.3" /></rect></element>
+	<element name="static_yellow"><rect><color red="0.9" green="0.9" blue="0.3" /></rect></element>
+	<element name="static_orange"><rect><color red="0.9" green="0.6" blue="0.3" /></rect></element>
+
+	<element name="text_b1"><text string="REPLAY"><color red="0.9" green="0.89" blue="0.8" /></text></element>
+	<element name="text_b2"><text string="PLAY"><color red="0.9" green="0.89" blue="0.8" /></text></element>
+	<element name="text_b3"><text string="BEST PLAY"><color red="0.9" green="0.89" blue="0.8" /></text></element>
+
+	<element name="hlh" defstate="0">
+		<text string=" ">
+			<bounds x="0.0" y="0.0" width="2.0" height="1.0" />
+			<color red="0.0" green="0.0" blue="0.0" />
+		</text>
+		<disk state="1">
+			<bounds x="0.57" y="0.07" width="0.86" height="0.86" />
+			<color red="0.0" green="0.0" blue="0.0" />
+		</disk>
+	</element>
+	<element name="hlv" defstate="0">
+		<text string=" ">
+			<bounds x="0.0" y="0.0" width="1.0" height="2.0" />
+			<color red="0.0" green="0.0" blue="0.0" />
+		</text>
+		<disk state="1">
+			<bounds x="0.07" y="0.57" width="0.86" height="0.86" />
+			<color red="0.0" green="0.0" blue="0.0" />
+		</disk>
+	</element>
+	<element name="hlb" defstate="0">
+		<text string=" ">
+			<bounds x="0.0" y="0.0" width="1.0" height="1.0" />
+			<color red="0.0" green="0.0" blue="0.0" />
+		</text>
+		<rect state="1">
+			<bounds x="0.0" y="0.0" width="1.0" height="1.0" />
+			<color red="0.0" green="0.0" blue="0.0" />
+		</rect>
+	</element>
+
 	<element name="ledr" defstate="0">
 		<disk state="0"><color red="0.2" green="0.04" blue="0.04" /></disk>
 		<disk state="1"><color red="1.0" green="0.2" blue="0.2" /></disk>
@@ -24,12 +66,43 @@
 <!-- build screen -->
 
 	<view name="Internal Layout">
-		<bounds left="0" right="100" top="0" bottom="100" />
+		<bounds left="0" right="12" top="0" bottom="12" />
+		<bezel element="static_white">
+			<bounds left="-1" right="13" top="-1" bottom="13" />
+		</bezel>
 
-		<bezel name="0.0" element="ledg"><bounds x="1" y="1" width="1" height="1" /></bezel>
-		<bezel name="0.1" element="ledr"><bounds x="3" y="1" width="1" height="1" /></bezel>
-		<bezel name="0.2" element="ledo"><bounds x="5" y="1" width="1" height="1" /></bezel>
-		<bezel name="0.3" element="ledy"><bounds x="7" y="1" width="1" height="1" /></bezel>
+	<!-- middle part -->
+
+		<bezel element="static_black"><bounds x="4" y="4" width="4" height="4" /></bezel>
+
+		<bezel element="static_yellow"><bounds x="4.5625" y="6" width="0.5" height="0.5" /></bezel>
+		<bezel element="static_green"><bounds x="5.625" y="5.875" width="0.75" height="0.75" /></bezel>
+		<bezel element="static_yellow"><bounds x="6.9375" y="6" width="0.5" height="0.5" /></bezel>
+
+		<bezel element="hlb" inputtag="IN.3" inputmask="0x04"><bounds x="4.5625" y="6" width="0.5" height="0.5" /><color alpha="0.25" /></bezel>
+		<bezel element="hlb" inputtag="IN.3" inputmask="0x02"><bounds x="5.625" y="5.875" width="0.75" height="0.75" /><color alpha="0.25" /></bezel>
+		<bezel element="hlb" inputtag="IN.3" inputmask="0x01"><bounds x="6.9375" y="6" width="0.5" height="0.5" /><color alpha="0.25" /></bezel>
+
+		<bezel element="text_b1"><bounds x="4.0625" y="6.75" width="1.5" height="0.25" /></bezel>
+		<bezel element="text_b2"><bounds x="5.125" y="6.75" width="1.75" height="0.25" /></bezel>
+		<bezel element="text_b3"><bounds x="6.2375" y="6.75" width="1.9" height="0.25" /></bezel>
+
+	<!-- main buttons and leds -->
+
+		<bezel element="static_red"><bounds x="1" y="4" width="2" height="4" /></bezel>
+		<bezel element="static_yellow"><bounds x="4" y="1" width="4" height="2" /></bezel>
+		<bezel element="static_orange"><bounds x="9" y="4" width="2" height="4" /></bezel>
+		<bezel element="static_green"><bounds x="4" y="9" width="4" height="2" /></bezel>
+
+		<bezel element="hlv" inputtag="IN.0" inputmask="0x02"><bounds x="1" y="4" width="2" height="4" /><color alpha="0.15" /></bezel>
+		<bezel element="hlh" inputtag="IN.0" inputmask="0x08"><bounds x="4" y="1" width="4" height="2" /><color alpha="0.15" /></bezel>
+		<bezel element="hlv" inputtag="IN.0" inputmask="0x04"><bounds x="9" y="4" width="2" height="4" /><color alpha="0.15" /></bezel>
+		<bezel element="hlh" inputtag="IN.0" inputmask="0x01"><bounds x="4" y="9" width="4" height="2" /><color alpha="0.15" /></bezel>
+
+		<bezel name="0.0" element="ledg"><bounds x="5.75" y="8.25" width="0.5" height="0.5" /></bezel>
+		<bezel name="0.1" element="ledr"><bounds x="3.25" y="5.75" width="0.5" height="0.5" /></bezel>
+		<bezel name="0.2" element="ledo"><bounds x="8.25" y="5.75" width="0.5" height="0.5" /></bezel>
+		<bezel name="0.3" element="ledy"><bounds x="5.75" y="3.25" width="0.5" height="0.5" /></bezel>
 
 	</view>
 </mamelayout>

From c260252018a1c073f2810ef2f3eb2507adc85aeb Mon Sep 17 00:00:00 2001
From: hap <happppp@users.noreply.github.com>
Date: Wed, 20 Apr 2016 20:44:37 +0200
Subject: [PATCH 121/122] nw

---
 src/mame/drivers/hh_tms1k.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/mame/drivers/hh_tms1k.cpp b/src/mame/drivers/hh_tms1k.cpp
index dedfe0d717e..21496ce5961 100644
--- a/src/mame/drivers/hh_tms1k.cpp
+++ b/src/mame/drivers/hh_tms1k.cpp
@@ -5042,7 +5042,7 @@ static const INT16 copycat_speaker_levels[4] = { 0, 0x7fff, -0x8000, 0 };
 static MACHINE_CONFIG_START( copycat, copycat_state )
 
 	/* basic machine hardware */
-	MCFG_CPU_ADD("maincpu", TMS1000, 350000) // approximation - RC osc. R=47K, C=47pf
+	MCFG_CPU_ADD("maincpu", TMS1000, 320000) // approximation - RC osc. R=47K, C=47pf
 	MCFG_TMS1XXX_READ_K_CB(READ8(copycat_state, read_k))
 	MCFG_TMS1XXX_WRITE_R_CB(WRITE16(copycat_state, write_r))
 	MCFG_TMS1XXX_WRITE_O_CB(WRITE16(copycat_state, write_o))

From 574558328ee96ea8770de6d7e8382f57eb38a236 Mon Sep 17 00:00:00 2001
From: David Haywood <mamehaze@users.noreply.github.com>
Date: Wed, 20 Apr 2016 21:43:04 +0100
Subject: [PATCH 122/122] new NOT WORKING Pokonyan (Japan 940322) [sylphia]

technically it probably works, but need to clean up the inputs, and one of the gfx roms needs redumping, I'll mark it as working and verify the desired credit once the rom is redumped.
---
 src/mame/drivers/cps1.cpp | 137 +++++++++++++++++++++++++++++++++++++-
 src/mame/mame.lst         |   1 +
 src/mame/video/cps1.cpp   |  13 +++-
 3 files changed, 149 insertions(+), 2 deletions(-)

diff --git a/src/mame/drivers/cps1.cpp b/src/mame/drivers/cps1.cpp
index d0aefe36539..602689100e7 100644
--- a/src/mame/drivers/cps1.cpp
+++ b/src/mame/drivers/cps1.cpp
@@ -3110,6 +3110,88 @@ static INPUT_PORTS_START( wofch )
 	PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_serial_93cxx_device, cs_write)
 INPUT_PORTS_END
 
+static INPUT_PORTS_START( pokonyan )
+	PORT_INCLUDE( cps1_3b )
+
+	PORT_START("DSWA")
+	PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
+	PORT_DIPSETTING(    0x01, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
+	PORT_DIPNAME( 0x02, 0x02, DEF_STR( Unknown ) )
+	PORT_DIPSETTING(    0x02, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
+	PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unknown ) )
+	PORT_DIPSETTING(    0x04, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
+	PORT_DIPNAME( 0x08, 0x08, DEF_STR( Unknown ) )
+	PORT_DIPSETTING(    0x08, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
+	PORT_DIPNAME( 0x10, 0x10, DEF_STR( Unknown ) )
+	PORT_DIPSETTING(    0x10, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
+	PORT_DIPNAME( 0x20, 0x20, DEF_STR( Unknown ) )
+	PORT_DIPSETTING(    0x20, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
+	PORT_DIPNAME( 0x40, 0x40, DEF_STR( Unknown ) )
+	PORT_DIPSETTING(    0x40, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
+	PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unknown ) )
+	PORT_DIPSETTING(    0x80, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
+
+	PORT_START("DSWB")
+	PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
+	PORT_DIPSETTING(    0x01, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
+	PORT_DIPNAME( 0x02, 0x02, DEF_STR( Unknown ) )
+	PORT_DIPSETTING(    0x02, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
+	PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unknown ) )
+	PORT_DIPSETTING(    0x04, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
+	PORT_DIPNAME( 0x08, 0x08, DEF_STR( Unknown ) )
+	PORT_DIPSETTING(    0x08, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
+	PORT_DIPNAME( 0x10, 0x10, DEF_STR( Unknown ) )
+	PORT_DIPSETTING(    0x10, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
+	PORT_DIPNAME( 0x20, 0x20, DEF_STR( Unknown ) )
+	PORT_DIPSETTING(    0x20, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
+	PORT_DIPNAME( 0x40, 0x40, DEF_STR( Unknown ) )
+	PORT_DIPSETTING(    0x40, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
+	PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unknown ) )
+	PORT_DIPSETTING(    0x80, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
+
+	PORT_START("DSWC")
+	PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
+	PORT_DIPSETTING(    0x01, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
+	PORT_DIPNAME( 0x02, 0x02, DEF_STR( Unknown ) )
+	PORT_DIPSETTING(    0x02, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
+	PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unknown ) )
+	PORT_DIPSETTING(    0x04, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
+	PORT_DIPNAME( 0x08, 0x08, DEF_STR( Unknown ) )
+	PORT_DIPSETTING(    0x08, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
+	PORT_DIPNAME( 0x10, 0x10, DEF_STR( Unknown ) )
+	PORT_DIPSETTING(    0x10, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
+	PORT_DIPNAME( 0x20, 0x20, DEF_STR( Unknown ) )
+	PORT_DIPSETTING(    0x20, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
+	PORT_DIPNAME( 0x40, 0x40, DEF_STR( Unknown ) )
+	PORT_DIPSETTING(    0x40, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
+	PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unknown ) )
+	PORT_DIPSETTING(    0x80, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
+INPUT_PORTS_END
+
 /*
 A Final Fight board with mismatched USA and Japan GFX proves that the columns
 of the 8x8 tilemap alternate between sides of the 16x16 tile resulting
@@ -5034,6 +5116,7 @@ ROM_START( ffightj1 )
 	ROM_LOAD( "lwio.12e",     0x0000, 0x0117, CRC(ad52b90c) SHA1(f0fd6aeea515ee449320fe15684e6b3ab7f97bf4) )
 ROM_END
 
+
 /* B-Board 88622B-3 */
 ROM_START( ffightj2 )
 	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
@@ -11577,6 +11660,56 @@ ROM_START( ganbare )
 	ROM_LOAD( "c632.ic1",     0x0000, 0x0117, CRC(0fbd9270) SHA1(d7e737b20c44d41e29ca94be56114b31934dde81) )
 ROM_END
 
+
+ROM_START( pokonyan )
+	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_LOAD16_BYTE( "xmqq-12f.bin", 0x00000, 0x20000, CRC(196297bf) SHA1(4724c4ccb755d3d457f5224d4c4ea860664d3b10) )
+	ROM_LOAD16_BYTE( "xmqq-12h.bin", 0x00001, 0x20000, CRC(2d7ee2e9) SHA1(af9f8c346e36b4bd6284913129782187e242aa3f) )
+	ROM_LOAD16_BYTE( "xmqq-13f.bin", 0x40000, 0x20000, CRC(8f6abf26) SHA1(e9918abc5ca02c8b3f3b5b2410aedc350dc12ec2) )
+	ROM_LOAD16_BYTE( "xmqq-13h.bin", 0x40001, 0x20000, CRC(3fefe432) SHA1(42763c047fd976c9a8fec3a38f2b132b6e2e15a9) )
+
+	ROM_REGION( 0x200000, "gfx", 0 )
+	ROMX_LOAD( "xmqq-4b.bin",  0x000000, 0x20000, CRC(933ab76d) SHA1(a51536b0ad89e08356cbb500c60099bd2a192a76) , ROM_SKIP(7) )
+	ROMX_LOAD( "xmqq-4a.bin",  0x000001, 0x20000, CRC(b098e7a9) SHA1(c848ddc0e6559dac6ca23d29c12bc65ea19b7dc4) , ROM_SKIP(7) )
+	ROMX_LOAD( "xmqq-9b.bin",  0x000002, 0x20000, CRC(b66d62d4) SHA1(1be1b89aa24382b4a3d4585b22b83f35b2a27333) , ROM_SKIP(7) )
+	ROMX_LOAD( "xmqq-9a.bin",  0x000003, 0x20000, CRC(9c23e40b) SHA1(9b5de73c4c6679a53871a45743a60c7cdefc8aaa) , ROM_SKIP(7) )
+	ROMX_LOAD( "xmqq-5e.bin",  0x000004, 0x20000, CRC(63d06d6f) SHA1(364d81aafa4d97e8d709e13b481585f655924254) , ROM_SKIP(7) )
+	ROMX_LOAD( "xmqq-5c.bin",  0x000005, 0x20000, CRC(e2169bb5) SHA1(2ca3d6eeee27606af0b21c69491c3bfbe1f82ed6) , ROM_SKIP(7) )
+	ROMX_LOAD( "xmqq-8h.bin",  0x000006, 0x20000, CRC(113121f5) SHA1(d5b3c97e70c3f53d4d68ed56d98e84df59f42073) , ROM_SKIP(7) )
+	ROMX_LOAD( "xmqq-8f.bin",  0x000007, 0x20000, CRC(beb00e07) SHA1(ab0264cb98fe9d77c5acff86800273ed4bdf2e1f) , ROM_SKIP(7) )
+	ROMX_LOAD( "xmqq-5b.bin",  0x100000, 0x20000, BAD_DUMP CRC(1849760c) SHA1(81707c50ddab864bb45cf524ffba092b8b212310) , ROM_SKIP(7) ) // issues with one of the address lines
+	ROMX_LOAD( "xmqq-5a.bin",  0x100001, 0x20000, CRC(bd40215e) SHA1(7350e56ecef8e87cf5a4d4f50231fada6fc5356b) , ROM_SKIP(7) )
+	ROMX_LOAD( "xmqq-10b.bin", 0x100002, 0x20000, CRC(9fa773ef) SHA1(4f0cf813cfe7fbdf20403cfab81b1c01907eb62f) , ROM_SKIP(7) )
+	ROMX_LOAD( "xmqq-10a.bin", 0x100003, 0x20000, CRC(638d4bc7) SHA1(fca924ad53ad1d00dc2e70436fd22de81c08115f) , ROM_SKIP(7) )
+	ROMX_LOAD( "xmqq-7e.bin",  0x100004, 0x20000, CRC(72c45858) SHA1(e1ea89568077739b891c95f57c867c02f6c109ff) , ROM_SKIP(7) )
+	ROMX_LOAD( "xmqq-7c.bin",  0x100005, 0x20000, CRC(d91cda18) SHA1(ef40cb78484355be74d2a08fdd870b49263ab57d) , ROM_SKIP(7) )
+	ROMX_LOAD( "xmqq-9h.bin",  0x100006, 0x20000, CRC(3cd8594b) SHA1(a099428d0f0231f91881beee0bd6a80ba2c3d693) , ROM_SKIP(7) )
+	ROMX_LOAD( "xmqq-9f.bin",  0x100007, 0x20000, CRC(1ec10bed) SHA1(139563c41450591b5674d885e3260cb99b206e25) , ROM_SKIP(7) )
+
+	ROM_REGION( 0x18000, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_LOAD( "xmqq-13b.bin",   0x00000, 0x08000, CRC(4e8b81a8) SHA1(4a837345223c51d668ec7f4d7460871c00f71482) )
+	ROM_CONTINUE(            0x10000, 0x08000 )
+
+	ROM_REGION( 0x40000, "oki", 0 ) /* Samples */
+	ROM_LOAD( "xmqq-12c.bin",  0x00000, 0x20000, CRC(71ac69ad) SHA1(401fe0294c6b7bc79426ab1922e02a97415cd2ef) )
+	ROM_LOAD( "xmqq-13c.bin",  0x20000, 0x20000, CRC(71e29699) SHA1(8f19a925bbd47ef965c41af233359a1552c7f8b0) )
+
+	/*
+	ROM_REGION( 0x0200, "aboardplds", 0 )
+	ROM_LOAD( "buf1",         0x0000, 0x0117, CRC(eb122de7) SHA1(b26b5bfe258e3e184f069719f9fd008d6b8f6b9b) )
+	ROM_LOAD( "ioa1",         0x0000, 0x0117, CRC(59c7ee3b) SHA1(fbb887c5b4f5cb8df77cec710eaac2985bc482a6) )
+	ROM_LOAD( "prg1",         0x0000, 0x0117, CRC(f1129744) SHA1(a5300f301c1a08a7da768f0773fa0fe3f683b237) )
+	ROM_LOAD( "rom1",         0x0000, 0x0117, CRC(41dc73b9) SHA1(7d4c9f1693c821fbf84e32dd6ef62ddf14967845) )
+	ROM_LOAD( "sou1",         0x0000, 0x0117, CRC(84f4b2fe) SHA1(dcc9e86cc36316fe42eace02d6df75d08bc8bb6d) )
+	*/
+
+	/* not sure
+	ROM_REGION( 0x0200, "bboardplds", 0 )
+	ROM_LOAD( "unknown.1a",     0x0000, 0x0117, NO_DUMP )
+	ROM_LOAD( "lwio.12e",     0x0000, 0x0117, CRC(ad52b90c) SHA1(f0fd6aeea515ee449320fe15684e6b3ab7f97bf4) )
+	*/
+ROM_END
+
 /* Home 'CPS Changer' Unit - For MESS */
 
 /* B-Board 91635B-2 */
@@ -12193,6 +12326,7 @@ GAME( 1995, megaman,     0,        cps1_12MHz, megaman,  cps_state,   cps1,
 GAME( 1995, megamana,    megaman,  cps1_12MHz, megaman,  cps_state,   cps1,     ROT0,   "Capcom", "Mega Man: The Power Battle (CPS1, Asia 951006)", MACHINE_SUPPORTS_SAVE )
 GAME( 1995, rockmanj,    megaman,  cps1_12MHz, rockmanj, cps_state,   cps1,     ROT0,   "Capcom", "Rockman: The Power Battle (CPS1, Japan 950922)", MACHINE_SUPPORTS_SAVE )
 GAME( 2000, ganbare,     0,        ganbare,    ganbare,  cps_state,   ganbare,  ROT0,   "Capcom", "Ganbare! Marine Kun (Japan 2K0411)", MACHINE_SUPPORTS_SAVE )
+GAME( 1994, pokonyan,    0,        cps1_10MHz, pokonyan, cps_state,   cps1,     ROT0,   "Capcom", "Pokonyan (Japan 940322)", MACHINE_SUPPORTS_SAVE | MACHINE_NOT_WORKING ) // 2002-10-24 was on the ROM labels, 940322 on the startup screen... take your pick
 
 /* Games released on CPS-1 hardware by Mitchell */
 
@@ -12201,7 +12335,7 @@ GAME( 1995, pang3r1,     pang3,    pang3,      pang3,    cps_state,   pang3,
 GAME( 1995, pang3j,      pang3,    pang3,      pang3,    cps_state,   pang3,    ROT0,   "Mitchell", "Pang! 3: Kaitou Tachi no Karei na Gogo (Japan 950511)", MACHINE_SUPPORTS_SAVE )
 GAME( 1995, pang3b,      pang3,    pang3,      pang3b,   cps_state,   pang3b,   ROT0,   "bootleg", "Pang! 3 (bootleg)", MACHINE_SUPPORTS_SAVE )    // 950511 - based on Euro version
 
-/* Home 'CPS Changer' Unit - For MESS */
+/* Home 'CPS Changer' Unit */
 
 CONS( 1994, wofch,  0, 0,     qsound,     wofch,      cps_state, wof,      "Capcom", "Tenchi wo Kurau II: Sekiheki no Tatakai (CPS Changer, Japan 921031)", MACHINE_SUPPORTS_SAVE )
 CONS( 1995, sfzch,  0, 0,     cps1_12MHz, sfzch,      cps_state, cps1,     "Capcom", "Street Fighter Zero (CPS Changer, Japan 951020)", MACHINE_SUPPORTS_SAVE )
@@ -12210,3 +12344,4 @@ CONS( 1995, sfach,  sfzch, 0, cps1_12MHz, sfzch,      cps_state, cps1,     "Capc
 CONS( 1995, sfzbch, sfzch, 0, cps1_12MHz, sfzch,      cps_state, cps1,     "Capcom", "Street Fighter Zero (CPS Changer, Brazil 950727)", MACHINE_SUPPORTS_SAVE )
 
 // Ken Sei Mogura: Street Fighter II - see kenseim.c
+
diff --git a/src/mame/mame.lst b/src/mame/mame.lst
index 0288acb4d35..81f2ba49edd 100644
--- a/src/mame/mame.lst
+++ b/src/mame/mame.lst
@@ -9786,6 +9786,7 @@ qad                             // 01/07/1992 (c) 1992 (USA)
 qadjr                           // 21/09/1994 (c) 1994 (Japan)
 qtono2j                         // 23/01/1995 (c) 1995 (Japan)
 rockmanj                        // 22/09/1995 (c) 1995 (Japan)
+pokonyan
 sf2                             // 22/05/1991 (c) 1991 (World)
 sf2acc                          // hack
 sf2acca                         // hack
diff --git a/src/mame/video/cps1.cpp b/src/mame/video/cps1.cpp
index 790db240802..a9d7bc06866 100644
--- a/src/mame/video/cps1.cpp
+++ b/src/mame/video/cps1.cpp
@@ -1383,7 +1383,17 @@ static const struct gfx_range mapper_KNM10B_table[] =
 	{ 0 }
 };
 
-
+// unknown part number, this could still be incorrect
+#define mapper_pokonyan   { 0x8000, 0x8000, 0x8000, 0 }, mapper_pokonyan_table
+static const struct gfx_range mapper_pokonyan_table[] =
+{
+	/* type            start    end      bank */
+	{ GFXTYPE_SPRITES, 0x0000, 0x7fff, 0 },
+	{ GFXTYPE_SCROLL1, 0x7000, 0x7fff, 0 },
+	{ GFXTYPE_SCROLL3, 0x0000, 0x7fff, 0 },
+	{ GFXTYPE_SCROLL2, 0x0000, 0x7fff, 0 },
+	{ 0 }
+};
 
 static const struct CPS1config cps1_config_table[]=
 {
@@ -1502,6 +1512,7 @@ static const struct CPS1config cps1_config_table[]=
 	{"knightsj",    CPS_B_21_BT4, mapper_KR63B,  0x36, 0, 0x34 },
 	{"knightsja",   CPS_B_21_BT4, mapper_KR63B,  0x36, 0, 0x34 },   // wrong, this set uses KR22B, still not dumped
 	//{"knightsb",    CPS_B_21_BT4, mapper_KR63B,  0x36, 0, 0x34 },   // wrong, knightsb bootleg doesn't use the KR63B PAL
+	{"pokonyan",       CPS_B_21_DEF, mapper_pokonyan, 0x36 },
 	{"sf2ce",       CPS_B_21_DEF, mapper_S9263B, 0x36 },
 	{"sf2ceea",     CPS_B_21_DEF, mapper_S9263B, 0x36 },
 	{"sf2ceua",     CPS_B_21_DEF, mapper_S9263B, 0x36 },