diff --git a/apps/c1p/all.xml b/apps/c1p/all.xml
index 0ed8ce9e7..3d8d28dd6 100644
--- a/apps/c1p/all.xml
+++ b/apps/c1p/all.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <serial id="serialPort" pos="left" padleft="8px">
-	<control type="list" class="input" binding="listSerial">
+	<control type="list" binding="listSerial">
 		<item ref="/apps/c1p/BASIC/JP/TUBELIST.BAS">TUBELIST (JP)</item>
 		<item ref="/apps/c1p/BASIC/JP/HANGWOMAN.BAS">HANGWOMAN (JP)</item>
 		<item ref="/apps/c1p/BASIC/JP/CHECKERS.BAS">CHECKERS (JP)</item>
@@ -20,6 +20,6 @@
 		<item ref="/apps/c1p/BASIC/OSI/SAMPLE6.BAS">PRESIDENTS</item>
 		<item ref="/sites/www.osiweb.org/programs/basic/OsiBas/spacewar.bas">SPACEWAR</item>
 	</control>
-	<control type="button" class="input" binding="loadSerial">Download</control>
-	<control type="file" class="input" binding="mountSerial" style="padding-left:16px"/>
+	<control type="button" binding="loadSerial">Download</control>
+	<control type="file" binding="mountSerial" style="padding-left:16px"/>
 </serial>
diff --git a/apps/c1p/samples.xml b/apps/c1p/samples.xml
index 98edb8208..1caa90e87 100644
--- a/apps/c1p/samples.xml
+++ b/apps/c1p/samples.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <serial id="serialPort" pos="left" padleft="8px">
-	<control type="list" class="input" binding="listSerial">
+	<control type="list" binding="listSerial">
 		<item ref="/apps/c1p/BASIC/OSI/POKER.BAS">POKER</item>
 		<item ref="/apps/c1p/BASIC/OSI/SAMPLE1.BAS">BASIC MATH</item>
 		<item ref="/apps/c1p/BASIC/OSI/SAMPLE2.BAS">CHECKING</item>
@@ -9,6 +9,6 @@
 		<item ref="/apps/c1p/BASIC/OSI/SAMPLE5.BAS">COUNTER</item>
 		<item ref="/apps/c1p/BASIC/OSI/SAMPLE6.BAS">PRESIDENTS</item>
 	</control>
-	<control type="button" class="input" binding="loadSerial">Download</control>
-	<control type="file" class="input" binding="mountSerial" style="padding-left:16px"/>
+	<control type="button" binding="loadSerial">Download</control>
+	<control type="file" binding="mountSerial" style="padding-left:16px"/>
 </serial>
diff --git a/devices/c1p/machine/32kb/machine.xml b/devices/c1p/machine/32kb/machine.xml
index dcd149bba..a3783d4d1 100644
--- a/devices/c1p/machine/32kb/machine.xml
+++ b/devices/c1p/machine/32kb/machine.xml
@@ -23,9 +23,9 @@
 		<name>Video Display</name>
 	</video>
 	<keyboard id="keyboard" padleft="8px">
-		<control type="button" class="input" binding="ctrl-c">CTRL-C</control>
-		<control type="button" class="input" binding="ctrl-o">CTRL-O</control>
-		<control type="button" class="input" binding="break">BREAK</control>
+		<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/samples.xml"/>
 	<disk ref="/disks/c1p/samples.xml"/>
diff --git a/devices/c1p/machine/8kb/all/debugger/machine.xml b/devices/c1p/machine/8kb/all/debugger/machine.xml
index 3fe0330dd..9e29b89b9 100644
--- a/devices/c1p/machine/8kb/all/debugger/machine.xml
+++ b/devices/c1p/machine/8kb/all/debugger/machine.xml
@@ -22,9 +22,9 @@
 		<name>Video Display</name>
 	</video>
 	<keyboard id="keyboard" padleft="8px">
-		<control type="button" class="input" binding="ctrl-c">CTRL-C</control>
-		<control type="button" class="input" binding="ctrl-o">CTRL-O</control>
-		<control type="button" class="input" binding="break">BREAK</control>
+		<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"/>
 	<panel ref="/devices/c1p/panel/default.xml"/>
diff --git a/devices/c1p/machine/8kb/embed/machine.xml b/devices/c1p/machine/8kb/embed/machine.xml
index c7265b54c..195d2c07f 100644
--- a/devices/c1p/machine/8kb/embed/machine.xml
+++ b/devices/c1p/machine/8kb/embed/machine.xml
@@ -17,9 +17,9 @@
 	<rom id="romSystem" size="0x0800" image="/devices/c1p/rom/system.hex"/>
 	<video id="video" screenwidth="256" screenheight="192" cols="32" rows="32" charset="/devices/c1p/video/chargen1x.png" width="256px" padding="8px"/>
 	<keyboard id="keyboard" pos="center">
-		<control type="button" class="input" binding="ctrl-c">CTRL-C</control>
-		<control type="button" class="input" binding="ctrl-o">CTRL-O</control>
-		<control type="button" class="input" binding="break">BREAK</control>
+		<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 id="serialPort" demo="true"/>
 </machine>
diff --git a/devices/c1p/machine/8kb/large/debugger/local.xml b/devices/c1p/machine/8kb/large/debugger/local.xml
index 0d87ef91c..ddcaf85d2 100644
--- a/devices/c1p/machine/8kb/large/debugger/local.xml
+++ b/devices/c1p/machine/8kb/large/debugger/local.xml
@@ -22,12 +22,12 @@
 		<name>Video Display</name>
 	</video>
 	<keyboard id="keyboard" padleft="8px">
-		<control type="button" class="input" binding="ctrl-c">CTRL-C</control>
-		<control type="button" class="input" binding="ctrl-o">CTRL-O</control>
-		<control type="button" class="input" binding="break">BREAK</control>
+		<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 id="serialPort" pos="left" padleft="8px">
-		<control type="list" class="input" binding="listSerial">
+		<control type="list" binding="listSerial">
 			<item ref="../../../../../../apps/c1p/BASIC/OSI/POKER.BAS">POKER</item>
 			<item ref="../../../../../../apps/c1p/BASIC/OSI/SAMPLE1.BAS">BASIC MATH</item>
 			<item ref="../../../../../../apps/c1p/BASIC/OSI/SAMPLE2.BAS">CHECKING</item>
@@ -36,7 +36,7 @@
 			<item ref="../../../../../../apps/c1p/BASIC/OSI/SAMPLE5.BAS">COUNTER</item>
 			<item ref="../../../../../../apps/c1p/BASIC/OSI/SAMPLE6.BAS">PRESIDENTS</item>
 		</control>
-		<control type="button" class="input" binding="loadSerial">Load File</control>
+		<control type="button" binding="loadSerial">Load File</control>
 	</serial>
 	<panel ref="../../../../panel/default.xml"/>
 </machine>
diff --git a/devices/c1p/machine/8kb/large/debugger/machine.xml b/devices/c1p/machine/8kb/large/debugger/machine.xml
index 2220b5d78..dc0a3823e 100644
--- a/devices/c1p/machine/8kb/large/debugger/machine.xml
+++ b/devices/c1p/machine/8kb/large/debugger/machine.xml
@@ -22,9 +22,9 @@
 		<name>Video Display</name>
 	</video>
 	<keyboard id="keyboard" padleft="8px">
-		<control type="button" class="input" binding="ctrl-c">CTRL-C</control>
-		<control type="button" class="input" binding="ctrl-o">CTRL-O</control>
-		<control type="button" class="input" binding="break">BREAK</control>
+		<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/samples.xml"/>
 	<panel ref="/devices/c1p/panel/default.xml"/>
diff --git a/devices/c1p/machine/8kb/large/machine.xml b/devices/c1p/machine/8kb/large/machine.xml
index a71b4d35a..c7aa3d2bf 100644
--- a/devices/c1p/machine/8kb/large/machine.xml
+++ b/devices/c1p/machine/8kb/large/machine.xml
@@ -18,12 +18,12 @@
 	<rom id="romSystem" size="0x0800" image="/devices/c1p/rom/system.hex"/>
 	<video id="video" screenwidth="512" screenheight="384" cols="32" rows="32" charset="/devices/c1p/video/chargen2x.png" padding="8px"/>
 	<cpu id="cpu6502" autostart="false" pos="left" padleft="8px">
-		<control type="button" class="input" binding="run">Run</control>
+		<control type="button" binding="run">Run</control>
 	</cpu>
 	<keyboard id="keyboard" pos="left" padleft="8px">
-		<control type="button" class="input" binding="ctrl-c">CTRL-C</control>
-		<control type="button" class="input" binding="ctrl-o">CTRL-O</control>
-		<control type="button" class="input" binding="break">BREAK</control>
+		<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 id="serialPort" demo="true"/>
 </machine>
diff --git a/devices/c1p/machine/8kb/small/machine.xml b/devices/c1p/machine/8kb/small/machine.xml
index d5a61ec8f..de383f3cd 100644
--- a/devices/c1p/machine/8kb/small/machine.xml
+++ b/devices/c1p/machine/8kb/small/machine.xml
@@ -18,9 +18,9 @@
 	<rom id="romSystem" size="0x0800" image="/devices/c1p/rom/system.hex"/>
 	<video id="video" screenwidth="256" screenheight="192" cols="32" rows="32" charset="/devices/c1p/video/chargen1x.png" width="256px" padding="8px"/>
 	<keyboard id="keyboard" padleft="8px">
-		<control type="button" class="input" binding="ctrl-c">CTRL-C</control>
-		<control type="button" class="input" binding="ctrl-o">CTRL-O</control>
-		<control type="button" class="input" binding="break">BREAK</control>
+		<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 id="serialPort" demo="true"/>
 </machine>
diff --git a/devices/c1p/panel/default.xml b/devices/c1p/panel/default.xml
index 0bcd5ef6d..e07874e07 100644
--- a/devices/c1p/panel/default.xml
+++ b/devices/c1p/panel/default.xml
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <panel id="panel" left="528px" top="8px" width="362px">
 	<name>Control Panel</name>
-	<control type="textarea" class="output" binding="print" width="240px" height="280px"/>
-	<control type="text" class="input" binding="debugInput" width="240px" pos=""/>
-	<control type="button" class="input" binding="debugEnter" top="290px" left="256px">Enter</control>
-	<control type="register" class="output" label="A" labelwidth="10px" binding="A" width="50px" height="18px" top="0px" left="256px" style="text-align:right"/>
-	<control type="register" class="output" label="X" labelwidth="10px" binding="X" width="50px" height="18px" top="19px" left="256px" style="text-align:right"/>
-	<control type="register" class="output" label="Y" labelwidth="10px" binding="Y" width="50px" height="18px" top="38px" left="256px" style="text-align:right"/>
-	<control type="register" class="output" label="C" labelwidth="10px" binding="C" width="50px" height="18px" top="57px" left="256px" style="text-align:right"/>
-	<control type="register" class="output" label="Z" labelwidth="10px" binding="Z" width="50px" height="18px" top="76px" left="256px" style="text-align:right"/>
-	<control type="register" class="output" label="I" labelwidth="10px" binding="I" width="50px" height="18px" top="95px" left="256px" style="text-align:right"/>
-	<control type="register" class="output" label="D" labelwidth="10px" binding="D" width="50px" height="18px" top="114px" left="256px" style="text-align:right"/>
-	<control type="register" class="output" label="B" labelwidth="10px" binding="B" width="50px" height="18px" top="133px" left="256px" style="text-align:right"/>
-	<control type="register" class="output" label="V" labelwidth="10px" binding="V" width="50px" height="18px" top="152px" left="256px" style="text-align:right"/>
-	<control type="register" class="output" label="N" labelwidth="10px" binding="N" width="50px" height="18px" top="171px" left="256px" style="text-align:right"/>
-	<control type="register" class="output" label="S" labelwidth="10px" binding="S" width="50px" height="18px" top="190px" left="256px" style="text-align:right"/>
-	<control type="register" class="output" label="PC" labelwidth="10px" binding="PC" width="50px" height="18px" top="209px" left="256px" style="text-align:right"/>
-	<control type="register" class="output" binding="speed" width="78px" height="18px" top="235px" left="256px" style="text-align:right"/>
+	<control type="textarea" binding="print" width="240px" height="280px"/>
+	<control type="text" binding="debugInput" width="240px" pos=""/>
+	<control type="button" binding="debugEnter" top="290px" left="256px">Enter</control>
+	<control type="register" label="A" labelwidth="10px" binding="A" width="50px" height="18px" top="0px" left="256px" style="text-align:right"/>
+	<control type="register" label="X" labelwidth="10px" binding="X" width="50px" height="18px" top="19px" left="256px" style="text-align:right"/>
+	<control type="register" label="Y" labelwidth="10px" binding="Y" width="50px" height="18px" top="38px" left="256px" style="text-align:right"/>
+	<control type="register" label="C" labelwidth="10px" binding="C" width="50px" height="18px" top="57px" left="256px" style="text-align:right"/>
+	<control type="register" label="Z" labelwidth="10px" binding="Z" width="50px" height="18px" top="76px" left="256px" style="text-align:right"/>
+	<control type="register" label="I" labelwidth="10px" binding="I" width="50px" height="18px" top="95px" left="256px" style="text-align:right"/>
+	<control type="register" label="D" labelwidth="10px" binding="D" width="50px" height="18px" top="114px" left="256px" style="text-align:right"/>
+	<control type="register" label="B" labelwidth="10px" binding="B" width="50px" height="18px" top="133px" left="256px" style="text-align:right"/>
+	<control type="register" label="V" labelwidth="10px" binding="V" width="50px" height="18px" top="152px" left="256px" style="text-align:right"/>
+	<control type="register" label="N" labelwidth="10px" binding="N" width="50px" height="18px" top="171px" left="256px" style="text-align:right"/>
+	<control type="register" label="S" labelwidth="10px" binding="S" width="50px" height="18px" top="190px" left="256px" style="text-align:right"/>
+	<control type="register" label="PC" labelwidth="10px" binding="PC" width="50px" height="18px" top="209px" left="256px" style="text-align:right"/>
+	<control type="register" binding="speed" width="78px" height="18px" top="235px" left="256px" style="text-align:right"/>
 	<control pos=""/>
-	<control type="button" class="input" binding="run">Run</control>
-	<control type="button" class="input" binding="step">Step</control>
-	<control type="button" class="input" binding="reset">Reset</control>
-	<control type="button" class="input" binding="setSpeed">Fast</control>
+	<control type="button" binding="run">Run</control>
+	<control type="button" binding="step">Step</control>
+	<control type="button" binding="reset">Reset</control>
+	<control type="button" binding="setSpeed">Fast</control>
 </panel>
diff --git a/devices/pc/keyboard/keyboard-minimal-arrows.xml b/devices/pc/keyboard/keyboard-minimal-arrows.xml
new file mode 100644
index 000000000..55788df03
--- /dev/null
+++ b/devices/pc/keyboard/keyboard-minimal-arrows.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<keyboard id="keyboard" padleft="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="f10">F10</control>
+	<control type="button" binding="left">&lt;</control>
+	<control type="button" binding="right">&gt;</control>
+	<control type="button" binding="up">^</control>
+	<control type="button" binding="down">v</control>
+</keyboard>
diff --git a/devices/pc/keyboard/keyboard-minimal-functions.xml b/devices/pc/keyboard/keyboard-minimal-functions.xml
new file mode 100644
index 000000000..76abbe885
--- /dev/null
+++ b/devices/pc/keyboard/keyboard-minimal-functions.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<keyboard id="keyboard" padleft="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>
+</keyboard>
diff --git a/devices/pc/keyboard/keyboard-minimal.xml b/devices/pc/keyboard/keyboard-minimal.xml
new file mode 100644
index 000000000..c72eb0a52
--- /dev/null
+++ b/devices/pc/keyboard/keyboard-minimal.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<keyboard id="keyboard" padleft="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="f10">F10</control>
+</keyboard>
diff --git a/devices/pc/keyboard/keyboard-us83.xml b/devices/pc/keyboard/keyboard-us83.xml
new file mode 100644
index 000000000..dfbf2e824
--- /dev/null
+++ b/devices/pc/keyboard/keyboard-us83.xml
@@ -0,0 +1,87 @@
+<keyboard id="keyboard" model="us83" pos="center" width="900px" height="210px" padleft="8px">
+	<control type="container">
+		<control type="key" binding="f1" width="34px" top="0px" left="0px">F1</control>
+		<control type="key" binding="f2" width="34px" top="0px" left="42px">F2</control>
+		<control type="key" binding="f3" width="34px" top="42px" left="0px">F3</control>
+		<control type="key" binding="f4" width="34px" top="42px" left="42px">F4</control>
+		<control type="key" binding="f5" width="34px" top="84px" left="0px">F5</control>
+		<control type="key" binding="f6" width="34px" top="84px" left="42px">F6</control>
+		<control type="key" binding="f7" width="34px" top="126px" left="0px">F7</control>
+		<control type="key" binding="f8" width="34px" top="126px" left="42px">F8</control>
+		<control type="key" binding="f9" width="34px" top="168px" left="0px">F9</control>
+		<control type="key" binding="f10" width="34px" top="168px" left="42px">F10</control>
+		<control type="key" binding="esc" width="46px" top="0px" left="96px">Esc</control>
+		<control type="key" binding="1" width="34px" top="0px" left="150px">1 !</control>
+		<control type="key" binding="2" width="34px" top="0px" left="192px">2 @</control>
+		<control type="key" binding="3" width="34px" top="0px" left="234px">3 #</control>
+		<control type="key" binding="4" width="34px" top="0px" left="276px">4 $</control>
+		<control type="key" binding="5" width="34px" top="0px" left="318px">5 %</control>
+		<control type="key" binding="6" width="34px" top="0px" left="360px">6 ^</control>
+		<control type="key" binding="7" width="34px" top="0px" left="402px">7 &amp;</control>
+		<control type="key" binding="8" width="34px" top="0px" left="444px">8 *</control>
+		<control type="key" binding="9" width="34px" top="0px" left="486px">9 (</control>
+		<control type="key" binding="0" width="34px" top="0px" left="528px">0 )</control>
+		<control type="key" binding="-" width="34px" top="0px" left="570px">- _</control>
+		<control type="key" binding="=" width="34px" top="0px" left="612px">= +</control>
+		<control type="key" binding="bs" width="46px" top="0px" left="654px">Back</control>
+		<control type="key" binding="num-lock" width="76px" top="0px" left="708px">Num</control>
+		<control type="key" binding="scroll-lock" width="76px" top="0px" left="792px">Scroll</control>
+		<control type="key" binding="tab" width="46px" top="42px" left="96px">Tab</control>
+		<control type="key" binding="q" width="34px" top="42px" left="150px">Q</control>
+		<control type="key" binding="w" width="34px" top="42px" left="192px">W</control>
+		<control type="key" binding="e" width="34px" top="42px" left="234px">E</control>
+		<control type="key" binding="r" width="34px" top="42px" left="276px">R</control>
+		<control type="key" binding="t" width="34px" top="42px" left="318px">T</control>
+		<control type="key" binding="y" width="34px" top="42px" left="360px">Y</control>
+		<control type="key" binding="u" width="34px" top="42px" left="402px">U</control>
+		<control type="key" binding="i" width="34px" top="42px" left="444px">I</control>
+		<control type="key" binding="o" width="34px" top="42px" left="486px">O</control>
+		<control type="key" binding="p" width="34px" top="42px" left="528px">P</control>
+		<control type="key" binding="[" width="34px" top="42px" left="570px">[ {</control>
+		<control type="key" binding="]" width="34px" top="42px" left="612px">] }</control>
+		<control type="key" binding="enter" height="76px" width="46px" top="42px" left="654px"><br/>Enter</control>
+		<control type="key" binding="num-home" width="34px" top="42px" left="708px">7</control>
+		<control type="key" binding="num-up" width="34px" top="42px" left="750px">8</control>
+		<control type="key" binding="num-pgup" width="34px" top="42px" left="792px">9</control>
+		<control type="key" binding="num-sub" width="34px" top="42px" left="834px">-</control>
+		<control type="key" binding="ctrl" width="46px" top="84px" left="96px">Ctrl</control>
+		<control type="key" binding="a" width="34px" top="84px" left="150px">A</control>
+		<control type="key" binding="s" width="34px" top="84px" left="192px">S</control>
+		<control type="key" binding="d" width="34px" top="84px" left="234px">D</control>
+		<control type="key" binding="f" width="34px" top="84px" left="276px">F</control>
+		<control type="key" binding="g" width="34px" top="84px" left="318px">G</control>
+		<control type="key" binding="h" width="34px" top="84px" left="360px">H</control>
+		<control type="key" binding="j" width="34px" top="84px" left="402px">J</control>
+		<control type="key" binding="k" width="34px" top="84px" left="444px">K</control>
+		<control type="key" binding="l" width="34px" top="84px" left="486px">L</control>
+		<control type="key" binding=";" width="34px" top="84px" left="528px">; :</control>
+		<control type="key" binding="quote" width="34px" top="84px" left="570px">' "</control>
+		<control type="key" binding="`" width="34px" top="84px" left="612px">` ~</control>
+		<control type="key" binding="num-left" width="34px" top="84px" left="708px">4</control>
+		<control type="key" binding="num-center" width="34px" top="84px" left="750px">5</control>
+		<control type="key" binding="num-right" width="34px" top="84px" left="792px">6</control>
+		<control type="key" binding="num-add" height="118px" width="34px" top="84px" left="834px"><br/>+</control>
+		<control type="key" binding="shift" width="46px" top="126px" left="96px">Shift</control>
+		<control type="key" binding="\\" width="34px" top="126px" left="150px">\ |</control>
+		<control type="key" binding="z" width="34px" top="126px" left="192px">Z</control>
+		<control type="key" binding="x" width="34px" top="126px" left="234px">X</control>
+		<control type="key" binding="c" width="34px" top="126px" left="276px">C</control>
+		<control type="key" binding="v" width="34px" top="126px" left="318px">V</control>
+		<control type="key" binding="b" width="34px" top="126px" left="360px">B</control>
+		<control type="key" binding="n" width="34px" top="126px" left="402px">N</control>
+		<control type="key" binding="m" width="34px" top="126px" left="444px">M</control>
+		<control type="key" binding="," width="34px" top="126px" left="486px">, &lt;</control>
+		<control type="key" binding="." width="34px" top="126px" left="528px">. &gt;</control>
+		<control type="key" binding="/" width="34px" top="126px" left="570px">/ ?</control>
+		<control type="key" binding="right-shift" width="46px" top="126px" left="612px">Shift</control>
+		<control type="key" binding="prtsc" width="34px" top="126px" left="666px">PrtSc</control>
+		<control type="key" binding="num-end" width="34px" top="126px" left="708px">1</control>
+		<control type="key" binding="num-down" width="34px" top="126px" left="750px">2</control>
+		<control type="key" binding="num-pgdn" width="34px" top="126px" left="792px">3</control>
+		<control type="key" binding="alt" width="46px" top="168px" left="96px">Alt</control>
+		<control type="key" binding="space" width="434px" top="168px" left="150px">Space</control>
+		<control type="key" binding="caps-lock" width="66px" top="168px" left="592px">Caps</control>
+		<control type="key" binding="num-ins" width="76px" top="168px" left="666px">Ins</control>
+		<control type="key" binding="num-del" width="76px" top="168px" left="750px">Del</control>
+	</control>
+</keyboard>
diff --git a/devices/pc/keyboard/minimal-arrows.xml b/devices/pc/keyboard/minimal-arrows.xml
deleted file mode 100644
index 6b7b10f27..000000000
--- a/devices/pc/keyboard/minimal-arrows.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<keyboard id="keyboard" padleft="8px">
-	<control type="button" class="input" binding="esc">ESC</control>
-	<control type="button" class="input" binding="ctrl-c">CTRL-C</control>
-	<control type="button" class="input" binding="ctrl-alt-del">CTRL-ALT-DEL</control>
-	<control type="button" class="input" binding="f1">F1</control>
-	<control type="button" class="input" binding="left">&lt;</control>
-	<control type="button" class="input" binding="right">&gt;</control>
-	<control type="button" class="input" binding="up">^</control>
-	<control type="button" class="input" binding="down">v</control>
-</keyboard>
diff --git a/devices/pc/keyboard/minimal-f1-f10.xml b/devices/pc/keyboard/minimal-f1-f10.xml
deleted file mode 100644
index 260e3d65f..000000000
--- a/devices/pc/keyboard/minimal-f1-f10.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<keyboard id="keyboard" padleft="8px">
-	<control type="button" class="input" binding="esc">ESC</control>
-	<control type="button" class="input" binding="ctrl-c">CTRL-C</control>
-	<control type="button" class="input" binding="ctrl-alt-del">CTRL-ALT-DEL</control>
-	<control type="button" class="input" binding="f1">F1</control>
-	<control type="button" class="input" binding="f10">F10</control>
-</keyboard>
diff --git a/devices/pc/keyboard/minimal-functions.xml b/devices/pc/keyboard/minimal-functions.xml
deleted file mode 100644
index 981abe759..000000000
--- a/devices/pc/keyboard/minimal-functions.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<keyboard id="keyboard" padleft="8px">
-	<control type="button" class="input" binding="esc">ESC</control>
-	<control type="button" class="input" binding="ctrl-c">CTRL-C</control>
-	<control type="button" class="input" binding="ctrl-alt-del">CTRL-ALT-DEL</control>
-	<control type="button" class="input" binding="f1">F1</control>
-	<control type="button" class="input" binding="f2">F2</control>
-	<control type="button" class="input" binding="f3">F3</control>
-	<control type="button" class="input" binding="f4">F4</control>
-	<control type="button" class="input" binding="f5">F5</control>
-	<control type="button" class="input" binding="f6">F6</control>
-	<control type="button" class="input" binding="f7">F7</control>
-	<control type="button" class="input" binding="f8">F8</control>
-	<control type="button" class="input" binding="f9">F9</control>
-	<control type="button" class="input" binding="f10">F10</control>
-</keyboard>
diff --git a/devices/pc/keyboard/minimal.xml b/devices/pc/keyboard/minimal.xml
deleted file mode 100644
index 0457dc80d..000000000
--- a/devices/pc/keyboard/minimal.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<keyboard id="keyboard" padleft="8px">
-	<control type="button" class="input" binding="esc">ESC</control>
-	<control type="button" class="input" binding="ctrl-c">CTRL-C</control>
-	<control type="button" class="input" binding="ctrl-alt-del">CTRL-ALT-DEL</control>
-</keyboard>
diff --git a/devices/pc/keyboard/us83.xml b/devices/pc/keyboard/us83.xml
deleted file mode 100644
index f91e32d58..000000000
--- a/devices/pc/keyboard/us83.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<keyboard id="keyboard" model="us83" pos="center" width="900px" height="210px" padleft="8px">
-	<control type="container">
-		<control type="key" class="input" binding="f1" width="34px" top="0px" left="0px">F1</control>
-		<control type="key" class="input" binding="f2" width="34px" top="0px" left="42px">F2</control>
-		<control type="key" class="input" binding="f3" width="34px" top="42px" left="0px">F3</control>
-		<control type="key" class="input" binding="f4" width="34px" top="42px" left="42px">F4</control>
-		<control type="key" class="input" binding="f5" width="34px" top="84px" left="0px">F5</control>
-		<control type="key" class="input" binding="f6" width="34px" top="84px" left="42px">F6</control>
-		<control type="key" class="input" binding="f7" width="34px" top="126px" left="0px">F7</control>
-		<control type="key" class="input" binding="f8" width="34px" top="126px" left="42px">F8</control>
-		<control type="key" class="input" binding="f9" width="34px" top="168px" left="0px">F9</control>
-		<control type="key" class="input" binding="f10" width="34px" top="168px" left="42px">F10</control>
-		<control type="key" class="input" binding="esc" width="46px" top="0px" left="96px">Esc</control>
-		<control type="key" class="input" binding="1" width="34px" top="0px" left="150px">1 !</control>
-		<control type="key" class="input" binding="2" width="34px" top="0px" left="192px">2 @</control>
-		<control type="key" class="input" binding="3" width="34px" top="0px" left="234px">3 #</control>
-		<control type="key" class="input" binding="4" width="34px" top="0px" left="276px">4 $</control>
-		<control type="key" class="input" binding="5" width="34px" top="0px" left="318px">5 %</control>
-		<control type="key" class="input" binding="6" width="34px" top="0px" left="360px">6 ^</control>
-		<control type="key" class="input" binding="7" width="34px" top="0px" left="402px">7 &amp;</control>
-		<control type="key" class="input" binding="8" width="34px" top="0px" left="444px">8 *</control>
-		<control type="key" class="input" binding="9" width="34px" top="0px" left="486px">9 (</control>
-		<control type="key" class="input" binding="0" width="34px" top="0px" left="528px">0 )</control>
-		<control type="key" class="input" binding="-" width="34px" top="0px" left="570px">- _</control>
-		<control type="key" class="input" binding="=" width="34px" top="0px" left="612px">= +</control>
-		<control type="key" class="input" binding="bs" width="46px" top="0px" left="654px">Back</control>
-		<control type="key" class="input" binding="num-lock" width="76px" top="0px" left="708px">Num</control>
-		<control type="key" class="input" binding="scroll-lock" width="76px" top="0px" left="792px">Scroll</control>
-		<control type="key" class="input" binding="tab" width="46px" top="42px" left="96px">Tab</control>
-		<control type="key" class="input" binding="q" width="34px" top="42px" left="150px">Q</control>
-		<control type="key" class="input" binding="w" width="34px" top="42px" left="192px">W</control>
-		<control type="key" class="input" binding="e" width="34px" top="42px" left="234px">E</control>
-		<control type="key" class="input" binding="r" width="34px" top="42px" left="276px">R</control>
-		<control type="key" class="input" binding="t" width="34px" top="42px" left="318px">T</control>
-		<control type="key" class="input" binding="y" width="34px" top="42px" left="360px">Y</control>
-		<control type="key" class="input" binding="u" width="34px" top="42px" left="402px">U</control>
-		<control type="key" class="input" binding="i" width="34px" top="42px" left="444px">I</control>
-		<control type="key" class="input" binding="o" width="34px" top="42px" left="486px">O</control>
-		<control type="key" class="input" binding="p" width="34px" top="42px" left="528px">P</control>
-		<control type="key" class="input" binding="[" width="34px" top="42px" left="570px">[ {</control>
-		<control type="key" class="input" binding="]" width="34px" top="42px" left="612px">] }</control>
-		<control type="key" class="input" binding="enter" height="76px" width="46px" top="42px" left="654px"><br/>Enter</control>
-		<control type="key" class="input" binding="num-home" width="34px" top="42px" left="708px">7</control>
-		<control type="key" class="input" binding="num-up" width="34px" top="42px" left="750px">8</control>
-		<control type="key" class="input" binding="num-pgup" width="34px" top="42px" left="792px">9</control>
-		<control type="key" class="input" binding="num-sub" width="34px" top="42px" left="834px">-</control>
-		<control type="key" class="input" binding="ctrl" width="46px" top="84px" left="96px">Ctrl</control>
-		<control type="key" class="input" binding="a" width="34px" top="84px" left="150px">A</control>
-		<control type="key" class="input" binding="s" width="34px" top="84px" left="192px">S</control>
-		<control type="key" class="input" binding="d" width="34px" top="84px" left="234px">D</control>
-		<control type="key" class="input" binding="f" width="34px" top="84px" left="276px">F</control>
-		<control type="key" class="input" binding="g" width="34px" top="84px" left="318px">G</control>
-		<control type="key" class="input" binding="h" width="34px" top="84px" left="360px">H</control>
-		<control type="key" class="input" binding="j" width="34px" top="84px" left="402px">J</control>
-		<control type="key" class="input" binding="k" width="34px" top="84px" left="444px">K</control>
-		<control type="key" class="input" binding="l" width="34px" top="84px" left="486px">L</control>
-		<control type="key" class="input" binding=";" width="34px" top="84px" left="528px">; :</control>
-		<control type="key" class="input" binding="quote" width="34px" top="84px" left="570px">' "</control>
-		<control type="key" class="input" binding="`" width="34px" top="84px" left="612px">` ~</control>
-		<control type="key" class="input" binding="num-left" width="34px" top="84px" left="708px">4</control>
-		<control type="key" class="input" binding="num-center" width="34px" top="84px" left="750px">5</control>
-		<control type="key" class="input" binding="num-right" width="34px" top="84px" left="792px">6</control>
-		<control type="key" class="input" binding="num-add" height="118px" width="34px" top="84px" left="834px"><br/>+</control>
-		<control type="key" class="input" binding="shift" width="46px" top="126px" left="96px">Shift</control>
-		<control type="key" class="input" binding="\\" width="34px" top="126px" left="150px">\ |</control>
-		<control type="key" class="input" binding="z" width="34px" top="126px" left="192px">Z</control>
-		<control type="key" class="input" binding="x" width="34px" top="126px" left="234px">X</control>
-		<control type="key" class="input" binding="c" width="34px" top="126px" left="276px">C</control>
-		<control type="key" class="input" binding="v" width="34px" top="126px" left="318px">V</control>
-		<control type="key" class="input" binding="b" width="34px" top="126px" left="360px">B</control>
-		<control type="key" class="input" binding="n" width="34px" top="126px" left="402px">N</control>
-		<control type="key" class="input" binding="m" width="34px" top="126px" left="444px">M</control>
-		<control type="key" class="input" binding="," width="34px" top="126px" left="486px">, &lt;</control>
-		<control type="key" class="input" binding="." width="34px" top="126px" left="528px">. &gt;</control>
-		<control type="key" class="input" binding="/" width="34px" top="126px" left="570px">/ ?</control>
-		<control type="key" class="input" binding="right-shift" width="46px" top="126px" left="612px">Shift</control>
-		<control type="key" class="input" binding="prtsc" width="34px" top="126px" left="666px">PrtSc</control>
-		<control type="key" class="input" binding="num-end" width="34px" top="126px" left="708px">1</control>
-		<control type="key" class="input" binding="num-down" width="34px" top="126px" left="750px">2</control>
-		<control type="key" class="input" binding="num-pgdn" width="34px" top="126px" left="792px">3</control>
-		<control type="key" class="input" binding="alt" width="46px" top="168px" left="96px">Alt</control>
-		<control type="key" class="input" binding="space" width="434px" top="168px" left="150px">Space</control>
-		<control type="key" class="input" binding="caps-lock" width="66px" top="168px" left="592px">Caps</control>
-		<control type="key" class="input" binding="num-ins" width="76px" top="168px" left="666px">Ins</control>
-		<control type="key" class="input" binding="num-del" width="76px" top="168px" left="750px">Del</control>
-	</control>
-</keyboard>
diff --git a/devices/pc/machine/5150/cga/384kb/softkbd/machine.xml b/devices/pc/machine/5150/cga/384kb/softkbd/machine.xml
index 289882855..714ae700e 100644
--- a/devices/pc/machine/5150/cga/384kb/softkbd/machine.xml
+++ b/devices/pc/machine/5150/cga/384kb/softkbd/machine.xml
@@ -9,12 +9,12 @@
 	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/basic/ibm-basic-1.00.json"/>
 	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/bios/5150/1981-04-24.json"/>
 	<video ref="/devices/pc/video/video-cga-960.xml"/>
-	<keyboard ref="/devices/pc/keyboard/us83.xml"/>
+	<keyboard ref="/devices/pc/keyboard/keyboard-us83.xml"/>
 	<panel ref="/devices/pc/panel/wide.xml"/>
 	<fdc ref="/disks/pc/samples.xml" width="280px"/>
 	<chipset id="chipset" model="5150" sw1="01001001" sw2="10100000" pos="left" padleft="8px" padbottom="8px">
-		<control type="switches" class="input" label="SW1" binding="sw1" left="0px"/>
-		<control type="switches" class="input" label="SW2" binding="sw2" left="0px"/>
-		<control type="description" class="output" binding="swdesc" left="0px"/>
+		<control type="switches" label="SW1" binding="sw1" left="0px"/>
+		<control type="switches" label="SW2" binding="sw2" left="0px"/>
+		<control type="description" binding="swdesc" left="0px"/>
 	</chipset>
 </machine>
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 f5f900563..6155d5ca6 100644
--- a/devices/pc/machine/5150/cga/64kb/donkey/debugger/machine.xml
+++ b/devices/pc/machine/5150/cga/64kb/donkey/debugger/machine.xml
@@ -8,13 +8,13 @@
 	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/bios/5150/1981-04-24.json"/>
 	<video ref="/devices/pc/video/video-cga-960.xml"/>
 	<cpu id="cpu8088" model="8088" autostart="true"/>
-	<keyboard ref="/devices/pc/keyboard/minimal.xml"/>
+	<keyboard ref="/devices/pc/keyboard/keyboard-minimal.xml"/>
 	<debugger id="debugger"/>
 	<panel ref="/devices/pc/panel/wide.xml"/>
 	<fdc ref="/disks/pc/samples.xml" width="280px"/>
 	<chipset id="chipset" model="5150" sw1="01001001" sw2="11110000" pos="left" padleft="8px" padbottom="8px">
-		<control type="switches" class="input" label="SW1" binding="sw1" left="0px"/>
-		<control type="switches" class="input" label="SW2" binding="sw2" left="0px"/>
-		<control type="description" class="output" binding="swdesc" left="0px"/>
+		<control type="switches" label="SW1" binding="sw1" left="0px"/>
+		<control type="switches" label="SW2" binding="sw2" left="0px"/>
+		<control type="description" binding="swdesc" left="0px"/>
 	</chipset>
 </machine>
diff --git a/devices/pc/machine/5150/cga/64kb/donkey/machine.xml b/devices/pc/machine/5150/cga/64kb/donkey/machine.xml
index 6140dcb22..13743ca20 100644
--- a/devices/pc/machine/5150/cga/64kb/donkey/machine.xml
+++ b/devices/pc/machine/5150/cga/64kb/donkey/machine.xml
@@ -8,10 +8,10 @@
 	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/bios/5150/1981-04-24.json"/>
 	<video ref="/devices/pc/video/video-cga-960.xml"/>
 	<cpu id="cpu8088" model="8088" autostart="true" padleft="8px">
-		<control type="button" class="input" binding="run">Run</control>
-		<control type="button" class="input" binding="reset">Reset</control>
+		<control type="button" binding="run">Run</control>
+		<control type="button" binding="reset">Reset</control>
 	</cpu>
-	<keyboard ref="/devices/pc/keyboard/minimal.xml"/>
+	<keyboard ref="/devices/pc/keyboard/keyboard-minimal.xml"/>
 	<fdc ref="/disks/pc/samples.xml" pos="right"/>
 	<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 147ff1195..2e7ce26d5 100644
--- a/devices/pc/machine/5150/cga/64kb/softkbd/machine.xml
+++ b/devices/pc/machine/5150/cga/64kb/softkbd/machine.xml
@@ -8,13 +8,13 @@
 	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/basic/ibm-basic-1.00.json"/>
 	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/bios/5150/1981-04-24.json"/>
 	<video ref="/devices/pc/video/video-cga-960.xml"/>
-	<keyboard ref="/devices/pc/keyboard/us83.xml"/>
+	<keyboard ref="/devices/pc/keyboard/keyboard-us83.xml"/>
 	<debugger id="debugger"/>
 	<panel ref="/devices/pc/panel/wide.xml"/>
 	<fdc ref="/disks/pc/samples.xml" width="280px"/>
 	<chipset id="chipset" model="5150" sw1="01001001" sw2="11110000" pos="left" padleft="8px" padbottom="8px">
-		<control type="switches" class="input" label="SW1" binding="sw1" left="0px"/>
-		<control type="switches" class="input" label="SW2" binding="sw2" left="0px"/>
-		<control type="description" class="output" binding="swdesc" left="0px"/>
+		<control type="switches" label="SW1" binding="sw1" left="0px"/>
+		<control type="switches" label="SW2" binding="sw2" left="0px"/>
+		<control type="description" binding="swdesc" left="0px"/>
 	</chipset>
 </machine>
diff --git a/devices/pc/machine/5150/mda/64kb/debugger/machine.xml b/devices/pc/machine/5150/mda/64kb/debugger/machine.xml
index 5a1fabc24..b79597620 100644
--- a/devices/pc/machine/5150/mda/64kb/debugger/machine.xml
+++ b/devices/pc/machine/5150/mda/64kb/debugger/machine.xml
@@ -8,13 +8,13 @@
 	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/bios/5150/1981-04-24.json"/>
 	<video ref="/devices/pc/video/video-mda.xml"/>
 	<cpu id="cpu8088" model="8088" autostart="true"/>
-	<keyboard ref="/devices/pc/keyboard/minimal-functions.xml"/>
+	<keyboard ref="/devices/pc/keyboard/keyboard-minimal-functions.xml"/>
 	<debugger id="debugger"/>
 	<panel ref="/devices/pc/panel/wide.xml"/>
 	<fdc ref="/disks/pc/samples.xml" width="280px"/>
 	<chipset id="chipset" model="5150" sw1="01000001" sw2="11110000" pos="left" padleft="8px" padbottom="8px">
-		<control type="switches" class="input" label="SW1" binding="sw1" left="0px"/>
-		<control type="switches" class="input" label="SW2" binding="sw2" left="0px"/>
-		<control type="description" class="output" binding="swdesc" left="0px"/>
+		<control type="switches" label="SW1" binding="sw1" left="0px"/>
+		<control type="switches" label="SW2" binding="sw2" left="0px"/>
+		<control type="description" binding="swdesc" left="0px"/>
 	</chipset>
 </machine>
diff --git a/devices/pc/machine/5150/mda/64kb/machine.xml b/devices/pc/machine/5150/mda/64kb/machine.xml
index 85212196a..71202c8e9 100644
--- a/devices/pc/machine/5150/mda/64kb/machine.xml
+++ b/devices/pc/machine/5150/mda/64kb/machine.xml
@@ -8,10 +8,10 @@
 	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/bios/5150/1981-04-24.json"/>
 	<video ref="/devices/pc/video/video-mda.xml"/>
 	<cpu id="cpu8088" model="8088" autostart="true" padleft="8px">
-		<control type="button" class="input" binding="run">Run</control>
-		<control type="button" class="input" binding="reset">Reset</control>
+		<control type="button" binding="run">Run</control>
+		<control type="button" binding="reset">Reset</control>
 	</cpu>
-	<keyboard ref="/devices/pc/keyboard/minimal.xml"/>
+	<keyboard ref="/devices/pc/keyboard/keyboard-minimal.xml"/>
 	<fdc ref="/disks/pc/samples.xml" pos="right"/>
 	<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 4b4713014..e361e26ef 100644
--- a/devices/pc/machine/5150/mda/64kb/softkbd/machine.xml
+++ b/devices/pc/machine/5150/mda/64kb/softkbd/machine.xml
@@ -8,13 +8,13 @@
 	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/basic/ibm-basic-1.00.json"/>
 	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/bios/5150/1981-04-24.json"/>
 	<video ref="/devices/pc/video/video-mda.xml"/>
-	<keyboard ref="/devices/pc/keyboard/us83.xml"/>
+	<keyboard ref="/devices/pc/keyboard/keyboard-us83.xml"/>
 	<debugger id="debugger"/>
 	<panel ref="/devices/pc/panel/wide.xml"/>
 	<fdc ref="/disks/pc/samples.xml" width="280px"/>
 	<chipset id="chipset" model="5150" sw1="01000001" sw2="11110000" pos="left" padleft="8px" padbottom="8px">
-		<control type="switches" class="input" label="SW1" binding="sw1" left="0px"/>
-		<control type="switches" class="input" label="SW2" binding="sw2" left="0px"/>
-		<control type="description" class="output" binding="swdesc" left="0px"/>
+		<control type="switches" label="SW1" binding="sw1" left="0px"/>
+		<control type="switches" label="SW2" binding="sw2" left="0px"/>
+		<control type="description" binding="swdesc" left="0px"/>
 	</chipset>
 </machine>
diff --git a/devices/pc/machine/5160/cga/256kb/array/machine.xml b/devices/pc/machine/5160/cga/256kb/array/machine.xml
index f5f3463cb..b60d44624 100644
--- a/devices/pc/machine/5160/cga/256kb/array/machine.xml
+++ b/devices/pc/machine/5160/cga/256kb/array/machine.xml
@@ -9,8 +9,8 @@
 	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/bios/5160/1982-11-08.json"/>
 	<video ref="/devices/pc/video/video-cga-960.xml"/>
 	<cpu id="cpu8088" model="8088" autostart="true" pos="left" padleft="8px">
-		<control type="button" class="input" binding="run">Run</control>
-		<control type="button" class="input" binding="reset">Reset</control>
+		<control type="button" binding="run">Run</control>
+		<control type="button" binding="reset">Reset</control>
 	</cpu>
 	<keyboard id="keyboard" model="us83"/>
 	<fdc ref="/disks/pc/samples.xml"/>
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 b0e6adbed..64b79fc69 100644
--- a/devices/pc/machine/5160/cga/256kb/demo/debugger/machine.xml
+++ b/devices/pc/machine/5160/cga/256kb/demo/debugger/machine.xml
@@ -9,13 +9,13 @@
 	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/bios/5160/1982-11-08.json"/>
 	<video ref="/devices/pc/video/video-cga-960.xml"/>
 	<cpu id="cpu8088" model="8088" autostart="true"/>
-	<keyboard ref="/devices/pc/keyboard/minimal-functions.xml"/>
+	<keyboard ref="/devices/pc/keyboard/keyboard-minimal-functions.xml"/>
 	<debugger id="debugger"/>
 	<panel ref="/devices/pc/panel/wide.xml"/>
 	<fdc ref="/disks/pc/samples.xml" width="280px"/>
 	<chipset id="chipset" model="5160" sw1="01001001" pos="left" padleft="8px" padbottom="8px">
-		<control type="switches" class="input" label="SW1" binding="sw1" left="0px"/>
-		<control type="description" class="output" binding="swdesc" left="0px"/>
+		<control type="switches" label="SW1" binding="sw1" left="0px"/>
+		<control type="description" binding="swdesc" left="0px"/>
 	</chipset>
 	<hdc id="hdcXT" drives='[{name:"10Mb Hard Disk",type:3}]'/>
 </machine>
diff --git a/devices/pc/machine/5160/cga/256kb/demo/machine.xml b/devices/pc/machine/5160/cga/256kb/demo/machine.xml
index 36f88b635..23a8d522f 100644
--- a/devices/pc/machine/5160/cga/256kb/demo/machine.xml
+++ b/devices/pc/machine/5160/cga/256kb/demo/machine.xml
@@ -9,10 +9,10 @@
 	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/bios/5160/1982-11-08.json"/>
 	<video ref="/devices/pc/video/video-cga-960.xml"/>
 	<cpu id="cpu8088" model="8088" autostart="true" pos="left" padleft="8px">
-		<control type="button" class="input" binding="run">Run</control>
-		<control type="button" class="input" binding="reset">Reset</control>
+		<control type="button" binding="run">Run</control>
+		<control type="button" binding="reset">Reset</control>
 	</cpu>
-	<keyboard ref="/devices/pc/keyboard/minimal-f1-f10.xml"/>
+	<keyboard ref="/devices/pc/keyboard/keyboard-minimal.xml"/>
 	<fdc ref="/disks/pc/samples.xml" pos="right"/>
 	<hdc id="hdcXT" drives='[{name:"10Mb Hard Disk",type:3}]'/>
 	<chipset id="chipset" model="5160" sw1="01001001"/>
diff --git a/devices/pc/machine/5160/cga/256kb/softkbd/machine.xml b/devices/pc/machine/5160/cga/256kb/softkbd/machine.xml
index 47e424c74..5631155df 100644
--- a/devices/pc/machine/5160/cga/256kb/softkbd/machine.xml
+++ b/devices/pc/machine/5160/cga/256kb/softkbd/machine.xml
@@ -9,13 +9,13 @@
 	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/basic/ibm-basic-1.10.json"/>
 	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/bios/5160/1982-11-08.json"/>
 	<video ref="/devices/pc/video/video-cga-960.xml"/>
-	<keyboard ref="/devices/pc/keyboard/us83.xml"/>
+	<keyboard ref="/devices/pc/keyboard/keyboard-us83.xml"/>
 	<debugger id="debugger"/>
 	<panel ref="/devices/pc/panel/default.xml"/>
 	<fdc ref="/disks/pc/samples.xml" width="280px"/>
 	<chipset id="chipset" model="5160" sw1="01001001" pos="left" padleft="8px" padbottom="8px">
-		<control type="switches" class="input" label="SW1" binding="sw1" left="0px"/>
-		<control type="description" class="output" binding="swdesc" left="0px"/>
+		<control type="switches" label="SW1" binding="sw1" left="0px"/>
+		<control type="description" binding="swdesc" left="0px"/>
 	</chipset>
 	<hdc id="hdcXT" drives='[{name:"10Mb Hard Disk",type:3}]'/>
 </machine>
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 23032bb96..174585ab8 100644
--- a/devices/pc/machine/5160/cga/256kb/win101/debugger/machine.xml
+++ b/devices/pc/machine/5160/cga/256kb/win101/debugger/machine.xml
@@ -9,13 +9,13 @@
 	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/bios/5160/1982-11-08.json"/>
 	<video ref="/devices/pc/video/video-cga-lock.xml"/>
 	<cpu id="cpu8088" model="8088" autostart="false"/>
-	<keyboard ref="/devices/pc/keyboard/minimal-functions.xml"/>
+	<keyboard ref="/devices/pc/keyboard/keyboard-minimal-functions.xml"/>
 	<debugger id="debugger"/>
 	<panel ref="/devices/pc/panel/wide.xml"/>
 	<fdc ref="/disks/pc/library.xml" width="320px"/>
 	<chipset id="chipset" model="5160" sw1="01001001" pos="left" padleft="8px" padbottom="8px">
-		<control type="switches" class="input" label="SW1" binding="sw1" left="0px"/>
-		<control type="description" class="output" binding="swdesc" left="0px"/>
+		<control type="switches" label="SW1" binding="sw1" left="0px"/>
+		<control type="description" binding="swdesc" left="0px"/>
 	</chipset>
 	<hdc ref="/disks/pc/fixed/win101.xml"/>
 	<serial id="com1" adapter="1" binding="print"/>
diff --git a/devices/pc/machine/5160/cga/256kb/win101/machine.xml b/devices/pc/machine/5160/cga/256kb/win101/machine.xml
index 66ef219bf..d4453dfb3 100644
--- a/devices/pc/machine/5160/cga/256kb/win101/machine.xml
+++ b/devices/pc/machine/5160/cga/256kb/win101/machine.xml
@@ -9,10 +9,10 @@
 	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/bios/5160/1982-11-08.json"/>
 	<video ref="/devices/pc/video/video-cga-lock.xml"/>
 	<cpu id="cpu8088" model="8088" autostart="true" pos="left" padleft="8px">
-		<control type="button" class="input" binding="run">Run</control>
-		<control type="button" class="input" binding="reset">Reset</control>
+		<control type="button" binding="run">Run</control>
+		<control type="button" binding="reset">Reset</control>
 	</cpu>
-	<keyboard ref="/devices/pc/keyboard/minimal-f1-f10.xml"/>
+	<keyboard ref="/devices/pc/keyboard/keyboard-minimal.xml"/>
 	<fdc ref="/disks/pc/samples.xml" pos="right"/>
 	<chipset id="chipset" model="5160" sw1="01001001"/>
 	<hdc ref="/disks/pc/fixed/win101.xml"/>
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 480c4c9b5..f49847728 100644
--- a/devices/pc/machine/5160/cga/256kb/win101/softkbd/machine.xml
+++ b/devices/pc/machine/5160/cga/256kb/win101/softkbd/machine.xml
@@ -9,13 +9,13 @@
 	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/basic/ibm-basic-1.10.json"/>
 	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/bios/5160/1982-11-08.json"/>
 	<video ref="/devices/pc/video/video-cga-lock.xml"/>
-	<keyboard ref="/devices/pc/keyboard/us83.xml"/>
+	<keyboard ref="/devices/pc/keyboard/keyboard-us83.xml"/>
 	<debugger id="debugger"/>
 	<panel ref="/devices/pc/panel/wide.xml"/>
 	<fdc ref="/disks/pc/library.xml" width="320px"/>
 	<chipset id="chipset" model="5160" sw1="01001001" pos="left" padleft="8px" padbottom="8px">
-		<control type="switches" class="input" label="SW1" binding="sw1" left="0px"/>
-		<control type="description" class="output" binding="swdesc" left="0px"/>
+		<control type="switches" label="SW1" binding="sw1" left="0px"/>
+		<control type="description" binding="swdesc" left="0px"/>
 	</chipset>
 	<hdc ref="/disks/pc/fixed/win101.xml"/>
 	<serial id="com1" adapter="1" binding="print"/>
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 45edd6bab..432b2ae43 100644
--- a/devices/pc/machine/5160/cga/512kb/win101/softkbd/machine.xml
+++ b/devices/pc/machine/5160/cga/512kb/win101/softkbd/machine.xml
@@ -9,13 +9,13 @@
 	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/basic/ibm-basic-1.10.json"/>
 	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/bios/5160/1982-11-08.json"/>
 	<video ref="/devices/pc/video/video-cga-lock.xml"/>
-	<keyboard ref="/devices/pc/keyboard/us83.xml"/>
+	<keyboard ref="/devices/pc/keyboard/keyboard-us83.xml"/>
 	<debugger id="debugger"/>
 	<panel ref="/devices/pc/panel/default.xml"/>
 	<fdc ref="/disks/pc/samples.xml" width="280px"/>
 	<chipset id="chipset" model="5160" sw1="01001001" pos="left" padleft="8px" padbottom="8px">
-		<control type="switches" class="input" label="SW1" binding="sw1" left="0px"/>
-		<control type="description" class="output" binding="swdesc" left="0px"/>
+		<control type="switches" label="SW1" binding="sw1" left="0px"/>
+		<control type="description" binding="swdesc" left="0px"/>
 	</chipset>
 	<hdc ref="/disks/pc/fixed/win101.xml"/>
 	<serial id="com1" adapter="1" binding="print"/>
diff --git a/devices/pc/machine/5160/cga/640kb/debugger/machine.xml b/devices/pc/machine/5160/cga/640kb/debugger/machine.xml
index 68f80d732..81975e402 100644
--- a/devices/pc/machine/5160/cga/640kb/debugger/machine.xml
+++ b/devices/pc/machine/5160/cga/640kb/debugger/machine.xml
@@ -9,13 +9,13 @@
 	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/bios/5160/1982-11-08.json"/>
 	<video ref="/devices/pc/video/video-cga-960-touch.xml"/>
 	<cpu id="cpu8088" model="8088" autostart="true"/>
-	<keyboard ref="/devices/pc/keyboard/minimal-f1-f10.xml"/>
+	<keyboard ref="/devices/pc/keyboard/keyboard-minimal.xml"/>
 	<debugger id="debugger"/>
 	<panel ref="/devices/pc/panel/wide.xml"/>
 	<fdc ref="/disks/pc/library.xml" width="320px"/>
 	<chipset id="chipset" model="5160" sw1="01001001" pos="left" padleft="8px" padbottom="8px">
-		<control type="switches" class="input" label="SW1" binding="sw1" left="0px"/>
-		<control type="description" class="output" binding="swdesc" left="0px"/>
+		<control type="switches" label="SW1" binding="sw1" left="0px"/>
+		<control type="description" binding="swdesc" left="0px"/>
 	</chipset>
 	<hdc id="hdcXT" drives='[{name:"10Mb Hard Disk",type:3}]'/>
 </machine>
diff --git a/devices/pc/machine/5160/cga/640kb/dos400m/machine.xml b/devices/pc/machine/5160/cga/640kb/dos400m/machine.xml
index d32647141..3dd38b433 100644
--- a/devices/pc/machine/5160/cga/640kb/dos400m/machine.xml
+++ b/devices/pc/machine/5160/cga/640kb/dos400m/machine.xml
@@ -9,13 +9,13 @@
 	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/basic/ibm-basic-1.10.json"/>
 	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/bios/5160/1982-11-08.json"/>
 	<video ref="/devices/pc/video/video-cga-lock.xml"/>
-	<keyboard ref="/devices/pc/keyboard/us83.xml"/>
+	<keyboard ref="/devices/pc/keyboard/keyboard-us83.xml"/>
 	<debugger id="debugger"/>
 	<panel ref="/devices/pc/panel/wide.xml"/>
 	<fdc ref="/disks/pc/library.xml" width="320px" 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"}}'/>
 	<chipset id="chipset" model="5160" sw1="01001001" pos="left" padleft="8px" padbottom="8px">
-		<control type="switches" class="input" label="SW1" binding="sw1" left="0px"/>
-		<control type="description" class="output" binding="swdesc" left="0px"/>
+		<control type="switches" label="SW1" binding="sw1" left="0px"/>
+		<control type="description" binding="swdesc" left="0px"/>
 	</chipset>
 	<hdc id="hdcXT" drives='[{name:"10Mb Hard Disk",type:3}]'/>
 	<serial id="com1" adapter="1" binding="print"/>
diff --git a/devices/pc/machine/5160/cga/640kb/machine.xml b/devices/pc/machine/5160/cga/640kb/machine.xml
index f93443b8d..58ac6afc1 100644
--- a/devices/pc/machine/5160/cga/640kb/machine.xml
+++ b/devices/pc/machine/5160/cga/640kb/machine.xml
@@ -9,10 +9,10 @@
 	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/bios/5160/1982-11-08.json"/>
 	<video ref="/devices/pc/video/video-cga-960-touch.xml"/>
 	<cpu id="cpu8088" model="8088" autostart="true" pos="left" padleft="8px">
-		<control type="button" class="input" binding="run">Run</control>
-		<control type="button" class="input" binding="reset">Reset</control>
+		<control type="button" binding="run">Run</control>
+		<control type="button" binding="reset">Reset</control>
 	</cpu>
-	<keyboard ref="/devices/pc/keyboard/minimal-f1-f10.xml"/>
+	<keyboard ref="/devices/pc/keyboard/keyboard-minimal.xml"/>
 	<fdc ref="/disks/pc/library.xml" pos="right"/>
 	<hdc id="hdcXT" drives='[{name:"10Mb Hard Disk",type:3}]'/>
 	<chipset id="chipset" model="5160" sw1="01001001"/>
diff --git a/devices/pc/machine/5160/ega/256kb/debugger/machine.xml b/devices/pc/machine/5160/ega/256kb/debugger/machine.xml
index 7e7db8353..05a1eb80f 100644
--- a/devices/pc/machine/5160/ega/256kb/debugger/machine.xml
+++ b/devices/pc/machine/5160/ega/256kb/debugger/machine.xml
@@ -10,13 +10,13 @@
 	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/basic/ibm-basic-1.10.json"/>
 	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/bios/5160/1982-11-08.json"/>
 	<video ref="/devices/pc/video/video-ega-64kb.xml"/>
-	<keyboard ref="/devices/pc/keyboard/minimal-functions.xml"/>
+	<keyboard ref="/devices/pc/keyboard/keyboard-minimal-functions.xml"/>
 	<debugger id="debugger"/>
 	<panel ref="/devices/pc/panel/wide.xml"/>
 	<fdc ref="/disks/pc/library.xml" width="320px"/>
 	<chipset id="chipset" model="5160" sw1="01001101" pos="left" padleft="8px" padbottom="8px">
-		<control type="switches" class="input" label="SW1" binding="sw1" left="0px"/>
-		<control type="description" class="output" binding="swdesc" left="0px"/>
+		<control type="switches" label="SW1" binding="sw1" left="0px"/>
+		<control type="description" binding="swdesc" left="0px"/>
 	</chipset>
 	<hdc id="hdcXT" drives='[{name:"10Mb Hard Disk",type:3}]'/>
 </machine>
diff --git a/devices/pc/machine/5160/ega/640kb/array/machine.xml b/devices/pc/machine/5160/ega/640kb/array/machine.xml
index 1cb1836c2..be768e69a 100644
--- a/devices/pc/machine/5160/ega/640kb/array/machine.xml
+++ b/devices/pc/machine/5160/ega/640kb/array/machine.xml
@@ -9,9 +9,9 @@
 	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/basic/ibm-basic-1.10.json"/>
 	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/bios/5160/1982-11-08.json"/>
 	<video ref="/devices/pc/video/video-ega-640-128kb-lock.xml"/>
-	<keyboard ref="/devices/pc/keyboard/minimal.xml"/>
+	<keyboard ref="/devices/pc/keyboard/keyboard-minimal.xml"/>
 	<cpu id="cpu8088" model="8088">
-		<control type="button" class="input" binding="setSpeed">Fast</control>
+		<control type="button" binding="setSpeed">Fast</control>
 	</cpu>
 	<fdc ref="/disks/pc/library.xml"/>
 	<chipset id="chipset" model="5160" sw1="01001101"/>
diff --git a/devices/pc/machine/5160/ega/640kb/debugger/machine.xml b/devices/pc/machine/5160/ega/640kb/debugger/machine.xml
index ea50bb7c1..16b347ca4 100644
--- a/devices/pc/machine/5160/ega/640kb/debugger/machine.xml
+++ b/devices/pc/machine/5160/ega/640kb/debugger/machine.xml
@@ -10,13 +10,13 @@
 	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/basic/ibm-basic-1.10.json"/>
 	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/bios/5160/1982-11-08.json"/>
 	<video ref="/devices/pc/video/video-ega-128kb-lock.xml"/>
-	<keyboard ref="/devices/pc/keyboard/minimal-functions.xml"/>
+	<keyboard ref="/devices/pc/keyboard/keyboard-minimal-functions.xml"/>
 	<debugger id="debugger"/>
 	<panel ref="/devices/pc/panel/wide.xml"/>
 	<fdc ref="/disks/pc/library.xml" width="320px"/>
 	<chipset id="chipset" model="5160" sw1="01001101" pos="left" padleft="8px" padbottom="8px">
-		<control type="switches" class="input" label="SW1" binding="sw1" left="0px"/>
-		<control type="description" class="output" binding="swdesc" left="0px"/>
+		<control type="switches" label="SW1" binding="sw1" left="0px"/>
+		<control type="description" binding="swdesc" left="0px"/>
 	</chipset>
 	<hdc ref="/disks/pc/fixed/win101-ega.xml"/>
 	<serial id="com1" adapter="1" binding="print"/>
diff --git a/devices/pc/machine/5160/ega/640kb/machine.xml b/devices/pc/machine/5160/ega/640kb/machine.xml
index 6f1687ed8..f93346d3a 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="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/basic/ibm-basic-1.10.json"/>
 	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/bios/5160/1982-11-08.json"/>
 	<video ref="/devices/pc/video/video-ega-128kb-lock.xml"/>
-	<keyboard ref="/devices/pc/keyboard/minimal-functions.xml"/>
+	<keyboard ref="/devices/pc/keyboard/keyboard-minimal-functions.xml"/>
 	<fdc ref="/disks/pc/library.xml"/>
 	<chipset id="chipset" model="5160" sw1="01001101"/>
 	<hdc ref="/disks/pc/fixed/win101-ega.xml"/>
diff --git a/devices/pc/machine/5160/ega/640kb/win101/machine.xml b/devices/pc/machine/5160/ega/640kb/win101/machine.xml
index bf140f08f..e789428f0 100644
--- a/devices/pc/machine/5160/ega/640kb/win101/machine.xml
+++ b/devices/pc/machine/5160/ega/640kb/win101/machine.xml
@@ -9,9 +9,9 @@
 	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/basic/ibm-basic-1.10.json"/>
 	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/bios/5160/1982-11-08.json"/>
 	<video ref="/devices/pc/video/video-ega-128kb-lock.xml"/>
-	<keyboard ref="/devices/pc/keyboard/minimal.xml"/>
+	<keyboard ref="/devices/pc/keyboard/keyboard-minimal.xml"/>
 	<cpu id="cpu8088" model="8088">
-		<control type="button" class="input" binding="setSpeed">Fast</control>
+		<control type="button" binding="setSpeed">Fast</control>
 	</cpu>
 	<fdc ref="/disks/pc/library.xml" pos="right"/>
 	<chipset id="chipset" model="5160" sw1="01001101"/>
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 6d1485b53..3ce604ba2 100644
--- a/devices/pc/machine/5160/mda/256kb/fake188/debugger/machine.xml
+++ b/devices/pc/machine/5160/mda/256kb/fake188/debugger/machine.xml
@@ -9,12 +9,12 @@
 	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/basic/ibm-basic-1.10.json"/>
 	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/bios/5160/1982-11-08.json"/>
 	<video ref="/devices/pc/video/video-mda.xml"/>
-	<keyboard ref="/devices/pc/keyboard/minimal.xml"/>
+	<keyboard ref="/devices/pc/keyboard/keyboard-minimal.xml"/>
 	<debugger id="debugger"/>
 	<panel ref="/devices/pc/panel/default.xml"/>
 	<fdc id="fdcNEC" width="280px" pos="left" padleft="8px" padbottom="8px" automount='{A:{name:"PC-DOS 2.00 (Disk 1)",path:"/disks/pc/dos/ibm/2.00/PCDOS200-DISK1.json"}, B:{name:"Executive Suite (1982)",path:"/apps/pc/1982/esuite/disk.json"}}'>
-		<control type="list" class="input" binding="listDrives"/>
-		<control type="list" class="input" binding="listDisks">
+		<control type="list" binding="listDrives"/>
+		<control type="list" binding="listDisks">
 			<disk path="">None</disk>
 			<manifest ref="/disks/pc/dos/ibm/1.00/manifest.xml" disk="*"/>
 			<manifest ref="/disks/pc/dos/ibm/1.10/manifest.xml" disk="*"/>
@@ -23,9 +23,9 @@
 			<manifest ref="/apps/pc/1981/visicalc/manifest.xml" disk="*"/>
 			<manifest ref="/apps/pc/1982/esuite/manifest.xml" disk="*"/>
 		</control>
-		<control type="button" class="input" binding="loadDrive">Download</control>
-		<control type="description" class="output" binding="descDisk" padleft="8px"/>
-		<control type="file" class="input" binding="mountDrive" padtop="8px"/>
+		<control type="button" binding="loadDrive">Download</control>
+		<control type="description" binding="descDisk" padleft="8px"/>
+		<control type="file" binding="mountDrive" padtop="8px"/>
 	</fdc>
 	<chipset id="chipset" model="5160" sw1="01000001"/>
 	<hdc id="hdcXT" drives='[{name:"10Mb Hard Disk",type:3}]'/>
diff --git a/devices/pc/machine/5160/mda/256kb/fake188/machine.xml b/devices/pc/machine/5160/mda/256kb/fake188/machine.xml
index b2a0dab10..477efa53a 100644
--- a/devices/pc/machine/5160/mda/256kb/fake188/machine.xml
+++ b/devices/pc/machine/5160/mda/256kb/fake188/machine.xml
@@ -9,12 +9,12 @@
 	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/bios/5160/1982-11-08.json"/>
 	<video ref="/devices/pc/video/video-mda.xml"/>
 	<cpu id="cpu80188" model="80188" autostart="true" padleft="8px">
-		<control type="button" class="input" binding="run">Run</control>
+		<control type="button" binding="run">Run</control>
 	</cpu>
-	<keyboard ref="/devices/pc/keyboard/minimal.xml"/>
+	<keyboard ref="/devices/pc/keyboard/keyboard-minimal.xml"/>
 	<fdc id="fdcNEC" pos="right" padleft="8px" padbottom="8px" automount='{A:{name:"PC-DOS 2.00 (Disk 1)",path:"/disks/pc/dos/ibm/2.00/PCDOS200-DISK1.json"}, B:{name:"Executive Suite (1982)",path:"/apps/pc/1982/esuite/disk.json"}}'>
-		<control type="list" class="input" binding="listDrives"/>
-		<control type="list" class="input" binding="listDisks">
+		<control type="list" binding="listDrives"/>
+		<control type="list" binding="listDisks">
 			<disk path="">None</disk>
 			<manifest ref="/disks/pc/dos/ibm/1.00/manifest.xml" disk="*"/>
 			<manifest ref="/disks/pc/dos/ibm/1.10/manifest.xml" disk="*"/>
@@ -23,9 +23,9 @@
 			<manifest ref="/apps/pc/1981/visicalc/manifest.xml" disk="*"/>
 			<manifest ref="/apps/pc/1982/esuite/manifest.xml" disk="*"/>
 		</control>
-		<control type="button" class="input" binding="loadDrive" padright="8px">Download</control>
-		<control type="description" class="output" binding="descDisk" padright="8px"/>
-		<control type="file" class="input" binding="mountDrive"/>
+		<control type="button" binding="loadDrive" padright="8px">Download</control>
+		<control type="description" binding="descDisk" padright="8px"/>
+		<control type="file" binding="mountDrive"/>
 	</fdc>
 	<chipset id="chipset" model="5160" sw1="01000001"/>
 	<hdc id="hdcXT" drives='[{name:"10Mb Hard Disk",type:3}]'/>
diff --git a/devices/pc/machine/5160/mda/256kb/machine.xml b/devices/pc/machine/5160/mda/256kb/machine.xml
index 7ec4f1fa5..50bb0eee0 100644
--- a/devices/pc/machine/5160/mda/256kb/machine.xml
+++ b/devices/pc/machine/5160/mda/256kb/machine.xml
@@ -9,7 +9,7 @@
 	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/basic/ibm-basic-1.10.json"/>
 	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/bios/5160/1982-11-08.json"/>
 	<video ref="/devices/pc/video/video-mda.xml"/>
-	<keyboard ref="/devices/pc/keyboard/minimal.xml"/>
+	<keyboard ref="/devices/pc/keyboard/keyboard-minimal.xml"/>
 	<fdc ref="/disks/pc/samples.xml"/>
 	<chipset id="chipset" model="5160" sw1="01000001"/>
 	<hdc id="hdcXT" drives='[{name:"10Mb Hard Disk",type:3}]'/>
diff --git a/devices/pc/machine/5160/mda/64kb/softkbd/machine.xml b/devices/pc/machine/5160/mda/64kb/softkbd/machine.xml
index d8a347eb3..0b9b90955 100644
--- a/devices/pc/machine/5160/mda/64kb/softkbd/machine.xml
+++ b/devices/pc/machine/5160/mda/64kb/softkbd/machine.xml
@@ -9,13 +9,13 @@
 	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/basic/ibm-basic-1.10.json"/>
 	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/bios/5160/1982-11-08.json"/>
 	<video ref="/devices/pc/video/video-mda.xml"/>
-	<keyboard ref="/devices/pc/keyboard/us83.xml"/>
+	<keyboard ref="/devices/pc/keyboard/keyboard-us83.xml"/>
 	<debugger id="debugger"/>
 	<panel ref="/devices/pc/panel/default.xml"/>
 	<fdc ref="/disks/pc/samples.xml" width="280px"/>
 	<chipset id="chipset" model="5160" sw1="01110001" pos="left" padleft="8px" padbottom="8px">
-		<control type="switches" class="input" label="SW1" binding="sw1" left="0px"/>
-		<control type="description" class="output" binding="swdesc" left="0px"/>
+		<control type="switches" label="SW1" binding="sw1" left="0px"/>
+		<control type="description" binding="swdesc" left="0px"/>
 	</chipset>
 	<hdc id="hdcXT" drives='[{name:"10Mb Hard Disk",type:3}]'/>
 </machine>
diff --git a/devices/pc/machine/5170/ega/1152kb/rev1/machine.xml b/devices/pc/machine/5170/ega/1152kb/rev1/machine.xml
index 889d5d6f5..4caabf547 100644
--- a/devices/pc/machine/5170/ega/1152kb/rev1/machine.xml
+++ b/devices/pc/machine/5170/ega/1152kb/rev1/machine.xml
@@ -9,7 +9,7 @@
 	<rom id="romEGA" addr="0xc0000" size="0x4000" file="/devices/pc/video/ibm-ega.json" notify="videoEGA"/>
 	<rom id="romBIOS" addr="0xf0000" size="0x10000" alias="0xff0000" file="/devices/pc/bios/5170/1984-01-10.json"/>
 	<video ref="/devices/pc/video/video-ega-128kb-lock.xml"/>
-	<keyboard ref="/devices/pc/keyboard/minimal-functions.xml"/>
+	<keyboard ref="/devices/pc/keyboard/keyboard-minimal-functions.xml"/>
 	<debugger id="debugger" messages="" commands=""/>
 	<panel ref="/devices/pc/panel/wide.xml"/>
 	<fdc ref="/disks/pc/library.xml" width="320px" 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"}}'/>
diff --git a/devices/pc/machine/5170/ega/1152kb/rev3/machine.xml b/devices/pc/machine/5170/ega/1152kb/rev3/machine.xml
index c040cbec5..e10677f2a 100644
--- a/devices/pc/machine/5170/ega/1152kb/rev3/machine.xml
+++ b/devices/pc/machine/5170/ega/1152kb/rev3/machine.xml
@@ -9,7 +9,7 @@
 	<rom id="romEGA" addr="0xc0000" size="0x4000" file="/devices/pc/video/ibm-ega.json" notify="videoEGA"/>
 	<rom id="romBIOS" addr="0xf0000" size="0x10000" alias="0xff0000" file="/devices/pc/bios/5170/1985-11-15.json"/>
 	<video ref="/devices/pc/video/video-ega-128kb-lock.xml"/>
-	<keyboard ref="/devices/pc/keyboard/minimal-functions.xml"/>
+	<keyboard ref="/devices/pc/keyboard/keyboard-minimal-functions.xml"/>
 	<debugger id="debugger" messages="" commands=""/>
 	<panel ref="/devices/pc/panel/wide.xml"/>
 	<fdc ref="/disks/pc/library.xml" width="320px" 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"}}'/>
diff --git a/devices/pc/machine/5170/ega/640kb/rev1/machine.xml b/devices/pc/machine/5170/ega/640kb/rev1/machine.xml
index 946796d83..9e475afec 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="romEGA" addr="0xc0000" size="0x4000" file="/devices/pc/video/ibm-ega.json" notify="videoEGA"/>
 	<rom id="romBIOS" addr="0xf0000" size="0x10000" alias="0xff0000" file="/devices/pc/bios/5170/1984-01-10.json"/>
 	<video ref="/devices/pc/video/video-ega-128kb-lock.xml"/>
-	<keyboard ref="/devices/pc/keyboard/minimal-functions.xml"/>
+	<keyboard ref="/devices/pc/keyboard/keyboard-minimal-functions.xml"/>
 	<debugger id="debugger" messages="" commands=""/>
 	<panel ref="/devices/pc/panel/wide.xml"/>
 	<fdc ref="/disks/pc/library.xml" width="320px" 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"}}'/>
diff --git a/devices/pc/panel/default.xml b/devices/pc/panel/default.xml
index e463ba3b2..e6b3df35b 100644
--- a/devices/pc/panel/default.xml
+++ b/devices/pc/panel/default.xml
@@ -2,47 +2,47 @@
 <panel id="panel" pos="center" width="720px" padding="8px">
 	<name>Control Panel</name>
 	<control type="container" class="pcjs-textarea" width="58%" padbottom="8px" padright="8px">
-		<control type="textarea" class="output" binding="print" width="100%" height="260px" pos="relative" padbottom="4px" style="resize:vertical;"/>
+		<control type="textarea" binding="print" width="100%" height="260px" pos="relative" padbottom="4px" style="resize:vertical;"/>
 		<control type="container">
-			<control type="text" class="input" binding="debugInput" width="auto"/>
-			<control type="button" class="input" binding="debugEnter">Enter</control>
-			<control type="button" class="input" binding="clear">Clear</control>
+			<control type="text" binding="debugInput" width="auto"/>
+			<control type="button" binding="debugEnter">Enter</control>
+			<control type="button" binding="clear">Clear</control>
 		</control>
 	</control>
 	<control type="container" class="pcjs-registers" width="38%" padleft="8px">
-		<control type="register" class="output" label="AX" binding="AX" width="40px" padright="8px" padbottom="8px">0000</control>
-		<control type="register" class="output" label="BX" binding="BX" width="40px" padright="8px" padbottom="8px">0000</control>
-		<control type="register" class="output" label="CX" binding="CX" width="40px" padright="8px" padbottom="8px">0000</control>
-		<control type="register" class="output" label="DX" binding="DX" width="40px" padright="8px" padbottom="8px">0000</control>
-		<control type="register" class="output" label="SP" binding="SP" width="40px" padright="8px" padbottom="8px">0000</control>
-		<control type="register" class="output" label="BP" binding="BP" width="40px" padright="8px" padbottom="8px">0000</control>
-		<control type="register" class="output" label="SI" binding="SI" width="40px" padright="8px" padbottom="8px">0000</control>
-		<control type="register" class="output" label="DI" binding="DI" width="40px" padright="8px" padbottom="8px">0000</control>
-		<control type="register" class="output" label="DS" binding="DS" width="40px" padright="8px" padbottom="8px">0000</control>
-		<control type="register" class="output" label="ES" binding="ES" width="40px" padright="8px" padbottom="8px">0000</control>
-		<control type="register" class="output" label="SS" binding="SS" width="40px" padright="8px" padbottom="8px">0000</control>
-		<control type="register" class="output" label="CS" binding="CS" width="40px" padright="8px" padbottom="8px">0000</control>
-		<control type="register" class="output" label="IP" binding="IP" width="40px" padright="8px" padbottom="8px">0000</control>
+		<control type="register" label="AX" binding="AX" width="40px" padright="8px" padbottom="8px">0000</control>
+		<control type="register" label="BX" binding="BX" width="40px" padright="8px" padbottom="8px">0000</control>
+		<control type="register" label="CX" binding="CX" width="40px" padright="8px" padbottom="8px">0000</control>
+		<control type="register" label="DX" binding="DX" width="40px" padright="8px" padbottom="8px">0000</control>
+		<control type="register" label="SP" binding="SP" width="40px" padright="8px" padbottom="8px">0000</control>
+		<control type="register" label="BP" binding="BP" width="40px" padright="8px" padbottom="8px">0000</control>
+		<control type="register" label="SI" binding="SI" width="40px" padright="8px" padbottom="8px">0000</control>
+		<control type="register" label="DI" binding="DI" width="40px" padright="8px" padbottom="8px">0000</control>
+		<control type="register" label="DS" binding="DS" width="40px" padright="8px" padbottom="8px">0000</control>
+		<control type="register" label="ES" binding="ES" width="40px" padright="8px" padbottom="8px">0000</control>
+		<control type="register" label="SS" binding="SS" width="40px" padright="8px" padbottom="8px">0000</control>
+		<control type="register" label="CS" binding="CS" width="40px" padright="8px" padbottom="8px">0000</control>
+		<control type="register" label="IP" binding="IP" width="40px" padright="8px" padbottom="8px">0000</control>
 		<control type="container" width="200px" pos="left">
-			<control type="flag" class="output" label="V" binding="V" width="8px" padright="4px" padbottom="8px">0</control>
-			<control type="flag" class="output" label="D" binding="D" width="8px" padright="4px" padbottom="8px">0</control>
-			<control type="flag" class="output" label="I" binding="I" width="8px" padright="4px" padbottom="8px">0</control>
-			<control type="flag" class="output" label="T" binding="T" width="8px" padright="4px" padbottom="8px">0</control>
-			<control type="flag" class="output" label="S" binding="S" width="8px" padright="4px" padbottom="8px">0</control>
-			<control type="flag" class="output" label="Z" binding="Z" width="8px" padright="4px" padbottom="8px">0</control>
-			<control type="flag" class="output" label="A" binding="A" width="8px" padright="4px" padbottom="8px">0</control>
-			<control type="flag" class="output" label="P" binding="P" width="8px" padright="4px" padbottom="8px">0</control>
-			<control type="flag" class="output" label="C" binding="C" width="8px" padright="4px" padbottom="8px">0</control>
+			<control type="flag" label="V" binding="V" width="8px" padright="4px" padbottom="8px">0</control>
+			<control type="flag" label="D" binding="D" width="8px" padright="4px" padbottom="8px">0</control>
+			<control type="flag" label="I" binding="I" width="8px" padright="4px" padbottom="8px">0</control>
+			<control type="flag" label="T" binding="T" width="8px" padright="4px" padbottom="8px">0</control>
+			<control type="flag" label="S" binding="S" width="8px" padright="4px" padbottom="8px">0</control>
+			<control type="flag" label="Z" binding="Z" width="8px" padright="4px" padbottom="8px">0</control>
+			<control type="flag" label="A" binding="A" width="8px" padright="4px" padbottom="8px">0</control>
+			<control type="flag" label="P" binding="P" width="8px" padright="4px" padbottom="8px">0</control>
+			<control type="flag" label="C" binding="C" width="8px" padright="4px" padbottom="8px">0</control>
 		</control>
 		<control pos=""/>
-		<control type="description" class="output" padbottom="8px">Speed:</control>
-		<control type="description" class="output" binding="speed" padleft="4px" padbottom="8px">Stopped</control>
+		<control type="description" padbottom="8px">Speed:</control>
+		<control type="description" binding="speed" padleft="4px" padbottom="8px">Stopped</control>
 	</control>
 	<control type="container" padleft="8px" padbottom="8px">
-		<control type="button" class="input" binding="run">Run</control>
-		<control type="button" class="input" binding="step">Step</control>
-		<control type="button" class="input" binding="reset">Reset</control>
-		<control type="button" class="input" binding="setSpeed">Fast</control>
-		<control type="button" class="input" binding="save">Save</control>
+		<control type="button" binding="run">Run</control>
+		<control type="button" binding="step">Step</control>
+		<control type="button" binding="reset">Reset</control>
+		<control type="button" binding="setSpeed">Fast</control>
+		<control type="button" binding="save">Save</control>
 	</control>
 </panel>
diff --git a/devices/pc/panel/wide.xml b/devices/pc/panel/wide.xml
index 179a3aa06..8e3d41f4b 100644
--- a/devices/pc/panel/wide.xml
+++ b/devices/pc/panel/wide.xml
@@ -2,47 +2,47 @@
 <panel id="panel" width="100%" padding="8px">
 	<name>Control Panel</name>
 	<control type="container" class="pcjs-textarea" width="60%" padbottom="8px" padright="8px">
-		<control type="textarea" class="output" binding="print" width="100%" height="260px" pos="relative" padbottom="4px" style="resize:vertical;"/>
+		<control type="textarea" binding="print" width="100%" height="260px" pos="relative" padbottom="4px" style="resize:vertical;"/>
 		<control type="container" width="100%">
-			<control type="text" class="input" binding="debugInput" width="auto"/>
-			<control type="button" class="input" binding="debugEnter">Enter</control>
-			<control type="button" class="input" binding="clear">Clear</control>
+			<control type="text" binding="debugInput" width="auto"/>
+			<control type="button" binding="debugEnter">Enter</control>
+			<control type="button" binding="clear">Clear</control>
 		</control>
 	</control>
 	<control type="container" class="pcjs-registers" width="35%" padleft="8px">
-		<control type="register" class="output" label="AX" binding="AX" pos="left" width="40px" padright="8px" padbottom="8px">0000</control>
-		<control type="register" class="output" label="BX" binding="BX" pos="left" width="40px" padright="8px" padbottom="8px">0000</control>
-		<control type="register" class="output" label="CX" binding="CX" pos="left" width="40px" padright="8px" padbottom="8px">0000</control>
-		<control type="register" class="output" label="DX" binding="DX" pos="left" width="40px" padright="8px" padbottom="8px">0000</control>
-		<control type="register" class="output" label="SP" binding="SP" pos="left" width="40px" padright="8px" padbottom="8px">0000</control>
-		<control type="register" class="output" label="BP" binding="BP" pos="left" width="40px" padright="8px" padbottom="8px">0000</control>
-		<control type="register" class="output" label="SI" binding="SI" pos="left" width="40px" padright="8px" padbottom="8px">0000</control>
-		<control type="register" class="output" label="DI" binding="DI" pos="left" width="40px" padright="8px" padbottom="8px">0000</control>
-		<control type="register" class="output" label="DS" binding="DS" pos="left" width="40px" padright="8px" padbottom="8px">0000</control>
-		<control type="register" class="output" label="ES" binding="ES" pos="left" width="40px" padright="8px" padbottom="8px">0000</control>
-		<control type="register" class="output" label="SS" binding="SS" pos="left" width="40px" padright="8px" padbottom="8px">0000</control>
-		<control type="register" class="output" label="CS" binding="CS" pos="left" width="40px" padright="8px" padbottom="8px">0000</control>
-		<control type="register" class="output" label="IP" binding="IP" pos="left" width="40px" padright="8px" padbottom="8px">0000</control>
+		<control type="register" label="AX" binding="AX" pos="left" width="40px" padright="8px" padbottom="8px">0000</control>
+		<control type="register" label="BX" binding="BX" pos="left" width="40px" padright="8px" padbottom="8px">0000</control>
+		<control type="register" label="CX" binding="CX" pos="left" width="40px" padright="8px" padbottom="8px">0000</control>
+		<control type="register" label="DX" binding="DX" pos="left" width="40px" padright="8px" padbottom="8px">0000</control>
+		<control type="register" label="SP" binding="SP" pos="left" width="40px" padright="8px" padbottom="8px">0000</control>
+		<control type="register" label="BP" binding="BP" pos="left" width="40px" padright="8px" padbottom="8px">0000</control>
+		<control type="register" label="SI" binding="SI" pos="left" width="40px" padright="8px" padbottom="8px">0000</control>
+		<control type="register" label="DI" binding="DI" pos="left" width="40px" padright="8px" padbottom="8px">0000</control>
+		<control type="register" label="DS" binding="DS" pos="left" width="40px" padright="8px" padbottom="8px">0000</control>
+		<control type="register" label="ES" binding="ES" pos="left" width="40px" padright="8px" padbottom="8px">0000</control>
+		<control type="register" label="SS" binding="SS" pos="left" width="40px" padright="8px" padbottom="8px">0000</control>
+		<control type="register" label="CS" binding="CS" pos="left" width="40px" padright="8px" padbottom="8px">0000</control>
+		<control type="register" label="IP" binding="IP" pos="left" width="40px" padright="8px" padbottom="8px">0000</control>
 		<control type="container" width="200px" pos="left">
-			<control type="flag" class="output" label="V" binding="V" width="8px" padright="4px" padbottom="8px">0</control>
-			<control type="flag" class="output" label="D" binding="D" width="8px" padright="4px" padbottom="8px">0</control>
-			<control type="flag" class="output" label="I" binding="I" width="8px" padright="4px" padbottom="8px">0</control>
-			<control type="flag" class="output" label="T" binding="T" width="8px" padright="4px" padbottom="8px">0</control>
-			<control type="flag" class="output" label="S" binding="S" width="8px" padright="4px" padbottom="8px">0</control>
-			<control type="flag" class="output" label="Z" binding="Z" width="8px" padright="4px" padbottom="8px">0</control>
-			<control type="flag" class="output" label="A" binding="A" width="8px" padright="4px" padbottom="8px">0</control>
-			<control type="flag" class="output" label="P" binding="P" width="8px" padright="4px" padbottom="8px">0</control>
-			<control type="flag" class="output" label="C" binding="C" width="8px" padright="4px" padbottom="8px">0</control>
+			<control type="flag" label="V" binding="V" width="8px" padright="4px" padbottom="8px">0</control>
+			<control type="flag" label="D" binding="D" width="8px" padright="4px" padbottom="8px">0</control>
+			<control type="flag" label="I" binding="I" width="8px" padright="4px" padbottom="8px">0</control>
+			<control type="flag" label="T" binding="T" width="8px" padright="4px" padbottom="8px">0</control>
+			<control type="flag" label="S" binding="S" width="8px" padright="4px" padbottom="8px">0</control>
+			<control type="flag" label="Z" binding="Z" width="8px" padright="4px" padbottom="8px">0</control>
+			<control type="flag" label="A" binding="A" width="8px" padright="4px" padbottom="8px">0</control>
+			<control type="flag" label="P" binding="P" width="8px" padright="4px" padbottom="8px">0</control>
+			<control type="flag" label="C" binding="C" width="8px" padright="4px" padbottom="8px">0</control>
 		</control>
 		<control pos=""/>
-		<control type="description" class="output" padbottom="8px">Speed:</control>
-		<control type="description" class="output" binding="speed" padleft="4px" padbottom="8px">Stopped</control>
+		<control type="description" padbottom="8px">Speed:</control>
+		<control type="description" binding="speed" padleft="4px" padbottom="8px">Stopped</control>
 	</control>
 	<control type="container" padleft="8px" padbottom="8px">
-		<control type="button" class="input" binding="run">Run</control>
-		<control type="button" class="input" binding="step">Step</control>
-		<control type="button" class="input" binding="reset">Reset</control>
-		<control type="button" class="input" binding="setSpeed">Fast</control>
-		<control type="button" class="input" binding="save">Save</control>
+		<control type="button" binding="run">Run</control>
+		<control type="button" binding="step">Step</control>
+		<control type="button" binding="reset">Reset</control>
+		<control type="button" binding="setSpeed">Fast</control>
+		<control type="button" binding="save">Save</control>
 	</control>
 </panel>
diff --git a/devices/pc/video/video-cga-960-touch.xml b/devices/pc/video/video-cga-960-touch.xml
index 15f293781..56bc96f49 100644
--- a/devices/pc/video/video-cga-960-touch.xml
+++ b/devices/pc/video/video-cga-960-touch.xml
@@ -3,9 +3,9 @@
 	<menu>
 		<title>Color Display</title>
 		<control type="container" pos="right">
-			<control type="led" class="output" label="Caps" binding="caps-lock" padleft="8px"/>
-			<control type="led" class="output" label="Num" binding="num-lock" padleft="8px"/>
-			<control type="led" class="output" label="Scroll" binding="scroll-lock" padleft="8px"/>
+			<control type="led" label="Caps" binding="caps-lock" padleft="8px"/>
+			<control type="led" label="Num" binding="num-lock" padleft="8px"/>
+			<control type="led" label="Scroll" binding="scroll-lock" padleft="8px"/>
 		</control>
 	</menu>
 </video>
diff --git a/devices/pc/video/video-cga-960.xml b/devices/pc/video/video-cga-960.xml
index 99dda9874..759e7cd20 100644
--- a/devices/pc/video/video-cga-960.xml
+++ b/devices/pc/video/video-cga-960.xml
@@ -3,9 +3,9 @@
 	<menu>
 		<title>Color Display</title>
 		<control type="container" pos="right">
-			<control type="led" class="output" label="Caps" binding="caps-lock" padleft="8px"/>
-			<control type="led" class="output" label="Num" binding="num-lock" padleft="8px"/>
-			<control type="led" class="output" label="Scroll" binding="scroll-lock" padleft="8px"/>
+			<control type="led" label="Caps" binding="caps-lock" padleft="8px"/>
+			<control type="led" label="Num" binding="num-lock" padleft="8px"/>
+			<control type="led" label="Scroll" binding="scroll-lock" padleft="8px"/>
 		</control>
 	</menu>
 </video>
diff --git a/devices/pc/video/video-cga-lock.xml b/devices/pc/video/video-cga-lock.xml
index b0a2268b7..091336e32 100644
--- a/devices/pc/video/video-cga-lock.xml
+++ b/devices/pc/video/video-cga-lock.xml
@@ -3,10 +3,10 @@
 	<menu>
 		<title>Color Display</title>
 		<control type="container" pos="right">
-			<control type="led" class="output" label="Caps" binding="caps-lock" padleft="8px"/>
-			<control type="led" class="output" label="Num" binding="num-lock" padleft="8px"/>
-			<control type="led" class="output" label="Scroll" binding="scroll-lock" padleft="8px"/>
-			<control type="button" class="input" binding="lockPointer" padleft="8px">Lock Pointer</control>
+			<control type="led" label="Caps" binding="caps-lock" padleft="8px"/>
+			<control type="led" label="Num" binding="num-lock" padleft="8px"/>
+			<control type="led" label="Scroll" binding="scroll-lock" padleft="8px"/>
+			<control type="button" binding="lockPointer" padleft="8px">Lock Pointer</control>
 		</control>
 	</menu>
 </video>
diff --git a/devices/pc/video/video-cga.xml b/devices/pc/video/video-cga.xml
index 3b78dda0e..3c6efaee9 100644
--- a/devices/pc/video/video-cga.xml
+++ b/devices/pc/video/video-cga.xml
@@ -3,9 +3,9 @@
 	<menu>
 		<title>Color Display</title>
 		<control type="container" pos="right">
-			<control type="led" class="output" label="Caps" binding="caps-lock" padleft="8px"/>
-			<control type="led" class="output" label="Num" binding="num-lock" padleft="8px"/>
-			<control type="led" class="output" label="Scroll" binding="scroll-lock" padleft="8px"/>
+			<control type="led" label="Caps" binding="caps-lock" padleft="8px"/>
+			<control type="led" label="Num" binding="num-lock" padleft="8px"/>
+			<control type="led" label="Scroll" binding="scroll-lock" padleft="8px"/>
 		</control>
 	</menu>
 </video>
diff --git a/devices/pc/video/video-ega-128kb-lock.xml b/devices/pc/video/video-ega-128kb-lock.xml
index 9409dbbb2..90c8e4d4d 100644
--- a/devices/pc/video/video-ega-128kb-lock.xml
+++ b/devices/pc/video/video-ega-128kb-lock.xml
@@ -3,10 +3,10 @@
 	<menu>
 		<title>Enhanced Color Display</title>
 		<control type="container" pos="right">
-			<control type="led" class="output" label="Caps" binding="caps-lock" padleft="8px"/>
-			<control type="led" class="output" label="Num" binding="num-lock" padleft="8px"/>
-			<control type="led" class="output" label="Scroll" binding="scroll-lock" padleft="8px"/>
-			<control type="button" class="input" binding="lockPointer" padleft="8px">Lock Pointer</control>
+			<control type="led" label="Caps" binding="caps-lock" padleft="8px"/>
+			<control type="led" label="Num" binding="num-lock" padleft="8px"/>
+			<control type="led" label="Scroll" binding="scroll-lock" padleft="8px"/>
+			<control type="button" binding="lockPointer" padleft="8px">Lock Pointer</control>
 		</control>
 	</menu>
 </video>
diff --git a/devices/pc/video/video-ega-640-128kb-lock.xml b/devices/pc/video/video-ega-640-128kb-lock.xml
index 6f09fa310..7cf4ecdae 100644
--- a/devices/pc/video/video-ega-640-128kb-lock.xml
+++ b/devices/pc/video/video-ega-640-128kb-lock.xml
@@ -3,10 +3,10 @@
 	<menu>
 		<title>Enhanced Color Display</title>
 		<control type="container" pos="right">
-			<control type="led" class="output" label="Caps" binding="caps-lock" padleft="8px"/>
-			<control type="led" class="output" label="Num" binding="num-lock" padleft="8px"/>
-			<control type="led" class="output" label="Scroll" binding="scroll-lock" padleft="8px"/>
-			<control type="button" class="input" binding="lockPointer" padleft="8px">Lock Pointer</control>
+			<control type="led" label="Caps" binding="caps-lock" padleft="8px"/>
+			<control type="led" label="Num" binding="num-lock" padleft="8px"/>
+			<control type="led" label="Scroll" binding="scroll-lock" padleft="8px"/>
+			<control type="button" binding="lockPointer" padleft="8px">Lock Pointer</control>
 		</control>
 	</menu>
 </video>
diff --git a/devices/pc/video/video-ega-64kb.xml b/devices/pc/video/video-ega-64kb.xml
index 44fb68289..0ac57b158 100644
--- a/devices/pc/video/video-ega-64kb.xml
+++ b/devices/pc/video/video-ega-64kb.xml
@@ -3,9 +3,9 @@
 	<menu>
 		<title>Enhanced Color Display</title>
 		<control type="container" pos="right">
-			<control type="led" class="output" label="Caps" binding="caps-lock" padleft="8px"/>
-			<control type="led" class="output" label="Num" binding="num-lock" padleft="8px"/>
-			<control type="led" class="output" label="Scroll" binding="scroll-lock" padleft="8px"/>
+			<control type="led" label="Caps" binding="caps-lock" padleft="8px"/>
+			<control type="led" label="Num" binding="num-lock" padleft="8px"/>
+			<control type="led" label="Scroll" binding="scroll-lock" padleft="8px"/>
 		</control>
 	</menu>
 </video>
diff --git a/devices/pc/video/video-mda.xml b/devices/pc/video/video-mda.xml
index d1951c5b7..cf3e67ea3 100644
--- a/devices/pc/video/video-mda.xml
+++ b/devices/pc/video/video-mda.xml
@@ -3,9 +3,9 @@
 	<menu>
 		<title>Monochrome Display</title>
 		<control type="container" pos="right">
-			<control type="led" class="output" label="Caps" binding="caps-lock" padleft="8px"/>
-			<control type="led" class="output" label="Num" binding="num-lock" padleft="8px"/>
-			<control type="led" class="output" label="Scroll" binding="scroll-lock" padleft="8px"/>
+			<control type="led" label="Caps" binding="caps-lock" padleft="8px"/>
+			<control type="led" label="Num" binding="num-lock" padleft="8px"/>
+			<control type="led" label="Scroll" binding="scroll-lock" padleft="8px"/>
 		</control>
 	</menu>
 </video>
diff --git a/disks/c1p/samples.xml b/disks/c1p/samples.xml
index b8dc6897b..711f9e12c 100644
--- a/disks/c1p/samples.xml
+++ b/disks/c1p/samples.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <disk id="disk" pos="left" padleft="8px">
-	<control type="list" class="input" binding="listDisk">
+	<control type="list" binding="listDisk">
 		<item ref="/disks/c1p/OS65D33.json">OS65D33</item>
 	</control>
-	<control type="button" class="input" binding="loadDisk">Load Disk</control>
+	<control type="button" binding="loadDisk">Load Disk</control>
 </disk>
diff --git a/disks/pc/cpm/machine.xml b/disks/pc/cpm/machine.xml
index 09f38d3e7..66e6e6855 100644
--- a/disks/pc/cpm/machine.xml
+++ b/disks/pc/cpm/machine.xml
@@ -8,18 +8,18 @@
 	<rom id="romBIOS"  addr="0xfe000" size="0x2000" file="/devices/pc/bios/5150/1981-04-24.json"/>
 	<video ref="/devices/pc/video/video-mda.xml"/>
 	<cpu id="cpu8088" model="8088" autostart="true" pos="left" padleft="8px" padbottom="8px">
-		<control type="button" class="input" binding="run">Run</control>
-		<control type="button" class="input" binding="reset">Reset</control>
+		<control type="button" binding="run">Run</control>
+		<control type="button" binding="reset">Reset</control>
 	</cpu>
-	<keyboard ref="/devices/pc/keyboard/minimal.xml"/>
+	<keyboard ref="/devices/pc/keyboard/keyboard-minimal.xml"/>
 	<fdc id="fdcNEC" automount='{A: {name: "CP/M-86 (Disk 1)", path: "/disks/pc/cpm/cpm86-disk1.json"}, B: {name: "CP/M-86 (Disk 2)", path: "/disks/pc/cpm/cpm86-disk2.json"}}' pos="right">
-		<control type="list" class="input" binding="listDrives"/>
-		<control type="list" class="input" binding="listDisks">
+		<control type="list" binding="listDrives"/>
+		<control type="list" binding="listDisks">
 			<disk path="">None</disk>
 			<manifest ref="/disks/pc/cpm/manifest.xml" disk="*"/>
 		</control>
-		<control type="button" class="input" binding="loadDrive">Load Drive</control>
-		<control type="description" class="output" binding="descDisk" padleft="8px"/>
+		<control type="button" binding="loadDrive">Load Drive</control>
+		<control type="description" binding="descDisk" padleft="8px"/>
 	</fdc>
 	<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 178e438e0..605f792bd 100644
--- a/disks/pc/diags/ibm/2.20/machine.xml
+++ b/disks/pc/diags/ibm/2.20/machine.xml
@@ -8,21 +8,21 @@
 	<rom id="romBIOS"  addr="0xfe000" size="0x2000" file="/devices/pc/bios/5150/1981-04-24.json"/>
 	<video ref="/devices/pc/video/video-mda.xml"/>
 	<cpu id="cpu8088" model="8088" autostart="true" pos="left" padleft="8px" padbottom="8px">
-		<control type="button" class="input" binding="run">Run</control>
-		<control type="button" class="input" binding="reset">Reset</control>
+		<control type="button" binding="run">Run</control>
+		<control type="button" binding="reset">Reset</control>
 	</cpu>
-	<keyboard ref="/devices/pc/keyboard/minimal.xml"/>
+	<keyboard ref="/devices/pc/keyboard/keyboard-minimal.xml"/>
 	<debugger id="debugger"/>
 	<panel ref="/devices/pc/panel/wide.xml"/>
 	<fdc id="fdcNEC" pos="left" padleft="8px" automount='{A: {name: "IBM Advanced Diagnostics", path: "/disks/pc/diags/ibm/2.20/5150_5155_5160_ADVDIAG_220.json"}}'>
-		<control type="list" class="input" binding="listDrives"/>
-		<control type="list" class="input" binding="listDisks">
+		<control type="list" binding="listDrives"/>
+		<control type="list" binding="listDisks">
 			<disk path="">None</disk>
 			<manifest ref="/disks/pc/dos/ibm/2.00/manifest.xml" disk="*"/>
 			<manifest ref="/disks/pc/diags/ibm/2.20/manifest.xml" disk="*"/>
 		</control>
-		<control type="button" class="input" binding="loadDrive">Load Drive</control>
-		<control type="description" class="output" binding="descDisk" padleft="8px"/>
+		<control type="button" binding="loadDrive">Load Drive</control>
+		<control type="description" binding="descDisk" padleft="8px"/>
 	</fdc>
 	<chipset id="chipset" model="5150" sw1="01000001" sw2="11110000"/>
 </machine>
diff --git a/disks/pc/games/infocom/disks.xml b/disks/pc/games/infocom/disks.xml
index 2985ab3c7..7e3f0bfb3 100644
--- a/disks/pc/games/infocom/disks.xml
+++ b/disks/pc/games/infocom/disks.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <fdc id="fdcNEC" automount='{A: {name: "Zork I", path: "/disks/pc/games/infocom/zork1/zork1-readonly.json"}}' padleft="8px" padbottom="8px" pos="left">
-	<control type="list" class="input" binding="listDrives"/>
-	<control type="list" class="input" binding="listDisks">
+	<control type="list" binding="listDrives"/>
+	<control type="list" binding="listDisks">
 		<disk path="">None</disk>
 		<manifest ref="/disks/pc/games/infocom/hhiker/manifest.xml" disk="*"/>
 		<manifest ref="/disks/pc/games/infocom/planet/manifest.xml" disk="*"/>
@@ -9,6 +9,6 @@
 		<manifest ref="/disks/pc/games/infocom/zork2/manifest.xml" disk="*"/>
 		<manifest ref="/disks/pc/games/infocom/zork3/manifest.xml" disk="*"/>
 	</control>
-	<control type="button" class="input" binding="loadDrive" padright="8px">Download</control>
-	<control type="description" class="output" binding="descDisk" padright="8px"/>
+	<control type="button" binding="loadDrive" padright="8px">Download</control>
+	<control type="description" binding="descDisk" padright="8px"/>
 </fdc>
diff --git a/disks/pc/games/infocom/machine-debug.xml b/disks/pc/games/infocom/machine-debug.xml
index 20db3839d..b4475f69e 100644
--- a/disks/pc/games/infocom/machine-debug.xml
+++ b/disks/pc/games/infocom/machine-debug.xml
@@ -9,9 +9,9 @@
 	<rom id="romBIOS"  addr="0xfe000" size="0x2000" file="/devices/pc/bios/5150/private/1981-04-24.rom"/>
 	<video ref="/devices/pc/video/video-cga.xml"/>
 	<keyboard id="keyboard" pos="left" padleft="8px">
-		<control type="button" class="input" binding="esc">ESC</control>
-		<control type="button" class="input" binding="ctrl-c">CTRL-C</control>
-		<control type="button" class="input" binding="ctrl-alt-del">CTRL-ALT-DEL</control>
+		<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>
 	</keyboard>
 	<debugger id="debugger"/>
 	<panel ref="/devices/pc/panel/wide.xml"/>
diff --git a/disks/pc/games/infocom/machine.xml b/disks/pc/games/infocom/machine.xml
index c6b4b9e2b..52817c0cf 100644
--- a/disks/pc/games/infocom/machine.xml
+++ b/disks/pc/games/infocom/machine.xml
@@ -8,10 +8,10 @@
 	<rom id="romBIOS"  addr="0xfe000" size="0x2000" file="/devices/pc/bios/5150/1981-04-24.json"/>
 	<video ref="/devices/pc/video/video-cga.xml"/>
 	<cpu id="cpu8088" model="8088" autostart="true" pos="left" padleft="8px" padbottom="8px">
-		<control type="button" class="input" binding="run">Run</control>
-		<control type="button" class="input" binding="reset">Reset</control>
+		<control type="button" binding="run">Run</control>
+		<control type="button" binding="reset">Reset</control>
 	</cpu>
-	<keyboard ref="/devices/pc/keyboard/minimal.xml"/>
+	<keyboard ref="/devices/pc/keyboard/keyboard-minimal.xml"/>
 	<fdc ref="/disks/pc/games/infocom/disks.xml"/>
 	<chipset id="chipset" model="5150" sw1="01001001" sw2="11110000"/>
 </machine>
diff --git a/disks/pc/games/infocom/zork1/debugger/machine.xml b/disks/pc/games/infocom/zork1/debugger/machine.xml
index 6948d265d..67ef1c787 100644
--- a/disks/pc/games/infocom/zork1/debugger/machine.xml
+++ b/disks/pc/games/infocom/zork1/debugger/machine.xml
@@ -9,20 +9,20 @@
 	<rom id="romBIOS"  addr="0xfe000" size="0x2000" file="/devices/pc/bios/5150/1981-04-24.json"/>
 	<video ref="/devices/pc/video/video-cga.xml"/>
 	<keyboard id="keyboard" pos="left" padleft="8px">
-		<control type="button" class="input" binding="esc">ESC</control>
-		<control type="button" class="input" binding="ctrl-c">CTRL-C</control>
-		<control type="button" class="input" binding="ctrl-alt-del">CTRL-ALT-DEL</control>
+		<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>
 	</keyboard>
 	<debugger id="debugger"/>
 	<panel ref="/devices/pc/panel/default.xml"/>
 	<fdc id="fdcNEC" automount='{A: {name: "Zork I", path: "/disks/pc/games/infocom/zork1/zork1-readonly.json"}}' pos="left" padleft="8px">
-		<control type="list" class="input" binding="listDrives"/>
-		<control type="list" class="input" binding="listDisks">
+		<control type="list" binding="listDrives"/>
+		<control type="list" binding="listDisks">
 			<disk path="">None</disk>
 			<manifest ref="/disks/pc/games/infocom/zork1/manifest.xml" disk="*"/>
 		</control>
-		<control type="button" class="input" binding="loadDrive">Load Drive</control>
-		<control type="description" class="output" binding="descDisk"/>
+		<control type="button" binding="loadDrive">Load Drive</control>
+		<control type="description" binding="descDisk"/>
 	</fdc>
 	<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 5a2b007ed..2a872c6d6 100644
--- a/disks/pc/games/microsoft/adventure/machine.xml
+++ b/disks/pc/games/microsoft/adventure/machine.xml
@@ -8,10 +8,10 @@
 	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/bios/5150/1981-04-24.json"/>
 	<video ref="/devices/pc/video/video-mda.xml"/>
 	<cpu id="cpu8088" model="8088" autostart="true" pos="left" padleft="8px">
-		<control type="button" class="input" binding="run">Run</control>
-		<control type="button" class="input" binding="reset">Reset</control>
+		<control type="button" binding="run">Run</control>
+		<control type="button" binding="reset">Reset</control>
 	</cpu>
-	<keyboard ref="/devices/pc/keyboard/minimal.xml"/>
+	<keyboard ref="/devices/pc/keyboard/keyboard-minimal.xml"/>
 	<fdc ref="/disks/pc/samples.xml" automount='{A: {name: "Microsoft Adventure", path: "/disks/pc/games/microsoft/adventure/adventure-1981.json"}}' pos="right"/>
 	<chipset id="chipset" model="5150" sw1="01000001" sw2="11110000"/>
 </machine>
diff --git a/disks/pc/library.xml b/disks/pc/library.xml
index f83289da5..6edfabaf0 100644
--- a/disks/pc/library.xml
+++ b/disks/pc/library.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <fdc id="fdcNEC" pos="left" padleft="8px" padbottom="8px" automount='{A:{name:"PC-DOS 2.00 (Disk 1)",path:"/disks/pc/dos/ibm/2.00/PCDOS200-DISK1.json"}, B:{name:"PC-DOS 2.00 (Disk 2)",path:"/disks/pc/dos/ibm/2.00/PCDOS200-DISK2.json"}}'>
-	<control type="list" class="input" binding="listDrives"/>
-	<control type="list" class="input" binding="listDisks">
+	<control type="list" binding="listDrives"/>
+	<control type="list" binding="listDisks">
 		<disk path="">None</disk>
 		<manifest ref="/disks/pc/dos/ibm/1.00/manifest.xml" disk="*"/>
 		<manifest ref="/disks/pc/dos/ibm/1.10/manifest.xml" disk="*"/>
@@ -45,7 +45,7 @@
 		<manifest ref="/apps/pc/1987/thinktank/manifest.xml" disk="disk01"/>
 		<manifest ref="/apps/pc/1992/moria/manifest.xml" disk="disk01"/>
 	</control>
-	<control type="button" class="input" binding="loadDrive" padright="8px">Download</control>
-	<control type="description" class="output" binding="descDisk" padright="8px"/>
-	<control type="file" class="input" binding="mountDrive"/>
+	<control type="button" binding="loadDrive" padright="8px">Download</control>
+	<control type="description" binding="descDisk" padright="8px"/>
+	<control type="file" binding="mountDrive"/>
 </fdc>
diff --git a/disks/pc/samples.xml b/disks/pc/samples.xml
index 96610b680..fce094079 100644
--- a/disks/pc/samples.xml
+++ b/disks/pc/samples.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <fdc id="fdcNEC" automount='{A:{name:"PC-DOS 2.00 (Disk 1)",path:"/disks/pc/dos/ibm/2.00/PCDOS200-DISK1.json"}, B:{name:"PC-DOS 2.00 (Disk 2)",path:"/disks/pc/dos/ibm/2.00/PCDOS200-DISK2.json"}}' pos="left" padleft="8px" padbottom="8px">
-	<control type="list" class="input" binding="listDrives"/>
-	<control type="list" class="input" binding="listDisks">
+	<control type="list" binding="listDrives"/>
+	<control type="list" binding="listDisks">
 		<disk path="">None</disk>
 		<manifest ref="/disks/pc/dos/ibm/1.00/manifest.xml" disk="*"/>
 		<manifest ref="/disks/pc/dos/ibm/1.10/manifest.xml" disk="*"/>
@@ -9,7 +9,7 @@
 		<manifest ref="/disks/pc/games/microsoft/adventure/manifest.xml" disk="*"/>
 		<manifest ref="/apps/pc/1981/visicalc/manifest.xml" disk="*"/>
 	</control>
-	<control type="button" class="input" binding="loadDrive" padright="8px">Download</control>
-	<control type="description" class="output" binding="descDisk" padright="8px"/>
-	<control type="file" class="input" binding="mountDrive"/>
+	<control type="button" binding="loadDrive" padright="8px">Download</control>
+	<control type="description" binding="descDisk" padright="8px"/>
+	<control type="file" binding="mountDrive"/>
 </fdc>
diff --git a/disks/pc/win/win10x.xml b/disks/pc/win/win10x.xml
index bb8187fd4..2020a4e32 100644
--- a/disks/pc/win/win10x.xml
+++ b/disks/pc/win/win10x.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <fdc id="fdcNEC" width="320px" pos="left" padtop="8px" automount='{A:{name:"PC-DOS 2.00 (Disk 1)",path:"/disks/pc/dos/ibm/2.00/PCDOS200-DISK1.json"}, B:{name:"PC-DOS 2.00 (Disk 2)",path:"/disks/pc/dos/ibm/2.00/PCDOS200-DISK2.json"}}'>
-	<control type="list" class="input" binding="listDrives"/>
-	<control type="list" class="input" binding="listDisks">
+	<control type="list" binding="listDrives"/>
+	<control type="list" binding="listDisks">
 		<disk path="">None</disk>
 		<manifest ref="/disks/pc/dos/ibm/2.00/manifest.xml" disk="*"/>
 		<disk path="/disks/pc/win/win101/01-SETUP/">Windows 1.01 (SETUP)</disk>
@@ -16,6 +16,6 @@
 		<disk path="/disks/pc/win/win103/05-APPS/">Windows 1.03 (APPS)</disk>
 		<disk path="/disks/pc/win/win103/06-WRITE/">Windows 1.03 (WRITE)</disk>
 	</control>
-	<control type="button" class="input" binding="loadDrive">Load Drive</control>
-	<control type="description" class="output" binding="descDisk" padleft="8px"/>
+	<control type="button" binding="loadDrive">Load Drive</control>
+	<control type="description" binding="descDisk" padleft="8px"/>
 </fdc>
diff --git a/docs/pcjs/demos/sample2.xml b/docs/pcjs/demos/sample2.xml
index 492e23757..de4857a49 100644
--- a/docs/pcjs/demos/sample2.xml
+++ b/docs/pcjs/demos/sample2.xml
@@ -11,16 +11,16 @@
 		</menu>
 	</video>
 	<cpu id="cpu8088" model="8088" autostart="true" pos="left">
-		<control type="button" class="input" binding="run">Run</control>
+		<control type="button" binding="run">Run</control>
 	</cpu>
 	<fdc id="fdcNEC" automount='{A: {name: "PC-DOS 1.00", path: "PCDOS100.json"}}' pos="left">
 		<control type="container">
-			<control type="list" class="input" binding="listDrives"/>
-			<control type="list" class="input" binding="listDisks">
+			<control type="list" binding="listDrives"/>
+			<control type="list" binding="listDisks">
 				<disk path="">None</disk>
 				<disk path="PCDOS100.json">PC-DOS 1.00</disk>
 			</control>
-			<control type="button" class="input" binding="loadDrive">Load Drive</control>
+			<control type="button" binding="loadDrive">Load Drive</control>
 		</control>
 	</fdc>
 	<chipset id="chipset" model="5150" sw1="01000001" sw2="11110000"/>
diff --git a/docs/pcjs/demos/sample3a.xml b/docs/pcjs/demos/sample3a.xml
index 748bdc54e..52a75585f 100644
--- a/docs/pcjs/demos/sample3a.xml
+++ b/docs/pcjs/demos/sample3a.xml
@@ -15,60 +15,60 @@
 	<panel id="panel" padtop="8px">
 		<name>Control Panel</name>
 		<control type="container" width="500px">
-			<control type="textarea" class="output" binding="print" width="480px" height="280px"/>
+			<control type="textarea" binding="print" width="480px" height="280px"/>
 			<control type="container">
-				<control type="text" class="input" binding="debugInput" width="380px"/>
-				<control type="button" class="input" binding="debugEnter">Enter</control>
-				<control type="button" class="input" binding="clear">Clear</control>
+				<control type="text" binding="debugInput" width="380px"/>
+				<control type="button" binding="debugEnter">Enter</control>
+				<control type="button" binding="clear">Clear</control>
 			</control>
 		</control>
 		<control type="container" width="320px">
-			<control type="register" class="output" label="AX" binding="AX" width="40px" padright="8px" padbottom="8px">0000</control>
-			<control type="register" class="output" label="BX" binding="BX" width="40px" padright="8px" padbottom="8px">0000</control>
-			<control type="register" class="output" label="CX" binding="CX" width="40px" padright="8px" padbottom="8px">0000</control>
-			<control type="register" class="output" label="DX" binding="DX" width="40px" padright="8px" padbottom="8px">0000</control>
-			<control type="register" class="output" label="SP" binding="SP" width="40px" padright="8px" padbottom="8px">0000</control>
-			<control type="register" class="output" label="BP" binding="BP" width="40px" padright="8px" padbottom="8px">0000</control>
-			<control type="register" class="output" label="SI" binding="SI" width="40px" padright="8px" padbottom="8px">0000</control>
-			<control type="register" class="output" label="DI" binding="DI" width="40px" padright="8px" padbottom="8px">0000</control>
-			<control type="register" class="output" label="DS" binding="DS" width="40px" padright="8px" padbottom="8px">0000</control>
-			<control type="register" class="output" label="ES" binding="ES" width="40px" padright="8px" padbottom="8px">0000</control>
-			<control type="register" class="output" label="SS" binding="SS" width="40px" padright="8px" padbottom="8px">0000</control>
-			<control type="register" class="output" label="CS" binding="CS" width="40px" padright="8px" padbottom="8px">0000</control>
-			<control type="register" class="output" label="IP" binding="IP" width="40px" padright="8px" padbottom="8px">0000</control>
-			<control type="flag" class="output" label="V" binding="V" width="8px" padright="4px" padbottom="8px">0</control>
-			<control type="flag" class="output" label="D" binding="D" width="8px" padright="4px" padbottom="8px">0</control>
-			<control type="flag" class="output" label="I" binding="I" width="8px" padright="4px" padbottom="8px">0</control>
-			<control type="flag" class="output" label="T" binding="T" width="8px" padright="4px" padbottom="8px">0</control>
-			<control type="flag" class="output" label="S" binding="S" width="8px" padright="4px" padbottom="8px">0</control>
-			<control type="flag" class="output" label="Z" binding="Z" width="8px" padright="4px" padbottom="8px">0</control>
-			<control type="flag" class="output" label="A" binding="A" width="8px" padright="4px" padbottom="8px">0</control>
-			<control type="flag" class="output" label="P" binding="P" width="8px" padright="4px" padbottom="8px">0</control>
-			<control type="flag" class="output" label="C" binding="C" left="0px" width="8px" padright="4px" padbottom="8px">0</control>
-			<control type="status" class="output" binding="speed" left="0px" padbottom="8px">Stopped</control>
-			<control type="button" class="input" binding="run">Run</control>
-			<control type="button" class="input" binding="step">Step</control>
-			<control type="button" class="input" binding="reset">Reset</control>
-			<control type="button" class="input" binding="setSpeed">Fast</control>
+			<control type="register" label="AX" binding="AX" width="40px" padright="8px" padbottom="8px">0000</control>
+			<control type="register" label="BX" binding="BX" width="40px" padright="8px" padbottom="8px">0000</control>
+			<control type="register" label="CX" binding="CX" width="40px" padright="8px" padbottom="8px">0000</control>
+			<control type="register" label="DX" binding="DX" width="40px" padright="8px" padbottom="8px">0000</control>
+			<control type="register" label="SP" binding="SP" width="40px" padright="8px" padbottom="8px">0000</control>
+			<control type="register" label="BP" binding="BP" width="40px" padright="8px" padbottom="8px">0000</control>
+			<control type="register" label="SI" binding="SI" width="40px" padright="8px" padbottom="8px">0000</control>
+			<control type="register" label="DI" binding="DI" width="40px" padright="8px" padbottom="8px">0000</control>
+			<control type="register" label="DS" binding="DS" width="40px" padright="8px" padbottom="8px">0000</control>
+			<control type="register" label="ES" binding="ES" width="40px" padright="8px" padbottom="8px">0000</control>
+			<control type="register" label="SS" binding="SS" width="40px" padright="8px" padbottom="8px">0000</control>
+			<control type="register" label="CS" binding="CS" width="40px" padright="8px" padbottom="8px">0000</control>
+			<control type="register" label="IP" binding="IP" width="40px" padright="8px" padbottom="8px">0000</control>
+			<control type="flag" label="V" binding="V" width="8px" padright="4px" padbottom="8px">0</control>
+			<control type="flag" label="D" binding="D" width="8px" padright="4px" padbottom="8px">0</control>
+			<control type="flag" label="I" binding="I" width="8px" padright="4px" padbottom="8px">0</control>
+			<control type="flag" label="T" binding="T" width="8px" padright="4px" padbottom="8px">0</control>
+			<control type="flag" label="S" binding="S" width="8px" padright="4px" padbottom="8px">0</control>
+			<control type="flag" label="Z" binding="Z" width="8px" padright="4px" padbottom="8px">0</control>
+			<control type="flag" label="A" binding="A" width="8px" padright="4px" padbottom="8px">0</control>
+			<control type="flag" label="P" binding="P" width="8px" padright="4px" padbottom="8px">0</control>
+			<control type="flag" label="C" binding="C" left="0px" width="8px" padright="4px" padbottom="8px">0</control>
+			<control type="status" binding="speed" left="0px" padbottom="8px">Stopped</control>
+			<control type="button" binding="run">Run</control>
+			<control type="button" binding="step">Step</control>
+			<control type="button" binding="reset">Reset</control>
+			<control type="button" binding="setSpeed">Fast</control>
 		</control>
 	</panel>
 	<fdc id="fdcNEC" automount='{A: {name: "PC-DOS 1.00", path: "PCDOS100.json"}, B: {name: "VisiCalc", path: "visicalc.json"}}' width="320px" pos="left" padtop="16px">
 		<control type="container">
-			<control type="list" class="input" binding="listDrives"/>
-			<control type="list" class="input" binding="listDisks">
+			<control type="list" binding="listDrives"/>
+			<control type="list" binding="listDisks">
 				<disk path="">None</disk>
 				<disk path="PCDOS100.json">PC-DOS 1.00</disk>
 				<disk path="visicalc.json" href="http://www.bricklin.com/history/vclicense.htm" desc="VisiCalc License">VisiCalc</disk>
 			</control>
-			<control type="button" class="input" binding="loadDrive">Load Drive</control>
-			<control type="description" class="output" binding="descDisk" padleft="8px"/>
+			<control type="button" binding="loadDrive">Load Drive</control>
+			<control type="description" binding="descDisk" padleft="8px"/>
 		</control>
 	</fdc>
 	<chipset id="chipset" model="5150" sw1="01000001" sw2="11110000" pos="left">
 		<control type="container" padtop="16px">
-			<control type="switches" class="input" label="SW1" binding="sw1" left="0px"/>
-			<control type="switches" class="input" label="SW2" binding="sw2" left="0px"/>
-			<control type="description" class="output" binding="swdesc" left="0px" padtop="8px"/>
+			<control type="switches" label="SW1" binding="sw1" left="0px"/>
+			<control type="switches" label="SW2" binding="sw2" left="0px"/>
+			<control type="description" binding="swdesc" left="0px" padtop="8px"/>
 		</control>
 	</chipset>
 </machine>