diff --git a/README.md b/README.md
index 3857565cd..ca1126540 100644
--- a/README.md
+++ b/README.md
@@ -5,10 +5,10 @@ Welcome to PCjs, home of [PCx86](/docs/pcx86/), the original IBM PC simulation t
one of several JavaScript Machines in the [PCjs Project](https://github.com/jeffpar/pcjs), an open-source project that
includes:
-* [PCx86](/docs/pcx86/), an x86-based IBM PC and PC-compatible emulator
-* [PC8080](/modules/pc8080/), an 8080 machine emulator (e.g., [Space Invaders](/devices/pc8080/machine/invaders/), [VT100 Terminal](/devices/pc8080/machine/vt100/))
+* [PCx86](/docs/pcx86/), an x86-based emulator of [IBM PC and PC-compatible Machines](/devices/pcx86/machine/)
+* [PC8080](/modules/pc8080/), an 8080 machine emulator (e.g., [Space Invaders](/devices/pc8080/machine/invaders/) and the [VT100 Terminal](/devices/pc8080/machine/vt100/))
* [C1Pjs](/docs/c1pjs/), an emulation of the 6502-based [Ohio Scientific Challenger 1P](/devices/c1p/)
-* [PDPjs](/modules/pdp11/), a PDP-11 emulator currently in development (e.g., [PDP-11/20](/devices/pdp11/machine/1120/), [PDP-11/45](/devices/pdp11/machine/1145/), [PDP-11/70](/devices/pdp11/machine/1170/))
+* [PDPjs](/modules/pdp11/), a [PDP-11 Machine](/devices/pdp11/machine/) emulator that supports the [PDP-11/20](/devices/pdp11/machine/1120/), [PDP-11/45](/devices/pdp11/machine/1145/), and [PDP-11/70](/devices/pdp11/machine/1170/)
All PCjs machine simulations are written entirely in [JavaScript](/modules/). No Flash, Java or other plugins are
required. Supported browsers include modern versions of Chrome, Safari, Firefox, Internet Explorer (v9.0 and up), Edge,
diff --git a/_posts/2016-12-30-out-with-the-old-in-with-ecmascript-2015.md b/_posts/2016-12-30-out-with-the-old-in-with-ecmascript-2015.md
index 3da568fab..ae546a781 100644
--- a/_posts/2016-12-30-out-with-the-old-in-with-ecmascript-2015.md
+++ b/_posts/2016-12-30-out-with-the-old-in-with-ecmascript-2015.md
@@ -84,10 +84,10 @@ apparently Google's Closure Compiler seized the ES6 opportunity to try to enforc
the default is `@struct`. Needless to say, when it came time to convert the next machine (PC8080) to classes, I prefaced
all my classes with `@unrestricted`.
-One downside of switching to ES6 one machine at a time is that, for now, I've had to fork the shared modules into
+One downside of switching to ES6 one machine at a time is that I had to temporarily fork the shared modules into
separate ES5 and ES6 folders. For example, one of the shared modules, [Component](/modules/shared/lib/component.js),
is the base class underlying most other machine components; ES5 objects *subclass* [Component](/modules/shared/lib/component.js),
-whereas ES6 classes *extend* [Component](/modules/shared/es6/component.js). Not all the shared modules needed to be forked,
+whereas ES6 classes *extend* [Component](/modules/shared/lib/component.js). Not all the shared modules needed to be forked,
but creating a new shared folder was the simplest solution. Once all the machines have been converted to use ES6 classes,
the new shared modules will become the default, and the old ones will fade away.
diff --git a/_posts/2017-01-31-completing-the-switch-to-es6-classes.md b/_posts/2017-01-31-completing-the-switch-to-es6-classes.md
new file mode 100644
index 000000000..665f19379
--- /dev/null
+++ b/_posts/2017-01-31-completing-the-switch-to-es6-classes.md
@@ -0,0 +1,70 @@
+---
+layout: post
+title: Completing the Switch to ES6 Classes
+date: 2017-01-31 15:00:00
+permalink: /blog/2017/01/31/
+---
+
+As I [mentioned](/blog/2016/12/30/) last December, I had started converting PCjs machines to ECMAScript 2015, more
+conveniently known as ES6. At the time, only one PCjs machine, [PDPjs](/modules/pdp11/), had been converted, which
+left the website in the unfortunate position of having duplicate shared modules: one set for ES5-based machines
+and another set for ES6.
+
+Well, I'm happy to report that today marks the completion of the ES6 conversion, and the return of a single set of
+[shared modules](/modules/shared/lib/).
+
+Admittedly, I was dragging my feet a bit, because the largest and most complex machine emulator, [PCx86](/modules/pcx86/),
+was going to require a fair bit work, not to mention regression testing. However, after converting three other
+PCjs machines ([PDPjs](/modules/pdp11/), [PC8080](/modules/pc8080/), and [C1Pjs](/modules/c1pjs/)), I had become
+pretty proficient at the conversion, so I was able to bulldoze my way through all the PCx86 files in a few hours,
+and fixing all the Closure Compiler compilation errors only took another hour or so.
+
+It's hard to say whether the conversion was really worth the effort, since I'm still using the Closure Compiler to
+transpile the code back to ES5. Also, since two of the emulators ([PCx86](/modules/pcx86/) and [PDPjs](/modules/pdp11/))
+can also be launched from the Node command-line, I've adopted Node's *require()* convention for importing the other
+scripts as modules, which makes them difficult to load inside a web browser if you want to test or debug the uncompiled
+code.
+
+To resolve that, I updated the built-in Node web server to "magically" strip out all the Node-specific stuff before
+serving up the individual JavaScript files. Eventually, I'll change the Node server's page template to use
+`` instead of ``, but that won't happen until all
+web browsers support module loading AND Node fully supports *import* and *export* instead of *require()* and
+*module.exports*.
+
+I do like the new ES6 class syntax *much* more than the old prototype-based syntax. We've gone from JavaScript classes
+that were like "lipstick on a pig" to classes that are more like "lipstick on a piglet" -- still a pig, but much cuter.
+
+For years, JavaScript fans have been trying to convince us that "prototypal inheritance" was better and more powerful
+than traditional class-based inheritance models. As far as I'm concerned, object prototypes were a hack, and no amount
+of after-the-fact rationalizations will convince me that they were actually a thoughtfully designed feature of the
+language. Not to mention the fact that prototype-based classes are tedious to write and unpleasant to look at.
+
+Obviously, I was not alone, because we now have ES6 classes.
+
+Do I still have gripes? Sure. My biggest grumble is that I can't easily define class constants; I have to attach them
+to the class *after* I finish defining the class, and even then, I can't declare them as *const*. I guess there are
+ways to do it, such as:
+
+ Object.defineProperty(SampleClass, 'ANSWER', {
+ value: 42,
+ writable : false,
+ enumerable : true,
+ configurable : false
+ });
+
+But who in their right mind is going to write all that just to define a single numeric class constant? I would love to
+be able to add a class constant *inside* a class with a simple:
+
+ static const ANSWER = 42;
+
+Beyond ES6 classes, there are several other improvements I'd like to make to the PCjs code base, including more
+extensive use of:
+
+- [Default Parameters](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Functions/Default_parameters)
+- *[const](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Statements/const)* and *[let](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Statements/let)*
+- [Computed Properties](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/Object_initializer#Computed_property_names)
+
+Those changes will come, but on a more piece-meal basis, as code is visited.
+
+*[@jeffpar](http://twitter.com/jeffpar)*
+*Jan 31, 2017*
diff --git a/apps/pcx86/1981/visicalc/manifest.xml b/apps/pcx86/1981/visicalc/manifest.xml
index 9d529d30a..2681c3981 100644
--- a/apps/pcx86/1981/visicalc/manifest.xml
+++ b/apps/pcx86/1981/visicalc/manifest.xml
@@ -1,5 +1,5 @@
-
+
VisiCalc
diff --git a/apps/pcx86/1982/esuite/manifest.xml b/apps/pcx86/1982/esuite/manifest.xml
index 88fddc4b6..a9312ce87 100644
--- a/apps/pcx86/1982/esuite/manifest.xml
+++ b/apps/pcx86/1982/esuite/manifest.xml
@@ -1,5 +1,5 @@
-
+
Executive Suite
diff --git a/apps/pcx86/1985/rogue/manifest.xml b/apps/pcx86/1985/rogue/manifest.xml
index 23e3338a8..32a84d176 100644
--- a/apps/pcx86/1985/rogue/manifest.xml
+++ b/apps/pcx86/1985/rogue/manifest.xml
@@ -1,5 +1,5 @@
-
+
Rogue
diff --git a/apps/pcx86/1987/thinktank/manifest.xml b/apps/pcx86/1987/thinktank/manifest.xml
index 95cae3dc4..ad632a20c 100644
--- a/apps/pcx86/1987/thinktank/manifest.xml
+++ b/apps/pcx86/1987/thinktank/manifest.xml
@@ -1,5 +1,5 @@
-
+
ThinkTank
2.41NP
diff --git a/apps/pcx86/1988/moria/manifest.xml b/apps/pcx86/1988/moria/manifest.xml
index 7e4e39064..a71401b8a 100644
--- a/apps/pcx86/1988/moria/manifest.xml
+++ b/apps/pcx86/1988/moria/manifest.xml
@@ -1,5 +1,5 @@
-
+
The Dungeons of Moria
4.872
diff --git a/apps/pcx86/1992/moria/manifest.xml b/apps/pcx86/1992/moria/manifest.xml
index a723c049b..3a4064b5b 100644
--- a/apps/pcx86/1992/moria/manifest.xml
+++ b/apps/pcx86/1992/moria/manifest.xml
@@ -1,5 +1,5 @@
-
+
The Dungeons of Moria
5.5
diff --git a/devices/c1p/machine/32kb/machine.xml b/devices/c1p/machine/32kb/machine.xml
index b719dce5a..1ceb524d2 100644
--- a/devices/c1p/machine/32kb/machine.xml
+++ b/devices/c1p/machine/32kb/machine.xml
@@ -1,5 +1,5 @@
-
+
OSI Challenger 1P (32Kb) with Disk Support
diff --git a/devices/c1p/machine/8kb/all/debugger/machine.xml b/devices/c1p/machine/8kb/all/debugger/machine.xml
index 69e358303..be2cd25ef 100644
--- a/devices/c1p/machine/8kb/all/debugger/machine.xml
+++ b/devices/c1p/machine/8kb/all/debugger/machine.xml
@@ -1,5 +1,5 @@
-
+
OSI Challenger 1P (8Kb, Additional Software)
diff --git a/devices/c1p/machine/8kb/all/machine.xml b/devices/c1p/machine/8kb/all/machine.xml
index 5ac828f57..8798cd145 100644
--- a/devices/c1p/machine/8kb/all/machine.xml
+++ b/devices/c1p/machine/8kb/all/machine.xml
@@ -1,5 +1,5 @@
-
+
OSI Challenger 1P (8Kb, Additional Software)
diff --git a/devices/c1p/machine/8kb/array/machine.xml b/devices/c1p/machine/8kb/array/machine.xml
index 04fbc9b84..c7635394e 100644
--- a/devices/c1p/machine/8kb/array/machine.xml
+++ b/devices/c1p/machine/8kb/array/machine.xml
@@ -1,5 +1,5 @@
-
+
Challenger 1P (8Kb) "Server Array"
diff --git a/devices/c1p/machine/8kb/large/debugger/machine.xml b/devices/c1p/machine/8kb/large/debugger/machine.xml
index 9fc957425..6d7bc7924 100644
--- a/devices/c1p/machine/8kb/large/debugger/machine.xml
+++ b/devices/c1p/machine/8kb/large/debugger/machine.xml
@@ -1,5 +1,5 @@
-
+
OSI Challenger 1P (8Kb) with Debugger
diff --git a/devices/c1p/machine/8kb/large/machine.xml b/devices/c1p/machine/8kb/large/machine.xml
index 8b8d286df..a73ff0965 100644
--- a/devices/c1p/machine/8kb/large/machine.xml
+++ b/devices/c1p/machine/8kb/large/machine.xml
@@ -1,5 +1,5 @@
-
+
OSI Challenger 1P (circa 1978)
diff --git a/devices/c1p/machine/8kb/small/machine.xml b/devices/c1p/machine/8kb/small/machine.xml
index defeca50e..6e7397c30 100644
--- a/devices/c1p/machine/8kb/small/machine.xml
+++ b/devices/c1p/machine/8kb/small/machine.xml
@@ -1,5 +1,5 @@
-
+
diff --git a/devices/pc8080/machine/exerciser/machine-8080ex1.xml b/devices/pc8080/machine/exerciser/machine-8080ex1.xml
index 81a26f9a9..f12c12e31 100644
--- a/devices/pc8080/machine/exerciser/machine-8080ex1.xml
+++ b/devices/pc8080/machine/exerciser/machine-8080ex1.xml
@@ -1,5 +1,5 @@
-
+
8080 Exerciser Test Machine
diff --git a/devices/pc8080/machine/exerciser/machine-8080pre.xml b/devices/pc8080/machine/exerciser/machine-8080pre.xml
index c693a8d2e..183a2bfc9 100644
--- a/devices/pc8080/machine/exerciser/machine-8080pre.xml
+++ b/devices/pc8080/machine/exerciser/machine-8080pre.xml
@@ -1,5 +1,5 @@
-
+
8080 Exerciser Preliminary Test Machine
diff --git a/devices/pc8080/machine/exerciser/machine-cputest.xml b/devices/pc8080/machine/exerciser/machine-cputest.xml
index 3c05bdaac..45e0b4970 100644
--- a/devices/pc8080/machine/exerciser/machine-cputest.xml
+++ b/devices/pc8080/machine/exerciser/machine-cputest.xml
@@ -1,5 +1,5 @@
-
+
8080 CPUTEST Machine
diff --git a/devices/pc8080/machine/exerciser/machine-test.xml b/devices/pc8080/machine/exerciser/machine-test.xml
index 2208856b5..8893bbfd4 100644
--- a/devices/pc8080/machine/exerciser/machine-test.xml
+++ b/devices/pc8080/machine/exerciser/machine-test.xml
@@ -1,5 +1,5 @@
-
+
8080 "Kelly Smith" Test Machine
diff --git a/devices/pc8080/machine/exerciser/machine.xml b/devices/pc8080/machine/exerciser/machine.xml
index 81a26f9a9..f12c12e31 100644
--- a/devices/pc8080/machine/exerciser/machine.xml
+++ b/devices/pc8080/machine/exerciser/machine.xml
@@ -1,5 +1,5 @@
-
+
8080 Exerciser Test Machine
diff --git a/devices/pc8080/machine/invaders/debugger/machine.xml b/devices/pc8080/machine/invaders/debugger/machine.xml
index fd7caf9a4..6166b7033 100644
--- a/devices/pc8080/machine/invaders/debugger/machine.xml
+++ b/devices/pc8080/machine/invaders/debugger/machine.xml
@@ -1,5 +1,5 @@
-
+
Space Invaders
diff --git a/devices/pc8080/machine/invaders/machine.xml b/devices/pc8080/machine/invaders/machine.xml
index c26945133..57394e37e 100644
--- a/devices/pc8080/machine/invaders/machine.xml
+++ b/devices/pc8080/machine/invaders/machine.xml
@@ -1,5 +1,5 @@
-
+
Space Invaders
diff --git a/devices/pc8080/machine/vt100/debugger/machine-left.xml b/devices/pc8080/machine/vt100/debugger/machine-left.xml
index b04f5c980..d243d6859 100644
--- a/devices/pc8080/machine/vt100/debugger/machine-left.xml
+++ b/devices/pc8080/machine/vt100/debugger/machine-left.xml
@@ -1,5 +1,5 @@
-
+
VT100 Terminal
diff --git a/devices/pc8080/machine/vt100/debugger/machine-right.xml b/devices/pc8080/machine/vt100/debugger/machine-right.xml
index 1c8a16771..2dba8bd90 100644
--- a/devices/pc8080/machine/vt100/debugger/machine-right.xml
+++ b/devices/pc8080/machine/vt100/debugger/machine-right.xml
@@ -1,5 +1,5 @@
-
+
VT100 Terminal
diff --git a/devices/pc8080/machine/vt100/debugger/machine.xml b/devices/pc8080/machine/vt100/debugger/machine.xml
index 9f8873c13..43194cdec 100644
--- a/devices/pc8080/machine/vt100/debugger/machine.xml
+++ b/devices/pc8080/machine/vt100/debugger/machine.xml
@@ -1,5 +1,5 @@
-
+
VT100 Terminal
diff --git a/devices/pc8080/machine/vt100/machine-left.xml b/devices/pc8080/machine/vt100/machine-left.xml
index 3a1b280fb..7aaeec8b2 100644
--- a/devices/pc8080/machine/vt100/machine-left.xml
+++ b/devices/pc8080/machine/vt100/machine-left.xml
@@ -1,5 +1,5 @@
-
+
VT100 Terminal
diff --git a/devices/pc8080/machine/vt100/machine-right.xml b/devices/pc8080/machine/vt100/machine-right.xml
index e4a35c9c0..732ada8cf 100644
--- a/devices/pc8080/machine/vt100/machine-right.xml
+++ b/devices/pc8080/machine/vt100/machine-right.xml
@@ -1,5 +1,5 @@
-
+
VT100 Terminal
diff --git a/devices/pc8080/machine/vt100/machine.xml b/devices/pc8080/machine/vt100/machine.xml
index c483d9931..420c20504 100644
--- a/devices/pc8080/machine/vt100/machine.xml
+++ b/devices/pc8080/machine/vt100/machine.xml
@@ -1,5 +1,5 @@
-
+
VT100 Terminal
diff --git a/devices/pcx86/machine/5150/cga/384kb/softkbd/machine.xml b/devices/pcx86/machine/5150/cga/384kb/softkbd/machine.xml
index fd6a808d4..1d3784a26 100644
--- a/devices/pcx86/machine/5150/cga/384kb/softkbd/machine.xml
+++ b/devices/pcx86/machine/5150/cga/384kb/softkbd/machine.xml
@@ -1,5 +1,5 @@
-
+
IBM PC (Model 5150), CGA, 384K
diff --git a/devices/pcx86/machine/5150/cga/64kb/donkey/debugger/machine.xml b/devices/pcx86/machine/5150/cga/64kb/donkey/debugger/machine.xml
index a73b25edf..388310b2c 100644
--- a/devices/pcx86/machine/5150/cga/64kb/donkey/debugger/machine.xml
+++ b/devices/pcx86/machine/5150/cga/64kb/donkey/debugger/machine.xml
@@ -1,5 +1,5 @@
-
+
IBM PC (Model 5150), CGA, 64K
diff --git a/devices/pcx86/machine/5150/cga/64kb/donkey/machine.xml b/devices/pcx86/machine/5150/cga/64kb/donkey/machine.xml
index ce79fd4f4..9e3af207d 100644
--- a/devices/pcx86/machine/5150/cga/64kb/donkey/machine.xml
+++ b/devices/pcx86/machine/5150/cga/64kb/donkey/machine.xml
@@ -1,5 +1,5 @@
-
+
IBM PC (Model 5150), CGA, 64K
diff --git a/devices/pcx86/machine/5150/cga/64kb/softkbd/machine.xml b/devices/pcx86/machine/5150/cga/64kb/softkbd/machine.xml
index 1f93e3a85..4c865ae94 100644
--- a/devices/pcx86/machine/5150/cga/64kb/softkbd/machine.xml
+++ b/devices/pcx86/machine/5150/cga/64kb/softkbd/machine.xml
@@ -1,5 +1,5 @@
-
+
IBM PC (Model 5150), CGA, 64K
diff --git a/devices/pcx86/machine/5150/dual/64kb/machine.xml b/devices/pcx86/machine/5150/dual/64kb/machine.xml
index 6ab09ced9..ac0e10b8e 100644
--- a/devices/pcx86/machine/5150/dual/64kb/machine.xml
+++ b/devices/pcx86/machine/5150/dual/64kb/machine.xml
@@ -1,5 +1,5 @@
-
+
IBM PC (Model 5150) with Dual Displays
diff --git a/devices/pcx86/machine/5150/mda/64kb/debugger/machine.xml b/devices/pcx86/machine/5150/mda/64kb/debugger/machine.xml
index af543c43e..58cb8dd17 100644
--- a/devices/pcx86/machine/5150/mda/64kb/debugger/machine.xml
+++ b/devices/pcx86/machine/5150/mda/64kb/debugger/machine.xml
@@ -1,5 +1,5 @@
-
+
IBM PC (Model 5150) with Monochrome Display
diff --git a/devices/pcx86/machine/5150/mda/64kb/machine.xml b/devices/pcx86/machine/5150/mda/64kb/machine.xml
index 1c50b843a..4adbdba1f 100644
--- a/devices/pcx86/machine/5150/mda/64kb/machine.xml
+++ b/devices/pcx86/machine/5150/mda/64kb/machine.xml
@@ -1,5 +1,5 @@
-
+
IBM PC (Model 5150) with Monochrome Display
diff --git a/devices/pcx86/machine/5150/mda/64kb/softkbd/machine.xml b/devices/pcx86/machine/5150/mda/64kb/softkbd/machine.xml
index 840772541..73f862f25 100644
--- a/devices/pcx86/machine/5150/mda/64kb/softkbd/machine.xml
+++ b/devices/pcx86/machine/5150/mda/64kb/softkbd/machine.xml
@@ -1,5 +1,5 @@
-
+
IBM PC (Model 5150), MDA, 64K
diff --git a/devices/pcx86/machine/5160/cga/256kb/array/machine.xml b/devices/pcx86/machine/5160/cga/256kb/array/machine.xml
index b38ddf62a..31a401270 100644
--- a/devices/pcx86/machine/5160/cga/256kb/array/machine.xml
+++ b/devices/pcx86/machine/5160/cga/256kb/array/machine.xml
@@ -1,5 +1,5 @@
-
+
IBM PC XT (Model 5160), CGA, 256K, 10Mb Drive
diff --git a/devices/pcx86/machine/5160/cga/256kb/demo/debugger/machine.xml b/devices/pcx86/machine/5160/cga/256kb/demo/debugger/machine.xml
index cbf3d62e3..f45bedbd9 100644
--- a/devices/pcx86/machine/5160/cga/256kb/demo/debugger/machine.xml
+++ b/devices/pcx86/machine/5160/cga/256kb/demo/debugger/machine.xml
@@ -1,5 +1,5 @@
-
+
IBM PC XT (Model 5160), CGA, 256Kb, 10Mb Drive
diff --git a/devices/pcx86/machine/5160/cga/256kb/demo/machine.xml b/devices/pcx86/machine/5160/cga/256kb/demo/machine.xml
index a8ce87caa..04a787c11 100644
--- a/devices/pcx86/machine/5160/cga/256kb/demo/machine.xml
+++ b/devices/pcx86/machine/5160/cga/256kb/demo/machine.xml
@@ -1,5 +1,5 @@
-
+
IBM PC XT (Model 5160), CGA, 256Kb, 10Mb Drive
diff --git a/devices/pcx86/machine/5160/cga/256kb/softkbd/machine.xml b/devices/pcx86/machine/5160/cga/256kb/softkbd/machine.xml
index e5c90f32a..28402d2a1 100644
--- a/devices/pcx86/machine/5160/cga/256kb/softkbd/machine.xml
+++ b/devices/pcx86/machine/5160/cga/256kb/softkbd/machine.xml
@@ -1,5 +1,5 @@
-
+
IBM PC XT (Model 5160), CGA, 256K, 10Mb Drive
diff --git a/devices/pcx86/machine/5160/cga/256kb/win101/debugger/machine.xml b/devices/pcx86/machine/5160/cga/256kb/win101/debugger/machine.xml
index 7ca92d629..e5bdae8d3 100644
--- a/devices/pcx86/machine/5160/cga/256kb/win101/debugger/machine.xml
+++ b/devices/pcx86/machine/5160/cga/256kb/win101/debugger/machine.xml
@@ -1,5 +1,5 @@
-
+
IBM PC XT (Model 5160) running Windows 1.01
diff --git a/devices/pcx86/machine/5160/cga/256kb/win101/machine.xml b/devices/pcx86/machine/5160/cga/256kb/win101/machine.xml
index 417b2dff6..1c81fe4ad 100644
--- a/devices/pcx86/machine/5160/cga/256kb/win101/machine.xml
+++ b/devices/pcx86/machine/5160/cga/256kb/win101/machine.xml
@@ -1,5 +1,5 @@
-
+
IBM PC XT (Model 5160) running Windows 1.01
diff --git a/devices/pcx86/machine/5160/cga/256kb/win101/softkbd/machine.xml b/devices/pcx86/machine/5160/cga/256kb/win101/softkbd/machine.xml
index c7c137b9f..2df481aa5 100644
--- a/devices/pcx86/machine/5160/cga/256kb/win101/softkbd/machine.xml
+++ b/devices/pcx86/machine/5160/cga/256kb/win101/softkbd/machine.xml
@@ -1,5 +1,5 @@
-
+
IBM PC XT (Model 5160), CGA, 256K, Windows 1.01
diff --git a/devices/pcx86/machine/5160/cga/512kb/win101/softkbd/machine.xml b/devices/pcx86/machine/5160/cga/512kb/win101/softkbd/machine.xml
index 48962a71d..f6e94bc90 100644
--- a/devices/pcx86/machine/5160/cga/512kb/win101/softkbd/machine.xml
+++ b/devices/pcx86/machine/5160/cga/512kb/win101/softkbd/machine.xml
@@ -1,5 +1,5 @@
-
+
IBM PC XT (Model 5160), CGA, 512K, WIN101
diff --git a/devices/pcx86/machine/5160/cga/640kb/debugger/machine.xml b/devices/pcx86/machine/5160/cga/640kb/debugger/machine.xml
index 057ba1a4f..1eae57dbf 100644
--- a/devices/pcx86/machine/5160/cga/640kb/debugger/machine.xml
+++ b/devices/pcx86/machine/5160/cga/640kb/debugger/machine.xml
@@ -1,5 +1,5 @@
-
+
IBM PC XT (Model 5160), CGA, 640K, 10Mb Drive
diff --git a/devices/pcx86/machine/5160/cga/640kb/machine.xml b/devices/pcx86/machine/5160/cga/640kb/machine.xml
index 2d23ace40..010786e63 100644
--- a/devices/pcx86/machine/5160/cga/640kb/machine.xml
+++ b/devices/pcx86/machine/5160/cga/640kb/machine.xml
@@ -1,5 +1,5 @@
-
+
IBM PC XT (Model 5160), CGA, 640K, 10Mb Drive
diff --git a/devices/pcx86/machine/5160/cga/640kb/softkbd/machine.xml b/devices/pcx86/machine/5160/cga/640kb/softkbd/machine.xml
index a03c03831..b0c60e9c5 100644
--- a/devices/pcx86/machine/5160/cga/640kb/softkbd/machine.xml
+++ b/devices/pcx86/machine/5160/cga/640kb/softkbd/machine.xml
@@ -1,5 +1,5 @@
-
+
IBM PC XT (Model 5160), CGA, 640K, 10Mb Drive
diff --git a/devices/pcx86/machine/5160/ega/256kb/debugger/machine.xml b/devices/pcx86/machine/5160/ega/256kb/debugger/machine.xml
index 03e99377b..06d13189d 100644
--- a/devices/pcx86/machine/5160/ega/256kb/debugger/machine.xml
+++ b/devices/pcx86/machine/5160/ega/256kb/debugger/machine.xml
@@ -1,5 +1,5 @@
-
+
IBM PC XT (Model 5160), 64K EGA, 256K RAM, 10Mb Hard Disk
diff --git a/devices/pcx86/machine/5160/ega/256kb/machine.xml b/devices/pcx86/machine/5160/ega/256kb/machine.xml
index 7dec5b8b5..f6c01ab39 100644
--- a/devices/pcx86/machine/5160/ega/256kb/machine.xml
+++ b/devices/pcx86/machine/5160/ega/256kb/machine.xml
@@ -1,5 +1,5 @@
-
+
IBM PC XT (Model 5160), 64K EGA, 256K RAM, 10Mb Hard Disk
diff --git a/devices/pcx86/machine/5160/ega/640kb/array/machine.xml b/devices/pcx86/machine/5160/ega/640kb/array/machine.xml
index 874e7b754..74f9faf95 100644
--- a/devices/pcx86/machine/5160/ega/640kb/array/machine.xml
+++ b/devices/pcx86/machine/5160/ega/640kb/array/machine.xml
@@ -1,5 +1,5 @@
-
+
IBM PC XT, 128K EGA, 640K RAM, 10Mb Hard Disk
diff --git a/devices/pcx86/machine/5160/ega/640kb/debugger/machine.xml b/devices/pcx86/machine/5160/ega/640kb/debugger/machine.xml
index 50ee66634..35a3045de 100644
--- a/devices/pcx86/machine/5160/ega/640kb/debugger/machine.xml
+++ b/devices/pcx86/machine/5160/ega/640kb/debugger/machine.xml
@@ -1,5 +1,5 @@
-
+
IBM PC XT, 128K EGA, 640K RAM, 10Mb Hard Disk
diff --git a/devices/pcx86/machine/5160/ega/640kb/machine.xml b/devices/pcx86/machine/5160/ega/640kb/machine.xml
index 2f5e44e7c..86143fcb5 100644
--- a/devices/pcx86/machine/5160/ega/640kb/machine.xml
+++ b/devices/pcx86/machine/5160/ega/640kb/machine.xml
@@ -1,5 +1,5 @@
-
+
IBM PC XT, 128K EGA, 640K RAM, 10Mb Hard Disk
diff --git a/devices/pcx86/machine/5160/mda/256kb/debugger/machine.xml b/devices/pcx86/machine/5160/mda/256kb/debugger/machine.xml
index 28e1e2baf..3218c53c1 100644
--- a/devices/pcx86/machine/5160/mda/256kb/debugger/machine.xml
+++ b/devices/pcx86/machine/5160/mda/256kb/debugger/machine.xml
@@ -1,5 +1,5 @@
-
+
IBM PC XT (Model 5160), MDA, 256Kb, 10Mb Drive
diff --git a/devices/pcx86/machine/5160/mda/256kb/fake188/debugger/machine.xml b/devices/pcx86/machine/5160/mda/256kb/fake188/debugger/machine.xml
index 5449218ce..fa6e17a08 100644
--- a/devices/pcx86/machine/5160/mda/256kb/fake188/debugger/machine.xml
+++ b/devices/pcx86/machine/5160/mda/256kb/fake188/debugger/machine.xml
@@ -1,5 +1,5 @@
-
+
IBM PC XT (Model 5160), MDA, 256Kb, 10Mb Drive
diff --git a/devices/pcx86/machine/5160/mda/256kb/fake188/machine.xml b/devices/pcx86/machine/5160/mda/256kb/fake188/machine.xml
index e6626d976..ced7579fb 100644
--- a/devices/pcx86/machine/5160/mda/256kb/fake188/machine.xml
+++ b/devices/pcx86/machine/5160/mda/256kb/fake188/machine.xml
@@ -1,5 +1,5 @@
-
+
IBM PC XT (Model 5160), MDA, 256Kb, 10Mb Drive
diff --git a/devices/pcx86/machine/5160/mda/256kb/machine.xml b/devices/pcx86/machine/5160/mda/256kb/machine.xml
index 47ac88fe7..3cf069595 100644
--- a/devices/pcx86/machine/5160/mda/256kb/machine.xml
+++ b/devices/pcx86/machine/5160/mda/256kb/machine.xml
@@ -1,5 +1,5 @@
-
+
IBM PC XT (Model 5160), MDA, 256Kb, 10Mb Drive
diff --git a/devices/pcx86/machine/5160/mda/64kb/softkbd/machine.xml b/devices/pcx86/machine/5160/mda/64kb/softkbd/machine.xml
index bca8cdd9b..28eac6f81 100644
--- a/devices/pcx86/machine/5160/mda/64kb/softkbd/machine.xml
+++ b/devices/pcx86/machine/5160/mda/64kb/softkbd/machine.xml
@@ -1,5 +1,5 @@
-
+
IBM PC XT (Model 5160), MDA, 64K, 10Mb Drive
diff --git a/devices/pcx86/machine/5170/cga/640kb/rev3/debugger/machine.xml b/devices/pcx86/machine/5170/cga/640kb/rev3/debugger/machine.xml
index c5613a26e..346cbcc87 100644
--- a/devices/pcx86/machine/5170/cga/640kb/rev3/debugger/machine.xml
+++ b/devices/pcx86/machine/5170/cga/640kb/rev3/debugger/machine.xml
@@ -1,5 +1,5 @@
-
+
IBM PC AT (8Mhz, 640Kb, Dual Floppy) with Color Display
diff --git a/devices/pcx86/machine/5170/cga/640kb/rev3/machine.xml b/devices/pcx86/machine/5170/cga/640kb/rev3/machine.xml
index e3d0c43c1..3512e022c 100644
--- a/devices/pcx86/machine/5170/cga/640kb/rev3/machine.xml
+++ b/devices/pcx86/machine/5170/cga/640kb/rev3/machine.xml
@@ -1,5 +1,5 @@
-
+
IBM PC AT (8Mhz, 640Kb, Dual Floppy) with Color Display
diff --git a/devices/pcx86/machine/5170/ega/1152kb/rev1/debugger/machine.xml b/devices/pcx86/machine/5170/ega/1152kb/rev1/debugger/machine.xml
index 069961341..593eae58d 100644
--- a/devices/pcx86/machine/5170/ega/1152kb/rev1/debugger/machine.xml
+++ b/devices/pcx86/machine/5170/ega/1152kb/rev1/debugger/machine.xml
@@ -1,5 +1,5 @@
-
+
IBM PC AT (6Mhz), 128Kb EGA, 1152Kb RAM, 20Mb Hard Disk
diff --git a/devices/pcx86/machine/5170/ega/1152kb/rev1/machine.xml b/devices/pcx86/machine/5170/ega/1152kb/rev1/machine.xml
index ea589f33a..56aaba70c 100644
--- a/devices/pcx86/machine/5170/ega/1152kb/rev1/machine.xml
+++ b/devices/pcx86/machine/5170/ega/1152kb/rev1/machine.xml
@@ -1,5 +1,5 @@
-
+
IBM PC AT (6Mhz), 128Kb EGA, 1152Kb RAM, 20Mb Hard Disk
diff --git a/devices/pcx86/machine/5170/ega/1152kb/rev3/debugger/backtrack/machine.xml b/devices/pcx86/machine/5170/ega/1152kb/rev3/debugger/backtrack/machine.xml
index 2898205bf..d2828f172 100644
--- a/devices/pcx86/machine/5170/ega/1152kb/rev3/debugger/backtrack/machine.xml
+++ b/devices/pcx86/machine/5170/ega/1152kb/rev3/debugger/backtrack/machine.xml
@@ -1,5 +1,5 @@
-
+
IBM PC AT (8Mhz), 128Kb EGA, 1152Kb RAM, 20Mb Hard Disk
diff --git a/devices/pcx86/machine/5170/ega/1152kb/rev3/debugger/machine.xml b/devices/pcx86/machine/5170/ega/1152kb/rev3/debugger/machine.xml
index 23dfb29f8..d61abe8c9 100644
--- a/devices/pcx86/machine/5170/ega/1152kb/rev3/debugger/machine.xml
+++ b/devices/pcx86/machine/5170/ega/1152kb/rev3/debugger/machine.xml
@@ -1,5 +1,5 @@
-
+
IBM PC AT (8Mhz), 128Kb EGA, 1152Kb RAM, 20Mb Hard Disk
diff --git a/devices/pcx86/machine/5170/ega/1152kb/rev3/machine.xml b/devices/pcx86/machine/5170/ega/1152kb/rev3/machine.xml
index 27ab067d7..09e44e56a 100644
--- a/devices/pcx86/machine/5170/ega/1152kb/rev3/machine.xml
+++ b/devices/pcx86/machine/5170/ega/1152kb/rev3/machine.xml
@@ -1,5 +1,5 @@
-
+
IBM PC AT (8Mhz), 128Kb EGA, 1152Kb RAM, 20Mb Hard Disk
diff --git a/devices/pcx86/machine/5170/ega/2048kb/rev3/debugger/backtrack/machine.xml b/devices/pcx86/machine/5170/ega/2048kb/rev3/debugger/backtrack/machine.xml
index 08f44586c..b8c3c903c 100644
--- a/devices/pcx86/machine/5170/ega/2048kb/rev3/debugger/backtrack/machine.xml
+++ b/devices/pcx86/machine/5170/ega/2048kb/rev3/debugger/backtrack/machine.xml
@@ -1,5 +1,5 @@
-
+
IBM PC AT (8Mhz), 128Kb EGA, 2Mb RAM, 20Mb Hard Disk
diff --git a/devices/pcx86/machine/5170/ega/2048kb/rev3/debugger/machine.xml b/devices/pcx86/machine/5170/ega/2048kb/rev3/debugger/machine.xml
index 6e2034552..3912e8435 100644
--- a/devices/pcx86/machine/5170/ega/2048kb/rev3/debugger/machine.xml
+++ b/devices/pcx86/machine/5170/ega/2048kb/rev3/debugger/machine.xml
@@ -1,5 +1,5 @@
-
+
IBM PC AT (8Mhz), 128Kb EGA, 2Mb RAM, 20Mb Hard Disk
diff --git a/devices/pcx86/machine/5170/ega/2048kb/rev3/machine.xml b/devices/pcx86/machine/5170/ega/2048kb/rev3/machine.xml
index bc9288fe2..52747c040 100644
--- a/devices/pcx86/machine/5170/ega/2048kb/rev3/machine.xml
+++ b/devices/pcx86/machine/5170/ega/2048kb/rev3/machine.xml
@@ -1,5 +1,5 @@
-
+
IBM PC AT (8Mhz), 128Kb EGA, 2Mb RAM, 20Mb Hard Disk
diff --git a/devices/pcx86/machine/5170/ega/640kb/rev1/debugger/machine.xml b/devices/pcx86/machine/5170/ega/640kb/rev1/debugger/machine.xml
index 979f4caa0..b84503845 100644
--- a/devices/pcx86/machine/5170/ega/640kb/rev1/debugger/machine.xml
+++ b/devices/pcx86/machine/5170/ega/640kb/rev1/debugger/machine.xml
@@ -1,5 +1,5 @@
-
+
IBM PC AT, 128K EGA, 640Kb RAM
diff --git a/devices/pcx86/machine/5170/ega/640kb/rev1/machine.xml b/devices/pcx86/machine/5170/ega/640kb/rev1/machine.xml
index afcb33d2b..5045d1b12 100644
--- a/devices/pcx86/machine/5170/ega/640kb/rev1/machine.xml
+++ b/devices/pcx86/machine/5170/ega/640kb/rev1/machine.xml
@@ -1,5 +1,5 @@
-
+
IBM PC AT, 128K EGA, 640Kb RAM
diff --git a/devices/pcx86/machine/5170/mda/640kb/rev3/debugger/machine.xml b/devices/pcx86/machine/5170/mda/640kb/rev3/debugger/machine.xml
index 70197c17c..bd2b7c435 100644
--- a/devices/pcx86/machine/5170/mda/640kb/rev3/debugger/machine.xml
+++ b/devices/pcx86/machine/5170/mda/640kb/rev3/debugger/machine.xml
@@ -1,5 +1,5 @@
-
+
IBM PC AT (8Mhz, 640Kb, Dual Floppy) with Monochrome Display
diff --git a/devices/pcx86/machine/5170/mda/640kb/rev3/machine.xml b/devices/pcx86/machine/5170/mda/640kb/rev3/machine.xml
index b3841177c..ae825679a 100644
--- a/devices/pcx86/machine/5170/mda/640kb/rev3/machine.xml
+++ b/devices/pcx86/machine/5170/mda/640kb/rev3/machine.xml
@@ -1,5 +1,5 @@
-
+
IBM PC AT (8Mhz, 640Kb, Dual Floppy) with Monochrome Display
diff --git a/devices/pcx86/machine/5170/vga/2048kb/debugger/machine.xml b/devices/pcx86/machine/5170/vga/2048kb/debugger/machine.xml
index 3893043c4..3511eab9c 100644
--- a/devices/pcx86/machine/5170/vga/2048kb/debugger/machine.xml
+++ b/devices/pcx86/machine/5170/vga/2048kb/debugger/machine.xml
@@ -1,5 +1,5 @@
-
+
IBM PC AT (8Mhz, 2Mb, 20Mb Hard Disk) with VGA Display
diff --git a/devices/pcx86/machine/5170/vga/2048kb/machine.xml b/devices/pcx86/machine/5170/vga/2048kb/machine.xml
index 676dc1fc2..642760628 100644
--- a/devices/pcx86/machine/5170/vga/2048kb/machine.xml
+++ b/devices/pcx86/machine/5170/vga/2048kb/machine.xml
@@ -1,5 +1,5 @@
-
+
IBM PC AT (8Mhz, 2Mb, 20Mb Hard Disk) with VGA Display
diff --git a/devices/pcx86/machine/5170/vga/4096kb/debugger/machine.xml b/devices/pcx86/machine/5170/vga/4096kb/debugger/machine.xml
index ed9189942..1cb132320 100644
--- a/devices/pcx86/machine/5170/vga/4096kb/debugger/machine.xml
+++ b/devices/pcx86/machine/5170/vga/4096kb/debugger/machine.xml
@@ -1,5 +1,5 @@
-
+
IBM PC AT (8Mhz, 4Mb, 20Mb Hard Disk) with VGA Display
diff --git a/devices/pcx86/machine/5170/vga/4096kb/machine.xml b/devices/pcx86/machine/5170/vga/4096kb/machine.xml
index 0ac97c71e..c345ba0b7 100644
--- a/devices/pcx86/machine/5170/vga/4096kb/machine.xml
+++ b/devices/pcx86/machine/5170/vga/4096kb/machine.xml
@@ -1,5 +1,5 @@
-
+
IBM PC AT (8Mhz), VGA, 4Mb RAM, 20Mb Hard Disk
diff --git a/devices/pcx86/machine/att/6300/cga/640kb/debugger/machine.xml b/devices/pcx86/machine/att/6300/cga/640kb/debugger/machine.xml
index 6eccfb2c9..e7efd5838 100644
--- a/devices/pcx86/machine/att/6300/cga/640kb/debugger/machine.xml
+++ b/devices/pcx86/machine/att/6300/cga/640kb/debugger/machine.xml
@@ -1,5 +1,5 @@
-
+
AT&T Personal Computer 6300 with Color Display
diff --git a/devices/pcx86/machine/att/6300/cga/640kb/machine.xml b/devices/pcx86/machine/att/6300/cga/640kb/machine.xml
index 2ee6c3d45..fa02329fe 100644
--- a/devices/pcx86/machine/att/6300/cga/640kb/machine.xml
+++ b/devices/pcx86/machine/att/6300/cga/640kb/machine.xml
@@ -1,5 +1,5 @@
-
+
AT&T Personal Computer 6300 with Color Display
diff --git a/devices/pcx86/machine/cdp/mpc1600/cga/640kb/debugger/machine.xml b/devices/pcx86/machine/cdp/mpc1600/cga/640kb/debugger/machine.xml
index f5bee88b3..a4ef82b01 100644
--- a/devices/pcx86/machine/cdp/mpc1600/cga/640kb/debugger/machine.xml
+++ b/devices/pcx86/machine/cdp/mpc1600/cga/640kb/debugger/machine.xml
@@ -1,5 +1,5 @@
-
+
Columbia Data Products MPC 1600 with Color Display
diff --git a/devices/pcx86/machine/cdp/mpc1600/cga/640kb/machine.xml b/devices/pcx86/machine/cdp/mpc1600/cga/640kb/machine.xml
index 0ddf1282c..978f8861e 100644
--- a/devices/pcx86/machine/cdp/mpc1600/cga/640kb/machine.xml
+++ b/devices/pcx86/machine/cdp/mpc1600/cga/640kb/machine.xml
@@ -1,5 +1,5 @@
-
+
Columbia Data Products MPC 1600 with Color Display
diff --git a/devices/pcx86/machine/compaq/deskpro386/ega/2048kb/debugger/machine.xml b/devices/pcx86/machine/compaq/deskpro386/ega/2048kb/debugger/machine.xml
index 4c54b5f09..f230e6f86 100644
--- a/devices/pcx86/machine/compaq/deskpro386/ega/2048kb/debugger/machine.xml
+++ b/devices/pcx86/machine/compaq/deskpro386/ega/2048kb/debugger/machine.xml
@@ -1,5 +1,5 @@
-
+
COMPAQ DeskPro 386, 2Mb RAM, 128Kb EGA
diff --git a/devices/pcx86/machine/compaq/deskpro386/ega/2048kb/machine.xml b/devices/pcx86/machine/compaq/deskpro386/ega/2048kb/machine.xml
index de5165170..7d90ef7b2 100644
--- a/devices/pcx86/machine/compaq/deskpro386/ega/2048kb/machine.xml
+++ b/devices/pcx86/machine/compaq/deskpro386/ega/2048kb/machine.xml
@@ -1,5 +1,5 @@
-
+
COMPAQ DeskPro 386, 2Mb RAM, 128Kb EGA
diff --git a/devices/pcx86/machine/compaq/deskpro386/ega/4096kb/debugger/machine.xml b/devices/pcx86/machine/compaq/deskpro386/ega/4096kb/debugger/machine.xml
index 94503de11..52dbe0a10 100644
--- a/devices/pcx86/machine/compaq/deskpro386/ega/4096kb/debugger/machine.xml
+++ b/devices/pcx86/machine/compaq/deskpro386/ega/4096kb/debugger/machine.xml
@@ -1,5 +1,5 @@
-
+
COMPAQ DeskPro 386, 4Mb RAM, 128Kb EGA
diff --git a/devices/pcx86/machine/compaq/deskpro386/ega/4096kb/machine.xml b/devices/pcx86/machine/compaq/deskpro386/ega/4096kb/machine.xml
index c7cc5a246..0ce247fec 100644
--- a/devices/pcx86/machine/compaq/deskpro386/ega/4096kb/machine.xml
+++ b/devices/pcx86/machine/compaq/deskpro386/ega/4096kb/machine.xml
@@ -1,5 +1,5 @@
-
+
COMPAQ DeskPro 386, 4Mb RAM, 128Kb EGA
diff --git a/devices/pcx86/machine/compaq/deskpro386/other/2048kb/debugger/backtrack/machine.xml b/devices/pcx86/machine/compaq/deskpro386/other/2048kb/debugger/backtrack/machine.xml
index 9bf823f6e..d44d1ff2a 100644
--- a/devices/pcx86/machine/compaq/deskpro386/other/2048kb/debugger/backtrack/machine.xml
+++ b/devices/pcx86/machine/compaq/deskpro386/other/2048kb/debugger/backtrack/machine.xml
@@ -1,5 +1,5 @@
-
+
COMPAQ DeskPro 386, 2Mb RAM, COMPAQ VGA, 20Mb Hard Disk
diff --git a/devices/pcx86/machine/compaq/deskpro386/other/2048kb/debugger/machine.xml b/devices/pcx86/machine/compaq/deskpro386/other/2048kb/debugger/machine.xml
index b90799340..08b9a702c 100644
--- a/devices/pcx86/machine/compaq/deskpro386/other/2048kb/debugger/machine.xml
+++ b/devices/pcx86/machine/compaq/deskpro386/other/2048kb/debugger/machine.xml
@@ -1,5 +1,5 @@
-
+
COMPAQ DeskPro 386, 2Mb RAM, COMPAQ VGA, 20Mb Hard Disk
diff --git a/devices/pcx86/machine/compaq/deskpro386/vga/2048kb/debugger/machine.xml b/devices/pcx86/machine/compaq/deskpro386/vga/2048kb/debugger/machine.xml
index 4af6ef9d1..d79962dec 100644
--- a/devices/pcx86/machine/compaq/deskpro386/vga/2048kb/debugger/machine.xml
+++ b/devices/pcx86/machine/compaq/deskpro386/vga/2048kb/debugger/machine.xml
@@ -1,5 +1,5 @@
-
+
COMPAQ DeskPro 386, 2Mb RAM, IBM VGA, 20Mb Hard Disk
diff --git a/devices/pcx86/machine/compaq/deskpro386/vga/2048kb/machine.xml b/devices/pcx86/machine/compaq/deskpro386/vga/2048kb/machine.xml
index 4044f87bd..f1c0b3f50 100644
--- a/devices/pcx86/machine/compaq/deskpro386/vga/2048kb/machine.xml
+++ b/devices/pcx86/machine/compaq/deskpro386/vga/2048kb/machine.xml
@@ -1,5 +1,5 @@
-
+
COMPAQ DeskPro 386, 2Mb RAM, IBM VGA, 20Mb Hard Disk
diff --git a/devices/pcx86/machine/compaq/deskpro386/vga/4096kb/debugger/machine.xml b/devices/pcx86/machine/compaq/deskpro386/vga/4096kb/debugger/machine.xml
index bc3a28429..123196ca1 100644
--- a/devices/pcx86/machine/compaq/deskpro386/vga/4096kb/debugger/machine.xml
+++ b/devices/pcx86/machine/compaq/deskpro386/vga/4096kb/debugger/machine.xml
@@ -1,5 +1,5 @@
-
+
COMPAQ DeskPro 386, 4Mb RAM, IBM VGA, 20Mb Hard Disk
diff --git a/devices/pcx86/machine/compaq/deskpro386/vga/4096kb/machine.xml b/devices/pcx86/machine/compaq/deskpro386/vga/4096kb/machine.xml
index 38f9f88fb..9dcc82605 100644
--- a/devices/pcx86/machine/compaq/deskpro386/vga/4096kb/machine.xml
+++ b/devices/pcx86/machine/compaq/deskpro386/vga/4096kb/machine.xml
@@ -1,5 +1,5 @@
-
+
COMPAQ DeskPro 386, 4Mb RAM, IBM VGA, 20Mb Hard Disk
diff --git a/devices/pcx86/machine/custom/machine.xml b/devices/pcx86/machine/custom/machine.xml
index 50b23eed1..4cec9918f 100644
--- a/devices/pcx86/machine/custom/machine.xml
+++ b/devices/pcx86/machine/custom/machine.xml
@@ -1,5 +1,5 @@
-
+
IBM PC (Model 5150) with Monochrome Display
diff --git a/devices/pcx86/machine/zenith/z150/cga/640kb/debugger/machine.xml b/devices/pcx86/machine/zenith/z150/cga/640kb/debugger/machine.xml
index 69983efa1..8a2a2f2ee 100644
--- a/devices/pcx86/machine/zenith/z150/cga/640kb/debugger/machine.xml
+++ b/devices/pcx86/machine/zenith/z150/cga/640kb/debugger/machine.xml
@@ -1,5 +1,5 @@
-
+
Zenith Z-150 with Color Display
diff --git a/devices/pcx86/machine/zenith/z150/cga/640kb/machine.xml b/devices/pcx86/machine/zenith/z150/cga/640kb/machine.xml
index 935a71b2c..853bf2598 100644
--- a/devices/pcx86/machine/zenith/z150/cga/640kb/machine.xml
+++ b/devices/pcx86/machine/zenith/z150/cga/640kb/machine.xml
@@ -1,5 +1,5 @@
-
+
Zenith Z-150 with Color Display
diff --git a/devices/pdp11/machine/1120/basic/debugger/machine.xml b/devices/pdp11/machine/1120/basic/debugger/machine.xml
index a28762ff5..f1b7d4f17 100644
--- a/devices/pdp11/machine/1120/basic/debugger/machine.xml
+++ b/devices/pdp11/machine/1120/basic/debugger/machine.xml
@@ -1,5 +1,5 @@
-
+
PDP-11/20: 16Kb, PDP-11 BASIC, Debugger
diff --git a/devices/pdp11/machine/1120/basic/machine.xml b/devices/pdp11/machine/1120/basic/machine.xml
index af883d0d3..d05bc7b74 100644
--- a/devices/pdp11/machine/1120/basic/machine.xml
+++ b/devices/pdp11/machine/1120/basic/machine.xml
@@ -1,5 +1,5 @@
-
+
PDP-11/20: 16Kb, PDP-11 BASIC
diff --git a/devices/pdp11/machine/1120/bootstrap/debugger/machine.xml b/devices/pdp11/machine/1120/bootstrap/debugger/machine.xml
index cfbce26fc..1d939cad8 100644
--- a/devices/pdp11/machine/1120/bootstrap/debugger/machine.xml
+++ b/devices/pdp11/machine/1120/bootstrap/debugger/machine.xml
@@ -1,5 +1,5 @@
-
+
PDP-11/20: 16Kb, Bootstrap Loader, Debugger
diff --git a/devices/pdp11/machine/1120/bootstrap/machine.xml b/devices/pdp11/machine/1120/bootstrap/machine.xml
index 4d82a3d55..a79f66a8a 100644
--- a/devices/pdp11/machine/1120/bootstrap/machine.xml
+++ b/devices/pdp11/machine/1120/bootstrap/machine.xml
@@ -1,5 +1,5 @@
-
+
PDP-11/20: 16Kb, Bootstrap Loader
diff --git a/devices/pdp11/machine/1120/monitor/debugger/machine.xml b/devices/pdp11/machine/1120/monitor/debugger/machine.xml
index 9253cda68..d068b5c2d 100644
--- a/devices/pdp11/machine/1120/monitor/debugger/machine.xml
+++ b/devices/pdp11/machine/1120/monitor/debugger/machine.xml
@@ -1,5 +1,5 @@
-
+
PDP-11/20 Boot Monitor with 56Kb and Debugger
diff --git a/devices/pdp11/machine/1120/monitor/machine.xml b/devices/pdp11/machine/1120/monitor/machine.xml
index ddd5b8e87..4944e7c59 100644
--- a/devices/pdp11/machine/1120/monitor/machine.xml
+++ b/devices/pdp11/machine/1120/monitor/machine.xml
@@ -1,5 +1,5 @@
-
+
PDP-11/20 Boot Monitor with 56Kb
diff --git a/devices/pdp11/machine/1120/panel/debugger/machine.xml b/devices/pdp11/machine/1120/panel/debugger/machine.xml
index b5cfe8acb..d738792a5 100644
--- a/devices/pdp11/machine/1120/panel/debugger/machine.xml
+++ b/devices/pdp11/machine/1120/panel/debugger/machine.xml
@@ -1,5 +1,5 @@
-
+
PDP-11/20 with Front Panel and Debugger
diff --git a/devices/pdp11/machine/1120/panel/debugger/test14/machine.xml b/devices/pdp11/machine/1120/panel/debugger/test14/machine.xml
index 446bd6148..7daec2f41 100644
--- a/devices/pdp11/machine/1120/panel/debugger/test14/machine.xml
+++ b/devices/pdp11/machine/1120/panel/debugger/test14/machine.xml
@@ -1,5 +1,5 @@
-
+
PDP-11/20 with Front Panel and TEST 14
diff --git a/devices/pdp11/machine/1120/panel/machine.xml b/devices/pdp11/machine/1120/panel/machine.xml
index 741313830..d3de6e1ec 100644
--- a/devices/pdp11/machine/1120/panel/machine.xml
+++ b/devices/pdp11/machine/1120/panel/machine.xml
@@ -1,5 +1,5 @@
-
+
PDP-11/20 with Front Panel
diff --git a/devices/pdp11/machine/1145/panel/debugger/machine.xml b/devices/pdp11/machine/1145/panel/debugger/machine.xml
index 791db3952..208235d3b 100644
--- a/devices/pdp11/machine/1145/panel/debugger/machine.xml
+++ b/devices/pdp11/machine/1145/panel/debugger/machine.xml
@@ -1,5 +1,5 @@
-
+
PDP-11/45 with 256Kb, Front Panel and Debugger
diff --git a/devices/pdp11/machine/1145/panel/machine.xml b/devices/pdp11/machine/1145/panel/machine.xml
index 99460c8a2..f8bf21dba 100644
--- a/devices/pdp11/machine/1145/panel/machine.xml
+++ b/devices/pdp11/machine/1145/panel/machine.xml
@@ -1,5 +1,5 @@
-
+
PDP-11/45 with 256Kb and Front Panel
diff --git a/devices/pdp11/machine/1145/vt100/debugger/machine-left.xml b/devices/pdp11/machine/1145/vt100/debugger/machine-left.xml
index cff8f59de..e48ca6d8b 100644
--- a/devices/pdp11/machine/1145/vt100/debugger/machine-left.xml
+++ b/devices/pdp11/machine/1145/vt100/debugger/machine-left.xml
@@ -1,5 +1,5 @@
-
+
PDP-11/45 with 256Kb, Front Panel, and Debugger
diff --git a/devices/pdp11/machine/1145/vt100/debugger/machine.xml b/devices/pdp11/machine/1145/vt100/debugger/machine.xml
index 9f9acf992..fbc1aff9f 100644
--- a/devices/pdp11/machine/1145/vt100/debugger/machine.xml
+++ b/devices/pdp11/machine/1145/vt100/debugger/machine.xml
@@ -1,5 +1,5 @@
-
+
PDP-11/45 with 256Kb, Front Panel, and Debugger
diff --git a/devices/pdp11/machine/1145/vt100/machine-left.xml b/devices/pdp11/machine/1145/vt100/machine-left.xml
index 374a8de18..0147e4fc8 100644
--- a/devices/pdp11/machine/1145/vt100/machine-left.xml
+++ b/devices/pdp11/machine/1145/vt100/machine-left.xml
@@ -1,5 +1,5 @@
-
+
PDP-11/45 with 256Kb and Front Panel
diff --git a/devices/pdp11/machine/1145/vt100/machine.xml b/devices/pdp11/machine/1145/vt100/machine.xml
index b98b003f1..35ab7279f 100644
--- a/devices/pdp11/machine/1145/vt100/machine.xml
+++ b/devices/pdp11/machine/1145/vt100/machine.xml
@@ -1,5 +1,5 @@
-
+
PDP-11/45 with 256Kb and Front Panel
diff --git a/devices/pdp11/machine/1170/4mb/debugger/machine.xml b/devices/pdp11/machine/1170/4mb/debugger/machine.xml
index d79f8b827..ca829680c 100644
--- a/devices/pdp11/machine/1170/4mb/debugger/machine.xml
+++ b/devices/pdp11/machine/1170/4mb/debugger/machine.xml
@@ -1,5 +1,5 @@
-
+
PDP-11/70 with 4Mb, Front Panel and Debugger
diff --git a/devices/pdp11/machine/1170/4mb/machine.xml b/devices/pdp11/machine/1170/4mb/machine.xml
index b1ee0c90c..6b84c7bad 100644
--- a/devices/pdp11/machine/1170/4mb/machine.xml
+++ b/devices/pdp11/machine/1170/4mb/machine.xml
@@ -1,5 +1,5 @@
-
+
PDP-11/70 with 4Mb and Front Panel
diff --git a/devices/pdp11/machine/1170/monitor/debugger/machine.xml b/devices/pdp11/machine/1170/monitor/debugger/machine.xml
index 2dc572dd4..278336207 100644
--- a/devices/pdp11/machine/1170/monitor/debugger/machine.xml
+++ b/devices/pdp11/machine/1170/monitor/debugger/machine.xml
@@ -1,5 +1,5 @@
-
+
PDP-11/70 with 256Kb, Boot Monitor, and Debugger
diff --git a/devices/pdp11/machine/1170/monitor/machine.xml b/devices/pdp11/machine/1170/monitor/machine.xml
index fe680a930..5bd296045 100644
--- a/devices/pdp11/machine/1170/monitor/machine.xml
+++ b/devices/pdp11/machine/1170/monitor/machine.xml
@@ -1,5 +1,5 @@
-
+
PDP-11/70 with 256Kb and Boot Monitor
diff --git a/devices/pdp11/machine/1170/panel/debugger/cpuexer/machine.xml b/devices/pdp11/machine/1170/panel/debugger/cpuexer/machine.xml
index acf182cdb..eb1b9794c 100644
--- a/devices/pdp11/machine/1170/panel/debugger/cpuexer/machine.xml
+++ b/devices/pdp11/machine/1170/panel/debugger/cpuexer/machine.xml
@@ -1,5 +1,5 @@
-
+
PDP-11/70 with 256Kb running CPU Exerciser
diff --git a/devices/pdp11/machine/1170/panel/debugger/machine.xml b/devices/pdp11/machine/1170/panel/debugger/machine.xml
index 1859fc024..f874ac202 100644
--- a/devices/pdp11/machine/1170/panel/debugger/machine.xml
+++ b/devices/pdp11/machine/1170/panel/debugger/machine.xml
@@ -1,5 +1,5 @@
-
+
PDP-11/70 with 256Kb, Front Panel and Debugger
diff --git a/devices/pdp11/machine/1170/panel/machine.xml b/devices/pdp11/machine/1170/panel/machine.xml
index 54adcec45..e6427ce7c 100644
--- a/devices/pdp11/machine/1170/panel/machine.xml
+++ b/devices/pdp11/machine/1170/panel/machine.xml
@@ -1,5 +1,5 @@
-
+
PDP-11/70 with 256Kb and Front Panel
diff --git a/devices/pdp11/machine/1170/vt100/debugger/machine-left.xml b/devices/pdp11/machine/1170/vt100/debugger/machine-left.xml
index 4305e5807..51259b226 100644
--- a/devices/pdp11/machine/1170/vt100/debugger/machine-left.xml
+++ b/devices/pdp11/machine/1170/vt100/debugger/machine-left.xml
@@ -1,5 +1,5 @@
-
+
PDP-11/70 with 256Kb, Front Panel, and Debugger
diff --git a/devices/pdp11/machine/1170/vt100/debugger/machine-right.xml b/devices/pdp11/machine/1170/vt100/debugger/machine-right.xml
index 336311999..23a804818 100644
--- a/devices/pdp11/machine/1170/vt100/debugger/machine-right.xml
+++ b/devices/pdp11/machine/1170/vt100/debugger/machine-right.xml
@@ -1,5 +1,5 @@
-
+
PDP-11/70 with 256Kb, Front Panel, and Debugger
diff --git a/devices/pdp11/machine/1170/vt100/debugger/machine.xml b/devices/pdp11/machine/1170/vt100/debugger/machine.xml
index f4b1e13ee..d62902687 100644
--- a/devices/pdp11/machine/1170/vt100/debugger/machine.xml
+++ b/devices/pdp11/machine/1170/vt100/debugger/machine.xml
@@ -1,5 +1,5 @@
-
+
PDP-11/70 with 256Kb, Front Panel, and Debugger
diff --git a/devices/pdp11/machine/1170/vt100/machine-left.xml b/devices/pdp11/machine/1170/vt100/machine-left.xml
index af9da4544..8f6da6163 100644
--- a/devices/pdp11/machine/1170/vt100/machine-left.xml
+++ b/devices/pdp11/machine/1170/vt100/machine-left.xml
@@ -1,5 +1,5 @@
-
+
PDP-11/70 with 256Kb and Front Panel
diff --git a/devices/pdp11/machine/1170/vt100/machine-right.xml b/devices/pdp11/machine/1170/vt100/machine-right.xml
index 3929e5676..42ea12ed7 100644
--- a/devices/pdp11/machine/1170/vt100/machine-right.xml
+++ b/devices/pdp11/machine/1170/vt100/machine-right.xml
@@ -1,5 +1,5 @@
-
+
PDP-11/70 with 256Kb and Front Panel
diff --git a/devices/pdp11/machine/1170/vt100/machine.xml b/devices/pdp11/machine/1170/vt100/machine.xml
index 9ae656cdb..e45884569 100644
--- a/devices/pdp11/machine/1170/vt100/machine.xml
+++ b/devices/pdp11/machine/1170/vt100/machine.xml
@@ -1,5 +1,5 @@
-
+
PDP-11/70 with 256Kb and Front Panel
diff --git a/disks/pcx86/apps/ibm/topview/1.01/manifest.xml b/disks/pcx86/apps/ibm/topview/1.01/manifest.xml
index 1a3058ce1..1ca0d11b8 100644
--- a/disks/pcx86/apps/ibm/topview/1.01/manifest.xml
+++ b/disks/pcx86/apps/ibm/topview/1.01/manifest.xml
@@ -1,5 +1,5 @@
-
+
TopView 1.01
diff --git a/disks/pcx86/apps/lotus/123/1.0a/manifest.xml b/disks/pcx86/apps/lotus/123/1.0a/manifest.xml
index 5bb2cee6a..54fd9daf7 100644
--- a/disks/pcx86/apps/lotus/123/1.0a/manifest.xml
+++ b/disks/pcx86/apps/lotus/123/1.0a/manifest.xml
@@ -1,5 +1,5 @@
-
+
1-2-3
1.0a
diff --git a/disks/pcx86/apps/micropro/wordstar/3.30/manifest.xml b/disks/pcx86/apps/micropro/wordstar/3.30/manifest.xml
index cceadaa5e..f52f59bec 100644
--- a/disks/pcx86/apps/micropro/wordstar/3.30/manifest.xml
+++ b/disks/pcx86/apps/micropro/wordstar/3.30/manifest.xml
@@ -1,5 +1,5 @@
-
+
WordStar 3.30
diff --git a/disks/pcx86/apps/micropro/wordstar/4.00/manifest.xml b/disks/pcx86/apps/micropro/wordstar/4.00/manifest.xml
index f6c034b75..0a1aeeeed 100644
--- a/disks/pcx86/apps/micropro/wordstar/4.00/manifest.xml
+++ b/disks/pcx86/apps/micropro/wordstar/4.00/manifest.xml
@@ -1,5 +1,5 @@
-
+
WordStar 4.00
diff --git a/disks/pcx86/apps/microsoft/chart/2.02/manifest.xml b/disks/pcx86/apps/microsoft/chart/2.02/manifest.xml
index 29e3f8256..5ae714f4b 100644
--- a/disks/pcx86/apps/microsoft/chart/2.02/manifest.xml
+++ b/disks/pcx86/apps/microsoft/chart/2.02/manifest.xml
@@ -1,5 +1,5 @@
-
+
Microsoft Chart
2.02
diff --git a/disks/pcx86/apps/microsoft/winword/2.0c/manifest.xml b/disks/pcx86/apps/microsoft/winword/2.0c/manifest.xml
index b1bdc002f..9a1010aff 100644
--- a/disks/pcx86/apps/microsoft/winword/2.0c/manifest.xml
+++ b/disks/pcx86/apps/microsoft/winword/2.0c/manifest.xml
@@ -1,5 +1,5 @@
-
+
Word for Windows
2.0c
diff --git a/disks/pcx86/apps/microsoft/word/3.0/manifest.xml b/disks/pcx86/apps/microsoft/word/3.0/manifest.xml
index 48f78f612..d6fc401af 100644
--- a/disks/pcx86/apps/microsoft/word/3.0/manifest.xml
+++ b/disks/pcx86/apps/microsoft/word/3.0/manifest.xml
@@ -1,5 +1,5 @@
-
+
MS Word
3.0
diff --git a/disks/pcx86/apps/microsoft/word/3.1/manifest.xml b/disks/pcx86/apps/microsoft/word/3.1/manifest.xml
index 5a6b47bd2..696e028b5 100644
--- a/disks/pcx86/apps/microsoft/word/3.1/manifest.xml
+++ b/disks/pcx86/apps/microsoft/word/3.1/manifest.xml
@@ -1,5 +1,5 @@
-
+
MS Word
3.1
diff --git a/disks/pcx86/apps/microsoft/word/5.0/manifest.xml b/disks/pcx86/apps/microsoft/word/5.0/manifest.xml
index bc1498770..b5241849f 100644
--- a/disks/pcx86/apps/microsoft/word/5.0/manifest.xml
+++ b/disks/pcx86/apps/microsoft/word/5.0/manifest.xml
@@ -1,5 +1,5 @@
-
+
MS Word
5.0
diff --git a/disks/pcx86/apps/sunnyhill/omniview/4.30/manifest.xml b/disks/pcx86/apps/sunnyhill/omniview/4.30/manifest.xml
index 0cee5b0d6..26c1b8900 100644
--- a/disks/pcx86/apps/sunnyhill/omniview/4.30/manifest.xml
+++ b/disks/pcx86/apps/sunnyhill/omniview/4.30/manifest.xml
@@ -1,5 +1,5 @@
-
+
Omniview 386
4.30
diff --git a/disks/pcx86/cpm/1.1b/machine.xml b/disks/pcx86/cpm/1.1b/machine.xml
index c54d2d7cb..a374abe2d 100644
--- a/disks/pcx86/cpm/1.1b/machine.xml
+++ b/disks/pcx86/cpm/1.1b/machine.xml
@@ -1,5 +1,5 @@
-
+
IBM PC (Model 5150) running CP/M-86
diff --git a/disks/pcx86/cpm/1.1b/manifest.xml b/disks/pcx86/cpm/1.1b/manifest.xml
index 7db49158b..a52bd86d4 100644
--- a/disks/pcx86/cpm/1.1b/manifest.xml
+++ b/disks/pcx86/cpm/1.1b/manifest.xml
@@ -1,5 +1,5 @@
-
+
CP/M-86
1.1B
diff --git a/disks/pcx86/diags/ibm/manifest.xml b/disks/pcx86/diags/ibm/manifest.xml
index f83aadbef..dffd63986 100644
--- a/disks/pcx86/diags/ibm/manifest.xml
+++ b/disks/pcx86/diags/ibm/manifest.xml
@@ -1,5 +1,5 @@
-
+
IBM PC Diagnostics
Diagnostics
diff --git a/disks/pcx86/dos/compaq/1.11/manifest.xml b/disks/pcx86/dos/compaq/1.11/manifest.xml
index 3f3a468e5..5c0fb0ba9 100644
--- a/disks/pcx86/dos/compaq/1.11/manifest.xml
+++ b/disks/pcx86/dos/compaq/1.11/manifest.xml
@@ -1,5 +1,5 @@
-
+
MS-DOS
1.11
diff --git a/disks/pcx86/dos/compaq/1.12/manifest.xml b/disks/pcx86/dos/compaq/1.12/manifest.xml
index 8d1bc04cd..1612a0c73 100644
--- a/disks/pcx86/dos/compaq/1.12/manifest.xml
+++ b/disks/pcx86/dos/compaq/1.12/manifest.xml
@@ -1,5 +1,5 @@
-
+
MS-DOS
1.12
diff --git a/disks/pcx86/dos/compaq/2.12/manifest.xml b/disks/pcx86/dos/compaq/2.12/manifest.xml
index 080ead978..08cbe7952 100644
--- a/disks/pcx86/dos/compaq/2.12/manifest.xml
+++ b/disks/pcx86/dos/compaq/2.12/manifest.xml
@@ -1,5 +1,5 @@
-
+
MS-DOS
2.12
diff --git a/disks/pcx86/dos/compaq/3.00/manifest.xml b/disks/pcx86/dos/compaq/3.00/manifest.xml
index 98e5ea6f2..2c00450be 100644
--- a/disks/pcx86/dos/compaq/3.00/manifest.xml
+++ b/disks/pcx86/dos/compaq/3.00/manifest.xml
@@ -1,5 +1,5 @@
-
+
MS-DOS
3.00
diff --git a/disks/pcx86/dos/compaq/3.10/manifest.xml b/disks/pcx86/dos/compaq/3.10/manifest.xml
index 6b088ce09..ee6932989 100644
--- a/disks/pcx86/dos/compaq/3.10/manifest.xml
+++ b/disks/pcx86/dos/compaq/3.10/manifest.xml
@@ -1,5 +1,5 @@
-
+
MS-DOS
3.10
diff --git a/disks/pcx86/dos/compaq/3.31/manifest.xml b/disks/pcx86/dos/compaq/3.31/manifest.xml
index dfa7b4ddb..64700a82c 100644
--- a/disks/pcx86/dos/compaq/3.31/manifest.xml
+++ b/disks/pcx86/dos/compaq/3.31/manifest.xml
@@ -1,5 +1,5 @@
-
+
MS-DOS
3.31
diff --git a/disks/pcx86/dos/ibm/1.00/manifest.xml b/disks/pcx86/dos/ibm/1.00/manifest.xml
index 08fd914be..a09f83880 100644
--- a/disks/pcx86/dos/ibm/1.00/manifest.xml
+++ b/disks/pcx86/dos/ibm/1.00/manifest.xml
@@ -1,5 +1,5 @@
-
+
PC-DOS
1.00
diff --git a/disks/pcx86/dos/ibm/1.10/manifest.xml b/disks/pcx86/dos/ibm/1.10/manifest.xml
index 7e7eba48f..73bab5b76 100644
--- a/disks/pcx86/dos/ibm/1.10/manifest.xml
+++ b/disks/pcx86/dos/ibm/1.10/manifest.xml
@@ -1,5 +1,5 @@
-
+
PC-DOS
1.10
diff --git a/disks/pcx86/dos/ibm/2.00/manifest.xml b/disks/pcx86/dos/ibm/2.00/manifest.xml
index 31e120174..393d3fdf0 100644
--- a/disks/pcx86/dos/ibm/2.00/manifest.xml
+++ b/disks/pcx86/dos/ibm/2.00/manifest.xml
@@ -1,5 +1,5 @@
-
+
PC-DOS
2.00
diff --git a/disks/pcx86/dos/ibm/2.10/manifest.xml b/disks/pcx86/dos/ibm/2.10/manifest.xml
index 25c6c7463..b7175140f 100644
--- a/disks/pcx86/dos/ibm/2.10/manifest.xml
+++ b/disks/pcx86/dos/ibm/2.10/manifest.xml
@@ -1,5 +1,5 @@
-
+
PC-DOS
2.10
diff --git a/disks/pcx86/dos/ibm/3.00/manifest.xml b/disks/pcx86/dos/ibm/3.00/manifest.xml
index 5d63d29eb..34260daca 100644
--- a/disks/pcx86/dos/ibm/3.00/manifest.xml
+++ b/disks/pcx86/dos/ibm/3.00/manifest.xml
@@ -1,5 +1,5 @@
-
+
PC-DOS
3.00
diff --git a/disks/pcx86/dos/ibm/3.10/manifest.xml b/disks/pcx86/dos/ibm/3.10/manifest.xml
index 154b7d64b..0b2757223 100644
--- a/disks/pcx86/dos/ibm/3.10/manifest.xml
+++ b/disks/pcx86/dos/ibm/3.10/manifest.xml
@@ -1,5 +1,5 @@
-
+
PC-DOS
3.10
diff --git a/disks/pcx86/dos/ibm/3.20/manifest.xml b/disks/pcx86/dos/ibm/3.20/manifest.xml
index 27167d7b3..d82560102 100644
--- a/disks/pcx86/dos/ibm/3.20/manifest.xml
+++ b/disks/pcx86/dos/ibm/3.20/manifest.xml
@@ -1,5 +1,5 @@
-
+
PC-DOS
3.20
diff --git a/disks/pcx86/dos/ibm/3.30/manifest.xml b/disks/pcx86/dos/ibm/3.30/manifest.xml
index bf40bbc4e..314dd83a8 100644
--- a/disks/pcx86/dos/ibm/3.30/manifest.xml
+++ b/disks/pcx86/dos/ibm/3.30/manifest.xml
@@ -1,5 +1,5 @@
-
+
PC-DOS
3.30
diff --git a/disks/pcx86/dos/ibm/4.00/manifest.xml b/disks/pcx86/dos/ibm/4.00/manifest.xml
index 35eb8a419..fdf588155 100644
--- a/disks/pcx86/dos/ibm/4.00/manifest.xml
+++ b/disks/pcx86/dos/ibm/4.00/manifest.xml
@@ -1,5 +1,5 @@
-
+
PC-DOS
4.00
diff --git a/disks/pcx86/dos/ibm/5.00/manifest.xml b/disks/pcx86/dos/ibm/5.00/manifest.xml
index cb3dc5eff..1d3db1f00 100644
--- a/disks/pcx86/dos/ibm/5.00/manifest.xml
+++ b/disks/pcx86/dos/ibm/5.00/manifest.xml
@@ -1,5 +1,5 @@
-
+
PC-DOS
5.00
diff --git a/disks/pcx86/dos/ibm/6.10/manifest.xml b/disks/pcx86/dos/ibm/6.10/manifest.xml
index db7fbd87a..b31d92956 100644
--- a/disks/pcx86/dos/ibm/6.10/manifest.xml
+++ b/disks/pcx86/dos/ibm/6.10/manifest.xml
@@ -1,5 +1,5 @@
-
+
PC-DOS
6.10
diff --git a/disks/pcx86/dos/ibm/6.30/manifest.xml b/disks/pcx86/dos/ibm/6.30/manifest.xml
index 336a50ed6..d749780c1 100644
--- a/disks/pcx86/dos/ibm/6.30/manifest.xml
+++ b/disks/pcx86/dos/ibm/6.30/manifest.xml
@@ -1,5 +1,5 @@
-
+
PC-DOS
6.30
diff --git a/disks/pcx86/dos/ibm/7.00/manifest.xml b/disks/pcx86/dos/ibm/7.00/manifest.xml
index 220458725..b72f584c4 100644
--- a/disks/pcx86/dos/ibm/7.00/manifest.xml
+++ b/disks/pcx86/dos/ibm/7.00/manifest.xml
@@ -1,5 +1,5 @@
-
+
PC-DOS
7.00
diff --git a/disks/pcx86/dos/microsoft/3.20/manifest.xml b/disks/pcx86/dos/microsoft/3.20/manifest.xml
index 398d13942..636361476 100644
--- a/disks/pcx86/dos/microsoft/3.20/manifest.xml
+++ b/disks/pcx86/dos/microsoft/3.20/manifest.xml
@@ -1,5 +1,5 @@
-
+
MS-DOS
3.20
diff --git a/disks/pcx86/dos/microsoft/3.21/manifest.xml b/disks/pcx86/dos/microsoft/3.21/manifest.xml
index 49a943f3e..121b03133 100644
--- a/disks/pcx86/dos/microsoft/3.21/manifest.xml
+++ b/disks/pcx86/dos/microsoft/3.21/manifest.xml
@@ -1,5 +1,5 @@
-
+
MS-DOS
3.21
diff --git a/disks/pcx86/dos/microsoft/3.30/manifest.xml b/disks/pcx86/dos/microsoft/3.30/manifest.xml
index 3c9c41809..dda74963e 100644
--- a/disks/pcx86/dos/microsoft/3.30/manifest.xml
+++ b/disks/pcx86/dos/microsoft/3.30/manifest.xml
@@ -1,5 +1,5 @@
-
+
MS-DOS
3.30
diff --git a/disks/pcx86/dos/microsoft/3.31/manifest.xml b/disks/pcx86/dos/microsoft/3.31/manifest.xml
index 600eb2d98..ce8b575ad 100644
--- a/disks/pcx86/dos/microsoft/3.31/manifest.xml
+++ b/disks/pcx86/dos/microsoft/3.31/manifest.xml
@@ -1,5 +1,5 @@
-
+
MS-DOS
3.31
diff --git a/disks/pcx86/dos/microsoft/4.00/manifest.xml b/disks/pcx86/dos/microsoft/4.00/manifest.xml
index d5f88fc73..82e2b5d98 100644
--- a/disks/pcx86/dos/microsoft/4.00/manifest.xml
+++ b/disks/pcx86/dos/microsoft/4.00/manifest.xml
@@ -1,5 +1,5 @@
-
+
MS-DOS
4.00
diff --git a/disks/pcx86/dos/microsoft/4.01/720K/manifest.xml b/disks/pcx86/dos/microsoft/4.01/720K/manifest.xml
index e3184af2f..c170dc490 100644
--- a/disks/pcx86/dos/microsoft/4.01/720K/manifest.xml
+++ b/disks/pcx86/dos/microsoft/4.01/720K/manifest.xml
@@ -1,5 +1,5 @@
-
+
MS-DOS
4.01
diff --git a/disks/pcx86/dos/microsoft/4.01/manifest.xml b/disks/pcx86/dos/microsoft/4.01/manifest.xml
index 6178412fc..8636963fc 100644
--- a/disks/pcx86/dos/microsoft/4.01/manifest.xml
+++ b/disks/pcx86/dos/microsoft/4.01/manifest.xml
@@ -1,5 +1,5 @@
-
+
MS-DOS
4.01
diff --git a/disks/pcx86/dos/microsoft/4.0M/manifest.xml b/disks/pcx86/dos/microsoft/4.0M/manifest.xml
index a8c53f394..0b769bcff 100644
--- a/disks/pcx86/dos/microsoft/4.0M/manifest.xml
+++ b/disks/pcx86/dos/microsoft/4.0M/manifest.xml
@@ -1,5 +1,5 @@
-
+
MS-DOS
4.0M
diff --git a/disks/pcx86/dos/microsoft/5.00/manifest.xml b/disks/pcx86/dos/microsoft/5.00/manifest.xml
index 6b144e911..1ce579c0c 100644
--- a/disks/pcx86/dos/microsoft/5.00/manifest.xml
+++ b/disks/pcx86/dos/microsoft/5.00/manifest.xml
@@ -1,5 +1,5 @@
-
+
MS-DOS
5.00
diff --git a/disks/pcx86/dos/microsoft/6.00/manifest.xml b/disks/pcx86/dos/microsoft/6.00/manifest.xml
index edca4cbb3..76dab0f1d 100644
--- a/disks/pcx86/dos/microsoft/6.00/manifest.xml
+++ b/disks/pcx86/dos/microsoft/6.00/manifest.xml
@@ -1,5 +1,5 @@
-
+
MS-DOS
6.00
diff --git a/disks/pcx86/dos/microsoft/6.20/manifest.xml b/disks/pcx86/dos/microsoft/6.20/manifest.xml
index c2dc86d1f..b239468f3 100644
--- a/disks/pcx86/dos/microsoft/6.20/manifest.xml
+++ b/disks/pcx86/dos/microsoft/6.20/manifest.xml
@@ -1,5 +1,5 @@
-
+
MS-DOS
6.20
diff --git a/disks/pcx86/dos/microsoft/6.22/manifest.xml b/disks/pcx86/dos/microsoft/6.22/manifest.xml
index 232b766e7..159df6526 100644
--- a/disks/pcx86/dos/microsoft/6.22/manifest.xml
+++ b/disks/pcx86/dos/microsoft/6.22/manifest.xml
@@ -1,5 +1,5 @@
-
+
MS-DOS
6.22
diff --git a/disks/pcx86/empty/manifest.xml b/disks/pcx86/empty/manifest.xml
index 972ff6b68..bc3a18d83 100644
--- a/disks/pcx86/empty/manifest.xml
+++ b/disks/pcx86/empty/manifest.xml
@@ -1,5 +1,5 @@
-
+
Empty Diskettes
diff --git a/disks/pcx86/games/id/wolf3d/manifest.xml b/disks/pcx86/games/id/wolf3d/manifest.xml
index b9e6c973e..f91bedaa6 100644
--- a/disks/pcx86/games/id/wolf3d/manifest.xml
+++ b/disks/pcx86/games/id/wolf3d/manifest.xml
@@ -1,5 +1,5 @@
-
+
Wolfenstein 3D
diff --git a/disks/pcx86/games/infocom/hhiker/manifest.xml b/disks/pcx86/games/infocom/hhiker/manifest.xml
index caa59d548..d195ef123 100644
--- a/disks/pcx86/games/infocom/hhiker/manifest.xml
+++ b/disks/pcx86/games/infocom/hhiker/manifest.xml
@@ -1,5 +1,5 @@
-
+
The Hitchhiker's Guide to the Galaxy
diff --git a/disks/pcx86/games/infocom/machine.xml b/disks/pcx86/games/infocom/machine.xml
index b441947a6..752bbb0ab 100644
--- a/disks/pcx86/games/infocom/machine.xml
+++ b/disks/pcx86/games/infocom/machine.xml
@@ -1,5 +1,5 @@
-
+
IBM PC Model 5150 (CGA, 64K)
diff --git a/disks/pcx86/games/infocom/planet/manifest.xml b/disks/pcx86/games/infocom/planet/manifest.xml
index ee38e8583..0b541cfba 100644
--- a/disks/pcx86/games/infocom/planet/manifest.xml
+++ b/disks/pcx86/games/infocom/planet/manifest.xml
@@ -1,5 +1,5 @@
-
+
Planetfall
diff --git a/disks/pcx86/games/infocom/zork1/debugger/machine.xml b/disks/pcx86/games/infocom/zork1/debugger/machine.xml
index 90d323ba6..37ba01539 100644
--- a/disks/pcx86/games/infocom/zork1/debugger/machine.xml
+++ b/disks/pcx86/games/infocom/zork1/debugger/machine.xml
@@ -1,5 +1,5 @@
-
+
Zork I (IBM PC Model 5150)
diff --git a/disks/pcx86/games/infocom/zork1/manifest.xml b/disks/pcx86/games/infocom/zork1/manifest.xml
index 82fe8ba76..0757d2e05 100644
--- a/disks/pcx86/games/infocom/zork1/manifest.xml
+++ b/disks/pcx86/games/infocom/zork1/manifest.xml
@@ -1,5 +1,5 @@
-
+
Zork I
diff --git a/disks/pcx86/games/infocom/zork2/manifest.xml b/disks/pcx86/games/infocom/zork2/manifest.xml
index 1aea1da5d..637694ce3 100644
--- a/disks/pcx86/games/infocom/zork2/manifest.xml
+++ b/disks/pcx86/games/infocom/zork2/manifest.xml
@@ -1,5 +1,5 @@
-
+
Zork II
diff --git a/disks/pcx86/games/infocom/zork3/manifest.xml b/disks/pcx86/games/infocom/zork3/manifest.xml
index 146abc6ad..cf41e080b 100644
--- a/disks/pcx86/games/infocom/zork3/manifest.xml
+++ b/disks/pcx86/games/infocom/zork3/manifest.xml
@@ -1,5 +1,5 @@
-
+
Zork III
diff --git a/disks/pcx86/games/microsoft/adventure/machine.xml b/disks/pcx86/games/microsoft/adventure/machine.xml
index a3b3b03e4..63a6170db 100644
--- a/disks/pcx86/games/microsoft/adventure/machine.xml
+++ b/disks/pcx86/games/microsoft/adventure/machine.xml
@@ -1,5 +1,5 @@
-
+
IBM PC (Model 5150) running Microsoft Adventure
diff --git a/disks/pcx86/games/microsoft/adventure/manifest.xml b/disks/pcx86/games/microsoft/adventure/manifest.xml
index eaddd948b..efa8d3c1b 100644
--- a/disks/pcx86/games/microsoft/adventure/manifest.xml
+++ b/disks/pcx86/games/microsoft/adventure/manifest.xml
@@ -1,5 +1,5 @@
-
+
Microsoft Adventure
1.00
diff --git a/disks/pcx86/games/microsoft/flightsim/1982/manifest.xml b/disks/pcx86/games/microsoft/flightsim/1982/manifest.xml
index ddcfa73fd..11dc74bcf 100644
--- a/disks/pcx86/games/microsoft/flightsim/1982/manifest.xml
+++ b/disks/pcx86/games/microsoft/flightsim/1982/manifest.xml
@@ -1,5 +1,5 @@
-
+
Microsoft Flight Simulator
diff --git a/disks/pcx86/games/microsoft/flightsim/1984/manifest.xml b/disks/pcx86/games/microsoft/flightsim/1984/manifest.xml
index efc9b4e8b..5871c3b32 100644
--- a/disks/pcx86/games/microsoft/flightsim/1984/manifest.xml
+++ b/disks/pcx86/games/microsoft/flightsim/1984/manifest.xml
@@ -1,5 +1,5 @@
-
+
Microsoft Flight Simulator
diff --git a/disks/pcx86/minix/1.1/manifest.xml b/disks/pcx86/minix/1.1/manifest.xml
index 2470c1884..96728fd30 100644
--- a/disks/pcx86/minix/1.1/manifest.xml
+++ b/disks/pcx86/minix/1.1/manifest.xml
@@ -1,5 +1,5 @@
-
+
MINIX
1.1
diff --git a/disks/pcx86/os2/ibm/1.0/manifest.xml b/disks/pcx86/os2/ibm/1.0/manifest.xml
index c0b41b2db..93ef5b7e3 100644
--- a/disks/pcx86/os2/ibm/1.0/manifest.xml
+++ b/disks/pcx86/os2/ibm/1.0/manifest.xml
@@ -1,5 +1,5 @@
-
+
IBM OS/2 1.0
diff --git a/disks/pcx86/os2/ibm/1.1/manifest.xml b/disks/pcx86/os2/ibm/1.1/manifest.xml
index a3ba86983..4ddca0000 100644
--- a/disks/pcx86/os2/ibm/1.1/manifest.xml
+++ b/disks/pcx86/os2/ibm/1.1/manifest.xml
@@ -1,5 +1,5 @@
-
+
IBM OS/2 1.1
diff --git a/disks/pcx86/os2/ibm/1.3/manifest.xml b/disks/pcx86/os2/ibm/1.3/manifest.xml
index a1adf6305..a3394c1f8 100644
--- a/disks/pcx86/os2/ibm/1.3/manifest.xml
+++ b/disks/pcx86/os2/ibm/1.3/manifest.xml
@@ -1,5 +1,5 @@
-
+
IBM OS/2 1.3
diff --git a/disks/pcx86/os2/microsoft/1.0/manifest.xml b/disks/pcx86/os2/microsoft/1.0/manifest.xml
index 808f841b1..b788a66e9 100644
--- a/disks/pcx86/os2/microsoft/1.0/manifest.xml
+++ b/disks/pcx86/os2/microsoft/1.0/manifest.xml
@@ -1,5 +1,5 @@
-
+
MS OS/2 1.0
diff --git a/disks/pcx86/os2/misc/manifest.xml b/disks/pcx86/os2/misc/manifest.xml
index 238df8022..81bb838bc 100644
--- a/disks/pcx86/os2/misc/manifest.xml
+++ b/disks/pcx86/os2/misc/manifest.xml
@@ -1,5 +1,5 @@
-
+
OS/2 Prototype Disks
diff --git a/disks/pcx86/tools/borland/pascal/3.00b/manifest.xml b/disks/pcx86/tools/borland/pascal/3.00b/manifest.xml
index 7f93d5eb1..46dbec322 100644
--- a/disks/pcx86/tools/borland/pascal/3.00b/manifest.xml
+++ b/disks/pcx86/tools/borland/pascal/3.00b/manifest.xml
@@ -1,5 +1,5 @@
-
+
Borland Turbo Pascal
diff --git a/disks/pcx86/tools/borland/pascal/3.01a/manifest.xml b/disks/pcx86/tools/borland/pascal/3.01a/manifest.xml
index b92dc40d6..a5d541950 100644
--- a/disks/pcx86/tools/borland/pascal/3.01a/manifest.xml
+++ b/disks/pcx86/tools/borland/pascal/3.01a/manifest.xml
@@ -1,5 +1,5 @@
-
+
Borland Turbo Pascal
diff --git a/disks/pcx86/tools/ibm/bascom/1.00/manifest.xml b/disks/pcx86/tools/ibm/bascom/1.00/manifest.xml
index ab41e0181..e720cbda4 100644
--- a/disks/pcx86/tools/ibm/bascom/1.00/manifest.xml
+++ b/disks/pcx86/tools/ibm/bascom/1.00/manifest.xml
@@ -1,5 +1,5 @@
-
+
IBM BASIC Compiler
1.00
diff --git a/disks/pcx86/tools/microsoft/basic/manifest.xml b/disks/pcx86/tools/microsoft/basic/manifest.xml
index cf9c289b9..3121ea179 100644
--- a/disks/pcx86/tools/microsoft/basic/manifest.xml
+++ b/disks/pcx86/tools/microsoft/basic/manifest.xml
@@ -1,5 +1,5 @@
-
+
MS BASIC
diff --git a/disks/pcx86/tools/microsoft/c/2.03/manifest.xml b/disks/pcx86/tools/microsoft/c/2.03/manifest.xml
index f6393f000..07770b247 100644
--- a/disks/pcx86/tools/microsoft/c/2.03/manifest.xml
+++ b/disks/pcx86/tools/microsoft/c/2.03/manifest.xml
@@ -1,5 +1,5 @@
-
+
Microsoft C Compiler
2.03
diff --git a/disks/pcx86/tools/microsoft/c/3.00/manifest.xml b/disks/pcx86/tools/microsoft/c/3.00/manifest.xml
index ab5362feb..36e972ce2 100644
--- a/disks/pcx86/tools/microsoft/c/3.00/manifest.xml
+++ b/disks/pcx86/tools/microsoft/c/3.00/manifest.xml
@@ -1,5 +1,5 @@
-
+
Microsoft C Compiler
3.00
diff --git a/disks/pcx86/tools/microsoft/c/4.00/manifest.xml b/disks/pcx86/tools/microsoft/c/4.00/manifest.xml
index 3c6a69007..829ae46b9 100644
--- a/disks/pcx86/tools/microsoft/c/4.00/manifest.xml
+++ b/disks/pcx86/tools/microsoft/c/4.00/manifest.xml
@@ -1,5 +1,5 @@
-
+
Microsoft C Compiler
4.00
diff --git a/disks/pcx86/tools/microsoft/c/5.00/manifest.xml b/disks/pcx86/tools/microsoft/c/5.00/manifest.xml
index 751055519..f3aba56b6 100644
--- a/disks/pcx86/tools/microsoft/c/5.00/manifest.xml
+++ b/disks/pcx86/tools/microsoft/c/5.00/manifest.xml
@@ -1,5 +1,5 @@
-
+
Microsoft C Compiler
5.00
diff --git a/disks/pcx86/tools/microsoft/c/5.10-os2/manifest.xml b/disks/pcx86/tools/microsoft/c/5.10-os2/manifest.xml
index 1d157fe5f..2c118b59c 100644
--- a/disks/pcx86/tools/microsoft/c/5.10-os2/manifest.xml
+++ b/disks/pcx86/tools/microsoft/c/5.10-os2/manifest.xml
@@ -1,5 +1,5 @@
-
+
Microsoft C Compiler
5.10-OS2
diff --git a/disks/pcx86/tools/microsoft/c/5.10/manifest.xml b/disks/pcx86/tools/microsoft/c/5.10/manifest.xml
index abc195d85..f7c870565 100644
--- a/disks/pcx86/tools/microsoft/c/5.10/manifest.xml
+++ b/disks/pcx86/tools/microsoft/c/5.10/manifest.xml
@@ -1,5 +1,5 @@
-
+
Microsoft C Compiler
5.10
diff --git a/disks/pcx86/tools/microsoft/masm/1.00/manifest.xml b/disks/pcx86/tools/microsoft/masm/1.00/manifest.xml
index c56faae90..601bf143d 100644
--- a/disks/pcx86/tools/microsoft/masm/1.00/manifest.xml
+++ b/disks/pcx86/tools/microsoft/masm/1.00/manifest.xml
@@ -1,5 +1,5 @@
-
+
Microsoft Macro Assembler
1.00
diff --git a/disks/pcx86/tools/microsoft/masm/3.00/manifest.xml b/disks/pcx86/tools/microsoft/masm/3.00/manifest.xml
index d9b3f8fc7..1c1a3f557 100644
--- a/disks/pcx86/tools/microsoft/masm/3.00/manifest.xml
+++ b/disks/pcx86/tools/microsoft/masm/3.00/manifest.xml
@@ -1,5 +1,5 @@
-
+
Microsoft Macro Assembler
3.00
diff --git a/disks/pcx86/tools/microsoft/masm/3.01/manifest.xml b/disks/pcx86/tools/microsoft/masm/3.01/manifest.xml
index 93baad1c6..fa5c9f017 100644
--- a/disks/pcx86/tools/microsoft/masm/3.01/manifest.xml
+++ b/disks/pcx86/tools/microsoft/masm/3.01/manifest.xml
@@ -1,5 +1,5 @@
-
+
Microsoft Macro Assembler
3.01
diff --git a/disks/pcx86/tools/microsoft/masm/4.00/manifest.xml b/disks/pcx86/tools/microsoft/masm/4.00/manifest.xml
index d38a5b8b0..5ad7b3a99 100644
--- a/disks/pcx86/tools/microsoft/masm/4.00/manifest.xml
+++ b/disks/pcx86/tools/microsoft/masm/4.00/manifest.xml
@@ -1,5 +1,5 @@
-
+
Microsoft Macro Assembler
4.00
diff --git a/disks/pcx86/tools/microsoft/masm/5.00/manifest.xml b/disks/pcx86/tools/microsoft/masm/5.00/manifest.xml
index a3db2a1ce..d5bd39e4b 100644
--- a/disks/pcx86/tools/microsoft/masm/5.00/manifest.xml
+++ b/disks/pcx86/tools/microsoft/masm/5.00/manifest.xml
@@ -1,5 +1,5 @@
-
+
Microsoft Macro Assembler
5.00
diff --git a/disks/pcx86/tools/microsoft/masm/5.10/manifest.xml b/disks/pcx86/tools/microsoft/masm/5.10/manifest.xml
index 3a169dd36..266c67b92 100644
--- a/disks/pcx86/tools/microsoft/masm/5.10/manifest.xml
+++ b/disks/pcx86/tools/microsoft/masm/5.10/manifest.xml
@@ -1,5 +1,5 @@
-
+
Microsoft Macro Assembler
5.10
diff --git a/disks/pcx86/tools/microsoft/masm/6.00/manifest.xml b/disks/pcx86/tools/microsoft/masm/6.00/manifest.xml
index 11df75add..8b0d069a1 100644
--- a/disks/pcx86/tools/microsoft/masm/6.00/manifest.xml
+++ b/disks/pcx86/tools/microsoft/masm/6.00/manifest.xml
@@ -1,5 +1,5 @@
-
+
Microsoft Macro Assembler
6.00
diff --git a/disks/pcx86/tools/microsoft/masm/6.11/manifest.xml b/disks/pcx86/tools/microsoft/masm/6.11/manifest.xml
index d7aebf891..0715460cd 100644
--- a/disks/pcx86/tools/microsoft/masm/6.11/manifest.xml
+++ b/disks/pcx86/tools/microsoft/masm/6.11/manifest.xml
@@ -1,5 +1,5 @@
-
+
Microsoft Macro Assembler
6.11
diff --git a/disks/pcx86/tools/microsoft/mouse/5.00/manifest.xml b/disks/pcx86/tools/microsoft/mouse/5.00/manifest.xml
index 66895a1da..12c0f2451 100644
--- a/disks/pcx86/tools/microsoft/mouse/5.00/manifest.xml
+++ b/disks/pcx86/tools/microsoft/mouse/5.00/manifest.xml
@@ -1,5 +1,5 @@
-
+
MS Mouse
5.00
diff --git a/disks/pcx86/tools/microsoft/os2/sdk/1.02/manifest.xml b/disks/pcx86/tools/microsoft/os2/sdk/1.02/manifest.xml
index d19d6304b..1b1910e67 100644
--- a/disks/pcx86/tools/microsoft/os2/sdk/1.02/manifest.xml
+++ b/disks/pcx86/tools/microsoft/os2/sdk/1.02/manifest.xml
@@ -1,5 +1,5 @@
-
+
MS OS/2 SDK 1.02
diff --git a/disks/pcx86/tools/microsoft/windows/sdk/1.01/manifest.xml b/disks/pcx86/tools/microsoft/windows/sdk/1.01/manifest.xml
index adc12d50f..c5d865871 100644
--- a/disks/pcx86/tools/microsoft/windows/sdk/1.01/manifest.xml
+++ b/disks/pcx86/tools/microsoft/windows/sdk/1.01/manifest.xml
@@ -1,5 +1,5 @@
-
+
Windows SDK 1.01
diff --git a/disks/pcx86/tools/microsoft/windows/sdk/1.03/manifest.xml b/disks/pcx86/tools/microsoft/windows/sdk/1.03/manifest.xml
index e83d48cc2..b92987757 100644
--- a/disks/pcx86/tools/microsoft/windows/sdk/1.03/manifest.xml
+++ b/disks/pcx86/tools/microsoft/windows/sdk/1.03/manifest.xml
@@ -1,5 +1,5 @@
-
+
Windows SDK 1.03
diff --git a/disks/pcx86/tools/microsoft/windows/sdk/1.04/manifest.xml b/disks/pcx86/tools/microsoft/windows/sdk/1.04/manifest.xml
index 9c7e13508..11ec69c9e 100644
--- a/disks/pcx86/tools/microsoft/windows/sdk/1.04/manifest.xml
+++ b/disks/pcx86/tools/microsoft/windows/sdk/1.04/manifest.xml
@@ -1,5 +1,5 @@
-
+
Windows SDK 1.04
os2museum.com
diff --git a/disks/pcx86/tools/microsoft/windows/sdk/2.03/manifest.xml b/disks/pcx86/tools/microsoft/windows/sdk/2.03/manifest.xml
index 890273900..6da1e4ded 100644
--- a/disks/pcx86/tools/microsoft/windows/sdk/2.03/manifest.xml
+++ b/disks/pcx86/tools/microsoft/windows/sdk/2.03/manifest.xml
@@ -1,5 +1,5 @@
-
+
Windows SDK 2.03
os2museum.com
diff --git a/disks/pcx86/tools/microsoft/windows/sdk/3.00/manifest.xml b/disks/pcx86/tools/microsoft/windows/sdk/3.00/manifest.xml
index eb2cd4920..9e2cb4d90 100644
--- a/disks/pcx86/tools/microsoft/windows/sdk/3.00/manifest.xml
+++ b/disks/pcx86/tools/microsoft/windows/sdk/3.00/manifest.xml
@@ -1,5 +1,5 @@
-
+
Windows SDK 3.00
diff --git a/disks/pcx86/tools/misc/manifest.xml b/disks/pcx86/tools/misc/manifest.xml
index 353011fc8..ba31d57a3 100644
--- a/disks/pcx86/tools/misc/manifest.xml
+++ b/disks/pcx86/tools/misc/manifest.xml
@@ -1,5 +1,5 @@
-
+
Enhanced DEBUG
PC DOS Retro: Enhanced DEBUG for PC DOS and MS-DOS
diff --git a/disks/pcx86/unix/ibm/pcix/1.0/manifest.xml b/disks/pcx86/unix/ibm/pcix/1.0/manifest.xml
index a64051887..6c7a5341b 100644
--- a/disks/pcx86/unix/ibm/pcix/1.0/manifest.xml
+++ b/disks/pcx86/unix/ibm/pcix/1.0/manifest.xml
@@ -1,5 +1,5 @@
-
+
PC/IX 1.0
diff --git a/disks/pcx86/unix/microport/system-v/2.3/manifest.xml b/disks/pcx86/unix/microport/system-v/2.3/manifest.xml
index cecd8e165..8432f0039 100644
--- a/disks/pcx86/unix/microport/system-v/2.3/manifest.xml
+++ b/disks/pcx86/unix/microport/system-v/2.3/manifest.xml
@@ -1,5 +1,5 @@
-
+
Microport's AT&T UNIX System V-AT 2.3 (5¨)
diff --git a/disks/pcx86/unix/sco/xenix/8086/2.1.3/manifest.xml b/disks/pcx86/unix/sco/xenix/8086/2.1.3/manifest.xml
index 3ec8dacf8..ebd955d1d 100644
--- a/disks/pcx86/unix/sco/xenix/8086/2.1.3/manifest.xml
+++ b/disks/pcx86/unix/sco/xenix/8086/2.1.3/manifest.xml
@@ -1,5 +1,5 @@
-
+
SCO Xenix 8086 Operating System v2.1.3
diff --git a/disks/pcx86/windows/1.00/manifest.xml b/disks/pcx86/windows/1.00/manifest.xml
index b3d2d913c..e8936c26c 100644
--- a/disks/pcx86/windows/1.00/manifest.xml
+++ b/disks/pcx86/windows/1.00/manifest.xml
@@ -1,5 +1,5 @@
-
+
Microsoft Windows 1.00
diff --git a/disks/pcx86/windows/1.01/manifest.xml b/disks/pcx86/windows/1.01/manifest.xml
index 1bfdffb4c..c9672d968 100644
--- a/disks/pcx86/windows/1.01/manifest.xml
+++ b/disks/pcx86/windows/1.01/manifest.xml
@@ -1,5 +1,5 @@
-
+
Microsoft Windows 1.01
diff --git a/disks/pcx86/windows/1.02/manifest.xml b/disks/pcx86/windows/1.02/manifest.xml
index 963d116a7..35dd6a59d 100644
--- a/disks/pcx86/windows/1.02/manifest.xml
+++ b/disks/pcx86/windows/1.02/manifest.xml
@@ -1,5 +1,5 @@
-
+
Microsoft Windows 1.02
diff --git a/disks/pcx86/windows/1.03/manifest.xml b/disks/pcx86/windows/1.03/manifest.xml
index 83a5e1d83..2155c8607 100644
--- a/disks/pcx86/windows/1.03/manifest.xml
+++ b/disks/pcx86/windows/1.03/manifest.xml
@@ -1,5 +1,5 @@
-
+
Microsoft Windows 1.03
diff --git a/disks/pcx86/windows/1.03a/manifest.xml b/disks/pcx86/windows/1.03a/manifest.xml
index 28f842f61..98fdeb686 100644
--- a/disks/pcx86/windows/1.03a/manifest.xml
+++ b/disks/pcx86/windows/1.03a/manifest.xml
@@ -1,5 +1,5 @@
-
+
Microsoft Windows 1.03a
diff --git a/disks/pcx86/windows/1.03b/manifest.xml b/disks/pcx86/windows/1.03b/manifest.xml
index 34555569d..0be1ccc23 100644
--- a/disks/pcx86/windows/1.03b/manifest.xml
+++ b/disks/pcx86/windows/1.03b/manifest.xml
@@ -1,5 +1,5 @@
-
+
Microsoft Windows 1.03b
diff --git a/disks/pcx86/windows/1.04/manifest.xml b/disks/pcx86/windows/1.04/manifest.xml
index 3a71ab392..19ac4be3f 100644
--- a/disks/pcx86/windows/1.04/manifest.xml
+++ b/disks/pcx86/windows/1.04/manifest.xml
@@ -1,5 +1,5 @@
-
+
Microsoft Windows 1.04
os2museum.com
diff --git a/disks/pcx86/windows/2.03/manifest.xml b/disks/pcx86/windows/2.03/manifest.xml
index c6d535967..75809917c 100644
--- a/disks/pcx86/windows/2.03/manifest.xml
+++ b/disks/pcx86/windows/2.03/manifest.xml
@@ -1,5 +1,5 @@
-
+
Microsoft Windows 2.03
diff --git a/disks/pcx86/windows/2.0x/manifest.xml b/disks/pcx86/windows/2.0x/manifest.xml
index 6ae1c1660..141783267 100644
--- a/disks/pcx86/windows/2.0x/manifest.xml
+++ b/disks/pcx86/windows/2.0x/manifest.xml
@@ -1,5 +1,5 @@
-
+
Microsoft Windows/386 2.0x
diff --git a/disks/pcx86/windows/2.10/manifest.xml b/disks/pcx86/windows/2.10/manifest.xml
index 617b1c953..a36db8f40 100644
--- a/disks/pcx86/windows/2.10/manifest.xml
+++ b/disks/pcx86/windows/2.10/manifest.xml
@@ -1,5 +1,5 @@
-
+
Microsoft Windows/386 2.10
diff --git a/disks/pcx86/windows/2.11/manifest.xml b/disks/pcx86/windows/2.11/manifest.xml
index a0d5c04d3..a3a095fc6 100644
--- a/disks/pcx86/windows/2.11/manifest.xml
+++ b/disks/pcx86/windows/2.11/manifest.xml
@@ -1,5 +1,5 @@
-
+