diff --git a/PowerEditor/src/MISC/PluginsManager/Notepad_plus_msgs.h b/PowerEditor/src/MISC/PluginsManager/Notepad_plus_msgs.h
index 306c109c..17ae057d 100644
--- a/PowerEditor/src/MISC/PluginsManager/Notepad_plus_msgs.h
+++ b/PowerEditor/src/MISC/PluginsManager/Notepad_plus_msgs.h
@@ -54,7 +54,6 @@ enum Platform { PF_UNKNOWN, PF_X86, PF_X64, PF_IA64 };
 
 
 
-//Here you can find how to use these messages : http://docs.notepad-plus-plus.org/index.php/Messages_And_Notifications
 #define NPPMSG  (WM_USER + 1000)
 
 	#define NPPM_GETCURRENTSCINTILLA  (NPPMSG + 4)
diff --git a/PowerEditor/src/Notepad_plus.rc b/PowerEditor/src/Notepad_plus.rc
index b96c1e86..01988008 100644
--- a/PowerEditor/src/Notepad_plus.rc
+++ b/PowerEditor/src/Notepad_plus.rc
@@ -970,17 +970,17 @@ BEGIN
     BEGIN
         MENUITEM "Command Line Arguments...",      IDM_CMDLINEARGUMENTS
         MENUITEM SEPARATOR
-        MENUITEM "Notepad++ Home",            IDM_HOMESWEETHOME
-        MENUITEM "Notepad++ Project Page",    IDM_PROJECTPAGE
-        MENUITEM "Notepad++ Community (Forum)",                     IDM_FORUM
-		MENUITEM "Live Support",				IDM_ONLINESUPPORT
-        //MENUITEM "Get More Plugins",          IDM_PLUGINSHOME
+        MENUITEM "Notepad++ Home",                 IDM_HOMESWEETHOME
+        MENUITEM "Notepad++ Project Page",         IDM_PROJECTPAGE
+		MENUITEM "Notepad++ Online Document",      IDM_ONLINEDOCUMENT
+        MENUITEM "Notepad++ Community (Forum)",    IDM_FORUM
+		MENUITEM "Live Support",				   IDM_ONLINESUPPORT
         MENUITEM SEPARATOR
-        MENUITEM "Update Notepad++",          IDM_UPDATE_NPP
-		MENUITEM "Set Updater Proxy...",         IDM_CONFUPDATERPROXY
+        MENUITEM "Update Notepad++",               IDM_UPDATE_NPP
+		MENUITEM "Set Updater Proxy...",           IDM_CONFUPDATERPROXY
 		MENUITEM SEPARATOR
-        MENUITEM "Debug Info...",           IDM_DEBUGINFO
-        MENUITEM "About Notepad++",           IDM_ABOUT
+        MENUITEM "Debug Info...",                  IDM_DEBUGINFO
+        MENUITEM "About Notepad++",                IDM_ABOUT
     END
 
     MENUITEM "X",    IDM_FILE_CLOSE, HELP
@@ -1012,10 +1012,10 @@ BEGIN
 	//CONTROL         "", IDI_SAMESEXMARRIAGE,"Static",SS_OWNERDRAW,20,5,64,64
     LTEXT           NOTEPAD_PLUS_VERSION, IDC_STATIC,70,20,140,11
     LTEXT           "bit",IDC_VERSION_BIT,150,20,140,11
-    LTEXT           "Author :",IDC_STATIC,21,45,31,8
-    LTEXT           "Notepad++ team",IDC_AUTHOR_NAME,78,45,70,8
-    LTEXT           "Home Page :",IDC_STATIC,21,59,47,8
-    LTEXT           "https://notepad-plus-plus.org/",IDC_HOME_ADDR,78,59,126,8
+    //LTEXT           "Author :",IDC_STATIC,21,45,31,8
+    //LTEXT           "Notepad++ team",IDC_AUTHOR_NAME,78,45,70,8
+    LTEXT           "Home:",IDC_STATIC,21,45,47,8
+    LTEXT           "https://notepad-plus-plus.org/",IDC_HOME_ADDR,50,45,126,8
     GROUPBOX        "GNU General Public Licence",IDC_STATIC,19,75,231,131,BS_CENTER
     DEFPUSHBUTTON   "OK",IDOK,106,215,50,14,BS_FLAT
     // IDC_LICENCE_EDIT should be the last line, don't know why
diff --git a/PowerEditor/src/NppCommands.cpp b/PowerEditor/src/NppCommands.cpp
index db157a6c..4e57b642 100644
--- a/PowerEditor/src/NppCommands.cpp
+++ b/PowerEditor/src/NppCommands.cpp
@@ -2844,9 +2844,9 @@ void Notepad_plus::command(int id)
 			break;
 		}
 
-		case IDM_ONLINEHELP:
+		case IDM_ONLINEDOCUMENT:
 		{
-			::ShellExecute(NULL, TEXT("open"), TEXT("http://docs.notepad-plus-plus.org/"), NULL, NULL, SW_SHOWNORMAL);
+			::ShellExecute(NULL, TEXT("open"), TEXT("https://npp-user-manual.org/"), NULL, NULL, SW_SHOWNORMAL);
 			break;
 		}
 
@@ -2859,7 +2859,7 @@ void Notepad_plus::command(int id)
 
 		case IDM_FORUM:
 		{
-			::ShellExecute(NULL, TEXT("open"), TEXT("https://notepad-plus-plus.org/community/"), NULL, NULL, SW_SHOWNORMAL);
+			::ShellExecute(NULL, TEXT("open"), TEXT("https://community.notepad-plus-plus.org/"), NULL, NULL, SW_SHOWNORMAL);
 			break;
 		}
 
@@ -2868,13 +2868,7 @@ void Notepad_plus::command(int id)
 			::ShellExecute(NULL, TEXT("open"), TEXT("https://gitter.im/notepad-plus-plus/notepad-plus-plus"), NULL, NULL, SW_SHOWNORMAL);
 			break;
 		}
-		/*
-		case IDM_PLUGINSHOME:
-		{
-			::ShellExecute(NULL, TEXT("open"), TEXT("http://docs.notepad-plus-plus.org/index.php/Plugin_Central"), NULL, NULL, SW_SHOWNORMAL);
-			break;
-		}
-		*/
+
 		case IDM_UPDATE_NPP :
 		case IDM_CONFUPDATERPROXY :
 		{
@@ -2890,7 +2884,7 @@ void Notepad_plus::command(int id)
 
 				if (res == IDYES)
 				{
-					::ShellExecute(NULL, TEXT("open"), TEXT("https://notepad-plus-plus.org/download/"), NULL, NULL, SW_SHOWNORMAL);
+					::ShellExecute(NULL, TEXT("open"), TEXT("https://notepad-plus-plus.org/downloads/"), NULL, NULL, SW_SHOWNORMAL);
 				}
 			}
 			else
diff --git a/PowerEditor/src/Parameters.cpp b/PowerEditor/src/Parameters.cpp
index 900692ec..629e14e1 100644
--- a/PowerEditor/src/Parameters.cpp
+++ b/PowerEditor/src/Parameters.cpp
@@ -389,7 +389,7 @@ static const WinMenuKeyDefinition winKeyDefs[] =
 	{ VK_NULL,    IDM_CMDLINEARGUMENTS,                         false, false, false, nullptr },
 	{ VK_NULL,    IDM_HOMESWEETHOME,                            false, false, false, nullptr },
 	{ VK_NULL,    IDM_PROJECTPAGE,                              false, false, false, nullptr },
-//  { VK_NULL,    IDM_ONLINEHELP,                               false, false, false, nullptr },
+//  { VK_NULL,    IDM_ONLINEDOCUMENT,                               false, false, false, nullptr },
 	{ VK_NULL,    IDM_FORUM,                                    false, false, false, nullptr },
 	{ VK_NULL,    IDM_ONLINESUPPORT,                            false, false, false, nullptr },
 //	{ VK_NULL,    IDM_PLUGINSHOME,                              false, false, false, nullptr },
diff --git a/PowerEditor/src/WinControls/AboutDlg/AboutDlg.cpp b/PowerEditor/src/WinControls/AboutDlg/AboutDlg.cpp
index 872294fe..c5f8c81a 100644
--- a/PowerEditor/src/WinControls/AboutDlg/AboutDlg.cpp
+++ b/PowerEditor/src/WinControls/AboutDlg/AboutDlg.cpp
@@ -60,9 +60,8 @@ INT_PTR CALLBACK AboutDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM lPara
             HWND licenceEditHandle = ::GetDlgItem(_hSelf, IDC_LICENCE_EDIT);
 			::SendMessage(licenceEditHandle, WM_SETTEXT, 0, reinterpret_cast<LPARAM>(LICENCE_TXT));
 
-            _emailLink.init(_hInst, _hSelf);
+            //_emailLink.init(_hInst, _hSelf);
 			//_emailLink.create(::GetDlgItem(_hSelf, IDC_AUTHOR_NAME), TEXT("mailto:don.h@free.fr"));
-			_emailLink.create(::GetDlgItem(_hSelf, IDC_AUTHOR_NAME), TEXT("https://notepad-plus-plus.org/contributors"));
 
             _pageLink.init(_hInst, _hSelf);
             _pageLink.create(::GetDlgItem(_hSelf, IDC_HOME_ADDR), TEXT("https://notepad-plus-plus.org/"));
diff --git a/PowerEditor/src/WinControls/AboutDlg/AboutDlg.h b/PowerEditor/src/WinControls/AboutDlg/AboutDlg.h
index 2dd6705c..41be3711 100644
--- a/PowerEditor/src/WinControls/AboutDlg/AboutDlg.h
+++ b/PowerEditor/src/WinControls/AboutDlg/AboutDlg.h
@@ -56,7 +56,7 @@ public :
 	void doDialog();
 
     virtual void destroy() {
-        _emailLink.destroy();
+        //_emailLink.destroy();
         _pageLink.destroy();
     };
 
@@ -64,7 +64,7 @@ protected :
 	virtual INT_PTR CALLBACK run_dlgProc(UINT message, WPARAM wParam, LPARAM lParam);
 
 private :
-    URLCtrl _emailLink;
+    //URLCtrl _emailLink;
     URLCtrl _pageLink;
 };
 
diff --git a/PowerEditor/src/menuCmdID.h b/PowerEditor/src/menuCmdID.h
index b1d7667f..ef7945dc 100644
--- a/PowerEditor/src/menuCmdID.h
+++ b/PowerEditor/src/menuCmdID.h
@@ -530,7 +530,7 @@
 #define    IDM_ABOUT    (IDM  + 7000)
     #define    IDM_HOMESWEETHOME    (IDM_ABOUT  + 1)
     #define    IDM_PROJECTPAGE      (IDM_ABOUT  + 2)
-    #define    IDM_ONLINEHELP       (IDM_ABOUT  + 3)
+    #define    IDM_ONLINEDOCUMENT   (IDM_ABOUT  + 3)
     #define    IDM_FORUM            (IDM_ABOUT  + 4)
     //#define    IDM_PLUGINSHOME      (IDM_ABOUT  + 5)
     #define    IDM_UPDATE_NPP       (IDM_ABOUT  + 6)