diff --git a/devices/pc/keyboard/keyboard-minimal-functions.xml b/devices/pc/keyboard/us83-buttons-functions.xml
similarity index 90%
rename from devices/pc/keyboard/keyboard-minimal-functions.xml
rename to devices/pc/keyboard/us83-buttons-functions.xml
index 5424bdd60..dd2fdef09 100644
--- a/devices/pc/keyboard/keyboard-minimal-functions.xml
+++ b/devices/pc/keyboard/us83-buttons-functions.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<keyboard id="keyboard" pos="left" padleft="8px" padbottom="8px">
+<keyboard id="keyboard" model="us83" pos="left" padleft="8px" padbottom="8px">
 	<control type="button" binding="esc">ESC</control>
 	<control type="button" binding="ctrl-c">CTRL-C</control>
 	<control type="button" binding="ctrl-alt-del">CTRL-ALT-DEL</control>
diff --git a/devices/pc/keyboard/keyboard-minimal.xml b/devices/pc/keyboard/us83-buttons-minimal.xml
similarity index 72%
rename from devices/pc/keyboard/keyboard-minimal.xml
rename to devices/pc/keyboard/us83-buttons-minimal.xml
index a85d70bd1..d76721f3b 100644
--- a/devices/pc/keyboard/keyboard-minimal.xml
+++ b/devices/pc/keyboard/us83-buttons-minimal.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<keyboard id="keyboard" pos="left" padleft="8px" padbottom="8px">
+<keyboard id="keyboard" model="us83" pos="left" padleft="8px" padbottom="8px">
 	<control type="button" binding="esc">ESC</control>
 	<control type="button" binding="f1">F1</control>
 	<control type="button" binding="f10">F10</control>
diff --git a/devices/pc/keyboard/keyboard-us83.xml b/devices/pc/keyboard/us83-softkeys.xml
similarity index 100%
rename from devices/pc/keyboard/keyboard-us83.xml
rename to devices/pc/keyboard/us83-softkeys.xml
diff --git a/devices/pc/keyboard/keyboard-minimal-arrows.xml b/devices/pc/keyboard/us84-buttons-arrows.xml
similarity index 84%
rename from devices/pc/keyboard/keyboard-minimal-arrows.xml
rename to devices/pc/keyboard/us84-buttons-arrows.xml
index 0bc3f1eea..26b1db5b5 100644
--- a/devices/pc/keyboard/keyboard-minimal-arrows.xml
+++ b/devices/pc/keyboard/us84-buttons-arrows.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<keyboard id="keyboard" pos="left" padleft="8px" padbottom="8px">
+<keyboard id="keyboard" model="us84" pos="left" padleft="8px" padbottom="8px">
 	<control type="button" binding="esc">ESC</control>
 	<control type="button" binding="f1">F1</control>
 	<control type="button" binding="sysreq">SysReq</control>
diff --git a/devices/pc/keyboard/us84-buttons-functions.xml b/devices/pc/keyboard/us84-buttons-functions.xml
new file mode 100644
index 000000000..14f0d6265
--- /dev/null
+++ b/devices/pc/keyboard/us84-buttons-functions.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<keyboard id="keyboard" model="us84" pos="left" padleft="8px" padbottom="8px">
+	<control type="button" binding="esc">ESC</control>
+	<control type="button" binding="ctrl-c">CTRL-C</control>
+	<control type="button" binding="ctrl-alt-del">CTRL-ALT-DEL</control>
+	<control type="button" binding="f1">F1</control>
+	<control type="button" binding="f2">F2</control>
+	<control type="button" binding="f3">F3</control>
+	<control type="button" binding="f4">F4</control>
+	<control type="button" binding="f5">F5</control>
+	<control type="button" binding="f6">F6</control>
+	<control type="button" binding="f7">F7</control>
+	<control type="button" binding="f8">F8</control>
+	<control type="button" binding="f9">F9</control>
+	<control type="button" binding="f10">F10</control>
+	<control type="button" binding="sysreq">SysReq</control>
+</keyboard>
diff --git a/devices/pc/keyboard/keyboard-test.xml b/devices/pc/keyboard/us84-buttons-test.xml
similarity index 88%
rename from devices/pc/keyboard/keyboard-test.xml
rename to devices/pc/keyboard/us84-buttons-test.xml
index bda15b6cd..268871c66 100644
--- a/devices/pc/keyboard/keyboard-test.xml
+++ b/devices/pc/keyboard/us84-buttons-test.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<keyboard id="keyboard" pos="left" padleft="8px" padbottom="8px">
+<keyboard id="keyboard" model="us84" pos="left" padleft="8px" padbottom="8px">
 	<control type="button" binding="esc">ESC</control>
 	<control type="button" binding="f1">F1</control>
 	<control type="button" binding="sysreq">SysReq</control>
diff --git a/devices/pc/machine/5150/cga/384kb/softkbd/machine.xml b/devices/pc/machine/5150/cga/384kb/softkbd/machine.xml
index 97adf53da..7352baa0b 100644
--- a/devices/pc/machine/5150/cga/384kb/softkbd/machine.xml
+++ b/devices/pc/machine/5150/cga/384kb/softkbd/machine.xml
@@ -10,7 +10,7 @@
 	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/rom/5150/bios/1981-04-24/PCBIOS-REV1.json"/>
 	<video ref="/devices/pc/video/ibm/cga/ibm-cga-960.xml"/>
 	<fdc ref="/disks/pc/compiled/library.xml"/>
-	<keyboard ref="/devices/pc/keyboard/keyboard-us83.xml"/>
+	<keyboard ref="/devices/pc/keyboard/us83-softkeys.xml"/>
 	<panel ref="/devices/pc/panel/wide.xml"/>
 	<chipset id="chipset" model="5150" sw1="01001001" sw2="10100000" pos="left" padleft="8px" padbottom="8px">
 		<control type="switches" label="SW1" binding="sw1" left="0px"/>
diff --git a/devices/pc/machine/5150/cga/64kb/donkey/debugger/machine.xml b/devices/pc/machine/5150/cga/64kb/donkey/debugger/machine.xml
index 79240ec92..5ec30637e 100644
--- a/devices/pc/machine/5150/cga/64kb/donkey/debugger/machine.xml
+++ b/devices/pc/machine/5150/cga/64kb/donkey/debugger/machine.xml
@@ -9,7 +9,7 @@
 	<video ref="/devices/pc/video/ibm/cga/ibm-cga-960.xml"/>
 	<fdc ref="/disks/pc/samples.xml"/>
 	<cpu id="cpu8088" model="8088" autostart="true"/>
-	<keyboard ref="/devices/pc/keyboard/keyboard-minimal.xml"/>
+	<keyboard ref="/devices/pc/keyboard/us83-buttons-minimal.xml"/>
 	<debugger id="debugger"/>
 	<panel ref="/devices/pc/panel/wide.xml"/>
 	<chipset id="chipset" model="5150" sw1="01001001" sw2="11110000" pos="left" padleft="8px" padbottom="8px">
diff --git a/devices/pc/machine/5150/cga/64kb/donkey/machine.xml b/devices/pc/machine/5150/cga/64kb/donkey/machine.xml
index 0b5244345..7f21d6ede 100644
--- a/devices/pc/machine/5150/cga/64kb/donkey/machine.xml
+++ b/devices/pc/machine/5150/cga/64kb/donkey/machine.xml
@@ -12,6 +12,6 @@
 		<control type="button" binding="run">Run</control>
 		<control type="button" binding="reset">Reset</control>
 	</cpu>
-	<keyboard ref="/devices/pc/keyboard/keyboard-minimal.xml"/>
+	<keyboard ref="/devices/pc/keyboard/us83-buttons-minimal.xml"/>
 	<chipset id="chipset" model="5150" sw1="01001001" sw2="11110000"/>
 </machine>
diff --git a/devices/pc/machine/5150/cga/64kb/softkbd/machine.xml b/devices/pc/machine/5150/cga/64kb/softkbd/machine.xml
index 2ea70c5f2..b80435bc7 100644
--- a/devices/pc/machine/5150/cga/64kb/softkbd/machine.xml
+++ b/devices/pc/machine/5150/cga/64kb/softkbd/machine.xml
@@ -9,7 +9,7 @@
 	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/rom/5150/bios/1981-04-24/PCBIOS-REV1.json"/>
 	<video ref="/devices/pc/video/ibm/cga/ibm-cga-960.xml"/>
 	<fdc ref="/disks/pc/samples.xml"/>
-	<keyboard ref="/devices/pc/keyboard/keyboard-us83.xml"/>
+	<keyboard ref="/devices/pc/keyboard/us83-softkeys.xml"/>
 	<debugger id="debugger"/>
 	<panel ref="/devices/pc/panel/wide.xml"/>
 	<chipset id="chipset" model="5150" sw1="01001001" sw2="11110000" pos="left" padleft="8px" padbottom="8px">
diff --git a/devices/pc/machine/5150/dual/64kb/machine.xml b/devices/pc/machine/5150/dual/64kb/machine.xml
index 7557f6215..41a35403c 100644
--- a/devices/pc/machine/5150/dual/64kb/machine.xml
+++ b/devices/pc/machine/5150/dual/64kb/machine.xml
@@ -13,6 +13,6 @@
 		<control type="button" binding="run">Run</control>
 		<control type="button" binding="reset">Reset</control>
 	</cpu>
-	<keyboard ref="/devices/pc/keyboard/keyboard-minimal.xml"/>
+	<keyboard ref="/devices/pc/keyboard/us83-buttons-minimal.xml"/>
 	<chipset id="chipset" model="5150" sw1="01000001" sw2="11110000"/>
 </machine>
diff --git a/devices/pc/machine/5150/mda/64kb/debugger/machine.xml b/devices/pc/machine/5150/mda/64kb/debugger/machine.xml
index 93c9fd339..45687d153 100644
--- a/devices/pc/machine/5150/mda/64kb/debugger/machine.xml
+++ b/devices/pc/machine/5150/mda/64kb/debugger/machine.xml
@@ -9,7 +9,7 @@
 	<video ref="/devices/pc/video/ibm/mda/ibm-mda.xml"/>
 	<fdc ref="/disks/pc/samples.xml"/>
 	<cpu id="cpu8088" model="8088" autostart="true"/>
-	<keyboard ref="/devices/pc/keyboard/keyboard-minimal-functions.xml"/>
+	<keyboard ref="/devices/pc/keyboard/us83-buttons-functions.xml"/>
 	<debugger id="debugger"/>
 	<panel ref="/devices/pc/panel/wide.xml"/>
 	<chipset id="chipset" model="5150" sw1="01000001" sw2="11110000" pos="left" padleft="8px" padbottom="8px">
diff --git a/devices/pc/machine/5150/mda/64kb/machine.xml b/devices/pc/machine/5150/mda/64kb/machine.xml
index c07aa47f4..5080ffa93 100644
--- a/devices/pc/machine/5150/mda/64kb/machine.xml
+++ b/devices/pc/machine/5150/mda/64kb/machine.xml
@@ -12,6 +12,6 @@
 		<control type="button" binding="run">Run</control>
 		<control type="button" binding="reset">Reset</control>
 	</cpu>
-	<keyboard ref="/devices/pc/keyboard/keyboard-minimal.xml"/>
+	<keyboard ref="/devices/pc/keyboard/us83-buttons-arrows.xml"/>
 	<chipset id="chipset" model="5150" sw1="01000001" sw2="11110000"/>
 </machine>
diff --git a/devices/pc/machine/5150/mda/64kb/softkbd/machine.xml b/devices/pc/machine/5150/mda/64kb/softkbd/machine.xml
index e4824d30d..c3e1e2838 100644
--- a/devices/pc/machine/5150/mda/64kb/softkbd/machine.xml
+++ b/devices/pc/machine/5150/mda/64kb/softkbd/machine.xml
@@ -9,7 +9,7 @@
 	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/rom/5150/bios/1981-04-24/PCBIOS-REV1.json"/>
 	<video ref="/devices/pc/video/ibm/mda/ibm-mda.xml"/>
 	<fdc ref="/disks/pc/samples.xml"/>
-	<keyboard ref="/devices/pc/keyboard/keyboard-us83.xml"/>
+	<keyboard ref="/devices/pc/keyboard/us83-softkeys.xml"/>
 	<debugger id="debugger"/>
 	<panel ref="/devices/pc/panel/wide.xml"/>
 	<chipset id="chipset" model="5150" sw1="01000001" sw2="11110000" pos="left" padleft="8px" padbottom="8px">
diff --git a/devices/pc/machine/5160/cga/256kb/demo/debugger/machine.xml b/devices/pc/machine/5160/cga/256kb/demo/debugger/machine.xml
index 40959faa2..b2f39ce4b 100644
--- a/devices/pc/machine/5160/cga/256kb/demo/debugger/machine.xml
+++ b/devices/pc/machine/5160/cga/256kb/demo/debugger/machine.xml
@@ -10,7 +10,7 @@
 	<video ref="/devices/pc/video/ibm/cga/ibm-cga-960.xml"/>
 	<fdc ref="/disks/pc/samples.xml"/>
 	<cpu id="cpu8088" model="8088" autostart="true"/>
-	<keyboard ref="/devices/pc/keyboard/keyboard-minimal-functions.xml"/>
+	<keyboard ref="/devices/pc/keyboard/us83-buttons-functions.xml"/>
 	<debugger id="debugger"/>
 	<panel ref="/devices/pc/panel/wide.xml"/>
 	<chipset id="chipset" model="5160" sw1="01001001" pos="left" padleft="8px" padbottom="8px">
diff --git a/devices/pc/machine/5160/cga/256kb/demo/machine.xml b/devices/pc/machine/5160/cga/256kb/demo/machine.xml
index bede5facd..6b8117592 100644
--- a/devices/pc/machine/5160/cga/256kb/demo/machine.xml
+++ b/devices/pc/machine/5160/cga/256kb/demo/machine.xml
@@ -13,7 +13,7 @@
 		<control type="button" binding="run">Run</control>
 		<control type="button" binding="reset">Reset</control>
 	</cpu>
-	<keyboard ref="/devices/pc/keyboard/keyboard-minimal.xml"/>
+	<keyboard ref="/devices/pc/keyboard/us83-buttons-minimal.xml"/>
 	<hdc id="hdcXT" drives='[{name:"10Mb Hard Disk",type:3}]'/>
 	<chipset id="chipset" model="5160" sw1="01001001"/>
 </machine>
diff --git a/devices/pc/machine/5160/cga/256kb/softkbd/machine.xml b/devices/pc/machine/5160/cga/256kb/softkbd/machine.xml
index 44d0412fe..f89a0e7c7 100644
--- a/devices/pc/machine/5160/cga/256kb/softkbd/machine.xml
+++ b/devices/pc/machine/5160/cga/256kb/softkbd/machine.xml
@@ -10,7 +10,7 @@
 	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/rom/5160/bios/1982-11-08/XTBIOS-REV1.json"/>
 	<video ref="/devices/pc/video/ibm/cga/ibm-cga-960.xml"/>
 	<fdc ref="/disks/pc/compiled/library.xml"/>
-	<keyboard ref="/devices/pc/keyboard/keyboard-us83.xml"/>
+	<keyboard ref="/devices/pc/keyboard/us83-softkeys.xml"/>
 	<debugger id="debugger"/>
 	<panel ref="/devices/pc/panel/default.xml"/>
 	<chipset id="chipset" model="5160" sw1="01001001" pos="left" padleft="8px" padbottom="8px">
diff --git a/devices/pc/machine/5160/cga/256kb/win101/debugger/machine.xml b/devices/pc/machine/5160/cga/256kb/win101/debugger/machine.xml
index 2de682e5b..a81a12b27 100644
--- a/devices/pc/machine/5160/cga/256kb/win101/debugger/machine.xml
+++ b/devices/pc/machine/5160/cga/256kb/win101/debugger/machine.xml
@@ -10,7 +10,7 @@
 	<video ref="/devices/pc/video/ibm/cga/ibm-cga-lock.xml"/>
 	<fdc ref="/disks/pc/compiled/library.xml"/>
 	<cpu id="cpu8088" model="8088" autostart="false"/>
-	<keyboard ref="/devices/pc/keyboard/keyboard-minimal-functions.xml"/>
+	<keyboard ref="/devices/pc/keyboard/us83-buttons-functions.xml"/>
 	<debugger id="debugger"/>
 	<panel ref="/devices/pc/panel/wide.xml"/>
 	<chipset id="chipset" model="5160" sw1="01001001" pos="left" padleft="8px" padbottom="8px">
diff --git a/devices/pc/machine/5160/cga/256kb/win101/machine.xml b/devices/pc/machine/5160/cga/256kb/win101/machine.xml
index 2fdab215e..ad4afbd6c 100644
--- a/devices/pc/machine/5160/cga/256kb/win101/machine.xml
+++ b/devices/pc/machine/5160/cga/256kb/win101/machine.xml
@@ -13,7 +13,7 @@
 		<control type="button" binding="run">Run</control>
 		<control type="button" binding="reset">Reset</control>
 	</cpu>
-	<keyboard ref="/devices/pc/keyboard/keyboard-minimal.xml"/>
+	<keyboard ref="/devices/pc/keyboard/us83-buttons-minimal.xml"/>
 	<chipset id="chipset" model="5160" sw1="01001001"/>
 	<hdc ref="/disks/pc/fixed/10mb/pcdos200-win101.xml"/>
 	<serial id="com1" adapter="1" binding="print"/>
diff --git a/devices/pc/machine/5160/cga/256kb/win101/softkbd/machine.xml b/devices/pc/machine/5160/cga/256kb/win101/softkbd/machine.xml
index d65f64350..df93157de 100644
--- a/devices/pc/machine/5160/cga/256kb/win101/softkbd/machine.xml
+++ b/devices/pc/machine/5160/cga/256kb/win101/softkbd/machine.xml
@@ -10,7 +10,7 @@
 	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/rom/5160/bios/1982-11-08/XTBIOS-REV1.json"/>
 	<video ref="/devices/pc/video/ibm/cga/ibm-cga-lock.xml"/>
 	<fdc ref="/disks/pc/compiled/library.xml"/>
-	<keyboard ref="/devices/pc/keyboard/keyboard-us83.xml"/>
+	<keyboard ref="/devices/pc/keyboard/us83-softkeys.xml"/>
 	<debugger id="debugger"/>
 	<panel ref="/devices/pc/panel/wide.xml"/>
 	<chipset id="chipset" model="5160" sw1="01001001" pos="left" padleft="8px" padbottom="8px">
diff --git a/devices/pc/machine/5160/cga/512kb/win101/softkbd/machine.xml b/devices/pc/machine/5160/cga/512kb/win101/softkbd/machine.xml
index 4caf6a97c..8723af1cb 100644
--- a/devices/pc/machine/5160/cga/512kb/win101/softkbd/machine.xml
+++ b/devices/pc/machine/5160/cga/512kb/win101/softkbd/machine.xml
@@ -10,7 +10,7 @@
 	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/rom/5160/bios/1982-11-08/XTBIOS-REV1.json"/>
 	<video ref="/devices/pc/video/ibm/cga/ibm-cga-lock.xml"/>
 	<fdc ref="/disks/pc/samples.xml"/>
-	<keyboard ref="/devices/pc/keyboard/keyboard-us83.xml"/>
+	<keyboard ref="/devices/pc/keyboard/us83-softkeys.xml"/>
 	<debugger id="debugger"/>
 	<panel ref="/devices/pc/panel/default.xml"/>
 	<chipset id="chipset" model="5160" sw1="01001001" pos="left" padleft="8px" padbottom="8px">
diff --git a/devices/pc/machine/5160/cga/640kb/debugger/machine.xml b/devices/pc/machine/5160/cga/640kb/debugger/machine.xml
index 8693a04b9..177de472f 100644
--- a/devices/pc/machine/5160/cga/640kb/debugger/machine.xml
+++ b/devices/pc/machine/5160/cga/640kb/debugger/machine.xml
@@ -10,7 +10,7 @@
 	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/rom/5160/bios/1982-11-08/XTBIOS-REV1.json"/>
 	<video ref="/devices/pc/video/ibm/cga/ibm-cga-960-keygrid.xml"/>
 	<fdc ref="/disks/pc/compiled/library.xml"/>
-	<keyboard ref="/devices/pc/keyboard/keyboard-minimal.xml"/>
+	<keyboard ref="/devices/pc/keyboard/us83-buttons-minimal.xml"/>
 	<debugger id="debugger"/>
 	<panel ref="/devices/pc/panel/wide.xml"/>
 	<chipset id="chipset" model="5160" sw1="01001001" pos="left" padleft="8px" padbottom="8px">
diff --git a/devices/pc/machine/5160/cga/640kb/dos400m/machine.xml b/devices/pc/machine/5160/cga/640kb/dos400m/machine.xml
index b2f7e284c..f3eb5a3d1 100644
--- a/devices/pc/machine/5160/cga/640kb/dos400m/machine.xml
+++ b/devices/pc/machine/5160/cga/640kb/dos400m/machine.xml
@@ -10,7 +10,7 @@
 	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/rom/5160/bios/1982-11-08/XTBIOS-REV1.json"/>
 	<video ref="/devices/pc/video/ibm/cga/ibm-cga-lock.xml"/>
 	<fdc ref="/disks/pc/compiled/library.xml" automount='{A:{name:"MS-DOS 4.0M (Disk 1)",path:"/disks/pc/dos/microsoft/4.0M/MSDOS400M-DISK1.json"}, B:{name:"MS-DOS 4.0M (Disk 2)",path:"/disks/pc/dos/microsoft/4.0M/MSDOS400M-DISK2.json"}}'/>
-	<keyboard ref="/devices/pc/keyboard/keyboard-us83.xml"/>
+	<keyboard ref="/devices/pc/keyboard/us83-softkeys.xml"/>
 	<debugger id="debugger"/>
 	<panel ref="/devices/pc/panel/wide.xml"/>
 	<chipset id="chipset" model="5160" sw1="01001001" pos="left" padleft="8px" padbottom="8px">
diff --git a/devices/pc/machine/5160/cga/640kb/machine.xml b/devices/pc/machine/5160/cga/640kb/machine.xml
index 9bf21f0e4..1a2ae3cea 100644
--- a/devices/pc/machine/5160/cga/640kb/machine.xml
+++ b/devices/pc/machine/5160/cga/640kb/machine.xml
@@ -13,7 +13,7 @@
 		<control type="button" binding="run">Run</control>
 		<control type="button" binding="reset">Reset</control>
 	</cpu>
-	<keyboard ref="/devices/pc/keyboard/keyboard-minimal.xml"/>
+	<keyboard ref="/devices/pc/keyboard/us83-buttons-minimal.xml"/>
 	<hdc id="hdcXT" drives='[{name:"10Mb Hard Disk",type:3}]'/>
 	<chipset id="chipset" model="5160" sw1="01001001"/>
 </machine>
diff --git a/devices/pc/machine/5160/ega/256kb/debugger/machine.xml b/devices/pc/machine/5160/ega/256kb/debugger/machine.xml
index 4712bcc68..d6966a4f6 100644
--- a/devices/pc/machine/5160/ega/256kb/debugger/machine.xml
+++ b/devices/pc/machine/5160/ega/256kb/debugger/machine.xml
@@ -10,7 +10,7 @@
 	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/rom/5160/bios/1982-11-08/XTBIOS-REV1.json"/>
 	<video ref="/devices/pc/video/ibm/ega/1984-09-13/64kb.xml"/>
 	<fdc ref="/disks/pc/compiled/library.xml"/>
-	<keyboard ref="/devices/pc/keyboard/keyboard-minimal-functions.xml"/>
+	<keyboard ref="/devices/pc/keyboard/us83-buttons-functions.xml"/>
 	<debugger id="debugger"/>
 	<panel ref="/devices/pc/panel/wide.xml"/>
 	<chipset id="chipset" model="5160" sw1="01001101" pos="left" padleft="8px" padbottom="8px">
diff --git a/devices/pc/machine/5160/ega/640kb/array/machine.xml b/devices/pc/machine/5160/ega/640kb/array/machine.xml
index 946007e92..9c263e857 100644
--- a/devices/pc/machine/5160/ega/640kb/array/machine.xml
+++ b/devices/pc/machine/5160/ega/640kb/array/machine.xml
@@ -9,7 +9,7 @@
 	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/rom/5160/bios/1982-11-08/XTBIOS-REV1.json"/>
 	<video ref="/devices/pc/video/ibm/ega/1984-09-13/128kb-autolock640.xml"/>
 	<fdc ref="/disks/pc/compiled/library.xml"/>
-	<keyboard ref="/devices/pc/keyboard/keyboard-minimal.xml"/>
+	<keyboard ref="/devices/pc/keyboard/us83-buttons-minimal.xml"/>
 	<cpu id="cpu8088" model="8088">
 		<control type="button" binding="setSpeed">Fast</control>
 	</cpu>
diff --git a/devices/pc/machine/5160/ega/640kb/debugger/machine.xml b/devices/pc/machine/5160/ega/640kb/debugger/machine.xml
index e8b5e1389..e78453aef 100644
--- a/devices/pc/machine/5160/ega/640kb/debugger/machine.xml
+++ b/devices/pc/machine/5160/ega/640kb/debugger/machine.xml
@@ -10,7 +10,7 @@
 	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/rom/5160/bios/1982-11-08/XTBIOS-REV1.json"/>
 	<video ref="/devices/pc/video/ibm/ega/1984-09-13/128kb-autolockfs.xml"/>
 	<fdc ref="/disks/pc/compiled/library.xml"/>
-	<keyboard ref="/devices/pc/keyboard/keyboard-minimal-functions.xml"/>
+	<keyboard ref="/devices/pc/keyboard/us83-buttons-functions.xml"/>
 	<debugger id="debugger"/>
 	<panel ref="/devices/pc/panel/wide.xml"/>
 	<chipset id="chipset" model="5160" sw1="01001101" pos="left" padleft="8px" padbottom="8px">
diff --git a/devices/pc/machine/5160/ega/640kb/machine.xml b/devices/pc/machine/5160/ega/640kb/machine.xml
index d3bf7aef6..e0e5009da 100644
--- a/devices/pc/machine/5160/ega/640kb/machine.xml
+++ b/devices/pc/machine/5160/ega/640kb/machine.xml
@@ -10,7 +10,7 @@
 	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/rom/5160/bios/1982-11-08/XTBIOS-REV1.json"/>
 	<video ref="/devices/pc/video/ibm/ega/1984-09-13/128kb-autolockfs.xml"/>
 	<fdc ref="/disks/pc/compiled/library.xml"/>
-	<keyboard ref="/devices/pc/keyboard/keyboard-minimal-functions.xml"/>
+	<keyboard ref="/devices/pc/keyboard/us83-buttons-functions.xml"/>
 	<chipset id="chipset" model="5160" sw1="01001101"/>
 	<hdc ref="/disks/pc/fixed/10mb/pcdos200-win101-ega.xml"/>
 	<serial id="com2" adapter="2"/>
diff --git a/devices/pc/machine/5160/ega/640kb/win101/debugger/machine.xml b/devices/pc/machine/5160/ega/640kb/win101/debugger/machine.xml
index c85e48583..6d03cf419 100644
--- a/devices/pc/machine/5160/ega/640kb/win101/debugger/machine.xml
+++ b/devices/pc/machine/5160/ega/640kb/win101/debugger/machine.xml
@@ -10,7 +10,7 @@
 	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/rom/5160/bios/1982-11-08/XTBIOS-REV1.json"/>
 	<video ref="/devices/pc/video/ibm/ega/1984-09-13/128kb-autolockfs.xml"/>
 	<fdc ref="/disks/pc/compiled/library.xml"/>
-	<keyboard ref="/devices/pc/keyboard/keyboard-minimal-functions.xml"/>
+	<keyboard ref="/devices/pc/keyboard/us83-buttons-functions.xml"/>
 	<debugger id="debugger"/>
 	<panel ref="/devices/pc/panel/wide.xml"/>
 	<chipset id="chipset" model="5160" sw1="01001101" pos="left" padleft="8px" padbottom="8px">
diff --git a/devices/pc/machine/5160/ega/640kb/win101/machine.xml b/devices/pc/machine/5160/ega/640kb/win101/machine.xml
index a6aa2f4d4..c89cb7c09 100644
--- a/devices/pc/machine/5160/ega/640kb/win101/machine.xml
+++ b/devices/pc/machine/5160/ega/640kb/win101/machine.xml
@@ -9,7 +9,7 @@
 	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/rom/5160/bios/1982-11-08/XTBIOS-REV1.json"/>
 	<video ref="/devices/pc/video/ibm/ega/1984-09-13/128kb-autolockfs.xml"/>
 	<fdc ref="/disks/pc/compiled/library.xml"/>
-	<keyboard ref="/devices/pc/keyboard/keyboard-minimal.xml"/>
+	<keyboard ref="/devices/pc/keyboard/us83-buttons-minimal.xml"/>
 	<cpu id="cpu8088" model="8088">
 		<control type="button" binding="setSpeed">Fast</control>
 	</cpu>
diff --git a/devices/pc/machine/5160/mda/256kb/debugger/machine.xml b/devices/pc/machine/5160/mda/256kb/debugger/machine.xml
index bf034d84b..d4949cd9a 100644
--- a/devices/pc/machine/5160/mda/256kb/debugger/machine.xml
+++ b/devices/pc/machine/5160/mda/256kb/debugger/machine.xml
@@ -10,7 +10,7 @@
 	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/rom/5160/bios/1982-11-08/XTBIOS-REV1.json"/>
 	<video ref="/devices/pc/video/ibm/mda/ibm-mda.xml"/>
 	<fdc ref="/disks/pc/compiled/library.xml"/>
-	<keyboard ref="/devices/pc/keyboard/keyboard-minimal.xml"/>
+	<keyboard ref="/devices/pc/keyboard/us83-buttons-minimal.xml"/>
 	<debugger id="debugger"/>
 	<panel ref="/devices/pc/panel/wide.xml"/>
 	<chipset id="chipset" model="5160" sw1="01000001"/>
diff --git a/devices/pc/machine/5160/mda/256kb/fake188/debugger/machine.xml b/devices/pc/machine/5160/mda/256kb/fake188/debugger/machine.xml
index e6b1c928a..665b4b601 100644
--- a/devices/pc/machine/5160/mda/256kb/fake188/debugger/machine.xml
+++ b/devices/pc/machine/5160/mda/256kb/fake188/debugger/machine.xml
@@ -25,7 +25,7 @@
 		<control type="description" binding="descDisk" padright="8px"/>
 		<control type="file" binding="mountDrive"/>
 	</fdc>
-	<keyboard ref="/devices/pc/keyboard/keyboard-minimal.xml"/>
+	<keyboard ref="/devices/pc/keyboard/us83-buttons-minimal.xml"/>
 	<debugger id="debugger"/>
 	<panel ref="/devices/pc/panel/default.xml"/>
 	<chipset id="chipset" model="5160" sw1="01000001"/>
diff --git a/devices/pc/machine/5160/mda/256kb/fake188/machine.xml b/devices/pc/machine/5160/mda/256kb/fake188/machine.xml
index 9730fe6d9..4d899e5f1 100644
--- a/devices/pc/machine/5160/mda/256kb/fake188/machine.xml
+++ b/devices/pc/machine/5160/mda/256kb/fake188/machine.xml
@@ -27,7 +27,7 @@
 	<cpu id="cpu80188" model="80188" autostart="true" pos="left" padleft="8px" padbottom="8px">
 		<control type="button" binding="run">Run</control>
 	</cpu>
-	<keyboard ref="/devices/pc/keyboard/keyboard-minimal.xml"/>
+	<keyboard ref="/devices/pc/keyboard/us83-buttons-minimal.xml"/>
 	<chipset id="chipset" model="5160" sw1="01000001"/>
 	<hdc id="hdcXT" drives='[{name:"10Mb Hard Disk",type:3}]'/>
 </machine>
diff --git a/devices/pc/machine/5160/mda/256kb/machine.xml b/devices/pc/machine/5160/mda/256kb/machine.xml
index 5c34b6f78..0e64948ad 100644
--- a/devices/pc/machine/5160/mda/256kb/machine.xml
+++ b/devices/pc/machine/5160/mda/256kb/machine.xml
@@ -10,7 +10,7 @@
 	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/rom/5160/bios/1982-11-08/XTBIOS-REV1.json"/>
 	<video ref="/devices/pc/video/ibm/mda/ibm-mda.xml"/>
 	<fdc ref="/disks/pc/compiled/library.xml"/>
-	<keyboard ref="/devices/pc/keyboard/keyboard-minimal.xml"/>
+	<keyboard ref="/devices/pc/keyboard/us83-buttons-minimal.xml"/>
 	<chipset id="chipset" model="5160" sw1="01000001"/>
 	<hdc id="hdcXT" drives='[{name:"10Mb Hard Disk",type:3}]'/>
 </machine>
diff --git a/devices/pc/machine/5160/mda/64kb/softkbd/machine.xml b/devices/pc/machine/5160/mda/64kb/softkbd/machine.xml
index d4cb83f50..e7f0015f1 100644
--- a/devices/pc/machine/5160/mda/64kb/softkbd/machine.xml
+++ b/devices/pc/machine/5160/mda/64kb/softkbd/machine.xml
@@ -9,7 +9,7 @@
 	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/rom/5160/basic/BASIC110.json"/>
 	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/rom/5160/bios/1982-11-08/XTBIOS-REV1.json"/>
 	<video ref="/devices/pc/video/ibm/mda/ibm-mda.xml"/>
-	<keyboard ref="/devices/pc/keyboard/keyboard-us83.xml"/>
+	<keyboard ref="/devices/pc/keyboard/us83-softkeys.xml"/>
 	<debugger id="debugger"/>
 	<panel ref="/devices/pc/panel/default.xml"/>
 	<fdc ref="/disks/pc/samples.xml" width="280px"/>
diff --git a/devices/pc/machine/5170/ega/1152kb/rev1/debugger/machine.xml b/devices/pc/machine/5170/ega/1152kb/rev1/debugger/machine.xml
index c50f7f870..66ef76ab9 100644
--- a/devices/pc/machine/5170/ega/1152kb/rev1/debugger/machine.xml
+++ b/devices/pc/machine/5170/ega/1152kb/rev1/debugger/machine.xml
@@ -9,7 +9,7 @@
 	<rom id="romBIOS" addr="0xf0000" size="0x10000" alias="0xff0000" file="/devices/pc/rom/5170/bios/1984-01-10/ATBIOS-REV1.json"/>
 	<video ref="/devices/pc/video/ibm/ega/1984-09-13/128kb-autolockfs.xml"/>
 	<fdc ref="/disks/pc/compiled/library.xml" automount='{A: {name: "PC-DOS 3.00 (Disk 1)", path: "/disks/pc/dos/ibm/3.00/PCDOS300-DISK1.json"}, B: {name: "PC-DOS 3.00 (Disk 2)", path: "/disks/pc/dos/ibm/3.00/PCDOS300-DISK2.json"}}'/>
-	<keyboard ref="/devices/pc/keyboard/keyboard-minimal-functions.xml"/>
+	<keyboard ref="/devices/pc/keyboard/us84-buttons-functions.xml"/>
 	<debugger id="debugger" messages="fault" commands=""/>
 	<panel ref="/devices/pc/panel/wide.xml"/>
 	<hdc id="hdcAT" type="at" drives='[{name:"20Mb Hard Disk",type:2}]'/>
diff --git a/devices/pc/machine/5170/ega/1152kb/rev3/debugger/backtrack/machine.xml b/devices/pc/machine/5170/ega/1152kb/rev3/debugger/backtrack/machine.xml
index d8a46fdd2..4dbf8525e 100644
--- a/devices/pc/machine/5170/ega/1152kb/rev3/debugger/backtrack/machine.xml
+++ b/devices/pc/machine/5170/ega/1152kb/rev3/debugger/backtrack/machine.xml
@@ -9,7 +9,7 @@
 	<rom id="romBIOS" addr="0xf0000" size="0x10000" alias="0xff0000" file="/devices/pc/rom/5170/bios/1985-11-15/ATBIOS-REV3.json"/>
 	<video ref="/devices/pc/video/ibm/ega/1984-09-13/128kb-autolockfs.xml"/>
 	<fdc ref="/disks/pc/compiled/library.xml" automount='{A: {name: "PC-DOS 3.20 (Disk 1)", path: "/disks/pc/dos/ibm/3.20/PCDOS320-DISK1.json"}, B: {name: "PC-DOS 3.20 (Disk 2)", path: "/disks/pc/dos/ibm/3.20/PCDOS320-DISK2.json"}}'/>
-	<keyboard ref="/devices/pc/keyboard/keyboard-minimal-functions.xml"/>
+	<keyboard ref="/devices/pc/keyboard/us84-buttons-functions.xml"/>
 	<debugger id="debugger" messages="fault" commands=""/>
 	<panel ref="/devices/pc/panel/btpanel.xml"/>
 	<hdc id="hdcAT" type="at" drives='[{name:"20Mb Hard Disk",type:2}]'/>
diff --git a/devices/pc/machine/5170/ega/1152kb/rev3/debugger/machine.xml b/devices/pc/machine/5170/ega/1152kb/rev3/debugger/machine.xml
index bcdebe0ff..7ca7f66ac 100644
--- a/devices/pc/machine/5170/ega/1152kb/rev3/debugger/machine.xml
+++ b/devices/pc/machine/5170/ega/1152kb/rev3/debugger/machine.xml
@@ -9,10 +9,10 @@
 	<rom id="romBIOS" addr="0xf0000" size="0x10000" alias="0xff0000" file="/devices/pc/rom/5170/bios/1985-11-15/ATBIOS-REV3.json"/>
 	<video ref="/devices/pc/video/ibm/ega/1984-09-13/128kb-autolockfs.xml"/>
 	<fdc ref="/disks/pc/compiled/library.xml" automount='{A: {name: "PC-DOS 3.20 (Disk 1)", path: "/disks/pc/dos/ibm/3.20/PCDOS320-DISK1.json"}, B: {name: "PC-DOS 3.20 (Disk 2)", path: "/disks/pc/dos/ibm/3.20/PCDOS320-DISK2.json"}}'/>
-	<keyboard ref="/devices/pc/keyboard/keyboard-minimal-arrows.xml"/>
+	<keyboard ref="/devices/pc/keyboard/us84-buttons-arrows.xml"/>
 	<debugger id="debugger" messages="fault" commands=""/>
 	<panel ref="/devices/pc/panel/wide.xml"/>
-	<hdc id="hdcAT" type="at" drives='[{name:"20Mb Hard Disk",type:2,path:"/disks/pc/fixed/20mb/pcdos320-win300.json"}]'/>
+	<hdc id="hdcAT" type="at" drives='[{name:"20Mb Hard Disk",type:2,path:"/disks/pc/fixed/20mb/PCDOS320-WIN300.json"}]'/>
 	<chipset id="chipset" model="5170" floppies="[1440,1200]"/>
 	<serial id="com1" adapter="1"/>
 	<serial id="com2" adapter="2" binding="print"/>
diff --git a/devices/pc/machine/5170/ega/1152kb/win300/debugger/machine.xml b/devices/pc/machine/5170/ega/1152kb/win300/debugger/machine.xml
index 23b3d1c2e..f6c3d1bbc 100644
--- a/devices/pc/machine/5170/ega/1152kb/win300/debugger/machine.xml
+++ b/devices/pc/machine/5170/ega/1152kb/win300/debugger/machine.xml
@@ -8,11 +8,11 @@
 	<rom id="romBIOS" addr="0xf0000" size="0x10000" alias="0xff0000" file="/devices/pc/rom/5170/bios/1985-11-15/ATBIOS-REV3.json"/>
 	<video ref="/devices/pc/video/ibm/ega/1984-09-13/128kb-autolockfs.xml"/>
 	<fdc ref="/disks/pc/compiled/library.xml" automount='{B: {name: "PC-DOS 3.20 (Disk 2)", path: "/disks/pc/dos/ibm/3.20/PCDOS320-DISK2.json"}}'/>
-	<keyboard ref="/devices/pc/keyboard/keyboard-minimal-arrows.xml"/>
+	<keyboard ref="/devices/pc/keyboard/us84-buttons-arrows.xml"/>
 	<debugger id="debugger"/>
 	<panel ref="/devices/pc/panel/wide.xml"/>
 	<cpu id="cpu286" model="80286" cycles="8000000"/>
-	<hdc id="hdcAT" type="at" drives='[{name:"20Mb Hard Disk",type:2,path:"/disks/pc/fixed/20mb/pcdos320-win300.json"}]'/>
+	<hdc id="hdcAT" type="at" drives='[{name:"20Mb Hard Disk",type:2,path:"/disks/pc/fixed/20mb/PCDOS320-WIN300.json"}]'/>
 	<chipset id="chipset" model="5170" floppies="[1440,1200]"/>
 	<serial id="com1" adapter="1"/>
 	<serial id="com2" adapter="2" binding="print"/>
diff --git a/devices/pc/machine/5170/ega/1152kb/win300/machine.xml b/devices/pc/machine/5170/ega/1152kb/win300/machine.xml
index f4c90e2ae..20ffb4365 100644
--- a/devices/pc/machine/5170/ega/1152kb/win300/machine.xml
+++ b/devices/pc/machine/5170/ega/1152kb/win300/machine.xml
@@ -8,13 +8,13 @@
 	<rom id="romBIOS" addr="0xf0000" size="0x10000" alias="0xff0000" file="/devices/pc/rom/5170/bios/1985-11-15/ATBIOS-REV3.json"/>
 	<video ref="/devices/pc/video/ibm/ega/1984-09-13/128kb-autolockfs.xml"/>
 	<fdc ref="/disks/pc/compiled/library.xml" automount='{B: {name: "PC-DOS 3.20 (Disk 2)", path: "/disks/pc/dos/ibm/3.20/PCDOS320-DISK2.json"}}'/>
-	<keyboard ref="/devices/pc/keyboard/keyboard-minimal-arrows.xml"/>
+	<keyboard ref="/devices/pc/keyboard/us84-buttons-arrows.xml"/>
 	<cpu id="cpu286" model="80286" cycles="8000000" autostart="true" pos="right" padright="8px" padbottom="8px">
 		<control type="button" binding="run">Run</control>
 		<control type="button" binding="reset">Reset</control>
 		<control type="button" binding="setSpeed">Speed</control>
 	</cpu>
-	<hdc id="hdcAT" type="at" drives='[{name:"20Mb Hard Disk",type:2,path:"/disks/pc/fixed/20mb/pcdos320-win300.json"}]'/>
+	<hdc id="hdcAT" type="at" drives='[{name:"20Mb Hard Disk",type:2,path:"/disks/pc/fixed/20mb/PCDOS320-WIN300.json"}]'/>
 	<chipset id="chipset" model="5170" floppies="[1440,1200]"/>
 	<serial id="com1" adapter="1"/>
 	<serial id="com2" adapter="2" binding="print"/>
diff --git a/devices/pc/machine/5170/ega/2048kb/rev3/debugger/machine.md b/devices/pc/machine/5170/ega/2048kb/rev3/debugger/machine.md
new file mode 100644
index 000000000..952000ebc
--- /dev/null
+++ b/devices/pc/machine/5170/ega/2048kb/rev3/debugger/machine.md
@@ -0,0 +1,11 @@
+---
+layout: page
+title: "IBM PC AT (Model 5170, 2Mb) with EGA Display and 20Mb Hard Disk"
+permalink: /devices/pc/machine/5170/ega/2048kb/rev3/debugger/
+machines:
+  - type: pc
+    id: ibm5170
+    debugger: true
+---
+
+{% include machine.html id="ibm5170" %}
diff --git a/disks/pc/os2/ibm/1.0/machine.xml b/devices/pc/machine/5170/ega/2048kb/rev3/debugger/machine.xml
similarity index 76%
rename from disks/pc/os2/ibm/1.0/machine.xml
rename to devices/pc/machine/5170/ega/2048kb/rev3/debugger/machine.xml
index edf188fbd..292b903e7 100644
--- a/disks/pc/os2/ibm/1.0/machine.xml
+++ b/devices/pc/machine/5170/ega/2048kb/rev3/debugger/machine.xml
@@ -8,11 +8,11 @@
 	<ram id="ramExt" addr="0x100000" size="0x160000" comment=""/>
 	<rom id="romBIOS" addr="0xf0000" size="0x10000" alias="0xff0000" file="/devices/pc/rom/5170/bios/1985-11-15/ATBIOS-REV3.json"/>
 	<video ref="/devices/pc/video/ibm/ega/1984-09-13/128kb-lockfs.xml"/>
-	<fdc ref="/disks/pc/compiled/library.xml" automount=''/>
-	<keyboard ref="/devices/pc/keyboard/keyboard-minimal-arrows.xml"/>
+	<fdc ref="/disks/pc/compiled/library.xml" automount='{A:{name:"PC-DOS 3.30 (Disk 1)",path:"/disks/pc/dos/ibm/3.30/PCDOS300-DISK1.json"}, B:{name:"PC-DOS 3.30 (Disk 2)",path:"/disks/pc/dos/ibm/3.30/PCDOS300-DISK2.json"}}'/>
+	<keyboard ref="/devices/pc/keyboard/us84-buttons-arrows.xml"/>
 	<debugger id="debugger" messages="fault" commands=""/>
 	<panel ref="/devices/pc/panel/wide.xml"/>
-	<hdc id="hdcAT" type="at" drives='[{name:"20Mb Hard Disk",type:2,path:"/disks/pc/os2/ibm/1.0/OS210-HDISK.json"}]'/>
+	<hdc id="hdcAT" type="at" drives='[{name:"20Mb Hard Disk",type:2,path:"/disks/pc/fixed/20mb/PCDOS330-EMPTY.json"}]'/>
 	<chipset id="chipset" model="5170" floppies="[1440,1200]"/>
 	<serial id="com1" adapter="1"/>
 	<serial id="com2" adapter="2" binding="print"/>
diff --git a/devices/pc/machine/5170/ega/640kb/rev1/debugger/machine.xml b/devices/pc/machine/5170/ega/640kb/rev1/debugger/machine.xml
index 740f7ceb8..9e6ff8c55 100644
--- a/devices/pc/machine/5170/ega/640kb/rev1/debugger/machine.xml
+++ b/devices/pc/machine/5170/ega/640kb/rev1/debugger/machine.xml
@@ -8,7 +8,7 @@
 	<rom id="romBIOS" addr="0xf0000" size="0x10000" alias="0xff0000" file="/devices/pc/rom/5170/bios/1984-01-10/ATBIOS-REV1.json"/>
 	<video ref="/devices/pc/video/ibm/ega/1984-09-13/128kb-autolockfs.xml"/>
 	<fdc ref="/disks/pc/compiled/library.xml" automount='{A: {name: "PC-DOS 3.00 (Disk 1)", path: "/disks/pc/dos/ibm/3.00/PCDOS300-DISK1.json"}, B: {name: "PC-DOS 3.00 (Disk 2)", path: "/disks/pc/dos/ibm/3.00/PCDOS300-DISK2.json"}}'/>
-	<keyboard ref="/devices/pc/keyboard/keyboard-minimal-functions.xml"/>
+	<keyboard ref="/devices/pc/keyboard/us84-buttons-functions.xml"/>
 	<debugger id="debugger" messages="fault" commands=""/>
 	<panel ref="/devices/pc/panel/wide.xml"/>
 	<chipset id="chipset" model="5170" floppies="[1200,1200]"/>
diff --git a/devices/pc/machine/5170/ega/640kb/rev1/machine.xml b/devices/pc/machine/5170/ega/640kb/rev1/machine.xml
index 55f908706..3a9d0264a 100644
--- a/devices/pc/machine/5170/ega/640kb/rev1/machine.xml
+++ b/devices/pc/machine/5170/ega/640kb/rev1/machine.xml
@@ -8,7 +8,7 @@
 	<rom id="romBIOS" addr="0xf0000" size="0x10000" alias="0xff0000" file="/devices/pc/rom/5170/bios/1984-01-10/ATBIOS-REV1.json"/>
 	<video ref="/devices/pc/video/ibm/ega/1984-09-13/128kb-autolockfs.xml"/>
 	<fdc ref="/disks/pc/compiled/library.xml" pos="right" automount='{A: {name: "MS-DOS 4.00 (Disk 1)", path: "/disks/pc/dos/microsoft/4.00/MSDOS400-DISK1.json"}}'/>
-	<keyboard ref="/devices/pc/keyboard/keyboard-minimal.xml"/>
+	<keyboard ref="/devices/pc/keyboard/us83-buttons-minimal.xml"/>
 	<chipset id="chipset" model="5170" floppies="[1200,1200]"/>
 	<serial id="com1" adapter="1"/>
 	<serial id="com2" adapter="2" binding="print"/>
diff --git a/devices/pc/machine/5170/vga/2048kb/win310/debugger/machine.xml b/devices/pc/machine/5170/vga/2048kb/win310/debugger/machine.xml
index dc5b549b4..3e154fb21 100644
--- a/devices/pc/machine/5170/vga/2048kb/win310/debugger/machine.xml
+++ b/devices/pc/machine/5170/vga/2048kb/win310/debugger/machine.xml
@@ -8,11 +8,11 @@
 	<rom id="romBIOS" addr="0xf0000" size="0x10000" alias="0xff0000" file="/devices/pc/rom/5170/bios/1985-11-15/ATBIOS-REV3.json"/>
 	<video ref="/devices/pc/video/ibm/vga/1986-10-27/256kb-autolockfs.xml"/>
 	<fdc ref="/disks/pc/compiled/library.xml" automount=''/>
-	<keyboard ref="/devices/pc/keyboard/keyboard-minimal-arrows.xml"/>
+	<keyboard ref="/devices/pc/keyboard/us84-buttons-arrows.xml"/>
 	<debugger id="debugger"/>
 	<panel ref="/devices/pc/panel/wide.xml"/>
 	<cpu id="cpu286" model="80286" cycles="8000000"/>
-	<hdc id="hdcAT" type="at" drives='[{name:"20Mb Hard Disk",type:2,path:"/disks/pc/fixed/20mb/pcdos330-win310.json"}]'/>
+	<hdc id="hdcAT" type="at" drives='[{name:"20Mb Hard Disk",type:2,path:"/disks/pc/fixed/20mb/PCDOS330-WIN310.json"}]'/>
 	<chipset id="chipset" model="5170" floppies="[1440,1200]"/>
 	<serial id="com1" adapter="1"/>
 	<serial id="com2" adapter="2" binding="print"/>
diff --git a/devices/pc/machine/5170/vga/2048kb/win310/machine.xml b/devices/pc/machine/5170/vga/2048kb/win310/machine.xml
index 162b45cc6..1d65c22ba 100644
--- a/devices/pc/machine/5170/vga/2048kb/win310/machine.xml
+++ b/devices/pc/machine/5170/vga/2048kb/win310/machine.xml
@@ -8,13 +8,13 @@
 	<rom id="romBIOS" addr="0xf0000" size="0x10000" alias="0xff0000" file="/devices/pc/rom/5170/bios/1985-11-15/ATBIOS-REV3.json"/>
 	<video ref="/devices/pc/video/ibm/vga/1986-10-27/256kb-autolockfs.xml"/>
 	<fdc ref="/disks/pc/compiled/library.xml" automount=''/>
-	<keyboard ref="/devices/pc/keyboard/keyboard-minimal-arrows.xml"/>
+	<keyboard ref="/devices/pc/keyboard/us84-buttons-arrows.xml"/>
 	<cpu id="cpu286" model="80286" cycles="8000000" autostart="true" pos="right" padright="8px" padbottom="8px">
 		<control type="button" binding="run">Run</control>
 		<control type="button" binding="reset">Reset</control>
 		<control type="button" binding="setSpeed">Speed</control>
 	</cpu>
-	<hdc id="hdcAT" type="at" drives='[{name:"20Mb Hard Disk",type:2,path:"/disks/pc/fixed/20mb/pcdos330-win310.json"}]'/>
+	<hdc id="hdcAT" type="at" drives='[{name:"20Mb Hard Disk",type:2,path:"/disks/pc/fixed/20mb/PCDOS330-WIN310.json"}]'/>
 	<chipset id="chipset" model="5170" floppies="[1440,1200]"/>
 	<serial id="com1" adapter="1"/>
 	<serial id="com2" adapter="2" binding="print"/>
diff --git a/devices/pc/machine/README.md b/devices/pc/machine/README.md
index daf54849e..97a0aeae1 100644
--- a/devices/pc/machine/README.md
+++ b/devices/pc/machine/README.md
@@ -105,5 +105,6 @@ Our pre-built [Model 5160](/devices/pc/machine/5160/) machines include:
 * [IBM PC AT (8Mhz, 1152Kb, 20Mb Drive) with EGA Display and Debugger](/devices/pc/machine/5170/ega/1152kb/rev3/debugger/)
 * [IBM PC AT (8Mhz, 1152Kb, 20Mb Drive) with EGA Display running Windows 3.00](/devices/pc/machine/5170/ega/1152kb/win300/)
 * [IBM PC AT (8Mhz, 1152Kb, 20Mb Drive) with EGA Display and Debugger running Windows 3.00](/devices/pc/machine/5170/ega/1152kb/win300/)
+* [IBM PC AT (8Mhz, 2Mb, 20Mb Drive) with EGA Display and Debugger](/devices/pc/machine/5170/ega/2048kb/rev3/debugger/)
 * [IBM PC AT (8Mhz, 2Mb, 20Mb Drive) with VGA Display running Windows 3.10](/devices/pc/machine/5170/vga/2048kb/win310/)
 * [IBM PC AT (8Mhz, 2Mb, 20Mb Drive) with VGA Display and Debugger running Windows 3.10](/devices/pc/machine/5170/vga/2048kb/win310/debugger/)
diff --git a/devices/pc/machine/compaq/deskpro386/ega/2048kb/machine.xml b/devices/pc/machine/compaq/deskpro386/ega/2048kb/machine.xml
index 11e90b265..4c05633f3 100644
--- a/devices/pc/machine/compaq/deskpro386/ega/2048kb/machine.xml
+++ b/devices/pc/machine/compaq/deskpro386/ega/2048kb/machine.xml
@@ -10,10 +10,10 @@
 	<rom id="romBIOS" addr="0xf8000" size="0x8000" alias="[0xf0000,0xffff0000,0xffff8000]" file="/devices/pc/rom/compaq/bios/deskpro386/1988-01-28/1988-01-28.json"/>
 	<video ref="/devices/pc/video/ibm/ega/1984-09-13/128kb-autolockfs.xml"/>
 	<fdc ref="/disks/pc/compiled/library.xml" automount='{A: {name: "PC-DOS 3.30 (Disk 1)", path: "/disks/pc/dos/ibm/3.30/PCDOS330-DISK1.json"}, B: {name: "PC-DOS 3.30 (Disk 2)", path: "/disks/pc/dos/ibm/3.30/PCDOS330-DISK2.json"}}'/>
-	<keyboard ref="/devices/pc/keyboard/keyboard-minimal-arrows.xml"/>
+	<keyboard ref="/devices/pc/keyboard/us84-buttons-arrows.xml"/>
 	<debugger id="debugger" messages="" commands=""/>
 	<panel ref="/devices/pc/panel/wide386.xml"/>
-	<hdc id="hdcAT" type="at" drives='[{name:"20Mb Hard Disk",type:2,path:"/disks/pc/fixed/20mb/pcdos330-empty.json"}]'/>
+	<hdc id="hdcAT" type="at" drives='[{name:"20Mb Hard Disk",type:2,path:"/disks/pc/fixed/20mb/PCDOS330-EMPTY.json"}]'/>
 	<chipset id="chipset" model="deskpro386" floppies="[1200,1200]"/>
 	<serial id="com1" adapter="1"/>
 	<serial id="com2" adapter="2" binding="print"/>
diff --git a/devices/pc/machine/compaq/deskpro386/ega/4096kb/machine.xml b/devices/pc/machine/compaq/deskpro386/ega/4096kb/machine.xml
index 3772b3f72..9fa40c293 100644
--- a/devices/pc/machine/compaq/deskpro386/ega/4096kb/machine.xml
+++ b/devices/pc/machine/compaq/deskpro386/ega/4096kb/machine.xml
@@ -10,10 +10,10 @@
 	<rom id="romBIOS" addr="0xf8000" size="0x8000" alias="[0xf0000,0xffff0000,0xffff8000]" file="/devices/pc/rom/compaq/bios/deskpro386/1988-01-28/1988-01-28.json"/>
 	<video ref="/devices/pc/video/ibm/ega/1984-09-13/128kb-autolockfs.xml"/>
 	<fdc ref="/disks/pc/compiled/library.xml" automount='{A: {name: "PC-DOS 3.30 (Disk 1)", path: "/disks/pc/dos/ibm/3.30/PCDOS330-DISK1.json"}, B: {name: "PC-DOS 3.30 (Disk 2)", path: "/disks/pc/dos/ibm/3.30/PCDOS330-DISK2.json"}}'/>
-	<keyboard ref="/devices/pc/keyboard/keyboard-minimal-arrows.xml"/>
+	<keyboard ref="/devices/pc/keyboard/us84-buttons-arrows.xml"/>
 	<debugger id="debugger" messages="" commands=""/>
 	<panel ref="/devices/pc/panel/wide386.xml"/>
-	<hdc id="hdcAT" type="at" drives='[{name:"20Mb Hard Disk",type:2,path:"/disks/pc/fixed/20mb/pcdos330-empty.json"}]'/>
+	<hdc id="hdcAT" type="at" drives='[{name:"20Mb Hard Disk",type:2,path:"/disks/pc/fixed/20mb/PCDOS330-EMPTY.json"}]'/>
 	<chipset id="chipset" model="deskpro386" floppies="[1200,1200]"/>
 	<parallel id="lpt1" adapter="2"/>
 	<serial id="com1" adapter="1"/>
diff --git a/devices/pc/machine/compaq/deskpro386/other/2048kb/machine.xml b/devices/pc/machine/compaq/deskpro386/other/2048kb/machine.xml
index 56cd557b1..3546cccb4 100644
--- a/devices/pc/machine/compaq/deskpro386/other/2048kb/machine.xml
+++ b/devices/pc/machine/compaq/deskpro386/other/2048kb/machine.xml
@@ -10,7 +10,7 @@
 	<rom id="romBIOS" addr="0xf8000" size="0x8000" alias="[0xf0000,0xffff0000,0xffff8000]" file="/devices/pc/rom/compaq/bios/deskpro386/1988-01-28/1988-01-28.json"/>
 	<video ref="/devices/pc/video/compaq/vga/109360-001/256kb-vga-lock.xml"/>
 	<fdc ref="/disks/pc/compiled/library.xml" automount='{A: {name: "PC-DOS 3.00 (Disk 1)", path: "/disks/pc/dos/ibm/3.00/PCDOS300-DISK1.json"}, B: {name: "PC-DOS 3.00 (Disk 2)", path: "/disks/pc/dos/ibm/3.00/PCDOS300-DISK2.json"}}'/>
-	<keyboard ref="/devices/pc/keyboard/keyboard-minimal-functions.xml"/>
+	<keyboard ref="/devices/pc/keyboard/us84-buttons-functions.xml"/>
 	<debugger id="debugger" messages="fault|port" commands=""/>
 	<panel ref="/devices/pc/panel/btpanel.xml"/>
 	<hdcNone id="hdcAT" type="at" drives='[{name:"20Mb Hard Disk",type:2}]'/>
diff --git a/devices/pc/machine/compaq/deskpro386/vga/2048kb/machine.xml b/devices/pc/machine/compaq/deskpro386/vga/2048kb/machine.xml
index d055dfce1..8b4f3e427 100644
--- a/devices/pc/machine/compaq/deskpro386/vga/2048kb/machine.xml
+++ b/devices/pc/machine/compaq/deskpro386/vga/2048kb/machine.xml
@@ -10,10 +10,10 @@
 	<rom id="romBIOS" addr="0xf8000" size="0x8000" alias="[0xf0000,0xffff0000,0xffff8000]" file="/devices/pc/rom/compaq/bios/deskpro386/1988-01-28/1988-01-28.json"/>
 	<video ref="/devices/pc/video/ibm/vga/1986-10-27/256kb-autolockfs.xml"/>
 	<fdc ref="/disks/pc/compiled/library.xml" automount='{A: {name: "PC-DOS 3.30 (Disk 1)", path: "/disks/pc/dos/ibm/3.30/PCDOS330-DISK1.json"}, B: {name: "VGA Tests (Black Book)", path: "/tests/pc/vga/VGABIN.json"}}'/>
-	<keyboard ref="/devices/pc/keyboard/keyboard-minimal-functions.xml"/>
+	<keyboard ref="/devices/pc/keyboard/us84-buttons-functions.xml"/>
 	<debugger id="debugger" messages="fault|int" commands=""/>
 	<panel ref="/devices/pc/panel/wide386.xml"/>
-	<hdc id="hdcAT" type="at" drives='[{name:"20Mb Hard Disk",type:2,path:"/disks/pc/fixed/20mb/pcdos330-empty.json"}]'/>
+	<hdc id="hdcAT" type="at" drives='[{name:"20Mb Hard Disk",type:2,path:"/disks/pc/fixed/20mb/PCDOS330-EMPTY.json"}]'/>
 	<chipset id="chipset" model="deskpro386" floppies="[1200,1200]" monitor="vga"/>
 	<serial id="com1" adapter="1"/>
 	<serial id="com2" adapter="2" binding="print"/>
diff --git a/devices/pc/machine/compaq/deskpro386/vga/4096kb/machine.xml b/devices/pc/machine/compaq/deskpro386/vga/4096kb/machine.xml
index 32f50463c..645ce581c 100644
--- a/devices/pc/machine/compaq/deskpro386/vga/4096kb/machine.xml
+++ b/devices/pc/machine/compaq/deskpro386/vga/4096kb/machine.xml
@@ -13,7 +13,7 @@
 	<keyboard id="keyboard"/>
 	<debugger id="debugger" messages="" commands=''/>
 	<panel ref="/devices/pc/panel/wide386.xml"/>
-	<hdc id="hdcAT" type="at" drives='[{name:"20Mb Hard Disk",type:2,path:"/disks/pc/fixed/20mb/pcdos330-empty.json"}]'/>
+	<hdc id="hdcAT" type="at" drives='[{name:"20Mb Hard Disk",type:2,path:"/disks/pc/fixed/20mb/PCDOS330-EMPTY.json"}]'/>
 	<chipset id="chipset" model="deskpro386" floppies="[1200,1200]" monitor="vga"/>
 	<serial id="com1" adapter="1"/>
 	<serial id="com2" adapter="2" binding="print"/>
diff --git a/devices/pc/machine/custom/machine.xml b/devices/pc/machine/custom/machine.xml
index bbbde8c57..900f75241 100644
--- a/devices/pc/machine/custom/machine.xml
+++ b/devices/pc/machine/custom/machine.xml
@@ -13,6 +13,6 @@
 		<control type="button" binding="run">Run</control>
 		<control type="button" binding="reset">Reset</control>
 	</cpu>
-	<keyboard ref="/devices/pc/keyboard/keyboard-minimal.xml"/>
+	<keyboard ref="/devices/pc/keyboard/us83-buttons-minimal.xml"/>
 	<chipset id="chipset" model="5150" sw1="01000001" sw2="11110000"/>
 </machine>
diff --git a/disks/pc/cpm/1.1b/machine.xml b/disks/pc/cpm/1.1b/machine.xml
index e8b9a613e..b30f4474b 100644
--- a/disks/pc/cpm/1.1b/machine.xml
+++ b/disks/pc/cpm/1.1b/machine.xml
@@ -20,6 +20,6 @@
 		<control type="button" binding="run">Run</control>
 		<control type="button" binding="reset">Reset</control>
 	</cpu>
-	<keyboard ref="/devices/pc/keyboard/keyboard-minimal.xml"/>
+	<keyboard ref="/devices/pc/keyboard/us83-buttons-minimal.xml"/>
 	<chipset id="chipset" model="5150" sw1="01000001" sw2="11110000"/>
 </machine>
diff --git a/disks/pc/diags/ibm/2.20/machine.xml b/disks/pc/diags/ibm/2.20/machine.xml
index b4f75932f..711705cc5 100644
--- a/disks/pc/diags/ibm/2.20/machine.xml
+++ b/disks/pc/diags/ibm/2.20/machine.xml
@@ -21,7 +21,7 @@
 		<control type="button" binding="run">Run</control>
 		<control type="button" binding="reset">Reset</control>
 	</cpu>
-	<keyboard ref="/devices/pc/keyboard/keyboard-minimal.xml"/>
+	<keyboard ref="/devices/pc/keyboard/us83-buttons-minimal.xml"/>
 	<debugger id="debugger"/>
 	<panel ref="/devices/pc/panel/wide.xml"/>
 	<chipset id="chipset" model="5150" sw1="01000001" sw2="11110000"/>
diff --git a/disks/pc/os2/ibm/1.0/OS210-HDISK.json b/disks/pc/fixed/20mb/IBMOS210.json
similarity index 100%
rename from disks/pc/os2/ibm/1.0/OS210-HDISK.json
rename to disks/pc/fixed/20mb/IBMOS210.json
diff --git a/disks/pc/games/infocom/machine.xml b/disks/pc/games/infocom/machine.xml
index 070732a79..d56b4cfe2 100644
--- a/disks/pc/games/infocom/machine.xml
+++ b/disks/pc/games/infocom/machine.xml
@@ -12,6 +12,6 @@
 		<control type="button" binding="run">Run</control>
 		<control type="button" binding="reset">Reset</control>
 	</cpu>
-	<keyboard ref="/devices/pc/keyboard/keyboard-minimal.xml"/>
+	<keyboard ref="/devices/pc/keyboard/us83-buttons-minimal.xml"/>
 	<chipset id="chipset" model="5150" sw1="01001001" sw2="11110000"/>
 </machine>
diff --git a/disks/pc/games/microsoft/adventure/machine.xml b/disks/pc/games/microsoft/adventure/machine.xml
index 9b2e9de8c..113dae57a 100644
--- a/disks/pc/games/microsoft/adventure/machine.xml
+++ b/disks/pc/games/microsoft/adventure/machine.xml
@@ -12,6 +12,6 @@
 		<control type="button" binding="run">Run</control>
 		<control type="button" binding="reset">Reset</control>
 	</cpu>
-	<keyboard ref="/devices/pc/keyboard/keyboard-minimal.xml"/>
+	<keyboard ref="/devices/pc/keyboard/us83-buttons-minimal.xml"/>
 	<chipset id="chipset" model="5150" sw1="01000001" sw2="11110000"/>
 </machine>
diff --git a/disks/pc/os2/ibm/1.0/README.md b/disks/pc/os2/ibm/1.0/README.md
index 1f0e5cc0f..78458bcc0 100644
--- a/disks/pc/os2/ibm/1.0/README.md
+++ b/disks/pc/os2/ibm/1.0/README.md
@@ -6,6 +6,9 @@ machines:
   - type: pc
     id: ibm5170
     debugger: true
+    config: /devices/pc/machine/5170/ega/2048kb/rev3/debugger/machine.xml
+    drives: '[{name:"20Mb Hard Disk",type:2,path:"/disks/pc/fixed/20mb/IBMOS210.json"}]'
+    automount: ''
 ---
 
 IBM OS/2 1.0