--- a\np2src\Notepad2.ini	Wed Apr 09 18:00:00 2008
+++ b\np2src\Notepad2.ini	Sat Jul 05 16:17:06 2008
@@ -219,24 +220,24 @@ ASP JS Regex=
 VBS Default=
 VBS Comment Line=fore:#008000
 VBS Number=fore:#FF0000
 VBS Keyword=fore:#800080;bold
 VBS String=fore:#008000
 VBS String EOL=fore:#008000
 VBS Identifier=
 ASP VBS Default=
-ASP VBS Comment Line =fore:#008000
+ASP VBS Comment Line=fore:#008000
 ASP VBS Number=
 ASP VBS Keyword=fore:#800080;bold
 ASP VBS String=fore:#008000
 ASP VBS String EOL=fore:#008000
 ASP VBS Identifier=
 [XML Document]
-FileNameExtensions=xml;xsl;svg;xul;xsd;xslt;axl;rdf;vcproj;manifest
+FileNameExtensions=xml;xsl;svg;xul;xsd;xslt;axl;rdf;vcproj;manifest;xaml;rss
 Default=
 XML Tag=fore:#800080
 XML Closing Tag=fore:#800080
 XML Attribute=fore:#FF0000
 XML Value=fore:#3A6EA5
 XML String double quoted=fore:#3A6EA5
 XML String single quoted=fore:#3A6EA5
 XML Other Inside Tag=fore:#3A6EA5
@@ -288,17 +289,17 @@ Keyword=fore:#0A246A;bold
 String=fore:#008000
 String not closed=fore:#008000;back:#FFFF80;eolfilled
 Operator=
 Identifier=
 Constant=
 Preprocessor=#fore:#808080
 Assembler=fore:#FF8000
 [C/C++ Source Code]
-FileNameExtensions=c;cpp;cxx;cc;h;hpp;hxx;hh
+FileNameExtensions=c;cpp;cxx;cc;h;hpp;hxx;hh;m;mm
 Default=
 Comment=fore:#008000
 Comment Line=fore:#008000
 Comment Doc=fore:#008000
 Comment Line Doc=fore:#008000
 Keyword=fore:#0A246A;bold
 Identifier=
 Number=fore:#FF0000
@@ -323,17 +324,17 @@ String=fore:#008000
 Verbatim String=fore:#008000
 String not closed=fore:#008000;back:#FFFF80;eolfilled
 Character=fore:#008000
 Operator=fore:#0A246A
 Preprocessor=fore:#FF8000
 Comment Doc Keyword=fore:#008000
 Comment Doc Keyword Error=fore:#008000
 [Resource Script]
-FileNameExtensions=rc;rc2;rct;dlg
+FileNameExtensions=rc;rc2;rct;dlg;r
 Default=
 Comment=fore:#008000
 Comment Line=fore:#008000
 Comment Doc=fore:#008000
 Keyword=fore:#0A246A;bold
 Identifier=
 Number=fore:#FF0000
 String=fore:#008000
--- a\np2src\src\Styles.c	Wed Apr 09 18:00:00 2008
+++ b\np2src\src\Styles.c	Sat Jul 05 16:16:55 2008
@@ -224,17 +224,17 @@ EDITLEXER lexHTML = { SCLEX_HTML, "Web S
                       //{ SCE_H_SGML_BLOCK_DEFAULT, "SGML Block Default", "", "" },
                       { -1, "", "", "" } } };
 
 
 KEYWORDLIST KeyWords_XML = {
 "", "", "", "", "", "ELEMENT DOCTYPE ATTLIST ENTITY NOTATION", "", "", "" };
 
 
-EDITLEXER lexXML = { SCLEX_XML, "XML Document", "xml;xsl;svg;xul;xsd;xslt;axl;rdf;vcproj;manifest", "", &KeyWords_XML, {
+EDITLEXER lexXML = { SCLEX_XML, "XML Document", "xml;xsl;svg;xul;xsd;xslt;axl;rdf;vcproj;manifest;xaml;rss", "", &KeyWords_XML, {
                      { STYLE_DEFAULT, "Default", "", "" },
                      //{ SCE_H_DEFAULT, "Default", "", "" },
                      { SCE_H_TAG, "XML Tag", "fore:#800080", "" },
                      { SCE_H_TAGEND, "XML Closing Tag", "fore:#800080", "" },
                      //{ SCE_H_TAGUNKNOWN, "XML Unknown Tag", "fore:#000080", "" },
                      { SCE_H_ATTRIBUTE, "XML Attribute", "fore:#FF0000", "" },
                      //{ SCE_H_ATTRIBUTEUNKNOWN, "XML Unknown Attribute", "fore:#FF0000", "" },
                      { SCE_H_VALUE, "XML Value", "fore:#3A6EA5", "" },
@@ -413,17 +413,17 @@ KEYWORDLIST KeyWords_CPP = {
 "interface latexonly li line link mainpage name namespace nosubgrouping note "
 "overload p page par param post pre ref relates remarks return retval sa "
 "section see showinitializer since skip skipline struct subsection test throw "
 "todo typedef union until var verbatim verbinclude version warning "
 "weakgroup $ @ \\ & < > # { }",
 "", "", "", "", "", "" };
 
 
-EDITLEXER lexCPP = { SCLEX_CPP, "C/C++ Source Code", "c;cpp;cxx;cc;h;hpp;hxx;hh", "", &KeyWords_CPP, {
+EDITLEXER lexCPP = { SCLEX_CPP, "C/C++ Source Code", "c;cpp;cxx;cc;h;hpp;hxx;hh;m;mm", "", &KeyWords_CPP, {
                      { STYLE_DEFAULT, "Default", "", "" },
                      //{ SCE_C_DEFAULT, "Default", "", "" },
                      { SCE_C_COMMENT, "Comment", "fore:#008000", "" },
                      { SCE_C_COMMENTLINE, "Comment Line", "fore:#008000", "" },
                      { SCE_C_COMMENTDOC, "Comment Doc", "fore:#008000", "" },
                      { SCE_C_COMMENTLINEDOC, "Comment Line Doc", "fore:#008000", "" },
                      { SCE_C_WORD, "Keyword", "fore:#0A246A;bold", "" },
                      { SCE_C_IDENTIFIER, "Identifier", "", "" },
@@ -496,17 +496,17 @@ KEYWORDLIST KeyWords_RC = {
 "DIALOGEX DISCARDABLE EDITTEXT END EXSTYLE FONT GROUPBOX "
 "ICON LANGUAGE LISTBOX LTEXT MENU MENUEX MENUITEM "
 "MESSAGETABLE POPUP PUSHBUTTON RADIOBUTTON RCDATA RTEXT "
 "SCROLLBAR SEPARATOR SHIFT STATE3 STRINGTABLE STYLE "
 "TEXTINCLUDE VALUE VERSION VERSIONINFO VIRTKEY",
 "", "", "", "", "", "", "", "" };
 
 
-EDITLEXER lexRC = { SCLEX_CPP, "Resource Script", "rc;rc2;rct;dlg", "", &KeyWords_RC, {
+EDITLEXER lexRC = { SCLEX_CPP, "Resource Script", "rc;rc2;rct;dlg;r", "", &KeyWords_RC, {
                     { STYLE_DEFAULT, "Default", "", "" },
                     //{ SCE_C_DEFAULT, "Default", "", "" },
                     { SCE_C_COMMENT, "Comment", "fore:#008000", "" },
                     { SCE_C_COMMENTLINE, "Comment Line", "fore:#008000", "" },
                     { SCE_C_COMMENTDOC, "Comment Doc", "fore:#008000", "" },
                     { SCE_C_WORD, "Keyword", "fore:#0A246A;bold", "" },
                     { SCE_C_IDENTIFIER, "Identifier", "", "" },
                     { SCE_C_NUMBER, "Number", "fore:#FF0000", "" },