diff --git a/docs/pcjs/demos/components.xsl b/docs/pcjs/demos/components.xsl
index 3e1bb9b88..3276864e0 100644
--- a/docs/pcjs/demos/components.xsl
+++ b/docs/pcjs/demos/components.xsl
@@ -365,7 +365,7 @@
 					<canvas class="{$APPCLASS}-binding {$APPCLASS}-canvas" width="{@width}" height="{@height}" style="-webkit-user-select:none;{$border}{$fontsize}{$style}" data-value="{{{$type},{$binding}}}"><xsl:apply-templates/></canvas>
 				</xsl:when>
 				<xsl:when test="@type = 'button'">
-					<button class="{$APPCLASS}-binding" style="-webkit-user-select:none;{$border}{$width}{$height}{$fontsize}{$style}" data-value="{{{$type},{$binding}},{$value}}}"><xsl:apply-templates/></button>
+					<button class="{$APPCLASS}-binding" style="-webkit-user-select:none;{$border}{$width}{$height}{$fontsize}{$style}" data-value="{{{$type},{$binding},{$value}}}"><xsl:apply-templates/></button>
 				</xsl:when>
 				<xsl:when test="@type = 'list'">
 					<select class="{$APPCLASS}-binding" style="{$border}{$width}{$height}{$fontsize}{$style}" data-value="{{{$type},{$binding}}}">
@@ -532,7 +532,7 @@
 		<xsl:variable name="stepping">
 			<xsl:choose>
 				<xsl:when test="@stepping"><xsl:value-of select="@stepping"/></xsl:when>
-				<xsl:otherwise></xsl:otherwise>
+				<xsl:otherwise/>
 			</xsl:choose>
 		</xsl:variable>
 		<xsl:variable name="fpu">
@@ -601,7 +601,7 @@
 		<xsl:variable name="stepping">
 			<xsl:choose>
 				<xsl:when test="@stepping"><xsl:value-of select="@stepping"/></xsl:when>
-				<xsl:otherwise></xsl:otherwise>
+				<xsl:otherwise/>
 			</xsl:choose>
 		</xsl:variable>
 		<xsl:call-template name="component">
@@ -957,7 +957,7 @@
 		<xsl:variable name="touchScreen">
 			<xsl:choose>
 				<xsl:when test="@touchscreen"><xsl:value-of select="@touchscreen"/></xsl:when>
-				<xsl:otherwise></xsl:otherwise>
+				<xsl:otherwise/>
 			</xsl:choose>
 		</xsl:variable>
 		<xsl:variable name="autoLock">
diff --git a/modules/shared/templates/common.html b/modules/shared/templates/common.html
index ca57f66c7..a2e627082 100644
--- a/modules/shared/templates/common.html
+++ b/modules/shared/templates/common.html
@@ -41,7 +41,7 @@
 					</ul>
 				</div>
 				<div class="common-top-right">
-					<p>Powered by <a href="http://nodejs.org" target="_blank">Node.js</a> and <a href="http://github.com/jeffpar/pcjs" target="_blank">GitHub</a></p>
+					<p>Powered by JavaScript and <a href="http://github.com/jeffpar/pcjs" target="_blank">GitHub</a></p>
 				</div>
 			</div>
 			<div class="common-middle">
diff --git a/modules/shared/templates/common.xsl b/modules/shared/templates/common.xsl
index cf20ecffc..767c0bc23 100644
--- a/modules/shared/templates/common.xsl
+++ b/modules/shared/templates/common.xsl
@@ -43,7 +43,7 @@
 				</ul>
 			</div>
 			<div class="common-top-right">
-				<p>Powered by <a href="http://nodejs.org" target="_blank">Node.js</a> and <a href="http://github.com/jeffpar/pcjs" target="_blank">GitHub</a></p>
+				<p>Powered by JavaScript and <a href="http://github.com/jeffpar/pcjs" target="_blank">GitHub</a></p>
 			</div>
 		</div>
 	</xsl:template>
diff --git a/versions/c1pjs/1.20.8/components.xsl b/versions/c1pjs/1.20.8/components.xsl
index 6dbb68088..a8f8f3035 100644
--- a/versions/c1pjs/1.20.8/components.xsl
+++ b/versions/c1pjs/1.20.8/components.xsl
@@ -20,7 +20,7 @@
 
 	<xsl:template name="componentScripts">
 		<xsl:param name="component"/>
-		<script type="text/javascript" src="/versions/{$APPCLASS}/{$APPVERSION}/{$component}.js"></script>
+		<script type="text/javascript" src="/versions/{$APPCLASS}/{$APPVERSION}/{$component}.js"> </script>
 	</xsl:template>
 
 	<xsl:template name="componentIncludes">
@@ -156,7 +156,7 @@
 			</xsl:if>
 			<div class="{$APPCLASS}-container" style="{$border}{$style}">
 				<xsl:if test="$class != '' and $component != 'machine'">
-					<div class="{$APPCLASS}-{$class}-object" data-value="{{id:'{$id}',name:'{$name}'{$parms}}}"></div>
+					<div class="{$APPCLASS}-{$class}-object" data-value="{{id:'{$id}',name:'{$name}'{$parms}}}"> </div>
 				</xsl:if>
 				<xsl:if test="control">
 					<div class="{$APPCLASS}-controls">
@@ -173,7 +173,7 @@
 				<div class="{$APPCLASS}-copyright">
 					<a href="http://{$SITEHOST}/{$APPCLASS}" target="_blank">C1Pjs</a> v<xsl:value-of select="$APPVERSION"/> © 2012-2016 by <a href="http://twitter.com/jeffpar" target="_blank">@jeffpar</a>
 				</div>
-				<div style="clear:both"></div>
+				<div style="clear:both"> </div>
 			</xsl:if>
 		</div>
 	</xsl:template>
@@ -283,7 +283,7 @@
 					<input class="{$APPCLASS}-binding" type="submit" style="{$border}{$fontsize}{$style}" data-value="{{{$type},{$binding}}}" value="{.}"/>
 				</xsl:when>
 				<xsl:when test="@type = 'textarea'">
-					<textarea class="{$APPCLASS}-binding" style="{$border}{$width}{$height}{$style}" data-value="{{{$type},{$binding}}}" readonly="readonly"></textarea>
+					<textarea class="{$APPCLASS}-binding" style="{$border}{$width}{$height}{$style}" data-value="{{{$type},{$binding}}}" readonly="readonly"> </textarea>
 				</xsl:when>
 				<xsl:when test="@type = 'heading'">
 					<div><xsl:value-of select="."/></div>
@@ -300,7 +300,7 @@
 					<hr/>
 				</xsl:when>
 				<xsl:when test="not(@type)">
-					<div style="clear:both"></div><br/>
+					<div style="clear:both"> </div><br/>
 				</xsl:when>
 				<xsl:otherwise>
 					<div class="{$APPCLASS}-binding{$subclass}" style="{$border}{$width}{$height}{$style}" data-value="{{{$type},{$binding}}}"><xsl:apply-templates/></div>
@@ -310,7 +310,7 @@
 				<xsl:if test="@labelpos = 'right'">
 					<div class="{$APPCLASS}-label" style="{$labelwidth}{$labelstyle}"><xsl:value-of select="@label"/></div>
 				</xsl:if>
-				<div style="clear:both"></div>
+				<div style="clear:both"> </div>
 			</xsl:if>
 		</div>
 	</xsl:template>
diff --git a/versions/pcjs/1.20.8/components.xsl b/versions/pcjs/1.20.8/components.xsl
index 8aba3645f..01a3183af 100644
--- a/versions/pcjs/1.20.8/components.xsl
+++ b/versions/pcjs/1.20.8/components.xsl
@@ -365,7 +365,7 @@
 					<canvas class="{$APPCLASS}-binding {$APPCLASS}-canvas" width="{@width}" height="{@height}" style="-webkit-user-select:none;{$border}{$fontsize}{$style}" data-value="{{{$type},{$binding}}}"><xsl:apply-templates/></canvas>
 				</xsl:when>
 				<xsl:when test="@type = 'button'">
-					<button class="{$APPCLASS}-binding" style="-webkit-user-select:none;{$border}{$width}{$height}{$fontsize}{$style}" data-value="{{{$type},{$binding}},{$value}}}"><xsl:apply-templates/></button>
+					<button class="{$APPCLASS}-binding" style="-webkit-user-select:none;{$border}{$width}{$height}{$fontsize}{$style}" data-value="{{{$type},{$binding},{$value}}}"><xsl:apply-templates/></button>
 				</xsl:when>
 				<xsl:when test="@type = 'list'">
 					<select class="{$APPCLASS}-binding" style="{$border}{$width}{$height}{$fontsize}{$style}" data-value="{{{$type},{$binding}}}">
@@ -532,7 +532,7 @@
 		<xsl:variable name="stepping">
 			<xsl:choose>
 				<xsl:when test="@stepping"><xsl:value-of select="@stepping"/></xsl:when>
-				<xsl:otherwise></xsl:otherwise>
+				<xsl:otherwise/>
 			</xsl:choose>
 		</xsl:variable>
 		<xsl:variable name="fpu">
@@ -601,7 +601,7 @@
 		<xsl:variable name="stepping">
 			<xsl:choose>
 				<xsl:when test="@stepping"><xsl:value-of select="@stepping"/></xsl:when>
-				<xsl:otherwise></xsl:otherwise>
+				<xsl:otherwise/>
 			</xsl:choose>
 		</xsl:variable>
 		<xsl:call-template name="component">
@@ -957,7 +957,7 @@
 		<xsl:variable name="touchScreen">
 			<xsl:choose>
 				<xsl:when test="@touchscreen"><xsl:value-of select="@touchscreen"/></xsl:when>
-				<xsl:otherwise></xsl:otherwise>
+				<xsl:otherwise/>
 			</xsl:choose>
 		</xsl:variable>
 		<xsl:variable name="autoLock">