diff --git a/src/language_en.h b/src/language_en.h
index addc451..31f6738 100644
--- a/src/language_en.h
+++ b/src/language_en.h
@@ -684,7 +684,7 @@ static languageDefinition language_en = { whichPluralForm_en, {
       TidyCSSPrefix,                0,
         "This option specifies the prefix that Tidy uses for styles rules. "
         "<br/>"
-        "By default, <code>c</code> will be used. "
+        "By default, <var>c</var> will be used. "
     },
     {/* Important notes for translators:
         - Use only <code></code>, <var></var>, <em></em>, <strong></strong>, and
@@ -699,7 +699,7 @@ static languageDefinition language_en = { whichPluralForm_en, {
         "presentational tags (currently <code>&lt;i&gt;</code>, "
         "<code>&lt;b&gt;</code>, <code>&lt;center&gt;</code> when enclosed within "
         "appropriate inline tags, and <code>&lt;font&gt;</code>). If set to "
-        "<code>yes</code> then legacy tags will be replaced with CSS "
+        "<var>yes</var> then legacy tags will be replaced with CSS "
         "<code>&lt;style&gt;</code> tags and structural markup as appropriate. "
     },
     {/* Important notes for translators:
@@ -725,20 +725,20 @@ static languageDefinition language_en = { whichPluralForm_en, {
       TidyDoctype,                  0,
         "This option specifies the DOCTYPE declaration generated by Tidy. "
         "<br/>"
-        "If set to <code>omit</code> the output won't contain a DOCTYPE "
+        "If set to <var>omit</var> the output won't contain a DOCTYPE "
         "declaration. Note this this also implies <code>numeric-entities</code> is "
-        "set to <code>yes</code>."
+        "set to <var>yes</var>."
         "<br/>"
-        "If set to <code>html5</code> the DOCTYPE is set to "
+        "If set to <var>html5</var> the DOCTYPE is set to "
         "<code>&lt;!DOCTYPE html&gt;</code>."
         "<br/>"
-        "If set to <code>auto</code> (the default) Tidy will use an educated guess "
+        "If set to <var>auto</var> (the default) Tidy will use an educated guess "
         "based upon the contents of the document."
         "<br/>"
-        "If set to <code>strict</code>, Tidy will set the DOCTYPE to the HTML4 or "
+        "If set to <var>strict</var>, Tidy will set the DOCTYPE to the HTML4 or "
         "XHTML1 strict DTD."
         "<br/>"
-        "If set to <code>loose</code>, the DOCTYPE is set to the HTML4 or XHTML1 "
+        "If set to <var>loose</var>, the DOCTYPE is set to the HTML4 or XHTML1 "
         "loose (transitional) DTD."
         "<br/>"
         "Alternatively, you can supply a string for the formal public identifier "
@@ -868,7 +868,7 @@ static languageDefinition language_en = { whichPluralForm_en, {
         "This option specifies if Tidy should replace unexpected hyphens with "
         "<code>=</code> characters when it comes across adjacent hyphens. "
         "<br/>"
-        "The default is <code>yes</code>. "
+        "The default is <var>yes</var>. "
         "<br/>"
         "This option is provided for users of Cold Fusion which uses the "
         "comment syntax: <code>&lt;!--- ---&gt;</code>. "
@@ -1054,17 +1054,17 @@ static languageDefinition language_en = { whichPluralForm_en, {
           be translated. */
       TidyMergeDivs,                0,
         "This option can be used to modify the behavior of <code>clean</code> when "
-        "set to <code>yes</code>."
+        "set to <var>yes</var>."
         "<br/>"
         "This option specifies if Tidy should merge nested <code>&lt;div&gt;</code> "
         "such as <code>&lt;div&gt;&lt;div&gt;...&lt;/div&gt;&lt;/div&gt;</code>. "
         "<br/>"
-        "If set to <code>auto</code> the attributes of the inner "
+        "If set to <var>auto</var> the attributes of the inner "
         "<code>&lt;div&gt;</code> are moved to the outer one. Nested "
         "<code>&lt;div&gt;</code> with <code>id</code> attributes are <em>not</em> "
         "merged. "
         "<br/>"
-        "If set to <code>yes</code> the attributes of the inner "
+        "If set to <var>yes</var> the attributes of the inner "
         "<code>&lt;div&gt;</code> are discarded with the exception of "
         "<code>class</code> and <code>style</code>. "
     },
@@ -1078,7 +1078,7 @@ static languageDefinition language_en = { whichPluralForm_en, {
           be translated. */
       TidyMergeSpans,               0,
         "This option can be used to modify the behavior of <code>clean</code> when "
-        "set to <code>yes</code>."
+        "set to <var>yes</var>."
         "<br/>"
         "This option specifies if Tidy should merge nested <code>&lt;span&gt;</code> "
         "such as <code>&lt;span&gt;&lt;span&gt;...&lt;/span&gt;&lt;/span&gt;</code>. "
@@ -1308,7 +1308,7 @@ static languageDefinition language_en = { whichPluralForm_en, {
           be translated. */
       TidySortAttributes,           0,
         "This option specifies that Tidy should sort attributes within an element "
-        "using the specified sort algorithm. If set to <code>alpha</code>, the "
+        "using the specified sort algorithm. If set to <var>alpha</var>, the "
         "algorithm is an ascending alphabetic sort. "
     },
     {/* Important notes for translators:
@@ -1336,7 +1336,7 @@ static languageDefinition language_en = { whichPluralForm_en, {
         "This option specifies if Tidy should print only the contents of the "
         "body tag as an HTML fragment. "
         "<br/>"
-        "If set to <code>auto</code>, this is performed only if the body tag has "
+        "If set to <var>auto</var>, this is performed only if the body tag has "
         "been inferred. "
         "<br/>"
         "Useful for incorporating existing whole pages as a portion of another "
@@ -1356,7 +1356,7 @@ static languageDefinition language_en = { whichPluralForm_en, {
         "This option specifies if Tidy should output attribute names in upper "
         "case. "
         "<br/>"
-        "The default is <code>no</code>, which results in lower case attribute "
+        "The default is <var>no</var>, which results in lower case attribute "
         "names, except for XML input, where the original case is preserved. "
     },
     {/* Important notes for translators:
@@ -1370,7 +1370,7 @@ static languageDefinition language_en = { whichPluralForm_en, {
       TidyUpperCaseTags,            0,
         "This option specifies if Tidy should output tag names in upper case. "
         "<br/>"
-        "The default is <code>no</code> which results in lower case tag names, "
+        "The default is <var>no</var> which results in lower case tag names, "
         "except for XML input where the original case is preserved. "
     },
     {/* Important notes for translators:
@@ -1400,7 +1400,7 @@ static languageDefinition language_en = { whichPluralForm_en, {
         "This option specifies what level of accessibility checking, if any, "
         "that Tidy should perform. "
         "<br/>"
-        "Level <code>0 (Tidy Classic)</code> is equivalent to Tidy Classic's accessibility "
+        "Level <var>0 (Tidy Classic)</var> is equivalent to Tidy Classic's accessibility "
         "checking. "
         "<br/>"
         "For more information on Tidy's accessibility checking, visit "
@@ -1416,7 +1416,7 @@ static languageDefinition language_en = { whichPluralForm_en, {
           be translated. */
       TidyShowErrors,               0,
         "This option specifies the number Tidy uses to determine if further errors "
-        "should be shown. If set to <code>0</code>, then no errors are shown. "
+        "should be shown. If set to <var>0</var>, then no errors are shown. "
     },
     {/* Important notes for translators:
         - Use only <code></code>, <var></var>, <em></em>, <strong></strong>, and
@@ -1464,13 +1464,13 @@ static languageDefinition language_en = { whichPluralForm_en, {
       TidyIndentContent,            0,
         "This option specifies if Tidy should indent block-level tags. "
         "<br/>"
-        "If set to <code>auto</code> Tidy will decide whether or not to indent the "
+        "If set to <var>auto</var> Tidy will decide whether or not to indent the "
         "content of tags such as <code>&lt;title&gt;</code>, "
         "<code>&lt;h1&gt;</code>-<code>&lt;h6&gt;</code>, <code>&lt;li&gt;</code>, "
         "<code>&lt;td&gt;</code>, or <code>&lt;p&gt;</code> "
         "based on the content including a block-level element. "
         "<br/>"
-        "Setting <code>indent</code> to <code>yes</code> can expose layout bugs in "
+        "Setting <code>indent</code> to <var>yes</var> can expose layout bugs in "
         "some browsers. "
         "<br/>"
         "Use the option <code>indent-spaces</code> to control the number of spaces "
@@ -1515,13 +1515,13 @@ static languageDefinition language_en = { whichPluralForm_en, {
         "This option specifies how Tidy deals with whitespace characters within "
         "attribute values. "
         "<br/>"
-        "If the value is <code>no</code> Tidy normalizes attribute values by "
+        "If the value is <var>no</var> Tidy normalizes attribute values by "
         "replacing any newline or tab with a single space, and further by replacing "
         "any contiguous whitespace with a single space. "
         "<br/>"
         "To force Tidy to preserve the original, literal values of all attributes "
         "and ensure that whitespace within attribute values is passed "
-        "through unchanged, set this option to <code>yes</code>. "
+        "through unchanged, set this option to <var>yes</var>. "
     },
     {/* Important notes for translators:
         - Use only <code></code>, <var></var>, <em></em>, <strong></strong>, and