diff --git a/devices/pc/machine/5160/ega/256kb/debugger/machine.xml b/devices/pc/machine/5160/ega/256kb/debugger/machine.xml
index 8fa068427..fe5fae50d 100644
--- a/devices/pc/machine/5160/ega/256kb/debugger/machine.xml
+++ b/devices/pc/machine/5160/ega/256kb/debugger/machine.xml
@@ -5,11 +5,10 @@
 	<computer id="xt-ega-256k" name="IBM PC XT"/>
 	<cpu id="cpu8088" model="8088"/>
 	<ram id="ramLow" addr="0x00000" test="false"/>
-	<rom id="romEGA" addr="0xc0000" size="0x4000" file="/devices/pc/video/ibm/ega/1984-09-13/ibm-ega.json" notify="videoEGA"/>
 	<rom id="romHDC" addr="0xc8000" size="0x2000" file="/devices/pc/hdc/ibm-xebec-1982.json"/>
 	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/rom/5160/basic/BASIC110.json"/>
 	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/rom/5160/bios/1982-11-08/XTBIOS-REV1.json"/>
-	<video ref="/devices/pc/video/ibm/ega/ibm-ega-64kb.xml"/>
+	<video ref="/devices/pc/video/ibm/ega/1984-09-13/64kb.xml"/>
 	<fdc ref="/disks/pc/compiled/library.xml"/>
 	<keyboard ref="/devices/pc/keyboard/keyboard-minimal-functions.xml"/>
 	<debugger id="debugger"/>
diff --git a/devices/pc/machine/5160/ega/640kb/array/machine.xml b/devices/pc/machine/5160/ega/640kb/array/machine.xml
index bb27a011c..a29c18ab8 100644
--- a/devices/pc/machine/5160/ega/640kb/array/machine.xml
+++ b/devices/pc/machine/5160/ega/640kb/array/machine.xml
@@ -4,11 +4,10 @@
 	<name pos="center">IBM PC XT, 128K EGA, 640K RAM, 10Mb Hard Drive</name>
 	<computer id="xt-ega-640k" name="IBM PC XT" state="/devices/pc/machine/5160/ega/640kb/win101/state.json"/>
 	<ram id="ramLow" addr="0x00000" test="false" size="0xa0000" comment="0xa0000 (640Kb) size overrides SW1|ROM BIOS memory test has been disabled"/>
-	<rom id="romEGA" addr="0xc0000" size="0x4000" file="/devices/pc/video/ibm/ega/1984-09-13/ibm-ega.json" notify="videoEGA"/>
 	<rom id="romHDC" addr="0xc8000" size="0x2000" file="/devices/pc/hdc/ibm-xebec-1982.json"/>
 	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/rom/5160/basic/BASIC110.json"/>
 	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/rom/5160/bios/1982-11-08/XTBIOS-REV1.json"/>
-	<video ref="/devices/pc/video/ibm/ega/ibm-ega-128kb-autolock640.xml"/>
+	<video ref="/devices/pc/video/ibm/ega/1984-09-13/128kb-autolock640.xml"/>
 	<fdc ref="/disks/pc/compiled/library.xml"/>
 	<keyboard ref="/devices/pc/keyboard/keyboard-minimal.xml"/>
 	<cpu id="cpu8088" model="8088">
diff --git a/devices/pc/machine/5160/ega/640kb/debugger/machine.xml b/devices/pc/machine/5160/ega/640kb/debugger/machine.xml
index 6e5ff17fc..71e4826de 100644
--- a/devices/pc/machine/5160/ega/640kb/debugger/machine.xml
+++ b/devices/pc/machine/5160/ega/640kb/debugger/machine.xml
@@ -5,11 +5,10 @@
 	<computer id="xt-ega-640k" name="IBM PC XT"/>
 	<cpu id="cpu8088" model="8088"/>
 	<ram id="ramLow" addr="0x00000" test="false" size="0xa0000" comment="0xa0000 (640Kb) size overrides SW1|ROM BIOS memory test has been disabled"/>
-	<rom id="romEGA" addr="0xc0000" size="0x4000" file="/devices/pc/video/ibm/ega/1984-09-13/ibm-ega.json" notify="videoEGA"/>
 	<rom id="romHDC" addr="0xc8000" size="0x2000" file="/devices/pc/hdc/ibm-xebec-1982.json"/>
 	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/rom/5160/basic/BASIC110.json"/>
 	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/rom/5160/bios/1982-11-08/XTBIOS-REV1.json"/>
-	<video ref="/devices/pc/video/ibm/ega/ibm-ega-128kb-autolockfs.xml"/>
+	<video ref="/devices/pc/video/ibm/ega/1984-09-13/128kb-autolockfs.xml"/>
 	<fdc ref="/disks/pc/compiled/library.xml"/>
 	<keyboard ref="/devices/pc/keyboard/keyboard-minimal-functions.xml"/>
 	<debugger id="debugger"/>
diff --git a/devices/pc/machine/5160/ega/640kb/machine.xml b/devices/pc/machine/5160/ega/640kb/machine.xml
index c2630c804..692e108f8 100644
--- a/devices/pc/machine/5160/ega/640kb/machine.xml
+++ b/devices/pc/machine/5160/ega/640kb/machine.xml
@@ -5,11 +5,10 @@
 	<computer id="xt-ega-640k" name="IBM PC XT"/>
 	<cpu id="cpu8088" model="8088"/>
 	<ram id="ramLow" addr="0x00000" test="false" size="0xa0000" comment="0xa0000 (640Kb) size overrides SW1|ROM BIOS memory test has been disabled"/>
-	<rom id="romEGA" addr="0xc0000" size="0x4000" file="/devices/pc/video/ibm/ega/1984-09-13/ibm-ega.json" notify="videoEGA"/>
 	<rom id="romHDC" addr="0xc8000" size="0x2000" file="/devices/pc/hdc/ibm-xebec-1982.json"/>
 	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/rom/5160/basic/BASIC110.json"/>
 	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/rom/5160/bios/1982-11-08/XTBIOS-REV1.json"/>
-	<video ref="/devices/pc/video/ibm/ega/ibm-ega-128kb-autolockfs.xml"/>
+	<video ref="/devices/pc/video/ibm/ega/1984-09-13/128kb-autolockfs.xml"/>
 	<fdc ref="/disks/pc/compiled/library.xml"/>
 	<keyboard ref="/devices/pc/keyboard/keyboard-minimal-functions.xml"/>
 	<chipset id="chipset" model="5160" sw1="01001101"/>
diff --git a/devices/pc/machine/5160/ega/640kb/win101/debugger/machine.xml b/devices/pc/machine/5160/ega/640kb/win101/debugger/machine.xml
index ac9bdb3c4..e0ed552f3 100644
--- a/devices/pc/machine/5160/ega/640kb/win101/debugger/machine.xml
+++ b/devices/pc/machine/5160/ega/640kb/win101/debugger/machine.xml
@@ -5,11 +5,10 @@
 	<computer id="xt-ega-640k" name="IBM PC XT" state="/devices/pc/machine/5160/ega/640kb/win101/state.json"/>
 	<cpu id="cpu8088" model="8088"/>
 	<ram id="ramLow" addr="0x00000" test="false" size="0xa0000" comment="0xa0000 (640Kb) size overrides SW1|ROM BIOS memory test has been disabled"/>
-	<rom id="romEGA" addr="0xc0000" size="0x4000" file="/devices/pc/video/ibm/ega/1984-09-13/ibm-ega.json" notify="videoEGA"/>
 	<rom id="romHDC" addr="0xc8000" size="0x2000" file="/devices/pc/hdc/ibm-xebec-1982.json"/>
 	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/rom/5160/basic/BASIC110.json"/>
 	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/rom/5160/bios/1982-11-08/XTBIOS-REV1.json"/>
-	<video ref="/devices/pc/video/ibm/ega/ibm-ega-128kb-autolockfs.xml"/>
+	<video ref="/devices/pc/video/ibm/ega/1984-09-13/128kb-autolockfs.xml"/>
 	<fdc ref="/disks/pc/compiled/library.xml"/>
 	<keyboard ref="/devices/pc/keyboard/keyboard-minimal-functions.xml"/>
 	<debugger id="debugger"/>
diff --git a/devices/pc/machine/5160/ega/640kb/win101/machine.xml b/devices/pc/machine/5160/ega/640kb/win101/machine.xml
index 52ed8c4c3..63fab42de 100644
--- a/devices/pc/machine/5160/ega/640kb/win101/machine.xml
+++ b/devices/pc/machine/5160/ega/640kb/win101/machine.xml
@@ -4,11 +4,10 @@
 	<name pos="center">IBM PC XT, 128K EGA, 640K RAM, 10Mb Hard Drive</name>
 	<computer id="xt-ega-640k" name="IBM PC XT" state="/devices/pc/machine/5160/ega/640kb/win101/state.json"/>
 	<ram id="ramLow" addr="0x00000" test="false" size="0xa0000" comment="0xa0000 (640Kb) size overrides SW1|ROM BIOS memory test has been disabled"/>
-	<rom id="romEGA" addr="0xc0000" size="0x4000" file="/devices/pc/video/ibm/ega/1984-09-13/ibm-ega.json" notify="videoEGA"/>
 	<rom id="romHDC" addr="0xc8000" size="0x2000" file="/devices/pc/hdc/ibm-xebec-1982.json"/>
 	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/rom/5160/basic/BASIC110.json"/>
 	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/rom/5160/bios/1982-11-08/XTBIOS-REV1.json"/>
-	<video ref="/devices/pc/video/ibm/ega/ibm-ega-128kb-autolockfs.xml"/>
+	<video ref="/devices/pc/video/ibm/ega/1984-09-13/128kb-autolockfs.xml"/>
 	<fdc ref="/disks/pc/compiled/library.xml"/>
 	<keyboard ref="/devices/pc/keyboard/keyboard-minimal.xml"/>
 	<cpu id="cpu8088" model="8088">
diff --git a/devices/pc/machine/5170/ega/1152kb/rev1/debugger/machine.xml b/devices/pc/machine/5170/ega/1152kb/rev1/debugger/machine.xml
index 8c0fa2642..b7e8e9d06 100644
--- a/devices/pc/machine/5170/ega/1152kb/rev1/debugger/machine.xml
+++ b/devices/pc/machine/5170/ega/1152kb/rev1/debugger/machine.xml
@@ -6,9 +6,8 @@
 	<cpu id="cpu286" model="80286"/>
 	<ram id="ramLow" addr="0x00000" test="false" size="0xa0000" comment="ROM BIOS memory test has been disabled"/>
 	<ram id="ramExt" addr="0x100000" size="0x80000" comment=""/>
-	<rom id="romEGA" addr="0xc0000" size="0x4000" file="/devices/pc/video/ibm/ega/1984-09-13/ibm-ega.json" notify="videoEGA"/>
 	<rom id="romBIOS" addr="0xf0000" size="0x10000" alias="0xff0000" file="/devices/pc/rom/5170/bios/1984-01-10/ATBIOS-REV1.json"/>
-	<video ref="/devices/pc/video/ibm/ega/ibm-ega-128kb-autolockfs.xml"/>
+	<video ref="/devices/pc/video/ibm/ega/1984-09-13/128kb-autolockfs.xml"/>
 	<fdc ref="/disks/pc/compiled/library.xml" automount='{A: {name: "PC-DOS 3.00 (Disk 1)", path: "/disks/pc/dos/ibm/3.00/PCDOS300-DISK1.json"}, B: {name: "PC-DOS 3.00 (Disk 2)", path: "/disks/pc/dos/ibm/3.00/PCDOS300-DISK2.json"}}'/>
 	<keyboard ref="/devices/pc/keyboard/keyboard-minimal-functions.xml"/>
 	<debugger id="debugger" messages="fault" commands=""/>
diff --git a/devices/pc/machine/5170/ega/1152kb/rev3/debugger/backtrack/machine.xml b/devices/pc/machine/5170/ega/1152kb/rev3/debugger/backtrack/machine.xml
index b17f2f6a4..5200c3c6c 100644
--- a/devices/pc/machine/5170/ega/1152kb/rev3/debugger/backtrack/machine.xml
+++ b/devices/pc/machine/5170/ega/1152kb/rev3/debugger/backtrack/machine.xml
@@ -6,9 +6,8 @@
 	<cpu id="cpu286" model="80286" cycles="8000000"/>
 	<ram id="ramLow" addr="0x00000" test="true" size="0xa0000" comment="ROM BIOS memory test has been disabled"/>
 	<ram id="ramExt" addr="0x100000" size="0x80000" comment=""/>
-	<rom id="romEGA" addr="0xc0000" size="0x4000" file="/devices/pc/video/ibm/ega/1984-09-13/ibm-ega.json" notify="videoEGA"/>
 	<rom id="romBIOS" addr="0xf0000" size="0x10000" alias="0xff0000" file="/devices/pc/rom/5170/bios/1985-11-15/ATBIOS-REV3.json"/>
-	<video ref="/devices/pc/video/ibm/ega/ibm-ega-128kb-autolockfs.xml"/>
+	<video ref="/devices/pc/video/ibm/ega/1984-09-13/128kb-autolockfs.xml"/>
 	<fdc ref="/disks/pc/compiled/library.xml" automount='{A: {name: "PC-DOS 3.20 (Disk 1)", path: "/disks/pc/dos/ibm/3.20/PCDOS320-DISK1.json"}, B: {name: "PC-DOS 3.20 (Disk 2)", path: "/disks/pc/dos/ibm/3.20/PCDOS320-DISK2.json"}}'/>
 	<keyboard ref="/devices/pc/keyboard/keyboard-minimal-functions.xml"/>
 	<debugger id="debugger" messages="fault" commands=""/>
diff --git a/devices/pc/machine/5170/ega/1152kb/rev3/debugger/machine.xml b/devices/pc/machine/5170/ega/1152kb/rev3/debugger/machine.xml
index a9ddd6847..8ca1e2e23 100644
--- a/devices/pc/machine/5170/ega/1152kb/rev3/debugger/machine.xml
+++ b/devices/pc/machine/5170/ega/1152kb/rev3/debugger/machine.xml
@@ -6,9 +6,8 @@
 	<cpu id="cpu286" model="80286" cycles="8000000"/>
 	<ram id="ramLow" addr="0x00000" test="false" size="0xa0000" comment="ROM BIOS memory test has been disabled"/>
 	<ram id="ramExt" addr="0x100000" size="0x80000" comment=""/>
-	<rom id="romEGA" addr="0xc0000" size="0x4000" file="/devices/pc/video/ibm/ega/1984-09-13/ibm-ega.json" notify="videoEGA"/>
 	<rom id="romBIOS" addr="0xf0000" size="0x10000" alias="0xff0000" file="/devices/pc/rom/5170/bios/1985-11-15/ATBIOS-REV3.json"/>
-	<video ref="/devices/pc/video/ibm/ega/ibm-ega-128kb-autolockfs.xml"/>
+	<video ref="/devices/pc/video/ibm/ega/1984-09-13/128kb-autolockfs.xml"/>
 	<fdc ref="/disks/pc/compiled/library.xml" automount='{A: {name: "PC-DOS 3.20 (Disk 1)", path: "/disks/pc/dos/ibm/3.20/PCDOS320-DISK1.json"}, B: {name: "PC-DOS 3.20 (Disk 2)", path: "/disks/pc/dos/ibm/3.20/PCDOS320-DISK2.json"}}'/>
 	<keyboard ref="/devices/pc/keyboard/keyboard-minimal-arrows.xml"/>
 	<debugger id="debugger" messages="fault" commands=""/>
diff --git a/devices/pc/machine/5170/ega/1152kb/win300/debugger/machine.xml b/devices/pc/machine/5170/ega/1152kb/win300/debugger/machine.xml
index 43b6e4cea..851c5e15b 100644
--- a/devices/pc/machine/5170/ega/1152kb/win300/debugger/machine.xml
+++ b/devices/pc/machine/5170/ega/1152kb/win300/debugger/machine.xml
@@ -5,9 +5,8 @@
 	<computer id="at-ega-1152k-rev3" name="IBM PC AT" buswidth="24"/>
 	<ram id="ramLow" addr="0x00000" test="true" size="0xa0000" comment="ROM BIOS memory test has NOT been disabled"/>
 	<ram id="ramExt" addr="0x100000" size="0x80000" comment=""/>
-	<rom id="romEGA" addr="0xc0000" size="0x4000" file="/devices/pc/video/ibm/ega/1984-09-13/ibm-ega.json" notify="videoEGA"/>
 	<rom id="romBIOS" addr="0xf0000" size="0x10000" alias="0xff0000" file="/devices/pc/rom/5170/bios/1985-11-15/ATBIOS-REV3.json"/>
-	<video ref="/devices/pc/video/ibm/ega/ibm-ega-128kb-autolockfs.xml"/>
+	<video ref="/devices/pc/video/ibm/ega/1984-09-13/128kb-autolockfs.xml"/>
 	<fdc ref="/disks/pc/compiled/library.xml" automount='{B: {name: "PC-DOS 3.20 (Disk 2)", path: "/disks/pc/dos/ibm/3.20/PCDOS320-DISK2.json"}}'/>
 	<keyboard ref="/devices/pc/keyboard/keyboard-minimal-arrows.xml"/>
 	<debugger id="debugger"/>
diff --git a/devices/pc/machine/5170/ega/1152kb/win300/machine.xml b/devices/pc/machine/5170/ega/1152kb/win300/machine.xml
index 414695f81..15d339ca8 100644
--- a/devices/pc/machine/5170/ega/1152kb/win300/machine.xml
+++ b/devices/pc/machine/5170/ega/1152kb/win300/machine.xml
@@ -5,9 +5,8 @@
 	<computer id="at-ega-1152k-rev3" name="IBM PC AT" buswidth="24"/>
 	<ram id="ramLow" addr="0x00000" test="false" size="0xa0000" comment="ROM BIOS memory test has been disabled"/>
 	<ram id="ramExt" addr="0x100000" size="0x80000" comment=""/>
-	<rom id="romEGA" addr="0xc0000" size="0x4000" file="/devices/pc/video/ibm/ega/1984-09-13/ibm-ega.json" notify="videoEGA"/>
 	<rom id="romBIOS" addr="0xf0000" size="0x10000" alias="0xff0000" file="/devices/pc/rom/5170/bios/1985-11-15/ATBIOS-REV3.json"/>
-	<video ref="/devices/pc/video/ibm/ega/ibm-ega-128kb-autolockfs.xml"/>
+	<video ref="/devices/pc/video/ibm/ega/1984-09-13/128kb-autolockfs.xml"/>
 	<fdc ref="/disks/pc/compiled/library.xml" automount='{B: {name: "PC-DOS 3.20 (Disk 2)", path: "/disks/pc/dos/ibm/3.20/PCDOS320-DISK2.json"}}'/>
 	<keyboard ref="/devices/pc/keyboard/keyboard-minimal-arrows.xml"/>
 	<cpu id="cpu286" model="80286" cycles="8000000" autostart="true" pos="right" padright="8px" padbottom="8px">
diff --git a/devices/pc/machine/5170/ega/640kb/rev1/debugger/machine.xml b/devices/pc/machine/5170/ega/640kb/rev1/debugger/machine.xml
index f1e4063ae..f1f5e5936 100644
--- a/devices/pc/machine/5170/ega/640kb/rev1/debugger/machine.xml
+++ b/devices/pc/machine/5170/ega/640kb/rev1/debugger/machine.xml
@@ -5,9 +5,8 @@
 	<computer id="at-ega-640k" name="IBM PC AT" buswidth="24"/>
 	<cpu id="cpu286" model="80286"/>
 	<ram id="ramLow" addr="0x00000" size="0xa0000"/>
-	<rom id="romEGA" addr="0xc0000" size="0x4000" file="/devices/pc/video/ibm/ega/1984-09-13/ibm-ega.json" notify="videoEGA"/>
 	<rom id="romBIOS" addr="0xf0000" size="0x10000" alias="0xff0000" file="/devices/pc/rom/5170/bios/1984-01-10/ATBIOS-REV1.json"/>
-	<video ref="/devices/pc/video/ibm/ega/ibm-ega-128kb-autolockfs.xml"/>
+	<video ref="/devices/pc/video/ibm/ega/1984-09-13/128kb-autolockfs.xml"/>
 	<fdc ref="/disks/pc/compiled/library.xml" automount='{A: {name: "PC-DOS 3.00 (Disk 1)", path: "/disks/pc/dos/ibm/3.00/PCDOS300-DISK1.json"}, B: {name: "PC-DOS 3.00 (Disk 2)", path: "/disks/pc/dos/ibm/3.00/PCDOS300-DISK2.json"}}'/>
 	<keyboard ref="/devices/pc/keyboard/keyboard-minimal-functions.xml"/>
 	<debugger id="debugger" messages="fault" commands=""/>
diff --git a/devices/pc/machine/5170/ega/640kb/rev1/machine.xml b/devices/pc/machine/5170/ega/640kb/rev1/machine.xml
index e9949acb2..4208f109e 100644
--- a/devices/pc/machine/5170/ega/640kb/rev1/machine.xml
+++ b/devices/pc/machine/5170/ega/640kb/rev1/machine.xml
@@ -5,9 +5,8 @@
 	<computer id="at-ega-640k" name="IBM PC AT" buswidth="24"/>
 	<cpu id="cpu286" model="80286"/>
 	<ram id="ramLow" addr="0x00000" size="0xa0000"/>
-	<rom id="romEGA" addr="0xc0000" size="0x4000" file="/devices/pc/video/ibm/ega/1984-09-13/ibm-ega.json" notify="videoEGA"/>
 	<rom id="romBIOS" addr="0xf0000" size="0x10000" alias="0xff0000" file="/devices/pc/rom/5170/bios/1984-01-10/ATBIOS-REV1.json"/>
-	<video ref="/devices/pc/video/ibm/ega/ibm-ega-128kb-autolockfs.xml"/>
+	<video ref="/devices/pc/video/ibm/ega/1984-09-13/128kb-autolockfs.xml"/>
 	<fdc ref="/disks/pc/compiled/library.xml" pos="right" automount='{A: {name: "MS-DOS 4.00 (Disk 1)", path: "/disks/pc/dos/microsoft/4.00/MSDOS400-DISK1.json"}}'/>
 	<keyboard ref="/devices/pc/keyboard/keyboard-minimal.xml"/>
 	<chipset id="chipset" model="5170" floppies="[1200,1200]"/>
diff --git a/devices/pc/machine/5170/vga/2048kb/win310/debugger/machine.xml b/devices/pc/machine/5170/vga/2048kb/win310/debugger/machine.xml
index 6b8cb34ae..2f186600d 100644
--- a/devices/pc/machine/5170/vga/2048kb/win310/debugger/machine.xml
+++ b/devices/pc/machine/5170/vga/2048kb/win310/debugger/machine.xml
@@ -5,9 +5,8 @@
 	<computer id="at-vga-2048k" name="IBM PC AT" buswidth="24"/>
 	<ram id="ramLow" addr="0x00000" test="true" size="0xa0000" comment="ROM BIOS memory test has NOT been disabled"/>
 	<ram id="ramExt" addr="0x100000" size="0x160000" comment=""/>
-	<rom id="romVGA" addr="0xc0000" size="0x6000" file="/devices/pc/video/ibm/vga/1986-10-27/ibm-vga.json" notify="videoVGA[0x378d,0x3f8d]"/>
 	<rom id="romBIOS" addr="0xf0000" size="0x10000" alias="0xff0000" file="/devices/pc/rom/5170/bios/1985-11-15/ATBIOS-REV3.json"/>
-	<video ref="/devices/pc/video/ibm/vga/ibm-vga-autolockfs.xml"/>
+	<video ref="/devices/pc/video/ibm/vga/1986-10-27/256kb-autolockfs.xml"/>
 	<fdc ref="/disks/pc/compiled/library.xml" automount=''/>
 	<keyboard ref="/devices/pc/keyboard/keyboard-minimal-arrows.xml"/>
 	<debugger id="debugger"/>
diff --git a/devices/pc/machine/5170/vga/2048kb/win310/machine.xml b/devices/pc/machine/5170/vga/2048kb/win310/machine.xml
index 49f03e604..016a880b4 100644
--- a/devices/pc/machine/5170/vga/2048kb/win310/machine.xml
+++ b/devices/pc/machine/5170/vga/2048kb/win310/machine.xml
@@ -5,9 +5,8 @@
 	<computer id="at-vga-2048k" name="IBM PC AT" buswidth="24"/>
 	<ram id="ramLow" addr="0x00000" test="false" size="0xa0000" comment="ROM BIOS memory test has been disabled"/>
 	<ram id="ramExt" addr="0x100000" size="0x160000" comment=""/>
-	<rom id="romVGA" addr="0xc0000" size="0x6000" file="/devices/pc/video/ibm/vga/1986-10-27/ibm-vga.json" notify="videoVGA[0x378d,0x3f8d]"/>
 	<rom id="romBIOS" addr="0xf0000" size="0x10000" alias="0xff0000" file="/devices/pc/rom/5170/bios/1985-11-15/ATBIOS-REV3.json"/>
-	<video ref="/devices/pc/video/ibm/vga/ibm-vga-autolockfs.xml"/>
+	<video ref="/devices/pc/video/ibm/vga/1986-10-27/256kb-autolockfs.xml"/>
 	<fdc ref="/disks/pc/compiled/library.xml" automount=''/>
 	<keyboard ref="/devices/pc/keyboard/keyboard-minimal-arrows.xml"/>
 	<cpu id="cpu286" model="80286" cycles="8000000" autostart="true" pos="right" padright="8px" padbottom="8px">
diff --git a/devices/pc/machine/compaq/deskpro386/ega/2048kb/machine.xml b/devices/pc/machine/compaq/deskpro386/ega/2048kb/machine.xml
index 7197fd1d2..3182c66ce 100644
--- a/devices/pc/machine/compaq/deskpro386/ega/2048kb/machine.xml
+++ b/devices/pc/machine/compaq/deskpro386/ega/2048kb/machine.xml
@@ -7,9 +7,8 @@
 	<ram id="ramLow" addr="0x00000" test="false" size="0xa0000" comment="ROM BIOS memory test has been disabled"/>
 	<ram id="ramCPQ" addr="0xfa0000" size="0x60000" comment="COMPAQ memory at 0xFA0000"/>
 	<ram id="ramExt" addr="0x100000" size="0x100000" comment="Extended memory at 0x100000"/>
-	<rom id="romEGA" addr="0xc0000" size="0x4000" file="/devices/pc/video/compaq/ega/000412-001B/compaq-ega.json" notify="videoEGA"/>
 	<rom id="romBIOS" addr="0xf8000" size="0x8000" alias="[0xf0000,0xffff0000,0xffff8000]" file="/devices/pc/rom/compaq/bios/deskpro386/1988-01-28/1988-01-28.json"/>
-	<video ref="/devices/pc/video/compaq/ega/compaq-ega-256kb-autolockfs.xml"/>
+	<video ref="/devices/pc/video/ibm/ega/1984-09-13/128kb-autolockfs.xml"/>
 	<fdc ref="/disks/pc/compiled/library.xml" automount='{A: {name: "PC-DOS 3.30 (Disk 1)", path: "/disks/pc/dos/ibm/3.30/PCDOS330-DISK1.json"}, B: {name: "PC-DOS 3.30 (Disk 2)", path: "/disks/pc/dos/ibm/3.30/PCDOS330-DISK2.json"}}'/>
 	<keyboard ref="/devices/pc/keyboard/keyboard-minimal-arrows.xml"/>
 	<debugger id="debugger" messages="" commands=""/>
diff --git a/devices/pc/machine/compaq/deskpro386/ega/4096kb/machine.xml b/devices/pc/machine/compaq/deskpro386/ega/4096kb/machine.xml
index e8a0c7a67..6554f4474 100644
--- a/devices/pc/machine/compaq/deskpro386/ega/4096kb/machine.xml
+++ b/devices/pc/machine/compaq/deskpro386/ega/4096kb/machine.xml
@@ -7,9 +7,8 @@
 	<ram id="ramLow" addr="0x00000" test="false" size="0xa0000" comment="ROM BIOS memory test has been disabled"/>
 	<ram id="ramCPQ" addr="0xfa0000" size="0x60000" comment="COMPAQ memory at 0xFA0000"/>
 	<ram id="ramExt" addr="0x100000" size="0x300000" comment="Extended memory at 0x100000"/>
-	<rom id="romEGA" addr="0xc0000" size="0x4000" file="/devices/pc/video/compaq/ega/000412-001B/compaq-ega.json" notify="videoEGA"/>
 	<rom id="romBIOS" addr="0xf8000" size="0x8000" alias="[0xf0000,0xffff0000,0xffff8000]" file="/devices/pc/rom/compaq/bios/deskpro386/1988-01-28/1988-01-28.json"/>
-	<video ref="/devices/pc/video/compaq/ega/compaq-ega-256kb-autolockfs.xml"/>
+	<video ref="/devices/pc/video/ibm/ega/1984-09-13/128kb-autolockfs.xml"/>
 	<fdc ref="/disks/pc/compiled/library.xml" automount='{A: {name: "PC-DOS 3.30 (Disk 1)", path: "/disks/pc/dos/ibm/3.30/PCDOS330-DISK1.json"}, B: {name: "PC-DOS 3.30 (Disk 2)", path: "/disks/pc/dos/ibm/3.30/PCDOS330-DISK2.json"}}'/>
 	<keyboard ref="/devices/pc/keyboard/keyboard-minimal-arrows.xml"/>
 	<debugger id="debugger" messages="" commands=""/>
diff --git a/devices/pc/machine/compaq/deskpro386/other/2048kb/machine.xml b/devices/pc/machine/compaq/deskpro386/other/2048kb/machine.xml
index a9bed7fd3..3f45d4bfc 100644
--- a/devices/pc/machine/compaq/deskpro386/other/2048kb/machine.xml
+++ b/devices/pc/machine/compaq/deskpro386/other/2048kb/machine.xml
@@ -7,9 +7,8 @@
 	<ram id="ramLow" addr="0x00000" test="true" size="0xa0000" comment="ROM BIOS memory test has NOT been disabled"/>
 	<ram id="ramCPQ" addr="0xfa0000" size="0x60000" comment="COMPAQ memory at 0xFA0000"/>
 	<ram id="ramExt" addr="0x100000" size="0x100000" comment="Extended memory at 0x100000"/>
-	<rom id="romVGA" addr="0xc0000" size="0x8000" file="/devices/pc/video/compaq/vga/109360-001/1987-10-27.json" notify="videoVGA"/>
 	<rom id="romBIOS" addr="0xf8000" size="0x8000" alias="[0xf0000,0xffff0000,0xffff8000]" file="/devices/pc/rom/compaq/bios/deskpro386/1988-01-28/1988-01-28.json"/>
-	<video ref="/devices/pc/video/compaq/vga/compaq-vga-lock.xml"/>
+	<video ref="/devices/pc/video/compaq/vga/109360-001/256kb-vga-lock.xml"/>
 	<fdc ref="/disks/pc/compiled/library.xml" automount='{A: {name: "PC-DOS 3.00 (Disk 1)", path: "/disks/pc/dos/ibm/3.00/PCDOS300-DISK1.json"}, B: {name: "PC-DOS 3.00 (Disk 2)", path: "/disks/pc/dos/ibm/3.00/PCDOS300-DISK2.json"}}'/>
 	<keyboard ref="/devices/pc/keyboard/keyboard-minimal-functions.xml"/>
 	<debugger id="debugger" messages="fault|port" commands=""/>
diff --git a/devices/pc/machine/compaq/deskpro386/vga/2048kb/machine.xml b/devices/pc/machine/compaq/deskpro386/vga/2048kb/machine.xml
index 7372d4da6..fd4ccd8a0 100644
--- a/devices/pc/machine/compaq/deskpro386/vga/2048kb/machine.xml
+++ b/devices/pc/machine/compaq/deskpro386/vga/2048kb/machine.xml
@@ -7,9 +7,8 @@
 	<ram id="ramLow" addr="0x00000" test="false" size="0xa0000" comment="ROM BIOS memory test has been disabled"/>
 	<ram id="ramCPQ" addr="0xfa0000" size="0x60000" comment="COMPAQ memory at 0xFA0000"/>
 	<ram id="ramExt" addr="0x100000" size="0x100000" comment="Extended memory at 0x100000"/>
-	<rom id="romVGA" addr="0xc0000" size="0x6000" file="/devices/pc/video/ibm/vga/1986-10-27/ibm-vga.json" notify="videoVGA[0x378d,0x3f8d]"/>
 	<rom id="romBIOS" addr="0xf8000" size="0x8000" alias="[0xf0000,0xffff0000,0xffff8000]" file="/devices/pc/rom/compaq/bios/deskpro386/1988-01-28/1988-01-28.json"/>
-	<video ref="/devices/pc/video/ibm/vga/ibm-vga-autolockfs.xml"/>
+	<video ref="/devices/pc/video/ibm/vga/1986-10-27/256kb-autolockfs.xml"/>
 	<fdc ref="/disks/pc/compiled/library.xml" automount='{A: {name: "PC-DOS 3.30 (Disk 1)", path: "/disks/pc/dos/ibm/3.30/PCDOS330-DISK1.json"}, B: {name: "VGA Tests (Black Book)", path: "/tests/pc/vga/VGABIN.json"}}'/>
 	<keyboard ref="/devices/pc/keyboard/keyboard-minimal-functions.xml"/>
 	<debugger id="debugger" messages="fault|int" commands=""/>
diff --git a/devices/pc/machine/compaq/deskpro386/vga/4096kb/machine.xml b/devices/pc/machine/compaq/deskpro386/vga/4096kb/machine.xml
index a7b0206cd..bc2486c49 100644
--- a/devices/pc/machine/compaq/deskpro386/vga/4096kb/machine.xml
+++ b/devices/pc/machine/compaq/deskpro386/vga/4096kb/machine.xml
@@ -7,9 +7,8 @@
 	<ram id="ramLow" addr="0x00000" test="false" size="0xa0000" comment="ROM BIOS memory test has been disabled"/>
 	<ram id="ramCPQ" addr="0xfa0000" size="0x60000" comment="COMPAQ memory at 0xFA0000"/>
 	<ram id="ramExt" addr="0x100000" size="0x300000" comment="Extended memory at 0x100000"/>
-	<rom id="romVGA" addr="0xc0000" size="0x6000" file="/devices/pc/video/ibm/vga/1986-10-27/ibm-vga.json" notify="videoVGA[0x378d,0x3f8d]"/>
 	<rom id="romBIOS" addr="0xf8000" size="0x8000" alias="[0xf0000,0xffff0000,0xffff8000]" file="/devices/pc/rom/compaq/bios/deskpro386/1988-01-28/1988-01-28.json"/>
-	<video ref="/devices/pc/video/ibm/vga/ibm-vga-lockfs.xml"/>
+	<video ref="/devices/pc/video/ibm/vga/1986-10-27/256kb-autolockfs.xml"/>
 	<fdc ref="/disks/pc/compiled/library.xml" automount=''/>
 	<keyboard id="keyboard"/>
 	<debugger id="debugger" messages="" commands=''/>
diff --git a/devices/pc/video/compaq/ega/compaq-ega-256kb-autolockfs.xml b/devices/pc/video/compaq/ega/000412-001B/256kb-autolockfs.xml
similarity index 82%
rename from devices/pc/video/compaq/ega/compaq-ega-256kb-autolockfs.xml
rename to devices/pc/video/compaq/ega/000412-001B/256kb-autolockfs.xml
index 516863c1d..08dc0edc1 100644
--- a/devices/pc/video/compaq/ega/compaq-ega-256kb-autolockfs.xml
+++ b/devices/pc/video/compaq/ega/000412-001B/256kb-autolockfs.xml
@@ -9,4 +9,5 @@
 			<control type="button" binding="fullScreen" padleft="8px">Full Screen</control>
 		</control>
 	</menu>
+	<rom id="romEGA" addr="0xc0000" size="0x4000" file="/devices/pc/video/compaq/ega/000412-001B/compaq-ega.json" notify="videoEGA"/>
 </video>
diff --git a/devices/pc/video/compaq/vga/compaq-vga-lock.xml b/devices/pc/video/compaq/vga/109360-001/256kb-vga-lock.xml
similarity index 81%
rename from devices/pc/video/compaq/vga/compaq-vga-lock.xml
rename to devices/pc/video/compaq/vga/109360-001/256kb-vga-lock.xml
index 4e1829ec3..fd1ed243d 100644
--- a/devices/pc/video/compaq/vga/compaq-vga-lock.xml
+++ b/devices/pc/video/compaq/vga/109360-001/256kb-vga-lock.xml
@@ -9,4 +9,5 @@
 			<control type="button" binding="fullScreen" padleft="8px">Full Screen</control>
 		</control>
 	</menu>
+	<rom id="romVGA" addr="0xc0000" size="0x8000" file="/devices/pc/video/compaq/vga/109360-001/1987-10-27.json" notify="videoVGA"/>
 </video>
diff --git a/devices/pc/video/ibm/ega/ibm-ega-128kb-autolock640.xml b/devices/pc/video/ibm/ega/1984-09-13/128kb-autolock640.xml
similarity index 100%
rename from devices/pc/video/ibm/ega/ibm-ega-128kb-autolock640.xml
rename to devices/pc/video/ibm/ega/1984-09-13/128kb-autolock640.xml
diff --git a/devices/pc/video/ibm/ega/ibm-ega-128kb-autolockfs.xml b/devices/pc/video/ibm/ega/1984-09-13/128kb-autolockfs.xml
similarity index 83%
rename from devices/pc/video/ibm/ega/ibm-ega-128kb-autolockfs.xml
rename to devices/pc/video/ibm/ega/1984-09-13/128kb-autolockfs.xml
index 031693fb9..e0d724405 100644
--- a/devices/pc/video/ibm/ega/ibm-ega-128kb-autolockfs.xml
+++ b/devices/pc/video/ibm/ega/1984-09-13/128kb-autolockfs.xml
@@ -9,4 +9,5 @@
 			<control type="button" binding="fullScreen" padleft="8px">Full Screen</control>
 		</control>
 	</menu>
+	<rom id="romEGA" addr="0xc0000" size="0x4000" file="/devices/pc/video/ibm/ega/1984-09-13/ibm-ega.json" notify="videoEGA"/>
 </video>
diff --git a/devices/pc/video/ibm/ega/ibm-ega-128kb-lockfs.xml b/devices/pc/video/ibm/ega/1984-09-13/128kb-lockfs.xml
similarity index 100%
rename from devices/pc/video/ibm/ega/ibm-ega-128kb-lockfs.xml
rename to devices/pc/video/ibm/ega/1984-09-13/128kb-lockfs.xml
diff --git a/devices/pc/video/ibm/ega/ibm-ega-256kb-autolock640.xml b/devices/pc/video/ibm/ega/1984-09-13/256kb-autolock640.xml
similarity index 80%
rename from devices/pc/video/ibm/ega/ibm-ega-256kb-autolock640.xml
rename to devices/pc/video/ibm/ega/1984-09-13/256kb-autolock640.xml
index df98b64fb..4c2040790 100644
--- a/devices/pc/video/ibm/ega/ibm-ega-256kb-autolock640.xml
+++ b/devices/pc/video/ibm/ega/1984-09-13/256kb-autolock640.xml
@@ -8,4 +8,5 @@
 			<control type="led" label="Scroll" binding="scroll-lock" padleft="8px"/>
 		</control>
 	</menu>
+	<rom id="romEGA" addr="0xc0000" size="0x4000" file="/devices/pc/video/ibm/ega/1984-09-13/ibm-ega.json" notify="videoEGA"/>
 </video>
diff --git a/devices/pc/video/ibm/ega/ibm-ega-256kb-autolockfs.xml b/devices/pc/video/ibm/ega/1984-09-13/256kb-autolockfs.xml
similarity index 83%
rename from devices/pc/video/ibm/ega/ibm-ega-256kb-autolockfs.xml
rename to devices/pc/video/ibm/ega/1984-09-13/256kb-autolockfs.xml
index f6858e04f..d5fb2f514 100644
--- a/devices/pc/video/ibm/ega/ibm-ega-256kb-autolockfs.xml
+++ b/devices/pc/video/ibm/ega/1984-09-13/256kb-autolockfs.xml
@@ -9,4 +9,5 @@
 			<control type="button" binding="fullScreen" padleft="8px">Full Screen</control>
 		</control>
 	</menu>
+	<rom id="romEGA" addr="0xc0000" size="0x4000" file="/devices/pc/video/ibm/ega/1984-09-13/ibm-ega.json" notify="videoEGA"/>
 </video>
diff --git a/devices/pc/video/ibm/ega/ibm-ega-256kb-lockfs.xml b/devices/pc/video/ibm/ega/1984-09-13/256kb-lockfs.xml
similarity index 84%
rename from devices/pc/video/ibm/ega/ibm-ega-256kb-lockfs.xml
rename to devices/pc/video/ibm/ega/1984-09-13/256kb-lockfs.xml
index 31b7fb6f3..5da46ae59 100644
--- a/devices/pc/video/ibm/ega/ibm-ega-256kb-lockfs.xml
+++ b/devices/pc/video/ibm/ega/1984-09-13/256kb-lockfs.xml
@@ -10,4 +10,5 @@
 			<control type="button" binding="fullScreen" padleft="8px">Full Screen</control>
 		</control>
 	</menu>
+	<rom id="romEGA" addr="0xc0000" size="0x4000" file="/devices/pc/video/ibm/ega/1984-09-13/ibm-ega.json" notify="videoEGA"/>
 </video>
diff --git a/devices/pc/video/ibm/ega/ibm-ega-64kb.xml b/devices/pc/video/ibm/ega/1984-09-13/64kb.xml
similarity index 80%
rename from devices/pc/video/ibm/ega/ibm-ega-64kb.xml
rename to devices/pc/video/ibm/ega/1984-09-13/64kb.xml
index 89fc2b74f..0faed795b 100644
--- a/devices/pc/video/ibm/ega/ibm-ega-64kb.xml
+++ b/devices/pc/video/ibm/ega/1984-09-13/64kb.xml
@@ -8,4 +8,5 @@
 			<control type="led" label="Scroll" binding="scroll-lock" padleft="8px"/>
 		</control>
 	</menu>
+	<rom id="romEGA" addr="0xc0000" size="0x4000" file="/devices/pc/video/ibm/ega/1984-09-13/ibm-ega.json" notify="videoEGA"/>
 </video>
diff --git a/devices/pc/video/ibm/vga/ibm-vga-autolockfs.xml b/devices/pc/video/ibm/vga/1986-10-27/256kb-autolockfs.xml
similarity index 81%
rename from devices/pc/video/ibm/vga/ibm-vga-autolockfs.xml
rename to devices/pc/video/ibm/vga/1986-10-27/256kb-autolockfs.xml
index 61048e062..b9f2d1721 100644
--- a/devices/pc/video/ibm/vga/ibm-vga-autolockfs.xml
+++ b/devices/pc/video/ibm/vga/1986-10-27/256kb-autolockfs.xml
@@ -9,4 +9,5 @@
 			<control type="button" binding="fullScreen" padleft="8px">Full Screen</control>
 		</control>
 	</menu>
+	<rom id="romVGA" addr="0xc0000" size="0x6000" file="/devices/pc/video/ibm/vga/1986-10-27/ibm-vga.json" notify="videoVGA[0x378d,0x3f8d]"/>
 </video>
diff --git a/devices/pc/video/ibm/vga/ibm-vga-lockfs.xml b/devices/pc/video/ibm/vga/1986-10-27/256kb-lockfs.xml
similarity index 100%
rename from devices/pc/video/ibm/vga/ibm-vga-lockfs.xml
rename to devices/pc/video/ibm/vga/1986-10-27/256kb-lockfs.xml
diff --git a/disks/pc/os2/ibm/1.0/machine.xml b/disks/pc/os2/ibm/1.0/machine.xml
index 57969045c..ebf4e4818 100644
--- a/disks/pc/os2/ibm/1.0/machine.xml
+++ b/disks/pc/os2/ibm/1.0/machine.xml
@@ -6,9 +6,8 @@
 	<cpu id="cpu286" model="80286" cycles="8000000" autostart="true"/>
 	<ram id="ramLow" addr="0x00000" test="false" size="0xa0000" comment="ROM BIOS memory test has been disabled"/>
 	<ram id="ramExt" addr="0x100000" size="0x160000" comment=""/>
-	<rom id="romEGA" addr="0xc0000" size="0x4000" file="/devices/pc/video/ibm/ega/1984-09-13/ibm-ega.json" notify="videoEGA"/>
 	<rom id="romBIOS" addr="0xf0000" size="0x10000" alias="0xff0000" file="/devices/pc/rom/5170/bios/1985-11-15/ATBIOS-REV3.json"/>
-	<video ref="/devices/pc/video/ibm/ega/ibm-ega-128kb-lockfs.xml"/>
+	<video ref="/devices/pc/video/ibm/ega/1984-09-13/128kb-lockfs.xml"/>
 	<fdc ref="/disks/pc/compiled/library.xml" automount=''/>
 	<keyboard ref="/devices/pc/keyboard/keyboard-minimal-arrows.xml"/>
 	<debugger id="debugger" messages="fault" commands=""/>
diff --git a/modules/pcjs/lib/x86cpu.js b/modules/pcjs/lib/x86cpu.js
index 138eca11d..9705a6cd4 100644
--- a/modules/pcjs/lib/x86cpu.js
+++ b/modules/pcjs/lib/x86cpu.js
@@ -1063,7 +1063,7 @@ X86CPU.prototype.resetRegs = function()
      */
     this.fMDSet = false;        // regMDHi and/or regMDLo are invalid unless fMDSet is true
     this.regMDLo = this.regMDHi = 0;
-    this.regXX = 0;             // for internal use only (eg, assists with ModRM decoder helper functions)
+    this.regXX = 0;             // for internal use only (eg, assists with ModRM helper functions)
 
     /*
      * This internal "register" is set in selected opcode handlers to record the original opcode; ordinarily,