Merge branch 'next-release'

Gruntfile.js

@@ -312,7 +312,7 @@ module.exports = function(grunt) {
             "c1pxsl": {
                 files: [
                     {
-                        cwd: "./modules/shared/templates/",
+                        cwd: "modules/shared/templates/",
                         src: ["common.css", "common.xsl", "document.css", "document.xsl", "machine.xsl", "manifest.xsl", "outline.xsl"],
                         dest: "versions/c1pjs/<%= pkg.version %>/",
                         expand: true
@@ -330,7 +330,7 @@ module.exports = function(grunt) {
             "pcxsl": {
                 files: [
                     {
-                        cwd: "./modules/shared/templates/",
+                        cwd: "modules/shared/templates/",
                         src: ["common.css", "common.xsl", "document.css", "document.xsl", "machine.xsl", "manifest.xsl", "outline.xsl"],
                         dest: "versions/pcjs/<%= pkg.version %>/",
                         expand: true
@@ -348,7 +348,7 @@ module.exports = function(grunt) {
             "c1pjs": {
                 files: [
                     {
-                        cwd: "./modules/c1pjs/templates/",
+                        cwd: "modules/c1pjs/templates/",
                         src: ["components.*"],
                         dest: "versions/c1pjs/<%= pkg.version %>/",
                         expand: true
@@ -365,7 +365,7 @@ module.exports = function(grunt) {
             "pcjs": {
                 files: [
                     {
-                        cwd: "./modules/pcjs/templates/",
+                        cwd: "modules/pcjs/templates/",
                         src: ["components.*"],
                         dest: "versions/pcjs/<%= pkg.version %>/",
                         expand: true
@@ -393,6 +393,62 @@ module.exports = function(grunt) {
                         return content.replace(/\/versions\/\{\$APPCLASS}\/\{\$APPVERSION}\//g, "");
                     }
                 }
+            },
+            "manifests": {
+                files: [
+                    {
+                        cwd: "disks/pc/",
+                        src: ["library.xml", "samples.xml"],
+                        dest: "disks/pc/compiled/",
+                        expand: true
+                    }
+                ],
+                options: {
+                    process: function(content, srcPath) {
+                        /*
+                         * This function mimics what components.xsl normally does for disk manifests referenced
+                         * by the FDC machine component.  Compare it to the following template in components.xsl:
+                         * 
+                         *      <xsl:template match="manifest[not(@ref)]" mode="component">
+                         * 
+                         * This code is not perfect (it doesn't process "link" attributes, for example, which is why
+                         * we've left machines that use the samples.xml disk library alone), but for machines that use
+                         * library.xml, having them use compiled/library.xml instead speeds up loading significantly.
+                         * 
+                         * Granted, after the first machine has fetched all the individual manifest files, your
+                         * browser should do a reasonably good job using cached copies for all subsequent machines,
+                         * but even then, there's still a noticeable delay.
+                         */
+                        var contentOrig = content;
+                        var reManifest = /([ \t]*)<manifest.*? ref="(.*?)".*?\/>/g, matchManifest;
+                        while ((matchManifest = reManifest.exec(contentOrig))) {
+                            var sManifest = grunt.file.read(path.join('.', matchManifest[2]));
+                            if (!sManifest) continue;
+                            var sDefaultName = "", match;
+                            match = sManifest.match(/<title.*?>(.*?)<\/title>/);
+                            if (match) {
+                                sDefaultName = match[1];
+                                match = sManifest.match(/<version.*?>(.*?)<\/version>/);
+                                if (match) sDefaultName += ' ' + match[1];
+                            }
+                            var reDisk, matchDisk, sDisks = "";
+                            reDisk = /<disk.*? href="([^"]*)".*?\/>/g;
+                            while ((matchDisk = reDisk.exec(sManifest))) {
+                                if (sDisks) sDisks += "\n";
+                                sDisks += matchManifest[1] + "<disk path=\"" + matchDisk[1] + "\">" + sDefaultName + "</disk>";
+                            }
+                            reDisk = /<disk.*? href="([^"]*)".*?>([\S\s]*?)<\/disk>/g;
+                            while ((matchDisk = reDisk.exec(sManifest))) {
+                                if (sDisks) sDisks += "\n";
+                                var matchName = matchDisk[2].match(/<name.*?>(.*?)<\/name>/);
+                                var sName = matchName && matchName[1] || sDefaultName;
+                                sDisks += matchManifest[1] + "<disk path=\"" + matchDisk[1] + "\">" + sName + "</disk>";
+                            }
+                            content = content.replace(matchManifest[0], sDisks);
+                        }
+                        return content;
+                    }
+                }
             }
         },
         run: {

_config.yml

@@ -17,7 +17,7 @@ right_brace: "}"
 
 # Build settings
 
-exclude: ["index.html", "**/index.html", "logs", "node_modules", "**/c64", "src", "**/src", "**/static", "tmp", "videos", "web", ".git", ".idea"]
+exclude: ["index.html", "**/index.html", "logs", "node_modules", "**/c64", "**/private", "src", "**/src", "**/static", "tmp", "videos", "web", ".git", ".idea"]
 markdown: kramdown
 kramdown:
   input: GFM
@@ -31,7 +31,7 @@ gems:
 
 pcjs:
   domain: pcjs.org    # whereas site.url is used for linking purposes, site.pcjs.domain is used for display purposes
-  version: 1.20.7     # IMPORTANT: keep pcjs.version in sync with package.json:version
+  version: 1.20.8     # IMPORTANT: keep pcjs.version in sync with package.json:version
   compiled: true      # by default, the compiled pcjs.version scripts will be used (eg, pc.js or pc-dbg.js)
   pc_scripts:         # if pcjs.compiled is false, the following scripts will be included instead, in the order listed
     - /modules/shared/lib/defines.js
@@ -69,6 +69,7 @@ pcjs:
     - /modules/pcjs/lib/ram.js
     - /modules/pcjs/lib/keyboard.js
     - /modules/pcjs/lib/video.js
+    - /modules/pcjs/lib/parallelport.js
     - /modules/pcjs/lib/serialport.js
     - /modules/pcjs/lib/mouse.js
     - /modules/pcjs/lib/disk.js

_developer.yml

@@ -0,0 +1,4 @@
+developer: true
+
+pcjs:
+  compiled: false

_includes/machine-engines.html

@@ -10,7 +10,7 @@
   {% else %}
     {% assign machine_template = machine.template %}
   {% endunless %}
-  {% capture machine_parms %}{{ site.left_brace }}state:"{{ machine.state }}",autoMount:{{ machine.automount|jsonify }}{{ site.right_brace }}{% endcapture %}
+  {% capture machine_parms %}{{ site.left_brace }}state:"{{ machine.state }}",autoMount:{{ machine.automount|jsonify }},messages:"{{ machine.messages }}"{{ site.right_brace }}{% endcapture %}
   {% if site.pcjs.compiled == true and machine.uncompiled != true %}
     {% capture machine_script %}<script type="text/javascript" src="{{ site.baseurl }}/versions/{{ machine.type | remove:'-dbg' }}js/{{ site.pcjs.version }}/{{ machine.type }}.js"></script>{% endcapture %}
     {% unless machine_scripts contains machine_script %}

_posts/2014-09-30-pcjs-coding-conventions.md

@@ -51,34 +51,42 @@ can be thought of as "class constants".
 For example, the ChipSet component, which manages (among other things) Programmable Interrupt Controllers or PICs,
 *could* define the constant for an EOI command like this:
 
-	ChipSet.EOI = 0x20;                     // non-specific EOI (end-of-interrupt)
+``` javascript
+ChipSet.EOI = 0x20;                     // non-specific EOI (end-of-interrupt)
+```
 
 but since the EOI command is actually one of a number Operation Command Words (specifically, OCW2), I include an
 "OCW2_" prefix in the constant name:
 
-	ChipSet.OCW2_EOI = 0x20;                // non-specific EOI (end-of-interrupt)
+``` javascript
+ChipSet.OCW2_EOI = 0x20;                // non-specific EOI (end-of-interrupt)
+```
 
 and since I also like to group constants that are associated with a particular register or port, and since I don't
 want the ChipSet constructor becoming littered with property constants, I first define a constant object; in this
 case, **PIC_LO**:
 
-	ChipSet.PIC_LO = {};
+``` javascript
-	ChipSet.PIC_LO.OCW2_EOI = 0x20;         // non-specific EOI (end-of-interrupt)
+ChipSet.PIC_LO = {};
-	ChipSet.PIC_LO.OCW2_EOI_SPEC = 0x60;    // specific EOI
+ChipSet.PIC_LO.OCW2_EOI = 0x20;         // non-specific EOI (end-of-interrupt)
-	ChipSet.PIC_LO.OCW2_EOI_ROT = 0xA0;     // rotate on non-specific EOI
+ChipSet.PIC_LO.OCW2_EOI_SPEC = 0x60;    // specific EOI
-	ChipSet.PIC_LO.OCW2_EOI_ROTSPEC = 0xE0; // rotate on specific EOI
+ChipSet.PIC_LO.OCW2_EOI_ROT = 0xA0;     // rotate on non-specific EOI
+ChipSet.PIC_LO.OCW2_EOI_ROTSPEC = 0xE0; // rotate on specific EOI
+```
 
 By using fully-qualified property names for each constant, the code has a more C-like appearance (think *#define*)
 that's also easier to preprocess.
 
 However, I've gradually switched to the more conventional JavaScript object notation for class constants:
  
-	ChipSet.PIC_LO = {
+``` javascript
-		OCW2_EOI:           0x20,           // non-specific EOI (end-of-interrupt)
+ChipSet.PIC_LO = {
-		OCW2_EOI_SPEC:      0x60,           // specific EOI
+	OCW2_EOI:           0x20,           // non-specific EOI (end-of-interrupt)
-		OCW2_EOI_ROT:       0xA0,           // rotate on non-specific EOI
+	OCW2_EOI_SPEC:      0x60,           // specific EOI
-		OCW2_EOI_ROTSPEC:   0xE0            // rotate on specific EOI
+	OCW2_EOI_ROT:       0xA0,           // rotate on non-specific EOI
-	};
+	OCW2_EOI_ROTSPEC:   0xE0            // rotate on specific EOI
+};
+```
 
 because, again, the Closure Compiler does an excellent job inlining such constants (or indeed any property that is
 never modified *or* enumerated).
@@ -94,17 +102,23 @@ override it, setting it to **FALSE** and disabling debug-only code.
 
 To ensure that debug-only code is not simply *disabled* but also *removed*, the code should be wrapped with:
 
-	if (DEBUG) {
+``` javascript
-		[code to be removed by the Closure Compiler]
+if (DEBUG) {
-	}
+	[code to be removed by the Closure Compiler]
+}
+```
 
 In many cases, the compiler is able to completely remove calls to debug-only class methods; eg:
 
-	Component.assert(off >= 0 && off < this.cb);
+``` javascript
+Component.assert(off >= 0 && off < this.cb);
+```
 
 However, calls to debug-only instance methods seem to be more problematic, so all such calls are wrapped; eg:
 
-	if (DEBUG) this.log('load("' + sFileURL + '")');
+``` javascript
+if (DEBUG) this.log('load("' + sFileURL + '")');
+```
 
 There are a number of other important shared constants in [/modules/shared/lib/defines.js](/modules/shared/lib/defines.js)
 and PCjs-specific constants in [/modules/pcjs/lib/defines.js](/modules/pcjs/lib/defines.js); refer
@@ -163,11 +177,15 @@ objects, but I'll leave my gripes about JSON for another post.
 
 Generally speaking, the only time I quote property names is when I have to.  I'll use the "dot" syntax; eg:
 
-	obj.prop = true;
+``` javascript
+obj.prop = true;
+```
 
 instead of:
 
-	obj['prop'] = true;
+``` javascript
+obj['prop'] = true;
+```
 
 unless the property name doesn't conform to variable name syntax (eg, if it starts with a digit) or if it's a
 "public" property and therefore I can't risk Google's Closure Compiler "minifying" the property name to something

_posts/2015-03-26-javascript-idiosyncrasies.md

@@ -1,9 +1,9 @@
 ---
 layout: post
 title: JavaScript Idiosyncrasies
-date: 2015-03-16 11:00:00
+date: 2015-03-26 11:00:00
 category: JavaScript
-permalink: /blog/2015/03/16/
+permalink: /blog/2015/03/26/
 ---
 
 Time to mention a few JavaScript idiosyncrasies, and how I deal with them.
@@ -35,36 +35,50 @@ Another exception is optional parameters.  When I write a method with optional p
 parameters to either be omitted (ie, *undefined*) or set to *null*.  Using "==", you can check for either value with
 a single comparison:
 
-	if (parameter == null) { ... }
+``` javascript
+if (parameter == null) { ... }
+```
 
 whereas strict equality requires more work:
  
-	if (parameter === undefined || parameter === null) { ... }
+``` javascript
+if (parameter === undefined || parameter === null) { ... }
+```
 
 This is one of those times when coercion (of *undefined* to *null*), and the use of "non-strict" operators, is beneficial.
 Here's another:
 
-	if (!b) { ... }
+``` javascript
+if (!b) { ... }
+```
 
 Coercing a value to *boolean* is a popular way of checking for all "falsy" values (ie, *undefined*, *null*,
 0, false, "", NaN, etc).  It is shorthand for:
 
-	if (b == false) { ... }
+``` javascript
+if (b == false) { ... }
+```
 
 yet I suspect the proponents of strict equality would embrace the former while rejecting the latter.
 
 However, I don't recommend "falsy" checks for optional parameters:
 
-	if (!parameter) { ... }
+``` javascript
+if (!parameter) { ... }
+```
 
 because often a valid numeric parameter might include 0, or a valid string parameter might include "", so it's better
 to do this:
 
-	if (parameter == null) { ... }
+``` javascript
+if (parameter == null) { ... }
+```
 
 and obviously if *null* is also a acceptable value, then you should definitely use strict equality:
 	
-	if (parameter === undefined) { ... }
+``` javascript
+if (parameter === undefined) { ... }
+```
 
 Problems with type coercion are **NOT** problems caused by a poor choice of operators, so trying to make
 those problems go away by artificially limiting your choice of operators seems like the wrong solution.
@@ -78,18 +92,20 @@ Explicitly convert variables to a single type whenever possible.  For example, I
 that accepts an optional numeric parameter, with a documented default value when it's omitted.  I think it's
 important make that parameter unambiguously numeric as soon as possible; eg:
 
-	/**
+``` javascript
-	 * foo(n)
+/**
-	 *
+ * foo(n)
-	 * Performs a mathematical operation on n and returns a result.
+ *
-	 *
+ * Performs a mathematical operation on n and returns a result.
-	 * @param {number} [n] is an optional parameter (defaults to zero if omitted)
+ *
-	 * @return {number}
+ * @param {number} [n] is an optional parameter (defaults to zero if omitted)
-	 */
+ * @return {number}
-	function foo(n) {
+ */
-		n = n || 0;
+function foo(n) {
-		...
+    n = n || 0;
-	}
+    ...
+}
+```
 
 The expression `n || 0` might seem pointless, because *undefined* and *zero* are equivalent in a "falsy" sense, but
 *undefined* is not a number, and there will be fewer problems downstream if you ensure that n is *always* a number.
@@ -98,8 +114,10 @@ The expression `n || 0` might seem pointless, because *undefined* and *zero* are
 
 When using *for*...*in* loops like this:
 
-	var a = [100, 200, 300];
+``` javascript
-	for (var i in a) { ... }
+var a = [100, 200, 300];
+for (var i in a) { ... }
+```
 	
 the type of variable *i* will be **string** rather than **number**; that is, it will contain "0", "1", and "2" rather
 than 0, 1, and 2.  If you then use *i* to set a matching element in another array, that element will not be stored in
@@ -107,27 +125,35 @@ the same (numeric) position as the original array.
 
 One solution is to convert *i* to a **number**:
 
-	parseInt(i, 10);
+``` javascript
+parseInt(i, 10);
+```
 
 However, a more elegant solution is to use the unary "+" operator to coerce the **string** to a **number**:
 
-	+i;
+``` javascript
++i;
+```
 
 The same problem arises with objects using numeric properties.  And watch out for JavaScript's automatic base
 conversion of numeric properties.  For example, when you enumerate the properties of object "o":
 
-	var o = {
+``` javascript
-		0x20: ' ',
+var o = {
-		0x41: 'A'
+    0x20: ' ',
-	};
+    0x41: 'A'
+};
+```
 
 you will get the strings "32" and "65", not "0x20" and "0x41".  You must quote your property names to prevent
 any conversion; eg:
 
-	var o = {
+``` javascript
-		"0x20": ' ',
+var o = {
-		"0x41": 'A'
+    "0x20": ' ',
-	};
+    "0x41": 'A'
+};
+```
 
 Numeric properties can always be safely converted using the unary "+" operator, regardless whether they were quoted
 or not.
@@ -141,8 +167,10 @@ whereas unary "+" conversion will return *NaN* if there are any invalid digits i
 It turns out that shifting an integer value by more than 31 bits in either direction may not shift as many bits as
 you'd expect.  For example:
 
-	n = 0x10000000;
+``` javascript
-	n >>>= 33;
+n = 0x10000000;
+n >>>= 33;
+```
 
 will shift n by only *one* bit, not 33 bits, and the result will be 0x08000000, not zero.  This is because,
 just like the shift instructions on 32-bit Intel processors, JavaScript converts the shift count to a *mod 32* value
@@ -150,17 +178,23 @@ just like the shift instructions on 32-bit Intel processors, JavaScript converts
 
 So the above example is equivalent to:
 
-	n >>>= 1;
+``` javascript
+n >>>= 1;
+```
 
 If you really need larger shift counts to work in a consistent manner, you can perform multiple shifts, where each
 shift count is in the range 0-31.  Here's one way to shift a number 33 bits:
 
-	n = (n >>> 31) >>> 2;
+``` javascript
+n = (n >>> 31) >>> 2;
+```
 
 Also, it's not quite correct to say that a shift count of zero has *no* effect on a number:
 
-	n = 0x88888888|0;       // n is displayed as -2004318072
+``` javascript
-	n >>>= 0;               // n is displayed as 2290649224
+n = 0x88888888|0;       // n is displayed as -2004318072
+n >>>= 0;               // n is displayed as 2290649224
+```
 
 It's true that the bottom 32 bits of the number were not changed, but a side-effect of the unsigned shift operator
 is that all the upper sign bits are stripped from the (64-bit) result.
@@ -168,7 +202,9 @@ is that all the upper sign bits are stripped from the (64-bit) result.
 Similarly, as soon as you perform any other bitwise operation on the number, even one that does not modify the low
 32 bits, the upper bits will revert to the sign of the lower 32-bit value:
 
-	n |= 0;                 // n is displayed as -2004318072 again
+``` javascript
+n |= 0;                 // n is displayed as -2004318072 again
+```
 
 *[@jeffpar](http://twitter.com/jeffpar)*  
 *March 26, 2015*

_posts/2016-02-08-super-bowl-winner-pcjs.md

@@ -0,0 +1,61 @@
+---
+layout: post
+title: "Super Bowl Winner: PCjs"
+date: 2016-02-08 14:00:00
+permalink: /blog/2016/02/08/
+---
+
+The new release of PCjs (v1.20.8) is a fairly minor update, but it's an important one for **FOOTBALL** fans, resolving
+two annoying problems with the [OS/2 FOOTBALL Boot Disk](/disks/pc/os2/misc/football/87058/): mysterious hard-error popups
+and blank screens.
+
+A hard-error popup would occur when FOOTBALL tried to initialize a non-existent PRN device.  To resolve that, PCjs
+now provides basic parallel port emulation, in the form of a [ParallelPort](/docs/pcjs/parallel/) component that you
+include in a machine XML file with the <parallel> element, in much the same way you include the
+[SerialPort](/docs/pcjs/serial/) component with the <serial> element.  The Compaq DeskPro 386
+[Test Machine](/devices/pc/machine/compaq/deskpro386/ega/4096kb/) used to run FOOTBALL has now been updated to include
+one parallel port.
+
+The other problem was that switching between sessions with the **SysReq** key would often result in a blank screen;
+the new session was active, but you couldn't see it.  This was a side-effect of how FOOTBALL reprograms the video
+controller when switching screens *and* the linear page mappings it creates to access video memory, which in turn
+exposed a PCjs memory-management bug.  The upshot is that whenever the Video component moves the address of the video
+buffer (which is *physical* memory), it must tell the CPU to flush any linear-to-physical mappings that may still refer
+to the old physical memory.
+
+With these changes, the [OS/2 FOOTBALL Boot Disk](/disks/pc/os2/misc/football/87058/) appears to be quite usable now.
+Feel free to give it a few kicks!
+
+---
+
+I've also tidied up a few things in the [Devices](/devices/) folder.  ROM images used to be stored under
+`/devices/pc/basic/` and `/devices/pc/bios/`, but BASIC and BIOS ROM images aren't actually devices; they are the
+*contents* of ROM devices.  So, with that in mind, I've made the following rearrangements:
+
+* `/devices/pc/bios/5150/*` => `/devices/pc/rom/5150/bios/*`
+* `/devices/pc/bios/5160/*` => `/devices/pc/rom/5160/bios/*`
+* `/devices/pc/bios/5170/*` => `/devices/pc/rom/5170/bios/*`
+* `/devices/pc/bios/compaq/*` => `/devices/pc/rom/compaq/bios/*`
+* `/devices/pc/basic/ibm-basic-1.00.json` => `/devices/pc/rom/5150/basic/BASIC100.json`
+* `/devices/pc/basic/ibm-basic-1.10.json` => `/devices/pc/rom/5160/basic/BASIC110.json`
+
+This structure mirrors what was done with Machine and Video devices, where the devices are organized
+first by manufacturer (IBM or COMPAQ) and then by type (MDA, CGA, EGA, etc).
+
+Here, the first ROM subdivision is either a manufacturer or a machine model.  A model implies a manufacturer;
+for example, models 5150 through 5170 refer to IBM PC models.
+
+---
+
+The IBM BASIC ROMs require a bit more research.  I'm a little unclear on the precise history of the BASIC ROMs and
+exactly which version shipped with each IBM PC machine revision.
+
+The project currently includes only two BASIC ROM versions, 1.00 and 1.10, which were initially released with the
+first model 5150 and 5160 machines, respectively.  However, I've also read reports that later revisions of the model
+5150 included BASIC ROM 1.10 as well.
+
+I believe there was also a BASIC ROM version 1.20 released for IBM PCjr, but since PCjs does not yet emulate the PCjr,
+it has not been added to the project.
+
+*[@jeffpar](http://twitter.com/jeffpar)*  
+*February 8, 2016*

_sass/_base.scss

@@ -140,6 +140,7 @@ code {
 pre {
     padding: 8px 12px;
     overflow-x: scroll;
+    white-space: pre-wrap;
     
     > code {
         border: 0;

_sass/_syntax-highlighting.scss

@@ -2,7 +2,7 @@
  * Syntax highlighting styles
  */
 .highlight {
-    background: #fff;
+//  background: #fff;
     @extend %vertical-rhythm;
 
     .c     { color: #998; font-style: italic } // Comment

apps/pc/1981/visicalc/manifest.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet type="text/xsl" href="/versions/pcjs/1.20.7/manifest.xsl"?>
+<?xml-stylesheet type="text/xsl" href="/versions/pcjs/1.20.8/manifest.xsl"?>
 <manifest type="software">
 	<title>VisiCalc</title>
 	<!-- Since version numbers are incorporated into the disk image names, and this version number is a bit ugly, we're not exposing it with the normal "version" tag -->

apps/pc/1982/esuite/manifest.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet type="text/xsl" href="/versions/pcjs/1.20.7/manifest.xsl"?>
+<?xml-stylesheet type="text/xsl" href="/versions/pcjs/1.20.8/manifest.xsl"?>
 <manifest type="software">
 	<title>Executive Suite</title>
 	<version/>

apps/pc/1985/rogue/manifest.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet type="text/xsl" href="/versions/pcjs/1.20.7/manifest.xsl"?>
+<?xml-stylesheet type="text/xsl" href="/versions/pcjs/1.20.8/manifest.xsl"?>
 <manifest type="software">
 	<title>Rogue</title>
 	<version/>

apps/pc/1987/thinktank/manifest.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet type="text/xsl" href="/versions/pcjs/1.20.7/manifest.xsl"?>
+<?xml-stylesheet type="text/xsl" href="/versions/pcjs/1.20.8/manifest.xsl"?>
 <manifest type="software">
 	<title>ThinkTank</title>
 	<version>2.41NP</version>

apps/pc/1988/moria/manifest.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet type="text/xsl" href="/versions/pcjs/1.20.7/manifest.xsl"?>
+<?xml-stylesheet type="text/xsl" href="/versions/pcjs/1.20.8/manifest.xsl"?>
 <manifest type="software">
 	<title>The Dungeons of Moria</title>
     <version>4.872</version>

apps/pc/1992/moria/manifest.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet type="text/xsl" href="/versions/pcjs/1.20.7/manifest.xsl"?>
+<?xml-stylesheet type="text/xsl" href="/versions/pcjs/1.20.8/manifest.xsl"?>
 <manifest type="software">
 	<title>The Dungeons of Moria</title>
 	<version>5.5</version>

devices/c1p/machine/32kb/machine.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet type="text/xsl" href="/versions/c1pjs/1.20.7/machine.xsl"?>
+<?xml-stylesheet type="text/xsl" href="/versions/c1pjs/1.20.8/machine.xsl"?>
 <machine id="c1psim" class="c1p" border="1" width="100%" padbottom="8px" background="#FAEBD7" style="padding-bottom:8px">
 	<name>OSI Challenger 1P (32Kb) with Disk Support</name>
 	<computer id="c1p" name="Challenger 1P">

devices/c1p/machine/8kb/all/debugger/machine.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet type="text/xsl" href="/versions/c1pjs/1.20.7/machine.xsl"?>
+<?xml-stylesheet type="text/xsl" href="/versions/c1pjs/1.20.8/machine.xsl"?>
 <machine id="c1pAll" class="c1p" border="1" width="100%" padbottom="8px" background="#FAEBD7" style="padding-bottom:8px">
 	<name>OSI Challenger 1P (8Kb, Additional Software)</name>
 	<computer id="c1p" name="Challenger 1P">

devices/c1p/machine/8kb/array/README.md

@@ -30,6 +30,10 @@ machines:
   - type: c1p
     id: osi9
     config: /devices/c1p/machine/8kb/small/machine.xml
+redirect_from:
+  - /configs/c1p/machines/array/
+  - /configs/c1p/machines/8kb/array/
+  - /devices/other/c1p/array.xml
 ---
 
 Challenger 1P (8Kb) "Server Array"

devices/c1p/machine/8kb/array/machine.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet type="text/xsl" href="/versions/c1pjs/1.20.7/outline.xsl"?>
+<?xml-stylesheet type="text/xsl" href="/versions/c1pjs/1.20.8/outline.xsl"?>
 <outline>
 	<title>Challenger 1P (8Kb) "Server Array"</title>
 	<machine id="OSI1" ref="/devices/c1p/machine/8kb/small/machine.xml"/>

devices/c1p/machine/8kb/large/debugger/local.html

@@ -26,7 +26,7 @@
 			</ul>
 		</div>
 		<div class="common-top-right">
-			<p>Powered by <a href="http://nodejs.org" target="_blank">Node.js</a> and <a href="http://aws.amazon.com/about-aws/whats-new/2013/03/11/announcing-aws-elastic-beanstalk-for-node-js/" target="_blank">AWS</a></p>
+			<p>Powered by JavaScript and <a href="http://github.com/jeffpar/pcjs" target="_blank">GitHub</a></p>
 		</div>
 	</div>
 	<div class="common-middle">
@@ -45,7 +45,7 @@
 			<div class="common-bottom">
 				<p class="common-reference"></p>
 				<p class="common-copyright">
-					<span class="common-copyright"><a href="http://www.pcjs.org/">pcjs.org</a> website © 2012-2015 by <a href="http://twitter.com/jeffpar">@jeffpar</a></span><br/>
+					<span class="common-copyright"><a href="http://www.pcjs.org/">pcjs.org</a> website © 2012-2016 by <a href="http://twitter.com/jeffpar">@jeffpar</a></span><br/>
 					<span class="common-copyright">PCjs and C1Pjs released under <a href="http://gnu.org/licenses/gpl.html">GPL version 3 or later</a></span>
 				</p>
 			</div>

devices/c1p/machine/8kb/large/debugger/machine.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet type="text/xsl" href="/versions/c1pjs/1.20.7/machine.xsl"?>
+<?xml-stylesheet type="text/xsl" href="/versions/c1pjs/1.20.8/machine.xsl"?>
 <machine id="c1p8kb" class="c1p" border="1" width="100%" background="#FAEBD7" style="padding-bottom:8px">
 	<name>OSI Challenger 1P (8Kb) with Debugger</name>
 	<computer id="c1p" name="Challenger 1P">

devices/c1p/machine/8kb/large/machine.md

@@ -5,6 +5,8 @@ permalink: /devices/c1p/machine/8kb/large/
 machines:
   - type: c1p
     id: c1p8kb
+redirect_from:
+  - /configs/c1p/machines/8kb/large/
 ---
 
 {% include machine.html id="c1p8kb" %}

devices/c1p/machine/8kb/large/machine.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet type="text/xsl" href="/versions/c1pjs/1.20.7/machine.xsl"?>
+<?xml-stylesheet type="text/xsl" href="/versions/c1pjs/1.20.8/machine.xsl"?>
 <machine id="c1pLarge" class="c1p" border="1" pos="center" background="#FAEBD7" style="padding-bottom:8px">
 	<name pos="center">OSI Challenger 1P (circa 1978)</name>
 	<computer id="c1p" name="Challenger 1P">

devices/c1p/machine/8kb/small/machine.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet type="text/xsl" href="/versions/c1pjs/1.20.7/machine.xsl"?>
+<?xml-stylesheet type="text/xsl" href="/versions/c1pjs/1.20.8/machine.xsl"?>
 <machine id="c1pSmall" class="c1p" border="1" width="272px" pos="left" padding="16px" background="#FAEBD7" style="padding-bottom:8px">
 	<computer id="c1p" name="Challenger 1P">
 		<module type="cpu" refid="cpu6502" start="0x0000" end="0xffff"/>

devices/pc/README.md

@@ -11,7 +11,7 @@ IBM PC Device Configurations
 
 * CPU
 * RAM
-* ROMs (eg, [BASIC](basic/), [BIOS](bios/))
+* [ROMs](rom/)
 * [Keyboards](keyboard/)
 * [Video Adapters](video/)
 * Floppy Disk Controllers
@@ -35,8 +35,8 @@ looks like:
 		<name pos="center">IBM PC (Model 5150) with Monochrome Display</name>
 		<computer id="pc-mda-64k" name="IBM PC" resume="1"/>
 		<ram id="ramLow" addr="0x00000"/>
-		<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/basic/ibm-basic-1.00.json"/>
+		<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/rom/5150/basic/BASIC100.json"/>
-		<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/bios/5150/1981-04-24.json"/>
+		<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/rom/5150/bios/1981-04-24/PCBIOS-REV1.json"/>
 		<video ref="/devices/pc/video/ibm/mda/ibm-mda.xml"/>
 		<cpu id="cpu8088" model="8088" autostart="true" padleft="8px">
 			<control type="button" binding="run">Run</control>

devices/pc/bios/README.md

@@ -1,21 +0,0 @@
----
-layout: page
-title: IBM PC BIOS ROMs
-permalink: /devices/pc/bios/
----
-
-BIOS ROMs
----
-
-The project contains the following IBM PC BIOS ROMs:
-
-* [Model 5150: Apr 24, 1981](5150/1981-04-24.json)
-* [Model 5150: Oct 19, 1981](5150/1981-10-19.json)
-* [Model 5150: Oct 27, 1982](5150/1982-10-27.json)
-* [Model 5160: Nov 08, 1982](5160/1982-11-08.json)
-* [Model 5160: May 09, 1986](5160/1986-05-09.json)
-
-As well as BIOS ROMs, with more detailed information, for the following machines:
-
-* [Model 5170](5170/)
-* [Compaq DeskPro 386](compaq/deskpro386/)

devices/pc/keyboard/keyboard-minimal-arrows.xml

@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <keyboard id="keyboard" padleft="8px">
 	<control type="button" binding="esc">ESC</control>
-	<control type="button" binding="ctrl-c">CTRL-C</control>
 	<control type="button" binding="f1">F1</control>
-	<control type="button" binding="f10">F10</control>
+	<control type="button" binding="sysreq">SysReq</control>
-	<control type="button" binding="left">&lt;</control>
+	<control type="button" binding="left">&#x2190;</control>
-	<control type="button" binding="right">&gt;</control>
+	<control type="button" binding="up">&#x2191;</control>
-	<control type="button" binding="up">^</control>
+	<control type="button" binding="down">&#x2193;</control>
-	<control type="button" binding="down">v</control>
+	<control type="button" binding="right">&#x2192;</control>
 </keyboard>

devices/pc/keyboard/keyboard-minimal-sysreq.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<keyboard id="keyboard" padleft="8px">
-	<control type="button" binding="esc">ESC</control>
-	<control type="button" binding="f1">F1</control>
-	<control type="button" binding="f10">F10</control>
-	<control type="button" binding="sysreq">SysReq</control>
-</keyboard>

devices/pc/keyboard/keyboard-test.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<keyboard id="keyboard" padleft="8px">
+	<control type="button" binding="esc">ESC</control>
+	<control type="button" binding="f1">F1</control>
+	<control type="button" binding="sysreq">SysReq</control>
+	<control type="button" binding="left">&#x2190;</control>
+	<control type="button" binding="up">&#x2191;</control>
+	<control type="button" binding="down">&#x2193;</control>
+	<control type="button" binding="right">&#x2192;</control>
+	<control type="button" binding="test1" value="Hello World!">HELLO</control>
+	<control type="button" binding="test2" value="GoodBye!">GOODBYE</control>
+</keyboard>

devices/pc/machine/5150/README.md

@@ -2,9 +2,15 @@
 layout: page
 title: IBM PC Machines (Model 5150)
 permalink: /devices/pc/machine/5150/
+redirect_from:
+  - /configs/pc/machines/5150/
 ---
 
 IBM PC Machines (Model 5150)
 ---
 
-All our Model 5150 configurations of the IBM PC are located here.
+All our Model 5150 configurations of the IBM PC are located here, including:
+
+* [IBM PC with Color Display](/devices/pc/machine/5150/cga/)
+* [IBM PC with Dual Display](/devices/pc/machine/5150/dual/64kb/)
+* [IBM PC with Monochrome Display](/devices/pc/machine/5150/mda/)

devices/pc/machine/5150/cga/384kb/softkbd/machine.md

@@ -1,6 +1,6 @@
 ---
 layout: page
-title: "IBM PC (Model 5150, 384Kb) with Color Display"
+title: "IBM PC (Model 5150, 384Kb) with Color Display and Soft Keyboard"
 permalink: /devices/pc/machine/5150/cga/384kb/softkbd/
 machines:
   - type: pc-dbg

devices/pc/machine/5150/cga/384kb/softkbd/machine.xml

@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet type="text/xsl" href="/versions/pcjs/1.20.7/machine.xsl"?>
+<?xml-stylesheet type="text/xsl" href="/versions/pcjs/1.20.8/machine.xsl"?>
 <machine id="ibm5150" class="pc" border="1" width="1000px" pos="center" background="white">
 	<name>IBM PC (Model 5150), CGA, 384K</name>
 	<computer id="pc-cga-384k" name="IBM PC"/>
 	<cpu id="cpu8088" model="8088"/>
 	<debugger id="debugger"/>
 	<ram id="ramLow" addr="0x00000" test="false" comment="no memory test"/>
-	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/basic/ibm-basic-1.00.json"/>
+	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/rom/5150/basic/BASIC100.json"/>
-	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/bios/5150/1981-04-24.json"/>
+	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/rom/5150/bios/1981-04-24/PCBIOS-REV1.json"/>
 	<video ref="/devices/pc/video/ibm/cga/ibm-cga-960.xml"/>
 	<keyboard ref="/devices/pc/keyboard/keyboard-us83.xml"/>
 	<panel ref="/devices/pc/panel/wide.xml"/>
-	<fdc ref="/disks/pc/library.xml" width="320px"/>
+	<fdc ref="/disks/pc/compiled/library.xml" width="320px"/>
 	<chipset id="chipset" model="5150" sw1="01001001" sw2="10100000" pos="left" padleft="8px" padbottom="8px">
 		<control type="switches" label="SW1" binding="sw1" left="0px"/>
 		<control type="switches" label="SW2" binding="sw2" left="0px"/>

devices/pc/machine/5150/cga/64kb/README.md

@@ -2,9 +2,15 @@
 layout: page
 title: "IBM PC (Model 5150, 64Kb) with Color Display"
 permalink: /devices/pc/machine/5150/cga/64kb/
+redirect_from:
+  - /configs/pc/machines/5150/cga/64kb/
 ---
 
-IBM PC (Model 5150) with Color Graphics (CGA) Display
+IBM PC with Color Graphics (CGA) Display
 ---
 
-All our 64Kb configurations of the IBM PC Model 5150 w/CGA are located here.
+All our 64Kb configurations of the IBM PC Model 5150 w/CGA 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/)

devices/pc/machine/5150/cga/64kb/donkey/README.md

@@ -1,6 +1,6 @@
 ---
 layout: page
-title: IBM PC (Model 5150, 64Kb) running DONKEY.BAS
+title: IBM PC (Model 5150, 64Kb) with Color Display
 permalink: /devices/pc/machine/5150/cga/64kb/donkey/
 redirect_from:
   - /configs/pc/machines/5150/cga/64kb/donkey/
@@ -9,7 +9,7 @@ machines:
     id: ibm5150
 ---
 
-IBM PC (Model 5150) running DONKEY.BAS
+IBM PC with Color Display
 ---
 
 {% include machine.html id="ibm5150" %}

devices/pc/machine/5150/cga/64kb/donkey/debugger/machine.md

@@ -1,13 +1,10 @@
 ---
 layout: page
-title: "IBM PC (Model 5150, 64Kb) running DONKEY.BAS with Debugger"
+title: "IBM PC (Model 5150, 64Kb) with Color Display and Debugger"
 permalink: /devices/pc/machine/5150/cga/64kb/donkey/debugger/
 machines:
   - type: pc-dbg
     id: ibm5150
 ---
 
-IBM PC (Model 5150) running DONKEY.BAS with Debugger
----
-
 {% include machine.html id="ibm5150" %}

devices/pc/machine/5150/cga/64kb/donkey/debugger/machine.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet type="text/xsl" href="/versions/pcjs/1.20.7/machine.xsl"?>
+<?xml-stylesheet type="text/xsl" href="/versions/pcjs/1.20.8/machine.xsl"?>
 <machine id="ibm5150" class="pc" border="1" width="980px" pos="center" background="#FAEBD7">
 	<name pos="center">IBM PC (Model 5150), CGA, 64K</name>
 	<computer id="pc-cga-64k" name="IBM PC" state="/devices/pc/machine/5150/cga/64kb/donkey/state.json"/>
 	<ram id="ramLow" addr="0x00000"/>
-	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/basic/ibm-basic-1.00.json"/>
+	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/rom/5150/basic/BASIC100.json"/>
-	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/bios/5150/1981-04-24.json"/>
+	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/rom/5150/bios/1981-04-24/PCBIOS-REV1.json"/>
 	<video ref="/devices/pc/video/ibm/cga/ibm-cga-960.xml"/>
 	<cpu id="cpu8088" model="8088" autostart="true"/>
 	<keyboard ref="/devices/pc/keyboard/keyboard-minimal.xml"/>

devices/pc/machine/5150/cga/64kb/donkey/machine.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet type="text/xsl" href="/versions/pcjs/1.20.7/machine.xsl"?>
+<?xml-stylesheet type="text/xsl" href="/versions/pcjs/1.20.8/machine.xsl"?>
 <machine id="ibm5150" class="pc" border="1" width="980px" pos="center" background="#FAEBD7">
 	<name pos="center">IBM PC (Model 5150), CGA, 64K</name>
 	<computer id="pc-cga-64k" name="IBM PC" state="/devices/pc/machine/5150/cga/64kb/donkey/state.json"/>
 	<ram id="ramLow" addr="0x00000"/>
-	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/basic/ibm-basic-1.00.json"/>
+	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/rom/5150/basic/BASIC100.json"/>
-	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/bios/5150/1981-04-24.json"/>
+	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/rom/5150/bios/1981-04-24/PCBIOS-REV1.json"/>
 	<video ref="/devices/pc/video/ibm/cga/ibm-cga-960.xml"/>
 	<cpu id="cpu8088" model="8088" autostart="true" padleft="8px">
 		<control type="button" binding="run">Run</control>

devices/pc/machine/5150/cga/64kb/softkbd/machine.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet type="text/xsl" href="/versions/pcjs/1.20.7/machine.xsl"?>
+<?xml-stylesheet type="text/xsl" href="/versions/pcjs/1.20.8/machine.xsl"?>
 <machine id="ibm5150" class="pc" border="1" width="1000px" pos="center" background="white">
 	<name>IBM PC (Model 5150), CGA, 64K</name>
 	<computer id="pc-cga-64k" name="IBM PC"/>
 	<cpu id="cpu8088" model="8088"/>
 	<ram id="ramLow" addr="0x00000"/>
-	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/basic/ibm-basic-1.00.json"/>
+	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/rom/5150/basic/BASIC100.json"/>
-	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/bios/5150/1981-04-24.json"/>
+	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/rom/5150/bios/1981-04-24/PCBIOS-REV1.json"/>
 	<video ref="/devices/pc/video/ibm/cga/ibm-cga-960.xml"/>
 	<keyboard ref="/devices/pc/keyboard/keyboard-us83.xml"/>
 	<debugger id="debugger"/>

devices/pc/machine/5150/cga/README.md

@@ -2,9 +2,17 @@
 layout: page
 title: "IBM PC (Model 5150) with Color Display"
 permalink: /devices/pc/machine/5150/cga/
+redirect_from:
+  - /configs/pc/machines/5150/cga/
+  - /demos/pc/cga/
 ---
 
-IBM PC (Model 5150) with Color Graphics (CGA) Display
+IBM PC with Color Graphics (CGA) Display
 ---
 
-All our Color Graphics (CGA) configurations of the IBM PC Model 5150 are located here.
+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/)

devices/pc/machine/5150/dual/64kb/machine.md

@@ -1,6 +1,6 @@
 ---
 layout: page
-title: "IBM PC (Model 5150) with Dual Display"
+title: "IBM PC (Model 5150, 64Kb) with Dual Display"
 permalink: /devices/pc/machine/5150/dual/64kb/
 machines:
   - type: pc

devices/pc/machine/5150/dual/64kb/machine.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet type="text/xsl" href="/versions/pcjs/1.20.7/machine.xsl"?>
+<?xml-stylesheet type="text/xsl" href="/versions/pcjs/1.20.8/machine.xsl"?>
 <machine id="ibm5150" class="pc" border="1" pos="center" background="#FAEBD7">
 	<name pos="center">IBM PC (Model 5150) with Dual Display</name>
 	<computer id="pc-dual-64k" name="IBM PC" resume="1"/>
 	<ram id="ramLow" addr="0x00000"/>
-	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/basic/ibm-basic-1.00.json"/>
+	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/rom/5150/basic/BASIC100.json"/>
-	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/bios/5150/1981-04-24.json"/>
+	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/rom/5150/bios/1981-04-24/PCBIOS-REV1.json"/>
 	<video ref="/devices/pc/video/ibm/mda/ibm-mda-dual.xml"/>
 	<video ref="/devices/pc/video/ibm/cga/ibm-cga-dual.xml"/>
 	<cpu id="cpu8088" model="8088" autostart="true" padleft="8px">

devices/pc/machine/5150/mda/64kb/debugger/machine.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet type="text/xsl" href="/versions/pcjs/1.20.7/machine.xsl"?>
+<?xml-stylesheet type="text/xsl" href="/versions/pcjs/1.20.8/machine.xsl"?>
 <machine id="ibm5150" class="pc" border="1" pos="center" background="#FAEBD7">
 	<name pos="center">IBM PC Model 5150 with Monochrome Display</name>
 	<computer id="pc-mda-64k" name="IBM PC" resume="1"/>
 	<ram id="ramLow" addr="0x00000"/>
-	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/basic/ibm-basic-1.00.json"/>
+	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/rom/5150/basic/BASIC100.json"/>
-	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/bios/5150/1981-04-24.json"/>
+	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/rom/5150/bios/1981-04-24/PCBIOS-REV1.json"/>
 	<video ref="/devices/pc/video/ibm/mda/ibm-mda.xml"/>
 	<cpu id="cpu8088" model="8088" autostart="true"/>
 	<keyboard ref="/devices/pc/keyboard/keyboard-minimal-functions.xml"/>

devices/pc/machine/5150/mda/64kb/machine.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet type="text/xsl" href="/versions/pcjs/1.20.7/machine.xsl"?>
+<?xml-stylesheet type="text/xsl" href="/versions/pcjs/1.20.8/machine.xsl"?>
 <machine id="ibm5150" class="pc" border="1" pos="center" background="#FAEBD7">
 	<name pos="center">IBM PC (Model 5150) with Monochrome Display</name>
 	<computer id="pc-mda-64k" name="IBM PC" resume="1"/>
 	<ram id="ramLow" addr="0x00000"/>
-	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/basic/ibm-basic-1.00.json"/>
+	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/rom/5150/basic/BASIC100.json"/>
-	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/bios/5150/1981-04-24.json"/>
+	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/rom/5150/bios/1981-04-24/PCBIOS-REV1.json"/>
 	<video ref="/devices/pc/video/ibm/mda/ibm-mda.xml"/>
 	<cpu id="cpu8088" model="8088" autostart="true" padleft="8px">
 		<control type="button" binding="run">Run</control>

devices/pc/machine/5150/mda/64kb/softkbd/machine.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet type="text/xsl" href="/versions/pcjs/1.20.7/machine.xsl"?>
+<?xml-stylesheet type="text/xsl" href="/versions/pcjs/1.20.8/machine.xsl"?>
 <machine id="ibm5150" class="pc" border="1" pos="center" background="white">
 	<name>IBM PC (Model 5150), MDA, 64K</name>
 	<computer id="pc-mda-64k" name="IBM PC"/>
 	<cpu id="cpu8088" model="8088"/>
 	<ram id="ramLow" addr="0x00000"/>
-	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/basic/ibm-basic-1.00.json"/>
+	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/rom/5150/basic/BASIC100.json"/>
-	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/bios/5150/1981-04-24.json"/>
+	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/rom/5150/bios/1981-04-24/PCBIOS-REV1.json"/>
 	<video ref="/devices/pc/video/ibm/mda/ibm-mda.xml"/>
 	<keyboard ref="/devices/pc/keyboard/keyboard-us83.xml"/>
 	<debugger id="debugger"/>

devices/pc/machine/5150/mda/README.md

@@ -8,10 +8,14 @@ machines:
     config: /devices/pc/machine/5150/mda/64kb/machine.xml
 ---
 
-IBM PC (Model 5150) with Monochrome (MDA) Display
+IBM PC with Monochrome (MDA) Display
 ---
 
-All our Monochrome (MDA) configurations of the IBM PC Model 5150 are located here.
+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/)
 
 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,

devices/pc/machine/5160/README.md

@@ -4,7 +4,11 @@ title: IBM PC XT (Model 5160)
 permalink: /devices/pc/machine/5160/
 ---
 
-IBM PC XT (Model 5160)
+IBM PC XT Machines (Model 5160)
 ---
 
-All our Model 5160, aka IBM PC XT, configurations are located here.
+All our Model 5160, aka IBM PC XT, configurations are located here, including:
+
+* [IBM PC XT with Color Display](/devices/pc/machine/5160/cga/)
+* [IBM PC XT with Enhanced Color Display](/devices/pc/machine/5160/ega/)
+* [IBM PC XT with Monochrome Display](/devices/pc/machine/5160/mda/)

devices/pc/machine/5160/cga/256kb/README.md

@@ -6,7 +6,15 @@ redirect_from:
   - /configs/pc/machines/5160/cga/256kb/
 ---
 
-IBM PC XT (Model 5160, 256Kb) with Color Display
+IBM PC XT (256Kb) with Color Display
 ---
 
-All our 256Kb Model 5160, aka IBM PC XT, configurations are located here.
+All our 256Kb Model 5160, aka IBM PC XT, configurations 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) Machine Array with CGA Displays](/devices/pc/machine/5160/cga/256kb/array/)

devices/pc/machine/5160/cga/256kb/array/README.md

@@ -1,6 +1,6 @@
 ---
 layout: page
-title: "IBM PC XT (Model 5160, 256Kb) Server Array"
+title: "IBM PC XT (Model 5160, 256Kb, 10Mb Drive) Machine Array with CGA Displays"
 permalink: /devices/pc/machine/5160/cga/256kb/array/
 machines:
   - type: pc
@@ -9,7 +9,7 @@ machines:
     id: ibm5160b
 ---
 
-IBM PC XT "Server Array"
+IBM PC XT CGA Machine Array
 ---
 
 ### Demonstration of Multiple IBM PCs on a Single Web Page

devices/pc/machine/5160/cga/256kb/array/machine.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet type="text/xsl" href="/versions/pcjs/1.20.7/machine.xsl"?>
+<?xml-stylesheet type="text/xsl" href="/versions/pcjs/1.20.8/machine.xsl"?>
 <machine id="ibm5160" class="pc" border="1" width="1000px" pos="center" background="white">
 	<name pos="center">IBM PC XT (Model 5160), CGA, 256K, 10Mb Drive</name>
 	<computer id="xt-cga-256k" name="IBM PC XT"/>
 	<ram id="ramLow" addr="0x00000" test="false"/>
 	<rom id="romHDC" addr="0xc8000" size="0x2000" file="/devices/pc/hdc/ibm-xebec-1982.json"/>
-	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/basic/ibm-basic-1.10.json"/>
+	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/rom/5160/basic/BASIC110.json"/>
-	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/bios/5160/1982-11-08.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-960.xml"/>
 	<cpu id="cpu8088" model="8088" autostart="true" pos="left" padleft="8px">
 		<control type="button" binding="run">Run</control>

devices/pc/machine/5160/cga/256kb/demo/README.md

@@ -1,13 +1,13 @@
 ---
 layout: page
-title: "IBM PC XT (Model 5160, 256Kb) with Color Display"
+title: "IBM PC XT (Model 5160, 256Kb, 10Mb Drive) with Color Display"
 permalink: /devices/pc/machine/5160/cga/256kb/demo/
 machines:
   - type: pc
     id: ibm5160
 ---
 
-IBM PC XT (Model 5160, 256Kb) with Color Display
+IBM PC XT with Color Display
 ---
 
 {% include machine.html id="ibm5160" %}

devices/pc/machine/5160/cga/256kb/demo/debugger/machine.md

@@ -1,6 +1,6 @@
 ---
 layout: page
-title: "IBM PC XT (Model 5160, 256Kb) with Color Display and Debugger"
+title: "IBM PC XT (Model 5160, 256Kb, 10Mb Drive) with Color Display and Debugger"
 permalink: /devices/pc/machine/5160/cga/256kb/demo/debugger/
 machines:
   - type: pc-dbg

devices/pc/machine/5160/cga/256kb/demo/debugger/machine.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet type="text/xsl" href="/versions/pcjs/1.20.7/machine.xsl"?>
+<?xml-stylesheet type="text/xsl" href="/versions/pcjs/1.20.8/machine.xsl"?>
 <machine id="ibm5160" class="pc" border="1" width="980px" pos="center" background="#FAEBD7">
 	<name pos="center">IBM PC XT (Model 5160), CGA, 256Kb, 10Mb Drive</name>
 	<computer id="xt-cga-256k" name="IBM PC XT" resume="1"/>
 	<ram id="ramLow" addr="0x00000" test="false" comment="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/basic/ibm-basic-1.10.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/bios/5160/1982-11-08.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-960.xml"/>
 	<cpu id="cpu8088" model="8088" autostart="true"/>
 	<keyboard ref="/devices/pc/keyboard/keyboard-minimal-functions.xml"/>

devices/pc/machine/5160/cga/256kb/demo/machine.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet type="text/xsl" href="/versions/pcjs/1.20.7/machine.xsl"?>
+<?xml-stylesheet type="text/xsl" href="/versions/pcjs/1.20.8/machine.xsl"?>
 <machine id="ibm5160" class="pc" border="1" width="980px" pos="center" background="#FAEBD7">
 	<name pos="center">IBM PC XT (Model 5160), CGA, 256Kb, 10Mb Drive</name>
 	<computer id="xt-cga-256k" name="IBM PC XT" resume="1"/>
 	<ram id="ramLow" addr="0x00000"/>
 	<rom id="romHDC" addr="0xc8000" size="0x2000" file="/devices/pc/hdc/ibm-xebec-1982.json"/>
-	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/basic/ibm-basic-1.10.json"/>
+	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/rom/5160/basic/BASIC110.json"/>
-	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/bios/5160/1982-11-08.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-960.xml"/>
 	<cpu id="cpu8088" model="8088" autostart="true" pos="left" padleft="8px">
 		<control type="button" binding="run">Run</control>

devices/pc/machine/5160/cga/256kb/softkbd/machine.md

@@ -1,6 +1,6 @@
 ---
 layout: page
-title: "IBM PC XT (Model 5160, 256Kb) with Color Display and Soft Keyboard"
+title: "IBM PC XT (Model 5160, 256Kb, 10Mb Drive) with Color Display and Soft Keyboard"
 permalink: /devices/pc/machine/5160/cga/256kb/softkbd/
 machines:
   - type: pc-dbg

devices/pc/machine/5160/cga/256kb/softkbd/machine.xml

@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet type="text/xsl" href="/versions/pcjs/1.20.7/machine.xsl"?>
+<?xml-stylesheet type="text/xsl" href="/versions/pcjs/1.20.8/machine.xsl"?>
 <machine id="ibm5160" class="pc" border="1" width="1000px" pos="center" background="white">
 	<name>IBM PC XT (Model 5160), CGA, 256K, 10Mb Drive</name>
 	<computer id="xt-cga-256k" name="IBM PC XT"/>
 	<cpu id="cpu8088" model="8088"/>
 	<ram id="ramLow" addr="0x00000" test="false"/>
 	<rom id="romHDC" addr="0xc8000" size="0x2000" file="/devices/pc/hdc/ibm-xebec-1982.json"/>
-	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/basic/ibm-basic-1.10.json"/>
+	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/rom/5160/basic/BASIC110.json"/>
-	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/bios/5160/1982-11-08.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-960.xml"/>
 	<keyboard ref="/devices/pc/keyboard/keyboard-us83.xml"/>
 	<debugger id="debugger"/>
 	<panel ref="/devices/pc/panel/default.xml"/>
-	<fdc ref="/disks/pc/library.xml" width="320px"/>
+	<fdc ref="/disks/pc/compiled/library.xml" width="320px"/>
 	<chipset id="chipset" model="5160" sw1="01001001" pos="left" padleft="8px" padbottom="8px">
 		<control type="switches" label="SW1" binding="sw1" left="0px"/>
 		<control type="description" binding="swdesc" left="0px"/>

devices/pc/machine/5160/cga/256kb/win101/README.md

@@ -1,9 +1,11 @@
 ---
 layout: page
-title: "IBM PC XT (Model 5160, 256Kb) running Windows 1.01"
+title: "IBM PC XT (Model 5160, 256Kb, 10Mb Drive) with Color Display running Windows 1.01"
 permalink: /devices/pc/machine/5160/cga/256kb/win101/
 redirect_from:
   - /configs/pc/machines/5160/cga/256kb/win101/
+  - /demos/pc/cga-win101/xt-cga-win101.xml
+  - /demos/pc/cga-win101/
 machines:
   - type: pc
     id: ibm5160

devices/pc/machine/5160/cga/256kb/win101/debugger/README.md

@@ -1,6 +1,6 @@
 ---
 layout: page
-title: "IBM PC XT (Model 5160, 256Kb) running Windows 1.01 with Debugger"
+title: "IBM PC XT (Model 5160, 256Kb, 10Mb Drive) with Color Display and Debugger running Windows 1.01"
 permalink: /devices/pc/machine/5160/cga/256kb/win101/debugger/
 redirect_from:
   - /configs/pc/machines/5160/cga/256kb/win101/debugger/
@@ -9,7 +9,7 @@ machines:
     id: ibm5160
 ---
 
-IBM PC XT running Windows 1.01
+IBM PC XT with Debugger running Windows 1.01
 ---
 
 {% include machine.html id="ibm5160" %}

devices/pc/machine/5160/cga/256kb/win101/debugger/machine.xml

@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet type="text/xsl" href="/versions/pcjs/1.20.7/machine.xsl"?>
+<?xml-stylesheet type="text/xsl" href="/versions/pcjs/1.20.8/machine.xsl"?>
 <machine id="ibm5160" class="pc" border="1" width="980px" pos="center" background="#FAEBD7">
 	<name pos="center">IBM PC XT (Model 5160) running Windows v1.01</name>
 	<computer id="xt-cga-win101" name="IBM PC XT" state="/devices/pc/machine/5160/cga/256kb/win101/state.json" resume="1"/>
 	<ram id="ramLow" addr="0x00000"/>
 	<rom id="romHDC" addr="0xc8000" size="0x2000" file="/devices/pc/hdc/ibm-xebec-1982.json"/>
-	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/basic/ibm-basic-1.10.json"/>
+	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/rom/5160/basic/BASIC110.json"/>
-	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/bios/5160/1982-11-08.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"/>
 	<cpu id="cpu8088" model="8088" autostart="false"/>
 	<keyboard ref="/devices/pc/keyboard/keyboard-minimal-functions.xml"/>
 	<debugger id="debugger"/>
 	<panel ref="/devices/pc/panel/wide.xml"/>
-	<fdc ref="/disks/pc/library.xml" width="320px"/>
+	<fdc ref="/disks/pc/compiled/library.xml" width="320px"/>
 	<chipset id="chipset" model="5160" sw1="01001001" pos="left" padleft="8px" padbottom="8px">
 		<control type="switches" label="SW1" binding="sw1" left="0px"/>
 		<control type="description" binding="swdesc" left="0px"/>

devices/pc/machine/5160/cga/256kb/win101/machine.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet type="text/xsl" href="/versions/pcjs/1.20.7/machine.xsl"?>
+<?xml-stylesheet type="text/xsl" href="/versions/pcjs/1.20.8/machine.xsl"?>
 <machine id="ibm5160" class="pc" border="1" pos="center" background="#FAEBD7">
 	<name pos="center">IBM PC XT (Model 5160) running Windows v1.01</name>
 	<computer id="xt-cga-win101" name="IBM PC XT" state="/devices/pc/machine/5160/cga/256kb/win101/state.json"/>
 	<ram id="ramLow" addr="0x00000"/>
 	<rom id="romHDC" addr="0xc8000" size="0x2000" file="/devices/pc/hdc/ibm-xebec-1982.json"/>
-	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/basic/ibm-basic-1.10.json"/>
+	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/rom/5160/basic/BASIC110.json"/>
-	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/bios/5160/1982-11-08.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"/>
 	<cpu id="cpu8088" model="8088" autostart="true" pos="left" padleft="8px">
 		<control type="button" binding="run">Run</control>

devices/pc/machine/5160/cga/256kb/win101/softkbd/machine.md

@@ -1,6 +1,6 @@
 ---
 layout: page
-title: "IBM PC XT (Model 5160, 256Kb) running Windows 1.01 with Soft Keyboard"
+title: "IBM PC XT (Model 5160, 256Kb, 10Mb Drive) with Color Display and Soft Keyboard running Windows 1.01"
 permalink: /devices/pc/machine/5160/cga/256kb/win101/softkbd/
 machines:
   - type: pc-dbg

devices/pc/machine/5160/cga/256kb/win101/softkbd/machine.xml

@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet type="text/xsl" href="/versions/pcjs/1.20.7/machine.xsl"?>
+<?xml-stylesheet type="text/xsl" href="/versions/pcjs/1.20.8/machine.xsl"?>
 <machine id="ibm5160" class="pc" border="1" width="1000px" pos="center" background="white">
 	<name>IBM PC XT (Model 5160), CGA, 256K, WIN101</name>
 	<computer id="xt-cga-256k" name="IBM PC XT"/>
 	<cpu id="cpu8088" model="8088" autostart="true"/>
 	<ram id="ramLow" addr="0x00000" test="false"/>
 	<rom id="romHDC" addr="0xc8000" size="0x2000" file="/devices/pc/hdc/ibm-xebec-1982.json"/>
-	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/basic/ibm-basic-1.10.json"/>
+	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/rom/5160/basic/BASIC110.json"/>
-	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/bios/5160/1982-11-08.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"/>
 	<keyboard ref="/devices/pc/keyboard/keyboard-us83.xml"/>
 	<debugger id="debugger"/>
 	<panel ref="/devices/pc/panel/wide.xml"/>
-	<fdc ref="/disks/pc/library.xml" width="320px"/>
+	<fdc ref="/disks/pc/compiled/library.xml" width="320px"/>
 	<chipset id="chipset" model="5160" sw1="01001001" pos="left" padleft="8px" padbottom="8px">
 		<control type="switches" label="SW1" binding="sw1" left="0px"/>
 		<control type="description" binding="swdesc" left="0px"/>

devices/pc/machine/5160/cga/512kb/win101/softkbd/machine.md

@@ -1,6 +1,6 @@
 ---
 layout: page
-title: "IBM PC XT (Model 5160, 512Kb) running Windows 1.01 with Soft Keyboard"
+title: "IBM PC XT (Model 5160, 512Kb, 10Mb Drive) with Color Display and Soft Keyboard running Windows 1.01"
 permalink: /devices/pc/machine/5160/cga/512kb/win101/softkbd/
 machines:
   - type: pc-dbg

devices/pc/machine/5160/cga/512kb/win101/softkbd/machine.xml

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet type="text/xsl" href="/versions/pcjs/1.20.7/machine.xsl"?>
+<?xml-stylesheet type="text/xsl" href="/versions/pcjs/1.20.8/machine.xsl"?>
 <machine id="ibm5160" class="pc" border="1" width="1000px" pos="center" background="white">
 	<name>IBM PC XT (Model 5160), CGA, 512K, WIN101</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"/>
 	<rom id="romHDC" addr="0xc8000" size="0x2000" file="/devices/pc/hdc/ibm-xebec-1982.json"/>
-	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/basic/ibm-basic-1.10.json"/>
+	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/rom/5160/basic/BASIC110.json"/>
-	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/bios/5160/1982-11-08.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"/>
 	<keyboard ref="/devices/pc/keyboard/keyboard-us83.xml"/>
 	<debugger id="debugger"/>

devices/pc/machine/5160/cga/640kb/debugger/machine.md

@@ -1,6 +1,6 @@
 ---
 layout: page
-title: "IBM PC XT (Model 5160, 640Kb) with Color Display and Debugger"
+title: "IBM PC XT (Model 5160, 640Kb, 10Mb Drive) with Color Display and Debugger"
 permalink: /devices/pc/machine/5160/cga/640kb/debugger/
 machines:
   - type: pc-dbg

devices/pc/machine/5160/cga/640kb/debugger/machine.xml

@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet type="text/xsl" href="/versions/pcjs/1.20.7/machine.xsl"?>
+<?xml-stylesheet type="text/xsl" href="/versions/pcjs/1.20.8/machine.xsl"?>
 <machine id="ibm5160" class="pc" border="1" width="980px" pos="center" background="#FAEBD7">
 	<name pos="center">IBM PC XT (Model 5160), CGA, 640K, 10Mb Drive</name>
 	<computer id="xt-cga-640k" name="IBM PC XT"/>
 	<cpu id="cpu8088" model="8088" autostart="true"/>
 	<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/basic/ibm-basic-1.10.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/bios/5160/1982-11-08.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-960-keygrid.xml"/>
 	<keyboard ref="/devices/pc/keyboard/keyboard-minimal.xml"/>
 	<debugger id="debugger"/>
 	<panel ref="/devices/pc/panel/wide.xml"/>
-	<fdc ref="/disks/pc/library.xml" width="320px"/>
+	<fdc ref="/disks/pc/compiled/library.xml" width="320px"/>
 	<chipset id="chipset" model="5160" sw1="01001001" pos="left" padleft="8px" padbottom="8px">
 		<control type="switches" label="SW1" binding="sw1" left="0px"/>
 		<control type="description" binding="swdesc" left="0px"/>

devices/pc/machine/5160/cga/640kb/dos400m/README.md

@@ -1,6 +1,6 @@
 ---
 layout: page
-title: "IBM PC XT (Model 5160, 640Kb) with Multitasking MS-DOS 4.00"
+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/

devices/pc/machine/5160/cga/640kb/dos400m/machine.xml

@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet type="text/xsl" href="/versions/pcjs/1.20.7/machine.xsl"?>
+<?xml-stylesheet type="text/xsl" href="/versions/pcjs/1.20.8/machine.xsl"?>
 <machine id="ibm5160" class="pc" border="1" width="1000px" pos="center" background="white">
 	<name>IBM PC XT (Model 5160), CGA, 640K, 10Mb Drive</name>
 	<computer id="xt-cga-640k" name="IBM PC XT"/>
 	<cpu id="cpu8088" model="8088" autostart="true"/>
 	<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/basic/ibm-basic-1.10.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/bios/5160/1982-11-08.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"/>
 	<keyboard ref="/devices/pc/keyboard/keyboard-us83.xml"/>
 	<debugger id="debugger"/>
 	<panel ref="/devices/pc/panel/wide.xml"/>
-	<fdc ref="/disks/pc/library.xml" width="320px" 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" width="320px" 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"}}'/>
 	<chipset id="chipset" model="5160" sw1="01001001" pos="left" padleft="8px" padbottom="8px">
 		<control type="switches" label="SW1" binding="sw1" left="0px"/>
 		<control type="description" binding="swdesc" left="0px"/>

devices/pc/machine/5160/cga/640kb/machine.md

@@ -1,6 +1,6 @@
 ---
 layout: page
-title: "IBM PC XT (Model 5160, 640Kb) with Color Display"
+title: "IBM PC XT (Model 5160, 640Kb, 10Mb Drive) with Color Display"
 permalink: /devices/pc/machine/5160/cga/640kb/
 machines:
   - type: pc

devices/pc/machine/5160/cga/640kb/machine.xml

@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet type="text/xsl" href="/versions/pcjs/1.20.7/machine.xsl"?>
+<?xml-stylesheet type="text/xsl" href="/versions/pcjs/1.20.8/machine.xsl"?>
 <machine id="ibm5160" class="pc" border="1" pos="center" background="#FAEBD7">
 	<name pos="center">IBM PC XT (Model 5160), CGA, 640K, 10Mb Drive</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/pc/hdc/ibm-xebec-1982.json"/>
-	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/basic/ibm-basic-1.10.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/bios/5160/1982-11-08.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-960-keygrid.xml"/>
 	<cpu id="cpu8088" model="8088" autostart="true" pos="left" padleft="8px">
 		<control type="button" binding="run">Run</control>
 		<control type="button" binding="reset">Reset</control>
 	</cpu>
 	<keyboard ref="/devices/pc/keyboard/keyboard-minimal.xml"/>
-	<fdc ref="/disks/pc/library.xml" pos="right"/>
+	<fdc ref="/disks/pc/compiled/library.xml" pos="right"/>
 	<hdc id="hdcXT" drives='[{name:"10Mb Hard Disk",type:3}]'/>
 	<chipset id="chipset" model="5160" sw1="01001001"/>
 </machine>

devices/pc/machine/5160/cga/README.md

@@ -0,0 +1,22 @@
+---
+layout: page
+title: "IBM PC (Model 5160) with Color Display"
+permalink: /devices/pc/machine/5160/cga/
+---
+
+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) 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/)

devices/pc/machine/5160/ega/256kb/debugger/machine.md

@@ -1,6 +1,6 @@
 ---
 layout: page
-title: "IBM PC XT (Model 5160, 256Kb) with EGA Display and Debugger"
+title: "IBM PC XT (Model 5160, 256Kb, 10Mb Drive) with EGA Display and Debugger"
 permalink: /devices/pc/machine/5160/ega/256kb/debugger/
 machines:
   - type: pc-dbg

devices/pc/machine/5160/ega/256kb/debugger/machine.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet type="text/xsl" href="/versions/pcjs/1.20.7/machine.xsl"?>
+<?xml-stylesheet type="text/xsl" href="/versions/pcjs/1.20.8/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"/>
@@ -7,13 +7,13 @@
 	<ram id="ramLow" addr="0x00000" test="false"/>
 	<rom id="romEGA" addr="0xc0000" size="0x4000" file="/devices/pc/video/ibm/ega/ibm-ega.json" notify="videoEGA"/>
 	<rom id="romHDC" addr="0xc8000" size="0x2000" file="/devices/pc/hdc/ibm-xebec-1982.json"/>
-	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/basic/ibm-basic-1.10.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/bios/5160/1982-11-08.json"/>
+	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/rom/5160/bios/1982-11-08/XTBIOS-REV1.json"/>
 	<video ref="/devices/pc/video/ibm/ega/ibm-ega-64kb.xml"/>
 	<keyboard ref="/devices/pc/keyboard/keyboard-minimal-functions.xml"/>
 	<debugger id="debugger"/>
 	<panel ref="/devices/pc/panel/wide.xml"/>
-	<fdc ref="/disks/pc/library.xml" width="320px"/>
+	<fdc ref="/disks/pc/compiled/library.xml" width="320px"/>
 	<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"/>

devices/pc/machine/5160/ega/640kb/array/README.md

@@ -1,6 +1,6 @@
 ---
 layout: page
-title: "Windows 1.01 Server Array"
+title: "IBM PC XT (Model 5160, 256Kb, 10Mb Drive) Machine Array with EGA Displays"
 permalink: /devices/pc/machine/5160/ega/640kb/array/
 machines:
   - type: pc
@@ -13,7 +13,7 @@ machines:
     id: ibm5160d
 ---
 
-Windows 1.01 "Server Array"
+IBM PC XT EGA Machine Array
 ---
 
 ### Demonstration of Multiple IBM PCs on a Single Web Page

devices/pc/machine/5160/ega/640kb/array/machine.xml

@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet type="text/xsl" href="/versions/pcjs/1.20.7/machine.xsl"?>
+<?xml-stylesheet type="text/xsl" href="/versions/pcjs/1.20.8/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"/>
 	<ram id="ramLow" addr="0x00000" test="false" size="0xa0000" comment="0xa0000 (640Kb) size overrides SW1|ROM BIOS memory test has been disabled"/>
 	<rom id="romEGA" addr="0xc0000" size="0x4000" file="/devices/pc/video/ibm/ega/ibm-ega.json" notify="videoEGA"/>
 	<rom id="romHDC" addr="0xc8000" size="0x2000" file="/devices/pc/hdc/ibm-xebec-1982.json"/>
-	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/basic/ibm-basic-1.10.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/bios/5160/1982-11-08.json"/>
+	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/rom/5160/bios/1982-11-08/XTBIOS-REV1.json"/>
 	<video ref="/devices/pc/video/ibm/ega/ibm-ega-128kb-autolock640.xml"/>
 	<keyboard ref="/devices/pc/keyboard/keyboard-minimal.xml"/>
 	<cpu id="cpu8088" model="8088">
 		<control type="button" binding="setSpeed">Fast</control>
 	</cpu>
-	<fdc ref="/disks/pc/library.xml"/>
+	<fdc ref="/disks/pc/compiled/library.xml"/>
 	<chipset id="chipset" model="5160" sw1="01001101"/>
 	<hdc ref="/disks/pc/fixed/win101-ega.xml"/>
 	<serial id="com2" adapter="2"/>

devices/pc/machine/5160/ega/640kb/debugger/machine.md

@@ -1,6 +1,6 @@
 ---
 layout: page
-title: "IBM PC XT (Model 5160, 640Kb) with EGA Display and Debugger"
+title: "IBM PC XT (Model 5160, 640Kb, 10Mb Drive) with EGA Display and Debugger"
 permalink: /devices/pc/machine/5160/ega/640kb/debugger/
 machines:
   - type: pc-dbg

devices/pc/machine/5160/ega/640kb/debugger/machine.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet type="text/xsl" href="/versions/pcjs/1.20.7/machine.xsl"?>
+<?xml-stylesheet type="text/xsl" href="/versions/pcjs/1.20.8/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"/>
@@ -7,13 +7,13 @@
 	<ram id="ramLow" addr="0x00000" test="false" size="0xa0000" comment="0xa0000 (640Kb) size overrides SW1|ROM BIOS memory test has been disabled"/>
 	<rom id="romEGA" addr="0xc0000" size="0x4000" file="/devices/pc/video/ibm/ega/ibm-ega.json" notify="videoEGA"/>
 	<rom id="romHDC" addr="0xc8000" size="0x2000" file="/devices/pc/hdc/ibm-xebec-1982.json"/>
-	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/basic/ibm-basic-1.10.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/bios/5160/1982-11-08.json"/>
+	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/rom/5160/bios/1982-11-08/XTBIOS-REV1.json"/>
 	<video ref="/devices/pc/video/ibm/ega/ibm-ega-128kb-autolockfs.xml"/>
 	<keyboard ref="/devices/pc/keyboard/keyboard-minimal-functions.xml"/>
 	<debugger id="debugger"/>
 	<panel ref="/devices/pc/panel/wide.xml"/>
-	<fdc ref="/disks/pc/library.xml" width="320px"/>
+	<fdc ref="/disks/pc/compiled/library.xml" width="320px"/>
 	<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"/>

devices/pc/machine/5160/ega/640kb/machine.md

@@ -1,6 +1,6 @@
 ---
 layout: page
-title: "IBM PC XT (Model 5160, 640Kb) with EGA Display"
+title: "IBM PC XT (Model 5160, 640Kb, 10Mb Drive) with EGA Display"
 permalink: /devices/pc/machine/5160/ega/640kb/
 machines:
   - type: pc

devices/pc/machine/5160/ega/640kb/machine.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet type="text/xsl" href="/versions/pcjs/1.20.7/machine.xsl"?>
+<?xml-stylesheet type="text/xsl" href="/versions/pcjs/1.20.8/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"/>
@@ -7,11 +7,11 @@
 	<ram id="ramLow" addr="0x00000" test="false" size="0xa0000" comment="0xa0000 (640Kb) size overrides SW1|ROM BIOS memory test has been disabled"/>
 	<rom id="romEGA" addr="0xc0000" size="0x4000" file="/devices/pc/video/ibm/ega/ibm-ega.json" notify="videoEGA"/>
 	<rom id="romHDC" addr="0xc8000" size="0x2000" file="/devices/pc/hdc/ibm-xebec-1982.json"/>
-	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/basic/ibm-basic-1.10.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/bios/5160/1982-11-08.json"/>
+	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/rom/5160/bios/1982-11-08/XTBIOS-REV1.json"/>
 	<video ref="/devices/pc/video/ibm/ega/ibm-ega-128kb-autolockfs.xml"/>
 	<keyboard ref="/devices/pc/keyboard/keyboard-minimal-functions.xml"/>
-	<fdc ref="/disks/pc/library.xml"/>
+	<fdc ref="/disks/pc/compiled/library.xml"/>
 	<chipset id="chipset" model="5160" sw1="01001101"/>
 	<hdc ref="/disks/pc/fixed/win101-ega.xml"/>
 	<serial id="com2" adapter="2"/>

devices/pc/machine/5160/ega/640kb/win101/debugger/machine.md

@@ -1,6 +1,6 @@
 ---
 layout: page
-title: "IBM PC XT (Model 5160, 640Kb) with EGA Display running Windows 1.01 and Debugger"
+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-dbg

devices/pc/machine/5160/ega/640kb/win101/debugger/machine.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet type="text/xsl" href="/versions/pcjs/1.20.7/machine.xsl"?>
+<?xml-stylesheet type="text/xsl" href="/versions/pcjs/1.20.8/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"/>
@@ -7,13 +7,13 @@
 	<ram id="ramLow" addr="0x00000" test="false" size="0xa0000" comment="0xa0000 (640Kb) size overrides SW1|ROM BIOS memory test has been disabled"/>
 	<rom id="romEGA" addr="0xc0000" size="0x4000" file="/devices/pc/video/ibm/ega/ibm-ega.json" notify="videoEGA"/>
 	<rom id="romHDC" addr="0xc8000" size="0x2000" file="/devices/pc/hdc/ibm-xebec-1982.json"/>
-	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/basic/ibm-basic-1.10.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/bios/5160/1982-11-08.json"/>
+	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/rom/5160/bios/1982-11-08/XTBIOS-REV1.json"/>
 	<video ref="/devices/pc/video/ibm/ega/ibm-ega-128kb-autolockfs.xml"/>
 	<keyboard ref="/devices/pc/keyboard/keyboard-minimal-functions.xml"/>
 	<debugger id="debugger"/>
 	<panel ref="/devices/pc/panel/wide.xml"/>
-	<fdc ref="/disks/pc/library.xml" width="320px"/>
+	<fdc ref="/disks/pc/compiled/library.xml" width="320px"/>
 	<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"/>

devices/pc/machine/5160/ega/640kb/win101/machine.md

@@ -1,6 +1,6 @@
 ---
 layout: page
-title: "IBM PC XT (Model 5160, 640Kb) with EGA Display running Windows 1.01"
+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/

devices/pc/machine/5160/ega/640kb/win101/machine.xml

@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet type="text/xsl" href="/versions/pcjs/1.20.7/machine.xsl"?>
+<?xml-stylesheet type="text/xsl" href="/versions/pcjs/1.20.8/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="romEGA" addr="0xc0000" size="0x4000" file="/devices/pc/video/ibm/ega/ibm-ega.json" notify="videoEGA"/>
 	<rom id="romHDC" addr="0xc8000" size="0x2000" file="/devices/pc/hdc/ibm-xebec-1982.json"/>
-	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/basic/ibm-basic-1.10.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/bios/5160/1982-11-08.json"/>
+	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/rom/5160/bios/1982-11-08/XTBIOS-REV1.json"/>
 	<video ref="/devices/pc/video/ibm/ega/ibm-ega-128kb-autolockfs.xml"/>
 	<keyboard ref="/devices/pc/keyboard/keyboard-minimal.xml"/>
 	<cpu id="cpu8088" model="8088">
 		<control type="button" binding="setSpeed">Fast</control>
 	</cpu>
-	<fdc ref="/disks/pc/library.xml" pos="right"/>
+	<fdc ref="/disks/pc/compiled/library.xml" pos="right"/>
 	<chipset id="chipset" model="5160" sw1="01001101"/>
 	<hdc ref="/disks/pc/fixed/win101-ega.xml"/>
 	<serial id="com2" adapter="2"/>

devices/pc/machine/5160/ega/README.md

@@ -0,0 +1,17 @@
+---
+layout: page
+title: "IBM PC XT (Model 5160) with Enhanced Color Display"
+permalink: /devices/pc/machine/5160/ega/
+---
+
+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 (640Kb, 10Mb Drive) Machine Array with EGA Displays](/devices/pc/machine/5160/ega/640kb/array/)

devices/pc/machine/5160/mda/256kb/debugger/machine.md

@@ -1,6 +1,6 @@
 ---
 layout: page
-title: "IBM PC XT (Model 5160, 256Kb) with Monochrome Display"
+title: "IBM PC XT (Model 5160, 256Kb, 10Mb Drive) with Monochrome Display and Debugger"
 permalink: /devices/pc/machine/5160/mda/256kb/debugger/
 machines:
   - type: pc-dbg

devices/pc/machine/5160/mda/256kb/debugger/machine.xml

@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet type="text/xsl" href="/versions/pcjs/1.20.7/machine.xsl"?>
+<?xml-stylesheet type="text/xsl" href="/versions/pcjs/1.20.8/machine.xsl"?>
 <machine id="ibm5160" class="pc" border="1" pos="center" background="#FAEBD7">
 	<name pos="center">IBM PC XT (Model 5160), MDA, 256Kb, 10Mb Drive</name>
 	<computer id="xt-mda-256k" name="IBM PC XT"/>
 	<cpu id="cpu8088" model="8088"/>
 	<ram id="ramLow" addr="0x00000" test="false"/>
 	<rom id="romHDC" addr="0xc8000" size="0x2000" file="/devices/pc/hdc/ibm-xebec-1982.json"/>
-	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/basic/ibm-basic-1.10.json"/>
+	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/rom/5160/basic/BASIC110.json"/>
-	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/bios/5160/1982-11-08.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/mda/ibm-mda.xml"/>
 	<keyboard ref="/devices/pc/keyboard/keyboard-minimal.xml"/>
 	<debugger id="debugger"/>
 	<panel ref="/devices/pc/panel/wide.xml"/>
-	<fdc ref="/disks/pc/library.xml" width="320px"/>
+	<fdc ref="/disks/pc/compiled/library.xml" width="320px"/>
 	<chipset id="chipset" model="5160" sw1="01000001"/>
 	<hdc id="hdcXT" drives='[{name:"10Mb Hard Disk",type:3}]'/>
 </machine>

devices/pc/machine/5160/mda/256kb/fake188/debugger/machine.xml

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet type="text/xsl" href="/versions/pcjs/1.20.7/machine.xsl"?>
+<?xml-stylesheet type="text/xsl" href="/versions/pcjs/1.20.8/machine.xsl"?>
 <machine id="ibm5160" class="pc" border="1" width="740px" pos="center" background="#FAEBD7">
 	<name pos="center">IBM PC XT (Model 5160), MDA, 256Kb, 10Mb Drive</name>
 	<computer id="xt188-mda-256k" name="IBM PC XT"/>
 	<cpu id="cpu80188" model="80188"/>
 	<ram id="ramLow" addr="0x00000" test="false"/>
 	<rom id="romHDC" addr="0xc8000" size="0x2000" file="/devices/pc/hdc/ibm-xebec-1982.json"/>
-	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/basic/ibm-basic-1.10.json"/>
+	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/rom/5160/basic/BASIC110.json"/>
-	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/bios/5160/1982-11-08.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/mda/ibm-mda.xml"/>
 	<keyboard ref="/devices/pc/keyboard/keyboard-minimal.xml"/>
 	<debugger id="debugger"/>

devices/pc/machine/5160/mda/256kb/fake188/machine.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet type="text/xsl" href="/versions/pcjs/1.20.7/machine.xsl"?>
+<?xml-stylesheet type="text/xsl" href="/versions/pcjs/1.20.8/machine.xsl"?>
 <machine id="ibm5160" class="pc" border="1" pos="center" background="#FAEBD7">
 	<name pos="center">IBM PC XT (Model 5160), MDA, 256Kb, 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/pc/hdc/ibm-xebec-1982.json"/>
-	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/basic/ibm-basic-1.10.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/bios/5160/1982-11-08.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/mda/ibm-mda.xml"/>
 	<cpu id="cpu80188" model="80188" autostart="true" padleft="8px">
 		<control type="button" binding="run">Run</control>

devices/pc/machine/5160/mda/256kb/machine.md

@@ -1,6 +1,6 @@
 ---
 layout: page
-title: "IBM PC XT (Model 5160, 256Kb) with Monochrome Display"
+title: "IBM PC XT (Model 5160, 256Kb, 10Mb Drive) with Monochrome Display"
 permalink: /devices/pc/machine/5160/mda/256kb/
 machines:
   - type: pc

devices/pc/machine/5160/mda/256kb/machine.xml

@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet type="text/xsl" href="/versions/pcjs/1.20.7/machine.xsl"?>
+<?xml-stylesheet type="text/xsl" href="/versions/pcjs/1.20.8/machine.xsl"?>
 <machine id="ibm5160" class="pc" border="1" pos="center" background="#FAEBD7">
 	<name pos="center">IBM PC XT (Model 5160), MDA, 256Kb, 10Mb Drive</name>
 	<computer id="xt-mda-256k" name="IBM PC XT"/>
 	<cpu id="cpu8088" model="8088"/>
 	<ram id="ramLow" addr="0x00000" test="false"/>
 	<rom id="romHDC" addr="0xc8000" size="0x2000" file="/devices/pc/hdc/ibm-xebec-1982.json"/>
-	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/basic/ibm-basic-1.10.json"/>
+	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/rom/5160/basic/BASIC110.json"/>
-	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/bios/5160/1982-11-08.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/mda/ibm-mda.xml"/>
 	<keyboard ref="/devices/pc/keyboard/keyboard-minimal.xml"/>
-	<fdc ref="/disks/pc/library.xml"/>
+	<fdc ref="/disks/pc/compiled/library.xml"/>
 	<chipset id="chipset" model="5160" sw1="01000001"/>
 	<hdc id="hdcXT" drives='[{name:"10Mb Hard Disk",type:3}]'/>
 </machine>

devices/pc/machine/5160/mda/64kb/softkbd/machine.md

@@ -1,6 +1,6 @@
 ---
 layout: page
-title: "IBM PC XT (Model 5160, 64Kb) with Monochrome Display and Soft Keyboard"
+title: "IBM PC XT (Model 5160, 64Kb, 10Mb Drive) with Monochrome Display and Soft Keyboard"
 permalink: /devices/pc/machine/5160/mda/64kb/softkbd/
 machines:
   - type: pc-dbg

devices/pc/machine/5160/mda/64kb/softkbd/machine.xml

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet type="text/xsl" href="/versions/pcjs/1.20.7/machine.xsl"?>
+<?xml-stylesheet type="text/xsl" href="/versions/pcjs/1.20.8/machine.xsl"?>
 <machine id="ibm5160" class="pc" border="1" width="1000px" pos="center" background="white">
 	<name>IBM PC XT (Model 5160), MDA, 64K, 10Mb Drive</name>
 	<computer id="xt-mda-64k" name="IBM PC XT"/>
 	<cpu id="cpu8088" model="8088"/>
 	<ram id="ramLow" addr="0x00000"/>
 	<rom id="romHDC" addr="0xc8000" size="0x2000" file="/devices/pc/hdc/ibm-xebec-1982.json"/>
-	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/basic/ibm-basic-1.10.json"/>
+	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/rom/5160/basic/BASIC110.json"/>
-	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/bios/5160/1982-11-08.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/mda/ibm-mda.xml"/>
 	<keyboard ref="/devices/pc/keyboard/keyboard-us83.xml"/>
 	<debugger id="debugger"/>

devices/pc/machine/5160/mda/README.md

@@ -0,0 +1,14 @@
+---
+layout: page
+title: IBM PC Machines (Model 5160) with Monochrome (MDA) Display
+permalink: /devices/pc/machine/5160/mda/
+---
+
+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/)

devices/pc/machine/5170/ega/1152kb/rev1/debugger/machine.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet type="text/xsl" href="/versions/pcjs/1.20.7/machine.xsl"?>
+<?xml-stylesheet type="text/xsl" href="/versions/pcjs/1.20.8/machine.xsl"?>
 <machine id="ibm5170" class="pc" border="1" pos="center" background="#FAEBD7">
 	<name pos="center">IBM PC AT (6Mhz), 128Kb EGA, 1152Kb RAM, 20Mb Hard Disk</name>
 	<computer id="at-ega-1152k-rev1" name="IBM PC AT" buswidth="24"/>
@@ -7,12 +7,12 @@
 	<ram id="ramLow" addr="0x00000" test="false" size="0xa0000" comment="ROM BIOS memory test has been disabled"/>
 	<ram id="ramExt" addr="0x100000" size="0x80000" comment=""/>
 	<rom id="romEGA" addr="0xc0000" size="0x4000" file="/devices/pc/video/ibm/ega/ibm-ega.json" notify="videoEGA"/>
-	<rom id="romBIOS" addr="0xf0000" size="0x10000" alias="0xff0000" file="/devices/pc/bios/5170/1984-01-10.json"/>
+	<rom id="romBIOS" addr="0xf0000" size="0x10000" alias="0xff0000" file="/devices/pc/rom/5170/bios/1984-01-10/ATBIOS-REV1.json"/>
 	<video ref="/devices/pc/video/ibm/ega/ibm-ega-128kb-autolockfs.xml"/>
 	<keyboard ref="/devices/pc/keyboard/keyboard-minimal-functions.xml"/>
 	<debugger id="debugger" messages="fault" commands=""/>
 	<panel ref="/devices/pc/panel/wide.xml"/>
-	<fdc ref="/disks/pc/library.xml" width="340px" automount='{A: {name: "PC-DOS 3.00 (Disk 1)", path: "/disks/pc/dos/ibm/3.00/PCDOS300-DISK1.json"}, B: {name: "PC-DOS 3.00 (Disk 2)", path: "/disks/pc/dos/ibm/3.00/PCDOS300-DISK2.json"}}'/>
+	<fdc ref="/disks/pc/compiled/library.xml" width="340px" automount='{A: {name: "PC-DOS 3.00 (Disk 1)", path: "/disks/pc/dos/ibm/3.00/PCDOS300-DISK1.json"}, B: {name: "PC-DOS 3.00 (Disk 2)", path: "/disks/pc/dos/ibm/3.00/PCDOS300-DISK2.json"}}'/>
 	<hdc id="hdcAT" type="at" drives='[{name:"20Mb Hard Disk",type:2}]'/>
 	<chipset id="chipset" model="5170" floppies="[1200,1200]"/>
 	<serial id="com1" adapter="1"/>

devices/pc/machine/5170/ega/1152kb/rev3/debugger/backtrack/machine.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet type="text/xsl" href="/versions/pcjs/1.20.7/machine.xsl"?>
+<?xml-stylesheet type="text/xsl" href="/versions/pcjs/1.20.8/machine.xsl"?>
 <machine id="ibm5170rev3" class="pc" border="1" pos="center" background="#FAEBD7">
 	<name pos="center">IBM PC AT (8Mhz), 128Kb EGA, 1152Kb RAM, 20Mb Hard Disk</name>
 	<computer id="at-ega-1152k-rev3" name="IBM PC AT" buswidth="24"/>
@@ -7,11 +7,11 @@
 	<ram id="ramLow" addr="0x00000" test="true" size="0xa0000" comment="ROM BIOS memory test has been disabled"/>
 	<ram id="ramExt" addr="0x100000" size="0x80000" comment=""/>
 	<rom id="romEGA" addr="0xc0000" size="0x4000" file="/devices/pc/video/ibm/ega/ibm-ega.json" notify="videoEGA"/>
-	<rom id="romBIOS" addr="0xf0000" size="0x10000" alias="0xff0000" file="/devices/pc/bios/5170/1985-11-15.json"/>
+	<rom id="romBIOS" addr="0xf0000" size="0x10000" alias="0xff0000" file="/devices/pc/rom/5170/bios/1985-11-15/ATBIOS-REV3.json"/>
 	<video ref="/devices/pc/video/ibm/ega/ibm-ega-128kb-autolockfs.xml"/>
 	<keyboard ref="/devices/pc/keyboard/keyboard-minimal-functions.xml"/>
 	<debugger id="debugger" messages="fault" commands=""/>
-	<fdc ref="/disks/pc/library.xml" automount='{A: {name: "PC-DOS 3.20 (Disk 1)", path: "/disks/pc/dos/ibm/3.20/PCDOS320-DISK1.json"}, B: {name: "PC-DOS 3.20 (Disk 2)", path: "/disks/pc/dos/ibm/3.20/PCDOS320-DISK2.json"}}'/>
+	<fdc ref="/disks/pc/compiled/library.xml" automount='{A: {name: "PC-DOS 3.20 (Disk 1)", path: "/disks/pc/dos/ibm/3.20/PCDOS320-DISK1.json"}, B: {name: "PC-DOS 3.20 (Disk 2)", path: "/disks/pc/dos/ibm/3.20/PCDOS320-DISK2.json"}}'/>
 	<panel ref="/devices/pc/panel/btpanel.xml"/>
 	<hdc id="hdcAT" type="at" drives='[{name:"20Mb Hard Disk",type:2}]'/>
 	<chipset id="chipset" model="5170" floppies="[1440,1200]" monitor="ega"/>

devices/pc/machine/5170/ega/1152kb/rev3/debugger/machine.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet type="text/xsl" href="/versions/pcjs/1.20.7/machine.xsl"?>
+<?xml-stylesheet type="text/xsl" href="/versions/pcjs/1.20.8/machine.xsl"?>
 <machine id="ibm5170" class="pc" border="1" pos="center" background="#FAEBD7">
 	<name pos="center">IBM PC AT (8Mhz), 128Kb EGA, 1152Kb RAM, 20Mb Hard Disk</name>
 	<computer id="at-ega-1152k-rev3" name="IBM PC AT" buswidth="24"/>
@@ -7,12 +7,12 @@
 	<ram id="ramLow" addr="0x00000" test="false" size="0xa0000" comment="ROM BIOS memory test has been disabled"/>
 	<ram id="ramExt" addr="0x100000" size="0x80000" comment=""/>
 	<rom id="romEGA" addr="0xc0000" size="0x4000" file="/devices/pc/video/ibm/ega/ibm-ega.json" notify="videoEGA"/>
-	<rom id="romBIOS" addr="0xf0000" size="0x10000" alias="0xff0000" file="/devices/pc/bios/5170/1985-11-15.json"/>
+	<rom id="romBIOS" addr="0xf0000" size="0x10000" alias="0xff0000" file="/devices/pc/rom/5170/bios/1985-11-15/ATBIOS-REV3.json"/>
 	<video ref="/devices/pc/video/ibm/ega/ibm-ega-128kb-autolockfs.xml"/>
-	<keyboard ref="/devices/pc/keyboard/keyboard-minimal-sysreq.xml"/>
+	<keyboard ref="/devices/pc/keyboard/keyboard-minimal-arrows.xml"/>
 	<debugger id="debugger" messages="fault" commands=""/>
 	<panel ref="/devices/pc/panel/wide.xml"/>
-	<fdc ref="/disks/pc/library.xml" automount='{A: {name: "PC-DOS 3.20 (Disk 1)", path: "/disks/pc/dos/ibm/3.20/PCDOS320-DISK1.json"}, B: {name: "PC-DOS 3.20 (Disk 2)", path: "/disks/pc/dos/ibm/3.20/PCDOS320-DISK2.json"}}'/>
+	<fdc ref="/disks/pc/compiled/library.xml" automount='{A: {name: "PC-DOS 3.20 (Disk 1)", path: "/disks/pc/dos/ibm/3.20/PCDOS320-DISK1.json"}, B: {name: "PC-DOS 3.20 (Disk 2)", path: "/disks/pc/dos/ibm/3.20/PCDOS320-DISK2.json"}}'/>
 	<hdc id="hdcAT" type="at" drives='[{name:"20Mb Hard Disk",type:2}]'/>
 	<chipset id="chipset" model="5170" floppies="[1440,1200]"/>
 	<serial id="com1" adapter="1"/>

devices/pc/machine/5170/ega/640kb/rev1/debugger/machine.xml

@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet type="text/xsl" href="/versions/pcjs/1.20.7/machine.xsl"?>
+<?xml-stylesheet type="text/xsl" href="/versions/pcjs/1.20.8/machine.xsl"?>
 <machine id="ibm5170" class="pc" border="1" pos="center" background="#FAEBD7">
 	<name pos="center">IBM PC AT, 128K EGA, 640K RAM</name>
 	<computer id="at-ega-640k" name="IBM PC AT" buswidth="24"/>
 	<cpu id="cpu286" model="80286"/>
 	<ram id="ramLow" addr="0x00000" size="0xa0000"/>
 	<rom id="romEGA" addr="0xc0000" size="0x4000" file="/devices/pc/video/ibm/ega/ibm-ega.json" notify="videoEGA"/>
-	<rom id="romBIOS" addr="0xf0000" size="0x10000" alias="0xff0000" file="/devices/pc/bios/5170/1984-01-10.json"/>
+	<rom id="romBIOS" addr="0xf0000" size="0x10000" alias="0xff0000" file="/devices/pc/rom/5170/bios/1984-01-10/ATBIOS-REV1.json"/>
 	<video ref="/devices/pc/video/ibm/ega/ibm-ega-128kb-autolockfs.xml"/>
 	<keyboard ref="/devices/pc/keyboard/keyboard-minimal-functions.xml"/>
 	<debugger id="debugger" messages="fault" commands=""/>
 	<panel ref="/devices/pc/panel/wide.xml"/>
-	<fdc ref="/disks/pc/library.xml" width="340px" automount='{A: {name: "PC-DOS 3.00 (Disk 1)", path: "/disks/pc/dos/ibm/3.00/PCDOS300-DISK1.json"}, B: {name: "PC-DOS 3.00 (Disk 2)", path: "/disks/pc/dos/ibm/3.00/PCDOS300-DISK2.json"}}'/>
+	<fdc ref="/disks/pc/compiled/library.xml" width="340px" automount='{A: {name: "PC-DOS 3.00 (Disk 1)", path: "/disks/pc/dos/ibm/3.00/PCDOS300-DISK1.json"}, B: {name: "PC-DOS 3.00 (Disk 2)", path: "/disks/pc/dos/ibm/3.00/PCDOS300-DISK2.json"}}'/>
 	<chipset id="chipset" model="5170" floppies="[1200,1200]"/>
 	<serial id="com1" adapter="1"/>
 	<serial id="com2" adapter="2" binding="print"/>

devices/pc/machine/5170/ega/640kb/rev1/debugger/manifest.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet type="text/xsl" href="/versions/pcjs/1.20.7/manifest.xsl"?>
+<?xml-stylesheet type="text/xsl" href="/versions/pcjs/1.20.8/manifest.xsl"?>
 <manifest type="document">
 	<title>IBM PC AT References</title>
 	<document href="http://minuszerodegrees.net/manuals/IBM_5170_Technical_Reference_1502243_MAR84.pdf">

devices/pc/machine/5170/ega/640kb/rev1/machine.xml

@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet type="text/xsl" href="/versions/pcjs/1.20.7/machine.xsl"?>
+<?xml-stylesheet type="text/xsl" href="/versions/pcjs/1.20.8/machine.xsl"?>
 <machine id="ibm5170" class="pc" border="1" pos="center" background="#FAEBD7">
 	<name pos="center">IBM PC AT, 128K EGA, 640K RAM</name>
 	<computer id="at-ega-640k" name="IBM PC AT" buswidth="24"/>
 	<cpu id="cpu286" model="80286"/>
 	<ram id="ramLow" addr="0x00000" size="0xa0000"/>
 	<rom id="romEGA" addr="0xc0000" size="0x4000" file="/devices/pc/video/ibm/ega/ibm-ega.json" notify="videoEGA"/>
-	<rom id="romBIOS" addr="0xf0000" size="0x10000" alias="0xff0000" file="/devices/pc/bios/5170/1984-01-10.json"/>
+	<rom id="romBIOS" addr="0xf0000" size="0x10000" alias="0xff0000" file="/devices/pc/rom/5170/bios/1984-01-10/ATBIOS-REV1.json"/>
 	<video ref="/devices/pc/video/ibm/ega/ibm-ega-128kb-autolockfs.xml"/>
 	<keyboard ref="/devices/pc/keyboard/keyboard-minimal.xml"/>
-	<fdc ref="/disks/pc/library.xml" pos="right" automount='{A: {name: "MS-DOS 4.00 (Disk 1)", path: "/disks/pc/dos/microsoft/4.00/MSDOS400-DISK1.json"}}'/>
+	<fdc ref="/disks/pc/compiled/library.xml" pos="right" automount='{A: {name: "MS-DOS 4.00 (Disk 1)", path: "/disks/pc/dos/microsoft/4.00/MSDOS400-DISK1.json"}}'/>
 	<chipset id="chipset" model="5170" floppies="[1200,1200]"/>
 	<serial id="com1" adapter="1"/>
 	<serial id="com2" adapter="2" binding="print"/>

devices/pc/machine/README.md

@@ -2,8 +2,10 @@
 layout: page
 title: Machine Configurations
 menu_title: Machines
-menu_order: 5
+menu_order: 6
 permalink: /devices/pc/machine/
+redirect_from:
+  - /configs/pc/machines/
 ---
 
 IBM PC Machine Configurations
@@ -59,43 +61,44 @@ From there, you can load another disk image
 
 ### Model 5150 Machine Configurations
 
-* [IBM PC, MDA, 64K](/devices/pc/machine/5150/mda/64kb/)
+Our pre-built [Model 5150](/devices/pc/machine/5150/) machines include:
-* [IBM PC, MDA, 64K, Debugger](/devices/pc/machine/5150/mda/64kb/debugger/)
+
-* [IBM PC, CGA, 64K, DONKEY.BAS](/devices/pc/machine/5150/cga/64kb/donkey/)
+* [IBM PC (64Kb) with Color Display](/devices/pc/machine/5150/cga/64kb/donkey/)
-* [IBM PC, CGA, 64K, DONKEY.BAS, Debugger](/devices/pc/machine/5150/cga/64kb/donkey/debugger/)
+* [IBM PC (64Kb) with Color Display and Debugger](/devices/pc/machine/5150/cga/64kb/donkey/debugger/)
-* [IBM PC, Dual Display, 64K](/devices/pc/machine/5150/dual/64kb/)
+* [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/)
 
 ### Model 5160 Machine Configurations
 
-* [IBM PC XT, MDA, 256K, 10Mb Drive](/devices/pc/machine/5160/mda/256kb/)
+Our pre-built [Model 5160](/devices/pc/machine/5160/) machines include:
-* [IBM PC XT, MDA, 256K, 10Mb Drive, Debugger](/devices/pc/machine/5160/mda/256kb/debugger/)
+
-* [IBM PC XT, CGA, 256K, 10Mb Drive](/devices/pc/machine/5160/cga/256kb/demo/)
+* [IBM PC XT (64Kb, 10Mb Drive) with Monochrome Display and Soft Keyboard](/devices/pc/machine/5160/mda/64kb/softkbd/)
-* [IBM PC XT, CGA, 256K, 10Mb Drive, Debugger](/devices/pc/machine/5160/cga/256kb/demo/debugger/)
+* [IBM PC XT (256Kb, 10Mb Drive) with Monochrome Display](/devices/pc/machine/5160/mda/256kb/)
-* [IBM PC XT, CGA, 256K, Windows 1.01](/devices/pc/machine/5160/cga/256kb/win101/)
+* [IBM PC XT (256Kb, 10Mb Drive) with Color Display](/devices/pc/machine/5160/cga/256kb/demo/)
-* [IBM PC XT, CGA, 256K, Windows 1.01, Debugger](/devices/pc/machine/5160/cga/256kb/win101/debugger/)
+* [IBM PC XT (256Kb, 10Mb Drive) with Color Display and Debugger](/devices/pc/machine/5160/cga/256kb/demo/debugger/)
-* [IBM PC XT, CGA, 640K, 10Mb Drive](/devices/pc/machine/5160/cga/640kb/)
+* [IBM PC XT (256Kb, 10Mb Drive) with Color Display and Soft Keyboard](/devices/pc/machine/5160/cga/256kb/softkbd/)
-* [IBM PC XT, CGA, 640K, 10Mb Drive, Debugger](/devices/pc/machine/5160/cga/640kb/debugger/)
+* [IBM PC XT (256Kb, 10Mb Drive) with Color Display running Windows 1.01](/devices/pc/machine/5160/cga/256kb/win101/)
-* [IBM PC XT, CGA, 640K, Multitasking MS-DOS 4.00](/devices/pc/machine/5160/cga/640kb/dos400m/)
+* [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, CGA "Server Array" Demo](/devices/pc/machine/5160/cga/256kb/array/)
+* [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, EGA, 256K, 10Mb Drive, Debugger](/devices/pc/machine/5160/ega/256kb/debugger/)
+* [IBM PC XT (256Kb, 10Mb Drive) Machine Array with CGA Displays](/devices/pc/machine/5160/cga/256kb/array/)
-* [IBM PC XT, EGA, 640K, 10Mb Drive](/devices/pc/machine/5160/ega/640kb/)
+* [IBM PC XT (256Kb, 10Mb Drive) with EGA Display and Debugger](/devices/pc/machine/5160/ega/256kb/debugger/)
-* [IBM PC XT, EGA, 640K, 10Mb Drive, Debugger](/devices/pc/machine/5160/ega/640kb/debugger/)
+* [IBM PC XT (256Kb, 10Mb Drive) with Monochrome Display and Debugger](/devices/pc/machine/5160/mda/256kb/debugger/)
-* [IBM PC XT, EGA, 640K, Windows 1.01](/devices/pc/machine/5160/ega/640kb/win101/)
+* [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, EGA, 640K, Windows 1.01, Debugger](/devices/pc/machine/5160/ega/640kb/win101/debugger/)
+* [IBM PC XT (640Kb, 10Mb Drive) with Color Display](/devices/pc/machine/5160/cga/640kb/)
-* [IBM PC XT, EGA "Server Array" Demo](/devices/pc/machine/5160/ega/640kb/array/)
+* [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 (640Kb, 10Mb Drive) Machine Array with EGA Displays](/devices/pc/machine/5160/ega/640kb/array/)
 
 ### Model 5170 Machine Configurations
 
 * [IBM PC AT (6Mhz), EGA, 640K, Debugger](/devices/pc/machine/5170/ega/640kb/rev1/debugger/)
 * [IBM PC AT (6Mhz), EGA, 1152Kb, 20Mb Drive, Debugger](/devices/pc/machine/5170/ega/1152kb/rev1/debugger/)
 * [IBM PC AT (8Mhz), EGA, 1152Kb, 20Mb Drive, Debugger](/devices/pc/machine/5170/ega/1152kb/rev3/debugger/)
-
-### Machine Configurations with "Soft Keyboards"
-
-* [IBM PC, MDA, 64K](/devices/pc/machine/5150/mda/64kb/softkbd/)
-* [IBM PC, CGA, 64K](/devices/pc/machine/5150/cga/64kb/softkbd/)
-* [IBM PC, CGA, 384K](/devices/pc/machine/5150/cga/384kb/softkbd/)
-* [IBM PC XT, MDA, 64K, 10Mb Drive](/devices/pc/machine/5160/mda/64kb/softkbd/)
-* [IBM PC XT, CGA, 256K, 10Mb Drive](/devices/pc/machine/5160/cga/256kb/softkbd/)
-* [IBM PC XT, CGA, 256K, Windows 1.01](/devices/pc/machine/5160/cga/256kb/win101/softkbd/)
-* [IBM PC XT, CGA, 512K, Windows 1.01](/devices/pc/machine/5160/cga/512kb/win101/softkbd/)

devices/pc/machine/compaq/deskpro386/README.md

@@ -7,6 +7,7 @@ permalink: /devices/pc/machine/compaq/deskpro386/
 Compaq DeskPro 386 Machines
 ---
 
-* [Compaq DeskPro 386 with EGA, 2Mb RAM](ega/2048kb/)
+* [Compaq DeskPro 386 with 128Kb EGA and 2Mb RAM](ega/2048kb/)
-* [Compaq DeskPro 386 with VGA, 2Mb RAM](vga/2048kb/)
+* [Compaq DeskPro 386 with 256Kb EGA and 4Mb RAM](ega/4096kb/)
-* [Compaq DeskPro 386 with VGA, 4Mb RAM, running Windows 95](vga/4096kb/)
+* [Compaq DeskPro 386 with VGA and 2Mb RAM](vga/2048kb/)
+* [Compaq DeskPro 386 with VGA and 4Mb RAM, running Windows 95](vga/4096kb/)