diff --git a/process_prismjs.xml b/process_prismjs.xml
index 084ef86..828b883 100644
--- a/process_prismjs.xml
+++ b/process_prismjs.xml
@@ -88,7 +88,10 @@
   <!--
     Check if Node is installed.
   -->
-  <target name="node.check" if="prismjs.highlightable">
+  <target 
+    name="node.check" 
+    if="prismjs.highlightable"
+    description="Ensure that Node.js is available">
     <!-- For Unix run node as an executable -->
 
     <exec
@@ -159,7 +162,10 @@
    
   </target>
 
-  <target name="highlight" if="prismjs.highlightable">
+  <target 
+    name="highlight" 
+    if="prismjs.highlightable"
+    description="Highlight codeblocks using Prism.js">
     <basename property="prism.temp.dirname" file="${dita.temp.dir}"/>
     <restrict id="prismjs.ditafileset">
       <ditafileset processingRole="normal">
diff --git a/test/basic-usage/expected.fo b/test/basic-usage/expected.fo
index 11eb068..814a08a 100644
--- a/test/basic-usage/expected.fo
+++ b/test/basic-usage/expected.fo
@@ -51,7 +51,12 @@
             <fo:inline color="black" font-family="MONOSPACE" font-weight="bold">prism.css</fo:inline>and
             <fo:inline color="black" font-family="MONOSPACE" font-weight="bold">prism.js</fo:inline>files you downloaded in your page. Example:</fo:block>
           <fo:block background-color="ALICEBLUE" color="black" font-family="MONOSPACE" font-weight="bold" hyphenation-character="&#9658;" keep-with-previous.within-page="always" linefeed-treatment="preserve" padding="6pt" white-space-collapse="false" white-space-treatment="preserve" wrap-option="wrap">
-            <fo:inline color="slategray" font-family="MONOSPACE" font-weight="bold">&lt;!DOCTYPE html&gt;</fo:inline>
+            <fo:inline color="slategray" font-family="MONOSPACE" font-weight="bold">
+              <fo:inline color="#909090" font-family="MONOSPACE" font-weight="bold">&lt;!</fo:inline>
+              <fo:inline color="black" font-family="MONOSPACE" font-weight="bold">DOCTYPE</fo:inline>
+              <fo:inline color="black" font-family="MONOSPACE" font-weight="bold">html</fo:inline>
+              <fo:inline color="#909090" font-family="MONOSPACE" font-weight="bold">&gt;</fo:inline>
+            </fo:inline>
             <fo:inline color="#900050" font-family="MONOSPACE" font-weight="bold">
               <fo:inline color="#900050" font-family="MONOSPACE" font-weight="bold">
                 <fo:inline color="#909090" font-family="MONOSPACE" font-weight="bold">&lt;</fo:inline>html</fo:inline>
@@ -67,13 +72,13 @@
                 <fo:inline color="#909090" font-family="MONOSPACE" font-weight="bold">&lt;</fo:inline>link</fo:inline>
               <fo:inline color="#609000" font-family="MONOSPACE" font-weight="bold">href</fo:inline>
               <fo:inline color="DARKCYAN" font-family="MONOSPACE" font-weight="bold">
-                <fo:inline color="#909090" font-family="MONOSPACE" font-weight="bold">=</fo:inline>
+                <fo:inline color="black" font-family="MONOSPACE" font-weight="bold">=</fo:inline>
                 <fo:inline color="#909090" font-family="MONOSPACE" font-weight="bold">"</fo:inline>themes/prism.css
                 <fo:inline color="#909090" font-family="MONOSPACE" font-weight="bold">"</fo:inline>
               </fo:inline>
               <fo:inline color="#609000" font-family="MONOSPACE" font-weight="bold">rel</fo:inline>
               <fo:inline color="DARKCYAN" font-family="MONOSPACE" font-weight="bold">
-                <fo:inline color="#909090" font-family="MONOSPACE" font-weight="bold">=</fo:inline>
+                <fo:inline color="black" font-family="MONOSPACE" font-weight="bold">=</fo:inline>
                 <fo:inline color="#909090" font-family="MONOSPACE" font-weight="bold">"</fo:inline>stylesheet
                 <fo:inline color="#909090" font-family="MONOSPACE" font-weight="bold">"</fo:inline>
               </fo:inline>
@@ -94,7 +99,7 @@
                 <fo:inline color="#909090" font-family="MONOSPACE" font-weight="bold">&lt;</fo:inline>script</fo:inline>
               <fo:inline color="#609000" font-family="MONOSPACE" font-weight="bold">src</fo:inline>
               <fo:inline color="DARKCYAN" font-family="MONOSPACE" font-weight="bold">
-                <fo:inline color="#909090" font-family="MONOSPACE" font-weight="bold">=</fo:inline>
+                <fo:inline color="black" font-family="MONOSPACE" font-weight="bold">=</fo:inline>
                 <fo:inline color="#909090" font-family="MONOSPACE" font-weight="bold">"</fo:inline>prism.js
                 <fo:inline color="#909090" font-family="MONOSPACE" font-weight="bold">"</fo:inline>
               </fo:inline>
@@ -197,7 +202,7 @@
                 <fo:inline color="#909090" font-family="MONOSPACE" font-weight="bold">&lt;</fo:inline>code</fo:inline>
               <fo:inline color="#609000" font-family="MONOSPACE" font-weight="bold">class</fo:inline>
               <fo:inline color="DARKCYAN" font-family="MONOSPACE" font-weight="bold">
-                <fo:inline color="#909090" font-family="MONOSPACE" font-weight="bold">=</fo:inline>
+                <fo:inline color="black" font-family="MONOSPACE" font-weight="bold">=</fo:inline>
                 <fo:inline color="#909090" font-family="MONOSPACE" font-weight="bold">"</fo:inline>language-css
                 <fo:inline color="#909090" font-family="MONOSPACE" font-weight="bold">"</fo:inline>
               </fo:inline>
@@ -240,7 +245,7 @@
                 <fo:inline color="#909090" font-family="MONOSPACE" font-weight="bold">&lt;</fo:inline>script</fo:inline>
               <fo:inline color="#609000" font-family="MONOSPACE" font-weight="bold">src</fo:inline>
               <fo:inline color="DARKCYAN" font-family="MONOSPACE" font-weight="bold">
-                <fo:inline color="#909090" font-family="MONOSPACE" font-weight="bold">=</fo:inline>
+                <fo:inline color="black" font-family="MONOSPACE" font-weight="bold">=</fo:inline>
                 <fo:inline color="#909090" font-family="MONOSPACE" font-weight="bold">"</fo:inline>prism.js
                 <fo:inline color="#909090" font-family="MONOSPACE" font-weight="bold">"</fo:inline>
               </fo:inline>
diff --git a/test/html/expected.html b/test/html/expected.html
index ea8b890..b4fb80e 100644
--- a/test/html/expected.html
+++ b/test/html/expected.html
@@ -7,8 +7,8 @@ <h1 class="title topictitle1" id="ariaid-title1">topic</h1>
      <p class="p">This page’s logo (SVG), highlighted with Prism:</p>
 	<pre class="pre codeblock language-markup"><code>
 	 	
-<span class="ph token tag"><span class="ph token tag"><span class="ph token punctuation">&lt;</span>svg</span> <span class="ph token attr-name">xmlns</span><span class="ph token attr-value"><span class="ph token punctuation">=</span><span class="ph token punctuation">"</span>http://www.w3.org/2000/svg<span class="ph token punctuation">"</span></span> <span class="ph token attr-name">viewBox</span><span class="ph token attr-value"><span class="ph token punctuation">=</span><span class="ph token punctuation">"</span>0 0 200 170<span class="ph token punctuation">"</span></span><span class="ph token punctuation">&gt;</span></span>
-	<span class="ph token tag"><span class="ph token tag"><span class="ph token punctuation">&lt;</span>path</span> <span class="ph token attr-name">fill</span><span class="ph token attr-value"><span class="ph token punctuation">=</span><span class="ph token punctuation">"</span>#fff<span class="ph token punctuation">"</span></span> <span class="ph token attr-name">d</span><span class="ph token attr-value"><span class="ph token punctuation">=</span><span class="ph token punctuation">"</span>M55.37 131.5H48.4v9.13h6.97c1.67 0 2.92-.4 3.78-1.22.85
+<span class="ph token tag"><span class="ph token tag"><span class="ph token punctuation">&lt;</span>svg</span> <span class="ph token attr-name">xmlns</span><span class="ph token attr-value"><span class="ph token punctuation attr-equals">=</span><span class="ph token punctuation">"</span>http://www.w3.org/2000/svg<span class="ph token punctuation">"</span></span> <span class="ph token attr-name">viewBox</span><span class="ph token attr-value"><span class="ph token punctuation attr-equals">=</span><span class="ph token punctuation">"</span>0 0 200 170<span class="ph token punctuation">"</span></span><span class="ph token punctuation">&gt;</span></span>
+	<span class="ph token tag"><span class="ph token tag"><span class="ph token punctuation">&lt;</span>path</span> <span class="ph token attr-name">fill</span><span class="ph token attr-value"><span class="ph token punctuation attr-equals">=</span><span class="ph token punctuation">"</span>#fff<span class="ph token punctuation">"</span></span> <span class="ph token attr-name">d</span><span class="ph token attr-value"><span class="ph token punctuation attr-equals">=</span><span class="ph token punctuation">"</span>M55.37 131.5H48.4v9.13h6.97c1.67 0 2.92-.4 3.78-1.22.85
 	-.8 1.28-1.92 1.28-3.33s-.43-2.54-1.28-3.35c-.86-.8-2.12-1.2-3.78-1.2m29.52
 	6.4c.3-.53.47-1.2.47-2.04 0-1.35-.45-2.4-1.37-3.2-.92-.76-2.14-1.15-3.65
 	-1.15H72.9v8.52h7.32c2.26 0 3.82-.7 4.67-2.1M100 0L0 170h200L100 0M60.86
diff --git a/test/javadoc/build.xml b/test/javadoc/build.xml
index 7900b26..04e4bd1 100644
--- a/test/javadoc/build.xml
+++ b/test/javadoc/build.xml
@@ -2,7 +2,7 @@
 <project basedir="." default="unit-test">
 	<import file="../bootstrap.xml"/>
 	<description>
-		Expect that PDF codeblock text highlights embedded elements correctly
+		Expect that PDF codeblock text highlights embedded JavaDoc elements correctly
 	</description>
 	<target description="" name="unit-test">
 		<exec-pdf/>
diff --git a/test/pdf/build.xml b/test/pdf/build.xml
index 0225295..9b5a5fe 100644
--- a/test/pdf/build.xml
+++ b/test/pdf/build.xml
@@ -2,7 +2,7 @@
 <project basedir="." default="unit-test">
 	<import file="../bootstrap.xml"/>
 	<description>
-		Expect that PDF codeblock text highlights syntax correctly
+		Expect that PDF codeblock text highlights SVG syntax correctly
 	</description>
 	<target description="" name="unit-test">
 		<exec-pdf/>
diff --git a/test/pdf/expected.fo b/test/pdf/expected.fo
index 2c37cd8..1331c4c 100644
--- a/test/pdf/expected.fo
+++ b/test/pdf/expected.fo
@@ -55,13 +55,13 @@
                 <fo:inline color="#909090" font-family="MONOSPACE" font-weight="bold">&lt;</fo:inline>svg</fo:inline>
               <fo:inline color="#609000" font-family="MONOSPACE" font-weight="bold">xmlns</fo:inline>
               <fo:inline color="DARKCYAN" font-family="MONOSPACE" font-weight="bold">
-                <fo:inline color="#909090" font-family="MONOSPACE" font-weight="bold">=</fo:inline>
+                <fo:inline color="black" font-family="MONOSPACE" font-weight="bold">=</fo:inline>
                 <fo:inline color="#909090" font-family="MONOSPACE" font-weight="bold">"</fo:inline>http://www.w3.org/2000/svg
                 <fo:inline color="#909090" font-family="MONOSPACE" font-weight="bold">"</fo:inline>
               </fo:inline>
               <fo:inline color="#609000" font-family="MONOSPACE" font-weight="bold">viewBox</fo:inline>
               <fo:inline color="DARKCYAN" font-family="MONOSPACE" font-weight="bold">
-                <fo:inline color="#909090" font-family="MONOSPACE" font-weight="bold">=</fo:inline>
+                <fo:inline color="black" font-family="MONOSPACE" font-weight="bold">=</fo:inline>
                 <fo:inline color="#909090" font-family="MONOSPACE" font-weight="bold">"</fo:inline>0 0 200 170
                 <fo:inline color="#909090" font-family="MONOSPACE" font-weight="bold">"</fo:inline>
               </fo:inline>
@@ -72,13 +72,13 @@
                 <fo:inline color="#909090" font-family="MONOSPACE" font-weight="bold">&lt;</fo:inline>path</fo:inline>
               <fo:inline color="#609000" font-family="MONOSPACE" font-weight="bold">fill</fo:inline>
               <fo:inline color="DARKCYAN" font-family="MONOSPACE" font-weight="bold">
-                <fo:inline color="#909090" font-family="MONOSPACE" font-weight="bold">=</fo:inline>
+                <fo:inline color="black" font-family="MONOSPACE" font-weight="bold">=</fo:inline>
                 <fo:inline color="#909090" font-family="MONOSPACE" font-weight="bold">"</fo:inline>#fff
                 <fo:inline color="#909090" font-family="MONOSPACE" font-weight="bold">"</fo:inline>
               </fo:inline>
               <fo:inline color="#609000" font-family="MONOSPACE" font-weight="bold">d</fo:inline>
               <fo:inline color="DARKCYAN" font-family="MONOSPACE" font-weight="bold">
-                <fo:inline color="#909090" font-family="MONOSPACE" font-weight="bold">=</fo:inline>
+                <fo:inline color="black" font-family="MONOSPACE" font-weight="bold">=</fo:inline>
                 <fo:inline color="#909090" font-family="MONOSPACE" font-weight="bold">"</fo:inline>M55.37 131.5H48.4v9.13h6.97c1.67 0 2.92-.4 3.78-1.22.85
 	-.8 1.28-1.92 1.28-3.33s-.43-2.54-1.28-3.35c-.86-.8-2.12-1.2-3.78-1.2m29.52
 	6.4c.3-.53.47-1.2.47-2.04 0-1.35-.45-2.4-1.37-3.2-.92-.76-2.14-1.15-3.65