diff --git a/apps/c1p/README.md b/apps/c1p/README.md
index da82704ca..e4ea1aa96 100644
--- a/apps/c1p/README.md
+++ b/apps/c1p/README.md
@@ -1,8 +1,8 @@
-Challenger 1P Serial Program Sets
+Challenger 1P Applications
---
The C1P serial port has no configurable hardware features. However, there is a "demo" property that can
be set, causing the machine to load some built-in demonstration code via the serial port when it starts up.
The purpose of these configuration files is to create UI controls that allow you to choose from a set of programs
-(eg, BASIC programs, 6502 machine code files) and send them to the C1P through the serial port.
\ No newline at end of file
+(eg, BASIC programs, 6502 machine code files) and send them to the C1P through the serial port.
diff --git a/apps/pc/README.md b/apps/pc/README.md
index 09235b92e..dc60fc573 100644
--- a/apps/pc/README.md
+++ b/apps/pc/README.md
@@ -1,7 +1,7 @@
-IBM PC Application Archives
+IBM PC Application Demos
---
-Below are selected demos of classic IBM PC applications running on [PCjs](/docs/about/).
+Below are selected demos of classic IBM PC applications running on [PCjs](/docs/about/pcjs/).
* [VisiCalc (1981)](1981/visicalc/)
* [Executive Suite (1982)](1982/esuite/)
@@ -9,7 +9,4 @@ Below are selected demos of classic IBM PC applications running on [PCjs](/docs/
* [ThinkTank (1987)](1987/thinktank/)
* The Dungeons of Moria (1988, [1992](1992/moria/))
-All of these demos are driven by simple XML manifest files. Click one and use your web browser's "View Source"
-command to see the raw manifest. Learn more about PCjs manifest files [here](/apps/).
-
-You can browse the rest of our software archives by year. There is no search capability at this time.
\ No newline at end of file
+More software is available in the [IBM PC Disk Archive](/disks/pc/).
diff --git a/devices/README.md b/devices/README.md
index 64e441e47..8031d5db0 100644
--- a/devices/README.md
+++ b/devices/README.md
@@ -1,4 +1,4 @@
-Device Configurations
+Machine Configurations
---
Browse [IBM PC](/devices/pc/machine/) and [Challenger 1P](/devices/c1p/machine/) machine configurations.
diff --git a/devices/c1p/README.md b/devices/c1p/README.md
index ad8f2ce59..2332ada86 100644
--- a/devices/c1p/README.md
+++ b/devices/c1p/README.md
@@ -1,7 +1,7 @@
Challenger 1P Configurations
---
-This folder contains Challenger 1P [Machine Configurations](machine/), along with of component configurations,
-such as [Control Panels](panel/).
+This folder contains Challenger 1P [Machine Configurations](machine/), along with [Control Panels](panel/) and
+other components.
[Applications](/apps/c1p/) and [Disk Images](/disks/c1p/) are also available.
diff --git a/devices/pc/README.md b/devices/pc/README.md
index 1a2c4bb0c..e23df89eb 100644
--- a/devices/pc/README.md
+++ b/devices/pc/README.md
@@ -1,5 +1,7 @@
IBM PC Configurations
---
-Here you'll find [Machine Configurations](/devices/pc/machine/), along with a variety of other component configurations
-that are used by the machines, such as [Control Panels](/devices/pc/panel/) and [Keyboard Layouts](/devices/pc/keyboard/).
+This folder contains IBM PC [Machine Configurations](machine/), along with [Control Panels](/devices/pc/panel/),
+[Keyboard Layouts](/devices/pc/keyboard/) and other components.
+
+[Application Demos](/apps/pc/) and [Disk Archives](/disks/pc/) are also available.
diff --git a/disks/README.md b/disks/README.md
index 64e810ca0..84667b1ee 100644
--- a/disks/README.md
+++ b/disks/README.md
@@ -1,6 +1,6 @@
Disk Archives
---
-Browse [IBM PC](pc/) and [Challenger 1P](c1p/) disk images.
+Browse [IBM PC](pc/) and [Challenger 1P](c1p/) disk archives.
### PCjs Disk Image Formats
diff --git a/disks/c1p/README.md b/disks/c1p/README.md
index 0069264bd..3257121a0 100644
--- a/disks/c1p/README.md
+++ b/disks/c1p/README.md
@@ -1,4 +1,4 @@
-Challenger 1P Disk Sets
+Challenger 1P Disks
---
-An assortment of Challenger 1P Disk Sets, for use by [C1P Machine Configurations](/devices/c1p/machine/).
+An assortment of Challenger 1P Disk Images, for use by [C1P Machine Configurations](/devices/c1p/machine/).
diff --git a/disks/pc/README.md b/disks/pc/README.md
index d44be3625..5c2fab726 100644
--- a/disks/pc/README.md
+++ b/disks/pc/README.md
@@ -1,4 +1,4 @@
-IBM PC Disk Archives
+IBM PC Disk Archive
---
Below are selected Disk Sets featuring "Ready-to-Boot" machine configurations:
@@ -7,7 +7,7 @@ Below are selected Disk Sets featuring "Ready-to-Boot" machine configurations:
* [IBM PC (Model 5150), MDA, 64K, IBM Diagnostics v2.20](/disks/pc/diags/ibm/2.20/)
* [IBM PC (Model 5150), CGA, 64K, Zork I](/disks/pc/games/infocom/zork1/)
-You can browse the rest of our disk archives by type. There is no search capability at this time.
+You can browse the rest of the disk archive by type. There is no search capability at this time.
### Disk Sets and Manifests
diff --git a/disks/pc/cpm/machine.xml b/disks/pc/cpm/machine.xml
index a22a88381..091364a67 100644
--- a/disks/pc/cpm/machine.xml
+++ b/disks/pc/cpm/machine.xml
@@ -9,7 +9,7 @@
-
+
Run
Reset
diff --git a/disks/pc/diags/ibm/2.20/machine.xml b/disks/pc/diags/ibm/2.20/machine.xml
index 1c2a5f447..4a136c662 100644
--- a/disks/pc/diags/ibm/2.20/machine.xml
+++ b/disks/pc/diags/ibm/2.20/machine.xml
@@ -9,7 +9,7 @@
-
+
Run
Reset
diff --git a/disks/pc/games/infocom/machine.xml b/disks/pc/games/infocom/machine.xml
index f601cc837..64cc38700 100644
--- a/disks/pc/games/infocom/machine.xml
+++ b/disks/pc/games/infocom/machine.xml
@@ -9,7 +9,7 @@
-
+
Run
Reset