diff --git a/devices/pc/machine/5150/cga/README.md b/devices/pc/machine/5150/cga/README.md
index 88fe34bdd..8c558b99c 100644
--- a/devices/pc/machine/5150/cga/README.md
+++ b/devices/pc/machine/5150/cga/README.md
@@ -12,7 +12,6 @@ IBM PC with Color Graphics (CGA) Display
 
 All our Color Graphics (CGA) configurations of the IBM PC Model 5150 are located here, including:
 
-* [IBM PC (64Kb) with Color Display](/devices/pc/machine/5150/cga/64kb/donkey/)
-* [IBM PC (64Kb) with Color Display and Debugger](/devices/pc/machine/5150/cga/64kb/donkey/debugger/)
-* [IBM PC (64Kb) with Color Display and Soft Keyboard](/devices/pc/machine/5150/cga/64kb/softkbd/)
-* [IBM PC (384Kb) with Color Display and Soft Keyboard](/devices/pc/machine/5150/cga/384kb/softkbd/)
+* [IBM PC (64Kb) with Color Display](/devices/pc/machine/5150/cga/64kb/donkey/) ([Debugger](/devices/pc/machine/5150/cga/64kb/donkey/debugger/))
+* [IBM PC (64Kb) with Color Display and Soft Keyboard (Debugger)](/devices/pc/machine/5150/cga/64kb/softkbd/)
+* [IBM PC (384Kb) with Color Display and Soft Keyboard (Debugger)](/devices/pc/machine/5150/cga/384kb/softkbd/)
diff --git a/devices/pc/machine/5150/mda/README.md b/devices/pc/machine/5150/mda/README.md
index 99629b327..3431840cf 100644
--- a/devices/pc/machine/5150/mda/README.md
+++ b/devices/pc/machine/5150/mda/README.md
@@ -13,9 +13,8 @@ IBM PC with Monochrome (MDA) Display
 
 All our Monochrome (MDA) configurations of the IBM PC Model 5150 are located here, including:
 
-* [IBM PC (64Kb) with Monochrome Display](/devices/pc/machine/5150/mda/64kb/)
-* [IBM PC (64Kb) with Monochrome Display and Debugger](/devices/pc/machine/5150/mda/64kb/debugger/)
-* [IBM PC (64Kb) with Monochrome Display and Soft Keyboard](/devices/pc/machine/5150/mda/64kb/softkbd/)
+* [IBM PC (64Kb) with Monochrome Display](/devices/pc/machine/5150/mda/64kb/) ([Debugger](/devices/pc/machine/5150/mda/64kb/debugger/))
+* [IBM PC (64Kb) with Monochrome Display and Soft Keyboard (Debugger)](/devices/pc/machine/5150/mda/64kb/softkbd/)
 
 Below is a 64kb configuration, with a clock speed of 4.77Mhz,
 using the original IBM PC Model 5150 ROM BIOS and MDA font ROM. For more control,
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 a81a12b27..cfecbf763 100644
--- a/devices/pc/machine/5160/cga/256kb/win101/debugger/machine.xml
+++ b/devices/pc/machine/5160/cga/256kb/win101/debugger/machine.xml
@@ -17,7 +17,7 @@
 		<control type="switches" label="SW1" binding="sw1" left="0px"/>
 		<control type="description" binding="swdesc" left="0px"/>
 	</chipset>
-	<hdc ref="/disks/pc/fixed/10mb/pcdos200-win101.xml"/>
+	<hdc ref="/disks/pc/fixed/10mb/pcdos200-win101-cga.xml"/>
 	<serial id="com1" adapter="1" binding="print"/>
 	<serial id="com2" adapter="2"/>
 	<mouse serial="com2"/>
diff --git a/devices/pc/machine/5160/cga/256kb/win101/machine.xml b/devices/pc/machine/5160/cga/256kb/win101/machine.xml
index ad4afbd6c..cb84dbdf1 100644
--- a/devices/pc/machine/5160/cga/256kb/win101/machine.xml
+++ b/devices/pc/machine/5160/cga/256kb/win101/machine.xml
@@ -15,7 +15,7 @@
 	</cpu>
 	<keyboard ref="/devices/pc/keyboard/us83-buttons-minimal.xml"/>
 	<chipset id="chipset" model="5160" sw1="01001001"/>
-	<hdc ref="/disks/pc/fixed/10mb/pcdos200-win101.xml"/>
+	<hdc ref="/disks/pc/fixed/10mb/pcdos200-win101-cga.xml"/>
 	<serial id="com1" adapter="1" binding="print"/>
 	<serial id="com2" adapter="2"/>
 	<mouse serial="com2"/>
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 df93157de..62e2288e6 100644
--- a/devices/pc/machine/5160/cga/256kb/win101/softkbd/machine.xml
+++ b/devices/pc/machine/5160/cga/256kb/win101/softkbd/machine.xml
@@ -17,7 +17,7 @@
 		<control type="switches" label="SW1" binding="sw1" left="0px"/>
 		<control type="description" binding="swdesc" left="0px"/>
 	</chipset>
-	<hdc ref="/disks/pc/fixed/10mb/pcdos200-win101.xml"/>
+	<hdc ref="/disks/pc/fixed/10mb/pcdos200-win101-cga.xml"/>
 	<serial id="com1" adapter="1" binding="print"/>
 	<serial id="com2" adapter="2"/>
 	<mouse serial="com2"/>
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 8723af1cb..386e077be 100644
--- a/devices/pc/machine/5160/cga/512kb/win101/softkbd/machine.xml
+++ b/devices/pc/machine/5160/cga/512kb/win101/softkbd/machine.xml
@@ -17,7 +17,7 @@
 		<control type="switches" label="SW1" binding="sw1" left="0px"/>
 		<control type="description" binding="swdesc" left="0px"/>
 	</chipset>
-	<hdc ref="/disks/pc/fixed/10mb/pcdos200-win101.xml"/>
+	<hdc ref="/disks/pc/fixed/10mb/pcdos200-win101-cga.xml"/>
 	<serial id="com1" adapter="1" binding="print"/>
 	<serial id="com2" adapter="2"/>
 	<mouse serial="com2"/>
diff --git a/devices/pc/machine/5160/cga/640kb/dos400m/README.md b/devices/pc/machine/5160/cga/640kb/dos400m/README.md
deleted file mode 100644
index d8b69200b..000000000
--- a/devices/pc/machine/5160/cga/640kb/dos400m/README.md
+++ /dev/null
@@ -1,28 +0,0 @@
----
-layout: page
-title: "IBM PC XT (Model 5160, 640Kb, 10Mb Drive) with Color Display running Multitasking MS-DOS 4.00"
-permalink: /devices/pc/machine/5160/cga/640kb/dos400m/
-redirect_from:
-  - /configs/pc/machines/5160/cga/640kb/dos400m/
-  - /videos/pcjs/
-machines:
-  - type: pc
-    id: ibm5160
-    debugger: true
----
-
-Multitasking MS-DOS 4.00
----
-
-This simulation demonstrates the first unearthed copy of Microsoft's "multitasking" version of MS-DOS.
-The [original images](/disks/pc/dos/microsoft/4.0M/) were discovered by the [PCjs Project](/docs/about/) in March 2013.
-This version of MS-DOS was never officially released in North America.  More information is available at
-[Wikipedia](http://en.wikipedia.org/wiki/Multi-tasking_MS-DOS_4.0) and [OS/2 Museum](http://www.os2museum.com/wp/?p=1769).
-
-Note: The designation "4.0M" is not an official version number; it's an internal version number used only to
-differentiate these disk images from those of the official MS-DOS 4.00 release in July 1988. 
-
-The PCjs machine configuration below boots MS-DOS 4.0M.  To access the MS-DOS "Session Manager" after it's booted,
-tap the **Alt** key.
-
-{% include machine.html id="ibm5160" %}
diff --git a/devices/pc/machine/5160/cga/640kb/softkbd/machine.md b/devices/pc/machine/5160/cga/640kb/softkbd/machine.md
new file mode 100644
index 000000000..cf9df28b7
--- /dev/null
+++ b/devices/pc/machine/5160/cga/640kb/softkbd/machine.md
@@ -0,0 +1,10 @@
+---
+layout: page
+title: "IBM PC XT (Model 5160, 640Kb, 10Mb Drive) with Color Display and Soft Keyboard"
+permalink: /devices/pc/machine/5160/cga/640kb/softkbd/
+machines:
+  - type: pc
+    id: ibm5160
+---
+
+{% include machine.html id="ibm5160" %}
diff --git a/devices/pc/machine/5160/cga/640kb/dos400m/machine.xml b/devices/pc/machine/5160/cga/640kb/softkbd/machine.xml
similarity index 85%
rename from devices/pc/machine/5160/cga/640kb/dos400m/machine.xml
rename to devices/pc/machine/5160/cga/640kb/softkbd/machine.xml
index f3eb5a3d1..eeee508de 100644
--- a/devices/pc/machine/5160/cga/640kb/dos400m/machine.xml
+++ b/devices/pc/machine/5160/cga/640kb/softkbd/machine.xml
@@ -9,7 +9,7 @@
 	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/rom/5160/basic/BASIC110.json"/>
 	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/rom/5160/bios/1982-11-08/XTBIOS-REV1.json"/>
 	<video ref="/devices/pc/video/ibm/cga/ibm-cga-lock.xml"/>
-	<fdc ref="/disks/pc/compiled/library.xml" automount='{A:{name:"MS-DOS 4.0M (Disk 1)",path:"/disks/pc/dos/microsoft/4.0M/MSDOS400M-DISK1.json"}, B:{name:"MS-DOS 4.0M (Disk 2)",path:"/disks/pc/dos/microsoft/4.0M/MSDOS400M-DISK2.json"}}'/>
+	<fdc ref="/disks/pc/compiled/library.xml"/>
 	<keyboard ref="/devices/pc/keyboard/us83-softkeys.xml"/>
 	<debugger id="debugger"/>
 	<panel ref="/devices/pc/panel/wide.xml"/>
diff --git a/devices/pc/machine/5160/cga/README.md b/devices/pc/machine/5160/cga/README.md
index 2ad9ca3d1..e62b698d2 100644
--- a/devices/pc/machine/5160/cga/README.md
+++ b/devices/pc/machine/5160/cga/README.md
@@ -9,14 +9,11 @@ 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/pc/machine/5160/cga/256kb/demo/)
-* [IBM PC XT (256Kb, 10Mb Drive) with Color Display and Debugger](/devices/pc/machine/5160/cga/256kb/demo/debugger/)
-* [IBM PC XT (256Kb, 10Mb Drive) with Color Display and Soft Keyboard](/devices/pc/machine/5160/cga/256kb/softkbd/)
-* [IBM PC XT (256Kb, 10Mb Drive) with Color Display running Windows 1.01](/devices/pc/machine/5160/cga/256kb/win101/)
-* [IBM PC XT (256Kb, 10Mb Drive) with Color Display and Debugger running Windows 1.01](/devices/pc/machine/5160/cga/256kb/win101/debugger/)
-* [IBM PC XT (256Kb, 10Mb Drive) with Color Display and Soft Keyboard running Windows 1.01](/devices/pc/machine/5160/cga/256kb/win101/softkbd/)
+* [IBM PC XT (256Kb, 10Mb Drive) with Color Display](/devices/pc/machine/5160/cga/256kb/demo/) ([Debugger](/devices/pc/machine/5160/cga/256kb/demo/debugger/))
+* [IBM PC XT (256Kb, 10Mb Drive) with Color Display and Soft Keyboard (Debugger)](/devices/pc/machine/5160/cga/256kb/softkbd/)
+* [IBM PC XT (256Kb, 10Mb Drive) with Color Display running Windows 1.01](/devices/pc/machine/5160/cga/256kb/win101/) ([Debugger](/devices/pc/machine/5160/cga/256kb/win101/debugger/))
+* [IBM PC XT (256Kb, 10Mb Drive) with Color Display and Soft Keyboard (Debugger)](/devices/pc/machine/5160/cga/256kb/win101/softkbd/)
+* [IBM PC XT (512Kb, 10Mb Drive) with Color Display and Soft Keyboard (Debugger)](/devices/pc/machine/5160/cga/512kb/win101/softkbd/)
+* [IBM PC XT (640Kb, 10Mb Drive) with Color Display](/devices/pc/machine/5160/cga/640kb/) ([Debugger](/devices/pc/machine/5160/cga/640kb/debugger/))
+* [IBM PC XT (640Kb, 10Mb Drive) with Color Display and Soft Keyboard (Debugger)](/devices/pc/machine/5160/cga/640kb/softkbd/)
 * [IBM PC XT (256Kb, 10Mb Drive) Machine Array with CGA Displays](/devices/pc/machine/5160/cga/256kb/array/)
-* [IBM PC XT (512Kb, 10Mb Drive) with Color Display and Soft Keyboard running Windows 1.01](/devices/pc/machine/5160/cga/512kb/win101/softkbd/)
-* [IBM PC XT (640Kb, 10Mb Drive) with Color Display](/devices/pc/machine/5160/cga/640kb/)
-* [IBM PC XT (640Kb, 10Mb Drive) with Color Display and Debugger](/devices/pc/machine/5160/cga/640kb/debugger/)
-* [IBM PC XT (640Kb, 10Mb Drive) with Color Display running Multitasking MS-DOS 4.00](/devices/pc/machine/5160/cga/640kb/dos400m/)
diff --git a/devices/pc/machine/5160/ega/256kb/machine.md b/devices/pc/machine/5160/ega/256kb/machine.md
new file mode 100644
index 000000000..78e1b8adf
--- /dev/null
+++ b/devices/pc/machine/5160/ega/256kb/machine.md
@@ -0,0 +1,10 @@
+---
+layout: page
+title: "IBM PC XT (Model 5160, 256Kb, 10Mb Drive) with EGA Display"
+permalink: /devices/pc/machine/5160/ega/256kb/
+machines:
+  - type: pc
+    id: ibm5160
+---
+
+{% include machine.html id="ibm5160" %}
diff --git a/devices/pc/machine/5160/ega/256kb/machine.xml b/devices/pc/machine/5160/ega/256kb/machine.xml
new file mode 100644
index 000000000..61ef43bf4
--- /dev/null
+++ b/devices/pc/machine/5160/ega/256kb/machine.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet type="text/xsl" href="/versions/pcjs/1.21.1/machine.xsl"?>
+<machine id="ibm5160" class="pc" border="1" pos="center" background="#FAEBD7">
+	<name>IBM PC XT (Model 5160), 64K EGA, 256K RAM, 10Mb Hard Drive</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/pc/hdc/ibm-xebec-1982.json"/>
+	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/rom/5160/basic/BASIC110.json"/>
+	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/rom/5160/bios/1982-11-08/XTBIOS-REV1.json"/>
+	<video ref="/devices/pc/video/ibm/ega/1984-09-13/64kb.xml"/>
+	<fdc ref="/disks/pc/compiled/library.xml"/>
+	<keyboard ref="/devices/pc/keyboard/us83-buttons-functions.xml"/>
+	<chipset id="chipset" model="5160" sw1="01001101"/>
+	<hdc id="hdcXT" drives='[{name:"10Mb Hard Disk",type:3}]'/>
+</machine>
diff --git a/devices/pc/machine/5160/ega/640kb/array/machine.xml b/devices/pc/machine/5160/ega/640kb/array/machine.xml
index 9c263e857..145ad27d5 100644
--- a/devices/pc/machine/5160/ega/640kb/array/machine.xml
+++ b/devices/pc/machine/5160/ega/640kb/array/machine.xml
@@ -2,7 +2,7 @@
 <?xml-stylesheet type="text/xsl" href="/versions/pcjs/1.21.1/machine.xsl"?>
 <machine id="ibm5160" class="pc" border="1" width="680px" float="left" background="#FAEBD7">
 	<name pos="center">IBM PC XT, 128K EGA, 640K RAM, 10Mb Hard Drive</name>
-	<computer id="xt-ega-640k" name="IBM PC XT" state="/devices/pc/machine/5160/ega/640kb/win101/state.json"/>
+	<computer id="xt-ega-640k" name="IBM PC XT" state="/disks/pc/windows/1.01/ibm5160-ega.json"/>
 	<ram id="ramLow" addr="0x00000" test="false" size="0xa0000" comment="0xa0000 (640Kb) size overrides SW1|ROM BIOS memory test has been disabled"/>
 	<rom id="romHDC" addr="0xc8000" size="0x2000" file="/devices/pc/hdc/ibm-xebec-1982.json"/>
 	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/rom/5160/basic/BASIC110.json"/>
diff --git a/devices/pc/machine/5160/ega/640kb/machine.xml b/devices/pc/machine/5160/ega/640kb/machine.xml
index e0e5009da..1999c7562 100644
--- a/devices/pc/machine/5160/ega/640kb/machine.xml
+++ b/devices/pc/machine/5160/ega/640kb/machine.xml
@@ -12,7 +12,7 @@
 	<fdc ref="/disks/pc/compiled/library.xml"/>
 	<keyboard ref="/devices/pc/keyboard/us83-buttons-functions.xml"/>
 	<chipset id="chipset" model="5160" sw1="01001101"/>
-	<hdc ref="/disks/pc/fixed/10mb/pcdos200-win101-ega.xml"/>
+	<hdc id="hdcXT" drives='[{name:"10Mb Hard Disk",type:3}]'/>
 	<serial id="com2" adapter="2"/>
 	<mouse serial="com2"/>
 </machine>
diff --git a/devices/pc/machine/5160/ega/640kb/win101/debugger/machine.md b/devices/pc/machine/5160/ega/640kb/win101/debugger/machine.md
deleted file mode 100644
index 5e15005aa..000000000
--- a/devices/pc/machine/5160/ega/640kb/win101/debugger/machine.md
+++ /dev/null
@@ -1,11 +0,0 @@
----
-layout: page
-title: "IBM PC XT (Model 5160, 640Kb, 10Mb Drive) with EGA Display and Debugger running Windows 1.01"
-permalink: /devices/pc/machine/5160/ega/640kb/win101/debugger/
-machines:
-  - type: pc
-    id: ibm5160
-    debugger: true
----
-
-{% include machine.html id="ibm5160" %}
diff --git a/devices/pc/machine/5160/ega/640kb/win101/debugger/machine.xml b/devices/pc/machine/5160/ega/640kb/win101/debugger/machine.xml
deleted file mode 100644
index 6d03cf419..000000000
--- a/devices/pc/machine/5160/ega/640kb/win101/debugger/machine.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet type="text/xsl" href="/versions/pcjs/1.21.1/machine.xsl"?>
-<machine id="ibm5160" class="pc" border="1" pos="center" background="#FAEBD7">
-	<name>IBM PC XT, 128K EGA, 640K RAM, 10Mb Hard Drive</name>
-	<computer id="xt-ega-640k" name="IBM PC XT" state="/devices/pc/machine/5160/ega/640kb/win101/state.json"/>
-	<cpu id="cpu8088" model="8088"/>
-	<ram id="ramLow" addr="0x00000" test="false" size="0xa0000" comment="0xa0000 (640Kb) size overrides SW1|ROM BIOS memory test has been disabled"/>
-	<rom id="romHDC" addr="0xc8000" size="0x2000" file="/devices/pc/hdc/ibm-xebec-1982.json"/>
-	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/rom/5160/basic/BASIC110.json"/>
-	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/rom/5160/bios/1982-11-08/XTBIOS-REV1.json"/>
-	<video ref="/devices/pc/video/ibm/ega/1984-09-13/128kb-autolockfs.xml"/>
-	<fdc ref="/disks/pc/compiled/library.xml"/>
-	<keyboard ref="/devices/pc/keyboard/us83-buttons-functions.xml"/>
-	<debugger id="debugger"/>
-	<panel ref="/devices/pc/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>
-	<hdc ref="/disks/pc/fixed/10mb/pcdos200-win101-ega.xml"/>
-	<serial id="com2" adapter="2"/>
-	<mouse serial="com2"/>
-</machine>
diff --git a/devices/pc/machine/5160/ega/640kb/win101/machine.md b/devices/pc/machine/5160/ega/640kb/win101/machine.md
deleted file mode 100644
index 1e0878f62..000000000
--- a/devices/pc/machine/5160/ega/640kb/win101/machine.md
+++ /dev/null
@@ -1,12 +0,0 @@
----
-layout: page
-title: "IBM PC XT (Model 5160, 640Kb, 10Mb Drive) with EGA Display running Windows 1.01"
-permalink: /devices/pc/machine/5160/ega/640kb/win101/
-redirect_from:
-  - /configs/pc/machines/5160/ega/640kb/win101/
-machines:
-  - type: pc
-    id: ibm5160
----
-
-{% include machine.html id="ibm5160" %}
diff --git a/devices/pc/machine/5160/ega/640kb/win101/machine.xml b/devices/pc/machine/5160/ega/640kb/win101/machine.xml
deleted file mode 100644
index c89cb7c09..000000000
--- a/devices/pc/machine/5160/ega/640kb/win101/machine.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet type="text/xsl" href="/versions/pcjs/1.21.1/machine.xsl"?>
-<machine id="ibm5160" class="pc" border="1" background="#FAEBD7">
-	<name pos="center">IBM PC XT, 128K EGA, 640K RAM, 10Mb Hard Drive</name>
-	<computer id="xt-ega-640k" name="IBM PC XT" state="/devices/pc/machine/5160/ega/640kb/win101/state.json"/>
-	<ram id="ramLow" addr="0x00000" test="false" size="0xa0000" comment="0xa0000 (640Kb) size overrides SW1|ROM BIOS memory test has been disabled"/>
-	<rom id="romHDC" addr="0xc8000" size="0x2000" file="/devices/pc/hdc/ibm-xebec-1982.json"/>
-	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/rom/5160/basic/BASIC110.json"/>
-	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/rom/5160/bios/1982-11-08/XTBIOS-REV1.json"/>
-	<video ref="/devices/pc/video/ibm/ega/1984-09-13/128kb-autolockfs.xml"/>
-	<fdc ref="/disks/pc/compiled/library.xml"/>
-	<keyboard ref="/devices/pc/keyboard/us83-buttons-minimal.xml"/>
-	<cpu id="cpu8088" model="8088">
-		<control type="button" binding="setSpeed">Fast</control>
-	</cpu>
-	<chipset id="chipset" model="5160" sw1="01001101"/>
-	<hdc ref="/disks/pc/fixed/10mb/pcdos200-win101-ega.xml"/>
-	<serial id="com2" adapter="2"/>
-	<mouse serial="com2"/>
-</machine>
diff --git a/devices/pc/machine/5160/ega/README.md b/devices/pc/machine/5160/ega/README.md
index d3fe0c257..71aec1d93 100644
--- a/devices/pc/machine/5160/ega/README.md
+++ b/devices/pc/machine/5160/ega/README.md
@@ -9,9 +9,6 @@ IBM PC XT with Enhanced Color Graphics (EGA) Display
 
 All our Enhanced Color Graphics (EGA) configurations of the IBM PC XT (Model 5160) are located here, including:
 
-* [IBM PC XT (256Kb, 10Mb Drive) with EGA Display and Debugger](/devices/pc/machine/5160/ega/256kb/debugger/)
-* [IBM PC XT (640Kb, 10Mb Drive) with EGA Display](/devices/pc/machine/5160/ega/640kb/)
-* [IBM PC XT (640Kb, 10Mb Drive) with EGA Display and Debugger](/devices/pc/machine/5160/ega/640kb/debugger/)
-* [IBM PC XT (640Kb, 10Mb Drive) with EGA Display running Windows 1.01](/devices/pc/machine/5160/ega/640kb/win101/)
-* [IBM PC XT (640Kb, 10Mb Drive) with EGA Display and Debugger running Windows 1.01](/devices/pc/machine/5160/ega/640kb/win101/debugger/)
+* [IBM PC XT (256Kb, 10Mb Drive) with EGA Display](/devices/pc/machine/5160/ega/256kb/) ([Debugger](/devices/pc/machine/5160/ega/256kb/debugger/))
+* [IBM PC XT (640Kb, 10Mb Drive) with EGA Display](/devices/pc/machine/5160/ega/640kb/) ([Debugger](/devices/pc/machine/5160/ega/640kb/debugger/))
 * [IBM PC XT (640Kb, 10Mb Drive) Machine Array with EGA Displays](/devices/pc/machine/5160/ega/640kb/array/)
diff --git a/devices/pc/machine/5160/mda/README.md b/devices/pc/machine/5160/mda/README.md
index 954a3b598..bb9d20768 100644
--- a/devices/pc/machine/5160/mda/README.md
+++ b/devices/pc/machine/5160/mda/README.md
@@ -9,6 +9,5 @@ IBM PC XT with Monochrome (MDA) Display
 
 All our Monochrome (MDA) configurations of the IBM PC XT (Model 5160) are located here, including:
 
-* [IBM PC XT (64Kb, 10Mb Drive) with Monochrome Display and Soft Keyboard](/devices/pc/machine/5160/mda/64kb/softkbd/)
-* [IBM PC XT (256Kb, 10Mb Drive) with Monochrome Display](/devices/pc/machine/5160/mda/256kb/)
-* [IBM PC XT (256Kb, 10Mb Drive) with Monochrome Display and Debugger](/devices/pc/machine/5160/mda/256kb/debugger/)
+* [IBM PC XT (64Kb, 10Mb Drive) with Monochrome Display](/devices/pc/machine/5160/mda/64kb/softkbd/)
+* [IBM PC XT (256Kb, 10Mb Drive) with Monochrome Display](/devices/pc/machine/5160/mda/256kb/) ([Debugger](/devices/pc/machine/5160/mda/256kb/debugger/))
diff --git a/devices/pc/machine/README.md b/devices/pc/machine/README.md
index 17d954c8b..1d7946f9d 100644
--- a/devices/pc/machine/README.md
+++ b/devices/pc/machine/README.md
@@ -64,46 +64,35 @@ From there, you can load another disk image
 
 Our pre-built [Model 5150](/devices/pc/machine/5150/) machines include:
 
-* [IBM PC (64Kb) with Color Display](/devices/pc/machine/5150/cga/64kb/donkey/)
-* [IBM PC (64Kb) with Color Display and Debugger](/devices/pc/machine/5150/cga/64kb/donkey/debugger/)
+* [IBM PC (64Kb) with Color Display](/devices/pc/machine/5150/cga/64kb/donkey/) ([Debugger](/devices/pc/machine/5150/cga/64kb/donkey/debugger/))
 * [IBM PC (64Kb) with Color Display and Soft Keyboard](/devices/pc/machine/5150/cga/64kb/softkbd/)
 * [IBM PC (64Kb) with Dual Display](/devices/pc/machine/5150/dual/64kb/)
-* [IBM PC (64Kb) with Monochrome Display](/devices/pc/machine/5150/mda/64kb/)
-* [IBM PC (64Kb) with Monochrome Display and Debugger](/devices/pc/machine/5150/mda/64kb/debugger/)
-* [IBM PC (64Kb) with Monochrome Display and Soft Keyboard](/devices/pc/machine/5150/mda/64kb/softkbd/)
-* [IBM PC (384Kb) with Color Display and Soft Keyboard](/devices/pc/machine/5150/cga/384kb/softkbd/)
+* [IBM PC (64Kb) with Monochrome Display](/devices/pc/machine/5150/mda/64kb/) ([Debugger](/devices/pc/machine/5150/mda/64kb/debugger/))
+* [IBM PC (64Kb) with Monochrome Display and Soft Keyboard (Debugger)](/devices/pc/machine/5150/mda/64kb/softkbd/)
+* [IBM PC (384Kb) with Color Display and Soft Keyboard (Debugger)](/devices/pc/machine/5150/cga/384kb/softkbd/)
 
 ### Model 5160 Machine Configurations
 
 Our pre-built [Model 5160](/devices/pc/machine/5160/) machines include:
 
-* [IBM PC XT (64Kb, 10Mb Drive) with Monochrome Display and Soft Keyboard](/devices/pc/machine/5160/mda/64kb/softkbd/)
-* [IBM PC XT (256Kb, 10Mb Drive) with Monochrome Display](/devices/pc/machine/5160/mda/256kb/)
-* [IBM PC XT (256Kb, 10Mb Drive) with Color Display](/devices/pc/machine/5160/cga/256kb/demo/)
-* [IBM PC XT (256Kb, 10Mb Drive) with Color Display and Debugger](/devices/pc/machine/5160/cga/256kb/demo/debugger/)
-* [IBM PC XT (256Kb, 10Mb Drive) with Color Display and Soft Keyboard](/devices/pc/machine/5160/cga/256kb/softkbd/)
-* [IBM PC XT (256Kb, 10Mb Drive) with Color Display running Windows 1.01](/devices/pc/machine/5160/cga/256kb/win101/)
-* [IBM PC XT (256Kb, 10Mb Drive) with Color Display and Debugger running Windows 1.01](/devices/pc/machine/5160/cga/256kb/win101/debugger/)
-* [IBM PC XT (256Kb, 10Mb Drive) with Color Display and Soft Keyboard running Windows 1.01](/devices/pc/machine/5160/cga/256kb/win101/softkbd/)
-* [IBM PC XT (256Kb, 10Mb Drive) Machine Array with Color Displays](/devices/pc/machine/5160/cga/256kb/array/)
-* [IBM PC XT (256Kb, 10Mb Drive) with EGA Display and Debugger](/devices/pc/machine/5160/ega/256kb/debugger/)
-* [IBM PC XT (256Kb, 10Mb Drive) with Monochrome Display and Debugger](/devices/pc/machine/5160/mda/256kb/debugger/)
-* [IBM PC XT (512Kb, 10Mb Drive) with Color Display and Soft Keyboard running Windows 1.01](/devices/pc/machine/5160/cga/512kb/win101/softkbd/)
-* [IBM PC XT (640Kb, 10Mb Drive) with Color Display](/devices/pc/machine/5160/cga/640kb/)
-* [IBM PC XT (640Kb, 10Mb Drive) with Color Display and Debugger](/devices/pc/machine/5160/cga/640kb/debugger/)
-* [IBM PC XT (640Kb, 10Mb Drive) with Color Display running Multitasking MS-DOS 4.00](/devices/pc/machine/5160/cga/640kb/dos400m/)
-* [IBM PC XT (640Kb, 10Mb Drive) with EGA Display](/devices/pc/machine/5160/ega/640kb/)
-* [IBM PC XT (640Kb, 10Mb Drive) with EGA Display and Debugger](/devices/pc/machine/5160/ega/640kb/debugger/)
-* [IBM PC XT (640Kb, 10Mb Drive) with EGA Display running Windows 1.01](/devices/pc/machine/5160/ega/640kb/win101/)
-* [IBM PC XT (640Kb, 10Mb Drive) with EGA Display and Debugger running Windows 1.01](/devices/pc/machine/5160/ega/640kb/win101/debugger/)
+* [IBM PC XT (64Kb, 10Mb Drive) with Monochrome Display](/devices/pc/machine/5160/mda/64kb/softkbd/)
+* [IBM PC XT (256Kb, 10Mb Drive) with Monochrome Display](/devices/pc/machine/5160/mda/256kb/) ([Debugger](/devices/pc/machine/5160/mda/256kb/debugger/))
+* [IBM PC XT (256Kb, 10Mb Drive) with Color Display](/devices/pc/machine/5160/cga/256kb/demo/) ([Debugger](/devices/pc/machine/5160/cga/256kb/demo/debugger/))
+* [IBM PC XT (256Kb, 10Mb Drive) with Color Display and Soft Keyboard (Debugger)](/devices/pc/machine/5160/cga/256kb/softkbd/)
+* [IBM PC XT (256Kb, 10Mb Drive) with Color Display running Windows 1.01](/devices/pc/machine/5160/cga/256kb/win101/) ([Debugger](/devices/pc/machine/5160/cga/256kb/win101/debugger/))
+* [IBM PC XT (256Kb, 10Mb Drive) with Color Display and Soft Keyboard (Debugger)](/devices/pc/machine/5160/cga/256kb/win101/softkbd/)
+* [IBM PC XT (512Kb, 10Mb Drive) with Color Display and Soft Keyboard (Debugger)](/devices/pc/machine/5160/cga/512kb/win101/softkbd/)
+* [IBM PC XT (640Kb, 10Mb Drive) with Color Display](/devices/pc/machine/5160/cga/640kb/) ([Debugger](/devices/pc/machine/5160/cga/640kb/debugger/))
+* [IBM PC XT (640Kb, 10Mb Drive) with Color Display and Soft Keyboard (Debugger)](/devices/pc/machine/5160/cga/640kb/softkbd/)
+* [IBM PC XT (256Kb, 10Mb Drive) with EGA Display](/devices/pc/machine/5160/ega/256kb/) ([Debugger](/devices/pc/machine/5160/ega/256kb/debugger/))
+* [IBM PC XT (640Kb, 10Mb Drive) with EGA Display](/devices/pc/machine/5160/ega/640kb/) ([Debugger](/devices/pc/machine/5160/ega/640kb/debugger/))
+* [IBM PC XT (256Kb, 10Mb Drive) Machine Array with CGA Displays](/devices/pc/machine/5160/cga/256kb/array/)
 * [IBM PC XT (640Kb, 10Mb Drive) Machine Array with EGA Displays](/devices/pc/machine/5160/ega/640kb/array/)
 
 ### Model 5170 Machine Configurations
 
-* [IBM PC AT (6Mhz, 640Kb) with EGA Display and Debugger](/devices/pc/machine/5170/ega/640kb/rev1/debugger/)
-* [IBM PC AT (6Mhz, 1Mb, 20Mb Drive) with EGA Display and Debugger](/devices/pc/machine/5170/ega/1152kb/rev1/debugger/)
-* [IBM PC AT (8Mhz, 1Mb, 20Mb Drive) with EGA Display and Debugger](/devices/pc/machine/5170/ega/1152kb/rev3/debugger/)
-* [IBM PC AT (8Mhz, 2Mb, 20Mb Drive) with EGA Display](/devices/pc/machine/5170/ega/2048kb/rev3/)
-* [IBM PC AT (8Mhz, 2Mb, 20Mb Drive) with EGA Display and Debugger](/devices/pc/machine/5170/ega/2048kb/rev3/debugger/)
-* [IBM PC AT (8Mhz, 2Mb, 20Mb Drive) with VGA Display](/devices/pc/machine/5170/vga/2048kb/)
-* [IBM PC AT (8Mhz, 2Mb, 20Mb Drive) with VGA Display and Debugger](/devices/pc/machine/5170/vga/2048kb/debugger/)
+* [IBM PC AT (6Mhz, 640Kb) with EGA Display (Debugger)](/devices/pc/machine/5170/ega/640kb/rev1/debugger/)
+* [IBM PC AT (6Mhz, 1Mb, 20Mb Drive) with EGA Display (Debugger)](/devices/pc/machine/5170/ega/1152kb/rev1/debugger/)
+* [IBM PC AT (8Mhz, 1Mb, 20Mb Drive) with EGA Display (Debugger)](/devices/pc/machine/5170/ega/1152kb/rev3/debugger/)
+* [IBM PC AT (8Mhz, 2Mb, 20Mb Drive) with EGA Display](/devices/pc/machine/5170/ega/2048kb/rev3/) ([Debugger](/devices/pc/machine/5170/ega/2048kb/rev3/debugger/))
+* [IBM PC AT (8Mhz, 2Mb, 20Mb Drive) with VGA Display](/devices/pc/machine/5170/vga/2048kb/) ([Debugger](/devices/pc/machine/5170/vga/2048kb/debugger/))
diff --git a/disks/pc/dos/microsoft/4.0M/README.md b/disks/pc/dos/microsoft/4.0M/README.md
index 08beb7c9e..47ff6bf12 100644
--- a/disks/pc/dos/microsoft/4.0M/README.md
+++ b/disks/pc/dos/microsoft/4.0M/README.md
@@ -6,7 +6,16 @@ machines:
   - type: pc
     id: ibm5160
     debugger: true
-    config: /devices/pc/machine/5160/cga/640kb/dos400m/machine.xml
+    config: /devices/pc/machine/5160/cga/640kb/softkbd/machine.xml
+    autoMount:
+      A:
+        path: /disks/pc/dos/microsoft/4.0M/MSDOS400M-DISK1.json
+      B:
+        path: /disks/pc/dos/microsoft/4.0M/MSDOS400M-DISK2.json
+redirect_from:
+  - /devices/pc/machine/5160/cga/640kb/dos400m/
+  - /configs/pc/machines/5160/cga/640kb/dos400m/
+  - /videos/pcjs/
 ---
 
 Multitasking MS-DOS 4.00
diff --git a/disks/pc/fixed/10mb/PCDOS200-WIN101.json b/disks/pc/fixed/10mb/PCDOS200-WIN101-CGA.json
similarity index 100%
rename from disks/pc/fixed/10mb/PCDOS200-WIN101.json
rename to disks/pc/fixed/10mb/PCDOS200-WIN101-CGA.json
diff --git a/disks/pc/fixed/10mb/pcdos200-win101.xml b/disks/pc/fixed/10mb/pcdos200-win101-cga.xml
similarity index 67%
rename from disks/pc/fixed/10mb/pcdos200-win101.xml
rename to disks/pc/fixed/10mb/pcdos200-win101-cga.xml
index 38f8f4774..9811cd617 100644
--- a/disks/pc/fixed/10mb/pcdos200-win101.xml
+++ b/disks/pc/fixed/10mb/pcdos200-win101-cga.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<hdc id="hdcXT" drives='[{name:"10Mb Hard Disk",path:"/disks/pc/fixed/10mb/PCDOS200-WIN101.json",type:3}]'/>
+<hdc id="hdcXT" drives='[{name:"10Mb Hard Disk",path:"/disks/pc/fixed/10mb/PCDOS200-WIN101-CGA.json",type:3}]'/>
diff --git a/disks/pc/windows/1.01/README.md b/disks/pc/windows/1.01/README.md
index c8bb760e8..e3ed8a54b 100644
--- a/disks/pc/windows/1.01/README.md
+++ b/disks/pc/windows/1.01/README.md
@@ -5,16 +5,24 @@ permalink: /disks/pc/windows/1.01/
 machines:
   - type: pc
     id: ibm5160
-    config: /devices/pc/machine/5160/ega/640kb/win101/machine.xml
+    state: ibm5160-ega.json
+    config: /devices/pc/machine/5160/ega/640kb/machine.xml
+    drives: '[{name:"10Mb Hard Disk",type:3,path:"/disks/pc/fixed/10mb/PCDOS200-WIN101-EGA.json"}]'
+redirect_from:
+  - /configs/pc/machines/5160/ega/640kb/win101/
+  - /devices/pc/machine/5160/ega/640kb/win101/
+  - /devices/pc/machine/5160/ega/640kb/win101/debugger/
 ---
 
 Microsoft Windows 1.01
 ---
 
-Windows 1.01, the first public version of Windows, was released on November 20, 1985.
+Windows 1.01, the first public version of Windows, was released on November 20, 1985.  It is shown
+here running on an IBM PC XT (Model 5160) with an EGA.
 
-It is shown here running on an IBM PC XT (Model 5160) with an EGA.  Directory listings of the five 360Kb distribution
-diskettes are provided [below](#directory-listings). 
+You can also run [Windows 1.01 on a CGA](/devices/pc/machine/5160/cga/256kb/win101/).
+
+Directory listings of the five 360Kb distribution diskettes are provided [below](#directory-listings). 
 
 {% include machine.html id="ibm5160" %}
 
diff --git a/devices/pc/machine/5160/ega/640kb/win101/state.json b/disks/pc/windows/1.01/ibm5160-ega.json
similarity index 100%
rename from devices/pc/machine/5160/ega/640kb/win101/state.json
rename to disks/pc/windows/1.01/ibm5160-ega.json