diff --git a/addon/Notepad++/Readme.txt b/addon/Notepad++/Readme.txt
index 8adb6956b..7c223e961 100644
--- a/addon/Notepad++/Readme.txt
+++ b/addon/Notepad++/Readme.txt
@@ -1,6 +1,7 @@
 YaCy lng highlighting for Notepad++
 
-To enable the highlighting of YaCy lng files simply copy the file userDefineLang.xml into your Notepad++ root directory.
+To enable the highlighting of YaCy lng files simply copy the file userDefineLang.xml into your %APPDATA%\Notepad++ directory.
+If you installed Notepad++ with the "Dont use %APPDATA%" option copy the file directly into the Notepad++ root directory.
 
 If you have already created other user defined languages merge the content of your existing userDefineLang.xml with the contents of ours.
 
diff --git a/addon/Notepad++/userDefineLang.xml b/addon/Notepad++/userDefineLang.xml
index 39591c32d..32daad6de 100644
--- a/addon/Notepad++/userDefineLang.xml
+++ b/addon/Notepad++/userDefineLang.xml
@@ -1,15 +1,22 @@
+<!-- This is a language definition file for the YaCy translation .lng files to be used for the Notepad++ editor available here: http://notepad-plus.sourceforge.net -->
+<!-- Put this file into your  %APPDATA%\Notepad++ directory to have syntax highlighting support for the YaCy .lng files automatically -->
+<!-- The language also shows in the Language menu as "YaCy lng" in the user defined section -->
+<!-- Known bugs: - Unescaped # also are displayed as comments in the middle of the line -->
+<!-- 2010-01-20 Tested with Notepad++ v4.2.2 by Michael Benz (mikeworks) -->
+<!-- 2010-01-20 Tested with Notepad++ v5.6.4 by Michael Benz (mikeworks) -->
 <NotepadPlus>
     <UserLang name="YaCy lng" ext="lng">
         <Settings>
             <Global caseIgnored="no" />
-            <TreatAsSymbol comment="no" commentLine="no" />
+            <TreatAsSymbol comment="no" commentLine="yes" />
             <Prefix words1="no" words2="no" words3="no" words4="no" />
         </Settings>
         <KeywordLists>
-            <Keywords name="Delimiters">=00=00</Keywords>
+            <Keywords name="Delimiters">&quot;&apos;0&quot;&apos;0</Keywords>
             <Keywords name="Folder+">#---------------------------</Keywords>
             <Keywords name="Folder-">#-----------------------------</Keywords>
-            <Keywords name="Comment"> 1 2 0#</Keywords>
+            <Keywords name="Operators">=</Keywords>
+            <Keywords name="Comment">1 2 0#</Keywords>
             <Keywords name="Words1">#File:</Keywords>
             <Keywords name="Words2"></Keywords>
             <Keywords name="Words3"></Keywords>
@@ -20,15 +27,15 @@
             <WordsStyle name="FOLDEROPEN" styleID="12" fgColor="FF0000" bgColor="FFFFFF" fontName="" fontStyle="3" />
             <WordsStyle name="FOLDERCLOSE" styleID="13" fgColor="FF0000" bgColor="FFFFFF" fontName="" fontStyle="3" />
             <WordsStyle name="KEYWORD1" styleID="5" fgColor="FF0000" bgColor="FFFFFF" fontName="" fontStyle="0" fontSize="10" />
-            <WordsStyle name="KEYWORD2" styleID="6" fgColor="FF0000" bgColor="FFFFFF" fontName="" fontStyle="0" />
+            <WordsStyle name="KEYWORD2" styleID="6" fgColor="000000" bgColor="FFFFFF" fontName="" fontStyle="1" />
             <WordsStyle name="KEYWORD3" styleID="7" fgColor="000000" bgColor="FFFFFF" fontName="" fontStyle="0" />
             <WordsStyle name="KEYWORD4" styleID="8" fgColor="000000" bgColor="FFFFFF" fontName="" fontStyle="0" />
-            <WordsStyle name="COMMENT" styleID="1" fgColor="FF8040" bgColor="FFFFFF" fontName="" fontStyle="0" />
-            <WordsStyle name="COMMENT LINE" styleID="2" fgColor="008000" bgColor="FFFFFF" fontName="" fontStyle="0" />
+            <WordsStyle name="COMMENT" styleID="1" fgColor="00AA00" bgColor="FFFFFF" fontName="" fontStyle="0" />
+            <WordsStyle name="COMMENT LINE" styleID="2" fgColor="00AA00" bgColor="FFFFFF" fontName="" fontStyle="2" />
             <WordsStyle name="NUMBER" styleID="4" fgColor="000000" bgColor="FFFFFF" fontName="" fontStyle="0" />
-            <WordsStyle name="OPERATOR" styleID="10" fgColor="000000" bgColor="FFFFFF" fontName="" fontStyle="0" />
-            <WordsStyle name="DELIMINER1" styleID="14" fgColor="8000FF" bgColor="FFFFFF" fontName="" fontStyle="0" />
-            <WordsStyle name="DELIMINER2" styleID="15" fgColor="000000" bgColor="FFFFFF" fontName="" fontStyle="0" />
+            <WordsStyle name="OPERATOR" styleID="10" fgColor="000000" bgColor="FFFFFF" fontName="" fontStyle="1" />
+            <WordsStyle name="DELIMINER1" styleID="14" fgColor="8080C0" bgColor="FFFFFF" fontName="" fontStyle="0" />
+            <WordsStyle name="DELIMINER2" styleID="15" fgColor="8080C0" bgColor="FFFFFF" fontName="" fontStyle="0" />
             <WordsStyle name="DELIMINER3" styleID="16" fgColor="000000" bgColor="FFFFFF" fontName="" fontStyle="0" />
         </Styles>
     </UserLang>