diff --git a/devices/pcx86/machine/5150/cga/256kb/machine.xml b/devices/pcx86/machine/5150/cga/256kb/machine.xml
index aaad4f320..9d3d754b2 100644
--- a/devices/pcx86/machine/5150/cga/256kb/machine.xml
+++ b/devices/pcx86/machine/5150/cga/256kb/machine.xml
@@ -8,11 +8,11 @@
 	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pcx86/rom/5150/1981-04-24/PCBIOS-REV1.json"/>
 	<video ref="/devices/pcx86/video/ibm/cga/ibm-cga.xml"/>
 	<fdc ref="/disks/pcx86/compiled/library.xml"/>
-	<cpu id="cpu8088" model="8088" autostart="true" pos="left" padLeft="8px" padBottom="8px">
+	<keyboard ref="/devices/pcx86/keyboard/us83-buttons-minimal.xml"/>
+	<cpu id="cpu8088" model="8088" autoStart="true" pos="right" padRight="8px" padBottom="8px">
 		<control type="button" binding="run">Run</control>
 		<control type="button" binding="reset">Reset</control>
 		<control type="button" binding="setSpeed">Speed</control>
 	</cpu>
-	<keyboard ref="/devices/pcx86/keyboard/us83-buttons-minimal.xml"/>
 	<chipset id="chipset" model="5150" sw1="01001001" sw2="10011000"/>
 </machine>
diff --git a/devices/pcx86/machine/5160/ega/640kb/machine.xml b/devices/pcx86/machine/5160/ega/640kb/machine.xml
index e306715c5..a582022d3 100644
--- a/devices/pcx86/machine/5160/ega/640kb/machine.xml
+++ b/devices/pcx86/machine/5160/ega/640kb/machine.xml
@@ -9,7 +9,7 @@
 	<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/128kb-autolockfs.xml"/>
 	<fdc ref="/disks/pcx86/compiled/library.xml" autoMount='{A:{name:"PC-DOS 3.20 (Disk 1)",path:"/disks/pcx86/dos/ibm/3.20/PCDOS320-DISK1.json"}, B:{name:"PC-DOS 3.20 (Disk 2)",path:"/disks/pcx86/dos/ibm/3.20/PCDOS320-DISK2.json"}}'/>
-	<cpu id="cpu8088" model="8088" autostart="true" pos="right" padRight="8px">
+	<cpu id="cpu8088" model="8088" autoStart="true" pos="right" padRight="8px">
 		<control type="button" binding="run">Run</control>
 		<control type="button" binding="reset">Reset</control>
 		<control type="button" binding="setSpeed">Speed</control>
diff --git a/disks/pcx86/compiled/shareware/pcsig08/pcsig08.xml b/disks/pcx86/compiled/shareware/pcsig08/pcsig08.xml
index 5de1920cb..b37bfcbe1 100644
--- a/disks/pcx86/compiled/shareware/pcsig08/pcsig08.xml
+++ b/disks/pcx86/compiled/shareware/pcsig08/pcsig08.xml
@@ -1,22 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<fdc id="fdcNEC" autoMount='{A:{name:"PC-DOS 3.20 (Disk 1)",path:"/disks/pcx86/dos/ibm/3.20/PCDOS320-DISK1.json"}, B:{name:"PC-DOS 3.20 (Disk 2)",path:"/disks/pcx86/dos/ibm/3.20/PCDOS320-DISK2.json"}}' pos="left" padLeft="8px" padBottom="8px">
+<fdc id="fdcNEC" pos="left" padLeft="8px" padBottom="8px">
 	<control type="list" binding="listDrives"/>
 	<control type="list" binding="listDisks">
-		<disk path="/disks/pcx86/dos/ibm/1.00/PCDOS100.json">PC-DOS 1.00</disk>
-		<disk path="/disks/pcx86/dos/ibm/1.10/PCDOS110.json">PC-DOS 1.10</disk>
-		<disk path="/disks/pcx86/dos/ibm/2.00/PCDOS200-DISK1.json">PC-DOS 2.00 (Disk 1)</disk>
-		<disk path="/disks/pcx86/dos/ibm/2.00/PCDOS200-DISK2.json">PC-DOS 2.00 (Disk 2)</disk>
-		<disk path="/disks/pcx86/dos/ibm/2.10/PCDOS210-DISK1.json">PC-DOS 2.10 (Disk 1)</disk>
-		<disk path="/disks/pcx86/dos/ibm/2.10/PCDOS210-DISK2.json">PC-DOS 2.10 (Disk 2)</disk>
-		<disk path="/disks/pcx86/dos/ibm/3.00/PCDOS300-DISK1.json">PC-DOS 3.00 (Disk 1)</disk>
-		<disk path="/disks/pcx86/dos/ibm/3.00/PCDOS300-DISK2.json">PC-DOS 3.00 (Disk 2)</disk>
-		<disk path="/disks/pcx86/dos/ibm/3.10/PCDOS310-DISK1.json">PC-DOS 3.10 (Disk 1)</disk>
-		<disk path="/disks/pcx86/dos/ibm/3.10/PCDOS310-DISK2.json">PC-DOS 3.10 (Disk 2)</disk>
-		<disk path="/disks/pcx86/dos/ibm/3.20/PCDOS320-DISK1.json">PC-DOS 3.20 (Disk 1)</disk>
-		<disk path="/disks/pcx86/dos/ibm/3.20/PCDOS320-DISK2.json">PC-DOS 3.20 (Disk 2)</disk>
-		<disk path="/disks/pcx86/dos/ibm/3.30/PCDOS330-DISK1.json">PC-DOS 3.30 (Disk 1)</disk>
-		<disk path="/disks/pcx86/dos/ibm/3.30/PCDOS330-DISK2.json">PC-DOS 3.30 (Disk 2)</disk>
-		<disk path="/disks/pcx86/dos/ibm/3.30/PCDOS330-DISK1-720K.json">PC-DOS 3.30 (720K)</disk>
+		<disk path="/disks/pcx86/dos/microsoft/3.20/MSDOS320-DISK1.json">MS-DOS 3.20 (Disk 1)</disk>
+		<disk path="/disks/pcx86/dos/microsoft/3.20/MSDOS320-DISK2.json">MS-DOS 3.20 (Disk 2)</disk>
+		<disk path="/disks/pcx86/dos/microsoft/3.20/MSDOS320-DISK3-PROGREF1.json">MS-DOS 3.20 (ProgRef 1)</disk>
+		<disk path="/disks/pcx86/dos/microsoft/3.20/MSDOS320-DISK4-PROGREF2.json">MS-DOS 3.20 (ProgRef 2)</disk>
 		<disk path="http://archive.pcjs.org/disks/pcx86/shareware/pcsig08/disks/DISK0001.json">PCSIG08: DISK0001</disk>
 		<disk path="http://archive.pcjs.org/disks/pcx86/shareware/pcsig08/disks/DISK0002.json">PCSIG08: DISK0002</disk>
 		<disk path="http://archive.pcjs.org/disks/pcx86/shareware/pcsig08/disks/DISK0003.json">PCSIG08: DISK0003</disk>
diff --git a/disks/pcx86/shareware/pcmag/README.md b/disks/pcx86/shareware/pcmag/README.md
index 1d4c89c54..edcbdc7ea 100644
--- a/disks/pcx86/shareware/pcmag/README.md
+++ b/disks/pcx86/shareware/pcmag/README.md
@@ -3,11 +3,11 @@ layout: page
 title: PC Magazine Disks
 permalink: /disks/pcx86/shareware/pcmag/
 machines:
-  - id: ibm5160-pcmag
+  - id: pcmag
     type: pcx86
-    resume: 1
     config: /devices/pcx86/machine/5160/ega/640kb/machine.xml
     drives: '[{name:"10Mb Hard Disk",type:3,path:"/disks/pcx86/fixed/10mb/MSDOS320-C400.json"}]'
+    resume: 1
     autoMount:
       A:
         name: None
@@ -28,7 +28,7 @@ with that diskette loaded in drive B.  The machine below is also available [with
 Looking at the volume numbers alone, you can tell that this collection is woefully incomplete, but perhaps more
 will surface over time.  [Let us know](mailto:Jeff@pcjs.org) if you find more.  Thanks.
 
-{% include machine.html id="ibm5160-pcmag" %}
+{% include machine.html id="pcmag" %}
 
 ### Directory of [PC Magazine (Vol. 06 No. 08)](/devices/pcx86/machine/5160/ega/640kb/?autoMount=%7B"B":%7B"name":"PC Magazine %28Vol. 06 No. 08%29"%7D%7D)
 
diff --git a/disks/pcx86/shareware/pcmag/debugger/README.md b/disks/pcx86/shareware/pcmag/debugger/README.md
index 0eb10f032..c8564ec47 100644
--- a/disks/pcx86/shareware/pcmag/debugger/README.md
+++ b/disks/pcx86/shareware/pcmag/debugger/README.md
@@ -3,19 +3,19 @@ layout: page
 title: PC Magazine Disks (with Debugger)
 permalink: /disks/pcx86/shareware/pcmag/debugger/
 machines:
-  - id: ibm5160-pcmag
+  - id: pcmag
     type: pcx86
     config: /devices/pcx86/machine/5160/ega/640kb/debugger/machine.xml
     drives: '[{name:"10Mb Hard Disk",type:3,path:"/disks/pcx86/fixed/10mb/MSDOS320-C400.json"}]'
+    autoStart: true
     autoMount:
       A:
         name: None
       B:
         name: PC Magazine (Vol. 06 No. 08)
-    autoStart: true
 ---
 
 PC Magazine Disks (with Debugger)
 ---------------------------------
 
-{% include machine.html id="ibm5160-pcmag" %}
+{% include machine.html id="pcmag" %}
diff --git a/disks/pcx86/shareware/pcsig08/README.md b/disks/pcx86/shareware/pcsig08/README.md
index 4d4b3c1ad..6deb8cce9 100644
--- a/disks/pcx86/shareware/pcsig08/README.md
+++ b/disks/pcx86/shareware/pcsig08/README.md
@@ -3,11 +3,9 @@ layout: page
 title: PC-SIG Library 8th Edition CD-ROM (April 1990)
 permalink: /disks/pcx86/shareware/pcsig08/
 machines:
-  - id: ibm5150-pcsig08
+  - id: pcsig08
     type: pcx86
     resume: 1
-    config: /disks/pcx86/shareware/pcsig08/machine.xml
-    autoType: $date\r$time\r
 ---
 
 PC-SIG Library 8th Edition CD-ROM (April 1990)
@@ -18,7 +16,7 @@ The directory listings were generated from the folder's [manifest](manifest.xml)
 [disklist](/modules/diskdump/bin/disklist), a custom PCjs JavaScript utility.  The same machine is also available
 [with the PCjs Debugger](debugger/).
 
-{% include machine.html id="ibm5150-pcsig08" %}
+{% include machine.html id="pcsig08" %}
 
 ### Directory of PCSIG08: DISK0001
 
diff --git a/disks/pcx86/shareware/pcsig08/debugger/README.md b/disks/pcx86/shareware/pcsig08/debugger/README.md
index 0c5ffb7b2..5524378e7 100644
--- a/disks/pcx86/shareware/pcsig08/debugger/README.md
+++ b/disks/pcx86/shareware/pcsig08/debugger/README.md
@@ -3,10 +3,10 @@ layout: page
 title: PC-SIG Library 8th Edition CD-ROM (April 1990) (with Debugger)
 permalink: /disks/pcx86/shareware/pcsig08/debugger/
 machines:
-  - id: ibm5150-pcsig08
+  - id: pcsig08
     type: pcx86
-    config: /disks/pcx86/shareware/pcsig08/debugger/machine.xml
-    autoType: $date\r$time\r
+    debugger: true
+    autoStart: true
 ---
 
 PC-SIG Library 8th Edition CD-ROM (with Debugger)
@@ -15,4 +15,4 @@ PC-SIG Library 8th Edition CD-ROM (with Debugger)
 The machine below has access to all 2,121 diskette images from the PC-SIG Library 8th Edition CD-ROM (April 1990).
 The same machine is also available [without the PCjs Debugger](../).
 
-{% include machine.html id="ibm5150-pcsig08" %}
+{% include machine.html id="pcsig08" %}
diff --git a/disks/pcx86/shareware/pcsig08/debugger/machine.xml b/disks/pcx86/shareware/pcsig08/debugger/machine.xml
index 6064694ea..355a1d90c 100644
--- a/disks/pcx86/shareware/pcsig08/debugger/machine.xml
+++ b/disks/pcx86/shareware/pcsig08/debugger/machine.xml
@@ -1,21 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="/versions/pcx86/1.35.2/machine.xsl"?>
-<machine id="ibm5150" type="pcx86" border="1" pos="center" background="default">
-	<name pos="center">IBM PC (Model 5150), CGA, 256K</name>
-	<computer id="pc-cga-256k" name="IBM PC"/>
-	<cpu id="cpu8088" model="8088" autoStart="true"/>
-	<ram id="ramLow" addr="0x00000" test="false" comment="no memory test"/>
-	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pcx86/rom/5150/basic/BASIC100.json"/>
-	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pcx86/rom/5150/1981-04-24/PCBIOS-REV1.json"/>
-	<video ref="/devices/pcx86/video/ibm/cga/ibm-cga.xml"/>
+<machine id="ibm5160" type="pcx86" border="1" pos="center" background="default">
+	<name pos="center">IBM PC XT, 128K EGA, 640K RAM, 10Mb Hard Disk (Formatted)</name>
+	<computer id="xt-ega-640k" name="IBM PC XT"/>
+	<cpu id="cpu8088" model="8088"/>
+	<ram id="ramLow" addr="0x00000" test="false" size="0xa0000" comment="0xa0000 (640Kb) size overrides SW1|ROM BIOS memory test has been disabled"/>
+	<rom id="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/128kb-autolockfs.xml"/>
 	<fdc ref="/disks/pcx86/compiled/shareware/pcsig08/pcsig08.xml"/>
-	<keyboard ref="/devices/pcx86/keyboard/us83-buttons-minimal.xml"/>
+	<keyboard ref="/devices/pcx86/keyboard/us83-buttons-functions.xml"/>
 	<debugger id="debugger"/>
 	<panel ref="/devices/pcx86/panel/wide.xml"/>
-	<chipset id="chipset" model="5150" sw1="01001001" sw2="10011000" pos="left" padLeft="8px" padBottom="8px">
+	<chipset id="chipset" model="5160" sw1="01001101" pos="left" padLeft="8px" padBottom="8px">
 		<control type="switches" label="SW1" binding="sw1" left="0px"/>
-		<control type="switches" label="SW2" binding="sw2" left="0px"/>
 		<control type="description" binding="swdesc" left="0px"/>
 	</chipset>
-	<serial id="com1" adapter="1" binding="print" tabsize="8"/>
+	<hdc ref="/disks/pcx86/fixed/10mb/msdos320-c400.xml"/>
+	<serial id="com1" adapter="1" binding="print"/>
+	<serial id="com2" adapter="2"/>
+	<mouse serial="com2"/>
 </machine>
diff --git a/disks/pcx86/shareware/pcsig08/machine.xml b/disks/pcx86/shareware/pcsig08/machine.xml
index e8576c1ee..d56ef3335 100644
--- a/disks/pcx86/shareware/pcsig08/machine.xml
+++ b/disks/pcx86/shareware/pcsig08/machine.xml
@@ -1,18 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="/versions/pcx86/1.35.2/machine.xsl"?>
-<machine id="ibm5150" type="pcx86" border="1" pos="center" background="default">
-	<name pos="center">IBM PC (Model 5150), CGA, 256K</name>
-	<computer id="pc-cga-256k" name="IBM PC"/>
-	<ram id="ramLow" addr="0x00000" test="false" comment="no memory test"/>
-	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pcx86/rom/5150/basic/BASIC100.json"/>
-	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pcx86/rom/5150/1981-04-24/PCBIOS-REV1.json"/>
-	<video ref="/devices/pcx86/video/ibm/cga/ibm-cga.xml"/>
+<machine id="ibm5160" type="pcx86" border="1" pos="center" background="default">
+	<name pos="center">IBM PC XT, 128K EGA, 640K RAM, 10Mb Hard Disk (Formatted)</name>
+	<computer id="xt-ega-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"/>
+	<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/128kb-autolockfs.xml"/>
 	<fdc ref="/disks/pcx86/compiled/shareware/pcsig08/pcsig08.xml"/>
-	<keyboard ref="/devices/pcx86/keyboard/us83-buttons-minimal.xml"/>
-	<cpu id="cpu8088" model="8088" autostart="true" pos="right" padRight="8px" padBottom="8px">
+	<cpu id="cpu8088" model="8088" autoStart="true" pos="right" padRight="8px">
 		<control type="button" binding="run">Run</control>
 		<control type="button" binding="reset">Reset</control>
 		<control type="button" binding="setSpeed">Speed</control>
 	</cpu>
-	<chipset id="chipset" model="5150" sw1="01001001" sw2="10011000"/>
+	<keyboard ref="/devices/pcx86/keyboard/us83-buttons-functions.xml"/>
+	<chipset id="chipset" model="5160" sw1="01001101"/>
+	<hdc ref="/disks/pcx86/fixed/10mb/msdos320-c400.xml"/>
+	<serial id="com1" adapter="1"/>
+	<serial id="com2" adapter="2"/>
+	<mouse serial="com2"/>
 </machine>
diff --git a/disks/pcx86/shareware/pcsig08/pcsig08.xml b/disks/pcx86/shareware/pcsig08/pcsig08.xml
index 25a71e9cc..b679493e7 100644
--- a/disks/pcx86/shareware/pcsig08/pcsig08.xml
+++ b/disks/pcx86/shareware/pcsig08/pcsig08.xml
@@ -1,15 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<fdc id="fdcNEC" autoMount='{A:{name:"PC-DOS 3.20 (Disk 1)",path:"/disks/pcx86/dos/ibm/3.20/PCDOS320-DISK1.json"}, B:{name:"PC-DOS 3.20 (Disk 2)",path:"/disks/pcx86/dos/ibm/3.20/PCDOS320-DISK2.json"}}' pos="left" padLeft="8px" padBottom="8px">
+<fdc id="fdcNEC" pos="left" padLeft="8px" padBottom="8px">
 	<control type="list" binding="listDrives"/>
 	<control type="list" binding="listDisks">
-		<manifest ref="/disks/pcx86/dos/ibm/1.00/manifest.xml"/>
-		<manifest ref="/disks/pcx86/dos/ibm/1.10/manifest.xml"/>
-		<manifest ref="/disks/pcx86/dos/ibm/2.00/manifest.xml"/>
-		<manifest ref="/disks/pcx86/dos/ibm/2.10/manifest.xml"/>
-		<manifest ref="/disks/pcx86/dos/ibm/3.00/manifest.xml"/>
-		<manifest ref="/disks/pcx86/dos/ibm/3.10/manifest.xml"/>
-		<manifest ref="/disks/pcx86/dos/ibm/3.20/manifest.xml"/>
-		<manifest ref="/disks/pcx86/dos/ibm/3.30/manifest.xml"/>
+		<manifest ref="/disks/pcx86/dos/microsoft/3.20/manifest.xml"/>
 		<manifest ref="/disks/pcx86/shareware/pcsig08/manifest.xml"/>
 	</control>
 	<control type="button" binding="loadDisk">Load</control>