up

remove connectionReuse
Update AssemblyInfo.cs
2020-12-05 18:13:24 +08:00 · 2020-12-05 18:12:55 +08:00 · 2020-11-29 20:44:02 +08:00 · 2020-11-29 20:43:26 +08:00 · 2020-11-23 21:18:44 +08:00 · 2020-11-05 10:34:50 +08:00
124 changed files with 15638 additions and 9617 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/README.md
+++ b/README.md
@@ -1,10 +1,10 @@
 # v2rayN

 ### How to use
- Download exe from release download
- Also need to download v2ray core in the same folder
+- If you are newbie please download v2rayN-Core.zip from releases
+- Otherwise please download v2rayN.zip (Also need to download v2ray core in the same folder)
 - Run v2rayN.exe

 ### Requirements  
 - Microsoft [.NET Framework 4.6](https://docs.microsoft.com/zh-cn/dotnet/framework/install/guide-for-developers) or higher
- Project V core [https://github.com/v2ray/v2ray-core/releases](https://github.com/v2ray/v2ray-core/releases)
+- Project V core [https://github.com/v2fly/v2ray-core/releases](https://github.com/v2fly/v2ray-core/releases)
--- 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/Base/HttpWebServer.cs
+++ b/v2rayN/v2rayN/Base/HttpWebServer.cs
@@ -57,10 +57,11 @@ namespace v2rayN.Base
                    {
                        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/Base/HttpWebServerB.cs
+++ b/v2rayN/v2rayN/Base/HttpWebServerB.cs
@@ -17,8 +17,10 @@ namespace v2rayN.Base
            this.port = port;
            this._responderMethod = method;

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

@@ -33,35 +35,52 @@ namespace v2rayN.Base

        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)
@@ -110,7 +129,7 @@ namespace v2rayN.Base

        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/Base/ListViewFlickerFree.cs
+++ b/v2rayN/v2rayN/Base/ListViewFlickerFree.cs
@@ -18,37 +18,31 @@ namespace v2rayN.Base
        {
            try
            {
-                int count = this.Columns.Count;
-                int MaxWidth = 0;
+                this.SuspendLayout();
                Graphics graphics = this.CreateGraphics();
-                Font font = this.Font;
-                ListView.ListViewItemCollection items = this.Items;
-
-                string str;
-                int width;

+                // 原生 ColumnHeaderAutoResizeStyle.ColumnContent 将忽略列头宽度
                this.AutoResizeColumns(ColumnHeaderAutoResizeStyle.HeaderSize);

-                for (int i = 0; i < count; i++)
+                for (int i = 0; i < this.Columns.Count; i++)
                {
-                    str = this.Columns[i].Text;
-                    MaxWidth = this.Columns[i].Width;
+                    ColumnHeader c = this.Columns[i];
+                    int cWidth = c.Width;
+                    string MaxStr = "";
+                    Font font = this.Items[0].SubItems[0].Font;

-                    foreach (ListViewItem item in items)
+                    foreach (ListViewItem item in this.Items)
                    {
-                        str = item.SubItems[i].Text;
-                        width = (int)graphics.MeasureString(str, font).Width;
-                        if (width > MaxWidth)
-                        {
-                            MaxWidth = width;
-                        }
+                        // 整行视作相同字形，不单独计算每个单元格
+                        font = item.SubItems[i].Font;
+                        string str = item.SubItems[i].Text;
+                        if (str.Length > MaxStr.Length) // 未考虑非等宽问题
+                            MaxStr = str;
                    }
-                    if (i == 0)
-                    {
-                        this.Columns[i].Width = MaxWidth;
-                    }
-                    this.Columns[i].Width = MaxWidth;
+                    int strWidth = (int)graphics.MeasureString(MaxStr, font).Width;
+                    c.Width = System.Math.Max(cWidth, strWidth);
                }
+                this.ResumeLayout();
            }
            catch { }
        }
--- a/v2rayN/v2rayN/Base/StringEx.cs
+++ b/v2rayN/v2rayN/Base/StringEx.cs
@@ -24,7 +24,7 @@ namespace v2rayN.Base

        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/Base/WebClientEx.cs
+++ b/v2rayN/v2rayN/Base/WebClientEx.cs
@@ -17,17 +17,7 @@ namespace v2rayN.Base
        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
@@ -5,10 +5,8 @@ using v2rayN.Mode;

 namespace v2rayN.Forms
 {
-    public partial class AddServer2Form : BaseForm
-    {
-        public int EditIndex { get; set; }
-        VmessItem vmessItem;
+    public partial class AddServer2Form : BaseServerForm
+    { 

        public AddServer2Form()
        {
@@ -63,7 +61,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.Designer.cs
+++ b/v2rayN/v2rayN/Forms/AddServer3Form.Designer.cs
@@ -55,14 +55,15 @@
            // 
            // btnClose
            // 
-            this.btnClose.DialogResult = System.Windows.Forms.DialogResult.Cancel;
            resources.ApplyResources(this.btnClose, "btnClose");
+            this.btnClose.DialogResult = System.Windows.Forms.DialogResult.Cancel;
            this.btnClose.Name = "btnClose";
            this.btnClose.UseVisualStyleBackColor = true;
            this.btnClose.Click += new System.EventHandler(this.btnClose_Click);
            // 
            // groupBox1
            // 
+            resources.ApplyResources(this.groupBox1, "groupBox1");
            this.groupBox1.Controls.Add(this.label13);
            this.groupBox1.Controls.Add(this.cmbSecurity);
            this.groupBox1.Controls.Add(this.txtRemarks);
@@ -74,7 +75,6 @@
            this.groupBox1.Controls.Add(this.label2);
            this.groupBox1.Controls.Add(this.txtAddress);
            this.groupBox1.Controls.Add(this.label1);
-            resources.ApplyResources(this.groupBox1, "groupBox1");
            this.groupBox1.Name = "groupBox1";
            this.groupBox1.TabStop = false;
            // 
@@ -85,6 +85,7 @@
            // 
            // cmbSecurity
            // 
+            resources.ApplyResources(this.cmbSecurity, "cmbSecurity");
            this.cmbSecurity.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
            this.cmbSecurity.FormattingEnabled = true;
            this.cmbSecurity.Items.AddRange(new object[] {
@@ -96,7 +97,6 @@
            resources.GetString("cmbSecurity.Items5"),
            resources.GetString("cmbSecurity.Items6"),
            resources.GetString("cmbSecurity.Items7")});
-            resources.ApplyResources(this.cmbSecurity, "cmbSecurity");
            this.cmbSecurity.Name = "cmbSecurity";
            // 
            // txtRemarks
@@ -146,9 +146,9 @@
            // 
            // panel2
            // 
+            resources.ApplyResources(this.panel2, "panel2");
            this.panel2.Controls.Add(this.btnClose);
            this.panel2.Controls.Add(this.btnOK);
-            resources.ApplyResources(this.panel2, "panel2");
            this.panel2.Name = "panel2";
            // 
            // btnOK
@@ -165,22 +165,22 @@
            // 
            // menuServer
            // 
+            resources.ApplyResources(this.menuServer, "menuServer");
            this.menuServer.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
            this.MenuItem1});
-            resources.ApplyResources(this.menuServer, "menuServer");
            this.menuServer.Name = "menuServer";
            // 
            // MenuItem1
            // 
+            resources.ApplyResources(this.MenuItem1, "MenuItem1");
            this.MenuItem1.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
            this.menuItemImportClipboard});
            this.MenuItem1.Name = "MenuItem1";
-            resources.ApplyResources(this.MenuItem1, "MenuItem1");
            // 
            // menuItemImportClipboard
            // 
-            this.menuItemImportClipboard.Name = "menuItemImportClipboard";
            resources.ApplyResources(this.menuItemImportClipboard, "menuItemImportClipboard");
+            this.menuItemImportClipboard.Name = "menuItemImportClipboard";
            this.menuItemImportClipboard.Click += new System.EventHandler(this.menuItemImportClipboard_Click);
            // 
            // AddServer3Form
--- a/v2rayN/v2rayN/Forms/AddServer3Form.cs
+++ b/v2rayN/v2rayN/Forms/AddServer3Form.cs
@@ -5,10 +5,8 @@ using v2rayN.Mode;

 namespace v2rayN.Forms
 {
-    public partial class AddServer3Form : BaseForm
-    {
-        public int EditIndex { get; set; }
-        VmessItem vmessItem = null;
+    public partial class AddServer3Form : BaseServerForm
+    { 

        public AddServer3Form()
        {
@@ -96,7 +94,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 +119,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,489 +118,489 @@
    <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="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>
-  <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>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 name="label3.Size" type="System.Drawing.Size, System.Drawing">
+    <value>53, 12</value>
  </data>
-  <data name="label13.Text" xml:space="preserve">
-    <value>* Fill in manually</value>
+  <data name="&gt;&gt;label6.Name" xml:space="preserve">
+    <value>label6</value>
  </data>
-  <data name="&gt;&gt;label13.Name" xml:space="preserve">
-    <value>label13</value>
+  <data name="&gt;&gt;cmbSecurity.Parent" xml:space="preserve">
+    <value>groupBox1</value>
  </data>
-  <data name="&gt;&gt;label13.Type" xml:space="preserve">
+  <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;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="menuServer.Size" type="System.Drawing.Size, System.Drawing">
+    <value>547, 25</value>
+  </data>
+  <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="txtRemarks.TabIndex" type="System.Int32, mscorlib">
+    <value>11</value>
+  </data>
+  <data name="&gt;&gt;menuServer.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
  <data name="&gt;&gt;label13.Parent" xml:space="preserve">
    <value>groupBox1</value>
  </data>
+  <data name="label5.TabIndex" type="System.Int32, mscorlib">
+    <value>8</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>
+  <data name="MenuItem1.Text" xml:space="preserve">
+    <value>Import configuration file</value>
+  </data>
+  <data name="&gt;&gt;txtPort.Parent" xml:space="preserve">
+    <value>groupBox1</value>
+  </data>
+  <data name="&gt;&gt;panel1.Name" xml:space="preserve">
+    <value>panel1</value>
+  </data>
+  <data name="groupBox1.TabIndex" type="System.Int32, mscorlib">
+    <value>3</value>
+  </data>
+  <data name="label3.Text" xml:space="preserve">
+    <value>Password</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;label6.Parent" xml:space="preserve">
+    <value>groupBox1</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;menuItemImportClipboard.Name" xml:space="preserve">
+    <value>menuItemImportClipboard</value>
+  </data>
+  <data name="groupBox1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+    <value>Fill</value>
+  </data>
+  <data name="&gt;&gt;label3.Parent" xml:space="preserve">
+    <value>groupBox1</value>
+  </data>
+  <data name="menuServer.TabIndex" type="System.Int32, mscorlib">
+    <value>8</value>
+  </data>
+  <data name="label1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>89, 12</value>
+  </data>
+  <data name="txtAddress.Location" type="System.Drawing.Point, System.Drawing">
+    <value>127, 27</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>
  <data name="&gt;&gt;label13.ZOrder" xml:space="preserve">
    <value>0</value>
  </data>
  <data name="cmbSecurity.Items" xml:space="preserve">
    <value>aes-256-cfb</value>
  </data>
-  <data name="cmbSecurity.Items1" xml:space="preserve">
-    <value>aes-128-cfb</value>
-  </data>
-  <data name="cmbSecurity.Items2" xml:space="preserve">
-    <value>chacha20</value>
-  </data>
-  <data name="cmbSecurity.Items3" xml:space="preserve">
-    <value>chacha20-ietf</value>
-  </data>
-  <data name="cmbSecurity.Items4" xml:space="preserve">
-    <value>aes-256-gcm</value>
-  </data>
-  <data name="cmbSecurity.Items5" xml:space="preserve">
-    <value>aes-128-gcm</value>
-  </data>
-  <data name="cmbSecurity.Items6" xml:space="preserve">
-    <value>chacha20-poly1305</value>
-  </data>
-  <data name="cmbSecurity.Items7" xml:space="preserve">
-    <value>chacha20-ietf-poly1305</value>
-  </data>
-  <data name="cmbSecurity.Location" type="System.Drawing.Point, System.Drawing">
-    <value>127, 120</value>
-  </data>
-  <data name="cmbSecurity.Size" type="System.Drawing.Size, System.Drawing">
-    <value>194, 20</value>
-  </data>
  <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="txtId.TabIndex" type="System.Int32, mscorlib">
+    <value>5</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="btnOK.Location" type="System.Drawing.Point, System.Drawing">
+    <value>303, 17</value>
  </data>
-  <data name="&gt;&gt;cmbSecurity.Parent" xml:space="preserve">
-    <value>groupBox1</value>
+  <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="&gt;&gt;cmbSecurity.ZOrder" xml:space="preserve">
-    <value>1</value>
+  <data name="label3.TabIndex" type="System.Int32, mscorlib">
+    <value>4</value>
  </data>
-  <data name="txtRemarks.Location" type="System.Drawing.Point, System.Drawing">
-    <value>127, 154</value>
+  <data name="&gt;&gt;MenuItem1.Name" xml:space="preserve">
+    <value>MenuItem1</value>
  </data>
-  <data name="txtRemarks.Size" type="System.Drawing.Size, System.Drawing">
-    <value>194, 21</value>
+  <data name="&gt;&gt;btnClose.ZOrder" xml:space="preserve">
+    <value>0</value>
  </data>
-  <data name="txtRemarks.TabIndex" type="System.Int32, mscorlib">
-    <value>11</value>
+  <data name="txtAddress.Size" type="System.Drawing.Size, System.Drawing">
+    <value>359, 21</value>
  </data>
-  <data name="&gt;&gt;txtRemarks.Name" xml:space="preserve">
-    <value>txtRemarks</value>
-  </data>
-  <data name="&gt;&gt;txtRemarks.Type" xml:space="preserve">
+  <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;txtRemarks.Parent" xml:space="preserve">
-    <value>groupBox1</value>
+  <data name="btnClose.Location" type="System.Drawing.Point, System.Drawing">
+    <value>396, 17</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">
-    <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">
+  <data name="&gt;&gt;label2.ZOrder" xml:space="preserve">
    <value>8</value>
  </data>
+  <data name="menuServer.Location" type="System.Drawing.Point, System.Drawing">
+    <value>0, 0</value>
+  </data>
+  <data name="&gt;&gt;label1.Name" xml:space="preserve">
+    <value>label1</value>
+  </data>
+  <data name="panel2.Size" type="System.Drawing.Size, System.Drawing">
+    <value>547, 60</value>
+  </data>
+  <data name="panel1.Location" type="System.Drawing.Point, System.Drawing">
+    <value>0, 25</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 name="&gt;&gt;txtRemarks.Parent" xml:space="preserve">
+    <value>groupBox1</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 name="label2.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="label13.TabIndex" type="System.Int32, mscorlib">
+    <value>22</value>
+  </data>
+  <data name="MenuItem1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>162, 21</value>
+  </data>
+  <data name="cmbSecurity.Location" type="System.Drawing.Point, System.Drawing">
+    <value>127, 123</value>
+  </data>
+  <data name="txtId.Location" type="System.Drawing.Point, System.Drawing">
+    <value>127, 91</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 name="&gt;&gt;btnOK.Parent" xml:space="preserve">
+    <value>panel2</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">
+  <data name="btnOK.TabIndex" type="System.Int32, mscorlib">
    <value>5</value>
  </data>
+  <data name="&gt;&gt;panel1.ZOrder" xml:space="preserve">
+    <value>2</value>
+  </data>
+  <data name="label6.Text" xml:space="preserve">
+    <value>Alias (remarks)</value>
+  </data>
+  <data name="&gt;&gt;txtId.Parent" xml:space="preserve">
+    <value>groupBox1</value>
+  </data>
+  <data name="label3.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="&gt;&gt;label5.Name" xml:space="preserve">
+    <value>label5</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">
+  <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;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>
-  <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 name="&gt;&gt;groupBox1.Name" xml:space="preserve">
+    <value>groupBox1</value>
+  </data>
+  <data name="&gt;&gt;btnOK.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
+  <data name="&gt;&gt;$this.Name" xml:space="preserve">
+    <value>AddServer3Form</value>
+  </data>
+  <data name="txtRemarks.Size" type="System.Drawing.Size, System.Drawing">
+    <value>194, 21</value>
+  </data>
+  <data name="&gt;&gt;label2.Parent" xml:space="preserve">
+    <value>groupBox1</value>
+  </data>
+  <data name="txtPort.Location" type="System.Drawing.Point, System.Drawing">
+    <value>127, 59</value>
+  </data>
+  <data name="&gt;&gt;groupBox1.ZOrder" xml:space="preserve">
+    <value>0</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;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;groupBox1.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="label2.Size" type="System.Drawing.Size, System.Drawing">
+    <value>71, 12</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;panel1.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="label5.Location" type="System.Drawing.Point, System.Drawing">
+    <value>12, 124</value>
+  </data>
+  <data name="label2.TabIndex" type="System.Int32, mscorlib">
+    <value>2</value>
+  </data>
+  <data name="&gt;&gt;label1.ZOrder" xml:space="preserve">
+    <value>10</value>
+  </data>
+  <data name="&gt;&gt;txtPort.Name" xml:space="preserve">
+    <value>txtPort</value>
+  </data>
+  <data name="cmbSecurity.Items1" xml:space="preserve">
+    <value>aes-128-cfb</value>
+  </data>
+  <data name="panel1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>547, 10</value>
+  </data>
+  <data name="groupBox1.Location" type="System.Drawing.Point, System.Drawing">
+    <value>0, 35</value>
+  </data>
+  <data name="&gt;&gt;txtId.ZOrder" xml:space="preserve">
+    <value>5</value>
+  </data>
+  <data name="menuItemImportClipboard.Size" type="System.Drawing.Size, System.Drawing">
+    <value>235, 22</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="$this.Text" xml:space="preserve">
+    <value>Edit or add a [Shadowsocks] server</value>
+  </data>
+  <data name="btnOK.Text" xml:space="preserve">
+    <value>&amp;OK</value>
+  </data>
+  <data name="cmbSecurity.Items2" xml:space="preserve">
+    <value>chacha20</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>
+  <data name="&gt;&gt;btnClose.Name" xml:space="preserve">
+    <value>btnClose</value>
+  </data>
+  <data name="&gt;&gt;btnClose.Parent" xml:space="preserve">
+    <value>panel2</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 name="&gt;&gt;menuServer.ZOrder" xml:space="preserve">
+    <value>3</value>
  </data>
-  <data name="&gt;&gt;label1.Name" xml:space="preserve">
-    <value>label1</value>
+  <data name="label3.Location" type="System.Drawing.Point, System.Drawing">
+    <value>12, 93</value>
  </data>
-  <data name="&gt;&gt;label1.Type" xml:space="preserve">
+  <data name="cmbSecurity.Size" type="System.Drawing.Size, System.Drawing">
+    <value>194, 20</value>
+  </data>
+  <data name="label6.TabIndex" type="System.Int32, mscorlib">
+    <value>10</value>
+  </data>
+  <data name="cmbSecurity.Items3" xml:space="preserve">
+    <value>chacha20-ietf</value>
+  </data>
+  <data name="label6.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="&gt;&gt;panel2.Name" xml:space="preserve">
+    <value>panel2</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="txtPort.Size" type="System.Drawing.Size, System.Drawing">
+    <value>194, 21</value>
+  </data>
+  <data name="txtAddress.TabIndex" type="System.Int32, mscorlib">
+    <value>1</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="panel1.TabIndex" type="System.Int32, mscorlib">
+    <value>6</value>
+  </data>
+  <data name="&gt;&gt;panel2.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
+  <data name="panel2.TabIndex" type="System.Int32, mscorlib">
+    <value>7</value>
+  </data>
+  <data name="&gt;&gt;label13.Name" xml:space="preserve">
+    <value>label13</value>
+  </data>
+  <data name="cmbSecurity.Items4" xml:space="preserve">
+    <value>aes-256-gcm</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;label1.Parent" xml:space="preserve">
    <value>groupBox1</value>
  </data>
-  <data name="&gt;&gt;label1.ZOrder" xml:space="preserve">
-    <value>10</value>
+  <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>
-  <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="&gt;&gt;label3.Name" xml:space="preserve">
+    <value>label3</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 name="label2.Text" xml:space="preserve">
+    <value>Server port</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 name="panel2.Location" type="System.Drawing.Point, System.Drawing">
+    <value>0, 231</value>
  </data>
-  <data name="&gt;&gt;panel2.ZOrder" xml:space="preserve">
-    <value>1</value>
+  <data name="&gt;&gt;txtAddress.ZOrder" xml:space="preserve">
+    <value>9</value>
  </data>
-  <data name="panel1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
-    <value>Top</value>
+  <data name="cmbSecurity.Items5" xml:space="preserve">
+    <value>aes-128-gcm</value>
  </data>
-  <data name="panel1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 25</value>
+  <data name="&gt;&gt;label5.ZOrder" xml:space="preserve">
+    <value>4</value>
  </data>
-  <data name="panel1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>547, 10</value>
+  <data name="btnClose.Text" xml:space="preserve">
+    <value>&amp;Cancel</value>
  </data>
-  <data name="panel1.TabIndex" type="System.Int32, mscorlib">
-    <value>6</value>
+  <data name="label13.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
  </data>
-  <data name="&gt;&gt;panel1.Name" xml:space="preserve">
-    <value>panel1</value>
+  <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
+    <value>6, 12</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="label5.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
  </data>
-  <data name="&gt;&gt;panel1.Parent" xml:space="preserve">
-    <value>$this</value>
-  </data>
-  <data name="&gt;&gt;panel1.ZOrder" xml:space="preserve">
-    <value>2</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>
-  <data name="menuItemImportClipboard.Text" xml:space="preserve">
-    <value>Import URL from clipboard</value>
-  </data>
-  <data name="MenuItem1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>162, 21</value>
-  </data>
-  <data name="MenuItem1.Text" xml:space="preserve">
-    <value>Import configuration file</value>
-  </data>
-  <data name="menuServer.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 0</value>
-  </data>
-  <data name="menuServer.Size" type="System.Drawing.Size, System.Drawing">
-    <value>547, 25</value>
-  </data>
-  <data name="menuServer.TabIndex" type="System.Int32, mscorlib">
-    <value>8</value>
+  <data name="label1.Text" xml:space="preserve">
+    <value>Server address</value>
  </data>
  <data name="&gt;&gt;menuServer.Name" xml:space="preserve">
    <value>menuServer</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="&gt;&gt;txtAddress.Name" xml:space="preserve">
+    <value>txtAddress</value>
  </data>
-  <data name="&gt;&gt;menuServer.Parent" xml:space="preserve">
+  <data name="txtRemarks.Location" type="System.Drawing.Point, System.Drawing">
+    <value>127, 154</value>
+  </data>
+  <data name="cmbSecurity.Items6" xml:space="preserve">
+    <value>chacha20-poly1305</value>
+  </data>
+  <data name="label6.Size" type="System.Drawing.Size, System.Drawing">
+    <value>95, 12</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="label13.Text" xml:space="preserve">
+    <value>* Fill in manually</value>
+  </data>
+  <data name="&gt;&gt;txtPort.ZOrder" xml:space="preserve">
+    <value>7</value>
+  </data>
+  <data name="&gt;&gt;label2.Name" xml:space="preserve">
+    <value>label2</value>
+  </data>
+  <data name="label2.Location" type="System.Drawing.Point, System.Drawing">
+    <value>12, 62</value>
+  </data>
+  <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
+    <value>547, 291</value>
+  </data>
+  <data name="cmbSecurity.Items7" xml:space="preserve">
+    <value>chacha20-ietf-poly1305</value>
+  </data>
+  <data name="&gt;&gt;btnOK.Name" xml:space="preserve">
+    <value>btnOK</value>
+  </data>
+  <data name="&gt;&gt;cmbSecurity.Name" xml:space="preserve">
+    <value>cmbSecurity</value>
+  </data>
+  <data name="&gt;&gt;panel2.Parent" xml:space="preserve">
    <value>$this</value>
  </data>
-  <data name="&gt;&gt;menuServer.ZOrder" xml:space="preserve">
+  <data name="groupBox1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>547, 196</value>
+  </data>
+  <data name="&gt;&gt;label6.ZOrder" xml:space="preserve">
+    <value>3</value>
+  </data>
+  <data name="btnClose.Size" type="System.Drawing.Size, System.Drawing">
+    <value>75, 23</value>
+  </data>
+  <data name="&gt;&gt;label3.ZOrder" xml:space="preserve">
+    <value>6</value>
+  </data>
+  <data name="label13.Location" type="System.Drawing.Point, System.Drawing">
+    <value>337, 158</value>
+  </data>
+  <data name="label5.Size" type="System.Drawing.Size, System.Drawing">
+    <value>65, 12</value>
+  </data>
+  <data name="btnClose.TabIndex" type="System.Int32, mscorlib">
+    <value>4</value>
+  </data>
+  <data name="&gt;&gt;txtRemarks.ZOrder" xml:space="preserve">
+    <value>2</value>
+  </data>
+  <data name="&gt;&gt;cmbSecurity.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
+  <data name="txtId.PasswordChar" type="System.Char, mscorlib" xml:space="preserve">
+    <value>*</value>
+  </data>
+  <data name="btnOK.Size" type="System.Drawing.Size, System.Drawing">
+    <value>75, 23</value>
+  </data>
+  <data name="menuItemImportClipboard.Text" xml:space="preserve">
+    <value>Import URL from clipboard</value>
+  </data>
+  <data name="&gt;&gt;txtAddress.Parent" xml:space="preserve">
+    <value>groupBox1</value>
+  </data>
+  <data name="groupBox1.Text" xml:space="preserve">
+    <value>Server</value>
+  </data>
+  <data name="&gt;&gt;txtRemarks.Name" xml:space="preserve">
+    <value>txtRemarks</value>
+  </data>
+  <data name="label6.Location" type="System.Drawing.Point, System.Drawing">
+    <value>12, 155</value>
+  </data>
+  <data name="label1.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="txtId.Size" type="System.Drawing.Size, System.Drawing">
+    <value>278, 21</value>
+  </data>
+  <data name="panel1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+    <value>Top</value>
+  </data>
+  <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>
-  <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
-    <value>547, 291</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>
+  <metadata name="menuServer.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
 </root>
--- a/v2rayN/v2rayN/Forms/AddServer3Form.zh-Hans.resx
+++ b/v2rayN/v2rayN/Forms/AddServer3Form.zh-Hans.resx
@@ -120,39 +120,58 @@
  <data name="btnClose.Text" xml:space="preserve">
    <value>取消(&amp;C)</value>
  </data>
+  <data name="groupBox1.Text" xml:space="preserve">
+    <value>服务器</value>
+  </data>
  <data name="label13.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="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>53, 12</value>
+  </data>
  <data name="label5.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="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="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>
-  <data name="menuItemScanScreen.Text" xml:space="preserve">
-    <value>扫描屏幕上的二维码</value>
+  <data name="MenuItem1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>92, 21</value>
  </data>
  <data name="MenuItem1.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="$this.Text" xml:space="preserve">
    <value>编辑或添加[Shadowsocks]服务器</value>
  </data>
--- a/v2rayN/v2rayN/Forms/AddServer4Form.Designer.cs
+++ b/v2rayN/v2rayN/Forms/AddServer4Form.Designer.cs
@@ -55,14 +55,15 @@
            // 
            // btnClose
            // 
-            this.btnClose.DialogResult = System.Windows.Forms.DialogResult.Cancel;
            resources.ApplyResources(this.btnClose, "btnClose");
+            this.btnClose.DialogResult = System.Windows.Forms.DialogResult.Cancel;
            this.btnClose.Name = "btnClose";
            this.btnClose.UseVisualStyleBackColor = true;
            this.btnClose.Click += new System.EventHandler(this.btnClose_Click);
            // 
            // groupBox1
            // 
+            resources.ApplyResources(this.groupBox1, "groupBox1");
            this.groupBox1.Controls.Add(this.txtSecurity);
            this.groupBox1.Controls.Add(this.label4);
            this.groupBox1.Controls.Add(this.txtId);
@@ -74,7 +75,6 @@
            this.groupBox1.Controls.Add(this.label2);
            this.groupBox1.Controls.Add(this.txtAddress);
            this.groupBox1.Controls.Add(this.label1);
-            resources.ApplyResources(this.groupBox1, "groupBox1");
            this.groupBox1.Name = "groupBox1";
            this.groupBox1.TabStop = false;
            // 
@@ -135,9 +135,9 @@
            // 
            // panel2
            // 
+            resources.ApplyResources(this.panel2, "panel2");
            this.panel2.Controls.Add(this.btnClose);
            this.panel2.Controls.Add(this.btnOK);
-            resources.ApplyResources(this.panel2, "panel2");
            this.panel2.Name = "panel2";
            // 
            // btnOK
@@ -154,22 +154,22 @@
            // 
            // menuServer
            // 
+            resources.ApplyResources(this.menuServer, "menuServer");
            this.menuServer.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
            this.MenuItem1});
-            resources.ApplyResources(this.menuServer, "menuServer");
            this.menuServer.Name = "menuServer";
            // 
            // MenuItem1
            // 
+            resources.ApplyResources(this.MenuItem1, "MenuItem1");
            this.MenuItem1.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
            this.menuItemImportClipboard});
            this.MenuItem1.Name = "MenuItem1";
-            resources.ApplyResources(this.MenuItem1, "MenuItem1");
            // 
            // menuItemImportClipboard
            // 
-            this.menuItemImportClipboard.Name = "menuItemImportClipboard";
            resources.ApplyResources(this.menuItemImportClipboard, "menuItemImportClipboard");
+            this.menuItemImportClipboard.Name = "menuItemImportClipboard";
            this.menuItemImportClipboard.Click += new System.EventHandler(this.menuItemImportClipboard_Click);
            // 
            // AddServer4Form
--- a/v2rayN/v2rayN/Forms/AddServer4Form.cs
+++ b/v2rayN/v2rayN/Forms/AddServer4Form.cs
@@ -5,10 +5,8 @@ using v2rayN.Mode;

 namespace v2rayN.Forms
 {
-    public partial class AddServer4Form : BaseForm
-    {
-        public int EditIndex { get; set; }
-        VmessItem vmessItem = null;
+    public partial class AddServer4Form : BaseServerForm
+    { 

        public AddServer4Form()
        {
@@ -85,7 +83,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 +108,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,471 +118,471 @@
    <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="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>
-  <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>0</value>
-  </data>
-  <data name="txtSecurity.Location" type="System.Drawing.Point, System.Drawing">
-    <value>127, 84</value>
-  </data>
-  <data name="txtSecurity.Size" type="System.Drawing.Size, System.Drawing">
-    <value>278, 21</value>
-  </data>
-  <data name="txtSecurity.TabIndex" type="System.Int32, mscorlib">
-    <value>26</value>
-  </data>
-  <data name="&gt;&gt;txtSecurity.Name" xml:space="preserve">
-    <value>txtSecurity</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>
-  <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">
-    <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>
-  <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">
-    <value>89, 12</value>
-  </data>
-  <data name="label4.TabIndex" type="System.Int32, mscorlib">
-    <value>25</value>
-  </data>
-  <data name="label4.Text" xml:space="preserve">
-    <value>User(Optional)</value>
-  </data>
-  <data name="&gt;&gt;label4.Name" xml:space="preserve">
-    <value>label4</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>
-  <data name="&gt;&gt;label4.Parent" xml:space="preserve">
-    <value>groupBox1</value>
-  </data>
-  <data name="&gt;&gt;label4.ZOrder" xml:space="preserve">
-    <value>1</value>
-  </data>
-  <data name="txtId.Location" type="System.Drawing.Point, System.Drawing">
-    <value>127, 117</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>24</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>2</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, 121</value>
+  <data name="label13.Size" type="System.Drawing.Size, System.Drawing">
+    <value>113, 12</value>
  </data>
  <data name="label3.Size" type="System.Drawing.Size, System.Drawing">
    <value>113, 12</value>
  </data>
-  <data name="label3.TabIndex" type="System.Int32, mscorlib">
-    <value>23</value>
+  <data name="&gt;&gt;label6.Name" xml:space="preserve">
+    <value>label6</value>
  </data>
-  <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">
+  <data name="&gt;&gt;txtSecurity.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">
+  <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="label6.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="&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="label13.Size" type="System.Drawing.Size, System.Drawing">
-    <value>113, 12</value>
+  <data name="&gt;&gt;panel2.Name" xml:space="preserve">
+    <value>panel2</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>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 name="menuServer.Size" type="System.Drawing.Size, System.Drawing">
+    <value>547, 25</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>
+  <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>
-  <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 name="MenuItem1.Text" xml:space="preserve">
+    <value>Import configuration file</value>
  </data>
-  <data name="&gt;&gt;txtRemarks.Parent" xml:space="preserve">
-    <value>groupBox1</value>
+  <data name="&gt;&gt;panel1.Name" xml:space="preserve">
+    <value>panel1</value>
  </data>
-  <data name="&gt;&gt;txtRemarks.ZOrder" xml:space="preserve">
-    <value>5</value>
+  <data name="groupBox1.TabIndex" type="System.Int32, mscorlib">
+    <value>3</value>
  </data>
-  <data name="label6.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
+  <data name="label3.Text" xml:space="preserve">
+    <value>Password(Optional)</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">
+  <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;label6.Parent" xml:space="preserve">
    <value>groupBox1</value>
  </data>
-  <data name="&gt;&gt;label6.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>
-  <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 name="&gt;&gt;menuItemImportClipboard.Name" xml:space="preserve">
+    <value>menuItemImportClipboard</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">
+  <data name="&gt;&gt;label3.Parent" 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>
-  <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, 25</value>
-  </data>
-  <data name="panel1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>547, 10</value>
-  </data>
-  <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>
-  <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="&gt;&gt;panel1.Parent" xml:space="preserve">
-    <value>$this</value>
-  </data>
-  <data name="&gt;&gt;panel1.ZOrder" xml:space="preserve">
-    <value>2</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>
-  <data name="menuItemImportClipboard.Text" xml:space="preserve">
-    <value>Import URL from clipboard</value>
-  </data>
-  <data name="MenuItem1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>162, 21</value>
-  </data>
-  <data name="MenuItem1.Text" xml:space="preserve">
-    <value>Import configuration file</value>
-  </data>
-  <data name="menuServer.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 0</value>
-  </data>
-  <data name="menuServer.Size" type="System.Drawing.Size, System.Drawing">
-    <value>547, 25</value>
-  </data>
  <data name="menuServer.TabIndex" type="System.Int32, mscorlib">
    <value>8</value>
  </data>
-  <data name="&gt;&gt;menuServer.Name" xml:space="preserve">
-    <value>menuServer</value>
+  <data name="label1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>89, 12</value>
+  </data>
+  <data name="txtAddress.Location" type="System.Drawing.Point, System.Drawing">
+    <value>127, 27</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>
+  <data name="&gt;&gt;label13.ZOrder" xml:space="preserve">
+    <value>4</value>
+  </data>
+  <data name="$this.Text" xml:space="preserve">
+    <value>Edit or add a [Socks] server</value>
+  </data>
+  <data name="label3.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="&gt;&gt;label1.ZOrder" xml:space="preserve">
+    <value>10</value>
+  </data>
+  <data name="txtId.TabIndex" type="System.Int32, mscorlib">
+    <value>24</value>
+  </data>
+  <data name="menuItemImportClipboard.Text" xml:space="preserve">
+    <value>Import URL from clipboard</value>
+  </data>
+  <data name="btnOK.Location" type="System.Drawing.Point, System.Drawing">
+    <value>303, 17</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="label3.TabIndex" type="System.Int32, mscorlib">
+    <value>23</value>
+  </data>
+  <data name="&gt;&gt;MenuItem1.Name" xml:space="preserve">
+    <value>MenuItem1</value>
+  </data>
+  <data name="&gt;&gt;btnClose.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <data name="txtAddress.Size" type="System.Drawing.Size, System.Drawing">
+    <value>359, 21</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="btnClose.Location" type="System.Drawing.Point, System.Drawing">
+    <value>396, 17</value>
+  </data>
+  <data name="&gt;&gt;label2.ZOrder" xml:space="preserve">
+    <value>8</value>
+  </data>
+  <data name="menuServer.Location" type="System.Drawing.Point, System.Drawing">
+    <value>0, 0</value>
+  </data>
+  <data name="&gt;&gt;label1.Name" xml:space="preserve">
+    <value>label1</value>
+  </data>
+  <data name="panel2.Size" type="System.Drawing.Size, System.Drawing">
+    <value>547, 60</value>
+  </data>
+  <data name="panel1.Location" type="System.Drawing.Point, System.Drawing">
+    <value>0, 25</value>
+  </data>
+  <data name="&gt;&gt;txtRemarks.Parent" xml:space="preserve">
+    <value>groupBox1</value>
+  </data>
+  <data name="label2.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="label13.TabIndex" type="System.Int32, mscorlib">
+    <value>22</value>
+  </data>
+  <data name="MenuItem1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>162, 21</value>
+  </data>
+  <data name="label3.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="groupBox1.Text" xml:space="preserve">
+    <value>Server</value>
+  </data>
+  <data name="txtId.Location" type="System.Drawing.Point, System.Drawing">
+    <value>127, 120</value>
+  </data>
+  <data name="&gt;&gt;btnOK.Parent" xml:space="preserve">
+    <value>panel2</value>
+  </data>
+  <data name="&gt;&gt;label1.Parent" xml:space="preserve">
+    <value>groupBox1</value>
+  </data>
+  <data name="btnOK.TabIndex" type="System.Int32, mscorlib">
+    <value>5</value>
+  </data>
+  <data name="&gt;&gt;panel1.ZOrder" xml:space="preserve">
+    <value>2</value>
+  </data>
+  <data name="txtSecurity.TabIndex" type="System.Int32, mscorlib">
+    <value>26</value>
+  </data>
+  <data name="&gt;&gt;txtId.Parent" xml:space="preserve">
+    <value>groupBox1</value>
+  </data>
+  <data name="&gt;&gt;menuServer.Name" xml:space="preserve">
+    <value>menuServer</value>
+  </data>
+  <data name="&gt;&gt;label13.Parent" xml:space="preserve">
+    <value>groupBox1</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="label4.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="&gt;&gt;txtId.Name" xml:space="preserve">
+    <value>txtId</value>
+  </data>
+  <data name="menuItemImportClipboard.Size" type="System.Drawing.Size, System.Drawing">
+    <value>235, 22</value>
+  </data>
+  <data name="label4.Location" type="System.Drawing.Point, System.Drawing">
+    <value>12, 93</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;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="label1.Location" type="System.Drawing.Point, System.Drawing">
+    <value>12, 31</value>
+  </data>
+  <data name="&gt;&gt;groupBox1.Name" xml:space="preserve">
+    <value>groupBox1</value>
+  </data>
+  <data name="&gt;&gt;btnOK.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
+  <data name="&gt;&gt;$this.Name" xml:space="preserve">
+    <value>AddServer4Form</value>
+  </data>
+  <data name="txtRemarks.Size" type="System.Drawing.Size, System.Drawing">
+    <value>194, 21</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>
+  <data name="&gt;&gt;txtPort.Parent" xml:space="preserve">
+    <value>groupBox1</value>
+  </data>
+  <data name="txtPort.Location" type="System.Drawing.Point, System.Drawing">
+    <value>127, 58</value>
+  </data>
+  <data name="&gt;&gt;label4.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
+  <data name="&gt;&gt;groupBox1.ZOrder" xml:space="preserve">
+    <value>0</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;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;groupBox1.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="label2.Size" type="System.Drawing.Size, System.Drawing">
+    <value>71, 12</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;panel1.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;label2.Parent" xml:space="preserve">
+    <value>groupBox1</value>
+  </data>
+  <data name="&gt;&gt;txtPort.Name" xml:space="preserve">
+    <value>txtPort</value>
+  </data>
+  <data name="&gt;&gt;btnClose.Parent" xml:space="preserve">
+    <value>panel2</value>
+  </data>
+  <data name="panel1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>547, 10</value>
+  </data>
+  <data name="txtId.PasswordChar" type="System.Char, mscorlib" xml:space="preserve">
+    <value>*</value>
+  </data>
+  <data name="&gt;&gt;txtId.ZOrder" xml:space="preserve">
+    <value>2</value>
+  </data>
+  <data name="&gt;&gt;txtSecurity.Name" xml:space="preserve">
+    <value>txtSecurity</value>
+  </data>
  <data name="&gt;&gt;menuServer.Parent" xml:space="preserve">
    <value>$this</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;label4.Name" xml:space="preserve">
+    <value>label4</value>
+  </data>
+  <data name="btnOK.Text" xml:space="preserve">
+    <value>&amp;OK</value>
+  </data>
+  <data name="&gt;&gt;btnClose.Name" xml:space="preserve">
+    <value>btnClose</value>
+  </data>
+  <data name="txtSecurity.Size" type="System.Drawing.Size, System.Drawing">
+    <value>278, 21</value>
+  </data>
+  <data name="label1.TabIndex" type="System.Int32, mscorlib">
+    <value>0</value>
+  </data>
  <data name="&gt;&gt;menuServer.ZOrder" xml:space="preserve">
    <value>3</value>
  </data>
+  <data name="label3.Location" type="System.Drawing.Point, System.Drawing">
+    <value>12, 124</value>
+  </data>
+  <data name="label2.TabIndex" type="System.Int32, mscorlib">
+    <value>2</value>
+  </data>
+  <data name="label6.TabIndex" type="System.Int32, mscorlib">
+    <value>10</value>
+  </data>
+  <data name="&gt;&gt;btnOK.Name" xml:space="preserve">
+    <value>btnOK</value>
+  </data>
+  <data name="txtPort.Size" type="System.Drawing.Size, System.Drawing">
+    <value>194, 21</value>
+  </data>
+  <data name="txtAddress.TabIndex" type="System.Int32, mscorlib">
+    <value>1</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="panel1.TabIndex" type="System.Int32, mscorlib">
+    <value>6</value>
+  </data>
+  <data name="&gt;&gt;panel2.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
+  <data name="panel2.TabIndex" type="System.Int32, mscorlib">
+    <value>7</value>
+  </data>
+  <data name="&gt;&gt;label13.Name" xml:space="preserve">
+    <value>label13</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;txtSecurity.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;$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;label3.Name" xml:space="preserve">
+    <value>label3</value>
+  </data>
+  <data name="label2.Text" xml:space="preserve">
+    <value>Server port</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="panel2.Location" type="System.Drawing.Point, System.Drawing">
+    <value>0, 231</value>
+  </data>
+  <data name="&gt;&gt;txtAddress.ZOrder" xml:space="preserve">
+    <value>9</value>
+  </data>
+  <data name="btnClose.Text" xml:space="preserve">
+    <value>&amp;Cancel</value>
+  </data>
+  <data name="label13.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
+    <value>6, 12</value>
+  </data>
+  <data name="label1.Text" xml:space="preserve">
+    <value>Server address</value>
+  </data>
+  <data name="label4.TabIndex" type="System.Int32, mscorlib">
+    <value>25</value>
+  </data>
+  <data name="&gt;&gt;txtAddress.Name" xml:space="preserve">
+    <value>txtAddress</value>
+  </data>
+  <data name="txtRemarks.Location" type="System.Drawing.Point, System.Drawing">
+    <value>127, 151</value>
+  </data>
+  <data name="label6.Size" type="System.Drawing.Size, System.Drawing">
+    <value>95, 12</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="label6.Text" xml:space="preserve">
+    <value>Alias (remarks)</value>
+  </data>
+  <data name="label13.Text" xml:space="preserve">
+    <value>* Fill in manually</value>
+  </data>
+  <data name="&gt;&gt;txtPort.ZOrder" xml:space="preserve">
+    <value>7</value>
+  </data>
+  <data name="&gt;&gt;label2.Name" xml:space="preserve">
+    <value>label2</value>
+  </data>
+  <data name="label2.Location" type="System.Drawing.Point, System.Drawing">
+    <value>12, 62</value>
+  </data>
+  <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
+    <value>547, 291</value>
+  </data>
+  <data name="&gt;&gt;panel2.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="groupBox1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>547, 196</value>
+  </data>
+  <data name="&gt;&gt;label6.ZOrder" xml:space="preserve">
+    <value>6</value>
+  </data>
+  <data name="&gt;&gt;txtSecurity.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <data name="btnClose.Size" type="System.Drawing.Size, System.Drawing">
+    <value>75, 23</value>
+  </data>
+  <data name="&gt;&gt;label3.ZOrder" xml:space="preserve">
+    <value>3</value>
+  </data>
+  <data name="txtSecurity.Location" type="System.Drawing.Point, System.Drawing">
+    <value>127, 89</value>
+  </data>
+  <data name="label13.Location" type="System.Drawing.Point, System.Drawing">
+    <value>337, 155</value>
+  </data>
+  <data name="label1.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="btnClose.TabIndex" type="System.Int32, mscorlib">
+    <value>4</value>
+  </data>
+  <data name="&gt;&gt;txtRemarks.ZOrder" xml:space="preserve">
+    <value>5</value>
+  </data>
+  <data name="btnOK.Size" type="System.Drawing.Size, System.Drawing">
+    <value>75, 23</value>
+  </data>
+  <data name="label4.Size" type="System.Drawing.Size, System.Drawing">
+    <value>89, 12</value>
+  </data>
+  <data name="&gt;&gt;txtAddress.Parent" xml:space="preserve">
+    <value>groupBox1</value>
+  </data>
+  <data name="&gt;&gt;label4.Parent" xml:space="preserve">
+    <value>groupBox1</value>
+  </data>
+  <data name="groupBox1.Location" type="System.Drawing.Point, System.Drawing">
+    <value>0, 35</value>
+  </data>
+  <data name="&gt;&gt;txtRemarks.Name" xml:space="preserve">
+    <value>txtRemarks</value>
+  </data>
+  <data name="label6.Location" type="System.Drawing.Point, System.Drawing">
+    <value>12, 155</value>
+  </data>
+  <data name="label4.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="label4.Text" xml:space="preserve">
+    <value>User(Optional)</value>
+  </data>
+  <data name="txtId.Size" type="System.Drawing.Size, System.Drawing">
+    <value>278, 21</value>
+  </data>
+  <data name="panel1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+    <value>Top</value>
+  </data>
+  <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>
-  <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
-    <value>547, 291</value>
-  </data>
-  <data name="$this.Text" xml:space="preserve">
-    <value>Edit or add a [Socks] 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>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>
+  <metadata name="menuServer.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
 </root>
--- a/v2rayN/v2rayN/Forms/AddServer4Form.zh-Hans.resx
+++ b/v2rayN/v2rayN/Forms/AddServer4Form.zh-Hans.resx
@@ -124,11 +124,8 @@
    <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>
-  <data name="label4.Location" type="System.Drawing.Point, System.Drawing">
-    <value>12, 89</value>
+  <data name="txtSecurity.Size" type="System.Drawing.Size, System.Drawing">
+    <value>194, 21</value>
  </data>
  <data name="label4.Size" type="System.Drawing.Size, System.Drawing">
    <value>77, 12</value>
@@ -136,11 +133,8 @@
  <data name="label4.Text" xml:space="preserve">
    <value>用户名(可选)</value>
  </data>
-  <data name="txtId.Location" type="System.Drawing.Point, System.Drawing">
-    <value>127, 115</value>
-  </data>
-  <data name="label3.Location" type="System.Drawing.Point, System.Drawing">
-    <value>12, 119</value>
+  <data name="txtId.Size" type="System.Drawing.Size, System.Drawing">
+    <value>194, 21</value>
  </data>
  <data name="label3.Size" type="System.Drawing.Size, System.Drawing">
    <value>65, 12</value>
--- a/v2rayN/v2rayN/Forms/AddServer5Form.Designer.cs
+++ b/v2rayN/v2rayN/Forms/AddServer5Form.Designer.cs
@@ -0,0 +1,513 @@
+namespace v2rayN.Forms
+{
+    partial class AddServer5Form
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(AddServer5Form));
+            this.btnClose = new System.Windows.Forms.Button();
+            this.groupBox1 = new System.Windows.Forms.GroupBox();
+            this.cmbFlow = new System.Windows.Forms.ComboBox();
+            this.label4 = new System.Windows.Forms.Label();
+            this.btnGUID = new System.Windows.Forms.Button();
+            this.label13 = new System.Windows.Forms.Label();
+            this.groupBox2 = new System.Windows.Forms.GroupBox();
+            this.label24 = new System.Windows.Forms.Label();
+            this.label23 = new System.Windows.Forms.Label();
+            this.panTlsMore = new System.Windows.Forms.Panel();
+            this.label21 = new System.Windows.Forms.Label();
+            this.cmbAllowInsecure = new System.Windows.Forms.ComboBox();
+            this.label9 = new System.Windows.Forms.Label();
+            this.label20 = new System.Windows.Forms.Label();
+            this.txtPath = new System.Windows.Forms.TextBox();
+            this.cmbNetwork = new System.Windows.Forms.ComboBox();
+            this.label7 = new System.Windows.Forms.Label();
+            this.label19 = new System.Windows.Forms.Label();
+            this.label18 = new System.Windows.Forms.Label();
+            this.label17 = new System.Windows.Forms.Label();
+            this.label16 = new System.Windows.Forms.Label();
+            this.label14 = new System.Windows.Forms.Label();
+            this.label15 = new System.Windows.Forms.Label();
+            this.cmbStreamSecurity = new System.Windows.Forms.ComboBox();
+            this.label12 = new System.Windows.Forms.Label();
+            this.txtRequestHost = new System.Windows.Forms.TextBox();
+            this.label11 = new System.Windows.Forms.Label();
+            this.label10 = new System.Windows.Forms.Label();
+            this.cmbHeaderType = new System.Windows.Forms.ComboBox();
+            this.label8 = new System.Windows.Forms.Label();
+            this.cmbSecurity = new System.Windows.Forms.ComboBox();
+            this.txtRemarks = new System.Windows.Forms.TextBox();
+            this.label6 = new System.Windows.Forms.Label();
+            this.label5 = new System.Windows.Forms.Label();
+            this.txtId = new System.Windows.Forms.TextBox();
+            this.label3 = new System.Windows.Forms.Label();
+            this.txtPort = new System.Windows.Forms.TextBox();
+            this.label2 = new System.Windows.Forms.Label();
+            this.txtAddress = new System.Windows.Forms.TextBox();
+            this.label1 = 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.menuServer = new System.Windows.Forms.MenuStrip();
+            this.MenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
+            this.MenuItemImportClient = new System.Windows.Forms.ToolStripMenuItem();
+            this.MenuItemImportServer = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
+            this.MenuItemImportClipboard = new System.Windows.Forms.ToolStripMenuItem();
+            this.groupBox1.SuspendLayout();
+            this.groupBox2.SuspendLayout();
+            this.panTlsMore.SuspendLayout();
+            this.panel2.SuspendLayout();
+            this.menuServer.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // btnClose
+            // 
+            this.btnClose.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+            resources.ApplyResources(this.btnClose, "btnClose");
+            this.btnClose.Name = "btnClose";
+            this.btnClose.UseVisualStyleBackColor = true;
+            this.btnClose.Click += new System.EventHandler(this.btnClose_Click);
+            // 
+            // groupBox1
+            // 
+            this.groupBox1.Controls.Add(this.cmbFlow);
+            this.groupBox1.Controls.Add(this.label4);
+            this.groupBox1.Controls.Add(this.btnGUID);
+            this.groupBox1.Controls.Add(this.label13);
+            this.groupBox1.Controls.Add(this.groupBox2);
+            this.groupBox1.Controls.Add(this.label8);
+            this.groupBox1.Controls.Add(this.cmbSecurity);
+            this.groupBox1.Controls.Add(this.txtRemarks);
+            this.groupBox1.Controls.Add(this.label6);
+            this.groupBox1.Controls.Add(this.label5);
+            this.groupBox1.Controls.Add(this.txtId);
+            this.groupBox1.Controls.Add(this.label3);
+            this.groupBox1.Controls.Add(this.txtPort);
+            this.groupBox1.Controls.Add(this.label2);
+            this.groupBox1.Controls.Add(this.txtAddress);
+            this.groupBox1.Controls.Add(this.label1);
+            resources.ApplyResources(this.groupBox1, "groupBox1");
+            this.groupBox1.Name = "groupBox1";
+            this.groupBox1.TabStop = false;
+            // 
+            // cmbFlow
+            // 
+            this.cmbFlow.FormattingEnabled = true;
+            this.cmbFlow.Items.AddRange(new object[] {
+            resources.GetString("cmbFlow.Items"),
+            resources.GetString("cmbFlow.Items1"),
+            resources.GetString("cmbFlow.Items2"),
+            resources.GetString("cmbFlow.Items3"),
+            resources.GetString("cmbFlow.Items4")});
+            resources.ApplyResources(this.cmbFlow, "cmbFlow");
+            this.cmbFlow.Name = "cmbFlow";
+            // 
+            // label4
+            // 
+            resources.ApplyResources(this.label4, "label4");
+            this.label4.Name = "label4";
+            // 
+            // btnGUID
+            // 
+            resources.ApplyResources(this.btnGUID, "btnGUID");
+            this.btnGUID.Name = "btnGUID";
+            this.btnGUID.UseVisualStyleBackColor = true;
+            this.btnGUID.Click += new System.EventHandler(this.btnGUID_Click);
+            // 
+            // label13
+            // 
+            resources.ApplyResources(this.label13, "label13");
+            this.label13.Name = "label13";
+            // 
+            // groupBox2
+            // 
+            this.groupBox2.Controls.Add(this.label24);
+            this.groupBox2.Controls.Add(this.label23);
+            this.groupBox2.Controls.Add(this.panTlsMore);
+            this.groupBox2.Controls.Add(this.label9);
+            this.groupBox2.Controls.Add(this.label20);
+            this.groupBox2.Controls.Add(this.txtPath);
+            this.groupBox2.Controls.Add(this.cmbNetwork);
+            this.groupBox2.Controls.Add(this.label7);
+            this.groupBox2.Controls.Add(this.label19);
+            this.groupBox2.Controls.Add(this.label18);
+            this.groupBox2.Controls.Add(this.label17);
+            this.groupBox2.Controls.Add(this.label16);
+            this.groupBox2.Controls.Add(this.label14);
+            this.groupBox2.Controls.Add(this.label15);
+            this.groupBox2.Controls.Add(this.cmbStreamSecurity);
+            this.groupBox2.Controls.Add(this.label12);
+            this.groupBox2.Controls.Add(this.txtRequestHost);
+            this.groupBox2.Controls.Add(this.label11);
+            this.groupBox2.Controls.Add(this.label10);
+            this.groupBox2.Controls.Add(this.cmbHeaderType);
+            resources.ApplyResources(this.groupBox2, "groupBox2");
+            this.groupBox2.Name = "groupBox2";
+            this.groupBox2.TabStop = false;
+            // 
+            // label24
+            // 
+            resources.ApplyResources(this.label24, "label24");
+            this.label24.Name = "label24";
+            // 
+            // label23
+            // 
+            resources.ApplyResources(this.label23, "label23");
+            this.label23.Name = "label23";
+            // 
+            // panTlsMore
+            // 
+            this.panTlsMore.Controls.Add(this.label21);
+            this.panTlsMore.Controls.Add(this.cmbAllowInsecure);
+            resources.ApplyResources(this.panTlsMore, "panTlsMore");
+            this.panTlsMore.Name = "panTlsMore";
+            // 
+            // label21
+            // 
+            resources.ApplyResources(this.label21, "label21");
+            this.label21.Name = "label21";
+            // 
+            // cmbAllowInsecure
+            // 
+            this.cmbAllowInsecure.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.cmbAllowInsecure.FormattingEnabled = true;
+            this.cmbAllowInsecure.Items.AddRange(new object[] {
+            resources.GetString("cmbAllowInsecure.Items"),
+            resources.GetString("cmbAllowInsecure.Items1"),
+            resources.GetString("cmbAllowInsecure.Items2")});
+            resources.ApplyResources(this.cmbAllowInsecure, "cmbAllowInsecure");
+            this.cmbAllowInsecure.Name = "cmbAllowInsecure";
+            // 
+            // label9
+            // 
+            resources.ApplyResources(this.label9, "label9");
+            this.label9.Name = "label9";
+            // 
+            // label20
+            // 
+            resources.ApplyResources(this.label20, "label20");
+            this.label20.Name = "label20";
+            // 
+            // txtPath
+            // 
+            resources.ApplyResources(this.txtPath, "txtPath");
+            this.txtPath.Name = "txtPath";
+            // 
+            // cmbNetwork
+            // 
+            this.cmbNetwork.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.cmbNetwork.FormattingEnabled = true;
+            this.cmbNetwork.Items.AddRange(new object[] {
+            resources.GetString("cmbNetwork.Items"),
+            resources.GetString("cmbNetwork.Items1"),
+            resources.GetString("cmbNetwork.Items2"),
+            resources.GetString("cmbNetwork.Items3"),
+            resources.GetString("cmbNetwork.Items4")});
+            resources.ApplyResources(this.cmbNetwork, "cmbNetwork");
+            this.cmbNetwork.Name = "cmbNetwork";
+            this.cmbNetwork.SelectedIndexChanged += new System.EventHandler(this.cmbNetwork_SelectedIndexChanged);
+            // 
+            // label7
+            // 
+            resources.ApplyResources(this.label7, "label7");
+            this.label7.Name = "label7";
+            // 
+            // label19
+            // 
+            resources.ApplyResources(this.label19, "label19");
+            this.label19.Name = "label19";
+            // 
+            // label18
+            // 
+            resources.ApplyResources(this.label18, "label18");
+            this.label18.Name = "label18";
+            // 
+            // label17
+            // 
+            resources.ApplyResources(this.label17, "label17");
+            this.label17.Name = "label17";
+            // 
+            // label16
+            // 
+            resources.ApplyResources(this.label16, "label16");
+            this.label16.Name = "label16";
+            // 
+            // label14
+            // 
+            resources.ApplyResources(this.label14, "label14");
+            this.label14.Name = "label14";
+            // 
+            // label15
+            // 
+            resources.ApplyResources(this.label15, "label15");
+            this.label15.Name = "label15";
+            // 
+            // cmbStreamSecurity
+            // 
+            this.cmbStreamSecurity.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.cmbStreamSecurity.FormattingEnabled = true;
+            this.cmbStreamSecurity.Items.AddRange(new object[] {
+            resources.GetString("cmbStreamSecurity.Items"),
+            resources.GetString("cmbStreamSecurity.Items1"),
+            resources.GetString("cmbStreamSecurity.Items2")});
+            resources.ApplyResources(this.cmbStreamSecurity, "cmbStreamSecurity");
+            this.cmbStreamSecurity.Name = "cmbStreamSecurity";
+            this.cmbStreamSecurity.SelectedIndexChanged += new System.EventHandler(this.cmbStreamSecurity_SelectedIndexChanged);
+            // 
+            // label12
+            // 
+            resources.ApplyResources(this.label12, "label12");
+            this.label12.Name = "label12";
+            // 
+            // txtRequestHost
+            // 
+            resources.ApplyResources(this.txtRequestHost, "txtRequestHost");
+            this.txtRequestHost.Name = "txtRequestHost";
+            // 
+            // label11
+            // 
+            resources.ApplyResources(this.label11, "label11");
+            this.label11.Name = "label11";
+            // 
+            // label10
+            // 
+            resources.ApplyResources(this.label10, "label10");
+            this.label10.Name = "label10";
+            // 
+            // cmbHeaderType
+            // 
+            this.cmbHeaderType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.cmbHeaderType.FormattingEnabled = true;
+            this.cmbHeaderType.Items.AddRange(new object[] {
+            resources.GetString("cmbHeaderType.Items"),
+            resources.GetString("cmbHeaderType.Items1"),
+            resources.GetString("cmbHeaderType.Items2"),
+            resources.GetString("cmbHeaderType.Items3"),
+            resources.GetString("cmbHeaderType.Items4"),
+            resources.GetString("cmbHeaderType.Items5"),
+            resources.GetString("cmbHeaderType.Items6")});
+            resources.ApplyResources(this.cmbHeaderType, "cmbHeaderType");
+            this.cmbHeaderType.Name = "cmbHeaderType";
+            // 
+            // label8
+            // 
+            resources.ApplyResources(this.label8, "label8");
+            this.label8.Name = "label8";
+            // 
+            // cmbSecurity
+            // 
+            this.cmbSecurity.DropDownStyle = System.Windows.Forms.ComboBoxStyle.Simple;
+            this.cmbSecurity.FormattingEnabled = true;
+            this.cmbSecurity.Items.AddRange(new object[] {
+            resources.GetString("cmbSecurity.Items")});
+            resources.ApplyResources(this.cmbSecurity, "cmbSecurity");
+            this.cmbSecurity.Name = "cmbSecurity";
+            // 
+            // txtRemarks
+            // 
+            resources.ApplyResources(this.txtRemarks, "txtRemarks");
+            this.txtRemarks.Name = "txtRemarks";
+            // 
+            // label6
+            // 
+            resources.ApplyResources(this.label6, "label6");
+            this.label6.Name = "label6";
+            // 
+            // label5
+            // 
+            resources.ApplyResources(this.label5, "label5");
+            this.label5.Name = "label5";
+            // 
+            // txtId
+            // 
+            resources.ApplyResources(this.txtId, "txtId");
+            this.txtId.Name = "txtId";
+            // 
+            // label3
+            // 
+            resources.ApplyResources(this.label3, "label3");
+            this.label3.Name = "label3";
+            // 
+            // txtPort
+            // 
+            resources.ApplyResources(this.txtPort, "txtPort");
+            this.txtPort.Name = "txtPort";
+            // 
+            // label2
+            // 
+            resources.ApplyResources(this.label2, "label2");
+            this.label2.Name = "label2";
+            // 
+            // txtAddress
+            // 
+            resources.ApplyResources(this.txtAddress, "txtAddress");
+            this.txtAddress.Name = "txtAddress";
+            // 
+            // label1
+            // 
+            resources.ApplyResources(this.label1, "label1");
+            this.label1.Name = "label1";
+            // 
+            // panel2
+            // 
+            this.panel2.Controls.Add(this.btnClose);
+            this.panel2.Controls.Add(this.btnOK);
+            resources.ApplyResources(this.panel2, "panel2");
+            this.panel2.Name = "panel2";
+            // 
+            // btnOK
+            // 
+            resources.ApplyResources(this.btnOK, "btnOK");
+            this.btnOK.Name = "btnOK";
+            this.btnOK.UseVisualStyleBackColor = true;
+            this.btnOK.Click += new System.EventHandler(this.btnOK_Click);
+            // 
+            // panel1
+            // 
+            resources.ApplyResources(this.panel1, "panel1");
+            this.panel1.Name = "panel1";
+            // 
+            // menuServer
+            // 
+            this.menuServer.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.MenuItem1});
+            resources.ApplyResources(this.menuServer, "menuServer");
+            this.menuServer.Name = "menuServer";
+            // 
+            // MenuItem1
+            // 
+            this.MenuItem1.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.MenuItemImportClient,
+            this.MenuItemImportServer,
+            this.toolStripSeparator1,
+            this.MenuItemImportClipboard});
+            this.MenuItem1.Name = "MenuItem1";
+            resources.ApplyResources(this.MenuItem1, "MenuItem1");
+            // 
+            // MenuItemImportClient
+            // 
+            this.MenuItemImportClient.Name = "MenuItemImportClient";
+            resources.ApplyResources(this.MenuItemImportClient, "MenuItemImportClient");
+            this.MenuItemImportClient.Click += new System.EventHandler(this.MenuItemImportClient_Click);
+            // 
+            // MenuItemImportServer
+            // 
+            this.MenuItemImportServer.Name = "MenuItemImportServer";
+            resources.ApplyResources(this.MenuItemImportServer, "MenuItemImportServer");
+            this.MenuItemImportServer.Click += new System.EventHandler(this.MenuItemImportServer_Click);
+            // 
+            // toolStripSeparator1
+            // 
+            this.toolStripSeparator1.Name = "toolStripSeparator1";
+            resources.ApplyResources(this.toolStripSeparator1, "toolStripSeparator1");
+            // 
+            // MenuItemImportClipboard
+            // 
+            this.MenuItemImportClipboard.Name = "MenuItemImportClipboard";
+            resources.ApplyResources(this.MenuItemImportClipboard, "MenuItemImportClipboard");
+            this.MenuItemImportClipboard.Click += new System.EventHandler(this.MenuItemImportClipboard_Click);
+            // 
+            // AddServer5Form
+            // 
+            resources.ApplyResources(this, "$this");
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.CancelButton = this.btnClose;
+            this.Controls.Add(this.groupBox1);
+            this.Controls.Add(this.panel2);
+            this.Controls.Add(this.panel1);
+            this.Controls.Add(this.menuServer);
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
+            this.Name = "AddServer5Form";
+            this.Load += new System.EventHandler(this.AddServer5Form_Load);
+            this.groupBox1.ResumeLayout(false);
+            this.groupBox1.PerformLayout();
+            this.groupBox2.ResumeLayout(false);
+            this.groupBox2.PerformLayout();
+            this.panTlsMore.ResumeLayout(false);
+            this.panTlsMore.PerformLayout();
+            this.panel2.ResumeLayout(false);
+            this.menuServer.ResumeLayout(false);
+            this.menuServer.PerformLayout();
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.GroupBox groupBox1;
+        private System.Windows.Forms.Button btnClose;
+        private System.Windows.Forms.Button btnOK;
+        private System.Windows.Forms.TextBox txtRemarks;
+        private System.Windows.Forms.Label label6;
+        private System.Windows.Forms.Label label5;
+        private System.Windows.Forms.TextBox txtId;
+        private System.Windows.Forms.Label label3;
+        private System.Windows.Forms.TextBox txtPort;
+        private System.Windows.Forms.Label label2;
+        private System.Windows.Forms.TextBox txtAddress;
+        private System.Windows.Forms.Label label1;
+        private System.Windows.Forms.ComboBox cmbSecurity;
+        private System.Windows.Forms.ComboBox cmbNetwork;
+        private System.Windows.Forms.Label label7;
+        private System.Windows.Forms.Label label9;
+        private System.Windows.Forms.Label label8;
+        private System.Windows.Forms.Panel panel1;
+        private System.Windows.Forms.Panel panel2;
+        private System.Windows.Forms.TextBox txtRequestHost;
+        private System.Windows.Forms.Label label10;
+        private System.Windows.Forms.Label label11;
+        private System.Windows.Forms.ComboBox cmbHeaderType;
+        private System.Windows.Forms.Label label12;
+        private System.Windows.Forms.GroupBox groupBox2;
+        private System.Windows.Forms.Label label13;
+        private System.Windows.Forms.MenuStrip menuServer;
+        private System.Windows.Forms.ToolStripMenuItem MenuItem1;
+        private System.Windows.Forms.ToolStripMenuItem MenuItemImportClient;
+        private System.Windows.Forms.ToolStripMenuItem MenuItemImportServer;
+        private System.Windows.Forms.Label label15;
+        private System.Windows.Forms.ComboBox cmbStreamSecurity;
+        private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;
+        private System.Windows.Forms.ToolStripMenuItem MenuItemImportClipboard;
+        private System.Windows.Forms.Button btnGUID;
+        private System.Windows.Forms.Label label16;
+        private System.Windows.Forms.Label label14;
+        private System.Windows.Forms.Label label17;
+        private System.Windows.Forms.Label label18;
+        private System.Windows.Forms.Label label19;
+        private System.Windows.Forms.TextBox txtPath;
+        private System.Windows.Forms.Label label20;
+        private System.Windows.Forms.Label label21;
+        private System.Windows.Forms.ComboBox cmbAllowInsecure;
+        private System.Windows.Forms.Panel panTlsMore;
+        private System.Windows.Forms.Label label24;
+        private System.Windows.Forms.Label label23;
+        private System.Windows.Forms.ComboBox cmbFlow;
+        private System.Windows.Forms.Label label4;
+    }
+}
--- a/v2rayN/v2rayN/Forms/AddServer5Form.cs
+++ b/v2rayN/v2rayN/Forms/AddServer5Form.cs
@@ -0,0 +1,286 @@
+using System;
+using System.Windows.Forms;
+using v2rayN.Handler;
+using v2rayN.Mode;
+
+namespace v2rayN.Forms
+{
+    public partial class AddServer5Form : BaseServerForm
+    { 
+
+        public AddServer5Form()
+        {
+            InitializeComponent();
+        }
+
+        private void AddServer5Form_Load(object sender, EventArgs e)
+        {
+            if (EditIndex >= 0)
+            {
+                vmessItem = config.vmess[EditIndex];
+                BindingServer();
+            }
+            else
+            {
+                vmessItem = new VmessItem();
+                ClearServer();
+            }
+        }
+
+        /// <summary>
+        /// 绑定数据
+        /// </summary>
+        private void BindingServer()
+        {
+            txtAddress.Text = vmessItem.address;
+            txtPort.Text = vmessItem.port.ToString();
+            txtId.Text = vmessItem.id;
+            cmbFlow.Text = vmessItem.flow;
+            cmbSecurity.Text = vmessItem.security;
+            cmbNetwork.Text = vmessItem.network;
+            txtRemarks.Text = vmessItem.remarks;
+
+            cmbHeaderType.Text = vmessItem.headerType;
+            txtRequestHost.Text = vmessItem.requestHost;
+            txtPath.Text = vmessItem.path;
+            cmbStreamSecurity.Text = vmessItem.streamSecurity;
+            cmbAllowInsecure.Text = vmessItem.allowInsecure;
+        }
+
+
+        /// <summary>
+        /// 清除设置
+        /// </summary>
+        private void ClearServer()
+        {
+            txtAddress.Text = "";
+            txtPort.Text = "";
+            txtId.Text = "";
+            cmbFlow.Text = "";
+            cmbSecurity.Text = Global.None;
+            cmbNetwork.Text = Global.DefaultNetwork;
+            txtRemarks.Text = "";
+
+            cmbHeaderType.Text = Global.None;
+            txtRequestHost.Text = "";
+            cmbStreamSecurity.Text = "";
+            cmbAllowInsecure.Text = "";
+            txtPath.Text = "";
+        }
+
+
+        private void cmbNetwork_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            SetHeaderType();
+        }
+
+        /// <summary>
+        /// 设置伪装选项
+        /// </summary>
+        private void SetHeaderType()
+        {
+            cmbHeaderType.Items.Clear();
+
+            string network = cmbNetwork.Text;
+            if (Utils.IsNullOrEmpty(network))
+            {
+                cmbHeaderType.Items.Add(Global.None);
+                return;
+            }
+
+            cmbHeaderType.Items.Add(Global.None);
+            if (network.Equals(Global.DefaultNetwork))
+            {
+                cmbHeaderType.Items.Add(Global.TcpHeaderHttp);
+            }
+            else if (network.Equals("kcp") || network.Equals("quic"))
+            {
+                cmbHeaderType.Items.Add("srtp");
+                cmbHeaderType.Items.Add("utp");
+                cmbHeaderType.Items.Add("wechat-video");
+                cmbHeaderType.Items.Add("dtls");
+                cmbHeaderType.Items.Add("wireguard");
+            }
+            else
+            {
+            }
+            cmbHeaderType.Text = Global.None;
+        }
+
+        private void btnOK_Click(object sender, EventArgs e)
+        {
+            string address = txtAddress.Text;
+            string port = txtPort.Text;
+            string id = txtId.Text;
+            string flow = cmbFlow.Text;
+            string security = cmbSecurity.Text;
+            string network = cmbNetwork.Text;
+            string remarks = txtRemarks.Text;
+
+            string headerType = cmbHeaderType.Text;
+            string requestHost = txtRequestHost.Text;
+            string path = txtPath.Text;
+            string streamSecurity = cmbStreamSecurity.Text;
+            string allowInsecure = cmbAllowInsecure.Text;
+
+            if (Utils.IsNullOrEmpty(address))
+            {
+                UI.Show(UIRes.I18N("FillServerAddress"));
+                return;
+            }
+            if (Utils.IsNullOrEmpty(port) || !Utils.IsNumberic(port))
+            {
+                UI.Show(UIRes.I18N("FillCorrectServerPort"));
+                return;
+            }
+            if (Utils.IsNullOrEmpty(id))
+            {
+                UI.Show(UIRes.I18N("FillUUID"));
+                return;
+            }
+
+
+            vmessItem.address = address;
+            vmessItem.port = Utils.ToInt(port);
+            vmessItem.id = id;
+            vmessItem.flow = flow;
+            vmessItem.security = security;
+            vmessItem.network = network;
+            vmessItem.remarks = remarks;
+
+            vmessItem.headerType = headerType;
+            vmessItem.requestHost = requestHost.Replace(" ", "");
+            vmessItem.path = path.Replace(" ", "");
+            vmessItem.streamSecurity = streamSecurity;
+            vmessItem.allowInsecure = allowInsecure;
+
+            if (ConfigHandler.AddVlessServer(ref config, vmessItem, EditIndex) == 0)
+            {
+                this.DialogResult = DialogResult.OK;
+            }
+            else
+            {
+                UI.ShowWarning(UIRes.I18N("OperationFailed"));
+            }
+        }
+
+        private void btnGUID_Click(object sender, EventArgs e)
+        {
+            txtId.Text = Utils.GetGUID();
+        }
+
+        private void btnClose_Click(object sender, EventArgs e)
+        {
+            this.DialogResult = DialogResult.Cancel;
+        }
+
+        private void cmbStreamSecurity_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            string security = cmbStreamSecurity.Text;
+            if (Utils.IsNullOrEmpty(security))
+            {
+                panTlsMore.Hide();
+            }
+            else
+            {
+                panTlsMore.Show();
+            }
+        }
+
+        #region 导入客户端/服务端配置
+
+        /// <summary>
+        /// 导入客户端
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void MenuItemImportClient_Click(object sender, EventArgs e)
+        {
+            MenuItemImport(1);
+        }
+
+        /// <summary>
+        /// 导入服务端
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void MenuItemImportServer_Click(object sender, EventArgs e)
+        {
+            MenuItemImport(2);
+        }
+
+        private void MenuItemImport(int type)
+        {
+            ClearServer();
+
+            OpenFileDialog fileDialog = new OpenFileDialog
+            {
+                Multiselect = false,
+                Filter = "Config|*.json|All|*.*"
+            };
+            if (fileDialog.ShowDialog() != DialogResult.OK)
+            {
+                return;
+            }
+            string fileName = fileDialog.FileName;
+            if (Utils.IsNullOrEmpty(fileName))
+            {
+                return;
+            }
+            string msg;
+            VmessItem vmessItem;
+            if (type.Equals(1))
+            {
+                vmessItem = V2rayConfigHandler.ImportFromClientConfig(fileName, out msg);
+            }
+            else
+            {
+                vmessItem = V2rayConfigHandler.ImportFromServerConfig(fileName, out msg);
+            }
+            if (vmessItem == null)
+            {
+                UI.ShowWarning(msg);
+                return;
+            }
+
+            txtAddress.Text = vmessItem.address;
+            txtPort.Text = vmessItem.port.ToString();
+            txtId.Text = vmessItem.id;
+            txtRemarks.Text = vmessItem.remarks;
+            cmbNetwork.Text = vmessItem.network;
+            cmbHeaderType.Text = vmessItem.headerType;
+            txtRequestHost.Text = vmessItem.requestHost;
+            txtPath.Text = vmessItem.path;
+            cmbStreamSecurity.Text = vmessItem.streamSecurity;
+        }
+
+        /// <summary>
+        /// 从剪贴板导入URL
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void MenuItemImportClipboard_Click(object sender, EventArgs e)
+        {
+            ClearServer();
+
+            VmessItem vmessItem = V2rayConfigHandler.ImportFromClipboardConfig(Utils.GetClipboardData(), out string msg);
+            if (vmessItem == null)
+            {
+                UI.ShowWarning(msg);
+                return;
+            }
+
+            txtAddress.Text = vmessItem.address;
+            txtPort.Text = vmessItem.port.ToString();
+            txtId.Text = vmessItem.id;
+            txtRemarks.Text = vmessItem.remarks;
+            cmbNetwork.Text = vmessItem.network;
+            cmbHeaderType.Text = vmessItem.headerType;
+            txtRequestHost.Text = vmessItem.requestHost;
+            txtPath.Text = vmessItem.path;
+            cmbStreamSecurity.Text = vmessItem.streamSecurity;
+        }
+        #endregion
+
+    }
+}
--- a/v2rayN/v2rayN/Forms/AddServer5Form.resx
+++ b/v2rayN/v2rayN/Forms/AddServer5Form.resx
--- a/v2rayN/v2rayN/Forms/AddServer5Form.zh-Hans.resx
+++ b/v2rayN/v2rayN/Forms/AddServer5Form.zh-Hans.resx
@@ -0,0 +1,344 @@
+<?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>
+  <data name="btnClose.Text" xml:space="preserve">
+    <value>取消(&amp;C)</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="cmbFlow.Size" type="System.Drawing.Size, System.Drawing">
+    <value>220, 20</value>
+  </data>
+  <data name="label4.Size" type="System.Drawing.Size, System.Drawing">
+    <value>65, 12</value>
+  </data>
+  <data name="label4.Text" xml:space="preserve">
+    <value>流控(flow)</value>
+  </data>
+  <data name="btnGUID.Text" xml:space="preserve">
+    <value>生成(&amp;G)</value>
+  </data>
+  <data name="label13.Text" xml:space="preserve">
+    <value>*手填,方便识别管理</value>
+  </data>
+  <data name="groupBox2.Text" xml:space="preserve">
+    <value>底层传输方式(transport)</value>
+  </data>
+  <data name="label24.Size" type="System.Drawing.Size, System.Drawing">
+    <value>149, 12</value>
+  </data>
+  <data name="label24.Text" xml:space="preserve">
+    <value>3)QUIC 加密密钥/Kcp seed</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="label21.Size" type="System.Drawing.Size, System.Drawing">
+    <value>167, 12</value>
+  </data>
+  <data name="label21.Text" xml:space="preserve">
+    <value>跳过证书验证(allowInsecure)</value>
+  </data>
+  <data name="cmbAllowInsecure.Location" type="System.Drawing.Point, System.Drawing">
+    <value>223, 7</value>
+  </data>
+  <data name="label9.Location" type="System.Drawing.Point, System.Drawing">
+    <value>353, 36</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="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="txtPath.Location" type="System.Drawing.Point, System.Drawing">
+    <value>127, 168</value>
+  </data>
+  <data name="cmbNetwork.Location" type="System.Drawing.Point, System.Drawing">
+    <value>127, 32</value>
+  </data>
+  <data name="cmbNetwork.Size" type="System.Drawing.Size, System.Drawing">
+    <value>220, 20</value>
+  </data>
+  <data name="label7.Location" type="System.Drawing.Point, System.Drawing">
+    <value>9, 36</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="label19.Location" type="System.Drawing.Point, System.Drawing">
+    <value>9, 168</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>
+  <data name="label14.Size" type="System.Drawing.Size, System.Drawing">
+    <value>161, 12</value>
+  </data>
+  <data name="label14.Text" xml:space="preserve">
+    <value>1)http host中间逗号(,)隔开</value>
+  </data>
+  <data name="label15.Location" type="System.Drawing.Point, System.Drawing">
+    <value>9, 241</value>
+  </data>
+  <data name="label15.Size" type="System.Drawing.Size, System.Drawing">
+    <value>107, 12</value>
+  </data>
+  <data name="label15.Text" xml:space="preserve">
+    <value>底层传输安全(tls)</value>
+  </data>
+  <data name="cmbStreamSecurity.Location" type="System.Drawing.Point, System.Drawing">
+    <value>127, 237</value>
+  </data>
+  <data name="label12.Location" type="System.Drawing.Point, System.Drawing">
+    <value>282, 71</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>127, 102</value>
+  </data>
+  <data name="txtRequestHost.Size" type="System.Drawing.Size, System.Drawing">
+    <value>334, 51</value>
+  </data>
+  <data name="label11.Location" type="System.Drawing.Point, System.Drawing">
+    <value>9, 71</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.Location" type="System.Drawing.Point, System.Drawing">
+    <value>9, 102</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="cmbHeaderType.Location" type="System.Drawing.Point, System.Drawing">
+    <value>127, 67</value>
+  </data>
+  <data name="label8.Location" type="System.Drawing.Point, System.Drawing">
+    <value>353, 158</value>
+  </data>
+  <data name="label8.Size" type="System.Drawing.Size, System.Drawing">
+    <value>71, 12</value>
+  </data>
+  <data name="label8.Text" xml:space="preserve">
+    <value>*非空(none)</value>
+  </data>
+  <data name="cmbSecurity.Size" type="System.Drawing.Size, System.Drawing">
+    <value>220, 20</value>
+  </data>
+  <data name="txtRemarks.Size" type="System.Drawing.Size, System.Drawing">
+    <value>220, 21</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>101, 12</value>
+  </data>
+  <data name="label5.Text" xml:space="preserve">
+    <value>加密(encryption)</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="label2.Size" type="System.Drawing.Size, System.Drawing">
+    <value>65, 12</value>
+  </data>
+  <data name="label2.Text" xml:space="preserve">
+    <value>端口(port)</value>
+  </data>
+  <data name="label1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>83, 12</value>
+  </data>
+  <data name="label1.Text" xml:space="preserve">
+    <value>地址(address)</value>
+  </data>
+  <data name="btnOK.Text" xml:space="preserve">
+    <value>确定(&amp;O)</value>
+  </data>
+  <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="MenuItem1.Enabled" type="System.Boolean, mscorlib">
+    <value>False</value>
+  </data>
+  <data name="MenuItem1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>92, 21</value>
+  </data>
+  <data name="MenuItem1.Text" xml:space="preserve">
+    <value>导入配置文件</value>
+  </data>
+  <data name="MenuItemImportClient.Size" type="System.Drawing.Size, System.Drawing">
+    <value>171, 22</value>
+  </data>
+  <data name="MenuItemImportClient.Text" xml:space="preserve">
+    <value>导入客户端配置</value>
+  </data>
+  <data name="MenuItemImportServer.Size" type="System.Drawing.Size, System.Drawing">
+    <value>171, 22</value>
+  </data>
+  <data name="MenuItemImportServer.Text" xml:space="preserve">
+    <value>导入服务端配置</value>
+  </data>
+  <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>
+  <data name="MenuItemImportClipboard.Text" xml:space="preserve">
+    <value>从剪贴板导入URL</value>
+  </data>
+  <data name="$this.Text" xml:space="preserve">
+    <value>编辑或添加[VLESS]服务器</value>
+  </data>
+</root>
--- a/v2rayN/v2rayN/Forms/AddServer6Form.Designer.cs
+++ b/v2rayN/v2rayN/Forms/AddServer6Form.Designer.cs
@@ -0,0 +1,189 @@
+namespace v2rayN.Forms
+{
+    partial class AddServer6Form
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(AddServer6Form));
+            this.btnClose = new System.Windows.Forms.Button();
+            this.groupBox1 = new System.Windows.Forms.GroupBox();
+            this.label4 = new System.Windows.Forms.Label();
+            this.txtRequestHost = new System.Windows.Forms.TextBox();
+            this.label13 = new System.Windows.Forms.Label();
+            this.txtRemarks = new System.Windows.Forms.TextBox();
+            this.label6 = new System.Windows.Forms.Label();
+            this.txtId = new System.Windows.Forms.TextBox();
+            this.label3 = new System.Windows.Forms.Label();
+            this.txtPort = new System.Windows.Forms.TextBox();
+            this.label2 = new System.Windows.Forms.Label();
+            this.txtAddress = new System.Windows.Forms.TextBox();
+            this.label1 = 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.groupBox1.SuspendLayout();
+            this.panel2.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // btnClose
+            // 
+            resources.ApplyResources(this.btnClose, "btnClose");
+            this.btnClose.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+            this.btnClose.Name = "btnClose";
+            this.btnClose.UseVisualStyleBackColor = true;
+            this.btnClose.Click += new System.EventHandler(this.btnClose_Click);
+            // 
+            // groupBox1
+            // 
+            resources.ApplyResources(this.groupBox1, "groupBox1");
+            this.groupBox1.Controls.Add(this.label4);
+            this.groupBox1.Controls.Add(this.txtRequestHost);
+            this.groupBox1.Controls.Add(this.label13);
+            this.groupBox1.Controls.Add(this.txtRemarks);
+            this.groupBox1.Controls.Add(this.label6);
+            this.groupBox1.Controls.Add(this.txtId);
+            this.groupBox1.Controls.Add(this.label3);
+            this.groupBox1.Controls.Add(this.txtPort);
+            this.groupBox1.Controls.Add(this.label2);
+            this.groupBox1.Controls.Add(this.txtAddress);
+            this.groupBox1.Controls.Add(this.label1);
+            this.groupBox1.Name = "groupBox1";
+            this.groupBox1.TabStop = false;
+            // 
+            // label4
+            // 
+            resources.ApplyResources(this.label4, "label4");
+            this.label4.Name = "label4";
+            // 
+            // txtRequestHost
+            // 
+            resources.ApplyResources(this.txtRequestHost, "txtRequestHost");
+            this.txtRequestHost.Name = "txtRequestHost";
+            // 
+            // label13
+            // 
+            resources.ApplyResources(this.label13, "label13");
+            this.label13.Name = "label13";
+            // 
+            // txtRemarks
+            // 
+            resources.ApplyResources(this.txtRemarks, "txtRemarks");
+            this.txtRemarks.Name = "txtRemarks";
+            // 
+            // label6
+            // 
+            resources.ApplyResources(this.label6, "label6");
+            this.label6.Name = "label6";
+            // 
+            // txtId
+            // 
+            resources.ApplyResources(this.txtId, "txtId");
+            this.txtId.Name = "txtId";
+            // 
+            // label3
+            // 
+            resources.ApplyResources(this.label3, "label3");
+            this.label3.Name = "label3";
+            // 
+            // txtPort
+            // 
+            resources.ApplyResources(this.txtPort, "txtPort");
+            this.txtPort.Name = "txtPort";
+            // 
+            // label2
+            // 
+            resources.ApplyResources(this.label2, "label2");
+            this.label2.Name = "label2";
+            // 
+            // txtAddress
+            // 
+            resources.ApplyResources(this.txtAddress, "txtAddress");
+            this.txtAddress.Name = "txtAddress";
+            // 
+            // label1
+            // 
+            resources.ApplyResources(this.label1, "label1");
+            this.label1.Name = "label1";
+            // 
+            // panel2
+            // 
+            resources.ApplyResources(this.panel2, "panel2");
+            this.panel2.Controls.Add(this.btnClose);
+            this.panel2.Controls.Add(this.btnOK);
+            this.panel2.Name = "panel2";
+            // 
+            // btnOK
+            // 
+            resources.ApplyResources(this.btnOK, "btnOK");
+            this.btnOK.Name = "btnOK";
+            this.btnOK.UseVisualStyleBackColor = true;
+            this.btnOK.Click += new System.EventHandler(this.btnOK_Click);
+            // 
+            // panel1
+            // 
+            resources.ApplyResources(this.panel1, "panel1");
+            this.panel1.Name = "panel1";
+            // 
+            // AddServer6Form
+            // 
+            resources.ApplyResources(this, "$this");
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.CancelButton = this.btnClose;
+            this.Controls.Add(this.groupBox1);
+            this.Controls.Add(this.panel2);
+            this.Controls.Add(this.panel1);
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
+            this.MinimizeBox = true;
+            this.Name = "AddServer6Form";
+            this.Load += new System.EventHandler(this.AddServer6Form_Load);
+            this.groupBox1.ResumeLayout(false);
+            this.groupBox1.PerformLayout();
+            this.panel2.ResumeLayout(false);
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.GroupBox groupBox1;
+        private System.Windows.Forms.Button btnClose;
+        private System.Windows.Forms.Button btnOK;
+        private System.Windows.Forms.TextBox txtRemarks;
+        private System.Windows.Forms.Label label6;
+        private System.Windows.Forms.TextBox txtId;
+        private System.Windows.Forms.Label label3;
+        private System.Windows.Forms.TextBox txtPort;
+        private System.Windows.Forms.Label label2;
+        private System.Windows.Forms.TextBox txtAddress;
+        private System.Windows.Forms.Label label1;
+        private System.Windows.Forms.Panel panel1;
+        private System.Windows.Forms.Panel panel2;
+        private System.Windows.Forms.Label label13;
+        private System.Windows.Forms.Label label4;
+        private System.Windows.Forms.TextBox txtRequestHost;
+    }
+}
--- a/v2rayN/v2rayN/Forms/AddServer6Form.cs
+++ b/v2rayN/v2rayN/Forms/AddServer6Form.cs
@@ -0,0 +1,100 @@
+using System;
+using System.Windows.Forms;
+using v2rayN.Handler;
+using v2rayN.Mode;
+
+namespace v2rayN.Forms
+{
+    public partial class AddServer6Form : BaseServerForm
+    {
+        public AddServer6Form()
+        {
+            InitializeComponent();
+        }
+
+        private void AddServer6Form_Load(object sender, EventArgs e)
+        {
+            if (EditIndex >= 0)
+            {
+                vmessItem = config.vmess[EditIndex];
+                BindingServer();
+            }
+            else
+            {
+                vmessItem = new VmessItem();
+                ClearServer();
+            }
+        }
+
+        /// <summary>
+        /// 绑定数据
+        /// </summary>
+        private void BindingServer()
+        {
+
+            txtAddress.Text = vmessItem.address;
+            txtPort.Text = vmessItem.port.ToString();
+            txtId.Text = vmessItem.id;
+            txtRequestHost.Text = vmessItem.requestHost;
+            txtRemarks.Text = vmessItem.remarks;
+        }
+
+
+        /// <summary>
+        /// 清除设置
+        /// </summary>
+        private void ClearServer()
+        {
+            txtAddress.Text = "";
+            txtPort.Text = "";
+            txtId.Text = "";
+            txtRequestHost.Text = "";
+            txtRemarks.Text = "";
+        }
+
+        private void btnOK_Click(object sender, EventArgs e)
+        {
+            string address = txtAddress.Text;
+            string port = txtPort.Text;
+            string id = txtId.Text;
+            string requestHost = txtRequestHost.Text;
+            string remarks = txtRemarks.Text;
+
+            if (Utils.IsNullOrEmpty(address))
+            {
+                UI.Show(UIRes.I18N("FillServerAddress"));
+                return;
+            }
+            if (Utils.IsNullOrEmpty(port) || !Utils.IsNumberic(port))
+            {
+                UI.Show(UIRes.I18N("FillCorrectServerPort"));
+                return;
+            }
+            if (Utils.IsNullOrEmpty(id))
+            {
+                UI.Show(UIRes.I18N("FillPassword"));
+                return;
+            } 
+
+            vmessItem.address = address;
+            vmessItem.port = Utils.ToInt(port);
+            vmessItem.id = id;
+            vmessItem.requestHost = requestHost.Replace(" ", "");
+            vmessItem.remarks = remarks;
+
+            if (ConfigHandler.AddTrojanServer(ref config, vmessItem, EditIndex) == 0)
+            {
+                this.DialogResult = DialogResult.OK;
+            }
+            else
+            {
+                UI.ShowWarning(UIRes.I18N("OperationFailed"));
+            }
+        }
+        private void btnClose_Click(object sender, EventArgs e)
+        {
+            this.DialogResult = DialogResult.Cancel;
+        }
+
+    }
+}
--- a/v2rayN/v2rayN/Forms/AddServer6Form.resx
+++ b/v2rayN/v2rayN/Forms/AddServer6Form.resx
@@ -0,0 +1,537 @@
+<?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>
+  <data name="&gt;&gt;txtPort.Parent" xml:space="preserve">
+    <value>groupBox1</value>
+  </data>
+  <data name="label1.Text" xml:space="preserve">
+    <value>Server address</value>
+  </data>
+  <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="txtPort.TabIndex" type="System.Int32, mscorlib">
+    <value>3</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>
+  <data name="label4.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="&gt;&gt;txtPort.Name" xml:space="preserve">
+    <value>txtPort</value>
+  </data>
+  <data name="label13.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="label6.Text" xml:space="preserve">
+    <value>Alias (remarks)</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>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="txtPort.Size" type="System.Drawing.Size, System.Drawing">
+    <value>194, 21</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>AddServer6Form</value>
+  </data>
+  <data name="&gt;&gt;label1.Name" xml:space="preserve">
+    <value>label1</value>
+  </data>
+  <data name="txtRequestHost.Size" type="System.Drawing.Size, System.Drawing">
+    <value>359, 21</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;txtRequestHost.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;btnClose.Parent" xml:space="preserve">
+    <value>panel2</value>
+  </data>
+  <data name="label6.Location" type="System.Drawing.Point, System.Drawing">
+    <value>12, 155</value>
+  </data>
+  <data name="groupBox1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+    <value>Fill</value>
+  </data>
+  <data name="label3.Size" type="System.Drawing.Size, System.Drawing">
+    <value>53, 12</value>
+  </data>
+  <data name="txtRequestHost.Location" type="System.Drawing.Point, System.Drawing">
+    <value>127, 123</value>
+  </data>
+  <data name="txtRemarks.Size" type="System.Drawing.Size, System.Drawing">
+    <value>194, 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="btnClose.Location" type="System.Drawing.Point, System.Drawing">
+    <value>396, 17</value>
+  </data>
+  <data name="label6.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="&gt;&gt;label3.Name" xml:space="preserve">
+    <value>label3</value>
+  </data>
+  <data name="txtRemarks.Location" type="System.Drawing.Point, System.Drawing">
+    <value>127, 154</value>
+  </data>
+  <data name="label3.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</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="label3.Location" type="System.Drawing.Point, System.Drawing">
+    <value>12, 93</value>
+  </data>
+  <data name="&gt;&gt;label1.ZOrder" xml:space="preserve">
+    <value>10</value>
+  </data>
+  <data name="groupBox1.Text" xml:space="preserve">
+    <value>Server</value>
+  </data>
+  <data name="&gt;&gt;txtRemarks.ZOrder" xml:space="preserve">
+    <value>3</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="&gt;&gt;txtRequestHost.Name" xml:space="preserve">
+    <value>txtRequestHost</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>
+  <data name="panel2.Size" type="System.Drawing.Size, System.Drawing">
+    <value>547, 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="&gt;&gt;txtRequestHost.Parent" xml:space="preserve">
+    <value>groupBox1</value>
+  </data>
+  <data name="txtId.Size" type="System.Drawing.Size, System.Drawing">
+    <value>359, 21</value>
+  </data>
+  <data name="$this.Text" xml:space="preserve">
+    <value>Edit or add a [Trojan] server</value>
+  </data>
+  <data name="txtAddress.Size" type="System.Drawing.Size, System.Drawing">
+    <value>359, 21</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="txtId.PasswordChar" type="System.Char, mscorlib" xml:space="preserve">
+    <value>*</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="label2.Size" type="System.Drawing.Size, System.Drawing">
+    <value>71, 12</value>
+  </data>
+  <data name="label4.TabIndex" type="System.Int32, mscorlib">
+    <value>24</value>
+  </data>
+  <data name="&gt;&gt;label4.Name" xml:space="preserve">
+    <value>label4</value>
+  </data>
+  <data name="&gt;&gt;txtId.Name" xml:space="preserve">
+    <value>txtId</value>
+  </data>
+  <data name="btnOK.Location" type="System.Drawing.Point, System.Drawing">
+    <value>303, 17</value>
+  </data>
+  <data name="&gt;&gt;groupBox1.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="btnClose.Size" type="System.Drawing.Size, System.Drawing">
+    <value>75, 23</value>
+  </data>
+  <data name="&gt;&gt;btnClose.Name" xml:space="preserve">
+    <value>btnClose</value>
+  </data>
+  <data name="label4.Text" xml:space="preserve">
+    <value>Host(SNI)</value>
+  </data>
+  <data name="&gt;&gt;label6.Name" xml:space="preserve">
+    <value>label6</value>
+  </data>
+  <data name="txtId.TabIndex" type="System.Int32, mscorlib">
+    <value>5</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="label3.Text" xml:space="preserve">
+    <value>Password</value>
+  </data>
+  <data name="btnOK.Size" type="System.Drawing.Size, System.Drawing">
+    <value>75, 23</value>
+  </data>
+  <data name="&gt;&gt;txtRequestHost.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
+  <data name="&gt;&gt;txtAddress.Name" xml:space="preserve">
+    <value>txtAddress</value>
+  </data>
+  <data name="&gt;&gt;label4.Parent" xml:space="preserve">
+    <value>groupBox1</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>4</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="groupBox1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>547, 221</value>
+  </data>
+  <data name="&gt;&gt;panel1.ZOrder" xml:space="preserve">
+    <value>2</value>
+  </data>
+  <data name="&gt;&gt;label2.Parent" xml:space="preserve">
+    <value>groupBox1</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, 27</value>
+  </data>
+  <data name="btnOK.TabIndex" type="System.Int32, mscorlib">
+    <value>5</value>
+  </data>
+  <data name="&gt;&gt;txtAddress.Parent" xml:space="preserve">
+    <value>groupBox1</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="txtRequestHost.TabIndex" type="System.Int32, mscorlib">
+    <value>23</value>
+  </data>
+  <data name="txtPort.Location" type="System.Drawing.Point, System.Drawing">
+    <value>127, 59</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.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="label2.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="label1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>89, 12</value>
+  </data>
+  <data name="&gt;&gt;label6.Parent" xml:space="preserve">
+    <value>groupBox1</value>
+  </data>
+  <data name="&gt;&gt;label4.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <data name="panel1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>547, 10</value>
+  </data>
+  <data name="&gt;&gt;label2.ZOrder" xml:space="preserve">
+    <value>8</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, 31</value>
+  </data>
+  <data name="btnOK.Text" xml:space="preserve">
+    <value>&amp;OK</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;btnClose.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <data name="label2.Text" xml:space="preserve">
+    <value>Server port</value>
+  </data>
+  <data name="label3.TabIndex" type="System.Int32, mscorlib">
+    <value>4</value>
+  </data>
+  <data name="label13.Location" type="System.Drawing.Point, System.Drawing">
+    <value>337, 158</value>
+  </data>
+  <data name="label4.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="label2.Location" type="System.Drawing.Point, System.Drawing">
+    <value>12, 62</value>
+  </data>
+  <data name="txtId.Location" type="System.Drawing.Point, System.Drawing">
+    <value>127, 91</value>
+  </data>
+  <data name="label4.Location" type="System.Drawing.Point, System.Drawing">
+    <value>12, 126</value>
+  </data>
+  <data name="&gt;&gt;txtPort.ZOrder" xml:space="preserve">
+    <value>7</value>
+  </data>
+  <data name="&gt;&gt;panel1.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="label4.Size" type="System.Drawing.Size, System.Drawing">
+    <value>59, 12</value>
+  </data>
+  <data name="&gt;&gt;btnOK.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
+  <data name="&gt;&gt;txtId.Parent" xml:space="preserve">
+    <value>groupBox1</value>
+  </data>
+  <data name="panel1.Location" type="System.Drawing.Point, System.Drawing">
+    <value>0, 0</value>
+  </data>
+  <data name="txtAddress.TabIndex" type="System.Int32, mscorlib">
+    <value>1</value>
+  </data>
+  <data name="&gt;&gt;label13.Name" xml:space="preserve">
+    <value>label13</value>
+  </data>
+  <data name="&gt;&gt;txtId.ZOrder" xml:space="preserve">
+    <value>5</value>
+  </data>
+  <data name="label6.Size" type="System.Drawing.Size, System.Drawing">
+    <value>95, 12</value>
+  </data>
+  <data name="&gt;&gt;label2.Name" xml:space="preserve">
+    <value>label2</value>
+  </data>
+  <data name="&gt;&gt;label13.ZOrder" xml:space="preserve">
+    <value>2</value>
+  </data>
+  <data name="&gt;&gt;panel2.Name" xml:space="preserve">
+    <value>panel2</value>
+  </data>
+  <data name="panel2.Location" type="System.Drawing.Point, System.Drawing">
+    <value>0, 231</value>
+  </data>
+  <data name="label13.TabIndex" type="System.Int32, mscorlib">
+    <value>22</value>
+  </data>
+  <data name="&gt;&gt;txtAddress.ZOrder" xml:space="preserve">
+    <value>9</value>
+  </data>
+  <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
+    <value>547, 291</value>
+  </data>
+  <data name="&gt;&gt;groupBox1.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <data name="&gt;&gt;$this.Type" xml:space="preserve">
+    <value>v2rayN.Forms.BaseServerForm, v2rayN, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value>
+  </data>
+  <data name="&gt;&gt;label3.Parent" xml:space="preserve">
+    <value>groupBox1</value>
+  </data>
+  <data name="&gt;&gt;panel2.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;label3.ZOrder" xml:space="preserve">
+    <value>6</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;panel2.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
+  <data name="&gt;&gt;btnOK.Parent" xml:space="preserve">
+    <value>panel2</value>
+  </data>
+  <data name="&gt;&gt;panel1.Name" xml:space="preserve">
+    <value>panel1</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="label2.TabIndex" type="System.Int32, mscorlib">
+    <value>2</value>
+  </data>
+  <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+</root>
--- a/v2rayN/v2rayN/Forms/AddServer6Form.zh-Hans.resx
+++ b/v2rayN/v2rayN/Forms/AddServer6Form.zh-Hans.resx
@@ -0,0 +1,163 @@
+<?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>
+  <data name="btnClose.Text" xml:space="preserve">
+    <value>取消(&amp;C)</value>
+  </data>
+  <data name="groupBox1.Text" xml:space="preserve">
+    <value>服务器</value>
+  </data>
+  <data name="label4.Text" xml:space="preserve">
+    <value>域名(SNI)</value>
+  </data>
+  <data name="label13.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="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="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="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="$this.Text" xml:space="preserve">
+    <value>编辑或添加[Trojan]服务器</value>
+  </data>
+</root>
--- a/v2rayN/v2rayN/Forms/AddServerForm.Designer.cs
+++ b/v2rayN/v2rayN/Forms/AddServerForm.Designer.cs
@@ -37,11 +37,13 @@
            this.label24 = new System.Windows.Forms.Label();
            this.label23 = new System.Windows.Forms.Label();
            this.panTlsMore = new System.Windows.Forms.Panel();
-            this.label22 = new System.Windows.Forms.Label();
            this.label21 = new System.Windows.Forms.Label();
            this.cmbAllowInsecure = new System.Windows.Forms.ComboBox();
+            this.label9 = new System.Windows.Forms.Label();
            this.label20 = new System.Windows.Forms.Label();
            this.txtPath = new System.Windows.Forms.TextBox();
+            this.cmbNetwork = new System.Windows.Forms.ComboBox();
+            this.label7 = new System.Windows.Forms.Label();
            this.label19 = new System.Windows.Forms.Label();
            this.label18 = new System.Windows.Forms.Label();
            this.label17 = new System.Windows.Forms.Label();
@@ -54,10 +56,7 @@
            this.label11 = new System.Windows.Forms.Label();
            this.label10 = new System.Windows.Forms.Label();
            this.cmbHeaderType = new System.Windows.Forms.ComboBox();
-            this.label9 = new System.Windows.Forms.Label();
            this.label8 = new System.Windows.Forms.Label();
-            this.cmbNetwork = new System.Windows.Forms.ComboBox();
-            this.label7 = new System.Windows.Forms.Label();
            this.cmbSecurity = new System.Windows.Forms.ComboBox();
            this.txtRemarks = new System.Windows.Forms.TextBox();
            this.label6 = new System.Windows.Forms.Label();
@@ -99,10 +98,7 @@
            this.groupBox1.Controls.Add(this.btnGUID);
            this.groupBox1.Controls.Add(this.label13);
            this.groupBox1.Controls.Add(this.groupBox2);
-            this.groupBox1.Controls.Add(this.label9);
            this.groupBox1.Controls.Add(this.label8);
-            this.groupBox1.Controls.Add(this.cmbNetwork);
-            this.groupBox1.Controls.Add(this.label7);
            this.groupBox1.Controls.Add(this.cmbSecurity);
            this.groupBox1.Controls.Add(this.txtRemarks);
            this.groupBox1.Controls.Add(this.label6);
@@ -136,8 +132,11 @@
            this.groupBox2.Controls.Add(this.label24);
            this.groupBox2.Controls.Add(this.label23);
            this.groupBox2.Controls.Add(this.panTlsMore);
+            this.groupBox2.Controls.Add(this.label9);
            this.groupBox2.Controls.Add(this.label20);
            this.groupBox2.Controls.Add(this.txtPath);
+            this.groupBox2.Controls.Add(this.cmbNetwork);
+            this.groupBox2.Controls.Add(this.label7);
            this.groupBox2.Controls.Add(this.label19);
            this.groupBox2.Controls.Add(this.label18);
            this.groupBox2.Controls.Add(this.label17);
@@ -166,17 +165,11 @@
            // 
            // panTlsMore
            // 
-            this.panTlsMore.Controls.Add(this.label22);
            this.panTlsMore.Controls.Add(this.label21);
            this.panTlsMore.Controls.Add(this.cmbAllowInsecure);
            resources.ApplyResources(this.panTlsMore, "panTlsMore");
            this.panTlsMore.Name = "panTlsMore";
            // 
-            // label22
-            // 
-            resources.ApplyResources(this.label22, "label22");
-            this.label22.Name = "label22";
-            // 
            // label21
            // 
            resources.ApplyResources(this.label21, "label21");
@@ -193,6 +186,11 @@
            resources.ApplyResources(this.cmbAllowInsecure, "cmbAllowInsecure");
            this.cmbAllowInsecure.Name = "cmbAllowInsecure";
            // 
+            // label9
+            // 
+            resources.ApplyResources(this.label9, "label9");
+            this.label9.Name = "label9";
+            // 
            // label20
            // 
            resources.ApplyResources(this.label20, "label20");
@@ -203,6 +201,25 @@
            resources.ApplyResources(this.txtPath, "txtPath");
            this.txtPath.Name = "txtPath";
            // 
+            // cmbNetwork
+            // 
+            this.cmbNetwork.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.cmbNetwork.FormattingEnabled = true;
+            this.cmbNetwork.Items.AddRange(new object[] {
+            resources.GetString("cmbNetwork.Items"),
+            resources.GetString("cmbNetwork.Items1"),
+            resources.GetString("cmbNetwork.Items2"),
+            resources.GetString("cmbNetwork.Items3"),
+            resources.GetString("cmbNetwork.Items4")});
+            resources.ApplyResources(this.cmbNetwork, "cmbNetwork");
+            this.cmbNetwork.Name = "cmbNetwork";
+            this.cmbNetwork.SelectedIndexChanged += new System.EventHandler(this.cmbNetwork_SelectedIndexChanged);
+            // 
+            // label7
+            // 
+            resources.ApplyResources(this.label7, "label7");
+            this.label7.Name = "label7";
+            // 
            // label19
            // 
            resources.ApplyResources(this.label19, "label19");
@@ -279,35 +296,11 @@
            resources.ApplyResources(this.cmbHeaderType, "cmbHeaderType");
            this.cmbHeaderType.Name = "cmbHeaderType";
            // 
-            // label9
-            // 
-            resources.ApplyResources(this.label9, "label9");
-            this.label9.Name = "label9";
-            // 
            // label8
            // 
            resources.ApplyResources(this.label8, "label8");
            this.label8.Name = "label8";
            // 
-            // cmbNetwork
-            // 
-            this.cmbNetwork.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.cmbNetwork.FormattingEnabled = true;
-            this.cmbNetwork.Items.AddRange(new object[] {
-            resources.GetString("cmbNetwork.Items"),
-            resources.GetString("cmbNetwork.Items1"),
-            resources.GetString("cmbNetwork.Items2"),
-            resources.GetString("cmbNetwork.Items3"),
-            resources.GetString("cmbNetwork.Items4")});
-            resources.ApplyResources(this.cmbNetwork, "cmbNetwork");
-            this.cmbNetwork.Name = "cmbNetwork";
-            this.cmbNetwork.SelectedIndexChanged += new System.EventHandler(this.cmbNetwork_SelectedIndexChanged);
-            // 
-            // label7
-            // 
-            resources.ApplyResources(this.label7, "label7");
-            this.label7.Name = "label7";
-            // 
            // cmbSecurity
            // 
            this.cmbSecurity.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
@@ -508,7 +501,6 @@
        private System.Windows.Forms.Label label20;
        private System.Windows.Forms.Label label21;
        private System.Windows.Forms.ComboBox cmbAllowInsecure;
-        private System.Windows.Forms.Label label22;
        private System.Windows.Forms.Panel panTlsMore;
        private System.Windows.Forms.Label label24;
        private System.Windows.Forms.Label label23;
--- a/v2rayN/v2rayN/Forms/AddServerForm.cs
+++ b/v2rayN/v2rayN/Forms/AddServerForm.cs
@@ -5,10 +5,8 @@ using v2rayN.Mode;

 namespace v2rayN.Forms
 {
-    public partial class AddServerForm : BaseForm
-    {
-        public int EditIndex { get; set; }
-        VmessItem vmessItem = null;
+    public partial class AddServerForm : BaseServerForm
+    { 

        public AddServerForm()
        {
@@ -166,7 +164,7 @@ namespace v2rayN.Forms
            }
            else
            {
-                UI.Show(UIRes.I18N("OperationFailed"));
+                UI.ShowWarning(UIRes.I18N("OperationFailed"));
            }
        }

@@ -180,6 +178,18 @@ namespace v2rayN.Forms
            this.DialogResult = DialogResult.Cancel;
        }

+        private void cmbStreamSecurity_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            string security = cmbStreamSecurity.Text;
+            if (Utils.IsNullOrEmpty(security))
+            {
+                panTlsMore.Hide();
+            }
+            else
+            {
+                panTlsMore.Show();
+            }
+        }

        #region 导入客户端/服务端配置

@@ -207,9 +217,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 +243,7 @@ namespace v2rayN.Forms
            }
            if (vmessItem == null)
            {
-                UI.Show(msg);
+                UI.ShowWarning(msg);
                return;
            }

@@ -256,11 +268,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;
            }

@@ -277,17 +288,5 @@ namespace v2rayN.Forms
        }
        #endregion

-        private void cmbStreamSecurity_SelectedIndexChanged(object sender, EventArgs e)
-        {
-            string security = cmbStreamSecurity.Text;
-            if (Utils.IsNullOrEmpty(security))
-            {
-                panTlsMore.Hide();
-            }
-            else
-            {
-                panTlsMore.Show();
-            }
-        }
    }
 }
--- a/v2rayN/v2rayN/Forms/AddServerForm.resx
+++ b/v2rayN/v2rayN/Forms/AddServerForm.resx
@@ -171,7 +171,7 @@
    <value>True</value>
  </data>
  <data name="label13.Location" type="System.Drawing.Point, System.Drawing">
-    <value>285, 203</value>
+    <value>285, 175</value>
  </data>
  <data name="label13.Size" type="System.Drawing.Size, System.Drawing">
    <value>113, 12</value>
@@ -202,16 +202,16 @@
    <value>NoControl</value>
  </data>
  <data name="label24.Location" type="System.Drawing.Point, System.Drawing">
-    <value>526, 165</value>
+    <value>529, 207</value>
  </data>
  <data name="label24.Size" type="System.Drawing.Size, System.Drawing">
-    <value>65, 12</value>
+    <value>119, 12</value>
  </data>
  <data name="label24.TabIndex" type="System.Int32, mscorlib">
    <value>35</value>
  </data>
  <data name="label24.Text" xml:space="preserve">
-    <value>3)QUIC key</value>
+    <value>3)QUIC key/Kcp seed</value>
  </data>
  <data name="&gt;&gt;label24.Name" xml:space="preserve">
    <value>label24</value>
@@ -232,7 +232,7 @@
    <value>NoControl</value>
  </data>
  <data name="label23.Location" type="System.Drawing.Point, System.Drawing">
-    <value>470, 99</value>
+    <value>465, 146</value>
  </data>
  <data name="label23.Size" type="System.Drawing.Size, System.Drawing">
    <value>89, 12</value>
@@ -255,33 +255,6 @@
  <data name="&gt;&gt;label23.ZOrder" xml:space="preserve">
    <value>1</value>
  </data>
-  <data name="label22.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="label22.Location" type="System.Drawing.Point, System.Drawing">
-    <value>205, 11</value>
-  </data>
-  <data name="label22.Size" type="System.Drawing.Size, System.Drawing">
-    <value>113, 12</value>
-  </data>
-  <data name="label22.TabIndex" type="System.Int32, mscorlib">
-    <value>32</value>
-  </data>
-  <data name="label22.Text" xml:space="preserve">
-    <value>Default value true</value>
-  </data>
-  <data name="&gt;&gt;label22.Name" xml:space="preserve">
-    <value>label22</value>
-  </data>
-  <data name="&gt;&gt;label22.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;label22.Parent" xml:space="preserve">
-    <value>panTlsMore</value>
-  </data>
-  <data name="&gt;&gt;label22.ZOrder" xml:space="preserve">
-    <value>0</value>
-  </data>
  <data name="label21.AutoSize" type="System.Boolean, mscorlib">
    <value>True</value>
  </data>
@@ -307,7 +280,7 @@
    <value>panTlsMore</value>
  </data>
  <data name="&gt;&gt;label21.ZOrder" xml:space="preserve">
-    <value>1</value>
+    <value>0</value>
  </data>
  <data name="cmbAllowInsecure.Items" xml:space="preserve">
    <value />
@@ -337,10 +310,10 @@
    <value>panTlsMore</value>
  </data>
  <data name="&gt;&gt;cmbAllowInsecure.ZOrder" xml:space="preserve">
-    <value>2</value>
+    <value>1</value>
  </data>
  <data name="panTlsMore.Location" type="System.Drawing.Point, System.Drawing">
-    <value>284, 189</value>
+    <value>284, 234</value>
  </data>
  <data name="panTlsMore.Size" type="System.Drawing.Size, System.Drawing">
    <value>338, 35</value>
@@ -360,11 +333,38 @@
  <data name="&gt;&gt;panTlsMore.ZOrder" xml:space="preserve">
    <value>2</value>
  </data>
+  <data name="label9.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="label9.Location" type="System.Drawing.Point, System.Drawing">
+    <value>350, 32</value>
+  </data>
+  <data name="label9.Size" type="System.Drawing.Size, System.Drawing">
+    <value>113, 12</value>
+  </data>
+  <data name="label9.TabIndex" type="System.Int32, mscorlib">
+    <value>15</value>
+  </data>
+  <data name="label9.Text" xml:space="preserve">
+    <value>*Default value tcp</value>
+  </data>
+  <data name="&gt;&gt;label9.Name" xml:space="preserve">
+    <value>label9</value>
+  </data>
+  <data name="&gt;&gt;label9.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;label9.Parent" xml:space="preserve">
+    <value>groupBox2</value>
+  </data>
+  <data name="&gt;&gt;label9.ZOrder" xml:space="preserve">
+    <value>3</value>
+  </data>
  <data name="label20.AutoSize" type="System.Boolean, mscorlib">
    <value>True</value>
  </data>
  <data name="label20.Location" type="System.Drawing.Point, System.Drawing">
-    <value>469, 83</value>
+    <value>464, 130</value>
  </data>
  <data name="label20.Size" type="System.Drawing.Size, System.Drawing">
    <value>203, 12</value>
@@ -385,10 +385,10 @@
    <value>groupBox2</value>
  </data>
  <data name="&gt;&gt;label20.ZOrder" xml:space="preserve">
-    <value>3</value>
+    <value>4</value>
  </data>
  <data name="txtPath.Location" type="System.Drawing.Point, System.Drawing">
-    <value>124, 125</value>
+    <value>127, 169</value>
  </data>
  <data name="txtPath.Multiline" type="System.Boolean, mscorlib">
    <value>True</value>
@@ -409,13 +409,76 @@
    <value>groupBox2</value>
  </data>
  <data name="&gt;&gt;txtPath.ZOrder" xml:space="preserve">
-    <value>4</value>
+    <value>5</value>
+  </data>
+  <data name="cmbNetwork.Items" xml:space="preserve">
+    <value>tcp</value>
+  </data>
+  <data name="cmbNetwork.Items1" xml:space="preserve">
+    <value>kcp</value>
+  </data>
+  <data name="cmbNetwork.Items2" xml:space="preserve">
+    <value>ws</value>
+  </data>
+  <data name="cmbNetwork.Items3" xml:space="preserve">
+    <value>h2</value>
+  </data>
+  <data name="cmbNetwork.Items4" xml:space="preserve">
+    <value>quic</value>
+  </data>
+  <data name="cmbNetwork.Location" type="System.Drawing.Point, System.Drawing">
+    <value>192, 28</value>
+  </data>
+  <data name="cmbNetwork.Size" type="System.Drawing.Size, System.Drawing">
+    <value>143, 20</value>
+  </data>
+  <data name="cmbNetwork.TabIndex" type="System.Int32, mscorlib">
+    <value>12</value>
+  </data>
+  <data name="&gt;&gt;cmbNetwork.Name" xml:space="preserve">
+    <value>cmbNetwork</value>
+  </data>
+  <data name="&gt;&gt;cmbNetwork.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;cmbNetwork.Parent" xml:space="preserve">
+    <value>groupBox2</value>
+  </data>
+  <data name="&gt;&gt;cmbNetwork.ZOrder" xml:space="preserve">
+    <value>6</value>
+  </data>
+  <data name="label7.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="label7.Location" type="System.Drawing.Point, System.Drawing">
+    <value>9, 32</value>
+  </data>
+  <data name="label7.Size" type="System.Drawing.Size, System.Drawing">
+    <value>167, 12</value>
+  </data>
+  <data name="label7.TabIndex" type="System.Int32, mscorlib">
+    <value>13</value>
+  </data>
+  <data name="label7.Text" xml:space="preserve">
+    <value>Transport protocol(network)</value>
+  </data>
+  <data name="&gt;&gt;label7.Name" xml:space="preserve">
+    <value>label7</value>
+  </data>
+  <data name="&gt;&gt;label7.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;label7.Parent" xml:space="preserve">
+    <value>groupBox2</value>
+  </data>
+  <data name="&gt;&gt;label7.ZOrder" xml:space="preserve">
+    <value>7</value>
  </data>
  <data name="label19.AutoSize" type="System.Boolean, mscorlib">
    <value>True</value>
  </data>
  <data name="label19.Location" type="System.Drawing.Point, System.Drawing">
-    <value>9, 125</value>
+    <value>9, 169</value>
  </data>
  <data name="label19.Size" type="System.Drawing.Size, System.Drawing">
    <value>29, 12</value>
@@ -436,13 +499,13 @@
    <value>groupBox2</value>
  </data>
  <data name="&gt;&gt;label19.ZOrder" xml:space="preserve">
-    <value>5</value>
+    <value>8</value>
  </data>
  <data name="label18.AutoSize" type="System.Boolean, mscorlib">
    <value>True</value>
  </data>
  <data name="label18.Location" type="System.Drawing.Point, System.Drawing">
-    <value>526, 147</value>
+    <value>529, 189</value>
  </data>
  <data name="label18.Size" type="System.Drawing.Size, System.Drawing">
    <value>59, 12</value>
@@ -463,13 +526,13 @@
    <value>groupBox2</value>
  </data>
  <data name="&gt;&gt;label18.ZOrder" xml:space="preserve">
-    <value>6</value>
+    <value>9</value>
  </data>
  <data name="label17.AutoSize" type="System.Boolean, mscorlib">
    <value>True</value>
  </data>
  <data name="label17.Location" type="System.Drawing.Point, System.Drawing">
-    <value>469, 68</value>
+    <value>464, 115</value>
  </data>
  <data name="label17.Size" type="System.Drawing.Size, System.Drawing">
    <value>59, 12</value>
@@ -490,13 +553,13 @@
    <value>groupBox2</value>
  </data>
  <data name="&gt;&gt;label17.ZOrder" xml:space="preserve">
-    <value>7</value>
+    <value>10</value>
  </data>
  <data name="label16.AutoSize" type="System.Boolean, mscorlib">
    <value>True</value>
  </data>
  <data name="label16.Location" type="System.Drawing.Point, System.Drawing">
-    <value>526, 130</value>
+    <value>529, 172</value>
  </data>
  <data name="label16.Size" type="System.Drawing.Size, System.Drawing">
    <value>59, 12</value>
@@ -517,13 +580,13 @@
    <value>groupBox2</value>
  </data>
  <data name="&gt;&gt;label16.ZOrder" xml:space="preserve">
-    <value>8</value>
+    <value>11</value>
  </data>
  <data name="label14.AutoSize" type="System.Boolean, mscorlib">
    <value>True</value>
  </data>
  <data name="label14.Location" type="System.Drawing.Point, System.Drawing">
-    <value>469, 53</value>
+    <value>464, 100</value>
  </data>
  <data name="label14.Size" type="System.Drawing.Size, System.Drawing">
    <value>215, 12</value>
@@ -544,13 +607,13 @@
    <value>groupBox2</value>
  </data>
  <data name="&gt;&gt;label14.ZOrder" xml:space="preserve">
-    <value>9</value>
+    <value>12</value>
  </data>
  <data name="label15.AutoSize" type="System.Boolean, mscorlib">
    <value>True</value>
  </data>
  <data name="label15.Location" type="System.Drawing.Point, System.Drawing">
-    <value>9, 201</value>
+    <value>9, 243</value>
  </data>
  <data name="label15.Size" type="System.Drawing.Size, System.Drawing">
    <value>23, 12</value>
@@ -571,7 +634,7 @@
    <value>groupBox2</value>
  </data>
  <data name="&gt;&gt;label15.ZOrder" xml:space="preserve">
-    <value>10</value>
+    <value>13</value>
  </data>
  <data name="cmbStreamSecurity.Items" xml:space="preserve">
    <value />
@@ -580,7 +643,7 @@
    <value>tls</value>
  </data>
  <data name="cmbStreamSecurity.Location" type="System.Drawing.Point, System.Drawing">
-    <value>124, 197</value>
+    <value>127, 239</value>
  </data>
  <data name="cmbStreamSecurity.Size" type="System.Drawing.Size, System.Drawing">
    <value>143, 20</value>
@@ -598,13 +661,13 @@
    <value>groupBox2</value>
  </data>
  <data name="&gt;&gt;cmbStreamSecurity.ZOrder" xml:space="preserve">
-    <value>11</value>
+    <value>14</value>
  </data>
  <data name="label12.AutoSize" type="System.Boolean, mscorlib">
    <value>True</value>
  </data>
  <data name="label12.Location" type="System.Drawing.Point, System.Drawing">
-    <value>282, 34</value>
+    <value>282, 66</value>
  </data>
  <data name="label12.Size" type="System.Drawing.Size, System.Drawing">
    <value>299, 12</value>
@@ -625,10 +688,10 @@
    <value>groupBox2</value>
  </data>
  <data name="&gt;&gt;label12.ZOrder" xml:space="preserve">
-    <value>12</value>
+    <value>15</value>
  </data>
  <data name="txtRequestHost.Location" type="System.Drawing.Point, System.Drawing">
-    <value>158, 58</value>
+    <value>158, 100</value>
  </data>
  <data name="txtRequestHost.Multiline" type="System.Boolean, mscorlib">
    <value>True</value>
@@ -649,13 +712,13 @@
    <value>groupBox2</value>
  </data>
  <data name="&gt;&gt;txtRequestHost.ZOrder" xml:space="preserve">
-    <value>13</value>
+    <value>16</value>
  </data>
  <data name="label11.AutoSize" type="System.Boolean, mscorlib">
    <value>True</value>
  </data>
  <data name="label11.Location" type="System.Drawing.Point, System.Drawing">
-    <value>9, 34</value>
+    <value>9, 66</value>
  </data>
  <data name="label11.Size" type="System.Drawing.Size, System.Drawing">
    <value>95, 12</value>
@@ -676,13 +739,13 @@
    <value>groupBox2</value>
  </data>
  <data name="&gt;&gt;label11.ZOrder" xml:space="preserve">
-    <value>14</value>
+    <value>17</value>
  </data>
  <data name="label10.AutoSize" type="System.Boolean, mscorlib">
    <value>True</value>
  </data>
  <data name="label10.Location" type="System.Drawing.Point, System.Drawing">
-    <value>9, 62</value>
+    <value>9, 100</value>
  </data>
  <data name="label10.Size" type="System.Drawing.Size, System.Drawing">
    <value>143, 12</value>
@@ -703,7 +766,7 @@
    <value>groupBox2</value>
  </data>
  <data name="&gt;&gt;label10.ZOrder" xml:space="preserve">
-    <value>15</value>
+    <value>18</value>
  </data>
  <data name="cmbHeaderType.Items" xml:space="preserve">
    <value>none</value>
@@ -727,7 +790,7 @@
    <value>wireguard</value>
  </data>
  <data name="cmbHeaderType.Location" type="System.Drawing.Point, System.Drawing">
-    <value>124, 30</value>
+    <value>127, 64</value>
  </data>
  <data name="cmbHeaderType.Size" type="System.Drawing.Size, System.Drawing">
    <value>143, 20</value>
@@ -745,22 +808,22 @@
    <value>groupBox2</value>
  </data>
  <data name="&gt;&gt;cmbHeaderType.ZOrder" xml:space="preserve">
-    <value>16</value>
+    <value>19</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>3, 237</value>
+    <value>3, 215</value>
  </data>
  <data name="groupBox2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>723, 234</value>
+    <value>723, 281</value>
  </data>
  <data name="groupBox2.TabIndex" type="System.Int32, mscorlib">
    <value>21</value>
  </data>
  <data name="groupBox2.Text" xml:space="preserve">
-    <value>Keep the default value if it is not clear</value>
+    <value>Transport</value>
  </data>
  <data name="&gt;&gt;groupBox2.Name" xml:space="preserve">
    <value>groupBox2</value>
@@ -774,33 +837,6 @@
  <data name="&gt;&gt;groupBox2.ZOrder" xml:space="preserve">
    <value>2</value>
  </data>
-  <data name="label9.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="label9.Location" type="System.Drawing.Point, System.Drawing">
-    <value>353, 175</value>
-  </data>
-  <data name="label9.Size" type="System.Drawing.Size, System.Drawing">
-    <value>113, 12</value>
-  </data>
-  <data name="label9.TabIndex" type="System.Int32, mscorlib">
-    <value>15</value>
-  </data>
-  <data name="label9.Text" xml:space="preserve">
-    <value>*Default value tcp</value>
-  </data>
-  <data name="&gt;&gt;label9.Name" xml:space="preserve">
-    <value>label9</value>
-  </data>
-  <data name="&gt;&gt;label9.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;label9.Parent" xml:space="preserve">
-    <value>groupBox1</value>
-  </data>
-  <data name="&gt;&gt;label9.ZOrder" xml:space="preserve">
-    <value>3</value>
-  </data>
  <data name="label8.AutoSize" type="System.Boolean, mscorlib">
    <value>True</value>
  </data>
@@ -826,70 +862,7 @@
    <value>groupBox1</value>
  </data>
  <data name="&gt;&gt;label8.ZOrder" xml:space="preserve">
-    <value>4</value>
-  </data>
-  <data name="cmbNetwork.Items" xml:space="preserve">
-    <value>tcp</value>
-  </data>
-  <data name="cmbNetwork.Items1" xml:space="preserve">
-    <value>kcp</value>
-  </data>
-  <data name="cmbNetwork.Items2" xml:space="preserve">
-    <value>ws</value>
-  </data>
-  <data name="cmbNetwork.Items3" xml:space="preserve">
-    <value>h2</value>
-  </data>
-  <data name="cmbNetwork.Items4" xml:space="preserve">
-    <value>quic</value>
-  </data>
-  <data name="cmbNetwork.Location" type="System.Drawing.Point, System.Drawing">
-    <value>195, 171</value>
-  </data>
-  <data name="cmbNetwork.Size" type="System.Drawing.Size, System.Drawing">
-    <value>143, 20</value>
-  </data>
-  <data name="cmbNetwork.TabIndex" type="System.Int32, mscorlib">
-    <value>12</value>
-  </data>
-  <data name="&gt;&gt;cmbNetwork.Name" xml:space="preserve">
-    <value>cmbNetwork</value>
-  </data>
-  <data name="&gt;&gt;cmbNetwork.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;cmbNetwork.Parent" xml:space="preserve">
-    <value>groupBox1</value>
-  </data>
-  <data name="&gt;&gt;cmbNetwork.ZOrder" xml:space="preserve">
-    <value>5</value>
-  </data>
-  <data name="label7.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="label7.Location" type="System.Drawing.Point, System.Drawing">
-    <value>12, 175</value>
-  </data>
-  <data name="label7.Size" type="System.Drawing.Size, System.Drawing">
-    <value>167, 12</value>
-  </data>
-  <data name="label7.TabIndex" type="System.Int32, mscorlib">
-    <value>13</value>
-  </data>
-  <data name="label7.Text" xml:space="preserve">
-    <value>Transport protocol(network)</value>
-  </data>
-  <data name="&gt;&gt;label7.Name" xml:space="preserve">
-    <value>label7</value>
-  </data>
-  <data name="&gt;&gt;label7.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;label7.Parent" xml:space="preserve">
-    <value>groupBox1</value>
-  </data>
-  <data name="&gt;&gt;label7.ZOrder" xml:space="preserve">
-    <value>6</value>
+    <value>3</value>
  </data>
  <data name="cmbSecurity.Items" xml:space="preserve">
    <value>aes-128-gcm</value>
@@ -922,10 +895,10 @@
    <value>groupBox1</value>
  </data>
  <data name="&gt;&gt;cmbSecurity.ZOrder" xml:space="preserve">
-    <value>7</value>
+    <value>4</value>
  </data>
  <data name="txtRemarks.Location" type="System.Drawing.Point, System.Drawing">
-    <value>127, 199</value>
+    <value>127, 171</value>
  </data>
  <data name="txtRemarks.Size" type="System.Drawing.Size, System.Drawing">
    <value>143, 21</value>
@@ -943,13 +916,13 @@
    <value>groupBox1</value>
  </data>
  <data name="&gt;&gt;txtRemarks.ZOrder" xml:space="preserve">
-    <value>8</value>
+    <value>5</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, 203</value>
+    <value>12, 175</value>
  </data>
  <data name="label6.Size" type="System.Drawing.Size, System.Drawing">
    <value>95, 12</value>
@@ -970,7 +943,7 @@
    <value>groupBox1</value>
  </data>
  <data name="&gt;&gt;label6.ZOrder" xml:space="preserve">
-    <value>9</value>
+    <value>6</value>
  </data>
  <data name="label5.AutoSize" type="System.Boolean, mscorlib">
    <value>True</value>
@@ -997,7 +970,7 @@
    <value>groupBox1</value>
  </data>
  <data name="&gt;&gt;label5.ZOrder" xml:space="preserve">
-    <value>10</value>
+    <value>7</value>
  </data>
  <data name="txtAlterId.Location" type="System.Drawing.Point, System.Drawing">
    <value>127, 114</value>
@@ -1018,7 +991,7 @@
    <value>groupBox1</value>
  </data>
  <data name="&gt;&gt;txtAlterId.ZOrder" xml:space="preserve">
-    <value>11</value>
+    <value>8</value>
  </data>
  <data name="label4.AutoSize" type="System.Boolean, mscorlib">
    <value>True</value>
@@ -1045,7 +1018,7 @@
    <value>groupBox1</value>
  </data>
  <data name="&gt;&gt;label4.ZOrder" xml:space="preserve">
-    <value>12</value>
+    <value>9</value>
  </data>
  <data name="txtId.Location" type="System.Drawing.Point, System.Drawing">
    <value>127, 85</value>
@@ -1066,7 +1039,7 @@
    <value>groupBox1</value>
  </data>
  <data name="&gt;&gt;txtId.ZOrder" xml:space="preserve">
-    <value>13</value>
+    <value>10</value>
  </data>
  <data name="label3.AutoSize" type="System.Boolean, mscorlib">
    <value>True</value>
@@ -1093,7 +1066,7 @@
    <value>groupBox1</value>
  </data>
  <data name="&gt;&gt;label3.ZOrder" xml:space="preserve">
-    <value>14</value>
+    <value>11</value>
  </data>
  <data name="txtPort.Location" type="System.Drawing.Point, System.Drawing">
    <value>127, 56</value>
@@ -1114,7 +1087,7 @@
    <value>groupBox1</value>
  </data>
  <data name="&gt;&gt;txtPort.ZOrder" xml:space="preserve">
-    <value>15</value>
+    <value>12</value>
  </data>
  <data name="label2.AutoSize" type="System.Boolean, mscorlib">
    <value>True</value>
@@ -1141,7 +1114,7 @@
    <value>groupBox1</value>
  </data>
  <data name="&gt;&gt;label2.ZOrder" xml:space="preserve">
-    <value>16</value>
+    <value>13</value>
  </data>
  <data name="txtAddress.Location" type="System.Drawing.Point, System.Drawing">
    <value>127, 27</value>
@@ -1162,7 +1135,7 @@
    <value>groupBox1</value>
  </data>
  <data name="&gt;&gt;txtAddress.ZOrder" xml:space="preserve">
-    <value>17</value>
+    <value>14</value>
  </data>
  <data name="label1.AutoSize" type="System.Boolean, mscorlib">
    <value>True</value>
@@ -1189,7 +1162,7 @@
    <value>groupBox1</value>
  </data>
  <data name="&gt;&gt;label1.ZOrder" xml:space="preserve">
-    <value>18</value>
+    <value>15</value>
  </data>
  <data name="groupBox1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
    <value>Fill</value>
@@ -1198,7 +1171,7 @@
    <value>0, 35</value>
  </data>
  <data name="groupBox1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>729, 474</value>
+    <value>729, 499</value>
  </data>
  <data name="groupBox1.TabIndex" type="System.Int32, mscorlib">
    <value>3</value>
@@ -1246,7 +1219,7 @@
    <value>Bottom</value>
  </data>
  <data name="panel2.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 509</value>
+    <value>0, 534</value>
  </data>
  <data name="panel2.Size" type="System.Drawing.Size, System.Drawing">
    <value>729, 60</value>
@@ -1344,11 +1317,14 @@
  <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    <value>True</value>
  </metadata>
+  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>25</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>729, 569</value>
+    <value>729, 594</value>
  </data>
  <data name="$this.Text" xml:space="preserve">
    <value>Edit or add a [VMess] server</value>
@@ -1387,6 +1363,6 @@
    <value>AddServerForm</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>
+    <value>v2rayN.Forms.BaseServerForm, v2rayN, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value>
  </data>
 </root>
--- a/v2rayN/v2rayN/Forms/AddServerForm.zh-Hans.resx
+++ b/v2rayN/v2rayN/Forms/AddServerForm.zh-Hans.resx
@@ -130,14 +130,14 @@
    <value>*手填,方便识别管理</value>
  </data>
  <data name="groupBox2.Text" xml:space="preserve">
-    <value>不清楚则保持默认值</value>
+    <value>底层传输方式(transport)</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>
+    <value>149, 12</value>
  </data>
  <data name="label24.Text" xml:space="preserve">
-    <value>3)QUIC 加密密钥</value>
+    <value>3)QUIC 加密密钥/Kcp seed</value>
  </data>
  <data name="label23.Size" type="System.Drawing.Size, System.Drawing">
    <value>95, 12</value>
@@ -145,11 +145,23 @@
  <data name="label23.Text" xml:space="preserve">
    <value>4)QUIC 加密方式</value>
  </data>
-  <data name="label22.Size" type="System.Drawing.Size, System.Drawing">
-    <value>53, 12</value>
+  <data name="label21.Size" type="System.Drawing.Size, System.Drawing">
+    <value>167, 12</value>
  </data>
-  <data name="label22.Text" xml:space="preserve">
-    <value>默认true</value>
+  <data name="label21.Text" xml:space="preserve">
+    <value>跳过证书验证(allowInsecure)</value>
+  </data>
+  <data name="cmbAllowInsecure.Location" type="System.Drawing.Point, System.Drawing">
+    <value>223, 7</value>
+  </data>
+  <data name="label9.Location" type="System.Drawing.Point, System.Drawing">
+    <value>350, 36</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="label20.Size" type="System.Drawing.Size, System.Drawing">
    <value>149, 12</value>
@@ -157,6 +169,27 @@
  <data name="label20.Text" xml:space="preserve">
    <value>3)h2 host中间逗号(,)隔开</value>
  </data>
+  <data name="txtPath.Location" type="System.Drawing.Point, System.Drawing">
+    <value>127, 168</value>
+  </data>
+  <data name="cmbNetwork.Location" type="System.Drawing.Point, System.Drawing">
+    <value>127, 32</value>
+  </data>
+  <data name="cmbNetwork.Size" type="System.Drawing.Size, System.Drawing">
+    <value>211, 20</value>
+  </data>
+  <data name="label7.Location" type="System.Drawing.Point, System.Drawing">
+    <value>9, 36</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="label19.Location" type="System.Drawing.Point, System.Drawing">
+    <value>9, 168</value>
+  </data>
  <data name="label19.Size" type="System.Drawing.Size, System.Drawing">
    <value>65, 12</value>
  </data>
@@ -169,11 +202,20 @@
  <data name="label14.Text" xml:space="preserve">
    <value>1)http host中间逗号(,)隔开</value>
  </data>
+  <data name="label15.Location" type="System.Drawing.Point, System.Drawing">
+    <value>9, 237</value>
+  </data>
  <data name="label15.Size" type="System.Drawing.Size, System.Drawing">
-    <value>77, 12</value>
+    <value>107, 12</value>
  </data>
  <data name="label15.Text" xml:space="preserve">
-    <value>底层传输安全</value>
+    <value>底层传输安全(tls)</value>
+  </data>
+  <data name="cmbStreamSecurity.Location" type="System.Drawing.Point, System.Drawing">
+    <value>127, 237</value>
+  </data>
+  <data name="label12.Location" type="System.Drawing.Point, System.Drawing">
+    <value>282, 71</value>
  </data>
  <data name="label12.Size" type="System.Drawing.Size, System.Drawing">
    <value>197, 12</value>
@@ -182,28 +224,31 @@
    <value>*tcp或kcp或QUIC伪装类型,默认none</value>
  </data>
  <data name="txtRequestHost.Location" type="System.Drawing.Point, System.Drawing">
-    <value>124, 58</value>
+    <value>127, 102</value>
  </data>
  <data name="txtRequestHost.Size" type="System.Drawing.Size, System.Drawing">
    <value>334, 51</value>
  </data>
+  <data name="label11.Location" type="System.Drawing.Point, System.Drawing">
+    <value>9, 71</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.Location" type="System.Drawing.Point, System.Drawing">
+    <value>9, 102</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 name="cmbHeaderType.Location" type="System.Drawing.Point, System.Drawing">
+    <value>127, 67</value>
  </data>
  <data name="label8.Size" type="System.Drawing.Size, System.Drawing">
    <value>113, 12</value>
@@ -211,18 +256,6 @@
  <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>
--- a/v2rayN/v2rayN/Forms/BaseServerForm.Designer.cs
+++ b/v2rayN/v2rayN/Forms/BaseServerForm.Designer.cs
@@ -0,0 +1,51 @@
+namespace v2rayN.Forms
+{
+    partial class BaseServerForm
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(BaseServerForm));
+            this.SuspendLayout();
+            // 
+            // BaseServerForm
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(292, 273);
+            this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
+            this.MaximizeBox = false;
+            this.MinimizeBox = false;
+            this.Name = "BaseServerForm";
+            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
+            this.Text = "BaseServerForm";
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+    }
+}
--- a/v2rayN/v2rayN/Forms/BaseServerForm.cs
+++ b/v2rayN/v2rayN/Forms/BaseServerForm.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Windows.Forms;
+using v2rayN.Mode;
+
+namespace v2rayN.Forms
+{
+    public partial class BaseServerForm : BaseForm
+    {
+        public int EditIndex { get; set; }
+        protected VmessItem vmessItem = null;
+
+        public BaseServerForm()
+        {
+            InitializeComponent();
+        }
+ 
+    }
+}
--- a/v2rayN/v2rayN/Forms/BaseServerForm.resx
+++ b/v2rayN/v2rayN/Forms/BaseServerForm.resx
--- a/v2rayN/v2rayN/Forms/MainForm.Designer.cs
+++ b/v2rayN/v2rayN/Forms/MainForm.Designer.cs
@@ -30,12 +30,14 @@
        {
            this.components = new System.ComponentModel.Container();
            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainForm));
-            this.splitContainer1 = new System.Windows.Forms.SplitContainer();
+            this.scMain = new System.Windows.Forms.SplitContainer();
            this.lvServers = new v2rayN.Base.ListViewFlickerFree();
            this.cmsLv = new System.Windows.Forms.ContextMenuStrip(this.components);
            this.menuAddVmessServer = new System.Windows.Forms.ToolStripMenuItem();
+            this.menuAddVlessServer = new System.Windows.Forms.ToolStripMenuItem();
            this.menuAddShadowsocksServer = new System.Windows.Forms.ToolStripMenuItem();
            this.menuAddSocksServer = new System.Windows.Forms.ToolStripMenuItem();
+            this.menuAddTrojanServer = new System.Windows.Forms.ToolStripMenuItem();
            this.menuAddCustomServer = new System.Windows.Forms.ToolStripMenuItem();
            this.menuAddServers = new System.Windows.Forms.ToolStripMenuItem();
            this.menuScanScreen = new System.Windows.Forms.ToolStripMenuItem();
@@ -55,6 +57,7 @@
            this.menuTcpingServer = new System.Windows.Forms.ToolStripMenuItem();
            this.menuRealPingServer = new System.Windows.Forms.ToolStripMenuItem();
            this.menuSpeedServer = new System.Windows.Forms.ToolStripMenuItem();
+            this.tsbTestMe = new System.Windows.Forms.ToolStripMenuItem();
            this.toolStripSeparator6 = new System.Windows.Forms.ToolStripSeparator();
            this.menuExport2ClientConfig = new System.Windows.Forms.ToolStripMenuItem();
            this.menuExport2ServerConfig = new System.Windows.Forms.ToolStripMenuItem();
@@ -64,16 +67,19 @@
            this.tsbServer = new System.Windows.Forms.ToolStripDropDownButton();
            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();
@@ -98,6 +104,7 @@
            this.tsbSub = new System.Windows.Forms.ToolStripDropDownButton();
            this.tsbSubSetting = new System.Windows.Forms.ToolStripMenuItem();
            this.tsbSubUpdate = new System.Windows.Forms.ToolStripMenuItem();
+            this.tsbQRCodeSwitch = new System.Windows.Forms.ToolStripButton();
            this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator();
            this.tsbOptionSetting = new System.Windows.Forms.ToolStripButton();
            this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator();
@@ -107,20 +114,22 @@
            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();
            this.tsbPromotion = new System.Windows.Forms.ToolStripButton();
            this.toolStripSeparator11 = new System.Windows.Forms.ToolStripSeparator();
            this.tsbClose = new System.Windows.Forms.ToolStripButton();
-            ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
-            this.splitContainer1.Panel1.SuspendLayout();
-            this.splitContainer1.Panel2.SuspendLayout();
-            this.splitContainer1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.scMain)).BeginInit();
+            this.scMain.Panel1.SuspendLayout();
+            this.scMain.Panel2.SuspendLayout();
+            this.scMain.SuspendLayout();
            this.cmsLv.SuspendLayout();
            this.cmsMain.SuspendLayout();
            this.groupBox1.SuspendLayout();
@@ -129,25 +138,27 @@
            this.tsMain.SuspendLayout();
            this.SuspendLayout();
            // 
-            // splitContainer1
+            // scMain
            // 
-            resources.ApplyResources(this.splitContainer1, "splitContainer1");
-            this.splitContainer1.FixedPanel = System.Windows.Forms.FixedPanel.Panel2;
-            this.splitContainer1.Name = "splitContainer1";
+            resources.ApplyResources(this.scMain, "scMain");
+            this.scMain.FixedPanel = System.Windows.Forms.FixedPanel.Panel2;
+            this.scMain.Name = "scMain";
            // 
-            // splitContainer1.Panel1
+            // scMain.Panel1
            // 
-            this.splitContainer1.Panel1.Controls.Add(this.lvServers);
+            resources.ApplyResources(this.scMain.Panel1, "scMain.Panel1");
+            this.scMain.Panel1.Controls.Add(this.lvServers);
            // 
-            // splitContainer1.Panel2
+            // scMain.Panel2
            // 
-            this.splitContainer1.Panel2.Controls.Add(this.qrCodeControl);
-            this.splitContainer1.SplitterMoved += new System.Windows.Forms.SplitterEventHandler(this.splitContainer1_SplitterMoved);
+            resources.ApplyResources(this.scMain.Panel2, "scMain.Panel2");
+            this.scMain.Panel2.Controls.Add(this.qrCodeControl);
+            this.scMain.TabStop = false;
            // 
            // 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;
@@ -158,17 +169,22 @@
            this.lvServers.Name = "lvServers";
            this.lvServers.UseCompatibleStateImageBehavior = false;
            this.lvServers.View = System.Windows.Forms.View.Details;
+            this.lvServers.ColumnClick += new System.Windows.Forms.ColumnClickEventHandler(this.lvServers_ColumnClick);
            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,
+            this.menuAddVlessServer,
            this.menuAddShadowsocksServer,
            this.menuAddSocksServer,
+            this.menuAddTrojanServer,
            this.menuAddCustomServer,
            this.menuAddServers,
            this.menuScanScreen,
@@ -188,171 +204,188 @@
            this.menuTcpingServer,
            this.menuRealPingServer,
            this.menuSpeedServer,
+            this.tsbTestMe,
            this.toolStripSeparator6,
            this.menuExport2ClientConfig,
            this.menuExport2ServerConfig,
            this.menuExport2ShareUrl,
            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);
            // 
+            // menuAddVlessServer
+            // 
+            resources.ApplyResources(this.menuAddVlessServer, "menuAddVlessServer");
+            this.menuAddVlessServer.Name = "menuAddVlessServer";
+            this.menuAddVlessServer.Click += new System.EventHandler(this.menuAddVlessServer_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);
            // 
+            // menuAddTrojanServer
+            // 
+            resources.ApplyResources(this.menuAddTrojanServer, "menuAddTrojanServer");
+            this.menuAddTrojanServer.Name = "menuAddTrojanServer";
+            this.menuAddTrojanServer.Click += new System.EventHandler(this.menuAddTrojanServer_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);
            // 
+            // tsbTestMe
+            // 
+            resources.ApplyResources(this.tsbTestMe, "tsbTestMe");
+            this.tsbTestMe.Name = "tsbTestMe";
+            this.tsbTestMe.Click += new System.EventHandler(this.tsbTestMe_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);
            // 
            // qrCodeControl
@@ -362,28 +395,28 @@
            // 
            // tsbServer
            // 
+            resources.ApplyResources(this.tsbServer, "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 +424,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 +527,31 @@
            // 
            // groupBox1
            // 
-            this.groupBox1.Controls.Add(this.splitContainer1);
            resources.ApplyResources(this.groupBox1, "groupBox1");
+            this.groupBox1.Controls.Add(this.scMain);
            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 +564,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 +574,8 @@
            // 
            // toolSslSocksPort
            // 
-            this.toolSslSocksPort.Name = "toolSslSocksPort";
            resources.ApplyResources(this.toolSslSocksPort, "toolSslSocksPort");
+            this.toolSslSocksPort.Name = "toolSslSocksPort";
            // 
            // toolSslBlank1
            // 
@@ -536,8 +590,8 @@
            // 
            // toolSslHttpPort
            // 
-            this.toolSslHttpPort.Name = "toolSslHttpPort";
            resources.ApplyResources(this.toolSslHttpPort, "toolSslHttpPort");
+            this.toolSslHttpPort.Name = "toolSslHttpPort";
            // 
            // toolSslBlank2
            // 
@@ -552,8 +606,8 @@
            // 
            // toolSslPacPort
            // 
-            this.toolSslPacPort.Name = "toolSslPacPort";
            resources.ApplyResources(this.toolSslPacPort, "toolSslPacPort");
+            this.toolSslPacPort.Name = "toolSslPacPort";
            // 
            // toolSslBlank3
            // 
@@ -569,8 +623,8 @@
            // 
            // toolSslBlank4
            // 
-            this.toolSslBlank4.Name = "toolSslBlank4";
            resources.ApplyResources(this.toolSslBlank4, "toolSslBlank4");
+            this.toolSslBlank4.Name = "toolSslBlank4";
            // 
            // panel1
            // 
@@ -579,11 +633,13 @@
            // 
            // 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,
            this.toolStripSeparator4,
            this.tsbSub,
+            this.tsbQRCodeSwitch,
            this.toolStripSeparator8,
            this.tsbOptionSetting,
            this.toolStripSeparator5,
@@ -595,51 +651,60 @@
            this.tsbPromotion,
            this.toolStripSeparator11,
            this.tsbClose});
-            resources.ApplyResources(this.tsMain, "tsMain");
            this.tsMain.Name = "tsMain";
+            this.tsMain.TabStop = true;
            // 
            // 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);
            // 
+            // tsbQRCodeSwitch
+            // 
+            resources.ApplyResources(this.tsbQRCodeSwitch, "tsbQRCodeSwitch");
+            this.tsbQRCodeSwitch.CheckOnClick = true;
+            this.tsbQRCodeSwitch.ForeColor = System.Drawing.Color.Black;
+            this.tsbQRCodeSwitch.Image = global::v2rayN.Properties.Resources.share;
+            this.tsbQRCodeSwitch.Name = "tsbQRCodeSwitch";
+            this.tsbQRCodeSwitch.CheckedChanged += new System.EventHandler(this.tsbQRCodeSwitch_CheckedChanged);
+            // 
            // 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";
            // 
            // tsbReload
            // 
@@ -649,95 +714,108 @@
            // 
            // 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
            // 
@@ -761,10 +839,10 @@
            this.Shown += new System.EventHandler(this.MainForm_Shown);
            this.VisibleChanged += new System.EventHandler(this.MainForm_VisibleChanged);
            this.Resize += new System.EventHandler(this.MainForm_Resize);
-            this.splitContainer1.Panel1.ResumeLayout(false);
-            this.splitContainer1.Panel2.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit();
-            this.splitContainer1.ResumeLayout(false);
+            this.scMain.Panel1.ResumeLayout(false);
+            this.scMain.Panel2.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.scMain)).EndInit();
+            this.scMain.ResumeLayout(false);
            this.cmsLv.ResumeLayout(false);
            this.cmsMain.ResumeLayout(false);
            this.groupBox1.ResumeLayout(false);
@@ -779,7 +857,7 @@

        }

-        #endregion
+#endregion

        private System.Windows.Forms.GroupBox groupBox1;
        private System.Windows.Forms.GroupBox groupBox2;
@@ -803,7 +881,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,12 +895,11 @@
        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;
        private System.Windows.Forms.ToolStripMenuItem menuAddShadowsocksServer;
-        private System.Windows.Forms.SplitContainer splitContainer1;
+        private System.Windows.Forms.SplitContainer scMain;
        private QRCodeControl qrCodeControl;
        private System.Windows.Forms.ToolStripSeparator toolStripSeparator10;
        private System.Windows.Forms.ToolStripDropDownButton tsbCheckUpdate;
@@ -868,6 +944,17 @@
        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.ToolStripMenuItem tsbTestMe;
+        private System.Windows.Forms.ToolStripButton tsbReload;
+        private System.Windows.Forms.ToolStripButton tsbQRCodeSwitch;
+        private System.Windows.Forms.ToolStripMenuItem menuAddVlessServer;
+        private System.Windows.Forms.ToolStripMenuItem menuAddTrojanServer;
    }
 }

--- 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,175 @@
  </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="menuAddVlessServer.Size" type="System.Drawing.Size, System.Drawing">
+    <value>300, 22</value>
+  </data>
+  <data name="menuAddVlessServer.Text" xml:space="preserve">
+    <value>添加[VLESS]服务器</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="menuAddTrojanServer.Size" type="System.Drawing.Size, System.Drawing">
+    <value>300, 22</value>
+  </data>
+  <data name="menuAddTrojanServer.Text" xml:space="preserve">
+    <value>添加[Trojan]服务器</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="tsbTestMe.Size" type="System.Drawing.Size, System.Drawing">
+    <value>300, 22</value>
+  </data>
+  <data name="tsbTestMe.Text" xml:space="preserve">
+    <value>测试当前服务状态</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="cmsLv.Size" type="System.Drawing.Size, System.Drawing">
-    <value>279, 534</value>
+    <value>301, 600</value>
  </data>
  <data name="lvServers.Items" mimetype="application/x-microsoft.net.object.binary.base64">
    <value>
@@ -297,41 +315,53 @@
  <data name="cmsMain.Size" type="System.Drawing.Size, System.Drawing">
    <value>196, 164</value>
  </data>
-  <data name="menuSysAgentEnabled.Size" type="System.Drawing.Size, System.Drawing">
-    <value>195, 22</value>
-  </data>
-  <data name="menuSysAgentEnabled.Text" xml:space="preserve">
-    <value>启用Http代理</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>
+    <value>Http代理</value>
+  </data>
+  <data name="menuNotEnabledHttp.Size" type="System.Drawing.Size, System.Drawing">
+    <value>316, 22</value>
+  </data>
+  <data name="menuNotEnabledHttp.Text" xml:space="preserve">
+    <value>关闭Http代理</value>
  </data>
  <data name="menuGlobal.Size" type="System.Drawing.Size, System.Drawing">
-    <value>340, 22</value>
+    <value>316, 22</value>
  </data>
  <data name="menuGlobal.Text" xml:space="preserve">
-    <value>开启Http代理,并自动配置代理服务器(全局模式)</value>
+    <value>开启Http代理,并自动配置系统代理(全局模式)</value>
  </data>
  <data name="menuGlobalPAC.Size" type="System.Drawing.Size, System.Drawing">
-    <value>340, 22</value>
+    <value>316, 22</value>
  </data>
  <data name="menuGlobalPAC.Text" xml:space="preserve">
-    <value>开启PAC,并自动配置PAC(PAC模式)</value>
+    <value>开启PAC,并自动配置系统代理(PAC模式)</value>
  </data>
  <data name="menuKeep.Size" type="System.Drawing.Size, System.Drawing">
-    <value>340, 22</value>
+    <value>316, 22</value>
  </data>
  <data name="menuKeep.Text" xml:space="preserve">
-    <value>仅开启Http代理,不自动配置代理服务器(直连模式)</value>
+    <value>仅开启Http代理,并清除系统代理</value>
  </data>
  <data name="menuKeepPAC.Size" type="System.Drawing.Size, System.Drawing">
-    <value>340, 22</value>
+    <value>316, 22</value>
  </data>
  <data name="menuKeepPAC.Text" xml:space="preserve">
-    <value>仅开启PAC,不自动配置PAC</value>
+    <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="menuServers.Size" type="System.Drawing.Size, System.Drawing">
    <value>195, 22</value>
@@ -357,6 +387,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>
@@ -393,6 +429,12 @@
  <data name="tsbSubUpdate.Text" xml:space="preserve">
    <value>更新订阅</value>
  </data>
+  <data name="tsbQRCodeSwitch.Size" type="System.Drawing.Size, System.Drawing">
+    <value>52, 53</value>
+  </data>
+  <data name="tsbQRCodeSwitch.Text" xml:space="preserve">
+    <value>  分享  </value>
+  </data>
  <data name="tsbOptionSetting.Size" type="System.Drawing.Size, System.Drawing">
    <value>76, 53</value>
  </data>
@@ -423,25 +465,28 @@
    <value>  检查更新  </value>
  </data>
  <data name="tsbCheckUpdateN.Size" type="System.Drawing.Size, System.Drawing">
-    <value>232, 22</value>
+    <value>223, 22</value>
  </data>
  <data name="tsbCheckUpdateN.Text" xml:space="preserve">
-    <value>检查更新v2rayN</value>
+    <value>v2rayN</value>
  </data>
  <data name="tsbCheckUpdateCore.Size" type="System.Drawing.Size, System.Drawing">
-    <value>232, 22</value>
+    <value>223, 22</value>
  </data>
  <data name="tsbCheckUpdateCore.Text" xml:space="preserve">
-    <value>检查更新v2rayCore</value>
+    <value>v2rayCore</value>
  </data>
  <data name="tsbCheckUpdatePACList.Size" type="System.Drawing.Size, System.Drawing">
-    <value>232, 22</value>
+    <value>223, 22</value>
  </data>
  <data name="tsbCheckUpdatePACList.Text" xml:space="preserve">
-    <value>检查更新PAC (需要Http代理)</value>
+    <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>232, 22</value>
+    <value>223, 22</value>
  </data>
  <data name="tsbCheckClearPACList.Text" xml:space="preserve">
    <value>简化PAC (请设置Core路由)</value>
@@ -453,7 +498,10 @@
    <value>   帮助   </value>
  </data>
  <data name="tsbAbout.Text" xml:space="preserve">
-    <value>关于</value>
+    <value>v2rayN 项目</value>
+  </data>
+  <data name="tsbV2rayWebsite.Text" xml:space="preserve">
+    <value>V2Ray 官网</value>
  </data>
  <data name="tsbPromotion.Size" type="System.Drawing.Size, System.Drawing">
    <value>68, 53</value>
@@ -468,7 +516,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,14 @@
        /// </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.chkdefAllowInsecure = new System.Windows.Forms.CheckBox();
+            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 +63,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 +85,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,40 +109,47 @@
            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
            // 
-            this.btnClose.DialogResult = System.Windows.Forms.DialogResult.Cancel;
            resources.ApplyResources(this.btnClose, "btnClose");
+            this.btnClose.DialogResult = System.Windows.Forms.DialogResult.Cancel;
            this.btnClose.Name = "btnClose";
            this.btnClose.UseVisualStyleBackColor = true;
            this.btnClose.Click += new System.EventHandler(this.btnClose_Click);
            // 
            // tabControl1
            // 
+            resources.ApplyResources(this.tabControl1, "tabControl1");
            this.tabControl1.Controls.Add(this.tabPage1);
            this.tabControl1.Controls.Add(this.tabPage2);
            this.tabControl1.Controls.Add(this.tabPage6);
            this.tabControl1.Controls.Add(this.tabPage7);
-            resources.ApplyResources(this.tabControl1, "tabControl1");
+            this.tabControl1.Controls.Add(this.tabPage9);
            this.tabControl1.Name = "tabControl1";
            this.tabControl1.SelectedIndex = 0;
            // 
            // tabPage1
            // 
-            this.tabPage1.Controls.Add(this.groupBox1);
            resources.ApplyResources(this.tabPage1, "tabPage1");
+            this.tabPage1.Controls.Add(this.groupBox1);
            this.tabPage1.Name = "tabPage1";
            this.tabPage1.UseVisualStyleBackColor = true;
            // 
            // groupBox1
            // 
+            resources.ApplyResources(this.groupBox1, "groupBox1");
+            this.groupBox1.Controls.Add(this.chkdefAllowInsecure);
+            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);
@@ -157,10 +168,35 @@
            this.groupBox1.Controls.Add(this.label5);
            this.groupBox1.Controls.Add(this.txtlocalPort);
            this.groupBox1.Controls.Add(this.label2);
-            resources.ApplyResources(this.groupBox1, "groupBox1");
            this.groupBox1.Name = "groupBox1";
            this.groupBox1.TabStop = false;
            // 
+            // chkdefAllowInsecure
+            // 
+            resources.ApplyResources(this.chkdefAllowInsecure, "chkdefAllowInsecure");
+            this.chkdefAllowInsecure.Name = "chkdefAllowInsecure";
+            this.chkdefAllowInsecure.UseVisualStyleBackColor = true;
+            // 
+            // label16
+            // 
+            resources.ApplyResources(this.label16, "label16");
+            this.label16.Name = "label16";
+            // 
+            // cmblistenerType
+            // 
+            resources.ApplyResources(this.cmblistenerType, "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")});
+            this.cmblistenerType.Name = "cmblistenerType";
+            // 
            // chksniffingEnabled2
            // 
            resources.ApplyResources(this.chksniffingEnabled2, "chksniffingEnabled2");
@@ -204,12 +240,12 @@
            // 
            // cmbprotocol2
            // 
+            resources.ApplyResources(this.cmbprotocol2, "cmbprotocol2");
            this.cmbprotocol2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
            this.cmbprotocol2.FormattingEnabled = true;
            this.cmbprotocol2.Items.AddRange(new object[] {
            resources.GetString("cmbprotocol2.Items"),
            resources.GetString("cmbprotocol2.Items1")});
-            resources.ApplyResources(this.cmbprotocol2, "cmbprotocol2");
            this.cmbprotocol2.Name = "cmbprotocol2";
            // 
            // label3
@@ -224,8 +260,8 @@
            // 
            // cmbprotocol
            // 
-            this.cmbprotocol.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
            resources.ApplyResources(this.cmbprotocol, "cmbprotocol");
+            this.cmbprotocol.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
            this.cmbprotocol.FormattingEnabled = true;
            this.cmbprotocol.Items.AddRange(new object[] {
            resources.GetString("cmbprotocol.Items"),
@@ -251,6 +287,7 @@
            // 
            // cmbloglevel
            // 
+            resources.ApplyResources(this.cmbloglevel, "cmbloglevel");
            this.cmbloglevel.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
            this.cmbloglevel.FormattingEnabled = true;
            this.cmbloglevel.Items.AddRange(new object[] {
@@ -259,7 +296,6 @@
            resources.GetString("cmbloglevel.Items2"),
            resources.GetString("cmbloglevel.Items3"),
            resources.GetString("cmbloglevel.Items4")});
-            resources.ApplyResources(this.cmbloglevel, "cmbloglevel");
            this.cmbloglevel.Name = "cmbloglevel";
            // 
            // label5
@@ -279,32 +315,33 @@
            // 
            // tabPage2
            // 
-            this.tabPage2.Controls.Add(this.groupBox2);
            resources.ApplyResources(this.tabPage2, "tabPage2");
+            this.tabPage2.Controls.Add(this.groupBox2);
            this.tabPage2.Name = "tabPage2";
            this.tabPage2.UseVisualStyleBackColor = true;
            // 
            // groupBox2
            // 
+            resources.ApplyResources(this.groupBox2, "groupBox2");
            this.groupBox2.Controls.Add(this.tabControl2);
            this.groupBox2.Controls.Add(this.panel3);
-            resources.ApplyResources(this.groupBox2, "groupBox2");
            this.groupBox2.Name = "groupBox2";
            this.groupBox2.TabStop = false;
            // 
            // tabControl2
            // 
+            resources.ApplyResources(this.tabControl2, "tabControl2");
            this.tabControl2.Controls.Add(this.tabPage3);
            this.tabControl2.Controls.Add(this.tabPage4);
            this.tabControl2.Controls.Add(this.tabPage5);
-            resources.ApplyResources(this.tabControl2, "tabControl2");
+            this.tabControl2.Controls.Add(this.tabPage8);
            this.tabControl2.Name = "tabControl2";
            this.tabControl2.SelectedIndex = 0;
            // 
            // tabPage3
            // 
-            this.tabPage3.Controls.Add(this.txtUseragent);
            resources.ApplyResources(this.tabPage3, "tabPage3");
+            this.tabPage3.Controls.Add(this.txtUseragent);
            this.tabPage3.Name = "tabPage3";
            this.tabPage3.UseVisualStyleBackColor = true;
            // 
@@ -315,8 +352,8 @@
            // 
            // tabPage4
            // 
-            this.tabPage4.Controls.Add(this.txtUserdirect);
            resources.ApplyResources(this.tabPage4, "tabPage4");
+            this.tabPage4.Controls.Add(this.txtUserdirect);
            this.tabPage4.Name = "tabPage4";
            this.tabPage4.UseVisualStyleBackColor = true;
            // 
@@ -327,8 +364,8 @@
            // 
            // tabPage5
            // 
-            this.tabPage5.Controls.Add(this.txtUserblock);
            resources.ApplyResources(this.tabPage5, "tabPage5");
+            this.tabPage5.Controls.Add(this.txtUserblock);
            this.tabPage5.Name = "tabPage5";
            this.tabPage5.UseVisualStyleBackColor = true;
            // 
@@ -337,17 +374,41 @@
            resources.ApplyResources(this.txtUserblock, "txtUserblock");
            this.txtUserblock.Name = "txtUserblock";
            // 
+            // tabPage8
+            // 
+            resources.ApplyResources(this.tabPage8, "tabPage8");
+            this.tabPage8.Controls.Add(this.cmbroutingMode);
+            this.tabPage8.Name = "tabPage8";
+            this.tabPage8.UseVisualStyleBackColor = true;
+            // 
+            // cmbroutingMode
+            // 
+            resources.ApplyResources(this.cmbroutingMode, "cmbroutingMode");
+            this.cmbroutingMode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.cmbroutingMode.FormattingEnabled = true;
+            this.cmbroutingMode.Items.AddRange(new object[] {
+            resources.GetString("cmbroutingMode.Items"),
+            resources.GetString("cmbroutingMode.Items1"),
+            resources.GetString("cmbroutingMode.Items2"),
+            resources.GetString("cmbroutingMode.Items3")});
+            this.cmbroutingMode.Name = "cmbroutingMode";
+            // 
            // panel3
            // 
-            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.Controls.Add(this.linkLabelRoutingDoc);
+            this.panel3.Controls.Add(this.btnSetDefRountingRule);
+            this.panel3.Controls.Add(this.labRoutingTips);
+            this.panel3.Controls.Add(this.cmbdomainStrategy);
            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");
@@ -355,47 +416,26 @@
            this.btnSetDefRountingRule.UseVisualStyleBackColor = true;
            this.btnSetDefRountingRule.Click += new System.EventHandler(this.btnSetDefRountingRule_Click);
            // 
+            // labRoutingTips
+            // 
+            resources.ApplyResources(this.labRoutingTips, "labRoutingTips");
+            this.labRoutingTips.ForeColor = System.Drawing.Color.Brown;
+            this.labRoutingTips.Name = "labRoutingTips";
+            // 
            // cmbdomainStrategy
            // 
+            resources.ApplyResources(this.cmbdomainStrategy, "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";
-            // 
-            // cmbroutingMode
-            // 
-            this.cmbroutingMode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.cmbroutingMode.FormattingEnabled = true;
-            this.cmbroutingMode.Items.AddRange(new object[] {
-            resources.GetString("cmbroutingMode.Items"),
-            resources.GetString("cmbroutingMode.Items1"),
-            resources.GetString("cmbroutingMode.Items2"),
-            resources.GetString("cmbroutingMode.Items3")});
-            resources.ApplyResources(this.cmbroutingMode, "cmbroutingMode");
-            this.cmbroutingMode.Name = "cmbroutingMode";
-            // 
            // tabPage6
            // 
+            resources.ApplyResources(this.tabPage6, "tabPage6");
            this.tabPage6.Controls.Add(this.chkKcpcongestion);
            this.tabPage6.Controls.Add(this.txtKcpwriteBufferSize);
            this.tabPage6.Controls.Add(this.label10);
@@ -409,7 +449,6 @@
            this.tabPage6.Controls.Add(this.label7);
            this.tabPage6.Controls.Add(this.txtKcpmtu);
            this.tabPage6.Controls.Add(this.label6);
-            resources.ApplyResources(this.tabPage6, "tabPage6");
            this.tabPage6.Name = "tabPage6";
            this.tabPage6.UseVisualStyleBackColor = true;
            // 
@@ -481,41 +520,36 @@
            // 
            // tabPage7
            // 
+            resources.ApplyResources(this.tabPage7, "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);
            this.tabPage7.Controls.Add(this.label13);
            this.tabPage7.Controls.Add(this.chkAutoRun);
-            resources.ApplyResources(this.tabPage7, "tabPage7");
            this.tabPage7.Name = "tabPage7";
            this.tabPage7.UseVisualStyleBackColor = true;
            // 
+            // chkKeepOlderDedupl
+            // 
+            resources.ApplyResources(this.chkKeepOlderDedupl, "chkKeepOlderDedupl");
+            this.chkKeepOlderDedupl.Name = "chkKeepOlderDedupl";
+            this.chkKeepOlderDedupl.UseVisualStyleBackColor = true;
+            // 
            // cbFreshrate
            // 
+            resources.ApplyResources(this.cbFreshrate, "cbFreshrate");
            this.cbFreshrate.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
            this.cbFreshrate.FormattingEnabled = true;
-            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,11 +578,36 @@
            this.chkAutoRun.Name = "chkAutoRun";
            this.chkAutoRun.UseVisualStyleBackColor = true;
            // 
+            // tabPage9
+            // 
+            resources.ApplyResources(this.tabPage9, "tabPage9");
+            this.tabPage9.Controls.Add(this.txtuserPacRule);
+            this.tabPage9.Controls.Add(this.panel4);
+            this.tabPage9.Name = "tabPage9";
+            this.tabPage9.UseVisualStyleBackColor = true;
+            // 
+            // txtuserPacRule
+            // 
+            resources.ApplyResources(this.txtuserPacRule, "txtuserPacRule");
+            this.txtuserPacRule.Name = "txtuserPacRule";
+            // 
+            // panel4
+            // 
+            resources.ApplyResources(this.panel4, "panel4");
+            this.panel4.Controls.Add(this.label4);
+            this.panel4.Name = "panel4";
+            // 
+            // label4
+            // 
+            resources.ApplyResources(this.label4, "label4");
+            this.label4.ForeColor = System.Drawing.Color.Brown;
+            this.label4.Name = "label4";
+            // 
            // panel2
            // 
+            resources.ApplyResources(this.panel2, "panel2");
            this.panel2.Controls.Add(this.btnClose);
            this.panel2.Controls.Add(this.btnOK);
-            resources.ApplyResources(this.panel2, "panel2");
            this.panel2.Name = "panel2";
            // 
            // btnOK
@@ -563,10 +622,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 +646,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 +717,22 @@
        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;
+        private System.Windows.Forms.CheckBox chkdefAllowInsecure;
    }
 }
--- a/v2rayN/v2rayN/Forms/OptionSettingForm.cs
+++ b/v2rayN/v2rayN/Forms/OptionSettingForm.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Windows.Forms;
 using v2rayN.Handler;
 using v2rayN.Base;
+using v2rayN.HttpProxyHandler;

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

            InitGUI();
+
+            InitUserPAC();
        }

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

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

                if (config.inbound.Count > 1)
@@ -64,6 +67,10 @@ namespace v2rayN.Forms

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

        /// <summary>
@@ -73,8 +80,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);
@@ -108,15 +114,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")},
@@ -127,7 +131,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];
@@ -142,6 +146,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)
@@ -164,13 +173,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"));
            }
        }

@@ -251,6 +265,10 @@ namespace v2rayN.Forms
            //remoteDNS
            config.remoteDNS = txtremoteDNS.Text.TrimEx();

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

@@ -327,16 +345,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)
            //{
@@ -350,6 +362,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;
@@ -369,25 +390,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];
+                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;
@@ -411,11 +441,22 @@ namespace v2rayN.Forms
        {
            labRoutingTips.Text = text;
        }
+
+        private void linkLabelRoutingDoc_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
+        {
+            System.Diagnostics.Process.Start("https://www.v2fly.org/config/routing.html");
+        }
    }

    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
@@ -120,7 +120,43 @@
  <data name="btnClose.Text" xml:space="preserve">
    <value>取消(&amp;C)</value>
  </data>
+  <data name="tabPage1.Text" xml:space="preserve">
+    <value>  Core:基础设置  </value>
+  </data>
  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="chkdefAllowInsecure.Size" type="System.Drawing.Size, System.Drawing">
+    <value>222, 16</value>
+  </data>
+  <data name="chkdefAllowInsecure.Text" xml:space="preserve">
+    <value>底层传输安全选tls时，默认跳过证书验证(allowInsecure)</value>
+  </data>
+  <data name="label16.Size" type="System.Drawing.Size, System.Drawing">
+    <value>53, 12</value>
+  </data>
+  <data name="label16.Text" xml:space="preserve">
+    <value>Http代理</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="chksniffingEnabled2.Size" type="System.Drawing.Size, System.Drawing">
    <value>96, 16</value>
  </data>
@@ -190,55 +226,47 @@
  <data name="label2.Text" xml:space="preserve">
    <value>本地监听端口</value>
  </data>
-  <data name="tabPage1.Text" xml:space="preserve">
-    <value>  Core:基础设置  </value>
+  <data name="tabPage2.Text" xml:space="preserve">
+    <value>  Core:路由设置  </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="tabPage3.Size" type="System.Drawing.Size, System.Drawing">
+    <value>634, 455</value>
  </data>
  <data name="tabPage3.Text" xml:space="preserve">
-    <value>  代理的Domain或IP  </value>
+    <value>  1.代理的Domain或IP  </value>
+  </data>
+  <data name="txtUseragent.Size" type="System.Drawing.Size, System.Drawing">
+    <value>628, 449</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>  直连的Domain或IP  </value>
+    <value>  2.直连的Domain或IP  </value>
+  </data>
+  <data name="txtUserdirect.Size" type="System.Drawing.Size, System.Drawing">
+    <value>628, 449</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>  阻止的Domain或IP  </value>
+    <value>  3.阻止的Domain或IP  </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 name="txtUserblock.Size" type="System.Drawing.Size, System.Drawing">
+    <value>628, 449</value>
  </data>
-  <data name="btnSetDefRountingRule.Location" type="System.Drawing.Point, System.Drawing">
-    <value>381, 43</value>
+  <data name="tabPage8.Size" type="System.Drawing.Size, System.Drawing">
+    <value>634, 455</value>
  </data>
-  <data name="btnSetDefRountingRule.Size" type="System.Drawing.Size, System.Drawing">
-    <value>201, 23</value>
-  </data>
-  <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>
-  <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.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="label15.Size" type="System.Drawing.Size, System.Drawing">
-    <value>53, 12</value>
-  </data>
-  <data name="label15.Text" xml:space="preserve">
-    <value>域名策略</value>
-  </data>
-  <data name="label12.Size" type="System.Drawing.Size, System.Drawing">
-    <value>53, 12</value>
-  </data>
-  <data name="label12.Text" xml:space="preserve">
-    <value>路由模式</value>
+  <data name="tabPage8.Text" xml:space="preserve">
+    <value>  4.预定义规则  </value>
  </data>
  <data name="cmbroutingMode.Items" xml:space="preserve">
    <value>全局</value>
@@ -252,15 +280,71 @@
  <data name="cmbroutingMode.Items3" xml:space="preserve">
    <value>绕过局域网及大陆地址</value>
  </data>
-  <data name="cmbroutingMode.Size" type="System.Drawing.Size, System.Drawing">
-    <value>232, 20</value>
+  <data name="cmbroutingMode.Location" type="System.Drawing.Point, System.Drawing">
+    <value>19, 26</value>
  </data>
-  <data name="tabPage2.Text" xml:space="preserve">
-    <value>  Core:路由设置  </value>
+  <data name="cmbroutingMode.Size" type="System.Drawing.Size, System.Drawing">
+    <value>244, 20</value>
+  </data>
+  <data name="panel3.Size" type="System.Drawing.Size, System.Drawing">
+    <value>642, 72</value>
+  </data>
+  <data name="linkLabelRoutingDoc.Size" type="System.Drawing.Size, System.Drawing">
+    <value>77, 12</value>
+  </data>
+  <data name="linkLabelRoutingDoc.Text" xml:space="preserve">
+    <value>域名解析策略</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>
+  <data name="btnSetDefRountingRule.Location" type="System.Drawing.Point, System.Drawing">
+    <value>351, 14</value>
+  </data>
+  <data name="btnSetDefRountingRule.Size" type="System.Drawing.Size, System.Drawing">
+    <value>201, 23</value>
+  </data>
+  <data name="btnSetDefRountingRule.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="tabPage6.Text" xml:space="preserve">
    <value>  Core:KCP设置  </value>
  </data>
+  <data name="tabPage7.Text" xml:space="preserve">
+    <value>  v2rayN设置  </value>
+  </data>
+  <data name="chkKeepOlderDedupl.Size" type="System.Drawing.Size, System.Drawing">
+    <value>156, 16</value>
+  </data>
+  <data name="chkKeepOlderDedupl.Text" xml:space="preserve">
+    <value>去重时保留序号较小的项</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="chkEnableStatistics.Size" type="System.Drawing.Size, System.Drawing">
+    <value>372, 16</value>
+  </data>
+  <data name="chkEnableStatistics.Text" xml:space="preserve">
+    <value>启用统计(实时网速显示和使用流量显示，需要重启v2rayN客户端)</value>
+  </data>
  <data name="chkAllowLANConn.Size" type="System.Drawing.Size, System.Drawing">
    <value>144, 16</value>
  </data>
@@ -279,8 +363,11 @@
  <data name="chkAutoRun.Text" xml:space="preserve">
    <value>开机自动启动(可能会不成功)</value>
  </data>
-  <data name="tabPage7.Text" xml:space="preserve">
-    <value>  v2rayN设置  </value>
+  <data name="tabPage9.Text" xml:space="preserve">
+    <value>  用户PAC设置  </value>
+  </data>
+  <data name="label4.Text" xml:space="preserve">
+    <value>*设置用户PAC规则，用逗号(,)隔开</value>
  </data>
  <data name="btnOK.Text" xml:space="preserve">
    <value>确定(&amp;O)</value>
@@ -288,13 +375,4 @@
  <data name="$this.Text" xml:space="preserve">
    <value>参数设置</value>
  </data>
-  <data name="chkEnableStatistics.Text" xml:space="preserve">
-    <value>启用统计（实时网速显示和使用流量显示，需要重启v2rayN客户端）</value>
-  </data>
-  <data name="lbCacheDays.Text" xml:space="preserve">
-    <value>缓存天数（0-30， 0关闭缓存单独每天的数据使用情况）</value>
-  </data>
-  <data name="lbFreshrate.Text" xml:space="preserve">
-    <value>统计刷新频率</value>
-  </data>
 </root>
--- a/v2rayN/v2rayN/Forms/QRCodeControl.Designer.cs
+++ b/v2rayN/v2rayN/Forms/QRCodeControl.Designer.cs
@@ -31,7 +31,6 @@
            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(QRCodeControl));
            this.txtUrl = new System.Windows.Forms.TextBox();
            this.picQRCode = new System.Windows.Forms.PictureBox();
-            this.chkShow = new System.Windows.Forms.CheckBox();
            ((System.ComponentModel.ISupportInitialize)(this.picQRCode)).BeginInit();
            this.SuspendLayout();
            // 
@@ -47,20 +46,12 @@
            this.picQRCode.Name = "picQRCode";
            this.picQRCode.TabStop = false;
            // 
-            // chkShow
-            // 
-            resources.ApplyResources(this.chkShow, "chkShow");
-            this.chkShow.Name = "chkShow";
-            this.chkShow.UseVisualStyleBackColor = true;
-            this.chkShow.CheckedChanged += new System.EventHandler(this.chkShow_CheckedChanged);
-            // 
            // QRCodeControl
            // 
            resources.ApplyResources(this, "$this");
            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
            this.Controls.Add(this.picQRCode);
            this.Controls.Add(this.txtUrl);
-            this.Controls.Add(this.chkShow);
            this.Name = "QRCodeControl";
            this.Load += new System.EventHandler(this.QRCodeControl_Load);
            ((System.ComponentModel.ISupportInitialize)(this.picQRCode)).EndInit();
@@ -73,6 +64,5 @@

        private System.Windows.Forms.TextBox txtUrl;
        private System.Windows.Forms.PictureBox picQRCode;
-        private System.Windows.Forms.CheckBox chkShow;
    }
 }
--- a/v2rayN/v2rayN/Forms/QRCodeControl.cs
+++ b/v2rayN/v2rayN/Forms/QRCodeControl.cs
@@ -12,7 +12,6 @@ namespace v2rayN.Forms
        }
        private void QRCodeControl_Load(object sender, System.EventArgs e)
        {
-            chkShow_CheckedChanged(null, null);
            txtUrl.MouseUp += txtUrl_MouseUp;      
        }

@@ -32,16 +31,9 @@ namespace v2rayN.Forms
                    txtUrl.Text = string.Empty;
                    return;
                }
-                picQRCode.Image = QRCodeHelper.GetQRCode(url);
                txtUrl.Text = url;
+                picQRCode.Image = QRCodeHelper.GetQRCode(url);                
            }
        }
-
-        private void chkShow_CheckedChanged(object sender, System.EventArgs e)
-        {
-            picQRCode.Visible =
-            txtUrl.Visible = chkShow.Checked;
-        }
-
    }
 }
--- a/v2rayN/v2rayN/Forms/QRCodeControl.resx
+++ b/v2rayN/v2rayN/Forms/QRCodeControl.resx
@@ -117,106 +117,76 @@
  <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>
-  </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>
-  <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>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="txtUrl.Location" type="System.Drawing.Point, System.Drawing">
+    <value>0, 371</value>
  </data>
+  <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
  <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 name="txtUrl.TabIndex" type="System.Int32, mscorlib">
+    <value>0</value>
  </data>
-  <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
-    <value>6, 12</value>
+  <data name="&gt;&gt;txtUrl.Name" xml:space="preserve">
+    <value>txtUrl</value>
  </data>
-  <data name="chkShow.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
+  <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.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;txtUrl.ZOrder" xml:space="preserve">
+    <value>1</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, 0</value>
+  </data>
+  <data name="picQRCode.Size" type="System.Drawing.Size, System.Drawing">
+    <value>356, 371</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="&gt;&gt;picQRCode.Name" xml:space="preserve">
+    <value>picQRCode</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>
+  <data name="&gt;&gt;picQRCode.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;picQRCode.ZOrder" xml:space="preserve">
+    <value>0</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.Size" type="System.Drawing.Size, System.Drawing">
+    <value>356, 441</value>
+  </data>
+  <data name="&gt;&gt;$this.Name" xml:space="preserve">
+    <value>QRCodeControl</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>
 </root>
--- a/v2rayN/v2rayN/Forms/QRCodeControl.zh-Hans.resx
+++ b/v2rayN/v2rayN/Forms/QRCodeControl.zh-Hans.resx
@@ -117,7 +117,4 @@
  <resheader name="writer">
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
-  <data name="chkShow.Text" xml:space="preserve">
-    <value>显示分享内容</value>
-  </data>
 </root>
--- a/v2rayN/v2rayN/Forms/SubSettingControl.cs
+++ b/v2rayN/v2rayN/Forms/SubSettingControl.cs
@@ -54,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.v2fly.org/";
        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://cachefly.cachefly.net/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,11 +98,12 @@ namespace v2rayN
        /// 阻止 tag值
        /// </summary>
        public const string blockTag = "block";
-        
+
        /// <summary>
        /// 
        /// </summary>
        public const string StreamSecurity = "tls";
+        public const string StreamSecurityX = "xtls";

        public const string InboundSocks = "socks";
        public const string InboundHttp = "http";
@@ -114,14 +117,26 @@ namespace v2rayN
        /// </summary>
        public const string vmessProtocol = "vmess://";
        /// <summary>
+        /// vmess
+        /// </summary>
+        public const string vmessProtocolLite = "vmess";
+        /// <summary>
        /// shadowsocks
        /// </summary>
        public const string ssProtocol = "ss://";
        /// <summary>
+        /// shadowsocks
+        /// </summary>
+        public const string ssProtocolLite = "shadowsocks";
+        /// <summary>
        /// socks
        /// </summary>
        public const string socksProtocol = "socks://";
        /// <summary>
+        /// socks
+        /// </summary>
+        public const string socksProtocolLite = "socks";
+        /// <summary>
        /// http
        /// </summary>
        public const string httpProtocol = "http://";
@@ -129,6 +144,22 @@ namespace v2rayN
        /// https
        /// </summary>
        public const string httpsProtocol = "https://";
+        /// <summary>
+        /// vless
+        /// </summary>
+        public const string vlessProtocol = "vless://";
+        /// <summary>
+        /// vless
+        /// </summary>
+        public const string vlessProtocolLite = "vless";
+        /// <summary>
+        /// trojan
+        /// </summary>
+        public const string trojanProtocol = "trojan://";
+        /// <summary>
+        /// trojan
+        /// </summary>
+        public const string trojanProtocolLite = "trojan";

        /// <summary>
        /// pac
@@ -160,8 +191,9 @@ namespace v2rayN
            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

@@ -170,32 +202,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端口
        /// </summary>
-        public static int socksPort { get; set; }
+        public static int socksPort
+        {
+            get; set;
+        }

        /// <summary>
        /// http端口
        /// </summary>
-        public static int httpPort { get; set; }
+        public static int httpPort
+        {
+            get; set;
+        }

        /// <summary>
        /// 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
@@ -4,6 +4,8 @@ using System.IO;
 using System.Net;
 using v2rayN.Mode;
 using v2rayN.Base;
+using System.Linq;
+using v2rayN.Tool;

 namespace v2rayN.Handler
 {
@@ -30,37 +32,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 = false,

-                ////默认监听端口
-                //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 = Global.InboundSocks;
-                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);

@@ -103,29 +106,56 @@ 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)
            {
                config.uiItem = new UIItem();
            }
+            if (config.uiItem.mainLvColWidth == null)
+            {
+                config.uiItem.mainLvColWidth = new Dictionary<string, int>();
+            }
+
            //// 如果是用户升级，首次会有端口号为0的情况，不可用，这里处理
            //if (config.pacPort == 0)
            //{
            //    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
@@ -183,6 +213,10 @@ namespace v2rayN.Handler
            else
            {
                //添加
+                if (Utils.IsNullOrEmpty(vmessItem.allowInsecure))
+                {
+                    vmessItem.allowInsecure = config.defAllowInsecure.ToString();
+                }
                config.vmess.Add(vmessItem);
                if (config.vmess.Count == 1)
                {
@@ -238,7 +272,7 @@ namespace v2rayN.Handler
        }

        /// <summary>
-        /// 复制服务器
+        /// 克隆服务器
        /// </summary>
        /// <param name="config"></param>
        /// <param name="index"></param>
@@ -250,22 +284,25 @@ 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,
+                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,
+                remarks = string.Format("{0}-clone", config.vmess[index].remarks),
+                headerType = config.vmess[index].headerType,
+                requestHost = config.vmess[index].requestHost,
+                path = config.vmess[index].path,
+                streamSecurity = config.vmess[index].streamSecurity,
+                allowInsecure = config.vmess[index].allowInsecure,
+                configType = config.vmess[index].configType
+            };

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

            ToJsonFile(config);

@@ -303,9 +340,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);

@@ -316,7 +353,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));
        }
@@ -336,18 +373,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);
@@ -356,7 +395,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);
@@ -371,7 +410,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);
@@ -384,6 +423,24 @@ namespace v2rayN.Handler
                    url = Utils.Base64Encode(url);
                    url = string.Format("{0}{1}{2}", Global.socksProtocol, url, remark);
                }
+                else if (vmessItem.configType == (int)EConfigType.Trojan)
+                {
+                    string remark = string.Empty;
+                    if (!Utils.IsNullOrEmpty(vmessItem.remarks))
+                    {
+                        remark = "#" + WebUtility.UrlEncode(vmessItem.remarks);
+                    }
+                    string query = string.Empty;
+                    if (!Utils.IsNullOrEmpty(vmessItem.requestHost))
+                    {
+                        query = string.Format("?sni={0}", vmessItem.requestHost);
+                    }
+                    url = string.Format("{0}@{1}:{2}",
+                        vmessItem.id,
+                        vmessItem.address,
+                        vmessItem.port);
+                    url = string.Format("{0}{1}{2}{3}", Global.trojanProtocol, url, query, remark);
+                }
                else
                {
                }
@@ -417,7 +474,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)
@@ -440,7 +497,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)
@@ -460,7 +517,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)
@@ -479,7 +536,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)
@@ -513,23 +570,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)
@@ -579,7 +637,7 @@ namespace v2rayN.Handler
            vmessItem.address = vmessItem.address.TrimEx();
            vmessItem.id = vmessItem.id.TrimEx();
            vmessItem.security = vmessItem.security.TrimEx();
-           
+
            if (index >= 0)
            {
                //修改
@@ -644,6 +702,50 @@ namespace v2rayN.Handler
            return 0;
        }

+
+        /// <summary>
+        /// 添加服务器或编辑
+        /// </summary>
+        /// <param name="config"></param>
+        /// <param name="vmessItem"></param>
+        /// <param name="index"></param>
+        /// <returns></returns>
+        public static int AddTrojanServer(ref Config config, VmessItem vmessItem, int index)
+        {
+            vmessItem.configVersion = 2;
+            vmessItem.configType = (int)EConfigType.Trojan;
+
+            vmessItem.address = vmessItem.address.TrimEx();
+            vmessItem.id = vmessItem.id.TrimEx();
+
+            vmessItem.streamSecurity = Global.StreamSecurity;
+            vmessItem.allowInsecure = "false";
+
+            if (index >= 0)
+            {
+                //修改
+                config.vmess[index] = vmessItem;
+                if (config.index.Equals(index))
+                {
+                    Global.reloadV2ray = true;
+                }
+            }
+            else
+            {
+                //添加
+                config.vmess.Add(vmessItem);
+                if (config.vmess.Count == 1)
+                {
+                    config.index = 0;
+                    Global.reloadV2ray = true;
+                }
+            }
+
+            ToJsonFile(config);
+
+            return 0;
+        }
+
        /// <summary>
        /// 配置文件版本升级
        /// </summary>
@@ -715,7 +817,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))
@@ -732,7 +834,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))
                {
@@ -742,7 +843,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,12 +870,15 @@ namespace v2rayN.Handler
                        countServers++;
                    }
                }
+                else if (vmessItem.configType == (int)EConfigType.Trojan)
+                {
+                    if (AddTrojanServer(ref config, vmessItem, -1) == 0)
+                    {
+                        countServers++;
+                    }
+                }
            }
-            if (countServers > 0)
-            {
-                return 0;
-            }
-            return -1;
+            return countServers;
        }

        /// <summary>
@@ -786,7 +890,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)
                {
@@ -794,10 +898,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);
@@ -850,5 +956,129 @@ namespace v2rayN.Handler
            ToJsonFile(config);
            return 0;
        }
+
+        public static int AddformMainLvColWidth(ref Config config, string name, int width)
+        {
+            if (config.uiItem.mainLvColWidth == null)
+            {
+                config.uiItem.mainLvColWidth = new Dictionary<string, int>();
+            }
+            if (config.uiItem.mainLvColWidth.ContainsKey(name))
+            {
+                config.uiItem.mainLvColWidth[name] = width;
+            }
+            else
+            {
+                config.uiItem.mainLvColWidth.Add(name, width);
+            }
+            return 0;
+        }
+        public static int GetformMainLvColWidth(ref Config config, string name, int width)
+        {
+            if (config.uiItem.mainLvColWidth == null)
+            {
+                config.uiItem.mainLvColWidth = new Dictionary<string, int>();
+            }
+            if (config.uiItem.mainLvColWidth.ContainsKey(name))
+            {
+                return config.uiItem.mainLvColWidth[name];
+            }
+            else
+            {
+                return width;
+            }
+        }
+
+        public static int SortServers(ref Config config, EServerColName name, bool asc)
+        {
+            if (config.vmess.Count <= 0)
+            {
+                return -1;
+            }
+            switch (name)
+            {
+                case EServerColName.configType:
+                case EServerColName.remarks:
+                case EServerColName.address:
+                case EServerColName.port:
+                case EServerColName.security:
+                case EServerColName.network:
+                case EServerColName.testResult:
+                    break;
+                default:
+                    return -1;
+            }
+            string itemId = config.getItemId();
+            var items = config.vmess.AsQueryable();
+
+            if (asc)
+            {
+                config.vmess = items.OrderBy(name.ToString()).ToList();
+            }
+            else
+            {
+                config.vmess = items.OrderByDescending(name.ToString()).ToList();
+            }
+
+            var index_ = config.vmess.FindIndex(it => it.getItemId() == itemId);
+            if (index_ >= 0)
+            {
+                config.index = index_;
+            }
+
+            ToJsonFile(config);
+            return 0;
+        }
+
+        /// <summary>
+        /// 添加服务器或编辑
+        /// </summary>
+        /// <param name="config"></param>
+        /// <param name="vmessItem"></param>
+        /// <param name="index"></param>
+        /// <returns></returns>
+        public static int AddVlessServer(ref Config config, VmessItem vmessItem, int index)
+        {
+            vmessItem.configVersion = 2;
+            vmessItem.configType = (int)EConfigType.VLESS;
+
+            vmessItem.address = vmessItem.address.TrimEx();
+            vmessItem.id = vmessItem.id.TrimEx();
+            vmessItem.security = vmessItem.security.TrimEx();
+            vmessItem.network = vmessItem.network.TrimEx();
+            vmessItem.headerType = vmessItem.headerType.TrimEx();
+            vmessItem.requestHost = vmessItem.requestHost.TrimEx();
+            vmessItem.path = vmessItem.path.TrimEx();
+            vmessItem.streamSecurity = vmessItem.streamSecurity.TrimEx();
+
+            if (index >= 0)
+            {
+                //修改
+                config.vmess[index] = vmessItem;
+                if (config.index.Equals(index))
+                {
+                    Global.reloadV2ray = true;
+                }
+            }
+            else
+            {
+                //添加
+                if (Utils.IsNullOrEmpty(vmessItem.allowInsecure))
+                {
+                    vmessItem.allowInsecure = config.defAllowInsecure.ToString();
+                }
+                config.vmess.Add(vmessItem);
+                if (config.vmess.Count == 1)
+                {
+                    config.index = 0;
+                    Global.reloadV2ray = true;
+                }
+            }
+
+            ToJsonFile(config);
+
+            return 0;
+        }
+
    }
 }
--- a/v2rayN/v2rayN/Handler/DownloadHandle.cs
+++ b/v2rayN/v2rayN/Handler/DownloadHandle.cs
@@ -1,8 +1,16 @@
-using System;
+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
 {
@@ -37,70 +45,148 @@ namespace v2rayN.Handler
            }
        }

-        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();
+        private int DownloadTimeout = -1;

+        #region Check for updates

-        public void AbsoluteV2rayCore(Config config)
+        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/v2fly/v2ray-core/releases/latest";
+        private const string coreUrl = "https://github.com/v2fly/v2ray-core/releases/download/{0}/v2ray-windows-{1}.zip";
+
+        public async void CheckUpdateAsync(string type)
        {
-            ServicePointManager.SecurityProtocol = (SecurityProtocolType)3072; //TLS 1.2
-            ServicePointManager.DefaultConnectionLimit = 256;
-            WebRequest request = WebRequest.Create(latestUrl);
-            request.BeginGetResponse(new AsyncCallback(OnResponseV2rayCore), request);
+            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;
+            }
        }

-        private void OnResponseV2rayCore(IAsyncResult ar)
+        /// <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/v2fly/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
            {
-                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)
+                string curVersion;
+                string message;
+                string url;
+                if (type == "Core")
                {
-                    osBit = "64";
+                    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
                {
-                    osBit = "32";
+                    throw new ArgumentException("Type");
                }
-                string url = string.Format(coreURL, version, osBit);
-                if (AbsoluteCompleted != null)
+
+                if (curVersion == version)
                {
-                    AbsoluteCompleted(this, new ResultEventArgs(true, url));
+                    AbsoluteCompleted?.Invoke(this, new ResultEventArgs(false, message));
+                    return;
                }
+
+                AbsoluteCompleted?.Invoke(this, new ResultEventArgs(true, url));
            }
            catch (Exception ex)
            {
                Utils.SaveLog(ex.Message, ex);

-                if (Error != null)
-                    Error(this, new ErrorEventArgs(ex));
+                Error?.Invoke(this, new ErrorEventArgs(ex));
            }
        }

+        #endregion

-        public void DownloadFileAsync(Config config, string url, WebProxy webProxy)
+        #region Download 
+
+        public WebClientEx DownloadFileAsync(string url, WebProxy webProxy, int downloadTimeout)
        {
+            WebClientEx ws = new WebClientEx();
            try
            {
-                ServicePointManager.SecurityProtocol = (SecurityProtocolType)3072; //TLS 1.2
-                ServicePointManager.DefaultConnectionLimit = 256;
-                if (UpdateCompleted != null)
-                {
-                    UpdateCompleted(this, new ResultEventArgs(false, "Downloading..."));
-                }
+                Utils.SetSecurityProtocol();
+                UpdateCompleted?.Invoke(this, new ResultEventArgs(false, UIRes.I18N("Downloading")));

                progressPercentage = -1;
+                totalBytesToReceive = 0;

-                WebClientEx ws = new WebClientEx();
+                //WebClientEx ws = new WebClientEx();
+                DownloadTimeout = downloadTimeout;
                if (webProxy != null)
                {
                    ws.Proxy = webProxy;// new WebProxy(Global.Loopback, Global.httpPort);
@@ -109,27 +195,35 @@ namespace v2rayN.Handler
                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));
+                Error?.Invoke(this, new ErrorEventArgs(ex));
            }
+            return ws;
        }

        void ws_DownloadProgressChanged(object sender, DownloadProgressChangedEventArgs e)
        {
-            if (blFirst)
-            {
-                totalBytesToReceive = e.TotalBytesToReceive - e.BytesReceived;
-                totalDatetime = DateTime.Now;
-                blFirst = false;
-            }
            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;
@@ -138,32 +232,40 @@ namespace v2rayN.Handler
                }
            }
        }
-
        void ws_DownloadFileCompleted(object sender, System.ComponentModel.AsyncCompletedEventArgs e)
        {
            try
            {
-                if (e.Error == null
-                    || Utils.IsNullOrEmpty(e.Error.ToString()))
+                if (UpdateCompleted != null)
                {
-                    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;
+                    else
+                    {
+                        throw e.Error;
+                    }
                }
            }
            catch (Exception ex)
            {
                Utils.SaveLog(ex.Message, ex);

-                if (Error != null)
-                    Error(this, new ErrorEventArgs(ex));
+                Error?.Invoke(this, new ErrorEventArgs(ex));
            }
        }

@@ -176,8 +278,7 @@ namespace v2rayN.Handler
            string source = string.Empty;
            try
            {
-                ServicePointManager.SecurityProtocol = (SecurityProtocolType)3072; //TLS 1.2
-                ServicePointManager.DefaultConnectionLimit = 256;
+                Utils.SetSecurityProtocol();

                WebClientEx ws = new WebClientEx();
                ws.DownloadStringCompleted += Ws_DownloadStringCompleted;
@@ -197,10 +298,7 @@ namespace v2rayN.Handler
                    || Utils.IsNullOrEmpty(e.Error.ToString()))
                {
                    string source = e.Result;
-                    if (UpdateCompleted != null)
-                    {
-                        UpdateCompleted(this, new ResultEventArgs(true, source));
-                    }
+                    UpdateCompleted?.Invoke(this, new ResultEventArgs(true, source));
                }
                else
                {
@@ -211,11 +309,51 @@ namespace v2rayN.Handler
            {
                Utils.SaveLog(ex.Message, ex);

-                if (Error != null)
-                    Error(this, new ErrorEventArgs(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,152 @@
+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
+                && config.vmess[index].configType != (int)EConfigType.VLESS)
+            {
+                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
+                && config.vmess[index].configType != (int)EConfigType.VLESS)
+            {
+                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,86 +1,60 @@
-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 DownloadHandle downloadHandle2;
        private Config _config;
        private V2rayHandler _v2rayHandler;
        private List<int> _selecteds;
-        private Thread _workThread;
        Action<int, string> _updateFunc;

-        private int testCounter = 0;
-        private int ItemIndex
-        {
-            get
-            {
-                return _selecteds[testCounter - 1];
-            }
-        }

        public SpeedtestHandler(ref Config config, ref V2rayHandler v2rayHandler, List<int> selecteds, string actionType, Action<int, string> update)
        {
            _config = config;
            _v2rayHandler = v2rayHandler;
-            _selecteds = selecteds;
+            _selecteds = Utils.DeepCopy(selecteds);
            _updateFunc = update;

            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 +62,7 @@ namespace v2rayN.Handler
                    }
                }

-                Thread.Sleep(100);
-
+                Thread.Sleep(10);
            }
            catch (Exception ex)
            {
@@ -97,166 +70,177 @@ namespace v2rayN.Handler
            }
        }

-        public void RunTcping()
+
+        private void RunPing()
        {
-            try
+            RunPingSub((int index) =>
            {
-                for (int k = 0; k < _selecteds.Count; k++)
-                {
-                    int index = _selecteds[k];
-                    if (_config.vmess[index].configType == (int)EConfigType.Custom)
-                    {
-                        continue;
-                    }
-                    try
-                    {
-                        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);
-                    }
-                }
-
-                Thread.Sleep(100);
-
-            }
-            catch (Exception ex)
-            {
-                Utils.SaveLog(ex.Message, ex);
-            }
+                long time = Utils.Ping(_config.vmess[index].address);
+                _updateFunc(index, FormatOut(time, "ms"));
+            });
        }

-        public void RunRealPing()
+        private void RunTcping()
        {
+            RunPingSub((int index) =>
+            {
+                int time = GetTcpingTime(_config.vmess[index].address, _config.vmess[index].port);
+                _updateFunc(index, FormatOut(time, "ms"));
+            });
+        }
+
+        private void RunRealPing()
+        {
+            int pid = -1;
            try
            {
                string msg = string.Empty;

-                Global.reloadV2ray = true;
-                _v2rayHandler.LoadV2ray(_config, _selecteds);
+                pid = _v2rayHandler.LoadV2rayConfigString(_config, _selecteds);

-                var httpPort = _config.GetLocalPort("speedtest");
-                for (int k = 0; k < _selecteds.Count; k++)
+                //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 webProxy = new WebProxy(Global.Loopback, httpPort + index);
-                        int responseTime = -1;
-                        var status = GetRealPingTime(Global.SpeedPingTestUrl, webProxy, out responseTime);
-                        if (!Utils.IsNullOrEmpty(status))
+                        try
                        {
-                            _updateFunc(index, string.Format("{0}", status));
+                            WebProxy webProxy = new WebProxy(Global.Loopback, httpPort + itemIndex);
+                            int responseTime = -1;
+                            string status = GetRealPingTime(_config.speedPingTestUrl, webProxy, out responseTime);
+                            string output = Utils.IsNullOrEmpty(status) ? FormatOut(responseTime, "ms") : FormatOut(status, "");
+                            _updateFunc(itemIndex, output);
                        }
-                        else
+                        catch (Exception ex)
                        {
-                            _updateFunc(index, string.Format("{0}ms", responseTime));
+                            Utils.SaveLog(ex.Message, ex);
                        }
-                    }
-                    catch (Exception ex)
-                    {
-                        Utils.SaveLog(ex.Message, ex);
-                    }
-                    Thread.Sleep(100);
+                    }));
+                    //Thread.Sleep(100);
                }
-
-                Global.reloadV2ray = true;
-                _v2rayHandler.LoadV2ray(_config);
-                Thread.Sleep(100);
-
+                Task.WaitAll(tasks.ToArray());
            }
            catch (Exception ex)
            {
                Utils.SaveLog(ex.Message, ex);
            }
+            finally
+            {
+                if (pid > 0) _v2rayHandler.V2rayStopPid(pid);
+            }
+        }
+
+        public int RunAvailabilityCheck() // alias: isLive
+        {
+            try
+            {
+                int httpPort = _config.GetLocalPort(Global.InboundHttp);
+
+                Task<int> t = Task.Run(() =>
+                {
+                    try
+                    {
+                        WebProxy webProxy = new WebProxy(Global.Loopback, httpPort);
+                        int responseTime = -1;
+                        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;
+                    }
+                });
+                return t.Result;
+            }
+            catch (Exception ex)
+            {
+                Utils.SaveLog(ex.Message, ex);
+                return -1;
+            }
        }

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

-            Global.reloadV2ray = true;
-            _v2rayHandler.LoadV2ray(_config, _selecteds);
+            pid = _v2rayHandler.LoadV2rayConfigString(_config, _selecteds);

-            string url = Global.SpeedTestUrl;
-            testCounter = 0;
-            if (downloadHandle2 == null)
+            string url = _config.speedTestUrl;
+            DownloadHandle downloadHandle2 = new DownloadHandle();
+            downloadHandle2.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);
-                    }
-                };
-                downloadHandle2.Error += (sender2, args) =>
-                {
-                    _updateFunc(ItemIndex, args.GetException().Message);
-                    if (ServerSpeedTestSub(testCounter, url) != 0)
-                    {
-                        return;
-                    }
-                };
-            }
+                _updateFunc(testCounter, args.Msg);
+            };
+            downloadHandle2.Error += (sender2, args) =>
+            {
+                _updateFunc(testCounter, args.GetException().Message);
+            };

-            if (ServerSpeedTestSub(testCounter, url) != 0)
+            var timeout = 10;
+            foreach (int itemIndex in _selecteds)
            {
-                return;
+                if (itemIndex >= _config.vmess.Count)
+                {
+                    break;
+                }
+
+                if (_config.vmess[itemIndex].configType == (int)EConfigType.Custom)
+                {
+                    continue;
+                }
+                testCounter = itemIndex;
+                int httpPort = _config.GetLocalPort("speedtest");
+
+                WebProxy webProxy = new WebProxy(Global.Loopback, httpPort + itemIndex);
+                var ws = downloadHandle2.DownloadFileAsync(url, webProxy, timeout - 2);
+
+                Thread.Sleep(1000 * timeout);
+
+                ws.CancelAsync();
+
+                Thread.Sleep(1000 * 2);
            }
+            if (pid > 0) _v2rayHandler.V2rayStopPid(pid);
        }

-        private int ServerSpeedTestSub(int index, string url)
-        {
-            if (index >= _selecteds.Count)
-            {
-                Global.reloadV2ray = true;
-                _v2rayHandler.LoadV2ray(_config);
-                return -1;
-            }
-
-            var httpPort = _config.GetLocalPort("speedtest");
-            index = _selecteds[index];
-            
-            testCounter++;
-            var webProxy = new WebProxy(Global.Loopback, httpPort + index);
-            downloadHandle2.DownloadFileAsync(_config, url, webProxy);
-
-            return 0;
-        }

        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();
@@ -272,14 +256,13 @@ namespace v2rayN.Handler
        {
            string msg = string.Empty;
            responseTime = -1;
-
            try
            {
                HttpWebRequest myHttpWebRequest = (HttpWebRequest)WebRequest.Create(url);
                myHttpWebRequest.Timeout = 5000;
                myHttpWebRequest.Proxy = webProxy;//new WebProxy(Global.Loopback, Global.httpPort);

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

                HttpWebResponse myHttpWebResponse = (HttpWebResponse)myHttpWebRequest.GetResponse();
@@ -299,9 +282,14 @@ namespace v2rayN.Handler
                msg = ex.Message;
            }
            return msg;
-
        }
-
-
+        private string FormatOut(object time, string unit)
+        {
+            if (time.ToString().Equals("-1"))
+            {
+                return "Timeout";
+            }
+            return string.Format("{0}{1}", time, unit).PadLeft(6, ' ');
+        }
    }
 }
--- 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,19 +142,94 @@ 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();

@@ -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,8 +1,12 @@
 using System;
 using System.Collections.Generic;
+using System.Collections.Specialized;
 using System.IO;
 using System.Linq;
 using System.Net;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Web;
 using v2rayN.Base;
 using v2rayN.Mode;

@@ -27,8 +31,6 @@ namespace v2rayN.Handler
        /// <returns></returns>
        public static int GenerateClientConfig(Config config, string fileName, bool blExport, out string msg)
        {
-            msg = string.Empty;
-
            try
            {
                //检查GUI设置
@@ -82,7 +84,7 @@ namespace v2rayN.Handler
                // TODO: 统计配置
                statistic(config, ref v2rayConfig);

-                Utils.ToJsonFile(v2rayConfig, fileName);
+                Utils.ToJsonFile(v2rayConfig, fileName, false);

                msg = string.Format(UIRes.I18N("SuccessfulConfiguration"), config.getSummary());
            }
@@ -149,7 +151,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 +228,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 +289,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 +302,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 +329,7 @@ namespace v2rayN.Handler
        {
            try
            {
-                var outbound = v2rayConfig.outbounds[0];
+                Outbounds outbound = v2rayConfig.outbounds[0];
                if (config.configType() == (int)EConfigType.Vmess)
                {
                    VnextItem vnextItem;
@@ -354,12 +364,13 @@ namespace v2rayN.Handler

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

                    //远程服务器底层传输配置
                    StreamSettings streamSettings = outbound.streamSettings;
                    boundStreamSettings(config, "out", ref streamSettings);

-                    outbound.protocol = "vmess";
+                    outbound.protocol = Global.vmessProtocolLite;
                    outbound.settings.servers = null;
                }
                else if (config.configType() == (int)EConfigType.Shadowsocks)
@@ -384,8 +395,10 @@ namespace v2rayN.Handler
                    serversItem.level = 1;

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

-                    outbound.protocol = "shadowsocks";
+
+                    outbound.protocol = Global.ssProtocolLite;
                    outbound.settings.vnext = null;
                }
                else if (config.configType() == (int)EConfigType.Socks)
@@ -403,21 +416,117 @@ 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.protocol = Global.socksProtocolLite;
+                    outbound.settings.vnext = null;
+                }
+                else if (config.configType() == (int)EConfigType.VLESS)
+                {
+                    VnextItem vnextItem;
+                    if (outbound.settings.vnext.Count <= 0)
+                    {
+                        vnextItem = new VnextItem();
+                        outbound.settings.vnext.Add(vnextItem);
+                    }
+                    else
+                    {
+                        vnextItem = outbound.settings.vnext[0];
+                    }
+                    //远程服务器地址和端口
+                    vnextItem.address = config.address();
+                    vnextItem.port = config.port();
+
+                    UsersItem usersItem;
+                    if (vnextItem.users.Count <= 0)
+                    {
+                        usersItem = new UsersItem();
+                        vnextItem.users.Add(usersItem);
+                    }
+                    else
+                    {
+                        usersItem = vnextItem.users[0];
+                    }
+                    //远程服务器用户ID
+                    usersItem.id = config.id();
+                    usersItem.alterId = 0;
+                    usersItem.flow = string.Empty;
+                    usersItem.email = Global.userEMail;
+                    usersItem.encryption = config.security();
+                    
+                    //Mux
+                    outbound.mux.enabled = config.muxEnabled;
+                    outbound.mux.concurrency = config.muxEnabled ? 8 : -1;
+
+                    //远程服务器底层传输配置
+                    StreamSettings streamSettings = outbound.streamSettings;
+                    boundStreamSettings(config, "out", ref streamSettings);
+
+                    //if xtls
+                    if (config.streamSecurity() == Global.StreamSecurityX)
+                    {
+                        if (Utils.IsNullOrEmpty(config.flow()))
+                        {
+                            usersItem.flow = "xtls-rprx-origin";
+                        }
+                        else
+                        {
+                            usersItem.flow = config.flow();
+                        }
+                        
+                        outbound.mux.enabled = false;
+                        outbound.mux.concurrency = -1;
+                    }
+
+                    outbound.protocol = Global.vlessProtocolLite;
+                    outbound.settings.servers = null;
+                }
+                else if (config.configType() == (int)EConfigType.Trojan)
+                {
+                    ServersItem serversItem;
+                    if (outbound.settings.servers.Count <= 0)
+                    {
+                        serversItem = new ServersItem();
+                        outbound.settings.servers.Add(serversItem);
+                    }
+                    else
+                    {
+                        serversItem = outbound.settings.servers[0];
+                    }
+                    //远程服务器地址和端口
+                    serversItem.address = config.address();
+                    serversItem.port = config.port();
+                    serversItem.password = config.id();
+
+                    serversItem.ota = false;
+                    serversItem.level = 1;
+
+                    outbound.mux.enabled = false;
+                    outbound.mux.concurrency = -1;
+
+
+                    //远程服务器底层传输配置
+                    StreamSettings streamSettings = outbound.streamSettings;
+                    boundStreamSettings(config, "out", ref streamSettings);
+
+                    outbound.protocol = Global.trojanProtocolLite;
                    outbound.settings.vnext = null;
                }
            }
@@ -440,30 +549,49 @@ 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;
+                        tlsSettings.serverName = Utils.String2List(host)[0];
                    }
                    streamSettings.tlsSettings = tlsSettings;
                }

+                //if xtls
+                if (config.streamSecurity() == Global.StreamSecurityX)
+                {
+                    streamSettings.security = config.streamSecurity();
+
+                    TlsSettings xtlsSettings = new TlsSettings
+                    {
+                        allowInsecure = config.allowInsecure()
+                    };
+                    if (!string.IsNullOrWhiteSpace(host))
+                    {
+                        xtlsSettings.serverName = Utils.String2List(host)[0];
+                    }
+                    streamSettings.xtlsSettings = xtlsSettings;
+                }
+
                //streamSettings
                switch (config.network())
                {
                    //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 +611,29 @@ 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()
+                        };
+                        if (!Utils.IsNullOrEmpty(config.path()))
+                        {
+                            kcpSettings.seed = config.path();
+                        }
                        streamSettings.kcpSettings = kcpSettings;
                        break;
                    //ws
                    case "ws":
-                        WsSettings wsSettings = new WsSettings();
-                        wsSettings.connectionReuse = true;
+                        WsSettings wsSettings = new WsSettings
+                        {                            
+                        };

                        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 +667,32 @@ 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
+                            {
+                                header = new Header
+                                {
+                                    type = config.headerType()
+                                }
+                            };

                            if (iobound.Equals("out"))
                            {
@@ -608,8 +755,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 +770,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 +790,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 +803,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 +824,6 @@ namespace v2rayN.Handler
        /// <returns></returns>
        public static int GenerateClientCustomConfig(Config config, string fileName, out string msg)
        {
-            msg = string.Empty;
-
            try
            {
                //检查GUI设置
@@ -688,11 +837,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 +877,6 @@ namespace v2rayN.Handler
        /// <returns></returns>
        public static int GenerateServerConfig(Config config, string fileName, out string msg)
        {
-            msg = string.Empty;
-
            try
            {
                //检查GUI设置
@@ -760,7 +917,7 @@ namespace v2rayN.Handler
                //传出设置
                ServerOutbound(config, ref v2rayConfig);

-                Utils.ToJsonFile(v2rayConfig, fileName);
+                Utils.ToJsonFile(v2rayConfig, fileName, false);

                msg = string.Format(UIRes.I18N("SuccessfulConfiguration"), config.getSummary());
            }
@@ -782,7 +939,7 @@ namespace v2rayN.Handler
        {
            try
            {
-                var inbound = v2rayConfig.inbounds[0];
+                Inbounds inbound = v2rayConfig.inbounds[0];
                UsersItem usersItem;
                if (inbound.settings.clients.Count <= 0)
                {
@@ -798,9 +955,22 @@ namespace v2rayN.Handler

                //远程服务器用户ID
                usersItem.id = config.id();
-                usersItem.alterId = config.alterId();
                usersItem.email = Global.userEMail;

+                if (config.configType() == (int)EConfigType.Vmess)
+                {
+                    inbound.protocol = Global.vmessProtocolLite;
+                    usersItem.alterId = config.alterId();
+
+                }
+                else if (config.configType() == (int)EConfigType.VLESS)
+                {
+                    inbound.protocol = Global.vlessProtocolLite;
+                    usersItem.alterId = 0;
+                    usersItem.flow = config.flow();
+                    inbound.settings.decryption = config.security();
+                }
+
                //远程服务器底层传输配置
                StreamSettings streamSettings = inbound.streamSettings;
                boundStreamSettings(config, "in", ref streamSettings);
@@ -871,10 +1041,10 @@ 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"
+                    || outbound.protocol != Global.vmessProtocolLite
                    || outbound.settings == null
                    || outbound.settings.vnext == null
                    || outbound.settings.vnext.Count <= 0
@@ -1017,10 +1187,10 @@ 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"
+                    || inbound.protocol != Global.vmessProtocolLite
                    || inbound.settings == null
                    || inbound.settings.clients == null
                    || inbound.settings.clients.Count <= 0)
@@ -1151,7 +1321,7 @@ namespace v2rayN.Handler
                    int indexSplit = result.IndexOf("?");
                    if (indexSplit > 0)
                    {
-                        vmessItem = ResolveVmess4Kitsunebi(result);
+                        vmessItem = ResolveStdVmess(result) ?? ResolveVmess4Kitsunebi(result);
                    }
                    else
                    {
@@ -1198,46 +1368,21 @@ namespace v2rayN.Handler
                {
                    msg = UIRes.I18N("ConfigurationFormatIncorrect");

-                    vmessItem.configType = (int)EConfigType.Shadowsocks;
-                    result = result.Substring(Global.ssProtocol.Length);
-                    //remark
-                    int indexRemark = result.IndexOf("#");
-                    if (indexRemark > 0)
+                    vmessItem = ResolveSSLegacy(result);
+                    if (vmessItem == null)
                    {
-                        try
-                        {
-                            vmessItem.remarks = WebUtility.UrlDecode(result.Substring(indexRemark + 1, result.Length - indexRemark - 1));
-                        }
-                        catch { }
-                        result = result.Substring(0, indexRemark);
+                        vmessItem = ResolveSip002(result);
                    }
-                    //part decode
-                    int indexS = result.IndexOf("@");
-                    if (indexS > 0)
+                    if (vmessItem == null)
                    {
-                        result = Utils.Base64Decode(result.Substring(0, indexS)) + result.Substring(indexS, result.Length - indexS);
+                        return null;
                    }
-                    else
+                    if (vmessItem.address.Length == 0 || vmessItem.port == 0 || vmessItem.security.Length == 0 || vmessItem.id.Length == 0)
                    {
-                        result = Utils.Base64Decode(result);
+                        return null;
                    }

-                    string[] arr1 = result.Split('@');
-                    if (arr1.Length != 2)
-                    {
-                        return null;
-                    }
-                    string[] arr21 = arr1[0].Split(':');
-                    //string[] arr22 = arr1[1].Split(':');
-                    int indexPort = arr1[1].LastIndexOf(":");
-                    if (arr21.Length != 2 || indexPort < 0)
-                    {
-                        return null;
-                    }
-                    vmessItem.address = arr1[1].Substring(0, indexPort);
-                    vmessItem.port = Utils.ToInt(arr1[1].Substring(indexPort + 1, arr1[1].Length - (indexPort + 1)));
-                    vmessItem.security = arr21[0];
-                    vmessItem.id = arr21[1];
+                    vmessItem.configType = (int)EConfigType.Shadowsocks;
                }
                else if (result.StartsWith(Global.socksProtocol))
                {
@@ -1283,6 +1428,30 @@ namespace v2rayN.Handler
                    vmessItem.security = arr21[0];
                    vmessItem.id = arr21[1];
                }
+                else if (result.StartsWith(Global.trojanProtocol))
+                {
+                    msg = UIRes.I18N("ConfigurationFormatIncorrect");
+
+                    vmessItem.configType = (int)EConfigType.Trojan;
+
+                    Uri uri = new Uri(result);
+                    vmessItem.address = uri.IdnHost;
+                    vmessItem.port = uri.Port;
+                    vmessItem.id = uri.UserInfo;
+
+                    var qurery = HttpUtility.ParseQueryString(uri.Query);
+                    vmessItem.requestHost = qurery["sni"] ?? "";
+
+                    var remarks = uri.Fragment.Replace("#", "");
+                    if (Utils.IsNullOrEmpty(remarks))
+                    {
+                        vmessItem.remarks = "NONE";
+                    }
+                    else
+                    {
+                        vmessItem.remarks = WebUtility.UrlDecode(remarks);
+                    }                     
+                }
                else
                {
                    msg = UIRes.I18N("NonvmessOrssProtocol");
@@ -1308,7 +1477,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 +1489,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)
@@ -1363,15 +1531,184 @@ namespace v2rayN.Handler
            return vmessItem;
        }

+        private static VmessItem ResolveSip002(string result)
+        {
+            Uri parsedUrl;
+            try
+            {
+                parsedUrl = new Uri(result);
+            }
+            catch (UriFormatException)
+            {
+                return null;
+            }
+            VmessItem server = new VmessItem
+            {
+                remarks = parsedUrl.GetComponents(UriComponents.Fragment, UriFormat.Unescaped),
+                address = parsedUrl.IdnHost,
+                port = parsedUrl.Port,
+            };
+
+            // parse base64 UserInfo
+            string rawUserInfo = parsedUrl.GetComponents(UriComponents.UserInfo, UriFormat.Unescaped);
+            string base64 = rawUserInfo.Replace('-', '+').Replace('_', '/');    // Web-safe base64 to normal base64
+            string userInfo;
+            try
+            {
+                userInfo = Encoding.UTF8.GetString(Convert.FromBase64String(
+                base64.PadRight(base64.Length + (4 - base64.Length % 4) % 4, '=')));
+            }
+            catch (FormatException)
+            {
+                return null;
+            }
+            string[] userInfoParts = userInfo.Split(new char[] { ':' }, 2);
+            if (userInfoParts.Length != 2)
+            {
+                return null;
+            }
+            server.security = userInfoParts[0];
+            server.id = userInfoParts[1];
+
+            NameValueCollection queryParameters = HttpUtility.ParseQueryString(parsedUrl.Query);
+            if (queryParameters["plugin"] != null)
+            {
+                return null;
+            }
+
+            return server;
+        }
+
+        private static readonly Regex UrlFinder = new Regex(@"ss://(?<base64>[A-Za-z0-9+-/=_]+)(?:#(?<tag>\S+))?", RegexOptions.IgnoreCase);
+        private static readonly Regex DetailsParser = new Regex(@"^((?<method>.+?):(?<password>.*)@(?<hostname>.+?):(?<port>\d+?))$", RegexOptions.IgnoreCase);
+
+        private static VmessItem ResolveSSLegacy(string result)
+        {
+            var match = UrlFinder.Match(result);
+            if (!match.Success)
+                return null;
+
+            VmessItem server = new VmessItem();
+            var base64 = match.Groups["base64"].Value.TrimEnd('/');
+            var tag = match.Groups["tag"].Value;
+            if (!tag.IsNullOrEmpty())
+            {
+                server.remarks = HttpUtility.UrlDecode(tag, Encoding.UTF8);
+            }
+            Match details;
+            try
+            {
+                details = DetailsParser.Match(Encoding.UTF8.GetString(Convert.FromBase64String(
+                    base64.PadRight(base64.Length + (4 - base64.Length % 4) % 4, '='))));
+            }
+            catch (FormatException)
+            {
+                return null;
+            }
+            if (!details.Success)
+                return null;
+            server.security = details.Groups["method"].Value;
+            server.id = details.Groups["password"].Value;
+            server.address = details.Groups["hostname"].Value;
+            server.port = int.Parse(details.Groups["port"].Value);
+            return server;
+        }
+
+
+        private static readonly Regex StdVmessUserInfo = new Regex(
+            @"^(?<network>[a-z]+)(\+(?<streamSecurity>[a-z]+))?:(?<id>[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})-(?<alterId>[0-9]+)$");
+
+        private static VmessItem ResolveStdVmess(string result)
+        {
+            VmessItem i = new VmessItem
+            {
+                configType = (int)EConfigType.Vmess,
+                security = "auto"
+            };
+
+            Uri u = new Uri(result);
+
+            i.address = u.IdnHost;
+            i.port = u.Port;
+            i.remarks = u.GetComponents(UriComponents.Fragment, UriFormat.Unescaped);
+            var q = HttpUtility.ParseQueryString(u.Query);
+
+            var m = StdVmessUserInfo.Match(u.UserInfo);
+            if (!m.Success) return null;
+
+            i.id = m.Groups["id"].Value;
+            if (!int.TryParse(m.Groups["alterId"].Value, out int aid))
+            {
+                return null;
+            }
+            i.alterId = aid;
+
+            if (m.Groups["streamSecurity"].Success)
+            {
+                i.streamSecurity = m.Groups["streamSecurity"].Value;
+            }
+            switch (i.streamSecurity)
+            {
+                case "tls":
+                    // TODO tls config
+                    break;
+                default:
+                    if (!string.IsNullOrWhiteSpace(i.streamSecurity))
+                        return null;
+                    break;
+            }
+
+            i.network = m.Groups["network"].Value;
+            switch (i.network)
+            {
+                case "tcp":
+                    string t1 = q["type"] ?? "none";
+                    i.headerType = t1;
+                    // TODO http option
+
+                    break;
+                case "kcp":
+                    i.headerType = q["type"] ?? "none";
+                    // TODO kcp seed
+                    break;
+
+                case "ws":
+                    string p1 = q["path"] ?? "/";
+                    string h1 = q["host"] ?? "";
+                    i.requestHost = h1;
+                    i.path = p1;
+                    break;
+
+                case "http":
+                    i.network = "h2";
+                    string p2 = q["path"] ?? "/";
+                    string h2 = q["host"] ?? "";
+                    i.requestHost = h2;
+                    i.path = p2;
+                    break;
+
+                case "quic":
+                    string s = q["security"] ?? "none";
+                    string k = q["key"] ?? "";
+                    string t3 = q["type"] ?? "none";
+                    i.headerType = t3;
+                    i.requestHost = s;
+                    i.path = k;
+                    break;
+
+                default:
+                    return null;
+            }
+
+            return i;
+        }
        #endregion

        #region Gen speedtest config


-        public static int GenerateClientSpeedtestConfig(Config config, List<int> selecteds, string fileName, out string msg)
+        public static string GenerateClientSpeedtestConfigString(Config config, List<int> selecteds, out string msg)
        {
-            msg = string.Empty;
-
            try
            {
                if (config == null
@@ -1381,71 +1718,75 @@ namespace v2rayN.Handler
                    )
                {
                    msg = UIRes.I18N("CheckServerSettings");
-                    return -1;
+                    return "";
                }

                msg = UIRes.I18N("InitialConfiguration");

+                Config configCopy = Utils.DeepCopy(config);
+
                string result = Utils.GetEmbedText(SampleClient);
                if (Utils.IsNullOrEmpty(result))
                {
                    msg = UIRes.I18N("FailedGetDefaultConfiguration");
-                    return -1;
+                    return "";
                }

                V2rayConfig v2rayConfig = Utils.FromJson<V2rayConfig>(result);
                if (v2rayConfig == null)
                {
                    msg = UIRes.I18N("FailedGenDefaultConfiguration");
-                    return -1;
+                    return "";
                }

-                log(config, ref v2rayConfig, false);
+                log(configCopy, ref v2rayConfig, false);
                //routing(config, ref v2rayConfig);
-                dns(config, ref v2rayConfig);
+                dns(configCopy, ref v2rayConfig);

+                v2rayConfig.inbounds.RemoveAt(0); // Remove "proxy" service for speedtest, avoiding port conflicts.

-                var httpPort = config.GetLocalPort("speedtest");
-                for (int k = 0; k < selecteds.Count; k++)
+                int httpPort = configCopy.GetLocalPort("speedtest");
+                foreach (int index in selecteds)
                {
-                    int index = selecteds[k];
-                    if (config.vmess[index].configType == (int)EConfigType.Custom)
+                    if (configCopy.vmess[index].configType == (int)EConfigType.Custom)
                    {
                        continue;
                    }

-                    config.index = index;
+                    configCopy.index = index;

-                    var inbound = new Inbounds();
-                    inbound.listen = Global.Loopback;
-                    inbound.port = httpPort + index;
-                    inbound.protocol = Global.InboundHttp;
+                    Inbounds inbound = new Inbounds
+                    {
+                        listen = Global.Loopback,
+                        port = httpPort + index,
+                        protocol = Global.InboundHttp
+                    };
                    inbound.tag = Global.InboundHttp + inbound.port.ToString();
                    v2rayConfig.inbounds.Add(inbound);


-                    var v2rayConfigCopy = Utils.FromJson<V2rayConfig>(result);
-                    outbound(config, ref v2rayConfigCopy);
+                    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]);

-                    var rule = new Mode.RulesItem();
-                    rule.inboundTag = inbound.tag;
-                    rule.outboundTag = v2rayConfigCopy.outbounds[0].tag;
-                    rule.type = "field";
+                    RulesItem rule = new RulesItem
+                    {
+                        inboundTag = new List<string> { inbound.tag },
+                        outboundTag = v2rayConfigCopy.outbounds[0].tag,
+                        type = "field"
+                    };
                    v2rayConfig.routing.rules.Add(rule);
                }

-                Utils.ToJsonFile(v2rayConfig, fileName);
-
-                msg = string.Format(UIRes.I18N("SuccessfulConfiguration"), config.getSummary());
+                msg = string.Format(UIRes.I18N("SuccessfulConfiguration"), configCopy.getSummary());
+                return Utils.ToJson(v2rayConfig);
            }
-            catch (Exception ex)
+            catch
            {
                msg = UIRes.I18N("FailedGenDefaultConfiguration");
-                return -1;
+                return "";
            }
-            return 0;
        }

        #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,17 @@ 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>
+            {
+                "xray",
+                "wv2ray",
+                "v2ray"
+            };
        }

        /// <summary>
@@ -38,9 +43,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);
                }
@@ -53,24 +57,25 @@ namespace v2rayN.Handler
        }

        /// <summary>
-        /// 载入V2ray
+        /// 新建进程，载入V2ray配置文件字符串
+        /// 返回新进程pid。
        /// </summary>
-        public void LoadV2ray(Config config, List<int> _selecteds)
+        public int LoadV2rayConfigString(Config config, List<int> _selecteds)
        {
-            if (Global.reloadV2ray)
+            int pid = -1;
+            string configStr = V2rayConfigHandler.GenerateClientSpeedtestConfigString(config, _selecteds, out string msg);
+            if (configStr == "")
            {
-                string msg = string.Empty;
-                string fileName = Utils.GetPath(v2rayConfigRes);
-                if (V2rayConfigHandler.GenerateClientSpeedtestConfig(config, _selecteds, fileName, out msg) != 0)
-                {
-                    ShowMsg(false, msg);
-                }
-                else
-                {
-                    ShowMsg(true, msg);
-                    V2rayRestart();
-                }
+                ShowMsg(false, msg);
            }
+            else
+            {
+                ShowMsg(false, msg);
+                pid = V2rayStartNew(configStr);
+                //V2rayRestart();
+                // start with -config
+            }
+            return pid;
        }

        /// <summary>
@@ -89,33 +94,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/v2fly/v2ray-core/releases");
+                ShowMsg(false, msg);
+            }
+            return fileName;
+        }

        /// <summary>
        /// V2ray启动
@@ -126,30 +190,77 @@ namespace v2rayN.Handler

            try
            {
-                //查找v2ray文件是否存在
-                string fileName = string.Empty;
-                for (int k = 0; k < lstV2ray.Count; k++)
+                string fileName = V2rayFindexe();
+                if (fileName == "") return;
+
+                Process p = new Process
                {
-                    string vName = string.Format("{0}.exe", lstV2ray[k]);
-                    vName = Utils.GetPath(vName);
-                    if (File.Exists(vName))
+                    StartInfo = new ProcessStartInfo
                    {
-                        fileName = vName;
-                        break;
+                        FileName = fileName,
+                        WorkingDirectory = Utils.StartupPath(),
+                        UseShellExecute = false,
+                        RedirectStandardOutput = true,
+                        RedirectStandardError = true,
+                        CreateNoWindow = true,
+                        StandardOutputEncoding = Encoding.UTF8
                    }
-                }
-                if (Utils.IsNullOrEmpty(fileName))
+                };
+                p.OutputDataReceived += new DataReceivedEventHandler((sender, e) =>
                {
-                    string msg = string.Format(UIRes.I18N("NotFoundCore"), @"https://github.com/v2ray/v2ray-core/releases");
-                    ShowMsg(true, msg);
-                    return;
+                    if (!String.IsNullOrEmpty(e.Data))
+                    {
+                        string msg = e.Data + Environment.NewLine;
+                        ShowMsg(false, msg);
+                    }
+                });
+                p.Start();
+                p.PriorityClass = ProcessPriorityClass.High;
+                p.BeginOutputReadLine();
+                //processId = p.Id;
+                _process = p;
+
+                if (p.WaitForExit(1000))
+                {
+                    throw new Exception(p.StandardError.ReadToEnd());
                }

-                Process p = new Process();
-                p.StartInfo.FileName = fileName;
-                p.StartInfo.UseShellExecute = false;
-                p.StartInfo.RedirectStandardOutput = true;
-                p.StartInfo.CreateNoWindow = true;
+                Global.processJob.AddProcess(p.Handle);
+            }
+            catch (Exception ex)
+            {
+                Utils.SaveLog(ex.Message, ex);
+                string msg = ex.Message;
+                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))
@@ -160,27 +271,53 @@ namespace v2rayN.Handler
                });
                p.Start();
                p.BeginOutputReadLine();
-                processId = p.Id;
+
+                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(true, msg);
+                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/HttpProxyHandler/HttpProxyHandle.cs
+++ b/v2rayN/v2rayN/HttpProxyHandler/HttpProxyHandle.cs
@@ -1,151 +1,186 @@
-using System;
-using v2rayN.Mode;
-
-namespace v2rayN.HttpProxyHandler
-{
-    /// <summary>
-    /// 系统代理(http)总处理
-    /// 启动privoxy提供http协议
-    /// 使用SysProxy设置IE系统代理或者PAC模式
-    /// </summary>
-    class HttpProxyHandle
-    {
-        public static bool Update(Config config, bool forceDisable)
-        {
-            int type = config.listenerType;
-
-            if (forceDisable)
-            {
-                type = 0;
-            }
-
-            try
-            {
-                if (type != 0)
-                {
-                    var port = Global.httpPort;
-                    if (port <= 0)
-                    {
-                        return false;
-                    }
-                    if (type == 1)
-                    {
-                        PACServerHandle.Stop();
-                        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);
-                    }
-                    else if (type == 3)
-                    {
-                        PACServerHandle.Stop();
-                        SysProxyHandle.SetIEProxy(false, false, null, null);
-                    }
-                    else if (type == 4)
-                    {
-                        string pacUrl = GetPacUrl();
-                        SysProxyHandle.SetIEProxy(false, false, null, null);
-                        PACServerHandle.Stop();
-                        PACServerHandle.Init(config);
-                    }
-                }
-                else
-                {
-                    SysProxyHandle.SetIEProxy(false, false, null, null);
-                    PACServerHandle.Stop();
-                }
-            }
-            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(Global.InboundSocks);
-                if (localPort > 0)
-                {
-                    PrivoxyHandler.Instance.Start(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
-            {
-                PrivoxyHandler.Instance.Stop();
-
-                Global.sysAgent = false;
-                Global.socksPort = 0;
-                Global.httpPort = 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(Global.InboundSocks);
-                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={ DateTime.Now.ToString("HHmmss")}";
-            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/PACListHandle.cs
+++ b/v2rayN/v2rayN/HttpProxyHandler/PACListHandle.cs
@@ -1,93 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Net;
-using System.Text;
-using Newtonsoft.Json;
-using v2rayN.Base;
-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
@@ -17,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
        {
@@ -28,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;
@@ -110,7 +114,7 @@ namespace v2rayN.HttpProxyHandler
        {
            try
            {
-                var pac = GetPacList(address);
+                string pac = GetPacList(address);
                return pac;
            }
            catch (Exception ex)
@@ -122,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
            //{
@@ -154,27 +163,40 @@ namespace v2rayN.HttpProxyHandler
            //}
        }

-
        private static string GetPacList(string address)
        {
-            var port = Global.httpPort;
+            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,19 +22,17 @@ namespace v2rayN.HttpProxyHandler

        private static int _uid;
        private static string _uniqueConfigFile;
-        private static Job _privoxyJob;
        private Process _process;
+        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)
            {
@@ -42,11 +40,6 @@ namespace v2rayN.HttpProxyHandler
            }
        }

-        private PrivoxyHandler()
-        {
-
-        }
-
        /// <summary>
        /// 单例
        /// </summary>
@@ -67,50 +60,61 @@ namespace v2rayN.HttpProxyHandler
            get; set;
        }

+        public void Restart(int localPort, Config config)
+        {
+            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 = config.GetLocalPort(Global.InboundHttp);
-                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);
+                    /*
+                     * 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);
            }
        }

@@ -123,6 +127,14 @@ namespace v2rayN.HttpProxyHandler
                _process = null;
                RunningPort = 0;
            }
+            else
+            {
+                Process[] existingPrivoxy = Process.GetProcessesByName(_privoxyName);
+                foreach (Process p in existingPrivoxy.Where(IsChildProcess))
+                {
+                    KillProcess(p);
+                }
+            }
        }

        private static void KillProcess(Process p)
@@ -134,7 +146,7 @@ namespace v2rayN.HttpProxyHandler
                if (!p.HasExited)
                {
                    p.Kill();
-                    p.WaitForExit();
+                    p.WaitForExit(100);
                }
            }
            catch (Exception ex)
@@ -160,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)
--- 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,20 +1,20 @@
-using Newtonsoft.Json;
+
 using System;
 using System.Diagnostics;
 using System.IO;
 using System.Text;
-using v2rayN.Base;
+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:
@@ -44,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();

@@ -56,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 v2rayN.Base;
+using v2rayN.HttpProxyHandler;
+

 namespace v2rayN.Mode
 {
@@ -106,23 +108,28 @@ namespace v2rayN.Mode
            get; set;
        }

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

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

+        /// <summary>
+        /// 去重时优先保留较旧（顶部）节点
+        /// </summary>
+        public bool keepOlderDedupl
+        {
+            get; set;
+        }
+
        /// <summary>
        /// 视图刷新率
        /// </summary>
@@ -155,25 +170,6 @@ namespace v2rayN.Mode
            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;
-            }
-        }

        /// <summary>
        /// 自定义远程DNS
@@ -182,6 +178,15 @@ namespace v2rayN.Mode
        {
            get; set;
        }
+
+        /// <summary>
+        /// 是否允许不安全连接
+        /// </summary>
+        public bool defAllowInsecure
+        {
+            get; set;
+        }
+
        /// <summary>
        /// 订阅
        /// </summary>
@@ -197,6 +202,11 @@ namespace v2rayN.Mode
            get; set;
        }

+        public List<string> userPacRule
+        {
+            get; set;
+        }
+
        #region 函数

        public string address()
@@ -296,7 +306,7 @@ namespace v2rayN.Mode
        {
            if (index < 0 || Utils.IsNullOrEmpty(vmess[index].allowInsecure))
            {
-                return true;
+                return defAllowInsecure;
            }
            return Convert.ToBoolean(vmess[index].allowInsecure);
        }
@@ -346,6 +356,23 @@ namespace v2rayN.Mode
            return vmess[index].getSummary();
        }

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

    }
@@ -371,14 +398,14 @@ namespace v2rayN.Mode
            configType = (int)EConfigType.Vmess;
            testResult = string.Empty;
            subid = string.Empty;
+            flow = string.Empty;
        }

        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]}";
@@ -391,21 +418,26 @@ namespace v2rayN.Mode
            {
                addr = address;
            }
-            if (configType == (int)EConfigType.Vmess)
+            switch (configType)
            {
-                summary += string.Format("{0}({1}:{2})", remarks, addr, port);
-            }
-            else if (configType == (int)EConfigType.Shadowsocks)
-            {
-                summary += string.Format("{0}({1}:{2})", remarks, addr, port);
-            }
-            else if (configType == (int)EConfigType.Socks)
-            {
-                summary += string.Format("{0}({1}:{2})", remarks, addr, port);
-            }
-            else
-            {
-                summary += string.Format("{0}", remarks);
+                case (int)EConfigType.Vmess:
+                    summary += string.Format("{0}({1}:{2})", remarks, addr, port);
+                    break;
+                case (int)EConfigType.Shadowsocks:
+                    summary += string.Format("{0}({1}:{2})", remarks, addr, port);
+                    break;
+                case (int)EConfigType.Socks:
+                    summary += string.Format("{0}({1}:{2})", remarks, addr, port);
+                    break;
+                case (int)EConfigType.VLESS:
+                    summary += string.Format("{0}({1}:{2})", remarks, addr, port);
+                    break;
+                case (int)EConfigType.Trojan:
+                    summary += string.Format("{0}({1}:{2})", remarks, addr, port);
+                    break;
+                default:
+                    summary += string.Format("{0}", remarks);
+                    break;
            }
            return summary;
        }
@@ -429,6 +461,14 @@ 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>
@@ -473,7 +513,7 @@ namespace v2rayN.Mode
            get; set;
        }
        /// <summary>
-        /// tcp,kcp,ws
+        /// tcp,kcp,ws,h2,quic
        /// </summary>
        public string network
        {
@@ -551,6 +591,14 @@ namespace v2rayN.Mode
        {
            get; set;
        }
+
+        /// <summary>
+        /// VLESS flow
+        /// </summary>
+        public string flow
+        {
+            get; set;
+        }
    }

    [Serializable]
@@ -677,10 +725,16 @@ namespace v2rayN.Mode
    [Serializable]
    public class UIItem
    {
-        /// <summary>
-        /// 
-        /// </summary>
-        public int mainQRCodeWidth { get; set; } = 600;

+
+        public System.Drawing.Size mainSize
+        {
+            get; set;
+        }
+
+        public Dictionary<string, int> mainLvColWidth
+        {
+            get; set;
+        }
    }
 }
--- a/v2rayN/v2rayN/Mode/EConfigType.cs
+++ b/v2rayN/v2rayN/Mode/EConfigType.cs
@@ -6,6 +6,8 @@ namespace v2rayN.Mode
        Vmess = 1,
        Custom = 2,
        Shadowsocks = 3,
-        Socks = 4
+        Socks = 4,
+        VLESS = 5,
+        Trojan = 6
    }
 }
--- a/v2rayN/v2rayN/Mode/EServerColName.cs
+++ b/v2rayN/v2rayN/Mode/EServerColName.cs
@@ -0,0 +1,21 @@
+
+namespace v2rayN.Mode
+{
+    public enum EServerColName
+    {
+        def = 0,
+        configType,
+        remarks,
+        address,
+        port,
+        security,
+        network,
+        subRemarks,
+        testResult,
+
+        todayDown,
+        todayUp,
+        totalDown,
+        totalUp
+    }
+}
--- 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
@@ -132,6 +132,13 @@ namespace v2rayN.Mode
        /// 
        /// </summary>
        public List<UsersItem> clients { get; set; }
+
+        
+        /// <summary>
+        /// VLESS
+        /// </summary>
+        public string decryption { get; set; }
+        
    }

    public class UsersItem
@@ -152,6 +159,16 @@ namespace v2rayN.Mode
        /// 
        /// </summary>
        public string security { get; set; }
+
+        /// <summary>
+        /// VLESS
+        /// </summary>
+        public string encryption { get; set; }
+
+        /// <summary>
+        /// VLESS
+        /// </summary>
+        public string flow { get; set; }         
    }
    public class Sniffing
    {
@@ -281,6 +298,11 @@ namespace v2rayN.Mode
        /// 
        /// </summary>
        public bool enabled { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public int concurrency { get; set; }
    }

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

-        public string inboundTag { get; set; }
+        public List<string> inboundTag { get; set; }
        /// <summary>
        /// 
        /// </summary>
@@ -376,7 +398,12 @@ namespace v2rayN.Mode
        /// QUIC
        /// </summary>
        public QuicSettings quicSettings { get; set; }
-        
+
+        /// <summary>
+        /// VLESS xtls
+        /// </summary>
+        public TlsSettings xtlsSettings { get; set; }
+
    }

    public class TlsSettings
@@ -393,11 +420,7 @@ namespace v2rayN.Mode
    }

    public class TcpSettings
-    {
-        /// <summary>
-        /// 是否重用 TCP 连接
-        /// </summary>
-        public bool connectionReuse { get; set; }
+    {         
        /// <summary>
        /// 数据包头部伪装设置
        /// </summary>
@@ -454,15 +477,14 @@ namespace v2rayN.Mode
        /// 
        /// </summary>
        public Header header { get; set; }
-    }
-
-    public class WsSettings
-    {
        /// <summary>
        /// 
        /// </summary>
-        public bool connectionReuse { get; set; }
+        public string seed { get; set; }
+    }

+    public class WsSettings
+    {      
        /// <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.46")]
+[assembly: AssemblyFileVersion("3.29")]
--- a/v2rayN/v2rayN/Properties/Resources.Designer.cs
+++ b/v2rayN/v2rayN/Properties/Resources.Designer.cs
@@ -19,7 +19,7 @@ namespace v2rayN.Properties {
    // 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。
    // 若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen
    // (以 /str 作为命令选项)，或重新生成 VS 项目。
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
+    [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 {
@@ -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>
@@ -206,6 +197,16 @@ namespace v2rayN.Properties {
            }
        }
        
+        /// <summary>
+        ///   查找 System.Drawing.Bitmap 类型的本地化资源。
+        /// </summary>
+        internal static System.Drawing.Bitmap share {
+            get {
+                object obj = ResourceManager.GetObject("share", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
        /// <summary>
        ///   查找 System.Drawing.Bitmap 类型的本地化资源。
        /// </summary>
--- a/v2rayN/v2rayN/Properties/Resources.resx
+++ b/v2rayN/v2rayN/Properties/Resources.resx
@@ -118,55 +118,55 @@
    <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="privoxy_exe" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\resources\privoxy.exe.gz;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
  <data name="about" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\about.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
-  <data name="abp_js" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\abp.js.gz;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="checkupdate" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\resources\checkupdate.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <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>
-  <data name="notify" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\notify.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
  <data name="option" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\option.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
-  <data name="pac_txt" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\pac.txt.gz;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="privoxy_conf" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\resources\privoxy_conf.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;gb2312</value>
-  </data>
-  <data name="privoxy_exe" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\resources\privoxy.exe.gz;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="promotion" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\resources\promotion.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
  <data name="restart" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\restart.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
-  <data name="server" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\server.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <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>
  </data>
  <data name="sub" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <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>
+  <data name="server" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\server.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</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>
+  <data name="notify" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\notify.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="checkupdate" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\resources\checkupdate.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="promotion" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\resources\promotion.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>
+  </data>
+  <data name="privoxy_conf" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\resources\privoxy_conf.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;gb2312</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>
+  <data name="pac_txt" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\pac.txt.gz;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <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="abp_js" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\abp.js.gz;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="share" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\resources\share.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</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/Resources/share.png
+++ b/v2rayN/v2rayN/Resources/share.png
--- 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,11 +475,11 @@ namespace v2rayN.Resx {
        }
        
        /// <summary>
-        ///   查找类似 Resolve V2rayCore successfully 的本地化字符串。
+        ///   查找类似 Resolve {0} successfully 的本地化字符串。
        /// </summary>
-        internal static string MsgParsingV2rayCoreSuccessfully {
+        internal static string MsgParsingSuccessfully {
            get {
-                return ResourceManager.GetString("MsgParsingV2rayCoreSuccessfully", resourceCulture);
+                return ResourceManager.GetString("MsgParsingSuccessfully", resourceCulture);
            }
        }
        
@@ -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>
@@ -286,8 +255,8 @@
  <data name="MsgPACUpdateSuccessfully" xml:space="preserve">
    <value>PAC update succeeded</value>
  </data>
-  <data name="MsgParsingV2rayCoreSuccessfully" xml:space="preserve">
-    <value>Resolve V2rayCore successfully</value>
+  <data name="MsgParsingSuccessfully" xml:space="preserve">
+    <value>Resolve {0} 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>
@@ -286,8 +255,8 @@
  <data name="MsgPACUpdateSuccessfully" xml:space="preserve">
    <value>PAC更新成功</value>
  </data>
-  <data name="MsgParsingV2rayCoreSuccessfully" xml:space="preserve">
-    <value>解析V2rayCore成功</value>
+  <data name="MsgParsingSuccessfully" xml:space="preserve">
+    <value>解析{0}成功</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-all,
--- a/Show More
+++ b/Show More