diff --git a/apps/pcx86/examples/example1.xml b/apps/pcx86/examples/example1.xml
index 0d907f1909..1832191349 100644
--- a/apps/pcx86/examples/example1.xml
+++ b/apps/pcx86/examples/example1.xml
@@ -6,7 +6,7 @@
 	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="ibm-basic-1.00.json"/>
 	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="1981-04-24.json"/>
 	<keyboard id="keyboard"/>
-	<video id="videoMDA" screenWidth="720" screenHeight="350" smoothing="false" fontROM="ibm-mda-cga.json">
+	<video id="videoMDA" screenWidth="720" screenHeight="350" fontROM="ibm-mda-cga.json">
 		<menu>
 			<title>Monochrome Display</title>
 		</menu>
diff --git a/apps/pcx86/examples/example2.xml b/apps/pcx86/examples/example2.xml
index 515658255a..a8d0c1bb7b 100644
--- a/apps/pcx86/examples/example2.xml
+++ b/apps/pcx86/examples/example2.xml
@@ -5,7 +5,7 @@
 	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="ibm-basic-1.00.json"/>
 	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="1981-04-24.json"/>
 	<keyboard id="keyboard"/>
-	<video id="videoMDA" screenWidth="720" screenHeight="350" smoothing="false" fontROM="ibm-mda-cga.json">
+	<video id="videoMDA" screenWidth="720" screenHeight="350" fontROM="ibm-mda-cga.json">
 		<menu>
 			<title>Monochrome Display</title>
 		</menu>
diff --git a/apps/pcx86/examples/example3a.xml b/apps/pcx86/examples/example3a.xml
index 4e90665f0a..0d484ce4ee 100644
--- a/apps/pcx86/examples/example3a.xml
+++ b/apps/pcx86/examples/example3a.xml
@@ -7,7 +7,7 @@
 	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="ibm-basic-1.00.json"/>
 	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="1981-04-24.json"/>
 	<keyboard id="keyboard"/>
-	<video id="videoMDA" screenWidth="720" screenHeight="350" smoothing="false" fontROM="ibm-mda-cga.json">
+	<video id="videoMDA" screenWidth="720" screenHeight="350" fontROM="ibm-mda-cga.json">
 		<menu>
 			<title>Monochrome Display</title>
 		</menu>
diff --git a/apps/pcx86/examples/example3b.xml b/apps/pcx86/examples/example3b.xml
index 2ecc0b23c2..1396dc7a20 100644
--- a/apps/pcx86/examples/example3b.xml
+++ b/apps/pcx86/examples/example3b.xml
@@ -6,7 +6,7 @@
 	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="ibm-basic-1.00.json"/>
 	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="1981-04-24.json"/>
 	<keyboard id="keyboard"/>
-	<video id="videoMDA" screenWidth="720" screenHeight="350" smoothing="false" fontROM="ibm-mda-cga.json"/>
+	<video id="videoMDA" screenWidth="720" screenHeight="350" fontROM="ibm-mda-cga.json"/>
 	<fdc id="fdcNEC" autoMount='{A: {name: "PC-DOS 1.00", path: "PCDOS100.json"}, B: {name: "VisiCalc", path: "visicalc.json"}}'/>
 	<chipset id="chipset" model="5150" sw1="01000001" sw2="11110000"/>
 </machine>
diff --git a/devices/c1p/machine/32kb/machine.xml b/devices/c1p/machine/32kb/machine.xml
index ea6b6cd8eb..72cd2e50a6 100644
--- a/devices/c1p/machine/32kb/machine.xml
+++ b/devices/c1p/machine/32kb/machine.xml
@@ -19,7 +19,7 @@
 	<rom id="romNull" size="0x2000"/>
 	<rom id="romBasic" size="0x2000" image="/devices/c1p/rom/basic-gcpatch.hex"/>
 	<rom id="romSystem" size="0x0800" image="/devices/c1p/rom/system.hex"/>
-	<video id="video" screenWidth="1024" screenHeight="800" cols="32" rows="32" smoothing="false" charSet="/devices/c1p/video/chargen4x.png" width="512px" padding="8px">
+	<video id="video" screenWidth="1024" screenHeight="800" cols="32" rows="32" charSet="/devices/c1p/video/chargen4x.png" width="512px" padding="8px">
 		<name>Video Display</name>
 	</video>
 	<keyboard id="keyboard" padLeft="8px">
diff --git a/devices/c1p/machine/8kb/all/debugger/machine.xml b/devices/c1p/machine/8kb/all/debugger/machine.xml
index f8ffc102e0..beb753a91d 100644
--- a/devices/c1p/machine/8kb/all/debugger/machine.xml
+++ b/devices/c1p/machine/8kb/all/debugger/machine.xml
@@ -18,7 +18,7 @@
 	<rom id="romNull" size="0x8000"/>
 	<rom id="romBasic" size="0x2000" image="/devices/c1p/rom/basic-gcpatch.hex"/>
 	<rom id="romSystem" size="0x0800" image="/devices/c1p/rom/system.hex"/>
-	<video id="video" screenWidth="1024" screenHeight="800" cols="32" rows="32" smoothing="false" charSet="/devices/c1p/video/chargen4x.png" width="512px" padding="8px">
+	<video id="video" screenWidth="1024" screenHeight="800" cols="32" rows="32" charSet="/devices/c1p/video/chargen4x.png" width="512px" padding="8px">
 		<name>Video Display</name>
 	</video>
 	<keyboard id="keyboard" padLeft="8px">
diff --git a/devices/c1p/machine/8kb/all/machine.xml b/devices/c1p/machine/8kb/all/machine.xml
index b55daf7711..6375a547d2 100644
--- a/devices/c1p/machine/8kb/all/machine.xml
+++ b/devices/c1p/machine/8kb/all/machine.xml
@@ -17,7 +17,7 @@
 	<rom id="romNull" size="0x8000"/>
 	<rom id="romBasic" size="0x2000" image="/devices/c1p/rom/basic-gcpatch.hex"/>
 	<rom id="romSystem" size="0x0800" image="/devices/c1p/rom/system.hex"/>
-	<video id="video" screenWidth="1024" screenHeight="800" cols="32" rows="32" smoothing="false" charSet="/devices/c1p/video/chargen4x.png" padding="8px">
+	<video id="video" screenWidth="1024" screenHeight="800" cols="32" rows="32" charSet="/devices/c1p/video/chargen4x.png" padding="8px">
 		<name>Video Display</name>
 	</video>
 	<keyboard id="keyboard" padLeft="8px">
diff --git a/devices/c1p/machine/8kb/embed/machine.xml b/devices/c1p/machine/8kb/embed/machine.xml
index d03e5a1bf4..99786b0d98 100644
--- a/devices/c1p/machine/8kb/embed/machine.xml
+++ b/devices/c1p/machine/8kb/embed/machine.xml
@@ -15,7 +15,7 @@
 	<rom id="romNull" size="0x8000"/>
 	<rom id="romBasic" size="0x2000" image="/devices/c1p/rom/basic-gcpatch.hex"/>
 	<rom id="romSystem" size="0x0800" image="/devices/c1p/rom/system.hex"/>
-	<video id="video" screenWidth="512" screenHeight="400" cols="32" rows="32" smoothing="false" charSet="/devices/c1p/video/chargen2x.png" width="256px" padding="8px"/>
+	<video id="video" screenWidth="512" screenHeight="400" cols="32" rows="32" charSet="/devices/c1p/video/chargen2x.png" width="256px" padding="8px"/>
 	<keyboard id="keyboard" pos="center" padLeft="8px">
 		<control type="button" binding="ctrl-c">CTRL-C</control>
 		<control type="button" binding="ctrl-o">CTRL-O</control>
diff --git a/devices/c1p/machine/8kb/large/debugger/local.xml b/devices/c1p/machine/8kb/large/debugger/local.xml
index b161127cf9..418ddecadd 100644
--- a/devices/c1p/machine/8kb/large/debugger/local.xml
+++ b/devices/c1p/machine/8kb/large/debugger/local.xml
@@ -18,7 +18,7 @@
 	<rom id="romNull" size="0x8000"/>
 	<rom id="romBasic" size="0x2000" image="../../../../rom/basic-gcpatch.hex"/>
 	<rom id="romSystem" size="0x0800" image="../../../../rom/system.hex"/>
-	<video id="video" screenWidth="1024" screenHeight="800" cols="32" rows="32" smoothing="false" charSet="../../../../video/chargen4x.png" width="512px" padding="8px">
+	<video id="video" screenWidth="1024" screenHeight="800" cols="32" rows="32" charSet="../../../../video/chargen4x.png" width="512px" padding="8px">
 		<name>Video Display</name>
 	</video>
 	<keyboard id="keyboard" padLeft="8px">
diff --git a/devices/c1p/machine/8kb/large/debugger/machine.xml b/devices/c1p/machine/8kb/large/debugger/machine.xml
index 7eae27f69d..02664ca198 100644
--- a/devices/c1p/machine/8kb/large/debugger/machine.xml
+++ b/devices/c1p/machine/8kb/large/debugger/machine.xml
@@ -18,7 +18,7 @@
 	<rom id="romNull" size="0x8000"/>
 	<rom id="romBasic" size="0x2000" image="/devices/c1p/rom/basic-gcpatch.hex"/>
 	<rom id="romSystem" size="0x0800" image="/devices/c1p/rom/system.hex"/>
-	<video id="video" screenWidth="1024" screenHeight="800" cols="32" rows="32" smoothing="false" charSet="/devices/c1p/video/chargen4x.png" width="512px" padding="8px">
+	<video id="video" screenWidth="1024" screenHeight="800" cols="32" rows="32" charSet="/devices/c1p/video/chargen4x.png" width="512px" padding="8px">
 		<name>Video Display</name>
 	</video>
 	<keyboard id="keyboard" padLeft="8px">
diff --git a/devices/c1p/machine/8kb/large/machine.xml b/devices/c1p/machine/8kb/large/machine.xml
index 3b61d7f56b..929965d94d 100644
--- a/devices/c1p/machine/8kb/large/machine.xml
+++ b/devices/c1p/machine/8kb/large/machine.xml
@@ -16,7 +16,7 @@
 	<rom id="romNull" size="0x8000"/>
 	<rom id="romBasic" size="0x2000" image="/devices/c1p/rom/basic-gcpatch.hex"/>
 	<rom id="romSystem" size="0x0800" image="/devices/c1p/rom/system.hex"/>
-	<video id="video" screenWidth="1024" screenHeight="800" cols="32" rows="32" smoothing="false" charSet="/devices/c1p/video/chargen4x.png" padding="8px"/>
+	<video id="video" screenWidth="1024" screenHeight="800" cols="32" rows="32" charSet="/devices/c1p/video/chargen4x.png" padding="8px"/>
 	<cpu id="cpu6502" autostart="false" pos="left" padLeft="8px">
 		<control type="button" binding="run">Run</control>
 	</cpu>
diff --git a/devices/c1p/machine/8kb/small/machine.xml b/devices/c1p/machine/8kb/small/machine.xml
index d0474a8511..03ae625685 100644
--- a/devices/c1p/machine/8kb/small/machine.xml
+++ b/devices/c1p/machine/8kb/small/machine.xml
@@ -16,7 +16,7 @@
 	<rom id="romNull" size="0x8000"/>
 	<rom id="romBasic" size="0x2000" image="/devices/c1p/rom/basic-gcpatch.hex"/>
 	<rom id="romSystem" size="0x0800" image="/devices/c1p/rom/system.hex"/>
-	<video id="video" screenWidth="512" screenHeight="400" cols="32" rows="32" smoothing="false" charSet="/devices/c1p/video/chargen2x.png" width="256px" padding="8px"/>
+	<video id="video" screenWidth="512" screenHeight="400" cols="32" rows="32" charSet="/devices/c1p/video/chargen2x.png" width="256px" padding="8px"/>
 	<keyboard id="keyboard" padLeft="8px">
 		<control type="button" binding="ctrl-c">CTRL-C</control>
 		<control type="button" binding="ctrl-o">CTRL-O</control>
diff --git a/devices/pc8080/machine/invaders/debugger/machine.xml b/devices/pc8080/machine/invaders/debugger/machine.xml
index f7e0711c62..eed5ad07db 100644
--- a/devices/pc8080/machine/invaders/debugger/machine.xml
+++ b/devices/pc8080/machine/invaders/debugger/machine.xml
@@ -9,7 +9,7 @@
 	<rom id="romF" addr="0x1000" size="0x0800" file="/devices/pc8080/rom/invaders/INVADERS-F.json"/>
 	<rom id="romE" addr="0x1800" size="0x0800" file="/devices/pc8080/rom/invaders/INVADERS-E.json"/>
 	<ram id="ram"  addr="0x2000" size="0x0400"/>
-	<video id="video" screenWidth="896" screenHeight="1024" bufferRotate="-90" smoothing="false" bufferFormat="si1978"
+	<video id="video" screenWidth="896" screenHeight="1024" bufferRotate="-90" bufferFormat="si1978"
 		   bufferAddr="0x2400" bufferCols="256" bufferRows="224" bufferBits="1" bufferLeft="0" interruptRate="120" width="40%" pos="left" padding="8px">
 		<menu>
 			<title>224x256 Screen (Rotated)</title>
diff --git a/devices/pc8080/machine/invaders/machine.xml b/devices/pc8080/machine/invaders/machine.xml
index f200cc7fda..67419e2ad2 100644
--- a/devices/pc8080/machine/invaders/machine.xml
+++ b/devices/pc8080/machine/invaders/machine.xml
@@ -9,7 +9,7 @@
 	<rom id="romF" addr="0x1000" size="0x0800" file="/devices/pc8080/rom/invaders/INVADERS-F.json"/>
 	<rom id="romE" addr="0x1800" size="0x0800" file="/devices/pc8080/rom/invaders/INVADERS-E.json"/>
 	<ram id="ram"  addr="0x2000" size="0x0400"/>
-	<video id="video" screenWidth="896" screenHeight="1024" bufferRotate="-90" smoothing="false" bufferFormat="si1978"
+	<video id="video" screenWidth="896" screenHeight="1024" bufferRotate="-90" bufferFormat="si1978"
 		   bufferAddr="0x2400" bufferCols="256" bufferRows="224" bufferBits="1" bufferLeft="0" interruptRate="120" padding="8px">
 		<menu>
 			<title>224x256 Screen (Rotated)</title>
diff --git a/devices/pc8080/machine/vt100/debugger/machine.xml b/devices/pc8080/machine/vt100/debugger/machine.xml
index ee51df9082..50869619c0 100644
--- a/devices/pc8080/machine/vt100/debugger/machine.xml
+++ b/devices/pc8080/machine/vt100/debugger/machine.xml
@@ -6,7 +6,7 @@
 	<cpu id="cpu8080" model="8080" cycles="2764800" autoStart="true"/>
 	<rom id="rom" addr="0x0000" size="0x2000" file="/devices/pc8080/rom/vt100/VT100.json"/>
 	<ram id="ram" addr="0x2000" size="0x0C00"/>
-	<video id="video" screenWidth="1600" screenHeight="960" smoothing="false" interruptRate="60"
+	<video id="video" screenWidth="1600" screenHeight="960" interruptRate="60"
 		   fontROM="/devices/pc8080/rom/vt100/23-018E2.json" fontColor="white" cellWidth="10" cellHeight="10"
 		   bufferAddr="0x2000" bufferRAM="true" bufferFormat="vt100" bufferCols="80" bufferRows="24" pos="left" padding="8px">
 		<menu>
diff --git a/devices/pc8080/machine/vt100/machine.xml b/devices/pc8080/machine/vt100/machine.xml
index b24890ccc9..50043b4fe7 100644
--- a/devices/pc8080/machine/vt100/machine.xml
+++ b/devices/pc8080/machine/vt100/machine.xml
@@ -5,7 +5,7 @@
 	<computer id="computer" busWidth="16"/>
 	<rom id="rom" addr="0x0000" size="0x2000" file="/devices/pc8080/rom/vt100/VT100.json"/>
 	<ram id="ram" addr="0x2000" size="0x0C00"/>
-	<video id="video" screenWidth="1600" screenHeight="960" smoothing="false" interruptRate="60"
+	<video id="video" screenWidth="1600" screenHeight="960" interruptRate="60"
 		   fontROM="/devices/pc8080/rom/vt100/23-018E2.json" fontColor="white" cellWidth="10" cellHeight="10"
 		   bufferAddr="0x2000" bufferRAM="true" bufferFormat="vt100" bufferCols="80" bufferRows="24" padding="8px">
 		<menu>
diff --git a/devices/pcx86/machine/5150/README.md b/devices/pcx86/machine/5150/README.md
index cc5b320d06..4b7afed955 100644
--- a/devices/pcx86/machine/5150/README.md
+++ b/devices/pcx86/machine/5150/README.md
@@ -9,7 +9,7 @@ redirect_from:
 IBM PC (Model 5150) Machines
 ----------------------------
 
-Our IBM PC 5150 configurations include:
+Our IBM PC (Model 5150) configurations include:
 
 * [IBM PC with Monochrome Display](/devices/pcx86/machine/5150/mda/)
 * [IBM PC with Color Display](/devices/pcx86/machine/5150/cga/)
diff --git a/devices/pcx86/machine/5160/README.md b/devices/pcx86/machine/5160/README.md
index d939145848..d67be7b42f 100644
--- a/devices/pcx86/machine/5160/README.md
+++ b/devices/pcx86/machine/5160/README.md
@@ -7,7 +7,7 @@ permalink: /devices/pcx86/machine/5160/
 IBM PC XT (Model 5160) Machines
 -------------------------------
 
-Our IBM PC XT 5160 configurations include:
+Our IBM PC XT (Model 5160) configurations include:
 
 * [IBM PC XT with Monochrome Display Adapter](/devices/pcx86/machine/5160/mda/)
 * [IBM PC XT with Color Graphics Adapter](/devices/pcx86/machine/5160/cga/)
diff --git a/devices/pcx86/machine/5160/cga/256kb/README.md b/devices/pcx86/machine/5160/cga/256kb/README.md
index 2e9ab6b898..3292d21691 100644
--- a/devices/pcx86/machine/5160/cga/256kb/README.md
+++ b/devices/pcx86/machine/5160/cga/256kb/README.md
@@ -15,8 +15,8 @@ IBM PC XT (256Kb) with Color Display
 
 All our 256Kb Model 5160, aka IBM PC XT, configurations are located here, including:
 
-* [IBM PC XT (256Kb, 10Mb Drive) Machine Array with CGA Displays](/devices/pcx86/machine/5160/cga/256kb/array/)
-* [IBM PC XT (256Kb, 10Mb Drive) with Color Display and Debugger](/devices/pcx86/machine/5160/cga/256kb/debugger/)
+* [IBM PC XT (256K RAM, 10Mb Drive) Machine Array with Color Displays](/devices/pcx86/machine/5160/cga/256kb/array/)
+* [IBM PC XT (256K RAM, 10Mb Drive) with Color Display and Debugger](/devices/pcx86/machine/5160/cga/256kb/debugger/)
 
 {% include machine.html id="ibm5160" %}
 
diff --git a/devices/pcx86/machine/5160/cga/256kb/array/README.md b/devices/pcx86/machine/5160/cga/256kb/array/README.md
index d50db0b502..81da99ab48 100644
--- a/devices/pcx86/machine/5160/cga/256kb/array/README.md
+++ b/devices/pcx86/machine/5160/cga/256kb/array/README.md
@@ -1,6 +1,6 @@
 ---
 layout: page
-title: IBM PC XT (Model 5160, 256Kb, 10Mb Drive) Machine Array with CGA Displays
+title: IBM PC XT (256K RAM, 10Mb Drive) Machine Array with Color Displays
 permalink: /devices/pcx86/machine/5160/cga/256kb/array/
 machines:
   - id: ibm5160-1
@@ -9,8 +9,8 @@ machines:
     type: pcx86
 ---
 
-IBM PC XT Machine Array with CGA Displays
------------------------------------------
+IBM PC XT Machine Array with Color Displays
+-------------------------------------------
 
 ### Demonstration of Multiple IBM PCs on a Single Web Page
 
diff --git a/devices/pcx86/machine/5160/cga/256kb/array/machine.xml b/devices/pcx86/machine/5160/cga/256kb/array/machine.xml
index e5f65d0771..4e1b576552 100644
--- a/devices/pcx86/machine/5160/cga/256kb/array/machine.xml
+++ b/devices/pcx86/machine/5160/cga/256kb/array/machine.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="/versions/pcx86/1.63.0/machine.xsl"?>
 <machine id="ibm5160" type="pcx86" border="1" width="1000px" pos="center" background="default">
-	<name pos="center">IBM PC XT (Model 5160), CGA, 256K, 10Mb Drive</name>
+	<name pos="center">IBM PC XT, Color Display, 256K RAM, 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/pcx86/hdc/ibm-xebec-1982.json"/>
diff --git a/devices/pcx86/machine/5160/cga/256kb/debugger/README.md b/devices/pcx86/machine/5160/cga/256kb/debugger/README.md
index d99b5fbdd2..1ef2f13535 100644
--- a/devices/pcx86/machine/5160/cga/256kb/debugger/README.md
+++ b/devices/pcx86/machine/5160/cga/256kb/debugger/README.md
@@ -1,6 +1,6 @@
 ---
 layout: page
-title: IBM PC XT (Model 5160, 256Kb, 10Mb Drive) with Color Display and Debugger
+title: IBM PC XT (256K RAM, 10Mb Drive) with Color Display and Debugger
 permalink: /devices/pcx86/machine/5160/cga/256kb/debugger/
 redirect_from:
   - /configs/pc/machines/5160/cga/256kb/demo/debugger/
diff --git a/devices/pcx86/machine/5160/cga/256kb/debugger/machine.xml b/devices/pcx86/machine/5160/cga/256kb/debugger/machine.xml
index e3386e25b0..b9377f83ad 100644
--- a/devices/pcx86/machine/5160/cga/256kb/debugger/machine.xml
+++ b/devices/pcx86/machine/5160/cga/256kb/debugger/machine.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="/versions/pcx86/1.63.0/machine.xsl"?>
 <machine id="ibm5160" type="pcx86" border="1" pos="center" background="default">
-	<name pos="center">IBM PC XT (Model 5160), CGA, 256Kb, 10Mb Drive</name>
+	<name pos="center">IBM PC XT, Color Display, 256K RAM, 10Mb Drive</name>
 	<computer id="xt-cga-256k" name="IBM PC XT"/>
 	<ram id="ramLow" addr="0x00000" test="false" comment="ROM BIOS memory test has been disabled"/>
 	<rom id="romHDC" addr="0xc8000" size="0x2000" file="/devices/pcx86/hdc/ibm-xebec-1982.json"/>
diff --git a/devices/pcx86/machine/5160/cga/256kb/machine.xml b/devices/pcx86/machine/5160/cga/256kb/machine.xml
index c4b630624f..1889e9fd18 100644
--- a/devices/pcx86/machine/5160/cga/256kb/machine.xml
+++ b/devices/pcx86/machine/5160/cga/256kb/machine.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="/versions/pcx86/1.63.0/machine.xsl"?>
 <machine id="ibm5160" type="pcx86" border="1" pos="center" background="default">
-	<name pos="center">IBM PC XT (Model 5160), CGA, 256Kb, 10Mb Drive</name>
+	<name pos="center">IBM PC XT, Color Display, 256K RAM, 10Mb Drive</name>
 	<computer id="xt-cga-256k" name="IBM PC XT"/>
 	<ram id="ramLow" addr="0x00000"/>
 	<rom id="romHDC" addr="0xc8000" size="0x2000" file="/devices/pcx86/hdc/ibm-xebec-1982.json"/>
diff --git a/devices/pcx86/machine/5160/cga/512kb/debugger/README.md b/devices/pcx86/machine/5160/cga/512kb/debugger/README.md
index 62cd78f965..8261924d13 100644
--- a/devices/pcx86/machine/5160/cga/512kb/debugger/README.md
+++ b/devices/pcx86/machine/5160/cga/512kb/debugger/README.md
@@ -1,6 +1,6 @@
 ---
 layout: page
-title: IBM PC XT (Model 5160, 512Kb, 10Mb Drive) with Color Display and Debugger
+title: IBM PC XT (512K RAM, 10Mb Drive) with Color Display and Debugger
 permalink: /devices/pcx86/machine/5160/cga/512kb/debugger/
 redirect_from:
   - /configs/pc/machines/5160/cga/512kb/debugger/
diff --git a/devices/pcx86/machine/5160/cga/512kb/debugger/machine.xml b/devices/pcx86/machine/5160/cga/512kb/debugger/machine.xml
index bbec2b6c40..99b3047dac 100644
--- a/devices/pcx86/machine/5160/cga/512kb/debugger/machine.xml
+++ b/devices/pcx86/machine/5160/cga/512kb/debugger/machine.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="/versions/pcx86/1.63.0/machine.xsl"?>
 <machine id="ibm5160" type="pcx86" border="1" width="1000px" pos="center" background="default">
-	<name pos="center">IBM PC XT (Model 5160), CGA, 512K, 10Mb Drive</name>
+	<name pos="center">IBM PC XT, Color Display, 512K RAM, 10Mb Drive</name>
 	<computer id="xt-cga-512k" name="IBM PC XT"/>
 	<cpu id="cpu8088" model="8088" autostart="true"/>
 	<ram id="ramLow" addr="0x00000" test="false" size="0x80000" comment="0x80000 (512Kb) size overrides SW1|ROM BIOS memory test has been disabled"/>
diff --git a/devices/pcx86/machine/5160/cga/640kb/README.md b/devices/pcx86/machine/5160/cga/640kb/README.md
index b9d09b488e..40720eb7f7 100644
--- a/devices/pcx86/machine/5160/cga/640kb/README.md
+++ b/devices/pcx86/machine/5160/cga/640kb/README.md
@@ -1,6 +1,6 @@
 ---
 layout: page
-title: IBM PC XT (Model 5160, 640Kb, 10Mb Drive) with Color Display
+title: IBM PC XT (640K RAM, 10Mb Drive) with Color Display
 permalink: /devices/pcx86/machine/5160/cga/640kb/
 machines:
   - id: ibm5160
diff --git a/devices/pcx86/machine/5160/cga/640kb/debugger/README.md b/devices/pcx86/machine/5160/cga/640kb/debugger/README.md
index bd3b625db3..c08a7ccfbe 100644
--- a/devices/pcx86/machine/5160/cga/640kb/debugger/README.md
+++ b/devices/pcx86/machine/5160/cga/640kb/debugger/README.md
@@ -1,6 +1,6 @@
 ---
 layout: page
-title: IBM PC XT (Model 5160, 640Kb, 10Mb Drive) with Color Display and Debugger
+title: IBM PC XT (640K RAM, 10Mb Drive) with Color Display and Debugger
 permalink: /devices/pcx86/machine/5160/cga/640kb/debugger/
 redirect_from:
   - /devices/pcx86/machine/5160/cga/640kb/softkbd/
diff --git a/devices/pcx86/machine/5160/cga/640kb/debugger/machine.xml b/devices/pcx86/machine/5160/cga/640kb/debugger/machine.xml
index 2ef2ad725e..ddaa1f36ae 100644
--- a/devices/pcx86/machine/5160/cga/640kb/debugger/machine.xml
+++ b/devices/pcx86/machine/5160/cga/640kb/debugger/machine.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="/versions/pcx86/1.63.0/machine.xsl"?>
 <machine id="ibm5160" type="pcx86" border="1" width="980px" pos="center" background="default">
-	<name pos="center">IBM PC XT (Model 5160), CGA, 640K, 10Mb Drive (Formatted)</name>
+	<name pos="center">IBM PC XT, Color Display, 640K RAM, 10Mb Drive (Formatted)</name>
 	<computer id="xt-cga-640k" name="IBM PC XT"/>
 	<cpu id="cpu8088" model="8088" autostart="true"/>
 	<ram id="ramLow" addr="0x00000" test="false" size="0xa0000" comment="0xa0000 (640Kb) size overrides SW1|ROM BIOS memory test has been disabled"/>
diff --git a/devices/pcx86/machine/5160/cga/640kb/machine.xml b/devices/pcx86/machine/5160/cga/640kb/machine.xml
index 6769437811..17c4e57e9c 100644
--- a/devices/pcx86/machine/5160/cga/640kb/machine.xml
+++ b/devices/pcx86/machine/5160/cga/640kb/machine.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="/versions/pcx86/1.63.0/machine.xsl"?>
 <machine id="ibm5160" type="pcx86" border="1" pos="center" background="default">
-	<name pos="center">IBM PC XT (Model 5160), CGA, 640K, 10Mb Drive (Formatted)</name>
+	<name pos="center">IBM PC XT, Color Display, 640K RAM, 10Mb Drive (Formatted)</name>
 	<computer id="xt-cga-640k" name="IBM PC XT"/>
 	<ram id="ramLow" addr="0x00000" test="false" size="0xa0000" comment="0xa0000 (640Kb) size overrides SW1|ROM BIOS memory test has been disabled"/>
 	<rom id="romHDC" addr="0xc8000" size="0x2000" file="/devices/pcx86/hdc/ibm-xebec-1982.json"/>
diff --git a/devices/pcx86/machine/5160/cga/640kb/mouse/debugger/machine.xml b/devices/pcx86/machine/5160/cga/640kb/mouse/debugger/machine.xml
index 032430016f..28d73323ce 100644
--- a/devices/pcx86/machine/5160/cga/640kb/mouse/debugger/machine.xml
+++ b/devices/pcx86/machine/5160/cga/640kb/mouse/debugger/machine.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="/versions/pcx86/1.63.0/machine.xsl"?>
 <machine id="ibm5160" type="pcx86" border="1" width="980px" pos="center" background="default">
-	<name pos="center">IBM PC XT (Model 5160), CGA, 640K, 10Mb Drive (Formatted)</name>
+	<name pos="center">IBM PC XT, Color Display, 640K RAM, 10Mb Drive (Formatted)</name>
 	<computer id="xt-cga-640k" name="IBM PC XT"/>
 	<cpu id="cpu8088" model="8088" autostart="true"/>
 	<ram id="ramLow" addr="0x00000" test="false" size="0xa0000" comment="0xa0000 (640Kb) size overrides SW1|ROM BIOS memory test has been disabled"/>
diff --git a/devices/pcx86/machine/5160/cga/640kb/mouse/machine.xml b/devices/pcx86/machine/5160/cga/640kb/mouse/machine.xml
index 8ac1e2615e..5d7c6c6877 100644
--- a/devices/pcx86/machine/5160/cga/640kb/mouse/machine.xml
+++ b/devices/pcx86/machine/5160/cga/640kb/mouse/machine.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="/versions/pcx86/1.63.0/machine.xsl"?>
 <machine id="ibm5160" type="pcx86" border="1" pos="center" background="default">
-	<name pos="center">IBM PC XT (Model 5160), CGA, 640K, 10Mb Drive (Formatted)</name>
+	<name pos="center">IBM PC XT, Color Display, 640K RAM, 10Mb Drive (Formatted)</name>
 	<computer id="xt-cga-640k" name="IBM PC XT"/>
 	<ram id="ramLow" addr="0x00000" test="false" size="0xa0000" comment="0xa0000 (640Kb) size overrides SW1|ROM BIOS memory test has been disabled"/>
 	<rom id="romHDC" addr="0xc8000" size="0x2000" file="/devices/pcx86/hdc/ibm-xebec-1982.json"/>
diff --git a/devices/pcx86/machine/5160/cga/README.md b/devices/pcx86/machine/5160/cga/README.md
index ca83589723..24f551c19c 100644
--- a/devices/pcx86/machine/5160/cga/README.md
+++ b/devices/pcx86/machine/5160/cga/README.md
@@ -11,7 +11,7 @@ IBM PC XT with Color Graphics (CGA) Display
 
 All our Color Graphics (CGA) configurations of the IBM PC XT (Model 5160) are located here, including:
 
-* [IBM PC XT (256Kb, 10Mb Drive) with Color Display](/devices/pcx86/machine/5160/cga/256kb/) ([Debugger](/devices/pcx86/machine/5160/cga/256kb/debugger/))
-* [IBM PC XT (256Kb, 10Mb Drive) Machine Array with CGA Displays](/devices/pcx86/machine/5160/cga/256kb/array/)
-* [IBM PC XT (512Kb, 10Mb Drive) with Color Display and Debugger](/devices/pcx86/machine/5160/cga/512kb/debugger/)
-* [IBM PC XT (640Kb, 10Mb Drive) with Color Display](/devices/pcx86/machine/5160/cga/640kb/) ([Debugger](/devices/pcx86/machine/5160/cga/640kb/debugger/))
+* [IBM PC XT (256K RAM, 10Mb Drive) with Color Display](/devices/pcx86/machine/5160/cga/256kb/) ([Debugger](/devices/pcx86/machine/5160/cga/256kb/debugger/))
+* [IBM PC XT (256K RAM, 10Mb Drive) Machine Array with CGA Displays](/devices/pcx86/machine/5160/cga/256kb/array/)
+* [IBM PC XT (512K RAM, 10Mb Drive) with Color Display and Debugger](/devices/pcx86/machine/5160/cga/512kb/debugger/)
+* [IBM PC XT (640K RAM, 10Mb Drive) with Color Display](/devices/pcx86/machine/5160/cga/640kb/) ([Debugger](/devices/pcx86/machine/5160/cga/640kb/debugger/))
diff --git a/devices/pcx86/machine/5160/ega/256kb/color/README.md b/devices/pcx86/machine/5160/ega/256kb/color/README.md
new file mode 100644
index 0000000000..cdcbf9fb09
--- /dev/null
+++ b/devices/pcx86/machine/5160/ega/256kb/color/README.md
@@ -0,0 +1,10 @@
+---
+layout: page
+title: IBM PC XT (256K EGA, 256K RAM, 10Mb Drive) with Color Display
+permalink: /devices/pcx86/machine/5160/ega/256kb/color/
+machines:
+  - id: ibm5160
+    type: pcx86
+---
+
+{% include machine.html id="ibm5160" %}
diff --git a/devices/pcx86/machine/5160/ega/256kb/color/debugger/README.md b/devices/pcx86/machine/5160/ega/256kb/color/debugger/README.md
new file mode 100644
index 0000000000..d253d2b674
--- /dev/null
+++ b/devices/pcx86/machine/5160/ega/256kb/color/debugger/README.md
@@ -0,0 +1,11 @@
+---
+layout: page
+title: IBM PC XT (256K EGA, 256K RAM, 10Mb Drive) with Color Display and Debugger
+permalink: /devices/pcx86/machine/5160/ega/256kb/color/debugger/
+machines:
+  - id: ibm5160
+    type: pcx86
+    debugger: true
+---
+
+{% include machine.html id="ibm5160" %}
diff --git a/devices/pcx86/machine/5160/ega/256kb/color/debugger/machine.xml b/devices/pcx86/machine/5160/ega/256kb/color/debugger/machine.xml
new file mode 100644
index 0000000000..bdd33fb6ad
--- /dev/null
+++ b/devices/pcx86/machine/5160/ega/256kb/color/debugger/machine.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet type="text/xsl" href="/versions/pcx86/1.63.0/machine.xsl"?>
+<machine id="ibm5160" type="pcx86" border="1" pos="center" background="default">
+	<name pos="center">IBM PC XT, 256K EGA, 256K RAM, 10Mb Hard Disk, Color Display</name>
+	<computer id="xt-ega-256k" name="IBM PC XT"/>
+	<cpu id="cpu8088" model="8088"/>
+	<ram id="ramLow" addr="0x00000" test="false"/>
+	<rom id="romHDC" addr="0xc8000" size="0x2000" file="/devices/pcx86/hdc/ibm-xebec-1982.json"/>
+	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pcx86/rom/5160/basic/BASIC110.json"/>
+	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pcx86/rom/5160/1982-11-08/XTBIOS-REV1.json"/>
+	<video ref="/devices/pcx86/video/ibm/ega/1984-09-13/ibm-ega-5153-256k.xml"/>
+	<fdc ref="/disks/pcx86/library.xml"/>
+	<hdc id="hdcXT" drives='[{name:"10Mb Hard Disk",type:3}]'/>
+	<keyboard ref="/devices/pcx86/keyboard/us83-softkeys.xml"/>
+	<debugger id="debugger"/>
+	<panel ref="/devices/pcx86/panel/wide.xml"/>
+	<chipset id="chipset" model="5160" sw1="01001101" pos="left" padLeft="8px" padBottom="8px">
+		<control type="switches" label="SW1" binding="sw1" left="0px"/>
+		<control type="description" binding="swdesc" left="0px"/>
+	</chipset>
+	<serial id="com1" adapter="1" binding="print"/>
+	<serial id="com2" adapter="2"/>
+</machine>
diff --git a/devices/pcx86/machine/5160/ega/256kb/color/machine.xml b/devices/pcx86/machine/5160/ega/256kb/color/machine.xml
new file mode 100644
index 0000000000..540c87bdd5
--- /dev/null
+++ b/devices/pcx86/machine/5160/ega/256kb/color/machine.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet type="text/xsl" href="/versions/pcx86/1.63.0/machine.xsl"?>
+<machine id="ibm5160" type="pcx86" border="1" pos="center" background="default">
+	<name pos="center">IBM PC XT, 256K EGA, 256K RAM, 10Mb Hard Disk, Color Display</name>
+	<computer id="xt-ega-256k" name="IBM PC XT"/>
+	<cpu id="cpu8088" model="8088"/>
+	<ram id="ramLow" addr="0x00000" test="false"/>
+	<rom id="romHDC" addr="0xc8000" size="0x2000" file="/devices/pcx86/hdc/ibm-xebec-1982.json"/>
+	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pcx86/rom/5160/basic/BASIC110.json"/>
+	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pcx86/rom/5160/1982-11-08/XTBIOS-REV1.json"/>
+	<video ref="/devices/pcx86/video/ibm/ega/1984-09-13/ibm-ega-5153-256k.xml"/>
+	<fdc ref="/disks/pcx86/library.xml"/>
+	<hdc id="hdcXT" drives='[{name:"10Mb Hard Disk",type:3}]'/>
+	<keyboard ref="/devices/pcx86/keyboard/us83-softkeys.xml"/>
+	<chipset id="chipset" model="5160" sw1="01001101"/>
+	<serial id="com1" adapter="1"/>
+	<serial id="com2" adapter="2"/>
+</machine>
diff --git a/devices/pcx86/machine/5160/ega/256kb/debugger/machine.xml b/devices/pcx86/machine/5160/ega/256kb/debugger/machine.xml
index 8de3c2e05d..146653c15a 100644
--- a/devices/pcx86/machine/5160/ega/256kb/debugger/machine.xml
+++ b/devices/pcx86/machine/5160/ega/256kb/debugger/machine.xml
@@ -8,7 +8,7 @@
 	<rom id="romHDC" addr="0xc8000" size="0x2000" file="/devices/pcx86/hdc/ibm-xebec-1982.json"/>
 	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pcx86/rom/5160/basic/BASIC110.json"/>
 	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pcx86/rom/5160/1982-11-08/XTBIOS-REV1.json"/>
-	<video ref="/devices/pcx86/video/ibm/ega/1984-09-13/ibm-ega-5153-256k.xml"/>
+	<video ref="/devices/pcx86/video/ibm/ega/1984-09-13/ibm-ega-5154-256k.xml"/>
 	<fdc ref="/disks/pcx86/library.xml"/>
 	<hdc id="hdcXT" drives='[{name:"10Mb Hard Disk",type:3}]'/>
 	<keyboard ref="/devices/pcx86/keyboard/us83-softkeys.xml"/>
diff --git a/devices/pcx86/machine/5160/ega/256kb/machine.xml b/devices/pcx86/machine/5160/ega/256kb/machine.xml
index 35fd663ca3..2635413093 100644
--- a/devices/pcx86/machine/5160/ega/256kb/machine.xml
+++ b/devices/pcx86/machine/5160/ega/256kb/machine.xml
@@ -8,7 +8,7 @@
 	<rom id="romHDC" addr="0xc8000" size="0x2000" file="/devices/pcx86/hdc/ibm-xebec-1982.json"/>
 	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pcx86/rom/5160/basic/BASIC110.json"/>
 	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pcx86/rom/5160/1982-11-08/XTBIOS-REV1.json"/>
-	<video ref="/devices/pcx86/video/ibm/ega/1984-09-13/ibm-ega-5153-256k.xml"/>
+	<video ref="/devices/pcx86/video/ibm/ega/1984-09-13/ibm-ega-5154-256k.xml"/>
 	<fdc ref="/disks/pcx86/library.xml"/>
 	<hdc id="hdcXT" drives='[{name:"10Mb Hard Disk",type:3}]'/>
 	<keyboard ref="/devices/pcx86/keyboard/us83-softkeys.xml"/>
diff --git a/devices/pcx86/machine/5160/ega/640kb/README.md b/devices/pcx86/machine/5160/ega/640kb/README.md
index 2037d20d3d..979e971f37 100644
--- a/devices/pcx86/machine/5160/ega/640kb/README.md
+++ b/devices/pcx86/machine/5160/ega/640kb/README.md
@@ -1,6 +1,6 @@
 ---
 layout: page
-title: IBM PC XT (Model 5160, 640Kb, 10Mb Drive) with EGA Display
+title: IBM PC XT (128K EGA, 640K RAM, 10Mb Drive) with Enhanced Color Display
 permalink: /devices/pcx86/machine/5160/ega/640kb/
 redirect_from:
   - /configs/pc/machines/5160/ega/640kb/
diff --git a/devices/pcx86/machine/5160/ega/640kb/array/README.md b/devices/pcx86/machine/5160/ega/640kb/array/README.md
index c1073e926d..dccaba7337 100644
--- a/devices/pcx86/machine/5160/ega/640kb/array/README.md
+++ b/devices/pcx86/machine/5160/ega/640kb/array/README.md
@@ -1,6 +1,6 @@
 ---
 layout: page
-title: IBM PC XT (Model 5160, 256Kb, 10Mb Drive) Machine Array with EGA Displays
+title: IBM PC XT (128K EGA, 640K RAM, 10Mb Drive) Machine Array with Enhanced Color Displays
 permalink: /devices/pcx86/machine/5160/ega/640kb/array/
 machines:
   - id: ibm5160-ega-win101-1
diff --git a/devices/pcx86/machine/5160/ega/640kb/debugger/README.md b/devices/pcx86/machine/5160/ega/640kb/debugger/README.md
index d665dfc4eb..573549cb31 100644
--- a/devices/pcx86/machine/5160/ega/640kb/debugger/README.md
+++ b/devices/pcx86/machine/5160/ega/640kb/debugger/README.md
@@ -1,6 +1,6 @@
 ---
 layout: page
-title: IBM PC XT (Model 5160, 640Kb, 10Mb Drive) with EGA Display and Debugger
+title: IBM PC XT (128K EGA, 640K RAM, 10Mb Drive) with Enhanced Color Display and Debugger
 permalink: /devices/pcx86/machine/5160/ega/640kb/debugger/
 machines:
   - id: ibm5160
diff --git a/devices/pcx86/machine/5160/ega/README.md b/devices/pcx86/machine/5160/ega/README.md
index fceb5f9954..e2fb451c7e 100644
--- a/devices/pcx86/machine/5160/ega/README.md
+++ b/devices/pcx86/machine/5160/ega/README.md
@@ -1,6 +1,6 @@
 ---
 layout: page
-title: "IBM PC XT (Model 5160) with Enhanced Graphics Adapter (EGA)"
+title: IBM PC XT (Model 5160) with Enhanced Graphics Adapter (EGA)
 permalink: /devices/pcx86/machine/5160/ega/
 ---
 
@@ -9,7 +9,9 @@ IBM PC XT (Model 5160) with Enhanced Graphics Adapter (EGA)
 
 All our Enhanced Graphics Adapter (EGA) configurations of the IBM PC XT (Model 5160) are located here, including:
 
-* [IBM PC XT (256K RAM, 256K EGA, 10Mb Drive) with Enhanced Color Display](/devices/pcx86/machine/5160/ega/256kb/) ([Debugger](/devices/pcx86/machine/5160/ega/256kb/debugger/))
 * [IBM PC XT (256K RAM, 256K EGA, 10Mb Drive) with Monochrome Display](/devices/pcx86/machine/5160/ega/256kb/mono/) ([Debugger](/devices/pcx86/machine/5160/ega/256kb/mono/debugger/))
+* [IBM PC XT (256K RAM, 256K EGA, 10Mb Drive) with Color Display](/devices/pcx86/machine/5160/ega/256kb/color/) ([Debugger](/devices/pcx86/machine/5160/ega/256kb/color/debugger/))
+* [IBM PC XT (256K RAM, 256K EGA, 10Mb Drive) with Enhanced Color Display](/devices/pcx86/machine/5160/ega/256kb/) ([Debugger](/devices/pcx86/machine/5160/ega/256kb/debugger/))
+
 * [IBM PC XT (640K RAM, 128K EGA, 10Mb Drive) with Enhanced Color Display](/devices/pcx86/machine/5160/ega/640kb/) ([Debugger](/devices/pcx86/machine/5160/ega/640kb/debugger/))
 * [IBM PC XT (640K RAM, 128K EGA, 10Mb Drive) Machine Array with Enhanced Color Displays](/devices/pcx86/machine/5160/ega/640kb/array/)
diff --git a/devices/pcx86/machine/5160/mda/256kb/README.md b/devices/pcx86/machine/5160/mda/256kb/README.md
index 076e9a86d1..7ab36d1172 100644
--- a/devices/pcx86/machine/5160/mda/256kb/README.md
+++ b/devices/pcx86/machine/5160/mda/256kb/README.md
@@ -1,6 +1,6 @@
 ---
 layout: page
-title: IBM PC XT (Model 5160, 256Kb, 10Mb Drive) with Monochrome Display
+title: IBM PC XT (256K RAM, 10Mb Drive) with Monochrome Display
 permalink: /devices/pcx86/machine/5160/mda/256kb/
 machines:
   - id: ibm5160
diff --git a/devices/pcx86/machine/5160/mda/256kb/debugger/README.md b/devices/pcx86/machine/5160/mda/256kb/debugger/README.md
index 52756fc622..b1718daad3 100644
--- a/devices/pcx86/machine/5160/mda/256kb/debugger/README.md
+++ b/devices/pcx86/machine/5160/mda/256kb/debugger/README.md
@@ -1,6 +1,6 @@
 ---
 layout: page
-title: IBM PC XT (Model 5160, 256Kb, 10Mb Drive) with Monochrome Display and Debugger
+title: IBM PC XT (256K RAM, 10Mb Drive) with Monochrome Display and Debugger
 permalink: /devices/pcx86/machine/5160/mda/256kb/debugger/
 machines:
   - id: ibm5160
diff --git a/devices/pcx86/machine/5160/mda/256kb/debugger/machine.xml b/devices/pcx86/machine/5160/mda/256kb/debugger/machine.xml
index f3eebafea2..6cfe490d5c 100644
--- a/devices/pcx86/machine/5160/mda/256kb/debugger/machine.xml
+++ b/devices/pcx86/machine/5160/mda/256kb/debugger/machine.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="/versions/pcx86/1.63.0/machine.xsl"?>
 <machine id="ibm5160" type="pcx86" border="1" pos="center" background="default">
-	<name pos="center">IBM PC XT (Model 5160), MDA, 256Kb, 10Mb Drive</name>
+	<name pos="center">IBM PC XT, Monochrome Display, 256K RAM, 10Mb Drive</name>
 	<computer id="xt-mda-256k" name="IBM PC XT"/>
 	<cpu id="cpu8088" model="8088"/>
 	<ram id="ramLow" addr="0x00000" test="false"/>
diff --git a/devices/pcx86/machine/5160/mda/256kb/fake188/README.md b/devices/pcx86/machine/5160/mda/256kb/fake188/README.md
index 2760eb8a5e..2ce3e46c1f 100644
--- a/devices/pcx86/machine/5160/mda/256kb/fake188/README.md
+++ b/devices/pcx86/machine/5160/mda/256kb/fake188/README.md
@@ -1,6 +1,6 @@
 ---
 layout: page
-title: IBM PC XT (Model 5160, 80188, 256Kb) with Monochrome Display
+title: IBM PC XT (80188 CPU, 256K RAM) with Monochrome Display
 permalink: /devices/pcx86/machine/5160/mda/256kb/fake188/
 machines:
   - id: ibm5160
diff --git a/devices/pcx86/machine/5160/mda/256kb/fake188/debugger/README.md b/devices/pcx86/machine/5160/mda/256kb/fake188/debugger/README.md
index f323378bf2..92965a0915 100644
--- a/devices/pcx86/machine/5160/mda/256kb/fake188/debugger/README.md
+++ b/devices/pcx86/machine/5160/mda/256kb/fake188/debugger/README.md
@@ -1,6 +1,6 @@
 ---
 layout: page
-title: IBM PC XT (Model 5160, 80188, 256Kb) with Monochrome Display and Debugger
+title: IBM PC XT (80188 CPU, 256K RAM) with Monochrome Display and Debugger
 permalink: /devices/pcx86/machine/5160/mda/256kb/fake188/debugger/
 machines:
   - id: ibm5160
diff --git a/devices/pcx86/machine/5160/mda/256kb/fake188/debugger/machine.xml b/devices/pcx86/machine/5160/mda/256kb/fake188/debugger/machine.xml
index fb732f36ba..be375c5dc6 100644
--- a/devices/pcx86/machine/5160/mda/256kb/fake188/debugger/machine.xml
+++ b/devices/pcx86/machine/5160/mda/256kb/fake188/debugger/machine.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="/versions/pcx86/1.63.0/machine.xsl"?>
 <machine id="ibm5160" type="pcx86" border="1" width="740px" pos="center" background="default">
-	<name pos="center">IBM PC XT (Model 5160), MDA, 256Kb, 10Mb Drive</name>
+	<name pos="center">IBM PC XT (80188 CPU), Monochrome Display, 256K RAM, 10Mb Drive</name>
 	<computer id="xt188-mda-256k" name="IBM PC XT"/>
 	<cpu id="cpu80188" model="80188"/>
 	<ram id="ramLow" addr="0x00000" test="false"/>
diff --git a/devices/pcx86/machine/5160/mda/256kb/fake188/machine.xml b/devices/pcx86/machine/5160/mda/256kb/fake188/machine.xml
index 9e428c7ef3..7635bdff40 100644
--- a/devices/pcx86/machine/5160/mda/256kb/fake188/machine.xml
+++ b/devices/pcx86/machine/5160/mda/256kb/fake188/machine.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="/versions/pcx86/1.63.0/machine.xsl"?>
 <machine id="ibm5160" type="pcx86" border="1" pos="center" background="default">
-	<name pos="center">IBM PC XT (Model 5160), MDA, 256Kb, 10Mb Drive</name>
+	<name pos="center">IBM PC XT (80188 CPU), Monochrome Display, 256K RAM, 10Mb Drive</name>
 	<computer id="xt188-mda-256k" name="IBM PC XT"/>
 	<ram id="ramLow" addr="0x00000" test="false"/>
 	<rom id="romHDC" addr="0xc8000" size="0x2000" file="/devices/pcx86/hdc/ibm-xebec-1982.json"/>
diff --git a/devices/pcx86/machine/5160/mda/64kb/debugger/README.md b/devices/pcx86/machine/5160/mda/64kb/debugger/README.md
index 16593358db..629f864e1c 100644
--- a/devices/pcx86/machine/5160/mda/64kb/debugger/README.md
+++ b/devices/pcx86/machine/5160/mda/64kb/debugger/README.md
@@ -1,6 +1,6 @@
 ---
 layout: page
-title: IBM PC XT (Model 5160, 64Kb, 10Mb Drive) with Monochrome Display and Debugger
+title: IBM PC XT (64K RAM, 10Mb Drive) with Monochrome Display and Debugger
 permalink: /devices/pcx86/machine/5160/mda/64kb/debugger/
 redirect_from:
   - /configs/pc/machines/5160/mda/64kb/debugger/index.xml/
diff --git a/devices/pcx86/machine/5160/mda/64kb/debugger/machine.xml b/devices/pcx86/machine/5160/mda/64kb/debugger/machine.xml
index 71459ed4cb..2c908d9f4c 100644
--- a/devices/pcx86/machine/5160/mda/64kb/debugger/machine.xml
+++ b/devices/pcx86/machine/5160/mda/64kb/debugger/machine.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="/versions/pcx86/1.63.0/machine.xsl"?>
 <machine id="ibm5160" type="pcx86" border="1" pos="center" background="default">
-	<name pos="center">IBM PC XT (Model 5160), MDA, 64K, 10Mb Drive</name>
+	<name pos="center">IBM PC XT, Monochrome Display, 64K RAM, 10Mb Drive</name>
 	<computer id="xt-mda-64k" name="IBM PC XT"/>
 	<cpu id="cpu8088" model="8088"/>
 	<ram id="ramLow" addr="0x00000"/>
diff --git a/devices/pcx86/machine/5160/mda/README.md b/devices/pcx86/machine/5160/mda/README.md
index 2898f7f032..7f1a6b2112 100644
--- a/devices/pcx86/machine/5160/mda/README.md
+++ b/devices/pcx86/machine/5160/mda/README.md
@@ -1,13 +1,13 @@
 ---
 layout: page
-title: IBM PC Machines (Model 5160) with Monochrome (MDA) Display
+title: IBM PC Machines (Model 5160) with Monochrome Display Adapter (MDA)
 permalink: /devices/pcx86/machine/5160/mda/
 redirect_from:
   - /configs/pc/machines/5160/mda/
 ---
 
-IBM PC XT with Monochrome (MDA) Display
----
+IBM PC XT (Model 5160) with Monochrome Display Adapter (MDA)
+------------------------------------------------------------
 
 All our Monochrome (MDA) configurations of the IBM PC XT (Model 5160) are located here, including:
 
diff --git a/devices/pcx86/machine/5170/README.md b/devices/pcx86/machine/5170/README.md
index 218ecc3cf7..2120d6db6d 100644
--- a/devices/pcx86/machine/5170/README.md
+++ b/devices/pcx86/machine/5170/README.md
@@ -7,14 +7,14 @@ permalink: /devices/pcx86/machine/5170/
 IBM PC AT (Model 5170) Machines
 -------------------------------
 
-Our IBM PC AT 5170 configurations include:
+Our IBM PC AT configurations include:
 
 * [IBM PC AT with MDA Display](/devices/pcx86/machine/5170/mda/)
 * [IBM PC AT with CGA Display](/devices/pcx86/machine/5170/cga/)
 * [IBM PC AT with EGA Display](/devices/pcx86/machine/5170/ega/)
 * [IBM PC AT with VGA Display](/devices/pcx86/machine/5170/vga/)
 
-The IBM PC AT 5170 came in a variety of its own models over a three-year period.
+The IBM PC AT came in a variety of its own "sub-models" over a three-year period.
 
 ### 5170 Models 68 and 99
 
@@ -59,7 +59,7 @@ Models 319 and 339 were introduced in April 1986:
 	- Enhanced 101-key keyboard
 
 IBM PC AT 5170 Configuration Options
----
+------------------------------------
 
 The IBM PC AT 5170 doesn't have DIP switches like previous models, but it still has a few switches and jumpers.
 
diff --git a/devices/pcx86/video/cdp/cga/cdp-cga.xml b/devices/pcx86/video/cdp/cga/cdp-cga.xml
index 2fef11aa13..2aef89931e 100644
--- a/devices/pcx86/video/cdp/cga/cdp-cga.xml
+++ b/devices/pcx86/video/cdp/cga/cdp-cga.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<video id="videoCGA" model="cga" screenWidth="960" screenHeight="480" smoothing="false" fontROM="/devices/pcx86/video/cdp/cga/MPC_VID-1.0.json" pos="center" padding="8px">
+<video id="videoCGA" model="cga" screenWidth="960" screenHeight="480" fontROM="/devices/pcx86/video/cdp/cga/MPC_VID-1.0.json" pos="center" padding="8px">
 	<menu>
 		<title>Color Display</title>
 		<control type="container" pos="right">
diff --git a/devices/pcx86/video/compaq/ega/000412-001B/256kb-autolockfs.xml b/devices/pcx86/video/compaq/ega/000412-001B/256kb-autolockfs.xml
index ba280ecf78..20e6a47908 100644
--- a/devices/pcx86/video/compaq/ega/000412-001B/256kb-autolockfs.xml
+++ b/devices/pcx86/video/compaq/ega/000412-001B/256kb-autolockfs.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<video id="videoEGA" model="ega" memory="0x40000" screenWidth="1280" screenHeight="700" smoothing="false" touchScreen="mouse" autoLock="true" pos="center" padding="8px">
+<video id="videoEGA" model="ega" memory="0x40000" screenWidth="1280" screenHeight="700" touchScreen="mouse" autoLock="true" pos="center" padding="8px">
 	<comment>
 		If [Wikipedia](https://en.wikipedia.org/wiki/Enhanced_Graphics_Adapter) is correct that the IBM EGA
 		(presumably when paired with an IBM 5154 EGA monitor) has a "pixel aspect ratio" of 1:1.37 at its highest
@@ -8,7 +8,6 @@
 		But testing reveals that round images appear roundest when we stick with a screen size proportional to 640x350.
 		Also note that 1280x700 produces crisper results than 640x350, and 2560x1400 is sharper still (at least when
 		using Chrome).  I'm going to split the difference and go with 1280x700.
-		UPDATE: With the new smoothing option (set to false), sharpness is even better (hopefully on all browsers).
 	</comment>
 	<menu>
 		<title>COMPAQ Enhanced Color Display</title>
diff --git a/devices/pcx86/video/compaq/vga/109360-001/256kb-autolock.xml b/devices/pcx86/video/compaq/vga/109360-001/256kb-autolock.xml
index 3c77331521..ca2b9daa8e 100644
--- a/devices/pcx86/video/compaq/vga/109360-001/256kb-autolock.xml
+++ b/devices/pcx86/video/compaq/vga/109360-001/256kb-autolock.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<video id="videoVGA" model="vga" screenWidth="1280" screenHeight="960" smoothing="false" autoLock="true" pos="center" padding="8px">
+<video id="videoVGA" model="vga" screenWidth="1280" screenHeight="960" autoLock="true" pos="center" padding="8px">
 	<menu>
 		<title>COMPAQ VGA Color Display</title>
 		<control type="container" pos="right">
diff --git a/devices/pcx86/video/ibm/cga/ibm-cga-dual.xml b/devices/pcx86/video/ibm/cga/ibm-cga-dual.xml
index a46e737c37..9189a836e1 100644
--- a/devices/pcx86/video/ibm/cga/ibm-cga-dual.xml
+++ b/devices/pcx86/video/ibm/cga/ibm-cga-dual.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<video id="videoCGA" model="cga" screenWidth="1280" screenHeight="800" smoothing="false" fontROM="/devices/pcx86/video/ibm/cga/ibm-cga.json" pos="center" padding="8px">
+<video id="videoCGA" model="cga" screenWidth="1280" screenHeight="800" fontROM="/devices/pcx86/video/ibm/cga/ibm-cga.json" pos="center" padding="8px">
 	<menu>
 		<title>IBM Color Display</title>
 	</menu>
diff --git a/devices/pcx86/video/ibm/cga/ibm-cga-keygrid.xml b/devices/pcx86/video/ibm/cga/ibm-cga-keygrid.xml
index cd6640209b..c39982e2dd 100644
--- a/devices/pcx86/video/ibm/cga/ibm-cga-keygrid.xml
+++ b/devices/pcx86/video/ibm/cga/ibm-cga-keygrid.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<video id="videoCGA" screenWidth="1280" screenHeight="800" smoothing="false" touchScreen="keygrid" fontROM="/devices/pcx86/video/ibm/cga/ibm-cga.json" pos="center" padding="8px">
+<video id="videoCGA" screenWidth="1280" screenHeight="800" touchScreen="keygrid" fontROM="/devices/pcx86/video/ibm/cga/ibm-cga.json" pos="center" padding="8px">
 	<menu>
 		<title>IBM Color Display</title>
 		<control type="container" pos="right">
diff --git a/devices/pcx86/video/ibm/cga/ibm-cga-lock.xml b/devices/pcx86/video/ibm/cga/ibm-cga-lock.xml
index 2878b112d8..c1a0ded9bf 100644
--- a/devices/pcx86/video/ibm/cga/ibm-cga-lock.xml
+++ b/devices/pcx86/video/ibm/cga/ibm-cga-lock.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<video id="videoCGA" screenWidth="1280" screenHeight="800" smoothing="false" touchScreen="mouse" autoLock="true" fontROM="/devices/pcx86/video/ibm/cga/ibm-cga.json" padding="8px">
+<video id="videoCGA" screenWidth="1280" screenHeight="800" touchScreen="mouse" autoLock="true" fontROM="/devices/pcx86/video/ibm/cga/ibm-cga.json" padding="8px">
 	<menu>
 		<title>IBM Color Display</title>
 		<control type="container" pos="right">
diff --git a/devices/pcx86/video/ibm/cga/ibm-cga.xml b/devices/pcx86/video/ibm/cga/ibm-cga.xml
index 364a8a172e..6d87a05284 100644
--- a/devices/pcx86/video/ibm/cga/ibm-cga.xml
+++ b/devices/pcx86/video/ibm/cga/ibm-cga.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<video id="videoCGA" model="cga" screenWidth="1280" screenHeight="800" smoothing="false" fontROM="/devices/pcx86/video/ibm/cga/ibm-cga.json" pos="center" padding="8px">
+<video id="videoCGA" model="cga" screenWidth="1280" screenHeight="800" fontROM="/devices/pcx86/video/ibm/cga/ibm-cga.json" pos="center" padding="8px">
 	<menu>
 		<title>IBM Color Display</title>
 		<control type="container" pos="right">
diff --git a/devices/pcx86/video/ibm/ega/1984-09-13/ibm-ega-5151-256k.xml b/devices/pcx86/video/ibm/ega/1984-09-13/ibm-ega-5151-256k.xml
index d360a4c0a8..e5d7367b8b 100644
--- a/devices/pcx86/video/ibm/ega/1984-09-13/ibm-ega-5151-256k.xml
+++ b/devices/pcx86/video/ibm/ega/1984-09-13/ibm-ega-5151-256k.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<video id="videoEGA" model="ega" memory="0x40000" screenWidth="1440" screenHeight="900" switches="0010" smoothing="false" touchScreen="mouse" pos="center" padding="8px">
+<video id="videoEGA" model="ega" memory="0x40000" screenWidth="1440" screenHeight="900" switches="0010" touchScreen="mouse" pos="center" padding="8px">
 	<menu>
 		<title>IBM Monochrome Display</title>
 		<control type="container" pos="right">
diff --git a/devices/pcx86/video/ibm/ega/1984-09-13/ibm-ega-5153-256k.xml b/devices/pcx86/video/ibm/ega/1984-09-13/ibm-ega-5153-256k.xml
index 12cc7d3b4a..25f74edca1 100644
--- a/devices/pcx86/video/ibm/ega/1984-09-13/ibm-ega-5153-256k.xml
+++ b/devices/pcx86/video/ibm/ega/1984-09-13/ibm-ega-5153-256k.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<video id="videoEGA" model="ega" memory="0x40000" screenWidth="1280" screenHeight="800" switches="0001" smoothing="false" touchScreen="mouse" pos="center" padding="8px">
+<video id="videoEGA" model="ega" memory="0x40000" screenWidth="1280" screenHeight="800" switches="0001" touchScreen="mouse" pos="center" padding="8px">
 	<menu>
 		<title>IBM Color Display</title>
 		<control type="container" pos="right">
diff --git a/devices/pcx86/video/ibm/ega/1984-09-13/ibm-ega-5154-128k-autolock640.xml b/devices/pcx86/video/ibm/ega/1984-09-13/ibm-ega-5154-128k-autolock640.xml
index a1a61a4958..ee9321e56e 100644
--- a/devices/pcx86/video/ibm/ega/1984-09-13/ibm-ega-5154-128k-autolock640.xml
+++ b/devices/pcx86/video/ibm/ega/1984-09-13/ibm-ega-5154-128k-autolock640.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<video id="videoEGA" model="ega" memory="0x20000" screenWidth="640" screenHeight="350" smoothing="false" autoLock="true" pos="center" padding="8px">
+<video id="videoEGA" model="ega" memory="0x20000" screenWidth="640" screenHeight="350" autoLock="true" pos="center" padding="8px">
 	<menu>
 		<title>IBM Enhanced Color Display</title>
 		<control type="container" pos="right">
diff --git a/devices/pcx86/video/ibm/ega/1984-09-13/ibm-ega-5154-128k-autolockfs.xml b/devices/pcx86/video/ibm/ega/1984-09-13/ibm-ega-5154-128k-autolockfs.xml
index f609649b3c..2c55533855 100644
--- a/devices/pcx86/video/ibm/ega/1984-09-13/ibm-ega-5154-128k-autolockfs.xml
+++ b/devices/pcx86/video/ibm/ega/1984-09-13/ibm-ega-5154-128k-autolockfs.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<video id="videoEGA" model="ega" memory="0x20000" screenWidth="1280" screenHeight="700" smoothing="false" touchScreen="mouse" autoLock="true" pos="center" padding="8px">
+<video id="videoEGA" model="ega" memory="0x20000" screenWidth="1280" screenHeight="700" touchScreen="mouse" autoLock="true" pos="center" padding="8px">
 	<comment>
 		If [Wikipedia](https://en.wikipedia.org/wiki/Enhanced_Graphics_Adapter) is correct that the IBM EGA
 		(presumably when paired with an IBM 5154 EGA monitor) has a "pixel aspect ratio" of 1:1.37 at its highest
@@ -8,7 +8,6 @@
 		But testing reveals that round images appear roundest when we stick with a screen size proportional to 640x350.
 		Also note that 1280x700 produces crisper results than 640x350, and 2560x1400 is sharper still (at least when
 		using Chrome).  I'm going to split the difference and go with 1280x700.
-		UPDATE: With the new smoothing option (set to false), sharpness is even better (hopefully on all browsers).
 	</comment>
 	<menu>
 		<title>IBM Enhanced Color Display</title>
diff --git a/devices/pcx86/video/ibm/ega/1984-09-13/ibm-ega-5154-128k-lockfs.xml b/devices/pcx86/video/ibm/ega/1984-09-13/ibm-ega-5154-128k-lockfs.xml
index 6ebc28188b..9f62ae5ef0 100644
--- a/devices/pcx86/video/ibm/ega/1984-09-13/ibm-ega-5154-128k-lockfs.xml
+++ b/devices/pcx86/video/ibm/ega/1984-09-13/ibm-ega-5154-128k-lockfs.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<video id="videoEGA" model="ega" memory="0x20000" screenWidth="1280" screenHeight="700" smoothing="false" touchScreen="mouse" pos="center" padding="8px">
+<video id="videoEGA" model="ega" memory="0x20000" screenWidth="1280" screenHeight="700" touchScreen="mouse" pos="center" padding="8px">
 	<comment>
 		If [Wikipedia](https://en.wikipedia.org/wiki/Enhanced_Graphics_Adapter) is correct that the IBM EGA
 		(presumably when paired with an IBM 5154 EGA monitor) has a "pixel aspect ratio" of 1:1.37 at its highest
@@ -8,7 +8,6 @@
 		But testing reveals that round images appear roundest when we stick with a screen size proportional to 640x350.
 		Also note that 1280x700 produces crisper results than 640x350, and 2560x1400 is sharper still (at least when
 		using Chrome).  I'm going to split the difference and go with 1280x700.
-		UPDATE: With the new smoothing option (set to false), sharpness is even better (hopefully on all browsers).
 	</comment>
 	<menu>
 		<title>IBM Enhanced Color Display</title>
diff --git a/devices/pcx86/video/ibm/ega/1984-09-13/ibm-ega-5154-128k.xml b/devices/pcx86/video/ibm/ega/1984-09-13/ibm-ega-5154-128k.xml
index ffd130cb8b..0739948067 100644
--- a/devices/pcx86/video/ibm/ega/1984-09-13/ibm-ega-5154-128k.xml
+++ b/devices/pcx86/video/ibm/ega/1984-09-13/ibm-ega-5154-128k.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<video id="videoEGA" model="ega" memory="0x20000" screenWidth="1280" screenHeight="700" smoothing="false" touchScreen="mouse" pos="center" padding="8px">
+<video id="videoEGA" model="ega" memory="0x20000" screenWidth="1280" screenHeight="700" touchScreen="mouse" pos="center" padding="8px">
 	<menu>
 		<title>IBM Enhanced Color Display</title>
 		<control type="container" pos="right">
diff --git a/devices/pcx86/video/ibm/ega/1984-09-13/ibm-ega-5154-256k-autolock640.xml b/devices/pcx86/video/ibm/ega/1984-09-13/ibm-ega-5154-256k-autolock640.xml
index 315af5224e..1427c6f26c 100644
--- a/devices/pcx86/video/ibm/ega/1984-09-13/ibm-ega-5154-256k-autolock640.xml
+++ b/devices/pcx86/video/ibm/ega/1984-09-13/ibm-ega-5154-256k-autolock640.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<video id="videoEGA" model="ega" memory="0x40000" screenWidth="640" screenHeight="350" smoothing="false" autoLock="true" pos="center" padding="8px">
+<video id="videoEGA" model="ega" memory="0x40000" screenWidth="640" screenHeight="350" autoLock="true" pos="center" padding="8px">
 	<menu>
 		<title>IBM Enhanced Color Display</title>
 		<control type="container" pos="right">
diff --git a/devices/pcx86/video/ibm/ega/1984-09-13/ibm-ega-5154-256k-autolockfs.xml b/devices/pcx86/video/ibm/ega/1984-09-13/ibm-ega-5154-256k-autolockfs.xml
index 8fe8609fab..21d95cccc0 100644
--- a/devices/pcx86/video/ibm/ega/1984-09-13/ibm-ega-5154-256k-autolockfs.xml
+++ b/devices/pcx86/video/ibm/ega/1984-09-13/ibm-ega-5154-256k-autolockfs.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<video id="videoEGA" model="ega" memory="0x40000" screenWidth="1280" screenHeight="700" smoothing="false" touchScreen="mouse" autoLock="true" pos="center" padding="8px">
+<video id="videoEGA" model="ega" memory="0x40000" screenWidth="1280" screenHeight="700" touchScreen="mouse" autoLock="true" pos="center" padding="8px">
 	<comment>
 		If [Wikipedia](https://en.wikipedia.org/wiki/Enhanced_Graphics_Adapter) is correct that the IBM EGA
 		(presumably when paired with an IBM 5154 EGA monitor) has a "pixel aspect ratio" of 1:1.37 at its highest
@@ -8,7 +8,6 @@
 		But testing reveals that round images appear roundest when we stick with a screen size proportional to 640x350.
 		Also note that 1280x700 produces crisper results than 640x350, and 2560x1400 is sharper still (at least when
 		using Chrome).  I'm going to split the difference and go with 1280x700.
-		UPDATE: With the new smoothing option (set to false), sharpness is even better (hopefully on all browsers).
 	</comment>
 	<menu>
 		<title>IBM Enhanced Color Display</title>
diff --git a/devices/pcx86/video/ibm/ega/1984-09-13/ibm-ega-5154-256k-lockfs.xml b/devices/pcx86/video/ibm/ega/1984-09-13/ibm-ega-5154-256k-lockfs.xml
index 3c3ee4dbbe..2134827646 100644
--- a/devices/pcx86/video/ibm/ega/1984-09-13/ibm-ega-5154-256k-lockfs.xml
+++ b/devices/pcx86/video/ibm/ega/1984-09-13/ibm-ega-5154-256k-lockfs.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<video id="videoEGA" model="ega" memory="0x40000" screenWidth="1280" screenHeight="700" smoothing="false" touchScreen="mouse" pos="center" padding="8px">
+<video id="videoEGA" model="ega" memory="0x40000" screenWidth="1280" screenHeight="700" touchScreen="mouse" pos="center" padding="8px">
 	<comment>
 		If [Wikipedia](https://en.wikipedia.org/wiki/Enhanced_Graphics_Adapter) is correct that the IBM EGA
 		(presumably when paired with an IBM 5154 EGA monitor) has a "pixel aspect ratio" of 1:1.37 at its highest
@@ -8,7 +8,6 @@
 		But testing reveals that round images appear roundest when we stick with a screen size proportional to 640x350.
 		Also note that 1280x700 produces crisper results than 640x350, and 2560x1400 is sharper still (at least when
 		using Chrome).  I'm going to split the difference and go with 1280x700.
-		UPDATE: With the new smoothing option (set to false), sharpness is even better (hopefully on all browsers).
 	</comment>
 	<menu>
 		<title>IBM Enhanced Color Display</title>
diff --git a/devices/pcx86/video/ibm/ega/1984-09-13/ibm-ega-5154-256k.xml b/devices/pcx86/video/ibm/ega/1984-09-13/ibm-ega-5154-256k.xml
index bbd091dacc..1e182311a1 100644
--- a/devices/pcx86/video/ibm/ega/1984-09-13/ibm-ega-5154-256k.xml
+++ b/devices/pcx86/video/ibm/ega/1984-09-13/ibm-ega-5154-256k.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<video id="videoEGA" model="ega" memory="0x40000" screenWidth="1280" screenHeight="700" smoothing="false" touchScreen="mouse" pos="center" padding="8px">
+<video id="videoEGA" model="ega" memory="0x40000" screenWidth="1280" screenHeight="700" touchScreen="mouse" pos="center" padding="8px">
 	<menu>
 		<title>IBM Enhanced Color Display</title>
 		<control type="container" pos="right">
diff --git a/devices/pcx86/video/ibm/ega/1984-09-13/ibm-ega-5154-64k.xml b/devices/pcx86/video/ibm/ega/1984-09-13/ibm-ega-5154-64k.xml
index 4f4f0c68ac..976d860e8b 100644
--- a/devices/pcx86/video/ibm/ega/1984-09-13/ibm-ega-5154-64k.xml
+++ b/devices/pcx86/video/ibm/ega/1984-09-13/ibm-ega-5154-64k.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<video id="videoEGA" model="ega" memory="0x10000" screenWidth="1280" screenHeight="700" smoothing="false" touchScreen="mouse" pos="center" padding="8px">
+<video id="videoEGA" model="ega" memory="0x10000" screenWidth="1280" screenHeight="700" touchScreen="mouse" pos="center" padding="8px">
 	<menu>
 		<title>IBM Enhanced Color Display</title>
 		<control type="container" pos="right">
diff --git a/devices/pcx86/video/ibm/mda/ibm-mda-dual.xml b/devices/pcx86/video/ibm/mda/ibm-mda-dual.xml
index c5bc57b68a..db161b55c0 100644
--- a/devices/pcx86/video/ibm/mda/ibm-mda-dual.xml
+++ b/devices/pcx86/video/ibm/mda/ibm-mda-dual.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<video id="videoMDA" model="mda" screenWidth="1440" screenHeight="900" smoothing="false" fontROM="/devices/pcx86/video/ibm/mda/ibm-mda.json" pos="center" padding="8px">
+<video id="videoMDA" model="mda" screenWidth="1440" screenHeight="900" fontROM="/devices/pcx86/video/ibm/mda/ibm-mda.json" pos="center" padding="8px">
 	<menu>
 		<title>IBM Monochrome Display</title>
 		<control type="container" pos="right">
diff --git a/devices/pcx86/video/ibm/mda/ibm-mda.xml b/devices/pcx86/video/ibm/mda/ibm-mda.xml
index f4aca57220..da306e28f4 100644
--- a/devices/pcx86/video/ibm/mda/ibm-mda.xml
+++ b/devices/pcx86/video/ibm/mda/ibm-mda.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<video id="videoMDA" screenWidth="1440" screenHeight="900" smoothing="false" fontROM="/devices/pcx86/video/ibm/mda/ibm-mda.json" pos="center" padding="8px">
+<video id="videoMDA" screenWidth="1440" screenHeight="900" fontROM="/devices/pcx86/video/ibm/mda/ibm-mda.json" pos="center" padding="8px">
 	<menu>
 		<title>IBM Monochrome Display</title>
 		<control type="container" pos="right">
diff --git a/devices/pcx86/video/ibm/vga/1986-10-27/ibm-vga-autolockfs.xml b/devices/pcx86/video/ibm/vga/1986-10-27/ibm-vga-autolockfs.xml
index d4de6c4b9c..d3a687cee6 100644
--- a/devices/pcx86/video/ibm/vga/1986-10-27/ibm-vga-autolockfs.xml
+++ b/devices/pcx86/video/ibm/vga/1986-10-27/ibm-vga-autolockfs.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<video id="videoVGA" model="vga" screenWidth="1280" screenHeight="960" smoothing="false" touchScreen="mouse" autoLock="true" pos="center" padding="8px">
+<video id="videoVGA" model="vga" screenWidth="1280" screenHeight="960" touchScreen="mouse" autoLock="true" pos="center" padding="8px">
 	<menu>
 		<title>IBM VGA Color Display</title>
 		<control type="container" pos="right">
diff --git a/devices/pcx86/video/ibm/vga/1986-10-27/ibm-vga-lockfs.xml b/devices/pcx86/video/ibm/vga/1986-10-27/ibm-vga-lockfs.xml
index 787f237868..5cbf9b7418 100644
--- a/devices/pcx86/video/ibm/vga/1986-10-27/ibm-vga-lockfs.xml
+++ b/devices/pcx86/video/ibm/vga/1986-10-27/ibm-vga-lockfs.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<video id="videoVGA" model="vga" screenWidth="1280" screenHeight="960" smoothing="false" touchScreen="mouse" pos="center" padding="8px">
+<video id="videoVGA" model="vga" screenWidth="1280" screenHeight="960" touchScreen="mouse" pos="center" padding="8px">
 	<menu>
 		<title>IBM VGA Color Display</title>
 		<control type="container" pos="right">
diff --git a/disks/pcx86/diags/ibm/ega/README.md b/disks/pcx86/diags/ibm/ega/README.md
index ab3c9f7a36..94c86ee367 100644
--- a/disks/pcx86/diags/ibm/ega/README.md
+++ b/disks/pcx86/diags/ibm/ega/README.md
@@ -8,7 +8,7 @@ machines:
     debugger: true
     commands: bp &0AC6:019B
     messages: video
-    config: /devices/pcx86/machine/5160/ega/256kb/debugger/machine.xml
+    config: /devices/pcx86/machine/5160/ega/256kb/color/debugger/machine.xml
     autoMount:
       A:
         name: PC-DOS 2.00 (Disk 1)
@@ -46,8 +46,52 @@ continuously, independent of CPU speed and divorced from other program operation
 with fast smooth scrolling in both directions, test subtle timing dependencies between subunits of the EGA.
 
 Thanks to Eric, a friend of PCjs, we finally have a copy of the Fantasy Land program, along with an assortment of other
-EGA utilities that he kindly provided.  Sadly, FantasyLand doesn't yet work in the PCx86 emulator, but it's on our
-"to-do" list.  Stay tuned!
+EGA utilities that he kindly included.
+
+Now that we've had an opportunity to examine the program, three things became apparent:
+
+1. The program's name was spelled "Fantasy Land"
+2. The program was designed for a Color Display (it used 8x8 fonts)
+3. The program required an EGA with a full 256K of RAM
+
+EGA users with an Enhanced Color Display (Model 5154) would normally have their EGA's switches set to "Enhanced Color
+Mode", which uses high resolution (8x14) fonts:
+
+    SW1   SW2   SW3   SW4
+    ---   ---   ---   ---
+    OFF   ON    ON    OFF
+
+so to run Fantasy Land, you would either need to change your EGA's settings to "Normal Color Mode", which defaults to
+the same font resolution (8x8) as the Color Display Adapter (CGA):
+
+    SW1   SW2   SW3   SW4
+    ---   ---   ---   ---
+    ON    ON    ON    OFF
+
+or connect your EGA to an older IBM Color Display (Model 5153) and set the EGA switches as follows:
+
+    SW1   SW2   SW3   SW4
+    ---   ---   ---   ---
+    OFF   OFF   OFF   ON
+
+The machine below uses the last option (ie, a Color Display configuration).
+
+Fantasy Land still has some issues running in the PCx86 emulator, but we're working on them.  You'll notice there
+are some additional "diagnostic" windows below the machine, which are essentially live representations of the four
+EGA "font banks" that Fantasy Land loads as part of its initialization.
+
+The EGA supported fonts with character heights up to 32 scan lines, so the maximum font size for a complete set of
+256 characters was 8K.  Unfortunately, the EGA required each font to be loaded on a 16K boundary in plane 2, so if
+you wanted to load 4 fonts, you had to have 64K of plane 2 memory, which in turn meant that all 4 planes had to have
+64K, for a total of 256K.
+
+In Fantasy Land's case, the amount of font data was fairly small: each of its four 8x8 fonts used only 2K, for a
+total of 8K.  But that didn't matter.  To load four fonts of *any* size, your EGA board had to be fully populated with
+256K.
+
+The VGA made some amends for this design oddity, by supporting 4 additional 8K font banks between the EGA's original
+4 banks.  It didn't change the fact that first 4 font banks still required a full 64K in plane 2, but by that time,
+it was a moot point, since all VGAs included 256K anyway.
 
 {% include machine.html id="ibm5160" %}
 
diff --git a/modules/pcx86/lib/video.js b/modules/pcx86/lib/video.js
index 0dc30495ec..6b44d5e613 100644
--- a/modules/pcx86/lib/video.js
+++ b/modules/pcx86/lib/video.js
@@ -3921,7 +3921,6 @@ class Video extends Component {
                 break;
 
             case Video.CARD.CGA:
-                aRGBColors = this.getCardColors();
                 if (this.aFontOffsets[0] != null) {
                     if (this.createFont(this.nCardFont, this.cxFontChar || 8, 8, this.aFontOffsets[0], 0x0000, abFontData, false, aRGBColors, aColorMap)) {
                         fChanges = true;
@@ -3935,7 +3934,6 @@ class Video extends Component {
 
             case Video.CARD.EGA:
                 nFonts += 4;
-                aRGBColors = this.getCardColors();
                 let cxChar = this.cxFontChar || 8;
                 let cyChar = 14;
                 let offData = this.aFontOffsets[1];
@@ -4770,8 +4768,13 @@ class Video extends Component {
 
         if (!this.cxBuffer || !this.cyBuffer) return;   // failsafe
 
-        if (this.fSmoothing != null && this.sSmoothing) {
-            this.contextScreen[this.sSmoothing] = this.nCardFont? true : this.fSmoothing;
+        /*
+         * Our 'smoothing' parameter defaults to null (which we treat the same as undefined), which means that
+         * image smoothing will be selectively enabled (ie, true for text modes, false for graphics modes); otherwise,
+         * we'll set image smoothing to whatever value was provided for ALL modes -- assuming the browser supports it.
+         */
+        if (this.sSmoothing) {
+            this.contextScreen[this.sSmoothing] = (this.fSmoothing == null? (this.nCardFont? true : this.fSmoothing) : this.fSmoothing);
         }
 
         /*