diff --git a/PowerEditor/bin/NppHelp.chm b/PowerEditor/bin/NppHelp.chm
index 1cd9d3c12..b195535cc 100644
Binary files a/PowerEditor/bin/NppHelp.chm and b/PowerEditor/bin/NppHelp.chm differ
diff --git a/PowerEditor/bin/change.log b/PowerEditor/bin/change.log
index 279873180..c96d71d00 100644
--- a/PowerEditor/bin/change.log
+++ b/PowerEditor/bin/change.log
@@ -1,108 +1,52 @@
-Notepad++ v5.4.5 fixed bugs (from v5.4.4) :
-
-1.  Fix plugins shortcuts not working bug.
-2.  Fix the tooltip on toolbar display bug for the plugins icons.
-3.  Fix a crash that was occurring when searching in files from a deep path.
-4.  Fix a crash issue (Unicode binary) while close Notepad++ with an RC file opened under Chinese Xp.
-5.  Fix Pascal and Scheme syntax highlighting problem (fixes in styles.xml).
-6.  Add SQL folding capacity.
-
-
-Notepad++ v5.4.4 fixed bugs (from v5.4.3) :
-
-1.  Upgrade Scintilla from 1.77 to 1.78.
-2.  Fix XML syntax highlighting bug while presence of the tag "<script/>" (Yes, finally).
-3.  Fix Find in files/Find in all open files bug in non western languages (ie. Russian, Chinese, Hebrew...).
-4.  Fix the find in files crash issue if find what field contains 0x0A or 0xD.
-5.  Fix Window7 SetWindowsHookEx() failed issue for the dockable windows. (by recognizing windows7 environment)
-6.  Fix no tool bar bug under w2k. 
-7.  Fix Incremental search bug while clicking on text zone after some searches.
-8.  Fix Matlab script making Notepad++ crash under Chinese windows issue.
-9.  Make NpWiki++ link available as on line help. 
-10. Add lines count on status bar.
-11. Fix "In selection" bug in Find Replace features.
-12. Fix the clickable link issue for some links (add '~' in RegExp).
-13. Fix the bug that Notepad++ does not show on while it is minimized and its file is modified from outside.
-
-
-Notepad++ v5.4.3 fixed bugs (from v5.4.2) :
-
-1.  Fix clickable link styling bug.
-2.  Fix document tab click launching a new instance bug.
-
-
-Notepad++ v5.4.2 fixed bugs (from v5.4.1) :
-
-1.  Fix the localization switcher bug while w/o doLocalConf.xml.
-2.  Fix only one document "Move to other view" close Notepad++ instance issue.
-3.  Fix plugin menu boolean check box bug.
-
-
-Notepad++ v5.4.1 new features and fixed bugs (from v5.4) :
-
-1.  Add ChangeMarkers plugin in installer. 
-2.  Add theme description in installer.
-3.  Make installer update contextMenu.xml (backup the old one then override it with the new one).
-4.  Fix lastRecentFileList localization issue.
-5.  Add readonly change status notification for plugin system.
-6.  Fix Styler Configurator user extension handler.
-
-
-Notepad++ v5.4 new features and fixed bugs (from v5.3.1) :
-
-1.  Add theme selector to switch styles.xml on the fly, change styles.xml on one click.
-2.  Add google chrome drag and derop tab feature : drag out tab to create a new instance, transfer documents among several instances by drag and drop.
-3.  Add Mark all extension : user can mark any occurrence with 5 different colours.
-4.  Add new feature : column selection allows to insertion a string by typing characters in sequence (w/o column mode editor).
-5.  Detect UTF16 encoding (BE and LE) w/o BOM.
-6.  Fix crash bug : Double click a file associated with an older version of Notepad++ while a newer version of Notepad++ instance is running.
-7.  lmprove main menu structure (more compact). Language Menu can be compacted as well (optional, in Preference dialog).
-8.  Fine numbers margin width is changed dynamically according to the needed space (but keeping at least 3 digits).
-9.  File history list (under the File menu) is limited to 100 characters per item. Longer file names are fitted to 100 characters by replacing path components with ellipses.
-10. Update Scintilla from v1.75 to v1.77.
-11. Indent guideline can be shown w/o whitespace or tab symbol.
-12. Fixed two bugs when calculating the width of the TaskList (document list when pressing ctrl+tab or right-click + mouse wheel.
-13. Add an (hidden) option to make the "Filters" and "Directory" fields follow the current opened document in "Find in files" dialog. The new parameters are located in config.xml and are called: "fifFilterFollowsDoc" and "fifFolderFollowsDoc" (set to "yes"/"no")
-14. Add new command parameters : -c (column) -x et -y (startup position).
-15. Remove change line marker which does not work correctly. Include ChangeMarkers plugin instead.
-16. Fix bug "Switch to found results window" command now switches back to the current edit view if the focus is already on the found results.
-17. Fix the search result inaccurate colorization bug.
-18. Fix the Mark all in selection bug (while Find Replace Dialog loosing the focus).
-19. Add 2 plugins messages : NPPN_FILEBEFORELOAD and NPPN_FILELOADFAILED.
-20. Fix New document not be switched while double clicking in Find in files result panel.
-21. Fix conversion min to Maj and Maj to min (or vice et versa) in column selection bug.
-22. Fix bug when the find dialog was closed the translucaent shadow remained in Windows 7.
-23. Fix crash bug of find in files feature.
-24. Add "follow current doc" checkbox in Find in file dialog.
-25. Add the ability of tag match feature to not highlight comment zone in html/xml.
-26. Fix TCL language highlighting bug.
+Notepad++ v5.5 new features and fixed bugs (from v5.4.5) :
 
+1.  Update : upgrade Scintilla from v1.78 to v2.01.
+2.  New feature : virtual space for column mode.
+3.  New feature : multi-editing / selection.
+4.  New feature : tab settings for per language.
+5.  New feature : selected lines moving up/down capacity.
+6.  New feature : incremental Search shows pink background when text not found (like Firefox).
+7.  New feature : rational number is recognized in User Defined Language System.
+8.  New feature : escape character capacity for the delimiter in User Defined Language System.
+9.  Bug fixed : tool bar tip crash issue.
+10. Bug fixed : column editor inserting octal number broken issue.
+11. Changed behaviour : "-nosession" parameter's not only none of session is loaded, but also none of session is saved.
+12. Bug fixed : docking feature crash issue.
+13. New feature : the ability to not launch Auto-updater during a period (15 days by default).
+14. New feature : import plugins feature (load on the fly).
+15. New feature : import theme (stylers.xml) feature.
+16. Bug fixed : a crash issue while launch Fin in file (regression since v5.4.5).
+17. Bug fixed : a crash issue while deleting the last line.
+18. Bug fixed : a bug of plugin message NPPM_GETPLUGINSCONFIGDIR (regression since v5.4.5).
+19. New feature :  new plugin notification NPPN_DOCORDERCHANGED to notify plugins that document order is changed.
+20. Bug fixed : tool bar chevron disappeared bug (regression since previous versions).
+21. Bug fixed : a crash bug due to instability of FTP_synchronize plugin (enhance Docking feature).
+22. Bug fixed : getting fonts problem under Chines/Korean/Japanese environment.
+23. Bug fixed : wrong File encoding auto-detection problem : binary file is detected as UTF-16 big-endian.
 
 
 Included plugins (Unicode):
 
 1.  TextFX v0.26
-2.  NppExec v0.3 RC1
-3.  Spell Checker v1.3.2
+2.  NppExec v0.3.2
+3.  Spell Checker v1.3.3
 4.  MIME Tools v1.5
-5.  FTP_synchronize v0.9.6
-6.  NppExport v0.2.8
-7.  Doc Monitor v2.2
-8.  NppNetNote v0.1
-9.  ChangeMarkers 1.2.1
-10. Compare Plugin 1.5.4
+5.  NppExport v0.2.8
+6.  Doc Monitor v2.2
+7.  NppNetNote v0.1
+8.  Compare Plugin 1.5.5
+9.  Plugin Manager 0.9.2.1
 
 Included plugins (ANSI):
 
 1.  TextFX v0.25
-2.  NppExec v0.3 RC1
-3.  Spell Checker v1.3.1
+2.  NppExec v0.3.2
+3.  Spell Checker v1.3.3
 4.  MIME Tools v1.5
-5.  FTP_synchronize v0.9.6
-6.  NppExport v0.2.8
-7.  Light Explorer v1.5
-8.  Doc Monitor v2.2
-9.  NppNetNote v0.1
-10. ChangeMarkers 1.2.1
-11. Compare Plugin 1.5.4
+5.  NppExport v0.2.8
+6.  Light Explorer v1.5
+7.  Doc Monitor v2.2
+8.  NppNetNote v0.1
+9.  Compare Plugin 1.5.5
+10. Plugin Manager 0.9.2.1
 
diff --git a/PowerEditor/misc/npp.help/HTML/Auto Completion.html b/PowerEditor/misc/npp.help/HTML/Auto Completion.html
index 89ac9320e..9cd82b121 100644
--- a/PowerEditor/misc/npp.help/HTML/Auto Completion.html	
+++ b/PowerEditor/misc/npp.help/HTML/Auto Completion.html	
@@ -32,5 +32,5 @@ tasks. The calltip will highlight the current parameter being edited
 for a quick emphasis on what is actually needed. It is purely
 passive and will not modify the text in any way. To trigger a calltip (if one can be found), select <span class="menu_item">Edit-&gt;Auto-Completion-&gt;Function parameters hint</span>.<p>Autocompletion
 is language based (see <a href="Languages.html">Languages</a>) and has different API files for
-each language. For more details on these API files and how to make your own, refer to <a target="_blank" href="http://apps.sourceforge.net/mediawiki/notepad-plus/index.php?title=Auto_Completion">NpWiki++</a>.
+each language. For more details on these API files and how to make your own, refer to <a target="_blank" href="http://sourceforge.net/apps/mediawiki/notepad-plus/index.php?title=Auto_Completion">NpWiki++</a>.
 </body></html>
\ No newline at end of file
diff --git a/PowerEditor/misc/npp.help/HTML/Bug Reports.html b/PowerEditor/misc/npp.help/HTML/Bug Reports.html
index 434e4abf3..b1a96703d 100644
--- a/PowerEditor/misc/npp.help/HTML/Bug Reports.html	
+++ b/PowerEditor/misc/npp.help/HTML/Bug Reports.html	
@@ -18,7 +18,7 @@ the forums: maybe other users noticed it as well and found a fix or
 are in discussion.<p>
 Check
 the Bug tracker
-(<a target="_blank" href="https://sourceforge.net/tracker2/?group_id=95717&amp;atid=612382">https://sourceforge.net/tracker2/?group_id=95717&amp;atid=612382</a>):
+(<a target="_blank" href="http://sourceforge.net/tracker2/?group_id=95717&amp;atid=612382">http://sourceforge.net/tracker2/?group_id=95717&amp;atid=612382</a>):
 maybe the bug is already detected and added to the list. Search for
 it and if it's not there, you can add it and help the developers find
 and fix it (always be very clear what the problem is, what causes it
diff --git a/PowerEditor/misc/npp.help/HTML/Built-in Languages.html b/PowerEditor/misc/npp.help/HTML/Built-in Languages.html
index 92a64d732..f9eafe236 100644
--- a/PowerEditor/misc/npp.help/HTML/Built-in Languages.html	
+++ b/PowerEditor/misc/npp.help/HTML/Built-in Languages.html	
@@ -1,9 +1,9 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html><head><meta content="text/html; charset=UTF-8" http-equiv="content-type"><title>Built-in Languages</title>
-<link rel="stylesheet" href="styles.css" type="text/css">
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html><head><meta content="text/html; charset=UTF-8" http-equiv="content-type"><title>Built-in Languages</title>
+<link rel="stylesheet" href="styles.css" type="text/css">
 </head>
-<body>
-<h1>Built-in languages</h1>
+<body>
+<h1>Built-in languages</h1>
 <p>Standard
 Notepad++ comes preloaded with a list with some of the most popular
 languages. You can select those languages using the Language
@@ -13,5 +13,5 @@ extension or filename (as is the case for makefiles) but you can always
 select another one. When saving a session, the selected language will
 be remembered, but closing and reopening the file will trigger the
 autodetection again. You can change the extensions that are associated
-with a language using the <a href="Styler%20Configurator.html#Extension">Styler Configurator</a>.
+with a language using the <a href="Styler%20Configurator.html#Extension">Styler Configurator</a>. Also, custom keywords can be added to most languages: when selecting an adequate (language, style item) pair, the Styler Configurator displayys a text area where extra keywords can be typed in, separated with spaces.
 </body></html>
\ No newline at end of file
diff --git a/PowerEditor/misc/npp.help/HTML/Command Line.html b/PowerEditor/misc/npp.help/HTML/Command Line.html
index 95f2a609b..4705858e2 100644
--- a/PowerEditor/misc/npp.help/HTML/Command Line.html	
+++ b/PowerEditor/misc/npp.help/HTML/Command Line.html	
@@ -30,15 +30,15 @@ just do not wish to load them, add this option.
 <dt>-ro
 <dd>Any file now opened will be opened in Read only mode.
 <dt>-nosession
-<dd> Do not load the previous session if Notepad++ is started.
+<dd> Do not load the previous session if Notepad++ is started. Do not save the session on exit either.
 <dt>-notabbar
 <dd> Hide the Tab Bar, even if the settings say otherwise.
 <dt>-n<span style="font-weight: normal;"><i>line number</i></span>
 <dd>Line number to go to for each file opened. 
 <dt>-x<span style="font-weight: normal;"><i>line number</i></span>
-Specify the horizontal position (in pixels) at which Notepad++ main window is to open.
+<dd>Specify the horizontal position (in pixels) at which Notepad++ main window is to open.
 <dt>-y<span style="font-weight: normal;"><i>line number</i></span>
-Specify the vertical position (in pixels) at which Notepad++ main window is to open.
+<dd>Specify the vertical position (in pixels) at which Notepad++ main window is to open.
 <dt>-l<span style="font-weight: normal;"><i>language short name</i></span>
 <dd>Language to set for each file opened. $$$ is a short identifier
 string, of which the following are allowed:<br></font><table style="text-align: left; width: 100%;" border="1" cellpadding="2" cellspacing="0" ><tbody><tr><td style="background-color:aquamarine;">normal, php, c, cpp, cs, objc,
diff --git a/PowerEditor/misc/npp.help/HTML/Context Menu.html b/PowerEditor/misc/npp.help/HTML/Context Menu.html
index 269ce061f..8c370fcd1 100644
--- a/PowerEditor/misc/npp.help/HTML/Context Menu.html	
+++ b/PowerEditor/misc/npp.help/HTML/Context Menu.html	
@@ -8,5 +8,5 @@ context menu can be reached by <span class="shortcut">rightclicking</span> anywh
 screen. The context menu allows for quick access to commonly used
 commands and is user configurable. To change the contents of the
 context menu, you have to edit the contextMenu.xml file. For this we
-refer you to<br><a target="_blank" href="https://apps.sourceforge.net/mediawiki/notepad-plus/index.php?title=Context_Menu">NpWiki++</a>
+refer you to<br><a target="_blank" href="http://sourceforge.net/apps/mediawiki/notepad-plus/index.php?title=Context_Menu">NpWiki++</a>
 </body></html>
\ No newline at end of file
diff --git a/PowerEditor/misc/npp.help/HTML/Editing_Scint.html b/PowerEditor/misc/npp.help/HTML/Editing_Scint.html
index bba5c212e..dba547675 100644
--- a/PowerEditor/misc/npp.help/HTML/Editing_Scint.html
+++ b/PowerEditor/misc/npp.help/HTML/Editing_Scint.html
@@ -7,4 +7,4 @@ the keyboard (or the standard Input Method Editor (IME) for eastern asian langua
 needed. However, Notepad++ has many tools and aids to assist in editing
 files, mainly to automate repetitive tasks or speed up development.<p>Notepad++
 is based on the Scintilla edit control and relies on it to perform many
-editing tasks, supplementing it if useful.<br><p><a href="Standard%20Operations.html">Standard Operations</a></p><p><a href="Indentation.html">Indentation</a></p><p><a href="Overtype.html">Overtype</a></p><p><a href="Auto%20Completion.html">Auto Completion</a></p><p><a href="Column%20Mode%20Editing.html">Column Mode Editing</a></p><p><a href="Commenting.html">Commenting</a></p><p><a href="Other%20editing%20tools.html">Other editing tools</a></p></body></html>
\ No newline at end of file
+editing tasks, supplementing it if useful.<br><p><a href="Standard%20Operations.html">Standard Operations</a></p><p><a href="Indentation.html">Indentation</a></p><p><a href="Selecting.html">Selecting text</a></p><p><a href="Overtype.html">Overtype</a></p><p><a href="Auto%20Completion.html">Auto Completion</a></p><p><a href="Column%20Mode%20Editing.html">Column Mode Editing</a></p><p><a href="Commenting.html">Commenting</a></p><p><a href="Other%20editing%20tools.html">Other editing tools</a></p></body></html>
\ No newline at end of file
diff --git a/PowerEditor/misc/npp.help/HTML/Feature Requests.html b/PowerEditor/misc/npp.help/HTML/Feature Requests.html
index 01d8f7cc6..f468fb362 100644
--- a/PowerEditor/misc/npp.help/HTML/Feature Requests.html	
+++ b/PowerEditor/misc/npp.help/HTML/Feature Requests.html	
@@ -6,9 +6,9 @@
 <p>If
 you have a (very) good idea on how to improve Notepad++, you can
 request a feature using the Feature Request tracker
-(<a target="_blank" href="https://sourceforge.net/tracker2/?group_id=95717&amp;atid=612385">https://sourceforge.net/tracker2/?group_id=95717&amp;atid=612385</a>).
+(<a target="_blank" href="http://sourceforge.net/tracker2/?group_id=95717&amp;atid=612385">http://sourceforge.net/tracker2/?group_id=95717&amp;atid=612385</a>).
 If it hasn't been asked for before, you can do so here. There is no
 guarantee it will be added however; what is a great feature for one
 person might be a big nuisance for another, or it simply is too
-difficult or time consuming to add it in. Also, some feature requests would involve modifying the Scintilla component, which would prove unpractical. In such a case, the feature request would be better filed with <a href="https://sourceforge.net/projects/scintilla/">the Scintilla project</a> 
+difficult or time consuming to add it in. Also, some feature requests would involve modifying the Scintilla component, which would prove unpractical. In such a case, the feature request would be better filed with <a href="http://sourceforge.net/projects/scintilla/">the Scintilla project</a> 
 </body></html>
\ No newline at end of file
diff --git a/PowerEditor/misc/npp.help/HTML/Incremental search.html b/PowerEditor/misc/npp.help/HTML/Incremental search.html
index 3e3275139..ed49769da 100644
--- a/PowerEditor/misc/npp.help/HTML/Incremental search.html	
+++ b/PowerEditor/misc/npp.help/HTML/Incremental search.html	
@@ -6,9 +6,10 @@
 open the Incremental Search dialog, select <span class="menu_item">Search-&gt;Incremental
 Search</span>. This is a fast
 means to find the first occurrence of some text and then find all
-consecutive results. You can color all occurrences by enabling the
-<span class="checkbox">Highlight All </span>option, the color can be adjusted using the <a href="Styler%20Configurator.html#Incremental_highlight_all">Styler Configurator</a>. The <span class="checkbox">Match Case</span> option only results in hits that
-have the same case as the query.</font>
+consecutive results.</p>
+<ul><li> You can color all occurrences by enabling the
+<span class="checkbox">Highlight All </span>option. The color can be adjusted using the <a href="Styler%20Configurator.html#Incremental_highlight_all">Styler Configurator</a>. </li><li>If no text is found, the text area shows it by changing its background to pink - like the Firefox Search current web page control does. </li><li>The <span class="checkbox">Match Case</span> option only results in hits that
+have the same case as the query.</li><li>
 The
 <span class="button">&gt;</span> button searches for the next occurrence, the <span class="button">&lt;</span> button for the
-previous one.<br>The <span class="button">X</span> button will close the Incremental Search dialog.</font></body></html>
\ No newline at end of file
+previous one.</li></ul></p><p>Finally, the <span class="button">X</span> button will close the Incremental Search dialog.</p></body></html>
\ No newline at end of file
diff --git a/PowerEditor/misc/npp.help/HTML/Indentation.html b/PowerEditor/misc/npp.help/HTML/Indentation.html
index 0110dd594..16ec7f922 100644
--- a/PowerEditor/misc/npp.help/HTML/Indentation.html
+++ b/PowerEditor/misc/npp.help/HTML/Indentation.html
@@ -20,7 +20,7 @@ beginning of each line that has any selected text, allowing to indent
 entire blocks of text at once. Pressing <span class="shortcut">Shift-TAB</span> will remove the
 indentation.
 <p> Indentation is done in levels, each level adding a
-predefined amount of whitespace (this amount can be configured, see <a href="Preferences.html#Edit_Components">Preferences</a>). There is also an option of choosing whether
+predefined amount of whitespace (this amount can be configured on a per language basis, see <a href="Preferences.html#Edit_Components">Preferences</a>). There is also an option of choosing whether
 to insert a TAB character or (multiple) spaces (for this, also see&nbsp;<a href="Preferences.html#Edit_Components">Preferences</a>).
 <p>Scintilla can show a line/guide for each
 level, which can be toggled by selecting <span class="menu_item">View-&gt;Show Symbol-&gt;Show Indent Guide</span>
diff --git a/PowerEditor/misc/npp.help/HTML/Main website and Forums.html b/PowerEditor/misc/npp.help/HTML/Main website and Forums.html
index 01e9a681b..149e54431 100644
--- a/PowerEditor/misc/npp.help/HTML/Main website and Forums.html	
+++ b/PowerEditor/misc/npp.help/HTML/Main website and Forums.html	
@@ -7,12 +7,12 @@
 can find further information and help for Notepad++ at:
 <dl>
 <dt>The forums:
-<dd><a target="_blank" href="https://sourceforge.net/forum/?group_id=95717">https://sourceforge.net/forum/?group_id=95717</a>
+<dd><a target="_blank" href="http://sourceforge.net/forum/?group_id=95717">http://sourceforge.net/forum/?group_id=95717</a>
 <dt>The
 Wiki, known as NpWiki++:
-<dd><a target="_blank" href="http://apps.sourceforge.net/mediawiki/notepad-plus/index.php?title=Main_Page">http://apps.sourceforge.net/mediawiki/notepad-plus/index.php?title=Main_Page</a>
+<dd><a target="_blank" href="http://sourceforge.net/apps/mediawiki/notepad-plus/index.php?title=Main_Page">http://sourceforge.net/apps/mediawiki/notepad-plus/index.php?title=Main_Page</a>
 <dt>IdeaTorrent:
-<dd><a target="_blank" href="https://sourceforge.net/apps/ideatorrent/notepad-plus/">https://sourceforge.net/apps/ideatorrent/notepad-plus/</a>
+<dd><a target="_blank" href="http://sourceforge.net/apps/ideatorrent/notepad-plus/">http://sourceforge.net/apps/ideatorrent/notepad-plus/</a>
 <dt>and
 of course the main site:</font>
 <dd><a target="_blank" href="http://notepad-plus.sourceforge.net/">http://notepad-plus.sourceforge.net/</a>
diff --git a/PowerEditor/misc/npp.help/HTML/Normal Search.html b/PowerEditor/misc/npp.help/HTML/Normal Search.html
index 7f1589fff..36406f3f9 100644
--- a/PowerEditor/misc/npp.help/HTML/Normal Search.html	
+++ b/PowerEditor/misc/npp.help/HTML/Normal Search.html	
@@ -84,7 +84,7 @@ engine, it is the same as with SciTE, so a full list of regex options
 can be found here (with the difference that POSIX mode is always on,
 this is not an option): <a target="_blank" href="http://www.scintilla.org/SciTERegEx.html">http://www.scintilla.org/SciTERegEx.html</a>
 with
-some examples here:<a target="_blank" href="http://apps.sourceforge.net/mediawiki/notepad-plus/index.php?title=">Regular_Expressions</font></a>
+some examples here:<a target="_blank" href="http://sourceforge.net/apps/mediawiki/notepad-plus/index.php?title=">Regular_Expressions</font></a>
 </li></ul>
 <p>The
 search direction determines to what relative direction of the cursor
diff --git a/PowerEditor/misc/npp.help/HTML/Other editing tools.html b/PowerEditor/misc/npp.help/HTML/Other editing tools.html
index 8c44e60ed..e7d690cc3 100644
--- a/PowerEditor/misc/npp.help/HTML/Other editing tools.html	
+++ b/PowerEditor/misc/npp.help/HTML/Other editing tools.html	
@@ -8,6 +8,6 @@ Look
 in the Edit menu for more editing capabilities, or in the
 Shortcut Mapper under the Scintilla section (see <a href="Shortcut%20Mapper.html">Shortcut
 Mapper</a> for more details). It is mostly for working on a per line
-basis. The Trim Trailing Space macro will remove any trailing
+basis. The <span class="menu_item">Edit -> Trim Trailing Space</span> command will remove any trailing
 whitespace from selected lines.
 </body></html>
\ No newline at end of file
diff --git a/PowerEditor/misc/npp.help/HTML/Patches.html b/PowerEditor/misc/npp.help/HTML/Patches.html
index 0597a79fb..51de68337 100644
--- a/PowerEditor/misc/npp.help/HTML/Patches.html
+++ b/PowerEditor/misc/npp.help/HTML/Patches.html
@@ -1,11 +1,11 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html><head><meta content="text/html; charset=UTF-8" http-equiv="content-type"><title>Patches</title>
 <link rel="stylesheet" href="styles.css" type="text/css"></head>
-<body><h1>Patches</h1>
+<body><h1>Patches</h1>
 <p>
 If you are a developer/contributor and already have an improvement ready for
 Notepad++, you can submit a patch using the patch tracker
-(<a target="_blank" href="https://sourceforge.net/tracker2/?group_id=95717&amp;atid=612384">https://sourceforge.net/tracker2/?group_id=95717&amp;atid=612384</a>).
+(<a target="_blank" href="http://sourceforge.net/tracker2/?group_id=95717&amp;atid=612384">http://sourceforge.net/tracker2/?group_id=95717&amp;atid=612384</a>).
 This is the great part of Open Source, you can add some stuff in as
-well :)
+well :)
 </body></html>
\ No newline at end of file
diff --git a/PowerEditor/misc/npp.help/HTML/Plugins.html b/PowerEditor/misc/npp.help/HTML/Plugins.html
index ec26b39e0..8d418f645 100644
--- a/PowerEditor/misc/npp.help/HTML/Plugins.html
+++ b/PowerEditor/misc/npp.help/HTML/Plugins.html
@@ -13,6 +13,7 @@ remove some. The plugins are located in the Plugins directory in the
 main Notepad++ installation directory. They are DLL files and simply
 removing or adding them is enough.
 <p>
+When Notepad++ starts, it looks into its Plugins configuration folder and loads whatever dll it finds. Later, you can add plugins using the <span class="menu_item">Settings -> Import -> Import plugins</span> menu.
 Be
 careful to make sure your version of Notepad++ is up-to-date enough
 for new plugins and that the plugin is compatible with Notepad++
@@ -23,9 +24,9 @@ not).
 Currently,
 Notepad++ can be found in an (older) ANSI version and the newer
 Unicode verison. The plugin has to match this version, otherwise it
-will not work (Notepad++ will warn you about this).</font>
+will not work (Notepad++ will warn you about this).
 Plugins
-can be found anywhere on the internet, but the “official”collection
+can be found anywhere on the internet, but a large
 can be found in the Notepad++ Plugins project on SourceForge.net:</font>
-<a target="_blank" href="https://sourceforge.net/projects/npp-plugins/">https://sourceforge.net/projects/npp-plugins/</a>
+<a target="_blank" href="http://sourceforge.net/projects/npp-plugins/">http://sourceforge.net/projects/npp-plugins/</a>. There is even a plugin, called Plugin Manager, which works out the installation details and version management for you.
 </body></html>
\ No newline at end of file
diff --git a/PowerEditor/misc/npp.help/HTML/Preferences.html b/PowerEditor/misc/npp.help/HTML/Preferences.html
index 82cb78d08..c46131af1 100644
--- a/PowerEditor/misc/npp.help/HTML/Preferences.html
+++ b/PowerEditor/misc/npp.help/HTML/Preferences.html
@@ -97,13 +97,9 @@ the size of the space character).
 rate</span> - Change from fast (F) to slow (S). Moving all the way to slow
 will stop the blinking.</font><br>You can change the caret color with the <a href="Styler%20Configurator.html#Caret_colour">Styler Configurator</a>.
 </li></ul>
-<dt>Tab settings
-<span style="font-weight:normal;">
-<ul><li><span class="label">Tab size</span> - Size in space characters of a tab character in the document.
-</li><li><span class="checkbox">Replace
-by space</span> - Checking this will cause any tabs added to be in the
-form of spaces, up to the amount as determined by the Tab size
-setting.</li></ul></span></dl>
+<dt>Multi-Editing
+<dd>You can enable or disable this feature through the checkbox. This both controls the ability to select multiple areas (see <a href="Selecting.html">Selecting text</a>) and to get typed text mirrored in all the areas in the selection.
+</dl>
 <p>
 The
 following options are changed per view (See <a href="Multi%20View.html">Multi View</a>). Select the
@@ -197,8 +193,8 @@ To remove the association, select the extension to dissociate and
 press the arrow next to the garbage can.
 <p>
 
-<h2><a name="Language_Menu"></a>Language
-Menu
+<h2><a name="</span>_Menu"></a>Language
+Menu/Tab settings
 </h2>You
 can select the languages that are available from the <span class="menu_item">Language</span> menu. In
 the <span class="label">Available Items</span> list are the languages that are currently
@@ -209,13 +205,17 @@ pressing the <span class="button">&lt;-</span> button.</font>
 <br>
 The appearance of the Language menu can be further controlled by the <span class="checkbox">Make Language menu Compact</span> checkbox. When checked, languages whose names start by the same letter are grouped into a submenu, rather than being all lumped in the menu proper.
 <p>
-
-<h2><a name="Print_-_Colour_and_Margin"></a>Print
-- Colour and Margin
-</h2>
+Tab settings can be adjusted on a per language basis. The right hand list has all built-in languages, as well as a topmost (Default) entry. The latter applies to all languages which don't have a custom setting, as well as to all user defined languages. The frame below allows adjusting tab settings for the selected language:
+<ul><li><span class="label">Tab size</span> - Size in space characters of a tab character in the document.
+</li><li><span class="checkbox">Replace
+by space</span> - Checking this will cause any tabs added to be in the
+form of spaces, up to the amount as determined by the Tab size
+setting.</li></ul>
+<p>
+<h2><a name="Print"></a>Print</h2>
 <p>Use
 these settings to adjust the layout and colors used when printing a
-document.
+document, as well as the page header and footer text. This can be any regular string or a variable that will change depending on the printed document.
 <p><ul><li>
 <span class="checkbox">Print
 line number</span> - If selected, linenumbers will be printed aswell.</li><li>
@@ -233,21 +233,12 @@ on white</span> - All text will be printed black and a white background.
 background color</span> - This will print all the text colored, but any
 background colors (including the default color) will be printed
 white.</li></ul>
-</li></ul><p>
-
-<h2><a name="Print_-_Header_and_Footer"></a>Print
-- Header and Footer</font>
-</h2>
-<p>Use
-these settings to control special text to appear at the documents
-edges. This can be any regular string or an variable that will change
-depending on the printed document.
-<p>
+</li></ul>
 <dl>
 <dt>Variables
 <dd>
 You can use <span class="label">Variable</span>:
-variable text inside the current header/footer. 
+variable text inside the current header/footer.
 There are a few default
 variables listed, but you can also use any variable used by the Run
 dialog (see <a href="Commands.html">Commands</a>) as well. The syntax 
@@ -387,6 +378,8 @@ other method of opening a file to load a session into Notepad++.
 <dt>Other options
 <span style="font-weight:normal;">
 <ul><li>
+<span class="checkbox">Enable Notepad++ auto-updater</span>: If checked, Notepad++ will attempt to find about an update at startup. You have the option of postponing the upgrade if one is found.
+</li><li>
 <span class="checkbox">Auto-indent</span> - 
 If checked, adding a new line will automatically indent that line
 if any line with text before it has indentation as well. The
diff --git a/PowerEditor/misc/npp.help/HTML/Printing.html b/PowerEditor/misc/npp.help/HTML/Printing.html
index 092680588..bbbcbec03 100644
--- a/PowerEditor/misc/npp.help/HTML/Printing.html
+++ b/PowerEditor/misc/npp.help/HTML/Printing.html
@@ -1,11 +1,11 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html><head><meta content="text/html; charset=UTF-8" http-equiv="content-type"><title>Printing</title>
 <link rel="stylesheet" href="styles.css" type="text/css"></head>
-<body><h1>Printing</h1>
+<body><h1>Printing</h1>
 <p>Notepad++ allows you to print a file with its
 current syntax coloring (see also the section about <a href="Languages.html">Languages</a>). If you
 select <span class="menu_item">File-&gt;Print</span>, the Print dialog will be shown allowing you to
 setup your printer before printing. Selecting <span class="menu_item">File-&gt;Print Now!</span> or
 clicking on <img style="width: 16px; height: 16px;" alt="" src="Images/Toolbar/print.png"> will immediately print the current file. To setup how a
-file should be printed, see <a href="Preferences.html#Print_-_Colour_and_Margin">Preferences</a>
+file should be printed, see <a href="Preferences.html#Print">Preferences</a>
 </body></html>
\ No newline at end of file
diff --git a/PowerEditor/misc/npp.help/HTML/Saving Sessions.html b/PowerEditor/misc/npp.help/HTML/Saving Sessions.html
index 63686c811..988e5c4a6 100644
--- a/PowerEditor/misc/npp.help/HTML/Saving Sessions.html	
+++ b/PowerEditor/misc/npp.help/HTML/Saving Sessions.html	
@@ -4,4 +4,5 @@
 </head>
 <body><h1>Saving sessions</h1>To save a session, select <span class="menu_item">File-&gt;Save
 Session</span> and select the location and name of the session to be saved.
-This is very similar to saving files, but instead for sessions.</body></html>
\ No newline at end of file
+This is very similar to saving files, but instead for sessions.
+</p><p>When the option to remember the last session is set in the Preferences dialog, Notepad++ automatically saves the current session on shutdown, except if it was launched with the -nosession command line option.</body></html>
\ No newline at end of file
diff --git a/PowerEditor/misc/npp.help/HTML/Settings.html b/PowerEditor/misc/npp.help/HTML/Settings.html
index 04ed83c92..5fdc12c83 100644
--- a/PowerEditor/misc/npp.help/HTML/Settings.html
+++ b/PowerEditor/misc/npp.help/HTML/Settings.html
@@ -1,8 +1,10 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html><head><meta content="text/html; charset=UTF-8" http-equiv="content-type"><title>Settings</title>
-<link rel="stylesheet" href="styles.css" type="text/css">
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html><head><meta content="text/html; charset=UTF-8" http-equiv="content-type"><title>Settings</title>
+<link rel="stylesheet" href="styles.css" type="text/css">
 </head>
 <body>
-<h1>Settings</h1>
-<p>Control some of the aspects of Notepad++. They are divided in three main groups:<br><p><a href="Preferences.html">Preferences</a></p><p><a href="Styler%20Configurator.html">Styler Configurator</a></p><p><a href="Shortcut%20Mapper.html">Shortcut Mapper</a></p><p></p>
+<h1>Settings</h1>
+<p>Control many the aspects of Notepad++. They are divided in three main groups:<br><p><a href="Preferences.html">Preferences</a></p><p><a href="Styler%20Configurator.html">Styler Configurator</a></p><p><a href="Shortcut%20Mapper.html">Shortcut Mapper</a></p><p></p>
+<p>
+The Shortcut Mapper is a list of keyboard shortcuts to everything that can have one in Notepad++. Styler Configurator allows changing the visual appearance of anything that has a colour or a font. The Preferences dialog manages everything else. While there are various aspects in Notepad++ that are not configurable, you may not even notice them.
 </body></html>
\ No newline at end of file
diff --git a/PowerEditor/misc/npp.help/HTML/Styler Configurator.html b/PowerEditor/misc/npp.help/HTML/Styler Configurator.html
index 1a1a94d32..a94698613 100644
--- a/PowerEditor/misc/npp.help/HTML/Styler Configurator.html	
+++ b/PowerEditor/misc/npp.help/HTML/Styler Configurator.html	
@@ -13,7 +13,6 @@ configurator has two lists. The left list (<span class="label">Language</span>)
 languages that can be styled, as well as other items with some color setting:
 <ul><li> Global Styles: controls the user interface colors. 
 </li><li>Search results: The text of the <a href="Search%window.html">Search results window</a>
-</li><li>Change markers: vertical bars that mark lines that have changed in a document since the last time it was loaded.
 </li><li>DOS style: Highlighting text as if displayed on a command.vom/cmd.exe shell window.
 </li></ul><p>
 The list on the right
@@ -38,7 +37,7 @@ enable transparent dialog. The slider controls the amount of
 transparency. Note that transparency is only available on Windows
 2000 and later.
 <dt>Style themes:
-<dd></span>A style theme is a complete collection of style properties (see below), foa all languages and global settings. At any given time, one theme is active, and you can change it at any time using the dropdown list at the top of the dialog. 
+<dd></span>A style theme is a complete collection of style properties (see below), foa all languages and global settings. At any given time, one theme is active, and you can change it at any time using the dropdown list at the top of the dialog. The list is read at startup from the themes\ configuration subfolder, but you can add to it later using the <span class="Menu">Preferences -> Import -> Import theme file(s)</span> command.
 <dt>Style properties:
 <dd>All styles have some properties assigned to them. Som
 styles have properties that others do not have, such as a background
@@ -227,14 +226,6 @@ the appearance of search results when shown in the <a href="Search%20window.html
 <dd>How this line shows. Right click the color to suppress this highlighting.
 </dl>
 <p>
-<h4>Change markers</h4>
-<p>
-There come in two flavours:
-<ul><li>Change - saved 
-</li><li>Change - not savd
-</li></ul>
-For each of them, the background color can be set.
-<p>
 <h4>Dos Style</h4>
 <p>
 The
diff --git a/PowerEditor/misc/npp.help/HTML/Tool Bar.html b/PowerEditor/misc/npp.help/HTML/Tool Bar.html
index d42c8c73d..dde3bf662 100644
--- a/PowerEditor/misc/npp.help/HTML/Tool Bar.html	
+++ b/PowerEditor/misc/npp.help/HTML/Tool Bar.html	
@@ -29,5 +29,5 @@ choose which mode to use, see <a href="Preferences.html#Global">Preferences</a>.
 load custom images for your toolbar, you need a special configuration
 file and the custom images. To learn how to use these, please see the
 following link for information:
-<br><a target="_blank" href="https://apps.sourceforge.net/mediawiki/notepad-plus/index.php?title=Toolbar_Customisation">https://apps.sourceforge.net/mediawiki/notepad-plus/index.php?title=Toolbar_Customisation</a>
+<br><a target="_blank" href="http://sourceforge.net/apps/mediawiki/notepad-plus/index.php?title=Toolbar_Customisation">http://sourceforge.net/apps/mediawiki/notepad-plus/index.php?title=Toolbar_Customisation</a>
 </body></html>
\ No newline at end of file
diff --git a/PowerEditor/misc/npp.help/HTML/User Defined languages.html b/PowerEditor/misc/npp.help/HTML/User Defined languages.html
index 79968dcd0..8581c7555 100644
--- a/PowerEditor/misc/npp.help/HTML/User Defined languages.html	
+++ b/PowerEditor/misc/npp.help/HTML/User Defined languages.html	
@@ -7,13 +7,13 @@
 defined languages allow you to add your own language to Notepad++.
 This is a very quick and easy way to do so.</font>
 Notepad++
-always has the main User Define language available. You can use this
+always has the main User Defined language available. You can use this
 to test your settings and then later on create a new language based
-on this. The User Define language gets reset each time you restart
+on this. The User Defined language gets reset each time you restart
 Notepad++, its settings will not be saved. User defined languages are
 available from the bottom of the language menu.<p>
 To
-define one, you need the User Define Dialog, which can be accessed by
+define one, you need the User Defined Dialog, which can be accessed by
 selecting <span class="menu_item">View-&gt;User Define Dialog...</span> or pressing the&nbsp;<img style="width: 16px; height: 16px;" alt="" src="Images/Toolbar/showPannel.png">  button.<p>
 The
 dialog can float like any regular dialog when open, or be docked in
@@ -85,10 +85,10 @@ are only recognized if they start a word with characters ranging from
 <p>This
 tab controls what operator symbols exists and what symbols act as
 delimiters. Operator symbols are characters that split two words.
-They behave much as whitespace but can be styled differently.</font>
+They behave much as whitespace but can be styled differently.</p><p>
 Delimiters
 are single characters and usually defined in pairs. Any text between
 a pair of delimiters as styled as such. A good example is a string,
 which is delimited on both sides with double quotes and drawn in a
-different color.
+different color. Since, in many languages, a string may contain the string delimiter with a special prefix, you can enable and choose this prefix, the escape character.
 </body></html>
\ No newline at end of file
diff --git a/PowerEditor/misc/npp.help/Table of Contents.hhc b/PowerEditor/misc/npp.help/Table of Contents.hhc
index 059dded42..773c59ae8 100644
--- a/PowerEditor/misc/npp.help/Table of Contents.hhc	
+++ b/PowerEditor/misc/npp.help/Table of Contents.hhc	
@@ -57,6 +57,12 @@
 			<param name="Name" value="Saving Sessions">
 			<param name="Local" value="HTML\Saving Sessions.html">
 			</OBJECT>
+	</UL>
+	<LI> <OBJECT type="text/sitemap">
+		<param name="Name" value="Editing">
+		<param name="Local" value="HTML\Editing_Scint.html">
+		</OBJECT>
+	<UL>
 		<LI> <OBJECT type="text/sitemap">
 			<param name="Name" value="Standard Operations">
 			<param name="Local" value="HTML\Standard Operations.html">
@@ -65,16 +71,14 @@
 			<param name="Name" value="Indentation">
 			<param name="Local" value="HTML\Indentation.html">
 			</OBJECT>
-	</UL>
-	<LI> <OBJECT type="text/sitemap">
-		<param name="Name" value="Editing">
-		<param name="Local" value="HTML\Editing_Scint.html">
-		</OBJECT>
-	<UL>
 		<LI> <OBJECT type="text/sitemap">
 			<param name="Name" value="Overtype">
 			<param name="Local" value="HTML\Overtype.html">
 			</OBJECT>
+		<LI> <OBJECT type="text/sitemap">
+			<param name="Name" value="Selecting text">
+			<param name="Local" value="HTML\Selecting.html">
+			</OBJECT>
 		<LI> <OBJECT type="text/sitemap">
 			<param name="Name" value="Auto Completion">
 			<param name="Local" value="HTML\Auto Completion.html">
diff --git a/PowerEditor/src/Notepad_plus.cpp b/PowerEditor/src/Notepad_plus.cpp
index 1fd49e2d9..bf1c77b3d 100644
--- a/PowerEditor/src/Notepad_plus.cpp
+++ b/PowerEditor/src/Notepad_plus.cpp
@@ -2659,10 +2659,8 @@ BOOL Notepad_plus::notify(SCNotification *notification)
 			::ScreenToClient(_hSelf, &p);
 			HWND hWin = ::RealChildWindowFromPoint(_hSelf, p);
 			const int tipMaxLen = 1024;
-			static TCHAR toolTip[tipMaxLen];
-			static TCHAR mainDocTip[tipMaxLen];
-			static TCHAR subDocTip[tipMaxLen];
-			toolTip[0] = mainDocTip[0] = subDocTip[0] = '\0';
+			static TCHAR docTip[tipMaxLen];
+			docTip[0] = '\0';
 
 			generic_string tipTmp(TEXT(""));
 			int id = int(lpttt->hdr.idFrom);
@@ -2670,10 +2668,10 @@ BOOL Notepad_plus::notify(SCNotification *notification)
 			if (hWin == _rebarTop.getHSelf())
 			{
 				getNameStrFromCmd(id, tipTmp);
-				if (tipTmp.length() >= tipMaxLen)
+				if (tipTmp.length() >= 80)
 					return FALSE;
-				lstrcpy(toolTip, tipTmp.c_str());
-				lpttt->lpszText = toolTip;
+
+				lstrcpy(lpttt->szText, tipTmp.c_str());
 				return TRUE;
 			}
 			else if (hWin == _mainDocTab.getHSelf())
@@ -2684,8 +2682,8 @@ BOOL Notepad_plus::notify(SCNotification *notification)
 
 				if (tipTmp.length() >= tipMaxLen)
 					return FALSE;
-				lstrcpy(mainDocTip, tipTmp.c_str());
-				lpttt->lpszText = mainDocTip;
+				lstrcpy(docTip, tipTmp.c_str());
+				lpttt->lpszText = docTip;
 				return TRUE;
 			}
 			else if (hWin == _subDocTab.getHSelf())
@@ -2696,8 +2694,8 @@ BOOL Notepad_plus::notify(SCNotification *notification)
 
 				if (tipTmp.length() >= tipMaxLen)
 					return FALSE;
-				lstrcpy(subDocTip, tipTmp.c_str());
-				lpttt->lpszText = subDocTip;
+				lstrcpy(docTip, tipTmp.c_str());
+				lpttt->lpszText = docTip;
 				return TRUE;
 			}
 			else
@@ -2705,10 +2703,58 @@ BOOL Notepad_plus::notify(SCNotification *notification)
 				return FALSE;
 			}
 		} catch (...) {
-			//printStr(TEXT("ToolTip crash is catched!"));
+			printStr(TEXT("ToolTip crash is catched!"));
 		}
-    } 
-    break;
+    }
+
+		/*
+		try {
+			LPTOOLTIPTEXT lpttt;
+	 
+			lpttt = (LPTOOLTIPTEXT)notification;
+	 
+			lpttt->hinst = NULL;
+			lpttt->lpszText = NULL;
+	  
+			POINT p;
+			::GetCursorPos(&p);
+	 
+			::ScreenToClient(_hSelf, &p);
+	 
+			HWND hWin = ::RealChildWindowFromPoint(_hSelf, p);
+			generic_string tipTmp(TEXT(""));
+			int id = int(lpttt->hdr.idFrom);
+	 
+			if (hWin == _rebarTop.getHSelf())
+			{
+				getNameStrFromCmd(id, tipTmp);
+			}
+			else if (hWin == _mainDocTab.getHSelf())
+			{
+				BufferID idd = _mainDocTab.getBufferByIndex(id);
+				Buffer * buf = MainFileManager->getBufferByID(idd);
+				tipTmp = buf->getFullPathName();
+			}
+			else if (hWin == _subDocTab.getHSelf())
+			{
+				BufferID idd = _subDocTab.getBufferByIndex(id);
+				Buffer * buf = MainFileManager->getBufferByID(idd);
+				tipTmp = buf->getFullPathName();
+			}
+			else
+				break;
+			
+			if (tipTmp.length() < 80)
+				return FALSE;
+			lstrcpy(lpttt->szText, tipTmp.c_str());
+
+		} catch (...) {
+			printStr(TEXT("ToolTip crash is catched!"));
+		}	
+	}
+*/
+		break;
+
 
     case SCN_ZOOM:
 		break;
@@ -4429,7 +4475,7 @@ void Notepad_plus::command(int id)
 		case IDM_SETTING_IMPORTPLUGIN :
         {
             // get plugin source path
-            TCHAR *extFilterName = TEXT("Notepad++ pligin");
+            TCHAR *extFilterName = TEXT("Notepad++ plugin");
             TCHAR *extFilter = TEXT(".dll");
             TCHAR *destDir = TEXT("plugins");
 
diff --git a/PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp b/PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp
index f345256bc..6c9446563 100644
--- a/PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp
+++ b/PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp
@@ -1307,6 +1307,7 @@ int FindReplaceDlg::markAll(const TCHAR *txt2find, int styleID)
 	return nbFound;
 }
 
+/*
 int FindReplaceDlg::markAll2(const TCHAR *txt2find)
 {
 	FindOption opt;
@@ -1315,7 +1316,7 @@ int FindReplaceDlg::markAll2(const TCHAR *txt2find)
 	int nbFound = processAll(ProcessMarkAll_2, txt2find, NULL, true, NULL, &opt);
 	return nbFound;
 }
-
+*/
 
 
 int FindReplaceDlg::markAllInc(const TCHAR *txt2find, FindOption *opt)
diff --git a/PowerEditor/src/ScitillaComponent/FindReplaceDlg.h b/PowerEditor/src/ScitillaComponent/FindReplaceDlg.h
index 86bd33371..d7dcaaf20 100644
--- a/PowerEditor/src/ScitillaComponent/FindReplaceDlg.h
+++ b/PowerEditor/src/ScitillaComponent/FindReplaceDlg.h
@@ -179,7 +179,7 @@ public :
 	bool processReplace(const TCHAR *txt2find, const TCHAR *txt2replace, FindOption *options = NULL);
 
 	int markAll(const TCHAR *txt2find, int styleID);
-	int markAll2(const TCHAR *str2find);
+	//int markAll2(const TCHAR *str2find);
 	int markAllInc(const TCHAR *str2find, FindOption *opt);
 	
 
diff --git a/PowerEditor/src/ScitillaComponent/ScintillaEditView.cpp b/PowerEditor/src/ScitillaComponent/ScintillaEditView.cpp
index ec01590d5..ec3a7b597 100644
--- a/PowerEditor/src/ScitillaComponent/ScintillaEditView.cpp
+++ b/PowerEditor/src/ScitillaComponent/ScintillaEditView.cpp
@@ -664,12 +664,14 @@ void ScintillaEditView::setCppLexer(LangType langType)
 	const TCHAR *lexerName = ScintillaEditView::langNames[langType].lexerName;
 
     execute(SCI_SETLEXER, SCLEX_CPP); 
+	/*
 	if (isCJK())
 	{
 		int charSet = codepage2CharSet();
 		if (charSet)
 			execute(SCI_STYLESETCHARACTERSET, SCE_C_STRING, charSet);
 	}
+	*/
 
 	if ((langType != L_RC) && (langType != L_JS))
     {
diff --git a/PowerEditor/src/Utf8_16.cpp b/PowerEditor/src/Utf8_16.cpp
index ed31798eb..52247ef95 100644
--- a/PowerEditor/src/Utf8_16.cpp
+++ b/PowerEditor/src/Utf8_16.cpp
@@ -210,12 +210,14 @@ void Utf8_16_Read::determineEncoding()
 		m_eEncoding = uni16LE_NoBOM;
 		m_nSkip = 0;
 	}
+	/* UTF-16 big-endian without BOM detection is taken away scince this detection is very week
     // try to detect UTF-16 big-endian without BOM
     else if (m_nLen > 1 && m_pBuf[0] == NULL && m_pBuf[1] != NULL)
 	{
 		m_eEncoding = uni16BE_NoBOM;
 		m_nSkip = 0;
 	}
+	*/
 	else
 	{
 		u78 detectedEncoding = utf8_7bits_8bits();
diff --git a/PowerEditor/src/contextMenu.xml b/PowerEditor/src/contextMenu.xml
index 7034dca18..51688eda2 100644
--- a/PowerEditor/src/contextMenu.xml
+++ b/PowerEditor/src/contextMenu.xml
@@ -19,8 +19,8 @@
         <Item id="43031"/>
         <Item id="43032"/>
         <Item id="0"/>
-        <Item MenuEntryName="Edit" MenuItemName="to UPPERCASE"/>
-        <Item MenuEntryName="Edit" MenuItemName="to lowercase"/>
+        <Item MenuEntryName="Edit" MenuItemName="UPPERCASE"/>
+        <Item MenuEntryName="Edit" MenuItemName="lowercase"/>
         <Item id="0"/>
         <Item MenuEntryName="Edit" MenuItemName="Toggle block comment"/>
         <Item MenuEntryName="Edit" MenuItemName="Stream comment"/>
diff --git a/PowerEditor/src/shortcuts.xml b/PowerEditor/src/shortcuts.xml
index c343f3c68..9e542861f 100644
--- a/PowerEditor/src/shortcuts.xml
+++ b/PowerEditor/src/shortcuts.xml
@@ -7,14 +7,19 @@
         </Macro>
     </Macros>
     <UserDefinedCommands>
-        <Command name="launch in Firefox" Ctrl="yes" Alt="yes" Shift="yes" Key="88">firefox &quot;$(FULL_CURRENT_PATH)&quot;</Command>
-        <Command name="launch in IE" Ctrl="yes" Alt="yes" Shift="yes" Key="73">iexplore &quot;$(FULL_CURRENT_PATH)&quot;</Command>
+        <Command name="Launch in Firefox" Ctrl="yes" Alt="yes" Shift="yes" Key="88">firefox &quot;$(FULL_CURRENT_PATH)&quot;</Command>
+        <Command name="Launch in IE" Ctrl="yes" Alt="yes" Shift="yes" Key="73">iexplore &quot;$(FULL_CURRENT_PATH)&quot;</Command>
+        <Command name="Launch in Chrome" Ctrl="yes" Alt="yes" Shift="yes" Key="82">chrome &quot;$(FULL_CURRENT_PATH)&quot;</Command>
+        <Command name="Launch in Safari" Ctrl="yes" Alt="yes" Shift="yes" Key="70">safari &quot;$(FULL_CURRENT_PATH)&quot;</Command>
         <Command name="Get php help" Ctrl="no" Alt="yes" Shift="no" Key="112">http://www.php.net/%20$(CURRENT_WORD)</Command>
         <Command name="Google Search" Ctrl="no" Alt="yes" Shift="no" Key="113">http://www.google.com/search?q=$(CURRENT_WORD)</Command>
         <Command name="Wikipedia Search" Ctrl="no" Alt="yes" Shift="no" Key="114">http://en.wikipedia.org/wiki/Special:Search?search=$(CURRENT_WORD)</Command>
-        <Command name="open file" Ctrl="no" Alt="yes" Shift="no" Key="116">$(NPP_DIRECTORY)\notepad++.exe $(CURRENT_WORD)</Command>
-        <Command name="open in another instance" Ctrl="no" Alt="yes" Shift="no" Key="117">$(NPP_DIRECTORY)\notepad++.exe $(CURRENT_WORD) -nosession -multiInst</Command>
-		<Command name="Open containing folder" Ctrl="no" Alt="no" Shift="no" Key="0">explorer $(CURRENT_DIRECTORY)</Command>
-		<Command name="Open current dir cmd" Ctrl="no" Alt="no" Shift="no" Key="0">cmd /K cd $(CURRENT_DIRECTORY)</Command>
+        <Command name="Open file" Ctrl="no" Alt="yes" Shift="no" Key="116">$(NPP_DIRECTORY)\notepad++.exe $(CURRENT_WORD)</Command>
+        <Command name="Open in another instance" Ctrl="no" Alt="yes" Shift="no" Key="117">$(NPP_DIRECTORY)\notepad++.exe $(CURRENT_WORD) -nosession -multiInst</Command>
+        <Command name="Open containing folder" Ctrl="no" Alt="no" Shift="no" Key="0">explorer $(CURRENT_DIRECTORY)</Command>
+        <Command name="Open current dir cmd" Ctrl="no" Alt="no" Shift="no" Key="0">cmd /K cd $(CURRENT_DIRECTORY)</Command>
+        <Command name="Send via Outlook" Ctrl="yes" Alt="yes" Shift="yes" Key="79">outlook /a &quot;$(FULL_CURRENT_PATH)&quot;</Command>
     </UserDefinedCommands>
+    <PluginCommands />
+    <ScintillaKeys />
 </NotepadPlus>