diff --git a/Gruntfile.js b/Gruntfile.js
index 702f6e821e..2747f6bdfc 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -385,43 +385,6 @@ module.exports = function(grunt) {
                     }
                 }
             },
-            "pcxsl": {
-                files: [
-                    {
-                        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
-                    }
-                ],
-                options: {
-                    process: function(content, srcPath) {
-                        var s = content.replace(/(<xsl:variable name="APPVERSION">)[^<]*(<\/xsl:variable>)/g, "$1" + pkg.version + "$2");
-                        s = s.replace(/"[^"]*\/?(common.css|common.xsl|components.css|components.xsl|document.css|document.xsl)"/g, '"/versions/pcjs/' + pkg.version + '/$1"');
-                        s = s.replace(/[ \t]*\/\*[^\*][\s\S]*?\*\//g, "").replace(/[ \t]*<!--[^@]*?-->[ \t]*\n?/g, "");
-                        return s;
-                    }
-                }
-            },
-            "pc8080xsl": {
-                files: [
-                    {
-                        cwd: "modules/shared/templates/",
-                        src: ["common.css", "common.xsl", "document.css", "document.xsl", "machine.xsl", "manifest.xsl", "outline.xsl"],
-                        dest: "versions/pc8080/<%= pkg.version %>/",
-                        expand: true
-                    }
-                ],
-                options: {
-                    process: function(content, srcPath) {
-                        var s = content.replace(/(<xsl:variable name="APPCLASS">)[^<]*(<\/xsl:variable>)/g, "$1pc8080$2");
-                        s = s.replace(/(<xsl:variable name="APPVERSION">)[^<]*(<\/xsl:variable>)/g, "$1" + pkg.version + "$2");
-                        s = s.replace(/"[^"]*\/?(common.css|common.xsl|components.css|components.xsl|document.css|document.xsl)"/g, '"/versions/pc8080/' + pkg.version + '/$1"');
-                        s = s.replace(/[ \t]*\/\*[^\*][\s\S]*?\*\//g, "").replace(/[ \t]*<!--[^@]*?-->[ \t]*\n?/g, "");
-                        return s;
-                    }
-                }
-            },
             "c1pjs": {
                 files: [
                     {
@@ -443,7 +406,7 @@ module.exports = function(grunt) {
                 files: [
                     {
                         cwd: "modules/shared/templates/",
-                        src: ["components.*"],
+                        src: ["common.css", "common.xsl", "components.*", "document.css", "document.xsl", "machine.xsl", "manifest.xsl", "outline.xsl"],
                         dest: "versions/pcjs/<%= pkg.version %>/",
                         expand: true
                     }
@@ -451,6 +414,7 @@ module.exports = function(grunt) {
                 options: {
                     process: function(content, srcPath) {
                         var s = content.replace(/(<xsl:variable name="APPVERSION">)[^<]*(<\/xsl:variable>)/g, "$1" + pkg.version + "$2");
+                        s = s.replace(/"[^"]*\/?(common.css|common.xsl|components.css|components.xsl|document.css|document.xsl)"/g, '"/versions/pcjs/' + pkg.version + '/$1"');
                         s = s.replace(/[ \t]*\/\*[^\*][\s\S]*?\*\//g, "").replace(/[ \t]*<!--[^@]*?-->[ \t]*\n?/g, "");
                         return s;
                     }
@@ -460,7 +424,7 @@ module.exports = function(grunt) {
                 files: [
                     {
                         cwd: "modules/shared/templates/",
-                        src: ["components.*"],
+                        src: ["common.css", "common.xsl", "components.*", "document.css", "document.xsl", "machine.xsl", "manifest.xsl", "outline.xsl"],
                         dest: "versions/pc8080/<%= pkg.version %>/",
                         expand: true
                     }
@@ -468,7 +432,9 @@ module.exports = function(grunt) {
                 options: {
                     process: function(content, srcPath) {
                         var s = content.replace(/(<xsl:variable name="APPCLASS">)[^<]*(<\/xsl:variable>)/g, "$1pc8080$2");
+                        s = s.replace(/(<xsl:variable name="APPNAME">)[^<]*(<\/xsl:variable>)/g, "$1PC8080$2");
                         s = s.replace(/(<xsl:variable name="APPVERSION">)[^<]*(<\/xsl:variable>)/g, "$1" + pkg.version + "$2");
+                        s = s.replace(/"[^"]*\/?(common.css|common.xsl|components.css|components.xsl|document.css|document.xsl)"/g, '"/versions/pc8080/' + pkg.version + '/$1"');
                         s = s.replace(/[ \t]*\/\*[^\*][\s\S]*?\*\//g, "").replace(/[ \t]*<!--[^@]*?-->[ \t]*\n?/g, "");
                         return s;
                     }
diff --git a/_posts/2016-04-30-the-intel-8080-cpu.md b/_posts/2016-04-30-the-intel-8080-cpu.md
index 789c3f8891..417f587bfa 100644
--- a/_posts/2016-04-30-the-intel-8080-cpu.md
+++ b/_posts/2016-04-30-the-intel-8080-cpu.md
@@ -15,7 +15,7 @@ calls so that you can see its progress in the Control Panel window.  It's a "hea
 (no keyboard or display), so that's all you get.
 
 The good news: PC8080 passes all the 8080 Exerciser tests.  And it doesn't do it by using all sorts of weird
-"flags tables", which most other 8080 emulations seem to fall back on.
+"flags tables" that most other 8080 emulators seem to fall back on.
 
 Like all the other CPU emulations in the PCjs Project, PC8080 never "calculates" the flags unless/until they are
 actually required, which considerably speeds up arithmetic operations.
diff --git a/devices/pc8080/machine/test/README.md b/devices/pc8080/machine/test/README.md
index a153fa2e67..b195e1785a 100644
--- a/devices/pc8080/machine/test/README.md
+++ b/devices/pc8080/machine/test/README.md
@@ -21,7 +21,7 @@ calls so that you can see its progress in the Control Panel window.  This is a "
 (no keyboard or display), so that's all you get.
 
 The good news: PC8080 passes all the 8080 Exerciser tests.  And it doesn't do it by using all sorts of weird
-"flags tables", which most other 8080 emulations seem to fall back on.
+"flags tables" that most other 8080 emulators seem to fall back on.
 
 Like all the other CPU emulations in the PCjs Project, PC8080 never "calculates" the flags unless/until they are
 actually required, which considerably speeds up all arithmetic operations.
diff --git a/disks/pc/compiled/library.xml b/disks/pc/compiled/library.xml
index fa926a70f3..e6ccfa3a34 100644
--- a/disks/pc/compiled/library.xml
+++ b/disks/pc/compiled/library.xml
@@ -294,21 +294,21 @@
 		<disk path="/disks/pc/unix/ibm/pcix/1.0/17SPECIA.json">PC/IX 1.0 (SPECIA)</disk>
 		<disk path="/disks/pc/unix/ibm/pcix/1.0/18GAMES.json">PC/IX 1.0 (GAMES)</disk>
 		<disk path="/disks/pc/unix/ibm/pcix/1.0/19ACCNT.json">PC/IX 1.0 (ACCNT)</disk>
-		<disk path="/disks/pc/unix/microport/system-v/2.3/SYSTEMV23-DISK01.json">Boot Disk</disk>
-		<disk path="/disks/pc/unix/microport/system-v/2.3/SYSTEMV23-DISK02.json">Runtime Disk 1</disk>
-		<disk path="/disks/pc/unix/microport/system-v/2.3/SYSTEMV23-DISK03.json">Runtime Disk 2</disk>
-		<disk path="/disks/pc/unix/microport/system-v/2.3/SYSTEMV23-DISK04.json">Runtime Disk 3</disk>
-		<disk path="/disks/pc/unix/microport/system-v/2.3/SYSTEMV23-DISK05.json">Runtime Utility Disk</disk>
-		<disk path="/disks/pc/unix/microport/system-v/2.3/SYSTEMV23-DISK06.json">Runtime System Vision</disk>
-		<disk path="/disks/pc/unix/microport/system-v/2.3/SYSTEMV23-DISK07.json">Runtime Link Kit Disk</disk>
-		<disk path="/disks/pc/unix/microport/system-v/2.3/SYSTEMV23-DISK08.json">Software Dev Disk 1</disk>
-		<disk path="/disks/pc/unix/microport/system-v/2.3/SYSTEMV23-DISK09.json">Software Dev Disk 2</disk>
-		<disk path="/disks/pc/unix/microport/system-v/2.3/SYSTEMV23-DISK10.json">Software Dev Disk 3</disk>
-		<disk path="/disks/pc/unix/microport/system-v/2.3/SYSTEMV23-DISK11.json">Software Dev Disk 4</disk>
-		<disk path="/disks/pc/unix/microport/system-v/2.3/SYSTEMV23-DISK12.json">Software Dev Upgrade</disk>
-		<disk path="/disks/pc/unix/microport/system-v/2.3/SYSTEMV23-DISK13.json">Text Prep Disk 1</disk>
-		<disk path="/disks/pc/unix/microport/system-v/2.3/SYSTEMV23-DISK14.json">Text Prep Disk 2</disk>
-		<disk path="/disks/pc/unix/microport/system-v/2.3/SYSTEMV23-DISK15.json">Text Prep Disk 3</disk>
+		<disk path="/disks/pc/unix/microport/system-v/2.3/SYSTEMV23-DISK01.json">UNIX System V Boot Disk</disk>
+		<disk path="/disks/pc/unix/microport/system-v/2.3/SYSTEMV23-DISK02.json">UNIX System V Runtime (Disk 1)</disk>
+		<disk path="/disks/pc/unix/microport/system-v/2.3/SYSTEMV23-DISK03.json">UNIX System V Runtime (Disk 2)</disk>
+		<disk path="/disks/pc/unix/microport/system-v/2.3/SYSTEMV23-DISK04.json">UNIX System V Runtime (Disk 3)</disk>
+		<disk path="/disks/pc/unix/microport/system-v/2.3/SYSTEMV23-DISK05.json">UNIX System V Runtime Utility Disk</disk>
+		<disk path="/disks/pc/unix/microport/system-v/2.3/SYSTEMV23-DISK06.json">UNIX System V Runtime System Vision</disk>
+		<disk path="/disks/pc/unix/microport/system-v/2.3/SYSTEMV23-DISK07.json">UNIX System V Runtime Link Kit</disk>
+		<disk path="/disks/pc/unix/microport/system-v/2.3/SYSTEMV23-DISK08.json">UNIX System V Software Dev (Disk 1)</disk>
+		<disk path="/disks/pc/unix/microport/system-v/2.3/SYSTEMV23-DISK09.json">UNIX System V Software Dev (Disk 2)</disk>
+		<disk path="/disks/pc/unix/microport/system-v/2.3/SYSTEMV23-DISK10.json">UNIX System V Software Dev (Disk 3)</disk>
+		<disk path="/disks/pc/unix/microport/system-v/2.3/SYSTEMV23-DISK11.json">UNIX System V Software Dev (Disk 4)</disk>
+		<disk path="/disks/pc/unix/microport/system-v/2.3/SYSTEMV23-DISK12.json">UNIX System V Software Dev Upgrade</disk>
+		<disk path="/disks/pc/unix/microport/system-v/2.3/SYSTEMV23-DISK13.json">UNIX System V Text Prep (Disk 1)</disk>
+		<disk path="/disks/pc/unix/microport/system-v/2.3/SYSTEMV23-DISK14.json">UNIX System V Text Prep (Disk 2)</disk>
+		<disk path="/disks/pc/unix/microport/system-v/2.3/SYSTEMV23-DISK15.json">UNIX System V Text Prep (Disk 3)</disk>
 		<disk path="/disks/pc/unix/sco/xenix/8086/2.1.3/N1.json">SCO Xenix 8086 (N1)</disk>
 		<disk path="/disks/pc/unix/sco/xenix/8086/2.1.3/N2.json">SCO Xenix 8086 (N2)</disk>
 		<disk path="/disks/pc/unix/sco/xenix/8086/2.1.3/N3.json">SCO Xenix 8086 (N3)</disk>
@@ -508,11 +508,11 @@
 		<disk path="/apps/pc/1985/rogue/disk.json">Demo: Rogue (1985)</disk>
 		<disk path="/apps/pc/1987/thinktank/disk.json">Demo: ThinkTank (1987)</disk>
 		<disk path="/apps/pc/1992/moria/disk.json">Demo: Moria 5.5 (1992)</disk>
-		<disk path="/pubs/pc/programming/DOS_Internals/DOS-INTERN.json">DOS Internals</disk>
-		<disk path="/pubs/pc/programming/The_Undocumented_PC/UNDOC.json">The Undocumented PC</disk>
-		<disk path="/pubs/pc/programming/Undocumented_DOS/UNDOC-DOS-DISK1.json">Undocumented DOS (Disk 1)</disk>
-		<disk path="/pubs/pc/programming/Undocumented_DOS/UNDOC-DOS-DISK2.json">Undocumented DOS (Disk 2)</disk>
-		<disk path="/pubs/pc/programming/Undocumented_Windows/UNDOC-WIN.json">Undocumented Windows</disk>
+		<disk path="/pubs/pc/programming/DOS_Internals/DOS-INTERN.json">Book: DOS Internals</disk>
+		<disk path="/pubs/pc/programming/The_Undocumented_PC/UNDOC.json">Book: The Undocumented PC</disk>
+		<disk path="/pubs/pc/programming/Undocumented_DOS/UNDOC-DOS-DISK1.json">Book: Undocumented DOS (Disk 1)</disk>
+		<disk path="/pubs/pc/programming/Undocumented_DOS/UNDOC-DOS-DISK2.json">Book: Undocumented DOS (Disk 2)</disk>
+		<disk path="/pubs/pc/programming/Undocumented_Windows/UNDOC-WIN.json">Book: Undocumented Windows</disk>
 		<disk path="/tests/pc/vga/VGABIN.json">VGA Tests (Black Book)</disk>
 	</control>
 	<control type="button" binding="loadDrive">Load</control>
diff --git a/disks/pc/unix/microport/system-v/2.3/manifest.xml b/disks/pc/unix/microport/system-v/2.3/manifest.xml
index fdd05e54e6..6c39cc2671 100644
--- a/disks/pc/unix/microport/system-v/2.3/manifest.xml
+++ b/disks/pc/unix/microport/system-v/2.3/manifest.xml
@@ -3,48 +3,48 @@
 <manifest type="software">
 	<title prefix="System V">Microport's AT&amp;T UNIX System V-AT 2.3 (5¨)</title>
 	<disk id="disk01" size="1228800" chs="80:2:15" img="archive/01 - System Diskette Boot Disk 1.img" href="/disks/pc/unix/microport/system-v/2.3/SYSTEMV23-DISK01.json" md5="08b5f4199ca06be2595ee9cf46f94857" md5json="87e19cb658085bd6d6173526ec0d3261">
-		<name>Boot Disk</name>
+		<name>UNIX System V Boot Disk</name>
 	</disk>
 	<disk id="disk02" size="1228800" chs="80:2:15" img="archive/02 - Runtime Disk 1.img" href="/disks/pc/unix/microport/system-v/2.3/SYSTEMV23-DISK02.json" md5="a56898d71a33dd09d19690084a6a8dfb" md5json="c47f303ae3b6514ae49c517ecfe83d2d">
-		<name>Runtime Disk 1</name>
+		<name>UNIX System V Runtime (Disk 1)</name>
 	</disk>
 	<disk id="disk03" size="1228800" chs="80:2:15" img="archive/03 - Runtime Disk 2.img" href="/disks/pc/unix/microport/system-v/2.3/SYSTEMV23-DISK03.json" md5="b62fd5e68f4d4c3c2b43530240197270" md5json="dc524ffe15a4f598a3c2ef185f2fe2b3">
-		<name>Runtime Disk 2</name>
+		<name>UNIX System V Runtime (Disk 2)</name>
 	</disk>
 	<disk id="disk04" size="1228800" chs="80:2:15" img="archive/04 - Runtime Disk 3.img" href="/disks/pc/unix/microport/system-v/2.3/SYSTEMV23-DISK04.json" md5="70b6750aaf621d8cb5968e3465f11a47" md5json="c491f195cbaffd763cf1ad813ab70831">
-		<name>Runtime Disk 3</name>
+		<name>UNIX System V Runtime (Disk 3)</name>
 	</disk>
 	<disk id="disk05" size="1228800" chs="80:2:15" img="archive/05 - Runtime Utility Disk.img" href="/disks/pc/unix/microport/system-v/2.3/SYSTEMV23-DISK05.json" md5="a1c2923f7116a29d1ab68a82ea2ac262" md5json="c19f5dcf0892da7f1372dc8d83d73f26">
-		<name>Runtime Utility Disk</name>
+		<name>UNIX System V Runtime Utility Disk</name>
 	</disk>
 	<disk id="disk06" size="1228800" chs="80:2:15" img="archive/06 - Runtime System Vision.img" href="/disks/pc/unix/microport/system-v/2.3/SYSTEMV23-DISK06.json" md5="19ffd026dd55bb39645e859a7ba86b06" md5json="104f8e9ef40b13418141674d84cf908f">
-		<name>Runtime System Vision</name>
+		<name>UNIX System V Runtime System Vision</name>
 	</disk>
 	<disk id="disk07" size="1228800" chs="80:2:15" img="archive/07 - Runtime Link Kit Disk.img" href="/disks/pc/unix/microport/system-v/2.3/SYSTEMV23-DISK07.json" md5="d010e85d690a23be6807694dfd99b7cd" md5json="9ca249bd570ad07c94c5c238ab9ca7ca">
-		<name>Runtime Link Kit Disk</name>
+		<name>UNIX System V Runtime Link Kit</name>
 	</disk>
 	<disk id="disk08" size="1228800" chs="80:2:15" img="archive/08 - Software Development Disk 1 EXPROGDEV.1.img" href="/disks/pc/unix/microport/system-v/2.3/SYSTEMV23-DISK08.json" md5="f13ae1e2fb556423bd418b0f336203b9" md5json="74f7c32c7ab7a344fa0afee04a816fef">
-		<name>Software Dev Disk 1</name>
+		<name>UNIX System V Software Dev (Disk 1)</name>
 	</disk>
 	<disk id="disk09" size="1228800" chs="80:2:15" img="archive/09 - Software Development Disk 2 PROGDEV.1.img" href="/disks/pc/unix/microport/system-v/2.3/SYSTEMV23-DISK09.json" md5="684d16091cac18152c3259455bc51023" md5json="1a4a0f327831f524ab86d253091b0362">
-		<name>Software Dev Disk 2</name>
+		<name>UNIX System V Software Dev (Disk 2)</name>
 	</disk>
 	<disk id="disk10" size="1228800" chs="80:2:15" img="archive/10 - Software Development Disk 3 PROGDEV.2.img" href="/disks/pc/unix/microport/system-v/2.3/SYSTEMV23-DISK10.json" md5="5ae1c5f8ca25564374d74d91b0c08bfc" md5json="e685e80181a017857664c305435d928a">
-		<name>Software Dev Disk 3</name>
+		<name>UNIX System V Software Dev (Disk 3)</name>
 	</disk>
 	<disk id="disk11" size="1228800" chs="80:2:15" img="archive/11 - Software Development Disk 4 PROGDEV.3.img" href="/disks/pc/unix/microport/system-v/2.3/SYSTEMV23-DISK11.json" md5="62798053f89cdf8c4012a64e1092629b" md5json="f3e2062d106aeece5c32d3efdd80dcb6">
-		<name>Software Dev Disk 4</name>
+		<name>UNIX System V Software Dev (Disk 4)</name>
 	</disk>
 	<disk id="disk12" size="1228800" chs="80:2:15" img="archive/12 - Software Development Upgrade Disk.img" href="/disks/pc/unix/microport/system-v/2.3/SYSTEMV23-DISK12.json" md5="0fd28b9b7110a2455fa32ce94fb24905" md5json="4a005f9c97cb5b39b2d49ab5f3f61c36">
-		<name>Software Dev Upgrade</name>
+		<name>UNIX System V Software Dev Upgrade</name>
 	</disk>
 	<disk id="disk13" size="1228800" chs="80:2:15" img="archive/13 - Text Preparation Disk 1 EXTEXT.1.img" href="/disks/pc/unix/microport/system-v/2.3/SYSTEMV23-DISK13.json" md5="c8ac3211e216dde23523714cb7ae8001" md5json="f378778e542e0c97518a0548ebcaa106">
-		<name>Text Prep Disk 1</name>
+		<name>UNIX System V Text Prep (Disk 1)</name>
 	</disk>
 	<disk id="disk14" size="1228800" chs="80:2:15" img="archive/14 - Text Preparation Disk 2 TEXT.1.img" href="/disks/pc/unix/microport/system-v/2.3/SYSTEMV23-DISK14.json" md5="1b7d785fb313cbc2d826993007723fe2" md5json="8616cb36945fe813b57407c2a70c8b8f">
-		<name>Text Prep Disk 2</name>
+		<name>UNIX System V Text Prep (Disk 2)</name>
 	</disk>
 	<disk id="disk15" size="1228800" chs="80:2:15" img="archive/15 - Text Preparation Disk 3 EXTEXT.2.img" href="/disks/pc/unix/microport/system-v/2.3/SYSTEMV23-DISK15.json" md5="b41fe3066f91102809e3ddc806942933" md5json="3ad9c286389927c75fe98b7f7578a2bf">
-		<name>Text Prep Disk 3</name>
+		<name>UNIX System V Text Prep (Disk 3)</name>
 	</disk>
 </manifest>
diff --git a/docs/pcjs/examples/components.xsl b/docs/pcjs/examples/components.xsl
index 4ed28f6088..4c7793aecc 100644
--- a/docs/pcjs/examples/components.xsl
+++ b/docs/pcjs/examples/components.xsl
@@ -12,11 +12,12 @@
 	<xsl:variable name="MACHINECLASS">pc</xsl:variable>
 	<xsl:variable name="CSSCLASS">pcjs</xsl:variable>
 	<xsl:variable name="APPCLASS">pcjs</xsl:variable>
+	<xsl:variable name="APPNAME">PCjs</xsl:variable>
 	<xsl:variable name="APPVERSION">1.21.7</xsl:variable>
 	<xsl:variable name="SITEHOST">www.pcjs.org</xsl:variable>
 
 	<xsl:template name="componentStyles">
-		<link rel="stylesheet" type="text/css" href="components.css"/>
+		<link rel="stylesheet" type="text/css" href="/versions/pcjs/1.21.7/components.css"/>
 	</xsl:template>
 
 	<xsl:template name="componentScripts">
@@ -241,7 +242,7 @@
 				</xsl:choose>
 				<xsl:if test="$APPCLASS = 'pcjs'"><div class="{$CSSCLASS}-reference" style="padding-left:8px">[<a href="#" onclick="savePC('{$machine}'); return false;">Save Machine</a>]</div></xsl:if>
 				<div class="{$CSSCLASS}-copyright">
-					<a href="http://{$SITEHOST}" target="_blank">PCjs</a> v<xsl:value-of select="$APPVERSION"/> © 2012-2016 by <a href="http://twitter.com/jeffpar" target="_blank">@jeffpar</a>
+					<a href="http://{$SITEHOST}" target="_blank"><xsl:value-of select="$APPNAME"/></a> v<xsl:value-of select="$APPVERSION"/> © 2012-2016 by <a href="http://twitter.com/jeffpar" target="_blank">@jeffpar</a>
 				</div>
 				<div style="clear:both"> </div>
 			</xsl:if>
diff --git a/modules/shared/templates/components.xsl b/modules/shared/templates/components.xsl
index 200f1911db..dfe67b5dfa 100644
--- a/modules/shared/templates/components.xsl
+++ b/modules/shared/templates/components.xsl
@@ -13,6 +13,7 @@
 	<xsl:variable name="MACHINECLASS">pc</xsl:variable>
 	<xsl:variable name="CSSCLASS">pcjs</xsl:variable>
 	<xsl:variable name="APPCLASS">pcjs</xsl:variable>
+	<xsl:variable name="APPNAME">PCjs</xsl:variable>
 	<xsl:variable name="APPVERSION">1.x.x</xsl:variable>
 	<xsl:variable name="SITEHOST">www.pcjs.org</xsl:variable>
 
@@ -242,7 +243,7 @@
 				</xsl:choose>
 				<xsl:if test="$APPCLASS = 'pcjs'"><div class="{$CSSCLASS}-reference" style="padding-left:8px">[<a href="#" onclick="savePC('{$machine}'); return false;">Save Machine</a>]</div></xsl:if>
 				<div class="{$CSSCLASS}-copyright">
-					<a href="http://{$SITEHOST}" target="_blank">PCjs</a> v<xsl:value-of select="$APPVERSION"/> © 2012-2016 by <a href="http://twitter.com/jeffpar" target="_blank">@jeffpar</a>
+					<a href="http://{$SITEHOST}" target="_blank"><xsl:value-of select="$APPNAME"/></a> v<xsl:value-of select="$APPVERSION"/> © 2012-2016 by <a href="http://twitter.com/jeffpar" target="_blank">@jeffpar</a>
 				</div>
 				<div style="clear:both"> </div>
 			</xsl:if>
diff --git a/pubs/pc/programming/manifest.xml b/pubs/pc/programming/manifest.xml
index ea237c51c8..262ad6bda2 100644
--- a/pubs/pc/programming/manifest.xml
+++ b/pubs/pc/programming/manifest.xml
@@ -15,18 +15,18 @@
 		<cover href="archive/The_8086_Book.jpg"/>
 	</document>
 	<disk id="disk01" size="1228800" chs="80:2:15" img="DOS_Internals/archive/DOS-INTERN.img" href="/pubs/pc/programming/DOS_Internals/DOS-INTERN.json" md5="bc8cdc0887473c7cd081107408c12579" md5json="3cf1390937ee6287d46076fac8655bc5">
-		<name>DOS Internals</name>
+		<name>Book: DOS Internals</name>
 	</disk>
 	<disk id="disk02" size="1228800" chs="80:2:15" img="The_Undocumented_PC/archive/UNDOC-PC.img" href="/pubs/pc/programming/The_Undocumented_PC/UNDOC.json" md5="beb02e4594f45a395d43c110759dc3ea" md5json="fdf2d24bb28196b751a58e749a6b0d1a">
-		<name>The Undocumented PC</name>
+		<name>Book: The Undocumented PC</name>
 	</disk>
 	<disk id="disk03" size="1228800" chs="80:2:15" img="Undocumented_DOS/archive/UNDOC-DOS-DISK1.img" href="/pubs/pc/programming/Undocumented_DOS/UNDOC-DOS-DISK1.json" md5="dd9d85065ec27b54055f991ea6bb4968" md5json="67fc8754967ec2588655826a484422f0">
-		<name>Undocumented DOS (Disk 1)</name>
+		<name>Book: Undocumented DOS (Disk 1)</name>
 	</disk>
 	<disk id="disk04" size="1228800" chs="80:2:15" img="Undocumented_DOS/archive/UNDOC-DOS-DISK2.img" href="/pubs/pc/programming/Undocumented_DOS/UNDOC-DOS-DISK2.json" md5="d35c9141a554b4854bb635173e72a999" md5json="ba92b1ec5bf2ac501736a4f025ce3caf">
-		<name>Undocumented DOS (Disk 2)</name>
+		<name>Book: Undocumented DOS (Disk 2)</name>
 	</disk>
 	<disk id="disk05" size="1228800" chs="80:2:15" img="Undocumented_Windows/archive/UNDOC-WIN.img" href="/pubs/pc/programming/Undocumented_Windows/UNDOC-WIN.json" md5="d5b088e7bc68da3741844b3505822a4d" md5json="4199690986b5ac03885e403b66e29058">
-		<name>Undocumented Windows</name>
+		<name>Book: Undocumented Windows</name>
 	</disk>
 </manifest>
diff --git a/versions/pc8080/1.21.7/components.xsl b/versions/pc8080/1.21.7/components.xsl
index 5369d79d66..d9d2597502 100644
--- a/versions/pc8080/1.21.7/components.xsl
+++ b/versions/pc8080/1.21.7/components.xsl
@@ -12,11 +12,12 @@
 	<xsl:variable name="MACHINECLASS">pc</xsl:variable>
 	<xsl:variable name="CSSCLASS">pcjs</xsl:variable>
 	<xsl:variable name="APPCLASS">pc8080</xsl:variable>
+	<xsl:variable name="APPNAME">PC8080</xsl:variable>
 	<xsl:variable name="APPVERSION">1.21.7</xsl:variable>
 	<xsl:variable name="SITEHOST">www.pcjs.org</xsl:variable>
 
 	<xsl:template name="componentStyles">
-		<link rel="stylesheet" type="text/css" href="/versions/{$APPCLASS}/{$APPVERSION}/components.css"/>
+		<link rel="stylesheet" type="text/css" href="/versions/pc8080/1.21.7/components.css"/>
 	</xsl:template>
 
 	<xsl:template name="componentScripts">
@@ -241,7 +242,7 @@
 				</xsl:choose>
 				<xsl:if test="$APPCLASS = 'pcjs'"><div class="{$CSSCLASS}-reference" style="padding-left:8px">[<a href="#" onclick="savePC('{$machine}'); return false;">Save Machine</a>]</div></xsl:if>
 				<div class="{$CSSCLASS}-copyright">
-					<a href="http://{$SITEHOST}" target="_blank">PCjs</a> v<xsl:value-of select="$APPVERSION"/> © 2012-2016 by <a href="http://twitter.com/jeffpar" target="_blank">@jeffpar</a>
+					<a href="http://{$SITEHOST}" target="_blank"><xsl:value-of select="$APPNAME"/></a> v<xsl:value-of select="$APPVERSION"/> © 2012-2016 by <a href="http://twitter.com/jeffpar" target="_blank">@jeffpar</a>
 				</div>
 				<div style="clear:both"> </div>
 			</xsl:if>
diff --git a/versions/pcjs/1.21.7/components.xsl b/versions/pcjs/1.21.7/components.xsl
index d102674c01..b0d62f4f32 100644
--- a/versions/pcjs/1.21.7/components.xsl
+++ b/versions/pcjs/1.21.7/components.xsl
@@ -12,11 +12,12 @@
 	<xsl:variable name="MACHINECLASS">pc</xsl:variable>
 	<xsl:variable name="CSSCLASS">pcjs</xsl:variable>
 	<xsl:variable name="APPCLASS">pcjs</xsl:variable>
+	<xsl:variable name="APPNAME">PCjs</xsl:variable>
 	<xsl:variable name="APPVERSION">1.21.7</xsl:variable>
 	<xsl:variable name="SITEHOST">www.pcjs.org</xsl:variable>
 
 	<xsl:template name="componentStyles">
-		<link rel="stylesheet" type="text/css" href="/versions/{$APPCLASS}/{$APPVERSION}/components.css"/>
+		<link rel="stylesheet" type="text/css" href="/versions/pcjs/1.21.7/components.css"/>
 	</xsl:template>
 
 	<xsl:template name="componentScripts">
@@ -241,7 +242,7 @@
 				</xsl:choose>
 				<xsl:if test="$APPCLASS = 'pcjs'"><div class="{$CSSCLASS}-reference" style="padding-left:8px">[<a href="#" onclick="savePC('{$machine}'); return false;">Save Machine</a>]</div></xsl:if>
 				<div class="{$CSSCLASS}-copyright">
-					<a href="http://{$SITEHOST}" target="_blank">PCjs</a> v<xsl:value-of select="$APPVERSION"/> © 2012-2016 by <a href="http://twitter.com/jeffpar" target="_blank">@jeffpar</a>
+					<a href="http://{$SITEHOST}" target="_blank"><xsl:value-of select="$APPNAME"/></a> v<xsl:value-of select="$APPVERSION"/> © 2012-2016 by <a href="http://twitter.com/jeffpar" target="_blank">@jeffpar</a>
 				</div>
 				<div style="clear:both"> </div>
 			</xsl:if>