diff --git a/docs/README.md b/docs/README.md
index f141b187a..12317a99f 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -30,7 +30,7 @@ Our [Publication Archive](/pubs/) includes these PC-related resources:
* [Magazines](/pubs/pc/magazines/)
* [Programming Guides](/pubs/pc/programming/)
* [Reference Manuals](/pubs/pc/reference/)
-* [Software User and Development Guides](/pubs/pc/software/) (eg, DOS, [OS/2](/pubs/pc/software/os2/), Windows)
+* [Software User and Development Guides](/pubs/pc/software/) (eg, [DOS](/pubs/pc/software/dos/), [OS/2](/pubs/pc/software/os2/), [Windows](/pubs/pc/software/windows/))
And publications related to Ohio Scientific's 6502-based Challenger 1P:
diff --git a/pubs/README.md b/pubs/README.md
index 971963572..13333d425 100644
--- a/pubs/README.md
+++ b/pubs/README.md
@@ -7,16 +7,16 @@ permalink: /pubs/
Publication Archive
---
-We have an assortment of PC-related resources:
+[PC Publications](pc/):
* [CPU Documents](/pubs/pc/reference/intel/)
* [Datasheets](/pubs/pc/datasheets/)
* [Magazines](/pubs/pc/magazines/)
* [Programming Guides](/pubs/pc/programming/)
* [Reference Manuals](/pubs/pc/reference/)
-* [Software User and Development Guides](/pubs/pc/software/) (eg, DOS, [OS/2](/pubs/pc/software/os2/), Windows)
+* [Software User and Development Guides](/pubs/pc/software/) (eg, [DOS](/pubs/pc/software/dos/), [OS/2](/pubs/pc/software/os2/), [Windows](/pubs/pc/software/windows/))
-Publications related to Ohio Scientific's 6502-based Challenger 1P:
+Ohio Scientific's 6502-based [Challenger 1P Publications](c1p/):
* [Datasheets](/pubs/c1p/datasheets/)
* [Programming Guides/Samples](/pubs/c1p/programming/)
diff --git a/pubs/pc/README.md b/pubs/pc/README.md
index 33edf7e6e..3db937e54 100644
--- a/pubs/pc/README.md
+++ b/pubs/pc/README.md
@@ -13,7 +13,7 @@ We have an assortment of PC-related resources:
* [Magazines](/pubs/pc/magazines/)
* [Programming Guides](/pubs/pc/programming/)
* [Reference Manuals](/pubs/pc/reference/)
-* [Software User and Development Guides](/pubs/pc/software/) (eg, DOS, [OS/2](/pubs/pc/software/os2/), Windows)
+* [Software User and Development Guides](/pubs/pc/software/) (eg, [DOS](/pubs/pc/software/dos/), [OS/2](/pubs/pc/software/os2/), [Windows](/pubs/pc/software/windows/))
[
](pc/datasheets/)
[
](pc/magazines/byte/)
diff --git a/pubs/pc/software/README.md b/pubs/pc/software/README.md
index 5029e34a9..d641c42b8 100644
--- a/pubs/pc/software/README.md
+++ b/pubs/pc/software/README.md
@@ -7,13 +7,13 @@ permalink: /pubs/pc/software/
PC Software User Guides
---
-* [IBM PC Disk Operating System v1.00](dos/PCDOS100/)
-* [IBM PC Disk Operating System v1.10](dos/PCDOS110/)
+* [PC-DOS Manuals](dos/)
PC Software Development Guides
---
-* [OS/2 Software Development Guides](os2/)
+* [OS/2 Software Guides](os2/)
+* [Windows Software Guides](windows/)
PC Software Development Tools
---
diff --git a/pubs/pc/software/dos/README.md b/pubs/pc/software/dos/README.md
index 2816c6202..cd045016b 100644
--- a/pubs/pc/software/dos/README.md
+++ b/pubs/pc/software/dos/README.md
@@ -4,7 +4,7 @@ title: PC-DOS Manuals
permalink: /pubs/pc/software/dos/
---
-PC-DOS Manuals
+IBM PC-DOS Manuals
---
* [IBM PC Disk Operating System v1.00](PCDOS100/)
diff --git a/pubs/pc/software/os2/README.md b/pubs/pc/software/os2/README.md
index e2f2a4560..a28d48d32 100644
--- a/pubs/pc/software/os2/README.md
+++ b/pubs/pc/software/os2/README.md
@@ -1,6 +1,6 @@
---
layout: page
-title: "OS/2 Programming Guides"
+title: OS/2 Software Guides
permalink: /pubs/pc/software/os2/
redirect_from:
- /pubs/pc/programming/os2/
diff --git a/pubs/pc/software/windows/README.md b/pubs/pc/software/windows/README.md
new file mode 100644
index 000000000..eacbab41c
--- /dev/null
+++ b/pubs/pc/software/windows/README.md
@@ -0,0 +1,11 @@
+---
+layout: page
+title: Windows Software Guides
+permalink: /pubs/pc/software/windows/
+---
+
+Windows Software Development Guides
+---
+
+* Windows SDK 1.03
+* [Windows SDK 2.00](sdk200/)
diff --git a/pubs/pc/software/windows/sdk200/README.md b/pubs/pc/software/windows/sdk200/README.md
new file mode 100644
index 000000000..ebfd1a004
--- /dev/null
+++ b/pubs/pc/software/windows/sdk200/README.md
@@ -0,0 +1,14 @@
+---
+layout: page
+title: Windows SDK 2.00
+permalink: /pubs/pc/software/windows/sdk200/
+---
+
+Windows Software Development Kit 2.00
+---
+
+* Programmer’s Reference [[external](http://www.os2museum.com/files/docs/win20sdk/windows-2.0-sdk-prgref-1987.pdf)]
+* Programming Tools [[external](http://www.os2museum.com/files/docs/win20sdk/windows-2.0-sdk-tools-1987.pdf)]
+* Application Style Guide [[external](http://www.os2museum.com/files/docs/win20sdk/windows-2.0-sdk-styleguide-1987.pdf)]
+* Windows Extensions [[external](http://www.os2museum.com/files/docs/win20sdk/windows-2.0-sdk-extensions-1987.pdf)]
+* Programmer's Learning Guide [[external](http://www.os2museum.com/files/docs/win20sdk/windows-2.0-sdk-lguide-1987.pdf)]
diff --git a/pubs/pc/software/windows/sdk20/manifest.xml b/pubs/pc/software/windows/sdk200/manifest.xml
similarity index 96%
rename from pubs/pc/software/windows/sdk20/manifest.xml
rename to pubs/pc/software/windows/sdk200/manifest.xml
index e27118956..23d3f285d 100644
--- a/pubs/pc/software/windows/sdk20/manifest.xml
+++ b/pubs/pc/software/windows/sdk200/manifest.xml
@@ -2,7 +2,7 @@
Microsoft Windows Software Development Kit
- 2.0
+ 2.00
os2museum.com
Programmer’s Reference
@@ -19,4 +19,4 @@
Programmer's Learning Guide
-
\ No newline at end of file
+
diff --git a/tests/README.md b/tests/README.md
new file mode 100644
index 000000000..8c9f69503
--- /dev/null
+++ b/tests/README.md
@@ -0,0 +1,10 @@
+---
+layout: page
+title: Test Resources
+permalink: /tests/
+---
+
+Test Resources
+---
+
+An assortment of [PC Tests](pc/) is available.
diff --git a/tests/pc/80386/README.md b/tests/pc/80386/README.md
new file mode 100644
index 000000000..5761c6f0a
--- /dev/null
+++ b/tests/pc/80386/README.md
@@ -0,0 +1,10 @@
+---
+layout: page
+title: 80386 Tests
+permalink: /tests/pc/80386/
+---
+
+Overview
+---
+
+See [test386.asm](test386.asm).
diff --git a/tests/pc/80386/makefile b/tests/pc/80386/makefile
index 531ab8ef6..cbc522d01 100644
--- a/tests/pc/80386/makefile
+++ b/tests/pc/80386/makefile
@@ -1,7 +1,7 @@
all: test386.json test386.img
-test386.com: test386.nasm ../inc/dos.inc ../inc/misc.inc ../inc/x86.inc
- nasm -i../inc/ -f bin test386.nasm -l test386.lst -o test386.com
+test386.com: test386.asm ../inc/dos.inc ../inc/misc.inc ../inc/x86.inc
+ nasm -i../inc/ -f bin test386.asm -l test386.lst -o test386.com
test386.json: test386.com
node ../../../modules/filedump/bin/filedump --file=test386.com --output=test386.json --overwrite
diff --git a/tests/pc/80386/test386.nasm b/tests/pc/80386/test386.asm
similarity index 99%
rename from tests/pc/80386/test386.nasm
rename to tests/pc/80386/test386.asm
index 507ad046c..212ce82cf 100644
--- a/tests/pc/80386/test386.nasm
+++ b/tests/pc/80386/test386.asm
@@ -1,5 +1,5 @@
;
-; test386.nasm
+; test386.asm
; Copyright © 2012-2015 Jeff Parsons
;
; This file is part of PCjs, which is part of the JavaScript Machines Project (aka JSMachines)
diff --git a/tests/pc/README.md b/tests/pc/README.md
new file mode 100644
index 000000000..2ddd4684d
--- /dev/null
+++ b/tests/pc/README.md
@@ -0,0 +1,12 @@
+---
+layout: page
+title: PC Test Resources
+permalink: /tests/pc/
+---
+
+PC Test Resources
+---
+
+* [80386 Tests](80386/)
+* [Trace Utility](trace/)
+* [VGA "Black Book" Tests](vga/)
diff --git a/tests/pc/trace/README.md b/tests/pc/trace/README.md
index 1b7146541..8bf64cb64 100644
--- a/tests/pc/trace/README.md
+++ b/tests/pc/trace/README.md
@@ -1,4 +1,7 @@
-Overview
+---
+layout: page
+title: PC Trace Utility
+permalink: /tests/pc/trace/
---
WARNING: This utility is obsolete. It has been superseded by [test386](/tests/pc/80386/),
@@ -6,6 +9,7 @@ which, going forward, serves as our new model for instruction-level testing. As
the **traceLog()** functionality mentioned below has been removed from the PCjs source code
(but you can always dig it back up if you really want it).
+Overview
---
TRACE.COM takes an instruction log, as recorded by the PCjs Debugger's traceLog() function, and
@@ -32,6 +36,7 @@ instructions, even though we'll be missing OVERFLOW validation for all single-bi
Operation
---
+
To load TRACE.COM and TRACE.TXT onto a virtual disk image that PCjs can access, you can add an
"automount" setting to your PCjs configuration that will dynamically generate a fresh disk image
every time the machine is loaded, via the DiskDump API. This is useful when you're constantly
diff --git a/versions/README.md b/versions/README.md
index 703f230fe..cf335c301 100644
--- a/versions/README.md
+++ b/versions/README.md
@@ -1,3 +1,10 @@
-Released Versions
---
-Current and past versions of [PCjs](pcjs/) and [C1Pjs](c1pjs/) are maintained here.
+layout: page
+title: Emulator Releases
+permalink: /versions/
+---
+
+Emulator Releases
+---
+
+Current and past releases of the [PCjs](pcjs/) and [C1Pjs](c1pjs/) emulators are maintained here.
diff --git a/versions/c1pjs/README.md b/versions/c1pjs/README.md
new file mode 100644
index 000000000..3489a94f4
--- /dev/null
+++ b/versions/c1pjs/README.md
@@ -0,0 +1,30 @@
+---
+layout: page
+title: C1Pjs Emulator Releases
+permalink: /versions/c1pjs/
+redirect_from:
+ - /versions/c1pjs/1.15.4/
+ - /versions/c1pjs/1.16.0/
+ - /versions/c1pjs/1.16.1/
+ - /versions/c1pjs/1.16.2/
+ - /versions/c1pjs/1.16.3/
+ - /versions/c1pjs/1.16.4/
+ - /versions/c1pjs/1.17.3/
+ - /versions/c1pjs/1.17.4/
+ - /versions/c1pjs/1.17.5/
+ - /versions/c1pjs/1.17.6/
+ - /versions/c1pjs/1.18.0/
+ - /versions/c1pjs/1.18.1/
+ - /versions/c1pjs/1.18.2/
+ - /versions/c1pjs/1.18.5/
+ - /versions/c1pjs/1.18.6/
+ - /versions/c1pjs/1.18.7/
+ - /versions/c1pjs/1.18.8/
+ - /versions/c1pjs/1.19.4/
+ - /versions/c1pjs/1.19.6/
+---
+
+C1Pjs Emulator Releases
+---
+
+The current version of C1Pjs is [{{ site.pcjs.version }}]({{ site.pcjs.version }}/c1p.js).
diff --git a/versions/icons/README.md b/versions/icons/README.md
new file mode 100644
index 000000000..a37daa073
--- /dev/null
+++ b/versions/icons/README.md
@@ -0,0 +1,10 @@
+---
+layout: page
+title: Project Icons
+permalink: /versions/icons/
+---
+
+Project Icons
+---
+
+* [Current Project Icons](current/)
diff --git a/versions/icons/current/README.md b/versions/icons/current/README.md
new file mode 100644
index 000000000..c438bc336
--- /dev/null
+++ b/versions/icons/current/README.md
@@ -0,0 +1,10 @@
+---
+layout: page
+title: Current Project Icons
+permalink: /versions/icons/current/
+---
+
+Current Project Icons
+---
+
+
diff --git a/versions/images/README.md b/versions/images/README.md
new file mode 100644
index 000000000..876f0368a
--- /dev/null
+++ b/versions/images/README.md
@@ -0,0 +1,10 @@
+---
+layout: page
+title: Project Images
+permalink: /versions/images/
+---
+
+Project Images
+---
+
+* [Current Project Images](current/)
diff --git a/versions/images/current/README.md b/versions/images/current/README.md
new file mode 100644
index 000000000..0bb102a49
--- /dev/null
+++ b/versions/images/current/README.md
@@ -0,0 +1,10 @@
+---
+layout: page
+title: Current Project Images
+permalink: /versions/images/current/
+---
+
+Current Project Images
+---
+
+
diff --git a/versions/images/current/bgnd.gif b/versions/images/current/bgnd.gif
deleted file mode 100644
index e74fd1d59..000000000
Binary files a/versions/images/current/bgnd.gif and /dev/null differ
diff --git a/versions/images/current/pattern-bubbles.png b/versions/images/current/pattern-bubbles.png
deleted file mode 100644
index b33e0c44d..000000000
Binary files a/versions/images/current/pattern-bubbles.png and /dev/null differ
diff --git a/versions/pcjs/README.md b/versions/pcjs/README.md
new file mode 100644
index 000000000..c972c1e0a
--- /dev/null
+++ b/versions/pcjs/README.md
@@ -0,0 +1,27 @@
+---
+layout: page
+title: PCjs Emulator Releases
+permalink: /versions/pcjs/
+redirect_from:
+ - /versions/pcjs/1.00/screenshots/
+ - /versions/pcjs/1.15.6/
+ - /versions/pcjs/1.15.7/
+ - /versions/pcjs/1.15.9/
+ - /versions/pcjs/1.16.2/
+ - /versions/pcjs/1.16.4/
+ - /versions/pcjs/1.16.5/
+ - /versions/pcjs/1.17.1/
+ - /versions/pcjs/1.18.1/
+ - /versions/pcjs/1.18.6/
+ - /versions/pcjs/1.18.7/
+ - /versions/pcjs/1.18.7/machine.xsl/
+ - /versions/pcjs/1.19.2/
+ - /versions/pcjs/1.19.4/
+ - /versions/pcjs/1.19.5/
+ - /versions/pcjs/1.19.6/
+---
+
+PCjs Emulator Releases
+---
+
+The current version of PCjs is [{{ site.pcjs.version }}]({{ site.pcjs.version }}/pc.js).