diff --git a/devices/pc8080/machine/vt100/debugger/machine-right.xml b/devices/pc8080/machine/vt100/debugger/machine-right.xml
index da0516814..14e4102b1 100644
--- a/devices/pc8080/machine/vt100/debugger/machine-right.xml
+++ b/devices/pc8080/machine/vt100/debugger/machine-right.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="/versions/pc8080/1.32.2/machine.xsl"?>
-<machine id="vt100" class="pc8080 machine-right" border="1" pos="center" background="#FAEBD7">
+<machine id="vt100" type="pc8080" class="machine-right" border="1" pos="center" background="#FAEBD7">
 	<name pos="center">VT100 Terminal</name>
 	<computer id="computer" busWidth="16"/>
 	<cpu id="cpu8080" model="8080" cycles="2764800" autoStart="true"/>
diff --git a/devices/pc8080/machine/vt100/debugger/machine.xml b/devices/pc8080/machine/vt100/debugger/machine.xml
index 4afc0c4cf..84b41d26f 100644
--- a/devices/pc8080/machine/vt100/debugger/machine.xml
+++ b/devices/pc8080/machine/vt100/debugger/machine.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="/versions/pc8080/1.32.2/machine.xsl"?>
-<machine id="vt100" class="pc8080" border="1" pos="center" background="#FAEBD7">
+<machine id="vt100" type="pc8080" border="1" pos="center" background="#FAEBD7">
 	<name pos="center">VT100 Terminal</name>
 	<computer id="computer" busWidth="16"/>
 	<cpu id="cpu8080" model="8080" cycles="2764800" autoStart="true"/>
diff --git a/devices/pc8080/machine/vt100/machine-right.xml b/devices/pc8080/machine/vt100/machine-right.xml
index d26541cdb..b57361f98 100644
--- a/devices/pc8080/machine/vt100/machine-right.xml
+++ b/devices/pc8080/machine/vt100/machine-right.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="/versions/pc8080/1.32.2/machine.xsl"?>
-<machine id="vt100" class="pc8080 machine-right" border="1" pos="center" background="#FAEBD7">
+<machine id="vt100" type="pc8080" class="machine-right" border="1" pos="center" background="#FAEBD7">
 	<name pos="center">VT100 Terminal</name>
 	<computer id="computer" busWidth="16"/>
 	<rom id="rom" addr="0x0000" size="0x2000" file="/devices/pc8080/rom/vt100/VT100.json"/>
diff --git a/devices/pc8080/machine/vt100/machine.xml b/devices/pc8080/machine/vt100/machine.xml
index a595b1a6f..667228feb 100644
--- a/devices/pc8080/machine/vt100/machine.xml
+++ b/devices/pc8080/machine/vt100/machine.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="/versions/pc8080/1.32.2/machine.xsl"?>
-<machine id="vt100" class="pc8080" border="1" pos="center" background="#FAEBD7">
+<machine id="vt100" type="pc8080" border="1" pos="center" background="#FAEBD7">
 	<name pos="center">VT100 Terminal</name>
 	<computer id="computer" busWidth="16"/>
 	<rom id="rom" addr="0x0000" size="0x2000" file="/devices/pc8080/rom/vt100/VT100.json"/>
diff --git a/devices/pdp11/machine/1170/vt100/debugger/machine-left.xml b/devices/pdp11/machine/1170/vt100/debugger/machine-left.xml
index 7bb9395d8..4305e5807 100644
--- a/devices/pdp11/machine/1170/vt100/debugger/machine-left.xml
+++ b/devices/pdp11/machine/1170/vt100/debugger/machine-left.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="/versions/pdpjs/1.32.2/machine.xsl"?>
-<machine id="test1170" class="pdp11 machine-left" border="1" pos="center" background="#FAEBD7">
+<machine id="test1170" type="pdp11" class="machine-left" border="1" pos="center" background="#FAEBD7">
 	<name pos="center">PDP-11/70 with 256Kb, Front Panel, and Debugger</name>
 	<computer id="computer" busWidth="22"/>
 	<cpu id="cpu" model="1170" cycles="6666667" autoStart="true"/>
diff --git a/devices/pdp11/machine/1170/vt100/debugger/machine.xml b/devices/pdp11/machine/1170/vt100/debugger/machine.xml
index e2aba5060..f4b1e13ee 100644
--- a/devices/pdp11/machine/1170/vt100/debugger/machine.xml
+++ b/devices/pdp11/machine/1170/vt100/debugger/machine.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="/versions/pdpjs/1.32.2/machine.xsl"?>
-<machine id="test1170" class="pdp11" border="1" pos="center" background="#FAEBD7">
+<machine id="test1170" type="pdp11" border="1" pos="center" background="#FAEBD7">
 	<name pos="center">PDP-11/70 with 256Kb, Front Panel, and Debugger</name>
 	<computer id="computer" busWidth="22"/>
 	<cpu id="cpu" model="1170" cycles="6666667" autoStart="true"/>
diff --git a/devices/pdp11/machine/1170/vt100/machine-left.xml b/devices/pdp11/machine/1170/vt100/machine-left.xml
index 193a6af6c..af9da4544 100644
--- a/devices/pdp11/machine/1170/vt100/machine-left.xml
+++ b/devices/pdp11/machine/1170/vt100/machine-left.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="/versions/pdpjs/1.32.2/machine.xsl"?>
-<machine id="test1170" class="pdp11 machine-left" border="1" pos="center" background="#FAEBD7">
+<machine id="test1170" type="pdp11" class="machine-left" border="1" pos="center" background="#FAEBD7">
 	<name pos="center">PDP-11/70 with 256Kb and Front Panel</name>
 	<computer id="computer" busWidth="22"/>
 	<cpu id="cpu" model="1170" cycles="6666667" autoStart="true"/>
diff --git a/devices/pdp11/machine/1170/vt100/machine.xml b/devices/pdp11/machine/1170/vt100/machine.xml
index 6483008d9..9ae656cdb 100644
--- a/devices/pdp11/machine/1170/vt100/machine.xml
+++ b/devices/pdp11/machine/1170/vt100/machine.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="/versions/pdpjs/1.32.2/machine.xsl"?>
-<machine id="test1170" class="pdp11" border="1" pos="center" background="#FAEBD7">
+<machine id="test1170" type="pdp11" border="1" pos="center" background="#FAEBD7">
 	<name pos="center">PDP-11/70 with 256Kb and Front Panel</name>
 	<computer id="computer" busWidth="22"/>
 	<cpu id="cpu" model="1170" cycles="6666667" autoStart="true"/>
diff --git a/docs/pcx86/examples/components.xsl b/docs/pcx86/examples/components.xsl
index 2828c82b7..a38673886 100644
--- a/docs/pcx86/examples/components.xsl
+++ b/docs/pcx86/examples/components.xsl
@@ -67,13 +67,16 @@
 		<xsl:variable name="machineStyle">
 			<xsl:if test="@float">float:<xsl:value-of select="@float"/></xsl:if>
 		</xsl:variable>
+		<xsl:variable name="machineType">
+			<xsl:if test="@type"><xsl:value-of select="@type"/></xsl:if>
+		</xsl:variable>
 		<xsl:variable name="machineClass">
 			<xsl:choose>
 				<xsl:when test="@class = 'pc' or @class = 'c1p'"><xsl:value-of select="@class"/>js</xsl:when>
 				<xsl:otherwise><xsl:value-of select="@class"/></xsl:otherwise>
 			</xsl:choose>
 		</xsl:variable>
-		<div id="{$machine}" class="machine {$machineClass}" style="{$machineStyle}">
+		<div id="{$machine}" class="machine {$machineType} {$machineClass}" style="{$machineStyle}">
 			<xsl:call-template name="component">
 				<xsl:with-param name="machine" select="$machine"/>
 				<xsl:with-param name="machineState">
diff --git a/modules/shared/templates/components.xsl b/modules/shared/templates/components.xsl
index 17aee9409..57103b403 100644
--- a/modules/shared/templates/components.xsl
+++ b/modules/shared/templates/components.xsl
@@ -68,13 +68,16 @@
 		<xsl:variable name="machineStyle">
 			<xsl:if test="@float">float:<xsl:value-of select="@float"/></xsl:if>
 		</xsl:variable>
+		<xsl:variable name="machineType">
+			<xsl:if test="@type"><xsl:value-of select="@type"/></xsl:if>
+		</xsl:variable>
 		<xsl:variable name="machineClass">
 			<xsl:choose>
 				<xsl:when test="@class = 'pc' or @class = 'c1p'"><xsl:value-of select="@class"/>js</xsl:when>
 				<xsl:otherwise><xsl:value-of select="@class"/></xsl:otherwise>
 			</xsl:choose>
 		</xsl:variable>
-		<div id="{$machine}" class="machine {$machineClass}" style="{$machineStyle}">
+		<div id="{$machine}" class="machine {$machineType} {$machineClass}" style="{$machineStyle}">
 			<xsl:call-template name="component">
 				<xsl:with-param name="machine" select="$machine"/>
 				<xsl:with-param name="machineState">
diff --git a/modules/shared/templates/machine.xsl b/modules/shared/templates/machine.xsl
index df9eb4bd6..73a82ead2 100644
--- a/modules/shared/templates/machine.xsl
+++ b/modules/shared/templates/machine.xsl
@@ -13,6 +13,18 @@
 	<xsl:include href="../../shared/templates/components.xsl"/>
 
 	<xsl:template match="/machine">
+		<xsl:variable name="machineType">
+			<xsl:choose>
+				<xsl:when test="@type"><xsl:value-of select="@type"/></xsl:when>
+				<xsl:otherwise><xsl:value-of select="@class"/></xsl:otherwise>
+			</xsl:choose>
+		</xsl:variable>
+		<xsl:variable name="machineClass">
+			<xsl:choose>
+				<xsl:when test="@class = 'pc' or @class = 'c1p'"><xsl:value-of select="@class"/>js</xsl:when>
+				<xsl:otherwise><xsl:value-of select="@class"/></xsl:otherwise>
+			</xsl:choose>
+		</xsl:variable>
 		<html lang="en">
 			<head>
 				<title><xsl:value-of select="$SITEHOST"/></title>
@@ -24,11 +36,11 @@
 					<xsl:call-template name="commonTop"/>
 					<div class="common-middle">
 						<p></p>
-						<div id="{@id}" class="machine {@class}js">
+						<div id="{@id}" class="machine {$machineType} {$machineClass}">
 							<xsl:call-template name="component">
 								<xsl:with-param name="machine" select="@id"/>
 								<xsl:with-param name="component" select="'machine'"/>
-								<xsl:with-param name="class"><xsl:value-of select="@class"/>js</xsl:with-param>
+								<xsl:with-param name="class" select="$machineClass"/>
 								<xsl:with-param name="parms"><xsl:if test="@parms">,<xsl:value-of select="@parms"/></xsl:if></xsl:with-param>
 							</xsl:call-template>
 						</div>
@@ -38,8 +50,8 @@
 				<xsl:call-template name="componentScripts">
 					<xsl:with-param name="component">
 						<xsl:choose>
-							<xsl:when test="debugger"><xsl:value-of select="@class"/>-dbg</xsl:when>
-							<xsl:otherwise><xsl:value-of select="@class"/></xsl:otherwise>
+							<xsl:when test="debugger"><xsl:value-of select="$machineType"/>-dbg</xsl:when>
+							<xsl:otherwise><xsl:value-of select="$machineType"/></xsl:otherwise>
 						</xsl:choose>
 					</xsl:with-param>
 				</xsl:call-template>
diff --git a/versions/c1pjs/1.32.2/machine.xsl b/versions/c1pjs/1.32.2/machine.xsl
index 92ab2def7..dd10906f7 100644
--- a/versions/c1pjs/1.32.2/machine.xsl
+++ b/versions/c1pjs/1.32.2/machine.xsl
@@ -12,6 +12,18 @@
 	<xsl:include href="/versions/c1pjs/1.32.2/components.xsl"/>
 
 	<xsl:template match="/machine">
+		<xsl:variable name="machineType">
+			<xsl:choose>
+				<xsl:when test="@type"><xsl:value-of select="@type"/></xsl:when>
+				<xsl:otherwise><xsl:value-of select="@class"/></xsl:otherwise>
+			</xsl:choose>
+		</xsl:variable>
+		<xsl:variable name="machineClass">
+			<xsl:choose>
+				<xsl:when test="@class = 'pc' or @class = 'c1p'"><xsl:value-of select="@class"/>js</xsl:when>
+				<xsl:otherwise><xsl:value-of select="@class"/></xsl:otherwise>
+			</xsl:choose>
+		</xsl:variable>
 		<html lang="en">
 			<head>
 				<title><xsl:value-of select="$SITEHOST"/></title>
@@ -23,11 +35,11 @@
 					<xsl:call-template name="commonTop"/>
 					<div class="common-middle">
 						<p></p>
-						<div id="{@id}" class="machine {@class}js">
+						<div id="{@id}" class="machine {$machineType} {$machineClass}">
 							<xsl:call-template name="component">
 								<xsl:with-param name="machine" select="@id"/>
 								<xsl:with-param name="component" select="'machine'"/>
-								<xsl:with-param name="class"><xsl:value-of select="@class"/>js</xsl:with-param>
+								<xsl:with-param name="class" select="$machineClass"/>
 								<xsl:with-param name="parms"><xsl:if test="@parms">,<xsl:value-of select="@parms"/></xsl:if></xsl:with-param>
 							</xsl:call-template>
 						</div>
@@ -37,8 +49,8 @@
 				<xsl:call-template name="componentScripts">
 					<xsl:with-param name="component">
 						<xsl:choose>
-							<xsl:when test="debugger"><xsl:value-of select="@class"/>-dbg</xsl:when>
-							<xsl:otherwise><xsl:value-of select="@class"/></xsl:otherwise>
+							<xsl:when test="debugger"><xsl:value-of select="$machineType"/>-dbg</xsl:when>
+							<xsl:otherwise><xsl:value-of select="$machineType"/></xsl:otherwise>
 						</xsl:choose>
 					</xsl:with-param>
 				</xsl:call-template>
diff --git a/versions/pc8080/1.32.2/components.xsl b/versions/pc8080/1.32.2/components.xsl
index 10d2d5e2f..96f4e10f0 100644
--- a/versions/pc8080/1.32.2/components.xsl
+++ b/versions/pc8080/1.32.2/components.xsl
@@ -67,13 +67,16 @@
 		<xsl:variable name="machineStyle">
 			<xsl:if test="@float">float:<xsl:value-of select="@float"/></xsl:if>
 		</xsl:variable>
+		<xsl:variable name="machineType">
+			<xsl:if test="@type"><xsl:value-of select="@type"/></xsl:if>
+		</xsl:variable>
 		<xsl:variable name="machineClass">
 			<xsl:choose>
 				<xsl:when test="@class = 'pc' or @class = 'c1p'"><xsl:value-of select="@class"/>js</xsl:when>
 				<xsl:otherwise><xsl:value-of select="@class"/></xsl:otherwise>
 			</xsl:choose>
 		</xsl:variable>
-		<div id="{$machine}" class="machine {$machineClass}" style="{$machineStyle}">
+		<div id="{$machine}" class="machine {$machineType} {$machineClass}" style="{$machineStyle}">
 			<xsl:call-template name="component">
 				<xsl:with-param name="machine" select="$machine"/>
 				<xsl:with-param name="machineState">
diff --git a/versions/pc8080/1.32.2/machine.xsl b/versions/pc8080/1.32.2/machine.xsl
index 494ee9278..3e8bd803f 100644
--- a/versions/pc8080/1.32.2/machine.xsl
+++ b/versions/pc8080/1.32.2/machine.xsl
@@ -12,6 +12,18 @@
 	<xsl:include href="/versions/pc8080/1.32.2/components.xsl"/>
 
 	<xsl:template match="/machine">
+		<xsl:variable name="machineType">
+			<xsl:choose>
+				<xsl:when test="@type"><xsl:value-of select="@type"/></xsl:when>
+				<xsl:otherwise><xsl:value-of select="@class"/></xsl:otherwise>
+			</xsl:choose>
+		</xsl:variable>
+		<xsl:variable name="machineClass">
+			<xsl:choose>
+				<xsl:when test="@class = 'pc' or @class = 'c1p'"><xsl:value-of select="@class"/>js</xsl:when>
+				<xsl:otherwise><xsl:value-of select="@class"/></xsl:otherwise>
+			</xsl:choose>
+		</xsl:variable>
 		<html lang="en">
 			<head>
 				<title><xsl:value-of select="$SITEHOST"/></title>
@@ -23,11 +35,11 @@
 					<xsl:call-template name="commonTop"/>
 					<div class="common-middle">
 						<p></p>
-						<div id="{@id}" class="machine {@class}js">
+						<div id="{@id}" class="machine {$machineType} {$machineClass}">
 							<xsl:call-template name="component">
 								<xsl:with-param name="machine" select="@id"/>
 								<xsl:with-param name="component" select="'machine'"/>
-								<xsl:with-param name="class"><xsl:value-of select="@class"/>js</xsl:with-param>
+								<xsl:with-param name="class" select="$machineClass"/>
 								<xsl:with-param name="parms"><xsl:if test="@parms">,<xsl:value-of select="@parms"/></xsl:if></xsl:with-param>
 							</xsl:call-template>
 						</div>
@@ -37,8 +49,8 @@
 				<xsl:call-template name="componentScripts">
 					<xsl:with-param name="component">
 						<xsl:choose>
-							<xsl:when test="debugger"><xsl:value-of select="@class"/>-dbg</xsl:when>
-							<xsl:otherwise><xsl:value-of select="@class"/></xsl:otherwise>
+							<xsl:when test="debugger"><xsl:value-of select="$machineType"/>-dbg</xsl:when>
+							<xsl:otherwise><xsl:value-of select="$machineType"/></xsl:otherwise>
 						</xsl:choose>
 					</xsl:with-param>
 				</xsl:call-template>
diff --git a/versions/pcx86/1.32.2/components.xsl b/versions/pcx86/1.32.2/components.xsl
index 798f2cfb8..6fe43e0ff 100644
--- a/versions/pcx86/1.32.2/components.xsl
+++ b/versions/pcx86/1.32.2/components.xsl
@@ -67,13 +67,16 @@
 		<xsl:variable name="machineStyle">
 			<xsl:if test="@float">float:<xsl:value-of select="@float"/></xsl:if>
 		</xsl:variable>
+		<xsl:variable name="machineType">
+			<xsl:if test="@type"><xsl:value-of select="@type"/></xsl:if>
+		</xsl:variable>
 		<xsl:variable name="machineClass">
 			<xsl:choose>
 				<xsl:when test="@class = 'pc' or @class = 'c1p'"><xsl:value-of select="@class"/>js</xsl:when>
 				<xsl:otherwise><xsl:value-of select="@class"/></xsl:otherwise>
 			</xsl:choose>
 		</xsl:variable>
-		<div id="{$machine}" class="machine {$machineClass}" style="{$machineStyle}">
+		<div id="{$machine}" class="machine {$machineType} {$machineClass}" style="{$machineStyle}">
 			<xsl:call-template name="component">
 				<xsl:with-param name="machine" select="$machine"/>
 				<xsl:with-param name="machineState">
diff --git a/versions/pcx86/1.32.2/machine.xsl b/versions/pcx86/1.32.2/machine.xsl
index 6a947d52a..e2a1a0e8b 100644
--- a/versions/pcx86/1.32.2/machine.xsl
+++ b/versions/pcx86/1.32.2/machine.xsl
@@ -12,6 +12,18 @@
 	<xsl:include href="/versions/pcx86/1.32.2/components.xsl"/>
 
 	<xsl:template match="/machine">
+		<xsl:variable name="machineType">
+			<xsl:choose>
+				<xsl:when test="@type"><xsl:value-of select="@type"/></xsl:when>
+				<xsl:otherwise><xsl:value-of select="@class"/></xsl:otherwise>
+			</xsl:choose>
+		</xsl:variable>
+		<xsl:variable name="machineClass">
+			<xsl:choose>
+				<xsl:when test="@class = 'pc' or @class = 'c1p'"><xsl:value-of select="@class"/>js</xsl:when>
+				<xsl:otherwise><xsl:value-of select="@class"/></xsl:otherwise>
+			</xsl:choose>
+		</xsl:variable>
 		<html lang="en">
 			<head>
 				<title><xsl:value-of select="$SITEHOST"/></title>
@@ -23,11 +35,11 @@
 					<xsl:call-template name="commonTop"/>
 					<div class="common-middle">
 						<p></p>
-						<div id="{@id}" class="machine {@class}js">
+						<div id="{@id}" class="machine {$machineType} {$machineClass}">
 							<xsl:call-template name="component">
 								<xsl:with-param name="machine" select="@id"/>
 								<xsl:with-param name="component" select="'machine'"/>
-								<xsl:with-param name="class"><xsl:value-of select="@class"/>js</xsl:with-param>
+								<xsl:with-param name="class" select="$machineClass"/>
 								<xsl:with-param name="parms"><xsl:if test="@parms">,<xsl:value-of select="@parms"/></xsl:if></xsl:with-param>
 							</xsl:call-template>
 						</div>
@@ -37,8 +49,8 @@
 				<xsl:call-template name="componentScripts">
 					<xsl:with-param name="component">
 						<xsl:choose>
-							<xsl:when test="debugger"><xsl:value-of select="@class"/>-dbg</xsl:when>
-							<xsl:otherwise><xsl:value-of select="@class"/></xsl:otherwise>
+							<xsl:when test="debugger"><xsl:value-of select="$machineType"/>-dbg</xsl:when>
+							<xsl:otherwise><xsl:value-of select="$machineType"/></xsl:otherwise>
 						</xsl:choose>
 					</xsl:with-param>
 				</xsl:call-template>
diff --git a/versions/pdpjs/1.32.2/components.xsl b/versions/pdpjs/1.32.2/components.xsl
index c3bf7de29..4d6f9fa1e 100644
--- a/versions/pdpjs/1.32.2/components.xsl
+++ b/versions/pdpjs/1.32.2/components.xsl
@@ -67,13 +67,16 @@
 		<xsl:variable name="machineStyle">
 			<xsl:if test="@float">float:<xsl:value-of select="@float"/></xsl:if>
 		</xsl:variable>
+		<xsl:variable name="machineType">
+			<xsl:if test="@type"><xsl:value-of select="@type"/></xsl:if>
+		</xsl:variable>
 		<xsl:variable name="machineClass">
 			<xsl:choose>
 				<xsl:when test="@class = 'pc' or @class = 'c1p'"><xsl:value-of select="@class"/>js</xsl:when>
 				<xsl:otherwise><xsl:value-of select="@class"/></xsl:otherwise>
 			</xsl:choose>
 		</xsl:variable>
-		<div id="{$machine}" class="machine {$machineClass}" style="{$machineStyle}">
+		<div id="{$machine}" class="machine {$machineType} {$machineClass}" style="{$machineStyle}">
 			<xsl:call-template name="component">
 				<xsl:with-param name="machine" select="$machine"/>
 				<xsl:with-param name="machineState">
diff --git a/versions/pdpjs/1.32.2/machine.xsl b/versions/pdpjs/1.32.2/machine.xsl
index 9100e8a20..1503cd6a2 100644
--- a/versions/pdpjs/1.32.2/machine.xsl
+++ b/versions/pdpjs/1.32.2/machine.xsl
@@ -12,6 +12,18 @@
 	<xsl:include href="/versions/pdpjs/1.32.2/components.xsl"/>
 
 	<xsl:template match="/machine">
+		<xsl:variable name="machineType">
+			<xsl:choose>
+				<xsl:when test="@type"><xsl:value-of select="@type"/></xsl:when>
+				<xsl:otherwise><xsl:value-of select="@class"/></xsl:otherwise>
+			</xsl:choose>
+		</xsl:variable>
+		<xsl:variable name="machineClass">
+			<xsl:choose>
+				<xsl:when test="@class = 'pc' or @class = 'c1p'"><xsl:value-of select="@class"/>js</xsl:when>
+				<xsl:otherwise><xsl:value-of select="@class"/></xsl:otherwise>
+			</xsl:choose>
+		</xsl:variable>
 		<html lang="en">
 			<head>
 				<title><xsl:value-of select="$SITEHOST"/></title>
@@ -23,11 +35,11 @@
 					<xsl:call-template name="commonTop"/>
 					<div class="common-middle">
 						<p></p>
-						<div id="{@id}" class="machine {@class}js">
+						<div id="{@id}" class="machine {$machineType} {$machineClass}">
 							<xsl:call-template name="component">
 								<xsl:with-param name="machine" select="@id"/>
 								<xsl:with-param name="component" select="'machine'"/>
-								<xsl:with-param name="class"><xsl:value-of select="@class"/>js</xsl:with-param>
+								<xsl:with-param name="class" select="$machineClass"/>
 								<xsl:with-param name="parms"><xsl:if test="@parms">,<xsl:value-of select="@parms"/></xsl:if></xsl:with-param>
 							</xsl:call-template>
 						</div>
@@ -37,8 +49,8 @@
 				<xsl:call-template name="componentScripts">
 					<xsl:with-param name="component">
 						<xsl:choose>
-							<xsl:when test="debugger"><xsl:value-of select="@class"/>-dbg</xsl:when>
-							<xsl:otherwise><xsl:value-of select="@class"/></xsl:otherwise>
+							<xsl:when test="debugger"><xsl:value-of select="$machineType"/>-dbg</xsl:when>
+							<xsl:otherwise><xsl:value-of select="$machineType"/></xsl:otherwise>
 						</xsl:choose>
 					</xsl:with-param>
 				</xsl:call-template>