From a40873092837450aedb533c2d7fcd0765be0902a Mon Sep 17 00:00:00 2001
From: Jeff Parsons <Jeff@pcjs.org>
Date: Sat, 15 Nov 2014 11:59:22 -0800
Subject: [PATCH] Factored XML video definitions

---
 .../pc/machine/5150/cga/384kb/softkbd/machine.xml    |  8 ++------
 .../5150/cga/64kb/donkey/debugger/machine.xml        |  6 +-----
 devices/pc/machine/5150/cga/64kb/donkey/machine.xml  |  6 +-----
 devices/pc/machine/5150/cga/64kb/softkbd/machine.xml |  8 ++------
 .../pc/machine/5150/mda/64kb/debugger/machine.xml    |  6 +-----
 devices/pc/machine/5150/mda/64kb/machine.xml         |  6 +-----
 devices/pc/machine/5150/mda/64kb/softkbd/machine.xml |  9 +--------
 devices/pc/machine/5160/cga/256kb/array/machine.xml  |  8 ++------
 .../machine/5160/cga/256kb/demo/debugger/machine.xml |  6 +-----
 devices/pc/machine/5160/cga/256kb/demo/machine.xml   |  6 +-----
 .../pc/machine/5160/cga/256kb/softkbd/machine.xml    |  8 ++------
 .../5160/cga/256kb/win101/debugger/machine.xml       |  7 +------
 devices/pc/machine/5160/cga/256kb/win101/machine.xml |  7 +------
 .../5160/cga/256kb/win101/softkbd/machine.xml        |  7 +------
 .../5160/cga/512kb/win101/softkbd/machine.xml        |  7 +------
 .../pc/machine/5160/cga/640kb/debugger/machine.xml   |  6 +-----
 .../pc/machine/5160/cga/640kb/dos400m/machine.xml    |  9 ++-------
 devices/pc/machine/5160/cga/640kb/machine.xml        |  6 +-----
 .../pc/machine/5160/ega/256kb/debugger/machine.xml   |  6 +-----
 devices/pc/machine/5160/ega/640kb/array/machine.xml  |  7 +------
 .../pc/machine/5160/ega/640kb/debugger/machine.xml   |  7 +------
 devices/pc/machine/5160/ega/640kb/machine.xml        |  7 +------
 devices/pc/machine/5160/ega/640kb/win101/machine.xml |  7 +------
 .../5160/mda/256kb/fake188/debugger/machine.xml      |  6 +-----
 .../pc/machine/5160/mda/256kb/fake188/machine.xml    |  6 +-----
 devices/pc/machine/5160/mda/256kb/machine.xml        |  8 ++------
 devices/pc/machine/5160/mda/64kb/softkbd/machine.xml |  8 ++------
 devices/pc/machine/5170/ega/1152kb/rev1/machine.xml  |  7 +------
 devices/pc/machine/5170/ega/1152kb/rev3/machine.xml  |  7 +------
 devices/pc/machine/5170/ega/640kb/rev1/machine.xml   |  7 +------
 devices/pc/video/video-cga-960-touch.xml             | 11 +++++++++++
 devices/pc/video/video-cga-960.xml                   | 11 +++++++++++
 devices/pc/video/video-cga-lock.xml                  | 12 ++++++++++++
 devices/pc/video/video-cga.xml                       | 11 +++++++++++
 devices/pc/video/video-ega-128kb-lock.xml            | 12 ++++++++++++
 devices/pc/video/video-ega-640-128kb-lock.xml        | 12 ++++++++++++
 devices/pc/video/video-ega-64kb.xml                  | 11 +++++++++++
 devices/pc/video/video-mda.xml                       | 11 +++++++++++
 disks/pc/cpm/machine.xml                             |  8 ++------
 disks/pc/diags/ibm/2.20/machine.xml                  |  9 +--------
 disks/pc/games/infocom/machine-debug.xml             | 10 +++-------
 disks/pc/games/infocom/machine.xml                   |  8 ++------
 disks/pc/games/infocom/zork1/debugger/machine.xml    |  8 ++------
 disks/pc/games/microsoft/adventure/machine.xml       |  6 +-----
 44 files changed, 139 insertions(+), 210 deletions(-)
 create mode 100644 devices/pc/video/video-cga-960-touch.xml
 create mode 100644 devices/pc/video/video-cga-960.xml
 create mode 100644 devices/pc/video/video-cga-lock.xml
 create mode 100644 devices/pc/video/video-cga.xml
 create mode 100644 devices/pc/video/video-ega-128kb-lock.xml
 create mode 100644 devices/pc/video/video-ega-640-128kb-lock.xml
 create mode 100644 devices/pc/video/video-ega-64kb.xml
 create mode 100644 devices/pc/video/video-mda.xml

diff --git a/devices/pc/machine/5150/cga/384kb/softkbd/machine.xml b/devices/pc/machine/5150/cga/384kb/softkbd/machine.xml
index 7c6947cf2..289882855 100644
--- a/devices/pc/machine/5150/cga/384kb/softkbd/machine.xml
+++ b/devices/pc/machine/5150/cga/384kb/softkbd/machine.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="/versions/pcjs/1.16.0/machine.xsl"?>
-<machine id="ibm5150" class="pc" border="1" pos="center" width="1000px" style="background-color:white">
+<machine id="ibm5150" class="pc" border="1" width="1000px" pos="center" style="background-color:white">
 	<name>IBM PC (Model 5150), CGA, 384K</name>
 	<computer id="pc-cga-384k" name="IBM PC"/>
 	<cpu id="cpu8088" model="8088"/>
@@ -8,11 +8,7 @@
 	<ram id="ramLow" addr="0x00000" test="false" comment="no memory test"/>
 	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/basic/ibm-basic-1.00.json"/>
 	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/bios/5150/1981-04-24.json"/>
-	<video id="videoCGA" screenwidth="960" screenheight="400" scale="true" charset="/devices/pc/video/ibm-mda-cga.json" pos="center" width="960px" padding="8px">
-		<menu>
-			<title>Color Display</title>
-		</menu>
-	</video>
+	<video ref="/devices/pc/video/video-cga-960.xml"/>
 	<keyboard ref="/devices/pc/keyboard/us83.xml"/>
 	<panel ref="/devices/pc/panel/wide.xml"/>
 	<fdc ref="/disks/pc/samples.xml" width="280px"/>
diff --git a/devices/pc/machine/5150/cga/64kb/donkey/debugger/machine.xml b/devices/pc/machine/5150/cga/64kb/donkey/debugger/machine.xml
index 8a78558cf..f5f900563 100644
--- a/devices/pc/machine/5150/cga/64kb/donkey/debugger/machine.xml
+++ b/devices/pc/machine/5150/cga/64kb/donkey/debugger/machine.xml
@@ -6,11 +6,7 @@
 	<ram id="ramLow" addr="0x00000"/>
 	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/basic/ibm-basic-1.00.json"/>
 	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/bios/5150/1981-04-24.json"/>
-	<video id="videoCGA" screenwidth="960" screenheight="400" scale="true" charset="/devices/pc/video/ibm-mda-cga.json" width="960px" padding="8px">
-		<menu>
-			<title>Color Display</title>
-		</menu>
-	</video>
+	<video ref="/devices/pc/video/video-cga-960.xml"/>
 	<cpu id="cpu8088" model="8088" autostart="true"/>
 	<keyboard ref="/devices/pc/keyboard/minimal.xml"/>
 	<debugger id="debugger"/>
diff --git a/devices/pc/machine/5150/cga/64kb/donkey/machine.xml b/devices/pc/machine/5150/cga/64kb/donkey/machine.xml
index d8e7c1feb..6140dcb22 100644
--- a/devices/pc/machine/5150/cga/64kb/donkey/machine.xml
+++ b/devices/pc/machine/5150/cga/64kb/donkey/machine.xml
@@ -6,11 +6,7 @@
 	<ram id="ramLow" addr="0x00000"/>
 	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/basic/ibm-basic-1.00.json"/>
 	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/bios/5150/1981-04-24.json"/>
-	<video id="videoCGA" screenwidth="960" screenheight="400" scale="true" charset="/devices/pc/video/ibm-mda-cga.json" width="960px" padding="8px">
-		<menu>
-			<title>Color Display</title>
-		</menu>
-	</video>
+	<video ref="/devices/pc/video/video-cga-960.xml"/>
 	<cpu id="cpu8088" model="8088" autostart="true" padleft="8px">
 		<control type="button" class="input" binding="run">Run</control>
 		<control type="button" class="input" binding="reset">Reset</control>
diff --git a/devices/pc/machine/5150/cga/64kb/softkbd/machine.xml b/devices/pc/machine/5150/cga/64kb/softkbd/machine.xml
index effa1d0c6..147ff1195 100644
--- a/devices/pc/machine/5150/cga/64kb/softkbd/machine.xml
+++ b/devices/pc/machine/5150/cga/64kb/softkbd/machine.xml
@@ -1,17 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="/versions/pcjs/1.16.0/machine.xsl"?>
-<machine id="ibm5150" class="pc" border="1" pos="center" width="1000px" style="background-color:white">
+<machine id="ibm5150" class="pc" border="1" width="1000px" pos="center" style="background-color:white">
 	<name>IBM PC (Model 5150), CGA, 64K</name>
 	<computer id="pc-cga-64k" name="IBM PC"/>
 	<cpu id="cpu8088" model="8088"/>
 	<ram id="ramLow" addr="0x00000"/>
 	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/basic/ibm-basic-1.00.json"/>
 	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/bios/5150/1981-04-24.json"/>
-	<video id="videoCGA" screenwidth="960" screenheight="400" scale="true" charset="/devices/pc/video/ibm-mda-cga.json" pos="center" width="960px" padding="8px">
-		<menu>
-			<title>Color Display</title>
-		</menu>
-	</video>
+	<video ref="/devices/pc/video/video-cga-960.xml"/>
 	<keyboard ref="/devices/pc/keyboard/us83.xml"/>
 	<debugger id="debugger"/>
 	<panel ref="/devices/pc/panel/wide.xml"/>
diff --git a/devices/pc/machine/5150/mda/64kb/debugger/machine.xml b/devices/pc/machine/5150/mda/64kb/debugger/machine.xml
index d8f885231..5a1fabc24 100644
--- a/devices/pc/machine/5150/mda/64kb/debugger/machine.xml
+++ b/devices/pc/machine/5150/mda/64kb/debugger/machine.xml
@@ -6,11 +6,7 @@
 	<ram id="ramLow" addr="0x00000"/>
 	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/basic/ibm-basic-1.00.json"/>
 	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/bios/5150/1981-04-24.json"/>
-	<video id="videoMDA" screenwidth="720" screenheight="350" scale="true" charset="/devices/pc/video/ibm-mda-cga.json" pos="center" padding="8px">
-		<menu>
-			<title>Monochrome Display</title>
-		</menu>
-	</video>
+	<video ref="/devices/pc/video/video-mda.xml"/>
 	<cpu id="cpu8088" model="8088" autostart="true"/>
 	<keyboard ref="/devices/pc/keyboard/minimal-functions.xml"/>
 	<debugger id="debugger"/>
diff --git a/devices/pc/machine/5150/mda/64kb/machine.xml b/devices/pc/machine/5150/mda/64kb/machine.xml
index 114a9b025..85212196a 100644
--- a/devices/pc/machine/5150/mda/64kb/machine.xml
+++ b/devices/pc/machine/5150/mda/64kb/machine.xml
@@ -6,11 +6,7 @@
 	<ram id="ramLow" addr="0x00000"/>
 	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/basic/ibm-basic-1.00.json"/>
 	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/bios/5150/1981-04-24.json"/>
-	<video id="videoMDA" screenwidth="720" screenheight="350" scale="true" charset="/devices/pc/video/ibm-mda-cga.json" pos="center" padding="8px">
-		<menu>
-			<title>Monochrome Display</title>
-		</menu>
-	</video>
+	<video ref="/devices/pc/video/video-mda.xml"/>
 	<cpu id="cpu8088" model="8088" autostart="true" padleft="8px">
 		<control type="button" class="input" binding="run">Run</control>
 		<control type="button" class="input" binding="reset">Reset</control>
diff --git a/devices/pc/machine/5150/mda/64kb/softkbd/machine.xml b/devices/pc/machine/5150/mda/64kb/softkbd/machine.xml
index 2cb681bc0..4b4713014 100644
--- a/devices/pc/machine/5150/mda/64kb/softkbd/machine.xml
+++ b/devices/pc/machine/5150/mda/64kb/softkbd/machine.xml
@@ -7,14 +7,7 @@
 	<ram id="ramLow" addr="0x00000"/>
 	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/basic/ibm-basic-1.00.json"/>
 	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/bios/5150/1981-04-24.json"/>
-	<video id="videoMDA" screenwidth="720" screenheight="350" scale="true" charset="/devices/pc/video/ibm-mda-cga.json" pos="center" padding="8px">
-		<menu>
-			<title>Monochrome Display</title>
-			<control type="led" class="output" label="Scroll" binding="scroll-lock" pos="right" padleft="8px"/>
-			<control type="led" class="output" label="Num" binding="num-lock" pos="right" padleft="8px"/>
-			<control type="led" class="output" label="Caps" binding="caps-lock" pos="right" padleft="8px"/>
-		</menu>
-	</video>
+	<video ref="/devices/pc/video/video-mda.xml"/>
 	<keyboard ref="/devices/pc/keyboard/us83.xml"/>
 	<debugger id="debugger"/>
 	<panel ref="/devices/pc/panel/wide.xml"/>
diff --git a/devices/pc/machine/5160/cga/256kb/array/machine.xml b/devices/pc/machine/5160/cga/256kb/array/machine.xml
index 3ba70a661..f5f3463cb 100644
--- a/devices/pc/machine/5160/cga/256kb/array/machine.xml
+++ b/devices/pc/machine/5160/cga/256kb/array/machine.xml
@@ -1,17 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="/versions/pcjs/1.16.0/machine.xsl"?>
-<machine id="ibm5160" class="pc" border="1" pos="center" width="1000px" style="background-color:white">
+<machine id="ibm5160" class="pc" border="1" width="1000px" pos="center" style="background-color:white">
 	<name pos="center">IBM PC XT (Model 5160), CGA, 256K, 10Mb Drive</name>
 	<computer id="xt-cga-256k" name="IBM PC XT"/>
 	<ram id="ramLow" addr="0x00000" test="false"/>
 	<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/basic/ibm-basic-1.10.json"/>
 	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/bios/5160/1982-11-08.json"/>
-	<video id="videoCGA" screenwidth="960" screenheight="400" scale="true" charset="/devices/pc/video/ibm-mda-cga.json" pos="center" width="960px" padding="8px">
-		<menu>
-			<title>Color Display</title>
-		</menu>
-	</video>
+	<video ref="/devices/pc/video/video-cga-960.xml"/>
 	<cpu id="cpu8088" model="8088" autostart="true" pos="left" padleft="8px">
 		<control type="button" class="input" binding="run">Run</control>
 		<control type="button" class="input" binding="reset">Reset</control>
diff --git a/devices/pc/machine/5160/cga/256kb/demo/debugger/machine.xml b/devices/pc/machine/5160/cga/256kb/demo/debugger/machine.xml
index 3e3f19c48..b0e6adbed 100644
--- a/devices/pc/machine/5160/cga/256kb/demo/debugger/machine.xml
+++ b/devices/pc/machine/5160/cga/256kb/demo/debugger/machine.xml
@@ -7,11 +7,7 @@
 	<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/basic/ibm-basic-1.10.json"/>
 	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/bios/5160/1982-11-08.json"/>
-	<video id="videoCGA" screenwidth="960" screenheight="400" scale="true" charset="/devices/pc/video/ibm-mda-cga.json" pos="center" width="960px" padding="8px">
-		<menu>
-			<title>Color Display</title>
-		</menu>
-	</video>
+	<video ref="/devices/pc/video/video-cga-960.xml"/>
 	<cpu id="cpu8088" model="8088" autostart="true"/>
 	<keyboard ref="/devices/pc/keyboard/minimal-functions.xml"/>
 	<debugger id="debugger"/>
diff --git a/devices/pc/machine/5160/cga/256kb/demo/machine.xml b/devices/pc/machine/5160/cga/256kb/demo/machine.xml
index 31df0b7ea..36f88b635 100644
--- a/devices/pc/machine/5160/cga/256kb/demo/machine.xml
+++ b/devices/pc/machine/5160/cga/256kb/demo/machine.xml
@@ -7,11 +7,7 @@
 	<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/basic/ibm-basic-1.10.json"/>
 	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/bios/5160/1982-11-08.json"/>
-	<video id="videoCGA" screenwidth="960" screenheight="400" scale="true" charset="/devices/pc/video/ibm-mda-cga.json" pos="center" width="960px" padding="8px">
-		<menu>
-			<title>Color Display</title>
-		</menu>
-	</video>
+	<video ref="/devices/pc/video/video-cga-960.xml"/>
 	<cpu id="cpu8088" model="8088" autostart="true" pos="left" padleft="8px">
 		<control type="button" class="input" binding="run">Run</control>
 		<control type="button" class="input" binding="reset">Reset</control>
diff --git a/devices/pc/machine/5160/cga/256kb/softkbd/machine.xml b/devices/pc/machine/5160/cga/256kb/softkbd/machine.xml
index d1b83a0b5..47e424c74 100644
--- a/devices/pc/machine/5160/cga/256kb/softkbd/machine.xml
+++ b/devices/pc/machine/5160/cga/256kb/softkbd/machine.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="/versions/pcjs/1.16.0/machine.xsl"?>
-<machine id="ibm5160" class="pc" border="1" pos="center" width="1000px" style="background-color:white">
+<machine id="ibm5160" class="pc" border="1" width="1000px" pos="center" style="background-color:white">
 	<name>IBM PC XT (Model 5160), CGA, 256K, 10Mb Drive</name>
 	<computer id="xt-cga-256k" name="IBM PC XT"/>
 	<cpu id="cpu8088" model="8088"/>
@@ -8,11 +8,7 @@
 	<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/basic/ibm-basic-1.10.json"/>
 	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/bios/5160/1982-11-08.json"/>
-	<video id="videoCGA" screenwidth="960" screenheight="400" scale="true" charset="/devices/pc/video/ibm-mda-cga.json" pos="center" width="960px" padding="8px">
-		<menu>
-			<title>Color Display</title>
-		</menu>
-	</video>
+	<video ref="/devices/pc/video/video-cga-960.xml"/>
 	<keyboard ref="/devices/pc/keyboard/us83.xml"/>
 	<debugger id="debugger"/>
 	<panel ref="/devices/pc/panel/default.xml"/>
diff --git a/devices/pc/machine/5160/cga/256kb/win101/debugger/machine.xml b/devices/pc/machine/5160/cga/256kb/win101/debugger/machine.xml
index ae5831016..23032bb96 100644
--- a/devices/pc/machine/5160/cga/256kb/win101/debugger/machine.xml
+++ b/devices/pc/machine/5160/cga/256kb/win101/debugger/machine.xml
@@ -7,12 +7,7 @@
 	<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/basic/ibm-basic-1.10.json"/>
 	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/bios/5160/1982-11-08.json"/>
-	<video id="videoCGA" screenwidth="960" screenheight="400" scale="true" autolock="true" charset="/devices/pc/video/ibm-mda-cga.json" width="960px" padding="8px">
-		<menu>
-			<title>Color Display</title>
-			<control type="button" class="input" binding="lockPointer" pos="right">Lock Pointer</control>
-		</menu>
-	</video>
+	<video ref="/devices/pc/video/video-cga-lock.xml"/>
 	<cpu id="cpu8088" model="8088" autostart="false"/>
 	<keyboard ref="/devices/pc/keyboard/minimal-functions.xml"/>
 	<debugger id="debugger"/>
diff --git a/devices/pc/machine/5160/cga/256kb/win101/machine.xml b/devices/pc/machine/5160/cga/256kb/win101/machine.xml
index 019d523c8..66ef219bf 100644
--- a/devices/pc/machine/5160/cga/256kb/win101/machine.xml
+++ b/devices/pc/machine/5160/cga/256kb/win101/machine.xml
@@ -7,12 +7,7 @@
 	<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/basic/ibm-basic-1.10.json"/>
 	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/bios/5160/1982-11-08.json"/>
-	<video id="videoCGA" screenwidth="960" screenheight="400" scale="true" autolock="true" charset="/devices/pc/video/ibm-mda-cga.json" padding="8px">
-		<menu>
-			<title>Color Display</title>
-			<control type="button" class="input" binding="lockPointer" pos="right">Lock Pointer</control>
-		</menu>
-	</video>
+	<video ref="/devices/pc/video/video-cga-lock.xml"/>
 	<cpu id="cpu8088" model="8088" autostart="true" pos="left" padleft="8px">
 		<control type="button" class="input" binding="run">Run</control>
 		<control type="button" class="input" binding="reset">Reset</control>
diff --git a/devices/pc/machine/5160/cga/256kb/win101/softkbd/machine.xml b/devices/pc/machine/5160/cga/256kb/win101/softkbd/machine.xml
index f9544c60b..b97f12307 100644
--- a/devices/pc/machine/5160/cga/256kb/win101/softkbd/machine.xml
+++ b/devices/pc/machine/5160/cga/256kb/win101/softkbd/machine.xml
@@ -8,12 +8,7 @@
 	<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/basic/ibm-basic-1.10.json"/>
 	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/bios/5160/1982-11-08.json"/>
-	<video id="videoCGA" screenwidth="960" screenheight="400" scale="true" autolock="true" charset="/devices/pc/video/ibm-mda-cga.json" pos="center" width="960px" padding="8px">
-		<menu>
-			<title>Color Display</title>
-			<control type="button" class="input" binding="lockPointer" pos="right">Lock Pointer</control>
-		</menu>
-	</video>
+	<video ref="/devices/pc/video/video-cga-lock.xml"/>
 	<keyboard ref="/devices/pc/keyboard/us83.xml"/>
 	<debugger id="debugger"/>
 	<panel ref="/devices/pc/panel/wide.xml"/>
diff --git a/devices/pc/machine/5160/cga/512kb/win101/softkbd/machine.xml b/devices/pc/machine/5160/cga/512kb/win101/softkbd/machine.xml
index d25bda633..4832ca7ec 100644
--- a/devices/pc/machine/5160/cga/512kb/win101/softkbd/machine.xml
+++ b/devices/pc/machine/5160/cga/512kb/win101/softkbd/machine.xml
@@ -8,12 +8,7 @@
 	<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/basic/ibm-basic-1.10.json"/>
 	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/bios/5160/1982-11-08.json"/>
-	<video id="videoCGA" screenwidth="960" screenheight="400" scale="true" autolock="true" charset="/devices/pc/video/ibm-mda-cga.json" pos="center" width="960px" padding="8px">
-		<menu>
-			<title>Color Display</title>
-			<control type="button" class="input" binding="lockPointer" pos="right">Lock Pointer</control>
-		</menu>
-	</video>
+	<video ref="/devices/pc/video/video-cga-lock.xml"/>
 	<keyboard ref="/devices/pc/keyboard/us83.xml"/>
 	<debugger id="debugger"/>
 	<panel ref="/devices/pc/panel/default.xml"/>
diff --git a/devices/pc/machine/5160/cga/640kb/debugger/machine.xml b/devices/pc/machine/5160/cga/640kb/debugger/machine.xml
index 209465061..68f80d732 100644
--- a/devices/pc/machine/5160/cga/640kb/debugger/machine.xml
+++ b/devices/pc/machine/5160/cga/640kb/debugger/machine.xml
@@ -7,11 +7,7 @@
 	<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/basic/ibm-basic-1.10.json"/>
 	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/bios/5160/1982-11-08.json"/>
-	<video id="videoCGA" screenwidth="960" screenheight="400" scale="true" charset="/devices/pc/video/ibm-mda-cga.json" touchscreen="true" pos="center" width="960px" padding="8px">
-		<menu>
-			<title>Color Display</title>
-		</menu>
-	</video>
+	<video ref="/devices/pc/video/video-cga-960-touch.xml"/>
 	<cpu id="cpu8088" model="8088" autostart="true"/>
 	<keyboard ref="/devices/pc/keyboard/minimal-f1-f10.xml"/>
 	<debugger id="debugger"/>
diff --git a/devices/pc/machine/5160/cga/640kb/dos400m/machine.xml b/devices/pc/machine/5160/cga/640kb/dos400m/machine.xml
index d070efb6f..d32647141 100644
--- a/devices/pc/machine/5160/cga/640kb/dos400m/machine.xml
+++ b/devices/pc/machine/5160/cga/640kb/dos400m/machine.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="/versions/pcjs/1.16.0/machine.xsl"?>
-<machine id="ibm5160" class="pc" border="1" pos="center" width="1000px" style="background-color:white">
+<machine id="ibm5160" class="pc" border="1" width="1000px" pos="center" style="background-color:white">
 	<name>IBM PC XT (Model 5160), CGA, 640K, 10Mb Drive</name>
 	<computer id="xt-cga-640k" name="IBM PC XT"/>
 	<cpu id="cpu8088" model="8088" autostart="true"/>
@@ -8,12 +8,7 @@
 	<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/basic/ibm-basic-1.10.json"/>
 	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/bios/5160/1982-11-08.json"/>
-	<video id="videoCGA" screenwidth="960" screenheight="400" scale="true" autolock="true" fontrom="/devices/pc/video/ibm-mda-cga.json" pos="center" width="960px" padding="8px">
-		<menu>
-			<title>Color Display</title>
-			<control type="button" class="input" binding="lockPointer" pos="right">Lock Pointer</control>
-		</menu>
-	</video>
+	<video ref="/devices/pc/video/video-cga-lock.xml"/>
 	<keyboard ref="/devices/pc/keyboard/us83.xml"/>
 	<debugger id="debugger"/>
 	<panel ref="/devices/pc/panel/wide.xml"/>
diff --git a/devices/pc/machine/5160/cga/640kb/machine.xml b/devices/pc/machine/5160/cga/640kb/machine.xml
index 74eae4e1b..f93443b8d 100644
--- a/devices/pc/machine/5160/cga/640kb/machine.xml
+++ b/devices/pc/machine/5160/cga/640kb/machine.xml
@@ -7,11 +7,7 @@
 	<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/basic/ibm-basic-1.10.json"/>
 	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/bios/5160/1982-11-08.json"/>
-	<video id="videoCGA" screenwidth="960" screenheight="400" scale="true" charset="/devices/pc/video/ibm-mda-cga.json" touchscreen="true" pos="center" padding="8px">
-		<menu>
-			<title>Color Display</title>
-		</menu>
-	</video>
+	<video ref="/devices/pc/video/video-cga-960-touch.xml"/>
 	<cpu id="cpu8088" model="8088" autostart="true" pos="left" padleft="8px">
 		<control type="button" class="input" binding="run">Run</control>
 		<control type="button" class="input" binding="reset">Reset</control>
diff --git a/devices/pc/machine/5160/ega/256kb/debugger/machine.xml b/devices/pc/machine/5160/ega/256kb/debugger/machine.xml
index 35be03b7b..7e7db8353 100644
--- a/devices/pc/machine/5160/ega/256kb/debugger/machine.xml
+++ b/devices/pc/machine/5160/ega/256kb/debugger/machine.xml
@@ -9,11 +9,7 @@
 	<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/basic/ibm-basic-1.10.json"/>
 	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/bios/5160/1982-11-08.json"/>
-	<video id="videoEGA" model="ega" memory="0x10000" screenwidth="640" screenheight="350" pos="center" padding="8px">
-		<menu>
-			<title>Enhanced Color Display</title>
-		</menu>
-	</video>
+	<video ref="/devices/pc/video/video-ega-64kb.xml"/>
 	<keyboard ref="/devices/pc/keyboard/minimal-functions.xml"/>
 	<debugger id="debugger"/>
 	<panel ref="/devices/pc/panel/wide.xml"/>
diff --git a/devices/pc/machine/5160/ega/640kb/array/machine.xml b/devices/pc/machine/5160/ega/640kb/array/machine.xml
index e94877c6d..1cb1836c2 100644
--- a/devices/pc/machine/5160/ega/640kb/array/machine.xml
+++ b/devices/pc/machine/5160/ega/640kb/array/machine.xml
@@ -8,12 +8,7 @@
 	<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/basic/ibm-basic-1.10.json"/>
 	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/bios/5160/1982-11-08.json"/>
-	<video id="videoEGA" model="ega" memory="0x20000" screenwidth="640" screenheight="350" width="640px" autolock="true" pos="center" padding="8px">
-		<menu>
-			<title>Enhanced Color Display</title>
-			<control type="button" class="input" binding="lockPointer" pos="right">Lock Pointer</control>
-		</menu>
-	</video>
+	<video ref="/devices/pc/video/video-ega-640-128kb-lock.xml"/>
 	<keyboard ref="/devices/pc/keyboard/minimal.xml"/>
 	<cpu id="cpu8088" model="8088">
 		<control type="button" class="input" binding="setSpeed">Fast</control>
diff --git a/devices/pc/machine/5160/ega/640kb/debugger/machine.xml b/devices/pc/machine/5160/ega/640kb/debugger/machine.xml
index 74873cde7..ea50bb7c1 100644
--- a/devices/pc/machine/5160/ega/640kb/debugger/machine.xml
+++ b/devices/pc/machine/5160/ega/640kb/debugger/machine.xml
@@ -9,12 +9,7 @@
 	<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/basic/ibm-basic-1.10.json"/>
 	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/bios/5160/1982-11-08.json"/>
-	<video id="videoEGA" model="ega" memory="0x20000" screenwidth="640" screenheight="350" autolock="true" pos="center" padding="8px">
-		<menu>
-			<title>Enhanced Color Display</title>
-			<control type="button" class="input" binding="lockPointer" pos="right">Lock Pointer</control>
-		</menu>
-	</video>
+	<video ref="/devices/pc/video/video-ega-128kb-lock.xml"/>
 	<keyboard ref="/devices/pc/keyboard/minimal-functions.xml"/>
 	<debugger id="debugger"/>
 	<panel ref="/devices/pc/panel/wide.xml"/>
diff --git a/devices/pc/machine/5160/ega/640kb/machine.xml b/devices/pc/machine/5160/ega/640kb/machine.xml
index 874ec4706..6f1687ed8 100644
--- a/devices/pc/machine/5160/ega/640kb/machine.xml
+++ b/devices/pc/machine/5160/ega/640kb/machine.xml
@@ -9,12 +9,7 @@
 	<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/basic/ibm-basic-1.10.json"/>
 	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/bios/5160/1982-11-08.json"/>
-	<video id="videoEGA" model="ega" memory="0x20000" screenwidth="640" screenheight="350" autolock="true" pos="center" padding="8px">
-		<menu>
-			<title>Enhanced Color Display</title>
-			<control type="button" class="input" binding="lockPointer" pos="right">Lock Pointer</control>
-		</menu>
-	</video>
+	<video ref="/devices/pc/video/video-ega-128kb-lock.xml"/>
 	<keyboard ref="/devices/pc/keyboard/minimal-functions.xml"/>
 	<fdc ref="/disks/pc/library.xml"/>
 	<chipset id="chipset" model="5160" sw1="01001101"/>
diff --git a/devices/pc/machine/5160/ega/640kb/win101/machine.xml b/devices/pc/machine/5160/ega/640kb/win101/machine.xml
index 9959feabb..bf140f08f 100644
--- a/devices/pc/machine/5160/ega/640kb/win101/machine.xml
+++ b/devices/pc/machine/5160/ega/640kb/win101/machine.xml
@@ -8,12 +8,7 @@
 	<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/basic/ibm-basic-1.10.json"/>
 	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/bios/5160/1982-11-08.json"/>
-	<video id="videoEGA" model="ega" memory="0x20000" screenwidth="640" screenheight="350" autolock="true" pos="center" padding="8px">
-		<menu>
-			<title>Enhanced Color Display</title>
-			<control type="button" class="input" binding="lockPointer" pos="right">Lock Pointer</control>
-		</menu>
-	</video>
+	<video ref="/devices/pc/video/video-ega-128kb-lock.xml"/>
 	<keyboard ref="/devices/pc/keyboard/minimal.xml"/>
 	<cpu id="cpu8088" model="8088">
 		<control type="button" class="input" binding="setSpeed">Fast</control>
diff --git a/devices/pc/machine/5160/mda/256kb/fake188/debugger/machine.xml b/devices/pc/machine/5160/mda/256kb/fake188/debugger/machine.xml
index cccdefa09..6d1485b53 100644
--- a/devices/pc/machine/5160/mda/256kb/fake188/debugger/machine.xml
+++ b/devices/pc/machine/5160/mda/256kb/fake188/debugger/machine.xml
@@ -8,11 +8,7 @@
 	<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/basic/ibm-basic-1.10.json"/>
 	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/bios/5160/1982-11-08.json"/>
-	<video id="videoMDA" screenwidth="720" screenheight="350" scale="true" charset="/devices/pc/video/ibm-mda-cga.json" pos="center" width="720px" padding="8px">
-		<menu>
-			<title>Monochrome Display</title>
-		</menu>
-	</video>
+	<video ref="/devices/pc/video/video-mda.xml"/>
 	<keyboard ref="/devices/pc/keyboard/minimal.xml"/>
 	<debugger id="debugger"/>
 	<panel ref="/devices/pc/panel/default.xml"/>
diff --git a/devices/pc/machine/5160/mda/256kb/fake188/machine.xml b/devices/pc/machine/5160/mda/256kb/fake188/machine.xml
index d9ad30235..b2a0dab10 100644
--- a/devices/pc/machine/5160/mda/256kb/fake188/machine.xml
+++ b/devices/pc/machine/5160/mda/256kb/fake188/machine.xml
@@ -7,11 +7,7 @@
 	<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/basic/ibm-basic-1.10.json"/>
 	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/bios/5160/1982-11-08.json"/>
-	<video id="videoMDA" screenwidth="720" screenheight="350" scale="true" charset="/devices/pc/video/ibm-mda-cga.json" pos="center" padding="8px">
-		<menu>
-			<title>Monochrome Display</title>
-		</menu>
-	</video>
+	<video ref="/devices/pc/video/video-mda.xml"/>
 	<cpu id="cpu80188" model="80188" autostart="true" padleft="8px">
 		<control type="button" class="input" binding="run">Run</control>
 	</cpu>
diff --git a/devices/pc/machine/5160/mda/256kb/machine.xml b/devices/pc/machine/5160/mda/256kb/machine.xml
index 990ebb81b..7ec4f1fa5 100644
--- a/devices/pc/machine/5160/mda/256kb/machine.xml
+++ b/devices/pc/machine/5160/mda/256kb/machine.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="/versions/pcjs/1.16.0/machine.xsl"?>
-<machine id="ibm5160" class="pc" border="1" width="740px" pos="center" style="background-color:#FAEBD7">
+<machine id="ibm5160" class="pc" border="1" pos="center" style="background-color:#FAEBD7">
 	<name pos="center">IBM PC XT (Model 5160), MDA, 256Kb, 10Mb Drive</name>
 	<computer id="xt-mda-256k" name="IBM PC XT"/>
 	<cpu id="cpu8088" model="8088"/>
@@ -8,11 +8,7 @@
 	<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/basic/ibm-basic-1.10.json"/>
 	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/bios/5160/1982-11-08.json"/>
-	<video id="videoMDA" screenwidth="720" screenheight="350" scale="true" charset="/devices/pc/video/ibm-mda-cga.json" pos="center" width="720px" padding="8px">
-		<menu>
-			<title>Monochrome Display</title>
-		</menu>
-	</video>
+	<video ref="/devices/pc/video/video-mda.xml"/>
 	<keyboard ref="/devices/pc/keyboard/minimal.xml"/>
 	<fdc ref="/disks/pc/samples.xml"/>
 	<chipset id="chipset" model="5160" sw1="01000001"/>
diff --git a/devices/pc/machine/5160/mda/64kb/softkbd/machine.xml b/devices/pc/machine/5160/mda/64kb/softkbd/machine.xml
index 9b6aa2608..d8a347eb3 100644
--- a/devices/pc/machine/5160/mda/64kb/softkbd/machine.xml
+++ b/devices/pc/machine/5160/mda/64kb/softkbd/machine.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="/versions/pcjs/1.16.0/machine.xsl"?>
-<machine id="ibm5160" class="pc" border="1" pos="center" width="1000px" style="background-color:white">
+<machine id="ibm5160" class="pc" border="1" width="1000px" pos="center" style="background-color:white">
 	<name>IBM PC XT (Model 5160), MDA, 64K, 10Mb Drive</name>
 	<computer id="xt-mda-64k" name="IBM PC XT"/>
 	<cpu id="cpu8088" model="8088"/>
@@ -8,11 +8,7 @@
 	<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/basic/ibm-basic-1.10.json"/>
 	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/bios/5160/1982-11-08.json"/>
-	<video id="videoMDA" screenwidth="720" screenheight="350" scale="true" charset="/devices/pc/video/ibm-mda-cga.json" pos="center" width="720px" padding="8px">
-		<menu>
-			<title>Monochrome Display</title>
-		</menu>
-	</video>
+	<video ref="/devices/pc/video/video-mda.xml"/>
 	<keyboard ref="/devices/pc/keyboard/us83.xml"/>
 	<debugger id="debugger"/>
 	<panel ref="/devices/pc/panel/default.xml"/>
diff --git a/devices/pc/machine/5170/ega/1152kb/rev1/machine.xml b/devices/pc/machine/5170/ega/1152kb/rev1/machine.xml
index 6493ec940..889d5d6f5 100644
--- a/devices/pc/machine/5170/ega/1152kb/rev1/machine.xml
+++ b/devices/pc/machine/5170/ega/1152kb/rev1/machine.xml
@@ -8,12 +8,7 @@
 	<ram id="ramExt" addr="0x100000" size="0x80000" comment=""/>
 	<rom id="romEGA" addr="0xc0000" size="0x4000" file="/devices/pc/video/ibm-ega.json" notify="videoEGA"/>
 	<rom id="romBIOS" addr="0xf0000" size="0x10000" alias="0xff0000" file="/devices/pc/bios/5170/1984-01-10.json"/>
-	<video id="videoEGA" model="ega" memory="0x20000" screenwidth="640" screenheight="350" autolock="true" pos="center" padding="8px">
-		<menu>
-			<title>Enhanced Color Display</title>
-			<control type="button" class="input" binding="lockPointer" pos="right">Lock Pointer</control>
-		</menu>
-	</video>
+	<video ref="/devices/pc/video/video-ega-128kb-lock.xml"/>
 	<keyboard ref="/devices/pc/keyboard/minimal-functions.xml"/>
 	<debugger id="debugger" messages="" commands=""/>
 	<panel ref="/devices/pc/panel/wide.xml"/>
diff --git a/devices/pc/machine/5170/ega/1152kb/rev3/machine.xml b/devices/pc/machine/5170/ega/1152kb/rev3/machine.xml
index 8cc86824d..c040cbec5 100644
--- a/devices/pc/machine/5170/ega/1152kb/rev3/machine.xml
+++ b/devices/pc/machine/5170/ega/1152kb/rev3/machine.xml
@@ -8,12 +8,7 @@
 	<ram id="ramExt" addr="0x100000" size="0x80000" comment=""/>
 	<rom id="romEGA" addr="0xc0000" size="0x4000" file="/devices/pc/video/ibm-ega.json" notify="videoEGA"/>
 	<rom id="romBIOS" addr="0xf0000" size="0x10000" alias="0xff0000" file="/devices/pc/bios/5170/1985-11-15.json"/>
-	<video id="videoEGA" model="ega" memory="0x20000" screenwidth="640" screenheight="350" autolock="true" pos="center" padding="8px">
-		<menu>
-			<title>Enhanced Color Display</title>
-			<control type="button" class="input" binding="lockPointer" pos="right">Lock Pointer</control>
-		</menu>
-	</video>
+	<video ref="/devices/pc/video/video-ega-128kb-lock.xml"/>
 	<keyboard ref="/devices/pc/keyboard/minimal-functions.xml"/>
 	<debugger id="debugger" messages="" commands=""/>
 	<panel ref="/devices/pc/panel/wide.xml"/>
diff --git a/devices/pc/machine/5170/ega/640kb/rev1/machine.xml b/devices/pc/machine/5170/ega/640kb/rev1/machine.xml
index 023456350..946796d83 100644
--- a/devices/pc/machine/5170/ega/640kb/rev1/machine.xml
+++ b/devices/pc/machine/5170/ega/640kb/rev1/machine.xml
@@ -7,12 +7,7 @@
 	<ram id="ramLow" addr="0x00000" size="0xa0000"/>
 	<rom id="romEGA" addr="0xc0000" size="0x4000" file="/devices/pc/video/ibm-ega.json" notify="videoEGA"/>
 	<rom id="romBIOS" addr="0xf0000" size="0x10000" alias="0xff0000" file="/devices/pc/bios/5170/1984-01-10.json"/>
-	<video id="videoEGA" model="ega" memory="0x20000" screenwidth="640" screenheight="350" autolock="true" pos="center" padding="8px">
-		<menu>
-			<title>Enhanced Color Display</title>
-			<control type="button" class="input" binding="lockPointer" pos="right">Lock Pointer</control>
-		</menu>
-	</video>
+	<video ref="/devices/pc/video/video-ega-128kb-lock.xml"/>
 	<keyboard ref="/devices/pc/keyboard/minimal-functions.xml"/>
 	<debugger id="debugger" messages="" commands=""/>
 	<panel ref="/devices/pc/panel/wide.xml"/>
diff --git a/devices/pc/video/video-cga-960-touch.xml b/devices/pc/video/video-cga-960-touch.xml
new file mode 100644
index 000000000..15f293781
--- /dev/null
+++ b/devices/pc/video/video-cga-960-touch.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<video id="videoCGA" screenwidth="960" screenheight="400" scale="true" charset="/devices/pc/video/ibm-mda-cga.json" touchscreen="true" width="960px" pos="center" padding="8px">
+	<menu>
+		<title>Color Display</title>
+		<control type="container" pos="right">
+			<control type="led" class="output" label="Caps" binding="caps-lock" padleft="8px"/>
+			<control type="led" class="output" label="Num" binding="num-lock" padleft="8px"/>
+			<control type="led" class="output" label="Scroll" binding="scroll-lock" padleft="8px"/>
+		</control>
+	</menu>
+</video>
diff --git a/devices/pc/video/video-cga-960.xml b/devices/pc/video/video-cga-960.xml
new file mode 100644
index 000000000..99dda9874
--- /dev/null
+++ b/devices/pc/video/video-cga-960.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<video id="videoCGA" screenwidth="960" screenheight="400" scale="true" charset="/devices/pc/video/ibm-mda-cga.json" width="960px" pos="center" padding="8px">
+	<menu>
+		<title>Color Display</title>
+		<control type="container" pos="right">
+			<control type="led" class="output" label="Caps" binding="caps-lock" padleft="8px"/>
+			<control type="led" class="output" label="Num" binding="num-lock" padleft="8px"/>
+			<control type="led" class="output" label="Scroll" binding="scroll-lock" padleft="8px"/>
+		</control>
+	</menu>
+</video>
diff --git a/devices/pc/video/video-cga-lock.xml b/devices/pc/video/video-cga-lock.xml
new file mode 100644
index 000000000..b0a2268b7
--- /dev/null
+++ b/devices/pc/video/video-cga-lock.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<video id="videoCGA" screenwidth="960" screenheight="400" scale="true" autolock="true" charset="/devices/pc/video/ibm-mda-cga.json" padding="8px">
+	<menu>
+		<title>Color Display</title>
+		<control type="container" pos="right">
+			<control type="led" class="output" label="Caps" binding="caps-lock" padleft="8px"/>
+			<control type="led" class="output" label="Num" binding="num-lock" padleft="8px"/>
+			<control type="led" class="output" label="Scroll" binding="scroll-lock" padleft="8px"/>
+			<control type="button" class="input" binding="lockPointer" padleft="8px">Lock Pointer</control>
+		</control>
+	</menu>
+</video>
diff --git a/devices/pc/video/video-cga.xml b/devices/pc/video/video-cga.xml
new file mode 100644
index 000000000..3b78dda0e
--- /dev/null
+++ b/devices/pc/video/video-cga.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<video id="videoCGA" screenwidth="960" screenheight="400" scale="true" charset="/devices/pc/video/ibm-mda-cga.json" pos="center" padding="8px">
+	<menu>
+		<title>Color Display</title>
+		<control type="container" pos="right">
+			<control type="led" class="output" label="Caps" binding="caps-lock" padleft="8px"/>
+			<control type="led" class="output" label="Num" binding="num-lock" padleft="8px"/>
+			<control type="led" class="output" label="Scroll" binding="scroll-lock" padleft="8px"/>
+		</control>
+	</menu>
+</video>
diff --git a/devices/pc/video/video-ega-128kb-lock.xml b/devices/pc/video/video-ega-128kb-lock.xml
new file mode 100644
index 000000000..9409dbbb2
--- /dev/null
+++ b/devices/pc/video/video-ega-128kb-lock.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<video id="videoEGA" model="ega" memory="0x20000" screenwidth="640" screenheight="350" autolock="true" pos="center" padding="8px">
+	<menu>
+		<title>Enhanced Color Display</title>
+		<control type="container" pos="right">
+			<control type="led" class="output" label="Caps" binding="caps-lock" padleft="8px"/>
+			<control type="led" class="output" label="Num" binding="num-lock" padleft="8px"/>
+			<control type="led" class="output" label="Scroll" binding="scroll-lock" padleft="8px"/>
+			<control type="button" class="input" binding="lockPointer" padleft="8px">Lock Pointer</control>
+		</control>
+	</menu>
+</video>
diff --git a/devices/pc/video/video-ega-640-128kb-lock.xml b/devices/pc/video/video-ega-640-128kb-lock.xml
new file mode 100644
index 000000000..6f09fa310
--- /dev/null
+++ b/devices/pc/video/video-ega-640-128kb-lock.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<video id="videoEGA" model="ega" memory="0x20000" screenwidth="640" screenheight="350" width="640px" autolock="true" pos="center" padding="8px">
+	<menu>
+		<title>Enhanced Color Display</title>
+		<control type="container" pos="right">
+			<control type="led" class="output" label="Caps" binding="caps-lock" padleft="8px"/>
+			<control type="led" class="output" label="Num" binding="num-lock" padleft="8px"/>
+			<control type="led" class="output" label="Scroll" binding="scroll-lock" padleft="8px"/>
+			<control type="button" class="input" binding="lockPointer" padleft="8px">Lock Pointer</control>
+		</control>
+	</menu>
+</video>
diff --git a/devices/pc/video/video-ega-64kb.xml b/devices/pc/video/video-ega-64kb.xml
new file mode 100644
index 000000000..44fb68289
--- /dev/null
+++ b/devices/pc/video/video-ega-64kb.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<video id="videoEGA" model="ega" memory="0x10000" screenwidth="640" screenheight="350" pos="center" padding="8px">
+	<menu>
+		<title>Enhanced Color Display</title>
+		<control type="container" pos="right">
+			<control type="led" class="output" label="Caps" binding="caps-lock" padleft="8px"/>
+			<control type="led" class="output" label="Num" binding="num-lock" padleft="8px"/>
+			<control type="led" class="output" label="Scroll" binding="scroll-lock" padleft="8px"/>
+		</control>
+	</menu>
+</video>
diff --git a/devices/pc/video/video-mda.xml b/devices/pc/video/video-mda.xml
new file mode 100644
index 000000000..d1951c5b7
--- /dev/null
+++ b/devices/pc/video/video-mda.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<video id="videoMDA" screenwidth="720" screenheight="350" scale="true" charset="/devices/pc/video/ibm-mda-cga.json" pos="center" padding="8px">
+	<menu>
+		<title>Monochrome Display</title>
+		<control type="container" pos="right">
+			<control type="led" class="output" label="Caps" binding="caps-lock" padleft="8px"/>
+			<control type="led" class="output" label="Num" binding="num-lock" padleft="8px"/>
+			<control type="led" class="output" label="Scroll" binding="scroll-lock" padleft="8px"/>
+		</control>
+	</menu>
+</video>
diff --git a/disks/pc/cpm/machine.xml b/disks/pc/cpm/machine.xml
index 813613925..09f38d3e7 100644
--- a/disks/pc/cpm/machine.xml
+++ b/disks/pc/cpm/machine.xml
@@ -1,16 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="/versions/pcjs/1.16.0/machine.xsl"?>
-<machine id="ibm5150" class="pc" border="1" width="740px" pos="center" style="background-color:#FAEBD7">
+<machine id="ibm5150" class="pc" border="1" pos="center" style="background-color:#FAEBD7">
 	<name pos="center">IBM PC (Model 5150) running CP/M-86</name>
 	<computer id="cpm-mda-64k" name="IBM PC" resume="1"/>
 	<ram id="ramLow" addr="0x00000"/>
 	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/basic/ibm-basic-1.00.json"/>
 	<rom id="romBIOS"  addr="0xfe000" size="0x2000" file="/devices/pc/bios/5150/1981-04-24.json"/>
-	<video id="videoMDA" screenwidth="720" screenheight="350" scale="true" charset="/devices/pc/video/ibm-mda-cga.json" padding="8px">
-		<menu>
-			<title>Monochrome Display</title>
-		</menu>
-	</video>
+	<video ref="/devices/pc/video/video-mda.xml"/>
 	<cpu id="cpu8088" model="8088" autostart="true" pos="left" padleft="8px" padbottom="8px">
 		<control type="button" class="input" binding="run">Run</control>
 		<control type="button" class="input" binding="reset">Reset</control>
diff --git a/disks/pc/diags/ibm/2.20/machine.xml b/disks/pc/diags/ibm/2.20/machine.xml
index a16852ac0..178e438e0 100644
--- a/disks/pc/diags/ibm/2.20/machine.xml
+++ b/disks/pc/diags/ibm/2.20/machine.xml
@@ -6,14 +6,7 @@
 	<ram id="ramLow" addr="0x00000"/>
 	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/basic/ibm-basic-1.00.json"/>
 	<rom id="romBIOS"  addr="0xfe000" size="0x2000" file="/devices/pc/bios/5150/1981-04-24.json"/>
-	<video id="videoMDA" screenwidth="720" screenheight="350" scale="true" charset="/devices/pc/video/ibm-mda-cga.json" padding="8px">
-		<menu>
-			<title>Monochrome Display</title>
-			<control type="led" class="output" label="Scroll" binding="scroll-lock" pos="right" padleft="8px"/>
-			<control type="led" class="output" label="Num" binding="num-lock" pos="right" padleft="8px"/>
-			<control type="led" class="output" label="Caps" binding="caps-lock" pos="right" padleft="8px"/>
-		</menu>
-	</video>
+	<video ref="/devices/pc/video/video-mda.xml"/>
 	<cpu id="cpu8088" model="8088" autostart="true" pos="left" padleft="8px" padbottom="8px">
 		<control type="button" class="input" binding="run">Run</control>
 		<control type="button" class="input" binding="reset">Reset</control>
diff --git a/disks/pc/games/infocom/machine-debug.xml b/disks/pc/games/infocom/machine-debug.xml
index e7deba33d..14cb774f4 100644
--- a/disks/pc/games/infocom/machine-debug.xml
+++ b/disks/pc/games/infocom/machine-debug.xml
@@ -5,13 +5,9 @@
 	<computer id="infocom-cga-64k" name="IBM PC" resume="1"/>
 	<cpu id="cpu8088" model="8088"/>
 	<ram id="ramLow" addr="0x00000" test="false"/>
-	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/basic/ibm-basic-1.00.rom"/>
-	<rom id="romBIOS"  addr="0xfe000" size="0x2000" file="/devices/pc/bios/5150/1981-04-24.rom"/>
-	<video id="videoCGA" screenwidth="960" screenheight="400" scale="true" charset="/devices/pc/video/ibm-mda-cga.rom" padding="8px">
-		<menu>
-			<title>Color Display</title>
-		</menu>
-	</video>
+	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/basic/private/ibm-basic-1.00.rom"/>
+	<rom id="romBIOS"  addr="0xfe000" size="0x2000" file="/devices/pc/bios/5150/private/1981-04-24.rom"/>
+	<video ref="/devices/pc/video/video-cga.xml"/>
 	<keyboard id="keyboard" pos="left" padleft="8px">
 		<control type="button" class="input" binding="esc">ESC</control>
 		<control type="button" class="input" binding="ctrl-c">CTRL-C</control>
diff --git a/disks/pc/games/infocom/machine.xml b/disks/pc/games/infocom/machine.xml
index 8e530497d..c6b4b9e2b 100644
--- a/disks/pc/games/infocom/machine.xml
+++ b/disks/pc/games/infocom/machine.xml
@@ -1,16 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="/versions/pcjs/1.16.0/machine.xsl"?>
-<machine id="ibm5150" class="pc" border="1" width="980px" pos="center" style="background-color:#FAEBD7">
+<machine id="ibm5150" class="pc" border="1" pos="center" style="background-color:#FAEBD7">
 	<name pos="center">IBM PC Model 5150 (CGA, 64K)</name>
 	<computer id="infocom-cga-64k" name="IBM PC" resume="1"/>
 	<ram id="ramLow" addr="0x00000" test="false"/>
 	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/basic/ibm-basic-1.00.json"/>
 	<rom id="romBIOS"  addr="0xfe000" size="0x2000" file="/devices/pc/bios/5150/1981-04-24.json"/>
-	<video id="videoCGA" screenwidth="960" screenheight="400" scale="true" charset="/devices/pc/video/ibm-mda-cga.json" padding="8px">
-		<menu>
-			<title>Color Display</title>
-		</menu>
-	</video>
+	<video ref="/devices/pc/video/video-cga.xml"/>
 	<cpu id="cpu8088" model="8088" autostart="true" pos="left" padleft="8px" padbottom="8px">
 		<control type="button" class="input" binding="run">Run</control>
 		<control type="button" class="input" binding="reset">Reset</control>
diff --git a/disks/pc/games/infocom/zork1/debugger/machine.xml b/disks/pc/games/infocom/zork1/debugger/machine.xml
index 2e8a45635..6948d265d 100644
--- a/disks/pc/games/infocom/zork1/debugger/machine.xml
+++ b/disks/pc/games/infocom/zork1/debugger/machine.xml
@@ -1,17 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="/versions/pcjs/1.16.0/machine.xsl"?>
-<machine id="ibm5150" class="pc" border="1" width="980px" pos="center" style="background-color:#FAEBD7">
+<machine id="ibm5150" class="pc" border="1" pos="center" style="background-color:#FAEBD7">
 	<name pos="center">Zork I (IBM PC Model 5150)</name>
 	<computer id="zork-cga-64k" name="IBM PC"/>
 	<cpu id="cpu8088" model="8088"/>
 	<ram id="ramLow" addr="0x00000" test="false"/>
 	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/basic/ibm-basic-1.00.json"/>
 	<rom id="romBIOS"  addr="0xfe000" size="0x2000" file="/devices/pc/bios/5150/1981-04-24.json"/>
-	<video id="videoCGA" screenwidth="960" screenheight="400" scale="true" charset="/devices/pc/video/ibm-mda-cga.json" padding="8px">
-		<menu>
-			<title>Color Display</title>
-		</menu>
-	</video>
+	<video ref="/devices/pc/video/video-cga.xml"/>
 	<keyboard id="keyboard" pos="left" padleft="8px">
 		<control type="button" class="input" binding="esc">ESC</control>
 		<control type="button" class="input" binding="ctrl-c">CTRL-C</control>
diff --git a/disks/pc/games/microsoft/adventure/machine.xml b/disks/pc/games/microsoft/adventure/machine.xml
index c04b0dcea..5a2b007ed 100644
--- a/disks/pc/games/microsoft/adventure/machine.xml
+++ b/disks/pc/games/microsoft/adventure/machine.xml
@@ -6,11 +6,7 @@
 	<ram id="ramLow" addr="0x00000"/>
 	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/basic/ibm-basic-1.00.json"/>
 	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/bios/5150/1981-04-24.json"/>
-	<video id="videoMDA" screenwidth="720" screenheight="350" scale="true" charset="/devices/pc/video/ibm-mda-cga.json" padding="8px">
-		<menu>
-			<title>Monochrome Display</title>
-		</menu>
-	</video>
+	<video ref="/devices/pc/video/video-mda.xml"/>
 	<cpu id="cpu8088" model="8088" autostart="true" pos="left" padleft="8px">
 		<control type="button" class="input" binding="run">Run</control>
 		<control type="button" class="input" binding="reset">Reset</control>