diff --git a/console/tidy.c b/console/tidy.c
index 000dee1..9337ee3 100644
--- a/console/tidy.c
+++ b/console/tidy.c
@@ -494,7 +494,7 @@ static Bool hasPickList( TidyOption topt )
  */
 static ctmbstr ConfigCategoryName( TidyConfigCategory id )
 {
-    if (id >= TidyMarkup && id <= TidyInternalCategory)
+    if (id >= TidyDiagnostics && id <= TidyInternalCategory)
         return tidyLocalizedString(id);
 
     fprintf(stderr, tidyLocalizedString(TC_STRING_FATAL_ERROR), (int)id);
diff --git a/include/tidyenum.h b/include/tidyenum.h
index 4ddace1..999a20b 100644
--- a/include/tidyenum.h
+++ b/include/tidyenum.h
@@ -87,11 +87,17 @@ extern "C" {
 
 /** Codes for populating TidyConfigCategory enumeration. */
 #define FOREACH_TIDYCONFIGCATEGORY(FN)                                    \
-    FN(TidyMarkup)           /**< Markup options: (X)HTML version, etc */ \
     FN(TidyDiagnostics)      /**< Diagnostics */                          \
-    FN(TidyPrettyPrint)      /**< Output layout */                        \
-    FN(TidyEncoding)         /**< Character encodings */                  \
-    FN(TidyMiscellaneous)    /**< File handling, message format, etc. */  \
+    FN(TidyDisplay)          /**< Affecting screen display */             \
+    FN(TidyDocumentIO)       /**< Pertaining to document I/O */           \
+    FN(TidyEncoding)         /**< Relating to encoding */                 \
+    FN(TidyFileIO)           /**< Pertaining to file I/O */               \
+    FN(TidyMarkupCleanup)    /**< Cleanup related options */              \
+    FN(TidyMarkupEntities)   /**< Entity related options */               \
+    FN(TidyMarkupRepair)     /**< Document repair related options */      \
+    FN(TidyMarkupTeach)      /**< Teach tidy new things */                \
+    FN(TidyMarkupXForm)      /**< Transform HTML one way or another */    \
+    FN(TidyPrettyPrint)      /**< Pretty printing options */              \
     FN(TidyInternalCategory) /**< Option is internal only. */
 
 
diff --git a/man/tidy1.xsl.in b/man/tidy1.xsl.in
index 541bf52..81bdd0f 100644
--- a/man/tidy1.xsl.in
+++ b/man/tidy1.xsl.in
@@ -251,28 +251,53 @@ There were errors.
 </xsl:template>
 
 <xsl:template name="show-config-options">
-.SS HTML, XHTML, XML options<xsl:text/>
+.SS Document Display options<xsl:text/>
   <xsl:call-template name="config-detail">
-    <xsl:with-param name="category">markup</xsl:with-param>
+    <xsl:with-param name="category">display</xsl:with-param>
+  </xsl:call-template>
+.SS Document In and Out options
+  <xsl:call-template name="config-detail">
+    <xsl:with-param name="category">document</xsl:with-param>
+  </xsl:call-template>
+.SS File Input-Output options
+  <xsl:call-template name="config-detail">
+    <xsl:with-param name="category">file</xsl:with-param>
   </xsl:call-template>
 .SS Diagnostics options
   <xsl:call-template name="config-detail">
     <xsl:with-param name="category">diagnostics</xsl:with-param>
   </xsl:call-template>
+.SS Encoding options
+  <xsl:call-template name="config-detail">
+    <xsl:with-param name="category">encoding</xsl:with-param>
+  </xsl:call-template>
+.SS Cleanup options
+  <xsl:call-template name="config-detail">
+    <xsl:with-param name="category">cleanup</xsl:with-param>
+  </xsl:call-template>
+.SS Entities options
+  <xsl:call-template name="config-detail">
+    <xsl:with-param name="category">entities</xsl:with-param>
+  </xsl:call-template>
+.SS Repair options
+  <xsl:call-template name="config-detail">
+    <xsl:with-param name="category">repair</xsl:with-param>
+  </xsl:call-template>
+.SS Transformation options
+  <xsl:call-template name="config-detail">
+    <xsl:with-param name="category">transform</xsl:with-param>
+  </xsl:call-template>
+.SS Teaching Tidy options
+  <xsl:call-template name="config-detail">
+    <xsl:with-param name="category">teach</xsl:with-param>
+  </xsl:call-template>
 .SS Pretty Print options
   <xsl:call-template name="config-detail">
     <xsl:with-param name="category">print</xsl:with-param>
   </xsl:call-template>
-.SS Character Encoding options
-  <xsl:call-template name="config-detail">
-    <xsl:with-param name="category">encoding</xsl:with-param>
-  </xsl:call-template>
-.SS Miscellaneous options
-  <xsl:call-template name="config-detail">
-    <xsl:with-param name="category">misc</xsl:with-param>
-  </xsl:call-template>
 </xsl:template>
 
+
 <!--
   Note that any templates called implicitly or explicitly
   from the "config-detail" template below will match on
diff --git a/src/config.c b/src/config.c
index b52133b..53e882c 100644
--- a/src/config.c
+++ b/src/config.c
@@ -134,12 +134,17 @@ static PickListItems attributeCasePicks = {
 };
 
 
-
-#define MU TidyMarkup
 #define DG TidyDiagnostics
-#define PP TidyPrettyPrint
+#define DD TidyDisplay
+#define DT TidyDocumentIO
 #define CE TidyEncoding
-#define MS TidyMiscellaneous
+#define IO TidyFileIO
+#define MC TidyMarkupCleanup
+#define ME TidyMarkupEntities
+#define MR TidyMarkupRepair
+#define MT TidyMarkupTeach
+#define MX TidyMarkupXForm
+#define PP TidyPrettyPrint
 #define IR TidyInternalCategory
 
 #define IN TidyInteger
@@ -190,96 +195,96 @@ static ParseProperty ParsePickList;
 /* Ensure struct order is same order as tidyenum.h:TidyOptionId! */
 static const TidyOptionImpl option_defs[] =
 {
-    { TidyUnknownOption,           MS, "unknown!",                    IN, 0,               NULL,              NULL                },
+    { TidyUnknownOption,           IR, "unknown!",                    IN, 0,               NULL,              NULL                },
     { TidyAccessibilityCheckLevel, DG, "accessibility-check",         IN, 0,               ParsePickList,     &accessPicks        },
-    { TidyAltText,                 MU, "alt-text",                    ST, 0,               ParseString,       NULL                },
-    { TidyAnchorAsName,            MU, "anchor-as-name",              BL, yes,             ParsePickList,     &boolPicks          },
-    { TidyAsciiChars,              CE, "ascii-chars",                 BL, no,              ParsePickList,     &boolPicks          },
-    { TidyBlockTags,               MU, "new-blocklevel-tags",         ST, 0,               ParseTagNames,     NULL                },
-    { TidyBodyOnly,                MU, "show-body-only",              IN, no,              ParsePickList,     &autoBoolPicks      },
+    { TidyAltText,                 MR, "alt-text",                    ST, 0,               ParseString,       NULL                },
+    { TidyAnchorAsName,            MR, "anchor-as-name",              BL, yes,             ParsePickList,     &boolPicks          },
+    { TidyAsciiChars,              ME, "ascii-chars",                 BL, no,              ParsePickList,     &boolPicks          },
+    { TidyBlockTags,               MT, "new-blocklevel-tags",         ST, 0,               ParseTagNames,     NULL                },
+    { TidyBodyOnly,                DD, "show-body-only",              IN, no,              ParsePickList,     &autoBoolPicks      },
     { TidyBreakBeforeBR,           PP, "break-before-br",             BL, no,              ParsePickList,     &boolPicks          },
     { TidyCharEncoding,            CE, "char-encoding",               IN, UTF8,            ParseCharEnc,      &charEncPicks       },
-    { TidyCoerceEndTags,           MU, "coerce-endtags",              BL, yes,             ParsePickList,     &boolPicks          },
-    { TidyCSSPrefix,               MU, "css-prefix",                  ST, 0,               ParseCSS1Selector, NULL                },
+    { TidyCoerceEndTags,           MR, "coerce-endtags",              BL, yes,             ParsePickList,     &boolPicks          },
+    { TidyCSSPrefix,               MR, "css-prefix",                  ST, 0,               ParseCSS1Selector, NULL                },
     { TidyCustomTags,              IR, "new-custom-tags",             ST, 0,               ParseTagNames,     NULL                }, /* 20170309 - Issue #119 */
-    { TidyDecorateInferredUL,      MU, "decorate-inferred-ul",        BL, no,              ParsePickList,     &boolPicks          },
-    { TidyDoctype,                 MU, "doctype",                     ST, 0,               ParseDocType,      &doctypePicks       },
+    { TidyDecorateInferredUL,      MX, "decorate-inferred-ul",        BL, no,              ParsePickList,     &boolPicks          },
+    { TidyDoctype,                 DT, "doctype",                     ST, 0,               ParseDocType,      &doctypePicks       },
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
     { TidyDoctypeMode,             IR, "doctype-mode",                IN, TidyDoctypeAuto, NULL,              &doctypePicks       },
 #endif
-    { TidyDropEmptyElems,          MU, "drop-empty-elements",         BL, yes,             ParsePickList,     &boolPicks          },
-    { TidyDropEmptyParas,          MU, "drop-empty-paras",            BL, yes,             ParsePickList,     &boolPicks          },
-    { TidyDropPropAttrs,           MU, "drop-proprietary-attributes", BL, no,              ParsePickList,     &boolPicks          },
-    { TidyDuplicateAttrs,          MU, "repeated-attributes",         IN, TidyKeepLast,    ParsePickList,     &repeatAttrPicks    },
-    { TidyEmacs,                   MS, "gnu-emacs",                   BL, no,              ParsePickList,     &boolPicks          },
+    { TidyDropEmptyElems,          MC, "drop-empty-elements",         BL, yes,             ParsePickList,     &boolPicks          },
+    { TidyDropEmptyParas,          MC, "drop-empty-paras",            BL, yes,             ParsePickList,     &boolPicks          },
+    { TidyDropPropAttrs,           MC, "drop-proprietary-attributes", BL, no,              ParsePickList,     &boolPicks          },
+    { TidyDuplicateAttrs,          MR, "repeated-attributes",         IN, TidyKeepLast,    ParsePickList,     &repeatAttrPicks    },
+    { TidyEmacs,                   DD, "gnu-emacs",                   BL, no,              ParsePickList,     &boolPicks          },
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
     { TidyEmacsFile,               IR, "gnu-emacs-file",              ST, 0,               ParseString,       NULL                },
 #endif
-    { TidyEmptyTags,               MU, "new-empty-tags",              ST, 0,               ParseTagNames,     NULL                },
-    { TidyEncloseBlockText,        MU, "enclose-block-text",          BL, no,              ParsePickList,     &boolPicks          },
-    { TidyEncloseBodyText,         MU, "enclose-text",                BL, no,              ParsePickList,     &boolPicks          },
-    { TidyErrFile,                 MS, "error-file",                  ST, 0,               ParseString,       NULL                },
-    { TidyEscapeCdata,             MU, "escape-cdata",                BL, no,              ParsePickList,     &boolPicks          },
-    { TidyEscapeScripts,           PP, "escape-scripts",              BL, yes,             ParsePickList,     &boolPicks          }, /* 20160227 - Issue #348 */
-    { TidyFixBackslash,            MU, "fix-backslash",               BL, yes,             ParsePickList,     &boolPicks          },
-    { TidyFixComments,             MU, "fix-bad-comments",            IN, TidyAutoState,   ParsePickList,     &autoBoolPicks      },
-    { TidyFixUri,                  MU, "fix-uri",                     BL, yes,             ParsePickList,     &boolPicks          },
-    { TidyForceOutput,             MS, "force-output",                BL, no,              ParsePickList,     &boolPicks          },
-    { TidyGDocClean,               MU, "gdoc",                        BL, no,              ParsePickList,     &boolPicks          },
-    { TidyHideComments,            MU, "hide-comments",               BL, no,              ParsePickList,     &boolPicks          },
-    { TidyHtmlOut,                 MU, "output-html",                 BL, no,              ParsePickList,     &boolPicks          },
+    { TidyEmptyTags,               MT, "new-empty-tags",              ST, 0,               ParseTagNames,     NULL                },
+    { TidyEncloseBlockText,        MR, "enclose-block-text",          BL, no,              ParsePickList,     &boolPicks          },
+    { TidyEncloseBodyText,         MR, "enclose-text",                BL, no,              ParsePickList,     &boolPicks          },
+    { TidyErrFile,                 IO, "error-file",                  ST, 0,               ParseString,       NULL                },
+    { TidyEscapeCdata,             MX, "escape-cdata",                BL, no,              ParsePickList,     &boolPicks          },
+    { TidyEscapeScripts,           MR, "escape-scripts",              BL, yes,             ParsePickList,     &boolPicks          }, /* 20160227 - Issue #348 */
+    { TidyFixBackslash,            MR, "fix-backslash",               BL, yes,             ParsePickList,     &boolPicks          },
+    { TidyFixComments,             MR, "fix-bad-comments",            IN, TidyAutoState,   ParsePickList,     &autoBoolPicks      },
+    { TidyFixUri,                  MR, "fix-uri",                     BL, yes,             ParsePickList,     &boolPicks          },
+    { TidyForceOutput,             DG, "force-output",                BL, no,              ParsePickList,     &boolPicks          },
+    { TidyGDocClean,               MC, "gdoc",                        BL, no,              ParsePickList,     &boolPicks          },
+    { TidyHideComments,            MX, "hide-comments",               BL, no,              ParsePickList,     &boolPicks          },
+    { TidyHtmlOut,                 DT, "output-html",                 BL, no,              ParsePickList,     &boolPicks          },
     { TidyInCharEncoding,          CE, "input-encoding",              IN, UTF8,            ParseCharEnc,      &charEncPicks       },
     { TidyIndentAttributes,        PP, "indent-attributes",           BL, no,              ParsePickList,     &boolPicks          },
-    { TidyIndentCdata,             MU, "indent-cdata",                BL, no,              ParsePickList,     &boolPicks          },
+    { TidyIndentCdata,             PP, "indent-cdata",                BL, no,              ParsePickList,     &boolPicks          },
     { TidyIndentContent,           PP, "indent",                      IN, TidyNoState,     ParsePickList,     &autoBoolPicks      },
     { TidyIndentSpaces,            PP, "indent-spaces",               IN, 2,               ParseInt,          NULL                },
-    { TidyInlineTags,              MU, "new-inline-tags",             ST, 0,               ParseTagNames,     NULL                },
-    { TidyJoinClasses,             MU, "join-classes",                BL, no,              ParsePickList,     &boolPicks          },
-    { TidyJoinStyles,              MU, "join-styles",                 BL, yes,             ParsePickList,     &boolPicks          },
-    { TidyKeepFileTimes,           MS, "keep-time",                   BL, no,              ParsePickList,     &boolPicks          },
-    { TidyLiteralAttribs,          MU, "literal-attributes",          BL, no,              ParsePickList,     &boolPicks          },
-    { TidyLogicalEmphasis,         MU, "logical-emphasis",            BL, no,              ParsePickList,     &boolPicks          },
-    { TidyLowerLiterals,           MU, "lower-literals",              BL, yes,             ParsePickList,     &boolPicks          },
-    { TidyMakeBare,                MU, "bare",                        BL, no,              ParsePickList,     &boolPicks          },
-    { TidyMakeClean,               MU, "clean",                       BL, no,              ParsePickList,     &boolPicks          },
-    { TidyMark,                    MS, "tidy-mark",                   BL, yes,             ParsePickList,     &boolPicks          },
-    { TidyMergeDivs,               MU, "merge-divs",                  IN, TidyAutoState,   ParsePickList,     &autoBoolPicks      },
-    { TidyMergeEmphasis,           MU, "merge-emphasis",              BL, yes,             ParsePickList,     &boolPicks          },
-    { TidyMergeSpans,              MU, "merge-spans",                 IN, TidyAutoState,   ParsePickList,     &autoBoolPicks      },
-    { TidyMetaCharset,             MS, "add-meta-charset",            BL, no,              ParsePickList,     &boolPicks          }, /* 20161004 - Issue #456 */
-    { TidyNCR,                     MU, "ncr",                         BL, yes,             ParsePickList,     &boolPicks          },
+    { TidyInlineTags,              MT, "new-inline-tags",             ST, 0,               ParseTagNames,     NULL                },
+    { TidyJoinClasses,             MX, "join-classes",                BL, no,              ParsePickList,     &boolPicks          },
+    { TidyJoinStyles,              MX, "join-styles",                 BL, yes,             ParsePickList,     &boolPicks          },
+    { TidyKeepFileTimes,           IO, "keep-time",                   BL, no,              ParsePickList,     &boolPicks          },
+    { TidyLiteralAttribs,          MR, "literal-attributes",          BL, no,              ParsePickList,     &boolPicks          },
+    { TidyLogicalEmphasis,         MC, "logical-emphasis",            BL, no,              ParsePickList,     &boolPicks          },
+    { TidyLowerLiterals,           MR, "lower-literals",              BL, yes,             ParsePickList,     &boolPicks          },
+    { TidyMakeBare,                MC, "bare",                        BL, no,              ParsePickList,     &boolPicks          },
+    { TidyMakeClean,               MC, "clean",                       BL, no,              ParsePickList,     &boolPicks          },
+    { TidyMark,                    PP, "tidy-mark",                   BL, yes,             ParsePickList,     &boolPicks          },
+    { TidyMergeDivs,               MC, "merge-divs",                  IN, TidyAutoState,   ParsePickList,     &autoBoolPicks      },
+    { TidyMergeEmphasis,           MX, "merge-emphasis",              BL, yes,             ParsePickList,     &boolPicks          },
+    { TidyMergeSpans,              MC, "merge-spans",                 IN, TidyAutoState,   ParsePickList,     &autoBoolPicks      },
+    { TidyMetaCharset,             DT, "add-meta-charset",            BL, no,              ParsePickList,     &boolPicks          }, /* 20161004 - Issue #456 */
+    { TidyNCR,                     ME, "ncr",                         BL, yes,             ParsePickList,     &boolPicks          },
     { TidyNewline,                 CE, "newline",                     IN, DLF,             ParsePickList,     &newlinePicks       },
-    { TidyNumEntities,             MU, "numeric-entities",            BL, no,              ParsePickList,     &boolPicks          },
-    { TidyOmitOptionalTags,        MU, "omit-optional-tags",          BL, no,              ParsePickList,     &boolPicks          },
+    { TidyNumEntities,             ME, "numeric-entities",            BL, no,              ParsePickList,     &boolPicks          },
+    { TidyOmitOptionalTags,        PP, "omit-optional-tags",          BL, no,              ParsePickList,     &boolPicks          },
     { TidyOutCharEncoding,         CE, "output-encoding",             IN, UTF8,            ParseCharEnc,      &charEncPicks       },
-    { TidyOutFile,                 MS, "output-file",                 ST, 0,               ParseString,       NULL                },
+    { TidyOutFile,                 IO, "output-file",                 ST, 0,               ParseString,       NULL                },
     { TidyOutputBOM,               CE, "output-bom",                  IN, TidyAutoState,   ParsePickList,     &autoBoolPicks      },
     { TidyPPrintTabs,              PP, "indent-with-tabs",            BL, no,              ParseTabs,         &boolPicks          }, /* 20150515 - Issue #108 */
-    { TidyPreserveEntities,        MU, "preserve-entities",           BL, no,              ParsePickList,     &boolPicks          },
-    { TidyPreTags,                 MU, "new-pre-tags",                ST, 0,               ParseTagNames,     NULL                },
-    { TidyPriorityAttributes,      MU, "priority-attributes",         ST, 0,               ParseList,         NULL                },
+    { TidyPreserveEntities,        ME, "preserve-entities",           BL, no,              ParsePickList,     &boolPicks          },
+    { TidyPreTags,                 MT, "new-pre-tags",                ST, 0,               ParseTagNames,     NULL                },
+    { TidyPriorityAttributes,      PP, "priority-attributes",         ST, 0,               ParseList,         NULL                },
     { TidyPunctWrap,               PP, "punctuation-wrap",            BL, no,              ParsePickList,     &boolPicks          },
-    { TidyQuiet,                   MS, "quiet",                       BL, no,              ParsePickList,     &boolPicks          },
-    { TidyQuoteAmpersand,          MU, "quote-ampersand",             BL, yes,             ParsePickList,     &boolPicks          },
-    { TidyQuoteMarks,              MU, "quote-marks",                 BL, no,              ParsePickList,     &boolPicks          },
-    { TidyQuoteNbsp,               MU, "quote-nbsp",                  BL, yes,             ParsePickList,     &boolPicks          },
-    { TidyReplaceColor,            MU, "replace-color",               BL, no,              ParsePickList,     &boolPicks          },
-    { TidyShowErrors,              DG, "show-errors",                 IN, 6,               ParseInt,          NULL                },
-    { TidyShowInfo,                DG, "show-info",                   BL, yes,             ParsePickList,     &boolPicks          },
-    { TidyShowMarkup,              PP, "markup",                      BL, yes,             ParsePickList,     &boolPicks          },
-    { TidyShowMetaChange,          MS, "show-meta-change",            BL, no,              ParsePickList,     &boolPicks          }, /* 20170609 - Issue #456 */
-    { TidyShowWarnings,            DG, "show-warnings",               BL, yes,             ParsePickList,     &boolPicks          },
-    { TidySkipNested,              MU, "skip-nested",                 BL, yes,             ParsePickList,     &boolPicks          }, /* 1642186 - Issue #65 */
+    { TidyQuiet,                   DD, "quiet",                       BL, no,              ParsePickList,     &boolPicks          },
+    { TidyQuoteAmpersand,          ME, "quote-ampersand",             BL, yes,             ParsePickList,     &boolPicks          },
+    { TidyQuoteMarks,              ME, "quote-marks",                 BL, no,              ParsePickList,     &boolPicks          },
+    { TidyQuoteNbsp,               ME, "quote-nbsp",                  BL, yes,             ParsePickList,     &boolPicks          },
+    { TidyReplaceColor,            MX, "replace-color",               BL, no,              ParsePickList,     &boolPicks          },
+    { TidyShowErrors,              DD, "show-errors",                 IN, 6,               ParseInt,          NULL                },
+    { TidyShowInfo,                DD, "show-info",                   BL, yes,             ParsePickList,     &boolPicks          },
+    { TidyShowMarkup,              DD, "markup",                      BL, yes,             ParsePickList,     &boolPicks          },
+    { TidyShowMetaChange,          DG, "show-meta-change",            BL, no,              ParsePickList,     &boolPicks          }, /* 20170609 - Issue #456 */
+    { TidyShowWarnings,            DD, "show-warnings",               BL, yes,             ParsePickList,     &boolPicks          },
+    { TidySkipNested,              MR, "skip-nested",                 BL, yes,             ParsePickList,     &boolPicks          }, /* 1642186 - Issue #65 */
     { TidySortAttributes,          PP, "sort-attributes",             IN, TidySortAttrNone,ParsePickList,     &sorterPicks        },
-    { TidyStrictTagsAttr,          MU, "strict-tags-attributes",      BL, no,              ParsePickList,     &boolPicks          }, /* 20160209 - Issue #350 */
-    { TidyStyleTags,               MU, "fix-style-tags",              BL, yes,             ParsePickList,     &boolPicks          },
+    { TidyStrictTagsAttr,          MR, "strict-tags-attributes",      BL, no,              ParsePickList,     &boolPicks          }, /* 20160209 - Issue #350 */
+    { TidyStyleTags,               MR, "fix-style-tags",              BL, yes,             ParsePickList,     &boolPicks          },
     { TidyTabSize,                 PP, "tab-size",                    IN, 8,               ParseInt,          NULL                },
-    { TidyUpperCaseAttrs,          MU, "uppercase-attributes",        IN, TidyUppercaseNo, ParsePickList,     &attributeCasePicks },
-    { TidyUpperCaseTags,           MU, "uppercase-tags",              BL, no,              ParsePickList,     &boolPicks          },
-    { TidyUseCustomTags,           MU, "custom-tags",                 IN, TidyCustomNo,    ParsePickList,     &customTagsPicks    }, /* 20170309 - Issue #119 */
+    { TidyUpperCaseAttrs,          MR, "uppercase-attributes",        IN, TidyUppercaseNo, ParsePickList,     &attributeCasePicks },
+    { TidyUpperCaseTags,           MR, "uppercase-tags",              BL, no,              ParsePickList,     &boolPicks          },
+    { TidyUseCustomTags,           MR, "custom-tags",                 IN, TidyCustomNo,    ParsePickList,     &customTagsPicks    }, /* 20170309 - Issue #119 */
     { TidyVertSpace,               PP, "vertical-space",              IN, no,              ParsePickList,     &autoBoolPicks      }, /* #228 - tri option */
-    { TidyWarnPropAttrs,           MU, "warn-proprietary-attributes", BL, yes,             ParsePickList,     &boolPicks          },
-    { TidyWord2000,                MU, "word-2000",                   BL, no,              ParsePickList,     &boolPicks          },
+    { TidyWarnPropAttrs,           DG, "warn-proprietary-attributes", BL, yes,             ParsePickList,     &boolPicks          },
+    { TidyWord2000,                MC, "word-2000",                   BL, no,              ParsePickList,     &boolPicks          },
     { TidyWrapAsp,                 PP, "wrap-asp",                    BL, yes,             ParsePickList,     &boolPicks          },
     { TidyWrapAttVals,             PP, "wrap-attributes",             BL, no,              ParsePickList,     &boolPicks          },
     { TidyWrapJste,                PP, "wrap-jste",                   BL, yes,             ParsePickList,     &boolPicks          },
@@ -287,13 +292,13 @@ static const TidyOptionImpl option_defs[] =
     { TidyWrapPhp,                 PP, "wrap-php",                    BL, yes,             ParsePickList,     &boolPicks          },
     { TidyWrapScriptlets,          PP, "wrap-script-literals",        BL, no,              ParsePickList,     &boolPicks          },
     { TidyWrapSection,             PP, "wrap-sections",               BL, yes,             ParsePickList,     &boolPicks          },
-    { TidyWriteBack,               MS, "write-back",                  BL, no,              ParsePickList,     &boolPicks          },
-    { TidyXhtmlOut,                MU, "output-xhtml",                BL, no,              ParsePickList,     &boolPicks          },
-    { TidyXmlDecl,                 MU, "add-xml-decl",                BL, no,              ParsePickList,     &boolPicks          },
-    { TidyXmlOut,                  MU, "output-xml",                  BL, no,              ParsePickList,     &boolPicks          },
-    { TidyXmlPIs,                  MU, "assume-xml-procins",          BL, no,              ParsePickList,     &boolPicks          },
-    { TidyXmlSpace,                MU, "add-xml-space",               BL, no,              ParsePickList,     &boolPicks          },
-    { TidyXmlTags,                 MU, "input-xml",                   BL, no,              ParsePickList,     &boolPicks          },
+    { TidyWriteBack,               IO, "write-back",                  BL, no,              ParsePickList,     &boolPicks          },
+    { TidyXhtmlOut,                DT, "output-xhtml",                BL, no,              ParsePickList,     &boolPicks          },
+    { TidyXmlDecl,                 DT, "add-xml-decl",                BL, no,              ParsePickList,     &boolPicks          },
+    { TidyXmlOut,                  DT, "output-xml",                  BL, no,              ParsePickList,     &boolPicks          },
+    { TidyXmlPIs,                  MR, "assume-xml-procins",          BL, no,              ParsePickList,     &boolPicks          },
+    { TidyXmlSpace,                DT, "add-xml-space",               BL, no,              ParsePickList,     &boolPicks          },
+    { TidyXmlTags,                 DT, "input-xml",                   BL, no,              ParsePickList,     &boolPicks          },
     { N_TIDY_OPTIONS,              XX, NULL,                          XY, 0,               NULL,              NULL                }
 };
 
diff --git a/src/language_en.h b/src/language_en.h
index 16a1913..2ca2b0e 100644
--- a/src/language_en.h
+++ b/src/language_en.h
@@ -1578,10 +1578,16 @@ static languageDefinition language_en = { whichPluralForm_en, {
      ********************************************/
     { TidyUnknownCategory,          0,   "unknown category!"                                                       },
     { TidyDiagnostics,              0,   "diagnostics"                                                             },
+    { TidyDisplay,                  0,   "display"                                                                 },
+    { TidyDocumentIO,               0,   "document"                                                                },
     { TidyEncoding,                 0,   "encoding"                                                                },
+    { TidyFileIO,                   0,   "file"                                                                    },
     { TidyInternalCategory,         0,   "internal (private)"                                                      },
-    { TidyMarkup,                   0,   "markup"                                                                  },
-    { TidyMiscellaneous,            0,   "misc"                                                                    },
+    { TidyMarkupCleanup,            0,   "cleanup"                                                                 },
+    { TidyMarkupEntities,           0,   "entities"                                                                },
+    { TidyMarkupRepair,             0,   "repair"                                                                  },
+    { TidyMarkupTeach,              0,   "teach"                                                                   },
+    { TidyMarkupXForm,              0,   "transform"                                                               },
     { TidyPrettyPrint,              0,   "print"                                                                   },
 
 
diff --git a/src/language_fr.h b/src/language_fr.h
index 4bb6c16..b8861f2 100644
--- a/src/language_fr.h
+++ b/src/language_fr.h
@@ -1,4 +1,4 @@
-#ifndef language_fr_h
+#ifndef language_fr_h
 #define language_fr_h
 /*
  * language_fr.h
@@ -557,8 +557,6 @@ static languageDefinition language_fr = { whichPluralForm_fr, {
     { TidyUnknownCategory,                           0, "catégorie inconnue!"                                                                                    },
     { TidyEncoding,                                  0, "encodage"                                                                                               },
     { TidyInternalCategory,                          0, "interne (privée)"                                                                                       },
-    { TidyMarkup,                                    0, "structure de balises"                                                                                   },
-    { TidyMiscellaneous,                             0, "divers"                                                                                                 },
     { TidyPrettyPrint,                               0, "affichage"                                                                                              },
     { TidyInfo,                                      0, "Info:"                                                                                                  },
     { TidyWarning,                                   0, "Avertissement:"                                                                                         },
diff --git a/src/language_pt_br.h b/src/language_pt_br.h
index 48bcdf0..3ae2e7e 100644
--- a/src/language_pt_br.h
+++ b/src/language_pt_br.h
@@ -1,4 +1,4 @@
-#ifndef language_pt_br_h
+#ifndef language_pt_br_h
 #define language_pt_br_h
 /*
  * language_pt_br.h
@@ -650,8 +650,6 @@ static languageDefinition language_pt_br = { whichPluralForm_pt_br, {
     { TidyDiagnostics,                               0, "diagnósticos"                                                                                    },
     { TidyEncoding,                                  0, "codificação"                                                                                     },
     { TidyInternalCategory,                          0, "interna (privada)"                                                                               },
-    { TidyMarkup,                                    0, "marcação"                                                                                        },
-    { TidyMiscellaneous,                             0, "miscelânea"                                                                                      },
     { TidyPrettyPrint,                               0, "impressão"                                                                                       },
     { TidyWarning,                                   0, "Acesso: "                                                                                        },
     { TidyAccess,                                    0, "Acesso: "                                                                                        },