diff --git a/devices/c1p/machine/8kb/README.md b/devices/c1p/machine/8kb/README.md
new file mode 100644
index 000000000..245911755
--- /dev/null
+++ b/devices/c1p/machine/8kb/README.md
@@ -0,0 +1,17 @@
+---
+layout: page
+title: Machines
+permalink: /devices/c1p/machine/8kb/
+---
+
+Challenger 1P Machine Configurations with 8Kb
+---
+
+Here are some sample C1P Machine Configurations with 8Kb:
+
+* [8kb with Large Display](large/) ([Debugger](large/debugger/))
+* [8kb with Small Display](small/)
+* [8kb with Large Display w/Additional Software](all/) ([Debugger](all/debugger/))
+* [8kb "Server Array" Demo](array/)
+
+See the [Documentation](/docs/c1pjs/) for details on the operation of C1Pjs.
diff --git a/devices/c1p/machine/8kb/all/machine.md b/devices/c1p/machine/8kb/all/machine.md
new file mode 100644
index 000000000..054e89d13
--- /dev/null
+++ b/devices/c1p/machine/8kb/all/machine.md
@@ -0,0 +1,10 @@
+---
+layout: page
+title: "OSI Challenger 1P (8Kb) with Additional Software"
+permalink: /devices/c1p/machine/8kb/all/
+machines:
+  - type: c1p
+    id: c1p8kb
+---
+
+{% include machine.html id="c1p8kb" %}
diff --git a/devices/c1p/machine/8kb/all/machine.xml b/devices/c1p/machine/8kb/all/machine.xml
new file mode 100644
index 000000000..a071cce97
--- /dev/null
+++ b/devices/c1p/machine/8kb/all/machine.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet type="text/xsl" href="/versions/c1pjs/1.21.6/machine.xsl"?>
+<machine id="c1pAll" class="c1p" border="1" pos="center" background="#FAEBD7" style="padding-bottom:8px">
+	<name>OSI Challenger 1P (8Kb, Additional Software)</name>
+	<computer id="c1p" name="Challenger 1P">
+		<module type="cpu" refid="cpu6502" start="0x0000" end="0xffff"/>
+		<module type="ram" refid="ram8K" start="0x0000" end="0x1fff"/>
+		<module type="rom" refid="romNull" start="0x2000" end="0x9fff"/>
+		<module type="rom" refid="romBasic" start="0xa000" end="0xbfff"/>
+		<module type="video" refid="video" start="0xd000" end="0xd3ff"/>
+		<module type="keyboard" refid="keyboard" start="0xdf00" end="0xdfff"/>
+		<module type="serial" refid="serialPort" start="0xf000" end="0xf0ff"/>
+		<module type="rom" refid="romSystem" start="0xf800" end="0xffff"/>
+	</computer>
+	<cpu id="cpu6502"/>
+	<ram id="ram8K" size="0x2000"/>
+	<rom id="romNull" size="0x8000"/>
+	<rom id="romBasic" size="0x2000" image="/devices/c1p/rom/basic-gcpatch.hex"/>
+	<rom id="romSystem" size="0x0800" image="/devices/c1p/rom/system.hex"/>
+	<video id="video" screenwidth="512" screenheight="400" cols="32" rows="32" charset="/devices/c1p/video/chargen2x.png" padding="8px">
+		<name>Video Display</name>
+	</video>
+	<keyboard id="keyboard" padleft="8px">
+		<control type="button" binding="ctrl-c">CTRL-C</control>
+		<control type="button" binding="ctrl-o">CTRL-O</control>
+		<control type="button" binding="break">BREAK</control>
+	</keyboard>
+	<serial ref="/apps/c1p/all.xml"/>
+</machine>
diff --git a/devices/c1p/machine/8kb/embed/machine.md b/devices/c1p/machine/8kb/embed/machine.md
new file mode 100644
index 000000000..d2466e3e1
--- /dev/null
+++ b/devices/c1p/machine/8kb/embed/machine.md
@@ -0,0 +1,13 @@
+---
+layout: page
+title: "OSI Challenger 1P (8Kb) with Small Display"
+permalink: /devices/c1p/machine/8kb/embed/
+machines:
+  - type: c1p
+    id: c1pEmbed
+redirect_from:
+  - /configs/c1p/machines/8kb/embed/
+  - /demos/c1p/embed.xml/
+---
+
+{% include machine.html id="c1pEmbed" %}
diff --git a/devices/c1p/machine/README.md b/devices/c1p/machine/README.md
index 9a23551fe..dcfdc23dd 100644
--- a/devices/c1p/machine/README.md
+++ b/devices/c1p/machine/README.md
@@ -9,10 +9,9 @@ Challenger 1P Machine Configurations
 
 Here are some sample C1P Machine Configurations:
 
-* [8kb with Large Display](8kb/large/)
-* [8kb with Large Display, Debugger](8kb/large/debugger/)
+* [8kb with Large Display](8kb/large/) ([Debugger](8kb/large/debugger/))
 * [8kb with Small Display](8kb/small/)
-* [8kb with Large Display, Debugger, Additional Software](8kb/all/debugger)
+* [8kb with Large Display w/Additional Software](8kb/all/) ([Debugger](8kb/all/debugger/))
 * [8kb "Server Array" Demo](8kb/array/)
 * [32kb with Diskette Support](32kb/)
 
diff --git a/disks/pc/diags/ibm/2.07/README.md b/disks/pc/diags/ibm/2.07/README.md
index df5aa05ee..1f6c008d5 100644
--- a/disks/pc/diags/ibm/2.07/README.md
+++ b/disks/pc/diags/ibm/2.07/README.md
@@ -1,7 +1,7 @@
 ---
 layout: page
 title: "IBM PC AT (Model 5170) running IBM PC AT Advanced Diagnostics 2.07"
-permalink: /disks/pc/diags/ibm/2.20/
+permalink: /disks/pc/diags/ibm/2.07/
 machines:
   - type: pc
     id: ibm5170
diff --git a/disks/pc/games/infocom/README.md b/disks/pc/games/infocom/README.md
index cfc58cc03..aea5142f2 100644
--- a/disks/pc/games/infocom/README.md
+++ b/disks/pc/games/infocom/README.md
@@ -2,12 +2,11 @@
 layout: page
 title: Infocom Games
 permalink: /disks/pc/games/infocom/
-machines:
-  - type: pc
-    id: ibm5150
 ---
 
 Infocom Games
 ---
 
-{% include machine.html id="ibm5150" %}
+* [Zork I](zork1/)
+* [Zork II](zork2/)
+* [Zork III](zork3/)
diff --git a/disks/pc/games/infocom/machine-debug.xml b/disks/pc/games/infocom/machine-debug.xml
index 2e9dfa8f7..bb204c568 100644
--- a/disks/pc/games/infocom/machine-debug.xml
+++ b/disks/pc/games/infocom/machine-debug.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="/versions/pcjs/1.21.6/machine.xsl"?>
-<machine id="ibm5150" class="pc" border="1" width="980px" pos="center" background="#FAEBD7">
+<machine id="ibm5150-infocom" class="pc" border="1" width="980px" pos="center" background="#FAEBD7">
 	<name pos="center">IBM PC Model 5150 (CGA, 64K)</name>
 	<computer id="infocom-cga-64k" name="IBM PC" resume="1"/>
 	<cpu id="cpu8088" model="8088"/>
diff --git a/disks/pc/games/infocom/machine.xml b/disks/pc/games/infocom/machine.xml
index 93927b8e1..97bb111d4 100644
--- a/disks/pc/games/infocom/machine.xml
+++ b/disks/pc/games/infocom/machine.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="/versions/pcjs/1.21.6/machine.xsl"?>
-<machine id="ibm5150" class="pc" border="1" pos="center" background="#FAEBD7">
+<machine id="ibm5150-infocom" class="pc" border="1" pos="center" background="#FAEBD7">
 	<name pos="center">IBM PC Model 5150 (CGA, 64K)</name>
 	<computer id="infocom-cga-64k" name="IBM PC" resume="1"/>
 	<ram id="ramLow" addr="0x00000" test="false"/>
diff --git a/disks/pc/games/infocom/zork1/debugger/machine.md b/disks/pc/games/infocom/zork1/debugger/machine.md
index 6693f426a..5489a75aa 100644
--- a/disks/pc/games/infocom/zork1/debugger/machine.md
+++ b/disks/pc/games/infocom/zork1/debugger/machine.md
@@ -1,13 +1,13 @@
 ---
 layout: page
-title: "IBM PC (Model 5150) running Zork with Debugger"
+title: "IBM PC (Model 5150) running Zork I with Debugger"
 permalink: /disks/pc/games/infocom/zork1/debugger/
 machines:
   - type: pc
-    id: ibm5150
+    id: ibm5150-zork1
 ---
 
 Zork I
 ---
 
-{% include machine.html id="ibm5150" %}
+{% include machine.html id="ibm5150-zork1" %}
diff --git a/disks/pc/games/infocom/zork1/machine.md b/disks/pc/games/infocom/zork1/machine.md
index c9aca497c..8271c0803 100644
--- a/disks/pc/games/infocom/zork1/machine.md
+++ b/disks/pc/games/infocom/zork1/machine.md
@@ -1,14 +1,14 @@
 ---
 layout: page
-title: "IBM PC (Model 5150) running Zork"
+title: "IBM PC (Model 5150) running Zork I"
 permalink: /disks/pc/games/infocom/zork1/
 machines:
   - type: pc
-    id: ibm5150
+    id: ibm5150-zork1
     config: /disks/pc/games/infocom/machine.xml
 ---
 
 Zork I
 ---
 
-{% include machine.html id="ibm5150" %}
+{% include machine.html id="ibm5150-zork1" %}
diff --git a/disks/pc/games/infocom/zork2/machine.md b/disks/pc/games/infocom/zork2/machine.md
new file mode 100644
index 000000000..4ac5fb954
--- /dev/null
+++ b/disks/pc/games/infocom/zork2/machine.md
@@ -0,0 +1,17 @@
+---
+layout: page
+title: "IBM PC (Model 5150) running Zork II"
+permalink: /disks/pc/games/infocom/zork2/
+machines:
+  - type: pc
+    id: ibm5150-zork2
+    config: /disks/pc/games/infocom/machine.xml
+    autoMount:
+      A:
+        path: /disks/pc/games/infocom/zork2/ZORK2-READONLY.json
+---
+
+Zork II
+---
+
+{% include machine.html id="ibm5150-zork2" %}
diff --git a/disks/pc/games/infocom/zork3/machine.md b/disks/pc/games/infocom/zork3/machine.md
new file mode 100644
index 000000000..bb8b42710
--- /dev/null
+++ b/disks/pc/games/infocom/zork3/machine.md
@@ -0,0 +1,17 @@
+---
+layout: page
+title: "IBM PC (Model 5150) running Zork III"
+permalink: /disks/pc/games/infocom/zork3/
+machines:
+  - type: pc
+    id: ibm5150-zork3
+    config: /disks/pc/games/infocom/machine.xml
+    autoMount:
+      A:
+        path: /disks/pc/games/infocom/zork3/ZORK3-READONLY.json
+---
+
+Zork III
+---
+
+{% include machine.html id="ibm5150-zork3" %}