Update AssemblyInfo.cs

Merge pull request #591 from yfdyh000/fix_list
Workaround for list misalignment
2020-03-25 13:19:42 +08:00 · 2020-03-25 10:31:23 +08:00 · 2020-03-25 10:27:26 +08:00 · 2020-03-25 08:56:00 +08:00 · 2020-03-23 08:35:53 +08:00 · 2020-03-23 08:32:47 +08:00
104 changed files with 9186 additions and 10005 deletions
--- a/.github/issue_template.md
+++ b/.github/issue_template.md
@@ -1,4 +1,4 @@
-在提出问题前请先自行排除服务器端问题，同时也请通过搜索确认是否有人提出过相同问题。
+在提出问题前请先自行排除服务器端问题和升级到最新客户端，同时也请通过搜索确认是否有人提出过相同问题。  

 ### 预期行为
 描述你认为应该发生什么
@@ -19,7 +19,7 @@
 ```
 </details>

-### 环境信息
+### 环境信息(客户端请升级至最新正式版)

 ### 额外信息（可选）

--- a/.gitignore
+++ b/.gitignore
@@ -5,11 +5,14 @@
 /v2rayN/.vs/
 /v2rayN/v2rayN/bin/Debug/app.publish
 /v2rayN/v2rayN/bin/Debug
-/v2rayN/v2rayN/obj/Debug
-/v2rayN/.vs/v2rayN/DesignTimeBuild
 /v2rayN/v2rayN/bin/Release
-/v2rayN/v2rayN/obj/Release
+/v2rayN/v2rayN/obj/
+/v2rayN/.vs/v2rayN/DesignTimeBuild
 /v2rayN/packages
 .vs/ProjectSettings.json
 .vs/slnx.sqlite
 .vs/VSWorkspaceState.json
+/v2rayN/v2rayUpgrade/bin/Debug
+/v2rayN/v2rayUpgrade/obj/Debug 
+/v2rayN/v2rayUpgrade/bin/Release
+/v2rayN/v2rayUpgrade/obj/Release
--- a/v2rayN/v2rayN.sln
+++ b/v2rayN/v2rayN.sln
@@ -5,6 +5,8 @@ VisualStudioVersion = 15.0.28010.2050
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "v2rayN", "v2rayN\v2rayN.csproj", "{0A9785E6-D256-4B73-9757-4EF59955FD1E}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "v2rayUpgrade", "v2rayUpgrade\v2rayUpgrade.csproj", "{F82BE52A-155C-492C-9E0A-1E917EC62C78}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -20,11 +22,20 @@ Global
 		{0A9785E6-D256-4B73-9757-4EF59955FD1E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0A9785E6-D256-4B73-9757-4EF59955FD1E}.Release|Any CPU.Build.0 = Release|Any CPU
 		{0A9785E6-D256-4B73-9757-4EF59955FD1E}.Release|x86.ActiveCfg = Release|Any CPU
+		{F82BE52A-155C-492C-9E0A-1E917EC62C78}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F82BE52A-155C-492C-9E0A-1E917EC62C78}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F82BE52A-155C-492C-9E0A-1E917EC62C78}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F82BE52A-155C-492C-9E0A-1E917EC62C78}.Debug|x86.Build.0 = Debug|Any CPU
+		{F82BE52A-155C-492C-9E0A-1E917EC62C78}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F82BE52A-155C-492C-9E0A-1E917EC62C78}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F82BE52A-155C-492C-9E0A-1E917EC62C78}.Release|x86.ActiveCfg = Release|Any CPU
+		{F82BE52A-155C-492C-9E0A-1E917EC62C78}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
+		RESX_SortFileContentOnSave = True
 		SolutionGuid = {56B88873-C9CC-4069-A1E5-DABD6C6E865E}
 	EndGlobalSection
 EndGlobal
--- a/v2rayN/v2rayN/HttpProxyHandler/HttpWebServer.cs
+++ b/v2rayN/v2rayN/HttpProxyHandler/HttpWebServer.cs
@@ -3,7 +3,7 @@ using System.Net;
 using System.Text;
 using System.Threading;

-namespace v2rayN.HttpProxyHandler
+namespace v2rayN.Base
 {
    public class HttpWebServer
    {
@@ -57,10 +57,11 @@ namespace v2rayN.HttpProxyHandler
                    {
                        ThreadPool.QueueUserWorkItem((c) =>
                        {
-                            var ctx = c as HttpListenerContext;
+                            HttpListenerContext ctx = c as HttpListenerContext;
                            try
                            {
                                string address = ctx.Request.LocalEndPoint.Address.ToString();
+                                Utils.SaveLog("Webserver Request " + address);
                                string rstr = _responderMethod(address);
                                byte[] buf = Encoding.UTF8.GetBytes(rstr);
                                ctx.Response.StatusCode = 200;
--- a/v2rayN/v2rayN/HttpProxyHandler/HttpWebServerB.cs
+++ b/v2rayN/v2rayN/HttpProxyHandler/HttpWebServerB.cs
@@ -1,12 +1,10 @@
 using System;
-using System.Collections;
 using System.IO;
 using System.Net;
 using System.Net.Sockets;
-using System.Text;
 using System.Threading;

-namespace v2rayN.HttpProxyHandler
+namespace v2rayN.Base
 {
    public class HttpWebServerB
    {
@@ -19,8 +17,10 @@ namespace v2rayN.HttpProxyHandler
            this.port = port;
            this._responderMethod = method;

-            Thread thread = new Thread(StartListen);
-            thread.IsBackground = true;
+            Thread thread = new Thread(StartListen)
+            {
+                IsBackground = true
+            };
            thread.Start();
        }

@@ -35,35 +35,52 @@ namespace v2rayN.HttpProxyHandler

        private void StartListen()
        {
-            listener = new TcpListener(IPAddress.Any, port);
-            listener.Start();
-            Utils.SaveLog("WebserverB running...");
-
-            while (true)
+            try
            {
-                TcpClient socket = listener.AcceptTcpClient();
-                Thread thread = new Thread(new ParameterizedThreadStart(ProcessThread));
-                thread.Start(socket);
-                Thread.Sleep(1);
+                listener = new TcpListener(IPAddress.Any, port);
+                listener.Start();
+                Utils.SaveLog("WebserverB running...");
+
+                while (true)
+                {
+                    if (!listener.Pending())
+                    {
+                        Thread.Sleep(100);
+                        continue;
+                    }
+
+                    TcpClient socket = listener.AcceptTcpClient();
+                    Thread thread = new Thread(new ParameterizedThreadStart(ProcessThread))
+                    {
+                        IsBackground = true
+                    };
+                    thread.Start(socket);
+                    Thread.Sleep(1);
+                }
+            }
+            catch
+            {
+                Utils.SaveLog("WebserverB start fail.");
            }
        }
        private void ProcessThread(object obj)
        {
            try
            {
-                var socket = obj as TcpClient;
+                TcpClient socket = obj as TcpClient;

-                var inputStream = new BufferedStream(socket.GetStream());
-                var outputStream = new StreamWriter(new BufferedStream(socket.GetStream()));
+                BufferedStream inputStream = new BufferedStream(socket.GetStream());
+                StreamWriter outputStream = new StreamWriter(new BufferedStream(socket.GetStream()));
                if (inputStream.CanRead)
                {
-                    var data = ReadStream(inputStream);
+                    string data = ReadStream(inputStream);

                    if (data.Contains("/pac/"))
                    {
                        if (_responderMethod != null)
                        {
-                            var address = ((IPEndPoint)socket.Client.LocalEndPoint).Address.ToString();
+                            string address = ((IPEndPoint)socket.Client.LocalEndPoint).Address.ToString();
+                            Utils.SaveLog("WebserverB Request " + address);
                            string pac = _responderMethod(address);

                            if (inputStream.CanWrite)
@@ -112,7 +129,7 @@ namespace v2rayN.HttpProxyHandler

        private void WriteStream(StreamWriter outputStream, string pac)
        {
-            var content_type = "application/x-ns-proxy-autoconfig";
+            string content_type = "application/x-ns-proxy-autoconfig";
            outputStream.WriteLine("HTTP/1.1 200 OK");
            outputStream.WriteLine(String.Format("Content-Type:{0}", content_type));
            outputStream.WriteLine("Connection: close");
--- a/v2rayN/v2rayN/Forms/ListViewFlickerFree.cs
+++ b/v2rayN/v2rayN/Forms/ListViewFlickerFree.cs
@@ -1,7 +1,7 @@
 using System.Drawing;
 using System.Windows.Forms;

-namespace v2rayN.Forms
+namespace v2rayN.Base
 {
    class ListViewFlickerFree : ListView
    {
@@ -22,7 +22,7 @@ namespace v2rayN.Forms
                int MaxWidth = 0;
                Graphics graphics = this.CreateGraphics();
                Font font = this.Font;
-                ListView.ListViewItemCollection items = this.Items;
+                ListViewItemCollection items = this.Items;

                string str;
                int width;
--- a/v2rayN/v2rayN/Base/StringEx.cs
+++ b/v2rayN/v2rayN/Base/StringEx.cs
@@ -2,7 +2,7 @@
 using System.IO;
 using System.Linq;

-namespace v2rayN
+namespace v2rayN.Base
 {
    static class StringEx
    {
@@ -24,7 +24,7 @@ namespace v2rayN

        public static bool IsWhiteSpace(this string value)
        {
-            foreach (var c in value)
+            foreach (char c in value)
            {
                if (char.IsWhiteSpace(c)) continue;

--- a/v2rayN/v2rayN/HttpProxyHandler/WebClientEx.cs
+++ b/v2rayN/v2rayN/HttpProxyHandler/WebClientEx.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Net;

-namespace v2rayN.HttpProxyHandler
+namespace v2rayN.Base
 {
    class WebClientEx : WebClient
    {
@@ -17,17 +17,7 @@ namespace v2rayN.HttpProxyHandler
        protected override WebRequest GetWebRequest(Uri address)
        {
            HttpWebRequest request;
-            if (address.Scheme == "https")
-            {
-                ServicePointManager.ServerCertificateValidationCallback = (a, b, c, d) => { return true; };
-                request = (HttpWebRequest)base.GetWebRequest(address);
-                request.ProtocolVersion = HttpVersion.Version10;
-            }
-            else
-            {
-                request = (HttpWebRequest)base.GetWebRequest(address);
-            }
-
+            request = (HttpWebRequest)base.GetWebRequest(address);
            request.Timeout = Timeout;
            request.ReadWriteTimeout = Timeout;
            //request.AllowAutoRedirect = false;
--- a/v2rayN/v2rayN/Forms/AddServer2Form.cs
+++ b/v2rayN/v2rayN/Forms/AddServer2Form.cs
@@ -63,7 +63,7 @@ namespace v2rayN.Forms
            }
            else
            {
-                UI.Show(UIRes.I18N("OperationFailed"));
+                UI.ShowWarning(UIRes.I18N("OperationFailed"));
            }
        }

--- a/v2rayN/v2rayN/Forms/AddServer2Form.resx
+++ b/v2rayN/v2rayN/Forms/AddServer2Form.resx
@@ -117,274 +117,148 @@
  <resheader name="writer">
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
-  <data name="&gt;&gt;txtAddress.Name" xml:space="preserve">
-    <value>txtAddress</value>
-  </data>
-  <data name="label1.Text" xml:space="preserve">
-    <value>Address</value>
-  </data>
-  <data name="&gt;&gt;txtAddress.ZOrder" xml:space="preserve">
-    <value>0</value>
-  </data>
-  <data name="&gt;&gt;label6.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="panel2.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
-    <value>Bottom</value>
-  </data>
  <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="label13.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="&gt;&gt;btnOK.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;btnOK.Name" xml:space="preserve">
-    <value>btnOK</value>
-  </data>
-  <data name="&gt;&gt;txtRemarks.Name" xml:space="preserve">
-    <value>txtRemarks</value>
-  </data>
-  <data name="&gt;&gt;panel2.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;$this.Name" xml:space="preserve">
-    <value>AddServer2Form</value>
-  </data>
-  <data name="&gt;&gt;label1.Name" xml:space="preserve">
-    <value>label1</value>
-  </data>
-  <data name="&gt;&gt;txtRemarks.Type" xml:space="preserve">
-    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;txtRemarks.Parent" xml:space="preserve">
-    <value>groupBox1</value>
-  </data>
-  <data name="&gt;&gt;btnClose.Parent" xml:space="preserve">
-    <value>panel2</value>
-  </data>
  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="label6.Location" type="System.Drawing.Point, System.Drawing">
-    <value>12, 27</value>
-  </data>
-  <data name="groupBox1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
-    <value>Fill</value>
-  </data>
-  <data name="txtAddress.Multiline" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="txtRemarks.Size" type="System.Drawing.Size, System.Drawing">
-    <value>313, 21</value>
-  </data>
-  <data name="&gt;&gt;label13.Parent" xml:space="preserve">
-    <value>groupBox1</value>
-  </data>
  <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
    <value>6, 12</value>
  </data>
-  <data name="label6.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="label6.Text" xml:space="preserve">
-    <value>Alias (remarks)</value>
-  </data>
-  <data name="txtRemarks.Location" type="System.Drawing.Point, System.Drawing">
-    <value>127, 23</value>
-  </data>
-  <data name="panel1.TabIndex" type="System.Int32, mscorlib">
-    <value>6</value>
-  </data>
-  <data name="panel2.TabIndex" type="System.Int32, mscorlib">
-    <value>7</value>
-  </data>
-  <data name="&gt;&gt;label1.Parent" xml:space="preserve">
-    <value>groupBox1</value>
-  </data>
-  <data name="label13.Size" type="System.Drawing.Size, System.Drawing">
-    <value>113, 12</value>
-  </data>
-  <data name="&gt;&gt;label1.ZOrder" xml:space="preserve">
-    <value>4</value>
-  </data>
-  <data name="groupBox1.Text" xml:space="preserve">
-    <value>Server</value>
-  </data>
-  <data name="txtAddress.TabIndex" type="System.Int32, mscorlib">
-    <value>23</value>
-  </data>
-  <data name="&gt;&gt;btnClose.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="label1.TabIndex" type="System.Int32, mscorlib">
-    <value>0</value>
-  </data>
-  <data name="panel2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>611, 60</value>
-  </data>
-  <data name="&gt;&gt;txtAddress.Type" xml:space="preserve">
-    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="$this.Text" xml:space="preserve">
-    <value>Edit custom configuration server</value>
-  </data>
-  <data name="txtAddress.Size" type="System.Drawing.Size, System.Drawing">
-    <value>432, 104</value>
-  </data>
-  <data name="panel1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>611, 10</value>
-  </data>
-  <data name="&gt;&gt;groupBox1.Name" xml:space="preserve">
-    <value>groupBox1</value>
-  </data>
-  <data name="label13.Text" xml:space="preserve">
-    <value>* Fill in manually</value>
-  </data>
-  <data name="txtRemarks.TabIndex" type="System.Int32, mscorlib">
-    <value>11</value>
-  </data>
-  <data name="label6.TabIndex" type="System.Int32, mscorlib">
-    <value>10</value>
-  </data>
-  <data name="&gt;&gt;panel1.Name" xml:space="preserve">
-    <value>panel1</value>
-  </data>
-  <data name="btnClose.Size" type="System.Drawing.Size, System.Drawing">
-    <value>75, 23</value>
-  </data>
-  <data name="&gt;&gt;txtRemarks.ZOrder" xml:space="preserve">
-    <value>2</value>
-  </data>
-  <data name="&gt;&gt;btnClose.Name" xml:space="preserve">
-    <value>btnClose</value>
-  </data>
-  <data name="btnOK.Location" type="System.Drawing.Point, System.Drawing">
-    <value>303, 17</value>
-  </data>
-  <data name="panel2.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 211</value>
-  </data>
-  <data name="btnOK.Size" type="System.Drawing.Size, System.Drawing">
-    <value>75, 23</value>
-  </data>
-  <data name="&gt;&gt;label13.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;groupBox1.Parent" xml:space="preserve">
-    <value>$this</value>
-  </data>
-  <data name="panel1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
-    <value>Top</value>
-  </data>
-  <data name="groupBox1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 10</value>
-  </data>
-  <data name="&gt;&gt;label6.ZOrder" xml:space="preserve">
-    <value>3</value>
-  </data>
-  <data name="groupBox1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>611, 201</value>
-  </data>
-  <data name="&gt;&gt;panel1.ZOrder" xml:space="preserve">
-    <value>2</value>
-  </data>
-  <data name="btnClose.TabIndex" type="System.Int32, mscorlib">
-    <value>4</value>
-  </data>
-  <data name="groupBox1.TabIndex" type="System.Int32, mscorlib">
-    <value>3</value>
-  </data>
-  <data name="txtAddress.Location" type="System.Drawing.Point, System.Drawing">
-    <value>127, 62</value>
-  </data>
-  <data name="&gt;&gt;txtAddress.Parent" xml:space="preserve">
-    <value>groupBox1</value>
-  </data>
-  <data name="label1.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="&gt;&gt;groupBox1.Type" xml:space="preserve">
-    <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="label1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>83, 12</value>
-  </data>
-  <data name="btnClose.Text" xml:space="preserve">
-    <value>&amp;Cancel</value>
-  </data>
-  <data name="label1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>12, 62</value>
-  </data>
-  <data name="btnOK.Text" xml:space="preserve">
-    <value>&amp;OK</value>
-  </data>
-  <data name="&gt;&gt;btnClose.ZOrder" xml:space="preserve">
-    <value>0</value>
-  </data>
-  <data name="&gt;&gt;panel1.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="label13.Location" type="System.Drawing.Point, System.Drawing">
-    <value>446, 26</value>
-  </data>
-  <data name="&gt;&gt;label6.Parent" xml:space="preserve">
-    <value>groupBox1</value>
-  </data>
-  <data name="&gt;&gt;label6.Name" xml:space="preserve">
-    <value>label6</value>
-  </data>
-  <data name="&gt;&gt;panel1.Parent" xml:space="preserve">
-    <value>$this</value>
-  </data>
-  <data name="&gt;&gt;btnOK.ZOrder" xml:space="preserve">
-    <value>1</value>
-  </data>
-  <data name="panel1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 0</value>
-  </data>
-  <data name="&gt;&gt;btnOK.Parent" xml:space="preserve">
-    <value>panel2</value>
-  </data>
-  <data name="&gt;&gt;label13.Name" xml:space="preserve">
-    <value>label13</value>
-  </data>
-  <data name="label6.Size" type="System.Drawing.Size, System.Drawing">
-    <value>83, 12</value>
-  </data>
-  <data name="label13.TabIndex" type="System.Int32, mscorlib">
-    <value>22</value>
-  </data>
-  <data name="&gt;&gt;label13.ZOrder" xml:space="preserve">
-    <value>1</value>
-  </data>
-  <data name="&gt;&gt;panel2.Name" xml:space="preserve">
-    <value>panel2</value>
-  </data>
-  <data name="btnOK.TabIndex" type="System.Int32, mscorlib">
-    <value>5</value>
-  </data>
  <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
    <value>611, 271</value>
  </data>
-  <data name="&gt;&gt;groupBox1.ZOrder" xml:space="preserve">
-    <value>0</value>
+  <data name="$this.Localizable" type="System.Boolean, mscorlib">
+    <value>True</value>
  </data>
-  <data name="&gt;&gt;$this.Type" xml:space="preserve">
-    <value>v2rayN.Forms.BaseForm, v2rayN, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value>
-  </data>
-  <data name="&gt;&gt;panel2.Parent" xml:space="preserve">
-    <value>$this</value>
+  <data name="$this.Text" xml:space="preserve">
+    <value>Edit custom configuration server</value>
  </data>
  <data name="btnClose.Location" type="System.Drawing.Point, System.Drawing">
    <value>396, 17</value>
  </data>
-  <data name="&gt;&gt;label1.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  <data name="btnClose.Size" type="System.Drawing.Size, System.Drawing">
+    <value>75, 23</value>
  </data>
-  <data name="&gt;&gt;panel2.ZOrder" xml:space="preserve">
-    <value>1</value>
+  <data name="btnClose.TabIndex" type="System.Int32, mscorlib">
+    <value>4</value>
  </data>
-  <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <data name="btnClose.Text" xml:space="preserve">
+    <value>&amp;Cancel</value>
+  </data>
+  <data name="btnOK.Location" type="System.Drawing.Point, System.Drawing">
+    <value>303, 17</value>
+  </data>
+  <data name="btnOK.Size" type="System.Drawing.Size, System.Drawing">
+    <value>75, 23</value>
+  </data>
+  <data name="btnOK.TabIndex" type="System.Int32, mscorlib">
+    <value>5</value>
+  </data>
+  <data name="btnOK.Text" xml:space="preserve">
+    <value>&amp;OK</value>
+  </data>
+  <data name="groupBox1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+    <value>Fill</value>
+  </data>
+  <data name="groupBox1.Location" type="System.Drawing.Point, System.Drawing">
+    <value>0, 10</value>
+  </data>
+  <data name="groupBox1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>611, 201</value>
+  </data>
+  <data name="groupBox1.TabIndex" type="System.Int32, mscorlib">
+    <value>3</value>
+  </data>
+  <data name="groupBox1.Text" xml:space="preserve">
+    <value>Server</value>
+  </data>
+  <data name="label1.AutoSize" type="System.Boolean, mscorlib">
    <value>True</value>
-  </metadata>
+  </data>
+  <data name="label1.Location" type="System.Drawing.Point, System.Drawing">
+    <value>12, 62</value>
+  </data>
+  <data name="label1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>83, 12</value>
+  </data>
+  <data name="label1.TabIndex" type="System.Int32, mscorlib">
+    <value>0</value>
+  </data>
+  <data name="label1.Text" xml:space="preserve">
+    <value>Address</value>
+  </data>
+  <data name="label13.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="label13.Location" type="System.Drawing.Point, System.Drawing">
+    <value>446, 26</value>
+  </data>
+  <data name="label13.Size" type="System.Drawing.Size, System.Drawing">
+    <value>113, 12</value>
+  </data>
+  <data name="label13.TabIndex" type="System.Int32, mscorlib">
+    <value>22</value>
+  </data>
+  <data name="label13.Text" xml:space="preserve">
+    <value>* Fill in manually</value>
+  </data>
+  <data name="label6.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="label6.Location" type="System.Drawing.Point, System.Drawing">
+    <value>12, 27</value>
+  </data>
+  <data name="label6.Size" type="System.Drawing.Size, System.Drawing">
+    <value>83, 12</value>
+  </data>
+  <data name="label6.TabIndex" type="System.Int32, mscorlib">
+    <value>10</value>
+  </data>
+  <data name="label6.Text" xml:space="preserve">
+    <value>Alias (remarks)</value>
+  </data>
+  <data name="panel1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+    <value>Top</value>
+  </data>
+  <data name="panel1.Location" type="System.Drawing.Point, System.Drawing">
+    <value>0, 0</value>
+  </data>
+  <data name="panel1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>611, 10</value>
+  </data>
+  <data name="panel1.TabIndex" type="System.Int32, mscorlib">
+    <value>6</value>
+  </data>
+  <data name="panel2.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+    <value>Bottom</value>
+  </data>
+  <data name="panel2.Location" type="System.Drawing.Point, System.Drawing">
+    <value>0, 211</value>
+  </data>
+  <data name="panel2.Size" type="System.Drawing.Size, System.Drawing">
+    <value>611, 60</value>
+  </data>
+  <data name="panel2.TabIndex" type="System.Int32, mscorlib">
+    <value>7</value>
+  </data>
+  <data name="txtAddress.Location" type="System.Drawing.Point, System.Drawing">
+    <value>127, 62</value>
+  </data>
+  <data name="txtAddress.Multiline" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="txtAddress.Size" type="System.Drawing.Size, System.Drawing">
+    <value>432, 104</value>
+  </data>
+  <data name="txtAddress.TabIndex" type="System.Int32, mscorlib">
+    <value>23</value>
+  </data>
+  <data name="txtRemarks.Location" type="System.Drawing.Point, System.Drawing">
+    <value>127, 23</value>
+  </data>
+  <data name="txtRemarks.Size" type="System.Drawing.Size, System.Drawing">
+    <value>313, 21</value>
+  </data>
+  <data name="txtRemarks.TabIndex" type="System.Int32, mscorlib">
+    <value>11</value>
+  </data>
 </root>
--- a/v2rayN/v2rayN/Forms/AddServer2Form.zh-Hans.resx
+++ b/v2rayN/v2rayN/Forms/AddServer2Form.zh-Hans.resx
@@ -117,25 +117,25 @@
  <resheader name="writer">
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
+  <data name="$this.Text" xml:space="preserve">
+    <value>编辑自定义配置服务器</value>
+  </data>
  <data name="btnClose.Text" xml:space="preserve">
    <value>取消(&amp;C)</value>
  </data>
+  <data name="btnOK.Text" xml:space="preserve">
+    <value>确定(&amp;O)</value>
+  </data>
+  <data name="groupBox1.Text" xml:space="preserve">
+    <value>服务器</value>
+  </data>
+  <data name="label1.Text" xml:space="preserve">
+    <value>地址(address)</value>
+  </data>
  <data name="label13.Text" xml:space="preserve">
    <value>*手填,方便识别管理</value>
  </data>
  <data name="label6.Text" xml:space="preserve">
    <value>别名(remarks)</value>
  </data>
-  <data name="label1.Text" xml:space="preserve">
-    <value>地址(address)</value>
-  </data>
-  <data name="groupBox1.Text" xml:space="preserve">
-    <value>服务器</value>
-  </data>
-  <data name="btnOK.Text" xml:space="preserve">
-    <value>确定(&amp;O)</value>
-  </data>
-  <data name="$this.Text" xml:space="preserve">
-    <value>编辑自定义配置服务器</value>
-  </data>
 </root>
--- a/v2rayN/v2rayN/Forms/AddServer3Form.cs
+++ b/v2rayN/v2rayN/Forms/AddServer3Form.cs
@@ -96,7 +96,7 @@ namespace v2rayN.Forms
            }
            else
            {
-                UI.Show(UIRes.I18N("OperationFailed"));
+                UI.ShowWarning(UIRes.I18N("OperationFailed"));
            }
        }
        private void btnClose_Click(object sender, EventArgs e)
@@ -121,11 +121,10 @@ namespace v2rayN.Forms
        {
            ClearServer();

-            string msg;
-            VmessItem vmessItem = V2rayConfigHandler.ImportFromClipboardConfig(Utils.GetClipboardData(), out msg);
+            VmessItem vmessItem = V2rayConfigHandler.ImportFromClipboardConfig(Utils.GetClipboardData(), out string msg);
            if (vmessItem == null)
            {
-                UI.Show(msg);
+                UI.ShowWarning(msg);
                return;
            }

--- a/v2rayN/v2rayN/Forms/AddServer3Form.resx
+++ b/v2rayN/v2rayN/Forms/AddServer3Form.resx
@@ -118,57 +118,43 @@
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
+    <value>6, 12</value>
+  </data>
+  <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
+    <value>547, 291</value>
+  </data>
+  <data name="$this.Localizable" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="$this.Text" xml:space="preserve">
+    <value>Edit or add a [Shadowsocks] server</value>
+  </data>
  <data name="btnClose.Location" type="System.Drawing.Point, System.Drawing">
    <value>396, 17</value>
  </data>
  <data name="btnClose.Size" type="System.Drawing.Size, System.Drawing">
    <value>75, 23</value>
  </data>
-  <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
  <data name="btnClose.TabIndex" type="System.Int32, mscorlib">
    <value>4</value>
  </data>
  <data name="btnClose.Text" xml:space="preserve">
    <value>&amp;Cancel</value>
  </data>
-  <data name="&gt;&gt;btnClose.Name" xml:space="preserve">
-    <value>btnClose</value>
+  <data name="btnOK.Location" type="System.Drawing.Point, System.Drawing">
+    <value>303, 17</value>
  </data>
-  <data name="&gt;&gt;btnClose.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  <data name="btnOK.Size" type="System.Drawing.Size, System.Drawing">
+    <value>75, 23</value>
  </data>
-  <data name="&gt;&gt;btnClose.Parent" xml:space="preserve">
-    <value>panel2</value>
+  <data name="btnOK.TabIndex" type="System.Int32, mscorlib">
+    <value>5</value>
  </data>
-  <data name="&gt;&gt;btnClose.ZOrder" xml:space="preserve">
-    <value>0</value>
-  </data>
-  <data name="label13.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="label13.Location" type="System.Drawing.Point, System.Drawing">
-    <value>337, 158</value>
-  </data>
-  <data name="label13.Size" type="System.Drawing.Size, System.Drawing">
-    <value>113, 12</value>
-  </data>
-  <data name="label13.TabIndex" type="System.Int32, mscorlib">
-    <value>22</value>
-  </data>
-  <data name="label13.Text" xml:space="preserve">
-    <value>* Fill in manually</value>
-  </data>
-  <data name="&gt;&gt;label13.Name" xml:space="preserve">
-    <value>label13</value>
-  </data>
-  <data name="&gt;&gt;label13.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;label13.Parent" xml:space="preserve">
-    <value>groupBox1</value>
-  </data>
-  <data name="&gt;&gt;label13.ZOrder" xml:space="preserve">
-    <value>0</value>
+  <data name="btnOK.Text" xml:space="preserve">
+    <value>&amp;OK</value>
  </data>
  <data name="cmbSecurity.Items" xml:space="preserve">
    <value>aes-256-cfb</value>
@@ -203,212 +189,20 @@
  <data name="cmbSecurity.TabIndex" type="System.Int32, mscorlib">
    <value>6</value>
  </data>
-  <data name="&gt;&gt;cmbSecurity.Name" xml:space="preserve">
-    <value>cmbSecurity</value>
+  <data name="groupBox1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+    <value>Fill</value>
  </data>
-  <data name="&gt;&gt;cmbSecurity.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  <data name="groupBox1.Location" type="System.Drawing.Point, System.Drawing">
+    <value>0, 35</value>
  </data>
-  <data name="&gt;&gt;cmbSecurity.Parent" xml:space="preserve">
-    <value>groupBox1</value>
+  <data name="groupBox1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>547, 196</value>
  </data>
-  <data name="&gt;&gt;cmbSecurity.ZOrder" xml:space="preserve">
-    <value>1</value>
-  </data>
-  <data name="txtRemarks.Location" type="System.Drawing.Point, System.Drawing">
-    <value>127, 154</value>
-  </data>
-  <data name="txtRemarks.Size" type="System.Drawing.Size, System.Drawing">
-    <value>194, 21</value>
-  </data>
-  <data name="txtRemarks.TabIndex" type="System.Int32, mscorlib">
-    <value>11</value>
-  </data>
-  <data name="&gt;&gt;txtRemarks.Name" xml:space="preserve">
-    <value>txtRemarks</value>
-  </data>
-  <data name="&gt;&gt;txtRemarks.Type" xml:space="preserve">
-    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;txtRemarks.Parent" xml:space="preserve">
-    <value>groupBox1</value>
-  </data>
-  <data name="&gt;&gt;txtRemarks.ZOrder" xml:space="preserve">
-    <value>2</value>
-  </data>
-  <data name="label6.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="label6.Location" type="System.Drawing.Point, System.Drawing">
-    <value>12, 158</value>
-  </data>
-  <data name="label6.Size" type="System.Drawing.Size, System.Drawing">
-    <value>95, 12</value>
-  </data>
-  <data name="label6.TabIndex" type="System.Int32, mscorlib">
-    <value>10</value>
-  </data>
-  <data name="label6.Text" xml:space="preserve">
-    <value>Alias (remarks)</value>
-  </data>
-  <data name="&gt;&gt;label6.Name" xml:space="preserve">
-    <value>label6</value>
-  </data>
-  <data name="&gt;&gt;label6.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;label6.Parent" xml:space="preserve">
-    <value>groupBox1</value>
-  </data>
-  <data name="&gt;&gt;label6.ZOrder" xml:space="preserve">
+  <data name="groupBox1.TabIndex" type="System.Int32, mscorlib">
    <value>3</value>
  </data>
-  <data name="label5.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="label5.Location" type="System.Drawing.Point, System.Drawing">
-    <value>12, 124</value>
-  </data>
-  <data name="label5.Size" type="System.Drawing.Size, System.Drawing">
-    <value>65, 12</value>
-  </data>
-  <data name="label5.TabIndex" type="System.Int32, mscorlib">
-    <value>8</value>
-  </data>
-  <data name="label5.Text" xml:space="preserve">
-    <value>Encryption</value>
-  </data>
-  <data name="&gt;&gt;label5.Name" xml:space="preserve">
-    <value>label5</value>
-  </data>
-  <data name="&gt;&gt;label5.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;label5.Parent" xml:space="preserve">
-    <value>groupBox1</value>
-  </data>
-  <data name="&gt;&gt;label5.ZOrder" xml:space="preserve">
-    <value>4</value>
-  </data>
-  <data name="txtId.Location" type="System.Drawing.Point, System.Drawing">
-    <value>127, 85</value>
-  </data>
-  <data name="txtId.PasswordChar" type="System.Char, mscorlib" xml:space="preserve">
-    <value>*</value>
-  </data>
-  <data name="txtId.Size" type="System.Drawing.Size, System.Drawing">
-    <value>278, 21</value>
-  </data>
-  <data name="txtId.TabIndex" type="System.Int32, mscorlib">
-    <value>5</value>
-  </data>
-  <data name="&gt;&gt;txtId.Name" xml:space="preserve">
-    <value>txtId</value>
-  </data>
-  <data name="&gt;&gt;txtId.Type" xml:space="preserve">
-    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;txtId.Parent" xml:space="preserve">
-    <value>groupBox1</value>
-  </data>
-  <data name="&gt;&gt;txtId.ZOrder" xml:space="preserve">
-    <value>5</value>
-  </data>
-  <data name="label3.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="label3.Location" type="System.Drawing.Point, System.Drawing">
-    <value>12, 89</value>
-  </data>
-  <data name="label3.Size" type="System.Drawing.Size, System.Drawing">
-    <value>53, 12</value>
-  </data>
-  <data name="label3.TabIndex" type="System.Int32, mscorlib">
-    <value>4</value>
-  </data>
-  <data name="label3.Text" xml:space="preserve">
-    <value>Password</value>
-  </data>
-  <data name="&gt;&gt;label3.Name" xml:space="preserve">
-    <value>label3</value>
-  </data>
-  <data name="&gt;&gt;label3.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;label3.Parent" xml:space="preserve">
-    <value>groupBox1</value>
-  </data>
-  <data name="&gt;&gt;label3.ZOrder" xml:space="preserve">
-    <value>6</value>
-  </data>
-  <data name="txtPort.Location" type="System.Drawing.Point, System.Drawing">
-    <value>127, 56</value>
-  </data>
-  <data name="txtPort.Size" type="System.Drawing.Size, System.Drawing">
-    <value>194, 21</value>
-  </data>
-  <data name="txtPort.TabIndex" type="System.Int32, mscorlib">
-    <value>3</value>
-  </data>
-  <data name="&gt;&gt;txtPort.Name" xml:space="preserve">
-    <value>txtPort</value>
-  </data>
-  <data name="&gt;&gt;txtPort.Type" xml:space="preserve">
-    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;txtPort.Parent" xml:space="preserve">
-    <value>groupBox1</value>
-  </data>
-  <data name="&gt;&gt;txtPort.ZOrder" xml:space="preserve">
-    <value>7</value>
-  </data>
-  <data name="label2.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="label2.Location" type="System.Drawing.Point, System.Drawing">
-    <value>12, 60</value>
-  </data>
-  <data name="label2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>71, 12</value>
-  </data>
-  <data name="label2.TabIndex" type="System.Int32, mscorlib">
-    <value>2</value>
-  </data>
-  <data name="label2.Text" xml:space="preserve">
-    <value>Server port</value>
-  </data>
-  <data name="&gt;&gt;label2.Name" xml:space="preserve">
-    <value>label2</value>
-  </data>
-  <data name="&gt;&gt;label2.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;label2.Parent" xml:space="preserve">
-    <value>groupBox1</value>
-  </data>
-  <data name="&gt;&gt;label2.ZOrder" xml:space="preserve">
-    <value>8</value>
-  </data>
-  <data name="txtAddress.Location" type="System.Drawing.Point, System.Drawing">
-    <value>127, 27</value>
-  </data>
-  <data name="txtAddress.Size" type="System.Drawing.Size, System.Drawing">
-    <value>359, 21</value>
-  </data>
-  <data name="txtAddress.TabIndex" type="System.Int32, mscorlib">
-    <value>1</value>
-  </data>
-  <data name="&gt;&gt;txtAddress.Name" xml:space="preserve">
-    <value>txtAddress</value>
-  </data>
-  <data name="&gt;&gt;txtAddress.Type" xml:space="preserve">
-    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;txtAddress.Parent" xml:space="preserve">
-    <value>groupBox1</value>
-  </data>
-  <data name="&gt;&gt;txtAddress.ZOrder" xml:space="preserve">
-    <value>9</value>
+  <data name="groupBox1.Text" xml:space="preserve">
+    <value>Server</value>
  </data>
  <data name="label1.AutoSize" type="System.Boolean, mscorlib">
    <value>True</value>
@@ -425,93 +219,104 @@
  <data name="label1.Text" xml:space="preserve">
    <value>Server address</value>
  </data>
-  <data name="&gt;&gt;label1.Name" xml:space="preserve">
-    <value>label1</value>
+  <data name="label13.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
  </data>
-  <data name="&gt;&gt;label1.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  <data name="label13.Location" type="System.Drawing.Point, System.Drawing">
+    <value>337, 158</value>
  </data>
-  <data name="&gt;&gt;label1.Parent" xml:space="preserve">
-    <value>groupBox1</value>
+  <data name="label13.Size" type="System.Drawing.Size, System.Drawing">
+    <value>113, 12</value>
  </data>
-  <data name="&gt;&gt;label1.ZOrder" xml:space="preserve">
+  <data name="label13.TabIndex" type="System.Int32, mscorlib">
+    <value>22</value>
+  </data>
+  <data name="label13.Text" xml:space="preserve">
+    <value>* Fill in manually</value>
+  </data>
+  <data name="label2.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="label2.Location" type="System.Drawing.Point, System.Drawing">
+    <value>12, 60</value>
+  </data>
+  <data name="label2.Size" type="System.Drawing.Size, System.Drawing">
+    <value>71, 12</value>
+  </data>
+  <data name="label2.TabIndex" type="System.Int32, mscorlib">
+    <value>2</value>
+  </data>
+  <data name="label2.Text" xml:space="preserve">
+    <value>Server port</value>
+  </data>
+  <data name="label3.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="label3.Location" type="System.Drawing.Point, System.Drawing">
+    <value>12, 89</value>
+  </data>
+  <data name="label3.Size" type="System.Drawing.Size, System.Drawing">
+    <value>53, 12</value>
+  </data>
+  <data name="label3.TabIndex" type="System.Int32, mscorlib">
+    <value>4</value>
+  </data>
+  <data name="label3.Text" xml:space="preserve">
+    <value>Password</value>
+  </data>
+  <data name="label5.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="label5.Location" type="System.Drawing.Point, System.Drawing">
+    <value>12, 124</value>
+  </data>
+  <data name="label5.Size" type="System.Drawing.Size, System.Drawing">
+    <value>65, 12</value>
+  </data>
+  <data name="label5.TabIndex" type="System.Int32, mscorlib">
+    <value>8</value>
+  </data>
+  <data name="label5.Text" xml:space="preserve">
+    <value>Encryption</value>
+  </data>
+  <data name="label6.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="label6.Location" type="System.Drawing.Point, System.Drawing">
+    <value>12, 158</value>
+  </data>
+  <data name="label6.Size" type="System.Drawing.Size, System.Drawing">
+    <value>95, 12</value>
+  </data>
+  <data name="label6.TabIndex" type="System.Int32, mscorlib">
    <value>10</value>
  </data>
-  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="groupBox1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
-    <value>Fill</value>
+  <data name="label6.Text" xml:space="preserve">
+    <value>Alias (remarks)</value>
  </data>
-  <data name="groupBox1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 35</value>
+  <data name="MenuItem1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>162, 21</value>
  </data>
-  <data name="groupBox1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>547, 196</value>
+  <data name="MenuItem1.Text" xml:space="preserve">
+    <value>Import configuration file</value>
  </data>
-  <data name="groupBox1.TabIndex" type="System.Int32, mscorlib">
-    <value>3</value>
+  <data name="menuItemImportClipboard.Size" type="System.Drawing.Size, System.Drawing">
+    <value>235, 22</value>
  </data>
-  <data name="groupBox1.Text" xml:space="preserve">
-    <value>Server</value>
+  <data name="menuItemImportClipboard.Text" xml:space="preserve">
+    <value>Import URL from clipboard</value>
  </data>
-  <data name="&gt;&gt;groupBox1.Name" xml:space="preserve">
-    <value>groupBox1</value>
+  <data name="menuServer.Location" type="System.Drawing.Point, System.Drawing">
+    <value>0, 0</value>
  </data>
-  <data name="&gt;&gt;groupBox1.Type" xml:space="preserve">
-    <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  <data name="menuServer.Size" type="System.Drawing.Size, System.Drawing">
+    <value>547, 25</value>
  </data>
-  <data name="&gt;&gt;groupBox1.Parent" xml:space="preserve">
-    <value>$this</value>
+  <data name="menuServer.TabIndex" type="System.Int32, mscorlib">
+    <value>8</value>
  </data>
-  <data name="&gt;&gt;groupBox1.ZOrder" xml:space="preserve">
-    <value>0</value>
-  </data>
-  <data name="btnOK.Location" type="System.Drawing.Point, System.Drawing">
-    <value>303, 17</value>
-  </data>
-  <data name="btnOK.Size" type="System.Drawing.Size, System.Drawing">
-    <value>75, 23</value>
-  </data>
-  <data name="btnOK.TabIndex" type="System.Int32, mscorlib">
-    <value>5</value>
-  </data>
-  <data name="btnOK.Text" xml:space="preserve">
-    <value>&amp;OK</value>
-  </data>
-  <data name="&gt;&gt;btnOK.Name" xml:space="preserve">
-    <value>btnOK</value>
-  </data>
-  <data name="&gt;&gt;btnOK.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;btnOK.Parent" xml:space="preserve">
-    <value>panel2</value>
-  </data>
-  <data name="&gt;&gt;btnOK.ZOrder" xml:space="preserve">
-    <value>1</value>
-  </data>
-  <data name="panel2.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
-    <value>Bottom</value>
-  </data>
-  <data name="panel2.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 231</value>
-  </data>
-  <data name="panel2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>547, 60</value>
-  </data>
-  <data name="panel2.TabIndex" type="System.Int32, mscorlib">
-    <value>7</value>
-  </data>
-  <data name="&gt;&gt;panel2.Name" xml:space="preserve">
-    <value>panel2</value>
-  </data>
-  <data name="&gt;&gt;panel2.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;panel2.Parent" xml:space="preserve">
-    <value>$this</value>
-  </data>
-  <data name="&gt;&gt;panel2.ZOrder" xml:space="preserve">
-    <value>1</value>
+  <data name="menuServer.TrayLocation" type="System.Drawing.Point, System.Drawing">
+    <value>17, 17</value>
  </data>
  <data name="panel1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
    <value>Top</value>
@@ -525,82 +330,55 @@
  <data name="panel1.TabIndex" type="System.Int32, mscorlib">
    <value>6</value>
  </data>
-  <data name="&gt;&gt;panel1.Name" xml:space="preserve">
-    <value>panel1</value>
+  <data name="panel2.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+    <value>Bottom</value>
  </data>
-  <data name="&gt;&gt;panel1.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  <data name="panel2.Location" type="System.Drawing.Point, System.Drawing">
+    <value>0, 231</value>
  </data>
-  <data name="&gt;&gt;panel1.Parent" xml:space="preserve">
-    <value>$this</value>
+  <data name="panel2.Size" type="System.Drawing.Size, System.Drawing">
+    <value>547, 60</value>
  </data>
-  <data name="&gt;&gt;panel1.ZOrder" xml:space="preserve">
-    <value>2</value>
+  <data name="panel2.TabIndex" type="System.Int32, mscorlib">
+    <value>7</value>
  </data>
-  <metadata name="menuServer.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
-  <data name="menuItemImportClipboard.Size" type="System.Drawing.Size, System.Drawing">
-    <value>235, 22</value>
+  <data name="txtAddress.Location" type="System.Drawing.Point, System.Drawing">
+    <value>127, 27</value>
  </data>
-  <data name="menuItemImportClipboard.Text" xml:space="preserve">
-    <value>Import URL from clipboard</value>
+  <data name="txtAddress.Size" type="System.Drawing.Size, System.Drawing">
+    <value>359, 21</value>
  </data>
-  <data name="MenuItem1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>162, 21</value>
+  <data name="txtAddress.TabIndex" type="System.Int32, mscorlib">
+    <value>1</value>
  </data>
-  <data name="MenuItem1.Text" xml:space="preserve">
-    <value>Import configuration file</value>
+  <data name="txtId.Location" type="System.Drawing.Point, System.Drawing">
+    <value>127, 85</value>
  </data>
-  <data name="menuServer.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 0</value>
+  <data name="txtId.PasswordChar" type="System.Char, mscorlib" xml:space="preserve">
+    <value>*</value>
  </data>
-  <data name="menuServer.Size" type="System.Drawing.Size, System.Drawing">
-    <value>547, 25</value>
+  <data name="txtId.Size" type="System.Drawing.Size, System.Drawing">
+    <value>278, 21</value>
  </data>
-  <data name="menuServer.TabIndex" type="System.Int32, mscorlib">
-    <value>8</value>
+  <data name="txtId.TabIndex" type="System.Int32, mscorlib">
+    <value>5</value>
  </data>
-  <data name="&gt;&gt;menuServer.Name" xml:space="preserve">
-    <value>menuServer</value>
+  <data name="txtPort.Location" type="System.Drawing.Point, System.Drawing">
+    <value>127, 56</value>
  </data>
-  <data name="&gt;&gt;menuServer.Type" xml:space="preserve">
-    <value>System.Windows.Forms.MenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  <data name="txtPort.Size" type="System.Drawing.Size, System.Drawing">
+    <value>194, 21</value>
  </data>
-  <data name="&gt;&gt;menuServer.Parent" xml:space="preserve">
-    <value>$this</value>
-  </data>
-  <data name="&gt;&gt;menuServer.ZOrder" xml:space="preserve">
+  <data name="txtPort.TabIndex" type="System.Int32, mscorlib">
    <value>3</value>
  </data>
-  <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
-    <value>6, 12</value>
+  <data name="txtRemarks.Location" type="System.Drawing.Point, System.Drawing">
+    <value>127, 154</value>
  </data>
-  <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
-    <value>547, 291</value>
+  <data name="txtRemarks.Size" type="System.Drawing.Size, System.Drawing">
+    <value>194, 21</value>
  </data>
-  <data name="$this.Text" xml:space="preserve">
-    <value>Edit or add a [Shadowsocks] server</value>
-  </data>
-  <data name="&gt;&gt;MenuItem1.Name" xml:space="preserve">
-    <value>MenuItem1</value>
-  </data>
-  <data name="&gt;&gt;MenuItem1.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;menuItemImportClipboard.Name" xml:space="preserve">
-    <value>menuItemImportClipboard</value>
-  </data>
-  <data name="&gt;&gt;menuItemImportClipboard.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;$this.Name" xml:space="preserve">
-    <value>AddServer3Form</value>
-  </data>
-  <data name="&gt;&gt;$this.Type" xml:space="preserve">
-    <value>v2rayN.Forms.BaseForm, v2rayN, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value>
+  <data name="txtRemarks.TabIndex" type="System.Int32, mscorlib">
+    <value>11</value>
  </data>
 </root>
--- a/v2rayN/v2rayN/Forms/AddServer3Form.zh-Hans.resx
+++ b/v2rayN/v2rayN/Forms/AddServer3Form.zh-Hans.resx
@@ -117,43 +117,40 @@
  <resheader name="writer">
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
+  <data name="$this.Text" xml:space="preserve">
+    <value>编辑或添加[Shadowsocks]服务器</value>
+  </data>
  <data name="btnClose.Text" xml:space="preserve">
    <value>取消(&amp;C)</value>
  </data>
-  <data name="label13.Text" xml:space="preserve">
-    <value>*手填,方便识别管理</value>
-  </data>
-  <data name="label6.Text" xml:space="preserve">
-    <value>别名(remarks)</value>
-  </data>
-  <data name="label5.Text" xml:space="preserve">
-    <value>加密方式</value>
-  </data>
-  <data name="label3.Text" xml:space="preserve">
-    <value>密码</value>
-  </data>
-  <data name="label2.Text" xml:space="preserve">
-    <value>服务器端口</value>
-  </data>
-  <data name="label1.Text" xml:space="preserve">
-    <value>服务器地址</value>
-  </data>
-  <data name="groupBox1.Text" xml:space="preserve">
-    <value>服务器</value>
-  </data>
  <data name="btnOK.Text" xml:space="preserve">
    <value>确定(&amp;O)</value>
  </data>
-  <data name="menuItemImportClipboard.Text" xml:space="preserve">
-    <value>从剪贴板导入URL</value>
+  <data name="groupBox1.Text" xml:space="preserve">
+    <value>服务器</value>
  </data>
-  <data name="menuItemScanScreen.Text" xml:space="preserve">
-    <value>扫描屏幕上的二维码</value>
+  <data name="label1.Text" xml:space="preserve">
+    <value>服务器地址</value>
+  </data>
+  <data name="label13.Text" xml:space="preserve">
+    <value>*手填,方便识别管理</value>
+  </data>
+  <data name="label2.Text" xml:space="preserve">
+    <value>服务器端口</value>
+  </data>
+  <data name="label3.Text" xml:space="preserve">
+    <value>密码</value>
+  </data>
+  <data name="label5.Text" xml:space="preserve">
+    <value>加密方式</value>
+  </data>
+  <data name="label6.Text" xml:space="preserve">
+    <value>别名(remarks)</value>
  </data>
  <data name="MenuItem1.Text" xml:space="preserve">
    <value>导入配置文件</value>
  </data>
-  <data name="$this.Text" xml:space="preserve">
-    <value>编辑或添加[Shadowsocks]服务器</value>
+  <data name="menuItemImportClipboard.Text" xml:space="preserve">
+    <value>从剪贴板导入URL</value>
  </data>
 </root>
--- a/v2rayN/v2rayN/Forms/AddServer4Form.cs
+++ b/v2rayN/v2rayN/Forms/AddServer4Form.cs
@@ -85,7 +85,7 @@ namespace v2rayN.Forms
            }
            else
            {
-                UI.Show(UIRes.I18N("OperationFailed"));
+                UI.ShowWarning(UIRes.I18N("OperationFailed"));
            }
        }
        private void btnClose_Click(object sender, EventArgs e)
@@ -110,11 +110,10 @@ namespace v2rayN.Forms
        {
            ClearServer();

-            string msg;
-            VmessItem vmessItem = V2rayConfigHandler.ImportFromClipboardConfig(Utils.GetClipboardData(), out msg);
+            VmessItem vmessItem = V2rayConfigHandler.ImportFromClipboardConfig(Utils.GetClipboardData(), out string msg);
            if (vmessItem == null)
            {
-                UI.Show(msg);
+                UI.ShowWarning(msg);
                return;
            }

--- a/v2rayN/v2rayN/Forms/AddServer4Form.resx
+++ b/v2rayN/v2rayN/Forms/AddServer4Form.resx
@@ -118,107 +118,104 @@
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
+    <value>6, 12</value>
+  </data>
+  <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
+    <value>547, 291</value>
+  </data>
+  <data name="$this.Localizable" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="$this.Text" xml:space="preserve">
+    <value>Edit or add a [Socks] server</value>
+  </data>
  <data name="btnClose.Location" type="System.Drawing.Point, System.Drawing">
    <value>396, 17</value>
  </data>
  <data name="btnClose.Size" type="System.Drawing.Size, System.Drawing">
    <value>75, 23</value>
  </data>
-  <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
  <data name="btnClose.TabIndex" type="System.Int32, mscorlib">
    <value>4</value>
  </data>
  <data name="btnClose.Text" xml:space="preserve">
    <value>&amp;Cancel</value>
  </data>
-  <data name="&gt;&gt;btnClose.Name" xml:space="preserve">
-    <value>btnClose</value>
+  <data name="btnOK.Location" type="System.Drawing.Point, System.Drawing">
+    <value>303, 17</value>
  </data>
-  <data name="&gt;&gt;btnClose.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  <data name="btnOK.Size" type="System.Drawing.Size, System.Drawing">
+    <value>75, 23</value>
  </data>
-  <data name="&gt;&gt;btnClose.Parent" xml:space="preserve">
-    <value>panel2</value>
+  <data name="btnOK.TabIndex" type="System.Int32, mscorlib">
+    <value>5</value>
  </data>
-  <data name="&gt;&gt;btnClose.ZOrder" xml:space="preserve">
-    <value>0</value>
+  <data name="btnOK.Text" xml:space="preserve">
+    <value>&amp;OK</value>
  </data>
-  <data name="txtSecurity.Location" type="System.Drawing.Point, System.Drawing">
-    <value>127, 84</value>
+  <data name="groupBox1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+    <value>Fill</value>
  </data>
-  <data name="txtSecurity.Size" type="System.Drawing.Size, System.Drawing">
-    <value>278, 21</value>
+  <data name="groupBox1.Location" type="System.Drawing.Point, System.Drawing">
+    <value>0, 35</value>
  </data>
-  <data name="txtSecurity.TabIndex" type="System.Int32, mscorlib">
-    <value>26</value>
+  <data name="groupBox1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>547, 196</value>
  </data>
-  <data name="&gt;&gt;txtSecurity.Name" xml:space="preserve">
-    <value>txtSecurity</value>
+  <data name="groupBox1.TabIndex" type="System.Int32, mscorlib">
+    <value>3</value>
  </data>
-  <data name="&gt;&gt;txtSecurity.Type" xml:space="preserve">
-    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  <data name="groupBox1.Text" xml:space="preserve">
+    <value>Server</value>
  </data>
-  <data name="&gt;&gt;txtSecurity.Parent" xml:space="preserve">
-    <value>groupBox1</value>
-  </data>
-  <data name="&gt;&gt;txtSecurity.ZOrder" xml:space="preserve">
-    <value>0</value>
-  </data>
-  <data name="label4.AutoSize" type="System.Boolean, mscorlib">
+  <data name="label1.AutoSize" type="System.Boolean, mscorlib">
    <value>True</value>
  </data>
-  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="label4.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
-    <value>NoControl</value>
+  <data name="label1.Location" type="System.Drawing.Point, System.Drawing">
+    <value>12, 31</value>
  </data>
-  <data name="label4.Location" type="System.Drawing.Point, System.Drawing">
-    <value>12, 88</value>
-  </data>
-  <data name="label4.Size" type="System.Drawing.Size, System.Drawing">
+  <data name="label1.Size" type="System.Drawing.Size, System.Drawing">
    <value>89, 12</value>
  </data>
-  <data name="label4.TabIndex" type="System.Int32, mscorlib">
-    <value>25</value>
+  <data name="label1.TabIndex" type="System.Int32, mscorlib">
+    <value>0</value>
  </data>
-  <data name="label4.Text" xml:space="preserve">
-    <value>User(Optional)</value>
+  <data name="label1.Text" xml:space="preserve">
+    <value>Server address</value>
  </data>
-  <data name="&gt;&gt;label4.Name" xml:space="preserve">
-    <value>label4</value>
+  <data name="label13.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
  </data>
-  <data name="&gt;&gt;label4.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  <data name="label13.Location" type="System.Drawing.Point, System.Drawing">
+    <value>337, 158</value>
  </data>
-  <data name="&gt;&gt;label4.Parent" xml:space="preserve">
-    <value>groupBox1</value>
+  <data name="label13.Size" type="System.Drawing.Size, System.Drawing">
+    <value>113, 12</value>
  </data>
-  <data name="&gt;&gt;label4.ZOrder" xml:space="preserve">
-    <value>1</value>
+  <data name="label13.TabIndex" type="System.Int32, mscorlib">
+    <value>22</value>
  </data>
-  <data name="txtId.Location" type="System.Drawing.Point, System.Drawing">
-    <value>127, 117</value>
+  <data name="label13.Text" xml:space="preserve">
+    <value>* Fill in manually</value>
  </data>
-  <data name="txtId.PasswordChar" type="System.Char, mscorlib" xml:space="preserve">
-    <value>*</value>
+  <data name="label2.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
  </data>
-  <data name="txtId.Size" type="System.Drawing.Size, System.Drawing">
-    <value>278, 21</value>
+  <data name="label2.Location" type="System.Drawing.Point, System.Drawing">
+    <value>12, 60</value>
  </data>
-  <data name="txtId.TabIndex" type="System.Int32, mscorlib">
-    <value>24</value>
+  <data name="label2.Size" type="System.Drawing.Size, System.Drawing">
+    <value>71, 12</value>
  </data>
-  <data name="&gt;&gt;txtId.Name" xml:space="preserve">
-    <value>txtId</value>
-  </data>
-  <data name="&gt;&gt;txtId.Type" xml:space="preserve">
-    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;txtId.Parent" xml:space="preserve">
-    <value>groupBox1</value>
-  </data>
-  <data name="&gt;&gt;txtId.ZOrder" xml:space="preserve">
+  <data name="label2.TabIndex" type="System.Int32, mscorlib">
    <value>2</value>
  </data>
+  <data name="label2.Text" xml:space="preserve">
+    <value>Server port</value>
+  </data>
  <data name="label3.AutoSize" type="System.Boolean, mscorlib">
    <value>True</value>
  </data>
@@ -237,65 +234,23 @@
  <data name="label3.Text" xml:space="preserve">
    <value>Password(Optional)</value>
  </data>
-  <data name="&gt;&gt;label3.Name" xml:space="preserve">
-    <value>label3</value>
-  </data>
-  <data name="&gt;&gt;label3.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;label3.Parent" xml:space="preserve">
-    <value>groupBox1</value>
-  </data>
-  <data name="&gt;&gt;label3.ZOrder" xml:space="preserve">
-    <value>3</value>
-  </data>
-  <data name="label13.AutoSize" type="System.Boolean, mscorlib">
+  <data name="label4.AutoSize" type="System.Boolean, mscorlib">
    <value>True</value>
  </data>
-  <data name="label13.Location" type="System.Drawing.Point, System.Drawing">
-    <value>337, 158</value>
+  <data name="label4.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
  </data>
-  <data name="label13.Size" type="System.Drawing.Size, System.Drawing">
-    <value>113, 12</value>
+  <data name="label4.Location" type="System.Drawing.Point, System.Drawing">
+    <value>12, 88</value>
  </data>
-  <data name="label13.TabIndex" type="System.Int32, mscorlib">
-    <value>22</value>
+  <data name="label4.Size" type="System.Drawing.Size, System.Drawing">
+    <value>89, 12</value>
  </data>
-  <data name="label13.Text" xml:space="preserve">
-    <value>* Fill in manually</value>
+  <data name="label4.TabIndex" type="System.Int32, mscorlib">
+    <value>25</value>
  </data>
-  <data name="&gt;&gt;label13.Name" xml:space="preserve">
-    <value>label13</value>
-  </data>
-  <data name="&gt;&gt;label13.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;label13.Parent" xml:space="preserve">
-    <value>groupBox1</value>
-  </data>
-  <data name="&gt;&gt;label13.ZOrder" xml:space="preserve">
-    <value>4</value>
-  </data>
-  <data name="txtRemarks.Location" type="System.Drawing.Point, System.Drawing">
-    <value>127, 154</value>
-  </data>
-  <data name="txtRemarks.Size" type="System.Drawing.Size, System.Drawing">
-    <value>194, 21</value>
-  </data>
-  <data name="txtRemarks.TabIndex" type="System.Int32, mscorlib">
-    <value>11</value>
-  </data>
-  <data name="&gt;&gt;txtRemarks.Name" xml:space="preserve">
-    <value>txtRemarks</value>
-  </data>
-  <data name="&gt;&gt;txtRemarks.Type" xml:space="preserve">
-    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;txtRemarks.Parent" xml:space="preserve">
-    <value>groupBox1</value>
-  </data>
-  <data name="&gt;&gt;txtRemarks.ZOrder" xml:space="preserve">
-    <value>5</value>
+  <data name="label4.Text" xml:space="preserve">
+    <value>User(Optional)</value>
  </data>
  <data name="label6.AutoSize" type="System.Boolean, mscorlib">
    <value>True</value>
@@ -312,188 +267,29 @@
  <data name="label6.Text" xml:space="preserve">
    <value>Alias (remarks)</value>
  </data>
-  <data name="&gt;&gt;label6.Name" xml:space="preserve">
-    <value>label6</value>
+  <data name="MenuItem1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>162, 21</value>
  </data>
-  <data name="&gt;&gt;label6.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  <data name="MenuItem1.Text" xml:space="preserve">
+    <value>Import configuration file</value>
  </data>
-  <data name="&gt;&gt;label6.Parent" xml:space="preserve">
-    <value>groupBox1</value>
+  <data name="menuItemImportClipboard.Size" type="System.Drawing.Size, System.Drawing">
+    <value>235, 22</value>
  </data>
-  <data name="&gt;&gt;label6.ZOrder" xml:space="preserve">
-    <value>6</value>
+  <data name="menuItemImportClipboard.Text" xml:space="preserve">
+    <value>Import URL from clipboard</value>
  </data>
-  <data name="txtPort.Location" type="System.Drawing.Point, System.Drawing">
-    <value>127, 56</value>
+  <data name="menuServer.Location" type="System.Drawing.Point, System.Drawing">
+    <value>0, 0</value>
  </data>
-  <data name="txtPort.Size" type="System.Drawing.Size, System.Drawing">
-    <value>194, 21</value>
+  <data name="menuServer.Size" type="System.Drawing.Size, System.Drawing">
+    <value>547, 25</value>
  </data>
-  <data name="txtPort.TabIndex" type="System.Int32, mscorlib">
-    <value>3</value>
-  </data>
-  <data name="&gt;&gt;txtPort.Name" xml:space="preserve">
-    <value>txtPort</value>
-  </data>
-  <data name="&gt;&gt;txtPort.Type" xml:space="preserve">
-    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;txtPort.Parent" xml:space="preserve">
-    <value>groupBox1</value>
-  </data>
-  <data name="&gt;&gt;txtPort.ZOrder" xml:space="preserve">
-    <value>7</value>
-  </data>
-  <data name="label2.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="label2.Location" type="System.Drawing.Point, System.Drawing">
-    <value>12, 60</value>
-  </data>
-  <data name="label2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>71, 12</value>
-  </data>
-  <data name="label2.TabIndex" type="System.Int32, mscorlib">
-    <value>2</value>
-  </data>
-  <data name="label2.Text" xml:space="preserve">
-    <value>Server port</value>
-  </data>
-  <data name="&gt;&gt;label2.Name" xml:space="preserve">
-    <value>label2</value>
-  </data>
-  <data name="&gt;&gt;label2.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;label2.Parent" xml:space="preserve">
-    <value>groupBox1</value>
-  </data>
-  <data name="&gt;&gt;label2.ZOrder" xml:space="preserve">
+  <data name="menuServer.TabIndex" type="System.Int32, mscorlib">
    <value>8</value>
  </data>
-  <data name="txtAddress.Location" type="System.Drawing.Point, System.Drawing">
-    <value>127, 27</value>
-  </data>
-  <data name="txtAddress.Size" type="System.Drawing.Size, System.Drawing">
-    <value>359, 21</value>
-  </data>
-  <data name="txtAddress.TabIndex" type="System.Int32, mscorlib">
-    <value>1</value>
-  </data>
-  <data name="&gt;&gt;txtAddress.Name" xml:space="preserve">
-    <value>txtAddress</value>
-  </data>
-  <data name="&gt;&gt;txtAddress.Type" xml:space="preserve">
-    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;txtAddress.Parent" xml:space="preserve">
-    <value>groupBox1</value>
-  </data>
-  <data name="&gt;&gt;txtAddress.ZOrder" xml:space="preserve">
-    <value>9</value>
-  </data>
-  <data name="label1.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="label1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>12, 31</value>
-  </data>
-  <data name="label1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>89, 12</value>
-  </data>
-  <data name="label1.TabIndex" type="System.Int32, mscorlib">
-    <value>0</value>
-  </data>
-  <data name="label1.Text" xml:space="preserve">
-    <value>Server address</value>
-  </data>
-  <data name="&gt;&gt;label1.Name" xml:space="preserve">
-    <value>label1</value>
-  </data>
-  <data name="&gt;&gt;label1.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;label1.Parent" xml:space="preserve">
-    <value>groupBox1</value>
-  </data>
-  <data name="&gt;&gt;label1.ZOrder" xml:space="preserve">
-    <value>10</value>
-  </data>
-  <data name="groupBox1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
-    <value>Fill</value>
-  </data>
-  <data name="groupBox1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 35</value>
-  </data>
-  <data name="groupBox1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>547, 196</value>
-  </data>
-  <data name="groupBox1.TabIndex" type="System.Int32, mscorlib">
-    <value>3</value>
-  </data>
-  <data name="groupBox1.Text" xml:space="preserve">
-    <value>Server</value>
-  </data>
-  <data name="&gt;&gt;groupBox1.Name" xml:space="preserve">
-    <value>groupBox1</value>
-  </data>
-  <data name="&gt;&gt;groupBox1.Type" xml:space="preserve">
-    <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;groupBox1.Parent" xml:space="preserve">
-    <value>$this</value>
-  </data>
-  <data name="&gt;&gt;groupBox1.ZOrder" xml:space="preserve">
-    <value>0</value>
-  </data>
-  <data name="btnOK.Location" type="System.Drawing.Point, System.Drawing">
-    <value>303, 17</value>
-  </data>
-  <data name="btnOK.Size" type="System.Drawing.Size, System.Drawing">
-    <value>75, 23</value>
-  </data>
-  <data name="btnOK.TabIndex" type="System.Int32, mscorlib">
-    <value>5</value>
-  </data>
-  <data name="btnOK.Text" xml:space="preserve">
-    <value>&amp;OK</value>
-  </data>
-  <data name="&gt;&gt;btnOK.Name" xml:space="preserve">
-    <value>btnOK</value>
-  </data>
-  <data name="&gt;&gt;btnOK.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;btnOK.Parent" xml:space="preserve">
-    <value>panel2</value>
-  </data>
-  <data name="&gt;&gt;btnOK.ZOrder" xml:space="preserve">
-    <value>1</value>
-  </data>
-  <data name="panel2.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
-    <value>Bottom</value>
-  </data>
-  <data name="panel2.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 231</value>
-  </data>
-  <data name="panel2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>547, 60</value>
-  </data>
-  <data name="panel2.TabIndex" type="System.Int32, mscorlib">
-    <value>7</value>
-  </data>
-  <data name="&gt;&gt;panel2.Name" xml:space="preserve">
-    <value>panel2</value>
-  </data>
-  <data name="&gt;&gt;panel2.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;panel2.Parent" xml:space="preserve">
-    <value>$this</value>
-  </data>
-  <data name="&gt;&gt;panel2.ZOrder" xml:space="preserve">
-    <value>1</value>
+  <data name="menuServer.TrayLocation" type="System.Drawing.Point, System.Drawing">
+    <value>17, 17</value>
  </data>
  <data name="panel1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
    <value>Top</value>
@@ -507,82 +303,64 @@
  <data name="panel1.TabIndex" type="System.Int32, mscorlib">
    <value>6</value>
  </data>
-  <data name="&gt;&gt;panel1.Name" xml:space="preserve">
-    <value>panel1</value>
+  <data name="panel2.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+    <value>Bottom</value>
  </data>
-  <data name="&gt;&gt;panel1.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  <data name="panel2.Location" type="System.Drawing.Point, System.Drawing">
+    <value>0, 231</value>
  </data>
-  <data name="&gt;&gt;panel1.Parent" xml:space="preserve">
-    <value>$this</value>
+  <data name="panel2.Size" type="System.Drawing.Size, System.Drawing">
+    <value>547, 60</value>
  </data>
-  <data name="&gt;&gt;panel1.ZOrder" xml:space="preserve">
-    <value>2</value>
+  <data name="panel2.TabIndex" type="System.Int32, mscorlib">
+    <value>7</value>
  </data>
-  <metadata name="menuServer.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
-  <data name="menuItemImportClipboard.Size" type="System.Drawing.Size, System.Drawing">
-    <value>235, 22</value>
+  <data name="txtAddress.Location" type="System.Drawing.Point, System.Drawing">
+    <value>127, 27</value>
  </data>
-  <data name="menuItemImportClipboard.Text" xml:space="preserve">
-    <value>Import URL from clipboard</value>
+  <data name="txtAddress.Size" type="System.Drawing.Size, System.Drawing">
+    <value>359, 21</value>
  </data>
-  <data name="MenuItem1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>162, 21</value>
+  <data name="txtAddress.TabIndex" type="System.Int32, mscorlib">
+    <value>1</value>
  </data>
-  <data name="MenuItem1.Text" xml:space="preserve">
-    <value>Import configuration file</value>
+  <data name="txtId.Location" type="System.Drawing.Point, System.Drawing">
+    <value>127, 117</value>
  </data>
-  <data name="menuServer.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 0</value>
+  <data name="txtId.PasswordChar" type="System.Char, mscorlib" xml:space="preserve">
+    <value>*</value>
  </data>
-  <data name="menuServer.Size" type="System.Drawing.Size, System.Drawing">
-    <value>547, 25</value>
+  <data name="txtId.Size" type="System.Drawing.Size, System.Drawing">
+    <value>278, 21</value>
  </data>
-  <data name="menuServer.TabIndex" type="System.Int32, mscorlib">
-    <value>8</value>
+  <data name="txtId.TabIndex" type="System.Int32, mscorlib">
+    <value>24</value>
  </data>
-  <data name="&gt;&gt;menuServer.Name" xml:space="preserve">
-    <value>menuServer</value>
+  <data name="txtPort.Location" type="System.Drawing.Point, System.Drawing">
+    <value>127, 56</value>
  </data>
-  <data name="&gt;&gt;menuServer.Type" xml:space="preserve">
-    <value>System.Windows.Forms.MenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  <data name="txtPort.Size" type="System.Drawing.Size, System.Drawing">
+    <value>194, 21</value>
  </data>
-  <data name="&gt;&gt;menuServer.Parent" xml:space="preserve">
-    <value>$this</value>
-  </data>
-  <data name="&gt;&gt;menuServer.ZOrder" xml:space="preserve">
+  <data name="txtPort.TabIndex" type="System.Int32, mscorlib">
    <value>3</value>
  </data>
-  <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
-    <value>6, 12</value>
+  <data name="txtRemarks.Location" type="System.Drawing.Point, System.Drawing">
+    <value>127, 154</value>
  </data>
-  <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
-    <value>547, 291</value>
+  <data name="txtRemarks.Size" type="System.Drawing.Size, System.Drawing">
+    <value>194, 21</value>
  </data>
-  <data name="$this.Text" xml:space="preserve">
-    <value>Edit or add a [Socks] server</value>
+  <data name="txtRemarks.TabIndex" type="System.Int32, mscorlib">
+    <value>11</value>
  </data>
-  <data name="&gt;&gt;MenuItem1.Name" xml:space="preserve">
-    <value>MenuItem1</value>
+  <data name="txtSecurity.Location" type="System.Drawing.Point, System.Drawing">
+    <value>127, 84</value>
  </data>
-  <data name="&gt;&gt;MenuItem1.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  <data name="txtSecurity.Size" type="System.Drawing.Size, System.Drawing">
+    <value>278, 21</value>
  </data>
-  <data name="&gt;&gt;menuItemImportClipboard.Name" xml:space="preserve">
-    <value>menuItemImportClipboard</value>
-  </data>
-  <data name="&gt;&gt;menuItemImportClipboard.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;$this.Name" xml:space="preserve">
-    <value>AddServer4Form</value>
-  </data>
-  <data name="&gt;&gt;$this.Type" xml:space="preserve">
-    <value>v2rayN.Forms.BaseForm, v2rayN, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value>
+  <data name="txtSecurity.TabIndex" type="System.Int32, mscorlib">
+    <value>26</value>
  </data>
 </root>
--- a/v2rayN/v2rayN/Forms/AddServer4Form.zh-Hans.resx
+++ b/v2rayN/v2rayN/Forms/AddServer4Form.zh-Hans.resx
@@ -117,27 +117,33 @@
  <resheader name="writer">
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="$this.Text" xml:space="preserve">
+    <value>编辑或添加[Socks]服务器</value>
+  </data>
  <data name="btnClose.Text" xml:space="preserve">
    <value>取消(&amp;C)</value>
  </data>
+  <data name="btnOK.Text" xml:space="preserve">
+    <value>确定(&amp;O)</value>
+  </data>
  <data name="groupBox1.Text" xml:space="preserve">
    <value>服务器</value>
  </data>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="txtSecurity.Location" type="System.Drawing.Point, System.Drawing">
-    <value>127, 85</value>
+  <data name="label1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>65, 12</value>
  </data>
-  <data name="label4.Location" type="System.Drawing.Point, System.Drawing">
-    <value>12, 89</value>
+  <data name="label1.Text" xml:space="preserve">
+    <value>服务器地址</value>
  </data>
-  <data name="label4.Size" type="System.Drawing.Size, System.Drawing">
-    <value>77, 12</value>
+  <data name="label13.Text" xml:space="preserve">
+    <value>*手填,方便识别管理</value>
  </data>
-  <data name="label4.Text" xml:space="preserve">
-    <value>用户名(可选)</value>
+  <data name="label2.Size" type="System.Drawing.Size, System.Drawing">
+    <value>65, 12</value>
  </data>
-  <data name="txtId.Location" type="System.Drawing.Point, System.Drawing">
-    <value>127, 115</value>
+  <data name="label2.Text" xml:space="preserve">
+    <value>服务器端口</value>
  </data>
  <data name="label3.Location" type="System.Drawing.Point, System.Drawing">
    <value>12, 119</value>
@@ -148,8 +154,14 @@
  <data name="label3.Text" xml:space="preserve">
    <value>密码(可选)</value>
  </data>
-  <data name="label13.Text" xml:space="preserve">
-    <value>*手填,方便识别管理</value>
+  <data name="label4.Location" type="System.Drawing.Point, System.Drawing">
+    <value>12, 89</value>
+  </data>
+  <data name="label4.Size" type="System.Drawing.Size, System.Drawing">
+    <value>77, 12</value>
+  </data>
+  <data name="label4.Text" xml:space="preserve">
+    <value>用户名(可选)</value>
  </data>
  <data name="label6.Size" type="System.Drawing.Size, System.Drawing">
    <value>83, 12</value>
@@ -157,21 +169,6 @@
  <data name="label6.Text" xml:space="preserve">
    <value>别名(remarks)</value>
  </data>
-  <data name="label2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>65, 12</value>
-  </data>
-  <data name="label2.Text" xml:space="preserve">
-    <value>服务器端口</value>
-  </data>
-  <data name="label1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>65, 12</value>
-  </data>
-  <data name="label1.Text" xml:space="preserve">
-    <value>服务器地址</value>
-  </data>
-  <data name="btnOK.Text" xml:space="preserve">
-    <value>确定(&amp;O)</value>
-  </data>
  <data name="MenuItem1.Size" type="System.Drawing.Size, System.Drawing">
    <value>92, 21</value>
  </data>
@@ -184,7 +181,10 @@
  <data name="menuItemImportClipboard.Text" xml:space="preserve">
    <value>从剪贴板导入URL</value>
  </data>
-  <data name="$this.Text" xml:space="preserve">
-    <value>编辑或添加[Socks]服务器</value>
+  <data name="txtId.Location" type="System.Drawing.Point, System.Drawing">
+    <value>127, 115</value>
+  </data>
+  <data name="txtSecurity.Location" type="System.Drawing.Point, System.Drawing">
+    <value>127, 85</value>
  </data>
 </root>
--- a/v2rayN/v2rayN/Forms/AddServerForm.cs
+++ b/v2rayN/v2rayN/Forms/AddServerForm.cs
@@ -166,7 +166,7 @@ namespace v2rayN.Forms
            }
            else
            {
-                UI.Show(UIRes.I18N("OperationFailed"));
+                UI.ShowWarning(UIRes.I18N("OperationFailed"));
            }
        }

@@ -207,9 +207,11 @@ namespace v2rayN.Forms
        {
            ClearServer();

-            OpenFileDialog fileDialog = new OpenFileDialog();
-            fileDialog.Multiselect = false;
-            fileDialog.Filter = "Config|*.json|All|*.*";
+            OpenFileDialog fileDialog = new OpenFileDialog
+            {
+                Multiselect = false,
+                Filter = "Config|*.json|All|*.*"
+            };
            if (fileDialog.ShowDialog() != DialogResult.OK)
            {
                return;
@@ -231,7 +233,7 @@ namespace v2rayN.Forms
            }
            if (vmessItem == null)
            {
-                UI.Show(msg);
+                UI.ShowWarning(msg);
                return;
            }

@@ -256,11 +258,10 @@ namespace v2rayN.Forms
        {
            ClearServer();

-            string msg;
-            VmessItem vmessItem = V2rayConfigHandler.ImportFromClipboardConfig(Utils.GetClipboardData(), out msg);
+            VmessItem vmessItem = V2rayConfigHandler.ImportFromClipboardConfig(Utils.GetClipboardData(), out string msg);
            if (vmessItem == null)
            {
-                UI.Show(msg);
+                UI.ShowWarning(msg);
                return;
            }

--- a/v2rayN/v2rayN/Forms/AddServerForm.resx
+++ b/v2rayN/v2rayN/Forms/AddServerForm.resx
--- a/v2rayN/v2rayN/Forms/AddServerForm.zh-Hans.resx
+++ b/v2rayN/v2rayN/Forms/AddServerForm.zh-Hans.resx
@@ -117,51 +117,63 @@
  <resheader name="writer">
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="$this.Text" xml:space="preserve">
+    <value>编辑或添加[VMess]服务器</value>
+  </data>
  <data name="btnClose.Text" xml:space="preserve">
    <value>取消(&amp;C)</value>
  </data>
-  <data name="groupBox1.Text" xml:space="preserve">
-    <value>服务器</value>
-  </data>
  <data name="btnGUID.Text" xml:space="preserve">
    <value>生成(&amp;G)</value>
  </data>
-  <data name="label13.Text" xml:space="preserve">
-    <value>*手填,方便识别管理</value>
+  <data name="btnOK.Text" xml:space="preserve">
+    <value>确定(&amp;O)</value>
+  </data>
+  <data name="cmbNetwork.Location" type="System.Drawing.Point, System.Drawing">
+    <value>127, 171</value>
+  </data>
+  <data name="cmbNetwork.Size" type="System.Drawing.Size, System.Drawing">
+    <value>211, 20</value>
+  </data>
+  <data name="cmbSecurity.Location" type="System.Drawing.Point, System.Drawing">
+    <value>127, 143</value>
+  </data>
+  <data name="cmbSecurity.Size" type="System.Drawing.Size, System.Drawing">
+    <value>211, 20</value>
+  </data>
+  <data name="groupBox1.Text" xml:space="preserve">
+    <value>服务器</value>
  </data>
  <data name="groupBox2.Text" xml:space="preserve">
    <value>不清楚则保持默认值</value>
  </data>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="label24.Size" type="System.Drawing.Size, System.Drawing">
-    <value>95, 12</value>
+  <data name="label1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>83, 12</value>
  </data>
-  <data name="label24.Text" xml:space="preserve">
-    <value>3)QUIC 加密密钥</value>
+  <data name="label1.Text" xml:space="preserve">
+    <value>地址(address)</value>
  </data>
-  <data name="label23.Size" type="System.Drawing.Size, System.Drawing">
-    <value>95, 12</value>
+  <data name="label10.Size" type="System.Drawing.Size, System.Drawing">
+    <value>89, 12</value>
  </data>
-  <data name="label23.Text" xml:space="preserve">
-    <value>4)QUIC 加密方式</value>
+  <data name="label10.Text" xml:space="preserve">
+    <value>伪装域名(host)</value>
  </data>
-  <data name="label22.Size" type="System.Drawing.Size, System.Drawing">
-    <value>53, 12</value>
+  <data name="label11.Size" type="System.Drawing.Size, System.Drawing">
+    <value>89, 12</value>
  </data>
-  <data name="label22.Text" xml:space="preserve">
-    <value>默认true</value>
+  <data name="label11.Text" xml:space="preserve">
+    <value>伪装类型(type)</value>
  </data>
-  <data name="label20.Size" type="System.Drawing.Size, System.Drawing">
-    <value>149, 12</value>
+  <data name="label12.Size" type="System.Drawing.Size, System.Drawing">
+    <value>197, 12</value>
  </data>
-  <data name="label20.Text" xml:space="preserve">
-    <value>3)h2 host中间逗号(,)隔开</value>
+  <data name="label12.Text" xml:space="preserve">
+    <value>*tcp或kcp或QUIC伪装类型,默认none</value>
  </data>
-  <data name="label19.Size" type="System.Drawing.Size, System.Drawing">
-    <value>65, 12</value>
-  </data>
-  <data name="label19.Text" xml:space="preserve">
-    <value>路径(path)</value>
+  <data name="label13.Text" xml:space="preserve">
+    <value>*手填,方便识别管理</value>
  </data>
  <data name="label14.Size" type="System.Drawing.Size, System.Drawing">
    <value>161, 12</value>
@@ -175,83 +187,11 @@
  <data name="label15.Text" xml:space="preserve">
    <value>底层传输安全</value>
  </data>
-  <data name="label12.Size" type="System.Drawing.Size, System.Drawing">
-    <value>197, 12</value>
-  </data>
-  <data name="label12.Text" xml:space="preserve">
-    <value>*tcp或kcp或QUIC伪装类型,默认none</value>
-  </data>
-  <data name="txtRequestHost.Location" type="System.Drawing.Point, System.Drawing">
-    <value>124, 58</value>
-  </data>
-  <data name="txtRequestHost.Size" type="System.Drawing.Size, System.Drawing">
-    <value>334, 51</value>
-  </data>
-  <data name="label11.Size" type="System.Drawing.Size, System.Drawing">
-    <value>89, 12</value>
-  </data>
-  <data name="label11.Text" xml:space="preserve">
-    <value>伪装类型(type)</value>
-  </data>
-  <data name="label10.Size" type="System.Drawing.Size, System.Drawing">
-    <value>89, 12</value>
-  </data>
-  <data name="label10.Text" xml:space="preserve">
-    <value>伪装域名(host)</value>
-  </data>
-  <data name="label9.Size" type="System.Drawing.Size, System.Drawing">
-    <value>143, 12</value>
-  </data>
-  <data name="label9.Text" xml:space="preserve">
-    <value>*默认tcp,选错会无法连接</value>
-  </data>
-  <data name="label8.Size" type="System.Drawing.Size, System.Drawing">
-    <value>113, 12</value>
-  </data>
-  <data name="label8.Text" xml:space="preserve">
-    <value>*随便选,建议(auto)</value>
-  </data>
-  <data name="cmbNetwork.Location" type="System.Drawing.Point, System.Drawing">
-    <value>127, 171</value>
-  </data>
-  <data name="cmbNetwork.Size" type="System.Drawing.Size, System.Drawing">
-    <value>211, 20</value>
-  </data>
-  <data name="label7.Size" type="System.Drawing.Size, System.Drawing">
-    <value>107, 12</value>
-  </data>
-  <data name="label7.Text" xml:space="preserve">
-    <value>传输协议(network)</value>
-  </data>
-  <data name="cmbSecurity.Location" type="System.Drawing.Point, System.Drawing">
-    <value>127, 143</value>
-  </data>
-  <data name="cmbSecurity.Size" type="System.Drawing.Size, System.Drawing">
-    <value>211, 20</value>
-  </data>
-  <data name="label6.Size" type="System.Drawing.Size, System.Drawing">
-    <value>83, 12</value>
-  </data>
-  <data name="label6.Text" xml:space="preserve">
-    <value>别名(remarks)</value>
-  </data>
-  <data name="label5.Size" type="System.Drawing.Size, System.Drawing">
-    <value>113, 12</value>
-  </data>
-  <data name="label5.Text" xml:space="preserve">
-    <value>加密方式(security)</value>
-  </data>
-  <data name="label4.Size" type="System.Drawing.Size, System.Drawing">
-    <value>95, 12</value>
-  </data>
-  <data name="label4.Text" xml:space="preserve">
-    <value>额外ID(alterId)</value>
-  </data>
-  <data name="label3.Size" type="System.Drawing.Size, System.Drawing">
+  <data name="label19.Size" type="System.Drawing.Size, System.Drawing">
    <value>65, 12</value>
  </data>
-  <data name="label3.Text" xml:space="preserve">
-    <value>用户ID(id)</value>
+  <data name="label19.Text" xml:space="preserve">
+    <value>路径(path)</value>
  </data>
  <data name="label2.Size" type="System.Drawing.Size, System.Drawing">
    <value>65, 12</value>
@@ -259,14 +199,71 @@
  <data name="label2.Text" xml:space="preserve">
    <value>端口(port)</value>
  </data>
-  <data name="label1.Size" type="System.Drawing.Size, System.Drawing">
+  <data name="label20.Size" type="System.Drawing.Size, System.Drawing">
+    <value>149, 12</value>
+  </data>
+  <data name="label20.Text" xml:space="preserve">
+    <value>3)h2 host中间逗号(,)隔开</value>
+  </data>
+  <data name="label22.Size" type="System.Drawing.Size, System.Drawing">
+    <value>53, 12</value>
+  </data>
+  <data name="label22.Text" xml:space="preserve">
+    <value>默认true</value>
+  </data>
+  <data name="label23.Size" type="System.Drawing.Size, System.Drawing">
+    <value>95, 12</value>
+  </data>
+  <data name="label23.Text" xml:space="preserve">
+    <value>4)QUIC 加密方式</value>
+  </data>
+  <data name="label24.Size" type="System.Drawing.Size, System.Drawing">
+    <value>95, 12</value>
+  </data>
+  <data name="label24.Text" xml:space="preserve">
+    <value>3)QUIC 加密密钥</value>
+  </data>
+  <data name="label3.Size" type="System.Drawing.Size, System.Drawing">
+    <value>65, 12</value>
+  </data>
+  <data name="label3.Text" xml:space="preserve">
+    <value>用户ID(id)</value>
+  </data>
+  <data name="label4.Size" type="System.Drawing.Size, System.Drawing">
+    <value>95, 12</value>
+  </data>
+  <data name="label4.Text" xml:space="preserve">
+    <value>额外ID(alterId)</value>
+  </data>
+  <data name="label5.Size" type="System.Drawing.Size, System.Drawing">
+    <value>113, 12</value>
+  </data>
+  <data name="label5.Text" xml:space="preserve">
+    <value>加密方式(security)</value>
+  </data>
+  <data name="label6.Size" type="System.Drawing.Size, System.Drawing">
    <value>83, 12</value>
  </data>
-  <data name="label1.Text" xml:space="preserve">
-    <value>地址(address)</value>
+  <data name="label6.Text" xml:space="preserve">
+    <value>别名(remarks)</value>
  </data>
-  <data name="btnOK.Text" xml:space="preserve">
-    <value>确定(&amp;O)</value>
+  <data name="label7.Size" type="System.Drawing.Size, System.Drawing">
+    <value>107, 12</value>
+  </data>
+  <data name="label7.Text" xml:space="preserve">
+    <value>传输协议(network)</value>
+  </data>
+  <data name="label8.Size" type="System.Drawing.Size, System.Drawing">
+    <value>113, 12</value>
+  </data>
+  <data name="label8.Text" xml:space="preserve">
+    <value>*随便选,建议(auto)</value>
+  </data>
+  <data name="label9.Size" type="System.Drawing.Size, System.Drawing">
+    <value>143, 12</value>
+  </data>
+  <data name="label9.Text" xml:space="preserve">
+    <value>*默认tcp,选错会无法连接</value>
  </data>
  <data name="MenuItem1.Size" type="System.Drawing.Size, System.Drawing">
    <value>92, 21</value>
@@ -280,6 +277,12 @@
  <data name="MenuItemImportClient.Text" xml:space="preserve">
    <value>导入客户端配置</value>
  </data>
+  <data name="MenuItemImportClipboard.Size" type="System.Drawing.Size, System.Drawing">
+    <value>171, 22</value>
+  </data>
+  <data name="MenuItemImportClipboard.Text" xml:space="preserve">
+    <value>从剪贴板导入URL</value>
+  </data>
  <data name="MenuItemImportServer.Size" type="System.Drawing.Size, System.Drawing">
    <value>171, 22</value>
  </data>
@@ -289,13 +292,10 @@
  <data name="toolStripSeparator1.Size" type="System.Drawing.Size, System.Drawing">
    <value>168, 6</value>
  </data>
-  <data name="MenuItemImportClipboard.Size" type="System.Drawing.Size, System.Drawing">
-    <value>171, 22</value>
+  <data name="txtRequestHost.Location" type="System.Drawing.Point, System.Drawing">
+    <value>124, 58</value>
  </data>
-  <data name="MenuItemImportClipboard.Text" xml:space="preserve">
-    <value>从剪贴板导入URL</value>
-  </data>
-  <data name="$this.Text" xml:space="preserve">
-    <value>编辑或添加[VMess]服务器</value>
+  <data name="txtRequestHost.Size" type="System.Drawing.Size, System.Drawing">
+    <value>334, 51</value>
  </data>
 </root>
--- a/v2rayN/v2rayN/Forms/MainForm.Designer.cs
+++ b/v2rayN/v2rayN/Forms/MainForm.Designer.cs
@@ -31,7 +31,7 @@
            this.components = new System.ComponentModel.Container();
            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainForm));
            this.splitContainer1 = new System.Windows.Forms.SplitContainer();
-            this.lvServers = new v2rayN.Forms.ListViewFlickerFree();
+            this.lvServers = new v2rayN.Base.ListViewFlickerFree();
            this.cmsLv = new System.Windows.Forms.ContextMenuStrip(this.components);
            this.menuAddVmessServer = new System.Windows.Forms.ToolStripMenuItem();
            this.menuAddShadowsocksServer = new System.Windows.Forms.ToolStripMenuItem();
@@ -60,20 +60,23 @@
            this.menuExport2ServerConfig = new System.Windows.Forms.ToolStripMenuItem();
            this.menuExport2ShareUrl = new System.Windows.Forms.ToolStripMenuItem();
            this.menuExport2SubContent = new System.Windows.Forms.ToolStripMenuItem();
-            this.qrCodeControl = new v2rayN.Forms.QRCodeControl();
            this.tsbServer = new System.Windows.Forms.ToolStripDropDownButton();
+            this.qrCodeControl = new v2rayN.Forms.QRCodeControl();
            this.notifyMain = new System.Windows.Forms.NotifyIcon(this.components);
            this.cmsMain = new System.Windows.Forms.ContextMenuStrip(this.components);
-            this.menuSysAgentEnabled = new System.Windows.Forms.ToolStripMenuItem();
            this.menuSysAgentMode = new System.Windows.Forms.ToolStripMenuItem();
+            this.menuNotEnabledHttp = new System.Windows.Forms.ToolStripMenuItem();
            this.menuGlobal = new System.Windows.Forms.ToolStripMenuItem();
            this.menuGlobalPAC = new System.Windows.Forms.ToolStripMenuItem();
            this.menuKeep = new System.Windows.Forms.ToolStripMenuItem();
            this.menuKeepPAC = new System.Windows.Forms.ToolStripMenuItem();
+            this.menuKeepNothing = new System.Windows.Forms.ToolStripMenuItem();
+            this.menuKeepPACNothing = new System.Windows.Forms.ToolStripMenuItem();
            this.menuServers = new System.Windows.Forms.ToolStripMenuItem();
            this.menuAddServers2 = new System.Windows.Forms.ToolStripMenuItem();
            this.menuScanScreen2 = new System.Windows.Forms.ToolStripMenuItem();
            this.menuCopyPACUrl = new System.Windows.Forms.ToolStripMenuItem();
+            this.menuUpdateSubscriptions = new System.Windows.Forms.ToolStripMenuItem();
            this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
            this.menuExit = new System.Windows.Forms.ToolStripMenuItem();
            this.bgwScan = new System.ComponentModel.BackgroundWorker();
@@ -101,16 +104,20 @@
            this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator();
            this.tsbOptionSetting = new System.Windows.Forms.ToolStripButton();
            this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator();
-            this.tsbReload = new System.Windows.Forms.ToolStripButton();
+            this.tsbService = new System.Windows.Forms.ToolStripDropDownButton();
+            this.tsbReload = new System.Windows.Forms.ToolStripMenuItem();
+            this.tsbTestMe = new System.Windows.Forms.ToolStripMenuItem();
            this.toolStripSeparator7 = new System.Windows.Forms.ToolStripSeparator();
            this.tsbCheckUpdate = new System.Windows.Forms.ToolStripDropDownButton();
            this.tsbCheckUpdateN = new System.Windows.Forms.ToolStripMenuItem();
            this.tsbCheckUpdateCore = new System.Windows.Forms.ToolStripMenuItem();
            this.tsbCheckUpdatePACList = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripSeparator13 = new System.Windows.Forms.ToolStripSeparator();
            this.tsbCheckClearPACList = new System.Windows.Forms.ToolStripMenuItem();
            this.toolStripSeparator10 = new System.Windows.Forms.ToolStripSeparator();
            this.tsbHelp = new System.Windows.Forms.ToolStripDropDownButton();
            this.tsbAbout = new System.Windows.Forms.ToolStripMenuItem();
+            this.tsbV2rayWebsite = new System.Windows.Forms.ToolStripMenuItem();
            this.toolStripSeparator12 = new System.Windows.Forms.ToolStripSeparator();
            this.tsbLanguageDef = new System.Windows.Forms.ToolStripMenuItem();
            this.tsbLanguageZhHans = new System.Windows.Forms.ToolStripMenuItem();
@@ -137,17 +144,19 @@
            // 
            // splitContainer1.Panel1
            // 
+            resources.ApplyResources(this.splitContainer1.Panel1, "splitContainer1.Panel1");
            this.splitContainer1.Panel1.Controls.Add(this.lvServers);
            // 
            // splitContainer1.Panel2
            // 
+            resources.ApplyResources(this.splitContainer1.Panel2, "splitContainer1.Panel2");
            this.splitContainer1.Panel2.Controls.Add(this.qrCodeControl);
            this.splitContainer1.SplitterMoved += new System.Windows.Forms.SplitterEventHandler(this.splitContainer1_SplitterMoved);
            // 
            // lvServers
            // 
-            this.lvServers.ContextMenuStrip = this.cmsLv;
            resources.ApplyResources(this.lvServers, "lvServers");
+            this.lvServers.ContextMenuStrip = this.cmsLv;
            this.lvServers.FullRowSelect = true;
            this.lvServers.GridLines = true;
            this.lvServers.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable;
@@ -159,11 +168,13 @@
            this.lvServers.UseCompatibleStateImageBehavior = false;
            this.lvServers.View = System.Windows.Forms.View.Details;
            this.lvServers.SelectedIndexChanged += new System.EventHandler(this.lvServers_SelectedIndexChanged);
+            this.lvServers.Click += new System.EventHandler(this.lvServers_Click);
            this.lvServers.DoubleClick += new System.EventHandler(this.lvServers_DoubleClick);
            this.lvServers.KeyDown += new System.Windows.Forms.KeyEventHandler(this.lvServers_KeyDown);
            // 
            // cmsLv
            // 
+            resources.ApplyResources(this.cmsLv, "cmsLv");
            this.cmsLv.ImageScalingSize = new System.Drawing.Size(20, 20);
            this.cmsLv.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
            this.menuAddVmessServer,
@@ -195,195 +206,194 @@
            this.menuExport2SubContent});
            this.cmsLv.Name = "cmsLv";
            this.cmsLv.OwnerItem = this.tsbServer;
-            resources.ApplyResources(this.cmsLv, "cmsLv");
            // 
            // menuAddVmessServer
            // 
-            this.menuAddVmessServer.Name = "menuAddVmessServer";
            resources.ApplyResources(this.menuAddVmessServer, "menuAddVmessServer");
+            this.menuAddVmessServer.Name = "menuAddVmessServer";
            this.menuAddVmessServer.Click += new System.EventHandler(this.menuAddVmessServer_Click);
            // 
            // menuAddShadowsocksServer
            // 
-            this.menuAddShadowsocksServer.Name = "menuAddShadowsocksServer";
            resources.ApplyResources(this.menuAddShadowsocksServer, "menuAddShadowsocksServer");
+            this.menuAddShadowsocksServer.Name = "menuAddShadowsocksServer";
            this.menuAddShadowsocksServer.Click += new System.EventHandler(this.menuAddShadowsocksServer_Click);
            // 
            // menuAddSocksServer
            // 
-            this.menuAddSocksServer.Name = "menuAddSocksServer";
            resources.ApplyResources(this.menuAddSocksServer, "menuAddSocksServer");
+            this.menuAddSocksServer.Name = "menuAddSocksServer";
            this.menuAddSocksServer.Click += new System.EventHandler(this.menuAddSocksServer_Click);
            // 
            // menuAddCustomServer
            // 
-            this.menuAddCustomServer.Name = "menuAddCustomServer";
            resources.ApplyResources(this.menuAddCustomServer, "menuAddCustomServer");
+            this.menuAddCustomServer.Name = "menuAddCustomServer";
            this.menuAddCustomServer.Click += new System.EventHandler(this.menuAddCustomServer_Click);
            // 
            // menuAddServers
            // 
-            this.menuAddServers.Name = "menuAddServers";
            resources.ApplyResources(this.menuAddServers, "menuAddServers");
+            this.menuAddServers.Name = "menuAddServers";
            this.menuAddServers.Click += new System.EventHandler(this.menuAddServers_Click);
            // 
            // menuScanScreen
            // 
-            this.menuScanScreen.Name = "menuScanScreen";
            resources.ApplyResources(this.menuScanScreen, "menuScanScreen");
+            this.menuScanScreen.Name = "menuScanScreen";
            this.menuScanScreen.Click += new System.EventHandler(this.menuScanScreen_Click);
            // 
            // toolStripSeparator1
            // 
-            this.toolStripSeparator1.Name = "toolStripSeparator1";
            resources.ApplyResources(this.toolStripSeparator1, "toolStripSeparator1");
+            this.toolStripSeparator1.Name = "toolStripSeparator1";
            // 
            // menuRemoveServer
            // 
-            this.menuRemoveServer.Name = "menuRemoveServer";
            resources.ApplyResources(this.menuRemoveServer, "menuRemoveServer");
+            this.menuRemoveServer.Name = "menuRemoveServer";
            this.menuRemoveServer.Click += new System.EventHandler(this.menuRemoveServer_Click);
            // 
            // menuRemoveDuplicateServer
            // 
-            this.menuRemoveDuplicateServer.Name = "menuRemoveDuplicateServer";
            resources.ApplyResources(this.menuRemoveDuplicateServer, "menuRemoveDuplicateServer");
+            this.menuRemoveDuplicateServer.Name = "menuRemoveDuplicateServer";
            this.menuRemoveDuplicateServer.Click += new System.EventHandler(this.menuRemoveDuplicateServer_Click);
            // 
            // menuCopyServer
            // 
-            this.menuCopyServer.Name = "menuCopyServer";
            resources.ApplyResources(this.menuCopyServer, "menuCopyServer");
+            this.menuCopyServer.Name = "menuCopyServer";
            this.menuCopyServer.Click += new System.EventHandler(this.menuCopyServer_Click);
            // 
            // menuSetDefaultServer
            // 
-            this.menuSetDefaultServer.Name = "menuSetDefaultServer";
            resources.ApplyResources(this.menuSetDefaultServer, "menuSetDefaultServer");
+            this.menuSetDefaultServer.Name = "menuSetDefaultServer";
            this.menuSetDefaultServer.Click += new System.EventHandler(this.menuSetDefaultServer_Click);
            // 
            // toolStripSeparator3
            // 
-            this.toolStripSeparator3.Name = "toolStripSeparator3";
            resources.ApplyResources(this.toolStripSeparator3, "toolStripSeparator3");
+            this.toolStripSeparator3.Name = "toolStripSeparator3";
            // 
            // menuMoveTop
            // 
-            this.menuMoveTop.Name = "menuMoveTop";
            resources.ApplyResources(this.menuMoveTop, "menuMoveTop");
+            this.menuMoveTop.Name = "menuMoveTop";
            this.menuMoveTop.Click += new System.EventHandler(this.menuMoveTop_Click);
            // 
            // menuMoveUp
            // 
-            this.menuMoveUp.Name = "menuMoveUp";
            resources.ApplyResources(this.menuMoveUp, "menuMoveUp");
+            this.menuMoveUp.Name = "menuMoveUp";
            this.menuMoveUp.Click += new System.EventHandler(this.menuMoveUp_Click);
            // 
            // menuMoveDown
            // 
-            this.menuMoveDown.Name = "menuMoveDown";
            resources.ApplyResources(this.menuMoveDown, "menuMoveDown");
+            this.menuMoveDown.Name = "menuMoveDown";
            this.menuMoveDown.Click += new System.EventHandler(this.menuMoveDown_Click);
            // 
            // menuMoveBottom
            // 
-            this.menuMoveBottom.Name = "menuMoveBottom";
            resources.ApplyResources(this.menuMoveBottom, "menuMoveBottom");
+            this.menuMoveBottom.Name = "menuMoveBottom";
            this.menuMoveBottom.Click += new System.EventHandler(this.menuMoveBottom_Click);
            // 
            // menuSelectAll
            // 
-            this.menuSelectAll.Name = "menuSelectAll";
            resources.ApplyResources(this.menuSelectAll, "menuSelectAll");
+            this.menuSelectAll.Name = "menuSelectAll";
            this.menuSelectAll.Click += new System.EventHandler(this.menuSelectAll_Click);
            // 
            // toolStripSeparator9
            // 
-            this.toolStripSeparator9.Name = "toolStripSeparator9";
            resources.ApplyResources(this.toolStripSeparator9, "toolStripSeparator9");
+            this.toolStripSeparator9.Name = "toolStripSeparator9";
            // 
            // menuPingServer
            // 
-            this.menuPingServer.Name = "menuPingServer";
            resources.ApplyResources(this.menuPingServer, "menuPingServer");
+            this.menuPingServer.Name = "menuPingServer";
            this.menuPingServer.Click += new System.EventHandler(this.menuPingServer_Click);
            // 
            // menuTcpingServer
            // 
-            this.menuTcpingServer.Name = "menuTcpingServer";
            resources.ApplyResources(this.menuTcpingServer, "menuTcpingServer");
+            this.menuTcpingServer.Name = "menuTcpingServer";
            this.menuTcpingServer.Click += new System.EventHandler(this.menuTcpingServer_Click);
            // 
            // menuRealPingServer
            // 
-            this.menuRealPingServer.Name = "menuRealPingServer";
            resources.ApplyResources(this.menuRealPingServer, "menuRealPingServer");
+            this.menuRealPingServer.Name = "menuRealPingServer";
            this.menuRealPingServer.Click += new System.EventHandler(this.menuRealPingServer_Click);
            // 
            // menuSpeedServer
            // 
-            this.menuSpeedServer.Name = "menuSpeedServer";
            resources.ApplyResources(this.menuSpeedServer, "menuSpeedServer");
+            this.menuSpeedServer.Name = "menuSpeedServer";
            this.menuSpeedServer.Click += new System.EventHandler(this.menuSpeedServer_Click);
            // 
            // toolStripSeparator6
            // 
-            this.toolStripSeparator6.Name = "toolStripSeparator6";
            resources.ApplyResources(this.toolStripSeparator6, "toolStripSeparator6");
+            this.toolStripSeparator6.Name = "toolStripSeparator6";
            // 
            // menuExport2ClientConfig
            // 
-            this.menuExport2ClientConfig.Name = "menuExport2ClientConfig";
            resources.ApplyResources(this.menuExport2ClientConfig, "menuExport2ClientConfig");
+            this.menuExport2ClientConfig.Name = "menuExport2ClientConfig";
            this.menuExport2ClientConfig.Click += new System.EventHandler(this.menuExport2ClientConfig_Click);
            // 
            // menuExport2ServerConfig
            // 
-            this.menuExport2ServerConfig.Name = "menuExport2ServerConfig";
            resources.ApplyResources(this.menuExport2ServerConfig, "menuExport2ServerConfig");
+            this.menuExport2ServerConfig.Name = "menuExport2ServerConfig";
            this.menuExport2ServerConfig.Click += new System.EventHandler(this.menuExport2ServerConfig_Click);
            // 
            // menuExport2ShareUrl
            // 
-            this.menuExport2ShareUrl.Name = "menuExport2ShareUrl";
            resources.ApplyResources(this.menuExport2ShareUrl, "menuExport2ShareUrl");
+            this.menuExport2ShareUrl.Name = "menuExport2ShareUrl";
            this.menuExport2ShareUrl.Click += new System.EventHandler(this.menuExport2ShareUrl_Click);
            // 
            // menuExport2SubContent
            // 
-            this.menuExport2SubContent.Name = "menuExport2SubContent";
            resources.ApplyResources(this.menuExport2SubContent, "menuExport2SubContent");
+            this.menuExport2SubContent.Name = "menuExport2SubContent";
            this.menuExport2SubContent.Click += new System.EventHandler(this.menuExport2SubContent_Click);
            // 
+            // tsbServer
+            // 
+            resources.ApplyResources(this.tsbServer, "tsbServer");
+            this.tsbServer.DropDown = this.cmsLv;
+            this.tsbServer.Image = global::v2rayN.Properties.Resources.server;
+            this.tsbServer.Name = "tsbServer";
+            // 
            // qrCodeControl
            // 
            resources.ApplyResources(this.qrCodeControl, "qrCodeControl");
            this.qrCodeControl.Name = "qrCodeControl";
            // 
-            // tsbServer
-            // 
-            this.tsbServer.DropDown = this.cmsLv;
-            this.tsbServer.Image = global::v2rayN.Properties.Resources.server;
-            resources.ApplyResources(this.tsbServer, "tsbServer");
-            this.tsbServer.Name = "tsbServer";
-            // 
            // notifyMain
            // 
-            this.notifyMain.ContextMenuStrip = this.cmsMain;
            resources.ApplyResources(this.notifyMain, "notifyMain");
+            this.notifyMain.ContextMenuStrip = this.cmsMain;
            this.notifyMain.MouseClick += new System.Windows.Forms.MouseEventHandler(this.notifyMain_MouseClick);
            // 
            // cmsMain
            // 
-            this.cmsMain.ImageScalingSize = new System.Drawing.Size(20, 20);
            resources.ApplyResources(this.cmsMain, "cmsMain");
+            this.cmsMain.ImageScalingSize = new System.Drawing.Size(20, 20);
            this.cmsMain.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.menuSysAgentEnabled,
            this.menuSysAgentMode,
            this.menuServers,
            this.menuAddServers2,
            this.menuScanScreen2,
            this.menuCopyPACUrl,
+            this.menuUpdateSubscriptions,
            this.toolStripSeparator2,
            this.menuExit});
            this.cmsMain.Name = "contextMenuStrip1";
@@ -391,78 +401,99 @@
            this.cmsMain.ShowCheckMargin = true;
            this.cmsMain.ShowImageMargin = false;
            // 
-            // menuSysAgentEnabled
-            // 
-            this.menuSysAgentEnabled.Name = "menuSysAgentEnabled";
-            resources.ApplyResources(this.menuSysAgentEnabled, "menuSysAgentEnabled");
-            this.menuSysAgentEnabled.Click += new System.EventHandler(this.menuSysAgentEnabled_Click);
-            // 
            // menuSysAgentMode
            // 
+            resources.ApplyResources(this.menuSysAgentMode, "menuSysAgentMode");
            this.menuSysAgentMode.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.menuNotEnabledHttp,
            this.menuGlobal,
            this.menuGlobalPAC,
            this.menuKeep,
-            this.menuKeepPAC});
+            this.menuKeepPAC,
+            this.menuKeepNothing,
+            this.menuKeepPACNothing});
            this.menuSysAgentMode.Name = "menuSysAgentMode";
-            resources.ApplyResources(this.menuSysAgentMode, "menuSysAgentMode");
+            // 
+            // menuNotEnabledHttp
+            // 
+            resources.ApplyResources(this.menuNotEnabledHttp, "menuNotEnabledHttp");
+            this.menuNotEnabledHttp.Name = "menuNotEnabledHttp";
+            this.menuNotEnabledHttp.Click += new System.EventHandler(this.menuNotEnabledHttp_Click);
            // 
            // menuGlobal
            // 
-            this.menuGlobal.Name = "menuGlobal";
            resources.ApplyResources(this.menuGlobal, "menuGlobal");
+            this.menuGlobal.Name = "menuGlobal";
            this.menuGlobal.Click += new System.EventHandler(this.menuGlobal_Click);
            // 
            // menuGlobalPAC
            // 
-            this.menuGlobalPAC.Name = "menuGlobalPAC";
            resources.ApplyResources(this.menuGlobalPAC, "menuGlobalPAC");
+            this.menuGlobalPAC.Name = "menuGlobalPAC";
            this.menuGlobalPAC.Click += new System.EventHandler(this.menuGlobalPAC_Click);
            // 
            // menuKeep
            // 
-            this.menuKeep.Name = "menuKeep";
            resources.ApplyResources(this.menuKeep, "menuKeep");
+            this.menuKeep.Name = "menuKeep";
            this.menuKeep.Click += new System.EventHandler(this.menuKeep_Click);
            // 
            // menuKeepPAC
            // 
-            this.menuKeepPAC.Name = "menuKeepPAC";
            resources.ApplyResources(this.menuKeepPAC, "menuKeepPAC");
+            this.menuKeepPAC.Name = "menuKeepPAC";
            this.menuKeepPAC.Click += new System.EventHandler(this.menuKeepPAC_Click);
            // 
+            // menuKeepNothing
+            // 
+            resources.ApplyResources(this.menuKeepNothing, "menuKeepNothing");
+            this.menuKeepNothing.Name = "menuKeepNothing";
+            this.menuKeepNothing.Click += new System.EventHandler(this.menuKeepNothing_Click);
+            // 
+            // menuKeepPACNothing
+            // 
+            resources.ApplyResources(this.menuKeepPACNothing, "menuKeepPACNothing");
+            this.menuKeepPACNothing.Name = "menuKeepPACNothing";
+            this.menuKeepPACNothing.Click += new System.EventHandler(this.menuKeepPACNothing_Click);
+            // 
            // menuServers
            // 
-            this.menuServers.Name = "menuServers";
            resources.ApplyResources(this.menuServers, "menuServers");
+            this.menuServers.Name = "menuServers";
            // 
            // menuAddServers2
            // 
-            this.menuAddServers2.Name = "menuAddServers2";
            resources.ApplyResources(this.menuAddServers2, "menuAddServers2");
+            this.menuAddServers2.Name = "menuAddServers2";
            this.menuAddServers2.Click += new System.EventHandler(this.menuAddServers_Click);
            // 
            // menuScanScreen2
            // 
-            this.menuScanScreen2.Name = "menuScanScreen2";
            resources.ApplyResources(this.menuScanScreen2, "menuScanScreen2");
+            this.menuScanScreen2.Name = "menuScanScreen2";
            this.menuScanScreen2.Click += new System.EventHandler(this.menuScanScreen_Click);
            // 
            // menuCopyPACUrl
            // 
-            this.menuCopyPACUrl.Name = "menuCopyPACUrl";
            resources.ApplyResources(this.menuCopyPACUrl, "menuCopyPACUrl");
+            this.menuCopyPACUrl.Name = "menuCopyPACUrl";
            this.menuCopyPACUrl.Click += new System.EventHandler(this.menuCopyPACUrl_Click);
            // 
+            // menuUpdateSubscriptions
+            // 
+            resources.ApplyResources(this.menuUpdateSubscriptions, "menuUpdateSubscriptions");
+            this.menuUpdateSubscriptions.Name = "menuUpdateSubscriptions";
+            this.menuUpdateSubscriptions.Click += new System.EventHandler(this.menuUpdateSubscriptions_Click);
+            // 
            // toolStripSeparator2
            // 
-            this.toolStripSeparator2.Name = "toolStripSeparator2";
            resources.ApplyResources(this.toolStripSeparator2, "toolStripSeparator2");
+            this.toolStripSeparator2.Name = "toolStripSeparator2";
            // 
            // menuExit
            // 
-            this.menuExit.Name = "menuExit";
            resources.ApplyResources(this.menuExit, "menuExit");
+            this.menuExit.Name = "menuExit";
            this.menuExit.Click += new System.EventHandler(this.menuExit_Click);
            // 
            // bgwScan
@@ -473,30 +504,31 @@
            // 
            // groupBox1
            // 
-            this.groupBox1.Controls.Add(this.splitContainer1);
            resources.ApplyResources(this.groupBox1, "groupBox1");
+            this.groupBox1.Controls.Add(this.splitContainer1);
            this.groupBox1.Name = "groupBox1";
            this.groupBox1.TabStop = false;
            // 
            // groupBox2
            // 
+            resources.ApplyResources(this.groupBox2, "groupBox2");
            this.groupBox2.Controls.Add(this.txtMsgBox);
            this.groupBox2.Controls.Add(this.ssMain);
-            resources.ApplyResources(this.groupBox2, "groupBox2");
            this.groupBox2.Name = "groupBox2";
            this.groupBox2.TabStop = false;
            // 
            // txtMsgBox
            // 
+            resources.ApplyResources(this.txtMsgBox, "txtMsgBox");
            this.txtMsgBox.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(41)))), ((int)(((byte)(49)))), ((int)(((byte)(52)))));
            this.txtMsgBox.BorderStyle = System.Windows.Forms.BorderStyle.None;
-            resources.ApplyResources(this.txtMsgBox, "txtMsgBox");
            this.txtMsgBox.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(226)))), ((int)(((byte)(228)))));
            this.txtMsgBox.Name = "txtMsgBox";
            this.txtMsgBox.ReadOnly = true;
            // 
            // ssMain
            // 
+            resources.ApplyResources(this.ssMain, "ssMain");
            this.ssMain.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
            this.toolSslSocksPortLab,
            this.toolSslSocksPort,
@@ -509,7 +541,6 @@
            this.toolSslBlank3,
            this.toolSslServerSpeed,
            this.toolSslBlank4});
-            resources.ApplyResources(this.ssMain, "ssMain");
            this.ssMain.Name = "ssMain";
            this.ssMain.ItemClicked += new System.Windows.Forms.ToolStripItemClickedEventHandler(this.ssMain_ItemClicked);
            // 
@@ -520,8 +551,8 @@
            // 
            // toolSslSocksPort
            // 
-            this.toolSslSocksPort.Name = "toolSslSocksPort";
            resources.ApplyResources(this.toolSslSocksPort, "toolSslSocksPort");
+            this.toolSslSocksPort.Name = "toolSslSocksPort";
            // 
            // toolSslBlank1
            // 
@@ -536,8 +567,8 @@
            // 
            // toolSslHttpPort
            // 
-            this.toolSslHttpPort.Name = "toolSslHttpPort";
            resources.ApplyResources(this.toolSslHttpPort, "toolSslHttpPort");
+            this.toolSslHttpPort.Name = "toolSslHttpPort";
            // 
            // toolSslBlank2
            // 
@@ -552,8 +583,8 @@
            // 
            // toolSslPacPort
            // 
-            this.toolSslPacPort.Name = "toolSslPacPort";
            resources.ApplyResources(this.toolSslPacPort, "toolSslPacPort");
+            this.toolSslPacPort.Name = "toolSslPacPort";
            // 
            // toolSslBlank3
            // 
@@ -569,8 +600,8 @@
            // 
            // toolSslBlank4
            // 
-            this.toolSslBlank4.Name = "toolSslBlank4";
            resources.ApplyResources(this.toolSslBlank4, "toolSslBlank4");
+            this.toolSslBlank4.Name = "toolSslBlank4";
            // 
            // panel1
            // 
@@ -579,6 +610,7 @@
            // 
            // tsMain
            // 
+            resources.ApplyResources(this.tsMain, "tsMain");
            this.tsMain.ImageScalingSize = new System.Drawing.Size(32, 32);
            this.tsMain.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
            this.tsbServer,
@@ -587,7 +619,7 @@
            this.toolStripSeparator8,
            this.tsbOptionSetting,
            this.toolStripSeparator5,
-            this.tsbReload,
+            this.tsbService,
            this.toolStripSeparator7,
            this.tsbCheckUpdate,
            this.toolStripSeparator10,
@@ -595,51 +627,58 @@
            this.tsbPromotion,
            this.toolStripSeparator11,
            this.tsbClose});
-            resources.ApplyResources(this.tsMain, "tsMain");
            this.tsMain.Name = "tsMain";
            // 
            // toolStripSeparator4
            // 
-            this.toolStripSeparator4.Name = "toolStripSeparator4";
            resources.ApplyResources(this.toolStripSeparator4, "toolStripSeparator4");
+            this.toolStripSeparator4.Name = "toolStripSeparator4";
            // 
            // tsbSub
            // 
+            resources.ApplyResources(this.tsbSub, "tsbSub");
            this.tsbSub.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
            this.tsbSubSetting,
            this.tsbSubUpdate});
            this.tsbSub.Image = global::v2rayN.Properties.Resources.sub;
-            resources.ApplyResources(this.tsbSub, "tsbSub");
            this.tsbSub.Name = "tsbSub";
            // 
            // tsbSubSetting
            // 
-            this.tsbSubSetting.Name = "tsbSubSetting";
            resources.ApplyResources(this.tsbSubSetting, "tsbSubSetting");
+            this.tsbSubSetting.Name = "tsbSubSetting";
            this.tsbSubSetting.Click += new System.EventHandler(this.tsbSubSetting_Click);
            // 
            // tsbSubUpdate
            // 
-            this.tsbSubUpdate.Name = "tsbSubUpdate";
            resources.ApplyResources(this.tsbSubUpdate, "tsbSubUpdate");
+            this.tsbSubUpdate.Name = "tsbSubUpdate";
            this.tsbSubUpdate.Click += new System.EventHandler(this.tsbSubUpdate_Click);
            // 
            // toolStripSeparator8
            // 
-            this.toolStripSeparator8.Name = "toolStripSeparator8";
            resources.ApplyResources(this.toolStripSeparator8, "toolStripSeparator8");
+            this.toolStripSeparator8.Name = "toolStripSeparator8";
            // 
            // tsbOptionSetting
            // 
-            this.tsbOptionSetting.Image = global::v2rayN.Properties.Resources.option;
            resources.ApplyResources(this.tsbOptionSetting, "tsbOptionSetting");
+            this.tsbOptionSetting.Image = global::v2rayN.Properties.Resources.option;
            this.tsbOptionSetting.Name = "tsbOptionSetting";
            this.tsbOptionSetting.Click += new System.EventHandler(this.tsbOptionSetting_Click);
            // 
            // toolStripSeparator5
            // 
-            this.toolStripSeparator5.Name = "toolStripSeparator5";
            resources.ApplyResources(this.toolStripSeparator5, "toolStripSeparator5");
+            this.toolStripSeparator5.Name = "toolStripSeparator5";
+            // 
+            // tsbService
+            // 
+            resources.ApplyResources(this.tsbService, "tsbService");
+            this.tsbService.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.tsbReload,
+            this.tsbTestMe});
+            this.tsbService.Name = "tsbService";
            // 
            // tsbReload
            // 
@@ -647,97 +686,116 @@
            this.tsbReload.Name = "tsbReload";
            this.tsbReload.Click += new System.EventHandler(this.tsbReload_Click);
            // 
+            // tsbTestMe
+            // 
+            resources.ApplyResources(this.tsbTestMe, "tsbTestMe");
+            this.tsbTestMe.Name = "tsbTestMe";
+            this.tsbTestMe.Click += new System.EventHandler(this.tsbTestMe_Click);
+            // 
            // toolStripSeparator7
            // 
-            this.toolStripSeparator7.Name = "toolStripSeparator7";
            resources.ApplyResources(this.toolStripSeparator7, "toolStripSeparator7");
+            this.toolStripSeparator7.Name = "toolStripSeparator7";
            // 
            // tsbCheckUpdate
            // 
+            resources.ApplyResources(this.tsbCheckUpdate, "tsbCheckUpdate");
            this.tsbCheckUpdate.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
            this.tsbCheckUpdateN,
            this.tsbCheckUpdateCore,
            this.tsbCheckUpdatePACList,
+            this.toolStripSeparator13,
            this.tsbCheckClearPACList});
            this.tsbCheckUpdate.Image = global::v2rayN.Properties.Resources.checkupdate;
-            resources.ApplyResources(this.tsbCheckUpdate, "tsbCheckUpdate");
            this.tsbCheckUpdate.Name = "tsbCheckUpdate";
            // 
            // tsbCheckUpdateN
            // 
-            this.tsbCheckUpdateN.Name = "tsbCheckUpdateN";
            resources.ApplyResources(this.tsbCheckUpdateN, "tsbCheckUpdateN");
+            this.tsbCheckUpdateN.Name = "tsbCheckUpdateN";
            this.tsbCheckUpdateN.Click += new System.EventHandler(this.tsbCheckUpdateN_Click);
            // 
            // tsbCheckUpdateCore
            // 
-            this.tsbCheckUpdateCore.Name = "tsbCheckUpdateCore";
            resources.ApplyResources(this.tsbCheckUpdateCore, "tsbCheckUpdateCore");
+            this.tsbCheckUpdateCore.Name = "tsbCheckUpdateCore";
            this.tsbCheckUpdateCore.Click += new System.EventHandler(this.tsbCheckUpdateCore_Click);
            // 
            // tsbCheckUpdatePACList
            // 
-            this.tsbCheckUpdatePACList.Name = "tsbCheckUpdatePACList";
            resources.ApplyResources(this.tsbCheckUpdatePACList, "tsbCheckUpdatePACList");
+            this.tsbCheckUpdatePACList.Name = "tsbCheckUpdatePACList";
            this.tsbCheckUpdatePACList.Click += new System.EventHandler(this.tsbCheckUpdatePACList_Click);
            // 
+            // toolStripSeparator13
+            // 
+            resources.ApplyResources(this.toolStripSeparator13, "toolStripSeparator13");
+            this.toolStripSeparator13.Name = "toolStripSeparator13";
+            // 
            // tsbCheckClearPACList
            // 
-            this.tsbCheckClearPACList.Name = "tsbCheckClearPACList";
            resources.ApplyResources(this.tsbCheckClearPACList, "tsbCheckClearPACList");
+            this.tsbCheckClearPACList.Name = "tsbCheckClearPACList";
            this.tsbCheckClearPACList.Click += new System.EventHandler(this.tsbCheckClearPACList_Click);
            // 
            // toolStripSeparator10
            // 
-            this.toolStripSeparator10.Name = "toolStripSeparator10";
            resources.ApplyResources(this.toolStripSeparator10, "toolStripSeparator10");
+            this.toolStripSeparator10.Name = "toolStripSeparator10";
            // 
            // tsbHelp
            // 
+            resources.ApplyResources(this.tsbHelp, "tsbHelp");
            this.tsbHelp.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
            this.tsbAbout,
+            this.tsbV2rayWebsite,
            this.toolStripSeparator12,
            this.tsbLanguageDef,
            this.tsbLanguageZhHans});
            this.tsbHelp.Image = global::v2rayN.Properties.Resources.help;
-            resources.ApplyResources(this.tsbHelp, "tsbHelp");
            this.tsbHelp.Name = "tsbHelp";
            // 
            // tsbAbout
            // 
-            this.tsbAbout.Name = "tsbAbout";
            resources.ApplyResources(this.tsbAbout, "tsbAbout");
+            this.tsbAbout.Name = "tsbAbout";
            this.tsbAbout.Click += new System.EventHandler(this.tsbAbout_Click);
            // 
+            // tsbV2rayWebsite
+            // 
+            resources.ApplyResources(this.tsbV2rayWebsite, "tsbV2rayWebsite");
+            this.tsbV2rayWebsite.Name = "tsbV2rayWebsite";
+            this.tsbV2rayWebsite.Click += new System.EventHandler(this.tsbV2rayWebsite_Click);
+            // 
            // toolStripSeparator12
            // 
-            this.toolStripSeparator12.Name = "toolStripSeparator12";
            resources.ApplyResources(this.toolStripSeparator12, "toolStripSeparator12");
+            this.toolStripSeparator12.Name = "toolStripSeparator12";
            // 
            // tsbLanguageDef
            // 
-            this.tsbLanguageDef.Name = "tsbLanguageDef";
            resources.ApplyResources(this.tsbLanguageDef, "tsbLanguageDef");
+            this.tsbLanguageDef.Name = "tsbLanguageDef";
            this.tsbLanguageDef.Click += new System.EventHandler(this.tsbLanguageDef_Click);
            // 
            // tsbLanguageZhHans
            // 
-            this.tsbLanguageZhHans.Name = "tsbLanguageZhHans";
            resources.ApplyResources(this.tsbLanguageZhHans, "tsbLanguageZhHans");
+            this.tsbLanguageZhHans.Name = "tsbLanguageZhHans";
            this.tsbLanguageZhHans.Click += new System.EventHandler(this.tsbLanguageZhHans_Click);
            // 
            // tsbPromotion
            // 
+            resources.ApplyResources(this.tsbPromotion, "tsbPromotion");
            this.tsbPromotion.ForeColor = System.Drawing.Color.Black;
            this.tsbPromotion.Image = global::v2rayN.Properties.Resources.promotion;
-            resources.ApplyResources(this.tsbPromotion, "tsbPromotion");
            this.tsbPromotion.Name = "tsbPromotion";
            this.tsbPromotion.Click += new System.EventHandler(this.tsbPromotion_Click);
            // 
            // toolStripSeparator11
            // 
-            this.toolStripSeparator11.Name = "toolStripSeparator11";
            resources.ApplyResources(this.toolStripSeparator11, "toolStripSeparator11");
+            this.toolStripSeparator11.Name = "toolStripSeparator11";
            // 
            // tsbClose
            // 
@@ -779,12 +837,12 @@

        }

-        #endregion
+#endregion

        private System.Windows.Forms.GroupBox groupBox1;
        private System.Windows.Forms.GroupBox groupBox2;
        private System.Windows.Forms.TextBox txtMsgBox;
-        private v2rayN.Forms.ListViewFlickerFree lvServers;
+        private v2rayN.Base.ListViewFlickerFree lvServers;
        private System.Windows.Forms.NotifyIcon notifyMain;
        private System.Windows.Forms.ContextMenuStrip cmsMain;
        private System.Windows.Forms.ToolStripMenuItem menuExit;
@@ -803,7 +861,6 @@
        private System.Windows.Forms.ToolStrip tsMain;
        private System.Windows.Forms.ToolStripDropDownButton tsbServer;
        private System.Windows.Forms.ToolStripButton tsbOptionSetting;
-        private System.Windows.Forms.ToolStripButton tsbReload;
        private System.Windows.Forms.ToolStripButton tsbClose;
        private System.Windows.Forms.ToolStripSeparator toolStripSeparator4;
        private System.Windows.Forms.ToolStripSeparator toolStripSeparator5;
@@ -818,7 +875,6 @@
        private System.Windows.Forms.ToolStripMenuItem menuGlobal;
        private System.Windows.Forms.ToolStripMenuItem menuGlobalPAC;
        private System.Windows.Forms.ToolStripMenuItem menuKeep;
-        private System.Windows.Forms.ToolStripMenuItem menuSysAgentEnabled;
        private System.Windows.Forms.ToolStripMenuItem menuCopyPACUrl;
        private System.Windows.Forms.ToolStripMenuItem menuAddCustomServer;
        private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;
@@ -868,6 +924,15 @@
        private System.Windows.Forms.ToolStripMenuItem menuRemoveDuplicateServer;
        private System.Windows.Forms.ToolStripMenuItem menuTcpingServer;
        private System.Windows.Forms.ToolStripMenuItem menuRealPingServer;
+        private System.Windows.Forms.ToolStripMenuItem menuNotEnabledHttp;
+        private System.Windows.Forms.ToolStripSeparator toolStripSeparator13;
+        private System.Windows.Forms.ToolStripMenuItem menuUpdateSubscriptions;
+        private System.Windows.Forms.ToolStripMenuItem tsbV2rayWebsite;
+        private System.Windows.Forms.ToolStripMenuItem menuKeepNothing;
+        private System.Windows.Forms.ToolStripMenuItem menuKeepPACNothing;
+        private System.Windows.Forms.ToolStripDropDownButton tsbService;
+        private System.Windows.Forms.ToolStripMenuItem tsbReload;
+        private System.Windows.Forms.ToolStripMenuItem tsbTestMe;
    }
 }

--- a/v2rayN/v2rayN/Forms/MainForm.cs
+++ b/v2rayN/v2rayN/Forms/MainForm.cs
--- a/v2rayN/v2rayN/Forms/MainForm.resx
+++ b/v2rayN/v2rayN/Forms/MainForm.resx
--- a/v2rayN/v2rayN/Forms/MainForm.zh-Hans.resx
+++ b/v2rayN/v2rayN/Forms/MainForm.zh-Hans.resx
@@ -119,157 +119,163 @@
  </resheader>
  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
  <data name="menuAddVmessServer.Size" type="System.Drawing.Size, System.Drawing">
-    <value>278, 22</value>
+    <value>300, 22</value>
  </data>
  <data name="menuAddVmessServer.Text" xml:space="preserve">
    <value>添加[VMess]服务器</value>
  </data>
  <data name="menuAddShadowsocksServer.Size" type="System.Drawing.Size, System.Drawing">
-    <value>278, 22</value>
+    <value>300, 22</value>
  </data>
  <data name="menuAddShadowsocksServer.Text" xml:space="preserve">
    <value>添加[Shadowsocks]服务器</value>
  </data>
  <data name="menuAddSocksServer.Size" type="System.Drawing.Size, System.Drawing">
-    <value>278, 22</value>
+    <value>300, 22</value>
  </data>
  <data name="menuAddSocksServer.Text" xml:space="preserve">
    <value>添加[Socks]服务器</value>
  </data>
  <data name="menuAddCustomServer.Size" type="System.Drawing.Size, System.Drawing">
-    <value>278, 22</value>
+    <value>300, 22</value>
  </data>
  <data name="menuAddCustomServer.Text" xml:space="preserve">
    <value>添加自定义配置服务器</value>
  </data>
  <data name="menuAddServers.Size" type="System.Drawing.Size, System.Drawing">
-    <value>278, 22</value>
+    <value>300, 22</value>
  </data>
  <data name="menuAddServers.Text" xml:space="preserve">
-    <value>从剪贴板导入批量URL</value>
+    <value>从剪贴板导入批量URL (Ctrl+V)</value>
  </data>
  <data name="menuScanScreen.Size" type="System.Drawing.Size, System.Drawing">
-    <value>278, 22</value>
+    <value>300, 22</value>
  </data>
  <data name="menuScanScreen.Text" xml:space="preserve">
-    <value>扫描屏幕上的二维码</value>
+    <value>扫描屏幕上的二维码 (Ctrl+S)</value>
  </data>
  <data name="toolStripSeparator1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>275, 6</value>
+    <value>297, 6</value>
  </data>
  <data name="menuRemoveServer.Size" type="System.Drawing.Size, System.Drawing">
-    <value>278, 22</value>
+    <value>300, 22</value>
  </data>
  <data name="menuRemoveServer.Text" xml:space="preserve">
-    <value>移除所选服务器(多选)   (Delete)</value>
+    <value>移除所选服务器(多选) (Delete)</value>
  </data>
  <data name="menuRemoveDuplicateServer.Size" type="System.Drawing.Size, System.Drawing">
-    <value>278, 22</value>
+    <value>300, 22</value>
  </data>
  <data name="menuRemoveDuplicateServer.Text" xml:space="preserve">
    <value>移除重复的服务器</value>
  </data>
  <data name="menuCopyServer.Size" type="System.Drawing.Size, System.Drawing">
-    <value>278, 22</value>
+    <value>300, 22</value>
  </data>
  <data name="menuCopyServer.Text" xml:space="preserve">
-    <value>复制所选服务器</value>
+    <value>克隆所选服务器</value>
  </data>
  <data name="menuSetDefaultServer.Size" type="System.Drawing.Size, System.Drawing">
-    <value>278, 22</value>
+    <value>300, 22</value>
  </data>
  <data name="menuSetDefaultServer.Text" xml:space="preserve">
-    <value>设为活动服务器   (Enter)</value>
+    <value>设为活动服务器 (Enter)</value>
  </data>
  <data name="toolStripSeparator3.Size" type="System.Drawing.Size, System.Drawing">
-    <value>275, 6</value>
+    <value>297, 6</value>
  </data>
  <data name="menuMoveTop.Size" type="System.Drawing.Size, System.Drawing">
-    <value>278, 22</value>
+    <value>300, 22</value>
  </data>
  <data name="menuMoveTop.Text" xml:space="preserve">
-    <value>上移至顶</value>
+    <value>上移至顶 (T)</value>
  </data>
  <data name="menuMoveUp.Size" type="System.Drawing.Size, System.Drawing">
-    <value>278, 22</value>
+    <value>300, 22</value>
  </data>
  <data name="menuMoveUp.Text" xml:space="preserve">
-    <value>上移      (U)</value>
+    <value>上移 (U)</value>
  </data>
  <data name="menuMoveDown.Size" type="System.Drawing.Size, System.Drawing">
-    <value>278, 22</value>
+    <value>300, 22</value>
  </data>
  <data name="menuMoveDown.Text" xml:space="preserve">
-    <value>下移      (D)</value>
+    <value>下移 (D)</value>
  </data>
  <data name="menuMoveBottom.Size" type="System.Drawing.Size, System.Drawing">
-    <value>278, 22</value>
+    <value>300, 22</value>
  </data>
  <data name="menuMoveBottom.Text" xml:space="preserve">
-    <value>下移至底</value>
+    <value>下移至底 (B)</value>
  </data>
  <data name="menuSelectAll.Size" type="System.Drawing.Size, System.Drawing">
-    <value>278, 22</value>
+    <value>300, 22</value>
  </data>
  <data name="menuSelectAll.Text" xml:space="preserve">
-    <value>全选      (Ctrl+A)</value>
+    <value>全选 (Ctrl+A)</value>
  </data>
  <data name="toolStripSeparator9.Size" type="System.Drawing.Size, System.Drawing">
-    <value>275, 6</value>
+    <value>297, 6</value>
  </data>
  <data name="menuPingServer.Size" type="System.Drawing.Size, System.Drawing">
-    <value>278, 22</value>
+    <value>300, 22</value>
  </data>
  <data name="menuPingServer.Text" xml:space="preserve">
-    <value>测试服务器延迟Ping(多选)(Ctrl+P)</value>
+    <value>测试服务器延迟Ping(多选) (Ctrl+P)</value>
  </data>
  <data name="menuTcpingServer.Size" type="System.Drawing.Size, System.Drawing">
-    <value>278, 22</value>
+    <value>300, 22</value>
  </data>
  <data name="menuTcpingServer.Text" xml:space="preserve">
-    <value>测试服务器延迟Tcping(多选)(Ctrl+O)</value>
+    <value>测试服务器延迟Tcping(多选) (Ctrl+O)</value>
  </data>
  <data name="menuRealPingServer.Size" type="System.Drawing.Size, System.Drawing">
-    <value>278, 22</value>
+    <value>300, 22</value>
  </data>
  <data name="menuRealPingServer.Text" xml:space="preserve">
-    <value>测试服务器真连接延迟(多选)(Ctrl+R)</value>
+    <value>测试服务器真连接延迟(多选) (Ctrl+R)</value>
  </data>
  <data name="menuSpeedServer.Size" type="System.Drawing.Size, System.Drawing">
-    <value>278, 22</value>
+    <value>300, 22</value>
  </data>
  <data name="menuSpeedServer.Text" xml:space="preserve">
-    <value>测试服务器速度(多选)(Ctrl+T)</value>
+    <value>测试服务器速度(多选) (Ctrl+T)</value>
  </data>
  <data name="toolStripSeparator6.Size" type="System.Drawing.Size, System.Drawing">
-    <value>275, 6</value>
+    <value>297, 6</value>
  </data>
  <data name="menuExport2ClientConfig.Size" type="System.Drawing.Size, System.Drawing">
-    <value>278, 22</value>
+    <value>300, 22</value>
  </data>
  <data name="menuExport2ClientConfig.Text" xml:space="preserve">
    <value>导出所选服务器为客户端配置</value>
  </data>
  <data name="menuExport2ServerConfig.Size" type="System.Drawing.Size, System.Drawing">
-    <value>278, 22</value>
+    <value>300, 22</value>
  </data>
  <data name="menuExport2ServerConfig.Text" xml:space="preserve">
    <value>导出所选服务器为服务端配置</value>
  </data>
  <data name="menuExport2ShareUrl.Size" type="System.Drawing.Size, System.Drawing">
-    <value>278, 22</value>
+    <value>300, 22</value>
  </data>
  <data name="menuExport2ShareUrl.Text" xml:space="preserve">
-    <value>批量导出分享URL至剪贴板(多选)</value>
+    <value>批量导出分享URL至剪贴板(多选) (Ctrl+C)</value>
  </data>
  <data name="menuExport2SubContent.Size" type="System.Drawing.Size, System.Drawing">
-    <value>278, 22</value>
+    <value>300, 22</value>
  </data>
  <data name="menuExport2SubContent.Text" xml:space="preserve">
    <value>批量导出订阅内容至剪贴板(多选)</value>
  </data>
+  <data name="tsbServer.Size" type="System.Drawing.Size, System.Drawing">
+    <value>73, 53</value>
+  </data>
+  <data name="tsbServer.Text" xml:space="preserve">
+    <value>  服务器  </value>
+  </data>
  <data name="cmsLv.Size" type="System.Drawing.Size, System.Drawing">
-    <value>279, 534</value>
+    <value>301, 534</value>
  </data>
  <data name="lvServers.Items" mimetype="application/x-microsoft.net.object.binary.base64">
    <value>
@@ -288,50 +294,53 @@
        ZW0uRHJhd2luZy5HcmFwaGljc1VuaXQBAAAAB3ZhbHVlX18ACAMAAAADAAAACw==
 </value>
  </data>
-  <data name="tsbServer.Size" type="System.Drawing.Size, System.Drawing">
-    <value>73, 53</value>
+  <data name="menuNotEnabledHttp.Size" type="System.Drawing.Size, System.Drawing">
+    <value>316, 22</value>
  </data>
-  <data name="tsbServer.Text" xml:space="preserve">
-    <value>  服务器  </value>
+  <data name="menuNotEnabledHttp.Text" xml:space="preserve">
+    <value>关闭Http代理</value>
  </data>
-  <data name="cmsMain.Size" type="System.Drawing.Size, System.Drawing">
-    <value>196, 164</value>
+  <data name="menuGlobal.Size" type="System.Drawing.Size, System.Drawing">
+    <value>316, 22</value>
  </data>
-  <data name="menuSysAgentEnabled.Size" type="System.Drawing.Size, System.Drawing">
-    <value>195, 22</value>
+  <data name="menuGlobal.Text" xml:space="preserve">
+    <value>开启Http代理,并自动配置系统代理(全局模式)</value>
  </data>
-  <data name="menuSysAgentEnabled.Text" xml:space="preserve">
-    <value>启用Http代理</value>
+  <data name="menuGlobalPAC.Size" type="System.Drawing.Size, System.Drawing">
+    <value>316, 22</value>
+  </data>
+  <data name="menuGlobalPAC.Text" xml:space="preserve">
+    <value>开启PAC,并自动配置系统代理(PAC模式)</value>
+  </data>
+  <data name="menuKeep.Size" type="System.Drawing.Size, System.Drawing">
+    <value>316, 22</value>
+  </data>
+  <data name="menuKeep.Text" xml:space="preserve">
+    <value>仅开启Http代理,并清除系统代理</value>
+  </data>
+  <data name="menuKeepPAC.Size" type="System.Drawing.Size, System.Drawing">
+    <value>316, 22</value>
+  </data>
+  <data name="menuKeepPAC.Text" xml:space="preserve">
+    <value>仅开启PAC,并清除系统代理</value>
+  </data>
+  <data name="menuKeepNothing.Size" type="System.Drawing.Size, System.Drawing">
+    <value>316, 22</value>
+  </data>
+  <data name="menuKeepNothing.Text" xml:space="preserve">
+    <value>仅开启Http代理,不改变系统代理</value>
+  </data>
+  <data name="menuKeepPACNothing.Size" type="System.Drawing.Size, System.Drawing">
+    <value>316, 22</value>
+  </data>
+  <data name="menuKeepPACNothing.Text" xml:space="preserve">
+    <value>仅开启PAC,不改变系统代理</value>
  </data>
  <data name="menuSysAgentMode.Size" type="System.Drawing.Size, System.Drawing">
    <value>195, 22</value>
  </data>
  <data name="menuSysAgentMode.Text" xml:space="preserve">
-    <value>Http代理模式</value>
-  </data>
-  <data name="menuGlobal.Size" type="System.Drawing.Size, System.Drawing">
-    <value>340, 22</value>
-  </data>
-  <data name="menuGlobal.Text" xml:space="preserve">
-    <value>开启Http代理,并自动配置代理服务器(全局模式)</value>
-  </data>
-  <data name="menuGlobalPAC.Size" type="System.Drawing.Size, System.Drawing">
-    <value>340, 22</value>
-  </data>
-  <data name="menuGlobalPAC.Text" xml:space="preserve">
-    <value>开启PAC,并自动配置PAC(PAC模式)</value>
-  </data>
-  <data name="menuKeep.Size" type="System.Drawing.Size, System.Drawing">
-    <value>340, 22</value>
-  </data>
-  <data name="menuKeep.Text" xml:space="preserve">
-    <value>仅开启Http代理,不自动配置代理服务器(直连模式)</value>
-  </data>
-  <data name="menuKeepPAC.Size" type="System.Drawing.Size, System.Drawing">
-    <value>340, 22</value>
-  </data>
-  <data name="menuKeepPAC.Text" xml:space="preserve">
-    <value>仅开启PAC,不自动配置PAC</value>
+    <value>Http代理</value>
  </data>
  <data name="menuServers.Size" type="System.Drawing.Size, System.Drawing">
    <value>195, 22</value>
@@ -357,6 +366,12 @@
  <data name="menuCopyPACUrl.Text" xml:space="preserve">
    <value>复制本地PAC网址</value>
  </data>
+  <data name="menuUpdateSubscriptions.Size" type="System.Drawing.Size, System.Drawing">
+    <value>195, 22</value>
+  </data>
+  <data name="menuUpdateSubscriptions.Text" xml:space="preserve">
+    <value>更新订阅</value>
+  </data>
  <data name="toolStripSeparator2.Size" type="System.Drawing.Size, System.Drawing">
    <value>192, 6</value>
  </data>
@@ -366,20 +381,17 @@
  <data name="menuExit.Text" xml:space="preserve">
    <value>退出</value>
  </data>
+  <data name="cmsMain.Size" type="System.Drawing.Size, System.Drawing">
+    <value>196, 164</value>
+  </data>
  <data name="groupBox1.Text" xml:space="preserve">
    <value>服务器列表</value>
  </data>
-  <data name="groupBox2.Text" xml:space="preserve">
-    <value>信息</value>
-  </data>
  <data name="toolSslServerSpeed.Text" xml:space="preserve">
    <value>网速显示未启用</value>
  </data>
-  <data name="tsbSub.Size" type="System.Drawing.Size, System.Drawing">
-    <value>61, 53</value>
-  </data>
-  <data name="tsbSub.Text" xml:space="preserve">
-    <value>  订阅  </value>
+  <data name="groupBox2.Text" xml:space="preserve">
+    <value>信息</value>
  </data>
  <data name="tsbSubSetting.Size" type="System.Drawing.Size, System.Drawing">
    <value>124, 22</value>
@@ -393,13 +405,31 @@
  <data name="tsbSubUpdate.Text" xml:space="preserve">
    <value>更新订阅</value>
  </data>
+  <data name="tsbSub.Size" type="System.Drawing.Size, System.Drawing">
+    <value>61, 53</value>
+  </data>
+  <data name="tsbSub.Text" xml:space="preserve">
+    <value>  订阅  </value>
+  </data>
  <data name="tsbOptionSetting.Size" type="System.Drawing.Size, System.Drawing">
    <value>76, 53</value>
  </data>
  <data name="tsbOptionSetting.Text" xml:space="preserve">
    <value>  参数设置  </value>
  </data>
-  <data name="tsbReload.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="tsbReload.Size" type="System.Drawing.Size, System.Drawing">
+    <value>148, 22</value>
+  </data>
+  <data name="tsbReload.Text" xml:space="preserve">
+    <value>重启服务</value>
+  </data>
+  <data name="tsbTestMe.Size" type="System.Drawing.Size, System.Drawing">
+    <value>148, 22</value>
+  </data>
+  <data name="tsbTestMe.Text" xml:space="preserve">
+    <value>测试服务状态</value>
+  </data>
+  <data name="tsbService.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAE3SURBVFhH7ZaBDQIhDEVvBEdwBDfQDXQER3AD3cARdAPd
@@ -410,11 +440,38 @@
        B6zCvozvYGzRM8zEoeg5TPZwDaGvpHQni1yzSxbXPW9q+hF13ROHuJnQcjbhtQAAAABJRU5ErkJggg==
 </value>
  </data>
-  <data name="tsbReload.Size" type="System.Drawing.Size, System.Drawing">
-    <value>76, 53</value>
+  <data name="tsbService.Size" type="System.Drawing.Size, System.Drawing">
+    <value>85, 53</value>
  </data>
-  <data name="tsbReload.Text" xml:space="preserve">
-    <value>  重启服务  </value>
+  <data name="tsbService.Text" xml:space="preserve">
+    <value>  当前服务  </value>
+  </data>
+  <data name="tsbCheckUpdateN.Size" type="System.Drawing.Size, System.Drawing">
+    <value>223, 22</value>
+  </data>
+  <data name="tsbCheckUpdateN.Text" xml:space="preserve">
+    <value>v2rayN</value>
+  </data>
+  <data name="tsbCheckUpdateCore.Size" type="System.Drawing.Size, System.Drawing">
+    <value>223, 22</value>
+  </data>
+  <data name="tsbCheckUpdateCore.Text" xml:space="preserve">
+    <value>v2rayCore</value>
+  </data>
+  <data name="tsbCheckUpdatePACList.Size" type="System.Drawing.Size, System.Drawing">
+    <value>223, 22</value>
+  </data>
+  <data name="tsbCheckUpdatePACList.Text" xml:space="preserve">
+    <value>PAC</value>
+  </data>
+  <data name="toolStripSeparator13.Size" type="System.Drawing.Size, System.Drawing">
+    <value>220, 6</value>
+  </data>
+  <data name="tsbCheckClearPACList.Size" type="System.Drawing.Size, System.Drawing">
+    <value>223, 22</value>
+  </data>
+  <data name="tsbCheckClearPACList.Text" xml:space="preserve">
+    <value>简化PAC (请设置Core路由)</value>
  </data>
  <data name="tsbCheckUpdate.Size" type="System.Drawing.Size, System.Drawing">
    <value>85, 53</value>
@@ -422,29 +479,11 @@
  <data name="tsbCheckUpdate.Text" xml:space="preserve">
    <value>  检查更新  </value>
  </data>
-  <data name="tsbCheckUpdateN.Size" type="System.Drawing.Size, System.Drawing">
-    <value>232, 22</value>
+  <data name="tsbAbout.Text" xml:space="preserve">
+    <value>v2rayN 项目</value>
  </data>
-  <data name="tsbCheckUpdateN.Text" xml:space="preserve">
-    <value>检查更新v2rayN</value>
-  </data>
-  <data name="tsbCheckUpdateCore.Size" type="System.Drawing.Size, System.Drawing">
-    <value>232, 22</value>
-  </data>
-  <data name="tsbCheckUpdateCore.Text" xml:space="preserve">
-    <value>检查更新v2rayCore</value>
-  </data>
-  <data name="tsbCheckUpdatePACList.Size" type="System.Drawing.Size, System.Drawing">
-    <value>232, 22</value>
-  </data>
-  <data name="tsbCheckUpdatePACList.Text" xml:space="preserve">
-    <value>检查更新PAC (需要Http代理)</value>
-  </data>
-  <data name="tsbCheckClearPACList.Size" type="System.Drawing.Size, System.Drawing">
-    <value>232, 22</value>
-  </data>
-  <data name="tsbCheckClearPACList.Text" xml:space="preserve">
-    <value>简化PAC (请设置Core路由)</value>
+  <data name="tsbV2rayWebsite.Text" xml:space="preserve">
+    <value>V2Ray 官网</value>
  </data>
  <data name="tsbHelp.Size" type="System.Drawing.Size, System.Drawing">
    <value>69, 53</value>
@@ -452,9 +491,6 @@
  <data name="tsbHelp.Text" xml:space="preserve">
    <value>   帮助   </value>
  </data>
-  <data name="tsbAbout.Text" xml:space="preserve">
-    <value>关于</value>
-  </data>
  <data name="tsbPromotion.Size" type="System.Drawing.Size, System.Drawing">
    <value>68, 53</value>
  </data>
@@ -468,7 +504,10 @@
        GqfZVG6X8mg1dfUAAPBQxAZd0SJruVXHWwAAAABJRU5ErkJggg==
 </value>
  </data>
+  <data name="tsbClose.Size" type="System.Drawing.Size, System.Drawing">
+    <value>76, 53</value>
+  </data>
  <data name="tsbClose.Text" xml:space="preserve">
-    <value>  关闭  </value>
+    <value>  关闭窗口  </value>
  </data>
 </root>
--- a/v2rayN/v2rayN/Forms/OptionSettingForm.Designer.cs
+++ b/v2rayN/v2rayN/Forms/OptionSettingForm.Designer.cs
@@ -28,12 +28,13 @@
        /// </summary>
        private void InitializeComponent()
        {
-            this.components = new System.ComponentModel.Container();
            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(OptionSettingForm));
            this.btnClose = new System.Windows.Forms.Button();
            this.tabControl1 = new System.Windows.Forms.TabControl();
            this.tabPage1 = new System.Windows.Forms.TabPage();
            this.groupBox1 = new System.Windows.Forms.GroupBox();
+            this.label16 = new System.Windows.Forms.Label();
+            this.cmblistenerType = new System.Windows.Forms.ComboBox();
            this.chksniffingEnabled2 = new System.Windows.Forms.CheckBox();
            this.chksniffingEnabled = new System.Windows.Forms.CheckBox();
            this.txtremoteDNS = new System.Windows.Forms.TextBox();
@@ -61,13 +62,13 @@
            this.txtUserdirect = new System.Windows.Forms.TextBox();
            this.tabPage5 = new System.Windows.Forms.TabPage();
            this.txtUserblock = new System.Windows.Forms.TextBox();
-            this.panel3 = new System.Windows.Forms.Panel();
-            this.btnSetDefRountingRule = new System.Windows.Forms.Button();
-            this.cmbdomainStrategy = new System.Windows.Forms.ComboBox();
-            this.labRoutingTips = new System.Windows.Forms.Label();
-            this.label15 = new System.Windows.Forms.Label();
-            this.label12 = new System.Windows.Forms.Label();
+            this.tabPage8 = new System.Windows.Forms.TabPage();
            this.cmbroutingMode = new System.Windows.Forms.ComboBox();
+            this.panel3 = new System.Windows.Forms.Panel();
+            this.linkLabelRoutingDoc = new System.Windows.Forms.LinkLabel();
+            this.btnSetDefRountingRule = new System.Windows.Forms.Button();
+            this.labRoutingTips = new System.Windows.Forms.Label();
+            this.cmbdomainStrategy = new System.Windows.Forms.ComboBox();
            this.tabPage6 = new System.Windows.Forms.TabPage();
            this.chkKcpcongestion = new System.Windows.Forms.CheckBox();
            this.txtKcpwriteBufferSize = new System.Windows.Forms.TextBox();
@@ -83,19 +84,21 @@
            this.txtKcpmtu = new System.Windows.Forms.TextBox();
            this.label6 = new System.Windows.Forms.Label();
            this.tabPage7 = new System.Windows.Forms.TabPage();
+            this.chkKeepOlderDedupl = new System.Windows.Forms.CheckBox();
            this.cbFreshrate = new System.Windows.Forms.ComboBox();
-            this.tbCacheDays = new System.Windows.Forms.TextBox();
            this.lbFreshrate = new System.Windows.Forms.Label();
-            this.lbCacheDays = new System.Windows.Forms.Label();
            this.chkEnableStatistics = new System.Windows.Forms.CheckBox();
            this.chkAllowLANConn = new System.Windows.Forms.CheckBox();
            this.txturlGFWList = new System.Windows.Forms.TextBox();
            this.label13 = new System.Windows.Forms.Label();
            this.chkAutoRun = new System.Windows.Forms.CheckBox();
+            this.tabPage9 = new System.Windows.Forms.TabPage();
+            this.txtuserPacRule = new System.Windows.Forms.TextBox();
+            this.panel4 = new System.Windows.Forms.Panel();
+            this.label4 = new System.Windows.Forms.Label();
            this.panel2 = new System.Windows.Forms.Panel();
            this.btnOK = new System.Windows.Forms.Button();
            this.panel1 = new System.Windows.Forms.Panel();
-            this.configBindingSource = new System.Windows.Forms.BindingSource(this.components);
            this.tabControl1.SuspendLayout();
            this.tabPage1.SuspendLayout();
            this.groupBox1.SuspendLayout();
@@ -105,11 +108,13 @@
            this.tabPage3.SuspendLayout();
            this.tabPage4.SuspendLayout();
            this.tabPage5.SuspendLayout();
+            this.tabPage8.SuspendLayout();
            this.panel3.SuspendLayout();
            this.tabPage6.SuspendLayout();
            this.tabPage7.SuspendLayout();
+            this.tabPage9.SuspendLayout();
+            this.panel4.SuspendLayout();
            this.panel2.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.configBindingSource)).BeginInit();
            this.SuspendLayout();
            // 
            // btnClose
@@ -126,6 +131,7 @@
            this.tabControl1.Controls.Add(this.tabPage2);
            this.tabControl1.Controls.Add(this.tabPage6);
            this.tabControl1.Controls.Add(this.tabPage7);
+            this.tabControl1.Controls.Add(this.tabPage9);
            resources.ApplyResources(this.tabControl1, "tabControl1");
            this.tabControl1.Name = "tabControl1";
            this.tabControl1.SelectedIndex = 0;
@@ -139,6 +145,8 @@
            // 
            // groupBox1
            // 
+            this.groupBox1.Controls.Add(this.label16);
+            this.groupBox1.Controls.Add(this.cmblistenerType);
            this.groupBox1.Controls.Add(this.chksniffingEnabled2);
            this.groupBox1.Controls.Add(this.chksniffingEnabled);
            this.groupBox1.Controls.Add(this.txtremoteDNS);
@@ -161,6 +169,26 @@
            this.groupBox1.Name = "groupBox1";
            this.groupBox1.TabStop = false;
            // 
+            // label16
+            // 
+            resources.ApplyResources(this.label16, "label16");
+            this.label16.Name = "label16";
+            // 
+            // cmblistenerType
+            // 
+            this.cmblistenerType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.cmblistenerType.FormattingEnabled = true;
+            this.cmblistenerType.Items.AddRange(new object[] {
+            resources.GetString("cmblistenerType.Items"),
+            resources.GetString("cmblistenerType.Items1"),
+            resources.GetString("cmblistenerType.Items2"),
+            resources.GetString("cmblistenerType.Items3"),
+            resources.GetString("cmblistenerType.Items4"),
+            resources.GetString("cmblistenerType.Items5"),
+            resources.GetString("cmblistenerType.Items6")});
+            resources.ApplyResources(this.cmblistenerType, "cmblistenerType");
+            this.cmblistenerType.Name = "cmblistenerType";
+            // 
            // chksniffingEnabled2
            // 
            resources.ApplyResources(this.chksniffingEnabled2, "chksniffingEnabled2");
@@ -297,6 +325,7 @@
            this.tabControl2.Controls.Add(this.tabPage3);
            this.tabControl2.Controls.Add(this.tabPage4);
            this.tabControl2.Controls.Add(this.tabPage5);
+            this.tabControl2.Controls.Add(this.tabPage8);
            resources.ApplyResources(this.tabControl2, "tabControl2");
            this.tabControl2.Name = "tabControl2";
            this.tabControl2.SelectedIndex = 0;
@@ -337,50 +366,12 @@
            resources.ApplyResources(this.txtUserblock, "txtUserblock");
            this.txtUserblock.Name = "txtUserblock";
            // 
-            // panel3
+            // tabPage8
            // 
-            this.panel3.Controls.Add(this.btnSetDefRountingRule);
-            this.panel3.Controls.Add(this.cmbdomainStrategy);
-            this.panel3.Controls.Add(this.labRoutingTips);
-            this.panel3.Controls.Add(this.label15);
-            this.panel3.Controls.Add(this.label12);
-            this.panel3.Controls.Add(this.cmbroutingMode);
-            resources.ApplyResources(this.panel3, "panel3");
-            this.panel3.Name = "panel3";
-            // 
-            // btnSetDefRountingRule
-            // 
-            resources.ApplyResources(this.btnSetDefRountingRule, "btnSetDefRountingRule");
-            this.btnSetDefRountingRule.Name = "btnSetDefRountingRule";
-            this.btnSetDefRountingRule.UseVisualStyleBackColor = true;
-            this.btnSetDefRountingRule.Click += new System.EventHandler(this.btnSetDefRountingRule_Click);
-            // 
-            // cmbdomainStrategy
-            // 
-            this.cmbdomainStrategy.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.cmbdomainStrategy.FormattingEnabled = true;
-            this.cmbdomainStrategy.Items.AddRange(new object[] {
-            resources.GetString("cmbdomainStrategy.Items"),
-            resources.GetString("cmbdomainStrategy.Items1"),
-            resources.GetString("cmbdomainStrategy.Items2")});
-            resources.ApplyResources(this.cmbdomainStrategy, "cmbdomainStrategy");
-            this.cmbdomainStrategy.Name = "cmbdomainStrategy";
-            // 
-            // labRoutingTips
-            // 
-            this.labRoutingTips.ForeColor = System.Drawing.Color.Brown;
-            resources.ApplyResources(this.labRoutingTips, "labRoutingTips");
-            this.labRoutingTips.Name = "labRoutingTips";
-            // 
-            // label15
-            // 
-            resources.ApplyResources(this.label15, "label15");
-            this.label15.Name = "label15";
-            // 
-            // label12
-            // 
-            resources.ApplyResources(this.label12, "label12");
-            this.label12.Name = "label12";
+            this.tabPage8.Controls.Add(this.cmbroutingMode);
+            resources.ApplyResources(this.tabPage8, "tabPage8");
+            this.tabPage8.Name = "tabPage8";
+            this.tabPage8.UseVisualStyleBackColor = true;
            // 
            // cmbroutingMode
            // 
@@ -394,6 +385,46 @@
            resources.ApplyResources(this.cmbroutingMode, "cmbroutingMode");
            this.cmbroutingMode.Name = "cmbroutingMode";
            // 
+            // panel3
+            // 
+            this.panel3.Controls.Add(this.linkLabelRoutingDoc);
+            this.panel3.Controls.Add(this.btnSetDefRountingRule);
+            this.panel3.Controls.Add(this.labRoutingTips);
+            this.panel3.Controls.Add(this.cmbdomainStrategy);
+            resources.ApplyResources(this.panel3, "panel3");
+            this.panel3.Name = "panel3";
+            // 
+            // linkLabelRoutingDoc
+            // 
+            resources.ApplyResources(this.linkLabelRoutingDoc, "linkLabelRoutingDoc");
+            this.linkLabelRoutingDoc.Name = "linkLabelRoutingDoc";
+            this.linkLabelRoutingDoc.TabStop = true;
+            this.linkLabelRoutingDoc.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabelRoutingDoc_LinkClicked);
+            // 
+            // btnSetDefRountingRule
+            // 
+            resources.ApplyResources(this.btnSetDefRountingRule, "btnSetDefRountingRule");
+            this.btnSetDefRountingRule.Name = "btnSetDefRountingRule";
+            this.btnSetDefRountingRule.UseVisualStyleBackColor = true;
+            this.btnSetDefRountingRule.Click += new System.EventHandler(this.btnSetDefRountingRule_Click);
+            // 
+            // labRoutingTips
+            // 
+            this.labRoutingTips.ForeColor = System.Drawing.Color.Brown;
+            resources.ApplyResources(this.labRoutingTips, "labRoutingTips");
+            this.labRoutingTips.Name = "labRoutingTips";
+            // 
+            // cmbdomainStrategy
+            // 
+            this.cmbdomainStrategy.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.cmbdomainStrategy.FormattingEnabled = true;
+            this.cmbdomainStrategy.Items.AddRange(new object[] {
+            resources.GetString("cmbdomainStrategy.Items"),
+            resources.GetString("cmbdomainStrategy.Items1"),
+            resources.GetString("cmbdomainStrategy.Items2")});
+            resources.ApplyResources(this.cmbdomainStrategy, "cmbdomainStrategy");
+            this.cmbdomainStrategy.Name = "cmbdomainStrategy";
+            // 
            // tabPage6
            // 
            this.tabPage6.Controls.Add(this.chkKcpcongestion);
@@ -481,10 +512,9 @@
            // 
            // tabPage7
            // 
+            this.tabPage7.Controls.Add(this.chkKeepOlderDedupl);
            this.tabPage7.Controls.Add(this.cbFreshrate);
-            this.tabPage7.Controls.Add(this.tbCacheDays);
            this.tabPage7.Controls.Add(this.lbFreshrate);
-            this.tabPage7.Controls.Add(this.lbCacheDays);
            this.tabPage7.Controls.Add(this.chkEnableStatistics);
            this.tabPage7.Controls.Add(this.chkAllowLANConn);
            this.tabPage7.Controls.Add(this.txturlGFWList);
@@ -494,6 +524,12 @@
            this.tabPage7.Name = "tabPage7";
            this.tabPage7.UseVisualStyleBackColor = true;
            // 
+            // chkKeepOlderDedupl
+            // 
+            resources.ApplyResources(this.chkKeepOlderDedupl, "chkKeepOlderDedupl");
+            this.chkKeepOlderDedupl.Name = "chkKeepOlderDedupl";
+            this.chkKeepOlderDedupl.UseVisualStyleBackColor = true;
+            // 
            // cbFreshrate
            // 
            this.cbFreshrate.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
@@ -501,21 +537,11 @@
            resources.ApplyResources(this.cbFreshrate, "cbFreshrate");
            this.cbFreshrate.Name = "cbFreshrate";
            // 
-            // tbCacheDays
-            // 
-            resources.ApplyResources(this.tbCacheDays, "tbCacheDays");
-            this.tbCacheDays.Name = "tbCacheDays";
-            // 
            // lbFreshrate
            // 
            resources.ApplyResources(this.lbFreshrate, "lbFreshrate");
            this.lbFreshrate.Name = "lbFreshrate";
            // 
-            // lbCacheDays
-            // 
-            resources.ApplyResources(this.lbCacheDays, "lbCacheDays");
-            this.lbCacheDays.Name = "lbCacheDays";
-            // 
            // chkEnableStatistics
            // 
            resources.ApplyResources(this.chkEnableStatistics, "chkEnableStatistics");
@@ -544,6 +570,31 @@
            this.chkAutoRun.Name = "chkAutoRun";
            this.chkAutoRun.UseVisualStyleBackColor = true;
            // 
+            // tabPage9
+            // 
+            this.tabPage9.Controls.Add(this.txtuserPacRule);
+            this.tabPage9.Controls.Add(this.panel4);
+            resources.ApplyResources(this.tabPage9, "tabPage9");
+            this.tabPage9.Name = "tabPage9";
+            this.tabPage9.UseVisualStyleBackColor = true;
+            // 
+            // txtuserPacRule
+            // 
+            resources.ApplyResources(this.txtuserPacRule, "txtuserPacRule");
+            this.txtuserPacRule.Name = "txtuserPacRule";
+            // 
+            // panel4
+            // 
+            this.panel4.Controls.Add(this.label4);
+            resources.ApplyResources(this.panel4, "panel4");
+            this.panel4.Name = "panel4";
+            // 
+            // label4
+            // 
+            this.label4.ForeColor = System.Drawing.Color.Brown;
+            resources.ApplyResources(this.label4, "label4");
+            this.label4.Name = "label4";
+            // 
            // panel2
            // 
            this.panel2.Controls.Add(this.btnClose);
@@ -563,10 +614,6 @@
            resources.ApplyResources(this.panel1, "panel1");
            this.panel1.Name = "panel1";
            // 
-            // configBindingSource
-            // 
-            this.configBindingSource.DataSource = typeof(v2rayN.Mode.Config);
-            // 
            // OptionSettingForm
            // 
            resources.ApplyResources(this, "$this");
@@ -591,14 +638,17 @@
            this.tabPage4.PerformLayout();
            this.tabPage5.ResumeLayout(false);
            this.tabPage5.PerformLayout();
+            this.tabPage8.ResumeLayout(false);
            this.panel3.ResumeLayout(false);
            this.panel3.PerformLayout();
            this.tabPage6.ResumeLayout(false);
            this.tabPage6.PerformLayout();
            this.tabPage7.ResumeLayout(false);
            this.tabPage7.PerformLayout();
+            this.tabPage9.ResumeLayout(false);
+            this.tabPage9.PerformLayout();
+            this.panel4.ResumeLayout(false);
            this.panel2.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.configBindingSource)).EndInit();
            this.ResumeLayout(false);

        }
@@ -659,17 +709,21 @@
        private System.Windows.Forms.Label label14;
        private System.Windows.Forms.Panel panel3;
        private System.Windows.Forms.ComboBox cmbdomainStrategy;
-        private System.Windows.Forms.Label label15;
-        private System.Windows.Forms.Label label12;
        private System.Windows.Forms.ComboBox cmbroutingMode;
        private System.Windows.Forms.CheckBox chksniffingEnabled;
        private System.Windows.Forms.CheckBox chksniffingEnabled2;
        private System.Windows.Forms.Button btnSetDefRountingRule;
        private System.Windows.Forms.CheckBox chkEnableStatistics;
-        private System.Windows.Forms.TextBox tbCacheDays;
-        private System.Windows.Forms.Label lbCacheDays;
        private System.Windows.Forms.ComboBox cbFreshrate;
        private System.Windows.Forms.Label lbFreshrate;
-        private System.Windows.Forms.BindingSource configBindingSource;
+        private System.Windows.Forms.Label label16;
+        private System.Windows.Forms.ComboBox cmblistenerType;
+        private System.Windows.Forms.TabPage tabPage8;
+        private System.Windows.Forms.TabPage tabPage9;
+        private System.Windows.Forms.TextBox txtuserPacRule;
+        private System.Windows.Forms.Panel panel4;
+        private System.Windows.Forms.Label label4;
+        private System.Windows.Forms.CheckBox chkKeepOlderDedupl;
+        private System.Windows.Forms.LinkLabel linkLabelRoutingDoc;
    }
 }
--- a/v2rayN/v2rayN/Forms/OptionSettingForm.cs
+++ b/v2rayN/v2rayN/Forms/OptionSettingForm.cs
@@ -2,6 +2,8 @@
 using System.Collections.Generic;
 using System.Windows.Forms;
 using v2rayN.Handler;
+using v2rayN.Base;
+using v2rayN.HttpProxyHandler;

 namespace v2rayN.Forms
 {
@@ -21,6 +23,8 @@ namespace v2rayN.Forms
            InitKCP();

            InitGUI();
+
+            InitUserPAC();
        }

        /// <summary>
@@ -43,8 +47,8 @@ namespace v2rayN.Forms
                chkudpEnabled.Checked = config.inbound[0].udpEnabled;
                chksniffingEnabled.Checked = config.inbound[0].sniffingEnabled;

-                txtlocalPort2.Text = "socks + 1";
-                cmbprotocol2.Text = "http";
+                txtlocalPort2.Text = $"{config.inbound[0].localPort + 1}";
+                cmbprotocol2.Text = Global.InboundHttp;

                if (config.inbound.Count > 1)
                {
@@ -63,6 +67,8 @@ namespace v2rayN.Forms

            //remoteDNS
            txtremoteDNS.Text = config.remoteDNS;
+
+            cmblistenerType.SelectedIndex = (int)config.listenerType;
        }

        /// <summary>
@@ -72,8 +78,7 @@ namespace v2rayN.Forms
        {
            //路由
            cmbdomainStrategy.Text = config.domainStrategy;
-            int routingMode = 0;
-            int.TryParse(config.routingMode, out routingMode);
+            int.TryParse(config.routingMode, out int routingMode);
            cmbroutingMode.SelectedIndex = routingMode;

            txtUseragent.Text = Utils.List2String(config.useragent, true);
@@ -107,15 +112,13 @@ namespace v2rayN.Forms
            txturlGFWList.Text = config.urlGFWList;

            chkAllowLANConn.Checked = config.allowLANConn;
+            chkEnableStatistics.Checked = config.enableStatistics;
+            chkKeepOlderDedupl.Checked = config.keepOlderDedupl;


-            var enableStatistics = config.enableStatistics;
-            chkEnableStatistics.Checked = enableStatistics;
-
-            tbCacheDays.Text = config.CacheDays.ToString();


-            var cbSource = new ComboItem[]
+            ComboItem[] cbSource = new ComboItem[]
            {
                new ComboItem{ID = (int)Global.StatisticsFreshRate.quick, Text = UIRes.I18N("QuickFresh")},
                new ComboItem{ID = (int)Global.StatisticsFreshRate.medium, Text = UIRes.I18N("MediumFresh")},
@@ -126,7 +129,7 @@ namespace v2rayN.Forms
            cbFreshrate.DisplayMember = "Text";
            cbFreshrate.ValueMember = "ID";

-            switch(config.statisticsFreshRate)
+            switch (config.statisticsFreshRate)
            {
                case (int)Global.StatisticsFreshRate.quick:
                    cbFreshrate.SelectedItem = cbSource[0];
@@ -141,6 +144,11 @@ namespace v2rayN.Forms

        }

+        private void InitUserPAC()
+        {
+            txtuserPacRule.Text = Utils.List2String(config.userPacRule, true);
+        }
+
        private void btnOK_Click(object sender, EventArgs e)
        {
            if (SaveBase() != 0)
@@ -163,13 +171,18 @@ namespace v2rayN.Forms
                return;
            }

+            if (SaveUserPAC() != 0)
+            {
+                return;
+            }
+
            if (ConfigHandler.SaveConfig(ref config) == 0)
            {
                this.DialogResult = DialogResult.OK;
            }
            else
            {
-                UI.Show(UIRes.I18N("OperationFailed"));
+                UI.ShowWarning(UIRes.I18N("OperationFailed"));
            }
        }

@@ -250,6 +263,8 @@ namespace v2rayN.Forms
            //remoteDNS
            config.remoteDNS = txtremoteDNS.Text.TrimEx();

+            config.listenerType = (ListenerType)Enum.ToObject(typeof(ListenerType), cmblistenerType.SelectedIndex);
+
            return 0;
        }

@@ -326,16 +341,10 @@ namespace v2rayN.Forms

            config.allowLANConn = chkAllowLANConn.Checked;

-            var lastEnableStatistics = config.enableStatistics;
+            bool lastEnableStatistics = config.enableStatistics;
            config.enableStatistics = chkEnableStatistics.Checked;
-
-            uint days = 0;
-            var valid = uint.TryParse(tbCacheDays.Text, out days);
-            if (!valid)
-                days = 7;
-            config.CacheDays = days;
-
            config.statisticsFreshRate = (int)cbFreshrate.SelectedValue;
+            config.keepOlderDedupl = chkKeepOlderDedupl.Checked;

            //if(lastEnableStatistics != config.enableStatistics)
            //{
@@ -349,6 +358,15 @@ namespace v2rayN.Forms
            return 0;
        }

+        private int SaveUserPAC()
+        {
+            string userPacRule = txtuserPacRule.Text.TrimEx();
+            userPacRule = userPacRule.Replace("\"", "");
+
+            config.userPacRule = Utils.String2List(userPacRule);
+
+            return 0;
+        }
        private void btnClose_Click(object sender, EventArgs e)
        {
            this.DialogResult = DialogResult.Cancel;
@@ -368,25 +386,34 @@ namespace v2rayN.Forms

        private void btnSetDefRountingRule_Click(object sender, EventArgs e)
        {
-            var lstUrl = new List<string>();
-            lstUrl.Add(Global.CustomRoutingListUrl + "proxy");
-            lstUrl.Add(Global.CustomRoutingListUrl + "direct");
-            lstUrl.Add(Global.CustomRoutingListUrl + "block");
+            txtUseragent.Text = Utils.GetEmbedText(Global.CustomRoutingFileName + Global.agentTag);
+            txtUserdirect.Text = Utils.GetEmbedText(Global.CustomRoutingFileName + Global.directTag);
+            txtUserblock.Text = Utils.GetEmbedText(Global.CustomRoutingFileName + Global.blockTag);
+            cmbroutingMode.SelectedIndex = 3;

-            var lstTxt = new List<TextBox>();
-            lstTxt.Add(txtUseragent);
-            lstTxt.Add(txtUserdirect);
-            lstTxt.Add(txtUserblock);
+            List<string> lstUrl = new List<string>
+            {
+                Global.CustomRoutingListUrl + Global.agentTag,
+                Global.CustomRoutingListUrl + Global.directTag,
+                Global.CustomRoutingListUrl + Global.blockTag
+            };
+
+            List<TextBox> lstTxt = new List<TextBox>
+            {
+                txtUseragent,
+                txtUserdirect,
+                txtUserblock
+            };

            for (int k = 0; k < lstUrl.Count; k++)
            {
-                var txt = lstTxt[k];
-                V2rayUpdateHandle v2rayUpdateHandle3 = new V2rayUpdateHandle();
-                v2rayUpdateHandle3.UpdateCompleted += (sender2, args) =>
+                TextBox txt = lstTxt[k];
+                DownloadHandle downloadHandle = new DownloadHandle();
+                downloadHandle.UpdateCompleted += (sender2, args) =>
                {
                    if (args.Success)
                    {
-                        var result = args.Msg;
+                        string result = args.Msg;
                        if (Utils.IsNullOrEmpty(result))
                        {
                            return;
@@ -398,23 +425,34 @@ namespace v2rayN.Forms
                        AppendText(false, args.Msg);
                    }
                };
-                v2rayUpdateHandle3.Error += (sender2, args) =>
+                downloadHandle.Error += (sender2, args) =>
                {
                    AppendText(true, args.GetException().Message);
                };

-                v2rayUpdateHandle3.WebDownloadString(lstUrl[k]);
+                downloadHandle.WebDownloadString(lstUrl[k]);
            }
        }
        void AppendText(bool notify, string text)
        {
            labRoutingTips.Text = text;
        }
+
+        private void linkLabelRoutingDoc_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
+        {
+            System.Diagnostics.Process.Start("https://www.v2ray.com/chapter_02/03_routing.html#routingobject");
+        }
    }

    class ComboItem
    {
-        public int ID { get; set; }
-        public string Text { get; set; }
+        public int ID
+        {
+            get; set;
+        }
+        public string Text
+        {
+            get; set;
+        }
    }
 }
--- a/v2rayN/v2rayN/Forms/OptionSettingForm.resx
+++ b/v2rayN/v2rayN/Forms/OptionSettingForm.resx
--- a/v2rayN/v2rayN/Forms/OptionSettingForm.zh-Hans.resx
+++ b/v2rayN/v2rayN/Forms/OptionSettingForm.zh-Hans.resx
@@ -117,97 +117,22 @@
  <resheader name="writer">
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
+  <data name="$this.Text" xml:space="preserve">
+    <value>参数设置</value>
+  </data>
  <data name="btnClose.Text" xml:space="preserve">
    <value>取消(&amp;C)</value>
  </data>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="chksniffingEnabled2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>96, 16</value>
-  </data>
-  <data name="chksniffingEnabled2.Text" xml:space="preserve">
-    <value>开启流量探测</value>
-  </data>
-  <data name="chksniffingEnabled.Size" type="System.Drawing.Size, System.Drawing">
-    <value>96, 16</value>
-  </data>
-  <data name="chksniffingEnabled.Text" xml:space="preserve">
-    <value>开启流量探测</value>
-  </data>
-  <data name="label14.Size" type="System.Drawing.Size, System.Drawing">
-    <value>191, 12</value>
-  </data>
-  <data name="label14.Text" xml:space="preserve">
-    <value>自定义DNS(可多个,用逗号(,)隔开)</value>
-  </data>
-  <data name="chkmuxEnabled.Text" xml:space="preserve">
-    <value>开启Mux多路复用(默认开启)</value>
-  </data>
-  <data name="chkAllowIn2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>102, 16</value>
-  </data>
-  <data name="chkAllowIn2.Text" xml:space="preserve">
-    <value>本地监听端口2</value>
-  </data>
-  <data name="chkudpEnabled2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>66, 16</value>
-  </data>
-  <data name="chkudpEnabled2.Text" xml:space="preserve">
-    <value>开启UDP</value>
-  </data>
-  <data name="label3.Size" type="System.Drawing.Size, System.Drawing">
-    <value>29, 12</value>
-  </data>
-  <data name="label3.Text" xml:space="preserve">
-    <value>协议</value>
-  </data>
-  <data name="label1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>29, 12</value>
-  </data>
-  <data name="label1.Text" xml:space="preserve">
-    <value>协议</value>
-  </data>
-  <data name="chkudpEnabled.Size" type="System.Drawing.Size, System.Drawing">
-    <value>66, 16</value>
-  </data>
-  <data name="chkudpEnabled.Text" xml:space="preserve">
-    <value>开启UDP</value>
-  </data>
-  <data name="chklogEnabled.Size" type="System.Drawing.Size, System.Drawing">
-    <value>156, 16</value>
-  </data>
-  <data name="chklogEnabled.Text" xml:space="preserve">
-    <value>记录本地日志(默认关闭)</value>
-  </data>
-  <data name="label5.Size" type="System.Drawing.Size, System.Drawing">
-    <value>53, 12</value>
-  </data>
-  <data name="label5.Text" xml:space="preserve">
-    <value>日志等级</value>
-  </data>
-  <data name="label2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>77, 12</value>
-  </data>
-  <data name="label2.Text" xml:space="preserve">
-    <value>本地监听端口</value>
-  </data>
-  <data name="tabPage1.Text" xml:space="preserve">
-    <value>  Core:基础设置  </value>
-  </data>
-  <data name="tabPage3.Text" xml:space="preserve">
-    <value>  代理的Domain或IP  </value>
-  </data>
-  <data name="tabPage4.Text" xml:space="preserve">
-    <value>  直连的Domain或IP  </value>
-  </data>
-  <data name="tabPage5.Text" xml:space="preserve">
-    <value>  阻止的Domain或IP  </value>
+  <data name="btnOK.Text" xml:space="preserve">
+    <value>确定(&amp;O)</value>
  </data>
  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
  <data name="btnSetDefRountingRule.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
    <value>NoControl</value>
  </data>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
  <data name="btnSetDefRountingRule.Location" type="System.Drawing.Point, System.Drawing">
-    <value>381, 43</value>
+    <value>351, 14</value>
  </data>
  <data name="btnSetDefRountingRule.Size" type="System.Drawing.Size, System.Drawing">
    <value>201, 23</value>
@@ -215,30 +140,86 @@
  <data name="btnSetDefRountingRule.Text" xml:space="preserve">
    <value>一键设置默认自定义路由规则</value>
  </data>
-  <data name="cmbdomainStrategy.Size" type="System.Drawing.Size, System.Drawing">
-    <value>232, 20</value>
+  <data name="chkAllowIn2.Size" type="System.Drawing.Size, System.Drawing">
+    <value>102, 16</value>
  </data>
-  <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="labRoutingTips.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
+  <data name="chkAllowIn2.Text" xml:space="preserve">
+    <value>本地监听端口2</value>
  </data>
-  <data name="labRoutingTips.Size" type="System.Drawing.Size, System.Drawing">
-    <value>383, 12</value>
+  <data name="chkAllowLANConn.Size" type="System.Drawing.Size, System.Drawing">
+    <value>144, 16</value>
  </data>
-  <data name="labRoutingTips.Text" xml:space="preserve">
-    <value>*设置的规则，用逗号(,)隔开;支持Domain(纯字符串/正则/子域名)和IP</value>
+  <data name="chkAllowLANConn.Text" xml:space="preserve">
+    <value>允许来自局域网的连接</value>
  </data>
-  <data name="label15.Size" type="System.Drawing.Size, System.Drawing">
-    <value>53, 12</value>
+  <data name="chkAutoRun.Size" type="System.Drawing.Size, System.Drawing">
+    <value>180, 16</value>
  </data>
-  <data name="label15.Text" xml:space="preserve">
-    <value>域名策略</value>
+  <data name="chkAutoRun.Text" xml:space="preserve">
+    <value>开机自动启动(可能会不成功)</value>
  </data>
-  <data name="label12.Size" type="System.Drawing.Size, System.Drawing">
-    <value>53, 12</value>
+  <data name="chkEnableStatistics.Size" type="System.Drawing.Size, System.Drawing">
+    <value>384, 16</value>
  </data>
-  <data name="label12.Text" xml:space="preserve">
-    <value>路由模式</value>
+  <data name="chkEnableStatistics.Text" xml:space="preserve">
+    <value>启用统计（实时网速显示和使用流量显示，需要重启v2rayN客户端）</value>
+  </data>
+  <data name="chkKeepOlderDedupl.Text" xml:space="preserve">
+    <value>去重时保留序号较小的项</value>
+  </data>
+  <data name="chklogEnabled.Size" type="System.Drawing.Size, System.Drawing">
+    <value>156, 16</value>
+  </data>
+  <data name="chklogEnabled.Text" xml:space="preserve">
+    <value>记录本地日志(默认关闭)</value>
+  </data>
+  <data name="chkmuxEnabled.Text" xml:space="preserve">
+    <value>开启Mux多路复用(默认开启)</value>
+  </data>
+  <data name="chksniffingEnabled.Size" type="System.Drawing.Size, System.Drawing">
+    <value>96, 16</value>
+  </data>
+  <data name="chksniffingEnabled.Text" xml:space="preserve">
+    <value>开启流量探测</value>
+  </data>
+  <data name="chksniffingEnabled2.Size" type="System.Drawing.Size, System.Drawing">
+    <value>96, 16</value>
+  </data>
+  <data name="chksniffingEnabled2.Text" xml:space="preserve">
+    <value>开启流量探测</value>
+  </data>
+  <data name="chkudpEnabled.Size" type="System.Drawing.Size, System.Drawing">
+    <value>66, 16</value>
+  </data>
+  <data name="chkudpEnabled.Text" xml:space="preserve">
+    <value>开启UDP</value>
+  </data>
+  <data name="chkudpEnabled2.Size" type="System.Drawing.Size, System.Drawing">
+    <value>66, 16</value>
+  </data>
+  <data name="chkudpEnabled2.Text" xml:space="preserve">
+    <value>开启UDP</value>
+  </data>
+  <data name="cmblistenerType.Items" xml:space="preserve">
+    <value>关闭Http代理</value>
+  </data>
+  <data name="cmblistenerType.Items1" xml:space="preserve">
+    <value>开启Http代理,并自动配置系统代理(全局模式)</value>
+  </data>
+  <data name="cmblistenerType.Items2" xml:space="preserve">
+    <value>开启PAC,并自动配置系统代理(PAC模式)</value>
+  </data>
+  <data name="cmblistenerType.Items3" xml:space="preserve">
+    <value>仅开启Http代理,并清除系统代理</value>
+  </data>
+  <data name="cmblistenerType.Items4" xml:space="preserve">
+    <value>仅开启PAC,并清除系统代理</value>
+  </data>
+  <data name="cmblistenerType.Items5" xml:space="preserve">
+    <value>仅开启Http代理,不改变系统代理</value>
+  </data>
+  <data name="cmblistenerType.Items6" xml:space="preserve">
+    <value>仅开启PAC,不改变系统代理</value>
  </data>
  <data name="cmbroutingMode.Items" xml:space="preserve">
    <value>全局</value>
@@ -252,20 +233,17 @@
  <data name="cmbroutingMode.Items3" xml:space="preserve">
    <value>绕过局域网及大陆地址</value>
  </data>
+  <data name="cmbroutingMode.Location" type="System.Drawing.Point, System.Drawing">
+    <value>19, 26</value>
+  </data>
  <data name="cmbroutingMode.Size" type="System.Drawing.Size, System.Drawing">
-    <value>232, 20</value>
+    <value>244, 20</value>
  </data>
-  <data name="tabPage2.Text" xml:space="preserve">
-    <value>  Core:路由设置  </value>
+  <data name="label1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>29, 12</value>
  </data>
-  <data name="tabPage6.Text" xml:space="preserve">
-    <value>  Core:KCP设置  </value>
-  </data>
-  <data name="chkAllowLANConn.Size" type="System.Drawing.Size, System.Drawing">
-    <value>144, 16</value>
-  </data>
-  <data name="chkAllowLANConn.Text" xml:space="preserve">
-    <value>允许来自局域网的连接</value>
+  <data name="label1.Text" xml:space="preserve">
+    <value>协议</value>
  </data>
  <data name="label13.Size" type="System.Drawing.Size, System.Drawing">
    <value>227, 12</value>
@@ -273,28 +251,119 @@
  <data name="label13.Text" xml:space="preserve">
    <value>自定义GFWList地址(不需自定义请填空白)</value>
  </data>
-  <data name="chkAutoRun.Size" type="System.Drawing.Size, System.Drawing">
-    <value>180, 16</value>
+  <data name="label14.Size" type="System.Drawing.Size, System.Drawing">
+    <value>191, 12</value>
  </data>
-  <data name="chkAutoRun.Text" xml:space="preserve">
-    <value>开机自动启动(可能会不成功)</value>
+  <data name="label14.Text" xml:space="preserve">
+    <value>自定义DNS(可多个,用逗号(,)隔开)</value>
  </data>
-  <data name="tabPage7.Text" xml:space="preserve">
-    <value>  v2rayN设置  </value>
+  <data name="label15.Size" type="System.Drawing.Size, System.Drawing">
+    <value>53, 12</value>
  </data>
-  <data name="btnOK.Text" xml:space="preserve">
-    <value>确定(&amp;O)</value>
+  <data name="label16.Size" type="System.Drawing.Size, System.Drawing">
+    <value>53, 12</value>
  </data>
-  <data name="$this.Text" xml:space="preserve">
-    <value>参数设置</value>
+  <data name="label16.Text" xml:space="preserve">
+    <value>Http代理</value>
  </data>
-  <data name="chkEnableStatistics.Text" xml:space="preserve">
-    <value>启用统计（实时网速显示和使用流量显示，需要重启v2rayN客户端）</value>
+  <data name="label2.Size" type="System.Drawing.Size, System.Drawing">
+    <value>77, 12</value>
  </data>
-  <data name="lbCacheDays.Text" xml:space="preserve">
-    <value>缓存天数（0-30， 0关闭缓存单独每天的数据使用情况）</value>
+  <data name="label2.Text" xml:space="preserve">
+    <value>本地监听端口</value>
+  </data>
+  <data name="label3.Size" type="System.Drawing.Size, System.Drawing">
+    <value>29, 12</value>
+  </data>
+  <data name="label3.Text" xml:space="preserve">
+    <value>协议</value>
+  </data>
+  <data name="label4.Text" xml:space="preserve">
+    <value>*设置用户PAC规则，用逗号(,)隔开</value>
+  </data>
+  <data name="label5.Size" type="System.Drawing.Size, System.Drawing">
+    <value>53, 12</value>
+  </data>
+  <data name="label5.Text" xml:space="preserve">
+    <value>日志等级</value>
+  </data>
+  <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="labRoutingTips.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="labRoutingTips.Location" type="System.Drawing.Point, System.Drawing">
+    <value>5, 49</value>
+  </data>
+  <data name="labRoutingTips.Size" type="System.Drawing.Size, System.Drawing">
+    <value>383, 12</value>
+  </data>
+  <data name="labRoutingTips.Text" xml:space="preserve">
+    <value>*设置的规则，用逗号(,)隔开;支持Domain(纯字符串/正则/子域名)和IP</value>
+  </data>
+  <data name="lbFreshrate.Size" type="System.Drawing.Size, System.Drawing">
+    <value>77, 12</value>
  </data>
  <data name="lbFreshrate.Text" xml:space="preserve">
    <value>统计刷新频率</value>
  </data>
+  <data name="linkLabelRoutingDoc.Text" xml:space="preserve">
+    <value>域名解析策略</value>
+  </data>
+  <data name="panel3.Size" type="System.Drawing.Size, System.Drawing">
+    <value>642, 72</value>
+  </data>
+  <data name="tabControl2.Location" type="System.Drawing.Point, System.Drawing">
+    <value>3, 89</value>
+  </data>
+  <data name="tabControl2.Size" type="System.Drawing.Size, System.Drawing">
+    <value>642, 481</value>
+  </data>
+  <data name="tabPage1.Text" xml:space="preserve">
+    <value>  Core:基础设置  </value>
+  </data>
+  <data name="tabPage2.Text" xml:space="preserve">
+    <value>  Core:路由设置  </value>
+  </data>
+  <data name="tabPage3.Size" type="System.Drawing.Size, System.Drawing">
+    <value>634, 455</value>
+  </data>
+  <data name="tabPage3.Text" xml:space="preserve">
+    <value>  1.代理的Domain或IP  </value>
+  </data>
+  <data name="tabPage4.Size" type="System.Drawing.Size, System.Drawing">
+    <value>634, 455</value>
+  </data>
+  <data name="tabPage4.Text" xml:space="preserve">
+    <value>  2.直连的Domain或IP  </value>
+  </data>
+  <data name="tabPage5.Size" type="System.Drawing.Size, System.Drawing">
+    <value>634, 455</value>
+  </data>
+  <data name="tabPage5.Text" xml:space="preserve">
+    <value>  3.阻止的Domain或IP  </value>
+  </data>
+  <data name="tabPage6.Text" xml:space="preserve">
+    <value>  Core:KCP设置  </value>
+  </data>
+  <data name="tabPage7.Text" xml:space="preserve">
+    <value>  v2rayN设置  </value>
+  </data>
+  <data name="tabPage8.Size" type="System.Drawing.Size, System.Drawing">
+    <value>634, 455</value>
+  </data>
+  <data name="tabPage8.Text" xml:space="preserve">
+    <value>  4.预定义规则  </value>
+  </data>
+  <data name="tabPage9.Text" xml:space="preserve">
+    <value>  用户PAC设置  </value>
+  </data>
+  <data name="txtUseragent.Size" type="System.Drawing.Size, System.Drawing">
+    <value>628, 449</value>
+  </data>
+  <data name="txtUserblock.Size" type="System.Drawing.Size, System.Drawing">
+    <value>628, 449</value>
+  </data>
+  <data name="txtUserdirect.Size" type="System.Drawing.Size, System.Drawing">
+    <value>628, 449</value>
+  </data>
 </root>
--- a/v2rayN/v2rayN/Forms/QRCodeControl.resx
+++ b/v2rayN/v2rayN/Forms/QRCodeControl.resx
@@ -117,106 +117,67 @@
  <resheader name="writer">
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
-  <data name="&gt;&gt;picQRCode.ZOrder" xml:space="preserve">
-    <value>0</value>
-  </data>
  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="$this.Size" type="System.Drawing.Size, System.Drawing">
-    <value>356, 441</value>
-  </data>
-  <data name="chkShow.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 0</value>
-  </data>
  <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="txtUrl.TabIndex" type="System.Int32, mscorlib">
-    <value>0</value>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
+    <value>6, 12</value>
  </data>
-  <data name="chkShow.Text" xml:space="preserve">
-    <value>Show shared content</value>
-  </data>
-  <data name="&gt;&gt;$this.Type" xml:space="preserve">
-    <value>System.Windows.Forms.UserControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="chkShow.Size" type="System.Drawing.Size, System.Drawing">
-    <value>356, 16</value>
+  <data name="$this.Localizable" type="System.Boolean, mscorlib">
+    <value>True</value>
  </data>
  <data name="&gt;&gt;$this.Name" xml:space="preserve">
    <value>QRCodeControl</value>
  </data>
-  <data name="picQRCode.Size" type="System.Drawing.Size, System.Drawing">
-    <value>356, 355</value>
-  </data>
-  <data name="txtUrl.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 371</value>
-  </data>
-  <data name="&gt;&gt;chkShow.Type" xml:space="preserve">
-    <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;picQRCode.Type" xml:space="preserve">
-    <value>System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="txtUrl.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
-    <value>Bottom</value>
-  </data>
-  <data name="picQRCode.TabIndex" type="System.Int32, mscorlib">
-    <value>24</value>
-  </data>
-  <data name="chkShow.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
-    <value>Top</value>
-  </data>
-  <data name="picQRCode.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
-    <value>Fill</value>
-  </data>
-  <data name="txtUrl.Multiline" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="picQRCode.SizeMode" type="System.Windows.Forms.PictureBoxSizeMode, System.Windows.Forms">
-    <value>Zoom</value>
-  </data>
-  <data name="&gt;&gt;txtUrl.Type" xml:space="preserve">
-    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;txtUrl.ZOrder" xml:space="preserve">
-    <value>1</value>
-  </data>
-  <data name="&gt;&gt;chkShow.Parent" xml:space="preserve">
-    <value>$this</value>
-  </data>
-  <data name="picQRCode.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 16</value>
-  </data>
-  <data name="&gt;&gt;txtUrl.Parent" xml:space="preserve">
-    <value>$this</value>
-  </data>
-  <data name="&gt;&gt;chkShow.Name" xml:space="preserve">
-    <value>chkShow</value>
-  </data>
-  <data name="&gt;&gt;picQRCode.Parent" xml:space="preserve">
-    <value>$this</value>
-  </data>
-  <data name="&gt;&gt;txtUrl.Name" xml:space="preserve">
-    <value>txtUrl</value>
-  </data>
-  <data name="&gt;&gt;chkShow.ZOrder" xml:space="preserve">
-    <value>2</value>
-  </data>
-  <data name="&gt;&gt;picQRCode.Name" xml:space="preserve">
-    <value>picQRCode</value>
-  </data>
-  <data name="txtUrl.Size" type="System.Drawing.Size, System.Drawing">
-    <value>356, 70</value>
-  </data>
-  <data name="chkShow.TabIndex" type="System.Int32, mscorlib">
-    <value>25</value>
-  </data>
-  <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
-    <value>6, 12</value>
+  <data name="$this.Size" type="System.Drawing.Size, System.Drawing">
+    <value>356, 441</value>
  </data>
  <data name="chkShow.AutoSize" type="System.Boolean, mscorlib">
    <value>True</value>
  </data>
-  <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <data name="chkShow.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+    <value>Top</value>
+  </data>
+  <data name="chkShow.Location" type="System.Drawing.Point, System.Drawing">
+    <value>0, 0</value>
+  </data>
+  <data name="chkShow.Size" type="System.Drawing.Size, System.Drawing">
+    <value>356, 16</value>
+  </data>
+  <data name="chkShow.TabIndex" type="System.Int32, mscorlib">
+    <value>25</value>
+  </data>
+  <data name="chkShow.Text" xml:space="preserve">
+    <value>Sharing panel</value>
+  </data>
+  <data name="picQRCode.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+    <value>Fill</value>
+  </data>
+  <data name="picQRCode.Location" type="System.Drawing.Point, System.Drawing">
+    <value>0, 16</value>
+  </data>
+  <data name="picQRCode.Size" type="System.Drawing.Size, System.Drawing">
+    <value>356, 355</value>
+  </data>
+  <data name="picQRCode.SizeMode" type="System.Windows.Forms.PictureBoxSizeMode, System.Windows.Forms">
+    <value>Zoom</value>
+  </data>
+  <data name="picQRCode.TabIndex" type="System.Int32, mscorlib">
+    <value>24</value>
+  </data>
+  <data name="txtUrl.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+    <value>Bottom</value>
+  </data>
+  <data name="txtUrl.Location" type="System.Drawing.Point, System.Drawing">
+    <value>0, 371</value>
+  </data>
+  <data name="txtUrl.Multiline" type="System.Boolean, mscorlib">
    <value>True</value>
-  </metadata>
+  </data>
+  <data name="txtUrl.Size" type="System.Drawing.Size, System.Drawing">
+    <value>356, 70</value>
+  </data>
+  <data name="txtUrl.TabIndex" type="System.Int32, mscorlib">
+    <value>0</value>
+  </data>
 </root>
--- a/v2rayN/v2rayN/Forms/SubSettingControl.cs
+++ b/v2rayN/v2rayN/Forms/SubSettingControl.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Windows.Forms;
+using v2rayN.Base;
 using v2rayN.Mode;

 namespace v2rayN.Forms
@@ -53,10 +54,7 @@ namespace v2rayN.Forms
                subItem.url = string.Empty;
            }

-            if (OnButtonClicked != null)
-            {
-                OnButtonClicked(sender, e);
-            }
+            OnButtonClicked?.Invoke(sender, e);
        }
    }
 }
--- a/v2rayN/v2rayN/Forms/SubSettingControl.resx
+++ b/v2rayN/v2rayN/Forms/SubSettingControl.resx
@@ -118,213 +118,123 @@
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="label2.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
-    <value>NoControl</value>
-  </data>
-  <data name="&gt;&gt;txtUrl.Parent" xml:space="preserve">
-    <value>groupBox2</value>
-  </data>
  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="chkEnabled.Size" type="System.Drawing.Size, System.Drawing">
-    <value>60, 16</value>
-  </data>
-  <data name="&gt;&gt;txtUrl.Name" xml:space="preserve">
-    <value>txtUrl</value>
-  </data>
-  <data name="btnRemove.Text" xml:space="preserve">
-    <value>&amp;Remove</value>
-  </data>
-  <data name="btnRemove.Location" type="System.Drawing.Point, System.Drawing">
-    <value>484, 21</value>
-  </data>
  <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="btnRemove.TabIndex" type="System.Int32, mscorlib">
-    <value>24</value>
-  </data>
-  <data name="txtUrl.Size" type="System.Drawing.Size, System.Drawing">
-    <value>432, 46</value>
-  </data>
-  <data name="&gt;&gt;$this.Name" xml:space="preserve">
-    <value>SubSettingControl</value>
-  </data>
-  <data name="&gt;&gt;txtRemarks.Type" xml:space="preserve">
-    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="txtUrl.Multiline" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="&gt;&gt;txtRemarks.Parent" xml:space="preserve">
-    <value>groupBox2</value>
-  </data>
-  <data name="label3.Size" type="System.Drawing.Size, System.Drawing">
-    <value>83, 12</value>
-  </data>
-  <data name="&gt;&gt;groupBox2.Name" xml:space="preserve">
-    <value>groupBox2</value>
-  </data>
  <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
    <value>6, 12</value>
  </data>
-  <data name="&gt;&gt;label3.Name" xml:space="preserve">
-    <value>label3</value>
+  <data name="$this.Language" type="System.Globalization.CultureInfo, mscorlib">
+    <value>zh-Hans</value>
  </data>
-  <data name="txtRemarks.Location" type="System.Drawing.Point, System.Drawing">
-    <value>127, 21</value>
-  </data>
-  <data name="label3.AutoSize" type="System.Boolean, mscorlib">
+  <data name="$this.Localizable" type="System.Boolean, mscorlib">
    <value>True</value>
  </data>
-  <data name="&gt;&gt;chkEnabled.ZOrder" xml:space="preserve">
-    <value>0</value>
-  </data>
-  <data name="label3.Location" type="System.Drawing.Point, System.Drawing">
-    <value>12, 55</value>
-  </data>
-  <data name="txtUrl.Location" type="System.Drawing.Point, System.Drawing">
-    <value>127, 55</value>
-  </data>
-  <data name="label2.TabIndex" type="System.Int32, mscorlib">
-    <value>10</value>
-  </data>
-  <data name="groupBox2.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
-    <value>Bottom</value>
-  </data>
-  <data name="&gt;&gt;label2.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;txtUrl.ZOrder" xml:space="preserve">
-    <value>2</value>
-  </data>
-  <data name="&gt;&gt;chkEnabled.Parent" xml:space="preserve">
-    <value>groupBox2</value>
-  </data>
-  <data name="&gt;&gt;label2.ZOrder" xml:space="preserve">
-    <value>4</value>
-  </data>
-  <data name="label2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>47, 12</value>
-  </data>
-  <data name="groupBox2.Text" xml:space="preserve">
-    <value>Subscription details</value>
-  </data>
-  <data name="groupBox2.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 9</value>
-  </data>
-  <data name="chkEnabled.Text" xml:space="preserve">
-    <value>Enable</value>
-  </data>
-  <data name="&gt;&gt;chkEnabled.Name" xml:space="preserve">
-    <value>chkEnabled</value>
-  </data>
-  <data name="&gt;&gt;txtRemarks.ZOrder" xml:space="preserve">
-    <value>3</value>
-  </data>
-  <data name="btnRemove.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
-    <value>NoControl</value>
-  </data>
-  <data name="label3.Text" xml:space="preserve">
-    <value>Address (url)</value>
-  </data>
-  <data name="chkEnabled.TabIndex" type="System.Int32, mscorlib">
-    <value>25</value>
-  </data>
-  <data name="txtUrl.TabIndex" type="System.Int32, mscorlib">
-    <value>23</value>
-  </data>
-  <data name="&gt;&gt;label2.Parent" xml:space="preserve">
-    <value>groupBox2</value>
-  </data>
-  <data name="&gt;&gt;btnRemove.Parent" xml:space="preserve">
-    <value>groupBox2</value>
-  </data>
-  <data name="chkEnabled.Location" type="System.Drawing.Point, System.Drawing">
-    <value>406, 23</value>
-  </data>
-  <data name="label2.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="chkEnabled.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="&gt;&gt;btnRemove.Name" xml:space="preserve">
-    <value>btnRemove</value>
-  </data>
-  <data name="label3.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
-    <value>NoControl</value>
-  </data>
-  <data name="&gt;&gt;label2.Name" xml:space="preserve">
-    <value>label2</value>
-  </data>
-  <data name="&gt;&gt;groupBox2.Type" xml:space="preserve">
-    <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="groupBox2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>584, 110</value>
-  </data>
-  <data name="chkEnabled.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
-    <value>NoControl</value>
-  </data>
  <data name="$this.Size" type="System.Drawing.Size, System.Drawing">
    <value>584, 119</value>
  </data>
-  <data name="txtRemarks.TabIndex" type="System.Int32, mscorlib">
-    <value>11</value>
+  <data name="btnRemove.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
  </data>
-  <data name="label2.Text" xml:space="preserve">
-    <value>Remarks</value>
-  </data>
-  <data name="label3.TabIndex" type="System.Int32, mscorlib">
-    <value>0</value>
-  </data>
-  <data name="label2.Location" type="System.Drawing.Point, System.Drawing">
-    <value>12, 25</value>
+  <data name="btnRemove.Location" type="System.Drawing.Point, System.Drawing">
+    <value>484, 21</value>
  </data>
  <data name="btnRemove.Size" type="System.Drawing.Size, System.Drawing">
    <value>75, 23</value>
  </data>
-  <data name="&gt;&gt;label3.Parent" xml:space="preserve">
-    <value>groupBox2</value>
+  <data name="btnRemove.TabIndex" type="System.Int32, mscorlib">
+    <value>24</value>
  </data>
-  <data name="txtRemarks.Size" type="System.Drawing.Size, System.Drawing">
-    <value>265, 21</value>
+  <data name="btnRemove.Text" xml:space="preserve">
+    <value>&amp;Remove</value>
+  </data>
+  <data name="chkEnabled.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="chkEnabled.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="chkEnabled.Location" type="System.Drawing.Point, System.Drawing">
+    <value>406, 23</value>
+  </data>
+  <data name="chkEnabled.Size" type="System.Drawing.Size, System.Drawing">
+    <value>60, 16</value>
+  </data>
+  <data name="chkEnabled.TabIndex" type="System.Int32, mscorlib">
+    <value>25</value>
+  </data>
+  <data name="chkEnabled.Text" xml:space="preserve">
+    <value>Enable</value>
+  </data>
+  <data name="groupBox2.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+    <value>Bottom</value>
+  </data>
+  <data name="groupBox2.Location" type="System.Drawing.Point, System.Drawing">
+    <value>0, 9</value>
+  </data>
+  <data name="groupBox2.Size" type="System.Drawing.Size, System.Drawing">
+    <value>584, 110</value>
  </data>
  <data name="groupBox2.TabIndex" type="System.Int32, mscorlib">
    <value>10</value>
  </data>
-  <data name="&gt;&gt;txtUrl.Type" xml:space="preserve">
-    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  <data name="groupBox2.Text" xml:space="preserve">
+    <value>Subscription details</value>
  </data>
-  <data name="&gt;&gt;btnRemove.ZOrder" xml:space="preserve">
-    <value>1</value>
+  <data name="label2.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
  </data>
-  <data name="&gt;&gt;groupBox2.Parent" xml:space="preserve">
-    <value>$this</value>
+  <data name="label2.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
  </data>
-  <data name="&gt;&gt;btnRemove.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  <data name="label2.Location" type="System.Drawing.Point, System.Drawing">
+    <value>12, 25</value>
  </data>
-  <data name="&gt;&gt;$this.Type" xml:space="preserve">
-    <value>System.Windows.Forms.UserControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  <data name="label2.Size" type="System.Drawing.Size, System.Drawing">
+    <value>47, 12</value>
  </data>
-  <data name="&gt;&gt;groupBox2.ZOrder" xml:space="preserve">
+  <data name="label2.TabIndex" type="System.Int32, mscorlib">
+    <value>10</value>
+  </data>
+  <data name="label2.Text" xml:space="preserve">
+    <value>Remarks</value>
+  </data>
+  <data name="label3.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="label3.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="label3.Location" type="System.Drawing.Point, System.Drawing">
+    <value>12, 55</value>
+  </data>
+  <data name="label3.Size" type="System.Drawing.Size, System.Drawing">
+    <value>83, 12</value>
+  </data>
+  <data name="label3.TabIndex" type="System.Int32, mscorlib">
    <value>0</value>
  </data>
-  <data name="&gt;&gt;txtRemarks.Name" xml:space="preserve">
-    <value>txtRemarks</value>
+  <data name="label3.Text" xml:space="preserve">
+    <value>Address (url)</value>
  </data>
-  <data name="&gt;&gt;label3.ZOrder" xml:space="preserve">
-    <value>5</value>
+  <data name="txtRemarks.Location" type="System.Drawing.Point, System.Drawing">
+    <value>127, 21</value>
  </data>
-  <data name="&gt;&gt;chkEnabled.Type" xml:space="preserve">
-    <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  <data name="txtRemarks.Size" type="System.Drawing.Size, System.Drawing">
+    <value>265, 21</value>
  </data>
-  <data name="&gt;&gt;label3.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  <data name="txtRemarks.TabIndex" type="System.Int32, mscorlib">
+    <value>11</value>
  </data>
-  <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <data name="txtUrl.Location" type="System.Drawing.Point, System.Drawing">
+    <value>127, 55</value>
+  </data>
+  <data name="txtUrl.Multiline" type="System.Boolean, mscorlib">
    <value>True</value>
-  </metadata>
-  <metadata name="$this.Language" type="System.Globalization.CultureInfo, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>zh-Hans</value>
-  </metadata>
+  </data>
+  <data name="txtUrl.Size" type="System.Drawing.Size, System.Drawing">
+    <value>432, 46</value>
+  </data>
+  <data name="txtUrl.TabIndex" type="System.Int32, mscorlib">
+    <value>23</value>
+  </data>
 </root>
--- a/v2rayN/v2rayN/Forms/SubSettingControl.zh-Hans.resx
+++ b/v2rayN/v2rayN/Forms/SubSettingControl.zh-Hans.resx
@@ -118,14 +118,17 @@
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="btnRemove.Text" xml:space="preserve">
+    <value>移除</value>
+  </data>
  <data name="chkEnabled.Size" type="System.Drawing.Size, System.Drawing">
    <value>48, 16</value>
  </data>
  <data name="chkEnabled.Text" xml:space="preserve">
    <value>启用</value>
  </data>
-  <data name="btnRemove.Text" xml:space="preserve">
-    <value>移除</value>
+  <data name="groupBox2.Text" xml:space="preserve">
+    <value>订阅详情</value>
  </data>
  <data name="label2.Size" type="System.Drawing.Size, System.Drawing">
    <value>29, 12</value>
@@ -139,7 +142,4 @@
  <data name="label3.Text" xml:space="preserve">
    <value>地址 (url)</value>
  </data>
-  <data name="groupBox2.Text" xml:space="preserve">
-    <value>订阅详情</value>
-  </data>
 </root>
--- a/v2rayN/v2rayN/Forms/SubSettingForm.cs
+++ b/v2rayN/v2rayN/Forms/SubSettingForm.cs
@@ -35,7 +35,7 @@ namespace v2rayN.Forms

            for (int k = config.subItem.Count - 1; k >= 0; k--)
            {
-                var item = config.subItem[k];
+                SubItem item = config.subItem[k];
                if (Utils.IsNullOrEmpty(item.remarks)
                    && Utils.IsNullOrEmpty(item.url))
                {
@@ -47,9 +47,8 @@ namespace v2rayN.Forms
                }
            }

-            for (int k = 0; k < config.subItem.Count; k++)
+            foreach (SubItem item in config.subItem)
            {
-                var item = config.subItem[k];
                SubSettingControl control = new SubSettingControl();
                control.OnButtonClicked += Control_OnButtonClicked;
                control.subItem = item;
@@ -80,7 +79,7 @@ namespace v2rayN.Forms
            }
            else
            {
-                UI.Show(UIRes.I18N("OperationFailed"));
+                UI.ShowWarning(UIRes.I18N("OperationFailed"));
            }
        }

@@ -99,10 +98,12 @@ namespace v2rayN.Forms

        private void AddSub()
        {
-            var subItem = new SubItem();
-            subItem.id = string.Empty;
-            subItem.remarks = "remarks";
-            subItem.url = "url";
+            SubItem subItem = new SubItem
+            {
+                id = string.Empty,
+                remarks = "remarks",
+                url = "url"
+            };
            config.subItem.Add(subItem);
        }
    }
--- a/v2rayN/v2rayN/Forms/SubSettingForm.resx
+++ b/v2rayN/v2rayN/Forms/SubSettingForm.resx
@@ -118,61 +118,19 @@
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="btnClose.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
-    <value>NoControl</value>
-  </data>
  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="btnClose.Location" type="System.Drawing.Point, System.Drawing">
-    <value>448, 17</value>
-  </data>
-  <data name="btnClose.Size" type="System.Drawing.Size, System.Drawing">
-    <value>75, 23</value>
-  </data>
  <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="btnClose.TabIndex" type="System.Int32, mscorlib">
-    <value>4</value>
+  <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
+    <value>6, 12</value>
  </data>
-  <data name="btnClose.Text" xml:space="preserve">
-    <value>&amp;Cancel</value>
+  <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
+    <value>581, 629</value>
  </data>
-  <data name="&gt;&gt;btnClose.Name" xml:space="preserve">
-    <value>btnClose</value>
-  </data>
-  <data name="&gt;&gt;btnClose.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;btnClose.Parent" xml:space="preserve">
-    <value>panel2</value>
-  </data>
-  <data name="&gt;&gt;btnClose.ZOrder" xml:space="preserve">
-    <value>1</value>
-  </data>
-  <data name="panCon.AutoScroll" type="System.Boolean, mscorlib">
+  <data name="$this.Localizable" type="System.Boolean, mscorlib">
    <value>True</value>
  </data>
-  <data name="panCon.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
-    <value>Fill</value>
-  </data>
-  <data name="panCon.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 0</value>
-  </data>
-  <data name="panCon.Size" type="System.Drawing.Size, System.Drawing">
-    <value>581, 569</value>
-  </data>
-  <data name="panCon.TabIndex" type="System.Int32, mscorlib">
-    <value>10</value>
-  </data>
-  <data name="&gt;&gt;panCon.Name" xml:space="preserve">
-    <value>panCon</value>
-  </data>
-  <data name="&gt;&gt;panCon.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;panCon.Parent" xml:space="preserve">
-    <value>$this</value>
-  </data>
-  <data name="&gt;&gt;panCon.ZOrder" xml:space="preserve">
-    <value>0</value>
+  <data name="$this.Text" xml:space="preserve">
+    <value>Subscription settings</value>
  </data>
  <data name="btnAdd.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
    <value>NoControl</value>
@@ -189,17 +147,20 @@
  <data name="btnAdd.Text" xml:space="preserve">
    <value>&amp;Add</value>
  </data>
-  <data name="&gt;&gt;btnAdd.Name" xml:space="preserve">
-    <value>btnAdd</value>
+  <data name="btnClose.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
  </data>
-  <data name="&gt;&gt;btnAdd.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  <data name="btnClose.Location" type="System.Drawing.Point, System.Drawing">
+    <value>448, 17</value>
  </data>
-  <data name="&gt;&gt;btnAdd.Parent" xml:space="preserve">
-    <value>panel2</value>
+  <data name="btnClose.Size" type="System.Drawing.Size, System.Drawing">
+    <value>75, 23</value>
  </data>
-  <data name="&gt;&gt;btnAdd.ZOrder" xml:space="preserve">
-    <value>0</value>
+  <data name="btnClose.TabIndex" type="System.Int32, mscorlib">
+    <value>4</value>
+  </data>
+  <data name="btnClose.Text" xml:space="preserve">
+    <value>&amp;Cancel</value>
  </data>
  <data name="btnOK.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
    <value>NoControl</value>
@@ -216,17 +177,20 @@
  <data name="btnOK.Text" xml:space="preserve">
    <value>&amp;OK</value>
  </data>
-  <data name="&gt;&gt;btnOK.Name" xml:space="preserve">
-    <value>btnOK</value>
+  <data name="panCon.AutoScroll" type="System.Boolean, mscorlib">
+    <value>True</value>
  </data>
-  <data name="&gt;&gt;btnOK.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  <data name="panCon.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+    <value>Fill</value>
  </data>
-  <data name="&gt;&gt;btnOK.Parent" xml:space="preserve">
-    <value>panel2</value>
+  <data name="panCon.Location" type="System.Drawing.Point, System.Drawing">
+    <value>0, 0</value>
  </data>
-  <data name="&gt;&gt;btnOK.ZOrder" xml:space="preserve">
-    <value>2</value>
+  <data name="panCon.Size" type="System.Drawing.Size, System.Drawing">
+    <value>581, 569</value>
+  </data>
+  <data name="panCon.TabIndex" type="System.Int32, mscorlib">
+    <value>10</value>
  </data>
  <data name="panel2.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
    <value>Bottom</value>
@@ -240,34 +204,4 @@
  <data name="panel2.TabIndex" type="System.Int32, mscorlib">
    <value>7</value>
  </data>
-  <data name="&gt;&gt;panel2.Name" xml:space="preserve">
-    <value>panel2</value>
-  </data>
-  <data name="&gt;&gt;panel2.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;panel2.Parent" xml:space="preserve">
-    <value>$this</value>
-  </data>
-  <data name="&gt;&gt;panel2.ZOrder" xml:space="preserve">
-    <value>1</value>
-  </data>
-  <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
-    <value>6, 12</value>
-  </data>
-  <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
-    <value>581, 629</value>
-  </data>  
-  <data name="$this.Text" xml:space="preserve">
-    <value>Subscription settings</value>
-  </data>
-  <data name="&gt;&gt;$this.Name" xml:space="preserve">
-    <value>SubSettingForm</value>
-  </data>
-  <data name="&gt;&gt;$this.Type" xml:space="preserve">
-    <value>v2rayN.Forms.BaseForm, v2rayN, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value>
-  </data>
 </root>
--- a/v2rayN/v2rayN/Forms/SubSettingForm.zh-Hans.resx
+++ b/v2rayN/v2rayN/Forms/SubSettingForm.zh-Hans.resx
@@ -117,12 +117,15 @@
  <resheader name="writer">
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
-  <data name="btnClose.Text" xml:space="preserve">
-    <value>取消(&amp;C)</value>
+  <data name="$this.Text" xml:space="preserve">
+    <value>订阅设置</value>
  </data>
  <data name="btnAdd.Text" xml:space="preserve">
    <value>添加(&amp;A)</value>
  </data>
+  <data name="btnClose.Text" xml:space="preserve">
+    <value>取消(&amp;C)</value>
+  </data>
  <data name="btnOK.Text" xml:space="preserve">
    <value>确定(&amp;O)</value>
  </data>
@@ -143,7 +146,4 @@
        ZW0uRHJhd2luZy5HcmFwaGljc1VuaXQBAAAAB3ZhbHVlX18ACAMAAAADAAAACw==
 </value>
  </data>
-  <data name="$this.Text" xml:space="preserve">
-    <value>订阅设置</value>
-  </data>
 </root>
--- a/v2rayN/v2rayN/Global.cs
+++ b/v2rayN/v2rayN/Global.cs
@@ -5,30 +5,30 @@ namespace v2rayN
    {
        #region 常量

-        /// <summary>
-        /// 更新链接
-        /// </summary>
-        public const string UpdateUrl = @"https://github.com/2dust/v2rayN/releases";
-        /// <summary>
-        /// 关于链接
-        /// </summary>
+
+        public const string v2rayWebsiteUrl = @"https://www.v2ray.com/";
        public const string AboutUrl = @"https://github.com/2dust/v2rayN";
+        public const string UpdateUrl = AboutUrl + @"/releases";
+

        /// <summary>
        /// SpeedTestUrl
        /// </summary>
-        public const string SpeedTestUrl = @"http://speedtest-sfo2.digitalocean.com/10mb.test";
+        public const string SpeedTestUrl = @"http://speedtest-sgp1.digitalocean.com/10mb.test";
        public const string SpeedPingTestUrl = @"https://www.google.com/generate_204";
+        public const string AvailabilityTestUrl = @"https://www.google.com/generate_204";

        /// <summary>
        /// CustomRoutingListUrl
        /// </summary>
        public const string CustomRoutingListUrl = @"https://raw.githubusercontent.com/2dust/v2rayCustomRoutingList/master/";

+        public const string GFWLIST_URL = "https://raw.githubusercontent.com/gfwlist/gfwlist/master/gfwlist.txt";
+
        /// <summary>
        /// PromotionUrl
        /// </summary>
-        public const string PromotionUrl = @"https://1.2345345.xyz/ads.html";
+        public const string PromotionUrl = @"aHR0cHM6Ly85LjIzNDQ1Ni54eXovYWJjLmh0bWw=";

        /// <summary>
        /// 本软件配置文件名
@@ -61,6 +61,8 @@ namespace v2rayN
        /// </summary>
        public const string BlankPacFileName = "v2rayN.Sample.BlankPac.txt";

+        public const string CustomRoutingFileName = "v2rayN.Sample.custom_routing_";
+

        /// <summary>
        /// 默认加密方式
@@ -96,12 +98,19 @@ namespace v2rayN
        /// 阻止 tag值
        /// </summary>
        public const string blockTag = "block";
-        
+
        /// <summary>
        /// 
        /// </summary>
        public const string StreamSecurity = "tls";

+        public const string InboundSocks = "socks";
+        public const string InboundHttp = "http";
+        public const string Loopback = "127.0.0.1";
+        public const string InboundAPITagName = "api";
+        public const string InboundAPIProtocal = "dokodemo-door";
+
+
        /// <summary>
        /// vmess
        /// </summary>
@@ -147,20 +156,15 @@ namespace v2rayN
        /// </summary>
        public const string CustomIconName = "v2rayN.ico";

-        public const string Loopback = "127.0.0.1";
-
-        public const string InboundAPITagName = "api";
-        public const string InboundProxyTagName = "proxy";  
-        public const string InboundAPIProtocal = "dokodemo-door";
-     
        public enum StatisticsFreshRate
        {
            quick = 1000,
            medium = 2000,
            slow = 3000
        }
-        public const string StatisticLogDirectory = "Statistics";
-        public const string StatisticLogOverall = "overall.txt";
+        public const string StatisticLogOverall = "StatisticLogOverall.json";
+
+        public const string IEProxyExceptions = "localhost;127.*;10.*;172.16.*;172.17.*;172.18.*;172.19.*;172.20.*;172.21.*;172.22.*;172.23.*;172.24.*;172.25.*;172.26.*;172.27.*;172.28.*;172.29.*;172.30.*;172.31.*;192.168.*";

        #endregion

@@ -169,32 +173,59 @@ namespace v2rayN
        /// <summary>
        /// 是否需要重启服务V2ray
        /// </summary>
-        public static bool reloadV2ray { get; set; }
+        public static bool reloadV2ray
+        {
+            get; set;
+        }

        /// <summary>
        /// 是否开启全局代理(http)
        /// </summary>
-        public static bool sysAgent { get; set; }
+        public static bool sysAgent
+        {
+            get; set;
+        }

        /// <summary>
-        /// socks端口号
+        /// socks端口
        /// </summary>
-        public static int socksPort { get; set; }
+        public static int socksPort
+        {
+            get; set;
+        }

        /// <summary>
-        /// 全局代理端口(http)
+        /// http端口
        /// </summary>
-        public static int sysAgentPort { get; set; }
+        public static int httpPort
+        {
+            get; set;
+        }

        /// <summary>
-        /// PAC监听端口号
+        /// PAC端口
        /// </summary>
-        public static int pacPort { get; set; }
+        public static int pacPort
+        {
+            get; set;
+        }

        /// <summary>
        ///  
        /// </summary>
-        public static int statePort { get; set; }
+        public static int statePort
+        {
+            get; set;
+        }
+
+        public static Job processJob
+        {
+            get; set;
+        }
+        public static System.Threading.Mutex mutexObj
+        {
+            get; set;
+        }

        #endregion

--- a/v2rayN/v2rayN/Handler/ConfigHandler.cs
+++ b/v2rayN/v2rayN/Handler/ConfigHandler.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Net;
 using v2rayN.Mode;
+using v2rayN.Base;

 namespace v2rayN.Handler
 {
@@ -29,37 +30,38 @@ namespace v2rayN.Handler
            }
            if (config == null)
            {
-                config = new Config();
-                config.index = -1;
-                config.logEnabled = false;
-                config.loglevel = "warning";
-                config.vmess = new List<VmessItem>();
+                config = new Config
+                {
+                    index = -1,
+                    logEnabled = false,
+                    loglevel = "warning",
+                    vmess = new List<VmessItem>(),

-                //Mux
-                config.muxEnabled = true;
+                    //Mux
+                    muxEnabled = true,

-                ////默认监听端口
-                //config.pacPort = 8888;
+                    ////默认监听端口
+                    //config.pacPort = 8888;

-                // 默认缓存七天
-                config.CacheDays = 7;
+                    // 默认不开启统计
+                    enableStatistics = false,

-                // 默认不开启统计
-                config.enableStatistics = false;
-
-                // 默认中等刷新率
-                config.statisticsFreshRate = (int)Global.StatisticsFreshRate.medium;
+                    // 默认中等刷新率
+                    statisticsFreshRate = (int)Global.StatisticsFreshRate.medium
+                };
            }

            //本地监听
            if (config.inbound == null)
            {
                config.inbound = new List<InItem>();
-                InItem inItem = new InItem();
-                inItem.protocol = "socks";
-                inItem.localPort = 10808;
-                inItem.udpEnabled = true;
-                inItem.sniffingEnabled = true;
+                InItem inItem = new InItem
+                {
+                    protocol = Global.InboundSocks,
+                    localPort = 10808,
+                    udpEnabled = true,
+                    sniffingEnabled = true
+                };

                config.inbound.Add(inItem);

@@ -75,7 +77,7 @@ namespace v2rayN.Handler
                //http协议不由core提供,只保留socks
                if (config.inbound.Count > 0)
                {
-                    config.inbound[0].protocol = "socks";
+                    config.inbound[0].protocol = Global.InboundSocks;
                }
            }
            //路由规则
@@ -102,14 +104,16 @@ namespace v2rayN.Handler
            //kcp
            if (config.kcpItem == null)
            {
-                config.kcpItem = new KcpItem();
-                config.kcpItem.mtu = 1350;
-                config.kcpItem.tti = 50;
-                config.kcpItem.uplinkCapacity = 12;
-                config.kcpItem.downlinkCapacity = 100;
-                config.kcpItem.readBufferSize = 2;
-                config.kcpItem.writeBufferSize = 2;
-                config.kcpItem.congestion = false;
+                config.kcpItem = new KcpItem
+                {
+                    mtu = 1350,
+                    tti = 50,
+                    uplinkCapacity = 12,
+                    downlinkCapacity = 100,
+                    readBufferSize = 2,
+                    writeBufferSize = 2,
+                    congestion = false
+                };
            }
            if (config.uiItem == null)
            {
@@ -120,11 +124,31 @@ namespace v2rayN.Handler
            //{
            //    config.pacPort = 8888;
            //}
+            if (Utils.IsNullOrEmpty(config.speedTestUrl))
+            {
+                config.speedTestUrl = Global.SpeedTestUrl;
+            }
+            if (Utils.IsNullOrEmpty(config.speedPingTestUrl))
+            {
+                config.speedPingTestUrl = Global.SpeedPingTestUrl;
+            }
+            if (Utils.IsNullOrEmpty(config.urlGFWList))
+            {
+                config.urlGFWList = Global.GFWLIST_URL;
+            }
+            //if (Utils.IsNullOrEmpty(config.remoteDNS))
+            //{
+            //    config.remoteDNS = "1.1.1.1";
+            //}

            if (config.subItem == null)
            {
                config.subItem = new List<SubItem>();
            }
+            if (config.userPacRule == null)
+            {
+                config.userPacRule = new List<string>();
+            }

            if (config == null
                || config.index < 0
@@ -237,7 +261,7 @@ namespace v2rayN.Handler
        }

        /// <summary>
-        /// 复制服务器
+        /// 克隆服务器
        /// </summary>
        /// <param name="config"></param>
        /// <param name="index"></param>
@@ -249,22 +273,24 @@ namespace v2rayN.Handler
                return -1;
            }

-            VmessItem vmessItem = new VmessItem();
-            vmessItem.configVersion = config.vmess[index].configVersion;
-            vmessItem.configType = config.vmess[index].configType;
-            vmessItem.address = config.vmess[index].address;
-            vmessItem.port = config.vmess[index].port;
-            vmessItem.id = config.vmess[index].id;
-            vmessItem.alterId = config.vmess[index].alterId;
-            vmessItem.security = config.vmess[index].security;
-            vmessItem.network = config.vmess[index].network;
-            vmessItem.headerType = config.vmess[index].headerType;
-            vmessItem.requestHost = config.vmess[index].requestHost;
-            vmessItem.path = config.vmess[index].path;
-            vmessItem.streamSecurity = config.vmess[index].streamSecurity;
-            vmessItem.remarks = string.Format("{0}-clone", config.vmess[index].remarks);
+            VmessItem vmessItem = new VmessItem
+            {
+                configVersion = config.vmess[index].configVersion,
+                configType = config.vmess[index].configType,
+                address = config.vmess[index].address,
+                port = config.vmess[index].port,
+                id = config.vmess[index].id,
+                alterId = config.vmess[index].alterId,
+                security = config.vmess[index].security,
+                network = config.vmess[index].network,
+                headerType = config.vmess[index].headerType,
+                requestHost = config.vmess[index].requestHost,
+                path = config.vmess[index].path,
+                streamSecurity = config.vmess[index].streamSecurity,
+                remarks = string.Format("{0}-clone", config.vmess[index].remarks)
+            };

-            config.vmess.Add(vmessItem);
+            config.vmess.Insert(index + 1, vmessItem); // 插入到下一项

            ToJsonFile(config);

@@ -302,9 +328,9 @@ namespace v2rayN.Handler
        /// </summary>
        /// <param name="config"></param>
        /// <returns></returns>
-        public static int SaveConfig(ref Config config)
+        public static int SaveConfig(ref Config config, bool reload = true)
        {
-            Global.reloadV2ray = true;
+            Global.reloadV2ray = reload;

            ToJsonFile(config);

@@ -315,7 +341,7 @@ namespace v2rayN.Handler
        /// 存储文件
        /// </summary>
        /// <param name="config"></param>
-        public static void ToJsonFile(Config config)
+        private static void ToJsonFile(Config config)
        {
            Utils.ToJsonFile(config, Utils.GetPath(configRes));
        }
@@ -335,18 +361,20 @@ namespace v2rayN.Handler
                VmessItem vmessItem = config.vmess[index];
                if (vmessItem.configType == (int)EConfigType.Vmess)
                {
-                    VmessQRCode vmessQRCode = new VmessQRCode();
-                    vmessQRCode.v = vmessItem.configVersion.ToString();
-                    vmessQRCode.ps = vmessItem.remarks.TrimEx(); //备注也许很长 ;
-                    vmessQRCode.add = vmessItem.address;
-                    vmessQRCode.port = vmessItem.port.ToString();
-                    vmessQRCode.id = vmessItem.id;
-                    vmessQRCode.aid = vmessItem.alterId.ToString();
-                    vmessQRCode.net = vmessItem.network;
-                    vmessQRCode.type = vmessItem.headerType;
-                    vmessQRCode.host = vmessItem.requestHost;
-                    vmessQRCode.path = vmessItem.path;
-                    vmessQRCode.tls = vmessItem.streamSecurity;
+                    VmessQRCode vmessQRCode = new VmessQRCode
+                    {
+                        v = vmessItem.configVersion.ToString(),
+                        ps = vmessItem.remarks.TrimEx(), //备注也许很长 ;
+                        add = vmessItem.address,
+                        port = vmessItem.port.ToString(),
+                        id = vmessItem.id,
+                        aid = vmessItem.alterId.ToString(),
+                        net = vmessItem.network,
+                        type = vmessItem.headerType,
+                        host = vmessItem.requestHost,
+                        path = vmessItem.path,
+                        tls = vmessItem.streamSecurity
+                    };

                    url = Utils.ToJson(vmessQRCode);
                    url = Utils.Base64Encode(url);
@@ -355,7 +383,7 @@ namespace v2rayN.Handler
                }
                else if (vmessItem.configType == (int)EConfigType.Shadowsocks)
                {
-                    var remark = string.Empty;
+                    string remark = string.Empty;
                    if (!Utils.IsNullOrEmpty(vmessItem.remarks))
                    {
                        remark = "#" + WebUtility.UrlEncode(vmessItem.remarks);
@@ -370,7 +398,7 @@ namespace v2rayN.Handler
                }
                else if (vmessItem.configType == (int)EConfigType.Socks)
                {
-                    var remark = string.Empty;
+                    string remark = string.Empty;
                    if (!Utils.IsNullOrEmpty(vmessItem.remarks))
                    {
                        remark = "#" + WebUtility.UrlEncode(vmessItem.remarks);
@@ -416,7 +444,7 @@ namespace v2rayN.Handler
                        {
                            return 0;
                        }
-                        VmessItem vmess = Utils.DeepCopy<VmessItem>(config.vmess[index]);
+                        VmessItem vmess = Utils.DeepCopy(config.vmess[index]);
                        config.vmess.RemoveAt(index);
                        config.vmess.Insert(0, vmess);
                        if (index < config.index)
@@ -439,7 +467,7 @@ namespace v2rayN.Handler
                        {
                            return 0;
                        }
-                        VmessItem vmess = Utils.DeepCopy<VmessItem>(config.vmess[index]);
+                        VmessItem vmess = Utils.DeepCopy(config.vmess[index]);
                        config.vmess.RemoveAt(index);
                        config.vmess.Insert(index - 1, vmess);
                        if (index == config.index + 1)
@@ -459,7 +487,7 @@ namespace v2rayN.Handler
                        {
                            return 0;
                        }
-                        VmessItem vmess = Utils.DeepCopy<VmessItem>(config.vmess[index]);
+                        VmessItem vmess = Utils.DeepCopy(config.vmess[index]);
                        config.vmess.RemoveAt(index);
                        config.vmess.Insert(index + 1, vmess);
                        if (index == config.index - 1)
@@ -478,7 +506,7 @@ namespace v2rayN.Handler
                        {
                            return 0;
                        }
-                        VmessItem vmess = Utils.DeepCopy<VmessItem>(config.vmess[index]);
+                        VmessItem vmess = Utils.DeepCopy(config.vmess[index]);
                        config.vmess.RemoveAt(index);
                        config.vmess.Add(vmess);
                        if (index < config.index)
@@ -512,23 +540,24 @@ namespace v2rayN.Handler
        /// <returns></returns>
        public static int AddCustomServer(ref Config config, string fileName)
        {
-            string newFileName = string.Empty;
-            newFileName = string.Format("{0}.json", Utils.GetGUID());
-            newFileName = Path.Combine(Utils.GetTempPath(), newFileName);
+            string newFileName = string.Format("{0}.json", Utils.GetGUID());
+            //newFileName = Path.Combine(Utils.GetTempPath(), newFileName);

            try
            {
-                File.Copy(fileName, newFileName);
+                File.Copy(fileName, Path.Combine(Utils.GetTempPath(), newFileName));
            }
            catch
            {
                return -1;
            }

-            VmessItem vmessItem = new VmessItem();
-            vmessItem.address = newFileName;
-            vmessItem.configType = (int)EConfigType.Custom;
-            vmessItem.remarks = string.Format("import custom@{0}", DateTime.Now.ToShortDateString());
+            VmessItem vmessItem = new VmessItem
+            {
+                address = newFileName,
+                configType = (int)EConfigType.Custom,
+                remarks = string.Format("import custom@{0}", DateTime.Now.ToShortDateString())
+            };

            config.vmess.Add(vmessItem);
            if (config.vmess.Count == 1)
@@ -578,7 +607,7 @@ namespace v2rayN.Handler
            vmessItem.address = vmessItem.address.TrimEx();
            vmessItem.id = vmessItem.id.TrimEx();
            vmessItem.security = vmessItem.security.TrimEx();
-           
+
            if (index >= 0)
            {
                //修改
@@ -714,7 +743,7 @@ namespace v2rayN.Handler
        /// <param name="config"></param>
        /// <param name="clipboardData"></param>
        /// <param name="subid"></param>
-        /// <returns></returns>
+        /// <returns>成功导入的数量</returns>
        public static int AddBatchServers(ref Config config, string clipboardData, string subid = "")
        {
            if (Utils.IsNullOrEmpty(clipboardData))
@@ -731,7 +760,6 @@ namespace v2rayN.Handler
            string[] arrData = clipboardData.Split(Environment.NewLine.ToCharArray());
            foreach (string str in arrData)
            {
-                string msg;
                //maybe sub
                if (str.StartsWith(Global.httpsProtocol) || str.StartsWith(Global.httpProtocol))
                {
@@ -741,7 +769,7 @@ namespace v2rayN.Handler
                    }
                    continue;
                }
-                VmessItem vmessItem = V2rayConfigHandler.ImportFromClipboardConfig(str, out msg);
+                VmessItem vmessItem = V2rayConfigHandler.ImportFromClipboardConfig(str, out string msg);
                if (vmessItem == null)
                {
                    continue;
@@ -769,11 +797,7 @@ namespace v2rayN.Handler
                    }
                }
            }
-            if (countServers > 0)
-            {
-                return 0;
-            }
-            return -1;
+            return countServers;
        }

        /// <summary>
@@ -785,7 +809,7 @@ namespace v2rayN.Handler
        public static int AddSubItem(ref Config config, string url)
        {
            //already exists
-            foreach (var sub in config.subItem)
+            foreach (SubItem sub in config.subItem)
            {
                if (url == sub.url)
                {
@@ -793,10 +817,12 @@ namespace v2rayN.Handler
                }
            }

-            var subItem = new SubItem();
-            subItem.id = string.Empty;
-            subItem.remarks = "import sub";
-            subItem.url = url;
+            SubItem subItem = new SubItem
+            {
+                id = string.Empty,
+                remarks = "import sub",
+                url = url
+            };
            config.subItem.Add(subItem);

            return SaveSubItem(ref config);
--- a/v2rayN/v2rayN/Handler/DownloadHandle.cs
+++ b/v2rayN/v2rayN/Handler/DownloadHandle.cs
@@ -0,0 +1,356 @@
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Net;
+using System.Net.Http;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Threading.Tasks;
+using v2rayN.Base;
+using v2rayN.Mode;
+using v2rayN.Properties;
+
+namespace v2rayN.Handler
+{
+    /// <summary>
+    ///Download
+    /// </summary>
+    class DownloadHandle
+    {
+        public event EventHandler<ResultEventArgs> AbsoluteCompleted;
+
+        public event EventHandler<ResultEventArgs> UpdateCompleted;
+
+        public event ErrorEventHandler Error;
+
+        public string DownloadFileName
+        {
+            get
+            {
+                return "v2ray-windows.zip";
+            }
+        }
+
+        public class ResultEventArgs : EventArgs
+        {
+            public bool Success;
+            public string Msg;
+
+            public ResultEventArgs(bool success, string msg)
+            {
+                this.Success = success;
+                this.Msg = msg;
+            }
+        }
+
+        private int progressPercentage = -1;
+        private long totalBytesToReceive = 0;
+        private DateTime totalDatetime = new DateTime();
+        private int DownloadTimeout = -1;
+
+        #region Check for updates
+
+        private readonly string nLatestUrl = "https://github.com/2dust/v2rayN/releases/latest";
+        private const string nUrl = "https://github.com/2dust/v2rayN/releases/download/{0}/v2rayN.zip";
+        private readonly string coreLatestUrl = "https://github.com/v2ray/v2ray-core/releases/latest";
+        private const string coreUrl = "https://github.com/v2ray/v2ray-core/releases/download/{0}/v2ray-windows-{1}.zip";
+
+        public async void CheckUpdateAsync(string type)
+        {
+            Utils.SetSecurityProtocol();
+            WebRequestHandler webRequestHandler = new WebRequestHandler
+            {
+                AllowAutoRedirect = false
+            };
+            HttpClient httpClient = new HttpClient(webRequestHandler);
+
+            string url;
+            if (type == "Core")
+            {
+                url = coreLatestUrl;
+            }
+            else if (type == "v2rayN")
+            {
+                url = nLatestUrl;
+            }
+            else
+            {
+                throw new ArgumentException("Type");
+            }
+            HttpResponseMessage response = await httpClient.GetAsync(url);
+            if (response.StatusCode.ToString() == "Redirect")
+            {
+                responseHandler(type, response.Headers.Location.ToString());
+            }
+            else
+            {
+                Utils.SaveLog("StatusCode error: " + url);
+                return;
+            }
+        }
+
+        /// <summary>
+        /// 获取V2RayCore版本
+        /// </summary>
+        public string getV2rayVersion()
+        {
+            try
+            {
+                string filePath = Utils.GetPath("V2ray.exe");
+                if (!File.Exists(filePath))
+                {
+                    string msg = string.Format(UIRes.I18N("NotFoundCore"), @"https://github.com/v2ray/v2ray-core/releases");
+                    //ShowMsg(true, msg);
+                    return "";
+                }
+
+                Process p = new Process();
+                p.StartInfo.FileName = filePath;
+                p.StartInfo.Arguments = "-version";
+                p.StartInfo.WorkingDirectory = Utils.StartupPath();
+                p.StartInfo.UseShellExecute = false;
+                p.StartInfo.RedirectStandardOutput = true;
+                p.StartInfo.CreateNoWindow = true;
+                p.StartInfo.StandardOutputEncoding = Encoding.UTF8;
+                p.Start();
+                p.WaitForExit(5000);
+                string echo = p.StandardOutput.ReadToEnd();
+                string version = Regex.Match(echo, "V2Ray ([0-9.]+) \\(").Groups[1].Value;
+                return version;
+            }
+
+            catch (Exception ex)
+            {
+                Utils.SaveLog(ex.Message, ex);
+                return "";
+            }
+        }
+        private void responseHandler(string type, string redirectUrl)
+        {
+            try
+            {
+                string version = redirectUrl.Substring(redirectUrl.LastIndexOf("/", StringComparison.Ordinal) + 1);
+
+                string curVersion;
+                string message;
+                string url;
+                if (type == "Core") {
+                    curVersion = "v" + getV2rayVersion();
+                    message = string.Format(UIRes.I18N("IsLatestCore"), curVersion);
+                    string osBit = Environment.Is64BitProcess ? "64" : "32";
+                    url = string.Format(coreUrl, version, osBit);
+                }
+                else if (type == "v2rayN") {
+                    curVersion = FileVersionInfo.GetVersionInfo(Utils.GetExePath()).FileVersion.ToString();
+                    message = string.Format(UIRes.I18N("IsLatestN"), curVersion);
+                    url = string.Format(nUrl, version);
+                }
+                else
+                {
+                    throw new ArgumentException("Type");
+                }
+
+                if (curVersion == version)
+                {
+                    AbsoluteCompleted?.Invoke(this, new ResultEventArgs(false, message));
+                    return;
+                }
+
+                AbsoluteCompleted?.Invoke(this, new ResultEventArgs(true, url));
+            }
+            catch (Exception ex)
+            {
+                Utils.SaveLog(ex.Message, ex);
+
+                Error?.Invoke(this, new ErrorEventArgs(ex));
+            }
+        }
+
+        #endregion
+
+        #region Download 
+
+        public void DownloadFileAsync(string url, WebProxy webProxy, int downloadTimeout)
+        {
+            try
+            {
+                Utils.SetSecurityProtocol();
+                UpdateCompleted?.Invoke(this, new ResultEventArgs(false, UIRes.I18N("Downloading")));
+
+                progressPercentage = -1;
+                totalBytesToReceive = 0;
+
+                WebClientEx ws = new WebClientEx();
+                DownloadTimeout = downloadTimeout;
+                if (webProxy != null)
+                {
+                    ws.Proxy = webProxy;// new WebProxy(Global.Loopback, Global.httpPort);
+                }
+
+                ws.DownloadFileCompleted += ws_DownloadFileCompleted;
+                ws.DownloadProgressChanged += ws_DownloadProgressChanged;
+                ws.DownloadFileAsync(new Uri(url), Utils.GetPath(DownloadFileName));
+            }
+            catch (Exception ex)
+            {
+                Utils.SaveLog(ex.Message, ex);
+
+                Error?.Invoke(this, new ErrorEventArgs(ex));
+            }
+        }
+
+        void ws_DownloadProgressChanged(object sender, DownloadProgressChangedEventArgs e)
+        {
+            if (UpdateCompleted != null)
+            {
+                if (totalBytesToReceive == 0)
+                {
+                    totalDatetime = DateTime.Now;
+                    totalBytesToReceive = e.BytesReceived;
+                    return;
+                }
+                totalBytesToReceive = e.BytesReceived;
+
+                if (DownloadTimeout != -1)
+                {
+                    if ((DateTime.Now - totalDatetime).TotalSeconds > DownloadTimeout)
+                    {
+                        ((WebClientEx)sender).CancelAsync();
+                    }
+                }
+                if (progressPercentage != e.ProgressPercentage && e.ProgressPercentage % 10 == 0)
+                {
+                    progressPercentage = e.ProgressPercentage;
+                    string msg = string.Format("...{0}%", e.ProgressPercentage);
+                    UpdateCompleted(this, new ResultEventArgs(false, msg));
+                }
+            }
+        }
+
+        void ws_DownloadFileCompleted(object sender, System.ComponentModel.AsyncCompletedEventArgs e)
+        {
+            try
+            {
+                if (UpdateCompleted != null)
+                {
+                    if (e.Cancelled)
+                    {
+                        ((WebClientEx)sender).Dispose();
+                        TimeSpan ts = (DateTime.Now - totalDatetime);
+                        string speed = string.Format("<{0} M/s", (totalBytesToReceive / ts.TotalMilliseconds / 1000).ToString("#0.##"));
+                        UpdateCompleted(this, new ResultEventArgs(true, speed));
+                        return;
+                    }
+
+                    if (e.Error == null
+                        || Utils.IsNullOrEmpty(e.Error.ToString()))
+                    {
+
+                        TimeSpan ts = (DateTime.Now - totalDatetime);
+                        string speed = string.Format("{0} M/s", (totalBytesToReceive / ts.TotalMilliseconds / 1000).ToString("#0.##"));
+                        UpdateCompleted(this, new ResultEventArgs(true, speed));
+                    }
+                    else
+                    {
+                        throw e.Error;
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                Utils.SaveLog(ex.Message, ex);
+
+                Error?.Invoke(this, new ErrorEventArgs(ex));
+            }
+        }
+
+        /// <summary>
+        /// DownloadString
+        /// </summary> 
+        /// <param name="url"></param>
+        public void WebDownloadString(string url)
+        {
+            string source = string.Empty;
+            try
+            {
+                Utils.SetSecurityProtocol();
+
+                WebClientEx ws = new WebClientEx();
+                ws.DownloadStringCompleted += Ws_DownloadStringCompleted;
+                ws.DownloadStringAsync(new Uri(url));
+            }
+            catch (Exception ex)
+            {
+                Utils.SaveLog(ex.Message, ex);
+            }
+        }
+
+        private void Ws_DownloadStringCompleted(object sender, DownloadStringCompletedEventArgs e)
+        {
+            try
+            {
+                if (e.Error == null
+                    || Utils.IsNullOrEmpty(e.Error.ToString()))
+                {
+                    string source = e.Result;
+                    UpdateCompleted?.Invoke(this, new ResultEventArgs(true, source));
+                }
+                else
+                {
+                    throw e.Error;
+                }
+            }
+            catch (Exception ex)
+            {
+                Utils.SaveLog(ex.Message, ex);
+
+                Error?.Invoke(this, new ErrorEventArgs(ex));
+            }
+        }
+
+        #endregion
+
+        #region PAC
+
+        public string GenPacFile(string result)
+        {
+            try
+            {
+                File.WriteAllText(Utils.GetTempPath("gfwlist.txt"), result, Encoding.UTF8);
+                List<string> lines = ParsePacResult(result);
+                string abpContent = Utils.UnGzip(Resources.abp_js);
+                abpContent = abpContent.Replace("__RULES__", JsonConvert.SerializeObject(lines, Formatting.Indented));
+                File.WriteAllText(Utils.GetPath(Global.pacFILE), abpContent, Encoding.UTF8);
+            }
+            catch (Exception ex)
+            {
+                Utils.SaveLog(ex.Message, ex);
+                return ex.Message;
+            }
+            return string.Empty;
+        }
+
+        private List<string> ParsePacResult(string response)
+        {
+            IEnumerable<char> IgnoredLineBegins = new[] { '!', '[' };
+
+            byte[] bytes = Convert.FromBase64String(response);
+            string content = Encoding.UTF8.GetString(bytes);
+            List<string> valid_lines = new List<string>();
+            using (StringReader sr = new StringReader(content))
+            {
+                foreach (string line in sr.NonWhiteSpaceLines())
+                {
+                    if (line.BeginWithAny(IgnoredLineBegins))
+                        continue;
+                    valid_lines.Add(line);
+                }
+            }
+            return valid_lines;
+        }
+
+        #endregion
+    }
+}
--- a/v2rayN/v2rayN/Handler/MainFormHandler.cs
+++ b/v2rayN/v2rayN/Handler/MainFormHandler.cs
@@ -0,0 +1,150 @@
+using System;
+using System.Drawing;
+using System.Windows.Forms;
+using v2rayN.Mode;
+
+namespace v2rayN.Handler
+{
+    class MainFormHandler
+    {
+        private static MainFormHandler instance;
+
+        //private DownloadHandle downloadHandle2;
+        //private Config _config;
+        //private V2rayHandler _v2rayHandler;
+        //private List<int> _selecteds;
+        //private Thread _workThread;
+        //Action<int, string> _updateFunc;
+        public static MainFormHandler Instance
+        {
+            get
+            {
+                if (instance == null)
+                {
+                    instance = new MainFormHandler();
+                }
+                return instance;
+            }
+        }
+
+        public Icon GetNotifyIcon(Config config, Icon def)
+        {
+            try
+            {
+                Color color = ColorTranslator.FromHtml("#3399CC");
+                int index = (int)config.listenerType;
+                if (index > 0)
+                {
+                    color = (new Color[] { Color.Red, Color.Purple, Color.DarkGreen, Color.Orange, Color.DarkSlateBlue, Color.RoyalBlue })[index - 1];
+                    //color = ColorTranslator.FromHtml(new string[] { "#CC0066", "#CC6600", "#99CC99", "#666699" }[index - 1]);
+                }
+
+                int width = 128;
+                int height = 128;
+
+                Bitmap bitmap = new Bitmap(width, height);
+                Graphics graphics = Graphics.FromImage(bitmap);
+                SolidBrush drawBrush = new SolidBrush(color);
+
+                graphics.FillEllipse(drawBrush, new Rectangle(0, 0, width, height));
+                int zoom = 16;
+                graphics.DrawImage(new Bitmap(Properties.Resources.notify, width - zoom, width - zoom), zoom / 2, zoom / 2);
+
+                Icon createdIcon = Icon.FromHandle(bitmap.GetHicon());
+
+                drawBrush.Dispose();
+                graphics.Dispose();
+                bitmap.Dispose();
+
+                return createdIcon;
+            }
+            catch (Exception ex)
+            {
+                Utils.SaveLog(ex.Message, ex);
+                return def;
+            }
+        }
+
+        public void Export2ClientConfig(int index, Config config)
+        {
+            //int index = GetLvSelectedIndex();
+            if (index < 0)
+            {
+                return;
+            }
+            if (config.vmess[index].configType != (int)EConfigType.Vmess)
+            {
+                UI.Show(UIRes.I18N("NonVmessService"));
+                return;
+            }
+
+            SaveFileDialog fileDialog = new SaveFileDialog
+            {
+                Filter = "Config|*.json",
+                FilterIndex = 2,
+                RestoreDirectory = true
+            };
+            if (fileDialog.ShowDialog() != DialogResult.OK)
+            {
+                return;
+            }
+            string fileName = fileDialog.FileName;
+            if (Utils.IsNullOrEmpty(fileName))
+            {
+                return;
+            }
+            Config configCopy = Utils.DeepCopy(config);
+            configCopy.index = index;
+            if (V2rayConfigHandler.Export2ClientConfig(configCopy, fileName, out string msg) != 0)
+            {
+                UI.Show(msg);
+            }
+            else
+            {
+                UI.ShowWarning(string.Format(UIRes.I18N("SaveClientConfigurationIn"), fileName));
+            }
+        }
+
+        public void Export2ServerConfig(int index, Config config)
+        {
+            //int index = GetLvSelectedIndex();
+            if (index < 0)
+            {
+                return;
+            }
+            if (config.vmess[index].configType != (int)EConfigType.Vmess)
+            {
+                UI.Show(UIRes.I18N("NonVmessService"));
+                return;
+            }
+
+            SaveFileDialog fileDialog = new SaveFileDialog
+            {
+                Filter = "Config|*.json",
+                FilterIndex = 2,
+                RestoreDirectory = true
+            };
+            if (fileDialog.ShowDialog() != DialogResult.OK)
+            {
+                return;
+            }
+            string fileName = fileDialog.FileName;
+            if (Utils.IsNullOrEmpty(fileName))
+            {
+                return;
+            }
+            Config configCopy = Utils.DeepCopy(config);
+            configCopy.index = index;
+            if (V2rayConfigHandler.Export2ServerConfig(configCopy, fileName, out string msg) != 0)
+            {
+                UI.Show(msg);
+            }
+            else
+            {
+                UI.ShowWarning(string.Format(UIRes.I18N("SaveServerConfigurationIn"), fileName));
+            }
+        }
+
+
+    }
+}
--- a/v2rayN/v2rayN/Handler/ProxySetting.cs
+++ b/v2rayN/v2rayN/Handler/ProxySetting.cs
@@ -1,190 +0,0 @@
-using System;
-using Microsoft.Win32;
-using System.Runtime.InteropServices;
-
-namespace v2rayN.Handler
-{
-    /// <summary>
-    /// 设置系统代理类
-    /// </summary>
-    class ProxySetting
-    {
-        public static bool UnsetProxy()
-        {
-            return SetProxy(null, null);
-        }
-        public static bool SetProxy(string strProxy)
-        {
-            return SetProxy(strProxy, null);
-        }
-
-        public static bool SetProxy(string strProxy, string exceptions)
-        {
-            InternetPerConnOptionList list = new InternetPerConnOptionList();
-
-            int optionCount = string.IsNullOrEmpty(strProxy) ? 1 : (string.IsNullOrEmpty(exceptions) ? 2 : 3);
-            InternetConnectionOption[] options = new InternetConnectionOption[optionCount];
-            // USE a proxy server ...
-            options[0].m_Option = PerConnOption.INTERNET_PER_CONN_FLAGS;
-            options[0].m_Value.m_Int = (int)((optionCount < 2) ? PerConnFlags.PROXY_TYPE_DIRECT : (PerConnFlags.PROXY_TYPE_DIRECT | PerConnFlags.PROXY_TYPE_PROXY));
-            // use THIS proxy server
-            if (optionCount > 1)
-            {
-                options[1].m_Option = PerConnOption.INTERNET_PER_CONN_PROXY_SERVER;
-                options[1].m_Value.m_StringPtr = Marshal.StringToHGlobalAuto(strProxy);
-                // except for these addresses ...
-                if (optionCount > 2)
-                {
-                    options[2].m_Option = PerConnOption.INTERNET_PER_CONN_PROXY_BYPASS;
-                    options[2].m_Value.m_StringPtr = Marshal.StringToHGlobalAuto(exceptions);
-                }
-            }
-
-            // default stuff
-            list.dwSize = Marshal.SizeOf(list);
-            list.szConnection = IntPtr.Zero;
-            list.dwOptionCount = options.Length;
-            list.dwOptionError = 0;
-
-
-            int optSize = Marshal.SizeOf(typeof(InternetConnectionOption));
-            // make a pointer out of all that ...
-            IntPtr optionsPtr = Marshal.AllocCoTaskMem(optSize * options.Length);
-            // copy the array over into that spot in memory ...
-            for (int i = 0; i < options.Length; ++i)
-            {
-                IntPtr opt = new IntPtr(optionsPtr.ToInt32() + (i * optSize));
-                Marshal.StructureToPtr(options[i], opt, false);
-            }
-
-            list.options = optionsPtr;
-
-            // and then make a pointer out of the whole list
-            IntPtr ipcoListPtr = Marshal.AllocCoTaskMem((Int32)list.dwSize);
-            Marshal.StructureToPtr(list, ipcoListPtr, false);
-
-            // and finally, call the API method!
-            int returnvalue = NativeMethods.InternetSetOption(IntPtr.Zero,
-               InternetOption.INTERNET_OPTION_PER_CONNECTION_OPTION,
-               ipcoListPtr, list.dwSize) ? -1 : 0;
-            if (returnvalue == 0)
-            {  // get the error codes, they might be helpful
-                returnvalue = Marshal.GetLastWin32Error();
-            }
-            // FREE the data ASAP
-            Marshal.FreeCoTaskMem(optionsPtr);
-            Marshal.FreeCoTaskMem(ipcoListPtr);
-            if (returnvalue > 0)
-            {  // throw the error codes, they might be helpful
-                //throw new Win32Exception(Marshal.GetLastWin32Error());
-            }
-
-            return (returnvalue < 0);
-        }
-
-
-        #region WinInet structures
-        [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Auto)]
-        public struct InternetPerConnOptionList
-        {
-            public int dwSize;               // size of the INTERNET_PER_CONN_OPTION_LIST struct
-            public IntPtr szConnection;         // connection name to set/query options
-            public int dwOptionCount;        // number of options to set/query
-            public int dwOptionError;           // on error, which option failed
-            //[MarshalAs(UnmanagedType.)]
-            public IntPtr options;
-        };
-
-        [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Auto)]
-        public struct InternetConnectionOption
-        {
-            static readonly int Size;
-            public PerConnOption m_Option;
-            public InternetConnectionOptionValue m_Value;
-            static InternetConnectionOption()
-            {
-                InternetConnectionOption.Size = Marshal.SizeOf(typeof(InternetConnectionOption));
-            }
-
-            // Nested Types
-            [StructLayout(LayoutKind.Explicit)]
-            public struct InternetConnectionOptionValue
-            {
-                // Fields
-                [FieldOffset(0)]
-                public System.Runtime.InteropServices.ComTypes.FILETIME m_FileTime;
-                [FieldOffset(0)]
-                public int m_Int;
-                [FieldOffset(0)]
-                public IntPtr m_StringPtr;
-            }
-        }
-        #endregion
-
-        #region WinInet enums
-        //
-        // options manifests for Internet{Query|Set}Option
-        //
-        public enum InternetOption : uint
-        {
-            INTERNET_OPTION_PER_CONNECTION_OPTION = 75
-        }
-
-        //
-        // Options used in INTERNET_PER_CONN_OPTON struct
-        //
-        public enum PerConnOption
-        {
-            INTERNET_PER_CONN_FLAGS = 1, // Sets or retrieves the connection type. The Value member will contain one or more of the values from PerConnFlags 
-            INTERNET_PER_CONN_PROXY_SERVER = 2, // Sets or retrieves a string containing the proxy servers.  
-            INTERNET_PER_CONN_PROXY_BYPASS = 3, // Sets or retrieves a string containing the URLs that do not use the proxy server.  
-            INTERNET_PER_CONN_AUTOCONFIG_URL = 4//, // Sets or retrieves a string containing the URL to the automatic configuration script.  
-
-        }
-
-        //
-        // PER_CONN_FLAGS
-        //
-        [Flags]
-        public enum PerConnFlags
-        {
-            PROXY_TYPE_DIRECT = 0x00000001,  // direct to net
-            PROXY_TYPE_PROXY = 0x00000002,  // via named proxy
-            PROXY_TYPE_AUTO_PROXY_URL = 0x00000004,  // autoproxy URL
-            PROXY_TYPE_AUTO_DETECT = 0x00000008   // use autoproxy detection
-        }
-        #endregion
-
-        internal static class NativeMethods
-        {
-            [DllImport("WinInet.dll", SetLastError = true, CharSet = CharSet.Auto)]
-            [return: MarshalAs(UnmanagedType.Bool)]
-            public static extern bool InternetSetOption(IntPtr hInternet, InternetOption dwOption, IntPtr lpBuffer, int dwBufferLength);
-        }
-
-        //判断是否使用代理
-        public static bool UsedProxy()
-        {
-            RegistryKey rk = Registry.CurrentUser.OpenSubKey(@"Software\Microsoft\Windows\CurrentVersion\Internet Settings", true);
-            if (rk.GetValue("ProxyEnable").ToString() == "1")
-            {
-                rk.Close();
-                return true;
-            }
-            else
-            {
-                rk.Close();
-                return false;
-            }
-        }
-        //获得代理的IP和端口
-        public static string GetProxyProxyServer()
-        {
-            RegistryKey rk = Registry.CurrentUser.OpenSubKey(@"Software\Microsoft\Windows\CurrentVersion\Internet Settings", true);
-            string ProxyServer = rk.GetValue("ProxyServer").ToString();
-            rk.Close();
-            return ProxyServer;
-
-        }
-    }
-}
--- a/v2rayN/v2rayN/Handler/QRCodeHelper.cs
+++ b/v2rayN/v2rayN/Handler/QRCodeHelper.cs
@@ -1,6 +1,4 @@
 using System.Drawing;
-using System.Drawing.Imaging;
-using System.IO;
 using ZXing;
 using ZXing.QrCode;

@@ -16,18 +14,22 @@ namespace v2rayN.Handler
            Image img = null;
            try
            {
-                QrCodeEncodingOptions options = new QrCodeEncodingOptions();
-                options.CharacterSet = "UTF-8";
-                options.DisableECI = true; // Extended Channel Interpretation (ECI) 主要用于特殊的字符集。并不是所有的扫描器都支持这种编码。
-                options.ErrorCorrection = ZXing.QrCode.Internal.ErrorCorrectionLevel.M; // 纠错级别
-                options.Width = 500;
-                options.Height = 500;
-                options.Margin = 1;
+                QrCodeEncodingOptions options = new QrCodeEncodingOptions
+                {
+                    CharacterSet = "UTF-8",
+                    DisableECI = true, // Extended Channel Interpretation (ECI) 主要用于特殊的字符集。并不是所有的扫描器都支持这种编码。
+                    ErrorCorrection = ZXing.QrCode.Internal.ErrorCorrectionLevel.M, // 纠错级别
+                    Width = 500,
+                    Height = 500,
+                    Margin = 1
+                };
                // options.Hints，更多属性，也可以在这里添加。

-                BarcodeWriter writer = new BarcodeWriter();
-                writer.Format = BarcodeFormat.QR_CODE;
-                writer.Options = options;
+                BarcodeWriter writer = new BarcodeWriter
+                {
+                    Format = BarcodeFormat.QR_CODE,
+                    Options = options
+                };
                Bitmap bmp = writer.Write(strContent);
                img = (Image)bmp;
                return img;
--- a/v2rayN/v2rayN/Handler/RoutingRuleHandler.cs
+++ b/v2rayN/v2rayN/Handler/RoutingRuleHandler.cs
@@ -1,53 +0,0 @@
-using System.Collections.Generic;
-using System.Text.RegularExpressions;
-
-namespace v2rayN.Handler
-{
-    /// <summary>
-    /// 路由规则文件处理类
-    /// </summary>
-    class RoutingRuleHandler
-    {
-        /// <summary>
-        /// Parse Pac to v2ray rule
-        /// </summary>
-        /// <param name="filePath"></param>
-        /// <returns></returns>
-        public static List<string> ParsePac(string filePath)
-        {
-            string result = Utils.LoadResource(filePath);
-            if (Utils.IsNullOrEmpty(result))
-            {
-                return null;
-            }
-
-            //取得rule
-            string pattern = @"(?is)(?<=\[)(.*)(?=\])";
-            Regex rgx = new Regex(pattern);
-            result = rgx.Match(result).Value;
-            int index = result.IndexOf("];");
-            result = result.Substring(0, index);
-            if (Utils.IsNullOrEmpty(result))
-            {
-                return null;
-            }
-
-            string[] arrPac = result.Split(',');
-            List<string> lstPac = new List<string>();
-            foreach (string str in arrPac)
-            {
-                //处理有效值
-                if (Utils.IsNullOrEmpty(str)
-                    || str.Length <= 3)
-                {
-                    continue;
-                }
-                string value = str.Replace("\",", "").Replace("\"", "").Replace(",", "").Replace("\r\n", "").Replace(" ", "");
-                lstPac.Add(value);
-            }
-
-            return lstPac;
-        }
-
-    }
-}
--- a/v2rayN/v2rayN/Handler/SpeedtestHandler.cs
+++ b/v2rayN/v2rayN/Handler/SpeedtestHandler.cs
@@ -1,21 +1,20 @@
-using Grpc.Core;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Net;
 using System.Net.Sockets;
 using System.Threading;
+using System.Threading.Tasks;
 using v2rayN.Mode;

 namespace v2rayN.Handler
 {
    class SpeedtestHandler
    {
-        private V2rayUpdateHandle v2rayUpdateHandle2;
+        private DownloadHandle downloadHandle2;
        private Config _config;
        private V2rayHandler _v2rayHandler;
        private List<int> _selecteds;
-        private Thread _workThread;
        Action<int, string> _updateFunc;

        private int testCounter = 0;
@@ -36,51 +35,35 @@ namespace v2rayN.Handler

            if (actionType == "ping")
            {
-                _workThread = new Thread(new ThreadStart(RunPing));
-                _workThread.Start();
+                Task.Run(() => RunPing());
            }
            if (actionType == "tcping")
            {
-                _workThread = new Thread(new ThreadStart(RunTcping));
-                _workThread.Start();
+                Task.Run(() => RunTcping());
            }
            else if (actionType == "realping")
            {
-                _workThread = new Thread(new ThreadStart(RunRealPing));
-                _workThread.Start();
+                Task.Run(() => RunRealPing());
            }
            else if (actionType == "speedtest")
            {
-                RunSpeedTest();
+                Task.Run(() => RunSpeedTest());
            }
        }

-        public void Close()
+        private void RunPingSub(Action<int> updateFun)
        {
            try
            {
-            }
-            catch (Exception ex)
-            {
-                Utils.SaveLog(ex.Message, ex);
-            }
-        }
-
-        public void RunPing()
-        {
-            try
-            {
-                for (int k = 0; k < _selecteds.Count; k++)
+                foreach (int index in _selecteds)
                {
-                    int index = _selecteds[k];
                    if (_config.vmess[index].configType == (int)EConfigType.Custom)
                    {
                        continue;
                    }
                    try
                    {
-                        long time = Utils.Ping(_config.vmess[index].address);
-                        _updateFunc(index, string.Format("{0}ms", time));
+                        updateFun(index);
                    }
                    catch (Exception ex)
                    {
@@ -88,8 +71,7 @@ namespace v2rayN.Handler
                    }
                }

-                Thread.Sleep(1);
-
+                Thread.Sleep(10);
            }
            catch (Exception ex)
            {
@@ -97,165 +79,174 @@ namespace v2rayN.Handler
            }
        }

-        public void RunTcping()
+
+        private void RunPing()
        {
+            RunPingSub((int index) =>
+            {
+                long time = Utils.Ping(_config.vmess[index].address);
+                _updateFunc(index, string.Format("{0}ms", time));
+            });
+        }
+
+        private void RunTcping()
+        {
+            RunPingSub((int index) =>
+            {
+                int time = GetTcpingTime(_config.vmess[index].address, _config.vmess[index].port);
+                _updateFunc(index, string.Format("{0}ms", time));
+            });
+        }
+
+        private void RunRealPing()
+        {
+            int pid = -1;
            try
            {
-                for (int k = 0; k < _selecteds.Count; k++)
+                string msg = string.Empty;
+
+                pid = _v2rayHandler.LoadV2rayConfigString(_config, _selecteds);
+
+                //Thread.Sleep(5000);
+                int httpPort = _config.GetLocalPort("speedtest");
+                List<Task> tasks = new List<Task>();
+                foreach (int itemIndex in _selecteds)
                {
-                    int index = _selecteds[k];
-                    if (_config.vmess[index].configType == (int)EConfigType.Custom)
+                    if (_config.vmess[itemIndex].configType == (int)EConfigType.Custom)
                    {
                        continue;
                    }
-                    try
+                    tasks.Add(Task.Run(() =>
                    {
-                        var time = GetTcpingTime(_config.vmess[index].address, _config.vmess[index].port);
-                        _updateFunc(index, string.Format("{0}ms", time));
-                    }
-                    catch (Exception ex)
-                    {
-                        Utils.SaveLog(ex.Message, ex);
-                    }
+                        try
+                        {
+                            WebProxy webProxy = new WebProxy(Global.Loopback, httpPort + itemIndex);
+                            int responseTime = -1;
+                            string status = GetRealPingTime(_config.speedPingTestUrl, webProxy, out responseTime);
+                            string output = Utils.IsNullOrEmpty(status) ? string.Format("{0}ms", responseTime) : string.Format("{0}", status);
+                            _updateFunc(itemIndex, output);
+                        }
+                        catch (Exception ex)
+                        {
+                            Utils.SaveLog(ex.Message, ex);
+                        }
+                    }));
+                    //Thread.Sleep(100);
                }
-
-                Thread.Sleep(1);
-
+                Task.WaitAll(tasks.ToArray());
            }
            catch (Exception ex)
            {
                Utils.SaveLog(ex.Message, ex);
            }
+            finally
+            {
+                if (pid > 0) _v2rayHandler.V2rayStopPid(pid);
+            }
        }

-        public void RunRealPing()
+        public int RunAvailabilityCheck() // alias: isLive
        {
            try
            {
-                for (int k = 0; k < _selecteds.Count; k++)
+                int httpPort = _config.GetLocalPort(Global.InboundHttp);
+
+                Task<int> t = Task.Run(() =>
                {
-                    int index = _selecteds[k];
-                    if (_config.vmess[index].configType == (int)EConfigType.Custom)
-                    {
-                        continue;
-                    }
                    try
                    {
-                        if (ConfigHandler.SetDefaultServer(ref _config, index) == 0)
-                        {
-                            _v2rayHandler.LoadV2ray(_config);
-                        }
-                        else
-                        {
-                            return;
-                        }
-                        Thread.Sleep(1000 * 5);
-
+                        WebProxy webProxy = new WebProxy(Global.Loopback, httpPort);
                        int responseTime = -1;
-                        var status = GetRealPingTime(Global.SpeedPingTestUrl, out responseTime);
-                        if (!Utils.IsNullOrEmpty(status))
-                        {
-                            _updateFunc(index, string.Format("{0}", status));
-                        }
-                        else
-                        {
-                            _updateFunc(index, string.Format("{0}ms", responseTime));
-                        }
+                        string status = GetRealPingTime(Global.AvailabilityTestUrl, webProxy, out responseTime);
+                        bool noError = Utils.IsNullOrEmpty(status);
+                        return noError ? responseTime : -1;
                    }
                    catch (Exception ex)
                    {
                        Utils.SaveLog(ex.Message, ex);
+                        return -1;
                    }
-                }
-
-                Thread.Sleep(1);
-
+                });
+                return t.Result;
            }
            catch (Exception ex)
            {
                Utils.SaveLog(ex.Message, ex);
+                return -1;
            }
        }

        private void RunSpeedTest()
        {
+            int pid = -1;
+
            if (_config.vmess.Count <= 0)
            {
                return;
            }

-            string url = Global.SpeedTestUrl;
+            pid = _v2rayHandler.LoadV2rayConfigString(_config, _selecteds);
+
+            string url = _config.speedTestUrl;
            testCounter = 0;
-            if (v2rayUpdateHandle2 == null)
+            if (downloadHandle2 == null)
            {
-                v2rayUpdateHandle2 = new V2rayUpdateHandle();
-                v2rayUpdateHandle2.UpdateCompleted += (sender2, args) =>
+                downloadHandle2 = new DownloadHandle();
+                downloadHandle2.UpdateCompleted += (sender2, args) =>
                {
-                    if (args.Success)
-                    {
-                        _updateFunc(ItemIndex, args.Msg);
-                        if (ServerSpeedTestSub(testCounter, url) != 0)
-                        {
-                            return;
-                        }
-                    }
-                    else
-                    {
-                        _updateFunc(ItemIndex, args.Msg);
-                    }
+                    _updateFunc(ItemIndex, args.Msg);
+                    if (args.Success) StartNext();
                };
-                v2rayUpdateHandle2.Error += (sender2, args) =>
+                downloadHandle2.Error += (sender2, args) =>
                {
                    _updateFunc(ItemIndex, args.GetException().Message);
-                    if (ServerSpeedTestSub(testCounter, url) != 0)
-                    {
-                        return;
-                    }
+                    StartNext();
                };
            }
-            if (ServerSpeedTestSub(testCounter, url) != 0)
-            {
-                return;
-            }
-        }

-        private int ServerSpeedTestSub(int index, string url)
-        {
-            if (index >= _selecteds.Count)
-            {
-                return -1;
-            }
+            StartNext();

-            if (ConfigHandler.SetDefaultServer(ref _config, _selecteds[index]) == 0)
+            void StartNext()
            {
-                _v2rayHandler.LoadV2ray(_config);
+                if (testCounter >= _selecteds.Count)
+                {
+                    if (pid > 0) _v2rayHandler.V2rayStopPid(pid);
+                    return;
+                }
+
+                int httpPort = _config.GetLocalPort("speedtest");
+                int index = _selecteds[testCounter];

                testCounter++;
-
-                v2rayUpdateHandle2.DownloadFileAsync(_config, url);
-
-                return 0;
-            }
-            else
-            {
-                return -1;
+                WebProxy webProxy = new WebProxy(Global.Loopback, httpPort + index);
+                downloadHandle2.DownloadFileAsync(url, webProxy, 20);
            }
        }

+
        private int GetTcpingTime(string url, int port)
        {
-            var responseTime = -1;
+            int responseTime = -1;

            try
            {
-                IPHostEntry ipHostInfo = System.Net.Dns.Resolve(url);
-                IPAddress ipAddress = ipHostInfo.AddressList[0];
+                if (!IPAddress.TryParse(url, out IPAddress ipAddress))
+                {
+                    IPHostEntry ipHostInfo = System.Net.Dns.GetHostEntry(url);
+                    ipAddress = ipHostInfo.AddressList[0];
+                }

-                var timer = new Stopwatch();
+                Stopwatch timer = new Stopwatch();
                timer.Start();

-                Socket clientSocket = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
-                clientSocket.Connect(new IPEndPoint(ipAddress, port));
+                IPEndPoint endPoint = new IPEndPoint(ipAddress, port);
+                Socket clientSocket = new Socket(endPoint.AddressFamily, SocketType.Stream, ProtocolType.Tcp);
+
+                IAsyncResult result = clientSocket.BeginConnect(endPoint, null, null);
+                if (!result.AsyncWaitHandle.WaitOne(TimeSpan.FromSeconds(5)))
+                    throw new TimeoutException("connect timeout (5s): " + url);
+                clientSocket.EndConnect(result);
+
                timer.Stop();
                responseTime = timer.Elapsed.Milliseconds;
                clientSocket.Close();
@@ -267,18 +258,17 @@ namespace v2rayN.Handler
            return responseTime;
        }

-        private string GetRealPingTime(string url, out int responseTime)
+        private string GetRealPingTime(string url, WebProxy webProxy, out int responseTime)
        {
            string msg = string.Empty;
            responseTime = -1;
-
            try
            {
                HttpWebRequest myHttpWebRequest = (HttpWebRequest)WebRequest.Create(url);
                myHttpWebRequest.Timeout = 5000;
-                myHttpWebRequest.Proxy = new WebProxy(Global.Loopback, Global.sysAgentPort);
+                myHttpWebRequest.Proxy = webProxy;//new WebProxy(Global.Loopback, Global.httpPort);

-                var timer = new Stopwatch();
+                Stopwatch timer = new Stopwatch();
                timer.Start();

                HttpWebResponse myHttpWebResponse = (HttpWebResponse)myHttpWebRequest.GetResponse();
@@ -298,9 +288,6 @@ namespace v2rayN.Handler
                msg = ex.Message;
            }
            return msg;
-
        }
-
-
    }
 }
--- a/v2rayN/v2rayN/Handler/StatisticsHandler.cs
+++ b/v2rayN/v2rayN/Handler/StatisticsHandler.cs
@@ -1,10 +1,10 @@
 using Grpc.Core;
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Net;
 using System.Net.Sockets;
 using System.Threading;
+using System.Threading.Tasks;
 using v2rayN.Mode;
 using v2rayN.Protos.Statistics;

@@ -13,80 +13,61 @@ namespace v2rayN.Handler
    class StatisticsHandler
    {
        private Mode.Config config_;
-
+        private ServerStatistics serverStatistics_;
        private Channel channel_;
        private StatsService.StatsServiceClient client_;
-        private Thread workThread_;
+        private bool exitFlag_;

-        Action<ulong, ulong, ulong, ulong, List<Mode.ServerStatistics>> updateFunc_;
+        Action<ulong, ulong, List<ServerStatItem>> updateFunc_;

-        private bool enabled_;
        public bool Enable
-        {
-            get
-            {
-                return enabled_;
-            }
-            set
-            {
-                enabled_ = value;
-            }
-        }
-
-        public bool UpdateUI;
-
-        public ulong TotalUp
-        {
-            get; private set;
-        }
-
-        public ulong TotalDown
-        {
-            get; private set;
-        }
-
-        public List<Mode.ServerStatistics> Statistic
        {
            get; set;
        }

-        public ulong Up
+        public bool UpdateUI
        {
-            get; private set;
+            get; set;
        }

-        public ulong Down
+        public List<ServerStatItem> Statistic
        {
-            get; private set;
+            get
+            {
+                return serverStatistics_.server;
+            }
        }

-        private string logPath_;
-
-        private bool exitFlag_;  // true to close workThread_
-
-        public StatisticsHandler(Mode.Config config, Action<ulong, ulong, ulong, ulong, List<Mode.ServerStatistics>> update)
+        public StatisticsHandler(Mode.Config config, Action<ulong, ulong, List<ServerStatItem>> update)
        {
+            //try
+            //{
+            //    if (Environment.Is64BitOperatingSystem)
+            //    {
+            //        FileManager.UncompressFile(Utils.GetPath("grpc_csharp_ext.x64.dll"), Resources.grpc_csharp_ext_x64_dll);
+            //    }
+            //    else
+            //    {
+            //        FileManager.UncompressFile(Utils.GetPath("grpc_csharp_ext.x86.dll"), Resources.grpc_csharp_ext_x86_dll);
+            //    }
+            //}
+            //catch (IOException ex)
+            //{
+            //    Utils.SaveLog(ex.Message, ex);
+
+            //}
+
            config_ = config;
-            enabled_ = config.enableStatistics;
+            Enable = config.enableStatistics;
            UpdateUI = false;
            updateFunc_ = update;
-            logPath_ = Utils.GetPath(Global.StatisticLogDirectory);
-            Statistic = new List<Mode.ServerStatistics>();
            exitFlag_ = false;

-            DeleteExpiredLog();
-            foreach (var server in config.vmess)
-            {
-                var statistic = new ServerStatistics(server.remarks, server.address, server.port, server.path, server.requestHost, 0, 0, 0, 0);
-                Statistic.Add(statistic);
-            }
-
            LoadFromFile();

            GrpcInit();

-            workThread_ = new Thread(new ThreadStart(Run));
-            workThread_.Start();
+            Task.Run(() => Run());
        }

        private void GrpcInit()
@@ -105,7 +86,6 @@ namespace v2rayN.Handler
        {
            try
            {
-
                exitFlag_ = true;
                channel_.ShutdownAsync();
            }
@@ -121,7 +101,7 @@ namespace v2rayN.Handler
            {
                try
                {
-                    if (enabled_ && channel_.State == ChannelState.Ready)
+                    if (Enable && channel_.State == ChannelState.Ready)
                    {
                        QueryStatsResponse res = null;
                        try
@@ -135,32 +115,21 @@ namespace v2rayN.Handler

                        if (res != null)
                        {
-                            var addr = config_.address();
-                            var port = config_.port();
-                            var path = config_.path();
-                            var cur = Statistic.FindIndex(item => item.address == addr && item.port == port && item.path == path);
-                            ulong up = 0,
-                                 down = 0;
+                            string itemId = config_.getItemId();
+                            ServerStatItem serverStatItem = GetServerStatItem(itemId);

                            //TODO: parse output
-                            ParseOutput(res.Stat, out up, out down);
+                            ParseOutput(res.Stat, out ulong up, out ulong down);

-                            Up = up;
-                            Down = down;
-
-                            TotalUp += up;
-                            TotalDown += down;
-
-                            if (cur != -1)
-                            {
-                                Statistic[cur].todayUp += up;
-                                Statistic[cur].todayDown += down;
-                                Statistic[cur].totalUp += up;
-                                Statistic[cur].totalDown += down;
-                            }
+                            serverStatItem.todayUp += up;
+                            serverStatItem.todayDown += down;
+                            serverStatItem.totalUp += up;
+                            serverStatItem.totalDown += down;

                            if (UpdateUI)
-                                updateFunc_(TotalUp, TotalDown, Up, Down, Statistic);
+                            {
+                                updateFunc_(up, down, new List<ServerStatItem> { serverStatItem });
+                            }
                        }
                    }
                    Thread.Sleep(config_.statisticsFreshRate);
@@ -173,26 +142,101 @@ namespace v2rayN.Handler
            }
        }

-        public void ParseOutput(Google.Protobuf.Collections.RepeatedField<Stat> source, out ulong up, out ulong down)
+        public void LoadFromFile()
+        {
+            try
+            {
+                string result = Utils.LoadResource(Utils.GetPath(Global.StatisticLogOverall));
+                if (!Utils.IsNullOrEmpty(result))
+                {
+                    //转成Json
+                    serverStatistics_ = Utils.FromJson<ServerStatistics>(result);
+                }
+
+                if (serverStatistics_ == null)
+                {
+                    serverStatistics_ = new ServerStatistics();
+                }
+                if (serverStatistics_.server == null)
+                {
+                    serverStatistics_.server = new List<ServerStatItem>();
+                }
+
+                long ticks = DateTime.Now.Date.Ticks;
+                foreach (ServerStatItem item in serverStatistics_.server)
+                {
+                    if (item.dateNow != ticks)
+                    {
+                        item.todayUp = 0;
+                        item.todayDown = 0;
+                        item.dateNow = ticks;
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                Utils.SaveLog(ex.Message, ex);
+            }
+        }
+
+        public void SaveToFile()
+        {
+            try
+            {
+                Utils.ToJsonFile(serverStatistics_, Utils.GetPath(Global.StatisticLogOverall));
+            }
+            catch (Exception ex)
+            {
+                Utils.SaveLog(ex.Message, ex);
+            }
+        }
+
+        private ServerStatItem GetServerStatItem(string itemId)
+        {
+            long ticks = DateTime.Now.Date.Ticks;
+            int cur = Statistic.FindIndex(item => item.itemId == itemId);
+            if (cur < 0)
+            {
+                Statistic.Add(new ServerStatItem
+                {
+                    itemId = itemId,
+                    totalUp = 0,
+                    totalDown = 0,
+                    todayUp = 0,
+                    todayDown = 0,
+                    dateNow = ticks
+                });
+                cur = Statistic.Count - 1;
+            }
+            if (Statistic[cur].dateNow != ticks)
+            {
+                Statistic[cur].todayUp = 0;
+                Statistic[cur].todayDown = 0;
+                Statistic[cur].dateNow = ticks;
+            }
+            return Statistic[cur];
+        }
+
+        private void ParseOutput(Google.Protobuf.Collections.RepeatedField<Stat> source, out ulong up, out ulong down)
        {

            up = 0; down = 0;
            try
            {

-                foreach (var stat in source)
+                foreach (Stat stat in source)
                {
-                    var name = stat.Name;
-                    var value = stat.Value;
-                    var nStr = name.Split(">>>".ToCharArray(), StringSplitOptions.RemoveEmptyEntries);
-                    var type = "";
+                    string name = stat.Name;
+                    long value = stat.Value;
+                    string[] nStr = name.Split(">>>".ToCharArray(), StringSplitOptions.RemoveEmptyEntries);
+                    string type = "";

                    name = name.Trim();

                    name = nStr[1];
                    type = nStr[3];

-                    if (name == Global.InboundProxyTagName)
+                    if (name == Global.agentTag)
                    {
                        if (type == "uplink")
                        {
@@ -211,218 +255,6 @@ namespace v2rayN.Handler
            }
        }

-        public void SaveToFile()
-        {
-            if (!Directory.Exists(logPath_))
-            {
-                Directory.CreateDirectory(logPath_);
-            }
-
-            // 总流量统计文件
-            var overallPath = Path.Combine(logPath_, Global.StatisticLogOverall);
-            if (!File.Exists(overallPath))
-            {
-                File.Create(overallPath);
-            }
-            try
-            {
-                using (var overallWriter = new StreamWriter(overallPath))
-                {
-                    double up_amount, down_amount;
-                    string up_unit, down_unit;
-
-                    Utils.ToHumanReadable(TotalUp, out up_amount, out up_unit);
-                    Utils.ToHumanReadable(TotalDown, out down_amount, out down_unit);
-
-                    overallWriter.WriteLine($"LastUpdate {DateTime.Now.ToString("yyyy-MM-dd")} {DateTime.Now.ToLongTimeString()}");
-                    overallWriter.WriteLine($"UP {string.Format("{0:f2}", up_amount)}{up_unit} {TotalUp}");
-                    overallWriter.WriteLine($"DOWN {string.Format("{0:f2}", down_amount)}{down_unit} {TotalDown}");
-                    foreach (var s in Statistic)
-                    {
-                        overallWriter.WriteLine($"* {s.name} {s.address} {s.port} {s.path} {s.host} {s.totalUp} {s.totalDown}");
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                Utils.SaveLog(ex.Message, ex);
-            }
-
-            // 当天流量记录文件
-            var dailyPath = Path.Combine(logPath_, $"{DateTime.Now.ToString("yyyy-MM-dd")}.txt");
-            if (!File.Exists(dailyPath))
-            {
-                File.Create(dailyPath);
-            }
-            try
-            {
-                using (var dailyWriter = new StreamWriter(dailyPath))
-                {
-                    dailyWriter.WriteLine($"LastUpdate {DateTime.Now.ToString("yyyy-MM-dd")} {DateTime.Now.ToLongTimeString()}");
-                    foreach (var s in Statistic)
-                    {
-                        dailyWriter.WriteLine($"* {s.name} {s.address} {s.port} {s.path} {s.host} {s.todayUp} {s.todayDown}");
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                Utils.SaveLog(ex.Message, ex);
-            }
-        }
-
-        public void LoadFromFile()
-        {
-            if (!Directory.Exists(logPath_)) return;
-
-            // 总流量统计文件
-            ///
-            /// 文件结构
-            /// LastUpdate [date] [time]
-            /// UP [readable string] [amount]
-            /// DOWN [readable string] [amount]
-            /// 每行每个数据空格分隔
-
-            try
-            {
-                Utils.SaveLog(logPath_ + Global.StatisticLogOverall);
-                var overallPath = Path.Combine(logPath_, Global.StatisticLogOverall);
-                if (File.Exists(overallPath))
-                {
-                    using (var overallReader = new StreamReader(overallPath))
-                    {
-                        while (!overallReader.EndOfStream)
-                        {
-                            var line = overallReader.ReadLine();
-                            if (line.StartsWith("LastUpdate"))
-                            {
-
-                            }
-                            else if (line.StartsWith("UP"))
-                            {
-                                var datas = line.Split(' ');
-                                if (datas.Length < 3) return;
-                                TotalUp = ulong.Parse(datas[2]);
-                            }
-                            else if (line.StartsWith("DOWN"))
-                            {
-                                var datas = line.Split(' ');
-                                if (datas.Length < 3) return;
-                                TotalDown = ulong.Parse(datas[2]);
-                            }
-                            else if (line.StartsWith("*"))
-                            {
-                                var datas = line.Split(' ');
-                                if (datas.Length < 8) return;
-                                var name = datas[1];
-                                var address = datas[2];
-                                var port = int.Parse(datas[3]);
-                                var path = datas[4];
-                                var host = datas[5];
-                                var totalUp = ulong.Parse(datas[6]);
-                                var totalDown = ulong.Parse(datas[7]);
-
-                                var temp = new ServerStatistics(name, address, port, path, host, 0, 0, 0, 0);
-                                var index = Statistic.FindIndex(item => Utils.IsIdenticalServer(item, temp));
-                                if (index != -1)
-                                {
-                                    Statistic[index].totalUp = totalUp;
-                                    Statistic[index].totalDown = totalDown;
-                                }
-                                else
-                                {
-                                    var s = new Mode.ServerStatistics(name, address, port, path, host, totalUp, totalDown, 0, 0);
-                                    Statistic.Add(s);
-                                }
-                            }
-                        }
-
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                Utils.SaveLog(ex.Message, ex);
-            }
-
-            try
-            {
-                Utils.SaveLog(logPath_ + $"{DateTime.Now.ToString("yyyy-MM-dd")}.txt");
-                var dailyPath = Path.Combine(logPath_, $"{DateTime.Now.ToString("yyyy-MM-dd")}.txt");
-                if (File.Exists(dailyPath))
-                {
-
-                    using (var dailyReader = new StreamReader(dailyPath))
-                    {
-                        while (!dailyReader.EndOfStream)
-                        {
-                            var line = dailyReader.ReadLine();
-                            if (line.StartsWith("LastUpdate"))
-                            {
-
-                            }
-                            else if (line.StartsWith("*"))
-                            {
-                                var datas = line.Split(' ');
-                                if (datas.Length < 8) return;
-                                var name = datas[1];
-                                var address = datas[2];
-                                var port = int.Parse(datas[3]);
-                                var path = datas[4];
-                                var host = datas[5];
-                                var todayUp = ulong.Parse(datas[6]);
-                                var todayDown = ulong.Parse(datas[7]);
-
-                                var temp = new ServerStatistics(name, address, port, path, host, 0, 0, 0, 0);
-                                var index = Statistic.FindIndex(item => Utils.IsIdenticalServer(item, temp));
-                                if (index != -1)
-                                {
-                                    Statistic[index].todayUp = todayUp;
-                                    Statistic[index].todayDown = todayDown;
-                                }
-                                else
-                                {
-                                    var s = new Mode.ServerStatistics(name, address, port, path, host, 0, 0, todayUp, todayDown);
-                                    Statistic.Add(s);
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                Utils.SaveLog(ex.Message, ex);
-            }
-        }
-
-
-        private void DeleteExpiredLog()
-        {
-            try
-            {
-                if (!Directory.Exists(logPath_)) return;
-                var dirInfo = new DirectoryInfo(logPath_);
-                var files = dirInfo.GetFiles();
-                foreach (var file in files)
-                {
-                    if (file.Name == "overall.txt") continue;
-                    var name = file.Name.Split('.')[0];
-                    var ft = DateTime.Parse(name);
-                    var ct = DateTime.Now;
-                    var dur = ct - ft;
-                    if (dur.Days > config_.CacheDays)
-                    {
-                        file.Delete();
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                Utils.SaveLog(ex.Message, ex);
-            }
-        }
-
        private int GetFreePort()
        {
            int defaultPort = 28123;
@@ -431,7 +263,7 @@ namespace v2rayN.Handler
                // TCP stack please do me a favor
                TcpListener l = new TcpListener(IPAddress.Loopback, 0);
                l.Start();
-                var port = ((IPEndPoint)l.LocalEndpoint).Port;
+                int port = ((IPEndPoint)l.LocalEndpoint).Port;
                l.Stop();
                return port;
            }
--- a/v2rayN/v2rayN/Handler/V2rayConfigHandler.cs
+++ b/v2rayN/v2rayN/Handler/V2rayConfigHandler.cs
@@ -1,10 +1,10 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using v2rayN.Mode;
-using System.Net;
-using System.Text;
 using System.Linq;
+using System.Net;
+using v2rayN.Base;
+using v2rayN.Mode;

 namespace v2rayN.Handler
 {
@@ -27,8 +27,6 @@ namespace v2rayN.Handler
        /// <returns></returns>
        public static int GenerateClientConfig(Config config, string fileName, bool blExport, out string msg)
        {
-            msg = string.Empty;
-
            try
            {
                //检查GUI设置
@@ -149,7 +147,7 @@ namespace v2rayN.Handler
        {
            try
            {
-                var inbound = v2rayConfig.inbounds[0];
+                Inbounds inbound = v2rayConfig.inbounds[0];
                //端口
                inbound.port = config.inbound[0].localPort;
                inbound.protocol = config.inbound[0].protocol;
@@ -226,20 +224,24 @@ namespace v2rayN.Handler
                    && userRule.Count > 0)
                {
                    //Domain
-                    RulesItem rulesDomain = new RulesItem();
-                    rulesDomain.type = "field";
-                    rulesDomain.outboundTag = tag;
-                    rulesDomain.domain = new List<string>();
+                    RulesItem rulesDomain = new RulesItem
+                    {
+                        type = "field",
+                        outboundTag = tag,
+                        domain = new List<string>()
+                    };

                    //IP
-                    RulesItem rulesIP = new RulesItem();
-                    rulesIP.type = "field";
-                    rulesIP.outboundTag = tag;
-                    rulesIP.ip = new List<string>();
-
-                    for (int k = 0; k < userRule.Count; k++)
+                    RulesItem rulesIP = new RulesItem
                    {
-                        string url = userRule[k].TrimEx();
+                        type = "field",
+                        outboundTag = tag,
+                        ip = new List<string>()
+                    };
+
+                    foreach (string u in userRule)
+                    {
+                        string url = u.TrimEx();
                        if (Utils.IsNullOrEmpty(url))
                        {
                            continue;
@@ -283,10 +285,12 @@ namespace v2rayN.Handler
                    //IP
                    if (ipOrDomain == "ip" || ipOrDomain == "")
                    {
-                        RulesItem rulesItem = new RulesItem();
-                        rulesItem.type = "field";
-                        rulesItem.outboundTag = Global.directTag;
-                        rulesItem.ip = new List<string>();
+                        RulesItem rulesItem = new RulesItem
+                        {
+                            type = "field",
+                            outboundTag = Global.directTag,
+                            ip = new List<string>()
+                        };
                        rulesItem.ip.Add($"geoip:{code}");

                        v2rayConfig.routing.rules.Add(rulesItem);
@@ -294,10 +298,12 @@ namespace v2rayN.Handler

                    if (ipOrDomain == "domain" || ipOrDomain == "")
                    {
-                        RulesItem rulesItem = new RulesItem();
-                        rulesItem.type = "field";
-                        rulesItem.outboundTag = Global.directTag;
-                        rulesItem.domain = new List<string>();
+                        RulesItem rulesItem = new RulesItem
+                        {
+                            type = "field",
+                            outboundTag = Global.directTag,
+                            domain = new List<string>()
+                        };
                        rulesItem.domain.Add($"geosite:{code}");
                        v2rayConfig.routing.rules.Add(rulesItem);
                    }
@@ -319,7 +325,7 @@ namespace v2rayN.Handler
        {
            try
            {
-                var outbound = v2rayConfig.outbounds[0];
+                Outbounds outbound = v2rayConfig.outbounds[0];
                if (config.configType() == (int)EConfigType.Vmess)
                {
                    VnextItem vnextItem;
@@ -354,6 +360,7 @@ namespace v2rayN.Handler

                    //Mux
                    outbound.mux.enabled = config.muxEnabled;
+                    outbound.mux.concurrency = config.muxEnabled ? 8 : -1;

                    //远程服务器底层传输配置
                    StreamSettings streamSettings = outbound.streamSettings;
@@ -384,6 +391,8 @@ namespace v2rayN.Handler
                    serversItem.level = 1;

                    outbound.mux.enabled = false;
+                    outbound.mux.concurrency = -1;
+                    

                    outbound.protocol = "shadowsocks";
                    outbound.settings.vnext = null;
@@ -403,19 +412,24 @@ namespace v2rayN.Handler
                    //远程服务器地址和端口
                    serversItem.address = config.address();
                    serversItem.port = config.port();
+                    serversItem.method = null;
+                    serversItem.password = null;

                    if (!Utils.IsNullOrEmpty(config.security())
                        && !Utils.IsNullOrEmpty(config.id()))
                    {
-                        var socksUsersItem = new SocksUsersItem();
-                        socksUsersItem.user = config.security();
-                        socksUsersItem.pass = config.id();
-                        socksUsersItem.level = 1;
+                        SocksUsersItem socksUsersItem = new SocksUsersItem
+                        {
+                            user = config.security(),
+                            pass = config.id(),
+                            level = 1
+                        };

                        serversItem.users = new List<SocksUsersItem>() { socksUsersItem };
                    }

                    outbound.mux.enabled = false;
+                    outbound.mux.concurrency = -1;

                    outbound.protocol = "socks";
                    outbound.settings.vnext = null;
@@ -440,15 +454,16 @@ namespace v2rayN.Handler
            {
                //远程服务器底层传输配置
                streamSettings.network = config.network();
-                var host = config.requestHost();
-
+                string host = config.requestHost();               
                //if tls
                if (config.streamSecurity() == Global.StreamSecurity)
                {
                    streamSettings.security = config.streamSecurity();

-                    TlsSettings tlsSettings = new TlsSettings();
-                    tlsSettings.allowInsecure = config.allowInsecure();
+                    TlsSettings tlsSettings = new TlsSettings
+                    {
+                        allowInsecure = config.allowInsecure()
+                    };
                    if (!string.IsNullOrWhiteSpace(host))
                    {
                        tlsSettings.serverName = host;
@@ -461,9 +476,11 @@ namespace v2rayN.Handler
                {
                    //kcp基本配置暂时是默认值，用户能自己设置伪装类型
                    case "kcp":
-                        KcpSettings kcpSettings = new KcpSettings();
-                        kcpSettings.mtu = config.kcpItem.mtu;
-                        kcpSettings.tti = config.kcpItem.tti;
+                        KcpSettings kcpSettings = new KcpSettings
+                        {
+                            mtu = config.kcpItem.mtu,
+                            tti = config.kcpItem.tti
+                        };
                        if (iobound.Equals("out"))
                        {
                            kcpSettings.uplinkCapacity = config.kcpItem.uplinkCapacity;
@@ -483,20 +500,26 @@ namespace v2rayN.Handler
                        kcpSettings.congestion = config.kcpItem.congestion;
                        kcpSettings.readBufferSize = config.kcpItem.readBufferSize;
                        kcpSettings.writeBufferSize = config.kcpItem.writeBufferSize;
-                        kcpSettings.header = new Header();
-                        kcpSettings.header.type = config.headerType();
+                        kcpSettings.header = new Header
+                        {
+                            type = config.headerType()
+                        };
                        streamSettings.kcpSettings = kcpSettings;
                        break;
                    //ws
                    case "ws":
-                        WsSettings wsSettings = new WsSettings();
-                        wsSettings.connectionReuse = true;
+                        WsSettings wsSettings = new WsSettings
+                        {
+                            connectionReuse = true
+                        };

                        string path = config.path();
                        if (!string.IsNullOrWhiteSpace(host))
                        {
-                            wsSettings.headers = new Headers();
-                            wsSettings.headers.Host = host;
+                            wsSettings.headers = new Headers
+                            {
+                                Host = host
+                            };
                        }
                        if (!string.IsNullOrWhiteSpace(path))
                        {
@@ -530,22 +553,33 @@ namespace v2rayN.Handler
                        break;
                    //quic
                    case "quic":
-                        QuicSettings quicsettings = new QuicSettings();
-                        quicsettings.security = host;
-                        quicsettings.key = config.path();
-                        quicsettings.header = new Header();
-                        quicsettings.header.type = config.headerType();
-
+                        QuicSettings quicsettings = new QuicSettings
+                        {
+                            security = host,
+                            key = config.path(),
+                            header = new Header
+                            {
+                                type = config.headerType()
+                            }
+                        };
                        streamSettings.quicSettings = quicsettings;
+                        if (config.streamSecurity() == Global.StreamSecurity)
+                        {
+                            streamSettings.tlsSettings.serverName = config.address();
+                        }
                        break;
                    default:
                        //tcp带http伪装
                        if (config.headerType().Equals(Global.TcpHeaderHttp))
                        {
-                            TcpSettings tcpSettings = new TcpSettings();
-                            tcpSettings.connectionReuse = true;
-                            tcpSettings.header = new Header();
-                            tcpSettings.header.type = config.headerType();
+                            TcpSettings tcpSettings = new TcpSettings
+                            {
+                                connectionReuse = true,
+                                header = new Header
+                                {
+                                    type = config.headerType()
+                                }
+                            };

                            if (iobound.Equals("out"))
                            {
@@ -608,8 +642,10 @@ namespace v2rayN.Handler
                    //}
                }
                //servers.Add("localhost");
-                v2rayConfig.dns = new Mode.Dns();
-                v2rayConfig.dns.servers = servers;
+                v2rayConfig.dns = new Mode.Dns
+                {
+                    servers = servers
+                };
            }
            catch
            {
@@ -621,10 +657,10 @@ namespace v2rayN.Handler
        {
            if (config.enableStatistics)
            {
-                var tag = Global.InboundAPITagName;
-                var apiObj = new Mode.API();
-                var policyObj = new Mode.Policy();
-                var policySystemSetting = new Mode.SystemPolicy();
+                string tag = Global.InboundAPITagName;
+                API apiObj = new API();
+                Policy policyObj = new Policy();
+                SystemPolicy policySystemSetting = new SystemPolicy();

                string[] services = { "StatsService" };

@@ -641,8 +677,8 @@ namespace v2rayN.Handler

                if (!v2rayConfig.inbounds.Exists(item => { return item.tag == tag; }))
                {
-                    var apiInbound = new Mode.Inbounds();
-                    var apiInboundSettings = new Mode.Inboundsettings();
+                    Inbounds apiInbound = new Inbounds();
+                    Inboundsettings apiInboundSettings = new Inboundsettings();
                    apiInbound.tag = tag;
                    apiInbound.listen = Global.Loopback;
                    apiInbound.port = Global.statePort;
@@ -654,10 +690,12 @@ namespace v2rayN.Handler

                if (!v2rayConfig.routing.rules.Exists(item => { return item.outboundTag == tag; }))
                {
-                    var apiRoutingRule = new Mode.RulesItem();
-                    apiRoutingRule.inboundTag = tag;
-                    apiRoutingRule.outboundTag = tag;
-                    apiRoutingRule.type = "field";
+                    RulesItem apiRoutingRule = new RulesItem
+                    {
+                        inboundTag = new List<string> { tag },
+                        outboundTag = tag,
+                        type = "field"
+                    };
                    v2rayConfig.routing.rules.Add(apiRoutingRule);
                }
            }
@@ -673,8 +711,6 @@ namespace v2rayN.Handler
        /// <returns></returns>
        public static int GenerateClientCustomConfig(Config config, string fileName, out string msg)
        {
-            msg = string.Empty;
-
            try
            {
                //检查GUI设置
@@ -688,11 +724,21 @@ namespace v2rayN.Handler
                    return -1;
                }

-                string addressFileName = config.address();
                if (File.Exists(fileName))
                {
                    File.Delete(fileName);
                }
+
+                string addressFileName = config.address();
+                if (!File.Exists(addressFileName))
+                {
+                    addressFileName = Path.Combine(Utils.GetTempPath(), addressFileName);
+                }
+                if (!File.Exists(addressFileName))
+                {
+                    msg = UIRes.I18N("FailedGenDefaultConfiguration");
+                    return -1;
+                }
                File.Copy(addressFileName, fileName);

                msg = string.Format(UIRes.I18N("SuccessfulConfiguration"), config.getSummary());
@@ -718,8 +764,6 @@ namespace v2rayN.Handler
        /// <returns></returns>
        public static int GenerateServerConfig(Config config, string fileName, out string msg)
        {
-            msg = string.Empty;
-
            try
            {
                //检查GUI设置
@@ -782,7 +826,7 @@ namespace v2rayN.Handler
        {
            try
            {
-                var inbound = v2rayConfig.inbounds[0];
+                Inbounds inbound = v2rayConfig.inbounds[0];
                UsersItem usersItem;
                if (inbound.settings.clients.Count <= 0)
                {
@@ -871,7 +915,7 @@ namespace v2rayN.Handler
                    return null;
                }

-                var outbound = v2rayConfig.outbounds[0];
+                Outbounds outbound = v2rayConfig.outbounds[0];
                if (outbound == null
                    || Utils.IsNullOrEmpty(outbound.protocol)
                    || outbound.protocol != "vmess"
@@ -1017,7 +1061,7 @@ namespace v2rayN.Handler
                    return null;
                }

-                var inbound = v2rayConfig.inbounds[0];
+                Inbounds inbound = v2rayConfig.inbounds[0];
                if (inbound == null
                    || Utils.IsNullOrEmpty(inbound.protocol)
                    || inbound.protocol != "vmess"
@@ -1308,7 +1352,6 @@ namespace v2rayN.Handler
        /// <returns></returns>
        public static int Export2ClientConfig(Config config, string fileName, out string msg)
        {
-            msg = string.Empty;
            return GenerateClientConfig(config, fileName, true, out msg);
        }

@@ -1321,15 +1364,15 @@ namespace v2rayN.Handler
        /// <returns></returns>
        public static int Export2ServerConfig(Config config, string fileName, out string msg)
        {
-            msg = string.Empty;
            return GenerateServerConfig(config, fileName, out msg);
        }

        private static VmessItem ResolveVmess4Kitsunebi(string result)
        {
-            VmessItem vmessItem = new VmessItem();
-
-            vmessItem.configType = (int)EConfigType.Vmess;
+            VmessItem vmessItem = new VmessItem
+            {
+                configType = (int)EConfigType.Vmess
+            };
            result = result.Substring(Global.vmessProtocol.Length);
            int indexSplit = result.IndexOf("?");
            if (indexSplit > 0)
@@ -1365,5 +1408,92 @@ namespace v2rayN.Handler

        #endregion

+        #region Gen speedtest config
+
+
+        public static string GenerateClientSpeedtestConfigString(Config config, List<int> selecteds, out string msg)
+        {
+            try
+            {
+                if (config == null
+                    || config.index < 0
+                    || config.vmess.Count <= 0
+                    || config.index > config.vmess.Count - 1
+                    )
+                {
+                    msg = UIRes.I18N("CheckServerSettings");
+                    return "";
+                }
+
+                msg = UIRes.I18N("InitialConfiguration");
+
+                Config configCopy = Utils.DeepCopy(config);             
+
+                string result = Utils.GetEmbedText(SampleClient);
+                if (Utils.IsNullOrEmpty(result))
+                {
+                    msg = UIRes.I18N("FailedGetDefaultConfiguration");
+                    return "";
+                }
+
+                V2rayConfig v2rayConfig = Utils.FromJson<V2rayConfig>(result);
+                if (v2rayConfig == null)
+                {
+                    msg = UIRes.I18N("FailedGenDefaultConfiguration");
+                    return "";
+                }
+
+                log(configCopy, ref v2rayConfig, false);
+                //routing(config, ref v2rayConfig);
+                dns(configCopy, ref v2rayConfig);
+
+                v2rayConfig.inbounds.RemoveAt(0); // Remove "proxy" service for speedtest, avoiding port conflicts.
+
+                int httpPort = configCopy.GetLocalPort("speedtest");
+                foreach (int index in selecteds)
+                {
+                    if (configCopy.vmess[index].configType == (int)EConfigType.Custom)
+                    {
+                        continue;
+                    }
+
+                    configCopy.index = index;
+
+                    Inbounds inbound = new Inbounds
+                    {
+                        listen = Global.Loopback,
+                        port = httpPort + index,
+                        protocol = Global.InboundHttp
+                    };
+                    inbound.tag = Global.InboundHttp + inbound.port.ToString();
+                    v2rayConfig.inbounds.Add(inbound);
+
+
+                    V2rayConfig v2rayConfigCopy = Utils.FromJson<V2rayConfig>(result);
+                    outbound(configCopy, ref v2rayConfigCopy);
+                    v2rayConfigCopy.outbounds[0].tag = Global.agentTag + inbound.port.ToString();
+                    v2rayConfig.outbounds.Add(v2rayConfigCopy.outbounds[0]);
+
+                    RulesItem rule = new RulesItem
+                    {
+                        inboundTag = new List<string> { inbound.tag },
+                        outboundTag = v2rayConfigCopy.outbounds[0].tag,
+                        type = "field"
+                    };
+                    v2rayConfig.routing.rules.Add(rule);
+                }
+
+                msg = string.Format(UIRes.I18N("SuccessfulConfiguration"), configCopy.getSummary());
+                return Utils.ToJson(v2rayConfig);
+            }
+            catch
+            {
+                msg = UIRes.I18N("FailedGenDefaultConfiguration");
+                return "";
+            }
+        }
+
+        #endregion
+
    }
 }
--- a/v2rayN/v2rayN/Handler/V2rayHandler.cs
+++ b/v2rayN/v2rayN/Handler/V2rayHandler.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
+using System.Text;
 using v2rayN.Mode;

 namespace v2rayN.Handler
@@ -22,13 +23,16 @@ namespace v2rayN.Handler
        private static string v2rayConfigRes = Global.v2rayConfigFileName;
        private List<string> lstV2ray;
        public event ProcessDelegate ProcessEvent;
-        private int processId = 0;
+        //private int processId = 0;
+        private Process _process;

        public V2rayHandler()
        {
-            lstV2ray = new List<string>();
-            lstV2ray.Add("wv2ray");
-            lstV2ray.Add("v2ray");
+            lstV2ray = new List<string>
+            {
+                "wv2ray",
+                "v2ray"
+            };
        }

        /// <summary>
@@ -38,9 +42,8 @@ namespace v2rayN.Handler
        {
            if (Global.reloadV2ray)
            {
-                string msg = string.Empty;
                string fileName = Utils.GetPath(v2rayConfigRes);
-                if (V2rayConfigHandler.GenerateClientConfig(config, fileName, false, out msg) != 0)
+                if (V2rayConfigHandler.GenerateClientConfig(config, fileName, false, out string msg) != 0)
                {
                    ShowMsg(false, msg);
                }
@@ -52,6 +55,28 @@ namespace v2rayN.Handler
            }
        }

+        /// <summary>
+        /// 新建进程，载入V2ray配置文件字符串
+        /// 返回新进程pid。
+        /// </summary>
+        public int LoadV2rayConfigString(Config config, List<int> _selecteds)
+        {
+            int pid = -1;
+            string configStr = V2rayConfigHandler.GenerateClientSpeedtestConfigString(config, _selecteds, out string msg);
+            if (configStr == "")
+            {
+                ShowMsg(false, msg);
+            }
+            else
+            {
+                ShowMsg(true, msg);
+                pid = V2rayStartNew(configStr);
+                //V2rayRestart();
+                // start with -config
+            }
+            return pid;
+        }
+
        /// <summary>
        /// V2ray重启
        /// </summary>
@@ -68,33 +93,92 @@ namespace v2rayN.Handler
        {
            try
            {
-                bool blExist = true;
-                if (processId > 0)
+                if (_process != null)
                {
-                    Process p1 = Process.GetProcessById(processId);
-                    if (p1 != null)
-                    {
-                        p1.Kill();
-                        blExist = false;
-                    }
+                    KillProcess(_process);
+                    _process.Dispose();
+                    _process = null;
                }
-                if (blExist)
+                else
                {
                    foreach (string vName in lstV2ray)
                    {
-                        Process[] killPro = Process.GetProcessesByName(vName);
-                        foreach (Process p in killPro)
+                        Process[] existing = Process.GetProcessesByName(vName);
+                        foreach (Process p in existing)
                        {
-                            p.Kill();
+                            string path = p.MainModule.FileName;
+                            if (path == $"{Utils.GetPath(vName)}.exe")
+                            {
+                                KillProcess(p);
+                            }
                        }
                    }
                }
+
+                //bool blExist = true;
+                //if (processId > 0)
+                //{
+                //    Process p1 = Process.GetProcessById(processId);
+                //    if (p1 != null)
+                //    {
+                //        p1.Kill();
+                //        blExist = false;
+                //    }
+                //}
+                //if (blExist)
+                //{
+                //    foreach (string vName in lstV2ray)
+                //    {
+                //        Process[] killPro = Process.GetProcessesByName(vName);
+                //        foreach (Process p in killPro)
+                //        {
+                //            p.Kill();
+                //        }
+                //    }
+                //}
            }
            catch (Exception ex)
            {
                Utils.SaveLog(ex.Message, ex);
            }
        }
+        /// <summary>
+        /// V2ray停止
+        /// </summary>
+        public void V2rayStopPid(int pid)
+        {
+            try
+            {
+                Process _p = Process.GetProcessById(pid);
+                KillProcess(_p);
+            }
+            catch (Exception ex)
+            {
+                Utils.SaveLog(ex.Message, ex);
+            }
+        }
+
+        private string V2rayFindexe() {
+            //查找v2ray文件是否存在
+            string fileName = string.Empty;
+            lstV2ray.Reverse();
+            foreach (string name in lstV2ray)
+            {
+                string vName = string.Format("{0}.exe", name);
+                vName = Utils.GetPath(vName);
+                if (File.Exists(vName))
+                {
+                    fileName = vName;
+                    break;
+                }
+            }
+            if (Utils.IsNullOrEmpty(fileName))
+            {
+                string msg = string.Format(UIRes.I18N("NotFoundCore"), @"https://github.com/v2ray/v2ray-core/releases");
+                ShowMsg(true, msg);
+            }
+            return fileName;
+        }

        /// <summary>
        /// V2ray启动
@@ -105,30 +189,22 @@ namespace v2rayN.Handler

            try
            {
-                //查找v2ray文件是否存在
-                string fileName = string.Empty;
-                for (int k = 0; k < lstV2ray.Count; k++)
-                {
-                    string vName = string.Format("{0}.exe", lstV2ray[k]);
-                    vName = Utils.GetPath(vName);
-                    if (File.Exists(vName))
-                    {
-                        fileName = vName;
-                        break;
-                    }
-                }
-                if (Utils.IsNullOrEmpty(fileName))
-                {       
-                    string msg = string.Format(UIRes.I18N("NotFoundCore"), @"https://github.com/v2ray/v2ray-core/releases");
-                    ShowMsg(true, msg);
-                    return;
-                }
+                string fileName = V2rayFindexe();
+                if (fileName == "") return;

-                Process p = new Process();
-                p.StartInfo.FileName = fileName;
-                p.StartInfo.UseShellExecute = false;
-                p.StartInfo.RedirectStandardOutput = true;
-                p.StartInfo.CreateNoWindow = true;
+                Process p = new Process
+                {
+                    StartInfo = new ProcessStartInfo
+                    {
+                        FileName = fileName,
+                        WorkingDirectory = Utils.StartupPath(),
+                        UseShellExecute = false,
+                        RedirectStandardOutput = true,
+                        RedirectStandardError = true,
+                        CreateNoWindow = true,
+                        StandardOutputEncoding = Encoding.UTF8
+                    }
+                };
                p.OutputDataReceived += new DataReceivedEventHandler((sender, e) =>
                {
                    if (!String.IsNullOrEmpty(e.Data))
@@ -139,7 +215,15 @@ namespace v2rayN.Handler
                });
                p.Start();
                p.BeginOutputReadLine();
-                processId = p.Id;
+                //processId = p.Id;
+                _process = p;
+
+                if (p.WaitForExit(1000))
+                {
+                    throw new Exception(p.StandardError.ReadToEnd());
+                }
+
+                Global.processJob.AddProcess(p.Handle);
            }
            catch (Exception ex)
            {
@@ -148,18 +232,90 @@ namespace v2rayN.Handler
                ShowMsg(true, msg);
            }
        }
+        /// <summary>
+        /// V2ray启动，新建进程，传入配置字符串
+        /// </summary>
+        private int V2rayStartNew(string configStr)
+        {
+            ShowMsg(false, string.Format(UIRes.I18N("StartService"), DateTime.Now.ToString()));
+
+            try
+            {
+                string fileName = V2rayFindexe();
+                if (fileName == "") return -1;
+
+                Process p = new Process
+                {
+                    StartInfo = new ProcessStartInfo
+                    {
+                        FileName = fileName,
+                        Arguments = "-config stdin:",
+                        WorkingDirectory = Utils.StartupPath(),
+                        UseShellExecute = false,
+                        RedirectStandardInput = true,
+                        RedirectStandardOutput = true,
+                        RedirectStandardError = true,
+                        CreateNoWindow = true,
+                        StandardOutputEncoding = Encoding.UTF8
+                    }
+                };
+                p.OutputDataReceived += new DataReceivedEventHandler((sender, e) =>
+                {
+                    if (!String.IsNullOrEmpty(e.Data))
+                    {
+                        string msg = e.Data + Environment.NewLine;
+                        ShowMsg(false, msg);
+                    }
+                });
+                p.Start();
+                p.BeginOutputReadLine();
+
+                p.StandardInput.Write(configStr);
+                p.StandardInput.Close();
+
+                if (p.WaitForExit(1000))
+                {
+                    throw new Exception(p.StandardError.ReadToEnd());
+                }
+
+                Global.processJob.AddProcess(p.Handle);
+                return p.Id;
+            }
+            catch (Exception ex)
+            {
+                Utils.SaveLog(ex.Message, ex);
+                string msg = ex.Message;
+                ShowMsg(false, msg);
+                return -1;
+            }
+        }

        /// <summary>
        /// 消息委托
        /// </summary>
-        /// <param name="notify"></param>
-        /// <param name="msg"></param>
-        private void ShowMsg(bool notify, string msg)
+        /// <param name="updateToTrayTooltip">是否更新托盘图标的工具提示</param>
+        /// <param name="msg">输出到日志框</param>
+        private void ShowMsg(bool updateToTrayTooltip, string msg)
        {
-            if (ProcessEvent != null)
-            {
-                ProcessEvent(notify, msg);
-            }
+            ProcessEvent?.Invoke(updateToTrayTooltip, msg);
        }
+
+        private void KillProcess(Process p)
+        {
+            try
+            {
+                p.CloseMainWindow();
+                p.WaitForExit(100);
+                if (!p.HasExited)
+                {
+                    p.Kill();
+                    p.WaitForExit(100);
+                }
+            }
+            catch (Exception ex)
+            {
+                Utils.SaveLog(ex.Message, ex);
+            }
+        }         
    }
 }
--- a/v2rayN/v2rayN/Handler/V2rayUpdateHandle.cs
+++ b/v2rayN/v2rayN/Handler/V2rayUpdateHandle.cs
@@ -1,223 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Net;
-using System.Text;
-using Newtonsoft.Json;
-using v2rayN.Mode;
-using v2rayN.Properties;
-using v2rayN.HttpProxyHandler;
-using System.Diagnostics;
-
-namespace v2rayN.Handler
-{
-    /// <summary>
-    ///Update V2ray Core 
-    /// </summary>
-    class V2rayUpdateHandle
-    {
-        public event EventHandler<ResultEventArgs> AbsoluteCompleted;
-
-        public event EventHandler<ResultEventArgs> UpdateCompleted;
-
-        public event ErrorEventHandler Error;
-
-        public string DownloadFileName
-        {
-            get
-            {
-                return "v2ray-windows.zip";
-            }
-        }
-
-        public class ResultEventArgs : EventArgs
-        {
-            public bool Success;
-            public string Msg;
-
-            public ResultEventArgs(bool success, string msg)
-            {
-                this.Success = success;
-                this.Msg = msg;
-            }
-        }
-
-        private string latestUrl = "https://github.com/v2ray/v2ray-core/releases/latest";
-        private const string coreURL = "https://github.com/v2ray/v2ray-core/releases/download/{0}/v2ray-windows-{1}.zip";
-        private int progressPercentage = -1;
-        private bool blFirst = true;
-        private long totalBytesToReceive = 0;
-        private DateTime totalDatetime = new DateTime();
-
-
-        public void AbsoluteV2rayCore(Config config)
-        {
-            ServicePointManager.SecurityProtocol = (SecurityProtocolType)3072; //TLS 1.2
-            ServicePointManager.DefaultConnectionLimit = 256;
-            WebRequest request = WebRequest.Create(latestUrl);
-            request.BeginGetResponse(new AsyncCallback(OnResponseV2rayCore), request);
-        }
-
-        private void OnResponseV2rayCore(IAsyncResult ar)
-        {
-            try
-            {
-                HttpWebRequest request = (HttpWebRequest)ar.AsyncState;
-                HttpWebResponse response = (HttpWebResponse)request.EndGetResponse(ar);
-                string redirectUrl = response.ResponseUri.AbsoluteUri;
-                string version = redirectUrl.Substring(redirectUrl.LastIndexOf("/", StringComparison.Ordinal) + 1);
-
-                string osBit = string.Empty;
-                if (Environment.Is64BitProcess)
-                {
-                    osBit = "64";
-                }
-                else
-                {
-                    osBit = "32";
-                }
-                string url = string.Format(coreURL, version, osBit);
-                if (AbsoluteCompleted != null)
-                {
-                    AbsoluteCompleted(this, new ResultEventArgs(true, url));
-                }
-            }
-            catch (Exception ex)
-            {
-                Utils.SaveLog(ex.Message, ex);
-
-                if (Error != null)
-                    Error(this, new ErrorEventArgs(ex));
-            }
-        }
-
-
-        public void DownloadFileAsync(Config config, string url)
-        {
-            try
-            {
-                ServicePointManager.SecurityProtocol = (SecurityProtocolType)3072; //TLS 1.2
-                ServicePointManager.DefaultConnectionLimit = 256;
-                if (UpdateCompleted != null)
-                {
-                    UpdateCompleted(this, new ResultEventArgs(false, "Downloading..."));
-                }
-
-                progressPercentage = -1;
-
-                WebClientEx ws = new WebClientEx();
-                ws.Proxy = new WebProxy(Global.Loopback, Global.sysAgentPort);
-
-                ws.DownloadFileCompleted += ws_DownloadFileCompleted;
-                ws.DownloadProgressChanged += ws_DownloadProgressChanged;
-                ws.DownloadFileAsync(new Uri(url), Utils.GetPath(DownloadFileName));
-                blFirst = true;
-            }
-            catch (Exception ex)
-            {
-                Utils.SaveLog(ex.Message, ex);
-
-                if (Error != null)
-                    Error(this, new ErrorEventArgs(ex));
-            }
-        }
-
-        void ws_DownloadProgressChanged(object sender, DownloadProgressChangedEventArgs e)
-        {
-            if (blFirst)
-            {
-                totalBytesToReceive = e.TotalBytesToReceive - e.BytesReceived;
-                totalDatetime = DateTime.Now;
-                blFirst = false;
-            }
-            if (UpdateCompleted != null)
-            {
-                if (progressPercentage != e.ProgressPercentage && e.ProgressPercentage % 10 == 0)
-                {
-                    progressPercentage = e.ProgressPercentage;
-                    string msg = string.Format("...{0}%", e.ProgressPercentage);
-                    UpdateCompleted(this, new ResultEventArgs(false, msg));
-                }
-            }
-        }
-
-        void ws_DownloadFileCompleted(object sender, System.ComponentModel.AsyncCompletedEventArgs e)
-        {
-            try
-            {
-                if (e.Error == null
-                    || Utils.IsNullOrEmpty(e.Error.ToString()))
-                {
-                    if (UpdateCompleted != null)
-                    {
-                        TimeSpan ts = (DateTime.Now - totalDatetime);
-                        string speed = string.Format("{0} M/s", (totalBytesToReceive / ts.TotalMilliseconds / 1000).ToString("#0.##"));
-                        UpdateCompleted(this, new ResultEventArgs(true, speed));
-                    }
-                }
-                else
-                {
-                    throw e.Error;
-                }
-            }
-            catch (Exception ex)
-            {
-                Utils.SaveLog(ex.Message, ex);
-
-                if (Error != null)
-                    Error(this, new ErrorEventArgs(ex));
-            }
-        }
-
-        /// <summary>
-        /// DownloadString
-        /// </summary> 
-        /// <param name="url"></param>
-        public void WebDownloadString(string url)
-        {
-            string source = string.Empty;
-            try
-            {
-                ServicePointManager.SecurityProtocol = (SecurityProtocolType)3072; //TLS 1.2
-                ServicePointManager.DefaultConnectionLimit = 256;
-
-                WebClientEx ws = new WebClientEx();
-                ws.DownloadStringCompleted += Ws_DownloadStringCompleted;
-                ws.DownloadStringAsync(new Uri(url));
-            }
-            catch (Exception ex)
-            {
-                Utils.SaveLog(ex.Message, ex);
-            }
-        }
-
-        private void Ws_DownloadStringCompleted(object sender, DownloadStringCompletedEventArgs e)
-        {
-            try
-            {
-                if (e.Error == null
-                    || Utils.IsNullOrEmpty(e.Error.ToString()))
-                {
-                    string source = e.Result;
-                    if (UpdateCompleted != null)
-                    {
-                        UpdateCompleted(this, new ResultEventArgs(true, source));
-                    }
-                }
-                else
-                {
-                    throw e.Error;
-                }
-            }
-            catch (Exception ex)
-            {
-                Utils.SaveLog(ex.Message, ex);
-
-                if (Error != null)
-                    Error(this, new ErrorEventArgs(ex));
-            }
-        }
-
-
-    }
-}
--- a/v2rayN/v2rayN/HttpProxyHandler/HttpProxyHandle.cs
+++ b/v2rayN/v2rayN/HttpProxyHandler/HttpProxyHandle.cs
@@ -1,177 +1,186 @@
-using System;
-using v2rayN.Mode;
-
-namespace v2rayN.HttpProxyHandler
-{
-    /// <summary>
-    /// 系统代理(http)总处理
-    /// 启动privoxy提供http协议
-    /// 使用SysProxy设置IE系统代理或者PAC模式
-    /// </summary>
-    class HttpProxyHandle
-    {
-        private static string GetTimestamp(DateTime value)
-        {
-            return value.ToString("MMddHHmmssfff");
-        }
-
-        public static void ReSetPACProxy(Config config)
-        {
-            if (config.listenerType == 2)
-            {
-                //SysProxyHandle.SetIEProxy(false, false, null, null);
-                //PACServerHandle.Stop();
-            }
-            Update(config, false);
-        }
-
-        public static bool Update(Config config, bool forceDisable)
-        {
-            int type = config.listenerType;
-
-            if (forceDisable)
-            {
-                type = 0;
-            }
-
-            try
-            {
-                if (type != 0)
-                {
-                    var port = Global.sysAgentPort;
-                    if (port <= 0)
-                    {
-                        return false;
-                    }
-                    if (type == 1)
-                    {
-                        PACServerHandle.Stop();
-                        PACFileWatcherHandle.StopWatch();
-                        SysProxyHandle.SetIEProxy(true, true, $"{Global.Loopback}:{port}", null);
-                    }
-                    else if (type == 2)
-                    {
-                        string pacUrl = GetPacUrl();
-                        SysProxyHandle.SetIEProxy(true, false, null, pacUrl);
-                        PACServerHandle.Stop();
-                        PACServerHandle.Init(config);
-                        PACFileWatcherHandle.StartWatch(config);
-                    }
-                    else if (type == 3)
-                    {
-                        PACServerHandle.Stop();
-                        PACFileWatcherHandle.StopWatch();
-                        SysProxyHandle.SetIEProxy(false, false, null, null);
-                    }
-                    else if (type == 4)
-                    {
-                        string pacUrl = GetPacUrl();
-                        SysProxyHandle.SetIEProxy(false, false, null, null);
-                        PACServerHandle.Stop();
-                        PACServerHandle.Init(config);
-                        PACFileWatcherHandle.StartWatch(config);
-                    }
-                }
-                else
-                {
-                    SysProxyHandle.SetIEProxy(false, false, null, null);
-                    PACServerHandle.Stop();
-                    PACFileWatcherHandle.StopWatch();
-                }
-            }
-            catch (Exception ex)
-            {
-                Utils.SaveLog(ex.Message, ex);
-            }
-            return true;
-        }
-
-        /// <summary>
-        /// 启用系统代理(http)
-        /// </summary>
-        /// <param name="config"></param>
-        public static void StartHttpAgent(Config config)
-        {
-            try
-            {
-                int localPort = config.GetLocalPort("socks");
-                if (localPort > 0)
-                {
-                    PrivoxyHandler.Instance.Start(localPort, config);
-                    if (PrivoxyHandler.Instance.RunningPort > 0)
-                    {
-                        Global.sysAgent = true;
-                        Global.socksPort = localPort;
-                        Global.sysAgentPort = PrivoxyHandler.Instance.RunningPort;
-                        Global.pacPort = Global.sysAgentPort + 1;
-                    }
-                }
-            }
-            catch
-            {
-            }
-        }
-
-        /// <summary>
-        /// 关闭系统代理
-        /// </summary>
-        /// <param name="config"></param>
-        public static void CloseHttpAgent(Config config)
-        {
-            try
-            {
-                ////开启全局代理则关闭
-                //if (Global.sysAgent)
-                //{
-                PrivoxyHandler.Instance.Stop();
-
-                Global.sysAgent = false;
-                Global.socksPort = 0;
-                Global.sysAgentPort = 0;
-                Global.pacPort = 0;
-                //}
-            }
-            catch
-            {
-            }
-        }
-
-        /// <summary>
-        /// 重启系统代理(http)
-        /// </summary>
-        /// <param name="config"></param>
-        /// <param name="forced"></param>
-        public static bool RestartHttpAgent(Config config, bool forced)
-        {
-            bool isRestart = false;
-            //强制重启或者socks端口变化
-            if (forced)
-            {
-                isRestart = true;
-            }
-            else
-            {
-                int localPort = config.GetLocalPort("socks");
-                if (localPort != Global.socksPort)
-                {
-                    isRestart = true;
-                }
-            }
-            if (isRestart)
-            {
-                CloseHttpAgent(config);
-                StartHttpAgent(config);
-                return true;
-            }
-            return false;
-        }
-
-        public static string GetPacUrl()
-        {
-            string pacUrl = $"http://{Global.Loopback}:{Global.pacPort}/pac/?t={GetTimestamp(DateTime.Now)}";
-
-
-            return pacUrl;
-        }
-    }
-}
+using System;
+using v2rayN.Mode;
+
+namespace v2rayN.HttpProxyHandler
+{
+    /// <summary>
+    /// 系统代理(http)模式
+    /// </summary>
+    public enum ListenerType
+    {
+        noHttpProxy = 0,
+        GlobalHttp = 1,
+        GlobalPac = 2,
+        HttpOpenAndClear = 3,
+        PacOpenAndClear = 4,
+        HttpOpenOnly = 5,
+        PacOpenOnly = 6
+    }
+    /// <summary>
+    /// 系统代理(http)总处理
+    /// 启动privoxy提供http协议
+    /// 设置IE系统代理或者PAC模式
+    /// </summary>
+    class HttpProxyHandle
+    {
+        private static bool Update(Config config, bool forceDisable)
+        {
+            ListenerType type = config.listenerType;
+
+            if (forceDisable)
+            {
+                type = ListenerType.noHttpProxy;
+            }
+
+            try
+            {
+                if (type != ListenerType.noHttpProxy)
+                {
+                    int port = Global.httpPort;
+                    if (port <= 0)
+                    {
+                        return false;
+                    }
+                    if (type == ListenerType.GlobalHttp)
+                    {
+                        //PACServerHandle.Stop();
+                        //ProxySetting.SetProxy($"{Global.Loopback}:{port}", Global.IEProxyExceptions, 2);
+                        SysProxyHandle.SetIEProxy(true, true, $"{Global.Loopback}:{port}");
+                    }
+                    else if (type == ListenerType.GlobalPac)
+                    {
+                        string pacUrl = GetPacUrl();
+                        //ProxySetting.SetProxy(pacUrl, "", 4);
+                        SysProxyHandle.SetIEProxy(true, false, pacUrl);
+                        //PACServerHandle.Stop();
+                        PACServerHandle.Init(config);
+                    }
+                    else if (type == ListenerType.HttpOpenAndClear)
+                    {
+                        //PACServerHandle.Stop();
+                        SysProxyHandle.ResetIEProxy();
+                    }
+                    else if (type == ListenerType.PacOpenAndClear)
+                    {
+                        string pacUrl = GetPacUrl();
+                        SysProxyHandle.ResetIEProxy();
+                        //PACServerHandle.Stop();
+                        PACServerHandle.Init(config);
+                    }
+                    else if (type == ListenerType.HttpOpenOnly)
+                    {
+                        //PACServerHandle.Stop();
+                        //SysProxyHandle.ResetIEProxy();
+                    }
+                    else if (type == ListenerType.PacOpenOnly)
+                    {
+                        string pacUrl = GetPacUrl();
+                        //SysProxyHandle.ResetIEProxy();
+                        //PACServerHandle.Stop();
+                        PACServerHandle.Init(config);
+                    }
+                }
+                else
+                {
+                    SysProxyHandle.ResetIEProxy();
+                    //PACServerHandle.Stop();
+                }
+            }
+            catch (Exception ex)
+            {
+                Utils.SaveLog(ex.Message, ex);
+            }
+            return true;
+        }
+
+        /// <summary>
+        /// 启用系统代理(http)
+        /// </summary>
+        /// <param name="config"></param>
+        private static void StartHttpAgent(Config config)
+        {
+            try
+            {
+                int localPort = config.GetLocalPort(Global.InboundSocks);
+                if (localPort > 0)
+                {
+                    PrivoxyHandler.Instance.Restart(localPort, config);
+                    if (PrivoxyHandler.Instance.RunningPort > 0)
+                    {
+                        Global.sysAgent = true;
+                        Global.socksPort = localPort;
+                        Global.httpPort = PrivoxyHandler.Instance.RunningPort;
+                        Global.pacPort = config.GetLocalPort("pac");
+                    }
+                }
+            }
+            catch
+            {
+            }
+        }
+
+        /// <summary>
+        /// 关闭系统代理
+        /// </summary>
+        /// <param name="config"></param>
+        public static void CloseHttpAgent(Config config)
+        {
+            try
+            {
+                if (config.listenerType != ListenerType.HttpOpenOnly && config.listenerType != ListenerType.PacOpenOnly)
+                {
+                    Update(config, true);
+                }
+
+                PrivoxyHandler.Instance.Stop();
+
+                Global.sysAgent = false;
+                Global.socksPort = 0;
+                Global.httpPort = 0;
+            }
+            catch
+            {
+            }
+        }
+
+        /// <summary>
+        /// 重启系统代理(http)
+        /// </summary>
+        /// <param name="config"></param>
+        /// <param name="forced"></param>
+        public static void RestartHttpAgent(Config config, bool forced)
+        {
+            bool isRestart = false;
+            if (config.listenerType == ListenerType.noHttpProxy)
+            {
+                // 关闭http proxy时，直接返回
+                return;
+            }
+            //强制重启或者socks端口变化
+            if (forced)
+            {
+                isRestart = true;
+            }
+            else
+            {
+                int localPort = config.GetLocalPort(Global.InboundSocks);
+                if (localPort != Global.socksPort)
+                {
+                    isRestart = true;
+                }
+            }
+            if (isRestart)
+            {
+                CloseHttpAgent(config);
+                StartHttpAgent(config);
+            }
+            Update(config, false);
+        }
+
+        public static string GetPacUrl()
+        {
+            string pacUrl = $"http://{Global.Loopback}:{Global.pacPort}/pac/?t={ DateTime.Now.ToString("HHmmss")}";
+            return pacUrl;
+        }
+    }
+}
--- a/v2rayN/v2rayN/HttpProxyHandler/PACFileWatcherHandle.cs
+++ b/v2rayN/v2rayN/HttpProxyHandler/PACFileWatcherHandle.cs
@@ -1,45 +0,0 @@
-using System.IO;
-using System.Windows.Forms;
-using v2rayN.Mode;
-
-namespace v2rayN.HttpProxyHandler
-{
-    /// <summary>
-    /// 提供PAC功能支持
-    /// </summary>
-    class PACFileWatcherHandle
-    {
-        private static FileSystemWatcher fileSystemWatcher;
-
-        private static long fileSize;
-
-        public static void StartWatch(Config config)
-        {
-            if (fileSystemWatcher == null)
-            {
-                fileSystemWatcher = new FileSystemWatcher(Utils.StartupPath());
-                fileSystemWatcher.Filter = "pac.txt";
-                fileSystemWatcher.NotifyFilter = NotifyFilters.Size;
-                fileSystemWatcher.Changed += (sender, args) =>
-                {
-                    var fileInfo = new FileInfo(args.FullPath);
-                    if (fileSize != fileInfo.Length)
-                    {
-                        fileSize = fileInfo.Length;
-                        HttpProxyHandle.ReSetPACProxy(config);
-                    }
-                    
-                };
-            }
-            fileSystemWatcher.EnableRaisingEvents = true;
-        }
-
-        public static void StopWatch()
-        {
-            if (fileSystemWatcher != null)
-            {
-                fileSystemWatcher.EnableRaisingEvents = false;
-            }
-        }
-    }
-}
--- a/v2rayN/v2rayN/HttpProxyHandler/PACListHandle.cs
+++ b/v2rayN/v2rayN/HttpProxyHandler/PACListHandle.cs
@@ -1,92 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Net;
-using System.Text;
-using Newtonsoft.Json;
-using v2rayN.Mode;
-using v2rayN.Properties;
-
-namespace v2rayN.HttpProxyHandler
-{
-    /// <summary>
-    /// 提供PAC功能支持
-    /// </summary>
-    class PACListHandle
-    {
-        public event EventHandler<ResultEventArgs> UpdateCompleted;
-
-        public event ErrorEventHandler Error;
-
-        public class ResultEventArgs : EventArgs
-        {
-            public bool Success;
-
-            public ResultEventArgs(bool success)
-            {
-                this.Success = success;
-            }
-        }
-
-        private const string GFWLIST_URL = "https://raw.githubusercontent.com/gfwlist/gfwlist/master/gfwlist.txt";
-
-        private static readonly IEnumerable<char> IgnoredLineBegins = new[] { '!', '[' };
-
-        public void UpdatePACFromGFWList(Config config)
-        {
-            string url = GFWLIST_URL;
-            if (!Utils.IsNullOrEmpty(config.urlGFWList))
-            {
-                url = config.urlGFWList;
-            }
-
-            //默认用户已开启系统代理
-            //var httpProxy = config.inbound.FirstOrDefault(x => x.protocol=="http");
-            //if (httpProxy == null)
-            //{
-            //    throw new Exception("未发现HTTP代理，无法设置代理更新");
-            //}
-            var http = new WebClientEx();
-            //http.Headers.Add("Connection", "Close");
-            //http.Proxy = new WebProxy(IPAddress.Loopback.ToString(), httpProxy.localPort);
-            http.DownloadStringCompleted += http_DownloadStringCompleted;
-            http.DownloadStringAsync(new Uri(url));
-        }
-
-        private void http_DownloadStringCompleted(object sender, DownloadStringCompletedEventArgs e)
-        {
-            try
-            {
-                File.WriteAllText(Utils.GetTempPath("gfwlist.txt"), e.Result, Encoding.UTF8);
-                List<string> lines = ParseResult(e.Result);
-                string abpContent = Utils.UnGzip(Resources.abp_js);
-                abpContent = abpContent.Replace("__RULES__", JsonConvert.SerializeObject(lines, Formatting.Indented));
-                File.WriteAllText(Utils.GetPath(Global.pacFILE), abpContent, Encoding.UTF8);
-                if (UpdateCompleted != null) UpdateCompleted(this, new ResultEventArgs(true));
-            }
-            catch (Exception ex)
-            {
-                Utils.SaveLog(ex.Message, ex);
-
-                if (Error != null) Error(this, new ErrorEventArgs(ex));
-            }
-        }
-
-        public static List<string> ParseResult(string response)
-        {
-            byte[] bytes = Convert.FromBase64String(response);
-            string content = Encoding.UTF8.GetString(bytes);
-            List<string> valid_lines = new List<string>();
-            using (var sr = new StringReader(content))
-            {
-                foreach (var line in sr.NonWhiteSpaceLines())
-                {
-                    if (line.BeginWithAny(IgnoredLineBegins))
-                        continue;
-                    valid_lines.Add(line);
-                }
-            }
-            return valid_lines;
-        }
-    }
-}
--- a/v2rayN/v2rayN/HttpProxyHandler/PACServerHandle.cs
+++ b/v2rayN/v2rayN/HttpProxyHandler/PACServerHandle.cs
@@ -5,6 +5,7 @@ using System.Text;
 using v2rayN.Mode;
 using v2rayN.Properties;
 using v2rayN.Tool;
+using v2rayN.Base;

 namespace v2rayN.HttpProxyHandler
 {
@@ -16,6 +17,7 @@ namespace v2rayN.HttpProxyHandler
        private static int pacPort = 0;
        private static HttpWebServer server;
        private static HttpWebServerB serverB;
+        private static Config _config;

        public static bool IsRunning
        {
@@ -27,14 +29,17 @@ namespace v2rayN.HttpProxyHandler

        public static void Init(Config config)
        {
-            //if (InitServer("*"))
-            //{
-            //    pacPort = Global.pacPort;
-            //}
-            if (InitServer(Global.Loopback))
+            _config = config;
+            Global.pacPort = config.GetLocalPort("pac");
+
+            if (InitServer("*"))
            {
                pacPort = Global.pacPort;
            }
+            //else if (InitServer(Global.Loopback))
+            //{
+            //    pacPort = Global.pacPort;
+            //}
            else if (InitServerB(Global.Loopback))
            {
                pacPort = Global.pacPort;
@@ -66,7 +71,6 @@ namespace v2rayN.HttpProxyHandler
                        server = new HttpWebServer(SendResponse, prefixes);
                        server.Run();

-                        //pacPort = Global.pacPort;
                    }
                }
                Utils.SaveLog("Webserver at " + address);
@@ -94,7 +98,6 @@ namespace v2rayN.HttpProxyHandler
                    if (serverB == null)
                    {
                        serverB = new HttpWebServerB(Global.pacPort, SendResponse);
-                        //pacPort = Global.pacPort;
                    }
                }
                Utils.SaveLog("WebserverB at " + address);
@@ -111,7 +114,7 @@ namespace v2rayN.HttpProxyHandler
        {
            try
            {
-                var pac = GetPacList(address);
+                string pac = GetPacList(address);
                return pac;
            }
            catch (Exception ex)
@@ -123,18 +126,23 @@ namespace v2rayN.HttpProxyHandler

        public static void Stop()
        {
-            //try
-            //{
-            //    if (server != null)
-            //    {
-            //        server.Stop();
-            //        server = null;
-            //    }
-            //}
-            //catch (Exception ex)
-            //{
-            //    Utils.SaveLog("Webserver Stop " + ex.Message);
-            //}
+            try
+            {
+                if (server != null)
+                {
+                    server.Stop();
+                    server = null;
+                }
+                if (serverB != null)
+                {
+                    serverB.Stop();
+                    serverB = null;
+                }
+            }
+            catch (Exception ex)
+            {
+                Utils.SaveLog("Webserver Stop " + ex.Message);
+            }

            //try
            //{
@@ -155,27 +163,40 @@ namespace v2rayN.HttpProxyHandler
            //}
        }

-
        private static string GetPacList(string address)
        {
-            var port = Global.sysAgentPort;
+            int port = Global.httpPort;
            if (port <= 0)
            {
                return "No port";
            }
            try
            {
-                List<string> lstProxy = new List<string>();
-                lstProxy.Add(string.Format("PROXY {0}:{1};", address, port));
-                var proxy = string.Join("", lstProxy.ToArray());
+                List<string> lstProxy = new List<string>
+                {
+                    string.Format("PROXY {0}:{1};", address, port)
+                };
+                string proxy = string.Join("", lstProxy.ToArray());

                string strPacfile = Utils.GetPath(Global.pacFILE);
                if (!File.Exists(strPacfile))
                {
                    FileManager.UncompressFile(strPacfile, Resources.pac_txt);
                }
-                var pac = File.ReadAllText(strPacfile, Encoding.UTF8);
+                string pac = File.ReadAllText(strPacfile, Encoding.UTF8);
                pac = pac.Replace("__PROXY__", proxy);
+
+                if (_config.userPacRule.Count > 0)
+                {
+                    string keyWords = "var rules = [";
+                    if (pac.IndexOf(keyWords) >= 0)
+                    {
+                        string userPac = string.Join($"\",{Environment.NewLine}\"", _config.userPacRule.ToArray());
+                        userPac = string.Format("\"{0}\",", userPac);
+                        pac = pac.Replace(keyWords, keyWords + userPac);
+                    }
+                }
+
                return pac;
            }
            catch
--- a/v2rayN/v2rayN/HttpProxyHandler/PrivoxyHandler.cs
+++ b/v2rayN/v2rayN/HttpProxyHandler/PrivoxyHandler.cs
@@ -22,21 +22,17 @@ namespace v2rayN.HttpProxyHandler

        private static int _uid;
        private static string _uniqueConfigFile;
-        private static Job _privoxyJob;
        private Process _process;
-        private int _runningPort;
-        private bool _isRunning;
+        private static string _privoxyName = "v2ray_privoxy";

        static PrivoxyHandler()
        {
            try
            {
-                _uid = Application.StartupPath.GetHashCode(); // Currently we use ss's StartupPath to identify different Privoxy instance.
+                _uid = Application.StartupPath.GetHashCode();
                _uniqueConfigFile = string.Format("privoxy_{0}.conf", _uid);
-                _privoxyJob = new Job();

-                FileManager.UncompressFile(Utils.GetTempPath("v2ray_privoxy.exe"), Resources.privoxy_exe);
-                FileManager.UncompressFile(Utils.GetTempPath("mgwz.dll"), Resources.mgwz_dll);
+                FileManager.UncompressFile(Utils.GetTempPath($"{_privoxyName}.exe"), Resources.privoxy_exe);
            }
            catch (IOException ex)
            {
@@ -44,11 +40,6 @@ namespace v2rayN.HttpProxyHandler
            }
        }

-        private PrivoxyHandler()
-        {
-
-        }
-
        /// <summary>
        /// 单例
        /// </summary>
@@ -66,64 +57,64 @@ namespace v2rayN.HttpProxyHandler

        public int RunningPort
        {
-            get
-            {
-                return _runningPort;
-            }
+            get; set;
        }

-        public bool IsRunning
+        public void Restart(int localPort, Config config)
        {
-            get
-            {
-                return _isRunning;
-            }
+            Stop();
+            Start(localPort, config);
        }

+
        public void Start(int localPort, Config config)
        {
-            if (_process == null)
+            try
            {
-                Process[] existingPrivoxy = Process.GetProcessesByName("v2ray_privoxy");
-                foreach (Process p in existingPrivoxy.Where(IsChildProcess))
+                if (_process == null)
                {
-                    KillProcess(p);
-                }
-                string privoxyConfig = Resources.privoxy_conf;
-                _runningPort = GetFreePort(localPort);
-                privoxyConfig = privoxyConfig.Replace("__SOCKS_PORT__", localPort.ToString());
-                privoxyConfig = privoxyConfig.Replace("__PRIVOXY_BIND_PORT__", _runningPort.ToString());
-                if (config.allowLANConn)
-                {
-                    privoxyConfig = privoxyConfig.Replace("__PRIVOXY_BIND_IP__", "0.0.0.0");
-                }
-                else
-                {
-                    privoxyConfig = privoxyConfig.Replace("__PRIVOXY_BIND_IP__", Global.Loopback);
-                }
-                FileManager.ByteArrayToFile(Utils.GetTempPath(_uniqueConfigFile), Encoding.UTF8.GetBytes(privoxyConfig));

-                _process = new Process
-                {
-                    // Configure the process using the StartInfo properties.
-                    StartInfo =
+                    string privoxyConfig = Resources.privoxy_conf;
+                    RunningPort = config.GetLocalPort(Global.InboundHttp);
+                    privoxyConfig = privoxyConfig.Replace("__SOCKS_PORT__", localPort.ToString());
+                    privoxyConfig = privoxyConfig.Replace("__PRIVOXY_BIND_PORT__", RunningPort.ToString());
+                    if (config.allowLANConn)
                    {
-                        FileName = "v2ray_privoxy.exe",
+                        privoxyConfig = privoxyConfig.Replace("__PRIVOXY_BIND_IP__", "0.0.0.0");
+                    }
+                    else
+                    {
+                        privoxyConfig = privoxyConfig.Replace("__PRIVOXY_BIND_IP__", Global.Loopback);
+                    }
+                    FileManager.ByteArrayToFile(Utils.GetTempPath(_uniqueConfigFile), Encoding.UTF8.GetBytes(privoxyConfig));
+
+                    _process = new Process
+                    {
+                        // Configure the process using the StartInfo properties.
+                        StartInfo =
+                    {
+                        FileName = $"{_privoxyName}.exe",
                        Arguments = _uniqueConfigFile,
                        WorkingDirectory = Utils.GetTempPath(),
                        WindowStyle = ProcessWindowStyle.Hidden,
                        UseShellExecute = true,
                        CreateNoWindow = true
                    }
-                };
-                _process.Start();
+                    };
+                    _process.Start();

-                /*
-                 * Add this process to job obj associated with this ss process, so that
-                 * when ss exit unexpectedly, this process will be forced killed by system.
-                 */
-                _privoxyJob.AddProcess(_process.Handle);
-                _isRunning = true;
+                    /*
+                     * Add this process to job obj associated with this ss process, so that
+                     * when ss exit unexpectedly, this process will be forced killed by system.
+                     */
+
+                    Global.processJob.AddProcess(_process.Handle);
+                }
+            }
+            catch (Exception ex)
+            {
+                RunningPort = 0;
+                Utils.SaveLog(ex.Message, ex);
            }
        }

@@ -134,7 +125,15 @@ namespace v2rayN.HttpProxyHandler
                KillProcess(_process);
                _process.Dispose();
                _process = null;
-                _isRunning = false;
+                RunningPort = 0;
+            }
+            else
+            {
+                Process[] existingPrivoxy = Process.GetProcessesByName(_privoxyName);
+                foreach (Process p in existingPrivoxy.Where(IsChildProcess))
+                {
+                    KillProcess(p);
+                }
            }
        }

@@ -147,7 +146,7 @@ namespace v2rayN.HttpProxyHandler
                if (!p.HasExited)
                {
                    p.Kill();
-                    p.WaitForExit();
+                    p.WaitForExit(100);
                }
            }
            catch (Exception ex)
@@ -173,9 +172,9 @@ namespace v2rayN.HttpProxyHandler
                /*
                 * Under PortableMode, we could identify it by the path of v2ray_privoxy.exe.
                 */
-                var path = process.MainModule.FileName;
+                string path = process.MainModule.FileName;

-                return Utils.GetTempPath("v2ray_privoxy.exe").Equals(path);
+                return Utils.GetTempPath($"{_privoxyName}.exe").Equals(path);

            }
            catch (Exception ex)
@@ -191,25 +190,5 @@ namespace v2rayN.HttpProxyHandler
            }
        }

-        private int GetFreePort(int localPort)
-        {
-            int defaultPort = 8123;
-            try
-            {
-                //// TCP stack please do me a favor
-                //TcpListener l = new TcpListener(IPAddress.Loopback, 0);
-                //l.Start();
-                //var port = ((IPEndPoint)l.LocalEndpoint).Port;
-                //l.Stop();
-                //return port;
-                return localPort + 1;
-            }
-            catch (Exception ex)
-            {
-                // in case access denied
-                Utils.SaveLog(ex.Message, ex);
-                return defaultPort;
-            }
-        }
    }
 }
--- a/v2rayN/v2rayN/HttpProxyHandler/ProxySetting.cs
+++ b/v2rayN/v2rayN/HttpProxyHandler/ProxySetting.cs
@@ -8,26 +8,46 @@ namespace v2rayN.HttpProxyHandler
    {
        public static bool UnsetProxy()
        {
-            return SetProxy(null, null);
-        }
-        public static bool SetProxy(string strProxy)
-        {
-            return SetProxy(strProxy, null);
+            return SetProxy(null, null, 1);
        }

-        public static bool SetProxy(string strProxy, string exceptions)
+        public static bool SetProxy(string strProxy, string exceptions, int type)
        {
            InternetPerConnOptionList list = new InternetPerConnOptionList();

-            int optionCount = Utils.IsNullOrEmpty(strProxy) ? 1 : (Utils.IsNullOrEmpty(exceptions) ? 2 : 3);
+            int optionCount = 1;
+            if (type == 1)
+            {
+                optionCount = 1;
+            }
+            else if (type == 2 || type == 4)
+            {
+                optionCount = Utils.IsNullOrEmpty(exceptions) ? 2 : 3;
+            }
+
+            int m_Int = (int)PerConnFlags.PROXY_TYPE_DIRECT;
+            PerConnOption m_Option = PerConnOption.INTERNET_PER_CONN_FLAGS;
+            if (type == 2)
+            {
+                m_Int = (int)(PerConnFlags.PROXY_TYPE_DIRECT | PerConnFlags.PROXY_TYPE_PROXY);
+                m_Option = PerConnOption.INTERNET_PER_CONN_PROXY_SERVER;
+            }
+            else if (type == 4)
+            {
+                m_Int = (int)(PerConnFlags.PROXY_TYPE_DIRECT | PerConnFlags.PROXY_TYPE_AUTO_PROXY_URL);
+                m_Option = PerConnOption.INTERNET_PER_CONN_AUTOCONFIG_URL;
+            }
+
+            //int optionCount = Utils.IsNullOrEmpty(strProxy) ? 1 : (Utils.IsNullOrEmpty(exceptions) ? 2 : 3);
            InternetConnectionOption[] options = new InternetConnectionOption[optionCount];
            // USE a proxy server ...
            options[0].m_Option = PerConnOption.INTERNET_PER_CONN_FLAGS;
-            options[0].m_Value.m_Int = (int)((optionCount < 2) ? PerConnFlags.PROXY_TYPE_DIRECT : (PerConnFlags.PROXY_TYPE_DIRECT | PerConnFlags.PROXY_TYPE_PROXY));
+            //options[0].m_Value.m_Int = (int)((optionCount < 2) ? PerConnFlags.PROXY_TYPE_DIRECT : (PerConnFlags.PROXY_TYPE_DIRECT | PerConnFlags.PROXY_TYPE_PROXY));
+            options[0].m_Value.m_Int = m_Int;
            // use THIS proxy server
            if (optionCount > 1)
            {
-                options[1].m_Option = PerConnOption.INTERNET_PER_CONN_PROXY_SERVER;
+                options[1].m_Option = m_Option;
                options[1].m_Value.m_StringPtr = Marshal.StringToHGlobalAuto(strProxy);
                // except for these addresses ...
                if (optionCount > 2)
@@ -50,14 +70,22 @@ namespace v2rayN.HttpProxyHandler
            // copy the array over into that spot in memory ...
            for (int i = 0; i < options.Length; ++i)
            {
-                IntPtr opt = new IntPtr(optionsPtr.ToInt32() + (i * optSize));
-                Marshal.StructureToPtr(options[i], opt, false);
+                if (Environment.Is64BitOperatingSystem)
+                {
+                    IntPtr opt = new IntPtr(optionsPtr.ToInt64() + (i * optSize));
+                    Marshal.StructureToPtr(options[i], opt, false);
+                }
+                else
+                {
+                    IntPtr opt = new IntPtr(optionsPtr.ToInt32() + (i * optSize));
+                    Marshal.StructureToPtr(options[i], opt, false);
+                }
            }

            list.options = optionsPtr;

            // and then make a pointer out of the whole list
-            IntPtr ipcoListPtr = Marshal.AllocCoTaskMem((Int32)list.dwSize);
+            IntPtr ipcoListPtr = Marshal.AllocCoTaskMem((int)list.dwSize);
            Marshal.StructureToPtr(list, ipcoListPtr, false);

            // and finally, call the API method!
@@ -100,7 +128,7 @@ namespace v2rayN.HttpProxyHandler
            public InternetConnectionOptionValue m_Value;
            static InternetConnectionOption()
            {
-                InternetConnectionOption.Size = Marshal.SizeOf(typeof(InternetConnectionOption));
+                Size = Marshal.SizeOf(typeof(InternetConnectionOption));
            }

            // Nested Types
@@ -181,7 +209,7 @@ namespace v2rayN.HttpProxyHandler
            string ProxyServer = rk.GetValue("ProxyServer").ToString();
            rk.Close();
            return ProxyServer;
-            
+
        }
    }
 }
--- a/v2rayN/v2rayN/HttpProxyHandler/SysProxyHandle.cs
+++ b/v2rayN/v2rayN/HttpProxyHandler/SysProxyHandle.cs
@@ -1,19 +1,20 @@
-using System;
+
+using System;
 using System.Diagnostics;
 using System.IO;
 using System.Text;
-using Newtonsoft.Json;
+using System.Threading;
 using v2rayN.Mode;
 using v2rayN.Properties;
 using v2rayN.Tool;

 namespace v2rayN.HttpProxyHandler
 {
-    class SysProxyHandle
+    public static class SysProxyHandle
    {
-        private const string _userWininetConfigFile = "user-wininet.json";
+        //private const string _userWininetConfigFile = "user-wininet.json";

-        private static string _queryStr;
+        //private static string _queryStr;

        // In general, this won't change
        // format:
@@ -43,11 +44,10 @@ namespace v2rayN.HttpProxyHandler
            catch (IOException ex)
            {
                Utils.SaveLog(ex.Message, ex);
-
            }
        }

-        public static void SetIEProxy(bool enable, bool global, string proxyServer, string pacURL)
+        public static void SetIEProxy(bool enable, bool global, string strProxy)
        {
            //Read();

@@ -55,130 +55,138 @@ namespace v2rayN.HttpProxyHandler
            //{
            //    // record user settings
            //    ExecSysproxy("query");
-            //    ParseQueryStr(_queryStr);
+            //    //ParseQueryStr(_queryStr);
            //}

            string arguments;
            if (enable)
            {
                arguments = global
-                    ? string.Format(
-                        //"global {0} <local>;localhost;127.*;10.*;172.16.*;172.17.*;172.18.*;172.19.*;172.20.*;172.21.*;172.22.*;172.23.*;172.24.*;172.25.*;172.26.*;172.27.*;172.28.*;172.29.*;172.30.*;172.31.*;172.32.*;192.168.*",
-                        "global {0} <local>;localhost;127.*;10.*;172.16.*;172.17.*;172.18.*;172.19.*;172.20.*;172.21.*;172.22.*;172.23.*;172.24.*;172.25.*;172.26.*;172.27.*;172.28.*;172.29.*;172.30.*;172.31.*;172.32.*",
-                        proxyServer)
-                    : string.Format("pac {0}", pacURL);
+                    ? $"global {strProxy} {Global.IEProxyExceptions}"
+                    : $"pac {strProxy}";
            }
            else
            {
                // restore user settings
-                //var flags = _userSettings.Flags;
-                //var proxy_server = _userSettings.ProxyServer ?? "-";
-                //var bypass_list = _userSettings.BypassList ?? "-";
-                //var pac_url = _userSettings.PacUrl ?? "-";
-                ////arguments = string.Format("set {0} {1} {2} {3}", flags, proxy_server, bypass_list, pac_url);
-                //set null settings
-                arguments = string.Format("set {0} {1} {2} {3}", 1, "-", "<local>", @"http://127.0.0.1");
+                string flags = _userSettings.Flags;
+                string proxy_server = _userSettings.ProxyServer ?? "-";
+                string bypass_list = _userSettings.BypassList ?? "-";
+                string pac_url = _userSettings.PacUrl ?? "-";
+                arguments = $"set {flags} {proxy_server} {bypass_list} {pac_url}";

                // have to get new settings
-                //_userSettings.UserSettingsRecorded = false;
+                _userSettings.UserSettingsRecorded = false;
            }

            //Save();
            ExecSysproxy(arguments);
        }

+        // set system proxy to 1 (null) (null) (null)
+        public static bool ResetIEProxy()
+        {
+            try
+            {
+                // clear user-wininet.json
+                //_userSettings = new SysproxyConfig();
+                //Save();
+                // clear system setting
+                ExecSysproxy("set 1 - - -");
+            }
+            catch (Exception)
+            {
+                return false;
+            }
+
+            return true;
+        }
+
        private static void ExecSysproxy(string arguments)
        {
-            using (var process = new Process())
+            // using event to avoid hanging when redirect standard output/error
+            // ref: https://stackoverflow.com/questions/139593/processstartinfo-hanging-on-waitforexit-why
+            // and http://blog.csdn.net/zhangweixing0/article/details/7356841
+            using (AutoResetEvent outputWaitHandle = new AutoResetEvent(false))
+            using (AutoResetEvent errorWaitHandle = new AutoResetEvent(false))
            {
-                // Configure the process using the StartInfo properties.
-                process.StartInfo.FileName = Utils.GetTempPath("sysproxy.exe");
-                process.StartInfo.Arguments = arguments;
-                process.StartInfo.WorkingDirectory = Utils.GetTempPath();
-                process.StartInfo.WindowStyle = ProcessWindowStyle.Hidden;
-                process.StartInfo.UseShellExecute = false;
-                process.StartInfo.RedirectStandardError = true;
-                process.StartInfo.RedirectStandardOutput = true;
-
-                // Need to provide encoding info, or output/error strings we got will be wrong.
-                process.StartInfo.StandardOutputEncoding = Encoding.Unicode;
-                process.StartInfo.StandardErrorEncoding = Encoding.Unicode;
-
-                process.StartInfo.CreateNoWindow = true;
-                process.Start();
-
-                var stderr = process.StandardError.ReadToEnd();
-                var stdout = process.StandardOutput.ReadToEnd();
-
-                process.WaitForExit();
-
-                var exitCode = process.ExitCode;
-                if (exitCode != (int)RET_ERRORS.RET_NO_ERROR)
+                using (Process process = new Process())
                {
-                    throw new Exception(stderr);
-                }
+                    // Configure the process using the StartInfo properties.
+                    process.StartInfo.FileName = Utils.GetTempPath("sysproxy.exe");
+                    process.StartInfo.Arguments = arguments;
+                    process.StartInfo.WorkingDirectory = Utils.GetTempPath();
+                    process.StartInfo.WindowStyle = ProcessWindowStyle.Hidden;
+                    process.StartInfo.UseShellExecute = false;
+                    process.StartInfo.RedirectStandardError = true;
+                    process.StartInfo.RedirectStandardOutput = true;

-                if (arguments == "query")
-                {
-                    if (stdout.IsNullOrWhiteSpace() || stdout.IsNullOrEmpty())
+                    // Need to provide encoding info, or output/error strings we got will be wrong.
+                    process.StartInfo.StandardOutputEncoding = Encoding.Unicode;
+                    process.StartInfo.StandardErrorEncoding = Encoding.Unicode;
+
+                    process.StartInfo.CreateNoWindow = true;
+
+                    StringBuilder output = new StringBuilder();
+                    StringBuilder error = new StringBuilder();
+
+                    process.OutputDataReceived += (sender, e) =>
                    {
-                        // we cannot get user settings
-                        throw new Exception("failed to query wininet settings");
+                        if (e.Data == null)
+                        {
+                            outputWaitHandle.Set();
+                        }
+                        else
+                        {
+                            output.AppendLine(e.Data);
+                        }
+                    };
+                    process.ErrorDataReceived += (sender, e) =>
+                    {
+                        if (e.Data == null)
+                        {
+                            errorWaitHandle.Set();
+                        }
+                        else
+                        {
+                            error.AppendLine(e.Data);
+                        }
+                    };
+                    try
+                    {
+                        process.Start();
+
+                        process.BeginErrorReadLine();
+                        process.BeginOutputReadLine();
+
+                        process.WaitForExit();
                    }
-                    _queryStr = stdout;
+                    catch (System.ComponentModel.Win32Exception e)
+                    {
+
+                        // log the arguments
+                        throw new Exception(process.StartInfo.Arguments);
+                    }
+                    string stderr = error.ToString();
+                    string stdout = output.ToString();
+
+                    int exitCode = process.ExitCode;
+                    if (exitCode != (int)RET_ERRORS.RET_NO_ERROR)
+                    {
+                        throw new Exception(stderr);
+                    }
+
+                    //if (arguments == "query")
+                    //{
+                    //    if (stdout.IsNullOrWhiteSpace() || stdout.IsNullOrEmpty())
+                    //    {
+                    //        throw new Exception("failed to query wininet settings");
+                    //    }
+                    //    _queryStr = stdout;
+                    //}
                }
            }
        }

-        private static void Save()
-        {
-            try
-            {
-                using (StreamWriter sw = new StreamWriter(File.Open(Utils.GetPath(_userWininetConfigFile), FileMode.Create)))
-                {
-                    string jsonString = JsonConvert.SerializeObject(_userSettings, Formatting.Indented);
-                    sw.Write(jsonString);
-                    sw.Flush();
-                }
-            }
-            catch (IOException ex)
-            {
-                Utils.SaveLog(ex.Message, ex);
-            }
-        }

-        private static void Read()
-        {
-            try
-            {
-                string configContent = File.ReadAllText(Utils.GetPath(_userWininetConfigFile));
-                _userSettings = JsonConvert.DeserializeObject<SysproxyConfig>(configContent);
-            }
-            catch (Exception ex)
-            {
-                Utils.SaveLog(ex.Message, ex);
-                // Suppress all exceptions. finally block will initialize new user config settings.
-            }
-            finally
-            {
-                if (_userSettings == null) _userSettings = new SysproxyConfig();
-            }
-        }
-
-        private static void ParseQueryStr(string str)
-        {
-            string[] userSettingsArr = str.Split(new string[] { "\r\n" }, StringSplitOptions.RemoveEmptyEntries);
-            _userSettings.Flags = userSettingsArr[0];
-
-            // handle output from WinINET
-            if (userSettingsArr[1] == "(null)") _userSettings.ProxyServer = null;
-            else _userSettings.ProxyServer = userSettingsArr[1];
-            if (userSettingsArr[2] == "(null)") _userSettings.BypassList = null;
-            else _userSettings.BypassList = userSettingsArr[2];
-            if (userSettingsArr[3] == "(null)") _userSettings.PacUrl = null;
-            else _userSettings.PacUrl = userSettingsArr[3];
-
-            _userSettings.UserSettingsRecorded = true;
-        }
    }
 }
--- a/v2rayN/v2rayN/LIB/Google.Protobuf.dll
+++ b/v2rayN/v2rayN/LIB/Google.Protobuf.dll
--- a/v2rayN/v2rayN/LIB/Grpc.Core.Api.dll
+++ b/v2rayN/v2rayN/LIB/Grpc.Core.Api.dll
--- a/v2rayN/v2rayN/LIB/Grpc.Core.dll
+++ b/v2rayN/v2rayN/LIB/Grpc.Core.dll
--- a/v2rayN/v2rayN/LIB/Newtonsoft.Json.dll
+++ b/v2rayN/v2rayN/LIB/Newtonsoft.Json.dll
--- a/v2rayN/v2rayN/LIB/System.Buffers.dll
+++ b/v2rayN/v2rayN/LIB/System.Buffers.dll
--- a/v2rayN/v2rayN/LIB/System.Memory.dll
+++ b/v2rayN/v2rayN/LIB/System.Memory.dll
--- a/v2rayN/v2rayN/LIB/System.Runtime.CompilerServices.Unsafe.dll
+++ b/v2rayN/v2rayN/LIB/System.Runtime.CompilerServices.Unsafe.dll
--- a/v2rayN/v2rayN/LIB/grpc_csharp_ext.x64.dll
+++ b/v2rayN/v2rayN/LIB/grpc_csharp_ext.x64.dll
--- a/v2rayN/v2rayN/LIB/grpc_csharp_ext.x86.dll
+++ b/v2rayN/v2rayN/LIB/grpc_csharp_ext.x86.dll
--- a/v2rayN/v2rayN/LIB/netstandard.dll
+++ b/v2rayN/v2rayN/LIB/netstandard.dll
--- a/v2rayN/v2rayN/LIB/zxing.dll
+++ b/v2rayN/v2rayN/LIB/zxing.dll
--- a/v2rayN/v2rayN/LIB/zxing.presentation.dll
+++ b/v2rayN/v2rayN/LIB/zxing.presentation.dll
--- a/v2rayN/v2rayN/Mode/Config.cs
+++ b/v2rayN/v2rayN/Mode/Config.cs
@@ -1,6 +1,8 @@
 using System;
 using System.Collections.Generic;
-using System.Text.RegularExpressions;
+using v2rayN.Base;
+using v2rayN.HttpProxyHandler;
+

 namespace v2rayN.Mode
 {
@@ -13,122 +15,188 @@ namespace v2rayN.Mode
        /// <summary>
        /// 本地监听
        /// </summary>
-        public List<InItem> inbound { get; set; }
+        public List<InItem> inbound
+        {
+            get; set;
+        }

        /// <summary>
        /// 允许日志
        /// </summary>
-        public bool logEnabled { get; set; }
+        public bool logEnabled
+        {
+            get; set;
+        }

        /// <summary>
        /// 日志等级
        /// </summary>
-        public string loglevel { get; set; }
+        public string loglevel
+        {
+            get; set;
+        }

        /// <summary>
        /// 活动配置序号
        /// </summary>
-        public int index { get; set; }
+        public int index
+        {
+            get; set;
+        }

        /// <summary>
        /// vmess服务器信息
        /// </summary>
-        public List<VmessItem> vmess { get; set; }
+        public List<VmessItem> vmess
+        {
+            get; set;
+        }

        /// <summary>
        /// 允许Mux多路复用
        /// </summary>
-        public bool muxEnabled { get; set; }
+        public bool muxEnabled
+        {
+            get; set;
+        }

        /// <summary>
        /// 域名解析策略
        /// </summary>
-        public string domainStrategy { get; set; }
+        public string domainStrategy
+        {
+            get; set;
+        }

        /// <summary>
        /// 路由模式
        /// </summary>
-        public string routingMode { get; set; }
+        public string routingMode
+        {
+            get; set;
+        }

        /// <summary>
        /// 用户自定义需代理的网址或ip
        /// </summary>
-        public List<string> useragent { get; set; }
+        public List<string> useragent
+        {
+            get; set;
+        }

        /// <summary>
        /// 用户自定义直连的网址或ip
        /// </summary>
-        public List<string> userdirect { get; set; }
+        public List<string> userdirect
+        {
+            get; set;
+        }

        /// <summary>
        /// 用户自定义阻止的网址或ip
        /// </summary>
-        public List<string> userblock { get; set; }
+        public List<string> userblock
+        {
+            get; set;
+        }

        /// <summary>
        /// KcpItem
        /// </summary>
-        public KcpItem kcpItem { get; set; }
-
+        public KcpItem kcpItem
+        {
+            get; set;
+        }

        /// <summary>
-        /// 启用Http代理
+        /// 监听状态
        /// </summary>
-        public bool sysAgentEnabled { get; set; }
+        public ListenerType listenerType
+        {
+            get; set;
+        }

        /// <summary>
-        /// 监听状态 0-不改变 1-全局 2-PAC
+        /// 自定义服务器下载测速url
        /// </summary>
-        public int listenerType { get; set; }
-
+        public string speedTestUrl
+        {
+            get; set;
+        }
+        /// <summary>
+        /// 自定义“服务器真连接延迟”测试url
+        /// </summary>
+        public string speedPingTestUrl
+        {
+            get; set;
+        }
        /// <summary>
        /// 自定义GFWList url
        /// </summary>
-        public string urlGFWList { get; set; }
+        public string urlGFWList
+        {
+            get; set;
+        }

        /// <summary>
        /// 允许来自局域网的连接
        /// </summary>
-        public bool allowLANConn { get; set; }
+        public bool allowLANConn
+        {
+            get; set;
+        }

        /// <summary>
        /// 启用实时网速和流量统计
        /// </summary>
-        public bool enableStatistics { get; set; }
+        public bool enableStatistics
+        {
+            get; set;
+        }
+
+        /// <summary>
+        /// 去重时优先保留较旧（顶部）节点
+        /// </summary>
+        public bool keepOlderDedupl
+        {
+            get; set;
+        }

        /// <summary>
        /// 视图刷新率
        /// </summary>
-        public int statisticsFreshRate { get; set; }
-
-        /// <summary>
-        /// 统计数据缓存天数 [0, 30]
-        ///     * 0 关闭单独每天使用流量的缓存
-        ///     * 无论如何不会关闭总流量的缓存
-        /// </summary>
-        private uint cacheDays;
-        public uint CacheDays {
-            get { return cacheDays; }
-            set 
-            {
-                if (value < 0) cacheDays = 0;
-                else if (value > 30) cacheDays = 30;
-                else cacheDays = value;
-            }
+        public int statisticsFreshRate
+        {
+            get; set;
        }
+         

        /// <summary>
        /// 自定义远程DNS
        /// </summary>
-        public string remoteDNS { get; set; }
+        public string remoteDNS
+        {
+            get; set;
+        }
        /// <summary>
        /// 订阅
        /// </summary>
-        public List<SubItem> subItem { get; set; }
+        public List<SubItem> subItem
+        {
+            get; set;
+        }
        /// <summary>
        /// UI
        /// </summary>
-        public UIItem uiItem { get; set; }
+        public UIItem uiItem
+        {
+            get; set;
+        }
+
+        public List<string> userPacRule
+        {
+            get; set;
+        }      

        #region 函数

@@ -236,6 +304,19 @@ namespace v2rayN.Mode

        public int GetLocalPort(string protocol)
        {
+            if (protocol == Global.InboundHttp)
+            {
+                return GetLocalPort(Global.InboundSocks) + 1;
+            }
+            else if (protocol == "pac")
+            {
+                return GetLocalPort(Global.InboundSocks) + 2;
+            }
+            else if (protocol == "speedtest")
+            {
+                return GetLocalPort(Global.InboundSocks) + 103;
+            }
+
            int localPort = 0;
            foreach (InItem inItem in inbound)
            {
@@ -266,6 +347,16 @@ namespace v2rayN.Mode
            return vmess[index].getSummary();
        }

+        public string getItemId()
+        {
+            if (index < 0)
+            {
+                return string.Empty;
+            }
+
+            return vmess[index].getItemId();
+        }
+
        #endregion

    }
@@ -295,10 +386,9 @@ namespace v2rayN.Mode

        public string getSummary()
        {
-            string summary = string.Empty;
-            summary = string.Format("{0}-", ((EConfigType)configType).ToString());
+            string summary = string.Format("{0}-", ((EConfigType)configType).ToString());
            string[] arrAddr = address.Split('.');
-            string addr = string.Empty;
+            string addr;
            if (arrAddr.Length > 2)
            {
                addr = $"{arrAddr[0]}***{arrAddr[arrAddr.Length - 1]}";
@@ -349,80 +439,136 @@ namespace v2rayN.Mode
            }
            return subid.Substring(0, 4);
        }
+
+        public string getItemId()
+        {
+            string itemId = $"{address}{port}{requestHost}{path}";
+            itemId = Utils.Base64Encode(itemId);
+            return itemId;
+        }
+
        /// <summary>
        /// 版本(现在=2)
        /// </summary>
-        public int configVersion { get; set; }
+        public int configVersion
+        {
+            get; set;
+        }

        /// <summary>
        /// 远程服务器地址
        /// </summary>
-        public string address { get; set; }
+        public string address
+        {
+            get; set;
+        }
        /// <summary>
        /// 远程服务器端口
        /// </summary>
-        public int port { get; set; }
+        public int port
+        {
+            get; set;
+        }
        /// <summary>
        /// 远程服务器ID
        /// </summary>
-        public string id { get; set; }
+        public string id
+        {
+            get; set;
+        }
        /// <summary>
        /// 远程服务器额外ID
        /// </summary>
-        public int alterId { get; set; }
+        public int alterId
+        {
+            get; set;
+        }
        /// <summary>
        /// 本地安全策略
        /// </summary>
-        public string security { get; set; }
+        public string security
+        {
+            get; set;
+        }
        /// <summary>
-        /// tcp,kcp,ws
+        /// tcp,kcp,ws,h2,quic
        /// </summary>
-        public string network { get; set; }
+        public string network
+        {
+            get; set;
+        }
        /// <summary>
        /// 备注或别名
        /// </summary>
-        public string remarks { get; set; }
+        public string remarks
+        {
+            get; set;
+        }

        /// <summary>
        /// 伪装类型
        /// </summary>
-        public string headerType { get; set; }
+        public string headerType
+        {
+            get; set;
+        }

        /// <summary>
        /// 伪装的域名
        /// </summary>
-        public string requestHost { get; set; }
+        public string requestHost
+        {
+            get; set;
+        }

        /// <summary>
        /// ws h2 path
        /// </summary>
-        public string path { get; set; }
+        public string path
+        {
+            get; set;
+        }

        /// <summary>
        /// 底层传输安全
        /// </summary>
-        public string streamSecurity { get; set; }
+        public string streamSecurity
+        {
+            get; set;
+        }

        /// <summary>
        /// 是否允许不安全连接（用于客户端）
        /// </summary>
-        public string allowInsecure { get; set; }
+        public string allowInsecure
+        {
+            get; set;
+        }


        /// <summary>
        /// config type(1=normal,2=custom)
        /// </summary>
-        public int configType { get; set; }
+        public int configType
+        {
+            get; set;
+        }

        /// <summary>
        /// 
        /// </summary>
-        public string testResult { get; set; }
+        public string testResult
+        {
+            get; set;
+        }

        /// <summary>
        /// SubItem id
        /// </summary>
-        public string subid { get; set; }
+        public string subid
+        {
+            get; set;
+        }
    }

    [Serializable]
@@ -431,17 +577,26 @@ namespace v2rayN.Mode
        /// <summary>
        /// 本地监听端口
        /// </summary>
-        public int localPort { get; set; }
+        public int localPort
+        {
+            get; set;
+        }

        /// <summary>
        /// 协议，默认为socks
        /// </summary>
-        public string protocol { get; set; }
+        public string protocol
+        {
+            get; set;
+        }

        /// <summary>
        /// 允许udp
        /// </summary>
-        public bool udpEnabled { get; set; }
+        public bool udpEnabled
+        {
+            get; set;
+        }

        /// <summary>
        /// 开启流量探测
@@ -455,31 +610,52 @@ namespace v2rayN.Mode
        /// <summary>
        /// 
        /// </summary>
-        public int mtu { get; set; }
+        public int mtu
+        {
+            get; set;
+        }
        /// <summary>
        /// 
        /// </summary>
-        public int tti { get; set; }
+        public int tti
+        {
+            get; set;
+        }
        /// <summary>
        /// 
        /// </summary>
-        public int uplinkCapacity { get; set; }
+        public int uplinkCapacity
+        {
+            get; set;
+        }
        /// <summary>
        /// 
        /// </summary>
-        public int downlinkCapacity { get; set; }
+        public int downlinkCapacity
+        {
+            get; set;
+        }
        /// <summary>
        /// 
        /// </summary>
-        public bool congestion { get; set; }
+        public bool congestion
+        {
+            get; set;
+        }
        /// <summary>
        /// 
        /// </summary>
-        public int readBufferSize { get; set; }
+        public int readBufferSize
+        {
+            get; set;
+        }
        /// <summary>
        /// 
        /// </summary>
-        public int writeBufferSize { get; set; }
+        public int writeBufferSize
+        {
+            get; set;
+        }
    }


@@ -489,17 +665,26 @@ namespace v2rayN.Mode
        /// <summary>
        /// 
        /// </summary>
-        public string id { get; set; }
+        public string id
+        {
+            get; set;
+        }

        /// <summary>
        /// 备注
        /// </summary>
-        public string remarks { get; set; }
+        public string remarks
+        {
+            get; set;
+        }

        /// <summary>
        /// url
        /// </summary>
-        public string url { get; set; }
+        public string url
+        {
+            get; set;
+        }

        /// <summary>
        /// enable
--- a/v2rayN/v2rayN/Mode/ServerStatistics.cs
+++ b/v2rayN/v2rayN/Mode/ServerStatistics.cs
@@ -1,35 +1,43 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;

 namespace v2rayN.Mode
 {
-    class ServerStatistics
+    [Serializable]
+    public class ServerStatistics
    {
-        public string name;
-        public string address;
-        public int port;
-        public string path;
-        public string host;
-        public ulong totalUp;
-        public ulong totalDown;
-        public ulong todayUp;
-        public ulong todayDown;
-
-        public ServerStatistics() { }
-        public ServerStatistics(string name, string addr, int port, string path, string host, ulong totalUp, ulong totalDown, ulong todayUp, ulong todayDown)
+        public List<ServerStatItem> server
        {
-            this.name = name;
-            this.address = addr;
-            this.port = port;
-            this.path = path;
-            this.host = host;
-            this.totalUp = totalUp;
-            this.totalDown = totalDown;
-            this.todayUp = todayUp;
-            this.todayDown = todayDown;
+            get; set;
+        }
+    }
+
+    [Serializable]
+    public class ServerStatItem
+    {
+        public string itemId
+        {
+            get; set;
+        }
+        public ulong totalUp
+        {
+            get; set;
+        }
+        public ulong totalDown
+        {
+            get; set;
+        }
+        public ulong todayUp
+        {
+            get; set;
+        }
+        public ulong todayDown
+        {
+            get; set;
+        }
+        public long dateNow
+        {
+            get; set;
        }
    }
 }
--- a/v2rayN/v2rayN/Mode/V2rayConfig.cs
+++ b/v2rayN/v2rayN/Mode/V2rayConfig.cs
@@ -281,6 +281,11 @@ namespace v2rayN.Mode
        /// 
        /// </summary>
        public bool enabled { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public int concurrency { get; set; }
    }

    public class Response
@@ -310,7 +315,7 @@ namespace v2rayN.Mode
        /// </summary>
        public string port { get; set; }

-        public string inboundTag { get; set; }
+        public List<string> inboundTag { get; set; }
        /// <summary>
        /// 
        /// </summary>
--- a/v2rayN/v2rayN/Program.cs
+++ b/v2rayN/v2rayN/Program.cs
@@ -1,8 +1,10 @@
 using System;
 using System.Diagnostics;
-using System.Reflection;
+using System.Threading;
 using System.Windows.Forms;
 using v2rayN.Forms;
+using v2rayN.Properties;
+using v2rayN.Tool;

 namespace v2rayN
 {
@@ -23,20 +25,20 @@ namespace v2rayN
            }

            Application.SetUnhandledExceptionMode(UnhandledExceptionMode.CatchException);
-            Application.ThreadException += new System.Threading.ThreadExceptionEventHandler(Application_ThreadException);
+            Application.ThreadException += new ThreadExceptionEventHandler(Application_ThreadException);
            AppDomain.CurrentDomain.UnhandledException += new UnhandledExceptionEventHandler(CurrentDomain_UnhandledException);

-            AppDomain.CurrentDomain.AssemblyResolve += CurrentDomain_AssemblyResolve;

+            //AppDomain.CurrentDomain.AssemblyResolve += CurrentDomain_AssemblyResolve;

-            Process instance = RunningInstance();
-            if (instance == null)
+            if (!IsDuplicateInstance())
            {
-                Utils.SaveLog("v2rayN start up");
+
+                Utils.SaveLog("v2rayN start up " + Utils.GetVersion());

                //设置语言环境
                string lang = Utils.RegReadValue(Global.MyRegPath, Global.MyRegKeyLanguage, "zh-Hans");
-                System.Threading.Thread.CurrentThread.CurrentUICulture = new System.Globalization.CultureInfo(lang);
+                Thread.CurrentThread.CurrentUICulture = new System.Globalization.CultureInfo(lang);

                Application.EnableVisualStyles();
                Application.SetCompatibleTextRenderingDefault(false);
@@ -44,53 +46,47 @@ namespace v2rayN
            }
            else
            {
-                UI.Show($"v2rayN is already running(v2rayN已经运行)");
+                UI.ShowWarning($"v2rayN is already running(v2rayN已经运行)");
            }
        }

-        private static Assembly CurrentDomain_AssemblyResolve(object sender, ResolveEventArgs args)
-        {
-            try
-            {
-                string resourceName = "v2rayN.LIB." + new AssemblyName(args.Name).Name + ".dll";
-                using (var stream = Assembly.GetExecutingAssembly().GetManifestResourceStream(resourceName))
-                {
-                    if (stream == null)
-                    {
-                        return null;
-                    }
-                    byte[] assemblyData = new byte[stream.Length];
-                    stream.Read(assemblyData, 0, assemblyData.Length);
-                    return Assembly.Load(assemblyData);
-                }
-            }
-            catch
-            {
-                return null;
-            }
-        }
+        //private static Assembly CurrentDomain_AssemblyResolve(object sender, ResolveEventArgs args)
+        //{
+        //    try
+        //    {
+        //        string resourceName = "v2rayN.LIB." + new AssemblyName(args.Name).Name + ".dll";
+        //        using (var stream = Assembly.GetExecutingAssembly().GetManifestResourceStream(resourceName))
+        //        {
+        //            if (stream == null)
+        //            {
+        //                return null;
+        //            }
+        //            byte[] assemblyData = new byte[stream.Length];
+        //            stream.Read(assemblyData, 0, assemblyData.Length);
+        //            return Assembly.Load(assemblyData);
+        //        }
+        //    }
+        //    catch
+        //    {
+        //        return null;
+        //    }
+        //}

        /// <summary> 
-        /// 获取正在运行的实例，没有运行的实例返回null; 
+        /// 检查是否已在运行
        /// </summary> 
-        public static Process RunningInstance()
+        public static bool IsDuplicateInstance()
        {
-            Process current = Process.GetCurrentProcess();
-            Process[] processes = Process.GetProcessesByName(current.ProcessName);
-            foreach (Process process in processes)
-            {
-                if (process.Id != current.Id)
-                {
-                    if (Assembly.GetExecutingAssembly().Location.Replace("/", "\\") == process.MainModule.FileName)
-                    {
-                        return process;
-                    }
-                }
-            }
-            return null;
+            //string name = "v2rayN";
+
+            string name = Utils.GetExePath(); // Allow different locations to run
+            name = name.Replace("\\", "/"); // https://stackoverflow.com/questions/20714120/could-not-find-a-part-of-the-path-error-while-creating-mutex
+            
+            Global.mutexObj = new Mutex(false, name, out bool bCreatedNew);
+            return !bCreatedNew;
        }

-        static void Application_ThreadException(object sender, System.Threading.ThreadExceptionEventArgs e)
+        static void Application_ThreadException(object sender, ThreadExceptionEventArgs e)
        {
            Utils.SaveLog("Application_ThreadException", e.Exception);
        }
@@ -99,6 +95,5 @@ namespace v2rayN
        {
            Utils.SaveLog("CurrentDomain_UnhandledException", (Exception)e.ExceptionObject);
        }
-
    }
 }
--- a/v2rayN/v2rayN/Properties/AssemblyInfo.cs
+++ b/v2rayN/v2rayN/Properties/AssemblyInfo.cs
@@ -1,5 +1,4 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;

 // 有关程序集的常规信息通过以下
@@ -8,9 +7,9 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyTitle("v2rayN")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Microsoft")]
+[assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("v2rayN")]
-[assembly: AssemblyCopyright("Copyright © Microsoft 2019")]
+[assembly: AssemblyCopyright("Copyright © 2019-2020 (GPLv3)")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]

@@ -33,4 +32,4 @@ using System.Runtime.InteropServices;
 // 方法是按如下所示使用“*”:
 //[assembly: AssemblyVersion("1.0.*")]
 //[assembly: AssemblyVersion("1.0.0")]
-[assembly: AssemblyFileVersion("2.45")]
+[assembly: AssemblyFileVersion("3.12")]
--- a/v2rayN/v2rayN/Properties/Resources.Designer.cs
+++ b/v2rayN/v2rayN/Properties/Resources.Designer.cs
@@ -100,16 +100,6 @@ namespace v2rayN.Properties {
            }
        }
        
-        /// <summary>
-        ///   查找 System.Byte[] 类型的本地化资源。
-        /// </summary>
-        internal static byte[] mgwz_dll {
-            get {
-                object obj = ResourceManager.GetObject("mgwz_dll", resourceCulture);
-                return ((byte[])(obj));
-            }
-        }
-        
        /// <summary>
        ///   查找 System.Drawing.Bitmap 类型的本地化资源。
        /// </summary>
@@ -157,6 +147,7 @@ namespace v2rayN.Properties {
        ///show-on-task-bar 0
        ///activity-animation 0
        ///forward-socks5 / 127.0.0.1:__SOCKS_PORT__ .
+        ///max-client-connections 2048
        ///hide-console
        /// 的本地化字符串。
        /// </summary>
--- a/v2rayN/v2rayN/Properties/Resources.resx
+++ b/v2rayN/v2rayN/Properties/Resources.resx
@@ -130,9 +130,6 @@
  <data name="help" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\resources\help.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
-  <data name="mgwz_dll" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\resources\mgwz.dll.gz;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
  <data name="minimize" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\minimize.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
@@ -164,9 +161,9 @@
    <value>..\resources\sub.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="sysproxy64_exe" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\sysproxy64.exe.gz;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>..\resources\sysproxy64.exe.gz;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </data>
  <data name="sysproxy_exe" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\sysproxy.exe.gz;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>..\resources\sysproxy.exe.gz;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </data>
 </root>
--- a/v2rayN/v2rayN/Resources/mgwz.dll.gz
+++ b/v2rayN/v2rayN/Resources/mgwz.dll.gz
--- a/v2rayN/v2rayN/Resources/pac.txt
+++ b/v2rayN/v2rayN/Resources/pac.txt
@@ -49,7 +49,7 @@ var rules = [
  "|http://img.dlsite.jp/",
  "||dm530.net",
  "share.dmhy.org",
-  "@@|https://share.dmhy.org",
+  "||dmhy.org",
  "||dmm.co.jp",
  "|http://www.dmm.com/netgame",
  "||dnvod.tv",
@@ -262,19 +262,25 @@ var rules = [
  "||daum.net",
  "||depositphotos.com",
  "||disconnect.me",
+  "||documentingreality.com",
  "||doubibackup.com",
  "||doubmirror.cf",
  "||encyclopedia.com",
  "||fangeqiang.com",
+  "||fanqiangdang.com",
  "||cloud.feedly.com",
+  "||feedx.net",
  "||flyzy2005.com",
  "||foreignpolicy.com",
  "||free-ss.site",
+  "||freehongkong.org",
  "||blog.fuckgfw233.org",
  "||g0v.social",
  "||globalvoices.org",
  "||glorystar.me",
  "||goregrish.com",
+  "||guangnianvpn.com",
+  "||hanime.tv",
  "||hbo.com",
  "||spaces.hightail.com",
  "||hkgalden.com",
@@ -288,6 +294,7 @@ var rules = [
  "||joinmastodon.org",
  "||liangzhichuanmei.com",
  "||lighti.me",
+  "||lightyearvpn.com",
  "||lihkg.com",
  "||line-scdn.net",
  "||i.lithium.com",
@@ -325,6 +332,7 @@ var rules = [
  "||api.pureapk.com",
  "||quora.com",
  "||quoracdn.net",
+  "||qz.com",
  "||cdn.seatguru.com",
  "||secure.raxcdn.com",
  "||redd.it",
@@ -368,6 +376,8 @@ var rules = [
  "||steemit.com",
  "||taiwanjustice.net",
  "||tinc-vpn.org",
+  "||u15.info",
+  "||washingtonpost.com",
  "||wenzhao.ca",
  "||whatsonweibo.com",
  "||wire.com",
@@ -375,6 +385,7 @@ var rules = [
  "||xm.com",
  "||xuehua.us",
  "||yes-news.com",
+  "||yigeni.com",
  "||you-get.org",
  "||zzcloud.me",
  "||aex.com",
@@ -697,459 +708,8 @@ var rules = [
  "||thefacebook.com",
  "||whatsapp.com",
  "||whatsapp.net",
-  "|https://www.ftchinese.com",
-  ".ftchinese.com/channel/video",
-  ".ftchinese.com/premium/001081066",
-  ".ftchinese.com/story/00102753",
-  ".ftchinese.com/story/001026616",
-  ".ftchinese.com/story/001026749",
-  ".ftchinese.com/story/001026807",
-  ".ftchinese.com/story/001026808",
-  ".ftchinese.com/story/001026834",
-  ".ftchinese.com/story/001026880",
-  ".ftchinese.com/story/001027429",
-  ".ftchinese.com/story/001030341",
-  ".ftchinese.com/story/001030502",
-  ".ftchinese.com/story/001030803",
-  ".ftchinese.com/story/001031317",
-  ".ftchinese.com/story/001032617",
-  ".ftchinese.com/story/001032636",
-  ".ftchinese.com/story/001032692",
-  ".ftchinese.com/story/001032762",
-  ".ftchinese.com/story/001033138",
-  ".ftchinese.com/story/001034917",
-  ".ftchinese.com/story/001034926",
-  ".ftchinese.com/story/001034927",
-  ".ftchinese.com/story/001034928",
-  ".ftchinese.com/story/001034952",
-  ".ftchinese.com/story/001035890",
-  ".ftchinese.com/story/001035972",
-  ".ftchinese.com/story/001035993",
-  ".ftchinese.com/story/001036417",
-  ".ftchinese.com/story/001037090",
-  ".ftchinese.com/story/001037091",
-  ".ftchinese.com/story/001038178",
-  ".ftchinese.com/story/001038199",
-  ".ftchinese.com/story/001038220",
-  ".ftchinese.com/story/001038819",
-  ".ftchinese.com/story/001038862",
-  ".ftchinese.com/story/001039067",
-  ".ftchinese.com/story/001039178",
-  ".ftchinese.com/story/001039211",
-  ".ftchinese.com/story/001039271",
-  ".ftchinese.com/story/001039295",
-  ".ftchinese.com/story/001039369",
-  ".ftchinese.com/story/001039482",
-  ".ftchinese.com/story/001039534",
-  ".ftchinese.com/story/001039555",
-  ".ftchinese.com/story/001039576",
-  ".ftchinese.com/story/001039712",
-  ".ftchinese.com/story/001039779",
-  ".ftchinese.com/story/001039809",
-  ".ftchinese.com/story/001040134",
-  ".ftchinese.com/story/001040835",
-  ".ftchinese.com/story/001040890",
-  ".ftchinese.com/story/001040918",
-  ".ftchinese.com/story/001040992",
-  ".ftchinese.com/story/001041209",
-  ".ftchinese.com/story/001042100",
-  ".ftchinese.com/story/001042252",
-  ".ftchinese.com/story/001042272",
-  ".ftchinese.com/story/001042280",
-  ".ftchinese.com/story/001043029",
-  ".ftchinese.com/story/001043066",
-  ".ftchinese.com/story/001043096",
-  ".ftchinese.com/story/001043124",
-  ".ftchinese.com/story/001043152",
-  ".ftchinese.com/story/001043189",
-  ".ftchinese.com/story/001043428",
-  ".ftchinese.com/story/001043439",
-  ".ftchinese.com/story/001043534",
-  ".ftchinese.com/story/001043675",
-  ".ftchinese.com/story/001043680",
-  ".ftchinese.com/story/001043702",
-  ".ftchinese.com/story/001043849",
-  ".ftchinese.com/story/001044099",
-  ".ftchinese.com/story/001044776",
-  ".ftchinese.com/story/001044871",
-  ".ftchinese.com/story/001044897",
-  ".ftchinese.com/story/001045114",
-  ".ftchinese.com/story/001045139",
-  ".ftchinese.com/story/001045186",
-  ".ftchinese.com/story/001045755",
-  ".ftchinese.com/story/001046087",
-  ".ftchinese.com/story/001046105",
-  ".ftchinese.com/story/001046118",
-  ".ftchinese.com/story/001046132",
-  ".ftchinese.com/story/001046517",
-  ".ftchinese.com/story/001046822",
-  ".ftchinese.com/story/001046866",
-  ".ftchinese.com/story/001046942",
-  ".ftchinese.com/story/001047180",
-  ".ftchinese.com/story/001047206",
-  ".ftchinese.com/story/001047304",
-  ".ftchinese.com/story/001047317",
-  ".ftchinese.com/story/001047345",
-  ".ftchinese.com/story/001047358",
-  ".ftchinese.com/story/001047375",
-  ".ftchinese.com/story/001047381",
-  ".ftchinese.com/story/001047413",
-  ".ftchinese.com/story/001047456",
-  ".ftchinese.com/story/001047491",
-  ".ftchinese.com/story/001047545",
-  ".ftchinese.com/story/001047558",
-  ".ftchinese.com/story/001047568",
-  ".ftchinese.com/story/001047627",
-  ".ftchinese.com/story/001048293",
-  ".ftchinese.com/story/001048343",
-  ".ftchinese.com/story/001048710",
-  ".ftchinese.com/story/001049289",
-  ".ftchinese.com/story/001049360",
-  ".ftchinese.com/story/001049896",
-  ".ftchinese.com/story/001050152",
-  ".ftchinese.com/story/001051027",
-  ".ftchinese.com/story/001051161",
-  ".ftchinese.com/story/001051372",
-  ".ftchinese.com/story/001051479",
-  ".ftchinese.com/story/001052138",
-  ".ftchinese.com/story/001052161",
-  ".ftchinese.com/story/001052525",
-  ".ftchinese.com/story/001052549",
-  ".ftchinese.com/story/001052701",
-  ".ftchinese.com/story/001052965",
-  ".ftchinese.com/story/001053149",
-  ".ftchinese.com/story/001053150",
-  ".ftchinese.com/story/001053200",
-  ".ftchinese.com/story/001053425",
-  ".ftchinese.com/story/001053496",
-  ".ftchinese.com/story/001053526",
-  ".ftchinese.com/story/001053557",
-  ".ftchinese.com/story/001053906",
-  ".ftchinese.com/story/001054049",
-  ".ftchinese.com/story/001054103",
-  ".ftchinese.com/story/001054109",
-  ".ftchinese.com/story/001054119",
-  ".ftchinese.com/story/001054123",
-  ".ftchinese.com/story/001054139",
-  ".ftchinese.com/story/001054166",
-  ".ftchinese.com/story/001054168",
-  ".ftchinese.com/story/001054190",
-  ".ftchinese.com/story/001054437",
-  ".ftchinese.com/story/001054526",
-  ".ftchinese.com/story/001054607",
-  ".ftchinese.com/story/001054644",
-  ".ftchinese.com/story/001054786",
-  ".ftchinese.com/story/001054843",
-  ".ftchinese.com/story/001054925",
-  ".ftchinese.com/story/001054940",
-  ".ftchinese.com/story/001055051",
-  ".ftchinese.com/story/001055063",
-  ".ftchinese.com/story/001055069",
-  ".ftchinese.com/story/001055136",
-  ".ftchinese.com/story/001055170",
-  ".ftchinese.com/story/001055202",
-  ".ftchinese.com/story/001055242",
-  ".ftchinese.com/story/001055263",
-  ".ftchinese.com/story/001055274",
-  ".ftchinese.com/story/001055299",
-  ".ftchinese.com/story/001055480",
-  ".ftchinese.com/story/001055551",
-  ".ftchinese.com/story/001055559",
-  ".ftchinese.com/story/001055566",
-  ".ftchinese.com/story/001055840",
-  ".ftchinese.com/story/001056099",
-  ".ftchinese.com/story/001056108",
-  ".ftchinese.com/story/001056131",
-  ".ftchinese.com/story/001056375",
-  ".ftchinese.com/story/001056491",
-  ".ftchinese.com/story/001056529",
-  ".ftchinese.com/story/001056534",
-  ".ftchinese.com/story/001056538",
-  ".ftchinese.com/story/001056541",
-  ".ftchinese.com/story/001056554",
-  ".ftchinese.com/story/001056557",
-  ".ftchinese.com/story/001056560",
-  ".ftchinese.com/story/001056567",
-  ".ftchinese.com/story/001056574",
-  ".ftchinese.com/story/001056588",
-  ".ftchinese.com/story/001056594",
-  ".ftchinese.com/story/001056596",
-  ".ftchinese.com/story/001056684",
-  ".ftchinese.com/story/001056832",
-  ".ftchinese.com/story/001056833",
-  ".ftchinese.com/story/001056851",
-  ".ftchinese.com/story/001056874",
-  ".ftchinese.com/story/001056896",
-  ".ftchinese.com/story/001056927",
-  ".ftchinese.com/story/001057011",
-  ".ftchinese.com/story/001057018",
-  ".ftchinese.com/story/001057044",
-  ".ftchinese.com/story/001057162",
-  ".ftchinese.com/story/001057500",
-  ".ftchinese.com/story/001057504",
-  ".ftchinese.com/story/001057509",
-  ".ftchinese.com/story/001057518",
-  ".ftchinese.com/story/001057532",
-  ".ftchinese.com/story/001057533",
-  ".ftchinese.com/story/001057556",
-  ".ftchinese.com/story/001057580",
-  ".ftchinese.com/story/001057638",
-  ".ftchinese.com/story/001057644",
-  ".ftchinese.com/story/001057817",
-  ".ftchinese.com/story/001057875",
-  ".ftchinese.com/story/001058009",
-  ".ftchinese.com/story/001058056",
-  ".ftchinese.com/story/001058224",
-  ".ftchinese.com/story/001058257",
-  ".ftchinese.com/story/001058295",
-  ".ftchinese.com/story/001058328",
-  ".ftchinese.com/story/001058339",
-  ".ftchinese.com/story/001058344",
-  ".ftchinese.com/story/001058352",
-  ".ftchinese.com/story/001058413",
-  ".ftchinese.com/story/001058421",
-  ".ftchinese.com/story/001058440",
-  ".ftchinese.com/story/001058458",
-  ".ftchinese.com/story/001058468",
-  ".ftchinese.com/story/001058561",
-  ".ftchinese.com/story/001058566",
-  ".ftchinese.com/story/001058567",
-  ".ftchinese.com/story/001058585",
-  ".ftchinese.com/story/001058628",
-  ".ftchinese.com/story/001058656",
-  ".ftchinese.com/story/001058665",
-  ".ftchinese.com/story/001058678",
-  ".ftchinese.com/story/001058691",
-  ".ftchinese.com/story/001058721",
-  ".ftchinese.com/story/001058728",
-  ".ftchinese.com/story/001059464",
-  ".ftchinese.com/story/001059484",
-  ".ftchinese.com/story/001059537",
-  ".ftchinese.com/story/001059538",
-  ".ftchinese.com/story/001059551",
-  ".ftchinese.com/story/001059818",
-  ".ftchinese.com/story/001059914",
-  ".ftchinese.com/story/001059920",
-  ".ftchinese.com/story/001059957",
-  ".ftchinese.com/story/001060088",
-  ".ftchinese.com/story/001060156",
-  ".ftchinese.com/story/001060157",
-  ".ftchinese.com/story/001060160",
-  ".ftchinese.com/story/001060181",
-  ".ftchinese.com/story/001060185",
-  ".ftchinese.com/story/001060493",
-  ".ftchinese.com/story/001060495",
-  ".ftchinese.com/story/001060590",
-  ".ftchinese.com/story/001060846",
-  ".ftchinese.com/story/001060847",
-  ".ftchinese.com/story/001060875",
-  ".ftchinese.com/story/001060921",
-  ".ftchinese.com/story/001060946",
-  ".ftchinese.com/story/001061120",
-  ".ftchinese.com/story/001061474",
-  ".ftchinese.com/story/001061524",
-  ".ftchinese.com/story/001061642",
-  ".ftchinese.com/story/001062017",
-  ".ftchinese.com/story/001062020",
-  ".ftchinese.com/story/001062028",
-  ".ftchinese.com/story/001062092",
-  ".ftchinese.com/story/001062096",
-  ".ftchinese.com/story/001062147",
-  ".ftchinese.com/story/001062176",
-  ".ftchinese.com/story/001062188",
-  ".ftchinese.com/story/001062254",
-  ".ftchinese.com/story/001062374",
-  ".ftchinese.com/story/001062482",
-  ".ftchinese.com/story/001062496",
-  ".ftchinese.com/story/001062501",
-  ".ftchinese.com/story/001062508",
-  ".ftchinese.com/story/001062519",
-  ".ftchinese.com/story/001062554",
-  ".ftchinese.com/story/001062741",
-  ".ftchinese.com/story/001062794",
-  ".ftchinese.com/story/001063160",
-  ".ftchinese.com/story/001063359",
-  ".ftchinese.com/story/001063512",
-  ".ftchinese.com/story/001063668",
-  ".ftchinese.com/story/001063692",
-  ".ftchinese.com/story/001063763",
-  ".ftchinese.com/story/001063764",
-  ".ftchinese.com/story/001063826",
-  ".ftchinese.com/story/001064127",
-  ".ftchinese.com/story/001064312",
-  ".ftchinese.com/story/001064705",
-  ".ftchinese.com/story/001064807",
-  ".ftchinese.com/story/001065120",
-  ".ftchinese.com/story/001065168",
-  ".ftchinese.com/story/001065249",
-  ".ftchinese.com/story/001065287",
-  ".ftchinese.com/story/001065335",
-  ".ftchinese.com/story/001065337",
-  ".ftchinese.com/story/001065541",
-  ".ftchinese.com/story/001065715",
-  ".ftchinese.com/story/001065735",
-  ".ftchinese.com/story/001065756",
-  ".ftchinese.com/story/001065802",
-  ".ftchinese.com/story/001066112",
-  ".ftchinese.com/story/001066136",
-  ".ftchinese.com/story/001066140",
-  ".ftchinese.com/story/001066465",
-  ".ftchinese.com/story/001066881",
-  ".ftchinese.com/story/001066950",
-  ".ftchinese.com/story/001066959",
-  ".ftchinese.com/story/001067435",
-  "www.ftchinese.com/story/001067479",
-  ".ftchinese.com/story/001067528",
-  ".ftchinese.com/story/001067545",
-  ".ftchinese.com/story/001067572",
-  ".ftchinese.com/story/001067648",
-  ".ftchinese.com/story/001067650",
-  ".ftchinese.com/story/001067680",
-  ".ftchinese.com/story/001067692",
-  ".ftchinese.com/story/001067871",
-  ".ftchinese.com/story/001067923",
-  ".ftchinese.com/story/001068062",
-  ".ftchinese.com/story/001068248",
-  ".ftchinese.com/story/001068278",
-  ".ftchinese.com/story/001068379",
-  ".ftchinese.com/story/001068483",
-  ".ftchinese.com/story/001068506",
-  ".ftchinese.com/story/001068547",
-  ".ftchinese.com/story/001068616",
-  ".ftchinese.com/story/001068622",
-  ".ftchinese.com/story/001068707",
-  ".ftchinese.com/story/001069146",
-  ".ftchinese.com/story/001069373",
-  ".ftchinese.com/story/001069516",
-  ".ftchinese.com/story/001069517",
-  ".ftchinese.com/story/001069687",
-  ".ftchinese.com/story/001069741",
-  ".ftchinese.com/story/001069861",
-  ".ftchinese.com/story/001069952",
-  ".ftchinese.com/story/001070053",
-  ".ftchinese.com/story/001070177",
-  ".ftchinese.com/story/001070307",
-  ".ftchinese.com/story/001070809",
-  ".ftchinese.com/story/001070990",
-  ".ftchinese.com/story/001071042",
-  ".ftchinese.com/story/001071044",
-  ".ftchinese.com/story/001071106",
-  ".ftchinese.com/story/001071166",
-  ".ftchinese.com/story/001071181",
-  "ftchinese.com/story/001071200",
-  ".ftchinese.com/story/001071208",
-  ".ftchinese.com/story/001071238",
-  ".ftchinese.com/story/001071683",
-  ".ftchinese.com/story/001072271",
-  ".ftchinese.com/story/001072348",
-  ".ftchinese.com/story/001072677",
-  ".ftchinese.com/story/001072726",
-  ".ftchinese.com/story/001072794",
-  ".ftchinese.com/story/001072853",
-  ".ftchinese.com/story/001072895",
-  ".ftchinese.com/story/001072993",
-  ".ftchinese.com/story/001073043",
-  ".ftchinese.com/story/001073103",
-  ".ftchinese.com/story/001073157",
-  ".ftchinese.com/story/001073216",
-  ".ftchinese.com/story/001073246",
-  ".ftchinese.com/story/001073305",
-  ".ftchinese.com/story/001073307",
-  ".ftchinese.com/story/001073408",
-  ".ftchinese.com/story/001073537",
-  ".ftchinese.com/story/001073672",
-  ".ftchinese.com/story/001073849",
-  ".ftchinese.com/story/001073906",
-  ".ftchinese.com/story/001074089",
-  ".ftchinese.com/story/001074110",
-  ".ftchinese.com/story/001074128",
-  ".ftchinese.com/story/001074157",
-  ".ftchinese.com/story/001074246",
-  ".ftchinese.com/story/001074307",
-  ".ftchinese.com/story/001074347",
-  ".ftchinese.com/story/001074423",
-  ".ftchinese.com/story/001074454",
-  ".ftchinese.com/story/001074467",
-  ".ftchinese.com/story/001074493",
-  ".ftchinese.com/story/001074550",
-  ".ftchinese.com/story/001074562",
-  ".ftchinese.com/story/001074653",
-  ".ftchinese.com/story/001074693",
-  ".ftchinese.com/story/001074699",
-  ".ftchinese.com/story/001074712",
-  ".ftchinese.com/story/001074713",
-  ".ftchinese.com/story/001074768",
-  ".ftchinese.com/story/001074782",
-  ".ftchinese.com/story/001074794",
-  ".ftchinese.com/story/001074822",
-  ".ftchinese.com/story/001074874",
-  ".ftchinese.com/story/001074891",
-  ".ftchinese.com/story/001074918",
-  ".ftchinese.com/story/001075081",
-  ".ftchinese.com/story/001075134",
-  ".ftchinese.com/story/001075142",
-  ".ftchinese.com/story/001075216",
-  ".ftchinese.com/story/001075230",
-  ".ftchinese.com/story/001075238",
-  ".ftchinese.com/story/001075262",
-  ".ftchinese.com/story/001075269",
-  ".ftchinese.com/story/001075491",
-  ".ftchinese.com/story/001075500",
-  ".ftchinese.com/story/001075650",
-  ".ftchinese.com/story/001075678",
-  ".ftchinese.com/story/001075703",
-  ".ftchinese.com/story/001075739",
-  ".ftchinese.com/story/001076066",
-  ".ftchinese.com/story/001076142",
-  ".ftchinese.com/story/001076459",
-  ".ftchinese.com/story/001076470",
-  ".ftchinese.com/story/001076538",
-  ".ftchinese.com/story/001076573",
-  ".ftchinese.com/story/001076901",
-  ".ftchinese.com/story/001077067",
-  ".ftchinese.com/story/001077084",
-  ".ftchinese.com/story/001077235",
-  ".ftchinese.com/story/001077344",
-  ".ftchinese.com/story/001077390",
-  ".ftchinese.com/story/001077392",
-  ".ftchinese.com/story/001077465",
-  ".ftchinese.com/story/001077468",
-  ".ftchinese.com/story/001077492",
-  ".ftchinese.com/story/001077745",
-  ".ftchinese.com/story/001077768",
-  ".ftchinese.com/story/001077804",
-  ".ftchinese.com/story/001077852",
-  ".ftchinese.com/story/001078646",
-  ".ftchinese.com/story/001078928",
-  ".ftchinese.com/story/001078967",
-  ".ftchinese.com/story/001079559",
-  ".ftchinese.com/story/001079641",
-  ".ftchinese.com/story/001079909",
-  ".ftchinese.com/story/001079934",
-  ".ftchinese.com/story/001079992",
-  ".ftchinese.com/story/001080054",
-  ".ftchinese.com/story/001080109",
-  ".ftchinese.com/story/001080169",
-  ".ftchinese.com/story/001080226",
-  ".ftchinese.com/story/001080429",
-  ".ftchinese.com/story/001080471",
-  ".ftchinese.com/story/001080550",
-  ".ftchinese.com/story/001080581",
-  ".ftchinese.com/story/001080647",
-  ".ftchinese.com/story/001080778",
-  ".ftchinese.com/story/001080892",
-  ".ftchinese.com/story/001080915",
-  ".ftchinese.com/story/001080935",
-  ".ftchinese.com/story/001081059",
-  ".ftchinese.com/story/001081127",
-  ".ftchinese.com/tag/%E5%8D%81%E5%85%AB%E5%B1%8A%E4%B8%89%E4%B8%AD%E5%85%A8%E4%BC%9A",
-  ".ftchinese.com/tag/%E6%B8%A9%E5%AE%B6%E5%AE%9D",
-  ".ftchinese.com/tag/%E8%96%84%E7%86%99%E6%9D%A5",
-  ".ftchinese.com/video/1437",
-  ".ftchinese.com/video/1882",
-  ".ftchinese.com/video/2446",
-  ".ftchinese.com/video/2601",
-  ".ftchinese.com/comments",
+  ".ftchinese.com",
+  "||ftchinese.com",
  "||1e100.net",
  "||466453.com",
  "||abc.xyz",
@@ -1595,6 +1155,7 @@ var rules = [
  "||2008xianzhang.info",
  "||2017.hk",
  "21andy.com/blog",
+  ".21join.com",
  ".21pron.com",
  "21sextury.com",
  ".228.net.tw",
@@ -1636,9 +1197,10 @@ var rules = [
  "64wiki.com",
  ".66.ca",
  "666kb.com",
-  "6park.com",
+  ".6park.com",
  "||6park.com",
  "||6parker.com",
+  "||6parknews.com",
  "||7capture.com",
  ".7cow.com",
  ".8-d.com",
@@ -1923,6 +1485,7 @@ var rules = [
  ".avdb.tv",
  "||avdb.tv",
  ".avfantasy.com",
+  "||avg.com",
  ".avgle.com",
  "||avgle.com",
  "||avidemux.org",
@@ -2716,6 +2279,8 @@ var rules = [
  "delicious.com/GFWbookmark",
  ".democrats.org",
  "||democrats.org",
+  ".demosisto.hk",
+  "||demosisto.hk",
  "||desc.se",
  "||dessci.com",
  ".destroy-china.jp",
@@ -3416,6 +2981,7 @@ var rules = [
  "||toutyrater.github.io",
  "wsgzao.github.io",
  "|https://wsgzao.github.io",
+  "||raw.githubusercontent.com",
  ".gizlen.net",
  "||gizlen.net",
  ".gjczz.com",
@@ -4390,7 +3956,7 @@ var rules = [
  ".lsmradio.com/rad_archives",
  ".lsmwebcast.com",
  ".ltn.com.tw",
-  "|http://ltn.com.tw",
+  "||ltn.com.tw",
  ".luke54.com",
  ".luke54.org",
  ".lupm.org",
@@ -4858,6 +4424,7 @@ var rules = [
  "|http://nvtongzhisheng.org",
  ".nwtca.org",
  "|http://nyaa.eu",
+  "||nyaa.si",
  ".nydus.ca",
  "nylon-angel.com",
  "nylonstockingsonline.com",
@@ -5321,6 +4888,7 @@ var rules = [
  "||rapidmoviez.com",
  "rapidvpn.com",
  "||rapidvpn.com",
+  "||rarbgprx.org",
  ".raremovie.cc",
  "|http://raremovie.cc",
  ".raremovie.net",
@@ -6861,7 +6429,7 @@ var rules = [
  "||windscribe.com",
  "||community.windy.com",
  "||wingy.site",
-  "winning11.com",
+  ".winning11.com",
  "winwhispers.info",
  "||wiredbytes.com",
  "||wiredpen.com",
--- a/v2rayN/v2rayN/Resources/pac.txt.gz
+++ b/v2rayN/v2rayN/Resources/pac.txt.gz
--- a/v2rayN/v2rayN/Resx/ResUI.Designer.cs
+++ b/v2rayN/v2rayN/Resx/ResUI.Designer.cs
@@ -19,7 +19,7 @@ namespace v2rayN.Resx {
    // 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。
    // 若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen
    // (以 /str 作为命令选项)，或重新生成 VS 项目。
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
    internal class ResUI {
@@ -105,6 +105,15 @@ namespace v2rayN.Resx {
            }
        }
        
+        /// <summary>
+        ///   查找类似 Downloading... 的本地化字符串。
+        /// </summary>
+        internal static string Downloading {
+            get {
+                return ResourceManager.GetString("Downloading", resourceCulture);
+            }
+        }
+        
        /// <summary>
        ///   查找类似 DOWN 的本地化字符串。
        /// </summary>
@@ -267,6 +276,24 @@ namespace v2rayN.Resx {
            }
        }
        
+        /// <summary>
+        ///   查找类似 {0} already up to date. 的本地化字符串。
+        /// </summary>
+        internal static string IsLatestCore {
+            get {
+                return ResourceManager.GetString("IsLatestCore", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 {0} already up to date. 的本地化字符串。
+        /// </summary>
+        internal static string IsLatestN {
+            get {
+                return ResourceManager.GetString("IsLatestN", resourceCulture);
+            }
+        }
+        
        /// <summary>
        ///   查找类似 Address 的本地化字符串。
        /// </summary>
@@ -394,7 +421,7 @@ namespace v2rayN.Resx {
        }
        
        /// <summary>
-        ///   查找类似 Download V2rayCore successfully 的本地化字符串。
+        ///   查找类似 Download V2ray successfully 的本地化字符串。
        /// </summary>
        internal static string MsgDownloadV2rayCoreSuccessfully {
            get {
@@ -448,7 +475,7 @@ namespace v2rayN.Resx {
        }
        
        /// <summary>
-        ///   查找类似 Resolve V2rayCore successfully 的本地化字符串。
+        ///   查找类似 Resolve V2ray successfully 的本地化字符串。
        /// </summary>
        internal static string MsgParsingV2rayCoreSuccessfully {
            get {
@@ -474,6 +501,15 @@ namespace v2rayN.Resx {
            }
        }
        
+        /// <summary>
+        ///   查找类似 Start updating {0}... 的本地化字符串。
+        /// </summary>
+        internal static string MsgStartUpdating {
+            get {
+                return ResourceManager.GetString("MsgStartUpdating", resourceCulture);
+            }
+        }
+        
        /// <summary>
        ///   查找类似 Start updating PAC... 的本地化字符串。
        /// </summary>
@@ -483,15 +519,6 @@ namespace v2rayN.Resx {
            }
        }
        
-        /// <summary>
-        ///   查找类似 Start updating V2rayCore... 的本地化字符串。
-        /// </summary>
-        internal static string MsgStartUpdatingV2rayCore {
-            get {
-                return ResourceManager.GetString("MsgStartUpdatingV2rayCore", resourceCulture);
-            }
-        }
-        
        /// <summary>
        ///   查找类似 Subscription content decoding failed (non-BASE64 code) 的本地化字符串。
        /// </summary>
@@ -574,7 +601,7 @@ namespace v2rayN.Resx {
        }
        
        /// <summary>
-        ///   查找类似 V2ray-core not found, download address: {0} 的本地化字符串。
+        ///   查找类似 V2ray-core not found, please download: {0} 的本地化字符串。
        /// </summary>
        internal static string NotFoundCore {
            get {
@@ -645,6 +672,15 @@ namespace v2rayN.Resx {
            }
        }
        
+        /// <summary>
+        ///   查找类似 Servers deduplication completed. Old: {0}, New: {1}. 的本地化字符串。
+        /// </summary>
+        internal static string RemoveDuplicateServerResult {
+            get {
+                return ResourceManager.GetString("RemoveDuplicateServerResult", resourceCulture);
+            }
+        }
+        
        /// <summary>
        ///   查找类似 Are you sure to remove the server? 的本地化字符串。
        /// </summary>
@@ -691,7 +727,7 @@ namespace v2rayN.Resx {
        }
        
        /// <summary>
-        ///   查找类似 PAC failed to start. Pls with an administrator. 的本地化字符串。
+        ///   查找类似 PAC failed to start. Run it with Admin right. 的本地化字符串。
        /// </summary>
        internal static string StartPacFailed {
            get {
@@ -700,7 +736,7 @@ namespace v2rayN.Resx {
        }
        
        /// <summary>
-        ///   查找类似 Start service ({0})...... 的本地化字符串。
+        ///   查找类似 Start service ({0})... 的本地化字符串。
        /// </summary>
        internal static string StartService {
            get {
@@ -728,7 +764,7 @@ namespace v2rayN.Resx {
        }
        
        /// <summary>
-        ///   查找类似 Imported bulk URL from clipboard successfully 的本地化字符串。
+        ///   查找类似 {0} servers have been imported from clipboard. 的本地化字符串。
        /// </summary>
        internal static string SuccessfullyImportedServerViaClipboard {
            get {
@@ -744,5 +780,14 @@ namespace v2rayN.Resx {
                return ResourceManager.GetString("SuccessfullyImportedServerViaScan", resourceCulture);
            }
        }
+        
+        /// <summary>
+        ///   查找类似 The ping of current service: {0} 的本地化字符串。
+        /// </summary>
+        internal static string TestMeOutput {
+            get {
+                return ResourceManager.GetString("TestMeOutput", resourceCulture);
+            }
+        }
    }
 }
--- a/v2rayN/v2rayN/Resx/ResUI.resx
+++ b/v2rayN/v2rayN/Resx/ResUI.resx
@@ -123,9 +123,39 @@
  <data name="BatchExportURLSuccessfully" xml:space="preserve">
    <value>Batch export share URL to clipboard successfully</value>
  </data>
+  <data name="CheckServerSettings" xml:space="preserve">
+    <value>Please check the server settings first</value>
+  </data>
+  <data name="ConfigurationFormatIncorrect" xml:space="preserve">
+    <value> configuration format is incorrect</value>
+  </data>
+  <data name="CustomServerTips" xml:space="preserve">
+    <value>Note that custom configuration relies entirely on your own configuration and does not work with all settings. The system agent is available when the socks port is equal to the port in the settings in the custom configuration inbound.</value>
+  </data>
+  <data name="Downloading" xml:space="preserve">
+    <value>Downloading...</value>
+  </data>
+  <data name="downloadSpeed" xml:space="preserve">
+    <value>DOWN</value>
+  </data>
+  <data name="DownloadYesNo" xml:space="preserve">
+    <value>Whether to download? {0}</value>
+  </data>
+  <data name="FailedConversionConfiguration" xml:space="preserve">
+    <value>Failed to convert configuration file</value>
+  </data>
+  <data name="FailedGenDefaultConfiguration" xml:space="preserve">
+    <value>Failed to generate default configuration file</value>
+  </data>
+  <data name="FailedGetDefaultConfiguration" xml:space="preserve">
+    <value> Failed to get the default configuration</value>
+  </data>
  <data name="FailedImportedCustomServer" xml:space="preserve">
    <value>Failed to import custom configuration server</value>
  </data>
+  <data name="FailedReadConfiguration" xml:space="preserve">
+    <value>Failed to read configuration file</value>
+  </data>
  <data name="FillCorrectAlterId" xml:space="preserve">
    <value>Please fill in the correct format extra ID</value>
  </data>
@@ -147,75 +177,6 @@
  <data name="FillUUID" xml:space="preserve">
    <value>Please fill in the user ID</value>
  </data>
-  <data name="NeedHttpGlobalProxy" xml:space="preserve">
-    <value> This feature relies on the Http global proxy, please set it correctly first.</value>
-  </data>
-  <data name="NonVmessService" xml:space="preserve">
-    <value> non-Vmess service, this feature is invalid</value>
-  </data>
-  <data name="NoValidQRcodeFound" xml:space="preserve">
-    <value>Scan completed, no valid QR code found</value>
-  </data>
-  <data name="OperationFailed" xml:space="preserve">
-    <value> operation failed, please check retry</value>
-  </data>
-  <data name="PleaseFillRemarks" xml:space="preserve">
-    <value>Please Fill Remarks</value>
-  </data>
-  <data name="PleaseSelectEncryption" xml:space="preserve">
-    <value>Please select the encryption method</value>
-  </data>
-  <data name="PleaseSelectProtocol" xml:space="preserve">
-    <value>Please select an agreement</value>
-  </data>
-  <data name="PleaseSelectServer" xml:space="preserve">
-    <value>Please select the server first</value>
-  </data>
-  <data name="SuccessfullyImportedCustomServer" xml:space="preserve">
-    <value>Successfully imported custom configuration server</value>
-  </data>
-  <data name="SuccessfullyImportedServerViaClipboard" xml:space="preserve">
-    <value>Imported bulk URL from clipboard successfully</value>
-  </data>
-  <data name="CustomServerTips" xml:space="preserve">
-    <value>Note that custom configuration relies entirely on your own configuration and does not work with all settings. The system agent is available when the socks port is equal to the port in the settings in the custom configuration inbound.</value>
-  </data>
-  <data name="SaveClientConfigurationIn" xml:space="preserve">
-    <value>The client configuration file is saved at: {0}</value>
-  </data>
-  <data name="SaveServerConfigurationIn" xml:space="preserve">
-    <value>The server configuration file is saved at: {0}</value>
-  </data>
-  <data name="SpeedServerTips" xml:space="preserve">
-    <value>Note: After this function relies on the Http global proxy test, please manually adjust the Http global proxy and active node!</value>
-  </data>
-  <data name="SuccessfullyImportedServerViaScan" xml:space="preserve">
-    <value>Scan import URL successfully</value>
-  </data>
-  <data name="DownloadYesNo" xml:space="preserve">
-    <value>Whether to download? {0}</value>
-  </data>
-  <data name="RemoveServer" xml:space="preserve">
-    <value>Are you sure to remove the server?</value>
-  </data>
-  <data name="CheckServerSettings" xml:space="preserve">
-    <value>Please check the server settings first</value>
-  </data>
-  <data name="ConfigurationFormatIncorrect" xml:space="preserve">
-    <value> configuration format is incorrect</value>
-  </data>
-  <data name="FailedConversionConfiguration" xml:space="preserve">
-    <value>Failed to convert configuration file</value>
-  </data>
-  <data name="FailedGenDefaultConfiguration" xml:space="preserve">
-    <value>Failed to generate default configuration file</value>
-  </data>
-  <data name="FailedGetDefaultConfiguration" xml:space="preserve">
-    <value> Failed to get the default configuration</value>
-  </data>
-  <data name="FailedReadConfiguration" xml:space="preserve">
-    <value>Failed to read configuration file</value>
-  </data>
  <data name="IncorrectClientConfiguration" xml:space="preserve">
    <value> is not the correct client configuration file, please check</value>
  </data>
@@ -228,18 +189,11 @@
  <data name="InitialConfiguration" xml:space="preserve">
    <value>Initial Configuration</value>
  </data>
-  <data name="NonvmessOrssProtocol" xml:space="preserve">
-    <value>Non-vmess or ss protocol</value>
+  <data name="IsLatestCore" xml:space="preserve">
+    <value>{0} already up to date.</value>
  </data>
-  <data name="SuccessfulConfiguration" xml:space="preserve">
-    <value>Successful configuration
-{0}</value>
-  </data>
-  <data name="NotFoundCore" xml:space="preserve">
-    <value>V2ray-core not found, download address: {0}</value>
-  </data>
-  <data name="StartService" xml:space="preserve">
-    <value>Start service ({0})......</value>
+  <data name="IsLatestN" xml:space="preserve">
+    <value>{0} already up to date.</value>
  </data>
  <data name="LvAddress" xml:space="preserve">
    <value>Address</value>
@@ -262,14 +216,29 @@
  <data name="LvTestResults" xml:space="preserve">
    <value>Test Results</value>
  </data>
+  <data name="LvTodayDownloadDataAmount" xml:space="preserve">
+    <value>Today download traffic</value>
+  </data>
+  <data name="LvTodayUploadDataAmount" xml:space="preserve">
+    <value>Today upload traffic</value>
+  </data>
+  <data name="LvTotalDownloadDataAmount" xml:space="preserve">
+    <value>Total download traffic</value>
+  </data>
+  <data name="LvTotalUploadDataAmount" xml:space="preserve">
+    <value>Total upload traffic</value>
+  </data>
  <data name="LvTransportProtocol" xml:space="preserve">
    <value>Transport</value>
  </data>
+  <data name="MediumFresh" xml:space="preserve">
+    <value>MediumFresh</value>
+  </data>
  <data name="MsgClearSubscription" xml:space="preserve">
    <value>Clear original subscription content</value>
  </data>
  <data name="MsgDownloadV2rayCoreSuccessfully" xml:space="preserve">
-    <value>Download V2rayCore successfully</value>
+    <value>Download V2ray successfully</value>
  </data>
  <data name="MsgFailedImportSubscription" xml:space="preserve">
    <value>Failed to import subscription content</value>
@@ -287,7 +256,7 @@
    <value>PAC update succeeded</value>
  </data>
  <data name="MsgParsingV2rayCoreSuccessfully" xml:space="preserve">
-    <value>Resolve V2rayCore successfully</value>
+    <value>Resolve V2ray successfully</value>
  </data>
  <data name="MsgSimplifyPAC" xml:space="preserve">
    <value>Simplify PAC Success</value>
@@ -295,12 +264,12 @@
  <data name="MsgStartGettingSubscriptions" xml:space="preserve">
    <value>Start getting subscriptions</value>
  </data>
+  <data name="MsgStartUpdating" xml:space="preserve">
+    <value>Start updating {0}...</value>
+  </data>
  <data name="MsgStartUpdatingPAC" xml:space="preserve">
    <value>Start updating PAC...</value>
  </data>
-  <data name="MsgStartUpdatingV2rayCore" xml:space="preserve">
-    <value>Start updating V2rayCore...</value>
-  </data>
  <data name="MsgSubscriptionDecodingFailed" xml:space="preserve">
    <value>Subscription content decoding failed (non-BASE64 code)</value>
  </data>
@@ -319,31 +288,77 @@
  <data name="MsgUpdateV2rayCoreSuccessfullyMore" xml:space="preserve">
    <value>Update V2rayCore successfully! Restarting service...</value>
  </data>
-  <data name="MediumFresh" xml:space="preserve">
-    <value>MediumFresh</value>
+  <data name="NeedHttpGlobalProxy" xml:space="preserve">
+    <value> This feature relies on the Http global proxy, please set it correctly first.</value>
+  </data>
+  <data name="NonvmessOrssProtocol" xml:space="preserve">
+    <value>Non-vmess or ss protocol</value>
+  </data>
+  <data name="NonVmessService" xml:space="preserve">
+    <value> non-Vmess service, this feature is invalid</value>
+  </data>
+  <data name="NotFoundCore" xml:space="preserve">
+    <value>V2ray-core not found, please download: {0}</value>
+  </data>
+  <data name="NoValidQRcodeFound" xml:space="preserve">
+    <value>Scan completed, no valid QR code found</value>
+  </data>
+  <data name="OperationFailed" xml:space="preserve">
+    <value> operation failed, please check retry</value>
+  </data>
+  <data name="PleaseFillRemarks" xml:space="preserve">
+    <value>Please Fill Remarks</value>
+  </data>
+  <data name="PleaseSelectEncryption" xml:space="preserve">
+    <value>Please select the encryption method</value>
+  </data>
+  <data name="PleaseSelectProtocol" xml:space="preserve">
+    <value>Please select an agreement</value>
+  </data>
+  <data name="PleaseSelectServer" xml:space="preserve">
+    <value>Please select the server first</value>
  </data>
  <data name="QuickFresh" xml:space="preserve">
    <value>QuickFresh</value>
  </data>
+  <data name="RemoveDuplicateServerResult" xml:space="preserve">
+    <value>Servers deduplication completed. Old: {0}, New: {1}.</value>
+  </data>
+  <data name="RemoveServer" xml:space="preserve">
+    <value>Are you sure to remove the server?</value>
+  </data>
+  <data name="SaveClientConfigurationIn" xml:space="preserve">
+    <value>The client configuration file is saved at: {0}</value>
+  </data>
+  <data name="SaveServerConfigurationIn" xml:space="preserve">
+    <value>The server configuration file is saved at: {0}</value>
+  </data>
  <data name="SlowFresh" xml:space="preserve">
    <value>SlowFresh</value>
  </data>
-  <data name="downloadSpeed" xml:space="preserve">
-    <value>DOWN</value>
-  </data>
-  <data name="LvTodayDownloadDataAmount" xml:space="preserve">
-    <value>Today download traffic</value>
-  </data>
-  <data name="LvTodayUploadDataAmount" xml:space="preserve">
-    <value>Today upload traffic</value>
-  </data>
-  <data name="LvTotalDownloadDataAmount" xml:space="preserve">
-    <value>Total download traffic</value>
-  </data>
-  <data name="LvTotalUploadDataAmount" xml:space="preserve">
-    <value>Total upload traffic</value>
+  <data name="SpeedServerTips" xml:space="preserve">
+    <value>Note: After this function relies on the Http global proxy test, please manually adjust the Http global proxy and active node!</value>
  </data>
  <data name="StartPacFailed" xml:space="preserve">
-    <value>PAC failed to start. Pls with an administrator.</value>
+    <value>PAC failed to start. Run it with Admin right.</value>
+  </data>
+  <data name="StartService" xml:space="preserve">
+    <value>Start service ({0})...</value>
+  </data>
+  <data name="SuccessfulConfiguration" xml:space="preserve">
+    <value>Successful configuration
+{0}</value>
+  </data>
+  <data name="SuccessfullyImportedCustomServer" xml:space="preserve">
+    <value>Successfully imported custom configuration server</value>
+  </data>
+  <data name="SuccessfullyImportedServerViaClipboard" xml:space="preserve">
+    <value>{0} servers have been imported from clipboard.</value>
+  </data>
+  <data name="SuccessfullyImportedServerViaScan" xml:space="preserve">
+    <value>Scan import URL successfully</value>
+  </data>
+  <data name="TestMeOutput" xml:space="preserve">
+    <value>The ping of current service: {0}</value>
  </data>
 </root>
--- a/v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx
+++ b/v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx
@@ -123,9 +123,39 @@
  <data name="BatchExportURLSuccessfully" xml:space="preserve">
    <value>批量导出分享URL至剪贴板成功</value>
  </data>
+  <data name="CheckServerSettings" xml:space="preserve">
+    <value>请先检查服务器设置</value>
+  </data>
+  <data name="ConfigurationFormatIncorrect" xml:space="preserve">
+    <value>配置格式不正确</value>
+  </data>
+  <data name="CustomServerTips" xml:space="preserve">
+    <value>注意,自定义配置完全依赖您自己的配置，不能使用所有设置功能。在自定义配置inbound中有socks port等于设置中的port时，系统代理才可用</value>
+  </data>
+  <data name="Downloading" xml:space="preserve">
+    <value>下载开始...</value>
+  </data>
+  <data name="downloadSpeed" xml:space="preserve">
+    <value>下载</value>
+  </data>
+  <data name="DownloadYesNo" xml:space="preserve">
+    <value>是否下载? {0}</value>
+  </data>
+  <data name="FailedConversionConfiguration" xml:space="preserve">
+    <value>转换配置文件失败</value>
+  </data>
+  <data name="FailedGenDefaultConfiguration" xml:space="preserve">
+    <value>生成默认配置文件失败</value>
+  </data>
+  <data name="FailedGetDefaultConfiguration" xml:space="preserve">
+    <value>取得默认配置失败</value>
+  </data>
  <data name="FailedImportedCustomServer" xml:space="preserve">
    <value>导入自定义配置服务器失败</value>
  </data>
+  <data name="FailedReadConfiguration" xml:space="preserve">
+    <value>读取配置文件失败</value>
+  </data>
  <data name="FillCorrectAlterId" xml:space="preserve">
    <value>请填写正确格式额外ID</value>
  </data>
@@ -147,75 +177,6 @@
  <data name="FillUUID" xml:space="preserve">
    <value>请填写用户ID</value>
  </data>
-  <data name="NeedHttpGlobalProxy" xml:space="preserve">
-    <value>此功能依赖Http全局代理,请先设置正确。</value>
-  </data>
-  <data name="NonVmessService" xml:space="preserve">
-    <value>非Vmess服务，此功能无效</value>
-  </data>
-  <data name="NoValidQRcodeFound" xml:space="preserve">
-    <value>扫描完成,未发现有效二维码</value>
-  </data>
-  <data name="OperationFailed" xml:space="preserve">
-    <value>操作失败，请检查重试</value>
-  </data>
-  <data name="PleaseFillRemarks" xml:space="preserve">
-    <value>请填写备注</value>
-  </data>
-  <data name="PleaseSelectEncryption" xml:space="preserve">
-    <value>请选择加密方式</value>
-  </data>
-  <data name="PleaseSelectProtocol" xml:space="preserve">
-    <value>请选择协议</value>
-  </data>
-  <data name="PleaseSelectServer" xml:space="preserve">
-    <value>请先选择服务器</value>
-  </data>
-  <data name="SuccessfullyImportedCustomServer" xml:space="preserve">
-    <value>成功导入自定义配置服务器</value>
-  </data>
-  <data name="SuccessfullyImportedServerViaClipboard" xml:space="preserve">
-    <value>从剪贴板导入批量URL成功</value>
-  </data>
-  <data name="CustomServerTips" xml:space="preserve">
-    <value>注意,自定义配置完全依赖您自己的配置，不能使用所有设置功能。在自定义配置inbound中有socks port等于设置中的port时，系统代理才可用</value>
-  </data>
-  <data name="SaveClientConfigurationIn" xml:space="preserve">
-    <value>客户端配置文件保存在:{0}</value>
-  </data>
-  <data name="SaveServerConfigurationIn" xml:space="preserve">
-    <value>服务端配置文件保存在:{0}</value>
-  </data>
-  <data name="SpeedServerTips" xml:space="preserve">
-    <value>注意：此功能依赖Http全局代理!测试完成后,请手工调整Http全局代理和活动节点。</value>
-  </data>
-  <data name="SuccessfullyImportedServerViaScan" xml:space="preserve">
-    <value>扫描导入URL成功</value>
-  </data>
-  <data name="DownloadYesNo" xml:space="preserve">
-    <value>是否下载? {0}</value>
-  </data>
-  <data name="RemoveServer" xml:space="preserve">
-    <value>是否确定移除服务器?</value>
-  </data>
-  <data name="CheckServerSettings" xml:space="preserve">
-    <value>请先检查服务器设置</value>
-  </data>
-  <data name="ConfigurationFormatIncorrect" xml:space="preserve">
-    <value>配置格式不正确</value>
-  </data>
-  <data name="FailedConversionConfiguration" xml:space="preserve">
-    <value>转换配置文件失败</value>
-  </data>
-  <data name="FailedGenDefaultConfiguration" xml:space="preserve">
-    <value>生成默认配置文件失败</value>
-  </data>
-  <data name="FailedGetDefaultConfiguration" xml:space="preserve">
-    <value>取得默认配置失败</value>
-  </data>
-  <data name="FailedReadConfiguration" xml:space="preserve">
-    <value>读取配置文件失败</value>
-  </data>
  <data name="IncorrectClientConfiguration" xml:space="preserve">
    <value>不是正确的客户端配置文件，请检查</value>
  </data>
@@ -228,18 +189,11 @@
  <data name="InitialConfiguration" xml:space="preserve">
    <value>初始化配置</value>
  </data>
-  <data name="NonvmessOrssProtocol" xml:space="preserve">
-    <value>非vmess或ss协议</value>
+  <data name="IsLatestCore" xml:space="preserve">
+    <value>{0} 已是最新版本。</value>
  </data>
-  <data name="SuccessfulConfiguration" xml:space="preserve">
-    <value>配置成功
-{0}</value>
-  </data>
-  <data name="NotFoundCore" xml:space="preserve">
-    <value>未找到v2ray-core,下载地址:{0}</value>
-  </data>
-  <data name="StartService" xml:space="preserve">
-    <value>启动服务({0})......</value>
+  <data name="IsLatestN" xml:space="preserve">
+    <value>{0} 已是最新版本。</value>
  </data>
  <data name="LvAddress" xml:space="preserve">
    <value>地址</value>
@@ -254,7 +208,7 @@
    <value>端口</value>
  </data>
  <data name="LvServiceType" xml:space="preserve">
-    <value>服务类型</value>
+    <value>类型</value>
  </data>
  <data name="LvSubscription" xml:space="preserve">
    <value>订阅</value>
@@ -262,14 +216,29 @@
  <data name="LvTestResults" xml:space="preserve">
    <value>测试结果</value>
  </data>
+  <data name="LvTodayDownloadDataAmount" xml:space="preserve">
+    <value>今日下载</value>
+  </data>
+  <data name="LvTodayUploadDataAmount" xml:space="preserve">
+    <value>今日上传</value>
+  </data>
+  <data name="LvTotalDownloadDataAmount" xml:space="preserve">
+    <value>总下载</value>
+  </data>
+  <data name="LvTotalUploadDataAmount" xml:space="preserve">
+    <value>总上传</value>
+  </data>
  <data name="LvTransportProtocol" xml:space="preserve">
    <value>传输协议</value>
  </data>
+  <data name="MediumFresh" xml:space="preserve">
+    <value>中等</value>
+  </data>
  <data name="MsgClearSubscription" xml:space="preserve">
    <value>清除原订阅内容</value>
  </data>
  <data name="MsgDownloadV2rayCoreSuccessfully" xml:space="preserve">
-    <value>下载V2rayCore成功</value>
+    <value>下载V2ray成功</value>
  </data>
  <data name="MsgFailedImportSubscription" xml:space="preserve">
    <value>导入订阅内容失败</value>
@@ -287,7 +256,7 @@
    <value>PAC更新成功</value>
  </data>
  <data name="MsgParsingV2rayCoreSuccessfully" xml:space="preserve">
-    <value>解析V2rayCore成功</value>
+    <value>解析V2ray成功</value>
  </data>
  <data name="MsgSimplifyPAC" xml:space="preserve">
    <value>简化PAC成功</value>
@@ -295,11 +264,11 @@
  <data name="MsgStartGettingSubscriptions" xml:space="preserve">
    <value>开始获取订阅内容</value>
  </data>
-  <data name="MsgStartUpdatingPAC" xml:space="preserve">
-    <value>开始更新PAC...</value>
+  <data name="MsgStartUpdating" xml:space="preserve">
+    <value>开始更新 {0}...</value>
  </data>
-  <data name="MsgStartUpdatingV2rayCore" xml:space="preserve">
-    <value>开始更新V2rayCore...</value>
+  <data name="MsgStartUpdatingPAC" xml:space="preserve">
+    <value>开始更新 PAC...</value>
  </data>
  <data name="MsgSubscriptionDecodingFailed" xml:space="preserve">
    <value>订阅内容解码失败(非BASE64码)</value>
@@ -319,31 +288,77 @@
  <data name="MsgUpdateV2rayCoreSuccessfullyMore" xml:space="preserve">
    <value>更新V2rayCore成功！正在重启服务...</value>
  </data>
-  <data name="MediumFresh" xml:space="preserve">
-    <value>中等</value>
+  <data name="NeedHttpGlobalProxy" xml:space="preserve">
+    <value>此功能依赖Http全局代理,请先设置正确。</value>
+  </data>
+  <data name="NonvmessOrssProtocol" xml:space="preserve">
+    <value>非vmess或ss协议</value>
+  </data>
+  <data name="NonVmessService" xml:space="preserve">
+    <value>非Vmess服务，此功能无效</value>
+  </data>
+  <data name="NotFoundCore" xml:space="preserve">
+    <value>找不到 v2ray-core，下载地址: {0}</value>
+  </data>
+  <data name="NoValidQRcodeFound" xml:space="preserve">
+    <value>扫描完成,未发现有效二维码</value>
+  </data>
+  <data name="OperationFailed" xml:space="preserve">
+    <value>操作失败，请检查重试</value>
+  </data>
+  <data name="PleaseFillRemarks" xml:space="preserve">
+    <value>请填写备注</value>
+  </data>
+  <data name="PleaseSelectEncryption" xml:space="preserve">
+    <value>请选择加密方式</value>
+  </data>
+  <data name="PleaseSelectProtocol" xml:space="preserve">
+    <value>请选择协议</value>
+  </data>
+  <data name="PleaseSelectServer" xml:space="preserve">
+    <value>请先选择服务器</value>
  </data>
  <data name="QuickFresh" xml:space="preserve">
    <value>快</value>
  </data>
+  <data name="RemoveDuplicateServerResult" xml:space="preserve">
+    <value>服务器去重完成。原数量: {0}，现数量: {1}</value>
+  </data>
+  <data name="RemoveServer" xml:space="preserve">
+    <value>是否确定移除服务器?</value>
+  </data>
+  <data name="SaveClientConfigurationIn" xml:space="preserve">
+    <value>客户端配置文件保存在:{0}</value>
+  </data>
+  <data name="SaveServerConfigurationIn" xml:space="preserve">
+    <value>服务端配置文件保存在:{0}</value>
+  </data>
  <data name="SlowFresh" xml:space="preserve">
    <value>慢</value>
  </data>
-  <data name="downloadSpeed" xml:space="preserve">
-    <value>下载</value>
-  </data>
-  <data name="LvTodayDownloadDataAmount" xml:space="preserve">
-    <value>今日下载</value>
-  </data>
-  <data name="LvTodayUploadDataAmount" xml:space="preserve">
-    <value>今日上传</value>
-  </data>
-  <data name="LvTotalDownloadDataAmount" xml:space="preserve">
-    <value>总下载</value>
-  </data>
-  <data name="LvTotalUploadDataAmount" xml:space="preserve">
-    <value>总上传</value>
+  <data name="SpeedServerTips" xml:space="preserve">
+    <value>注意：此功能依赖Http全局代理!测试完成后,请手工调整Http全局代理和活动节点。</value>
  </data>
  <data name="StartPacFailed" xml:space="preserve">
    <value>PAC服务启动失败,请用管理员启动</value>
  </data>
+  <data name="StartService" xml:space="preserve">
+    <value>启动服务({0})...</value>
+  </data>
+  <data name="SuccessfulConfiguration" xml:space="preserve">
+    <value>配置成功
+{0}</value>
+  </data>
+  <data name="SuccessfullyImportedCustomServer" xml:space="preserve">
+    <value>成功导入自定义配置服务器</value>
+  </data>
+  <data name="SuccessfullyImportedServerViaClipboard" xml:space="preserve">
+    <value>成功从剪贴板导入 {0} 个服务器</value>
+  </data>
+  <data name="SuccessfullyImportedServerViaScan" xml:space="preserve">
+    <value>扫描导入URL成功</value>
+  </data>
+  <data name="TestMeOutput" xml:space="preserve">
+    <value>当前服务的真连接延迟: {0}</value>
+  </data>
 </root>
--- a/v2rayN/v2rayN/Sample/SampleClientConfig.txt
+++ b/v2rayN/v2rayN/Sample/SampleClientConfig.txt
@@ -76,7 +76,7 @@
 		"domainStrategy": "IPIfNonMatch",
 		"rules": [
 				{
-                    "inboundTag": "api",
+                    "inboundTag": ["api"],
                    "outboundTag": "api",
                    "type": "field"
                }
--- a/v2rayN/v2rayN/Sample/custom_routing_block
+++ b/v2rayN/v2rayN/Sample/custom_routing_block
@@ -0,0 +1 @@
+geosite:category-ads,
--- a/v2rayN/v2rayN/Sample/custom_routing_direct
+++ b/v2rayN/v2rayN/Sample/custom_routing_direct
@@ -0,0 +1,132 @@
+domain:12306.com,
+domain:51ym.me,
+domain:52pojie.cn,
+domain:8686c.com,
+domain:abercrombie.com,
+domain:adobesc.com,
+domain:air-matters.com,
+domain:air-matters.io,
+domain:airtable.com,
+domain:akadns.net,
+domain:apache.org,
+domain:api.crisp.chat,
+domain:api.termius.com,
+domain:appshike.com,
+domain:appstore.com,
+domain:aweme.snssdk.com,
+domain:bababian.com,
+domain:battle.net,
+domain:beatsbydre.com,
+domain:bet365.com,
+domain:bilibili.cn,
+domain:ccgslb.com,
+domain:ccgslb.net,
+domain:chunbo.com,
+domain:chunboimg.com,
+domain:clashroyaleapp.com,
+domain:cloudsigma.com,
+domain:cloudxns.net,
+domain:cmfu.com,
+domain:culturedcode.com,
+domain:dct-cloud.com,
+domain:didialift.com,
+domain:douyutv.com,
+domain:duokan.com,
+domain:dytt8.net,
+domain:easou.com,
+domain:ecitic.net,
+domain:eclipse.org,
+domain:eudic.net,
+domain:ewqcxz.com,
+domain:fir.im,
+domain:frdic.com,
+domain:fresh-ideas.cc,
+domain:godic.net,
+domain:goodread.com,
+domain:haibian.com,
+domain:hdslb.net,
+domain:hollisterco.com,
+domain:hongxiu.com,
+domain:hxcdn.net,
+domain:images.unsplash.com,
+domain:img4me.com,
+domain:ipify.org,
+domain:ixdzs.com,
+domain:jd.hk,
+domain:jianshuapi.com,
+domain:jomodns.com,
+domain:jsboxbbs.com,
+domain:knewone.com,
+domain:kuaidi100.com,
+domain:lemicp.com,
+domain:letvcloud.com,
+domain:lizhi.io,
+domain:localizecdn.com,
+domain:lucifr.com,
+domain:luoo.net,
+domain:mai.tn,
+domain:maven.org,
+domain:miwifi.com,
+domain:moji.com,
+domain:moke.com,
+domain:mtalk.google.com,
+domain:mxhichina.com,
+domain:myqcloud.com,
+domain:myunlu.com,
+domain:netease.com,
+domain:nfoservers.com,
+domain:nssurge.com,
+domain:nuomi.com,
+domain:ourdvs.com,
+domain:overcast.fm,
+domain:paypal.com,
+domain:paypalobjects.com,
+domain:pgyer.com,
+domain:qdaily.com,
+domain:qdmm.com,
+domain:qin.io,
+domain:qingmang.me,
+domain:qingmang.mobi,
+domain:qqurl.com,
+domain:rarbg.to,
+domain:rrmj.tv,
+domain:ruguoapp.com,
+domain:sm.ms,
+domain:snwx.com,
+domain:soku.com,
+domain:startssl.com,
+domain:store.steampowered.com,
+domain:symcd.com,
+domain:teamviewer.com,
+domain:tmzvps.com,
+domain:trello.com,
+domain:trellocdn.com,
+domain:ttmeiju.com,
+domain:udache.com,
+domain:uxengine.net,
+domain:weather.bjango.com,
+domain:weather.com,
+domain:webqxs.com,
+domain:weico.cc,
+domain:wenku8.net,
+domain:werewolf.53site.com,
+domain:windowsupdate.com,
+domain:wkcdn.com,
+domain:workflowy.com,
+domain:xdrig.com,
+domain:xiaojukeji.com,
+domain:xiaomi.net,
+domain:xiaomicp.com,
+domain:ximalaya.com,
+domain:xitek.com,
+domain:xmcdn.com,
+domain:xslb.net,
+domain:xteko.com,
+domain:yach.me,
+domain:yixia.com,
+domain:yunjiasu-cdn.net,
+domain:zealer.com,
+domain:zgslb.net,
+domain:zimuzu.tv,
+domain:zmz002.com,
+domain:samsungdm.com,
--- a/v2rayN/v2rayN/Sample/custom_routing_proxy
+++ b/v2rayN/v2rayN/Sample/custom_routing_proxy
@@ -0,0 +1,33 @@
+geosite:google,
+geosite:github,
+geosite:netflix,
+geosite:steam,
+geosite:telegram,
+geosite:tumblr,
+geosite:speedtest,
+geosite:bbc,
+domain:gvt1.com,
+domain:textnow.com,
+domain:twitch.tv,
+domain:wikileaks.org,
+domain:naver.com,
+91.108.4.0/22,
+91.108.8.0/22,
+91.108.12.0/22,
+91.108.20.0/22,
+91.108.36.0/23,
+91.108.38.0/23,
+91.108.56.0/22,
+149.154.160.0/20,
+149.154.164.0/22,
+149.154.172.0/22,
+74.125.0.0/16,
+173.194.0.0/16,
+172.217.0.0/16,
+216.58.200.0/24,
+216.58.220.0/24,
+91.108.56.116,
+91.108.56.0/24,
+109.239.140.0/24,
+149.154.167.0/24,
+149.154.175.0/24,
--- a/v2rayN/v2rayN/Tool/FileManager.cs
+++ b/v2rayN/v2rayN/Tool/FileManager.cs
@@ -11,7 +11,7 @@ namespace v2rayN.Tool
        {
            try
            {
-                using (var fs = new FileStream(fileName, FileMode.Create, FileAccess.Write))
+                using (FileStream fs = new FileStream(fileName, FileMode.Create, FileAccess.Write))
                    fs.Write(content, 0, content.Length);
                return true;
            }
@@ -24,20 +24,27 @@ namespace v2rayN.Tool

        public static void UncompressFile(string fileName, byte[] content)
        {
-            // Because the uncompressed size of the file is unknown,
-            // we are using an arbitrary buffer size.
-            byte[] buffer = new byte[4096];
-            int n;
-
-            using (var fs = File.Create(fileName))
-            using (var input = new GZipStream(new MemoryStream(content),
-                    CompressionMode.Decompress, false))
+            try
            {
-                while ((n = input.Read(buffer, 0, buffer.Length)) > 0)
+                // Because the uncompressed size of the file is unknown,
+                // we are using an arbitrary buffer size.
+                byte[] buffer = new byte[4096];
+                int n;
+
+                using (FileStream fs = File.Create(fileName))
+                using (GZipStream input = new GZipStream(new MemoryStream(content),
+                        CompressionMode.Decompress, false))
                {
-                    fs.Write(buffer, 0, n);
+                    while ((n = input.Read(buffer, 0, buffer.Length)) > 0)
+                    {
+                        fs.Write(buffer, 0, n);
+                    }
                }
            }
+            catch (Exception ex)
+            {
+                Utils.SaveLog(ex.Message, ex);
+            }
        }

        public static string NonExclusiveReadAllText(string path)
@@ -49,8 +56,8 @@ namespace v2rayN.Tool
        {
            try
            {
-                using (var fs = new FileStream(path, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
-                using (var sr = new StreamReader(fs, encoding))
+                using (FileStream fs = new FileStream(path, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
+                using (StreamReader sr = new StreamReader(fs, encoding))
                {
                    return sr.ReadToEnd();
                }
@@ -61,5 +68,61 @@ namespace v2rayN.Tool
                throw ex;
            }
        }
+        public static bool ZipExtractToFile(string fileName)
+        {
+            try
+            {
+                using (ZipArchive archive = ZipFile.OpenRead(fileName))
+                {
+                    foreach (ZipArchiveEntry entry in archive.Entries)
+                    {
+                        if (entry.Length == 0)
+                        {
+                            continue;
+                        }
+                        try
+                        {
+                            entry.ExtractToFile(Utils.GetPath(entry.Name), true);
+                        }
+                        catch (IOException ex)
+                        {
+                            Utils.SaveLog(ex.Message, ex);
+                        }
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                Utils.SaveLog(ex.Message, ex);
+                return false;
+            }
+            return true;
+        }
+
+        public static bool ZipExtractToFullFile(string fileName)
+        {
+            try
+            {
+                using (ZipArchive archive = ZipFile.OpenRead(fileName))
+                {
+                    foreach (ZipArchiveEntry entry in archive.Entries)
+                    {
+                        if (entry.Length == 0)
+                            continue;
+
+                        string entryOuputPath = Utils.GetPath(entry.FullName);
+                        FileInfo fileInfo = new FileInfo(entryOuputPath);
+                        fileInfo.Directory.Create();
+                        entry.ExtractToFile(entryOuputPath, true);
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                Utils.SaveLog(ex.Message, ex);
+                return false;
+            }
+            return true;
+        }
    }
 }
--- a/v2rayN/v2rayN/Tool/Job.cs
+++ b/v2rayN/v2rayN/Tool/Job.cs
@@ -16,13 +16,13 @@ namespace v2rayN
        public Job()
        {
            handle = CreateJobObject(IntPtr.Zero, null);
-            var extendedInfoPtr = IntPtr.Zero;
-            var info = new JOBOBJECT_BASIC_LIMIT_INFORMATION
+            IntPtr extendedInfoPtr = IntPtr.Zero;
+            JOBOBJECT_BASIC_LIMIT_INFORMATION info = new JOBOBJECT_BASIC_LIMIT_INFORMATION
            {
                LimitFlags = 0x2000
            };

-            var extendedInfo = new JOBOBJECT_EXTENDED_LIMIT_INFORMATION
+            JOBOBJECT_EXTENDED_LIMIT_INFORMATION extendedInfo = new JOBOBJECT_EXTENDED_LIMIT_INFORMATION
            {
                BasicLimitInformation = info
            };
@@ -43,18 +43,17 @@ namespace v2rayN
                if (extendedInfoPtr != IntPtr.Zero)
                {
                    Marshal.FreeHGlobal(extendedInfoPtr);
-                    extendedInfoPtr = IntPtr.Zero;
                }
            }
        }

        public bool AddProcess(IntPtr processHandle)
        {
-            var succ = AssignProcessToJobObject(handle, processHandle);
+            bool succ = AssignProcessToJobObject(handle, processHandle);

            if (!succ)
            {
-                //Logging.Error("Failed to call AssignProcessToJobObject! GetLastError=" + Marshal.GetLastWin32Error());
+                Utils.SaveLog("Failed to call AssignProcessToJobObject! GetLastError=" + Marshal.GetLastWin32Error());
            }

            return succ;
--- a/v2rayN/v2rayN/Tool/UI.cs
+++ b/v2rayN/v2rayN/Tool/UI.cs
@@ -1,5 +1,4 @@
-using System.Globalization;
-using System.Windows.Forms;
+using System.Windows.Forms;

 namespace v2rayN
 {
@@ -7,12 +6,20 @@ namespace v2rayN
    {
        public static void Show(string msg)
        {
-            MessageBox.Show(msg);
+            MessageBox.Show(msg, "v2rayN", MessageBoxButtons.OK, MessageBoxIcon.Information);
+        }
+        public static void ShowWarning(string msg)
+        {
+            MessageBox.Show(msg, "v2rayN", MessageBoxButtons.OK, MessageBoxIcon.Warning);
+        }
+        public static void ShowError(string msg)
+        {
+            MessageBox.Show(msg, "v2rayN", MessageBoxButtons.OK, MessageBoxIcon.Error);
        }

        public static DialogResult ShowYesNo(string msg)
        {
-            return MessageBox.Show(msg, "YesNo", MessageBoxButtons.YesNo);
+            return MessageBox.Show(msg, "v2rayN", MessageBoxButtons.YesNo, MessageBoxIcon.Question);
        }

        //public static string GetResourseString(string key)
--- a/v2rayN/v2rayN/Tool/UIRes.cs
+++ b/v2rayN/v2rayN/Tool/UIRes.cs
@@ -10,7 +10,7 @@ namespace v2rayN

        static string LoadString(ResourceManager resMgr, string key)
        {
-            var value = resMgr.GetString(key);
+            string value = resMgr.GetString(key);
            if (value == null)
            {
                throw new KeyNotFoundException($"key: {key}");
--- a/v2rayN/v2rayN/Tool/Utils.cs
+++ b/v2rayN/v2rayN/Tool/Utils.cs
@@ -18,6 +18,7 @@ using ZXing;
 using ZXing.Common;
 using ZXing.QrCode;
 using System.Security.Principal;
+using v2rayN.Base;

 namespace v2rayN
 {
@@ -38,7 +39,7 @@ namespace v2rayN

            try
            {
-                var assembly = Assembly.GetExecutingAssembly();
+                Assembly assembly = Assembly.GetExecutingAssembly();
                using (Stream stream = assembly.GetManifestResourceStream(res))
                using (StreamReader reader = new StreamReader(stream))
                {
@@ -120,10 +121,10 @@ namespace v2rayN
        /// <returns></returns>
        public static int ToJsonFile(Object obj, string filePath)
        {
-            int result = -1;
+            int result;
            try
            {
-                using (StreamWriter file = System.IO.File.CreateText(filePath))
+                using (StreamWriter file = File.CreateText(filePath))
                {
                    //JsonSerializer serializer = new JsonSerializer();
                    JsonSerializer serializer = new JsonSerializer() { Formatting = Formatting.Indented };
@@ -154,7 +155,7 @@ namespace v2rayN
            {
                if (wrap)
                {
-                    return string.Join(",\r\n", lst.ToArray());
+                    return string.Join("," + Environment.NewLine, lst.ToArray());
                }
                else
                {
@@ -175,7 +176,7 @@ namespace v2rayN
        {
            try
            {
-                str = str.Replace("\r\n", "");
+                str = str.Replace(Environment.NewLine, "");
                return new List<string>(str.Split(new string[] { "," }, StringSplitOptions.RemoveEmptyEntries));
            }
            catch
@@ -193,7 +194,7 @@ namespace v2rayN
        {
            try
            {
-                var plainTextBytes = System.Text.Encoding.UTF8.GetBytes(plainText);
+                byte[] plainTextBytes = Encoding.UTF8.GetBytes(plainText);
                return Convert.ToBase64String(plainTextBytes);
            }
            catch (Exception ex)
@@ -213,8 +214,8 @@ namespace v2rayN
            try
            {
                plainText = plainText.TrimEx()
+                  .Replace(Environment.NewLine, "")
                  .Replace("\n", "")
-                  .Replace("\r\n", "")
                  .Replace("\r", "")
                  .Replace(" ", "");

@@ -271,20 +272,20 @@ namespace v2rayN
        /// <param name="unit">单位</param>
        public static void ToHumanReadable(ulong amount, out double result, out string unit)
        {
-            var factor = 1024u;
-            var KBs = amount / factor;
+            uint factor = 1024u;
+            ulong KBs = amount / factor;
            if (KBs > 0)
            {
                // multi KB
-                var MBs = KBs / factor;
+                ulong MBs = KBs / factor;
                if (MBs > 0)
                {
                    // multi MB
-                    var GBs = MBs / factor;
+                    ulong GBs = MBs / factor;
                    if (GBs > 0)
                    {
                        // multi GB
-                        var TBs = GBs / factor;
+                        ulong TBs = GBs / factor;
                        if (TBs > 0)
                        {
                            // 你是魔鬼吗？ 用这么多流量
@@ -313,23 +314,39 @@ namespace v2rayN

        public static string HumanFy(ulong amount)
        {
-            double result;
-            string unit;
-            ToHumanReadable(amount, out result, out unit);
-            return $"{string.Format("{0:f1}", result)}{unit}";
+            ToHumanReadable(amount, out double result, out string unit);
+            return $"{string.Format("{0:f1}", result)} {unit}";
        }

-        public static void DedupServerList(List<Mode.VmessItem> source, out List<Mode.VmessItem> result)
+        public static void DedupServerList(List<Mode.VmessItem> source, out List<Mode.VmessItem> result, bool keepOlder)
        {
-            var list = new List<Mode.VmessItem>();
-            foreach (var item in source)
+            List<Mode.VmessItem> list = new List<Mode.VmessItem>();
+            if (!keepOlder) source.Reverse(); // Remove the early items first
+
+            bool _isAdded(Mode.VmessItem o, Mode.VmessItem n)
            {
-                if (!list.Exists(i => item.address == i.address && item.port == i.port && item.path == i.path))
+                return o.configVersion == n.configVersion &&
+                    o.configType == n.configType &&
+                    o.address == n.address &&
+                    o.port == n.port &&
+                    o.id == n.id &&
+                    o.alterId == n.alterId &&
+                    o.security == n.security &&
+                    o.network == n.network &&
+                    o.headerType == n.headerType &&
+                    o.requestHost == n.requestHost &&
+                    o.path == n.path &&
+                    o.streamSecurity == n.streamSecurity;
+                // skip (will remove) different remarks
+            }
+            foreach (Mode.VmessItem item in source)
+            {
+                if (!list.Exists(i => _isAdded(i, item)))
                {
                    list.Add(item);
                }
            }
-
+            if (!keepOlder) list.Reverse();
            result = list;
        }

@@ -347,7 +364,7 @@ namespace v2rayN
        {
            try
            {
-                int var1 = Utils.ToInt(oText);
+                int var1 = ToInt(oText);
                return true;
            }
            catch
@@ -391,7 +408,7 @@ namespace v2rayN
            //可能是CIDR
            if (ip.IndexOf(@"/") > 0)
            {
-                var cidr = ip.Split('/');
+                string[] cidr = ip.Split('/');
                if (cidr.Length == 2)
                {
                    if (!IsNumberic(cidr[0]))
@@ -442,15 +459,6 @@ namespace v2rayN
            return Regex.IsMatch(input, pattern, RegexOptions.IgnoreCase);
        }

-        public static bool IsIdenticalServer(Mode.ServerStatistics a, Mode.ServerStatistics b)
-        {
-            return (a.address == b.address
-                    && a.port == b.port
-                    && a.path == b.path
-                    && a.host == b.host
-                );
-        }
-
        #endregion

        #region 开机自动启动
@@ -477,24 +485,16 @@ namespace v2rayN
        /// </summary>
        /// <param name="run"></param>
        /// <returns></returns>
-        public static int SetAutoRun(bool run)
+        public static void SetAutoRun(bool run)
        {
            try
            {
-                if (run)
-                {
-                    string exePath = GetExePath();
-                    RegWriteValue(autoRunRegPath, autoRunName, exePath);
-                }
-                else
-                {
-                    RegWriteValue(autoRunRegPath, autoRunName, "");
-                }
+                string exePath = GetExePath();
+                RegWriteValue(autoRunRegPath, autoRunName, run ? exePath : "");
            }
            catch
            {
            }
-            return 0;
        }

        /// <summary>
@@ -505,7 +505,7 @@ namespace v2rayN
        {
            try
            {
-                var value = RegReadValue(autoRunRegPath, autoRunName, "");
+                string value = RegReadValue(autoRunRegPath, autoRunName, "");
                string exePath = GetExePath();
                if (value?.Equals(exePath) == true)
                {
@@ -525,7 +525,7 @@ namespace v2rayN
        public static string GetPath(string fileName)
        {
            string startupPath = StartupPath();
-            if (Utils.IsNullOrEmpty(fileName))
+            if (IsNullOrEmpty(fileName))
            {
                return startupPath;
            }
@@ -543,15 +543,7 @@ namespace v2rayN

        public static string StartupPath()
        {
-            try
-            {
-                string exePath = GetExePath();
-                return exePath.Substring(0, exePath.LastIndexOf("\\", StringComparison.Ordinal));
-            }
-            catch
-            {
-                return Application.StartupPath;
-            }
+            return Application.StartupPath;
        }

        public static string RegReadValue(string path, string name, string def)
@@ -617,7 +609,7 @@ namespace v2rayN
            long roundtripTime = -1;
            try
            {
-                int timeout = 120;
+                int timeout = 30;
                int echoNum = 2;
                Ping pingSender = new Ping();
                for (int i = 0; i < echoNum; i++)
@@ -665,7 +657,14 @@ namespace v2rayN
            return lstIPAddress;
        }

-
+        public static void SetSecurityProtocol()
+        {
+            ServicePointManager.SecurityProtocol = SecurityProtocolType.Ssl3
+                                       | SecurityProtocolType.Tls
+                                       | SecurityProtocolType.Tls11
+                                       | SecurityProtocolType.Tls12;
+            ServicePointManager.DefaultConnectionLimit = 256;
+        }
        #endregion

        #region 杂项
@@ -787,16 +786,13 @@ namespace v2rayN

        #region TempPath

-        private static string _tempPath = null;
-
        // return path to store temporary files
        public static string GetTempPath()
        {
-            if (_tempPath == null)
+            string _tempPath = Path.Combine(StartupPath(), "v2ray_win_temp");
+            if (!Directory.Exists(_tempPath))
            {
-                Directory.CreateDirectory(Path.Combine(StartupPath(), "v2ray_win_temp"));
-                // don't use "/", it will fail when we call explorer /select xxx/ss_win_temp\xxx.log
-                _tempPath = Path.Combine(StartupPath(), "v2ray_win_temp");
+                Directory.CreateDirectory(_tempPath);
            }
            return _tempPath;
        }
@@ -804,31 +800,18 @@ namespace v2rayN
        public static string GetTempPath(string filename)
        {
            return Path.Combine(GetTempPath(), filename);
-        }
-
-        public static void ClearTempPath()
-        {
-            //Directory.Delete(GetTempPath(), true);
-            //_tempPath = null;
-        }
+        }              

        public static string UnGzip(byte[] buf)
        {
-            byte[] buffer = new byte[1024];
-            int n;
-            using (MemoryStream sb = new MemoryStream())
+            MemoryStream sb = new MemoryStream();
+            using (GZipStream input = new GZipStream(new MemoryStream(buf),
+            CompressionMode.Decompress,
+            false))
            {
-                using (GZipStream input = new GZipStream(new MemoryStream(buf),
-                    CompressionMode.Decompress,
-                    false))
-                {
-                    while ((n = input.Read(buffer, 0, buffer.Length)) > 0)
-                    {
-                        sb.Write(buffer, 0, n);
-                    }
-                }
-                return System.Text.Encoding.UTF8.GetString(sb.ToArray());
+                input.CopyTo(sb);
            }
+            return Encoding.UTF8.GetString(sb.ToArray());
        }

        #endregion
@@ -862,7 +845,7 @@ namespace v2rayN

                SwWrite.WriteLine(string.Format("{0}{1}[{2}]{3}", "--------------------------------", strTitle, DateTime.Now.ToString("HH:mm:ss"), "--------------------------------"));
                SwWrite.Write(strContent);
-                SwWrite.WriteLine("\r\n");
+                SwWrite.WriteLine(Environment.NewLine);
                SwWrite.WriteLine(" ");
                SwWrite.Flush();
                SwWrite.Close();
@@ -877,7 +860,6 @@ namespace v2rayN

        public static string ScanScreen()
        {
-            string ret = string.Empty;
            try
            {
                foreach (Screen screen in Screen.AllScreens)
@@ -909,13 +891,13 @@ namespace v2rayN
                                                GraphicsUnit.Pixel);
                            }

-                            var source = new BitmapLuminanceSource(target);
-                            var bitmap = new BinaryBitmap(new HybridBinarizer(source));
+                            BitmapLuminanceSource source = new BitmapLuminanceSource(target);
+                            BinaryBitmap bitmap = new BinaryBitmap(new HybridBinarizer(source));
                            QRCodeReader reader = new QRCodeReader();
-                            var result = reader.decode(bitmap);
+                            Result result = reader.decode(bitmap);
                            if (result != null)
                            {
-                                ret = result.Text;
+                                string ret = result.Text;
                                return ret;
                            }
                        }
--- a/v2rayN/v2rayN/grpc_csharp_ext.x64.dll
+++ b/v2rayN/v2rayN/grpc_csharp_ext.x64.dll
--- a/v2rayN/v2rayN/grpc_csharp_ext.x86.dll
+++ b/v2rayN/v2rayN/grpc_csharp_ext.x86.dll
--- a/v2rayN/v2rayN/packages.config
+++ b/v2rayN/v2rayN/packages.config
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Grpc.Tools" version="2.23.0" targetFramework="net46" developmentDependency="true" />
-</packages>
--- a/v2rayN/v2rayN/v2rayN.csproj
+++ b/v2rayN/v2rayN/v2rayN.csproj
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\Grpc.Tools.2.23.0\build\Grpc.Tools.props" Condition="Exists('..\packages\Grpc.Tools.2.23.0\build\Grpc.Tools.props')" />
  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
  <PropertyGroup>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -45,7 +44,7 @@
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
+    <DebugType>none</DebugType>
    <Optimize>true</Optimize>
    <OutputPath>bin\Release\</OutputPath>
    <DefineConstants>TRACE</DefineConstants>
@@ -74,33 +73,14 @@
  </PropertyGroup>
  <PropertyGroup />
  <PropertyGroup />
+  <PropertyGroup>
+    <StartupObject>v2rayN.Program</StartupObject>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+  </PropertyGroup>
  <ItemGroup>
-    <Reference Include="Google.Protobuf, Version=3.9.1.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>LIB\Google.Protobuf.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="Grpc.Core, Version=2.0.0.0, Culture=neutral, PublicKeyToken=d754f35622e28bad, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>LIB\Grpc.Core.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="Grpc.Core.Api, Version=2.0.0.0, Culture=neutral, PublicKeyToken=d754f35622e28bad, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>LIB\Grpc.Core.Api.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>LIB\Newtonsoft.Json.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
    <Reference Include="System" />
-    <Reference Include="System.Buffers, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>LIB\System.Buffers.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
    <Reference Include="System.Core" />
    <Reference Include="System.Data.DataSetExtensions" />
    <Reference Include="Microsoft.CSharp" />
@@ -109,29 +89,12 @@
    <Reference Include="System.Drawing" />
    <Reference Include="System.IO.Compression" />
    <Reference Include="System.IO.Compression.FileSystem" />
-    <Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>LIB\System.Memory.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
+    <Reference Include="System.Messaging" />
    <Reference Include="System.Net" />
-    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>LIB\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Net.Http.WebRequest" />
    <Reference Include="System.Windows.Forms" />
    <Reference Include="System.Xml" />
-    <Reference Include="zxing, Version=0.16.2.0, Culture=neutral, PublicKeyToken=4e88037ac681fe60, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>LIB\zxing.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="zxing.presentation, Version=0.16.2.0, Culture=neutral, PublicKeyToken=4e88037ac681fe60, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>LIB\zxing.presentation.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
  </ItemGroup>
  <ItemGroup>
    <Compile Include="Forms\AddServer4Form.cs">
@@ -140,7 +103,7 @@
    <Compile Include="Forms\AddServer4Form.Designer.cs">
      <DependentUpon>AddServer4Form.cs</DependentUpon>
    </Compile>
-    <Compile Include="Forms\ListViewFlickerFree.cs">
+    <Compile Include="Base\ListViewFlickerFree.cs">
      <SubType>Component</SubType>
    </Compile>
    <Compile Include="Forms\MainForm.cs">
@@ -179,25 +142,29 @@
    <Compile Include="Forms\SubSettingControl.Designer.cs">
      <DependentUpon>SubSettingControl.cs</DependentUpon>
    </Compile>
+    <Compile Include="Handler\MainFormHandler.cs" />
    <Compile Include="Handler\SpeedtestHandler.cs" />
    <Compile Include="Handler\StatisticsHandler.cs" />
-    <Compile Include="Handler\V2rayUpdateHandle.cs" />
-    <Compile Include="HttpProxyHandler\HttpWebServer.cs" />
-    <Compile Include="HttpProxyHandler\HttpWebServerB.cs" />
-    <Compile Include="HttpProxyHandler\PACFileWatcherHandle.cs" />
+    <Compile Include="Handler\DownloadHandle.cs" />
+    <Compile Include="Base\HttpWebServer.cs" />
+    <Compile Include="Base\HttpWebServerB.cs" />
    <Compile Include="HttpProxyHandler\PrivoxyHandler.cs" />
-    <Compile Include="HttpProxyHandler\PACListHandle.cs" />
    <Compile Include="HttpProxyHandler\PACServerHandle.cs" />
    <Compile Include="HttpProxyHandler\ProxySetting.cs" />
-    <Compile Include="HttpProxyHandler\SysProxyHandle.cs" />
    <Compile Include="HttpProxyHandler\HttpProxyHandle.cs" />
-    <Compile Include="HttpProxyHandler\WebClientEx.cs">
+    <Compile Include="Base\WebClientEx.cs">
      <SubType>Component</SubType>
    </Compile>
+    <Compile Include="HttpProxyHandler\SysProxyHandle.cs" />
    <Compile Include="Mode\EMove.cs" />
    <Compile Include="Mode\ServerStatistics.cs" />
    <Compile Include="Mode\SysproxyConfig.cs" />
    <Compile Include="Mode\EConfigType.cs" />
+    <Compile Include="Properties\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
    <Compile Include="Resx\ResUI.zh-Hans.Designer.cs">
      <AutoGen>True</AutoGen>
      <DesignTime>True</DesignTime>
@@ -208,7 +175,7 @@
      <DesignTime>True</DesignTime>
      <DependentUpon>ResUI.resx</DependentUpon>
    </Compile>
-    <Compile Include="StringEx.cs">
+    <Compile Include="Base\StringEx.cs">
      <SubType>Code</SubType>
    </Compile>
    <Compile Include="Forms\AddServerForm.cs">
@@ -225,7 +192,6 @@
    </Compile>
    <Compile Include="Global.cs" />
    <Compile Include="Handler\QRCodeHelper.cs" />
-    <Compile Include="Handler\RoutingRuleHandler.cs" />
    <Compile Include="Mode\VmessQRCode.cs" />
    <Compile Include="Mode\V2rayTcpRequest.cs" />
    <Compile Include="Handler\ConfigHandler.cs" />
@@ -283,6 +249,7 @@
    </EmbeddedResource>
    <EmbeddedResource Include="Forms\SubSettingControl.resx">
      <DependentUpon>SubSettingControl.cs</DependentUpon>
+      <SubType>Designer</SubType>
    </EmbeddedResource>
    <EmbeddedResource Include="Forms\SubSettingControl.zh-Hans.resx">
      <DependentUpon>SubSettingControl.cs</DependentUpon>
@@ -319,18 +286,12 @@
    </EmbeddedResource>
    <EmbeddedResource Include="Properties\Resources.resx">
      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
      <SubType>Designer</SubType>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
    </EmbeddedResource>
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Resources.resx</DependentUpon>
-      <DesignTime>True</DesignTime>
-    </Compile>
    <EmbeddedResource Include="app.config">
      <SubType>Designer</SubType>
    </EmbeddedResource>
-    <None Include="packages.config" />
    <None Include="Properties\Settings.settings">
      <Generator>SettingsSingleFileGenerator</Generator>
      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
@@ -340,11 +301,14 @@
      <DependentUpon>Settings.settings</DependentUpon>
      <DesignTimeSharedInput>True</DesignTimeSharedInput>
    </Compile>
+    <EmbeddedResource Include="Sample\custom_routing_block" />
+    <EmbeddedResource Include="Sample\custom_routing_direct" />
+    <EmbeddedResource Include="Sample\custom_routing_proxy" />
+    <None Include="Resources\sysproxy.exe.gz" />
+    <None Include="Resources\sysproxy64.exe.gz" />
    <Protobuf Include="Protos\Statistics.proto" />
    <None Include="Resources\abp.js.gz" />
    <None Include="Resources\pac.txt.gz" />
-    <None Include="Resources\sysproxy.exe.gz" />
-    <None Include="Resources\sysproxy64.exe.gz" />
  </ItemGroup>
  <ItemGroup>
    <EmbeddedResource Include="Resx\ResUI.zh-Hans.resx">
@@ -392,7 +356,6 @@
    <EmbeddedResource Include="Sample\SampleServerConfig.txt" />
  </ItemGroup>
  <ItemGroup>
-    <None Include="Resources\mgwz.dll.gz" />
    <None Include="Resources\privoxy.exe.gz" />
    <None Include="Resources\restart.png" />
  </ItemGroup>
@@ -411,40 +374,37 @@
    <None Include="Resources\sub.png" />
    <None Include="Resources\checkupdate.png" />
    <None Include="Resources\about.png" />
-    <EmbeddedResource Include="LIB\Google.Protobuf.dll" />
-    <EmbeddedResource Include="LIB\Grpc.Core.Api.dll" />
-    <EmbeddedResource Include="LIB\Grpc.Core.dll" />
-    <EmbeddedResource Include="LIB\Newtonsoft.Json.dll" />
-    <EmbeddedResource Include="LIB\System.Buffers.dll" />
-    <EmbeddedResource Include="LIB\System.Memory.dll" />
-    <EmbeddedResource Include="LIB\System.Runtime.CompilerServices.Unsafe.dll" />
-    <EmbeddedResource Include="LIB\zxing.dll" />
-    <EmbeddedResource Include="LIB\zxing.presentation.dll" />
-    <Content Include="grpc_csharp_ext.x64.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="grpc_csharp_ext.x86.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <EmbeddedResource Include="LIB\netstandard.dll" />
    <Content Include="Resources\help.png" />
    <None Include="Resources\notify.png" />
    <Content Include="Resources\privoxy_conf.txt" />
  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Google.Protobuf">
+      <Version>3.11.4</Version>
+    </PackageReference>
+    <PackageReference Include="Grpc.Core">
+      <Version>2.27.0</Version>
+    </PackageReference>
+    <PackageReference Include="Grpc.Tools">
+      <Version>2.27.0</Version>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+    <PackageReference Include="Newtonsoft.Json">
+      <Version>12.0.3</Version>
+    </PackageReference>
+    <PackageReference Include="ZXing.Net">
+      <Version>0.16.5</Version>
+    </PackageReference>
+  </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
  <PropertyGroup>
-    <PostBuildEvent>
-    </PostBuildEvent>
+    <PostBuildEvent>copy /y $(SolutionDir)v2rayUpgrade\$(OutDir)* $(TargetDir)
+
+del $(TargetDir)*.xml $(TargetDir)*.so $(TargetDir)*.dylib
+if not "$(ConfigurationName)" == "Debug" del $(TargetDir)*.pdb</PostBuildEvent>
  </PropertyGroup>
  <Import Project="..\packages\Grpc.Core.2.23.0\build\net45\Grpc.Core.targets" Condition="Exists('..\packages\Grpc.Core.2.23.0\build\net45\Grpc.Core.targets')" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\packages\Grpc.Tools.2.23.0\build\Grpc.Tools.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Grpc.Tools.2.23.0\build\Grpc.Tools.props'))" />
-    <Error Condition="!Exists('..\packages\Grpc.Tools.2.23.0\build\Grpc.Tools.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Grpc.Tools.2.23.0\build\Grpc.Tools.targets'))" />
-  </Target>
-  <Import Project="..\packages\Grpc.Tools.2.23.0\build\Grpc.Tools.targets" Condition="Exists('..\packages\Grpc.Tools.2.23.0\build\Grpc.Tools.targets')" />
  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
       Other similar extension points exist, see Microsoft.Common.targets.
  <Target Name="BeforeBuild">
--- a/v2rayN/v2rayUpgrade/App.config
+++ b/v2rayN/v2rayUpgrade/App.config
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+    <startup> 
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6"/>
+    </startup>
+</configuration>
--- a/v2rayN/v2rayUpgrade/MainForm.Designer.cs
+++ b/v2rayN/v2rayUpgrade/MainForm.Designer.cs
@@ -0,0 +1,105 @@
+namespace v2rayUpgrade
+{
+    partial class MainForm
+    {
+        /// <summary>
+        /// 必需的设计器变量。
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// 清理所有正在使用的资源。
+        /// </summary>
+        /// <param name="disposing">如果应释放托管资源，为 true；否则为 false。</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows 窗体设计器生成的代码
+
+        /// <summary>
+        /// 设计器支持所需的方法 - 不要修改
+        /// 使用代码编辑器修改此方法的内容。
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.btnClose = new System.Windows.Forms.Button();
+            this.btnOK = new System.Windows.Forms.Button();
+            this.label1 = new System.Windows.Forms.Label();
+            this.label2 = new System.Windows.Forms.Label();
+            this.SuspendLayout();
+            // 
+            // btnClose
+            // 
+            this.btnClose.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+            this.btnClose.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+            this.btnClose.Location = new System.Drawing.Point(367, 118);
+            this.btnClose.Name = "btnClose";
+            this.btnClose.Size = new System.Drawing.Size(184, 89);
+            this.btnClose.TabIndex = 1;
+            this.btnClose.Text = "&Exit(退出)";
+            this.btnClose.UseVisualStyleBackColor = true;
+            this.btnClose.Click += new System.EventHandler(this.btnClose_Click);
+            // 
+            // btnOK
+            // 
+            this.btnOK.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+            this.btnOK.Location = new System.Drawing.Point(81, 118);
+            this.btnOK.Name = "btnOK";
+            this.btnOK.Size = new System.Drawing.Size(184, 89);
+            this.btnOK.TabIndex = 0;
+            this.btnOK.Text = "&Upgrade(升级)";
+            this.btnOK.UseVisualStyleBackColor = true;
+            this.btnOK.Click += new System.EventHandler(this.btnOK_Click);
+            // 
+            // label1
+            // 
+            this.label1.AutoSize = true;
+            this.label1.Font = new System.Drawing.Font("宋体", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label1.Location = new System.Drawing.Point(79, 64);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(205, 15);
+            this.label1.TabIndex = 8;
+            this.label1.Text = "升级成功后将自动重启v2rayN";
+            // 
+            // label2
+            // 
+            this.label2.AutoSize = true;
+            this.label2.Font = new System.Drawing.Font("宋体", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label2.Location = new System.Drawing.Point(79, 37);
+            this.label2.Name = "label2";
+            this.label2.Size = new System.Drawing.Size(471, 15);
+            this.label2.TabIndex = 9;
+            this.label2.Text = "v2rayN will restart automatically after successful upgrade";
+            // 
+            // MainForm
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(616, 284);
+            this.Controls.Add(this.label2);
+            this.Controls.Add(this.label1);
+            this.Controls.Add(this.btnClose);
+            this.Controls.Add(this.btnOK);
+            this.Name = "MainForm";
+            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
+            this.Text = "v2rayUpgrade";
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.Button btnClose;
+        private System.Windows.Forms.Button btnOK;
+        private System.Windows.Forms.Label label1;
+        private System.Windows.Forms.Label label2;
+    }
+}
+
--- a/v2rayN/v2rayUpgrade/MainForm.cs
+++ b/v2rayN/v2rayUpgrade/MainForm.cs
@@ -0,0 +1,131 @@
+using System;
+using System.Diagnostics;
+using System.IO;
+using System.IO.Compression;
+using System.Windows.Forms;
+
+namespace v2rayUpgrade
+{
+    public partial class MainForm : Form
+    {
+        private readonly string defaultFilename = "v2ray-windows.zip";
+        private string fileName;
+
+        public MainForm(string[] args)
+        {
+            InitializeComponent();
+            if (args.Length > 0)
+            {
+                fileName = args[0];
+            }
+        }
+        private void showWarn(string message)
+        {
+            MessageBox.Show(message, "", MessageBoxButtons.OK, MessageBoxIcon.Warning);
+        }
+
+        private void btnOK_Click(object sender, EventArgs e)
+        {
+            try
+            {
+                Process[] existing = Process.GetProcessesByName("v2rayN");
+                foreach (Process p in existing)
+                {
+                    string path = p.MainModule.FileName;
+                    if (path == GetPath("v2rayN.exe"))
+                    {
+                        p.Kill();
+                        p.WaitForExit(100);
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                // Access may be denied without admin right. The user may not be an administrator.
+                showWarn("Failed to close v2rayN(关闭v2rayN失败).\n" +
+                    "Close it manually, or the upgrade may fail.(请手动关闭正在运行的v2rayN，否则可能升级失败。\n\n" + ex.StackTrace);
+            }
+
+            try
+            {
+
+                if (!File.Exists(fileName))
+                {
+                    if (File.Exists(defaultFilename))
+                    {
+                        fileName = defaultFilename;
+                    }
+                    else
+                    {
+                        showWarn("Upgrade Failed, File Not Exist(升级失败,文件不存在).");
+                        return;
+                    }
+                }
+
+                string thisAppOldFile = Application.ExecutablePath + ".tmp";
+                File.Delete(thisAppOldFile);
+                string startKey = "v2rayN/";
+
+                using (ZipArchive archive = ZipFile.OpenRead(fileName))
+                {
+                    foreach (ZipArchiveEntry entry in archive.Entries)
+                    {
+                        if (entry.Length == 0)
+                        {
+                            continue;
+                        }
+                        string fullName = entry.FullName;
+                        if (fullName.StartsWith(startKey))
+                        {
+                            fullName = fullName.Substring(startKey.Length, fullName.Length - startKey.Length);
+                        }
+                        if (Application.ExecutablePath.ToLower() == GetPath(fullName).ToLower())
+                        {
+                            File.Move(Application.ExecutablePath, thisAppOldFile);
+                        }
+
+                        string entryOuputPath = GetPath(fullName);
+
+                        FileInfo fileInfo = new FileInfo(entryOuputPath);
+                        fileInfo.Directory.Create();
+                        entry.ExtractToFile(entryOuputPath, true);
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                showWarn("Upgrade Failed(升级失败)." + ex.StackTrace);
+                return;
+            }
+
+            Process.Start("v2rayN.exe");
+            MessageBox.Show("Upgrade successed(升级成功)", "", MessageBoxButtons.OK, MessageBoxIcon.Information);
+
+            Close();
+        }
+
+        private void btnClose_Click(object sender, EventArgs e)
+        {
+            Close();
+        }
+
+        public static string GetExePath()
+        {
+            return Application.ExecutablePath;
+        }
+
+        public static string StartupPath()
+        {
+            return Application.StartupPath;
+        }
+        public static string GetPath(string fileName)
+        {
+            string startupPath = StartupPath();
+            if (string.IsNullOrEmpty(fileName))
+            {
+                return startupPath;
+            }
+            return Path.Combine(startupPath, fileName);
+        }
+    }
+}
--- a/v2rayN/v2rayUpgrade/MainForm.resx
+++ b/v2rayN/v2rayUpgrade/MainForm.resx
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
--- a/v2rayN/v2rayUpgrade/Program.cs
+++ b/v2rayN/v2rayUpgrade/Program.cs
@@ -0,0 +1,19 @@
+using System;
+using System.Windows.Forms;
+
+namespace v2rayUpgrade
+{
+    static class Program
+    {
+        /// <summary>
+        /// 应用程序的主入口点。
+        /// </summary>
+        [STAThread]
+        static void Main(string[] args)
+        {
+            Application.EnableVisualStyles();
+            Application.SetCompatibleTextRenderingDefault(false);
+            Application.Run(new MainForm(args));
+        }
+    }
+}
--- a/v2rayN/v2rayUpgrade/Properties/AssemblyInfo.cs
+++ b/v2rayN/v2rayUpgrade/Properties/AssemblyInfo.cs
@@ -0,0 +1,34 @@
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+// 有关程序集的一般信息由以下
+// 控制。更改这些特性值可修改
+// 与程序集关联的信息。
+[assembly: AssemblyTitle("v2rayUpgrade")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("v2rayUpgrade")]
+[assembly: AssemblyCopyright("Copyright © 2019-2020 (GPLv3)")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// 将 ComVisible 设置为 false 会使此程序集中的类型
+//对 COM 组件不可见。如果需要从 COM 访问此程序集中的类型
+//请将此类型的 ComVisible 特性设置为 true。
+[assembly: ComVisible(false)]
+
+// 如果此项目向 COM 公开，则下列 GUID 用于类型库的 ID
+[assembly: Guid("f82be52a-155c-492c-9e0a-1e917ec62c78")]
+
+// 程序集的版本信息由下列四个值组成: 
+//
+//      主版本
+//      次版本
+//      生成号
+//      修订号
+//
+// 可以指定所有值，也可以使用以下所示的 "*" 预置版本号和修订号
+// 方法是按如下所示使用“*”: :
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyFileVersion("1.1.0.0")]
--- a/v2rayN/v2rayUpgrade/Properties/Resources.Designer.cs
+++ b/v2rayN/v2rayUpgrade/Properties/Resources.Designer.cs
@@ -0,0 +1,63 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     此代码由工具生成。
+//     运行时版本:4.0.30319.42000
+//
+//     对此文件的更改可能会导致不正确的行为，并且如果
+//     重新生成代码，这些更改将会丢失。
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace v2rayUpgrade.Properties {
+    using System;
+    
+    
+    /// <summary>
+    ///   一个强类型的资源类，用于查找本地化的字符串等。
+    /// </summary>
+    // 此类是由 StronglyTypedResourceBuilder
+    // 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。
+    // 若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen
+    // (以 /str 作为命令选项)，或重新生成 VS 项目。
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    internal class Resources {
+        
+        private static global::System.Resources.ResourceManager resourceMan;
+        
+        private static global::System.Globalization.CultureInfo resourceCulture;
+        
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal Resources() {
+        }
+        
+        /// <summary>
+        ///   返回此类使用的缓存的 ResourceManager 实例。
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("v2rayUpgrade.Properties.Resources", typeof(Resources).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+        
+        /// <summary>
+        ///   重写当前线程的 CurrentUICulture 属性
+        ///   重写当前线程的 CurrentUICulture 属性。
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+    }
+}
--- a/v2rayN/v2rayUpgrade/Properties/Resources.resx
+++ b/v2rayN/v2rayUpgrade/Properties/Resources.resx
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
2dust	07bdcb5491	Update AssemblyInfo.cs	2020-03-25 13:19:42 +08:00
2dust	01ac3be89f	Merge pull request #591 from yfdyh000/fix_list Workaround for list misalignment	2020-03-25 10:31:23 +08:00
YFdyh000	5f90b5b4c4	Workaround for list misalignment	2020-03-25 10:27:26 +08:00
2dust	a616ba50c2	up	2020-03-25 08:56:00 +08:00
2dust	3ebaabc1ef	Merge pull request #573 from yfdyh000/netbuild 规范依赖文件的结构	2020-03-23 08:35:53 +08:00
2dust	1510549663	Merge pull request #572 from yfdyh000/pr6 代码优化；测速进程出错回报；域名解析策略文档链接	2020-03-23 08:32:47 +08:00
YFdyh000	db0a757a49	Migrate to PackageReference	2020-03-21 11:03:10 +08:00
YFdyh000	20ab51e339	使v2rayUpgrade.exe支持更新自身	2020-03-21 09:38:37 +08:00
YFdyh000	948b9c26d9	妥善处理依赖舍弃释放libs.zip，增加启动速度、代码安全性，减少.git占用	2020-03-21 09:38:34 +08:00
YFdyh000	300a4d8067	域名解析策略补充说明	2020-03-21 09:24:05 +08:00
YFdyh000	a65afd7524	Better startup error checking & fix bug	2020-03-21 03:20:49 +08:00
YFdyh000	d8458e84f4	refine code	2020-03-21 03:20:49 +08:00
YFdyh000	a6664fbc01	ListViewItem引用列名称，增加代码可靠性	2020-03-21 03:20:46 +08:00
2dust	111f77c59c	up	2020-03-20 16:23:12 +08:00
2dust	48218a3dad	Merge pull request #567 from yfdyh000/pr5 功能和代码优化	2020-03-20 09:23:05 +08:00
YFdyh000	ec3eb2215b	预防闪退	2020-03-20 08:45:33 +08:00
YFdyh000	a6fcf53b10	'int' convert to 'enum ListenerType'	2020-03-20 07:53:05 +08:00
YFdyh000	be9bbcc2c7	add check	2020-03-20 07:53:04 +08:00
YFdyh000	a4a0b29250	refine merge	2020-03-20 07:53:01 +08:00
YFdyh000	01b34dd45a	Merge remote-tracking branch 'remotes/Code-Fight/master' into pr5	2020-03-20 07:15:22 +08:00
YFdyh000	2d2e4deb82	清理代码跳过证书验证存风险强制HTTP1.0已知存有兼容性问题	2020-03-20 06:34:00 +08:00
YFdyh000	3daa8f479c	更新时使用代理（如可用）	2020-03-20 06:32:28 +08:00
YFdyh000	d2ab186e44	Add TestMe button	2020-03-20 06:32:27 +08:00
YFdyh000	5b2a6b12af	增强程序更新成功率	2020-03-20 06:32:26 +08:00
YFdyh000	5357f504d8	隔行着色	2020-03-20 06:32:25 +08:00
YFdyh000	df427d80a1	启用项粗体+蓝色	2020-03-20 06:32:24 +08:00
YFdyh000	b1f5d5ad75	cleanup	2020-03-20 06:32:24 +08:00
YFdyh000	af71eed96e	简化代码	2020-03-20 06:32:23 +08:00
YFdyh000	6293ddacc6	fix	2020-03-20 06:32:23 +08:00
2dust	1a807c056c	Update WebClientEx.cs	2020-03-16 14:32:42 +08:00
2dust	3bd65b8d85	Update libs.zip	2020-03-16 10:33:01 +08:00
2dust	cf6d0598f8	Update AssemblyInfo.cs	2020-03-16 10:31:38 +08:00
2dust	a2758f0e0a	keep the sys proxy	2020-03-16 10:28:43 +08:00
2dust	300f5ef949	Merge pull request #543 from yfdyh000/pr4 琐碎优化	2020-03-16 08:40:24 +08:00
YFdyh000	01fef4d357	update AssemblyInfo.cs	2020-03-16 07:00:19 +08:00
YFdyh000	62b521718e	降低 Ping 超时	2020-03-16 07:00:19 +08:00
YFdyh000	6da0b6a628	简化代码组合 StartupPath 未见意义	2020-03-16 07:00:15 +08:00
YFdyh000	9f3b128044	优化重写 v2rayUpgrade 不再强制传入参数。用户还可利用此工具“重装”软件。直接使用已有文件先启动再提示成功升级成功后自动退出	2020-03-16 06:51:55 +08:00
YFdyh000	a7e215dd5b	修正检查更新进度说明	2020-03-16 04:38:49 +08:00
YFdyh000	443605d1dc	英文语言包微调	2020-03-16 04:38:49 +08:00
YFdyh000	1865621a6a	测速不再重启现有服务代码整理和简化	2020-03-16 04:38:48 +08:00
YFdyh000	d94fcbd8a3	已运行检测改用互斥锁增强可靠性	2020-03-16 04:38:48 +08:00
YFdyh000	794b88e5ab	消息框图标优化致命错误取Error，普通错误取警告。	2020-03-16 04:38:47 +08:00
YFdyh000	e60369c817	补充本地化	2020-03-16 04:38:44 +08:00
YFdyh000	2add30cc77	IDE0018	2020-03-15 17:48:52 +08:00
YFdyh000	ec3c471df6	IDE0059	2020-03-15 17:48:52 +08:00
YFdyh000	2f6236353b	IDE0028	2020-03-15 17:48:52 +08:00
2dust	973d4ddbb2	Merge pull request #542 from yfdyh000/misc-pr3 功能增强，代码优化和清理	2020-03-15 10:57:04 +08:00
YFdyh000	0334d52cfb	简洁写法	2020-03-15 07:47:34 +08:00
YFdyh000	88d1948b51	测速网址可配置化	2020-03-15 03:54:14 +08:00
YFdyh000	11d90dfb68	删除不必要的Using	2020-03-15 03:54:13 +08:00
YFdyh000	cdc96817e8	IDE0002	2020-03-15 03:54:12 +08:00
YFdyh000	edea40012c	IDE0018	2020-03-15 03:54:12 +08:00
YFdyh000	67b99c4c8b	IDE0008-显式类型	2020-03-15 03:54:11 +08:00
YFdyh000	56c3c22568	IDE0001-简化名称	2020-03-15 03:54:11 +08:00
YFdyh000	d8d8346d45	IDE0017-简化对象初始化	2020-03-15 03:54:10 +08:00
YFdyh000	8b68ecb891	排序resx内容以利检查和冲突合并 VS扩展 ResXManager	2020-03-15 03:54:10 +08:00
YFdyh000	c183f1ed6e	清理窗体的冗余本地化资源由$this.Localizable自动生成的<<内部属性	2020-03-15 03:54:09 +08:00
YFdyh000	4a9d9ac2ac	UI微调	2020-03-15 03:54:08 +08:00
YFdyh000	5dffb30b27	允许设置去重保留较早或较晚的项	2020-03-15 03:54:08 +08:00
YFdyh000	cf195c7694	优先去除旧（顶）项。严格检查，避免删除参数不同的配置。	2020-03-15 03:54:07 +08:00
YFdyh000	1922f30f0f	整合函数	2020-03-15 03:54:07 +08:00
YFdyh000	b6d1c4330f	优化代码-ThreadStart改用Task	2020-03-15 03:54:06 +08:00
YFdyh000	aee8994c41	多线程测试真延迟	2020-03-15 02:08:14 +08:00
2dust	593313a684	up sysproxy	2020-03-13 14:37:18 +08:00
2dust	c71caec9df	Merge pull request #533 from samsong8610/master Fixes #390 允许来自局域网的连接需要人工重启	2020-03-13 11:49:19 +08:00
Sam Song	89bc92b98e	Fixes #390 允许来自局域网的连接需要人工重启当修改参数设置时，除重新加载v2ray外也重新启动HTTP代理，否则，需要用户人工退出再启动。如果没有开启HTTP代理，因为修改参数设置触发的重启HTTP代理不做任何操作。	2020-03-12 22:39:32 +08:00
2dust	17dec098cd	Update V2rayConfigHandler.cs	2020-03-12 15:57:34 +08:00
2dust	4e38ec8f57	Update AssemblyInfo.cs	2020-03-10 09:30:04 +08:00
2dust	eda7b1789a	Update MainForm.cs	2020-03-10 09:30:01 +08:00
2dust	db2510fac5	Create .gitignore	2020-03-10 08:21:27 +08:00
2dust	e354dad70b	Merge pull request #524 from lycor1s/master fix quic server name	2020-03-09 19:25:36 +08:00
2dust	02607e116e	Delete .gitignore	2020-03-09 19:22:28 +08:00
Kyrie@cedu.me	932fd330ce	fix quic server name	2020-03-09 17:19:34 +08:00
2dust	c9c0dc9b5b	Merge pull request #523 from yfdyh000/misc-pr2 快捷键优化	2020-03-09 16:08:29 +08:00
YFdyh000	2b3e29f3d1	added shortcut key of "scan QR code" by @dearsn	2020-03-09 16:04:22 +08:00
YFdyh000	b83b624dc3	移至顶部/底部的快捷键调整	2020-03-09 16:04:20 +08:00
2dust	1d3832f562	up	2020-03-09 13:19:47 +08:00
2dust	daa358a0ca	Update AssemblyInfo.cs	2020-03-09 11:20:32 +08:00
2dust	ecf1be42ee	Merge pull request #460 from yfdyh000/fix_quic_host fix QUIC host config	2020-03-09 10:46:25 +08:00
2dust	3d6afe50e3	Merge pull request #453 from yfdyh000/misc-pr1 UI 为主的琐碎优化	2020-03-09 10:44:22 +08:00
zfcode	c1bb333555	add tray menu:subscription for updates	2020-02-27 14:17:33 +08:00
YFdyh000	5a386c2802	代码优化	2020-02-21 13:41:45 +08:00
YFdyh000	6dddaa03ae	整合和优化函数	2020-02-21 13:06:43 +08:00
YFdyh000	643a8094a6	增强检查更新	2020-02-21 11:28:51 +08:00
YFdyh000	a62f375f5b	修正tcping逻辑 * 当IP地址存在反向解析结果（例 [xxx].members.linode.com），会连接反向域名的IP地址池，可能导致测速IPv4服务器时连接到IPv6地址并且失败。	2020-02-21 07:03:38 +08:00
YFdyh000	a498578c17	fix QUIC host config	2020-02-20 02:30:18 +08:00
YFdyh000	7cf6ab4b51	克隆服务器新增到下一项而非最底	2020-02-20 01:45:32 +08:00
YFdyh000	dda920e33e	继续修正统计列次序调整	2020-02-20 00:14:50 +08:00
YFdyh000	ae296fced8	英文和琐碎代码优化	2020-02-20 00:10:35 +08:00
YFdyh000	cdf381ce41	移动到顶/底的菜单增加快捷键 #456	2020-02-20 00:08:16 +08:00
YFdyh000	195828cee1	琐碎的英文调整	2020-02-19 06:38:42 +08:00
YFdyh000	cc3560ab29	切换语言立即执行	2020-02-19 06:37:10 +08:00
YFdyh000	c975896c5e	菜单增加V2Ray官网，调整用词	2020-02-19 03:35:22 +08:00
YFdyh000	627e4513f3	新增Ctrl+C和Ctrl+V，规范快捷键提示间距	2020-02-19 03:11:56 +08:00
YFdyh000	c4c05bfafd	统计列后续纠正，及代码优化	2020-02-19 01:03:25 +08:00
YFdyh000	31fb479459	明确“关闭窗口”按钮	2020-02-19 00:11:58 +08:00
YFdyh000	1b0e3b3575	tcping增加5s超时机制; ping间隔降低至10ms	2020-02-19 00:11:51 +08:00
YFdyh000	6206c81546	服务器去重结果回报	2020-02-18 18:26:10 +08:00
YFdyh000	e09210e6c3	剪贴板导入数量报告	2020-02-18 18:26:07 +08:00
YFdyh000	4089cc5cf0	统计列次序调整	2020-02-17 22:21:45 +08:00
YFdyh000	2c6b2f8065	字符串等琐碎优化	2020-02-17 22:21:39 +08:00
2dust	112273036b	up doh	2020-01-15 09:35:19 +08:00
2dust	df5b55b14f	Update MainForm.cs	2020-01-15 09:35:06 +08:00
2dust	40bb7a5ea1	Update libs.zip	2020-01-02 13:49:48 +08:00
2dust	cf5b0cbd06	Update Program.cs	2020-01-02 13:49:44 +08:00
2dust	504a6c5d89	upgrade	2020-01-02 13:49:37 +08:00
2dust	a33e586ff4	Update AssemblyInfo.cs	2019-12-26 08:53:16 +08:00
2dust	a1d579e1ec	restart core	2019-12-26 08:53:13 +08:00
2dust	59a9fc9a3d	Update libs.zip	2019-12-26 08:52:42 +08:00
2dust	194d9a0abc	upgrade	2019-12-26 08:52:37 +08:00
2dust	5566df791c	up spac	2019-12-24 09:33:23 +08:00
2dust	1ca416bacf	Update AssemblyInfo.cs	2019-12-24 09:01:17 +08:00
2dust	97d7229974	Update V2rayHandler.cs	2019-12-24 09:01:13 +08:00
2dust	6a0bfc43dd	Update Global.cs	2019-12-24 09:01:10 +08:00
2dust	732da0c330	Update libs.zip	2019-12-18 13:13:06 +08:00
2dust	012bb5654b	Update MainForm.cs	2019-12-18 13:13:00 +08:00
2dust	068fe3113b	up test	2019-12-17 16:16:47 +08:00
2dust	4a74102eb7	Update ProxySetting.cs	2019-12-17 09:14:31 +08:00
2dust	b310cfeda2	Update ProxySetting.cs	2019-12-16 20:04:58 +08:00
2dust	07cd855446	Update DownloadHandle.cs	2019-12-16 17:16:27 +08:00
2dust	ab08660c20	Update AssemblyInfo.cs	2019-12-16 14:26:23 +08:00
2dust	daf271ee0d	Merge branch 'master' of https://github.com/2dust/v2rayN	2019-12-16 10:24:32 +08:00
2dust	f949c9f4f0	Update Global.cs	2019-12-16 10:24:29 +08:00
2dust	a609eb4bcf	Update issue_template.md	2019-12-16 09:12:02 +08:00
2dust	fd9b6d0ff0	up ui	2019-12-16 09:10:01 +08:00
2dust	cb074528f4	up pac	2019-12-13 09:49:17 +08:00
2dust	5cadf59e10	add up	2019-12-12 10:16:09 +08:00
2dust	86229bf73b	add upgrade	2019-12-12 10:04:12 +08:00
2dust	cf04c64fee	user pac rules	2019-12-11 13:36:05 +08:00
2dust	f8517a316b	up newline	2019-12-11 11:42:41 +08:00
2dust	8bcbd34c27	up job	2019-12-11 10:25:28 +08:00
2dust	3e35882fee	add ieproxy	2019-12-10 11:22:13 +08:00
2dust	cf204fac39	add libs	2019-12-10 11:21:39 +08:00
2dust	dfc22258dd	remove res	2019-12-10 11:11:27 +08:00
2dust	b7ac195bfc	Merge pull request #293 from kotori2/master Fix encoding issue	2019-12-06 16:54:47 +08:00
双草酸酯	45c74cfe59	Fix encoding issue	2019-12-05 17:29:43 +08:00
2dust	fe15fde594	up pp	2019-12-02 13:47:13 +08:00
2dust	ec312055be	Update AssemblyInfo.cs	2019-11-27 13:57:51 +08:00
2dust	b08a0212ff	Update DownloadHandle.cs	2019-11-27 13:15:02 +08:00
2dust	3f1688f8b7	up stat	2019-11-25 13:22:35 +08:00
2dust	912f682359	Update AssemblyInfo.cs	2019-11-14 10:37:10 +08:00
2dust	1a84090cc7	cleanup http	2019-11-13 11:33:47 +08:00
2dust	70dadf9964	up routing	2019-11-08 17:30:48 +08:00
2dust	9eab95e870	up test	2019-11-02 11:07:31 +08:00
2dust	f199e3bf82	Update AssemblyInfo.cs	2019-10-30 14:20:12 +08:00
2dust	7d31c2e472	up addr	2019-10-30 14:07:26 +08:00
2dust	ad406c3682	Update SpeedtestHandler.cs	2019-10-28 13:11:14 +08:00
2dust	2779670fa2	up speedtest	2019-10-27 12:55:20 +08:00
2dust	5b00bf82fb	Update MainForm.cs	2019-10-24 08:42:55 +08:00
2dust	473e0cf839	Update HttpWebServerB.cs	2019-10-24 08:23:32 +08:00
2dust	ef01b4aa5e	fix pac	2019-10-23 15:18:21 +08:00
2dust	c0340843eb	up pac	2019-10-22 17:04:11 +08:00
2dust	e6ca25462e	clean	2019-10-21 14:17:28 +08:00
2dust	53494341fc	Update AssemblyInfo.cs	2019-10-21 10:38:15 +08:00
2dust	5aee97320b	up speedtest	2019-10-21 10:35:54 +08:00
2dust	d5c69c7838	Clean code	2019-10-18 14:49:42 +08:00
2dust	9224ea9819	up webproxy	2019-10-17 13:29:58 +08:00